Kieran/ffmpeg-rs-raw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: use decoder name from ctx

Browse Source
This commit is contained in:
kieran 2024-11-08 11:48:49 +00:00
parent ff8b3df716
commit 6dbd1e15cd
No known key found for this signature in database
GPG Key ID: DE71CEB3925BE941
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/main.rs
View File

@ -48,7 +48,6 @@ unsafe fn decode_input(demuxer: Demuxer, info: DemuxerInfo) {
.setup_decoder(stream, None) .setup_decoder(stream, None)
.expect("decoder setup failed"); .expect("decoder setup failed");
} }
info!("{}", decoder);
loop_decoder(demuxer, decoder); loop_decoder(demuxer, decoder);
} }

4
src/decode.rs
View File

@ -35,9 +35,9 @@ impl DecoderCodecContext {
/// Get the codec name /// Get the codec name
pub fn codec_name(&self) -> String { pub fn codec_name(&self) -> String {
let codec_name = unsafe { rstr!(avcodec_get_name((*self.codec).id)) }; let codec_name = unsafe { rstr!((*(*self).codec).name) };
if self.hw_config.is_null() { if self.hw_config.is_null() {
codec_name.to_string() format!("{}", codec_name)
} else { } else {
let hw = unsafe { rstr!(av_hwdevice_get_type_name((*self.hw_config).device_type)) }; let hw = unsafe { rstr!(av_hwdevice_get_type_name((*self.hw_config).device_type)) };
format!("{}_{}", codec_name, hw) format!("{}_{}", codec_name, hw)

4
src/lib.rs
View File

@ -38,7 +38,11 @@ macro_rules! cstr {
#[macro_export] #[macro_export]
macro_rules! rstr { macro_rules! rstr {
($str:expr) => { ($str:expr) => {
if !$str.is_null() {
core::ffi::CStr::from_ptr($str).to_str().unwrap() core::ffi::CStr::from_ptr($str).to_str().unwrap()
} else {
""
}
}; };
} }