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
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>
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>
2013-03-15yadif: 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: Michael Niedermayer <michaelni@gmx.at>
2013-03-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: Michael Niedermayer <michaelni@gmx.at>
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-02-16yadif: remove unused variableMichael Niedermayer
Found by: durandal_1707 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-16Merge commit '64ed397635ef2666b0ca0c8d8c60a8bc44581d82'Michael Niedermayer
* commit '64ed397635ef2666b0ca0c8d8c60a8bc44581d82': vf_yadif: fix out-of line reads Conflicts: libavfilter/vf_yadif.c tests/ref/fate/filter-yadif-mode0 tests/ref/fate/filter-yadif-mode1 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-16Merge commit 'ccd70d9c1689990e5aef2de383199bbc7cf60d13'Michael Niedermayer
* commit 'ccd70d9c1689990e5aef2de383199bbc7cf60d13': vf_yadif: factorize initializing the filtering callbacks Conflicts: libavfilter/vf_yadif.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-16lavfi/yadif: support 9, 12, and 14 bits per pixelJames Darnley
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-16lavfi/yadif: remove unnecessary castJames Darnley
Finish what 99162f8 started Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-15vf_yadif: fix out-of line readsAnton Khirnov
Some changes in the border pixels, visually indistinguishable.
2013-02-15vf_yadif: factorize initializing the filtering callbacksAnton Khirnov
Do it all in config_props().
2013-02-06Merge commit '238614de679a71970c20d7c3fee08a322967ec40'Michael Niedermayer
* commit '238614de679a71970c20d7c3fee08a322967ec40': cdgraphics: do not rely on get_buffer() initializing the frame. svq1: replace struct svq1_frame_size with an array. vf_yadif: silence a warning. Conflicts: libavcodec/svq1dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-06vf_yadif: silence a warning.Anton Khirnov
clang says: libavfilter/vf_yadif.c:192:28: warning: incompatible pointer types assigning to 'void (*)(uint8_t *, uint8_t *, uint8_t *, uint8_t *, int, int, int, int, int)' from 'void (uint16_t *, uint16_t *, uint16_t *, uint16_t *, int, int, int, int, int)'
2013-01-10lavfi/yadif: fix shorthand/option mismatchAndré Pankratz
Fix trac ticket #2128. Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2013-01-04lavfi/yadif: add support to named constantsStefano Sabatini
2013-01-04lavfi/yadif: add support to named options and options introspectionStefano Sabatini
Also rename the "enable_auto" field to "deint", to match the name of the option.
2013-01-04lavfi/yadif: remove redundant NULL checks in uninitStefano Sabatini
2013-01-04lavfi/yadif: fail during the configuration stage in case of invalid video sizeStefano Sabatini
This is better than repeatedly failing during the filtering stage.
2013-01-04lavfi/yadif: remove unused poll_frame callbackStefano Sabatini
2012-11-29vf_yadif: switch to filter_frame, this filter did not support slicesAnton Khirnov
signed-off-by: Michael Niedermayer <michaelni@gmx.at>