Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(483)

Side by Side Diff: webrtc/modules/video_render/android/video_render_android_impl.cc

Issue 1813173002: Deletes the class VideoRendererCallback. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Break long lines. Add explicit keyword on IncomingVideoStream constructor. Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 } 65 }
66 delete &_javaShutdownEvent; 66 delete &_javaShutdownEvent;
67 delete &_javaRenderEvent; 67 delete &_javaRenderEvent;
68 delete &_critSect; 68 delete &_critSect;
69 } 69 }
70 70
71 int32_t VideoRenderAndroid::ChangeWindow(void* /*window*/) { 71 int32_t VideoRenderAndroid::ChangeWindow(void* /*window*/) {
72 return -1; 72 return -1;
73 } 73 }
74 74
75 VideoRenderCallback* 75 rtc::VideoSinkInterface<VideoFrame>*
76 VideoRenderAndroid::AddIncomingRenderStream(const uint32_t streamId, 76 VideoRenderAndroid::AddIncomingRenderStream(const uint32_t streamId,
77 const uint32_t zOrder, 77 const uint32_t zOrder,
78 const float left, const float top, 78 const float left, const float top,
79 const float right, 79 const float right,
80 const float bottom) { 80 const float bottom) {
81 CriticalSectionScoped cs(&_critSect); 81 CriticalSectionScoped cs(&_critSect);
82 82
83 AndroidStream* renderStream = NULL; 83 AndroidStream* renderStream = NULL;
84 AndroidStreamMap::iterator item = _streamsMap.find(streamId); 84 AndroidStreamMap::iterator item = _streamsMap.find(streamId);
85 if (item != _streamsMap.end() && item->second != NULL) { 85 if (item != _streamsMap.end() && item->second != NULL) {
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
307 const void* colorKey, 307 const void* colorKey,
308 const float left, const float top, 308 const float left, const float top,
309 const float right, 309 const float right,
310 const float bottom) { 310 const float bottom) {
311 WEBRTC_TRACE(kTraceError, kTraceVideoRenderer, _id, 311 WEBRTC_TRACE(kTraceError, kTraceVideoRenderer, _id,
312 "%s - not supported on Android", __FUNCTION__); 312 "%s - not supported on Android", __FUNCTION__);
313 return -1; 313 return -1;
314 } 314 }
315 315
316 } // namespace webrtc 316 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698