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

Issue 12212079: Update Cdm Wrapper and ClearKeyCdm to work with CDM interface version 4. (Closed)

Created:
7 years, 10 months ago by xhwang
Modified:
7 years, 10 months ago
Reviewers:
ddorwin
CC:
chromium-reviews, feature-media-reviews_chromium.org, darin-cc_chromium.org
Visibility:
Public.

Description

Update Cdm Wrapper and ClearKeyCdm to work with CDM interface version 4. Also roll CDM DEPS to r181763. TEST=Test page plays; content_browsertests pass. Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=181850

Patch Set 1 #

Total comments: 4

Patch Set 2 : #

Patch Set 3 : #

Patch Set 4 : Roll DEPS #

Total comments: 2

Patch Set 5 : #

Patch Set 6 : Update to match latest CDM interface change (https://codereview.chromium.org/12224069) #

Patch Set 7 : merged ddorwin's CL (https://codereview.chromium.org/12221102/) #

Total comments: 2

Patch Set 8 : update DEPS #

Patch Set 9 : rebase #

Patch Set 10 : make ClearKeyCdm ctor explicit #

Patch Set 11 : fix casts #

Patch Set 12 : one more cast fix #

Patch Set 13 : rebase #

Unified diffs Side-by-side diffs Delta from patch set Stats (+103 lines, -62 lines) Patch
M DEPS View 1 2 3 4 5 6 7 8 9 10 11 12 1 chunk +1 line, -1 line 0 comments Download
M webkit/media/crypto/ppapi/cdm_video_decoder.h View 1 2 3 4 5 6 7 8 1 chunk +1 line, -2 lines 0 comments Download
M webkit/media/crypto/ppapi/cdm_video_decoder.cc View 1 2 3 4 5 3 chunks +4 lines, -5 lines 0 comments Download
M webkit/media/crypto/ppapi/cdm_wrapper.cc View 1 2 3 4 5 6 7 8 9 10 10 chunks +47 lines, -11 lines 0 comments Download
M webkit/media/crypto/ppapi/clear_key_cdm.h View 1 2 3 4 5 6 7 8 9 3 chunks +2 lines, -2 lines 0 comments Download
M webkit/media/crypto/ppapi/clear_key_cdm.cc View 1 2 3 4 5 6 7 8 9 10 11 7 chunks +24 lines, -17 lines 0 comments Download
M webkit/media/crypto/ppapi/fake_cdm_video_decoder.h View 1 2 3 4 5 1 chunk +1 line, -1 line 0 comments Download
M webkit/media/crypto/ppapi/fake_cdm_video_decoder.cc View 1 2 3 4 5 2 chunks +3 lines, -3 lines 0 comments Download
M webkit/media/crypto/ppapi/ffmpeg_cdm_audio_decoder.h View 1 2 3 4 5 6 7 8 2 chunks +2 lines, -2 lines 0 comments Download
M webkit/media/crypto/ppapi/ffmpeg_cdm_audio_decoder.cc View 1 2 3 4 5 6 7 8 2 chunks +4 lines, -4 lines 0 comments Download
M webkit/media/crypto/ppapi/ffmpeg_cdm_video_decoder.h View 1 2 3 4 5 2 chunks +2 lines, -2 lines 0 comments Download
M webkit/media/crypto/ppapi/ffmpeg_cdm_video_decoder.cc View 1 2 3 4 5 2 chunks +4 lines, -4 lines 0 comments Download
M webkit/media/crypto/ppapi/libvpx_cdm_video_decoder.h View 1 2 3 4 5 2 chunks +2 lines, -2 lines 0 comments Download
M webkit/media/crypto/ppapi/libvpx_cdm_video_decoder.cc View 1 2 3 4 5 6 7 8 3 chunks +6 lines, -6 lines 0 comments Download

Messages

Total messages: 13 (0 generated)
xhwang
PTAL
7 years, 10 months ago (2013-02-07 22:45:43 UTC) #1
ddorwin
lgtm % comments https://codereview.chromium.org/12212079/diff/1/webkit/media/crypto/ppapi/cdm_wrapper.cc File webkit/media/crypto/ppapi/cdm_wrapper.cc (right): https://codereview.chromium.org/12212079/diff/1/webkit/media/crypto/ppapi/cdm_wrapper.cc#newcode520 webkit/media/crypto/ppapi/cdm_wrapper.cc:520: // GetCdmHost implementation. HostFactory https://codereview.chromium.org/12212079/diff/1/webkit/media/crypto/ppapi/clear_key_cdm.cc File ...
7 years, 10 months ago (2013-02-07 23:50:21 UTC) #2
xhwang
https://codereview.chromium.org/12212079/diff/1/webkit/media/crypto/ppapi/cdm_wrapper.cc File webkit/media/crypto/ppapi/cdm_wrapper.cc (right): https://codereview.chromium.org/12212079/diff/1/webkit/media/crypto/ppapi/cdm_wrapper.cc#newcode520 webkit/media/crypto/ppapi/cdm_wrapper.cc:520: // GetCdmHost implementation. On 2013/02/07 23:50:21, ddorwin wrote: > ...
7 years, 10 months ago (2013-02-08 01:23:11 UTC) #3
ddorwin
lgtm
7 years, 10 months ago (2013-02-08 01:29:12 UTC) #4
ddorwin
You need to add a src/DEPS roll of CDM.h once you've landed that.
7 years, 10 months ago (2013-02-08 01:30:05 UTC) #5
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/xhwang@chromium.org/12212079/11001
7 years, 10 months ago (2013-02-08 02:29:01 UTC) #6
ddorwin
https://codereview.chromium.org/12212079/diff/11001/webkit/media/crypto/ppapi/clear_key_cdm.cc File webkit/media/crypto/ppapi/clear_key_cdm.cc (right): https://codereview.chromium.org/12212079/diff/11001/webkit/media/crypto/ppapi/clear_key_cdm.cc#newcode141 webkit/media/crypto/ppapi/clear_key_cdm.cc:141: reinterpret_cast<cdm::Host*>(host)); You could do the reinterpret_cast at 136.
7 years, 10 months ago (2013-02-08 04:36:47 UTC) #7
xhwang
https://codereview.chromium.org/12212079/diff/11001/webkit/media/crypto/ppapi/clear_key_cdm.cc File webkit/media/crypto/ppapi/clear_key_cdm.cc (right): https://codereview.chromium.org/12212079/diff/11001/webkit/media/crypto/ppapi/clear_key_cdm.cc#newcode141 webkit/media/crypto/ppapi/clear_key_cdm.cc:141: reinterpret_cast<cdm::Host*>(host)); On 2013/02/08 04:36:47, ddorwin wrote: > You could ...
7 years, 10 months ago (2013-02-08 07:11:57 UTC) #8
xhwang
PTAL again.
7 years, 10 months ago (2013-02-09 02:03:40 UTC) #9
xhwang
CL merged and updated. PTAL!
7 years, 10 months ago (2013-02-11 20:46:32 UTC) #10
ddorwin
lgtm https://codereview.chromium.org/12212079/diff/8004/DEPS File DEPS (right): https://codereview.chromium.org/12212079/diff/8004/DEPS#newcode329 DEPS:329: "/trunk/deps/cdm@181408", Update this, right?
7 years, 10 months ago (2013-02-11 21:27:25 UTC) #11
xhwang
https://codereview.chromium.org/12212079/diff/8004/DEPS File DEPS (right): https://codereview.chromium.org/12212079/diff/8004/DEPS#newcode329 DEPS:329: "/trunk/deps/cdm@181408", On 2013/02/11 21:27:25, ddorwin wrote: > Update this, ...
7 years, 10 months ago (2013-02-11 23:11:09 UTC) #12
commit-bot: I haz the power
7 years, 10 months ago (2013-02-12 04:42:32 UTC) #13

Powered by Google App Engine
This is Rietveld 408576698