[FFmpeg-devel] [PATCH v2 4/6] avformat: add argo_asf muxer

[Zane van Iperen]

On Tue, 04 Aug 2020 09:27:35 +0000
"Zane van Iperen" <zane at zanevaniperen.com> wrote:

> 
> On Tue, 04 Aug 2020 08:46:41 +0000
> "Zane van Iperen" <zane at zanevaniperen.com> wrote:
> 
> Disregard, this breaks FATE. Will post a follow-up later.
> 
Right, so there's two ways I can fix this, which would be the preferred
option?

1. Explicitly tell FATE to use ASF:

    diff --git a/tests/fate/lavf-container.mak b/tests/fate/lavf-container.mak
    index 9e0eed4851..87dda63579 100644
    --- a/tests/fate/lavf-container.mak
    +++ b/tests/fate/lavf-container.mak
    @@ -24,7 +24,7 @@ $(FATE_LAVF_CONTAINER): CMD = lavf_container
     $(FATE_LAVF_CONTAINER): REF = $(SRC_PATH)/tests/ref/lavf/$(@:fate-lavf-%=%)
     $(FATE_LAVF_CONTAINER): $(AREF) $(VREF)
     
    -fate-lavf-asf: CMD = lavf_container "" "-c:a mp2 -ar 44100" "-r 25"
    +fate-lavf-asf: CMD = lavf_container "" "-f asf -c:a mp2 -ar 44100" "-r 25"
     fate-lavf-avi fate-lavf-nut: CMD = lavf_container "" "-c:a mp2 -ar 44100 -threads 1"
     fate-lavf-dv:  CMD = lavf_container "-ar 48000 -channel_layout stereo" "-r 25 -s pal"
     fate-lavf-dv_pal:  CMD = lavf_container_timecode_nodrop "-ar 48000 -r 25 -s pal -ac 2 -f dv"

2. NULL'ify the extensions field of ff_argo_asf_muxer. Would require the user to
   specify "-f argo_asf" on the command line. This seems the nicer solution.

    diff --git a/libavformat/argo_asf.c b/libavformat/argo_asf.c
    index 6239d8eebb..01f8fc4dc7 100644
    --- a/libavformat/argo_asf.c
    +++ b/libavformat/argo_asf.c
    @@ -367,7 +367,10 @@ static int argo_asf_write_trailer(AVFormatContext *s)
     AVOutputFormat ff_argo_asf_muxer = {
         .name           = "argo_asf",
         .long_name      = NULL_IF_CONFIG_SMALL("Argonaut Games ASF"),
    -    .extensions     = "asf",
    +    /*
    +     * Can't have this as it conflicts with the actual ASF format.
    +     * .extensions     = "asf",
    +     */
         .audio_codec    = AV_CODEC_ID_ADPCM_ARGO,
         .video_codec    = AV_CODEC_ID_NONE,
         .init           = argo_asf_write_init,
    

Zane