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

Fix for lossless with rect-tx

Browse Source 
Change-Id: Ibb1e5d5137c7717bc6a8683ad78d842c3e5f052e
This commit is contained in:
Peter de Rivaz
2016-08-10 10:19:09 +01:00
parent c57816fb58
commit ffbdc51018
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
vp10/encoder/rdopt.c
View File

@@ -4448,7 +4448,9 @@ static int64_t encode_inter_mb_segment(VP10_COMP *cpi,
const int num_4x4_h = num_4x4_blocks_high_txsize_lookup[tx_size]; const int num_4x4_h = num_4x4_blocks_high_txsize_lookup[tx_size];
#if CONFIG_EXT_TX && CONFIG_RECT_TX && !CONFIG_VAR_TX #if CONFIG_EXT_TX && CONFIG_RECT_TX && !CONFIG_VAR_TX
assert(tx_size == max_txsize_rect_lookup[mi->mbmi.sb_type]); assert(IMPLIES(xd->lossless[mi->mbmi.segment_id], tx_size == TX_4X4));
assert(IMPLIES(!xd->lossless[mi->mbmi.segment_id],
tx_size == max_txsize_rect_lookup[mi->mbmi.sb_type]));
#else #else
assert(tx_size == TX_4X4); assert(tx_size == TX_4X4);
#endif // CONFIG_EXT_TX && CONFIG_RECT_TX && !CONFIG_VAR_TX #endif // CONFIG_EXT_TX && CONFIG_RECT_TX && !CONFIG_VAR_TX
@@ -5006,7 +5008,8 @@ static int64_t rd_pick_best_sub8x8_mode(
const int inter_mode_mask = cpi->sf.inter_mode_mask[bsize]; const int inter_mode_mask = cpi->sf.inter_mode_mask[bsize];
MB_MODE_INFO_EXT *const mbmi_ext = x->mbmi_ext; MB_MODE_INFO_EXT *const mbmi_ext = x->mbmi_ext;
#if CONFIG_EXT_TX && CONFIG_RECT_TX && !CONFIG_VAR_TX #if CONFIG_EXT_TX && CONFIG_RECT_TX && !CONFIG_VAR_TX
mbmi->tx_size = max_txsize_rect_lookup[bsize]; mbmi->tx_size =
xd->lossless[mbmi->segment_id] ? TX_4X4 : max_txsize_rect_lookup[bsize];
#else #else
mbmi->tx_size = TX_4X4; mbmi->tx_size = TX_4X4;
#endif // CONFIG_EXT_TX && CONFIG_RECT_TX && !CONFIG_VAR_TX #endif // CONFIG_EXT_TX && CONFIG_RECT_TX && !CONFIG_VAR_TX