videolan/ffmpeg
1
Fork 0
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-09-13 10:39:08 +02:00
Code Releases Activity
85,703 Commits 36 Branches 398 Tags 244 MiB
f7542d7e35
Commit Graph

6357 Commits

Author SHA1 Message Date
Clément Bœsch
ca6f0f85bb Merge commit '85baef4ff1512bcc2544928bfa5f42072903a691' 
* commit '85baef4ff1512bcc2544928bfa5f42072903a691':
  vf_drawtext: Move static keyword to beginning of variable declaration

This commit is mostly a noop, see:
d9e2aceb7f
6d7aa437e1

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-29 14:26:57 +02:00
Clément Bœsch
473f0f75a1 lavfi: fix race when func rets holder is NULL 
If ret is NULL, a dummy common holder is created to hold *all* the
parallel function returns, which gets written concurrently. This commit
simplify the whole logic by simply not writing to that holder when not
set.
 2017-03-28 23:47:24 +02:00
Rostislav Pehlivanov
a8fe8d6b4a lavfi: remove af_asynts filter 
Long overdue for removal, af_aresample should be used instead.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
 2017-03-27 14:06:16 +01:00
Michael Niedermayer
eaf6f10f1b avfilter/vf_signature: Replace uncommon spelling of seperate 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-03-26 20:34:47 +02:00
James Almer
963cd953fb avfilter: stop using deprecated codec flags 
Signed-off-by: James Almer <jamrial@gmail.com>
 2017-03-25 21:37:06 -03:00
Kieran Kunhya
4cca2f74f2 vf_drawtext: Fix memory leak 2017-03-21 12:15:50 +00:00
Gerion Entrup
5e3a418b60 add signature filter for MPEG7 video signature 
This filter does not implement all features of MPEG7. Missing features:
- compression of signature files
- work only on (cropped) parts of the video

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-03-21 00:11:08 +01:00
Clément Bœsch
bc1023eb36 Merge commit 'bdf7610eb266fd3de650040c97328791868abd82' 
* commit 'bdf7610eb266fd3de650040c97328791868abd82':
  vf_scale_vaapi: Crop input surface to active region

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-20 16:44:53 +01:00
Rostislav Pehlivanov
3796fb2692 lavfi: deprecate AVFilterGraph->resample_lavr_opts 
Not used by anything at all since we don't auto insert lavr filters.

Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
 2017-03-18 07:37:35 +00:00
Alexis Ballier
bbc8f3d20e lavf/vf_framerate: Fix frame leak when increasing framerate. 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-03-16 16:16:05 +01:00
Paul B Mahol
62c8dc4642 avfilter/vf_lut3d: actually skip lines when encountering DOMAIN_ string 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-03-13 15:30:05 +01:00
Jun Zhao
bf238a6a3c vf_hwupload: Add missing return value check 
Add missing return value checks to suppress build warning and
remove noop ff_formats_unref() calling.

Note: most filters using ff_formats_ref() didn't have a suitable
error handling, it's a potential memory leak issue.

Signed-off-by: Jun Zhao <jun.zhao@intel.com>
Signed-off-by: Mark Thompson <sw@jkqxz.net>
 2017-03-12 18:12:30 +00:00
Mark Thompson
b9acc7fbd9 Merge commit 'ad71d3276fef0ee7e791e62bbfe9c4e540047417' 
* commit 'ad71d3276fef0ee7e791e62bbfe9c4e540047417':
  lavfi: add a QSV deinterlacing filter

Minor fixup for lavfi differences.

Merged-by: Mark Thompson <sw@jkqxz.net>
 2017-03-12 17:00:42 +00:00
Anton Khirnov
807a3b30d2 lavfi: add a QSV scaling filter 
This merges libav commit ac7bfd6967,
which was previously skipped.

(cherry picked from commit ac7bfd6967)
Signed-off-by: Mark Thompson <sw@jkqxz.net>
 2017-03-12 15:02:33 +00:00
Muhammad Faiz
0bab78f7e7 avfilter/af_firequalizer: add av_restrict on convolution func 
slightly improved speed

Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
 2017-03-12 03:21:55 +07:00
Moritz Barsnick
114bbb0b74 libavfilter/avf_showwaves: make sqrt and cbrt scale option values available to showwavespic by name 
The 'sqrt' and 'cbrt' scalers were added in commit
80262d8c86, but their symbolic option values
only made available to the showwaves filter, not showwavespic, despite
the scalers working properly by their numerical option values.

Signed-off-by: Moritz Barsnick <barsnick@gmx.net>
 2017-03-11 11:55:57 +01:00
Muhammad Faiz
af7010ad05 avfilter/allfilters: make avfilter_register_all thread safe 
use ff_thread_once

Suggested-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
 2017-03-07 20:34:44 +07:00
Paul B Mahol
dbc7f02a72 avfilter/aeval: trim last frame's number of samples to match requested duration 
Fixes #6181.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-02-25 19:53:14 +01:00
Mark Thompson
359586f14f lavfi: Add VAAPI deinterlacer 
(cherry picked from commit ade370a4d7)
(cherry picked from commit 2d518aec4c)
 2017-02-23 22:08:26 +00:00
Rostislav Pehlivanov
42959044ac lavfi/buffersrc: fix directly setting channel layout 
When setting the channel layout directly using AVBufferSrcParameters
the channel layout was correctly set however the init function still
expected the old string format to set the number of channels (when it
hadn't already been specified).

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
 2017-02-21 16:25:47 +00:00
Pavel Koshevoy
947fdad92d avfilter/af_atempo: fix drift calculation, ticket #6157 
ticket #6157

Reported-by: Steven Liu <lq@chinaffmpeg.org>
Signed-off-by: Pavel Koshevoy <pkoshevoy@gmail.com>
 2017-02-20 10:51:28 +08:00
Marton Balint
a9f3e4b138 avfilter/f_setcmd: fix null pointer dereference on using dash as interval 
Fixes Coverity CID 1396259.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2017-02-19 16:43:53 +01:00
Paul B Mahol
aa234698e9 avfilter/vf_lut: make it possible to clip pixel values that are out of valid range 
Previous behavior was not useful at all as such pixels where all mapped to 0.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-02-13 22:54:21 +01:00
Paul B Mahol
72864547f9 avfilter/vf_lut: do not always explicitly clip pixels 
Old behaviour was not useful at all. New behaviour only emulate
old behaviour with default options.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-02-13 22:54:20 +01:00
Carl Eugen Hoyos
350ce0b9d3 lavfi/minterpolate: Remove an unused variable. 2017-02-11 16:38:56 +01:00
Maksym Veremeyenko
8efb7f5a26 avfilter/vf_scale: Fix chroma positioning for 4:2:0 pixel format 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-02-07 21:32:26 +01:00
Michael Niedermayer
4fcdc9f359 avfilter/vf_midequalizer: Remove duplicate include 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-02-06 10:45:01 +01:00
Marton Balint
e57fd926b0 avfilter/af_pan: fix null pointer dereference on empty token 
Fixes Coverity CID 1396254.

Signed-off-by: Marton Balint <cus@passwd.hu>
 2017-02-05 22:49:04 +01:00
Mark Thompson
326b1ed93e vf_scale_vaapi: Add missing return value checks 
Fixes CID 1374119.
 2017-02-05 15:13:16 +00:00
Marton Balint
fd57f70c97 avfilter/ebur128: fix relative threshold calculation for multiple contexts 
This reworks the code a bit and also disallows NULL contexts.

Fixes Coverity CID 1396273, 1396279.

Signed-off-by: Marton Balint <cus@passwd.hu>
 2017-02-04 23:54:18 +01:00
Marton Balint
a91cedf79a avfilter/ebur128: do not allow null ebur128 context in ff_ebur128_relative_threshold 
The user should supply a proper context.

Fixes Coverity CID 1396246.

Signed-off-by: Marton Balint <cus@passwd.hu>
 2017-02-04 23:54:17 +01:00
Paul B Mahol
012dd8c99a avfilter: add midequalizer filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-02-04 14:47:33 +01:00
Michael Niedermayer
c347b28699 avfilter/vf_unsharp: Free out AVFrame on error 
Fixes memleak
Fixes part of CID1197065

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-02-03 21:52:22 +01:00
Michael Niedermayer
19f567208c avfilter/vf_perspective: Free out AVFrame on error 
Fixes memleak
Fixes part of CID1197065

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-02-03 21:52:22 +01:00
Michael Niedermayer
21a07ac191 avfilter/vf_fieldhint: Free out AVFrame on error 
Fixes memleak
Fixes part of CID1197065

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-02-03 21:52:22 +01:00
Michael Niedermayer
15b2c37d5e avfilter/vf_deshake: Free out AVFrame on error 
Fixes memleak
Fixes part of CID1197065

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-02-03 21:52:22 +01:00
Michael Niedermayer
3edbc2408b avfilter/vf_ciescope: Free out AVFrame on error 
Fixes memleak
Fixes part of CID1197065

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-02-03 21:52:22 +01:00
Aman Gupta
037bb4021c avfilter/scale: refactor common code for scaling height/width expressions 
Implements support for height/width expressions in vf_scale_vaapi,
by refactoring common code into a new libavfilter/scale.c

Signed-off-by: Mark Thompson <sw@jkqxz.net>
 2017-02-02 22:58:54 +00:00
Paul B Mahol
3405d6c7bc avfilter/overlay: add gbrp output format 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-01-31 10:54:03 +01:00
Paul B Mahol
acf1dd5b74 avfilter: add threshold filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-01-30 18:44:08 +01:00
Muhammad Faiz
c4a3526b57 avfilter/showcqt: make minimum timeclamp option lower 
high basefreq does not require high timeclamp

Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
 2017-01-30 05:41:49 +07:00
Nicolas George
383057f8e7 lavfi: make ff_framequeue_skip_samples() more useful. 
Instead of just updating statistics and leaving the work to the
call site, have it actually do the work.

Also: skip the samples by updating the frame data pointers
instead of moving the samples. More efficient and avoid writing
into shared frames.
Found-By: Muhammad Faiz <mfcc64@gmail.com>
 2017-01-29 18:53:11 +01:00
Paul B Mahol
c6f7f33eec avfilter/vf_remap: add . at end of long description 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-01-29 13:29:33 +01:00
Michael Niedermayer
6294247730 avfilter/vf_gblur: Increase supported pixel count from 31bit to 32bit in filter_postscale() 
Fixes CID1396252

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-01-27 22:16:37 +01:00
Paul B Mahol
836c8750b3 avfilter/avf_showspectrum: fix 2 possible crashes 
Make sure no division by zero is done.
Make sure there are actually samples available.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-01-27 13:37:00 +01:00
Paul B Mahol
ee8e00b703 avfilter: add abitscope multimedia filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-01-26 16:21:25 +01:00
Marton Balint
977fd88419 avfilter/formats: do not allow unknown layouts in ff_parse_channel_layout if nret is not set 
Current code returned the number of channels as channel layout in that case,
and if nret is not set then unknown layouts are typically not supported.

Also use the common parsing code. Use a temporary workaround to parse an
unknown channel layout such as '13c', after a 1 year grace period only '13C'
will work.

Signed-off-by: Marton Balint <cus@passwd.hu>
 2017-01-24 23:51:36 +01:00
Paul B Mahol
08e5732318 avfilter: add EIA-608 line extractor 
Signed-off-by: Dave Rice <dave@dericed.com>
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-01-24 10:20:10 +01:00
Michael Niedermayer
0a5add45c7 avfilter/af_hdcd: Fix leak of memory allocated by ff_make_format_list() 
Fixes CID1396265

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-01-22 02:28:53 +01:00
Michael Niedermayer
61164112a5 avfilter/avf_showspectrum: Fix memleak of text allocated by av_asprintf() 
Fixes CID1396261

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-01-21 23:07:02 +01:00
Michael Niedermayer
e740e9c798 avfilter/vf_palettegen: Fix leak and simplify code 
Fixes CID1270818

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-01-21 22:40:14 +01:00
Michael Niedermayer
5f2b360fc0 avfilter/avfiltergraph: Add assert to write down in machine readable form what is assumed about sample rates in swap_samplerates_on_filter() 
Fixes CID1397292

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-01-21 01:35:52 +01:00
Steven Liu
90096e42e1 avfilter:vf_drawtext: add new line space size set parameter 
add line_spacing parameter to set the space between two lines

Based on an idea by: Leandro Santiago <leandrosansilva@gmail.com>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
 2017-01-19 07:09:22 +08:00
Sergey Kudryashov
a9b33b5a37 libavfilter/af_biquads: warn about clipping only after frame with clipping 2017-01-12 19:52:29 +01:00
Nicolas George
f7191ccad6 lavfi: remove stray semicolons. 
Hopefully fix compilation with suncc.
 2017-01-12 15:07:18 +01:00
Nicolas George
aaae459a85 lavfi: reindent after previous commit. 2017-01-12 14:06:16 +01:00
Nicolas George
912969a33e lavfi/buffersink: move to the new design. 2017-01-12 14:06:16 +01:00
Nicolas George
32c59a115d lavfi: do not call ff_filter_frame() with activate. 
avfilter_graph_request_oldest() does work that should be done by
either the filter or the application.

The principle of this function, calling ff_request_frame() from
outside the filter was always shaky. This version is less elegant
since it requires making special cases for each filter, but it
is more robust since it no longer calls ff_request_frame()
directly without notifying the filter.

Eventually, avfilter_graph_request_oldest() will be deprecated
for a function to just run the graph.
 2017-01-12 14:06:16 +01:00
Nicolas George
c619a4e525 lavfi: make two functions static. 
ff_request_frame_to_filter() and ff_filter_frame_to_filter()
are only used in avfilter.c.
 2017-01-12 14:06:16 +01:00
Nicolas George
ae4650f0b9 lavfi: disallow ff_request_frame for filters using activate. 
Having two different functions allows to have stricter tests
and detect errors earlier.
 2017-01-12 14:06:16 +01:00
Nicolas George
9eb4c79afd lavfi: add ff_inlink_request_frame(). 2017-01-12 14:06:16 +01:00
Nicolas George
d3cb140433 lavfi: move ff_update_link_current_pts() into the utility functions. 
It does not change anything for the existing filters and makes
better code fatrorization when future code will use the utility
functions.
 2017-01-12 14:06:16 +01:00
Nicolas George
7910127a8e lavfi: cosmetic: remove forward declaration. 2017-01-12 14:06:16 +01:00
Nicolas George
3ff01feda3 lavfi: add AVFilter.activate. 2017-01-12 14:06:16 +01:00
Nicolas George
db4a71c0ff lavfi: use the consume helpers in ff_filter_frame_to_filter(). 2017-01-12 14:06:16 +01:00
Nicolas George
d360ddf03b lavfi: add helpers to consume frames from link FIFOs. 2017-01-12 14:06:16 +01:00
Nicolas George
2e5af443c3 lavfi: pass min explicitly to samples_ready(). 2017-01-12 14:06:16 +01:00
Nicolas George
e7e4c8dfbe lavfi: add ff_inlink_evaluate_timeline_at_frame(). 2017-01-12 14:06:16 +01:00
Nicolas George
0e3d2496e2 lavfi: add ff_inlink_process_commands(). 2017-01-12 14:06:16 +01:00
Nicolas George
846f142134 lavfi: merge two variables after a recent commit. 2017-01-12 14:06:16 +01:00
Nicolas George
28c62df672 lavfi: implement ff_inlink_make_frame_writable(). 
Unlike av_frame_is_writable(), it uses the link's alloc callback,
making direct rendering possible.

The code comes from ff_filter_frame_framed(), moved with mostly
trivial changes.
 2017-01-12 14:06:16 +01:00
Nicolas George
918891e146 lavfi: export ff_filter_set_ready() to the library. 2017-01-12 14:06:16 +01:00
Nicolas George
4c24f3ac16 lavfi: add ff_inlink_acknowledge_status(). 
Also introduce libavfilter/filters.h for all functions needed
to implement filters.
 2017-01-12 14:06:16 +01:00
Nicolas George
485617ea0f lavfi: document that AVFilterLink is not for applications. 2017-01-12 14:06:16 +01:00
Nicolas George
e9ecada1d4 lavfi/tests/filtfmts: include internal.h. 2017-01-12 14:06:16 +01:00
Nicolas George
dbe9dbed31 lavfi/buffersink: add accessors for the stream properties. 
av_buffersink_get_frame_rate() did already exist; its argument becomes const.
 2017-01-12 14:06:16 +01:00
Nicolas George
0b66c456f9 lavfi, ffmpeg: simplify filter names. 
The names are only used for technical output and debugging.
Make them similar to C identifiers for easier quick reading
of debug dumps.
 2017-01-12 14:06:16 +01:00
Matthieu Bouron
e1f4971209 lavfi: use an audio frame pool for each link of the filtergraph 2017-01-12 10:22:52 +01:00
Matthieu Bouron
b1ed7957b8 lavfi/framepool: cosmetic style fixes 2017-01-12 10:22:52 +01:00
Matthieu Bouron
e2d336cf64 lavfi/framepool: re-indent after previous commit 2017-01-12 10:22:52 +01:00
Matthieu Bouron
eb3368178e lavfi/framepool: add audio support 2017-01-12 10:22:52 +01:00
Matthieu Bouron
b1f68f00b1 lavfi/framepool: rename FFVideoFramePool to FFFramePool 2017-01-12 10:22:52 +01:00
Steven Liu
184c13f64a avfilter/vf_libopencv: fix resource leak in read_shape_frame_filter 
CID: 1324298
add a label when error goto the label to release resource

Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
 2017-01-11 09:59:55 +08:00
Paul B Mahol
7aef56864c avfilter/af_sofalizer: speed and clean up fast convolution a little 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-01-09 18:38:25 +01:00
Paul B Mahol
0ddc24d232 avfilter/af_dynaudnorm: fix hang with too short input 
The only thing we can do at such point is return samples unchanged.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-01-08 20:42:17 +01:00
Clément Bœsch
27627c281e lavfi/selectivecolor: add a link to algorithm explanations 2017-01-07 14:25:57 +01:00
Michael Niedermayer
bc6b53ae99 avfilter/asrc_flite: Fix textbuf leak 
Fixes CID1244189

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-01-06 16:26:05 +01:00
Paul B Mahol
520c0736fd avfilter/vf_shuffleframes: allow also dropping frames 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-01-06 12:27:46 +01:00
Paul B Mahol
72d6101510 avfilter/avf_aphasemeter: fix memleaks 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-01-04 13:15:19 +01:00
Michael Niedermayer
3d8a8fd27e avfilter/vf_pad: Fix segfault if reconfiguration fails 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-01-02 18:42:31 +01:00
Clément Bœsch
771b3a956e lavfi/selectivecolor: rename adjust_range to scale 
This variable corresponds to the final scale of the adjustement for a
given color range.
 2016-12-31 13:01:04 +01:00
Michael Niedermayer
ffc3337e0b avfilter/vf_pad: Add eval=frame support 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-12-30 02:29:19 +01:00
Paul B Mahol
49abd5dbb8 avfilter/avf_aphasemeter: make video output optional 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-12-28 17:03:57 +01:00
Clément Bœsch
afaaf8db18 lavfi/selectivecolor: simplify crazy mid val computations 2016-12-27 23:56:23 +01:00
Clément Bœsch
571a360157 lavfi/transpose: add missing const options flags 
Fixes ffmpeg -h filter=transpose
 2016-12-27 23:49:44 +01:00
Marton Balint
0db48ee425 avfilter/af_amerge: properly handle unknown input layouts 
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2016-12-25 21:10:03 +01:00
Paul B Mahol
c6c888e996 avfilter/vf_w3fdif: add >8 but <16 bit support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-12-25 09:50:36 +01:00
Nicolas George
0ff5567a30 lavfi/buffersrc: push the frame deeper if requested. 
Reduce peak memory consumption with ffmpeg in certain cases.
 2016-12-24 13:18:03 +01:00
Nicolas George
3b64e3ea45 lavf/framesync: detect EOF immediately. 
Fix an infinite loop in forward_status_change().
 2016-12-24 13:18:02 +01:00
James Almer
e1b8271949 avfilter/framequeue: add missing check for ASSERT_LEVEL 
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-12-24 01:56:24 -03:00