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

Side by Side Diff: media/video/video_decode_accelerator.cc

Issue 2058113002: Add 'cbcs' encryption scheme support in Android media. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/video/video_decode_accelerator.h" 5 #include "media/video/video_decode_accelerator.h"
6 6
7 #include <GLES2/gl2.h> 7 #include <GLES2/gl2.h>
8 #include "base/logging.h" 8 #include "base/logging.h"
9 9
10 namespace media { 10 namespace media {
11 11
12 VideoDecodeAccelerator::Config::Config() = default;
13
12 VideoDecodeAccelerator::Config::Config(VideoCodecProfile video_codec_profile) 14 VideoDecodeAccelerator::Config::Config(VideoCodecProfile video_codec_profile)
13 : profile(video_codec_profile) {} 15 : profile(video_codec_profile) {}
14 16
15 std::string VideoDecodeAccelerator::Config::AsHumanReadableString() const { 17 std::string VideoDecodeAccelerator::Config::AsHumanReadableString() const {
16 std::ostringstream s; 18 std::ostringstream s;
17 s << "profile: " << GetProfileName(profile) << " encrypted? " 19 s << "profile: " << GetProfileName(profile) << " encrypted? "
18 << (is_encrypted ? "true" : "false"); 20 << (is_encrypted() ? "true" : "false");
19 return s.str(); 21 return s.str();
20 } 22 }
21 23
22 void VideoDecodeAccelerator::Client::NotifyInitializationComplete( 24 void VideoDecodeAccelerator::Client::NotifyInitializationComplete(
23 bool success) { 25 bool success) {
24 NOTREACHED() << "By default deferred initialization is not supported."; 26 NOTREACHED() << "By default deferred initialization is not supported.";
25 } 27 }
26 28
27 VideoDecodeAccelerator::~VideoDecodeAccelerator() {} 29 VideoDecodeAccelerator::~VideoDecodeAccelerator() {}
28 30
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 } // namespace media 78 } // namespace media
77 79
78 namespace std { 80 namespace std {
79 81
80 void default_delete<media::VideoDecodeAccelerator>::operator()( 82 void default_delete<media::VideoDecodeAccelerator>::operator()(
81 media::VideoDecodeAccelerator* vda) const { 83 media::VideoDecodeAccelerator* vda) const {
82 vda->Destroy(); 84 vda->Destroy();
83 } 85 }
84 86
85 } // namespace std 87 } // namespace std
OLDNEW
« media/base/encryption_scheme.h ('K') | « media/video/video_decode_accelerator.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698