virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity
92,743 Commits 37 Branches 400 Tags 465 MiB
a07470ba37
Commit Graph

43 Commits

Author SHA1 Message Date
Marton Balint
7748f395de avfilter/vf_select: use common scene sad functions 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2018-11-11 20:30:50 +01:00
Paul B Mahol
01b986cf18 avfilter/f_select: check ff_insert_outpad() for failure 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-08-25 10:05:09 +02:00
Muhammad Faiz
6af050d7d0 avfilter: do not use AVFrame accessor 
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
 2017-04-23 14:40:30 +07:00
Nicolas George
183ce55b0d lavfi: split frame_count between input and output. 
AVFilterLink.frame_count is supposed to count the number of frames
that were passed on the link, but with min_samples, that number is
not always the same for the source and destination filters.
With the addition of a FIFO on the link, the difference will become
more significant.

Split the variable in two: frame_count_in counts the number of
frames that entered the link, frame_count_out counts the number
of frames that were sent to the destination filter.
 2016-11-13 10:41:16 +01:00
Marton Balint
839eb1c77d lavfi/select: add support for concatdec_select option 
This option can be used to select useful frames from an ffconcat file which is
using inpoints and outpoints but where the source files are not intra frame
only.

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2015-11-25 00:34:29 +01:00
Nicolas George
ca540fbdb4 lavfi/vf_select: remove looping on request_frame(). 2015-10-07 19:05:13 +02:00
Clément Bœsch
fd682b1892 avfilter: handle error in query_formats() of a bunch of random video filters 2015-03-16 23:43:12 +01:00
Clément Bœsch
37bfeca78c avfilter/select: larger pixel sad computation 2014-08-14 19:11:13 +02:00
Clément Bœsch
10d96d8d66 avfilter/select: re-align a few comments 2014-08-14 18:52:53 +02:00
Clément Bœsch
97478ef5fe avfilter/select: fix "t" eval variable comment 2014-08-05 21:15:13 +02:00
Clément Bœsch
eaeb61c3a6 avfilter/select: remove optional avcodec dependency 2014-08-05 21:05:53 +02:00
Michael Niedermayer
6f622e5fcb avfilter/f_select: avoid double->int in debug output 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-30 17:50:35 +02:00
Michael Niedermayer
bcbfb95b0e avfilter/f_select: Set var_values[VAR_KEY] correctly 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-30 17:49:26 +02:00
Michael Niedermayer
887d8d293f avfilter/f_select: avoid using doubles for equals checks and casts to enums 
This might silence some warnings.

Issue found from: a8d803a320
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-30 17:37:09 +02:00
Michael Niedermayer
c0a586d9d5 reintroduce avpriv_dsputil_init() to maintain ABI until next soname bump 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-26 13:21:07 +02:00
Michael Niedermayer
3a2d1465c8 Merge commit '2d60444331fca1910510038dd3817bea885c2367' 
* commit '2d60444331fca1910510038dd3817bea885c2367':
  dsputil: Split motion estimation compare bits off into their own context

Conflicts:
	configure
	libavcodec/Makefile
	libavcodec/arm/Makefile
	libavcodec/dvenc.c
	libavcodec/error_resilience.c
	libavcodec/h264.h
	libavcodec/h264_slice.c
	libavcodec/me_cmp.c
	libavcodec/me_cmp.h
	libavcodec/motion_est.c
	libavcodec/motion_est_template.c
	libavcodec/mpeg4videoenc.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/x86/Makefile
	libavcodec/x86/me_cmp_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-17 23:27:40 +02:00
Michael Niedermayer
6bd1741231 avfilter/f_select: fix incompatible pointer type warning 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-05 05:51:50 +02:00
Michael Niedermayer
74a8dbe1c4 Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b' 
* commit '58400ac133bcfb6bf8196b4e5208bc178307739b':
  lavfi: name anonymous structs

Conflicts:
	libavfilter/buffersink.c
	libavfilter/f_select.c
	libavfilter/src_movie.c
	libavfilter/vf_drawbox.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_overlay.c
	libavfilter/vf_showinfo.c
	libavfilter/vf_unsharp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-19 18:20:17 +02:00
Michael Niedermayer
5a8ef3c66b avfilter/f_select: fix loss of precission in SAD calculation 
Fixes part of Ticket3466
Found-by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-16 03:44:57 +02:00
Michael Niedermayer
325f6e0a97 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavfi: do not export the filters from shared objects

Conflicts:
	libavfilter/af_amix.c
	libavfilter/af_anull.c
	libavfilter/asrc_anullsrc.c
	libavfilter/f_select.c
	libavfilter/f_settb.c
	libavfilter/split.c
	libavfilter/src_movie.c
	libavfilter/vf_aspect.c
	libavfilter/vf_blackframe.c
	libavfilter/vf_colorbalance.c
	libavfilter/vf_copy.c
	libavfilter/vf_crop.c
	libavfilter/vf_cropdetect.c
	libavfilter/vf_drawbox.c
	libavfilter/vf_format.c
	libavfilter/vf_framestep.c
	libavfilter/vf_frei0r.c
	libavfilter/vf_hflip.c
	libavfilter/vf_libopencv.c
	libavfilter/vf_lut.c
	libavfilter/vf_null.c
	libavfilter/vf_overlay.c
	libavfilter/vf_scale.c
	libavfilter/vf_transpose.c
	libavfilter/vf_unsharp.c
	libavfilter/vf_vflip.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-29 11:58:11 +01:00
Paul B Mahol
b211607b5c avfilter: various cosmetics 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-12 14:01:43 +00:00
Paul B Mahol
b077d8d908 avfilter: remove redundant .get_(audio/video)_buffer initializations 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-07 18:20:16 +00:00
Paul B Mahol
91cae60ecb lavfi/select: unbreak compatibility with older PICT_TYPE syntax 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-12 10:52:26 +00:00
Paul B Mahol
4868855b13 lavfi/select: set forgotten VAR_PICT_TYPE_BI 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-10 17:39:09 +00:00
Clément Bœsch
b8a5c76131 lavfi: add frame counter into AVFilterLink and use it in filters. 2013-04-23 01:02:27 +02:00
Stefano Sabatini
8bfd878151 lavfi/select: factorize options definition between select and aselect 2013-04-17 22:39:04 +02:00
Stefano Sabatini
dcc1b32361 lavfi/select: add support for dynamic number of outputs 2013-04-17 22:34:05 +02:00
Stefano Sabatini
565c50ac7b lavfi/select: make select_frame() return void 
Set select->select internally to the function, avoid lossy double->int
conversion causing spurious frame drop (e.g. in case the evaluation
result is positive and less than 1).
 2013-04-17 22:28:56 +02:00
Clément Bœsch
1e3104cd3c Add avpriv_dsputil_init() and use it in lavfi where relevant. 
dsputil_init() is deprecated and not meant to be exported.
ff_dsputil_init() is internal to libavcodec and thus can not be used.
avpriv_dsputil_init() is the version shared between libraries.

This commit fixes 3 unjustified libavfilter deprecated warnings.
 2013-04-14 20:15:54 +02:00
Michael Niedermayer
fd6228e657 lavfi: remove now unused args parameter from AVFilter.init and init_opaque 
This is mostly automated global search and replace

The deprecated aconvert filter is disabled, if it still has users
it should be updated

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-12 11:54:39 +02:00
Michael Niedermayer
865e20daf3 avfilter/f_select: use AVFrame metadata accessor function 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-11 18:33:24 +02:00
Clément Bœsch
cb2327e88d lavfi/aselect: switch to an AVOptions-based system. 2013-04-11 11:51:48 +02:00
Michael Niedermayer
b3fb2d8cec Merge commit '95f1f56a21bc2f824af6fb97ca7ab35cdd0c401e' 
* commit '95f1f56a21bc2f824af6fb97ca7ab35cdd0c401e':
  vf_select: switch to an AVOptions-based system.

Conflicts:
	doc/filters.texi
	libavfilter/f_select.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-10 23:24:48 +02:00
Clément Bœsch
8b994c8c1c lavfi/select: use standard options parsing. 2013-03-24 12:26:24 +01:00
Clément Bœsch
96e4b00d62 lavfi: remove remaining forgotten min/rej perms. 2013-03-10 02:38:21 +01:00
Michael Niedermayer
a05a44e205 Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 
* commit '7e350379f87e7f74420b4813170fe808e2313911':
  lavfi: switch to AVFrame.

Conflicts:
	doc/filters.texi
	libavfilter/af_ashowinfo.c
	libavfilter/audio.c
	libavfilter/avfilter.c
	libavfilter/avfilter.h
	libavfilter/buffersink.c
	libavfilter/buffersrc.c
	libavfilter/buffersrc.h
	libavfilter/f_select.c
	libavfilter/f_setpts.c
	libavfilter/fifo.c
	libavfilter/split.c
	libavfilter/src_movie.c
	libavfilter/version.h
	libavfilter/vf_aspect.c
	libavfilter/vf_bbox.c
	libavfilter/vf_blackframe.c
	libavfilter/vf_delogo.c
	libavfilter/vf_drawbox.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_fade.c
	libavfilter/vf_fieldorder.c
	libavfilter/vf_fps.c
	libavfilter/vf_frei0r.c
	libavfilter/vf_gradfun.c
	libavfilter/vf_hqdn3d.c
	libavfilter/vf_lut.c
	libavfilter/vf_overlay.c
	libavfilter/vf_pad.c
	libavfilter/vf_scale.c
	libavfilter/vf_showinfo.c
	libavfilter/vf_transpose.c
	libavfilter/vf_vflip.c
	libavfilter/vf_yadif.c
	libavfilter/video.c
	libavfilter/vsrc_testsrc.c
	libavfilter/yadif.h

Following are notes about the merge authorship and various technical details.

Michael Niedermayer:
  * Main merge operation, notably avfilter.c and video.c
  * Switch to AVFrame:
    - afade
    - anullsrc
    - apad
    - aresample
    - blackframe
    - deshake
    - idet
    - il
    - mandelbrot
    - mptestsrc
    - noise
    - setfield
    - smartblur
    - tinterlace
  * various merge changes and fixes in:
    - ashowinfo
    - blackdetect
    - field
    - fps
    - select
    - testsrc
    - yadif

Nicolas George:
  * Switch to AVFrame:
    - make rawdec work with refcounted frames. Adapted from commit
      759001c534 by Anton Khirnov.
      Also, fix the use of || instead of | in a flags check.
    - make buffer sink and src, audio and video work all together

Clément Bœsch:
  * Switch to AVFrame:
    - aevalsrc
    - alphaextract
    - blend
    - cellauto
    - colormatrix
    - concat
    - earwax
    - ebur128
    - edgedetect
    - geq
    - histeq
    - histogram
    - hue
    - kerndeint
    - life
    - movie
    - mp (with the help of Michael)
    - overlay
    - pad
    - pan
    - pp
    - pp
    - removelogo
    - sendcmd
    - showspectrum
    - showwaves
    - silencedetect
    - stereo3d
    - subtitles
    - super2xsai
    - swapuv
    - thumbnail
    - tile

Hendrik Leppkes:
  * Switch to AVFrame:
    - aconvert
    - amerge
    - asetnsamples
    - atempo
    - biquads

Matthieu Bouron:
  * Switch to AVFrame
    - alphamerge
    - decimate
    - volumedetect

Stefano Sabatini:
  * Switch to AVFrame:
    - astreamsync
    - flite
    - framestep

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Clément Bœsch <ubitux@gmail.com>
Signed-off-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Matthieu Bouron <matthieu.bouron@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-10 01:40:35 +01:00
Stefano Sabatini
c0a4871c16 lavfi/select: correctly set prev_t and prev_pts 
In particular, fix trac ticket #2248.
 2013-02-07 21:28:46 +01:00
Stefano Sabatini
872855e2a5 lavfi/select: avoid double -> int lossy conversion in debug log 2013-02-07 21:00:54 +01:00
Clément Bœsch
174c483e2e lavfi/select: fix compilation with avcodec disabled. 2012-12-20 05:17:36 +01:00
Stefano Sabatini
43912625e0 lavfi/select: assign NAN to ignored values 
Also log scene value. Improve debugging.
 2012-12-13 00:18:49 +01:00
Stefano Sabatini
6ba1f28008 lavfi/select: add support to options 
Add options introspection, and improve error feedback.
 2012-12-13 00:16:30 +01:00
Stefano Sabatini
c214cd18e2 lavfi/select: in select_frame(), rename picref -> ref 
The variable is now used also for audio frames.
 2012-12-13 00:12:55 +01:00
Stefano Sabatini
c51f090ff9 lavfi: mv vf_select.c -> f_select.c 
The file now contains also an audio select implementation. Also move the
aselect/select documentation from video filters to the multimedia filters
section.
 2012-12-13 00:10:43 +01:00