summaryrefslogtreecommitdiff
path: root/vp10/encoder
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2016-01-04 15:20:50 -0500
committerRonald S. Bultje <rsbultje@gmail.com>2016-01-04 15:21:02 -0500
commitd9439fdc3685bcd40b21ffe85302a06481697f43 (patch)
treead9f5b1717ab12516192580dead58c2eb35fee3e /vp10/encoder
parentb8c2a4eb0c47b633096f5c428b70607e7bf8d570 (diff)
downloadlibvpx-d9439fdc3685bcd40b21ffe85302a06481697f43.tar
libvpx-d9439fdc3685bcd40b21ffe85302a06481697f43.tar.gz
libvpx-d9439fdc3685bcd40b21ffe85302a06481697f43.tar.bz2
libvpx-d9439fdc3685bcd40b21ffe85302a06481697f43.zip
vp10: skip coding of txsz for lossless-segment blocks.
Change-Id: Ic23c10b6d2a9fed3abe69c6bf10e910832444f2c
Diffstat (limited to 'vp10/encoder')
-rw-r--r--vp10/encoder/bitstream.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/vp10/encoder/bitstream.c b/vp10/encoder/bitstream.c
index 361ac9962..477752aa7 100644
--- a/vp10/encoder/bitstream.c
+++ b/vp10/encoder/bitstream.c
@@ -303,7 +303,7 @@ static void pack_inter_mode_mvs(VP10_COMP *cpi, const MODE_INFO *mi,
vpx_write(w, is_inter, vp10_get_intra_inter_prob(cm, xd));
if (bsize >= BLOCK_8X8 && cm->tx_mode == TX_MODE_SELECT &&
- !(is_inter && skip)) {
+ !(is_inter && skip) && !xd->lossless[segment_id]) {
write_selected_tx_size(cm, xd, w);
}
@@ -391,7 +391,8 @@ static void write_mb_modes_kf(const VP10_COMMON *cm, const MACROBLOCKD *xd,
write_skip(cm, xd, mbmi->segment_id, mi, w);
- if (bsize >= BLOCK_8X8 && cm->tx_mode == TX_MODE_SELECT)
+ if (bsize >= BLOCK_8X8 && cm->tx_mode == TX_MODE_SELECT &&
+ !xd->lossless[mbmi->segment_id])
write_selected_tx_size(cm, xd, w);
if (bsize >= BLOCK_8X8) {