Commit 2d50c849 authored by Dmitry Kovalev's avatar Dmitry Kovalev Committed by Gerrit Code Review
Browse files

Merge "Using partition counts from FRAME_COUNTS struct in the encoder."

parents 9fe88870 75e4377d
...@@ -1391,8 +1391,7 @@ static size_t write_compressed_header(VP9_COMP *cpi, uint8_t *data) { ...@@ -1391,8 +1391,7 @@ static size_t write_compressed_header(VP9_COMP *cpi, uint8_t *data) {
for (i = 0; i < PARTITION_CONTEXTS; ++i) for (i = 0; i < PARTITION_CONTEXTS; ++i)
prob_diff_update(vp9_partition_tree, fc->partition_prob[i], prob_diff_update(vp9_partition_tree, fc->partition_prob[i],
(unsigned int *)cpi->partition_count[i], PARTITION_TYPES, cm->counts.partition[i], PARTITION_TYPES, &header_bc);
&header_bc);
vp9_write_nmv_probs(cpi, cm->allow_high_precision_mv, &header_bc); vp9_write_nmv_probs(cpi, cm->allow_high_precision_mv, &header_bc);
} }
......
...@@ -850,18 +850,18 @@ static void encode_sb(VP9_COMP *cpi, const TileInfo *const tile, ...@@ -850,18 +850,18 @@ static void encode_sb(VP9_COMP *cpi, const TileInfo *const tile,
switch (partition) { switch (partition) {
case PARTITION_NONE: case PARTITION_NONE:
if (output_enabled && bsize >= BLOCK_8X8) if (output_enabled && bsize >= BLOCK_8X8)
cpi->partition_count[pl][PARTITION_NONE]++; cm->counts.partition[pl][PARTITION_NONE]++;
encode_b(cpi, tile, tp, mi_row, mi_col, output_enabled, c1, -1); encode_b(cpi, tile, tp, mi_row, mi_col, output_enabled, c1, -1);
break; break;
case PARTITION_VERT: case PARTITION_VERT:
if (output_enabled) if (output_enabled)
cpi->partition_count[pl][PARTITION_VERT]++; cm->counts.partition[pl][PARTITION_VERT]++;
encode_b(cpi, tile, tp, mi_row, mi_col, output_enabled, c1, 0); encode_b(cpi, tile, tp, mi_row, mi_col, output_enabled, c1, 0);
encode_b(cpi, tile, tp, mi_row, mi_col + bs, output_enabled, c1, 1); encode_b(cpi, tile, tp, mi_row, mi_col + bs, output_enabled, c1, 1);
break; break;
case PARTITION_HORZ: case PARTITION_HORZ:
if (output_enabled) if (output_enabled)
cpi->partition_count[pl][PARTITION_HORZ]++; cm->counts.partition[pl][PARTITION_HORZ]++;
encode_b(cpi, tile, tp, mi_row, mi_col, output_enabled, c1, 0); encode_b(cpi, tile, tp, mi_row, mi_col, output_enabled, c1, 0);
encode_b(cpi, tile, tp, mi_row + bs, mi_col, output_enabled, c1, 1); encode_b(cpi, tile, tp, mi_row + bs, mi_col, output_enabled, c1, 1);
break; break;
...@@ -869,7 +869,7 @@ static void encode_sb(VP9_COMP *cpi, const TileInfo *const tile, ...@@ -869,7 +869,7 @@ static void encode_sb(VP9_COMP *cpi, const TileInfo *const tile,
subsize = get_subsize(bsize, PARTITION_SPLIT); subsize = get_subsize(bsize, PARTITION_SPLIT);
if (output_enabled) if (output_enabled)
cpi->partition_count[pl][PARTITION_SPLIT]++; cm->counts.partition[pl][PARTITION_SPLIT]++;
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
const int x_idx = i & 1, y_idx = i >> 1; const int x_idx = i & 1, y_idx = i >> 1;
...@@ -1888,7 +1888,7 @@ static void init_encode_frame_mb_context(VP9_COMP *cpi) { ...@@ -1888,7 +1888,7 @@ static void init_encode_frame_mb_context(VP9_COMP *cpi) {
vp9_zero(cpi->y_mode_count); vp9_zero(cpi->y_mode_count);
vp9_zero(cpi->y_uv_mode_count); vp9_zero(cpi->y_uv_mode_count);
vp9_zero(cm->counts.inter_mode); vp9_zero(cm->counts.inter_mode);
vp9_zero(cpi->partition_count); vp9_zero(cm->counts.partition);
vp9_zero(cpi->intra_inter_count); vp9_zero(cpi->intra_inter_count);
vp9_zero(cpi->comp_inter_count); vp9_zero(cpi->comp_inter_count);
vp9_zero(cpi->single_ref_count); vp9_zero(cpi->single_ref_count);
......
...@@ -3053,7 +3053,6 @@ static void encode_frame_to_data_rate(VP9_COMP *cpi, ...@@ -3053,7 +3053,6 @@ static void encode_frame_to_data_rate(VP9_COMP *cpi,
vp9_copy(counts->y_mode, cpi->y_mode_count); vp9_copy(counts->y_mode, cpi->y_mode_count);
vp9_copy(counts->uv_mode, cpi->y_uv_mode_count); vp9_copy(counts->uv_mode, cpi->y_uv_mode_count);
vp9_copy(counts->partition, cpi->partition_count);
vp9_copy(counts->intra_inter, cpi->intra_inter_count); vp9_copy(counts->intra_inter, cpi->intra_inter_count);
vp9_copy(counts->comp_inter, cpi->comp_inter_count); vp9_copy(counts->comp_inter, cpi->comp_inter_count);
vp9_copy(counts->single_ref, cpi->single_ref_count); vp9_copy(counts->single_ref, cpi->single_ref_count);
......
...@@ -467,7 +467,6 @@ typedef struct VP9_COMP { ...@@ -467,7 +467,6 @@ typedef struct VP9_COMP {
int y_mode_count[4][INTRA_MODES]; int y_mode_count[4][INTRA_MODES];
int y_uv_mode_count[INTRA_MODES][INTRA_MODES]; int y_uv_mode_count[INTRA_MODES][INTRA_MODES];
unsigned int partition_count[PARTITION_CONTEXTS][PARTITION_TYPES];
nmv_context_counts NMVcount; nmv_context_counts NMVcount;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment