diff --git a/webrtc/modules/video_coding/codecs/test_framework/normal_async_test.cc b/webrtc/modules/video_coding/codecs/test_framework/normal_async_test.cc index 9eda36e843..dcd74790c2 100644 --- a/webrtc/modules/video_coding/codecs/test_framework/normal_async_test.cc +++ b/webrtc/modules/video_coding/codecs/test_framework/normal_async_test.cc @@ -26,14 +26,12 @@ using namespace webrtc; NormalAsyncTest::NormalAsyncTest() : -NormalTest("Async Normal Test 1", "A test of normal execution of the codec", - _testNo), +NormalTest("Async Normal Test 1", "A test of normal execution of the codec", 1), _decodeCompleteTime(0), _encodeCompleteTime(0), _encFrameCnt(0), _decFrameCnt(0), _requestKeyFrame(false), -_testNo(1), _appendNext(false), _missingFrames(false), _rttFrames(0), @@ -47,13 +45,13 @@ _waitForKey(false) NormalAsyncTest::NormalAsyncTest(uint32_t bitRate) : NormalTest("Async Normal Test 1", "A test of normal execution of the codec", - bitRate, _testNo), + bitRate, + 1), _decodeCompleteTime(0), _encodeCompleteTime(0), _encFrameCnt(0), _decFrameCnt(0), _requestKeyFrame(false), -_testNo(1), _appendNext(false), _missingFrames(false), _rttFrames(0), @@ -67,13 +65,12 @@ _waitForKey(false) NormalAsyncTest::NormalAsyncTest(std::string name, std::string description, unsigned int testNo) : -NormalTest(name, description, _testNo), +NormalTest(name, description, testNo), _decodeCompleteTime(0), _encodeCompleteTime(0), _encFrameCnt(0), _decFrameCnt(0), _requestKeyFrame(false), -_testNo(testNo), _lengthEncFrame(0), _appendNext(false), _missingFrames(false), @@ -88,13 +85,12 @@ _waitForKey(false) NormalAsyncTest::NormalAsyncTest(std::string name, std::string description, uint32_t bitRate, unsigned int testNo) : -NormalTest(name, description, bitRate, _testNo), +NormalTest(name, description, bitRate, testNo), _decodeCompleteTime(0), _encodeCompleteTime(0), _encFrameCnt(0), _decFrameCnt(0), _requestKeyFrame(false), -_testNo(testNo), _lengthEncFrame(0), _appendNext(false), _missingFrames(false), @@ -110,13 +106,12 @@ NormalAsyncTest::NormalAsyncTest(std::string name, std::string description, uint32_t bitRate, unsigned int testNo, unsigned int rttFrames) : -NormalTest(name, description, bitRate, _testNo), +NormalTest(name, description, bitRate, testNo), _decodeCompleteTime(0), _encodeCompleteTime(0), _encFrameCnt(0), _decFrameCnt(0), _requestKeyFrame(false), -_testNo(testNo), _lengthEncFrame(0), _appendNext(false), _missingFrames(false), diff --git a/webrtc/modules/video_coding/codecs/test_framework/normal_async_test.h b/webrtc/modules/video_coding/codecs/test_framework/normal_async_test.h index d2d17eebc7..1e62534aca 100644 --- a/webrtc/modules/video_coding/codecs/test_framework/normal_async_test.h +++ b/webrtc/modules/video_coding/codecs/test_framework/normal_async_test.h @@ -118,7 +118,6 @@ protected: int _encFrameCnt; int _decFrameCnt; bool _requestKeyFrame; - unsigned int _testNo; unsigned int _lengthEncFrame; FrameQueueTuple* _frameToDecode; bool _appendNext;