Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
From: Zhao Zhili <quinkblack@foxmail.com>
To: ffmpeg-devel@ffmpeg.org
Cc: Zhao Zhili <quinkblack@foxmail.com>
Subject: [FFmpeg-devel] [PATCH v3 4/4] avformat/tests/movenc: test dealing with abnormal timestamp
Date: Fri, 31 Dec 2021 19:36:10 +0800
Message-ID: <tencent_763895C15DB500687202E9685A7D2EAE4E0A@qq.com> (raw)
In-Reply-To: <20211231113610.85358-1-quinkblack@foxmail.com>

---
 libavformat/tests/movenc.c | 30 +++++++++++++++++++++++++++++-
 tests/ref/fate/movenc      | 14 ++++++++++++++
 2 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/libavformat/tests/movenc.c b/libavformat/tests/movenc.c
index 2af72f11c7..79de20ee75 100644
--- a/libavformat/tests/movenc.c
+++ b/libavformat/tests/movenc.c
@@ -248,11 +248,14 @@ static void init(int bf, int audio_preroll)
 static void mux_frames(int n, int c)
 {
     int end_frames = frames + n;
+    int has_audio = 0;
     while (1) {
         uint8_t pktdata[8] = { 0 };
         av_packet_unref(pkt);
 
-        if (av_compare_ts(audio_dts, audio_st->time_base, video_dts, video_st->time_base) < 0) {
+        if (av_compare_ts(audio_dts, audio_st->time_base, video_dts, video_st->time_base) < 0 ||
+            (frames == end_frames && !has_audio)) {
+            has_audio = 1;
             pkt->dts = pkt->pts = audio_dts;
             pkt->stream_index = 1;
             pkt->duration = audio_duration;
@@ -787,6 +790,31 @@ int main(int argc, char **argv)
     finish();
     close_out();
 
+    // Abnormal difference of timestamp between two streams.
+    do_interleave = 1;
+    init_out("streams-timestamp-offset");
+    av_dict_set(&opts, "movflags", "frag_keyframe+empty_moov", 0);
+    av_dict_set(&opts, "frag_duration", "650000", 0);
+    init_fps(0, 0, 30);
+    audio_dts = INT_MAX - audio_duration / 2;
+    mux_gops(1);
+    finish();
+    close_out();
+    do_interleave = 0;
+
+    // Abnormal timestamp jump.
+    do_interleave = 1;
+    init_out("streams-timestamp-jump");
+    av_dict_set(&opts, "movflags", "frag_keyframe+empty_moov", 0);
+    av_dict_set(&opts, "frag_duration", "650000", 0);
+    init_fps(0, 0, 30);
+    mux_gops(1);
+    audio_dts = (int64_t)(INT_MAX) * 3 / 2;
+    mux_gops(1);
+    finish();
+    close_out();
+    do_interleave = 0;
+
     av_free(md5);
     av_packet_free(&pkt);
 
diff --git a/tests/ref/fate/movenc b/tests/ref/fate/movenc
index 81ea75f372..a5614f49a7 100644
--- a/tests/ref/fate/movenc
+++ b/tests/ref/fate/movenc
@@ -151,3 +151,17 @@ write_data len 900, time 0, type sync atom moof
 write_data len 908, time 1000000, type sync atom moof
 write_data len 148, time nopts, type trailer atom -
 3be575022e446855bca1e45b7942cc0c 3115 empty-moov-neg-cts
+write_data len 36, time nopts, type header atom ftyp
+write_data len 1123, time nopts, type header atom -
+write_data len 280, time 0, type sync atom moof
+write_data len 288, time 666667, type boundary atom moof
+write_data len 129, time nopts, type trailer atom -
+60d2f9877f29bd154b0047dfbca8e36a 1856 streams-timestamp-offset
+write_data len 36, time nopts, type header atom ftyp
+write_data len 1123, time nopts, type header atom -
+write_data len 588, time 0, type sync atom moof
+write_data len 472, time 666667, type boundary atom moof
+write_data len 280, time 1000000, type sync atom moof
+write_data len 288, time 1666667, type boundary atom moof
+write_data len 205, time nopts, type trailer atom -
+15951eb265243ad827446117f3a24099 2992 streams-timestamp-jump
-- 
2.31.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

      parent reply	other threads:[~2021-12-31 11:36 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20211231113610.85358-1-quinkblack@foxmail.com>
2021-12-31 11:36 ` [FFmpeg-devel] [PATCH v3 2/4] avformat/movenc: add missing timestamp check when peek from interleave queues Zhao Zhili
2021-12-31 11:36 ` [FFmpeg-devel] [PATCH v3 3/4] avformat/movenc: check track start_dts before use it Zhao Zhili
2021-12-31 11:36 ` Zhao Zhili [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=tencent_763895C15DB500687202E9685A7D2EAE4E0A@qq.com \
    --to=quinkblack@foxmail.com \
    --cc=ffmpeg-devel@ffmpeg.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
		ffmpegdev@gitmailbox.com
	public-inbox-index ffmpegdev

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git