Implemented parsing of HEVC codec ids

media/base/video_codecs.h

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_BASE_VIDEO_CODECS_H_
 #define MEDIA_BASE_VIDEO_CODECS_H_
 
 #include <stdint.h>
 #include <string>
 #include "media/base/media_export.h"
+#include "media/media_features.h"
 
 namespace media {
 
 enum VideoCodec {
   // These values are histogrammed over time; do not change their ordinal
   // values.  When deleting a codec replace it with a dummy value; when adding a
   // codec, do so at the bottom (and update kVideoCodecMax).
   kUnknownVideoCodec = 0,
   kCodecH264,
   kCodecVC1,
   kCodecMPEG2,
   kCodecMPEG4,
   kCodecTheora,
   kCodecVP8,
   kCodecVP9,
   kCodecHEVC,
   // DO NOT ADD RANDOM VIDEO CODECS!
   //
   // The only acceptable time to add a new codec is if there is production code
   // that uses said codec in the same CL.
 
   kVideoCodecMax = kCodecHEVC  // Must equal the last "real" codec above.
 };
 
-// Video stream profile.  This *must* match PP_VideoDecoder_Profile.
-// (enforced in webkit/plugins/ppapi/ppb_video_decoder_impl.cc) and
-// gpu::VideoCodecProfile.
+// Video codec profiles. Keep in sync with mojo::VideoCodecProfile (see
+// media/mojo/interfaces/media_types.mojom) and gpu::VideoCodecProfile (see
+// gpu/config/gpu_info.h), as well as PP_VideoDecoder_Profile (translation is
+// performed in content/renderer/pepper/ppb_video_decoder_impl.cc).
+// NOTE: These values are histogrammed over time in UMA so the values must

[ddorwin, 2016/02/26 18:54:17]

Since this note is so important, I would put it first and maybe offset it
somehow

+// never ever change (add new values to tools/metrics/histograms/histograms.xml)
 enum VideoCodecProfile {
   // Keep the values in this enum unique, as they imply format (h.264 vs. VP8,
   // for example), and keep the values for a particular format grouped
   // together for clarity.
   VIDEO_CODEC_PROFILE_UNKNOWN = -1,
   VIDEO_CODEC_PROFILE_MIN = VIDEO_CODEC_PROFILE_UNKNOWN,
   H264PROFILE_MIN = 0,
   H264PROFILE_BASELINE = H264PROFILE_MIN,
   H264PROFILE_MAIN = 1,
   H264PROFILE_EXTENDED = 2,
   H264PROFILE_HIGH = 3,
   H264PROFILE_HIGH10PROFILE = 4,
   H264PROFILE_HIGH422PROFILE = 5,
   H264PROFILE_HIGH444PREDICTIVEPROFILE = 6,
   H264PROFILE_SCALABLEBASELINE = 7,
   H264PROFILE_SCALABLEHIGH = 8,
   H264PROFILE_STEREOHIGH = 9,
   H264PROFILE_MULTIVIEWHIGH = 10,
   H264PROFILE_MAX = H264PROFILE_MULTIVIEWHIGH,
   VP8PROFILE_MIN = 11,
   VP8PROFILE_ANY = VP8PROFILE_MIN,
   VP8PROFILE_MAX = VP8PROFILE_ANY,
   VP9PROFILE_MIN = 12,
   VP9PROFILE_ANY = VP9PROFILE_MIN,

[ddorwin, 2016/02/26 18:54:17]

Should we reserve 3 or 4 values for VP9 profiles?

[servolk, 2016/02/26 19:50:19]

Yeah, I think we probably should. According to wikipedia vp9 has 4 profiles
(although there's a full byte for encoding profile value in the bitstream, so at
least in theory there could be more added later, but I hope VP9 is pretty stable
now and not gonna change much anymore, new development is gonna happen in VP10).

[servolk, 2016/02/26 22:24:26]

Done.

   VP9PROFILE_MAX = VP9PROFILE_ANY,
-  VIDEO_CODEC_PROFILE_MAX = VP9PROFILE_MAX,
+  HEVCPROFILE_MIN = 13,
+  HEVCPROFILE_MAIN = HEVCPROFILE_MIN,
+  HEVCPROFILE_MAIN10 = 14,
+  HEVCPROFILE_MAIN_STILL_PICTURE = 15,

[ddorwin, 2016/02/26 18:54:17]

If you plan to add other HEVC profiles, should we reserve some space?

[servolk, 2016/02/26 19:50:19]

Currently (and I don't expect that to change for a while) HEVC is the last codec
anyway, so we don't need to reserve any space, although we could, I guess.

+  HEVCPROFILE_MAX = HEVCPROFILE_MAIN_STILL_PICTURE,
+  VIDEO_CODEC_PROFILE_MAX = HEVCPROFILE_MAX,
 };
 
 std::string MEDIA_EXPORT GetCodecName(VideoCodec codec);
 std::string MEDIA_EXPORT GetProfileName(VideoCodecProfile profile);
 
 // Handle parsing AVC/H.264 codec ids as outlined in RFC 6381 and ISO-14496-10.
 MEDIA_EXPORT bool ParseAVCCodecId(const std::string& codec_id,
                                   VideoCodecProfile* profile,
                                   uint8_t* level_idc);
 
+#if BUILDFLAG(ENABLE_HEVC_DEMUXING)
+MEDIA_EXPORT bool ParseHEVCCodecId(const std::string& codec_id,
+                                   VideoCodecProfile* profile,
+                                   uint8_t* level_idc);
+#endif
+
 }  // namespace media
 
 #endif  // MEDIA_BASE_VIDEO_CODECS_H_