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

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

Issue 1769593002: Add 4 VP9 profiles to the media::VideoCodecProfile enum. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@hevc-codec-7
Patch Set: Better TODOs Created 4 years, 9 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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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_CODECS_H_ 5 #ifndef MEDIA_BASE_VIDEO_CODECS_H_
6 #define MEDIA_BASE_VIDEO_CODECS_H_ 6 #define MEDIA_BASE_VIDEO_CODECS_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 #include <string> 9 #include <string>
10 #include "media/base/media_export.h" 10 #include "media/base/media_export.h"
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 H264PROFILE_HIGH444PREDICTIVEPROFILE = 6, 55 H264PROFILE_HIGH444PREDICTIVEPROFILE = 6,
56 H264PROFILE_SCALABLEBASELINE = 7, 56 H264PROFILE_SCALABLEBASELINE = 7,
57 H264PROFILE_SCALABLEHIGH = 8, 57 H264PROFILE_SCALABLEHIGH = 8,
58 H264PROFILE_STEREOHIGH = 9, 58 H264PROFILE_STEREOHIGH = 9,
59 H264PROFILE_MULTIVIEWHIGH = 10, 59 H264PROFILE_MULTIVIEWHIGH = 10,
60 H264PROFILE_MAX = H264PROFILE_MULTIVIEWHIGH, 60 H264PROFILE_MAX = H264PROFILE_MULTIVIEWHIGH,
61 VP8PROFILE_MIN = 11, 61 VP8PROFILE_MIN = 11,
62 VP8PROFILE_ANY = VP8PROFILE_MIN, 62 VP8PROFILE_ANY = VP8PROFILE_MIN,
63 VP8PROFILE_MAX = VP8PROFILE_ANY, 63 VP8PROFILE_MAX = VP8PROFILE_ANY,
64 VP9PROFILE_MIN = 12, 64 VP9PROFILE_MIN = 12,
65 VP9PROFILE_ANY = VP9PROFILE_MIN, 65 VP9PROFILE_PROFILE0 = VP9PROFILE_MIN,
66 VP9PROFILE_MAX = VP9PROFILE_ANY, 66 VP9PROFILE_PROFILE1 = 13,
67 VP9PROFILE_PROFILE2 = 14,
68 VP9PROFILE_PROFILE3 = 15,
69 VP9PROFILE_MAX = VP9PROFILE_PROFILE3,
67 // 4 profile values are reserved for VP9 profiles. 70 // 4 profile values are reserved for VP9 profiles.
68 HEVCPROFILE_MIN = VP9PROFILE_ANY + 4, //=16 71 HEVCPROFILE_MIN = 16,
69 HEVCPROFILE_MAIN = HEVCPROFILE_MIN, 72 HEVCPROFILE_MAIN = HEVCPROFILE_MIN,
70 HEVCPROFILE_MAIN10 = 17, 73 HEVCPROFILE_MAIN10 = 17,
71 HEVCPROFILE_MAIN_STILL_PICTURE = 18, 74 HEVCPROFILE_MAIN_STILL_PICTURE = 18,
72 HEVCPROFILE_MAX = HEVCPROFILE_MAIN_STILL_PICTURE, 75 HEVCPROFILE_MAX = HEVCPROFILE_MAIN_STILL_PICTURE,
73 VIDEO_CODEC_PROFILE_MAX = HEVCPROFILE_MAX, 76 VIDEO_CODEC_PROFILE_MAX = HEVCPROFILE_MAX,
74 }; 77 };
75 78
76 std::string MEDIA_EXPORT GetCodecName(VideoCodec codec); 79 std::string MEDIA_EXPORT GetCodecName(VideoCodec codec);
77 std::string MEDIA_EXPORT GetProfileName(VideoCodecProfile profile); 80 std::string MEDIA_EXPORT GetProfileName(VideoCodecProfile profile);
78 81
79 // Handle parsing AVC/H.264 codec ids as outlined in RFC 6381 and ISO-14496-10. 82 // Handle parsing AVC/H.264 codec ids as outlined in RFC 6381 and ISO-14496-10.
80 MEDIA_EXPORT bool ParseAVCCodecId(const std::string& codec_id, 83 MEDIA_EXPORT bool ParseAVCCodecId(const std::string& codec_id,
81 VideoCodecProfile* profile, 84 VideoCodecProfile* profile,
82 uint8_t* level_idc); 85 uint8_t* level_idc);
83 86
84 #if BUILDFLAG(ENABLE_HEVC_DEMUXING) 87 #if BUILDFLAG(ENABLE_HEVC_DEMUXING)
85 MEDIA_EXPORT bool ParseHEVCCodecId(const std::string& codec_id, 88 MEDIA_EXPORT bool ParseHEVCCodecId(const std::string& codec_id,
86 VideoCodecProfile* profile, 89 VideoCodecProfile* profile,
87 uint8_t* level_idc); 90 uint8_t* level_idc);
88 #endif 91 #endif
89 92
90 } // namespace media 93 } // namespace media
91 94
92 #endif // MEDIA_BASE_VIDEO_CODECS_H_ 95 #endif // MEDIA_BASE_VIDEO_CODECS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698