videomixer: prefix orc functions with video_mixer_orc_

diff --git a/gst/videomixer/blend.c b/gst/videomixer/blend.c
index a54aab8..b7e24a1 100644 (file)
--- a/gst/videomixer/blend.c
+++ b/gst/videomixer/blend.c
@@ -97,7 +97,7 @@ _##method##_loop_##name (guint8 * dest, const guint8 * src, gint src_height, \
     gint src_width, gint src_stride, gint dest_stride, guint s_alpha) \
 { \
   s_alpha = MIN (255, s_alpha); \
-  orc_##method##_##name (dest, dest_stride, src, src_stride, \
+  video_mixer_orc_##method##_##name (dest, dest_stride, src, src_stride, \
       s_alpha, src_width, src_height); \
 }
 
@@ -188,7 +188,7 @@ fill_color_##name (GstVideoFrame * frame, gint Y, gint U, gint V) \
   } \
   val = GUINT32_FROM_BE ((0xff << A) | (c1 << C1) | (c2 << C2) | (c3 << C3)); \
   \
-  orc_splat_u32 ((guint32 *) dest, val, height * width); \
+  video_mixer_orc_splat_u32 ((guint32 *) dest, val, height * width); \
 }
 
 A32_COLOR (argb, TRUE, 24, 16, 8, 0);
@@ -425,20 +425,20 @@ fill_color_##format_name (GstVideoFrame * frame, \
 #define GST_ROUND_UP_1(x) (x)
 
 PLANAR_YUV_BLEND (i420, GST_VIDEO_FORMAT_I420, GST_ROUND_UP_2,
-    GST_ROUND_UP_2, memcpy, orc_blend_u8);
+    GST_ROUND_UP_2, memcpy, video_mixer_orc_blend_u8);
 PLANAR_YUV_FILL_CHECKER (i420, GST_VIDEO_FORMAT_I420, memset);
 PLANAR_YUV_FILL_COLOR (i420, GST_VIDEO_FORMAT_I420, memset);
 PLANAR_YUV_FILL_COLOR (yv12, GST_VIDEO_FORMAT_YV12, memset);
 PLANAR_YUV_BLEND (y444, GST_VIDEO_FORMAT_Y444, GST_ROUND_UP_1,
-    GST_ROUND_UP_1, memcpy, orc_blend_u8);
+    GST_ROUND_UP_1, memcpy, video_mixer_orc_blend_u8);
 PLANAR_YUV_FILL_CHECKER (y444, GST_VIDEO_FORMAT_Y444, memset);
 PLANAR_YUV_FILL_COLOR (y444, GST_VIDEO_FORMAT_Y444, memset);
 PLANAR_YUV_BLEND (y42b, GST_VIDEO_FORMAT_Y42B, GST_ROUND_UP_2,
-    GST_ROUND_UP_1, memcpy, orc_blend_u8);
+    GST_ROUND_UP_1, memcpy, video_mixer_orc_blend_u8);
 PLANAR_YUV_FILL_CHECKER (y42b, GST_VIDEO_FORMAT_Y42B, memset);
 PLANAR_YUV_FILL_COLOR (y42b, GST_VIDEO_FORMAT_Y42B, memset);
 PLANAR_YUV_BLEND (y41b, GST_VIDEO_FORMAT_Y41B, GST_ROUND_UP_4,
-    GST_ROUND_UP_1, memcpy, orc_blend_u8);
+    GST_ROUND_UP_1, memcpy, video_mixer_orc_blend_u8);
 PLANAR_YUV_FILL_CHECKER (y41b, GST_VIDEO_FORMAT_Y41B, memset);
 PLANAR_YUV_FILL_COLOR (y41b, GST_VIDEO_FORMAT_Y41B, memset);
 
@@ -581,12 +581,12 @@ _memset_##name (guint8* dest, gint red, gint green, gint blue, gint width) { \
   guint32 val; \
   \
   val = GUINT32_FROM_BE ((red << r) | (green << g) | (blue << b)); \
-  orc_splat_u32 ((guint32 *) dest, val, width); \
+  video_mixer_orc_splat_u32 ((guint32 *) dest, val, width); \
 }
 
-#define _orc_memcpy_u32(dest,src,len) orc_memcpy_u32((guint32 *) dest, (const guint32 *) src, len/4)
+#define _orc_memcpy_u32(dest,src,len) video_mixer_orc_memcpy_u32((guint32 *) dest, (const guint32 *) src, len/4)
 
-RGB_BLEND (rgb, 3, memcpy, orc_blend_u8);
+RGB_BLEND (rgb, 3, memcpy, video_mixer_orc_blend_u8);
 RGB_FILL_CHECKER_C (rgb, 3, 0, 1, 2);
 MEMSET_RGB_C (rgb, 0, 1, 2);
 RGB_FILL_COLOR (rgb_c, 3, _memset_rgb_c);
@@ -594,7 +594,7 @@ RGB_FILL_COLOR (rgb_c, 3, _memset_rgb_c);
 MEMSET_RGB_C (bgr, 2, 1, 0);
 RGB_FILL_COLOR (bgr_c, 3, _memset_bgr_c);
 
-RGB_BLEND (xrgb, 4, _orc_memcpy_u32, orc_blend_u8);
+RGB_BLEND (xrgb, 4, _orc_memcpy_u32, video_mixer_orc_blend_u8);
 RGB_FILL_CHECKER_C (xrgb, 4, 1, 2, 3);
 MEMSET_XRGB (xrgb, 24, 16, 0);
 RGB_FILL_COLOR (xrgb, 4, _memset_xrgb);
@@ -729,12 +729,12 @@ fill_color_##name (GstVideoFrame * frame, \
   val = GUINT32_FROM_BE ((colY << Y1) | (colY << Y2) | (colU << U) | (colV << V)); \
   \
   for (i = 0; i < height; i++) { \
-    orc_splat_u32 ((guint32 *) dest, val, width); \
+    video_mixer_orc_splat_u32 ((guint32 *) dest, val, width); \
     dest += dest_stride; \
   } \
 }
 
-PACKED_422_BLEND (yuy2, memcpy, orc_blend_u8);
+PACKED_422_BLEND (yuy2, memcpy, video_mixer_orc_blend_u8);
 PACKED_422_FILL_CHECKER_C (yuy2, 0, 1, 2, 3);
 PACKED_422_FILL_CHECKER_C (uyvy, 1, 0, 3, 2);
 PACKED_422_FILL_COLOR (yuy2, 24, 16, 8, 0);

diff --git a/gst/videomixer/blendorc-dist.c b/gst/videomixer/blendorc-dist.c
index ee783d8..c842292 100644 (file)
--- a/gst/videomixer/blendorc-dist.c
+++ b/gst/videomixer/blendorc-dist.c
@@ -82,18 +82,18 @@ typedef union
 #ifndef DISABLE_ORC
 #include <orc/orc.h>
 #endif
-void orc_splat_u32 (guint32 * ORC_RESTRICT d1, int p1, int n);
-void orc_memcpy_u32 (guint32 * ORC_RESTRICT d1, const guint32 * ORC_RESTRICT s1,
-    int n);
-void orc_blend_u8 (guint8 * ORC_RESTRICT d1, int d1_stride,
+void video_mixer_orc_splat_u32 (guint32 * ORC_RESTRICT d1, int p1, int n);
+void video_mixer_orc_memcpy_u32 (guint32 * ORC_RESTRICT d1,
+    const guint32 * ORC_RESTRICT s1, int n);
+void video_mixer_orc_blend_u8 (guint8 * ORC_RESTRICT d1, int d1_stride,
     const guint8 * ORC_RESTRICT s1, int s1_stride, int p1, int n, int m);
-void orc_blend_argb (guint8 * ORC_RESTRICT d1, int d1_stride,
+void video_mixer_orc_blend_argb (guint8 * ORC_RESTRICT d1, int d1_stride,
     const guint8 * ORC_RESTRICT s1, int s1_stride, int p1, int n, int m);
-void orc_blend_bgra (guint8 * ORC_RESTRICT d1, int d1_stride,
+void video_mixer_orc_blend_bgra (guint8 * ORC_RESTRICT d1, int d1_stride,
     const guint8 * ORC_RESTRICT s1, int s1_stride, int p1, int n, int m);
-void orc_overlay_argb (guint8 * ORC_RESTRICT d1, int d1_stride,
+void video_mixer_orc_overlay_argb (guint8 * ORC_RESTRICT d1, int d1_stride,
     const guint8 * ORC_RESTRICT s1, int s1_stride, int p1, int n, int m);
-void orc_overlay_bgra (guint8 * ORC_RESTRICT d1, int d1_stride,
+void video_mixer_orc_overlay_bgra (guint8 * ORC_RESTRICT d1, int d1_stride,
     const guint8 * ORC_RESTRICT s1, int s1_stride, int p1, int n, int m);
 
 
@@ -141,10 +141,10 @@ void orc_overlay_bgra (guint8 * ORC_RESTRICT d1, int d1_stride,
 
 
 
-/* orc_splat_u32 */
+/* video_mixer_orc_splat_u32 */
 #ifdef DISABLE_ORC
 void
-orc_splat_u32 (guint32 * ORC_RESTRICT d1, int p1, int n)
+video_mixer_orc_splat_u32 (guint32 * ORC_RESTRICT d1, int p1, int n)
 {
   int i;
   orc_union32 *ORC_RESTRICT ptr0;
@@ -167,7 +167,7 @@ orc_splat_u32 (guint32 * ORC_RESTRICT d1, int p1, int n)
 
 #else
 static void
-_backup_orc_splat_u32 (OrcExecutor * ORC_RESTRICT ex)
+_backup_video_mixer_orc_splat_u32 (OrcExecutor * ORC_RESTRICT ex)
 {
   int i;
   int n = ex->n;
@@ -190,7 +190,7 @@ _backup_orc_splat_u32 (OrcExecutor * ORC_RESTRICT ex)
 }
 
 void
-orc_splat_u32 (guint32 * ORC_RESTRICT d1, int p1, int n)
+video_mixer_orc_splat_u32 (guint32 * ORC_RESTRICT d1, int p1, int n)
 {
   OrcExecutor _ex, *ex = &_ex;
   static volatile int p_inited = 0;
@@ -202,8 +202,8 @@ orc_splat_u32 (guint32 * ORC_RESTRICT d1, int p1, int n)
     if (!p_inited) {
 
       p = orc_program_new ();
-      orc_program_set_name (p, "orc_splat_u32");
-      orc_program_set_backup_function (p, _backup_orc_splat_u32);
+      orc_program_set_name (p, "video_mixer_orc_splat_u32");
+      orc_program_set_backup_function (p, _backup_video_mixer_orc_splat_u32);
       orc_program_add_destination (p, 4, "d1");
       orc_program_add_parameter (p, 4, "p1");
 
@@ -227,11 +227,11 @@ orc_splat_u32 (guint32 * ORC_RESTRICT d1, int p1, int n)
 #endif
 
 
-/* orc_memcpy_u32 */
+/* video_mixer_orc_memcpy_u32 */
 #ifdef DISABLE_ORC
 void
-orc_memcpy_u32 (guint32 * ORC_RESTRICT d1, const guint32 * ORC_RESTRICT s1,
-    int n)
+video_mixer_orc_memcpy_u32 (guint32 * ORC_RESTRICT d1,
+    const guint32 * ORC_RESTRICT s1, int n)
 {
   int i;
   orc_union32 *ORC_RESTRICT ptr0;
@@ -256,7 +256,7 @@ orc_memcpy_u32 (guint32 * ORC_RESTRICT d1, const guint32 * ORC_RESTRICT s1,
 
 #else
 static void
-_backup_orc_memcpy_u32 (OrcExecutor * ORC_RESTRICT ex)
+_backup_video_mixer_orc_memcpy_u32 (OrcExecutor * ORC_RESTRICT ex)
 {
   int i;
   int n = ex->n;
@@ -281,8 +281,8 @@ _backup_orc_memcpy_u32 (OrcExecutor * ORC_RESTRICT ex)
 }
 
 void
-orc_memcpy_u32 (guint32 * ORC_RESTRICT d1, const guint32 * ORC_RESTRICT s1,
-    int n)
+video_mixer_orc_memcpy_u32 (guint32 * ORC_RESTRICT d1,
+    const guint32 * ORC_RESTRICT s1, int n)
 {
   OrcExecutor _ex, *ex = &_ex;
   static volatile int p_inited = 0;
@@ -294,8 +294,8 @@ orc_memcpy_u32 (guint32 * ORC_RESTRICT d1, const guint32 * ORC_RESTRICT s1,
     if (!p_inited) {
 
       p = orc_program_new ();
-      orc_program_set_name (p, "orc_memcpy_u32");
-      orc_program_set_backup_function (p, _backup_orc_memcpy_u32);
+      orc_program_set_name (p, "video_mixer_orc_memcpy_u32");
+      orc_program_set_backup_function (p, _backup_video_mixer_orc_memcpy_u32);
       orc_program_add_destination (p, 4, "d1");
       orc_program_add_source (p, 4, "s1");
 
@@ -319,10 +319,10 @@ orc_memcpy_u32 (guint32 * ORC_RESTRICT d1, const guint32 * ORC_RESTRICT s1,
 #endif
 
 
-/* orc_blend_u8 */
+/* video_mixer_orc_blend_u8 */
 #ifdef DISABLE_ORC
 void
-orc_blend_u8 (guint8 * ORC_RESTRICT d1, int d1_stride,
+video_mixer_orc_blend_u8 (guint8 * ORC_RESTRICT d1, int d1_stride,
     const guint8 * ORC_RESTRICT s1, int s1_stride, int p1, int n, int m)
 {
   int i;
@@ -378,7 +378,7 @@ orc_blend_u8 (guint8 * ORC_RESTRICT d1, int d1_stride,
 
 #else
 static void
-_backup_orc_blend_u8 (OrcExecutor * ORC_RESTRICT ex)
+_backup_video_mixer_orc_blend_u8 (OrcExecutor * ORC_RESTRICT ex)
 {
   int i;
   int j;
@@ -434,7 +434,7 @@ _backup_orc_blend_u8 (OrcExecutor * ORC_RESTRICT ex)
 }
 
 void
-orc_blend_u8 (guint8 * ORC_RESTRICT d1, int d1_stride,
+video_mixer_orc_blend_u8 (guint8 * ORC_RESTRICT d1, int d1_stride,
     const guint8 * ORC_RESTRICT s1, int s1_stride, int p1, int n, int m)
 {
   OrcExecutor _ex, *ex = &_ex;
@@ -448,8 +448,8 @@ orc_blend_u8 (guint8 * ORC_RESTRICT d1, int d1_stride,
 
       p = orc_program_new ();
       orc_program_set_2d (p);
-      orc_program_set_name (p, "orc_blend_u8");
-      orc_program_set_backup_function (p, _backup_orc_blend_u8);
+      orc_program_set_name (p, "video_mixer_orc_blend_u8");
+      orc_program_set_backup_function (p, _backup_video_mixer_orc_blend_u8);
       orc_program_add_destination (p, 1, "d1");
       orc_program_add_source (p, 1, "s1");
       orc_program_add_constant (p, 1, 0x00000008, "c1");
@@ -495,10 +495,10 @@ orc_blend_u8 (guint8 * ORC_RESTRICT d1, int d1_stride,
 #endif
 
 
-/* orc_blend_argb */
+/* video_mixer_orc_blend_argb */
 #ifdef DISABLE_ORC
 void
-orc_blend_argb (guint8 * ORC_RESTRICT d1, int d1_stride,
+video_mixer_orc_blend_argb (guint8 * ORC_RESTRICT d1, int d1_stride,
     const guint8 * ORC_RESTRICT s1, int s1_stride, int p1, int n, int m)
 {
   int i;
@@ -618,7 +618,7 @@ orc_blend_argb (guint8 * ORC_RESTRICT d1, int d1_stride,
 
 #else
 static void
-_backup_orc_blend_argb (OrcExecutor * ORC_RESTRICT ex)
+_backup_video_mixer_orc_blend_argb (OrcExecutor * ORC_RESTRICT ex)
 {
   int i;
   int j;
@@ -738,7 +738,7 @@ _backup_orc_blend_argb (OrcExecutor * ORC_RESTRICT ex)
 }
 
 void
-orc_blend_argb (guint8 * ORC_RESTRICT d1, int d1_stride,
+video_mixer_orc_blend_argb (guint8 * ORC_RESTRICT d1, int d1_stride,
     const guint8 * ORC_RESTRICT s1, int s1_stride, int p1, int n, int m)
 {
   OrcExecutor _ex, *ex = &_ex;
@@ -752,8 +752,8 @@ orc_blend_argb (guint8 * ORC_RESTRICT d1, int d1_stride,
 
       p = orc_program_new ();
       orc_program_set_2d (p);
-      orc_program_set_name (p, "orc_blend_argb");
-      orc_program_set_backup_function (p, _backup_orc_blend_argb);
+      orc_program_set_name (p, "video_mixer_orc_blend_argb");
+      orc_program_set_backup_function (p, _backup_video_mixer_orc_blend_argb);
       orc_program_add_destination (p, 4, "d1");
       orc_program_add_source (p, 4, "s1");
       orc_program_add_constant (p, 4, 0x000000ff, "c1");
@@ -823,10 +823,10 @@ orc_blend_argb (guint8 * ORC_RESTRICT d1, int d1_stride,
 #endif
 
 
-/* orc_blend_bgra */
+/* video_mixer_orc_blend_bgra */
 #ifdef DISABLE_ORC
 void
-orc_blend_bgra (guint8 * ORC_RESTRICT d1, int d1_stride,
+video_mixer_orc_blend_bgra (guint8 * ORC_RESTRICT d1, int d1_stride,
     const guint8 * ORC_RESTRICT s1, int s1_stride, int p1, int n, int m)
 {
   int i;
@@ -949,7 +949,7 @@ orc_blend_bgra (guint8 * ORC_RESTRICT d1, int d1_stride,
 
 #else
 static void
-_backup_orc_blend_bgra (OrcExecutor * ORC_RESTRICT ex)
+_backup_video_mixer_orc_blend_bgra (OrcExecutor * ORC_RESTRICT ex)
 {
   int i;
   int j;
@@ -1072,7 +1072,7 @@ _backup_orc_blend_bgra (OrcExecutor * ORC_RESTRICT ex)
 }
 
 void
-orc_blend_bgra (guint8 * ORC_RESTRICT d1, int d1_stride,
+video_mixer_orc_blend_bgra (guint8 * ORC_RESTRICT d1, int d1_stride,
     const guint8 * ORC_RESTRICT s1, int s1_stride, int p1, int n, int m)
 {
   OrcExecutor _ex, *ex = &_ex;
@@ -1086,8 +1086,8 @@ orc_blend_bgra (guint8 * ORC_RESTRICT d1, int d1_stride,
 
       p = orc_program_new ();
       orc_program_set_2d (p);
-      orc_program_set_name (p, "orc_blend_bgra");
-      orc_program_set_backup_function (p, _backup_orc_blend_bgra);
+      orc_program_set_name (p, "video_mixer_orc_blend_bgra");
+      orc_program_set_backup_function (p, _backup_video_mixer_orc_blend_bgra);
       orc_program_add_destination (p, 4, "d1");
       orc_program_add_source (p, 4, "s1");
       orc_program_add_constant (p, 4, 0xff000000, "c1");
@@ -1161,10 +1161,10 @@ orc_blend_bgra (guint8 * ORC_RESTRICT d1, int d1_stride,
 #endif
 
 
-/* orc_overlay_argb */
+/* video_mixer_orc_overlay_argb */
 #ifdef DISABLE_ORC
 void
-orc_overlay_argb (guint8 * ORC_RESTRICT d1, int d1_stride,
+video_mixer_orc_overlay_argb (guint8 * ORC_RESTRICT d1, int d1_stride,
     const guint8 * ORC_RESTRICT s1, int s1_stride, int p1, int n, int m)
 {
   int i;
@@ -1361,7 +1361,7 @@ orc_overlay_argb (guint8 * ORC_RESTRICT d1, int d1_stride,
 
 #else
 static void
-_backup_orc_overlay_argb (OrcExecutor * ORC_RESTRICT ex)
+_backup_video_mixer_orc_overlay_argb (OrcExecutor * ORC_RESTRICT ex)
 {
   int i;
   int j;
@@ -1558,7 +1558,7 @@ _backup_orc_overlay_argb (OrcExecutor * ORC_RESTRICT ex)
 }
 
 void
-orc_overlay_argb (guint8 * ORC_RESTRICT d1, int d1_stride,
+video_mixer_orc_overlay_argb (guint8 * ORC_RESTRICT d1, int d1_stride,
     const guint8 * ORC_RESTRICT s1, int s1_stride, int p1, int n, int m)
 {
   OrcExecutor _ex, *ex = &_ex;
@@ -1572,8 +1572,8 @@ orc_overlay_argb (guint8 * ORC_RESTRICT d1, int d1_stride,
 
       p = orc_program_new ();
       orc_program_set_2d (p);
-      orc_program_set_name (p, "orc_overlay_argb");
-      orc_program_set_backup_function (p, _backup_orc_overlay_argb);
+      orc_program_set_name (p, "video_mixer_orc_overlay_argb");
+      orc_program_set_backup_function (p, _backup_video_mixer_orc_overlay_argb);
       orc_program_add_destination (p, 4, "d1");
       orc_program_add_source (p, 4, "s1");
       orc_program_add_constant (p, 4, 0xffffffff, "c1");
@@ -1673,10 +1673,10 @@ orc_overlay_argb (guint8 * ORC_RESTRICT d1, int d1_stride,
 #endif
 
 
-/* orc_overlay_bgra */
+/* video_mixer_orc_overlay_bgra */
 #ifdef DISABLE_ORC
 void
-orc_overlay_bgra (guint8 * ORC_RESTRICT d1, int d1_stride,
+video_mixer_orc_overlay_bgra (guint8 * ORC_RESTRICT d1, int d1_stride,
     const guint8 * ORC_RESTRICT s1, int s1_stride, int p1, int n, int m)
 {
   int i;
@@ -1879,7 +1879,7 @@ orc_overlay_bgra (guint8 * ORC_RESTRICT d1, int d1_stride,
 
 #else
 static void
-_backup_orc_overlay_bgra (OrcExecutor * ORC_RESTRICT ex)
+_backup_video_mixer_orc_overlay_bgra (OrcExecutor * ORC_RESTRICT ex)
 {
   int i;
   int j;
@@ -2082,7 +2082,7 @@ _backup_orc_overlay_bgra (OrcExecutor * ORC_RESTRICT ex)
 }
 
 void
-orc_overlay_bgra (guint8 * ORC_RESTRICT d1, int d1_stride,
+video_mixer_orc_overlay_bgra (guint8 * ORC_RESTRICT d1, int d1_stride,
     const guint8 * ORC_RESTRICT s1, int s1_stride, int p1, int n, int m)
 {
   OrcExecutor _ex, *ex = &_ex;
@@ -2096,8 +2096,8 @@ orc_overlay_bgra (guint8 * ORC_RESTRICT d1, int d1_stride,
 
       p = orc_program_new ();
       orc_program_set_2d (p);
-      orc_program_set_name (p, "orc_overlay_bgra");
-      orc_program_set_backup_function (p, _backup_orc_overlay_bgra);
+      orc_program_set_name (p, "video_mixer_orc_overlay_bgra");
+      orc_program_set_backup_function (p, _backup_video_mixer_orc_overlay_bgra);
       orc_program_add_destination (p, 4, "d1");
       orc_program_add_source (p, 4, "s1");
       orc_program_add_constant (p, 4, 0xffffffff, "c1");

diff --git a/gst/videomixer/blendorc-dist.h b/gst/videomixer/blendorc-dist.h
index 9346540..aeeb678 100644 (file)
--- a/gst/videomixer/blendorc-dist.h
+++ b/gst/videomixer/blendorc-dist.h
@@ -67,13 +67,13 @@ typedef union { orc_int64 i; double f; orc_int32 x2[2]; float x2f[2]; orc_int16
 #define ORC_RESTRICT
 #endif
 #endif
-void orc_splat_u32 (guint32 * ORC_RESTRICT d1, int p1, int n);
-void orc_memcpy_u32 (guint32 * ORC_RESTRICT d1, const guint32 * ORC_RESTRICT s1, int n);
-void orc_blend_u8 (guint8 * ORC_RESTRICT d1, int d1_stride, const guint8 * ORC_RESTRICT s1, int s1_stride, int p1, int n, int m);
-void orc_blend_argb (guint8 * ORC_RESTRICT d1, int d1_stride, const guint8 * ORC_RESTRICT s1, int s1_stride, int p1, int n, int m);
-void orc_blend_bgra (guint8 * ORC_RESTRICT d1, int d1_stride, const guint8 * ORC_RESTRICT s1, int s1_stride, int p1, int n, int m);
-void orc_overlay_argb (guint8 * ORC_RESTRICT d1, int d1_stride, const guint8 * ORC_RESTRICT s1, int s1_stride, int p1, int n, int m);
-void orc_overlay_bgra (guint8 * ORC_RESTRICT d1, int d1_stride, const guint8 * ORC_RESTRICT s1, int s1_stride, int p1, int n, int m);
+void video_mixer_orc_splat_u32 (guint32 * ORC_RESTRICT d1, int p1, int n);
+void video_mixer_orc_memcpy_u32 (guint32 * ORC_RESTRICT d1, const guint32 * ORC_RESTRICT s1, int n);
+void video_mixer_orc_blend_u8 (guint8 * ORC_RESTRICT d1, int d1_stride, const guint8 * ORC_RESTRICT s1, int s1_stride, int p1, int n, int m);
+void video_mixer_orc_blend_argb (guint8 * ORC_RESTRICT d1, int d1_stride, const guint8 * ORC_RESTRICT s1, int s1_stride, int p1, int n, int m);
+void video_mixer_orc_blend_bgra (guint8 * ORC_RESTRICT d1, int d1_stride, const guint8 * ORC_RESTRICT s1, int s1_stride, int p1, int n, int m);
+void video_mixer_orc_overlay_argb (guint8 * ORC_RESTRICT d1, int d1_stride, const guint8 * ORC_RESTRICT s1, int s1_stride, int p1, int n, int m);
+void video_mixer_orc_overlay_bgra (guint8 * ORC_RESTRICT d1, int d1_stride, const guint8 * ORC_RESTRICT s1, int s1_stride, int p1, int n, int m);
 
 #ifdef __cplusplus
 }

diff --git a/gst/videomixer/blendorc.orc b/gst/videomixer/blendorc.orc
index 9140345..cbc1a46 100644 (file)
--- a/gst/videomixer/blendorc.orc
+++ b/gst/videomixer/blendorc.orc
@@ -1,16 +1,16 @@
-.function orc_splat_u32
+.function video_mixer_orc_splat_u32
 .dest 4 d1 guint32
 .param 4 p1 guint32
 
 copyl d1, p1
 
-.function orc_memcpy_u32
+.function video_mixer_orc_memcpy_u32
 .dest 4 d1 guint32
 .source 4 s1 guint32
 
 copyl d1, s1
 
-.function orc_blend_u8
+.function video_mixer_orc_blend_u8
 .flags 2d
 .dest 1 d1 guint8
 .source 1 s1 guint8
@@ -29,7 +29,7 @@ shruw t2, t2, c1
 convsuswb d1, t2
 
 
-.function orc_blend_argb
+.function video_mixer_orc_blend_argb
 .flags 2d
 .dest 4 d guint8
 .source 4 s guint8
@@ -61,7 +61,7 @@ x4 convwb t, d_wide
 orl t, t, a_alpha
 storel d, t
 
-.function orc_blend_bgra
+.function video_mixer_orc_blend_bgra
 .flags 2d
 .dest 4 d guint8
 .source 4 s guint8
@@ -96,7 +96,7 @@ orl t, t, a_alpha
 storel d, t
 
 
-.function orc_overlay_argb
+.function video_mixer_orc_overlay_argb
 .flags 2d
 .dest 4 d guint8
 .source 4 s guint8
@@ -156,7 +156,7 @@ andl a, a, a_alpha
 orl  t, t, a
 storel d, t
 
-.function orc_overlay_bgra
+.function video_mixer_orc_overlay_bgra
 .flags 2d
 .dest 4 d guint8
 .source 4 s guint8