James Almer
672e704e4a
Merge commit 'feed239021bad89743d5e7989b426ae594322eb7'
...
* commit 'feed239021bad89743d5e7989b426ae594322eb7':
yadif: Account for the buffer alignment while processing the frame edges
See 221f902f1d
2017-11-11 10:09:41 -03:00
Michael Niedermayer
feed239021
yadif: Account for the buffer alignment while processing the frame edges
...
Avoid out of bound reads.
Bug-Id: 1031
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2017-08-22 22:31:19 +02:00
Paul B Mahol
a0a57072c9
avfilter: make use of ff_filter_get_nb_threads
2016-08-29 16:27:09 +02:00
Vittorio Giovara
41ed7ab45f
cosmetics: Fix spelling mistakes
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2016-05-04 18:16:21 +02:00
Paul B Mahol
0a7379d9cf
avfilter/vf_yadif: make use of ctx pointer
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2016-02-01 11:59:17 +01:00
Derek Buitenhuis
21f9468402
avutil: Rename FF_CEIL_COMPAT to AV_CEIL_COMPAT
...
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>
2016-01-27 16:36:46 +00:00
Hendrik Leppkes
cb98712866
Merge commit '9df477e03ef74068f3de130adc4dd34349a16ef2'
...
* commit '9df477e03ef74068f3de130adc4dd34349a16ef2':
yadif: update frame rate
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-11-11 14:50:33 +01:00
Michael Niedermayer
9df477e03e
yadif: update frame rate
...
(cherry picked from ffmpeg commit 3161958455
2015-11-09 08:09:41 +01:00
Nicolas George
8a9fa46e87
lavfi/vf_yadif: reindent after last commit.
2015-10-07 19:05:13 +02:00
Nicolas George
4883e5d540
lavfi/vf_yadif: remove looping on request_frame().
2015-10-07 19:05:13 +02:00
Michael Niedermayer
549d109248
avfilter/vf_yadif: add missing "This file is part of FFmpeg"
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-27 13:08:24 +02:00
Hendrik Leppkes
151aa2ebff
Merge commit '2268db2cd052674fde55c7d48b7a5098ce89b4ba'
...
* commit '2268db2cd052674fde55c7d48b7a5098ce89b4ba':
lavu: Drop the {minus,plus}1 suffix from AVComponentDescriptor fields
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-08 16:35:28 +02:00
Vittorio Giovara
2268db2cd0
lavu: Drop the {minus,plus}1 suffix from AVComponentDescriptor fields
...
The new fields can be accessed directly and are more intelligible.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-09-07 12:37:47 +02:00
Paul B Mahol
a0854c084e
avfilter: handle error in query_formats() in bunch of filters
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-04-08 13:05:06 +00:00
Michael Niedermayer
42411a85b7
avfilter/vf_yadif: detect telecine content
...
Fixes: yadif with interlaced_flag_switch.mpeg
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-06 00:31:37 +01:00
Michael Niedermayer
081567397e
avfilter/vf_yadif: add >8bit planar rgb formats
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-30 22:52:45 +01:00
Neil Birkbeck
e4788e9cd9
avfilter/vf_yadif: fix extra leading dup frame when deint=1
...
Logic for handling single frame in yadif (0f9f24c9👎 1) to output extra duplicate leading frame:
ffmpeg -i fate-suite/ffmpeg-synthetic/vsynth1/%02d.pgm -vf yadif=0👎 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" behaves correctly (like "yadif=0👎 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-11-29 21:59:47 +01:00
Michael Niedermayer
681e008d06
vfilter/vf_yadif: fix request_frame after 0f9f24c9
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-03 16:14:32 +02:00
Michael Niedermayer
0f9f24c9cf
avfilter/vf_yadif: fix filtering a single image
...
Found-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-02 02:33:24 +02:00
Robert Krüger
194ef56ba7
Change license of yadif from GPL to LGPL
...
Signed-off-by: Robert Krüger <krueger@lesspain.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-14 14:19:15 +01:00
Robert Krüger
6109399366
Revert "avfilter/yadif: Revert "lavfi: convert input/ouput list compound literals to named objects""
...
This reverts commit 4ef4bb4a20
2014-01-14 14:19:15 +01:00
Robert Krüger
99c4abfe88
Revert "Revert "yadif: add parens around macro parameters""
...
This reverts commit ab00800cde
2014-01-14 14:19:14 +01:00
Robert Krüger
4a38eeec38
Revert "Revert "vf_yadif: move x86 init code to x86/yadif.c""
...
This reverts commit 975110a85e
2014-01-14 14:19:14 +01:00
Robert Krüger
d8e763fda7
vf_yadif: Relicense from GPL to LGPL
...
All copyright holders have agreed to the relicensing.
2014-01-14 00:04:59 +01:00
Michael Niedermayer
975110a85e
Revert "vf_yadif: move x86 init code to x86/yadif.c"
...
This reverts commit a87b17f328
2013-12-01 20:26:26 +01:00
Michael Niedermayer
ab00800cde
Revert "yadif: add parens around macro parameters"
...
This reverts commit 49e617f956
2013-12-01 20:26:26 +01:00
Michael Niedermayer
4ef4bb4a20
avfilter/yadif: Revert "lavfi: convert input/ouput list compound literals to named objects"
...
This reverts commit 568c70e79e
2013-12-01 20:26:26 +01: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
Anton Khirnov
cd43ca0443
lavfi: do not export the filters from shared objects
2013-10-28 15:29:54 +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
a8e00cf926
avfilter: remove redundant use of AV_NE() macro
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-11 15:05:21 +00:00
Michael Niedermayer
59b9ecc92a
avfilter/vf_yadif: Treat mode as a field of flags
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-05 20:53:12 +02:00
Michael Niedermayer
4ff5b2683c
avfilter/vf_yadif: fix "incompatible pointer type" warning
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-05 19:58:45 +02:00
Michael Niedermayer
a67dcd74ab
avfilter/vf_yadif: add gbr(a)p support
...
Suggested-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-05 14:06:17 +02:00
Michael Niedermayer
92b7e7b318
avfilter/vf_yadif: reallocate frames if strides differ
...
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-09-03 05:14:29 +02:00
Michael Niedermayer
8589d7a61c
avfilter/vf_yadif:remove unneeded include assert.h
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-19 18:53:57 +02:00
Michael Niedermayer
1d08e4b584
yadif: fix slice sizes
...
This more evenly distributes the load between threads
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-24 17:46:57 +02:00
Michael Niedermayer
221f902f1d
avfilter/vf_yadif: fix race condition
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-24 17:26:20 +02:00
Michael Niedermayer
558ce3e5b7
Merge remote-tracking branch 'qatar/master'
...
* 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-24 15:24:22 +02:00
Anton Khirnov
cb79881b49
vf_yadif: support slice threading
2013-05-24 09:32:07 +02:00
Clément Bœsch
b8a9876a8b
lavfi/yadif: add timeline support.
2013-05-21 16:09:42 +02:00
Clément Bœsch
f3962c6264
lavfi/yadif: fix chroma subsampling with odd sizes.
2013-05-16 23:20:02 +02:00
James Darnley
d10499a32a
yadif: correct strides in filter_edges_16bit
...
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-14 09:24:13 +02:00
James Darnley
b0ef0ae776
yadif: restore speed of the C filtering code
...
Always use the special filter for the first and last 3 columns (only).
Changes made in 64ed397
2013-05-14 09:23:55 +02:00
Michael Niedermayer
ab6091f8e2
Merge commit '7536c671040f1f3ebc9f0d3b7831dac71436b775'
...
* 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-11 01:18:18 +02:00
Anton Khirnov
7536c67104
vf_yadif: switch to an AVOptions-based system.
2013-04-09 19:09:03 +02:00
Nicolas George
2753d4ebf0
lavfi/vf_yadif: use standard options parsing.
2013-03-20 21:13:56 +01:00
James Darnley
7976d92dac
yadif: cosmetic indentation from previous commits
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-16 22:33:06 +01:00
James Darnley
17e7b49501
yadif: x86 assembly for 16-bit samples
...
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-16 22:32:34 +01:00
James Darnley
3d751b1ef6
yadif: correct strides in filter_edges_16bit
...
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-15 19:10:55 +01:00
