Merge commit '03afb62e83516141ba999536fc97575faefb98af'

* commit '03afb62e83516141ba999536fc97575faefb98af':
  libvpxenc: export CPB props side data

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

Merge commit '11c9bd633f635f07a762be1ecd672de55daf4edc'

* commit '11c9bd633f635f07a762be1ecd672de55daf4edc':
  libopenh264enc: export CPB props side data

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

Merge commit 'f0b769c16daafa64720dcba7fa81a9f5255e1d29'

* commit 'f0b769c16daafa64720dcba7fa81a9f5255e1d29':
  lavc: add a packet side data type for VBV-like parameters

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

Merge commit 'e63e3797a1ed9346f529848e6ba3d27fd2d2cc8d'

* commit 'e63e3797a1ed9346f529848e6ba3d27fd2d2cc8d':
  avconv: pass the global codec side data to the muxer

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

Merge commit '84adab333cddeefc3cfd843089dee23f58bd372c'

* commit '84adab333cddeefc3cfd843089dee23f58bd372c':
  lavc: add stream-global packet side data

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

Merge commit '31c51f7441de07b88cfea2550245bf1f5140cb8f'

* commit '31c51f7441de07b88cfea2550245bf1f5140cb8f':
  avpacket: add a function for wrapping existing data as side data

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

Merge commit 'b09ad37c83841c399abb7f2503a2ab214d0c2d48'

* commit 'b09ad37c83841c399abb7f2503a2ab214d0c2d48':
  h264: derive the delay from the level when it's not present

Merged without changing the strict_std_compliance check, as it breaks FATE
and changes decoding behavior.

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

Merge commit '792b9c9dfcf44b657d7854368d975b5ca3bc22ca'

* commit '792b9c9dfcf44b657d7854368d975b5ca3bc22ca':
  h264: set frame_num in start_frame(), not decode_slice_header()

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

Merge commit '741b494fa8cd28a7d096349bac183893c236e3f9'

* commit '741b494fa8cd28a7d096349bac183893c236e3f9':
  h264: eliminate default_ref_list

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

ffmpeg: add progress speed to status line and report

This adds a computation of the progress speed versus realtime ("Nx")
to the status line and to the report log. It uses the progress time
as already calculated for total output time as a base.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avformat/swfenc: Check frama rate before writing it

Fixes assertion failure with ffserver

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

diracdec: Fix codeblock parameters reading

diracdec: Add support for HQ profile

diracdec: Add 10-bits to pix_fmt table

opus_silk: fix typo causing overflow in silk_stabilize_lsf

Due to this typo max_center can be too large, causing nlsf to be set to
too large values, which in turn can cause nlsf[i - 1] + min_delta[i] to
overflow to a negative value, which is not allowed for nlsf and can
cause an out of bounds read in silk_lsf2lpc.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

ffprobe: use print_val to print the frame pkt_size value

This allows to honour formatting options.

avfilter/af_sofalizer: use SIMD in compensate_volume()

Signed-off-by: Paul B Mahol <onemda@gmail.com>

mips: add mips64r2 architecture variant

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

mips: i6400 core is not mips32r2, so disable mips32r2

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

ffmpeg: Allow specifying the program number for created programs

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

lavc: move exp2fi to ff_exp2fi in internal.h

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>

lavu/eval: remove pow and exp2 for postfixes

These postfixes can be computed statically, and there is no need to
waste runtime resources.

Tested with FATE.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>

avfilter/vf_stereo3d: get rid of ts_unit hack

Signed-off-by: Paul B Mahol <onemda@gmail.com>

lavc/libopenh264: apply minor options text consistency fixes

doc/encoders/libopenh264: update documentation after recent changes

lavc: typo fix uncliped -> unclipped

Untested due to lack of ppc.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>

ffm: reject invalid codec_id and codec_type

A negative codec_id cannot be handled by the found_decoder API of
AVStream->info: if the codec_id is not recognized, found_decoder is set
to -codec_id, which has to be '<0' according to the API documentation.

This can cause NULL pointer dereferencing in try_decode_frame.

Also make sure the codec_type matches the expected one for codec_id.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

avfilter/af_ladspa: unbreak Mch -> Nch plugins, where M < N

Signed-off-by: Paul B Mahol <onemda@gmail.com>

ffserver: explicitly use time_t for uptime calc

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>

ffserver: free pathname before bailing out

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>

ffserver: use EXIT_FAILURE on failed child fork()

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>

ffserver: be explicit on failed fork() msg

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>

ffserver: allocate AVStream's internal too

Avoids segfault at init_muxer() (mux.c) due to a
null pointer dereference on the recently
introduced AVStream->internal

Fixes: #5059 (https://trac.ffmpeg.org/ticket/5059)

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>

movenc: support cenc (common encryption)

support writing encrypted mp4 using aes-ctr, conforming to ISO/IEC
23001-7.

3 new parameters were added:
- encryption_scheme - allowed values are none (default) and cenc-aes-ctr
- encryption_key - 128 bit encryption key (hex)
- encryption_kid - 128 bit encryption key identifier (hex)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

libavutil: add aes-ctr support

for supporting mp4 cenc encoding/decoding

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avfilter/vf_stereo3d: add direct (faster) path:

for above below and side by side to alternating format
for above below and side by side to mono format

Signed-off-by: Paul B Mahol <onemda@gmail.com>

Merge commit 'e7078e842d93436edba1f30af1f9869d3913f7fe'

* commit 'e7078e842d93436edba1f30af1f9869d3913f7fe':
  hevcdsp: add x86 SIMD for MC

Not merged, FFmpeg HEVC DSP has diverged substantially from Libav.

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

Merge commit '0cef06df073934ca08d0357fcbbbcf2bc9b2a0cd'

* commit '0cef06df073934ca08d0357fcbbbcf2bc9b2a0cd':
  checkasm: add HEVC MC tests

Not merged, FFmpeg HEVC DSP has diverged substantially from Libav.

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

Merge commit 'a853388d2fc5be848cca839a9fdf39a97c2d7b0e'

* commit 'a853388d2fc5be848cca839a9fdf39a97c2d7b0e':
  hevc: change the stride of the MC buffer to be in bytes instead of elements

Not merged, FFmpeg HEVC DSP has diverged substantially from Libav.

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

Merge commit '688417399c69aadd4c287bdb0dec82ef8799011c'

* commit '688417399c69aadd4c287bdb0dec82ef8799011c':
  hevcdsp: split the pred functions by width

Not merged, FFmpeg HEVC DSP has diverged substantially from Libav.

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

Merge commit '818bfe7f0a3ff243deb63c4b146de2563f38ffd4'

* commit '818bfe7f0a3ff243deb63c4b146de2563f38ffd4':
  hevcdsp: split the epel functions by width

Not merged, FFmpeg HEVC DSP has diverged substantially from Libav.

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

Merge commit '1f821750f0b8d0c87cbf88a28ad699b92db5ec88'

* commit '1f821750f0b8d0c87cbf88a28ad699b92db5ec88':
  hevcdsp: split the qpel functions by width instead of by the subpixel fraction

Not merged, FFmpeg HEVC DSP has diverged substantially from Libav.

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

lavc/utils: use AVPixFmtDescriptor to probe palette formats

Also use the input frame format instead of the AVCodecContext one according
to the documentation of AVCodecContext.get_buffer2().

lavfi: use a video frame pool for each link of the filtergraph

avfilter/af_sofalizer: check av_fft_init return code

Signed-off-by: Paul B Mahol <onemda@gmail.com>

swscale/x86/rgb2rgb_template: Fallback to mmx in interleaveBytes() if the alignment is insufficient for SSE*

This also as a sideeffect fixes the non aligned case

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

swscale/x86/rgb2rgb_template: Do not crash on misaligend stride

Fixes Ticket5013

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avfilter/vf_decimate: fix typo in fraction

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

configure: add conditional library dependency for sofalizer and showfreqs

Signed-off-by: Paul B Mahol <onemda@gmail.com>

avfilter/af_sofalizer: add frequency domain processing and use it by default

Code ported from SOFAlizer patch for VLC.

Signed-off-by: Paul B Mahol <onemda@gmail.com>

avfilter/vf_decimate: Check that input parameters match

Fixes Ticket4964

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

golomb: always check for invalid UE golomb codes in get_ue_golomb

Also correct the check to reject log < 7, because UPDATE_CACHE only
guarantees 25 meaningful bits.

This fixes undefined behavior:
runtime error: shift exponent is negative

Testing with START/STOP timers in get_ue_golomb, one for the first
branch (A) and one for the second (B), shows that there is practically no
slowdown, e.g. for the cavs decoder:

With the check in the B branch:
    629 decicycles in get_ue_golomb B, 4194260 runs,     44 skips
    433 decicycles in get_ue_golomb A,268434102 runs,   1354 skips

Without the check:
    624 decicycles in get_ue_golomb B, 4194273 runs,     31 skips
    433 decicycles in get_ue_golomb A,268434203 runs,   1253 skips

Since the B branch is executed far less often than the A branch, this
change is negligible, even more so for the h264 decoder, where the ratio
B/A is a lot smaller.

Fixes: mozilla bug 1230239
Fixes: fbeb8b2c7c996e9b91c6b1af319d7ebc/asan_heap-oob_195450f_2743_e8856ece4579ea486670be2b236099a0.bit

Found-by: Tyson Smith
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

avfilter/vf_decimate: change ts_unit to AVRational

This might help with rounding differences between platforms

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avfilter/vf_mpdecimate: Add missing emms_c()

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

aacenc: switch to using the RNG from libavutil

PSNR doesn't change as expected. The AAC spec doesn't really say
anything about how exactly to generate noise.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>

avfilter/vf_delogo: fix show option when clipping

The show option did not take clipping into account, so the borders on
the clipped side wouldn't show up. Fix it.

Signed-off-by: Jean Delvare <jdelvare@suse.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/nvenc: clamp initial qp value to [1, 51]

Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>

avcodec/nvenc: set slice number to 1 to improve encoding quality

Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>

get_bits: Support max_depth > 2 in GET_RL_VLC_INTERNAL

fate: increase FUZZ by 1 for aac-tns-encode

This should fix this test failing on kfreebsd, a regression since
6e5dbe7, which decreased the CMP_TARGET by 1.

Reviewed-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

avfilter/af_sofalizer: switch comments positions to correct order

Signed-off-by: Paul B Mahol <onemda@gmail.com>

lavfi/ebur128: apply I dual mono correction only if I available

Spotted-by: jamrial & gcc 6

avfilter/af_sofalizer: fix calculation of split point

Signed-off-by: Paul B Mahol <onemda@gmail.com>

avformat/mxfenc: Do not crash if there is no packet in the first stream

Fixes: Ticket4914

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avfilter/af_sofalizer: remove reorder hack

Signed-off-by: Paul B Mahol <onemda@gmail.com>

avfilter/af_sofalizer: move modulo operation out of loop

Signed-off-by: Paul B Mahol <onemda@gmail.com>

lavf/tee: fix side data double free.

Similar to 33fefdb44.
Fix trac ticket #4921.

Signed-off-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avformat/hlsenc: Check the return code of avformat_write_header()

Fixes: segfault
Fixes: Ticket5067

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avformat/mov: Enable parser for mp3s by old HandBrake

Fixes Ticket5047

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avformat/mxfenc: Fix integer overflow in length computation

Fixes: CID1341577

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avfilter/af_sofalizer: make it possible to configure speaker elevation

Signed-off-by: Paul B Mahol <onemda@gmail.com>

avformat/segment: Fix memory leak of cur_entry.filename

Solution suggested-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

doc/general: add missing @tab for ADPCM VIMA

Signed-off-by: Paul B Mahol <onemda@gmail.com>

avfilter/af_sofalizer: display some info when loading sofa file

Signed-off-by: Paul B Mahol <onemda@gmail.com>

avfilter: add SOFAlizer audio filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>

mips: i6400 core does have an FPU, so not disable it

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

mips: add i6400 core optimizations

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

mips: remove --mips64r6 configure option

Having a configure option with the same name as a MIPS ISA is confusing,
so better to remove it. This option was being used to add some
optimizations to a specific core (i6400). We will add the optimizations
just when the i6400 core has been detected, in a later patch.

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/aacsbr_template: Add Check to read_sbr_envelope()

The limit is a conservative guess, the spec does not seem to specify a limit

Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

lavf/matroskadec: Set codec_tag also for audio codecs.

This was already done for "A_MS/ACM" mkv files and it is done
for mov files but was not done for A_QUICKTIME" mkv files.

avfilter/vf_delogo: Use AVPixFmtDescriptor.nb_components

Relying on AVPixFmtDescriptor.nb_components is cleaner and faster than
checking data and linesize for every possible plane.

Signed-off-by: Jean Delvare <jdelvare@suse.de>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/aarch64/neon.S: Update neon.s for transpose_4x4H

The transpose_4x4H is wrong which cost me much time to find this bug. The orders of r2 and r3 are wrong,
this bug waste me much time while I make aarch64 arm instruction which used the function.

doc: fix selectivecolor filter position

avcodec/aacsbr: Split the env_facs table

This also removes a #ifdef and special case for the fixed point case

Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

lavc: typo fix cliping -> clipping, saftey -> safety

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>

avformat/mpegtsenc: Add basic multi program support

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

ffmpeg: Add basic support to mux multiple programs

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avformat: Add av_program_add_stream_index()

This will be used by the subsequent commit(s)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

doc/issue_tracker.txt: various updates

Added missing components.
Fixed some nits.

Signed-off-by: Lou Logan <lou@lrcd.com>

lavc/mdct_template: use lrint instead of floor hack

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>

lavc/dcaenc: avoid wasteful cos calls

cos has symmetry; use this.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>

lavc/nellymoserdec: replace pow by exp2

exp2 suffices here.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>

lavfi/formats: fix segfault when allocation fails

This is a somewhat subtle failure that can occur when the realloc_array
fails in FORMATS_REF.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>

ffmpeg: change command line option -dump to work without -loglevel debug

-hex and -dump command line options do nothing unless -loglevel debug is set.

-dump by itself is useful for monitoring live streams (to get the current PTS for example)  however when it is used with -loglevel debug for an RTMP stream, librtmp also dumps the packet data which makes the output too noisy.

do_pkt_dump is only set in check_keyboard_interaction or by the -dump command line option so this change should have no effect on any other parts of the code..

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avutil/softfloat: Assert that the exponent did not overflow the legal range in av_normalize1_sf()

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avfilter/af_aemphasis: more declarations above

Signed-off-by: Paul B Mahol <onemda@gmail.com>

sbr_qmf_analysis: sanitize input for 32-bit imdct

If the input contains too many too large values, the imdct can overflow.
Even if it didn't, the output would be larger than the valid range of 29
bits.

Note that this is a very delicate limit: Allowing values up to 1<<25
does not prevent input larger than 1<<29 from arriving at
sbr_sum_square, while limiting values to 1<<23 breaks the
fate-aac-fixed-al_sbr_hq_cm_48_5.1 test.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

sbrdsp_fixed: assert that input values are in the valid range

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

aacsbr: ensure strictly monotone time borders

This fixes a division by zero in the aac_fixed decoder.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

diracdec: remove duplicate codeblock decoding

Broken by commit 7424a6d0a589d31100d6067ebcb47236c00f4b36

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>