fixed bitstream filtering

Author: bwsw

src/lib.rs

@@ -270,25 +270,36 @@ fn process_bsf(
         debug!("Ingress packet count: {}", packets.len());
         let mut new_packets = Vec::new();
         for mut packet in packets.drain(..) {
+            debug!("Source packet size: {}", packet.size());
             unsafe {
                 if av_bsf_send_packet(filter.ptr, packet.as_mut_ptr()) < 0 {
                     error!("Unable to send packet to bitstream filter");
                 }
 
                 loop {
-                    let mut new_packet = Packet::new(packet.size() + 2048);
-                    let ret = av_bsf_receive_packet(filter.ptr, packet.as_mut_ptr());
-                    if ret < 0 {
+                    let mut new_packet = Packet::empty();
+                    let ret = av_bsf_receive_packet(filter.ptr, new_packet.as_mut_ptr());
+                    if ret == AVERROR(EAGAIN) {
+                        //debug!("Required extra packets");
+                        break;
+                    }
+                    if ret == AVERROR_EOF {
+                        error!("End of filter");
                         break;
                     }
-                    if ret == AVERROR(EAGAIN) || ret == AVERROR_EOF {
+                    if ret < 0 {
+                        error!("Unable to receive packet from bitstream filter: {}", ret);
                         break;
                     }
+                    debug!(
+                        "New packet size: {}",
+                        new_packet.data().as_ref().unwrap().len()
+                    );
                     new_packet.set_stream(packet.stream());
-                    new_packet.set_flags(packet.flags());
-                    new_packet.set_dts(packet.dts());
-                    new_packet.set_pts(packet.pts());
-                    new_packet.set_duration(packet.duration());
+                    //new_packet.set_flags(packet.flags());
+                    // new_packet.set_dts(packet.dts());
+                    // new_packet.set_pts(packet.pts());
+                    // new_packet.set_duration(packet.duration());
                     new_packets.push(new_packet.clone());
                 }
             }

test.py

@@ -12,8 +12,8 @@ def bytes_to_bits_binary(byte_data):
 
 if __name__ == '__main__':
     # set env LOGLEVEL=info
-    file = "/home/ivan/Downloads/1_underground_supercut_reencode_bug.mp4"
-    # file = "/home/ivan/Downloads/1_underground_supercut.mp4"
+    # file = "/dev/video0"
+    file = "/home/ivan/Downloads/1_underground_supercut.mp4"
     # file = "/home/ivan/Downloads/1_underground_supercut_reencode_bug_x265.mp4"
     # file = "/home/ivan/Downloads/1_underground_supercut_reencode_bug_aud.mp4"
     s = FFMpegSource(file, params=[],
@@ -25,6 +25,7 @@ def bytes_to_bits_binary(byte_data):
                                   BsfFilter("h265", "hevc_mp4toannexb")])
     s.log_level = FFmpegLogLevel.Info
     # counter = 0
+    f = open("output.h264", "wb")
     while True:
         try:
             p = s.video_frame()
@@ -35,6 +36,7 @@ def bytes_to_bits_binary(byte_data):
             print("Skipped frames because of queue overflow:", p.queue_full_skipped_count)
             # print("Is bytestream", p.is_byte_stream)
             payload = p.payload_as_bytes()
+            f.write(payload)
             print("Payload length:", len(payload))
             # print 1st 3 bytes of the payload
             # bin_res = " ".join(format(x, '#010b')[2:] for x in payload[:16])