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

Merge "Disable zeroblock forcing for lossless coding mode"

Browse Source
This commit is contained in:
Yaowu Xu 2013-11-08 11:11:39 -08:00 committed by Gerrit Code Review
commit 814112d0f6
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/vp9_lossless_test.cc
View File

@ -35,7 +35,7 @@ class LossLessTest : public ::libvpx_test::EncoderTest,
}
virtual void BeginPassHook(unsigned int /*pass*/) {
psnr_ = 0.0;
psnr_ = kMaxPsnr;
nframes_ = 0;
}
@ -65,9 +65,9 @@ TEST_P(LossLessTest, TestLossLessEncoding) {
init_flags_ = VPX_CODEC_USE_PSNR;
// intentionally changed the dimension for better testing coverage
libvpx_test::I420VideoSource video("hantro_collage_w352h288.yuv", 356, 284,
libvpx_test::I420VideoSource video("hantro_collage_w352h288.yuv", 352, 288,
timebase.den, timebase.num, 0, 30);
ASSERT_NO_FATAL_FAILURE(RunLoop(&video));
const double psnr_lossless = GetMinPsnr();
EXPECT_GE(psnr_lossless, kMaxPsnr);
}

2
vp9/encoder/vp9_rdopt.c
View File

@ -609,7 +609,7 @@ 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 (plane == 0)
if (!xd->lossless && plane == 0)
x->zcoeff_blk[tx_size][block] = rd1 > rd2 || !xd->plane[plane].eobs[block];
args->this_rate += args->rate;