media/base/mime_util_unittest.cc - Issue 1577433004: Flip proprietary codecs to false for Android chromium builds.

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: media/base/mime_util_unittest.cc

Issue 1577433004: Flip proprietary codecs to false for Android chromium builds. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Undo comment change. Created 4 years, 9 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: media/base/mime_util_unittest.cc

diff --git a/media/base/mime_util_unittest.cc b/media/base/mime_util_unittest.cc

index da9877da533d938eb95c40adb154a0bb76b1dba3..0690f85f73b3c27cdb84d28a2d1bba3e946eaff2 100644

--- a/media/base/mime_util_unittest.cc

+++ b/media/base/mime_util_unittest.cc

@@ -131,7 +131,7 @@ TEST(MimeUtilTest, CommonMediaMimeType) {

EXPECT_TRUE(IsSupportedMediaMimeType("video/ogg"));

#endif // OS_ANDROID

-#if defined(OS_ANDROID)

+#if defined(OS_ANDROID) && defined(USE_PROPRIETARY_CODECS)

// HLS is supported on Android API level 14 and higher and Chrome supports

// API levels 15 and higher, so these are expected to be supported.

bool kHlsSupported = true;

« no previous file with comments | « media/base/android/BUILD.gn ('k') | media/filters/audio_decoder_unittest.cc » ('j') | no next file with comments »