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
diff --git a/video_engine/vie_renderer.cc b/video_engine/vie_renderer.cc
index 2bc7044..c577148 100644
--- a/video_engine/vie_renderer.cc
+++ b/video_engine/vie_renderer.cc
@@ -17,11 +17,11 @@
namespace webrtc {
-ViERenderer* ViERenderer::CreateViERenderer(const WebRtc_Word32 render_id,
- const WebRtc_Word32 engine_id,
+ViERenderer* ViERenderer::CreateViERenderer(const int32_t render_id,
+ const int32_t engine_id,
VideoRender& render_module,
ViERenderManager& render_manager,
- const WebRtc_UWord32 z_order,
+ const uint32_t z_order,
const float left,
const float top,
const float right,
@@ -43,15 +43,15 @@
delete incoming_external_callback_;
}
-WebRtc_Word32 ViERenderer::StartRender() {
+int32_t ViERenderer::StartRender() {
return render_module_.StartRender(render_id_);
}
-WebRtc_Word32 ViERenderer::StopRender() {
+int32_t ViERenderer::StopRender() {
return render_module_.StopRender(render_id_);
}
-WebRtc_Word32 ViERenderer::GetLastRenderedFrame(const WebRtc_Word32 renderID,
- I420VideoFrame& video_frame) {
+int32_t ViERenderer::GetLastRenderedFrame(const int32_t renderID,
+ I420VideoFrame& video_frame) {
return render_module_.GetLastRenderedFrame(renderID, video_frame);
}
@@ -59,11 +59,11 @@
return render_module_.SetExpectedRenderDelay(render_id_, render_delay);
}
-WebRtc_Word32 ViERenderer::ConfigureRenderer(const unsigned int z_order,
- const float left,
- const float top,
- const float right,
- const float bottom) {
+int32_t ViERenderer::ConfigureRenderer(const unsigned int z_order,
+ const float left,
+ const float top,
+ const float right,
+ const float bottom) {
return render_module_.ConfigureRenderer(render_id_, z_order, left, top, right,
bottom);
}
@@ -72,27 +72,27 @@
return render_module_;
}
-WebRtc_Word32 ViERenderer::EnableMirroring(const WebRtc_Word32 render_id,
- const bool enable,
- const bool mirror_xaxis,
- const bool mirror_yaxis) {
+int32_t ViERenderer::EnableMirroring(const int32_t render_id,
+ const bool enable,
+ const bool mirror_xaxis,
+ const bool mirror_yaxis) {
return render_module_.MirrorRenderStream(render_id, enable, mirror_xaxis,
mirror_yaxis);
}
-WebRtc_Word32 ViERenderer::SetTimeoutImage(const I420VideoFrame& timeout_image,
- const WebRtc_Word32 timeout_value) {
+int32_t ViERenderer::SetTimeoutImage(const I420VideoFrame& timeout_image,
+ const int32_t timeout_value) {
return render_module_.SetTimeoutImage(render_id_, timeout_image,
timeout_value);
}
-WebRtc_Word32 ViERenderer::SetRenderStartImage(
+int32_t ViERenderer::SetRenderStartImage(
const I420VideoFrame& start_image) {
return render_module_.SetStartImage(render_id_, start_image);
}
-WebRtc_Word32 ViERenderer::SetExternalRenderer(
- const WebRtc_Word32 render_id,
+int32_t ViERenderer::SetExternalRenderer(
+ const int32_t render_id,
RawVideoType video_input_format,
ExternalRenderer* external_renderer) {
if (!incoming_external_callback_)
@@ -104,8 +104,8 @@
incoming_external_callback_);
}
-ViERenderer::ViERenderer(const WebRtc_Word32 render_id,
- const WebRtc_Word32 engine_id,
+ViERenderer::ViERenderer(const int32_t render_id,
+ const int32_t engine_id,
VideoRender& render_module,
ViERenderManager& render_manager)
: render_id_(render_id),
@@ -115,11 +115,11 @@
incoming_external_callback_(new ViEExternalRendererImpl()) {
}
-WebRtc_Word32 ViERenderer::Init(const WebRtc_UWord32 z_order,
- const float left,
- const float top,
- const float right,
- const float bottom) {
+int32_t ViERenderer::Init(const uint32_t z_order,
+ const float left,
+ const float top,
+ const float right,
+ const float bottom) {
render_callback_ =
static_cast<VideoRenderCallback*>(render_module_.AddIncomingRenderStream(
render_id_, z_order, left, top, right, bottom));
@@ -133,7 +133,7 @@
void ViERenderer::DeliverFrame(int id,
I420VideoFrame* video_frame,
int num_csrcs,
- const WebRtc_UWord32 CSRC[kRtpCsrcSize]) {
+ const uint32_t CSRC[kRtpCsrcSize]) {
render_callback_->RenderFrame(render_id_, *video_frame);
}
@@ -166,8 +166,8 @@
return 0;
}
-WebRtc_Word32 ViEExternalRendererImpl::RenderFrame(
- const WebRtc_UWord32 stream_id,
+int32_t ViEExternalRendererImpl::RenderFrame(
+ const uint32_t stream_id,
I420VideoFrame& video_frame) {
VideoFrame* out_frame = converted_frame_.get();