Add functionality for parsing H264 profile-level-id

webrtc/common_types.h

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #ifndef WEBRTC_COMMON_TYPES_H_
 #define WEBRTC_COMMON_TYPES_H_
 
 #include <assert.h>
 #include <stddef.h>
 #include <string.h>
 
 #include <string>
 #include <vector>
 
+#include "webrtc/base/optional.h"
 #include "webrtc/common_video/rotation.h"
 #include "webrtc/typedefs.h"
 
 #if defined(_MSC_VER)
 // Disable "new behavior: elements of array will be default initialized"
 // warning. Affects OverUseDetectorOptions.
 #pragma warning(disable : 4351)
 #endif
 
 #if defined(WEBRTC_EXPORT)
@@ skipping 460 matching lines @@
 enum { kMaxSpatialLayers = 5 };
 enum { kMaxTemporalStreams = 4 };
 
 enum VideoCodecComplexity {
   kComplexityNormal = 0,
   kComplexityHigh = 1,
   kComplexityHigher = 2,
   kComplexityMax = 3
 };
 
-enum VideoCodecProfile { kProfileBase = 0x00, kProfileMain = 0x01 };
+enum H264Profile {

[hta-webrtc, 2016/10/28 09:55:23]

Query: Is it really necessary to pollute webrtc/common_types.h (probably the
most included file in the whole webrtc stack) with this degree of H.264
specifics?

In the interest of preparing for runtime-injectable codecs, I'd like to put
codec-specific definitions as close to the codec-specific includes as possible -
the fact that we're sinning dramatically against this in the present files is no
excuse for continuing the practice.

[magjed_webrtc, 2016/10/28 14:59:27]

Good point. I moved everything to webrtc/common_video/h264 instead. We don't
need to store the H264 profile as a setting in
VideoCodecH264/VideoCodecUnion/webrtc::VideoCodec at all. The plan is to
negotiate the profile in cricket::VideoCodec that is now passed as argument to
WebRtcVideoEncoderFactory::CreateVideoEncoder(), so it shouldn't be necessary to
also send the profile as argument in webrtc::VideoCodec in
VideoEncoder::InitEncode(const webrtc::VideoCodec* codec_settings).

+  kProfileConstrainedBaseline,
+  kProfileBaseline,
+  kProfileMain,
+  kProfileConstrainedHigh,
+  kProfileHigh,
+};
+
+// All values are equal to ten times the level number, except level 1b which is
+// special.
+enum H264Level {
+  kH264Level1_b = 0,
+  kH264Level1 = 10,
+  kH264Level1_1 = 11,
+  kH264Level1_2 = 12,
+  kH264Level1_3 = 13,
+  kH264Level2 = 20,
+  kH264Level2_1 = 21,
+  kH264Level2_2 = 22,
+  kH264Level3 = 30,
+  kH264Level3_1 = 31,
+  kH264Level3_2 = 32,
+  kH264Level4 = 40,
+  kH264Level4_1 = 41,
+  kH264Level4_2 = 42,
+  kH264Level5 = 50,
+  kH264Level5_1 = 51,
+  kH264Level5_2 = 52
+};
+
+struct H264ProfileLevelId {
+  H264Profile profile;
+  H264Level level;
+};
+
+// Parse H264 profile level id that is represented as a string of 3 hex bytes.
+// Nothing will be returned if the string is not a recognized H264
+// profile level id.
+rtc::Optional<H264ProfileLevelId> ParseH264ProfileLevelId(const char* str);
 
 enum VP8ResilienceMode {
   kResilienceOff,    // The stream produced by the encoder requires a
                      // recovery frame (typically a key frame) to be
                      // decodable after a packet loss.
   kResilientStream,  // A stream produced by the encoder is resilient to
                      // packet losses, but packets within a frame subsequent
                      // to a loss can't be decoded.
   kResilientFrames   // Same as kResilientStream but with added resilience
                      // within a frame.
@@ skipping 24 matching lines @@
   bool frameDroppingOn;
   int keyFrameInterval;
   bool adaptiveQpMode;
   bool automaticResizeOn;
   unsigned char numberOfSpatialLayers;
   bool flexibleMode;
 };
 
 // H264 specific.
 struct VideoCodecH264 {
-  VideoCodecProfile profile;
+  H264ProfileLevelId profileLevelId;
   bool frameDroppingOn;
   int keyFrameInterval;
   // These are NULL/0 if not externally negotiated.
   const uint8_t* spsData;
   size_t spsLen;
   const uint8_t* ppsData;
   size_t ppsLen;
 };
 
 // Video codec types
@@ skipping 283 matching lines @@
 enum class RtcpMode { kOff, kCompound, kReducedSize };
 
 enum NetworkState {
   kNetworkUp,
   kNetworkDown,
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_COMMON_TYPES_H_