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

78
webrtc/modules/video_render/windows/i_video_render_win.h
View File

@ -28,7 +28,7 @@ public:
{
};
virtual WebRtc_Word32 Init() = 0;
virtual int32_t Init() = 0;
/**************************************************************************
*
@ -37,22 +37,20 @@ public:
***************************************************************************/
virtual VideoRenderCallback
* CreateChannel(const WebRtc_UWord32 streamId,
const WebRtc_UWord32 zOrder,
* CreateChannel(const uint32_t streamId,
const uint32_t zOrder,
const float left,
const float top,
const float right,
const float bottom) = 0;
virtual WebRtc_Word32 DeleteChannel(const WebRtc_UWord32 streamId) = 0;
virtual int32_t DeleteChannel(const uint32_t streamId) = 0;
virtual WebRtc_Word32 GetStreamSettings(const WebRtc_UWord32 channel,
const WebRtc_UWord16 streamId,
WebRtc_UWord32& zOrder,
float& left,
float& top,
float& right,
float& bottom) = 0;
virtual int32_t GetStreamSettings(const uint32_t channel,
const uint16_t streamId,
uint32_t& zOrder,
float& left, float& top,
float& right, float& bottom) = 0;
/**************************************************************************
*
@ -60,9 +58,9 @@ public:
*
***************************************************************************/
virtual WebRtc_Word32 StartRender() = 0;
virtual int32_t StartRender() = 0;
virtual WebRtc_Word32 StopRender() = 0;
virtual int32_t StopRender() = 0;
/**************************************************************************
*
@ -72,45 +70,39 @@ public:
virtual bool IsFullScreen() = 0;
virtual WebRtc_Word32 SetCropping(const WebRtc_UWord32 channel,
const WebRtc_UWord16 streamId,
virtual int32_t SetCropping(const uint32_t channel,
const uint16_t streamId,
const float left, const float top,
const float right, const float bottom) = 0;
virtual int32_t ConfigureRenderer(const uint32_t channel,
const uint16_t streamId,
const unsigned int zOrder,
const float left,
const float top,
const float right,
const float bottom) = 0;
virtual WebRtc_Word32 ConfigureRenderer(const WebRtc_UWord32 channel,
const WebRtc_UWord16 streamId,
const unsigned int zOrder,
const float left,
const float top,
const float right,
const float bottom) = 0;
virtual int32_t SetTransparentBackground(const bool enable) = 0;
virtual WebRtc_Word32 SetTransparentBackground(const bool enable) = 0;
virtual int32_t SetText(const uint8_t textId,
const uint8_t* text,
const int32_t textLength,
const uint32_t colorText,
const uint32_t colorBg,
const float left, const float top,
const float rigth, const float bottom) = 0;
virtual WebRtc_Word32 SetText(const WebRtc_UWord8 textId,
const WebRtc_UWord8* text,
const WebRtc_Word32 textLength,
const WebRtc_UWord32 colorText,
const WebRtc_UWord32 colorBg,
const float left,
const float top,
const float rigth,
const float bottom) = 0;
virtual int32_t SetBitmap(const void* bitMap,
const uint8_t pictureId,
const void* colorKey,
const float left, const float top,
const float right, const float bottom) = 0;
virtual WebRtc_Word32 SetBitmap(const void* bitMap,
const WebRtc_UWord8 pictureId,
const void* colorKey,
const float left,
const float top,
const float right,
const float bottom) = 0;
virtual int32_t ChangeWindow(void* window) = 0;
virtual WebRtc_Word32 ChangeWindow(void* window) = 0;
virtual WebRtc_Word32 GetGraphicsMemory(WebRtc_UWord64& totalMemory,
WebRtc_UWord64& availableMemory) = 0;
virtual int32_t GetGraphicsMemory(uint64_t& totalMemory,
uint64_t& availableMemory) = 0;
};

98
webrtc/modules/video_render/windows/video_render_direct3d9.cc
View File

@ -68,8 +68,8 @@ D3D9Channel::~D3D9Channel()
}
}
void D3D9Channel::SetStreamSettings(WebRtc_UWord16 streamId,
WebRtc_UWord32 zOrder,
void D3D9Channel::SetStreamSettings(uint16_t streamId,
uint32_t zOrder,
float startWidth,
float startHeight,
float stopWidth,
@ -83,8 +83,8 @@ void D3D9Channel::SetStreamSettings(WebRtc_UWord16 streamId,
_stopHeight = stopHeight;
}
int D3D9Channel::GetStreamSettings(WebRtc_UWord16 streamId,
WebRtc_UWord32& zOrder,
int D3D9Channel::GetStreamSettings(uint16_t streamId,
uint32_t& zOrder,
float& startWidth,
float& startHeight,
float& stopWidth,
@ -142,8 +142,8 @@ int D3D9Channel::FrameSizeChange(int width, int height, int numberOfStreams)
return 0;
}
WebRtc_Word32 D3D9Channel::RenderFrame(const WebRtc_UWord32 streamId,
I420VideoFrame& videoFrame)
int32_t D3D9Channel::RenderFrame(const uint32_t streamId,
I420VideoFrame& videoFrame)
{
CriticalSectionScoped cs(_critSect);
if (_width != videoFrame.width() || _height != videoFrame.height())
@ -539,7 +539,7 @@ int VideoRenderDirect3D9::InitDevice()
return 0;
}
WebRtc_Word32 VideoRenderDirect3D9::Init()
int32_t VideoRenderDirect3D9::Init()
{
WEBRTC_TRACE(kTraceInfo, kTraceVideo, -1,
"VideoRenderDirect3D9::Init");
@ -570,7 +570,7 @@ WebRtc_Word32 VideoRenderDirect3D9::Init()
return InitDevice();
}
WebRtc_Word32 VideoRenderDirect3D9::ChangeWindow(void* window)
int32_t VideoRenderDirect3D9::ChangeWindow(void* window)
{
WEBRTC_TRACE(kTraceError, kTraceVideo, -1, "Not supported.");
return -1;
@ -636,7 +636,7 @@ int VideoRenderDirect3D9::UpdateRenderSurface()
textureWidth = channelObj->GetTextureWidth();
textureHeight = channelObj->GetTextureHeight();
WebRtc_UWord32 zOrder;
uint32_t zOrder;
float startWidth, startHeight, stopWidth, stopHeight;
channelObj->GetStreamSettings(0, zOrder, startWidth,
startHeight, stopWidth,
@ -815,7 +815,7 @@ D3D9Channel* VideoRenderDirect3D9::GetD3DChannel(int channel)
return ddobj;
}
WebRtc_Word32 VideoRenderDirect3D9::DeleteChannel(const WebRtc_UWord32 streamId)
int32_t VideoRenderDirect3D9::DeleteChannel(const uint32_t streamId)
{
CriticalSectionScoped cs(&_refD3DCritsect);
@ -843,8 +843,8 @@ WebRtc_Word32 VideoRenderDirect3D9::DeleteChannel(const WebRtc_UWord32 streamId)
return -1;
}
VideoRenderCallback* VideoRenderDirect3D9::CreateChannel(const WebRtc_UWord32 channel,
const WebRtc_UWord32 zOrder,
VideoRenderCallback* VideoRenderDirect3D9::CreateChannel(const uint32_t channel,
const uint32_t zOrder,
const float left,
const float top,
const float right,
@ -871,13 +871,11 @@ VideoRenderCallback* VideoRenderDirect3D9::CreateChannel(const WebRtc_UWord32 ch
return d3dChannel;
}
WebRtc_Word32 VideoRenderDirect3D9::GetStreamSettings(const WebRtc_UWord32 channel,
const WebRtc_UWord16 streamId,
WebRtc_UWord32& zOrder,
float& left,
float& top,
float& right,
float& bottom)
int32_t VideoRenderDirect3D9::GetStreamSettings(const uint32_t channel,
const uint16_t streamId,
uint32_t& zOrder,
float& left, float& top,
float& right, float& bottom)
{
std::map<int, D3D9Channel*>::iterator ddIt;
ddIt = _d3dChannels.find(channel & 0x0000ffff);
@ -939,13 +937,13 @@ int VideoRenderDirect3D9::UpdateVerticeBuffer(LPDIRECT3DVERTEXBUFFER9 pVB,
return 0;
}
WebRtc_Word32 VideoRenderDirect3D9::StartRender()
int32_t VideoRenderDirect3D9::StartRender()
{
WEBRTC_TRACE(kTraceError, kTraceVideo, -1, "Not supported.");
return 0;
}
WebRtc_Word32 VideoRenderDirect3D9::StopRender()
int32_t VideoRenderDirect3D9::StopRender()
{
WEBRTC_TRACE(kTraceError, kTraceVideo, -1, "Not supported.");
return 0;
@ -956,45 +954,39 @@ bool VideoRenderDirect3D9::IsFullScreen()
return _fullScreen;
}
WebRtc_Word32 VideoRenderDirect3D9::SetCropping(const WebRtc_UWord32 channel,
const WebRtc_UWord16 streamId,
const float left,
const float top,
const float right,
const float bottom)
int32_t VideoRenderDirect3D9::SetCropping(const uint32_t channel,
const uint16_t streamId,
const float left, const float top,
const float right, const float bottom)
{
WEBRTC_TRACE(kTraceError, kTraceVideo, -1, "Not supported.");
return 0;
}
WebRtc_Word32 VideoRenderDirect3D9::SetTransparentBackground(
int32_t VideoRenderDirect3D9::SetTransparentBackground(
const bool enable)
{
WEBRTC_TRACE(kTraceError, kTraceVideo, -1, "Not supported.");
return 0;
}
WebRtc_Word32 VideoRenderDirect3D9::SetText(const WebRtc_UWord8 textId,
const WebRtc_UWord8* text,
const WebRtc_Word32 textLength,
const WebRtc_UWord32 colorText,
const WebRtc_UWord32 colorBg,
const float left,
const float top,
const float rigth,
const float bottom)
int32_t VideoRenderDirect3D9::SetText(const uint8_t textId,
const uint8_t* text,
const int32_t textLength,
const uint32_t colorText,
const uint32_t colorBg,
const float left, const float top,
const float rigth, const float bottom)
{
WEBRTC_TRACE(kTraceError, kTraceVideo, -1, "Not supported.");
return 0;
}
WebRtc_Word32 VideoRenderDirect3D9::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 VideoRenderDirect3D9::SetBitmap(const void* bitMap,
const uint8_t pictureId,
const void* colorKey,
const float left, const float top,
const float right, const float bottom)
{
if (!bitMap)
{
@ -1141,8 +1133,8 @@ WebRtc_Word32 VideoRenderDirect3D9::SetBitmap(const void* bitMap,
}
WebRtc_Word32 VideoRenderDirect3D9::GetGraphicsMemory(WebRtc_UWord64& totalMemory,
WebRtc_UWord64& availableMemory)
int32_t VideoRenderDirect3D9::GetGraphicsMemory(uint64_t& totalMemory,
uint64_t& availableMemory)
{
if (_totalMemory == -1 || _availableMemory == -1)
{
@ -1155,13 +1147,13 @@ WebRtc_Word32 VideoRenderDirect3D9::GetGraphicsMemory(WebRtc_UWord64& totalMemor
return 0;
}
WebRtc_Word32 VideoRenderDirect3D9::ConfigureRenderer(const WebRtc_UWord32 channel,
const WebRtc_UWord16 streamId,
const unsigned int zOrder,
const float left,
const float top,
const float right,
const float bottom)
int32_t VideoRenderDirect3D9::ConfigureRenderer(const uint32_t channel,
const uint16_t streamId,
const unsigned int zOrder,
const float left,
const float top,
const float right,
const float bottom)
{
std::map<int, D3D9Channel*>::iterator ddIt;
ddIt = _d3dChannels.find(channel & 0x0000ffff);

98
webrtc/modules/video_render/windows/video_render_direct3d9.h
View File

@ -45,8 +45,8 @@ public:
// A new frame is delivered.
virtual int DeliverFrame(const I420VideoFrame& videoFrame);
virtual WebRtc_Word32 RenderFrame(const WebRtc_UWord32 streamId,
I420VideoFrame& videoFrame);
virtual int32_t RenderFrame(const uint32_t streamId,
I420VideoFrame& videoFrame);
// Called to check if the video frame is updated.
int IsUpdated(bool& isUpdated);
@ -58,14 +58,14 @@ public:
int GetTextureWidth();
int GetTextureHeight();
//
void SetStreamSettings(WebRtc_UWord16 streamId,
WebRtc_UWord32 zOrder,
void SetStreamSettings(uint16_t streamId,
uint32_t zOrder,
float startWidth,
float startHeight,
float stopWidth,
float stopHeight);
int GetStreamSettings(WebRtc_UWord16 streamId,
WebRtc_UWord32& zOrder,
int GetStreamSettings(uint16_t streamId,
uint32_t& zOrder,
float& startWidth,
float& startHeight,
float& stopWidth,
@ -88,8 +88,8 @@ private:
int _height;
//sream settings
//TODO support multiple streams in one channel
WebRtc_UWord16 _streamId;
WebRtc_UWord32 _zOrder;
uint16_t _streamId;
uint32_t _zOrder;
float _startWidth;
float _startHeight;
float _stopWidth;
@ -110,7 +110,7 @@ public:
* Init
*
***************************************************************************/
virtual WebRtc_Word32 Init();
virtual int32_t Init();
/**************************************************************************
*
@ -118,22 +118,20 @@ public:
*
***************************************************************************/
virtual VideoRenderCallback
* CreateChannel(const WebRtc_UWord32 streamId,
const WebRtc_UWord32 zOrder,
* CreateChannel(const uint32_t streamId,
const uint32_t zOrder,
const float left,
const float top,
const float right,
const float bottom);
virtual WebRtc_Word32 DeleteChannel(const WebRtc_UWord32 streamId);
virtual int32_t DeleteChannel(const uint32_t streamId);
virtual WebRtc_Word32 GetStreamSettings(const WebRtc_UWord32 channel,
const WebRtc_UWord16 streamId,
WebRtc_UWord32& zOrder,
float& left,
float& top,
float& right,
float& bottom);
virtual int32_t GetStreamSettings(const uint32_t channel,
const uint16_t streamId,
uint32_t& zOrder,
float& left, float& top,
float& right, float& bottom);
/**************************************************************************
*
@ -141,8 +139,8 @@ public:
*
***************************************************************************/
virtual WebRtc_Word32 StartRender();
virtual WebRtc_Word32 StopRender();
virtual int32_t StartRender();
virtual int32_t StopRender();
/**************************************************************************
*
@ -152,45 +150,37 @@ public:
virtual bool IsFullScreen();
virtual WebRtc_Word32 SetCropping(const WebRtc_UWord32 channel,
const WebRtc_UWord16 streamId,
const float left,
const float top,
const float right,
const float bottom);
virtual int32_t SetCropping(const uint32_t channel,
const uint16_t streamId,
const float left, const float top,
const float right, const float bottom);
virtual WebRtc_Word32 ConfigureRenderer(const WebRtc_UWord32 channel,
const WebRtc_UWord16 streamId,
const unsigned int zOrder,
const float left,
const float top,
const float right,
const float bottom);
virtual int32_t ConfigureRenderer(const uint32_t channel,
const uint16_t streamId,
const unsigned int zOrder,
const float left, const float top,
const float right, const float bottom);
virtual WebRtc_Word32 SetTransparentBackground(const bool enable);
virtual int32_t SetTransparentBackground(const bool enable);
virtual WebRtc_Word32 ChangeWindow(void* window);
virtual int32_t ChangeWindow(void* window);
virtual WebRtc_Word32 GetGraphicsMemory(WebRtc_UWord64& totalMemory,
WebRtc_UWord64& availableMemory);
virtual int32_t GetGraphicsMemory(uint64_t& totalMemory,
uint64_t& availableMemory);
virtual WebRtc_Word32 SetText(const WebRtc_UWord8 textId,
const WebRtc_UWord8* text,
const WebRtc_Word32 textLength,
const WebRtc_UWord32 colorText,
const WebRtc_UWord32 colorBg,
const float left,
const float top,
const float rigth,
const float bottom);
virtual int32_t SetText(const uint8_t textId,
const uint8_t* text,
const int32_t textLength,
const uint32_t colorText,
const uint32_t colorBg,
const float left, const float top,
const float rigth, const float bottom);
virtual WebRtc_Word32 SetBitmap(const void* bitMap,
const WebRtc_UWord8 pictureId,
const void* colorKey,
const float left,
const float top,
const float right,
const float bottom);
virtual int32_t SetBitmap(const void* bitMap,
const uint8_t pictureId,
const void* colorKey,
const float left, const float top,
const float right, const float bottom);
public:
// Get a channel by channel id

94
webrtc/modules/video_render/windows/video_render_windows_impl.cc
View File

@ -21,7 +21,7 @@
namespace webrtc {
VideoRenderWindowsImpl::VideoRenderWindowsImpl(const WebRtc_Word32 id,
VideoRenderWindowsImpl::VideoRenderWindowsImpl(const int32_t id,
const VideoRenderType videoRenderType, void* window, const bool fullscreen)
: _id(id),
_renderWindowsCritsect(*CriticalSectionWrapper::CreateCriticalSection()),
@ -41,7 +41,7 @@ VideoRenderWindowsImpl::~VideoRenderWindowsImpl()
}
}
WebRtc_Word32 VideoRenderWindowsImpl::Init()
int32_t VideoRenderWindowsImpl::Init()
{
// Create the win renderer
switch (_renderMethod)
@ -72,14 +72,14 @@ WebRtc_Word32 VideoRenderWindowsImpl::Init()
return -1;
}
WebRtc_Word32 VideoRenderWindowsImpl::ChangeUniqueId(const WebRtc_Word32 id)
int32_t VideoRenderWindowsImpl::ChangeUniqueId(const int32_t id)
{
CriticalSectionScoped cs(&_renderWindowsCritsect);
_id = id;
return 0;
}
WebRtc_Word32 VideoRenderWindowsImpl::ChangeWindow(void* window)
int32_t VideoRenderWindowsImpl::ChangeWindow(void* window)
{
CriticalSectionScoped cs(&_renderWindowsCritsect);
if (!_ptrRendererWin)
@ -93,8 +93,8 @@ WebRtc_Word32 VideoRenderWindowsImpl::ChangeWindow(void* window)
}
VideoRenderCallback*
VideoRenderWindowsImpl::AddIncomingRenderStream(const WebRtc_UWord32 streamId,
const WebRtc_UWord32 zOrder,
VideoRenderWindowsImpl::AddIncomingRenderStream(const uint32_t streamId,
const uint32_t zOrder,
const float left,
const float top,
const float right,
@ -115,11 +115,11 @@ VideoRenderWindowsImpl::AddIncomingRenderStream(const WebRtc_UWord32 streamId,
return renderCallback;
}
WebRtc_Word32 VideoRenderWindowsImpl::DeleteIncomingRenderStream(
const WebRtc_UWord32 streamId)
int32_t VideoRenderWindowsImpl::DeleteIncomingRenderStream(
const uint32_t streamId)
{
CriticalSectionScoped cs(&_renderWindowsCritsect);
WebRtc_Word32 error = -1;
int32_t error = -1;
if (!_ptrRendererWin)
{
}
@ -130,9 +130,9 @@ WebRtc_Word32 VideoRenderWindowsImpl::DeleteIncomingRenderStream(
return error;
}
WebRtc_Word32 VideoRenderWindowsImpl::GetIncomingRenderStreamProperties(
const WebRtc_UWord32 streamId,
WebRtc_UWord32& zOrder,
int32_t VideoRenderWindowsImpl::GetIncomingRenderStreamProperties(
const uint32_t streamId,
uint32_t& zOrder,
float& left,
float& top,
float& right,
@ -145,7 +145,7 @@ WebRtc_Word32 VideoRenderWindowsImpl::GetIncomingRenderStreamProperties(
right = 0;
bottom = 0;
WebRtc_Word32 error = -1;
int32_t error = -1;
if (!_ptrRendererWin)
{
}
@ -157,10 +157,10 @@ WebRtc_Word32 VideoRenderWindowsImpl::GetIncomingRenderStreamProperties(
return error;
}
WebRtc_Word32 VideoRenderWindowsImpl::StartRender()
int32_t VideoRenderWindowsImpl::StartRender()
{
CriticalSectionScoped cs(&_renderWindowsCritsect);
WebRtc_Word32 error = -1;
int32_t error = -1;
if (!_ptrRendererWin)
{
}
@ -171,10 +171,10 @@ WebRtc_Word32 VideoRenderWindowsImpl::StartRender()
return error;
}
WebRtc_Word32 VideoRenderWindowsImpl::StopRender()
int32_t VideoRenderWindowsImpl::StopRender()
{
CriticalSectionScoped cs(&_renderWindowsCritsect);
WebRtc_Word32 error = -1;
int32_t error = -1;
if (!_ptrRendererWin)
{
}
@ -209,9 +209,9 @@ bool VideoRenderWindowsImpl::FullScreen()
return fullscreen;
}
WebRtc_Word32 VideoRenderWindowsImpl::GetGraphicsMemory(
WebRtc_UWord64& totalGraphicsMemory,
WebRtc_UWord64& availableGraphicsMemory) const
int32_t VideoRenderWindowsImpl::GetGraphicsMemory(
uint64_t& totalGraphicsMemory,
uint64_t& availableGraphicsMemory) const
{
if (_ptrRendererWin)
{
@ -224,9 +224,9 @@ WebRtc_Word32 VideoRenderWindowsImpl::GetGraphicsMemory(
return -1;
}
WebRtc_Word32 VideoRenderWindowsImpl::GetScreenResolution(
WebRtc_UWord32& screenWidth,
WebRtc_UWord32& screenHeight) const
int32_t VideoRenderWindowsImpl::GetScreenResolution(
uint32_t& screenWidth,
uint32_t& screenHeight) const
{
CriticalSectionScoped cs(&_renderWindowsCritsect);
screenWidth = 0;
@ -234,22 +234,22 @@ WebRtc_Word32 VideoRenderWindowsImpl::GetScreenResolution(
return 0;
}
WebRtc_UWord32 VideoRenderWindowsImpl::RenderFrameRate(
const WebRtc_UWord32 streamId)
uint32_t VideoRenderWindowsImpl::RenderFrameRate(
const uint32_t streamId)
{
CriticalSectionScoped cs(&_renderWindowsCritsect);
return 0;
}
WebRtc_Word32 VideoRenderWindowsImpl::SetStreamCropping(
const WebRtc_UWord32 streamId,
int32_t VideoRenderWindowsImpl::SetStreamCropping(
const uint32_t streamId,
const float left,
const float top,
const float right,
const float bottom)
{
CriticalSectionScoped cs(&_renderWindowsCritsect);
WebRtc_Word32 error = -1;
int32_t error = -1;
if (!_ptrRendererWin)
{
}
@ -261,8 +261,8 @@ WebRtc_Word32 VideoRenderWindowsImpl::SetStreamCropping(
return error;
}
WebRtc_Word32 VideoRenderWindowsImpl::ConfigureRenderer(
const WebRtc_UWord32 streamId,
int32_t VideoRenderWindowsImpl::ConfigureRenderer(
const uint32_t streamId,
const unsigned int zOrder,
const float left,
const float top,
@ -270,7 +270,7 @@ WebRtc_Word32 VideoRenderWindowsImpl::ConfigureRenderer(
const float bottom)
{
CriticalSectionScoped cs(&_renderWindowsCritsect);
WebRtc_Word32 error = -1;
int32_t error = -1;
if (!_ptrRendererWin)
{
}
@ -283,11 +283,11 @@ WebRtc_Word32 VideoRenderWindowsImpl::ConfigureRenderer(
return error;
}
WebRtc_Word32 VideoRenderWindowsImpl::SetTransparentBackground(
int32_t VideoRenderWindowsImpl::SetTransparentBackground(
const bool enable)
{
CriticalSectionScoped cs(&_renderWindowsCritsect);
WebRtc_Word32 error = -1;
int32_t error = -1;
if (!_ptrRendererWin)
{
}
@ -298,19 +298,19 @@ WebRtc_Word32 VideoRenderWindowsImpl::SetTransparentBackground(
return error;
}
WebRtc_Word32 VideoRenderWindowsImpl::SetText(
const WebRtc_UWord8 textId,
const WebRtc_UWord8* text,
const WebRtc_Word32 textLength,
const WebRtc_UWord32 textColorRef,
const WebRtc_UWord32 backgroundColorRef,
int32_t VideoRenderWindowsImpl::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)
{
CriticalSectionScoped cs(&_renderWindowsCritsect);
WebRtc_Word32 error = -1;
int32_t error = -1;
if (!_ptrRendererWin)
{
}
@ -323,16 +323,14 @@ WebRtc_Word32 VideoRenderWindowsImpl::SetText(
return error;
}
WebRtc_Word32 VideoRenderWindowsImpl::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 VideoRenderWindowsImpl::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(&_renderWindowsCritsect);
WebRtc_Word32 error = -1;
int32_t error = -1;
if (!_ptrRendererWin)
{
}

84
webrtc/modules/video_render/windows/video_render_windows_impl.h
View File

@ -34,17 +34,17 @@ public:
* Constructor/destructor
*/
VideoRenderWindowsImpl(const WebRtc_Word32 id,
VideoRenderWindowsImpl(const int32_t id,
const VideoRenderType videoRenderType,
void* window, const bool fullscreen);
virtual ~VideoRenderWindowsImpl();
virtual WebRtc_Word32 Init();
virtual int32_t Init();
virtual WebRtc_Word32 ChangeUniqueId(const WebRtc_Word32 id);
virtual int32_t ChangeUniqueId(const int32_t id);
virtual WebRtc_Word32 ChangeWindow(void* window);
virtual int32_t ChangeWindow(void* window);
/**************************************************************************
*
@ -53,17 +53,17 @@ public:
***************************************************************************/
virtual VideoRenderCallback
* AddIncomingRenderStream(const WebRtc_UWord32 streamId,
const WebRtc_UWord32 zOrder,
* AddIncomingRenderStream(const uint32_t streamId,
const uint32_t zOrder,
const float left, const float top,
const float right, const float bottom);
virtual WebRtc_Word32
DeleteIncomingRenderStream(const WebRtc_UWord32 streamId);
virtual int32_t
DeleteIncomingRenderStream(const uint32_t streamId);
virtual WebRtc_Word32
GetIncomingRenderStreamProperties(const WebRtc_UWord32 streamId,
WebRtc_UWord32& zOrder,
virtual int32_t
GetIncomingRenderStreamProperties(const uint32_t streamId,
uint32_t& zOrder,
float& left, float& top,
float& right, float& bottom) const;
@ -73,9 +73,9 @@ public:
*
***************************************************************************/
virtual WebRtc_Word32 StartRender();
virtual int32_t StartRender();
virtual WebRtc_Word32 StopRender();
virtual int32_t StopRender();
/**************************************************************************
*
@ -89,45 +89,43 @@ public:
virtual bool FullScreen();
virtual WebRtc_Word32
GetGraphicsMemory(WebRtc_UWord64& totalGraphicsMemory,
WebRtc_UWord64& availableGraphicsMemory) const;
virtual int32_t
GetGraphicsMemory(uint64_t& totalGraphicsMemory,
uint64_t& availableGraphicsMemory) const;
virtual WebRtc_Word32
GetScreenResolution(WebRtc_UWord32& screenWidth,
WebRtc_UWord32& screenHeight) const;
virtual int32_t
GetScreenResolution(uint32_t& screenWidth,
uint32_t& screenHeight) const;
virtual WebRtc_UWord32 RenderFrameRate(const WebRtc_UWord32 streamId);
virtual uint32_t RenderFrameRate(const uint32_t streamId);
virtual WebRtc_Word32 SetStreamCropping(const WebRtc_UWord32 streamId,
const float left, const float top,
const float right,
const float bottom);
virtual int32_t SetStreamCropping(const uint32_t streamId,
const float left, const float top,
const float right, const float bottom);
virtual WebRtc_Word32 ConfigureRenderer(const WebRtc_UWord32 streamId,
const unsigned int zOrder,
const float left, const float top,
const float right,
const float bottom);
virtual int32_t ConfigureRenderer(const uint32_t streamId,
const unsigned int zOrder,
const float left, const float top,
const float right, const float bottom);
virtual WebRtc_Word32 SetTransparentBackground(const bool enable);
virtual int32_t SetTransparentBackground(const bool enable);
virtual WebRtc_Word32 SetText(const WebRtc_UWord8 textId,
const WebRtc_UWord8* text,
const WebRtc_Word32 textLength,
const WebRtc_UWord32 textColorRef,
const WebRtc_UWord32 backgroundColorRef,
const float left, const float top,
const float right, const float bottom);
virtual int32_t 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);
virtual WebRtc_Word32 SetBitmap(const void* bitMap,
const WebRtc_UWord8 pictureId,
const void* colorKey, const float left,
const float top, const float right,
const float bottom);
virtual int32_t SetBitmap(const void* bitMap,
const uint8_t pictureId,
const void* colorKey,
const float left, const float top,
const float right, const float bottom);
private:
WebRtc_Word32 _id;
int32_t _id;
CriticalSectionWrapper& _renderWindowsCritsect;
void* _prtWindow;