diff --git a/examples/codec-info.rs b/examples/codec-info.rs index d388795..a34bf3f 100644 --- a/examples/codec-info.rs +++ b/examples/codec-info.rs @@ -20,11 +20,11 @@ fn main() { } if let Ok(video) = codec.video() { - if let Some(rates) = video.rates() { - println!("\t rates: {:?}", rates.collect::>()); + if let Some(rates) = video.frame_rates() { + println!("\t frame rates: {:?}", rates.collect::>()); } else { - println!("\t rates: any"); + println!("\t frame rates: any"); } if let Some(formats) = video.formats() { @@ -36,11 +36,11 @@ fn main() { } if let Ok(audio) = codec.audio() { - if let Some(rates) = audio.rates() { - println!("\t rates: {:?}", rates.collect::>()); + if let Some(rates) = audio.sample_rates() { + println!("\t sample rates: {:?}", rates.collect::>()); } else { - println!("\t rates: any"); + println!("\t sample rates: any"); } if let Some(formats) = audio.formats() { @@ -75,11 +75,11 @@ fn main() { } if let Ok(video) = codec.video() { - if let Some(rates) = video.rates() { - println!("\t rates: {:?}", rates.collect::>()); + if let Some(rates) = video.frame_rates() { + println!("\t frame rates: {:?}", rates.collect::>()); } else { - println!("\t rates: any"); + println!("\t frame rates: any"); } if let Some(formats) = video.formats() { @@ -91,11 +91,11 @@ fn main() { } if let Ok(audio) = codec.audio() { - if let Some(rates) = audio.rates() { - println!("\t rates: {:?}", rates.collect::>()); + if let Some(rates) = audio.sample_rates() { + println!("\t sample rates: {:?}", rates.collect::>()); } else { - println!("\t rates: any"); + println!("\t sample rates: any"); } if let Some(formats) = audio.formats() { diff --git a/examples/metadata.rs b/examples/metadata.rs index daa33f7..de3da4f 100644 --- a/examples/metadata.rs +++ b/examples/metadata.rs @@ -44,7 +44,7 @@ fn main() { println!("\tframes: {}", stream.frames()); println!("\tdisposition: {:?}", stream.disposition()); println!("\tdiscard: {:?}", stream.discard()); - println!("\trate: {}", stream.rate()); + println!("\tframe rate: {}", stream.frame_rate()); let codec = stream.codec(); println!("\tmedium: {:?}", codec.medium()); @@ -77,7 +77,7 @@ fn main() { println!("\tbit_rate: {}", audio.bit_rate()); println!("\tmax_rate: {}", audio.max_bit_rate()); println!("\tdelay: {}", audio.delay()); - println!("\taudio.rate: {}", audio.rate()); + println!("\taudio.sample_rate: {}", audio.sample_rate()); println!("\taudio.channels: {}", audio.channels()); println!("\taudio.format: {:?}", audio.format()); println!("\taudio.frames: {}", audio.frames()); diff --git a/examples/transcode-audio.rs b/examples/transcode-audio.rs index 36a9f56..a1bd3de 100644 --- a/examples/transcode-audio.rs +++ b/examples/transcode-audio.rs @@ -12,7 +12,7 @@ fn filter( let args = format!( "time_base={}:sample_rate={}:sample_fmt={}:channel_layout=0x{:x}", decoder.time_base(), - decoder.rate(), + decoder.sample_rate(), decoder.format().name(), decoder.channel_layout().bits() ); @@ -25,7 +25,7 @@ fn filter( out.set_sample_format(encoder.format()); out.set_channel_layout(encoder.channel_layout()); - out.set_sample_rate(encoder.rate()); + out.set_sample_rate(encoder.sample_rate()); } filter.output("in", 0)?.input("out", 0)?.parse(spec)?; @@ -89,7 +89,7 @@ fn transcoder>( encoder.set_flags(ffmpeg::codec::flag::Flags::GLOBAL_HEADER); } - encoder.set_rate(decoder.rate() as i32); + encoder.set_sample_rate(decoder.sample_rate() as i32); encoder.set_channel_layout(channel_layout); encoder.set_channels(channel_layout.channels()); encoder.set_format( @@ -102,8 +102,8 @@ fn transcoder>( encoder.set_bit_rate(decoder.bit_rate()); encoder.set_max_bit_rate(decoder.max_bit_rate()); - encoder.set_time_base((1, decoder.rate() as i32)); - output.set_time_base((1, decoder.rate() as i32)); + encoder.set_time_base((1, decoder.sample_rate() as i32)); + output.set_time_base((1, decoder.sample_rate() as i32)); let encoder = encoder.open_as(codec)?; output.set_parameters(&encoder); diff --git a/src/codec/audio.rs b/src/codec/audio.rs index 34a05d1..4661b5c 100644 --- a/src/codec/audio.rs +++ b/src/codec/audio.rs @@ -15,7 +15,7 @@ impl Audio { } impl Audio { - pub fn rates(&self) -> Option { + pub fn sample_rates(&self) -> Option { unsafe { if (*self.as_ptr()).supported_samplerates.is_null() { None diff --git a/src/codec/decoder/audio.rs b/src/codec/decoder/audio.rs index 8a7e796..ab93ca9 100644 --- a/src/codec/decoder/audio.rs +++ b/src/codec/decoder/audio.rs @@ -30,7 +30,7 @@ impl Audio { } } - pub fn rate(&self) -> u32 { + pub fn sample_rate(&self) -> u32 { unsafe { (*self.as_ptr()).sample_rate as u32 } } diff --git a/src/codec/encoder/audio.rs b/src/codec/encoder/audio.rs index d5a188f..e74653f 100644 --- a/src/codec/encoder/audio.rs +++ b/src/codec/encoder/audio.rs @@ -77,13 +77,13 @@ impl Audio { } } - pub fn set_rate(&mut self, rate: i32) { + pub fn set_sample_rate(&mut self, rate: i32) { unsafe { (*self.as_mut_ptr()).sample_rate = rate; } } - pub fn rate(&self) -> u32 { + pub fn sample_rate(&self) -> u32 { unsafe { (*self.as_ptr()).sample_rate as u32 } } diff --git a/src/codec/video.rs b/src/codec/video.rs index f08492d..fbb09a1 100644 --- a/src/codec/video.rs +++ b/src/codec/video.rs @@ -15,7 +15,7 @@ impl Video { } impl Video { - pub fn rates(&self) -> Option { + pub fn frame_rates(&self) -> Option { unsafe { if (*self.codec.as_ptr()).supported_framerates.is_null() { None diff --git a/src/format/stream/stream.rs b/src/format/stream/stream.rs index dd3824f..6bfc4b7 100644 --- a/src/format/stream/stream.rs +++ b/src/format/stream/stream.rs @@ -88,7 +88,7 @@ impl<'a> Stream<'a> { SideDataIter::new(self) } - pub fn rate(&self) -> Rational { + pub fn frame_rate(&self) -> Rational { unsafe { Rational::from(av_stream_get_r_frame_rate(self.as_ptr())) } } diff --git a/src/software/resampling/extensions.rs b/src/software/resampling/extensions.rs index f6a551c..83249fe 100644 --- a/src/software/resampling/extensions.rs +++ b/src/software/resampling/extensions.rs @@ -12,7 +12,7 @@ impl frame::Audio { Context::get( self.format(), self.channel_layout(), - self.rate(), + self.sample_rate(), format, channel_layout, rate, @@ -31,7 +31,7 @@ impl decoder::Audio { Context::get( self.format(), self.channel_layout(), - self.rate(), + self.sample_rate(), format, channel_layout, rate, diff --git a/src/util/frame/audio.rs b/src/util/frame/audio.rs index 9b78805..5daa816 100644 --- a/src/util/frame/audio.rs +++ b/src/util/frame/audio.rs @@ -90,7 +90,7 @@ impl Audio { } #[inline] - pub fn rate(&self) -> u32 { + pub fn sample_rate(&self) -> u32 { unsafe { av_frame_get_sample_rate(self.as_ptr()) as u32 } } @@ -213,7 +213,7 @@ impl ::std::fmt::Debug for Audio { f.write_str("ffmpeg::frame::Audio { ")?; f.write_str(&format!("format: {:?}, ", self.format()))?; f.write_str(&format!("channels: {:?}, ", self.channels()))?; - f.write_str(&format!("rate: {:?}, ", self.rate()))?; + f.write_str(&format!("sample_rate: {:?}, ", self.sample_rate()))?; f.write_str(&format!("samples: {:?} ", self.samples()))?; f.write_str("}") }