NalUnitIter

scottlamb · Nov 18, 2023 · 8a05e77 · 8a05e77
1 parent 7126ba0
commit 8a05e77
Show file tree

Hide file tree

Showing 2 changed files with 147 additions and 240 deletions.
diff --git a/src/codec/h264.rs b/src/codec/h264.rs
@@ -7,7 +7,7 @@ pub mod dts_extractor;
 
 use super::VideoFrame;
 use crate::{
-    codec::h264::dts_extractor::{DtsExtractor, Temp},
+    codec::h264::dts_extractor::{DtsExtractor, NalUnitIter},
     rtp::{ReceivedPacket, ReceivedPacketBuilder},
     Error, Timestamp, VideoTimestamp,
 };
@@ -47,7 +47,7 @@ pub(crate) struct Depacketizer {
 }
 
 #[derive(Debug)]
-pub(crate) struct Nal {
+struct Nal {
     hdr: h264_reader::nal::NalHeader,
 
     /// The length of `Depacketizer::pieces` as this NAL finishes.
@@ -517,8 +517,6 @@ impl Depacketizer {
             _ => false,
         };
 
-        let nalus = Temp::new(&self.nals, &self.pieces);
-
         let mut dts = au.timestamp.timestamp;
         if let Some(parameters) = &self.parameters {
             // Skip samples silently until we find one with an IDR.
@@ -530,7 +528,12 @@ impl Depacketizer {
             if let Some(dts_extractor) = &mut self.dts_extractor {
                 let pts = au.timestamp.timestamp();
                 dts = dts_extractor
-                    .extract(&parameters.sps, is_random_access_point, nalus, pts)
+                    .extract(
+                        &parameters.sps,
+                        is_random_access_point,
+                        NalUnitIter::new(&data),
+                        pts,
+                    )
                     .map_err(|e| e.to_string())?;
             };
         }