| 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 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 108 return -1; | 108 return -1; |
| 109 } | 109 } |
| 110 _ptrWindow = window; | 110 _ptrWindow = window; |
| 111 | 111 |
| 112 | 112 |
| 113 _ptrWindow = window; | 113 _ptrWindow = window; |
| 114 | 114 |
| 115 return 0; | 115 return 0; |
| 116 } | 116 } |
| 117 | 117 |
| 118 VideoRenderCallback* | 118 rtc::VideoSinkInterface<VideoFrame>* |
| 119 VideoRenderMacCarbonImpl::AddIncomingRenderStream(const uint32_t streamId, | 119 VideoRenderMacCarbonImpl::AddIncomingRenderStream(const uint32_t streamId, |
| 120 const uint32_t zOrder, | 120 const uint32_t zOrder, |
| 121 const float left, | 121 const float left, |
| 122 const float top, | 122 const float top, |
| 123 const float right, | 123 const float right, |
| 124 const float bottom) | 124 const float bottom) |
| 125 { | 125 { |
| 126 | 126 |
| 127 CriticalSectionScoped cs(&_renderMacCarbonCritsect); | 127 CriticalSectionScoped cs(&_renderMacCarbonCritsect); |
| 128 WEBRTC_TRACE(kTraceDebug, kTraceVideoRenderer, _id, "%s", __FUNCTION__); | 128 WEBRTC_TRACE(kTraceDebug, kTraceVideoRenderer, _id, "%s", __FUNCTION__); |
| (...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 271 const float right, | 271 const float right, |
| 272 const float bottom) | 272 const float bottom) |
| 273 { | 273 { |
| 274 return 0; | 274 return 0; |
| 275 } | 275 } |
| 276 | 276 |
| 277 | 277 |
| 278 } // namespace webrtc | 278 } // namespace webrtc |
| 279 | 279 |
| 280 #endif // CARBON_RENDERING | 280 #endif // CARBON_RENDERING |
| OLD | NEW |