Skip to content

Add version checks down to VAAPI 1.10 #33

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
cadubentzen wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add version checks down to VAAPI 1.10 #33

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
15 changes: 15 additions & 0 deletions lib/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,15 @@ fn main() {
major > desired_major || (major == desired_major && minor >= desired_minor)
};

// Declare the custom cfg flags to avoid warnings
println!("cargo::rustc-check-cfg=cfg(libva_1_21_or_higher)");
println!("cargo::rustc-check-cfg=cfg(libva_1_20_or_higher)");
println!("cargo::rustc-check-cfg=cfg(libva_1_19_or_higher)");
println!("cargo::rustc-check-cfg=cfg(libva_1_16_or_higher)");
println!("cargo::rustc-check-cfg=cfg(libva_1_14_or_higher)");
println!("cargo::rustc-check-cfg=cfg(libva_1_10_or_higher)");

// Set the cfg flags based on version
if va_check_version(1, 21) {
println!("cargo::rustc-cfg=libva_1_21_or_higher");
}
Expand All @@ -112,6 +121,12 @@ fn main() {
if va_check_version(1, 16) {
println!("cargo::rustc-cfg=libva_1_16_or_higher")
}
if va_check_version(1, 14) {
println!("cargo::rustc-cfg=libva_1_14_or_higher");
}
if va_check_version(1, 10) {
println!("cargo::rustc-cfg=libva_1_10_or_higher");
}

if !va_lib_path.is_empty() {
assert!(
Expand Down
13 changes: 13 additions & 0 deletions lib/src/buffer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

//! Wrappers and helpers around `VABuffer`s.

#[cfg(libva_1_14_or_higher)]
mod av1;
mod enc_jpeg;
mod enc_misc;
Expand All @@ -15,6 +16,7 @@ mod proc_pipeline;
mod vp8;
mod vp9;

#[cfg(libva_1_14_or_higher)]
pub use av1::*;
pub use enc_jpeg::*;
pub use enc_misc::*;
Expand Down Expand Up @@ -52,6 +54,7 @@ impl Buffer {
BufferType::SliceParameter(SliceParameter::H264(ref mut params)) => {
params.inner_mut().len()
}
#[cfg(libva_1_14_or_higher)]
BufferType::SliceParameter(SliceParameter::AV1(ref mut params)) => {
params.inner_mut().len()
}
Expand Down Expand Up @@ -88,6 +91,7 @@ impl Buffer {
wrapper.inner_mut() as *mut _ as *mut std::ffi::c_void,
std::mem::size_of_val(wrapper.inner_mut()),
),
#[cfg(libva_1_14_or_higher)]
PictureParameter::AV1(ref mut wrapper) => (
wrapper.inner_mut() as *mut _ as *mut std::ffi::c_void,
std::mem::size_of_val(wrapper.inner_mut()),
Expand Down Expand Up @@ -127,6 +131,7 @@ impl Buffer {
wrapper.inner_mut() as *mut _ as *mut std::ffi::c_void,
std::mem::size_of_val(wrapper.inner_mut()),
),
#[cfg(libva_1_14_or_higher)]
SliceParameter::AV1(ref mut wrapper) => (
wrapper.inner_mut().as_mut_ptr() as *mut std::ffi::c_void,
std::mem::size_of::<bindings::VASliceParameterBufferAV1>(),
Expand Down Expand Up @@ -197,6 +202,7 @@ impl Buffer {
wrapper.inner_mut() as *mut _ as *mut std::ffi::c_void,
std::mem::size_of_val(wrapper.inner_mut()),
),
#[cfg(libva_1_14_or_higher)]
EncSequenceParameter::AV1(ref mut wrapper) => (
wrapper.inner_mut() as *mut _ as *mut std::ffi::c_void,
std::mem::size_of_val(wrapper.inner_mut()),
Expand All @@ -220,6 +226,7 @@ impl Buffer {
wrapper.inner_mut() as *mut _ as *mut std::ffi::c_void,
std::mem::size_of_val(wrapper.inner_mut()),
),
#[cfg(libva_1_14_or_higher)]
EncPictureParameter::AV1(ref mut wrapper) => (
wrapper.inner_mut() as *mut _ as *mut std::ffi::c_void,
std::mem::size_of_val(wrapper.inner_mut()),
Expand All @@ -235,6 +242,7 @@ impl Buffer {
wrapper.inner_mut() as *mut _ as *mut std::ffi::c_void,
std::mem::size_of_val(wrapper.inner_mut()),
),
#[cfg(libva_1_14_or_higher)]
EncSliceParameter::AV1(ref mut wrapper) => (
wrapper.inner_mut() as *mut _ as *mut std::ffi::c_void,
std::mem::size_of_val(wrapper.inner_mut()),
Expand Down Expand Up @@ -425,6 +433,7 @@ pub enum PictureParameter {
HEVCRext(hevc::PictureParameterBufferHEVCRext),
/// Wrapper over VAPictureParameterBufferHEVCScc
HEVCScc(hevc::PictureParameterBufferHEVCScc),
#[cfg(libva_1_14_or_higher)]
/// Wrapper over VADecPictureParameterBufferAV1
AV1(av1::PictureParameterBufferAV1),
/// Wrapper over VAPictureParameterBufferJPEGBaseline
Expand All @@ -447,6 +456,7 @@ pub enum SliceParameter {
HEVC(hevc::SliceParameterBufferHEVC),
/// Wrapper over VASliceParameterBufferHEVCRext
HEVCRext(hevc::SliceParameterBufferHEVCRext),
#[cfg(libva_1_14_or_higher)]
/// Wrapper over VASliceParameterBufferAV1
AV1(av1::SliceParameterBufferAV1),
/// Wrapper over VASliceParameterBufferJPEGBaseline
Expand Down Expand Up @@ -491,6 +501,7 @@ pub enum EncSequenceParameter {
VP8(vp8::EncSequenceParameterBufferVP8),
/// Abstraction over `VAEncSequenceParameterBufferVP9`
VP9(vp9::EncSequenceParameterBufferVP9),
#[cfg(libva_1_14_or_higher)]
/// Abstraction over `VAEncSequenceParameterBufferAV1`
AV1(av1::EncSequenceParameterBufferAV1),
}
Expand All @@ -505,6 +516,7 @@ pub enum EncPictureParameter {
VP8(vp8::EncPictureParameterBufferVP8),
/// Abstraction over `VAEncPictureParameterBufferVP9`
VP9(vp9::EncPictureParameterBufferVP9),
#[cfg(libva_1_14_or_higher)]
/// Abstraction over `VAEncPictureParameterBufferAV1`
AV1(av1::EncPictureParameterBufferAV1),
}
Expand All @@ -515,6 +527,7 @@ pub enum EncSliceParameter {
H264(h264::EncSliceParameterBufferH264),
/// Abstraction over `VAEncSliceParameterBufferHEVC`
HEVC(hevc::EncSliceParameterBufferHEVC),
#[cfg(libva_1_14_or_higher)]
/// Abstraction over `VAEncTileGroupBufferAV1`
AV1(av1::EncTileGroupBufferAV1),
}
Expand Down
1 change: 1 addition & 0 deletions lib/src/buffer/enc_misc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ impl EncMiscParameterRateControl {
ICQ_quality_factor: icq_quality_factor,
max_qp,
quality_factor,
#[cfg(libva_1_10_or_higher)]
target_frame_size,
..Default::default()
},
Expand Down
2 changes: 2 additions & 0 deletions lib/src/buffer/hevc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1142,7 +1142,9 @@ impl EncSliceParameterBufferHEVC {
slice_beta_offset_div2,
slice_tc_offset_div2,
slice_fields,
#[cfg(libva_1_10_or_higher)]
pred_weight_table_bit_offset,
#[cfg(libva_1_10_or_higher)]
pred_weight_table_bit_length,
va_reserved: Default::default(),
}))
Expand Down
1 change: 1 addition & 0 deletions lib/src/buffer/jpeg_baseline.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ impl PictureParameterBufferJPEGBaseline {
num_components,
color_space,
rotation,
#[cfg(libva_1_20_or_higher)]
crop_rectangle,
va_reserved: Default::default(),
}))
Expand Down