Skip to content

fix: use pkg-config to find ffmpeg libraries #573

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
UlyssesZh wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: use pkg-config to find ffmpeg libraries #573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions prpr-avc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,6 @@ edition = "2021"
sasa = { git = "https://github.com/Mivik/sasa", default-features = false }
thiserror = "2.0.12"
tracing = "0.1.41"

[build-dependencies]
pkg-config = "0.3"
9 changes: 3 additions & 6 deletions prpr-avc/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
use std::path::Path;

fn main() {
let libs_dir = std::env::var("PRPR_AVC_LIBS").unwrap_or_else(|_| format!("{}/static-lib", std::env::var("CARGO_MANIFEST_DIR").unwrap()));
let libs_path = Path::new(&libs_dir).join(std::env::var("TARGET").unwrap());
let libs_path = libs_path.display();
println!("cargo:rustc-link-search={libs_path}");
println!("cargo:rustc-link-lib=z");
println!("cargo:rerun-if-changed={libs_path}");
for lib in ["libavformat", "libavcodec", "libavutil", "libswscale", "libswresample"] {
pkg_config::Config::new().statik(false).probe(lib);
}
}
11 changes: 3 additions & 8 deletions prpr-avc/src/ffi.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ pub const AV_SAMPLE_FMT_FLT: AVSampleFormat = 3;

pub const AV_ROUND_UP: AVRounding = 0;

#[link(name = "avformat", kind = "static")]
extern "C" {
pub fn avformat_alloc_context() -> *mut AVFormatContext;
pub fn avformat_free_context(s: *mut AVFormatContext);
Expand All @@ -20,7 +19,6 @@ extern "C" {
pub fn av_read_frame(s: *mut AVFormatContext, pkt: *mut AVPacket) -> ::std::os::raw::c_int;
}

#[link(name = "avutil", kind = "static")]
extern "C" {
pub fn av_strerror(errnum: ::std::os::raw::c_int, errbuf: *mut ::std::os::raw::c_char, errbuf_size: usize) -> ::std::os::raw::c_int;
pub fn av_frame_alloc() -> *mut AVFrame;
Expand All @@ -29,7 +27,6 @@ extern "C" {
pub fn av_rescale_rnd(a: i64, b: i64, c: i64, r: AVRounding) -> i64;
}

#[link(name = "avcodec", kind = "static")]
extern "C" {
pub fn avcodec_find_decoder(id: AVCodecID) -> *mut AVCodec;
pub fn avcodec_alloc_context3(codec: *const AVCodec) -> *mut AVCodecContext;
Expand All @@ -43,7 +40,6 @@ extern "C" {
pub fn avcodec_default_get_format(s: *mut AVCodecContext, fmt: *const AVPixelFormat) -> AVPixelFormat;
}

#[link(name = "swscale", kind = "static")]
extern "C" {
pub fn sws_getContext(
srcW: ::std::os::raw::c_int,
Expand All @@ -68,10 +64,9 @@ extern "C" {
) -> ::std::os::raw::c_int;
}

#[link(name = "swresample", kind = "static")]
extern "C" {
pub fn swr_alloc_set_opts(
s: *mut SwrContext,
pub fn swr_alloc_set_opts2(
ps: *mut *mut SwrContext,
out_ch_layout: i64,
out_sample_fmt: AVSampleFormat,
out_sample_rate: ::std::os::raw::c_int,
Expand All @@ -80,7 +75,7 @@ extern "C" {
in_sample_rate: ::std::os::raw::c_int,
log_offset: ::std::os::raw::c_int,
log_ctx: *mut ::std::os::raw::c_void,
) -> *mut SwrContext;
) -> ::std::os::raw::c_int;
pub fn swr_init(s: *mut SwrContext) -> ::std::os::raw::c_int;
pub fn swr_get_delay(s: *const SwrContext, base: ::std::os::raw::c_int) -> i64;
pub fn swr_convert(
Expand Down
14 changes: 9 additions & 5 deletions prpr-avc/src/swr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ pub struct SwrContext(OwnedPtr<ffi::SwrContext>);
impl SwrContext {
pub fn new(in_format: &AudioStreamFormat, out_format: &AudioStreamFormat) -> Result<Self> {
unsafe {
OwnedPtr::new(ffi::swr_alloc_set_opts(
null_mut(),
let mut raw: *mut ffi::SwrContext = null_mut();
let ret = ffi::swr_alloc_set_opts2(
&mut raw,
out_format.channel_layout as _,
out_format.sample_fmt,
out_format.sample_rate,
Expand All @@ -15,9 +16,12 @@ impl SwrContext {
in_format.sample_rate,
0,
null_mut(),
))
.map(|ctx| Self(ctx))
.ok_or(Error::AllocationFailed)
);
if ret < 0 || raw.is_null() {
Err(Error::AllocationFailed)
} else {
OwnedPtr::new(raw).map(|ctx| Self(ctx)).ok_or(Error::AllocationFailed)
}
}
}

Expand Down