[FFmpeg-devel] [PATCH v2] avformat/imf: add IMF CPL with repeated resources to FATE
James Almer
jamrial at gmail.com
Mon Jan 3 01:41:53 EET 2022
On 1/2/2022 8:38 PM, Pierre-Anthony Lemieux wrote:
> On Sun, Jan 2, 2022 at 3:28 PM James Almer <jamrial at gmail.com> wrote:
>>
>>
>>
>> On 1/2/2022 8:16 PM, pal at sandflow.com wrote:
>>> From: Pierre-Anthony Lemieux <pal at palemieux.com>
>>>
>>> Signed-off-by: Pierre-Anthony Lemieux <pal at palemieux.com>
>>> ---
>>>
>>> Notes:
>>> The `fate-imf-cpl-with-repeat` target requires following files (<256 kB)
>>> to placed under $(TARGET_SAMPLES)/imf/countdown/:
>>> http://ffmpeg-imf-samples-public.s3-website-us-west-1.amazonaws.com/countdown/ASSETMAP.xml
>>> http://ffmpeg-imf-samples-public.s3-website-us-west-1.amazonaws.com/countdown/CPL_f5095caa-f204-4e1c-8a84-7af48c7ae16b.xml
>>> http://ffmpeg-imf-samples-public.s3-website-us-west-1.amazonaws.com/countdown/PKL_4671220f-c87a-4660-bf2a-6ef848791a2c.xml
>>> http://ffmpeg-imf-samples-public.s3-website-us-west-1.amazonaws.com/countdown/frame-counter.mxf
>>>
>>> tests/Makefile | 1 +
>>> tests/fate/imf.mak | 12 ++++++++
>>> tests/ref/fate/imf-cpl-with-repeat | 46 ++++++++++++++++++++++++++++++
>>> 3 files changed, 59 insertions(+)
>>> create mode 100644 tests/fate/imf.mak
>>> create mode 100644 tests/ref/fate/imf-cpl-with-repeat
>>>
>>> diff --git a/tests/Makefile b/tests/Makefile
>>> index 87807ed31f..c4c31ae871 100644
>>> --- a/tests/Makefile
>>> +++ b/tests/Makefile
>>> @@ -153,6 +153,7 @@ include $(SRC_PATH)/tests/fate/hlsenc.mak
>>> include $(SRC_PATH)/tests/fate/hw.mak
>>> include $(SRC_PATH)/tests/fate/id3v2.mak
>>> include $(SRC_PATH)/tests/fate/image.mak
>>> +include $(SRC_PATH)/tests/fate/imf.mak
>>> include $(SRC_PATH)/tests/fate/indeo.mak
>>> include $(SRC_PATH)/tests/fate/libavcodec.mak
>>> include $(SRC_PATH)/tests/fate/libavdevice.mak
>>> diff --git a/tests/fate/imf.mak b/tests/fate/imf.mak
>>> new file mode 100644
>>> index 0000000000..c9490d665b
>>> --- /dev/null
>>> +++ b/tests/fate/imf.mak
>>> @@ -0,0 +1,12 @@
>>> +FATE_IMF += fate-imf-cpl-with-repeat
>>> +fate-imf-cpl-with-repeat: $(TARGET_SAMPLES)/imf/countdown/CPL_f5095caa-f204-4e1c-8a84-7af48c7ae16b.xml
>>> +fate-imf-cpl-with-repeat: $(TARGET_SAMPLES)/imf/countdown/ASSETMAP.xml
>>> +fate-imf-cpl-with-repeat: $(TARGET_SAMPLES)/imf/countdown/frame-counter.mxf
>>> +fate-imf-cpl-with-repeat: $(TARGET_SAMPLES)/imf/countdown/PKL_4671220f-c87a-4660-bf2a-6ef848791a2c.xml
>>
>> No need for these four lines. They wrongly make the build system assume
>> it needs to create these files if they are not available.
>>
>> Simply by adding the test to the FATE_SAMPLES_AVCONV list like you're
>> doing below will make sure it's not run unless a samples directory was
>> provided.
>>
>>> +fate-imf-cpl-with-repeat: CMD = framecrc -i $(TARGET_SAMPLES)/imf/countdown/CPL_f5095caa-f204-4e1c-8a84-7af48c7ae16b.xml -c:v copy
>>> +
>>> +FATE_IMF-$(CONFIG_IMF_DEMUXER) += $(FATE_IMF)
>>
>> This test also needs the mxf demuxer, right? Should instead be
>>
>> $(call ALLYES, IMF_DEMUXER MXF_DEMUXER) if so.
>>
>>> +
>>> +FATE_SAMPLES_AVCONV += $(FATE_IMF-yes)
>>> +
>>> +fate-imf: $(FATE_IMF-yes)
>>
>> You can do
>>
>> FATE_SAMPLES_AVCONV-$(call ALLYES, IMF_DEMUXER MXF_DEMUXER) += $(FATE_IMF)
>>
>> fate-imf: $(FATE_IMF)
>>
>> And not bother adding a FATE_IMF-yes variable.
>
> ... so basically:
>
> ```
> FATE_IMF += fate-imf-cpl-with-repeat
> fate-imf-cpl-with-repeat: CMD = framecrc -i
> $(TARGET_SAMPLES)/imf/countdown/CPL_f5095caa-f204-4e1c-8a84-7af48c7ae16b.xml
> -c:v copy
> FATE_SAMPLES_AVCONV-$(call ALLYES, IMF_DEMUXER MXF_DEMUXER) += $(FATE_IMF)
> fate-imf: $(FATE_IMF)
> ```
Yes.
>
>>
>>> diff --git a/tests/ref/fate/imf-cpl-with-repeat b/tests/ref/fate/imf-cpl-with-repeat
>>> new file mode 100644
>>> index 0000000000..38092d542c
>>> --- /dev/null
>>> +++ b/tests/ref/fate/imf-cpl-with-repeat
>>> @@ -0,0 +1,46 @@
>>> +#tb 0: 1/24
>>> +#media_type 0: video
>>> +#codec_id 0: jpeg2000
>>> +#dimensions 0: 1920x1080
>>> +#sar 0: 0/1
>>> +0, 0, 0, 1, 5034, 0x29a972c1
>>> +0, 1, 1, 1, 7214, 0x704fb452
>>> +0, 2, 2, 1, 8496, 0xee9d2692
>>> +0, 3, 3, 1, 4917, 0xd35c1a2f
>>> +0, 4, 4, 1, 8803, 0xdc01ad91
>>> +0, 5, 5, 1, 8426, 0xacc4413a
>>> +0, 6, 6, 1, 9626, 0x46865f1e
>>> +0, 7, 7, 1, 7409, 0xa21efc69
>>> +0, 8, 8, 1, 7409, 0xa21efc69
>>> +0, 9, 9, 1, 7409, 0xa21efc69
>>> +0, 10, 10, 1, 7409, 0xa21efc69
>>> +0, 11, 11, 1, 7409, 0xa21efc69
>>> +0, 12, 12, 1, 7409, 0xa21efc69
>>> +0, 13, 13, 1, 7409, 0xa21efc69
>>> +0, 14, 14, 1, 7409, 0xa21efc69
>>> +0, 15, 15, 1, 7409, 0xa21efc69
>>> +0, 16, 16, 1, 7409, 0xa21efc69
>>> +0, 17, 17, 1, 7409, 0xa21efc69
>>> +0, 18, 18, 1, 7409, 0xa21efc69
>>> +0, 19, 19, 1, 7409, 0xa21efc69
>>> +0, 20, 20, 1, 7409, 0xa21efc69
>>> +0, 21, 21, 1, 7409, 0xa21efc69
>>> +0, 22, 22, 1, 7409, 0xa21efc69
>>> +0, 23, 23, 1, 7409, 0xa21efc69
>>> +0, 24, 24, 1, 7409, 0xa21efc69
>>> +0, 25, 25, 1, 7409, 0xa21efc69
>>> +0, 26, 26, 1, 7409, 0xa21efc69
>>> +0, 27, 27, 1, 7409, 0xa21efc69
>>> +0, 28, 28, 1, 7409, 0xa21efc69
>>> +0, 29, 29, 1, 7409, 0xa21efc69
>>> +0, 30, 30, 1, 7409, 0xa21efc69
>>> +0, 30, 31, 1, 8426, 0xacc4413a
>>> +0, 30, 32, 1, 9626, 0x46865f1e
>>> +0, 30, 33, 1, 5412, 0xf4884a91
>>> +0, 30, 34, 1, 9129, 0xbdb77fb3
>>> +0, 30, 35, 1, 10009, 0xac8a3ec5
>>> +0, 30, 36, 1, 7204, 0x4e239746
>>> +0, 30, 37, 1, 9413, 0x27620541
>>> +0, 30, 38, 1, 10725, 0x2feb9589
>>> +0, 30, 39, 1, 7101, 0x62159f85
>>> +0, 30, 40, 1, 10984, 0xa2eb2e49
>> _______________________________________________
>> ffmpeg-devel mailing list
>> ffmpeg-devel at ffmpeg.org
>> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>>
>> To unsubscribe, visit link above, or email
>> ffmpeg-devel-request at ffmpeg.org with subject "unsubscribe".
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request at ffmpeg.org with subject "unsubscribe".
More information about the ffmpeg-devel
mailing list