diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c6e9bd2c4..4cbcac85c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -40,6 +40,9 @@ stages:
     - export GST_PLUGIN_SYSTEM_PATH=$PWD/gstreamer/lib/x86_64-linux-gnu/gstreamer-1.0
     - export PATH=$PATH:$PWD/gstreamer/bin
 
+    # go back to the root build directory
+    - cd ..
+
     - rustc --version
     - cargo --version
   script:
@@ -52,6 +55,28 @@ stages:
     # https://github.com/sdroege/gstreamer-sys/issues/16
     # - cargo test --all --all-features --color=always
 
+    # Run tests for crates we can currently run. The others
+    # need a new release of the C library first
+    - |
+        for crate in gstreamer-app-sys \
+                     gstreamer-audio-sys \
+                     gstreamer-base-sys \
+                     gstreamer-check-sys \
+                     gstreamer-gl-sys \
+                     gstreamer-mpegts-sys \
+                     gstreamer-net-sys \
+                     gstreamer-pbutils-sys \
+                     gstreamer-player-sys \
+                     gstreamer-rtsp-sys \
+                     gstreamer-sdp-sys \
+                     gstreamer-sys \
+                     gstreamer-tag-sys \
+                     gstreamer-video-sys \
+                     gstreamer-webrtc-sys; \
+            do \
+                cargo test -p $crate; \
+            done
+
 test 1.28:
   # 1.28 img
   # https://hub.docker.com/_/rust/
diff --git a/Gir_Gst.toml b/Gir_Gst.toml
index 21468e4a6..15888029c 100644
--- a/Gir_Gst.toml
+++ b/Gir_Gst.toml
@@ -11,6 +11,12 @@ ignore = [
     "Gst.VERSION_MINOR",
     "Gst.VERSION_MICRO",
     "Gst.VERSION_NANO",
+    "Gst.ERROR_SYSTEM",
+    "Gst.TIME_FORMAT",
+    "Gst.STIME_FORMAT",
+    "Gst.PTR_FORMAT",
+    "Gst.SEGMENT_FORMAT",
+    "Gst.FOURCC_FORMAT",
 ]
 
 external_libraries = [
diff --git a/Gir_GstGL.toml b/Gir_GstGL.toml
index c2eb5445d..f7b622cf3 100644
--- a/Gir_GstGL.toml
+++ b/Gir_GstGL.toml
@@ -6,6 +6,11 @@ min_cfg_version = "1.14"
 target_path = "gstreamer-gl-sys"
 work_mode = "sys"
 
+ignore = [
+    "GstGL.GL_DISPLAY_EGL_NAME",
+    "GstGL.GL_COLOR_CONVERT_VIDEO_CAPS",
+]
+
 external_libraries = [
     "GLib",
     "GObject",
@@ -29,10 +34,14 @@ name = "GstGL.GLDisplayEGLClass"
 status = "generate"
 cfg_condition = "feature = \"egl\""
 
-[[object]]
-name = "GstGL.GL_DISPLAY_EGL_NAME"
-status = "generate"
-cfg_condition = "feature = \"egl\""
-    [[object.constant]]
-    pattern = ".*"
-    cfg_condition = "feature = \"egl\""
+#[[object]]
+#name = "GstGL.GL_DISPLAY_EGL_NAME"
+#status = "manual"
+#cfg_condition = "feature = \"egl\""
+#    [[object.constant]]
+#    pattern = ".*"
+#    cfg_condition = "feature = \"egl\""
+
+#[[object]]
+#name = "GstGL.GL_COLOR_CONVERT_VIDEO_CAPS"
+#status = "manual"
diff --git a/gir-files/Gst-1.0.gir b/gir-files/Gst-1.0.gir
index 0a19b4c0a..82b983de1 100644
--- a/gir-files/Gst-1.0.gir
+++ b/gir-files/Gst-1.0.gir
@@ -10582,7 +10582,7 @@ and GST_DEBUG_BIN_TO_DOT_FILE_WITH_TS().</doc>
         <doc xml:space="preserve">show all the typical details that one might want</doc>
       </member>
       <member name="verbose"
-              value="-1"
+              value="4294967295"
               c:identifier="GST_DEBUG_GRAPH_SHOW_VERBOSE"
               glib:nick="verbose">
         <doc xml:space="preserve">show all details regardless of how large or
diff --git a/gir-files/GstGL-1.0.gir b/gir-files/GstGL-1.0.gir
index ae1ebda32..a306bd44c 100644
--- a/gir-files/GstGL-1.0.gir
+++ b/gir-files/GstGL-1.0.gir
@@ -4268,7 +4268,7 @@ multiple times.  This must be called before any other GstGLRenderbuffer operatio
       <member name="compatibility" value="4" c:identifier="GST_GLSL_PROFILE_COMPATIBILITY">
         <doc xml:space="preserve">OpenGL compatibility profile</doc>
       </member>
-      <member name="any" value="-1" c:identifier="GST_GLSL_PROFILE_ANY">
+      <member name="any" value="4294967295" c:identifier="GST_GLSL_PROFILE_ANY">
         <doc xml:space="preserve">any OpenGL/OpenGL|ES profile</doc>
       </member>
     </bitfield>
diff --git a/gstreamer-app-sys/src/lib.rs b/gstreamer-app-sys/src/lib.rs
index 5d7f1ff77..7673200a4 100644
--- a/gstreamer-app-sys/src/lib.rs
+++ b/gstreamer-app-sys/src/lib.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
diff --git a/gstreamer-app-sys/tests/abi.rs b/gstreamer-app-sys/tests/abi.rs
index 52401ccd8..96542063d 100644
--- a/gstreamer-app-sys/tests/abi.rs
+++ b/gstreamer-app-sys/tests/abi.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
@@ -227,7 +227,14 @@ fn get_c_value(dir: &Path, cc: &Compiler, name: &str) -> Result<String, Box<Erro
                            &abi_cmd, &output).into());
     }
 
-    Ok(str::from_utf8(&output.stdout)?.trim().to_owned())
+    let output = str::from_utf8(&output.stdout)?.trim();
+    if !output.starts_with("###gir test###") ||
+       !output.ends_with("###gir test###") {
+        return Err(format!("command {:?} return invalid output, {:?}",
+                           &abi_cmd, &output).into());
+    }
+
+    Ok(String::from(&output[14..(output.len() - 14)]))
 }
 
 const RUST_LAYOUTS: &[(&str, Layout)] = &[
@@ -241,9 +248,9 @@ const RUST_LAYOUTS: &[(&str, Layout)] = &[
 ];
 
 const RUST_CONSTANTS: &[(&str, &str)] = &[
-    ("GST_APP_STREAM_TYPE_RANDOM_ACCESS", "2"),
-    ("GST_APP_STREAM_TYPE_SEEKABLE", "1"),
-    ("GST_APP_STREAM_TYPE_STREAM", "0"),
+    ("(gint) GST_APP_STREAM_TYPE_RANDOM_ACCESS", "2"),
+    ("(gint) GST_APP_STREAM_TYPE_SEEKABLE", "1"),
+    ("(gint) GST_APP_STREAM_TYPE_STREAM", "0"),
 ];
 
 
diff --git a/gstreamer-app-sys/tests/constant.c b/gstreamer-app-sys/tests/constant.c
index a167e0146..f54bce75c 100644
--- a/gstreamer-app-sys/tests/constant.c
+++ b/gstreamer-app-sys/tests/constant.c
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
@@ -7,21 +7,21 @@
 
 int main() {
     printf(_Generic((ABI_CONSTANT_NAME),
-                    char *: "%s",
-                    const char *: "%s",
-                    char: "%c",
-                    signed char: "%hhd",
-                    unsigned char: "%hhu",
-                    short int: "%hd",
-                    unsigned short int: "%hu",
-                    int: "%d",
-                    unsigned int: "%u",
-                    long: "%ld",
-                    unsigned long: "%lu",
-                    long long: "%lld",
-                    unsigned long long: "%llu",
-                    double: "%f",
-                    long double: "%ld"),
+                    char *: "###gir test###%s###gir test###\n",
+                    const char *: "###gir test###%s###gir test###\n",
+                    char: "###gir test###%c###gir test###\n",
+                    signed char: "###gir test###%hhd###gir test###\n",
+                    unsigned char: "###gir test###%hhu###gir test###\n",
+                    short int: "###gir test###%hd###gir test###\n",
+                    unsigned short int: "###gir test###%hu###gir test###\n",
+                    int: "###gir test###%d###gir test###\n",
+                    unsigned int: "###gir test###%u###gir test###\n",
+                    long: "###gir test###%ld###gir test###\n",
+                    unsigned long: "###gir test###%lu###gir test###\n",
+                    long long: "###gir test###%lld###gir test###\n",
+                    unsigned long long: "###gir test###%llu###gir test###\n",
+                    double: "###gir test###%f###gir test###\n",
+                    long double: "###gir test###%ld###gir test###\n"),
            ABI_CONSTANT_NAME);
     return 0;
 }
diff --git a/gstreamer-app-sys/tests/layout.c b/gstreamer-app-sys/tests/layout.c
index 829276260..aef10fc35 100644
--- a/gstreamer-app-sys/tests/layout.c
+++ b/gstreamer-app-sys/tests/layout.c
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
diff --git a/gstreamer-audio-sys/src/lib.rs b/gstreamer-audio-sys/src/lib.rs
index efef5396d..b1f6a9f6b 100644
--- a/gstreamer-audio-sys/src/lib.rs
+++ b/gstreamer-audio-sys/src/lib.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
diff --git a/gstreamer-audio-sys/tests/abi.rs b/gstreamer-audio-sys/tests/abi.rs
index ac20e0ea7..8c0a1acd1 100644
--- a/gstreamer-audio-sys/tests/abi.rs
+++ b/gstreamer-audio-sys/tests/abi.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
@@ -227,7 +227,14 @@ fn get_c_value(dir: &Path, cc: &Compiler, name: &str) -> Result<String, Box<Erro
                            &abi_cmd, &output).into());
     }
 
-    Ok(str::from_utf8(&output.stdout)?.trim().to_owned())
+    let output = str::from_utf8(&output.stdout)?.trim();
+    if !output.starts_with("###gir test###") ||
+       !output.ends_with("###gir test###") {
+        return Err(format!("command {:?} return invalid output, {:?}",
+                           &abi_cmd, &output).into());
+    }
+
+    Ok(String::from(&output[14..(output.len() - 14)]))
 }
 
 const RUST_LAYOUTS: &[(&str, Layout)] = &[
@@ -289,62 +296,62 @@ const RUST_LAYOUTS: &[(&str, Layout)] = &[
 ];
 
 const RUST_CONSTANTS: &[(&str, &str)] = &[
-    ("GST_AUDIO_BASE_SINK_DISCONT_REASON_ALIGNMENT", "4"),
-    ("GST_AUDIO_BASE_SINK_DISCONT_REASON_DEVICE_FAILURE", "5"),
-    ("GST_AUDIO_BASE_SINK_DISCONT_REASON_FLUSH", "2"),
-    ("GST_AUDIO_BASE_SINK_DISCONT_REASON_NEW_CAPS", "1"),
-    ("GST_AUDIO_BASE_SINK_DISCONT_REASON_NO_DISCONT", "0"),
-    ("GST_AUDIO_BASE_SINK_DISCONT_REASON_SYNC_LATENCY", "3"),
-    ("GST_AUDIO_BASE_SINK_SLAVE_CUSTOM", "3"),
-    ("GST_AUDIO_BASE_SINK_SLAVE_NONE", "2"),
-    ("GST_AUDIO_BASE_SINK_SLAVE_RESAMPLE", "0"),
-    ("GST_AUDIO_BASE_SINK_SLAVE_SKEW", "1"),
-    ("GST_AUDIO_BASE_SRC_SLAVE_NONE", "3"),
-    ("GST_AUDIO_BASE_SRC_SLAVE_RESAMPLE", "0"),
-    ("GST_AUDIO_BASE_SRC_SLAVE_RE_TIMESTAMP", "1"),
-    ("GST_AUDIO_BASE_SRC_SLAVE_SKEW", "2"),
-    ("GST_AUDIO_CD_SRC_MODE_CONTINUOUS", "1"),
-    ("GST_AUDIO_CD_SRC_MODE_NORMAL", "0"),
+    ("(gint) GST_AUDIO_BASE_SINK_DISCONT_REASON_ALIGNMENT", "4"),
+    ("(gint) GST_AUDIO_BASE_SINK_DISCONT_REASON_DEVICE_FAILURE", "5"),
+    ("(gint) GST_AUDIO_BASE_SINK_DISCONT_REASON_FLUSH", "2"),
+    ("(gint) GST_AUDIO_BASE_SINK_DISCONT_REASON_NEW_CAPS", "1"),
+    ("(gint) GST_AUDIO_BASE_SINK_DISCONT_REASON_NO_DISCONT", "0"),
+    ("(gint) GST_AUDIO_BASE_SINK_DISCONT_REASON_SYNC_LATENCY", "3"),
+    ("(gint) GST_AUDIO_BASE_SINK_SLAVE_CUSTOM", "3"),
+    ("(gint) GST_AUDIO_BASE_SINK_SLAVE_NONE", "2"),
+    ("(gint) GST_AUDIO_BASE_SINK_SLAVE_RESAMPLE", "0"),
+    ("(gint) GST_AUDIO_BASE_SINK_SLAVE_SKEW", "1"),
+    ("(gint) GST_AUDIO_BASE_SRC_SLAVE_NONE", "3"),
+    ("(gint) GST_AUDIO_BASE_SRC_SLAVE_RESAMPLE", "0"),
+    ("(gint) GST_AUDIO_BASE_SRC_SLAVE_RE_TIMESTAMP", "1"),
+    ("(gint) GST_AUDIO_BASE_SRC_SLAVE_SKEW", "2"),
+    ("(gint) GST_AUDIO_CD_SRC_MODE_CONTINUOUS", "1"),
+    ("(gint) GST_AUDIO_CD_SRC_MODE_NORMAL", "0"),
     ("GST_AUDIO_CHANNELS_RANGE", "(int) [ 1, max ]"),
-    ("GST_AUDIO_CHANNEL_MIXER_FLAGS_NONE", "0"),
-    ("GST_AUDIO_CHANNEL_MIXER_FLAGS_NON_INTERLEAVED_IN", "1"),
-    ("GST_AUDIO_CHANNEL_MIXER_FLAGS_NON_INTERLEAVED_OUT", "2"),
-    ("GST_AUDIO_CHANNEL_MIXER_FLAGS_UNPOSITIONED_IN", "4"),
-    ("GST_AUDIO_CHANNEL_MIXER_FLAGS_UNPOSITIONED_OUT", "8"),
-    ("GST_AUDIO_CHANNEL_POSITION_BOTTOM_FRONT_CENTER", "21"),
-    ("GST_AUDIO_CHANNEL_POSITION_BOTTOM_FRONT_LEFT", "22"),
-    ("GST_AUDIO_CHANNEL_POSITION_BOTTOM_FRONT_RIGHT", "23"),
-    ("GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER", "2"),
-    ("GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT", "0"),
-    ("GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER", "6"),
-    ("GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT", "1"),
-    ("GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER", "7"),
-    ("GST_AUDIO_CHANNEL_POSITION_INVALID", "-1"),
-    ("GST_AUDIO_CHANNEL_POSITION_LFE1", "3"),
-    ("GST_AUDIO_CHANNEL_POSITION_LFE2", "9"),
-    ("GST_AUDIO_CHANNEL_POSITION_MONO", "-2"),
-    ("GST_AUDIO_CHANNEL_POSITION_NONE", "-3"),
-    ("GST_AUDIO_CHANNEL_POSITION_REAR_CENTER", "8"),
-    ("GST_AUDIO_CHANNEL_POSITION_REAR_LEFT", "4"),
-    ("GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT", "5"),
-    ("GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT", "10"),
-    ("GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT", "11"),
-    ("GST_AUDIO_CHANNEL_POSITION_SURROUND_LEFT", "26"),
-    ("GST_AUDIO_CHANNEL_POSITION_SURROUND_RIGHT", "27"),
-    ("GST_AUDIO_CHANNEL_POSITION_TOP_CENTER", "15"),
-    ("GST_AUDIO_CHANNEL_POSITION_TOP_FRONT_CENTER", "14"),
-    ("GST_AUDIO_CHANNEL_POSITION_TOP_FRONT_LEFT", "12"),
-    ("GST_AUDIO_CHANNEL_POSITION_TOP_FRONT_RIGHT", "13"),
-    ("GST_AUDIO_CHANNEL_POSITION_TOP_REAR_CENTER", "20"),
-    ("GST_AUDIO_CHANNEL_POSITION_TOP_REAR_LEFT", "16"),
-    ("GST_AUDIO_CHANNEL_POSITION_TOP_REAR_RIGHT", "17"),
-    ("GST_AUDIO_CHANNEL_POSITION_TOP_SIDE_LEFT", "18"),
-    ("GST_AUDIO_CHANNEL_POSITION_TOP_SIDE_RIGHT", "19"),
-    ("GST_AUDIO_CHANNEL_POSITION_WIDE_LEFT", "24"),
-    ("GST_AUDIO_CHANNEL_POSITION_WIDE_RIGHT", "25"),
-    ("GST_AUDIO_CONVERTER_FLAG_IN_WRITABLE", "1"),
-    ("GST_AUDIO_CONVERTER_FLAG_NONE", "0"),
-    ("GST_AUDIO_CONVERTER_FLAG_VARIABLE_RATE", "2"),
+    ("(guint) GST_AUDIO_CHANNEL_MIXER_FLAGS_NONE", "0"),
+    ("(guint) GST_AUDIO_CHANNEL_MIXER_FLAGS_NON_INTERLEAVED_IN", "1"),
+    ("(guint) GST_AUDIO_CHANNEL_MIXER_FLAGS_NON_INTERLEAVED_OUT", "2"),
+    ("(guint) GST_AUDIO_CHANNEL_MIXER_FLAGS_UNPOSITIONED_IN", "4"),
+    ("(guint) GST_AUDIO_CHANNEL_MIXER_FLAGS_UNPOSITIONED_OUT", "8"),
+    ("(gint) GST_AUDIO_CHANNEL_POSITION_BOTTOM_FRONT_CENTER", "21"),
+    ("(gint) GST_AUDIO_CHANNEL_POSITION_BOTTOM_FRONT_LEFT", "22"),
+    ("(gint) GST_AUDIO_CHANNEL_POSITION_BOTTOM_FRONT_RIGHT", "23"),
+    ("(gint) GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER", "2"),
+    ("(gint) GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT", "0"),
+    ("(gint) GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER", "6"),
+    ("(gint) GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT", "1"),
+    ("(gint) GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER", "7"),
+    ("(gint) GST_AUDIO_CHANNEL_POSITION_INVALID", "-1"),
+    ("(gint) GST_AUDIO_CHANNEL_POSITION_LFE1", "3"),
+    ("(gint) GST_AUDIO_CHANNEL_POSITION_LFE2", "9"),
+    ("(gint) GST_AUDIO_CHANNEL_POSITION_MONO", "-2"),
+    ("(gint) GST_AUDIO_CHANNEL_POSITION_NONE", "-3"),
+    ("(gint) GST_AUDIO_CHANNEL_POSITION_REAR_CENTER", "8"),
+    ("(gint) GST_AUDIO_CHANNEL_POSITION_REAR_LEFT", "4"),
+    ("(gint) GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT", "5"),
+    ("(gint) GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT", "10"),
+    ("(gint) GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT", "11"),
+    ("(gint) GST_AUDIO_CHANNEL_POSITION_SURROUND_LEFT", "26"),
+    ("(gint) GST_AUDIO_CHANNEL_POSITION_SURROUND_RIGHT", "27"),
+    ("(gint) GST_AUDIO_CHANNEL_POSITION_TOP_CENTER", "15"),
+    ("(gint) GST_AUDIO_CHANNEL_POSITION_TOP_FRONT_CENTER", "14"),
+    ("(gint) GST_AUDIO_CHANNEL_POSITION_TOP_FRONT_LEFT", "12"),
+    ("(gint) GST_AUDIO_CHANNEL_POSITION_TOP_FRONT_RIGHT", "13"),
+    ("(gint) GST_AUDIO_CHANNEL_POSITION_TOP_REAR_CENTER", "20"),
+    ("(gint) GST_AUDIO_CHANNEL_POSITION_TOP_REAR_LEFT", "16"),
+    ("(gint) GST_AUDIO_CHANNEL_POSITION_TOP_REAR_RIGHT", "17"),
+    ("(gint) GST_AUDIO_CHANNEL_POSITION_TOP_SIDE_LEFT", "18"),
+    ("(gint) GST_AUDIO_CHANNEL_POSITION_TOP_SIDE_RIGHT", "19"),
+    ("(gint) GST_AUDIO_CHANNEL_POSITION_WIDE_LEFT", "24"),
+    ("(gint) GST_AUDIO_CHANNEL_POSITION_WIDE_RIGHT", "25"),
+    ("(guint) GST_AUDIO_CONVERTER_FLAG_IN_WRITABLE", "1"),
+    ("(guint) GST_AUDIO_CONVERTER_FLAG_NONE", "0"),
+    ("(guint) GST_AUDIO_CONVERTER_FLAG_VARIABLE_RATE", "2"),
     ("GST_AUDIO_CONVERTER_OPT_DITHER_METHOD", "GstAudioConverter.dither-method"),
     ("GST_AUDIO_CONVERTER_OPT_MIX_MATRIX", "GstAudioConverter.mix-matrix"),
     ("GST_AUDIO_CONVERTER_OPT_NOISE_SHAPING_METHOD", "GstAudioConverter.noise-shaping-method"),
@@ -356,93 +363,93 @@ const RUST_CONSTANTS: &[(&str, &str)] = &[
     ("GST_AUDIO_DEF_CHANNELS", "2"),
     ("GST_AUDIO_DEF_FORMAT", "S16LE"),
     ("GST_AUDIO_DEF_RATE", "44100"),
-    ("GST_AUDIO_DITHER_NONE", "0"),
-    ("GST_AUDIO_DITHER_RPDF", "1"),
-    ("GST_AUDIO_DITHER_TPDF", "2"),
-    ("GST_AUDIO_DITHER_TPDF_HF", "3"),
+    ("(gint) GST_AUDIO_DITHER_NONE", "0"),
+    ("(gint) GST_AUDIO_DITHER_RPDF", "1"),
+    ("(gint) GST_AUDIO_DITHER_TPDF", "2"),
+    ("(gint) GST_AUDIO_DITHER_TPDF_HF", "3"),
     ("GST_AUDIO_ENCODER_SINK_NAME", "sink"),
     ("GST_AUDIO_ENCODER_SRC_NAME", "src"),
-    ("GST_AUDIO_FLAG_NONE", "0"),
-    ("GST_AUDIO_FLAG_UNPOSITIONED", "1"),
+    ("(guint) GST_AUDIO_FLAG_NONE", "0"),
+    ("(guint) GST_AUDIO_FLAG_UNPOSITIONED", "1"),
     ("GST_AUDIO_FORMATS_ALL", " { S8, U8, S16LE, S16BE, U16LE, U16BE, S24_32LE, S24_32BE, U24_32LE, U24_32BE, S32LE, S32BE, U32LE, U32BE, S24LE, S24BE, U24LE, U24BE, S20LE, S20BE, U20LE, U20BE, S18LE, S18BE, U18LE, U18BE, F32LE, F32BE, F64LE, F64BE }"),
-    ("GST_AUDIO_FORMAT_ENCODED", "1"),
-    ("GST_AUDIO_FORMAT_F32", "28"),
-    ("GST_AUDIO_FORMAT_F32BE", "29"),
-    ("GST_AUDIO_FORMAT_F32LE", "28"),
-    ("GST_AUDIO_FORMAT_F64", "30"),
-    ("GST_AUDIO_FORMAT_F64BE", "31"),
-    ("GST_AUDIO_FORMAT_F64LE", "30"),
-    ("GST_AUDIO_FORMAT_FLAG_COMPLEX", "16"),
-    ("GST_AUDIO_FORMAT_FLAG_FLOAT", "2"),
-    ("GST_AUDIO_FORMAT_FLAG_INTEGER", "1"),
-    ("GST_AUDIO_FORMAT_FLAG_SIGNED", "4"),
-    ("GST_AUDIO_FORMAT_FLAG_UNPACK", "32"),
-    ("GST_AUDIO_FORMAT_S16", "4"),
-    ("GST_AUDIO_FORMAT_S16BE", "5"),
-    ("GST_AUDIO_FORMAT_S16LE", "4"),
-    ("GST_AUDIO_FORMAT_S18", "24"),
-    ("GST_AUDIO_FORMAT_S18BE", "25"),
-    ("GST_AUDIO_FORMAT_S18LE", "24"),
-    ("GST_AUDIO_FORMAT_S20", "20"),
-    ("GST_AUDIO_FORMAT_S20BE", "21"),
-    ("GST_AUDIO_FORMAT_S20LE", "20"),
-    ("GST_AUDIO_FORMAT_S24", "16"),
-    ("GST_AUDIO_FORMAT_S24BE", "17"),
-    ("GST_AUDIO_FORMAT_S24LE", "16"),
-    ("GST_AUDIO_FORMAT_S24_32", "8"),
-    ("GST_AUDIO_FORMAT_S24_32BE", "9"),
-    ("GST_AUDIO_FORMAT_S24_32LE", "8"),
-    ("GST_AUDIO_FORMAT_S32", "12"),
-    ("GST_AUDIO_FORMAT_S32BE", "13"),
-    ("GST_AUDIO_FORMAT_S32LE", "12"),
-    ("GST_AUDIO_FORMAT_S8", "2"),
-    ("GST_AUDIO_FORMAT_U16", "6"),
-    ("GST_AUDIO_FORMAT_U16BE", "7"),
-    ("GST_AUDIO_FORMAT_U16LE", "6"),
-    ("GST_AUDIO_FORMAT_U18", "26"),
-    ("GST_AUDIO_FORMAT_U18BE", "27"),
-    ("GST_AUDIO_FORMAT_U18LE", "26"),
-    ("GST_AUDIO_FORMAT_U20", "22"),
-    ("GST_AUDIO_FORMAT_U20BE", "23"),
-    ("GST_AUDIO_FORMAT_U20LE", "22"),
-    ("GST_AUDIO_FORMAT_U24", "18"),
-    ("GST_AUDIO_FORMAT_U24BE", "19"),
-    ("GST_AUDIO_FORMAT_U24LE", "18"),
-    ("GST_AUDIO_FORMAT_U24_32", "10"),
-    ("GST_AUDIO_FORMAT_U24_32BE", "11"),
-    ("GST_AUDIO_FORMAT_U24_32LE", "10"),
-    ("GST_AUDIO_FORMAT_U32", "14"),
-    ("GST_AUDIO_FORMAT_U32BE", "15"),
-    ("GST_AUDIO_FORMAT_U32LE", "14"),
-    ("GST_AUDIO_FORMAT_U8", "3"),
-    ("GST_AUDIO_FORMAT_UNKNOWN", "0"),
-    ("GST_AUDIO_LAYOUT_INTERLEAVED", "0"),
-    ("GST_AUDIO_LAYOUT_NON_INTERLEAVED", "1"),
-    ("GST_AUDIO_NOISE_SHAPING_ERROR_FEEDBACK", "1"),
-    ("GST_AUDIO_NOISE_SHAPING_HIGH", "4"),
-    ("GST_AUDIO_NOISE_SHAPING_MEDIUM", "3"),
-    ("GST_AUDIO_NOISE_SHAPING_NONE", "0"),
-    ("GST_AUDIO_NOISE_SHAPING_SIMPLE", "2"),
-    ("GST_AUDIO_PACK_FLAG_NONE", "0"),
-    ("GST_AUDIO_PACK_FLAG_TRUNCATE_RANGE", "1"),
-    ("GST_AUDIO_QUANTIZE_FLAG_NONE", "0"),
-    ("GST_AUDIO_QUANTIZE_FLAG_NON_INTERLEAVED", "1"),
+    ("(gint) GST_AUDIO_FORMAT_ENCODED", "1"),
+    ("(gint) GST_AUDIO_FORMAT_F32", "28"),
+    ("(gint) GST_AUDIO_FORMAT_F32BE", "29"),
+    ("(gint) GST_AUDIO_FORMAT_F32LE", "28"),
+    ("(gint) GST_AUDIO_FORMAT_F64", "30"),
+    ("(gint) GST_AUDIO_FORMAT_F64BE", "31"),
+    ("(gint) GST_AUDIO_FORMAT_F64LE", "30"),
+    ("(guint) GST_AUDIO_FORMAT_FLAG_COMPLEX", "16"),
+    ("(guint) GST_AUDIO_FORMAT_FLAG_FLOAT", "2"),
+    ("(guint) GST_AUDIO_FORMAT_FLAG_INTEGER", "1"),
+    ("(guint) GST_AUDIO_FORMAT_FLAG_SIGNED", "4"),
+    ("(guint) GST_AUDIO_FORMAT_FLAG_UNPACK", "32"),
+    ("(gint) GST_AUDIO_FORMAT_S16", "4"),
+    ("(gint) GST_AUDIO_FORMAT_S16BE", "5"),
+    ("(gint) GST_AUDIO_FORMAT_S16LE", "4"),
+    ("(gint) GST_AUDIO_FORMAT_S18", "24"),
+    ("(gint) GST_AUDIO_FORMAT_S18BE", "25"),
+    ("(gint) GST_AUDIO_FORMAT_S18LE", "24"),
+    ("(gint) GST_AUDIO_FORMAT_S20", "20"),
+    ("(gint) GST_AUDIO_FORMAT_S20BE", "21"),
+    ("(gint) GST_AUDIO_FORMAT_S20LE", "20"),
+    ("(gint) GST_AUDIO_FORMAT_S24", "16"),
+    ("(gint) GST_AUDIO_FORMAT_S24BE", "17"),
+    ("(gint) GST_AUDIO_FORMAT_S24LE", "16"),
+    ("(gint) GST_AUDIO_FORMAT_S24_32", "8"),
+    ("(gint) GST_AUDIO_FORMAT_S24_32BE", "9"),
+    ("(gint) GST_AUDIO_FORMAT_S24_32LE", "8"),
+    ("(gint) GST_AUDIO_FORMAT_S32", "12"),
+    ("(gint) GST_AUDIO_FORMAT_S32BE", "13"),
+    ("(gint) GST_AUDIO_FORMAT_S32LE", "12"),
+    ("(gint) GST_AUDIO_FORMAT_S8", "2"),
+    ("(gint) GST_AUDIO_FORMAT_U16", "6"),
+    ("(gint) GST_AUDIO_FORMAT_U16BE", "7"),
+    ("(gint) GST_AUDIO_FORMAT_U16LE", "6"),
+    ("(gint) GST_AUDIO_FORMAT_U18", "26"),
+    ("(gint) GST_AUDIO_FORMAT_U18BE", "27"),
+    ("(gint) GST_AUDIO_FORMAT_U18LE", "26"),
+    ("(gint) GST_AUDIO_FORMAT_U20", "22"),
+    ("(gint) GST_AUDIO_FORMAT_U20BE", "23"),
+    ("(gint) GST_AUDIO_FORMAT_U20LE", "22"),
+    ("(gint) GST_AUDIO_FORMAT_U24", "18"),
+    ("(gint) GST_AUDIO_FORMAT_U24BE", "19"),
+    ("(gint) GST_AUDIO_FORMAT_U24LE", "18"),
+    ("(gint) GST_AUDIO_FORMAT_U24_32", "10"),
+    ("(gint) GST_AUDIO_FORMAT_U24_32BE", "11"),
+    ("(gint) GST_AUDIO_FORMAT_U24_32LE", "10"),
+    ("(gint) GST_AUDIO_FORMAT_U32", "14"),
+    ("(gint) GST_AUDIO_FORMAT_U32BE", "15"),
+    ("(gint) GST_AUDIO_FORMAT_U32LE", "14"),
+    ("(gint) GST_AUDIO_FORMAT_U8", "3"),
+    ("(gint) GST_AUDIO_FORMAT_UNKNOWN", "0"),
+    ("(gint) GST_AUDIO_LAYOUT_INTERLEAVED", "0"),
+    ("(gint) GST_AUDIO_LAYOUT_NON_INTERLEAVED", "1"),
+    ("(gint) GST_AUDIO_NOISE_SHAPING_ERROR_FEEDBACK", "1"),
+    ("(gint) GST_AUDIO_NOISE_SHAPING_HIGH", "4"),
+    ("(gint) GST_AUDIO_NOISE_SHAPING_MEDIUM", "3"),
+    ("(gint) GST_AUDIO_NOISE_SHAPING_NONE", "0"),
+    ("(gint) GST_AUDIO_NOISE_SHAPING_SIMPLE", "2"),
+    ("(guint) GST_AUDIO_PACK_FLAG_NONE", "0"),
+    ("(guint) GST_AUDIO_PACK_FLAG_TRUNCATE_RANGE", "1"),
+    ("(guint) GST_AUDIO_QUANTIZE_FLAG_NONE", "0"),
+    ("(guint) GST_AUDIO_QUANTIZE_FLAG_NON_INTERLEAVED", "1"),
     ("GST_AUDIO_RATE_RANGE", "(int) [ 1, max ]"),
-    ("GST_AUDIO_RESAMPLER_FILTER_INTERPOLATION_CUBIC", "2"),
-    ("GST_AUDIO_RESAMPLER_FILTER_INTERPOLATION_LINEAR", "1"),
-    ("GST_AUDIO_RESAMPLER_FILTER_INTERPOLATION_NONE", "0"),
-    ("GST_AUDIO_RESAMPLER_FILTER_MODE_AUTO", "2"),
-    ("GST_AUDIO_RESAMPLER_FILTER_MODE_FULL", "1"),
-    ("GST_AUDIO_RESAMPLER_FILTER_MODE_INTERPOLATED", "0"),
-    ("GST_AUDIO_RESAMPLER_FLAG_NONE", "0"),
-    ("GST_AUDIO_RESAMPLER_FLAG_NON_INTERLEAVED_IN", "1"),
-    ("GST_AUDIO_RESAMPLER_FLAG_NON_INTERLEAVED_OUT", "2"),
-    ("GST_AUDIO_RESAMPLER_FLAG_VARIABLE_RATE", "4"),
-    ("GST_AUDIO_RESAMPLER_METHOD_BLACKMAN_NUTTALL", "3"),
-    ("GST_AUDIO_RESAMPLER_METHOD_CUBIC", "2"),
-    ("GST_AUDIO_RESAMPLER_METHOD_KAISER", "4"),
-    ("GST_AUDIO_RESAMPLER_METHOD_LINEAR", "1"),
-    ("GST_AUDIO_RESAMPLER_METHOD_NEAREST", "0"),
+    ("(gint) GST_AUDIO_RESAMPLER_FILTER_INTERPOLATION_CUBIC", "2"),
+    ("(gint) GST_AUDIO_RESAMPLER_FILTER_INTERPOLATION_LINEAR", "1"),
+    ("(gint) GST_AUDIO_RESAMPLER_FILTER_INTERPOLATION_NONE", "0"),
+    ("(gint) GST_AUDIO_RESAMPLER_FILTER_MODE_AUTO", "2"),
+    ("(gint) GST_AUDIO_RESAMPLER_FILTER_MODE_FULL", "1"),
+    ("(gint) GST_AUDIO_RESAMPLER_FILTER_MODE_INTERPOLATED", "0"),
+    ("(guint) GST_AUDIO_RESAMPLER_FLAG_NONE", "0"),
+    ("(guint) GST_AUDIO_RESAMPLER_FLAG_NON_INTERLEAVED_IN", "1"),
+    ("(guint) GST_AUDIO_RESAMPLER_FLAG_NON_INTERLEAVED_OUT", "2"),
+    ("(guint) GST_AUDIO_RESAMPLER_FLAG_VARIABLE_RATE", "4"),
+    ("(gint) GST_AUDIO_RESAMPLER_METHOD_BLACKMAN_NUTTALL", "3"),
+    ("(gint) GST_AUDIO_RESAMPLER_METHOD_CUBIC", "2"),
+    ("(gint) GST_AUDIO_RESAMPLER_METHOD_KAISER", "4"),
+    ("(gint) GST_AUDIO_RESAMPLER_METHOD_LINEAR", "1"),
+    ("(gint) GST_AUDIO_RESAMPLER_METHOD_NEAREST", "0"),
     ("GST_AUDIO_RESAMPLER_OPT_CUBIC_B", "GstAudioResampler.cubic-b"),
     ("GST_AUDIO_RESAMPLER_OPT_CUBIC_C", "GstAudioResampler.cubic-c"),
     ("GST_AUDIO_RESAMPLER_OPT_CUTOFF", "GstAudioResampler.cutoff"),
@@ -457,31 +464,31 @@ const RUST_CONSTANTS: &[(&str, &str)] = &[
     ("GST_AUDIO_RESAMPLER_QUALITY_DEFAULT", "4"),
     ("GST_AUDIO_RESAMPLER_QUALITY_MAX", "10"),
     ("GST_AUDIO_RESAMPLER_QUALITY_MIN", "0"),
-    ("GST_AUDIO_RING_BUFFER_FORMAT_TYPE_AC3", "7"),
-    ("GST_AUDIO_RING_BUFFER_FORMAT_TYPE_A_LAW", "2"),
-    ("GST_AUDIO_RING_BUFFER_FORMAT_TYPE_DTS", "9"),
-    ("GST_AUDIO_RING_BUFFER_FORMAT_TYPE_EAC3", "8"),
-    ("GST_AUDIO_RING_BUFFER_FORMAT_TYPE_FLAC", "14"),
-    ("GST_AUDIO_RING_BUFFER_FORMAT_TYPE_GSM", "5"),
-    ("GST_AUDIO_RING_BUFFER_FORMAT_TYPE_IEC958", "6"),
-    ("GST_AUDIO_RING_BUFFER_FORMAT_TYPE_IMA_ADPCM", "3"),
-    ("GST_AUDIO_RING_BUFFER_FORMAT_TYPE_MPEG", "4"),
-    ("GST_AUDIO_RING_BUFFER_FORMAT_TYPE_MPEG2_AAC", "10"),
-    ("GST_AUDIO_RING_BUFFER_FORMAT_TYPE_MPEG2_AAC_RAW", "12"),
-    ("GST_AUDIO_RING_BUFFER_FORMAT_TYPE_MPEG4_AAC", "11"),
-    ("GST_AUDIO_RING_BUFFER_FORMAT_TYPE_MPEG4_AAC_RAW", "13"),
-    ("GST_AUDIO_RING_BUFFER_FORMAT_TYPE_MU_LAW", "1"),
-    ("GST_AUDIO_RING_BUFFER_FORMAT_TYPE_RAW", "0"),
-    ("GST_AUDIO_RING_BUFFER_STATE_ERROR", "3"),
-    ("GST_AUDIO_RING_BUFFER_STATE_PAUSED", "1"),
-    ("GST_AUDIO_RING_BUFFER_STATE_STARTED", "2"),
-    ("GST_AUDIO_RING_BUFFER_STATE_STOPPED", "0"),
+    ("(gint) GST_AUDIO_RING_BUFFER_FORMAT_TYPE_AC3", "7"),
+    ("(gint) GST_AUDIO_RING_BUFFER_FORMAT_TYPE_A_LAW", "2"),
+    ("(gint) GST_AUDIO_RING_BUFFER_FORMAT_TYPE_DTS", "9"),
+    ("(gint) GST_AUDIO_RING_BUFFER_FORMAT_TYPE_EAC3", "8"),
+    ("(gint) GST_AUDIO_RING_BUFFER_FORMAT_TYPE_FLAC", "14"),
+    ("(gint) GST_AUDIO_RING_BUFFER_FORMAT_TYPE_GSM", "5"),
+    ("(gint) GST_AUDIO_RING_BUFFER_FORMAT_TYPE_IEC958", "6"),
+    ("(gint) GST_AUDIO_RING_BUFFER_FORMAT_TYPE_IMA_ADPCM", "3"),
+    ("(gint) GST_AUDIO_RING_BUFFER_FORMAT_TYPE_MPEG", "4"),
+    ("(gint) GST_AUDIO_RING_BUFFER_FORMAT_TYPE_MPEG2_AAC", "10"),
+    ("(gint) GST_AUDIO_RING_BUFFER_FORMAT_TYPE_MPEG2_AAC_RAW", "12"),
+    ("(gint) GST_AUDIO_RING_BUFFER_FORMAT_TYPE_MPEG4_AAC", "11"),
+    ("(gint) GST_AUDIO_RING_BUFFER_FORMAT_TYPE_MPEG4_AAC_RAW", "13"),
+    ("(gint) GST_AUDIO_RING_BUFFER_FORMAT_TYPE_MU_LAW", "1"),
+    ("(gint) GST_AUDIO_RING_BUFFER_FORMAT_TYPE_RAW", "0"),
+    ("(gint) GST_AUDIO_RING_BUFFER_STATE_ERROR", "3"),
+    ("(gint) GST_AUDIO_RING_BUFFER_STATE_PAUSED", "1"),
+    ("(gint) GST_AUDIO_RING_BUFFER_STATE_STARTED", "2"),
+    ("(gint) GST_AUDIO_RING_BUFFER_STATE_STOPPED", "0"),
     ("GST_META_TAG_AUDIO_CHANNELS_STR", "channels"),
     ("GST_META_TAG_AUDIO_RATE_STR", "rate"),
     ("GST_META_TAG_AUDIO_STR", "audio"),
-    ("GST_STREAM_VOLUME_FORMAT_CUBIC", "1"),
-    ("GST_STREAM_VOLUME_FORMAT_DB", "2"),
-    ("GST_STREAM_VOLUME_FORMAT_LINEAR", "0"),
+    ("(gint) GST_STREAM_VOLUME_FORMAT_CUBIC", "1"),
+    ("(gint) GST_STREAM_VOLUME_FORMAT_DB", "2"),
+    ("(gint) GST_STREAM_VOLUME_FORMAT_LINEAR", "0"),
 ];
 
 
diff --git a/gstreamer-audio-sys/tests/constant.c b/gstreamer-audio-sys/tests/constant.c
index a167e0146..f54bce75c 100644
--- a/gstreamer-audio-sys/tests/constant.c
+++ b/gstreamer-audio-sys/tests/constant.c
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
@@ -7,21 +7,21 @@
 
 int main() {
     printf(_Generic((ABI_CONSTANT_NAME),
-                    char *: "%s",
-                    const char *: "%s",
-                    char: "%c",
-                    signed char: "%hhd",
-                    unsigned char: "%hhu",
-                    short int: "%hd",
-                    unsigned short int: "%hu",
-                    int: "%d",
-                    unsigned int: "%u",
-                    long: "%ld",
-                    unsigned long: "%lu",
-                    long long: "%lld",
-                    unsigned long long: "%llu",
-                    double: "%f",
-                    long double: "%ld"),
+                    char *: "###gir test###%s###gir test###\n",
+                    const char *: "###gir test###%s###gir test###\n",
+                    char: "###gir test###%c###gir test###\n",
+                    signed char: "###gir test###%hhd###gir test###\n",
+                    unsigned char: "###gir test###%hhu###gir test###\n",
+                    short int: "###gir test###%hd###gir test###\n",
+                    unsigned short int: "###gir test###%hu###gir test###\n",
+                    int: "###gir test###%d###gir test###\n",
+                    unsigned int: "###gir test###%u###gir test###\n",
+                    long: "###gir test###%ld###gir test###\n",
+                    unsigned long: "###gir test###%lu###gir test###\n",
+                    long long: "###gir test###%lld###gir test###\n",
+                    unsigned long long: "###gir test###%llu###gir test###\n",
+                    double: "###gir test###%f###gir test###\n",
+                    long double: "###gir test###%ld###gir test###\n"),
            ABI_CONSTANT_NAME);
     return 0;
 }
diff --git a/gstreamer-audio-sys/tests/layout.c b/gstreamer-audio-sys/tests/layout.c
index 829276260..aef10fc35 100644
--- a/gstreamer-audio-sys/tests/layout.c
+++ b/gstreamer-audio-sys/tests/layout.c
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
diff --git a/gstreamer-base-sys/src/lib.rs b/gstreamer-base-sys/src/lib.rs
index 2bf22c510..77195e6fc 100644
--- a/gstreamer-base-sys/src/lib.rs
+++ b/gstreamer-base-sys/src/lib.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
diff --git a/gstreamer-base-sys/tests/abi.rs b/gstreamer-base-sys/tests/abi.rs
index 6f240048d..2a4ea0bdb 100644
--- a/gstreamer-base-sys/tests/abi.rs
+++ b/gstreamer-base-sys/tests/abi.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
@@ -227,7 +227,14 @@ fn get_c_value(dir: &Path, cc: &Compiler, name: &str) -> Result<String, Box<Erro
                            &abi_cmd, &output).into());
     }
 
-    Ok(str::from_utf8(&output.stdout)?.trim().to_owned())
+    let output = str::from_utf8(&output.stdout)?.trim();
+    if !output.starts_with("###gir test###") ||
+       !output.ends_with("###gir test###") {
+        return Err(format!("command {:?} return invalid output, {:?}",
+                           &abi_cmd, &output).into());
+    }
+
+    Ok(String::from(&output[14..(output.len() - 14)]))
 }
 
 const RUST_LAYOUTS: &[(&str, Layout)] = &[
@@ -264,22 +271,22 @@ const RUST_LAYOUTS: &[(&str, Layout)] = &[
 const RUST_CONSTANTS: &[(&str, &str)] = &[
     ("GST_BASE_PARSE_FLAG_DRAINING", "2"),
     ("GST_BASE_PARSE_FLAG_LOST_SYNC", "1"),
-    ("GST_BASE_PARSE_FRAME_FLAG_CLIP", "4"),
-    ("GST_BASE_PARSE_FRAME_FLAG_DROP", "8"),
-    ("GST_BASE_PARSE_FRAME_FLAG_NEW_FRAME", "1"),
-    ("GST_BASE_PARSE_FRAME_FLAG_NONE", "0"),
-    ("GST_BASE_PARSE_FRAME_FLAG_NO_FRAME", "2"),
-    ("GST_BASE_PARSE_FRAME_FLAG_QUEUE", "16"),
-    ("GST_BASE_SRC_FLAG_LAST", "1048576"),
-    ("GST_BASE_SRC_FLAG_STARTED", "32768"),
-    ("GST_BASE_SRC_FLAG_STARTING", "16384"),
+    ("(guint) GST_BASE_PARSE_FRAME_FLAG_CLIP", "4"),
+    ("(guint) GST_BASE_PARSE_FRAME_FLAG_DROP", "8"),
+    ("(guint) GST_BASE_PARSE_FRAME_FLAG_NEW_FRAME", "1"),
+    ("(guint) GST_BASE_PARSE_FRAME_FLAG_NONE", "0"),
+    ("(guint) GST_BASE_PARSE_FRAME_FLAG_NO_FRAME", "2"),
+    ("(guint) GST_BASE_PARSE_FRAME_FLAG_QUEUE", "16"),
+    ("(guint) GST_BASE_SRC_FLAG_LAST", "1048576"),
+    ("(guint) GST_BASE_SRC_FLAG_STARTED", "32768"),
+    ("(guint) GST_BASE_SRC_FLAG_STARTING", "16384"),
     ("GST_BASE_TRANSFORM_SINK_NAME", "sink"),
     ("GST_BASE_TRANSFORM_SRC_NAME", "src"),
-    ("GST_COLLECT_PADS_STATE_EOS", "1"),
-    ("GST_COLLECT_PADS_STATE_FLUSHING", "2"),
-    ("GST_COLLECT_PADS_STATE_LOCKED", "16"),
-    ("GST_COLLECT_PADS_STATE_NEW_SEGMENT", "4"),
-    ("GST_COLLECT_PADS_STATE_WAITING", "8"),
+    ("(guint) GST_COLLECT_PADS_STATE_EOS", "1"),
+    ("(guint) GST_COLLECT_PADS_STATE_FLUSHING", "2"),
+    ("(guint) GST_COLLECT_PADS_STATE_LOCKED", "16"),
+    ("(guint) GST_COLLECT_PADS_STATE_NEW_SEGMENT", "4"),
+    ("(guint) GST_COLLECT_PADS_STATE_WAITING", "8"),
 ];
 
 
diff --git a/gstreamer-base-sys/tests/constant.c b/gstreamer-base-sys/tests/constant.c
index a167e0146..f54bce75c 100644
--- a/gstreamer-base-sys/tests/constant.c
+++ b/gstreamer-base-sys/tests/constant.c
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
@@ -7,21 +7,21 @@
 
 int main() {
     printf(_Generic((ABI_CONSTANT_NAME),
-                    char *: "%s",
-                    const char *: "%s",
-                    char: "%c",
-                    signed char: "%hhd",
-                    unsigned char: "%hhu",
-                    short int: "%hd",
-                    unsigned short int: "%hu",
-                    int: "%d",
-                    unsigned int: "%u",
-                    long: "%ld",
-                    unsigned long: "%lu",
-                    long long: "%lld",
-                    unsigned long long: "%llu",
-                    double: "%f",
-                    long double: "%ld"),
+                    char *: "###gir test###%s###gir test###\n",
+                    const char *: "###gir test###%s###gir test###\n",
+                    char: "###gir test###%c###gir test###\n",
+                    signed char: "###gir test###%hhd###gir test###\n",
+                    unsigned char: "###gir test###%hhu###gir test###\n",
+                    short int: "###gir test###%hd###gir test###\n",
+                    unsigned short int: "###gir test###%hu###gir test###\n",
+                    int: "###gir test###%d###gir test###\n",
+                    unsigned int: "###gir test###%u###gir test###\n",
+                    long: "###gir test###%ld###gir test###\n",
+                    unsigned long: "###gir test###%lu###gir test###\n",
+                    long long: "###gir test###%lld###gir test###\n",
+                    unsigned long long: "###gir test###%llu###gir test###\n",
+                    double: "###gir test###%f###gir test###\n",
+                    long double: "###gir test###%ld###gir test###\n"),
            ABI_CONSTANT_NAME);
     return 0;
 }
diff --git a/gstreamer-base-sys/tests/layout.c b/gstreamer-base-sys/tests/layout.c
index 829276260..aef10fc35 100644
--- a/gstreamer-base-sys/tests/layout.c
+++ b/gstreamer-base-sys/tests/layout.c
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
diff --git a/gstreamer-check-sys/src/lib.rs b/gstreamer-check-sys/src/lib.rs
index 97f7f0515..380eb3431 100644
--- a/gstreamer-check-sys/src/lib.rs
+++ b/gstreamer-check-sys/src/lib.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
diff --git a/gstreamer-check-sys/tests/abi.rs b/gstreamer-check-sys/tests/abi.rs
index 0217f46d2..0124c6331 100644
--- a/gstreamer-check-sys/tests/abi.rs
+++ b/gstreamer-check-sys/tests/abi.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
@@ -227,7 +227,14 @@ fn get_c_value(dir: &Path, cc: &Compiler, name: &str) -> Result<String, Box<Erro
                            &abi_cmd, &output).into());
     }
 
-    Ok(str::from_utf8(&output.stdout)?.trim().to_owned())
+    let output = str::from_utf8(&output.stdout)?.trim();
+    if !output.starts_with("###gir test###") ||
+       !output.ends_with("###gir test###") {
+        return Err(format!("command {:?} return invalid output, {:?}",
+                           &abi_cmd, &output).into());
+    }
+
+    Ok(String::from(&output[14..(output.len() - 14)]))
 }
 
 const RUST_LAYOUTS: &[(&str, Layout)] = &[
diff --git a/gstreamer-check-sys/tests/constant.c b/gstreamer-check-sys/tests/constant.c
index a167e0146..f54bce75c 100644
--- a/gstreamer-check-sys/tests/constant.c
+++ b/gstreamer-check-sys/tests/constant.c
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
@@ -7,21 +7,21 @@
 
 int main() {
     printf(_Generic((ABI_CONSTANT_NAME),
-                    char *: "%s",
-                    const char *: "%s",
-                    char: "%c",
-                    signed char: "%hhd",
-                    unsigned char: "%hhu",
-                    short int: "%hd",
-                    unsigned short int: "%hu",
-                    int: "%d",
-                    unsigned int: "%u",
-                    long: "%ld",
-                    unsigned long: "%lu",
-                    long long: "%lld",
-                    unsigned long long: "%llu",
-                    double: "%f",
-                    long double: "%ld"),
+                    char *: "###gir test###%s###gir test###\n",
+                    const char *: "###gir test###%s###gir test###\n",
+                    char: "###gir test###%c###gir test###\n",
+                    signed char: "###gir test###%hhd###gir test###\n",
+                    unsigned char: "###gir test###%hhu###gir test###\n",
+                    short int: "###gir test###%hd###gir test###\n",
+                    unsigned short int: "###gir test###%hu###gir test###\n",
+                    int: "###gir test###%d###gir test###\n",
+                    unsigned int: "###gir test###%u###gir test###\n",
+                    long: "###gir test###%ld###gir test###\n",
+                    unsigned long: "###gir test###%lu###gir test###\n",
+                    long long: "###gir test###%lld###gir test###\n",
+                    unsigned long long: "###gir test###%llu###gir test###\n",
+                    double: "###gir test###%f###gir test###\n",
+                    long double: "###gir test###%ld###gir test###\n"),
            ABI_CONSTANT_NAME);
     return 0;
 }
diff --git a/gstreamer-check-sys/tests/layout.c b/gstreamer-check-sys/tests/layout.c
index 829276260..aef10fc35 100644
--- a/gstreamer-check-sys/tests/layout.c
+++ b/gstreamer-check-sys/tests/layout.c
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
diff --git a/gstreamer-editing-services-sys/src/lib.rs b/gstreamer-editing-services-sys/src/lib.rs
index 4c0caf7fa..4f8d77afc 100644
--- a/gstreamer-editing-services-sys/src/lib.rs
+++ b/gstreamer-editing-services-sys/src/lib.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
diff --git a/gstreamer-editing-services-sys/tests/abi.rs b/gstreamer-editing-services-sys/tests/abi.rs
index 382eb0f51..0f69c81b9 100644
--- a/gstreamer-editing-services-sys/tests/abi.rs
+++ b/gstreamer-editing-services-sys/tests/abi.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
@@ -227,7 +227,14 @@ fn get_c_value(dir: &Path, cc: &Compiler, name: &str) -> Result<String, Box<Erro
                            &abi_cmd, &output).into());
     }
 
-    Ok(str::from_utf8(&output.stdout)?.trim().to_owned())
+    let output = str::from_utf8(&output.stdout)?.trim();
+    if !output.starts_with("###gir test###") ||
+       !output.ends_with("###gir test###") {
+        return Err(format!("command {:?} return invalid output, {:?}",
+                           &abi_cmd, &output).into());
+    }
+
+    Ok(String::from(&output[14..(output.len() - 14)]))
 }
 
 const RUST_LAYOUTS: &[(&str, Layout)] = &[
@@ -350,25 +357,25 @@ const RUST_LAYOUTS: &[(&str, Layout)] = &[
 ];
 
 const RUST_CONSTANTS: &[(&str, &str)] = &[
-    ("GES_ASSET_LOADING_ASYNC", "1"),
-    ("GES_ASSET_LOADING_ERROR", "0"),
-    ("GES_ASSET_LOADING_OK", "2"),
-    ("GES_CHILDREN_IGNORE_NOTIFIES", "1"),
-    ("GES_CHILDREN_LAST", "4"),
-    ("GES_CHILDREN_UPDATE", "0"),
-    ("GES_CHILDREN_UPDATE_ALL_VALUES", "3"),
-    ("GES_CHILDREN_UPDATE_OFFSETS", "2"),
-    ("GES_EDGE_END", "1"),
-    ("GES_EDGE_NONE", "2"),
-    ("GES_EDGE_START", "0"),
-    ("GES_EDIT_MODE_NORMAL", "0"),
-    ("GES_EDIT_MODE_RIPPLE", "1"),
-    ("GES_EDIT_MODE_ROLL", "2"),
-    ("GES_EDIT_MODE_SLIDE", "4"),
-    ("GES_EDIT_MODE_TRIM", "3"),
-    ("GES_ERROR_ASSET_LOADING", "1"),
-    ("GES_ERROR_ASSET_WRONG_ID", "0"),
-    ("GES_ERROR_FORMATTER_MALFORMED_INPUT_FILE", "2"),
+    ("(gint) GES_ASSET_LOADING_ASYNC", "1"),
+    ("(gint) GES_ASSET_LOADING_ERROR", "0"),
+    ("(gint) GES_ASSET_LOADING_OK", "2"),
+    ("(gint) GES_CHILDREN_IGNORE_NOTIFIES", "1"),
+    ("(gint) GES_CHILDREN_LAST", "4"),
+    ("(gint) GES_CHILDREN_UPDATE", "0"),
+    ("(gint) GES_CHILDREN_UPDATE_ALL_VALUES", "3"),
+    ("(gint) GES_CHILDREN_UPDATE_OFFSETS", "2"),
+    ("(gint) GES_EDGE_END", "1"),
+    ("(gint) GES_EDGE_NONE", "2"),
+    ("(gint) GES_EDGE_START", "0"),
+    ("(gint) GES_EDIT_MODE_NORMAL", "0"),
+    ("(gint) GES_EDIT_MODE_RIPPLE", "1"),
+    ("(gint) GES_EDIT_MODE_ROLL", "2"),
+    ("(gint) GES_EDIT_MODE_SLIDE", "4"),
+    ("(gint) GES_EDIT_MODE_TRIM", "3"),
+    ("(gint) GES_ERROR_ASSET_LOADING", "1"),
+    ("(gint) GES_ERROR_ASSET_WRONG_ID", "0"),
+    ("(gint) GES_ERROR_FORMATTER_MALFORMED_INPUT_FILE", "2"),
     ("GES_META_DESCRIPTION", "description"),
     ("GES_META_FORMATTER_EXTENSION", "extension"),
     ("GES_META_FORMATTER_MIMETYPE", "mimetype"),
@@ -376,125 +383,125 @@ const RUST_CONSTANTS: &[(&str, &str)] = &[
     ("GES_META_FORMATTER_RANK", "rank"),
     ("GES_META_FORMATTER_VERSION", "version"),
     ("GES_META_FORMAT_VERSION", "format-version"),
-    ("GES_META_READABLE", "1"),
-    ("GES_META_READ_WRITE", "3"),
+    ("(guint) GES_META_READABLE", "1"),
+    ("(guint) GES_META_READ_WRITE", "3"),
     ("GES_META_VOLUME", "volume"),
     ("GES_META_VOLUME_DEFAULT", "1.000000"),
-    ("GES_META_WRITABLE", "2"),
+    ("(guint) GES_META_WRITABLE", "2"),
     ("GES_MULTI_FILE_URI_PREFIX", "multifile://"),
     ("GES_PADDING", "4"),
     ("GES_PADDING_LARGE", "20"),
-    ("GES_PIPELINE_MODE_PREVIEW", "3"),
-    ("GES_PIPELINE_MODE_PREVIEW_AUDIO", "1"),
-    ("GES_PIPELINE_MODE_PREVIEW_VIDEO", "2"),
-    ("GES_PIPELINE_MODE_RENDER", "4"),
-    ("GES_PIPELINE_MODE_SMART_RENDER", "8"),
-    ("GES_TEXT_HALIGN_ABSOLUTE", "5"),
-    ("GES_TEXT_HALIGN_CENTER", "1"),
-    ("GES_TEXT_HALIGN_LEFT", "0"),
-    ("GES_TEXT_HALIGN_POSITION", "4"),
-    ("GES_TEXT_HALIGN_RIGHT", "2"),
-    ("GES_TEXT_VALIGN_ABSOLUTE", "5"),
-    ("GES_TEXT_VALIGN_BASELINE", "0"),
-    ("GES_TEXT_VALIGN_BOTTOM", "1"),
-    ("GES_TEXT_VALIGN_CENTER", "4"),
-    ("GES_TEXT_VALIGN_POSITION", "3"),
-    ("GES_TEXT_VALIGN_TOP", "2"),
-    ("GES_TRACK_TYPE_AUDIO", "2"),
-    ("GES_TRACK_TYPE_CUSTOM", "16"),
-    ("GES_TRACK_TYPE_TEXT", "8"),
-    ("GES_TRACK_TYPE_UNKNOWN", "1"),
-    ("GES_TRACK_TYPE_VIDEO", "4"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_BARNDOOR_DBL", "45"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_BARNDOOR_DTL", "46"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_BARNDOOR_H", "22"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_BARNDOOR_V", "21"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_BARNVEE_D", "65"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_BARNVEE_L", "66"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_BARNVEE_R", "68"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_BARNVEE_U", "67"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_BAR_WIPE_LR", "1"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_BAR_WIPE_TB", "2"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_BOWTIE_H", "44"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_BOWTIE_V", "43"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_BOX_WIPE_BC", "25"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_BOX_WIPE_BL", "6"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_BOX_WIPE_BR", "5"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_BOX_WIPE_LC", "26"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_BOX_WIPE_RC", "24"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_BOX_WIPE_TC", "23"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_BOX_WIPE_TL", "3"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_BOX_WIPE_TR", "4"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_CLOCK_CW12", "201"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_CLOCK_CW3", "202"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_CLOCK_CW6", "203"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_CLOCK_CW9", "204"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_CROSSFADE", "512"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_DIAGONAL_TL", "41"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_DIAGONAL_TR", "42"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_DOUBLEFAN_FIH", "236"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_DOUBLEFAN_FIV", "235"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_DOUBLEFAN_FOH", "214"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_DOUBLEFAN_FOV", "213"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_DOUBLESWEEP_OH", "228"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_DOUBLESWEEP_OV", "227"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_DOUBLESWEEP_PD", "226"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_DOUBLESWEEP_PDBL", "246"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_DOUBLESWEEP_PDTL", "245"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_DOUBLESWEEP_PV", "225"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_FAN_B", "233"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_FAN_CR", "212"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_FAN_CT", "211"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_FAN_L", "234"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_FAN_R", "232"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_FAN_T", "231"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_FOUR_BOX_WIPE_CI", "7"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_FOUR_BOX_WIPE_CO", "8"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_IRIS_RECT", "101"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_MISC_DIAGONAL_DBD", "47"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_MISC_DIAGONAL_DD", "48"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_NONE", "0"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_PINWHEEL_FB", "207"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_PINWHEEL_TBH", "206"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_PINWHEEL_TBV", "205"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_SALOONDOOR_B", "253"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_SALOONDOOR_L", "252"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_SALOONDOOR_R", "254"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_SALOONDOOR_T", "251"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_SINGLESWEEP_CWB", "223"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_SINGLESWEEP_CWBL", "242"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_SINGLESWEEP_CWBR", "243"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_SINGLESWEEP_CWL", "224"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_SINGLESWEEP_CWR", "222"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_SINGLESWEEP_CWT", "221"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_SINGLESWEEP_CWTL", "241"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_SINGLESWEEP_CWTR", "244"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_VEE_D", "61"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_VEE_L", "62"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_VEE_R", "64"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_VEE_U", "63"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_WINDSHIELD_H", "264"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_WINDSHIELD_R", "261"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_WINDSHIELD_U", "262"),
-    ("GES_VIDEO_STANDARD_TRANSITION_TYPE_WINDSHIELD_V", "263"),
-    ("GES_VIDEO_TEST_CHROMA_ZONE_PLATE", "16"),
-    ("GES_VIDEO_TEST_GAMUT", "15"),
-    ("GES_VIDEO_TEST_PATTERN_BLACK", "2"),
-    ("GES_VIDEO_TEST_PATTERN_BLINK", "12"),
-    ("GES_VIDEO_TEST_PATTERN_BLUE", "6"),
-    ("GES_VIDEO_TEST_PATTERN_CHECKERS1", "7"),
-    ("GES_VIDEO_TEST_PATTERN_CHECKERS2", "8"),
-    ("GES_VIDEO_TEST_PATTERN_CHECKERS4", "9"),
-    ("GES_VIDEO_TEST_PATTERN_CHECKERS8", "10"),
-    ("GES_VIDEO_TEST_PATTERN_CIRCULAR", "11"),
-    ("GES_VIDEO_TEST_PATTERN_GREEN", "5"),
-    ("GES_VIDEO_TEST_PATTERN_RED", "4"),
-    ("GES_VIDEO_TEST_PATTERN_SMPTE", "0"),
-    ("GES_VIDEO_TEST_PATTERN_SMPTE75", "13"),
-    ("GES_VIDEO_TEST_PATTERN_SNOW", "1"),
-    ("GES_VIDEO_TEST_PATTERN_SOLID", "17"),
-    ("GES_VIDEO_TEST_PATTERN_WHITE", "3"),
-    ("GES_VIDEO_TEST_ZONE_PLATE", "14"),
+    ("(guint) GES_PIPELINE_MODE_PREVIEW", "3"),
+    ("(guint) GES_PIPELINE_MODE_PREVIEW_AUDIO", "1"),
+    ("(guint) GES_PIPELINE_MODE_PREVIEW_VIDEO", "2"),
+    ("(guint) GES_PIPELINE_MODE_RENDER", "4"),
+    ("(guint) GES_PIPELINE_MODE_SMART_RENDER", "8"),
+    ("(gint) GES_TEXT_HALIGN_ABSOLUTE", "5"),
+    ("(gint) GES_TEXT_HALIGN_CENTER", "1"),
+    ("(gint) GES_TEXT_HALIGN_LEFT", "0"),
+    ("(gint) GES_TEXT_HALIGN_POSITION", "4"),
+    ("(gint) GES_TEXT_HALIGN_RIGHT", "2"),
+    ("(gint) GES_TEXT_VALIGN_ABSOLUTE", "5"),
+    ("(gint) GES_TEXT_VALIGN_BASELINE", "0"),
+    ("(gint) GES_TEXT_VALIGN_BOTTOM", "1"),
+    ("(gint) GES_TEXT_VALIGN_CENTER", "4"),
+    ("(gint) GES_TEXT_VALIGN_POSITION", "3"),
+    ("(gint) GES_TEXT_VALIGN_TOP", "2"),
+    ("(guint) GES_TRACK_TYPE_AUDIO", "2"),
+    ("(guint) GES_TRACK_TYPE_CUSTOM", "16"),
+    ("(guint) GES_TRACK_TYPE_TEXT", "8"),
+    ("(guint) GES_TRACK_TYPE_UNKNOWN", "1"),
+    ("(guint) GES_TRACK_TYPE_VIDEO", "4"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_BARNDOOR_DBL", "45"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_BARNDOOR_DTL", "46"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_BARNDOOR_H", "22"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_BARNDOOR_V", "21"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_BARNVEE_D", "65"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_BARNVEE_L", "66"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_BARNVEE_R", "68"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_BARNVEE_U", "67"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_BAR_WIPE_LR", "1"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_BAR_WIPE_TB", "2"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_BOWTIE_H", "44"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_BOWTIE_V", "43"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_BOX_WIPE_BC", "25"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_BOX_WIPE_BL", "6"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_BOX_WIPE_BR", "5"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_BOX_WIPE_LC", "26"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_BOX_WIPE_RC", "24"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_BOX_WIPE_TC", "23"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_BOX_WIPE_TL", "3"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_BOX_WIPE_TR", "4"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_CLOCK_CW12", "201"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_CLOCK_CW3", "202"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_CLOCK_CW6", "203"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_CLOCK_CW9", "204"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_CROSSFADE", "512"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_DIAGONAL_TL", "41"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_DIAGONAL_TR", "42"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_DOUBLEFAN_FIH", "236"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_DOUBLEFAN_FIV", "235"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_DOUBLEFAN_FOH", "214"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_DOUBLEFAN_FOV", "213"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_DOUBLESWEEP_OH", "228"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_DOUBLESWEEP_OV", "227"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_DOUBLESWEEP_PD", "226"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_DOUBLESWEEP_PDBL", "246"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_DOUBLESWEEP_PDTL", "245"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_DOUBLESWEEP_PV", "225"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_FAN_B", "233"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_FAN_CR", "212"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_FAN_CT", "211"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_FAN_L", "234"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_FAN_R", "232"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_FAN_T", "231"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_FOUR_BOX_WIPE_CI", "7"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_FOUR_BOX_WIPE_CO", "8"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_IRIS_RECT", "101"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_MISC_DIAGONAL_DBD", "47"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_MISC_DIAGONAL_DD", "48"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_NONE", "0"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_PINWHEEL_FB", "207"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_PINWHEEL_TBH", "206"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_PINWHEEL_TBV", "205"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_SALOONDOOR_B", "253"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_SALOONDOOR_L", "252"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_SALOONDOOR_R", "254"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_SALOONDOOR_T", "251"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_SINGLESWEEP_CWB", "223"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_SINGLESWEEP_CWBL", "242"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_SINGLESWEEP_CWBR", "243"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_SINGLESWEEP_CWL", "224"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_SINGLESWEEP_CWR", "222"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_SINGLESWEEP_CWT", "221"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_SINGLESWEEP_CWTL", "241"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_SINGLESWEEP_CWTR", "244"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_VEE_D", "61"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_VEE_L", "62"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_VEE_R", "64"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_VEE_U", "63"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_WINDSHIELD_H", "264"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_WINDSHIELD_R", "261"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_WINDSHIELD_U", "262"),
+    ("(gint) GES_VIDEO_STANDARD_TRANSITION_TYPE_WINDSHIELD_V", "263"),
+    ("(gint) GES_VIDEO_TEST_CHROMA_ZONE_PLATE", "16"),
+    ("(gint) GES_VIDEO_TEST_GAMUT", "15"),
+    ("(gint) GES_VIDEO_TEST_PATTERN_BLACK", "2"),
+    ("(gint) GES_VIDEO_TEST_PATTERN_BLINK", "12"),
+    ("(gint) GES_VIDEO_TEST_PATTERN_BLUE", "6"),
+    ("(gint) GES_VIDEO_TEST_PATTERN_CHECKERS1", "7"),
+    ("(gint) GES_VIDEO_TEST_PATTERN_CHECKERS2", "8"),
+    ("(gint) GES_VIDEO_TEST_PATTERN_CHECKERS4", "9"),
+    ("(gint) GES_VIDEO_TEST_PATTERN_CHECKERS8", "10"),
+    ("(gint) GES_VIDEO_TEST_PATTERN_CIRCULAR", "11"),
+    ("(gint) GES_VIDEO_TEST_PATTERN_GREEN", "5"),
+    ("(gint) GES_VIDEO_TEST_PATTERN_RED", "4"),
+    ("(gint) GES_VIDEO_TEST_PATTERN_SMPTE", "0"),
+    ("(gint) GES_VIDEO_TEST_PATTERN_SMPTE75", "13"),
+    ("(gint) GES_VIDEO_TEST_PATTERN_SNOW", "1"),
+    ("(gint) GES_VIDEO_TEST_PATTERN_SOLID", "17"),
+    ("(gint) GES_VIDEO_TEST_PATTERN_WHITE", "3"),
+    ("(gint) GES_VIDEO_TEST_ZONE_PLATE", "14"),
 ];
 
 
diff --git a/gstreamer-editing-services-sys/tests/constant.c b/gstreamer-editing-services-sys/tests/constant.c
index a167e0146..f54bce75c 100644
--- a/gstreamer-editing-services-sys/tests/constant.c
+++ b/gstreamer-editing-services-sys/tests/constant.c
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
@@ -7,21 +7,21 @@
 
 int main() {
     printf(_Generic((ABI_CONSTANT_NAME),
-                    char *: "%s",
-                    const char *: "%s",
-                    char: "%c",
-                    signed char: "%hhd",
-                    unsigned char: "%hhu",
-                    short int: "%hd",
-                    unsigned short int: "%hu",
-                    int: "%d",
-                    unsigned int: "%u",
-                    long: "%ld",
-                    unsigned long: "%lu",
-                    long long: "%lld",
-                    unsigned long long: "%llu",
-                    double: "%f",
-                    long double: "%ld"),
+                    char *: "###gir test###%s###gir test###\n",
+                    const char *: "###gir test###%s###gir test###\n",
+                    char: "###gir test###%c###gir test###\n",
+                    signed char: "###gir test###%hhd###gir test###\n",
+                    unsigned char: "###gir test###%hhu###gir test###\n",
+                    short int: "###gir test###%hd###gir test###\n",
+                    unsigned short int: "###gir test###%hu###gir test###\n",
+                    int: "###gir test###%d###gir test###\n",
+                    unsigned int: "###gir test###%u###gir test###\n",
+                    long: "###gir test###%ld###gir test###\n",
+                    unsigned long: "###gir test###%lu###gir test###\n",
+                    long long: "###gir test###%lld###gir test###\n",
+                    unsigned long long: "###gir test###%llu###gir test###\n",
+                    double: "###gir test###%f###gir test###\n",
+                    long double: "###gir test###%ld###gir test###\n"),
            ABI_CONSTANT_NAME);
     return 0;
 }
diff --git a/gstreamer-editing-services-sys/tests/layout.c b/gstreamer-editing-services-sys/tests/layout.c
index 829276260..aef10fc35 100644
--- a/gstreamer-editing-services-sys/tests/layout.c
+++ b/gstreamer-editing-services-sys/tests/layout.c
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
diff --git a/gstreamer-gl-sys/src/lib.rs b/gstreamer-gl-sys/src/lib.rs
index 35e1ac031..8bb110764 100644
--- a/gstreamer-gl-sys/src/lib.rs
+++ b/gstreamer-gl-sys/src/lib.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
@@ -12,6 +12,10 @@ extern crate gstreamer_sys as gst;
 extern crate gstreamer_base_sys as gst_base;
 extern crate gstreamer_video_sys as gst_video;
 
+mod manual;
+
+pub use manual::*;
+
 #[allow(unused_imports)]
 use libc::{c_int, c_char, c_uchar, c_float, c_uint, c_double,
     c_short, c_ushort, c_long, c_ulong,
@@ -121,15 +125,12 @@ pub const GST_GL_API_OPENGL_NAME: *const c_char = b"opengl\0" as *const u8 as *c
 pub const GST_GL_BASE_MEMORY_ALLOCATOR_NAME: *const c_char = b"GLBaseMemory\0" as *const u8 as *const c_char;
 pub const GST_GL_BUFFER_ALLOCATOR_NAME: *const c_char = b"GLBuffer\0" as *const u8 as *const c_char;
 pub const GST_GL_COLOR_CONVERT_FORMATS: *const c_char = b"{ RGBA, RGB, RGBx, BGR, BGRx, BGRA, xRGB, xBGR, ARGB, ABGR, Y444, I420, YV12, Y42B, Y41B, NV12, NV21, YUY2, UYVY, AYUV, GRAY8, GRAY16_LE, GRAY16_BE, RGB16, BGR16 }\0" as *const u8 as *const c_char;
-pub const GST_GL_COLOR_CONVERT_VIDEO_CAPS: *const c_char = b"video/x-raw(\0" as *const u8 as *const c_char;
 pub const GST_GL_CONTEXT_TYPE_CGL: *const c_char = b"gst.gl.context.CGL\0" as *const u8 as *const c_char;
 pub const GST_GL_CONTEXT_TYPE_EAGL: *const c_char = b"gst.gl.context.EAGL\0" as *const u8 as *const c_char;
 pub const GST_GL_CONTEXT_TYPE_EGL: *const c_char = b"gst.gl.context.EGL\0" as *const u8 as *const c_char;
 pub const GST_GL_CONTEXT_TYPE_GLX: *const c_char = b"gst.gl.context.GLX\0" as *const u8 as *const c_char;
 pub const GST_GL_CONTEXT_TYPE_WGL: *const c_char = b"gst.gl.context.WGL\0" as *const u8 as *const c_char;
 pub const GST_GL_DISPLAY_CONTEXT_TYPE: *const c_char = b"gst.gl.GLDisplay\0" as *const u8 as *const c_char;
-    #[cfg(any(feature = "egl", feature = "dox"))]
-pub const GST_GL_DISPLAY_EGL_NAME: *const c_char = b"gst.gl.display.egl\0" as *const u8 as *const c_char;
 pub const GST_GL_MEMORY_ALLOCATOR_NAME: *const c_char = b"GLMemory\0" as *const u8 as *const c_char;
 pub const GST_GL_MEMORY_PBO_ALLOCATOR_NAME: *const c_char = b"GLMemoryPBO\0" as *const u8 as *const c_char;
 pub const GST_GL_MEMORY_VIDEO_FORMATS_STR: *const c_char = b"{ RGBA, BGRA, RGBx, BGRx, ARGB, ABGR, xRGB, xBGR, RGB, BGR, RGB16, BGR16, AYUV, I420, YV12, NV12, NV21, YUY2, UYVY, Y41B, Y42B, Y444, GRAY8, GRAY16_LE, GRAY16_BE }\0" as *const u8 as *const c_char;
diff --git a/gstreamer-gl-sys/src/manual.rs b/gstreamer-gl-sys/src/manual.rs
new file mode 100644
index 000000000..c9eb530b5
--- /dev/null
+++ b/gstreamer-gl-sys/src/manual.rs
@@ -0,0 +1,8 @@
+use libc::c_char;
+
+// See https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/issues/497
+#[cfg(any(feature = "egl", feature = "dox"))]
+pub const GST_GL_DISPLAY_EGL_NAME: *const c_char = b"gst.gl.display.egl\0" as *const u8 as *const c_char;
+
+// See https://gitlab.gnome.org/GNOME/gobject-introspection/issues/238
+pub const GST_GL_COLOR_CONVERT_VIDEO_CAPS: *const c_char = b"video/x-raw(memory:GLMemory), format = (string) { RGBA, RGB, RGBx, BGR, BGRx, BGRA, xRGB, xBGR, ARGB, ABGR, Y444, I420, YV12, Y42B, Y41B, NV12, NV21, YUY2, UYVY, AYUV, GRAY8, GRAY16_LE, GRAY16_BE, RGB16, BGR16 }, width = (int) [ 1, max ], height = (int) [ 1, max ], framerate = (fraction) [ 0, max ], texture-target = (string) { 2D, rectangle, external-oes }  ; video/x-raw(memory:GLMemory,meta:GstVideoOverlayComposition), format = (string) { RGBA, RGB, RGBx, BGR, BGRx, BGRA, xRGB, xBGR, ARGB, ABGR, Y444, I420, YV12, Y42B, Y41B, NV12, NV21, YUY2, UYVY, AYUV, GRAY8, GRAY16_LE, GRAY16_BE, RGB16, BGR16 }, width = (int) [ 1, max ], height = (int) [ 1, max ], framerate = (fraction) [ 0, max ], texture-target = (string) { 2D, rectangle, external-oes }\0" as *const u8 as *const c_char;
diff --git a/gstreamer-gl-sys/tests/abi.rs b/gstreamer-gl-sys/tests/abi.rs
index 8fe52f342..c4fdd8d30 100644
--- a/gstreamer-gl-sys/tests/abi.rs
+++ b/gstreamer-gl-sys/tests/abi.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
@@ -227,7 +227,14 @@ fn get_c_value(dir: &Path, cc: &Compiler, name: &str) -> Result<String, Box<Erro
                            &abi_cmd, &output).into());
     }
 
-    Ok(str::from_utf8(&output.stdout)?.trim().to_owned())
+    let output = str::from_utf8(&output.stdout)?.trim();
+    if !output.starts_with("###gir test###") ||
+       !output.ends_with("###gir test###") {
+        return Err(format!("command {:?} return invalid output, {:?}",
+                           &abi_cmd, &output).into());
+    }
+
+    Ok(String::from(&output[14..(output.len() - 14)]))
 }
 
 const RUST_LAYOUTS: &[(&str, Layout)] = &[
@@ -307,124 +314,122 @@ const RUST_CONSTANTS: &[(&str, &str)] = &[
     ("GST_BUFFER_POOL_OPTION_GL_TEXTURE_TARGET_RECTANGLE", "GstBufferPoolOptionGLTextureTargetRectangle"),
     ("GST_CAPS_FEATURE_MEMORY_GL_BUFFER", "memory:GLBuffer"),
     ("GST_CAPS_FEATURE_MEMORY_GL_MEMORY", "memory:GLMemory"),
-    ("GST_GLSL_ERROR_COMPILE", "0"),
-    ("GST_GLSL_ERROR_LINK", "1"),
-    ("GST_GLSL_ERROR_PROGRAM", "2"),
-    ("GST_GLSL_PROFILE_ANY", "-1"),
-    ("GST_GLSL_PROFILE_COMPATIBILITY", "4"),
-    ("GST_GLSL_PROFILE_CORE", "2"),
-    ("GST_GLSL_PROFILE_ES", "1"),
-    ("GST_GLSL_PROFILE_NONE", "0"),
-    ("GST_GLSL_VERSION_100", "100"),
-    ("GST_GLSL_VERSION_110", "110"),
-    ("GST_GLSL_VERSION_120", "120"),
-    ("GST_GLSL_VERSION_130", "130"),
-    ("GST_GLSL_VERSION_140", "140"),
-    ("GST_GLSL_VERSION_150", "150"),
-    ("GST_GLSL_VERSION_300", "300"),
-    ("GST_GLSL_VERSION_310", "310"),
-    ("GST_GLSL_VERSION_320", "320"),
-    ("GST_GLSL_VERSION_330", "330"),
-    ("GST_GLSL_VERSION_400", "400"),
-    ("GST_GLSL_VERSION_410", "410"),
-    ("GST_GLSL_VERSION_420", "420"),
-    ("GST_GLSL_VERSION_430", "430"),
-    ("GST_GLSL_VERSION_440", "440"),
-    ("GST_GLSL_VERSION_450", "450"),
-    ("GST_GLSL_VERSION_NONE", "0"),
+    ("(gint) GST_GLSL_ERROR_COMPILE", "0"),
+    ("(gint) GST_GLSL_ERROR_LINK", "1"),
+    ("(gint) GST_GLSL_ERROR_PROGRAM", "2"),
+    ("(guint) GST_GLSL_PROFILE_ANY", "4294967295"),
+    ("(guint) GST_GLSL_PROFILE_COMPATIBILITY", "4"),
+    ("(guint) GST_GLSL_PROFILE_CORE", "2"),
+    ("(guint) GST_GLSL_PROFILE_ES", "1"),
+    ("(guint) GST_GLSL_PROFILE_NONE", "0"),
+    ("(gint) GST_GLSL_VERSION_100", "100"),
+    ("(gint) GST_GLSL_VERSION_110", "110"),
+    ("(gint) GST_GLSL_VERSION_120", "120"),
+    ("(gint) GST_GLSL_VERSION_130", "130"),
+    ("(gint) GST_GLSL_VERSION_140", "140"),
+    ("(gint) GST_GLSL_VERSION_150", "150"),
+    ("(gint) GST_GLSL_VERSION_300", "300"),
+    ("(gint) GST_GLSL_VERSION_310", "310"),
+    ("(gint) GST_GLSL_VERSION_320", "320"),
+    ("(gint) GST_GLSL_VERSION_330", "330"),
+    ("(gint) GST_GLSL_VERSION_400", "400"),
+    ("(gint) GST_GLSL_VERSION_410", "410"),
+    ("(gint) GST_GLSL_VERSION_420", "420"),
+    ("(gint) GST_GLSL_VERSION_430", "430"),
+    ("(gint) GST_GLSL_VERSION_440", "440"),
+    ("(gint) GST_GLSL_VERSION_450", "450"),
+    ("(gint) GST_GLSL_VERSION_NONE", "0"),
     ("GST_GL_ALLOCATION_PARAMS_ALLOC_FLAG_ALLOC", "1"),
     ("GST_GL_ALLOCATION_PARAMS_ALLOC_FLAG_BUFFER", "16"),
     ("GST_GL_ALLOCATION_PARAMS_ALLOC_FLAG_USER", "65536"),
     ("GST_GL_ALLOCATION_PARAMS_ALLOC_FLAG_VIDEO", "8"),
     ("GST_GL_ALLOCATION_PARAMS_ALLOC_FLAG_WRAP_GPU_HANDLE", "4"),
     ("GST_GL_ALLOCATION_PARAMS_ALLOC_FLAG_WRAP_SYSMEM", "2"),
-    ("GST_GL_ALPHA", "6406"),
-    ("GST_GL_API_ANY", "4294967295"),
-    ("GST_GL_API_GLES1", "32768"),
+    ("(gint) GST_GL_ALPHA", "6406"),
+    ("(guint) GST_GL_API_ANY", "4294967295"),
+    ("(guint) GST_GL_API_GLES1", "32768"),
     ("GST_GL_API_GLES1_NAME", "gles1"),
-    ("GST_GL_API_GLES2", "65536"),
+    ("(guint) GST_GL_API_GLES2", "65536"),
     ("GST_GL_API_GLES2_NAME", "gles2"),
-    ("GST_GL_API_NONE", "0"),
-    ("GST_GL_API_OPENGL", "1"),
-    ("GST_GL_API_OPENGL3", "2"),
+    ("(guint) GST_GL_API_NONE", "0"),
+    ("(guint) GST_GL_API_OPENGL", "1"),
+    ("(guint) GST_GL_API_OPENGL3", "2"),
     ("GST_GL_API_OPENGL3_NAME", "opengl3"),
     ("GST_GL_API_OPENGL_NAME", "opengl"),
     ("GST_GL_BASE_MEMORY_ALLOCATOR_NAME", "GLBaseMemory"),
-    ("GST_GL_BASE_MEMORY_ERROR_FAILED", "0"),
-    ("GST_GL_BASE_MEMORY_ERROR_OLD_LIBS", "1"),
-    ("GST_GL_BASE_MEMORY_ERROR_RESOURCE_UNAVAILABLE", "2"),
-    ("GST_GL_BASE_MEMORY_TRANSFER_NEED_DOWNLOAD", "1048576"),
-    ("GST_GL_BASE_MEMORY_TRANSFER_NEED_UPLOAD", "2097152"),
+    ("(gint) GST_GL_BASE_MEMORY_ERROR_FAILED", "0"),
+    ("(gint) GST_GL_BASE_MEMORY_ERROR_OLD_LIBS", "1"),
+    ("(gint) GST_GL_BASE_MEMORY_ERROR_RESOURCE_UNAVAILABLE", "2"),
+    ("(guint) GST_GL_BASE_MEMORY_TRANSFER_NEED_DOWNLOAD", "1048576"),
+    ("(guint) GST_GL_BASE_MEMORY_TRANSFER_NEED_UPLOAD", "2097152"),
     ("GST_GL_BUFFER_ALLOCATOR_NAME", "GLBuffer"),
     ("GST_GL_COLOR_CONVERT_FORMATS", "{ RGBA, RGB, RGBx, BGR, BGRx, BGRA, xRGB, xBGR, ARGB, ABGR, Y444, I420, YV12, Y42B, Y41B, NV12, NV21, YUY2, UYVY, AYUV, GRAY8, GRAY16_LE, GRAY16_BE, RGB16, BGR16 }"),
-    ("GST_GL_COLOR_CONVERT_VIDEO_CAPS", "video/x-raw("),
-    ("GST_GL_CONTEXT_ERROR_CREATE_CONTEXT", "4"),
-    ("GST_GL_CONTEXT_ERROR_FAILED", "0"),
-    ("GST_GL_CONTEXT_ERROR_OLD_LIBS", "3"),
-    ("GST_GL_CONTEXT_ERROR_RESOURCE_UNAVAILABLE", "5"),
-    ("GST_GL_CONTEXT_ERROR_WRONG_API", "2"),
-    ("GST_GL_CONTEXT_ERROR_WRONG_CONFIG", "1"),
+    ("(gint) GST_GL_CONTEXT_ERROR_CREATE_CONTEXT", "4"),
+    ("(gint) GST_GL_CONTEXT_ERROR_FAILED", "0"),
+    ("(gint) GST_GL_CONTEXT_ERROR_OLD_LIBS", "3"),
+    ("(gint) GST_GL_CONTEXT_ERROR_RESOURCE_UNAVAILABLE", "5"),
+    ("(gint) GST_GL_CONTEXT_ERROR_WRONG_API", "2"),
+    ("(gint) GST_GL_CONTEXT_ERROR_WRONG_CONFIG", "1"),
     ("GST_GL_CONTEXT_TYPE_CGL", "gst.gl.context.CGL"),
     ("GST_GL_CONTEXT_TYPE_EAGL", "gst.gl.context.EAGL"),
     ("GST_GL_CONTEXT_TYPE_EGL", "gst.gl.context.EGL"),
     ("GST_GL_CONTEXT_TYPE_GLX", "gst.gl.context.GLX"),
     ("GST_GL_CONTEXT_TYPE_WGL", "gst.gl.context.WGL"),
-    ("GST_GL_DEPTH24_STENCIL8", "35056"),
-    ("GST_GL_DEPTH_COMPONENT16", "33189"),
+    ("(gint) GST_GL_DEPTH24_STENCIL8", "35056"),
+    ("(gint) GST_GL_DEPTH_COMPONENT16", "33189"),
     ("GST_GL_DISPLAY_CONTEXT_TYPE", "gst.gl.GLDisplay"),
-    ("GST_GL_DISPLAY_EGL_NAME", "gst.gl.display.egl"),
-    ("GST_GL_DISPLAY_TYPE_ANY", "4294967295"),
-    ("GST_GL_DISPLAY_TYPE_COCOA", "4"),
-    ("GST_GL_DISPLAY_TYPE_DISPMANX", "16"),
-    ("GST_GL_DISPLAY_TYPE_EGL", "32"),
-    ("GST_GL_DISPLAY_TYPE_GBM", "128"),
-    ("GST_GL_DISPLAY_TYPE_NONE", "0"),
-    ("GST_GL_DISPLAY_TYPE_VIV_FB", "64"),
-    ("GST_GL_DISPLAY_TYPE_WAYLAND", "2"),
-    ("GST_GL_DISPLAY_TYPE_WIN32", "8"),
-    ("GST_GL_DISPLAY_TYPE_X11", "1"),
-    ("GST_GL_LUMINANCE", "6409"),
-    ("GST_GL_LUMINANCE_ALPHA", "6410"),
+    ("(guint) GST_GL_DISPLAY_TYPE_ANY", "4294967295"),
+    ("(guint) GST_GL_DISPLAY_TYPE_COCOA", "4"),
+    ("(guint) GST_GL_DISPLAY_TYPE_DISPMANX", "16"),
+    ("(guint) GST_GL_DISPLAY_TYPE_EGL", "32"),
+    ("(guint) GST_GL_DISPLAY_TYPE_GBM", "128"),
+    ("(guint) GST_GL_DISPLAY_TYPE_NONE", "0"),
+    ("(guint) GST_GL_DISPLAY_TYPE_VIV_FB", "64"),
+    ("(guint) GST_GL_DISPLAY_TYPE_WAYLAND", "2"),
+    ("(guint) GST_GL_DISPLAY_TYPE_WIN32", "8"),
+    ("(guint) GST_GL_DISPLAY_TYPE_X11", "1"),
+    ("(gint) GST_GL_LUMINANCE", "6409"),
+    ("(gint) GST_GL_LUMINANCE_ALPHA", "6410"),
     ("GST_GL_MEMORY_ALLOCATOR_NAME", "GLMemory"),
     ("GST_GL_MEMORY_PBO_ALLOCATOR_NAME", "GLMemoryPBO"),
     ("GST_GL_MEMORY_VIDEO_FORMATS_STR", "{ RGBA, BGRA, RGBx, BGRx, ARGB, ABGR, xRGB, xBGR, RGB, BGR, RGB16, BGR16, AYUV, I420, YV12, NV12, NV21, YUY2, UYVY, Y41B, Y42B, Y444, GRAY8, GRAY16_LE, GRAY16_BE }"),
-    ("GST_GL_PLATFORM_ANY", "4294967295"),
-    ("GST_GL_PLATFORM_CGL", "8"),
-    ("GST_GL_PLATFORM_EAGL", "16"),
-    ("GST_GL_PLATFORM_EGL", "1"),
-    ("GST_GL_PLATFORM_GLX", "2"),
-    ("GST_GL_PLATFORM_NONE", "0"),
-    ("GST_GL_PLATFORM_WGL", "4"),
-    ("GST_GL_QUERY_NONE", "0"),
-    ("GST_GL_QUERY_TIMESTAMP", "2"),
-    ("GST_GL_QUERY_TIME_ELAPSED", "1"),
-    ("GST_GL_R8", "33321"),
-    ("GST_GL_RED", "6403"),
+    ("(guint) GST_GL_PLATFORM_ANY", "4294967295"),
+    ("(guint) GST_GL_PLATFORM_CGL", "8"),
+    ("(guint) GST_GL_PLATFORM_EAGL", "16"),
+    ("(guint) GST_GL_PLATFORM_EGL", "1"),
+    ("(guint) GST_GL_PLATFORM_GLX", "2"),
+    ("(guint) GST_GL_PLATFORM_NONE", "0"),
+    ("(guint) GST_GL_PLATFORM_WGL", "4"),
+    ("(gint) GST_GL_QUERY_NONE", "0"),
+    ("(gint) GST_GL_QUERY_TIMESTAMP", "2"),
+    ("(gint) GST_GL_QUERY_TIME_ELAPSED", "1"),
+    ("(gint) GST_GL_R8", "33321"),
+    ("(gint) GST_GL_RED", "6403"),
     ("GST_GL_RENDERBUFFER_ALLOCATOR_NAME", "GLRenderbuffer"),
-    ("GST_GL_RG", "33319"),
-    ("GST_GL_RG8", "33323"),
-    ("GST_GL_RGB", "6407"),
-    ("GST_GL_RGB565", "36194"),
-    ("GST_GL_RGB8", "32849"),
-    ("GST_GL_RGBA", "6408"),
-    ("GST_GL_RGBA8", "32856"),
-    ("GST_GL_STEREO_DOWNMIX_ANAGLYPH_AMBER_BLUE_DUBOIS", "2"),
-    ("GST_GL_STEREO_DOWNMIX_ANAGLYPH_GREEN_MAGENTA_DUBOIS", "0"),
-    ("GST_GL_STEREO_DOWNMIX_ANAGLYPH_RED_CYAN_DUBOIS", "1"),
-    ("GST_GL_TEXTURE_TARGET_2D", "1"),
+    ("(gint) GST_GL_RG", "33319"),
+    ("(gint) GST_GL_RG8", "33323"),
+    ("(gint) GST_GL_RGB", "6407"),
+    ("(gint) GST_GL_RGB565", "36194"),
+    ("(gint) GST_GL_RGB8", "32849"),
+    ("(gint) GST_GL_RGBA", "6408"),
+    ("(gint) GST_GL_RGBA8", "32856"),
+    ("(gint) GST_GL_STEREO_DOWNMIX_ANAGLYPH_AMBER_BLUE_DUBOIS", "2"),
+    ("(gint) GST_GL_STEREO_DOWNMIX_ANAGLYPH_GREEN_MAGENTA_DUBOIS", "0"),
+    ("(gint) GST_GL_STEREO_DOWNMIX_ANAGLYPH_RED_CYAN_DUBOIS", "1"),
+    ("(gint) GST_GL_TEXTURE_TARGET_2D", "1"),
     ("GST_GL_TEXTURE_TARGET_2D_STR", "2D"),
-    ("GST_GL_TEXTURE_TARGET_EXTERNAL_OES", "3"),
+    ("(gint) GST_GL_TEXTURE_TARGET_EXTERNAL_OES", "3"),
     ("GST_GL_TEXTURE_TARGET_EXTERNAL_OES_STR", "external-oes"),
-    ("GST_GL_TEXTURE_TARGET_NONE", "0"),
-    ("GST_GL_TEXTURE_TARGET_RECTANGLE", "2"),
+    ("(gint) GST_GL_TEXTURE_TARGET_NONE", "0"),
+    ("(gint) GST_GL_TEXTURE_TARGET_RECTANGLE", "2"),
     ("GST_GL_TEXTURE_TARGET_RECTANGLE_STR", "rectangle"),
-    ("GST_GL_UPLOAD_DONE", "1"),
-    ("GST_GL_UPLOAD_ERROR", "-1"),
-    ("GST_GL_UPLOAD_RECONFIGURE", "-3"),
-    ("GST_GL_UPLOAD_UNSUPPORTED", "-2"),
-    ("GST_GL_WINDOW_ERROR_FAILED", "0"),
-    ("GST_GL_WINDOW_ERROR_OLD_LIBS", "1"),
-    ("GST_GL_WINDOW_ERROR_RESOURCE_UNAVAILABLE", "2"),
+    ("(gint) GST_GL_UPLOAD_DONE", "1"),
+    ("(gint) GST_GL_UPLOAD_ERROR", "-1"),
+    ("(gint) GST_GL_UPLOAD_RECONFIGURE", "-3"),
+    ("(gint) GST_GL_UPLOAD_UNSUPPORTED", "-2"),
+    ("(gint) GST_GL_WINDOW_ERROR_FAILED", "0"),
+    ("(gint) GST_GL_WINDOW_ERROR_OLD_LIBS", "1"),
+    ("(gint) GST_GL_WINDOW_ERROR_RESOURCE_UNAVAILABLE", "2"),
     ("GST_MAP_GL", "131072"),
 ];
 
diff --git a/gstreamer-gl-sys/tests/constant.c b/gstreamer-gl-sys/tests/constant.c
index a167e0146..f54bce75c 100644
--- a/gstreamer-gl-sys/tests/constant.c
+++ b/gstreamer-gl-sys/tests/constant.c
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
@@ -7,21 +7,21 @@
 
 int main() {
     printf(_Generic((ABI_CONSTANT_NAME),
-                    char *: "%s",
-                    const char *: "%s",
-                    char: "%c",
-                    signed char: "%hhd",
-                    unsigned char: "%hhu",
-                    short int: "%hd",
-                    unsigned short int: "%hu",
-                    int: "%d",
-                    unsigned int: "%u",
-                    long: "%ld",
-                    unsigned long: "%lu",
-                    long long: "%lld",
-                    unsigned long long: "%llu",
-                    double: "%f",
-                    long double: "%ld"),
+                    char *: "###gir test###%s###gir test###\n",
+                    const char *: "###gir test###%s###gir test###\n",
+                    char: "###gir test###%c###gir test###\n",
+                    signed char: "###gir test###%hhd###gir test###\n",
+                    unsigned char: "###gir test###%hhu###gir test###\n",
+                    short int: "###gir test###%hd###gir test###\n",
+                    unsigned short int: "###gir test###%hu###gir test###\n",
+                    int: "###gir test###%d###gir test###\n",
+                    unsigned int: "###gir test###%u###gir test###\n",
+                    long: "###gir test###%ld###gir test###\n",
+                    unsigned long: "###gir test###%lu###gir test###\n",
+                    long long: "###gir test###%lld###gir test###\n",
+                    unsigned long long: "###gir test###%llu###gir test###\n",
+                    double: "###gir test###%f###gir test###\n",
+                    long double: "###gir test###%ld###gir test###\n"),
            ABI_CONSTANT_NAME);
     return 0;
 }
diff --git a/gstreamer-gl-sys/tests/layout.c b/gstreamer-gl-sys/tests/layout.c
index 829276260..aef10fc35 100644
--- a/gstreamer-gl-sys/tests/layout.c
+++ b/gstreamer-gl-sys/tests/layout.c
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
diff --git a/gstreamer-mpegts-sys/src/lib.rs b/gstreamer-mpegts-sys/src/lib.rs
index d12d6e5a2..9cb4dfe59 100644
--- a/gstreamer-mpegts-sys/src/lib.rs
+++ b/gstreamer-mpegts-sys/src/lib.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
diff --git a/gstreamer-mpegts-sys/tests/abi.rs b/gstreamer-mpegts-sys/tests/abi.rs
index 54a80b594..516da8d8b 100644
--- a/gstreamer-mpegts-sys/tests/abi.rs
+++ b/gstreamer-mpegts-sys/tests/abi.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
@@ -227,7 +227,14 @@ fn get_c_value(dir: &Path, cc: &Compiler, name: &str) -> Result<String, Box<Erro
                            &abi_cmd, &output).into());
     }
 
-    Ok(str::from_utf8(&output.stdout)?.trim().to_owned())
+    let output = str::from_utf8(&output.stdout)?.trim();
+    if !output.starts_with("###gir test###") ||
+       !output.ends_with("###gir test###") {
+        return Err(format!("command {:?} return invalid output, {:?}",
+                           &abi_cmd, &output).into());
+    }
+
+    Ok(String::from(&output[14..(output.len() - 14)]))
 }
 
 const RUST_LAYOUTS: &[(&str, Layout)] = &[
@@ -313,497 +320,497 @@ const RUST_LAYOUTS: &[(&str, Layout)] = &[
 ];
 
 const RUST_CONSTANTS: &[(&str, &str)] = &[
-    ("ADDITIONAL_INFO_PAGE", "3"),
-    ("GST_DVB_SERVICE_ADVANCED_CODEC_DIGITAL_RADIO_SOUND", "10"),
-    ("GST_DVB_SERVICE_ADVANCED_CODEC_HD_DIGITAL_TELEVISION", "25"),
-    ("GST_DVB_SERVICE_ADVANCED_CODEC_HD_NVOD_REFERENCE", "27"),
-    ("GST_DVB_SERVICE_ADVANCED_CODEC_HD_NVOD_TIME_SHIFTED", "26"),
-    ("GST_DVB_SERVICE_ADVANCED_CODEC_MOSAIC", "11"),
-    ("GST_DVB_SERVICE_ADVANCED_CODEC_SD_DIGITAL_TELEVISION", "22"),
-    ("GST_DVB_SERVICE_ADVANCED_CODEC_SD_NVOD_REFERENCE", "24"),
-    ("GST_DVB_SERVICE_ADVANCED_CODEC_SD_NVOD_TIME_SHIFTED", "23"),
-    ("GST_DVB_SERVICE_ADVANCED_CODEC_STEREO_HD_DIGITAL_TELEVISION", "28"),
-    ("GST_DVB_SERVICE_ADVANCED_CODEC_STEREO_HD_NVOD_REFERENCE", "30"),
-    ("GST_DVB_SERVICE_ADVANCED_CODEC_STEREO_HD_NVOD_TIME_SHIFTED", "29"),
-    ("GST_DVB_SERVICE_DATA_BROADCAST", "12"),
-    ("GST_DVB_SERVICE_DIGITAL_RADIO_SOUND", "2"),
-    ("GST_DVB_SERVICE_DIGITAL_TELEVISION", "1"),
-    ("GST_DVB_SERVICE_DVB_MHP", "16"),
-    ("GST_DVB_SERVICE_DVB_SRM", "8"),
-    ("GST_DVB_SERVICE_FM_RADIO", "7"),
-    ("GST_DVB_SERVICE_MOSAIC", "6"),
-    ("GST_DVB_SERVICE_MPEG2_HD_DIGITAL_TELEVISION", "17"),
-    ("GST_DVB_SERVICE_NVOD_REFERENCE", "4"),
-    ("GST_DVB_SERVICE_NVOD_TIME_SHIFTED", "5"),
-    ("GST_DVB_SERVICE_RCS_FLS", "15"),
-    ("GST_DVB_SERVICE_RCS_MAP", "14"),
-    ("GST_DVB_SERVICE_RESERVED_00", "0"),
-    ("GST_DVB_SERVICE_RESERVED_09", "9"),
-    ("GST_DVB_SERVICE_RESERVED_0D_COMMON_INTERFACE", "13"),
-    ("GST_DVB_SERVICE_RESERVED_FF", "31"),
-    ("GST_DVB_SERVICE_TELETEXT", "3"),
-    ("GST_MPEGTS_ATSC_MGT_TABLE_TYPE_EIT0", "256"),
-    ("GST_MPEGTS_ATSC_MGT_TABLE_TYPE_EIT127", "383"),
-    ("GST_MPEGTS_ATSC_MGT_TABLE_TYPE_ETT0", "512"),
-    ("GST_MPEGTS_ATSC_MGT_TABLE_TYPE_ETT127", "639"),
-    ("GST_MPEGTS_AUDIO_TYPE_CLEAN_EFFECTS", "1"),
-    ("GST_MPEGTS_AUDIO_TYPE_HEARING_IMPAIRED", "2"),
-    ("GST_MPEGTS_AUDIO_TYPE_UNDEFINED", "0"),
-    ("GST_MPEGTS_AUDIO_TYPE_VISUAL_IMPAIRED_COMMENTARY", "3"),
-    ("GST_MPEGTS_CABLE_OUTER_FEC_NONE", "1"),
-    ("GST_MPEGTS_CABLE_OUTER_FEC_RS_204_188", "2"),
-    ("GST_MPEGTS_CABLE_OUTER_FEC_UNDEFINED", "0"),
-    ("GST_MPEGTS_CONTENT_ARTS_CULTURE", "7"),
-    ("GST_MPEGTS_CONTENT_CHILDREN_YOUTH_PROGRAM", "5"),
-    ("GST_MPEGTS_CONTENT_EDUCATION_SCIENCE_FACTUAL", "9"),
-    ("GST_MPEGTS_CONTENT_LEISURE_HOBBIES", "10"),
-    ("GST_MPEGTS_CONTENT_MOVIE_DRAMA", "1"),
-    ("GST_MPEGTS_CONTENT_MUSIC_BALLET_DANCE", "6"),
-    ("GST_MPEGTS_CONTENT_NEWS_CURRENT_AFFAIRS", "2"),
-    ("GST_MPEGTS_CONTENT_SHOW_GAME_SHOW", "3"),
-    ("GST_MPEGTS_CONTENT_SOCIAL_POLITICAL_ECONOMICS", "8"),
-    ("GST_MPEGTS_CONTENT_SPECIAL_CHARACTERISTICS", "11"),
-    ("GST_MPEGTS_CONTENT_SPORTS", "4"),
-    ("GST_MPEGTS_DVB_LINKAGE_CA_REPLACEMENT", "3"),
-    ("GST_MPEGTS_DVB_LINKAGE_DATA_BROADCAST", "6"),
-    ("GST_MPEGTS_DVB_LINKAGE_EPG", "2"),
-    ("GST_MPEGTS_DVB_LINKAGE_EVENT", "13"),
-    ("GST_MPEGTS_DVB_LINKAGE_EXTENDED_EVENT", "14"),
-    ("GST_MPEGTS_DVB_LINKAGE_HAND_OVER_ASSOCIATED", "3"),
-    ("GST_MPEGTS_DVB_LINKAGE_HAND_OVER_IDENTICAL", "1"),
-    ("GST_MPEGTS_DVB_LINKAGE_HAND_OVER_LOCAL_VARIATION", "2"),
-    ("GST_MPEGTS_DVB_LINKAGE_HAND_OVER_RESERVED", "0"),
-    ("GST_MPEGTS_DVB_LINKAGE_INFORMATION", "1"),
-    ("GST_MPEGTS_DVB_LINKAGE_IP_MAC_NOTIFICATION", "11"),
-    ("GST_MPEGTS_DVB_LINKAGE_MOBILE_HAND_OVER", "8"),
-    ("GST_MPEGTS_DVB_LINKAGE_RCS_MAP", "7"),
-    ("GST_MPEGTS_DVB_LINKAGE_RESERVED_00", "0"),
-    ("GST_MPEGTS_DVB_LINKAGE_SERVICE_REPLACEMENT", "5"),
-    ("GST_MPEGTS_DVB_LINKAGE_SYSTEM_SOFTWARE_UPDATE", "9"),
-    ("GST_MPEGTS_DVB_LINKAGE_TS_CONTAINING_COMPLETE_SI", "4"),
-    ("GST_MPEGTS_DVB_LINKAGE_TS_CONTAINING_INT", "12"),
-    ("GST_MPEGTS_DVB_LINKAGE_TS_CONTAINING_SSU", "10"),
-    ("GST_MPEGTS_DVB_SCRAMBLING_MODE_ATIS_0", "112"),
-    ("GST_MPEGTS_DVB_SCRAMBLING_MODE_ATIS_F", "127"),
-    ("GST_MPEGTS_DVB_SCRAMBLING_MODE_CISSA", "16"),
-    ("GST_MPEGTS_DVB_SCRAMBLING_MODE_CSA1", "1"),
-    ("GST_MPEGTS_DVB_SCRAMBLING_MODE_CSA2", "2"),
-    ("GST_MPEGTS_DVB_SCRAMBLING_MODE_CSA3_FULL_ENHANCED", "5"),
-    ("GST_MPEGTS_DVB_SCRAMBLING_MODE_CSA3_MINIMAL_ENHANCED", "4"),
-    ("GST_MPEGTS_DVB_SCRAMBLING_MODE_CSA3_STANDARD", "3"),
-    ("GST_MPEGTS_DVB_SCRAMBLING_MODE_RESERVED", "0"),
-    ("GST_MPEGTS_FEC_1_2", "1"),
-    ("GST_MPEGTS_FEC_2_3", "2"),
-    ("GST_MPEGTS_FEC_2_5", "12"),
-    ("GST_MPEGTS_FEC_3_4", "3"),
-    ("GST_MPEGTS_FEC_3_5", "10"),
-    ("GST_MPEGTS_FEC_4_5", "4"),
-    ("GST_MPEGTS_FEC_5_6", "5"),
-    ("GST_MPEGTS_FEC_6_7", "6"),
-    ("GST_MPEGTS_FEC_7_8", "7"),
-    ("GST_MPEGTS_FEC_8_9", "8"),
-    ("GST_MPEGTS_FEC_9_10", "11"),
-    ("GST_MPEGTS_FEC_AUTO", "9"),
-    ("GST_MPEGTS_FEC_NONE", "0"),
-    ("GST_MPEGTS_GUARD_INTERVAL_19_128", "6"),
-    ("GST_MPEGTS_GUARD_INTERVAL_19_256", "7"),
-    ("GST_MPEGTS_GUARD_INTERVAL_1_128", "5"),
-    ("GST_MPEGTS_GUARD_INTERVAL_1_16", "1"),
-    ("GST_MPEGTS_GUARD_INTERVAL_1_32", "0"),
-    ("GST_MPEGTS_GUARD_INTERVAL_1_4", "3"),
-    ("GST_MPEGTS_GUARD_INTERVAL_1_8", "2"),
-    ("GST_MPEGTS_GUARD_INTERVAL_AUTO", "4"),
-    ("GST_MPEGTS_GUARD_INTERVAL_PN420", "8"),
-    ("GST_MPEGTS_GUARD_INTERVAL_PN595", "9"),
-    ("GST_MPEGTS_GUARD_INTERVAL_PN945", "10"),
-    ("GST_MPEGTS_HIERARCHY_1", "1"),
-    ("GST_MPEGTS_HIERARCHY_2", "2"),
-    ("GST_MPEGTS_HIERARCHY_4", "3"),
-    ("GST_MPEGTS_HIERARCHY_AUTO", "4"),
-    ("GST_MPEGTS_HIERARCHY_NONE", "0"),
-    ("GST_MPEGTS_MODULATION_APSK_16", "10"),
-    ("GST_MPEGTS_MODULATION_APSK_32", "11"),
-    ("GST_MPEGTS_MODULATION_DQPSK", "12"),
-    ("GST_MPEGTS_MODULATION_NONE", "14"),
-    ("GST_MPEGTS_MODULATION_PSK_8", "9"),
-    ("GST_MPEGTS_MODULATION_QAM_128", "4"),
-    ("GST_MPEGTS_MODULATION_QAM_16", "1"),
-    ("GST_MPEGTS_MODULATION_QAM_256", "5"),
-    ("GST_MPEGTS_MODULATION_QAM_32", "2"),
-    ("GST_MPEGTS_MODULATION_QAM_4_NR_", "13"),
-    ("GST_MPEGTS_MODULATION_QAM_64", "3"),
-    ("GST_MPEGTS_MODULATION_QAM_AUTO", "6"),
-    ("GST_MPEGTS_MODULATION_QPSK", "0"),
-    ("GST_MPEGTS_MODULATION_VSB_16", "8"),
-    ("GST_MPEGTS_MODULATION_VSB_8", "7"),
-    ("GST_MPEGTS_POLARIZATION_CIRCULAR_LEFT", "2"),
-    ("GST_MPEGTS_POLARIZATION_CIRCULAR_RIGHT", "3"),
-    ("GST_MPEGTS_POLARIZATION_LINEAR_HORIZONTAL", "0"),
-    ("GST_MPEGTS_POLARIZATION_LINEAR_VERTICAL", "1"),
-    ("GST_MPEGTS_ROLLOFF_20", "1"),
-    ("GST_MPEGTS_ROLLOFF_25", "2"),
-    ("GST_MPEGTS_ROLLOFF_35", "0"),
-    ("GST_MPEGTS_ROLLOFF_AUTO", "4"),
-    ("GST_MPEGTS_ROLLOFF_RESERVED", "3"),
-    ("GST_MPEGTS_RUNNING_STATUS_NOT_RUNNING", "1"),
-    ("GST_MPEGTS_RUNNING_STATUS_OFF_AIR", "5"),
-    ("GST_MPEGTS_RUNNING_STATUS_PAUSING", "3"),
-    ("GST_MPEGTS_RUNNING_STATUS_RUNNING", "4"),
-    ("GST_MPEGTS_RUNNING_STATUS_STARTS_IN_FEW_SECONDS", "2"),
-    ("GST_MPEGTS_RUNNING_STATUS_UNDEFINED", "0"),
-    ("GST_MPEGTS_SECTION_ATSC_CVCT", "12"),
-    ("GST_MPEGTS_SECTION_ATSC_EIT", "15"),
-    ("GST_MPEGTS_SECTION_ATSC_ETT", "14"),
-    ("GST_MPEGTS_SECTION_ATSC_MGT", "13"),
-    ("GST_MPEGTS_SECTION_ATSC_STT", "16"),
-    ("GST_MPEGTS_SECTION_ATSC_TVCT", "11"),
-    ("GST_MPEGTS_SECTION_BAT", "7"),
-    ("GST_MPEGTS_SECTION_CAT", "3"),
-    ("GST_MPEGTS_SECTION_EIT", "5"),
-    ("GST_MPEGTS_SECTION_NIT", "6"),
-    ("GST_MPEGTS_SECTION_PAT", "1"),
-    ("GST_MPEGTS_SECTION_PMT", "2"),
-    ("GST_MPEGTS_SECTION_SDT", "8"),
-    ("GST_MPEGTS_SECTION_TDT", "9"),
-    ("GST_MPEGTS_SECTION_TOT", "10"),
-    ("GST_MPEGTS_SECTION_TSDT", "4"),
-    ("GST_MPEGTS_SECTION_UNKNOWN", "0"),
-    ("GST_MPEGTS_STREAM_CONTENT_AAC", "6"),
-    ("GST_MPEGTS_STREAM_CONTENT_AC_3", "4"),
-    ("GST_MPEGTS_STREAM_CONTENT_AVC", "5"),
-    ("GST_MPEGTS_STREAM_CONTENT_DTS", "7"),
-    ("GST_MPEGTS_STREAM_CONTENT_MPEG1_LAYER2_AUDIO", "2"),
-    ("GST_MPEGTS_STREAM_CONTENT_MPEG2_VIDEO", "1"),
-    ("GST_MPEGTS_STREAM_CONTENT_SRM_CPCM", "8"),
-    ("GST_MPEGTS_STREAM_CONTENT_TELETEXT_OR_SUBTITLE", "3"),
-    ("GST_MPEGTS_STREAM_TYPE_AUDIO_AAC_ADTS", "15"),
-    ("GST_MPEGTS_STREAM_TYPE_AUDIO_AAC_CLEAN", "28"),
-    ("GST_MPEGTS_STREAM_TYPE_AUDIO_AAC_LATM", "17"),
-    ("GST_MPEGTS_STREAM_TYPE_AUDIO_MPEG1", "3"),
-    ("GST_MPEGTS_STREAM_TYPE_AUDIO_MPEG2", "4"),
-    ("GST_MPEGTS_STREAM_TYPE_AUXILIARY", "14"),
-    ("GST_MPEGTS_STREAM_TYPE_DSMCC_A", "10"),
-    ("GST_MPEGTS_STREAM_TYPE_DSMCC_B", "11"),
-    ("GST_MPEGTS_STREAM_TYPE_DSMCC_C", "12"),
-    ("GST_MPEGTS_STREAM_TYPE_DSMCC_D", "13"),
-    ("GST_MPEGTS_STREAM_TYPE_DSM_CC", "8"),
-    ("GST_MPEGTS_STREAM_TYPE_H_222_1", "9"),
-    ("GST_MPEGTS_STREAM_TYPE_IPMP_STREAM", "127"),
-    ("GST_MPEGTS_STREAM_TYPE_METADATA_DATA_CAROUSEL", "23"),
-    ("GST_MPEGTS_STREAM_TYPE_METADATA_OBJECT_CAROUSEL", "24"),
-    ("GST_MPEGTS_STREAM_TYPE_METADATA_PES_PACKETS", "21"),
-    ("GST_MPEGTS_STREAM_TYPE_METADATA_SECTIONS", "22"),
-    ("GST_MPEGTS_STREAM_TYPE_METADATA_SYNCHRONIZED_DOWNLOAD", "25"),
-    ("GST_MPEGTS_STREAM_TYPE_MHEG", "7"),
-    ("GST_MPEGTS_STREAM_TYPE_MPEG2_IPMP", "26"),
-    ("GST_MPEGTS_STREAM_TYPE_MPEG4_TIMED_TEXT", "29"),
-    ("GST_MPEGTS_STREAM_TYPE_PRIVATE_PES_PACKETS", "6"),
-    ("GST_MPEGTS_STREAM_TYPE_PRIVATE_SECTIONS", "5"),
-    ("GST_MPEGTS_STREAM_TYPE_RESERVED_00", "0"),
-    ("GST_MPEGTS_STREAM_TYPE_SCTE_ASYNC_DATA", "195"),
-    ("GST_MPEGTS_STREAM_TYPE_SCTE_DSMCC_DCB", "176"),
-    ("GST_MPEGTS_STREAM_TYPE_SCTE_DST_NRT", "149"),
-    ("GST_MPEGTS_STREAM_TYPE_SCTE_ISOCH_DATA", "131"),
-    ("GST_MPEGTS_STREAM_TYPE_SCTE_SIGNALING", "192"),
-    ("GST_MPEGTS_STREAM_TYPE_SCTE_SUBTITLING", "130"),
-    ("GST_MPEGTS_STREAM_TYPE_SCTE_SYNC_DATA", "194"),
-    ("GST_MPEGTS_STREAM_TYPE_SL_FLEXMUX_PES_PACKETS", "18"),
-    ("GST_MPEGTS_STREAM_TYPE_SL_FLEXMUX_SECTIONS", "19"),
-    ("GST_MPEGTS_STREAM_TYPE_SYNCHRONIZED_DOWNLOAD", "20"),
-    ("GST_MPEGTS_STREAM_TYPE_VIDEO_H264", "27"),
-    ("GST_MPEGTS_STREAM_TYPE_VIDEO_H264_MVC_SUB_BITSTREAM", "32"),
-    ("GST_MPEGTS_STREAM_TYPE_VIDEO_H264_STEREO_ADDITIONAL_VIEW", "35"),
-    ("GST_MPEGTS_STREAM_TYPE_VIDEO_H264_SVC_SUB_BITSTREAM", "31"),
-    ("GST_MPEGTS_STREAM_TYPE_VIDEO_HEVC", "36"),
-    ("GST_MPEGTS_STREAM_TYPE_VIDEO_JP2K", "33"),
-    ("GST_MPEGTS_STREAM_TYPE_VIDEO_MPEG1", "1"),
-    ("GST_MPEGTS_STREAM_TYPE_VIDEO_MPEG2", "2"),
-    ("GST_MPEGTS_STREAM_TYPE_VIDEO_MPEG2_STEREO_ADDITIONAL_VIEW", "34"),
-    ("GST_MPEGTS_STREAM_TYPE_VIDEO_MPEG4", "16"),
-    ("GST_MPEGTS_STREAM_TYPE_VIDEO_RVC", "30"),
-    ("GST_MPEGTS_TRANSMISSION_MODE_16K", "5"),
-    ("GST_MPEGTS_TRANSMISSION_MODE_1K", "4"),
-    ("GST_MPEGTS_TRANSMISSION_MODE_2K", "0"),
-    ("GST_MPEGTS_TRANSMISSION_MODE_32K", "6"),
-    ("GST_MPEGTS_TRANSMISSION_MODE_4K", "3"),
-    ("GST_MPEGTS_TRANSMISSION_MODE_8K", "1"),
-    ("GST_MPEGTS_TRANSMISSION_MODE_AUTO", "2"),
-    ("GST_MPEGTS_TRANSMISSION_MODE_C1", "7"),
-    ("GST_MPEGTS_TRANSMISSION_MODE_C3780", "8"),
-    ("GST_MTS_DESC_AC3_AUDIO_STREAM", "129"),
-    ("GST_MTS_DESC_ATSC_AC3", "131"),
-    ("GST_MTS_DESC_ATSC_CAPTION_SERVICE", "134"),
-    ("GST_MTS_DESC_ATSC_COMPONENT_NAME", "163"),
-    ("GST_MTS_DESC_ATSC_CONTENT_ADVISORY", "135"),
-    ("GST_MTS_DESC_ATSC_CRC32", "181"),
-    ("GST_MTS_DESC_ATSC_DATA_SERVICE", "164"),
-    ("GST_MTS_DESC_ATSC_DCC_ARRIVING_REQUEST", "169"),
-    ("GST_MTS_DESC_ATSC_DCC_DEPARTING_REQUEST", "168"),
-    ("GST_MTS_DESC_ATSC_DOWNLOAD_DESCRIPTOR", "166"),
-    ("GST_MTS_DESC_ATSC_EAC3", "204"),
-    ("GST_MTS_DESC_ATSC_ENHANCED_SIGNALING", "178"),
-    ("GST_MTS_DESC_ATSC_EXTENDED_CHANNEL_NAME", "160"),
-    ("GST_MTS_DESC_ATSC_GENRE", "171"),
-    ("GST_MTS_DESC_ATSC_GROUP_LINK", "184"),
-    ("GST_MTS_DESC_ATSC_MODULE_LINK", "180"),
-    ("GST_MTS_DESC_ATSC_MULTIPROTOCOL_ENCAPSULATION", "167"),
-    ("GST_MTS_DESC_ATSC_PID_COUNT", "165"),
-    ("GST_MTS_DESC_ATSC_PRIVATE_INFORMATION", "173"),
-    ("GST_MTS_DESC_ATSC_REDISTRIBUTION_CONTROL", "170"),
-    ("GST_MTS_DESC_ATSC_SERVICE_LOCATION", "161"),
-    ("GST_MTS_DESC_ATSC_STUFFING", "128"),
-    ("GST_MTS_DESC_ATSC_TIME_SHIFTED_SERVICE", "162"),
-    ("GST_MTS_DESC_AUDIO_STREAM", "3"),
-    ("GST_MTS_DESC_AUXILIARY_VIDEO_STREAM", "47"),
-    ("GST_MTS_DESC_AVC_TIMING_AND_HRD", "42"),
-    ("GST_MTS_DESC_AVC_VIDEO", "40"),
-    ("GST_MTS_DESC_CA", "9"),
-    ("GST_MTS_DESC_CONTENT_LABELING", "36"),
-    ("GST_MTS_DESC_COPYRIGHT", "13"),
-    ("GST_MTS_DESC_DATA_STREAM_ALIGNMENT", "6"),
-    ("GST_MTS_DESC_DSMCC_ASSOCIATION_TAG", "20"),
-    ("GST_MTS_DESC_DSMCC_CAROUSEL_IDENTIFIER", "19"),
-    ("GST_MTS_DESC_DSMCC_DEFERRED_ASSOCIATION_TAG", "21"),
-    ("GST_MTS_DESC_DSMCC_NPT_ENDPOINT", "24"),
-    ("GST_MTS_DESC_DSMCC_NPT_REFERENCE", "23"),
-    ("GST_MTS_DESC_DSMCC_STREAM_EVENT", "26"),
-    ("GST_MTS_DESC_DSMCC_STREAM_MODE", "25"),
-    ("GST_MTS_DESC_DTG_LOGICAL_CHANNEL", "131"),
-    ("GST_MTS_DESC_DVB_AAC", "124"),
-    ("GST_MTS_DESC_DVB_AC3", "106"),
-    ("GST_MTS_DESC_DVB_ADAPTATION_FIELD_DATA", "112"),
-    ("GST_MTS_DESC_DVB_ANCILLARY_DATA", "107"),
-    ("GST_MTS_DESC_DVB_ANNOUNCEMENT_SUPPORT", "110"),
-    ("GST_MTS_DESC_DVB_APPLICATION_SIGNALLING", "111"),
-    ("GST_MTS_DESC_DVB_BOUQUET_NAME", "71"),
-    ("GST_MTS_DESC_DVB_CABLE_DELIVERY_SYSTEM", "68"),
-    ("GST_MTS_DESC_DVB_CA_IDENTIFIER", "83"),
-    ("GST_MTS_DESC_DVB_CELL_FREQUENCY_LINK", "109"),
-    ("GST_MTS_DESC_DVB_CELL_LIST", "108"),
-    ("GST_MTS_DESC_DVB_COMPONENT", "80"),
-    ("GST_MTS_DESC_DVB_CONTENT", "84"),
-    ("GST_MTS_DESC_DVB_CONTENT_IDENTIFIER", "118"),
-    ("GST_MTS_DESC_DVB_COUNTRY_AVAILABILITY", "73"),
-    ("GST_MTS_DESC_DVB_DATA_BROADCAST", "100"),
-    ("GST_MTS_DESC_DVB_DATA_BROADCAST_ID", "102"),
-    ("GST_MTS_DESC_DVB_DEFAULT_AUTHORITY", "115"),
-    ("GST_MTS_DESC_DVB_DSNG", "104"),
-    ("GST_MTS_DESC_DVB_DTS", "123"),
-    ("GST_MTS_DESC_DVB_ECM_REPETITION_RATE", "120"),
-    ("GST_MTS_DESC_DVB_ENHANCED_AC3", "122"),
-    ("GST_MTS_DESC_DVB_EXTENDED_EVENT", "78"),
-    ("GST_MTS_DESC_DVB_EXTENSION", "127"),
-    ("GST_MTS_DESC_DVB_FREQUENCY_LIST", "98"),
-    ("GST_MTS_DESC_DVB_FTA_CONTENT_MANAGEMENT", "126"),
-    ("GST_MTS_DESC_DVB_LINKAGE", "74"),
-    ("GST_MTS_DESC_DVB_LOCAL_TIME_OFFSET", "88"),
-    ("GST_MTS_DESC_DVB_MOSAIC", "81"),
-    ("GST_MTS_DESC_DVB_MULTILINGUAL_BOUQUET_NAME", "92"),
-    ("GST_MTS_DESC_DVB_MULTILINGUAL_COMPONENT", "94"),
-    ("GST_MTS_DESC_DVB_MULTILINGUAL_NETWORK_NAME", "91"),
-    ("GST_MTS_DESC_DVB_MULTILINGUAL_SERVICE_NAME", "93"),
-    ("GST_MTS_DESC_DVB_NETWORK_NAME", "64"),
-    ("GST_MTS_DESC_DVB_NVOD_REFERENCE", "75"),
-    ("GST_MTS_DESC_DVB_PARENTAL_RATING", "85"),
-    ("GST_MTS_DESC_DVB_PARTIAL_TRANSPORT_STREAM", "99"),
-    ("GST_MTS_DESC_DVB_PDC", "105"),
-    ("GST_MTS_DESC_DVB_PRIVATE_DATA_SPECIFIER", "95"),
-    ("GST_MTS_DESC_DVB_RELATED_CONTENT", "116"),
-    ("GST_MTS_DESC_DVB_S2_SATELLITE_DELIVERY_SYSTEM", "121"),
-    ("GST_MTS_DESC_DVB_SATELLITE_DELIVERY_SYSTEM", "67"),
-    ("GST_MTS_DESC_DVB_SCRAMBLING", "101"),
-    ("GST_MTS_DESC_DVB_SERVICE", "72"),
-    ("GST_MTS_DESC_DVB_SERVICE_AVAILABILITY", "114"),
-    ("GST_MTS_DESC_DVB_SERVICE_IDENTIFIER", "113"),
-    ("GST_MTS_DESC_DVB_SERVICE_LIST", "65"),
-    ("GST_MTS_DESC_DVB_SERVICE_MOVE", "96"),
-    ("GST_MTS_DESC_DVB_SHORT_EVENT", "77"),
-    ("GST_MTS_DESC_DVB_SHORT_SMOOTHING_BUFFER", "97"),
-    ("GST_MTS_DESC_DVB_STREAM_IDENTIFIER", "82"),
-    ("GST_MTS_DESC_DVB_STUFFING", "66"),
-    ("GST_MTS_DESC_DVB_SUBTITLING", "89"),
-    ("GST_MTS_DESC_DVB_TELEPHONE", "87"),
-    ("GST_MTS_DESC_DVB_TELETEXT", "86"),
-    ("GST_MTS_DESC_DVB_TERRESTRIAL_DELIVERY_SYSTEM", "90"),
-    ("GST_MTS_DESC_DVB_TIMESLICE_FEC_IDENTIFIER", "119"),
-    ("GST_MTS_DESC_DVB_TIME_SHIFTED_EVENT", "79"),
-    ("GST_MTS_DESC_DVB_TIME_SHIFTED_SERVICE", "76"),
-    ("GST_MTS_DESC_DVB_TRANSPORT_STREAM", "103"),
-    ("GST_MTS_DESC_DVB_TVA_ID", "117"),
-    ("GST_MTS_DESC_DVB_VBI_DATA", "69"),
-    ("GST_MTS_DESC_DVB_VBI_TELETEXT", "70"),
-    ("GST_MTS_DESC_DVB_XAIT_LOCATION", "125"),
-    ("GST_MTS_DESC_EXTERNAL_ES_ID", "32"),
-    ("GST_MTS_DESC_EXT_DVB_C2_DELIVERY_SYSTEM", "13"),
-    ("GST_MTS_DESC_EXT_DVB_CP", "2"),
-    ("GST_MTS_DESC_EXT_DVB_CPCM_DELIVERY_SIGNALLING", "1"),
-    ("GST_MTS_DESC_EXT_DVB_CP_IDENTIFIER", "3"),
-    ("GST_MTS_DESC_EXT_DVB_DTS_HD_AUDIO_STREAM", "14"),
-    ("GST_MTS_DESC_EXT_DVB_DTS_NEUTRAL", "15"),
-    ("GST_MTS_DESC_EXT_DVB_IMAGE_ICON", "0"),
-    ("GST_MTS_DESC_EXT_DVB_MESSAGE", "8"),
-    ("GST_MTS_DESC_EXT_DVB_NETWORK_CHANGE_NOTIFY", "7"),
-    ("GST_MTS_DESC_EXT_DVB_SERVICE_RELOCATED", "11"),
-    ("GST_MTS_DESC_EXT_DVB_SH_DELIVERY_SYSTEM", "5"),
-    ("GST_MTS_DESC_EXT_DVB_SUPPLEMENTARY_AUDIO", "6"),
-    ("GST_MTS_DESC_EXT_DVB_T2MI", "17"),
-    ("GST_MTS_DESC_EXT_DVB_T2_DELIVERY_SYSTEM", "4"),
-    ("GST_MTS_DESC_EXT_DVB_TARGET_REGION", "9"),
-    ("GST_MTS_DESC_EXT_DVB_TARGET_REGION_NAME", "10"),
-    ("GST_MTS_DESC_EXT_DVB_URI_LINKAGE", "19"),
-    ("GST_MTS_DESC_EXT_DVB_VIDEO_DEPTH_RANGE", "16"),
-    ("GST_MTS_DESC_EXT_DVB_XAIT_PID", "12"),
-    ("GST_MTS_DESC_FLEX_MUX_TIMING", "44"),
-    ("GST_MTS_DESC_FMC", "31"),
-    ("GST_MTS_DESC_FMX_BUFFER_SIZE", "34"),
-    ("GST_MTS_DESC_HIERARCHY", "4"),
-    ("GST_MTS_DESC_IBP", "18"),
-    ("GST_MTS_DESC_IOD", "29"),
-    ("GST_MTS_DESC_IPMP", "41"),
-    ("GST_MTS_DESC_ISDB_AUDIO_COMPONENT", "196"),
-    ("GST_MTS_DESC_ISDB_BASIC_LOCAL_EVENT", "208"),
-    ("GST_MTS_DESC_ISDB_BOARD_INFORMATION", "219"),
-    ("GST_MTS_DESC_ISDB_BROADCASTER_NAME", "216"),
-    ("GST_MTS_DESC_ISDB_CA_CONTRACT_INFORMATION", "203"),
-    ("GST_MTS_DESC_ISDB_CA_EMM_TS", "202"),
-    ("GST_MTS_DESC_ISDB_CA_SERVICE", "204"),
-    ("GST_MTS_DESC_ISDB_COMPONENT_GROUP", "217"),
-    ("GST_MTS_DESC_ISDB_CONNECTED_TRANSMISSION", "221"),
-    ("GST_MTS_DESC_ISDB_CONTENT_AVAILABILITY", "222"),
-    ("GST_MTS_DESC_ISDB_DATA_CONTENT", "199"),
-    ("GST_MTS_DESC_ISDB_DIGITAL_COPY_CONTROL", "193"),
-    ("GST_MTS_DESC_ISDB_DOWNLOAD_CONTENT", "201"),
-    ("GST_MTS_DESC_ISDB_EVENT_GROUP", "214"),
-    ("GST_MTS_DESC_ISDB_EXTENDED_BROADCASTER", "206"),
-    ("GST_MTS_DESC_ISDB_HIERARCHICAL_TRANSMISSION", "192"),
-    ("GST_MTS_DESC_ISDB_HYPERLINK", "197"),
-    ("GST_MTS_DESC_ISDB_LDT_LINKAGE", "220"),
-    ("GST_MTS_DESC_ISDB_LOGO_TRANSMISSION", "207"),
-    ("GST_MTS_DESC_ISDB_NETWORK_IDENTIFICATION", "194"),
-    ("GST_MTS_DESC_ISDB_NODE_RELATION", "210"),
-    ("GST_MTS_DESC_ISDB_PARTIAL_TS_TIME", "195"),
-    ("GST_MTS_DESC_ISDB_REFERENCE", "209"),
-    ("GST_MTS_DESC_ISDB_SERIES", "213"),
-    ("GST_MTS_DESC_ISDB_SERVICE_GROUP", "224"),
-    ("GST_MTS_DESC_ISDB_SHORT_NODE_INFORMATION", "211"),
-    ("GST_MTS_DESC_ISDB_SI_PARAMETER", "215"),
-    ("GST_MTS_DESC_ISDB_SI_PRIME_TS", "218"),
-    ("GST_MTS_DESC_ISDB_STC_REFERENCE", "212"),
-    ("GST_MTS_DESC_ISDB_TARGET_REGION", "198"),
-    ("GST_MTS_DESC_ISDB_TS_INFORMATION", "205"),
-    ("GST_MTS_DESC_ISDB_VIDEO_DECODE_CONTROL", "200"),
-    ("GST_MTS_DESC_ISO_639_LANGUAGE", "10"),
-    ("GST_MTS_DESC_J2K_VIDEO", "50"),
-    ("GST_MTS_DESC_MAXIMUM_BITRATE", "14"),
-    ("GST_MTS_DESC_METADATA", "38"),
-    ("GST_MTS_DESC_METADATA_POINTER", "37"),
-    ("GST_MTS_DESC_METADATA_STD", "39"),
-    ("GST_MTS_DESC_MPEG2_AAC_AUDIO", "43"),
-    ("GST_MTS_DESC_MPEG2_STEREOSCOPIC_VIDEO_FORMAT", "52"),
-    ("GST_MTS_DESC_MPEG4_AUDIO", "28"),
-    ("GST_MTS_DESC_MPEG4_AUDIO_EXTENSION", "46"),
-    ("GST_MTS_DESC_MPEG4_TEXT", "45"),
-    ("GST_MTS_DESC_MPEG4_VIDEO", "27"),
-    ("GST_MTS_DESC_MULTIPLEX_BUFFER", "35"),
-    ("GST_MTS_DESC_MULTIPLEX_BUFFER_UTILISATION", "12"),
-    ("GST_MTS_DESC_MUX_CODE", "33"),
-    ("GST_MTS_DESC_MVC_EXTENSION", "49"),
-    ("GST_MTS_DESC_MVC_OPERATION_POINT", "51"),
-    ("GST_MTS_DESC_PRIVATE_DATA_INDICATOR", "15"),
-    ("GST_MTS_DESC_REGISTRATION", "5"),
-    ("GST_MTS_DESC_RESERVED_00", "0"),
-    ("GST_MTS_DESC_RESERVED_01", "1"),
-    ("GST_MTS_DESC_SL", "30"),
-    ("GST_MTS_DESC_SMOOTHING_BUFFER", "16"),
-    ("GST_MTS_DESC_STD", "17"),
-    ("GST_MTS_DESC_STEREOSCOPIC_PROGRAM_INFO", "53"),
-    ("GST_MTS_DESC_STEREOSCOPIC_VIDEO_INFO", "54"),
-    ("GST_MTS_DESC_SVC_EXTENSION", "48"),
-    ("GST_MTS_DESC_SYSTEM_CLOCK", "11"),
-    ("GST_MTS_DESC_TARGET_BACKGROUND_GRID", "7"),
-    ("GST_MTS_DESC_VIDEO_STREAM", "2"),
-    ("GST_MTS_DESC_VIDEO_WINDOW", "8"),
-    ("GST_MTS_TABLE_ID_14496_OBJET_DESCRIPTOR", "5"),
-    ("GST_MTS_TABLE_ID_14496_SCENE_DESCRIPTION", "4"),
-    ("GST_MTS_TABLE_ID_APPLICATION_INFORMATION_TABLE", "116"),
-    ("GST_MTS_TABLE_ID_ATSC_AGGREGATE_DATA_EVENT", "217"),
-    ("GST_MTS_TABLE_ID_ATSC_AGGREGATE_EVENT_INFORMATION", "214"),
-    ("GST_MTS_TABLE_ID_ATSC_AGGREGATE_EXTENDED_TEXT", "215"),
-    ("GST_MTS_TABLE_ID_ATSC_CABLE_VIRTUAL_CHANNEL", "201"),
-    ("GST_MTS_TABLE_ID_ATSC_CHANNEL_OR_EVENT_EXTENDED_TEXT", "204"),
-    ("GST_MTS_TABLE_ID_ATSC_DATA_EVENT", "206"),
-    ("GST_MTS_TABLE_ID_ATSC_DATA_SERVICE", "207"),
-    ("GST_MTS_TABLE_ID_ATSC_DIRECTED_CHANNEL_CHANGE", "211"),
-    ("GST_MTS_TABLE_ID_ATSC_DIRECTED_CHANNEL_CHANGE_SECTION_CODE", "212"),
-    ("GST_MTS_TABLE_ID_ATSC_EVENT_INFORMATION", "203"),
-    ("GST_MTS_TABLE_ID_ATSC_LONG_TERM_SERVICE", "210"),
-    ("GST_MTS_TABLE_ID_ATSC_MASTER_GUIDE", "199"),
-    ("GST_MTS_TABLE_ID_ATSC_NETWORK_RESOURCE", "209"),
-    ("GST_MTS_TABLE_ID_ATSC_RATING_REGION", "202"),
-    ("GST_MTS_TABLE_ID_ATSC_SATELLITE_VIRTUAL_CHANNEL", "218"),
-    ("GST_MTS_TABLE_ID_ATSC_SYSTEM_TIME", "205"),
-    ("GST_MTS_TABLE_ID_ATSC_TERRESTRIAL_VIRTUAL_CHANNEL", "200"),
-    ("GST_MTS_TABLE_ID_BOUQUET_ASSOCIATION", "74"),
-    ("GST_MTS_TABLE_ID_CA_MESSAGE_ECM_0", "128"),
-    ("GST_MTS_TABLE_ID_CA_MESSAGE_ECM_1", "129"),
-    ("GST_MTS_TABLE_ID_CA_MESSAGE_SYSTEM_PRIVATE_1", "130"),
-    ("GST_MTS_TABLE_ID_CA_MESSAGE_SYSTEM_PRIVATE_N", "143"),
-    ("GST_MTS_TABLE_ID_CMT", "164"),
-    ("GST_MTS_TABLE_ID_CONDITIONAL_ACCESS", "1"),
-    ("GST_MTS_TABLE_ID_CONTAINER", "117"),
-    ("GST_MTS_TABLE_ID_CONTENT_IDENTIFIER", "119"),
-    ("GST_MTS_TABLE_ID_DISCONTINUITY_INFORMATION", "126"),
-    ("GST_MTS_TABLE_ID_DSM_CC_ADDRESSABLE_SECTIONS", "63"),
-    ("GST_MTS_TABLE_ID_DSM_CC_DOWNLOAD_DATA_MESSAGES", "60"),
-    ("GST_MTS_TABLE_ID_DSM_CC_MULTIPROTO_ENCAPSULATED_DATA", "58"),
-    ("GST_MTS_TABLE_ID_DSM_CC_PRIVATE_DATA", "62"),
-    ("GST_MTS_TABLE_ID_DSM_CC_STREAM_DESCRIPTORS", "61"),
-    ("GST_MTS_TABLE_ID_DSM_CC_U_N_MESSAGES", "59"),
-    ("GST_MTS_TABLE_ID_EVENT_INFORMATION_ACTUAL_TS_PRESENT", "78"),
-    ("GST_MTS_TABLE_ID_EVENT_INFORMATION_ACTUAL_TS_SCHEDULE_1", "80"),
-    ("GST_MTS_TABLE_ID_EVENT_INFORMATION_ACTUAL_TS_SCHEDULE_N", "95"),
-    ("GST_MTS_TABLE_ID_EVENT_INFORMATION_OTHER_TS_PRESENT", "79"),
-    ("GST_MTS_TABLE_ID_EVENT_INFORMATION_OTHER_TS_SCHEDULE_1", "96"),
-    ("GST_MTS_TABLE_ID_EVENT_INFORMATION_OTHER_TS_SCHEDULE_N", "111"),
-    ("GST_MTS_TABLE_ID_FCT", "161"),
-    ("GST_MTS_TABLE_ID_IPMP_CONTROL_INFORMATION", "7"),
-    ("GST_MTS_TABLE_ID_LL_FEC_PARITY_DATA_TABLE", "177"),
-    ("GST_MTS_TABLE_ID_METADATA", "6"),
-    ("GST_MTS_TABLE_ID_MPE_FEC", "120"),
-    ("GST_MTS_TABLE_ID_MPE_IFEC", "122"),
-    ("GST_MTS_TABLE_ID_NETWORK_INFORMATION_ACTUAL_NETWORK", "64"),
-    ("GST_MTS_TABLE_ID_NETWORK_INFORMATION_OTHER_NETWORK", "65"),
-    ("GST_MTS_TABLE_ID_PCR_PACKET_PAYLOAD", "166"),
-    ("GST_MTS_TABLE_ID_PROGRAM_ASSOCIATION", "0"),
-    ("GST_MTS_TABLE_ID_RELATED_CONTENT", "118"),
-    ("GST_MTS_TABLE_ID_RESOLUTION_NOTIFICATION", "121"),
-    ("GST_MTS_TABLE_ID_RUNNING_STATUS", "113"),
-    ("GST_MTS_TABLE_ID_SCT", "160"),
-    ("GST_MTS_TABLE_ID_SCTE_DDB", "228"),
-    ("GST_MTS_TABLE_ID_SCTE_DII", "227"),
-    ("GST_MTS_TABLE_ID_SCTE_EAS", "216"),
-    ("GST_MTS_TABLE_ID_SCTE_EBIF", "224"),
-    ("GST_MTS_TABLE_ID_SCTE_EISS", "226"),
-    ("GST_MTS_TABLE_ID_SCTE_RESERVED", "225"),
-    ("GST_MTS_TABLE_ID_SCTE_SPLICE", "252"),
-    ("GST_MTS_TABLE_ID_SELECTION_INFORMATION", "127"),
-    ("GST_MTS_TABLE_ID_SERVICE_DESCRIPTION_ACTUAL_TS", "66"),
-    ("GST_MTS_TABLE_ID_SERVICE_DESCRIPTION_OTHER_TS", "70"),
-    ("GST_MTS_TABLE_ID_SPT", "163"),
-    ("GST_MTS_TABLE_ID_STUFFING", "114"),
-    ("GST_MTS_TABLE_ID_TBTP", "165"),
-    ("GST_MTS_TABLE_ID_TCT", "162"),
-    ("GST_MTS_TABLE_ID_TIM", "176"),
-    ("GST_MTS_TABLE_ID_TIME_DATE", "112"),
-    ("GST_MTS_TABLE_ID_TIME_OFFSET", "115"),
-    ("GST_MTS_TABLE_ID_TRANSMISSION_MODE_SUPPORT_PAYLOAD", "170"),
-    ("GST_MTS_TABLE_ID_TS_DESCRIPTION", "3"),
-    ("GST_MTS_TABLE_ID_TS_PROGRAM_MAP", "2"),
-    ("GST_MTS_TABLE_ID_UNSET", "255"),
-    ("HEARING_IMPAIRED_PAGE", "5"),
-    ("INITIAL_PAGE", "1"),
-    ("PROGRAMME_SCHEDULE_PAGE", "4"),
-    ("SUBTITLE_PAGE", "2"),
+    ("(gint) ADDITIONAL_INFO_PAGE", "3"),
+    ("(gint) GST_DVB_SERVICE_ADVANCED_CODEC_DIGITAL_RADIO_SOUND", "10"),
+    ("(gint) GST_DVB_SERVICE_ADVANCED_CODEC_HD_DIGITAL_TELEVISION", "25"),
+    ("(gint) GST_DVB_SERVICE_ADVANCED_CODEC_HD_NVOD_REFERENCE", "27"),
+    ("(gint) GST_DVB_SERVICE_ADVANCED_CODEC_HD_NVOD_TIME_SHIFTED", "26"),
+    ("(gint) GST_DVB_SERVICE_ADVANCED_CODEC_MOSAIC", "11"),
+    ("(gint) GST_DVB_SERVICE_ADVANCED_CODEC_SD_DIGITAL_TELEVISION", "22"),
+    ("(gint) GST_DVB_SERVICE_ADVANCED_CODEC_SD_NVOD_REFERENCE", "24"),
+    ("(gint) GST_DVB_SERVICE_ADVANCED_CODEC_SD_NVOD_TIME_SHIFTED", "23"),
+    ("(gint) GST_DVB_SERVICE_ADVANCED_CODEC_STEREO_HD_DIGITAL_TELEVISION", "28"),
+    ("(gint) GST_DVB_SERVICE_ADVANCED_CODEC_STEREO_HD_NVOD_REFERENCE", "30"),
+    ("(gint) GST_DVB_SERVICE_ADVANCED_CODEC_STEREO_HD_NVOD_TIME_SHIFTED", "29"),
+    ("(gint) GST_DVB_SERVICE_DATA_BROADCAST", "12"),
+    ("(gint) GST_DVB_SERVICE_DIGITAL_RADIO_SOUND", "2"),
+    ("(gint) GST_DVB_SERVICE_DIGITAL_TELEVISION", "1"),
+    ("(gint) GST_DVB_SERVICE_DVB_MHP", "16"),
+    ("(gint) GST_DVB_SERVICE_DVB_SRM", "8"),
+    ("(gint) GST_DVB_SERVICE_FM_RADIO", "7"),
+    ("(gint) GST_DVB_SERVICE_MOSAIC", "6"),
+    ("(gint) GST_DVB_SERVICE_MPEG2_HD_DIGITAL_TELEVISION", "17"),
+    ("(gint) GST_DVB_SERVICE_NVOD_REFERENCE", "4"),
+    ("(gint) GST_DVB_SERVICE_NVOD_TIME_SHIFTED", "5"),
+    ("(gint) GST_DVB_SERVICE_RCS_FLS", "15"),
+    ("(gint) GST_DVB_SERVICE_RCS_MAP", "14"),
+    ("(gint) GST_DVB_SERVICE_RESERVED_00", "0"),
+    ("(gint) GST_DVB_SERVICE_RESERVED_09", "9"),
+    ("(gint) GST_DVB_SERVICE_RESERVED_0D_COMMON_INTERFACE", "13"),
+    ("(gint) GST_DVB_SERVICE_RESERVED_FF", "31"),
+    ("(gint) GST_DVB_SERVICE_TELETEXT", "3"),
+    ("(gint) GST_MPEGTS_ATSC_MGT_TABLE_TYPE_EIT0", "256"),
+    ("(gint) GST_MPEGTS_ATSC_MGT_TABLE_TYPE_EIT127", "383"),
+    ("(gint) GST_MPEGTS_ATSC_MGT_TABLE_TYPE_ETT0", "512"),
+    ("(gint) GST_MPEGTS_ATSC_MGT_TABLE_TYPE_ETT127", "639"),
+    ("(gint) GST_MPEGTS_AUDIO_TYPE_CLEAN_EFFECTS", "1"),
+    ("(gint) GST_MPEGTS_AUDIO_TYPE_HEARING_IMPAIRED", "2"),
+    ("(gint) GST_MPEGTS_AUDIO_TYPE_UNDEFINED", "0"),
+    ("(gint) GST_MPEGTS_AUDIO_TYPE_VISUAL_IMPAIRED_COMMENTARY", "3"),
+    ("(gint) GST_MPEGTS_CABLE_OUTER_FEC_NONE", "1"),
+    ("(gint) GST_MPEGTS_CABLE_OUTER_FEC_RS_204_188", "2"),
+    ("(gint) GST_MPEGTS_CABLE_OUTER_FEC_UNDEFINED", "0"),
+    ("(gint) GST_MPEGTS_CONTENT_ARTS_CULTURE", "7"),
+    ("(gint) GST_MPEGTS_CONTENT_CHILDREN_YOUTH_PROGRAM", "5"),
+    ("(gint) GST_MPEGTS_CONTENT_EDUCATION_SCIENCE_FACTUAL", "9"),
+    ("(gint) GST_MPEGTS_CONTENT_LEISURE_HOBBIES", "10"),
+    ("(gint) GST_MPEGTS_CONTENT_MOVIE_DRAMA", "1"),
+    ("(gint) GST_MPEGTS_CONTENT_MUSIC_BALLET_DANCE", "6"),
+    ("(gint) GST_MPEGTS_CONTENT_NEWS_CURRENT_AFFAIRS", "2"),
+    ("(gint) GST_MPEGTS_CONTENT_SHOW_GAME_SHOW", "3"),
+    ("(gint) GST_MPEGTS_CONTENT_SOCIAL_POLITICAL_ECONOMICS", "8"),
+    ("(gint) GST_MPEGTS_CONTENT_SPECIAL_CHARACTERISTICS", "11"),
+    ("(gint) GST_MPEGTS_CONTENT_SPORTS", "4"),
+    ("(gint) GST_MPEGTS_DVB_LINKAGE_CA_REPLACEMENT", "3"),
+    ("(gint) GST_MPEGTS_DVB_LINKAGE_DATA_BROADCAST", "6"),
+    ("(gint) GST_MPEGTS_DVB_LINKAGE_EPG", "2"),
+    ("(gint) GST_MPEGTS_DVB_LINKAGE_EVENT", "13"),
+    ("(gint) GST_MPEGTS_DVB_LINKAGE_EXTENDED_EVENT", "14"),
+    ("(gint) GST_MPEGTS_DVB_LINKAGE_HAND_OVER_ASSOCIATED", "3"),
+    ("(gint) GST_MPEGTS_DVB_LINKAGE_HAND_OVER_IDENTICAL", "1"),
+    ("(gint) GST_MPEGTS_DVB_LINKAGE_HAND_OVER_LOCAL_VARIATION", "2"),
+    ("(gint) GST_MPEGTS_DVB_LINKAGE_HAND_OVER_RESERVED", "0"),
+    ("(gint) GST_MPEGTS_DVB_LINKAGE_INFORMATION", "1"),
+    ("(gint) GST_MPEGTS_DVB_LINKAGE_IP_MAC_NOTIFICATION", "11"),
+    ("(gint) GST_MPEGTS_DVB_LINKAGE_MOBILE_HAND_OVER", "8"),
+    ("(gint) GST_MPEGTS_DVB_LINKAGE_RCS_MAP", "7"),
+    ("(gint) GST_MPEGTS_DVB_LINKAGE_RESERVED_00", "0"),
+    ("(gint) GST_MPEGTS_DVB_LINKAGE_SERVICE_REPLACEMENT", "5"),
+    ("(gint) GST_MPEGTS_DVB_LINKAGE_SYSTEM_SOFTWARE_UPDATE", "9"),
+    ("(gint) GST_MPEGTS_DVB_LINKAGE_TS_CONTAINING_COMPLETE_SI", "4"),
+    ("(gint) GST_MPEGTS_DVB_LINKAGE_TS_CONTAINING_INT", "12"),
+    ("(gint) GST_MPEGTS_DVB_LINKAGE_TS_CONTAINING_SSU", "10"),
+    ("(gint) GST_MPEGTS_DVB_SCRAMBLING_MODE_ATIS_0", "112"),
+    ("(gint) GST_MPEGTS_DVB_SCRAMBLING_MODE_ATIS_F", "127"),
+    ("(gint) GST_MPEGTS_DVB_SCRAMBLING_MODE_CISSA", "16"),
+    ("(gint) GST_MPEGTS_DVB_SCRAMBLING_MODE_CSA1", "1"),
+    ("(gint) GST_MPEGTS_DVB_SCRAMBLING_MODE_CSA2", "2"),
+    ("(gint) GST_MPEGTS_DVB_SCRAMBLING_MODE_CSA3_FULL_ENHANCED", "5"),
+    ("(gint) GST_MPEGTS_DVB_SCRAMBLING_MODE_CSA3_MINIMAL_ENHANCED", "4"),
+    ("(gint) GST_MPEGTS_DVB_SCRAMBLING_MODE_CSA3_STANDARD", "3"),
+    ("(gint) GST_MPEGTS_DVB_SCRAMBLING_MODE_RESERVED", "0"),
+    ("(gint) GST_MPEGTS_FEC_1_2", "1"),
+    ("(gint) GST_MPEGTS_FEC_2_3", "2"),
+    ("(gint) GST_MPEGTS_FEC_2_5", "12"),
+    ("(gint) GST_MPEGTS_FEC_3_4", "3"),
+    ("(gint) GST_MPEGTS_FEC_3_5", "10"),
+    ("(gint) GST_MPEGTS_FEC_4_5", "4"),
+    ("(gint) GST_MPEGTS_FEC_5_6", "5"),
+    ("(gint) GST_MPEGTS_FEC_6_7", "6"),
+    ("(gint) GST_MPEGTS_FEC_7_8", "7"),
+    ("(gint) GST_MPEGTS_FEC_8_9", "8"),
+    ("(gint) GST_MPEGTS_FEC_9_10", "11"),
+    ("(gint) GST_MPEGTS_FEC_AUTO", "9"),
+    ("(gint) GST_MPEGTS_FEC_NONE", "0"),
+    ("(gint) GST_MPEGTS_GUARD_INTERVAL_19_128", "6"),
+    ("(gint) GST_MPEGTS_GUARD_INTERVAL_19_256", "7"),
+    ("(gint) GST_MPEGTS_GUARD_INTERVAL_1_128", "5"),
+    ("(gint) GST_MPEGTS_GUARD_INTERVAL_1_16", "1"),
+    ("(gint) GST_MPEGTS_GUARD_INTERVAL_1_32", "0"),
+    ("(gint) GST_MPEGTS_GUARD_INTERVAL_1_4", "3"),
+    ("(gint) GST_MPEGTS_GUARD_INTERVAL_1_8", "2"),
+    ("(gint) GST_MPEGTS_GUARD_INTERVAL_AUTO", "4"),
+    ("(gint) GST_MPEGTS_GUARD_INTERVAL_PN420", "8"),
+    ("(gint) GST_MPEGTS_GUARD_INTERVAL_PN595", "9"),
+    ("(gint) GST_MPEGTS_GUARD_INTERVAL_PN945", "10"),
+    ("(gint) GST_MPEGTS_HIERARCHY_1", "1"),
+    ("(gint) GST_MPEGTS_HIERARCHY_2", "2"),
+    ("(gint) GST_MPEGTS_HIERARCHY_4", "3"),
+    ("(gint) GST_MPEGTS_HIERARCHY_AUTO", "4"),
+    ("(gint) GST_MPEGTS_HIERARCHY_NONE", "0"),
+    ("(gint) GST_MPEGTS_MODULATION_APSK_16", "10"),
+    ("(gint) GST_MPEGTS_MODULATION_APSK_32", "11"),
+    ("(gint) GST_MPEGTS_MODULATION_DQPSK", "12"),
+    ("(gint) GST_MPEGTS_MODULATION_NONE", "14"),
+    ("(gint) GST_MPEGTS_MODULATION_PSK_8", "9"),
+    ("(gint) GST_MPEGTS_MODULATION_QAM_128", "4"),
+    ("(gint) GST_MPEGTS_MODULATION_QAM_16", "1"),
+    ("(gint) GST_MPEGTS_MODULATION_QAM_256", "5"),
+    ("(gint) GST_MPEGTS_MODULATION_QAM_32", "2"),
+    ("(gint) GST_MPEGTS_MODULATION_QAM_4_NR_", "13"),
+    ("(gint) GST_MPEGTS_MODULATION_QAM_64", "3"),
+    ("(gint) GST_MPEGTS_MODULATION_QAM_AUTO", "6"),
+    ("(gint) GST_MPEGTS_MODULATION_QPSK", "0"),
+    ("(gint) GST_MPEGTS_MODULATION_VSB_16", "8"),
+    ("(gint) GST_MPEGTS_MODULATION_VSB_8", "7"),
+    ("(gint) GST_MPEGTS_POLARIZATION_CIRCULAR_LEFT", "2"),
+    ("(gint) GST_MPEGTS_POLARIZATION_CIRCULAR_RIGHT", "3"),
+    ("(gint) GST_MPEGTS_POLARIZATION_LINEAR_HORIZONTAL", "0"),
+    ("(gint) GST_MPEGTS_POLARIZATION_LINEAR_VERTICAL", "1"),
+    ("(gint) GST_MPEGTS_ROLLOFF_20", "1"),
+    ("(gint) GST_MPEGTS_ROLLOFF_25", "2"),
+    ("(gint) GST_MPEGTS_ROLLOFF_35", "0"),
+    ("(gint) GST_MPEGTS_ROLLOFF_AUTO", "4"),
+    ("(gint) GST_MPEGTS_ROLLOFF_RESERVED", "3"),
+    ("(gint) GST_MPEGTS_RUNNING_STATUS_NOT_RUNNING", "1"),
+    ("(gint) GST_MPEGTS_RUNNING_STATUS_OFF_AIR", "5"),
+    ("(gint) GST_MPEGTS_RUNNING_STATUS_PAUSING", "3"),
+    ("(gint) GST_MPEGTS_RUNNING_STATUS_RUNNING", "4"),
+    ("(gint) GST_MPEGTS_RUNNING_STATUS_STARTS_IN_FEW_SECONDS", "2"),
+    ("(gint) GST_MPEGTS_RUNNING_STATUS_UNDEFINED", "0"),
+    ("(gint) GST_MPEGTS_SECTION_ATSC_CVCT", "12"),
+    ("(gint) GST_MPEGTS_SECTION_ATSC_EIT", "15"),
+    ("(gint) GST_MPEGTS_SECTION_ATSC_ETT", "14"),
+    ("(gint) GST_MPEGTS_SECTION_ATSC_MGT", "13"),
+    ("(gint) GST_MPEGTS_SECTION_ATSC_STT", "16"),
+    ("(gint) GST_MPEGTS_SECTION_ATSC_TVCT", "11"),
+    ("(gint) GST_MPEGTS_SECTION_BAT", "7"),
+    ("(gint) GST_MPEGTS_SECTION_CAT", "3"),
+    ("(gint) GST_MPEGTS_SECTION_EIT", "5"),
+    ("(gint) GST_MPEGTS_SECTION_NIT", "6"),
+    ("(gint) GST_MPEGTS_SECTION_PAT", "1"),
+    ("(gint) GST_MPEGTS_SECTION_PMT", "2"),
+    ("(gint) GST_MPEGTS_SECTION_SDT", "8"),
+    ("(gint) GST_MPEGTS_SECTION_TDT", "9"),
+    ("(gint) GST_MPEGTS_SECTION_TOT", "10"),
+    ("(gint) GST_MPEGTS_SECTION_TSDT", "4"),
+    ("(gint) GST_MPEGTS_SECTION_UNKNOWN", "0"),
+    ("(gint) GST_MPEGTS_STREAM_CONTENT_AAC", "6"),
+    ("(gint) GST_MPEGTS_STREAM_CONTENT_AC_3", "4"),
+    ("(gint) GST_MPEGTS_STREAM_CONTENT_AVC", "5"),
+    ("(gint) GST_MPEGTS_STREAM_CONTENT_DTS", "7"),
+    ("(gint) GST_MPEGTS_STREAM_CONTENT_MPEG1_LAYER2_AUDIO", "2"),
+    ("(gint) GST_MPEGTS_STREAM_CONTENT_MPEG2_VIDEO", "1"),
+    ("(gint) GST_MPEGTS_STREAM_CONTENT_SRM_CPCM", "8"),
+    ("(gint) GST_MPEGTS_STREAM_CONTENT_TELETEXT_OR_SUBTITLE", "3"),
+    ("(gint) GST_MPEGTS_STREAM_TYPE_AUDIO_AAC_ADTS", "15"),
+    ("(gint) GST_MPEGTS_STREAM_TYPE_AUDIO_AAC_CLEAN", "28"),
+    ("(gint) GST_MPEGTS_STREAM_TYPE_AUDIO_AAC_LATM", "17"),
+    ("(gint) GST_MPEGTS_STREAM_TYPE_AUDIO_MPEG1", "3"),
+    ("(gint) GST_MPEGTS_STREAM_TYPE_AUDIO_MPEG2", "4"),
+    ("(gint) GST_MPEGTS_STREAM_TYPE_AUXILIARY", "14"),
+    ("(gint) GST_MPEGTS_STREAM_TYPE_DSMCC_A", "10"),
+    ("(gint) GST_MPEGTS_STREAM_TYPE_DSMCC_B", "11"),
+    ("(gint) GST_MPEGTS_STREAM_TYPE_DSMCC_C", "12"),
+    ("(gint) GST_MPEGTS_STREAM_TYPE_DSMCC_D", "13"),
+    ("(gint) GST_MPEGTS_STREAM_TYPE_DSM_CC", "8"),
+    ("(gint) GST_MPEGTS_STREAM_TYPE_H_222_1", "9"),
+    ("(gint) GST_MPEGTS_STREAM_TYPE_IPMP_STREAM", "127"),
+    ("(gint) GST_MPEGTS_STREAM_TYPE_METADATA_DATA_CAROUSEL", "23"),
+    ("(gint) GST_MPEGTS_STREAM_TYPE_METADATA_OBJECT_CAROUSEL", "24"),
+    ("(gint) GST_MPEGTS_STREAM_TYPE_METADATA_PES_PACKETS", "21"),
+    ("(gint) GST_MPEGTS_STREAM_TYPE_METADATA_SECTIONS", "22"),
+    ("(gint) GST_MPEGTS_STREAM_TYPE_METADATA_SYNCHRONIZED_DOWNLOAD", "25"),
+    ("(gint) GST_MPEGTS_STREAM_TYPE_MHEG", "7"),
+    ("(gint) GST_MPEGTS_STREAM_TYPE_MPEG2_IPMP", "26"),
+    ("(gint) GST_MPEGTS_STREAM_TYPE_MPEG4_TIMED_TEXT", "29"),
+    ("(gint) GST_MPEGTS_STREAM_TYPE_PRIVATE_PES_PACKETS", "6"),
+    ("(gint) GST_MPEGTS_STREAM_TYPE_PRIVATE_SECTIONS", "5"),
+    ("(gint) GST_MPEGTS_STREAM_TYPE_RESERVED_00", "0"),
+    ("(gint) GST_MPEGTS_STREAM_TYPE_SCTE_ASYNC_DATA", "195"),
+    ("(gint) GST_MPEGTS_STREAM_TYPE_SCTE_DSMCC_DCB", "176"),
+    ("(gint) GST_MPEGTS_STREAM_TYPE_SCTE_DST_NRT", "149"),
+    ("(gint) GST_MPEGTS_STREAM_TYPE_SCTE_ISOCH_DATA", "131"),
+    ("(gint) GST_MPEGTS_STREAM_TYPE_SCTE_SIGNALING", "192"),
+    ("(gint) GST_MPEGTS_STREAM_TYPE_SCTE_SUBTITLING", "130"),
+    ("(gint) GST_MPEGTS_STREAM_TYPE_SCTE_SYNC_DATA", "194"),
+    ("(gint) GST_MPEGTS_STREAM_TYPE_SL_FLEXMUX_PES_PACKETS", "18"),
+    ("(gint) GST_MPEGTS_STREAM_TYPE_SL_FLEXMUX_SECTIONS", "19"),
+    ("(gint) GST_MPEGTS_STREAM_TYPE_SYNCHRONIZED_DOWNLOAD", "20"),
+    ("(gint) GST_MPEGTS_STREAM_TYPE_VIDEO_H264", "27"),
+    ("(gint) GST_MPEGTS_STREAM_TYPE_VIDEO_H264_MVC_SUB_BITSTREAM", "32"),
+    ("(gint) GST_MPEGTS_STREAM_TYPE_VIDEO_H264_STEREO_ADDITIONAL_VIEW", "35"),
+    ("(gint) GST_MPEGTS_STREAM_TYPE_VIDEO_H264_SVC_SUB_BITSTREAM", "31"),
+    ("(gint) GST_MPEGTS_STREAM_TYPE_VIDEO_HEVC", "36"),
+    ("(gint) GST_MPEGTS_STREAM_TYPE_VIDEO_JP2K", "33"),
+    ("(gint) GST_MPEGTS_STREAM_TYPE_VIDEO_MPEG1", "1"),
+    ("(gint) GST_MPEGTS_STREAM_TYPE_VIDEO_MPEG2", "2"),
+    ("(gint) GST_MPEGTS_STREAM_TYPE_VIDEO_MPEG2_STEREO_ADDITIONAL_VIEW", "34"),
+    ("(gint) GST_MPEGTS_STREAM_TYPE_VIDEO_MPEG4", "16"),
+    ("(gint) GST_MPEGTS_STREAM_TYPE_VIDEO_RVC", "30"),
+    ("(gint) GST_MPEGTS_TRANSMISSION_MODE_16K", "5"),
+    ("(gint) GST_MPEGTS_TRANSMISSION_MODE_1K", "4"),
+    ("(gint) GST_MPEGTS_TRANSMISSION_MODE_2K", "0"),
+    ("(gint) GST_MPEGTS_TRANSMISSION_MODE_32K", "6"),
+    ("(gint) GST_MPEGTS_TRANSMISSION_MODE_4K", "3"),
+    ("(gint) GST_MPEGTS_TRANSMISSION_MODE_8K", "1"),
+    ("(gint) GST_MPEGTS_TRANSMISSION_MODE_AUTO", "2"),
+    ("(gint) GST_MPEGTS_TRANSMISSION_MODE_C1", "7"),
+    ("(gint) GST_MPEGTS_TRANSMISSION_MODE_C3780", "8"),
+    ("(gint) GST_MTS_DESC_AC3_AUDIO_STREAM", "129"),
+    ("(gint) GST_MTS_DESC_ATSC_AC3", "131"),
+    ("(gint) GST_MTS_DESC_ATSC_CAPTION_SERVICE", "134"),
+    ("(gint) GST_MTS_DESC_ATSC_COMPONENT_NAME", "163"),
+    ("(gint) GST_MTS_DESC_ATSC_CONTENT_ADVISORY", "135"),
+    ("(gint) GST_MTS_DESC_ATSC_CRC32", "181"),
+    ("(gint) GST_MTS_DESC_ATSC_DATA_SERVICE", "164"),
+    ("(gint) GST_MTS_DESC_ATSC_DCC_ARRIVING_REQUEST", "169"),
+    ("(gint) GST_MTS_DESC_ATSC_DCC_DEPARTING_REQUEST", "168"),
+    ("(gint) GST_MTS_DESC_ATSC_DOWNLOAD_DESCRIPTOR", "166"),
+    ("(gint) GST_MTS_DESC_ATSC_EAC3", "204"),
+    ("(gint) GST_MTS_DESC_ATSC_ENHANCED_SIGNALING", "178"),
+    ("(gint) GST_MTS_DESC_ATSC_EXTENDED_CHANNEL_NAME", "160"),
+    ("(gint) GST_MTS_DESC_ATSC_GENRE", "171"),
+    ("(gint) GST_MTS_DESC_ATSC_GROUP_LINK", "184"),
+    ("(gint) GST_MTS_DESC_ATSC_MODULE_LINK", "180"),
+    ("(gint) GST_MTS_DESC_ATSC_MULTIPROTOCOL_ENCAPSULATION", "167"),
+    ("(gint) GST_MTS_DESC_ATSC_PID_COUNT", "165"),
+    ("(gint) GST_MTS_DESC_ATSC_PRIVATE_INFORMATION", "173"),
+    ("(gint) GST_MTS_DESC_ATSC_REDISTRIBUTION_CONTROL", "170"),
+    ("(gint) GST_MTS_DESC_ATSC_SERVICE_LOCATION", "161"),
+    ("(gint) GST_MTS_DESC_ATSC_STUFFING", "128"),
+    ("(gint) GST_MTS_DESC_ATSC_TIME_SHIFTED_SERVICE", "162"),
+    ("(gint) GST_MTS_DESC_AUDIO_STREAM", "3"),
+    ("(gint) GST_MTS_DESC_AUXILIARY_VIDEO_STREAM", "47"),
+    ("(gint) GST_MTS_DESC_AVC_TIMING_AND_HRD", "42"),
+    ("(gint) GST_MTS_DESC_AVC_VIDEO", "40"),
+    ("(gint) GST_MTS_DESC_CA", "9"),
+    ("(gint) GST_MTS_DESC_CONTENT_LABELING", "36"),
+    ("(gint) GST_MTS_DESC_COPYRIGHT", "13"),
+    ("(gint) GST_MTS_DESC_DATA_STREAM_ALIGNMENT", "6"),
+    ("(gint) GST_MTS_DESC_DSMCC_ASSOCIATION_TAG", "20"),
+    ("(gint) GST_MTS_DESC_DSMCC_CAROUSEL_IDENTIFIER", "19"),
+    ("(gint) GST_MTS_DESC_DSMCC_DEFERRED_ASSOCIATION_TAG", "21"),
+    ("(gint) GST_MTS_DESC_DSMCC_NPT_ENDPOINT", "24"),
+    ("(gint) GST_MTS_DESC_DSMCC_NPT_REFERENCE", "23"),
+    ("(gint) GST_MTS_DESC_DSMCC_STREAM_EVENT", "26"),
+    ("(gint) GST_MTS_DESC_DSMCC_STREAM_MODE", "25"),
+    ("(gint) GST_MTS_DESC_DTG_LOGICAL_CHANNEL", "131"),
+    ("(gint) GST_MTS_DESC_DVB_AAC", "124"),
+    ("(gint) GST_MTS_DESC_DVB_AC3", "106"),
+    ("(gint) GST_MTS_DESC_DVB_ADAPTATION_FIELD_DATA", "112"),
+    ("(gint) GST_MTS_DESC_DVB_ANCILLARY_DATA", "107"),
+    ("(gint) GST_MTS_DESC_DVB_ANNOUNCEMENT_SUPPORT", "110"),
+    ("(gint) GST_MTS_DESC_DVB_APPLICATION_SIGNALLING", "111"),
+    ("(gint) GST_MTS_DESC_DVB_BOUQUET_NAME", "71"),
+    ("(gint) GST_MTS_DESC_DVB_CABLE_DELIVERY_SYSTEM", "68"),
+    ("(gint) GST_MTS_DESC_DVB_CA_IDENTIFIER", "83"),
+    ("(gint) GST_MTS_DESC_DVB_CELL_FREQUENCY_LINK", "109"),
+    ("(gint) GST_MTS_DESC_DVB_CELL_LIST", "108"),
+    ("(gint) GST_MTS_DESC_DVB_COMPONENT", "80"),
+    ("(gint) GST_MTS_DESC_DVB_CONTENT", "84"),
+    ("(gint) GST_MTS_DESC_DVB_CONTENT_IDENTIFIER", "118"),
+    ("(gint) GST_MTS_DESC_DVB_COUNTRY_AVAILABILITY", "73"),
+    ("(gint) GST_MTS_DESC_DVB_DATA_BROADCAST", "100"),
+    ("(gint) GST_MTS_DESC_DVB_DATA_BROADCAST_ID", "102"),
+    ("(gint) GST_MTS_DESC_DVB_DEFAULT_AUTHORITY", "115"),
+    ("(gint) GST_MTS_DESC_DVB_DSNG", "104"),
+    ("(gint) GST_MTS_DESC_DVB_DTS", "123"),
+    ("(gint) GST_MTS_DESC_DVB_ECM_REPETITION_RATE", "120"),
+    ("(gint) GST_MTS_DESC_DVB_ENHANCED_AC3", "122"),
+    ("(gint) GST_MTS_DESC_DVB_EXTENDED_EVENT", "78"),
+    ("(gint) GST_MTS_DESC_DVB_EXTENSION", "127"),
+    ("(gint) GST_MTS_DESC_DVB_FREQUENCY_LIST", "98"),
+    ("(gint) GST_MTS_DESC_DVB_FTA_CONTENT_MANAGEMENT", "126"),
+    ("(gint) GST_MTS_DESC_DVB_LINKAGE", "74"),
+    ("(gint) GST_MTS_DESC_DVB_LOCAL_TIME_OFFSET", "88"),
+    ("(gint) GST_MTS_DESC_DVB_MOSAIC", "81"),
+    ("(gint) GST_MTS_DESC_DVB_MULTILINGUAL_BOUQUET_NAME", "92"),
+    ("(gint) GST_MTS_DESC_DVB_MULTILINGUAL_COMPONENT", "94"),
+    ("(gint) GST_MTS_DESC_DVB_MULTILINGUAL_NETWORK_NAME", "91"),
+    ("(gint) GST_MTS_DESC_DVB_MULTILINGUAL_SERVICE_NAME", "93"),
+    ("(gint) GST_MTS_DESC_DVB_NETWORK_NAME", "64"),
+    ("(gint) GST_MTS_DESC_DVB_NVOD_REFERENCE", "75"),
+    ("(gint) GST_MTS_DESC_DVB_PARENTAL_RATING", "85"),
+    ("(gint) GST_MTS_DESC_DVB_PARTIAL_TRANSPORT_STREAM", "99"),
+    ("(gint) GST_MTS_DESC_DVB_PDC", "105"),
+    ("(gint) GST_MTS_DESC_DVB_PRIVATE_DATA_SPECIFIER", "95"),
+    ("(gint) GST_MTS_DESC_DVB_RELATED_CONTENT", "116"),
+    ("(gint) GST_MTS_DESC_DVB_S2_SATELLITE_DELIVERY_SYSTEM", "121"),
+    ("(gint) GST_MTS_DESC_DVB_SATELLITE_DELIVERY_SYSTEM", "67"),
+    ("(gint) GST_MTS_DESC_DVB_SCRAMBLING", "101"),
+    ("(gint) GST_MTS_DESC_DVB_SERVICE", "72"),
+    ("(gint) GST_MTS_DESC_DVB_SERVICE_AVAILABILITY", "114"),
+    ("(gint) GST_MTS_DESC_DVB_SERVICE_IDENTIFIER", "113"),
+    ("(gint) GST_MTS_DESC_DVB_SERVICE_LIST", "65"),
+    ("(gint) GST_MTS_DESC_DVB_SERVICE_MOVE", "96"),
+    ("(gint) GST_MTS_DESC_DVB_SHORT_EVENT", "77"),
+    ("(gint) GST_MTS_DESC_DVB_SHORT_SMOOTHING_BUFFER", "97"),
+    ("(gint) GST_MTS_DESC_DVB_STREAM_IDENTIFIER", "82"),
+    ("(gint) GST_MTS_DESC_DVB_STUFFING", "66"),
+    ("(gint) GST_MTS_DESC_DVB_SUBTITLING", "89"),
+    ("(gint) GST_MTS_DESC_DVB_TELEPHONE", "87"),
+    ("(gint) GST_MTS_DESC_DVB_TELETEXT", "86"),
+    ("(gint) GST_MTS_DESC_DVB_TERRESTRIAL_DELIVERY_SYSTEM", "90"),
+    ("(gint) GST_MTS_DESC_DVB_TIMESLICE_FEC_IDENTIFIER", "119"),
+    ("(gint) GST_MTS_DESC_DVB_TIME_SHIFTED_EVENT", "79"),
+    ("(gint) GST_MTS_DESC_DVB_TIME_SHIFTED_SERVICE", "76"),
+    ("(gint) GST_MTS_DESC_DVB_TRANSPORT_STREAM", "103"),
+    ("(gint) GST_MTS_DESC_DVB_TVA_ID", "117"),
+    ("(gint) GST_MTS_DESC_DVB_VBI_DATA", "69"),
+    ("(gint) GST_MTS_DESC_DVB_VBI_TELETEXT", "70"),
+    ("(gint) GST_MTS_DESC_DVB_XAIT_LOCATION", "125"),
+    ("(gint) GST_MTS_DESC_EXTERNAL_ES_ID", "32"),
+    ("(gint) GST_MTS_DESC_EXT_DVB_C2_DELIVERY_SYSTEM", "13"),
+    ("(gint) GST_MTS_DESC_EXT_DVB_CP", "2"),
+    ("(gint) GST_MTS_DESC_EXT_DVB_CPCM_DELIVERY_SIGNALLING", "1"),
+    ("(gint) GST_MTS_DESC_EXT_DVB_CP_IDENTIFIER", "3"),
+    ("(gint) GST_MTS_DESC_EXT_DVB_DTS_HD_AUDIO_STREAM", "14"),
+    ("(gint) GST_MTS_DESC_EXT_DVB_DTS_NEUTRAL", "15"),
+    ("(gint) GST_MTS_DESC_EXT_DVB_IMAGE_ICON", "0"),
+    ("(gint) GST_MTS_DESC_EXT_DVB_MESSAGE", "8"),
+    ("(gint) GST_MTS_DESC_EXT_DVB_NETWORK_CHANGE_NOTIFY", "7"),
+    ("(gint) GST_MTS_DESC_EXT_DVB_SERVICE_RELOCATED", "11"),
+    ("(gint) GST_MTS_DESC_EXT_DVB_SH_DELIVERY_SYSTEM", "5"),
+    ("(gint) GST_MTS_DESC_EXT_DVB_SUPPLEMENTARY_AUDIO", "6"),
+    ("(gint) GST_MTS_DESC_EXT_DVB_T2MI", "17"),
+    ("(gint) GST_MTS_DESC_EXT_DVB_T2_DELIVERY_SYSTEM", "4"),
+    ("(gint) GST_MTS_DESC_EXT_DVB_TARGET_REGION", "9"),
+    ("(gint) GST_MTS_DESC_EXT_DVB_TARGET_REGION_NAME", "10"),
+    ("(gint) GST_MTS_DESC_EXT_DVB_URI_LINKAGE", "19"),
+    ("(gint) GST_MTS_DESC_EXT_DVB_VIDEO_DEPTH_RANGE", "16"),
+    ("(gint) GST_MTS_DESC_EXT_DVB_XAIT_PID", "12"),
+    ("(gint) GST_MTS_DESC_FLEX_MUX_TIMING", "44"),
+    ("(gint) GST_MTS_DESC_FMC", "31"),
+    ("(gint) GST_MTS_DESC_FMX_BUFFER_SIZE", "34"),
+    ("(gint) GST_MTS_DESC_HIERARCHY", "4"),
+    ("(gint) GST_MTS_DESC_IBP", "18"),
+    ("(gint) GST_MTS_DESC_IOD", "29"),
+    ("(gint) GST_MTS_DESC_IPMP", "41"),
+    ("(gint) GST_MTS_DESC_ISDB_AUDIO_COMPONENT", "196"),
+    ("(gint) GST_MTS_DESC_ISDB_BASIC_LOCAL_EVENT", "208"),
+    ("(gint) GST_MTS_DESC_ISDB_BOARD_INFORMATION", "219"),
+    ("(gint) GST_MTS_DESC_ISDB_BROADCASTER_NAME", "216"),
+    ("(gint) GST_MTS_DESC_ISDB_CA_CONTRACT_INFORMATION", "203"),
+    ("(gint) GST_MTS_DESC_ISDB_CA_EMM_TS", "202"),
+    ("(gint) GST_MTS_DESC_ISDB_CA_SERVICE", "204"),
+    ("(gint) GST_MTS_DESC_ISDB_COMPONENT_GROUP", "217"),
+    ("(gint) GST_MTS_DESC_ISDB_CONNECTED_TRANSMISSION", "221"),
+    ("(gint) GST_MTS_DESC_ISDB_CONTENT_AVAILABILITY", "222"),
+    ("(gint) GST_MTS_DESC_ISDB_DATA_CONTENT", "199"),
+    ("(gint) GST_MTS_DESC_ISDB_DIGITAL_COPY_CONTROL", "193"),
+    ("(gint) GST_MTS_DESC_ISDB_DOWNLOAD_CONTENT", "201"),
+    ("(gint) GST_MTS_DESC_ISDB_EVENT_GROUP", "214"),
+    ("(gint) GST_MTS_DESC_ISDB_EXTENDED_BROADCASTER", "206"),
+    ("(gint) GST_MTS_DESC_ISDB_HIERARCHICAL_TRANSMISSION", "192"),
+    ("(gint) GST_MTS_DESC_ISDB_HYPERLINK", "197"),
+    ("(gint) GST_MTS_DESC_ISDB_LDT_LINKAGE", "220"),
+    ("(gint) GST_MTS_DESC_ISDB_LOGO_TRANSMISSION", "207"),
+    ("(gint) GST_MTS_DESC_ISDB_NETWORK_IDENTIFICATION", "194"),
+    ("(gint) GST_MTS_DESC_ISDB_NODE_RELATION", "210"),
+    ("(gint) GST_MTS_DESC_ISDB_PARTIAL_TS_TIME", "195"),
+    ("(gint) GST_MTS_DESC_ISDB_REFERENCE", "209"),
+    ("(gint) GST_MTS_DESC_ISDB_SERIES", "213"),
+    ("(gint) GST_MTS_DESC_ISDB_SERVICE_GROUP", "224"),
+    ("(gint) GST_MTS_DESC_ISDB_SHORT_NODE_INFORMATION", "211"),
+    ("(gint) GST_MTS_DESC_ISDB_SI_PARAMETER", "215"),
+    ("(gint) GST_MTS_DESC_ISDB_SI_PRIME_TS", "218"),
+    ("(gint) GST_MTS_DESC_ISDB_STC_REFERENCE", "212"),
+    ("(gint) GST_MTS_DESC_ISDB_TARGET_REGION", "198"),
+    ("(gint) GST_MTS_DESC_ISDB_TS_INFORMATION", "205"),
+    ("(gint) GST_MTS_DESC_ISDB_VIDEO_DECODE_CONTROL", "200"),
+    ("(gint) GST_MTS_DESC_ISO_639_LANGUAGE", "10"),
+    ("(gint) GST_MTS_DESC_J2K_VIDEO", "50"),
+    ("(gint) GST_MTS_DESC_MAXIMUM_BITRATE", "14"),
+    ("(gint) GST_MTS_DESC_METADATA", "38"),
+    ("(gint) GST_MTS_DESC_METADATA_POINTER", "37"),
+    ("(gint) GST_MTS_DESC_METADATA_STD", "39"),
+    ("(gint) GST_MTS_DESC_MPEG2_AAC_AUDIO", "43"),
+    ("(gint) GST_MTS_DESC_MPEG2_STEREOSCOPIC_VIDEO_FORMAT", "52"),
+    ("(gint) GST_MTS_DESC_MPEG4_AUDIO", "28"),
+    ("(gint) GST_MTS_DESC_MPEG4_AUDIO_EXTENSION", "46"),
+    ("(gint) GST_MTS_DESC_MPEG4_TEXT", "45"),
+    ("(gint) GST_MTS_DESC_MPEG4_VIDEO", "27"),
+    ("(gint) GST_MTS_DESC_MULTIPLEX_BUFFER", "35"),
+    ("(gint) GST_MTS_DESC_MULTIPLEX_BUFFER_UTILISATION", "12"),
+    ("(gint) GST_MTS_DESC_MUX_CODE", "33"),
+    ("(gint) GST_MTS_DESC_MVC_EXTENSION", "49"),
+    ("(gint) GST_MTS_DESC_MVC_OPERATION_POINT", "51"),
+    ("(gint) GST_MTS_DESC_PRIVATE_DATA_INDICATOR", "15"),
+    ("(gint) GST_MTS_DESC_REGISTRATION", "5"),
+    ("(gint) GST_MTS_DESC_RESERVED_00", "0"),
+    ("(gint) GST_MTS_DESC_RESERVED_01", "1"),
+    ("(gint) GST_MTS_DESC_SL", "30"),
+    ("(gint) GST_MTS_DESC_SMOOTHING_BUFFER", "16"),
+    ("(gint) GST_MTS_DESC_STD", "17"),
+    ("(gint) GST_MTS_DESC_STEREOSCOPIC_PROGRAM_INFO", "53"),
+    ("(gint) GST_MTS_DESC_STEREOSCOPIC_VIDEO_INFO", "54"),
+    ("(gint) GST_MTS_DESC_SVC_EXTENSION", "48"),
+    ("(gint) GST_MTS_DESC_SYSTEM_CLOCK", "11"),
+    ("(gint) GST_MTS_DESC_TARGET_BACKGROUND_GRID", "7"),
+    ("(gint) GST_MTS_DESC_VIDEO_STREAM", "2"),
+    ("(gint) GST_MTS_DESC_VIDEO_WINDOW", "8"),
+    ("(gint) GST_MTS_TABLE_ID_14496_OBJET_DESCRIPTOR", "5"),
+    ("(gint) GST_MTS_TABLE_ID_14496_SCENE_DESCRIPTION", "4"),
+    ("(gint) GST_MTS_TABLE_ID_APPLICATION_INFORMATION_TABLE", "116"),
+    ("(gint) GST_MTS_TABLE_ID_ATSC_AGGREGATE_DATA_EVENT", "217"),
+    ("(gint) GST_MTS_TABLE_ID_ATSC_AGGREGATE_EVENT_INFORMATION", "214"),
+    ("(gint) GST_MTS_TABLE_ID_ATSC_AGGREGATE_EXTENDED_TEXT", "215"),
+    ("(gint) GST_MTS_TABLE_ID_ATSC_CABLE_VIRTUAL_CHANNEL", "201"),
+    ("(gint) GST_MTS_TABLE_ID_ATSC_CHANNEL_OR_EVENT_EXTENDED_TEXT", "204"),
+    ("(gint) GST_MTS_TABLE_ID_ATSC_DATA_EVENT", "206"),
+    ("(gint) GST_MTS_TABLE_ID_ATSC_DATA_SERVICE", "207"),
+    ("(gint) GST_MTS_TABLE_ID_ATSC_DIRECTED_CHANNEL_CHANGE", "211"),
+    ("(gint) GST_MTS_TABLE_ID_ATSC_DIRECTED_CHANNEL_CHANGE_SECTION_CODE", "212"),
+    ("(gint) GST_MTS_TABLE_ID_ATSC_EVENT_INFORMATION", "203"),
+    ("(gint) GST_MTS_TABLE_ID_ATSC_LONG_TERM_SERVICE", "210"),
+    ("(gint) GST_MTS_TABLE_ID_ATSC_MASTER_GUIDE", "199"),
+    ("(gint) GST_MTS_TABLE_ID_ATSC_NETWORK_RESOURCE", "209"),
+    ("(gint) GST_MTS_TABLE_ID_ATSC_RATING_REGION", "202"),
+    ("(gint) GST_MTS_TABLE_ID_ATSC_SATELLITE_VIRTUAL_CHANNEL", "218"),
+    ("(gint) GST_MTS_TABLE_ID_ATSC_SYSTEM_TIME", "205"),
+    ("(gint) GST_MTS_TABLE_ID_ATSC_TERRESTRIAL_VIRTUAL_CHANNEL", "200"),
+    ("(gint) GST_MTS_TABLE_ID_BOUQUET_ASSOCIATION", "74"),
+    ("(gint) GST_MTS_TABLE_ID_CA_MESSAGE_ECM_0", "128"),
+    ("(gint) GST_MTS_TABLE_ID_CA_MESSAGE_ECM_1", "129"),
+    ("(gint) GST_MTS_TABLE_ID_CA_MESSAGE_SYSTEM_PRIVATE_1", "130"),
+    ("(gint) GST_MTS_TABLE_ID_CA_MESSAGE_SYSTEM_PRIVATE_N", "143"),
+    ("(gint) GST_MTS_TABLE_ID_CMT", "164"),
+    ("(gint) GST_MTS_TABLE_ID_CONDITIONAL_ACCESS", "1"),
+    ("(gint) GST_MTS_TABLE_ID_CONTAINER", "117"),
+    ("(gint) GST_MTS_TABLE_ID_CONTENT_IDENTIFIER", "119"),
+    ("(gint) GST_MTS_TABLE_ID_DISCONTINUITY_INFORMATION", "126"),
+    ("(gint) GST_MTS_TABLE_ID_DSM_CC_ADDRESSABLE_SECTIONS", "63"),
+    ("(gint) GST_MTS_TABLE_ID_DSM_CC_DOWNLOAD_DATA_MESSAGES", "60"),
+    ("(gint) GST_MTS_TABLE_ID_DSM_CC_MULTIPROTO_ENCAPSULATED_DATA", "58"),
+    ("(gint) GST_MTS_TABLE_ID_DSM_CC_PRIVATE_DATA", "62"),
+    ("(gint) GST_MTS_TABLE_ID_DSM_CC_STREAM_DESCRIPTORS", "61"),
+    ("(gint) GST_MTS_TABLE_ID_DSM_CC_U_N_MESSAGES", "59"),
+    ("(gint) GST_MTS_TABLE_ID_EVENT_INFORMATION_ACTUAL_TS_PRESENT", "78"),
+    ("(gint) GST_MTS_TABLE_ID_EVENT_INFORMATION_ACTUAL_TS_SCHEDULE_1", "80"),
+    ("(gint) GST_MTS_TABLE_ID_EVENT_INFORMATION_ACTUAL_TS_SCHEDULE_N", "95"),
+    ("(gint) GST_MTS_TABLE_ID_EVENT_INFORMATION_OTHER_TS_PRESENT", "79"),
+    ("(gint) GST_MTS_TABLE_ID_EVENT_INFORMATION_OTHER_TS_SCHEDULE_1", "96"),
+    ("(gint) GST_MTS_TABLE_ID_EVENT_INFORMATION_OTHER_TS_SCHEDULE_N", "111"),
+    ("(gint) GST_MTS_TABLE_ID_FCT", "161"),
+    ("(gint) GST_MTS_TABLE_ID_IPMP_CONTROL_INFORMATION", "7"),
+    ("(gint) GST_MTS_TABLE_ID_LL_FEC_PARITY_DATA_TABLE", "177"),
+    ("(gint) GST_MTS_TABLE_ID_METADATA", "6"),
+    ("(gint) GST_MTS_TABLE_ID_MPE_FEC", "120"),
+    ("(gint) GST_MTS_TABLE_ID_MPE_IFEC", "122"),
+    ("(gint) GST_MTS_TABLE_ID_NETWORK_INFORMATION_ACTUAL_NETWORK", "64"),
+    ("(gint) GST_MTS_TABLE_ID_NETWORK_INFORMATION_OTHER_NETWORK", "65"),
+    ("(gint) GST_MTS_TABLE_ID_PCR_PACKET_PAYLOAD", "166"),
+    ("(gint) GST_MTS_TABLE_ID_PROGRAM_ASSOCIATION", "0"),
+    ("(gint) GST_MTS_TABLE_ID_RELATED_CONTENT", "118"),
+    ("(gint) GST_MTS_TABLE_ID_RESOLUTION_NOTIFICATION", "121"),
+    ("(gint) GST_MTS_TABLE_ID_RUNNING_STATUS", "113"),
+    ("(gint) GST_MTS_TABLE_ID_SCT", "160"),
+    ("(gint) GST_MTS_TABLE_ID_SCTE_DDB", "228"),
+    ("(gint) GST_MTS_TABLE_ID_SCTE_DII", "227"),
+    ("(gint) GST_MTS_TABLE_ID_SCTE_EAS", "216"),
+    ("(gint) GST_MTS_TABLE_ID_SCTE_EBIF", "224"),
+    ("(gint) GST_MTS_TABLE_ID_SCTE_EISS", "226"),
+    ("(gint) GST_MTS_TABLE_ID_SCTE_RESERVED", "225"),
+    ("(gint) GST_MTS_TABLE_ID_SCTE_SPLICE", "252"),
+    ("(gint) GST_MTS_TABLE_ID_SELECTION_INFORMATION", "127"),
+    ("(gint) GST_MTS_TABLE_ID_SERVICE_DESCRIPTION_ACTUAL_TS", "66"),
+    ("(gint) GST_MTS_TABLE_ID_SERVICE_DESCRIPTION_OTHER_TS", "70"),
+    ("(gint) GST_MTS_TABLE_ID_SPT", "163"),
+    ("(gint) GST_MTS_TABLE_ID_STUFFING", "114"),
+    ("(gint) GST_MTS_TABLE_ID_TBTP", "165"),
+    ("(gint) GST_MTS_TABLE_ID_TCT", "162"),
+    ("(gint) GST_MTS_TABLE_ID_TIM", "176"),
+    ("(gint) GST_MTS_TABLE_ID_TIME_DATE", "112"),
+    ("(gint) GST_MTS_TABLE_ID_TIME_OFFSET", "115"),
+    ("(gint) GST_MTS_TABLE_ID_TRANSMISSION_MODE_SUPPORT_PAYLOAD", "170"),
+    ("(gint) GST_MTS_TABLE_ID_TS_DESCRIPTION", "3"),
+    ("(gint) GST_MTS_TABLE_ID_TS_PROGRAM_MAP", "2"),
+    ("(gint) GST_MTS_TABLE_ID_UNSET", "255"),
+    ("(gint) HEARING_IMPAIRED_PAGE", "5"),
+    ("(gint) INITIAL_PAGE", "1"),
+    ("(gint) PROGRAMME_SCHEDULE_PAGE", "4"),
+    ("(gint) SUBTITLE_PAGE", "2"),
 ];
 
 
diff --git a/gstreamer-mpegts-sys/tests/constant.c b/gstreamer-mpegts-sys/tests/constant.c
index a167e0146..f54bce75c 100644
--- a/gstreamer-mpegts-sys/tests/constant.c
+++ b/gstreamer-mpegts-sys/tests/constant.c
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
@@ -7,21 +7,21 @@
 
 int main() {
     printf(_Generic((ABI_CONSTANT_NAME),
-                    char *: "%s",
-                    const char *: "%s",
-                    char: "%c",
-                    signed char: "%hhd",
-                    unsigned char: "%hhu",
-                    short int: "%hd",
-                    unsigned short int: "%hu",
-                    int: "%d",
-                    unsigned int: "%u",
-                    long: "%ld",
-                    unsigned long: "%lu",
-                    long long: "%lld",
-                    unsigned long long: "%llu",
-                    double: "%f",
-                    long double: "%ld"),
+                    char *: "###gir test###%s###gir test###\n",
+                    const char *: "###gir test###%s###gir test###\n",
+                    char: "###gir test###%c###gir test###\n",
+                    signed char: "###gir test###%hhd###gir test###\n",
+                    unsigned char: "###gir test###%hhu###gir test###\n",
+                    short int: "###gir test###%hd###gir test###\n",
+                    unsigned short int: "###gir test###%hu###gir test###\n",
+                    int: "###gir test###%d###gir test###\n",
+                    unsigned int: "###gir test###%u###gir test###\n",
+                    long: "###gir test###%ld###gir test###\n",
+                    unsigned long: "###gir test###%lu###gir test###\n",
+                    long long: "###gir test###%lld###gir test###\n",
+                    unsigned long long: "###gir test###%llu###gir test###\n",
+                    double: "###gir test###%f###gir test###\n",
+                    long double: "###gir test###%ld###gir test###\n"),
            ABI_CONSTANT_NAME);
     return 0;
 }
diff --git a/gstreamer-mpegts-sys/tests/layout.c b/gstreamer-mpegts-sys/tests/layout.c
index 829276260..aef10fc35 100644
--- a/gstreamer-mpegts-sys/tests/layout.c
+++ b/gstreamer-mpegts-sys/tests/layout.c
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
diff --git a/gstreamer-net-sys/src/lib.rs b/gstreamer-net-sys/src/lib.rs
index 474008ff0..4e4d66f91 100644
--- a/gstreamer-net-sys/src/lib.rs
+++ b/gstreamer-net-sys/src/lib.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
diff --git a/gstreamer-net-sys/tests/abi.rs b/gstreamer-net-sys/tests/abi.rs
index 9e70c30ec..386bc17a9 100644
--- a/gstreamer-net-sys/tests/abi.rs
+++ b/gstreamer-net-sys/tests/abi.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
@@ -227,7 +227,14 @@ fn get_c_value(dir: &Path, cc: &Compiler, name: &str) -> Result<String, Box<Erro
                            &abi_cmd, &output).into());
     }
 
-    Ok(str::from_utf8(&output.stdout)?.trim().to_owned())
+    let output = str::from_utf8(&output.stdout)?.trim();
+    if !output.starts_with("###gir test###") ||
+       !output.ends_with("###gir test###") {
+        return Err(format!("command {:?} return invalid output, {:?}",
+                           &abi_cmd, &output).into());
+    }
+
+    Ok(String::from(&output[14..(output.len() - 14)]))
 }
 
 const RUST_LAYOUTS: &[(&str, Layout)] = &[
diff --git a/gstreamer-net-sys/tests/constant.c b/gstreamer-net-sys/tests/constant.c
index a167e0146..f54bce75c 100644
--- a/gstreamer-net-sys/tests/constant.c
+++ b/gstreamer-net-sys/tests/constant.c
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
@@ -7,21 +7,21 @@
 
 int main() {
     printf(_Generic((ABI_CONSTANT_NAME),
-                    char *: "%s",
-                    const char *: "%s",
-                    char: "%c",
-                    signed char: "%hhd",
-                    unsigned char: "%hhu",
-                    short int: "%hd",
-                    unsigned short int: "%hu",
-                    int: "%d",
-                    unsigned int: "%u",
-                    long: "%ld",
-                    unsigned long: "%lu",
-                    long long: "%lld",
-                    unsigned long long: "%llu",
-                    double: "%f",
-                    long double: "%ld"),
+                    char *: "###gir test###%s###gir test###\n",
+                    const char *: "###gir test###%s###gir test###\n",
+                    char: "###gir test###%c###gir test###\n",
+                    signed char: "###gir test###%hhd###gir test###\n",
+                    unsigned char: "###gir test###%hhu###gir test###\n",
+                    short int: "###gir test###%hd###gir test###\n",
+                    unsigned short int: "###gir test###%hu###gir test###\n",
+                    int: "###gir test###%d###gir test###\n",
+                    unsigned int: "###gir test###%u###gir test###\n",
+                    long: "###gir test###%ld###gir test###\n",
+                    unsigned long: "###gir test###%lu###gir test###\n",
+                    long long: "###gir test###%lld###gir test###\n",
+                    unsigned long long: "###gir test###%llu###gir test###\n",
+                    double: "###gir test###%f###gir test###\n",
+                    long double: "###gir test###%ld###gir test###\n"),
            ABI_CONSTANT_NAME);
     return 0;
 }
diff --git a/gstreamer-net-sys/tests/layout.c b/gstreamer-net-sys/tests/layout.c
index 829276260..aef10fc35 100644
--- a/gstreamer-net-sys/tests/layout.c
+++ b/gstreamer-net-sys/tests/layout.c
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
diff --git a/gstreamer-pbutils-sys/src/lib.rs b/gstreamer-pbutils-sys/src/lib.rs
index 16559690a..d26f934c9 100644
--- a/gstreamer-pbutils-sys/src/lib.rs
+++ b/gstreamer-pbutils-sys/src/lib.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
diff --git a/gstreamer-pbutils-sys/tests/abi.rs b/gstreamer-pbutils-sys/tests/abi.rs
index ad72eb08f..8f9156ce8 100644
--- a/gstreamer-pbutils-sys/tests/abi.rs
+++ b/gstreamer-pbutils-sys/tests/abi.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
@@ -227,7 +227,14 @@ fn get_c_value(dir: &Path, cc: &Compiler, name: &str) -> Result<String, Box<Erro
                            &abi_cmd, &output).into());
     }
 
-    Ok(str::from_utf8(&output.stdout)?.trim().to_owned())
+    let output = str::from_utf8(&output.stdout)?.trim();
+    if !output.starts_with("###gir test###") ||
+       !output.ends_with("###gir test###") {
+        return Err(format!("command {:?} return invalid output, {:?}",
+                           &abi_cmd, &output).into());
+    }
+
+    Ok(String::from(&output[14..(output.len() - 14)]))
 }
 
 const RUST_LAYOUTS: &[(&str, Layout)] = &[
@@ -249,43 +256,43 @@ const RUST_LAYOUTS: &[(&str, Layout)] = &[
 ];
 
 const RUST_CONSTANTS: &[(&str, &str)] = &[
-    ("GST_AUDIO_VISUALIZER_SHADER_FADE", "1"),
-    ("GST_AUDIO_VISUALIZER_SHADER_FADE_AND_MOVE_DOWN", "3"),
-    ("GST_AUDIO_VISUALIZER_SHADER_FADE_AND_MOVE_HORIZ_IN", "7"),
-    ("GST_AUDIO_VISUALIZER_SHADER_FADE_AND_MOVE_HORIZ_OUT", "6"),
-    ("GST_AUDIO_VISUALIZER_SHADER_FADE_AND_MOVE_LEFT", "4"),
-    ("GST_AUDIO_VISUALIZER_SHADER_FADE_AND_MOVE_RIGHT", "5"),
-    ("GST_AUDIO_VISUALIZER_SHADER_FADE_AND_MOVE_UP", "2"),
-    ("GST_AUDIO_VISUALIZER_SHADER_FADE_AND_MOVE_VERT_IN", "9"),
-    ("GST_AUDIO_VISUALIZER_SHADER_FADE_AND_MOVE_VERT_OUT", "8"),
-    ("GST_AUDIO_VISUALIZER_SHADER_NONE", "0"),
-    ("GST_DISCOVERER_BUSY", "4"),
-    ("GST_DISCOVERER_ERROR", "2"),
-    ("GST_DISCOVERER_MISSING_PLUGINS", "5"),
-    ("GST_DISCOVERER_OK", "0"),
-    ("GST_DISCOVERER_SERIALIZE_ALL", "7"),
-    ("GST_DISCOVERER_SERIALIZE_BASIC", "0"),
-    ("GST_DISCOVERER_SERIALIZE_CAPS", "1"),
-    ("GST_DISCOVERER_SERIALIZE_MISC", "4"),
-    ("GST_DISCOVERER_SERIALIZE_TAGS", "2"),
-    ("GST_DISCOVERER_TIMEOUT", "3"),
-    ("GST_DISCOVERER_URI_INVALID", "1"),
+    ("(gint) GST_AUDIO_VISUALIZER_SHADER_FADE", "1"),
+    ("(gint) GST_AUDIO_VISUALIZER_SHADER_FADE_AND_MOVE_DOWN", "3"),
+    ("(gint) GST_AUDIO_VISUALIZER_SHADER_FADE_AND_MOVE_HORIZ_IN", "7"),
+    ("(gint) GST_AUDIO_VISUALIZER_SHADER_FADE_AND_MOVE_HORIZ_OUT", "6"),
+    ("(gint) GST_AUDIO_VISUALIZER_SHADER_FADE_AND_MOVE_LEFT", "4"),
+    ("(gint) GST_AUDIO_VISUALIZER_SHADER_FADE_AND_MOVE_RIGHT", "5"),
+    ("(gint) GST_AUDIO_VISUALIZER_SHADER_FADE_AND_MOVE_UP", "2"),
+    ("(gint) GST_AUDIO_VISUALIZER_SHADER_FADE_AND_MOVE_VERT_IN", "9"),
+    ("(gint) GST_AUDIO_VISUALIZER_SHADER_FADE_AND_MOVE_VERT_OUT", "8"),
+    ("(gint) GST_AUDIO_VISUALIZER_SHADER_NONE", "0"),
+    ("(gint) GST_DISCOVERER_BUSY", "4"),
+    ("(gint) GST_DISCOVERER_ERROR", "2"),
+    ("(gint) GST_DISCOVERER_MISSING_PLUGINS", "5"),
+    ("(gint) GST_DISCOVERER_OK", "0"),
+    ("(guint) GST_DISCOVERER_SERIALIZE_ALL", "7"),
+    ("(guint) GST_DISCOVERER_SERIALIZE_BASIC", "0"),
+    ("(guint) GST_DISCOVERER_SERIALIZE_CAPS", "1"),
+    ("(guint) GST_DISCOVERER_SERIALIZE_MISC", "4"),
+    ("(guint) GST_DISCOVERER_SERIALIZE_TAGS", "2"),
+    ("(gint) GST_DISCOVERER_TIMEOUT", "3"),
+    ("(gint) GST_DISCOVERER_URI_INVALID", "1"),
     ("GST_ENCODING_CATEGORY_CAPTURE", "capture"),
     ("GST_ENCODING_CATEGORY_DEVICE", "device"),
     ("GST_ENCODING_CATEGORY_FILE_EXTENSION", "file-extension"),
     ("GST_ENCODING_CATEGORY_ONLINE_SERVICE", "online-service"),
     ("GST_ENCODING_CATEGORY_STORAGE_EDITING", "storage-editing"),
-    ("GST_INSTALL_PLUGINS_CRASHED", "100"),
-    ("GST_INSTALL_PLUGINS_ERROR", "2"),
-    ("GST_INSTALL_PLUGINS_HELPER_MISSING", "202"),
-    ("GST_INSTALL_PLUGINS_INSTALL_IN_PROGRESS", "203"),
-    ("GST_INSTALL_PLUGINS_INTERNAL_FAILURE", "201"),
-    ("GST_INSTALL_PLUGINS_INVALID", "101"),
-    ("GST_INSTALL_PLUGINS_NOT_FOUND", "1"),
-    ("GST_INSTALL_PLUGINS_PARTIAL_SUCCESS", "3"),
-    ("GST_INSTALL_PLUGINS_STARTED_OK", "200"),
-    ("GST_INSTALL_PLUGINS_SUCCESS", "0"),
-    ("GST_INSTALL_PLUGINS_USER_ABORT", "4"),
+    ("(gint) GST_INSTALL_PLUGINS_CRASHED", "100"),
+    ("(gint) GST_INSTALL_PLUGINS_ERROR", "2"),
+    ("(gint) GST_INSTALL_PLUGINS_HELPER_MISSING", "202"),
+    ("(gint) GST_INSTALL_PLUGINS_INSTALL_IN_PROGRESS", "203"),
+    ("(gint) GST_INSTALL_PLUGINS_INTERNAL_FAILURE", "201"),
+    ("(gint) GST_INSTALL_PLUGINS_INVALID", "101"),
+    ("(gint) GST_INSTALL_PLUGINS_NOT_FOUND", "1"),
+    ("(gint) GST_INSTALL_PLUGINS_PARTIAL_SUCCESS", "3"),
+    ("(gint) GST_INSTALL_PLUGINS_STARTED_OK", "200"),
+    ("(gint) GST_INSTALL_PLUGINS_SUCCESS", "0"),
+    ("(gint) GST_INSTALL_PLUGINS_USER_ABORT", "4"),
 ];
 
 
diff --git a/gstreamer-pbutils-sys/tests/constant.c b/gstreamer-pbutils-sys/tests/constant.c
index a167e0146..f54bce75c 100644
--- a/gstreamer-pbutils-sys/tests/constant.c
+++ b/gstreamer-pbutils-sys/tests/constant.c
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
@@ -7,21 +7,21 @@
 
 int main() {
     printf(_Generic((ABI_CONSTANT_NAME),
-                    char *: "%s",
-                    const char *: "%s",
-                    char: "%c",
-                    signed char: "%hhd",
-                    unsigned char: "%hhu",
-                    short int: "%hd",
-                    unsigned short int: "%hu",
-                    int: "%d",
-                    unsigned int: "%u",
-                    long: "%ld",
-                    unsigned long: "%lu",
-                    long long: "%lld",
-                    unsigned long long: "%llu",
-                    double: "%f",
-                    long double: "%ld"),
+                    char *: "###gir test###%s###gir test###\n",
+                    const char *: "###gir test###%s###gir test###\n",
+                    char: "###gir test###%c###gir test###\n",
+                    signed char: "###gir test###%hhd###gir test###\n",
+                    unsigned char: "###gir test###%hhu###gir test###\n",
+                    short int: "###gir test###%hd###gir test###\n",
+                    unsigned short int: "###gir test###%hu###gir test###\n",
+                    int: "###gir test###%d###gir test###\n",
+                    unsigned int: "###gir test###%u###gir test###\n",
+                    long: "###gir test###%ld###gir test###\n",
+                    unsigned long: "###gir test###%lu###gir test###\n",
+                    long long: "###gir test###%lld###gir test###\n",
+                    unsigned long long: "###gir test###%llu###gir test###\n",
+                    double: "###gir test###%f###gir test###\n",
+                    long double: "###gir test###%ld###gir test###\n"),
            ABI_CONSTANT_NAME);
     return 0;
 }
diff --git a/gstreamer-pbutils-sys/tests/layout.c b/gstreamer-pbutils-sys/tests/layout.c
index 829276260..aef10fc35 100644
--- a/gstreamer-pbutils-sys/tests/layout.c
+++ b/gstreamer-pbutils-sys/tests/layout.c
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
diff --git a/gstreamer-player-sys/src/lib.rs b/gstreamer-player-sys/src/lib.rs
index 4d00e9b74..dfebbea86 100644
--- a/gstreamer-player-sys/src/lib.rs
+++ b/gstreamer-player-sys/src/lib.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
diff --git a/gstreamer-player-sys/tests/abi.rs b/gstreamer-player-sys/tests/abi.rs
index d848e00ec..fd1977136 100644
--- a/gstreamer-player-sys/tests/abi.rs
+++ b/gstreamer-player-sys/tests/abi.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
@@ -227,7 +227,14 @@ fn get_c_value(dir: &Path, cc: &Compiler, name: &str) -> Result<String, Box<Erro
                            &abi_cmd, &output).into());
     }
 
-    Ok(str::from_utf8(&output.stdout)?.trim().to_owned())
+    let output = str::from_utf8(&output.stdout)?.trim();
+    if !output.starts_with("###gir test###") ||
+       !output.ends_with("###gir test###") {
+        return Err(format!("command {:?} return invalid output, {:?}",
+                           &abi_cmd, &output).into());
+    }
+
+    Ok(String::from(&output[14..(output.len() - 14)]))
 }
 
 const RUST_LAYOUTS: &[(&str, Layout)] = &[
@@ -241,20 +248,20 @@ const RUST_LAYOUTS: &[(&str, Layout)] = &[
 ];
 
 const RUST_CONSTANTS: &[(&str, &str)] = &[
-    ("GST_PLAYER_COLOR_BALANCE_BRIGHTNESS", "0"),
-    ("GST_PLAYER_COLOR_BALANCE_CONTRAST", "1"),
-    ("GST_PLAYER_COLOR_BALANCE_HUE", "3"),
-    ("GST_PLAYER_COLOR_BALANCE_SATURATION", "2"),
-    ("GST_PLAYER_ERROR_FAILED", "0"),
-    ("GST_PLAYER_STATE_BUFFERING", "1"),
-    ("GST_PLAYER_STATE_PAUSED", "2"),
-    ("GST_PLAYER_STATE_PLAYING", "3"),
-    ("GST_PLAYER_STATE_STOPPED", "0"),
-    ("GST_PLAYER_THUMBNAIL_JPG", "3"),
-    ("GST_PLAYER_THUMBNAIL_PNG", "4"),
-    ("GST_PLAYER_THUMBNAIL_RAW_BGRx", "2"),
-    ("GST_PLAYER_THUMBNAIL_RAW_NATIVE", "0"),
-    ("GST_PLAYER_THUMBNAIL_RAW_xRGB", "1"),
+    ("(gint) GST_PLAYER_COLOR_BALANCE_BRIGHTNESS", "0"),
+    ("(gint) GST_PLAYER_COLOR_BALANCE_CONTRAST", "1"),
+    ("(gint) GST_PLAYER_COLOR_BALANCE_HUE", "3"),
+    ("(gint) GST_PLAYER_COLOR_BALANCE_SATURATION", "2"),
+    ("(gint) GST_PLAYER_ERROR_FAILED", "0"),
+    ("(gint) GST_PLAYER_STATE_BUFFERING", "1"),
+    ("(gint) GST_PLAYER_STATE_PAUSED", "2"),
+    ("(gint) GST_PLAYER_STATE_PLAYING", "3"),
+    ("(gint) GST_PLAYER_STATE_STOPPED", "0"),
+    ("(gint) GST_PLAYER_THUMBNAIL_JPG", "3"),
+    ("(gint) GST_PLAYER_THUMBNAIL_PNG", "4"),
+    ("(gint) GST_PLAYER_THUMBNAIL_RAW_BGRx", "2"),
+    ("(gint) GST_PLAYER_THUMBNAIL_RAW_NATIVE", "0"),
+    ("(gint) GST_PLAYER_THUMBNAIL_RAW_xRGB", "1"),
 ];
 
 
diff --git a/gstreamer-player-sys/tests/constant.c b/gstreamer-player-sys/tests/constant.c
index a167e0146..f54bce75c 100644
--- a/gstreamer-player-sys/tests/constant.c
+++ b/gstreamer-player-sys/tests/constant.c
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
@@ -7,21 +7,21 @@
 
 int main() {
     printf(_Generic((ABI_CONSTANT_NAME),
-                    char *: "%s",
-                    const char *: "%s",
-                    char: "%c",
-                    signed char: "%hhd",
-                    unsigned char: "%hhu",
-                    short int: "%hd",
-                    unsigned short int: "%hu",
-                    int: "%d",
-                    unsigned int: "%u",
-                    long: "%ld",
-                    unsigned long: "%lu",
-                    long long: "%lld",
-                    unsigned long long: "%llu",
-                    double: "%f",
-                    long double: "%ld"),
+                    char *: "###gir test###%s###gir test###\n",
+                    const char *: "###gir test###%s###gir test###\n",
+                    char: "###gir test###%c###gir test###\n",
+                    signed char: "###gir test###%hhd###gir test###\n",
+                    unsigned char: "###gir test###%hhu###gir test###\n",
+                    short int: "###gir test###%hd###gir test###\n",
+                    unsigned short int: "###gir test###%hu###gir test###\n",
+                    int: "###gir test###%d###gir test###\n",
+                    unsigned int: "###gir test###%u###gir test###\n",
+                    long: "###gir test###%ld###gir test###\n",
+                    unsigned long: "###gir test###%lu###gir test###\n",
+                    long long: "###gir test###%lld###gir test###\n",
+                    unsigned long long: "###gir test###%llu###gir test###\n",
+                    double: "###gir test###%f###gir test###\n",
+                    long double: "###gir test###%ld###gir test###\n"),
            ABI_CONSTANT_NAME);
     return 0;
 }
diff --git a/gstreamer-player-sys/tests/layout.c b/gstreamer-player-sys/tests/layout.c
index 829276260..aef10fc35 100644
--- a/gstreamer-player-sys/tests/layout.c
+++ b/gstreamer-player-sys/tests/layout.c
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
diff --git a/gstreamer-rtsp-server-sys/src/lib.rs b/gstreamer-rtsp-server-sys/src/lib.rs
index 58970d79c..370b414e3 100644
--- a/gstreamer-rtsp-server-sys/src/lib.rs
+++ b/gstreamer-rtsp-server-sys/src/lib.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
diff --git a/gstreamer-rtsp-server-sys/tests/abi.rs b/gstreamer-rtsp-server-sys/tests/abi.rs
index f9aa4acbf..78a5e028e 100644
--- a/gstreamer-rtsp-server-sys/tests/abi.rs
+++ b/gstreamer-rtsp-server-sys/tests/abi.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
@@ -227,7 +227,14 @@ fn get_c_value(dir: &Path, cc: &Compiler, name: &str) -> Result<String, Box<Erro
                            &abi_cmd, &output).into());
     }
 
-    Ok(str::from_utf8(&output.stdout)?.trim().to_owned())
+    let output = str::from_utf8(&output.stdout)?.trim();
+    if !output.starts_with("###gir test###") ||
+       !output.ends_with("###gir test###") {
+        return Err(format!("command {:?} return invalid output, {:?}",
+                           &abi_cmd, &output).into());
+    }
+
+    Ok(String::from(&output[14..(output.len() - 14)]))
 }
 
 const RUST_LAYOUTS: &[(&str, Layout)] = &[
@@ -284,48 +291,48 @@ const RUST_LAYOUTS: &[(&str, Layout)] = &[
 ];
 
 const RUST_CONSTANTS: &[(&str, &str)] = &[
-    ("GST_RTSP_ADDRESS_FLAG_EVEN_PORT", "4"),
-    ("GST_RTSP_ADDRESS_FLAG_IPV4", "1"),
-    ("GST_RTSP_ADDRESS_FLAG_IPV6", "2"),
-    ("GST_RTSP_ADDRESS_FLAG_MULTICAST", "8"),
-    ("GST_RTSP_ADDRESS_FLAG_NONE", "0"),
-    ("GST_RTSP_ADDRESS_FLAG_UNICAST", "16"),
+    ("(guint) GST_RTSP_ADDRESS_FLAG_EVEN_PORT", "4"),
+    ("(guint) GST_RTSP_ADDRESS_FLAG_IPV4", "1"),
+    ("(guint) GST_RTSP_ADDRESS_FLAG_IPV6", "2"),
+    ("(guint) GST_RTSP_ADDRESS_FLAG_MULTICAST", "8"),
+    ("(guint) GST_RTSP_ADDRESS_FLAG_NONE", "0"),
+    ("(guint) GST_RTSP_ADDRESS_FLAG_UNICAST", "16"),
     ("GST_RTSP_ADDRESS_POOL_ANY_IPV4", "0.0.0.0"),
     ("GST_RTSP_ADDRESS_POOL_ANY_IPV6", "::"),
-    ("GST_RTSP_ADDRESS_POOL_EINVAL", "-1"),
-    ("GST_RTSP_ADDRESS_POOL_ELAST", "-4"),
-    ("GST_RTSP_ADDRESS_POOL_ERANGE", "-3"),
-    ("GST_RTSP_ADDRESS_POOL_ERESERVED", "-2"),
-    ("GST_RTSP_ADDRESS_POOL_OK", "0"),
+    ("(gint) GST_RTSP_ADDRESS_POOL_EINVAL", "-1"),
+    ("(gint) GST_RTSP_ADDRESS_POOL_ELAST", "-4"),
+    ("(gint) GST_RTSP_ADDRESS_POOL_ERANGE", "-3"),
+    ("(gint) GST_RTSP_ADDRESS_POOL_ERESERVED", "-2"),
+    ("(gint) GST_RTSP_ADDRESS_POOL_OK", "0"),
     ("GST_RTSP_AUTH_CHECK_CONNECT", "auth.check.connect"),
     ("GST_RTSP_AUTH_CHECK_MEDIA_FACTORY_ACCESS", "auth.check.media.factory.access"),
     ("GST_RTSP_AUTH_CHECK_MEDIA_FACTORY_CONSTRUCT", "auth.check.media.factory.construct"),
     ("GST_RTSP_AUTH_CHECK_TRANSPORT_CLIENT_SETTINGS", "auth.check.transport.client-settings"),
     ("GST_RTSP_AUTH_CHECK_URL", "auth.check.url"),
-    ("GST_RTSP_FILTER_KEEP", "1"),
-    ("GST_RTSP_FILTER_REF", "2"),
-    ("GST_RTSP_FILTER_REMOVE", "0"),
-    ("GST_RTSP_MEDIA_STATUS_ERROR", "5"),
-    ("GST_RTSP_MEDIA_STATUS_PREPARED", "3"),
-    ("GST_RTSP_MEDIA_STATUS_PREPARING", "2"),
-    ("GST_RTSP_MEDIA_STATUS_SUSPENDED", "4"),
-    ("GST_RTSP_MEDIA_STATUS_UNPREPARED", "0"),
-    ("GST_RTSP_MEDIA_STATUS_UNPREPARING", "1"),
+    ("(gint) GST_RTSP_FILTER_KEEP", "1"),
+    ("(gint) GST_RTSP_FILTER_REF", "2"),
+    ("(gint) GST_RTSP_FILTER_REMOVE", "0"),
+    ("(gint) GST_RTSP_MEDIA_STATUS_ERROR", "5"),
+    ("(gint) GST_RTSP_MEDIA_STATUS_PREPARED", "3"),
+    ("(gint) GST_RTSP_MEDIA_STATUS_PREPARING", "2"),
+    ("(gint) GST_RTSP_MEDIA_STATUS_SUSPENDED", "4"),
+    ("(gint) GST_RTSP_MEDIA_STATUS_UNPREPARED", "0"),
+    ("(gint) GST_RTSP_MEDIA_STATUS_UNPREPARING", "1"),
     ("GST_RTSP_ONVIF_BACKCHANNEL_REQUIREMENT", "www.onvif.org/ver20/backchannel"),
     ("GST_RTSP_PERM_MEDIA_FACTORY_ACCESS", "media.factory.access"),
     ("GST_RTSP_PERM_MEDIA_FACTORY_CONSTRUCT", "media.factory.construct"),
-    ("GST_RTSP_PUBLISH_CLOCK_MODE_CLOCK", "1"),
-    ("GST_RTSP_PUBLISH_CLOCK_MODE_CLOCK_AND_OFFSET", "2"),
-    ("GST_RTSP_PUBLISH_CLOCK_MODE_NONE", "0"),
-    ("GST_RTSP_SUSPEND_MODE_NONE", "0"),
-    ("GST_RTSP_SUSPEND_MODE_PAUSE", "1"),
-    ("GST_RTSP_SUSPEND_MODE_RESET", "2"),
-    ("GST_RTSP_THREAD_TYPE_CLIENT", "0"),
-    ("GST_RTSP_THREAD_TYPE_MEDIA", "1"),
+    ("(gint) GST_RTSP_PUBLISH_CLOCK_MODE_CLOCK", "1"),
+    ("(gint) GST_RTSP_PUBLISH_CLOCK_MODE_CLOCK_AND_OFFSET", "2"),
+    ("(gint) GST_RTSP_PUBLISH_CLOCK_MODE_NONE", "0"),
+    ("(gint) GST_RTSP_SUSPEND_MODE_NONE", "0"),
+    ("(gint) GST_RTSP_SUSPEND_MODE_PAUSE", "1"),
+    ("(gint) GST_RTSP_SUSPEND_MODE_RESET", "2"),
+    ("(gint) GST_RTSP_THREAD_TYPE_CLIENT", "0"),
+    ("(gint) GST_RTSP_THREAD_TYPE_MEDIA", "1"),
     ("GST_RTSP_TOKEN_MEDIA_FACTORY_ROLE", "media.factory.role"),
     ("GST_RTSP_TOKEN_TRANSPORT_CLIENT_SETTINGS", "transport.client-settings"),
-    ("GST_RTSP_TRANSPORT_MODE_PLAY", "1"),
-    ("GST_RTSP_TRANSPORT_MODE_RECORD", "2"),
+    ("(guint) GST_RTSP_TRANSPORT_MODE_PLAY", "1"),
+    ("(guint) GST_RTSP_TRANSPORT_MODE_RECORD", "2"),
 ];
 
 
diff --git a/gstreamer-rtsp-server-sys/tests/constant.c b/gstreamer-rtsp-server-sys/tests/constant.c
index a167e0146..f54bce75c 100644
--- a/gstreamer-rtsp-server-sys/tests/constant.c
+++ b/gstreamer-rtsp-server-sys/tests/constant.c
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
@@ -7,21 +7,21 @@
 
 int main() {
     printf(_Generic((ABI_CONSTANT_NAME),
-                    char *: "%s",
-                    const char *: "%s",
-                    char: "%c",
-                    signed char: "%hhd",
-                    unsigned char: "%hhu",
-                    short int: "%hd",
-                    unsigned short int: "%hu",
-                    int: "%d",
-                    unsigned int: "%u",
-                    long: "%ld",
-                    unsigned long: "%lu",
-                    long long: "%lld",
-                    unsigned long long: "%llu",
-                    double: "%f",
-                    long double: "%ld"),
+                    char *: "###gir test###%s###gir test###\n",
+                    const char *: "###gir test###%s###gir test###\n",
+                    char: "###gir test###%c###gir test###\n",
+                    signed char: "###gir test###%hhd###gir test###\n",
+                    unsigned char: "###gir test###%hhu###gir test###\n",
+                    short int: "###gir test###%hd###gir test###\n",
+                    unsigned short int: "###gir test###%hu###gir test###\n",
+                    int: "###gir test###%d###gir test###\n",
+                    unsigned int: "###gir test###%u###gir test###\n",
+                    long: "###gir test###%ld###gir test###\n",
+                    unsigned long: "###gir test###%lu###gir test###\n",
+                    long long: "###gir test###%lld###gir test###\n",
+                    unsigned long long: "###gir test###%llu###gir test###\n",
+                    double: "###gir test###%f###gir test###\n",
+                    long double: "###gir test###%ld###gir test###\n"),
            ABI_CONSTANT_NAME);
     return 0;
 }
diff --git a/gstreamer-rtsp-server-sys/tests/layout.c b/gstreamer-rtsp-server-sys/tests/layout.c
index 829276260..aef10fc35 100644
--- a/gstreamer-rtsp-server-sys/tests/layout.c
+++ b/gstreamer-rtsp-server-sys/tests/layout.c
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
diff --git a/gstreamer-rtsp-sys/src/lib.rs b/gstreamer-rtsp-sys/src/lib.rs
index a66056373..90ff52676 100644
--- a/gstreamer-rtsp-sys/src/lib.rs
+++ b/gstreamer-rtsp-sys/src/lib.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
diff --git a/gstreamer-rtsp-sys/tests/abi.rs b/gstreamer-rtsp-sys/tests/abi.rs
index 46ec0a8bb..e6c529da4 100644
--- a/gstreamer-rtsp-sys/tests/abi.rs
+++ b/gstreamer-rtsp-sys/tests/abi.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
@@ -227,7 +227,14 @@ fn get_c_value(dir: &Path, cc: &Compiler, name: &str) -> Result<String, Box<Erro
                            &abi_cmd, &output).into());
     }
 
-    Ok(str::from_utf8(&output.stdout)?.trim().to_owned())
+    let output = str::from_utf8(&output.stdout)?.trim();
+    if !output.starts_with("###gir test###") ||
+       !output.ends_with("###gir test###") {
+        return Err(format!("command {:?} return invalid output, {:?}",
+                           &abi_cmd, &output).into());
+    }
+
+    Ok(String::from(&output[14..(output.len() - 14)]))
 }
 
 const RUST_LAYOUTS: &[(&str, Layout)] = &[
@@ -260,221 +267,221 @@ const RUST_LAYOUTS: &[(&str, Layout)] = &[
 ];
 
 const RUST_CONSTANTS: &[(&str, &str)] = &[
-    ("GST_RTSP_ANNOUNCE", "2"),
-    ("GST_RTSP_AUTH_BASIC", "1"),
-    ("GST_RTSP_AUTH_DIGEST", "2"),
-    ("GST_RTSP_AUTH_NONE", "0"),
+    ("(guint) GST_RTSP_ANNOUNCE", "2"),
+    ("(gint) GST_RTSP_AUTH_BASIC", "1"),
+    ("(gint) GST_RTSP_AUTH_DIGEST", "2"),
+    ("(gint) GST_RTSP_AUTH_NONE", "0"),
     ("GST_RTSP_DEFAULT_PORT", "554"),
-    ("GST_RTSP_DESCRIBE", "1"),
-    ("GST_RTSP_EEOF", "-11"),
-    ("GST_RTSP_EINTR", "-3"),
-    ("GST_RTSP_EINVAL", "-2"),
-    ("GST_RTSP_ELAST", "-17"),
-    ("GST_RTSP_ENET", "-12"),
-    ("GST_RTSP_ENOMEM", "-4"),
-    ("GST_RTSP_ENOTIMPL", "-6"),
-    ("GST_RTSP_ENOTIP", "-13"),
-    ("GST_RTSP_EPARSE", "-8"),
-    ("GST_RTSP_ERESOLV", "-5"),
-    ("GST_RTSP_ERROR", "-1"),
-    ("GST_RTSP_ESYS", "-7"),
-    ("GST_RTSP_ETGET", "-15"),
-    ("GST_RTSP_ETIMEOUT", "-14"),
-    ("GST_RTSP_ETPOST", "-16"),
-    ("GST_RTSP_EV_READ", "1"),
-    ("GST_RTSP_EV_WRITE", "2"),
-    ("GST_RTSP_EWSASTART", "-9"),
-    ("GST_RTSP_EWSAVERSION", "-10"),
-    ("GST_RTSP_FAM_INET", "1"),
-    ("GST_RTSP_FAM_INET6", "2"),
-    ("GST_RTSP_FAM_NONE", "0"),
-    ("GST_RTSP_GET", "2048"),
-    ("GST_RTSP_GET_PARAMETER", "4"),
-    ("GST_RTSP_HDR_ACCEPT", "1"),
-    ("GST_RTSP_HDR_ACCEPT_CHARSET", "56"),
-    ("GST_RTSP_HDR_ACCEPT_ENCODING", "2"),
-    ("GST_RTSP_HDR_ACCEPT_LANGUAGE", "3"),
-    ("GST_RTSP_HDR_ACCEPT_RANGES", "86"),
-    ("GST_RTSP_HDR_ALERT", "45"),
-    ("GST_RTSP_HDR_ALLOW", "4"),
-    ("GST_RTSP_HDR_AUTHENTICATION_INFO", "76"),
-    ("GST_RTSP_HDR_AUTHORIZATION", "5"),
-    ("GST_RTSP_HDR_BANDWIDTH", "6"),
-    ("GST_RTSP_HDR_BLOCKSIZE", "7"),
-    ("GST_RTSP_HDR_CACHE_CONTROL", "8"),
-    ("GST_RTSP_HDR_CLIENT_CHALLENGE", "40"),
-    ("GST_RTSP_HDR_CLIENT_ID", "46"),
-    ("GST_RTSP_HDR_COMPANY_ID", "47"),
-    ("GST_RTSP_HDR_CONFERENCE", "9"),
-    ("GST_RTSP_HDR_CONNECTION", "10"),
-    ("GST_RTSP_HDR_CONTENT_BASE", "11"),
-    ("GST_RTSP_HDR_CONTENT_ENCODING", "12"),
-    ("GST_RTSP_HDR_CONTENT_LANGUAGE", "13"),
-    ("GST_RTSP_HDR_CONTENT_LENGTH", "14"),
-    ("GST_RTSP_HDR_CONTENT_LOCATION", "15"),
-    ("GST_RTSP_HDR_CONTENT_TYPE", "16"),
-    ("GST_RTSP_HDR_CSEQ", "17"),
-    ("GST_RTSP_HDR_DATE", "18"),
-    ("GST_RTSP_HDR_ETAG", "54"),
-    ("GST_RTSP_HDR_EXPIRES", "19"),
-    ("GST_RTSP_HDR_FROM", "20"),
-    ("GST_RTSP_HDR_GUID", "48"),
-    ("GST_RTSP_HDR_HOST", "77"),
-    ("GST_RTSP_HDR_IF_MATCH", "55"),
-    ("GST_RTSP_HDR_IF_MODIFIED_SINCE", "21"),
-    ("GST_RTSP_HDR_INVALID", "0"),
-    ("GST_RTSP_HDR_KEYMGMT", "82"),
-    ("GST_RTSP_HDR_LANGUAGE", "51"),
-    ("GST_RTSP_HDR_LAST", "87"),
-    ("GST_RTSP_HDR_LAST_MODIFIED", "22"),
-    ("GST_RTSP_HDR_LOCATION", "53"),
-    ("GST_RTSP_HDR_MAX_ASM_WIDTH", "50"),
-    ("GST_RTSP_HDR_MEDIA_PROPERTIES", "84"),
-    ("GST_RTSP_HDR_PIPELINED_REQUESTS", "83"),
-    ("GST_RTSP_HDR_PLAYER_START_TIME", "52"),
-    ("GST_RTSP_HDR_PRAGMA", "78"),
-    ("GST_RTSP_HDR_PROXY_AUTHENTICATE", "23"),
-    ("GST_RTSP_HDR_PROXY_REQUIRE", "24"),
-    ("GST_RTSP_HDR_PUBLIC", "25"),
-    ("GST_RTSP_HDR_RANGE", "26"),
-    ("GST_RTSP_HDR_REAL_CHALLENGE1", "41"),
-    ("GST_RTSP_HDR_REAL_CHALLENGE2", "42"),
-    ("GST_RTSP_HDR_REAL_CHALLENGE3", "43"),
-    ("GST_RTSP_HDR_REFERER", "27"),
-    ("GST_RTSP_HDR_REGION_DATA", "49"),
-    ("GST_RTSP_HDR_REQUIRE", "28"),
-    ("GST_RTSP_HDR_RETRY_AFTER", "29"),
-    ("GST_RTSP_HDR_RTCP_INTERVAL", "81"),
-    ("GST_RTSP_HDR_RTP_INFO", "30"),
-    ("GST_RTSP_HDR_SCALE", "31"),
-    ("GST_RTSP_HDR_SEEK_STYLE", "85"),
-    ("GST_RTSP_HDR_SERVER", "33"),
-    ("GST_RTSP_HDR_SESSION", "32"),
-    ("GST_RTSP_HDR_SPEED", "34"),
-    ("GST_RTSP_HDR_SUBSCRIBE", "44"),
-    ("GST_RTSP_HDR_SUPPORTED", "57"),
-    ("GST_RTSP_HDR_TIMESTAMP", "75"),
-    ("GST_RTSP_HDR_TRANSPORT", "35"),
-    ("GST_RTSP_HDR_UNSUPPORTED", "36"),
-    ("GST_RTSP_HDR_USER_AGENT", "37"),
-    ("GST_RTSP_HDR_VARY", "58"),
-    ("GST_RTSP_HDR_VIA", "38"),
-    ("GST_RTSP_HDR_WWW_AUTHENTICATE", "39"),
-    ("GST_RTSP_HDR_X_ACCELERATE_STREAMING", "59"),
-    ("GST_RTSP_HDR_X_ACCEPT_AUTHENT", "60"),
-    ("GST_RTSP_HDR_X_ACCEPT_PROXY_AUTHENT", "61"),
-    ("GST_RTSP_HDR_X_BROADCAST_ID", "62"),
-    ("GST_RTSP_HDR_X_BURST_STREAMING", "63"),
-    ("GST_RTSP_HDR_X_NOTICE", "64"),
-    ("GST_RTSP_HDR_X_PLAYER_LAG_TIME", "65"),
-    ("GST_RTSP_HDR_X_PLAYLIST", "66"),
-    ("GST_RTSP_HDR_X_PLAYLIST_CHANGE_NOTICE", "67"),
-    ("GST_RTSP_HDR_X_PLAYLIST_GEN_ID", "68"),
-    ("GST_RTSP_HDR_X_PLAYLIST_SEEK_ID", "69"),
-    ("GST_RTSP_HDR_X_PROXY_CLIENT_AGENT", "70"),
-    ("GST_RTSP_HDR_X_PROXY_CLIENT_VERB", "71"),
-    ("GST_RTSP_HDR_X_RECEDING_PLAYLISTCHANGE", "72"),
-    ("GST_RTSP_HDR_X_RTP_INFO", "73"),
-    ("GST_RTSP_HDR_X_SERVER_IP_ADDRESS", "79"),
-    ("GST_RTSP_HDR_X_SESSIONCOOKIE", "80"),
-    ("GST_RTSP_HDR_X_STARTUPPROFILE", "74"),
-    ("GST_RTSP_INVALID", "0"),
-    ("GST_RTSP_LOWER_TRANS_HTTP", "16"),
-    ("GST_RTSP_LOWER_TRANS_TCP", "4"),
-    ("GST_RTSP_LOWER_TRANS_TLS", "32"),
-    ("GST_RTSP_LOWER_TRANS_UDP", "1"),
-    ("GST_RTSP_LOWER_TRANS_UDP_MCAST", "2"),
-    ("GST_RTSP_LOWER_TRANS_UNKNOWN", "0"),
-    ("GST_RTSP_MESSAGE_DATA", "5"),
-    ("GST_RTSP_MESSAGE_HTTP_REQUEST", "3"),
-    ("GST_RTSP_MESSAGE_HTTP_RESPONSE", "4"),
-    ("GST_RTSP_MESSAGE_INVALID", "0"),
-    ("GST_RTSP_MESSAGE_REQUEST", "1"),
-    ("GST_RTSP_MESSAGE_RESPONSE", "2"),
-    ("GST_RTSP_OK", "0"),
-    ("GST_RTSP_OPTIONS", "8"),
-    ("GST_RTSP_PAUSE", "16"),
-    ("GST_RTSP_PLAY", "32"),
-    ("GST_RTSP_POST", "4096"),
-    ("GST_RTSP_PROFILE_AVP", "1"),
-    ("GST_RTSP_PROFILE_AVPF", "4"),
-    ("GST_RTSP_PROFILE_SAVP", "2"),
-    ("GST_RTSP_PROFILE_SAVPF", "8"),
-    ("GST_RTSP_PROFILE_UNKNOWN", "0"),
-    ("GST_RTSP_RANGE_CLOCK", "4"),
-    ("GST_RTSP_RANGE_NPT", "3"),
-    ("GST_RTSP_RANGE_SMPTE", "0"),
-    ("GST_RTSP_RANGE_SMPTE_25", "2"),
-    ("GST_RTSP_RANGE_SMPTE_30_DROP", "1"),
-    ("GST_RTSP_RECORD", "64"),
-    ("GST_RTSP_REDIRECT", "128"),
-    ("GST_RTSP_SETUP", "256"),
-    ("GST_RTSP_SET_PARAMETER", "512"),
-    ("GST_RTSP_STATE_INIT", "1"),
-    ("GST_RTSP_STATE_INVALID", "0"),
-    ("GST_RTSP_STATE_PLAYING", "4"),
-    ("GST_RTSP_STATE_READY", "2"),
-    ("GST_RTSP_STATE_RECORDING", "5"),
-    ("GST_RTSP_STATE_SEEKING", "3"),
-    ("GST_RTSP_STS_AGGREGATE_OPERATION_NOT_ALLOWED", "459"),
-    ("GST_RTSP_STS_BAD_GATEWAY", "502"),
-    ("GST_RTSP_STS_BAD_REQUEST", "400"),
-    ("GST_RTSP_STS_CONFERENCE_NOT_FOUND", "452"),
-    ("GST_RTSP_STS_CONTINUE", "100"),
-    ("GST_RTSP_STS_CREATED", "201"),
-    ("GST_RTSP_STS_DESTINATION_UNREACHABLE", "462"),
-    ("GST_RTSP_STS_FORBIDDEN", "403"),
-    ("GST_RTSP_STS_GATEWAY_TIMEOUT", "504"),
-    ("GST_RTSP_STS_GONE", "410"),
-    ("GST_RTSP_STS_HEADER_FIELD_NOT_VALID_FOR_RESOURCE", "456"),
-    ("GST_RTSP_STS_INTERNAL_SERVER_ERROR", "500"),
-    ("GST_RTSP_STS_INVALID", "0"),
-    ("GST_RTSP_STS_INVALID_RANGE", "457"),
-    ("GST_RTSP_STS_KEY_MANAGEMENT_FAILURE", "463"),
-    ("GST_RTSP_STS_LENGTH_REQUIRED", "411"),
-    ("GST_RTSP_STS_LOW_ON_STORAGE", "250"),
-    ("GST_RTSP_STS_METHOD_NOT_ALLOWED", "405"),
-    ("GST_RTSP_STS_METHOD_NOT_VALID_IN_THIS_STATE", "455"),
-    ("GST_RTSP_STS_MOVED_PERMANENTLY", "301"),
-    ("GST_RTSP_STS_MOVE_TEMPORARILY", "302"),
-    ("GST_RTSP_STS_MULTIPLE_CHOICES", "300"),
-    ("GST_RTSP_STS_NOT_ACCEPTABLE", "406"),
-    ("GST_RTSP_STS_NOT_ENOUGH_BANDWIDTH", "453"),
-    ("GST_RTSP_STS_NOT_FOUND", "404"),
-    ("GST_RTSP_STS_NOT_IMPLEMENTED", "501"),
-    ("GST_RTSP_STS_NOT_MODIFIED", "304"),
-    ("GST_RTSP_STS_OK", "200"),
-    ("GST_RTSP_STS_ONLY_AGGREGATE_OPERATION_ALLOWED", "460"),
-    ("GST_RTSP_STS_OPTION_NOT_SUPPORTED", "551"),
-    ("GST_RTSP_STS_PARAMETER_IS_READONLY", "458"),
-    ("GST_RTSP_STS_PARAMETER_NOT_UNDERSTOOD", "451"),
-    ("GST_RTSP_STS_PAYMENT_REQUIRED", "402"),
-    ("GST_RTSP_STS_PRECONDITION_FAILED", "412"),
-    ("GST_RTSP_STS_PROXY_AUTH_REQUIRED", "407"),
-    ("GST_RTSP_STS_REQUEST_ENTITY_TOO_LARGE", "413"),
-    ("GST_RTSP_STS_REQUEST_TIMEOUT", "408"),
-    ("GST_RTSP_STS_REQUEST_URI_TOO_LARGE", "414"),
-    ("GST_RTSP_STS_RTSP_VERSION_NOT_SUPPORTED", "505"),
-    ("GST_RTSP_STS_SEE_OTHER", "303"),
-    ("GST_RTSP_STS_SERVICE_UNAVAILABLE", "503"),
-    ("GST_RTSP_STS_SESSION_NOT_FOUND", "454"),
-    ("GST_RTSP_STS_UNAUTHORIZED", "401"),
-    ("GST_RTSP_STS_UNSUPPORTED_MEDIA_TYPE", "415"),
-    ("GST_RTSP_STS_UNSUPPORTED_TRANSPORT", "461"),
-    ("GST_RTSP_STS_USE_PROXY", "305"),
-    ("GST_RTSP_TEARDOWN", "1024"),
-    ("GST_RTSP_TIME_END", "2"),
-    ("GST_RTSP_TIME_FRAMES", "3"),
-    ("GST_RTSP_TIME_NOW", "1"),
-    ("GST_RTSP_TIME_SECONDS", "0"),
-    ("GST_RTSP_TIME_UTC", "4"),
-    ("GST_RTSP_TRANS_RDT", "2"),
-    ("GST_RTSP_TRANS_RTP", "1"),
-    ("GST_RTSP_TRANS_UNKNOWN", "0"),
-    ("GST_RTSP_VERSION_1_0", "16"),
-    ("GST_RTSP_VERSION_1_1", "17"),
-    ("GST_RTSP_VERSION_2_0", "32"),
-    ("GST_RTSP_VERSION_INVALID", "0"),
+    ("(guint) GST_RTSP_DESCRIBE", "1"),
+    ("(gint) GST_RTSP_EEOF", "-11"),
+    ("(gint) GST_RTSP_EINTR", "-3"),
+    ("(gint) GST_RTSP_EINVAL", "-2"),
+    ("(gint) GST_RTSP_ELAST", "-17"),
+    ("(gint) GST_RTSP_ENET", "-12"),
+    ("(gint) GST_RTSP_ENOMEM", "-4"),
+    ("(gint) GST_RTSP_ENOTIMPL", "-6"),
+    ("(gint) GST_RTSP_ENOTIP", "-13"),
+    ("(gint) GST_RTSP_EPARSE", "-8"),
+    ("(gint) GST_RTSP_ERESOLV", "-5"),
+    ("(gint) GST_RTSP_ERROR", "-1"),
+    ("(gint) GST_RTSP_ESYS", "-7"),
+    ("(gint) GST_RTSP_ETGET", "-15"),
+    ("(gint) GST_RTSP_ETIMEOUT", "-14"),
+    ("(gint) GST_RTSP_ETPOST", "-16"),
+    ("(guint) GST_RTSP_EV_READ", "1"),
+    ("(guint) GST_RTSP_EV_WRITE", "2"),
+    ("(gint) GST_RTSP_EWSASTART", "-9"),
+    ("(gint) GST_RTSP_EWSAVERSION", "-10"),
+    ("(gint) GST_RTSP_FAM_INET", "1"),
+    ("(gint) GST_RTSP_FAM_INET6", "2"),
+    ("(gint) GST_RTSP_FAM_NONE", "0"),
+    ("(guint) GST_RTSP_GET", "2048"),
+    ("(guint) GST_RTSP_GET_PARAMETER", "4"),
+    ("(gint) GST_RTSP_HDR_ACCEPT", "1"),
+    ("(gint) GST_RTSP_HDR_ACCEPT_CHARSET", "56"),
+    ("(gint) GST_RTSP_HDR_ACCEPT_ENCODING", "2"),
+    ("(gint) GST_RTSP_HDR_ACCEPT_LANGUAGE", "3"),
+    ("(gint) GST_RTSP_HDR_ACCEPT_RANGES", "86"),
+    ("(gint) GST_RTSP_HDR_ALERT", "45"),
+    ("(gint) GST_RTSP_HDR_ALLOW", "4"),
+    ("(gint) GST_RTSP_HDR_AUTHENTICATION_INFO", "76"),
+    ("(gint) GST_RTSP_HDR_AUTHORIZATION", "5"),
+    ("(gint) GST_RTSP_HDR_BANDWIDTH", "6"),
+    ("(gint) GST_RTSP_HDR_BLOCKSIZE", "7"),
+    ("(gint) GST_RTSP_HDR_CACHE_CONTROL", "8"),
+    ("(gint) GST_RTSP_HDR_CLIENT_CHALLENGE", "40"),
+    ("(gint) GST_RTSP_HDR_CLIENT_ID", "46"),
+    ("(gint) GST_RTSP_HDR_COMPANY_ID", "47"),
+    ("(gint) GST_RTSP_HDR_CONFERENCE", "9"),
+    ("(gint) GST_RTSP_HDR_CONNECTION", "10"),
+    ("(gint) GST_RTSP_HDR_CONTENT_BASE", "11"),
+    ("(gint) GST_RTSP_HDR_CONTENT_ENCODING", "12"),
+    ("(gint) GST_RTSP_HDR_CONTENT_LANGUAGE", "13"),
+    ("(gint) GST_RTSP_HDR_CONTENT_LENGTH", "14"),
+    ("(gint) GST_RTSP_HDR_CONTENT_LOCATION", "15"),
+    ("(gint) GST_RTSP_HDR_CONTENT_TYPE", "16"),
+    ("(gint) GST_RTSP_HDR_CSEQ", "17"),
+    ("(gint) GST_RTSP_HDR_DATE", "18"),
+    ("(gint) GST_RTSP_HDR_ETAG", "54"),
+    ("(gint) GST_RTSP_HDR_EXPIRES", "19"),
+    ("(gint) GST_RTSP_HDR_FROM", "20"),
+    ("(gint) GST_RTSP_HDR_GUID", "48"),
+    ("(gint) GST_RTSP_HDR_HOST", "77"),
+    ("(gint) GST_RTSP_HDR_IF_MATCH", "55"),
+    ("(gint) GST_RTSP_HDR_IF_MODIFIED_SINCE", "21"),
+    ("(gint) GST_RTSP_HDR_INVALID", "0"),
+    ("(gint) GST_RTSP_HDR_KEYMGMT", "82"),
+    ("(gint) GST_RTSP_HDR_LANGUAGE", "51"),
+    ("(gint) GST_RTSP_HDR_LAST", "87"),
+    ("(gint) GST_RTSP_HDR_LAST_MODIFIED", "22"),
+    ("(gint) GST_RTSP_HDR_LOCATION", "53"),
+    ("(gint) GST_RTSP_HDR_MAX_ASM_WIDTH", "50"),
+    ("(gint) GST_RTSP_HDR_MEDIA_PROPERTIES", "84"),
+    ("(gint) GST_RTSP_HDR_PIPELINED_REQUESTS", "83"),
+    ("(gint) GST_RTSP_HDR_PLAYER_START_TIME", "52"),
+    ("(gint) GST_RTSP_HDR_PRAGMA", "78"),
+    ("(gint) GST_RTSP_HDR_PROXY_AUTHENTICATE", "23"),
+    ("(gint) GST_RTSP_HDR_PROXY_REQUIRE", "24"),
+    ("(gint) GST_RTSP_HDR_PUBLIC", "25"),
+    ("(gint) GST_RTSP_HDR_RANGE", "26"),
+    ("(gint) GST_RTSP_HDR_REAL_CHALLENGE1", "41"),
+    ("(gint) GST_RTSP_HDR_REAL_CHALLENGE2", "42"),
+    ("(gint) GST_RTSP_HDR_REAL_CHALLENGE3", "43"),
+    ("(gint) GST_RTSP_HDR_REFERER", "27"),
+    ("(gint) GST_RTSP_HDR_REGION_DATA", "49"),
+    ("(gint) GST_RTSP_HDR_REQUIRE", "28"),
+    ("(gint) GST_RTSP_HDR_RETRY_AFTER", "29"),
+    ("(gint) GST_RTSP_HDR_RTCP_INTERVAL", "81"),
+    ("(gint) GST_RTSP_HDR_RTP_INFO", "30"),
+    ("(gint) GST_RTSP_HDR_SCALE", "31"),
+    ("(gint) GST_RTSP_HDR_SEEK_STYLE", "85"),
+    ("(gint) GST_RTSP_HDR_SERVER", "33"),
+    ("(gint) GST_RTSP_HDR_SESSION", "32"),
+    ("(gint) GST_RTSP_HDR_SPEED", "34"),
+    ("(gint) GST_RTSP_HDR_SUBSCRIBE", "44"),
+    ("(gint) GST_RTSP_HDR_SUPPORTED", "57"),
+    ("(gint) GST_RTSP_HDR_TIMESTAMP", "75"),
+    ("(gint) GST_RTSP_HDR_TRANSPORT", "35"),
+    ("(gint) GST_RTSP_HDR_UNSUPPORTED", "36"),
+    ("(gint) GST_RTSP_HDR_USER_AGENT", "37"),
+    ("(gint) GST_RTSP_HDR_VARY", "58"),
+    ("(gint) GST_RTSP_HDR_VIA", "38"),
+    ("(gint) GST_RTSP_HDR_WWW_AUTHENTICATE", "39"),
+    ("(gint) GST_RTSP_HDR_X_ACCELERATE_STREAMING", "59"),
+    ("(gint) GST_RTSP_HDR_X_ACCEPT_AUTHENT", "60"),
+    ("(gint) GST_RTSP_HDR_X_ACCEPT_PROXY_AUTHENT", "61"),
+    ("(gint) GST_RTSP_HDR_X_BROADCAST_ID", "62"),
+    ("(gint) GST_RTSP_HDR_X_BURST_STREAMING", "63"),
+    ("(gint) GST_RTSP_HDR_X_NOTICE", "64"),
+    ("(gint) GST_RTSP_HDR_X_PLAYER_LAG_TIME", "65"),
+    ("(gint) GST_RTSP_HDR_X_PLAYLIST", "66"),
+    ("(gint) GST_RTSP_HDR_X_PLAYLIST_CHANGE_NOTICE", "67"),
+    ("(gint) GST_RTSP_HDR_X_PLAYLIST_GEN_ID", "68"),
+    ("(gint) GST_RTSP_HDR_X_PLAYLIST_SEEK_ID", "69"),
+    ("(gint) GST_RTSP_HDR_X_PROXY_CLIENT_AGENT", "70"),
+    ("(gint) GST_RTSP_HDR_X_PROXY_CLIENT_VERB", "71"),
+    ("(gint) GST_RTSP_HDR_X_RECEDING_PLAYLISTCHANGE", "72"),
+    ("(gint) GST_RTSP_HDR_X_RTP_INFO", "73"),
+    ("(gint) GST_RTSP_HDR_X_SERVER_IP_ADDRESS", "79"),
+    ("(gint) GST_RTSP_HDR_X_SESSIONCOOKIE", "80"),
+    ("(gint) GST_RTSP_HDR_X_STARTUPPROFILE", "74"),
+    ("(guint) GST_RTSP_INVALID", "0"),
+    ("(guint) GST_RTSP_LOWER_TRANS_HTTP", "16"),
+    ("(guint) GST_RTSP_LOWER_TRANS_TCP", "4"),
+    ("(guint) GST_RTSP_LOWER_TRANS_TLS", "32"),
+    ("(guint) GST_RTSP_LOWER_TRANS_UDP", "1"),
+    ("(guint) GST_RTSP_LOWER_TRANS_UDP_MCAST", "2"),
+    ("(guint) GST_RTSP_LOWER_TRANS_UNKNOWN", "0"),
+    ("(gint) GST_RTSP_MESSAGE_DATA", "5"),
+    ("(gint) GST_RTSP_MESSAGE_HTTP_REQUEST", "3"),
+    ("(gint) GST_RTSP_MESSAGE_HTTP_RESPONSE", "4"),
+    ("(gint) GST_RTSP_MESSAGE_INVALID", "0"),
+    ("(gint) GST_RTSP_MESSAGE_REQUEST", "1"),
+    ("(gint) GST_RTSP_MESSAGE_RESPONSE", "2"),
+    ("(gint) GST_RTSP_OK", "0"),
+    ("(guint) GST_RTSP_OPTIONS", "8"),
+    ("(guint) GST_RTSP_PAUSE", "16"),
+    ("(guint) GST_RTSP_PLAY", "32"),
+    ("(guint) GST_RTSP_POST", "4096"),
+    ("(guint) GST_RTSP_PROFILE_AVP", "1"),
+    ("(guint) GST_RTSP_PROFILE_AVPF", "4"),
+    ("(guint) GST_RTSP_PROFILE_SAVP", "2"),
+    ("(guint) GST_RTSP_PROFILE_SAVPF", "8"),
+    ("(guint) GST_RTSP_PROFILE_UNKNOWN", "0"),
+    ("(gint) GST_RTSP_RANGE_CLOCK", "4"),
+    ("(gint) GST_RTSP_RANGE_NPT", "3"),
+    ("(gint) GST_RTSP_RANGE_SMPTE", "0"),
+    ("(gint) GST_RTSP_RANGE_SMPTE_25", "2"),
+    ("(gint) GST_RTSP_RANGE_SMPTE_30_DROP", "1"),
+    ("(guint) GST_RTSP_RECORD", "64"),
+    ("(guint) GST_RTSP_REDIRECT", "128"),
+    ("(guint) GST_RTSP_SETUP", "256"),
+    ("(guint) GST_RTSP_SET_PARAMETER", "512"),
+    ("(gint) GST_RTSP_STATE_INIT", "1"),
+    ("(gint) GST_RTSP_STATE_INVALID", "0"),
+    ("(gint) GST_RTSP_STATE_PLAYING", "4"),
+    ("(gint) GST_RTSP_STATE_READY", "2"),
+    ("(gint) GST_RTSP_STATE_RECORDING", "5"),
+    ("(gint) GST_RTSP_STATE_SEEKING", "3"),
+    ("(gint) GST_RTSP_STS_AGGREGATE_OPERATION_NOT_ALLOWED", "459"),
+    ("(gint) GST_RTSP_STS_BAD_GATEWAY", "502"),
+    ("(gint) GST_RTSP_STS_BAD_REQUEST", "400"),
+    ("(gint) GST_RTSP_STS_CONFERENCE_NOT_FOUND", "452"),
+    ("(gint) GST_RTSP_STS_CONTINUE", "100"),
+    ("(gint) GST_RTSP_STS_CREATED", "201"),
+    ("(gint) GST_RTSP_STS_DESTINATION_UNREACHABLE", "462"),
+    ("(gint) GST_RTSP_STS_FORBIDDEN", "403"),
+    ("(gint) GST_RTSP_STS_GATEWAY_TIMEOUT", "504"),
+    ("(gint) GST_RTSP_STS_GONE", "410"),
+    ("(gint) GST_RTSP_STS_HEADER_FIELD_NOT_VALID_FOR_RESOURCE", "456"),
+    ("(gint) GST_RTSP_STS_INTERNAL_SERVER_ERROR", "500"),
+    ("(gint) GST_RTSP_STS_INVALID", "0"),
+    ("(gint) GST_RTSP_STS_INVALID_RANGE", "457"),
+    ("(gint) GST_RTSP_STS_KEY_MANAGEMENT_FAILURE", "463"),
+    ("(gint) GST_RTSP_STS_LENGTH_REQUIRED", "411"),
+    ("(gint) GST_RTSP_STS_LOW_ON_STORAGE", "250"),
+    ("(gint) GST_RTSP_STS_METHOD_NOT_ALLOWED", "405"),
+    ("(gint) GST_RTSP_STS_METHOD_NOT_VALID_IN_THIS_STATE", "455"),
+    ("(gint) GST_RTSP_STS_MOVED_PERMANENTLY", "301"),
+    ("(gint) GST_RTSP_STS_MOVE_TEMPORARILY", "302"),
+    ("(gint) GST_RTSP_STS_MULTIPLE_CHOICES", "300"),
+    ("(gint) GST_RTSP_STS_NOT_ACCEPTABLE", "406"),
+    ("(gint) GST_RTSP_STS_NOT_ENOUGH_BANDWIDTH", "453"),
+    ("(gint) GST_RTSP_STS_NOT_FOUND", "404"),
+    ("(gint) GST_RTSP_STS_NOT_IMPLEMENTED", "501"),
+    ("(gint) GST_RTSP_STS_NOT_MODIFIED", "304"),
+    ("(gint) GST_RTSP_STS_OK", "200"),
+    ("(gint) GST_RTSP_STS_ONLY_AGGREGATE_OPERATION_ALLOWED", "460"),
+    ("(gint) GST_RTSP_STS_OPTION_NOT_SUPPORTED", "551"),
+    ("(gint) GST_RTSP_STS_PARAMETER_IS_READONLY", "458"),
+    ("(gint) GST_RTSP_STS_PARAMETER_NOT_UNDERSTOOD", "451"),
+    ("(gint) GST_RTSP_STS_PAYMENT_REQUIRED", "402"),
+    ("(gint) GST_RTSP_STS_PRECONDITION_FAILED", "412"),
+    ("(gint) GST_RTSP_STS_PROXY_AUTH_REQUIRED", "407"),
+    ("(gint) GST_RTSP_STS_REQUEST_ENTITY_TOO_LARGE", "413"),
+    ("(gint) GST_RTSP_STS_REQUEST_TIMEOUT", "408"),
+    ("(gint) GST_RTSP_STS_REQUEST_URI_TOO_LARGE", "414"),
+    ("(gint) GST_RTSP_STS_RTSP_VERSION_NOT_SUPPORTED", "505"),
+    ("(gint) GST_RTSP_STS_SEE_OTHER", "303"),
+    ("(gint) GST_RTSP_STS_SERVICE_UNAVAILABLE", "503"),
+    ("(gint) GST_RTSP_STS_SESSION_NOT_FOUND", "454"),
+    ("(gint) GST_RTSP_STS_UNAUTHORIZED", "401"),
+    ("(gint) GST_RTSP_STS_UNSUPPORTED_MEDIA_TYPE", "415"),
+    ("(gint) GST_RTSP_STS_UNSUPPORTED_TRANSPORT", "461"),
+    ("(gint) GST_RTSP_STS_USE_PROXY", "305"),
+    ("(guint) GST_RTSP_TEARDOWN", "1024"),
+    ("(gint) GST_RTSP_TIME_END", "2"),
+    ("(gint) GST_RTSP_TIME_FRAMES", "3"),
+    ("(gint) GST_RTSP_TIME_NOW", "1"),
+    ("(gint) GST_RTSP_TIME_SECONDS", "0"),
+    ("(gint) GST_RTSP_TIME_UTC", "4"),
+    ("(guint) GST_RTSP_TRANS_RDT", "2"),
+    ("(guint) GST_RTSP_TRANS_RTP", "1"),
+    ("(guint) GST_RTSP_TRANS_UNKNOWN", "0"),
+    ("(gint) GST_RTSP_VERSION_1_0", "16"),
+    ("(gint) GST_RTSP_VERSION_1_1", "17"),
+    ("(gint) GST_RTSP_VERSION_2_0", "32"),
+    ("(gint) GST_RTSP_VERSION_INVALID", "0"),
 ];
 
 
diff --git a/gstreamer-rtsp-sys/tests/constant.c b/gstreamer-rtsp-sys/tests/constant.c
index a167e0146..f54bce75c 100644
--- a/gstreamer-rtsp-sys/tests/constant.c
+++ b/gstreamer-rtsp-sys/tests/constant.c
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
@@ -7,21 +7,21 @@
 
 int main() {
     printf(_Generic((ABI_CONSTANT_NAME),
-                    char *: "%s",
-                    const char *: "%s",
-                    char: "%c",
-                    signed char: "%hhd",
-                    unsigned char: "%hhu",
-                    short int: "%hd",
-                    unsigned short int: "%hu",
-                    int: "%d",
-                    unsigned int: "%u",
-                    long: "%ld",
-                    unsigned long: "%lu",
-                    long long: "%lld",
-                    unsigned long long: "%llu",
-                    double: "%f",
-                    long double: "%ld"),
+                    char *: "###gir test###%s###gir test###\n",
+                    const char *: "###gir test###%s###gir test###\n",
+                    char: "###gir test###%c###gir test###\n",
+                    signed char: "###gir test###%hhd###gir test###\n",
+                    unsigned char: "###gir test###%hhu###gir test###\n",
+                    short int: "###gir test###%hd###gir test###\n",
+                    unsigned short int: "###gir test###%hu###gir test###\n",
+                    int: "###gir test###%d###gir test###\n",
+                    unsigned int: "###gir test###%u###gir test###\n",
+                    long: "###gir test###%ld###gir test###\n",
+                    unsigned long: "###gir test###%lu###gir test###\n",
+                    long long: "###gir test###%lld###gir test###\n",
+                    unsigned long long: "###gir test###%llu###gir test###\n",
+                    double: "###gir test###%f###gir test###\n",
+                    long double: "###gir test###%ld###gir test###\n"),
            ABI_CONSTANT_NAME);
     return 0;
 }
diff --git a/gstreamer-rtsp-sys/tests/layout.c b/gstreamer-rtsp-sys/tests/layout.c
index 829276260..aef10fc35 100644
--- a/gstreamer-rtsp-sys/tests/layout.c
+++ b/gstreamer-rtsp-sys/tests/layout.c
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
diff --git a/gstreamer-sdp-sys/src/lib.rs b/gstreamer-sdp-sys/src/lib.rs
index 2e1d2b009..cda6cc37a 100644
--- a/gstreamer-sdp-sys/src/lib.rs
+++ b/gstreamer-sdp-sys/src/lib.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
diff --git a/gstreamer-sdp-sys/tests/abi.rs b/gstreamer-sdp-sys/tests/abi.rs
index ca991b481..c7dbe5e6f 100644
--- a/gstreamer-sdp-sys/tests/abi.rs
+++ b/gstreamer-sdp-sys/tests/abi.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
@@ -227,7 +227,14 @@ fn get_c_value(dir: &Path, cc: &Compiler, name: &str) -> Result<String, Box<Erro
                            &abi_cmd, &output).into());
     }
 
-    Ok(str::from_utf8(&output.stdout)?.trim().to_owned())
+    let output = str::from_utf8(&output.stdout)?.trim();
+    if !output.starts_with("###gir test###") ||
+       !output.ends_with("###gir test###") {
+        return Err(format!("command {:?} return invalid output, {:?}",
+                           &abi_cmd, &output).into());
+    }
+
+    Ok(String::from(&output[14..(output.len() - 14)]))
 }
 
 const RUST_LAYOUTS: &[(&str, Layout)] = &[
@@ -266,61 +273,61 @@ const RUST_LAYOUTS: &[(&str, Layout)] = &[
 ];
 
 const RUST_CONSTANTS: &[(&str, &str)] = &[
-    ("GST_MIKEY_CACHE_ALWAYS", "1"),
-    ("GST_MIKEY_CACHE_FOR_CSB", "2"),
-    ("GST_MIKEY_CACHE_NONE", "0"),
-    ("GST_MIKEY_ENC_AES_CM_128", "1"),
-    ("GST_MIKEY_ENC_AES_KW_128", "2"),
-    ("GST_MIKEY_ENC_NULL", "0"),
-    ("GST_MIKEY_KD_TEK", "2"),
-    ("GST_MIKEY_KD_TGK", "0"),
-    ("GST_MIKEY_KV_INTERVAL", "2"),
-    ("GST_MIKEY_KV_NULL", "0"),
-    ("GST_MIKEY_KV_SPI", "1"),
-    ("GST_MIKEY_MAC_HMAC_SHA_1_160", "1"),
-    ("GST_MIKEY_MAC_NULL", "0"),
-    ("GST_MIKEY_MAP_TYPE_SRTP", "0"),
-    ("GST_MIKEY_PRF_MIKEY_1", "0"),
-    ("GST_MIKEY_PT_CERT", "7"),
-    ("GST_MIKEY_PT_CHASH", "8"),
-    ("GST_MIKEY_PT_DH", "3"),
-    ("GST_MIKEY_PT_ERR", "12"),
-    ("GST_MIKEY_PT_GEN_EXT", "21"),
-    ("GST_MIKEY_PT_ID", "6"),
-    ("GST_MIKEY_PT_KEMAC", "1"),
-    ("GST_MIKEY_PT_KEY_DATA", "20"),
-    ("GST_MIKEY_PT_LAST", "0"),
-    ("GST_MIKEY_PT_PKE", "2"),
-    ("GST_MIKEY_PT_RAND", "11"),
-    ("GST_MIKEY_PT_SIGN", "4"),
-    ("GST_MIKEY_PT_SP", "10"),
-    ("GST_MIKEY_PT_T", "5"),
-    ("GST_MIKEY_PT_V", "9"),
-    ("GST_MIKEY_SEC_PROTO_SRTP", "0"),
-    ("GST_MIKEY_SP_SRTP_AUTH_ALG", "2"),
-    ("GST_MIKEY_SP_SRTP_AUTH_KEY_LEN", "3"),
-    ("GST_MIKEY_SP_SRTP_AUTH_TAG_LEN", "11"),
-    ("GST_MIKEY_SP_SRTP_ENC_ALG", "0"),
-    ("GST_MIKEY_SP_SRTP_ENC_KEY_LEN", "1"),
-    ("GST_MIKEY_SP_SRTP_FEC_ORDER", "9"),
-    ("GST_MIKEY_SP_SRTP_KEY_DERIV_RATE", "6"),
-    ("GST_MIKEY_SP_SRTP_PRF", "5"),
-    ("GST_MIKEY_SP_SRTP_SALT_KEY_LEN", "4"),
-    ("GST_MIKEY_SP_SRTP_SRTCP_ENC", "8"),
-    ("GST_MIKEY_SP_SRTP_SRTP_AUTH", "10"),
-    ("GST_MIKEY_SP_SRTP_SRTP_ENC", "7"),
-    ("GST_MIKEY_SP_SRTP_SRTP_PREFIX_LEN", "12"),
-    ("GST_MIKEY_TS_TYPE_COUNTER", "2"),
-    ("GST_MIKEY_TS_TYPE_NTP", "1"),
-    ("GST_MIKEY_TS_TYPE_NTP_UTC", "0"),
-    ("GST_MIKEY_TYPE_DH_INIT", "4"),
-    ("GST_MIKEY_TYPE_DH_RESP", "5"),
-    ("GST_MIKEY_TYPE_ERROR", "6"),
-    ("GST_MIKEY_TYPE_INVALID", "-1"),
-    ("GST_MIKEY_TYPE_PK_INIT", "2"),
-    ("GST_MIKEY_TYPE_PK_VERIFY", "3"),
-    ("GST_MIKEY_TYPE_PSK_INIT", "0"),
-    ("GST_MIKEY_TYPE_PSK_VERIFY", "1"),
+    ("(gint) GST_MIKEY_CACHE_ALWAYS", "1"),
+    ("(gint) GST_MIKEY_CACHE_FOR_CSB", "2"),
+    ("(gint) GST_MIKEY_CACHE_NONE", "0"),
+    ("(gint) GST_MIKEY_ENC_AES_CM_128", "1"),
+    ("(gint) GST_MIKEY_ENC_AES_KW_128", "2"),
+    ("(gint) GST_MIKEY_ENC_NULL", "0"),
+    ("(gint) GST_MIKEY_KD_TEK", "2"),
+    ("(gint) GST_MIKEY_KD_TGK", "0"),
+    ("(gint) GST_MIKEY_KV_INTERVAL", "2"),
+    ("(gint) GST_MIKEY_KV_NULL", "0"),
+    ("(gint) GST_MIKEY_KV_SPI", "1"),
+    ("(gint) GST_MIKEY_MAC_HMAC_SHA_1_160", "1"),
+    ("(gint) GST_MIKEY_MAC_NULL", "0"),
+    ("(gint) GST_MIKEY_MAP_TYPE_SRTP", "0"),
+    ("(gint) GST_MIKEY_PRF_MIKEY_1", "0"),
+    ("(gint) GST_MIKEY_PT_CERT", "7"),
+    ("(gint) GST_MIKEY_PT_CHASH", "8"),
+    ("(gint) GST_MIKEY_PT_DH", "3"),
+    ("(gint) GST_MIKEY_PT_ERR", "12"),
+    ("(gint) GST_MIKEY_PT_GEN_EXT", "21"),
+    ("(gint) GST_MIKEY_PT_ID", "6"),
+    ("(gint) GST_MIKEY_PT_KEMAC", "1"),
+    ("(gint) GST_MIKEY_PT_KEY_DATA", "20"),
+    ("(gint) GST_MIKEY_PT_LAST", "0"),
+    ("(gint) GST_MIKEY_PT_PKE", "2"),
+    ("(gint) GST_MIKEY_PT_RAND", "11"),
+    ("(gint) GST_MIKEY_PT_SIGN", "4"),
+    ("(gint) GST_MIKEY_PT_SP", "10"),
+    ("(gint) GST_MIKEY_PT_T", "5"),
+    ("(gint) GST_MIKEY_PT_V", "9"),
+    ("(gint) GST_MIKEY_SEC_PROTO_SRTP", "0"),
+    ("(gint) GST_MIKEY_SP_SRTP_AUTH_ALG", "2"),
+    ("(gint) GST_MIKEY_SP_SRTP_AUTH_KEY_LEN", "3"),
+    ("(gint) GST_MIKEY_SP_SRTP_AUTH_TAG_LEN", "11"),
+    ("(gint) GST_MIKEY_SP_SRTP_ENC_ALG", "0"),
+    ("(gint) GST_MIKEY_SP_SRTP_ENC_KEY_LEN", "1"),
+    ("(gint) GST_MIKEY_SP_SRTP_FEC_ORDER", "9"),
+    ("(gint) GST_MIKEY_SP_SRTP_KEY_DERIV_RATE", "6"),
+    ("(gint) GST_MIKEY_SP_SRTP_PRF", "5"),
+    ("(gint) GST_MIKEY_SP_SRTP_SALT_KEY_LEN", "4"),
+    ("(gint) GST_MIKEY_SP_SRTP_SRTCP_ENC", "8"),
+    ("(gint) GST_MIKEY_SP_SRTP_SRTP_AUTH", "10"),
+    ("(gint) GST_MIKEY_SP_SRTP_SRTP_ENC", "7"),
+    ("(gint) GST_MIKEY_SP_SRTP_SRTP_PREFIX_LEN", "12"),
+    ("(gint) GST_MIKEY_TS_TYPE_COUNTER", "2"),
+    ("(gint) GST_MIKEY_TS_TYPE_NTP", "1"),
+    ("(gint) GST_MIKEY_TS_TYPE_NTP_UTC", "0"),
+    ("(gint) GST_MIKEY_TYPE_DH_INIT", "4"),
+    ("(gint) GST_MIKEY_TYPE_DH_RESP", "5"),
+    ("(gint) GST_MIKEY_TYPE_ERROR", "6"),
+    ("(gint) GST_MIKEY_TYPE_INVALID", "-1"),
+    ("(gint) GST_MIKEY_TYPE_PK_INIT", "2"),
+    ("(gint) GST_MIKEY_TYPE_PK_VERIFY", "3"),
+    ("(gint) GST_MIKEY_TYPE_PSK_INIT", "0"),
+    ("(gint) GST_MIKEY_TYPE_PSK_VERIFY", "1"),
     ("GST_MIKEY_VERSION", "1"),
     ("GST_SDP_BWTYPE_AS", "AS"),
     ("GST_SDP_BWTYPE_CT", "CT"),
@@ -328,8 +335,8 @@ const RUST_CONSTANTS: &[(&str, &str)] = &[
     ("GST_SDP_BWTYPE_RR", "RR"),
     ("GST_SDP_BWTYPE_RS", "RS"),
     ("GST_SDP_BWTYPE_TIAS", "TIAS"),
-    ("GST_SDP_EINVAL", "-1"),
-    ("GST_SDP_OK", "0"),
+    ("(gint) GST_SDP_EINVAL", "-1"),
+    ("(gint) GST_SDP_OK", "0"),
 ];
 
 
diff --git a/gstreamer-sdp-sys/tests/constant.c b/gstreamer-sdp-sys/tests/constant.c
index a167e0146..f54bce75c 100644
--- a/gstreamer-sdp-sys/tests/constant.c
+++ b/gstreamer-sdp-sys/tests/constant.c
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
@@ -7,21 +7,21 @@
 
 int main() {
     printf(_Generic((ABI_CONSTANT_NAME),
-                    char *: "%s",
-                    const char *: "%s",
-                    char: "%c",
-                    signed char: "%hhd",
-                    unsigned char: "%hhu",
-                    short int: "%hd",
-                    unsigned short int: "%hu",
-                    int: "%d",
-                    unsigned int: "%u",
-                    long: "%ld",
-                    unsigned long: "%lu",
-                    long long: "%lld",
-                    unsigned long long: "%llu",
-                    double: "%f",
-                    long double: "%ld"),
+                    char *: "###gir test###%s###gir test###\n",
+                    const char *: "###gir test###%s###gir test###\n",
+                    char: "###gir test###%c###gir test###\n",
+                    signed char: "###gir test###%hhd###gir test###\n",
+                    unsigned char: "###gir test###%hhu###gir test###\n",
+                    short int: "###gir test###%hd###gir test###\n",
+                    unsigned short int: "###gir test###%hu###gir test###\n",
+                    int: "###gir test###%d###gir test###\n",
+                    unsigned int: "###gir test###%u###gir test###\n",
+                    long: "###gir test###%ld###gir test###\n",
+                    unsigned long: "###gir test###%lu###gir test###\n",
+                    long long: "###gir test###%lld###gir test###\n",
+                    unsigned long long: "###gir test###%llu###gir test###\n",
+                    double: "###gir test###%f###gir test###\n",
+                    long double: "###gir test###%ld###gir test###\n"),
            ABI_CONSTANT_NAME);
     return 0;
 }
diff --git a/gstreamer-sdp-sys/tests/layout.c b/gstreamer-sdp-sys/tests/layout.c
index 829276260..aef10fc35 100644
--- a/gstreamer-sdp-sys/tests/layout.c
+++ b/gstreamer-sdp-sys/tests/layout.c
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
diff --git a/gstreamer-sys/src/lib.rs b/gstreamer-sys/src/lib.rs
index e99c7fdce..a6d91283a 100644
--- a/gstreamer-sys/src/lib.rs
+++ b/gstreamer-sys/src/lib.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
@@ -468,13 +468,11 @@ pub const GST_ELEMENT_METADATA_DOC_URI: *const c_char = b"doc-uri\0" as *const u
 pub const GST_ELEMENT_METADATA_ICON_NAME: *const c_char = b"icon-name\0" as *const u8 as *const c_char;
 pub const GST_ELEMENT_METADATA_KLASS: *const c_char = b"klass\0" as *const u8 as *const c_char;
 pub const GST_ELEMENT_METADATA_LONGNAME: *const c_char = b"long-name\0" as *const u8 as *const c_char;
-pub const GST_ERROR_SYSTEM: *const c_char = b"system error: %s\0" as *const u8 as *const c_char;
 pub const GST_EVENT_NUM_SHIFT: c_int = 8;
 pub const GST_EVENT_TYPE_BOTH: GstEventTypeFlags = 3;
 pub const GST_FLAG_SET_MASK_EXACT: c_uint = 4294967295;
 pub const GST_FORMAT_PERCENT_MAX: i64 = 1000000;
 pub const GST_FORMAT_PERCENT_SCALE: i64 = 10000;
-pub const GST_FOURCC_FORMAT: *const c_char = b"c%c%c%c\0" as *const u8 as *const c_char;
 pub const GST_GROUP_ID_INVALID: c_int = 0;
 pub const GST_LICENSE_UNKNOWN: *const c_char = b"unknown\0" as *const u8 as *const c_char;
 pub const GST_LOCK_FLAG_READWRITE: GstLockFlags = 3;
@@ -488,13 +486,10 @@ pub const GST_PARAM_MUTABLE_PLAYING: c_int = 4096;
 pub const GST_PARAM_MUTABLE_READY: c_int = 1024;
 pub const GST_PARAM_USER_SHIFT: c_int = 65536;
 pub const GST_PROTECTION_SYSTEM_ID_CAPS_FIELD: *const c_char = b"protection-system\0" as *const u8 as *const c_char;
-pub const GST_PTR_FORMAT: *const c_char = b"paA\0" as *const u8 as *const c_char;
 pub const GST_QUERY_NUM_SHIFT: c_int = 8;
 pub const GST_QUERY_TYPE_BOTH: GstQueryTypeFlags = 3;
 pub const GST_SECOND: GstClockTimeDiff = 1000000000;
-pub const GST_SEGMENT_FORMAT: *const c_char = b"paB\0" as *const u8 as *const c_char;
 pub const GST_SEQNUM_INVALID: c_int = 0;
-pub const GST_STIME_FORMAT: *const c_char = b"c%\0" as *const u8 as *const c_char;
 pub const GST_TAG_ALBUM: *const c_char = b"album\0" as *const u8 as *const c_char;
 pub const GST_TAG_ALBUM_ARTIST: *const c_char = b"album-artist\0" as *const u8 as *const c_char;
 pub const GST_TAG_ALBUM_ARTIST_SORTNAME: *const c_char = b"album-artist-sortname\0" as *const u8 as *const c_char;
@@ -580,7 +575,6 @@ pub const GST_TAG_TRACK_PEAK: *const c_char = b"replaygain-track-peak\0" as *con
 pub const GST_TAG_USER_RATING: *const c_char = b"user-rating\0" as *const u8 as *const c_char;
 pub const GST_TAG_VERSION: *const c_char = b"version\0" as *const u8 as *const c_char;
 pub const GST_TAG_VIDEO_CODEC: *const c_char = b"video-codec\0" as *const u8 as *const c_char;
-pub const GST_TIME_FORMAT: *const c_char = b"u:%02u:%02u.%09u\0" as *const u8 as *const c_char;
 pub const GST_TOC_REPEAT_COUNT_INFINITE: c_int = -1;
 pub const GST_URI_NO_PORT: c_int = 0;
 pub const GST_USECOND: GstClockTimeDiff = 1000;
diff --git a/gstreamer-sys/tests/abi.rs b/gstreamer-sys/tests/abi.rs
index 05b255022..c424721a4 100644
--- a/gstreamer-sys/tests/abi.rs
+++ b/gstreamer-sys/tests/abi.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
@@ -227,7 +227,14 @@ fn get_c_value(dir: &Path, cc: &Compiler, name: &str) -> Result<String, Box<Erro
                            &abi_cmd, &output).into());
     }
 
-    Ok(str::from_utf8(&output.stdout)?.trim().to_owned())
+    let output = str::from_utf8(&output.stdout)?.trim();
+    if !output.starts_with("###gir test###") ||
+       !output.ends_with("###gir test###") {
+        return Err(format!("command {:?} return invalid output, {:?}",
+                           &abi_cmd, &output).into());
+    }
+
+    Ok(String::from(&output[14..(output.len() - 14)]))
 }
 
 const RUST_LAYOUTS: &[(&str, Layout)] = &[
@@ -407,123 +414,123 @@ const RUST_LAYOUTS: &[(&str, Layout)] = &[
 ];
 
 const RUST_CONSTANTS: &[(&str, &str)] = &[
-    ("GST_ALLOCATOR_FLAG_CUSTOM_ALLOC", "16"),
-    ("GST_ALLOCATOR_FLAG_LAST", "1048576"),
+    ("(guint) GST_ALLOCATOR_FLAG_CUSTOM_ALLOC", "16"),
+    ("(guint) GST_ALLOCATOR_FLAG_LAST", "1048576"),
     ("GST_ALLOCATOR_SYSMEM", "SystemMemory"),
-    ("GST_BIN_FLAG_LAST", "524288"),
-    ("GST_BIN_FLAG_NO_RESYNC", "16384"),
-    ("GST_BIN_FLAG_STREAMS_AWARE", "32768"),
-    ("GST_BUFFERING_DOWNLOAD", "1"),
-    ("GST_BUFFERING_LIVE", "3"),
-    ("GST_BUFFERING_STREAM", "0"),
-    ("GST_BUFFERING_TIMESHIFT", "2"),
+    ("(guint) GST_BIN_FLAG_LAST", "524288"),
+    ("(guint) GST_BIN_FLAG_NO_RESYNC", "16384"),
+    ("(guint) GST_BIN_FLAG_STREAMS_AWARE", "32768"),
+    ("(gint) GST_BUFFERING_DOWNLOAD", "1"),
+    ("(gint) GST_BUFFERING_LIVE", "3"),
+    ("(gint) GST_BUFFERING_STREAM", "0"),
+    ("(gint) GST_BUFFERING_TIMESHIFT", "2"),
     ("GST_BUFFER_COPY_ALL", "15"),
-    ("GST_BUFFER_COPY_DEEP", "32"),
-    ("GST_BUFFER_COPY_FLAGS", "1"),
-    ("GST_BUFFER_COPY_MEMORY", "8"),
-    ("GST_BUFFER_COPY_MERGE", "16"),
-    ("GST_BUFFER_COPY_META", "4"),
+    ("(guint) GST_BUFFER_COPY_DEEP", "32"),
+    ("(guint) GST_BUFFER_COPY_FLAGS", "1"),
+    ("(guint) GST_BUFFER_COPY_MEMORY", "8"),
+    ("(guint) GST_BUFFER_COPY_MERGE", "16"),
+    ("(guint) GST_BUFFER_COPY_META", "4"),
     ("GST_BUFFER_COPY_METADATA", "7"),
-    ("GST_BUFFER_COPY_NONE", "0"),
-    ("GST_BUFFER_COPY_TIMESTAMPS", "2"),
-    ("GST_BUFFER_FLAG_CORRUPTED", "256"),
-    ("GST_BUFFER_FLAG_DECODE_ONLY", "32"),
-    ("GST_BUFFER_FLAG_DELTA_UNIT", "8192"),
-    ("GST_BUFFER_FLAG_DISCONT", "64"),
-    ("GST_BUFFER_FLAG_DROPPABLE", "4096"),
-    ("GST_BUFFER_FLAG_GAP", "2048"),
-    ("GST_BUFFER_FLAG_HEADER", "1024"),
-    ("GST_BUFFER_FLAG_LAST", "1048576"),
-    ("GST_BUFFER_FLAG_LIVE", "16"),
-    ("GST_BUFFER_FLAG_MARKER", "512"),
-    ("GST_BUFFER_FLAG_NON_DROPPABLE", "65536"),
-    ("GST_BUFFER_FLAG_RESYNC", "128"),
-    ("GST_BUFFER_FLAG_SYNC_AFTER", "32768"),
-    ("GST_BUFFER_FLAG_TAG_MEMORY", "16384"),
+    ("(guint) GST_BUFFER_COPY_NONE", "0"),
+    ("(guint) GST_BUFFER_COPY_TIMESTAMPS", "2"),
+    ("(guint) GST_BUFFER_FLAG_CORRUPTED", "256"),
+    ("(guint) GST_BUFFER_FLAG_DECODE_ONLY", "32"),
+    ("(guint) GST_BUFFER_FLAG_DELTA_UNIT", "8192"),
+    ("(guint) GST_BUFFER_FLAG_DISCONT", "64"),
+    ("(guint) GST_BUFFER_FLAG_DROPPABLE", "4096"),
+    ("(guint) GST_BUFFER_FLAG_GAP", "2048"),
+    ("(guint) GST_BUFFER_FLAG_HEADER", "1024"),
+    ("(guint) GST_BUFFER_FLAG_LAST", "1048576"),
+    ("(guint) GST_BUFFER_FLAG_LIVE", "16"),
+    ("(guint) GST_BUFFER_FLAG_MARKER", "512"),
+    ("(guint) GST_BUFFER_FLAG_NON_DROPPABLE", "65536"),
+    ("(guint) GST_BUFFER_FLAG_RESYNC", "128"),
+    ("(guint) GST_BUFFER_FLAG_SYNC_AFTER", "32768"),
+    ("(guint) GST_BUFFER_FLAG_TAG_MEMORY", "16384"),
     ("GST_BUFFER_OFFSET_NONE", "18446744073709551615"),
-    ("GST_BUFFER_POOL_ACQUIRE_FLAG_DISCONT", "4"),
-    ("GST_BUFFER_POOL_ACQUIRE_FLAG_DONTWAIT", "2"),
-    ("GST_BUFFER_POOL_ACQUIRE_FLAG_KEY_UNIT", "1"),
-    ("GST_BUFFER_POOL_ACQUIRE_FLAG_LAST", "65536"),
-    ("GST_BUFFER_POOL_ACQUIRE_FLAG_NONE", "0"),
-    ("GST_BUS_ASYNC", "2"),
-    ("GST_BUS_DROP", "0"),
-    ("GST_BUS_FLAG_LAST", "32"),
-    ("GST_BUS_FLUSHING", "16"),
-    ("GST_BUS_PASS", "1"),
+    ("(guint) GST_BUFFER_POOL_ACQUIRE_FLAG_DISCONT", "4"),
+    ("(guint) GST_BUFFER_POOL_ACQUIRE_FLAG_DONTWAIT", "2"),
+    ("(guint) GST_BUFFER_POOL_ACQUIRE_FLAG_KEY_UNIT", "1"),
+    ("(guint) GST_BUFFER_POOL_ACQUIRE_FLAG_LAST", "65536"),
+    ("(guint) GST_BUFFER_POOL_ACQUIRE_FLAG_NONE", "0"),
+    ("(gint) GST_BUS_ASYNC", "2"),
+    ("(gint) GST_BUS_DROP", "0"),
+    ("(guint) GST_BUS_FLAG_LAST", "32"),
+    ("(guint) GST_BUS_FLUSHING", "16"),
+    ("(gint) GST_BUS_PASS", "1"),
     ("GST_CAN_INLINE", "1"),
     ("GST_CAPS_FEATURE_MEMORY_SYSTEM_MEMORY", "memory:SystemMemory"),
-    ("GST_CAPS_FLAG_ANY", "16"),
-    ("GST_CAPS_INTERSECT_FIRST", "1"),
-    ("GST_CAPS_INTERSECT_ZIG_ZAG", "0"),
-    ("GST_CLOCK_BADTIME", "4"),
-    ("GST_CLOCK_BUSY", "3"),
-    ("GST_CLOCK_DONE", "7"),
-    ("GST_CLOCK_EARLY", "1"),
-    ("GST_CLOCK_ENTRY_PERIODIC", "1"),
-    ("GST_CLOCK_ENTRY_SINGLE", "0"),
-    ("GST_CLOCK_ERROR", "5"),
-    ("GST_CLOCK_FLAG_CAN_DO_PERIODIC_ASYNC", "128"),
-    ("GST_CLOCK_FLAG_CAN_DO_PERIODIC_SYNC", "64"),
-    ("GST_CLOCK_FLAG_CAN_DO_SINGLE_ASYNC", "32"),
-    ("GST_CLOCK_FLAG_CAN_DO_SINGLE_SYNC", "16"),
-    ("GST_CLOCK_FLAG_CAN_SET_MASTER", "512"),
-    ("GST_CLOCK_FLAG_CAN_SET_RESOLUTION", "256"),
-    ("GST_CLOCK_FLAG_LAST", "4096"),
-    ("GST_CLOCK_FLAG_NEEDS_STARTUP_SYNC", "1024"),
-    ("GST_CLOCK_OK", "0"),
+    ("(guint) GST_CAPS_FLAG_ANY", "16"),
+    ("(gint) GST_CAPS_INTERSECT_FIRST", "1"),
+    ("(gint) GST_CAPS_INTERSECT_ZIG_ZAG", "0"),
+    ("(gint) GST_CLOCK_BADTIME", "4"),
+    ("(gint) GST_CLOCK_BUSY", "3"),
+    ("(gint) GST_CLOCK_DONE", "7"),
+    ("(gint) GST_CLOCK_EARLY", "1"),
+    ("(gint) GST_CLOCK_ENTRY_PERIODIC", "1"),
+    ("(gint) GST_CLOCK_ENTRY_SINGLE", "0"),
+    ("(gint) GST_CLOCK_ERROR", "5"),
+    ("(guint) GST_CLOCK_FLAG_CAN_DO_PERIODIC_ASYNC", "128"),
+    ("(guint) GST_CLOCK_FLAG_CAN_DO_PERIODIC_SYNC", "64"),
+    ("(guint) GST_CLOCK_FLAG_CAN_DO_SINGLE_ASYNC", "32"),
+    ("(guint) GST_CLOCK_FLAG_CAN_DO_SINGLE_SYNC", "16"),
+    ("(guint) GST_CLOCK_FLAG_CAN_SET_MASTER", "512"),
+    ("(guint) GST_CLOCK_FLAG_CAN_SET_RESOLUTION", "256"),
+    ("(guint) GST_CLOCK_FLAG_LAST", "4096"),
+    ("(guint) GST_CLOCK_FLAG_NEEDS_STARTUP_SYNC", "1024"),
+    ("(gint) GST_CLOCK_OK", "0"),
     ("GST_CLOCK_TIME_NONE", "18446744073709551615"),
-    ("GST_CLOCK_TYPE_MONOTONIC", "1"),
-    ("GST_CLOCK_TYPE_OTHER", "2"),
-    ("GST_CLOCK_TYPE_REALTIME", "0"),
-    ("GST_CLOCK_UNSCHEDULED", "2"),
-    ("GST_CLOCK_UNSUPPORTED", "6"),
-    ("GST_CORE_ERROR_CAPS", "10"),
-    ("GST_CORE_ERROR_CLOCK", "13"),
-    ("GST_CORE_ERROR_DISABLED", "14"),
-    ("GST_CORE_ERROR_EVENT", "8"),
-    ("GST_CORE_ERROR_FAILED", "1"),
-    ("GST_CORE_ERROR_MISSING_PLUGIN", "12"),
-    ("GST_CORE_ERROR_NEGOTIATION", "7"),
-    ("GST_CORE_ERROR_NOT_IMPLEMENTED", "3"),
-    ("GST_CORE_ERROR_NUM_ERRORS", "15"),
-    ("GST_CORE_ERROR_PAD", "5"),
-    ("GST_CORE_ERROR_SEEK", "9"),
-    ("GST_CORE_ERROR_STATE_CHANGE", "4"),
-    ("GST_CORE_ERROR_TAG", "11"),
-    ("GST_CORE_ERROR_THREAD", "6"),
-    ("GST_CORE_ERROR_TOO_LAZY", "2"),
-    ("GST_DEBUG_BG_BLACK", "0"),
-    ("GST_DEBUG_BG_BLUE", "64"),
-    ("GST_DEBUG_BG_CYAN", "96"),
-    ("GST_DEBUG_BG_GREEN", "32"),
-    ("GST_DEBUG_BG_MAGENTA", "80"),
+    ("(gint) GST_CLOCK_TYPE_MONOTONIC", "1"),
+    ("(gint) GST_CLOCK_TYPE_OTHER", "2"),
+    ("(gint) GST_CLOCK_TYPE_REALTIME", "0"),
+    ("(gint) GST_CLOCK_UNSCHEDULED", "2"),
+    ("(gint) GST_CLOCK_UNSUPPORTED", "6"),
+    ("(gint) GST_CORE_ERROR_CAPS", "10"),
+    ("(gint) GST_CORE_ERROR_CLOCK", "13"),
+    ("(gint) GST_CORE_ERROR_DISABLED", "14"),
+    ("(gint) GST_CORE_ERROR_EVENT", "8"),
+    ("(gint) GST_CORE_ERROR_FAILED", "1"),
+    ("(gint) GST_CORE_ERROR_MISSING_PLUGIN", "12"),
+    ("(gint) GST_CORE_ERROR_NEGOTIATION", "7"),
+    ("(gint) GST_CORE_ERROR_NOT_IMPLEMENTED", "3"),
+    ("(gint) GST_CORE_ERROR_NUM_ERRORS", "15"),
+    ("(gint) GST_CORE_ERROR_PAD", "5"),
+    ("(gint) GST_CORE_ERROR_SEEK", "9"),
+    ("(gint) GST_CORE_ERROR_STATE_CHANGE", "4"),
+    ("(gint) GST_CORE_ERROR_TAG", "11"),
+    ("(gint) GST_CORE_ERROR_THREAD", "6"),
+    ("(gint) GST_CORE_ERROR_TOO_LAZY", "2"),
+    ("(guint) GST_DEBUG_BG_BLACK", "0"),
+    ("(guint) GST_DEBUG_BG_BLUE", "64"),
+    ("(guint) GST_DEBUG_BG_CYAN", "96"),
+    ("(guint) GST_DEBUG_BG_GREEN", "32"),
+    ("(guint) GST_DEBUG_BG_MAGENTA", "80"),
     ("GST_DEBUG_BG_MASK", "240"),
-    ("GST_DEBUG_BG_RED", "16"),
-    ("GST_DEBUG_BG_WHITE", "112"),
-    ("GST_DEBUG_BG_YELLOW", "48"),
-    ("GST_DEBUG_BOLD", "256"),
-    ("GST_DEBUG_COLOR_MODE_OFF", "0"),
-    ("GST_DEBUG_COLOR_MODE_ON", "1"),
-    ("GST_DEBUG_COLOR_MODE_UNIX", "2"),
-    ("GST_DEBUG_FG_BLACK", "0"),
-    ("GST_DEBUG_FG_BLUE", "4"),
-    ("GST_DEBUG_FG_CYAN", "6"),
-    ("GST_DEBUG_FG_GREEN", "2"),
-    ("GST_DEBUG_FG_MAGENTA", "5"),
+    ("(guint) GST_DEBUG_BG_RED", "16"),
+    ("(guint) GST_DEBUG_BG_WHITE", "112"),
+    ("(guint) GST_DEBUG_BG_YELLOW", "48"),
+    ("(guint) GST_DEBUG_BOLD", "256"),
+    ("(gint) GST_DEBUG_COLOR_MODE_OFF", "0"),
+    ("(gint) GST_DEBUG_COLOR_MODE_ON", "1"),
+    ("(gint) GST_DEBUG_COLOR_MODE_UNIX", "2"),
+    ("(guint) GST_DEBUG_FG_BLACK", "0"),
+    ("(guint) GST_DEBUG_FG_BLUE", "4"),
+    ("(guint) GST_DEBUG_FG_CYAN", "6"),
+    ("(guint) GST_DEBUG_FG_GREEN", "2"),
+    ("(guint) GST_DEBUG_FG_MAGENTA", "5"),
     ("GST_DEBUG_FG_MASK", "15"),
-    ("GST_DEBUG_FG_RED", "1"),
-    ("GST_DEBUG_FG_WHITE", "7"),
-    ("GST_DEBUG_FG_YELLOW", "3"),
+    ("(guint) GST_DEBUG_FG_RED", "1"),
+    ("(guint) GST_DEBUG_FG_WHITE", "7"),
+    ("(guint) GST_DEBUG_FG_YELLOW", "3"),
     ("GST_DEBUG_FORMAT_MASK", "65280"),
-    ("GST_DEBUG_GRAPH_SHOW_ALL", "15"),
-    ("GST_DEBUG_GRAPH_SHOW_CAPS_DETAILS", "2"),
-    ("GST_DEBUG_GRAPH_SHOW_FULL_PARAMS", "16"),
-    ("GST_DEBUG_GRAPH_SHOW_MEDIA_TYPE", "1"),
-    ("GST_DEBUG_GRAPH_SHOW_NON_DEFAULT_PARAMS", "4"),
-    ("GST_DEBUG_GRAPH_SHOW_STATES", "8"),
-    ("GST_DEBUG_GRAPH_SHOW_VERBOSE", "-1"),
-    ("GST_DEBUG_UNDERLINE", "512"),
+    ("(guint) GST_DEBUG_GRAPH_SHOW_ALL", "15"),
+    ("(guint) GST_DEBUG_GRAPH_SHOW_CAPS_DETAILS", "2"),
+    ("(guint) GST_DEBUG_GRAPH_SHOW_FULL_PARAMS", "16"),
+    ("(guint) GST_DEBUG_GRAPH_SHOW_MEDIA_TYPE", "1"),
+    ("(guint) GST_DEBUG_GRAPH_SHOW_NON_DEFAULT_PARAMS", "4"),
+    ("(guint) GST_DEBUG_GRAPH_SHOW_STATES", "8"),
+    ("(guint) GST_DEBUG_GRAPH_SHOW_VERBOSE", "4294967295"),
+    ("(guint) GST_DEBUG_UNDERLINE", "512"),
     ("GST_ELEMENT_FACTORY_KLASS_DECODER", "Decoder"),
     ("GST_ELEMENT_FACTORY_KLASS_DECRYPTOR", "Decryptor"),
     ("GST_ELEMENT_FACTORY_KLASS_DEMUXER", "Demuxer"),
@@ -565,412 +572,407 @@ const RUST_CONSTANTS: &[(&str, &str)] = &[
     ("GST_ELEMENT_FACTORY_TYPE_SINK", "4"),
     ("GST_ELEMENT_FACTORY_TYPE_SRC", "8"),
     ("GST_ELEMENT_FACTORY_TYPE_VIDEO_ENCODER", "2814749767106562"),
-    ("GST_ELEMENT_FLAG_INDEXABLE", "512"),
-    ("GST_ELEMENT_FLAG_LAST", "16384"),
-    ("GST_ELEMENT_FLAG_LOCKED_STATE", "16"),
-    ("GST_ELEMENT_FLAG_PROVIDE_CLOCK", "128"),
-    ("GST_ELEMENT_FLAG_REQUIRE_CLOCK", "256"),
-    ("GST_ELEMENT_FLAG_SINK", "32"),
-    ("GST_ELEMENT_FLAG_SOURCE", "64"),
+    ("(guint) GST_ELEMENT_FLAG_INDEXABLE", "512"),
+    ("(guint) GST_ELEMENT_FLAG_LAST", "16384"),
+    ("(guint) GST_ELEMENT_FLAG_LOCKED_STATE", "16"),
+    ("(guint) GST_ELEMENT_FLAG_PROVIDE_CLOCK", "128"),
+    ("(guint) GST_ELEMENT_FLAG_REQUIRE_CLOCK", "256"),
+    ("(guint) GST_ELEMENT_FLAG_SINK", "32"),
+    ("(guint) GST_ELEMENT_FLAG_SOURCE", "64"),
     ("GST_ELEMENT_METADATA_AUTHOR", "author"),
     ("GST_ELEMENT_METADATA_DESCRIPTION", "description"),
     ("GST_ELEMENT_METADATA_DOC_URI", "doc-uri"),
     ("GST_ELEMENT_METADATA_ICON_NAME", "icon-name"),
     ("GST_ELEMENT_METADATA_KLASS", "klass"),
     ("GST_ELEMENT_METADATA_LONGNAME", "long-name"),
-    ("GST_ERROR_SYSTEM", "system error: %s"),
-    ("GST_EVENT_BUFFERSIZE", "23054"),
-    ("GST_EVENT_CAPS", "12814"),
-    ("GST_EVENT_CUSTOM_BOTH", "79367"),
-    ("GST_EVENT_CUSTOM_BOTH_OOB", "81923"),
-    ("GST_EVENT_CUSTOM_DOWNSTREAM", "71686"),
-    ("GST_EVENT_CUSTOM_DOWNSTREAM_OOB", "74242"),
-    ("GST_EVENT_CUSTOM_DOWNSTREAM_STICKY", "76830"),
-    ("GST_EVENT_CUSTOM_UPSTREAM", "69121"),
-    ("GST_EVENT_EOS", "28174"),
-    ("GST_EVENT_FLUSH_START", "2563"),
-    ("GST_EVENT_FLUSH_STOP", "5127"),
-    ("GST_EVENT_GAP", "40966"),
-    ("GST_EVENT_LATENCY", "56321"),
-    ("GST_EVENT_NAVIGATION", "53761"),
+    ("(gint) GST_EVENT_BUFFERSIZE", "23054"),
+    ("(gint) GST_EVENT_CAPS", "12814"),
+    ("(gint) GST_EVENT_CUSTOM_BOTH", "79367"),
+    ("(gint) GST_EVENT_CUSTOM_BOTH_OOB", "81923"),
+    ("(gint) GST_EVENT_CUSTOM_DOWNSTREAM", "71686"),
+    ("(gint) GST_EVENT_CUSTOM_DOWNSTREAM_OOB", "74242"),
+    ("(gint) GST_EVENT_CUSTOM_DOWNSTREAM_STICKY", "76830"),
+    ("(gint) GST_EVENT_CUSTOM_UPSTREAM", "69121"),
+    ("(gint) GST_EVENT_EOS", "28174"),
+    ("(gint) GST_EVENT_FLUSH_START", "2563"),
+    ("(gint) GST_EVENT_FLUSH_STOP", "5127"),
+    ("(gint) GST_EVENT_GAP", "40966"),
+    ("(gint) GST_EVENT_LATENCY", "56321"),
+    ("(gint) GST_EVENT_NAVIGATION", "53761"),
     ("GST_EVENT_NUM_SHIFT", "8"),
-    ("GST_EVENT_PROTECTION", "33310"),
-    ("GST_EVENT_QOS", "48641"),
-    ("GST_EVENT_RECONFIGURE", "61441"),
-    ("GST_EVENT_SEEK", "51201"),
-    ("GST_EVENT_SEGMENT", "17934"),
-    ("GST_EVENT_SEGMENT_DONE", "38406"),
-    ("GST_EVENT_SELECT_STREAMS", "66561"),
-    ("GST_EVENT_SINK_MESSAGE", "25630"),
-    ("GST_EVENT_STEP", "58881"),
-    ("GST_EVENT_STREAM_COLLECTION", "19230"),
-    ("GST_EVENT_STREAM_GROUP_DONE", "26894"),
-    ("GST_EVENT_STREAM_START", "10254"),
-    ("GST_EVENT_TAG", "20510"),
-    ("GST_EVENT_TOC", "30750"),
-    ("GST_EVENT_TOC_SELECT", "64001"),
+    ("(gint) GST_EVENT_PROTECTION", "33310"),
+    ("(gint) GST_EVENT_QOS", "48641"),
+    ("(gint) GST_EVENT_RECONFIGURE", "61441"),
+    ("(gint) GST_EVENT_SEEK", "51201"),
+    ("(gint) GST_EVENT_SEGMENT", "17934"),
+    ("(gint) GST_EVENT_SEGMENT_DONE", "38406"),
+    ("(gint) GST_EVENT_SELECT_STREAMS", "66561"),
+    ("(gint) GST_EVENT_SINK_MESSAGE", "25630"),
+    ("(gint) GST_EVENT_STEP", "58881"),
+    ("(gint) GST_EVENT_STREAM_COLLECTION", "19230"),
+    ("(gint) GST_EVENT_STREAM_GROUP_DONE", "26894"),
+    ("(gint) GST_EVENT_STREAM_START", "10254"),
+    ("(gint) GST_EVENT_TAG", "20510"),
+    ("(gint) GST_EVENT_TOC", "30750"),
+    ("(gint) GST_EVENT_TOC_SELECT", "64001"),
     ("GST_EVENT_TYPE_BOTH", "3"),
-    ("GST_EVENT_TYPE_DOWNSTREAM", "2"),
-    ("GST_EVENT_TYPE_SERIALIZED", "4"),
-    ("GST_EVENT_TYPE_STICKY", "8"),
-    ("GST_EVENT_TYPE_STICKY_MULTI", "16"),
-    ("GST_EVENT_TYPE_UPSTREAM", "1"),
-    ("GST_EVENT_UNKNOWN", "0"),
+    ("(guint) GST_EVENT_TYPE_DOWNSTREAM", "2"),
+    ("(guint) GST_EVENT_TYPE_SERIALIZED", "4"),
+    ("(guint) GST_EVENT_TYPE_STICKY", "8"),
+    ("(guint) GST_EVENT_TYPE_STICKY_MULTI", "16"),
+    ("(guint) GST_EVENT_TYPE_UPSTREAM", "1"),
+    ("(gint) GST_EVENT_UNKNOWN", "0"),
     ("GST_FLAG_SET_MASK_EXACT", "4294967295"),
-    ("GST_FLOW_CUSTOM_ERROR", "-100"),
-    ("GST_FLOW_CUSTOM_ERROR_1", "-101"),
-    ("GST_FLOW_CUSTOM_ERROR_2", "-102"),
-    ("GST_FLOW_CUSTOM_SUCCESS", "100"),
-    ("GST_FLOW_CUSTOM_SUCCESS_1", "101"),
-    ("GST_FLOW_CUSTOM_SUCCESS_2", "102"),
-    ("GST_FLOW_EOS", "-3"),
-    ("GST_FLOW_ERROR", "-5"),
-    ("GST_FLOW_FLUSHING", "-2"),
-    ("GST_FLOW_NOT_LINKED", "-1"),
-    ("GST_FLOW_NOT_NEGOTIATED", "-4"),
-    ("GST_FLOW_NOT_SUPPORTED", "-6"),
-    ("GST_FLOW_OK", "0"),
-    ("GST_FORMAT_BUFFERS", "4"),
-    ("GST_FORMAT_BYTES", "2"),
-    ("GST_FORMAT_DEFAULT", "1"),
-    ("GST_FORMAT_PERCENT", "5"),
+    ("(gint) GST_FLOW_CUSTOM_ERROR", "-100"),
+    ("(gint) GST_FLOW_CUSTOM_ERROR_1", "-101"),
+    ("(gint) GST_FLOW_CUSTOM_ERROR_2", "-102"),
+    ("(gint) GST_FLOW_CUSTOM_SUCCESS", "100"),
+    ("(gint) GST_FLOW_CUSTOM_SUCCESS_1", "101"),
+    ("(gint) GST_FLOW_CUSTOM_SUCCESS_2", "102"),
+    ("(gint) GST_FLOW_EOS", "-3"),
+    ("(gint) GST_FLOW_ERROR", "-5"),
+    ("(gint) GST_FLOW_FLUSHING", "-2"),
+    ("(gint) GST_FLOW_NOT_LINKED", "-1"),
+    ("(gint) GST_FLOW_NOT_NEGOTIATED", "-4"),
+    ("(gint) GST_FLOW_NOT_SUPPORTED", "-6"),
+    ("(gint) GST_FLOW_OK", "0"),
+    ("(gint) GST_FORMAT_BUFFERS", "4"),
+    ("(gint) GST_FORMAT_BYTES", "2"),
+    ("(gint) GST_FORMAT_DEFAULT", "1"),
+    ("(gint) GST_FORMAT_PERCENT", "5"),
     ("GST_FORMAT_PERCENT_MAX", "1000000"),
     ("GST_FORMAT_PERCENT_SCALE", "10000"),
-    ("GST_FORMAT_TIME", "3"),
-    ("GST_FORMAT_UNDEFINED", "0"),
-    ("GST_FOURCC_FORMAT", "c%c%c%c"),
+    ("(gint) GST_FORMAT_TIME", "3"),
+    ("(gint) GST_FORMAT_UNDEFINED", "0"),
     ("GST_GROUP_ID_INVALID", "0"),
-    ("GST_ITERATOR_DONE", "0"),
-    ("GST_ITERATOR_ERROR", "3"),
-    ("GST_ITERATOR_ITEM_END", "2"),
-    ("GST_ITERATOR_ITEM_PASS", "1"),
-    ("GST_ITERATOR_ITEM_SKIP", "0"),
-    ("GST_ITERATOR_OK", "1"),
-    ("GST_ITERATOR_RESYNC", "2"),
-    ("GST_LEVEL_COUNT", "10"),
-    ("GST_LEVEL_DEBUG", "5"),
-    ("GST_LEVEL_ERROR", "1"),
-    ("GST_LEVEL_FIXME", "3"),
-    ("GST_LEVEL_INFO", "4"),
-    ("GST_LEVEL_LOG", "6"),
-    ("GST_LEVEL_MEMDUMP", "9"),
-    ("GST_LEVEL_NONE", "0"),
-    ("GST_LEVEL_TRACE", "7"),
-    ("GST_LEVEL_WARNING", "2"),
-    ("GST_LIBRARY_ERROR_ENCODE", "6"),
-    ("GST_LIBRARY_ERROR_FAILED", "1"),
-    ("GST_LIBRARY_ERROR_INIT", "3"),
-    ("GST_LIBRARY_ERROR_NUM_ERRORS", "7"),
-    ("GST_LIBRARY_ERROR_SETTINGS", "5"),
-    ("GST_LIBRARY_ERROR_SHUTDOWN", "4"),
-    ("GST_LIBRARY_ERROR_TOO_LAZY", "2"),
+    ("(gint) GST_ITERATOR_DONE", "0"),
+    ("(gint) GST_ITERATOR_ERROR", "3"),
+    ("(gint) GST_ITERATOR_ITEM_END", "2"),
+    ("(gint) GST_ITERATOR_ITEM_PASS", "1"),
+    ("(gint) GST_ITERATOR_ITEM_SKIP", "0"),
+    ("(gint) GST_ITERATOR_OK", "1"),
+    ("(gint) GST_ITERATOR_RESYNC", "2"),
+    ("(gint) GST_LEVEL_COUNT", "10"),
+    ("(gint) GST_LEVEL_DEBUG", "5"),
+    ("(gint) GST_LEVEL_ERROR", "1"),
+    ("(gint) GST_LEVEL_FIXME", "3"),
+    ("(gint) GST_LEVEL_INFO", "4"),
+    ("(gint) GST_LEVEL_LOG", "6"),
+    ("(gint) GST_LEVEL_MEMDUMP", "9"),
+    ("(gint) GST_LEVEL_NONE", "0"),
+    ("(gint) GST_LEVEL_TRACE", "7"),
+    ("(gint) GST_LEVEL_WARNING", "2"),
+    ("(gint) GST_LIBRARY_ERROR_ENCODE", "6"),
+    ("(gint) GST_LIBRARY_ERROR_FAILED", "1"),
+    ("(gint) GST_LIBRARY_ERROR_INIT", "3"),
+    ("(gint) GST_LIBRARY_ERROR_NUM_ERRORS", "7"),
+    ("(gint) GST_LIBRARY_ERROR_SETTINGS", "5"),
+    ("(gint) GST_LIBRARY_ERROR_SHUTDOWN", "4"),
+    ("(gint) GST_LIBRARY_ERROR_TOO_LAZY", "2"),
     ("GST_LICENSE_UNKNOWN", "unknown"),
-    ("GST_LOCK_FLAG_EXCLUSIVE", "4"),
-    ("GST_LOCK_FLAG_LAST", "256"),
-    ("GST_LOCK_FLAG_READ", "1"),
+    ("(guint) GST_LOCK_FLAG_EXCLUSIVE", "4"),
+    ("(guint) GST_LOCK_FLAG_LAST", "256"),
+    ("(guint) GST_LOCK_FLAG_READ", "1"),
     ("GST_LOCK_FLAG_READWRITE", "3"),
-    ("GST_LOCK_FLAG_WRITE", "2"),
-    ("GST_MAP_FLAG_LAST", "65536"),
-    ("GST_MAP_READ", "1"),
+    ("(guint) GST_LOCK_FLAG_WRITE", "2"),
+    ("(guint) GST_MAP_FLAG_LAST", "65536"),
+    ("(guint) GST_MAP_READ", "1"),
     ("GST_MAP_READWRITE", "3"),
-    ("GST_MAP_WRITE", "2"),
-    ("GST_MEMORY_FLAG_LAST", "1048576"),
-    ("GST_MEMORY_FLAG_NOT_MAPPABLE", "256"),
-    ("GST_MEMORY_FLAG_NO_SHARE", "16"),
-    ("GST_MEMORY_FLAG_PHYSICALLY_CONTIGUOUS", "128"),
-    ("GST_MEMORY_FLAG_READONLY", "2"),
-    ("GST_MEMORY_FLAG_ZERO_PADDED", "64"),
-    ("GST_MEMORY_FLAG_ZERO_PREFIXED", "32"),
-    ("GST_MESSAGE_ANY", "4294967295"),
-    ("GST_MESSAGE_APPLICATION", "16384"),
-    ("GST_MESSAGE_ASYNC_DONE", "2097152"),
-    ("GST_MESSAGE_ASYNC_START", "1048576"),
-    ("GST_MESSAGE_BUFFERING", "32"),
-    ("GST_MESSAGE_CLOCK_LOST", "1024"),
-    ("GST_MESSAGE_CLOCK_PROVIDE", "512"),
-    ("GST_MESSAGE_DEVICE_ADDED", "2147483649"),
-    ("GST_MESSAGE_DEVICE_REMOVED", "2147483650"),
-    ("GST_MESSAGE_DURATION_CHANGED", "262144"),
-    ("GST_MESSAGE_ELEMENT", "32768"),
-    ("GST_MESSAGE_EOS", "1"),
-    ("GST_MESSAGE_ERROR", "2"),
-    ("GST_MESSAGE_EXTENDED", "2147483648"),
-    ("GST_MESSAGE_HAVE_CONTEXT", "1073741824"),
-    ("GST_MESSAGE_INFO", "8"),
-    ("GST_MESSAGE_LATENCY", "524288"),
-    ("GST_MESSAGE_NEED_CONTEXT", "536870912"),
-    ("GST_MESSAGE_NEW_CLOCK", "2048"),
-    ("GST_MESSAGE_PROGRESS", "33554432"),
-    ("GST_MESSAGE_PROPERTY_NOTIFY", "2147483651"),
-    ("GST_MESSAGE_QOS", "16777216"),
-    ("GST_MESSAGE_REDIRECT", "2147483654"),
-    ("GST_MESSAGE_REQUEST_STATE", "4194304"),
-    ("GST_MESSAGE_RESET_TIME", "134217728"),
-    ("GST_MESSAGE_SEGMENT_DONE", "131072"),
-    ("GST_MESSAGE_SEGMENT_START", "65536"),
-    ("GST_MESSAGE_STATE_CHANGED", "64"),
-    ("GST_MESSAGE_STATE_DIRTY", "128"),
-    ("GST_MESSAGE_STEP_DONE", "256"),
-    ("GST_MESSAGE_STEP_START", "8388608"),
-    ("GST_MESSAGE_STREAMS_SELECTED", "2147483653"),
-    ("GST_MESSAGE_STREAM_COLLECTION", "2147483652"),
-    ("GST_MESSAGE_STREAM_START", "268435456"),
-    ("GST_MESSAGE_STREAM_STATUS", "8192"),
-    ("GST_MESSAGE_STRUCTURE_CHANGE", "4096"),
-    ("GST_MESSAGE_TAG", "16"),
-    ("GST_MESSAGE_TOC", "67108864"),
-    ("GST_MESSAGE_UNKNOWN", "0"),
-    ("GST_MESSAGE_WARNING", "4"),
-    ("GST_META_FLAG_LAST", "65536"),
-    ("GST_META_FLAG_LOCKED", "4"),
-    ("GST_META_FLAG_NONE", "0"),
-    ("GST_META_FLAG_POOLED", "2"),
-    ("GST_META_FLAG_READONLY", "1"),
+    ("(guint) GST_MAP_WRITE", "2"),
+    ("(guint) GST_MEMORY_FLAG_LAST", "1048576"),
+    ("(guint) GST_MEMORY_FLAG_NOT_MAPPABLE", "256"),
+    ("(guint) GST_MEMORY_FLAG_NO_SHARE", "16"),
+    ("(guint) GST_MEMORY_FLAG_PHYSICALLY_CONTIGUOUS", "128"),
+    ("(guint) GST_MEMORY_FLAG_READONLY", "2"),
+    ("(guint) GST_MEMORY_FLAG_ZERO_PADDED", "64"),
+    ("(guint) GST_MEMORY_FLAG_ZERO_PREFIXED", "32"),
+    ("(guint) GST_MESSAGE_ANY", "4294967295"),
+    ("(guint) GST_MESSAGE_APPLICATION", "16384"),
+    ("(guint) GST_MESSAGE_ASYNC_DONE", "2097152"),
+    ("(guint) GST_MESSAGE_ASYNC_START", "1048576"),
+    ("(guint) GST_MESSAGE_BUFFERING", "32"),
+    ("(guint) GST_MESSAGE_CLOCK_LOST", "1024"),
+    ("(guint) GST_MESSAGE_CLOCK_PROVIDE", "512"),
+    ("(guint) GST_MESSAGE_DEVICE_ADDED", "2147483649"),
+    ("(guint) GST_MESSAGE_DEVICE_REMOVED", "2147483650"),
+    ("(guint) GST_MESSAGE_DURATION_CHANGED", "262144"),
+    ("(guint) GST_MESSAGE_ELEMENT", "32768"),
+    ("(guint) GST_MESSAGE_EOS", "1"),
+    ("(guint) GST_MESSAGE_ERROR", "2"),
+    ("(guint) GST_MESSAGE_EXTENDED", "2147483648"),
+    ("(guint) GST_MESSAGE_HAVE_CONTEXT", "1073741824"),
+    ("(guint) GST_MESSAGE_INFO", "8"),
+    ("(guint) GST_MESSAGE_LATENCY", "524288"),
+    ("(guint) GST_MESSAGE_NEED_CONTEXT", "536870912"),
+    ("(guint) GST_MESSAGE_NEW_CLOCK", "2048"),
+    ("(guint) GST_MESSAGE_PROGRESS", "33554432"),
+    ("(guint) GST_MESSAGE_PROPERTY_NOTIFY", "2147483651"),
+    ("(guint) GST_MESSAGE_QOS", "16777216"),
+    ("(guint) GST_MESSAGE_REDIRECT", "2147483654"),
+    ("(guint) GST_MESSAGE_REQUEST_STATE", "4194304"),
+    ("(guint) GST_MESSAGE_RESET_TIME", "134217728"),
+    ("(guint) GST_MESSAGE_SEGMENT_DONE", "131072"),
+    ("(guint) GST_MESSAGE_SEGMENT_START", "65536"),
+    ("(guint) GST_MESSAGE_STATE_CHANGED", "64"),
+    ("(guint) GST_MESSAGE_STATE_DIRTY", "128"),
+    ("(guint) GST_MESSAGE_STEP_DONE", "256"),
+    ("(guint) GST_MESSAGE_STEP_START", "8388608"),
+    ("(guint) GST_MESSAGE_STREAMS_SELECTED", "2147483653"),
+    ("(guint) GST_MESSAGE_STREAM_COLLECTION", "2147483652"),
+    ("(guint) GST_MESSAGE_STREAM_START", "268435456"),
+    ("(guint) GST_MESSAGE_STREAM_STATUS", "8192"),
+    ("(guint) GST_MESSAGE_STRUCTURE_CHANGE", "4096"),
+    ("(guint) GST_MESSAGE_TAG", "16"),
+    ("(guint) GST_MESSAGE_TOC", "67108864"),
+    ("(guint) GST_MESSAGE_UNKNOWN", "0"),
+    ("(guint) GST_MESSAGE_WARNING", "4"),
+    ("(guint) GST_META_FLAG_LAST", "65536"),
+    ("(guint) GST_META_FLAG_LOCKED", "4"),
+    ("(guint) GST_META_FLAG_NONE", "0"),
+    ("(guint) GST_META_FLAG_POOLED", "2"),
+    ("(guint) GST_META_FLAG_READONLY", "1"),
     ("GST_META_TAG_MEMORY_STR", "memory"),
-    ("GST_MINI_OBJECT_FLAG_LAST", "16"),
-    ("GST_MINI_OBJECT_FLAG_LOCKABLE", "1"),
-    ("GST_MINI_OBJECT_FLAG_LOCK_READONLY", "2"),
-    ("GST_MINI_OBJECT_FLAG_MAY_BE_LEAKED", "4"),
+    ("(guint) GST_MINI_OBJECT_FLAG_LAST", "16"),
+    ("(guint) GST_MINI_OBJECT_FLAG_LOCKABLE", "1"),
+    ("(guint) GST_MINI_OBJECT_FLAG_LOCK_READONLY", "2"),
+    ("(guint) GST_MINI_OBJECT_FLAG_MAY_BE_LEAKED", "4"),
     ("GST_MSECOND", "1000000"),
     ("GST_NSECOND", "1"),
-    ("GST_OBJECT_FLAG_LAST", "16"),
-    ("GST_OBJECT_FLAG_MAY_BE_LEAKED", "1"),
-    ("GST_PAD_ALWAYS", "0"),
-    ("GST_PAD_FLAG_ACCEPT_INTERSECT", "32768"),
-    ("GST_PAD_FLAG_ACCEPT_TEMPLATE", "65536"),
-    ("GST_PAD_FLAG_BLOCKED", "16"),
-    ("GST_PAD_FLAG_BLOCKING", "128"),
-    ("GST_PAD_FLAG_EOS", "64"),
-    ("GST_PAD_FLAG_FIXED_CAPS", "2048"),
-    ("GST_PAD_FLAG_FLUSHING", "32"),
-    ("GST_PAD_FLAG_LAST", "1048576"),
-    ("GST_PAD_FLAG_NEED_PARENT", "256"),
-    ("GST_PAD_FLAG_NEED_RECONFIGURE", "512"),
-    ("GST_PAD_FLAG_PENDING_EVENTS", "1024"),
-    ("GST_PAD_FLAG_PROXY_ALLOCATION", "8192"),
-    ("GST_PAD_FLAG_PROXY_CAPS", "4096"),
-    ("GST_PAD_FLAG_PROXY_SCHEDULING", "16384"),
-    ("GST_PAD_LINK_CHECK_CAPS", "4"),
-    ("GST_PAD_LINK_CHECK_DEFAULT", "5"),
-    ("GST_PAD_LINK_CHECK_HIERARCHY", "1"),
-    ("GST_PAD_LINK_CHECK_NOTHING", "0"),
-    ("GST_PAD_LINK_CHECK_NO_RECONFIGURE", "8"),
-    ("GST_PAD_LINK_CHECK_TEMPLATE_CAPS", "2"),
-    ("GST_PAD_LINK_NOFORMAT", "-4"),
-    ("GST_PAD_LINK_NOSCHED", "-5"),
-    ("GST_PAD_LINK_OK", "0"),
-    ("GST_PAD_LINK_REFUSED", "-6"),
-    ("GST_PAD_LINK_WAS_LINKED", "-2"),
-    ("GST_PAD_LINK_WRONG_DIRECTION", "-3"),
-    ("GST_PAD_LINK_WRONG_HIERARCHY", "-1"),
-    ("GST_PAD_MODE_NONE", "0"),
-    ("GST_PAD_MODE_PULL", "2"),
-    ("GST_PAD_MODE_PUSH", "1"),
-    ("GST_PAD_PROBE_DROP", "0"),
-    ("GST_PAD_PROBE_HANDLED", "4"),
-    ("GST_PAD_PROBE_OK", "1"),
-    ("GST_PAD_PROBE_PASS", "3"),
-    ("GST_PAD_PROBE_REMOVE", "2"),
-    ("GST_PAD_PROBE_TYPE_ALL_BOTH", "1776"),
-    ("GST_PAD_PROBE_TYPE_BLOCK", "2"),
-    ("GST_PAD_PROBE_TYPE_BLOCKING", "3"),
-    ("GST_PAD_PROBE_TYPE_BLOCK_DOWNSTREAM", "114"),
-    ("GST_PAD_PROBE_TYPE_BLOCK_UPSTREAM", "130"),
-    ("GST_PAD_PROBE_TYPE_BUFFER", "16"),
-    ("GST_PAD_PROBE_TYPE_BUFFER_LIST", "32"),
-    ("GST_PAD_PROBE_TYPE_DATA_BOTH", "240"),
-    ("GST_PAD_PROBE_TYPE_DATA_DOWNSTREAM", "112"),
-    ("GST_PAD_PROBE_TYPE_DATA_UPSTREAM", "128"),
-    ("GST_PAD_PROBE_TYPE_EVENT_BOTH", "192"),
-    ("GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM", "64"),
-    ("GST_PAD_PROBE_TYPE_EVENT_FLUSH", "256"),
-    ("GST_PAD_PROBE_TYPE_EVENT_UPSTREAM", "128"),
-    ("GST_PAD_PROBE_TYPE_IDLE", "1"),
-    ("GST_PAD_PROBE_TYPE_INVALID", "0"),
-    ("GST_PAD_PROBE_TYPE_PULL", "8192"),
-    ("GST_PAD_PROBE_TYPE_PUSH", "4096"),
-    ("GST_PAD_PROBE_TYPE_QUERY_BOTH", "1536"),
-    ("GST_PAD_PROBE_TYPE_QUERY_DOWNSTREAM", "512"),
-    ("GST_PAD_PROBE_TYPE_QUERY_UPSTREAM", "1024"),
-    ("GST_PAD_PROBE_TYPE_SCHEDULING", "12288"),
-    ("GST_PAD_REQUEST", "2"),
-    ("GST_PAD_SINK", "2"),
-    ("GST_PAD_SOMETIMES", "1"),
-    ("GST_PAD_SRC", "1"),
-    ("GST_PAD_TEMPLATE_FLAG_LAST", "256"),
-    ("GST_PAD_UNKNOWN", "0"),
+    ("(guint) GST_OBJECT_FLAG_LAST", "16"),
+    ("(guint) GST_OBJECT_FLAG_MAY_BE_LEAKED", "1"),
+    ("(gint) GST_PAD_ALWAYS", "0"),
+    ("(guint) GST_PAD_FLAG_ACCEPT_INTERSECT", "32768"),
+    ("(guint) GST_PAD_FLAG_ACCEPT_TEMPLATE", "65536"),
+    ("(guint) GST_PAD_FLAG_BLOCKED", "16"),
+    ("(guint) GST_PAD_FLAG_BLOCKING", "128"),
+    ("(guint) GST_PAD_FLAG_EOS", "64"),
+    ("(guint) GST_PAD_FLAG_FIXED_CAPS", "2048"),
+    ("(guint) GST_PAD_FLAG_FLUSHING", "32"),
+    ("(guint) GST_PAD_FLAG_LAST", "1048576"),
+    ("(guint) GST_PAD_FLAG_NEED_PARENT", "256"),
+    ("(guint) GST_PAD_FLAG_NEED_RECONFIGURE", "512"),
+    ("(guint) GST_PAD_FLAG_PENDING_EVENTS", "1024"),
+    ("(guint) GST_PAD_FLAG_PROXY_ALLOCATION", "8192"),
+    ("(guint) GST_PAD_FLAG_PROXY_CAPS", "4096"),
+    ("(guint) GST_PAD_FLAG_PROXY_SCHEDULING", "16384"),
+    ("(guint) GST_PAD_LINK_CHECK_CAPS", "4"),
+    ("(guint) GST_PAD_LINK_CHECK_DEFAULT", "5"),
+    ("(guint) GST_PAD_LINK_CHECK_HIERARCHY", "1"),
+    ("(guint) GST_PAD_LINK_CHECK_NOTHING", "0"),
+    ("(guint) GST_PAD_LINK_CHECK_NO_RECONFIGURE", "8"),
+    ("(guint) GST_PAD_LINK_CHECK_TEMPLATE_CAPS", "2"),
+    ("(gint) GST_PAD_LINK_NOFORMAT", "-4"),
+    ("(gint) GST_PAD_LINK_NOSCHED", "-5"),
+    ("(gint) GST_PAD_LINK_OK", "0"),
+    ("(gint) GST_PAD_LINK_REFUSED", "-6"),
+    ("(gint) GST_PAD_LINK_WAS_LINKED", "-2"),
+    ("(gint) GST_PAD_LINK_WRONG_DIRECTION", "-3"),
+    ("(gint) GST_PAD_LINK_WRONG_HIERARCHY", "-1"),
+    ("(gint) GST_PAD_MODE_NONE", "0"),
+    ("(gint) GST_PAD_MODE_PULL", "2"),
+    ("(gint) GST_PAD_MODE_PUSH", "1"),
+    ("(gint) GST_PAD_PROBE_DROP", "0"),
+    ("(gint) GST_PAD_PROBE_HANDLED", "4"),
+    ("(gint) GST_PAD_PROBE_OK", "1"),
+    ("(gint) GST_PAD_PROBE_PASS", "3"),
+    ("(gint) GST_PAD_PROBE_REMOVE", "2"),
+    ("(guint) GST_PAD_PROBE_TYPE_ALL_BOTH", "1776"),
+    ("(guint) GST_PAD_PROBE_TYPE_BLOCK", "2"),
+    ("(guint) GST_PAD_PROBE_TYPE_BLOCKING", "3"),
+    ("(guint) GST_PAD_PROBE_TYPE_BLOCK_DOWNSTREAM", "114"),
+    ("(guint) GST_PAD_PROBE_TYPE_BLOCK_UPSTREAM", "130"),
+    ("(guint) GST_PAD_PROBE_TYPE_BUFFER", "16"),
+    ("(guint) GST_PAD_PROBE_TYPE_BUFFER_LIST", "32"),
+    ("(guint) GST_PAD_PROBE_TYPE_DATA_BOTH", "240"),
+    ("(guint) GST_PAD_PROBE_TYPE_DATA_DOWNSTREAM", "112"),
+    ("(guint) GST_PAD_PROBE_TYPE_DATA_UPSTREAM", "128"),
+    ("(guint) GST_PAD_PROBE_TYPE_EVENT_BOTH", "192"),
+    ("(guint) GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM", "64"),
+    ("(guint) GST_PAD_PROBE_TYPE_EVENT_FLUSH", "256"),
+    ("(guint) GST_PAD_PROBE_TYPE_EVENT_UPSTREAM", "128"),
+    ("(guint) GST_PAD_PROBE_TYPE_IDLE", "1"),
+    ("(guint) GST_PAD_PROBE_TYPE_INVALID", "0"),
+    ("(guint) GST_PAD_PROBE_TYPE_PULL", "8192"),
+    ("(guint) GST_PAD_PROBE_TYPE_PUSH", "4096"),
+    ("(guint) GST_PAD_PROBE_TYPE_QUERY_BOTH", "1536"),
+    ("(guint) GST_PAD_PROBE_TYPE_QUERY_DOWNSTREAM", "512"),
+    ("(guint) GST_PAD_PROBE_TYPE_QUERY_UPSTREAM", "1024"),
+    ("(guint) GST_PAD_PROBE_TYPE_SCHEDULING", "12288"),
+    ("(gint) GST_PAD_REQUEST", "2"),
+    ("(gint) GST_PAD_SINK", "2"),
+    ("(gint) GST_PAD_SOMETIMES", "1"),
+    ("(gint) GST_PAD_SRC", "1"),
+    ("(guint) GST_PAD_TEMPLATE_FLAG_LAST", "256"),
+    ("(gint) GST_PAD_UNKNOWN", "0"),
     ("GST_PARAM_CONTROLLABLE", "512"),
     ("GST_PARAM_MUTABLE_PAUSED", "2048"),
     ("GST_PARAM_MUTABLE_PLAYING", "4096"),
     ("GST_PARAM_MUTABLE_READY", "1024"),
     ("GST_PARAM_USER_SHIFT", "65536"),
-    ("GST_PARSE_ERROR_COULD_NOT_SET_PROPERTY", "4"),
-    ("GST_PARSE_ERROR_DELAYED_LINK", "7"),
-    ("GST_PARSE_ERROR_EMPTY", "6"),
-    ("GST_PARSE_ERROR_EMPTY_BIN", "5"),
-    ("GST_PARSE_ERROR_LINK", "3"),
-    ("GST_PARSE_ERROR_NO_SUCH_ELEMENT", "1"),
-    ("GST_PARSE_ERROR_NO_SUCH_PROPERTY", "2"),
-    ("GST_PARSE_ERROR_SYNTAX", "0"),
-    ("GST_PARSE_FLAG_FATAL_ERRORS", "1"),
-    ("GST_PARSE_FLAG_NONE", "0"),
-    ("GST_PARSE_FLAG_NO_SINGLE_ELEMENT_BINS", "2"),
-    ("GST_PARSE_FLAG_PLACE_IN_BIN", "4"),
-    ("GST_PIPELINE_FLAG_FIXED_CLOCK", "524288"),
-    ("GST_PIPELINE_FLAG_LAST", "8388608"),
-    ("GST_PLUGIN_DEPENDENCY_FLAG_FILE_NAME_IS_PREFIX", "8"),
-    ("GST_PLUGIN_DEPENDENCY_FLAG_FILE_NAME_IS_SUFFIX", "4"),
-    ("GST_PLUGIN_DEPENDENCY_FLAG_NONE", "0"),
-    ("GST_PLUGIN_DEPENDENCY_FLAG_PATHS_ARE_DEFAULT_ONLY", "2"),
-    ("GST_PLUGIN_DEPENDENCY_FLAG_PATHS_ARE_RELATIVE_TO_EXE", "16"),
-    ("GST_PLUGIN_DEPENDENCY_FLAG_RECURSE", "1"),
-    ("GST_PLUGIN_ERROR_DEPENDENCIES", "1"),
-    ("GST_PLUGIN_ERROR_MODULE", "0"),
-    ("GST_PLUGIN_ERROR_NAME_MISMATCH", "2"),
-    ("GST_PLUGIN_FLAG_BLACKLISTED", "32"),
-    ("GST_PLUGIN_FLAG_CACHED", "16"),
-    ("GST_PROGRESS_TYPE_CANCELED", "3"),
-    ("GST_PROGRESS_TYPE_COMPLETE", "2"),
-    ("GST_PROGRESS_TYPE_CONTINUE", "1"),
-    ("GST_PROGRESS_TYPE_ERROR", "4"),
-    ("GST_PROGRESS_TYPE_START", "0"),
-    ("GST_PROMISE_RESULT_EXPIRED", "3"),
-    ("GST_PROMISE_RESULT_INTERRUPTED", "1"),
-    ("GST_PROMISE_RESULT_PENDING", "0"),
-    ("GST_PROMISE_RESULT_REPLIED", "2"),
+    ("(gint) GST_PARSE_ERROR_COULD_NOT_SET_PROPERTY", "4"),
+    ("(gint) GST_PARSE_ERROR_DELAYED_LINK", "7"),
+    ("(gint) GST_PARSE_ERROR_EMPTY", "6"),
+    ("(gint) GST_PARSE_ERROR_EMPTY_BIN", "5"),
+    ("(gint) GST_PARSE_ERROR_LINK", "3"),
+    ("(gint) GST_PARSE_ERROR_NO_SUCH_ELEMENT", "1"),
+    ("(gint) GST_PARSE_ERROR_NO_SUCH_PROPERTY", "2"),
+    ("(gint) GST_PARSE_ERROR_SYNTAX", "0"),
+    ("(guint) GST_PARSE_FLAG_FATAL_ERRORS", "1"),
+    ("(guint) GST_PARSE_FLAG_NONE", "0"),
+    ("(guint) GST_PARSE_FLAG_NO_SINGLE_ELEMENT_BINS", "2"),
+    ("(guint) GST_PARSE_FLAG_PLACE_IN_BIN", "4"),
+    ("(guint) GST_PIPELINE_FLAG_FIXED_CLOCK", "524288"),
+    ("(guint) GST_PIPELINE_FLAG_LAST", "8388608"),
+    ("(guint) GST_PLUGIN_DEPENDENCY_FLAG_FILE_NAME_IS_PREFIX", "8"),
+    ("(guint) GST_PLUGIN_DEPENDENCY_FLAG_FILE_NAME_IS_SUFFIX", "4"),
+    ("(guint) GST_PLUGIN_DEPENDENCY_FLAG_NONE", "0"),
+    ("(guint) GST_PLUGIN_DEPENDENCY_FLAG_PATHS_ARE_DEFAULT_ONLY", "2"),
+    ("(guint) GST_PLUGIN_DEPENDENCY_FLAG_PATHS_ARE_RELATIVE_TO_EXE", "16"),
+    ("(guint) GST_PLUGIN_DEPENDENCY_FLAG_RECURSE", "1"),
+    ("(gint) GST_PLUGIN_ERROR_DEPENDENCIES", "1"),
+    ("(gint) GST_PLUGIN_ERROR_MODULE", "0"),
+    ("(gint) GST_PLUGIN_ERROR_NAME_MISMATCH", "2"),
+    ("(guint) GST_PLUGIN_FLAG_BLACKLISTED", "32"),
+    ("(guint) GST_PLUGIN_FLAG_CACHED", "16"),
+    ("(gint) GST_PROGRESS_TYPE_CANCELED", "3"),
+    ("(gint) GST_PROGRESS_TYPE_COMPLETE", "2"),
+    ("(gint) GST_PROGRESS_TYPE_CONTINUE", "1"),
+    ("(gint) GST_PROGRESS_TYPE_ERROR", "4"),
+    ("(gint) GST_PROGRESS_TYPE_START", "0"),
+    ("(gint) GST_PROMISE_RESULT_EXPIRED", "3"),
+    ("(gint) GST_PROMISE_RESULT_INTERRUPTED", "1"),
+    ("(gint) GST_PROMISE_RESULT_PENDING", "0"),
+    ("(gint) GST_PROMISE_RESULT_REPLIED", "2"),
     ("GST_PROTECTION_SYSTEM_ID_CAPS_FIELD", "protection-system"),
-    ("GST_PTR_FORMAT", "paA"),
-    ("GST_QOS_TYPE_OVERFLOW", "0"),
-    ("GST_QOS_TYPE_THROTTLE", "2"),
-    ("GST_QOS_TYPE_UNDERFLOW", "1"),
-    ("GST_QUERY_ACCEPT_CAPS", "40963"),
-    ("GST_QUERY_ALLOCATION", "35846"),
-    ("GST_QUERY_BUFFERING", "28163"),
-    ("GST_QUERY_CAPS", "43523"),
-    ("GST_QUERY_CONTEXT", "48643"),
-    ("GST_QUERY_CONVERT", "20483"),
-    ("GST_QUERY_CUSTOM", "30723"),
-    ("GST_QUERY_DRAIN", "46086"),
-    ("GST_QUERY_DURATION", "5123"),
-    ("GST_QUERY_FORMATS", "23043"),
-    ("GST_QUERY_JITTER", "10243"),
-    ("GST_QUERY_LATENCY", "7683"),
+    ("(gint) GST_QOS_TYPE_OVERFLOW", "0"),
+    ("(gint) GST_QOS_TYPE_THROTTLE", "2"),
+    ("(gint) GST_QOS_TYPE_UNDERFLOW", "1"),
+    ("(gint) GST_QUERY_ACCEPT_CAPS", "40963"),
+    ("(gint) GST_QUERY_ALLOCATION", "35846"),
+    ("(gint) GST_QUERY_BUFFERING", "28163"),
+    ("(gint) GST_QUERY_CAPS", "43523"),
+    ("(gint) GST_QUERY_CONTEXT", "48643"),
+    ("(gint) GST_QUERY_CONVERT", "20483"),
+    ("(gint) GST_QUERY_CUSTOM", "30723"),
+    ("(gint) GST_QUERY_DRAIN", "46086"),
+    ("(gint) GST_QUERY_DURATION", "5123"),
+    ("(gint) GST_QUERY_FORMATS", "23043"),
+    ("(gint) GST_QUERY_JITTER", "10243"),
+    ("(gint) GST_QUERY_LATENCY", "7683"),
     ("GST_QUERY_NUM_SHIFT", "8"),
-    ("GST_QUERY_POSITION", "2563"),
-    ("GST_QUERY_RATE", "12803"),
-    ("GST_QUERY_SCHEDULING", "38401"),
-    ("GST_QUERY_SEEKING", "15363"),
-    ("GST_QUERY_SEGMENT", "17923"),
+    ("(gint) GST_QUERY_POSITION", "2563"),
+    ("(gint) GST_QUERY_RATE", "12803"),
+    ("(gint) GST_QUERY_SCHEDULING", "38401"),
+    ("(gint) GST_QUERY_SEEKING", "15363"),
+    ("(gint) GST_QUERY_SEGMENT", "17923"),
     ("GST_QUERY_TYPE_BOTH", "3"),
-    ("GST_QUERY_TYPE_DOWNSTREAM", "2"),
-    ("GST_QUERY_TYPE_SERIALIZED", "4"),
-    ("GST_QUERY_TYPE_UPSTREAM", "1"),
-    ("GST_QUERY_UNKNOWN", "0"),
-    ("GST_QUERY_URI", "33283"),
-    ("GST_RANK_MARGINAL", "64"),
-    ("GST_RANK_NONE", "0"),
-    ("GST_RANK_PRIMARY", "256"),
-    ("GST_RANK_SECONDARY", "128"),
-    ("GST_RESOURCE_ERROR_BUSY", "4"),
-    ("GST_RESOURCE_ERROR_CLOSE", "8"),
-    ("GST_RESOURCE_ERROR_FAILED", "1"),
-    ("GST_RESOURCE_ERROR_NOT_AUTHORIZED", "15"),
-    ("GST_RESOURCE_ERROR_NOT_FOUND", "3"),
-    ("GST_RESOURCE_ERROR_NO_SPACE_LEFT", "14"),
-    ("GST_RESOURCE_ERROR_NUM_ERRORS", "16"),
-    ("GST_RESOURCE_ERROR_OPEN_READ", "5"),
-    ("GST_RESOURCE_ERROR_OPEN_READ_WRITE", "7"),
-    ("GST_RESOURCE_ERROR_OPEN_WRITE", "6"),
-    ("GST_RESOURCE_ERROR_READ", "9"),
-    ("GST_RESOURCE_ERROR_SEEK", "11"),
-    ("GST_RESOURCE_ERROR_SETTINGS", "13"),
-    ("GST_RESOURCE_ERROR_SYNC", "12"),
-    ("GST_RESOURCE_ERROR_TOO_LAZY", "2"),
-    ("GST_RESOURCE_ERROR_WRITE", "10"),
-    ("GST_SCHEDULING_FLAG_BANDWIDTH_LIMITED", "4"),
-    ("GST_SCHEDULING_FLAG_SEEKABLE", "1"),
-    ("GST_SCHEDULING_FLAG_SEQUENTIAL", "2"),
-    ("GST_SEARCH_MODE_AFTER", "2"),
-    ("GST_SEARCH_MODE_BEFORE", "1"),
-    ("GST_SEARCH_MODE_EXACT", "0"),
+    ("(guint) GST_QUERY_TYPE_DOWNSTREAM", "2"),
+    ("(guint) GST_QUERY_TYPE_SERIALIZED", "4"),
+    ("(guint) GST_QUERY_TYPE_UPSTREAM", "1"),
+    ("(gint) GST_QUERY_UNKNOWN", "0"),
+    ("(gint) GST_QUERY_URI", "33283"),
+    ("(gint) GST_RANK_MARGINAL", "64"),
+    ("(gint) GST_RANK_NONE", "0"),
+    ("(gint) GST_RANK_PRIMARY", "256"),
+    ("(gint) GST_RANK_SECONDARY", "128"),
+    ("(gint) GST_RESOURCE_ERROR_BUSY", "4"),
+    ("(gint) GST_RESOURCE_ERROR_CLOSE", "8"),
+    ("(gint) GST_RESOURCE_ERROR_FAILED", "1"),
+    ("(gint) GST_RESOURCE_ERROR_NOT_AUTHORIZED", "15"),
+    ("(gint) GST_RESOURCE_ERROR_NOT_FOUND", "3"),
+    ("(gint) GST_RESOURCE_ERROR_NO_SPACE_LEFT", "14"),
+    ("(gint) GST_RESOURCE_ERROR_NUM_ERRORS", "16"),
+    ("(gint) GST_RESOURCE_ERROR_OPEN_READ", "5"),
+    ("(gint) GST_RESOURCE_ERROR_OPEN_READ_WRITE", "7"),
+    ("(gint) GST_RESOURCE_ERROR_OPEN_WRITE", "6"),
+    ("(gint) GST_RESOURCE_ERROR_READ", "9"),
+    ("(gint) GST_RESOURCE_ERROR_SEEK", "11"),
+    ("(gint) GST_RESOURCE_ERROR_SETTINGS", "13"),
+    ("(gint) GST_RESOURCE_ERROR_SYNC", "12"),
+    ("(gint) GST_RESOURCE_ERROR_TOO_LAZY", "2"),
+    ("(gint) GST_RESOURCE_ERROR_WRITE", "10"),
+    ("(guint) GST_SCHEDULING_FLAG_BANDWIDTH_LIMITED", "4"),
+    ("(guint) GST_SCHEDULING_FLAG_SEEKABLE", "1"),
+    ("(guint) GST_SCHEDULING_FLAG_SEQUENTIAL", "2"),
+    ("(gint) GST_SEARCH_MODE_AFTER", "2"),
+    ("(gint) GST_SEARCH_MODE_BEFORE", "1"),
+    ("(gint) GST_SEARCH_MODE_EXACT", "0"),
     ("GST_SECOND", "1000000000"),
-    ("GST_SEEK_FLAG_ACCURATE", "2"),
-    ("GST_SEEK_FLAG_FLUSH", "1"),
-    ("GST_SEEK_FLAG_KEY_UNIT", "4"),
-    ("GST_SEEK_FLAG_NONE", "0"),
-    ("GST_SEEK_FLAG_SEGMENT", "8"),
-    ("GST_SEEK_FLAG_SKIP", "16"),
-    ("GST_SEEK_FLAG_SNAP_AFTER", "64"),
-    ("GST_SEEK_FLAG_SNAP_BEFORE", "32"),
-    ("GST_SEEK_FLAG_SNAP_NEAREST", "96"),
-    ("GST_SEEK_FLAG_TRICKMODE", "16"),
-    ("GST_SEEK_FLAG_TRICKMODE_KEY_UNITS", "128"),
-    ("GST_SEEK_FLAG_TRICKMODE_NO_AUDIO", "256"),
-    ("GST_SEEK_TYPE_END", "2"),
-    ("GST_SEEK_TYPE_NONE", "0"),
-    ("GST_SEEK_TYPE_SET", "1"),
-    ("GST_SEGMENT_FLAG_NONE", "0"),
-    ("GST_SEGMENT_FLAG_RESET", "1"),
-    ("GST_SEGMENT_FLAG_SEGMENT", "8"),
-    ("GST_SEGMENT_FLAG_SKIP", "16"),
-    ("GST_SEGMENT_FLAG_TRICKMODE", "16"),
-    ("GST_SEGMENT_FLAG_TRICKMODE_KEY_UNITS", "128"),
-    ("GST_SEGMENT_FLAG_TRICKMODE_NO_AUDIO", "256"),
-    ("GST_SEGMENT_FORMAT", "paB"),
+    ("(guint) GST_SEEK_FLAG_ACCURATE", "2"),
+    ("(guint) GST_SEEK_FLAG_FLUSH", "1"),
+    ("(guint) GST_SEEK_FLAG_KEY_UNIT", "4"),
+    ("(guint) GST_SEEK_FLAG_NONE", "0"),
+    ("(guint) GST_SEEK_FLAG_SEGMENT", "8"),
+    ("(guint) GST_SEEK_FLAG_SKIP", "16"),
+    ("(guint) GST_SEEK_FLAG_SNAP_AFTER", "64"),
+    ("(guint) GST_SEEK_FLAG_SNAP_BEFORE", "32"),
+    ("(guint) GST_SEEK_FLAG_SNAP_NEAREST", "96"),
+    ("(guint) GST_SEEK_FLAG_TRICKMODE", "16"),
+    ("(guint) GST_SEEK_FLAG_TRICKMODE_KEY_UNITS", "128"),
+    ("(guint) GST_SEEK_FLAG_TRICKMODE_NO_AUDIO", "256"),
+    ("(gint) GST_SEEK_TYPE_END", "2"),
+    ("(gint) GST_SEEK_TYPE_NONE", "0"),
+    ("(gint) GST_SEEK_TYPE_SET", "1"),
+    ("(guint) GST_SEGMENT_FLAG_NONE", "0"),
+    ("(guint) GST_SEGMENT_FLAG_RESET", "1"),
+    ("(guint) GST_SEGMENT_FLAG_SEGMENT", "8"),
+    ("(guint) GST_SEGMENT_FLAG_SKIP", "16"),
+    ("(guint) GST_SEGMENT_FLAG_TRICKMODE", "16"),
+    ("(guint) GST_SEGMENT_FLAG_TRICKMODE_KEY_UNITS", "128"),
+    ("(guint) GST_SEGMENT_FLAG_TRICKMODE_NO_AUDIO", "256"),
     ("GST_SEQNUM_INVALID", "0"),
-    ("GST_STACK_TRACE_SHOW_FULL", "1"),
-    ("GST_STATE_CHANGE_ASYNC", "2"),
-    ("GST_STATE_CHANGE_FAILURE", "0"),
-    ("GST_STATE_CHANGE_NO_PREROLL", "3"),
-    ("GST_STATE_CHANGE_NULL_TO_NULL", "9"),
-    ("GST_STATE_CHANGE_NULL_TO_READY", "10"),
-    ("GST_STATE_CHANGE_PAUSED_TO_PAUSED", "27"),
-    ("GST_STATE_CHANGE_PAUSED_TO_PLAYING", "28"),
-    ("GST_STATE_CHANGE_PAUSED_TO_READY", "26"),
-    ("GST_STATE_CHANGE_PLAYING_TO_PAUSED", "35"),
-    ("GST_STATE_CHANGE_PLAYING_TO_PLAYING", "36"),
-    ("GST_STATE_CHANGE_READY_TO_NULL", "17"),
-    ("GST_STATE_CHANGE_READY_TO_PAUSED", "19"),
-    ("GST_STATE_CHANGE_READY_TO_READY", "18"),
-    ("GST_STATE_CHANGE_SUCCESS", "1"),
-    ("GST_STATE_NULL", "1"),
-    ("GST_STATE_PAUSED", "3"),
-    ("GST_STATE_PLAYING", "4"),
-    ("GST_STATE_READY", "2"),
-    ("GST_STATE_VOID_PENDING", "0"),
-    ("GST_STIME_FORMAT", "c%"),
-    ("GST_STREAM_ERROR_CODEC_NOT_FOUND", "6"),
-    ("GST_STREAM_ERROR_DECODE", "7"),
-    ("GST_STREAM_ERROR_DECRYPT", "12"),
-    ("GST_STREAM_ERROR_DECRYPT_NOKEY", "13"),
-    ("GST_STREAM_ERROR_DEMUX", "9"),
-    ("GST_STREAM_ERROR_ENCODE", "8"),
-    ("GST_STREAM_ERROR_FAILED", "1"),
-    ("GST_STREAM_ERROR_FORMAT", "11"),
-    ("GST_STREAM_ERROR_MUX", "10"),
-    ("GST_STREAM_ERROR_NOT_IMPLEMENTED", "3"),
-    ("GST_STREAM_ERROR_NUM_ERRORS", "14"),
-    ("GST_STREAM_ERROR_TOO_LAZY", "2"),
-    ("GST_STREAM_ERROR_TYPE_NOT_FOUND", "4"),
-    ("GST_STREAM_ERROR_WRONG_TYPE", "5"),
-    ("GST_STREAM_FLAG_NONE", "0"),
-    ("GST_STREAM_FLAG_SELECT", "2"),
-    ("GST_STREAM_FLAG_SPARSE", "1"),
-    ("GST_STREAM_FLAG_UNSELECT", "4"),
-    ("GST_STREAM_STATUS_TYPE_CREATE", "0"),
-    ("GST_STREAM_STATUS_TYPE_DESTROY", "3"),
-    ("GST_STREAM_STATUS_TYPE_ENTER", "1"),
-    ("GST_STREAM_STATUS_TYPE_LEAVE", "2"),
-    ("GST_STREAM_STATUS_TYPE_PAUSE", "9"),
-    ("GST_STREAM_STATUS_TYPE_START", "8"),
-    ("GST_STREAM_STATUS_TYPE_STOP", "10"),
-    ("GST_STREAM_TYPE_AUDIO", "2"),
-    ("GST_STREAM_TYPE_CONTAINER", "8"),
-    ("GST_STREAM_TYPE_TEXT", "16"),
-    ("GST_STREAM_TYPE_UNKNOWN", "1"),
-    ("GST_STREAM_TYPE_VIDEO", "4"),
-    ("GST_STRUCTURE_CHANGE_TYPE_PAD_LINK", "0"),
-    ("GST_STRUCTURE_CHANGE_TYPE_PAD_UNLINK", "1"),
+    ("(guint) GST_STACK_TRACE_SHOW_FULL", "1"),
+    ("(gint) GST_STATE_CHANGE_ASYNC", "2"),
+    ("(gint) GST_STATE_CHANGE_FAILURE", "0"),
+    ("(gint) GST_STATE_CHANGE_NO_PREROLL", "3"),
+    ("(gint) GST_STATE_CHANGE_NULL_TO_NULL", "9"),
+    ("(gint) GST_STATE_CHANGE_NULL_TO_READY", "10"),
+    ("(gint) GST_STATE_CHANGE_PAUSED_TO_PAUSED", "27"),
+    ("(gint) GST_STATE_CHANGE_PAUSED_TO_PLAYING", "28"),
+    ("(gint) GST_STATE_CHANGE_PAUSED_TO_READY", "26"),
+    ("(gint) GST_STATE_CHANGE_PLAYING_TO_PAUSED", "35"),
+    ("(gint) GST_STATE_CHANGE_PLAYING_TO_PLAYING", "36"),
+    ("(gint) GST_STATE_CHANGE_READY_TO_NULL", "17"),
+    ("(gint) GST_STATE_CHANGE_READY_TO_PAUSED", "19"),
+    ("(gint) GST_STATE_CHANGE_READY_TO_READY", "18"),
+    ("(gint) GST_STATE_CHANGE_SUCCESS", "1"),
+    ("(gint) GST_STATE_NULL", "1"),
+    ("(gint) GST_STATE_PAUSED", "3"),
+    ("(gint) GST_STATE_PLAYING", "4"),
+    ("(gint) GST_STATE_READY", "2"),
+    ("(gint) GST_STATE_VOID_PENDING", "0"),
+    ("(gint) GST_STREAM_ERROR_CODEC_NOT_FOUND", "6"),
+    ("(gint) GST_STREAM_ERROR_DECODE", "7"),
+    ("(gint) GST_STREAM_ERROR_DECRYPT", "12"),
+    ("(gint) GST_STREAM_ERROR_DECRYPT_NOKEY", "13"),
+    ("(gint) GST_STREAM_ERROR_DEMUX", "9"),
+    ("(gint) GST_STREAM_ERROR_ENCODE", "8"),
+    ("(gint) GST_STREAM_ERROR_FAILED", "1"),
+    ("(gint) GST_STREAM_ERROR_FORMAT", "11"),
+    ("(gint) GST_STREAM_ERROR_MUX", "10"),
+    ("(gint) GST_STREAM_ERROR_NOT_IMPLEMENTED", "3"),
+    ("(gint) GST_STREAM_ERROR_NUM_ERRORS", "14"),
+    ("(gint) GST_STREAM_ERROR_TOO_LAZY", "2"),
+    ("(gint) GST_STREAM_ERROR_TYPE_NOT_FOUND", "4"),
+    ("(gint) GST_STREAM_ERROR_WRONG_TYPE", "5"),
+    ("(guint) GST_STREAM_FLAG_NONE", "0"),
+    ("(guint) GST_STREAM_FLAG_SELECT", "2"),
+    ("(guint) GST_STREAM_FLAG_SPARSE", "1"),
+    ("(guint) GST_STREAM_FLAG_UNSELECT", "4"),
+    ("(gint) GST_STREAM_STATUS_TYPE_CREATE", "0"),
+    ("(gint) GST_STREAM_STATUS_TYPE_DESTROY", "3"),
+    ("(gint) GST_STREAM_STATUS_TYPE_ENTER", "1"),
+    ("(gint) GST_STREAM_STATUS_TYPE_LEAVE", "2"),
+    ("(gint) GST_STREAM_STATUS_TYPE_PAUSE", "9"),
+    ("(gint) GST_STREAM_STATUS_TYPE_START", "8"),
+    ("(gint) GST_STREAM_STATUS_TYPE_STOP", "10"),
+    ("(guint) GST_STREAM_TYPE_AUDIO", "2"),
+    ("(guint) GST_STREAM_TYPE_CONTAINER", "8"),
+    ("(guint) GST_STREAM_TYPE_TEXT", "16"),
+    ("(guint) GST_STREAM_TYPE_UNKNOWN", "1"),
+    ("(guint) GST_STREAM_TYPE_VIDEO", "4"),
+    ("(gint) GST_STRUCTURE_CHANGE_TYPE_PAD_LINK", "0"),
+    ("(gint) GST_STRUCTURE_CHANGE_TYPE_PAD_UNLINK", "1"),
     ("GST_TAG_ALBUM", "album"),
     ("GST_TAG_ALBUM_ARTIST", "album-artist"),
     ("GST_TAG_ALBUM_ARTIST_SORTNAME", "album-artist-sortname"),
@@ -1006,11 +1008,11 @@ const RUST_CONSTANTS: &[(&str, &str)] = &[
     ("GST_TAG_ENCODER", "encoder"),
     ("GST_TAG_ENCODER_VERSION", "encoder-version"),
     ("GST_TAG_EXTENDED_COMMENT", "extended-comment"),
-    ("GST_TAG_FLAG_COUNT", "4"),
-    ("GST_TAG_FLAG_DECODED", "3"),
-    ("GST_TAG_FLAG_ENCODED", "2"),
-    ("GST_TAG_FLAG_META", "1"),
-    ("GST_TAG_FLAG_UNDEFINED", "0"),
+    ("(gint) GST_TAG_FLAG_COUNT", "4"),
+    ("(gint) GST_TAG_FLAG_DECODED", "3"),
+    ("(gint) GST_TAG_FLAG_ENCODED", "2"),
+    ("(gint) GST_TAG_FLAG_META", "1"),
+    ("(gint) GST_TAG_FLAG_UNDEFINED", "0"),
     ("GST_TAG_GENRE", "genre"),
     ("GST_TAG_GEO_LOCATION_CAPTURE_DIRECTION", "geo-location-capture-direction"),
     ("GST_TAG_GEO_LOCATION_CITY", "geo-location-city"),
@@ -1037,14 +1039,14 @@ const RUST_CONSTANTS: &[(&str, &str)] = &[
     ("GST_TAG_LOCATION", "location"),
     ("GST_TAG_LYRICS", "lyrics"),
     ("GST_TAG_MAXIMUM_BITRATE", "maximum-bitrate"),
-    ("GST_TAG_MERGE_APPEND", "3"),
-    ("GST_TAG_MERGE_COUNT", "7"),
-    ("GST_TAG_MERGE_KEEP", "5"),
-    ("GST_TAG_MERGE_KEEP_ALL", "6"),
-    ("GST_TAG_MERGE_PREPEND", "4"),
-    ("GST_TAG_MERGE_REPLACE", "2"),
-    ("GST_TAG_MERGE_REPLACE_ALL", "1"),
-    ("GST_TAG_MERGE_UNDEFINED", "0"),
+    ("(gint) GST_TAG_MERGE_APPEND", "3"),
+    ("(gint) GST_TAG_MERGE_COUNT", "7"),
+    ("(gint) GST_TAG_MERGE_KEEP", "5"),
+    ("(gint) GST_TAG_MERGE_KEEP_ALL", "6"),
+    ("(gint) GST_TAG_MERGE_PREPEND", "4"),
+    ("(gint) GST_TAG_MERGE_REPLACE", "2"),
+    ("(gint) GST_TAG_MERGE_REPLACE_ALL", "1"),
+    ("(gint) GST_TAG_MERGE_UNDEFINED", "0"),
     ("GST_TAG_MIDI_BASE_NOTE", "midi-base-note"),
     ("GST_TAG_MINIMUM_BITRATE", "minimum-bitrate"),
     ("GST_TAG_NOMINAL_BITRATE", "nominal-bitrate"),
@@ -1054,8 +1056,8 @@ const RUST_CONSTANTS: &[(&str, &str)] = &[
     ("GST_TAG_PRIVATE_DATA", "private-data"),
     ("GST_TAG_PUBLISHER", "publisher"),
     ("GST_TAG_REFERENCE_LEVEL", "replaygain-reference-level"),
-    ("GST_TAG_SCOPE_GLOBAL", "1"),
-    ("GST_TAG_SCOPE_STREAM", "0"),
+    ("(gint) GST_TAG_SCOPE_GLOBAL", "1"),
+    ("(gint) GST_TAG_SCOPE_STREAM", "0"),
     ("GST_TAG_SERIAL", "serial"),
     ("GST_TAG_SHOW_EPISODE_NUMBER", "show-episode-number"),
     ("GST_TAG_SHOW_NAME", "show-name"),
@@ -1071,45 +1073,44 @@ const RUST_CONSTANTS: &[(&str, &str)] = &[
     ("GST_TAG_USER_RATING", "user-rating"),
     ("GST_TAG_VERSION", "version"),
     ("GST_TAG_VIDEO_CODEC", "video-codec"),
-    ("GST_TASK_PAUSED", "2"),
-    ("GST_TASK_STARTED", "0"),
-    ("GST_TASK_STOPPED", "1"),
-    ("GST_TIME_FORMAT", "u:%02u:%02u.%09u"),
-    ("GST_TOC_ENTRY_TYPE_ANGLE", "-3"),
-    ("GST_TOC_ENTRY_TYPE_CHAPTER", "3"),
-    ("GST_TOC_ENTRY_TYPE_EDITION", "-1"),
-    ("GST_TOC_ENTRY_TYPE_INVALID", "0"),
-    ("GST_TOC_ENTRY_TYPE_TITLE", "1"),
-    ("GST_TOC_ENTRY_TYPE_TRACK", "2"),
-    ("GST_TOC_ENTRY_TYPE_VERSION", "-2"),
-    ("GST_TOC_LOOP_FORWARD", "1"),
-    ("GST_TOC_LOOP_NONE", "0"),
-    ("GST_TOC_LOOP_PING_PONG", "3"),
-    ("GST_TOC_LOOP_REVERSE", "2"),
+    ("(gint) GST_TASK_PAUSED", "2"),
+    ("(gint) GST_TASK_STARTED", "0"),
+    ("(gint) GST_TASK_STOPPED", "1"),
+    ("(gint) GST_TOC_ENTRY_TYPE_ANGLE", "-3"),
+    ("(gint) GST_TOC_ENTRY_TYPE_CHAPTER", "3"),
+    ("(gint) GST_TOC_ENTRY_TYPE_EDITION", "-1"),
+    ("(gint) GST_TOC_ENTRY_TYPE_INVALID", "0"),
+    ("(gint) GST_TOC_ENTRY_TYPE_TITLE", "1"),
+    ("(gint) GST_TOC_ENTRY_TYPE_TRACK", "2"),
+    ("(gint) GST_TOC_ENTRY_TYPE_VERSION", "-2"),
+    ("(gint) GST_TOC_LOOP_FORWARD", "1"),
+    ("(gint) GST_TOC_LOOP_NONE", "0"),
+    ("(gint) GST_TOC_LOOP_PING_PONG", "3"),
+    ("(gint) GST_TOC_LOOP_REVERSE", "2"),
     ("GST_TOC_REPEAT_COUNT_INFINITE", "-1"),
-    ("GST_TOC_SCOPE_CURRENT", "2"),
-    ("GST_TOC_SCOPE_GLOBAL", "1"),
-    ("GST_TRACER_VALUE_FLAGS_AGGREGATED", "2"),
-    ("GST_TRACER_VALUE_FLAGS_NONE", "0"),
-    ("GST_TRACER_VALUE_FLAGS_OPTIONAL", "1"),
-    ("GST_TRACER_VALUE_SCOPE_ELEMENT", "2"),
-    ("GST_TRACER_VALUE_SCOPE_PAD", "3"),
-    ("GST_TRACER_VALUE_SCOPE_PROCESS", "0"),
-    ("GST_TRACER_VALUE_SCOPE_THREAD", "1"),
-    ("GST_TYPE_FIND_LIKELY", "80"),
-    ("GST_TYPE_FIND_MAXIMUM", "100"),
-    ("GST_TYPE_FIND_MINIMUM", "1"),
-    ("GST_TYPE_FIND_NEARLY_CERTAIN", "99"),
-    ("GST_TYPE_FIND_NONE", "0"),
-    ("GST_TYPE_FIND_POSSIBLE", "50"),
-    ("GST_URI_ERROR_BAD_REFERENCE", "3"),
-    ("GST_URI_ERROR_BAD_STATE", "2"),
-    ("GST_URI_ERROR_BAD_URI", "1"),
-    ("GST_URI_ERROR_UNSUPPORTED_PROTOCOL", "0"),
+    ("(gint) GST_TOC_SCOPE_CURRENT", "2"),
+    ("(gint) GST_TOC_SCOPE_GLOBAL", "1"),
+    ("(guint) GST_TRACER_VALUE_FLAGS_AGGREGATED", "2"),
+    ("(guint) GST_TRACER_VALUE_FLAGS_NONE", "0"),
+    ("(guint) GST_TRACER_VALUE_FLAGS_OPTIONAL", "1"),
+    ("(gint) GST_TRACER_VALUE_SCOPE_ELEMENT", "2"),
+    ("(gint) GST_TRACER_VALUE_SCOPE_PAD", "3"),
+    ("(gint) GST_TRACER_VALUE_SCOPE_PROCESS", "0"),
+    ("(gint) GST_TRACER_VALUE_SCOPE_THREAD", "1"),
+    ("(gint) GST_TYPE_FIND_LIKELY", "80"),
+    ("(gint) GST_TYPE_FIND_MAXIMUM", "100"),
+    ("(gint) GST_TYPE_FIND_MINIMUM", "1"),
+    ("(gint) GST_TYPE_FIND_NEARLY_CERTAIN", "99"),
+    ("(gint) GST_TYPE_FIND_NONE", "0"),
+    ("(gint) GST_TYPE_FIND_POSSIBLE", "50"),
+    ("(gint) GST_URI_ERROR_BAD_REFERENCE", "3"),
+    ("(gint) GST_URI_ERROR_BAD_STATE", "2"),
+    ("(gint) GST_URI_ERROR_BAD_URI", "1"),
+    ("(gint) GST_URI_ERROR_UNSUPPORTED_PROTOCOL", "0"),
     ("GST_URI_NO_PORT", "0"),
-    ("GST_URI_SINK", "1"),
-    ("GST_URI_SRC", "2"),
-    ("GST_URI_UNKNOWN", "0"),
+    ("(gint) GST_URI_SINK", "1"),
+    ("(gint) GST_URI_SRC", "2"),
+    ("(gint) GST_URI_UNKNOWN", "0"),
     ("GST_USECOND", "1000"),
     ("GST_VALUE_EQUAL", "0"),
     ("GST_VALUE_GREATER_THAN", "1"),
diff --git a/gstreamer-sys/tests/constant.c b/gstreamer-sys/tests/constant.c
index a167e0146..f54bce75c 100644
--- a/gstreamer-sys/tests/constant.c
+++ b/gstreamer-sys/tests/constant.c
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
@@ -7,21 +7,21 @@
 
 int main() {
     printf(_Generic((ABI_CONSTANT_NAME),
-                    char *: "%s",
-                    const char *: "%s",
-                    char: "%c",
-                    signed char: "%hhd",
-                    unsigned char: "%hhu",
-                    short int: "%hd",
-                    unsigned short int: "%hu",
-                    int: "%d",
-                    unsigned int: "%u",
-                    long: "%ld",
-                    unsigned long: "%lu",
-                    long long: "%lld",
-                    unsigned long long: "%llu",
-                    double: "%f",
-                    long double: "%ld"),
+                    char *: "###gir test###%s###gir test###\n",
+                    const char *: "###gir test###%s###gir test###\n",
+                    char: "###gir test###%c###gir test###\n",
+                    signed char: "###gir test###%hhd###gir test###\n",
+                    unsigned char: "###gir test###%hhu###gir test###\n",
+                    short int: "###gir test###%hd###gir test###\n",
+                    unsigned short int: "###gir test###%hu###gir test###\n",
+                    int: "###gir test###%d###gir test###\n",
+                    unsigned int: "###gir test###%u###gir test###\n",
+                    long: "###gir test###%ld###gir test###\n",
+                    unsigned long: "###gir test###%lu###gir test###\n",
+                    long long: "###gir test###%lld###gir test###\n",
+                    unsigned long long: "###gir test###%llu###gir test###\n",
+                    double: "###gir test###%f###gir test###\n",
+                    long double: "###gir test###%ld###gir test###\n"),
            ABI_CONSTANT_NAME);
     return 0;
 }
diff --git a/gstreamer-sys/tests/layout.c b/gstreamer-sys/tests/layout.c
index 829276260..aef10fc35 100644
--- a/gstreamer-sys/tests/layout.c
+++ b/gstreamer-sys/tests/layout.c
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
diff --git a/gstreamer-tag-sys/src/lib.rs b/gstreamer-tag-sys/src/lib.rs
index fb9870e6f..0c5c7366f 100644
--- a/gstreamer-tag-sys/src/lib.rs
+++ b/gstreamer-tag-sys/src/lib.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
diff --git a/gstreamer-tag-sys/tests/abi.rs b/gstreamer-tag-sys/tests/abi.rs
index 82ce2ab2d..a5c5852fb 100644
--- a/gstreamer-tag-sys/tests/abi.rs
+++ b/gstreamer-tag-sys/tests/abi.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
@@ -227,7 +227,14 @@ fn get_c_value(dir: &Path, cc: &Compiler, name: &str) -> Result<String, Box<Erro
                            &abi_cmd, &output).into());
     }
 
-    Ok(str::from_utf8(&output.stdout)?.trim().to_owned())
+    let output = str::from_utf8(&output.stdout)?.trim();
+    if !output.starts_with("###gir test###") ||
+       !output.ends_with("###gir test###") {
+        return Err(format!("command {:?} return invalid output, {:?}",
+                           &abi_cmd, &output).into());
+    }
+
+    Ok(String::from(&output[14..(output.len() - 14)]))
 }
 
 const RUST_LAYOUTS: &[(&str, Layout)] = &[
@@ -268,46 +275,46 @@ const RUST_CONSTANTS: &[(&str, &str)] = &[
     ("GST_TAG_CMML_CLIP", "cmml-clip"),
     ("GST_TAG_CMML_HEAD", "cmml-head"),
     ("GST_TAG_CMML_STREAM", "cmml-stream"),
-    ("GST_TAG_DEMUX_RESULT_AGAIN", "1"),
-    ("GST_TAG_DEMUX_RESULT_BROKEN_TAG", "0"),
-    ("GST_TAG_DEMUX_RESULT_OK", "2"),
+    ("(gint) GST_TAG_DEMUX_RESULT_AGAIN", "1"),
+    ("(gint) GST_TAG_DEMUX_RESULT_BROKEN_TAG", "0"),
+    ("(gint) GST_TAG_DEMUX_RESULT_OK", "2"),
     ("GST_TAG_ID3V2_HEADER_SIZE", "10"),
     ("GST_TAG_IMAGE_HORIZONTAL_PPI", "image-horizontal-ppi"),
-    ("GST_TAG_IMAGE_TYPE_ARTIST", "6"),
-    ("GST_TAG_IMAGE_TYPE_BACK_COVER", "2"),
-    ("GST_TAG_IMAGE_TYPE_BAND_ARTIST_LOGO", "17"),
-    ("GST_TAG_IMAGE_TYPE_BAND_ORCHESTRA", "8"),
-    ("GST_TAG_IMAGE_TYPE_COMPOSER", "9"),
-    ("GST_TAG_IMAGE_TYPE_CONDUCTOR", "7"),
-    ("GST_TAG_IMAGE_TYPE_DURING_PERFORMANCE", "13"),
-    ("GST_TAG_IMAGE_TYPE_DURING_RECORDING", "12"),
-    ("GST_TAG_IMAGE_TYPE_FISH", "15"),
-    ("GST_TAG_IMAGE_TYPE_FRONT_COVER", "1"),
-    ("GST_TAG_IMAGE_TYPE_ILLUSTRATION", "16"),
-    ("GST_TAG_IMAGE_TYPE_LEAD_ARTIST", "5"),
-    ("GST_TAG_IMAGE_TYPE_LEAFLET_PAGE", "3"),
-    ("GST_TAG_IMAGE_TYPE_LYRICIST", "10"),
-    ("GST_TAG_IMAGE_TYPE_MEDIUM", "4"),
-    ("GST_TAG_IMAGE_TYPE_NONE", "-1"),
-    ("GST_TAG_IMAGE_TYPE_PUBLISHER_STUDIO_LOGO", "18"),
-    ("GST_TAG_IMAGE_TYPE_RECORDING_LOCATION", "11"),
-    ("GST_TAG_IMAGE_TYPE_UNDEFINED", "0"),
-    ("GST_TAG_IMAGE_TYPE_VIDEO_CAPTURE", "14"),
+    ("(gint) GST_TAG_IMAGE_TYPE_ARTIST", "6"),
+    ("(gint) GST_TAG_IMAGE_TYPE_BACK_COVER", "2"),
+    ("(gint) GST_TAG_IMAGE_TYPE_BAND_ARTIST_LOGO", "17"),
+    ("(gint) GST_TAG_IMAGE_TYPE_BAND_ORCHESTRA", "8"),
+    ("(gint) GST_TAG_IMAGE_TYPE_COMPOSER", "9"),
+    ("(gint) GST_TAG_IMAGE_TYPE_CONDUCTOR", "7"),
+    ("(gint) GST_TAG_IMAGE_TYPE_DURING_PERFORMANCE", "13"),
+    ("(gint) GST_TAG_IMAGE_TYPE_DURING_RECORDING", "12"),
+    ("(gint) GST_TAG_IMAGE_TYPE_FISH", "15"),
+    ("(gint) GST_TAG_IMAGE_TYPE_FRONT_COVER", "1"),
+    ("(gint) GST_TAG_IMAGE_TYPE_ILLUSTRATION", "16"),
+    ("(gint) GST_TAG_IMAGE_TYPE_LEAD_ARTIST", "5"),
+    ("(gint) GST_TAG_IMAGE_TYPE_LEAFLET_PAGE", "3"),
+    ("(gint) GST_TAG_IMAGE_TYPE_LYRICIST", "10"),
+    ("(gint) GST_TAG_IMAGE_TYPE_MEDIUM", "4"),
+    ("(gint) GST_TAG_IMAGE_TYPE_NONE", "-1"),
+    ("(gint) GST_TAG_IMAGE_TYPE_PUBLISHER_STUDIO_LOGO", "18"),
+    ("(gint) GST_TAG_IMAGE_TYPE_RECORDING_LOCATION", "11"),
+    ("(gint) GST_TAG_IMAGE_TYPE_UNDEFINED", "0"),
+    ("(gint) GST_TAG_IMAGE_TYPE_VIDEO_CAPTURE", "14"),
     ("GST_TAG_IMAGE_VERTICAL_PPI", "image-vertical-ppi"),
-    ("GST_TAG_LICENSE_CREATIVE_COMMONS_LICENSE", "16777216"),
-    ("GST_TAG_LICENSE_FREE_SOFTWARE_FOUNDATION_LICENSE", "33554432"),
-    ("GST_TAG_LICENSE_PERMITS_DERIVATIVE_WORKS", "4"),
-    ("GST_TAG_LICENSE_PERMITS_DISTRIBUTION", "2"),
-    ("GST_TAG_LICENSE_PERMITS_REPRODUCTION", "1"),
-    ("GST_TAG_LICENSE_PERMITS_SHARING", "8"),
-    ("GST_TAG_LICENSE_PROHIBITS_COMMERCIAL_USE", "65536"),
-    ("GST_TAG_LICENSE_PROHIBITS_HIGH_INCOME_NATION_USE", "131072"),
-    ("GST_TAG_LICENSE_REQUIRES_ATTRIBUTION", "512"),
-    ("GST_TAG_LICENSE_REQUIRES_COPYLEFT", "4096"),
-    ("GST_TAG_LICENSE_REQUIRES_LESSER_COPYLEFT", "8192"),
-    ("GST_TAG_LICENSE_REQUIRES_NOTICE", "256"),
-    ("GST_TAG_LICENSE_REQUIRES_SHARE_ALIKE", "1024"),
-    ("GST_TAG_LICENSE_REQUIRES_SOURCE_CODE", "2048"),
+    ("(guint) GST_TAG_LICENSE_CREATIVE_COMMONS_LICENSE", "16777216"),
+    ("(guint) GST_TAG_LICENSE_FREE_SOFTWARE_FOUNDATION_LICENSE", "33554432"),
+    ("(guint) GST_TAG_LICENSE_PERMITS_DERIVATIVE_WORKS", "4"),
+    ("(guint) GST_TAG_LICENSE_PERMITS_DISTRIBUTION", "2"),
+    ("(guint) GST_TAG_LICENSE_PERMITS_REPRODUCTION", "1"),
+    ("(guint) GST_TAG_LICENSE_PERMITS_SHARING", "8"),
+    ("(guint) GST_TAG_LICENSE_PROHIBITS_COMMERCIAL_USE", "65536"),
+    ("(guint) GST_TAG_LICENSE_PROHIBITS_HIGH_INCOME_NATION_USE", "131072"),
+    ("(guint) GST_TAG_LICENSE_REQUIRES_ATTRIBUTION", "512"),
+    ("(guint) GST_TAG_LICENSE_REQUIRES_COPYLEFT", "4096"),
+    ("(guint) GST_TAG_LICENSE_REQUIRES_LESSER_COPYLEFT", "8192"),
+    ("(guint) GST_TAG_LICENSE_REQUIRES_NOTICE", "256"),
+    ("(guint) GST_TAG_LICENSE_REQUIRES_SHARE_ALIKE", "1024"),
+    ("(guint) GST_TAG_LICENSE_REQUIRES_SOURCE_CODE", "2048"),
     ("GST_TAG_MUSICAL_KEY", "musical-key"),
     ("GST_TAG_MUSICBRAINZ_ALBUMARTISTID", "musicbrainz-albumartistid"),
     ("GST_TAG_MUSICBRAINZ_ALBUMID", "musicbrainz-albumid"),
diff --git a/gstreamer-tag-sys/tests/constant.c b/gstreamer-tag-sys/tests/constant.c
index a167e0146..f54bce75c 100644
--- a/gstreamer-tag-sys/tests/constant.c
+++ b/gstreamer-tag-sys/tests/constant.c
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
@@ -7,21 +7,21 @@
 
 int main() {
     printf(_Generic((ABI_CONSTANT_NAME),
-                    char *: "%s",
-                    const char *: "%s",
-                    char: "%c",
-                    signed char: "%hhd",
-                    unsigned char: "%hhu",
-                    short int: "%hd",
-                    unsigned short int: "%hu",
-                    int: "%d",
-                    unsigned int: "%u",
-                    long: "%ld",
-                    unsigned long: "%lu",
-                    long long: "%lld",
-                    unsigned long long: "%llu",
-                    double: "%f",
-                    long double: "%ld"),
+                    char *: "###gir test###%s###gir test###\n",
+                    const char *: "###gir test###%s###gir test###\n",
+                    char: "###gir test###%c###gir test###\n",
+                    signed char: "###gir test###%hhd###gir test###\n",
+                    unsigned char: "###gir test###%hhu###gir test###\n",
+                    short int: "###gir test###%hd###gir test###\n",
+                    unsigned short int: "###gir test###%hu###gir test###\n",
+                    int: "###gir test###%d###gir test###\n",
+                    unsigned int: "###gir test###%u###gir test###\n",
+                    long: "###gir test###%ld###gir test###\n",
+                    unsigned long: "###gir test###%lu###gir test###\n",
+                    long long: "###gir test###%lld###gir test###\n",
+                    unsigned long long: "###gir test###%llu###gir test###\n",
+                    double: "###gir test###%f###gir test###\n",
+                    long double: "###gir test###%ld###gir test###\n"),
            ABI_CONSTANT_NAME);
     return 0;
 }
diff --git a/gstreamer-tag-sys/tests/layout.c b/gstreamer-tag-sys/tests/layout.c
index 829276260..aef10fc35 100644
--- a/gstreamer-tag-sys/tests/layout.c
+++ b/gstreamer-tag-sys/tests/layout.c
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
diff --git a/gstreamer-video-sys/src/lib.rs b/gstreamer-video-sys/src/lib.rs
index 8e1d28f0e..d62a8d2e8 100644
--- a/gstreamer-video-sys/src/lib.rs
+++ b/gstreamer-video-sys/src/lib.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
diff --git a/gstreamer-video-sys/tests/abi.rs b/gstreamer-video-sys/tests/abi.rs
index c79b1a9cb..971c05354 100644
--- a/gstreamer-video-sys/tests/abi.rs
+++ b/gstreamer-video-sys/tests/abi.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
@@ -227,7 +227,14 @@ fn get_c_value(dir: &Path, cc: &Compiler, name: &str) -> Result<String, Box<Erro
                            &abi_cmd, &output).into());
     }
 
-    Ok(str::from_utf8(&output.stdout)?.trim().to_owned())
+    let output = str::from_utf8(&output.stdout)?.trim();
+    if !output.starts_with("###gir test###") ||
+       !output.ends_with("###gir test###") {
+        return Err(format!("command {:?} return invalid output, {:?}",
+                           &abi_cmd, &output).into());
+    }
+
+    Ok(String::from(&output[14..(output.len() - 14)]))
 }
 
 const RUST_LAYOUTS: &[(&str, Layout)] = &[
@@ -322,97 +329,97 @@ const RUST_CONSTANTS: &[(&str, &str)] = &[
     ("GST_CAPS_FEATURE_META_GST_VIDEO_GL_TEXTURE_UPLOAD_META", "meta:GstVideoGLTextureUploadMeta"),
     ("GST_CAPS_FEATURE_META_GST_VIDEO_META", "meta:GstVideoMeta"),
     ("GST_CAPS_FEATURE_META_GST_VIDEO_OVERLAY_COMPOSITION", "meta:GstVideoOverlayComposition"),
-    ("GST_COLOR_BALANCE_HARDWARE", "0"),
-    ("GST_COLOR_BALANCE_SOFTWARE", "1"),
+    ("(gint) GST_COLOR_BALANCE_HARDWARE", "0"),
+    ("(gint) GST_COLOR_BALANCE_SOFTWARE", "1"),
     ("GST_META_TAG_VIDEO_COLORSPACE_STR", "colorspace"),
     ("GST_META_TAG_VIDEO_ORIENTATION_STR", "orientation"),
     ("GST_META_TAG_VIDEO_SIZE_STR", "size"),
     ("GST_META_TAG_VIDEO_STR", "video"),
-    ("GST_NAVIGATION_COMMAND_ACTIVATE", "24"),
-    ("GST_NAVIGATION_COMMAND_DOWN", "23"),
-    ("GST_NAVIGATION_COMMAND_INVALID", "0"),
-    ("GST_NAVIGATION_COMMAND_LEFT", "20"),
-    ("GST_NAVIGATION_COMMAND_MENU1", "1"),
-    ("GST_NAVIGATION_COMMAND_MENU2", "2"),
-    ("GST_NAVIGATION_COMMAND_MENU3", "3"),
-    ("GST_NAVIGATION_COMMAND_MENU4", "4"),
-    ("GST_NAVIGATION_COMMAND_MENU5", "5"),
-    ("GST_NAVIGATION_COMMAND_MENU6", "6"),
-    ("GST_NAVIGATION_COMMAND_MENU7", "7"),
-    ("GST_NAVIGATION_COMMAND_NEXT_ANGLE", "31"),
-    ("GST_NAVIGATION_COMMAND_PREV_ANGLE", "30"),
-    ("GST_NAVIGATION_COMMAND_RIGHT", "21"),
-    ("GST_NAVIGATION_COMMAND_UP", "22"),
-    ("GST_NAVIGATION_EVENT_COMMAND", "6"),
-    ("GST_NAVIGATION_EVENT_INVALID", "0"),
-    ("GST_NAVIGATION_EVENT_KEY_PRESS", "1"),
-    ("GST_NAVIGATION_EVENT_KEY_RELEASE", "2"),
-    ("GST_NAVIGATION_EVENT_MOUSE_BUTTON_PRESS", "3"),
-    ("GST_NAVIGATION_EVENT_MOUSE_BUTTON_RELEASE", "4"),
-    ("GST_NAVIGATION_EVENT_MOUSE_MOVE", "5"),
-    ("GST_NAVIGATION_MESSAGE_ANGLES_CHANGED", "3"),
-    ("GST_NAVIGATION_MESSAGE_COMMANDS_CHANGED", "2"),
-    ("GST_NAVIGATION_MESSAGE_EVENT", "4"),
-    ("GST_NAVIGATION_MESSAGE_INVALID", "0"),
-    ("GST_NAVIGATION_MESSAGE_MOUSE_OVER", "1"),
-    ("GST_NAVIGATION_QUERY_ANGLES", "2"),
-    ("GST_NAVIGATION_QUERY_COMMANDS", "1"),
-    ("GST_NAVIGATION_QUERY_INVALID", "0"),
-    ("GST_VIDEO_ALPHA_MODE_COPY", "0"),
-    ("GST_VIDEO_ALPHA_MODE_MULT", "2"),
-    ("GST_VIDEO_ALPHA_MODE_SET", "1"),
-    ("GST_VIDEO_BUFFER_FLAG_FIRST_IN_BUNDLE", "33554432"),
-    ("GST_VIDEO_BUFFER_FLAG_INTERLACED", "1048576"),
-    ("GST_VIDEO_BUFFER_FLAG_LAST", "268435456"),
-    ("GST_VIDEO_BUFFER_FLAG_MULTIPLE_VIEW", "16777216"),
-    ("GST_VIDEO_BUFFER_FLAG_ONEFIELD", "8388608"),
-    ("GST_VIDEO_BUFFER_FLAG_RFF", "4194304"),
-    ("GST_VIDEO_BUFFER_FLAG_TFF", "2097152"),
-    ("GST_VIDEO_CHROMA_FLAG_INTERLACED", "1"),
-    ("GST_VIDEO_CHROMA_FLAG_NONE", "0"),
-    ("GST_VIDEO_CHROMA_METHOD_LINEAR", "1"),
-    ("GST_VIDEO_CHROMA_METHOD_NEAREST", "0"),
-    ("GST_VIDEO_CHROMA_MODE_DOWNSAMPLE_ONLY", "2"),
-    ("GST_VIDEO_CHROMA_MODE_FULL", "0"),
-    ("GST_VIDEO_CHROMA_MODE_NONE", "3"),
-    ("GST_VIDEO_CHROMA_MODE_UPSAMPLE_ONLY", "1"),
-    ("GST_VIDEO_CHROMA_SITE_ALT_LINE", "8"),
-    ("GST_VIDEO_CHROMA_SITE_COSITED", "6"),
-    ("GST_VIDEO_CHROMA_SITE_DV", "14"),
-    ("GST_VIDEO_CHROMA_SITE_H_COSITED", "2"),
-    ("GST_VIDEO_CHROMA_SITE_JPEG", "1"),
-    ("GST_VIDEO_CHROMA_SITE_MPEG2", "2"),
-    ("GST_VIDEO_CHROMA_SITE_NONE", "1"),
-    ("GST_VIDEO_CHROMA_SITE_UNKNOWN", "0"),
-    ("GST_VIDEO_CHROMA_SITE_V_COSITED", "4"),
-    ("GST_VIDEO_CODEC_FRAME_FLAG_DECODE_ONLY", "1"),
-    ("GST_VIDEO_CODEC_FRAME_FLAG_FORCE_KEYFRAME", "4"),
-    ("GST_VIDEO_CODEC_FRAME_FLAG_FORCE_KEYFRAME_HEADERS", "8"),
-    ("GST_VIDEO_CODEC_FRAME_FLAG_SYNC_POINT", "2"),
+    ("(gint) GST_NAVIGATION_COMMAND_ACTIVATE", "24"),
+    ("(gint) GST_NAVIGATION_COMMAND_DOWN", "23"),
+    ("(gint) GST_NAVIGATION_COMMAND_INVALID", "0"),
+    ("(gint) GST_NAVIGATION_COMMAND_LEFT", "20"),
+    ("(gint) GST_NAVIGATION_COMMAND_MENU1", "1"),
+    ("(gint) GST_NAVIGATION_COMMAND_MENU2", "2"),
+    ("(gint) GST_NAVIGATION_COMMAND_MENU3", "3"),
+    ("(gint) GST_NAVIGATION_COMMAND_MENU4", "4"),
+    ("(gint) GST_NAVIGATION_COMMAND_MENU5", "5"),
+    ("(gint) GST_NAVIGATION_COMMAND_MENU6", "6"),
+    ("(gint) GST_NAVIGATION_COMMAND_MENU7", "7"),
+    ("(gint) GST_NAVIGATION_COMMAND_NEXT_ANGLE", "31"),
+    ("(gint) GST_NAVIGATION_COMMAND_PREV_ANGLE", "30"),
+    ("(gint) GST_NAVIGATION_COMMAND_RIGHT", "21"),
+    ("(gint) GST_NAVIGATION_COMMAND_UP", "22"),
+    ("(gint) GST_NAVIGATION_EVENT_COMMAND", "6"),
+    ("(gint) GST_NAVIGATION_EVENT_INVALID", "0"),
+    ("(gint) GST_NAVIGATION_EVENT_KEY_PRESS", "1"),
+    ("(gint) GST_NAVIGATION_EVENT_KEY_RELEASE", "2"),
+    ("(gint) GST_NAVIGATION_EVENT_MOUSE_BUTTON_PRESS", "3"),
+    ("(gint) GST_NAVIGATION_EVENT_MOUSE_BUTTON_RELEASE", "4"),
+    ("(gint) GST_NAVIGATION_EVENT_MOUSE_MOVE", "5"),
+    ("(gint) GST_NAVIGATION_MESSAGE_ANGLES_CHANGED", "3"),
+    ("(gint) GST_NAVIGATION_MESSAGE_COMMANDS_CHANGED", "2"),
+    ("(gint) GST_NAVIGATION_MESSAGE_EVENT", "4"),
+    ("(gint) GST_NAVIGATION_MESSAGE_INVALID", "0"),
+    ("(gint) GST_NAVIGATION_MESSAGE_MOUSE_OVER", "1"),
+    ("(gint) GST_NAVIGATION_QUERY_ANGLES", "2"),
+    ("(gint) GST_NAVIGATION_QUERY_COMMANDS", "1"),
+    ("(gint) GST_NAVIGATION_QUERY_INVALID", "0"),
+    ("(gint) GST_VIDEO_ALPHA_MODE_COPY", "0"),
+    ("(gint) GST_VIDEO_ALPHA_MODE_MULT", "2"),
+    ("(gint) GST_VIDEO_ALPHA_MODE_SET", "1"),
+    ("(guint) GST_VIDEO_BUFFER_FLAG_FIRST_IN_BUNDLE", "33554432"),
+    ("(guint) GST_VIDEO_BUFFER_FLAG_INTERLACED", "1048576"),
+    ("(guint) GST_VIDEO_BUFFER_FLAG_LAST", "268435456"),
+    ("(guint) GST_VIDEO_BUFFER_FLAG_MULTIPLE_VIEW", "16777216"),
+    ("(guint) GST_VIDEO_BUFFER_FLAG_ONEFIELD", "8388608"),
+    ("(guint) GST_VIDEO_BUFFER_FLAG_RFF", "4194304"),
+    ("(guint) GST_VIDEO_BUFFER_FLAG_TFF", "2097152"),
+    ("(guint) GST_VIDEO_CHROMA_FLAG_INTERLACED", "1"),
+    ("(guint) GST_VIDEO_CHROMA_FLAG_NONE", "0"),
+    ("(gint) GST_VIDEO_CHROMA_METHOD_LINEAR", "1"),
+    ("(gint) GST_VIDEO_CHROMA_METHOD_NEAREST", "0"),
+    ("(gint) GST_VIDEO_CHROMA_MODE_DOWNSAMPLE_ONLY", "2"),
+    ("(gint) GST_VIDEO_CHROMA_MODE_FULL", "0"),
+    ("(gint) GST_VIDEO_CHROMA_MODE_NONE", "3"),
+    ("(gint) GST_VIDEO_CHROMA_MODE_UPSAMPLE_ONLY", "1"),
+    ("(guint) GST_VIDEO_CHROMA_SITE_ALT_LINE", "8"),
+    ("(guint) GST_VIDEO_CHROMA_SITE_COSITED", "6"),
+    ("(guint) GST_VIDEO_CHROMA_SITE_DV", "14"),
+    ("(guint) GST_VIDEO_CHROMA_SITE_H_COSITED", "2"),
+    ("(guint) GST_VIDEO_CHROMA_SITE_JPEG", "1"),
+    ("(guint) GST_VIDEO_CHROMA_SITE_MPEG2", "2"),
+    ("(guint) GST_VIDEO_CHROMA_SITE_NONE", "1"),
+    ("(guint) GST_VIDEO_CHROMA_SITE_UNKNOWN", "0"),
+    ("(guint) GST_VIDEO_CHROMA_SITE_V_COSITED", "4"),
+    ("(guint) GST_VIDEO_CODEC_FRAME_FLAG_DECODE_ONLY", "1"),
+    ("(guint) GST_VIDEO_CODEC_FRAME_FLAG_FORCE_KEYFRAME", "4"),
+    ("(guint) GST_VIDEO_CODEC_FRAME_FLAG_FORCE_KEYFRAME_HEADERS", "8"),
+    ("(guint) GST_VIDEO_CODEC_FRAME_FLAG_SYNC_POINT", "2"),
     ("GST_VIDEO_COLORIMETRY_BT2020", "bt2020"),
     ("GST_VIDEO_COLORIMETRY_BT601", "bt601"),
     ("GST_VIDEO_COLORIMETRY_BT709", "bt709"),
     ("GST_VIDEO_COLORIMETRY_SMPTE240M", "smpte240m"),
     ("GST_VIDEO_COLORIMETRY_SRGB", "sRGB"),
-    ("GST_VIDEO_COLOR_MATRIX_BT2020", "6"),
-    ("GST_VIDEO_COLOR_MATRIX_BT601", "4"),
-    ("GST_VIDEO_COLOR_MATRIX_BT709", "3"),
-    ("GST_VIDEO_COLOR_MATRIX_FCC", "2"),
-    ("GST_VIDEO_COLOR_MATRIX_RGB", "1"),
-    ("GST_VIDEO_COLOR_MATRIX_SMPTE240M", "5"),
-    ("GST_VIDEO_COLOR_MATRIX_UNKNOWN", "0"),
-    ("GST_VIDEO_COLOR_PRIMARIES_ADOBERGB", "8"),
-    ("GST_VIDEO_COLOR_PRIMARIES_BT2020", "7"),
-    ("GST_VIDEO_COLOR_PRIMARIES_BT470BG", "3"),
-    ("GST_VIDEO_COLOR_PRIMARIES_BT470M", "2"),
-    ("GST_VIDEO_COLOR_PRIMARIES_BT709", "1"),
-    ("GST_VIDEO_COLOR_PRIMARIES_FILM", "6"),
-    ("GST_VIDEO_COLOR_PRIMARIES_SMPTE170M", "4"),
-    ("GST_VIDEO_COLOR_PRIMARIES_SMPTE240M", "5"),
-    ("GST_VIDEO_COLOR_PRIMARIES_UNKNOWN", "0"),
-    ("GST_VIDEO_COLOR_RANGE_0_255", "1"),
-    ("GST_VIDEO_COLOR_RANGE_16_235", "2"),
-    ("GST_VIDEO_COLOR_RANGE_UNKNOWN", "0"),
+    ("(gint) GST_VIDEO_COLOR_MATRIX_BT2020", "6"),
+    ("(gint) GST_VIDEO_COLOR_MATRIX_BT601", "4"),
+    ("(gint) GST_VIDEO_COLOR_MATRIX_BT709", "3"),
+    ("(gint) GST_VIDEO_COLOR_MATRIX_FCC", "2"),
+    ("(gint) GST_VIDEO_COLOR_MATRIX_RGB", "1"),
+    ("(gint) GST_VIDEO_COLOR_MATRIX_SMPTE240M", "5"),
+    ("(gint) GST_VIDEO_COLOR_MATRIX_UNKNOWN", "0"),
+    ("(gint) GST_VIDEO_COLOR_PRIMARIES_ADOBERGB", "8"),
+    ("(gint) GST_VIDEO_COLOR_PRIMARIES_BT2020", "7"),
+    ("(gint) GST_VIDEO_COLOR_PRIMARIES_BT470BG", "3"),
+    ("(gint) GST_VIDEO_COLOR_PRIMARIES_BT470M", "2"),
+    ("(gint) GST_VIDEO_COLOR_PRIMARIES_BT709", "1"),
+    ("(gint) GST_VIDEO_COLOR_PRIMARIES_FILM", "6"),
+    ("(gint) GST_VIDEO_COLOR_PRIMARIES_SMPTE170M", "4"),
+    ("(gint) GST_VIDEO_COLOR_PRIMARIES_SMPTE240M", "5"),
+    ("(gint) GST_VIDEO_COLOR_PRIMARIES_UNKNOWN", "0"),
+    ("(gint) GST_VIDEO_COLOR_RANGE_0_255", "1"),
+    ("(gint) GST_VIDEO_COLOR_RANGE_16_235", "2"),
+    ("(gint) GST_VIDEO_COLOR_RANGE_UNKNOWN", "0"),
     ("GST_VIDEO_COMP_A", "3"),
     ("GST_VIDEO_COMP_B", "2"),
     ("GST_VIDEO_COMP_G", "1"),
@@ -447,237 +454,237 @@ const RUST_CONSTANTS: &[(&str, &str)] = &[
     ("GST_VIDEO_DECODER_MAX_ERRORS", "10"),
     ("GST_VIDEO_DECODER_SINK_NAME", "sink"),
     ("GST_VIDEO_DECODER_SRC_NAME", "src"),
-    ("GST_VIDEO_DITHER_BAYER", "4"),
-    ("GST_VIDEO_DITHER_FLAG_INTERLACED", "1"),
-    ("GST_VIDEO_DITHER_FLAG_NONE", "0"),
-    ("GST_VIDEO_DITHER_FLAG_QUANTIZE", "2"),
-    ("GST_VIDEO_DITHER_FLOYD_STEINBERG", "2"),
-    ("GST_VIDEO_DITHER_NONE", "0"),
-    ("GST_VIDEO_DITHER_SIERRA_LITE", "3"),
-    ("GST_VIDEO_DITHER_VERTERR", "1"),
+    ("(gint) GST_VIDEO_DITHER_BAYER", "4"),
+    ("(guint) GST_VIDEO_DITHER_FLAG_INTERLACED", "1"),
+    ("(guint) GST_VIDEO_DITHER_FLAG_NONE", "0"),
+    ("(guint) GST_VIDEO_DITHER_FLAG_QUANTIZE", "2"),
+    ("(gint) GST_VIDEO_DITHER_FLOYD_STEINBERG", "2"),
+    ("(gint) GST_VIDEO_DITHER_NONE", "0"),
+    ("(gint) GST_VIDEO_DITHER_SIERRA_LITE", "3"),
+    ("(gint) GST_VIDEO_DITHER_VERTERR", "1"),
     ("GST_VIDEO_ENCODER_SINK_NAME", "sink"),
     ("GST_VIDEO_ENCODER_SRC_NAME", "src"),
-    ("GST_VIDEO_FIELD_ORDER_BOTTOM_FIELD_FIRST", "2"),
-    ("GST_VIDEO_FIELD_ORDER_TOP_FIELD_FIRST", "1"),
-    ("GST_VIDEO_FIELD_ORDER_UNKNOWN", "0"),
-    ("GST_VIDEO_FLAG_NONE", "0"),
-    ("GST_VIDEO_FLAG_PREMULTIPLIED_ALPHA", "2"),
-    ("GST_VIDEO_FLAG_VARIABLE_FPS", "1"),
+    ("(gint) GST_VIDEO_FIELD_ORDER_BOTTOM_FIELD_FIRST", "2"),
+    ("(gint) GST_VIDEO_FIELD_ORDER_TOP_FIELD_FIRST", "1"),
+    ("(gint) GST_VIDEO_FIELD_ORDER_UNKNOWN", "0"),
+    ("(guint) GST_VIDEO_FLAG_NONE", "0"),
+    ("(guint) GST_VIDEO_FLAG_PREMULTIPLIED_ALPHA", "2"),
+    ("(guint) GST_VIDEO_FLAG_VARIABLE_FPS", "1"),
     ("GST_VIDEO_FORMATS_ALL", "{ I420, YV12, YUY2, UYVY, AYUV, RGBx, BGRx, xRGB, xBGR, RGBA, BGRA, ARGB, ABGR, RGB, BGR, Y41B, Y42B, YVYU, Y444, v210, v216, NV12, NV21, GRAY8, GRAY16_BE, GRAY16_LE, v308, RGB16, BGR16, RGB15, BGR15, UYVP, A420, RGB8P, YUV9, YVU9, IYU1, ARGB64, AYUV64, r210, I420_10BE, I420_10LE, I422_10BE, I422_10LE, Y444_10BE, Y444_10LE, GBR, GBR_10BE, GBR_10LE, NV16, NV24, NV12_64Z32, A420_10BE, A420_10LE, A422_10BE, A422_10LE, A444_10BE, A444_10LE, NV61, P010_10BE, P010_10LE, IYU2, VYUY, GBRA, GBRA_10BE, GBRA_10LE, GBR_12BE, GBR_12LE, GBRA_12BE, GBRA_12LE, I420_12BE, I420_12LE, I422_12BE, I422_12LE, Y444_12BE, Y444_12LE, GRAY10_LE32, NV12_10LE32, NV16_10LE32 }"),
-    ("GST_VIDEO_FORMAT_A420", "34"),
-    ("GST_VIDEO_FORMAT_A420_10BE", "54"),
-    ("GST_VIDEO_FORMAT_A420_10LE", "55"),
-    ("GST_VIDEO_FORMAT_A422_10BE", "56"),
-    ("GST_VIDEO_FORMAT_A422_10LE", "57"),
-    ("GST_VIDEO_FORMAT_A444_10BE", "58"),
-    ("GST_VIDEO_FORMAT_A444_10LE", "59"),
-    ("GST_VIDEO_FORMAT_ABGR", "14"),
-    ("GST_VIDEO_FORMAT_ARGB", "13"),
-    ("GST_VIDEO_FORMAT_ARGB64", "39"),
-    ("GST_VIDEO_FORMAT_AYUV", "6"),
-    ("GST_VIDEO_FORMAT_AYUV64", "40"),
-    ("GST_VIDEO_FORMAT_BGR", "16"),
-    ("GST_VIDEO_FORMAT_BGR15", "32"),
-    ("GST_VIDEO_FORMAT_BGR16", "30"),
-    ("GST_VIDEO_FORMAT_BGRA", "12"),
-    ("GST_VIDEO_FORMAT_BGRx", "8"),
-    ("GST_VIDEO_FORMAT_ENCODED", "1"),
-    ("GST_VIDEO_FORMAT_FLAG_ALPHA", "8"),
-    ("GST_VIDEO_FORMAT_FLAG_COMPLEX", "64"),
-    ("GST_VIDEO_FORMAT_FLAG_GRAY", "4"),
-    ("GST_VIDEO_FORMAT_FLAG_LE", "16"),
-    ("GST_VIDEO_FORMAT_FLAG_PALETTE", "32"),
-    ("GST_VIDEO_FORMAT_FLAG_RGB", "2"),
-    ("GST_VIDEO_FORMAT_FLAG_TILED", "256"),
-    ("GST_VIDEO_FORMAT_FLAG_UNPACK", "128"),
-    ("GST_VIDEO_FORMAT_FLAG_YUV", "1"),
-    ("GST_VIDEO_FORMAT_GBR", "48"),
-    ("GST_VIDEO_FORMAT_GBRA", "65"),
-    ("GST_VIDEO_FORMAT_GBRA_10BE", "66"),
-    ("GST_VIDEO_FORMAT_GBRA_10LE", "67"),
-    ("GST_VIDEO_FORMAT_GBRA_12BE", "70"),
-    ("GST_VIDEO_FORMAT_GBRA_12LE", "71"),
-    ("GST_VIDEO_FORMAT_GBR_10BE", "49"),
-    ("GST_VIDEO_FORMAT_GBR_10LE", "50"),
-    ("GST_VIDEO_FORMAT_GBR_12BE", "68"),
-    ("GST_VIDEO_FORMAT_GBR_12LE", "69"),
-    ("GST_VIDEO_FORMAT_GRAY10_LE32", "78"),
-    ("GST_VIDEO_FORMAT_GRAY16_BE", "26"),
-    ("GST_VIDEO_FORMAT_GRAY16_LE", "27"),
-    ("GST_VIDEO_FORMAT_GRAY8", "25"),
-    ("GST_VIDEO_FORMAT_I420", "2"),
-    ("GST_VIDEO_FORMAT_I420_10BE", "42"),
-    ("GST_VIDEO_FORMAT_I420_10LE", "43"),
-    ("GST_VIDEO_FORMAT_I420_12BE", "72"),
-    ("GST_VIDEO_FORMAT_I420_12LE", "73"),
-    ("GST_VIDEO_FORMAT_I422_10BE", "44"),
-    ("GST_VIDEO_FORMAT_I422_10LE", "45"),
-    ("GST_VIDEO_FORMAT_I422_12BE", "74"),
-    ("GST_VIDEO_FORMAT_I422_12LE", "75"),
-    ("GST_VIDEO_FORMAT_IYU1", "38"),
-    ("GST_VIDEO_FORMAT_IYU2", "63"),
-    ("GST_VIDEO_FORMAT_NV12", "23"),
-    ("GST_VIDEO_FORMAT_NV12_10LE32", "79"),
-    ("GST_VIDEO_FORMAT_NV12_64Z32", "53"),
-    ("GST_VIDEO_FORMAT_NV16", "51"),
-    ("GST_VIDEO_FORMAT_NV16_10LE32", "80"),
-    ("GST_VIDEO_FORMAT_NV21", "24"),
-    ("GST_VIDEO_FORMAT_NV24", "52"),
-    ("GST_VIDEO_FORMAT_NV61", "60"),
-    ("GST_VIDEO_FORMAT_P010_10BE", "61"),
-    ("GST_VIDEO_FORMAT_P010_10LE", "62"),
-    ("GST_VIDEO_FORMAT_RGB", "15"),
-    ("GST_VIDEO_FORMAT_RGB15", "31"),
-    ("GST_VIDEO_FORMAT_RGB16", "29"),
-    ("GST_VIDEO_FORMAT_RGB8P", "35"),
-    ("GST_VIDEO_FORMAT_RGBA", "11"),
-    ("GST_VIDEO_FORMAT_RGBx", "7"),
-    ("GST_VIDEO_FORMAT_UNKNOWN", "0"),
-    ("GST_VIDEO_FORMAT_UYVP", "33"),
-    ("GST_VIDEO_FORMAT_UYVY", "5"),
-    ("GST_VIDEO_FORMAT_VYUY", "64"),
-    ("GST_VIDEO_FORMAT_Y41B", "17"),
-    ("GST_VIDEO_FORMAT_Y42B", "18"),
-    ("GST_VIDEO_FORMAT_Y444", "20"),
-    ("GST_VIDEO_FORMAT_Y444_10BE", "46"),
-    ("GST_VIDEO_FORMAT_Y444_10LE", "47"),
-    ("GST_VIDEO_FORMAT_Y444_12BE", "76"),
-    ("GST_VIDEO_FORMAT_Y444_12LE", "77"),
-    ("GST_VIDEO_FORMAT_YUV9", "36"),
-    ("GST_VIDEO_FORMAT_YUY2", "4"),
-    ("GST_VIDEO_FORMAT_YV12", "3"),
-    ("GST_VIDEO_FORMAT_YVU9", "37"),
-    ("GST_VIDEO_FORMAT_YVYU", "19"),
-    ("GST_VIDEO_FORMAT_r210", "41"),
-    ("GST_VIDEO_FORMAT_v210", "21"),
-    ("GST_VIDEO_FORMAT_v216", "22"),
-    ("GST_VIDEO_FORMAT_v308", "28"),
-    ("GST_VIDEO_FORMAT_xBGR", "10"),
-    ("GST_VIDEO_FORMAT_xRGB", "9"),
+    ("(gint) GST_VIDEO_FORMAT_A420", "34"),
+    ("(gint) GST_VIDEO_FORMAT_A420_10BE", "54"),
+    ("(gint) GST_VIDEO_FORMAT_A420_10LE", "55"),
+    ("(gint) GST_VIDEO_FORMAT_A422_10BE", "56"),
+    ("(gint) GST_VIDEO_FORMAT_A422_10LE", "57"),
+    ("(gint) GST_VIDEO_FORMAT_A444_10BE", "58"),
+    ("(gint) GST_VIDEO_FORMAT_A444_10LE", "59"),
+    ("(gint) GST_VIDEO_FORMAT_ABGR", "14"),
+    ("(gint) GST_VIDEO_FORMAT_ARGB", "13"),
+    ("(gint) GST_VIDEO_FORMAT_ARGB64", "39"),
+    ("(gint) GST_VIDEO_FORMAT_AYUV", "6"),
+    ("(gint) GST_VIDEO_FORMAT_AYUV64", "40"),
+    ("(gint) GST_VIDEO_FORMAT_BGR", "16"),
+    ("(gint) GST_VIDEO_FORMAT_BGR15", "32"),
+    ("(gint) GST_VIDEO_FORMAT_BGR16", "30"),
+    ("(gint) GST_VIDEO_FORMAT_BGRA", "12"),
+    ("(gint) GST_VIDEO_FORMAT_BGRx", "8"),
+    ("(gint) GST_VIDEO_FORMAT_ENCODED", "1"),
+    ("(guint) GST_VIDEO_FORMAT_FLAG_ALPHA", "8"),
+    ("(guint) GST_VIDEO_FORMAT_FLAG_COMPLEX", "64"),
+    ("(guint) GST_VIDEO_FORMAT_FLAG_GRAY", "4"),
+    ("(guint) GST_VIDEO_FORMAT_FLAG_LE", "16"),
+    ("(guint) GST_VIDEO_FORMAT_FLAG_PALETTE", "32"),
+    ("(guint) GST_VIDEO_FORMAT_FLAG_RGB", "2"),
+    ("(guint) GST_VIDEO_FORMAT_FLAG_TILED", "256"),
+    ("(guint) GST_VIDEO_FORMAT_FLAG_UNPACK", "128"),
+    ("(guint) GST_VIDEO_FORMAT_FLAG_YUV", "1"),
+    ("(gint) GST_VIDEO_FORMAT_GBR", "48"),
+    ("(gint) GST_VIDEO_FORMAT_GBRA", "65"),
+    ("(gint) GST_VIDEO_FORMAT_GBRA_10BE", "66"),
+    ("(gint) GST_VIDEO_FORMAT_GBRA_10LE", "67"),
+    ("(gint) GST_VIDEO_FORMAT_GBRA_12BE", "70"),
+    ("(gint) GST_VIDEO_FORMAT_GBRA_12LE", "71"),
+    ("(gint) GST_VIDEO_FORMAT_GBR_10BE", "49"),
+    ("(gint) GST_VIDEO_FORMAT_GBR_10LE", "50"),
+    ("(gint) GST_VIDEO_FORMAT_GBR_12BE", "68"),
+    ("(gint) GST_VIDEO_FORMAT_GBR_12LE", "69"),
+    ("(gint) GST_VIDEO_FORMAT_GRAY10_LE32", "78"),
+    ("(gint) GST_VIDEO_FORMAT_GRAY16_BE", "26"),
+    ("(gint) GST_VIDEO_FORMAT_GRAY16_LE", "27"),
+    ("(gint) GST_VIDEO_FORMAT_GRAY8", "25"),
+    ("(gint) GST_VIDEO_FORMAT_I420", "2"),
+    ("(gint) GST_VIDEO_FORMAT_I420_10BE", "42"),
+    ("(gint) GST_VIDEO_FORMAT_I420_10LE", "43"),
+    ("(gint) GST_VIDEO_FORMAT_I420_12BE", "72"),
+    ("(gint) GST_VIDEO_FORMAT_I420_12LE", "73"),
+    ("(gint) GST_VIDEO_FORMAT_I422_10BE", "44"),
+    ("(gint) GST_VIDEO_FORMAT_I422_10LE", "45"),
+    ("(gint) GST_VIDEO_FORMAT_I422_12BE", "74"),
+    ("(gint) GST_VIDEO_FORMAT_I422_12LE", "75"),
+    ("(gint) GST_VIDEO_FORMAT_IYU1", "38"),
+    ("(gint) GST_VIDEO_FORMAT_IYU2", "63"),
+    ("(gint) GST_VIDEO_FORMAT_NV12", "23"),
+    ("(gint) GST_VIDEO_FORMAT_NV12_10LE32", "79"),
+    ("(gint) GST_VIDEO_FORMAT_NV12_64Z32", "53"),
+    ("(gint) GST_VIDEO_FORMAT_NV16", "51"),
+    ("(gint) GST_VIDEO_FORMAT_NV16_10LE32", "80"),
+    ("(gint) GST_VIDEO_FORMAT_NV21", "24"),
+    ("(gint) GST_VIDEO_FORMAT_NV24", "52"),
+    ("(gint) GST_VIDEO_FORMAT_NV61", "60"),
+    ("(gint) GST_VIDEO_FORMAT_P010_10BE", "61"),
+    ("(gint) GST_VIDEO_FORMAT_P010_10LE", "62"),
+    ("(gint) GST_VIDEO_FORMAT_RGB", "15"),
+    ("(gint) GST_VIDEO_FORMAT_RGB15", "31"),
+    ("(gint) GST_VIDEO_FORMAT_RGB16", "29"),
+    ("(gint) GST_VIDEO_FORMAT_RGB8P", "35"),
+    ("(gint) GST_VIDEO_FORMAT_RGBA", "11"),
+    ("(gint) GST_VIDEO_FORMAT_RGBx", "7"),
+    ("(gint) GST_VIDEO_FORMAT_UNKNOWN", "0"),
+    ("(gint) GST_VIDEO_FORMAT_UYVP", "33"),
+    ("(gint) GST_VIDEO_FORMAT_UYVY", "5"),
+    ("(gint) GST_VIDEO_FORMAT_VYUY", "64"),
+    ("(gint) GST_VIDEO_FORMAT_Y41B", "17"),
+    ("(gint) GST_VIDEO_FORMAT_Y42B", "18"),
+    ("(gint) GST_VIDEO_FORMAT_Y444", "20"),
+    ("(gint) GST_VIDEO_FORMAT_Y444_10BE", "46"),
+    ("(gint) GST_VIDEO_FORMAT_Y444_10LE", "47"),
+    ("(gint) GST_VIDEO_FORMAT_Y444_12BE", "76"),
+    ("(gint) GST_VIDEO_FORMAT_Y444_12LE", "77"),
+    ("(gint) GST_VIDEO_FORMAT_YUV9", "36"),
+    ("(gint) GST_VIDEO_FORMAT_YUY2", "4"),
+    ("(gint) GST_VIDEO_FORMAT_YV12", "3"),
+    ("(gint) GST_VIDEO_FORMAT_YVU9", "37"),
+    ("(gint) GST_VIDEO_FORMAT_YVYU", "19"),
+    ("(gint) GST_VIDEO_FORMAT_r210", "41"),
+    ("(gint) GST_VIDEO_FORMAT_v210", "21"),
+    ("(gint) GST_VIDEO_FORMAT_v216", "22"),
+    ("(gint) GST_VIDEO_FORMAT_v308", "28"),
+    ("(gint) GST_VIDEO_FORMAT_xBGR", "10"),
+    ("(gint) GST_VIDEO_FORMAT_xRGB", "9"),
     ("GST_VIDEO_FPS_RANGE", "(fraction) [ 0, max ]"),
-    ("GST_VIDEO_FRAME_FLAG_FIRST_IN_BUNDLE", "32"),
-    ("GST_VIDEO_FRAME_FLAG_INTERLACED", "1"),
-    ("GST_VIDEO_FRAME_FLAG_MULTIPLE_VIEW", "16"),
-    ("GST_VIDEO_FRAME_FLAG_NONE", "0"),
-    ("GST_VIDEO_FRAME_FLAG_ONEFIELD", "8"),
-    ("GST_VIDEO_FRAME_FLAG_RFF", "4"),
-    ("GST_VIDEO_FRAME_FLAG_TFF", "2"),
-    ("GST_VIDEO_FRAME_MAP_FLAG_LAST", "16777216"),
-    ("GST_VIDEO_FRAME_MAP_FLAG_NO_REF", "65536"),
-    ("GST_VIDEO_GAMMA_MODE_NONE", "0"),
-    ("GST_VIDEO_GAMMA_MODE_REMAP", "1"),
-    ("GST_VIDEO_GL_TEXTURE_ORIENTATION_X_FLIP_Y_FLIP", "3"),
-    ("GST_VIDEO_GL_TEXTURE_ORIENTATION_X_FLIP_Y_NORMAL", "2"),
-    ("GST_VIDEO_GL_TEXTURE_ORIENTATION_X_NORMAL_Y_FLIP", "1"),
-    ("GST_VIDEO_GL_TEXTURE_ORIENTATION_X_NORMAL_Y_NORMAL", "0"),
-    ("GST_VIDEO_GL_TEXTURE_TYPE_LUMINANCE", "0"),
-    ("GST_VIDEO_GL_TEXTURE_TYPE_LUMINANCE_ALPHA", "1"),
-    ("GST_VIDEO_GL_TEXTURE_TYPE_R", "5"),
-    ("GST_VIDEO_GL_TEXTURE_TYPE_RG", "6"),
-    ("GST_VIDEO_GL_TEXTURE_TYPE_RGB", "3"),
-    ("GST_VIDEO_GL_TEXTURE_TYPE_RGB16", "2"),
-    ("GST_VIDEO_GL_TEXTURE_TYPE_RGBA", "4"),
-    ("GST_VIDEO_INTERLACE_MODE_FIELDS", "3"),
-    ("GST_VIDEO_INTERLACE_MODE_INTERLEAVED", "1"),
-    ("GST_VIDEO_INTERLACE_MODE_MIXED", "2"),
-    ("GST_VIDEO_INTERLACE_MODE_PROGRESSIVE", "0"),
-    ("GST_VIDEO_MATRIX_MODE_FULL", "0"),
-    ("GST_VIDEO_MATRIX_MODE_INPUT_ONLY", "1"),
-    ("GST_VIDEO_MATRIX_MODE_NONE", "3"),
-    ("GST_VIDEO_MATRIX_MODE_OUTPUT_ONLY", "2"),
+    ("(guint) GST_VIDEO_FRAME_FLAG_FIRST_IN_BUNDLE", "32"),
+    ("(guint) GST_VIDEO_FRAME_FLAG_INTERLACED", "1"),
+    ("(guint) GST_VIDEO_FRAME_FLAG_MULTIPLE_VIEW", "16"),
+    ("(guint) GST_VIDEO_FRAME_FLAG_NONE", "0"),
+    ("(guint) GST_VIDEO_FRAME_FLAG_ONEFIELD", "8"),
+    ("(guint) GST_VIDEO_FRAME_FLAG_RFF", "4"),
+    ("(guint) GST_VIDEO_FRAME_FLAG_TFF", "2"),
+    ("(guint) GST_VIDEO_FRAME_MAP_FLAG_LAST", "16777216"),
+    ("(guint) GST_VIDEO_FRAME_MAP_FLAG_NO_REF", "65536"),
+    ("(gint) GST_VIDEO_GAMMA_MODE_NONE", "0"),
+    ("(gint) GST_VIDEO_GAMMA_MODE_REMAP", "1"),
+    ("(gint) GST_VIDEO_GL_TEXTURE_ORIENTATION_X_FLIP_Y_FLIP", "3"),
+    ("(gint) GST_VIDEO_GL_TEXTURE_ORIENTATION_X_FLIP_Y_NORMAL", "2"),
+    ("(gint) GST_VIDEO_GL_TEXTURE_ORIENTATION_X_NORMAL_Y_FLIP", "1"),
+    ("(gint) GST_VIDEO_GL_TEXTURE_ORIENTATION_X_NORMAL_Y_NORMAL", "0"),
+    ("(gint) GST_VIDEO_GL_TEXTURE_TYPE_LUMINANCE", "0"),
+    ("(gint) GST_VIDEO_GL_TEXTURE_TYPE_LUMINANCE_ALPHA", "1"),
+    ("(gint) GST_VIDEO_GL_TEXTURE_TYPE_R", "5"),
+    ("(gint) GST_VIDEO_GL_TEXTURE_TYPE_RG", "6"),
+    ("(gint) GST_VIDEO_GL_TEXTURE_TYPE_RGB", "3"),
+    ("(gint) GST_VIDEO_GL_TEXTURE_TYPE_RGB16", "2"),
+    ("(gint) GST_VIDEO_GL_TEXTURE_TYPE_RGBA", "4"),
+    ("(gint) GST_VIDEO_INTERLACE_MODE_FIELDS", "3"),
+    ("(gint) GST_VIDEO_INTERLACE_MODE_INTERLEAVED", "1"),
+    ("(gint) GST_VIDEO_INTERLACE_MODE_MIXED", "2"),
+    ("(gint) GST_VIDEO_INTERLACE_MODE_PROGRESSIVE", "0"),
+    ("(gint) GST_VIDEO_MATRIX_MODE_FULL", "0"),
+    ("(gint) GST_VIDEO_MATRIX_MODE_INPUT_ONLY", "1"),
+    ("(gint) GST_VIDEO_MATRIX_MODE_NONE", "3"),
+    ("(gint) GST_VIDEO_MATRIX_MODE_OUTPUT_ONLY", "2"),
     ("GST_VIDEO_MAX_COMPONENTS", "4"),
     ("GST_VIDEO_MAX_PLANES", "4"),
-    ("GST_VIDEO_MULTIVIEW_FLAGS_HALF_ASPECT", "16384"),
-    ("GST_VIDEO_MULTIVIEW_FLAGS_LEFT_FLIPPED", "2"),
-    ("GST_VIDEO_MULTIVIEW_FLAGS_LEFT_FLOPPED", "4"),
-    ("GST_VIDEO_MULTIVIEW_FLAGS_MIXED_MONO", "32768"),
-    ("GST_VIDEO_MULTIVIEW_FLAGS_NONE", "0"),
-    ("GST_VIDEO_MULTIVIEW_FLAGS_RIGHT_FLIPPED", "8"),
-    ("GST_VIDEO_MULTIVIEW_FLAGS_RIGHT_FLOPPED", "16"),
-    ("GST_VIDEO_MULTIVIEW_FLAGS_RIGHT_VIEW_FIRST", "1"),
-    ("GST_VIDEO_MULTIVIEW_FRAME_PACKING_CHECKERBOARD", "8"),
-    ("GST_VIDEO_MULTIVIEW_FRAME_PACKING_COLUMN_INTERLEAVED", "5"),
-    ("GST_VIDEO_MULTIVIEW_FRAME_PACKING_LEFT", "1"),
-    ("GST_VIDEO_MULTIVIEW_FRAME_PACKING_MONO", "0"),
-    ("GST_VIDEO_MULTIVIEW_FRAME_PACKING_NONE", "-1"),
-    ("GST_VIDEO_MULTIVIEW_FRAME_PACKING_RIGHT", "2"),
-    ("GST_VIDEO_MULTIVIEW_FRAME_PACKING_ROW_INTERLEAVED", "6"),
-    ("GST_VIDEO_MULTIVIEW_FRAME_PACKING_SIDE_BY_SIDE", "3"),
-    ("GST_VIDEO_MULTIVIEW_FRAME_PACKING_SIDE_BY_SIDE_QUINCUNX", "4"),
-    ("GST_VIDEO_MULTIVIEW_FRAME_PACKING_TOP_BOTTOM", "7"),
-    ("GST_VIDEO_MULTIVIEW_MODE_CHECKERBOARD", "8"),
-    ("GST_VIDEO_MULTIVIEW_MODE_COLUMN_INTERLEAVED", "5"),
-    ("GST_VIDEO_MULTIVIEW_MODE_FRAME_BY_FRAME", "32"),
-    ("GST_VIDEO_MULTIVIEW_MODE_LEFT", "1"),
-    ("GST_VIDEO_MULTIVIEW_MODE_MONO", "0"),
-    ("GST_VIDEO_MULTIVIEW_MODE_MULTIVIEW_FRAME_BY_FRAME", "33"),
-    ("GST_VIDEO_MULTIVIEW_MODE_NONE", "-1"),
-    ("GST_VIDEO_MULTIVIEW_MODE_RIGHT", "2"),
-    ("GST_VIDEO_MULTIVIEW_MODE_ROW_INTERLEAVED", "6"),
-    ("GST_VIDEO_MULTIVIEW_MODE_SEPARATED", "34"),
-    ("GST_VIDEO_MULTIVIEW_MODE_SIDE_BY_SIDE", "3"),
-    ("GST_VIDEO_MULTIVIEW_MODE_SIDE_BY_SIDE_QUINCUNX", "4"),
-    ("GST_VIDEO_MULTIVIEW_MODE_TOP_BOTTOM", "7"),
-    ("GST_VIDEO_ORIENTATION_180", "2"),
-    ("GST_VIDEO_ORIENTATION_90L", "3"),
-    ("GST_VIDEO_ORIENTATION_90R", "1"),
-    ("GST_VIDEO_ORIENTATION_AUTO", "8"),
-    ("GST_VIDEO_ORIENTATION_CUSTOM", "9"),
-    ("GST_VIDEO_ORIENTATION_HORIZ", "4"),
-    ("GST_VIDEO_ORIENTATION_IDENTITY", "0"),
-    ("GST_VIDEO_ORIENTATION_UL_LR", "6"),
-    ("GST_VIDEO_ORIENTATION_UR_LL", "7"),
-    ("GST_VIDEO_ORIENTATION_VERT", "5"),
+    ("(guint) GST_VIDEO_MULTIVIEW_FLAGS_HALF_ASPECT", "16384"),
+    ("(guint) GST_VIDEO_MULTIVIEW_FLAGS_LEFT_FLIPPED", "2"),
+    ("(guint) GST_VIDEO_MULTIVIEW_FLAGS_LEFT_FLOPPED", "4"),
+    ("(guint) GST_VIDEO_MULTIVIEW_FLAGS_MIXED_MONO", "32768"),
+    ("(guint) GST_VIDEO_MULTIVIEW_FLAGS_NONE", "0"),
+    ("(guint) GST_VIDEO_MULTIVIEW_FLAGS_RIGHT_FLIPPED", "8"),
+    ("(guint) GST_VIDEO_MULTIVIEW_FLAGS_RIGHT_FLOPPED", "16"),
+    ("(guint) GST_VIDEO_MULTIVIEW_FLAGS_RIGHT_VIEW_FIRST", "1"),
+    ("(gint) GST_VIDEO_MULTIVIEW_FRAME_PACKING_CHECKERBOARD", "8"),
+    ("(gint) GST_VIDEO_MULTIVIEW_FRAME_PACKING_COLUMN_INTERLEAVED", "5"),
+    ("(gint) GST_VIDEO_MULTIVIEW_FRAME_PACKING_LEFT", "1"),
+    ("(gint) GST_VIDEO_MULTIVIEW_FRAME_PACKING_MONO", "0"),
+    ("(gint) GST_VIDEO_MULTIVIEW_FRAME_PACKING_NONE", "-1"),
+    ("(gint) GST_VIDEO_MULTIVIEW_FRAME_PACKING_RIGHT", "2"),
+    ("(gint) GST_VIDEO_MULTIVIEW_FRAME_PACKING_ROW_INTERLEAVED", "6"),
+    ("(gint) GST_VIDEO_MULTIVIEW_FRAME_PACKING_SIDE_BY_SIDE", "3"),
+    ("(gint) GST_VIDEO_MULTIVIEW_FRAME_PACKING_SIDE_BY_SIDE_QUINCUNX", "4"),
+    ("(gint) GST_VIDEO_MULTIVIEW_FRAME_PACKING_TOP_BOTTOM", "7"),
+    ("(gint) GST_VIDEO_MULTIVIEW_MODE_CHECKERBOARD", "8"),
+    ("(gint) GST_VIDEO_MULTIVIEW_MODE_COLUMN_INTERLEAVED", "5"),
+    ("(gint) GST_VIDEO_MULTIVIEW_MODE_FRAME_BY_FRAME", "32"),
+    ("(gint) GST_VIDEO_MULTIVIEW_MODE_LEFT", "1"),
+    ("(gint) GST_VIDEO_MULTIVIEW_MODE_MONO", "0"),
+    ("(gint) GST_VIDEO_MULTIVIEW_MODE_MULTIVIEW_FRAME_BY_FRAME", "33"),
+    ("(gint) GST_VIDEO_MULTIVIEW_MODE_NONE", "-1"),
+    ("(gint) GST_VIDEO_MULTIVIEW_MODE_RIGHT", "2"),
+    ("(gint) GST_VIDEO_MULTIVIEW_MODE_ROW_INTERLEAVED", "6"),
+    ("(gint) GST_VIDEO_MULTIVIEW_MODE_SEPARATED", "34"),
+    ("(gint) GST_VIDEO_MULTIVIEW_MODE_SIDE_BY_SIDE", "3"),
+    ("(gint) GST_VIDEO_MULTIVIEW_MODE_SIDE_BY_SIDE_QUINCUNX", "4"),
+    ("(gint) GST_VIDEO_MULTIVIEW_MODE_TOP_BOTTOM", "7"),
+    ("(gint) GST_VIDEO_ORIENTATION_180", "2"),
+    ("(gint) GST_VIDEO_ORIENTATION_90L", "3"),
+    ("(gint) GST_VIDEO_ORIENTATION_90R", "1"),
+    ("(gint) GST_VIDEO_ORIENTATION_AUTO", "8"),
+    ("(gint) GST_VIDEO_ORIENTATION_CUSTOM", "9"),
+    ("(gint) GST_VIDEO_ORIENTATION_HORIZ", "4"),
+    ("(gint) GST_VIDEO_ORIENTATION_IDENTITY", "0"),
+    ("(gint) GST_VIDEO_ORIENTATION_UL_LR", "6"),
+    ("(gint) GST_VIDEO_ORIENTATION_UR_LL", "7"),
+    ("(gint) GST_VIDEO_ORIENTATION_VERT", "5"),
     ("GST_VIDEO_OVERLAY_COMPOSITION_BLEND_FORMATS", "{ BGRx, RGBx, xRGB, xBGR, RGBA, BGRA, ARGB, ABGR, RGB, BGR, I420, YV12, AYUV, YUY2, UYVY, v308, Y41B, Y42B, Y444, NV12, NV21, A420, YUV9, YVU9, IYU1, GRAY8 }"),
-    ("GST_VIDEO_OVERLAY_FORMAT_FLAG_GLOBAL_ALPHA", "2"),
-    ("GST_VIDEO_OVERLAY_FORMAT_FLAG_NONE", "0"),
-    ("GST_VIDEO_OVERLAY_FORMAT_FLAG_PREMULTIPLIED_ALPHA", "1"),
-    ("GST_VIDEO_PACK_FLAG_INTERLACED", "2"),
-    ("GST_VIDEO_PACK_FLAG_NONE", "0"),
-    ("GST_VIDEO_PACK_FLAG_TRUNCATE_RANGE", "1"),
-    ("GST_VIDEO_PRIMARIES_MODE_FAST", "2"),
-    ("GST_VIDEO_PRIMARIES_MODE_MERGE_ONLY", "1"),
-    ("GST_VIDEO_PRIMARIES_MODE_NONE", "0"),
-    ("GST_VIDEO_RESAMPLER_FLAG_HALF_TAPS", "1"),
-    ("GST_VIDEO_RESAMPLER_FLAG_NONE", "0"),
-    ("GST_VIDEO_RESAMPLER_METHOD_CUBIC", "2"),
-    ("GST_VIDEO_RESAMPLER_METHOD_LANCZOS", "4"),
-    ("GST_VIDEO_RESAMPLER_METHOD_LINEAR", "1"),
-    ("GST_VIDEO_RESAMPLER_METHOD_NEAREST", "0"),
-    ("GST_VIDEO_RESAMPLER_METHOD_SINC", "3"),
+    ("(guint) GST_VIDEO_OVERLAY_FORMAT_FLAG_GLOBAL_ALPHA", "2"),
+    ("(guint) GST_VIDEO_OVERLAY_FORMAT_FLAG_NONE", "0"),
+    ("(guint) GST_VIDEO_OVERLAY_FORMAT_FLAG_PREMULTIPLIED_ALPHA", "1"),
+    ("(guint) GST_VIDEO_PACK_FLAG_INTERLACED", "2"),
+    ("(guint) GST_VIDEO_PACK_FLAG_NONE", "0"),
+    ("(guint) GST_VIDEO_PACK_FLAG_TRUNCATE_RANGE", "1"),
+    ("(gint) GST_VIDEO_PRIMARIES_MODE_FAST", "2"),
+    ("(gint) GST_VIDEO_PRIMARIES_MODE_MERGE_ONLY", "1"),
+    ("(gint) GST_VIDEO_PRIMARIES_MODE_NONE", "0"),
+    ("(guint) GST_VIDEO_RESAMPLER_FLAG_HALF_TAPS", "1"),
+    ("(guint) GST_VIDEO_RESAMPLER_FLAG_NONE", "0"),
+    ("(gint) GST_VIDEO_RESAMPLER_METHOD_CUBIC", "2"),
+    ("(gint) GST_VIDEO_RESAMPLER_METHOD_LANCZOS", "4"),
+    ("(gint) GST_VIDEO_RESAMPLER_METHOD_LINEAR", "1"),
+    ("(gint) GST_VIDEO_RESAMPLER_METHOD_NEAREST", "0"),
+    ("(gint) GST_VIDEO_RESAMPLER_METHOD_SINC", "3"),
     ("GST_VIDEO_RESAMPLER_OPT_CUBIC_B", "GstVideoResampler.cubic-b"),
     ("GST_VIDEO_RESAMPLER_OPT_CUBIC_C", "GstVideoResampler.cubic-c"),
     ("GST_VIDEO_RESAMPLER_OPT_ENVELOPE", "GstVideoResampler.envelope"),
     ("GST_VIDEO_RESAMPLER_OPT_MAX_TAPS", "GstVideoResampler.max-taps"),
     ("GST_VIDEO_RESAMPLER_OPT_SHARPEN", "GstVideoResampler.sharpen"),
     ("GST_VIDEO_RESAMPLER_OPT_SHARPNESS", "GstVideoResampler.sharpness"),
-    ("GST_VIDEO_SCALER_FLAG_INTERLACED", "1"),
-    ("GST_VIDEO_SCALER_FLAG_NONE", "0"),
+    ("(guint) GST_VIDEO_SCALER_FLAG_INTERLACED", "1"),
+    ("(guint) GST_VIDEO_SCALER_FLAG_NONE", "0"),
     ("GST_VIDEO_SCALER_OPT_DITHER_METHOD", "GstVideoScaler.dither-method"),
     ("GST_VIDEO_SIZE_RANGE", "(int) [ 1, max ]"),
-    ("GST_VIDEO_TILE_MODE_UNKNOWN", "0"),
-    ("GST_VIDEO_TILE_MODE_ZFLIPZ_2X2", "65536"),
-    ("GST_VIDEO_TILE_TYPE_INDEXED", "0"),
+    ("(gint) GST_VIDEO_TILE_MODE_UNKNOWN", "0"),
+    ("(gint) GST_VIDEO_TILE_MODE_ZFLIPZ_2X2", "65536"),
+    ("(gint) GST_VIDEO_TILE_TYPE_INDEXED", "0"),
     ("GST_VIDEO_TILE_TYPE_MASK", "65535"),
     ("GST_VIDEO_TILE_TYPE_SHIFT", "16"),
     ("GST_VIDEO_TILE_X_TILES_MASK", "65535"),
     ("GST_VIDEO_TILE_Y_TILES_SHIFT", "16"),
-    ("GST_VIDEO_TIME_CODE_FLAGS_DROP_FRAME", "1"),
-    ("GST_VIDEO_TIME_CODE_FLAGS_INTERLACED", "2"),
-    ("GST_VIDEO_TIME_CODE_FLAGS_NONE", "0"),
-    ("GST_VIDEO_TRANSFER_ADOBERGB", "12"),
-    ("GST_VIDEO_TRANSFER_BT2020_12", "11"),
-    ("GST_VIDEO_TRANSFER_BT709", "5"),
-    ("GST_VIDEO_TRANSFER_GAMMA10", "1"),
-    ("GST_VIDEO_TRANSFER_GAMMA18", "2"),
-    ("GST_VIDEO_TRANSFER_GAMMA20", "3"),
-    ("GST_VIDEO_TRANSFER_GAMMA22", "4"),
-    ("GST_VIDEO_TRANSFER_GAMMA28", "8"),
-    ("GST_VIDEO_TRANSFER_LOG100", "9"),
-    ("GST_VIDEO_TRANSFER_LOG316", "10"),
-    ("GST_VIDEO_TRANSFER_SMPTE240M", "6"),
-    ("GST_VIDEO_TRANSFER_SRGB", "7"),
-    ("GST_VIDEO_TRANSFER_UNKNOWN", "0"),
+    ("(guint) GST_VIDEO_TIME_CODE_FLAGS_DROP_FRAME", "1"),
+    ("(guint) GST_VIDEO_TIME_CODE_FLAGS_INTERLACED", "2"),
+    ("(guint) GST_VIDEO_TIME_CODE_FLAGS_NONE", "0"),
+    ("(gint) GST_VIDEO_TRANSFER_ADOBERGB", "12"),
+    ("(gint) GST_VIDEO_TRANSFER_BT2020_12", "11"),
+    ("(gint) GST_VIDEO_TRANSFER_BT709", "5"),
+    ("(gint) GST_VIDEO_TRANSFER_GAMMA10", "1"),
+    ("(gint) GST_VIDEO_TRANSFER_GAMMA18", "2"),
+    ("(gint) GST_VIDEO_TRANSFER_GAMMA20", "3"),
+    ("(gint) GST_VIDEO_TRANSFER_GAMMA22", "4"),
+    ("(gint) GST_VIDEO_TRANSFER_GAMMA28", "8"),
+    ("(gint) GST_VIDEO_TRANSFER_LOG100", "9"),
+    ("(gint) GST_VIDEO_TRANSFER_LOG316", "10"),
+    ("(gint) GST_VIDEO_TRANSFER_SMPTE240M", "6"),
+    ("(gint) GST_VIDEO_TRANSFER_SRGB", "7"),
+    ("(gint) GST_VIDEO_TRANSFER_UNKNOWN", "0"),
 ];
 
 
diff --git a/gstreamer-video-sys/tests/constant.c b/gstreamer-video-sys/tests/constant.c
index a167e0146..f54bce75c 100644
--- a/gstreamer-video-sys/tests/constant.c
+++ b/gstreamer-video-sys/tests/constant.c
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
@@ -7,21 +7,21 @@
 
 int main() {
     printf(_Generic((ABI_CONSTANT_NAME),
-                    char *: "%s",
-                    const char *: "%s",
-                    char: "%c",
-                    signed char: "%hhd",
-                    unsigned char: "%hhu",
-                    short int: "%hd",
-                    unsigned short int: "%hu",
-                    int: "%d",
-                    unsigned int: "%u",
-                    long: "%ld",
-                    unsigned long: "%lu",
-                    long long: "%lld",
-                    unsigned long long: "%llu",
-                    double: "%f",
-                    long double: "%ld"),
+                    char *: "###gir test###%s###gir test###\n",
+                    const char *: "###gir test###%s###gir test###\n",
+                    char: "###gir test###%c###gir test###\n",
+                    signed char: "###gir test###%hhd###gir test###\n",
+                    unsigned char: "###gir test###%hhu###gir test###\n",
+                    short int: "###gir test###%hd###gir test###\n",
+                    unsigned short int: "###gir test###%hu###gir test###\n",
+                    int: "###gir test###%d###gir test###\n",
+                    unsigned int: "###gir test###%u###gir test###\n",
+                    long: "###gir test###%ld###gir test###\n",
+                    unsigned long: "###gir test###%lu###gir test###\n",
+                    long long: "###gir test###%lld###gir test###\n",
+                    unsigned long long: "###gir test###%llu###gir test###\n",
+                    double: "###gir test###%f###gir test###\n",
+                    long double: "###gir test###%ld###gir test###\n"),
            ABI_CONSTANT_NAME);
     return 0;
 }
diff --git a/gstreamer-video-sys/tests/layout.c b/gstreamer-video-sys/tests/layout.c
index 829276260..aef10fc35 100644
--- a/gstreamer-video-sys/tests/layout.c
+++ b/gstreamer-video-sys/tests/layout.c
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
diff --git a/gstreamer-webrtc-sys/src/lib.rs b/gstreamer-webrtc-sys/src/lib.rs
index de30b08ba..79f02f06d 100644
--- a/gstreamer-webrtc-sys/src/lib.rs
+++ b/gstreamer-webrtc-sys/src/lib.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
diff --git a/gstreamer-webrtc-sys/tests/abi.rs b/gstreamer-webrtc-sys/tests/abi.rs
index 58193b4f5..f57f416d3 100644
--- a/gstreamer-webrtc-sys/tests/abi.rs
+++ b/gstreamer-webrtc-sys/tests/abi.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
@@ -227,7 +227,14 @@ fn get_c_value(dir: &Path, cc: &Compiler, name: &str) -> Result<String, Box<Erro
                            &abi_cmd, &output).into());
     }
 
-    Ok(str::from_utf8(&output.stdout)?.trim().to_owned())
+    let output = str::from_utf8(&output.stdout)?.trim();
+    if !output.starts_with("###gir test###") ||
+       !output.ends_with("###gir test###") {
+        return Err(format!("command {:?} return invalid output, {:?}",
+                           &abi_cmd, &output).into());
+    }
+
+    Ok(String::from(&output[14..(output.len() - 14)]))
 }
 
 const RUST_LAYOUTS: &[(&str, Layout)] = &[
@@ -257,66 +264,66 @@ const RUST_LAYOUTS: &[(&str, Layout)] = &[
 ];
 
 const RUST_CONSTANTS: &[(&str, &str)] = &[
-    ("GST_WEBRTC_DTLS_SETUP_ACTIVE", "2"),
-    ("GST_WEBRTC_DTLS_SETUP_ACTPASS", "1"),
-    ("GST_WEBRTC_DTLS_SETUP_NONE", "0"),
-    ("GST_WEBRTC_DTLS_SETUP_PASSIVE", "3"),
-    ("GST_WEBRTC_DTLS_TRANSPORT_STATE_CLOSED", "1"),
-    ("GST_WEBRTC_DTLS_TRANSPORT_STATE_CONNECTED", "4"),
-    ("GST_WEBRTC_DTLS_TRANSPORT_STATE_CONNECTING", "3"),
-    ("GST_WEBRTC_DTLS_TRANSPORT_STATE_FAILED", "2"),
-    ("GST_WEBRTC_DTLS_TRANSPORT_STATE_NEW", "0"),
-    ("GST_WEBRTC_FEC_TYPE_NONE", "0"),
-    ("GST_WEBRTC_FEC_TYPE_ULP_RED", "1"),
-    ("GST_WEBRTC_ICE_COMPONENT_RTCP", "1"),
-    ("GST_WEBRTC_ICE_COMPONENT_RTP", "0"),
-    ("GST_WEBRTC_ICE_CONNECTION_STATE_CHECKING", "1"),
-    ("GST_WEBRTC_ICE_CONNECTION_STATE_CLOSED", "6"),
-    ("GST_WEBRTC_ICE_CONNECTION_STATE_COMPLETED", "3"),
-    ("GST_WEBRTC_ICE_CONNECTION_STATE_CONNECTED", "2"),
-    ("GST_WEBRTC_ICE_CONNECTION_STATE_DISCONNECTED", "5"),
-    ("GST_WEBRTC_ICE_CONNECTION_STATE_FAILED", "4"),
-    ("GST_WEBRTC_ICE_CONNECTION_STATE_NEW", "0"),
-    ("GST_WEBRTC_ICE_GATHERING_STATE_COMPLETE", "2"),
-    ("GST_WEBRTC_ICE_GATHERING_STATE_GATHERING", "1"),
-    ("GST_WEBRTC_ICE_GATHERING_STATE_NEW", "0"),
-    ("GST_WEBRTC_ICE_ROLE_CONTROLLED", "0"),
-    ("GST_WEBRTC_ICE_ROLE_CONTROLLING", "1"),
-    ("GST_WEBRTC_PEER_CONNECTION_STATE_CLOSED", "5"),
-    ("GST_WEBRTC_PEER_CONNECTION_STATE_CONNECTED", "2"),
-    ("GST_WEBRTC_PEER_CONNECTION_STATE_CONNECTING", "1"),
-    ("GST_WEBRTC_PEER_CONNECTION_STATE_DISCONNECTED", "3"),
-    ("GST_WEBRTC_PEER_CONNECTION_STATE_FAILED", "4"),
-    ("GST_WEBRTC_PEER_CONNECTION_STATE_NEW", "0"),
-    ("GST_WEBRTC_RTP_TRANSCEIVER_DIRECTION_INACTIVE", "1"),
-    ("GST_WEBRTC_RTP_TRANSCEIVER_DIRECTION_NONE", "0"),
-    ("GST_WEBRTC_RTP_TRANSCEIVER_DIRECTION_RECVONLY", "3"),
-    ("GST_WEBRTC_RTP_TRANSCEIVER_DIRECTION_SENDONLY", "2"),
-    ("GST_WEBRTC_RTP_TRANSCEIVER_DIRECTION_SENDRECV", "4"),
-    ("GST_WEBRTC_SDP_TYPE_ANSWER", "3"),
-    ("GST_WEBRTC_SDP_TYPE_OFFER", "1"),
-    ("GST_WEBRTC_SDP_TYPE_PRANSWER", "2"),
-    ("GST_WEBRTC_SDP_TYPE_ROLLBACK", "4"),
-    ("GST_WEBRTC_SIGNALING_STATE_CLOSED", "1"),
-    ("GST_WEBRTC_SIGNALING_STATE_HAVE_LOCAL_OFFER", "2"),
-    ("GST_WEBRTC_SIGNALING_STATE_HAVE_LOCAL_PRANSWER", "4"),
-    ("GST_WEBRTC_SIGNALING_STATE_HAVE_REMOTE_OFFER", "3"),
-    ("GST_WEBRTC_SIGNALING_STATE_HAVE_REMOTE_PRANSWER", "5"),
-    ("GST_WEBRTC_SIGNALING_STATE_STABLE", "0"),
-    ("GST_WEBRTC_STATS_CANDIDATE_PAIR", "11"),
-    ("GST_WEBRTC_STATS_CERTIFICATE", "14"),
-    ("GST_WEBRTC_STATS_CODEC", "1"),
-    ("GST_WEBRTC_STATS_CSRC", "6"),
-    ("GST_WEBRTC_STATS_DATA_CHANNEL", "8"),
-    ("GST_WEBRTC_STATS_INBOUND_RTP", "2"),
-    ("GST_WEBRTC_STATS_LOCAL_CANDIDATE", "12"),
-    ("GST_WEBRTC_STATS_OUTBOUND_RTP", "3"),
-    ("GST_WEBRTC_STATS_PEER_CONNECTION", "7"),
-    ("GST_WEBRTC_STATS_REMOTE_CANDIDATE", "13"),
-    ("GST_WEBRTC_STATS_REMOTE_INBOUND_RTP", "4"),
-    ("GST_WEBRTC_STATS_REMOTE_OUTBOUND_RTP", "5"),
-    ("GST_WEBRTC_STATS_STREAM", "9"),
-    ("GST_WEBRTC_STATS_TRANSPORT", "10"),
+    ("(gint) GST_WEBRTC_DTLS_SETUP_ACTIVE", "2"),
+    ("(gint) GST_WEBRTC_DTLS_SETUP_ACTPASS", "1"),
+    ("(gint) GST_WEBRTC_DTLS_SETUP_NONE", "0"),
+    ("(gint) GST_WEBRTC_DTLS_SETUP_PASSIVE", "3"),
+    ("(gint) GST_WEBRTC_DTLS_TRANSPORT_STATE_CLOSED", "1"),
+    ("(gint) GST_WEBRTC_DTLS_TRANSPORT_STATE_CONNECTED", "4"),
+    ("(gint) GST_WEBRTC_DTLS_TRANSPORT_STATE_CONNECTING", "3"),
+    ("(gint) GST_WEBRTC_DTLS_TRANSPORT_STATE_FAILED", "2"),
+    ("(gint) GST_WEBRTC_DTLS_TRANSPORT_STATE_NEW", "0"),
+    ("(gint) GST_WEBRTC_FEC_TYPE_NONE", "0"),
+    ("(gint) GST_WEBRTC_FEC_TYPE_ULP_RED", "1"),
+    ("(gint) GST_WEBRTC_ICE_COMPONENT_RTCP", "1"),
+    ("(gint) GST_WEBRTC_ICE_COMPONENT_RTP", "0"),
+    ("(gint) GST_WEBRTC_ICE_CONNECTION_STATE_CHECKING", "1"),
+    ("(gint) GST_WEBRTC_ICE_CONNECTION_STATE_CLOSED", "6"),
+    ("(gint) GST_WEBRTC_ICE_CONNECTION_STATE_COMPLETED", "3"),
+    ("(gint) GST_WEBRTC_ICE_CONNECTION_STATE_CONNECTED", "2"),
+    ("(gint) GST_WEBRTC_ICE_CONNECTION_STATE_DISCONNECTED", "5"),
+    ("(gint) GST_WEBRTC_ICE_CONNECTION_STATE_FAILED", "4"),
+    ("(gint) GST_WEBRTC_ICE_CONNECTION_STATE_NEW", "0"),
+    ("(gint) GST_WEBRTC_ICE_GATHERING_STATE_COMPLETE", "2"),
+    ("(gint) GST_WEBRTC_ICE_GATHERING_STATE_GATHERING", "1"),
+    ("(gint) GST_WEBRTC_ICE_GATHERING_STATE_NEW", "0"),
+    ("(gint) GST_WEBRTC_ICE_ROLE_CONTROLLED", "0"),
+    ("(gint) GST_WEBRTC_ICE_ROLE_CONTROLLING", "1"),
+    ("(gint) GST_WEBRTC_PEER_CONNECTION_STATE_CLOSED", "5"),
+    ("(gint) GST_WEBRTC_PEER_CONNECTION_STATE_CONNECTED", "2"),
+    ("(gint) GST_WEBRTC_PEER_CONNECTION_STATE_CONNECTING", "1"),
+    ("(gint) GST_WEBRTC_PEER_CONNECTION_STATE_DISCONNECTED", "3"),
+    ("(gint) GST_WEBRTC_PEER_CONNECTION_STATE_FAILED", "4"),
+    ("(gint) GST_WEBRTC_PEER_CONNECTION_STATE_NEW", "0"),
+    ("(gint) GST_WEBRTC_RTP_TRANSCEIVER_DIRECTION_INACTIVE", "1"),
+    ("(gint) GST_WEBRTC_RTP_TRANSCEIVER_DIRECTION_NONE", "0"),
+    ("(gint) GST_WEBRTC_RTP_TRANSCEIVER_DIRECTION_RECVONLY", "3"),
+    ("(gint) GST_WEBRTC_RTP_TRANSCEIVER_DIRECTION_SENDONLY", "2"),
+    ("(gint) GST_WEBRTC_RTP_TRANSCEIVER_DIRECTION_SENDRECV", "4"),
+    ("(gint) GST_WEBRTC_SDP_TYPE_ANSWER", "3"),
+    ("(gint) GST_WEBRTC_SDP_TYPE_OFFER", "1"),
+    ("(gint) GST_WEBRTC_SDP_TYPE_PRANSWER", "2"),
+    ("(gint) GST_WEBRTC_SDP_TYPE_ROLLBACK", "4"),
+    ("(gint) GST_WEBRTC_SIGNALING_STATE_CLOSED", "1"),
+    ("(gint) GST_WEBRTC_SIGNALING_STATE_HAVE_LOCAL_OFFER", "2"),
+    ("(gint) GST_WEBRTC_SIGNALING_STATE_HAVE_LOCAL_PRANSWER", "4"),
+    ("(gint) GST_WEBRTC_SIGNALING_STATE_HAVE_REMOTE_OFFER", "3"),
+    ("(gint) GST_WEBRTC_SIGNALING_STATE_HAVE_REMOTE_PRANSWER", "5"),
+    ("(gint) GST_WEBRTC_SIGNALING_STATE_STABLE", "0"),
+    ("(gint) GST_WEBRTC_STATS_CANDIDATE_PAIR", "11"),
+    ("(gint) GST_WEBRTC_STATS_CERTIFICATE", "14"),
+    ("(gint) GST_WEBRTC_STATS_CODEC", "1"),
+    ("(gint) GST_WEBRTC_STATS_CSRC", "6"),
+    ("(gint) GST_WEBRTC_STATS_DATA_CHANNEL", "8"),
+    ("(gint) GST_WEBRTC_STATS_INBOUND_RTP", "2"),
+    ("(gint) GST_WEBRTC_STATS_LOCAL_CANDIDATE", "12"),
+    ("(gint) GST_WEBRTC_STATS_OUTBOUND_RTP", "3"),
+    ("(gint) GST_WEBRTC_STATS_PEER_CONNECTION", "7"),
+    ("(gint) GST_WEBRTC_STATS_REMOTE_CANDIDATE", "13"),
+    ("(gint) GST_WEBRTC_STATS_REMOTE_INBOUND_RTP", "4"),
+    ("(gint) GST_WEBRTC_STATS_REMOTE_OUTBOUND_RTP", "5"),
+    ("(gint) GST_WEBRTC_STATS_STREAM", "9"),
+    ("(gint) GST_WEBRTC_STATS_TRANSPORT", "10"),
 ];
 
 
diff --git a/gstreamer-webrtc-sys/tests/constant.c b/gstreamer-webrtc-sys/tests/constant.c
index a167e0146..f54bce75c 100644
--- a/gstreamer-webrtc-sys/tests/constant.c
+++ b/gstreamer-webrtc-sys/tests/constant.c
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
@@ -7,21 +7,21 @@
 
 int main() {
     printf(_Generic((ABI_CONSTANT_NAME),
-                    char *: "%s",
-                    const char *: "%s",
-                    char: "%c",
-                    signed char: "%hhd",
-                    unsigned char: "%hhu",
-                    short int: "%hd",
-                    unsigned short int: "%hu",
-                    int: "%d",
-                    unsigned int: "%u",
-                    long: "%ld",
-                    unsigned long: "%lu",
-                    long long: "%lld",
-                    unsigned long long: "%llu",
-                    double: "%f",
-                    long double: "%ld"),
+                    char *: "###gir test###%s###gir test###\n",
+                    const char *: "###gir test###%s###gir test###\n",
+                    char: "###gir test###%c###gir test###\n",
+                    signed char: "###gir test###%hhd###gir test###\n",
+                    unsigned char: "###gir test###%hhu###gir test###\n",
+                    short int: "###gir test###%hd###gir test###\n",
+                    unsigned short int: "###gir test###%hu###gir test###\n",
+                    int: "###gir test###%d###gir test###\n",
+                    unsigned int: "###gir test###%u###gir test###\n",
+                    long: "###gir test###%ld###gir test###\n",
+                    unsigned long: "###gir test###%lu###gir test###\n",
+                    long long: "###gir test###%lld###gir test###\n",
+                    unsigned long long: "###gir test###%llu###gir test###\n",
+                    double: "###gir test###%f###gir test###\n",
+                    long double: "###gir test###%ld###gir test###\n"),
            ABI_CONSTANT_NAME);
     return 0;
 }
diff --git a/gstreamer-webrtc-sys/tests/layout.c b/gstreamer-webrtc-sys/tests/layout.c
index 829276260..aef10fc35 100644
--- a/gstreamer-webrtc-sys/tests/layout.c
+++ b/gstreamer-webrtc-sys/tests/layout.c
@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ b5ea065)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ dd33bdf)
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT