[*] move video-encoder to a new crate

Author: heng30

Cargo.lock

@@ -130,6 +130,7 @@ pmacro = { path = "lib/pmacro" }
 bytesio = { path = "lib/bytesio" }
 recorder = { path = "lib/recorder" }
 mp4-player = { path = "lib/mp4-player" }
+video-encoder = { path = "lib/video-encoder" }
 screen-capture = { path = "lib/screen-capture" }
 screen-capture-windows = { path = "lib/screen-capture-windows" }
 screen-capture-wayland-wlr = { path = "lib/screen-capture-wayland-wlr" }

Cargo.toml

@@ -10,7 +10,6 @@ homepage.workspace = true
 repository.workspace = true
 description.workspace = true
 
-
 [dependencies]
 log.workspace = true
 mp4.workspace = true
@@ -20,14 +19,15 @@ fdk-aac.workspace = true
 thiserror.workspace = true
 crossbeam.workspace = true
 derive_builder.workspace = true
+video-encoder.workspace = true
 
 [dev-dependencies]
 rand.workspace = true
 image.workspace = true
 env_logger.workspace = true
 
 [target.'cfg(target_os = "linux")'.dev-dependencies]
-recorder = { workspace = true, features = ["wayland-wlr"] }
+video-encoder = { workspace = true, features = ["x264"] }
 
 [target.'cfg(target_os = "windows")'.dev-dependencies]
-recorder = { workspace = true, features = ["windows"] }
+video-encoder = { workspace = true, features = ["ffmpeg"] }

lib/mp4m/Cargo.toml

@@ -3,17 +3,17 @@ use image::{ImageBuffer, Rgb};
 use mp4m::mp4_processor::{
     AudioConfig, Mp4Processor, Mp4ProcessorConfigBuilder, VideoConfig, VideoFrameType,
 };
-use recorder::{self, EncodedFrame, FPS, VideoEncoderConfig};
 use std::{path::PathBuf, thread, time::Duration};
+use video_encoder::{EncodedFrame, VideoEncoderConfig};
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     env_logger::init();
 
     let audio_file = "data/speaker.wav";
     let output_file = "data/tmp/output.mp4";
     let (width, height) = (1920, 1080);
-    let (fps, duration_seconds) = (FPS::Fps25, 10);
-    let total_frames = fps.to_u32() * duration_seconds;
+    let (fps, duration_seconds) = (25, 10);
+    let total_frames = fps * duration_seconds;
 
     // Create red, green, blue images (RGB format)
     let red_frame = create_color_frame(width, height, 255, 0, 0);
@@ -43,11 +43,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     // Create video config
     let config = Mp4ProcessorConfigBuilder::default()
         .save_path(PathBuf::from(output_file))
-        .video_config(VideoConfig {
-            width,
-            height,
-            fps: fps.to_u32(),
-        })
+        .video_config(VideoConfig { width, height, fps })
         .build()?;
 
     let mut processor = Mp4Processor::new(config);
@@ -99,7 +95,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     }
 
     let config = VideoEncoderConfig::new(width, height).with_fps(fps);
-    let mut h264_encoder = recorder::video_encoder_new(config)?;
+    let mut h264_encoder = video_encoder::new(config)?;
     let headers_data = h264_encoder.headers()?;
 
     let processor_thread = thread::spawn(move || {
@@ -109,7 +105,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     });
 
     for frame_num in 0..total_frames {
-        let img = match (frame_num / fps.to_u32()) % 3 {
+        let img = match (frame_num / fps) % 3 {
             0 => &red_frame,
             1 => &green_frame,
             2 => &blue_frame,

lib/mp4m/examples/mp4_processor_demo.rs

@@ -3,8 +3,8 @@ use image::{ImageBuffer, Rgb};
 use mp4m::mp4_processor::{
     AudioConfig, Mp4Processor, Mp4ProcessorConfigBuilder, VideoConfig, VideoFrameType,
 };
-use recorder::{EncodedFrame, FPS, VideoEncoderConfig};
 use std::{path::PathBuf, thread, time::Duration};
+use video_encoder::{EncodedFrame, VideoEncoderConfig};
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     env_logger::init();
@@ -13,8 +13,8 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     let audio_file2 = "data/input.wav";
     let output_file = "data/tmp/output.mp4";
     let (width, height) = (1920, 1080);
-    let (fps, duration_seconds) = (FPS::Fps25, 10);
-    let total_frames = fps.to_u32() * duration_seconds;
+    let (fps, duration_seconds) = (25, 10);
+    let total_frames = fps * duration_seconds;
 
     // Create red, green, blue images (RGB format)
     let red_frame = create_color_frame(width, height, 255, 0, 0);
@@ -63,11 +63,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     // Create video config
     let config = Mp4ProcessorConfigBuilder::default()
         .save_path(PathBuf::from(output_file))
-        .video_config(VideoConfig {
-            width,
-            height,
-            fps: fps.to_u32(),
-        })
+        .video_config(VideoConfig { width, height, fps })
         .build()?;
 
     let mut processor = Mp4Processor::new(config);
@@ -178,14 +174,14 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     // Generate and send video frames
     let config = VideoEncoderConfig::new(width, height).with_fps(fps);
-    let mut h264_encoder = recorder::video_encoder_new(config)?;
+    let mut h264_encoder = video_encoder::new(config)?;
     let headers_data = h264_encoder.headers()?;
     if let Err(e) = video_sender.send(VideoFrameType::Frame(headers_data)) {
         panic!("video sender h264 header failed: {e}");
     }
 
     for frame_num in 0..total_frames {
-        let img = match (frame_num / fps.to_u32()) % 3 {
+        let img = match (frame_num / fps) % 3 {
             0 => &red_frame,
             1 => &green_frame,
             2 => &blue_frame,

lib/mp4m/examples/mp4_processor_two_audios_demo.rs

@@ -6,8 +6,7 @@ pub use audio_processor::{
     AudioProcessor, AudioProcessorConfigBuilder, OutputDestination, sample_rate,
 };
 pub use mp4_processor::{
-    AudioConfig, Mp4Processor, Mp4ProcessorConfigBuilder, VIDEO_TIMESCALE, VideoConfig,
-    VideoFrameType,
+    AudioConfig, Mp4Processor, Mp4ProcessorConfigBuilder, VideoConfig, VideoFrameType,
 };
 pub use sample_type::{I24, SampleType};
 

lib/mp4m/src/lib.rs

@@ -8,8 +8,8 @@ use mp4::{
 };
 use std::{fs::File, io::BufWriter, path::PathBuf};
 use thiserror::Error;
+use video_encoder::VIDEO_TIMESCALE;
 
-pub const VIDEO_TIMESCALE: u32 = 90000; // Standard video timescale (90kHz) for better compatibility
 const DEFAULT_PPS: [u8; 6] = [0x68, 0xeb, 0xe3, 0xcb, 0x22, 0xc0];
 const DEFAULT_SPS: [u8; 25] = [
     0x67, 0x64, 0x00, 0x1e, 0xac, 0xd9, 0x40, 0xa0, 0x2f, 0xf9, 0x70, 0x11, 0x00, 0x00, 0x03, 0x03,

lib/mp4m/src/mp4_processor.rs

@@ -22,15 +22,12 @@ thiserror.workspace = true
 once_cell.workspace = true
 spin_sleep.workspace = true
 nnnoiseless.workspace = true
+video-encoder.workspace = true
 derive_setters.workspace = true
 screen-capture.workspace = true
-openh264 = { workspace = true, optional = true }
-yuv = { workspace = true, features = ["rayon"] }
-ffmpeg-next = { workspace = true, optional = true }
 fast_image_resize = { workspace = true, features = ["rayon"] }
 
 [target.'cfg(target_os = "linux")'.dependencies]
-x264 = { workspace = true, optional = true }
 pipewire.workspace = true
 screen-capture-wayland-wlr = { workspace = true, optional = true }
 screen-capture-wayland-portal = { workspace = true, optional = true }
@@ -64,14 +61,10 @@ env_logger.workspace = true
 
 [features]
 default = []
-windows = ["ffmpeg-video-encoder"]
-wayland-wlr = ["dep:screen-capture-wayland-wlr", "x264-video-encoder"]
-wayland-portal = ["dep:screen-capture-wayland-portal", "x264-video-encoder"]
+windows = ["video-encoder/ffmpeg"]
+wayland-wlr = ["dep:screen-capture-wayland-wlr", "video-encoder/x264"]
+wayland-portal = ["dep:screen-capture-wayland-portal", "video-encoder/x264"]
 
 # For debug on Linux
-# wayland-wlr = ["dep:screen-capture-wayland-wlr", "ffmpeg-video-encoder"]
-# wayland-wlr = ["dep:screen-capture-wayland-wlr", "openh264-video-encoder"]
-
-x264-video-encoder = ["dep:x264"]
-openh264-video-encoder = ["dep:openh264"]
-ffmpeg-video-encoder = ["dep:ffmpeg-next"]
+# wayland-wlr = ["dep:screen-capture-wayland-wlr", "video-encoder/ffmpeg"]
+# wayland-wlr = ["dep:screen-capture-wayland-wlr", "video-encoder/openh264"]

lib/recorder/Cargo.toml

@@ -12,7 +12,7 @@ pub enum RecorderError {
     ImageProcessingFailed(String),
 
     #[error("Video encoding failed: {0}")]
-    VideoEncodingFailed(String),
+    VideoEncodingFailed(#[from] video_encoder::EncoderError),
 
     #[error("Video decoding failed: {0}")]
     VideoDecodingFailed(String),

lib/recorder/src/error.rs

@@ -7,7 +7,6 @@ mod error;
 mod recorder;
 mod resolution;
 mod speaker_recorder;
-mod video_encoder;
 
 pub use audio_level::*;
 pub use audio_recorder::{AudioDeviceInfo, AudioRecorder, AudioRecorderError};