Skip to content

Commit

Permalink
Use single copy on rgb24
Browse files Browse the repository at this point in the history
  • Loading branch information
@dominikWin
dominikWin committed Oct 19, 2024
1 parent 1d85621 commit 31a2505
Show file tree
Hide file tree
Showing 2 changed files with 108 additions and 73 deletions.
68 changes: 17 additions & 51 deletions vidformer/src/filter/cv2.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,7 @@ impl Rectangle {
Parameter::Positional { name: "img" },
Parameter::Positional { name: "pt1" },
Parameter::Positional { name: "pt2" },
Parameter::Positional {
name: "color",
},
Parameter::Positional { name: "color" },
Parameter::PositionalOptional {
name: "thickness",
default_value: Val::Int(1),
Expand Down Expand Up @@ -200,19 +198,11 @@ impl PutText {
let signature = filter_utils::FunctionSignature {
parameters: vec![
Parameter::Positional { name: "img" },
Parameter::Positional {
name: "text",
},
Parameter::Positional { name: "text" },
Parameter::Positional { name: "org" },
Parameter::Positional {
name: "fontFace",
},
Parameter::Positional {
name: "fontScale",
},
Parameter::Positional {
name: "color",
},
Parameter::Positional { name: "fontFace" },
Parameter::Positional { name: "fontScale" },
Parameter::Positional { name: "color" },
Parameter::PositionalOptional {
name: "thickness",
default_value: Val::Int(1),
Expand Down Expand Up @@ -382,9 +372,7 @@ impl ArrowedLine {
Parameter::Positional { name: "img" },
Parameter::Positional { name: "pt1" },
Parameter::Positional { name: "pt2" },
Parameter::Positional {
name: "color",
},
Parameter::Positional { name: "color" },
Parameter::PositionalOptional {
name: "thickness",
default_value: Val::Int(1),
Expand Down Expand Up @@ -545,9 +533,7 @@ impl Line {
Parameter::Positional { name: "img" },
Parameter::Positional { name: "pt1" },
Parameter::Positional { name: "pt2" },
Parameter::Positional {
name: "color",
},
Parameter::Positional { name: "color" },
Parameter::PositionalOptional {
name: "thickness",
default_value: Val::Int(1),
Expand Down Expand Up @@ -694,15 +680,9 @@ impl Circle {
let signature = filter_utils::FunctionSignature {
parameters: vec![
Parameter::Positional { name: "img" },
Parameter::Positional {
name: "center",
},
Parameter::Positional {
name: "radius",
},
Parameter::Positional {
name: "color",
},
Parameter::Positional { name: "center" },
Parameter::Positional { name: "radius" },
Parameter::Positional { name: "color" },
Parameter::PositionalOptional {
name: "thickness",
default_value: Val::Int(1),
Expand Down Expand Up @@ -849,12 +829,8 @@ impl SetTo {
let signature = filter_utils::FunctionSignature {
parameters: vec![
Parameter::Positional { name: "img" },
Parameter::Positional {
name: "color",
},
Parameter::Positional {
name: "mask",
},
Parameter::Positional { name: "color" },
Parameter::Positional { name: "mask" },
],
};

Expand Down Expand Up @@ -975,21 +951,11 @@ impl AddWeighted {
) -> Result<AddWeightedArgs, String> {
let signature = filter_utils::FunctionSignature {
parameters: vec![
Parameter::Positional {
name: "src1",
},
Parameter::Positional {
name: "alpha",
},
Parameter::Positional {
name: "src2",
},
Parameter::Positional {
name: "beta",
},
Parameter::Positional {
name: "gamma",
},
Parameter::Positional { name: "src1" },
Parameter::Positional { name: "alpha" },
Parameter::Positional { name: "src2" },
Parameter::Positional { name: "beta" },
Parameter::Positional { name: "gamma" },
],
};

Expand Down
113 changes: 91 additions & 22 deletions vidformer/src/filter/filter_utils.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,26 @@ use super::Val;

#[derive(Clone, Debug)]
pub(crate) enum Parameter {
Positional { name: &'static str },
PositionalOptional { name: &'static str, default_value: Val },
VarArgs { name: &'static str },
KeywordOnly { name: &'static str },
KeywordOnlyOptional { name: &'static str, default_value: Val },
KwArgs { name: &'static str },
Positional {
name: &'static str,
},
PositionalOptional {
name: &'static str,
default_value: Val,
},
VarArgs {
name: &'static str,
},
KeywordOnly {
name: &'static str,
},
KeywordOnlyOptional {
name: &'static str,
default_value: Val,
},
KwArgs {
name: &'static str,
},
}

pub(crate) struct FunctionSignature {
Expand Down Expand Up @@ -212,15 +226,10 @@ pub(crate) fn frame_to_mat_rgb24(img: &Frame, width: i32, height: i32) -> opencv
}
.unwrap();

// copy img data into mat
unsafe {
let mut src = (*img).data[0];
let mut dst = mat.data_mut();
for _ in 0..height {
std::ptr::copy_nonoverlapping(src, dst, width as usize * 3);
src = src.add((*img).linesize[0] as usize);
dst = dst.add(width as usize * 3);
}
let src = (*img).data[0];
let dst = mat.data_mut();
std::ptr::copy_nonoverlapping(src, dst, width as usize * height as usize * 3);
}

mat
Expand All @@ -235,16 +244,76 @@ pub(crate) fn frame_to_mat_gray8(img: &Frame, width: i32, height: i32) -> opencv
}
.unwrap();

// copy img data into mat
unsafe {
let mut src = (*img).data[0];
let mut dst = mat.data_mut();
for _ in 0..height {
std::ptr::copy_nonoverlapping(src, dst, width as usize);
src = src.add((*img).linesize[0] as usize);
dst = dst.add(width as usize);
}
let src = (*img).data[0];
let dst = mat.data_mut();
std::ptr::copy_nonoverlapping(src, dst, width as usize * height as usize);
}

mat
}

#[cfg(test)]
mod tests {
use opencv::core::Scalar;
use opencv::prelude::Mat;
use opencv::prelude::MatTraitConst;
use rusty_ffmpeg::ffi;

#[test]
fn test_packed_layout_rgb24() {
// we do some sharing of buffers between libav and opencv so we need to make sure that
// the layout of the data is the same

let num_planes =
unsafe { ffi::av_pix_fmt_count_planes(ffi::AVPixelFormat_AV_PIX_FMT_RGB24) };
assert_eq!(num_planes, 1);

let width = 1920;
let height = 1080;
let size = (width as usize) * (height as usize) * 3;

let frame_encoded_size_all_planes = unsafe {
ffi::av_image_get_buffer_size(ffi::AVPixelFormat_AV_PIX_FMT_RGB24, width, height, 1)
};

assert_eq!(size, frame_encoded_size_all_planes as usize);

// make sure mat data buffer is the same size as the frame buffer
let color = Scalar::new(255.0, 0.0, 0.0, 0.0);
let mat =
Mat::new_rows_cols_with_default(height, width, opencv::core::CV_8UC3, color).unwrap();

assert_eq!(
size,
mat.total() as usize * mat.elem_size().unwrap() as usize
);
}

#[test]
fn test_packed_layout_gray8() {
let num_planes =
unsafe { ffi::av_pix_fmt_count_planes(ffi::AVPixelFormat_AV_PIX_FMT_GRAY8) };
assert_eq!(num_planes, 1);

let width = 1920;
let height = 1080;
let size = (width as usize) * (height as usize);

let frame_encoded_size_all_planes = unsafe {
ffi::av_image_get_buffer_size(ffi::AVPixelFormat_AV_PIX_FMT_GRAY8, width, height, 1)
};

assert_eq!(size, frame_encoded_size_all_planes as usize);

// make sure mat data buffer is the same size as the frame buffer
let color = Scalar::new(255.0, 0.0, 0.0, 0.0);
let mat =
Mat::new_rows_cols_with_default(height, width, opencv::core::CV_8UC1, color).unwrap();

assert_eq!(
size,
mat.total() as usize * mat.elem_size().unwrap() as usize
);
}
}

0 comments on commit 31a2505

Please sign in to comment.