Index: content/renderer/render_thread_impl.cc |
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc |
index 0fec9edb263264ae428ee42d3cf612d28cd6b04f..12e31bd84c93b5922bd24fa8094c46a8ead06434 100644 |
--- a/content/renderer/render_thread_impl.cc |
+++ b/content/renderer/render_thread_impl.cc |
@@ -172,6 +172,7 @@ |
#include "content/renderer/android/synchronous_compositor_filter.h" |
#include "content/renderer/media/android/renderer_demuxer_android.h" |
#include "content/renderer/media/android/stream_texture_factory_impl.h" |
+#include "media/base/android/media_codec_util.h" |
#endif |
#if defined(OS_MACOSX) |
@@ -809,6 +810,13 @@ void RenderThreadImpl::Init() { |
// been initialized by the Zygote before this instance became a Renderer. |
media::InitializeMediaLibrary(); |
+#if defined(OS_ANDROID) |
+ if (!command_line.HasSwitch(switches::kDisableAcceleratedVideoDecode) && |
+ media::MediaCodecUtil::IsMediaCodecAvailable()) { |
+ media::EnablePlatformDecoderSupport(); |
+ } |
+#endif |
+ |
memory_pressure_listener_.reset(new base::MemoryPressureListener( |
base::Bind(&RenderThreadImpl::OnMemoryPressure, base::Unretained(this)))); |