| Index: webrtc/media/devices/carbonvideorenderer.h
|
| diff --git a/webrtc/media/devices/carbonvideorenderer.h b/webrtc/media/devices/carbonvideorenderer.h
|
| index 0f801c2297c7a78d96a6e1eba420d52690cca765..e90c1314eead620bf662d4aff5da2b6d868344b4 100644
|
| --- a/webrtc/media/devices/carbonvideorenderer.h
|
| +++ b/webrtc/media/devices/carbonvideorenderer.h
|
| @@ -19,25 +19,24 @@
|
| #include <Carbon/Carbon.h>
|
|
|
| #include "webrtc/base/criticalsection.h"
|
| -#include "webrtc/media/base/videorenderer.h"
|
| +#include "webrtc/media/base/videosinkinterface.h"
|
|
|
| namespace cricket {
|
|
|
| -class CarbonVideoRenderer : public VideoRenderer {
|
| +class CarbonVideoRenderer
|
| + : public rtc::VideoSinkInterface<cricket::VideoFrame> {
|
| public:
|
| CarbonVideoRenderer(int x, int y);
|
| virtual ~CarbonVideoRenderer();
|
|
|
| - // Implementation of pure virtual methods of VideoRenderer.
|
| - // These two methods may be executed in different threads.
|
| - // SetSize is called before RenderFrame.
|
| - virtual bool SetSize(int width, int height, int reserved);
|
| - virtual bool RenderFrame(const VideoFrame* frame);
|
| + // Implementation of VideoSinkInterface.
|
| + void OnFrame(const VideoFrame& frame) override;
|
|
|
| // Needs to be called on the main thread.
|
| bool Initialize();
|
|
|
| private:
|
| + bool SetSize(int width, int height);
|
| bool DrawFrame();
|
|
|
| static OSStatus DrawEventHandler(EventHandlerCallRef handler,
|
|
|