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

Revert "Changed argument occurences of const I420VideoFrame* to const I420VideoFrame& and non-const I420VideoFrame& to I420VideoFrame*."

Browse Source 
This reverts commit r8731.

Reason for revert: Breakes Chromium FYI bots.

TBR=hbos, tommi

Review URL: https://webrtc-codereview.appspot.com/40359004

Cr-Commit-Position: refs/heads/master@{#8733}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8733 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
magjed@webrtc.org
2015-03-16 13:46:52 +00:00
parent 93d9d6503e
commit 2056ee3e3c
72 changed files with 290 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
webrtc/modules/video_render/mac/video_render_nsopengl.mm
View File

@ -90,17 +90,18 @@ int32_t VideoChannelNSOpenGL::GetChannelProperties(float& left, float& top,
}
int32_t VideoChannelNSOpenGL::RenderFrame(
const uint32_t /*streamId*/, I420VideoFrame* videoFrame) {
const uint32_t /*streamId*/, I420VideoFrame& videoFrame) {
_owner->LockAGLCntx();
if(_width != videoFrame->width() || _height != videoFrame->height()) {
if(FrameSizeChange(videoFrame->width(), videoFrame->height(), 1) == -1) {
if(_width != videoFrame.width() ||
_height != videoFrame.height()) {
if(FrameSizeChange(videoFrame.width(), videoFrame.height(), 1) == -1) {
_owner->UnlockAGLCntx();
return -1;
}
}
int ret = DeliverFrame(*videoFrame);
int ret = DeliverFrame(videoFrame);
_owner->UnlockAGLCntx();
return ret;