Used in FMVs for FX Fighter and Croc. Supports BVID and BASF streams,
requests samples for anything else.
Due to the way BASF streams are contained in the file, only one is
supported. I have yet to see a BRP file with multiple.
Signed-off-by: Zane van Iperen
---
Changelog| 1
For future use by the argo_brp demuxer
Signed-off-by: Zane van Iperen
---
libavformat/argo_asf.c | 2 +-
libavformat/argo_asf.h | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/libavformat/argo_asf.c b/libavformat/argo_asf.c
index ee8c85f735..c131207aa1 100644
Signed-off-by: Zane van Iperen
---
libavformat/argo_asf.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/libavformat/argo_asf.c b/libavformat/argo_asf.c
index bf9b5d0c0a..208280b4d9 100644
--- a/libavformat/argo_asf.c
+++ b/libavformat/argo_asf.c
@@ -144,6 +144,9 @@ static int
Adds support for demuxing BRP files from Argonaut Games' games.
Used to store the FMVs.
v2: [1]
- Don't add AV_CODEC_ID_ARGO descriptor, use AV_CODEC_ID_NONE instead.
[1]: https://ffmpeg.org/pipermail/ffmpeg-devel/2020-September/269332.html
Zane van Iperen (4):
avformat/argo_asf: bail
On Mon, 7 Sep 2020 20:15:28 -0300
"James Almer" wrote:
>
> You could change the demuxer you submitted to simply skip the video
> track and demux only the audio, which afaik can be decoded by libavcodec.
> If this Argo video codec was supported by some other container then it
> would make sense
On Mon, 7 Sep 2020 16:33:58 +0200
"Paul B Mahol" wrote:
>
> On Mon, Sep 07, 2020 at 01:14:26PM +, Zane van Iperen wrote:
> > Signed-off-by: Zane van Iperen
> > ---
> > libavcodec/codec_desc.c | 7 +++
> > libavcodec/codec_id.h | 1 +
> >
On Mon, 7 Sep 2020 16:35:47 +0200
"Paul B Mahol" wrote:
> > +
> > +fail:
> > +/* TODO: Remove once AVFMT_HEADER_CLEANUP lands. */
>
> Huh, what is this one comment about?
>
I believe Andreas is updating all the demuxers so their read_close()
function can safely be called if read_header()
Used in FMVs for FX Fighter and Croc. Supports BVID and BASF streams,
requests samples for anything else.
Due to the way BASF streams are contained in the file, only one is
supported. I have yet to see a BRP file with multiple.
Signed-off-by: Zane van Iperen
---
Changelog| 1
Signed-off-by: Zane van Iperen
---
libavcodec/codec_desc.c | 7 +++
libavcodec/codec_id.h | 1 +
libavcodec/version.h| 2 +-
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c
index 9e73dcba27..f33585adaa 100644
Adds support for demuxing BRP files from Argonaut Games' games.
Used to store the FMVs.
Zane van Iperen (5):
avformat/argo_asf: bail if invalid tag
avformat/argo_asf: split functionality into a header
avformat/argo_asf: add ASF_MIN_BUFFER_SIZE #define
avcodec: add "Argonaut Games
For future use by the argo_brp demuxer
Signed-off-by: Zane van Iperen
---
libavformat/argo_asf.c | 2 +-
libavformat/argo_asf.h | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/libavformat/argo_asf.c b/libavformat/argo_asf.c
index ee8c85f735..c131207aa1 100644
uint8_t
*buf);
- int ff_argo_asf_fill_stream(AVStream *st, const ArgoASFChunkHeader *ckhdr);
Signed-off-by: Zane van Iperen
---
libavformat/argo_asf.c | 204 +++--
libavformat/argo_asf.h | 67 ++
2 files changed, 159 insertions(+), 112 deletions
Signed-off-by: Zane van Iperen
---
libavformat/argo_asf.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/libavformat/argo_asf.c b/libavformat/argo_asf.c
index bf9b5d0c0a..208280b4d9 100644
--- a/libavformat/argo_asf.c
+++ b/libavformat/argo_asf.c
@@ -144,6 +144,9 @@ static int
On Sat, 05 Sep 2020 12:05:03 +
"Zane van Iperen" wrote:
>
> Version 1.1 (FX Fighter) files all have a sample rate of 44100
> in the header, but only play back correctly at 22050.
>
> Force the sample rate to 22050 when reading, and restrict it
> when muxing.
Version 1.1 (FX Fighter) files all have a sample rate of 44100
in the header, but only play back correctly at 22050.
Force the sample rate to 22050 when reading, and restrict it
when muxing.
Signed-off-by: Zane van Iperen
---
libavformat/argo_asf.c | 19 +--
1 file changed, 17
On Mon, 24 Aug 2020 14:11:00 +1000
"Steven Liu" wrote:
> > A few things:
> >
> > 1. Is the second link to the author's website really necessary?
> the Chinaffmpeg link is added by me
> that because it’s only Chinese Font version,
> and there have lots link about that book in China, eg, jd.com,
On Sun, 09 Aug 2020 22:38:19 +1000
"FFmpegQuickHacks"
wrote:
> Hi,
>
> The original patch is archived at:
> http://ffmpeg.org/pipermail/ffmpeg-devel/2020-May/262634.html
>
> Here it is again:
>
> ---
> src/documentation | 10 ++
> 1 files changed, 6 insertions(+), 4 deletions(-)
On Mon, 17 Aug 2020 12:21:46 -0700
Yiğit Uyan wrote:
> Can somebody help with extending the rtsp/s link limit to match the web
> urls (eg. 2048 characters)
AFAICS this would work as a band-aid, but since the RFC doesn't
specify a length limit (that I can find), in the long run it might be
On Mon, 10 Aug 2020 23:33:14 +0200
"Alexander Strasser" wrote:
>
> Hi Zane,
>
> thanks for addressing my comments in v3.
>
> AFAICS you also took Andreas' feedback into account, but I didn't
> check that.
>
No worries. I'm pretty sure I handled everything...
> No more remarks from me.
>
Signed-off-by: Zane van Iperen
---
libavformat/argo_asf.c | 14 +-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/libavformat/argo_asf.c b/libavformat/argo_asf.c
index d25a5de37f..577b9d9c01 100644
--- a/libavformat/argo_asf.c
+++ b/libavformat/argo_asf.c
@@ -68,6
Signed-off-by: Zane van Iperen
---
libavformat/argo_asf.c | 47 +++---
1 file changed, 44 insertions(+), 3 deletions(-)
diff --git a/libavformat/argo_asf.c b/libavformat/argo_asf.c
index bb69b01ff4..d25a5de37f 100644
--- a/libavformat/argo_asf.c
+++ b
is identical.
Signed-off-by: Zane van Iperen
---
libavformat/argo_asf.c | 7 ---
1 file changed, 7 deletions(-)
diff --git a/libavformat/argo_asf.c b/libavformat/argo_asf.c
index 94d3ae3e09..bb69b01ff4 100644
--- a/libavformat/argo_asf.c
+++ b/libavformat/argo_asf.c
@@ -136,13 +136,6 @@ static int
Signed-off-by: Zane van Iperen
---
libavformat/argo_asf.c | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/libavformat/argo_asf.c b/libavformat/argo_asf.c
index 671b7482f9..94d3ae3e09 100644
--- a/libavformat/argo_asf.c
+++ b/libavformat/argo_asf.c
@@ -87,9 +87,12
Only when the user hasn't manually specified one.
Matches the original files more closely.
Signed-off-by: Zane van Iperen
---
libavformat/argo_asf.c | 20 +---
1 file changed, 17 insertions(+), 3 deletions(-)
diff --git a/libavformat/argo_asf.c b/libavformat/argo_asf.c
index
On Sun, 9 Aug 2020 09:29:16 +0200
"Paul B Mahol" wrote:
>
> This is really bad practice.
>
Usually I'd agree. However (and I've just checked this) all file
versions are identical.
Since this is an Argonaut Games format, I checked the version of all the
ASF files in their most recent games.
On Sat, 8 Aug 2020 19:57:09 +0200
"Nicolas George" wrote:
>
> Tables that were not just written by the code author are
> not actually source code, otherwise,
> "recode data..x1 < proprietary.o > source.c"
> would be enough to launder a proprietary blob into
> the source code.
>
> Documenting
Only when the user hasn't manually specified one.
Matches the original files more closely.
Signed-off-by: Zane van Iperen
---
libavformat/argo_asf.c | 20 +---
1 file changed, 17 insertions(+), 3 deletions(-)
diff --git a/libavformat/argo_asf.c b/libavformat/argo_asf.c
index
Signed-off-by: Zane van Iperen
---
libavformat/argo_asf.c | 14 +-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/libavformat/argo_asf.c b/libavformat/argo_asf.c
index c693cfd045..7eaf2fec73 100644
--- a/libavformat/argo_asf.c
+++ b/libavformat/argo_asf.c
@@ -74,6
Signed-off-by: Zane van Iperen
---
libavformat/argo_asf.c | 47 +++---
1 file changed, 44 insertions(+), 3 deletions(-)
diff --git a/libavformat/argo_asf.c b/libavformat/argo_asf.c
index beec46a0d4..c693cfd045 100644
--- a/libavformat/argo_asf.c
+++ b
All files I've seen are identical, irregardless of version.
Until shown otherwise, assume unknown ones are too.
Signed-off-by: Zane van Iperen
---
libavformat/argo_asf.c | 37 +++--
1 file changed, 7 insertions(+), 30 deletions(-)
diff --git a/libavformat
On Sat, 8 Aug 2020 12:20:32 +0200
"Andreas Rheinhardt" wrote:
> > #if CONFIG_ARGO_ASF_DEMUXER
> > @@ -301,7 +302,10 @@ static int argo_asf_write_header(AVFormatContext *s)
> > /* version_{major,minor} set by options. */
> > ctx->fhdr.num_chunks = 1;
> >
On Sat, 08 Aug 2020 13:05:28 +0200
"Alexander Strasser" wrote:
>
> Hi Zane!
>
Hello!
> >@@ -296,8 +298,7 @@ static int argo_asf_write_header(AVFormatContext
> >*s)
> > ArgoASFContext *ctx = s->priv_data;
> >
> > ctx->fhdr.magic = ASF_TAG;
> >-
On Sat, 8 Aug 2020 12:15:01 +0200
"Andreas Rheinhardt" wrote:
> The version fields in the structure mimic the way the header is set up:
> They are uint16_t. Yet the fields will be written with a pointer to int
> (that's a consequence of using AV_OPT_TYPE_INT). This means that (most
> likely) an
On Sat, 8 Aug 2020 11:46:55 +0200
"Andreas Rheinhardt" wrote:
> >
> There is no point keeping data only used once in your context which is
> not what these contexts are there for. Coupled with patch 4/6 you are
> adding a const AVClass * to the context of the demuxer although the
> demuxer
Signed-off-by: Zane van Iperen
---
libavformat/argo_asf.c | 14 +-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/libavformat/argo_asf.c b/libavformat/argo_asf.c
index 9845cb955b..3499519903 100644
--- a/libavformat/argo_asf.c
+++ b/libavformat/argo_asf.c
@@ -69,6
Signed-off-by: Zane van Iperen
---
libavformat/argo_asf.c | 37 +++--
1 file changed, 35 insertions(+), 2 deletions(-)
diff --git a/libavformat/argo_asf.c b/libavformat/argo_asf.c
index 1770192aad..9845cb955b 100644
--- a/libavformat/argo_asf.c
+++ b/libavformat
Only when the user hasn't manually specified one.
Matches the original files more closely.
Signed-off-by: Zane van Iperen
---
libavformat/argo_asf.c | 21 ++---
1 file changed, 18 insertions(+), 3 deletions(-)
diff --git a/libavformat/argo_asf.c b/libavformat/argo_asf.c
index
Preparation for options.
Signed-off-by: Zane van Iperen
---
libavformat/argo_asf.c | 42 +-
1 file changed, 21 insertions(+), 21 deletions(-)
diff --git a/libavformat/argo_asf.c b/libavformat/argo_asf.c
index 52e37f9c10..1770192aad 100644
Signed-off-by: Zane van Iperen
---
libavformat/argo_asf.c | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/libavformat/argo_asf.c b/libavformat/argo_asf.c
index beec46a0d4..52e37f9c10 100644
--- a/libavformat/argo_asf.c
+++ b/libavformat/argo_asf.c
@@ -63,11 +63,11
All files I've seen are identical, irregardless of version.
Until shown otherwise, assume unknown ones are too.
Signed-off-by: Zane van Iperen
---
libavformat/argo_asf.c | 37 +++--
1 file changed, 7 insertions(+), 30 deletions(-)
diff --git a/libavformat
On Tue, 04 Aug 2020 23:08:50 +
"Zane van Iperen" wrote:
>
> v3:
> * fix FATE failure (lavf-asf) caused by "asf" extension conflict
>
> v2: [1]
> * enforce the samples-per-block value in the demuxer
> * remove unnecessary initialisers
> * a
On Thu, 6 Aug 2020 01:33:57 +0200
"Andreas Rheinhardt" wrote:
>
> static void load_sb_block(AVFormatContext *s, VividasDemuxContext *viv,
> unsigned expected_size)
> @@ -608,7 +606,7 @@ static int viv_read_header(AVFormatContext *s)
> ret = track_index(viv, s, buf, v);
>
On Wed, 5 Aug 2020 23:09:45 +0200
"Andreas Rheinhardt" wrote:
> > +
> > +static int argo_asf_write_trailer(AVFormatContext *s)
> > +{
> > +int16_t ret;
>
> Using an int16_t here is wrong: It may mask errors and apart from that
> it may lead to warnings from static analyzers.
>
Good catch,
Signed-off-by: Zane van Iperen
---
tests/fate/acodec.mak | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/tests/fate/acodec.mak b/tests/fate/acodec.mak
index 96ab0e587e..3e2a18435f 100644
--- a/tests/fate/acodec.mak
+++ b/tests/fate/acodec.mak
@@ -44,15 +44,15
Signed-off-by: Zane van Iperen
---
libavformat/argo_asf.c | 9 -
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/libavformat/argo_asf.c b/libavformat/argo_asf.c
index 3339425244..9de64dfab4 100644
--- a/libavformat/argo_asf.c
+++ b/libavformat/argo_asf.c
@@ -27,6 +27,7
Replaces adpcm_argo_expand_nibble(). Preparation for the encoder.
Signed-off-by: Zane van Iperen
---
libavcodec/adpcm.c | 10 +-
libavcodec/adpcm.h | 2 ++
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c
index b77f4b8ef6
Signed-off-by: Zane van Iperen
---
Changelog | 1 +
doc/general.texi | 2 +-
libavcodec/Makefile| 1 +
libavcodec/adpcmenc.c | 86 +-
libavcodec/allcodecs.c | 1 +
libavcodec/utils.c | 1 +
libavcodec/version.h | 2 +-
7
Signed-off-by: Zane van Iperen
---
tests/fate/acodec.mak | 2 ++
tests/ref/acodec/adpcm-argo | 4
2 files changed, 6 insertions(+)
create mode 100644 tests/ref/acodec/adpcm-argo
diff --git a/tests/fate/acodec.mak b/tests/fate/acodec.mak
index 197b6ed7c0..96ab0e587e 100644
Signed-off-by: Zane van Iperen
---
Changelog| 1 +
libavformat/Makefile | 1 +
libavformat/allformats.c | 1 +
libavformat/argo_asf.c | 127 ++-
libavformat/version.h| 2 +-
5 files changed, 130 insertions(+), 2 deletions
and check packet sizes
* use AVStream::nb_frames instead of calculating the value
* fix Makefile dependencies
Zane van Iperen (6):
avformat/argo_asf: check sample count in demuxer
avcodec/adpcm_argo: add ff_adpcm_argo_expand_nibble() and cleanup
parameters
avcodec: add adpcm_argo encoder
On Tue, 04 Aug 2020 09:27:35 +
"Zane van Iperen" wrote:
>
> On Tue, 04 Aug 2020 08:46:41 +0000
> "Zane van Iperen" 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
On Tue, 04 Aug 2020 08:46:41 +
"Zane van Iperen" wrote:
Disregard, this breaks FATE. Will post a follow-up later.
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe,
Signed-off-by: Zane van Iperen
---
tests/fate/acodec.mak | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/tests/fate/acodec.mak b/tests/fate/acodec.mak
index 96ab0e587e..3e2a18435f 100644
--- a/tests/fate/acodec.mak
+++ b/tests/fate/acodec.mak
@@ -44,15 +44,15
Signed-off-by: Zane van Iperen
---
tests/fate/acodec.mak | 2 ++
tests/ref/acodec/adpcm-argo | 4
2 files changed, 6 insertions(+)
create mode 100644 tests/ref/acodec/adpcm-argo
diff --git a/tests/fate/acodec.mak b/tests/fate/acodec.mak
index 197b6ed7c0..96ab0e587e 100644
Signed-off-by: Zane van Iperen
---
Changelog | 1 +
doc/general.texi | 2 +-
libavcodec/Makefile| 1 +
libavcodec/adpcmenc.c | 86 +-
libavcodec/allcodecs.c | 1 +
libavcodec/utils.c | 1 +
libavcodec/version.h | 2 +-
7
Signed-off-by: Zane van Iperen
---
Changelog| 1 +
libavformat/Makefile | 1 +
libavformat/allformats.c | 1 +
libavformat/argo_asf.c | 124 ++-
libavformat/version.h| 2 +-
5 files changed, 127 insertions(+), 2 deletions
Signed-off-by: Zane van Iperen
---
libavformat/argo_asf.c | 9 -
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/libavformat/argo_asf.c b/libavformat/argo_asf.c
index 3339425244..9de64dfab4 100644
--- a/libavformat/argo_asf.c
+++ b/libavformat/argo_asf.c
@@ -27,6 +27,7
the value
* fix Makefile dependencies
Zane van Iperen (6):
avformat/argo_asf: check sample count in demuxer
avcodec/adpcm_argo: add ff_adpcm_argo_expand_nibble() and cleanup
parameters
avcodec: add adpcm_argo encoder
avformat: add argo_asf muxer
fate: add adpcm_argo test
fate: cosmetics
Replaces adpcm_argo_expand_nibble(). Preparation for the encoder.
Signed-off-by: Zane van Iperen
---
libavcodec/adpcm.c | 10 +-
libavcodec/adpcm.h | 2 ++
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c
index b77f4b8ef6
On Mon, 3 Aug 2020 01:22:34 +0200
"Michael Niedermayer" wrote:
> > diff --git a/libavcodec/version.h b/libavcodec/version.h
> > index f66919617a..a3f9f828ee 100644
> > --- a/libavcodec/version.h
> > +++ b/libavcodec/version.h
> > @@ -28,7 +28,7 @@
> > #include "libavutil/version.h"
> >
> >
On Sun, 2 Aug 2020 14:43:20 +0200
"Andreas Rheinhardt" wrote:
> > So, something like this basically:
> >
> > static int argo_asf_write_packet(AVFormatContext *s, AVPacket *pkt)
> > {
> > if (pkt->size != 17 && pkt->size != 34)
> > return AVERROR(EINVAL);
> >
> >
On Sun, 2 Aug 2020 14:14:45 +0200
"Andreas Rheinhardt" wrote:
>
> Zane van Iperen:
> >>> +static int argo_asf_write_trailer(AVFormatContext *s)
> >>> +{
> >>> +int64_t data_size, num_blocks;
> >>> +
On Sun, 2 Aug 2020 13:28:10 +0200
> > +for (int i = 0; i < FF_ARRAY_ELEMS(fhdr->name); i++)
> > +avio_w8(pb, fhdr->name[i]);
>
> Are you aware of avio_write()?
...yes. I basically copied the reading code, which used AV_RL8.
I've changed it.
> > +static int
Signed-off-by: Zane van Iperen
---
tests/fate/acodec.mak | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/tests/fate/acodec.mak b/tests/fate/acodec.mak
index 96ab0e587e..3e2a18435f 100644
--- a/tests/fate/acodec.mak
+++ b/tests/fate/acodec.mak
@@ -44,15 +44,15
Signed-off-by: Zane van Iperen
---
Changelog| 1 +
libavformat/Makefile | 1 +
libavformat/allformats.c | 1 +
libavformat/argo_asf.c | 123 ++-
libavformat/version.h| 2 +-
5 files changed, 126 insertions(+), 2 deletions
Signed-off-by: Zane van Iperen
---
tests/fate/acodec.mak | 2 ++
tests/ref/acodec/adpcm-argo | 4
2 files changed, 6 insertions(+)
create mode 100644 tests/ref/acodec/adpcm-argo
diff --git a/tests/fate/acodec.mak b/tests/fate/acodec.mak
index 197b6ed7c0..96ab0e587e 100644
Replaces adpcm_argo_expand_nibble(). Preparation for the encoder.
Signed-off-by: Zane van Iperen
---
libavcodec/adpcm.c | 10 +-
libavcodec/adpcm.h | 2 ++
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c
index b77f4b8ef6
Flag bit was in the wrong place.
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 4de4a23289..b77f4b8ef6 100644
--- a/libavcodec/adpcm.c
+++ b/libavcodec/adpcm.c
@@ -1987,7
Signed-off-by: Zane van Iperen
---
Changelog | 1 +
doc/general.texi | 2 +-
libavcodec/Makefile| 1 +
libavcodec/adpcmenc.c | 86 +-
libavcodec/allcodecs.c | 1 +
libavcodec/utils.c | 1 +
libavcodec/version.h | 2 +-
7
Hi all,
What's the policy for backporting patches?
Is it just run-FATE-then-push, or is there some extra review required?
Zane
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe,
On Fri, 31 Jul 2020 00:55:56 +0800
"zongwave" wrote:
> ++static int xcam_query_formats(AVFilterContext *ctx)
> ++{
> ++XCAMContext *s = ctx->priv;
> ++AVFilterFormats *formats = NULL;
> ++
> ++static const enum AVPixelFormat nv12_fmts[] = {AV_PIX_FMT_NV12,
> AV_PIX_FMT_NONE};
> ++
On Thu, 30 Jul 2020 09:23:12 +
"Zong, Wei" wrote:
> Yes, I made the patch with git command "format-patch", there's some
> redundant message, so I modified the patch file a little bit
> manually. Then I use git "send-email" to send the patch.
I'm pretty sure modifying the .patch manually
On Wed, 29 Jul 2020 15:09:28 +0200
"Andreas Rheinhardt" wrote:
>
> Zane van Iperen:
> > On Wed, 29 Jul 2020 12:14:40 +0000
> > "Zane van Iperen" wrote:
> >
> >>
> >> Value was incorrectly changed in
> >> 3bf1be21
On Wed, 29 Jul 2020 12:14:40 +
"Zane van Iperen" wrote:
>
> Value was incorrectly changed in
> 3bf1be210150b435c51c7c8eb8fd05a1fca08814.
>
I'll apply this tomorrow if no objections.
___
ffmpeg-devel mailing list
ffmpeg-
Value was incorrectly changed in 3bf1be210150b435c51c7c8eb8fd05a1fca08814.
Signed-off-by: Zane van Iperen
---
libavformat/apm.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavformat/apm.c b/libavformat/apm.c
index 4c5844c83e..38a0f6382a 100644
--- a/libavformat
On Tue, 28 Jul 2020 06:10:57 +0200
"Josef Zlomek" wrote:
>
> Now, the function trim_double_dot_url splits the path by "/" into
> components, and processes the components one ny one:
Typo: ny should be by, I'm assuming?
___
ffmpeg-devel mailing list
On Mon, 20 Jul 2020 10:46:29 +
"Zane van Iperen" wrote:
>
> Signed-off-by: Zane van Iperen
> ---
> libavformat/apm.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
This is a trivial fix, will app
Signed-off-by: Zane van Iperen
---
libavformat/apm.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavformat/apm.c b/libavformat/apm.c
index 0d88e1099a..fe95a9ad7a 100644
--- a/libavformat/apm.c
+++ b/libavformat/apm.c
@@ -126,8 +126,8 @@ static int apm_read_header
On Wed, 08 Jul 2020 12:54:46 +
"Zane van Iperen" wrote:
>
> v6: [8]
> * split out header and extradata fixes
> * add more-descriptive commit messages
> * fix bit_rate overflow
>
Will rebase and push in the ne
On Wed, 08 Jul 2020 12:54:46 +
"Zane van Iperen" wrote:
> v6: [8]
> * split out header and extradata fixes
> * add more-descriptive commit messages
> * fix bit_rate overflow
Ping 2.
___
ffmpeg-devel mailing list
ffmpeg-
On Wed, 08 Jul 2020 12:54:46 +
"Zane van Iperen" wrote:
>
> v6: [8]
> * split out header and extradata fixes
> * add more-descriptive commit messages
> * fix bit_rate overflow
>
Ping.
___
ffmpeg-devel mailing list
f
Signed-off-by: Zane van Iperen
---
tests/fate/acodec.mak | 2 ++
tests/ref/acodec/adpcm-ima_apm | 4
2 files changed, 6 insertions(+)
create mode 100644 tests/ref/acodec/adpcm-ima_apm
diff --git a/tests/fate/acodec.mak b/tests/fate/acodec.mak
index bb6bfe5ada..197b6ed7c0 100644
Signed-off-by: Zane van Iperen
---
Changelog| 1 +
libavformat/Makefile | 1 +
libavformat/allformats.c | 1 +
libavformat/apm.c| 107 ++-
libavformat/version.h| 2 +-
5 files changed, 110 insertions(+), 2 deletions
Signed-off-by: Zane van Iperen
---
Changelog | 1 +
doc/general.texi | 2 +-
libavcodec/Makefile| 1 +
libavcodec/adpcmenc.c | 34 --
libavcodec/allcodecs.c | 1 +
libavcodec/utils.c | 1 +
libavcodec/version.h | 2 +-
7 files
Signed-off-by: Zane van Iperen
---
libavcodec/adpcmenc.c | 35 ++-
1 file changed, 18 insertions(+), 17 deletions(-)
diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c
index 4985abb163..adb7bf0bbf 100644
--- a/libavcodec/adpcmenc.c
+++ b/libavcodec
The leading WAVEFORMATEX in .APM files is malformed:
* The nAvgBytesPerSec field is wrong, and
* sizeof(cbSize) is 4 instead of 2.
Signed-off-by: Zane van Iperen
---
libavformat/Makefile | 2 +-
libavformat/apm.c| 50
2 files changed, 33
Signed-off-by: Zane van Iperen
---
libavformat/apm.c | 100 +++---
1 file changed, 51 insertions(+), 49 deletions(-)
diff --git a/libavformat/apm.c b/libavformat/apm.c
index 8d655d0a33..0d88e1099a 100644
--- a/libavformat/apm.c
+++ b/libavformat/apm.c
tps://ffmpeg.org/pipermail/ffmpeg-devel/2020-June/265218.html
[8] https://ffmpeg.org/pipermail/ffmpeg-devel/2020-July/265840.html
Zane van Iperen (7):
avformat/apm: read header correctly
avformat/apm: use the entire APMState structure as extradata
avformat/apm: fix variable/structure nam
Is the "actual" codec extradata instead of the hand-crafted one
from the previous revision.
Signed-off-by: Zane van Iperen
---
libavformat/apm.c | 9 -
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/libavformat/apm.c b/libavformat/apm.c
index 4158b81457..8d655d0
Signed-off-by: Zane van Iperen
---
MAINTAINERS | 6 ++
1 file changed, 6 insertions(+)
diff --git a/MAINTAINERS b/MAINTAINERS
index 02af52101e..30c2ec59e6 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -393,7 +393,10 @@ Muxers/Demuxers:
afc.c Paul B Mahol
this privilege.
Since `git format-patch` doesn't handle signatures, a signed version of the
commit
may be found at:
https://github.com/vs49688/FFmpeg maint
Zane van Iperen (1):
MAINTAINERS: add myself and gpg fingerprint
MAINTAINERS | 6 ++
1 file changed, 6 insertions(+)
--
2.25.1
On Mon, 6 Jul 2020 18:29:57 +0200
"Michael Niedermayer" wrote:
> On Mon, Jul 06, 2020 at 09:24:20AM +0000, Zane van Iperen wrote:
> > Signed-off-by: Zane van Iperen
> > ---
> > libavformat/Makefile | 2 +-
> > libavformat/apm.c| 62
> > +
Signed-off-by: Zane van Iperen
---
libavcodec/adpcmenc.c | 35 ++-
1 file changed, 18 insertions(+), 17 deletions(-)
diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c
index 4985abb163..adb7bf0bbf 100644
--- a/libavcodec/adpcmenc.c
+++ b/libavcodec
Signed-off-by: Zane van Iperen
---
tests/fate/acodec.mak | 2 ++
tests/ref/acodec/adpcm-ima_apm | 4
2 files changed, 6 insertions(+)
create mode 100644 tests/ref/acodec/adpcm-ima_apm
diff --git a/tests/fate/acodec.mak b/tests/fate/acodec.mak
index bb6bfe5ada..197b6ed7c0 100644
Signed-off-by: Zane van Iperen
---
Changelog | 1 +
doc/general.texi | 2 +-
libavcodec/Makefile| 1 +
libavcodec/adpcmenc.c | 34 --
libavcodec/allcodecs.c | 1 +
libavcodec/utils.c | 1 +
libavcodec/version.h | 2 +-
7 files
Signed-off-by: Zane van Iperen
---
Changelog| 1 +
libavformat/Makefile | 1 +
libavformat/allformats.c | 1 +
libavformat/apm.c| 110 ++-
libavformat/version.h| 2 +-
5 files changed, 112 insertions(+), 3 deletions
65218.html
Zane van Iperen (6):
avformat/apm: use new extradata format
avformat/apm: fix variable/structure names and cosmetics
avcodec: add adpcm_ima_apm encoder
avformat: add apm muxer
fate: add adpcm_ima_apm encoding test
avcodec/adpcmenc: cleanup trellis checks
Changelog
Signed-off-by: Zane van Iperen
---
libavformat/apm.c | 94 ---
1 file changed, 48 insertions(+), 46 deletions(-)
diff --git a/libavformat/apm.c b/libavformat/apm.c
index b51b9fcbe6..666cb97fd3 100644
--- a/libavformat/apm.c
+++ b/libavformat/apm.c
Signed-off-by: Zane van Iperen
---
libavformat/Makefile | 2 +-
libavformat/apm.c| 62
2 files changed, 35 insertions(+), 29 deletions(-)
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 26af859a28..a4113fe644 100644
On Fri, 26 Jun 2020 21:45:37 +0200
"Michael Niedermayer" wrote:
> On Sat, Jun 20, 2020 at 10:59:14AM +0000, Zane van Iperen wrote:
> > Signed-off-by: Zane van Iperen
> > ---
> > libavcodec/adpcm.c | 17 -
> > 1 file changed, 12 insertions
301 - 400 of 611 matches
Mail list logo
