Turn on tx_skip for inter modes

Fixed the mismatch issue in lossless case

Change-Id: Ia2fd98865b4687e664fdc75f62b402e8289a1968
This commit is contained in:
hui su 2015-01-13 11:24:07 -08:00
parent 919692d6c5
commit 2c68b07d7d
2 changed files with 3 additions and 3 deletions

View File

@ -23,7 +23,7 @@ extern "C" {
#define QINDEX_RANGE (MAXQ - MINQ + 1)
#define QINDEX_BITS 8
#if CONFIG_TX_SKIP
#define TX_SKIP_Q_THRESH_INTER -1
#define TX_SKIP_Q_THRESH_INTER 0
#define TX_SKIP_Q_THRESH_INTRA 255
#define TX_SKIP_SHIFT_THRESH 0
#endif // CONFIG_TX_SKIP

View File

@ -621,8 +621,8 @@ static void txfm_rd_in_plane(MACROBLOCK *x,
args.use_fast_coef_costing = use_fast_coef_casting;
#if CONFIG_TX_SKIP
if (xd->lossless && tx_size != TX_4X4 &&
!xd->mi[0].src_mi->mbmi.tx_skip[plane != 0]) {
if (xd->lossless && (tx_size == TX_32X32 ||
(tx_size != TX_4X4 && !xd->mi[0].src_mi->mbmi.tx_skip[plane != 0]))) {
*rate = INT_MAX;
*distortion = INT64_MAX;
*sse = INT64_MAX;