Index: content/browser/renderer_host/render_message_filter.cc |
diff --git a/content/browser/renderer_host/render_message_filter.cc b/content/browser/renderer_host/render_message_filter.cc |
index d59828867501efea76a2013ea99b340c46eec4fc..efe1ce65b76f695e0aa5346c66e84ed3959af0a7 100644 |
--- a/content/browser/renderer_host/render_message_filter.cc |
+++ b/content/browser/renderer_host/render_message_filter.cc |
@@ -73,6 +73,7 @@ |
#endif |
#if defined(OS_ANDROID) |
+#include "content/browser/media/android/media_throttler.h" |
#include "media/base/android/webaudio_media_codec_bridge.h" |
#endif |
@@ -97,6 +98,13 @@ base::LazyInstance<gfx::ColorProfile>::Leaky g_color_profile = |
LAZY_INSTANCE_INITIALIZER; |
#endif |
+#if defined(OS_ANDROID) |
+void CloseWebAudioFileDescriptor(int fd) { |
+ if (close(fd)) |
+ VLOG(1) << "Couldn't close output webaudio fd: " << strerror(errno); |
+} |
+#endif |
+ |
} // namespace |
RenderMessageFilter::RenderMessageFilter( |
@@ -640,14 +648,24 @@ void RenderMessageFilter::OnWebAudioMediaCodec( |
base::SharedMemoryHandle encoded_data_handle, |
base::FileDescriptor pcm_output, |
uint32_t data_size) { |
- // Let a WorkerPool handle this request since the WebAudio |
- // MediaCodec bridge is slow and can block while sending the data to |
- // the renderer. |
- base::WorkerPool::PostTask( |
- FROM_HERE, |
- base::Bind(&media::WebAudioMediaCodecBridge::RunWebAudioMediaCodec, |
- encoded_data_handle, pcm_output, data_size), |
- true); |
+ if (!MediaThrottler::GetInstance()->RequestDecoderResources()) { |
+ base::WorkerPool::PostTask( |
+ FROM_HERE, |
+ base::Bind(&CloseWebAudioFileDescriptor, pcm_output.fd), |
+ true); |
+ VLOG(1) << "Cannot decode audio data due to throttling"; |
+ } else { |
+ // Let a WorkerPool handle this request since the WebAudio |
+ // MediaCodec bridge is slow and can block while sending the data to |
+ // the renderer. |
+ base::WorkerPool::PostTask( |
+ FROM_HERE, |
+ base::Bind(&media::WebAudioMediaCodecBridge::RunWebAudioMediaCodec, |
+ encoded_data_handle, pcm_output, data_size, |
+ base::Bind(&MediaThrottler::OnDecodeRequestFinished, |
+ base::Unretained(MediaThrottler::GetInstance()))), |
+ true); |
+ } |
} |
#endif |