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-18 18:39:21 +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-18 18:39:21 +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
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#ifndef __INC_VP8C_INT_H
|
|
|
|
|
#define __INC_VP8C_INT_H
|
|
|
|
|
|
2010-05-24 17:39:59 +02:00
|
|
|
#include "vpx_config.h"
|
|
|
|
|
#include "vpx/internal/vpx_codec_internal.h"
|
2010-05-18 17:58:33 +02:00
|
|
|
#include "loopfilter.h"
|
|
|
|
|
#include "entropymv.h"
|
|
|
|
|
#include "entropy.h"
|
|
|
|
|
#include "idct.h"
|
|
|
|
|
#include "recon.h"
|
2011-08-01 22:42:14 +02:00
|
|
|
#if CONFIG_POSTPROC
|
2010-05-18 17:58:33 +02:00
|
|
|
#include "postproc.h"
|
2011-08-01 22:42:14 +02:00
|
|
|
#endif
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2010-10-28 01:04:02 +02:00
|
|
|
/*#ifdef PACKET_TESTING*/
|
2010-05-18 17:58:33 +02:00
|
|
|
#include "header.h"
|
2010-10-28 01:04:02 +02:00
|
|
|
/*#endif*/
|
2010-05-18 17:58:33 +02:00
|
|
|
|
|
|
|
|
/* Create/destroy static data structures. */
|
|
|
|
|
|
|
|
|
|
void vp8_initialize_common(void);
|
|
|
|
|
|
|
|
|
|
#define MINQ 0
|
2011-12-12 19:27:25 +01:00
|
|
|
|
|
|
|
|
#define MAXQ 255
|
|
|
|
|
#define QINDEX_BITS 8
|
|
|
|
|
|
2010-05-18 17:58:33 +02:00
|
|
|
#define QINDEX_RANGE (MAXQ + 1)
|
|
|
|
|
|
2010-07-22 14:07:32 +02:00
|
|
|
#define NUM_YV12_BUFFERS 4
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2011-06-13 16:42:27 +02:00
|
|
|
#define MAX_PARTITIONS 9
|
|
|
|
|
|
2012-02-09 16:44:18 +01:00
|
|
|
#define DUAL_PRED_CONTEXTS 2
|
|
|
|
|
|
2010-05-18 17:58:33 +02:00
|
|
|
typedef struct frame_contexts
|
|
|
|
|
{
|
|
|
|
|
vp8_prob bmode_prob [VP8_BINTRAMODES-1];
|
|
|
|
|
vp8_prob ymode_prob [VP8_YMODES-1]; /* interframe intra mode probs */
|
2011-12-08 20:43:09 +01:00
|
|
|
#if CONFIG_UVINTRA
|
|
|
|
|
vp8_prob uv_mode_prob [VP8_YMODES][VP8_UV_MODES-1];
|
|
|
|
|
#else
|
2010-05-18 17:58:33 +02:00
|
|
|
vp8_prob uv_mode_prob [VP8_UV_MODES-1];
|
2011-12-08 20:43:09 +01:00
|
|
|
#endif
|
2010-05-18 17:58:33 +02:00
|
|
|
vp8_prob sub_mv_ref_prob [VP8_SUBMVREFS-1];
|
2011-06-28 23:03:47 +02:00
|
|
|
vp8_prob coef_probs [BLOCK_TYPES] [COEF_BANDS] [PREV_COEF_CONTEXTS] [ENTROPY_NODES];
|
2011-02-14 23:18:18 +01:00
|
|
|
#if CONFIG_T8X8
|
|
|
|
|
vp8_prob coef_probs_8x8 [BLOCK_TYPES] [COEF_BANDS] [PREV_COEF_CONTEXTS] [ENTROPY_NODES];
|
|
|
|
|
#endif
|
2010-05-18 17:58:33 +02:00
|
|
|
MV_CONTEXT mvc[2];
|
2010-10-28 01:04:02 +02:00
|
|
|
MV_CONTEXT pre_mvc[2]; /* not to caculate the mvcost for the frame if mvc doesn't change. */
|
2010-05-18 17:58:33 +02:00
|
|
|
} FRAME_CONTEXT;
|
|
|
|
|
|
|
|
|
|
typedef enum
|
|
|
|
|
{
|
|
|
|
|
ONE_PARTITION = 0,
|
|
|
|
|
TWO_PARTITION = 1,
|
|
|
|
|
FOUR_PARTITION = 2,
|
|
|
|
|
EIGHT_PARTITION = 3
|
|
|
|
|
} TOKEN_PARTITION;
|
|
|
|
|
|
|
|
|
|
typedef enum
|
|
|
|
|
{
|
|
|
|
|
RECON_CLAMP_REQUIRED = 0,
|
|
|
|
|
RECON_CLAMP_NOTREQUIRED = 1
|
|
|
|
|
} CLAMP_TYPE;
|
|
|
|
|
|
|
|
|
|
typedef enum
|
|
|
|
|
{
|
|
|
|
|
SIXTAP = 0,
|
|
|
|
|
BILINEAR = 1
|
|
|
|
|
} INTERPOLATIONFILTERTYPE;
|
|
|
|
|
|
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
|
|
|
typedef enum
|
|
|
|
|
{
|
|
|
|
|
SINGLE_PREDICTION_ONLY = 0,
|
|
|
|
|
DUAL_PREDICTION_ONLY = 1,
|
|
|
|
|
HYBRID_PREDICTION = 2,
|
|
|
|
|
NB_PREDICTION_TYPES = 3,
|
|
|
|
|
} DUALPREDMODE_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
|
|
|
|
|
/* TODO: allows larger transform */
|
|
|
|
|
typedef enum
|
|
|
|
|
{
|
|
|
|
|
ONLY_4X4 = 0,
|
|
|
|
|
ALLOW_8X8 = 1
|
|
|
|
|
} TXFM_MODE;
|
|
|
|
|
#endif /* CONFIG_T8X8 */
|
|
|
|
|
|
2010-05-18 17:58:33 +02:00
|
|
|
typedef struct VP8_COMMON_RTCD
|
|
|
|
|
{
|
|
|
|
|
#if CONFIG_RUNTIME_CPU_DETECT
|
|
|
|
|
vp8_idct_rtcd_vtable_t idct;
|
|
|
|
|
vp8_recon_rtcd_vtable_t recon;
|
|
|
|
|
vp8_subpix_rtcd_vtable_t subpix;
|
|
|
|
|
vp8_loopfilter_rtcd_vtable_t loopfilter;
|
2011-08-01 22:42:14 +02:00
|
|
|
#if CONFIG_POSTPROC
|
2010-05-18 17:58:33 +02:00
|
|
|
vp8_postproc_rtcd_vtable_t postproc;
|
2011-08-01 22:42:14 +02:00
|
|
|
#endif
|
Add runtime CPU detection support for ARM.
The primary goal is to allow a binary to be built which supports
NEON, but can fall back to non-NEON routines, since some Android
devices do not have NEON, even if they are otherwise ARMv7 (e.g.,
Tegra).
The configure-generated flags HAVE_ARMV7, etc., are used to decide
which versions of each function to build, and when
CONFIG_RUNTIME_CPU_DETECT is enabled, the correct version is chosen
at run time.
In order for this to work, the CFLAGS must be set to something
appropriate (e.g., without -mfpu=neon for ARMv7, and with
appropriate -march and -mcpu for even earlier configurations), or
the native C code will not be able to run.
The ASFLAGS must remain set for the most advanced instruction set
required at build time, since the ARM assembler will refuse to emit
them otherwise.
I have not attempted to make any changes to configure to do this
automatically.
Doing so will probably require the addition of new configure options.
Many of the hooks for RTCD on ARM were already there, but a lot of
the code had bit-rotted, and a good deal of the ARM-specific code
is not integrated into the RTCD structs at all.
I did not try to resolve the latter, merely to add the minimal amount
of protection around them to allow RTCD to work.
Those functions that were called based on an ifdef at the calling
site were expanded to check the RTCD flags at that site, but they
should be added to an RTCD struct somewhere in the future.
The functions invoked with global function pointers still are, but
these should be moved into an RTCD struct for thread safety (I
believe every platform currently supported has atomic pointer
stores, but this is not guaranteed).
The encoder's boolhuff functions did not even have _c and armv7
suffixes, and the correct version was resolved at link time.
The token packing functions did have appropriate suffixes, but the
version was selected with a define, with no associated RTCD struct.
However, for both of these, the only armv7 instruction they actually
used was rbit, and this was completely superfluous, so I reworked
them to avoid it.
The only non-ARMv4 instruction remaining in them is clz, which is
ARMv5 (not even ARMv5TE is required).
Considering that there are no ARM-specific configs which are not at
least ARMv5TE, I did not try to detect these at runtime, and simply
enable them for ARMv5 and above.
Finally, the NEON register saving code was completely non-reentrant,
since it saved the registers to a global, static variable.
I moved the storage for this onto the stack.
A single binary built with this code was tested on an ARM11 (ARMv6)
and a Cortex A8 (ARMv7 w/NEON), for both the encoder and decoder,
and produced identical output, while using the correct accelerated
functions on each.
I did not test on any earlier processors.
Change-Id: I45cbd63a614f4554c3b325c45d46c0806f009eaa
2010-10-21 00:39:11 +02:00
|
|
|
int flags;
|
2010-05-18 17:58:33 +02:00
|
|
|
#else
|
|
|
|
|
int unused;
|
|
|
|
|
#endif
|
|
|
|
|
} VP8_COMMON_RTCD;
|
|
|
|
|
|
|
|
|
|
typedef struct VP8Common
|
2011-06-10 13:10:21 +02:00
|
|
|
|
2010-05-18 17:58:33 +02:00
|
|
|
{
|
|
|
|
|
struct vpx_internal_error_info error;
|
|
|
|
|
|
2010-10-22 02:04:30 +02:00
|
|
|
DECLARE_ALIGNED(16, short, Y1dequant[QINDEX_RANGE][16]);
|
|
|
|
|
DECLARE_ALIGNED(16, short, Y2dequant[QINDEX_RANGE][16]);
|
|
|
|
|
DECLARE_ALIGNED(16, short, UVdequant[QINDEX_RANGE][16]);
|
2010-05-18 17:58:33 +02:00
|
|
|
|
|
|
|
|
int Width;
|
|
|
|
|
int Height;
|
|
|
|
|
int horiz_scale;
|
|
|
|
|
int vert_scale;
|
|
|
|
|
|
|
|
|
|
YUV_TYPE clr_type;
|
|
|
|
|
CLAMP_TYPE clamp_type;
|
|
|
|
|
|
|
|
|
|
YV12_BUFFER_CONFIG *frame_to_show;
|
2010-07-22 14:07:32 +02:00
|
|
|
|
|
|
|
|
YV12_BUFFER_CONFIG yv12_fb[NUM_YV12_BUFFERS];
|
|
|
|
|
int fb_idx_ref_cnt[NUM_YV12_BUFFERS];
|
|
|
|
|
int new_fb_idx, lst_fb_idx, gld_fb_idx, alt_fb_idx;
|
|
|
|
|
|
2010-05-18 17:58:33 +02:00
|
|
|
YV12_BUFFER_CONFIG post_proc_buffer;
|
|
|
|
|
YV12_BUFFER_CONFIG temp_scale_frame;
|
|
|
|
|
|
2011-06-10 13:10:21 +02:00
|
|
|
|
|
|
|
|
FRAME_TYPE last_frame_type; /* Save last frame's frame type for motion search. */
|
2010-05-18 17:58:33 +02:00
|
|
|
FRAME_TYPE frame_type;
|
|
|
|
|
|
|
|
|
|
int show_frame;
|
|
|
|
|
|
|
|
|
|
int frame_flags;
|
|
|
|
|
int MBs;
|
|
|
|
|
int mb_rows;
|
|
|
|
|
int mb_cols;
|
|
|
|
|
int mode_info_stride;
|
|
|
|
|
|
2010-10-28 01:04:02 +02:00
|
|
|
/* profile settings */
|
2010-06-01 17:14:25 +02:00
|
|
|
int experimental;
|
2010-05-18 17:58:33 +02:00
|
|
|
int mb_no_coeff_skip;
|
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
|
|
|
|
|
TXFM_MODE txfm_mode;
|
|
|
|
|
#endif
|
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
|
|
|
DUALPREDMODE_TYPE dual_pred_mode;
|
2010-05-18 17:58:33 +02:00
|
|
|
int no_lpf;
|
|
|
|
|
int use_bilinear_mc_filter;
|
|
|
|
|
int full_pixel;
|
|
|
|
|
|
|
|
|
|
int base_qindex;
|
2010-10-28 01:04:02 +02:00
|
|
|
int last_kf_gf_q; /* Q used on the last GF or KF */
|
2010-05-18 17:58:33 +02:00
|
|
|
|
|
|
|
|
int y1dc_delta_q;
|
|
|
|
|
int y2dc_delta_q;
|
|
|
|
|
int y2ac_delta_q;
|
|
|
|
|
int uvdc_delta_q;
|
|
|
|
|
int uvac_delta_q;
|
|
|
|
|
|
|
|
|
|
unsigned int frames_since_golden;
|
|
|
|
|
unsigned int frames_till_alt_ref_frame;
|
|
|
|
|
|
|
|
|
|
/* We allocate a MODE_INFO struct for each macroblock, together with
|
|
|
|
|
an extra row on top and column on the left to simplify prediction. */
|
|
|
|
|
|
|
|
|
|
MODE_INFO *mip; /* Base of allocated array */
|
|
|
|
|
MODE_INFO *mi; /* Corresponds to upper left visible macroblock */
|
2011-05-02 15:30:51 +02:00
|
|
|
MODE_INFO *prev_mip; /* MODE_INFO array 'mip' from last decoded frame */
|
|
|
|
|
MODE_INFO *prev_mi; /* 'mi' from last frame (points into prev_mip) */
|
2010-05-18 17:58:33 +02:00
|
|
|
|
|
|
|
|
|
2012-01-27 19:29:07 +01:00
|
|
|
// Persistent mb segment id map used in prediction.
|
|
|
|
|
unsigned char * last_frame_seg_map;
|
|
|
|
|
|
2010-05-18 17:58:33 +02:00
|
|
|
INTERPOLATIONFILTERTYPE mcomp_filter_type;
|
|
|
|
|
LOOPFILTERTYPE filter_type;
|
2011-06-10 13:10:21 +02:00
|
|
|
|
|
|
|
|
loop_filter_info_n lf_info;
|
|
|
|
|
|
2010-05-18 17:58:33 +02:00
|
|
|
int filter_level;
|
|
|
|
|
int last_sharpness_level;
|
|
|
|
|
int sharpness_level;
|
|
|
|
|
|
2010-10-28 01:04:02 +02:00
|
|
|
int refresh_last_frame; /* Two state 0 = NO, 1 = YES */
|
|
|
|
|
int refresh_golden_frame; /* Two state 0 = NO, 1 = YES */
|
|
|
|
|
int refresh_alt_ref_frame; /* Two state 0 = NO, 1 = YES */
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2010-10-28 01:04:02 +02:00
|
|
|
int copy_buffer_to_gf; /* 0 none, 1 Last to GF, 2 ARF to GF */
|
|
|
|
|
int copy_buffer_to_arf; /* 0 none, 1 Last to ARF, 2 GF to ARF */
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2010-10-28 01:04:02 +02:00
|
|
|
int refresh_entropy_probs; /* Two state 0 = NO, 1 = YES */
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2010-10-28 01:04:02 +02:00
|
|
|
int ref_frame_sign_bias[MAX_REF_FRAMES]; /* Two state 0, 1 */
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2010-10-28 01:04:02 +02:00
|
|
|
/* Y,U,V,Y2 */
|
|
|
|
|
ENTROPY_CONTEXT_PLANES *above_context; /* row of context for each plane */
|
|
|
|
|
ENTROPY_CONTEXT_PLANES left_context; /* (up to) 4 contexts "" */
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2010-10-28 01:04:02 +02:00
|
|
|
/* keyframe block modes are predicted by their above, left neighbors */
|
2010-05-18 17:58:33 +02:00
|
|
|
|
|
|
|
|
vp8_prob kf_bmode_prob [VP8_BINTRAMODES] [VP8_BINTRAMODES] [VP8_BINTRAMODES-1];
|
2011-08-05 01:30:27 +02:00
|
|
|
#if CONFIG_QIMODE
|
|
|
|
|
vp8_prob kf_ymode_prob[8][VP8_YMODES-1]; /* keyframe "" */
|
2011-08-31 21:01:58 +02:00
|
|
|
int kf_ymode_probs_index;
|
|
|
|
|
int kf_ymode_probs_update;
|
2011-08-05 01:30:27 +02:00
|
|
|
#else
|
2010-05-18 17:58:33 +02:00
|
|
|
vp8_prob kf_ymode_prob [VP8_YMODES-1]; /* keyframe "" */
|
2011-08-05 01:30:27 +02:00
|
|
|
#endif
|
2011-08-05 01:30:27 +02:00
|
|
|
#if CONFIG_UVINTRA
|
|
|
|
|
vp8_prob kf_uv_mode_prob[VP8_YMODES] [VP8_UV_MODES-1];
|
|
|
|
|
#else
|
2010-05-18 17:58:33 +02:00
|
|
|
vp8_prob kf_uv_mode_prob [VP8_UV_MODES-1];
|
2011-08-05 01:30:27 +02:00
|
|
|
#endif
|
2011-12-07 22:03:57 +01:00
|
|
|
|
2011-08-05 01:30:27 +02:00
|
|
|
vp8_prob i8x8_mode_prob [VP8_UV_MODES-1];
|
2012-01-27 19:35:14 +01:00
|
|
|
|
|
|
|
|
vp8_prob prob_intra_coded;
|
|
|
|
|
vp8_prob prob_last_coded;
|
|
|
|
|
vp8_prob prob_gf_coded;
|
|
|
|
|
|
2012-01-27 19:29:07 +01:00
|
|
|
// Context probabilities when using predictive coding of segment id
|
|
|
|
|
vp8_prob segment_pred_probs[PREDICTION_PROBS];
|
|
|
|
|
unsigned char temporal_update;
|
|
|
|
|
|
2012-01-28 11:07:08 +01:00
|
|
|
// Context probabilities for reference frame prediction
|
2012-02-03 14:46:18 +01:00
|
|
|
unsigned char ref_scores[MAX_REF_FRAMES];
|
2012-01-28 11:07:08 +01:00
|
|
|
vp8_prob ref_pred_probs[PREDICTION_PROBS];
|
|
|
|
|
vp8_prob mod_refprobs[MAX_REF_FRAMES][PREDICTION_PROBS];
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2012-02-09 16:44:18 +01:00
|
|
|
vp8_prob prob_dualpred[DUAL_PRED_CONTEXTS];
|
2012-02-02 15:33:34 +01:00
|
|
|
|
2011-12-01 01:36:46 +01:00
|
|
|
FRAME_CONTEXT lfc_a; /* last alt ref entropy */
|
2010-10-28 01:04:02 +02:00
|
|
|
FRAME_CONTEXT lfc; /* last frame entropy */
|
|
|
|
|
FRAME_CONTEXT fc; /* this frame entropy */
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2011-12-06 21:03:42 +01:00
|
|
|
int mv_ref_ct[6][4][2];
|
|
|
|
|
int mode_context[6][4];
|
2011-12-08 20:43:09 +01:00
|
|
|
int mv_ref_ct_a[6][4][2];
|
|
|
|
|
int mode_context_a[6][4];
|
2011-12-06 21:03:42 +01:00
|
|
|
int vp8_mode_contexts[6][4];
|
|
|
|
|
|
2010-05-18 17:58:33 +02:00
|
|
|
unsigned int current_video_frame;
|
|
|
|
|
int near_boffset[3];
|
|
|
|
|
int version;
|
|
|
|
|
|
|
|
|
|
TOKEN_PARTITION multi_token_partition;
|
|
|
|
|
|
|
|
|
|
#ifdef PACKET_TESTING
|
|
|
|
|
VP8_HEADER oh;
|
|
|
|
|
#endif
|
|
|
|
|
double bitrate;
|
|
|
|
|
double framerate;
|
|
|
|
|
|
|
|
|
|
#if CONFIG_RUNTIME_CPU_DETECT
|
|
|
|
|
VP8_COMMON_RTCD rtcd;
|
2011-03-25 11:53:03 +01:00
|
|
|
#endif
|
|
|
|
|
#if CONFIG_MULTITHREAD
|
|
|
|
|
int processor_core_count;
|
2010-05-18 17:58:33 +02:00
|
|
|
#endif
|
2011-08-01 22:42:14 +02:00
|
|
|
#if CONFIG_POSTPROC
|
2010-05-18 17:58:33 +02:00
|
|
|
struct postproc_state postproc_state;
|
2011-08-01 22:42:14 +02:00
|
|
|
#endif
|
2010-05-18 17:58:33 +02:00
|
|
|
} VP8_COMMON;
|
|
|
|
|
|
|
|
|
|
#endif
|