Merge pull request #454 from oto313/feature/fix-calculation-rtp-heade…

…r-size Fix of rtp header size calculation
webrtc-rs · Jun 12, 2023 · 92d376b · 92d376b
2 parents f33c5f5 + 81c7b56
commit 92d376b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/media/src/io/ivf_writer/ivf_writer_test.rs b/media/src/io/ivf_writer/ivf_writer_test.rs
@@ -24,6 +24,7 @@ fn test_ivf_writer_add_packet_and_close() -> Result<()> {
             csrc: vec![],
             padding: false,
             extensions: vec![],
+            extensions_padding: 0,
         },
         payload: raw_valid_pkt.slice(20..),
     };
@@ -51,6 +52,7 @@ fn test_ivf_writer_add_packet_and_close() -> Result<()> {
             csrc: vec![],
             padding: raw_mid_part_pkt.len() % 4 != 0,
             extensions: vec![],
+            extensions_padding: 0,
         },
         payload: raw_mid_part_pkt.slice(20..),
     };
@@ -78,6 +80,7 @@ fn test_ivf_writer_add_packet_and_close() -> Result<()> {
             csrc: vec![],
             padding: raw_keyframe_pkt.len() % 4 != 0,
             extensions: vec![],
+            extensions_padding: 0,
         },
         payload: raw_keyframe_pkt.slice(20..),
     };

diff --git a/media/src/io/ogg_writer/ogg_writer_test.rs b/media/src/io/ogg_writer/ogg_writer_test.rs
@@ -23,6 +23,7 @@ fn test_ogg_writer_add_packet_and_close() -> Result<()> {
             csrc: vec![],
             padding: false,
             extensions: vec![],
+            extensions_padding: 0,
         },
         payload: raw_pkt.slice(20..),
     };

diff --git a/rtp/src/header.rs b/rtp/src/header.rs
@@ -47,6 +47,7 @@ pub struct Header {
     pub csrc: Vec<u32>,
     pub extension_profile: u16,
     pub extensions: Vec<Extension>,
+    pub extensions_padding: usize,
 }
 
 impl Unmarshal for Header {
@@ -97,7 +98,7 @@ impl Unmarshal for Header {
         for _ in 0..cc {
             csrc.push(raw_packet.get_u32());
         }
-
+        let mut extensions_padding: usize = 0;
         let (extension_profile, extensions) = if extension {
             let expected = curr_offset + 4;
             if raw_packet_len < expected {
@@ -123,6 +124,7 @@ impl Unmarshal for Header {
                         if b == 0x00 {
                             // padding
                             curr_offset += 1;
+                            extensions_padding += 1;
                             continue;
                         }
 
@@ -149,6 +151,7 @@ impl Unmarshal for Header {
                         if b == 0x00 {
                             // padding
                             curr_offset += 1;
+                            extensions_padding += 1;
                             continue;
                         }
 
@@ -194,6 +197,7 @@ impl Unmarshal for Header {
             csrc,
             extension_profile,
             extensions,
+            extensions_padding,
         })
     }
 }
@@ -203,7 +207,7 @@ impl MarshalSize for Header {
     fn marshal_size(&self) -> usize {
         let mut head_size = 12 + (self.csrc.len() * CSRC_LENGTH);
         if self.extension {
-            let extension_payload_len = self.get_extension_payload_len();
+            let extension_payload_len = self.get_extension_payload_len() + self.extensions_padding;
             let extension_payload_size = (extension_payload_len + 3) / 4;
             head_size += 4 + extension_payload_size * 4;
         }

diff --git a/rtp/src/packetizer/packetizer_test.rs b/rtp/src/packetizer/packetizer_test.rs
@@ -77,6 +77,7 @@ fn test_packetizer_abs_send_time() -> Result<()> {
                 id: 1,
                 payload: Bytes::from_static(&[0x40, 0, 0]),
             }],
+            extensions_padding: 0,
         },
         payload: Bytes::from_static(&[0x11, 0x12, 0x13, 0x14]),
     };
-Original file line number
+Diff line change
@@ Expand Up / @@ -77,6 +77,7 @@ fn test_packetizer_abs_send_time() -> Result<()> { @@
                     id: 1,
                     payload: Bytes::from_static(&[0x40, 0, 0]),
                 }],
+                extensions_padding: 0,
             },
             payload: Bytes::from_static(&[0x11, 0x12, 0x13, 0x14]),
         };
@@ Expand Down @@