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

Unified Diff: media/video/video_decode_accelerator.cc

Issue 1963903002: Remove VideoDecodeAccelerator::SetCdm() and pass the cdm in Initialize() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add cdm_id to paramtraits Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/video/video_decode_accelerator.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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) {
« no previous file with comments | « media/video/video_decode_accelerator.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698