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

Issue 1442933002: media: Pass SetCdmReadyCB in {Audio|Video}Decoder::Initialize(). (Closed)

Created:
5 years, 1 month ago by xhwang
Modified:
5 years, 1 month ago
CC:
chromium-reviews, mkwst+moarreviews-renderer_chromium.org, mlamouri+watch-content_chromium.org, feature-media-reviews_chromium.org, jam, darin-cc_chromium.org
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

media: Pass SetCdmReadyCB in {Audio|Video}Decoder::Initialize(). 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 BUG=545099 Committed: https://crrev.com/406d0255ae170720d2bc68cd7783855f16f3be17 Cr-Commit-Position: refs/heads/master@{#359702}

Patch Set 1 #

Patch Set 2 : fix compile errors #

Unified diffs Side-by-side diffs Delta from patch set Stats (+186 lines, -137 lines) Patch
M content/common/gpu/media/video_encode_accelerator_unittest.cc View 1 2 chunks +4 lines, -2 lines 0 comments Download
M content/renderer/media/android/media_source_delegate.cc View 1 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/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

Messages

Total messages: 15 (6 generated)
xhwang
jrummell: PTAL dalecurtis: Please review the audio/video decoder API change. ddorwin: FYI
5 years, 1 month ago (2015-11-13 18:16:31 UTC) #4
jrummell
lgtm
5 years, 1 month ago (2015-11-13 19:52:12 UTC) #5
xhwang
TBRing bbudge for trivial changes in content/renderer/pepper/video_decoder_shim.cc.
5 years, 1 month ago (2015-11-13 19:54:34 UTC) #8
bbudge
content/renderer/pepper/video_decoder_shim.cc LGTM
5 years, 1 month ago (2015-11-13 20:55:25 UTC) #9
DaleCurtis
api change lgtm, didn't review all the files.
5 years, 1 month ago (2015-11-13 23:38:54 UTC) #10
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1442933002/20001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1442933002/20001
5 years, 1 month ago (2015-11-13 23:42:34 UTC) #12
commit-bot: I haz the power
Committed patchset #2 (id:20001)
5 years, 1 month ago (2015-11-14 00:26:02 UTC) #13
commit-bot: I haz the power
Patchset 2 (id:??) landed as https://crrev.com/406d0255ae170720d2bc68cd7783855f16f3be17 Cr-Commit-Position: refs/heads/master@{#359702}
5 years, 1 month ago (2015-11-14 00:27:04 UTC) #14
loyso (OOO)
5 years, 1 month ago (2015-11-14 01:46:04 UTC) #15
Message was sent while issue was closed.
A revert of this CL (patchset #2 id:20001) has been created in
https://codereview.chromium.org/1446713003/ by loyso@chromium.org.

The reason for reverting is: Mac build doesn't compile.

../../media/cast/sender/h264_vt_encoder_unittest.cc:140:43: error: too few
arguments to function call, expected 5, have 4
                   base::Unretained(this)));
                                          ^
../../media/filters/ffmpeg_video_decoder.h:42:3: note: 'Initialize' declared
here
  void Initialize(const VideoDecoderConfig& config,
  ^
1 error generated..

Powered by Google App Engine
This is Rietveld 408576698