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

Side by Side Diff: webrtc/modules/video_render/mac/video_render_agl.h

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) 2011 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2011 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 19 matching lines...) Expand all
30 #include <list> 30 #include <list>
31 #include <map> 31 #include <map>
32 #include <memory> 32 #include <memory>
33 33
34 class VideoRenderAGL; 34 class VideoRenderAGL;
35 35
36 namespace webrtc { 36 namespace webrtc {
37 class CriticalSectionWrapper; 37 class CriticalSectionWrapper;
38 class EventWrapper; 38 class EventWrapper;
39 39
40 class VideoChannelAGL : public VideoRenderCallback { 40 class VideoChannelAGL : public rtc::VideoSinkInterface<VideoFrame> {
41 public: 41 public:
42 42
43 VideoChannelAGL(AGLContext& aglContext, int iId, VideoRenderAGL* owner); 43 VideoChannelAGL(AGLContext& aglContext, int iId, VideoRenderAGL* owner);
44 virtual ~VideoChannelAGL(); 44 virtual ~VideoChannelAGL();
45 virtual int FrameSizeChange(int width, int height, int numberOfStreams); 45 virtual int FrameSizeChange(int width, int height, int numberOfStreams);
46 virtual int DeliverFrame(const VideoFrame& videoFrame); 46 virtual int DeliverFrame(const VideoFrame& videoFrame);
47 virtual int UpdateSize(int width, int height); 47 virtual int UpdateSize(int width, int height);
48 int SetStreamSettings(int streamId, float startWidth, float startHeight, 48 int SetStreamSettings(int streamId, float startWidth, float startHeight,
49 float stopWidth, float stopHeight); 49 float stopWidth, float stopHeight);
50 int SetStreamCropSettings(int streamId, float startWidth, float startHeight, 50 int SetStreamCropSettings(int streamId, float startWidth, float startHeight,
51 float stopWidth, float stopHeight); 51 float stopWidth, float stopHeight);
52 int RenderOffScreenBuffer(); 52 int RenderOffScreenBuffer();
53 int IsUpdated(bool& isUpdated); 53 int IsUpdated(bool& isUpdated);
54 virtual int UpdateStretchSize(int stretchHeight, int stretchWidth); 54 virtual int UpdateStretchSize(int stretchHeight, int stretchWidth);
55 virtual int32_t RenderFrame(const uint32_t streamId, VideoFrame& videoFrame); 55 virtual void OnFrame(const VideoFrame& videoFrame);
mflodman 2016/05/02 07:06:55 Add comment: // Implements rtc::VideoSinkInterface
56 56
57 private: 57 private:
58 58
59 AGLContext _aglContext; 59 AGLContext _aglContext;
60 int _id; 60 int _id;
61 VideoRenderAGL* _owner; 61 VideoRenderAGL* _owner;
62 int _width; 62 int _width;
63 int _height; 63 int _height;
64 int _stretchedWidth; 64 int _stretchedWidth;
65 int _stretchedHeight; 65 int _stretchedHeight;
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 HIRect _currentViewBounds; 169 HIRect _currentViewBounds;
170 HIRect _lastViewBounds; 170 HIRect _lastViewBounds;
171 bool _renderingIsPaused; 171 bool _renderingIsPaused;
172 }; 172 };
173 173
174 } // namespace webrtc 174 } // namespace webrtc
175 175
176 #endif // WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_MAC_VIDEO_RENDER_AGL_H_ 176 #endif // WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_MAC_VIDEO_RENDER_AGL_H_
177 177
178 #endif // CARBON_RENDERING 178 #endif // CARBON_RENDERING
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698