generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Reusing FRAME_COUNTS in the encoder."

Browse Source
This commit is contained in:
Dmitry Kovalev
2013-12-20 10:56:31 -08:00
committed by Gerrit Code Review
parent 9938777058 4e84ad1fc6
commit 47d482cb0a
4 changed files with 14 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
vp9/encoder/vp9_bitstream.c
View File

@@ -1242,7 +1242,7 @@ static size_t write_compressed_header(VP9_COMP *cpi, uint8_t *data) {
for (i = 0; i < INTRA_INTER_CONTEXTS; i++)
vp9_cond_prob_diff_update(&header_bc, &fc->intra_inter_prob[i],
cpi->intra_inter_count[i]);
cm->counts.intra_inter[i]);
if (cm->allow_comp_inter_inter) {
const int reference_mode = cpi->common.reference_mode;
@@ -1275,8 +1275,7 @@ static size_t write_compressed_header(VP9_COMP *cpi, uint8_t *data) {
for (i = 0; i < BLOCK_SIZE_GROUPS; ++i)
prob_diff_update(vp9_intra_mode_tree, cm->fc.y_mode_prob[i],
(unsigned int *)cpi->y_mode_count[i], INTRA_MODES,
&header_bc);
cm->counts.y_mode[i], INTRA_MODES, &header_bc);
for (i = 0; i < PARTITION_CONTEXTS; ++i)
prob_diff_update(vp9_partition_tree, fc->partition_prob[i],

22
vp9/encoder/vp9_encodeframe.c
View File

@@ -754,7 +754,7 @@ static void update_stats(VP9_COMP *cpi) {
SEG_LVL_REF_FRAME);
if (!seg_ref_active)
cpi->intra_inter_count[vp9_get_intra_inter_context(xd)]
cm->counts.intra_inter[vp9_get_intra_inter_context(xd)]
[is_inter_block(mbmi)]++;
// If the segment reference feature is enabled we have only a single
@@ -2006,11 +2006,11 @@ static void init_encode_frame_mb_context(VP9_COMP *cpi) {
xd->mi_8x8[0]->mbmi.mode = DC_PRED;
xd->mi_8x8[0]->mbmi.uv_mode = DC_PRED;
vp9_zero(cpi->y_mode_count);
vp9_zero(cpi->y_uv_mode_count);
vp9_zero(cm->counts.y_mode);
vp9_zero(cm->counts.uv_mode);
vp9_zero(cm->counts.inter_mode);
vp9_zero(cm->counts.partition);
vp9_zero(cpi->intra_inter_count);
vp9_zero(cm->counts.intra_inter);
vp9_zero(cm->counts.comp_inter);
vp9_zero(cm->counts.single_ref);
vp9_zero(cm->counts.comp_ref);
@@ -2145,8 +2145,8 @@ static void encode_frame_internal(VP9_COMP *cpi) {
int j;
unsigned int intra_count = 0, inter_count = 0;
for (j = 0; j < INTRA_INTER_CONTEXTS; ++j) {
intra_count += cpi->intra_inter_count[j][0];
inter_count += cpi->intra_inter_count[j][1];
intra_count += cm->counts.intra_inter[j][0];
inter_count += cm->counts.intra_inter[j][1];
}
cpi->sf.skip_encode_frame = ((intra_count << 2) < inter_count);
cpi->sf.skip_encode_frame &= (cm->frame_type != KEY_FRAME);
@@ -2477,12 +2477,12 @@ void vp9_encode_frame(VP9_COMP *cpi) {
}
}
static void sum_intra_stats(VP9_COMP *cpi, const MODE_INFO *mi) {
static void sum_intra_stats(VP9_COMMON *cm, const MODE_INFO *mi) {
const MB_PREDICTION_MODE y_mode = mi->mbmi.mode;
const MB_PREDICTION_MODE uv_mode = mi->mbmi.uv_mode;
const BLOCK_SIZE bsize = mi->mbmi.sb_type;
++cpi->y_uv_mode_count[y_mode][uv_mode];
++cm->counts.uv_mode[y_mode][uv_mode];
if (bsize < BLOCK_8X8) {
int idx, idy;
@@ -2490,9 +2490,9 @@ static void sum_intra_stats(VP9_COMP *cpi, const MODE_INFO *mi) {
const int num_4x4_blocks_high = num_4x4_blocks_high_lookup[bsize];
for (idy = 0; idy < 2; idy += num_4x4_blocks_high)
for (idx = 0; idx < 2; idx += num_4x4_blocks_wide)
++cpi->y_mode_count[0][mi->bmi[idy * 2 + idx].as_mode];
++cm->counts.y_mode[0][mi->bmi[idy * 2 + idx].as_mode];
} else {
++cpi->y_mode_count[size_group_lookup[bsize]][y_mode];
++cm->counts.y_mode[size_group_lookup[bsize]][y_mode];
}
}
@@ -2582,7 +2582,7 @@ static void encode_superblock(VP9_COMP *cpi, TOKENEXTRA **t, int output_enabled,
vp9_encode_intra_block_y(x, MAX(bsize, BLOCK_8X8));
vp9_encode_intra_block_uv(x, MAX(bsize, BLOCK_8X8));
if (output_enabled)
sum_intra_stats(cpi, mi);
sum_intra_stats(cm, mi);
} else {
int idx = cm->ref_frame_map[get_ref_frame_idx(cpi, mbmi->ref_frame[0])];
YV12_BUFFER_CONFIG *ref_fb = &cm->yv12_fb[idx];

7
vp9/encoder/vp9_onyx_if.c
View File

@@ -1784,7 +1784,7 @@ VP9_PTR vp9_create_compressor(VP9_CONFIG *oxcf) {
cm->error.setjmp = 0;
vp9_zero(cpi->y_uv_mode_count);
vp9_zero(cpi->common.counts.uv_mode);
#ifdef MODE_TEST_HIT_STATS
vp9_zero(cpi->mode_test_hits);
@@ -3114,11 +3114,6 @@ static void encode_frame_to_data_rate(VP9_COMP *cpi,
}
if (!frame_is_intra_only(&cpi->common)) {
FRAME_COUNTS *counts = &cpi->common.counts;
vp9_copy(counts->y_mode, cpi->y_mode_count);
vp9_copy(counts->uv_mode, cpi->y_uv_mode_count);
vp9_copy(counts->intra_inter, cpi->intra_inter_count);
if (!cpi->common.error_resilient_mode &&
!cpi->common.frame_parallel_decoding_mode) {
vp9_adapt_mode_probs(&cpi->common);

5
vp9/encoder/vp9_onyx_int.h
View File

@@ -431,8 +431,6 @@ typedef struct VP9_COMP {
int64_t rd_comp_pred_diff[REFERENCE_MODES];
int64_t rd_prediction_type_threshes[4][REFERENCE_MODES];
unsigned int intra_inter_count[INTRA_INTER_CONTEXTS][2];
int64_t rd_tx_select_diff[TX_MODES];
// FIXME(rbultje) can this overflow?
int rd_tx_select_threshes[4][TX_MODES];
@@ -461,9 +459,6 @@ typedef struct VP9_COMP {
int cq_target_quality;
int y_mode_count[4][INTRA_MODES];
int y_uv_mode_count[INTRA_MODES][INTRA_MODES];
vp9_coeff_count coef_counts[TX_SIZES][PLANE_TYPES];
vp9_coeff_probs_model frame_coef_probs[TX_SIZES][PLANE_TYPES];
vp9_coeff_stats frame_branch_ct[TX_SIZES][PLANE_TYPES];