MrBesen
/
ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
103,043 Commits 4 Branches 0 Tags 195 MiB
Commit Graph

176 Commits

Author SHA1 Message Date
Andreas Rheinhardt 2c05ee092b avutil/internal, swresample/audioconvert: Remove cpu.h inclusions 
These inclusions are not necessary, as cpu.h is already included
wherever it is needed (via direct inclusion or via the arch-specific
headers).
Also remove other unnecessary cpu.h inclusions from ordinary
non-headers.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
 2021-07-22 14:33:45 +02:00
Michael Niedermayer 7971f62120 avfilter/vf_yadif: Fix handing of tiny images 
Fixes: out of array access
Fixes: Ticket8240
Fixes: CVE-2020-22021

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2021-05-29 20:14:24 +02:00
Tom Boshoven 8205f32663 avfilter/yadif: Fix time base for large denominators 
This fixes an issue where the yadif filter could cause the timebase denominator to overflow.

Signed-off-by: Tom Boshoven <tom@jwplayer.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2021-05-27 17:43:40 +02:00
Andreas Rheinhardt a04ad248a0 avfilter: Constify all AVFilters 
This is possible now that the next-API is gone.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Signed-off-by: James Almer <jamrial@gmail.com>
 2021-04-27 11:48:05 -03:00
Limin Wang 71ec3e4583 Revert "avfilter/yadif: simplify the code for better readability" 
This reverts commit 2a9b934675.
 2020-08-27 07:30:30 +08:00
Limin Wang 2a9b934675 avfilter/yadif: simplify the code for better readability 
Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
 2020-08-26 14:21:11 +08:00
Limin Wang 3dd6c4478b avfilter/vf_yadif: cosmetics in the pix_fmts[] array 
Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2019-12-25 18:00:40 +01:00
Limin Wang c1ed00fd18 avfilter/vf_yadif: rename config_props -> config_output, link -> outlink 
Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2019-11-29 00:03:28 +01:00
Philip Langdale 598f0f3927 libavfilter/vf_yadif: Make frame management logic and options shareable 
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.
 2018-11-02 11:24:05 -07:00
James Almer 672e704e4a Merge commit 'feed239021bad89743d5e7989b426ae594322eb7' 
* commit 'feed239021bad89743d5e7989b426ae594322eb7':
  yadif: Account for the buffer alignment while processing the frame edges

See 221f902f1d

Merged-by: James Almer <jamrial@gmail.com>
 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)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 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), caused deint=1 (e.g., yadif=0👎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.

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 99c4abfe88 Revert "Revert "yadif: add parens around macro parameters"" 
This reverts commit ab00800cde.

Signed-off-by: Robert Krüger <krueger@lesspain.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 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.

Signed-off-by: Robert Krüger <krueger@lesspain.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 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.
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-01 20:26:26 +01:00
Michael Niedermayer ab00800cde Revert "yadif: add parens around macro parameters" 
This reverts commit 49e617f956.
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-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.
This reduces the amount of non LGPL code, making a relicensing to LGPL
easier

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 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