From d021bbbc9e9bbdc14b12538a1fc8aba1a78f4688 Mon Sep 17 00:00:00 2001 From: "marpan@webrtc.org" Date: Tue, 16 Dec 2014 00:21:47 +0000 Subject: [PATCH] Fix vp9 setting in vie loopback test. If vp9 codec was selected then videoCodec.codecSpecific.VP8.numberOfTemporalLayers was being set. TBR=stefan@webrtc.org BUG= Review URL: https://webrtc-codereview.appspot.com/37389004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@7907 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../test/auto_test/source/vie_autotest_loopback.cc | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/webrtc/video_engine/test/auto_test/source/vie_autotest_loopback.cc b/webrtc/video_engine/test/auto_test/source/vie_autotest_loopback.cc index 03a82b4ca..471112251 100644 --- a/webrtc/video_engine/test/auto_test/source/vie_autotest_loopback.cc +++ b/webrtc/video_engine/test/auto_test/source/vie_autotest_loopback.cc @@ -427,13 +427,17 @@ int VideoEngineSampleCode(void* window1, void* window2) // Set number of temporal layers. std::cout << std::endl; - std::cout << "Choose number of temporal layers (1 to 4)."; - std::cout << "Press enter for default: \n"; + std::cout << "Choose number of temporal layers for VP8 (1 to 4). "; + std::cout << "Press enter for default (=1) for other codecs: \n"; std::getline(std::cin, str); int numTemporalLayers = atoi(str.c_str()); - if(numTemporalLayers != 0) - { - videoCodec.codecSpecific.VP8.numberOfTemporalLayers = numTemporalLayers; + if (numTemporalLayers != 0 && + videoCodec.codecType == webrtc::kVideoCodecVP8) { + videoCodec.codecSpecific.VP8.numberOfTemporalLayers = numTemporalLayers; + } else if (videoCodec.codecType == webrtc::kVideoCodecVP9) { + // Temporal layers for vp9 not yet supported in webrtc. + numTemporalLayers = 1; + videoCodec.codecSpecific.VP9.numberOfTemporalLayers = 1; } // Set start bit rate