Update ORC fallback disted code

4 files changed, 118 insertions, 118 deletions

diff --git a/gst/bayer/gstbayerorc-dist.c b/gst/bayer/gstbayerorc-dist.c
index e79862f62..0e309cdba 100644
--- a/gst/bayer/gstbayerorc-dist.c
+++ b/gst/bayer/gstbayerorc-dist.c
@@ -140,11 +140,11 @@ void bayer_orc_merge_gr_argb (guint8 * ORC_RESTRICT d1,
 #define ORC_MAX(a,b) ((a)>(b) ? (a) : (b))
 #define ORC_SB_MAX 127
 #define ORC_SB_MIN (-1-ORC_SB_MAX)
-#define ORC_UB_MAX 255
+#define ORC_UB_MAX (orc_uint8) 255
 #define ORC_UB_MIN 0
 #define ORC_SW_MAX 32767
 #define ORC_SW_MIN (-1-ORC_SW_MAX)
-#define ORC_UW_MAX 65535
+#define ORC_UW_MAX (orc_uint16)65535
 #define ORC_UW_MIN 0
 #define ORC_SL_MAX 2147483647
 #define ORC_SL_MIN (-1-ORC_SL_MAX)
@@ -692,12 +692,12 @@ bayer_orc_merge_bg_bgra (guint8 * ORC_RESTRICT d1,
   ptr9 = (orc_union16 *) s6;
 
   /* 9: loadpw */
-  var42.i = (int) 0x000000ff;   /* 255 or 1.25987e-321f */
+  var42.i = 0x000000ff;         /* 255 or 1.25987e-321f */
   /* 11: loadpw */
-  var43.i = (int) 0x0000ff00;   /* 65280 or 3.22526e-319f */
+  var43.i = 0x0000ff00;         /* 65280 or 3.22526e-319f */
   /* 16: loadpb */
-  var45.x2[0] = (int) 0x000000ff;       /* 255 or 1.25987e-321f */
-  var45.x2[1] = (int) 0x000000ff;       /* 255 or 1.25987e-321f */
+  var45.x2[0] = 0x000000ff;     /* 255 or 1.25987e-321f */
+  var45.x2[1] = 0x000000ff;     /* 255 or 1.25987e-321f */
 
   for (i = 0; i < n; i++) {
     /* 0: loadw */
@@ -828,12 +828,12 @@ _backup_bayer_orc_merge_bg_bgra (OrcExecutor * ORC_RESTRICT ex)
   ptr9 = (orc_union16 *) ex->arrays[9];
 
   /* 9: loadpw */
-  var42.i = (int) 0x000000ff;   /* 255 or 1.25987e-321f */
+  var42.i = 0x000000ff;         /* 255 or 1.25987e-321f */
   /* 11: loadpw */
-  var43.i = (int) 0x0000ff00;   /* 65280 or 3.22526e-319f */
+  var43.i = 0x0000ff00;         /* 65280 or 3.22526e-319f */
   /* 16: loadpb */
-  var45.x2[0] = (int) 0x000000ff;       /* 255 or 1.25987e-321f */
-  var45.x2[1] = (int) 0x000000ff;       /* 255 or 1.25987e-321f */
+  var45.x2[0] = 0x000000ff;     /* 255 or 1.25987e-321f */
+  var45.x2[1] = 0x000000ff;     /* 255 or 1.25987e-321f */
 
   for (i = 0; i < n; i++) {
     /* 0: loadw */
@@ -1064,12 +1064,12 @@ bayer_orc_merge_gr_bgra (guint8 * ORC_RESTRICT d1,
   ptr9 = (orc_union16 *) s6;
 
   /* 9: loadpw */
-  var42.i = (int) 0x0000ff00;   /* 65280 or 3.22526e-319f */
+  var42.i = 0x0000ff00;         /* 65280 or 3.22526e-319f */
   /* 11: loadpw */
-  var43.i = (int) 0x000000ff;   /* 255 or 1.25987e-321f */
+  var43.i = 0x000000ff;         /* 255 or 1.25987e-321f */
   /* 16: loadpb */
-  var45.x2[0] = (int) 0x000000ff;       /* 255 or 1.25987e-321f */
-  var45.x2[1] = (int) 0x000000ff;       /* 255 or 1.25987e-321f */
+  var45.x2[0] = 0x000000ff;     /* 255 or 1.25987e-321f */
+  var45.x2[1] = 0x000000ff;     /* 255 or 1.25987e-321f */
 
   for (i = 0; i < n; i++) {
     /* 0: loadw */
@@ -1200,12 +1200,12 @@ _backup_bayer_orc_merge_gr_bgra (OrcExecutor * ORC_RESTRICT ex)
   ptr9 = (orc_union16 *) ex->arrays[9];
 
   /* 9: loadpw */
-  var42.i = (int) 0x0000ff00;   /* 65280 or 3.22526e-319f */
+  var42.i = 0x0000ff00;         /* 65280 or 3.22526e-319f */
   /* 11: loadpw */
-  var43.i = (int) 0x000000ff;   /* 255 or 1.25987e-321f */
+  var43.i = 0x000000ff;         /* 255 or 1.25987e-321f */
   /* 16: loadpb */
-  var45.x2[0] = (int) 0x000000ff;       /* 255 or 1.25987e-321f */
-  var45.x2[1] = (int) 0x000000ff;       /* 255 or 1.25987e-321f */
+  var45.x2[0] = 0x000000ff;     /* 255 or 1.25987e-321f */
+  var45.x2[1] = 0x000000ff;     /* 255 or 1.25987e-321f */
 
   for (i = 0; i < n; i++) {
     /* 0: loadw */
@@ -1436,12 +1436,12 @@ bayer_orc_merge_bg_abgr (guint8 * ORC_RESTRICT d1,
   ptr9 = (orc_union16 *) s6;
 
   /* 9: loadpw */
-  var42.i = (int) 0x000000ff;   /* 255 or 1.25987e-321f */
+  var42.i = 0x000000ff;         /* 255 or 1.25987e-321f */
   /* 11: loadpw */
-  var43.i = (int) 0x0000ff00;   /* 65280 or 3.22526e-319f */
+  var43.i = 0x0000ff00;         /* 65280 or 3.22526e-319f */
   /* 14: loadpb */
-  var44.x2[0] = (int) 0x000000ff;       /* 255 or 1.25987e-321f */
-  var44.x2[1] = (int) 0x000000ff;       /* 255 or 1.25987e-321f */
+  var44.x2[0] = 0x000000ff;     /* 255 or 1.25987e-321f */
+  var44.x2[1] = 0x000000ff;     /* 255 or 1.25987e-321f */
 
   for (i = 0; i < n; i++) {
     /* 0: loadw */
@@ -1572,12 +1572,12 @@ _backup_bayer_orc_merge_bg_abgr (OrcExecutor * ORC_RESTRICT ex)
   ptr9 = (orc_union16 *) ex->arrays[9];
 
   /* 9: loadpw */
-  var42.i = (int) 0x000000ff;   /* 255 or 1.25987e-321f */
+  var42.i = 0x000000ff;         /* 255 or 1.25987e-321f */
   /* 11: loadpw */
-  var43.i = (int) 0x0000ff00;   /* 65280 or 3.22526e-319f */
+  var43.i = 0x0000ff00;         /* 65280 or 3.22526e-319f */
   /* 14: loadpb */
-  var44.x2[0] = (int) 0x000000ff;       /* 255 or 1.25987e-321f */
-  var44.x2[1] = (int) 0x000000ff;       /* 255 or 1.25987e-321f */
+  var44.x2[0] = 0x000000ff;     /* 255 or 1.25987e-321f */
+  var44.x2[1] = 0x000000ff;     /* 255 or 1.25987e-321f */
 
   for (i = 0; i < n; i++) {
     /* 0: loadw */
@@ -1808,12 +1808,12 @@ bayer_orc_merge_gr_abgr (guint8 * ORC_RESTRICT d1,
   ptr9 = (orc_union16 *) s6;
 
   /* 9: loadpw */
-  var42.i = (int) 0x0000ff00;   /* 65280 or 3.22526e-319f */
+  var42.i = 0x0000ff00;         /* 65280 or 3.22526e-319f */
   /* 11: loadpw */
-  var43.i = (int) 0x000000ff;   /* 255 or 1.25987e-321f */
+  var43.i = 0x000000ff;         /* 255 or 1.25987e-321f */
   /* 14: loadpb */
-  var44.x2[0] = (int) 0x000000ff;       /* 255 or 1.25987e-321f */
-  var44.x2[1] = (int) 0x000000ff;       /* 255 or 1.25987e-321f */
+  var44.x2[0] = 0x000000ff;     /* 255 or 1.25987e-321f */
+  var44.x2[1] = 0x000000ff;     /* 255 or 1.25987e-321f */
 
   for (i = 0; i < n; i++) {
     /* 0: loadw */
@@ -1944,12 +1944,12 @@ _backup_bayer_orc_merge_gr_abgr (OrcExecutor * ORC_RESTRICT ex)
   ptr9 = (orc_union16 *) ex->arrays[9];
 
   /* 9: loadpw */
-  var42.i = (int) 0x0000ff00;   /* 65280 or 3.22526e-319f */
+  var42.i = 0x0000ff00;         /* 65280 or 3.22526e-319f */
   /* 11: loadpw */
-  var43.i = (int) 0x000000ff;   /* 255 or 1.25987e-321f */
+  var43.i = 0x000000ff;         /* 255 or 1.25987e-321f */
   /* 14: loadpb */
-  var44.x2[0] = (int) 0x000000ff;       /* 255 or 1.25987e-321f */
-  var44.x2[1] = (int) 0x000000ff;       /* 255 or 1.25987e-321f */
+  var44.x2[0] = 0x000000ff;     /* 255 or 1.25987e-321f */
+  var44.x2[1] = 0x000000ff;     /* 255 or 1.25987e-321f */
 
   for (i = 0; i < n; i++) {
     /* 0: loadw */
@@ -2180,12 +2180,12 @@ bayer_orc_merge_bg_rgba (guint8 * ORC_RESTRICT d1,
   ptr9 = (orc_union16 *) s6;
 
   /* 9: loadpw */
-  var42.i = (int) 0x000000ff;   /* 255 or 1.25987e-321f */
+  var42.i = 0x000000ff;         /* 255 or 1.25987e-321f */
   /* 11: loadpw */
-  var43.i = (int) 0x0000ff00;   /* 65280 or 3.22526e-319f */
+  var43.i = 0x0000ff00;         /* 65280 or 3.22526e-319f */
   /* 16: loadpb */
-  var45.x2[0] = (int) 0x000000ff;       /* 255 or 1.25987e-321f */
-  var45.x2[1] = (int) 0x000000ff;       /* 255 or 1.25987e-321f */
+  var45.x2[0] = 0x000000ff;     /* 255 or 1.25987e-321f */
+  var45.x2[1] = 0x000000ff;     /* 255 or 1.25987e-321f */
 
   for (i = 0; i < n; i++) {
     /* 0: loadw */
@@ -2316,12 +2316,12 @@ _backup_bayer_orc_merge_bg_rgba (OrcExecutor * ORC_RESTRICT ex)
   ptr9 = (orc_union16 *) ex->arrays[9];
 
   /* 9: loadpw */
-  var42.i = (int) 0x000000ff;   /* 255 or 1.25987e-321f */
+  var42.i = 0x000000ff;         /* 255 or 1.25987e-321f */
   /* 11: loadpw */
-  var43.i = (int) 0x0000ff00;   /* 65280 or 3.22526e-319f */
+  var43.i = 0x0000ff00;         /* 65280 or 3.22526e-319f */
   /* 16: loadpb */
-  var45.x2[0] = (int) 0x000000ff;       /* 255 or 1.25987e-321f */
-  var45.x2[1] = (int) 0x000000ff;       /* 255 or 1.25987e-321f */
+  var45.x2[0] = 0x000000ff;     /* 255 or 1.25987e-321f */
+  var45.x2[1] = 0x000000ff;     /* 255 or 1.25987e-321f */
 
   for (i = 0; i < n; i++) {
     /* 0: loadw */
@@ -2552,12 +2552,12 @@ bayer_orc_merge_gr_rgba (guint8 * ORC_RESTRICT d1,
   ptr9 = (orc_union16 *) s6;
 
   /* 9: loadpw */
-  var42.i = (int) 0x0000ff00;   /* 65280 or 3.22526e-319f */
+  var42.i = 0x0000ff00;         /* 65280 or 3.22526e-319f */
   /* 11: loadpw */
-  var43.i = (int) 0x000000ff;   /* 255 or 1.25987e-321f */
+  var43.i = 0x000000ff;         /* 255 or 1.25987e-321f */
   /* 16: loadpb */
-  var45.x2[0] = (int) 0x000000ff;       /* 255 or 1.25987e-321f */
-  var45.x2[1] = (int) 0x000000ff;       /* 255 or 1.25987e-321f */
+  var45.x2[0] = 0x000000ff;     /* 255 or 1.25987e-321f */
+  var45.x2[1] = 0x000000ff;     /* 255 or 1.25987e-321f */
 
   for (i = 0; i < n; i++) {
     /* 0: loadw */
@@ -2688,12 +2688,12 @@ _backup_bayer_orc_merge_gr_rgba (OrcExecutor * ORC_RESTRICT ex)
   ptr9 = (orc_union16 *) ex->arrays[9];
 
   /* 9: loadpw */
-  var42.i = (int) 0x0000ff00;   /* 65280 or 3.22526e-319f */
+  var42.i = 0x0000ff00;         /* 65280 or 3.22526e-319f */
   /* 11: loadpw */
-  var43.i = (int) 0x000000ff;   /* 255 or 1.25987e-321f */
+  var43.i = 0x000000ff;         /* 255 or 1.25987e-321f */
   /* 16: loadpb */
-  var45.x2[0] = (int) 0x000000ff;       /* 255 or 1.25987e-321f */
-  var45.x2[1] = (int) 0x000000ff;       /* 255 or 1.25987e-321f */
+  var45.x2[0] = 0x000000ff;     /* 255 or 1.25987e-321f */
+  var45.x2[1] = 0x000000ff;     /* 255 or 1.25987e-321f */
 
   for (i = 0; i < n; i++) {
     /* 0: loadw */
@@ -2924,12 +2924,12 @@ bayer_orc_merge_bg_argb (guint8 * ORC_RESTRICT d1,
   ptr9 = (orc_union16 *) s6;
 
   /* 9: loadpw */
-  var42.i = (int) 0x000000ff;   /* 255 or 1.25987e-321f */
+  var42.i = 0x000000ff;         /* 255 or 1.25987e-321f */
   /* 11: loadpw */
-  var43.i = (int) 0x0000ff00;   /* 65280 or 3.22526e-319f */
+  var43.i = 0x0000ff00;         /* 65280 or 3.22526e-319f */
   /* 14: loadpb */
-  var44.x2[0] = (int) 0x000000ff;       /* 255 or 1.25987e-321f */
-  var44.x2[1] = (int) 0x000000ff;       /* 255 or 1.25987e-321f */
+  var44.x2[0] = 0x000000ff;     /* 255 or 1.25987e-321f */
+  var44.x2[1] = 0x000000ff;     /* 255 or 1.25987e-321f */
 
   for (i = 0; i < n; i++) {
     /* 0: loadw */
@@ -3060,12 +3060,12 @@ _backup_bayer_orc_merge_bg_argb (OrcExecutor * ORC_RESTRICT ex)
   ptr9 = (orc_union16 *) ex->arrays[9];
 
   /* 9: loadpw */
-  var42.i = (int) 0x000000ff;   /* 255 or 1.25987e-321f */
+  var42.i = 0x000000ff;         /* 255 or 1.25987e-321f */
   /* 11: loadpw */
-  var43.i = (int) 0x0000ff00;   /* 65280 or 3.22526e-319f */
+  var43.i = 0x0000ff00;         /* 65280 or 3.22526e-319f */
   /* 14: loadpb */
-  var44.x2[0] = (int) 0x000000ff;       /* 255 or 1.25987e-321f */
-  var44.x2[1] = (int) 0x000000ff;       /* 255 or 1.25987e-321f */
+  var44.x2[0] = 0x000000ff;     /* 255 or 1.25987e-321f */
+  var44.x2[1] = 0x000000ff;     /* 255 or 1.25987e-321f */
 
   for (i = 0; i < n; i++) {
     /* 0: loadw */
@@ -3296,12 +3296,12 @@ bayer_orc_merge_gr_argb (guint8 * ORC_RESTRICT d1,
   ptr9 = (orc_union16 *) s6;
 
   /* 9: loadpw */
-  var42.i = (int) 0x0000ff00;   /* 65280 or 3.22526e-319f */
+  var42.i = 0x0000ff00;         /* 65280 or 3.22526e-319f */
   /* 11: loadpw */
-  var43.i = (int) 0x000000ff;   /* 255 or 1.25987e-321f */
+  var43.i = 0x000000ff;         /* 255 or 1.25987e-321f */
   /* 14: loadpb */
-  var44.x2[0] = (int) 0x000000ff;       /* 255 or 1.25987e-321f */
-  var44.x2[1] = (int) 0x000000ff;       /* 255 or 1.25987e-321f */
+  var44.x2[0] = 0x000000ff;     /* 255 or 1.25987e-321f */
+  var44.x2[1] = 0x000000ff;     /* 255 or 1.25987e-321f */
 
   for (i = 0; i < n; i++) {
     /* 0: loadw */
@@ -3432,12 +3432,12 @@ _backup_bayer_orc_merge_gr_argb (OrcExecutor * ORC_RESTRICT ex)
   ptr9 = (orc_union16 *) ex->arrays[9];
 
   /* 9: loadpw */
-  var42.i = (int) 0x0000ff00;   /* 65280 or 3.22526e-319f */
+  var42.i = 0x0000ff00;         /* 65280 or 3.22526e-319f */
   /* 11: loadpw */
-  var43.i = (int) 0x000000ff;   /* 255 or 1.25987e-321f */
+  var43.i = 0x000000ff;         /* 255 or 1.25987e-321f */
   /* 14: loadpb */
-  var44.x2[0] = (int) 0x000000ff;       /* 255 or 1.25987e-321f */
-  var44.x2[1] = (int) 0x000000ff;       /* 255 or 1.25987e-321f */
+  var44.x2[0] = 0x000000ff;     /* 255 or 1.25987e-321f */
+  var44.x2[1] = 0x000000ff;     /* 255 or 1.25987e-321f */
 
   for (i = 0; i < n; i++) {
     /* 0: loadw */
diff --git a/gst/compositor/compositororc-dist.c b/gst/compositor/compositororc-dist.c
index 0fab506cd..06cbfddea 100644
--- a/gst/compositor/compositororc-dist.c
+++ b/gst/compositor/compositororc-dist.c
@@ -123,11 +123,11 @@ void compositor_orc_overlay_bgra_addition (guint8 * ORC_RESTRICT d1,
 #define ORC_MAX(a,b) ((a)>(b) ? (a) : (b))
 #define ORC_SB_MAX 127
 #define ORC_SB_MIN (-1-ORC_SB_MAX)
-#define ORC_UB_MAX 255
+#define ORC_UB_MAX (orc_uint8) 255
 #define ORC_UB_MIN 0
 #define ORC_SW_MAX 32767
 #define ORC_SW_MIN (-1-ORC_SW_MAX)
-#define ORC_UW_MAX 65535
+#define ORC_UW_MAX (orc_uint16)65535
 #define ORC_UW_MIN 0
 #define ORC_SL_MAX 2147483647
 #define ORC_SL_MIN (-1-ORC_SL_MAX)
@@ -601,7 +601,7 @@ compositor_orc_blend_argb (guint8 * ORC_RESTRICT d1, int d1_stride,
     var39.x4[2] = p1;
     var39.x4[3] = p1;
     /* 16: loadpl */
-    var40.i = (int) 0x000000ff; /* 255 or 1.25987e-321f */
+    var40.i = 0x000000ff;       /* 255 or 1.25987e-321f */
 
     for (i = 0; i < n; i++) {
       /* 0: loadl */
@@ -735,7 +735,7 @@ _backup_compositor_orc_blend_argb (OrcExecutor * ORC_RESTRICT ex)
     var39.x4[2] = ex->params[24];
     var39.x4[3] = ex->params[24];
     /* 16: loadpl */
-    var40.i = (int) 0x000000ff; /* 255 or 1.25987e-321f */
+    var40.i = 0x000000ff;       /* 255 or 1.25987e-321f */
 
     for (i = 0; i < n; i++) {
       /* 0: loadl */
@@ -975,7 +975,7 @@ compositor_orc_blend_bgra (guint8 * ORC_RESTRICT d1, int d1_stride,
     var40.x4[2] = p1;
     var40.x4[3] = p1;
     /* 17: loadpl */
-    var41.i = (int) 0xff000000; /* -16777216 or 2.11371e-314f */
+    var41.i = 0xff000000;       /* -16777216 or 2.11371e-314f */
 
     for (i = 0; i < n; i++) {
       /* 0: loadl */
@@ -1112,7 +1112,7 @@ _backup_compositor_orc_blend_bgra (OrcExecutor * ORC_RESTRICT ex)
     var40.x4[2] = ex->params[24];
     var40.x4[3] = ex->params[24];
     /* 17: loadpl */
-    var41.i = (int) 0xff000000; /* -16777216 or 2.11371e-314f */
+    var41.i = 0xff000000;       /* -16777216 or 2.11371e-314f */
 
     for (i = 0; i < n; i++) {
       /* 0: loadl */
@@ -1376,11 +1376,11 @@ compositor_orc_overlay_argb (guint8 * ORC_RESTRICT d1, int d1_stride,
     var41.x4[2] = p1;
     var41.x4[3] = p1;
     /* 10: loadpl */
-    var53.i = (int) 0xffffffff; /* -1 or 2.122e-314f */
+    var53.i = 0xffffffff;       /* -1 or 2.122e-314f */
     /* 26: loadpl */
-    var42.i = (int) 0xffffff00; /* -256 or 2.122e-314f */
+    var42.i = 0xffffff00;       /* -256 or 2.122e-314f */
     /* 29: loadpl */
-    var43.i = (int) 0x000000ff; /* 255 or 1.25987e-321f */
+    var43.i = 0x000000ff;       /* 255 or 1.25987e-321f */
 
     for (i = 0; i < n; i++) {
       /* 0: loadl */
@@ -1592,11 +1592,11 @@ _backup_compositor_orc_overlay_argb (OrcExecutor * ORC_RESTRICT ex)
     var41.x4[2] = ex->params[24];
     var41.x4[3] = ex->params[24];
     /* 10: loadpl */
-    var53.i = (int) 0xffffffff; /* -1 or 2.122e-314f */
+    var53.i = 0xffffffff;       /* -1 or 2.122e-314f */
     /* 26: loadpl */
-    var42.i = (int) 0xffffff00; /* -256 or 2.122e-314f */
+    var42.i = 0xffffff00;       /* -256 or 2.122e-314f */
     /* 29: loadpl */
-    var43.i = (int) 0x000000ff; /* 255 or 1.25987e-321f */
+    var43.i = 0x000000ff;       /* 255 or 1.25987e-321f */
 
     for (i = 0; i < n; i++) {
       /* 0: loadl */
@@ -1954,11 +1954,11 @@ compositor_orc_overlay_argb_addition (guint8 * ORC_RESTRICT d1, int d1_stride,
     var42.x4[2] = p1;
     var42.x4[3] = p1;
     /* 10: loadpl */
-    var54.i = (int) 0xffffffff; /* -1 or 2.122e-314f */
+    var54.i = 0xffffffff;       /* -1 or 2.122e-314f */
     /* 32: loadpl */
-    var43.i = (int) 0xffffff00; /* -256 or 2.122e-314f */
+    var43.i = 0xffffff00;       /* -256 or 2.122e-314f */
     /* 35: loadpl */
-    var44.i = (int) 0x000000ff; /* 255 or 1.25987e-321f */
+    var44.i = 0x000000ff;       /* 255 or 1.25987e-321f */
 
     for (i = 0; i < n; i++) {
       /* 0: loadl */
@@ -2197,11 +2197,11 @@ _backup_compositor_orc_overlay_argb_addition (OrcExecutor * ORC_RESTRICT ex)
     var42.x4[2] = ex->params[24];
     var42.x4[3] = ex->params[24];
     /* 10: loadpl */
-    var54.i = (int) 0xffffffff; /* -1 or 2.122e-314f */
+    var54.i = 0xffffffff;       /* -1 or 2.122e-314f */
     /* 32: loadpl */
-    var43.i = (int) 0xffffff00; /* -256 or 2.122e-314f */
+    var43.i = 0xffffff00;       /* -256 or 2.122e-314f */
     /* 35: loadpl */
-    var44.i = (int) 0x000000ff; /* 255 or 1.25987e-321f */
+    var44.i = 0x000000ff;       /* 255 or 1.25987e-321f */
 
     for (i = 0; i < n; i++) {
       /* 0: loadl */
@@ -2593,11 +2593,11 @@ compositor_orc_overlay_bgra (guint8 * ORC_RESTRICT d1, int d1_stride,
     var42.x4[2] = p1;
     var42.x4[3] = p1;
     /* 11: loadpl */
-    var55.i = (int) 0xffffffff; /* -1 or 2.122e-314f */
+    var55.i = 0xffffffff;       /* -1 or 2.122e-314f */
     /* 28: loadpl */
-    var43.i = (int) 0x00ffffff; /* 16777215 or 8.28905e-317f */
+    var43.i = 0x00ffffff;       /* 16777215 or 8.28905e-317f */
     /* 31: loadpl */
-    var44.i = (int) 0xff000000; /* -16777216 or 2.11371e-314f */
+    var44.i = 0xff000000;       /* -16777216 or 2.11371e-314f */
 
     for (i = 0; i < n; i++) {
       /* 0: loadl */
@@ -2815,11 +2815,11 @@ _backup_compositor_orc_overlay_bgra (OrcExecutor * ORC_RESTRICT ex)
     var42.x4[2] = ex->params[24];
     var42.x4[3] = ex->params[24];
     /* 11: loadpl */
-    var55.i = (int) 0xffffffff; /* -1 or 2.122e-314f */
+    var55.i = 0xffffffff;       /* -1 or 2.122e-314f */
     /* 28: loadpl */
-    var43.i = (int) 0x00ffffff; /* 16777215 or 8.28905e-317f */
+    var43.i = 0x00ffffff;       /* 16777215 or 8.28905e-317f */
     /* 31: loadpl */
-    var44.i = (int) 0xff000000; /* -16777216 or 2.11371e-314f */
+    var44.i = 0xff000000;       /* -16777216 or 2.11371e-314f */
 
     for (i = 0; i < n; i++) {
       /* 0: loadl */
@@ -3191,11 +3191,11 @@ compositor_orc_overlay_bgra_addition (guint8 * ORC_RESTRICT d1, int d1_stride,
     var43.x4[2] = p1;
     var43.x4[3] = p1;
     /* 11: loadpl */
-    var56.i = (int) 0xffffffff; /* -1 or 2.122e-314f */
+    var56.i = 0xffffffff;       /* -1 or 2.122e-314f */
     /* 35: loadpl */
-    var44.i = (int) 0x00ffffff; /* 16777215 or 8.28905e-317f */
+    var44.i = 0x00ffffff;       /* 16777215 or 8.28905e-317f */
     /* 38: loadpl */
-    var45.i = (int) 0xff000000; /* -16777216 or 2.11371e-314f */
+    var45.i = 0xff000000;       /* -16777216 or 2.11371e-314f */
 
     for (i = 0; i < n; i++) {
       /* 0: loadl */
@@ -3443,11 +3443,11 @@ _backup_compositor_orc_overlay_bgra_addition (OrcExecutor * ORC_RESTRICT ex)
     var43.x4[2] = ex->params[24];
     var43.x4[3] = ex->params[24];
     /* 11: loadpl */
-    var56.i = (int) 0xffffffff; /* -1 or 2.122e-314f */
+    var56.i = 0xffffffff;       /* -1 or 2.122e-314f */
     /* 35: loadpl */
-    var44.i = (int) 0x00ffffff; /* 16777215 or 8.28905e-317f */
+    var44.i = 0x00ffffff;       /* 16777215 or 8.28905e-317f */
     /* 38: loadpl */
-    var45.i = (int) 0xff000000; /* -16777216 or 2.11371e-314f */
+    var45.i = 0xff000000;       /* -16777216 or 2.11371e-314f */
 
     for (i = 0; i < n; i++) {
       /* 0: loadl */
diff --git a/gst/fieldanalysis/gstfieldanalysisorc-dist.c b/gst/fieldanalysis/gstfieldanalysisorc-dist.c
index 1ae014339..85559e356 100644
--- a/gst/fieldanalysis/gstfieldanalysisorc-dist.c
+++ b/gst/fieldanalysis/gstfieldanalysisorc-dist.c
@@ -120,11 +120,11 @@ void fieldanalysis_orc_opposite_parity_5_tap_planar_yuv (guint32 *
 #define ORC_MAX(a,b) ((a)>(b) ? (a) : (b))
 #define ORC_SB_MAX 127
 #define ORC_SB_MIN (-1-ORC_SB_MAX)
-#define ORC_UB_MAX 255
+#define ORC_UB_MAX (orc_uint8) 255
 #define ORC_UB_MIN 0
 #define ORC_SW_MAX 32767
 #define ORC_SW_MIN (-1-ORC_SW_MAX)
-#define ORC_UW_MAX 65535
+#define ORC_UW_MAX (orc_uint16)65535
 #define ORC_UW_MIN 0
 #define ORC_SL_MAX 2147483647
 #define ORC_SL_MIN (-1-ORC_SL_MAX)
@@ -909,7 +909,7 @@ fieldanalysis_orc_opposite_parity_5_tap_planar_yuv (guint32 * ORC_RESTRICT a1,
   ptr8 = (orc_int8 *) s5;
 
   /* 11: loadpw */
-  var44.i = (int) 0x00000003;   /* 3 or 1.4822e-323f */
+  var44.i = 0x00000003;         /* 3 or 1.4822e-323f */
   /* 20: loadpl */
   var45.i = p1;
 
@@ -1011,7 +1011,7 @@ _backup_fieldanalysis_orc_opposite_parity_5_tap_planar_yuv (OrcExecutor *
   ptr8 = (orc_int8 *) ex->arrays[8];
 
   /* 11: loadpw */
-  var44.i = (int) 0x00000003;   /* 3 or 1.4822e-323f */
+  var44.i = 0x00000003;         /* 3 or 1.4822e-323f */
   /* 20: loadpl */
   var45.i = ex->params[24];
 
diff --git a/gst/gaudieffects/gstgaudieffectsorc-dist.c b/gst/gaudieffects/gstgaudieffectsorc-dist.c
index 0ca7fc197..967538ccf 100644
--- a/gst/gaudieffects/gstgaudieffectsorc-dist.c
+++ b/gst/gaudieffects/gstgaudieffectsorc-dist.c
@@ -106,11 +106,11 @@ void gaudi_orc_burn (guint32 * ORC_RESTRICT d1, const guint32 * ORC_RESTRICT s1,
 #define ORC_MAX(a,b) ((a)>(b) ? (a) : (b))
 #define ORC_SB_MAX 127
 #define ORC_SB_MIN (-1-ORC_SB_MAX)
-#define ORC_UB_MAX 255
+#define ORC_UB_MAX (orc_uint8) 255
 #define ORC_UB_MIN 0
 #define ORC_SW_MAX 32767
 #define ORC_SW_MIN (-1-ORC_SW_MAX)
-#define ORC_UW_MAX 65535
+#define ORC_UW_MAX (orc_uint16)65535
 #define ORC_UW_MIN 0
 #define ORC_SL_MAX 2147483647
 #define ORC_SL_MIN (-1-ORC_SL_MAX)
@@ -184,15 +184,15 @@ gaudi_orc_burn (guint32 * ORC_RESTRICT d1, const guint32 * ORC_RESTRICT s1,
   var36.x4[2] = p1;
   var36.x4[3] = p1;
   /* 6: loadpb */
-  var37.x4[0] = (int) 0x000000ff;       /* 255 or 1.25987e-321f */
-  var37.x4[1] = (int) 0x000000ff;       /* 255 or 1.25987e-321f */
-  var37.x4[2] = (int) 0x000000ff;       /* 255 or 1.25987e-321f */
-  var37.x4[3] = (int) 0x000000ff;       /* 255 or 1.25987e-321f */
+  var37.x4[0] = 0x000000ff;     /* 255 or 1.25987e-321f */
+  var37.x4[1] = 0x000000ff;     /* 255 or 1.25987e-321f */
+  var37.x4[2] = 0x000000ff;     /* 255 or 1.25987e-321f */
+  var37.x4[3] = 0x000000ff;     /* 255 or 1.25987e-321f */
   /* 11: loadpw */
-  var38.x4[0] = (int) 0x000000ff;       /* 255 or 1.25987e-321f */
-  var38.x4[1] = (int) 0x000000ff;       /* 255 or 1.25987e-321f */
-  var38.x4[2] = (int) 0x000000ff;       /* 255 or 1.25987e-321f */
-  var38.x4[3] = (int) 0x000000ff;       /* 255 or 1.25987e-321f */
+  var38.x4[0] = 0x000000ff;     /* 255 or 1.25987e-321f */
+  var38.x4[1] = 0x000000ff;     /* 255 or 1.25987e-321f */
+  var38.x4[2] = 0x000000ff;     /* 255 or 1.25987e-321f */
+  var38.x4[3] = 0x000000ff;     /* 255 or 1.25987e-321f */
 
   for (i = 0; i < n; i++) {
     /* 0: loadl */
@@ -305,15 +305,15 @@ _backup_gaudi_orc_burn (OrcExecutor * ORC_RESTRICT ex)
   var36.x4[2] = ex->params[24];
   var36.x4[3] = ex->params[24];
   /* 6: loadpb */
-  var37.x4[0] = (int) 0x000000ff;       /* 255 or 1.25987e-321f */
-  var37.x4[1] = (int) 0x000000ff;       /* 255 or 1.25987e-321f */
-  var37.x4[2] = (int) 0x000000ff;       /* 255 or 1.25987e-321f */
-  var37.x4[3] = (int) 0x000000ff;       /* 255 or 1.25987e-321f */
+  var37.x4[0] = 0x000000ff;     /* 255 or 1.25987e-321f */
+  var37.x4[1] = 0x000000ff;     /* 255 or 1.25987e-321f */
+  var37.x4[2] = 0x000000ff;     /* 255 or 1.25987e-321f */
+  var37.x4[3] = 0x000000ff;     /* 255 or 1.25987e-321f */
   /* 11: loadpw */
-  var38.x4[0] = (int) 0x000000ff;       /* 255 or 1.25987e-321f */
-  var38.x4[1] = (int) 0x000000ff;       /* 255 or 1.25987e-321f */
-  var38.x4[2] = (int) 0x000000ff;       /* 255 or 1.25987e-321f */
-  var38.x4[3] = (int) 0x000000ff;       /* 255 or 1.25987e-321f */
+  var38.x4[0] = 0x000000ff;     /* 255 or 1.25987e-321f */
+  var38.x4[1] = 0x000000ff;     /* 255 or 1.25987e-321f */
+  var38.x4[2] = 0x000000ff;     /* 255 or 1.25987e-321f */
+  var38.x4[3] = 0x000000ff;     /* 255 or 1.25987e-321f */
 
   for (i = 0; i < n; i++) {
     /* 0: loadl */