mirrors/gst-plugins-rs
mirrors/gst-plugins-rs
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git synced 2025-09-01 09:13:48 +00:00
Code Issues Projects Releases Wiki Activity

aws/polly: fix gap forwarding as with 11labs

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/2510>
This commit is contained in:
Mathieu Duponchelle 2025-08-28 15:51:20 +02:00 committed by GStreamer Marge Bot
parent a162b82b73
commit 7fd461fd24
1 changed files with 66 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
net/aws/src/polly/imp.rs
View file

@ -177,13 +177,74 @@ impl Polly {
Gap(g) => {
let (pts, duration) = g.get();
let overflow = self.settings.lock().unwrap().overflow;
let mut state = self.state.lock().unwrap();
state.out_segment.set_position(match duration {
Some(duration) => duration + pts,
_ => pts,
});
let new_gap_event = match overflow {
AwsOverflow::Clip => {
state.out_segment.set_position(match duration {
Some(duration) => duration + pts,
_ => pts,
});
Some(event.clone())
}
AwsOverflow::Shift | AwsOverflow::Overlap => {
if let Some(position) = state.out_segment.position() {
if let Some(duration) = duration {
let end_pts = pts + duration;
if end_pts > position {
// Output our own gap event that starts at our current position
Some(
gst::event::Gap::builder(position)
.duration(end_pts - position)
.seqnum(event.seqnum())
.build(),
)
} else {
// We have already advanced past this gap's end
None
}
} else if pts > position {
Some(gst::event::Gap::builder(pts).seqnum(event.seqnum()).build())
} else {
// This duration-less gap was older that our current position, do
// nothing
None
}
} else {
// Position wasn't set yet, the gap can be forwarded unchanged
Some(event.clone())
}
}
};
if let Some(ref event) = new_gap_event {
let Gap(gap) = event.view() else {
unreachable!()
};
let (new_pts, new_duration) = gap.get();
gst::log!(
CAT,
imp = self,
"pushing gap with pts {new_pts} and duration {new_duration:?}"
);
state.out_segment.set_position(match new_duration {
Some(new_duration) => new_duration + new_pts,
_ => new_pts,
});
}
drop(state);
gst::Pad::event_default(pad, Some(&*self.obj()), event)
if let Some(event) = new_gap_event {
gst::Pad::event_default(pad, Some(&*self.obj()), event)
} else {
true
}
}
_ => gst::Pad::event_default(pad, Some(&*self.obj()), event),
}