From: Wim Taymans <wim.taymans@collabora.co.uk>
Date: Mon, 23 Jul 2012 15:03:53 +0000 (+0200)
Subject: videoscale: prefix orc functions with gst_video_scale_orc
X-Git-Tag: 1.19.3~511^2~6140
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d4255d43397a4f461a20b729e3d615a154b80c20;p=platform%2Fupstream%2Fgstreamer.git

videoscale: prefix orc functions with gst_video_scale_orc

See https://bugzilla.gnome.org/show_bug.cgi?id=680025
---

diff --git a/gst/videoscale/gstvideoscaleorc-dist.c b/gst/videoscale/gstvideoscaleorc-dist.c
index 401d53e..14cd6a1 100644
--- a/gst/videoscale/gstvideoscaleorc-dist.c
+++ b/gst/videoscale/gstvideoscaleorc-dist.c
@@ -82,35 +82,38 @@ typedef union
 #ifndef DISABLE_ORC
 #include <orc/orc.h>
 #endif
-void orc_merge_linear_u8 (orc_uint8 * ORC_RESTRICT d1,
+void gst_video_scale_orc_merge_linear_u8 (orc_uint8 * ORC_RESTRICT d1,
     const orc_uint8 * ORC_RESTRICT s1, const orc_uint8 * ORC_RESTRICT s2,
     int p1, int n);
-void orc_merge_linear_u16 (orc_uint16 * ORC_RESTRICT d1,
+void gst_video_scale_orc_merge_linear_u16 (orc_uint16 * ORC_RESTRICT d1,
     const orc_uint16 * ORC_RESTRICT s1, const orc_uint16 * ORC_RESTRICT s2,
     int p1, int p2, int n);
-void orc_splat_u16 (orc_uint16 * ORC_RESTRICT d1, int p1, int n);
-void orc_splat_u32 (orc_uint32 * ORC_RESTRICT d1, int p1, int n);
-void orc_splat_u64 (orc_uint64 * ORC_RESTRICT d1, orc_int64 p1, int n);
-void orc_downsample_u8 (guint8 * ORC_RESTRICT d1,
+void gst_video_scale_orc_splat_u16 (orc_uint16 * ORC_RESTRICT d1, int p1,
+    int n);
+void gst_video_scale_orc_splat_u32 (orc_uint32 * ORC_RESTRICT d1, int p1,
+    int n);
+void gst_video_scale_orc_splat_u64 (orc_uint64 * ORC_RESTRICT d1, orc_int64 p1,
+    int n);
+void gst_video_scale_orc_downsample_u8 (guint8 * ORC_RESTRICT d1,
     const guint8 * ORC_RESTRICT s1, int n);
-void orc_downsample_u16 (guint16 * ORC_RESTRICT d1,
+void gst_video_scale_orc_downsample_u16 (guint16 * ORC_RESTRICT d1,
     const guint16 * ORC_RESTRICT s1, int n);
-void gst_videoscale_orc_downsample_u32 (guint8 * ORC_RESTRICT d1,
+void gst_video_scale_orc_downsample_u32 (guint8 * ORC_RESTRICT d1,
     const guint8 * ORC_RESTRICT s1, int n);
-void gst_videoscale_orc_downsample_yuyv (guint8 * ORC_RESTRICT d1,
+void gst_video_scale_orc_downsample_yuyv (guint8 * ORC_RESTRICT d1,
     const guint8 * ORC_RESTRICT s1, int n);
-void gst_videoscale_orc_resample_nearest_u8 (guint8 * ORC_RESTRICT d1,
+void gst_video_scale_orc_resample_nearest_u8 (guint8 * ORC_RESTRICT d1,
     const guint8 * ORC_RESTRICT s1, int p1, int p2, int n);
-void gst_videoscale_orc_resample_bilinear_u8 (guint8 * ORC_RESTRICT d1,
+void gst_video_scale_orc_resample_bilinear_u8 (guint8 * ORC_RESTRICT d1,
     const guint8 * ORC_RESTRICT s1, int p1, int p2, int n);
-void gst_videoscale_orc_resample_nearest_u32 (guint8 * ORC_RESTRICT d1,
+void gst_video_scale_orc_resample_nearest_u32 (guint8 * ORC_RESTRICT d1,
     const guint8 * ORC_RESTRICT s1, int p1, int p2, int n);
-void gst_videoscale_orc_resample_bilinear_u32 (guint8 * ORC_RESTRICT d1,
+void gst_video_scale_orc_resample_bilinear_u32 (guint8 * ORC_RESTRICT d1,
     const guint8 * ORC_RESTRICT s1, int p1, int p2, int n);
-void gst_videoscale_orc_resample_merge_bilinear_u32 (guint8 * ORC_RESTRICT d1,
+void gst_video_scale_orc_resample_merge_bilinear_u32 (guint8 * ORC_RESTRICT d1,
     guint8 * ORC_RESTRICT d2, const guint8 * ORC_RESTRICT s1,
     const guint8 * ORC_RESTRICT s2, int p1, int p2, int p3, int n);
-void gst_videoscale_orc_merge_bicubic_u8 (guint8 * ORC_RESTRICT d1,
+void gst_video_scale_orc_merge_bicubic_u8 (guint8 * ORC_RESTRICT d1,
     const guint8 * ORC_RESTRICT s1, const guint8 * ORC_RESTRICT s2,
     const guint8 * ORC_RESTRICT s3, const guint8 * ORC_RESTRICT s4, int p1,
     int p2, int p3, int p4, int n);
@@ -160,10 +163,10 @@ void gst_videoscale_orc_merge_bicubic_u8 (guint8 * ORC_RESTRICT d1,
 
 
 
-/* orc_merge_linear_u8 */
+/* gst_video_scale_orc_merge_linear_u8 */
 #ifdef DISABLE_ORC
 void
-orc_merge_linear_u8 (orc_uint8 * ORC_RESTRICT d1,
+gst_video_scale_orc_merge_linear_u8 (orc_uint8 * ORC_RESTRICT d1,
     const orc_uint8 * ORC_RESTRICT s1, const orc_uint8 * ORC_RESTRICT s2,
     int p1, int n)
 {
@@ -222,7 +225,7 @@ orc_merge_linear_u8 (orc_uint8 * ORC_RESTRICT d1,
 
 #else
 static void
-_backup_orc_merge_linear_u8 (OrcExecutor * ORC_RESTRICT ex)
+_backup_gst_video_scale_orc_merge_linear_u8 (OrcExecutor * ORC_RESTRICT ex)
 {
   int i;
   int n = ex->n;
@@ -279,7 +282,7 @@ _backup_orc_merge_linear_u8 (OrcExecutor * ORC_RESTRICT ex)
 }
 
 void
-orc_merge_linear_u8 (orc_uint8 * ORC_RESTRICT d1,
+gst_video_scale_orc_merge_linear_u8 (orc_uint8 * ORC_RESTRICT d1,
     const orc_uint8 * ORC_RESTRICT s1, const orc_uint8 * ORC_RESTRICT s2,
     int p1, int n)
 {
@@ -293,8 +296,9 @@ orc_merge_linear_u8 (orc_uint8 * ORC_RESTRICT d1,
     if (!p_inited) {
 
       p = orc_program_new ();
-      orc_program_set_name (p, "orc_merge_linear_u8");
-      orc_program_set_backup_function (p, _backup_orc_merge_linear_u8);
+      orc_program_set_name (p, "gst_video_scale_orc_merge_linear_u8");
+      orc_program_set_backup_function (p,
+          _backup_gst_video_scale_orc_merge_linear_u8);
       orc_program_add_destination (p, 1, "d1");
       orc_program_add_source (p, 1, "s1");
       orc_program_add_source (p, 1, "s2");
@@ -341,10 +345,10 @@ orc_merge_linear_u8 (orc_uint8 * ORC_RESTRICT d1,
 #endif
 
 
-/* orc_merge_linear_u16 */
+/* gst_video_scale_orc_merge_linear_u16 */
 #ifdef DISABLE_ORC
 void
-orc_merge_linear_u16 (orc_uint16 * ORC_RESTRICT d1,
+gst_video_scale_orc_merge_linear_u16 (orc_uint16 * ORC_RESTRICT d1,
     const orc_uint16 * ORC_RESTRICT s1, const orc_uint16 * ORC_RESTRICT s2,
     int p1, int p2, int n)
 {
@@ -394,7 +398,7 @@ orc_merge_linear_u16 (orc_uint16 * ORC_RESTRICT d1,
 
 #else
 static void
-_backup_orc_merge_linear_u16 (OrcExecutor * ORC_RESTRICT ex)
+_backup_gst_video_scale_orc_merge_linear_u16 (OrcExecutor * ORC_RESTRICT ex)
 {
   int i;
   int n = ex->n;
@@ -442,7 +446,7 @@ _backup_orc_merge_linear_u16 (OrcExecutor * ORC_RESTRICT ex)
 }
 
 void
-orc_merge_linear_u16 (orc_uint16 * ORC_RESTRICT d1,
+gst_video_scale_orc_merge_linear_u16 (orc_uint16 * ORC_RESTRICT d1,
     const orc_uint16 * ORC_RESTRICT s1, const orc_uint16 * ORC_RESTRICT s2,
     int p1, int p2, int n)
 {
@@ -456,8 +460,9 @@ orc_merge_linear_u16 (orc_uint16 * ORC_RESTRICT d1,
     if (!p_inited) {
 
       p = orc_program_new ();
-      orc_program_set_name (p, "orc_merge_linear_u16");
-      orc_program_set_backup_function (p, _backup_orc_merge_linear_u16);
+      orc_program_set_name (p, "gst_video_scale_orc_merge_linear_u16");
+      orc_program_set_backup_function (p,
+          _backup_gst_video_scale_orc_merge_linear_u16);
       orc_program_add_destination (p, 2, "d1");
       orc_program_add_source (p, 2, "s1");
       orc_program_add_source (p, 2, "s2");
@@ -498,10 +503,10 @@ orc_merge_linear_u16 (orc_uint16 * ORC_RESTRICT d1,
 #endif
 
 
-/* orc_splat_u16 */
+/* gst_video_scale_orc_splat_u16 */
 #ifdef DISABLE_ORC
 void
-orc_splat_u16 (orc_uint16 * ORC_RESTRICT d1, int p1, int n)
+gst_video_scale_orc_splat_u16 (orc_uint16 * ORC_RESTRICT d1, int p1, int n)
 {
   int i;
   orc_union16 *ORC_RESTRICT ptr0;
@@ -524,7 +529,7 @@ orc_splat_u16 (orc_uint16 * ORC_RESTRICT d1, int p1, int n)
 
 #else
 static void
-_backup_orc_splat_u16 (OrcExecutor * ORC_RESTRICT ex)
+_backup_gst_video_scale_orc_splat_u16 (OrcExecutor * ORC_RESTRICT ex)
 {
   int i;
   int n = ex->n;
@@ -547,7 +552,7 @@ _backup_orc_splat_u16 (OrcExecutor * ORC_RESTRICT ex)
 }
 
 void
-orc_splat_u16 (orc_uint16 * ORC_RESTRICT d1, int p1, int n)
+gst_video_scale_orc_splat_u16 (orc_uint16 * ORC_RESTRICT d1, int p1, int n)
 {
   OrcExecutor _ex, *ex = &_ex;
   static volatile int p_inited = 0;
@@ -559,8 +564,9 @@ orc_splat_u16 (orc_uint16 * ORC_RESTRICT d1, int p1, int n)
     if (!p_inited) {
 
       p = orc_program_new ();
-      orc_program_set_name (p, "orc_splat_u16");
-      orc_program_set_backup_function (p, _backup_orc_splat_u16);
+      orc_program_set_name (p, "gst_video_scale_orc_splat_u16");
+      orc_program_set_backup_function (p,
+          _backup_gst_video_scale_orc_splat_u16);
       orc_program_add_destination (p, 2, "d1");
       orc_program_add_parameter (p, 2, "p1");
 
@@ -584,10 +590,10 @@ orc_splat_u16 (orc_uint16 * ORC_RESTRICT d1, int p1, int n)
 #endif
 
 
-/* orc_splat_u32 */
+/* gst_video_scale_orc_splat_u32 */
 #ifdef DISABLE_ORC
 void
-orc_splat_u32 (orc_uint32 * ORC_RESTRICT d1, int p1, int n)
+gst_video_scale_orc_splat_u32 (orc_uint32 * ORC_RESTRICT d1, int p1, int n)
 {
   int i;
   orc_union32 *ORC_RESTRICT ptr0;
@@ -610,7 +616,7 @@ orc_splat_u32 (orc_uint32 * ORC_RESTRICT d1, int p1, int n)
 
 #else
 static void
-_backup_orc_splat_u32 (OrcExecutor * ORC_RESTRICT ex)
+_backup_gst_video_scale_orc_splat_u32 (OrcExecutor * ORC_RESTRICT ex)
 {
   int i;
   int n = ex->n;
@@ -633,7 +639,7 @@ _backup_orc_splat_u32 (OrcExecutor * ORC_RESTRICT ex)
 }
 
 void
-orc_splat_u32 (orc_uint32 * ORC_RESTRICT d1, int p1, int n)
+gst_video_scale_orc_splat_u32 (orc_uint32 * ORC_RESTRICT d1, int p1, int n)
 {
   OrcExecutor _ex, *ex = &_ex;
   static volatile int p_inited = 0;
@@ -645,8 +651,9 @@ orc_splat_u32 (orc_uint32 * 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, "gst_video_scale_orc_splat_u32");
+      orc_program_set_backup_function (p,
+          _backup_gst_video_scale_orc_splat_u32);
       orc_program_add_destination (p, 4, "d1");
       orc_program_add_parameter (p, 4, "p1");
 
@@ -670,10 +677,11 @@ orc_splat_u32 (orc_uint32 * ORC_RESTRICT d1, int p1, int n)
 #endif
 
 
-/* orc_splat_u64 */
+/* gst_video_scale_orc_splat_u64 */
 #ifdef DISABLE_ORC
 void
-orc_splat_u64 (orc_uint64 * ORC_RESTRICT d1, orc_int64 p1, int n)
+gst_video_scale_orc_splat_u64 (orc_uint64 * ORC_RESTRICT d1, orc_int64 p1,
+    int n)
 {
   int i;
   orc_union64 *ORC_RESTRICT ptr0;
@@ -696,7 +704,7 @@ orc_splat_u64 (orc_uint64 * ORC_RESTRICT d1, orc_int64 p1, int n)
 
 #else
 static void
-_backup_orc_splat_u64 (OrcExecutor * ORC_RESTRICT ex)
+_backup_gst_video_scale_orc_splat_u64 (OrcExecutor * ORC_RESTRICT ex)
 {
   int i;
   int n = ex->n;
@@ -721,7 +729,8 @@ _backup_orc_splat_u64 (OrcExecutor * ORC_RESTRICT ex)
 }
 
 void
-orc_splat_u64 (orc_uint64 * ORC_RESTRICT d1, orc_int64 p1, int n)
+gst_video_scale_orc_splat_u64 (orc_uint64 * ORC_RESTRICT d1, orc_int64 p1,
+    int n)
 {
   OrcExecutor _ex, *ex = &_ex;
   static volatile int p_inited = 0;
@@ -733,8 +742,9 @@ orc_splat_u64 (orc_uint64 * ORC_RESTRICT d1, orc_int64 p1, int n)
     if (!p_inited) {
 
       p = orc_program_new ();
-      orc_program_set_name (p, "orc_splat_u64");
-      orc_program_set_backup_function (p, _backup_orc_splat_u64);
+      orc_program_set_name (p, "gst_video_scale_orc_splat_u64");
+      orc_program_set_backup_function (p,
+          _backup_gst_video_scale_orc_splat_u64);
       orc_program_add_destination (p, 8, "d1");
       orc_program_add_parameter_int64 (p, 8, "p1");
 
@@ -763,11 +773,11 @@ orc_splat_u64 (orc_uint64 * ORC_RESTRICT d1, orc_int64 p1, int n)
 #endif
 
 
-/* orc_downsample_u8 */
+/* gst_video_scale_orc_downsample_u8 */
 #ifdef DISABLE_ORC
 void
-orc_downsample_u8 (guint8 * ORC_RESTRICT d1, const guint8 * ORC_RESTRICT s1,
-    int n)
+gst_video_scale_orc_downsample_u8 (guint8 * ORC_RESTRICT d1,
+    const guint8 * ORC_RESTRICT s1, int n)
 {
   int i;
   orc_int8 *ORC_RESTRICT ptr0;
@@ -801,7 +811,7 @@ orc_downsample_u8 (guint8 * ORC_RESTRICT d1, const guint8 * ORC_RESTRICT s1,
 
 #else
 static void
-_backup_orc_downsample_u8 (OrcExecutor * ORC_RESTRICT ex)
+_backup_gst_video_scale_orc_downsample_u8 (OrcExecutor * ORC_RESTRICT ex)
 {
   int i;
   int n = ex->n;
@@ -835,8 +845,8 @@ _backup_orc_downsample_u8 (OrcExecutor * ORC_RESTRICT ex)
 }
 
 void
-orc_downsample_u8 (guint8 * ORC_RESTRICT d1, const guint8 * ORC_RESTRICT s1,
-    int n)
+gst_video_scale_orc_downsample_u8 (guint8 * ORC_RESTRICT d1,
+    const guint8 * ORC_RESTRICT s1, int n)
 {
   OrcExecutor _ex, *ex = &_ex;
   static volatile int p_inited = 0;
@@ -848,8 +858,9 @@ orc_downsample_u8 (guint8 * ORC_RESTRICT d1, const guint8 * ORC_RESTRICT s1,
     if (!p_inited) {
 
       p = orc_program_new ();
-      orc_program_set_name (p, "orc_downsample_u8");
-      orc_program_set_backup_function (p, _backup_orc_downsample_u8);
+      orc_program_set_name (p, "gst_video_scale_orc_downsample_u8");
+      orc_program_set_backup_function (p,
+          _backup_gst_video_scale_orc_downsample_u8);
       orc_program_add_destination (p, 1, "d1");
       orc_program_add_source (p, 2, "s1");
       orc_program_add_temporary (p, 1, "t1");
@@ -877,11 +888,11 @@ orc_downsample_u8 (guint8 * ORC_RESTRICT d1, const guint8 * ORC_RESTRICT s1,
 #endif
 
 
-/* orc_downsample_u16 */
+/* gst_video_scale_orc_downsample_u16 */
 #ifdef DISABLE_ORC
 void
-orc_downsample_u16 (guint16 * ORC_RESTRICT d1, const guint16 * ORC_RESTRICT s1,
-    int n)
+gst_video_scale_orc_downsample_u16 (guint16 * ORC_RESTRICT d1,
+    const guint16 * ORC_RESTRICT s1, int n)
 {
   int i;
   orc_union16 *ORC_RESTRICT ptr0;
@@ -915,7 +926,7 @@ orc_downsample_u16 (guint16 * ORC_RESTRICT d1, const guint16 * ORC_RESTRICT s1,
 
 #else
 static void
-_backup_orc_downsample_u16 (OrcExecutor * ORC_RESTRICT ex)
+_backup_gst_video_scale_orc_downsample_u16 (OrcExecutor * ORC_RESTRICT ex)
 {
   int i;
   int n = ex->n;
@@ -949,8 +960,8 @@ _backup_orc_downsample_u16 (OrcExecutor * ORC_RESTRICT ex)
 }
 
 void
-orc_downsample_u16 (guint16 * ORC_RESTRICT d1, const guint16 * ORC_RESTRICT s1,
-    int n)
+gst_video_scale_orc_downsample_u16 (guint16 * ORC_RESTRICT d1,
+    const guint16 * ORC_RESTRICT s1, int n)
 {
   OrcExecutor _ex, *ex = &_ex;
   static volatile int p_inited = 0;
@@ -962,8 +973,9 @@ orc_downsample_u16 (guint16 * ORC_RESTRICT d1, const guint16 * ORC_RESTRICT s1,
     if (!p_inited) {
 
       p = orc_program_new ();
-      orc_program_set_name (p, "orc_downsample_u16");
-      orc_program_set_backup_function (p, _backup_orc_downsample_u16);
+      orc_program_set_name (p, "gst_video_scale_orc_downsample_u16");
+      orc_program_set_backup_function (p,
+          _backup_gst_video_scale_orc_downsample_u16);
       orc_program_add_destination (p, 2, "d1");
       orc_program_add_source (p, 4, "s1");
       orc_program_add_temporary (p, 2, "t1");
@@ -991,10 +1003,10 @@ orc_downsample_u16 (guint16 * ORC_RESTRICT d1, const guint16 * ORC_RESTRICT s1,
 #endif
 
 
-/* gst_videoscale_orc_downsample_u32 */
+/* gst_video_scale_orc_downsample_u32 */
 #ifdef DISABLE_ORC
 void
-gst_videoscale_orc_downsample_u32 (guint8 * ORC_RESTRICT d1,
+gst_video_scale_orc_downsample_u32 (guint8 * ORC_RESTRICT d1,
     const guint8 * ORC_RESTRICT s1, int n)
 {
   int i;
@@ -1032,7 +1044,7 @@ gst_videoscale_orc_downsample_u32 (guint8 * ORC_RESTRICT d1,
 
 #else
 static void
-_backup_gst_videoscale_orc_downsample_u32 (OrcExecutor * ORC_RESTRICT ex)
+_backup_gst_video_scale_orc_downsample_u32 (OrcExecutor * ORC_RESTRICT ex)
 {
   int i;
   int n = ex->n;
@@ -1069,7 +1081,7 @@ _backup_gst_videoscale_orc_downsample_u32 (OrcExecutor * ORC_RESTRICT ex)
 }
 
 void
-gst_videoscale_orc_downsample_u32 (guint8 * ORC_RESTRICT d1,
+gst_video_scale_orc_downsample_u32 (guint8 * ORC_RESTRICT d1,
     const guint8 * ORC_RESTRICT s1, int n)
 {
   OrcExecutor _ex, *ex = &_ex;
@@ -1082,9 +1094,9 @@ gst_videoscale_orc_downsample_u32 (guint8 * ORC_RESTRICT d1,
     if (!p_inited) {
 
       p = orc_program_new ();
-      orc_program_set_name (p, "gst_videoscale_orc_downsample_u32");
+      orc_program_set_name (p, "gst_video_scale_orc_downsample_u32");
       orc_program_set_backup_function (p,
-          _backup_gst_videoscale_orc_downsample_u32);
+          _backup_gst_video_scale_orc_downsample_u32);
       orc_program_add_destination (p, 4, "d1");
       orc_program_add_source (p, 8, "s1");
       orc_program_add_temporary (p, 4, "t1");
@@ -1112,10 +1124,10 @@ gst_videoscale_orc_downsample_u32 (guint8 * ORC_RESTRICT d1,
 #endif
 
 
-/* gst_videoscale_orc_downsample_yuyv */
+/* gst_video_scale_orc_downsample_yuyv */
 #ifdef DISABLE_ORC
 void
-gst_videoscale_orc_downsample_yuyv (guint8 * ORC_RESTRICT d1,
+gst_video_scale_orc_downsample_yuyv (guint8 * ORC_RESTRICT d1,
     const guint8 * ORC_RESTRICT s1, int n)
 {
   int i;
@@ -1211,7 +1223,7 @@ gst_videoscale_orc_downsample_yuyv (guint8 * ORC_RESTRICT d1,
 
 #else
 static void
-_backup_gst_videoscale_orc_downsample_yuyv (OrcExecutor * ORC_RESTRICT ex)
+_backup_gst_video_scale_orc_downsample_yuyv (OrcExecutor * ORC_RESTRICT ex)
 {
   int i;
   int n = ex->n;
@@ -1306,7 +1318,7 @@ _backup_gst_videoscale_orc_downsample_yuyv (OrcExecutor * ORC_RESTRICT ex)
 }
 
 void
-gst_videoscale_orc_downsample_yuyv (guint8 * ORC_RESTRICT d1,
+gst_video_scale_orc_downsample_yuyv (guint8 * ORC_RESTRICT d1,
     const guint8 * ORC_RESTRICT s1, int n)
 {
   OrcExecutor _ex, *ex = &_ex;
@@ -1319,9 +1331,9 @@ gst_videoscale_orc_downsample_yuyv (guint8 * ORC_RESTRICT d1,
     if (!p_inited) {
 
       p = orc_program_new ();
-      orc_program_set_name (p, "gst_videoscale_orc_downsample_yuyv");
+      orc_program_set_name (p, "gst_video_scale_orc_downsample_yuyv");
       orc_program_set_backup_function (p,
-          _backup_gst_videoscale_orc_downsample_yuyv);
+          _backup_gst_video_scale_orc_downsample_yuyv);
       orc_program_add_destination (p, 4, "d1");
       orc_program_add_source (p, 8, "s1");
       orc_program_add_temporary (p, 4, "t1");
@@ -1361,10 +1373,10 @@ gst_videoscale_orc_downsample_yuyv (guint8 * ORC_RESTRICT d1,
 #endif
 
 
-/* gst_videoscale_orc_resample_nearest_u8 */
+/* gst_video_scale_orc_resample_nearest_u8 */
 #ifdef DISABLE_ORC
 void
-gst_videoscale_orc_resample_nearest_u8 (guint8 * ORC_RESTRICT d1,
+gst_video_scale_orc_resample_nearest_u8 (guint8 * ORC_RESTRICT d1,
     const guint8 * ORC_RESTRICT s1, int p1, int p2, int n)
 {
   int i;
@@ -1387,7 +1399,7 @@ gst_videoscale_orc_resample_nearest_u8 (guint8 * ORC_RESTRICT d1,
 
 #else
 static void
-_backup_gst_videoscale_orc_resample_nearest_u8 (OrcExecutor * ORC_RESTRICT ex)
+_backup_gst_video_scale_orc_resample_nearest_u8 (OrcExecutor * ORC_RESTRICT ex)
 {
   int i;
   int n = ex->n;
@@ -1409,7 +1421,7 @@ _backup_gst_videoscale_orc_resample_nearest_u8 (OrcExecutor * ORC_RESTRICT ex)
 }
 
 void
-gst_videoscale_orc_resample_nearest_u8 (guint8 * ORC_RESTRICT d1,
+gst_video_scale_orc_resample_nearest_u8 (guint8 * ORC_RESTRICT d1,
     const guint8 * ORC_RESTRICT s1, int p1, int p2, int n)
 {
   OrcExecutor _ex, *ex = &_ex;
@@ -1422,9 +1434,9 @@ gst_videoscale_orc_resample_nearest_u8 (guint8 * ORC_RESTRICT d1,
     if (!p_inited) {
 
       p = orc_program_new ();
-      orc_program_set_name (p, "gst_videoscale_orc_resample_nearest_u8");
+      orc_program_set_name (p, "gst_video_scale_orc_resample_nearest_u8");
       orc_program_set_backup_function (p,
-          _backup_gst_videoscale_orc_resample_nearest_u8);
+          _backup_gst_video_scale_orc_resample_nearest_u8);
       orc_program_add_destination (p, 1, "d1");
       orc_program_add_source (p, 1, "s1");
       orc_program_add_parameter (p, 4, "p1");
@@ -1452,10 +1464,10 @@ gst_videoscale_orc_resample_nearest_u8 (guint8 * ORC_RESTRICT d1,
 #endif
 
 
-/* gst_videoscale_orc_resample_bilinear_u8 */
+/* gst_video_scale_orc_resample_bilinear_u8 */
 #ifdef DISABLE_ORC
 void
-gst_videoscale_orc_resample_bilinear_u8 (guint8 * ORC_RESTRICT d1,
+gst_video_scale_orc_resample_bilinear_u8 (guint8 * ORC_RESTRICT d1,
     const guint8 * ORC_RESTRICT s1, int p1, int p2, int n)
 {
   int i;
@@ -1483,7 +1495,7 @@ gst_videoscale_orc_resample_bilinear_u8 (guint8 * ORC_RESTRICT d1,
 
 #else
 static void
-_backup_gst_videoscale_orc_resample_bilinear_u8 (OrcExecutor * ORC_RESTRICT ex)
+_backup_gst_video_scale_orc_resample_bilinear_u8 (OrcExecutor * ORC_RESTRICT ex)
 {
   int i;
   int n = ex->n;
@@ -1510,7 +1522,7 @@ _backup_gst_videoscale_orc_resample_bilinear_u8 (OrcExecutor * ORC_RESTRICT ex)
 }
 
 void
-gst_videoscale_orc_resample_bilinear_u8 (guint8 * ORC_RESTRICT d1,
+gst_video_scale_orc_resample_bilinear_u8 (guint8 * ORC_RESTRICT d1,
     const guint8 * ORC_RESTRICT s1, int p1, int p2, int n)
 {
   OrcExecutor _ex, *ex = &_ex;
@@ -1523,9 +1535,9 @@ gst_videoscale_orc_resample_bilinear_u8 (guint8 * ORC_RESTRICT d1,
     if (!p_inited) {
 
       p = orc_program_new ();
-      orc_program_set_name (p, "gst_videoscale_orc_resample_bilinear_u8");
+      orc_program_set_name (p, "gst_video_scale_orc_resample_bilinear_u8");
       orc_program_set_backup_function (p,
-          _backup_gst_videoscale_orc_resample_bilinear_u8);
+          _backup_gst_video_scale_orc_resample_bilinear_u8);
       orc_program_add_destination (p, 1, "d1");
       orc_program_add_source (p, 1, "s1");
       orc_program_add_parameter (p, 4, "p1");
@@ -1553,10 +1565,10 @@ gst_videoscale_orc_resample_bilinear_u8 (guint8 * ORC_RESTRICT d1,
 #endif
 
 
-/* gst_videoscale_orc_resample_nearest_u32 */
+/* gst_video_scale_orc_resample_nearest_u32 */
 #ifdef DISABLE_ORC
 void
-gst_videoscale_orc_resample_nearest_u32 (guint8 * ORC_RESTRICT d1,
+gst_video_scale_orc_resample_nearest_u32 (guint8 * ORC_RESTRICT d1,
     const guint8 * ORC_RESTRICT s1, int p1, int p2, int n)
 {
   int i;
@@ -1579,7 +1591,7 @@ gst_videoscale_orc_resample_nearest_u32 (guint8 * ORC_RESTRICT d1,
 
 #else
 static void
-_backup_gst_videoscale_orc_resample_nearest_u32 (OrcExecutor * ORC_RESTRICT ex)
+_backup_gst_video_scale_orc_resample_nearest_u32 (OrcExecutor * ORC_RESTRICT ex)
 {
   int i;
   int n = ex->n;
@@ -1601,7 +1613,7 @@ _backup_gst_videoscale_orc_resample_nearest_u32 (OrcExecutor * ORC_RESTRICT ex)
 }
 
 void
-gst_videoscale_orc_resample_nearest_u32 (guint8 * ORC_RESTRICT d1,
+gst_video_scale_orc_resample_nearest_u32 (guint8 * ORC_RESTRICT d1,
     const guint8 * ORC_RESTRICT s1, int p1, int p2, int n)
 {
   OrcExecutor _ex, *ex = &_ex;
@@ -1614,9 +1626,9 @@ gst_videoscale_orc_resample_nearest_u32 (guint8 * ORC_RESTRICT d1,
     if (!p_inited) {
 
       p = orc_program_new ();
-      orc_program_set_name (p, "gst_videoscale_orc_resample_nearest_u32");
+      orc_program_set_name (p, "gst_video_scale_orc_resample_nearest_u32");
       orc_program_set_backup_function (p,
-          _backup_gst_videoscale_orc_resample_nearest_u32);
+          _backup_gst_video_scale_orc_resample_nearest_u32);
       orc_program_add_destination (p, 4, "d1");
       orc_program_add_source (p, 4, "s1");
       orc_program_add_parameter (p, 4, "p1");
@@ -1644,10 +1656,10 @@ gst_videoscale_orc_resample_nearest_u32 (guint8 * ORC_RESTRICT d1,
 #endif
 
 
-/* gst_videoscale_orc_resample_bilinear_u32 */
+/* gst_video_scale_orc_resample_bilinear_u32 */
 #ifdef DISABLE_ORC
 void
-gst_videoscale_orc_resample_bilinear_u32 (guint8 * ORC_RESTRICT d1,
+gst_video_scale_orc_resample_bilinear_u32 (guint8 * ORC_RESTRICT d1,
     const guint8 * ORC_RESTRICT s1, int p1, int p2, int n)
 {
   int i;
@@ -1686,7 +1698,8 @@ gst_videoscale_orc_resample_bilinear_u32 (guint8 * ORC_RESTRICT d1,
 
 #else
 static void
-_backup_gst_videoscale_orc_resample_bilinear_u32 (OrcExecutor * ORC_RESTRICT ex)
+_backup_gst_video_scale_orc_resample_bilinear_u32 (OrcExecutor *
+    ORC_RESTRICT ex)
 {
   int i;
   int n = ex->n;
@@ -1724,7 +1737,7 @@ _backup_gst_videoscale_orc_resample_bilinear_u32 (OrcExecutor * ORC_RESTRICT ex)
 }
 
 void
-gst_videoscale_orc_resample_bilinear_u32 (guint8 * ORC_RESTRICT d1,
+gst_video_scale_orc_resample_bilinear_u32 (guint8 * ORC_RESTRICT d1,
     const guint8 * ORC_RESTRICT s1, int p1, int p2, int n)
 {
   OrcExecutor _ex, *ex = &_ex;
@@ -1737,9 +1750,9 @@ gst_videoscale_orc_resample_bilinear_u32 (guint8 * ORC_RESTRICT d1,
     if (!p_inited) {
 
       p = orc_program_new ();
-      orc_program_set_name (p, "gst_videoscale_orc_resample_bilinear_u32");
+      orc_program_set_name (p, "gst_video_scale_orc_resample_bilinear_u32");
       orc_program_set_backup_function (p,
-          _backup_gst_videoscale_orc_resample_bilinear_u32);
+          _backup_gst_video_scale_orc_resample_bilinear_u32);
       orc_program_add_destination (p, 4, "d1");
       orc_program_add_source (p, 4, "s1");
       orc_program_add_parameter (p, 4, "p1");
@@ -1767,10 +1780,10 @@ gst_videoscale_orc_resample_bilinear_u32 (guint8 * ORC_RESTRICT d1,
 #endif
 
 
-/* gst_videoscale_orc_resample_merge_bilinear_u32 */
+/* gst_video_scale_orc_resample_merge_bilinear_u32 */
 #ifdef DISABLE_ORC
 void
-gst_videoscale_orc_resample_merge_bilinear_u32 (guint8 * ORC_RESTRICT d1,
+gst_video_scale_orc_resample_merge_bilinear_u32 (guint8 * ORC_RESTRICT d1,
     guint8 * ORC_RESTRICT d2, const guint8 * ORC_RESTRICT s1,
     const guint8 * ORC_RESTRICT s2, int p1, int p2, int p3, int n)
 {
@@ -1861,7 +1874,7 @@ gst_videoscale_orc_resample_merge_bilinear_u32 (guint8 * ORC_RESTRICT d1,
 
 #else
 static void
-_backup_gst_videoscale_orc_resample_merge_bilinear_u32 (OrcExecutor *
+_backup_gst_video_scale_orc_resample_merge_bilinear_u32 (OrcExecutor *
     ORC_RESTRICT ex)
 {
   int i;
@@ -1951,7 +1964,7 @@ _backup_gst_videoscale_orc_resample_merge_bilinear_u32 (OrcExecutor *
 }
 
 void
-gst_videoscale_orc_resample_merge_bilinear_u32 (guint8 * ORC_RESTRICT d1,
+gst_video_scale_orc_resample_merge_bilinear_u32 (guint8 * ORC_RESTRICT d1,
     guint8 * ORC_RESTRICT d2, const guint8 * ORC_RESTRICT s1,
     const guint8 * ORC_RESTRICT s2, int p1, int p2, int p3, int n)
 {
@@ -1966,9 +1979,9 @@ gst_videoscale_orc_resample_merge_bilinear_u32 (guint8 * ORC_RESTRICT d1,
 
       p = orc_program_new ();
       orc_program_set_name (p,
-          "gst_videoscale_orc_resample_merge_bilinear_u32");
+          "gst_video_scale_orc_resample_merge_bilinear_u32");
       orc_program_set_backup_function (p,
-          _backup_gst_videoscale_orc_resample_merge_bilinear_u32);
+          _backup_gst_video_scale_orc_resample_merge_bilinear_u32);
       orc_program_add_destination (p, 4, "d1");
       orc_program_add_destination (p, 4, "d2");
       orc_program_add_source (p, 4, "s1");
@@ -2023,10 +2036,10 @@ gst_videoscale_orc_resample_merge_bilinear_u32 (guint8 * ORC_RESTRICT d1,
 #endif
 
 
-/* gst_videoscale_orc_merge_bicubic_u8 */
+/* gst_video_scale_orc_merge_bicubic_u8 */
 #ifdef DISABLE_ORC
 void
-gst_videoscale_orc_merge_bicubic_u8 (guint8 * ORC_RESTRICT d1,
+gst_video_scale_orc_merge_bicubic_u8 (guint8 * ORC_RESTRICT d1,
     const guint8 * ORC_RESTRICT s1, const guint8 * ORC_RESTRICT s2,
     const guint8 * ORC_RESTRICT s3, const guint8 * ORC_RESTRICT s4, int p1,
     int p2, int p3, int p4, int n)
@@ -2111,7 +2124,7 @@ gst_videoscale_orc_merge_bicubic_u8 (guint8 * ORC_RESTRICT d1,
 
 #else
 static void
-_backup_gst_videoscale_orc_merge_bicubic_u8 (OrcExecutor * ORC_RESTRICT ex)
+_backup_gst_video_scale_orc_merge_bicubic_u8 (OrcExecutor * ORC_RESTRICT ex)
 {
   int i;
   int n = ex->n;
@@ -2193,7 +2206,7 @@ _backup_gst_videoscale_orc_merge_bicubic_u8 (OrcExecutor * ORC_RESTRICT ex)
 }
 
 void
-gst_videoscale_orc_merge_bicubic_u8 (guint8 * ORC_RESTRICT d1,
+gst_video_scale_orc_merge_bicubic_u8 (guint8 * ORC_RESTRICT d1,
     const guint8 * ORC_RESTRICT s1, const guint8 * ORC_RESTRICT s2,
     const guint8 * ORC_RESTRICT s3, const guint8 * ORC_RESTRICT s4, int p1,
     int p2, int p3, int p4, int n)
@@ -2208,9 +2221,9 @@ gst_videoscale_orc_merge_bicubic_u8 (guint8 * ORC_RESTRICT d1,
     if (!p_inited) {
 
       p = orc_program_new ();
-      orc_program_set_name (p, "gst_videoscale_orc_merge_bicubic_u8");
+      orc_program_set_name (p, "gst_video_scale_orc_merge_bicubic_u8");
       orc_program_set_backup_function (p,
-          _backup_gst_videoscale_orc_merge_bicubic_u8);
+          _backup_gst_video_scale_orc_merge_bicubic_u8);
       orc_program_add_destination (p, 1, "d1");
       orc_program_add_source (p, 1, "s1");
       orc_program_add_source (p, 1, "s2");
diff --git a/gst/videoscale/gstvideoscaleorc-dist.h b/gst/videoscale/gstvideoscaleorc-dist.h
index e8408c1..44bae00 100644
--- a/gst/videoscale/gstvideoscaleorc-dist.h
+++ b/gst/videoscale/gstvideoscaleorc-dist.h
@@ -67,21 +67,21 @@ typedef union { orc_int64 i; double f; orc_int32 x2[2]; float x2f[2]; orc_int16
 #define ORC_RESTRICT
 #endif
 #endif
-void orc_merge_linear_u8 (orc_uint8 * ORC_RESTRICT d1, const orc_uint8 * ORC_RESTRICT s1, const orc_uint8 * ORC_RESTRICT s2, int p1, int n);
-void orc_merge_linear_u16 (orc_uint16 * ORC_RESTRICT d1, const orc_uint16 * ORC_RESTRICT s1, const orc_uint16 * ORC_RESTRICT s2, int p1, int p2, int n);
-void orc_splat_u16 (orc_uint16 * ORC_RESTRICT d1, int p1, int n);
-void orc_splat_u32 (orc_uint32 * ORC_RESTRICT d1, int p1, int n);
-void orc_splat_u64 (orc_uint64 * ORC_RESTRICT d1, orc_int64 p1, int n);
-void orc_downsample_u8 (guint8 * ORC_RESTRICT d1, const guint8 * ORC_RESTRICT s1, int n);
-void orc_downsample_u16 (guint16 * ORC_RESTRICT d1, const guint16 * ORC_RESTRICT s1, int n);
-void gst_videoscale_orc_downsample_u32 (guint8 * ORC_RESTRICT d1, const guint8 * ORC_RESTRICT s1, int n);
-void gst_videoscale_orc_downsample_yuyv (guint8 * ORC_RESTRICT d1, const guint8 * ORC_RESTRICT s1, int n);
-void gst_videoscale_orc_resample_nearest_u8 (guint8 * ORC_RESTRICT d1, const guint8 * ORC_RESTRICT s1, int p1, int p2, int n);
-void gst_videoscale_orc_resample_bilinear_u8 (guint8 * ORC_RESTRICT d1, const guint8 * ORC_RESTRICT s1, int p1, int p2, int n);
-void gst_videoscale_orc_resample_nearest_u32 (guint8 * ORC_RESTRICT d1, const guint8 * ORC_RESTRICT s1, int p1, int p2, int n);
-void gst_videoscale_orc_resample_bilinear_u32 (guint8 * ORC_RESTRICT d1, const guint8 * ORC_RESTRICT s1, int p1, int p2, int n);
-void gst_videoscale_orc_resample_merge_bilinear_u32 (guint8 * ORC_RESTRICT d1, guint8 * ORC_RESTRICT d2, const guint8 * ORC_RESTRICT s1, const guint8 * ORC_RESTRICT s2, int p1, int p2, int p3, int n);
-void gst_videoscale_orc_merge_bicubic_u8 (guint8 * ORC_RESTRICT d1, const guint8 * ORC_RESTRICT s1, const guint8 * ORC_RESTRICT s2, const guint8 * ORC_RESTRICT s3, const guint8 * ORC_RESTRICT s4, int p1, int p2, int p3, int p4, int n);
+void gst_video_scale_orc_merge_linear_u8 (orc_uint8 * ORC_RESTRICT d1, const orc_uint8 * ORC_RESTRICT s1, const orc_uint8 * ORC_RESTRICT s2, int p1, int n);
+void gst_video_scale_orc_merge_linear_u16 (orc_uint16 * ORC_RESTRICT d1, const orc_uint16 * ORC_RESTRICT s1, const orc_uint16 * ORC_RESTRICT s2, int p1, int p2, int n);
+void gst_video_scale_orc_splat_u16 (orc_uint16 * ORC_RESTRICT d1, int p1, int n);
+void gst_video_scale_orc_splat_u32 (orc_uint32 * ORC_RESTRICT d1, int p1, int n);
+void gst_video_scale_orc_splat_u64 (orc_uint64 * ORC_RESTRICT d1, orc_int64 p1, int n);
+void gst_video_scale_orc_downsample_u8 (guint8 * ORC_RESTRICT d1, const guint8 * ORC_RESTRICT s1, int n);
+void gst_video_scale_orc_downsample_u16 (guint16 * ORC_RESTRICT d1, const guint16 * ORC_RESTRICT s1, int n);
+void gst_video_scale_orc_downsample_u32 (guint8 * ORC_RESTRICT d1, const guint8 * ORC_RESTRICT s1, int n);
+void gst_video_scale_orc_downsample_yuyv (guint8 * ORC_RESTRICT d1, const guint8 * ORC_RESTRICT s1, int n);
+void gst_video_scale_orc_resample_nearest_u8 (guint8 * ORC_RESTRICT d1, const guint8 * ORC_RESTRICT s1, int p1, int p2, int n);
+void gst_video_scale_orc_resample_bilinear_u8 (guint8 * ORC_RESTRICT d1, const guint8 * ORC_RESTRICT s1, int p1, int p2, int n);
+void gst_video_scale_orc_resample_nearest_u32 (guint8 * ORC_RESTRICT d1, const guint8 * ORC_RESTRICT s1, int p1, int p2, int n);
+void gst_video_scale_orc_resample_bilinear_u32 (guint8 * ORC_RESTRICT d1, const guint8 * ORC_RESTRICT s1, int p1, int p2, int n);
+void gst_video_scale_orc_resample_merge_bilinear_u32 (guint8 * ORC_RESTRICT d1, guint8 * ORC_RESTRICT d2, const guint8 * ORC_RESTRICT s1, const guint8 * ORC_RESTRICT s2, int p1, int p2, int p3, int n);
+void gst_video_scale_orc_merge_bicubic_u8 (guint8 * ORC_RESTRICT d1, const guint8 * ORC_RESTRICT s1, const guint8 * ORC_RESTRICT s2, const guint8 * ORC_RESTRICT s3, const guint8 * ORC_RESTRICT s4, int p1, int p2, int p3, int p4, int n);
 
 #ifdef __cplusplus
 }
diff --git a/gst/videoscale/gstvideoscaleorc.orc b/gst/videoscale/gstvideoscaleorc.orc
index 92ddf20..cc736eb 100644
--- a/gst/videoscale/gstvideoscaleorc.orc
+++ b/gst/videoscale/gstvideoscaleorc.orc
@@ -1,5 +1,5 @@
 
-.function orc_merge_linear_u8
+.function gst_video_scale_orc_merge_linear_u8
 .dest 1 d1
 .source 1 s1
 .source 1 s2
@@ -20,7 +20,7 @@ addb d1, t, a
 
 
 
-.function orc_merge_linear_u16
+.function gst_video_scale_orc_merge_linear_u16
 .dest 2 d1
 .source 2 s1
 .source 2 s2
@@ -38,28 +38,28 @@ shrul t1, t1, 16
 convlw d1, t1
 
 
-.function orc_splat_u16
+.function gst_video_scale_orc_splat_u16
 .dest 2 d1
 .param 2 p1
 
 copyw d1, p1
 
 
-.function orc_splat_u32
+.function gst_video_scale_orc_splat_u32
 .dest 4 d1
 .param 4 p1
 
 copyl d1, p1
 
 
-.function orc_splat_u64
+.function gst_video_scale_orc_splat_u64
 .dest 8 d1
 .longparam 8 p1
 
 copyq d1, p1
 
 
-.function orc_downsample_u8
+.function gst_video_scale_orc_downsample_u8
 .dest 1 d1 guint8
 .source 2 s1 guint8
 .temp 1 t1
@@ -69,7 +69,7 @@ splitwb t1, t2, s1
 avgub d1, t1, t2
 
 
-.function orc_downsample_u16
+.function gst_video_scale_orc_downsample_u16
 .dest 2 d1 guint16
 .source 4 s1 guint16
 .temp 2 t1
@@ -79,7 +79,7 @@ splitlw t1, t2, s1
 avguw d1, t1, t2
 
 
-.function gst_videoscale_orc_downsample_u32
+.function gst_video_scale_orc_downsample_u32
 .dest 4 d1 guint8
 .source 8 s1 guint8
 .temp 4 t1
@@ -89,7 +89,7 @@ splitql t1, t2, s1
 x4 avgub d1, t1, t2
 
 
-.function gst_videoscale_orc_downsample_yuyv
+.function gst_video_scale_orc_downsample_yuyv
 .dest 4 d1 guint8
 .source 8 s1 guint8
 .temp 4 yyyy
@@ -108,7 +108,7 @@ x2 mergebw d1, yy, uv
 
 
 
-.function gst_videoscale_orc_resample_nearest_u8
+.function gst_video_scale_orc_resample_nearest_u8
 .dest 1 d1 guint8
 .source 1 s1 guint8
 .param 4 p1
@@ -117,7 +117,7 @@ x2 mergebw d1, yy, uv
 ldresnearb d1, s1, p1, p2
 
 
-.function gst_videoscale_orc_resample_bilinear_u8
+.function gst_video_scale_orc_resample_bilinear_u8
 .dest 1 d1 guint8
 .source 1 s1 guint8
 .param 4 p1
@@ -126,7 +126,7 @@ ldresnearb d1, s1, p1, p2
 ldreslinb d1, s1, p1, p2
 
 
-.function gst_videoscale_orc_resample_nearest_u32
+.function gst_video_scale_orc_resample_nearest_u32
 .dest 4 d1 guint8
 .source 4 s1 guint8
 .param 4 p1
@@ -135,7 +135,7 @@ ldreslinb d1, s1, p1, p2
 ldresnearl d1, s1, p1, p2
 
 
-.function gst_videoscale_orc_resample_bilinear_u32
+.function gst_video_scale_orc_resample_bilinear_u32
 .dest 4 d1 guint8
 .source 4 s1 guint8
 .param 4 p1
@@ -144,7 +144,7 @@ ldresnearl d1, s1, p1, p2
 ldreslinl d1, s1, p1, p2
 
 
-.function gst_videoscale_orc_resample_merge_bilinear_u32
+.function gst_video_scale_orc_resample_merge_bilinear_u32
 .dest 4 d1 guint8
 .dest 4 d2 guint8
 .source 4 s1 guint8
@@ -170,7 +170,7 @@ x4 addb d1, t, a
 
 
 
-.function gst_videoscale_orc_merge_bicubic_u8
+.function gst_video_scale_orc_merge_bicubic_u8
 .dest 1 d1 guint8
 .source 1 s1 guint8
 .source 1 s2 guint8
diff --git a/gst/videoscale/vs_fill_borders.c b/gst/videoscale/vs_fill_borders.c
index ca6cfd5..c469886 100644
--- a/gst/videoscale/vs_fill_borders.c
+++ b/gst/videoscale/vs_fill_borders.c
@@ -59,7 +59,7 @@ vs_fill_borders_RGBA (const VSImage * dest, const uint8_t * val)
 
   data = dest->real_pixels;
   for (i = 0; i < top; i++) {
-    orc_splat_u32 ((uint32_t *) data, v, real_width);
+    gst_video_scale_orc_splat_u32 ((uint32_t *) data, v, real_width);
     data += stride;
   }
 
@@ -67,8 +67,8 @@ vs_fill_borders_RGBA (const VSImage * dest, const uint8_t * val)
     tmp = height;
     tmp2 = (left + width) * 4;
     for (i = 0; i < tmp; i++) {
-      orc_splat_u32 ((uint32_t *) data, v, left);
-      orc_splat_u32 ((uint32_t *) (data + tmp2), v, right);
+      gst_video_scale_orc_splat_u32 ((uint32_t *) data, v, left);
+      gst_video_scale_orc_splat_u32 ((uint32_t *) (data + tmp2), v, right);
       data += stride;
     }
   } else {
@@ -76,7 +76,7 @@ vs_fill_borders_RGBA (const VSImage * dest, const uint8_t * val)
   }
 
   for (i = 0; i < bottom; i++) {
-    orc_splat_u32 ((uint32_t *) data, v, real_width);
+    gst_video_scale_orc_splat_u32 ((uint32_t *) data, v, real_width);
     data += stride;
   }
 }
@@ -282,7 +282,7 @@ vs_fill_borders_Y16 (const VSImage * dest, const uint16_t val)
 
   data = dest->real_pixels;
   for (i = 0; i < top; i++) {
-    orc_splat_u16 ((uint16_t *) data, val, real_width);
+    gst_video_scale_orc_splat_u16 ((uint16_t *) data, val, real_width);
     data += stride;
   }
 
@@ -290,8 +290,8 @@ vs_fill_borders_Y16 (const VSImage * dest, const uint16_t val)
     tmp = height;
     tmp2 = (left + width) * 2;
     for (i = 0; i < tmp; i++) {
-      orc_splat_u16 ((uint16_t *) data, val, left);
-      orc_splat_u16 ((uint16_t *) (data + tmp2), val, right);
+      gst_video_scale_orc_splat_u16 ((uint16_t *) data, val, left);
+      gst_video_scale_orc_splat_u16 ((uint16_t *) (data + tmp2), val, right);
       data += stride;
     }
   } else {
@@ -299,7 +299,7 @@ vs_fill_borders_Y16 (const VSImage * dest, const uint16_t val)
   }
 
   for (i = 0; i < bottom; i++) {
-    orc_splat_u16 ((uint16_t *) data, val, real_width);
+    gst_video_scale_orc_splat_u16 ((uint16_t *) data, val, real_width);
     data += stride;
   }
 }
@@ -320,7 +320,7 @@ vs_fill_borders_RGB565 (const VSImage * dest, const uint8_t * val)
 
   data = dest->real_pixels;
   for (i = 0; i < top; i++) {
-    orc_splat_u16 ((uint16_t *) data, v, real_width);
+    gst_video_scale_orc_splat_u16 ((uint16_t *) data, v, real_width);
     data += stride;
   }
 
@@ -328,8 +328,8 @@ vs_fill_borders_RGB565 (const VSImage * dest, const uint8_t * val)
     tmp = height;
     tmp2 = (left + width) * 2;
     for (i = 0; i < tmp; i++) {
-      orc_splat_u16 ((uint16_t *) data, v, left);
-      orc_splat_u16 ((uint16_t *) (data + tmp2), v, right);
+      gst_video_scale_orc_splat_u16 ((uint16_t *) data, v, left);
+      gst_video_scale_orc_splat_u16 ((uint16_t *) (data + tmp2), v, right);
       data += stride;
     }
   } else {
@@ -337,7 +337,7 @@ vs_fill_borders_RGB565 (const VSImage * dest, const uint8_t * val)
   }
 
   for (i = 0; i < bottom; i++) {
-    orc_splat_u16 ((uint16_t *) data, v, real_width);
+    gst_video_scale_orc_splat_u16 ((uint16_t *) data, v, real_width);
     data += stride;
   }
 }
@@ -358,7 +358,7 @@ vs_fill_borders_RGB555 (const VSImage * dest, const uint8_t * val)
 
   data = dest->real_pixels;
   for (i = 0; i < top; i++) {
-    orc_splat_u16 ((uint16_t *) data, v, real_width);
+    gst_video_scale_orc_splat_u16 ((uint16_t *) data, v, real_width);
     data += stride;
   }
 
@@ -366,8 +366,8 @@ vs_fill_borders_RGB555 (const VSImage * dest, const uint8_t * val)
     tmp = height;
     tmp2 = (left + width) * 2;
     for (i = 0; i < tmp; i++) {
-      orc_splat_u16 ((uint16_t *) data, v, left);
-      orc_splat_u16 ((uint16_t *) (data + tmp2), v, right);
+      gst_video_scale_orc_splat_u16 ((uint16_t *) data, v, left);
+      gst_video_scale_orc_splat_u16 ((uint16_t *) (data + tmp2), v, right);
       data += stride;
     }
   } else {
@@ -375,7 +375,7 @@ vs_fill_borders_RGB555 (const VSImage * dest, const uint8_t * val)
   }
 
   for (i = 0; i < bottom; i++) {
-    orc_splat_u16 ((uint16_t *) data, v, real_width);
+    gst_video_scale_orc_splat_u16 ((uint16_t *) data, v, real_width);
     data += stride;
   }
 }
@@ -399,7 +399,7 @@ vs_fill_borders_AYUV64 (const VSImage * dest, const uint8_t * val)
 
   data = dest->real_pixels;
   for (i = 0; i < top; i++) {
-    orc_splat_u64 ((uint64_t *) data, v, real_width);
+    gst_video_scale_orc_splat_u64 ((uint64_t *) data, v, real_width);
     data += stride;
   }
 
@@ -407,8 +407,8 @@ vs_fill_borders_AYUV64 (const VSImage * dest, const uint8_t * val)
     tmp = height;
     tmp2 = (left + width) * 8;
     for (i = 0; i < tmp; i++) {
-      orc_splat_u64 ((uint64_t *) data, v, left);
-      orc_splat_u64 ((uint64_t *) (data + tmp2), v, right);
+      gst_video_scale_orc_splat_u64 ((uint64_t *) data, v, left);
+      gst_video_scale_orc_splat_u64 ((uint64_t *) (data + tmp2), v, right);
       data += stride;
     }
   } else {
@@ -416,7 +416,7 @@ vs_fill_borders_AYUV64 (const VSImage * dest, const uint8_t * val)
   }
 
   for (i = 0; i < bottom; i++) {
-    orc_splat_u64 ((uint64_t *) data, v, real_width);
+    gst_video_scale_orc_splat_u64 ((uint64_t *) data, v, real_width);
     data += stride;
   }
 }
diff --git a/gst/videoscale/vs_image.c b/gst/videoscale/vs_image.c
index 09ccf25..a0907f9 100644
--- a/gst/videoscale/vs_image.c
+++ b/gst/videoscale/vs_image.c
@@ -68,7 +68,7 @@ vs_image_scale_nearest_RGBA (const VSImage * dest, const VSImage * src,
       memcpy (dest->pixels + i * dest->stride,
           dest->pixels + (i - 1) * dest->stride, dest->width * 4);
     } else {
-      gst_videoscale_orc_resample_nearest_u32 (dest->pixels + i * dest->stride,
+      gst_video_scale_orc_resample_nearest_u32 (dest->pixels + i * dest->stride,
           src->pixels + j * src->stride, 0, x_increment, dest->width);
     }
 
@@ -105,7 +105,7 @@ vs_image_scale_linear_RGBA (const VSImage * dest, const VSImage * src,
 #define LINE(x) ((tmpbuf) + (dest_size)*((x)&1))
 
   acc = 0;
-  gst_videoscale_orc_resample_bilinear_u32 (LINE (0), src->pixels,
+  gst_video_scale_orc_resample_bilinear_u32 (LINE (0), src->pixels,
       0, x_increment, dest->width);
   y1 = 0;
   for (i = 0; i < dest->height; i++) {
@@ -116,16 +116,16 @@ vs_image_scale_linear_RGBA (const VSImage * dest, const VSImage * src,
       memcpy (dest->pixels + i * dest->stride, LINE (j), dest_size);
     } else {
       if (j > y1) {
-        gst_videoscale_orc_resample_bilinear_u32 (LINE (j),
+        gst_video_scale_orc_resample_bilinear_u32 (LINE (j),
             src->pixels + j * src->stride, 0, x_increment, dest->width);
         y1++;
       }
       if (j >= y1) {
-        gst_videoscale_orc_resample_bilinear_u32 (LINE (j + 1),
+        gst_video_scale_orc_resample_bilinear_u32 (LINE (j + 1),
             src->pixels + (j + 1) * src->stride, 0, x_increment, dest->width);
         y1++;
       }
-      orc_merge_linear_u8 (dest->pixels + i * dest->stride,
+      gst_video_scale_orc_merge_linear_u8 (dest->pixels + i * dest->stride,
           LINE (j), LINE (j + 1), (x >> 8), dest->width * 4);
     }
 
@@ -678,7 +678,7 @@ vs_image_scale_nearest_Y (const VSImage * dest, const VSImage * src,
   for (i = 0; i < dest->height; i++) {
     j = acc >> 16;
 
-    gst_videoscale_orc_resample_nearest_u8 (dest->pixels + i * dest->stride,
+    gst_video_scale_orc_resample_nearest_u8 (dest->pixels + i * dest->stride,
         src->pixels + j * src->stride, 0, x_increment, dest->width);
     acc += y_increment;
   }
@@ -717,7 +717,7 @@ vs_image_scale_linear_Y (const VSImage * dest, const VSImage * src,
 
   acc = 0;
   y2 = -1;
-  gst_videoscale_orc_resample_bilinear_u8 (tmp1, src->pixels,
+  gst_video_scale_orc_resample_bilinear_u8 (tmp1, src->pixels,
       0, x_increment, dest->width);
   y1 = 0;
   for (i = 0; i < dest->height; i++) {
@@ -730,7 +730,7 @@ vs_image_scale_linear_Y (const VSImage * dest, const VSImage * src,
       } else if (j == y2) {
         memcpy (dest->pixels + i * dest->stride, tmp2, dest_size);
       } else {
-        gst_videoscale_orc_resample_bilinear_u8 (tmp1,
+        gst_video_scale_orc_resample_bilinear_u8 (tmp1,
             src->pixels + j * src->stride, 0, x_increment, dest->width);
         y1 = j;
         memcpy (dest->pixels + i * dest->stride, tmp1, dest_size);
@@ -738,39 +738,39 @@ vs_image_scale_linear_Y (const VSImage * dest, const VSImage * src,
     } else {
       if (j == y1) {
         if (j + 1 != y2) {
-          gst_videoscale_orc_resample_bilinear_u8 (tmp2,
+          gst_video_scale_orc_resample_bilinear_u8 (tmp2,
               src->pixels + (j + 1) * src->stride, 0, x_increment, dest->width);
           y2 = j + 1;
         }
         if ((x >> 8) == 0) {
           memcpy (dest->pixels + i * dest->stride, tmp1, dest->width);
         } else {
-          orc_merge_linear_u8 (dest->pixels + i * dest->stride,
+          gst_video_scale_orc_merge_linear_u8 (dest->pixels + i * dest->stride,
               tmp1, tmp2, (x >> 8), dest->width);
         }
       } else if (j == y2) {
         if (j + 1 != y1) {
-          gst_videoscale_orc_resample_bilinear_u8 (tmp1,
+          gst_video_scale_orc_resample_bilinear_u8 (tmp1,
               src->pixels + (j + 1) * src->stride, 0, x_increment, dest->width);
           y1 = j + 1;
         }
         if ((x >> 8) == 0) {
           memcpy (dest->pixels + i * dest->stride, tmp2, dest->width);
         } else {
-          orc_merge_linear_u8 (dest->pixels + i * dest->stride,
+          gst_video_scale_orc_merge_linear_u8 (dest->pixels + i * dest->stride,
               tmp2, tmp1, (x >> 8), dest->width);
         }
       } else {
-        gst_videoscale_orc_resample_bilinear_u8 (tmp1,
+        gst_video_scale_orc_resample_bilinear_u8 (tmp1,
             src->pixels + j * src->stride, 0, x_increment, dest->width);
         y1 = j;
-        gst_videoscale_orc_resample_bilinear_u8 (tmp2,
+        gst_video_scale_orc_resample_bilinear_u8 (tmp2,
             src->pixels + (j + 1) * src->stride, 0, x_increment, dest->width);
         y2 = (j + 1);
         if ((x >> 8) == 0) {
           memcpy (dest->pixels + i * dest->stride, tmp1, dest->width);
         } else {
-          orc_merge_linear_u8 (dest->pixels + i * dest->stride,
+          gst_video_scale_orc_merge_linear_u8 (dest->pixels + i * dest->stride,
               tmp1, tmp2, (x >> 8), dest->width);
         }
       }
@@ -1240,7 +1240,7 @@ vs_image_scale_linear_AYUV64 (const VSImage * dest, const VSImage * src,
 #define LINE(x) ((guint16 *)((tmpbuf) + (dest_size)*((x)&1)))
 
   acc = 0;
-  //gst_videoscale_orc_resample_bilinear_u64 (LINE (0), src->pixels,
+  //gst_video_scale_orc_resample_bilinear_u64 (LINE (0), src->pixels,
   //    0, x_increment, dest->width);
   xacc = 0;
   vs_scanline_resample_linear_AYUV64 ((guint8 *) LINE (0),
@@ -1258,7 +1258,7 @@ vs_image_scale_linear_AYUV64 (const VSImage * dest, const VSImage * src,
         vs_scanline_resample_linear_AYUV64 ((guint8 *) LINE (j),
             src->pixels + j * src->stride, src->width, dest->width, &xacc,
             x_increment);
-        //gst_videoscale_orc_resample_bilinear_u64 (LINE (j),
+        //gst_video_scale_orc_resample_bilinear_u64 (LINE (j),
         //    src->pixels + j * src->stride, 0, x_increment, dest->width);
         y1++;
       }
@@ -1267,16 +1267,18 @@ vs_image_scale_linear_AYUV64 (const VSImage * dest, const VSImage * src,
         vs_scanline_resample_linear_AYUV64 ((guint8 *) LINE (j + 1),
             src->pixels + (j + 1) * src->stride, src->width, dest->width, &xacc,
             x_increment);
-        orc_merge_linear_u16 ((guint16 *) (dest->pixels + i * dest->stride),
-            LINE (j), LINE (j + 1), 65536 - x, x, dest->width * 4);
-        //gst_videoscale_orc_resample_merge_bilinear_u64 (dest->pixels +
+        gst_video_scale_orc_merge_linear_u16 ((guint16 *) (dest->pixels +
+                i * dest->stride), LINE (j), LINE (j + 1), 65536 - x, x,
+            dest->width * 4);
+        //gst_video_scale_orc_resample_merge_bilinear_u64 (dest->pixels +
         //    i * dest->stride, LINE (j + 1), LINE (j),
         //    src->pixels + (j + 1) * src->stride, (x >> 8), 0, x_increment,
         //    dest->width);
         y1++;
       } else {
-        orc_merge_linear_u16 ((guint16 *) (dest->pixels + i * dest->stride),
-            LINE (j), LINE (j + 1), 65536 - x, x, dest->width * 4);
+        gst_video_scale_orc_merge_linear_u16 ((guint16 *) (dest->pixels +
+                i * dest->stride), LINE (j), LINE (j + 1), 65536 - x, x,
+            dest->width * 4);
       }
     }
 
diff --git a/gst/videoscale/vs_scanline.c b/gst/videoscale/vs_scanline.c
index c9459c2..31d52a0 100644
--- a/gst/videoscale/vs_scanline.c
+++ b/gst/videoscale/vs_scanline.c
@@ -37,14 +37,14 @@
 void
 vs_scanline_downsample_Y (uint8_t * dest, uint8_t * src, int n)
 {
-  orc_downsample_u8 (dest, src, n);
+  gst_video_scale_orc_downsample_u8 (dest, src, n);
 }
 
 void
 vs_scanline_resample_nearest_Y (uint8_t * dest, uint8_t * src, int src_width,
     int n, int *accumulator, int increment)
 {
-  gst_videoscale_orc_resample_nearest_u8 (dest, src,
+  gst_video_scale_orc_resample_nearest_u8 (dest, src,
       *accumulator, increment, n);
 
   *accumulator += n * increment;
@@ -55,7 +55,7 @@ void
 vs_scanline_resample_linear_Y (uint8_t * dest, uint8_t * src, int src_width,
     int n, int *accumulator, int increment)
 {
-  gst_videoscale_orc_resample_bilinear_u8 (dest, src,
+  gst_video_scale_orc_resample_bilinear_u8 (dest, src,
       *accumulator, increment, n);
 
   *accumulator += n * increment;
@@ -70,14 +70,14 @@ vs_scanline_merge_linear_Y (uint8_t * dest, uint8_t * src1, uint8_t * src2,
   if (value == 0) {
     memcpy (dest, src1, n);
   } else {
-    orc_merge_linear_u8 (dest, src1, src2, value, n);
+    gst_video_scale_orc_merge_linear_u8 (dest, src1, src2, value, n);
   }
 }
 
 void
 vs_scanline_downsample_Y16 (uint8_t * dest, uint8_t * src, int n)
 {
-  orc_downsample_u16 ((uint16_t *) dest, (uint16_t *) src, n);
+  gst_video_scale_orc_downsample_u16 ((uint16_t *) dest, (uint16_t *) src, n);
 }
 
 void
@@ -137,7 +137,7 @@ vs_scanline_merge_linear_Y16 (uint8_t * dest, uint8_t * src1, uint8_t * src2,
   if (x == 0) {
     memcpy (d, s1, n * 2);
   } else {
-    orc_merge_linear_u16 (d, s1, s2, 65536 - x, x, n);
+    gst_video_scale_orc_merge_linear_u16 (d, s1, s2, 65536 - x, x, n);
   }
 }
 
@@ -146,14 +146,14 @@ vs_scanline_merge_linear_Y16 (uint8_t * dest, uint8_t * src1, uint8_t * src2,
 void
 vs_scanline_downsample_RGBA (uint8_t * dest, uint8_t * src, int n)
 {
-  gst_videoscale_orc_downsample_u32 (dest, src, n);
+  gst_video_scale_orc_downsample_u32 (dest, src, n);
 }
 
 void
 vs_scanline_resample_nearest_RGBA (uint8_t * dest, uint8_t * src, int src_width,
     int n, int *accumulator, int increment)
 {
-  gst_videoscale_orc_resample_nearest_u32 (dest, src,
+  gst_video_scale_orc_resample_nearest_u32 (dest, src,
       *accumulator, increment, n);
 
   *accumulator += n * increment;
@@ -163,7 +163,7 @@ void
 vs_scanline_resample_linear_RGBA (uint8_t * dest, uint8_t * src, int src_width,
     int n, int *accumulator, int increment)
 {
-  gst_videoscale_orc_resample_bilinear_u32 (dest, src,
+  gst_video_scale_orc_resample_bilinear_u32 (dest, src,
       *accumulator, increment, n);
 
   *accumulator += n * increment;
@@ -178,7 +178,7 @@ vs_scanline_merge_linear_RGBA (uint8_t * dest, uint8_t * src1, uint8_t * src2,
   if (value == 0) {
     memcpy (dest, src1, n * 4);
   } else {
-    orc_merge_linear_u8 (dest, src1, src2, value, n * 4);
+    gst_video_scale_orc_merge_linear_u8 (dest, src1, src2, value, n * 4);
   }
 }
 
@@ -263,7 +263,7 @@ vs_scanline_merge_linear_RGB (uint8_t * dest, uint8_t * src1, uint8_t * src2,
   if (value == 0) {
     memcpy (dest, src1, n * 3);
   } else {
-    orc_merge_linear_u8 (dest, src1, src2, value, n * 3);
+    gst_video_scale_orc_merge_linear_u8 (dest, src1, src2, value, n * 3);
   }
 }
 
@@ -276,7 +276,7 @@ vs_scanline_merge_linear_RGB (uint8_t * dest, uint8_t * src1, uint8_t * src2,
 void
 vs_scanline_downsample_YUYV (uint8_t * dest, uint8_t * src, int n)
 {
-  gst_videoscale_orc_downsample_yuyv (dest, src, n);
+  gst_video_scale_orc_downsample_yuyv (dest, src, n);
 }
 
 void
@@ -385,7 +385,7 @@ vs_scanline_merge_linear_YUYV (uint8_t * dest, uint8_t * src1, uint8_t * src2,
   if (value == 0) {
     memcpy (dest, src1, quads * 4);
   } else {
-    orc_merge_linear_u8 (dest, src1, src2, value, quads * 4);
+    gst_video_scale_orc_merge_linear_u8 (dest, src1, src2, value, quads * 4);
   }
 }
 
@@ -514,7 +514,7 @@ vs_scanline_merge_linear_UYVY (uint8_t * dest, uint8_t * src1,
   if (value == 0) {
     memcpy (dest, src1, quads * 4);
   } else {
-    orc_merge_linear_u8 (dest, src1, src2, value, quads * 4);
+    gst_video_scale_orc_merge_linear_u8 (dest, src1, src2, value, quads * 4);
   }
 }
 
@@ -596,7 +596,7 @@ vs_scanline_merge_linear_NV12 (uint8_t * dest, uint8_t * src1,
   if (value == 0) {
     memcpy (dest, src1, n * 2);
   } else {
-    orc_merge_linear_u8 (dest, src1, src2, value, n * 2);
+    gst_video_scale_orc_merge_linear_u8 (dest, src1, src2, value, n * 2);
   }
 }