| Index: media/video/video_decode_accelerator.cc
|
| diff --git a/media/video/video_decode_accelerator.cc b/media/video/video_decode_accelerator.cc
|
| index 382625a0cbf85a3ea52dd6ca8b411cf18b32dbbf..02901535dacdec979232af7b0bb5a5cb6baacba1 100644
|
| --- a/media/video/video_decode_accelerator.cc
|
| +++ b/media/video/video_decode_accelerator.cc
|
| @@ -12,11 +12,6 @@ namespace media {
|
| VideoDecodeAccelerator::Config::Config(VideoCodecProfile video_codec_profile)
|
| : profile(video_codec_profile) {}
|
|
|
| -VideoDecodeAccelerator::Config::Config(
|
| - const VideoDecoderConfig& video_decoder_config)
|
| - : profile(video_decoder_config.profile()),
|
| - is_encrypted(video_decoder_config.is_encrypted()) {}
|
| -
|
| std::string VideoDecodeAccelerator::Config::AsHumanReadableString() const {
|
| std::ostringstream s;
|
| s << "profile: " << GetProfileName(profile) << " encrypted? "
|
| @@ -31,10 +26,6 @@ void VideoDecodeAccelerator::Client::NotifyInitializationComplete(
|
|
|
| VideoDecodeAccelerator::~VideoDecodeAccelerator() {}
|
|
|
| -void VideoDecodeAccelerator::SetCdm(int cdm_id) {
|
| - NOTREACHED() << "By default CDM is not supported.";
|
| -}
|
| -
|
| bool VideoDecodeAccelerator::TryToSetupDecodeOnSeparateThread(
|
| const base::WeakPtr<Client>& decode_client,
|
| const scoped_refptr<base::SingleThreadTaskRunner>& decode_task_runner) {
|
|
|