60cb39da86
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
246 lines
6.2 KiB
C
246 lines
6.2 KiB
C
/*
|
|
* Copyright (c) 2010 The WebM project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
|
|
#ifndef __INC_VP8C_INT_H
|
|
#define __INC_VP8C_INT_H
|
|
|
|
#include "vpx_config.h"
|
|
#include "vpx/internal/vpx_codec_internal.h"
|
|
#include "loopfilter.h"
|
|
#include "entropymv.h"
|
|
#include "entropy.h"
|
|
#include "idct.h"
|
|
#include "recon.h"
|
|
#if CONFIG_POSTPROC
|
|
#include "postproc.h"
|
|
#endif
|
|
|
|
/*#ifdef PACKET_TESTING*/
|
|
#include "header.h"
|
|
/*#endif*/
|
|
|
|
/* Create/destroy static data structures. */
|
|
|
|
void vp8_initialize_common(void);
|
|
|
|
#define MINQ 0
|
|
#define MAXQ 127
|
|
#define QINDEX_RANGE (MAXQ + 1)
|
|
|
|
#define NUM_YV12_BUFFERS 4
|
|
|
|
#define MAX_PARTITIONS 9
|
|
|
|
typedef struct frame_contexts
|
|
{
|
|
vp8_prob bmode_prob [VP8_BINTRAMODES-1];
|
|
vp8_prob ymode_prob [VP8_YMODES-1]; /* interframe intra mode probs */
|
|
vp8_prob uv_mode_prob [VP8_UV_MODES-1];
|
|
vp8_prob sub_mv_ref_prob [VP8_SUBMVREFS-1];
|
|
vp8_prob coef_probs [BLOCK_TYPES] [COEF_BANDS] [PREV_COEF_CONTEXTS] [ENTROPY_NODES];
|
|
#if CONFIG_T8X8
|
|
vp8_prob coef_probs_8x8 [BLOCK_TYPES] [COEF_BANDS] [PREV_COEF_CONTEXTS] [ENTROPY_NODES];
|
|
#endif
|
|
MV_CONTEXT mvc[2];
|
|
MV_CONTEXT pre_mvc[2]; /* not to caculate the mvcost for the frame if mvc doesn't change. */
|
|
} 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;
|
|
|
|
#if CONFIG_DUALPRED
|
|
typedef enum
|
|
{
|
|
SINGLE_PREDICTION_ONLY = 0,
|
|
DUAL_PREDICTION_ONLY = 1,
|
|
HYBRID_PREDICTION = 2,
|
|
NB_PREDICTION_TYPES = 3,
|
|
} DUALPREDMODE_TYPE;
|
|
#endif /* CONFIG_DUALPRED */
|
|
|
|
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;
|
|
#if CONFIG_POSTPROC
|
|
vp8_postproc_rtcd_vtable_t postproc;
|
|
#endif
|
|
int flags;
|
|
#else
|
|
int unused;
|
|
#endif
|
|
} VP8_COMMON_RTCD;
|
|
|
|
typedef struct VP8Common
|
|
|
|
{
|
|
struct vpx_internal_error_info error;
|
|
|
|
DECLARE_ALIGNED(16, short, Y1dequant[QINDEX_RANGE][16]);
|
|
DECLARE_ALIGNED(16, short, Y2dequant[QINDEX_RANGE][16]);
|
|
DECLARE_ALIGNED(16, short, UVdequant[QINDEX_RANGE][16]);
|
|
|
|
int Width;
|
|
int Height;
|
|
int horiz_scale;
|
|
int vert_scale;
|
|
|
|
YUV_TYPE clr_type;
|
|
CLAMP_TYPE clamp_type;
|
|
|
|
YV12_BUFFER_CONFIG *frame_to_show;
|
|
|
|
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;
|
|
|
|
YV12_BUFFER_CONFIG post_proc_buffer;
|
|
YV12_BUFFER_CONFIG temp_scale_frame;
|
|
|
|
|
|
FRAME_TYPE last_frame_type; /* Save last frame's frame type for motion search. */
|
|
FRAME_TYPE frame_type;
|
|
|
|
int show_frame;
|
|
|
|
int frame_flags;
|
|
int MBs;
|
|
int mb_rows;
|
|
int mb_cols;
|
|
int mode_info_stride;
|
|
|
|
/* profile settings */
|
|
int experimental;
|
|
int mb_no_coeff_skip;
|
|
#if CONFIG_DUALPRED
|
|
DUALPREDMODE_TYPE dual_pred_mode;
|
|
#endif /* CONFIG_DUALPRED */
|
|
int no_lpf;
|
|
int use_bilinear_mc_filter;
|
|
int full_pixel;
|
|
|
|
int base_qindex;
|
|
int last_kf_gf_q; /* Q used on the last GF or KF */
|
|
|
|
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 */
|
|
MODE_INFO *prev_mip; /* MODE_INFO array 'mip' from last decoded frame */
|
|
MODE_INFO *prev_mi; /* 'mi' from last frame (points into prev_mip) */
|
|
|
|
|
|
INTERPOLATIONFILTERTYPE mcomp_filter_type;
|
|
LOOPFILTERTYPE filter_type;
|
|
|
|
loop_filter_info_n lf_info;
|
|
|
|
int filter_level;
|
|
int last_sharpness_level;
|
|
int sharpness_level;
|
|
|
|
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 */
|
|
|
|
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 */
|
|
|
|
int refresh_entropy_probs; /* Two state 0 = NO, 1 = YES */
|
|
|
|
int ref_frame_sign_bias[MAX_REF_FRAMES]; /* Two state 0, 1 */
|
|
|
|
/* Y,U,V,Y2 */
|
|
ENTROPY_CONTEXT_PLANES *above_context; /* row of context for each plane */
|
|
ENTROPY_CONTEXT_PLANES left_context; /* (up to) 4 contexts "" */
|
|
|
|
|
|
/* keyframe block modes are predicted by their above, left neighbors */
|
|
|
|
vp8_prob kf_bmode_prob [VP8_BINTRAMODES] [VP8_BINTRAMODES] [VP8_BINTRAMODES-1];
|
|
#if CONFIG_QIMODE
|
|
vp8_prob kf_ymode_prob[8][VP8_YMODES-1]; /* keyframe "" */
|
|
int kf_ymode_probs_index;
|
|
int kf_ymode_probs_update;
|
|
#else
|
|
vp8_prob kf_ymode_prob [VP8_YMODES-1]; /* keyframe "" */
|
|
#endif
|
|
#if CONFIG_UVINTRA
|
|
vp8_prob kf_uv_mode_prob[VP8_YMODES] [VP8_UV_MODES-1];
|
|
#else
|
|
vp8_prob kf_uv_mode_prob [VP8_UV_MODES-1];
|
|
#endif
|
|
#if CONFIG_I8X8
|
|
vp8_prob i8x8_mode_prob [VP8_UV_MODES-1];
|
|
#endif
|
|
|
|
#if CONFIG_MULCONTEXT
|
|
FRAME_CONTEXT lfc_a; /* last alt ref entropy */
|
|
#endif
|
|
FRAME_CONTEXT lfc; /* last frame entropy */
|
|
FRAME_CONTEXT fc; /* this frame entropy */
|
|
|
|
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;
|
|
#endif
|
|
#if CONFIG_MULTITHREAD
|
|
int processor_core_count;
|
|
#endif
|
|
#if CONFIG_POSTPROC
|
|
struct postproc_state postproc_state;
|
|
#endif
|
|
} VP8_COMMON;
|
|
|
|
#endif
|