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

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

Issue 1485043002: Passed is_encrypted parameter to the VDA initialization. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed comments Created 5 years 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/v4l2_slice_video_decode_accelerator.cc
diff --git a/content/common/gpu/media/v4l2_slice_video_decode_accelerator.cc b/content/common/gpu/media/v4l2_slice_video_decode_accelerator.cc
index a682648b7a50d21764a831ce9f68667022ed4bc8..f17dc6295cb4ab44e3f8be2c9a8648d048365648 100644
--- a/content/common/gpu/media/v4l2_slice_video_decode_accelerator.cc
+++ b/content/common/gpu/media/v4l2_slice_video_decode_accelerator.cc
@@ -433,10 +433,14 @@ void V4L2SliceVideoDecodeAccelerator::NotifyError(Error error) {
}
}
-bool V4L2SliceVideoDecodeAccelerator::Initialize(
- media::VideoCodecProfile profile,
- VideoDecodeAccelerator::Client* client) {
- DVLOGF(3) << "profile: " << profile;
+bool V4L2SliceVideoDecodeAccelerator::Initialize(const Config& config,
+ Client* client) {
+ DVLOGF(3) << "profile: " << config.profile;
+ if (config.is_encrypted) {
+ NOTREACHED() << "Encrypted streams are not supported for this VDA";
+ return false;
+ }
+
DCHECK(child_task_runner_->BelongsToCurrentThread());
DCHECK_EQ(state_, kUninitialized);
@@ -444,7 +448,7 @@ bool V4L2SliceVideoDecodeAccelerator::Initialize(
new base::WeakPtrFactory<VideoDecodeAccelerator::Client>(client));
client_ = client_ptr_factory_->GetWeakPtr();
- video_profile_ = profile;
+ video_profile_ = config.profile;
if (video_profile_ >= media::H264PROFILE_MIN &&
video_profile_ <= media::H264PROFILE_MAX) {

Powered by Google App Engine
This is Rietveld 408576698