| 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 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 77 if (!_ptrRendererWin) | 77 if (!_ptrRendererWin) |
| 78 { | 78 { |
| 79 return -1; | 79 return -1; |
| 80 } | 80 } |
| 81 else | 81 else |
| 82 { | 82 { |
| 83 return _ptrRendererWin->ChangeWindow(window); | 83 return _ptrRendererWin->ChangeWindow(window); |
| 84 } | 84 } |
| 85 } | 85 } |
| 86 | 86 |
| 87 VideoRenderCallback* | 87 rtc::VideoSinkInterface<VideoFrame>* |
| 88 VideoRenderWindowsImpl::AddIncomingRenderStream(const uint32_t streamId, | 88 VideoRenderWindowsImpl::AddIncomingRenderStream(const uint32_t streamId, |
| 89 const uint32_t zOrder, | 89 const uint32_t zOrder, |
| 90 const float left, | 90 const float left, |
| 91 const float top, | 91 const float top, |
| 92 const float right, | 92 const float right, |
| 93 const float bottom) | 93 const float bottom) |
| 94 { | 94 { |
| 95 CriticalSectionScoped cs(&_renderWindowsCritsect); | 95 CriticalSectionScoped cs(&_renderWindowsCritsect); |
| 96 VideoRenderCallback* renderCallback = NULL; | 96 rtc::VideoSinkInterface<VideoFrame>* renderCallback = NULL; |
| 97 | 97 |
| 98 if (!_ptrRendererWin) | 98 if (!_ptrRendererWin) |
| 99 { | 99 { |
| 100 } | 100 } |
| 101 else | 101 else |
| 102 { | 102 { |
| 103 renderCallback = _ptrRendererWin->CreateChannel(streamId, zOrder, left, | 103 renderCallback = _ptrRendererWin->CreateChannel(streamId, zOrder, left, |
| 104 top, right, bottom); | 104 top, right, bottom); |
| 105 } | 105 } |
| 106 | 106 |
| (...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 328 } | 328 } |
| 329 else | 329 else |
| 330 { | 330 { |
| 331 error = _ptrRendererWin->SetBitmap(bitMap, pictureId, colorKey, left, | 331 error = _ptrRendererWin->SetBitmap(bitMap, pictureId, colorKey, left, |
| 332 top, right, bottom); | 332 top, right, bottom); |
| 333 } | 333 } |
| 334 return error; | 334 return error; |
| 335 } | 335 } |
| 336 | 336 |
| 337 } // namespace webrtc | 337 } // namespace webrtc |
| OLD | NEW |