Skip to content

Fix timestamp overflow causing stream corruption after ~71 minutes #398

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

Draft
joshkautz wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Fix timestamp overflow causing stream corruption after ~71 minutes #398

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
28 changes: 14 additions & 14 deletions src/rtsp/factory.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,8 +243,8 @@ pub(super) async fn make_factory(
// Run blocking code on a seperate thread
// This is not an async thread
std::thread::spawn(move || {
let mut aud_ts = 0u32;
let mut vid_ts = 0u32;
let mut aud_ts: u64 = 0;
let mut vid_ts: u64 = 0;
let mut pools = Default::default();

log::trace!("{name}::{stream}: Sending buffered frames");
Expand Down Expand Up @@ -304,48 +304,48 @@ fn send_to_sources(
pools: &mut HashMap<usize, gstreamer::BufferPool>,
vid_src: &Option<AppSrc>,
aud_src: &Option<AppSrc>,
vid_ts: &mut u32,
aud_ts: &mut u32,
vid_ts: &mut u64,
aud_ts: &mut u64,
stream_config: &StreamConfig,
) -> AnyResult<()> {
// Update TS
match data {
BcMedia::Aac(aac) => {
let duration = aac.duration().expect("Could not calculate AAC duration");
if let Some(aud_src) = aud_src.as_ref() {
log::debug!("Sending AAC: {:?}", Duration::from_micros(*aud_ts as u64));
log::debug!("Sending AAC: {:?}", Duration::from_micros(*aud_ts));
send_to_appsrc(
aud_src,
aac.data,
Duration::from_micros(*aud_ts as u64),
Duration::from_micros(*aud_ts),
pools,
)?;
}
*aud_ts += duration;
*aud_ts += duration as u64;
}
BcMedia::Adpcm(adpcm) => {
let duration = adpcm
.duration()
.expect("Could not calculate ADPCM duration");
if let Some(aud_src) = aud_src.as_ref() {
log::trace!("Sending ADPCM: {:?}", Duration::from_micros(*aud_ts as u64));
log::trace!("Sending ADPCM: {:?}", Duration::from_micros(*aud_ts));
send_to_appsrc(
aud_src,
adpcm.data,
Duration::from_micros(*aud_ts as u64),
Duration::from_micros(*aud_ts),
pools,
)?;
}
*aud_ts += duration;
*aud_ts += duration as u64;
}
BcMedia::Iframe(BcMediaIframe { data, .. })
| BcMedia::Pframe(BcMediaPframe { data, .. }) => {
if let Some(vid_src) = vid_src.as_ref() {
log::trace!("Sending VID: {:?}", Duration::from_micros(*vid_ts as u64));
send_to_appsrc(vid_src, data, Duration::from_micros(*vid_ts as u64), pools)?;
log::trace!("Sending VID: {:?}", Duration::from_micros(*vid_ts));
send_to_appsrc(vid_src, data, Duration::from_micros(*vid_ts), pools)?;
}
const MICROSECONDS: u32 = 1000000;
*vid_ts += MICROSECONDS / stream_config.fps;
const MICROSECONDS: u64 = 1000000;
*vid_ts += MICROSECONDS / stream_config.fps as u64;
}
_ => {}
}
Expand Down