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-26 05:21:00 +00:00
Code Issues Projects Releases Wiki Activity

fmp4mux: Pass one more buffer in test_buffer_multi_stream_short_gops test

Browse source 
This works around non-determinism in aggregator where depending on
timing it can happen that it consumes all buffers from both pads or
waits for another buffer on one pad while the other one already has one.

The effect in this test was that it sometimes timed out. By providing
one more buffer it is guaranteed now that at this point the muxer is
beyond the end of the first fragment.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/1081>
This commit is contained in:
Sebastian Dröge 2023-02-09 20:36:44 +02:00
parent 5965ff4364
commit 4d9b6c5472
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
mux/fmp4/tests/tests.rs
View file

@ -1138,8 +1138,8 @@ fn test_buffer_multi_stream_short_gops() {
let output_offset = (60 * 60 * 1000).seconds(); let output_offset = (60 * 60 * 1000).seconds();
// Push 8 buffers of 1s each, 1st, 4th and 7th buffer without DELTA_UNIT flag // Push 9 buffers of 1s each, 1st, 4th and 7th buffer without DELTA_UNIT flag
for i in 0..8 { for i in 0..9 {
let mut buffer = gst::Buffer::with_size(1).unwrap(); let mut buffer = gst::Buffer::with_size(1).unwrap();
{ {
let buffer = buffer.get_mut().unwrap(); let buffer = buffer.get_mut().unwrap();
@ -1161,7 +1161,7 @@ fn test_buffer_multi_stream_short_gops() {
} }
assert_eq!(h2.push(buffer), Ok(gst::FlowSuccess::Ok)); assert_eq!(h2.push(buffer), Ok(gst::FlowSuccess::Ok));
if i == 2 || i == 7 { if i == 2 || i == 8 {
let ev = loop { let ev = loop {
let ev = h1.pull_upstream_event().unwrap(); let ev = h1.pull_upstream_event().unwrap();
if ev.type_() != gst::EventType::Reconfigure if ev.type_() != gst::EventType::Reconfigure
@ -1254,12 +1254,12 @@ fn test_buffer_multi_stream_short_gops() {
assert_eq!(fragment_header.flags(), gst::BufferFlags::HEADER); assert_eq!(fragment_header.flags(), gst::BufferFlags::HEADER);
assert_eq!(fragment_header.pts(), Some(3.seconds() + output_offset)); assert_eq!(fragment_header.pts(), Some(3.seconds() + output_offset));
assert_eq!(fragment_header.dts(), Some(3.seconds() + output_offset)); assert_eq!(fragment_header.dts(), Some(3.seconds() + output_offset));
assert_eq!(fragment_header.duration(), Some(5.seconds())); assert_eq!(fragment_header.duration(), Some(6.seconds()));
for i in 3..8 { for i in 3..9 {
for j in 0..2 { for j in 0..2 {
let buffer = h1.pull().unwrap(); let buffer = h1.pull().unwrap();
if i == 7 && j == 1 { if i == 8 && j == 1 {
assert_eq!( assert_eq!(
buffer.flags(), buffer.flags(),
gst::BufferFlags::DELTA_UNIT | gst::BufferFlags::MARKER gst::BufferFlags::DELTA_UNIT | gst::BufferFlags::MARKER