components/cdm/browser/cdm_message_filter_android.cc - Issue 2572883002: Convert USE_PROPRIETARY_CODECS to a buildflag header.

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: components/cdm/browser/cdm_message_filter_android.cc

Issue 2572883002: Convert USE_PROPRIETARY_CODECS to a buildflag header. (Closed)

Patch Set: Merge Created 4 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:

Index: components/cdm/browser/cdm_message_filter_android.cc

diff --git a/components/cdm/browser/cdm_message_filter_android.cc b/components/cdm/browser/cdm_message_filter_android.cc

index e7f53716e00595425746375deccb17e6e9830240..2936a81ec86a71098bb3ad4e2de273842c6002ff 100644

--- a/components/cdm/browser/cdm_message_filter_android.cc

+++ b/components/cdm/browser/cdm_message_filter_android.cc

@@ -41,13 +41,13 @@ const CodecInfo kCodecsToQuery[] = {

{media::EME_CODEC_WEBM_VORBIS, CODEC_AUDIO, "vorbis", "video/webm"},

{media::EME_CODEC_WEBM_VP8, CODEC_VIDEO, "vp8", "video/webm"},

{media::EME_CODEC_WEBM_VP9, CODEC_VIDEO, "vp9", "video/webm"},

-#if defined(USE_PROPRIETARY_CODECS)

+#if BUILDFLAG(USE_PROPRIETARY_CODECS)

{media::EME_CODEC_MP4_AAC, CODEC_AUDIO, "mp4a", "video/mp4"},

{media::EME_CODEC_MP4_AVC1, CODEC_VIDEO, "avc1", "video/mp4"},

#if BUILDFLAG(ENABLE_HEVC_DEMUXING)

{media::EME_CODEC_MP4_HEVC, CODEC_VIDEO, "hvc1", "video/mp4"},

#endif

-#endif // defined(USE_PROPRIETARY_CODECS)

+#endif // BUILDFLAG(USE_PROPRIETARY_CODECS)

};

static SupportedCodecs GetSupportedCodecs(

« no previous file with comments | « components/cdm/DEPS ('k') | components/cdm/common/widevine_drm_delegate_android.cc » ('j') | no next file with comments »