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

Unified Diff: content/renderer/media/webrtc/media_stream_video_webrtc_sink.h

Issue 1849003002: Add video frame refresh to MediaStream and VideoCapture stacks. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed nick's PS3 comments (moving non-observer impl out of MSVideoSink interface). 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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/webrtc/media_stream_video_webrtc_sink.h
diff --git a/content/renderer/media/webrtc/media_stream_video_webrtc_sink.h b/content/renderer/media/webrtc/media_stream_video_webrtc_sink.h
index 2a25d248fcbcabed020607e8c609df87c0d6ef64..97137319b222792ad4c3610f71cd086098a016d7 100644
--- a/content/renderer/media/webrtc/media_stream_video_webrtc_sink.h
+++ b/content/renderer/media/webrtc/media_stream_video_webrtc_sink.h
@@ -6,6 +6,7 @@
#define CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_VIDEO_TRACK_ADAPTER_H_
#include "base/macros.h"
+#include "base/memory/weak_ptr.h"
#include "base/threading/thread_checker.h"
#include "content/public/renderer/media_stream_video_sink.h"
#include "content/renderer/media/webrtc/webrtc_video_capturer_adapter.h"
@@ -41,15 +42,23 @@ class MediaStreamVideoWebRtcSink : public MediaStreamVideoSink {
void OnEnabledChanged(bool enabled) override;
private:
+ // Helper to request a refresh frame from the source. Called via the callback
+ // passed to WebRtcVideoSourceAdapter.
+ void RequestRefreshFrame();
+
// Used to DCHECK that we are called on the correct thread.
base::ThreadChecker thread_checker_;
scoped_refptr<webrtc::VideoTrackInterface> video_track_;
- blink::WebMediaStreamTrack web_track_;
class WebRtcVideoSourceAdapter;
scoped_refptr<WebRtcVideoSourceAdapter> source_adapter_;
+ // Provides WebRtcVideoSourceAdapter a weak reference to
+ // MediaStreamVideoWebRtcSink in order to allow it to request refresh frames.
+ // See comments in media_stream_video_webrtc_sink.cc.
+ base::WeakPtrFactory<MediaStreamVideoWebRtcSink> weak_factory_;
+
DISALLOW_COPY_AND_ASSIGN(MediaStreamVideoWebRtcSink);
};

Powered by Google App Engine
This is Rietveld 408576698