Merge pull request #6 from phial3/develop

optimize `Parameters::from(&encoder)`
phial3 · Feb 10, 2025 · 8032cfd · 8032cfd
2 parents d5258f0 + 2a4e48e
commit 8032cfd
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 12 deletions.
diff --git a/examples/transcode-audio.rs b/examples/transcode-audio.rs
@@ -3,6 +3,7 @@ extern crate ffmpeg_the_third as ffmpeg;
 use std::env;
 use std::path::Path;
 
+use ffmpeg::codec::Parameters;
 use ffmpeg::{codec, filter, format, frame, media};
 use ffmpeg::{rescale, Rescale};
 
@@ -135,7 +136,7 @@ fn transcoder<P: AsRef<Path> + ?Sized>(
     output.set_time_base((1, decoder.rate() as i32));
 
     let encoder = encoder.open_as(codec)?;
-    output.set_parameters_into(&encoder);
+    output.set_parameters(Parameters::from(&encoder));
 
     let filter = filter(filter_spec, &decoder, &encoder)?;
 

diff --git a/examples/transcode-x264.rs b/examples/transcode-x264.rs
@@ -21,6 +21,7 @@ use std::collections::HashMap;
 use std::env;
 use std::time::Instant;
 
+use ffmpeg::codec::Parameters;
 use ffmpeg::{
     codec, decoder, encoder, format, frame, log, media, picture, Dictionary, Packet, Rational,
 };
@@ -58,7 +59,7 @@ impl Transcoder {
         let mut encoder = codec::context::Context::new_with_codec(codec.unwrap())
             .encoder()
             .video()?;
-        ost.set_parameters_into(&encoder);
+        ost.set_parameters(Parameters::from(&encoder));
         encoder.set_height(decoder.height());
         encoder.set_width(decoder.width());
         encoder.set_aspect_ratio(decoder.aspect_ratio());
@@ -73,7 +74,7 @@ impl Transcoder {
         let opened_encoder = encoder
             .open_with(x264_opts)
             .expect("error opening x264 with supplied settings");
-        ost.set_parameters_into(&opened_encoder);
+        ost.set_parameters(Parameters::from(&opened_encoder));
         Ok(Self {
             ost_index,
             decoder,

diff --git a/examples/video-resize.rs b/examples/video-resize.rs
@@ -1,5 +1,6 @@
 extern crate ffmpeg_the_third as ffmpeg;
 
+use ffmpeg::codec::Parameters;
 use ffmpeg::{codec, format, frame, media, picture, software};
 use std::env;
 
@@ -54,7 +55,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     // 创建输出流
     let mut output_stream = output_context.add_stream(codec)?;
-    output_stream.set_parameters_into(&encoder);
+    output_stream.set_parameters(Parameters::from(&encoder));
     output_context.write_header()?;
 
     // 创建缩放器

diff --git a/src/format/stream/stream_mut.rs b/src/format/stream/stream_mut.rs
@@ -61,14 +61,6 @@ impl<'a> StreamMut<'a> {
         }
     }
 
-    pub fn set_parameters_into<P: Into<codec::Parameters>>(&mut self, parameters: P) {
-        let parameters = parameters.into();
-
-        unsafe {
-            avcodec_parameters_copy((*self.as_mut_ptr()).codecpar, parameters.as_ptr());
-        }
-    }
-
     pub fn copy_parameters_from_context(&mut self, ctx: &codec::Context) {
         unsafe {
             avcodec_parameters_from_context((*self.as_mut_ptr()).codecpar, ctx.as_ptr());