Merge "don't dummy pack if we won't recode"

This commit is contained in:
Jim Bankoski 2014-01-16 08:21:03 -08:00 committed by Gerrit Code Review
commit a5cb1b1ad5

View File

@ -2707,6 +2707,7 @@ static void encode_with_recode_loop(VP9_COMP *cpi,
// Dummy pack of the bitstream using up to date stats to get an // Dummy pack of the bitstream using up to date stats to get an
// accurate estimate of output frame size to determine if we need // accurate estimate of output frame size to determine if we need
// to recode. // to recode.
if (cpi->sf.recode_loop != 0) {
vp9_save_coding_context(cpi); vp9_save_coding_context(cpi);
cpi->dummy_packing = 1; cpi->dummy_packing = 1;
vp9_pack_bitstream(cpi, dest, size); vp9_pack_bitstream(cpi, dest, size);
@ -2715,6 +2716,7 @@ static void encode_with_recode_loop(VP9_COMP *cpi,
if (frame_over_shoot_limit == 0) if (frame_over_shoot_limit == 0)
frame_over_shoot_limit = 1; frame_over_shoot_limit = 1;
}
if (cpi->oxcf.end_usage == USAGE_CONSTANT_QUALITY) { if (cpi->oxcf.end_usage == USAGE_CONSTANT_QUALITY) {
loop = 0; loop = 0;