2017-09-11 5:46 GMT+08:00 James Almer <jamr...@gmail.com>: > On 9/10/2017 6:10 PM, Nicolas George wrote: > > Le quartidi 24 fructidor, an CCXXV, Mark Thompson a écrit : > >> Input and output formats must be the same, the overlay format must be > >> the same as the input except possibly with an additional alpha > component. > >> --- > >> configure | 1 + > >> libavfilter/Makefile | 2 + > >> libavfilter/allfilters.c | 1 + > >> libavfilter/opencl/overlay.cl | 104 ++++++++++++ > >> libavfilter/opencl_source.h | 2 + > >> libavfilter/vf_overlay_opencl.c | 347 ++++++++++++++++++++++++++++++ > ++++++++++ > >> 6 files changed, 457 insertions(+) > >> create mode 100644 libavfilter/opencl/overlay.cl > >> create mode 100644 libavfilter/vf_overlay_opencl.c > >> > >> diff --git a/configure b/configure > >> index 895ae2ec38..c036a53a69 100755 > >> --- a/configure > >> +++ b/configure > >> @@ -3178,6 +3178,7 @@ negate_filter_deps="lut_filter" > >> nnedi_filter_deps="gpl" > >> ocr_filter_deps="libtesseract" > >> ocv_filter_deps="libopencv" > >> +overlay_opencl_filter_deps="opencl" > >> owdenoise_filter_deps="gpl" > >> pan_filter_deps="swresample" > >> perspective_filter_deps="gpl" > >> diff --git a/libavfilter/Makefile b/libavfilter/Makefile > >> index cb3a1424d9..cc9d4021b8 100644 > >> --- a/libavfilter/Makefile > >> +++ b/libavfilter/Makefile > >> @@ -249,6 +249,8 @@ OBJS-$(CONFIG_OCV_FILTER) += > vf_libopencv.o > >> OBJS-$(CONFIG_OPENCL) += deshake_opencl.o > unsharp_opencl.o > >> OBJS-$(CONFIG_OSCILLOSCOPE_FILTER) += vf_datascope.o > > > >> OBJS-$(CONFIG_OVERLAY_FILTER) += vf_overlay.o > framesync2.o > >> +OBJS-$(CONFIG_OVERLAY_OPENCL_FILTER) += vf_overlay_opencl.o > opencl.o \ > >> + opencl/overlay.o > > > > Missing framesync2.o? > > Maybe it should be its own subsystem entry with the filters stating the > dependency in configure instead? It's used by enough filters by now to > justify that. > Unless of course it becomes a requirement for all filters in the long > run, where it should be an unconditional OBJS object. > looks good to me
> _____________________________________________ __ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel > _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel