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

Merge "Fix clpf and dering signalling when used with ext-partition-types" into nextgenv2

Browse Source
This commit is contained in:
Debargha Mukherjee
2016-10-27 20:45:06 +00:00
committed by Gerrit Code Review
parent a5e3bc0fbc f8935c9c92
commit 058e42d399
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
av1/decoder/decodeframe.c
View File

@@ -1775,6 +1775,7 @@ static void decode_partition(AV1Decoder *const pbi, MACROBLOCKD *const xd,
if (bsize >= BLOCK_8X8 && if (bsize >= BLOCK_8X8 &&
(bsize == BLOCK_8X8 || partition != PARTITION_SPLIT)) (bsize == BLOCK_8X8 || partition != PARTITION_SPLIT))
dec_update_partition_context(xd, mi_row, mi_col, subsize, num_8x8_wh); dec_update_partition_context(xd, mi_row, mi_col, subsize, num_8x8_wh);
#endif // CONFIG_EXT_PARTITION_TYPES
#if CONFIG_CLPF #if CONFIG_CLPF
if (bsize == BLOCK_64X64 && cm->clpf_strength_y && if (bsize == BLOCK_64X64 && cm->clpf_strength_y &&
@@ -1812,6 +1813,7 @@ static void decode_partition(AV1Decoder *const pbi, MACROBLOCKD *const xd,
} }
} }
#endif #endif
#if CONFIG_DERING #if CONFIG_DERING
if (bsize == BLOCK_64X64) { if (bsize == BLOCK_64X64) {
if (cm->dering_level != 0 && !sb_all_skip(cm, mi_row, mi_col)) { if (cm->dering_level != 0 && !sb_all_skip(cm, mi_row, mi_col)) {
@@ -1823,7 +1825,6 @@ static void decode_partition(AV1Decoder *const pbi, MACROBLOCKD *const xd,
} }
} }
#endif #endif
#endif // CONFIG_EXT_PARTITION_TYPES
} }
#if !CONFIG_ANS #if !CONFIG_ANS

2
av1/encoder/bitstream.c
View File

@@ -2058,6 +2058,7 @@ static void write_modes_sb(AV1_COMP *const cpi, const TileInfo *const tile,
if (bsize >= BLOCK_8X8 && if (bsize >= BLOCK_8X8 &&
(bsize == BLOCK_8X8 || partition != PARTITION_SPLIT)) (bsize == BLOCK_8X8 || partition != PARTITION_SPLIT))
update_partition_context(xd, mi_row, mi_col, subsize, bsize); update_partition_context(xd, mi_row, mi_col, subsize, bsize);
#endif // CONFIG_EXT_PARTITION_TYPES
#if CONFIG_CLPF #if CONFIG_CLPF
if (bsize == BLOCK_64X64 && cm->clpf_blocks && cm->clpf_strength_y && if (bsize == BLOCK_64X64 && cm->clpf_blocks && cm->clpf_strength_y &&
@@ -2099,7 +2100,6 @@ static void write_modes_sb(AV1_COMP *const cpi, const TileInfo *const tile,
DERING_REFINEMENT_BITS); DERING_REFINEMENT_BITS);
} }
#endif #endif
#endif // CONFIG_EXT_PARTITION_TYPES
} }
static void write_modes(AV1_COMP *const cpi, const TileInfo *const tile, static void write_modes(AV1_COMP *const cpi, const TileInfo *const tile,