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

Fix lossless mode in tx-skip experiment

Browse Source 
Change-Id: I205fa8614a9079ce7e6ca87d7b08fe3602bbd376
This commit is contained in:
hui su
2015-06-04 14:13:26 -07:00
parent b8a793458a
commit 507857786d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
vp9/encoder/vp9_rdopt.c
View File

@@ -777,7 +777,7 @@ static void block_rd_txfm(int plane, int block, BLOCK_SIZE plane_bsize,
void txfm_rd_in_plane(MACROBLOCK *x, void txfm_rd_in_plane(MACROBLOCK *x,
#else #else
static void txfm_rd_in_plane(MACROBLOCK *x, static void txfm_rd_in_plane(MACROBLOCK *x,
#endif #endif // CONFIG_SUPERTX
int *rate, int64_t *distortion, int *rate, int64_t *distortion,
int *skippable, int64_t *sse, int *skippable, int64_t *sse,
int64_t ref_best_rd, int plane, int64_t ref_best_rd, int plane,
@@ -792,15 +792,15 @@ static void txfm_rd_in_plane(MACROBLOCK *x,
args.use_fast_coef_costing = use_fast_coef_casting; args.use_fast_coef_costing = use_fast_coef_casting;
#if CONFIG_TX_SKIP #if CONFIG_TX_SKIP
if (xd->lossless && (tx_size == TX_32X32 || if (xd->lossless && tx_size != TX_4X4 &&
(tx_size != TX_4X4 && !xd->mi[0].src_mi->mbmi.tx_skip[plane != 0]))) { !xd->mi[0].src_mi->mbmi.tx_skip[plane != 0]) {
*rate = INT_MAX; *rate = INT_MAX;
*distortion = INT64_MAX; *distortion = INT64_MAX;
*sse = INT64_MAX; *sse = INT64_MAX;
*skippable = 0; *skippable = 0;
return; return;
} }
#endif #endif // CONFIG_TX_SKIP
if (plane == 0) if (plane == 0)
xd->mi[0].src_mi->mbmi.tx_size = tx_size; xd->mi[0].src_mi->mbmi.tx_size = tx_size;