zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WebRtc_Word32 -> int32_t in video_render/

Browse Source 
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
This commit is contained in:
pbos@webrtc.org
2013-04-10 08:09:04 +00:00
parent b7192b8247
commit ddf94e71e5
39 changed files with 1273 additions and 1332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

129
webrtc/modules/video_render/video_render_impl.cc
View File

@ -66,7 +66,7 @@
namespace webrtc {
VideoRender*
VideoRender::CreateVideoRender(const WebRtc_Word32 id,
VideoRender::CreateVideoRender(const int32_t id,
void* window,
const bool fullscreen,
const VideoRenderType videoRenderType/*=kRenderDefault*/)
@ -90,7 +90,7 @@ void VideoRender::DestroyVideoRender(
}
ModuleVideoRenderImpl::ModuleVideoRenderImpl(
const WebRtc_Word32 id,
const int32_t id,
const VideoRenderType videoRenderType,
void* window,
const bool fullscreen) :
@ -310,7 +310,7 @@ ModuleVideoRenderImpl::~ModuleVideoRenderImpl()
}
}
WebRtc_Word32 ModuleVideoRenderImpl::ChangeUniqueId(const WebRtc_Word32 id)
int32_t ModuleVideoRenderImpl::ChangeUniqueId(const int32_t id)
{
CriticalSectionScoped cs(&_moduleCrit);
@ -325,12 +325,12 @@ WebRtc_Word32 ModuleVideoRenderImpl::ChangeUniqueId(const WebRtc_Word32 id)
return 0;
}
WebRtc_Word32 ModuleVideoRenderImpl::TimeUntilNextProcess()
int32_t ModuleVideoRenderImpl::TimeUntilNextProcess()
{
// Not used
return 50;
}
WebRtc_Word32 ModuleVideoRenderImpl::Process()
int32_t ModuleVideoRenderImpl::Process()
{
// Not used
return 0;
@ -343,7 +343,7 @@ ModuleVideoRenderImpl::Window()
return _ptrWindow;
}
WebRtc_Word32 ModuleVideoRenderImpl::ChangeWindow(void* window)
int32_t ModuleVideoRenderImpl::ChangeWindow(void* window)
{
CriticalSectionScoped cs(&_moduleCrit);
@ -398,14 +398,14 @@ WebRtc_Word32 ModuleVideoRenderImpl::ChangeWindow(void* window)
#endif
}
WebRtc_Word32 ModuleVideoRenderImpl::Id()
int32_t ModuleVideoRenderImpl::Id()
{
CriticalSectionScoped cs(&_moduleCrit);
return _id;
}
WebRtc_UWord32 ModuleVideoRenderImpl::GetIncomingFrameRate(
const WebRtc_UWord32 streamId)
uint32_t ModuleVideoRenderImpl::GetIncomingFrameRate(
const uint32_t streamId)
{
CriticalSectionScoped cs(&_moduleCrit);
@ -430,8 +430,8 @@ WebRtc_UWord32 ModuleVideoRenderImpl::GetIncomingFrameRate(
}
VideoRenderCallback*
ModuleVideoRenderImpl::AddIncomingRenderStream(const WebRtc_UWord32 streamId,
const WebRtc_UWord32 zOrder,
ModuleVideoRenderImpl::AddIncomingRenderStream(const uint32_t streamId,
const uint32_t zOrder,
const float left,
const float top,
const float right,
@ -494,8 +494,8 @@ ModuleVideoRenderImpl::AddIncomingRenderStream(const WebRtc_UWord32 streamId,
return moduleCallback;
}
WebRtc_Word32 ModuleVideoRenderImpl::DeleteIncomingRenderStream(
const WebRtc_UWord32 streamId)
int32_t ModuleVideoRenderImpl::DeleteIncomingRenderStream(
const uint32_t streamId)
{
CriticalSectionScoped cs(&_moduleCrit);
@ -524,8 +524,8 @@ WebRtc_Word32 ModuleVideoRenderImpl::DeleteIncomingRenderStream(
return 0;
}
WebRtc_Word32 ModuleVideoRenderImpl::AddExternalRenderCallback(
const WebRtc_UWord32 streamId,
int32_t ModuleVideoRenderImpl::AddExternalRenderCallback(
const uint32_t streamId,
VideoRenderCallback* renderObject)
{
CriticalSectionScoped cs(&_moduleCrit);
@ -548,9 +548,9 @@ WebRtc_Word32 ModuleVideoRenderImpl::AddExternalRenderCallback(
return ptrIncomingStream->SetExternalCallback(renderObject);
}
WebRtc_Word32 ModuleVideoRenderImpl::GetIncomingRenderStreamProperties(
const WebRtc_UWord32 streamId,
WebRtc_UWord32& zOrder,
int32_t ModuleVideoRenderImpl::GetIncomingRenderStreamProperties(
const uint32_t streamId,
uint32_t& zOrder,
float& left,
float& top,
float& right,
@ -570,15 +570,15 @@ WebRtc_Word32 ModuleVideoRenderImpl::GetIncomingRenderStreamProperties(
bottom);
}
WebRtc_UWord32 ModuleVideoRenderImpl::GetNumIncomingRenderStreams() const
uint32_t ModuleVideoRenderImpl::GetNumIncomingRenderStreams() const
{
CriticalSectionScoped cs(&_moduleCrit);
return (WebRtc_UWord32) _streamRenderMap.Size();
return (uint32_t) _streamRenderMap.Size();
}
bool ModuleVideoRenderImpl::HasIncomingRenderStream(
const WebRtc_UWord32 streamId) const
const uint32_t streamId) const
{
CriticalSectionScoped cs(&_moduleCrit);
@ -590,14 +590,14 @@ bool ModuleVideoRenderImpl::HasIncomingRenderStream(
return hasStream;
}
WebRtc_Word32 ModuleVideoRenderImpl::RegisterRawFrameCallback(
const WebRtc_UWord32 streamId,
int32_t ModuleVideoRenderImpl::RegisterRawFrameCallback(
const uint32_t streamId,
VideoRenderCallback* callbackObj)
{
return -1;
}
WebRtc_Word32 ModuleVideoRenderImpl::StartRender(const WebRtc_UWord32 streamId)
int32_t ModuleVideoRenderImpl::StartRender(const uint32_t streamId)
{
CriticalSectionScoped cs(&_moduleCrit);
@ -630,7 +630,7 @@ WebRtc_Word32 ModuleVideoRenderImpl::StartRender(const WebRtc_UWord32 streamId)
return 0;
}
WebRtc_Word32 ModuleVideoRenderImpl::StopRender(const WebRtc_UWord32 streamId)
int32_t ModuleVideoRenderImpl::StopRender(const uint32_t streamId)
{
CriticalSectionScoped cs(&_moduleCrit);
@ -658,11 +658,11 @@ WebRtc_Word32 ModuleVideoRenderImpl::StopRender(const WebRtc_UWord32 streamId)
return 0;
}
WebRtc_Word32 ModuleVideoRenderImpl::ResetRender()
int32_t ModuleVideoRenderImpl::ResetRender()
{
CriticalSectionScoped cs(&_moduleCrit);
WebRtc_Word32 error = 0;
int32_t error = 0;
// Loop through all incoming streams and stop them
MapItem* item = _streamRenderMap.First();
@ -704,9 +704,9 @@ bool ModuleVideoRenderImpl::IsFullScreen()
return _ptrRenderer->FullScreen();
}
WebRtc_Word32 ModuleVideoRenderImpl::GetScreenResolution(
WebRtc_UWord32& screenWidth,
WebRtc_UWord32& screenHeight) const
int32_t ModuleVideoRenderImpl::GetScreenResolution(
uint32_t& screenWidth,
uint32_t& screenHeight) const
{
CriticalSectionScoped cs(&_moduleCrit);
@ -719,8 +719,8 @@ WebRtc_Word32 ModuleVideoRenderImpl::GetScreenResolution(
return _ptrRenderer->GetScreenResolution(screenWidth, screenHeight);
}
WebRtc_UWord32 ModuleVideoRenderImpl::RenderFrameRate(
const WebRtc_UWord32 streamId)
uint32_t ModuleVideoRenderImpl::RenderFrameRate(
const uint32_t streamId)
{
CriticalSectionScoped cs(&_moduleCrit);
@ -733,8 +733,8 @@ WebRtc_UWord32 ModuleVideoRenderImpl::RenderFrameRate(
return _ptrRenderer->RenderFrameRate(streamId);
}
WebRtc_Word32 ModuleVideoRenderImpl::SetStreamCropping(
const WebRtc_UWord32 streamId,
int32_t ModuleVideoRenderImpl::SetStreamCropping(
const uint32_t streamId,
const float left,
const float top,
const float right,
@ -751,7 +751,7 @@ WebRtc_Word32 ModuleVideoRenderImpl::SetStreamCropping(
return _ptrRenderer->SetStreamCropping(streamId, left, top, right, bottom);
}
WebRtc_Word32 ModuleVideoRenderImpl::SetTransparentBackground(const bool enable)
int32_t ModuleVideoRenderImpl::SetTransparentBackground(const bool enable)
{
CriticalSectionScoped cs(&_moduleCrit);
@ -764,18 +764,17 @@ WebRtc_Word32 ModuleVideoRenderImpl::SetTransparentBackground(const bool enable)
return _ptrRenderer->SetTransparentBackground(enable);
}
WebRtc_Word32 ModuleVideoRenderImpl::FullScreenRender(void* window,
const bool enable)
int32_t ModuleVideoRenderImpl::FullScreenRender(void* window, const bool enable)
{
return -1;
}
WebRtc_Word32 ModuleVideoRenderImpl::SetText(
const WebRtc_UWord8 textId,
const WebRtc_UWord8* text,
const WebRtc_Word32 textLength,
const WebRtc_UWord32 textColorRef,
const WebRtc_UWord32 backgroundColorRef,
int32_t ModuleVideoRenderImpl::SetText(
const uint8_t textId,
const uint8_t* text,
const int32_t textLength,
const uint32_t textColorRef,
const uint32_t backgroundColorRef,
const float left, const float top,
const float right,
const float bottom)
@ -792,13 +791,13 @@ WebRtc_Word32 ModuleVideoRenderImpl::SetText(
backgroundColorRef, left, top, right, bottom);
}
WebRtc_Word32 ModuleVideoRenderImpl::SetBitmap(const void* bitMap,
const WebRtc_UWord8 pictureId,
const void* colorKey,
const float left,
const float top,
const float right,
const float bottom)
int32_t ModuleVideoRenderImpl::SetBitmap(const void* bitMap,
const uint8_t pictureId,
const void* colorKey,
const float left,
const float top,
const float right,
const float bottom)
{
CriticalSectionScoped cs(&_moduleCrit);
@ -812,8 +811,8 @@ WebRtc_Word32 ModuleVideoRenderImpl::SetBitmap(const void* bitMap,
right, bottom);
}
WebRtc_Word32 ModuleVideoRenderImpl::GetLastRenderedFrame(
const WebRtc_UWord32 streamId,
int32_t ModuleVideoRenderImpl::GetLastRenderedFrame(
const uint32_t streamId,
I420VideoFrame &frame) const
{
CriticalSectionScoped cs(&_moduleCrit);
@ -845,8 +844,8 @@ WebRtc_Word32 ModuleVideoRenderImpl::GetLastRenderedFrame(
return incomingStream->GetLastRenderedFrame(frame);
}
WebRtc_Word32 ModuleVideoRenderImpl::SetExpectedRenderDelay(
WebRtc_UWord32 stream_id, WebRtc_Word32 delay_ms) {
int32_t ModuleVideoRenderImpl::SetExpectedRenderDelay(
uint32_t stream_id, int32_t delay_ms) {
CriticalSectionScoped cs(&_moduleCrit);
if (!_ptrRenderer) {
@ -876,8 +875,8 @@ WebRtc_Word32 ModuleVideoRenderImpl::SetExpectedRenderDelay(
return incoming_stream->SetExpectedRenderDelay(delay_ms);
}
WebRtc_Word32 ModuleVideoRenderImpl::ConfigureRenderer(
const WebRtc_UWord32 streamId,
int32_t ModuleVideoRenderImpl::ConfigureRenderer(
const uint32_t streamId,
const unsigned int zOrder,
const float left,
const float top,
@ -896,8 +895,8 @@ WebRtc_Word32 ModuleVideoRenderImpl::ConfigureRenderer(
bottom);
}
WebRtc_Word32 ModuleVideoRenderImpl::SetStartImage(
const WebRtc_UWord32 streamId,
int32_t ModuleVideoRenderImpl::SetStartImage(
const uint32_t streamId,
const I420VideoFrame& videoFrame)
{
CriticalSectionScoped cs(&_moduleCrit);
@ -930,10 +929,10 @@ WebRtc_Word32 ModuleVideoRenderImpl::SetStartImage(
}
WebRtc_Word32 ModuleVideoRenderImpl::SetTimeoutImage(
const WebRtc_UWord32 streamId,
int32_t ModuleVideoRenderImpl::SetTimeoutImage(
const uint32_t streamId,
const I420VideoFrame& videoFrame,
const WebRtc_UWord32 timeout)
const uint32_t timeout)
{
CriticalSectionScoped cs(&_moduleCrit);
@ -964,10 +963,10 @@ WebRtc_Word32 ModuleVideoRenderImpl::SetTimeoutImage(
return incomingStream->SetTimeoutImage(videoFrame, timeout);
}
WebRtc_Word32 ModuleVideoRenderImpl::MirrorRenderStream(const int renderId,
const bool enable,
const bool mirrorXAxis,
const bool mirrorYAxis)
int32_t ModuleVideoRenderImpl::MirrorRenderStream(const int renderId,
const bool enable,
const bool mirrorXAxis,
const bool mirrorYAxis)
{
CriticalSectionScoped cs(&_moduleCrit);