Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
@dominikWin
dominikWin committed Oct 21, 2024
2 parents 4110b08 + 896b0a0 commit 0a462d9
Show file tree
Hide file tree
Showing 8 changed files with 165 additions and 140 deletions.
4 changes: 2 additions & 2 deletions vidformer-cli/src/yrden.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -866,8 +866,8 @@ async fn yrden_http_req(
};

let dve_range_config = vidformer::Range {
start: start,
end: end,
start,
end,
ts_format: vidformer::RangeTsFormat::StreamLocal,
};

Expand Down
2 changes: 1 addition & 1 deletion vidformer/src/av/demuxer.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ mod test {
.expect("failed to allocated memory for AVPacket");

let mut demuxed_packets = 0;
while let Some(_) = demuxer.read_packet(packet) {
while demuxer.read_packet(packet).is_some() {
demuxed_packets += 1;
}
demuxer.close();
Expand Down
4 changes: 2 additions & 2 deletions vidformer/src/av/framesource.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,11 +140,11 @@ mod test {
&0.into(),
&service,
profile.file_size,
&io_runtime.handle(),
io_runtime.handle(),
)
.unwrap();

while let Some(_) = framesource.next_frame().unwrap() {
while framesource.next_frame().unwrap().is_some() {
decoded_frames += 1;
}

Expand Down
2 changes: 1 addition & 1 deletion vidformer/src/dve.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1325,7 +1325,7 @@ pub fn create_spec_hls(
context: &Context,
_config: &Config,
) -> (String, String, String, Vec<(Rational64, Rational64)>) {
let namespace = format!("{}", crate::util::rand_uuid());
let namespace = crate::util::rand_uuid().to_string();

let _playlist_path = format!("{namespace}/playlist.m3u8");
let playlist_text = format!(
Expand Down
132 changes: 49 additions & 83 deletions vidformer/src/filter/cv2.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,22 +43,20 @@ impl Rectangle {
) -> Result<RectangleArgs, String> {
let signature = filter_utils::FunctionSignature {
parameters: vec![
Parameter::Positional { name: "img".into() },
Parameter::Positional { name: "pt1".into() },
Parameter::Positional { name: "pt2".into() },
Parameter::Positional {
name: "color".into(),
},
Parameter::Positional { name: "img" },
Parameter::Positional { name: "pt1" },
Parameter::Positional { name: "pt2" },
Parameter::Positional { name: "color" },
Parameter::PositionalOptional {
name: "thickness".into(),
name: "thickness",
default_value: Val::Int(1),
},
Parameter::PositionalOptional {
name: "lineType".into(),
name: "lineType",
default_value: Val::Int(8),
},
Parameter::PositionalOptional {
name: "shift".into(),
name: "shift",
default_value: Val::Int(0),
},
],
Expand Down Expand Up @@ -199,30 +197,22 @@ impl PutText {
) -> Result<PutTextArgs, String> {
let signature = filter_utils::FunctionSignature {
parameters: vec![
Parameter::Positional { name: "img".into() },
Parameter::Positional {
name: "text".into(),
},
Parameter::Positional { name: "org".into() },
Parameter::Positional {
name: "fontFace".into(),
},
Parameter::Positional {
name: "fontScale".into(),
},
Parameter::Positional {
name: "color".into(),
},
Parameter::Positional { name: "img" },
Parameter::Positional { name: "text" },
Parameter::Positional { name: "org" },
Parameter::Positional { name: "fontFace" },
Parameter::Positional { name: "fontScale" },
Parameter::Positional { name: "color" },
Parameter::PositionalOptional {
name: "thickness".into(),
name: "thickness",
default_value: Val::Int(1),
},
Parameter::PositionalOptional {
name: "lineType".into(),
name: "lineType",
default_value: Val::Int(8),
},
Parameter::PositionalOptional {
name: "bottomLeftOrigin".into(),
name: "bottomLeftOrigin",
default_value: Val::Bool(false),
},
],
Expand Down Expand Up @@ -379,26 +369,24 @@ impl ArrowedLine {
) -> Result<ArrowedLineArgs, String> {
let signature = FunctionSignature {
parameters: vec![
Parameter::Positional { name: "img".into() },
Parameter::Positional { name: "pt1".into() },
Parameter::Positional { name: "pt2".into() },
Parameter::Positional {
name: "color".into(),
},
Parameter::Positional { name: "img" },
Parameter::Positional { name: "pt1" },
Parameter::Positional { name: "pt2" },
Parameter::Positional { name: "color" },
Parameter::PositionalOptional {
name: "thickness".into(),
name: "thickness",
default_value: Val::Int(1),
},
Parameter::PositionalOptional {
name: "lineType".into(),
name: "lineType",
default_value: Val::Int(8),
},
Parameter::PositionalOptional {
name: "shift".into(),
name: "shift",
default_value: Val::Int(0),
},
Parameter::PositionalOptional {
name: "tipLength".into(),
name: "tipLength",
default_value: Val::Float(0.1),
},
],
Expand Down Expand Up @@ -542,22 +530,20 @@ impl Line {
) -> Result<LineArgs, String> {
let signature = FunctionSignature {
parameters: vec![
Parameter::Positional { name: "img".into() },
Parameter::Positional { name: "pt1".into() },
Parameter::Positional { name: "pt2".into() },
Parameter::Positional {
name: "color".into(),
},
Parameter::Positional { name: "img" },
Parameter::Positional { name: "pt1" },
Parameter::Positional { name: "pt2" },
Parameter::Positional { name: "color" },
Parameter::PositionalOptional {
name: "thickness".into(),
name: "thickness",
default_value: Val::Int(1),
},
Parameter::PositionalOptional {
name: "lineType".into(),
name: "lineType",
default_value: Val::Int(8),
},
Parameter::PositionalOptional {
name: "shift".into(),
name: "shift",
default_value: Val::Int(0),
},
],
Expand Down Expand Up @@ -693,26 +679,20 @@ impl Circle {
) -> Result<CircleArgs, String> {
let signature = filter_utils::FunctionSignature {
parameters: vec![
Parameter::Positional { name: "img".into() },
Parameter::Positional {
name: "center".into(),
},
Parameter::Positional {
name: "radius".into(),
},
Parameter::Positional {
name: "color".into(),
},
Parameter::Positional { name: "img" },
Parameter::Positional { name: "center" },
Parameter::Positional { name: "radius" },
Parameter::Positional { name: "color" },
Parameter::PositionalOptional {
name: "thickness".into(),
name: "thickness",
default_value: Val::Int(1),
},
Parameter::PositionalOptional {
name: "lineType".into(),
name: "lineType",
default_value: Val::Int(8),
},
Parameter::PositionalOptional {
name: "shift".into(),
name: "shift",
default_value: Val::Int(0),
},
],
Expand Down Expand Up @@ -848,13 +828,9 @@ impl SetTo {
) -> Result<SetToArgs, String> {
let signature = filter_utils::FunctionSignature {
parameters: vec![
Parameter::Positional { name: "img".into() },
Parameter::Positional {
name: "color".into(),
},
Parameter::Positional {
name: "mask".into(),
},
Parameter::Positional { name: "img" },
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".into(),
},
Parameter::Positional {
name: "alpha".into(),
},
Parameter::Positional {
name: "src2".into(),
},
Parameter::Positional {
name: "beta".into(),
},
Parameter::Positional {
name: "gamma".into(),
},
Parameter::Positional { name: "src1" },
Parameter::Positional { name: "alpha" },
Parameter::Positional { name: "src2" },
Parameter::Positional { name: "beta" },
Parameter::Positional { name: "gamma" },
],
};

Expand Down Expand Up @@ -1066,7 +1032,7 @@ impl Filter for AddWeighted {
let src2_mat = filter_utils::frame_to_mat_rgb24(&src2, width, height);

let mut out_mat = opencv::core::Mat::new_nd_with_default(
&[height as i32, width as i32, 3],
&[height, width, 3],
opencv::core::CV_8UC3,
opencv::core::Scalar::all(0.0),
)
Expand All @@ -1083,8 +1049,8 @@ impl Filter for AddWeighted {
)
.unwrap();

assert_eq!(out_mat.rows(), height as i32);
assert_eq!(out_mat.cols(), width as i32);
assert_eq!(out_mat.rows(), { height });
assert_eq!(out_mat.cols(), { width });
assert_eq!(out_mat.channels(), 3);

let f = match filter_utils::mat_to_frame_rgb24(out_mat, width, height) {
Expand Down
Loading

0 comments on commit 0a462d9

Please sign in to comment.