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

Test upscaling as well as downscaling

Browse Source 
Fixes a bug in vp9_set_internal_size() that prevented returning to
the unscaled state. Updated the ResizeInternalTest to scale both
down and up. Added a check that all frames are within 2.5% of the
quality of the initial keyframe.

Change-Id: I3b7ef17cdac144ed05b9148dce6badfa75cff5c8
This commit is contained in:
John Koleszar
2013-02-21 10:38:27 -08:00
parent 6fd7dd1a70
commit b683eecf6d
2 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
test/resize_test.cc
View File

@@ -101,7 +101,7 @@ TEST_P(ResizeTest, TestExternalResizeWorks) {
class ResizeInternalTest : public ResizeTest { class ResizeInternalTest : public ResizeTest {
protected: protected:
ResizeInternalTest() : ResizeTest() {} ResizeInternalTest() : ResizeTest(), frame0_psnr_(0.0) {}
virtual void PreEncodeFrameHook(libvpx_test::VideoSource *video, virtual void PreEncodeFrameHook(libvpx_test::VideoSource *video,
libvpx_test::Encoder *encoder) { libvpx_test::Encoder *encoder) {
@@ -109,19 +109,33 @@ class ResizeInternalTest : public ResizeTest {
struct vpx_scaling_mode mode = {VP8E_FOURFIVE, VP8E_THREEFIVE}; struct vpx_scaling_mode mode = {VP8E_FOURFIVE, VP8E_THREEFIVE};
encoder->Control(VP8E_SET_SCALEMODE, &mode); encoder->Control(VP8E_SET_SCALEMODE, &mode);
} }
if (video->frame() == 6) {
struct vpx_scaling_mode mode = {VP8E_NORMAL, VP8E_NORMAL};
encoder->Control(VP8E_SET_SCALEMODE, &mode);
} }
}
virtual void PSNRPktHook(const vpx_codec_cx_pkt_t *pkt) {
if (!frame0_psnr_)
frame0_psnr_ = pkt->data.psnr.psnr[0];
ASSERT_NEAR(pkt->data.psnr.psnr[0], frame0_psnr_, 0.025*frame0_psnr_);
}
double frame0_psnr_;
}; };
TEST_P(ResizeInternalTest, TestInternalResizeWorks) { TEST_P(ResizeInternalTest, TestInternalResizeWorks) {
::libvpx_test::I420VideoSource video("hantro_collage_w352h288.yuv", 352, 288, ::libvpx_test::I420VideoSource video("hantro_collage_w352h288.yuv", 352, 288,
30, 1, 0, 6); 30, 1, 0, 10);
cfg_.rc_target_bitrate = 5000; init_flags_ = VPX_CODEC_USE_PSNR;
// q picked such that initial keyframe on this clip is ~30dB PSNR
cfg_.rc_min_quantizer = cfg_.rc_max_quantizer = 48;
ASSERT_NO_FATAL_FAILURE(RunLoop(&video)); ASSERT_NO_FATAL_FAILURE(RunLoop(&video));
for (std::vector<FrameInfo>::iterator info = frame_info_list_.begin(); for (std::vector<FrameInfo>::iterator info = frame_info_list_.begin();
info != frame_info_list_.end(); ++info) { info != frame_info_list_.end(); ++info) {
const vpx_codec_pts_t pts = info->pts; const vpx_codec_pts_t pts = info->pts;
if (pts >= 3) { if (pts >= 3 && pts < 6) {
ASSERT_EQ(282U, info->w) << "Frame " << pts << " had unexpected width"; ASSERT_EQ(282U, info->w) << "Frame " << pts << " had unexpected width";
ASSERT_EQ(173U, info->h) << "Frame " << pts << " had unexpected height"; ASSERT_EQ(173U, info->h) << "Frame " << pts << " had unexpected height";
} else { } else {

13
vp9/encoder/vp9_onyx_if.c
View File

@@ -4123,20 +4123,19 @@ int vp9_set_internal_size(VP9_PTR comp,
VP9_COMP *cpi = (VP9_COMP *) comp; VP9_COMP *cpi = (VP9_COMP *) comp;
VP9_COMMON *cm = &cpi->common; VP9_COMMON *cm = &cpi->common;
if (horiz_mode <= ONETWO) if (horiz_mode > ONETWO)
cm->horiz_scale = horiz_mode;
else
return -1; return -1;
if (vert_mode <= ONETWO) if (vert_mode > ONETWO)
cm->vert_scale = vert_mode;
else
return -1; return -1;
if (cm->horiz_scale != NORMAL || cm->vert_scale != NORMAL) { if (cm->horiz_scale != horiz_mode || cm->vert_scale != vert_mode) {
int UNINITIALIZED_IS_SAFE(hr), UNINITIALIZED_IS_SAFE(hs); int UNINITIALIZED_IS_SAFE(hr), UNINITIALIZED_IS_SAFE(hs);
int UNINITIALIZED_IS_SAFE(vr), UNINITIALIZED_IS_SAFE(vs); int UNINITIALIZED_IS_SAFE(vr), UNINITIALIZED_IS_SAFE(vs);
cm->horiz_scale = horiz_mode;
cm->vert_scale = vert_mode;
Scale2Ratio(cm->horiz_scale, &hr, &hs); Scale2Ratio(cm->horiz_scale, &hr, &hs);
Scale2Ratio(cm->vert_scale, &vr, &vs); Scale2Ratio(cm->vert_scale, &vr, &vs);