bstein/lesavka
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(audio): rebase remote packet pts onto local playback timeline

Browse Source
This commit is contained in:
Brad Stein 2026-04-21 01:52:39 -03:00
parent 9616ba00ea
commit 736c4e3bac
1 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
client/src/output/audio.rs
View File

@ -5,6 +5,7 @@ use gst::MessageView::*;
use gst::prelude::*;
use gstreamer as gst;
use gstreamer_app as gst_app;
use std::sync::Mutex;
use tracing::{debug, error, info, warn};
use lesavka_common::lesavka::AudioPacket;
@ -12,6 +13,14 @@ use lesavka_common::lesavka::AudioPacket;
pub struct AudioOut {
pipeline: gst::Pipeline,
src: gst_app::AppSrc,
timeline: Mutex<AudioTimeline>,
}
#[derive(Default)]
struct AudioTimeline {
first_remote_pts_us: Option<u64>,
last_local_pts_us: u64,
packets: u64,
}
impl AudioOut {
@ -106,14 +115,36 @@ impl AudioOut {
pipeline
.set_state(gst::State::Playing)
.context("starting audio pipeline")?;
Ok(Self { pipeline, src })
Ok(Self {
pipeline,
src,
timeline: Mutex::new(AudioTimeline::default()),
})
}
pub fn push(&self, pkt: AudioPacket) {
let mut buf = gst::Buffer::from_slice(pkt.data);
buf.get_mut()
.unwrap()
.set_pts(Some(gst::ClockTime::from_useconds(pkt.pts)));
if let Ok(mut timeline) = self.timeline.lock() {
let base = timeline.first_remote_pts_us.get_or_insert(pkt.pts);
let mut local_pts_us = pkt.pts.saturating_sub(*base);
if local_pts_us < timeline.last_local_pts_us {
local_pts_us = timeline.last_local_pts_us.saturating_add(1);
}
timeline.last_local_pts_us = local_pts_us;
timeline.packets = timeline.packets.saturating_add(1);
if timeline.packets <= 8 || timeline.packets % 600 == 0 {
debug!(
packet = timeline.packets,
remote_pts_us = pkt.pts,
local_pts_us,
bytes = buf.size(),
"🔊 audio packet queued"
);
}
buf.get_mut()
.unwrap()
.set_pts(Some(gst::ClockTime::from_useconds(local_pts_us)));
}
#[cfg(not(coverage))]
if let Err(e) = self.src.push_buffer(buf) {
warn!("📉 AppSrc push failed: {e:?}");