encounter/rust-ffmpeg-zmwangx
0
0
Fork 0
mirror of https://github.com/encounter/rust-ffmpeg-zmwangx.git synced 2026-07-10 21:18:40 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix(software/resampling): use swr_alloc_set_opts2 for 5.1+

Browse Source
This commit is contained in:
tilpner
2023-05-24 17:22:59 +02:00
committed by Till Höppner
parent 00fa8d39d5
commit f19f1be02b
1 changed files with 34 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/software/resampling/context.rs
+34 -14
View File
@@ -44,24 +44,44 @@ impl Context {
dst_rate: u32,
) -> Result<Self, Error> {
unsafe {
let ptr = swr_alloc_set_opts(
ptr::null_mut(),
dst_channel_layout.bits() as i64,
dst_format.into(),
dst_rate as c_int,
src_channel_layout.bits() as i64,
src_format.into(),
src_rate as c_int,
0,
ptr::null_mut(),
);
let mut ctx = ptr::null_mut::<SwrContext>();
if !ptr.is_null() {
match swr_init(ptr) {
#[cfg(not(feature = "ffmpeg_5_1"))]
{
ctx = swr_alloc_set_opts(
ptr::null_mut(),
dst_channel_layout.bits() as i64,
dst_format.into(),
dst_rate as c_int,
src_channel_layout.bits() as i64,
src_format.into(),
src_rate as c_int,
0,
ptr::null_mut(),
);
}
#[cfg(feature = "ffmpeg_5_1")]
{
swr_alloc_set_opts2(
&mut ctx as *mut _,
dst_channel_layout.as_ptr(),
dst_format.into(),
dst_rate as c_int,
src_channel_layout.as_ptr(),
src_format.into(),
src_rate as c_int,
0,
ptr::null_mut(),
);
}
if !ctx.is_null() {
match swr_init(ctx) {
e if e < 0 => Err(Error::from(e)),
_ => Ok(Context {
ptr,
ptr: ctx,
input: Definition {
format: src_format,