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
2013-12-24do O(1) instead of O(n) atomic operations in register functionsMichael Niedermayer
about 1ms faster startup time Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 133fbfc7811ffae7b97dd129fcd0b5e646742362) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-24avfilter/ff_insert_pad: fix order of operationsMichael Niedermayer
Fixes out of bounds access Fixes CID732170 Fixes CID732169 No filter is known to use this function in a way so the issue can be reproduced. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit ab2bfb85d49b2f8aa505816f93e75fd18ad0a361) Conflicts: libavfilter/avfilter.c
2013-11-28lavfi/af_pan: support unknown layouts on input.Nicolas George
Fix trac ticket #2899. (cherry picked from commit 7b0a587393e03dab552d66450d43ab82bda0a5a1)
2013-11-28lavfi/af_pan: support unknown layouts on output.Nicolas George
(cherry picked from commit 4e9adc9b7363cc336e3d47c98455e1508902fd29)
2013-11-28lavfi: parsing helper for unknown channel layouts.Nicolas George
Make ff_parse_channel_layout() accept unknown layouts too. (cherry picked from commit 6e2473edfda26a556c615ebc04d8aeba800bef7e)
2013-11-28lavfi/avfiltergraph: do not reduce incompatible lists.Nicolas George
A list of "all channel layouts" but not "all channel counts" can not be reduced to a single unknown channel count. (cherry picked from commit d300f5f6f570659e4b58567b35c9e8600c9f2956)
2013-11-28lavfi/avfiltergraph: suggest a solution when format selection fails.Nicolas George
Format selection can fail if unknown channel layouts are used with filters that do not support it. (cherry picked from commit f775eb3fb4c7b716107355e428e40cb63f71ee7a)
2013-09-23avfilter/vf_fps: make sure the fifo is not empty before using itMichael Niedermayer
Fixes Ticket2905 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit cdd5df8189ff1537f7abe8defe971f80602cc2d2) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-09avfilter/vf_separatefields: fix ;;Michael Niedermayer
Found-by: llogan Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 74561680cd01f36a2b225efb529bcd5729b65d32) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-09avfilter: fix plane validity checksMichael Niedermayer
Fixes out of array accesses (cherry picked from commit e43a0a232dbf6d3c161823c2e07c52e76227a1bc) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-11lavfi/aconvert: unbreakPaul B Mahol
Even if its deprecated, it should still work correctly. Signed-off-by: Paul B Mahol <onemda@gmail.com> (cherry picked from commit bc95b9428950cd672162bcb2bb98fbecad52a5b3) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-10avfilter/af_earwax: Fix out of array accesses on odd packetsMichael Niedermayer
Found-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 0a3a0edd52b98aec27d1b8c63c85cb52ff46d40e) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-09avfilter/graphparse: Fix build with --enable-incompatible-fork-abiMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-09lavfi/drawtext: add support for printing frame metadataPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-09lavfi/psnr: rename 's' parameter to match documentationPaul B Mahol
Also removes some irrelevant lines in documentation. Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-09lavfi: fix broken logic in metadata handlingPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-08lavfi/rotate: switch to new drawutilsPaul B Mahol
Get rid of ugly hacks, also add support for more pixel formats. Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-08lavfi/drawutils: fix planar rgbPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-08lavfi/pad: use FFSIGNPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-08lavfi: add psnr filterPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-06replace some deprecated definesPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-06lavfi/blend: use dual input helpersPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-05lavfi/delogo: band width must be at least 1Jean Delvare
We need at least one pixel around the logo to use as known points to interpolate from. So properly declare the band/t attribute has having a minimum value of 1. Signed-off-by: Jean Delvare <khali@linux-fr.org> Reviewed-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-05lavfi/delogo: option show shouldn't affect bandJean Delvare
Options "show" and "band" are unrelated and should thus be independent. However, setting "show" to 1 currently resets "band" to its default value of 4. While this is documented, this still surprising and confusing IMHO. Change this behavior and make "show" and "band" independent from each other. Update the documentation accordingly. Signed-off-by: Jean Delvare <khali@linux-fr.org> Reviewed-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-05lavfi/blackdetect: support 2 more pixels formatsPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-05lavfi/cropdetect: export cropdetect info to frame metadataPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-05lavfi/delogo: remember left and right samples when interpolatingJean Delvare
The left and right samples are the same for the whole line, so store their values and don't recompute them for every iteration of "y". This simple optimization results in a speed improvement between 15% and 20% in my tests (depending on the logo geometry.) Result is obviously the same. Signed-off-by: Jean Delvare <khali@linux-fr.org> Reviewed-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-05lavfi/delogo: don't recompute the same difference again and againJean Delvare
The top left hand corner pixel coordinates are already stored in logo_x1 and logo_y1 so don't recompute each of them 6 times for every iteration. This is a simple code optimization, result is obviously the same. The performance gain is small (about 2% in my tests) but still good to have, and the new code is clearer. Signed-off-by: Jean Delvare <khali@linux-fr.org> Reviewed-by; Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-04lavfi/crop: support more pixel formatsPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-04lavfi/delogo: avoid propagation of rounding errors in chroma planesJean Delvare
When operating on subsampled chroma planes, some rounding is taking place. The left and top borders are rounded down while the width and height are rounded up, so all rounding is done outward to guarantee the logo area is fully covered. The problem is that the width and height are counted from the unrounded left and top borders, respectively. So if the left or top border position has indeed been rounded down, and the width or height needs no rounding (up), the position of the the right or bottom border will be effectively rounded down, i.e. inward. The issue can easily be seen with a yuv240p input and -vf delogo=45:45:60:40:show=1 -vframes 1 delogo-bug.png (or virtually any logo area with odd x and y and even width and height.) The right and bottom chroma borders (in green) are clearly off. In order to fix this, the width and height must be adjusted to include the bits lost in the rounding of the left and top border positions, respectively, prior to being themselves rounded up. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-04lavfi/delogo: take SAR into accountJean Delvare
When interpolating, weights are based on relative distances, which assume square pixels. If a non-1:1 sample aspect ratio is used, it should be taken into account when comparing distances, because the human eye and brain care about the picture as it is displayed, not stored. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-03lavfi: create Libav-API compatibility layer for avfilter_graph_parse() at ↵Stefano Sabatini
the next bump Add function avfilter_graph_parse_ptr() and favor it in place of avfilter_graph_parse(), which will be restored with the old/Libav signature at the next bump. If HAVE_INCOMPATIBLE_LIBAV_API is enabled it will use the Libav-compatible signature for avfilter_graph_parse(). At the next major bump the current implementation of avfilter_graph_parse() should be dropped in favor of the Libav/old implementation. Should address trac ticket #2672.
2013-07-01lavfi/delogo: use weighted interpolationJean Delvare
The original delogo algorithm interpolates both horizontally and vertically and uses the average to compute the resulting sample. This works reasonably well when the logo area is almost square. However when the logo area is significantly larger than high or higher than large, the result is largely suboptimal. The issue can be clearly seen by testing the delogo filter with a fake logo area that is 200 pixels large and 2 pixels high. Vertical interpolation gives a very good result in that case, horizontal interpolation gives a very bad result, and the overall result is poor, because both are given the same weight. Even when the logo is roughly square, the current algorithm gives poor results on the borders of the logo area, because it always gives horizontal and vertical interpolations an equal weight, and this is suboptimal on borders. For example, in the middle of the left hand side border of the logo, you want to trust the left known point much more than the right known point (which the current algorithm already does) but also much more than the top and bottom known points (which the current algorithm doesn't do.) By properly weighting each known point when computing the value of each interpolated pixel, the visual result is much better, especially on borders and/or for high or large logo areas. The algorithm I implemented guarantees that the weight of each of the 4 known points directly depends on its distance to the interpolated point. It is largely inspired from the original algorithm, the key difference being that it computes the relative weights globally instead of separating the vertical and horizontal interpolations and combining them afterward. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2013-06-30Rename thread_init() in libavcodec and libavfilter as library_thread_init().Carl Eugen Hoyos
The aix header sys/thread.h contains a definition for thread_init().
2013-06-30Rename constant HZ in af_biquads.c as HERTZ.Carl Eugen Hoyos
The aix header sys/m_param.h defines HZ as _HZ.
2013-06-28avfilter/avfilter: Make avfilter_register() thread safeMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-28avfilter/vf_mp: preserve pixel format when possibleMichael Niedermayer
Fixes Ticket2577 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-26avfilter/src_movie: Fix handling of packet size for videoMichael Niedermayer
See Ticket2556 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-26libavfilter/src_movie: fix which packet is resetMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-26vf_drawbox: give all v_log() a contextMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-26vf_drawbox: avoid declaration in for() argumentsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-26Merge branch 'drawbox_exprs' of https://github.com/mjmvisser/FFmpegMichael Niedermayer
* 'drawbox_exprs' of https://github.com/mjmvisser/FFmpeg: enabled expressions on x, y, w, h and t parameters for drawgrid and drawbox, added examples Reviewed-by: Andrey Utkin Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-25enabled expressions on x, y, w, h and t parameters for drawgrid and drawbox, ↵Mark Visser
added examples
2013-06-25lavfi/movie: free packet on decoder errorMichael Niedermayer
Prevents infinite loop, see Ticket2556 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-25avfilter/vsrc_testsrc: fix artifacts with odd heightMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-21Merge commit 'eeeb5c291d3f78eaade5b99c2614c7cab0e9be79'Michael Niedermayer
* commit 'eeeb5c291d3f78eaade5b99c2614c7cab0e9be79': vsrc_movie: do not free avoption variables in uninit() Conflicts: libavfilter/src_movie.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-20vsrc_movie: do not free avoption variables in uninit()Anton Khirnov
The generic code frees them as well. Since av_free was used to free them instead of av_freep, this would result in a double free.
2013-06-20delogo: Fix function descriptionJean Delvare
The algorithm works on src and writes to dst, not the other way around. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-19Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: lavfi: switch ff_default_get_audio_buffer() to av_frame_get_buffer() Conflicts: libavfilter/audio.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-19Merge branch 'frame_num_offset' of https://github.com/mjmvisser/FFmpegMichael Niedermayer
Merged-by: Michael Niedermayer <michaelni@gmx.at>