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

Unified Diff: content/browser/renderer_host/media/audio_renderer_host.cc

Issue 68173025: Introduce new interface for MediaInternals updates. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix JavaScript test. Use non-exported base. Created 7 years, 1 month 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/browser/renderer_host/media/audio_renderer_host.cc
diff --git a/content/browser/renderer_host/media/audio_renderer_host.cc b/content/browser/renderer_host/media/audio_renderer_host.cc
index 7e6ab82fef96cc4de9dddad7a99e16c3a704f831..6282a13fada9660652792776e33da2642f322d3b 100644
--- a/content/browser/renderer_host/media/audio_renderer_host.cc
+++ b/content/browser/renderer_host/media/audio_renderer_host.cc
@@ -117,7 +117,8 @@ AudioRendererHost::AudioRendererHost(
: render_process_id_(render_process_id),
audio_manager_(audio_manager),
mirroring_manager_(mirroring_manager),
- media_internals_(media_internals),
+ audio_log_(media_internals->CreateAudioLog(
+ media::AudioLogFactory::AUDIO_OUTPUT_CONTROLLER)),
media_stream_manager_(media_stream_manager) {
DCHECK(audio_manager_);
DCHECK(media_stream_manager_);
@@ -379,10 +380,7 @@ void AudioRendererHost::OnCreateStream(
render_process_id_, entry->render_view_id(), entry->controller());
}
audio_entries_.insert(std::make_pair(stream_id, entry.release()));
- if (media_internals_) {
- media_internals_->OnAudioStreamCreated(
- this, stream_id, params, input_device_id);
- }
+ audio_log_->OnCreated(stream_id, params, input_device_id, output_device_id);
}
void AudioRendererHost::OnPlayStream(int stream_id) {
@@ -395,8 +393,7 @@ void AudioRendererHost::OnPlayStream(int stream_id) {
}
entry->controller()->Play();
- if (media_internals_)
- media_internals_->OnSetAudioStreamPlaying(this, stream_id, true);
+ audio_log_->OnStarted(stream_id);
}
void AudioRendererHost::OnPauseStream(int stream_id) {
@@ -409,8 +406,7 @@ void AudioRendererHost::OnPauseStream(int stream_id) {
}
entry->controller()->Pause();
- if (media_internals_)
- media_internals_->OnSetAudioStreamPlaying(this, stream_id, false);
+ audio_log_->OnStopped(stream_id);
}
void AudioRendererHost::OnSetVolume(int stream_id, double volume) {
@@ -426,8 +422,7 @@ void AudioRendererHost::OnSetVolume(int stream_id, double volume) {
if (volume < 0 || volume > 1.0)
return;
entry->controller()->SetVolume(volume);
- if (media_internals_)
- media_internals_->OnSetAudioStreamVolume(this, stream_id, volume);
+ audio_log_->OnSetVolume(stream_id, volume);
}
void AudioRendererHost::SendErrorMessage(int stream_id) {
@@ -453,9 +448,7 @@ void AudioRendererHost::OnCloseStream(int stream_id) {
}
controller->Close(
base::Bind(&AudioRendererHost::DeleteEntry, this, base::Passed(&entry)));
-
- if (media_internals_)
- media_internals_->OnSetAudioStreamStatus(this, stream_id, "closed");
+ audio_log_->OnClosed(stream_id);
}
void AudioRendererHost::DeleteEntry(scoped_ptr<AudioEntry> entry) {
@@ -469,12 +462,6 @@ void AudioRendererHost::DeleteEntry(scoped_ptr<AudioEntry> entry) {
render_process_id_, entry->render_view_id(), entry->stream_id(),
false, -std::numeric_limits<float>::infinity(), false);
}
-
- // Notify the media observer.
- if (media_internals_)
- media_internals_->OnDeleteAudioStream(this, entry->stream_id());
-
- // Note: |entry| will be deleted upon leaving this scope.
}
void AudioRendererHost::ReportErrorAndClose(int stream_id) {
@@ -488,9 +475,7 @@ void AudioRendererHost::ReportErrorAndClose(int stream_id) {
SendErrorMessage(stream_id);
- if (media_internals_)
- media_internals_->OnSetAudioStreamStatus(this, stream_id, "error");
-
+ audio_log_->OnError(stream_id);
OnCloseStream(stream_id);
}
« no previous file with comments | « content/browser/renderer_host/media/audio_renderer_host.h ('k') | content/browser/resources/media/client_renderer.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698