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

« no previous file with comments | « chrome/test/data/android/media/test.webm ('k') | components/dom_distiller/content/browser/distiller_page_web_contents_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/cdm/browser/widevine_drm_delegate_android.cc

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

index ba091430f3b79867f088490787f54af6919c79eb..d4133eeeb0bc52d1ca9f0abc0f0e258a935204fa 100644

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

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

@@ -36,9 +36,13 @@ bool WidevineDrmDelegateAndroid::OnCreateSession(

if (init_data_type != media::EmeInitDataType::CENC)

return true;

+#if defined(PROPRIETARY_CODECS)

// Widevine MediaDrm plugin only accepts the "data" part of the PSSH box as

// the init data when using MP4 container.

return media::GetPsshData(init_data, GetUUID(), init_data_out);

+#else

+ return false;

+#endif

}

} // namespace cdm