From 38cc9acdd3a763a6ac8ec28d48918338a1abdfcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Fri, 8 Aug 2014 12:24:57 +0300 Subject: [PATCH] Set a specific frame size in TemporalLayerSettingTest Previously, this test used whatever size was set in m_iWidth and m_iHeight before, which depended on the order that the tests were executed. When this test was the first one executed in the EncoderInterfaceTest, the width and height were set to the max. Instead of having the test behaviour depend on the test order, set a specific size, just as InitializeParamExt and MemoryCheckTest do. This reduces the runtime of TemporalLayerSettingTest from 86 seconds to 26 seconds, when run in valgrind. --- test/encoder/EncUT_EncoderExt.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/encoder/EncUT_EncoderExt.cpp b/test/encoder/EncUT_EncoderExt.cpp index 7e59abe6..23be6b8c 100644 --- a/test/encoder/EncUT_EncoderExt.cpp +++ b/test/encoder/EncUT_EncoderExt.cpp @@ -138,8 +138,10 @@ void EncoderInterfaceTest::InitializeParamExt() { TEST_F (EncoderInterfaceTest, TemporalLayerSettingTest) { - pParamExt->iPicWidth = m_iWidth; - pParamExt->iPicHeight = m_iHeight; + pParamExt->iPicWidth = 1280; + pParamExt->iPicHeight = 720; + m_iWidth = pParamExt->iPicWidth; + m_iHeight = pParamExt->iPicHeight; pParamExt->iTargetBitrate = 60000; pParamExt->sSpatialLayers[0].iVideoHeight = pParamExt->iPicHeight; pParamExt->sSpatialLayers[0].iVideoWidth = pParamExt->iPicWidth;