implemented correct codec and pixel_format for decoded streams

Author: bwsw

Cargo.toml

@@ -7,7 +7,7 @@ repository = "https://github.com/insight-platform/FFmpeg-Input"
 readme = "README.md"
 keywords = ["FFmpeg", "Video"]
 categories = ["computer-vision"]
-version = "0.1.5"
+version = "0.1.6"
 edition = "2021"
 license="Apache-2.0"
 rust-version = "1.62"

README.md

@@ -15,7 +15,15 @@ pip install ffmpeg-input
 ### Build In Docker (Manylinux_2_28)
 
 ```bash
+# certain python version (decreases build time)
+#
+docker build  -t ffmpeg_input -f docker/Dockerfile.manylinux_2_28_X64 --build-arg PYTHON_INTERPRETER=/opt/python/cp38-cp38/bin/python .
+# all manylinux versions
+#
 docker build -t ffmpeg_input -f docker/Dockerfile.manylinux_2_28_X64 .
+
+# copy wheels from docker
+#
 docker run --rm -it -v $(pwd)/distfiles:/tmp ffmpeg_input cp -R /opt/dist /tmp
 ```
 

src/lib.rs

@@ -18,7 +18,7 @@ use std::time::SystemTime;
 const DECODING_FORMAT: Pixel = Pixel::BGR24;
 const DECODED_PIX_BYTES: u32 = 3;
 
-fn is_stream_key_framed(id: ffmpeg::codec::Id) -> Result<bool, String> {
+fn is_stream_key_framed(id: Id) -> Result<bool, String> {
     let key_frames = match id {
         Id::H264
         | Id::H265
@@ -291,8 +291,17 @@ fn handle(
             };
 
             for (raw_frame, width, height) in raw_frames {
-                let codec = String::from(video_decoder.codec().unwrap().name());
-                let pixel_format = format!("{:?}", video_decoder.format());
+                let codec = if !decode {
+                    String::from(video_decoder.codec().unwrap().name())
+                } else {
+                    String::from(Id::RAWVIDEO.name())
+                };
+
+                let pixel_format = if !decode {
+                    format!("{:?}", video_decoder.format())
+                } else {
+                    format!("{:?}", DECODING_FORMAT)
+                };
 
                 let key_frame = p.is_key();
                 let pts = p.pts();

test_decode.py

@@ -19,7 +19,7 @@
             res = np.frombuffer(res, dtype=np.uint8)
             res = np.reshape(res, (p.frame_height, p.frame_width, 3))
             end = time.time()
-            print(p.queue_len, "all_time={}".format(int(end * 1000 - p.frame_received_ts)),
+            print(p.codec, p.pixel_format, p.queue_len, "all_time={}".format(int(end * 1000 - p.frame_received_ts)),
                   "python_time={}".format(int(end * 1000 - p.frame_processed_ts)))
             cv2.imshow('Image', res)
             if cv2.waitKey(1) & 0xFF == ord('q'):