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

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

Created:
5 years, 1 month ago by loyso (OOO)
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

Revert of media: Pass SetCdmReadyCB in {Audio|Video}Decoder::Initialize(). (patchset #2 id:20001 of https://codereview.chromium.org/1442933002/ ) Reason for revert: 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. Original issue's 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} TBR=jrummell@chromium.org,dalecurtis@chromium.org,ddorwin@chromium.org,bbudge@chromium.org,xhwang@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=545099 Committed: https://crrev.com/0c1df0a37a815953d1af3d4eaf145af969210d5d Cr-Commit-Position: refs/heads/master@{#359731}

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+137 lines, -186 lines) Patch
M content/common/gpu/media/video_encode_accelerator_unittest.cc View 2 chunks +2 lines, -4 lines 0 comments Download
M content/renderer/media/android/media_source_delegate.cc View 2 chunks +6 lines, -4 lines 0 comments Download
M content/renderer/pepper/video_decoder_shim.cc View 2 chunks +1 line, -2 lines 0 comments Download
M media/base/audio_decoder.h View 2 chunks +0 lines, -7 lines 0 comments Download
M media/base/mock_filters.h View 2 chunks +2 lines, -4 lines 0 comments Download
M media/base/video_decoder.h View 3 chunks +0 lines, -6 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 +8 lines, -6 lines 0 comments Download
M media/filters/decoder_stream.cc View 2 chunks +3 lines, -4 lines 0 comments Download
M media/filters/decoder_stream_traits.h View 3 chunks +0 lines, -3 lines 0 comments Download
M media/filters/decoder_stream_traits.cc View 2 chunks +2 lines, -5 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 +2 lines, -3 lines 0 comments Download
M media/filters/decrypting_audio_decoder_unittest.cc View 3 chunks +6 lines, -7 lines 0 comments Download
M media/filters/decrypting_demuxer_stream.h View 1 chunk +2 lines, -3 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 +6 lines, -10 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 +2 lines, -3 lines 0 comments Download
M media/filters/decrypting_video_decoder_unittest.cc View 3 chunks +9 lines, -14 lines 0 comments Download
M media/filters/fake_video_decoder.h View 1 chunk +0 lines, -1 line 0 comments Download
M media/filters/fake_video_decoder.cc View 1 chunk +0 lines, -1 line 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 +0 lines, -1 line 0 comments Download
M media/filters/ffmpeg_audio_decoder.cc View 1 chunk +0 lines, -1 line 0 comments Download
M media/filters/ffmpeg_video_decoder.h View 1 chunk +0 lines, -1 line 0 comments Download
M media/filters/ffmpeg_video_decoder.cc View 1 chunk +0 lines, -1 line 0 comments Download
M media/filters/ffmpeg_video_decoder_unittest.cc View 1 chunk +1 line, -2 lines 0 comments Download
M media/filters/gpu_video_decoder.h View 1 chunk +0 lines, -1 line 0 comments Download
M media/filters/gpu_video_decoder.cc View 1 chunk +0 lines, -2 lines 0 comments Download
M media/filters/opus_audio_decoder.h View 1 chunk +0 lines, -1 line 0 comments Download
M media/filters/opus_audio_decoder.cc View 1 chunk +0 lines, -1 line 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 +0 lines, -1 line 0 comments Download
M media/filters/vpx_video_decoder.cc View 1 chunk +0 lines, -1 line 0 comments Download
M media/renderers/audio_renderer_impl_unittest.cc View 5 chunks +7 lines, -8 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: 5 (0 generated)
loyso (OOO)
Created Revert of media: Pass SetCdmReadyCB in {Audio|Video}Decoder::Initialize().
5 years, 1 month ago (2015-11-14 01:46:04 UTC) #1
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1446713003/1 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1446713003/1
5 years, 1 month ago (2015-11-14 01:46:31 UTC) #2
commit-bot: I haz the power
Committed patchset #1 (id:1)
5 years, 1 month ago (2015-11-14 01:48:58 UTC) #3
commit-bot: I haz the power
Patchset 1 (id:??) landed as https://crrev.com/0c1df0a37a815953d1af3d4eaf145af969210d5d Cr-Commit-Position: refs/heads/master@{#359731}
5 years, 1 month ago (2015-11-14 01:50:05 UTC) #4
xhwang
5 years, 1 month ago (2015-11-14 05:37:40 UTC) #5
Message was sent while issue was closed.
lgtm

thanks for the revert!

but, why this isn't caught by any bot?

Powered by Google App Engine
This is Rietveld 408576698