Throttle media decoding after excessive Android media server crashes

content/browser/renderer_host/render_message_filter.cc

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 5a1a8475f96e7cbaebd8903518aaa08050ae2fb8..398dcd56c8adcc6b91a976632ff996e9396b7039 100644
--- a/content/browser/renderer_host/render_message_filter.cc
+++ b/content/browser/renderer_host/render_message_filter.cc
@@ -62,7 +62,9 @@
 #if defined(OS_POSIX)
 #include "base/file_descriptor_posix.h"
 #endif
+
 #if defined(OS_ANDROID)
+#include "content/browser/media/android/media_throttler.h"
 #include "media/base/android/webaudio_media_codec_bridge.h"
 #endif
 
@@ -82,6 +84,15 @@ base::LazyInstance<gfx::ColorProfile>::Leaky g_color_profile =
     LAZY_INSTANCE_INITIALIZER;
 #endif
 
+#if defined(OS_ANDROID)
+void CloseWebAudioFileDescriptor(int fd) {
+  if (close(fd)) {
+    LOG(ERROR) << "Couldn't close output webaudio fd "
+               << ": " << strerror(errno);

[jochen (gone - plz use gerrit), 2015/09/30 09:43:28]

i bet the ": " on the previous line

[qinmin, 2015/09/30 19:27:42]

Done.

+  }
+}
+#endif
+
 }  // namespace
 
 RenderMessageFilter::RenderMessageFilter(
@@ -504,14 +515,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);
+    LOG(ERROR) << "Cannot decode audio data due to throttling";

[jochen (gone - plz use gerrit), 2015/09/30 09:43:28]

VLOG(1) maybe (here and above)?

[qinmin, 2015/09/30 19:27:42]

Done.

+  } 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