History

lavfi: add an chromaber_vulkan filter

This commit adds a chromatic aberration filter for Vulkan that attempts to emulate a lens chromatic aberration effect. For a YUV frame it will instead shift the chroma channels, providing a simple approximation.

Lynne committed 7 years ago

Commit 907ae871 parent a2db7344 files · +343 −0Browse files

Unified · Split

4 files
  1. configure +1 −0
  2. libavfilter/Makefile +1 −0
  3. libavfilter/allfilters.c +1 −0
  4. libavfilter/vf_chromaber_vulkan.c +340 −0
configure+1−0
@@ -3469,6 +3469,7 @@ bm3d_filter_select="dct" · 3468 unmodified lines
34693469 boxblur_filter_deps="gpl"
34703470 boxblur_opencl_filter_deps="opencl gpl"
34713471 bs2b_filter_deps="libbs2b"
3472+chromaber_vulkan_filter_deps="vulkan libglslang"
34723473 colorkey_opencl_filter_deps="opencl"
34733474 colormatrix_filter_deps="gpl"
34743475 convolution_opencl_filter_deps="opencl"
libavfilter/Makefile+1−0
@@ -176,6 +176,7 @@ OBJS-$(CONFIG_BOXBLUR_FILTER) += vf_boxblur.o boxblur.o · 175 unmodified lines
176176 OBJS-$(CONFIG_BOXBLUR_OPENCL_FILTER) += vf_avgblur_opencl.o opencl.o \
177177 opencl/avgblur.o boxblur.o
178178 OBJS-$(CONFIG_BWDIF_FILTER) += vf_bwdif.o yadif_common.o
179+OBJS-$(CONFIG_CHROMABER_VULKAN_FILTER) += vf_chromaber_vulkan.o vulkan.o
179180 OBJS-$(CONFIG_CHROMAHOLD_FILTER) += vf_chromakey.o
180181 OBJS-$(CONFIG_CHROMAKEY_FILTER) += vf_chromakey.o
181182 OBJS-$(CONFIG_CHROMASHIFT_FILTER) += vf_chromashift.o
libavfilter/allfilters.c+1−0
@@ -88,6 +88,7 @@ extern AVFilter ff_af_bandreject; · 87 unmodified lines
8888 extern AVFilter ff_af_bass;
8989 extern AVFilter ff_af_biquad;
9090 extern AVFilter ff_af_bs2b;
91+extern AVFilter ff_vf_chromaber_vulkan;
9192 extern AVFilter ff_af_channelmap;
9293 extern AVFilter ff_af_channelsplit;
9394 extern AVFilter ff_af_chorus;
libavfilter/vf_chromaber_vulkan.c+340−0
@@ -0,0 +1,340 @@
1+/*
2+ * This file is part of FFmpeg.
3+ *
4+ * FFmpeg is free software; you can redistribute it and/or
5+ * modify it under the terms of the GNU Lesser General Public
6+ * License as published by the Free Software Foundation; either
7+ * version 2.1 of the License, or (at your option) any later version.
8+ *
9+ * FFmpeg is distributed in the hope that it will be useful,
10+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
11+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12+ * Lesser General Public License for more details.
13+ *
14+ * You should have received a copy of the GNU Lesser General Public
15+ * License along with FFmpeg; if not, write to the Free Software
16+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17+ */
18+
19+#include "libavutil/opt.h"
20+#include "vulkan.h"
21+#include "internal.h"
22+
23+#define CGROUPS (int [3]){ 32, 32, 1 }
24+
25+typedef struct ChromaticAberrationVulkanContext {
26+ VulkanFilterContext vkctx;
27+
28+ int initialized;
29+ FFVkExecContext *exec;
30+ VulkanPipeline *pl;
31+
32+ /* Shader updators, must be in the main filter struct */
33+ VkDescriptorImageInfo input_images[3];
34+ VkDescriptorImageInfo output_images[3];
35+
36+ /* Push constants / options */
37+ struct {
38+ float dist[2];
39+ } opts;
40+} ChromaticAberrationVulkanContext;
41+
42+static const char distort_chroma_kernel[] = {
43+ C(0, void distort_rgb(ivec2 size, ivec2 pos) )
44+ C(0, { )
45+ C(1, const vec2 p = ((vec2(pos)/vec2(size)) - 0.5f)*2.0f; )
46+ C(1, const vec2 o = p * (dist - 1.0f); )
47+ C(0, )
48+ C(1, vec4 res; )
49+ C(1, res.r = texture(input_img[0], ((p - o)/2.0f) + 0.5f).r; )
50+ C(1, res.g = texture(input_img[0], ((p )/2.0f) + 0.5f).g; )
51+ C(1, res.b = texture(input_img[0], ((p + o)/2.0f) + 0.5f).b; )
52+ C(1, res.a = texture(input_img[0], ((p )/2.0f) + 0.5f).a; )
53+ C(1, imageStore(output_img[0], pos, res); )
54+ C(0, } )
55+ C(0, )
56+ C(0, void distort_chroma(int idx, ivec2 size, ivec2 pos) )
57+ C(0, { )
58+ C(1, vec2 p = ((vec2(pos)/vec2(size)) - 0.5f)*2.0f; )
59+ C(1, float d = sqrt(p.x*p.x + p.y*p.y); )
60+ C(1, p *= d / (d* dist); )
61+ C(1, vec4 res = texture(input_img[idx], (p/2.0f) + 0.5f); )
62+ C(1, imageStore(output_img[idx], pos, res); )
63+ C(0, } )
64+};
65+
66+static av_cold int init_filter(AVFilterContext *ctx, AVFrame *in)
67+{
68+ int err;
69+ ChromaticAberrationVulkanContext *s = ctx->priv;
70+
71+ /* Create a sampler */
72+ VkSampler *sampler = ff_vk_init_sampler(ctx, 0, VK_FILTER_LINEAR);
73+ if (!sampler)
74+ return AVERROR_EXTERNAL;
75+
76+ s->pl = ff_vk_create_pipeline(ctx);
77+ if (!s->pl)
78+ return AVERROR(ENOMEM);
79+
80+ /* Normalize options */
81+ s->opts.dist[0] = (s->opts.dist[0] / 100.0f) + 1.0f;
82+ s->opts.dist[1] = (s->opts.dist[1] / 100.0f) + 1.0f;
83+
84+ { /* Create the shader */
85+ const int planes = av_pix_fmt_count_planes(s->vkctx.output_format);
86+ VulkanDescriptorSetBinding desc_i[2] = {
87+ {
88+ .name = "input_img",
89+ .type = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER,
90+ .dimensions = 2,
91+ .elems = planes,
92+ .stages = VK_SHADER_STAGE_COMPUTE_BIT,
93+ .updater = s->input_images,
94+ .samplers = DUP_SAMPLER_ARRAY4(*sampler),
95+ },
96+ {
97+ .name = "output_img",
98+ .type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE,
99+ .mem_layout = ff_vk_shader_rep_fmt(s->vkctx.output_format),
100+ .mem_quali = "writeonly",
101+ .dimensions = 2,
102+ .elems = planes,
103+ .stages = VK_SHADER_STAGE_COMPUTE_BIT,
104+ .updater = s->output_images,
105+ },
106+ };
107+
108+ SPIRVShader *shd = ff_vk_init_shader(ctx, s->pl, "chromaber_compute",
109+ VK_SHADER_STAGE_COMPUTE_BIT);
110+ if (!shd)
111+ return AVERROR(ENOMEM);
112+
113+ ff_vk_set_compute_shader_sizes(ctx, shd, CGROUPS);
114+
115+ GLSLC(0, layout(push_constant, std430) uniform pushConstants { );
116+ GLSLC(1, vec2 dist; );
117+ GLSLC(0, }; );
118+ GLSLC(0, );
119+
120+ ff_vk_add_push_constant(ctx, s->pl, 0, sizeof(s->opts),
121+ VK_SHADER_STAGE_COMPUTE_BIT);
122+
123+ RET(ff_vk_add_descriptor_set(ctx, s->pl, shd, desc_i, 2, 0)); /* set 0 */
124+
125+ GLSLD( distort_chroma_kernel );
126+ GLSLC(0, void main() );
127+ GLSLC(0, { );
128+ GLSLC(1, ivec2 pos = ivec2(gl_GlobalInvocationID.xy); );
129+ if (planes == 1) {
130+ GLSLC(1, distort_rgb(imageSize(output_img[0]), pos); );
131+ } else {
132+ GLSLC(1, ivec2 size = imageSize(output_img[0]); );
133+ GLSLC(1, vec2 npos = vec2(pos)/vec2(size); );
134+ GLSLC(1, vec4 res = texture(input_img[0], npos); );
135+ GLSLC(1, imageStore(output_img[0], pos, res); );
136+ for (int i = 1; i < planes; i++) {
137+ GLSLC(0, );
138+ GLSLF(1, size = imageSize(output_img[%i]); ,i);
139+ GLSLC(1, if (IS_WITHIN(pos, size)) { );
140+ GLSLF(2, distort_chroma(%i, size, pos); ,i);
141+ GLSLC(1, } else { );
142+ GLSLC(2, npos = vec2(pos)/vec2(size); );
143+ GLSLF(2, res = texture(input_img[%i], npos); ,i);
144+ GLSLF(2, imageStore(output_img[%i], pos, res); ,i);
145+ GLSLC(1, } );
146+ }
147+ }
148+ GLSLC(0, } );
149+
150+ RET(ff_vk_compile_shader(ctx, shd, "main"));
151+ }
152+
153+ RET(ff_vk_init_pipeline_layout(ctx, s->pl));
154+ RET(ff_vk_init_compute_pipeline(ctx, s->pl));
155+
156+ /* Execution context */
157+ RET(ff_vk_create_exec_ctx(ctx, &s->exec,
158+ s->vkctx.hwctx->queue_family_comp_index));
159+
160+ s->initialized = 1;
161+
162+ return 0;
163+
164+fail:
165+ return err;
166+}
167+
168+static int process_frames(AVFilterContext *avctx, AVFrame *out_f, AVFrame *in_f)
169+{
170+ int err = 0;
171+ ChromaticAberrationVulkanContext *s = avctx->priv;
172+ AVVkFrame *in = (AVVkFrame *)in_f->data[0];
173+ AVVkFrame *out = (AVVkFrame *)out_f->data[0];
174+ int planes = av_pix_fmt_count_planes(s->vkctx.output_format);
175+
176+ for (int i = 0; i < planes; i++) {
177+ RET(ff_vk_create_imageview(avctx, &s->input_images[i].imageView, in->img[i],
178+ av_vkfmt_from_pixfmt(s->vkctx.input_format)[i],
179+ ff_comp_identity_map));
180+
181+ RET(ff_vk_create_imageview(avctx, &s->output_images[i].imageView, out->img[i],
182+ av_vkfmt_from_pixfmt(s->vkctx.output_format)[i],
183+ ff_comp_identity_map));
184+
185+ s->input_images[i].imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
186+ s->output_images[i].imageLayout = VK_IMAGE_LAYOUT_GENERAL;
187+ }
188+
189+ ff_vk_update_descriptor_set(avctx, s->pl, 0);
190+
191+ ff_vk_start_exec_recording(avctx, s->exec);
192+
193+ for (int i = 0; i < planes; i++) {
194+ VkImageMemoryBarrier bar[2] = {
195+ {
196+ .sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,
197+ .srcAccessMask = 0,
198+ .dstAccessMask = VK_ACCESS_SHADER_READ_BIT,
199+ .oldLayout = in->layout[i],
200+ .newLayout = s->input_images[i].imageLayout,
201+ .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
202+ .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
203+ .image = in->img[i],
204+ .subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT,
205+ .subresourceRange.levelCount = 1,
206+ .subresourceRange.layerCount = 1,
207+ },
208+ {
209+ .sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,
210+ .srcAccessMask = 0,
211+ .dstAccessMask = VK_ACCESS_SHADER_WRITE_BIT,
212+ .oldLayout = out->layout[i],
213+ .newLayout = s->output_images[i].imageLayout,
214+ .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
215+ .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
216+ .image = out->img[i],
217+ .subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT,
218+ .subresourceRange.levelCount = 1,
219+ .subresourceRange.layerCount = 1,
220+ },
221+ };
222+
223+ vkCmdPipelineBarrier(s->exec->buf, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT,
224+ VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT, 0,
225+ 0, NULL, 0, NULL, FF_ARRAY_ELEMS(bar), bar);
226+
227+ in->layout[i] = bar[0].newLayout;
228+ in->access[i] = bar[0].dstAccessMask;
229+
230+ out->layout[i] = bar[1].newLayout;
231+ out->access[i] = bar[1].dstAccessMask;
232+ }
233+
234+ ff_vk_bind_pipeline_exec(avctx, s->exec, s->pl);
235+
236+ ff_vk_update_push_exec(avctx, s->exec, VK_SHADER_STAGE_COMPUTE_BIT,
237+ 0, sizeof(s->opts), &s->opts);
238+
239+ vkCmdDispatch(s->exec->buf,
240+ FFALIGN(s->vkctx.output_width, CGROUPS[0])/CGROUPS[0],
241+ FFALIGN(s->vkctx.output_height, CGROUPS[1])/CGROUPS[1], 1);
242+
243+ ff_vk_add_exec_dep(avctx, s->exec, in_f, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT);
244+ ff_vk_add_exec_dep(avctx, s->exec, out_f, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT);
245+
246+ err = ff_vk_submit_exec_queue(avctx, s->exec);
247+ if (err)
248+ return err;
249+
250+ for (int i = 0; i < planes; i++) {
251+ ff_vk_destroy_imageview(avctx, &s->input_images[i].imageView);
252+ ff_vk_destroy_imageview(avctx, &s->output_images[i].imageView);
253+ }
254+
255+fail:
256+ return err;
257+}
258+
259+static int chromaber_vulkan_filter_frame(AVFilterLink *link, AVFrame *in)
260+{
261+ int err;
262+ AVFilterContext *ctx = link->dst;
263+ ChromaticAberrationVulkanContext *s = ctx->priv;
264+ AVFilterLink *outlink = ctx->outputs[0];
265+
266+ AVFrame *out = ff_get_video_buffer(outlink, outlink->w, outlink->h);
267+ if (!out) {
268+ err = AVERROR(ENOMEM);
269+ goto fail;
270+ }
271+
272+ if (!s->initialized)
273+ RET(init_filter(ctx, in));
274+
275+ RET(process_frames(ctx, out, in));
276+
277+ err = av_frame_copy_props(out, in);
278+ if (err < 0)
279+ goto fail;
280+
281+ av_frame_free(&in);
282+
283+ return ff_filter_frame(outlink, out);
284+
285+fail:
286+ av_frame_free(&in);
287+ av_frame_free(&out);
288+ return err;
289+}
290+
291+static void chromaber_vulkan_uninit(AVFilterContext *avctx)
292+{
293+ ChromaticAberrationVulkanContext *s = avctx->priv;
294+
295+ ff_vk_filter_uninit(avctx);
296+
297+ s->initialized = 0;
298+}
299+
300+#define OFFSET(x) offsetof(ChromaticAberrationVulkanContext, x)
301+#define FLAGS (AV_OPT_FLAG_FILTERING_PARAM | AV_OPT_FLAG_VIDEO_PARAM)
302+static const AVOption chromaber_vulkan_options[] = {
303+ { "dist_x", "Set horizontal distortion amount", OFFSET(opts.dist[0]), AV_OPT_TYPE_FLOAT, {.dbl = 0.0f}, -10.0f, 10.0f, .flags = FLAGS },
304+ { "dist_y", "Set vertical distortion amount", OFFSET(opts.dist[1]), AV_OPT_TYPE_FLOAT, {.dbl = 0.0f}, -10.0f, 10.0f, .flags = FLAGS },
305+ { NULL },
306+};
307+
308+AVFILTER_DEFINE_CLASS(chromaber_vulkan);
309+
310+static const AVFilterPad chromaber_vulkan_inputs[] = {
311+ {
312+ .name = "default",
313+ .type = AVMEDIA_TYPE_VIDEO,
314+ .filter_frame = &chromaber_vulkan_filter_frame,
315+ .config_props = &ff_vk_filter_config_input,
316+ },
317+ { NULL }
318+};
319+
320+static const AVFilterPad chromaber_vulkan_outputs[] = {
321+ {
322+ .name = "default",
323+ .type = AVMEDIA_TYPE_VIDEO,
324+ .config_props = &ff_vk_filter_config_output,
325+ },
326+ { NULL }
327+};
328+
329+AVFilter ff_vf_chromaber_vulkan = {
330+ .name = "chromaber_vulkan",
331+ .description = NULL_IF_CONFIG_SMALL("Offset chroma of input video (chromatic aberration)"),
332+ .priv_size = sizeof(ChromaticAberrationVulkanContext),
333+ .init = &ff_vk_filter_init,
334+ .uninit = &chromaber_vulkan_uninit,
335+ .query_formats = &ff_vk_filter_query_formats,
336+ .inputs = chromaber_vulkan_inputs,
337+ .outputs = chromaber_vulkan_outputs,
338+ .priv_class = &chromaber_vulkan_class,
339+ .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE,
340+};

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t