content/renderer/render_thread_impl.cc - Issue 1690063002: Fix mime type mappings when the unified media pipeline is enabled.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Simplify, test, rebase on split. 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

« no previous file with comments | « content/renderer/render_frame_impl.cc ('k') | media/base/android/java/src/org/chromium/media/MediaCodecUtil.java » ('j') | media/base/android/media_codec_util.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/render_thread_impl.cc

diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc

index 0746e713f20785915aada189dc328dcd5bdd1aa2..825650c640d9c653e0774e9323779bd54ced07c3 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))));