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

Unified Diff: content/renderer/render_thread_impl.cc

Issue 1690063002: Fix mime type mappings when the unified media pipeline is enabled. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix compile error. Created 4 years, 10 months 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/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))));
« no previous file with comments | « content/renderer/render_frame_impl.cc ('k') | media/base/android/java/src/org/chromium/media/MediaCodecUtil.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698