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

Unified Diff: content/renderer/media/media_stream_video_track.h

Issue 976233002: MediaStreamVideo*/VideoTrackAdapter and RTCVideoRenderer (small) cleanup (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/media_stream_video_track.h
diff --git a/content/renderer/media/media_stream_video_track.h b/content/renderer/media/media_stream_video_track.h
index c3b5ed9de734a3e0eaf5db2bdc43dff91adb45a3..8a82e011c5bed0facba4b3eddf4a090174a79c23 100644
--- a/content/renderer/media/media_stream_video_track.h
+++ b/content/renderer/media/media_stream_video_track.h
@@ -59,10 +59,6 @@ class CONTENT_EXPORT MediaStreamVideoTrack : public MediaStreamTrack {
return constraints_;
}
- protected:
- // Used to DCHECK that we are called on the correct thread.
- base::ThreadChecker thread_checker_;
-
private:
// MediaStreamVideoSink is a friend to allow it to call AddSink() and
// RemoveSink().
@@ -81,14 +77,17 @@ class CONTENT_EXPORT MediaStreamVideoTrack : public MediaStreamTrack {
const VideoCaptureDeliverFrameCB& callback);
void RemoveSink(MediaStreamVideoSink* sink);
+ // Used to DCHECK that we are called on Render main Thread.
+ base::ThreadChecker render_thread_checker_;
wolenetz 2015/03/11 23:37:37 I'm confused: which thread_checker_ was previously
mcasas 2015/03/13 01:09:34 I consolidated the ThreadCheckers in the different
+
std::vector<MediaStreamVideoSink*> sinks_;
// |FrameDeliverer| is an internal helper object used for delivering video
// frames on the IO-thread using callbacks to all registered tracks.
class FrameDeliverer;
- scoped_refptr<FrameDeliverer> frame_deliverer_;
+ const scoped_refptr<FrameDeliverer> frame_deliverer_;
- blink::WebMediaConstraints constraints_;
+ const blink::WebMediaConstraints constraints_;
// Weak ref to the source this tracks is connected to. |source_| is owned
// by the blink::WebMediaStreamSource and is guaranteed to outlive the

Powered by Google App Engine
This is Rietveld 408576698