November 2018 - ffmpeg-cvslog

Revert "libopus: Add channel mapping 2 support in libopusdec"
by Rostislav Pehlivanov 29 Nov '18

29 Nov '18

ffmpeg | branch: master | Rostislav Pehlivanov <atomnuker(a)gmail.com> | Wed Nov 28 23:54:08 2018 +0000| [ffec9d32feaff7075c0b150f1168e08aeb4a296a] | committer: Rostislav Pehlivanov Revert "libopus: Add channel mapping 2 support in libopusdec" This reverts commit c8c995bc1ddc34df93049f002432286018c8cc94. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ffec9d32feaff7075… --- libavcodec/libopusdec.c | 39 ++++++++++----------------------------- 1 file changed, 10 insertions(+), 29 deletions(-) diff --git a/libavcodec/libopusdec.c b/libavcodec/libopusdec.c index 2a97811d18..1724a49906 100644 --- a/libavcodec/libopusdec.c +++ b/libavcodec/libopusdec.c @@ -63,6 +63,8 @@ static av_cold int libopus_decode_init(AVCodecContext *avc) avc->sample_rate = 48000; avc->sample_fmt = avc->request_sample_fmt == AV_SAMPLE_FMT_FLT ? AV_SAMPLE_FMT_FLT : AV_SAMPLE_FMT_S16; + avc->channel_layout = avc->channels > 8 ? 0 : + ff_vorbis_channel_layouts[avc->channels - 1]; if (avc->extradata_size >= OPUS_HEAD_SIZE) { opus->pre_skip = AV_RL16(avc->extradata + 10); @@ -86,35 +88,14 @@ static av_cold int libopus_decode_init(AVCodecContext *avc) mapping = mapping_arr; } - if (channel_map == 1) { - avc->channel_layout = avc->channels > 8 ? 0 : - ff_vorbis_channel_layouts[avc->channels - 1]; - if (avc->channels > 2 && avc->channels <= 8) { - const uint8_t *vorbis_offset = ff_vorbis_channel_layout_offsets[avc->channels - 1]; - int ch; - - /* Remap channels from Vorbis order to ffmpeg order */ - for (ch = 0; ch < avc->channels; ch++) - mapping_arr[ch] = mapping[vorbis_offset[ch]]; - mapping = mapping_arr; - } - } else if (channel_map == 2) { - int ambisonic_order = ff_sqrt(avc->channels) - 1; - if (avc->channels != (ambisonic_order + 1) * (ambisonic_order + 1) && - avc->channels != (ambisonic_order + 1) * (ambisonic_order + 1) + 2) { - av_log(avc, AV_LOG_ERROR, - "Channel mapping 2 is only specified for channel counts" - " which can be written as (n + 1)^2 or (n + 2)^2 + 2" - " for nonnegative integer n\n"); - return AVERROR_INVALIDDATA; - } - if (avc->channels > 227) { - av_log(avc, AV_LOG_ERROR, "Too many channels\n"); - return AVERROR_INVALIDDATA; - } - avc->channel_layout = 0; - } else { - avc->channel_layout = 0; + if (avc->channels > 2 && avc->channels <= 8) { + const uint8_t *vorbis_offset = ff_vorbis_channel_layout_offsets[avc->channels - 1]; + int ch; + + /* Remap channels from Vorbis order to ffmpeg order */ + for (ch = 0; ch < avc->channels; ch++) + mapping_arr[ch] = mapping[vorbis_offset[ch]]; + mapping = mapping_arr; } opus->dec = opus_multistream_decoder_create(avc->sample_rate, avc->channels,

1 0

Revert "avcodec/libopusenc: Fix warning when encoding ambisonics with channel mapping 2"
by Rostislav Pehlivanov 29 Nov '18

29 Nov '18

ffmpeg | branch: master | Rostislav Pehlivanov <atomnuker(a)gmail.com> | Wed Nov 28 23:53:51 2018 +0000| [cf283f2dfbbf8b4c59d4f32f4308ede851613257] | committer: Rostislav Pehlivanov Revert "avcodec/libopusenc: Fix warning when encoding ambisonics with channel mapping 2" This reverts commit 4cd6f08d2005c20a03ccd53a0a6f8a115c5ebe2e. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cf283f2dfbbf8b4c5… --- libavcodec/libopusenc.c | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/libavcodec/libopusenc.c b/libavcodec/libopusenc.c index 50d843ebc5..7c025a66d7 100644 --- a/libavcodec/libopusenc.c +++ b/libavcodec/libopusenc.c @@ -27,7 +27,6 @@ #include "bytestream.h" #include "internal.h" #include "libopus.h" -#include "mathops.h" #include "vorbis.h" #include "audio_frame_queue.h" @@ -201,21 +200,6 @@ static int libopus_check_vorbis_layout(AVCodecContext *avctx, int mapping_family return 0; } -static int libopus_check_ambisonics_channels(AVCodecContext *avctx) { - int channels = avctx->channels; - int ambisonic_order = ff_sqrt(channels) - 1; - if (channels != ((ambisonic_order + 1) * (ambisonic_order + 1)) && - channels != ((ambisonic_order + 1) * (ambisonic_order + 1) + 2)) { - av_log(avctx, AV_LOG_ERROR, - "Ambisonics coding is only specified for channel counts" - " which can be written as (n + 1)^2 or (n + 1)^2 + 2" - " for nonnegative integer n\n"); - return AVERROR_INVALIDDATA; - } - - return 0; -} - static int libopus_validate_layout_and_get_channel_map( AVCodecContext *avctx, int mapping_family, @@ -247,12 +231,6 @@ static int libopus_validate_layout_and_get_channel_map( channel_map = ff_vorbis_channel_layout_offsets[avctx->channels - 1]; } break; - case 2: - ret = libopus_check_max_channels(avctx, 227); - if (ret == 0) { - ret = libopus_check_ambisonics_channels(avctx); - } - break; case 255: ret = libopus_check_max_channels(avctx, 254); break;

1 0

avcodec/libopusenc: Fix warning when encoding ambisonics with channel mapping 2
by Felicia Lim 28 Nov '18

28 Nov '18

ffmpeg | branch: master | Felicia Lim <flim(a)google.com> | Mon Jul 30 12:59:44 2018 -0700| [4cd6f08d2005c20a03ccd53a0a6f8a115c5ebe2e] | committer: Michael Niedermayer avcodec/libopusenc: Fix warning when encoding ambisonics with channel mapping 2 Also adds checks on the number of channels. Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4cd6f08d2005c20a0… --- libavcodec/libopusenc.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/libavcodec/libopusenc.c b/libavcodec/libopusenc.c index 7c025a66d7..50d843ebc5 100644 --- a/libavcodec/libopusenc.c +++ b/libavcodec/libopusenc.c @@ -27,6 +27,7 @@ #include "bytestream.h" #include "internal.h" #include "libopus.h" +#include "mathops.h" #include "vorbis.h" #include "audio_frame_queue.h" @@ -200,6 +201,21 @@ static int libopus_check_vorbis_layout(AVCodecContext *avctx, int mapping_family return 0; } +static int libopus_check_ambisonics_channels(AVCodecContext *avctx) { + int channels = avctx->channels; + int ambisonic_order = ff_sqrt(channels) - 1; + if (channels != ((ambisonic_order + 1) * (ambisonic_order + 1)) && + channels != ((ambisonic_order + 1) * (ambisonic_order + 1) + 2)) { + av_log(avctx, AV_LOG_ERROR, + "Ambisonics coding is only specified for channel counts" + " which can be written as (n + 1)^2 or (n + 1)^2 + 2" + " for nonnegative integer n\n"); + return AVERROR_INVALIDDATA; + } + + return 0; +} + static int libopus_validate_layout_and_get_channel_map( AVCodecContext *avctx, int mapping_family, @@ -231,6 +247,12 @@ static int libopus_validate_layout_and_get_channel_map( channel_map = ff_vorbis_channel_layout_offsets[avctx->channels - 1]; } break; + case 2: + ret = libopus_check_max_channels(avctx, 227); + if (ret == 0) { + ret = libopus_check_ambisonics_channels(avctx); + } + break; case 255: ret = libopus_check_max_channels(avctx, 254); break;

1 0

lavf/rawdec: Do not mark streams from raw subtitle demuxers as data streams.
by Carl Eugen Hoyos 28 Nov '18

28 Nov '18

ffmpeg | branch: master | Carl Eugen Hoyos <ceffmpeg(a)gmail.com> | Tue Nov 27 18:22:02 2018 +0100| [271a00043ef3116d9561e45fa5773a0d9a0993c2] | committer: Carl Eugen Hoyos lavf/rawdec: Do not mark streams from raw subtitle demuxers as data streams. Improves "ffmpeg -i" output for raw dvbsub files. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=271a00043ef3116d9… --- libavformat/rawdec.c | 11 +++++++++++ libavformat/rawdec.h | 4 +++- libavformat/version.h | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/libavformat/rawdec.c b/libavformat/rawdec.c index b38a4b5e5d..6249352d28 100644 --- a/libavformat/rawdec.c +++ b/libavformat/rawdec.c @@ -91,6 +91,17 @@ fail: return ret; } +int ff_raw_subtitle_read_header(AVFormatContext *s) +{ + AVStream *st = avformat_new_stream(s, NULL); + if (!st) + return AVERROR(ENOMEM); + st->codecpar->codec_type = AVMEDIA_TYPE_SUBTITLE; + st->codecpar->codec_id = s->iformat->raw_codec_id; + st->start_time = 0; + return 0; +} + int ff_raw_data_read_header(AVFormatContext *s) { AVStream *st = avformat_new_stream(s, NULL); diff --git a/libavformat/rawdec.h b/libavformat/rawdec.h index a464bbb432..3eb416b8ee 100644 --- a/libavformat/rawdec.h +++ b/libavformat/rawdec.h @@ -41,6 +41,8 @@ int ff_raw_audio_read_header(AVFormatContext *s); int ff_raw_video_read_header(AVFormatContext *s); +int ff_raw_subtitle_read_header(AVFormatContext *s); + int ff_raw_data_read_header(AVFormatContext *s); #define FF_RAWVIDEO_DEMUXER_CLASS(name)\ @@ -83,7 +85,7 @@ AVInputFormat ff_ ## shortname ## _demuxer = {\ .name = #shortname,\ .long_name = NULL_IF_CONFIG_SMALL(longname),\ .read_probe = probe,\ - .read_header = ff_raw_data_read_header,\ + .read_header = ff_raw_subtitle_read_header,\ .read_packet = ff_raw_read_partial_packet,\ .extensions = ext,\ .flags = flag,\ diff --git a/libavformat/version.h b/libavformat/version.h index 70e868ffbc..824b9e7cd6 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -33,7 +33,7 @@ // Also please add any ticket numbers that you believe might be affected here #define LIBAVFORMAT_VERSION_MAJOR 58 #define LIBAVFORMAT_VERSION_MINOR 23 -#define LIBAVFORMAT_VERSION_MICRO 100 +#define LIBAVFORMAT_VERSION_MICRO 101 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \

1 0

avcodec/opus: check if internal is available
by Paul B Mahol 28 Nov '18

28 Nov '18

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Wed Nov 28 20:27:43 2018 +0100| [68f289dacddcdf9742a8e9af51956ac226bfbafb] | committer: Paul B Mahol avcodec/opus: check if internal is available > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=68f289dacddcdf974… --- libavcodec/opus.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/opus.c b/libavcodec/opus.c index 22cda64801..f74278a7e3 100644 --- a/libavcodec/opus.c +++ b/libavcodec/opus.c @@ -326,7 +326,9 @@ av_cold int ff_opus_parse_extradata(AVCodecContext *avctx, return AVERROR_PATCHWELCOME; } - avctx->delay = avctx->internal->skip_samples = AV_RL16(extradata + 10); + avctx->delay = AV_RL16(extradata + 10); + if (avctx->internal) + avctx->internal->skip_samples = avctx->delay; channels = avctx->extradata ? extradata[9] : (avctx->channels == 1) ? 1 : 2; if (!channels) {

1 0

avpriv_tempfile: add djgpp fallback
by Peter Ross 28 Nov '18

28 Nov '18

ffmpeg | branch: master | Peter Ross <pross(a)xvid.org> | Tue Nov 20 18:42:41 2018 +1100| [331715534a5bbf692b468989225104cd9bbf9fdb] | committer: Peter Ross avpriv_tempfile: add djgpp fallback > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=331715534a5bbf692… --- libavutil/file_open.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/file_open.c b/libavutil/file_open.c index a8da283583..cc302f2f76 100644 --- a/libavutil/file_open.c +++ b/libavutil/file_open.c @@ -138,7 +138,7 @@ int avpriv_tempfile(const char *prefix, char **filename, int log_offset, void *l #else snprintf(*filename, len, "/tmp/%sXXXXXX", prefix); fd = mkstemp(*filename); -#if defined(_WIN32) || defined (__ANDROID__) +#if defined(_WIN32) || defined (__ANDROID__) || defined(__DJGPP__) if (fd < 0) { snprintf(*filename, len, "./%sXXXXXX", prefix); fd = mkstemp(*filename);

1 0

configure: memalign is broken on djgpp 2.05
by Peter Ross 28 Nov '18

28 Nov '18

ffmpeg | branch: master | Peter Ross <pross(a)xvid.org> | Tue Nov 13 21:32:23 2018 +1100| [8b7a1c22274e591f6927e1d4f0e2cb6989081fcc] | committer: Peter Ross configure: memalign is broken on djgpp 2.05 djgpp 2.05 finally provides posix-compatible memalign, but it is broken, so use malloc instead. discussion: http://www.delorie.com/archives/browse.cgi?p=djgpp/2017/12/29/16:26:58 > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8b7a1c22274e591f6… --- configure | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 197e978a55..3e9222ed1b 100755 --- a/configure +++ b/configure @@ -6796,10 +6796,17 @@ check_deps $CONFIG_LIST \ enabled threads && ! enabled pthreads && ! enabled atomics_native && die "non pthread threading without atomics not supported, try adding --enable-pthreads or --cpu=i486 or higher if you are on x86" enabled avresample && warn "Building with deprecated library libavresample" -if test $target_os = "haiku"; then +case $target_os in +haiku) disable memalign disable posix_memalign -fi + ;; +*-dos|freedos|opendos) + if test_cpp_condition sys/version.h "defined(__DJGPP__) && __DJGPP__ == 2 && __DJGPP_MINOR__ == 5"; then + disable memalign + fi + ;; +esac flatten_extralibs(){ nested_entries=

1 0

additional math.h functions for djgpp
by Peter Ross 28 Nov '18

28 Nov '18

ffmpeg | branch: master | Peter Ross <pross(a)xvid.org> | Sun Nov 11 21:49:29 2018 +1100| [dea1224754fda003b0229c56bce6602a5699d8db] | committer: Peter Ross additional math.h functions for djgpp > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dea1224754fda003b… --- compat/djgpp/math.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ compat/djgpp/math.h | 25 +++++++++++++++++++++++++ configure | 2 ++ tests/ref/fate/source | 1 + 4 files changed, 75 insertions(+) diff --git a/compat/djgpp/math.c b/compat/djgpp/math.c new file mode 100644 index 0000000000..777b879e01 --- /dev/null +++ b/compat/djgpp/math.c @@ -0,0 +1,47 @@ +/* + * 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 <math.h> + +#define FUN(name, type, op) \ +type name(type x, type y) \ +{ \ + if (fpclassify(x) == FP_NAN) return y; \ + if (fpclassify(y) == FP_NAN) return x; \ + return x op y ? x : y; \ +} + +FUN(fmin, double, <) +FUN(fmax, double, >) +FUN(fminf, float, <) +FUN(fmaxf, float, >) + +long double fmodl(long double x, long double y) +{ + return fmod(x, y); +} + +long double scalbnl(long double x, int exp) +{ + return scalbn(x, exp); +} + +long double copysignl(long double x, long double y) +{ + return copysign(x, y); +} diff --git a/compat/djgpp/math.h b/compat/djgpp/math.h new file mode 100644 index 0000000000..4c02ea9c40 --- /dev/null +++ b/compat/djgpp/math.h @@ -0,0 +1,25 @@ +/* + * 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 + */ + +double fmin(double, double); +double fmax(double, double); +float fminf(float, float); +float fmaxf(float, float); +long double fmodl(long double, long double); +long double scalbnl(long double, int); +long double copysignl(long double, long double); diff --git a/configure b/configure index 6909eaa72a..197e978a55 100755 --- a/configure +++ b/configure @@ -5468,6 +5468,8 @@ EOF elif test_${pfx}cpp_condition sys/version.h "defined __DJGPP__"; then eval ${pfx}libc_type=djgpp add_cppflags -U__STRICT_ANSI__ + add_cflags "-include $source_path/compat/djgpp/math.h" + add_compat djgpp/math.o fi test_${pfx}cc <<EOF #include <time.h> diff --git a/tests/ref/fate/source b/tests/ref/fate/source index b35f016127..0c98a0638a 100644 --- a/tests/ref/fate/source +++ b/tests/ref/fate/source @@ -28,6 +28,7 @@ compat/avisynth/avxsynth_c.h compat/avisynth/windowsPorts/basicDataTypeConversions.h compat/avisynth/windowsPorts/windows2linux.h compat/cuda/dynlink_loader.h +compat/djgpp/math.h compat/float/float.h compat/float/limits.h Use of av_clip() where av_clip_uintp2() could be used:

1 0

configure: detect djgpp libc
by Peter Ross 28 Nov '18

28 Nov '18

ffmpeg | branch: master | Peter Ross <pross(a)xvid.org> | Sun Nov 11 22:02:56 2018 +1100| [533ba0b6b5a5357fe8c19b3b5bb23fa16b6979f1] | committer: Peter Ross configure: detect djgpp libc > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=533ba0b6b5a5357fe… --- configure | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configure b/configure index ab3144e459..6909eaa72a 100755 --- a/configure +++ b/configure @@ -5297,7 +5297,6 @@ case $target_os in network_extralibs="-lsocket" objformat="coff" enable dos_paths - add_cppflags -U__STRICT_ANSI__ ;; linux) enable section_data_rel_ro @@ -5466,6 +5465,9 @@ EOF elif test_${pfx}cpp_condition sys/brand.h "defined LABELED_BRAND_NAME"; then eval ${pfx}libc_type=solaris add_${pfx}cppflags -D__EXTENSIONS__ -D_XOPEN_SOURCE=600 + elif test_${pfx}cpp_condition sys/version.h "defined __DJGPP__"; then + eval ${pfx}libc_type=djgpp + add_cppflags -U__STRICT_ANSI__ fi test_${pfx}cc <<EOF #include <time.h>

1 0

avcodec/opus: set skip_samples
by Paul B Mahol 28 Nov '18

28 Nov '18

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Tue Nov 27 15:16:36 2018 +0100| [18aea7bdd96b320a40573bccabea56afeccdd91c] | committer: Paul B Mahol avcodec/opus: set skip_samples Also update fate test. Fixes #5258. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=18aea7bdd96b320a4… --- libavcodec/opus.c | 3 ++- tests/fate/opus.mak | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/opus.c b/libavcodec/opus.c index aa827b604c..22cda64801 100644 --- a/libavcodec/opus.c +++ b/libavcodec/opus.c @@ -31,6 +31,7 @@ #include "opus_celt.h" #include "opustab.h" +#include "internal.h" #include "vorbis.h" static const uint16_t opus_frame_duration[32] = { @@ -325,7 +326,7 @@ av_cold int ff_opus_parse_extradata(AVCodecContext *avctx, return AVERROR_PATCHWELCOME; } - avctx->delay = AV_RL16(extradata + 10); + avctx->delay = avctx->internal->skip_samples = AV_RL16(extradata + 10); channels = avctx->extradata ? extradata[9] : (avctx->channels == 1) ? 1 : 2; if (!channels) { diff --git a/tests/fate/opus.mak b/tests/fate/opus.mak index 7f289455cf..c50d88f5e9 100644 --- a/tests/fate/opus.mak +++ b/tests/fate/opus.mak @@ -36,6 +36,7 @@ fate-opus-testvector09: CMP_TARGET = 0 fate-opus-testvector10: CMP_TARGET = 38 fate-opus-testvector11: CMP_TARGET = 0 fate-opus-testvector12: CMP_TARGET = 160 +fate-opus-tron.6ch.tinypkts: CMP_SHIFT = 1440 fate-opus-tron.6ch.tinypkts: CMP_TARGET = 0 $(FATE_OPUS_CELT): CMP = oneoff

1 0