diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-04-29 16:07:17 -0700 |
|---|---|---|
| committer | Dmitry Kovalev <dkovalev@google.com> | 2013-04-29 16:07:17 -0700 |
| commit | ee97da2c0317275e12eae68437a5cf212323c4fb (patch) | |
| tree | acbae01c29d1624cfe5c77e4bf652d36610b4782 /vp9/encoder/vp9_rdopt.c | |
| parent | bbac4094e4cb2cc782040733656bf2ee5738ee59 (diff) | |
| download | libvpx-ee97da2c0317275e12eae68437a5cf212323c4fb.tar libvpx-ee97da2c0317275e12eae68437a5cf212323c4fb.tar.gz libvpx-ee97da2c0317275e12eae68437a5cf212323c4fb.tar.bz2 libvpx-ee97da2c0317275e12eae68437a5cf212323c4fb.zip | |
Cleaning up encoder segmentation code.
Moving code from vp9_pack_bitstream to new function encode_segmentation.
Change-Id: I1f1e59a1f038618ad95162b7db4b6f8164850ea8
Diffstat (limited to 'vp9/encoder/vp9_rdopt.c')
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index cc142d94f..92b0cf184 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -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 |