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

48
webrtc/modules/video_render/linux/video_x11_channel.h
View File

@ -29,24 +29,24 @@ class CriticalSectionWrapper;
class VideoX11Channel: public VideoRenderCallback
{
public:
VideoX11Channel(WebRtc_Word32 id);
VideoX11Channel(int32_t id);
virtual ~VideoX11Channel();
virtual WebRtc_Word32 RenderFrame(const WebRtc_UWord32 streamId,
I420VideoFrame& videoFrame);
virtual int32_t RenderFrame(const uint32_t streamId,
I420VideoFrame& videoFrame);
WebRtc_Word32 FrameSizeChange(WebRtc_Word32 width, WebRtc_Word32 height,
WebRtc_Word32 numberOfStreams);
WebRtc_Word32 DeliverFrame(const I420VideoFrame& videoFrame);
WebRtc_Word32 GetFrameSize(WebRtc_Word32& width, WebRtc_Word32& height);
WebRtc_Word32 Init(Window window, float left, float top, float right,
float bottom);
WebRtc_Word32 ChangeWindow(Window window);
WebRtc_Word32
GetStreamProperties(WebRtc_UWord32& zOrder, float& left,
int32_t FrameSizeChange(int32_t width, int32_t height,
int32_t numberOfStreams);
int32_t DeliverFrame(const I420VideoFrame& videoFrame);
int32_t GetFrameSize(int32_t& width, int32_t& height);
int32_t Init(Window window, float left, float top, float right,
float bottom);
int32_t ChangeWindow(Window window);
int32_t
GetStreamProperties(uint32_t& zOrder, float& left,
float& top, float& right, float& bottom) const;
WebRtc_Word32 ReleaseWindow();
int32_t ReleaseWindow();
bool IsPrepared()
{
@ -55,9 +55,9 @@ public:
private:
WebRtc_Word32
CreateLocalRenderer(WebRtc_Word32 width, WebRtc_Word32 height);
WebRtc_Word32 RemoveRenderer();
int32_t
CreateLocalRenderer(int32_t width, int32_t height);
int32_t RemoveRenderer();
//FIXME a better place for this method? the GetWidthHeight no longer
// supported by common_video.
@ -71,14 +71,14 @@ private:
XImage* _image;
Window _window;
GC _gc;
WebRtc_Word32 _width; // incoming frame width
WebRtc_Word32 _height; // incoming frame height
WebRtc_Word32 _outWidth; // render frame width
WebRtc_Word32 _outHeight; // render frame height
WebRtc_Word32 _xPos; // position within window
WebRtc_Word32 _yPos;
int32_t _width; // incoming frame width
int32_t _height; // incoming frame height
int32_t _outWidth; // render frame width
int32_t _outHeight; // render frame height
int32_t _xPos; // position within window
int32_t _yPos;
bool _prepared; // true if ready to use
WebRtc_Word32 _dispCount;
int32_t _dispCount;
unsigned char* _buffer;
float _top;
@ -86,7 +86,7 @@ private:
float _right;
float _bottom;
WebRtc_Word32 _Id;
int32_t _Id;
};