| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2013 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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 53 CriticalSectionScoped cs(crit_sec_); | 53 CriticalSectionScoped cs(crit_sec_); |
| 54 if (window == NULL) { | 54 if (window == NULL) { |
| 55 return -1; | 55 return -1; |
| 56 } | 56 } |
| 57 | 57 |
| 58 ptr_window_ = window; | 58 ptr_window_ = window; |
| 59 | 59 |
| 60 return ptr_ios_render_->ChangeWindow(ptr_window_); | 60 return ptr_ios_render_->ChangeWindow(ptr_window_); |
| 61 } | 61 } |
| 62 | 62 |
| 63 VideoRenderCallback* VideoRenderIosImpl::AddIncomingRenderStream( | 63 rtc::VideoSinkInterface<VideoFrame>* |
| 64 const uint32_t stream_id, | 64 VideoRenderIosImpl::AddIncomingRenderStream(const uint32_t stream_id, |
| 65 const uint32_t z_order, | 65 const uint32_t z_order, |
| 66 const float left, | 66 const float left, |
| 67 const float top, | 67 const float top, |
| 68 const float right, | 68 const float right, |
| 69 const float bottom) { | 69 const float bottom) { |
| 70 CriticalSectionScoped cs(crit_sec_); | 70 CriticalSectionScoped cs(crit_sec_); |
| 71 if (!ptr_window_) { | 71 if (!ptr_window_) { |
| 72 return NULL; | 72 return NULL; |
| 73 } | 73 } |
| 74 | 74 |
| 75 return ptr_ios_render_->CreateEaglChannel( | 75 return ptr_ios_render_->CreateEaglChannel( |
| 76 stream_id, z_order, left, top, right, bottom); | 76 stream_id, z_order, left, top, right, bottom); |
| 77 } | 77 } |
| 78 | 78 |
| 79 int32_t VideoRenderIosImpl::DeleteIncomingRenderStream( | 79 int32_t VideoRenderIosImpl::DeleteIncomingRenderStream( |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 161 const float left, | 161 const float left, |
| 162 const float top, | 162 const float top, |
| 163 const float right, | 163 const float right, |
| 164 const float bottom) { | 164 const float bottom) { |
| 165 IOS_UNSUPPORTED(); | 165 IOS_UNSUPPORTED(); |
| 166 } | 166 } |
| 167 | 167 |
| 168 int32_t VideoRenderIosImpl::FullScreenRender(void* window, const bool enable) { | 168 int32_t VideoRenderIosImpl::FullScreenRender(void* window, const bool enable) { |
| 169 IOS_UNSUPPORTED(); | 169 IOS_UNSUPPORTED(); |
| 170 } | 170 } |
| OLD | NEW |