From c5e6c0b5f680bbcaa7a172b6b241f5a920df983a Mon Sep 17 00:00:00 2001 From: erankor Date: Mon, 11 Jun 2018 14:45:11 +0300 Subject: [PATCH] qt-faststart: add fate test for stco overflow verify that the stco atom is upgraded to co64 when the addition of moov size to the offsets results in an overflow Signed-off-by: Michael Niedermayer --- tests/Makefile | 4 +++- tests/fate/mov.mak | 9 ++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index 98d7b6d608..409d88a9f1 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -182,7 +182,7 @@ FATE-$(CONFIG_FFPROBE) += $(FATE_FFPROBE) FATE_SAMPLES_AVCONV += $(FATE_SAMPLES_AVCONV-yes) FATE_SAMPLES_FFMPEG += $(FATE_SAMPLES_FFMPEG-yes) -FATE_EXTERN-$(CONFIG_FFMPEG) += $(FATE_SAMPLES_AVCONV) $(FATE_SAMPLES_FFMPEG) $(FATE_SAMPLES_FFPROBE) +FATE_EXTERN-$(CONFIG_FFMPEG) += $(FATE_SAMPLES_AVCONV) $(FATE_SAMPLES_FFMPEG) $(FATE_SAMPLES_FFPROBE) $(FATE_SAMPLES_FASTSTART) FATE_EXTERN += $(FATE_EXTERN-yes) FATE += $(FATE-yes) @@ -194,6 +194,8 @@ $(FATE_FFMPEG) $(FATE_SAMPLES_AVCONV) $(FATE_SAMPLES_FFMPEG): ffmpeg$(PROGSSUF)$ $(FATE_FFPROBE) $(FATE_SAMPLES_FFPROBE): ffprobe$(PROGSSUF)$(EXESUF) +$(FATE_SAMPLES_FASTSTART): tools/qt-faststart$(PROGSSUF)$(EXESUF) + ifdef SAMPLES FATE += $(FATE_FULL) $(FATE_FULL-yes) FATE += $(FATE_EXTERN) diff --git a/tests/fate/mov.mak b/tests/fate/mov.mak index 960b1867dd..b9c1ad9d3a 100644 --- a/tests/fate/mov.mak +++ b/tests/fate/mov.mak @@ -28,10 +28,13 @@ FATE_MOV_FFPROBE = fate-mov-neg-firstpts-discard \ fate-mov-guess-delay-2 \ fate-mov-guess-delay-3 \ +FATE_MOV_FASTSTART = fate-mov-faststart-4gb-overflow \ + FATE_SAMPLES_AVCONV += $(FATE_MOV) FATE_SAMPLES_FFPROBE += $(FATE_MOV_FFPROBE) +FATE_SAMPLES_FASTSTART += $(FATE_MOV_FASTSTART) -fate-mov: $(FATE_MOV) $(FATE_MOV_FFPROBE) +fate-mov: $(FATE_MOV) $(FATE_MOV_FFPROBE) $(FATE_MOV_FASTSTART) # Make sure we handle edit lists correctly in normal cases. fate-mov-1elist-noctts: CMD = framemd5 -i $(TARGET_SAMPLES)/mov/mov-1elist-noctts.mov @@ -109,3 +112,7 @@ fate-mov-gpmf-remux: REF = 8f48e435ee1f6b7e173ea756141eabf3 fate-mov-guess-delay-1: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_entries stream=has_b_frames -select_streams v $(TARGET_SAMPLES)/h264/h264_3bf_nopyramid_nobsrestriction.mp4 fate-mov-guess-delay-2: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_entries stream=has_b_frames -select_streams v $(TARGET_SAMPLES)/h264/h264_3bf_pyramid_nobsrestriction.mp4 fate-mov-guess-delay-3: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_entries stream=has_b_frames -select_streams v $(TARGET_SAMPLES)/h264/h264_4bf_pyramid_nobsrestriction.mp4 + +fate-mov-faststart-4gb-overflow: CMD = run tools/qt-faststart$(PROGSSUF)$(EXESUF) $(TARGET_SAMPLES)/mov/faststart-4gb-overflow.mov faststart-4gb-overflow-output.mov > /dev/null ; md5sum faststart-4gb-overflow-output.mov | cut -d " " -f1 ; rm faststart-4gb-overflow-output.mov +fate-mov-faststart-4gb-overflow: CMP = oneline +fate-mov-faststart-4gb-overflow: REF = bc875921f151871e787c4b4023269b29