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

Side by Side Diff: media/base/video_decoder_config.h

Issue 816353010: Implemented HEVC video demuxing and parsing (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Moved back h265_parser_unittest.cc in media/BUILD.gn Created 5 years, 3 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/base/mime_util.cc ('k') | media/base/video_decoder_config.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_BASE_VIDEO_DECODER_CONFIG_H_ 5 #ifndef MEDIA_BASE_VIDEO_DECODER_CONFIG_H_
6 #define MEDIA_BASE_VIDEO_DECODER_CONFIG_H_ 6 #define MEDIA_BASE_VIDEO_DECODER_CONFIG_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 10 matching lines...) Expand all
21 // values. When deleting a codec replace it with a dummy value; when adding a 21 // values. When deleting a codec replace it with a dummy value; when adding a
22 // codec, do so at the bottom (and update kVideoCodecMax). 22 // codec, do so at the bottom (and update kVideoCodecMax).
23 kUnknownVideoCodec = 0, 23 kUnknownVideoCodec = 0,
24 kCodecH264, 24 kCodecH264,
25 kCodecVC1, 25 kCodecVC1,
26 kCodecMPEG2, 26 kCodecMPEG2,
27 kCodecMPEG4, 27 kCodecMPEG4,
28 kCodecTheora, 28 kCodecTheora,
29 kCodecVP8, 29 kCodecVP8,
30 kCodecVP9, 30 kCodecVP9,
31 kCodecHEVC,
31 // DO NOT ADD RANDOM VIDEO CODECS! 32 // DO NOT ADD RANDOM VIDEO CODECS!
32 // 33 //
33 // The only acceptable time to add a new codec is if there is production code 34 // The only acceptable time to add a new codec is if there is production code
34 // that uses said codec in the same CL. 35 // that uses said codec in the same CL.
35 36
36 kVideoCodecMax = kCodecVP9 // Must equal the last "real" codec above. 37 kVideoCodecMax = kCodecHEVC // Must equal the last "real" codec above.
37 }; 38 };
38 39
39 // Video stream profile. This *must* match PP_VideoDecoder_Profile. 40 // Video stream profile. This *must* match PP_VideoDecoder_Profile.
40 // (enforced in webkit/plugins/ppapi/ppb_video_decoder_impl.cc) and 41 // (enforced in webkit/plugins/ppapi/ppb_video_decoder_impl.cc) and
41 // gpu::VideoCodecProfile. 42 // gpu::VideoCodecProfile.
42 enum VideoCodecProfile { 43 enum VideoCodecProfile {
43 // Keep the values in this enum unique, as they imply format (h.264 vs. VP8, 44 // Keep the values in this enum unique, as they imply format (h.264 vs. VP8,
44 // for example), and keep the values for a particular format grouped 45 // for example), and keep the values for a particular format grouped
45 // together for clarity. 46 // together for clarity.
46 VIDEO_CODEC_PROFILE_UNKNOWN = -1, 47 VIDEO_CODEC_PROFILE_UNKNOWN = -1,
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 bool is_encrypted_; 166 bool is_encrypted_;
166 167
167 // Not using DISALLOW_COPY_AND_ASSIGN here intentionally to allow the compiler 168 // Not using DISALLOW_COPY_AND_ASSIGN here intentionally to allow the compiler
168 // generated copy constructor and assignment operator. Since the extra data is 169 // generated copy constructor and assignment operator. Since the extra data is
169 // typically small, the performance impact is minimal. 170 // typically small, the performance impact is minimal.
170 }; 171 };
171 172
172 } // namespace media 173 } // namespace media
173 174
174 #endif // MEDIA_BASE_VIDEO_DECODER_CONFIG_H_ 175 #endif // MEDIA_BASE_VIDEO_DECODER_CONFIG_H_
OLDNEW
« no previous file with comments | « media/base/mime_util.cc ('k') | media/base/video_decoder_config.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698