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

Unified Diff: content/common/gpu/media/android_video_decode_accelerator.cc

Issue 1438063002: media: Support SetCdm() on VideoDecodeAccelerator interface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comments addressed Created 5 years, 1 month 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
Index: content/common/gpu/media/android_video_decode_accelerator.cc
diff --git a/content/common/gpu/media/android_video_decode_accelerator.cc b/content/common/gpu/media/android_video_decode_accelerator.cc
index 67b12595e63c98a88315ee1af234df1f183caeaa..8a0f7db1482e42716f03a58977aadcd920ded71c 100644
--- a/content/common/gpu/media/android_video_decode_accelerator.cc
+++ b/content/common/gpu/media/android_video_decode_accelerator.cc
@@ -138,6 +138,12 @@ bool AndroidVideoDecodeAccelerator::Initialize(media::VideoCodecProfile profile,
return true;
}
+void AndroidVideoDecodeAccelerator::SetCdm(int /* cdm_id */) {
+ // TODO(xhwang): Implement CDM setting here.
+ NOTIMPLEMENTED();
+ NotifyCdmAttached(false);
+}
+
void AndroidVideoDecodeAccelerator::DoIOTask() {
DCHECK(thread_checker_.CalledOnValidThread());
TRACE_EVENT0("media", "AVDA::DoIOTask");
@@ -583,6 +589,10 @@ void AndroidVideoDecodeAccelerator::PostError(
state_ = ERROR;
}
+void AndroidVideoDecodeAccelerator::NotifyCdmAttached(bool success) {
+ client_->NotifyCdmAttached(success);
+}
+
void AndroidVideoDecodeAccelerator::NotifyPictureReady(
const media::Picture& picture) {
client_->PictureReady(picture);

Powered by Google App Engine
This is Rietveld 408576698