Release 1.12.41.12.4

5 files changed, 122 insertions, 122 deletions

diff --git a/gst/audiomixer/gstaudiomixerorc-dist.c b/gst/audiomixer/gstaudiomixerorc-dist.c
index be377f705..fae10cf26 100644
--- a/gst/audiomixer/gstaudiomixerorc-dist.c
+++ b/gst/audiomixer/gstaudiomixerorc-dist.c
@@ -137,11 +137,11 @@ void audiomixer_orc_add_volume_f64 (double *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)
@@ -1129,7 +1129,7 @@ audiomixer_orc_volume_u8 (guint8 * ORC_RESTRICT d1, int p1, int n)
   ptr0 = (orc_int8 *) d1;
 
   /* 1: loadpb */
-  var35 = (int) 0x00000080;     /* 128 or 6.32404e-322f */
+  var35 = 0x00000080;           /* 128 or 6.32404e-322f */
   /* 3: loadpb */
   var36 = p1;
 
@@ -1175,7 +1175,7 @@ _backup_audiomixer_orc_volume_u8 (OrcExecutor * ORC_RESTRICT ex)
   ptr0 = (orc_int8 *) ex->arrays[0];
 
   /* 1: loadpb */
-  var35 = (int) 0x00000080;     /* 128 or 6.32404e-322f */
+  var35 = 0x00000080;           /* 128 or 6.32404e-322f */
   /* 3: loadpb */
   var36 = ex->params[24];
 
@@ -1292,7 +1292,7 @@ audiomixer_orc_add_volume_u8 (guint8 * ORC_RESTRICT d1,
   ptr4 = (orc_int8 *) s1;
 
   /* 1: loadpb */
-  var35 = (int) 0x00000080;     /* 128 or 6.32404e-322f */
+  var35 = 0x00000080;           /* 128 or 6.32404e-322f */
   /* 3: loadpb */
   var36 = p1;
 
@@ -1346,7 +1346,7 @@ _backup_audiomixer_orc_add_volume_u8 (OrcExecutor * ORC_RESTRICT ex)
   ptr4 = (orc_int8 *) ex->arrays[4];
 
   /* 1: loadpb */
-  var35 = (int) 0x00000080;     /* 128 or 6.32404e-322f */
+  var35 = 0x00000080;           /* 128 or 6.32404e-322f */
   /* 3: loadpb */
   var36 = ex->params[24];
 
@@ -1622,7 +1622,7 @@ audiomixer_orc_add_volume_u16 (guint16 * ORC_RESTRICT d1,
   ptr4 = (orc_union16 *) s1;
 
   /* 1: loadpw */
-  var35.i = (int) 0x00008000;   /* 32768 or 1.61895e-319f */
+  var35.i = 0x00008000;         /* 32768 or 1.61895e-319f */
   /* 3: loadpw */
   var36.i = p1;
 
@@ -1676,7 +1676,7 @@ _backup_audiomixer_orc_add_volume_u16 (OrcExecutor * ORC_RESTRICT ex)
   ptr4 = (orc_union16 *) ex->arrays[4];
 
   /* 1: loadpw */
-  var35.i = (int) 0x00008000;   /* 32768 or 1.61895e-319f */
+  var35.i = 0x00008000;         /* 32768 or 1.61895e-319f */
   /* 3: loadpw */
   var36.i = ex->params[24];
 
@@ -1956,7 +1956,7 @@ audiomixer_orc_add_volume_u32 (guint32 * ORC_RESTRICT d1,
   ptr4 = (orc_union32 *) s1;
 
   /* 1: loadpl */
-  var35.i = (int) 0x80000000;   /* -2147483648 or 1.061e-314f */
+  var35.i = 0x80000000;         /* -2147483648 or 1.061e-314f */
   /* 3: loadpl */
   var36.i = p1;
 
@@ -2012,7 +2012,7 @@ _backup_audiomixer_orc_add_volume_u32 (OrcExecutor * ORC_RESTRICT ex)
   ptr4 = (orc_union32 *) ex->arrays[4];
 
   /* 1: loadpl */
-  var35.i = (int) 0x80000000;   /* -2147483648 or 1.061e-314f */
+  var35.i = 0x80000000;         /* -2147483648 or 1.061e-314f */
   /* 3: loadpl */
   var36.i = ex->params[24];
 
diff --git a/gst/bayer/gstbayerorc-dist.c b/gst/bayer/gstbayerorc-dist.c
index e79862f62..e9dd7a8a0 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)
@@ -336,7 +336,7 @@ bayer_orc_horiz_upsample_unaligned (guint8 * ORC_RESTRICT d1,
       static const orc_uint8 bc[] = {
         1, 9, 34, 98, 97, 121, 101, 114, 95, 111, 114, 99, 95, 104, 111, 114,
         105, 122, 95, 117, 112, 115, 97, 109, 112, 108, 101, 95, 117, 110, 97,
-        108,
+            108,
         105, 103, 110, 101, 100, 11, 2, 2, 11, 2, 2, 12, 2, 2, 14, 4,
         1, 0, 0, 0, 20, 2, 20, 1, 20, 1, 20, 1, 20, 1, 199, 34,
         33, 4, 83, 32, 4, 16, 199, 36, 35, 32, 39, 36, 34, 36, 196, 0,
@@ -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 41744820b..5a7cb2a11 100644
--- a/gst/compositor/compositororc-dist.c
+++ b/gst/compositor/compositororc-dist.c
@@ -117,11 +117,11 @@ void compositor_orc_overlay_bgra (guint8 * ORC_RESTRICT d1, int d1_stride,
 #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)
@@ -595,7 +595,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 */
@@ -729,7 +729,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 */
@@ -969,7 +969,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 */
@@ -1106,7 +1106,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 */
@@ -1370,11 +1370,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 */
@@ -1586,11 +1586,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 */
@@ -1944,11 +1944,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 */
@@ -2166,11 +2166,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 */
diff --git a/gst/fieldanalysis/gstfieldanalysisorc-dist.c b/gst/fieldanalysis/gstfieldanalysisorc-dist.c
index 1ae014339..1bf13cf4b 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)
@@ -283,7 +283,7 @@ fieldanalysis_orc_same_parity_sad_planar_yuv (guint32 * ORC_RESTRICT a1,
       static const orc_uint8 bc[] = {
         1, 9, 44, 102, 105, 101, 108, 100, 97, 110, 97, 108, 121, 115, 105, 115,
         95, 111, 114, 99, 95, 115, 97, 109, 101, 95, 112, 97, 114, 105, 116,
-        121,
+            121,
         95, 115, 97, 100, 95, 112, 108, 97, 110, 97, 114, 95, 121, 117, 118, 12,
         1, 1, 12, 1, 1, 13, 4, 16, 4, 20, 2, 20, 2, 20, 4, 20,
         4, 150, 32, 4, 150, 33, 5, 98, 32, 32, 33, 69, 32, 32, 154, 34,
@@ -466,9 +466,9 @@ fieldanalysis_orc_same_parity_ssd_planar_yuv (guint32 * ORC_RESTRICT a1,
       static const orc_uint8 bc[] = {
         1, 9, 44, 102, 105, 101, 108, 100, 97, 110, 97, 108, 121, 115, 105, 115,
         95, 111, 114, 99, 95, 115, 97, 109, 101, 95, 112, 97, 114, 105, 116,
-        121,
+            121,
         95, 115, 115, 100, 95, 112, 108, 97, 110, 97, 114, 95, 121, 117, 118,
-        12,
+            12,
         1, 1, 12, 1, 1, 13, 4, 16, 4, 20, 2, 20, 2, 20, 4, 20,
         4, 150, 32, 4, 150, 33, 5, 98, 32, 32, 33, 176, 34, 32, 32, 111,
         35, 34, 24, 106, 34, 34, 35, 181, 12, 34, 2, 0,
@@ -758,7 +758,7 @@ fieldanalysis_orc_same_parity_3_tap_planar_yuv (guint32 * ORC_RESTRICT a1,
       static const orc_uint8 bc[] = {
         1, 9, 46, 102, 105, 101, 108, 100, 97, 110, 97, 108, 121, 115, 105, 115,
         95, 111, 114, 99, 95, 115, 97, 109, 101, 95, 112, 97, 114, 105, 116,
-        121,
+            121,
         95, 51, 95, 116, 97, 112, 95, 112, 108, 97, 110, 97, 114, 95, 121, 117,
         118, 12, 1, 1, 12, 1, 1, 12, 1, 1, 12, 1, 1, 12, 1, 1,
         12, 1, 1, 13, 4, 14, 2, 2, 0, 0, 0, 16, 4, 20, 2, 20,
@@ -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];
 
@@ -1085,7 +1085,7 @@ fieldanalysis_orc_opposite_parity_5_tap_planar_yuv (guint32 * ORC_RESTRICT a1,
       static const orc_uint8 bc[] = {
         1, 9, 50, 102, 105, 101, 108, 100, 97, 110, 97, 108, 121, 115, 105, 115,
         95, 111, 114, 99, 95, 111, 112, 112, 111, 115, 105, 116, 101, 95, 112,
-        97,
+            97,
         114, 105, 116, 121, 95, 53, 95, 116, 97, 112, 95, 112, 108, 97, 110, 97,
         114, 95, 121, 117, 118, 12, 1, 1, 12, 1, 1, 12, 1, 1, 12, 1,
         1, 12, 1, 1, 13, 4, 14, 2, 2, 0, 0, 0, 14, 2, 3, 0,
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 */