generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "vp10: only assume ONLY_4X4 if segmentation is disabled."

Browse Source
This commit is contained in:
Yaowu Xu 2016-01-05 02:29:05 +00:00 committed by Gerrit Code Review
commit ef77ce4407
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vp10/decoder/decodeframe.c
View File

@ -2109,8 +2109,8 @@ static size_t read_uncompressed_header(VP10Decoder *pbi,
setup_segmentation_dequant(cm); setup_segmentation_dequant(cm);
#if CONFIG_MISC_FIXES #if CONFIG_MISC_FIXES
cm->tx_mode = (xd->lossless[0]) ? ONLY_4X4 cm->tx_mode = (!cm->seg.enabled && xd->lossless[0]) ? ONLY_4X4
: read_tx_mode(rb); : read_tx_mode(rb);
cm->reference_mode = read_frame_reference_mode(cm, rb); cm->reference_mode = read_frame_reference_mode(cm, rb);
#endif #endif

2
vp10/encoder/bitstream.c
View File

@ -1261,7 +1261,7 @@ static void write_uncompressed_header(VP10_COMP *cpi,
encode_quantization(cm, wb); encode_quantization(cm, wb);
encode_segmentation(cm, xd, wb); encode_segmentation(cm, xd, wb);
#if CONFIG_MISC_FIXES #if CONFIG_MISC_FIXES
if (xd->lossless[0]) if (!cm->seg.enabled && xd->lossless[0])
cm->tx_mode = TX_4X4; cm->tx_mode = TX_4X4;
else else
write_txfm_mode(cm->tx_mode, wb); write_txfm_mode(cm->tx_mode, wb);