github-mirrors/netris-warp
1
0
Fork 0
mirror of https://github.com/nestriness/warp.git synced 2025-12-15 03:15:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: Gstreamer pipeline quitting too soon.

Browse Source 
TODO: Fix error with of an overflowing ``GST:Buffer``
This commit is contained in:
Wanjohi
2024-01-03 06:09:59 +03:00
parent 60cae1e7b8
commit 4ec4dc27b5
2 changed files with 416 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main.rs
View File

@@ -75,7 +75,7 @@ async fn main() -> anyhow::Result<()> {
quinn::Endpoint::client(config.bind)?; quinn::Endpoint::client(config.bind)?;
endpoint.set_default_client_config(quinn_client_config); endpoint.set_default_client_config(quinn_client_config);
log::info!("connecting to relay: url={}", config.url); println!("connecting to relay: url={}", config.url);
let session = webtransport_quinn::connect(&endpoint, &config.url) let session = webtransport_quinn::connect(&endpoint, &config.url)
.await .await

254
src/media.rs
View File

@@ -6,10 +6,10 @@ use std::sync::{Arc, Mutex};
use moq_transport::cache::{broadcast, fragment, segment, track}; use moq_transport::cache::{broadcast, fragment, segment, track};
use moq_transport::VarInt; use moq_transport::VarInt;
use std::collections::HashMap;
use std::io::Cursor;
use serde_json::json; use serde_json::json;
use std::cmp::max; use std::cmp::max;
use std::collections::HashMap;
use std::io::Cursor;
use std::time; use std::time;
use mp4::{self, ReadBox}; use mp4::{self, ReadBox};
@@ -64,6 +64,9 @@ impl Mp4Parser {
let mut atom_bytes = Vec::with_capacity(atom_size); let mut atom_bytes = Vec::with_capacity(atom_size);
// TODO: Swap vectors? // TODO: Swap vectors?
atom_bytes.extend_from_slice(&self.buf[0..atom_size]); atom_bytes.extend_from_slice(&self.buf[0..atom_size]);
println!("self.buffer length in Mp4 parser {:?}", self.buf.len());
println!("atom size {:?}", atom_size);
assert_eq!(self.buf.len(), atom_size); assert_eq!(self.buf.len(), atom_size);
self.buf.clear(); self.buf.clear();
Some(Mp4Atom { Some(Mp4Atom {
@@ -116,6 +119,8 @@ pub struct GST {}
impl GST { impl GST {
pub async fn run(mut broadcast: broadcast::Publisher) -> anyhow::Result<()> { pub async fn run(mut broadcast: broadcast::Publisher) -> anyhow::Result<()> {
println!("starting up GST.run");
gst::init()?; gst::init()?;
//FIXME: add audio pipeline //FIXME: add audio pipeline
@@ -227,27 +232,49 @@ impl GST {
appsink.set_callbacks( appsink.set_callbacks(
gst_app::AppSinkCallbacks::builder() gst_app::AppSinkCallbacks::builder()
.new_sample(move |sink| { .new_sample(move |sink| {
let sample = sink.pull_sample().map_err(|_| gst::FlowError::Eos)?; let sample = sink
.pull_sample()
.with_context(|| "Error pulling sample")
.map_err(|e| {
eprintln!("{:?}", e);
gst::FlowError::Eos
})?;
// The muxer only outputs non-empty buffer lists // The muxer only outputs non-empty buffer lists
let buffer_list = sample.buffer_list_owned().expect("no buffer list"); let buffer_list = sample.buffer_list_owned().expect("no buffer list");
println!("buffer is empty {:?}", buffer_list.is_empty());
assert!(!buffer_list.is_empty()); assert!(!buffer_list.is_empty());
println!("bufferlist is this long {:?}", buffer_list.len());
let first = buffer_list.get(0).unwrap(); let first = buffer_list.get(0).unwrap();
// Each list contains a full segment, i.e. does not start with a DELTA_UNIT // Each list contains a full segment, i.e. does not start with a DELTA_UNIT
println!("first buffer has a delta unit {:?}", first.flags().contains(gst::BufferFlags::DELTA_UNIT));
assert!(!first.flags().contains(gst::BufferFlags::DELTA_UNIT)); assert!(!first.flags().contains(gst::BufferFlags::DELTA_UNIT));
for buffer in &*buffer_list { for buffer in &*buffer_list {
let map = buffer.map_readable().map_err(|_| gst::FlowError::Error)?; let map = buffer
.map_readable()
.with_context(|| "Error mapping buffer to readable")
.map_err(|e| {
eprintln!("{:?}", e);
gst::FlowError::Error
})?;
let input_buf = map.as_ref(); let input_buf = map.as_ref();
let mut state = state.lock().unwrap(); let mut state = state.lock().unwrap();
//FIXME: The buffer in the mp4parser is "overflowing"
//TODO: Find another way to "slice" a buffer at a time, probably use this method https://github.com/sdroege/gst-plugin-rs/blob/d9397ef1743ac92e84784d00b93dc0877d44f966/mux/fmp4/examples/hls_live.rs#L256C17-L280C18 or this
state.mp4_parser.add(input_buf); state.mp4_parser.add(input_buf);
// Update cummulative fragment variables. // Update cummulative fragment variables.
// Buffer PTS, etc. are only valid if this buffer contains MDAT data. // Buffer PTS, etc. are only valid if this buffer contains MDAT data.
if state.mp4_parser.have_mdat() { if state.mp4_parser.have_mdat() {
println!("buffer has pts {:?}", buffer.pts().is_some());
assert!(buffer.pts().is_some()); assert!(buffer.pts().is_some());
if state.fragment_pts.is_none() || state.fragment_pts > buffer.pts() { if state.fragment_pts.is_none() || state.fragment_pts > buffer.pts() {
state.fragment_pts = buffer.pts(); state.fragment_pts = buffer.pts();
@@ -302,79 +329,131 @@ impl GST {
let mut state = state.lock().unwrap(); let mut state = state.lock().unwrap();
match state.mp4_parser.pop_atom() { match state.mp4_parser.pop_atom() {
Some(atom) => { Some(atom) => {
log::info!("atom_size={}, atom_type={}", atom.len(), atom.atom_type); log::info!(
"atom_size={}, atom_type={}",
atom.len(),
atom.atom_type
);
match atom.atom_type { match atom.atom_type {
ATOM_TYPE_FTYPE => { ATOM_TYPE_FTYPE => {
state.ftype_atom = Some(atom); state.ftype_atom = Some(atom);
log::info!("ftype_atom={:?}", state.ftype_atom); log::info!("ftype_atom={:?}", state.ftype_atom);
}, }
ATOM_TYPE_MOOV => { ATOM_TYPE_MOOV => {
state.moov_atom = Some(atom); state.moov_atom = Some(atom);
log::info!("moov_atom={:?}", state.moov_atom); log::info!("moov_atom={:?}", state.moov_atom);
match (state.ftype_atom.as_ref(), state.moov_atom.as_ref()) { match (state.ftype_atom.as_ref(), state.moov_atom.as_ref())
{
(Some(ftype_atom), Some(moov_atom)) => { (Some(ftype_atom), Some(moov_atom)) => {
let output_buf_len = ftype_atom.len() + moov_atom.len(); let output_buf_len =
let mut gst_buffer = gst::Buffer::with_size(output_buf_len).unwrap(); ftype_atom.len() + moov_atom.len();
let mut gst_buffer =
gst::Buffer::with_size(output_buf_len).unwrap();
{ {
let buffer_ref = gst_buffer.get_mut().unwrap(); let buffer_ref = gst_buffer.get_mut().unwrap();
buffer_ref.set_pts(state.fragment_pts); buffer_ref.set_pts(state.fragment_pts);
buffer_ref.set_dts(state.fragment_dts); buffer_ref.set_dts(state.fragment_dts);
let pts_plus_duration =state.fragment_max_pts_plus_duration.clone(); let pts_plus_duration = state
.fragment_max_pts_plus_duration
.clone();
let fragment_pts = state.fragment_pts.clone(); let fragment_pts = state.fragment_pts.clone();
let duration = match (pts_plus_duration, fragment_pts) { let duration =
(Some(pts_plus_duration), Some(fragment_pts)) => { match (pts_plus_duration, fragment_pts) {
Some(pts_plus_duration - fragment_pts) (
} Some(pts_plus_duration),
Some(fragment_pts),
) => Some(
pts_plus_duration - fragment_pts,
),
// Handle the case where one or both values are `None` // Handle the case where one or both values are `None`
_ => None, _ => None,
}; };
buffer_ref.set_duration(duration); buffer_ref.set_duration(duration);
buffer_ref.set_offset(state.fragment_offset.unwrap_or(gst_sys::GST_BUFFER_OFFSET_NONE)); buffer_ref.set_offset(
buffer_ref.set_offset_end(state.fragment_offset_end.unwrap_or(gst_sys::GST_BUFFER_OFFSET_NONE)); state.fragment_offset.unwrap_or(
gst_sys::GST_BUFFER_OFFSET_NONE,
),
);
buffer_ref.set_offset_end(
state.fragment_offset_end.unwrap_or(
gst_sys::GST_BUFFER_OFFSET_NONE,
),
);
//this is a header //this is a header
buffer_ref.set_flags(gst::BufferFlags::HEADER); buffer_ref.set_flags(gst::BufferFlags::HEADER);
let mut buffer_map = buffer_ref.map_writable().unwrap(); let mut buffer_map =
buffer_ref.map_writable().unwrap();
let slice = buffer_map.as_mut_slice(); let slice = buffer_map.as_mut_slice();
let mut pos = 0; let mut pos = 0;
slice[pos..pos+ftype_atom.len()].copy_from_slice(&ftype_atom.atom_bytes); slice[pos..pos + ftype_atom.len()]
.copy_from_slice(&ftype_atom.atom_bytes);
pos += ftype_atom.len(); pos += ftype_atom.len();
slice[pos..pos+moov_atom.len()].copy_from_slice(&moov_atom.atom_bytes); slice[pos..pos + moov_atom.len()]
.copy_from_slice(&moov_atom.atom_bytes);
pos += moov_atom.len(); pos += moov_atom.len();
log::info!("real size of the header atom={:?}", pos); println!(
log::info!("expected size of the header atom={:?}", output_buf_len); "real size of the header atom={:?}",
pos
);
println!(
"expected size of the header atom={:?}",
output_buf_len
);
assert_eq!(pos, output_buf_len); assert_eq!(pos, output_buf_len);
}; };
log::info!("pushing the header atom={:?}", gst_buffer); log::info!(
"pushing the header atom={:?}",
gst_buffer
);
// Create the catalog track with a single segment. // Create the catalog track with a single segment.
let mut init_track = state.broadcast.clone().create_track("0.mp4").map_err(|_| gst::FlowError::Error)?; let mut init_track = state
let init_segment = init_track.create_segment(segment::Info { .broadcast
.clone()
.create_track("0.mp4")
.map_err(|_| gst::FlowError::Error)?;
let init_segment = init_track
.create_segment(segment::Info {
sequence: VarInt::ZERO, sequence: VarInt::ZERO,
priority: 0, priority: 0,
expires: None, expires: None,
}).map_err(|_| gst::FlowError::Error)?; })
.map_err(|_| gst::FlowError::Error)?;
// Create a single fragment, optionally setting the size // Create a single fragment, optionally setting the size
let mut init_fragment = init_segment.final_fragment(VarInt::ZERO).map_err(|_| gst::FlowError::Error)?; let mut init_fragment = init_segment
.final_fragment(VarInt::ZERO)
.map_err(|_| gst::FlowError::Error)?;
let buffer_map = gst_buffer.map_readable().map_err(|_| gst::FlowError::Error)?; let buffer_map = gst_buffer
.map_readable()
.map_err(|_| gst::FlowError::Error)?;
// Create a a Vec<u8> object from the data slice // Create a a Vec<u8> object from the data slice
let bytes = buffer_map.as_slice().to_vec(); let bytes = buffer_map.as_slice().to_vec();
init_fragment.chunk(bytes.into()).map_err(|_| gst::FlowError::Error)?; init_fragment
.chunk(bytes.into())
.map_err(|_| gst::FlowError::Error)?;
// We're going to parse the moov box. // We're going to parse the moov box.
// We have to read the moov box header to correctly advance the cursor for the mp4 crate. // We have to read the moov box header to correctly advance the cursor for the mp4 crate.
let mut moov_reader = Cursor::new(moov_atom.atom_bytes.clone()); let mut moov_reader =
let moov_header = mp4::BoxHeader::read(&mut moov_reader).map_err(|_| gst::FlowError::Error)?; Cursor::new(moov_atom.atom_bytes.clone());
let moov_header =
mp4::BoxHeader::read(&mut moov_reader)
.map_err(|_| gst::FlowError::Error)?;
// Parse the moov box so we can detect the timescales for each track. // Parse the moov box so we can detect the timescales for each track.
let moov = mp4::MoovBox::read_box(&mut moov_reader, moov_header.size).map_err(|_| gst::FlowError::Error)?; let moov = mp4::MoovBox::read_box(
&mut moov_reader,
moov_header.size,
)
.map_err(|_| gst::FlowError::Error)?;
let mut tracks = HashMap::new(); let mut tracks = HashMap::new();
@@ -385,15 +464,24 @@ impl GST {
let timescale = track_timescale(&moov, id); let timescale = track_timescale(&moov, id);
// Store the track publisher in a map so we can update it later. // Store the track publisher in a map so we can update it later.
let track = broadcast.create_track(&name).map_err(|_| gst::FlowError::Error)?; let track = broadcast
.create_track(&name)
.map_err(|_| gst::FlowError::Error)?;
let track = Track::new(track, timescale); let track = Track::new(track, timescale);
tracks.insert(id, track); tracks.insert(id, track);
} }
let mut catalog = broadcast.create_track(".catalog").map_err(|_| gst::FlowError::Error)?; let mut catalog = broadcast
.create_track(".catalog")
.map_err(|_| gst::FlowError::Error)?;
// Create the catalog track // Create the catalog track
Self::serve_catalog(&mut catalog, &init_track.name, &moov).map_err(|_| gst::FlowError::Error)?; Self::serve_catalog(
&mut catalog,
&init_track.name,
&moov,
)
.map_err(|_| gst::FlowError::Error)?;
state.tracks = Some(tracks); state.tracks = Some(tracks);
state.init = Some(init_track); state.init = Some(init_track);
@@ -401,9 +489,9 @@ impl GST {
} }
_ => { _ => {
log::warn!("Received moov without ftype"); log::warn!("Received moov without ftype");
},
} }
}, }
}
ATOM_TYPE_MOOF => { ATOM_TYPE_MOOF => {
log::info!("pushing the moof_atom={:?}", atom); log::info!("pushing the moof_atom={:?}", atom);
@@ -417,14 +505,20 @@ impl GST {
}; };
let mut reader = Cursor::new(atom.atom_bytes.clone()); let mut reader = Cursor::new(atom.atom_bytes.clone());
let header = mp4::BoxHeader::read(&mut reader).map_err(|_| gst::FlowError::Error)?; let header = mp4::BoxHeader::read(&mut reader)
let moof = mp4::MoofBox::read_box(&mut reader, header.size).map_err(|_| gst::FlowError::Error)?; .map_err(|_| gst::FlowError::Error)?;
let moof = mp4::MoofBox::read_box(&mut reader, header.size)
.map_err(|_| gst::FlowError::Error)?;
// Process the moof. // Process the moof.
let fragment = Fragment::new(moof).map_err(|_| gst::FlowError::Error)?; let fragment = Fragment::new(moof)
.map_err(|_| gst::FlowError::Error)?;
// Get the track for this moof. // Get the track for this moof.
let track = tracks.get_mut(&fragment.track).context("failed to find track").map_err(|_| gst::FlowError::Error)?; let track = tracks
.get_mut(&fragment.track)
.context("failed to find track")
.map_err(|_| gst::FlowError::Error)?;
// Save the track ID for the next iteration, which must be a mdat. // Save the track ID for the next iteration, which must be a mdat.
if current.clone().is_none() { if current.clone().is_none() {
@@ -435,14 +529,20 @@ impl GST {
current.replace(fragment.track); current.replace(fragment.track);
// Publish the moof header, creating a new segment if it's a keyframe. // Publish the moof header, creating a new segment if it's a keyframe.
track.header(atom.atom_bytes.clone(), fragment).context("failed to publish moof").map_err(|_| gst::FlowError::Error)?; track
.header(atom.atom_bytes.clone(), fragment)
}, .context("failed to publish moof")
.map_err(|_| gst::FlowError::Error)?;
}
ATOM_TYPE_MDAT => { ATOM_TYPE_MDAT => {
log::info!("pushing the mdat_atom={:?}", atom); log::info!("pushing the mdat_atom={:?}", atom);
// Get the track ID from the previous moof. // Get the track ID from the previous moof.
let track = state.current.take().context("missing moof").map_err(|_| gst::FlowError::Error)?; let track = state
.current
.take()
.context("missing moof")
.map_err(|_| gst::FlowError::Error)?;
let tracks = if let Some(tracks) = &mut state.tracks { let tracks = if let Some(tracks) = &mut state.tracks {
tracks tracks
@@ -451,19 +551,25 @@ impl GST {
return Err(gst::FlowError::Error); return Err(gst::FlowError::Error);
}; };
let track = tracks.get_mut(&track).context("failed to find track").map_err(|_| gst::FlowError::Error)?; let track = tracks
.get_mut(&track)
.context("failed to find track")
.map_err(|_| gst::FlowError::Error)?;
// Publish the mdat atom. // Publish the mdat atom.
track.data(atom.atom_bytes.clone()).context("failed to publish mdat").map_err(|_| gst::FlowError::Error)?; track
}, .data(atom.atom_bytes.clone())
.context("failed to publish mdat")
.map_err(|_| gst::FlowError::Error)?;
}
_ => { _ => {
log::warn!("Unknown atom type {:?}", atom); log::warn!("Unknown atom type {:?}", atom);
},
} }
}, }
}
None => break, None => break,
} }
}; }
Ok(gst::FlowSuccess::Ok) Ok(gst::FlowSuccess::Ok)
}) })
@@ -473,6 +579,38 @@ impl GST {
.build(), .build(),
); );
pipeline.set_state(gst::State::Playing)?;
let bus = pipeline
.bus()
.expect("Pipeline without bus. Shouldn't happen!");
for msg in bus.iter_timed(gst::ClockTime::NONE) {
use gst::MessageView;
match msg.view() {
MessageView::Eos(..) => {
println!("EOS");
break;
}
MessageView::Error(err) => {
pipeline.set_state(gst::State::Null)?;
eprintln!(
"Got error from {}: {} ({})",
msg.src()
.map(|s| String::from(s.path_string()))
.unwrap_or_else(|| "None".into()),
err.error(),
err.debug().unwrap_or_else(|| "".into()),
);
break;
}
_ => (),
}
}
pipeline.set_state(gst::State::Null)?;
Ok(()) Ok(())
} }
@@ -482,6 +620,8 @@ impl GST {
init_track_name: &str, init_track_name: &str,
moov: &mp4::MoovBox, moov: &mp4::MoovBox,
) -> Result<(), anyhow::Error> { ) -> Result<(), anyhow::Error> {
println!("serving the catalog");
let segment = track.create_segment(segment::Info { let segment = track.create_segment(segment::Info {
sequence: VarInt::ZERO, sequence: VarInt::ZERO,
priority: 0, priority: 0,
@@ -529,7 +669,10 @@ impl GST {
.es_desc .es_desc
.dec_config; .dec_config;
let codec_str = format!("mp4a.{:02x}.{}", desc.object_type_indication, desc.dec_specific.profile); let codec_str = format!(
"mp4a.{:02x}.{}",
desc.object_type_indication, desc.dec_specific.profile
);
track["kind"] = json!("audio"); track["kind"] = json!("audio");
track["codec"] = json!(codec_str); track["codec"] = json!(codec_str);
@@ -544,7 +687,10 @@ impl GST {
} else if let Some(vp09) = &stsd.vp09 { } else if let Some(vp09) = &stsd.vp09 {
// https://github.com/gpac/mp4box.js/blob/325741b592d910297bf609bc7c400fc76101077b/src/box-codecs.js#L238 // https://github.com/gpac/mp4box.js/blob/325741b592d910297bf609bc7c400fc76101077b/src/box-codecs.js#L238
let vpcc = &vp09.vpcc; let vpcc = &vp09.vpcc;
let codec_str = format!("vp09.0.{:02x}.{:02x}.{:02x}", vpcc.profile, vpcc.level, vpcc.bit_depth); let codec_str = format!(
"vp09.0.{:02x}.{:02x}.{:02x}",
vpcc.profile, vpcc.level, vpcc.bit_depth
);
track["kind"] = json!("video"); track["kind"] = json!("video");
track["codec"] = json!(codec_str); track["codec"] = json!(codec_str);
@@ -626,7 +772,9 @@ impl Track {
sequence: VarInt::try_from(self.sequence).context("sequence too large")?, sequence: VarInt::try_from(self.sequence).context("sequence too large")?,
// Newer segments are higher priority // Newer segments are higher priority
priority: u32::MAX.checked_sub(timestamp).context("priority too large")?, priority: u32::MAX
.checked_sub(timestamp)
.context("priority too large")?,
// Delete segments after 10s. // Delete segments after 10s.
expires: Some(time::Duration::from_secs(10)), expires: Some(time::Duration::from_secs(10)),