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

Unified Diff: content/common/gpu/media/vt_video_decode_accelerator_mac.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/vt_video_decode_accelerator_mac.cc
diff --git a/content/common/gpu/media/vt_video_decode_accelerator_mac.cc b/content/common/gpu/media/vt_video_decode_accelerator_mac.cc
index 741cb8fd4e25df45dc291e6363115f3171e3cd63..6b3e0dc74399584d247d674099f3f8c99605c876 100644
--- a/content/common/gpu/media/vt_video_decode_accelerator_mac.cc
+++ b/content/common/gpu/media/vt_video_decode_accelerator_mac.cc
@@ -313,10 +313,15 @@ VTVideoDecodeAccelerator::~VTVideoDecodeAccelerator() {
DCHECK(gpu_thread_checker_.CalledOnValidThread());
}
-bool VTVideoDecodeAccelerator::Initialize(
- media::VideoCodecProfile profile,
- Client* client) {
+bool VTVideoDecodeAccelerator::Initialize(const Config& config,
+ Client* client) {
DCHECK(gpu_thread_checker_.CalledOnValidThread());
+
+ if (config.is_encrypted) {
+ NOTREACHED() << "Encrypted streams are not supported for this VDA";
+ return false;
+ }
+
client_ = client;
if (!InitializeVideoToolbox())
@@ -324,7 +329,7 @@ bool VTVideoDecodeAccelerator::Initialize(
bool profile_supported = false;
for (const auto& supported_profile : kSupportedProfiles) {
- if (profile == supported_profile) {
+ if (config.profile == supported_profile) {
profile_supported = true;
break;
}
« no previous file with comments | « content/common/gpu/media/vt_video_decode_accelerator_mac.h ('k') | content/renderer/media/rtc_video_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698