Re: [FFmpeg-devel] [PATCH v4 2/2] avformat/libopenmpt: Probe file format from file data if possible

2018-03-21 Thread Jörn Heusipp
On 03/20/2018 10:37 PM, Michael Niedermayer wrote: On Sun, Mar 18, 2018 at 09:10:47PM +, Josh de Kock wrote: On 2018/03/18 8:23, wm4 wrote: On Sun, 18 Mar 2018 08:44:12 +0100 Jörn Heusipp wrote: On 03/04/2018 08:55 AM, Jörn Heusipp wrote: On 02/21/2018 12:11 PM, Jörn Heusipp wrote

Re: [FFmpeg-devel] [PATCH v4 2/2] avformat/libopenmpt: Probe file format from file data if possible

2018-03-18 Thread Jörn Heusipp
On 03/04/2018 08:55 AM, Jörn Heusipp wrote: On 02/21/2018 12:11 PM, Jörn Heusipp wrote:   libavformat/libopenmpt.c | 57   1 file changed, 57 insertions(+) Uhm, ping? So, my patches have been waiting without any further comment for more

Re: [FFmpeg-devel] [PATCH v4 2/2] avformat/libopenmpt: Probe file format from file data if possible

2018-03-03 Thread Jörn Heusipp
On 02/21/2018 12:11 PM, Jörn Heusipp wrote: libavformat/libopenmpt.c | 57 1 file changed, 57 insertions(+) Uhm, ping? Regards, Jörn ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http

[FFmpeg-devel] [PATCH v4 2/2] avformat/libopenmpt: Probe file format from file data if possible

2018-02-21 Thread Jörn Heusipp
unctions combined in tools/probetest for all of its module formats combined (currently 41 modules formats in libopenmpt 0.3.4 and 234 file formats in FFmpeg). Signed-off-by: Jörn Heusipp --- libavformat/libopenmpt.c | 57 1 file changed, 57 inserti

[FFmpeg-devel] [PATCH v4 1/2] avformat/libopenmpt: Update file extensions list for libopenmpt 0.3

2018-02-21 Thread Jörn Heusipp
Signed-off-by: Jörn Heusipp --- libavformat/libopenmpt.c | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavformat/libopenmpt.c b/libavformat/libopenmpt.c index 30c3d6e..5efbdc4 100644 --- a/libavformat/libopenmpt.c +++ b/libavformat/libopenmpt.c @@ -234,5 +234,9

Re: [FFmpeg-devel] [PATCH v3 4/4] avformat/libopenmpt: Probe file format from file data if possible

2018-01-23 Thread Jörn Heusipp
On 01/11/2018 09:11 AM, Jörn Heusipp wrote: Signed-off-by: Jörn Heusipp --- libavformat/libopenmpt.c | 57 1 file changed, 57 insertions(+) Does anyone have any further comments on patches 3/4 and 4/4? Carl Eugen Hoyos suggested that more

[FFmpeg-devel] [PATCH v3 2/4] avformat/libopenmpt: Update to libopenmpt 0.3 API

2018-01-11 Thread Jörn Heusipp
still supported. Signed-off-by: Jörn Heusipp --- libavformat/libopenmpt.c | 25 + 1 file changed, 25 insertions(+) diff --git a/libavformat/libopenmpt.c b/libavformat/libopenmpt.c index 2e22290..30c3d6e 100644 --- a/libavformat/libopenmpt.c +++ b/libavformat/libopenmpt.c

[FFmpeg-devel] [PATCH v3 1/4] avformat/libopenmpt: Fix mixed code and declarations

2018-01-11 Thread Jörn Heusipp
Signed-off-by: Jörn Heusipp --- libavformat/libopenmpt.c | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libavformat/libopenmpt.c b/libavformat/libopenmpt.c index af6eb1a..2e22290 100644 --- a/libavformat/libopenmpt.c +++ b/libavformat/libopenmpt.c @@ -72,13

[FFmpeg-devel] [PATCH v3 3/4] avformat/libopenmpt: Update file extensions list for libopenmpt 0.3

2018-01-11 Thread Jörn Heusipp
Signed-off-by: Jörn Heusipp --- libavformat/libopenmpt.c | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavformat/libopenmpt.c b/libavformat/libopenmpt.c index 30c3d6e..5efbdc4 100644 --- a/libavformat/libopenmpt.c +++ b/libavformat/libopenmpt.c @@ -234,5 +234,9

[FFmpeg-devel] [PATCH v3 4/4] avformat/libopenmpt: Probe file format from file data if possible

2018-01-11 Thread Jörn Heusipp
unctions combined in tools/probetest for all of its module formats combined (currently 41 modules formats in libopenmpt 0.3.4 and 234 file formats in FFmpeg). Signed-off-by: Jörn Heusipp --- libavformat/libopenmpt.c | 57 1 file changed, 57 inserti

Re: [FFmpeg-devel] [PATCH v2 4/4] avformat/libopenmpt: Probe file format from file data if possible

2018-01-10 Thread Jörn Heusipp
On 01/10/2018 12:55 PM, Carl Eugen Hoyos wrote: 2018-01-10 12:18 GMT+01:00 Jörn Heusipp : When building with libopenmpt 0.3, use the libopenmpt file header probing functions for probing. libopenmpt probing functions are allocation-free and designed to be as fast as possible. For libopenmpt

[FFmpeg-devel] [PATCH v2 2/4] avformat/libopenmpt: Update to libopenmpt 0.3 API

2018-01-10 Thread Jörn Heusipp
still supported. Signed-off-by: Jörn Heusipp --- libavformat/libopenmpt.c | 25 + 1 file changed, 25 insertions(+) diff --git a/libavformat/libopenmpt.c b/libavformat/libopenmpt.c index 2e22290..30c3d6e 100644 --- a/libavformat/libopenmpt.c +++ b/libavformat/libopenmpt.c

[FFmpeg-devel] [PATCH v2 3/4] avformat/libopenmpt: Update file extensions list for libopenmpt 0.3

2018-01-10 Thread Jörn Heusipp
Signed-off-by: Jörn Heusipp --- libavformat/libopenmpt.c | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavformat/libopenmpt.c b/libavformat/libopenmpt.c index 30c3d6e..5efbdc4 100644 --- a/libavformat/libopenmpt.c +++ b/libavformat/libopenmpt.c @@ -234,5 +234,9

[FFmpeg-devel] [PATCH v2 4/4] avformat/libopenmpt: Probe file format from file data if possible

2018-01-10 Thread Jörn Heusipp
unctions combined in tools/probetest for all of its module formats combined (currently 41 modules formats in libopenmpt 0.3.4 and 234 file formats in FFmpeg). Signed-off-by: Jörn Heusipp --- libavformat/libopenmpt.c | 57 1 file changed, 57 inserti

[FFmpeg-devel] [PATCH v2 0/4] libopenmpt 0.3 updates

2018-01-10 Thread Jörn Heusipp
robetest generates, these more real-world examples of going through av_probe_input_format() on all files in FATE show an even smaller relative increase: 11043671 / 10846094 - 1 = 0.018 ~= 2%. Note that in actual use, the to be probed data will likely not be in page cache. Jörn Heusipp (4): avform

[FFmpeg-devel] [PATCH v2 1/4] avformat/libopenmpt: Fix mixed code and declarations

2018-01-10 Thread Jörn Heusipp
Signed-off-by: Jörn Heusipp --- libavformat/libopenmpt.c | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libavformat/libopenmpt.c b/libavformat/libopenmpt.c index af6eb1a..2e22290 100644 --- a/libavformat/libopenmpt.c +++ b/libavformat/libopenmpt.c @@ -72,13

Re: [FFmpeg-devel] [PATCH 4/4] avformat/libopenmpt: Probe file format from file data if possible

2018-01-08 Thread Jörn Heusipp
On 01/08/2018 12:57 AM, Carl Eugen Hoyos wrote: 2018-01-07 15:40 GMT+01:00 Jörn Heusipp : On 01/06/2018 04:10 PM, Carl Eugen Hoyos wrote: 2018-01-06 11:07 GMT+01:00 Jörn Heusipp : libopenmpt file header probing is tested regularly against the FATE suite and other diverse file collections

Re: [FFmpeg-devel] [PATCH 3/4] avformat/libopenmpt: Update file extensions list for libopenmpt 0.3

2018-01-08 Thread Jörn Heusipp
On 01/08/2018 12:48 AM, Carl Eugen Hoyos wrote: 2018-01-07 15:40 GMT+01:00 Jörn Heusipp : On 01/06/2018 04:06 PM, Carl Eugen Hoyos wrote: 2018-01-06 11:07 GMT+01:00 Jörn Heusipp : -.extensions = "669,amf,ams,dbm,digi,dmf,dsm,far,gdm,imf,it,j2b,m15,mdl,med,mmcmp,mms,mo3,mod

Re: [FFmpeg-devel] [PATCH 4/4] avformat/libopenmpt: Probe file format from file data if possible

2018-01-07 Thread Jörn Heusipp
On 01/06/2018 04:10 PM, Carl Eugen Hoyos wrote: 2018-01-06 11:07 GMT+01:00 Jörn Heusipp : libopenmpt file header probing is tested regularly against the FATE suite and other diverse file collections by libopenmpt upstream in order to avoid false positives. You could also test tools

Re: [FFmpeg-devel] [PATCH 3/4] avformat/libopenmpt: Update file extensions list for libopenmpt 0.3

2018-01-07 Thread Jörn Heusipp
On 01/06/2018 04:06 PM, Carl Eugen Hoyos wrote: 2018-01-06 11:07 GMT+01:00 Jörn Heusipp : Signed-off-by: Jörn Heusipp --- libavformat/libopenmpt.c | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavformat/libopenmpt.c b/libavformat/libopenmpt.c index 30c3d6e

[FFmpeg-devel] [PATCH 4/4] avformat/libopenmpt: Probe file format from file data if possible

2018-01-06 Thread Jörn Heusipp
VProbeData)); pd.filename = argv[i]; memset(buf, 0, sizeof(buf)); f = fopen(pd.filename, "rb"); size = fread(buf, 1, BUFSIZE, f); fclose(f); pd.buf_size = size; av_probe_input_format(&pd, 1); }

[FFmpeg-devel] [PATCH 1/4] avformat/libopenmpt: Fix mixed code and declarations

2018-01-06 Thread Jörn Heusipp
Signed-off-by: Jörn Heusipp --- libavformat/libopenmpt.c | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libavformat/libopenmpt.c b/libavformat/libopenmpt.c index af6eb1a..2e22290 100644 --- a/libavformat/libopenmpt.c +++ b/libavformat/libopenmpt.c @@ -72,13

[FFmpeg-devel] [PATCH 3/4] avformat/libopenmpt: Update file extensions list for libopenmpt 0.3

2018-01-06 Thread Jörn Heusipp
Signed-off-by: Jörn Heusipp --- libavformat/libopenmpt.c | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavformat/libopenmpt.c b/libavformat/libopenmpt.c index 30c3d6e..5efbdc4 100644 --- a/libavformat/libopenmpt.c +++ b/libavformat/libopenmpt.c @@ -234,5 +234,9

[FFmpeg-devel] [PATCH 2/4] avformat/libopenmpt: Update to libopenmpt 0.3 API

2018-01-06 Thread Jörn Heusipp
still supported. Signed-off-by: Jörn Heusipp --- libavformat/libopenmpt.c | 25 + 1 file changed, 25 insertions(+) diff --git a/libavformat/libopenmpt.c b/libavformat/libopenmpt.c index 2e22290..30c3d6e 100644 --- a/libavformat/libopenmpt.c +++ b/libavformat/libopenmpt.c

Re: [FFmpeg-devel] [PATCH] configure: add libm ldflags globally

2017-10-17 Thread Jörn Heusipp
On 10/16/2017 11:38 PM, Hendrik Leppkes wrote: On Mon, Oct 16, 2017 at 11:02 PM, James Almer wrote: The remaining issue after this patchset is applied is linking to the C++ standard library with some external deps. According to Jörn Heusipp, the libopenmpt maintainer, it's not some

Re: [FFmpeg-devel] [PATCH] configure: add libm ldflags globally

2017-10-17 Thread Jörn Heusipp
On 10/17/2017 03:04 AM, Carl Eugen Hoyos wrote: 2017-10-16 23:02 GMT+02:00 James Almer : and by hardcoding a -lstdc++ ldflag in configure checks we're apparently breaking detection on systems where the compiler uses libc++, like it seems to be the case with Clang on MacOS. Did you test this?

Re: [FFmpeg-devel] [PATCH] configure: add libm ldflags globally

2017-10-17 Thread Jörn Heusipp
On 10/17/2017 12:13 AM, Jan Ekstrom wrote: On Tue, Oct 17, 2017 at 12:38 AM, Hendrik Leppkes wrote: Perhaps such libraries shouldn't hardcode -lstdc++ in there, but dynamically put whichever C++ library they built against in there instead? Its not like you can actually use a static library bui

Re: [FFmpeg-devel] [FFmpeg-cvslog] Merge commit '7cb1d9e2dbbe5bf4652be5d78cdd68e956fa3d63'

2017-10-14 Thread Jörn Heusipp
Hello On 10/14/2017 01:32 AM, James Almer wrote: On 10/13/2017 6:30 PM, Reino Wijnsma wrote: On 13-10-2017 18:48, James Almer wrote: Are "-lshlwapi -lpthread -lcrypt32" extralibs you added manually, or were they derived from dependencies like libmpg123, vorbis, etc by pkg-config? My configu

Re: [FFmpeg-devel] [PATCH] avformat/libopenmpt: Query duration and metadata after selecting subsong

2017-09-24 Thread Jörn Heusipp
On 09/17/2017 03:35 PM, Jörn Heusipp wrote: Duration depends on the selected subsong and thus must be queried after selecting the subsong. There is no compelling reason to query other metadata earlier either. Signed-off-by: Jörn Heusipp --- ping

[FFmpeg-devel] [PATCH] avformat/libopenmpt: Query duration and metadata after selecting subsong

2017-09-17 Thread Jörn Heusipp
Duration depends on the selected subsong and thus must be queried after selecting the subsong. There is no compelling reason to query other metadata earlier either. Signed-off-by: Jörn Heusipp --- libavformat/libopenmpt.c | 17 + 1 file changed, 9 insertions(+), 8 deletions

Re: [FFmpeg-devel] FFmpeg 3.3

2017-01-22 Thread Jörn Heusipp
On 01/23/2017 02:11 AM, Michael Niedermayer wrote: I also intend to make some new point releases from the currently maintained branches if someone wants to backport something https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/367cac7827870054ae3bd6d4517e7b13f4f3f72c needs to be applied to the 3.2

Re: [FFmpeg-devel] [PATCH] libopenmpt: add missing avio_read return value check

2017-01-15 Thread Jörn Heusipp
On 01/09/2017 08:20 PM, Jörn Heusipp wrote: On 01/01/2017 08:27 PM, Andreas Cadhalpun wrote: This fixes heap-buffer-overflows in libopenmpt caused by interpreting the negative size value as unsigned size_t. Signed-off-by: Andreas Cadhalpun --- libavformat/libopenmpt.c | 5 + 1 file

Re: [FFmpeg-devel] [PATCH] libopenmpt: add missing avio_read return value check

2017-01-09 Thread Jörn Heusipp
On 01/01/2017 08:27 PM, Andreas Cadhalpun wrote: This fixes heap-buffer-overflows in libopenmpt caused by interpreting the negative size value as unsigned size_t. Signed-off-by: Andreas Cadhalpun --- libavformat/libopenmpt.c | 5 + 1 file changed, 5 insertions(+) Looks fine to me. Rega

Re: [FFmpeg-devel] [PATCH 2/3 v3] libopenmpt: add subsong support

2016-07-20 Thread Jörn Heusipp
On 07/19/2016 11:33 PM, Josh de Kock wrote: --- libavformat/libopenmpt.c | 26 +++--- 1 file changed, 23 insertions(+), 3 deletions(-) +{ "subsong", "set subsong",OFFSET(subsong), AV_OPT_TYPE_INT,{ .i64 = -2 }, -2, INT_MAX, A | D, "layou

Re: [FFmpeg-devel] [PATCH] libopenmpt: add subsong support

2016-07-18 Thread Jörn Heusipp
On 07/18/2016 02:59 PM, Josh de Kock wrote: libavformat/libopenmpt.c | 8 1 file changed, 8 insertions(+) +{"subsong", "set subsong",OFFSET(subsong), AV_OPT_TYPE_INT,{.i64 = 0}, 0, 1000, A|D}, 1. -1 is a valid subs

[FFmpeg-devel] [PATCH 2/3] libavformat/libopenmpt: Actually set stream duration and fix the confusion around the used time base.

2016-07-17 Thread Jörn Heusipp
Signed-off-by: Jörn Heusipp --- libavformat/libopenmpt.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavformat/libopenmpt.c b/libavformat/libopenmpt.c index 58a02be..7b1dd5b 100644 --- a/libavformat/libopenmpt.c +++ b/libavformat/libopenmpt.c @@ -94,9 +94,8

[FFmpeg-devel] [PATCH 1/3] libavformat/libopenmpt: Fix memory leak in error path in read_header_openmpt().

2016-07-17 Thread Jörn Heusipp
Signed-off-by: Jörn Heusipp --- libavformat/libopenmpt.c | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavformat/libopenmpt.c b/libavformat/libopenmpt.c index fd38828..58a02be 100644 --- a/libavformat/libopenmpt.c +++ b/libavformat/libopenmpt.c @@ -89,8 +89,11

[FFmpeg-devel] [PATCH 3/3] libavformat/libopenmpt: Add "date" to metadata.

2016-07-17 Thread Jörn Heusipp
Signed-off-by: Jörn Heusipp --- libavformat/libopenmpt.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/libopenmpt.c b/libavformat/libopenmpt.c index 7b1dd5b..997c13d 100644 --- a/libavformat/libopenmpt.c +++ b/libavformat/libopenmpt.c @@ -87,6 +87,7 @@ static int

Re: [FFmpeg-devel] [PATCH 2/2] avformat/libmodplug: Remove code that has become redundant

2016-07-16 Thread Jörn Heusipp
On 07/16/2016 03:49 PM, Josh de Kock wrote: On Sat, Jul 16, 2016, at 02:31 PM, Jörn Heusipp wrote: [...] Unless one of libopenmpt and libmodplug demuxers lowers its own file extension probing score, this will not work, as they both handle pretty much the same file formats. This could be

Re: [FFmpeg-devel] [PATCH 2/2] avformat/libmodplug: Remove code that has become redundant

2016-07-16 Thread Jörn Heusipp
On 07/15/2016 10:41 PM, Michael Niedermayer wrote: @@ -372,7 +361,6 @@ AVInputFormat ff_libmodplug_demuxer = { .name = "libmodplug", .long_name = NULL_IF_CONFIG_SMALL("ModPlug demuxer"), .priv_data_size = sizeof(ModPlugContext), -.read_probe = modplug_pro

Re: [FFmpeg-devel] [PATCHv4] lavf: add libopenmpt demuxer

2016-07-09 Thread Jörn Heusipp
On 06/30/2016 02:49 AM, Josh de Kock wrote: Fixes ticket #5623 TODO: bump lavf minor --- I looked more thoroughly at your patch again. I'm commenting from libopenmpt perspective of course. +openmpt->module = openmpt_module_create_from_memory(buf, size, openmpt_logfunc, s, NULL); +

Re: [FFmpeg-devel] [PATCHv4] lavf: add libopenmpt demuxer

2016-07-09 Thread Jörn Heusipp
On 07/08/2016 10:17 PM, Nicolas George wrote: Le primidi 21 messidor, an CCXXIV, Jörn Heusipp a écrit : Regarding AVProbeData: Looking at AVProbeData, I can see no (optional) field describing the file size: typedef struct AVProbeData { const char *filename; unsigned char *buf

Re: [FFmpeg-devel] [PATCHv4] lavf: add libopenmpt demuxer

2016-07-08 Thread Jörn Heusipp
Hello! On 06/30/2016 02:49 AM, Josh de Kock wrote: Fixes ticket #5623 TODO: bump lavf minor (I am one of the libopenmpt maintainers) We have been following the ffmpeg libopenmpt demuxer patches and we already gave feedback at https://bugs.openmpt.org/view.php?id=817 (for reference). I'm