highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
82,743 Commits 36 Branches 392 Tags
5cd3ea1cc0802324a06815e056ed5294719ed3cc
Commit Graph

82743 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
5cd3ea1cc0 avformat/ffmdec: Remove some st->codec uses which set encoder parameters 
Modern ffserver should not need these

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-12-03 14:05:15 +01:00
Carl Eugen Hoyos
6c059bb2af configure: Fix standalone compilation of the rtp muxer. 
Reported and suggested by: me at juneoh dot net

Fixes ticket #5989.
 2016-12-03 12:54:50 +01:00
Michael Niedermayer
afcf15b0db avformat/oggparsespeex: Check frames_per_packet and packet_size 
The speex specification does not seem to restrict these values, thus
the limits where choosen so as to avoid multiplicative overflow

Fixes undefined behavior
Fixes: 635422.ogg

Found-by: Matt Wolenetz <wolenetz@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-12-03 03:59:13 +01:00
Michael Niedermayer
90da187f1d avformat/utils: Check start/end before computing duration in update_stream_timings() 
Fixes undefined behavior
Fixes: 637428.ogg

Found-by: Matt Wolenetz <wolenetz@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-12-03 03:59:13 +01:00
James Almer
f88c8e0dc3 compat/atomics: rename header guards 
Fixes fate-source.

Signed-off-by: James Almer <jamrial@gmail.com>
 2016-12-02 20:08:54 -03:00
James Almer
b5a0b85721 fate: rename fate-mov-init-nonkeyframe ref file 
Fixes the test. Regression since 059a786c20

Signed-off-by: James Almer <jamrial@gmail.com>
 2016-12-02 20:06:17 -03:00
Vittorio Giovara
25fcbf7a84 hevc: Support extradata changes 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2016-12-02 15:04:24 -05:00
Vittorio Giovara
46fae40d25 hevc: Allow parsing external extradata buffers 2016-12-02 15:03:24 -05:00
Vittorio Giovara
059a786c20 fate/mov: Rename a couple of entries to respect the file naming scheme 2016-12-02 15:03:06 -05:00
Anton Khirnov
41e891e89e Add a compat dummy stdatomic.h used when threading is disabled 
Adapted from the code by Rémi Denis-Courmont from VLC

This merges libav commit eb34d40354.

Signed-off-by: Wan-Teh Chang <wtc@google.com>
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-12-02 16:25:18 -03:00
Anton Khirnov
74b5f10862 Add a compat stdatomic.h implementation based on pthreads 
Adapted from the code by Rémi Denis-Courmont from VLC

This merges libav commit f9a6a80e06.

Signed-off-by: Wan-Teh Chang <wtc@google.com>
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-12-02 16:25:18 -03:00
Anton Khirnov
70faadc826 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 bb81ed4765.

Signed-off-by: Wan-Teh Chang <wtc@google.com>
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-12-02 16:25:18 -03:00
Anton Khirnov
c91e72ed52 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 c2755864af.

Signed-off-by: Wan-Teh Chang <wtc@google.com>
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-12-02 16:25:17 -03:00
Anton Khirnov
3359eede8f 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 4e928ef340.

Signed-off-by: Wan-Teh Chang <wtc@google.com>
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-12-02 16:25:17 -03:00
Michael Niedermayer
4059cd3952 avformat/ffmenc: Remove the last use of st->codec 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-12-02 19:37:00 +01:00
Michael Niedermayer
78519a0029 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>
 2016-12-02 19:37:00 +01:00
Michael Niedermayer
e8215b77ff avformat/ffmenc: set bitexact mode for old API without accessing the encoder 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-12-02 19:37:00 +01:00
Michael Niedermayer
c06d4f2ced 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>
 2016-12-02 19:37:00 +01:00
Michael Niedermayer
b7d94c19cd 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>
 2016-12-02 19:37:00 +01:00
Michael Niedermayer
7d1b1b660b avfilter/vf_premultiply: remove redundant semicolons 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-12-02 19:37:00 +01:00
Rainer Hochecker
7a9db61da3 matroskadec: partly revert "demux relevant subtitle packets after a seek" 
This reverts parts of c16582579b. 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>
 2016-12-02 13:59:17 +01:00
Michael Niedermayer
89092fafdd tests/ffserver.regression.ref: Update ffserver checksums 
They have changed due to 122190392b

Reviewed-by: "Reynaldo H. Verdejo Pinochet" <reynaldo@osg.samsung.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-12-01 23:43:31 +01:00
Gregory J. Wolfe
9c041a3cd5 avformat/tests/fifo_muxer: includes libavformat/network.h to define ETIMEDOUT for fate build. 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-12-01 23:42:50 +01:00
Paul B Mahol
6e713841e8 avfilter: add premultiply filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-12-01 22:12:21 +01:00
Paul B Mahol
6427c9ffee swscale: add gbr(a)p16 output support 2016-12-01 21:37:25 +01:00
Michael Niedermayer
fbdf8f176e 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>
 2016-12-01 20:07:14 +01:00
Александр Слободенюк
3aa1ff30f3 doc/examples/transcode_aac: fix a typo 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-12-01 12:53:45 +01:00
Tobias Rapp
4d57ca51d7 ffmpeg: assert return value is initialized 
Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-12-01 12:01:51 +01:00
Carl Eugen Hoyos
d44af9a38e 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.
 2016-12-01 09:53:38 +01:00
Philip Langdale
4e6d1c1f4e 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 1348139, 1348140, 1348141
 2016-11-30 16:14:39 -08:00
Philip Langdale
5512dbe37f avcodec/crystalhd: Handle errors from av_image_get_linesize 
This function can return an error in certain situations.

Fixes Coverity CID 703707.
 2016-11-30 16:14:39 -08:00
Reynaldo H. Verdejo Pinochet
b5c899ab5e 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>
 2016-11-30 15:47:49 -08:00
Philip Langdale
fdb124001e tools/coverity: Add model for av_realloc 
Really should have done this last time. It should provide consistency
across our allocations and frees.
 2016-11-30 15:21:57 -08:00
James Darnley
13d71c28cc 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)
 2016-11-30 22:58:28 +01:00
James Darnley
1dae7ffa0b avcodec/h264: mmx 4:2:2 idct add8 function 
2.87 times faster (1830 vs. 638 cycles)
 2016-11-30 22:58:27 +01:00
James Darnley
815ea8c6cc avcodec/h264: mmxext 4:2:2 chroma intra deblock/loop filter 
2.1 times faster (401 vs. 194 cycles)
 2016-11-30 22:58:27 +01:00
Andreas Cadhalpun
122190392b 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>
 2016-11-30 22:38:10 +01:00
Andreas Cadhalpun
7f034a02cd 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>
 2016-11-30 22:38:10 +01:00
Andreas Cadhalpun
0bd227e31c 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>
 2016-11-30 22:38:10 +01:00
Philip Langdale
5eb6852063 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.
 2016-11-30 13:27:43 -08:00
Vittorio Giovara
115b834dcf fate: Add test for mov displaymatrix 2016-11-30 12:19:30 -05:00
Vittorio Giovara
33f7f636ff ffprobe: Fix displaying side data list only 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2016-11-30 12:19:14 -05:00
Vittorio Giovara
7010ebdf1f 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>
 2016-11-30 12:18:58 -05:00
Timo Rothenpieler
c2f3af57a5 avcodec/nvenc: mark intentional fall through 2016-11-30 12:36:23 +01:00
Timo Rothenpieler
7dafb3a25a avfilter/vf_hwupload_cuda: fix potential leak 2016-11-30 12:36:23 +01:00
Timo Rothenpieler
52773a2c68 avutil/hwcontext_cuda: check for missing pixel format 2016-11-30 12:36:23 +01:00
Timo Rothenpieler
88281a5256 avfilter/vf_scale_npp: check ff_set_common_formats return value 2016-11-30 12:36:23 +01:00
Miroslav Slugeň
1d056dd855 avfilter/vf_scale_npp: move aspect ratio correction after av_frame_copy_props 
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
 2016-11-30 12:36:23 +01:00
Miroslav Slugeň
f2dd6aee80 avcodec/nvenc: always reduce DAR width and height 
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
 2016-11-30 12:36:23 +01:00
Philip Langdale
27038693bb 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>
 2016-11-30 12:36:23 +01:00