diff --git a/src/lib.rs b/src/lib.rs index f9183fbd871e72f95cf75daa260dcfc12bfa0f76..54d8b905725d7a53185766bc3562a27bca16a900 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,7 +1,6 @@ #![allow(dead_code)] pub mod spritesheet; -pub mod stream_metadata; use std::path::Path; @@ -62,14 +61,6 @@ pub fn extract( local_codec.name()? ); - let mut metadata = stream_metadata::StreamMetadata::new( - avformat_context - .input_format()? - .determine_mime(local_codec.name()?)?, - duration, - codec_parameters.bit_rate() / 1000, - ); - let mut output_frame = AVFrame::new().map_err(|error| format_err!("Could not create output frame: {}", error))?; @@ -110,7 +101,6 @@ pub fn extract( if !spritesheet_manager.initialized() { spritesheet_manager .initialize(frame.width() as u32, frame.height() as u32); - metadata.set_frame_size(frame.width(), frame.height()); output_frame .init( spritesheet_manager.sprite_width() as i32, @@ -147,9 +137,5 @@ pub fn extract( spritesheet_manager.save()?; } - metadata - .save(output_folder.join("media.json")) - .map_err(|error| format_err!("Could not write stream metadata: {}", error))?; - Ok(()) } diff --git a/src/stream_metadata.rs b/src/stream_metadata.rs deleted file mode 100644 index b4fdc88d275e3730862e169a4eecfd48c7c888f0..0000000000000000000000000000000000000000 --- a/src/stream_metadata.rs +++ /dev/null @@ -1,41 +0,0 @@ -use std::fs::File; -use std::io::BufWriter; -use std::path::Path; - -use serde::{Deserialize, Serialize}; - -use media_time::MediaTime; - -#[derive(Serialize, Deserialize)] -pub struct StreamMetadata { - content_type: String, - duration: i64, - bitrate: i64, - aspect_ratio: f32, - width: i32, - height: i32, -} - -impl StreamMetadata { - pub fn new(content_type: impl AsRef<str>, duration: MediaTime, bitrate: i64) -> StreamMetadata { - StreamMetadata { - content_type: String::from(content_type.as_ref()), - duration: duration.seconds(), - bitrate, - aspect_ratio: 0.0, - width: 0, - height: 0, - } - } - - pub fn set_frame_size(&mut self, width: i32, height: i32) { - self.width = width; - self.height = height; - self.aspect_ratio = (width as f64 / height as f64) as f32; - } - - pub fn save(&self, path: impl AsRef<Path>) -> Result<(), std::io::Error> { - serde_json::to_writer(BufWriter::new(File::create(path)?), self)?; - Ok(()) - } -}