ffmpeg.git
4 months agolavd/dshow: Interpret negative height as bottom-down frame.
Carl Eugen Hoyos [Mon, 17 Sep 2018 22:16:42 +0000 (00:16 +0200)]
lavd/dshow: Interpret negative height as bottom-down frame.

Fixes ticket #7436.

4 months agolavf/webvttenc: Always write hours in the timestamp with two characters.
Carl Eugen Hoyos [Mon, 17 Sep 2018 16:20:05 +0000 (18:20 +0200)]
lavf/webvttenc: Always write hours in the timestamp with two characters.

Fixes ticket #7442.

Reviewed-by: Reto Kromer
4 months agoavcodec/zmbv: Check that the decompressed data size is correct
Michael Niedermayer [Mon, 17 Sep 2018 22:28:37 +0000 (00:28 +0200)]
avcodec/zmbv: Check that the decompressed data size is correct

This checks the value exactly for intra frames and checks it against a
minimum for inter frames as they can be variable.

Fixes: Timeout
Fixes: 10182/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ZMBV_fuzzer-6245951174344704

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 months agoavcodec/zmbv: Update decomp_len in raw frames
Michael Niedermayer [Mon, 17 Sep 2018 19:33:59 +0000 (21:33 +0200)]
avcodec/zmbv: Update decomp_len in raw frames

decomp_len is used in raw frames, so it should not be left at the value from
whatever was decoded previously (which may be any other frame)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 months agoavcodec/mips: [loongson] refine ff_vc1_inv_trans_8x8_mmi.
Shiyou Yin [Mon, 17 Sep 2018 09:20:28 +0000 (17:20 +0800)]
avcodec/mips: [loongson] refine ff_vc1_inv_trans_8x8_mmi.

Combined 1st and 2nd loop into one inline asm in function ff_vc1_inv_trans_8x8_mmi to
reduce memory operation, and made some small optimization in ff_vc1_inv_trans_4x8_mmi.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 months agoMerge commit 'a2041a6522642859ce64af1c618d6fb90a50d4af'
James Almer [Tue, 18 Sep 2018 16:28:05 +0000 (13:28 -0300)]
Merge commit 'a2041a6522642859ce64af1c618d6fb90a50d4af'

* commit 'a2041a6522642859ce64af1c618d6fb90a50d4af':
  qsvenc: AV_PIX_FMT_QSV path should release frame

Merged-by: James Almer <jamrial@gmail.com>
4 months agoqsvenc: AV_PIX_FMT_QSV path should release frame
Maxym Dmytrychenko [Tue, 18 Sep 2018 07:47:52 +0000 (09:47 +0200)]
qsvenc: AV_PIX_FMT_QSV path should release frame

Fixes high memory usage and prevents over allocation of the frames via
proper unref.

Can be checked as:
-hwaccel qsv -c:v h264_qsv -i ../h264-conformance/CANL2_Sony_E.jsv -c:v
h264_qsv -b:v 2000k -y qsv.mp4

4 months agolibavfilter: Removes stored DNN models. Adds support for native backend model file...
Sergey Lavrushkin [Thu, 6 Sep 2018 11:33:06 +0000 (14:33 +0300)]
libavfilter: Removes stored DNN models. Adds support for native backend model file format in tf backend.

Signed-off-by: Pedro Arthur <bygrandao@gmail.com>
4 months agolavc/libxavs2: remove nonexistent parameters
hwren [Wed, 12 Sep 2018 07:54:51 +0000 (15:54 +0800)]
lavc/libxavs2: remove nonexistent parameters

Signed-off-by: hwren <hwrenx@126.com>
4 months agolavc/libdavs2: fix error return codes
hwren [Wed, 12 Sep 2018 05:53:08 +0000 (13:53 +0800)]
lavc/libdavs2: fix error return codes

Signed-off-by: hwren <hwrenx@126.com>
4 months agolavc/libdavs2: remove unused header files
hwren [Wed, 12 Sep 2018 05:53:07 +0000 (13:53 +0800)]
lavc/libdavs2: remove unused header files

Signed-off-by: hwren <hwrenx@126.com>
4 months agoavformat/dashenc: Format VP9 profile as decimal instead of Hexadecimal
James Almer [Mon, 17 Sep 2018 17:29:46 +0000 (14:29 -0300)]
avformat/dashenc: Format VP9 profile as decimal instead of Hexadecimal

Signed-off-by: James Almer <jamrial@gmail.com>
4 months agoavformat/dashenc: Format VP9 bitdepth as decimal instead of Hexadecimal
Karthick Jeyapal [Mon, 17 Sep 2018 08:03:49 +0000 (13:33 +0530)]
avformat/dashenc: Format VP9 bitdepth as decimal instead of Hexadecimal

For example bitdepth should be printed as 10 instead of 0A. Thanks to Hendrik Leppkes for pointing this out

Signed-off-by: James Almer <jamrial@gmail.com>
4 months agoavformat/dashenc: Format VP9 level as decimal instead of hexadecimal
Karthick Jeyapal [Mon, 17 Sep 2018 08:03:48 +0000 (13:33 +0530)]
avformat/dashenc: Format VP9 level as decimal instead of hexadecimal

Commit ID 63c69d51c7532fb6c2460076329b50ec51a0f290 fixed the bug in vpcc, get_vp9_level() function, causing this change.

Signed-off-by: James Almer <jamrial@gmail.com>
4 months agoavfilter/vf_colorspace: fix typo in comment
Paul B Mahol [Mon, 17 Sep 2018 10:51:59 +0000 (12:51 +0200)]
avfilter/vf_colorspace: fix typo in comment

4 months agodoc/filters: update astats description
Paul B Mahol [Mon, 17 Sep 2018 10:34:57 +0000 (12:34 +0200)]
doc/filters: update astats description

4 months agoavfilter/af_astats: count zero crossings
Paul B Mahol [Wed, 12 Sep 2018 12:54:22 +0000 (14:54 +0200)]
avfilter/af_astats: count zero crossings

4 months agoffmpeg: block output == input for files
Gyan Doshi [Sun, 26 Aug 2018 05:52:50 +0000 (11:22 +0530)]
ffmpeg: block output == input for files

Fixes #4655

4 months agoavfilter: add acrossover filter
Paul B Mahol [Thu, 31 May 2018 15:24:23 +0000 (17:24 +0200)]
avfilter: add acrossover filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 months agoavformat/vpcc: fix values in VP9 level detection heuristics
James Almer [Tue, 28 Aug 2018 01:56:14 +0000 (22:56 -0300)]
avformat/vpcc: fix values in VP9 level detection heuristics

The levels are stored as decimal values, not hexadecimal.

Reviewed-by: James Zern <jzern@google.com>
Signed-off-by: James Almer <jamrial@gmail.com>
4 months agoavfilter/avf_aphasemeter: check return value of ff_insert_outpad()
Paul B Mahol [Sat, 15 Sep 2018 19:51:59 +0000 (21:51 +0200)]
avfilter/avf_aphasemeter: check return value of ff_insert_outpad()

4 months agoavfilter/f_ebur128: check return value of ff_insert_outpad()
Paul B Mahol [Sat, 15 Sep 2018 19:47:48 +0000 (21:47 +0200)]
avfilter/f_ebur128: check return value of ff_insert_outpad()

4 months agoavfilter/af_anequalizer: check return value of ff_insert_outpad()
Paul B Mahol [Sat, 15 Sep 2018 19:44:13 +0000 (21:44 +0200)]
avfilter/af_anequalizer: check return value of ff_insert_outpad()

4 months agoavfilter/af_afir: switch to activate
Paul B Mahol [Sat, 15 Sep 2018 18:35:08 +0000 (20:35 +0200)]
avfilter/af_afir: switch to activate

4 months agoavfilter/af_afir: check return value of ff_insert_outpad()
Paul B Mahol [Sat, 15 Sep 2018 18:03:40 +0000 (20:03 +0200)]
avfilter/af_afir: check return value of ff_insert_outpad()

4 months agoavcodec/shorten: Fix bitstream end check in read_header()
Michael Niedermayer [Sat, 15 Sep 2018 00:08:20 +0000 (02:08 +0200)]
avcodec/shorten: Fix bitstream end check in read_header()

Fixes: Timeout
Fixes: 9961/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SHORTEN_fuzzer-5687856176562176

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 months agoavcodec/dvdsubdec: Avoid branch in decode_run_8bit()
Michael Niedermayer [Thu, 13 Sep 2018 02:24:49 +0000 (04:24 +0200)]
avcodec/dvdsubdec: Avoid branch in decode_run_8bit()

Speed improvment 35.5 sec -> 34.7sec

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 months agolibavformat/mxfenc: fix dnxhr ul typo
Jason Stevens [Thu, 13 Sep 2018 00:21:52 +0000 (17:21 -0700)]
libavformat/mxfenc: fix dnxhr ul typo

byte 8 of dnxhr codec ul should be 0x0D

Signed-off-by: Jason Stevens <jay@wizardofthenet.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 months agoavcodec: add missing mpegvideo dependencies to SpeedHQ decoder
James Almer [Sat, 15 Sep 2018 14:26:51 +0000 (11:26 -0300)]
avcodec: add missing mpegvideo dependencies to SpeedHQ decoder

Signed-off-by: James Almer <jamrial@gmail.com>
4 months agoavfilter/avf_showspectrum: add magma color map
Paul B Mahol [Sat, 15 Sep 2018 12:01:03 +0000 (14:01 +0200)]
avfilter/avf_showspectrum: add magma color map

4 months agoconfigure: add missing avcodec dependency to avfilter when bm3d filter is enabled
James Almer [Sat, 15 Sep 2018 00:17:04 +0000 (21:17 -0300)]
configure: add missing avcodec dependency to avfilter when bm3d filter is enabled

Signed-off-by: James Almer <jamrial@gmail.com>
4 months agoavdevice/pulse_audio_dec: set channel map
Paul B Mahol [Wed, 12 Sep 2018 20:17:52 +0000 (22:17 +0200)]
avdevice/pulse_audio_dec: set channel map

This fixes opening devices with >6 channels.

4 months agoFix typos
Michael Bunk [Thu, 30 Aug 2018 06:56:18 +0000 (08:56 +0200)]
Fix typos

4 months agolavf/davs2: Do not mix declarations and code.
Carl Eugen Hoyos [Fri, 14 Sep 2018 18:55:51 +0000 (20:55 +0200)]
lavf/davs2: Do not mix declarations and code.

Fixes the following warning:
libavformat/davs2.c:39:5: warning: ISO C90 forbids mixed declarations and code

4 months agox86/float_dsp: add ff_vector_dmul_{sse2,avx}
James Almer [Thu, 13 Sep 2018 13:04:46 +0000 (10:04 -0300)]
x86/float_dsp: add ff_vector_dmul_{sse2,avx}

~3x to 5x faster.

Signed-off-by: James Almer <jamrial@gmail.com>
4 months agocheckasm/float_dsp: add test for vector_dmul
James Almer [Thu, 13 Sep 2018 13:03:46 +0000 (10:03 -0300)]
checkasm/float_dsp: add test for vector_dmul

Signed-off-by: James Almer <jamrial@gmail.com>
4 months agoMerge commit '2a9e1c122eed66be1b26b747342b848300b226c7'
James Almer [Fri, 14 Sep 2018 02:16:18 +0000 (23:16 -0300)]
Merge commit '2a9e1c122eed66be1b26b747342b848300b226c7'

* commit '2a9e1c122eed66be1b26b747342b848300b226c7':
  libfdk-aac: Don't use defined() in a #define

Merged-by: James Almer <jamrial@gmail.com>
4 months agolavfi/silencedetect: fix spelling
Tristan Matthews [Mon, 10 Sep 2018 19:07:15 +0000 (15:07 -0400)]
lavfi/silencedetect: fix spelling

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 months agoavcodec/mips: [loongson] fix bug of svq3-watermark failed in fate test.
Shiyou Yin [Thu, 13 Sep 2018 03:04:05 +0000 (11:04 +0800)]
avcodec/mips: [loongson] fix bug of svq3-watermark failed in fate test.

Failed case: svq3-watermark
When minimum loop count of following functions are greater than parameter h passed to them, svq3-watermark failed.
1. ff_put_pixels4_8_mmi
2. ff_avg_pixels4_8_mmi
3. ff_put_pixels4_l2_8_mmi
4. ff_avg_pixels4_l2_8_mmi

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 months agolavd/avfoundation: Fix skewed video output
Rick Kern [Fri, 24 Jun 2016 15:00:17 +0000 (11:00 -0400)]
lavd/avfoundation: Fix skewed video output

Fixes ticket #5654.
The linesize can be greater than the minimum required. This copies the
frame taking linesize into account.

Signed-off-by: Rick Kern <kernrj@gmail.com>
4 months agolibfdk-aac: Don't use defined() in a #define
Martin Storsjö [Wed, 12 Sep 2018 20:03:12 +0000 (23:03 +0300)]
libfdk-aac: Don't use defined() in a #define

MSVC expands the preprocessor directives differently, making the
version check fail in the previous form.

Clang can warn about this with -Wexpansion-to-defined (not currently
enabled by default):
warning: macro expansion producing 'defined' has undefined behavior [-Wexpansion-to-defined]

Signed-off-by: Martin Storsjö <martin@martin.st>
4 months agoavfilter/vf_bm3d: use av_clip_uintp2_c where clip is variable
Paul B Mahol [Thu, 13 Sep 2018 18:48:08 +0000 (20:48 +0200)]
avfilter/vf_bm3d: use av_clip_uintp2_c where clip is variable

4 months agoavcodec/libaom: fix setting amount of threads
James Almer [Thu, 13 Sep 2018 16:26:00 +0000 (13:26 -0300)]
avcodec/libaom: fix setting amount of threads

The libaom doxy says that a value of 0 for the threads fields is
equivalent to a value of 1, whereas for avctx->thread_count it means
the maximum amount of threads possible for the host system.

Use av_cpu_count() to get the correct thread count when auto threads
is requested.

Reviewed-by: Jan Ekström <jeebjp@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
4 months agoavfilter/vf_remap: refactor code
Paul B Mahol [Tue, 11 Sep 2018 11:38:36 +0000 (13:38 +0200)]
avfilter/vf_remap: refactor code

4 months agoconfigure: bm3d filter depends on dct in avcodec
Paul B Mahol [Thu, 13 Sep 2018 09:27:20 +0000 (11:27 +0200)]
configure: bm3d filter depends on dct in avcodec

4 months agoavfilter: add bm3d filter
Paul B Mahol [Wed, 9 May 2018 10:58:23 +0000 (12:58 +0200)]
avfilter: add bm3d filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 months agoavfilter: add amultiply audio filter
Paul B Mahol [Wed, 12 Sep 2018 09:12:21 +0000 (11:12 +0200)]
avfilter: add amultiply audio filter

4 months agoavutil: add float_dsp.vector_dmul
Paul B Mahol [Wed, 12 Sep 2018 10:29:02 +0000 (12:29 +0200)]
avutil: add float_dsp.vector_dmul

4 months agoavcodec/libaomenc: remove AVOption related to frame partitions
James Almer [Wed, 12 Sep 2018 14:44:56 +0000 (11:44 -0300)]
avcodec/libaomenc: remove AVOption related to frame partitions

Support for it was apparently never in the codebase, and the enum
value was recently removed from the public headers [1]

[1] https://aomedia.googlesource.com/aom/+/df4ffb73140fe31bebdabd17c1a7b53721e74838

Signed-off-by: James Almer <jamrial@gmail.com>
4 months agolavf: add raw AVS2 demuxer
hwren [Wed, 12 Sep 2018 04:13:53 +0000 (12:13 +0800)]
lavf: add raw AVS2 demuxer

Signed-off-by: hwren <hwrenx@126.com>
Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
4 months agoRevert "lavf: add raw AVS2 demuxer"
Steven Liu [Wed, 12 Sep 2018 04:11:25 +0000 (12:11 +0800)]
Revert "lavf: add raw AVS2 demuxer"

This reverts commit 1e20ed4382b0d99226d58bea82ace14fd3286e4e.

4 months agolavf: add raw AVS2 demuxer
Steven Liu [Wed, 12 Sep 2018 03:21:59 +0000 (11:21 +0800)]
lavf: add raw AVS2 demuxer

Signed-off-by: hwren <hwrenx@126.com>
Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
4 months agolibavcodec/pnm_parser: do not lose skipped parts in reporting of how much was consumed
Michael Niedermayer [Mon, 3 Sep 2018 21:42:22 +0000 (23:42 +0200)]
libavcodec/pnm_parser: do not lose skipped parts in reporting of how much was consumed

Fixes: Timeout
Fixes: 9759/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_PPM_fuzzer-5655277650051072
Fixes: 9753/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_PGMYUV_fuzzer-5764378543521792

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 months agoavcodec/vp8: Check bitstream input in vp7_fade_frame() before time consuming operation
Michael Niedermayer [Sun, 24 Jun 2018 00:43:18 +0000 (02:43 +0200)]
avcodec/vp8: Check bitstream input in vp7_fade_frame() before time consuming operation

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 months agoavcodec/mjpegdec: simplify rgb index remaping
Michael Niedermayer [Fri, 6 Jul 2018 13:45:41 +0000 (15:45 +0200)]
avcodec/mjpegdec: simplify rgb index remaping

4 months agolavf/Makefile: Fix standalone build of AVS2 muxer
Mark Thompson [Tue, 11 Sep 2018 21:36:58 +0000 (22:36 +0100)]
lavf/Makefile: Fix standalone build of AVS2 muxer

Found-by: Paul B Mahol <onemda@gmail.com>
4 months agolavf: add raw avs2 muxer
hwren [Mon, 10 Sep 2018 03:59:03 +0000 (11:59 +0800)]
lavf: add raw avs2 muxer

Signed-off-by: hwren <hwrenx@126.com>
4 months agolavc, doc, configure: add libxavs2 video encoder wrapper
hwren [Mon, 10 Sep 2018 03:59:02 +0000 (11:59 +0800)]
lavc, doc, configure: add libxavs2 video encoder wrapper

Signed-off-by: hwren <hwrenx@126.com>
4 months agoavformat/tcp: re-add checks for setsockopt return values
James Almer [Tue, 11 Sep 2018 18:27:09 +0000 (15:27 -0300)]
avformat/tcp: re-add checks for setsockopt return values

Originally added in 0ed0af595b691121d08bad23b56adf24a23a7ae5 and lost
by mistake in ef71ef5f30ddf1cd61e46628a04608892caf76d2.

Signed-off-by: James Almer <jamrial@gmail.com>
4 months agoMerge commit '7e929dac100916fc45cb95e231025f3439c20156'
James Almer [Tue, 11 Sep 2018 17:13:28 +0000 (14:13 -0300)]
Merge commit '7e929dac100916fc45cb95e231025f3439c20156'

* commit '7e929dac100916fc45cb95e231025f3439c20156':
  libfdk-aacenc: Allow enabling the ELDv2 profile

Merged-by: James Almer <jamrial@gmail.com>
4 months agoMerge commit '2edaafe5b93832715781851dfe2663da228a05ad'
James Almer [Tue, 11 Sep 2018 17:13:14 +0000 (14:13 -0300)]
Merge commit '2edaafe5b93832715781851dfe2663da228a05ad'

* commit '2edaafe5b93832715781851dfe2663da228a05ad':
  libfdk-aacdec: Allow setting the new dynamic range control effect setting

Merged-by: James Almer <jamrial@gmail.com>
4 months agoMerge commit 'ffb9b7a6bab6c6bfd3dd9a7c32e3724209824999'
James Almer [Tue, 11 Sep 2018 17:11:39 +0000 (14:11 -0300)]
Merge commit 'ffb9b7a6bab6c6bfd3dd9a7c32e3724209824999'

* commit 'ffb9b7a6bab6c6bfd3dd9a7c32e3724209824999':
  libfdk-aac: Consistently use a proper version check macro for detecting features

Merged-by: James Almer <jamrial@gmail.com>
4 months agoMerge commit '642fd4769becc2f4827f8375a3d9e8edd2f5df77'
James Almer [Tue, 11 Sep 2018 17:04:20 +0000 (14:04 -0300)]
Merge commit '642fd4769becc2f4827f8375a3d9e8edd2f5df77'

* commit '642fd4769becc2f4827f8375a3d9e8edd2f5df77':
  qsvvpp: Perform full init only when needed

Merged-by: James Almer <jamrial@gmail.com>
4 months agoMerge commit '141c960e21d2860e354f9b90df136184dd00a9a8'
James Almer [Tue, 11 Sep 2018 17:02:58 +0000 (14:02 -0300)]
Merge commit '141c960e21d2860e354f9b90df136184dd00a9a8'

* commit '141c960e21d2860e354f9b90df136184dd00a9a8':
  libfdk-aacenc: Fix building with libfdk-aac v2

Merged-by: James Almer <jamrial@gmail.com>
4 months agoMerge commit 'c8bca9fe466f810fd484e2c6db7ef7bc83b5a943'
James Almer [Tue, 11 Sep 2018 17:01:47 +0000 (14:01 -0300)]
Merge commit 'c8bca9fe466f810fd484e2c6db7ef7bc83b5a943'

* commit 'c8bca9fe466f810fd484e2c6db7ef7bc83b5a943':
  lavc/qsvenc: dump BufferSizeInKB message

Merged-by: James Almer <jamrial@gmail.com>
4 months agoMerge commit 'e16b20782a597e36a9c7488487c3179375a25b97'
James Almer [Tue, 11 Sep 2018 16:57:49 +0000 (13:57 -0300)]
Merge commit 'e16b20782a597e36a9c7488487c3179375a25b97'

* commit 'e16b20782a597e36a9c7488487c3179375a25b97':
  lavc/qsvenc: allow to set qp range for h264 BRC

Merged-by: James Almer <jamrial@gmail.com>
4 months agoMerge commit '83678dbbae64ad8c501e0c732c1117e642c25dae'
James Almer [Tue, 11 Sep 2018 16:57:23 +0000 (13:57 -0300)]
Merge commit '83678dbbae64ad8c501e0c732c1117e642c25dae'

* commit '83678dbbae64ad8c501e0c732c1117e642c25dae':
  libopenh264dec: Export the decoded profile and level in AVCodecContext

Merged-by: James Almer <jamrial@gmail.com>
4 months agoMerge commit '8c76bfacf663ff71cee5264a74d0f9c86addd325'
James Almer [Tue, 11 Sep 2018 16:54:59 +0000 (13:54 -0300)]
Merge commit '8c76bfacf663ff71cee5264a74d0f9c86addd325'

* commit '8c76bfacf663ff71cee5264a74d0f9c86addd325':
  tcp: Use ff_connect_parallel for RFC 8305 style connecting

Merged-by: James Almer <jamrial@gmail.com>
4 months agoMerge commit '9b4c3f5aadf54ffd2a6e15746b1fd736379883c4'
James Almer [Tue, 11 Sep 2018 16:51:22 +0000 (13:51 -0300)]
Merge commit '9b4c3f5aadf54ffd2a6e15746b1fd736379883c4'

* commit '9b4c3f5aadf54ffd2a6e15746b1fd736379883c4':
  network: Add RFC 8305 style "Happy Eyeballs"/"Fast Fallback" helper function

Merged-by: James Almer <jamrial@gmail.com>
4 months agoMerge commit '69caad8959982580504643d36aef22528e4aa6ce'
James Almer [Tue, 11 Sep 2018 16:42:09 +0000 (13:42 -0300)]
Merge commit '69caad8959982580504643d36aef22528e4aa6ce'

* commit '69caad8959982580504643d36aef22528e4aa6ce':
  qsvdec: Release packet on decoding failure for  mpeg2/vp8/vc1

Merged-by: James Almer <jamrial@gmail.com>
4 months agoMerge commit '76eef04f30a768fa80366d679f3de7e9447b67d5'
James Almer [Tue, 11 Sep 2018 16:41:46 +0000 (13:41 -0300)]
Merge commit '76eef04f30a768fa80366d679f3de7e9447b67d5'

* commit '76eef04f30a768fa80366d679f3de7e9447b67d5':
  qsvenc: Fix a misleading log message

Merged-by: James Almer <jamrial@gmail.com>
4 months agoMerge commit 'e05e5920a4e1f1f15cc8a7c843159d519f6ec18e'
James Almer [Tue, 11 Sep 2018 16:41:07 +0000 (13:41 -0300)]
Merge commit 'e05e5920a4e1f1f15cc8a7c843159d519f6ec18e'

* commit 'e05e5920a4e1f1f15cc8a7c843159d519f6ec18e':
  qsv: Error out if getting session handle failed in avfilter

Merged-by: James Almer <jamrial@gmail.com>
4 months agoMerge commit '662558f985f50834eebe82d6b6854c66f33ab320'
James Almer [Tue, 11 Sep 2018 16:29:37 +0000 (13:29 -0300)]
Merge commit '662558f985f50834eebe82d6b6854c66f33ab320'

* commit '662558f985f50834eebe82d6b6854c66f33ab320':
  decode: copy the output parameters from the last bsf in the chain back to the AVCodecContext
  decode: flush the internal bsfs instead of constantly reinitalizing them
  h264_redundant_pps_bsf: implement a AVBSFContext.flush() callback
  vp9_superframe_bsf: implement a AVBSFContext.flush() callback
  vp9_superframe_split_bsf: implement a AVBSFContext.flush() callback
  h264_mp4toannexb_bsf: implement a AVBSFContext.flush() callback
  bsf: add a flushing mechanism to AVBSFContext

This commit is a noop, see
b33f5299a59f5f155a4df5cb630b1de2acdb25b2
390f156451bc860169deca68eee4e21bf746a9ab
63e0846c66607a1a4cce027d9f55e353c4b56948
e9980c451e294dbc8c81ed8dd4a8e5792397fbbe
2954e513930f9b1bc2cfba49eed3fc1911e76892
94fe138de0ba5892a7051f5b47c191a41b78805a
f631c328e680a3dd491936b92f69970c20cdcfc7

Merged-by: James Almer <jamrial@gmail.com>
4 months agoMerge commit '6a9c00c09d2bc50c0ea64ba092b2f4afc46aa978'
James Almer [Tue, 11 Sep 2018 16:18:52 +0000 (13:18 -0300)]
Merge commit '6a9c00c09d2bc50c0ea64ba092b2f4afc46aa978'

* commit '6a9c00c09d2bc50c0ea64ba092b2f4afc46aa978':
  tls_openssl: Fix checks for SSL_ERROR_WANT_WRITE in nonblocking operation

Merged-by: James Almer <jamrial@gmail.com>
4 months agoMerge commit '22f98ac19cf29f22b3e1d10314df9503f06fe683'
James Almer [Tue, 11 Sep 2018 16:17:38 +0000 (13:17 -0300)]
Merge commit '22f98ac19cf29f22b3e1d10314df9503f06fe683'

* commit '22f98ac19cf29f22b3e1d10314df9503f06fe683':
  network: Check for EINTR in ff_poll_interrupt

Merged-by: James Almer <jamrial@gmail.com>
4 months agoMerge commit 'c194b9ad6dbe65f5abd68158c4811ed84e2a2b95'
James Almer [Tue, 11 Sep 2018 16:15:41 +0000 (13:15 -0300)]
Merge commit 'c194b9ad6dbe65f5abd68158c4811ed84e2a2b95'

* commit 'c194b9ad6dbe65f5abd68158c4811ed84e2a2b95':
  network: Use ff_neterrno instead of AVERROR(errno) for poll errors

This commit is a noop, see 54b6bef6e13adf377c78c28ede22a4322ab28865

Merged-by: James Almer <jamrial@gmail.com>
4 months agoMerge commit '5d01bd181bb77e6740462095d7be4e0733a59420'
James Almer [Tue, 11 Sep 2018 16:14:02 +0000 (13:14 -0300)]
Merge commit '5d01bd181bb77e6740462095d7be4e0733a59420'

* commit '5d01bd181bb77e6740462095d7be4e0733a59420':
  http: pass return code from http_open_cnx_internal() on its failure

This commit is a noop, see 70c9d400087c182ce670fcc008b05c2edabd73e9

Merged-by: James Almer <jamrial@gmail.com>
4 months agoMerge commit '325aa63dd1a3abc2453914d0bc111d297833d725'
James Almer [Tue, 11 Sep 2018 16:11:22 +0000 (13:11 -0300)]
Merge commit '325aa63dd1a3abc2453914d0bc111d297833d725'

* commit '325aa63dd1a3abc2453914d0bc111d297833d725':
  qsv: enforcing continuous memory layout

Merged-by: James Almer <jamrial@gmail.com>
4 months agoMerge commit 'f89ec87afaf0d1abb6d450253b0b348fd554533b'
James Almer [Tue, 11 Sep 2018 14:48:38 +0000 (11:48 -0300)]
Merge commit 'f89ec87afaf0d1abb6d450253b0b348fd554533b'

* commit 'f89ec87afaf0d1abb6d450253b0b348fd554533b':
  frame: Simplify the video allocation

Merged-by: James Almer <jamrial@gmail.com>
Padding-Remixed-by: Michael Niedermayer <michael@niedermayer.cc>
4 months agoavformat/dashenc: Remove muxer overhead from Bandwidth field in DASH manifest
Karthick Jeyapal [Tue, 4 Sep 2018 08:15:48 +0000 (13:45 +0530)]
avformat/dashenc: Remove muxer overhead from Bandwidth field in DASH manifest

Fixes bug id #7386
Muxer overhead calculations was intented for HLS playlist as Apple's mediastreamvalidator tests were failing.
But applying the same fix for DASH manifest proved counterproductive, as Bandwidth can be used for segment name templates.

4 months agoavformat/dashenc: Add CODECS tag to HLS master playlist
Karthick Jeyapal [Tue, 4 Sep 2018 08:15:47 +0000 (13:45 +0530)]
avformat/dashenc: Add CODECS tag to HLS master playlist

4 months agoavfilter/vf_datascope: reduce block height
Paul B Mahol [Tue, 11 Sep 2018 09:58:49 +0000 (11:58 +0200)]
avfilter/vf_datascope: reduce block height

So it match minimal input video size requirement.

4 months agoavfilter/vf_limiter: add slice threading
Paul B Mahol [Tue, 11 Sep 2018 09:24:07 +0000 (11:24 +0200)]
avfilter/vf_limiter: add slice threading

4 months agoavcodec/loco: rotate other planes too for non-power of 2 widths
Paul B Mahol [Tue, 11 Sep 2018 08:15:59 +0000 (10:15 +0200)]
avcodec/loco: rotate other planes too for non-power of 2 widths

This was forgotten in df05fd3131fd94d01ebeaa58b4c60510961b8be2.

4 months agolibavformat/mxfenc: add missing dnxhr mxfcontainer essence ULs
Jason Stevens [Sat, 8 Sep 2018 13:26:31 +0000 (06:26 -0700)]
libavformat/mxfenc: add missing dnxhr mxfcontainer essence ULs

Add missing dnxhr mxf container essence ULs to the mxf encoder.

This fixes dnxhr mxf files being quarantined by Avid Media Composer.

Signed-off-by: Jason Stevens <jay@wizardofthenet.com>
Reviewed-by: Baptiste Coudurier
4 months agolibavcodec/dnxhd: change ff_dnxhd_get_hr_frame_size to avpriv_
Jason Stevens [Sat, 8 Sep 2018 05:42:13 +0000 (22:42 -0700)]
libavcodec/dnxhd: change ff_dnxhd_get_hr_frame_size to avpriv_

refactor ff_dnxhd_get_hr_frame_size to avpriv_dnxhd_get_hr_frame_size,
to allow cross library usage in libavformat/mxfenc this change makes
this function no longer be always inlined.

Signed-off-by: Jason Stevens <jay@wizardofthenet.com>
4 months agoavcodec/loco: switch to planar rgb format
Paul B Mahol [Mon, 10 Sep 2018 09:18:59 +0000 (11:18 +0200)]
avcodec/loco: switch to planar rgb format

Remove now unused step variable.

4 months agoavfilter: add nvidia NPP based transpose filter
Roman Arzumanyan [Wed, 29 Aug 2018 09:53:02 +0000 (12:53 +0300)]
avfilter: add nvidia NPP based transpose filter

Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
4 months agotests/fate: fix lut hash for gray14
Paul B Mahol [Sun, 9 Sep 2018 20:49:54 +0000 (22:49 +0200)]
tests/fate: fix lut hash for gray14

4 months agoswscale/swscale_unscaled: add gbrap -> packed rgb path
Paul B Mahol [Sun, 9 Sep 2018 20:33:25 +0000 (22:33 +0200)]
swscale/swscale_unscaled: add gbrap -> packed rgb path

4 months agoavcodec/lagarith: set pict_type too
Paul B Mahol [Sun, 9 Sep 2018 19:52:43 +0000 (21:52 +0200)]
avcodec/lagarith: set pict_type too

4 months agoavcodec/lagarith: switch to planar rgb
Paul B Mahol [Sat, 8 Sep 2018 23:05:56 +0000 (01:05 +0200)]
avcodec/lagarith: switch to planar rgb

Speed goes from 363 fps to 428 fps for 640x480 video.

4 months agoavcodec/v210enc: Pass through Active Format Description (AFD) data
Devin Heitmueller [Fri, 7 Sep 2018 19:40:27 +0000 (15:40 -0400)]
avcodec/v210enc: Pass through Active Format Description (AFD) data

When encoding to V210, make sure the AFD side data makes it through
in the resulting AVPacket.  This is needed so the decklink output
module can put out AFD when in 10-bit mode.

Signed-off-by: Devin Heitmueller <dheitmueller@ltnglobal.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
4 months agoavcodec: add AV_PKT_DATA_AFD to allow AFD data to be embedded in AVPacket
Devin Heitmueller [Fri, 7 Sep 2018 19:40:26 +0000 (15:40 -0400)]
avcodec: add AV_PKT_DATA_AFD to allow AFD data to be embedded in AVPacket

Create a new AVPacket side data type for Active Format Description,
which mirrors the side data type found in AVFrame.  The primary
use case for this is ensuring AFD gets preserved in the V210
encoder, so that the decklink libavdevice can output AFD.

Signed-off-by: Devin Heitmueller <dheitmueller@ltnglobal.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
4 months agoavdevice/decklink: Add support for EIA-708 output over SDI
Devin Heitmueller [Fri, 7 Sep 2018 19:40:25 +0000 (15:40 -0400)]
avdevice/decklink: Add support for EIA-708 output over SDI

Hook in libklvanc and use it for output of EIA-708 captions over
SDI.  The bulk of this patch is just general support for ancillary
data for the Decklink SDI module - the real work for construction
of the EIA-708 CDP and VANC line construction is done by libklvanc.

Libklvanc can be found at: https://github.com/stoth68000/libklvanc

Updated to reflect feedback from Marton Balint <cus@passwd.hu>,
Carl Eugen Hoyos <ceffmpeg@gmail.com>, Aaron Levinson
<alevinsn_dev@levland.net>, and Moritz Barsnick <barsnick@gmx.net>

Signed-off-by: Devin Heitmueller <dheitmueller@ltnglobal.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
4 months agoavcodec/v210enc: Pass through A53 CC data
Devin Heitmueller [Fri, 7 Sep 2018 19:40:24 +0000 (15:40 -0400)]
avcodec/v210enc: Pass through A53 CC data

When encoding to V210, make sure the CC side data makes it through
in the resulting AVPacket.  This is needed so the decklink output
module can put out captions when in 10-bit mode.

Signed-off-by: Devin Heitmueller <dheitmueller@ltnglobal.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
4 months agoavformat/movenc: remove experimental checks for AV1 streams
James Almer [Sun, 9 Sep 2018 20:26:09 +0000 (17:26 -0300)]
avformat/movenc: remove experimental checks for AV1 streams

The spec has been finalized.

Signed-off-by: James Almer <jamrial@gmail.com>
4 months agoavfilter/vf_framerate: switch to activate
Marton Balint [Sun, 26 Aug 2018 22:51:52 +0000 (00:51 +0200)]
avfilter/vf_framerate: switch to activate

Signed-off-by: Marton Balint <cus@passwd.hu>
4 months agoavfilter/f_cue: add cue and acue filters
Marton Balint [Thu, 28 Jun 2018 22:03:04 +0000 (00:03 +0200)]
avfilter/f_cue: add cue and acue filters

To delay filtering until a given wallclock timestamp.

Signed-off-by: Marton Balint <cus@passwd.hu>
4 months agoavutil/file: allow mapping 0 byte files with av_file_map
Marton Balint [Thu, 6 Sep 2018 18:46:16 +0000 (20:46 +0200)]
avutil/file: allow mapping 0 byte files with av_file_map

Signed-off-by: Marton Balint <cus@passwd.hu>