Fixes Valgrind warnings in the default VCM tests.
BUG= TEST= Review URL: http://webrtc-codereview.appspot.com/299010 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1120 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
@@ -377,7 +377,7 @@ CodecDataBaseTest::Perform(CmdArgs& args)
|
|||||||
} // end: iterate codecs
|
} // end: iterate codecs
|
||||||
rewind(_sourceFile);
|
rewind(_sourceFile);
|
||||||
sourceFrame.Free();
|
sourceFrame.Free();
|
||||||
delete tmpBuffer;
|
delete [] tmpBuffer;
|
||||||
delete decodeCallCDT;
|
delete decodeCallCDT;
|
||||||
delete encodeCallCDT;
|
delete encodeCallCDT;
|
||||||
// closing and calculating PSNR for prior encoder-decoder test
|
// closing and calculating PSNR for prior encoder-decoder test
|
||||||
|
|||||||
@@ -580,6 +580,7 @@ VCMEncComplete_KeyReqTest::SendData(
|
|||||||
{
|
{
|
||||||
WebRtcRTPHeader rtpInfo;
|
WebRtcRTPHeader rtpInfo;
|
||||||
rtpInfo.header.markerBit = true; // end of frame
|
rtpInfo.header.markerBit = true; // end of frame
|
||||||
|
rtpInfo.type.Video.codecHeader.VP8.InitRTPVideoHeaderVP8();
|
||||||
rtpInfo.type.Video.codec = kRTPVideoVP8;
|
rtpInfo.type.Video.codec = kRTPVideoVP8;
|
||||||
rtpInfo.header.payloadType = payloadType;
|
rtpInfo.header.payloadType = payloadType;
|
||||||
rtpInfo.header.sequenceNumber = _seqNo;
|
rtpInfo.header.sequenceNumber = _seqNo;
|
||||||
|
|||||||
@@ -100,6 +100,7 @@ VCMNTEncodeCompleteCallback::SendData(
|
|||||||
break;
|
break;
|
||||||
case kVideoCodecVP8:
|
case kVideoCodecVP8:
|
||||||
rtpInfo.type.Video.codec = kRTPVideoVP8;
|
rtpInfo.type.Video.codec = kRTPVideoVP8;
|
||||||
|
rtpInfo.type.Video.codecHeader.VP8.InitRTPVideoHeaderVP8();
|
||||||
rtpInfo.type.Video.codecHeader.VP8.nonReference =
|
rtpInfo.type.Video.codecHeader.VP8.nonReference =
|
||||||
videoHdr->codecHeader.VP8.nonReference;
|
videoHdr->codecHeader.VP8.nonReference;
|
||||||
rtpInfo.type.Video.codecHeader.VP8.pictureId =
|
rtpInfo.type.Video.codecHeader.VP8.pictureId =
|
||||||
@@ -329,7 +330,7 @@ NormalTest::Perform(CmdArgs& args)
|
|||||||
_testTotalTime = endTime - startTime;
|
_testTotalTime = endTime - startTime;
|
||||||
_sumEncBytes = _encodeCompleteCallback.EncodedBytes();
|
_sumEncBytes = _encodeCompleteCallback.EncodedBytes();
|
||||||
|
|
||||||
delete tmpBuffer;
|
delete [] tmpBuffer;
|
||||||
delete waitEvent;
|
delete waitEvent;
|
||||||
Teardown();
|
Teardown();
|
||||||
Print();
|
Print();
|
||||||
|
|||||||
@@ -61,15 +61,16 @@ VCMEncodeCompleteCallback::SendData(
|
|||||||
rtpInfo.header.markerBit = true; // end of frame
|
rtpInfo.header.markerBit = true; // end of frame
|
||||||
rtpInfo.type.Video.isFirstPacket = true;
|
rtpInfo.type.Video.isFirstPacket = true;
|
||||||
rtpInfo.type.Video.codec = _codecType;
|
rtpInfo.type.Video.codec = _codecType;
|
||||||
|
rtpInfo.type.Video.height = (WebRtc_UWord16)_height;
|
||||||
|
rtpInfo.type.Video.width = (WebRtc_UWord16)_width;
|
||||||
switch (_codecType)
|
switch (_codecType)
|
||||||
{
|
{
|
||||||
case webrtc::kRTPVideoH263:
|
case webrtc::kRTPVideoH263:
|
||||||
rtpInfo.type.Video.codecHeader.H263.bits = false;
|
rtpInfo.type.Video.codecHeader.H263.bits = false;
|
||||||
rtpInfo.type.Video.codecHeader.H263.independentlyDecodable = false;
|
rtpInfo.type.Video.codecHeader.H263.independentlyDecodable = false;
|
||||||
rtpInfo.type.Video.height = (WebRtc_UWord16)_height;
|
|
||||||
rtpInfo.type.Video.width = (WebRtc_UWord16)_width;
|
|
||||||
break;
|
break;
|
||||||
case webrtc::kRTPVideoVP8:
|
case webrtc::kRTPVideoVP8:
|
||||||
|
rtpInfo.type.Video.codecHeader.VP8.InitRTPVideoHeaderVP8();
|
||||||
rtpInfo.type.Video.codecHeader.VP8.nonReference =
|
rtpInfo.type.Video.codecHeader.VP8.nonReference =
|
||||||
videoHdr->codecHeader.VP8.nonReference;
|
videoHdr->codecHeader.VP8.nonReference;
|
||||||
rtpInfo.type.Video.codecHeader.VP8.pictureId =
|
rtpInfo.type.Video.codecHeader.VP8.pictureId =
|
||||||
|
|||||||
@@ -201,6 +201,7 @@ int main(int argc, char **argv)
|
|||||||
ret |= CodecDataBaseTest::RunTest(args);
|
ret |= CodecDataBaseTest::RunTest(args);
|
||||||
ret |= ReceiverTimingTests(args);
|
ret |= ReceiverTimingTests(args);
|
||||||
ret |= JitterBufferTest(args);
|
ret |= JitterBufferTest(args);
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
ret = -1;
|
ret = -1;
|
||||||
break;
|
break;
|
||||||
|
|||||||
Reference in New Issue
Block a user