summaryrefslogtreecommitdiffstats
path: root/chromium/content/renderer/media/rtc_video_renderer.h
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/content/renderer/media/rtc_video_renderer.h')
-rw-r--r--chromium/content/renderer/media/rtc_video_renderer.h13
1 files changed, 9 insertions, 4 deletions
diff --git a/chromium/content/renderer/media/rtc_video_renderer.h b/chromium/content/renderer/media/rtc_video_renderer.h
index b72a5860ee8..e205b6b5f8d 100644
--- a/chromium/content/renderer/media/rtc_video_renderer.h
+++ b/chromium/content/renderer/media/rtc_video_renderer.h
@@ -6,7 +6,9 @@
#define CONTENT_RENDERER_MEDIA_RTC_VIDEO_RENDERER_H_
#include "base/callback.h"
+#include "base/memory/weak_ptr.h"
#include "content/common/content_export.h"
+#include "content/common/media/video_capture.h"
#include "content/public/renderer/media_stream_video_sink.h"
#include "content/renderer/media/video_frame_provider.h"
#include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
@@ -52,21 +54,24 @@ class CONTENT_EXPORT RTCVideoRenderer
STOPPED,
};
+ void OnVideoFrame(const scoped_refptr<media::VideoFrame>& frame,
+ const media::VideoCaptureFormat& format,
+ const base::TimeTicks& estimated_capture_time);
+
// VideoTrackSink implementation. Called on the main thread.
- virtual void OnVideoFrame(
- const scoped_refptr<media::VideoFrame>& frame) OVERRIDE;
virtual void OnReadyStateChanged(
blink::WebMediaStreamSource::ReadyState state) OVERRIDE;
virtual void OnEnabledChanged(bool enabled) OVERRIDE;
- void MaybeRenderSignalingFrame();
+ void RenderSignalingFrame();
base::Closure error_cb_;
RepaintCB repaint_cb_;
scoped_refptr<base::MessageLoopProxy> message_loop_proxy_;
State state_;
- bool first_frame_rendered_;
+ gfx::Size frame_size_;
blink::WebMediaStreamTrack video_track_;
+ base::WeakPtrFactory<RTCVideoRenderer> weak_factory_;
DISALLOW_COPY_AND_ASSIGN(RTCVideoRenderer);
};