H.264 packetization mode 0 (try 2)

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.
  */
 
@@ skipping 524 matching lines @@
   bool denoisingOn;
   bool frameDroppingOn;
   int keyFrameInterval;
   bool adaptiveQpMode;
   bool automaticResizeOn;
   unsigned char numberOfSpatialLayers;
   bool flexibleMode;
 };
 
 // H264 specific.
+enum H264PacketizationMode {
+  // Because VideoCodecH264 was initialized in multiple places using memset,
+  // we let 0 have the meaning of "not set".
+  kH264PacketizationModeNotSet = 0,
+  kH264PacketizationMode0,  // Only single NALU allowed
+  kH264PacketizationMode1   // Non-interleaved - STAP-A, FU-A is allowed
+};
+
 struct VideoCodecH264 {
   VideoCodecProfile profile;
   bool frameDroppingOn;
   int keyFrameInterval;
+  H264PacketizationMode packetization_mode;
   // 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
 enum VideoCodecType {
   kVideoCodecVP8,
@@ skipping 281 matching lines @@
 enum class RtcpMode { kOff, kCompound, kReducedSize };
 
 enum NetworkState {
   kNetworkUp,
   kNetworkDown,
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_COMMON_TYPES_H_