FFmpeg

Commit Graph

Author	SHA1	Message	Date
Jörn Heusipp	f6ea397d0a	avformat/libopenmpt: Probe file format from file data if possible 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 0.2, or when libopenmpt 0.3 file header probing cannot probe successfully due to too small probe buffer, test the filename against the file extensions supported by the libopenmpt library that is actually linked, instead of relying on a hard-coded file extension list. File extension testing is also allocation-free and designed to be fast in libopenmpt. Avoiding a hard-coded file extension list is useful because later libopenmpt versions will likely add support for more module file formats. 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. FATE passes with './configure --enable-libopenmpt' as well as with './configure --enable-libopenmpt --enable-libmodplug'. libopenmpt probing adds about 5%..10% cpu time (depending on precise usage pattern and host CPU and compiler version used for libopenmpt) compared to all current internal FFmpeg probing functions 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 <osmanx@problemloesungsmaschine.de> Reviewed-by: Josh de Kock <josh@itanimul.li> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>	7 years ago
Jörn Heusipp	81b0d591d6	avformat/libopenmpt: Update file extensions list for libopenmpt 0.3 Signed-off-by: Jörn Heusipp <osmanx@problemloesungsmaschine.de> Reviewed-by: Josh de Kock <josh@itanimul.li> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>	7 years ago
Jörn Heusipp	8b1b25a86f	avformat/libopenmpt: Update to libopenmpt 0.3 API libopenmpt 0.3 deprecates openmpt_module_create_from_memory() and provides a replacement function openmpt_module_create_from_memory2(). Detecting libopenmpt 0.3 can be done at build time via the API version macros provided by libopenmpt. libopenmpt 0.2 did not provide all required macros, however libopenmpt documents the required #define shims that can be safely added for libopenmpt 0.2. Using openmpt_module_create_from_memory2() instead of openmpt_module_create_from_memory() avoids the deprecation warning when building ffmpeg with libopenmpt 0.3. openmpt_module_create_from_memory2() provides more fine-grained error reporting and in particular allows distinguishing out-of-memory from input file parsing errors. Return appropriate ffmpeg errors accordingly. libopenmpt 0.3 is ABI and API compatible with applications built against libopenmpt 0.2. Building ffmpeg with libopenmpt 0.2 is still supported. Signed-off-by: Jörn Heusipp <osmanx@problemloesungsmaschine.de> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>	7 years ago
Jörn Heusipp	a571a2a65a	avformat/libopenmpt: Fix mixed code and declarations Signed-off-by: Jörn Heusipp <osmanx@problemloesungsmaschine.de> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>	7 years ago
Jörn Heusipp	3d2da6d585	avformat/libopenmpt: Query duration and metadata after selecting subsong 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. Tested with libopenmpt version: 0.2.8760-beta27 Libopenmpt configure options: --without-ogg --without-vorbis --without-vorbisfile --without-portaudio --without-portaudiocpp --without-mpg123 --without-pulseaudio --without-sndfile --without-flac Signed-off-by: Jörn Heusipp <osmanx@problemloesungsmaschine.de> Signed-off-by: Josh de Kock <josh@itanimul.li>	7 years ago
Michael Niedermayer	bd8201566d	avformat/libopenmpt: Check for avio_size() failure Fixes CID1396850 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>	8 years ago
Andreas Cadhalpun	367cac7827	libopenmpt: add missing avio_read return value check This fixes heap-buffer-overflows in libopenmpt caused by interpreting the negative size value as unsigned size_t. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Reviewed-by: Jörn Heusipp <osmanx@problemloesungsmaschine.de> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>	8 years ago
Jörn Heusipp	64131b87d6	libopenmpt: Add "date" to metadata. Signed-off-by: Jörn Heusipp <osmanx@problemloesungsmaschine.de> Signed-off-by: Josh de Kock <josh@itanimul.li>	9 years ago
Jörn Heusipp	840df1f193	libopenmpt: set stream duration and fix time base Fix the confusion around the used time base. Check size returned from avio_size() Signed-off-by: Jörn Heusipp <osmanx@problemloesungsmaschine.de> Signed-off-by: Josh de Kock <josh@itanimul.li>	9 years ago
Josh de Kock	9134d2df5b	libopenmpt: add subsong support Signed-off-by: Josh de Kock <josh@itanimul.li>	9 years ago
Jörn Heusipp	f1eb6ddcb3	libavformat/libopenmpt: Fix memory leak in error path in read_header_openmpt(). Signed-off-by: Jörn Heusipp <osmanx@problemloesungsmaschine.de> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>	9 years ago
Josh de Kock	d52dd768a3	lavf: add libopenmpt demuxer Fixes ticket #5623 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>	9 years ago

12 Commits (053ee996a03b8744af6e12d39e3087efae218b64)