From patchwork Fri Mar 9 00:47:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 7878 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.181.170 with SMTP id m39csp391941jaj; Thu, 8 Mar 2018 16:47:57 -0800 (PST) X-Google-Smtp-Source: AG47ELtHTF63Rs2ZggxU2yg9vobrYYgt0QGOyq2npCDpGdtIYqI6IxlA01ZFuZJ/+/cGd0cteHIE X-Received: by 10.223.186.140 with SMTP id p12mr21238383wrg.162.1520556477116; Thu, 08 Mar 2018 16:47:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520556477; cv=none; d=google.com; s=arc-20160816; b=NSBltyWiyThy3ZBObvOCIO/BEzA1m4cg27OB+4dRDtPiXor9MiorFL6gkO748OBnHU uljkFnU1/9/DhEUX0p/NcJnWNYVIi/twzqURekzITeJFnvo9xn8a447+OAbqRKfIG9Ru MSzz9hMn2FXE1m/b95x3AL8gGm/ie8/USyOPU15O7GNqvfbJvbmBTAmydnO98doj6K1E B2xfH0VY0B7sRoMwZopoJgUUh0S1V7cr6mhqBojxirAul3v/WceEQcvtG/iHbRLm1Z0r Fj5yoE+Vxv80DnvLRok58v1jauFt53NcWtYKxqx2wIhNKrDBAtIQpbfT2sP4uPtYknpL 388Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:content-language:mime-version:user-agent:date :message-id:from:to:dkim-signature:delivered-to :arc-authentication-results; bh=QJxOrrT6IOm+TRhd7SlVI1c9zmAxqH3q8LlGW+I6CIs=; b=BKyWp77XLqwPlqz8/FyHrDd53vz3vEJyN3LxDLlhZdA0fFastouw9TDLFuIdTeWJY4 hLU4K7x4LQLqxQzwIrrXsTSsBHVVdNP5RMft+M62nf8FcpUXE8ZvqB6lGfEBGp+UixAl kGOby/223M8SLhrKUYL7M1iBjSwHZHIXIAmPv9eidNwQ7Zng6qDbZTsfY0aasBk2mVWX 9uJJkknSaKaWlewe7J46NoSDRukHnpC+FPHDP7KkSNVXaBUrCkAvFGtwK8b+UKJUbixe EiZCYnUzD6vuQFQycNdv1ggvomd8uadihSbB/CoG4OSJdLBRtPZIRDsf2tgd/JlMBgKk jONg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=OXS0N0dV; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p5si96139wmd.48.2018.03.08.16.47.56; Thu, 08 Mar 2018 16:47:57 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=OXS0N0dV; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 91C7168A628; Fri, 9 Mar 2018 02:47:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f169.google.com (mail-wr0-f169.google.com [209.85.128.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DC4E768A5DE for ; Fri, 9 Mar 2018 02:47:39 +0200 (EET) Received: by mail-wr0-f169.google.com with SMTP id v111so7468684wrb.3 for ; Thu, 08 Mar 2018 16:47:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=to:from:subject:message-id:date:user-agent:mime-version :content-language:content-transfer-encoding; bh=q8PEPxG8kbh9ZQQOZnIq/KNAzPsGff4tvNEBh4CgxC8=; b=OXS0N0dVJ9ILmRf/123XMlgZSo3qVE/+FnJKLzQ1io2VojM8Wck+bSHk4zeIRem+CF zl0MT4fMkm5NptD7zNzjAz9mDF304OzeUyY2Vl6com5Yi/Gsr1qY1lJDheHsOlZWdBt6 iWbHwAyenxgDxch2iwFPDs7NnPSyabE9cFGX7LKpr1QVzvobh+I6GL05FwrfHa02+2Wz pha7Wu6OVQ7RLNvephwG5ffqyAVyins/0yCj2zlSoRsMZnfzqutmvNtVBI/2mYa7FP9f u/4wJPhy87DqCgZR+0PF9pxXnbD/SVffXhyYFGnaD+A7DZG24phoMsz47xkekO9TVQOJ U5lg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-language:content-transfer-encoding; bh=q8PEPxG8kbh9ZQQOZnIq/KNAzPsGff4tvNEBh4CgxC8=; b=jAxr0on1FNVUzFZby5whJMFXjfiv4vWCyz2IS1JkC+2KW1HMNaYH/Cor1rrgH5BZQQ bwlKXddTOEbmfGXK7+NZuCXMMgNqkNb32uafIsYRD8/ZH9xM2yYpyrQVhRbzI5naYtwz 3C3CtvE+uL3CnKGPAeZLka1nEAqLd5omI65q5Nj+aPuOfZMeiCn4X9jYyJ8CIAVLSa+1 llxXUnbeeIx4niB1awzjuAkUAp464+dNSVyTkevxuOHm85dmmvDXy8E33XsUkVUrPuQf HCNJki7ozMoBFL8sOk7+exQJlyn+VjpAhmNBY86Zk7lE672ni3uPcRhuCd9Rhed4Rd/q EreA== X-Gm-Message-State: APf1xPAkODbYDG5LoL+lBw+TtRXNWcOzZzevmQeQjTpYAU/iREV4Id2a EjqroypzhKUhOGaZSWNs1GRipIR4 X-Received: by 10.223.160.67 with SMTP id l3mr22473148wrl.201.1520556468281; Thu, 08 Mar 2018 16:47:48 -0800 (PST) Received: from [192.168.0.3] (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id g52sm41842199wra.20.2018.03.08.16.47.47 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Mar 2018 16:47:47 -0800 (PST) To: FFmpeg development discussions and patches From: Mark Thompson Message-ID: <8c4b71d6-2830-e38b-ac84-1c85c7d562fc@jkqxz.net> Date: Fri, 9 Mar 2018 00:47:46 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 Content-Language: en-US Subject: [FFmpeg-devel] [PATCH] vf_unsharp_opencl: Do not apply kernel to locations outside images X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- (Oops.) libavfilter/vf_unsharp_opencl.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/libavfilter/vf_unsharp_opencl.c b/libavfilter/vf_unsharp_opencl.c index 6a453c014b..3ee1b5b4ae 100644 --- a/libavfilter/vf_unsharp_opencl.c +++ b/libavfilter/vf_unsharp_opencl.c @@ -236,6 +236,7 @@ static int unsharp_opencl_filter_frame(AVFilterLink *inlink, AVFrame *input) size_t global_work[2]; size_t local_work[2]; cl_mem src, dst; + size_t plane_width, plane_height; int err, p; av_log(ctx, AV_LOG_DEBUG, "Filter input: %s, %ux%u (%"PRId64").\n", @@ -268,6 +269,21 @@ static int unsharp_opencl_filter_frame(AVFilterLink *inlink, AVFrame *input) if (!dst) break; + cle = clGetImageInfo(src, CL_IMAGE_WIDTH, + sizeof(plane_width), &plane_width, NULL); + if (cle != CL_SUCCESS) { + av_log(avctx, AV_LOG_ERROR, "Failed to get plane %d " + "width: %d.\n", p, cle); + goto fail; + } + cle = clGetImageInfo(src, CL_IMAGE_HEIGHT, + sizeof(plane_height), &plane_height, NULL); + if (cle != CL_SUCCESS) { + av_log(avctx, AV_LOG_ERROR, "Failed to get plane %d " + "height: %d.\n", p, cle); + goto fail; + } + cle = clSetKernelArg(ctx->kernel, 0, sizeof(cl_mem), &dst); if (cle != CL_SUCCESS) { av_log(avctx, AV_LOG_ERROR, "Failed to set kernel " @@ -321,11 +337,11 @@ static int unsharp_opencl_filter_frame(AVFilterLink *inlink, AVFrame *input) } if (ctx->global) { - global_work[0] = output->width; - global_work[1] = output->height; + global_work[0] = plane_width; + global_work[1] = plane_height; } else { - global_work[0] = FFALIGN(output->width, 16); - global_work[1] = FFALIGN(output->height, 16); + global_work[0] = FFALIGN(plane_width, 16); + global_work[1] = FFALIGN(plane_height, 16); local_work[0] = 16; local_work[1] = 16; }