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

Issue 1344133002: MediaCodecPlayer implementation - stage 7 (DRM) (Closed)

Created:
5 years, 3 months ago by Tima Vaisburd
Modified:
5 years, 2 months ago
Reviewers:
qinmin, xhwang
CC:
chromium-reviews, posciak+watch_chromium.org, feature-media-reviews_chromium.org, avayvod+watch_chromium.org, mcasas+watch_chromium.org, mlamouri+watch-media_chromium.org
Base URL:
https://chromium.googlesource.com/chromium/src.git@mtplayer-drm-prepare
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

MediaCodecPlayer implementation - stage 7 (DRM) Added MediaDrmBridge and its callbacks processing. This CL depends on https://codereview.chromium.org/1341883003/ (Move MediaDrmBridge to media thread for MediaCodecPlayer). BUG=407577 Committed: https://crrev.com/4b662b45d4c6ae7292eda07754ceab2cf94d0ebd Cr-Commit-Position: refs/heads/master@{#351735}

Patch Set 1 #

Patch Set 2 : Added a call to manager's OnWaitingForDecryptionKey() #

Patch Set 3 : Removed MediaDrmProxy #

Patch Set 4 : Use MediaCrypto received with callback, never get it directly from MediaDrmBridge #

Total comments: 1

Patch Set 5 : Repost SetMediaCryptoReadyCB on UI thread, further cleanup #

Total comments: 4

Patch Set 6 : Reset key_request_posted_ flag in decoder's Flush() #

Patch Set 7 : Used the MediaDrmBridge UI thread weak ptr and the new param in the crypto ready calback #

Patch Set 8 : Removed unused drm_bridge_ in the decoder #

Patch Set 9 : Rebased #

Total comments: 41

Patch Set 10 : Used BindToCurrentLoop() #

Patch Set 11 : Do not reset again the MediaCryptoReadyCB in MEdiaSourcePlayer #

Patch Set 12 : Addressed Xiaohan's comments #

Patch Set 13 : Fixed CDMPromiseAdapter destruction in MediaDrmBridge, fixed the use of IsContentEncrypted() in theā€¦ #

Total comments: 1

Patch Set 14 : Renamed a variable #

Unified diffs Side-by-side diffs Delta from patch set Stats (+397 lines, -80 lines) Patch
M media/base/android/media_codec_audio_decoder.h View 1 2 3 4 5 6 7 8 9 10 11 3 chunks +3 lines, -1 line 0 comments Download
M media/base/android/media_codec_audio_decoder.cc View 1 2 3 4 5 6 7 8 9 10 11 5 chunks +12 lines, -3 lines 0 comments Download
M media/base/android/media_codec_decoder.h View 1 2 3 4 5 6 7 8 9 10 11 12 13 7 chunks +20 lines, -6 lines 0 comments Download
M media/base/android/media_codec_decoder.cc View 1 2 3 4 5 6 7 8 9 10 11 12 13 10 chunks +70 lines, -19 lines 0 comments Download
M media/base/android/media_codec_decoder_unittest.cc View 1 2 3 14 chunks +14 lines, -11 lines 0 comments Download
M media/base/android/media_codec_player.h View 1 2 3 4 5 6 7 8 9 10 11 7 chunks +26 lines, -0 lines 0 comments Download
M media/base/android/media_codec_player.cc View 1 2 3 4 5 6 7 8 9 10 11 12 19 chunks +199 lines, -19 lines 0 comments Download
M media/base/android/media_codec_video_decoder.h View 1 2 3 4 5 6 7 8 9 10 11 4 chunks +12 lines, -1 line 0 comments Download
M media/base/android/media_codec_video_decoder.cc View 1 2 3 4 5 6 7 8 9 10 11 6 chunks +28 lines, -10 lines 0 comments Download
M media/base/android/media_drm_bridge.h View 1 2 3 4 5 6 7 8 9 10 11 12 1 chunk +1 line, -1 line 0 comments Download
M media/base/android/media_drm_bridge.cc View 1 2 3 4 5 6 7 8 9 10 11 12 7 chunks +12 lines, -8 lines 0 comments Download
M media/base/android/media_source_player.cc View 1 2 3 4 5 6 7 8 9 10 1 chunk +0 lines, -1 line 0 comments Download

Dependent Patchsets:

Messages

Total messages: 22 (4 generated)
Tima Vaisburd
I did the split. PTAL.
5 years, 3 months ago (2015-09-15 20:11:54 UTC) #2
qinmin
lgtm
5 years, 3 months ago (2015-09-16 18:19:55 UTC) #3
Tima Vaisburd
The Patch Set 4 corresponds to https://codereview.chromium.org/1341883003/ patch set 12. I receive the MediaCrypto with ...
5 years, 3 months ago (2015-09-19 04:54:10 UTC) #4
Tima Vaisburd
On 2015/09/19 04:54:10, Tima Vaisburd wrote: > The Patch Set 4 corresponds to https://codereview.chromium.org/1341883003/ patch ...
5 years, 3 months ago (2015-09-21 21:35:00 UTC) #5
Tima Vaisburd
Added xhwang@ https://codereview.chromium.org/1344133002/diff/60001/media/base/android/media_codec_player.cc File media/base/android/media_codec_player.cc (right): https://codereview.chromium.org/1344133002/diff/60001/media/base/android/media_codec_player.cc#newcode893 media/base/android/media_codec_player.cc:893: drm_bridge_->SetMediaCryptoReadyCB(MediaDrmBridge::MediaCryptoReadyCB()); MediaDrmBridge does ResetAndReturn before sending this ...
5 years, 3 months ago (2015-09-22 19:41:23 UTC) #7
qinmin
https://codereview.chromium.org/1344133002/diff/80001/media/base/android/media_codec_decoder.cc File media/base/android/media_codec_decoder.cc (right): https://codereview.chromium.org/1344133002/diff/80001/media/base/android/media_codec_decoder.cc#newcode84 media/base/android/media_codec_decoder.cc:84: void MediaCodecDecoder::Flush() { key_request_posted needs to be reset to ...
5 years, 3 months ago (2015-09-23 05:58:26 UTC) #8
Tima Vaisburd
https://codereview.chromium.org/1344133002/diff/80001/media/base/android/media_codec_decoder.cc File media/base/android/media_codec_decoder.cc (right): https://codereview.chromium.org/1344133002/diff/80001/media/base/android/media_codec_decoder.cc#newcode84 media/base/android/media_codec_decoder.cc:84: void MediaCodecDecoder::Flush() { On 2015/09/23 05:58:26, qinmin wrote: > ...
5 years, 3 months ago (2015-09-24 18:15:43 UTC) #9
Tima Vaisburd
Addressed two TODOs: used a new weak ptr for the UI thread for MediaDrmBridge and ...
5 years, 3 months ago (2015-09-24 22:22:59 UTC) #10
xhwang
I reviewed an older PS, but the new changes should be minimal. The CL mostly ...
5 years, 2 months ago (2015-09-30 18:07:54 UTC) #11
Tima Vaisburd
https://chromiumcodereview.appspot.com/1344133002/diff/160001/media/base/android/media_codec_decoder.cc File media/base/android/media_codec_decoder.cc (right): https://chromiumcodereview.appspot.com/1344133002/diff/160001/media/base/android/media_codec_decoder.cc#newcode40 media/base/android/media_codec_decoder.cc:40: const base::Closure& key_required_cb, On 2015/09/30 18:07:53, xhwang wrote: > ...
5 years, 2 months ago (2015-09-30 21:24:51 UTC) #12
Tima Vaisburd
https://chromiumcodereview.appspot.com/1344133002/diff/160001/media/base/android/media_codec_audio_decoder.cc File media/base/android/media_codec_audio_decoder.cc (right): https://chromiumcodereview.appspot.com/1344133002/diff/160001/media/base/android/media_codec_audio_decoder.cc#newcode63 media/base/android/media_codec_audio_decoder.cc:63: DVLOG(1) << class_name() << "::" << __FUNCTION__ << " ...
5 years, 2 months ago (2015-09-30 23:00:51 UTC) #13
xhwang
lgtm with a few more discussions. https://chromiumcodereview.appspot.com/1344133002/diff/160001/media/base/android/media_codec_audio_decoder.cc File media/base/android/media_codec_audio_decoder.cc (right): https://chromiumcodereview.appspot.com/1344133002/diff/160001/media/base/android/media_codec_audio_decoder.cc#newcode63 media/base/android/media_codec_audio_decoder.cc:63: DVLOG(1) << class_name() ...
5 years, 2 months ago (2015-10-01 00:04:40 UTC) #14
Tima Vaisburd
https://chromiumcodereview.appspot.com/1344133002/diff/160001/media/base/android/media_codec_audio_decoder.cc File media/base/android/media_codec_audio_decoder.cc (right): https://chromiumcodereview.appspot.com/1344133002/diff/160001/media/base/android/media_codec_audio_decoder.cc#newcode63 media/base/android/media_codec_audio_decoder.cc:63: DVLOG(1) << class_name() << "::" << __FUNCTION__ << " ...
5 years, 2 months ago (2015-10-01 00:36:07 UTC) #15
xhwang
https://chromiumcodereview.appspot.com/1344133002/diff/160001/media/base/android/media_codec_player.cc File media/base/android/media_codec_player.cc (right): https://chromiumcodereview.appspot.com/1344133002/diff/160001/media/base/android/media_codec_player.cc#newcode827 media/base/android/media_codec_player.cc:827: } On 2015/10/01 00:36:06, Tima Vaisburd wrote: > On ...
5 years, 2 months ago (2015-10-01 00:50:05 UTC) #16
Tima Vaisburd
https://chromiumcodereview.appspot.com/1344133002/diff/160001/media/base/android/media_codec_player.h File media/base/android/media_codec_player.h (right): https://chromiumcodereview.appspot.com/1344133002/diff/160001/media/base/android/media_codec_player.h#newcode290 media/base/android/media_codec_player.h:290: void OnKeyRequired(DemuxerStream::Type type); On 2015/10/01 00:04:40, xhwang wrote: > ...
5 years, 2 months ago (2015-10-01 00:51:20 UTC) #17
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1344133002/250001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1344133002/250001
5 years, 2 months ago (2015-10-01 00:52:24 UTC) #20
commit-bot: I haz the power
Committed patchset #14 (id:250001)
5 years, 2 months ago (2015-10-01 05:48:29 UTC) #21
commit-bot: I haz the power
5 years, 2 months ago (2015-10-01 05:49:48 UTC) #22
Message was sent while issue was closed.
Patchset 14 (id:??) landed as
https://crrev.com/4b662b45d4c6ae7292eda07754ceab2cf94d0ebd
Cr-Commit-Position: refs/heads/master@{#351735}

Powered by Google App Engine
This is Rietveld 408576698