9daf3154db
This is the first patch to add superblock (32x32) coding order capabilities. It does not yet do any mode selection at the SB level, that will follow in a further patch. This patch encodes rows of SBs rather than MBs, each SB contains 2x2 MBs. Two intra prediction modes have been disabled since they require reconstructed data for the above-right MB which may not have been encoded yet (e.g. for the bottom right MB in each SB). Results on the one test clip I have tried (720p GIPS clip) suggest that it is somewhere around 0.2dB worse than the baseline version, so there may be bugs. It has been tested with no experiments enabled and with the following 3 experiments enabled: --enable-enhanced_interp --enable-high_precision_mv --enable-sixteenth_subpel_uv in each case the decode buffer matches the recon buffer (using "cmp" to compare the dumped/decoded frames). Note: Testing these experiments individually created errors. Some problems were found with other experiments but it is unclear what state these experiments are in: --enable-comp_intra_pred --enable-newentropy --enable-uvintra This code has not been extensively tested yet, so there is every likelihood that further bugs remain. I also intend to do some code cleanup & refactoring in tandem with the next patch that adds the 32x32 modes. Change-Id: I1eba7f740a70b3510df58db53464535ef881b4d9
366 lines
9.8 KiB
C
366 lines
9.8 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_BLOCKD_H
|
|
#define __INC_BLOCKD_H
|
|
|
|
void vpx_log(const char *format, ...);
|
|
|
|
#include "vpx_ports/config.h"
|
|
#include "vpx_scale/yv12config.h"
|
|
#include "mv.h"
|
|
#include "treecoder.h"
|
|
#include "subpixel.h"
|
|
#include "vpx_ports/mem.h"
|
|
#include "common.h"
|
|
|
|
#define TRUE 1
|
|
#define FALSE 0
|
|
|
|
//#define MODE_STATS
|
|
|
|
/*#define DCPRED 1*/
|
|
#define DCPREDSIMTHRESH 0
|
|
#define DCPREDCNTTHRESH 3
|
|
|
|
#define MB_FEATURE_TREE_PROBS 3
|
|
#define PREDICTION_PROBS 3
|
|
|
|
#if CONFIG_NEWENTROPY
|
|
#define MBSKIP_CONTEXTS 3
|
|
#endif
|
|
|
|
#define MAX_MB_SEGMENTS 4
|
|
|
|
#define MAX_REF_LF_DELTAS 4
|
|
#define MAX_MODE_LF_DELTAS 4
|
|
|
|
/* Segment Feature Masks */
|
|
#define SEGMENT_DELTADATA 0
|
|
#define SEGMENT_ABSDATA 1
|
|
|
|
typedef struct
|
|
{
|
|
int r, c;
|
|
} POS;
|
|
|
|
#define PLANE_TYPE_Y_NO_DC 0
|
|
#define PLANE_TYPE_Y2 1
|
|
#define PLANE_TYPE_UV 2
|
|
#define PLANE_TYPE_Y_WITH_DC 3
|
|
|
|
|
|
typedef char ENTROPY_CONTEXT;
|
|
typedef struct
|
|
{
|
|
ENTROPY_CONTEXT y1[4];
|
|
ENTROPY_CONTEXT u[2];
|
|
ENTROPY_CONTEXT v[2];
|
|
ENTROPY_CONTEXT y2;
|
|
} ENTROPY_CONTEXT_PLANES;
|
|
|
|
extern const unsigned char vp8_block2left[25];
|
|
extern const unsigned char vp8_block2above[25];
|
|
extern const unsigned char vp8_block2left_8x8[25];
|
|
extern const unsigned char vp8_block2above_8x8[25];
|
|
|
|
|
|
#define VP8_COMBINEENTROPYCONTEXTS( Dest, A, B) \
|
|
Dest = ((A)!=0) + ((B)!=0);
|
|
|
|
typedef enum
|
|
{
|
|
KEY_FRAME = 0,
|
|
INTER_FRAME = 1
|
|
} FRAME_TYPE;
|
|
|
|
typedef enum
|
|
{
|
|
DC_PRED, /* average of above and left pixels */
|
|
V_PRED, /* vertical prediction */
|
|
H_PRED, /* horizontal prediction */
|
|
TM_PRED, /* Truemotion prediction */
|
|
I8X8_PRED, /* 8x8 based prediction, each 8x8 has its own prediction mode */
|
|
B_PRED, /* block based prediction, each block has its own prediction mode */
|
|
|
|
NEARESTMV,
|
|
NEARMV,
|
|
ZEROMV,
|
|
NEWMV,
|
|
SPLITMV,
|
|
|
|
MB_MODE_COUNT
|
|
} MB_PREDICTION_MODE;
|
|
|
|
// Segment level features.
|
|
typedef enum
|
|
{
|
|
SEG_LVL_ALT_Q = 0, // Use alternate Quantizer ....
|
|
SEG_LVL_ALT_LF = 1, // Use alternate loop filter value...
|
|
SEG_LVL_REF_FRAME = 2, // Optional Segment reference frame
|
|
SEG_LVL_MODE = 3, // Optional Segment mode
|
|
SEG_LVL_EOB = 4, // EOB end stop marker.
|
|
SEG_LVL_TRANSFORM = 5, // Block transform size.
|
|
SEG_LVL_MAX = 6 // Number of MB level features supported
|
|
|
|
} SEG_LVL_FEATURES;
|
|
|
|
// Segment level features.
|
|
typedef enum
|
|
{
|
|
TX_4X4 = 0, // 4x4 dct transform
|
|
TX_8X8 = 1, // 8x8 dct transform
|
|
|
|
TX_SIZE_MAX = 2 // Number of differnt transforms avaialble
|
|
|
|
} TX_SIZE;
|
|
|
|
#define VP8_YMODES (B_PRED + 1)
|
|
#define VP8_UV_MODES (TM_PRED + 1)
|
|
#define VP8_I8X8_MODES (TM_PRED + 1)
|
|
|
|
#define VP8_MVREFS (1 + SPLITMV - NEARESTMV)
|
|
|
|
typedef enum
|
|
{
|
|
B_DC_PRED, /* average of above and left pixels */
|
|
B_TM_PRED,
|
|
|
|
B_VE_PRED, /* vertical prediction */
|
|
B_HE_PRED, /* horizontal prediction */
|
|
|
|
B_LD_PRED,
|
|
B_RD_PRED,
|
|
|
|
B_VR_PRED,
|
|
B_VL_PRED,
|
|
B_HD_PRED,
|
|
B_HU_PRED,
|
|
|
|
LEFT4X4,
|
|
ABOVE4X4,
|
|
ZERO4X4,
|
|
NEW4X4,
|
|
|
|
B_MODE_COUNT
|
|
} B_PREDICTION_MODE;
|
|
|
|
#define VP8_BINTRAMODES (B_HU_PRED + 1) /* 10 */
|
|
#define VP8_SUBMVREFS (1 + NEW4X4 - LEFT4X4)
|
|
|
|
/* For keyframes, intra block modes are predicted by the (already decoded)
|
|
modes for the Y blocks to the left and above us; for interframes, there
|
|
is a single probability table. */
|
|
|
|
union b_mode_info
|
|
{
|
|
struct {
|
|
B_PREDICTION_MODE first;
|
|
#if CONFIG_COMP_INTRA_PRED
|
|
B_PREDICTION_MODE second;
|
|
#endif
|
|
} as_mode;
|
|
int_mv mv;
|
|
};
|
|
|
|
typedef enum
|
|
{
|
|
INTRA_FRAME = 0,
|
|
LAST_FRAME = 1,
|
|
GOLDEN_FRAME = 2,
|
|
ALTREF_FRAME = 3,
|
|
MAX_REF_FRAMES = 4
|
|
} MV_REFERENCE_FRAME;
|
|
|
|
typedef struct
|
|
{
|
|
MB_PREDICTION_MODE mode, uv_mode;
|
|
#if CONFIG_COMP_INTRA_PRED
|
|
MB_PREDICTION_MODE second_mode, second_uv_mode;
|
|
#endif
|
|
MV_REFERENCE_FRAME ref_frame, second_ref_frame;
|
|
TX_SIZE txfm_size;
|
|
int_mv mv, second_mv;
|
|
unsigned char partitioning;
|
|
unsigned char mb_skip_coeff; /* does this mb has coefficients at all, 1=no coefficients, 0=need decode tokens */
|
|
unsigned char need_to_clamp_mvs;
|
|
unsigned char need_to_clamp_secondmv;
|
|
unsigned char segment_id; /* Which set of segmentation parameters should be used for this MB */
|
|
|
|
// Flags used for prediction status of various bistream signals
|
|
unsigned char seg_id_predicted;
|
|
unsigned char ref_predicted;
|
|
|
|
// Indicates if the mb is part of the image (1) vs border (0)
|
|
// This can be useful in determining whether the MB provides
|
|
// a valid predictor
|
|
unsigned char mb_in_image;
|
|
|
|
} MB_MODE_INFO;
|
|
|
|
typedef struct
|
|
{
|
|
MB_MODE_INFO mbmi;
|
|
union b_mode_info bmi[16];
|
|
} MODE_INFO;
|
|
|
|
typedef struct
|
|
{
|
|
short *qcoeff;
|
|
short *dqcoeff;
|
|
unsigned char *predictor;
|
|
short *diff;
|
|
short *dequant;
|
|
|
|
/* 16 Y blocks, 4 U blocks, 4 V blocks each with 16 entries */
|
|
unsigned char **base_pre;
|
|
int pre;
|
|
int pre_stride;
|
|
|
|
unsigned char **base_dst;
|
|
int dst;
|
|
int dst_stride;
|
|
|
|
int eob;
|
|
|
|
union b_mode_info bmi;
|
|
} BLOCKD;
|
|
|
|
typedef struct MacroBlockD
|
|
{
|
|
DECLARE_ALIGNED(16, short, diff[400]); /* from idct diff */
|
|
DECLARE_ALIGNED(16, unsigned char, predictor[384]);
|
|
DECLARE_ALIGNED(16, short, qcoeff[400]);
|
|
DECLARE_ALIGNED(16, short, dqcoeff[400]);
|
|
DECLARE_ALIGNED(16, char, eobs[25]);
|
|
|
|
/* 16 Y blocks, 4 U, 4 V, 1 DC 2nd order block, each with 16 entries. */
|
|
BLOCKD block[25];
|
|
int fullpixel_mask;
|
|
|
|
YV12_BUFFER_CONFIG pre; /* Filtered copy of previous frame reconstruction */
|
|
struct {
|
|
uint8_t *y_buffer, *u_buffer, *v_buffer;
|
|
} second_pre;
|
|
YV12_BUFFER_CONFIG dst;
|
|
|
|
MODE_INFO *prev_mode_info_context;
|
|
MODE_INFO *mode_info_context;
|
|
int mode_info_stride;
|
|
|
|
FRAME_TYPE frame_type;
|
|
|
|
int up_available;
|
|
int left_available;
|
|
|
|
/* Y,U,V,Y2 */
|
|
ENTROPY_CONTEXT_PLANES *above_context;
|
|
ENTROPY_CONTEXT_PLANES *left_context;
|
|
|
|
/* 0 indicates segmentation at MB level is not enabled. Otherwise the individual bits indicate which features are active. */
|
|
unsigned char segmentation_enabled;
|
|
|
|
/* 0 (do not update) 1 (update) the macroblock segmentation map. */
|
|
unsigned char update_mb_segmentation_map;
|
|
|
|
/* 0 (do not update) 1 (update) the macroblock segmentation feature data. */
|
|
unsigned char update_mb_segmentation_data;
|
|
|
|
/* 0 (do not update) 1 (update) the macroblock segmentation feature data. */
|
|
unsigned char mb_segment_abs_delta;
|
|
|
|
/* Per frame flags that define which MB level features (such as quantizer or loop filter level) */
|
|
/* are enabled and when enabled the proabilities used to decode the per MB flags in MB_MODE_INFO */
|
|
|
|
// Probability Tree used to code Segment number
|
|
vp8_prob mb_segment_tree_probs[MB_FEATURE_TREE_PROBS];
|
|
|
|
|
|
// Segment features
|
|
signed char segment_feature_data[MAX_MB_SEGMENTS][SEG_LVL_MAX];
|
|
unsigned int segment_feature_mask[MAX_MB_SEGMENTS];
|
|
|
|
#if CONFIG_FEATUREUPDATES
|
|
// keep around the last set so we can figure out what updates...
|
|
unsigned int old_segment_feature_mask[MAX_MB_SEGMENTS];
|
|
signed char old_segment_feature_data[MAX_MB_SEGMENTS][SEG_LVL_MAX];
|
|
#endif
|
|
|
|
/* mode_based Loop filter adjustment */
|
|
unsigned char mode_ref_lf_delta_enabled;
|
|
unsigned char mode_ref_lf_delta_update;
|
|
|
|
/* Delta values have the range +/- MAX_LOOP_FILTER */
|
|
signed char last_ref_lf_deltas[MAX_REF_LF_DELTAS]; /* 0 = Intra, Last, GF, ARF */
|
|
signed char ref_lf_deltas[MAX_REF_LF_DELTAS]; /* 0 = Intra, Last, GF, ARF */
|
|
signed char last_mode_lf_deltas[MAX_MODE_LF_DELTAS]; /* 0 = BPRED, ZERO_MV, MV, SPLIT */
|
|
signed char mode_lf_deltas[MAX_MODE_LF_DELTAS]; /* 0 = BPRED, ZERO_MV, MV, SPLIT */
|
|
|
|
/* Distance of MB away from frame edges */
|
|
int mb_to_left_edge;
|
|
int mb_to_right_edge;
|
|
int mb_to_top_edge;
|
|
int mb_to_bottom_edge;
|
|
|
|
unsigned int frames_since_golden;
|
|
unsigned int frames_till_alt_ref_frame;
|
|
vp8_subpix_fn_t subpixel_predict;
|
|
vp8_subpix_fn_t subpixel_predict8x4;
|
|
vp8_subpix_fn_t subpixel_predict8x8;
|
|
vp8_subpix_fn_t subpixel_predict16x16;
|
|
vp8_subpix_fn_t subpixel_predict_avg8x8;
|
|
vp8_subpix_fn_t subpixel_predict_avg16x16;
|
|
#if CONFIG_HIGH_PRECISION_MV
|
|
int allow_high_precision_mv;
|
|
#endif /* CONFIG_HIGH_PRECISION_MV */
|
|
|
|
void *current_bc;
|
|
|
|
int corrupted;
|
|
|
|
#if ARCH_X86 || ARCH_X86_64
|
|
/* This is an intermediate buffer currently used in sub-pixel motion search
|
|
* to keep a copy of the reference area. This buffer can be used for other
|
|
* purpose.
|
|
*/
|
|
DECLARE_ALIGNED(32, unsigned char, y_buf[22*32]);
|
|
#endif
|
|
|
|
#if CONFIG_RUNTIME_CPU_DETECT
|
|
struct VP8_COMMON_RTCD *rtcd;
|
|
#endif
|
|
|
|
int mb_index; // Index of the MB in the SB (0..3)
|
|
|
|
} MACROBLOCKD;
|
|
|
|
|
|
extern void vp8_build_block_doffsets(MACROBLOCKD *x);
|
|
extern void vp8_setup_block_dptrs(MACROBLOCKD *x);
|
|
|
|
static void update_blockd_bmi(MACROBLOCKD *xd)
|
|
{
|
|
int i;
|
|
int is_4x4;
|
|
is_4x4 = (xd->mode_info_context->mbmi.mode == SPLITMV) ||
|
|
(xd->mode_info_context->mbmi.mode == I8X8_PRED) ||
|
|
(xd->mode_info_context->mbmi.mode == B_PRED);
|
|
|
|
if (is_4x4)
|
|
{
|
|
for (i = 0; i < 16; i++)
|
|
{
|
|
xd->block[i].bmi = xd->mode_info_context->bmi[i];
|
|
}
|
|
}
|
|
}
|
|
#endif /* __INC_BLOCKD_H */
|