diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2016-01-04 15:13:29 -0500 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2016-01-04 15:21:02 -0500 |
| commit | 53a11656cd4f38c8d005f18ff7e00ca64c4d004b (patch) | |
| tree | 4a13fdab646e1f8b1d65cb3e3b3935f84f46743d /vp10/encoder | |
| parent | d9439fdc3685bcd40b21ffe85302a06481697f43 (diff) | |
| download | libvpx-53a11656cd4f38c8d005f18ff7e00ca64c4d004b.tar libvpx-53a11656cd4f38c8d005f18ff7e00ca64c4d004b.tar.gz libvpx-53a11656cd4f38c8d005f18ff7e00ca64c4d004b.tar.bz2 libvpx-53a11656cd4f38c8d005f18ff7e00ca64c4d004b.zip | |
vp10: only assume ONLY_4X4 if segmentation is disabled.
Otherwise, per-segment lossless might mean that some segments are not
lossless and they could still want to use another mode. The per-block
tx points remain uncoded on blocks where (per the segment id) the Q
value implies lossless.
Change-Id: If210206ab1fe3dd11976797370c77f961f13dfa0
Diffstat (limited to 'vp10/encoder')
| -rw-r--r-- | vp10/encoder/bitstream.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vp10/encoder/bitstream.c b/vp10/encoder/bitstream.c index 477752aa7..d4b8c36db 100644 --- a/vp10/encoder/bitstream.c +++ b/vp10/encoder/bitstream.c @@ -1261,7 +1261,7 @@ static void write_uncompressed_header(VP10_COMP *cpi, encode_quantization(cm, wb); encode_segmentation(cm, xd, wb); #if CONFIG_MISC_FIXES - if (xd->lossless[0]) + if (!cm->seg.enabled && xd->lossless[0]) cm->tx_mode = TX_4X4; else write_txfm_mode(cm->tx_mode, wb); |