Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(227)

Issue 1131753003: Plumb |use_secure_codecs| through to BrowserCdmFactoryAndroid. (Closed)

Created:
5 years, 7 months ago by sandersd (OOO until July 31)
Modified:
5 years, 7 months ago
CC:
avayvod+watch_chromium.org, chromium-reviews, darin-cc_chromium.org, eme-reviews_chromium.org, feature-media-reviews_chromium.org, gunsch+watch_chromium.org, jam, lcwu+watch_chromium.org, mcasas+watch_chromium.org, mkwst+moarreviews-renderer_chromium.org, mlamouri+watch-content_chromium.org, posciak+watch_chromium.org, wjia+watch_chromium.org, xhwang
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Plumb |use_secure_codecs| through to BrowserCdmFactoryAndroid. This completes the path from the secure surface preference, through requestMediaKeySystemAccess() and finally to CDM creation on Android where secure codecs are enabled. With this change, configs requiring secure codes are rejected without the preference and the CDM is only configures to use hardware-secure codecs if the config requires it. There is a separate bug (http://crbug.com/478185) for implementing similar plumbing for the use of secure surfaces. BUG=467779 Committed: https://crrev.com/d7411976f6467bf4519f66f32b4459717e7352d7 Cr-Commit-Position: refs/heads/master@{#330040}

Patch Set 1 #

Patch Set 2 : #

Total comments: 43

Patch Set 3 : Address ddorwin@'s comments. #

Total comments: 2

Patch Set 4 : IPC_STRUCT #

Total comments: 2

Patch Set 5 : #

Patch Set 6 : :-( #

Patch Set 7 : Update unittest. #

Total comments: 2
Unified diffs Side-by-side diffs Delta from patch set Stats (+197 lines, -161 lines) Patch
M chromecast/browser/media/cast_browser_cdm_factory.h View 1 2 1 chunk +1 line, -1 line 0 comments Download
M chromecast/browser/media/cast_browser_cdm_factory.cc View 1 2 1 chunk +3 lines, -2 lines 0 comments Download
M content/browser/media/cdm/browser_cdm_manager.h View 1 2 3 4 5 4 chunks +6 lines, -3 lines 2 comments Download
M content/browser/media/cdm/browser_cdm_manager.cc View 1 2 3 4 5 3 chunks +13 lines, -25 lines 0 comments Download
M content/common/media/cdm_messages.h View 1 2 3 4 2 chunks +8 lines, -3 lines 0 comments Download
M content/renderer/media/crypto/ppapi_decryptor.h View 1 2 1 chunk +1 line, -1 line 0 comments Download
M content/renderer/media/crypto/ppapi_decryptor.cc View 1 chunk +1 line, -1 line 0 comments Download
M content/renderer/media/crypto/proxy_media_keys.h View 1 2 2 chunks +2 lines, -0 lines 0 comments Download
M content/renderer/media/crypto/proxy_media_keys.cc View 1 2 3 chunks +4 lines, -2 lines 0 comments Download
M content/renderer/media/crypto/render_cdm_factory.h View 2 chunks +5 lines, -2 lines 0 comments Download
M content/renderer/media/crypto/render_cdm_factory.cc View 1 2 3 chunks +13 lines, -12 lines 0 comments Download
M content/renderer/media/crypto/renderer_cdm_manager.h View 1 2 1 chunk +2 lines, -1 line 0 comments Download
M content/renderer/media/crypto/renderer_cdm_manager.cc View 1 2 3 1 chunk +7 lines, -3 lines 0 comments Download
M media/base/android/browser_cdm_factory_android.h View 1 2 1 chunk +1 line, -1 line 0 comments Download
M media/base/android/browser_cdm_factory_android.cc View 1 2 2 chunks +6 lines, -7 lines 0 comments Download
M media/base/browser_cdm_factory.h View 1 2 2 chunks +4 lines, -4 lines 0 comments Download
M media/base/browser_cdm_factory.cc View 1 2 2 chunks +2 lines, -2 lines 0 comments Download
A media/base/cdm_config.h View 1 2 1 chunk +29 lines, -0 lines 0 comments Download
M media/base/cdm_factory.h View 2 chunks +3 lines, -2 lines 0 comments Download
M media/base/eme_constants.h View 1 2 1 chunk +2 lines, -2 lines 0 comments Download
M media/base/key_systems.cc View 1 2 3 4 5 6 2 chunks +4 lines, -4 lines 0 comments Download
M media/blink/cdm_session_adapter.h View 2 chunks +2 lines, -2 lines 0 comments Download
M media/blink/cdm_session_adapter.cc View 1 2 3 4 5 6 1 chunk +2 lines, -4 lines 0 comments Download
M media/blink/key_system_config_selector.h View 2 chunks +2 lines, -2 lines 0 comments Download
M media/blink/key_system_config_selector.cc View 1 2 9 chunks +29 lines, -20 lines 0 comments Download
M media/blink/key_system_config_selector_unittest.cc View 1 2 3 4 5 6 1 chunk +1 line, -1 line 0 comments Download
M media/blink/webcontentdecryptionmodule_impl.h View 2 chunks +2 lines, -2 lines 0 comments Download
M media/blink/webcontentdecryptionmodule_impl.cc View 2 chunks +3 lines, -5 lines 0 comments Download
M media/blink/webcontentdecryptionmoduleaccess_impl.h View 1 2 3 chunks +9 lines, -5 lines 0 comments Download
M media/blink/webcontentdecryptionmoduleaccess_impl.cc View 3 chunks +12 lines, -24 lines 0 comments Download
M media/blink/webencryptedmediaclient_impl.h View 3 chunks +3 lines, -3 lines 0 comments Download
M media/blink/webencryptedmediaclient_impl.cc View 1 chunk +5 lines, -7 lines 0 comments Download
M media/cdm/default_cdm_factory.h View 2 chunks +3 lines, -2 lines 0 comments Download
M media/cdm/default_cdm_factory.cc View 1 chunk +1 line, -2 lines 0 comments Download
M media/cdm/proxy_decryptor.cc View 2 chunks +6 lines, -4 lines 0 comments Download

Messages

Total messages: 61 (27 generated)
sandersd (OOO until July 31)
Two open questions, both with working solutions in the first patch set: (1) Should CdmConfig ...
5 years, 7 months ago (2015-05-13 00:44:10 UTC) #2
commit-bot: I haz the power
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1131753003/1
5 years, 7 months ago (2015-05-13 00:44:43 UTC) #4
commit-bot: I haz the power
Dry run: Try jobs failed on following builders: android_compile_dbg on tryserver.chromium.linux (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.linux/builders/android_compile_dbg/builds/15721)
5 years, 7 months ago (2015-05-13 01:15:05 UTC) #6
ddorwin
LG overall. Just minor stuff. +xhwang FYI on BrowserCdm changes. https://codereview.chromium.org/1131753003/diff/40001/chromecast/browser/media/cast_browser_cdm_factory.cc File chromecast/browser/media/cast_browser_cdm_factory.cc (right): https://codereview.chromium.org/1131753003/diff/40001/chromecast/browser/media/cast_browser_cdm_factory.cc#newcode26 ...
5 years, 7 months ago (2015-05-13 06:03:21 UTC) #8
gunsch
https://codereview.chromium.org/1131753003/diff/40001/chromecast/browser/media/cast_browser_cdm_factory.cc File chromecast/browser/media/cast_browser_cdm_factory.cc (right): https://codereview.chromium.org/1131753003/diff/40001/chromecast/browser/media/cast_browser_cdm_factory.cc#newcode26 chromecast/browser/media/cast_browser_cdm_factory.cc:26: DCHECK(!use_secure_codecs) << "Chromecast does not use |use_secure_codecs|"; On 2015/05/13 ...
5 years, 7 months ago (2015-05-13 06:52:38 UTC) #10
sandersd (OOO until July 31)
dcheng@chromium.org: Please review changes in content/common/media/cdm_messages.h bbudge@chromium.org: Please review changes in content/renderer/pepper/ https://codereview.chromium.org/1131753003/diff/40001/content/browser/media/cdm/browser_cdm_manager.h File content/browser/media/cdm/browser_cdm_manager.h ...
5 years, 7 months ago (2015-05-13 18:17:14 UTC) #12
sandersd (OOO until July 31)
https://codereview.chromium.org/1131753003/diff/40001/content/renderer/media/crypto/proxy_media_keys.h File content/renderer/media/crypto/proxy_media_keys.h (right): https://codereview.chromium.org/1131753003/diff/40001/content/renderer/media/crypto/proxy_media_keys.h#newcode24 content/renderer/media/crypto/proxy_media_keys.h:24: struct CdmConfig; On 2015/05/13 06:03:20, ddorwin wrote: > not ...
5 years, 7 months ago (2015-05-14 00:06:58 UTC) #13
ddorwin
Thanks. LGTM. https://codereview.chromium.org/1131753003/diff/40001/content/renderer/media/crypto/render_cdm_factory.cc File content/renderer/media/crypto/render_cdm_factory.cc (right): https://codereview.chromium.org/1131753003/diff/40001/content/renderer/media/crypto/render_cdm_factory.cc#newcode85 content/renderer/media/crypto/render_cdm_factory.cc:85: DCHECK(cdm_config.allow_distinctive_identifier); On 2015/05/13 06:52:37, gunsch wrote: > ...
5 years, 7 months ago (2015-05-14 00:17:31 UTC) #14
gunsch
https://codereview.chromium.org/1131753003/diff/40001/content/renderer/media/crypto/render_cdm_factory.cc File content/renderer/media/crypto/render_cdm_factory.cc (right): https://codereview.chromium.org/1131753003/diff/40001/content/renderer/media/crypto/render_cdm_factory.cc#newcode85 content/renderer/media/crypto/render_cdm_factory.cc:85: DCHECK(cdm_config.allow_distinctive_identifier); On 2015/05/14 00:17:31, ddorwin wrote: > On 2015/05/13 ...
5 years, 7 months ago (2015-05-14 01:35:52 UTC) #16
gunsch-google
lgtm for chromecast/
5 years, 7 months ago (2015-05-14 04:46:06 UTC) #18
gunsch
actual lgtm for chromecast
5 years, 7 months ago (2015-05-14 17:04:05 UTC) #19
commit-bot: I haz the power
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1131753003/60001
5 years, 7 months ago (2015-05-14 18:15:12 UTC) #21
commit-bot: I haz the power
Dry run: This issue passed the CQ dry run.
5 years, 7 months ago (2015-05-14 19:59:59 UTC) #23
sandersd (OOO until July 31)
nasko@: Please review changes in content/common/media/cdm_messages.h.
5 years, 7 months ago (2015-05-14 20:10:23 UTC) #25
nasko
https://codereview.chromium.org/1131753003/diff/60001/content/common/media/cdm_messages.h File content/common/media/cdm_messages.h (right): https://codereview.chromium.org/1131753003/diff/60001/content/common/media/cdm_messages.h#newcode24 content/common/media/cdm_messages.h:24: struct InitializeCdmParameters { structs should be defined using IPC_STRUCT_BEGIN/IPC_STRUCT_MEMBER/IPC_STRUCT_END ...
5 years, 7 months ago (2015-05-14 21:53:19 UTC) #26
sandersd (OOO until July 31)
https://codereview.chromium.org/1131753003/diff/60001/content/common/media/cdm_messages.h File content/common/media/cdm_messages.h (right): https://codereview.chromium.org/1131753003/diff/60001/content/common/media/cdm_messages.h#newcode24 content/common/media/cdm_messages.h:24: struct InitializeCdmParameters { On 2015/05/14 21:53:18, nasko wrote: > ...
5 years, 7 months ago (2015-05-14 22:05:17 UTC) #27
nasko
IPC LGTM with a nit. https://codereview.chromium.org/1131753003/diff/80001/content/common/media/cdm_messages.h File content/common/media/cdm_messages.h (right): https://codereview.chromium.org/1131753003/diff/80001/content/common/media/cdm_messages.h#newcode23 content/common/media/cdm_messages.h:23: IPC_STRUCT_BEGIN(CdmHostMsg_InitializeCdm_Params) nit: Move this ...
5 years, 7 months ago (2015-05-14 22:13:58 UTC) #28
sandersd (OOO until July 31)
https://codereview.chromium.org/1131753003/diff/80001/content/common/media/cdm_messages.h File content/common/media/cdm_messages.h (right): https://codereview.chromium.org/1131753003/diff/80001/content/common/media/cdm_messages.h#newcode23 content/common/media/cdm_messages.h:23: IPC_STRUCT_BEGIN(CdmHostMsg_InitializeCdm_Params) On 2015/05/14 22:13:58, nasko wrote: > nit: Move ...
5 years, 7 months ago (2015-05-14 22:41:32 UTC) #29
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1131753003/100001
5 years, 7 months ago (2015-05-14 22:42:02 UTC) #32
commit-bot: I haz the power
Try jobs failed on following builders: android_compile_dbg on tryserver.chromium.linux (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.linux/builders/android_compile_dbg/builds/16619) linux_android_rel_ng on tryserver.chromium.linux (JOB_FAILED, ...
5 years, 7 months ago (2015-05-14 23:15:46 UTC) #34
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1131753003/120001
5 years, 7 months ago (2015-05-14 23:21:04 UTC) #37
commit-bot: I haz the power
Try jobs failed on following builders: android_compile_dbg on tryserver.chromium.linux (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.linux/builders/android_compile_dbg/builds/16646)
5 years, 7 months ago (2015-05-14 23:53:13 UTC) #39
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1131753003/140001
5 years, 7 months ago (2015-05-14 23:58:07 UTC) #42
commit-bot: I haz the power
Try jobs failed on following builders: linux_android_rel_ng on tryserver.chromium.linux (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_android_rel_ng/builds/23223)
5 years, 7 months ago (2015-05-15 00:29:47 UTC) #44
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1131753003/160001
5 years, 7 months ago (2015-05-15 00:32:05 UTC) #49
commit-bot: I haz the power
Committed patchset #6 (id:160001)
5 years, 7 months ago (2015-05-15 01:24:07 UTC) #50
commit-bot: I haz the power
Patchset 6 (id:??) landed as https://crrev.com/9ce0a551c7f1d79dea793b5691473ef9d5fb9326 Cr-Commit-Position: refs/heads/master@{#330008}
5 years, 7 months ago (2015-05-15 01:24:47 UTC) #51
jam
A revert of this CL (patchset #6 id:160001) has been created in https://codereview.chromium.org/1132773003/ by jam@chromium.org. ...
5 years, 7 months ago (2015-05-15 01:46:34 UTC) #52
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1131753003/180001
5 years, 7 months ago (2015-05-15 03:32:01 UTC) #55
ddorwin
PS7 LGTM
5 years, 7 months ago (2015-05-15 03:40:42 UTC) #56
commit-bot: I haz the power
Committed patchset #7 (id:180001)
5 years, 7 months ago (2015-05-15 04:22:07 UTC) #57
commit-bot: I haz the power
Patchset 7 (id:??) landed as https://crrev.com/d7411976f6467bf4519f66f32b4459717e7352d7 Cr-Commit-Position: refs/heads/master@{#330040}
5 years, 7 months ago (2015-05-15 04:23:05 UTC) #58
dcheng
https://codereview.chromium.org/1131753003/diff/180001/content/browser/media/cdm/browser_cdm_manager.h File content/browser/media/cdm/browser_cdm_manager.h (right): https://codereview.chromium.org/1131753003/diff/180001/content/browser/media/cdm/browser_cdm_manager.h#newcode34 content/browser/media/cdm/browser_cdm_manager.h:34: struct InitializeCdmParameters; Is this leftover from an earlier patch?
5 years, 7 months ago (2015-05-15 15:31:32 UTC) #60
sandersd (OOO until July 31)
5 years, 7 months ago (2015-05-15 17:52:18 UTC) #61
Message was sent while issue was closed.
https://codereview.chromium.org/1131753003/diff/180001/content/browser/media/...
File content/browser/media/cdm/browser_cdm_manager.h (right):

https://codereview.chromium.org/1131753003/diff/180001/content/browser/media/...
content/browser/media/cdm/browser_cdm_manager.h:34: struct
InitializeCdmParameters;
On 2015/05/15 15:31:32, dcheng wrote:
> Is this leftover from an earlier patch?

Oops.

https://codereview.chromium.org/1136663006

Powered by Google App Engine
This is Rietveld 408576698