ffmpeg.git
3 years agoAdd a compat stdatomic.h implementation based on pthreads
Anton Khirnov [Mon, 28 Nov 2016 23:29:55 +0000 (15:29 -0800)]
Add a compat stdatomic.h implementation based on pthreads

Adapted from the code by Rémi Denis-Courmont from VLC

This merges libav commit f9a6a80e065cdb95b233978f1d96ec9bc863daa1.

Signed-off-by: Wan-Teh Chang <wtc@google.com>
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoAdd a compat stdatomic.h implementation based on suncc atomics
Anton Khirnov [Mon, 28 Nov 2016 23:29:54 +0000 (15:29 -0800)]
Add a compat stdatomic.h implementation based on suncc atomics

Adapted from the code by Rémi Denis-Courmont from VLC

This merges libav commit bb81ed476569b912a37ed553e756e123b6b13b14.

Signed-off-by: Wan-Teh Chang <wtc@google.com>
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoAdd a compat stdatomic.h implementation based on windows atomics
Anton Khirnov [Mon, 28 Nov 2016 23:29:53 +0000 (15:29 -0800)]
Add a compat stdatomic.h implementation based on windows atomics

Adapted from the code by Rémi Denis-Courmont from VLC

This merges libav commit c2755864afadfbaa349e8d583665c86fe99fa90b.

Signed-off-by: Wan-Teh Chang <wtc@google.com>
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoAdd a compat stdatomic.h implementation based on GCC atomics
Anton Khirnov [Mon, 28 Nov 2016 21:24:22 +0000 (13:24 -0800)]
Add a compat stdatomic.h implementation based on GCC atomics

Adapted from the code by Rémi Denis-Courmont from VLC

This merges libav commit 4e928ef340ac20325f529d92fcbc51e768085358.

Signed-off-by: Wan-Teh Chang <wtc@google.com>
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoavformat/ffmenc: Remove the last use of st->codec
Michael Niedermayer [Thu, 1 Dec 2016 16:18:15 +0000 (17:18 +0100)]
avformat/ffmenc: Remove the last use of st->codec

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavformat/ffmenc: Make ffm_write_header_codec_ctx() use codecpar
Michael Niedermayer [Thu, 1 Dec 2016 15:17:41 +0000 (16:17 +0100)]
avformat/ffmenc: Make ffm_write_header_codec_ctx() use codecpar

This would be simpler if codecpar supported AVOptions
modern ffserver should be unaffected by this, older ffserver which required the
muxer to directly access the encoder could have issues with this, but this
direct access is just wrong and unsafe

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavformat/ffmenc: set bitexact mode for old API without accessing the encoder
Michael Niedermayer [Thu, 1 Dec 2016 15:58:37 +0000 (16:58 +0100)]
avformat/ffmenc: set bitexact mode for old API without accessing the encoder

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavformat/ffmenc: Drop ffm_write_header_codec_private_ctx()
Michael Niedermayer [Thu, 1 Dec 2016 15:07:35 +0000 (16:07 +0100)]
avformat/ffmenc: Drop ffm_write_header_codec_private_ctx()

This accesses the private encoder context, it should not be used by
the current ffserver it may affect old ffserver versions but i believe
there is consens that accessing the private encoder context from the muxer
is completely wrong.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavformat/ffmenc: Replace some st->codec use by codecpar
Michael Niedermayer [Thu, 1 Dec 2016 15:00:44 +0000 (16:00 +0100)]
avformat/ffmenc: Replace some st->codec use by codecpar

Note, this temporarly drops the ability to set ffmpeg encoder debug and flags2 via ffserver.conf

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavfilter/vf_premultiply: remove redundant semicolons
Michael Niedermayer [Fri, 2 Dec 2016 12:01:20 +0000 (13:01 +0100)]
avfilter/vf_premultiply: remove redundant semicolons

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agomatroskadec: partly revert "demux relevant subtitle packets after a seek"
Rainer Hochecker [Sat, 26 Nov 2016 07:27:44 +0000 (08:27 +0100)]
matroskadec: partly revert "demux relevant subtitle packets after a seek"

This reverts parts of c16582579b1c6f66a86615c5808cd5b2bf17be73. The hard
coded 30 seconds are a lot, and finishing the seek can takes several
seconds when the source is on a network share. Remove this code
entirely, because it does more bad than good.

(Commit message provided by committer, based on the original messages
by the patch author.)

Signed-off-by: Rainer Hochecker <fernetmenta@online.de>
Signed-off-by: wm4 <nfxjfg@googlemail.com>
3 years agotests/ffserver.regression.ref: Update ffserver checksums
Michael Niedermayer [Thu, 1 Dec 2016 16:37:34 +0000 (17:37 +0100)]
tests/ffserver.regression.ref: Update ffserver checksums

They have changed due to 122190392b297b7cd9783641d880df887fd80d07

Reviewed-by: "Reynaldo H. Verdejo Pinochet" <reynaldo@osg.samsung.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavformat/tests/fifo_muxer: includes libavformat/network.h to define ETIMEDOUT for...
Gregory J. Wolfe [Thu, 1 Dec 2016 18:35:02 +0000 (13:35 -0500)]
avformat/tests/fifo_muxer: includes libavformat/network.h to define ETIMEDOUT for fate build.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavfilter: add premultiply filter
Paul B Mahol [Mon, 28 Nov 2016 16:28:59 +0000 (17:28 +0100)]
avfilter: add premultiply filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agoswscale: add gbr(a)p16 output support
Paul B Mahol [Wed, 30 Nov 2016 21:45:08 +0000 (22:45 +0100)]
swscale: add gbr(a)p16 output support

3 years agoffserver: set format bitexact flag, eliminate warnings about it not being set
Michael Niedermayer [Thu, 1 Dec 2016 17:01:12 +0000 (18:01 +0100)]
ffserver: set format bitexact flag, eliminate warnings about it not being set

Tested-by: Reto Kromer <lists@reto.ch>
Reviewed-by: "Reynaldo H. Verdejo Pinochet" <reynaldo@osg.samsung.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agodoc/examples/transcode_aac: fix a typo
Александр Слободенюк [Wed, 30 Nov 2016 10:31:58 +0000 (13:31 +0300)]
doc/examples/transcode_aac: fix a typo

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoffmpeg: assert return value is initialized
Tobias Rapp [Thu, 24 Nov 2016 14:45:00 +0000 (15:45 +0100)]
ffmpeg: assert return value is initialized

Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agolavfi: Fix aix compilation.
Carl Eugen Hoyos [Tue, 29 Nov 2016 20:49:22 +0000 (21:49 +0100)]
lavfi: Fix aix compilation.

Rename hz in af_apulsator.c and avf_showspectrum.c as hertz.

The aix header sys/m_param.h defines hz as __hz.

3 years agoavcodec/vdpau_hevc: Fix potential out-of-bounds write
Philip Langdale [Thu, 1 Dec 2016 00:13:14 +0000 (16:13 -0800)]
avcodec/vdpau_hevc: Fix potential out-of-bounds write

The maximum number of references is 16, so the index value cannot
exceed 15.

Fixes Coverity CID 134813913481401348141

3 years agoavcodec/crystalhd: Handle errors from av_image_get_linesize
Philip Langdale [Thu, 1 Dec 2016 00:03:44 +0000 (16:03 -0800)]
avcodec/crystalhd: Handle errors from av_image_get_linesize

This function can return an error in certain situations.

Fixes Coverity CID 703707.

3 years agoffserver: fix broken HTML on generated status page
Reynaldo H. Verdejo Pinochet [Wed, 30 Nov 2016 18:28:16 +0000 (10:28 -0800)]
ffserver: fix broken HTML on generated status page

Dropped incompatible/obsoleted HTML tag attributes

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
3 years agotools/coverity: Add model for av_realloc
Philip Langdale [Wed, 30 Nov 2016 22:50:36 +0000 (14:50 -0800)]
tools/coverity: Add model for av_realloc

Really should have done this last time. It should provide consistency
across our allocations and frees.

3 years agoavcodec/h264: sse2 and avx 4:2:2 idct add8 10-bit functions
James Darnley [Mon, 28 Nov 2016 23:38:43 +0000 (00:38 +0100)]
avcodec/h264: sse2 and avx 4:2:2 idct add8 10-bit functions

Yorkfield:
 - sse2:
   - complex: 4.13x faster (1514 vs. 367 cycles)
   - simple:  4.38x faster (1836 vs. 419 cycles)

Skylake:
 - sse2:
   - complex: 3.61x faster ( 936 vs. 260 cycles)
   - simple:  3.97x faster (1126 vs. 284 cycles)
 - avx (versus sse2):
   - complex: 1.07x faster (260 vs. 244 cycles)
   - simple:  1.03x faster (284 vs. 274 cycles)

3 years agoavcodec/h264: mmx 4:2:2 idct add8 function
James Darnley [Mon, 28 Nov 2016 17:22:17 +0000 (18:22 +0100)]
avcodec/h264: mmx 4:2:2 idct add8 function

2.87 times faster (1830 vs. 638 cycles)

3 years agoavcodec/h264: mmxext 4:2:2 chroma intra deblock/loop filter
James Darnley [Mon, 28 Nov 2016 13:26:53 +0000 (14:26 +0100)]
avcodec/h264: mmxext 4:2:2 chroma intra deblock/loop filter

2.1 times faster (401 vs. 194 cycles)

3 years agoffserver: use codec time_base for stream
Andreas Cadhalpun [Wed, 30 Nov 2016 00:49:09 +0000 (01:49 +0100)]
ffserver: use codec time_base for stream

This fixes producing swf and rm files as done by ffservertest.

Reviewed-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
3 years agotests: drop -d option from ffserver invocation
Andreas Cadhalpun [Wed, 30 Nov 2016 00:29:40 +0000 (01:29 +0100)]
tests: drop -d option from ffserver invocation

It randomly causes failures with an error like:
"Failed to set value '-f' for option 'd': Error number -920332800 occurred"

(The error number is different every time.)

Reviewed-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
3 years agotests: print errors from ffserver
Andreas Cadhalpun [Wed, 30 Nov 2016 00:23:26 +0000 (01:23 +0100)]
tests: print errors from ffserver

Not doing so makes debugging unnecessarily hard.

Reviewed-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
3 years agotools/coverity: Add models for av_mallocz and av_free
Philip Langdale [Sun, 27 Nov 2016 19:16:18 +0000 (11:16 -0800)]
tools/coverity: Add models for av_mallocz and av_free

This should deal with some false positives, but might lead to
more of them depending on whether it realises that av_freep()
wraps av_free() or not.

3 years agofate: Add test for mov displaymatrix
Vittorio Giovara [Fri, 18 Nov 2016 19:34:43 +0000 (14:34 -0500)]
fate: Add test for mov displaymatrix

3 years agoffprobe: Fix displaying side data list only
Vittorio Giovara [Fri, 18 Nov 2016 19:32:02 +0000 (14:32 -0500)]
ffprobe: Fix displaying side data list only

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
3 years agomov: Evaluate the movie display matrix
Vittorio Giovara [Thu, 3 Nov 2016 22:52:08 +0000 (18:52 -0400)]
mov: Evaluate the movie display matrix

This matrix needs to be applied after all others have (currently only
display matrix from trak), but cannot be handled in movie box, since
streams are not allocated yet. So store it in main context, and apply
it when appropriate, that is after parsing the tkhd one.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
3 years agoavcodec/nvenc: mark intentional fall through
Timo Rothenpieler [Tue, 29 Nov 2016 16:44:16 +0000 (17:44 +0100)]
avcodec/nvenc: mark intentional fall through

3 years agoavfilter/vf_hwupload_cuda: fix potential leak
Timo Rothenpieler [Tue, 29 Nov 2016 16:40:18 +0000 (17:40 +0100)]
avfilter/vf_hwupload_cuda: fix potential leak

3 years agoavutil/hwcontext_cuda: check for missing pixel format
Timo Rothenpieler [Tue, 29 Nov 2016 16:37:13 +0000 (17:37 +0100)]
avutil/hwcontext_cuda: check for missing pixel format

3 years agoavfilter/vf_scale_npp: check ff_set_common_formats return value
Timo Rothenpieler [Tue, 29 Nov 2016 16:28:15 +0000 (17:28 +0100)]
avfilter/vf_scale_npp: check ff_set_common_formats return value

3 years agoavfilter/vf_scale_npp: move aspect ratio correction after av_frame_copy_props
Miroslav Slugeň [Sun, 27 Nov 2016 00:09:05 +0000 (01:09 +0100)]
avfilter/vf_scale_npp: move aspect ratio correction after av_frame_copy_props

Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
3 years agoavcodec/nvenc: always reduce DAR width and height
Miroslav Slugeň [Sun, 27 Nov 2016 00:46:06 +0000 (01:46 +0100)]
avcodec/nvenc: always reduce DAR width and height

Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
3 years agoavcodec/nvenc: Delay identification of underlying format of cuda frames
Philip Langdale [Fri, 25 Nov 2016 19:11:45 +0000 (11:11 -0800)]
avcodec/nvenc: Delay identification of underlying format of cuda frames

When input surfaces are cuda frames, we will not know what the actual
underlying format (nv12, p010, etc) is at surface allocation time.

On the other hand, we will know when the input frames are actually
registered and associated with a surface.

So, let's delay format discovery until registration time, which is
actually how we handle other frame properties, such as dimensions.

By itself, this change doesn't allow for transcoding of 10bit
content from cuvid, but it reduces the problem to the hardcoding of
the sw format in ffmpeg_cuvid.c

Signed-off-by: Philip Langdale <philipl@overt.org>
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
3 years agoffserver: Add client requested urls to the status page
Michael Niedermayer [Tue, 29 Nov 2016 21:19:50 +0000 (22:19 +0100)]
ffserver: Add client requested urls to the status page

Fixes Ticket3791

Reviewed-by: "Reynaldo H. Verdejo Pinochet" <reynaldo@osg.samsung.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavidec: fix leaking extradata
Andreas Cadhalpun [Mon, 28 Nov 2016 23:28:55 +0000 (00:28 +0100)]
avidec: fix leaking extradata

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
3 years agomatroskadec: prevent access of elements after freeing
Michael Schenk [Fri, 25 Nov 2016 08:36:20 +0000 (09:36 +0100)]
matroskadec: prevent access of elements after freeing

Using the decode interrupt feature of ffmpeg may cause crashes by
accessing previously freed pointers in matroska_read_close.

To prevent this reset nb_elem to zero after freeing the elements,
because ffmpeg normally tests for nb_elem.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
3 years agoavcodec/flac_parser: Update nb_headers_buffered
Michael Niedermayer [Thu, 24 Nov 2016 14:29:52 +0000 (15:29 +0100)]
avcodec/flac_parser: Update nb_headers_buffered

Fixes infinite loop
Fixes: fuzz.flac

Found-by: Frank Liberato <liberato@google.com>
Reviewed-by: Frank Liberato <liberato@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoidroqdec: fix leaking pkt on failure
Andreas Cadhalpun [Mon, 28 Nov 2016 23:43:27 +0000 (00:43 +0100)]
idroqdec: fix leaking pkt on failure

The code calls av_new_packet a few lines above and the allocated memory
has to be freed in case of an error.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
3 years agofate: update after addition of gray10 to lavc/raw
Paul B Mahol [Tue, 29 Nov 2016 23:06:53 +0000 (00:06 +0100)]
fate: update after addition of gray10 to lavc/raw

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agotests/ffserver-regression: Check the status page too
Michael Niedermayer [Tue, 29 Nov 2016 17:25:58 +0000 (18:25 +0100)]
tests/ffserver-regression: Check the status page too

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoffsrever: Make the status page bitexact if any stream is bitexact
Michael Niedermayer [Tue, 29 Nov 2016 18:05:43 +0000 (19:05 +0100)]
ffsrever: Make the status page bitexact if any stream is bitexact

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoffserver_config: Setup codecpar in add_codec()
Michael Niedermayer [Tue, 29 Nov 2016 17:48:40 +0000 (18:48 +0100)]
ffserver_config: Setup codecpar in add_codec()

fixes segfault in the status page code

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agotests/ffserver.regression.ref: update ffserver checksums
Michael Niedermayer [Mon, 28 Nov 2016 17:03:07 +0000 (18:03 +0100)]
tests/ffserver.regression.ref: update ffserver checksums

Reviewed-by: "Reynaldo H. Verdejo Pinochet" <reynaldo@osg.samsung.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agotests/ffserver-regression.sh: give wget a timeout and prevent retries
Michael Niedermayer [Mon, 28 Nov 2016 17:02:37 +0000 (18:02 +0100)]
tests/ffserver-regression.sh: give wget a timeout and prevent retries

Reviewed-by: "Reynaldo H. Verdejo Pinochet" <reynaldo@osg.samsung.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavformat/idroqdec: Check chunk_size for being too large
Michael Niedermayer [Tue, 29 Nov 2016 01:58:34 +0000 (02:58 +0100)]
avformat/idroqdec: Check chunk_size for being too large

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavfilter/vf_masked*: add gray10 and gray12 support
Paul B Mahol [Tue, 29 Nov 2016 15:50:38 +0000 (16:50 +0100)]
avfilter/vf_masked*: add gray10 and gray12 support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agoavfilter/vf_bitplanenoise: add gray10 and gray12 suppport
Paul B Mahol [Tue, 29 Nov 2016 15:32:33 +0000 (16:32 +0100)]
avfilter/vf_bitplanenoise: add gray10 and gray12 suppport

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agoavfilter/vf_extractplanes: add extract support for 10bit and 12bit formats
Paul B Mahol [Tue, 29 Nov 2016 13:49:01 +0000 (14:49 +0100)]
avfilter/vf_extractplanes: add extract support for 10bit and 12bit formats

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agoavfilter/vf_waveform: add gray10 and gray12 support
Paul B Mahol [Tue, 29 Nov 2016 10:34:48 +0000 (11:34 +0100)]
avfilter/vf_waveform: add gray10 and gray12 support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agoavcodec/raw: add gray10 support in nut
Paul B Mahol [Tue, 29 Nov 2016 10:18:54 +0000 (11:18 +0100)]
avcodec/raw: add gray10 support in nut

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agoavcodec/msrledec: implement vertical offset in 4-bit RLE
Daniel Verkamp [Tue, 29 Nov 2016 09:54:56 +0000 (10:54 +0100)]
avcodec/msrledec: implement vertical offset in 4-bit RLE

The delta escape (2) is supposed to work the same in 4-bit RLE as in
8-bit RLE.  This is documented in the MSDN Bitmap Compression page:
https://msdn.microsoft.com/en-us/library/windows/desktop/dd183383(v=vs.85).aspx

The unchecked modification of line is safe, since the loop condition
(line >= 0) will check it before any pixel data is written.

Fixes ticket #5153 (output now matches ImageMagick for the provided sample).

Signed-off-by: Daniel Verkamp <daniel@drv.nu>
3 years agotests: Fix running ffserver under qemu
Michael Niedermayer [Mon, 28 Nov 2016 22:28:52 +0000 (23:28 +0100)]
tests: Fix running ffserver under qemu

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agotests/Makefile: Fix ffservertest dependencies
Michael Niedermayer [Mon, 28 Nov 2016 22:07:19 +0000 (23:07 +0100)]
tests/Makefile: Fix ffservertest dependencies

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoffserver: Remove last use of AVStream size
Michael Niedermayer [Sun, 27 Nov 2016 18:13:56 +0000 (19:13 +0100)]
ffserver: Remove last use of AVStream size

Reviewed-by: "Reynaldo H. Verdejo Pinochet" <reynaldo@osg.samsung.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoffserver: Remove some deprecated API use related to codec/codecpar
Michael Niedermayer [Sun, 27 Nov 2016 17:05:07 +0000 (18:05 +0100)]
ffserver: Remove some deprecated API use related to codec/codecpar

Reviewed-by: "Reynaldo H. Verdejo Pinochet" <reynaldo@osg.samsung.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoffserver: Remove use of AVStream as a intermediate to store parameters
Michael Niedermayer [Sun, 27 Nov 2016 16:42:50 +0000 (17:42 +0100)]
ffserver: Remove use of AVStream as a intermediate to store parameters

Reviewed-by: "Reynaldo H. Verdejo Pinochet" <reynaldo@osg.samsung.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoffserver: drop FeedData, its unused
Michael Niedermayer [Sun, 27 Nov 2016 16:10:18 +0000 (17:10 +0100)]
ffserver: drop FeedData, its unused

Reviewed-by: "Reynaldo H. Verdejo Pinochet" <reynaldo@osg.samsung.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agotests/ffserver-regression.sh: Fix file truncation introduced in 508826f961caf662cadb7...
Michael Niedermayer [Mon, 28 Nov 2016 17:36:16 +0000 (18:36 +0100)]
tests/ffserver-regression.sh: Fix file truncation introduced in 508826f961caf662cadb7c253e3c0e7d75104bdd

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agolibvpxenc: Report encoded VP9 level
Alex Converse [Fri, 18 Nov 2016 21:56:32 +0000 (13:56 -0800)]
libvpxenc: Report encoded VP9 level

Report the actual level of the encoded output if a level is
targeted or the level is passively tracked with a target of 0.

3 years agovf_colorspace: Forbid odd dimensions
Vittorio Giovara [Thu, 17 Nov 2016 20:51:16 +0000 (15:51 -0500)]
vf_colorspace: Forbid odd dimensions

This prevents writing past bounds.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
3 years agoffmpeg_opt: Fix starttime with ffm in bitexact mode
Michael Niedermayer [Mon, 28 Nov 2016 15:56:12 +0000 (16:56 +0100)]
ffmpeg_opt: Fix starttime with ffm in bitexact mode

This fixes some differences between runs of the ffserver tests
(in my local tree 2 runs gave the same result with this but i had other
 changes too)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agopngdec: check if previous frame exists instead of trusting sequence_number
Andreas Cadhalpun [Fri, 25 Nov 2016 21:09:51 +0000 (22:09 +0100)]
pngdec: check if previous frame exists instead of trusting sequence_number

This fixes a segmentation fault caused by calling memcpy with NULL as
second argument in handle_p_frame_apng.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
3 years agotests/ffserver.conf: Force bitexactness in the ffmpeg command
Michael Niedermayer [Sun, 27 Nov 2016 19:48:28 +0000 (20:48 +0100)]
tests/ffserver.conf: Force bitexactness in the ffmpeg command

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavformat/rmenc: Check framerate before storing
Michael Niedermayer [Sun, 27 Nov 2016 20:01:06 +0000 (21:01 +0100)]
avformat/rmenc: Check framerate before storing

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agolavfi/f_ebur128: relicense to LGPL
Clément Bœsch [Sat, 26 Nov 2016 16:01:50 +0000 (17:01 +0100)]
lavfi/f_ebur128: relicense to LGPL

All copyright holders have agreed to the relicensing.

Approved-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Approved-by: David Sedacca <sedacca@comcast.net>
Approved-by: Ganesh Ajjanagadde <gajjanag@mit.edu>
Approved-by: Jean First <jeanfirst@gmail.com>
Approved-by: Kyle Swanson <k@ylo.ph>
Approved-by: Michael Niedermayer <michael@niedermayer.cc>
Approved-by: Nicolas George <george@nsup.org>
Approved-by: Paul B Mahol <onemda@gmail.com>
Approved-by: Thilo Borgmann <thilo.borgmann@mail.de>
3 years agoavcodec/me_cmp: Fix median_sad size
Michael Niedermayer [Sun, 27 Nov 2016 13:34:57 +0000 (14:34 +0100)]
avcodec/me_cmp: Fix median_sad size

Fixes out of array read
Fixes: COV1396255

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoffserver: Remove extract_mpeg4_header()
Michael Niedermayer [Wed, 23 Nov 2016 17:40:25 +0000 (18:40 +0100)]
ffserver: Remove extract_mpeg4_header()

This should not be needed, our AVParsers should do this
I do not have a testcase though, please help testing this and please
add fate tests if you can.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoRevert "ffserver: use AVStream.codecpar in open_input_stream()"
Michael Niedermayer [Wed, 23 Nov 2016 18:26:38 +0000 (19:26 +0100)]
Revert "ffserver: use AVStream.codecpar in open_input_stream()"

Fixes null pointer dereference

Testcase is simply a ffmpeg instance sending a stream to ffserver while another ffmpeg reads from it

This reverts commit 6f0a1710d77dde0d803861506a2157a23f08c14c.

3 years agoconfigure: check for stdatomic.h
Anton Khirnov [Thu, 24 Nov 2016 05:54:53 +0000 (21:54 -0800)]
configure: check for stdatomic.h

Since this is a C11 feature, it requires -std=c11.

Not actually used for anything yet, that will be added in the following
commits.

This merges libav commit 13f5d2bf75b95a0bfdb9940a5e359a719e242bed.

Signed-off-by: Wan-Teh Chang <wtc@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavfilter/vf_zscale: export approximate gamma option and enable it by default
Paul B Mahol [Sun, 27 Nov 2016 10:43:54 +0000 (11:43 +0100)]
avfilter/vf_zscale: export approximate gamma option and enable it by default

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agoavformat/utils: Fix type mismatch
Michael Niedermayer [Sun, 27 Nov 2016 02:39:20 +0000 (03:39 +0100)]
avformat/utils: Fix type mismatch

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agolavf: always forward codec_whitelist in avformat_find_stream_info
Andreas Cadhalpun [Fri, 25 Nov 2016 20:56:03 +0000 (21:56 +0100)]
lavf: always forward codec_whitelist in avformat_find_stream_info

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
3 years agodxva2_vc1: support multiple slices
Hendrik Leppkes [Tue, 15 Nov 2016 09:28:54 +0000 (10:28 +0100)]
dxva2_vc1: support multiple slices

3 years agovc1dec: support multiple slices in frame coded images with hwaccel
Hendrik Leppkes [Tue, 15 Nov 2016 09:28:10 +0000 (10:28 +0100)]
vc1dec: support multiple slices in frame coded images with hwaccel

Based on a patch by Jun Zhao <mypopydev@gmail.com>

3 years agorefine avformat/flvdec set bit_rate
Steven Liu [Sat, 26 Nov 2016 03:28:22 +0000 (11:28 +0800)]
refine avformat/flvdec set bit_rate

3 years agoavformat/flvdec: move set bit_rate from parse AMF OBJECT to
Steven Liu [Sat, 26 Nov 2016 00:56:18 +0000 (08:56 +0800)]
avformat/flvdec: move set bit_rate from parse AMF OBJECT to
 create_stream

before patch:
Stream #0:0: Video: h264 (High), yuv420p(progressive), 1280x714 [SAR 1:1 DAR 640:357], 25 fps, 25 tbr, 1k tbn, 50 tbc

after patch:
Stream #0:0: Video: h264 (High), yuv420p(progressive), 1280x714 [SAR 1:1 DAR 640:357], 2576 kb/s, 25 fps, 25 tbr, 1k tbn, 50 tbc

Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavformat/flvenc: fix ticket 5976 and use old commit
Steven Liu [Sat, 26 Nov 2016 00:52:19 +0000 (08:52 +0800)]
avformat/flvenc: fix ticket 5976 and use old commit

mythtv have problem with non-seekable dont write duration and filesize
and there have problem with some other server and player with 0 value
duation and filesize.
So add a flv flags to fix the ticket and make a choose for users.

Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
3 years agoswresample/soxr: fix invalid use of linear_interp
Muhammad Faiz [Fri, 25 Nov 2016 09:39:34 +0000 (16:39 +0700)]
swresample/soxr: fix invalid use of linear_interp

give very bad quality for soxr resampler.
linear_interp is intended for  using linear interpolation
between filter bank so quality will be better.

i guess this is misunderstood as 'do not use filter bank,
but directly interpolate linearly between samples'.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
3 years agoavcodec/aac_adtstoasc_bsf: validate and forward extradata if the stream is already ASC
James Almer [Fri, 25 Nov 2016 00:10:47 +0000 (21:10 -0300)]
avcodec/aac_adtstoasc_bsf: validate and forward extradata if the stream is already ASC

Fixes ticket #5973

Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
3 years agomss2: only use error correction for matching block counts
Andreas Cadhalpun [Thu, 24 Nov 2016 22:57:46 +0000 (23:57 +0100)]
mss2: only use error correction for matching block counts

This fixes a heap-buffer-overflow in ff_er_frame_end when decoding mss2
with coded_width/coded_height larger than width/height.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
3 years agoavcodec/nvenc: Remove aspect-ratio decompensation logic
Philip Langdale [Wed, 23 Nov 2016 22:05:18 +0000 (14:05 -0800)]
avcodec/nvenc: Remove aspect-ratio decompensation logic

This dubious behaviour in nvenc was finally removed by nvidia, and
as we refuse to run on anything older than 7.0, we don't need to
keep it around for old versions.

3 years agoavcodec/mpeg4audio: correctly propagate meaningful error values
James Almer [Fri, 25 Nov 2016 13:40:59 +0000 (10:40 -0300)]
avcodec/mpeg4audio: correctly propagate meaningful error values

Signed-off-by: James Almer <jamrial@gmail.com>
3 years agolavf/flvdec: Set avg_frame_rate for video streams.
Carl Eugen Hoyos [Fri, 25 Nov 2016 10:06:14 +0000 (11:06 +0100)]
lavf/flvdec: Set avg_frame_rate for video streams.

Requested-by: qw, applemax82 at 163 dot com
Reviewed-by: Steven Liu
3 years agoMAINTAINERS: Add Vittorio to "Developers with git write access who are currently...
Michael Niedermayer [Wed, 23 Nov 2016 11:04:27 +0000 (12:04 +0100)]
MAINTAINERS: Add Vittorio to "Developers with git write access who are currently not maintaining any specific part"

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoMAINTAINERS: Add developers who have git write access but are otherwise not listed
Michael Niedermayer [Mon, 21 Nov 2016 17:22:03 +0000 (18:22 +0100)]
MAINTAINERS: Add developers who have git write access but are otherwise not listed

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agosoftfloat: decrease MIN_EXP to cover full float range
Andreas Cadhalpun [Thu, 24 Nov 2016 23:26:51 +0000 (00:26 +0100)]
softfloat: decrease MIN_EXP to cover full float range

floats are not necessarily normalized, so a normalized softfloat needs
MIN_EXP lowered by 23 to cover that range.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
3 years agofate/exr: add test for pxr24 with half and uint32 channel
Martin Vignali [Thu, 17 Nov 2016 20:25:19 +0000 (21:25 +0100)]
fate/exr: add test for pxr24 with half and uint32 channel

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
3 years agolibavcodec/exr: add support for uint32 channel decoding with pxr24
Martin Vignali [Thu, 17 Nov 2016 20:24:42 +0000 (21:24 +0100)]
libavcodec/exr: add support for uint32 channel decoding with pxr24

Doesn't decode the uint32 layer, but decodes the half part of the file.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
3 years agolibopusdec: default to stereo for invalid number of channels
Andreas Cadhalpun [Mon, 14 Nov 2016 20:41:45 +0000 (21:41 +0100)]
libopusdec: default to stereo for invalid number of channels

This fixes an out-of-bounds read if avc->channels is 0.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
3 years agoflvdec: require need_context_update when changing codec id
Andreas Cadhalpun [Fri, 4 Nov 2016 20:37:13 +0000 (21:37 +0100)]
flvdec: require need_context_update when changing codec id

Otherwise the codec context and codecpar might disagree on the codec id,
triggering asserts in av_parser_parse2.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
3 years agoswresample/resample: optimize exact_rational=on:linear_interp=on case
Muhammad Faiz [Thu, 24 Nov 2016 08:02:07 +0000 (15:02 +0700)]
swresample/resample: optimize exact_rational=on:linear_interp=on case

separate dsp.resample to dsp.resample_common and dsp.resample_linear
and choose to call faster resample_common even when linear_interp=on
when c->frac and c->dst_incr_mod are both zero

speed up resampling when exact_rational and linear_interp are both
enabled because exact_rational force c->frac and c->dst_incr_mod to
be zero when soft compensation does not happen

benchmark on exact_rational=on:linear_interp=on
        old     new
real    8.432s  5.097s
user    7.679s  4.989s
sys     0.125s  0.107s

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
3 years agofate/swresample: add resample exact_lin and exact_lin_async test
Muhammad Faiz [Wed, 23 Nov 2016 20:30:25 +0000 (03:30 +0700)]
fate/swresample: add resample exact_lin and exact_lin_async test

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
3 years agoavutil/tests: add cpu_init to .gitignore and tests/fate
Wan-Teh Chang [Wed, 23 Nov 2016 23:08:20 +0000 (15:08 -0800)]
avutil/tests: add cpu_init to .gitignore and tests/fate

This is a follow-up to commit d84a21207ea83055dc9b6dc1cd6a379f2ea756e7,
which added the libavutil/tests/cpu_init.c.

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