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

fmp4mux: Add support for multiple input streams

Browse source
This commit is contained in:
Sebastian Dröge 2022-05-12 13:44:20 +03:00
parent 31a32a7e2e
commit e06665b92d
3 changed files with 797 additions and 362 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1070
generic/fmp4/src/fmp4mux/imp.rs
View file

File diff suppressed because it is too large Load diff

9
generic/fmp4/src/fmp4mux/mod.rs
View file

@ -99,6 +99,15 @@ pub(crate) enum Variant {
DASH,
}
impl Variant {
pub(crate) fn is_single_stream(self) -> bool {
match self {
Variant::ISO => false,
Variant::CMAF | Variant::DASH => true,
}
}
}
#[derive(Debug)]
pub(crate) struct FragmentOffset {
time: gst::ClockTime,

80
generic/fmp4/tests/tests.rs
View file

@ -6,6 +6,8 @@
// SPDX-License-Identifier: MPL-2.0
//
use gst::prelude::*;
fn init() {
use std::sync::Once;
static INIT: Once = Once::new();
@ -16,12 +18,18 @@ fn init() {
});
}
#[test]
fn test_buffer_flags() {
init();
fn test_buffer_flags_single_stream(cmaf: bool) {
let mut h = if cmaf {
gst_check::Harness::new("cmafmux")
} else {
gst_check::Harness::with_padnames("isofmp4mux", Some("sink_0"), Some("src"))
};
// 5s fragment duration
let mut h = gst_check::Harness::new_parse("isofmp4mux fragment-duration=5000000000");
h.element()
.unwrap()
.set_property("fragment-duration", gst::ClockTime::from_seconds(5));
h.set_src_caps(
gst::Caps::builder("video/x-h264")
.field("width", 1920i32)
@ -34,6 +42,12 @@ fn test_buffer_flags() {
);
h.play();
let output_offset = if cmaf {
gst::ClockTime::ZERO
} else {
gst::ClockTime::from_seconds(60 * 60 * 1000)
};
// Push 7 buffers of 1s each, 1st and last buffer without DELTA_UNIT flag
for i in 0..7 {
let mut buffer = gst::Buffer::with_size(1).unwrap();
@ -75,13 +89,19 @@ fn test_buffer_flags() {
header.flags(),
gst::BufferFlags::HEADER | gst::BufferFlags::DISCONT
);
assert_eq!(header.pts(), Some(gst::ClockTime::ZERO));
assert_eq!(header.dts(), Some(gst::ClockTime::ZERO));
assert_eq!(header.pts(), Some(gst::ClockTime::ZERO + output_offset));
assert_eq!(header.dts(), Some(gst::ClockTime::ZERO + output_offset));
let fragment_header = h.pull().unwrap();
assert_eq!(fragment_header.flags(), gst::BufferFlags::HEADER);
assert_eq!(fragment_header.pts(), Some(gst::ClockTime::ZERO));
assert_eq!(fragment_header.dts(), Some(gst::ClockTime::ZERO));
assert_eq!(
fragment_header.pts(),
Some(gst::ClockTime::ZERO + output_offset)
);
assert_eq!(
fragment_header.dts(),
Some(gst::ClockTime::ZERO + output_offset)
);
assert_eq!(
fragment_header.duration(),
Some(gst::ClockTime::from_seconds(5))
@ -97,8 +117,14 @@ fn test_buffer_flags() {
} else {
assert_eq!(buffer.flags(), gst::BufferFlags::DELTA_UNIT);
}
assert_eq!(buffer.pts(), Some(gst::ClockTime::from_seconds(i)));
assert_eq!(buffer.dts(), Some(gst::ClockTime::from_seconds(i)));
assert_eq!(
buffer.pts(),
Some(gst::ClockTime::from_seconds(i) + output_offset)
);
assert_eq!(
buffer.dts(),
Some(gst::ClockTime::from_seconds(i) + output_offset)
);
assert_eq!(buffer.duration(), Some(gst::ClockTime::SECOND));
}
@ -106,8 +132,14 @@ fn test_buffer_flags() {
let fragment_header = h.pull().unwrap();
assert_eq!(fragment_header.flags(), gst::BufferFlags::HEADER);
assert_eq!(fragment_header.pts(), Some(gst::ClockTime::from_seconds(5)));
assert_eq!(fragment_header.dts(), Some(gst::ClockTime::from_seconds(5)));
assert_eq!(
fragment_header.pts(),
Some(gst::ClockTime::from_seconds(5) + output_offset)
);
assert_eq!(
fragment_header.dts(),
Some(gst::ClockTime::from_seconds(5) + output_offset)
);
assert_eq!(
fragment_header.duration(),
Some(gst::ClockTime::from_seconds(2))
@ -123,8 +155,14 @@ fn test_buffer_flags() {
} else {
assert_eq!(buffer.flags(), gst::BufferFlags::DELTA_UNIT);
}
assert_eq!(buffer.pts(), Some(gst::ClockTime::from_seconds(i)));
assert_eq!(buffer.dts(), Some(gst::ClockTime::from_seconds(i)));
assert_eq!(
buffer.pts(),
Some(gst::ClockTime::from_seconds(i) + output_offset)
);
assert_eq!(
buffer.dts(),
Some(gst::ClockTime::from_seconds(i) + output_offset)
);
assert_eq!(buffer.duration(), Some(gst::ClockTime::SECOND));
}
@ -137,3 +175,17 @@ fn test_buffer_flags() {
let ev = h.pull_event().unwrap();
assert_eq!(ev.type_(), gst::EventType::Eos);
}
#[test]
fn test_buffer_flags_single_stream_cmaf() {
init();
test_buffer_flags_single_stream(true);
}
#[test]
fn test_buffer_flags_single_stream_iso() {
init();
test_buffer_flags_single_stream(false);
}