media: Replace DecryptorReadyCB with CdmReadyCB.

media: Replace DecryptorReadyCB with CdmReadyCB.

The media pipeline on Android will need the CDM ID in the CdmContext instead of
a Decryptor, which is used on Desktop. This CL makes the SetCdm() implementation
more generic.

BUG=545099
TEST=No functionality change.

Committed: https://crrev.com/00f69db77f1088499192ff69d1fc5b271025bd9a
Cr-Commit-Position: refs/heads/master@{#359278}

[xhwang, 2015-11-11 00:06:36]

xhwang@chromium.org changed reviewers:
+ jrummell@chromium.org

[xhwang, 2015-11-11 00:06:36]

Please start from decryptor.h and cdm_context.h. 

The CL seems large but is pretty mechanical, with the exception of Android code
and the unittests unfortunately.

PTAL!

[xhwang, 2015-11-11 00:07:01]

Description was changed from

==========
media: Replace DecryptorReadyCB with CdmReadyCB.

The media pipeline on Android will need the CDM ID in the CdmContext instead of
a Decryptor, which is used on Desktop. This CL makes the SetCdm() implementation
more generic.

BUG=545099
TEST=No functionality change.
==========

to

==========
media: Replace DecryptorReadyCB with CdmReadyCB.

The media pipeline on Android will need the CDM ID in the CdmContext instead of
a Decryptor, which is used on Desktop. This CL makes the SetCdm() implementation
more generic.

BUG=545099
TEST=No functionality change.
==========

[xhwang, 2015-11-11 00:07:01]

xhwang@chromium.org changed reviewers:
+ ddorwin@chromium.org

[xhwang, 2015-11-11 00:07:01]

xhwang@chromium.org changed required reviewers:
+ jrummell@chromium.org

[xhwang, 2015-11-11 00:08:12]

+ddorwin for high level sanity check.

[jrummell, 2015-11-12 00:23:07]

lgtm w/nits

https://codereview.chromium.org/1423163004/diff/40001/content/renderer/media/...
File content/renderer/media/android/webmediaplayer_android.cc (right):

https://codereview.chromium.org/1423163004/diff/40001/content/renderer/media/...
content/renderer/media/android/webmediaplayer_android.cc:195:
video_frame_provider_client_(NULL),
Since you changed cdm_context_ to nullptr, should this one be changed too?

https://codereview.chromium.org/1423163004/diff/40001/media/filters/decryptin...
File media/filters/decrypting_audio_decoder_unittest.cc (right):

https://codereview.chromium.org/1423163004/diff/40001/media/filters/decryptin...
media/filters/decrypting_audio_decoder_unittest.cc:121: EXPECT_CALL(*this,
CdmSet(has_cdm && has_decryptor));
I think the |has_cdm| is redundant.

https://codereview.chromium.org/1423163004/diff/40001/media/filters/decryptin...
File media/filters/decrypting_demuxer_stream_unittest.cc (right):

https://codereview.chromium.org/1423163004/diff/40001/media/filters/decryptin...
media/filters/decrypting_demuxer_stream_unittest.cc:121: EXPECT_CALL(*this,
CdmSet(has_cdm && has_decryptor))
ditto on |has_cdm|.

https://codereview.chromium.org/1423163004/diff/40001/media/filters/decryptin...
File media/filters/decrypting_video_decoder_unittest.cc (right):

https://codereview.chromium.org/1423163004/diff/40001/media/filters/decryptin...
media/filters/decrypting_video_decoder_unittest.cc:93: EXPECT_CALL(*this,
CdmSet(has_cdm && has_decryptor));
ditto on |has_cdm|.

[xhwang, 2015-11-12 06:26:36]

comments addressed

[xhwang, 2015-11-12 06:28:38]

https://chromiumcodereview.appspot.com/1423163004/diff/40001/content/renderer...
File content/renderer/media/android/webmediaplayer_android.cc (right):

https://chromiumcodereview.appspot.com/1423163004/diff/40001/content/renderer...
content/renderer/media/android/webmediaplayer_android.cc:195:
video_frame_provider_client_(NULL),
On 2015/11/12 00:23:06, jrummell wrote:
> Since you changed cdm_context_ to nullptr, should this one be changed too?

Done.

https://chromiumcodereview.appspot.com/1423163004/diff/40001/media/filters/de...
File media/filters/decrypting_audio_decoder_unittest.cc (right):

https://chromiumcodereview.appspot.com/1423163004/diff/40001/media/filters/de...
media/filters/decrypting_audio_decoder_unittest.cc:121: EXPECT_CALL(*this,
CdmSet(has_cdm && has_decryptor));
On 2015/11/12 00:23:07, jrummell wrote:
> I think the |has_cdm| is redundant.

Done.

https://chromiumcodereview.appspot.com/1423163004/diff/40001/media/filters/de...
File media/filters/decrypting_demuxer_stream_unittest.cc (right):

https://chromiumcodereview.appspot.com/1423163004/diff/40001/media/filters/de...
media/filters/decrypting_demuxer_stream_unittest.cc:121: EXPECT_CALL(*this,
CdmSet(has_cdm && has_decryptor))
On 2015/11/12 00:23:07, jrummell wrote:
> ditto on |has_cdm|.

Done.

https://chromiumcodereview.appspot.com/1423163004/diff/40001/media/filters/de...
File media/filters/decrypting_video_decoder_unittest.cc (right):

https://chromiumcodereview.appspot.com/1423163004/diff/40001/media/filters/de...
media/filters/decrypting_video_decoder_unittest.cc:93: EXPECT_CALL(*this,
CdmSet(has_cdm && has_decryptor));
On 2015/11/12 00:23:07, jrummell wrote:
> ditto on |has_cdm|.

Done.

[xhwang, 2015-11-12 06:47:47]

The CQ bit was checked by xhwang@chromium.org

[xhwang, 2015-11-12 06:47:48]

The patchset sent to the CQ was uploaded after l-g-t-m from
jrummell@chromium.org
Link to the patchset: https://chromiumcodereview.appspot.com/1423163004/#ps60001
(title: "comments addressed")

[commit-bot: I haz the power, 2015-11-12 06:48:06]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1423163004/60001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1423163004/60001

[commit-bot: I haz the power, 2015-11-12 07:32:48]

Committed patchset #4 (id:60001)

[commit-bot: I haz the power, 2015-11-12 20:05:43]

Patchset 4 (id:??) landed as
https://crrev.com/00f69db77f1088499192ff69d1fc5b271025bd9a
Cr-Commit-Position: refs/heads/master@{#359278}