summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2015-11-10 23:33:44 +0200
committerMartin Storsjö <martin@martin.st>2015-11-11 22:53:42 +0200
commit1d62ee38894afb696674db78cee8f8d89204a8fe (patch)
treeeddaee22a2ad7cea8bebc7e7039a85a3f64ce582
parentbef3b1f59f036aba4a5fe599b2480f6bd9e6b280 (diff)
movenc: Add a unit test for signaling of the track start times
Signed-off-by: Martin Storsjö <martin@martin.st>
-rw-r--r--libavformat/movenc-test.c51
-rw-r--r--tests/ref/fate/movenc4
2 files changed, 55 insertions, 0 deletions
diff --git a/libavformat/movenc-test.c b/libavformat/movenc-test.c
index a549854fc1..0a1384e281 100644
--- a/libavformat/movenc-test.c
+++ b/libavformat/movenc-test.c
@@ -280,6 +280,23 @@ static void skip_gops(int n)
skip_write = 0;
}
+static void signal_init_ts(void)
+{
+ AVPacket pkt;
+ av_init_packet(&pkt);
+ pkt.size = 0;
+ pkt.data = NULL;
+
+ pkt.stream_index = 0;
+ pkt.dts = video_dts;
+ pkt.pts = 0;
+ av_write_frame(ctx, &pkt);
+
+ pkt.stream_index = 1;
+ pkt.dts = pkt.pts = audio_dts;
+ av_write_frame(ctx, &pkt);
+}
+
static void finish(void)
{
av_write_trailer(ctx);
@@ -572,6 +589,40 @@ int main(int argc, char **argv)
finish();
+ // Test discontinously written fragments with b-frames and audio preroll,
+ // properly signaled.
+ av_dict_set(&opts, "movflags", "frag_custom+delay_moov+dash", 0);
+ init(1, 1);
+ mux_gops(1);
+ init_out("delay-moov-elst-signal-init");
+ av_write_frame(ctx, NULL); // Output the moov
+ close_out();
+ memcpy(header, hash, HASH_SIZE);
+ av_write_frame(ctx, NULL); // Output the first fragment
+ init_out("delay-moov-elst-signal-second-frag");
+ mux_gops(1);
+ av_write_frame(ctx, NULL); // Output the second fragment
+ close_out();
+ memcpy(content, hash, HASH_SIZE);
+ finish();
+
+ av_dict_set(&opts, "movflags", "frag_custom+delay_moov+dash+frag_discont", 0);
+ av_dict_set(&opts, "fragment_index", "2", 0);
+ init(1, 1);
+ signal_init_ts();
+ skip_gops(1);
+ mux_gops(1); // Write the second fragment
+ init_out("delay-moov-elst-signal-init-discont");
+ av_write_frame(ctx, NULL); // Output the moov
+ close_out();
+ check(!memcmp(hash, header, HASH_SIZE), "discontinuously written header differs");
+ init_out("delay-moov-elst-signal-second-frag-discont");
+ av_write_frame(ctx, NULL); // Output the second fragment
+ close_out();
+ check(!memcmp(hash, content, HASH_SIZE), "discontinuously written fragment differs");
+ finish();
+
+
// Test VFR content, with sidx atoms (which declare the pts duration
// of a fragment, forcing overriding the start pts of the next one).
// Here, the fragment duration in pts is significantly different from
diff --git a/tests/ref/fate/movenc b/tests/ref/fate/movenc
index fec7db5952..b1196a20bd 100644
--- a/tests/ref/fate/movenc
+++ b/tests/ref/fate/movenc
@@ -20,5 +20,9 @@ f12baf7c4269695817337192c7069328 996 delay-moov-content
41afdc44b0e376fae49a730afe0c53c2 704 delay-moov-elst-second-frag
93d5d944d10570857b726dd1c482bc03 1207 delay-moov-elst-init-discont
41afdc44b0e376fae49a730afe0c53c2 704 delay-moov-elst-second-frag-discont
+bf648056bf98cf98b0fbd1334d788423 1243 delay-moov-elst-signal-init
+13b8487a4f004ec9f1db543aee1e5e18 704 delay-moov-elst-signal-second-frag
+bf648056bf98cf98b0fbd1334d788423 1243 delay-moov-elst-signal-init-discont
+13b8487a4f004ec9f1db543aee1e5e18 704 delay-moov-elst-signal-second-frag-discont
4407220c69fb6d96fd3f4daea05140c3 3647 vfr
4407220c69fb6d96fd3f4daea05140c3 3647 vfr-noduration