Re: [FFmpeg-devel] [PATCH 2/4] avformat: add demuxer for LEGO Racers' ALP format

2020-03-04 Thread Zane van Iperen
On Thu, 5 Mar 2020 02:26:38 +0100 "Andreas Rheinhardt" wrote: > Am 05.03.2020 um 01:40 schrieb Zane van Iperen: > > Signed-off-by: Zane van Iperen > > --- > > libavformat/Makefile | 1 + > > libavformat/allformats.c | 1

[FFmpeg-devel] [PATCH 0/4] High Voltage Software ALP demuxer + decoder.

2020-03-04 Thread Zane van Iperen
Adds support for the .TUN and .PCM files used by some High Voltage Software games. Zane van Iperen (4): avcodec: add decoder for High Voltage Software's ALP ADPCM avformat: add demuxer for LEGO Racers' ALP format changelog: add adpcm_ima_alp decoder and alp demuxer doc: add adpcm_ima_alp

[FFmpeg-devel] [PATCH 1/4] avcodec: add decoder for High Voltage Software's ALP ADPCM

2020-03-04 Thread Zane van Iperen
Signed-off-by: Zane van Iperen --- libavcodec/Makefile | 1 + libavcodec/adpcm.c | 36 libavcodec/allcodecs.c | 1 + libavcodec/avcodec.h| 1 + libavcodec/codec_desc.c | 7 +++ libavcodec/version.h| 4 ++-- 6 files changed, 48

[FFmpeg-devel] [PATCH 2/4] avformat: add demuxer for LEGO Racers' ALP format

2020-03-04 Thread Zane van Iperen
Signed-off-by: Zane van Iperen --- libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/alp.c| 135 +++ libavformat/version.h| 4 +- 4 files changed, 139 insertions(+), 2 deletions(-) create mode 100644 libavformat

[FFmpeg-devel] [PATCH 3/4] changelog: add adpcm_ima_alp decoder and alp demuxer

2020-03-04 Thread Zane van Iperen
Signed-off-by: Zane van Iperen --- Changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Changelog b/Changelog index cb310a3abc..0503069daa 100644 --- a/Changelog +++ b/Changelog @@ -43,7 +43,8 @@ version : - Rayman 2 ADPCM decoder - Rayman 2 APM demuxer - cas video

[FFmpeg-devel] [PATCH 4/4] doc: add adpcm_ima_alp

2020-03-04 Thread Zane van Iperen
Signed-off-by: Zane van Iperen --- doc/general.texi | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/general.texi b/doc/general.texi index dbdc348598..87eaad7791 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -1100,6 +1100,7 @@ following image formats are supported: @item ADPCM

[FFmpeg-devel] [PATCH v5 1/2] avcodec: add decoder for argonaut games' adpcm codec

2020-01-25 Thread Zane van Iperen
Adds support for the ADPCM variant used by some Argonaut Games' games, such as 'Croc! Legend of the Gobbos', and 'Croc 2'. Signed-off-by: Zane van Iperen --- Changelog | 1 + doc/general.texi| 1 + libavcodec/Makefile | 1 + libavcodec/adpcm.c | 67

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

2020-01-25 Thread Zane van Iperen
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 --- Changelog| 1

[FFmpeg-devel] [PATCH v5 0/2] Argonaut Games ASF and ADPCM decoding support

2020-01-25 Thread Zane van Iperen
://ffmpeg.org/pipermail/ffmpeg-devel/2020-January/256024.html [6]: https://ffmpeg.org/pipermail/ffmpeg-devel/2020-January/256129.html Zane Zane van Iperen (2): avcodec: add decoder for argonaut games' adpcm codec avformat: add demuxer for argonaut games' ASF format Changelog| 2

[FFmpeg-devel] [PATCH v2 1/2] avcodec: add decoder for Simon & Schuster Interactive's ADPCM variant

2020-02-05 Thread Zane van Iperen
Adds support for the ADPCM variant used by some Simon & Schuster Interactive games such as Real War, and Real War: Rogue States. Signed-off-by: Zane van Iperen --- libavcodec/Makefile | 1 + libavcodec/adpcm.c | 10 ++ libavcodec/allcodecs.c | 1 + libavcodec/avcod

[FFmpeg-devel] [PATCH v2 2/2] avformat: add demuxer for Simon & Schuster Interactive's VAG format

2020-02-05 Thread Zane van Iperen
Adds support for the custom VAG container used by some Simon & Schuster Interactive games such as Real War, and Real War: Rogue States. Signed-off-by: Zane van Iperen --- libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/kvag.c |

[FFmpeg-devel] [PATCH v2 0/2] Simon & Schuster Interactive VAG demuxer + decoder.

2020-02-05 Thread Zane van Iperen
Some things to note: * SSI's VAG has no relation to the existing PS2 VAG. I've named it 'kvag' (after its tag), but am open to suggestions if this is inappropriate (ssi_vag?). Zane Zane van Iperen (2): avcodec: add decoder for Simon & Schuster Interactive's ADPCM variant avformat: add

Re: [FFmpeg-devel] [PATCH] avcodec/adpcm_argo: simplify and move duplicated logic into a function

2020-02-01 Thread Zane van Iperen
2/2/20 4:04 am, Michael Niedermayer пишет: > > On Sat, Feb 01, 2020 at 06:59:59AM +, Zane van Iperen wrote: >> Signed-off-by: Zane van Iperen >> --- >> libavcodec/adpcm.c | 40 ++-- >> 1 file changed, 18 insertions(+),

[FFmpeg-devel] [PATCH] fate/adpcm: add adpcm_argo tests

2020-02-03 Thread Zane van Iperen
Signed-off-by: Zane van Iperen --- tests/fate/adpcm.mak | 6 ++ tests/ref/fate/adpcm-argo-mono | 1 + tests/ref/fate/adpcm-argo-stereo | 1 + 3 files changed, 8 insertions(+) create mode 100644 tests/ref/fate/adpcm-argo-mono create mode 100644 tests/ref/fate/adpcm-argo-stereo

[FFmpeg-devel] [PATCH] fate/adpcm: add adpcm_ima_ssi tests

2020-02-07 Thread Zane van Iperen
Signed-off-by: Zane van Iperen --- tests/fate/adpcm.mak| 6 ++ tests/ref/fate/adpcm-ima-ssi-mono | 1 + tests/ref/fate/adpcm-ima-ssi-stereo | 1 + 3 files changed, 8 insertions(+) create mode 100644 tests/ref/fate/adpcm-ima-ssi-mono create mode 100644 tests/ref/fate/adpcm

[FFmpeg-devel] [PATCH 1/2] avcodec: add decoder for Simon & Schuster Interactive's ADPCM variant

2020-01-31 Thread Zane van Iperen
Adds support for the ADPCM variant used by some Simon & Schuster Interactive games such as Real War, and Real War: Rogue States. Signed-off-by: Zane van Iperen --- libavcodec/Makefile | 1 + libavcodec/adpcm.c | 10 ++ libavcodec/allcodecs.c | 1 + libavcodec/avcod

[FFmpeg-devel] [PATCH] avcodec/adpcm_argo: simplify and move duplicated logic into a function

2020-01-31 Thread Zane van Iperen
Signed-off-by: Zane van Iperen --- libavcodec/adpcm.c | 40 ++-- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index dad3da28d3..9a42353351 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c

[FFmpeg-devel] [PATCH 2/2] avformat: add demuxer for Simon & Schuster Interactive's VAG format

2020-01-31 Thread Zane van Iperen
Adds support for the custom VAG container used by some Simon & Schuster Interactive games such as Real War, and Real War: Rogue States. Signed-off-by: Zane van Iperen --- libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/kvag.c |

[FFmpeg-devel] [PATCH 0/2] Simon & Schuster Interactive VAG demuxer + decoder.

2020-01-31 Thread Zane van Iperen
PS2 VAG. I've named it 'kvag' (after its tag), but am open to suggestions if this is inappropriate (ssi_vag?). * The ROUNDED_DIV() call causes a (harmless) warning when called with unsigned arguments. I'm not sure of the policy for situations like this. Zane Zane van Iperen (2): avcodec:

Re: [FFmpeg-devel] [PATCH 2/2] avformat: add demuxer for Rayman 2's APM format

2020-02-17 Thread Zane van Iperen
On 18/2/20 8:54 am, Moritz Barsnick wrote: > > On Mon, Feb 17, 2020 at 18:34:34 +0100, Carl Eugen Hoyos wrote: >> Am 17.02.2020 um 10:49 schrieb Zane van Iperen : >>> There's no real "magic" fields to look for, hence why I set the `extensions` >>&g

[FFmpeg-devel] [PATCH v2 2/2] avformat: add demuxer for Rayman 2's APM format

2020-02-18 Thread Zane van Iperen
Adds support for the APM file format used by Ubisoft's Rayman 2. Signed-off-by: Zane van Iperen --- libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/apm.c| 188 +++ libavformat/version.h| 4 +- 4 files changed, 192

[FFmpeg-devel] [PATCH v2 1/2] avcodec: add decoder for Rayman 2's ADPCM variant

2020-02-18 Thread Zane van Iperen
Adds support for the ADPCM variant used in Rayman 2's files. Signed-off-by: Zane van Iperen --- libavcodec/Makefile | 1 + libavcodec/adpcm.c | 24 libavcodec/allcodecs.c | 1 + libavcodec/avcodec.h| 1 + libavcodec/codec_desc.c | 7 +++ libavcodec

[FFmpeg-devel] [PATCH v2 0/2] Ubisoft Rayman 2 APM demuxer + decoder.

2020-02-18 Thread Zane van Iperen
Hi all, This patchset adds support for the APM files used by Rayman 2. It has been tested against all *.apm files in the game folder. v2: - Change extradata to use AV_{W,R}L32 instead of AV_{W,R}N32 - fix version - add probe function - removed an unnecessary `n = 0` Zane Zane van

Re: [FFmpeg-devel] [PATCH v3 1/2] avcodec: add decoder for Rayman 2's ADPCM variant

2020-02-20 Thread Zane van Iperen
20/2/20 11:49 pm, Paul B Mahol пишет: > > On 2/20/20, Zane van Iperen wrote: >> Adds support for the ADPCM variant used in Rayman 2's files. >> >> +case AV_CODEC_ID_ADPCM_IMA_APM: >> +for (n = nb_samples / 2; n > 0; n--) { >> +for

Re: [FFmpeg-devel] [PATCH 2/2] avformat: add demuxer for Rayman 2's APM format

2020-02-17 Thread Zane van Iperen
On 17/2/20 7:26 pm, Paul B Mahol wrote: > > On 2/17/20, Zane van Iperen wrote: >> Adds support for the APM file format used by Ubisoft's Rayman 2. >> >> Signed-off-by: Zane van Iperen >> --- >> libavformat/Makefile | 1 + >> libavformat/a

[FFmpeg-devel] [PATCH 1/2] avcodec: add decoder for Rayman 2's ADPCM variant

2020-02-17 Thread Zane van Iperen
Adds support for the ADPCM variant used in Rayman 2's files. Signed-off-by: Zane van Iperen --- libavcodec/Makefile | 1 + libavcodec/adpcm.c | 24 libavcodec/allcodecs.c | 1 + libavcodec/avcodec.h| 1 + libavcodec/codec_desc.c | 7 +++ libavcodec

[FFmpeg-devel] [PATCH 2/2] avformat: add demuxer for Rayman 2's APM format

2020-02-17 Thread Zane van Iperen
Adds support for the APM file format used by Ubisoft's Rayman 2. Signed-off-by: Zane van Iperen --- libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/apm.c| 171 +++ libavformat/version.h| 2 +- 4 files changed, 174

[FFmpeg-devel] [PATCH 0/2] Ubisoft Rayman 2 APM demuxer + decoder.

2020-02-17 Thread Zane van Iperen
Hi all, This patchset adds support for the APM files used by Rayman 2. It has been tested against all *.apm files in the game folder. Zane Zane van Iperen (2): avcodec: add decoder for Rayman 2's ADPCM variant avformat: add demuxer for Rayman 2's APM format libavcodec/Makefile | 1

[FFmpeg-devel] [PATCH] fate/adpcm: add adpcm_ima_apm tests

2020-02-22 Thread Zane van Iperen
Signed-off-by: Zane van Iperen --- tests/fate/adpcm.mak| 6 ++ tests/ref/fate/adpcm-ima-apm-mono | 1 + tests/ref/fate/adpcm-ima-apm-stereo | 1 + 3 files changed, 8 insertions(+) create mode 100644 tests/ref/fate/adpcm-ima-apm-mono create mode 100644 tests/ref/fate/adpcm

[FFmpeg-devel] [PATCH 2/2] doc: add adpcm_ima_{ssi,apm}

2020-02-22 Thread Zane van Iperen
Signed-off-by: Zane van Iperen --- doc/general.texi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/general.texi b/doc/general.texi index 01d2748f28..dbdc348598 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -1101,6 +1101,8 @@ following image formats are supported: @item

[FFmpeg-devel] [PATCH 1/2] changelog: add adpcm_ima_ssi decoder and kvag demuxer

2020-02-22 Thread Zane van Iperen
Signed-off-by: Zane van Iperen --- Changelog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Changelog b/Changelog index ac873fd39e..e8ba02cb02 100644 --- a/Changelog +++ b/Changelog @@ -36,6 +36,8 @@ version : - xfade_opencl filter - afirsrc audio filter source - pad_opencl filter

[FFmpeg-devel] [PATCH v3 2/2] avformat: add demuxer for Rayman 2's APM format

2020-02-20 Thread Zane van Iperen
Adds support for the APM file format used by Ubisoft's Rayman 2. Signed-off-by: Zane van Iperen --- libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/apm.c| 188 +++ libavformat/version.h| 4 +- 4 files changed, 192

[FFmpeg-devel] [PATCH v3 1/2] avcodec: add decoder for Rayman 2's ADPCM variant

2020-02-20 Thread Zane van Iperen
Adds support for the ADPCM variant used in Rayman 2's files. Signed-off-by: Zane van Iperen --- libavcodec/Makefile | 1 + libavcodec/adpcm.c | 21 + libavcodec/allcodecs.c | 1 + libavcodec/avcodec.h| 1 + libavcodec/codec_desc.c | 7 +++ libavcodec

[FFmpeg-devel] [PATCH v3 0/2] Ubisoft Rayman 2 APM demuxer + decoder.

2020-02-20 Thread Zane van Iperen
an unnecessary `n = 0` Zane Zane van Iperen (2): avcodec: add decoder for Rayman 2's ADPCM variant avformat: add demuxer for Rayman 2's APM format libavcodec/Makefile | 1 + libavcodec/adpcm.c | 21 + libavcodec/allcodecs.c | 1 + libavcodec/avcodec.h | 1 + libavcodec

[FFmpeg-devel] [PATCH v2 1/2] avcodec: add decoder for argonaut games' adpcm codec

2020-01-19 Thread Zane van Iperen
Adds support for the ADPCM variant used by some Argonaut Games' games, such as 'Croc! Legend of the Gobbos', and 'Croc 2'. Signed-off-by: Zane van Iperen --- Changelog | 2 +- doc/general.texi| 1 + libavcodec/Makefile | 1 + libavcodec/adpcm_argo.c | 264

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

2020-01-19 Thread Zane van Iperen
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 Reviewed-by: Andreas Rheinhardt

[FFmpeg-devel] [PATCH v2 0/2] Argonaut Games ASF and ADPCM decoding support

2020-01-19 Thread Zane van Iperen
- FIGHT/SOUND/*.ASF from https://samples.ffmpeg.org/game-formats/brender/part2.zip [1]: https://ffmpeg.org/pipermail/ffmpeg-devel/2020-January/255986.html Zane Zane van Iperen (2): avcodec: add decoder for argonaut games' adpcm codec avformat: add demuxer for argonaut games' ASF format

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

2020-01-19 Thread Zane van Iperen
19/1/20 5:51 pm, Andreas Rheinhardt пишет: > > Zane van Iperen: >> 19/1/20 2:18 pm, Andreas Rheinhardt пишет: >>> >>> On Sun, Jan 19, 2020 at 4:12 AM Zane van Iperen >>> wrote: >>> >>>> Adds support for the custom ASF container us

[FFmpeg-devel] [PATCH 1/2] avcodec: add decoder for argonaut games' adpcm codec

2020-01-18 Thread Zane van Iperen
Adds support for the ADPCM variant used by some Argonaut Games' games, such as 'Croc! Legend of the Gobbos', and 'Croc 2'. Signed-off-by: Zane van Iperen --- Changelog | 2 +- doc/general.texi| 1 + libavcodec/Makefile | 1 + libavcodec/adpcm_argo.c | 264

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

2020-01-18 Thread Zane van Iperen
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 --- Changelog| 1

[FFmpeg-devel] [PATCH 0/2] Argonaut Games ASF and ADPCM decoding support

2020-01-18 Thread Zane van Iperen
://samples.ffmpeg.org/game-formats/brender/part2.zip Zane Zane van Iperen (2): avcodec: add decoder for argonaut games' adpcm codec avformat: add demuxer for argonaut games' ASF format Changelog| 3 +- doc/general.texi | 1 + libavcodec/Makefile | 1

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

2020-01-18 Thread Zane van Iperen
19/1/20 2:18 pm, Andreas Rheinhardt пишет: > > On Sun, Jan 19, 2020 at 4:12 AM Zane van Iperen > wrote: > >> 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

Re: [FFmpeg-devel] [PATCH v2 2/2] avformat: add demuxer for argonaut games' ASF format

2020-01-19 Thread Zane van Iperen
On 20/1/20 2:34 am, Moritz Barsnick wrote: > > Just one more: > > On Sun, Jan 19, 2020 at 08:33:45 +0000, Zane van Iperen wrote: > >> +if (av_match_ext(p->filename, "asf")) >> +score += AVPROBE_SCORE_EXTENSION; > > Just a remark: The

[FFmpeg-devel] [PATCH v2 3/4] avcodec/adpcm_argo: formatting fixes

2020-01-19 Thread Zane van Iperen
Signed-off-by: Zane van Iperen --- Changelog | 1 + libavcodec/adpcm_argo.c | 53 +++-- 2 files changed, 26 insertions(+), 28 deletions(-) diff --git a/Changelog b/Changelog index bc1593bfd1..65ef01c77d 100644 --- a/Changelog +++ b/Changelog

Re: [FFmpeg-devel] [PATCH v2 1/2] avcodec: add decoder for argonaut games' adpcm codec

2020-01-19 Thread Zane van Iperen
On 19/1/20 11:22 pm, Moritz Barsnick wrote: > > On Sun, Jan 19, 2020 at 08:33:39 +, Zane van Iperen wrote: >> Adds support for the ADPCM variant used by some Argonaut Games' games, >> such as 'Croc! Legend of the Gobbos', and 'Croc 2'. > > Some small nitpicks he

[FFmpeg-devel] [PATCH v2 4/4] avformat/argo_asf: formatting fixes

2020-01-19 Thread Zane van Iperen
Signed-off-by: Zane van Iperen --- libavformat/argo_asf.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavformat/argo_asf.c b/libavformat/argo_asf.c index d8f2d71009..d51d16f6b7 100644 --- a/libavformat/argo_asf.c +++ b/libavformat/argo_asf.c @@ -24,8 +24,8

Re: [FFmpeg-devel] [PATCH v2 2/2] avformat: add demuxer for argonaut games' ASF format

2020-01-19 Thread Zane van Iperen
20/1/20 9:47 am, Carl Eugen Hoyos пишет: > > Am So., 19. Jan. 2020 um 23:44 Uhr schrieb Zane van Iperen > : >> >> 20/1/20 4:52 am, Carl Eugen Hoyos пишет: > >>>> +argo_asf_parse_file_header(, p->buf); >>>> + >&g

Re: [FFmpeg-devel] [PATCH v2 2/2] avformat: add demuxer for argonaut games' ASF format

2020-01-19 Thread Zane van Iperen
20/1/20 4:52 am, Carl Eugen Hoyos пишет: > > Am So., 19. Jan. 2020 um 09:34 Uhr schrieb Zane van Iperen > : > >> +static int argo_asf_probe(const AVProbeData *p) >> +{ >> +int score; >> +ArgoASFFileHeader hdr; >> + >> +if (p->

Re: [FFmpeg-devel] [PATCH v2 1/2] avcodec: add decoder for argonaut games' adpcm codec

2020-01-19 Thread Zane van Iperen
20/1/20 7:24 am, Tomas Härdin пишет: > > sön 2020-01-19 klockan 08:33 + skrev Zane van Iperen: >> Adds support for the ADPCM variant used by some Argonaut Games' >> games, >> such as 'Croc! Legend of the Gobbos', and 'Croc 2'. >> >> Signed-off-by: Za

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

2020-01-21 Thread Zane van Iperen
22/1/20 9:52 am, Carl Eugen Hoyos пишет: > > Am Mi., 22. Jan. 2020 um 00:33 Uhr schrieb Zane van Iperen > : >> >> 21/1/20 11:14 pm, Carl Eugen Hoyos пишет: >>> >>> Am Di., 21. Jan. 2020 um 11:09 Uhr schrieb Zane van Iperen >>> : >>

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

2020-01-21 Thread Zane van Iperen
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 --- Changelog| 1

[FFmpeg-devel] [PATCH v4 1/2] avcodec: add decoder for argonaut games' adpcm codec

2020-01-21 Thread Zane van Iperen
Adds support for the ADPCM variant used by some Argonaut Games' games, such as 'Croc! Legend of the Gobbos', and 'Croc 2'. Signed-off-by: Zane van Iperen --- Changelog | 1 + doc/general.texi| 1 + libavcodec/Makefile | 1 + libavcodec/adpcm.c | 152

[FFmpeg-devel] [PATCH v4 0/2] Argonaut Games ASF and ADPCM decoding support

2020-01-21 Thread Zane van Iperen
://ffmpeg.org/pipermail/ffmpeg-devel/2020-January/256014.html [4]: https://ffmpeg.org/pipermail/ffmpeg-devel/2020-January/256021.html [5]: https://ffmpeg.org/pipermail/ffmpeg-devel/2020-January/256024.html [6]: https://ffmpeg.org/pipermail/ffmpeg-devel/2020-January/256129.html Zane Zane van Iperen (2

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

2020-01-21 Thread Zane van Iperen
22/1/20 10:30 am, Carl Eugen Hoyos пишет: > > Am Mi., 22. Jan. 2020 um 01:13 Uhr schrieb Zane van Iperen > : > >> Ah, sorry I misunderstood. How's this? >> >> >if (hdr.magic != ASF_TAG) >> >return 0; >> > >> >

[FFmpeg-devel] [PATCH v3 1/2] avcodec: add decoder for argonaut games' adpcm codec

2020-01-21 Thread Zane van Iperen
Adds support for the ADPCM variant used by some Argonaut Games' games, such as 'Croc! Legend of the Gobbos', and 'Croc 2'. Signed-off-by: Zane van Iperen --- Changelog | 1 + doc/general.texi| 1 + libavcodec/Makefile | 1 + libavcodec/adpcm.c | 152

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

2020-01-21 Thread Zane van Iperen
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 --- Changelog| 1

[FFmpeg-devel] [PATCH v3 0/2] Argonaut Games ASF and ADPCM decoding support

2020-01-21 Thread Zane van Iperen
]: https://ffmpeg.org/pipermail/ffmpeg-devel/2020-January/256021.html [5]: https://ffmpeg.org/pipermail/ffmpeg-devel/2020-January/256024.html Zane Zane van Iperen (2): avcodec: add decoder for argonaut games' adpcm codec avformat: add demuxer for argonaut games' ASF format Changelog

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

2020-01-21 Thread Zane van Iperen
21/1/20 11:14 pm, Carl Eugen Hoyos пишет: > > Am Di., 21. Jan. 2020 um 11:09 Uhr schrieb Zane van Iperen > : > >> +static int argo_asf_probe(const AVProbeData *p) >> +{ >> +int score; >> +ArgoASFFileHeader hdr; >> + >> +av_asse

[FFmpeg-devel] [PATCH] avcodec/adpcm: consolidate tables into adpcm_data.c

2020-03-10 Thread Zane van Iperen
Signed-off-by: Zane van Iperen --- libavcodec/adpcm.c | 67 +++-- libavcodec/adpcm_data.c | 29 ++ libavcodec/adpcm_data.h | 4 +++ 3 files changed, 51 insertions(+), 49 deletions(-) diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c

[FFmpeg-devel] [PATCH v2 4/4] doc: add adpcm_ima_alp

2020-03-07 Thread Zane van Iperen
Signed-off-by: Zane van Iperen --- doc/general.texi | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/general.texi b/doc/general.texi index dbdc348598..87eaad7791 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -1100,6 +1100,7 @@ following image formats are supported: @item ADPCM

[FFmpeg-devel] [PATCH v2 2/4] avformat: add demuxer for LEGO Racers' ALP format

2020-03-07 Thread Zane van Iperen
Signed-off-by: Zane van Iperen --- libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/alp.c| 146 +++ libavformat/version.h| 4 +- 4 files changed, 150 insertions(+), 2 deletions(-) create mode 100644 libavformat

[FFmpeg-devel] [PATCH v2 3/4] changelog: add adpcm_ima_alp decoder and alp demuxer

2020-03-07 Thread Zane van Iperen
Signed-off-by: Zane van Iperen --- Changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Changelog b/Changelog index cb310a3abc..0503069daa 100644 --- a/Changelog +++ b/Changelog @@ -43,7 +43,8 @@ version : - Rayman 2 ADPCM decoder - Rayman 2 APM demuxer - cas video

[FFmpeg-devel] [PATCH v2 1/4] avcodec: add decoder for High Voltage Software's ALP ADPCM

2020-03-07 Thread Zane van Iperen
Signed-off-by: Zane van Iperen --- libavcodec/Makefile | 1 + libavcodec/adpcm.c | 36 libavcodec/allcodecs.c | 1 + libavcodec/avcodec.h| 1 + libavcodec/codec_desc.c | 7 +++ libavcodec/version.h| 4 ++-- 6 files changed, 48

[FFmpeg-devel] [PATCH v2 0/4] High Voltage Software ALP demuxer + decoder.

2020-03-07 Thread Zane van Iperen
Adds support for the .TUN and .PCM files used by some High Voltage Software games. v2: - check for header size and "ADPCM" magic in probe - error if sample rate > 44100 to catch possible overflow - don't allocate stream until after header is validated - formatting fixes Za

[FFmpeg-devel] [PATCH] fate/adpcm: add adpcm_ima_alp tests

2020-03-09 Thread Zane van Iperen
Signed-off-by: Zane van Iperen --- tests/fate/adpcm.mak| 6 ++ tests/ref/fate/adpcm-ima-alp-mono | 1 + tests/ref/fate/adpcm-ima-alp-stereo | 1 + 3 files changed, 8 insertions(+) create mode 100644 tests/ref/fate/adpcm-ima-alp-mono create mode 100644 tests/ref/fate/adpcm

[FFmpeg-devel] [PATCH] avformat/alp: tweak probe function to return MAX-1

2020-03-09 Thread Zane van Iperen
Signed-off-by: Zane van Iperen --- libavformat/alp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/alp.c b/libavformat/alp.c index c0c7905380..4c2e8f0652 100644 --- a/libavformat/alp.c +++ b/libavformat/alp.c @@ -51,7 +51,7 @@ static int alp_probe(const

Re: [FFmpeg-devel] [PATCH] avcodec/adpcm: consolidate tables into adpcm_data.c

2020-03-10 Thread Zane van Iperen
On Tue, 10 Mar 2020 14:52:25 +0100 "Paul B Mahol" wrote: > I fail to see how useful this is. > Unless you plan to write encoder it is not useful. > It was just to clean things up a bit by keeping them together. Otherwise, 'tis no matter. Zane ___

Re: [FFmpeg-devel] [PATCH] avcodec/adpcm: consolidate tables into adpcm_data.c

2020-03-10 Thread Zane van Iperen
On Tue, 10 Mar 2020 15:47:08 +0100 "Moritz Barsnick" wrote: > On Tue, Mar 10, 2020 at 14:15:26 +0000, Zane van Iperen wrote: > > It was just to clean things up a bit by keeping them together. > > Otherwise, 'tis no matter. > > Does it actually build? Nothing

[FFmpeg-devel] [PATCH 1/2] avcodec: add adpcm_ima_ssi encoder

2020-04-09 Thread Zane van Iperen
Signed-off-by: Zane van Iperen --- Changelog | 1 + doc/general.texi | 2 +- libavcodec/Makefile| 1 + libavcodec/adpcmenc.c | 30 ++ libavcodec/allcodecs.c | 1 + libavcodec/utils.c | 1 + libavcodec/version.h | 4 ++-- 7 files

[FFmpeg-devel] [PATCH 2/2] avformat: add kvag muxer

2020-04-09 Thread Zane van Iperen
Signed-off-by: Zane van Iperen --- Changelog| 1 + libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/kvag.c | 78 +++- libavformat/version.h| 2 +- 5 files changed, 81 insertions(+), 2 deletions(-) diff

[FFmpeg-devel] [PATCH v3 2/2] avformat: add kvag muxer

2020-04-10 Thread Zane van Iperen
Signed-off-by: Zane van Iperen --- Changelog| 1 + libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/kvag.c | 84 +++- libavformat/version.h| 2 +- 5 files changed, 87 insertions(+), 2 deletions(-) diff

[FFmpeg-devel] [PATCH v3 1/2] avcodec: add adpcm_ima_ssi encoder

2020-04-10 Thread Zane van Iperen
Signed-off-by: Zane van Iperen --- Changelog | 1 + doc/general.texi | 2 +- libavcodec/Makefile| 1 + libavcodec/adpcmenc.c | 30 ++ libavcodec/allcodecs.c | 1 + libavcodec/utils.c | 1 + libavcodec/version.h | 2 +- 7 files

[FFmpeg-devel] [PATCH v2 1/2] avcodec: add adpcm_ima_ssi encoder

2020-04-10 Thread Zane van Iperen
Signed-off-by: Zane van Iperen --- Changelog | 1 + doc/general.texi | 2 +- libavcodec/Makefile| 1 + libavcodec/adpcmenc.c | 30 ++ libavcodec/allcodecs.c | 1 + libavcodec/utils.c | 1 + libavcodec/version.h | 4 ++-- 7 files

[FFmpeg-devel] [PATCH v2 2/2] avformat: add kvag muxer

2020-04-10 Thread Zane van Iperen
Signed-off-by: Zane van Iperen --- Changelog| 1 + libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/kvag.c | 84 +++- libavformat/version.h| 2 +- 5 files changed, 87 insertions(+), 2 deletions(-) diff

Re: [FFmpeg-devel] [PATCH v3 1/2] avcodec: add adpcm_ima_ssi encoder

2020-04-11 Thread Zane van Iperen
On Fri, 10 Apr 2020 12:26:50 + "Zane van Iperen" wrote: > Signed-off-by: Zane van Iperen > --- > Changelog | 1 + > doc/general.texi | 2 +- > libavcodec/Makefile| 1 + > libavcodec/adpcmenc.c | 30 ++ &g

Re: [FFmpeg-devel] [PATCH v8 0/2] Pro Pinball Series Soundbank demuxer + decoder.

2020-04-11 Thread Zane van Iperen
On Tue, 07 Apr 2020 10:48:53 + "Zane van Iperen" wrote: > Adds support for the soundbank files used by the Pro Pinball series > of games. > > Please CC for review. > > v8: > - change "goto done" to a return + "goto fail" > - H

[FFmpeg-devel] [PATCH] avcodec/adpcm: remove unused shift parameter from adpcm_ima_qt_expand_nibble()

2020-04-11 Thread Zane van Iperen
Signed-off-by: Zane van Iperen --- libavcodec/adpcm.c | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index e9abddc43c..ee18875579 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -348,7 +348,7 @@ static

Re: [FFmpeg-devel] [PATCH v8 0/2] Pro Pinball Series Soundbank demuxer + decoder.

2020-04-15 Thread Zane van Iperen
On Tue, 07 Apr 2020 10:48:53 + "Zane van Iperen" wrote: > Adds support for the soundbank files used by the Pro Pinball series > of games. > Ping 2. Could I please have some reviews on this, it's been over a week. I have a rebased version here, if required: https:/

Re: [FFmpeg-devel] [PATCH v8 1/2] avcodec: add support for Cunning Developments' ADPCM

2020-04-15 Thread Zane van Iperen
On Wed, 15 Apr 2020 19:31:44 +0200 "Michael Niedermayer" wrote: > On Tue, Apr 07, 2020 at 10:48:58AM +0000, Zane van Iperen wrote: > > Signed-off-by: Zane van Iperen > > --- > > Changelog | 1 + > > doc/general.texi|

[FFmpeg-devel] [PATCH v9 2/2] avformat: add demuxer for Pro Pinball Series' Soundbanks

2020-04-16 Thread Zane van Iperen
Signed-off-by: Zane van Iperen --- Changelog| 1 + libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/pp_bnk.c | 293 +++ libavformat/version.h| 2 +- 5 files changed, 297 insertions(+), 1 deletion

[FFmpeg-devel] [PATCH v9 1/2] avcodec: add support for Cunning Developments' ADPCM

2020-04-16 Thread Zane van Iperen
Signed-off-by: Zane van Iperen --- Changelog | 1 + doc/general.texi| 1 + libavcodec/Makefile | 1 + libavcodec/adpcm.c | 34 ++ libavcodec/adpcm_data.c | 13 + libavcodec/adpcm_data.h | 2 ++ libavcodec/allcodecs.c

[FFmpeg-devel] [PATCH v9 0/2] Pro Pinball Series Soundbank demuxer + decoder.

2020-04-16 Thread Zane van Iperen
org/pipermail/ffmpeg-devel/2020-April/259864.html [5]: https://ffmpeg.org/pipermail/ffmpeg-devel/2020-April/259863.html [6]: https://ffmpeg.org/pipermail/ffmpeg-devel/2020-April/260706.html Zane van Iperen (2): avcodec: add support for Cunning Developments' ADPCM avformat: add demuxer fo

[FFmpeg-devel] [PATCH 1/2] avcodec/adpcm_ima_{apc, ssi, oki}: replace while() with for()

2020-04-17 Thread Zane van Iperen
Per discussion at https://ffmpeg.org/pipermail/ffmpeg-devel/2020-April/260854.html Signed-off-by: Zane van Iperen --- libavcodec/adpcm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index ee18875579..7d35884056 100644

[FFmpeg-devel] [PATCH 2/2] avcodec/adpcm: update get_nb_samples() doc

2020-04-17 Thread Zane van Iperen
Signed-off-by: Zane van Iperen --- libavcodec/adpcm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index 7d35884056..9ea6a268eb 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -668,7 +668,7 @@ static inline int16_t

[FFmpeg-devel] [PATCH v10 2/2] avformat: add demuxer for Pro Pinball Series' Soundbanks

2020-04-17 Thread Zane van Iperen
Signed-off-by: Zane van Iperen --- Changelog| 1 + libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/pp_bnk.c | 293 +++ libavformat/version.h| 2 +- 5 files changed, 297 insertions(+), 1 deletion

[FFmpeg-devel] [PATCH v10 1/2] avcodec: add support for Cunning Developments' ADPCM

2020-04-17 Thread Zane van Iperen
Signed-off-by: Zane van Iperen --- Changelog | 1 + doc/general.texi| 1 + libavcodec/Makefile | 1 + libavcodec/adpcm.c | 33 + libavcodec/adpcm_data.c | 13 + libavcodec/adpcm_data.h | 2 ++ libavcodec/allcodecs.c

[FFmpeg-devel] [PATCH v10 0/2] Pro Pinball Series Soundbank demuxer + decoder.

2020-04-17 Thread Zane van Iperen
March/259278.html [4]: https://ffmpeg.org/pipermail/ffmpeg-devel/2020-April/259864.html [5]: https://ffmpeg.org/pipermail/ffmpeg-devel/2020-April/259863.html [6]: https://ffmpeg.org/pipermail/ffmpeg-devel/2020-April/260706.html [7]: https://ffmpeg.org/pipermail/ffmpeg-devel/2020-April/260854.html

Re: [FFmpeg-devel] [PATCH v8 1/2] avcodec: add support for Cunning Developments' ADPCM

2020-04-17 Thread Zane van Iperen
On Fri, 17 Apr 2020 18:50:05 +0200 "Michael Niedermayer" wrote: > On Thu, Apr 16, 2020 at 11:39:00PM +0000, Zane van Iperen wrote: > > On Thu, 16 Apr 2020 21:37:54 +0200 > > "Michael Niedermayer" wrote: > > > > > > > > @@ -1

Re: [FFmpeg-devel] [PATCH v8 1/2] avcodec: add support for Cunning Developments' ADPCM

2020-04-16 Thread Zane van Iperen
On Thu, 16 Apr 2020 21:37:54 +0200 "Michael Niedermayer" wrote: > > > > @@ -1304,6 +1329,13 @@ static int > > > > adpcm_decode_frame(AVCodecContext *avctx, void *data, samples > > > > += avctx->channels; } > > > > break; > > > > +case AV_CODEC_ID_ADPCM_IMA_CUNNING: > > > > +

Re: [FFmpeg-devel] [PATCH v7 2/2] avformat: add demuxer for Pro Pinball Series' Soundbanks

2020-04-07 Thread Zane van Iperen
On Mon, 6 Apr 2020 17:39:13 +0200 "Andreas Rheinhardt" wrote: > > +/* Parse and validate each track. */ > > +for (int i = 0; i < hdr.track_count; i++) { > > +PPBnkTrack e; > > + > > +if ((ret = avio_read(s->pb, buf, PP_BNK_TRACK_SIZE)) < 0) { > > +goto done; >

[FFmpeg-devel] [PATCH v8 0/2] Pro Pinball Series Soundbank demuxer + decoder.

2020-04-07 Thread Zane van Iperen
otential memory leak if read_header() fails - fix a buffer overread - attempt seek before updating state - remove unneeded check - naming fixes v2: - Add sanity checks in header fields - Formatting and comment fixes - Change the struct names to match the files Zane van Iperen (2):

[FFmpeg-devel] [PATCH v8 2/2] avformat: add demuxer for Pro Pinball Series' Soundbanks

2020-04-07 Thread Zane van Iperen
Signed-off-by: Zane van Iperen --- Changelog| 1 + libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/pp_bnk.c | 290 +++ libavformat/version.h| 2 +- 5 files changed, 294 insertions(+), 1 deletion

[FFmpeg-devel] [PATCH v8 1/2] avcodec: add support for Cunning Developments' ADPCM

2020-04-07 Thread Zane van Iperen
Signed-off-by: Zane van Iperen --- Changelog | 1 + doc/general.texi| 1 + libavcodec/Makefile | 1 + libavcodec/adpcm.c | 33 + libavcodec/adpcm_data.c | 13 + libavcodec/adpcm_data.h | 2 ++ libavcodec/allcodecs.c

[FFmpeg-devel] [PATCH v7 1/2] avcodec: add support for Cunning Developments' ADPCM

2020-04-06 Thread Zane van Iperen
Signed-off-by: Zane van Iperen --- Changelog | 1 + doc/general.texi| 1 + libavcodec/Makefile | 1 + libavcodec/adpcm.c | 33 + libavcodec/adpcm_data.c | 13 + libavcodec/adpcm_data.h | 2 ++ libavcodec/allcodecs.c

[FFmpeg-devel] [PATCH v7 0/2] Pro Pinball Series Soundbank demuxer + decoder.

2020-04-06 Thread Zane van Iperen
fixes v2: - Add sanity checks in header fields - Formatting and comment fixes - Change the struct names to match the files Zane van Iperen (2): avcodec: add support for Cunning Developments' ADPCM avformat: add demuxer for Pro Pinball Series' Soundbanks Changelog| 2

[FFmpeg-devel] [PATCH v7 2/2] avformat: add demuxer for Pro Pinball Series' Soundbanks

2020-04-06 Thread Zane van Iperen
Signed-off-by: Zane van Iperen --- Changelog| 1 + libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/pp_bnk.c | 271 +++ libavformat/version.h| 2 +- 5 files changed, 275 insertions(+), 1 deletion

Re: [FFmpeg-devel] [PATCH v3 1/2] avcodec: add adpcm_ima_ssi encoder

2020-04-12 Thread Zane van Iperen
On Sun, 12 Apr 2020 11:41:40 +0200 "Paul B Mahol" wrote: > On 4/12/20, Zane van Iperen wrote: > > On Sat, 11 Apr 2020 22:02:26 +0200 > > "Paul B Mahol" wrote: > > > >> > > >> > Ping. > >> > > >> >

Re: [FFmpeg-devel] [PATCH v3 1/2] avcodec: add adpcm_ima_ssi encoder

2020-04-12 Thread Zane van Iperen
On Sat, 11 Apr 2020 22:02:26 +0200 "Paul B Mahol" wrote: > > > > Ping. > > > > Also, could someone please clarify something for me? > > > > When encoding, there's no inherit differences between trellis and > > non-trellis other then a potentially more-accurate set of nibbles? > > > > And the

Re: [FFmpeg-devel] [PATCH v3 1/2] avcodec: add adpcm_ima_ssi encoder

2020-04-12 Thread Zane van Iperen
On Sun, 12 Apr 2020 15:01:39 +0200 "Paul B Mahol" wrote: > > > > I probably should have mentioned that yes, I had already added the > > appropriate SSI code to adpcm_compress_trellis(). > > The one that updates node predictor? > > > > Yep, wherever there was a check for QT, I added a check

Re: [FFmpeg-devel] [PATCH 1/2] avcodec/adpcm_ima_{apc, ssi, oki}: replace while() with for()

2020-04-19 Thread Zane van Iperen
On Sat, 18 Apr 2020 00:59:25 + "Zane van Iperen" wrote: > Per discussion at > https://ffmpeg.org/pipermail/ffmpeg-devel/2020-April/260854.html > > Signed-off-by: Zane van Iperen > --- > libavcodec/adpcm.c | 6 +++--- > 1 file changed, 3 insertions(+)

  1   2   3   4   5   6   7   >