|
media: Pass SetCdmReadyCB in {Audio|Video}Decoder::Initialize().
(This reverts commit 0c1df0a37a815953d1af3d4eaf145af969210d5d with fix.)
This enables all audio/video decoders the ability to get access to the CDM
associated with the media element. This is useful for certain decoders to handle
encrypted streams.
For Decrypting{Audio|Video}Decoder and DecryptingDemuxerStream, the SetCdmReadyCB
is simply moved from constructor to Initialize() call. In the future this could
also help move Decrypting{Audio|Video}Decoder creation out of DecoderSelector so
that it is treated the same as all other decoders.
TBR=bbudge@chromium.org,jrummell@chromium.org,dalecurtis@chromium.org
BUG= 545099
Committed: https://crrev.com/680a312fa2dfe2fccce0ecc1d00193fa6d4be29b
Cr-Commit-Position: refs/heads/master@{#359754}
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+189 lines, -138 lines) |
Patch |
 |
M |
content/common/gpu/media/video_encode_accelerator_unittest.cc
|
View
|
|
2 chunks |
+4 lines, -2 lines |
0 comments
|
Download
|
 |
M |
content/renderer/media/android/media_source_delegate.cc
|
View
|
|
2 chunks |
+4 lines, -6 lines |
0 comments
|
Download
|
 |
M |
content/renderer/pepper/video_decoder_shim.cc
|
View
|
|
2 chunks |
+2 lines, -1 line |
0 comments
|
Download
|
 |
M |
media/base/audio_decoder.h
|
View
|
|
2 chunks |
+7 lines, -0 lines |
0 comments
|
Download
|
 |
M |
media/base/mock_filters.h
|
View
|
|
2 chunks |
+4 lines, -2 lines |
0 comments
|
Download
|
 |
M |
media/base/video_decoder.h
|
View
|
|
3 chunks |
+6 lines, -0 lines |
0 comments
|
Download
|
 |
M |
media/cast/sender/h264_vt_encoder_unittest.cc
|
View
|
|
2 chunks |
+3 lines, -1 line |
0 comments
|
Download
|
 |
M |
media/filters/audio_decoder_selector_unittest.cc
|
View
|
|
15 chunks |
+35 lines, -35 lines |
0 comments
|
Download
|
 |
M |
media/filters/audio_decoder_unittest.cc
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
M |
media/filters/decoder_selector.cc
|
View
|
|
3 chunks |
+6 lines, -8 lines |
0 comments
|
Download
|
 |
M |
media/filters/decoder_stream.cc
|
View
|
|
2 chunks |
+4 lines, -3 lines |
0 comments
|
Download
|
 |
M |
media/filters/decoder_stream_traits.h
|
View
|
|
3 chunks |
+3 lines, -0 lines |
0 comments
|
Download
|
 |
M |
media/filters/decoder_stream_traits.cc
|
View
|
|
2 chunks |
+5 lines, -2 lines |
0 comments
|
Download
|
 |
M |
media/filters/decrypting_audio_decoder.h
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
M |
media/filters/decrypting_audio_decoder.cc
|
View
|
|
3 chunks |
+3 lines, -2 lines |
0 comments
|
Download
|
 |
M |
media/filters/decrypting_audio_decoder_unittest.cc
|
View
|
|
3 chunks |
+7 lines, -6 lines |
0 comments
|
Download
|
 |
M |
media/filters/decrypting_demuxer_stream.h
|
View
|
|
1 chunk |
+3 lines, -2 lines |
0 comments
|
Download
|
 |
M |
media/filters/decrypting_demuxer_stream.cc
|
View
|
|
3 chunks |
+2 lines, -2 lines |
0 comments
|
Download
|
 |
M |
media/filters/decrypting_demuxer_stream_unittest.cc
|
View
|
|
2 chunks |
+10 lines, -6 lines |
0 comments
|
Download
|
 |
M |
media/filters/decrypting_video_decoder.h
|
View
|
|
2 chunks |
+1 line, -1 line |
0 comments
|
Download
|
 |
M |
media/filters/decrypting_video_decoder.cc
|
View
|
|
3 chunks |
+3 lines, -2 lines |
0 comments
|
Download
|
 |
M |
media/filters/decrypting_video_decoder_unittest.cc
|
View
|
|
3 chunks |
+14 lines, -9 lines |
0 comments
|
Download
|
 |
M |
media/filters/fake_video_decoder.h
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
M |
media/filters/fake_video_decoder.cc
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
M |
media/filters/fake_video_decoder_unittest.cc
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
M |
media/filters/ffmpeg_audio_decoder.h
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
M |
media/filters/ffmpeg_audio_decoder.cc
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
M |
media/filters/ffmpeg_video_decoder.h
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
M |
media/filters/ffmpeg_video_decoder.cc
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
M |
media/filters/ffmpeg_video_decoder_unittest.cc
|
View
|
|
1 chunk |
+2 lines, -1 line |
0 comments
|
Download
|
 |
M |
media/filters/gpu_video_decoder.h
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
M |
media/filters/gpu_video_decoder.cc
|
View
|
|
1 chunk |
+2 lines, -0 lines |
0 comments
|
Download
|
 |
M |
media/filters/opus_audio_decoder.h
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
M |
media/filters/opus_audio_decoder.cc
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
M |
media/filters/video_decoder_selector_unittest.cc
|
View
|
|
15 chunks |
+35 lines, -35 lines |
0 comments
|
Download
|
 |
M |
media/filters/vpx_video_decoder.h
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
M |
media/filters/vpx_video_decoder.cc
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
M |
media/renderers/audio_renderer_impl_unittest.cc
|
View
|
|
5 chunks |
+8 lines, -7 lines |
0 comments
|
Download
|
 |
M |
media/renderers/video_renderer_impl_unittest.cc
|
View
|
|
1 chunk |
+2 lines, -2 lines |
0 comments
|
Download
|
Total messages: 8 (3 generated)
|