content/renderer/media/webrtc/peer_connection_dependency_factory.cc - Issue 1525003002: Revert of Refactor MediaCodecBridge to add support for NDK APIs

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/media/webrtc/peer_connection_dependency_factory.cc

Issue 1525003002: Revert of Refactor MediaCodecBridge to add support for NDK APIs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix rebase errors Created 5 years 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/media/webrtc/peer_connection_dependency_factory.cc

diff --git a/content/renderer/media/webrtc/peer_connection_dependency_factory.cc b/content/renderer/media/webrtc/peer_connection_dependency_factory.cc

index 3775d3e88c39d7d38c5903f2fc25363095c1fe1a..6e00dc9eec865d7a14860cd3403889397e25255f 100644

--- a/content/renderer/media/webrtc/peer_connection_dependency_factory.cc

+++ b/content/renderer/media/webrtc/peer_connection_dependency_factory.cc

@@ -63,7 +63,7 @@

#include "third_party/webrtc/base/ssladapter.h"

#if defined(OS_ANDROID)

-#include "media/base/android/media_codec_util.h"

+#include "media/base/android/media_codec_bridge.h"

#endif

namespace content {

@@ -416,7 +416,7 @@ void PeerConnectionDependencyFactory::InitializeSignalingThread(

}

#if defined(OS_ANDROID)

- if (!media::MediaCodecUtil::SupportsSetParameters())

+ if (!media::MediaCodecBridge::SupportsSetParameters())

encoder_factory.reset();

#endif

« no previous file with comments | « content/common/gpu/media/avda_shared_state.h ('k') | media/BUILD.gn » ('j') | no next file with comments »