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

Unified Diff: content/renderer/media/media_stream_video_capturer_source.cc

Issue 883293005: Cast: Basic cast_receiver API for chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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_capturer_source.cc
diff --git a/content/renderer/media/media_stream_video_capturer_source.cc b/content/renderer/media/media_stream_video_capturer_source.cc
index e03d440906d21fc26f969a89bcbbbaadcb1e9d73..3bb6f1ce0bf64a2c6a9c8df6475c9c7495ba65f2 100644
--- a/content/renderer/media/media_stream_video_capturer_source.cc
+++ b/content/renderer/media/media_stream_video_capturer_source.cc
@@ -143,12 +143,11 @@ void VideoCapturerDelegate::OnStateUpdateOnRenderThread(
DCHECK(thread_checker_.CalledOnValidThread());
DVLOG(3) << "OnStateUpdateOnRenderThread state = " << state;
if (state == VIDEO_CAPTURE_STATE_STARTED && !running_callback_.is_null()) {
- running_callback_.Run(MEDIA_DEVICE_OK);
+ running_callback_.Run(true);
return;
}
if (state > VIDEO_CAPTURE_STATE_STARTED && !running_callback_.is_null()) {
- base::ResetAndReturn(&running_callback_).Run(
- MEDIA_DEVICE_TRACK_START_FAILURE);
+ base::ResetAndReturn(&running_callback_).Run(false);
}
}
@@ -213,8 +212,8 @@ void VideoCapturerDelegate::OnDeviceSupportedFormatsEnumerated(
MediaStreamVideoCapturerSource::MediaStreamVideoCapturerSource(
const StreamDeviceInfo& device_info,
const SourceStoppedCallback& stop_callback,
- scoped_ptr<VideoCapturerDelegate> delegate)
- : delegate_(delegate.Pass()) {
+ scoped_refptr<media::VideoCapturerSource> delegate)
+ : delegate_(delegate) {
SetDeviceInfo(device_info);
SetStopCallback(stop_callback);
}
@@ -247,10 +246,14 @@ void MediaStreamVideoCapturerSource::StartSourceImpl(
delegate_->StartCapture(
new_params,
frame_callback,
- base::Bind(&MediaStreamVideoCapturerSource::OnStartDone,
+ base::Bind(&MediaStreamVideoCapturerSource::OnStarted,
base::Unretained(this)));
}
+void MediaStreamVideoCapturerSource::OnStarted(bool result) {
+ OnStartDone(result ? MEDIA_DEVICE_OK : MEDIA_DEVICE_TRACK_START_FAILURE);
+}
+
void MediaStreamVideoCapturerSource::StopSourceImpl() {
delegate_->StopCapture();
}

Powered by Google App Engine
This is Rietveld 408576698