summaryrefslogtreecommitdiff
path: root/modules/video_processing/main
diff options
context:
space:
mode:
authormikhal@webrtc.org <mikhal@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2012-12-13 19:53:26 +0000
committermikhal@webrtc.org <mikhal@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2012-12-13 19:53:26 +0000
commitb6c38fd5ca16d18b4dc54b7a76290ee78d035e03 (patch)
tree232546b27a1982c07928ab9e470161aff3da98aa /modules/video_processing/main
parentb8f8c5e113f2a4ac84a2f3b302c76c1e6ace9ff1 (diff)
downloadwebrtc-b6c38fd5ca16d18b4dc54b7a76290ee78d035e03.tar.gz
vpm unit test: Diasble frame dropping in tests
(follow up on r3284) BUG= Review URL: https://webrtc-codereview.appspot.com/991005 git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@3285 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'modules/video_processing/main')
-rw-r--r--modules/video_processing/main/test/unit_test/unit_test.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/modules/video_processing/main/test/unit_test/unit_test.cc b/modules/video_processing/main/test/unit_test/unit_test.cc
index e4775fc0..dc779441 100644
--- a/modules/video_processing/main/test/unit_test/unit_test.cc
+++ b/modules/video_processing/main/test/unit_test/unit_test.cc
@@ -213,13 +213,11 @@ TEST_F(VideoProcessingModuleTest, FrameStats)
TEST_F(VideoProcessingModuleTest, PreprocessorLogic)
{
- // Disable temporal sampling.
- int resolution = 100;
+ // Disable temporal sampling (frame dropping).
_vpm->EnableTemporalDecimation(false);
+ int resolution = 100;
EXPECT_EQ(VPM_OK, _vpm->SetMaxFrameRate(30));
EXPECT_EQ(VPM_OK, _vpm->SetTargetResolution(resolution, resolution, 15));
- // Revert
- _vpm->EnableTemporalDecimation(true);
EXPECT_EQ(VPM_OK, _vpm->SetTargetResolution(resolution, resolution, 30));
// Disable spatial sampling.
_vpm->SetInputFrameResampleMode(kNoRescaling);