commit c75102eba7ceb57f76a2e9c140dac123896a6d0b
author pbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Tue Apr 09 13:32:55 2013 +0000
committer pbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Tue Apr 09 13:32:55 2013 +0000
tree 8f115386636cdae00c4a4b791bad3e8c4444c4f2
parent 0ea11c1768005b0b496d01ac9b5e9d3790131317

WebRtc_Word32 -> int32_t in utility/

BUG=314

Review URL: https://webrtc-codereview.appspot.com/1307005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@3797 4adac7df-926f-26a2-2b94-8c16560cd09d

webrtc/modules/utility/source/video_coder.cc

diff --git a/webrtc/modules/utility/source/video_coder.cc b/webrtc/modules/utility/source/video_coder.cc
index cc33161..01e4ae0 100644
--- a/webrtc/modules/utility/source/video_coder.cc
+++ b/webrtc/modules/utility/source/video_coder.cc
@@ -13,7 +13,7 @@
 #include "video_coder.h"
 
 namespace webrtc {
-VideoCoder::VideoCoder(WebRtc_UWord32 instanceID)
+VideoCoder::VideoCoder(uint32_t instanceID)
     : _vcm(VideoCodingModule::Create(instanceID)),
       _decodedVideo(0)
 {
@@ -29,7 +29,7 @@
     VideoCodingModule::Destroy(_vcm);
 }
 
-WebRtc_Word32 VideoCoder::ResetDecoder()
+int32_t VideoCoder::ResetDecoder()
 {
     _vcm->ResetDecoder();
 
@@ -41,9 +41,9 @@
     return 0;
 }
 
-WebRtc_Word32 VideoCoder::SetEncodeCodec(VideoCodec& videoCodecInst,
-                                         WebRtc_UWord32 numberOfCores,
-                                         WebRtc_UWord32 maxPayloadSize)
+int32_t VideoCoder::SetEncodeCodec(VideoCodec& videoCodecInst,
+                                   uint32_t numberOfCores,
+                                   uint32_t maxPayloadSize)
 {
     if(_vcm->RegisterSendCodec(&videoCodecInst, numberOfCores,
                                maxPayloadSize) != VCM_OK)
@@ -54,12 +54,12 @@
 }
 
 
-WebRtc_Word32 VideoCoder::SetDecodeCodec(VideoCodec& videoCodecInst,
-                                         WebRtc_Word32 numberOfCores)
+int32_t VideoCoder::SetDecodeCodec(VideoCodec& videoCodecInst,
+                                   int32_t numberOfCores)
 {
     if (videoCodecInst.plType == 0)
     {
-        WebRtc_Word8 plType = DefaultPayloadType(videoCodecInst.plName);
+        int8_t plType = DefaultPayloadType(videoCodecInst.plName);
         if (plType == -1)
         {
             return -1;
@@ -74,8 +74,8 @@
     return 0;
 }
 
-WebRtc_Word32 VideoCoder::Decode(I420VideoFrame& decodedVideo,
-                                 const EncodedVideoData& encodedData)
+int32_t VideoCoder::Decode(I420VideoFrame& decodedVideo,
+                           const EncodedVideoData& encodedData)
 {
     decodedVideo.ResetSize();
     if(encodedData.payloadSize <= 0)
@@ -92,8 +92,8 @@
 }
 
 
-WebRtc_Word32 VideoCoder::Encode(const I420VideoFrame& videoFrame,
-                                 EncodedVideoData& videoEncodedData)
+int32_t VideoCoder::Encode(const I420VideoFrame& videoFrame,
+                           EncodedVideoData& videoEncodedData)
 {
     // The AddVideoFrame(..) call will (indirectly) call SendData(). Store a
     // pointer to videoFrame so that it can be updated.
@@ -106,11 +106,11 @@
     return 0;
 }
 
-WebRtc_Word8 VideoCoder::DefaultPayloadType(const char* plName)
+int8_t VideoCoder::DefaultPayloadType(const char* plName)
 {
     VideoCodec tmpCodec;
-    WebRtc_Word32 numberOfCodecs = _vcm->NumberOfCodecs();
-    for (WebRtc_UWord8 i = 0; i < numberOfCodecs; i++)
+    int32_t numberOfCodecs = _vcm->NumberOfCodecs();
+    for (uint8_t i = 0; i < numberOfCodecs; i++)
     {
         _vcm->Codec(i, &tmpCodec);
         if(strncmp(tmpCodec.plName, plName, kPayloadNameSize) == 0)
@@ -121,18 +121,18 @@
     return -1;
 }
 
-WebRtc_Word32 VideoCoder::FrameToRender(I420VideoFrame& videoFrame)
+int32_t VideoCoder::FrameToRender(I420VideoFrame& videoFrame)
 {
     return _decodedVideo->CopyFrame(videoFrame);
 }
 
-WebRtc_Word32 VideoCoder::SendData(
+int32_t VideoCoder::SendData(
     const FrameType frameType,
-    const WebRtc_UWord8  payloadType,
-    const WebRtc_UWord32 timeStamp,
+    const uint8_t  payloadType,
+    const uint32_t timeStamp,
     int64_t capture_time_ms,
-    const WebRtc_UWord8* payloadData,
-    WebRtc_UWord32 payloadSize,
+    const uint8_t* payloadData,
+    uint32_t payloadSize,
     const RTPFragmentationHeader& fragmentationHeader,
     const RTPVideoHeader* /*rtpVideoHdr*/)
 {
@@ -144,7 +144,7 @@
     _videoEncodedData->timeStamp = timeStamp;
     _videoEncodedData->fragmentationHeader.CopyFrom(fragmentationHeader);
     memcpy(_videoEncodedData->payloadData, payloadData,
-           sizeof(WebRtc_UWord8) * payloadSize);
+           sizeof(uint8_t) * payloadSize);
     _videoEncodedData->payloadSize = payloadSize;
     return 0;
 }