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

Side by Side Diff: webrtc/media/devices/carbonvideorenderer.h

Issue 1819103003: Delete cricket::VideoRenderer. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase. Created 4 years, 9 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
« no previous file with comments | « webrtc/media/base/videorenderer.h ('k') | webrtc/media/devices/carbonvideorenderer.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
11 // Definition of class CarbonVideoRenderer that implements the abstract class 11 // Definition of class CarbonVideoRenderer that implements the abstract class
12 // cricket::VideoRenderer via Carbon. 12 // cricket::VideoRenderer via Carbon.
13 13
14 #ifndef WEBRTC_MEDIA_DEVICES_CARBONVIDEORENDERER_H_ 14 #ifndef WEBRTC_MEDIA_DEVICES_CARBONVIDEORENDERER_H_
15 #define WEBRTC_MEDIA_DEVICES_CARBONVIDEORENDERER_H_ 15 #define WEBRTC_MEDIA_DEVICES_CARBONVIDEORENDERER_H_
16 16
17 #include <memory> 17 #include <memory>
18 18
19 #include <Carbon/Carbon.h> 19 #include <Carbon/Carbon.h>
20 20
21 #include "webrtc/base/criticalsection.h" 21 #include "webrtc/base/criticalsection.h"
22 #include "webrtc/media/base/videorenderer.h" 22 #include "webrtc/media/base/videosinkinterface.h"
23 23
24 namespace cricket { 24 namespace cricket {
25 25
26 class CarbonVideoRenderer : public VideoRenderer { 26 class CarbonVideoRenderer
27 : public rtc::VideoSinkInterface<cricket::VideoFrame> {
27 public: 28 public:
28 CarbonVideoRenderer(int x, int y); 29 CarbonVideoRenderer(int x, int y);
29 virtual ~CarbonVideoRenderer(); 30 virtual ~CarbonVideoRenderer();
30 31
31 // Implementation of pure virtual methods of VideoRenderer. 32 // Implementation of VideoSinkInterface.
32 // These two methods may be executed in different threads. 33 void OnFrame(const VideoFrame& frame) override;
33 // SetSize is called before RenderFrame.
34 virtual bool SetSize(int width, int height, int reserved);
35 virtual bool RenderFrame(const VideoFrame* frame);
36 34
37 // Needs to be called on the main thread. 35 // Needs to be called on the main thread.
38 bool Initialize(); 36 bool Initialize();
39 37
40 private: 38 private:
39 bool SetSize(int width, int height);
41 bool DrawFrame(); 40 bool DrawFrame();
42 41
43 static OSStatus DrawEventHandler(EventHandlerCallRef handler, 42 static OSStatus DrawEventHandler(EventHandlerCallRef handler,
44 EventRef event, 43 EventRef event,
45 void* data); 44 void* data);
46 std::unique_ptr<uint8_t[]> image_; 45 std::unique_ptr<uint8_t[]> image_;
47 rtc::CriticalSection image_crit_; 46 rtc::CriticalSection image_crit_;
48 int image_width_; 47 int image_width_;
49 int image_height_; 48 int image_height_;
50 int x_; 49 int x_;
51 int y_; 50 int y_;
52 WindowRef window_ref_; 51 WindowRef window_ref_;
53 }; 52 };
54 53
55 } // namespace cricket 54 } // namespace cricket
56 55
57 #endif // WEBRTC_MEDIA_DEVICES_CARBONVIDEORENDERER_H_ 56 #endif // WEBRTC_MEDIA_DEVICES_CARBONVIDEORENDERER_H_
OLDNEW
« no previous file with comments | « webrtc/media/base/videorenderer.h ('k') | webrtc/media/devices/carbonvideorenderer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698