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

Side by Side Diff: content/renderer/media/media_stream_video_source.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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_VIDEO_SOURCE_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_VIDEO_SOURCE_H_
6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_VIDEO_SOURCE_H_ 6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_VIDEO_SOURCE_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 MediaStreamVideoTrack* track; 163 MediaStreamVideoTrack* track;
164 VideoCaptureDeliverFrameCB frame_callback; 164 VideoCaptureDeliverFrameCB frame_callback;
165 blink::WebMediaConstraints constraints; 165 blink::WebMediaConstraints constraints;
166 ConstraintsCallback callback; 166 ConstraintsCallback callback;
167 }; 167 };
168 std::vector<RequestedConstraints> requested_constraints_; 168 std::vector<RequestedConstraints> requested_constraints_;
169 169
170 media::VideoCaptureFormats supported_formats_; 170 media::VideoCaptureFormats supported_formats_;
171 171
172 // |track_adapter_| delivers video frames to the tracks on the IO-thread. 172 // |track_adapter_| delivers video frames to the tracks on the IO-thread.
173 scoped_refptr<VideoTrackAdapter> track_adapter_; 173 const scoped_refptr<VideoTrackAdapter> track_adapter_;
174 174
175 // Tracks that currently are connected to this source. 175 // Tracks that currently are connected to this source.
176 std::vector<MediaStreamVideoTrack*> tracks_; 176 std::vector<MediaStreamVideoTrack*> tracks_;
177 177
178 // NOTE: Weak pointers must be invalidated before all other member variables. 178 // NOTE: Weak pointers must be invalidated before all other member variables.
179 base::WeakPtrFactory<MediaStreamVideoSource> weak_factory_; 179 base::WeakPtrFactory<MediaStreamVideoSource> weak_factory_;
180 180
181 DISALLOW_COPY_AND_ASSIGN(MediaStreamVideoSource); 181 DISALLOW_COPY_AND_ASSIGN(MediaStreamVideoSource);
182 }; 182 };
183 183
184 } // namespace content 184 } // namespace content
185 185
186 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_VIDEO_SOURCE_H_ 186 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_VIDEO_SOURCE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698