Index: content/browser/media/audio_stream_monitor.cc |
diff --git a/content/browser/media/audio_stream_monitor.cc b/content/browser/media/audio_stream_monitor.cc |
index bab834778a95e7a702d31e37174cb46003d5b183..523b742dbbf86a4c99374d8ba7bde80ef03c8393 100644 |
--- a/content/browser/media/audio_stream_monitor.cc |
+++ b/content/browser/media/audio_stream_monitor.cc |
@@ -4,6 +4,8 @@ |
#include "content/browser/media/audio_stream_monitor.h" |
+#include <unordered_map> |
+ |
#include "base/bind.h" |
#include "base/bind_helpers.h" |
#include "content/browser/web_contents/web_contents_impl.h" |
@@ -29,13 +31,6 @@ AudioStreamMonitor* StartStopMonitoringHelper(ActionType action_type, |
if (!render_process_host) |
return nullptr; |
- // TODO(dalecurtis, maxmorin): We should really only be sending these when the |
- // streams are audible or we don't have power level monitoring. |
- if (action_type == ActionType::STARTING) |
- render_process_host->OnAudioStreamAdded(); |
- else |
- render_process_host->OnAudioStreamRemoved(); |
- |
WebContentsImpl* const web_contents = |
static_cast<WebContentsImpl*>(WebContents::FromRenderFrameHost( |
RenderFrameHost::FromID(render_process_id, render_frame_id))); |
@@ -72,9 +67,21 @@ void AudioStreamMonitor::RenderProcessGone(int render_process_id) { |
// reused. During this period StartStopMonitoringHelper() will be unable to |
// lookup the WebContents using the now-dead |render_frame_id|. We must thus |
// have this secondary mechanism for clearing stale callbacks. |
- |
+ std::unordered_set<int> audible_frame_removed; |
for (auto it = poll_callbacks_.begin(); it != poll_callbacks_.end();) { |
- if (it->first.first == render_process_id) { |
+ if (std::get<0>(it->first) == render_process_id) { |
+ int render_frame_id = std::get<1>(it->first); |
+ auto* render_frame_host = |
+ RenderFrameHost::FromID(render_process_id, render_frame_id); |
+ if (render_frame_host && render_frame_host->IsAudible()) { |
+ if (audible_frame_removed.find(render_frame_id) == |
+ audible_frame_removed.end()) { |
+ if (auto* render_process_host = |
+ RenderProcessHost::FromID(render_process_id)) |
nasko
2017/06/20 16:17:45
innermost if statement also requires {}, since it
lpy
2017/06/20 22:28:53
Done.
|
+ render_process_host->OnAudioStreamRemoved(); |
+ audible_frame_removed.insert(render_frame_id); |
+ } |
+ } |
it = poll_callbacks_.erase(it); |
OnStreamRemoved(); |
} else { |
@@ -122,8 +129,8 @@ void AudioStreamMonitor::StartMonitoringHelper( |
DCHECK_CURRENTLY_ON(BrowserThread::UI); |
if (AudioStreamMonitor* monitor = StartStopMonitoringHelper( |
ActionType::STARTING, render_process_id, render_frame_id)) { |
- monitor->StartMonitoringStreamOnUIThread(render_process_id, stream_id, |
- read_power_callback); |
+ monitor->StartMonitoringStreamOnUIThread(render_process_id, render_frame_id, |
+ stream_id, read_power_callback); |
} |
} |
@@ -134,34 +141,55 @@ void AudioStreamMonitor::StopMonitoringHelper(int render_process_id, |
DCHECK_CURRENTLY_ON(BrowserThread::UI); |
if (AudioStreamMonitor* monitor = StartStopMonitoringHelper( |
ActionType::STOPPING, render_process_id, render_frame_id)) { |
- monitor->StopMonitoringStreamOnUIThread(render_process_id, stream_id); |
+ monitor->StopMonitoringStreamOnUIThread(render_process_id, render_frame_id, |
+ stream_id); |
} |
} |
void AudioStreamMonitor::StartMonitoringStreamOnUIThread( |
int render_process_id, |
+ int render_frame_id, |
int stream_id, |
const ReadPowerAndClipCallback& read_power_callback) { |
DCHECK(thread_checker_.CalledOnValidThread()); |
DCHECK(!read_power_callback.is_null()); |
- const StreamID qualified_id(render_process_id, stream_id); |
+ const StreamID qualified_id(render_process_id, render_frame_id, stream_id); |
DCHECK(poll_callbacks_.find(qualified_id) == poll_callbacks_.end()); |
poll_callbacks_[qualified_id] = read_power_callback; |
+ // Sends audio-added signal to RenderProcessHost when there is no power level |
+ // monitoring, sends the signal when the stream becomes non-audible. |
+ if (!power_level_monitoring_available()) { |
+ if (auto* render_process_host = |
+ RenderProcessHost::FromID(render_process_id)) |
nasko
2017/06/20 16:17:45
Same here about needing {} on multiline if stateme
lpy
2017/06/20 22:28:53
Done.
|
+ render_process_host->OnAudioStreamAdded(); |
+ } |
OnStreamAdded(); |
} |
void AudioStreamMonitor::StopMonitoringStreamOnUIThread(int render_process_id, |
+ int render_frame_id, |
int stream_id) { |
DCHECK(thread_checker_.CalledOnValidThread()); |
// In the event of render process death, these may have already been cleared. |
- auto it = poll_callbacks_.find(StreamID(render_process_id, stream_id)); |
- if (it == poll_callbacks_.end()) |
+ auto it = poll_callbacks_.find( |
+ StreamID(render_process_id, render_frame_id, stream_id)); |
+ if (it == poll_callbacks_.end()) { |
DaleCurtis
2017/06/20 00:32:53
No need for {} on single line conditional.
lpy
2017/06/20 22:28:53
Done.
|
return; |
+ } |
poll_callbacks_.erase(it); |
+ // Sends audio-removed signal to RenderProcessHost when there is no power |
+ // level monitoring, otherwise sends the signal when the stream becomes |
+ // non-audible. |
+ if (!power_level_monitoring_available()) { |
+ if (auto* render_process_host = |
+ RenderProcessHost::FromID(render_process_id)) |
+ render_process_host->OnAudioStreamRemoved(); |
+ } |
+ |
OnStreamRemoved(); |
} |
@@ -169,20 +197,51 @@ void AudioStreamMonitor::Poll() { |
bool was_audible = is_audible_; |
is_audible_ = false; |
+ // Record whether or not a RenderFrameHost is audible. |
+ std::unordered_map<RenderFrameHost*, bool> is_frame_audible; |
DaleCurtis
2017/06/20 00:32:53
I don't think there should be very many of these,
lpy
2017/06/20 22:28:53
Done.
|
for (StreamPollCallbackMap::const_iterator it = poll_callbacks_.begin(); |
- it != poll_callbacks_.end(); |
- ++it) { |
+ it != poll_callbacks_.end(); ++it) { |
// TODO(miu): A new UI for delivering specific power level and clipping |
// information is still in the works. For now, we throw away all |
// information except for "is it audible?" |
const float power_dbfs = it->second.Run().first; |
const float kSilenceThresholdDBFS = -72.24719896f; |
- if (power_dbfs >= kSilenceThresholdDBFS) { |
+ bool is_stream_audible = power_dbfs >= kSilenceThresholdDBFS; |
+ if (!is_audible_ && is_stream_audible) { |
last_blurt_time_ = clock_->NowTicks(); |
is_audible_ = true; |
MaybeToggle(); |
- break; // No need to poll remaining streams. |
+ } |
+ |
+ // Record whether or not the RenderFrame is audible, a RenderFrame is |
+ // audible when there is a audio stream in it that is audible. |
+ auto* render_frame_host = |
+ RenderFrameHost::FromID(std::get<0>(it->first), std::get<1>(it->first)); |
+ if (!render_frame_host) |
DaleCurtis
2017/06/20 00:32:53
I think this should be impossible here, we would h
lpy
2017/06/20 22:28:53
Done.
|
+ continue; |
+ if (is_frame_audible.find(render_frame_host) == is_frame_audible.end()) { |
+ is_frame_audible[render_frame_host] = is_stream_audible; |
+ } else { |
+ is_frame_audible[render_frame_host] |= is_stream_audible; |
DaleCurtis
2017/06/20 00:32:53
I think you just need this line. Default value of
lpy
2017/06/20 22:28:53
Done.
|
+ } |
+ } |
+ |
+ // Update RenderFrameHost and RenderProcessHost audible state only when state |
DaleCurtis
2017/06/20 00:32:53
Do we want to be responsible for both RenderFrameH
lpy
2017/06/20 22:28:53
Done.
I defer to RenderFrameHosts to update their
|
+ // changed. |
+ for (auto it = is_frame_audible.begin(); it != is_frame_audible.end(); ++it) { |
DaleCurtis
2017/06/20 00:32:53
for (auto& kv : ...) { }
lpy
2017/06/20 22:28:53
Done.
|
+ auto* render_frame_host = it->first; |
+ bool is_frame_audible = it->second; |
+ if (is_frame_audible != render_frame_host->IsAudible()) { |
+ render_frame_host->OnAudioStateChanged(is_frame_audible); |
+ auto* render_process_host = render_frame_host->GetProcess(); |
+ if (!render_process_host) |
DaleCurtis
2017/06/20 00:32:53
Again shouldn't be possible at this point.
lpy
2017/06/20 22:28:53
Done.
|
+ continue; |
+ if (is_frame_audible) { |
+ render_process_host->OnAudioStreamAdded(); |
+ } else { |
+ render_process_host->OnAudioStreamRemoved(); |
+ } |
} |
} |