Merge pull request #445 from nathansizemore/h264-reader-buffer-size

Adds configurable capacity to H264Reader.

Author: yngrtc

examples/examples/play-from-disk-h264/play-from-disk-h264.rs

@@ -172,7 +172,7 @@ async fn main() -> Result<()> {
             // Open a H264 file and start reading using our H264Reader
             let file = File::open(&video_file_name)?;
             let reader = BufReader::new(file);
-            let mut h264 = H264Reader::new(reader);
+            let mut h264 = H264Reader::new(reader, 1_048_576);
 
             // Wait for connection established
             notify_video.notified().await;

media/src/io/h264_reader/h264_reader_test.rs

@@ -4,7 +4,7 @@ use std::io::Cursor;
 #[test]
 fn test_data_does_not_start_with_h264header() -> Result<()> {
     let test_function = |input: &[u8]| {
-        let mut reader = H264Reader::new(Cursor::new(input));
+        let mut reader = H264Reader::new(Cursor::new(input), 1_048_576);
         if let Err(err) = reader.next_nal() {
             assert_eq!(err, Error::ErrDataIsNotH264Stream);
         } else {
@@ -24,7 +24,7 @@ fn test_data_does_not_start_with_h264header() -> Result<()> {
 #[test]
 fn test_parse_header() -> Result<()> {
     let h264bytes = &[0x0, 0x0, 0x1, 0xAB];
-    let mut reader = H264Reader::new(Cursor::new(h264bytes));
+    let mut reader = H264Reader::new(Cursor::new(h264bytes), 1_048_576);
 
     let nal = reader.next_nal()?;
 
@@ -40,7 +40,7 @@ fn test_parse_header() -> Result<()> {
 #[test]
 fn test_eof() -> Result<()> {
     let test_function = |input: &[u8]| {
-        let mut reader = H264Reader::new(Cursor::new(input));
+        let mut reader = H264Reader::new(Cursor::new(input), 1_048_576);
         if let Err(err) = reader.next_nal() {
             assert_eq!(Error::ErrIoEOF, err);
         } else {
@@ -62,7 +62,7 @@ fn test_skip_sei() -> Result<()> {
         0x0, 0x0, 0x0, 0x1, 0xAB,
     ];
 
-    let mut reader = H264Reader::new(Cursor::new(h264bytes));
+    let mut reader = H264Reader::new(Cursor::new(h264bytes), 1_048_576);
 
     let nal = reader.next_nal()?;
     assert_eq!(nal.data[0], 0xAA);
@@ -81,7 +81,7 @@ fn test_issue1734_next_nal() -> Result<()> {
     ];
 
     for test in tests {
-        let mut reader = H264Reader::new(Cursor::new(test));
+        let mut reader = H264Reader::new(Cursor::new(test), 1_048_576);
 
         // Just make sure it doesn't crash
         while reader.next_nal().is_ok() {
@@ -95,7 +95,7 @@ fn test_issue1734_next_nal() -> Result<()> {
 #[test]
 fn test_trailing01after_start_code() -> Result<()> {
     let test = vec![0x0, 0x0, 0x0, 0x1, 0x01, 0x0, 0x0, 0x0, 0x1, 0x01];
-    let mut r = H264Reader::new(Cursor::new(test));
+    let mut r = H264Reader::new(Cursor::new(test), 1_048_576);
 
     for _ in 0..=1 {
         let _nal = r.next_nal()?;

media/src/io/h264_reader/mod.rs

@@ -142,15 +142,15 @@ pub struct H264Reader<R: Read> {
 }
 
 impl<R: Read> H264Reader<R> {
-    /// new creates new H264Reader
-    pub fn new(reader: R) -> H264Reader<R> {
+    /// new creates new `H264Reader` with `capacity` sized read buffer.
+    pub fn new(reader: R, capacity: usize) -> H264Reader<R> {
         H264Reader {
             reader,
             nal_buffer: BytesMut::new(),
             count_of_consecutive_zero_bytes: 0,
             nal_prefix_parsed: false,
             read_buffer: vec![],
-            temp_buf: vec![0u8; 4096],
+            temp_buf: vec![0u8; capacity],
         }
     }