diff options
| author | Yaowu Xu <yaowu@google.com> | 2013-11-18 15:43:41 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-11-18 15:43:41 -0800 |
| commit | 040dc8c9450a8b7ebb100a38745654962ce3f076 (patch) | |
| tree | 841a2d45e6bcb569148aae9b9273a1b2fe1f37ce | |
| parent | a42ab027fd784150e11497fc0f00ec894cbfd1c7 (diff) | |
| parent | e63aaf9ad1021d7a12f6a3e12ac32742ebbf7dbe (diff) | |
| download | libvpx-040dc8c9450a8b7ebb100a38745654962ce3f076.tar libvpx-040dc8c9450a8b7ebb100a38745654962ce3f076.tar.gz libvpx-040dc8c9450a8b7ebb100a38745654962ce3f076.tar.bz2 libvpx-040dc8c9450a8b7ebb100a38745654962ce3f076.zip | |
Merge "Fixed a bug in commit a4a5a210"
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index e6ec21d50..e92beb33a 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -612,8 +612,9 @@ static void block_yrd_txfm(int plane, int block, BLOCK_SIZE plane_bsize, // TODO(jingning): temporarily enabled only for luma component rd = MIN(rd1, rd2); - if (!xd->lossless && plane == 0) - x->zcoeff_blk[tx_size][block] = rd1 > rd2 || !xd->plane[plane].eobs[block]; + if (plane == 0) + x->zcoeff_blk[tx_size][block] = !xd->plane[plane].eobs[block] || + (rd1 > rd2 && !xd->lossless); args->this_rate += args->rate; args->this_dist += args->dist; |