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

Side by Side Diff: content/renderer/media/media_stream_video_source.cc

Issue 2970823003: Rename MediaStreamVideoSource:GetCurrentFormatImpl() to GetCurrentFormat() (Closed)
Patch Set: add DCHECK Created 3 years, 5 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 #include "content/renderer/media/media_stream_video_source.h" 5 #include "content/renderer/media/media_stream_video_source.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 #include <memory> 9 #include <memory>
10 #include <string> 10 #include <string>
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 } 123 }
124 124
125 base::SingleThreadTaskRunner* MediaStreamVideoSource::io_task_runner() const { 125 base::SingleThreadTaskRunner* MediaStreamVideoSource::io_task_runner() const {
126 DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); 126 DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
127 return track_adapter_->io_task_runner(); 127 return track_adapter_->io_task_runner();
128 } 128 }
129 129
130 base::Optional<media::VideoCaptureFormat> 130 base::Optional<media::VideoCaptureFormat>
131 MediaStreamVideoSource::GetCurrentFormat() const { 131 MediaStreamVideoSource::GetCurrentFormat() const {
132 DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); 132 DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
133 return GetCurrentFormatImpl();
134 }
135
136 base::Optional<media::VideoCaptureFormat>
137 MediaStreamVideoSource::GetCurrentFormatImpl() const {
138 return base::Optional<media::VideoCaptureFormat>(); 133 return base::Optional<media::VideoCaptureFormat>();
139 } 134 }
140 135
141 void MediaStreamVideoSource::DoStopSource() { 136 void MediaStreamVideoSource::DoStopSource() {
142 DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); 137 DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
143 DVLOG(3) << "DoStopSource()"; 138 DVLOG(3) << "DoStopSource()";
144 if (state_ == ENDED) 139 if (state_ == ENDED)
145 return; 140 return;
146 track_adapter_->StopFrameMonitoring(); 141 track_adapter_->StopFrameMonitoring();
147 StopSourceImpl(); 142 StopSourceImpl();
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 MediaStreamVideoSource::TrackDescriptor::TrackDescriptor( 233 MediaStreamVideoSource::TrackDescriptor::TrackDescriptor(
239 TrackDescriptor&& other) = default; 234 TrackDescriptor&& other) = default;
240 MediaStreamVideoSource::TrackDescriptor& 235 MediaStreamVideoSource::TrackDescriptor&
241 MediaStreamVideoSource::TrackDescriptor::operator=( 236 MediaStreamVideoSource::TrackDescriptor::operator=(
242 MediaStreamVideoSource::TrackDescriptor&& other) = default; 237 MediaStreamVideoSource::TrackDescriptor&& other) = default;
243 238
244 MediaStreamVideoSource::TrackDescriptor::~TrackDescriptor() { 239 MediaStreamVideoSource::TrackDescriptor::~TrackDescriptor() {
245 } 240 }
246 241
247 } // namespace content 242 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/media_stream_video_source.h ('k') | content/renderer/media/mock_media_stream_video_source.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698