2010-05-18 17:58:33 +02:00
|
|
|
/*
|
2010-09-09 14:16:39 +02:00
|
|
|
* Copyright (c) 2010 The WebM project authors. All Rights Reserved.
|
2010-05-18 17:58:33 +02:00
|
|
|
*
|
2010-06-09 17:29:20 +02:00
|
|
|
* Use of this source code is governed by a BSD-style license
|
2010-06-04 22:19:40 +02:00
|
|
|
* that can be found in the LICENSE file in the root of the source
|
|
|
|
* tree. An additional intellectual property rights grant can be found
|
2010-06-09 17:29:20 +02:00
|
|
|
* in the file PATENTS. All contributing project authors may
|
2010-06-04 22:19:40 +02:00
|
|
|
* be found in the AUTHORS file in the root of the source tree.
|
2010-05-18 17:58:33 +02:00
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
#include "onyxd_int.h"
|
2011-02-10 20:41:38 +01:00
|
|
|
#include "vp8/common/header.h"
|
|
|
|
#include "vp8/common/reconintra.h"
|
|
|
|
#include "vp8/common/reconintra4x4.h"
|
|
|
|
#include "vp8/common/recon.h"
|
|
|
|
#include "vp8/common/reconinter.h"
|
2010-05-18 17:58:33 +02:00
|
|
|
#include "dequantize.h"
|
|
|
|
#include "detokenize.h"
|
2011-02-10 20:41:38 +01:00
|
|
|
#include "vp8/common/invtrans.h"
|
|
|
|
#include "vp8/common/alloccommon.h"
|
|
|
|
#include "vp8/common/entropymode.h"
|
|
|
|
#include "vp8/common/quant_common.h"
|
2010-09-16 20:08:52 +02:00
|
|
|
#include "vpx_scale/vpxscale.h"
|
|
|
|
#include "vpx_scale/yv12extend.h"
|
2011-02-10 20:41:38 +01:00
|
|
|
#include "vp8/common/setupintrarecon.h"
|
2010-09-09 20:42:48 +02:00
|
|
|
|
2010-05-18 17:58:33 +02:00
|
|
|
#include "decodemv.h"
|
2011-02-10 20:41:38 +01:00
|
|
|
#include "vp8/common/extend.h"
|
2011-12-06 21:03:42 +01:00
|
|
|
#include "vp8/common/modecont.h"
|
2011-05-02 15:30:51 +02:00
|
|
|
#if CONFIG_ERROR_CONCEALMENT
|
|
|
|
#include "error_concealment.h"
|
|
|
|
#endif
|
2010-05-18 17:58:33 +02:00
|
|
|
#include "vpx_mem/vpx_mem.h"
|
2011-02-10 20:41:38 +01:00
|
|
|
#include "vp8/common/idct.h"
|
2010-05-18 17:58:33 +02:00
|
|
|
#include "dequantize.h"
|
|
|
|
#include "dboolhuff.h"
|
|
|
|
|
2011-10-05 12:26:00 +02:00
|
|
|
#include "vp8/common/seg_common.h"
|
|
|
|
|
2010-05-18 17:58:33 +02:00
|
|
|
#include <assert.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
|
2011-12-01 01:25:00 +01:00
|
|
|
|
2011-02-14 23:18:18 +01:00
|
|
|
#ifdef DEC_DEBUG
|
|
|
|
int dec_debug = 0;
|
|
|
|
#endif
|
|
|
|
|
2010-05-18 17:58:33 +02:00
|
|
|
void vp8cx_init_de_quantizer(VP8D_COMP *pbi)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
int Q;
|
|
|
|
VP8_COMMON *const pc = & pbi->common;
|
|
|
|
|
|
|
|
for (Q = 0; Q < QINDEX_RANGE; Q++)
|
|
|
|
{
|
2010-10-22 02:04:30 +02:00
|
|
|
pc->Y1dequant[Q][0] = (short)vp8_dc_quant(Q, pc->y1dc_delta_q);
|
|
|
|
pc->Y2dequant[Q][0] = (short)vp8_dc2quant(Q, pc->y2dc_delta_q);
|
|
|
|
pc->UVdequant[Q][0] = (short)vp8_dc_uv_quant(Q, pc->uvdc_delta_q);
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2010-10-28 01:04:02 +02:00
|
|
|
/* all the ac values = ; */
|
2010-05-18 17:58:33 +02:00
|
|
|
for (i = 1; i < 16; i++)
|
|
|
|
{
|
|
|
|
int rc = vp8_default_zig_zag1d[i];
|
|
|
|
|
2010-10-22 02:04:30 +02:00
|
|
|
pc->Y1dequant[Q][rc] = (short)vp8_ac_yquant(Q);
|
|
|
|
pc->Y2dequant[Q][rc] = (short)vp8_ac2quant(Q, pc->y2ac_delta_q);
|
|
|
|
pc->UVdequant[Q][rc] = (short)vp8_ac_uv_quant(Q, pc->uvac_delta_q);
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-09-16 20:08:52 +02:00
|
|
|
void mb_init_dequantizer(VP8D_COMP *pbi, MACROBLOCKD *xd)
|
2010-05-18 17:58:33 +02:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
int QIndex;
|
|
|
|
VP8_COMMON *const pc = & pbi->common;
|
2011-09-14 19:20:25 +02:00
|
|
|
int segment_id = xd->mode_info_context->mbmi.segment_id;
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2011-09-14 19:20:25 +02:00
|
|
|
// Set the Q baseline allowing for any segment level adjustment
|
2011-10-05 12:26:00 +02:00
|
|
|
if ( segfeature_active( xd, segment_id, SEG_LVL_ALT_Q ) )
|
2010-05-18 17:58:33 +02:00
|
|
|
{
|
2010-10-28 01:04:02 +02:00
|
|
|
/* Abs Value */
|
2010-05-18 17:58:33 +02:00
|
|
|
if (xd->mb_segement_abs_delta == SEGMENT_ABSDATA)
|
2011-11-03 17:58:26 +01:00
|
|
|
QIndex = get_segdata( xd, segment_id, SEG_LVL_ALT_Q );
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2010-10-28 01:04:02 +02:00
|
|
|
/* Delta Value */
|
2010-05-18 17:58:33 +02:00
|
|
|
else
|
|
|
|
{
|
2011-09-13 13:58:04 +02:00
|
|
|
QIndex = pc->base_qindex +
|
2011-11-03 17:58:26 +01:00
|
|
|
get_segdata( xd, segment_id, SEG_LVL_ALT_Q );
|
2010-10-28 01:04:02 +02:00
|
|
|
QIndex = (QIndex >= 0) ? ((QIndex <= MAXQ) ? QIndex : MAXQ) : 0; /* Clamp to valid range */
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
QIndex = pc->base_qindex;
|
|
|
|
|
2010-10-28 01:04:02 +02:00
|
|
|
/* Set up the block level dequant pointers */
|
2010-05-18 17:58:33 +02:00
|
|
|
for (i = 0; i < 16; i++)
|
|
|
|
{
|
|
|
|
xd->block[i].dequant = pc->Y1dequant[QIndex];
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 16; i < 24; i++)
|
|
|
|
{
|
|
|
|
xd->block[i].dequant = pc->UVdequant[QIndex];
|
|
|
|
}
|
|
|
|
|
|
|
|
xd->block[24].dequant = pc->Y2dequant[QIndex];
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
#if CONFIG_RUNTIME_CPU_DETECT
|
|
|
|
#define RTCD_VTABLE(x) (&(pbi)->common.rtcd.x)
|
|
|
|
#else
|
|
|
|
#define RTCD_VTABLE(x) NULL
|
|
|
|
#endif
|
|
|
|
|
2010-10-28 01:04:02 +02:00
|
|
|
/* skip_recon_mb() is Modified: Instead of writing the result to predictor buffer and then copying it
|
|
|
|
* to dst buffer, we can write the result directly to dst buffer. This eliminates unnecessary copy.
|
|
|
|
*/
|
2010-05-18 17:58:33 +02:00
|
|
|
static void skip_recon_mb(VP8D_COMP *pbi, MACROBLOCKD *xd)
|
|
|
|
{
|
2011-04-21 20:59:42 +02:00
|
|
|
if (xd->mode_info_context->mbmi.ref_frame == INTRA_FRAME)
|
2010-05-18 17:58:33 +02:00
|
|
|
{
|
2011-04-27 19:05:10 +02:00
|
|
|
RECON_INVOKE(&pbi->common.rtcd.recon, build_intra_predictors_mbuv_s)(xd);
|
2011-03-11 17:35:38 +01:00
|
|
|
RECON_INVOKE(&pbi->common.rtcd.recon,
|
|
|
|
build_intra_predictors_mby_s)(xd);
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2011-04-28 16:53:59 +02:00
|
|
|
vp8_build_inter16x16_predictors_mb(xd, xd->dst.y_buffer,
|
|
|
|
xd->dst.u_buffer, xd->dst.v_buffer,
|
|
|
|
xd->dst.y_stride, xd->dst.uv_stride);
|
2012-02-10 01:11:00 +01:00
|
|
|
|
Dual 16x16 inter prediction.
This patch introduces the concept of dual inter16x16 prediction. A
16x16 inter-predicted macroblock can use 2 references instead of 1,
where both references use the same mvmode (new, near/est, zero). In the
case of newmv, this means that two MVs are coded instead of one. The
frame can be encoded in 3 ways: all MBs single-prediction, all MBs dual
prediction, or per-MB single/dual prediction selection ("hybrid"), in
which case a single bit is coded per-MB to indicate whether the MB uses
single or dual inter prediction.
In the future, we can (maybe?) get further gains by mixing this with
Adrian's 32x32 work, per-segment dual prediction settings, or adding
support for dual splitmv/8x8mv inter prediction.
Gain (on derf-set, CQ mode) is ~2.8% (SSIM) or ~3.6% (glb PSNR). Most
gain is at medium/high bitrates, but there's minor gains at low bitrates
also. Output was confirmed to match between encoder and decoder.
Note for optimization people: this patch introduces a 2nd version of
16x16/8x8 sixtap/bilin functions, which does an avg instead of a
store. They may want to look and make sure this is implemented to
their satisfaction so we can optimize it best in the future.
Change-ID: I59dc84b07cbb3ccf073ac0f756d03d294cb19281
2011-12-06 20:53:02 +01:00
|
|
|
if (xd->mode_info_context->mbmi.second_ref_frame)
|
|
|
|
{
|
|
|
|
vp8_build_2nd_inter16x16_predictors_mb(xd, xd->dst.y_buffer,
|
|
|
|
xd->dst.u_buffer, xd->dst.v_buffer,
|
|
|
|
xd->dst.y_stride, xd->dst.uv_stride);
|
|
|
|
}
|
2011-12-01 01:25:00 +01:00
|
|
|
}
|
2011-02-14 23:18:18 +01:00
|
|
|
#ifdef DEC_DEBUG
|
|
|
|
if (dec_debug) {
|
|
|
|
int i, j;
|
|
|
|
printf("Generating predictors\n");
|
|
|
|
for (i=0;i<16;i++) {
|
|
|
|
for (j=0;j<16;j++) printf("%3d ", xd->dst.y_buffer[i*xd->dst.y_stride+j]);
|
|
|
|
printf("\n");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
2011-12-01 01:25:00 +01:00
|
|
|
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
|
|
|
|
2011-12-07 22:03:57 +01:00
|
|
|
extern const int vp8_i8x8_block[4];
|
2011-05-02 15:30:51 +02:00
|
|
|
static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd,
|
|
|
|
unsigned int mb_idx)
|
2010-05-18 17:58:33 +02:00
|
|
|
{
|
2010-05-28 20:28:12 +02:00
|
|
|
int eobtotal = 0;
|
2011-08-08 10:56:20 +02:00
|
|
|
int throw_residual = 0;
|
2011-06-28 16:22:13 +02:00
|
|
|
MB_PREDICTION_MODE mode;
|
|
|
|
int i;
|
2010-05-28 20:28:12 +02:00
|
|
|
|
2011-11-04 19:29:51 +01:00
|
|
|
#if CONFIG_T8X8
|
Improved coding using 8x8 transform
In summary, this commit encompasses a series of changes in attempt to
improve the 8x8 transform based coding to help overall compression
quality, please refer to the detailed commit history below for what
are the rationale underly the series of changes:
a. A frame level flag to indicate if 8x8 transform is used at all.
b. 8x8 transform is not used for key frames and small image size.
c. On inter coded frame, macroblocks using modes B_PRED, SPLIT_MV
and I8X8_PRED are forced to using 4x4 transform based coding, the
rest uses 8x8 transform based coding.
d. Encoder and decoder has the same assumption on the relationship
between prediction modes and transform size, therefore no signaling
is encoded in bitstream.
e. Mode decision process now calculate the rate and distortion scores
using their respective transforms.
Overall test results:
1. HD set
http://www.corp.google.com/~yaowu/no_crawl/t8x8/HD_t8x8_20120206.html
(avg psnr: 3.09% glb psnr: 3.22%, ssim: 3.90%)
2. Cif set:
http://www.corp.google.com/~yaowu/no_crawl/t8x8/cif_t8x8_20120206.html
(avg psnr: -0.03%, glb psnr: -0.02%, ssim: -0.04%)
It should be noted here, as 8x8 transform coding itself is disabled
for cif size clips, the 0.03% loss is purely from the 1 bit/frame
flag overhead on if 8x8 transform is used or not for the frame.
---patch history for future reference---
Patch 1:
this commit tries to select transform size based on macroblock
prediction mode. If the size of a prediction mode is 16x16, then
the macroblock is forced to use 8x8 transform. If the prediction
mode is B_PRED, SPLITMV or I8X8_PRED, then the macroblock is forced
to use 4x4 transform. Tests on the following HD clips showed mixed
results: (all hd clips only used first 100 frames in the test)
http://www.corp.google.com/~yaowu/no_crawl/t8x8/hdmodebased8x8.html
http://www.corp.google.com/~yaowu/no_crawl/t8x8/hdmodebased8x8_log.html
while the results are mixed and overall negative, it is interesting to
see 8x8 helped a few of the clips.
Patch 2:
this patch tries to hard-wire selection of transform size based on
prediction modes without using segmentation to signal the transform size.
encoder and decoder both takes the same assumption that all macroblocks
use 8x8 transform except when prediciton mode is B_PRED, I8X8_PRED or
SPLITMV. Test results are as follows:
http://www.corp.google.com/~yaowu/no_crawl/t8x8/cifmodebase8x8_0125.html
http://www.corp.google.com/~yaowu/no_crawl/t8x8/hdmodebased8x8_0125log.html
Interestingly, by removing the overhead or coding the segmentation, the
results on this limited HD set have turn positive on average.
Patch 3:
this patch disabled the usage of 8x8 transform on key frames, and kept the
logic from patch 2 for inter frames only. test results on HD set turned
decidedly positive with 8x8 transform enabled on inter frame with 16x16
prediction modes: (avg psnr: .81% glb psnr: .82 ssim: .55%)
http://www.corp.google.com/~yaowu/no_crawl/t8x8/hdintermode8x8_0125.html
results on cif set still negative overall
Patch 4:
continued from last patch, but now in mode decision process, the rate and
distortion estimates are computed based on 8x8 transform results for MBs
with modes associated with 8x8 transform. This patch also fixed a problem
related to segment based eob coding when 8x8 transform is used. The patch
significantly improved the results on HD clips:
http://www.corp.google.com/~yaowu/no_crawl/t8x8/hd8x8RDintermode.html
(avg psnr: 2.70% glb psnr: 2.76% ssim: 3.34%)
results on cif also improved, though they are still negative compared to
baseline that uses 4x4 transform only:
http://www.corp.google.com/~yaowu/no_crawl/t8x8/cif8x8RDintermode.html
(avg psnr: -.78% glb psnr: -.86% ssim: -.19%)
Patch 5:
This patch does 3 things:
a. a bunch of decoder bug fixes, encodings and decodings were verified
to have matched recon buffer on a number of encodes on cif size mobile and
hd version of _pedestrian.
b. the patch further improved the rate distortion calculation of MBS that
use 8x8 transform. This provided some further gain on compression.
c. the patch also got the experimental work SEG_LVL_EOB to work with 8x8
transformed macroblock, test results indicates it improves the cif set
but hurt the HD set slightly.
Tests results on HD clips:
http://www.corp.google.com/~yaowu/no_crawl/t8x8/HD_t8x8_20120201.html
(avg psnr: 3.19% glb psnr: 3.30% ssim: 3.93%)
Test results on cif clips:
http://www.corp.google.com/~yaowu/no_crawl/t8x8/cif_t8x8_20120201.html
(avg psnr: -.47% glb psnr: -.51% ssim: +.28%)
Patch 6:
Added a frame level flag to indicate if 8x8 transform is allowed at all.
temporarily the decision is based on frame size, can be optimized later
one. This get the cif results to basically unchanged, with one bit per
frame overhead on both cif and hd clips.
Patch 8:
Rebase and Merge to head by PGW.
Fixed some suspect 4s that look like hey should be 64s in regard
to segmented EOB. Perhaps #defines would be bette.
Bulit and tested without T8x8 enabled and produces unchanged
output.
Patch 9:
Corrected misalligned code/decode of "txfm_mode" bit.
Limited testing for correct encode and decode with
T8x8 configured on derf clips.
Change-Id: I156e1405d25f81579d579dff8ab9af53944ec49c
2012-02-10 01:12:23 +01:00
|
|
|
int tx_type;
|
|
|
|
if( pbi->common.txfm_mode==ONLY_4X4 )
|
|
|
|
{
|
|
|
|
xd->mode_info_context->mbmi.txfm_size = TX_4X4;
|
|
|
|
}
|
|
|
|
else if( pbi->common.txfm_mode == ALLOW_8X8 )
|
|
|
|
{
|
|
|
|
if( xd->mode_info_context->mbmi.mode ==B_PRED
|
|
|
|
||xd->mode_info_context->mbmi.mode ==I8X8_PRED
|
|
|
|
||xd->mode_info_context->mbmi.mode ==SPLITMV)
|
|
|
|
xd->mode_info_context->mbmi.txfm_size = TX_4X4;
|
|
|
|
else
|
|
|
|
xd->mode_info_context->mbmi.txfm_size = TX_8X8;
|
|
|
|
}
|
|
|
|
|
|
|
|
tx_type = xd->mode_info_context->mbmi.txfm_size;
|
2011-11-04 19:29:51 +01:00
|
|
|
#endif
|
|
|
|
|
2010-08-12 22:25:43 +02:00
|
|
|
if (xd->mode_info_context->mbmi.mb_skip_coeff)
|
2010-05-28 20:28:12 +02:00
|
|
|
{
|
|
|
|
vp8_reset_mb_tokens_context(xd);
|
|
|
|
}
|
2011-09-06 14:34:36 +02:00
|
|
|
else if (!vp8dx_bool_error(xd->current_bc))
|
2010-05-28 20:28:12 +02:00
|
|
|
{
|
2011-02-14 23:18:18 +01:00
|
|
|
|
|
|
|
#if CONFIG_T8X8
|
|
|
|
for(i = 0; i < 25; i++)
|
|
|
|
{
|
|
|
|
xd->block[i].eob = 0;
|
|
|
|
xd->eobs[i] = 0;
|
|
|
|
}
|
2011-11-04 19:29:51 +01:00
|
|
|
if ( tx_type == TX_8X8 )
|
|
|
|
{
|
2011-02-14 23:18:18 +01:00
|
|
|
eobtotal = vp8_decode_mb_tokens_8x8(pbi, xd);
|
2011-11-04 19:29:51 +01:00
|
|
|
}
|
2011-02-14 23:18:18 +01:00
|
|
|
else
|
|
|
|
#endif
|
|
|
|
eobtotal = vp8_decode_mb_tokens(pbi, xd);
|
|
|
|
#ifdef DEC_DEBUG
|
|
|
|
if (dec_debug) {
|
|
|
|
printf("\nTokens (%d)\n", eobtotal);
|
|
|
|
for (i =0; i<400; i++) {
|
|
|
|
printf("%3d ", xd->qcoeff[i]);
|
|
|
|
if (i%16 == 15) printf("\n");
|
|
|
|
}
|
|
|
|
printf("\n");
|
|
|
|
}
|
|
|
|
#endif
|
2010-05-28 20:28:12 +02:00
|
|
|
}
|
|
|
|
|
2011-06-28 16:22:13 +02:00
|
|
|
mode = xd->mode_info_context->mbmi.mode;
|
|
|
|
|
2011-08-05 01:30:27 +02:00
|
|
|
if (eobtotal == 0 && mode != B_PRED && mode != SPLITMV
|
|
|
|
&& mode != I8X8_PRED
|
|
|
|
&&!vp8dx_bool_error(xd->current_bc)
|
|
|
|
)
|
2010-05-28 20:28:12 +02:00
|
|
|
{
|
2011-04-26 15:37:19 +02:00
|
|
|
/* Special case: Force the loopfilter to skip when eobtotal and
|
2011-07-20 23:21:24 +02:00
|
|
|
* mb_skip_coeff are zero.
|
|
|
|
* */
|
2011-04-26 15:37:19 +02:00
|
|
|
xd->mode_info_context->mbmi.mb_skip_coeff = 1;
|
|
|
|
|
2010-05-28 20:28:12 +02:00
|
|
|
skip_recon_mb(pbi, xd);
|
|
|
|
return;
|
|
|
|
}
|
2011-07-20 23:21:24 +02:00
|
|
|
|
2011-12-01 01:25:00 +01:00
|
|
|
#ifdef DEC_DEBUG
|
|
|
|
if (dec_debug) {
|
|
|
|
int i, j;
|
|
|
|
printf("Generating predictors\n");
|
|
|
|
for (i=0;i<16;i++) {
|
|
|
|
for (j=0;j<16;j++) printf("%3d ", xd->dst.y_buffer[i*xd->dst.y_stride+j]);
|
|
|
|
printf("\n");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
|
2010-05-28 20:28:12 +02:00
|
|
|
if (xd->segmentation_enabled)
|
|
|
|
mb_init_dequantizer(pbi, xd);
|
|
|
|
|
2010-10-28 01:04:02 +02:00
|
|
|
/* do prediction */
|
2011-04-21 20:59:42 +02:00
|
|
|
if (xd->mode_info_context->mbmi.ref_frame == INTRA_FRAME)
|
2010-05-18 17:58:33 +02:00
|
|
|
{
|
2011-08-05 01:30:27 +02:00
|
|
|
if(mode != I8X8_PRED)
|
|
|
|
{
|
2011-12-07 22:03:57 +01:00
|
|
|
RECON_INVOKE(&pbi->common.rtcd.recon, build_intra_predictors_mbuv)(xd);
|
|
|
|
if (mode != B_PRED)
|
|
|
|
{
|
|
|
|
RECON_INVOKE(&pbi->common.rtcd.recon,
|
|
|
|
build_intra_predictors_mby)(xd);
|
|
|
|
} else {
|
2012-02-02 18:04:40 +01:00
|
|
|
#if !CONFIG_SUPERBLOCKS
|
2011-12-07 22:03:57 +01:00
|
|
|
vp8_intra_prediction_down_copy(xd);
|
2012-02-02 18:04:40 +01:00
|
|
|
#endif
|
2011-12-07 22:03:57 +01:00
|
|
|
}
|
2011-08-05 01:30:27 +02:00
|
|
|
}
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
vp8_build_inter_predictors_mb(xd);
|
|
|
|
}
|
2011-08-08 10:56:20 +02:00
|
|
|
/* When we have independent partitions we can apply residual even
|
|
|
|
* though other partitions within the frame are corrupt.
|
|
|
|
*/
|
|
|
|
throw_residual = (!pbi->independent_partitions &&
|
|
|
|
pbi->frame_corrupt_residual);
|
|
|
|
throw_residual = (throw_residual || vp8dx_bool_error(xd->current_bc));
|
|
|
|
|
2011-05-02 15:30:51 +02:00
|
|
|
#if CONFIG_ERROR_CONCEALMENT
|
2011-08-08 10:56:20 +02:00
|
|
|
if (pbi->ec_active &&
|
|
|
|
(mb_idx >= pbi->mvs_corrupt_from_mb || throw_residual))
|
2011-05-02 15:30:51 +02:00
|
|
|
{
|
|
|
|
/* MB with corrupt residuals or corrupt mode/motion vectors.
|
2011-07-20 23:21:24 +02:00
|
|
|
* Better to use the predictor as reconstruction.
|
|
|
|
*/
|
2011-08-08 10:56:20 +02:00
|
|
|
pbi->frame_corrupt_residual = 1;
|
2011-06-16 11:44:50 +02:00
|
|
|
vpx_memset(xd->qcoeff, 0, sizeof(xd->qcoeff));
|
2011-05-02 15:30:51 +02:00
|
|
|
vp8_conceal_corrupt_mb(xd);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2010-10-28 01:04:02 +02:00
|
|
|
/* dequantization and idct */
|
2011-08-05 01:30:27 +02:00
|
|
|
if (mode == I8X8_PRED)
|
|
|
|
{
|
|
|
|
for (i = 0; i < 4; i++)
|
|
|
|
{
|
|
|
|
int ib = vp8_i8x8_block[i];
|
|
|
|
const int iblock[4]={0,1,4,5};
|
|
|
|
int j;
|
|
|
|
int i8x8mode;
|
|
|
|
BLOCKD *b;
|
|
|
|
|
|
|
|
b = &xd->block[ib];
|
|
|
|
i8x8mode= b->bmi.as_mode;
|
|
|
|
RECON_INVOKE(RTCD_VTABLE(recon), intra8x8_predict)
|
|
|
|
(b, i8x8mode, b->predictor);
|
|
|
|
|
|
|
|
for(j = 0; j < 4; j++)
|
|
|
|
{
|
|
|
|
b = &xd->block[ib+iblock[j]];
|
|
|
|
if (xd->eobs[ib+iblock[j]] > 1)
|
|
|
|
{
|
|
|
|
DEQUANT_INVOKE(&pbi->dequant, idct_add)
|
|
|
|
(b->qcoeff, b->dequant, b->predictor,
|
|
|
|
*(b->base_dst) + b->dst, 16, b->dst_stride);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
IDCT_INVOKE(RTCD_VTABLE(idct), idct1_scalar_add)
|
|
|
|
(b->qcoeff[0] * b->dequant[0], b->predictor,
|
|
|
|
*(b->base_dst) + b->dst, 16, b->dst_stride);
|
|
|
|
((int *)b->qcoeff)[0] = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
b = &xd->block[16+i];
|
|
|
|
RECON_INVOKE(RTCD_VTABLE(recon), intra_uv4x4_predict)
|
|
|
|
(b, i8x8mode, b->predictor);
|
|
|
|
DEQUANT_INVOKE(&pbi->dequant, idct_add)
|
|
|
|
(b->qcoeff, b->dequant, b->predictor,
|
|
|
|
*(b->base_dst) + b->dst, 8, b->dst_stride);
|
|
|
|
b = &xd->block[20+i];
|
|
|
|
RECON_INVOKE(RTCD_VTABLE(recon), intra_uv4x4_predict)
|
|
|
|
(b, i8x8mode, b->predictor);
|
|
|
|
DEQUANT_INVOKE(&pbi->dequant, idct_add)
|
|
|
|
(b->qcoeff, b->dequant, b->predictor,
|
|
|
|
*(b->base_dst) + b->dst, 8, b->dst_stride);
|
|
|
|
}
|
|
|
|
}
|
2011-12-07 22:03:57 +01:00
|
|
|
else if (mode == B_PRED)
|
2010-05-18 17:58:33 +02:00
|
|
|
{
|
2010-05-28 20:28:12 +02:00
|
|
|
for (i = 0; i < 16; i++)
|
2010-05-18 17:58:33 +02:00
|
|
|
{
|
2010-05-28 20:28:12 +02:00
|
|
|
BLOCKD *b = &xd->block[i];
|
2011-08-24 20:42:26 +02:00
|
|
|
int b_mode = xd->mode_info_context->bmi[i].as_mode;
|
|
|
|
|
2011-04-27 19:05:10 +02:00
|
|
|
RECON_INVOKE(RTCD_VTABLE(recon), intra4x4_predict)
|
2011-08-24 20:42:26 +02:00
|
|
|
(b, b_mode, b->predictor);
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2010-08-20 19:58:19 +02:00
|
|
|
if (xd->eobs[i] > 1)
|
2010-05-18 17:58:33 +02:00
|
|
|
{
|
2010-08-20 19:58:19 +02:00
|
|
|
DEQUANT_INVOKE(&pbi->dequant, idct_add)
|
2010-10-22 02:04:30 +02:00
|
|
|
(b->qcoeff, b->dequant, b->predictor,
|
2010-08-20 19:58:19 +02:00
|
|
|
*(b->base_dst) + b->dst, 16, b->dst_stride);
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2010-08-20 19:58:19 +02:00
|
|
|
IDCT_INVOKE(RTCD_VTABLE(idct), idct1_scalar_add)
|
2010-10-22 02:04:30 +02:00
|
|
|
(b->qcoeff[0] * b->dequant[0], b->predictor,
|
2010-08-20 19:58:19 +02:00
|
|
|
*(b->base_dst) + b->dst, 16, b->dst_stride);
|
2010-05-18 17:58:33 +02:00
|
|
|
((int *)b->qcoeff)[0] = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2011-06-28 16:22:13 +02:00
|
|
|
else if (mode == SPLITMV)
|
2010-05-18 17:58:33 +02:00
|
|
|
{
|
2011-11-11 02:15:06 +01:00
|
|
|
DEQUANT_INVOKE (&pbi->dequant, idct_add_y_block)
|
|
|
|
(xd->qcoeff, xd->block[0].dequant,
|
|
|
|
xd->predictor, xd->dst.y_buffer,
|
|
|
|
xd->dst.y_stride, xd->eobs);
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
2011-06-28 16:22:13 +02:00
|
|
|
else
|
|
|
|
{
|
|
|
|
BLOCKD *b = &xd->block[24];
|
|
|
|
|
2011-02-14 23:18:18 +01:00
|
|
|
#if CONFIG_T8X8
|
2011-11-04 19:29:51 +01:00
|
|
|
if( tx_type == TX_8X8 )
|
2011-06-28 16:22:13 +02:00
|
|
|
{
|
2011-11-10 21:54:22 +01:00
|
|
|
DEQUANT_INVOKE(&pbi->dequant, block_2x2)(b);
|
2011-02-14 23:18:18 +01:00
|
|
|
#ifdef DEC_DEBUG
|
|
|
|
if (dec_debug)
|
|
|
|
{
|
|
|
|
int j;
|
|
|
|
printf("DQcoeff Haar\n");
|
|
|
|
for (j=0;j<16;j++) {
|
|
|
|
printf("%d ", b->dqcoeff[j]);
|
|
|
|
}
|
|
|
|
printf("\n");
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
IDCT_INVOKE(RTCD_VTABLE(idct), ihaar2)(&b->dqcoeff[0], b->diff, 8);
|
|
|
|
((int *)b->qcoeff)[0] = 0;//2nd order block are set to 0 after inverse transform
|
2011-06-28 16:22:13 +02:00
|
|
|
((int *)b->qcoeff)[1] = 0;
|
|
|
|
((int *)b->qcoeff)[2] = 0;
|
|
|
|
((int *)b->qcoeff)[3] = 0;
|
|
|
|
((int *)b->qcoeff)[4] = 0;
|
|
|
|
((int *)b->qcoeff)[5] = 0;
|
|
|
|
((int *)b->qcoeff)[6] = 0;
|
|
|
|
((int *)b->qcoeff)[7] = 0;
|
2011-02-14 23:18:18 +01:00
|
|
|
DEQUANT_INVOKE (&pbi->dequant, dc_idct_add_y_block_8x8)
|
|
|
|
(xd->qcoeff, xd->block[0].dequant,
|
|
|
|
xd->predictor, xd->dst.y_buffer,
|
|
|
|
xd->dst.y_stride, xd->eobs, xd->block[24].diff, xd);
|
|
|
|
|
2011-06-28 16:22:13 +02:00
|
|
|
}
|
2011-02-14 23:18:18 +01:00
|
|
|
|
2011-06-28 16:22:13 +02:00
|
|
|
else
|
2011-02-14 23:18:18 +01:00
|
|
|
#endif
|
2011-10-09 00:48:53 +02:00
|
|
|
{
|
2011-11-11 02:15:06 +01:00
|
|
|
DEQUANT_INVOKE(&pbi->dequant, block)(b);
|
2011-02-14 23:18:18 +01:00
|
|
|
if (xd->eobs[24] > 1)
|
|
|
|
{
|
|
|
|
IDCT_INVOKE(RTCD_VTABLE(idct), iwalsh16)(&b->dqcoeff[0], b->diff);
|
|
|
|
((int *)b->qcoeff)[0] = 0;
|
|
|
|
((int *)b->qcoeff)[1] = 0;
|
|
|
|
((int *)b->qcoeff)[2] = 0;
|
|
|
|
((int *)b->qcoeff)[3] = 0;
|
|
|
|
((int *)b->qcoeff)[4] = 0;
|
|
|
|
((int *)b->qcoeff)[5] = 0;
|
|
|
|
((int *)b->qcoeff)[6] = 0;
|
|
|
|
((int *)b->qcoeff)[7] = 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
IDCT_INVOKE(RTCD_VTABLE(idct), iwalsh1)(&b->dqcoeff[0], b->diff);
|
|
|
|
((int *)b->qcoeff)[0] = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
DEQUANT_INVOKE (&pbi->dequant, dc_idct_add_y_block)
|
|
|
|
(xd->qcoeff, xd->block[0].dequant,
|
|
|
|
xd->predictor, xd->dst.y_buffer,
|
|
|
|
xd->dst.y_stride, xd->eobs, xd->block[24].diff);
|
2011-10-09 00:48:53 +02:00
|
|
|
}
|
2011-02-14 23:18:18 +01:00
|
|
|
}
|
|
|
|
#if CONFIG_T8X8
|
2011-11-04 19:29:51 +01:00
|
|
|
if( tx_type == TX_8X8 )
|
2011-02-14 23:18:18 +01:00
|
|
|
{
|
|
|
|
DEQUANT_INVOKE (&pbi->dequant, idct_add_uv_block_8x8)//
|
|
|
|
(xd->qcoeff+16*16, xd->block[16].dequant,
|
|
|
|
xd->predictor+16*16, xd->dst.u_buffer, xd->dst.v_buffer,
|
|
|
|
xd->dst.uv_stride, xd->eobs+16, xd);//
|
|
|
|
|
|
|
|
}
|
|
|
|
else
|
|
|
|
#endif
|
2011-08-05 01:30:27 +02:00
|
|
|
if(xd->mode_info_context->mbmi.mode!=I8X8_PRED)
|
2011-12-07 22:03:57 +01:00
|
|
|
DEQUANT_INVOKE (&pbi->dequant, idct_add_uv_block)
|
|
|
|
(xd->qcoeff+16*16, xd->block[16].dequant,
|
|
|
|
xd->predictor+16*16, xd->dst.u_buffer, xd->dst.v_buffer,
|
|
|
|
xd->dst.uv_stride, xd->eobs+16);
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2011-07-20 23:21:24 +02:00
|
|
|
}
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2010-09-16 20:08:52 +02:00
|
|
|
|
2010-05-18 17:58:33 +02:00
|
|
|
static int get_delta_q(vp8_reader *bc, int prev, int *q_update)
|
|
|
|
{
|
|
|
|
int ret_val = 0;
|
|
|
|
|
|
|
|
if (vp8_read_bit(bc))
|
|
|
|
{
|
|
|
|
ret_val = vp8_read_literal(bc, 4);
|
|
|
|
|
|
|
|
if (vp8_read_bit(bc))
|
|
|
|
ret_val = -ret_val;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Trigger a quantizer update if the delta-q value has changed */
|
|
|
|
if (ret_val != prev)
|
|
|
|
*q_update = 1;
|
|
|
|
|
|
|
|
return ret_val;
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef PACKET_TESTING
|
|
|
|
#include <stdio.h>
|
|
|
|
FILE *vpxlog = 0;
|
|
|
|
#endif
|
|
|
|
|
2012-02-02 18:04:40 +01:00
|
|
|
#if CONFIG_SUPERBLOCKS
|
|
|
|
static void
|
|
|
|
decode_sb_row(VP8D_COMP *pbi, VP8_COMMON *pc, int mbrow, MACROBLOCKD *xd)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
int recon_yoffset, recon_uvoffset;
|
|
|
|
int mb_row, mb_col;
|
|
|
|
int ref_fb_idx = pc->lst_fb_idx;
|
|
|
|
int dst_fb_idx = pc->new_fb_idx;
|
|
|
|
int recon_y_stride = pc->yv12_fb[ref_fb_idx].y_stride;
|
|
|
|
int recon_uv_stride = pc->yv12_fb[ref_fb_idx].uv_stride;
|
|
|
|
int sb_col;
|
|
|
|
int row_delta[4] = { 0, +1, 0, -1};
|
|
|
|
int col_delta[4] = {+1, -1, +1, +1};
|
|
|
|
int sb_cols = (pc->mb_cols + 1)>>1;
|
|
|
|
ENTROPY_CONTEXT_PLANES left_context[2];
|
|
|
|
|
|
|
|
vpx_memset(left_context, 0, sizeof(left_context));
|
|
|
|
|
|
|
|
mb_row = mbrow;
|
|
|
|
mb_col = 0;
|
|
|
|
|
|
|
|
for (sb_col=0; sb_col<sb_cols; sb_col++)
|
|
|
|
{
|
|
|
|
for ( i=0; i<4; i++ )
|
|
|
|
{
|
|
|
|
int dy = row_delta[i];
|
|
|
|
int dx = col_delta[i];
|
|
|
|
int offset_extended = dy * xd->mode_info_stride + dx;
|
|
|
|
|
|
|
|
if ((mb_row >= pc->mb_rows) || (mb_col >= pc->mb_cols))
|
|
|
|
{
|
|
|
|
// Skip on to the next MB
|
|
|
|
mb_row += dy;
|
|
|
|
mb_col += dx;
|
|
|
|
xd->mode_info_context += offset_extended;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Copy in the appropriate left context
|
|
|
|
vpx_memcpy (&pc->left_context,
|
|
|
|
&left_context[(i>>1) & 0x1],
|
|
|
|
sizeof(ENTROPY_CONTEXT_PLANES));
|
|
|
|
|
|
|
|
// reset above block coeffs
|
|
|
|
xd->above_context = pc->above_context + mb_col;
|
|
|
|
|
|
|
|
/* Distance of Mb to the various image edges.
|
|
|
|
* These are specified to 8th pel as they are always compared to
|
|
|
|
* values that are in 1/8th pel units
|
|
|
|
*/
|
|
|
|
xd->mb_to_top_edge = -((mb_row * 16)) << 3;
|
|
|
|
xd->mb_to_bottom_edge = ((pc->mb_rows - 1 - mb_row) * 16) << 3;
|
|
|
|
|
|
|
|
xd->mb_to_left_edge = -((mb_col * 16) << 3);
|
|
|
|
xd->mb_to_right_edge = ((pc->mb_cols - 1 - mb_col) * 16) << 3;
|
|
|
|
|
|
|
|
xd->up_available = (mb_row != 0);
|
|
|
|
xd->left_available = (mb_col != 0);
|
|
|
|
|
|
|
|
#if CONFIG_ERROR_CONCEALMENT
|
|
|
|
{
|
|
|
|
int corrupt_residual = (!pbi->independent_partitions &&
|
|
|
|
pbi->frame_corrupt_residual) ||
|
|
|
|
vp8dx_bool_error(xd->current_bc);
|
|
|
|
if (pbi->ec_active &&
|
|
|
|
xd->mode_info_context->mbmi.ref_frame == INTRA_FRAME &&
|
|
|
|
corrupt_residual)
|
|
|
|
{
|
|
|
|
/* We have an intra block with corrupt coefficients, better
|
|
|
|
* to conceal with an inter block. Interpolate MVs from
|
|
|
|
* neighboring MBs.
|
|
|
|
*
|
|
|
|
* Note that for the first mb with corrupt residual in a
|
|
|
|
* frame, we might not discover that before decoding the
|
|
|
|
* residual. That happens after this check, and therefore
|
|
|
|
* no inter concealment will be done.
|
|
|
|
*/
|
|
|
|
vp8_interpolate_motion(xd,
|
|
|
|
mb_row, mb_col,
|
|
|
|
pc->mb_rows, pc->mb_cols,
|
|
|
|
pc->mode_info_stride);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
update_blockd_bmi(xd);
|
|
|
|
|
|
|
|
recon_yoffset = (mb_row * recon_y_stride * 16) + (mb_col * 16);
|
|
|
|
recon_uvoffset = (mb_row * recon_uv_stride * 8) + (mb_col * 8);
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2012-02-02 18:04:40 +01:00
|
|
|
xd->dst.y_buffer = pc->yv12_fb[dst_fb_idx].y_buffer + recon_yoffset;
|
|
|
|
xd->dst.u_buffer = pc->yv12_fb[dst_fb_idx].u_buffer + recon_uvoffset;
|
|
|
|
xd->dst.v_buffer = pc->yv12_fb[dst_fb_idx].v_buffer + recon_uvoffset;
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2012-02-02 18:04:40 +01:00
|
|
|
/* Select the appropriate reference frame for this MB */
|
|
|
|
if (xd->mode_info_context->mbmi.ref_frame == LAST_FRAME)
|
|
|
|
ref_fb_idx = pc->lst_fb_idx;
|
|
|
|
else if (xd->mode_info_context->mbmi.ref_frame == GOLDEN_FRAME)
|
|
|
|
ref_fb_idx = pc->gld_fb_idx;
|
|
|
|
else
|
|
|
|
ref_fb_idx = pc->alt_fb_idx;
|
|
|
|
|
|
|
|
xd->pre.y_buffer = pc->yv12_fb[ref_fb_idx].y_buffer +recon_yoffset;
|
|
|
|
xd->pre.u_buffer = pc->yv12_fb[ref_fb_idx].u_buffer +recon_uvoffset;
|
|
|
|
xd->pre.v_buffer = pc->yv12_fb[ref_fb_idx].v_buffer +recon_uvoffset;
|
|
|
|
|
|
|
|
if (xd->mode_info_context->mbmi.second_ref_frame)
|
|
|
|
{
|
|
|
|
int second_ref_fb_idx;
|
|
|
|
|
|
|
|
/* Select the appropriate reference frame for this MB */
|
|
|
|
if (xd->mode_info_context->mbmi.second_ref_frame == LAST_FRAME)
|
|
|
|
second_ref_fb_idx = pc->lst_fb_idx;
|
|
|
|
else if (xd->mode_info_context->mbmi.second_ref_frame ==
|
|
|
|
GOLDEN_FRAME)
|
|
|
|
second_ref_fb_idx = pc->gld_fb_idx;
|
|
|
|
else
|
|
|
|
second_ref_fb_idx = pc->alt_fb_idx;
|
|
|
|
|
|
|
|
xd->second_pre.y_buffer =
|
|
|
|
pc->yv12_fb[second_ref_fb_idx].y_buffer + recon_yoffset;
|
|
|
|
xd->second_pre.u_buffer =
|
|
|
|
pc->yv12_fb[second_ref_fb_idx].u_buffer + recon_uvoffset;
|
|
|
|
xd->second_pre.v_buffer =
|
|
|
|
pc->yv12_fb[second_ref_fb_idx].v_buffer + recon_uvoffset;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (xd->mode_info_context->mbmi.ref_frame != INTRA_FRAME)
|
|
|
|
{
|
|
|
|
/* propagate errors from reference frames */
|
|
|
|
xd->corrupted |= pc->yv12_fb[ref_fb_idx].corrupted;
|
|
|
|
}
|
|
|
|
|
|
|
|
decode_macroblock(pbi, xd, mb_row * pc->mb_cols + mb_col);
|
|
|
|
|
|
|
|
/* check if the boolean decoder has suffered an error */
|
|
|
|
xd->corrupted |= vp8dx_bool_error(xd->current_bc);
|
|
|
|
|
|
|
|
// Copy in the appropriate left context
|
|
|
|
vpx_memcpy (&left_context[(i>>1) & 0x1],
|
|
|
|
&pc->left_context,
|
|
|
|
sizeof(ENTROPY_CONTEXT_PLANES));
|
|
|
|
|
|
|
|
// skip to next MB
|
|
|
|
xd->mode_info_context += offset_extended;
|
|
|
|
mb_row += dy;
|
|
|
|
mb_col += dx;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* skip prediction column */
|
|
|
|
xd->mode_info_context += 1 - (pc->mb_cols & 0x1) + xd->mode_info_stride;
|
|
|
|
}
|
|
|
|
#else
|
2011-03-17 22:07:59 +01:00
|
|
|
static void
|
|
|
|
decode_mb_row(VP8D_COMP *pbi, VP8_COMMON *pc, int mb_row, MACROBLOCKD *xd)
|
2010-05-18 17:58:33 +02:00
|
|
|
{
|
|
|
|
int recon_yoffset, recon_uvoffset;
|
|
|
|
int mb_col;
|
2010-07-22 14:07:32 +02:00
|
|
|
int ref_fb_idx = pc->lst_fb_idx;
|
|
|
|
int dst_fb_idx = pc->new_fb_idx;
|
|
|
|
int recon_y_stride = pc->yv12_fb[ref_fb_idx].y_stride;
|
|
|
|
int recon_uv_stride = pc->yv12_fb[ref_fb_idx].uv_stride;
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2010-08-31 16:49:57 +02:00
|
|
|
vpx_memset(&pc->left_context, 0, sizeof(pc->left_context));
|
2010-05-18 17:58:33 +02:00
|
|
|
recon_yoffset = mb_row * recon_y_stride * 16;
|
|
|
|
recon_uvoffset = mb_row * recon_uv_stride * 8;
|
2010-10-28 01:04:02 +02:00
|
|
|
/* reset above block coeffs */
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2010-08-31 16:49:57 +02:00
|
|
|
xd->above_context = pc->above_context;
|
2010-05-18 17:58:33 +02:00
|
|
|
xd->up_available = (mb_row != 0);
|
|
|
|
|
|
|
|
xd->mb_to_top_edge = -((mb_row * 16)) << 3;
|
|
|
|
xd->mb_to_bottom_edge = ((pc->mb_rows - 1 - mb_row) * 16) << 3;
|
|
|
|
|
|
|
|
for (mb_col = 0; mb_col < pc->mb_cols; mb_col++)
|
|
|
|
{
|
2011-05-02 15:30:51 +02:00
|
|
|
/* Distance of Mb to the various image edges.
|
|
|
|
* These are specified to 8th pel as they are always compared to values
|
|
|
|
* that are in 1/8th pel units
|
|
|
|
*/
|
|
|
|
xd->mb_to_left_edge = -((mb_col * 16) << 3);
|
|
|
|
xd->mb_to_right_edge = ((pc->mb_cols - 1 - mb_col) * 16) << 3;
|
|
|
|
|
|
|
|
#if CONFIG_ERROR_CONCEALMENT
|
|
|
|
{
|
2011-08-08 10:56:20 +02:00
|
|
|
int corrupt_residual = (!pbi->independent_partitions &&
|
|
|
|
pbi->frame_corrupt_residual) ||
|
|
|
|
vp8dx_bool_error(xd->current_bc);
|
|
|
|
if (pbi->ec_active &&
|
|
|
|
xd->mode_info_context->mbmi.ref_frame == INTRA_FRAME &&
|
|
|
|
corrupt_residual)
|
|
|
|
{
|
|
|
|
/* We have an intra block with corrupt coefficients, better to
|
|
|
|
* conceal with an inter block. Interpolate MVs from neighboring
|
|
|
|
* MBs.
|
|
|
|
*
|
|
|
|
* Note that for the first mb with corrupt residual in a frame,
|
|
|
|
* we might not discover that before decoding the residual. That
|
|
|
|
* happens after this check, and therefore no inter concealment
|
|
|
|
* will be done.
|
|
|
|
*/
|
|
|
|
vp8_interpolate_motion(xd,
|
|
|
|
mb_row, mb_col,
|
|
|
|
pc->mb_rows, pc->mb_cols,
|
|
|
|
pc->mode_info_stride);
|
|
|
|
}
|
2011-05-02 15:30:51 +02:00
|
|
|
}
|
|
|
|
#endif
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2011-08-05 01:30:27 +02:00
|
|
|
update_blockd_bmi(xd);
|
2011-12-07 22:03:57 +01:00
|
|
|
|
2010-07-22 14:07:32 +02:00
|
|
|
xd->dst.y_buffer = pc->yv12_fb[dst_fb_idx].y_buffer + recon_yoffset;
|
|
|
|
xd->dst.u_buffer = pc->yv12_fb[dst_fb_idx].u_buffer + recon_uvoffset;
|
|
|
|
xd->dst.v_buffer = pc->yv12_fb[dst_fb_idx].v_buffer + recon_uvoffset;
|
2010-05-18 17:58:33 +02:00
|
|
|
|
|
|
|
xd->left_available = (mb_col != 0);
|
|
|
|
|
2010-10-28 01:04:02 +02:00
|
|
|
/* Select the appropriate reference frame for this MB */
|
2010-08-12 22:25:43 +02:00
|
|
|
if (xd->mode_info_context->mbmi.ref_frame == LAST_FRAME)
|
2010-07-22 14:07:32 +02:00
|
|
|
ref_fb_idx = pc->lst_fb_idx;
|
2010-08-12 22:25:43 +02:00
|
|
|
else if (xd->mode_info_context->mbmi.ref_frame == GOLDEN_FRAME)
|
2010-07-22 14:07:32 +02:00
|
|
|
ref_fb_idx = pc->gld_fb_idx;
|
2010-05-18 17:58:33 +02:00
|
|
|
else
|
2010-07-22 14:07:32 +02:00
|
|
|
ref_fb_idx = pc->alt_fb_idx;
|
|
|
|
|
|
|
|
xd->pre.y_buffer = pc->yv12_fb[ref_fb_idx].y_buffer + recon_yoffset;
|
|
|
|
xd->pre.u_buffer = pc->yv12_fb[ref_fb_idx].u_buffer + recon_uvoffset;
|
|
|
|
xd->pre.v_buffer = pc->yv12_fb[ref_fb_idx].v_buffer + recon_uvoffset;
|
2010-05-18 17:58:33 +02:00
|
|
|
|
Dual 16x16 inter prediction.
This patch introduces the concept of dual inter16x16 prediction. A
16x16 inter-predicted macroblock can use 2 references instead of 1,
where both references use the same mvmode (new, near/est, zero). In the
case of newmv, this means that two MVs are coded instead of one. The
frame can be encoded in 3 ways: all MBs single-prediction, all MBs dual
prediction, or per-MB single/dual prediction selection ("hybrid"), in
which case a single bit is coded per-MB to indicate whether the MB uses
single or dual inter prediction.
In the future, we can (maybe?) get further gains by mixing this with
Adrian's 32x32 work, per-segment dual prediction settings, or adding
support for dual splitmv/8x8mv inter prediction.
Gain (on derf-set, CQ mode) is ~2.8% (SSIM) or ~3.6% (glb PSNR). Most
gain is at medium/high bitrates, but there's minor gains at low bitrates
also. Output was confirmed to match between encoder and decoder.
Note for optimization people: this patch introduces a 2nd version of
16x16/8x8 sixtap/bilin functions, which does an avg instead of a
store. They may want to look and make sure this is implemented to
their satisfaction so we can optimize it best in the future.
Change-ID: I59dc84b07cbb3ccf073ac0f756d03d294cb19281
2011-12-06 20:53:02 +01:00
|
|
|
if (xd->mode_info_context->mbmi.second_ref_frame)
|
|
|
|
{
|
|
|
|
int second_ref_fb_idx;
|
|
|
|
|
|
|
|
/* Select the appropriate reference frame for this MB */
|
|
|
|
if (xd->mode_info_context->mbmi.second_ref_frame == LAST_FRAME)
|
|
|
|
second_ref_fb_idx = pc->lst_fb_idx;
|
|
|
|
else if (xd->mode_info_context->mbmi.second_ref_frame == GOLDEN_FRAME)
|
|
|
|
second_ref_fb_idx = pc->gld_fb_idx;
|
|
|
|
else
|
|
|
|
second_ref_fb_idx = pc->alt_fb_idx;
|
|
|
|
|
|
|
|
xd->second_pre.y_buffer = pc->yv12_fb[second_ref_fb_idx].y_buffer + recon_yoffset;
|
|
|
|
xd->second_pre.u_buffer = pc->yv12_fb[second_ref_fb_idx].u_buffer + recon_uvoffset;
|
|
|
|
xd->second_pre.v_buffer = pc->yv12_fb[second_ref_fb_idx].v_buffer + recon_uvoffset;
|
|
|
|
}
|
|
|
|
|
2010-12-16 16:46:31 +01:00
|
|
|
if (xd->mode_info_context->mbmi.ref_frame != INTRA_FRAME)
|
|
|
|
{
|
|
|
|
/* propagate errors from reference frames */
|
|
|
|
xd->corrupted |= pc->yv12_fb[ref_fb_idx].corrupted;
|
|
|
|
}
|
|
|
|
|
2011-02-14 23:18:18 +01:00
|
|
|
#ifdef DEC_DEBUG
|
2011-12-01 01:25:00 +01:00
|
|
|
dec_debug = (pc->current_video_frame==1 && mb_row==4 && mb_col==0);
|
2011-02-14 23:18:18 +01:00
|
|
|
#endif
|
2011-05-02 15:30:51 +02:00
|
|
|
decode_macroblock(pbi, xd, mb_row * pc->mb_cols + mb_col);
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2010-12-16 16:46:31 +01:00
|
|
|
/* check if the boolean decoder has suffered an error */
|
|
|
|
xd->corrupted |= vp8dx_bool_error(xd->current_bc);
|
2010-05-18 17:58:33 +02:00
|
|
|
recon_yoffset += 16;
|
|
|
|
recon_uvoffset += 8;
|
|
|
|
|
|
|
|
++xd->mode_info_context; /* next mb */
|
|
|
|
|
2010-08-31 16:49:57 +02:00
|
|
|
xd->above_context++;
|
2010-05-18 17:58:33 +02:00
|
|
|
|
|
|
|
}
|
|
|
|
|
2010-10-28 01:04:02 +02:00
|
|
|
/* adjust to the next row of mbs */
|
2010-05-18 17:58:33 +02:00
|
|
|
vp8_extend_mb_row(
|
2010-07-22 14:07:32 +02:00
|
|
|
&pc->yv12_fb[dst_fb_idx],
|
2010-05-18 17:58:33 +02:00
|
|
|
xd->dst.y_buffer + 16, xd->dst.u_buffer + 8, xd->dst.v_buffer + 8
|
|
|
|
);
|
|
|
|
|
|
|
|
++xd->mode_info_context; /* skip prediction column */
|
|
|
|
}
|
2012-02-02 18:04:40 +01:00
|
|
|
#endif // CONFIG_SUPERBLOCKS
|
2010-05-18 17:58:33 +02:00
|
|
|
|
|
|
|
static unsigned int read_partition_size(const unsigned char *cx_size)
|
|
|
|
{
|
|
|
|
const unsigned int size =
|
|
|
|
cx_size[0] + (cx_size[1] << 8) + (cx_size[2] << 16);
|
|
|
|
return size;
|
|
|
|
}
|
|
|
|
|
2011-06-13 16:42:27 +02:00
|
|
|
static void setup_token_decoder_partition_input(VP8D_COMP *pbi)
|
|
|
|
{
|
|
|
|
vp8_reader *bool_decoder = &pbi->bc2;
|
|
|
|
int part_idx = 1;
|
2011-09-06 14:34:36 +02:00
|
|
|
int num_token_partitions;
|
2011-06-13 16:42:27 +02:00
|
|
|
|
|
|
|
TOKEN_PARTITION multi_token_partition =
|
|
|
|
(TOKEN_PARTITION)vp8_read_literal(&pbi->bc, 2);
|
2011-09-06 14:34:36 +02:00
|
|
|
if (!vp8dx_bool_error(&pbi->bc))
|
|
|
|
pbi->common.multi_token_partition = multi_token_partition;
|
|
|
|
num_token_partitions = 1 << pbi->common.multi_token_partition;
|
|
|
|
if (num_token_partitions + 1 > pbi->num_partitions)
|
|
|
|
vpx_internal_error(&pbi->common.error, VPX_CODEC_CORRUPT_FRAME,
|
|
|
|
"Partitions missing");
|
2011-06-13 16:42:27 +02:00
|
|
|
assert(vp8dx_bool_error(&pbi->bc) ||
|
|
|
|
multi_token_partition == pbi->common.multi_token_partition);
|
|
|
|
if (pbi->num_partitions > 2)
|
|
|
|
{
|
|
|
|
CHECK_MEM_ERROR(pbi->mbc, vpx_malloc((pbi->num_partitions - 1) *
|
|
|
|
sizeof(vp8_reader)));
|
|
|
|
bool_decoder = pbi->mbc;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (; part_idx < pbi->num_partitions; ++part_idx)
|
|
|
|
{
|
|
|
|
if (vp8dx_start_decode(bool_decoder,
|
|
|
|
pbi->partitions[part_idx],
|
|
|
|
pbi->partition_sizes[part_idx]))
|
|
|
|
vpx_internal_error(&pbi->common.error, VPX_CODEC_MEM_ERROR,
|
|
|
|
"Failed to allocate bool decoder %d",
|
|
|
|
part_idx);
|
|
|
|
|
|
|
|
bool_decoder++;
|
|
|
|
}
|
|
|
|
}
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2011-08-05 18:27:25 +02:00
|
|
|
|
|
|
|
static int read_is_valid(const unsigned char *start,
|
|
|
|
size_t len,
|
|
|
|
const unsigned char *end)
|
|
|
|
{
|
|
|
|
return (start + len > start && start + len <= end);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-05-18 17:58:33 +02:00
|
|
|
static void setup_token_decoder(VP8D_COMP *pbi,
|
|
|
|
const unsigned char *cx_data)
|
|
|
|
{
|
|
|
|
int num_part;
|
|
|
|
int i;
|
|
|
|
VP8_COMMON *pc = &pbi->common;
|
|
|
|
const unsigned char *user_data_end = pbi->Source + pbi->source_sz;
|
|
|
|
vp8_reader *bool_decoder;
|
|
|
|
const unsigned char *partition;
|
|
|
|
|
|
|
|
/* Parse number of token partitions to use */
|
2011-06-16 11:44:50 +02:00
|
|
|
const TOKEN_PARTITION multi_token_partition =
|
|
|
|
(TOKEN_PARTITION)vp8_read_literal(&pbi->bc, 2);
|
|
|
|
/* Only update the multi_token_partition field if we are sure the value
|
|
|
|
* is correct. */
|
2011-08-08 10:56:20 +02:00
|
|
|
if (!pbi->ec_active || !vp8dx_bool_error(&pbi->bc))
|
2011-06-16 11:44:50 +02:00
|
|
|
pc->multi_token_partition = multi_token_partition;
|
|
|
|
|
2010-05-18 17:58:33 +02:00
|
|
|
num_part = 1 << pc->multi_token_partition;
|
|
|
|
|
|
|
|
/* Set up pointers to the first partition */
|
|
|
|
partition = cx_data;
|
|
|
|
bool_decoder = &pbi->bc2;
|
|
|
|
|
|
|
|
if (num_part > 1)
|
|
|
|
{
|
|
|
|
CHECK_MEM_ERROR(pbi->mbc, vpx_malloc(num_part * sizeof(vp8_reader)));
|
|
|
|
bool_decoder = pbi->mbc;
|
|
|
|
partition += 3 * (num_part - 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < num_part; i++)
|
|
|
|
{
|
|
|
|
const unsigned char *partition_size_ptr = cx_data + i * 3;
|
2011-08-05 18:27:25 +02:00
|
|
|
ptrdiff_t partition_size, bytes_left;
|
|
|
|
|
|
|
|
bytes_left = user_data_end - partition;
|
2010-05-18 17:58:33 +02:00
|
|
|
|
|
|
|
/* Calculate the length of this partition. The last partition
|
2011-08-05 18:27:25 +02:00
|
|
|
* size is implicit. If the partition size can't be read, then
|
|
|
|
* either use the remaining data in the buffer (for EC mode)
|
|
|
|
* or throw an error.
|
2010-05-18 17:58:33 +02:00
|
|
|
*/
|
|
|
|
if (i < num_part - 1)
|
|
|
|
{
|
2011-08-05 18:27:25 +02:00
|
|
|
if (read_is_valid(partition_size_ptr, 3, user_data_end))
|
|
|
|
partition_size = read_partition_size(partition_size_ptr);
|
2011-08-08 10:56:20 +02:00
|
|
|
else if (pbi->ec_active)
|
2011-08-05 18:27:25 +02:00
|
|
|
partition_size = bytes_left;
|
|
|
|
else
|
|
|
|
vpx_internal_error(&pc->error, VPX_CODEC_CORRUPT_FRAME,
|
|
|
|
"Truncated partition size data");
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
|
|
|
else
|
2011-08-05 18:27:25 +02:00
|
|
|
partition_size = bytes_left;
|
|
|
|
|
|
|
|
/* Validate the calculated partition length. If the buffer
|
|
|
|
* described by the partition can't be fully read, then restrict
|
|
|
|
* it to the portion that can be (for EC mode) or throw an error.
|
|
|
|
*/
|
|
|
|
if (!read_is_valid(partition, partition_size, user_data_end))
|
2010-05-18 17:58:33 +02:00
|
|
|
{
|
2011-08-08 10:56:20 +02:00
|
|
|
if (pbi->ec_active)
|
2011-08-05 18:27:25 +02:00
|
|
|
partition_size = bytes_left;
|
|
|
|
else
|
|
|
|
vpx_internal_error(&pc->error, VPX_CODEC_CORRUPT_FRAME,
|
|
|
|
"Truncated packet or corrupt partition "
|
|
|
|
"%d length", i + 1);
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
|
|
|
|
2011-02-04 22:00:00 +01:00
|
|
|
if (vp8dx_start_decode(bool_decoder, partition, partition_size))
|
2010-05-18 17:58:33 +02:00
|
|
|
vpx_internal_error(&pc->error, VPX_CODEC_MEM_ERROR,
|
|
|
|
"Failed to allocate bool decoder %d", i + 1);
|
|
|
|
|
|
|
|
/* Advance to the next partition */
|
|
|
|
partition += partition_size;
|
|
|
|
bool_decoder++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void stop_token_decoder(VP8D_COMP *pbi)
|
|
|
|
{
|
|
|
|
VP8_COMMON *pc = &pbi->common;
|
|
|
|
|
|
|
|
if (pc->multi_token_partition != ONE_PARTITION)
|
2011-06-14 02:29:49 +02:00
|
|
|
{
|
2010-05-18 17:58:33 +02:00
|
|
|
vpx_free(pbi->mbc);
|
2011-06-14 02:29:49 +02:00
|
|
|
pbi->mbc = NULL;
|
|
|
|
}
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static void init_frame(VP8D_COMP *pbi)
|
|
|
|
{
|
|
|
|
VP8_COMMON *const pc = & pbi->common;
|
|
|
|
MACROBLOCKD *const xd = & pbi->mb;
|
|
|
|
|
|
|
|
if (pc->frame_type == KEY_FRAME)
|
|
|
|
{
|
2010-10-28 01:04:02 +02:00
|
|
|
/* Various keyframe initializations */
|
2010-05-18 17:58:33 +02:00
|
|
|
vpx_memcpy(pc->fc.mvc, vp8_default_mv_context, sizeof(vp8_default_mv_context));
|
|
|
|
|
|
|
|
vp8_init_mbmode_probs(pc);
|
|
|
|
|
|
|
|
vp8_default_coef_probs(pc);
|
|
|
|
vp8_kf_default_bmode_probs(pc->kf_bmode_prob);
|
|
|
|
|
2011-09-14 19:20:25 +02:00
|
|
|
// Reset the segment feature data to the default stats:
|
|
|
|
// Features disabled, 0, with delta coding (Default state).
|
2011-11-03 17:58:26 +01:00
|
|
|
clearall_segfeatures( xd );
|
2011-09-14 19:20:25 +02:00
|
|
|
|
2010-05-18 17:58:33 +02:00
|
|
|
xd->mb_segement_abs_delta = SEGMENT_DELTADATA;
|
|
|
|
|
2010-10-28 01:04:02 +02:00
|
|
|
/* reset the mode ref deltasa for loop filter */
|
2010-05-18 17:58:33 +02:00
|
|
|
vpx_memset(xd->ref_lf_deltas, 0, sizeof(xd->ref_lf_deltas));
|
|
|
|
vpx_memset(xd->mode_lf_deltas, 0, sizeof(xd->mode_lf_deltas));
|
|
|
|
|
2010-10-28 01:04:02 +02:00
|
|
|
/* All buffers are implicitly updated on key frames. */
|
2010-05-18 17:58:33 +02:00
|
|
|
pc->refresh_golden_frame = 1;
|
|
|
|
pc->refresh_alt_ref_frame = 1;
|
|
|
|
pc->copy_buffer_to_gf = 0;
|
|
|
|
pc->copy_buffer_to_arf = 0;
|
|
|
|
|
2010-10-28 01:04:02 +02:00
|
|
|
/* Note that Golden and Altref modes cannot be used on a key frame so
|
|
|
|
* ref_frame_sign_bias[] is undefined and meaningless
|
|
|
|
*/
|
2010-05-18 17:58:33 +02:00
|
|
|
pc->ref_frame_sign_bias[GOLDEN_FRAME] = 0;
|
|
|
|
pc->ref_frame_sign_bias[ALTREF_FRAME] = 0;
|
2011-12-01 01:36:46 +01:00
|
|
|
|
|
|
|
vpx_memcpy(&pc->lfc, &pc->fc, sizeof(pc->fc));
|
|
|
|
vpx_memcpy(&pc->lfc_a, &pc->fc, sizeof(pc->fc));
|
2011-12-07 22:55:58 +01:00
|
|
|
|
2011-12-08 20:43:09 +01:00
|
|
|
vp8_init_mode_contexts(&pbi->common);
|
|
|
|
vpx_memcpy( pbi->common.vp8_mode_contexts,
|
|
|
|
pbi->common.mode_context,
|
|
|
|
sizeof(pbi->common.mode_context));
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2011-12-01 01:36:46 +01:00
|
|
|
|
2010-05-18 17:58:33 +02:00
|
|
|
if (!pc->use_bilinear_mc_filter)
|
|
|
|
pc->mcomp_filter_type = SIXTAP;
|
|
|
|
else
|
|
|
|
pc->mcomp_filter_type = BILINEAR;
|
|
|
|
|
2010-10-28 01:04:02 +02:00
|
|
|
/* To enable choice of different interploation filters */
|
2010-05-18 17:58:33 +02:00
|
|
|
if (pc->mcomp_filter_type == SIXTAP)
|
|
|
|
{
|
|
|
|
xd->subpixel_predict = SUBPIX_INVOKE(RTCD_VTABLE(subpix), sixtap4x4);
|
|
|
|
xd->subpixel_predict8x4 = SUBPIX_INVOKE(RTCD_VTABLE(subpix), sixtap8x4);
|
|
|
|
xd->subpixel_predict8x8 = SUBPIX_INVOKE(RTCD_VTABLE(subpix), sixtap8x8);
|
|
|
|
xd->subpixel_predict16x16 = SUBPIX_INVOKE(RTCD_VTABLE(subpix), sixtap16x16);
|
Dual 16x16 inter prediction.
This patch introduces the concept of dual inter16x16 prediction. A
16x16 inter-predicted macroblock can use 2 references instead of 1,
where both references use the same mvmode (new, near/est, zero). In the
case of newmv, this means that two MVs are coded instead of one. The
frame can be encoded in 3 ways: all MBs single-prediction, all MBs dual
prediction, or per-MB single/dual prediction selection ("hybrid"), in
which case a single bit is coded per-MB to indicate whether the MB uses
single or dual inter prediction.
In the future, we can (maybe?) get further gains by mixing this with
Adrian's 32x32 work, per-segment dual prediction settings, or adding
support for dual splitmv/8x8mv inter prediction.
Gain (on derf-set, CQ mode) is ~2.8% (SSIM) or ~3.6% (glb PSNR). Most
gain is at medium/high bitrates, but there's minor gains at low bitrates
also. Output was confirmed to match between encoder and decoder.
Note for optimization people: this patch introduces a 2nd version of
16x16/8x8 sixtap/bilin functions, which does an avg instead of a
store. They may want to look and make sure this is implemented to
their satisfaction so we can optimize it best in the future.
Change-ID: I59dc84b07cbb3ccf073ac0f756d03d294cb19281
2011-12-06 20:53:02 +01:00
|
|
|
xd->subpixel_predict_avg8x8 = SUBPIX_INVOKE(RTCD_VTABLE(subpix), sixtap_avg8x8);
|
|
|
|
xd->subpixel_predict_avg16x16 = SUBPIX_INVOKE(RTCD_VTABLE(subpix), sixtap_avg16x16);
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
xd->subpixel_predict = SUBPIX_INVOKE(RTCD_VTABLE(subpix), bilinear4x4);
|
|
|
|
xd->subpixel_predict8x4 = SUBPIX_INVOKE(RTCD_VTABLE(subpix), bilinear8x4);
|
|
|
|
xd->subpixel_predict8x8 = SUBPIX_INVOKE(RTCD_VTABLE(subpix), bilinear8x8);
|
|
|
|
xd->subpixel_predict16x16 = SUBPIX_INVOKE(RTCD_VTABLE(subpix), bilinear16x16);
|
Dual 16x16 inter prediction.
This patch introduces the concept of dual inter16x16 prediction. A
16x16 inter-predicted macroblock can use 2 references instead of 1,
where both references use the same mvmode (new, near/est, zero). In the
case of newmv, this means that two MVs are coded instead of one. The
frame can be encoded in 3 ways: all MBs single-prediction, all MBs dual
prediction, or per-MB single/dual prediction selection ("hybrid"), in
which case a single bit is coded per-MB to indicate whether the MB uses
single or dual inter prediction.
In the future, we can (maybe?) get further gains by mixing this with
Adrian's 32x32 work, per-segment dual prediction settings, or adding
support for dual splitmv/8x8mv inter prediction.
Gain (on derf-set, CQ mode) is ~2.8% (SSIM) or ~3.6% (glb PSNR). Most
gain is at medium/high bitrates, but there's minor gains at low bitrates
also. Output was confirmed to match between encoder and decoder.
Note for optimization people: this patch introduces a 2nd version of
16x16/8x8 sixtap/bilin functions, which does an avg instead of a
store. They may want to look and make sure this is implemented to
their satisfaction so we can optimize it best in the future.
Change-ID: I59dc84b07cbb3ccf073ac0f756d03d294cb19281
2011-12-06 20:53:02 +01:00
|
|
|
xd->subpixel_predict_avg8x8 = SUBPIX_INVOKE(RTCD_VTABLE(subpix), bilinear_avg8x8);
|
|
|
|
xd->subpixel_predict_avg16x16 = SUBPIX_INVOKE(RTCD_VTABLE(subpix), bilinear_avg16x16);
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
2011-08-08 10:56:20 +02:00
|
|
|
|
|
|
|
if (pbi->decoded_key_frame && pbi->ec_enabled && !pbi->ec_active)
|
|
|
|
pbi->ec_active = 1;
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
|
|
|
|
2010-09-01 02:43:14 +02:00
|
|
|
xd->left_context = &pc->left_context;
|
2010-05-18 17:58:33 +02:00
|
|
|
xd->mode_info_context = pc->mi;
|
|
|
|
xd->frame_type = pc->frame_type;
|
2010-08-12 22:25:43 +02:00
|
|
|
xd->mode_info_context->mbmi.mode = DC_PRED;
|
2010-05-18 17:58:33 +02:00
|
|
|
xd->mode_info_stride = pc->mode_info_stride;
|
2010-12-16 16:46:31 +01:00
|
|
|
xd->corrupted = 0; /* init without corruption */
|
2011-08-24 20:42:26 +02:00
|
|
|
|
|
|
|
xd->fullpixel_mask = 0xffffffff;
|
|
|
|
if(pc->full_pixel)
|
|
|
|
xd->fullpixel_mask = 0xfffffff8;
|
|
|
|
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
int vp8_decode_frame(VP8D_COMP *pbi)
|
|
|
|
{
|
|
|
|
vp8_reader *const bc = & pbi->bc;
|
|
|
|
VP8_COMMON *const pc = & pbi->common;
|
|
|
|
MACROBLOCKD *const xd = & pbi->mb;
|
|
|
|
const unsigned char *data = (const unsigned char *)pbi->Source;
|
2011-06-13 16:42:27 +02:00
|
|
|
const unsigned char *data_end = data + pbi->source_sz;
|
2010-10-28 01:04:02 +02:00
|
|
|
ptrdiff_t first_partition_length_in_bytes;
|
2011-07-20 23:21:24 +02:00
|
|
|
|
2010-05-18 17:58:33 +02:00
|
|
|
int mb_row;
|
|
|
|
int i, j, k, l;
|
2011-08-08 10:56:20 +02:00
|
|
|
int corrupt_tokens = 0;
|
|
|
|
int prev_independent_partitions = pbi->independent_partitions;
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2011-06-13 16:42:27 +02:00
|
|
|
if (pbi->input_partition)
|
|
|
|
{
|
|
|
|
data = pbi->partitions[0];
|
|
|
|
data_end = data + pbi->partition_sizes[0];
|
|
|
|
}
|
|
|
|
|
2010-12-16 16:46:31 +01:00
|
|
|
/* start with no corruption of current frame */
|
|
|
|
xd->corrupted = 0;
|
|
|
|
pc->yv12_fb[pc->new_fb_idx].corrupted = 0;
|
|
|
|
|
2010-10-20 00:40:46 +02:00
|
|
|
if (data_end - data < 3)
|
2010-05-18 17:58:33 +02:00
|
|
|
{
|
2011-08-08 10:56:20 +02:00
|
|
|
if (pbi->ec_active)
|
2011-05-02 15:30:51 +02:00
|
|
|
{
|
|
|
|
/* Declare the missing frame as an inter frame since it will
|
|
|
|
be handled as an inter frame when we have estimated its
|
|
|
|
motion vectors. */
|
|
|
|
pc->frame_type = INTER_FRAME;
|
|
|
|
pc->version = 0;
|
|
|
|
pc->show_frame = 1;
|
|
|
|
first_partition_length_in_bytes = 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
vpx_internal_error(&pc->error, VPX_CODEC_CORRUPT_FRAME,
|
|
|
|
"Truncated packet");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
pc->frame_type = (FRAME_TYPE)(data[0] & 1);
|
|
|
|
pc->version = (data[0] >> 1) & 7;
|
|
|
|
pc->show_frame = (data[0] >> 4) & 1;
|
|
|
|
first_partition_length_in_bytes =
|
|
|
|
(data[0] | (data[1] << 8) | (data[2] << 16)) >> 5;
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2011-08-08 10:56:20 +02:00
|
|
|
if (!pbi->ec_active && (data + first_partition_length_in_bytes > data_end
|
2011-05-02 15:30:51 +02:00
|
|
|
|| data + first_partition_length_in_bytes < data))
|
|
|
|
vpx_internal_error(&pc->error, VPX_CODEC_CORRUPT_FRAME,
|
|
|
|
"Truncated packet or corrupt partition 0 length");
|
2011-09-06 14:34:36 +02:00
|
|
|
|
|
|
|
data += 3;
|
|
|
|
|
2011-05-02 15:30:51 +02:00
|
|
|
vp8_setup_version(pc);
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2011-05-02 15:30:51 +02:00
|
|
|
if (pc->frame_type == KEY_FRAME)
|
2010-05-18 17:58:33 +02:00
|
|
|
{
|
2011-05-02 15:30:51 +02:00
|
|
|
const int Width = pc->Width;
|
|
|
|
const int Height = pc->Height;
|
|
|
|
|
|
|
|
/* vet via sync code */
|
|
|
|
/* When error concealment is enabled we should only check the sync
|
|
|
|
* code if we have enough bits available
|
|
|
|
*/
|
2011-08-08 10:56:20 +02:00
|
|
|
if (!pbi->ec_active || data + 3 < data_end)
|
2010-05-18 17:58:33 +02:00
|
|
|
{
|
2011-05-02 15:30:51 +02:00
|
|
|
if (data[0] != 0x9d || data[1] != 0x01 || data[2] != 0x2a)
|
|
|
|
vpx_internal_error(&pc->error, VPX_CODEC_UNSUP_BITSTREAM,
|
|
|
|
"Invalid frame sync code");
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
|
|
|
|
2011-05-02 15:30:51 +02:00
|
|
|
/* If error concealment is enabled we should only parse the new size
|
|
|
|
* if we have enough data. Otherwise we will end up with the wrong
|
|
|
|
* size.
|
|
|
|
*/
|
2011-08-08 10:56:20 +02:00
|
|
|
if (!pbi->ec_active || data + 6 < data_end)
|
2010-05-18 17:58:33 +02:00
|
|
|
{
|
2011-05-02 15:30:51 +02:00
|
|
|
pc->Width = (data[3] | (data[4] << 8)) & 0x3fff;
|
|
|
|
pc->horiz_scale = data[4] >> 6;
|
|
|
|
pc->Height = (data[5] | (data[6] << 8)) & 0x3fff;
|
|
|
|
pc->vert_scale = data[6] >> 6;
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
2011-05-02 15:30:51 +02:00
|
|
|
data += 7;
|
|
|
|
|
|
|
|
if (Width != pc->Width || Height != pc->Height)
|
|
|
|
{
|
|
|
|
int prev_mb_rows = pc->mb_rows;
|
|
|
|
|
|
|
|
if (pc->Width <= 0)
|
|
|
|
{
|
|
|
|
pc->Width = Width;
|
|
|
|
vpx_internal_error(&pc->error, VPX_CODEC_CORRUPT_FRAME,
|
|
|
|
"Invalid frame width");
|
|
|
|
}
|
|
|
|
|
|
|
|
if (pc->Height <= 0)
|
|
|
|
{
|
|
|
|
pc->Height = Height;
|
|
|
|
vpx_internal_error(&pc->error, VPX_CODEC_CORRUPT_FRAME,
|
|
|
|
"Invalid frame height");
|
|
|
|
}
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2011-05-02 15:30:51 +02:00
|
|
|
if (vp8_alloc_frame_buffers(pc, pc->Width, pc->Height))
|
|
|
|
vpx_internal_error(&pc->error, VPX_CODEC_MEM_ERROR,
|
|
|
|
"Failed to allocate frame buffers");
|
|
|
|
|
|
|
|
#if CONFIG_ERROR_CONCEALMENT
|
|
|
|
pbi->overlaps = NULL;
|
|
|
|
if (pbi->ec_enabled)
|
|
|
|
{
|
|
|
|
if (vp8_alloc_overlap_lists(pbi))
|
|
|
|
vpx_internal_error(&pc->error, VPX_CODEC_MEM_ERROR,
|
|
|
|
"Failed to allocate overlap lists "
|
|
|
|
"for error concealment");
|
|
|
|
}
|
|
|
|
#endif
|
2010-09-16 20:08:52 +02:00
|
|
|
|
2011-05-02 15:30:51 +02:00
|
|
|
}
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-09-06 14:34:36 +02:00
|
|
|
if ((!pbi->decoded_key_frame && pc->frame_type != KEY_FRAME) ||
|
|
|
|
pc->Width == 0 || pc->Height == 0)
|
2010-05-18 17:58:33 +02:00
|
|
|
{
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
init_frame(pbi);
|
|
|
|
|
2011-02-04 22:00:00 +01:00
|
|
|
if (vp8dx_start_decode(bc, data, data_end - data))
|
2010-05-18 17:58:33 +02:00
|
|
|
vpx_internal_error(&pc->error, VPX_CODEC_MEM_ERROR,
|
|
|
|
"Failed to allocate bool decoder 0");
|
|
|
|
if (pc->frame_type == KEY_FRAME) {
|
|
|
|
pc->clr_type = (YUV_TYPE)vp8_read_bit(bc);
|
|
|
|
pc->clamp_type = (CLAMP_TYPE)vp8_read_bit(bc);
|
|
|
|
}
|
|
|
|
|
2010-10-28 01:04:02 +02:00
|
|
|
/* Is segmentation enabled */
|
2010-05-18 17:58:33 +02:00
|
|
|
xd->segmentation_enabled = (unsigned char)vp8_read_bit(bc);
|
|
|
|
if (xd->segmentation_enabled)
|
|
|
|
{
|
2011-11-11 11:10:06 +01:00
|
|
|
// Read whether or not the segmentation map is being explicitly
|
|
|
|
// updated this frame.
|
2010-05-18 17:58:33 +02:00
|
|
|
xd->update_mb_segmentation_map = (unsigned char)vp8_read_bit(bc);
|
2011-11-11 11:10:06 +01:00
|
|
|
|
|
|
|
// If so what method will be used.
|
|
|
|
if ( xd->update_mb_segmentation_map )
|
2012-01-27 19:29:07 +01:00
|
|
|
pc->temporal_update = (unsigned char)vp8_read_bit(bc);
|
2011-11-11 11:10:06 +01:00
|
|
|
|
|
|
|
// Is the segment data being updated
|
2010-05-18 17:58:33 +02:00
|
|
|
xd->update_mb_segmentation_data = (unsigned char)vp8_read_bit(bc);
|
|
|
|
|
|
|
|
if (xd->update_mb_segmentation_data)
|
|
|
|
{
|
2011-11-03 13:50:09 +01:00
|
|
|
int data;
|
|
|
|
|
2010-05-18 17:58:33 +02:00
|
|
|
xd->mb_segement_abs_delta = (unsigned char)vp8_read_bit(bc);
|
|
|
|
|
2011-10-07 17:58:28 +02:00
|
|
|
clearall_segfeatures( xd );
|
2011-09-14 19:20:25 +02:00
|
|
|
|
2011-09-13 16:24:45 +02:00
|
|
|
// For each segmentation...
|
2011-11-03 13:50:09 +01:00
|
|
|
for (i = 0; i < MAX_MB_SEGMENTS; i++)
|
2011-09-13 16:24:45 +02:00
|
|
|
{
|
|
|
|
// For each of the segments features...
|
2011-11-03 13:50:09 +01:00
|
|
|
for (j = 0; j < SEG_LVL_MAX; j++)
|
2010-05-18 17:58:33 +02:00
|
|
|
{
|
2012-02-13 17:21:24 +01:00
|
|
|
|
|
|
|
#if CONFIG_FEATUREUPDATES
|
|
|
|
// feature updated?
|
|
|
|
if (vp8_read_bit(bc))
|
|
|
|
{
|
|
|
|
int active=1;
|
|
|
|
|
|
|
|
if ( segfeature_active( xd, i, j ))
|
|
|
|
active=vp8_read_bit(bc);
|
|
|
|
|
|
|
|
// Is the feature enabled
|
|
|
|
if (active)
|
|
|
|
{
|
|
|
|
// Update the feature data and mask
|
|
|
|
enable_segfeature(xd, i, j);
|
|
|
|
|
|
|
|
data = (signed char)vp8_read_literal(
|
|
|
|
bc, seg_feature_data_bits(j));
|
|
|
|
|
|
|
|
// Is the segment data signed..
|
|
|
|
if ( is_segfeature_signed(j) )
|
|
|
|
{
|
|
|
|
if (vp8_read_bit(bc))
|
|
|
|
data = - data;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
data = 0;
|
|
|
|
|
|
|
|
set_segdata(xd, i, j, data);
|
|
|
|
}
|
|
|
|
|
|
|
|
#else
|
2011-09-14 19:20:25 +02:00
|
|
|
// Is the feature enabled
|
2010-05-18 17:58:33 +02:00
|
|
|
if (vp8_read_bit(bc))
|
|
|
|
{
|
2011-09-14 19:20:25 +02:00
|
|
|
// Update the feature data and mask
|
2011-11-03 13:50:09 +01:00
|
|
|
enable_segfeature(xd, i, j);
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2011-11-03 13:50:09 +01:00
|
|
|
data = (signed char)vp8_read_literal(
|
|
|
|
bc, seg_feature_data_bits(j));
|
|
|
|
|
2011-10-07 17:58:28 +02:00
|
|
|
// Is the segment data signed..
|
2011-11-03 13:50:09 +01:00
|
|
|
if ( is_segfeature_signed(j) )
|
2011-10-07 17:58:28 +02:00
|
|
|
{
|
|
|
|
if (vp8_read_bit(bc))
|
2011-11-03 13:50:09 +01:00
|
|
|
data = - data;
|
2011-10-07 17:58:28 +02:00
|
|
|
}
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
|
|
|
else
|
2011-11-03 13:50:09 +01:00
|
|
|
data = 0;
|
|
|
|
|
|
|
|
set_segdata(xd, i, j, data);
|
2012-02-13 17:21:24 +01:00
|
|
|
#endif
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (xd->update_mb_segmentation_map)
|
|
|
|
{
|
2011-11-15 17:15:23 +01:00
|
|
|
// Which macro block level features are enabled
|
2011-11-15 12:13:33 +01:00
|
|
|
vpx_memset(xd->mb_segment_tree_probs, 255,
|
|
|
|
sizeof(xd->mb_segment_tree_probs));
|
2012-01-27 19:29:07 +01:00
|
|
|
vpx_memset(pc->segment_pred_probs, 255,
|
|
|
|
sizeof(pc->segment_pred_probs));
|
2011-11-15 12:13:33 +01:00
|
|
|
|
|
|
|
// Read the probs used to decode the segment id for each macro
|
|
|
|
// block.
|
2010-05-18 17:58:33 +02:00
|
|
|
for (i = 0; i < MB_FEATURE_TREE_PROBS; i++)
|
|
|
|
{
|
2011-11-15 12:13:33 +01:00
|
|
|
// If not explicitly set value is defaulted to 255 by
|
|
|
|
//memset above
|
2010-05-18 17:58:33 +02:00
|
|
|
if (vp8_read_bit(bc))
|
2011-11-15 12:13:33 +01:00
|
|
|
xd->mb_segment_tree_probs[i] =
|
|
|
|
(vp8_prob)vp8_read_literal(bc, 8);
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
2011-11-15 17:15:23 +01:00
|
|
|
|
2011-11-15 12:13:33 +01:00
|
|
|
// If predictive coding of segment map is enabled read the
|
|
|
|
// prediction probabilities.
|
2012-01-27 19:29:07 +01:00
|
|
|
if ( pc->temporal_update )
|
2011-11-15 12:13:33 +01:00
|
|
|
{
|
|
|
|
// Read the prediction probs needed to decode the segment id
|
|
|
|
// when predictive coding enabled
|
2012-01-27 19:29:07 +01:00
|
|
|
for (i = 0; i < PREDICTION_PROBS; i++)
|
2011-11-15 12:13:33 +01:00
|
|
|
{
|
|
|
|
// If not explicitly set value is defaulted to 255 by
|
|
|
|
// memset above
|
|
|
|
if (vp8_read_bit(bc))
|
2012-01-27 19:29:07 +01:00
|
|
|
pc->segment_pred_probs[i] =
|
2011-11-15 12:13:33 +01:00
|
|
|
(vp8_prob)vp8_read_literal(bc, 8);
|
|
|
|
}
|
|
|
|
}
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-01-28 13:20:14 +01:00
|
|
|
// Read common prediction model status flag probability updates for the
|
|
|
|
// reference frame
|
|
|
|
if ( pc->frame_type == KEY_FRAME )
|
|
|
|
{
|
|
|
|
// Set the prediction probabilities to defaults
|
|
|
|
pc->ref_pred_probs[0] = 120;
|
|
|
|
pc->ref_pred_probs[1] = 80;
|
|
|
|
pc->ref_pred_probs[2] = 40;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
for (i = 0; i < PREDICTION_PROBS; i++)
|
|
|
|
{
|
|
|
|
if ( vp8_read_bit(bc) )
|
|
|
|
pc->ref_pred_probs[i] = (vp8_prob)vp8_read_literal(bc, 8);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-10-28 01:04:02 +02:00
|
|
|
/* Read the loop filter level and type */
|
Improved coding using 8x8 transform
In summary, this commit encompasses a series of changes in attempt to
improve the 8x8 transform based coding to help overall compression
quality, please refer to the detailed commit history below for what
are the rationale underly the series of changes:
a. A frame level flag to indicate if 8x8 transform is used at all.
b. 8x8 transform is not used for key frames and small image size.
c. On inter coded frame, macroblocks using modes B_PRED, SPLIT_MV
and I8X8_PRED are forced to using 4x4 transform based coding, the
rest uses 8x8 transform based coding.
d. Encoder and decoder has the same assumption on the relationship
between prediction modes and transform size, therefore no signaling
is encoded in bitstream.
e. Mode decision process now calculate the rate and distortion scores
using their respective transforms.
Overall test results:
1. HD set
http://www.corp.google.com/~yaowu/no_crawl/t8x8/HD_t8x8_20120206.html
(avg psnr: 3.09% glb psnr: 3.22%, ssim: 3.90%)
2. Cif set:
http://www.corp.google.com/~yaowu/no_crawl/t8x8/cif_t8x8_20120206.html
(avg psnr: -0.03%, glb psnr: -0.02%, ssim: -0.04%)
It should be noted here, as 8x8 transform coding itself is disabled
for cif size clips, the 0.03% loss is purely from the 1 bit/frame
flag overhead on if 8x8 transform is used or not for the frame.
---patch history for future reference---
Patch 1:
this commit tries to select transform size based on macroblock
prediction mode. If the size of a prediction mode is 16x16, then
the macroblock is forced to use 8x8 transform. If the prediction
mode is B_PRED, SPLITMV or I8X8_PRED, then the macroblock is forced
to use 4x4 transform. Tests on the following HD clips showed mixed
results: (all hd clips only used first 100 frames in the test)
http://www.corp.google.com/~yaowu/no_crawl/t8x8/hdmodebased8x8.html
http://www.corp.google.com/~yaowu/no_crawl/t8x8/hdmodebased8x8_log.html
while the results are mixed and overall negative, it is interesting to
see 8x8 helped a few of the clips.
Patch 2:
this patch tries to hard-wire selection of transform size based on
prediction modes without using segmentation to signal the transform size.
encoder and decoder both takes the same assumption that all macroblocks
use 8x8 transform except when prediciton mode is B_PRED, I8X8_PRED or
SPLITMV. Test results are as follows:
http://www.corp.google.com/~yaowu/no_crawl/t8x8/cifmodebase8x8_0125.html
http://www.corp.google.com/~yaowu/no_crawl/t8x8/hdmodebased8x8_0125log.html
Interestingly, by removing the overhead or coding the segmentation, the
results on this limited HD set have turn positive on average.
Patch 3:
this patch disabled the usage of 8x8 transform on key frames, and kept the
logic from patch 2 for inter frames only. test results on HD set turned
decidedly positive with 8x8 transform enabled on inter frame with 16x16
prediction modes: (avg psnr: .81% glb psnr: .82 ssim: .55%)
http://www.corp.google.com/~yaowu/no_crawl/t8x8/hdintermode8x8_0125.html
results on cif set still negative overall
Patch 4:
continued from last patch, but now in mode decision process, the rate and
distortion estimates are computed based on 8x8 transform results for MBs
with modes associated with 8x8 transform. This patch also fixed a problem
related to segment based eob coding when 8x8 transform is used. The patch
significantly improved the results on HD clips:
http://www.corp.google.com/~yaowu/no_crawl/t8x8/hd8x8RDintermode.html
(avg psnr: 2.70% glb psnr: 2.76% ssim: 3.34%)
results on cif also improved, though they are still negative compared to
baseline that uses 4x4 transform only:
http://www.corp.google.com/~yaowu/no_crawl/t8x8/cif8x8RDintermode.html
(avg psnr: -.78% glb psnr: -.86% ssim: -.19%)
Patch 5:
This patch does 3 things:
a. a bunch of decoder bug fixes, encodings and decodings were verified
to have matched recon buffer on a number of encodes on cif size mobile and
hd version of _pedestrian.
b. the patch further improved the rate distortion calculation of MBS that
use 8x8 transform. This provided some further gain on compression.
c. the patch also got the experimental work SEG_LVL_EOB to work with 8x8
transformed macroblock, test results indicates it improves the cif set
but hurt the HD set slightly.
Tests results on HD clips:
http://www.corp.google.com/~yaowu/no_crawl/t8x8/HD_t8x8_20120201.html
(avg psnr: 3.19% glb psnr: 3.30% ssim: 3.93%)
Test results on cif clips:
http://www.corp.google.com/~yaowu/no_crawl/t8x8/cif_t8x8_20120201.html
(avg psnr: -.47% glb psnr: -.51% ssim: +.28%)
Patch 6:
Added a frame level flag to indicate if 8x8 transform is allowed at all.
temporarily the decision is based on frame size, can be optimized later
one. This get the cif results to basically unchanged, with one bit per
frame overhead on both cif and hd clips.
Patch 8:
Rebase and Merge to head by PGW.
Fixed some suspect 4s that look like hey should be 64s in regard
to segmented EOB. Perhaps #defines would be bette.
Bulit and tested without T8x8 enabled and produces unchanged
output.
Patch 9:
Corrected misalligned code/decode of "txfm_mode" bit.
Limited testing for correct encode and decode with
T8x8 configured on derf clips.
Change-Id: I156e1405d25f81579d579dff8ab9af53944ec49c
2012-02-10 01:12:23 +01:00
|
|
|
#if CONFIG_T8X8
|
|
|
|
pc->txfm_mode = (TXFM_MODE) vp8_read_bit(bc);
|
|
|
|
#endif
|
|
|
|
|
2010-05-18 17:58:33 +02:00
|
|
|
pc->filter_type = (LOOPFILTERTYPE) vp8_read_bit(bc);
|
|
|
|
pc->filter_level = vp8_read_literal(bc, 6);
|
|
|
|
pc->sharpness_level = vp8_read_literal(bc, 3);
|
|
|
|
|
2010-10-28 01:04:02 +02:00
|
|
|
/* Read in loop filter deltas applied at the MB level based on mode or ref frame. */
|
2010-05-18 17:58:33 +02:00
|
|
|
xd->mode_ref_lf_delta_update = 0;
|
|
|
|
xd->mode_ref_lf_delta_enabled = (unsigned char)vp8_read_bit(bc);
|
|
|
|
|
|
|
|
if (xd->mode_ref_lf_delta_enabled)
|
|
|
|
{
|
2010-10-28 01:04:02 +02:00
|
|
|
/* Do the deltas need to be updated */
|
2010-05-18 17:58:33 +02:00
|
|
|
xd->mode_ref_lf_delta_update = (unsigned char)vp8_read_bit(bc);
|
|
|
|
|
|
|
|
if (xd->mode_ref_lf_delta_update)
|
|
|
|
{
|
2010-10-28 01:04:02 +02:00
|
|
|
/* Send update */
|
2010-05-18 17:58:33 +02:00
|
|
|
for (i = 0; i < MAX_REF_LF_DELTAS; i++)
|
|
|
|
{
|
|
|
|
if (vp8_read_bit(bc))
|
|
|
|
{
|
2010-10-28 01:04:02 +02:00
|
|
|
/*sign = vp8_read_bit( bc );*/
|
2010-05-18 17:58:33 +02:00
|
|
|
xd->ref_lf_deltas[i] = (signed char)vp8_read_literal(bc, 6);
|
|
|
|
|
2010-10-28 01:04:02 +02:00
|
|
|
if (vp8_read_bit(bc)) /* Apply sign */
|
2010-05-18 17:58:33 +02:00
|
|
|
xd->ref_lf_deltas[i] = xd->ref_lf_deltas[i] * -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-10-28 01:04:02 +02:00
|
|
|
/* Send update */
|
2010-05-18 17:58:33 +02:00
|
|
|
for (i = 0; i < MAX_MODE_LF_DELTAS; i++)
|
|
|
|
{
|
|
|
|
if (vp8_read_bit(bc))
|
|
|
|
{
|
2010-10-28 01:04:02 +02:00
|
|
|
/*sign = vp8_read_bit( bc );*/
|
2010-05-18 17:58:33 +02:00
|
|
|
xd->mode_lf_deltas[i] = (signed char)vp8_read_literal(bc, 6);
|
|
|
|
|
2010-10-28 01:04:02 +02:00
|
|
|
if (vp8_read_bit(bc)) /* Apply sign */
|
2010-05-18 17:58:33 +02:00
|
|
|
xd->mode_lf_deltas[i] = xd->mode_lf_deltas[i] * -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-06-13 16:42:27 +02:00
|
|
|
if (pbi->input_partition)
|
|
|
|
{
|
|
|
|
setup_token_decoder_partition_input(pbi);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
setup_token_decoder(pbi, data + first_partition_length_in_bytes);
|
|
|
|
}
|
2010-05-18 17:58:33 +02:00
|
|
|
xd->current_bc = &pbi->bc2;
|
|
|
|
|
2010-10-28 01:04:02 +02:00
|
|
|
/* Read the default quantizers. */
|
2010-05-18 17:58:33 +02:00
|
|
|
{
|
|
|
|
int Q, q_update;
|
|
|
|
|
2011-12-12 19:27:25 +01:00
|
|
|
Q = vp8_read_literal(bc, QINDEX_BITS); /* AC 1st order Q = default */
|
2010-05-18 17:58:33 +02:00
|
|
|
pc->base_qindex = Q;
|
|
|
|
q_update = 0;
|
|
|
|
pc->y1dc_delta_q = get_delta_q(bc, pc->y1dc_delta_q, &q_update);
|
|
|
|
pc->y2dc_delta_q = get_delta_q(bc, pc->y2dc_delta_q, &q_update);
|
|
|
|
pc->y2ac_delta_q = get_delta_q(bc, pc->y2ac_delta_q, &q_update);
|
|
|
|
pc->uvdc_delta_q = get_delta_q(bc, pc->uvdc_delta_q, &q_update);
|
|
|
|
pc->uvac_delta_q = get_delta_q(bc, pc->uvac_delta_q, &q_update);
|
|
|
|
|
|
|
|
if (q_update)
|
|
|
|
vp8cx_init_de_quantizer(pbi);
|
|
|
|
|
2010-10-28 01:04:02 +02:00
|
|
|
/* MB level dequantizer setup */
|
2010-05-18 17:58:33 +02:00
|
|
|
mb_init_dequantizer(pbi, &pbi->mb);
|
|
|
|
}
|
|
|
|
|
2010-10-28 01:04:02 +02:00
|
|
|
/* Determine if the golden frame or ARF buffer should be updated and how.
|
|
|
|
* For all non key frames the GF and ARF refresh flags and sign bias
|
|
|
|
* flags must be set explicitly.
|
|
|
|
*/
|
2010-05-18 17:58:33 +02:00
|
|
|
if (pc->frame_type != KEY_FRAME)
|
|
|
|
{
|
2010-10-28 01:04:02 +02:00
|
|
|
/* Should the GF or ARF be updated from the current frame */
|
2010-05-18 17:58:33 +02:00
|
|
|
pc->refresh_golden_frame = vp8_read_bit(bc);
|
2011-05-02 15:30:51 +02:00
|
|
|
#if CONFIG_ERROR_CONCEALMENT
|
|
|
|
/* Assume we shouldn't refresh golden if the bit is missing */
|
|
|
|
xd->corrupted |= vp8dx_bool_error(bc);
|
2011-08-08 10:56:20 +02:00
|
|
|
if (pbi->ec_active && xd->corrupted)
|
2011-05-02 15:30:51 +02:00
|
|
|
pc->refresh_golden_frame = 0;
|
|
|
|
#endif
|
|
|
|
|
2010-05-18 17:58:33 +02:00
|
|
|
pc->refresh_alt_ref_frame = vp8_read_bit(bc);
|
2011-05-02 15:30:51 +02:00
|
|
|
#if CONFIG_ERROR_CONCEALMENT
|
|
|
|
/* Assume we shouldn't refresh altref if the bit is missing */
|
|
|
|
xd->corrupted |= vp8dx_bool_error(bc);
|
2011-08-08 10:56:20 +02:00
|
|
|
if (pbi->ec_active && xd->corrupted)
|
2011-05-02 15:30:51 +02:00
|
|
|
pc->refresh_alt_ref_frame = 0;
|
|
|
|
#endif
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2011-12-01 01:36:46 +01:00
|
|
|
if(pc->refresh_alt_ref_frame)
|
2011-12-08 20:43:09 +01:00
|
|
|
{
|
2011-12-01 01:36:46 +01:00
|
|
|
vpx_memcpy(&pc->fc, &pc->lfc_a, sizeof(pc->fc));
|
2011-12-08 20:43:09 +01:00
|
|
|
vpx_memcpy( pc->vp8_mode_contexts,
|
|
|
|
pc->mode_context_a,
|
|
|
|
sizeof(pc->vp8_mode_contexts));
|
|
|
|
}
|
2011-12-01 01:36:46 +01:00
|
|
|
else
|
2011-12-08 20:43:09 +01:00
|
|
|
{
|
2011-12-01 01:36:46 +01:00
|
|
|
vpx_memcpy(&pc->fc, &pc->lfc, sizeof(pc->fc));
|
2011-12-08 20:43:09 +01:00
|
|
|
vpx_memcpy( pc->vp8_mode_contexts,
|
|
|
|
pc->mode_context,
|
|
|
|
sizeof(pc->vp8_mode_contexts));
|
|
|
|
}
|
2011-12-01 01:36:46 +01:00
|
|
|
|
2010-10-28 01:04:02 +02:00
|
|
|
/* Buffer to buffer copy flags. */
|
2010-05-18 17:58:33 +02:00
|
|
|
pc->copy_buffer_to_gf = 0;
|
|
|
|
|
|
|
|
if (!pc->refresh_golden_frame)
|
|
|
|
pc->copy_buffer_to_gf = vp8_read_literal(bc, 2);
|
|
|
|
|
|
|
|
pc->copy_buffer_to_arf = 0;
|
|
|
|
|
|
|
|
if (!pc->refresh_alt_ref_frame)
|
|
|
|
pc->copy_buffer_to_arf = vp8_read_literal(bc, 2);
|
|
|
|
|
|
|
|
pc->ref_frame_sign_bias[GOLDEN_FRAME] = vp8_read_bit(bc);
|
|
|
|
pc->ref_frame_sign_bias[ALTREF_FRAME] = vp8_read_bit(bc);
|
|
|
|
}
|
|
|
|
|
|
|
|
pc->refresh_entropy_probs = vp8_read_bit(bc);
|
|
|
|
if (pc->refresh_entropy_probs == 0)
|
|
|
|
{
|
|
|
|
vpx_memcpy(&pc->lfc, &pc->fc, sizeof(pc->fc));
|
|
|
|
}
|
|
|
|
|
|
|
|
pc->refresh_last_frame = pc->frame_type == KEY_FRAME || vp8_read_bit(bc);
|
|
|
|
|
2011-05-02 15:30:51 +02:00
|
|
|
#if CONFIG_ERROR_CONCEALMENT
|
|
|
|
/* Assume we should refresh the last frame if the bit is missing */
|
|
|
|
xd->corrupted |= vp8dx_bool_error(bc);
|
2011-08-08 10:56:20 +02:00
|
|
|
if (pbi->ec_active && xd->corrupted)
|
2011-05-02 15:30:51 +02:00
|
|
|
pc->refresh_last_frame = 1;
|
|
|
|
#endif
|
|
|
|
|
2010-05-18 17:58:33 +02:00
|
|
|
if (0)
|
|
|
|
{
|
|
|
|
FILE *z = fopen("decodestats.stt", "a");
|
|
|
|
fprintf(z, "%6d F:%d,G:%d,A:%d,L:%d,Q:%d\n",
|
|
|
|
pc->current_video_frame,
|
|
|
|
pc->frame_type,
|
|
|
|
pc->refresh_golden_frame,
|
|
|
|
pc->refresh_alt_ref_frame,
|
|
|
|
pc->refresh_last_frame,
|
|
|
|
pc->base_qindex);
|
|
|
|
fclose(z);
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
2011-08-08 10:56:20 +02:00
|
|
|
pbi->independent_partitions = 1;
|
|
|
|
|
2012-02-07 00:10:13 +01:00
|
|
|
if(vp8_read_bit(bc))
|
|
|
|
{
|
2010-10-28 01:04:02 +02:00
|
|
|
/* read coef probability tree */
|
2010-05-18 17:58:33 +02:00
|
|
|
for (i = 0; i < BLOCK_TYPES; i++)
|
|
|
|
for (j = 0; j < COEF_BANDS; j++)
|
|
|
|
for (k = 0; k < PREV_COEF_CONTEXTS; k++)
|
2011-06-28 23:03:47 +02:00
|
|
|
for (l = 0; l < ENTROPY_NODES; l++)
|
2010-05-18 17:58:33 +02:00
|
|
|
{
|
|
|
|
vp8_prob *const p = pc->fc.coef_probs [i][j][k] + l;
|
|
|
|
|
|
|
|
if (vp8_read(bc, vp8_coef_update_probs [i][j][k][l]))
|
|
|
|
{
|
|
|
|
*p = (vp8_prob)vp8_read_literal(bc, 8);
|
|
|
|
|
|
|
|
}
|
2011-08-08 10:56:20 +02:00
|
|
|
if (k > 0 && *p != pc->fc.coef_probs[i][j][k-1][l])
|
|
|
|
pbi->independent_partitions = 0;
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
2012-02-07 00:10:13 +01:00
|
|
|
}
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
2011-02-14 23:18:18 +01:00
|
|
|
#if CONFIG_T8X8
|
2012-02-07 00:10:13 +01:00
|
|
|
if(pbi->common.txfm_mode == ALLOW_8X8 && vp8_read_bit(bc))
|
2011-02-14 23:18:18 +01:00
|
|
|
{
|
|
|
|
// read coef probability tree
|
|
|
|
for (i = 0; i < BLOCK_TYPES; i++)
|
|
|
|
for (j = 0; j < COEF_BANDS; j++)
|
|
|
|
for (k = 0; k < PREV_COEF_CONTEXTS; k++)
|
|
|
|
for (l = 0; l < MAX_ENTROPY_TOKENS - 1; l++)
|
|
|
|
{
|
|
|
|
|
|
|
|
vp8_prob *const p = pc->fc.coef_probs_8x8 [i][j][k] + l;
|
|
|
|
|
|
|
|
if (vp8_read(bc, vp8_coef_update_probs_8x8 [i][j][k][l]))
|
|
|
|
{
|
|
|
|
*p = (vp8_prob)vp8_read_literal(bc, 8);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2010-07-22 14:07:32 +02:00
|
|
|
vpx_memcpy(&xd->pre, &pc->yv12_fb[pc->lst_fb_idx], sizeof(YV12_BUFFER_CONFIG));
|
|
|
|
vpx_memcpy(&xd->dst, &pc->yv12_fb[pc->new_fb_idx], sizeof(YV12_BUFFER_CONFIG));
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2012-01-27 19:35:14 +01:00
|
|
|
// Create the segmentation map structure and set to 0
|
2012-01-27 19:29:07 +01:00
|
|
|
if (!pc->last_frame_seg_map)
|
|
|
|
CHECK_MEM_ERROR(pc->last_frame_seg_map,
|
|
|
|
vpx_calloc((pc->mb_rows * pc->mb_cols), 1));
|
2010-09-24 00:25:33 +02:00
|
|
|
|
2010-10-28 01:04:02 +02:00
|
|
|
/* set up frame new frame for intra coded blocks */
|
2012-02-10 17:02:10 +01:00
|
|
|
vp8_setup_intra_recon(&pc->yv12_fb[pc->new_fb_idx]);
|
2010-05-18 17:58:33 +02:00
|
|
|
|
|
|
|
vp8_setup_block_dptrs(xd);
|
|
|
|
|
|
|
|
vp8_build_block_doffsets(xd);
|
|
|
|
|
2010-10-28 01:04:02 +02:00
|
|
|
/* clear out the coeff buffer */
|
2010-05-18 17:58:33 +02:00
|
|
|
vpx_memset(xd->qcoeff, 0, sizeof(xd->qcoeff));
|
|
|
|
|
2010-10-28 01:04:02 +02:00
|
|
|
/* Read the mb_no_coeff_skip flag */
|
2010-05-18 17:58:33 +02:00
|
|
|
pc->mb_no_coeff_skip = (int)vp8_read_bit(bc);
|
|
|
|
|
2010-09-09 20:42:48 +02:00
|
|
|
vp8_decode_mode_mvs(pbi);
|
2011-12-08 20:43:09 +01:00
|
|
|
if(pbi->common.frame_type != KEY_FRAME)
|
2011-12-06 21:03:42 +01:00
|
|
|
{
|
|
|
|
vp8_update_mode_context(&pbi->common);
|
|
|
|
}
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2011-05-02 15:30:51 +02:00
|
|
|
#if CONFIG_ERROR_CONCEALMENT
|
2011-08-08 10:56:20 +02:00
|
|
|
if (pbi->ec_active &&
|
2011-05-02 15:30:51 +02:00
|
|
|
pbi->mvs_corrupt_from_mb < (unsigned int)pc->mb_cols * pc->mb_rows)
|
|
|
|
{
|
|
|
|
/* Motion vectors are missing in this frame. We will try to estimate
|
|
|
|
* them and then continue decoding the frame as usual */
|
|
|
|
vp8_estimate_missing_mvs(pbi);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2010-08-31 16:49:57 +02:00
|
|
|
vpx_memset(pc->above_context, 0, sizeof(ENTROPY_CONTEXT_PLANES) * pc->mb_cols);
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2012-01-28 11:24:43 +01:00
|
|
|
// Resset the macroblock mode info context to the start of the list
|
|
|
|
xd->mode_info_context = pc->mi;
|
|
|
|
|
2010-05-18 17:58:33 +02:00
|
|
|
{
|
|
|
|
int ibc = 0;
|
2010-06-11 16:17:57 +02:00
|
|
|
int num_part = 1 << pc->multi_token_partition;
|
2011-08-08 10:56:20 +02:00
|
|
|
pbi->frame_corrupt_residual = 0;
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2012-02-02 18:04:40 +01:00
|
|
|
#if CONFIG_SUPERBLOCKS
|
|
|
|
/* Decode a row of super-blocks */
|
|
|
|
for (mb_row = 0; mb_row < pc->mb_rows; mb_row+=2)
|
|
|
|
{
|
|
|
|
if (num_part > 1)
|
|
|
|
{
|
|
|
|
xd->current_bc = & pbi->mbc[ibc];
|
|
|
|
ibc++;
|
|
|
|
|
|
|
|
if (ibc == num_part)
|
|
|
|
ibc = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
decode_sb_row(pbi, pc, mb_row, xd);
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
/* Decode a row of macro blocks */
|
2010-05-18 17:58:33 +02:00
|
|
|
for (mb_row = 0; mb_row < pc->mb_rows; mb_row++)
|
|
|
|
{
|
|
|
|
|
|
|
|
if (num_part > 1)
|
|
|
|
{
|
|
|
|
xd->current_bc = & pbi->mbc[ibc];
|
|
|
|
ibc++;
|
|
|
|
|
|
|
|
if (ibc == num_part)
|
|
|
|
ibc = 0;
|
|
|
|
}
|
|
|
|
|
2011-03-17 22:07:59 +01:00
|
|
|
decode_mb_row(pbi, pc, mb_row, xd);
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
2012-02-02 18:04:40 +01:00
|
|
|
#endif /* CONFIG_SUPERBLOCKS */
|
2011-08-08 10:56:20 +02:00
|
|
|
corrupt_tokens |= xd->corrupted;
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
stop_token_decoder(pbi);
|
|
|
|
|
2010-12-16 16:46:31 +01:00
|
|
|
/* Collect information about decoder corruption. */
|
|
|
|
/* 1. Check first boolean decoder for errors. */
|
2011-08-08 10:56:20 +02:00
|
|
|
pc->yv12_fb[pc->new_fb_idx].corrupted = vp8dx_bool_error(bc);
|
2010-12-16 16:46:31 +01:00
|
|
|
/* 2. Check the macroblock information */
|
2011-08-08 10:56:20 +02:00
|
|
|
pc->yv12_fb[pc->new_fb_idx].corrupted |= corrupt_tokens;
|
|
|
|
|
|
|
|
if (!pbi->decoded_key_frame)
|
|
|
|
{
|
|
|
|
if (pc->frame_type == KEY_FRAME &&
|
|
|
|
!pc->yv12_fb[pc->new_fb_idx].corrupted)
|
|
|
|
pbi->decoded_key_frame = 1;
|
|
|
|
else
|
|
|
|
vpx_internal_error(&pbi->common.error, VPX_CODEC_CORRUPT_FRAME,
|
|
|
|
"A stream must start with a complete key frame");
|
|
|
|
}
|
2010-12-16 16:46:31 +01:00
|
|
|
|
2010-10-28 01:04:02 +02:00
|
|
|
/* vpx_log("Decoder: Frame Decoded, Size Roughly:%d bytes \n",bc->pos+pbi->bc2.pos); */
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2010-10-28 01:04:02 +02:00
|
|
|
/* If this was a kf or Gf note the Q used */
|
2010-06-11 16:17:57 +02:00
|
|
|
if ((pc->frame_type == KEY_FRAME) ||
|
|
|
|
pc->refresh_golden_frame || pc->refresh_alt_ref_frame)
|
|
|
|
{
|
2010-05-18 17:58:33 +02:00
|
|
|
pc->last_kf_gf_q = pc->base_qindex;
|
2010-06-11 16:17:57 +02:00
|
|
|
}
|
2011-12-01 01:36:46 +01:00
|
|
|
if(pc->refresh_entropy_probs)
|
|
|
|
{
|
|
|
|
if(pc->refresh_alt_ref_frame)
|
|
|
|
vpx_memcpy(&pc->lfc_a, &pc->fc, sizeof(pc->fc));
|
|
|
|
else
|
|
|
|
vpx_memcpy(&pc->lfc, &pc->fc, sizeof(pc->fc));
|
|
|
|
}
|
2010-05-18 17:58:33 +02:00
|
|
|
|
|
|
|
#ifdef PACKET_TESTING
|
|
|
|
{
|
|
|
|
FILE *f = fopen("decompressor.VP8", "ab");
|
|
|
|
unsigned int size = pbi->bc2.pos + pbi->bc.pos + 8;
|
|
|
|
fwrite((void *) &size, 4, 1, f);
|
|
|
|
fwrite((void *) pbi->Source, size, 1, f);
|
|
|
|
fclose(f);
|
|
|
|
}
|
|
|
|
#endif
|
2011-02-14 23:18:18 +01:00
|
|
|
//printf("Frame %d Done\n", frame_count++);
|
2010-05-18 17:58:33 +02:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
2012-02-02 18:04:40 +01:00
|
|
|
|