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
AgeCommit message (Collapse)Author
2018-11-02libavfilter/vf_yadif: Make frame management logic and options shareablePhilip Langdale
I'm writing a cuda implementation of yadif, and while this obviously has a very different implementation of the actual filtering, all the frame management is unchanged. To avoid duplicating that logic, let's make it shareable. From the perspective of the existing filter, the only real change is introducing a function pointer for the filter() function so it can be specified for the specific filter.
2017-11-11Merge commit 'feed239021bad89743d5e7989b426ae594322eb7'James Almer
* commit 'feed239021bad89743d5e7989b426ae594322eb7': yadif: Account for the buffer alignment while processing the frame edges See 221f902f1dc167bdc0bfdff6b6af3214ae3cc1f4 Merged-by: James Almer <jamrial@gmail.com>
2017-08-22yadif: Account for the buffer alignment while processing the frame edgesMichael Niedermayer
Avoid out of bound reads. Bug-Id: 1031 CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2016-08-29avfilter: make use of ff_filter_get_nb_threadsPaul B Mahol
2016-05-04cosmetics: Fix spelling mistakesVittorio Giovara
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2016-02-01avfilter/vf_yadif: make use of ctx pointerPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2016-01-27avutil: Rename FF_CEIL_COMPAT to AV_CEIL_COMPATDerek Buitenhuis
Libav, for some reason, merged this as a public API function. This will aid in future merges. A define is left for backwards compat, just in case some person used it, since it is in a public header. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2015-11-11Merge commit '9df477e03ef74068f3de130adc4dd34349a16ef2'Hendrik Leppkes
* commit '9df477e03ef74068f3de130adc4dd34349a16ef2': yadif: update frame rate Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-11-09yadif: update frame rateMichael Niedermayer
(cherry picked from ffmpeg commit 31619584556466e4beab98e9b04ed4c5ba0db178) Signed-off-by: Anton Khirnov <anton@khirnov.net>
2015-10-07lavfi/vf_yadif: reindent after last commit.Nicolas George
2015-10-07lavfi/vf_yadif: remove looping on request_frame().Nicolas George
2015-09-27avfilter/vf_yadif: add missing "This file is part of FFmpeg"Michael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-08Merge commit '2268db2cd052674fde55c7d48b7a5098ce89b4ba'Hendrik Leppkes
* commit '2268db2cd052674fde55c7d48b7a5098ce89b4ba': lavu: Drop the {minus,plus}1 suffix from AVComponentDescriptor fields Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-07lavu: Drop the {minus,plus}1 suffix from AVComponentDescriptor fieldsVittorio Giovara
The new fields can be accessed directly and are more intelligible. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-04-08avfilter: handle error in query_formats() in bunch of filtersPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-01-06avfilter/vf_yadif: detect telecine contentMichael Niedermayer
Fixes: yadif with interlaced_flag_switch.mpeg Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-31avfilter/vf_yadif: add >8bit planar rgb formatsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-29avfilter/vf_yadif: fix extra leading dup frame when deint=1Neil Birkbeck
Logic for handling single frame in yadif (0f9f24c9), caused deint=1 (e.g., yadif=0:-1:1) to output extra duplicate leading frame: ffmpeg -i fate-suite/ffmpeg-synthetic/vsynth1/%02d.pgm -vf yadif=0:-1:1,showinfo -f null -y /dev/null [Parsed_showinfo_1 @ 0x1d967d0] n:0 pts:0 pts_time:0 pos:-1 fmt:gray sar:0/1 s:352x432 i:P iskey:1 type:I checksum:E457EEA0 plane_checksum:[E457EEA0] mean:[126] stdev:[46.6] [Parsed_showinfo_1 @ 0x1d967d0] n:1 pts:0 pts_time:0 pos:-1 fmt:gray sar:0/1 s:352x432 i:P iskey:1 type:I checksum:E457EEA0 plane_checksum:[E457EEA0] mean:[126] stdev:[46.6] (Outputs 51 frames) After patch, vf "yadif=0:-1:1" behaves correctly (like "yadif=0:-1:0") and outputs 50 frames, first two: [Parsed_showinfo_1 @ 0x1e307d0] n:0 pts:0 pts_time:0 pos:-1 fmt:gray sar:0/1 s:352x432 i:P iskey:1 type:I checksum:68E8D1EB plane_checksum:[68E8D1EB] mean:[126] stdev:[46.0] [Parsed_showinfo_1 @ 0x1e307d0] n:1 pts:2 pts_time:0.04 pos:-1 fmt:gray sar:0/1 s:352x432 i:P iskey:1 type:I checksum:4E674BC7 plane_checksum:[4E674BC7] mean:[125] stdev:[46.0] (Outputs 50 frames) Signed-off-by: Neil Birkbeck <neil.birkbeck@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-03vfilter/vf_yadif: fix request_frame after 0f9f24c9Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-02avfilter/vf_yadif: fix filtering a single imageMichael Niedermayer
Found-by: wm4 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-14Change license of yadif from GPL to LGPLRobert Krüger
Signed-off-by: Robert Krüger <krueger@lesspain.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-14Revert "avfilter/yadif: Revert "lavfi: convert input/ouput list compound ↵Robert Krüger
literals to named objects"" This reverts commit 4ef4bb4a203e8f472ab0484396270b9430862037. Signed-off-by: Robert Krüger <krueger@lesspain.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-14Revert "Revert "yadif: add parens around macro parameters""Robert Krüger
This reverts commit ab00800cde1af1f252731118062dd5149f1a7ed7. Signed-off-by: Robert Krüger <krueger@lesspain.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-14Revert "Revert "vf_yadif: move x86 init code to x86/yadif.c""Robert Krüger
This reverts commit 975110a85ef8e794fdc041455ff41b0ad30bc01e. Signed-off-by: Robert Krüger <krueger@lesspain.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-14vf_yadif: Relicense from GPL to LGPLRobert Krüger
All copyright holders have agreed to the relicensing.
2013-12-01Revert "vf_yadif: move x86 init code to x86/yadif.c"Michael Niedermayer
This reverts commit a87b17f3283aada762820f1b797eeb7a2dff6c61. This reduces the amount of non LGPL code, making a relicensing to LGPL easier Conflicts: libavfilter/vf_yadif.c libavfilter/x86/yadif.c libavfilter/x86/yadif_template.c libavfilter/yadif.h Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-01Revert "yadif: add parens around macro parameters"Michael Niedermayer
This reverts commit 49e617f9565b6528fe707bae7ea4b62b10c771a5. This reduces the amount of non LGPL code, making a relicensing to LGPL easier Conflicts: libavfilter/vf_yadif.c Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-01avfilter/yadif: Revert "lavfi: convert input/ouput list compound literals to ↵Michael Niedermayer
named objects" This reverts commit 568c70e79ee267426c15ef4603c69703f6a5884a. This reduces the amount of non LGPL code, making a relicensing to LGPL easier Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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-11avfilter: remove redundant use of AV_NE() macroPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-05avfilter/vf_yadif: Treat mode as a field of flagsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-05avfilter/vf_yadif: fix "incompatible pointer type" warningMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-05avfilter/vf_yadif: add gbr(a)p supportMichael Niedermayer
Suggested-by: durandal_1707 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-03avfilter/vf_yadif: reallocate frames if strides differMichael Niedermayer
Fixes Ticket2896 An alternative to this would be to change the code to support any stride. The condition of differing strides should be rare. If theres no speedloss supporting any stride would be better Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-19avfilter/vf_yadif:remove unneeded include assert.hMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-24yadif: fix slice sizesMichael Niedermayer
This more evenly distributes the load between threads Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-24avfilter/vf_yadif: fix race conditionMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-24Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: vf_fade: support slice threading vf_yadif: support slice threading Conflicts: libavfilter/vf_fade.c libavfilter/vf_yadif.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-24vf_yadif: support slice threadingAnton Khirnov
2013-05-21lavfi/yadif: add timeline support.Clément Bœsch
2013-05-17lavfi/yadif: fix chroma subsampling with odd sizes.Clément Bœsch
2013-05-14yadif: correct strides in filter_edges_16bitJames Darnley
The C code treats the data as arrays of uint16_t so strides must not be in bytes but in pixels. Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-05-14yadif: restore speed of the C filtering codeJames Darnley
Always use the special filter for the first and last 3 columns (only). Changes made in 64ed397 slowed the filter to just under 3/4 of what it was. This commit restores the speed while maintaining identical output. For reference, on my Athlon64: 1733222 decicycles in old 2358563 decicycles in new 1727558 decicycles in this Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-04-11Merge commit '7536c671040f1f3ebc9f0d3b7831dac71436b775'Michael Niedermayer
* commit '7536c671040f1f3ebc9f0d3b7831dac71436b775': vf_yadif: switch to an AVOptions-based system. Conflicts: doc/filters.texi libavfilter/vf_yadif.c libavfilter/yadif.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-09vf_yadif: switch to an AVOptions-based system.Anton Khirnov
2013-03-21lavfi/vf_yadif: use standard options parsing.Nicolas George
2013-03-17yadif: cosmetic indentation from previous commitsJames Darnley
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-17yadif: x86 assembly for 16-bit samplesJames Darnley
This is a fairly dumb copy of the assembly for 8-bit samples but it works and produces identical output to the C version. The options have been tested on an Athlon64 and a Core2Quad. Athlon64: 1810385 decicycles in C, 32726 runs, 42 skips 1080744 decicycles in mmx, 32744 runs, 24 skips, 1.7x faster 818315 decicycles in sse2, 32735 runs, 33 skips, 2.2x faster Core2Quad: 924025 decicycles in C, 32750 runs, 18 skips 623995 decicycles in mmx, 32767 runs, 1 skips, 1.5x faster 406223 decicycles in sse2, 32764 runs, 4 skips, 2.3x faster 387842 decicycles in ssse3, 32767 runs, 1 skips, 2.4x faster 307726 decicycles in sse4, 32763 runs, 5 skips, 3.0x faster Signed-off-by: Michael Niedermayer <michaelni@gmx.at>