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

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, used std::move, added VDA::Config::AsHumanReadableString 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 unified diff | Download patch
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 <memory> 8 #include <memory>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 // Largest used enum. This should be adjusted when new errors are added. 52 // Largest used enum. This should be adjusted when new errors are added.
53 LARGEST_ERROR_ENUM, 53 LARGEST_ERROR_ENUM,
54 }; 54 };
55 55
56 // Config structure contains parameters required for the VDA initialization. 56 // Config structure contains parameters required for the VDA initialization.
57 struct MEDIA_EXPORT Config { 57 struct MEDIA_EXPORT Config {
58 Config() = default; 58 Config() = default;
59 Config(VideoCodecProfile profile); 59 Config(VideoCodecProfile profile);
60 Config(const VideoDecoderConfig& video_decoder_config); 60 Config(const VideoDecoderConfig& video_decoder_config);
61 61
62 std::string AsHumanReadableString() const;
63
62 // |profile| combines the information about the codec and its profile. 64 // |profile| combines the information about the codec and its profile.
63 VideoCodecProfile profile = VIDEO_CODEC_PROFILE_UNKNOWN; 65 VideoCodecProfile profile = VIDEO_CODEC_PROFILE_UNKNOWN;
64 66
65 // The flag indicating whether the stream is encrypted. 67 // The flag indicating whether the stream is encrypted.
66 bool is_encrypted = false; 68 bool is_encrypted = false;
67 }; 69 };
68 70
69 // Interface for collaborating with picture interface to provide memory for 71 // Interface for collaborating with picture interface to provide memory for
70 // output picture and blitting them. These callbacks will not be made unless 72 // output picture and blitting them. These callbacks will not be made unless
71 // Initialize() has returned successfully. 73 // Initialize() has returned successfully.
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 // Specialize std::default_delete so that scoped_ptr<VideoDecodeAccelerator> 211 // Specialize std::default_delete so that scoped_ptr<VideoDecodeAccelerator>
210 // uses "Destroy()" instead of trying to use the destructor. 212 // uses "Destroy()" instead of trying to use the destructor.
211 template <> 213 template <>
212 struct MEDIA_EXPORT default_delete<media::VideoDecodeAccelerator> { 214 struct MEDIA_EXPORT default_delete<media::VideoDecodeAccelerator> {
213 void operator()(media::VideoDecodeAccelerator* vda) const; 215 void operator()(media::VideoDecodeAccelerator* vda) const;
214 }; 216 };
215 217
216 } // namespace std 218 } // namespace std
217 219
218 #endif // MEDIA_VIDEO_VIDEO_DECODE_ACCELERATOR_H_ 220 #endif // MEDIA_VIDEO_VIDEO_DECODE_ACCELERATOR_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698