Refactor and enhance FFmpeg integration with tests and features

Cargo.toml

@@ -2,7 +2,6 @@
 name = "rsmedia"
 version = "0.1.0"
 edition = "2021"
-build = "build.rs"
 readme = "README.md"
 license = "MIT OR Apache-2.0"
 description = "High-level video toolkit based on ffmpeg."
@@ -18,20 +17,20 @@ ffmpeg6 = ["rsmpeg/ffmpeg6"]
 ffmpeg7 = ["rsmpeg/ffmpeg7_1"]
 ffmpeg8 = ["rsmpeg/ffmpeg8"]
 ## unxi linking ffmpeg with pkg-config.
-link_system_ffmpeg = ["rsmpeg/link_system_ffmpeg", "pkg-config"]
+link_system_ffmpeg = ["rsmpeg/link_system_ffmpeg"]
 ## windows linking ffmpeg with vcpkg.
-link_vcpkg_ffmpeg = ["rsmpeg/link_vcpkg_ffmpeg", "vcpkg"]
+link_vcpkg_ffmpeg = ["rsmpeg/link_vcpkg_ffmpeg"]
 
 [dependencies]
-pix = "0.14"
+pix = "1.0"
 rgb = "0.8"
-yuv = { version = "0.8", features = ["rayon", "professional_mode"] }
 color = "0.3"
+yuv = { version = "0.8", features = ["rayon", "professional_mode"] }
 colorous = "1.0"
-colorutils-rs = "0.7"
+colorutils-rs = "0.8"
 palette = "0.7"
 image = "0.25"
-imageproc = "0.26"
+imageproc = "0.27"
 num-traits = "0.2"
 anyhow = "1.0"
 log = "0.4"
@@ -43,34 +42,32 @@ dashmap = "6.1"
 once_cell = "1.21"
 num_cpus = "1.17"
 ndarray = { version = "0.17", optional = true }
-rsmpeg = { git = "https://github.com/larksuite/rsmpeg", default-features = false }
+# use custom rsmpeg
+rsmpeg = { git = "https://gitee.com/phial3/rsmpeg", branch = "dev", default-features = false }
 
 [dev-dependencies]
 libc = "0.2"
 camino = "1.2"
 chrono = "0.4"
-ringbuf = "0.4"
-ctor = "0.6"
+ringbuf = "0.5"
+ctor = "1.0"
+dtor = "1.0"
 tracing-subscriber = { version = "0.3", features = ["fmt", "env-filter", "chrono"] }
 ab_glyph = "0.2"
-libblur = "0.23"
+libblur = "0.24"
 pic-scale = "0.7"
 fast_image_resize = "6.0"
 histogram_equalization = "0.2"
 ## security & async
 futures = "0.3"
 tokio = { version = "1", features = ["full"] }
 ## sound & audio
-cpal = "0.17"
+cpal = "0.18"
 wavers = "1.5"
-rubato = "1.0"
+rubato = "4.0"
 dasp = { version = "0.11", features = ["all"] }
 rodio = { version = "0.22", features = ["symphonia-all", "tracing"] }
 
-[build-dependencies]
-vcpkg = { version = "0.2", optional = true }
-pkg-config = { version = "0.3", optional = true }
-
 [package.metadata.docs.rs]
 all-features = true
 
@@ -83,3 +80,37 @@ required-features = ["ndarray"]
 name = "encoding"
 path = "examples/encoding.rs"
 required-features = ["ndarray"]
+
+[[example]]
+name = "decode_raw"
+path = "examples/decode_raw.rs"
+
+[[example]]
+name = "audio"
+path = "examples/audio.rs"
+required-features = ["ndarray"]
+
+[[example]]
+name = "seek"
+path = "examples/seek.rs"
+required-features = ["ndarray"]
+
+[[example]]
+name = "metadata"
+path = "examples/metadata.rs"
+required-features = ["ndarray"]
+
+[[example]]
+name = "filter_demo"
+path = "examples/filter_demo.rs"
+required-features = ["ndarray"]
+
+[[example]]
+name = "color_professional"
+path = "examples/color_professional.rs"
+required-features = ["ndarray"]
+
+[[example]]
+name = "quick_write"
+path = "examples/quick_write.rs"
+required-features = ["ndarray"]

README.md

@@ -166,7 +166,7 @@ export FFMPEG_DLL_PATH=$FFMPEG_DIR/lib/libffmpeg.dll
 fn main() {
   rsmedia::init().unwrap();
 
-  let input_path = Path::new("/tmp/bear.mp4");
+  let input_path = Path::new("/tmp/test.mp4");
   let mut demuxer = Demuxer::new(input_path).unwrap();
 
   // demux and mux all streams frame
@@ -202,7 +202,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
     let mut decoder = DecoderBuilder::new(MediaType::VIDEO)
           // decoder with CUDA acceleration
           // .with_hardware_device(Some(HWDeviceType::CUDA.auto_best_config().unwrap()))
-          // .with_codec_name(Some("h264_cuvid".to_string()))
+          // .with_codec_name("h264_cuvid".to_string())
           .build_wrapped(source)
           .context("failed to create decoder")?;
 
@@ -211,7 +211,12 @@ async fn main() -> Result<(), Box<dyn Error>> {
       Ok(Some(yuv_frame)) => {
         println!(
           "decoded frame pts: {}, type: {:?}, format:{:?}",
-          yuv_frame.pts, yuv_frame.media_type, yuv_frame.format
+          yuv_frame.pts,
+          yuv_frame.media_type,
+          yuv_frame
+            .video_format()
+            .map(|f| f.get_pix_fmt_name())
+            .unwrap_or_else(|| "n/a".to_string())
         );
 
         // processing frame here...
@@ -243,9 +248,9 @@ fn main() -> Result<(), Box<dyn Error>> {
           // encoder with CUDA acceleration
           // .with_hardware_device(Some(HWDeviceType::CUDA.auto_best_config().unwrap()))
           // libx264, libx265, h264_nvenc, h264_vaapi
-          // .with_codec_name(Some("h264_nvenc".to_string()))
-          // .with_options(Some(Options::preset_h264_nvenc()))
-          .with_filters(Some(filters))
+          // .with_codec_name("h264_nvenc".to_string())
+          // .with_options(Options::preset_h264_nvenc())
+          .with_filters(filters)
           .build_wrapped(output_path)
           .expect("failed to create encoder");