diff mbox series

[FFmpeg-devel,2/2] FATE: Add test for probing MOV/MP4 files with extended box sizes

Message ID 20210318161456.1103652-2-derek.buitenhuis@gmail.com
State Superseded
Headers show
Series [FFmpeg-devel,1/2] avformat/mov: Fix extended atom size buffer length check
Related show

Checks

Context Check Description
andriy/x86_make success Make finished
andriy/x86_make_fate fail Make fate failed
andriy/PPC64_make success Make finished
andriy/PPC64_make_fate warning Make fate failed

Commit Message

Derek Buitenhuis March 18, 2021, 4:14 p.m. UTC
The test sample has to have no file extension, otherwise probing
happens to work, based off file extension alone, and we want to
test the actual proobing function.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
---
I will reply to this email with the sample file in question.
---
 tests/fate/mov.mak                   | 3 +++
 tests/ref/fate/mov-mp4-extended-atom | 1 +
 2 files changed, 4 insertions(+)
 create mode 100644 tests/ref/fate/mov-mp4-extended-atom

Comments

Derek Buitenhuis March 18, 2021, 4:45 p.m. UTC | #1
On 18/03/2021 16:14, Derek Buitenhuis wrote:
> The test sample has to have no file extension, otherwise probing
> happens to work, based off file extension alone, and we want to
> test the actual proobing function.
> 
> Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
> ---
> I will reply to this email with the sample file in question.
> ---

I've attached the sample file to this email, as it's quite small.

Could someone add it to the FATE rsync server? In theory I have
access to do this, but I have no idea how to, and there are no
docs AFAIK.

- Derek
Derek Buitenhuis March 18, 2021, 4:46 p.m. UTC | #2
On 18/03/2021 16:14, Derek Buitenhuis wrote:
> The test sample has to have no file extension, otherwise probing
> happens to work, based off file extension alone, and we want to
> test the actual proobing function.
> 
> Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
> ---
> I will reply to this email with the sample file in question.
> ---

I've attached the sample file to this email, as it's quite small.

Could someone add it to the FATE rsync server? In theory I have
access to do this, but I have no idea how to, and there are no
docs AFAIK.

- Derek
Andreas Rheinhardt March 18, 2021, 4:50 p.m. UTC | #3
Derek Buitenhuis:
> The test sample has to have no file extension, otherwise probing
> happens to work, based off file extension alone, and we want to
> test the actual proobing function.
                     ^
> 
> Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
> ---
> I will reply to this email with the sample file in question.
> ---
>  tests/fate/mov.mak                   | 3 +++
>  tests/ref/fate/mov-mp4-extended-atom | 1 +
>  2 files changed, 4 insertions(+)
>  create mode 100644 tests/ref/fate/mov-mp4-extended-atom
> 
> diff --git a/tests/fate/mov.mak b/tests/fate/mov.mak
> index 0fd20fef96..e2dbd6ab10 100644
> --- a/tests/fate/mov.mak
> +++ b/tests/fate/mov.mak
> @@ -29,6 +29,7 @@ FATE_MOV_FFPROBE = fate-mov-neg-firstpts-discard \
>                     fate-mov-guess-delay-2 \
>                     fate-mov-guess-delay-3 \
>                     fate-mov-mp4-with-mov-in24-ver \
> +                   fate-mov-mp4-extended-atom

If you don't add the line continuation here, the next one will have to
modify the line you just added.

>  
>  FATE_MOV_FASTSTART = fate-mov-faststart-4gb-overflow \
>  
> @@ -124,3 +125,5 @@ fate-mov-faststart-4gb-overflow: CMP = oneline
>  fate-mov-faststart-4gb-overflow: REF = bc875921f151871e787c4b4023269b29
>  
>  fate-mov-mp4-with-mov-in24-ver: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_entries stream=codec_name -select_streams 1 $(TARGET_SAMPLES)/mov/mp4-with-mov-in24-ver.mp4
> +
> +fate-mov-mp4-extended-atom: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_packets -print_format compact -select_streams v $(TARGET_SAMPLES)/mov/extended_atom_size_probe
> diff --git a/tests/ref/fate/mov-mp4-extended-atom b/tests/ref/fate/mov-mp4-extended-atom
> new file mode 100644
> index 0000000000..9d01abb2f5
> --- /dev/null
> +++ b/tests/ref/fate/mov-mp4-extended-atom
> @@ -0,0 +1 @@
> +packet|codec_type=video|stream_index=0|pts=0|pts_time=0.000000|dts=0|dts_time=0.000000|duration=1001|duration_time=0.033367|size=14798|pos=16|flags=K_
>
Derek Buitenhuis March 18, 2021, 4:56 p.m. UTC | #4
On 18/03/2021 16:50, Andreas Rheinhardt wrote:
>> The test sample has to have no file extension, otherwise probing
>> happens to work, based off file extension alone, and we want to
>> test the actual proobing function.
>                      ^

[...]

>>                     fate-mov-mp4-with-mov-in24-ver \
>> +                   fate-mov-mp4-extended-atom
> 
> If you don't add the line continuation here, the next one will have to
> modify the line you just added.

Both fixed, and v2 sent.

- Derek
diff mbox series

Patch

diff --git a/tests/fate/mov.mak b/tests/fate/mov.mak
index 0fd20fef96..e2dbd6ab10 100644
--- a/tests/fate/mov.mak
+++ b/tests/fate/mov.mak
@@ -29,6 +29,7 @@  FATE_MOV_FFPROBE = fate-mov-neg-firstpts-discard \
                    fate-mov-guess-delay-2 \
                    fate-mov-guess-delay-3 \
                    fate-mov-mp4-with-mov-in24-ver \
+                   fate-mov-mp4-extended-atom
 
 FATE_MOV_FASTSTART = fate-mov-faststart-4gb-overflow \
 
@@ -124,3 +125,5 @@  fate-mov-faststart-4gb-overflow: CMP = oneline
 fate-mov-faststart-4gb-overflow: REF = bc875921f151871e787c4b4023269b29
 
 fate-mov-mp4-with-mov-in24-ver: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_entries stream=codec_name -select_streams 1 $(TARGET_SAMPLES)/mov/mp4-with-mov-in24-ver.mp4
+
+fate-mov-mp4-extended-atom: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_packets -print_format compact -select_streams v $(TARGET_SAMPLES)/mov/extended_atom_size_probe
diff --git a/tests/ref/fate/mov-mp4-extended-atom b/tests/ref/fate/mov-mp4-extended-atom
new file mode 100644
index 0000000000..9d01abb2f5
--- /dev/null
+++ b/tests/ref/fate/mov-mp4-extended-atom
@@ -0,0 +1 @@ 
+packet|codec_type=video|stream_index=0|pts=0|pts_time=0.000000|dts=0|dts_time=0.000000|duration=1001|duration_time=0.033367|size=14798|pos=16|flags=K_