commit ddf94e71e524371f0cc2f6bcfed9ee5a972f11e9
author pbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Wed Apr 10 08:09:04 2013 +0000
committer pbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Wed Apr 10 08:09:04 2013 +0000
tree 25713a26e364898cd9ed78495f89bcb779ae76e0
parent b7192b82476d00384fdc153e6a09a6ac53cef67b

WebRtc_Word32 -> int32_t in video_render/

BUG=314

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

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

webrtc/modules/video_render/video_render_frames.cc

diff --git a/webrtc/modules/video_render/video_render_frames.cc b/webrtc/modules/video_render/video_render_frames.cc
index 134b93a..2c137a3 100644
--- a/webrtc/modules/video_render/video_render_frames.cc
+++ b/webrtc/modules/video_render/video_render_frames.cc
@@ -18,9 +18,9 @@
 
 namespace webrtc {
 
-const WebRtc_Word32 KEventMaxWaitTimeMs = 200;
-const WebRtc_UWord32 kMinRenderDelayMs = 10;
-const WebRtc_UWord32 kMaxRenderDelayMs= 500;
+const int32_t KEventMaxWaitTimeMs = 200;
+const uint32_t kMinRenderDelayMs = 10;
+const uint32_t kMaxRenderDelayMs= 500;
 
 VideoRenderFrames::VideoRenderFrames()
     : incoming_frames_(),
@@ -31,8 +31,8 @@
   ReleaseAllFrames();
 }
 
-WebRtc_Word32 VideoRenderFrames::AddFrame(I420VideoFrame* new_frame) {
-  const WebRtc_Word64 time_now = TickTime::MillisecondTimestamp();
+int32_t VideoRenderFrames::AddFrame(I420VideoFrame* new_frame) {
+  const int64_t time_now = TickTime::MillisecondTimestamp();
 
   if (new_frame->render_time_ms() + KOldRenderTimestampMS < time_now) {
     WEBRTC_TRACE(kTraceWarning, kTraceVideoRenderer, -1,
@@ -119,7 +119,7 @@
   return render_frame;
 }
 
-WebRtc_Word32 VideoRenderFrames::ReturnFrame(I420VideoFrame* old_frame) {
+int32_t VideoRenderFrames::ReturnFrame(I420VideoFrame* old_frame) {
   old_frame->ResetSize();
   old_frame->set_timestamp(0);
   old_frame->set_render_time_ms(0);
@@ -127,7 +127,7 @@
   return 0;
 }
 
-WebRtc_Word32 VideoRenderFrames::ReleaseAllFrames() {
+int32_t VideoRenderFrames::ReleaseAllFrames() {
   while (!incoming_frames_.Empty()) {
     ListItem* item = incoming_frames_.First();
     if (item) {
@@ -149,8 +149,8 @@
   return 0;
 }
 
-WebRtc_UWord32 VideoRenderFrames::TimeToNextFrameRelease() {
-  WebRtc_Word64 time_to_release = 0;
+uint32_t VideoRenderFrames::TimeToNextFrameRelease() {
+  int64_t time_to_release = 0;
   ListItem* item = incoming_frames_.First();
   if (item) {
     I420VideoFrame* oldest_frame =
@@ -163,11 +163,11 @@
   } else {
     time_to_release = KEventMaxWaitTimeMs;
   }
-  return static_cast<WebRtc_UWord32>(time_to_release);
+  return static_cast<uint32_t>(time_to_release);
 }
 
-WebRtc_Word32 VideoRenderFrames::SetRenderDelay(
-    const WebRtc_UWord32 render_delay) {
+int32_t VideoRenderFrames::SetRenderDelay(
+    const uint32_t render_delay) {
   if (render_delay < kMinRenderDelayMs ||
       render_delay > kMaxRenderDelayMs) {
     WEBRTC_TRACE(kTraceWarning, kTraceVideoRenderer,