From 57fa9e8bb22f94481e093c1c6df3d548c754b55e Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Tue, 24 Jul 2012 10:46:39 +0200 Subject: [PATCH] guadi: prefix orc functions with gaudi_orc_ --- gst/gaudieffects/gstburn.c | 2 +- gst/gaudieffects/gstgaudieffectsorc-dist.c | 14 +++++++------- gst/gaudieffects/gstgaudieffectsorc-dist.h | 2 +- gst/gaudieffects/gstgaudieffectsorc.orc | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/gst/gaudieffects/gstburn.c b/gst/gaudieffects/gstburn.c index 02d03e7f8a..c64092ed16 100644 --- a/gst/gaudieffects/gstburn.c +++ b/gst/gaudieffects/gstburn.c @@ -256,7 +256,7 @@ gst_burn_transform_frame (GstVideoFilter * vfilter, GST_OBJECT_UNLOCK (filter); /*** Now the image processing work.... ***/ - orc_gaudi_burn (dest, src, adjustment, video_size); + gaudi_orc_burn (dest, src, adjustment, video_size); return GST_FLOW_OK; } diff --git a/gst/gaudieffects/gstgaudieffectsorc-dist.c b/gst/gaudieffects/gstgaudieffectsorc-dist.c index cd9896be42..0486e5d45b 100644 --- a/gst/gaudieffects/gstgaudieffectsorc-dist.c +++ b/gst/gaudieffects/gstgaudieffectsorc-dist.c @@ -82,7 +82,7 @@ typedef union #ifndef DISABLE_ORC #include #endif -void orc_gaudi_burn (guint32 * ORC_RESTRICT d1, const guint32 * ORC_RESTRICT s1, +void gaudi_orc_burn (guint32 * ORC_RESTRICT d1, const guint32 * ORC_RESTRICT s1, int p1, int n); @@ -130,10 +130,10 @@ void orc_gaudi_burn (guint32 * ORC_RESTRICT d1, const guint32 * ORC_RESTRICT s1, -/* orc_gaudi_burn */ +/* gaudi_orc_burn */ #ifdef DISABLE_ORC void -orc_gaudi_burn (guint32 * ORC_RESTRICT d1, const guint32 * ORC_RESTRICT s1, +gaudi_orc_burn (guint32 * ORC_RESTRICT d1, const guint32 * ORC_RESTRICT s1, int p1, int n) { int i; @@ -246,7 +246,7 @@ orc_gaudi_burn (guint32 * ORC_RESTRICT d1, const guint32 * ORC_RESTRICT s1, #else static void -_backup_orc_gaudi_burn (OrcExecutor * ORC_RESTRICT ex) +_backup_gaudi_orc_burn (OrcExecutor * ORC_RESTRICT ex) { int i; int n = ex->n; @@ -358,7 +358,7 @@ _backup_orc_gaudi_burn (OrcExecutor * ORC_RESTRICT ex) } void -orc_gaudi_burn (guint32 * ORC_RESTRICT d1, const guint32 * ORC_RESTRICT s1, +gaudi_orc_burn (guint32 * ORC_RESTRICT d1, const guint32 * ORC_RESTRICT s1, int p1, int n) { OrcExecutor _ex, *ex = &_ex; @@ -372,8 +372,8 @@ orc_gaudi_burn (guint32 * ORC_RESTRICT d1, const guint32 * ORC_RESTRICT s1, OrcProgram *p; p = orc_program_new (); - orc_program_set_name (p, "orc_gaudi_burn"); - orc_program_set_backup_function (p, _backup_orc_gaudi_burn); + orc_program_set_name (p, "gaudi_orc_burn"); + orc_program_set_backup_function (p, _backup_gaudi_orc_burn); orc_program_add_destination (p, 4, "d1"); orc_program_add_source (p, 4, "s1"); orc_program_add_constant (p, 1, 0x000000ff, "c1"); diff --git a/gst/gaudieffects/gstgaudieffectsorc-dist.h b/gst/gaudieffects/gstgaudieffectsorc-dist.h index 87aed19905..09e10e73fa 100644 --- a/gst/gaudieffects/gstgaudieffectsorc-dist.h +++ b/gst/gaudieffects/gstgaudieffectsorc-dist.h @@ -67,7 +67,7 @@ typedef union { orc_int64 i; double f; orc_int32 x2[2]; float x2f[2]; orc_int16 #define ORC_RESTRICT #endif #endif -void orc_gaudi_burn (guint32 * ORC_RESTRICT d1, const guint32 * ORC_RESTRICT s1, int p1, int n); +void gaudi_orc_burn (guint32 * ORC_RESTRICT d1, const guint32 * ORC_RESTRICT s1, int p1, int n); #ifdef __cplusplus } diff --git a/gst/gaudieffects/gstgaudieffectsorc.orc b/gst/gaudieffects/gstgaudieffectsorc.orc index 5cc74544a4..a9915fead5 100644 --- a/gst/gaudieffects/gstgaudieffectsorc.orc +++ b/gst/gaudieffects/gstgaudieffectsorc.orc @@ -1,5 +1,5 @@ -.function orc_gaudi_burn +.function gaudi_orc_burn .dest 4 dest guint32 .source 4 src guint32 .param 4 adj gint @@ -23,4 +23,4 @@ x4 divluw tmp2, tmp2, a2 # tmp = tmp / a x4 subw tmp2, c255, tmp2 # tmp = 255 - tmp x4 convwb tmp, tmp2 # convert from size 2 to 1 -storel dest, tmp \ No newline at end of file +storel dest, tmp