[go: nahoru, domu]

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

Issue 17422002: Encrypted Media: DecryptingXxx::SetDecryptor() accepts NULL decryptor. (Closed)

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

Description

Encrypted Media: DecryptingXxx::SetDecryptor() accepts NULL decryptor. Currently ProxyDecryptor never sets NULL decryptor in DecryptorReadyCB. However on Chrome on Android, we have a legit use case of this. When ProxyDecryptor cannot create a decryptor for the specified key system, it'll choose to go through the IPC route to defer decryption to the browser. In this case, it could set NULL decryptor in DecrypingDemuxerStream's SetDecryptor() callback to trigger DDS init failure, so that MediaSourceDelegate will not try to decrypt the buffers at the renderer side. Instead it'll send all encrypted buffers over the IPC to the browser. BUG=163552 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=207202

Patch Set 1 #

Total comments: 4

Patch Set 2 : Add todo and bug. #

Unified diffs Side-by-side diffs Delta from patch set Stats (+46 lines, -0 lines) Patch
M media/filters/decrypting_audio_decoder.cc View 1 1 chunk +8 lines, -0 lines 0 comments Download
M media/filters/decrypting_audio_decoder_unittest.cc View 1 chunk +9 lines, -0 lines 0 comments Download
M media/filters/decrypting_demuxer_stream.cc View 1 chunk +7 lines, -0 lines 0 comments Download
M media/filters/decrypting_demuxer_stream_unittest.cc View 1 chunk +9 lines, -0 lines 0 comments Download
M media/filters/decrypting_video_decoder.cc View 1 chunk +6 lines, -0 lines 0 comments Download
M media/filters/decrypting_video_decoder_unittest.cc View 1 chunk +7 lines, -0 lines 0 comments Download

Messages

Total messages: 8 (0 generated)
xhwang
PTAL
7 years, 6 months ago (2013-06-18 18:29:22 UTC) #1
qinmin
https://codereview.chromium.org/17422002/diff/1/media/filters/decrypting_audio_decoder.cc File media/filters/decrypting_audio_decoder.cc (right): https://codereview.chromium.org/17422002/diff/1/media/filters/decrypting_audio_decoder.cc#newcode179 media/filters/decrypting_audio_decoder.cc:179: state_ = kDecodeFinished; why the state_ value is different ...
7 years, 6 months ago (2013-06-18 22:09:20 UTC) #2
xhwang
https://codereview.chromium.org/17422002/diff/1/media/filters/decrypting_audio_decoder.cc File media/filters/decrypting_audio_decoder.cc (right): https://codereview.chromium.org/17422002/diff/1/media/filters/decrypting_audio_decoder.cc#newcode179 media/filters/decrypting_audio_decoder.cc:179: state_ = kDecodeFinished; On 2013/06/18 22:09:20, qinmin wrote: > ...
7 years, 6 months ago (2013-06-18 22:34:23 UTC) #3
qinmin
lgtm
7 years, 6 months ago (2013-06-18 22:45:56 UTC) #4
ddorwin
lgtm https://codereview.chromium.org/17422002/diff/1/media/filters/decrypting_audio_decoder.cc File media/filters/decrypting_audio_decoder.cc (right): https://codereview.chromium.org/17422002/diff/1/media/filters/decrypting_audio_decoder.cc#newcode179 media/filters/decrypting_audio_decoder.cc:179: state_ = kDecodeFinished; On 2013/06/18 22:34:23, xhwang wrote: ...
7 years, 6 months ago (2013-06-19 00:06:50 UTC) #5
xhwang
https://codereview.chromium.org/17422002/diff/1/media/filters/decrypting_audio_decoder.cc File media/filters/decrypting_audio_decoder.cc (right): https://codereview.chromium.org/17422002/diff/1/media/filters/decrypting_audio_decoder.cc#newcode179 media/filters/decrypting_audio_decoder.cc:179: state_ = kDecodeFinished; On 2013/06/19 00:06:50, ddorwin wrote: > ...
7 years, 6 months ago (2013-06-19 00:37:45 UTC) #6
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/xhwang@chromium.org/17422002/7001
7 years, 6 months ago (2013-06-19 00:38:15 UTC) #7
commit-bot: I haz the power
7 years, 6 months ago (2013-06-19 07:36:11 UTC) #8
Message was sent while issue was closed.
Change committed as 207202

Powered by Google App Engine
This is Rietveld 408576698