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

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

Issue 2626533002: Revert of Fix getUserMedia so that failure is reported for invalid audio sources. (Closed)
Patch Set: Created 3 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/external_media_stream_audio_source.cc
diff --git a/content/renderer/media/external_media_stream_audio_source.cc b/content/renderer/media/external_media_stream_audio_source.cc
index 01b32ad6b3d46b57271791cb2cd645386f909cf9..7c2977c2907c46249730468bb2f63b81ffbe75a3 100644
--- a/content/renderer/media/external_media_stream_audio_source.cc
+++ b/content/renderer/media/external_media_stream_audio_source.cc
@@ -40,10 +40,7 @@
<< GetAudioParameters().AsHumanReadableString() << "}.";
source_->Initialize(GetAudioParameters(), this, -1);
source_->Start();
- // OnCaptureStarted() is expected to be called synchronously by this
- // implementation. If this needs to be changed, the source needs to be started
- // outside of EnsureSourceIsStarted since its design is synchronous.
- CHECK(was_started_);
+ was_started_ = true;
return true;
}
@@ -58,10 +55,6 @@
<< (is_local_source() ? "local" : "remote")
<< " source with audio parameters={"
<< GetAudioParameters().AsHumanReadableString() << "}.";
-}
-
-void ExternalMediaStreamAudioSource::OnCaptureStarted() {
- was_started_ = true;
}
void ExternalMediaStreamAudioSource::Capture(const media::AudioBus* audio_bus,
« no previous file with comments | « content/renderer/media/external_media_stream_audio_source.h ('k') | content/renderer/media/local_media_stream_audio_source.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698