ref: 5e33fd200c02d765efc14306e564004934d99046
parent: 40a4a3dd898ffc6924ae31faaa372925bffeed7c
parent: 6affef728b052197f9f8a576205ea77ba7bec7c0
author: Jingning Han <jingning@google.com>
date: Mon Mar 17 10:17:58 EDT 2014
Merge "Add bit-stream write flag to nonrd_use_partition"
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -2689,7 +2689,7 @@
MODE_INFO **mi_8x8,
TOKENEXTRA **tp,
int mi_row, int mi_col,
- BLOCK_SIZE bsize,
+ BLOCK_SIZE bsize, int output_enabled,
int *totrate, int64_t *totdist) {VP9_COMMON *const cm = &cpi->common;
MACROBLOCK *const x = &cpi->mb;
@@ -2748,10 +2748,10 @@
*get_sb_index(x, subsize) = 0;
nonrd_use_partition(cpi, tile, mi_8x8, tp, mi_row, mi_col,
- subsize, totrate, totdist);
+ subsize, output_enabled, totrate, totdist);
*get_sb_index(x, subsize) = 1;
nonrd_use_partition(cpi, tile, mi_8x8 + hbs, tp,
- mi_row, mi_col + hbs, subsize,
+ mi_row, mi_col + hbs, subsize, output_enabled,
&rate, &dist);
if (rate != INT_MAX && dist != INT64_MAX &&
*totrate != INT_MAX && *totdist != INT64_MAX) {@@ -2760,7 +2760,7 @@
}
*get_sb_index(x, subsize) = 2;
nonrd_use_partition(cpi, tile, mi_8x8 + hbs * mis, tp,
- mi_row + hbs, mi_col, subsize,
+ mi_row + hbs, mi_col, subsize, output_enabled,
&rate, &dist);
if (rate != INT_MAX && dist != INT64_MAX &&
*totrate != INT_MAX && *totdist != INT64_MAX) {@@ -2769,7 +2769,7 @@
}
*get_sb_index(x, subsize) = 3;
nonrd_use_partition(cpi, tile, mi_8x8 + hbs * mis + hbs, tp,
- mi_row + hbs, mi_col + hbs, subsize,
+ mi_row + hbs, mi_col + hbs, subsize, output_enabled,
&rate, &dist);
if (rate != INT_MAX && dist != INT64_MAX &&
*totrate != INT_MAX && *totdist != INT64_MAX) {@@ -2781,7 +2781,7 @@
assert("Invalid partition type.");}
- if (bsize == BLOCK_64X64)
+ if (bsize == BLOCK_64X64 && output_enabled)
encode_sb_rt(cpi, tile, tp, mi_row, mi_col, 1, bsize);
}
@@ -2813,7 +2813,7 @@
else
set_fixed_partitioning(cpi, tile, mi_8x8, mi_row, mi_col, bsize);
- nonrd_use_partition(cpi, tile, mi_8x8, tp, mi_row, mi_col, BLOCK_64X64,
+ nonrd_use_partition(cpi, tile, mi_8x8, tp, mi_row, mi_col, BLOCK_64X64, 1,
&dummy_rate, &dummy_dist);
}
}
--
⑨