Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/libavfilter/vf_fps.c
AgeCommit message (Collapse)Author
2019-09-10avfilter/vf_fps: Avoid inlink fifo build up.Nikolas Bowe
When duplicating frames we need to schedule for activation again, otherwise frames can build up in the inlink fifo. Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-11-27lavfi/fps: Avoid duplicating Closed Captions when increasing frame rate.Carl Eugen Hoyos
2018-03-08libavfilter/vf_fps: Minor cleanupsCalvin Walton
Since the config_props function now references both the input and output links, rename the 'link' variable to 'outlink'. Fix up some mismatching indentation. Don't bother setting the width and height on the outlink; the filter framework does that for us.
2018-03-08libavfilter/vf_fps: Rewrite using activate callbackCalvin Walton
The old version of the filter had a problem where it would queue up all of the duplicate frames required to fill a timestamp gap in a single call to filter_frame. In problematic files - I've hit this in webcam streams with large gaps due to network issues - this will queue up a potentially huge number of frames. (I've seen it trigger the Linux OOM-killer on particularly large pts gaps.) This revised version of the filter using the activate callback will generate at most 1 frame each time it is called.
2017-10-06avfilter/vf_fps: add eof_action filter optionTobias Rapp
Allows to specify the action to be performed when reading the last frame from the internal FIFO buffer. By default the last frame is written to filter output depending on the timestamp rounding method. When using "pass" action the last frame is passed through if input duration has not been reached yet. Examples using an input file with 25Hz, 1.4sec duration: - "fps=fps=1:round=near" generates an output file of 1sec - "fps=fps=1:round=near:eof_action=pass" generates an output file of 2sec Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
2017-10-05avfilter/vf_fps: clean-up filter optionsTobias Rapp
Add missing AV_OPT_FLAG_FILTERING_PARAM flag to "start_time" option. Fix indent of "round" named constants and clear unused field values. Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
2017-09-15vf_fps: Fix memory leak introduced by eea64ef4Thierry Foucu
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-09-15vf_fps: when reading EOF, using current_pts to duplicate the last frame if ↵Thierry Foucu
needed. Fix ticket #2674 Tested with examples from ticket 2674. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-05-09avfilter/vf_fps: set fps value boundariesPrzemysław Sobala
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-10-07lavfi/vf_fps: remove looping on request_frame().Nicolas George
2015-02-05avfilter/vf_fps: update frame drop commentMichael Niedermayer
Found-by: ubitux Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-04avfilter/vf_fps: Do not drop a random subset of framesMichael Niedermayer
This also avoids droping the frame which is closest to the target timestamp Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-20lavfi/vf_fps: use av_fifo_alloc_arrayLukasz Marek
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-05-08lavfi: use av_fifo_freepLukasz Marek
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-02-20avfilter/vf_fps: fix rounding error accumulationMichael Niedermayer
Fixes Ticket3329 Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-24Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: Add missing #includes for *INT64_MAX and *INT64_C Conflicts: ffmpeg.c ffmpeg_filter.c ffplay.c libavformat/assdec.c libavformat/avidec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-24Add missing #includes for *INT64_MAX and *INT64_CDiego Biurrun
2013-10-29Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* 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-28lavfi: do not export the filters from shared objectsAnton Khirnov
2013-09-12avfilter: various cosmeticsPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-02avfilter/vf_fps: make sure the fifo is not empty before using itMichael Niedermayer
Fixes Ticket2905 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-29avfilter/vf_fps: fix ABI compatibility with AV_NOPTS starttimeMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-29Merge commit 'cb8f70c96e14c1b4824ef23d21d78d10fc5a4b93'Michael Niedermayer
* commit 'cb8f70c96e14c1b4824ef23d21d78d10fc5a4b93': vf_fps: use double constants for default/min/max for start_time Conflicts: libavfilter/vf_fps.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-28vf_fps: use double constants for default/min/max for start_timeHendrik Leppkes
When using AV_NOPTS_VALUE (which expands to INT64_C(0x8000000000000000)) as union initializer for a double field, the c99 converter needs to interpret this constant when filling the union initializer, and it is interpreted as a positive value. When converting AV_NOPTS_VALUE to a double, MSVC 2010 ends up with the same positive value as the c99 converter, while MSVC 2012 gets a negative value. This results in an infite loop in various FATE tests on MSVC 2012. Signed-off-by: Martin Storsjö <martin@martin.st>
2013-08-26avfilter/vf_fps: Work around msvc (c99wrap) build failurePavel Koshevoy
c99wrap choked on initialization of .dbl start_time option with AV_NOPTS_VALUE: Unable to parse int64_t as expression primary Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-21Merge commit '545a0b807cf45b2bbc4c9087a297b741ce00f508'Michael Niedermayer
* commit '545a0b807cf45b2bbc4c9087a297b741ce00f508': vf_fps: add 'start_time' option Conflicts: doc/filters.texi libavfilter/vf_fps.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-20vf_fps: add 'start_time' optionJustin Ruggles
This allows for dropping or duplication to match a particular start time.
2013-05-17Merge commit '4c205f42c86ccefa093c59434669af34ad14a52b'Michael Niedermayer
* commit '4c205f42c86ccefa093c59434669af34ad14a52b': vf_drawbox: make config_props work properly when called multiple times. vf_drawtext: do not reset the frame number in config_input. vf_fps: move initializing pts from config_props to init. Conflicts: libavfilter/vf_drawbox.c libavfilter/vf_drawtext.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-17vf_fps: move initializing pts from config_props to init.Anton Khirnov
It should not be reinitialized if the link properties change.
2013-04-14lavfi: add missing periods in filter descriptions.Clément Bœsch
2013-04-12lavfi: remove now unused args parameter from AVFilter.initAnton Khirnov
Conflicts: libavfilter/avfilter.c libavfilter/vf_drawtext.c libavfilter/vf_lut.c libavfilter/vf_select.c libavfilter/vf_setpts.c libavfilter/vsrc_color.c libavfilter/vsrc_movie.c Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10Merge commit 'f13ab29925883b4245da4129694af3af378d67be'Michael Niedermayer
* commit 'f13ab29925883b4245da4129694af3af378d67be': vf_fps: switch to an AVOptions-based system. Conflicts: libavfilter/vf_fps.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-09lavfi: remove now unused args parameter from AVFilter.initAnton Khirnov
2013-04-09vf_fps: switch to an AVOptions-based system.Anton Khirnov
2013-03-26lavfi/fps: make use of AV_OPT_TYPE_VIDEO_RATEPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-03-21lavfi/vf_fps: use standard options parsing.Nicolas George
2013-03-10lavfi: remove remaining forgotten min/rej perms.Clément Bœsch
2013-03-10Merge commit '7e350379f87e7f74420b4813170fe808e2313911'Michael Niedermayer
* 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 759001c534287a96dc96d1e274665feb7059145d 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-08lavfi: switch to AVFrame.Anton Khirnov
Deprecate AVFilterBuffer/AVFilterBufferRef and everything related to it and use AVFrame instead.
2013-01-16Merge commit 'dae1d507af94261bafd3b11549884e5d1eca590e'Michael Niedermayer
* commit 'dae1d507af94261bafd3b11549884e5d1eca590e': x86: Add PAVGB macro to abstract pavgb/pavgusb instruction via cpuflags vf_fps: add final flushed frames to the dropped frame count rv34_parser: Adjust #if for disabling individual parsers Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-15vf_fps: add final flushed frames to the dropped frame countJustin Ruggles
2012-12-11lavfi/fps: remove parse opt error message.Clément Bœsch
See cc650cf0 for more info.
2012-12-11lavfi/fps: add shorthand.Clément Bœsch
2012-11-28vf_fps: switch to filter_frameAnton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28lavfi: merge start_frame/draw_slice/end_frameAnton Khirnov
Any alleged performance benefits gained from the split are purely mythological and do not justify added code complexity.
2012-10-25lavfi/vf_fps: allow to set the rounding method.Nicolas George
By default, fps selects frames near PTS 0, 0.5, 1.5, 2.5, etc. With round=down, it selects the frames near PTS 0, 1, 2, 3, etc.
2012-10-11Merge commit '4436f25a1682ada3f7226cb6fadf429946933161'Michael Niedermayer
* commit '4436f25a1682ada3f7226cb6fadf429946933161': build: remove references to unused EXTRAOBJS variable lavfi: convert input/ouput list compound literals to named objects fate: add h263 obmc vsynth tests avconv: remove bogus warning when using avconv -h without parameter averror: explicitly define AVERROR_* values flashsv: propagate inflateReset() errors indeo4/5: remove constant parameter num_bands from wavelet recomposition mxfdec: return error if no segments are available in mxf_get_sorted_table_segments Double motion vector range for HPEL interlaced picture in proper place Conflicts: libavcodec/v210dec.h libavfilter/af_aformat.c libavfilter/af_amix.c libavfilter/af_asyncts.c libavfilter/af_channelmap.c libavfilter/af_join.c libavfilter/asrc_anullsrc.c libavfilter/buffersrc.c libavfilter/f_setpts.c libavfilter/f_settb.c libavfilter/fifo.c libavfilter/src_movie.c libavfilter/vf_ass.c libavfilter/vf_blackframe.c libavfilter/vf_boxblur.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_hflip.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_select.c libavfilter/vf_transpose.c libavfilter/vf_yadif.c libavfilter/vsrc_testsrc.c libavformat/mxfdec.c libavutil/error.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-11lavfi: convert input/ouput list compound literals to named objectsMans Rullgard
A number of compilers, for example those from TI and IBM, choke on these initialisers. The current style is also quite ugly. Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-08-18lavfi: add priv class to filter definitions and flags to filter internal optionsStefano Sabatini
This allows the iteration callbacks to discover the internal class and options, and show them when required.
2012-08-17vf_fps: fix permissions.Nicolas George
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-29 17:52:12 +0300