| 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 20 matching lines...) Expand all Loading... |
| 31 { | 31 { |
| 32 return 0; | 32 return 0; |
| 33 } | 33 } |
| 34 | 34 |
| 35 int32_t VideoRenderExternalImpl::ChangeWindow(void* window) | 35 int32_t VideoRenderExternalImpl::ChangeWindow(void* window) |
| 36 { | 36 { |
| 37 CriticalSectionScoped cs(&_critSect); | 37 CriticalSectionScoped cs(&_critSect); |
| 38 return 0; | 38 return 0; |
| 39 } | 39 } |
| 40 | 40 |
| 41 VideoRenderCallback* | 41 rtc::VideoSinkInterface<VideoFrame>* |
| 42 VideoRenderExternalImpl::AddIncomingRenderStream(const uint32_t streamId, | 42 VideoRenderExternalImpl::AddIncomingRenderStream(const uint32_t streamId, |
| 43 const uint32_t zOrder, | 43 const uint32_t zOrder, |
| 44 const float left, | 44 const float left, |
| 45 const float top, | 45 const float top, |
| 46 const float right, | 46 const float right, |
| 47 const float bottom) | 47 const float bottom) |
| 48 { | 48 { |
| 49 CriticalSectionScoped cs(&_critSect); | 49 CriticalSectionScoped cs(&_critSect); |
| 50 return this; | 50 return this; |
| 51 } | 51 } |
| (...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 180 const void* colorKey, | 180 const void* colorKey, |
| 181 const float left, | 181 const float left, |
| 182 const float top, | 182 const float top, |
| 183 const float right, | 183 const float right, |
| 184 const float bottom) | 184 const float bottom) |
| 185 { | 185 { |
| 186 CriticalSectionScoped cs(&_critSect); | 186 CriticalSectionScoped cs(&_critSect); |
| 187 return 0; | 187 return 0; |
| 188 } | 188 } |
| 189 | 189 |
| 190 // VideoRenderCallback | 190 // rtc::VideoSinkInterface<VideoFrame> |
| 191 int32_t VideoRenderExternalImpl::RenderFrame(const uint32_t streamId, | 191 void VideoRenderExternalImpl::OnFrame(const VideoFrame& videoFrame) {} |
| 192 const VideoFrame& videoFrame) { | 192 |
| 193 return 0; | |
| 194 } | |
| 195 } // namespace webrtc | 193 } // namespace webrtc |
| OLD | NEW |