diff mbox series

[FFmpeg-devel,v3,2/2] avformat: add demuxer for argonaut games' ASF format

Message ID 20200121100906.8353-3-zane@zanevaniperen.com
State New
Headers show
Series Argonaut Games ASF and ADPCM decoding support
Related show

Checks

Context Check Description
andriy/ffmpeg-patchwork pending
andriy/ffmpeg-patchwork success Applied patch
andriy/ffmpeg-patchwork success Configure finished
andriy/ffmpeg-patchwork success Make finished
andriy/ffmpeg-patchwork success Make fate finished

Commit Message

Zane van Iperen Jan. 21, 2020, 10:09 a.m. UTC
Adds support for the custom ASF container used by some Argonaut Games'
games, such as 'Croc! Legend of the Gobbos', and 'Croc 2'.

Can also handle the sample files in:
https://samples.ffmpeg.org/game-formats/brender/part2.zip

Signed-off-by: Zane van Iperen <zane@zanevaniperen.com>
---
 Changelog                |   1 +
 libavformat/Makefile     |   1 +
 libavformat/allformats.c |   1 +
 libavformat/argo_asf.c   | 262 +++++++++++++++++++++++++++++++++++++++
 libavformat/version.h    |   4 +-
 5 files changed, 267 insertions(+), 2 deletions(-)
 create mode 100644 libavformat/argo_asf.c

Comments

Carl Eugen Hoyos Jan. 21, 2020, 1:14 p.m. UTC | #1
Am Di., 21. Jan. 2020 um 11:09 Uhr schrieb Zane van Iperen
<zane@zanevaniperen.com>:

> +static int argo_asf_probe(const AVProbeData *p)
> +{
> +    int score;
> +    ArgoASFFileHeader hdr;
> +
> +    av_assert0(AVPROBE_PADDING_SIZE >= ASF_FILE_HEADER_SIZE);
> +
> +    argo_asf_parse_file_header(&hdr, p->buf);
> +
> +    if (hdr.magic != ASF_TAG)
> +        return 0;

> +    /* If this is huge, then it's very likely not an ASF file. */
> +    if (hdr.chunk_offset > INT_MAX)
> +        return 1;

Am I correct that this tests only one bit?
This makes sense for many probe functions that can easily
return false positives based on weak heuristics, probe
functions typically return high scores for matching first 32
bits though.

> +    score = 0;
> +    if (argo_asf_is_known_version(&hdr))
> +        score += (AVPROBE_SCORE_MAX / 2) + 1;

Unusual code style.

> +    /* Have only ever seen these with 1 chunk. */
> +    if (hdr.num_chunks == 1)
> +        score += 10;

Returns 0 for argo files with unknown version and more than
one chunk and 10 for for unknown version and one chunk.

Should be ~25 in both cases, feel free to return a higher
score if all tests pass, I just wanted to simplify the probe
function as testing 32 bit is what is usually done.

Carl Eugen
Zane van Iperen Jan. 21, 2020, 11:32 p.m. UTC | #2
21/1/20 11:14 pm, Carl Eugen Hoyos пишет:
> 
> Am Di., 21. Jan. 2020 um 11:09 Uhr schrieb Zane van Iperen
> <zane@zanevaniperen.com>:
> 
>> +static int argo_asf_probe(const AVProbeData *p)
>> +{
>> +    int score;
>> +    ArgoASFFileHeader hdr;
>> +
>> +    av_assert0(AVPROBE_PADDING_SIZE >= ASF_FILE_HEADER_SIZE);
>> +
>> +    argo_asf_parse_file_header(&hdr, p->buf);
>> +
>> +    if (hdr.magic != ASF_TAG)
>> +        return 0;
> 
>> +    /* If this is huge, then it's very likely not an ASF file. */
>> +    if (hdr.chunk_offset > INT_MAX)
>> +        return 1;
> 
> Am I correct that this tests only one bit?
> This makes sense for many probe functions that can easily
> return false positives based on weak heuristics, probe
> functions typically return high scores for matching first 32
> bits though.
> 

I can just get rid of that check completely if it's easier.

>> +    score = 0;
>> +    if (argo_asf_is_known_version(&hdr))
>> +        score += (AVPROBE_SCORE_MAX / 2) + 1;
> 
> Unusual code style.
> 
>> +    /* Have only ever seen these with 1 chunk. */
>> +    if (hdr.num_chunks == 1)
>> +        score += 10;
> 
> Returns 0 for argo files with unknown version and more than
> one chunk and 10 for for unknown version and one chunk.
> 
> Should be ~25 in both cases, feel free to return a higher
> score if all tests pass, I just wanted to simplify the probe
> function as testing 32 bit is what is usually done.
> 

Returning 0 on a unknown version is a bug, I want it to hit the
avpriv_request_sample() below.

Would something like this (untested) be better?

 >     if (hdr.chunk_offset & 0xFF000000U)
 >         return 1;
 >
 >     score = (AVPROBE_SCORE_MAX / 2) + 1;
 >
 >     if (!argo_asf_is_known_version(&hdr))
 >         score -= 25;
 >
 >     /* Have only ever seen these with 1 chunk. */
 >     if (hdr.num_chunks > 1)
 >         score -= 25;
 >
 >     return score;

That way if it fails one check it'll be 26, or 1 if it fails both.

> Carl Eugen
> _______________________________________________
> 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".
> 

Zane
Carl Eugen Hoyos Jan. 21, 2020, 11:52 p.m. UTC | #3
Am Mi., 22. Jan. 2020 um 00:33 Uhr schrieb Zane van Iperen
<zane@zanevaniperen.com>:
>
> 21/1/20 11:14 pm, Carl Eugen Hoyos пишет:
> >
> > Am Di., 21. Jan. 2020 um 11:09 Uhr schrieb Zane van Iperen
> > <zane@zanevaniperen.com>:
> >
> >> +static int argo_asf_probe(const AVProbeData *p)
> >> +{
> >> +    int score;
> >> +    ArgoASFFileHeader hdr;
> >> +
> >> +    av_assert0(AVPROBE_PADDING_SIZE >= ASF_FILE_HEADER_SIZE);
> >> +
> >> +    argo_asf_parse_file_header(&hdr, p->buf);
> >> +
> >> +    if (hdr.magic != ASF_TAG)
> >> +        return 0;
> >
> >> +    /* If this is huge, then it's very likely not an ASF file. */
> >> +    if (hdr.chunk_offset > INT_MAX)
> >> +        return 1;
> >
> > Am I correct that this tests only one bit?
> > This makes sense for many probe functions that can easily
> > return false positives based on weak heuristics, probe
> > functions typically return high scores for matching first 32
> > bits though.
>
> I can just get rid of that check completely if it's easier.

Please.

> >> +    score = 0;
> >> +    if (argo_asf_is_known_version(&hdr))
> >> +        score += (AVPROBE_SCORE_MAX / 2) + 1;
> >
> > Unusual code style.
> >
> >> +    /* Have only ever seen these with 1 chunk. */
> >> +    if (hdr.num_chunks == 1)
> >> +        score += 10;
> >
> > Returns 0 for argo files with unknown version and more than
> > one chunk and 10 for for unknown version and one chunk.
> >
> > Should be ~25 in both cases, feel free to return a higher
> > score if all tests pass, I just wanted to simplify the probe
> > function as testing 32 bit is what is usually done.
> >
>
> Returning 0 on a unknown version is a bug, I want it to hit the
> avpriv_request_sample() below.
>
> Would something like this (untested) be better?
>
>  >     if (hdr.chunk_offset & 0xFF000000U)
>  >         return 1;
>  >
>  >     score = (AVPROBE_SCORE_MAX / 2) + 1;
>  >
>  >     if (!argo_asf_is_known_version(&hdr))
>  >         score -= 25;
>  >
>  >     /* Have only ever seen these with 1 chunk. */
>  >     if (hdr.num_chunks > 1)
>  >         score -= 25;
>  >
>  >     return score;
>
> That way if it fails one check it'll be 26, or 1 if it fails both.

But it should return ~25 if the first 32bit match (but the version
is wrong) and fail later.

I mostly wanted to argue for a less complicated probe function
for a format that starts with 32 known bits.

Carl Eugen
Zane van Iperen Jan. 22, 2020, 12:12 a.m. UTC | #4
22/1/20 9:52 am, Carl Eugen Hoyos пишет:
> 
> Am Mi., 22. Jan. 2020 um 00:33 Uhr schrieb Zane van Iperen
> <zane@zanevaniperen.com>:
>>
>> 21/1/20 11:14 pm, Carl Eugen Hoyos пишет:
>>>
>>> Am Di., 21. Jan. 2020 um 11:09 Uhr schrieb Zane van Iperen
>>> <zane@zanevaniperen.com>:
>>>
>>>> +static int argo_asf_probe(const AVProbeData *p)
>>>> +{
>>>> +    int score;
>>>> +    ArgoASFFileHeader hdr;
>>>> +
>>>> +    av_assert0(AVPROBE_PADDING_SIZE >= ASF_FILE_HEADER_SIZE);
>>>> +
>>>> +    argo_asf_parse_file_header(&hdr, p->buf);
>>>> +
>>>> +    if (hdr.magic != ASF_TAG)
>>>> +        return 0;
>>>
>>>> +    /* If this is huge, then it's very likely not an ASF file. */
>>>> +    if (hdr.chunk_offset > INT_MAX)
>>>> +        return 1;
>>>
>>> Am I correct that this tests only one bit?
>>> This makes sense for many probe functions that can easily
>>> return false positives based on weak heuristics, probe
>>> functions typically return high scores for matching first 32
>>> bits though.
>>
>> I can just get rid of that check completely if it's easier.
> 
> Please.
> 

Done.

>>>> +    score = 0;
>>>> +    if (argo_asf_is_known_version(&hdr))
>>>> +        score += (AVPROBE_SCORE_MAX / 2) + 1;
>>>
>>> Unusual code style.
>>>
>>>> +    /* Have only ever seen these with 1 chunk. */
>>>> +    if (hdr.num_chunks == 1)
>>>> +        score += 10;
>>>
>>> Returns 0 for argo files with unknown version and more than
>>> one chunk and 10 for for unknown version and one chunk.
>>>
>>> Should be ~25 in both cases, feel free to return a higher
>>> score if all tests pass, I just wanted to simplify the probe
>>> function as testing 32 bit is what is usually done.
>>>
>>
>> Returning 0 on a unknown version is a bug, I want it to hit the
>> avpriv_request_sample() below.
>>
>> Would something like this (untested) be better?
>>
>>   >     if (hdr.chunk_offset & 0xFF000000U)
>>   >         return 1;
>>   >
>>   >     score = (AVPROBE_SCORE_MAX / 2) + 1;
>>   >
>>   >     if (!argo_asf_is_known_version(&hdr))
>>   >         score -= 25;
>>   >
>>   >     /* Have only ever seen these with 1 chunk. */
>>   >     if (hdr.num_chunks > 1)
>>   >         score -= 25;
>>   >
>>   >     return score;
>>
>> That way if it fails one check it'll be 26, or 1 if it fails both.
> 
> But it should return ~25 if the first 32bit match (but the version
> is wrong) and fail later.
> 
> I mostly wanted to argue for a less complicated probe function
> for a format that starts with 32 known bits.
> 

Ah, sorry I misunderstood. How's this?

 >    if (hdr.magic != ASF_TAG)
 >        return 0;
 >
 >    if (!argo_asf_is_known_version(&hdr))
 >        return 25;
 >
 >    return (AVPROBE_SCORE_MAX / 2) + 1;

> Carl Eugen
> _______________________________________________
> 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".
> 

Zane
Carl Eugen Hoyos Jan. 22, 2020, 12:30 a.m. UTC | #5
Am Mi., 22. Jan. 2020 um 01:13 Uhr schrieb Zane van Iperen
<zane@zanevaniperen.com>:

> Ah, sorry I misunderstood. How's this?
>
>  >    if (hdr.magic != ASF_TAG)
>  >        return 0;
>  >
>  >    if (!argo_asf_is_known_version(&hdr))
>  >        return 25;
>  >
>  >    return (AVPROBE_SCORE_MAX / 2) + 1;

I like this much better, use AVPROBE_SCORE_EXTENSION / 2 and
AVPROBE_SCORE_EXTENSION + 1 as it's done in other places.

Carl Eugen
Zane van Iperen Jan. 22, 2020, 12:41 a.m. UTC | #6
22/1/20 10:30 am, Carl Eugen Hoyos пишет:
> 
> Am Mi., 22. Jan. 2020 um 01:13 Uhr schrieb Zane van Iperen
> <zane@zanevaniperen.com>:
> 
>> Ah, sorry I misunderstood. How's this?
>>
>>   >    if (hdr.magic != ASF_TAG)
>>   >        return 0;
>>   >
>>   >    if (!argo_asf_is_known_version(&hdr))
>>   >        return 25;
>>   >
>>   >    return (AVPROBE_SCORE_MAX / 2) + 1;
> 
> I like this much better, use AVPROBE_SCORE_EXTENSION / 2 and
> AVPROBE_SCORE_EXTENSION + 1 as it's done in other places.
> 

Done. Is it worth sending a v4 for such a small change, or should
I just send an additional patch?

> Carl Eugen
> _______________________________________________
> 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".
> 

Zane
Carl Eugen Hoyos Jan. 22, 2020, 12:42 a.m. UTC | #7
Am Mi., 22. Jan. 2020 um 01:41 Uhr schrieb Zane van Iperen
<zane@zanevaniperen.com>:
>
> 22/1/20 10:30 am, Carl Eugen Hoyos пишет:
> >
> > Am Mi., 22. Jan. 2020 um 01:13 Uhr schrieb Zane van Iperen
> > <zane@zanevaniperen.com>:
> >
> >> Ah, sorry I misunderstood. How's this?
> >>
> >>   >    if (hdr.magic != ASF_TAG)
> >>   >        return 0;
> >>   >
> >>   >    if (!argo_asf_is_known_version(&hdr))
> >>   >        return 25;
> >>   >
> >>   >    return (AVPROBE_SCORE_MAX / 2) + 1;
> >
> > I like this much better, use AVPROBE_SCORE_EXTENSION / 2 and
> > AVPROBE_SCORE_EXTENSION + 1 as it's done in other places.
> >
>
> Done. Is it worth sending a v4 for such a small change, or should
> I just send an additional patch?

Do not send patches to change patches that are not committed yet.

Carl Eugen
diff mbox series

Patch

diff --git a/Changelog b/Changelog
index c029d73c72..65ef01c77d 100644
--- a/Changelog
+++ b/Changelog
@@ -31,6 +31,7 @@  version <next>:
 - thistogram filter
 - freezeframes filter
 - Argonaut Games ADPCM decoder
+- Argonaut Games ASF demuxer
 
 
 version 4.2:
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 52f29b1a6d..ba6ea8c4a6 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -99,6 +99,7 @@  OBJS-$(CONFIG_APTX_MUXER)                += rawenc.o
 OBJS-$(CONFIG_APTX_HD_DEMUXER)           += aptxdec.o rawdec.o
 OBJS-$(CONFIG_APTX_HD_MUXER)             += rawenc.o
 OBJS-$(CONFIG_AQTITLE_DEMUXER)           += aqtitledec.o subtitles.o
+OBJS-$(CONFIG_ARGO_ASF_DEMUXER)          += argo_asf.o
 OBJS-$(CONFIG_ASF_DEMUXER)               += asfdec_f.o asf.o asfcrypt.o \
                                             avlanguage.o
 OBJS-$(CONFIG_ASF_O_DEMUXER)             += asfdec_o.o asf.o asfcrypt.o \
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index ff9bdb906f..fe74a32e47 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -60,6 +60,7 @@  extern AVOutputFormat ff_aptx_muxer;
 extern AVInputFormat  ff_aptx_hd_demuxer;
 extern AVOutputFormat ff_aptx_hd_muxer;
 extern AVInputFormat  ff_aqtitle_demuxer;
+extern AVInputFormat  ff_argo_asf_demuxer;
 extern AVInputFormat  ff_asf_demuxer;
 extern AVOutputFormat ff_asf_muxer;
 extern AVInputFormat  ff_asf_o_demuxer;
diff --git a/libavformat/argo_asf.c b/libavformat/argo_asf.c
new file mode 100644
index 0000000000..fc4845f19e
--- /dev/null
+++ b/libavformat/argo_asf.c
@@ -0,0 +1,262 @@ 
+/*
+ * Argonaut Games ASF demuxer
+ *
+ * Copyright (C) 2020 Zane van Iperen (zane@zanevaniperen.com)
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+#include "avformat.h"
+#include "internal.h"
+#include "libavutil/intreadwrite.h"
+#include "libavutil/avassert.h"
+
+#define ASF_TAG                 MKTAG('A', 'S', 'F', '\0')
+#define ASF_FILE_HEADER_SIZE    24
+#define ASF_CHUNK_HEADER_SIZE   20
+
+typedef struct ArgoASFFileHeader {
+    uint32_t    magic;          /*< Magic Number, {'A', 'S', 'F', '\0'} */
+    uint16_t    version_major;  /*< File Major Version. */
+    uint16_t    version_minor;  /*< File Minor Version. */
+    uint32_t    num_chunks;     /*< No. chunks in the file. */
+    uint32_t    chunk_offset;   /*< Offset to the first chunk from the start of the file. */
+    int8_t      name[8];        /*< Name. */
+} ArgoASFFileHeader;
+
+typedef struct ArgoASFChunkHeader {
+    uint32_t    num_blocks;     /*< No. blocks in the chunk. */
+    uint32_t    num_samples;    /*< No. samples per channel in a block. */
+    uint32_t    unk1;           /*< Unknown */
+    uint16_t    sample_rate;    /*< Sample rate. */
+    uint16_t    unk2;           /*< Unknown. */
+    uint32_t    flags;          /*< Stream flags. */
+} ArgoASFChunkHeader;
+
+enum {
+    ASF_CF_BITS_PER_SAMPLE  = (1 << 0), /*< 16-bit if set, 8 otherwise.      */
+    ASF_CF_STEREO           = (1 << 1), /*< Stereo if set, mono otherwise.   */
+    ASF_CF_ALWAYS1_1        = (1 << 2), /*< Unknown, always seems to be set. */
+    ASF_CF_ALWAYS1_2        = (1 << 3), /*< Unknown, always seems to be set. */
+
+    ASF_CF_ALWAYS1          = ASF_CF_ALWAYS1_1 | ASF_CF_ALWAYS1_2,
+    ASF_CF_ALWAYS0          = ~(ASF_CF_BITS_PER_SAMPLE | ASF_CF_STEREO | ASF_CF_ALWAYS1)
+};
+
+typedef struct ArgoASFDemuxContext
+{
+    ArgoASFFileHeader   fhdr;
+    ArgoASFChunkHeader  ckhdr;
+    uint32_t            blocks_read;
+} ArgoASFDemuxContext;
+
+static void argo_asf_parse_file_header(ArgoASFFileHeader *hdr, const uint8_t *buf)
+{
+    hdr->magic          = AV_RL32(buf + 0);
+    hdr->version_major  = AV_RL16(buf + 4);
+    hdr->version_minor  = AV_RL16(buf + 6);
+    hdr->num_chunks     = AV_RL32(buf + 8);
+    hdr->chunk_offset   = AV_RL32(buf + 12);
+    for (int i = 0; i < 8; i++)
+        hdr->name[i]    = AV_RL8(buf + 16 + i);
+}
+
+static void argo_asf_parse_chunk_header(ArgoASFChunkHeader *hdr, const uint8_t *buf)
+{
+    hdr->num_blocks     = AV_RL32(buf + 0);
+    hdr->num_samples    = AV_RL32(buf + 4);
+    hdr->unk1           = AV_RL32(buf + 8);
+    hdr->sample_rate    = AV_RL16(buf + 12);
+    hdr->unk2           = AV_RL16(buf + 14);
+    hdr->flags          = AV_RL32(buf + 16);
+}
+
+/*
+ * Known versions:
+ * 1.1: The sample files in /game-formats/brender/part2.zip
+ * 1.2: Croc! Legend of the Gobbos
+ * 2.1: Croc 2
+ */
+static int argo_asf_is_known_version(const ArgoASFFileHeader *hdr)
+{
+    return (hdr->version_major == 1 && hdr->version_minor == 1) ||
+           (hdr->version_major == 1 && hdr->version_minor == 2) ||
+           (hdr->version_major == 2 && hdr->version_minor == 1);
+}
+
+static int argo_asf_probe(const AVProbeData *p)
+{
+    int score;
+    ArgoASFFileHeader hdr;
+
+    av_assert0(AVPROBE_PADDING_SIZE >= ASF_FILE_HEADER_SIZE);
+
+    argo_asf_parse_file_header(&hdr, p->buf);
+
+    if (hdr.magic != ASF_TAG)
+        return 0;
+
+    /* If this is huge, then it's very likely not an ASF file. */
+    if (hdr.chunk_offset > INT_MAX)
+        return 1;
+
+    score = 0;
+    if (argo_asf_is_known_version(&hdr))
+        score += (AVPROBE_SCORE_MAX / 2) + 1;
+
+    /* Have only ever seen these with 1 chunk. */
+    if (hdr.num_chunks == 1)
+        score += 10;
+
+    return score;
+}
+
+
+
+static int argo_asf_read_header(AVFormatContext *s)
+{
+    int64_t ret;
+    AVIOContext *pb = s->pb;
+    AVStream *st;
+    ArgoASFDemuxContext *asf = s->priv_data;
+    uint8_t buf[FFMAX(ASF_FILE_HEADER_SIZE, ASF_CHUNK_HEADER_SIZE)];
+
+    if (!(st = avformat_new_stream(s, NULL)))
+        return AVERROR(ENOMEM);
+
+    if ((ret = avio_read(pb, buf, ASF_FILE_HEADER_SIZE)) < 0)
+        return ret;
+    else if (ret != ASF_FILE_HEADER_SIZE)
+        return AVERROR(EIO);
+
+    argo_asf_parse_file_header(&asf->fhdr, buf);
+
+    if (!argo_asf_is_known_version(&asf->fhdr)) {
+        avpriv_request_sample(s, "Version %hu.%hu",
+            asf->fhdr.version_major, asf->fhdr.version_minor
+        );
+        return AVERROR_PATCHWELCOME;
+    }
+
+    if (asf->fhdr.num_chunks < 0) {
+        return AVERROR_INVALIDDATA;
+    } else if (asf->fhdr.num_chunks > 1) {
+        avpriv_request_sample(s, ">1 chunk");
+        return AVERROR_PATCHWELCOME;
+    }
+
+    if (asf->fhdr.chunk_offset < ASF_FILE_HEADER_SIZE)
+        return AVERROR_INVALIDDATA;
+
+    if ((ret = avio_skip(pb, asf->fhdr.chunk_offset - ASF_FILE_HEADER_SIZE)) < 0)
+        return ret;
+
+    if ((ret = avio_read(pb, buf, ASF_CHUNK_HEADER_SIZE)) < 0)
+        return ret;
+    else if (ret != ASF_CHUNK_HEADER_SIZE)
+        return AVERROR(EIO);
+
+    argo_asf_parse_chunk_header(&asf->ckhdr, buf);
+
+    if ((asf->ckhdr.flags & ASF_CF_ALWAYS1) != ASF_CF_ALWAYS1 || (asf->ckhdr.flags & ASF_CF_ALWAYS0) != 0) {
+        avpriv_request_sample(s, "Nonstandard flags (0x%08X)", asf->ckhdr.flags);
+        return AVERROR_PATCHWELCOME;
+    }
+
+    st->codecpar->codec_type                = AVMEDIA_TYPE_AUDIO;
+    st->codecpar->codec_id                  = AV_CODEC_ID_ADPCM_ARGO;
+    st->codecpar->format                    = AV_SAMPLE_FMT_S16;
+
+    if (asf->ckhdr.flags & ASF_CF_STEREO) {
+        st->codecpar->channel_layout        = AV_CH_LAYOUT_STEREO;
+        st->codecpar->channels              = 2;
+    } else {
+        st->codecpar->channel_layout        = AV_CH_LAYOUT_MONO;
+        st->codecpar->channels              = 1;
+    }
+
+    st->codecpar->sample_rate               = asf->ckhdr.sample_rate;
+
+    st->codecpar->bits_per_coded_sample     = 4;
+
+    if (asf->ckhdr.flags & ASF_CF_BITS_PER_SAMPLE)
+        st->codecpar->bits_per_raw_sample   = 16;
+    else
+        st->codecpar->bits_per_raw_sample   = 8;
+
+    if (st->codecpar->bits_per_raw_sample != 16) {
+        /* The header allows for these, but I've never seen any files with them. */
+        avpriv_request_sample(s, "Non 16-bit samples");
+        return AVERROR_PATCHWELCOME;
+    }
+
+    /*
+     * (nchannel control bytes) + ((bytes_per_channel) * nchannel)
+     * For mono, this is 17. For stereo, this is 34.
+     */
+    st->codecpar->frame_size            = st->codecpar->channels +
+                                          (asf->ckhdr.num_samples / 2) *
+                                          st->codecpar->channels;
+
+    st->codecpar->block_align           = st->codecpar->frame_size;
+
+    st->codecpar->bit_rate              = st->codecpar->channels *
+                                          st->codecpar->sample_rate *
+                                          st->codecpar->bits_per_coded_sample;
+
+    avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate);
+    st->start_time      = 0;
+    st->duration        = asf->ckhdr.num_blocks * asf->ckhdr.num_samples;
+    st->nb_frames       = asf->ckhdr.num_blocks;
+    return 0;
+}
+
+static int argo_asf_read_packet(AVFormatContext *s, AVPacket *pkt)
+{
+    ArgoASFDemuxContext *asf = s->priv_data;
+
+    AVStream *st = s->streams[0];
+    AVIOContext *pb = s->pb;
+    int ret;
+
+    if (asf->blocks_read >= asf->ckhdr.num_blocks)
+        return AVERROR_EOF;
+
+    if ((ret = av_get_packet(pb, pkt, st->codecpar->frame_size)) < 0)
+        return ret;
+    else if (ret != st->codecpar->frame_size)
+        return AVERROR_INVALIDDATA;
+
+    pkt->stream_index   = st->index;
+    pkt->duration       = asf->ckhdr.num_samples;
+
+    ++asf->blocks_read;
+    return 0;
+}
+
+/*
+ * Not actually sure what ASF stands for.
+ * - Argonaut Sound File?
+ * - Audio Stream File?
+ */
+AVInputFormat ff_argo_asf_demuxer = {
+    .name           = "argo_asf",
+    .long_name      = NULL_IF_CONFIG_SMALL("Argonaut Games ASF"),
+    .priv_data_size = sizeof(ArgoASFDemuxContext),
+    .read_probe     = argo_asf_probe,
+    .read_header    = argo_asf_read_header,
+    .read_packet    = argo_asf_read_packet
+};
diff --git a/libavformat/version.h b/libavformat/version.h
index 8be0c41411..f72fb9478a 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -32,8 +32,8 @@ 
 // Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium)
 // Also please add any ticket numbers that you believe might be affected here
 #define LIBAVFORMAT_VERSION_MAJOR  58
-#define LIBAVFORMAT_VERSION_MINOR  35
-#define LIBAVFORMAT_VERSION_MICRO 104
+#define LIBAVFORMAT_VERSION_MINOR  36
+#define LIBAVFORMAT_VERSION_MICRO 100
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
                                                LIBAVFORMAT_VERSION_MINOR, \