[FFmpeg-devel] [PATCH] lavfi: modify names of deshake_kernel.h and unsharp_kernel.h

[Stefano Sabatini]

On date Wednesday 2013-05-08 08:58:16 +0800, Wei Gao encoded:
> 2013/5/8 Stefano Sabatini <stefasab at gmail.com>
> 
> > On date Wednesday 2013-05-08 01:04:13 +0200, Clément Bœsch encoded:
> > > On Wed, May 08, 2013 at 12:56:34AM +0200, Stefano Sabatini wrote:
> > > [...]
> > > > > --- a/libavfilter/unsharp_kernel.h
> > > > > +++ b/libavfilter/unsharp_opencl_kernel.h
> > > > > @@ -134,4 +134,4 @@ kernel void unsharp(global  unsigned char *src,
> > > > >
> > > > >  );
> > > > >
> > > > > -#endif /* AVFILTER_UNSHARP_KERNEL_H */
> > > > > +#endif /* AVFILTER_UNSHARP_OPENCL_KERNEL_H */
> > > >
> > > > same here.
> > > >
> > > > LGTM otherwise, thanks.
> > >
> > > Maybe it would be better to use a opencl_ prefix though (so files are
> > > sticked together)
> >
> > Or alternatively put the files in a dedicated opencl dir (like we
> > basically do for ASM). But I consider per-filter grouping better than
> > per architecture grouping in this specific case, so I'd stick with
> > this patch approach.
> >
> Hi, thanks for reviewing, the attachment is the patch.
> 
> Thanks
> Best regards
> 
> > --
> > FFmpeg = Fiendish & Fiendish Mean Picky Evanescent Gadget
> > _______________________________________________
> > ffmpeg-devel mailing list
> > ffmpeg-devel at ffmpeg.org
> > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> >

> From bc5dd69f6d5cd0618d9ec98c3caec7c035b93714 Mon Sep 17 00:00:00 2001
> From: highgod0401 <highgod0401 at gmail.com>
> Date: Wed, 8 May 2013 08:53:09 +0800
> Subject: [PATCH] lavfi: modify names of deshake_kernel.h and unsharp_kernel.h
> 
> ---
>  libavfilter/Makefile                                      | 2 +-
>  libavfilter/{deshake_kernel.h => deshake_opencl_kernel.h} | 6 +++---
>  libavfilter/opencl_allkernels.c                           | 4 ++--
>  libavfilter/{unsharp_kernel.h => unsharp_opencl_kernel.h} | 6 +++---
>  4 files changed, 9 insertions(+), 9 deletions(-)
>  rename libavfilter/{deshake_kernel.h => deshake_opencl_kernel.h} (98%)
>  rename libavfilter/{unsharp_kernel.h => unsharp_opencl_kernel.h} (97%)
> 
> diff --git a/libavfilter/Makefile b/libavfilter/Makefile
> index f0e703e..8efbbbd 100644
> --- a/libavfilter/Makefile
> +++ b/libavfilter/Makefile
> @@ -232,7 +232,7 @@ OBJS-$(CONFIG_AMOVIE_FILTER)                 += src_movie.o
>  OBJS-$(CONFIG_MOVIE_FILTER)                  += src_movie.o
>  
>  SKIPHEADERS-$(CONFIG_LIBVIDSTAB)             += vidstabutils.h
> -SKIPHEADERS-$(CONFIG_OPENCL)                 += opencl_internal.h deshake_kernel.h unsharp_kernel.h
> +SKIPHEADERS-$(CONFIG_OPENCL)                 += opencl_internal.h deshake_opencl_kernel.h unsharp_opencl_kernel.h
>  
>  TOOLS     = graph2dot
>  TESTPROGS = drawutils filtfmts formats
> diff --git a/libavfilter/deshake_kernel.h b/libavfilter/deshake_opencl_kernel.h
> similarity index 98%
> rename from libavfilter/deshake_kernel.h
> rename to libavfilter/deshake_opencl_kernel.h
> index 1eb06fe..ca0bf83 100644
> --- a/libavfilter/deshake_kernel.h
> +++ b/libavfilter/deshake_opencl_kernel.h
> @@ -19,8 +19,8 @@
>   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
>   */
>  
> -#ifndef AVFILTER_DESHAKE_KERNEL_H
> -#define AVFILTER_DESHAKE_KERNEL_H
> +#ifndef AVFILTER_DESHAKE_OPENCL_KERNEL_H
> +#define AVFILTER_DESHAKE_OPENCL_KERNEL_H
>  
>  #include "libavutil/opencl.h"
>  
> @@ -214,4 +214,4 @@ kernel void avfilter_transform(global  unsigned char *src,
>  }
>  );
>  
> -#endif /* AVFILTER_DESHAKE_KERNEL_H */
> +#endif /* AVFILTER_DESHAKE_OPENCL_KERNEL_H */
> diff --git a/libavfilter/opencl_allkernels.c b/libavfilter/opencl_allkernels.c
> index b4530c0..6d80fa8 100644
> --- a/libavfilter/opencl_allkernels.c
> +++ b/libavfilter/opencl_allkernels.c
> @@ -21,8 +21,8 @@
>  #include "opencl_allkernels.h"
>  #if CONFIG_OPENCL
>  #include "libavutil/opencl.h"
> -#include "deshake_kernel.h"
> -#include "unsharp_kernel.h"
> +#include "deshake_opencl_kernel.h"
> +#include "unsharp_opencl_kernel.h"
>  #endif
>  
>  #define OPENCL_REGISTER_KERNEL_CODE(X, x)                                              \
> diff --git a/libavfilter/unsharp_kernel.h b/libavfilter/unsharp_opencl_kernel.h
> similarity index 97%
> rename from libavfilter/unsharp_kernel.h
> rename to libavfilter/unsharp_opencl_kernel.h
> index dd65bc0..0cc8e90 100644
> --- a/libavfilter/unsharp_kernel.h
> +++ b/libavfilter/unsharp_opencl_kernel.h
> @@ -18,8 +18,8 @@
>   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
>   */
>  
> -#ifndef AVFILTER_UNSHARP_KERNEL_H
> -#define AVFILTER_UNSHARP_KERNEL_H
> +#ifndef AVFILTER_UNSHARP_OPENCL_KERNEL_H
> +#define AVFILTER_UNSHARP_OPENCL_KERNEL_H
>  
>  #include "libavutil/opencl.h"
>  
> @@ -134,4 +134,4 @@ kernel void unsharp(global  unsigned char *src,
>  
>  );
>  
> -#endif /* AVFILTER_UNSHARP_KERNEL_H */
> +#endif /* AVFILTER_UNSHARP_OPENCL_KERNEL_H */

Looks Good To Me, thanks.
-- 
FFmpeg = Fast Faithless Mythic Programmable Extroverse Governor