admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix clang warnings in video engine.

Browse Source 
There are a number of namespace related warnings remaining in the video engine tests.
Review URL: http://webrtc-codereview.appspot.com/135007

git-svn-id: http://webrtc.googlecode.com/svn/trunk@503 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
andrew@webrtc.org 2011-09-01 00:41:31 +00:00
parent 243db12616
commit 777ef59394
3 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/video_engine/main/source/vie_channel.cc
View File

@ -76,7 +76,7 @@ ViEChannel::ViEChannel(WebRtc_Word32 channelId, WebRtc_Word32 engineId,
_ptrExternalTransport(NULL),
_decoderReset(true),
_waitForKeyFrame(false),
_ptrDecodeThread(false),
_ptrDecodeThread(NULL),
_ptrSrtpModuleEncryption(NULL),
_ptrSrtpModuleDecryption(NULL),
_ptrExternalEncryption(NULL),

18
src/video_engine/main/test/AutoTest/interface/tb_I420_codec.h
View File

@ -38,10 +38,10 @@ public:
WebRtc_Word32 numberOfCores,
WebRtc_UWord32 maxPayloadSize);
virtual WebRtc_Word32 Encode(const webrtc::RawImage& inputImage,
const void* codecSpecificInfo = NULL,
webrtc::VideoFrameType frameType =
webrtc::kDeltaFrame);
virtual WebRtc_Word32 Encode(
const webrtc::RawImage& inputImage,
const webrtc::CodecSpecificInfo* codecSpecificInfo = NULL,
webrtc::VideoFrameType frameType = webrtc::kDeltaFrame);
virtual WebRtc_Word32 RegisterEncodeCompleteCallback(
webrtc::EncodedImageCallback* callback);
@ -98,10 +98,12 @@ public:
virtual WebRtc_Word32 InitDecode(const webrtc::VideoCodec* inst,
WebRtc_Word32 numberOfCores);
virtual WebRtc_Word32 Decode(const webrtc::EncodedImage& inputImage,
bool missingFrames,
const void* codecSpecificInfo = NULL,
WebRtc_Word64 renderTimeMs = -1);
virtual WebRtc_Word32 Decode(
const webrtc::EncodedImage& inputImage,
bool missingFrames,
const webrtc::CodecSpecificInfo* codecSpecificInfo = NULL,
WebRtc_Word64 renderTimeMs = -1);
virtual WebRtc_Word32
RegisterDecodeCompleteCallback(webrtc::DecodedImageCallback* callback);
virtual WebRtc_Word32 Release();

17
src/video_engine/main/test/AutoTest/source/tb_I420_codec.cc
View File

@ -114,10 +114,10 @@ WebRtc_Word32 tbI420Encoder::InitEncode(const webrtc::VideoCodec* inst,
return WEBRTC_VIDEO_CODEC_OK;
}
WebRtc_Word32 tbI420Encoder::Encode(const webrtc::RawImage& inputImage,
const void* codecSpecificInfo /*= NULL*/,
webrtc::VideoFrameType frameType
/*= webrtc::kDeltaFrame*/)
WebRtc_Word32 tbI420Encoder::Encode(
const webrtc::RawImage& inputImage,
const webrtc::CodecSpecificInfo* codecSpecificInfo /*= NULL*/,
webrtc::VideoFrameType frameType /*= webrtc::kDeltaFrame*/)
{
_functionCalls.Encode++;
if (!_inited)
@ -234,10 +234,11 @@ WebRtc_Word32 tbI420Decoder::InitDecode(const webrtc::VideoCodec* inst,
return WEBRTC_VIDEO_CODEC_OK;
}
WebRtc_Word32 tbI420Decoder::Decode(const webrtc::EncodedImage& inputImage,
bool /*missingFrames*/,
const void* /*codecSpecificInfWord64o*/,
WebRtc_Word64 /*renderTimeMs*/)
WebRtc_Word32 tbI420Decoder::Decode(
const webrtc::EncodedImage& inputImage,
bool /*missingFrames*/,
const webrtc::CodecSpecificInfo* /*codecSpecificInfWord64o*/,
WebRtc_Word64 /*renderTimeMs*/)
{
_functionCalls.Decode++;
if (inputImage._buffer == NULL)