ca6b85aa4e
Patch 1 to Patch 3 is an initial implementation of 8x8 intra prediction modes, here are with the following assumptions: a. 8x8 has 4 prediction modes DC, H, V and TM b. UV 4x4 block use the same mode as corresponding 8x8 area c. i8x8 modes are enabled for key frame only for now Patch 4: d. removed debug code from previous patches Patch 5: e. added stats code to collect entropy stats and further cleaned up Patch 6: f. changed mode stats code to collect finer stats of modes Patch 7: g. normalized i8x8 modes distribution to total at 256 (8bits). Patch 8: h. fixed a bug in decoder and removed debug printf output. Patch 9: i. more cleanups to address paul's comment Patch 10: j. messy rebase/merges to bring the commit up to date. Tests on HD clips encoded with all key frame showing consistent gain on all clips and all metrics:~0.5%(psnr) and 0.6%(ssim): http://www.corp.google.com/~yaowu/no_crawl/i8x8hd_allkey_fixedq.html To build and test, configure with: --enable-experimental --enable-i8x8 Change-Id: I9813fe07ae48cab5fdb5d904bca022514ad01e7f
143 lines
3.7 KiB
C
143 lines
3.7 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_BLOCK_H
|
|
#define __INC_BLOCK_H
|
|
|
|
#include "vp8/common/onyx.h"
|
|
#include "vp8/common/blockd.h"
|
|
#include "vp8/common/entropymv.h"
|
|
#include "vp8/common/entropy.h"
|
|
#include "vpx_ports/mem.h"
|
|
|
|
// motion search site
|
|
typedef struct
|
|
{
|
|
MV mv;
|
|
int offset;
|
|
} search_site;
|
|
|
|
typedef struct
|
|
{
|
|
// 16 Y blocks, 4 U blocks, 4 V blocks each with 16 entries
|
|
short *src_diff;
|
|
short *coeff;
|
|
|
|
// 16 Y blocks, 4 U blocks, 4 V blocks each with 16 entries
|
|
short *quant;
|
|
short *quant_fast;
|
|
unsigned char *quant_shift;
|
|
short *zbin;
|
|
short *zrun_zbin_boost;
|
|
short *round;
|
|
|
|
// Zbin Over Quant value
|
|
short zbin_extra;
|
|
|
|
unsigned char **base_src;
|
|
int src;
|
|
int src_stride;
|
|
|
|
// MV enc_mv;
|
|
int force_empty;
|
|
|
|
} BLOCK;
|
|
|
|
typedef struct
|
|
{
|
|
int count;
|
|
struct
|
|
{
|
|
B_PREDICTION_MODE mode;
|
|
int_mv mv;
|
|
} bmi[16];
|
|
} PARTITION_INFO;
|
|
|
|
typedef struct
|
|
{
|
|
DECLARE_ALIGNED(16, short, src_diff[400]); // 16x16 Y 8x8 U 8x8 V 4x4 2nd Y
|
|
DECLARE_ALIGNED(16, short, coeff[400]); // 16x16 Y 8x8 U 8x8 V 4x4 2nd Y
|
|
DECLARE_ALIGNED(16, unsigned char, thismb[256]);
|
|
|
|
unsigned char *thismb_ptr;
|
|
// 16 Y blocks, 4 U blocks, 4 V blocks, 1 DC 2nd order block each with 16 entries
|
|
BLOCK block[25];
|
|
|
|
YV12_BUFFER_CONFIG src;
|
|
|
|
MACROBLOCKD e_mbd;
|
|
PARTITION_INFO *partition_info; /* work pointer */
|
|
PARTITION_INFO *pi; /* Corresponds to upper left visible macroblock */
|
|
PARTITION_INFO *pip; /* Base of allocated array */
|
|
|
|
search_site *ss;
|
|
int ss_count;
|
|
int searches_per_step;
|
|
|
|
int errorperbit;
|
|
int sadperbit16;
|
|
int sadperbit4;
|
|
int rddiv;
|
|
int rdmult;
|
|
unsigned int * mb_activity_ptr;
|
|
int * mb_norm_activity_ptr;
|
|
signed int act_zbin_adj;
|
|
|
|
int mvcosts[2][MVvals+1];
|
|
int *mvcost[2];
|
|
int mvsadcosts[2][MVfpvals+1];
|
|
int *mvsadcost[2];
|
|
int mbmode_cost[2][MB_MODE_COUNT];
|
|
int intra_uv_mode_cost[2][MB_MODE_COUNT];
|
|
unsigned int bmode_costs[10][10][10];
|
|
#if CONFIG_I8X8
|
|
unsigned int i8x8_mode_costs[MB_MODE_COUNT];
|
|
#endif
|
|
unsigned int inter_bmode_costs[B_MODE_COUNT];
|
|
|
|
// These define limits to motion vector components to prevent them from extending outside the UMV borders
|
|
int mv_col_min;
|
|
int mv_col_max;
|
|
int mv_row_min;
|
|
int mv_row_max;
|
|
|
|
int vector_range; // Used to monitor limiting range of recent vectors to guide search.
|
|
int skip;
|
|
|
|
int encode_breakout;
|
|
|
|
//char * gf_active_ptr;
|
|
signed char *gf_active_ptr;
|
|
|
|
unsigned char *active_ptr;
|
|
MV_CONTEXT *mvc;
|
|
|
|
unsigned int token_costs[BLOCK_TYPES] [COEF_BANDS] [PREV_COEF_CONTEXTS] [MAX_ENTROPY_TOKENS];
|
|
int optimize;
|
|
int q_index;
|
|
|
|
void (*vp8_short_fdct4x4)(short *input, short *output, int pitch);
|
|
void (*vp8_short_fdct8x4)(short *input, short *output, int pitch);
|
|
void (*short_walsh4x4)(short *input, short *output, int pitch);
|
|
void (*quantize_b)(BLOCK *b, BLOCKD *d);
|
|
void (*quantize_b_pair)(BLOCK *b1, BLOCK *b2, BLOCKD *d0, BLOCKD *d1);
|
|
#if CONFIG_T8X8
|
|
void (*vp8_short_fdct8x8)(short *input, short *output, int pitch);
|
|
void (*short_fhaar2x2)(short *input, short *output, int pitch);
|
|
void (*quantize_b_8x8)(BLOCK *b, BLOCKD *d);
|
|
void (*quantize_b_2x2)(BLOCK *b, BLOCKD *d);
|
|
#endif
|
|
|
|
} MACROBLOCK;
|
|
|
|
|
|
#endif
|