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

98
webrtc/modules/video_render/i_video_render.h
View File

@ -27,11 +27,11 @@ public:
{
};
virtual WebRtc_Word32 Init() = 0;
virtual int32_t Init() = 0;
virtual WebRtc_Word32 ChangeUniqueId(const WebRtc_Word32 id) = 0;
virtual int32_t ChangeUniqueId(const int32_t id) = 0;
virtual WebRtc_Word32 ChangeWindow(void* window) = 0;
virtual int32_t ChangeWindow(void* window) = 0;
/**************************************************************************
*
@ -40,26 +40,26 @@ 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) = 0;
virtual WebRtc_Word32
DeleteIncomingRenderStream(const WebRtc_UWord32 streamId) = 0;
virtual int32_t
DeleteIncomingRenderStream(const uint32_t streamId) = 0;
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 = 0;
// Implemented in common code?
//virtual WebRtc_UWord32 GetNumIncomingRenderStreams() const = 0;
//virtual bool HasIncomingRenderStream(const WebRtc_UWord16 stramId) const = 0;
//virtual uint32_t GetNumIncomingRenderStreams() const = 0;
//virtual bool HasIncomingRenderStream(const uint16_t stramId) const = 0;
/**************************************************************************
@ -68,9 +68,9 @@ public:
*
***************************************************************************/
virtual WebRtc_Word32 StartRender() = 0;
virtual int32_t StartRender() = 0;
virtual WebRtc_Word32 StopRender() = 0;
virtual int32_t StopRender() = 0;
/**************************************************************************
*
@ -84,48 +84,48 @@ public:
virtual bool FullScreen() = 0;
// TODO: This should be treated in platform specific code only
virtual WebRtc_Word32
GetGraphicsMemory(WebRtc_UWord64& totalGraphicsMemory,
WebRtc_UWord64& availableGraphicsMemory) const = 0;
virtual int32_t
GetGraphicsMemory(uint64_t& totalGraphicsMemory,
uint64_t& availableGraphicsMemory) const = 0;
virtual WebRtc_Word32
GetScreenResolution(WebRtc_UWord32& screenWidth,
WebRtc_UWord32& screenHeight) const = 0;
virtual int32_t
GetScreenResolution(uint32_t& screenWidth,
uint32_t& screenHeight) const = 0;
virtual WebRtc_UWord32 RenderFrameRate(const WebRtc_UWord32 streamId) = 0;
virtual uint32_t RenderFrameRate(const uint32_t streamId) = 0;
virtual WebRtc_Word32 SetStreamCropping(const WebRtc_UWord32 streamId,
const float left,
const float top,
const float right,
const float bottom) = 0;
virtual int32_t SetStreamCropping(const uint32_t streamId,
const float left,
const float top,
const float right,
const float bottom) = 0;
virtual WebRtc_Word32 ConfigureRenderer(const WebRtc_UWord32 streamId,
const unsigned int zOrder,
const float left,
const float top,
const float right,
const float bottom) = 0;
virtual int32_t ConfigureRenderer(const uint32_t streamId,
const unsigned int zOrder,
const float left,
const float top,
const float right,
const float bottom) = 0;
virtual WebRtc_Word32 SetTransparentBackground(const bool enable) = 0;
virtual int32_t SetTransparentBackground(const bool enable) = 0;
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 rigth,
const float bottom) = 0;
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 rigth,
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 SetBitmap(const void* bitMap,
const uint8_t pictureId,
const void* colorKey,
const float left,
const float top,
const float right,
const float bottom) = 0;
};
} //namespace webrtc