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

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

Issue 1469353010: Configure MediaCodec with CDM in ADVA (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase again Created 4 years, 11 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
« no previous file with comments | « media/media.gyp ('k') | media/video/video_decode_accelerator.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef MEDIA_VIDEO_VIDEO_DECODE_ACCELERATOR_H_ 5 #ifndef MEDIA_VIDEO_VIDEO_DECODE_ACCELERATOR_H_
6 #define MEDIA_VIDEO_VIDEO_DECODE_ACCELERATOR_H_ 6 #define MEDIA_VIDEO_VIDEO_DECODE_ACCELERATOR_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 // Largest used enum. This should be adjusted when new errors are added. 76 // Largest used enum. This should be adjusted when new errors are added.
77 LARGEST_ERROR_ENUM, 77 LARGEST_ERROR_ENUM,
78 }; 78 };
79 79
80 // Config structure contains parameters required for the VDA initialization. 80 // Config structure contains parameters required for the VDA initialization.
81 struct MEDIA_EXPORT Config { 81 struct MEDIA_EXPORT Config {
82 Config() = default; 82 Config() = default;
83 Config(VideoCodecProfile profile); 83 Config(VideoCodecProfile profile);
84 Config(const VideoDecoderConfig& video_decoder_config); 84 Config(const VideoDecoderConfig& video_decoder_config);
85 85
86 std::string AsHumanReadableString() const;
87
86 // |profile| combines the information about the codec and its profile. 88 // |profile| combines the information about the codec and its profile.
87 VideoCodecProfile profile = VIDEO_CODEC_PROFILE_UNKNOWN; 89 VideoCodecProfile profile = VIDEO_CODEC_PROFILE_UNKNOWN;
88 90
89 // The flag indicating whether the stream is encrypted. 91 // The flag indicating whether the stream is encrypted.
90 bool is_encrypted = false; 92 bool is_encrypted = false;
91 }; 93 };
92 94
93 // Interface for collaborating with picture interface to provide memory for 95 // Interface for collaborating with picture interface to provide memory for
94 // output picture and blitting them. These callbacks will not be made unless 96 // output picture and blitting them. These callbacks will not be made unless
95 // Initialize() has returned successfully. 97 // Initialize() has returned successfully.
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 // Specialize std::default_delete so that scoped_ptr<VideoDecodeAccelerator> 235 // Specialize std::default_delete so that scoped_ptr<VideoDecodeAccelerator>
234 // uses "Destroy()" instead of trying to use the destructor. 236 // uses "Destroy()" instead of trying to use the destructor.
235 template <> 237 template <>
236 struct MEDIA_EXPORT default_delete<media::VideoDecodeAccelerator> { 238 struct MEDIA_EXPORT default_delete<media::VideoDecodeAccelerator> {
237 void operator()(media::VideoDecodeAccelerator* vda) const; 239 void operator()(media::VideoDecodeAccelerator* vda) const;
238 }; 240 };
239 241
240 } // namespace std 242 } // namespace std
241 243
242 #endif // MEDIA_VIDEO_VIDEO_DECODE_ACCELERATOR_H_ 244 #endif // MEDIA_VIDEO_VIDEO_DECODE_ACCELERATOR_H_
OLDNEW
« no previous file with comments | « media/media.gyp ('k') | media/video/video_decode_accelerator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698