ffmpeg.git
3 years agovaapi: Add VP9 hwaccell support
Timo Rothenpieler [Sat, 19 Dec 2015 19:31:00 +0000 (20:31 +0100)]
vaapi: Add VP9 hwaccell support

Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
3 years agolavf/rmdec: Use correct format specifier for int64_t.
Carl Eugen Hoyos [Tue, 22 Dec 2015 08:29:08 +0000 (09:29 +0100)]
lavf/rmdec: Use correct format specifier for int64_t.

Fixes ticket #5100.

3 years agoAAC encoder: fix possible assertion failure in PNS
Claudio Freire [Tue, 22 Dec 2015 08:26:12 +0000 (05:26 -0300)]
AAC encoder: fix possible assertion failure in PNS

Fix possible SF delta violation that would cause an
eventual assertion failure in some corner cases (esp
on very low bitrates) when marking bands for PNS due
to misuse of the sf_delta utilities

3 years agoaacenc_is: rename variable
Rostislav Pehlivanov [Mon, 21 Dec 2015 17:23:38 +0000 (17:23 +0000)]
aacenc_is: rename variable

'erf' is far from the best name for a variable and is not very
descriptive since the actual variable points to the comparitively best
IS phase. Therefore rename it to 'best'.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
3 years agolavu/libm: add erf hack and make dynaudnorm available everywhere
Ganesh Ajjanagadde [Sun, 20 Dec 2015 02:17:03 +0000 (18:17 -0800)]
lavu/libm: add erf hack and make dynaudnorm available everywhere

Source code is from Boost:
http://www.boost.org/doc/libs/1_46_1/boost/math/special_functions/erf.hpp
with appropriate modifications for FFmpeg.

Tested on interval -6 to 6 (beyond which it saturates), +/-NAN, +/-INFINITY
under -fsanitize=undefined on clang to test for possible undefined behavior.

This function turns out to actually be essentially as accurate and faster than the
libm (GNU/BSD's/Mac OS X), and I can think of 3 reasons why upstream
does not use this:
1. They are not aware of it.
2. They are concerned about licensing - this applies especially to GNU
libm.
3. They do not know and/or appreciate the benefits of rational
approximations over polynomial approximations. Boost uses them to great
effect, see e.g swr/resample for bessel derived from them, which is also
similarly superior to libm variants.

First, performance.
sample benchmark (clang -O3, Haswell, GNU/Linux):

3e8 values evenly spaced from 0 to 6
time (libm):
./test  13.39s user 0.00s system 100% cpu 13.376 total
time (boost based):
./test  9.20s user 0.00s system 100% cpu 9.190 total

Second, accuracy.
1e8 eval pts from 0 to 6
maxdiff (absolute): 2.2204460492503131e-16
occuring at point where libm erf is correctly rounded, this is not.

Illustration of superior rounding of this function:
arg   : 0.83999999999999997
erf   : 0.76514271145499457
boost : 0.76514271145499446
real  : 0.76514271145499446

i.e libm is actually incorrectly rounded. Note that this is clear from:
https://github.com/JuliaLang/openlibm/blob/master/src/s_erf.c (the Sun
implementation used by both BSD and GNU libm's), where only 1 ulp is
guaranteed.

Reasons it is not easy/worthwhile to create a "correctly rounded"
variant of this function (i.e 0.5ulp):
1. Upstream libm's don't do it anyway, so we can't guarantee this unless
we force this implementation on all platforms. This is not easy, as the
linker would complain unless measures are taken.
2. Nothing in FFmpeg cares or can care about such things, due to the
above and FFmpeg's nature.
3. Creating a correctly rounded function will in practice need some use of long
double/fma. long double, although C89/C90, unfortunately has problems on
ppc. This needs fixing of toolchain flags/configure. In any case this
will be slower for miniscule gain.

Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
3 years agolavf/avformat: add av_warn_unused_result to avformat_write_header
Ganesh Ajjanagadde [Mon, 21 Dec 2015 16:36:46 +0000 (08:36 -0800)]
lavf/avformat: add av_warn_unused_result to avformat_write_header

May be useful as a defense, see e.g c62d1780fff8a1997dd1707bbc557efc8fe41e3c.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
3 years agolavd/pulse_audio_enc: replace lround by lrint
Ganesh Ajjanagadde [Wed, 16 Dec 2015 19:59:12 +0000 (14:59 -0500)]
lavd/pulse_audio_enc: replace lround by lrint

Here it is mostly a cosmetic change, but there might be benefits in that
there are no compat hacks for lround, while there are for lrint.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
3 years agolavfi/vf_histogram: replace round by lrint
Ganesh Ajjanagadde [Wed, 16 Dec 2015 19:56:18 +0000 (14:56 -0500)]
lavfi/vf_histogram: replace round by lrint

lrint is at least as fast, uses a superior rounding mode, and avoids an
implicit cast.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
3 years agolavfi/af_dynaudnorm: replace round by lrint
Ganesh Ajjanagadde [Wed, 16 Dec 2015 19:51:09 +0000 (14:51 -0500)]
lavfi/af_dynaudnorm: replace round by lrint

lrint is at least as fast, uses a superior rounding mode, and avoids an
implicit cast.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
3 years agolavfi/vf_crop: replace round by lrint
Ganesh Ajjanagadde [Wed, 16 Dec 2015 19:50:00 +0000 (14:50 -0500)]
lavfi/vf_crop: replace round by lrint

lrint is at least as fast, avoids an implicit cast, and uses a superior
rounding mode.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
3 years agolavc/libvpxenc: replace round by lrint
Ganesh Ajjanagadde [Wed, 16 Dec 2015 19:48:45 +0000 (14:48 -0500)]
lavc/libvpxenc: replace round by lrint

Mostly cosmetic here.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
3 years agolavfi/vf_drawtext: replace round by llrint
Ganesh Ajjanagadde [Wed, 16 Dec 2015 19:39:37 +0000 (14:39 -0500)]
lavfi/vf_drawtext: replace round by llrint

llrint is at least as fast, and avoids an implicit cast.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
3 years agolavfi/vf_colorlevels: replace round by lrint
Ganesh Ajjanagadde [Wed, 16 Dec 2015 19:36:53 +0000 (14:36 -0500)]
lavfi/vf_colorlevels: replace round by lrint

lrint avoids an implicit cast, and is not slower on non-broken libm's. Thus this
represents a Pareto improvement.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
3 years agolavfi/vf_colorchannelmixer: replace round by lrint
Ganesh Ajjanagadde [Wed, 16 Dec 2015 19:34:09 +0000 (14:34 -0500)]
lavfi/vf_colorchannelmixer: replace round by lrint

lrint is faster here on -ftree-vectorize with GCC. This is likely simply
an artifact of GCC's rather terrible auto-vectorizer, since as per the
instruction set manuals cvtsd2si and cvttsd2si (or their vector equivalents)
have identical cycle timings.

Anyway, regardless of above, lrint is superior to round accuracy wise.

Safety guaranteed as long int has at least 32 bits.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
3 years agolavfi/drawtext: fix shadow[xy] descriptions
Clément Bœsch [Mon, 21 Dec 2015 15:42:14 +0000 (16:42 +0100)]
lavfi/drawtext: fix shadow[xy] descriptions

3 years agolavfi/drawtext: hide first font load warning when fontconfig is present
Clément Bœsch [Mon, 21 Dec 2015 15:07:22 +0000 (16:07 +0100)]
lavfi/drawtext: hide first font load warning when fontconfig is present

3 years agolavfi/drawtext: fix crash when no text, file or timecode provided
Clément Bœsch [Mon, 21 Dec 2015 14:54:20 +0000 (15:54 +0100)]
lavfi/drawtext: fix crash when no text, file or timecode provided

3 years agoavfilter/af_ladspa: fix av_assert0()
Paul B Mahol [Mon, 21 Dec 2015 12:26:17 +0000 (13:26 +0100)]
avfilter/af_ladspa: fix av_assert0()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agolavf/img2enc: add atomic_writing option
Clément Bœsch [Tue, 8 Dec 2015 09:44:31 +0000 (10:44 +0100)]
lavf/img2enc: add atomic_writing option

This behaviour change caused a regression on our side recently, we might
want to disable the option by default.

3 years agolavc: add text encoder
Clément Bœsch [Thu, 17 Dec 2015 11:23:35 +0000 (12:23 +0100)]
lavc: add text encoder

3 years agolavfi/scale: add nb_slices debug option
Clément Bœsch [Fri, 18 Dec 2015 14:44:33 +0000 (15:44 +0100)]
lavfi/scale: add nb_slices debug option

3 years agoavcodec/indeo2: use init_get_bits8
Paul B Mahol [Sun, 20 Dec 2015 20:31:55 +0000 (21:31 +0100)]
avcodec/indeo2: use init_get_bits8

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agox86/hevc_sao: add ff_hevc_sao_edge_filter_{8,16}_{10,12}
James Almer [Sun, 6 Dec 2015 05:47:45 +0000 (02:47 -0300)]
x86/hevc_sao: add ff_hevc_sao_edge_filter_{8,16}_{10,12}

Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
3 years agox86/hevc_sao: simplify sao_edge_filter 10/12bit
James Almer [Sun, 6 Dec 2015 05:46:51 +0000 (02:46 -0300)]
x86/hevc_sao: simplify sao_edge_filter 10/12bit

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
3 years agox86/hevc_sao: simplify sao_band_filter 10/12bit
James Almer [Sun, 6 Dec 2015 05:42:34 +0000 (02:42 -0300)]
x86/hevc_sao: simplify sao_band_filter 10/12bit

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoavfilter/avf_showfreqs: make it possible to split channels
Paul B Mahol [Sun, 20 Dec 2015 18:52:51 +0000 (19:52 +0100)]
avfilter/avf_showfreqs: make it possible to split channels

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agoavcodec/flacenc: use designated initializers for AVClass
Paul B Mahol [Sun, 20 Dec 2015 16:47:21 +0000 (17:47 +0100)]
avcodec/flacenc: use designated initializers for AVClass

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agoavcodec/s302menc: check if buf_size can actually be put into 16bit size
Paul B Mahol [Sat, 19 Dec 2015 20:52:19 +0000 (21:52 +0100)]
avcodec/s302menc: check if buf_size can actually be put into 16bit size

This disallows creating unplayable audio.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agoavcodec/s302menc: set supported channel layouts by codec
Paul B Mahol [Sat, 19 Dec 2015 20:34:27 +0000 (21:34 +0100)]
avcodec/s302menc: set supported channel layouts by codec

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agonuv: sanitize negative fps rate
Andreas Cadhalpun [Wed, 16 Dec 2015 19:52:39 +0000 (20:52 +0100)]
nuv: sanitize negative fps rate

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
3 years agorawdec: only exempt BIT0 with need_copy from buffer sanity check
Andreas Cadhalpun [Sat, 19 Dec 2015 22:45:06 +0000 (23:45 +0100)]
rawdec: only exempt BIT0 with need_copy from buffer sanity check

Otherwise the too small buffer is directly used in the frame, causing
segmentation faults, when trying to use the frame.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
3 years agomlvdec: check that index_entries exist
Andreas Cadhalpun [Sat, 19 Dec 2015 22:44:53 +0000 (23:44 +0100)]
mlvdec: check that index_entries exist

This fixes NULL pointer dereferencing.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
3 years agoavcodec/mpeg4videodec: also for empty partitioned slices
Michael Niedermayer [Sat, 19 Dec 2015 22:21:33 +0000 (23:21 +0100)]
avcodec/mpeg4videodec: also for empty partitioned slices

Fixes assertion failure
Fixes: id_acf3e47f864e1ee4c7b86c0653e0ff31e5bde56e.m4v

Found-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agolavu/libm: add copysign hack
Ganesh Ajjanagadde [Fri, 18 Dec 2015 19:13:11 +0000 (11:13 -0800)]
lavu/libm: add copysign hack

For systems with broken libms.
Tested with NAN, -NAN, INFINITY, -INFINITY, +/-x for regular double x and
combinations of these.

Old versions of MSVC need some UINT64_C hackery.

Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
3 years agoavcodec/Makefile: add missing dep for g723_1 encoder
James Almer [Sat, 19 Dec 2015 21:50:47 +0000 (18:50 -0300)]
avcodec/Makefile: add missing dep for g723_1 encoder

Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoavfilter/af_dynaudnorm: use av_malloc_array()
Paul B Mahol [Sat, 19 Dec 2015 21:46:10 +0000 (22:46 +0100)]
avfilter/af_dynaudnorm: use av_malloc_array()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agoavcodec/h264_refs: Fix long_idx check
Michael Niedermayer [Sat, 19 Dec 2015 20:59:42 +0000 (21:59 +0100)]
avcodec/h264_refs: Fix long_idx check

Fixes out of array read
Fixes mozilla bug 1233606

Found-by: Tyson Smith
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoswscale/arm/yuv2rgb: add ff_yuv420p_to_{argb,rgba,abgr,bgra}_neon_{16,32}
Matthieu Bouron [Tue, 15 Dec 2015 13:42:22 +0000 (14:42 +0100)]
swscale/arm/yuv2rgb: add ff_yuv420p_to_{argb,rgba,abgr,bgra}_neon_{16,32}

3 years agoswscale/arm/yuv2rgb: disable neon if accurate_rnd is enabled
Matthieu Bouron [Fri, 18 Dec 2015 13:24:52 +0000 (14:24 +0100)]
swscale/arm/yuv2rgb: disable neon if accurate_rnd is enabled

This disables the 32bit precision neon code path in favor of the
default C one and avoids breaking fate.

3 years agoavcodec/ffv1enc: Fix 2 pass mode with the default rc table
Michael Niedermayer [Sat, 19 Dec 2015 19:06:58 +0000 (20:06 +0100)]
avcodec/ffv1enc: Fix 2 pass mode with the default rc table

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavfilter/vf_stereo3d: add interleave columns input support
Paul B Mahol [Fri, 18 Dec 2015 21:00:31 +0000 (22:00 +0100)]
avfilter/vf_stereo3d: add interleave columns input support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agolavu/intmath: add faster clz support
Ganesh Ajjanagadde [Wed, 16 Dec 2015 18:28:39 +0000 (13:28 -0500)]
lavu/intmath: add faster clz support

This should be useful for the sofalizer filter.

Reviewed-by: Kieran Kunhya <kierank@ob-encoder.com>
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
3 years agolavfi/vsrc_mandelbrot: replace round by lrint
Ganesh Ajjanagadde [Wed, 16 Dec 2015 19:54:53 +0000 (14:54 -0500)]
lavfi/vsrc_mandelbrot: replace round by lrint

lrint is at least as fast, and is more accurate.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
3 years agolavfi/vf_cropdetect: replace round by lrint
Ganesh Ajjanagadde [Wed, 16 Dec 2015 19:52:16 +0000 (14:52 -0500)]
lavfi/vf_cropdetect: replace round by lrint

lrint is at least as fast, and more accurate.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
3 years agolavf/hlsenc: replace round by lrint
Ganesh Ajjanagadde [Wed, 16 Dec 2015 19:40:50 +0000 (14:40 -0500)]
lavf/hlsenc: replace round by lrint

Mainly cosmetic here.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
3 years agolavfi/vf_idet: replace round and cast by lrint
Ganesh Ajjanagadde [Wed, 16 Dec 2015 18:03:59 +0000 (13:03 -0500)]
lavfi/vf_idet: replace round and cast by lrint

lrint is faster and conveys the intent better here. It is safe as long int has
at least 32 bits.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
3 years agolavc/aacsbr: sbr_dequant optimization
Ganesh Ajjanagadde [Wed, 16 Dec 2015 04:27:23 +0000 (23:27 -0500)]
lavc/aacsbr: sbr_dequant optimization

This uses ff_exp2fi to get a speedup (~ 6x).

sample benchmark (Haswell, GNU/Linux):
old:
  19102 decicycles in sbr_dequant,    1023 runs,      1 skips
  19002 decicycles in sbr_dequant,    2045 runs,      3 skips
  17638 decicycles in sbr_dequant,    4093 runs,      3 skips
  15825 decicycles in sbr_dequant,    8189 runs,      3 skips
  16404 decicycles in sbr_dequant,   16379 runs,      5 skips

new:
   3063 decicycles in sbr_dequant,    1024 runs,      0 skips
   3049 decicycles in sbr_dequant,    2048 runs,      0 skips
   2968 decicycles in sbr_dequant,    4096 runs,      0 skips
   2818 decicycles in sbr_dequant,    8191 runs,      1 skips
   2853 decicycles in sbr_dequant,   16383 runs,      1 skips

Reviewed-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
3 years agonutdec: reject negative value_len in read_sm_data
Andreas Cadhalpun [Sat, 19 Dec 2015 11:02:56 +0000 (12:02 +0100)]
nutdec: reject negative value_len in read_sm_data

If it is negative, it can cause the byte position to move backwards in
avio_skip, which in turn makes sm_size negative and thus size larger
than the size of the packet buffer, causing invalid writes in avio_read.

Also fix potential overflow of avio_tell(bc) + value_len.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
3 years agoxwddec: prevent overflow of lsize * avctx->height
Andreas Cadhalpun [Fri, 18 Dec 2015 18:28:51 +0000 (19:28 +0100)]
xwddec: prevent overflow of lsize * avctx->height

This is used to check if the input buffer is large enough, so if this
overflows it can cause a false negative leading to a segmentation fault
in bytestream2_get_bufferu.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
3 years agoffplay: remove existing AVPicture usage
Marton Balint [Tue, 8 Dec 2015 21:33:31 +0000 (22:33 +0100)]
ffplay: remove existing AVPicture usage

It is deprecated.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
3 years agonutdec: only copy the header if it exists
Andreas Cadhalpun [Fri, 18 Dec 2015 14:18:47 +0000 (15:18 +0100)]
nutdec: only copy the header if it exists

Fixes ubsan runtime error: null pointer passed as argument 2, which is
declared to never be null

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
3 years agoffserver: refactor build_feed_streams()
Reynaldo H. Verdejo Pinochet [Thu, 17 Dec 2015 02:14:25 +0000 (18:14 -0800)]
ffserver: refactor build_feed_streams()

* Avoid excesive nesting that made it really hard to follow
* Drop unneeded vars
* Factor out codec compatibility check routine
* Ensure inputs are closed and contexts are freed as needed
  before returning

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
3 years agoffserver: refactor build_file_streams()
Reynaldo H. Verdejo Pinochet [Wed, 16 Dec 2015 06:08:52 +0000 (22:08 -0800)]
ffserver: refactor build_file_streams()

Avoid unneeded nesting, drop redundant var

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
3 years agoffserver: unify exit path from build_feed_streams()
Reynaldo H. Verdejo Pinochet [Tue, 15 Dec 2015 22:51:18 +0000 (14:51 -0800)]
ffserver: unify exit path from build_feed_streams()

Exit from main on build_feed_streams() failures & use
standard EXIT_ codes on error out/normal exit.

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
3 years agoswscale/arm/yuv2rgb: simplify process_16px_* macro call
Matthieu Bouron [Tue, 15 Dec 2015 16:04:09 +0000 (17:04 +0100)]
swscale/arm/yuv2rgb: simplify process_16px_* macro call

3 years agoavcodec/arm64: fix inverted register order in transpose_4x4H
Janne Grunau [Fri, 18 Dec 2015 10:27:05 +0000 (11:27 +0100)]
avcodec/arm64: fix inverted register order in transpose_4x4H

Fix related register order issue in ff_h264_idct_add_neon.

Found-by: zjh8890 <243186085@qq.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavfilter/vf_delogo: change the definition of logo_x2 and logo_y2
Jean Delvare [Fri, 18 Dec 2015 15:16:38 +0000 (16:16 +0100)]
avfilter/vf_delogo: change the definition of logo_x2 and logo_y2

In the code we keep using logo_x2-1 and logo_y2-1 rather than logo_x2
and logo_y2 themselves. Define them to be what we need instead, to avoid
the repeated subtractions.

Signed-off-by: Jean Delvare <jdelvare@suse.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agooggparsedaala: sync with current bitstream syntax
Rostislav Pehlivanov [Fri, 18 Dec 2015 22:54:38 +0000 (22:54 +0000)]
oggparsedaala: sync with current bitstream syntax

Since the parser was merged back almost 2 months ago this is the first
time the bitstream of the container has been updated.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
3 years agoavfilter/vf_stereo3d: fix interleaved columns output
Paul B Mahol [Fri, 18 Dec 2015 21:04:19 +0000 (22:04 +0100)]
avfilter/vf_stereo3d: fix interleaved columns output

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agoavfilter/vf_stereo3d: multiply linesize only once for interleaved row to mono
Paul B Mahol [Fri, 18 Dec 2015 18:44:01 +0000 (19:44 +0100)]
avfilter/vf_stereo3d: multiply linesize only once for interleaved row to mono

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agoavcodec/ffv1enc: unbreak -coder option
Michael Niedermayer [Fri, 18 Dec 2015 16:52:35 +0000 (17:52 +0100)]
avcodec/ffv1enc: unbreak -coder option

This fixes a segfault caused by moving the coder option and changing its semantics

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoswscale/arm/yuv2rgb: fix slicing
Clément Bœsch [Fri, 18 Dec 2015 15:03:00 +0000 (16:03 +0100)]
swscale/arm/yuv2rgb: fix slicing

3 years agoexr: fix out of bounds read in get_code
Andreas Cadhalpun [Sun, 13 Dec 2015 22:17:09 +0000 (23:17 +0100)]
exr: fix out of bounds read in get_code

This macro unconditionally used out[-1], which causes an out of bounds
read, if out is the very beginning of the buffer.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
3 years agoon2avc: limit number of bits to 30 in get_egolomb
Andreas Cadhalpun [Wed, 16 Dec 2015 15:48:19 +0000 (16:48 +0100)]
on2avc: limit number of bits to 30 in get_egolomb

More don't fit into the integer output.

Also use get_bits_long, since get_bits only supports reading up to 25
bits, while get_bits_long supports the full integer range.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
3 years agoacenc: remove deprecated avctx->frame_bits use
Rostislav Pehlivanov [Fri, 18 Dec 2015 14:27:13 +0000 (14:27 +0000)]
acenc: remove deprecated avctx->frame_bits use

The type of last_frame_pb_count was chosen to be an int since overflow
is impossible (the spec says the maximum bits per frame is 6144 per
channel and the encoder checks for that).

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
3 years agodoc/filters: copy all input modes to output modes.
Paul B Mahol [Fri, 18 Dec 2015 13:36:39 +0000 (14:36 +0100)]
doc/filters: copy all input modes to output modes.

For people who cant read.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agoavfilter/vf_stereo3d: add fast path for interleave rows to mono
Paul B Mahol [Fri, 18 Dec 2015 12:30:49 +0000 (13:30 +0100)]
avfilter/vf_stereo3d: add fast path for interleave rows to mono

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agoMerge commit '458e53f51fc75d08df884f8e9eb3d7ded23e97b3'
Hendrik Leppkes [Fri, 18 Dec 2015 13:53:19 +0000 (14:53 +0100)]
Merge commit '458e53f51fc75d08df884f8e9eb3d7ded23e97b3'

* commit '458e53f51fc75d08df884f8e9eb3d7ded23e97b3':
  mpegvideo_enc: actually add the side data with vbv_delay to the packet

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit 'b0b133b8c02984ba0a50448f632a5dd8a50c9045'
Hendrik Leppkes [Fri, 18 Dec 2015 13:53:00 +0000 (14:53 +0100)]
Merge commit 'b0b133b8c02984ba0a50448f632a5dd8a50c9045'

* commit 'b0b133b8c02984ba0a50448f632a5dd8a50c9045':
  hevcdsp: use a macro for .rodata section

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit '81c95eb8eee856d98d4ac37367dbc761f2faf875'
Hendrik Leppkes [Fri, 18 Dec 2015 13:52:18 +0000 (14:52 +0100)]
Merge commit '81c95eb8eee856d98d4ac37367dbc761f2faf875'

* commit '81c95eb8eee856d98d4ac37367dbc761f2faf875':
  openh264: Directly include the deprecation guards header

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit '34138ece23c8ddae543269212a051c00d49e67d7'
Hendrik Leppkes [Fri, 18 Dec 2015 13:50:54 +0000 (14:50 +0100)]
Merge commit '34138ece23c8ddae543269212a051c00d49e67d7'

* commit '34138ece23c8ddae543269212a051c00d49e67d7':
  log: Use a do {} while (0) for tlog

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit 'febfb49a70e82f5ac46dc7ea34dabd4d56b19b31'
Hendrik Leppkes [Fri, 18 Dec 2015 13:49:56 +0000 (14:49 +0100)]
Merge commit 'febfb49a70e82f5ac46dc7ea34dabd4d56b19b31'

* commit 'febfb49a70e82f5ac46dc7ea34dabd4d56b19b31':
  matroskadec: Fix sample_aspect_ratio for stereo matroska content

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agolavc/sunrastenc: fix private codec options
Hendrik Leppkes [Fri, 18 Dec 2015 13:44:49 +0000 (14:44 +0100)]
lavc/sunrastenc: fix private codec options

The options were not actually hooked up.

3 years agoMerge commit 'c34df422628e6b7b657faee241fe7bb2629e0f57'
Hendrik Leppkes [Fri, 18 Dec 2015 13:39:59 +0000 (14:39 +0100)]
Merge commit 'c34df422628e6b7b657faee241fe7bb2629e0f57'

* commit 'c34df422628e6b7b657faee241fe7bb2629e0f57':
  sgienc: Make sure to initialize skipped header portions

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit '16216b713f9a21865cc07993961cf5d0ece24916'
Hendrik Leppkes [Fri, 18 Dec 2015 13:39:15 +0000 (14:39 +0100)]
Merge commit '16216b713f9a21865cc07993961cf5d0ece24916'

* commit '16216b713f9a21865cc07993961cf5d0ece24916':
  lavc: Drop exporting 2-pass encoding stats

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit 'be00ec832c519427cd92218abac77dafdc1d5487'
Hendrik Leppkes [Fri, 18 Dec 2015 13:27:41 +0000 (14:27 +0100)]
Merge commit 'be00ec832c519427cd92218abac77dafdc1d5487'

* commit 'be00ec832c519427cd92218abac77dafdc1d5487':
  lavc: Deprecate coder_type and its symbols

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoavfilter/vf_stereo3d: fix interleave rows output
Paul B Mahol [Fri, 18 Dec 2015 09:48:36 +0000 (10:48 +0100)]
avfilter/vf_stereo3d: fix interleave rows output

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agoavfilter/vf_stereo3d: add fast path for interleave rows to alternating
Paul B Mahol [Fri, 18 Dec 2015 09:34:19 +0000 (10:34 +0100)]
avfilter/vf_stereo3d: add fast path for interleave rows to alternating

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agolavu/error: add missing error messages for errors supported on all platforms
Marton Balint [Wed, 9 Dec 2015 20:45:01 +0000 (21:45 +0100)]
lavu/error: add missing error messages for errors supported on all platforms

We need these if we have no strerror_r.

Descriptions are taken from doc/errno.txt except for ENOMEM.

Signed-off-by: Marton Balint <cus@passwd.hu>
3 years agodoc/errno: fix description typo for ENAMETOOLONG
Marton Balint [Wed, 9 Dec 2015 20:45:54 +0000 (21:45 +0100)]
doc/errno: fix description typo for ENAMETOOLONG

Signed-off-by: Marton Balint <cus@passwd.hu>
3 years agoavcodec/h264_mc_template: prefetch list1 only if it is used in the MB
Michael Niedermayer [Thu, 17 Dec 2015 23:20:51 +0000 (00:20 +0100)]
avcodec/h264_mc_template: prefetch list1 only if it is used in the MB

Fixes ubsan warning
Fixes Mozilla bug 1230276

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/h264_slice: Simplify ref2frm indexing
Michael Niedermayer [Thu, 17 Dec 2015 21:51:00 +0000 (22:51 +0100)]
avcodec/h264_slice: Simplify ref2frm indexing

This also suppresses a ubsan warning
Fixes Mozilla bug 1230247

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agolavc/opus_celt: replace pow by exp2
Ganesh Ajjanagadde [Wed, 9 Dec 2015 23:23:00 +0000 (18:23 -0500)]
lavc/opus_celt: replace pow by exp2

exp2 is faster.

It may be possible to optimize further; e.g the exponents seem to be
multiples of 0.25. This requires study though.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
3 years agoRevert "avcodec/aarch64/neon.S: Update neon.s for transpose_4x4H"
Michael Niedermayer [Thu, 17 Dec 2015 20:14:45 +0000 (21:14 +0100)]
Revert "avcodec/aarch64/neon.S: Update neon.s for transpose_4x4H"

The change was not correct and broke H264

This reverts commit cd83f899c94f691b045697d12efa21f83eb2329f.

3 years agosonic: make sure num_taps * channels is not larger than frame_size
Andreas Cadhalpun [Tue, 15 Dec 2015 22:43:03 +0000 (23:43 +0100)]
sonic: make sure num_taps * channels is not larger than frame_size

If that is the case, the loop setting predictor_state in
sonic_decode_frame causes out of bounds reads of int_samples, which has
only frame_size number of elements.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
3 years agoavfilter/af_sofalizer: Fix occured typo
Michael Niedermayer [Thu, 17 Dec 2015 17:58:53 +0000 (18:58 +0100)]
avfilter/af_sofalizer: Fix occured typo

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/diracdec: Check ff_set_dimensions() for failure
Michael Niedermayer [Thu, 17 Dec 2015 16:02:14 +0000 (17:02 +0100)]
avcodec/diracdec: Check ff_set_dimensions() for failure

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavformat/oggparsedirac: Export sample aspect ratio
Michael Niedermayer [Thu, 17 Dec 2015 15:01:43 +0000 (16:01 +0100)]
avformat/oggparsedirac: Export sample aspect ratio

Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/diracdec: fix aspect ratio (it was lost after efcc8fddd6b7d1f931ff349e195d78c...
Michael Niedermayer [Thu, 17 Dec 2015 15:01:21 +0000 (16:01 +0100)]
avcodec/diracdec: fix aspect ratio (it was lost after efcc8fddd6b7d1f931ff349e195d78c3c943d7fd)

Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavformat/xmv: Add *.xmv to the recognized extensions for the XMV format.
rsn8887 [Wed, 16 Dec 2015 23:08:23 +0000 (17:08 -0600)]
avformat/xmv: Add *.xmv to the recognized extensions for the XMV format.

3 years agolavc/nellymoserenc: avoid wasteful pow
Ganesh Ajjanagadde [Wed, 9 Dec 2015 23:50:28 +0000 (18:50 -0500)]
lavc/nellymoserenc: avoid wasteful pow

exp2 suffices here. Some trivial speedup is done in addition here by
reusing results.

This retains accuracy, and in particular results in identical values
with GNU libm + gcc/clang.

sample benchmark (Haswell, GNU/Linux):
proposed : 424160 decicycles in pow_table,     512 runs,      0 skips
exp2 only: 1262093 decicycles in pow_table,     512 runs,      0 skips
old      : 2849085 decicycles in pow_table,     512 runs,      0 skips

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
3 years agolavu/random_seed: use arc4random() when available
Ganesh Ajjanagadde [Mon, 7 Dec 2015 02:10:21 +0000 (21:10 -0500)]
lavu/random_seed: use arc4random() when available

arc4random() was designed as a superior interface for system random
number generation, designed for OpenBSD and subsequently incorporated by
other BSD's, Mac OS X, and some non-standard libc's. It is thus an improvement to
use it whenever available.

As a side note, this may or may not get included in glibc, and there is
a proposal to create a posix_random family based on these ideas:
http://austingroupbugs.net/view.php?id=859.

Tested on Mac OS X.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
3 years agoMerge commit 'f1ccd076801444ab7f524cb13e0886faaf10fd50'
Hendrik Leppkes [Thu, 17 Dec 2015 14:03:50 +0000 (15:03 +0100)]
Merge commit 'f1ccd076801444ab7f524cb13e0886faaf10fd50'

* commit 'f1ccd076801444ab7f524cb13e0886faaf10fd50':
  h264: do not call frame_start() for missing frames

Not merged, FFmpeg does a lot more in frame_start to setup missing frames
as well (like coloring them), and the overhead of the other setup is
minimal.

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit 'd6dc5d15af0d8617611281a34a2c3f9ced149ccf'
Hendrik Leppkes [Thu, 17 Dec 2015 13:53:37 +0000 (14:53 +0100)]
Merge commit 'd6dc5d15af0d8617611281a34a2c3f9ced149ccf'

* commit 'd6dc5d15af0d8617611281a34a2c3f9ced149ccf':
  aacdec: fix aac_static_table_init() prototype

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit '68e547ae8b455e5e2b60839f35c359d77a6d94bc'
Hendrik Leppkes [Thu, 17 Dec 2015 13:52:28 +0000 (14:52 +0100)]
Merge commit '68e547ae8b455e5e2b60839f35c359d77a6d94bc'

* commit '68e547ae8b455e5e2b60839f35c359d77a6d94bc':
  avpacket: use ERANGE instead of EOVERFLOW

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit 'd5f5c90be9ec120f1320dcdd808b7bd917dee47c'
Hendrik Leppkes [Thu, 17 Dec 2015 13:52:15 +0000 (14:52 +0100)]
Merge commit 'd5f5c90be9ec120f1320dcdd808b7bd917dee47c'

* commit 'd5f5c90be9ec120f1320dcdd808b7bd917dee47c':
  rtsp: free opts dictionary on failure of getnameinfo

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit '8df8f0c70c9c2085d9ca186b7cbf43656c4412eb'
Hendrik Leppkes [Thu, 17 Dec 2015 13:52:05 +0000 (14:52 +0100)]
Merge commit '8df8f0c70c9c2085d9ca186b7cbf43656c4412eb'

* commit '8df8f0c70c9c2085d9ca186b7cbf43656c4412eb':
  movenc-test: add a missing va_end call

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit 'b8b21dee0f0b4bcc1888067c497d6e838859d2cd'
Hendrik Leppkes [Thu, 17 Dec 2015 13:49:24 +0000 (14:49 +0100)]
Merge commit 'b8b21dee0f0b4bcc1888067c497d6e838859d2cd'

* commit 'b8b21dee0f0b4bcc1888067c497d6e838859d2cd':
  mxfenc: always assume long gop

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit 'e02de9df4b218bd6e1e927b67fd4075741545688'
Hendrik Leppkes [Thu, 17 Dec 2015 13:48:46 +0000 (14:48 +0100)]
Merge commit 'e02de9df4b218bd6e1e927b67fd4075741545688'

* commit 'e02de9df4b218bd6e1e927b67fd4075741545688':
  lavc: export Dirac parsing API used by the ogg demuxer as public

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit '8bcadaacc2b8dc3c5d6569835a5ca20e62d3efca'
Hendrik Leppkes [Thu, 17 Dec 2015 12:55:39 +0000 (13:55 +0100)]
Merge commit '8bcadaacc2b8dc3c5d6569835a5ca20e62d3efca'

* commit '8bcadaacc2b8dc3c5d6569835a5ca20e62d3efca':
  mpegenc: use the CPB props side data

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>