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

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

Issue 2902893002: Prefixing the explicit keyword to the media::VideoDecodeAccelerator::Config (Closed)
Patch Set: Created 3 years, 7 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 | « content/renderer/pepper/pepper_video_decoder_host.cc ('k') | no next file » | 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 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 // AssignPictureBuffers() call, it will expect a call to 123 // AssignPictureBuffers() call, it will expect a call to
124 // ImportBufferForPicture() for each PictureBuffer before use. 124 // ImportBufferForPicture() for each PictureBuffer before use.
125 enum class OutputMode { 125 enum class OutputMode {
126 ALLOCATE, 126 ALLOCATE,
127 IMPORT, 127 IMPORT,
128 }; 128 };
129 129
130 Config(); 130 Config();
131 Config(const Config& config); 131 Config(const Config& config);
132 132
133 // Intentional converting constructor. 133 explicit Config(VideoCodecProfile profile);
134 // TODO(watk): Make this explicit.
135 Config(VideoCodecProfile profile);
136 134
137 ~Config(); 135 ~Config();
138 136
139 std::string AsHumanReadableString() const; 137 std::string AsHumanReadableString() const;
140 bool is_encrypted() const { return encryption_scheme.is_encrypted(); } 138 bool is_encrypted() const { return encryption_scheme.is_encrypted(); }
141 139
142 // The video codec and profile. 140 // The video codec and profile.
143 VideoCodecProfile profile = VIDEO_CODEC_PROFILE_UNKNOWN; 141 VideoCodecProfile profile = VIDEO_CODEC_PROFILE_UNKNOWN;
144 142
145 // Whether the stream is encrypted, and, if so, the scheme used. 143 // Whether the stream is encrypted, and, if so, the scheme used.
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
378 // std::unique_ptr<VideoDecodeAccelerator> uses "Destroy()" instead of trying to 376 // std::unique_ptr<VideoDecodeAccelerator> uses "Destroy()" instead of trying to
379 // use the destructor. 377 // use the destructor.
380 template <> 378 template <>
381 struct MEDIA_EXPORT default_delete<media::VideoDecodeAccelerator> { 379 struct MEDIA_EXPORT default_delete<media::VideoDecodeAccelerator> {
382 void operator()(media::VideoDecodeAccelerator* vda) const; 380 void operator()(media::VideoDecodeAccelerator* vda) const;
383 }; 381 };
384 382
385 } // namespace std 383 } // namespace std
386 384
387 #endif // MEDIA_VIDEO_VIDEO_DECODE_ACCELERATOR_H_ 385 #endif // MEDIA_VIDEO_VIDEO_DECODE_ACCELERATOR_H_
OLDNEW
« no previous file with comments | « content/renderer/pepper/pepper_video_decoder_host.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698