From 67879bc2e69d7907b7ceb92135a34f77fe643e7f Mon Sep 17 00:00:00 2001
From: "pbos@webrtc.org" <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>
Date: Tue, 9 Apr 2013 13:41:51 +0000
Subject: WebRtc_Word32 -> int32_t in video_engine/

BUG=314

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@3801 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 video_engine/vie_file_impl.cc | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

(limited to 'video_engine/vie_file_impl.cc')

diff --git a/video_engine/vie_file_impl.cc b/video_engine/vie_file_impl.cc
index bea4ebd7..29380921 100644
--- a/video_engine/vie_file_impl.cc
+++ b/video_engine/vie_file_impl.cc
@@ -57,7 +57,7 @@ int ViEFileImpl::Release() {
                "ViEFile::Release()");
   // Decrease ref count.
   (*this)--;
-  WebRtc_Word32 ref_count = GetCount();
+  int32_t ref_count = GetCount();
   if (ref_count < 0) {
     WEBRTC_TRACE(kTraceWarning, kTraceVideo, shared_data_->instance_id(),
                  "ViEFile release too many times");
@@ -96,7 +96,7 @@ int ViEFileImpl::StartPlayFile(const char* file_nameUTF8,
   }
 
   VoiceEngine* voice = shared_data_->channel_manager()->GetVoiceEngine();
-  const WebRtc_Word32 result = shared_data_->input_manager()->CreateFilePlayer(
+  const int32_t result = shared_data_->input_manager()->CreateFilePlayer(
       file_nameUTF8, loop, file_format, voice, file_id);
   if (result != 0) {
     shared_data_->SetLastError(result);
@@ -375,7 +375,7 @@ int ViEFileImpl::StartRecordOutgoingVideo(const int video_channel,
     return -1;
   }
 
-  WebRtc_Word32 ve_channel_id = -1;
+  int32_t ve_channel_id = -1;
   VoiceEngine* ve_ptr = NULL;
   if (audio_source != NO_AUDIO) {
     ViEChannel* vie_channel = cs.Channel(video_channel);
@@ -511,7 +511,7 @@ int ViEFileImpl::StartRecordIncomingVideo(const int video_channel,
     return -1;
   }
 
-  WebRtc_Word32 ve_channel_id = -1;
+  int32_t ve_channel_id = -1;
   VoiceEngine* ve_ptr = NULL;
   if (audio_source != NO_AUDIO) {
     ve_channel_id = vie_channel->VoiceChannel();
@@ -601,8 +601,7 @@ int ViEFileImpl::GetRenderSnapshot(const int video_channel,
   // Copy from VideoFrame class to ViEPicture struct.
   int buffer_length = CalcBufferSize(kI420, video_frame.width(),
                                      video_frame.height());
-  picture.data = static_cast<WebRtc_UWord8*>(malloc(
-      buffer_length * sizeof(WebRtc_UWord8)));
+  picture.data = static_cast<uint8_t*>(malloc(buffer_length * sizeof(uint8_t)));
   if (ExtractBuffer(video_frame, buffer_length, picture.data) < 0) {
     return -1;
   }
@@ -669,8 +668,7 @@ int ViEFileImpl::GetCaptureDeviceSnapshot(const int capture_id,
   // Copy from VideoFrame class to ViEPicture struct.
   int buffer_length = CalcBufferSize(kI420, video_frame.width(),
                                      video_frame.height());
-  picture.data = static_cast<WebRtc_UWord8*>(malloc(
-      buffer_length * sizeof(WebRtc_UWord8)));
+  picture.data = static_cast<uint8_t*>(malloc(buffer_length * sizeof(uint8_t)));
   if (ExtractBuffer(video_frame, buffer_length, picture.data) < 0) {
     return -1;
   }
@@ -787,7 +785,7 @@ int ViEFileImpl::SetRenderTimeoutImage(const int video_channel,
     shared_data_->SetLastError(kViEFileInvalidFile);
     return -1;
   }
-  WebRtc_Word32 timeout_time = timeout_ms;
+  int32_t timeout_time = timeout_ms;
   if (timeout_ms < kViEMinRenderTimeoutTimeMs) {
     WEBRTC_TRACE(kTraceWarning, kTraceVideo,
                  ViEId(shared_data_->instance_id(), video_channel),
@@ -842,7 +840,7 @@ const unsigned int timeout_ms) {
     shared_data_->SetLastError(kViEFileInvalidCapture);
     return -1;
   }
-  WebRtc_Word32 timeout_time = timeout_ms;
+  int32_t timeout_time = timeout_ms;
   if (timeout_ms < kViEMinRenderTimeoutTimeMs) {
     WEBRTC_TRACE(kTraceWarning, kTraceVideo,
                  ViEId(shared_data_->instance_id(), video_channel),
@@ -864,8 +862,8 @@ const unsigned int timeout_ms) {
   return 0;
 }
 
-WebRtc_Word32 ViEFileImpl::GetNextCapturedFrame(WebRtc_Word32 capture_id,
-                                                I420VideoFrame* video_frame) {
+int32_t ViEFileImpl::GetNextCapturedFrame(int32_t capture_id,
+                                          I420VideoFrame* video_frame) {
   ViEInputManagerScoped is(*(shared_data_->input_manager()));
   ViECapturer* capturer = is.Capture(capture_id);
   if (!capturer) {
@@ -945,7 +943,7 @@ bool ViECaptureSnapshot::GetSnapshot(unsigned int max_wait_time,
 void ViECaptureSnapshot::DeliverFrame(int id,
                                       I420VideoFrame* video_frame,
                                       int num_csrcs,
-const WebRtc_UWord32 CSRC[kRtpCsrcSize]) {
+const uint32_t CSRC[kRtpCsrcSize]) {
   CriticalSectionScoped cs(crit_.get());
   if (!video_frame_) {
     return;
-- 
cgit v1.2.3