| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 80 } | 80 } |
| 81 _ptrWindow = window; | 81 _ptrWindow = window; |
| 82 | 82 |
| 83 | 83 |
| 84 _ptrWindow = window; | 84 _ptrWindow = window; |
| 85 _ptrCocoaRender->ChangeWindow((CocoaRenderView*)_ptrWindow); | 85 _ptrCocoaRender->ChangeWindow((CocoaRenderView*)_ptrWindow); |
| 86 | 86 |
| 87 return 0; | 87 return 0; |
| 88 } | 88 } |
| 89 | 89 |
| 90 VideoRenderCallback* | 90 rtc::VideoSinkInterface<VideoFrame>* |
| 91 VideoRenderMacCocoaImpl::AddIncomingRenderStream(const uint32_t streamId, | 91 VideoRenderMacCocoaImpl::AddIncomingRenderStream(const uint32_t streamId, |
| 92 const uint32_t zOrder, | 92 const uint32_t zOrder, |
| 93 const float left, | 93 const float left, |
| 94 const float top, | 94 const float top, |
| 95 const float right, | 95 const float right, |
| 96 const float bottom) | 96 const float bottom) |
| 97 { | 97 { |
| 98 CriticalSectionScoped cs(&_renderMacCocoaCritsect); | 98 CriticalSectionScoped cs(&_renderMacCocoaCritsect); |
| 99 WEBRTC_TRACE(kTraceDebug, kTraceVideoRenderer, _id, "%s", __FUNCTION__); | 99 WEBRTC_TRACE(kTraceDebug, kTraceVideoRenderer, _id, "%s", __FUNCTION__); |
| 100 VideoChannelNSOpenGL* nsOpenGLChannel = NULL; | 100 VideoChannelNSOpenGL* nsOpenGLChannel = NULL; |
| (...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 244 } | 244 } |
| 245 | 245 |
| 246 int32_t VideoRenderMacCocoaImpl::FullScreenRender(void* window, const bool enabl
e) | 246 int32_t VideoRenderMacCocoaImpl::FullScreenRender(void* window, const bool enabl
e) |
| 247 { | 247 { |
| 248 return -1; | 248 return -1; |
| 249 } | 249 } |
| 250 | 250 |
| 251 } // namespace webrtc | 251 } // namespace webrtc |
| 252 | 252 |
| 253 #endif // COCOA_RENDERING | 253 #endif // COCOA_RENDERING |
| OLD | NEW |