Cleaning up encoder segmentation code.

Moving code from vp9_pack_bitstream to new function encode_segmentation.

Change-Id: I1f1e59a1f038618ad95162b7db4b6f8164850ea8
This commit is contained in:
Dmitry Kovalev
2013-04-29 16:07:17 -07:00
parent bbac4094e4
commit ee97da2c03
7 changed files with 126 additions and 150 deletions

View File

@@ -4824,10 +4824,9 @@ void vp9_pick_mode_inter_macroblock(VP9_COMP *cpi, MACROBLOCK *x,
int64_t intra_error = 0;
unsigned char *segment_id = &mbmi->segment_id;
if (xd->segmentation_enabled)
x->encode_breakout = cpi->segment_encode_breakout[*segment_id];
else
x->encode_breakout = cpi->oxcf.encode_breakout;
x->encode_breakout = xd->segmentation_enabled ?
cpi->segment_encode_breakout[*segment_id] :
cpi->oxcf.encode_breakout;
// if (cpi->sf.RD)
// For now this codebase is limited to a single rd encode path