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

Merge "Allow large tx_size in lossless coding with transform skipping" into nextgen

Browse Source
This commit is contained in:
punksu
2014-12-27 20:52:36 -08:00
committed by Gerrit Code Review
parent 2b959d4ee8 8a41d18bd0
commit b0ef621f84
5 changed files with 115 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
vp9/decoder/vp9_decodeframe.c
View File

@@ -2045,7 +2045,9 @@ static void read_supertx_probs(FRAME_CONTEXT *fc, vp9_reader *r) {
static int read_compressed_header(VP9Decoder *pbi, const uint8_t *data,
size_t partition_size) {
VP9_COMMON *const cm = &pbi->common;
#if !CONFIG_TX_SKIP
MACROBLOCKD *const xd = &pbi->mb;
#endif
FRAME_CONTEXT *const fc = &cm->fc;
vp9_reader r;
int k;
@@ -2055,7 +2057,11 @@ static int read_compressed_header(VP9Decoder *pbi, const uint8_t *data,
vpx_internal_error(&cm->error, VPX_CODEC_MEM_ERROR,
"Failed to allocate bool decoder 0");
#if CONFIG_TX_SKIP
cm->tx_mode = read_tx_mode(&r);
#else
cm->tx_mode = xd->lossless ? ONLY_4X4 : read_tx_mode(&r);
#endif
if (cm->tx_mode == TX_MODE_SELECT)
read_tx_mode_probs(&fc->tx_probs, &r);
read_coef_probs(fc, cm->tx_mode, &r);