H.264 packetization mode 0 (try 3)

webrtc/modules/include/module_common_types.h

Index: webrtc/modules/include/module_common_types.h
diff --git a/webrtc/modules/include/module_common_types.h b/webrtc/modules/include/module_common_types.h
index a5ea5c8e2d7da8327573eb74b1795087dd8f0085..7ef0d70a822666dcf43d8367cc956022730c15e5 100644
--- a/webrtc/modules/include/module_common_types.h
+++ b/webrtc/modules/include/module_common_types.h
@@ -260,6 +260,14 @@ enum H264PacketizationTypes {
                     // that was too large to fit into a single packet.
 };
 
+// Due to the structure containing this being initialized with zeroes
+// in some places, and mode 1 being default, mode 1 needs to have the value
+// zero. https://crbug.com/webrtc/6803
+enum H264PacketizationMode {
+  kH264PacketizationMode1 = 0,  // Non-interleaved - STAP-A, FU-A is allowed
+  kH264PacketizationMode0       // Only single NALU allowed

[sprang_webrtc, 2016/12/01 16:58:57]

nit: Drop H264Packetization from the names of the actual values and define the
type of the enum. Personally I'd even prefer an enum class, but up to you.
Is there a more descriptive name than "mode 1" btw? If not, maybe name it
kModeOne, just so it doesn't look like kModel.

[hta-webrtc, 2016/12/01 18:26:27]

Heh. They're called "Single NAL Unit Mode" (0) and "Non-Interleaved Mode" (1).
I'll use those names.

+};
+
 struct NaluInfo {
   uint8_t type;
   int sps_id;
@@ -273,14 +281,19 @@ struct NaluInfo {
 const size_t kMaxNalusPerPacket = 10;
 
 struct RTPVideoHeaderH264 {
-  uint8_t nalu_type;  // The NAL unit type. If this is a header for a
-                      // fragmented packet, it's the NAL unit type of
-                      // the original data. If this is the header for an
-                      // aggregated packet, it's the NAL unit type of
-                      // the first NAL unit in the packet.
+  // The NAL unit type. If this is a header for a
+  // fragmented packet, it's the NAL unit type of
+  // the original data. If this is the header for an
+  // aggregated packet, it's the NAL unit type of
+  // the first NAL unit in the packet.
+  uint8_t nalu_type;
+  // The packetization type of this buffer - single, aggregated or fragmented.
   H264PacketizationTypes packetization_type;
   NaluInfo nalus[kMaxNalusPerPacket];
   size_t nalus_length;
+  // The packetization mode of this transport. Packetization mode
+  // determines which packetization types are allowed when packetizing.
+  H264PacketizationMode packetization_mode;
 };
 
 union RTPVideoTypeHeader {