diff --git a/gstreamer-allocators/src/auto/versions.txt b/gstreamer-allocators/src/auto/versions.txt index e20a6c61d..ba08203f4 100644 --- a/gstreamer-allocators/src/auto/versions.txt +++ b/gstreamer-allocators/src/auto/versions.txt @@ -1,3 +1,3 @@ Generated by gir (https://github.com/gtk-rs/gir @ 0a15f4e10c41) from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ db97a3ad67f5) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 05cc12709e2f) diff --git a/gstreamer-allocators/sys/src/auto/versions.txt b/gstreamer-allocators/sys/src/auto/versions.txt index e20a6c61d..ba08203f4 100644 --- a/gstreamer-allocators/sys/src/auto/versions.txt +++ b/gstreamer-allocators/sys/src/auto/versions.txt @@ -1,3 +1,3 @@ Generated by gir (https://github.com/gtk-rs/gir @ 0a15f4e10c41) from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ db97a3ad67f5) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 05cc12709e2f) diff --git a/gstreamer-analytics/src/auto/versions.txt b/gstreamer-analytics/src/auto/versions.txt index e20a6c61d..ba08203f4 100644 --- a/gstreamer-analytics/src/auto/versions.txt +++ b/gstreamer-analytics/src/auto/versions.txt @@ -1,3 +1,3 @@ Generated by gir (https://github.com/gtk-rs/gir @ 0a15f4e10c41) from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ db97a3ad67f5) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 05cc12709e2f) diff --git a/gstreamer-analytics/sys/src/auto/versions.txt b/gstreamer-analytics/sys/src/auto/versions.txt index e20a6c61d..ba08203f4 100644 --- a/gstreamer-analytics/sys/src/auto/versions.txt +++ b/gstreamer-analytics/sys/src/auto/versions.txt @@ -1,3 +1,3 @@ Generated by gir (https://github.com/gtk-rs/gir @ 0a15f4e10c41) from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ db97a3ad67f5) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 05cc12709e2f) diff --git a/gstreamer-analytics/sys/src/lib.rs b/gstreamer-analytics/sys/src/lib.rs index fb52c031a..edf1ac543 100644 --- a/gstreamer-analytics/sys/src/lib.rs +++ b/gstreamer-analytics/sys/src/lib.rs @@ -31,6 +31,11 @@ use glib::{gboolean, gconstpointer, gpointer, GType}; // Aliases pub type GstAnalyticsMtdType = uintptr_t; +// Enums +pub type GstSegmentationType = c_int; +pub const GST_SEGMENTATION_TYPE_SEMANTIC: GstSegmentationType = 0; +pub const GST_SEGMENTATION_TYPE_INSTANCE: GstSegmentationType = 1; + // Constants pub const GST_INF_RELATION_SPAN: c_int = -1; pub const GST_ANALYTICS_MTD_TYPE_ANY: c_int = 0; @@ -90,7 +95,8 @@ pub struct GstAnalyticsMtdImpl { gpointer, ) -> gboolean, >, - pub _reserved: [gpointer; 20], + pub mtd_meta_clear: Option, + pub _reserved: [gpointer; 19], } impl ::std::fmt::Debug for GstAnalyticsMtdImpl { @@ -98,6 +104,7 @@ impl ::std::fmt::Debug for GstAnalyticsMtdImpl { f.debug_struct(&format!("GstAnalyticsMtdImpl @ {self:p}")) .field("name", &self.name) .field("mtd_meta_transform", &self.mtd_meta_transform) + .field("mtd_meta_clear", &self.mtd_meta_clear) .finish() } } @@ -143,6 +150,22 @@ impl ::std::fmt::Debug for GstAnalyticsRelationMetaInitParams { } } +#[derive(Copy, Clone)] +#[repr(C)] +pub struct GstAnalyticsSegmentationMtd { + pub id: c_uint, + pub meta: *mut GstAnalyticsRelationMeta, +} + +impl ::std::fmt::Debug for GstAnalyticsSegmentationMtd { + fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { + f.debug_struct(&format!("GstAnalyticsSegmentationMtd @ {self:p}")) + .field("id", &self.id) + .field("meta", &self.meta) + .finish() + } +} + #[derive(Copy, Clone)] #[repr(C)] pub struct GstAnalyticsTrackingMtd { @@ -165,16 +188,16 @@ extern "C" { // GstAnalyticsClsMtd //========================================================================= pub fn gst_analytics_cls_mtd_get_index_by_quark( - handle: *mut GstAnalyticsClsMtd, + handle: *const GstAnalyticsClsMtd, quark: glib::GQuark, ) -> c_int; - pub fn gst_analytics_cls_mtd_get_length(handle: *mut GstAnalyticsClsMtd) -> size_t; + pub fn gst_analytics_cls_mtd_get_length(handle: *const GstAnalyticsClsMtd) -> size_t; pub fn gst_analytics_cls_mtd_get_level( - handle: *mut GstAnalyticsClsMtd, + handle: *const GstAnalyticsClsMtd, index: size_t, ) -> c_float; pub fn gst_analytics_cls_mtd_get_quark( - handle: *mut GstAnalyticsClsMtd, + handle: *const GstAnalyticsClsMtd, index: size_t, ) -> glib::GQuark; pub fn gst_analytics_cls_mtd_get_mtd_type() -> GstAnalyticsMtdType; @@ -182,27 +205,27 @@ extern "C" { //========================================================================= // GstAnalyticsMtd //========================================================================= - pub fn gst_analytics_mtd_get_id(instance: *mut GstAnalyticsMtd) -> c_uint; - pub fn gst_analytics_mtd_get_mtd_type(instance: *mut GstAnalyticsMtd) -> GstAnalyticsMtdType; - pub fn gst_analytics_mtd_get_size(instance: *mut GstAnalyticsMtd) -> size_t; + pub fn gst_analytics_mtd_get_id(instance: *const GstAnalyticsMtd) -> c_uint; + pub fn gst_analytics_mtd_get_mtd_type(instance: *const GstAnalyticsMtd) -> GstAnalyticsMtdType; + pub fn gst_analytics_mtd_get_size(instance: *const GstAnalyticsMtd) -> size_t; pub fn gst_analytics_mtd_type_get_name(type_: GstAnalyticsMtdType) -> *const c_char; //========================================================================= // GstAnalyticsODMtd //========================================================================= pub fn gst_analytics_od_mtd_get_confidence_lvl( - instance: *mut GstAnalyticsODMtd, + instance: *const GstAnalyticsODMtd, loc_conf_lvl: *mut c_float, ) -> gboolean; pub fn gst_analytics_od_mtd_get_location( - instance: *mut GstAnalyticsODMtd, + instance: *const GstAnalyticsODMtd, x: *mut c_int, y: *mut c_int, w: *mut c_int, h: *mut c_int, loc_conf_lvl: *mut c_float, ) -> gboolean; - pub fn gst_analytics_od_mtd_get_obj_type(handle: *mut GstAnalyticsODMtd) -> glib::GQuark; + pub fn gst_analytics_od_mtd_get_obj_type(handle: *const GstAnalyticsODMtd) -> glib::GQuark; pub fn gst_analytics_od_mtd_get_mtd_type() -> GstAnalyticsMtdType; //========================================================================= @@ -237,6 +260,20 @@ extern "C" { class_quark: glib::GQuark, cls_mtd: *mut GstAnalyticsClsMtd, ) -> gboolean; + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_analytics_relation_meta_add_segmentation_mtd( + instance: *mut GstAnalyticsRelationMeta, + buffer: *mut gst::GstBuffer, + segmentation_type: GstSegmentationType, + region_count: size_t, + region_ids: *mut c_uint, + masks_loc_x: c_int, + masks_loc_y: c_int, + masks_loc_w: c_uint, + masks_loc_h: c_uint, + segmentation_mtd: *mut GstAnalyticsSegmentationMtd, + ) -> gboolean; pub fn gst_analytics_relation_meta_add_tracking_mtd( instance: *mut GstAnalyticsRelationMeta, tracking_id: u64, @@ -244,7 +281,7 @@ extern "C" { trk_mtd: *mut GstAnalyticsTrackingMtd, ) -> gboolean; pub fn gst_analytics_relation_meta_exist( - rmeta: *mut GstAnalyticsRelationMeta, + rmeta: *const GstAnalyticsRelationMeta, an_meta_first_id: c_uint, an_meta_second_id: c_uint, max_relation_span: c_int, @@ -271,7 +308,7 @@ extern "C" { rlt: *mut GstAnalyticsMtd, ) -> gboolean; pub fn gst_analytics_relation_meta_get_mtd_data( - meta: *mut GstAnalyticsRelationMeta, + meta: *const GstAnalyticsRelationMeta, an_meta_id: c_uint, ) -> gpointer; pub fn gst_analytics_relation_meta_get_od_mtd( @@ -280,7 +317,7 @@ extern "C" { rlt: *mut GstAnalyticsODMtd, ) -> gboolean; pub fn gst_analytics_relation_meta_get_relation( - meta: *mut GstAnalyticsRelationMeta, + meta: *const GstAnalyticsRelationMeta, an_meta_first_id: c_uint, an_meta_second_id: c_uint, ) -> GstAnalyticsRelTypes; @@ -303,11 +340,45 @@ extern "C" { ) -> gboolean; pub fn gst_analytics_relation_meta_get_info() -> *const gst::GstMetaInfo; + //========================================================================= + // GstAnalyticsSegmentationMtd + //========================================================================= + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_analytics_segmentation_mtd_get_mask( + handle: *const GstAnalyticsSegmentationMtd, + masks_loc_x: *mut c_int, + masks_loc_y: *mut c_int, + masks_loc_w: *mut c_uint, + masks_loc_h: *mut c_uint, + ) -> *mut gst::GstBuffer; + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_analytics_segmentation_mtd_get_region_count( + handle: *const GstAnalyticsSegmentationMtd, + ) -> size_t; + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_analytics_segmentation_mtd_get_region_id( + handle: *const GstAnalyticsSegmentationMtd, + index: size_t, + ) -> c_uint; + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_analytics_segmentation_mtd_get_region_index( + handle: *const GstAnalyticsSegmentationMtd, + index: *mut size_t, + id: c_uint, + ) -> gboolean; + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_analytics_segmentation_mtd_get_mtd_type() -> GstAnalyticsMtdType; + //========================================================================= // GstAnalyticsTrackingMtd //========================================================================= pub fn gst_analytics_tracking_mtd_get_info( - instance: *mut GstAnalyticsTrackingMtd, + instance: *const GstAnalyticsTrackingMtd, tracking_id: *mut u64, tracking_first_seen: *mut gst::GstClockTime, tracking_last_seen: *mut gst::GstClockTime, @@ -333,7 +404,7 @@ extern "C" { pub fn gst_buffer_get_analytics_relation_meta( buffer: *mut gst::GstBuffer, ) -> *mut GstAnalyticsRelationMeta; - pub fn gst_analytics_relation_get_length(instance: *mut GstAnalyticsRelationMeta) -> size_t; + pub fn gst_analytics_relation_get_length(instance: *const GstAnalyticsRelationMeta) -> size_t; pub fn gst_analytics_relation_meta_api_get_type() -> GType; } diff --git a/gstreamer-analytics/sys/tests/abi.rs b/gstreamer-analytics/sys/tests/abi.rs index 38ae92b7d..41779222b 100644 --- a/gstreamer-analytics/sys/tests/abi.rs +++ b/gstreamer-analytics/sys/tests/abi.rs @@ -251,6 +251,13 @@ const RUST_LAYOUTS: &[(&str, Layout)] = &[ alignment: align_of::(), }, ), + ( + "GstAnalyticsSegmentationMtd", + Layout { + size: size_of::(), + alignment: align_of::(), + }, + ), ( "GstAnalyticsTrackingMtd", Layout { @@ -258,6 +265,13 @@ const RUST_LAYOUTS: &[(&str, Layout)] = &[ alignment: align_of::(), }, ), + ( + "GstSegmentationType", + Layout { + size: size_of::(), + alignment: align_of::(), + }, + ), ]; const RUST_CONSTANTS: &[(&str, &str)] = &[ @@ -269,4 +283,6 @@ const RUST_CONSTANTS: &[(&str, &str)] = &[ ("(guint) GST_ANALYTICS_REL_TYPE_NONE", "0"), ("(guint) GST_ANALYTICS_REL_TYPE_RELATE_TO", "8"), ("GST_INF_RELATION_SPAN", "-1"), + ("(gint) GST_SEGMENTATION_TYPE_INSTANCE", "1"), + ("(gint) GST_SEGMENTATION_TYPE_SEMANTIC", "0"), ]; diff --git a/gstreamer-analytics/sys/tests/constant.c b/gstreamer-analytics/sys/tests/constant.c index 29c8f37a8..2d874e48f 100644 --- a/gstreamer-analytics/sys/tests/constant.c +++ b/gstreamer-analytics/sys/tests/constant.c @@ -37,5 +37,7 @@ int main() { PRINT_CONSTANT((guint) GST_ANALYTICS_REL_TYPE_NONE); PRINT_CONSTANT((guint) GST_ANALYTICS_REL_TYPE_RELATE_TO); PRINT_CONSTANT(GST_INF_RELATION_SPAN); + PRINT_CONSTANT((gint) GST_SEGMENTATION_TYPE_INSTANCE); + PRINT_CONSTANT((gint) GST_SEGMENTATION_TYPE_SEMANTIC); return 0; } diff --git a/gstreamer-analytics/sys/tests/layout.c b/gstreamer-analytics/sys/tests/layout.c index 6739517b3..0406b4212 100644 --- a/gstreamer-analytics/sys/tests/layout.c +++ b/gstreamer-analytics/sys/tests/layout.c @@ -15,6 +15,8 @@ int main() { printf("%s;%zu;%zu\n", "GstAnalyticsODMtd", sizeof(GstAnalyticsODMtd), alignof(GstAnalyticsODMtd)); printf("%s;%zu;%zu\n", "GstAnalyticsRelTypes", sizeof(GstAnalyticsRelTypes), alignof(GstAnalyticsRelTypes)); printf("%s;%zu;%zu\n", "GstAnalyticsRelationMetaInitParams", sizeof(GstAnalyticsRelationMetaInitParams), alignof(GstAnalyticsRelationMetaInitParams)); + printf("%s;%zu;%zu\n", "GstAnalyticsSegmentationMtd", sizeof(GstAnalyticsSegmentationMtd), alignof(GstAnalyticsSegmentationMtd)); printf("%s;%zu;%zu\n", "GstAnalyticsTrackingMtd", sizeof(GstAnalyticsTrackingMtd), alignof(GstAnalyticsTrackingMtd)); + printf("%s;%zu;%zu\n", "GstSegmentationType", sizeof(GstSegmentationType), alignof(GstSegmentationType)); return 0; } diff --git a/gstreamer-app/src/auto/app_sink.rs b/gstreamer-app/src/auto/app_sink.rs index 79cfec459..160cd34fd 100644 --- a/gstreamer-app/src/auto/app_sink.rs +++ b/gstreamer-app/src/auto/app_sink.rs @@ -77,6 +77,7 @@ impl AppSink { } #[doc(alias = "gst_app_sink_is_eos")] + #[doc(alias = "eos")] pub fn is_eos(&self) -> bool { unsafe { from_glib(ffi::gst_app_sink_is_eos(self.to_glib_none().0)) } } diff --git a/gstreamer-app/src/auto/versions.txt b/gstreamer-app/src/auto/versions.txt index e20a6c61d..ba08203f4 100644 --- a/gstreamer-app/src/auto/versions.txt +++ b/gstreamer-app/src/auto/versions.txt @@ -1,3 +1,3 @@ Generated by gir (https://github.com/gtk-rs/gir @ 0a15f4e10c41) from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ db97a3ad67f5) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 05cc12709e2f) diff --git a/gstreamer-app/sys/src/auto/versions.txt b/gstreamer-app/sys/src/auto/versions.txt index e20a6c61d..ba08203f4 100644 --- a/gstreamer-app/sys/src/auto/versions.txt +++ b/gstreamer-app/sys/src/auto/versions.txt @@ -1,3 +1,3 @@ Generated by gir (https://github.com/gtk-rs/gir @ 0a15f4e10c41) from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ db97a3ad67f5) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 05cc12709e2f) diff --git a/gstreamer-audio/src/auto/versions.txt b/gstreamer-audio/src/auto/versions.txt index e20a6c61d..ba08203f4 100644 --- a/gstreamer-audio/src/auto/versions.txt +++ b/gstreamer-audio/src/auto/versions.txt @@ -1,3 +1,3 @@ Generated by gir (https://github.com/gtk-rs/gir @ 0a15f4e10c41) from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ db97a3ad67f5) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 05cc12709e2f) diff --git a/gstreamer-audio/sys/src/auto/versions.txt b/gstreamer-audio/sys/src/auto/versions.txt index e20a6c61d..ba08203f4 100644 --- a/gstreamer-audio/sys/src/auto/versions.txt +++ b/gstreamer-audio/sys/src/auto/versions.txt @@ -1,3 +1,3 @@ Generated by gir (https://github.com/gtk-rs/gir @ 0a15f4e10c41) from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ db97a3ad67f5) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 05cc12709e2f) diff --git a/gstreamer-audio/sys/src/lib.rs b/gstreamer-audio/sys/src/lib.rs index 045163489..e2d468c25 100644 --- a/gstreamer-audio/sys/src/lib.rs +++ b/gstreamer-audio/sys/src/lib.rs @@ -1796,6 +1796,7 @@ extern "C" { //========================================================================= // GstAudioFormatInfo //========================================================================= + pub fn gst_audio_format_info_get_type() -> GType; #[cfg(feature = "v1_20")] #[cfg_attr(docsrs, doc(cfg(feature = "v1_20")))] pub fn gst_audio_format_info_fill_silence( @@ -2433,7 +2434,6 @@ extern "C" { ) -> gboolean; pub fn gst_audio_clipping_meta_api_get_type() -> GType; pub fn gst_audio_downmix_meta_api_get_type() -> GType; - pub fn gst_audio_format_info_get_type() -> GType; #[cfg(feature = "v1_18")] #[cfg_attr(docsrs, doc(cfg(feature = "v1_18")))] pub fn gst_audio_formats_raw(len: *mut c_uint) -> *const GstAudioFormat; diff --git a/gstreamer-base/src/auto/aggregator.rs b/gstreamer-base/src/auto/aggregator.rs index 44ce9e632..fd822253f 100644 --- a/gstreamer-base/src/auto/aggregator.rs +++ b/gstreamer-base/src/auto/aggregator.rs @@ -123,6 +123,13 @@ pub trait AggregatorExt: IsA + 'static { } } + //#[cfg(feature = "v1_26")] + //#[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + //#[doc(alias = "gst_aggregator_push_src_event")] + //fn push_src_event(&self, event: /*Ignored*/gst::Event) -> bool { + // unsafe { TODO: call ffi:gst_aggregator_push_src_event() } + //} + #[cfg(feature = "v1_22")] #[cfg_attr(docsrs, doc(cfg(feature = "v1_22")))] #[doc(alias = "gst_aggregator_set_force_live")] diff --git a/gstreamer-base/src/auto/versions.txt b/gstreamer-base/src/auto/versions.txt index e20a6c61d..ba08203f4 100644 --- a/gstreamer-base/src/auto/versions.txt +++ b/gstreamer-base/src/auto/versions.txt @@ -1,3 +1,3 @@ Generated by gir (https://github.com/gtk-rs/gir @ 0a15f4e10c41) from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ db97a3ad67f5) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 05cc12709e2f) diff --git a/gstreamer-base/sys/src/auto/versions.txt b/gstreamer-base/sys/src/auto/versions.txt index e20a6c61d..ba08203f4 100644 --- a/gstreamer-base/sys/src/auto/versions.txt +++ b/gstreamer-base/sys/src/auto/versions.txt @@ -1,3 +1,3 @@ Generated by gir (https://github.com/gtk-rs/gir @ 0a15f4e10c41) from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ db97a3ad67f5) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 05cc12709e2f) diff --git a/gstreamer-base/sys/src/lib.rs b/gstreamer-base/sys/src/lib.rs index cedd32bc0..766f98bd7 100644 --- a/gstreamer-base/sys/src/lib.rs +++ b/gstreamer-base/sys/src/lib.rs @@ -1898,6 +1898,12 @@ extern "C" { self_: *mut GstAggregator, pad: *mut GstAggregatorPad, ) -> *mut gst::GstSample; + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_aggregator_push_src_event( + aggregator: *mut GstAggregator, + event: *mut gst::GstEvent, + ) -> gboolean; #[cfg(feature = "v1_18")] #[cfg_attr(docsrs, doc(cfg(feature = "v1_18")))] pub fn gst_aggregator_selected_samples( diff --git a/gstreamer-check/src/auto/versions.txt b/gstreamer-check/src/auto/versions.txt index e20a6c61d..ba08203f4 100644 --- a/gstreamer-check/src/auto/versions.txt +++ b/gstreamer-check/src/auto/versions.txt @@ -1,3 +1,3 @@ Generated by gir (https://github.com/gtk-rs/gir @ 0a15f4e10c41) from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ db97a3ad67f5) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 05cc12709e2f) diff --git a/gstreamer-check/sys/src/auto/versions.txt b/gstreamer-check/sys/src/auto/versions.txt index e20a6c61d..ba08203f4 100644 --- a/gstreamer-check/sys/src/auto/versions.txt +++ b/gstreamer-check/sys/src/auto/versions.txt @@ -1,3 +1,3 @@ Generated by gir (https://github.com/gtk-rs/gir @ 0a15f4e10c41) from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ db97a3ad67f5) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 05cc12709e2f) diff --git a/gstreamer-controller/src/auto/versions.txt b/gstreamer-controller/src/auto/versions.txt index e20a6c61d..ba08203f4 100644 --- a/gstreamer-controller/src/auto/versions.txt +++ b/gstreamer-controller/src/auto/versions.txt @@ -1,3 +1,3 @@ Generated by gir (https://github.com/gtk-rs/gir @ 0a15f4e10c41) from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ db97a3ad67f5) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 05cc12709e2f) diff --git a/gstreamer-controller/sys/src/auto/versions.txt b/gstreamer-controller/sys/src/auto/versions.txt index e20a6c61d..ba08203f4 100644 --- a/gstreamer-controller/sys/src/auto/versions.txt +++ b/gstreamer-controller/sys/src/auto/versions.txt @@ -1,3 +1,3 @@ Generated by gir (https://github.com/gtk-rs/gir @ 0a15f4e10c41) from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ db97a3ad67f5) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 05cc12709e2f) diff --git a/gstreamer-editing-services/src/auto/track_element.rs b/gstreamer-editing-services/src/auto/track_element.rs index a860ff7dd..fcf99dfa0 100644 --- a/gstreamer-editing-services/src/auto/track_element.rs +++ b/gstreamer-editing-services/src/auto/track_element.rs @@ -85,7 +85,7 @@ pub trait TrackElementExt: IsA + 'static { //#[doc(alias = "ges_track_element_get_all_control_bindings")] //#[doc(alias = "get_all_control_bindings")] - //fn all_control_bindings(&self) -> /*Unknown conversion*//*Unimplemented*/HashTable TypeId { ns_id: 0, id: 28 }/TypeId { ns_id: 6, id: 88 } { + //fn all_control_bindings(&self) -> /*Unknown conversion*//*Unimplemented*/HashTable TypeId { ns_id: 0, id: 28 }/TypeId { ns_id: 6, id: 89 } { // unsafe { TODO: call ffi:ges_track_element_get_all_control_bindings() } //} @@ -220,6 +220,7 @@ pub trait TrackElementExt: IsA + 'static { } #[doc(alias = "ges_track_element_is_active")] + #[doc(alias = "active")] fn is_active(&self) -> bool { unsafe { from_glib(ffi::ges_track_element_is_active( diff --git a/gstreamer-editing-services/src/auto/versions.txt b/gstreamer-editing-services/src/auto/versions.txt index e20a6c61d..ba08203f4 100644 --- a/gstreamer-editing-services/src/auto/versions.txt +++ b/gstreamer-editing-services/src/auto/versions.txt @@ -1,3 +1,3 @@ Generated by gir (https://github.com/gtk-rs/gir @ 0a15f4e10c41) from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ db97a3ad67f5) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 05cc12709e2f) diff --git a/gstreamer-editing-services/sys/src/auto/versions.txt b/gstreamer-editing-services/sys/src/auto/versions.txt index e20a6c61d..ba08203f4 100644 --- a/gstreamer-editing-services/sys/src/auto/versions.txt +++ b/gstreamer-editing-services/sys/src/auto/versions.txt @@ -1,3 +1,3 @@ Generated by gir (https://github.com/gtk-rs/gir @ 0a15f4e10c41) from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ db97a3ad67f5) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 05cc12709e2f) diff --git a/gstreamer-gl/egl/src/auto/versions.txt b/gstreamer-gl/egl/src/auto/versions.txt index e20a6c61d..ba08203f4 100644 --- a/gstreamer-gl/egl/src/auto/versions.txt +++ b/gstreamer-gl/egl/src/auto/versions.txt @@ -1,3 +1,3 @@ Generated by gir (https://github.com/gtk-rs/gir @ 0a15f4e10c41) from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ db97a3ad67f5) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 05cc12709e2f) diff --git a/gstreamer-gl/egl/sys/src/auto/versions.txt b/gstreamer-gl/egl/sys/src/auto/versions.txt index e20a6c61d..ba08203f4 100644 --- a/gstreamer-gl/egl/sys/src/auto/versions.txt +++ b/gstreamer-gl/egl/sys/src/auto/versions.txt @@ -1,3 +1,3 @@ Generated by gir (https://github.com/gtk-rs/gir @ 0a15f4e10c41) from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ db97a3ad67f5) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 05cc12709e2f) diff --git a/gstreamer-gl/src/auto/gl_shader.rs b/gstreamer-gl/src/auto/gl_shader.rs index 398169218..2f52f6b73 100644 --- a/gstreamer-gl/src/auto/gl_shader.rs +++ b/gstreamer-gl/src/auto/gl_shader.rs @@ -144,6 +144,7 @@ impl GLShader { } #[doc(alias = "gst_gl_shader_is_linked")] + #[doc(alias = "linked")] pub fn is_linked(&self) -> bool { unsafe { from_glib(ffi::gst_gl_shader_is_linked(self.to_glib_none().0)) } } diff --git a/gstreamer-gl/src/auto/versions.txt b/gstreamer-gl/src/auto/versions.txt index e20a6c61d..ba08203f4 100644 --- a/gstreamer-gl/src/auto/versions.txt +++ b/gstreamer-gl/src/auto/versions.txt @@ -1,3 +1,3 @@ Generated by gir (https://github.com/gtk-rs/gir @ 0a15f4e10c41) from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ db97a3ad67f5) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 05cc12709e2f) diff --git a/gstreamer-gl/sys/src/auto/versions.txt b/gstreamer-gl/sys/src/auto/versions.txt index e20a6c61d..ba08203f4 100644 --- a/gstreamer-gl/sys/src/auto/versions.txt +++ b/gstreamer-gl/sys/src/auto/versions.txt @@ -1,3 +1,3 @@ Generated by gir (https://github.com/gtk-rs/gir @ 0a15f4e10c41) from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ db97a3ad67f5) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 05cc12709e2f) diff --git a/gstreamer-gl/wayland/src/auto/versions.txt b/gstreamer-gl/wayland/src/auto/versions.txt index e20a6c61d..ba08203f4 100644 --- a/gstreamer-gl/wayland/src/auto/versions.txt +++ b/gstreamer-gl/wayland/src/auto/versions.txt @@ -1,3 +1,3 @@ Generated by gir (https://github.com/gtk-rs/gir @ 0a15f4e10c41) from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ db97a3ad67f5) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 05cc12709e2f) diff --git a/gstreamer-gl/wayland/sys/src/auto/versions.txt b/gstreamer-gl/wayland/sys/src/auto/versions.txt index e20a6c61d..ba08203f4 100644 --- a/gstreamer-gl/wayland/sys/src/auto/versions.txt +++ b/gstreamer-gl/wayland/sys/src/auto/versions.txt @@ -1,3 +1,3 @@ Generated by gir (https://github.com/gtk-rs/gir @ 0a15f4e10c41) from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ db97a3ad67f5) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 05cc12709e2f) diff --git a/gstreamer-gl/x11/src/auto/versions.txt b/gstreamer-gl/x11/src/auto/versions.txt index e20a6c61d..ba08203f4 100644 --- a/gstreamer-gl/x11/src/auto/versions.txt +++ b/gstreamer-gl/x11/src/auto/versions.txt @@ -1,3 +1,3 @@ Generated by gir (https://github.com/gtk-rs/gir @ 0a15f4e10c41) from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ db97a3ad67f5) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 05cc12709e2f) diff --git a/gstreamer-gl/x11/sys/src/auto/versions.txt b/gstreamer-gl/x11/sys/src/auto/versions.txt index e20a6c61d..ba08203f4 100644 --- a/gstreamer-gl/x11/sys/src/auto/versions.txt +++ b/gstreamer-gl/x11/sys/src/auto/versions.txt @@ -1,3 +1,3 @@ Generated by gir (https://github.com/gtk-rs/gir @ 0a15f4e10c41) from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ db97a3ad67f5) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 05cc12709e2f) diff --git a/gstreamer-mpegts/src/auto/versions.txt b/gstreamer-mpegts/src/auto/versions.txt index e20a6c61d..ba08203f4 100644 --- a/gstreamer-mpegts/src/auto/versions.txt +++ b/gstreamer-mpegts/src/auto/versions.txt @@ -1,3 +1,3 @@ Generated by gir (https://github.com/gtk-rs/gir @ 0a15f4e10c41) from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ db97a3ad67f5) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 05cc12709e2f) diff --git a/gstreamer-mpegts/sys/src/auto/versions.txt b/gstreamer-mpegts/sys/src/auto/versions.txt index e20a6c61d..ba08203f4 100644 --- a/gstreamer-mpegts/sys/src/auto/versions.txt +++ b/gstreamer-mpegts/sys/src/auto/versions.txt @@ -1,3 +1,3 @@ Generated by gir (https://github.com/gtk-rs/gir @ 0a15f4e10c41) from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ db97a3ad67f5) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 05cc12709e2f) diff --git a/gstreamer-mpegts/sys/src/lib.rs b/gstreamer-mpegts/sys/src/lib.rs index ae078d4fb..3d6dbeb74 100644 --- a/gstreamer-mpegts/sys/src/lib.rs +++ b/gstreamer-mpegts/sys/src/lib.rs @@ -328,6 +328,12 @@ pub const GST_MTS_DESC_MVC_OPERATION_POINT: GstMpegtsDescriptorType = 51; pub const GST_MTS_DESC_MPEG2_STEREOSCOPIC_VIDEO_FORMAT: GstMpegtsDescriptorType = 52; pub const GST_MTS_DESC_STEREOSCOPIC_PROGRAM_INFO: GstMpegtsDescriptorType = 53; pub const GST_MTS_DESC_STEREOSCOPIC_VIDEO_INFO: GstMpegtsDescriptorType = 54; +#[cfg(feature = "v1_26")] +#[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] +pub const GST_MTS_DESC_EXTENSION: GstMpegtsDescriptorType = 63; + +pub type GstMpegtsExtendedDescriptorType = c_int; +pub const GST_MTS_DESC_EXT_JXS_VIDEO: GstMpegtsExtendedDescriptorType = 20; pub type GstMpegtsHdmvStreamType = c_int; pub const GST_MPEGTS_STREAM_TYPE_HDMV_AUDIO_LPCM: GstMpegtsHdmvStreamType = 128; @@ -649,6 +655,9 @@ pub const GST_MPEGTS_STREAM_TYPE_VIDEO_JP2K: GstMpegtsStreamType = 33; pub const GST_MPEGTS_STREAM_TYPE_VIDEO_MPEG2_STEREO_ADDITIONAL_VIEW: GstMpegtsStreamType = 34; pub const GST_MPEGTS_STREAM_TYPE_VIDEO_H264_STEREO_ADDITIONAL_VIEW: GstMpegtsStreamType = 35; pub const GST_MPEGTS_STREAM_TYPE_VIDEO_HEVC: GstMpegtsStreamType = 36; +#[cfg(feature = "v1_26")] +#[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] +pub const GST_MPEGTS_STREAM_TYPE_VIDEO_JPEG_XS: GstMpegtsStreamType = 50; pub const GST_MPEGTS_STREAM_TYPE_IPMP_STREAM: GstMpegtsStreamType = 127; #[cfg(feature = "v1_20")] #[cfg_attr(docsrs, doc(cfg(feature = "v1_20")))] @@ -1498,6 +1507,74 @@ impl ::std::fmt::Debug for GstMpegtsISO639LanguageDescriptor { } } +#[derive(Copy, Clone)] +#[repr(C)] +pub struct GstMpegtsJpegXsDescriptor { + pub descriptor_version: u8, + pub horizontal_size: u16, + pub vertical_size: u16, + pub brat: u32, + pub frat: u32, + pub schar: u16, + pub Ppih: u16, + pub Plev: u16, + pub max_buffer_size: u32, + pub buffer_model_type: u8, + pub colour_primaries: u8, + pub transfer_characteristics: u8, + pub matrix_coefficients: u8, + pub video_full_range_flag: gboolean, + pub still_mode: gboolean, + pub mdm_flag: gboolean, + pub X_c0: u16, + pub Y_c0: u16, + pub X_c1: u16, + pub Y_c1: u16, + pub X_c2: u16, + pub Y_c2: u16, + pub X_wp: u16, + pub Y_wp: u16, + pub L_max: u32, + pub L_min: u32, + pub MaxCLL: u16, + pub MaxFALL: u16, +} + +impl ::std::fmt::Debug for GstMpegtsJpegXsDescriptor { + fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { + f.debug_struct(&format!("GstMpegtsJpegXsDescriptor @ {self:p}")) + .field("descriptor_version", &self.descriptor_version) + .field("horizontal_size", &self.horizontal_size) + .field("vertical_size", &self.vertical_size) + .field("brat", &self.brat) + .field("frat", &self.frat) + .field("schar", &self.schar) + .field("Ppih", &self.Ppih) + .field("Plev", &self.Plev) + .field("max_buffer_size", &self.max_buffer_size) + .field("buffer_model_type", &self.buffer_model_type) + .field("colour_primaries", &self.colour_primaries) + .field("transfer_characteristics", &self.transfer_characteristics) + .field("matrix_coefficients", &self.matrix_coefficients) + .field("video_full_range_flag", &self.video_full_range_flag) + .field("still_mode", &self.still_mode) + .field("mdm_flag", &self.mdm_flag) + .field("X_c0", &self.X_c0) + .field("Y_c0", &self.Y_c0) + .field("X_c1", &self.X_c1) + .field("Y_c1", &self.Y_c1) + .field("X_c2", &self.X_c2) + .field("Y_c2", &self.Y_c2) + .field("X_wp", &self.X_wp) + .field("Y_wp", &self.Y_wp) + .field("L_max", &self.L_max) + .field("L_min", &self.L_min) + .field("MaxCLL", &self.MaxCLL) + .field("MaxFALL", &self.MaxFALL) + .finish() + } +} + #[derive(Copy, Clone)] #[repr(C)] pub struct GstMpegtsLogicalChannel { @@ -2261,6 +2338,9 @@ extern "C" { // GstMpegtsDescriptor //========================================================================= pub fn gst_mpegts_descriptor_get_type() -> GType; + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_mpegts_descriptor_copy(desc: *mut GstMpegtsDescriptor) -> *mut GstMpegtsDescriptor; pub fn gst_mpegts_descriptor_free(desc: *mut GstMpegtsDescriptor); #[cfg(feature = "v1_20")] #[cfg_attr(docsrs, doc(cfg(feature = "v1_20")))] @@ -2416,6 +2496,12 @@ extern "C" { pub fn gst_mpegts_descriptor_parse_iso_639_language_nb( descriptor: *const GstMpegtsDescriptor, ) -> c_uint; + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_mpegts_descriptor_parse_jpeg_xs( + descriptor: *const GstMpegtsDescriptor, + res: *mut GstMpegtsJpegXsDescriptor, + ) -> gboolean; pub fn gst_mpegts_descriptor_parse_logical_channel( descriptor: *const GstMpegtsDescriptor, res: *mut GstMpegtsLogicalChannelDescriptor, @@ -2482,6 +2568,11 @@ extern "C" { ) -> *mut GstMpegtsDescriptor; #[cfg(feature = "v1_26")] #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_mpegts_descriptor_from_jpeg_xs( + jpegxs: *const GstMpegtsJpegXsDescriptor, + ) -> *mut GstMpegtsDescriptor; + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] pub fn gst_mpegts_descriptor_from_metadata( metadata_descriptor: *const GstMpegtsMetadataDescriptor, ) -> *mut GstMpegtsDescriptor; @@ -2555,6 +2646,13 @@ extern "C" { desc: *mut GstMpegtsISO639LanguageDescriptor, ); + //========================================================================= + // GstMpegtsJpegXsDescriptor + //========================================================================= + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_mpegts_jpeg_xs_descriptor_get_type() -> GType; + //========================================================================= // GstMpegtsLogicalChannel //========================================================================= diff --git a/gstreamer-mpegts/sys/tests/abi.rs b/gstreamer-mpegts/sys/tests/abi.rs index 10d9fd822..d657caf5e 100644 --- a/gstreamer-mpegts/sys/tests/abi.rs +++ b/gstreamer-mpegts/sys/tests/abi.rs @@ -538,6 +538,13 @@ const RUST_LAYOUTS: &[(&str, Layout)] = &[ alignment: align_of::(), }, ), + ( + "GstMpegtsExtendedDescriptorType", + Layout { + size: size_of::(), + alignment: align_of::(), + }, + ), ( "GstMpegtsExtendedEventDescriptor", Layout { @@ -580,6 +587,13 @@ const RUST_LAYOUTS: &[(&str, Layout)] = &[ alignment: align_of::(), }, ), + ( + "GstMpegtsJpegXsDescriptor", + Layout { + size: size_of::(), + alignment: align_of::(), + }, + ), ( "GstMpegtsLogicalChannel", Layout { @@ -1211,6 +1225,7 @@ const RUST_CONSTANTS: &[(&str, &str)] = &[ ), ("(gint) GST_MPEGTS_STREAM_TYPE_VIDEO_HEVC", "36"), ("(gint) GST_MPEGTS_STREAM_TYPE_VIDEO_JP2K", "33"), + ("(gint) GST_MPEGTS_STREAM_TYPE_VIDEO_JPEG_XS", "50"), ("(gint) GST_MPEGTS_STREAM_TYPE_VIDEO_MPEG1", "1"), ("(gint) GST_MPEGTS_STREAM_TYPE_VIDEO_MPEG2", "2"), ( @@ -1336,6 +1351,7 @@ const RUST_CONSTANTS: &[(&str, &str)] = &[ ("(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_EXTENSION", "63"), ("(gint) GST_MTS_DESC_EXTERNAL_ES_ID", "32"), ("(gint) GST_MTS_DESC_EXT_DVB_AC4", "21"), ("(gint) GST_MTS_DESC_EXT_DVB_AUDIO_PRESELECTION", "25"), @@ -1358,6 +1374,7 @@ const RUST_CONSTANTS: &[(&str, &str)] = &[ ("(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_EXT_JXS_VIDEO", "20"), ("(gint) GST_MTS_DESC_FLEX_MUX_TIMING", "44"), ("(gint) GST_MTS_DESC_FMC", "31"), ("(gint) GST_MTS_DESC_FMX_BUFFER_SIZE", "34"), diff --git a/gstreamer-mpegts/sys/tests/constant.c b/gstreamer-mpegts/sys/tests/constant.c index 6bdafe1e0..c88fd6c90 100644 --- a/gstreamer-mpegts/sys/tests/constant.c +++ b/gstreamer-mpegts/sys/tests/constant.c @@ -264,6 +264,7 @@ int main() { PRINT_CONSTANT((gint) GST_MPEGTS_STREAM_TYPE_VIDEO_H264_SVC_SUB_BITSTREAM); PRINT_CONSTANT((gint) GST_MPEGTS_STREAM_TYPE_VIDEO_HEVC); PRINT_CONSTANT((gint) GST_MPEGTS_STREAM_TYPE_VIDEO_JP2K); + PRINT_CONSTANT((gint) GST_MPEGTS_STREAM_TYPE_VIDEO_JPEG_XS); PRINT_CONSTANT((gint) GST_MPEGTS_STREAM_TYPE_VIDEO_MPEG1); PRINT_CONSTANT((gint) GST_MPEGTS_STREAM_TYPE_VIDEO_MPEG2); PRINT_CONSTANT((gint) GST_MPEGTS_STREAM_TYPE_VIDEO_MPEG2_STEREO_ADDITIONAL_VIEW); @@ -380,6 +381,7 @@ int main() { PRINT_CONSTANT((gint) GST_MTS_DESC_DVB_VBI_DATA); PRINT_CONSTANT((gint) GST_MTS_DESC_DVB_VBI_TELETEXT); PRINT_CONSTANT((gint) GST_MTS_DESC_DVB_XAIT_LOCATION); + PRINT_CONSTANT((gint) GST_MTS_DESC_EXTENSION); PRINT_CONSTANT((gint) GST_MTS_DESC_EXTERNAL_ES_ID); PRINT_CONSTANT((gint) GST_MTS_DESC_EXT_DVB_AC4); PRINT_CONSTANT((gint) GST_MTS_DESC_EXT_DVB_AUDIO_PRESELECTION); @@ -402,6 +404,7 @@ int main() { PRINT_CONSTANT((gint) GST_MTS_DESC_EXT_DVB_URI_LINKAGE); PRINT_CONSTANT((gint) GST_MTS_DESC_EXT_DVB_VIDEO_DEPTH_RANGE); PRINT_CONSTANT((gint) GST_MTS_DESC_EXT_DVB_XAIT_PID); + PRINT_CONSTANT((gint) GST_MTS_DESC_EXT_JXS_VIDEO); PRINT_CONSTANT((gint) GST_MTS_DESC_FLEX_MUX_TIMING); PRINT_CONSTANT((gint) GST_MTS_DESC_FMC); PRINT_CONSTANT((gint) GST_MTS_DESC_FMX_BUFFER_SIZE); diff --git a/gstreamer-mpegts/sys/tests/layout.c b/gstreamer-mpegts/sys/tests/layout.c index ce92f3c67..69b87436c 100644 --- a/gstreamer-mpegts/sys/tests/layout.c +++ b/gstreamer-mpegts/sys/tests/layout.c @@ -56,12 +56,14 @@ int main() { printf("%s;%zu;%zu\n", "GstMpegtsDvbMultilingualServiceNameItem", sizeof(GstMpegtsDvbMultilingualServiceNameItem), alignof(GstMpegtsDvbMultilingualServiceNameItem)); printf("%s;%zu;%zu\n", "GstMpegtsEIT", sizeof(GstMpegtsEIT), alignof(GstMpegtsEIT)); printf("%s;%zu;%zu\n", "GstMpegtsEITEvent", sizeof(GstMpegtsEITEvent), alignof(GstMpegtsEITEvent)); + printf("%s;%zu;%zu\n", "GstMpegtsExtendedDescriptorType", sizeof(GstMpegtsExtendedDescriptorType), alignof(GstMpegtsExtendedDescriptorType)); printf("%s;%zu;%zu\n", "GstMpegtsExtendedEventDescriptor", sizeof(GstMpegtsExtendedEventDescriptor), alignof(GstMpegtsExtendedEventDescriptor)); printf("%s;%zu;%zu\n", "GstMpegtsExtendedEventItem", sizeof(GstMpegtsExtendedEventItem), alignof(GstMpegtsExtendedEventItem)); printf("%s;%zu;%zu\n", "GstMpegtsHdmvStreamType", sizeof(GstMpegtsHdmvStreamType), alignof(GstMpegtsHdmvStreamType)); printf("%s;%zu;%zu\n", "GstMpegtsISDBDescriptorType", sizeof(GstMpegtsISDBDescriptorType), alignof(GstMpegtsISDBDescriptorType)); printf("%s;%zu;%zu\n", "GstMpegtsISO639LanguageDescriptor", sizeof(GstMpegtsISO639LanguageDescriptor), alignof(GstMpegtsISO639LanguageDescriptor)); printf("%s;%zu;%zu\n", "GstMpegtsIso639AudioType", sizeof(GstMpegtsIso639AudioType), alignof(GstMpegtsIso639AudioType)); + printf("%s;%zu;%zu\n", "GstMpegtsJpegXsDescriptor", sizeof(GstMpegtsJpegXsDescriptor), alignof(GstMpegtsJpegXsDescriptor)); printf("%s;%zu;%zu\n", "GstMpegtsLogicalChannel", sizeof(GstMpegtsLogicalChannel), alignof(GstMpegtsLogicalChannel)); printf("%s;%zu;%zu\n", "GstMpegtsLogicalChannelDescriptor", sizeof(GstMpegtsLogicalChannelDescriptor), alignof(GstMpegtsLogicalChannelDescriptor)); printf("%s;%zu;%zu\n", "GstMpegtsMetadataApplicationFormat", sizeof(GstMpegtsMetadataApplicationFormat), alignof(GstMpegtsMetadataApplicationFormat)); diff --git a/gstreamer-net/src/auto/versions.txt b/gstreamer-net/src/auto/versions.txt index e20a6c61d..ba08203f4 100644 --- a/gstreamer-net/src/auto/versions.txt +++ b/gstreamer-net/src/auto/versions.txt @@ -1,3 +1,3 @@ Generated by gir (https://github.com/gtk-rs/gir @ 0a15f4e10c41) from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ db97a3ad67f5) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 05cc12709e2f) diff --git a/gstreamer-net/sys/src/auto/versions.txt b/gstreamer-net/sys/src/auto/versions.txt index e20a6c61d..ba08203f4 100644 --- a/gstreamer-net/sys/src/auto/versions.txt +++ b/gstreamer-net/sys/src/auto/versions.txt @@ -1,3 +1,3 @@ Generated by gir (https://github.com/gtk-rs/gir @ 0a15f4e10c41) from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ db97a3ad67f5) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 05cc12709e2f) diff --git a/gstreamer-pbutils/src/auto/versions.txt b/gstreamer-pbutils/src/auto/versions.txt index e20a6c61d..ba08203f4 100644 --- a/gstreamer-pbutils/src/auto/versions.txt +++ b/gstreamer-pbutils/src/auto/versions.txt @@ -1,3 +1,3 @@ Generated by gir (https://github.com/gtk-rs/gir @ 0a15f4e10c41) from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ db97a3ad67f5) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 05cc12709e2f) diff --git a/gstreamer-pbutils/sys/src/auto/versions.txt b/gstreamer-pbutils/sys/src/auto/versions.txt index e20a6c61d..ba08203f4 100644 --- a/gstreamer-pbutils/sys/src/auto/versions.txt +++ b/gstreamer-pbutils/sys/src/auto/versions.txt @@ -1,3 +1,3 @@ Generated by gir (https://github.com/gtk-rs/gir @ 0a15f4e10c41) from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ db97a3ad67f5) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 05cc12709e2f) diff --git a/gstreamer-play/src/auto/versions.txt b/gstreamer-play/src/auto/versions.txt index e20a6c61d..ba08203f4 100644 --- a/gstreamer-play/src/auto/versions.txt +++ b/gstreamer-play/src/auto/versions.txt @@ -1,3 +1,3 @@ Generated by gir (https://github.com/gtk-rs/gir @ 0a15f4e10c41) from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ db97a3ad67f5) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 05cc12709e2f) diff --git a/gstreamer-play/sys/src/auto/versions.txt b/gstreamer-play/sys/src/auto/versions.txt index e20a6c61d..ba08203f4 100644 --- a/gstreamer-play/sys/src/auto/versions.txt +++ b/gstreamer-play/sys/src/auto/versions.txt @@ -1,3 +1,3 @@ Generated by gir (https://github.com/gtk-rs/gir @ 0a15f4e10c41) from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ db97a3ad67f5) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 05cc12709e2f) diff --git a/gstreamer-player/src/auto/versions.txt b/gstreamer-player/src/auto/versions.txt index e20a6c61d..ba08203f4 100644 --- a/gstreamer-player/src/auto/versions.txt +++ b/gstreamer-player/src/auto/versions.txt @@ -1,3 +1,3 @@ Generated by gir (https://github.com/gtk-rs/gir @ 0a15f4e10c41) from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ db97a3ad67f5) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 05cc12709e2f) diff --git a/gstreamer-player/sys/src/auto/versions.txt b/gstreamer-player/sys/src/auto/versions.txt index e20a6c61d..ba08203f4 100644 --- a/gstreamer-player/sys/src/auto/versions.txt +++ b/gstreamer-player/sys/src/auto/versions.txt @@ -1,3 +1,3 @@ Generated by gir (https://github.com/gtk-rs/gir @ 0a15f4e10c41) from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ db97a3ad67f5) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 05cc12709e2f) diff --git a/gstreamer-rtp/src/auto/versions.txt b/gstreamer-rtp/src/auto/versions.txt index e20a6c61d..ba08203f4 100644 --- a/gstreamer-rtp/src/auto/versions.txt +++ b/gstreamer-rtp/src/auto/versions.txt @@ -1,3 +1,3 @@ Generated by gir (https://github.com/gtk-rs/gir @ 0a15f4e10c41) from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ db97a3ad67f5) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 05cc12709e2f) diff --git a/gstreamer-rtp/sys/src/auto/versions.txt b/gstreamer-rtp/sys/src/auto/versions.txt index e20a6c61d..ba08203f4 100644 --- a/gstreamer-rtp/sys/src/auto/versions.txt +++ b/gstreamer-rtp/sys/src/auto/versions.txt @@ -1,3 +1,3 @@ Generated by gir (https://github.com/gtk-rs/gir @ 0a15f4e10c41) from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ db97a3ad67f5) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 05cc12709e2f) diff --git a/gstreamer-rtsp-server/src/auto/rtsp_media.rs b/gstreamer-rtsp-server/src/auto/rtsp_media.rs index 8ac470fbb..3ca4cedf6 100644 --- a/gstreamer-rtsp-server/src/auto/rtsp_media.rs +++ b/gstreamer-rtsp-server/src/auto/rtsp_media.rs @@ -368,6 +368,7 @@ pub trait RTSPMediaExt: IsA + 'static { #[cfg(feature = "v1_16")] #[cfg_attr(docsrs, doc(cfg(feature = "v1_16")))] #[doc(alias = "gst_rtsp_media_is_bind_mcast_address")] + #[doc(alias = "bind-mcast-address")] fn is_bind_mcast_address(&self) -> bool { unsafe { from_glib(ffi::gst_rtsp_media_is_bind_mcast_address( @@ -377,6 +378,7 @@ pub trait RTSPMediaExt: IsA + 'static { } #[doc(alias = "gst_rtsp_media_is_eos_shutdown")] + #[doc(alias = "eos-shutdown")] fn is_eos_shutdown(&self) -> bool { unsafe { from_glib(ffi::gst_rtsp_media_is_eos_shutdown( @@ -397,6 +399,7 @@ pub trait RTSPMediaExt: IsA + 'static { } #[doc(alias = "gst_rtsp_media_is_reusable")] + #[doc(alias = "reusable")] fn is_reusable(&self) -> bool { unsafe { from_glib(ffi::gst_rtsp_media_is_reusable( @@ -406,6 +409,7 @@ pub trait RTSPMediaExt: IsA + 'static { } #[doc(alias = "gst_rtsp_media_is_shared")] + #[doc(alias = "shared")] fn is_shared(&self) -> bool { unsafe { from_glib(ffi::gst_rtsp_media_is_shared( @@ -415,6 +419,7 @@ pub trait RTSPMediaExt: IsA + 'static { } #[doc(alias = "gst_rtsp_media_is_stop_on_disconnect")] + #[doc(alias = "stop-on-disconnect")] fn is_stop_on_disconnect(&self) -> bool { unsafe { from_glib(ffi::gst_rtsp_media_is_stop_on_disconnect( @@ -424,6 +429,7 @@ pub trait RTSPMediaExt: IsA + 'static { } #[doc(alias = "gst_rtsp_media_is_time_provider")] + #[doc(alias = "time-provider")] fn is_time_provider(&self) -> bool { unsafe { from_glib(ffi::gst_rtsp_media_is_time_provider( @@ -789,8 +795,10 @@ pub trait RTSPMediaExt: IsA + 'static { } } + #[cfg(not(feature = "v1_16"))] + #[cfg_attr(docsrs, doc(cfg(not(feature = "v1_16"))))] #[doc(alias = "bind-mcast-address")] - fn get_property_bind_mcast_address(&self) -> bool { + fn is_bind_mcast_address(&self) -> bool { ObjectExt::property(self.as_ref(), "bind-mcast-address") } diff --git a/gstreamer-rtsp-server/src/auto/rtsp_media_factory.rs b/gstreamer-rtsp-server/src/auto/rtsp_media_factory.rs index 370ed5be1..9b053ddbf 100644 --- a/gstreamer-rtsp-server/src/auto/rtsp_media_factory.rs +++ b/gstreamer-rtsp-server/src/auto/rtsp_media_factory.rs @@ -259,6 +259,7 @@ pub trait RTSPMediaFactoryExt: IsA + 'static { #[cfg(feature = "v1_16")] #[cfg_attr(docsrs, doc(cfg(feature = "v1_16")))] #[doc(alias = "gst_rtsp_media_factory_is_bind_mcast_address")] + #[doc(alias = "bind-mcast-address")] fn is_bind_mcast_address(&self) -> bool { unsafe { from_glib(ffi::gst_rtsp_media_factory_is_bind_mcast_address( @@ -270,6 +271,7 @@ pub trait RTSPMediaFactoryExt: IsA + 'static { #[cfg(feature = "v1_20")] #[cfg_attr(docsrs, doc(cfg(feature = "v1_20")))] #[doc(alias = "gst_rtsp_media_factory_is_enable_rtcp")] + #[doc(alias = "enable-rtcp")] fn is_enable_rtcp(&self) -> bool { unsafe { from_glib(ffi::gst_rtsp_media_factory_is_enable_rtcp( @@ -279,6 +281,7 @@ pub trait RTSPMediaFactoryExt: IsA + 'static { } #[doc(alias = "gst_rtsp_media_factory_is_eos_shutdown")] + #[doc(alias = "eos-shutdown")] fn is_eos_shutdown(&self) -> bool { unsafe { from_glib(ffi::gst_rtsp_media_factory_is_eos_shutdown( @@ -288,6 +291,7 @@ pub trait RTSPMediaFactoryExt: IsA + 'static { } #[doc(alias = "gst_rtsp_media_factory_is_shared")] + #[doc(alias = "shared")] fn is_shared(&self) -> bool { unsafe { from_glib(ffi::gst_rtsp_media_factory_is_shared( @@ -562,8 +566,10 @@ pub trait RTSPMediaFactoryExt: IsA + 'static { } } + #[cfg(not(feature = "v1_16"))] + #[cfg_attr(docsrs, doc(cfg(not(feature = "v1_16"))))] #[doc(alias = "bind-mcast-address")] - fn get_property_bind_mcast_address(&self) -> bool { + fn is_bind_mcast_address(&self) -> bool { ObjectExt::property(self.as_ref(), "bind-mcast-address") } diff --git a/gstreamer-rtsp-server/src/auto/versions.txt b/gstreamer-rtsp-server/src/auto/versions.txt index e20a6c61d..ba08203f4 100644 --- a/gstreamer-rtsp-server/src/auto/versions.txt +++ b/gstreamer-rtsp-server/src/auto/versions.txt @@ -1,3 +1,3 @@ Generated by gir (https://github.com/gtk-rs/gir @ 0a15f4e10c41) from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ db97a3ad67f5) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 05cc12709e2f) diff --git a/gstreamer-rtsp-server/sys/src/auto/versions.txt b/gstreamer-rtsp-server/sys/src/auto/versions.txt index e20a6c61d..ba08203f4 100644 --- a/gstreamer-rtsp-server/sys/src/auto/versions.txt +++ b/gstreamer-rtsp-server/sys/src/auto/versions.txt @@ -1,3 +1,3 @@ Generated by gir (https://github.com/gtk-rs/gir @ 0a15f4e10c41) from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ db97a3ad67f5) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 05cc12709e2f) diff --git a/gstreamer-rtsp-server/sys/src/lib.rs b/gstreamer-rtsp-server/sys/src/lib.rs index d8a0ede0c..2bc4c6ce4 100644 --- a/gstreamer-rtsp-server/sys/src/lib.rs +++ b/gstreamer-rtsp-server/sys/src/lib.rs @@ -1347,6 +1347,7 @@ extern "C" { //========================================================================= // GstRTSPContext //========================================================================= + pub fn gst_rtsp_context_get_type() -> GType; pub fn gst_rtsp_context_pop_current(ctx: *mut GstRTSPContext); pub fn gst_rtsp_context_push_current(ctx: *mut GstRTSPContext); #[cfg(feature = "v1_22")] @@ -2663,7 +2664,6 @@ extern "C" { //========================================================================= // Other functions //========================================================================= - pub fn gst_rtsp_context_get_type() -> GType; pub fn gst_rtsp_params_get( client: *mut GstRTSPClient, ctx: *mut GstRTSPContext, diff --git a/gstreamer-rtsp/src/auto/versions.txt b/gstreamer-rtsp/src/auto/versions.txt index e20a6c61d..ba08203f4 100644 --- a/gstreamer-rtsp/src/auto/versions.txt +++ b/gstreamer-rtsp/src/auto/versions.txt @@ -1,3 +1,3 @@ Generated by gir (https://github.com/gtk-rs/gir @ 0a15f4e10c41) from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ db97a3ad67f5) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 05cc12709e2f) diff --git a/gstreamer-rtsp/sys/src/auto/versions.txt b/gstreamer-rtsp/sys/src/auto/versions.txt index e20a6c61d..ba08203f4 100644 --- a/gstreamer-rtsp/sys/src/auto/versions.txt +++ b/gstreamer-rtsp/sys/src/auto/versions.txt @@ -1,3 +1,3 @@ Generated by gir (https://github.com/gtk-rs/gir @ 0a15f4e10c41) from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ db97a3ad67f5) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 05cc12709e2f) diff --git a/gstreamer-sdp/src/auto/versions.txt b/gstreamer-sdp/src/auto/versions.txt index e20a6c61d..ba08203f4 100644 --- a/gstreamer-sdp/src/auto/versions.txt +++ b/gstreamer-sdp/src/auto/versions.txt @@ -1,3 +1,3 @@ Generated by gir (https://github.com/gtk-rs/gir @ 0a15f4e10c41) from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ db97a3ad67f5) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 05cc12709e2f) diff --git a/gstreamer-sdp/sys/src/auto/versions.txt b/gstreamer-sdp/sys/src/auto/versions.txt index e20a6c61d..ba08203f4 100644 --- a/gstreamer-sdp/sys/src/auto/versions.txt +++ b/gstreamer-sdp/sys/src/auto/versions.txt @@ -1,3 +1,3 @@ Generated by gir (https://github.com/gtk-rs/gir @ 0a15f4e10c41) from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ db97a3ad67f5) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 05cc12709e2f) diff --git a/gstreamer-tag/sys/src/auto/versions.txt b/gstreamer-tag/sys/src/auto/versions.txt index e20a6c61d..ba08203f4 100644 --- a/gstreamer-tag/sys/src/auto/versions.txt +++ b/gstreamer-tag/sys/src/auto/versions.txt @@ -1,3 +1,3 @@ Generated by gir (https://github.com/gtk-rs/gir @ 0a15f4e10c41) from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ db97a3ad67f5) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 05cc12709e2f) diff --git a/gstreamer-validate/src/auto/versions.txt b/gstreamer-validate/src/auto/versions.txt index e20a6c61d..ba08203f4 100644 --- a/gstreamer-validate/src/auto/versions.txt +++ b/gstreamer-validate/src/auto/versions.txt @@ -1,3 +1,3 @@ Generated by gir (https://github.com/gtk-rs/gir @ 0a15f4e10c41) from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ db97a3ad67f5) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 05cc12709e2f) diff --git a/gstreamer-validate/sys/src/auto/versions.txt b/gstreamer-validate/sys/src/auto/versions.txt index e20a6c61d..ba08203f4 100644 --- a/gstreamer-validate/sys/src/auto/versions.txt +++ b/gstreamer-validate/sys/src/auto/versions.txt @@ -1,3 +1,3 @@ Generated by gir (https://github.com/gtk-rs/gir @ 0a15f4e10c41) from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ db97a3ad67f5) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 05cc12709e2f) diff --git a/gstreamer-validate/sys/src/lib.rs b/gstreamer-validate/sys/src/lib.rs index 60f85bf35..34e586aa4 100644 --- a/gstreamer-validate/sys/src/lib.rs +++ b/gstreamer-validate/sys/src/lib.rs @@ -178,7 +178,7 @@ pub struct GstValidateAction { pub filename: *mut c_char, pub debug: *mut c_char, pub n_repeats: c_int, - pub rangename: *const c_char, + pub rangename: *mut c_char, pub priv_: *mut GstValidateActionPrivate, pub _gst_reserved: [gpointer; 4], } diff --git a/gstreamer-video/src/auto/versions.txt b/gstreamer-video/src/auto/versions.txt index e20a6c61d..ba08203f4 100644 --- a/gstreamer-video/src/auto/versions.txt +++ b/gstreamer-video/src/auto/versions.txt @@ -1,3 +1,3 @@ Generated by gir (https://github.com/gtk-rs/gir @ 0a15f4e10c41) from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ db97a3ad67f5) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 05cc12709e2f) diff --git a/gstreamer-video/src/auto/video_encoder.rs b/gstreamer-video/src/auto/video_encoder.rs index 28c193335..579b0b027 100644 --- a/gstreamer-video/src/auto/video_encoder.rs +++ b/gstreamer-video/src/auto/video_encoder.rs @@ -38,6 +38,18 @@ pub trait VideoEncoderExt: IsA + 'static { } } + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + #[doc(alias = "gst_video_encoder_drop_frame")] + fn drop_frame(&self, frame: VideoCodecFrame) { + unsafe { + ffi::gst_video_encoder_drop_frame( + self.as_ref().to_glib_none().0, + frame.into_glib_ptr(), + ); + } + } + #[doc(alias = "gst_video_encoder_finish_frame")] fn finish_frame(&self, frame: VideoCodecFrame) -> Result { unsafe { @@ -103,6 +115,18 @@ pub trait VideoEncoderExt: IsA + 'static { } } + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + #[doc(alias = "gst_video_encoder_release_frame")] + fn release_frame(&self, frame: VideoCodecFrame) { + unsafe { + ffi::gst_video_encoder_release_frame( + self.as_ref().to_glib_none().0, + frame.into_glib_ptr(), + ); + } + } + #[cfg(feature = "v1_18")] #[cfg_attr(docsrs, doc(cfg(feature = "v1_18")))] #[doc(alias = "gst_video_encoder_set_min_force_key_unit_interval")] diff --git a/gstreamer-video/sys/src/auto/versions.txt b/gstreamer-video/sys/src/auto/versions.txt index e20a6c61d..ba08203f4 100644 --- a/gstreamer-video/sys/src/auto/versions.txt +++ b/gstreamer-video/sys/src/auto/versions.txt @@ -1,3 +1,3 @@ Generated by gir (https://github.com/gtk-rs/gir @ 0a15f4e10c41) from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ db97a3ad67f5) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 05cc12709e2f) diff --git a/gstreamer-video/sys/src/lib.rs b/gstreamer-video/sys/src/lib.rs index e11d94341..4c9a4437c 100644 --- a/gstreamer-video/sys/src/lib.rs +++ b/gstreamer-video/sys/src/lib.rs @@ -4011,6 +4011,12 @@ extern "C" { frame: *mut GstVideoCodecFrame, size: size_t, ) -> gst::GstFlowReturn; + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_video_encoder_drop_frame( + encoder: *mut GstVideoEncoder, + frame: *mut GstVideoCodecFrame, + ); pub fn gst_video_encoder_finish_frame( encoder: *mut GstVideoEncoder, frame: *mut GstVideoCodecFrame, @@ -4063,6 +4069,12 @@ extern "C" { caps: *mut gst::GstCaps, filter: *mut gst::GstCaps, ) -> *mut gst::GstCaps; + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_video_encoder_release_frame( + encoder: *mut GstVideoEncoder, + frame: *mut GstVideoCodecFrame, + ); pub fn gst_video_encoder_set_headers(encoder: *mut GstVideoEncoder, headers: *mut glib::GList); pub fn gst_video_encoder_set_latency( encoder: *mut GstVideoEncoder, diff --git a/gstreamer-webrtc/src/auto/versions.txt b/gstreamer-webrtc/src/auto/versions.txt index e20a6c61d..ba08203f4 100644 --- a/gstreamer-webrtc/src/auto/versions.txt +++ b/gstreamer-webrtc/src/auto/versions.txt @@ -1,3 +1,3 @@ Generated by gir (https://github.com/gtk-rs/gir @ 0a15f4e10c41) from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ db97a3ad67f5) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 05cc12709e2f) diff --git a/gstreamer-webrtc/sys/src/auto/versions.txt b/gstreamer-webrtc/sys/src/auto/versions.txt index e20a6c61d..ba08203f4 100644 --- a/gstreamer-webrtc/sys/src/auto/versions.txt +++ b/gstreamer-webrtc/sys/src/auto/versions.txt @@ -1,3 +1,3 @@ Generated by gir (https://github.com/gtk-rs/gir @ 0a15f4e10c41) from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ db97a3ad67f5) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 05cc12709e2f) diff --git a/gstreamer/src/auto/clock.rs b/gstreamer/src/auto/clock.rs index 0b8f6cc77..56081432e 100644 --- a/gstreamer/src/auto/clock.rs +++ b/gstreamer/src/auto/clock.rs @@ -78,13 +78,17 @@ unsafe impl Sync for Clock {} pub trait ClockExt: IsA + 'static { #[doc(alias = "gst_clock_add_observation")] - fn add_observation(&self, slave: ClockTime, master: ClockTime) -> Option { + fn add_observation( + &self, + observation_internal: ClockTime, + observation_external: ClockTime, + ) -> Option { unsafe { let mut r_squared = std::mem::MaybeUninit::uninit(); let ret = from_glib(ffi::gst_clock_add_observation( self.as_ref().to_glib_none().0, - slave.into_glib(), - master.into_glib(), + observation_internal.into_glib(), + observation_external.into_glib(), r_squared.as_mut_ptr(), )); if ret { @@ -98,8 +102,8 @@ pub trait ClockExt: IsA + 'static { #[doc(alias = "gst_clock_add_observation_unapplied")] fn add_observation_unapplied( &self, - slave: ClockTime, - master: ClockTime, + observation_internal: ClockTime, + observation_external: ClockTime, ) -> Option<(f64, ClockTime, ClockTime, ClockTime, ClockTime)> { unsafe { let mut r_squared = std::mem::MaybeUninit::uninit(); @@ -109,8 +113,8 @@ pub trait ClockExt: IsA + 'static { let mut rate_denom = std::mem::MaybeUninit::uninit(); let ret = from_glib(ffi::gst_clock_add_observation_unapplied( self.as_ref().to_glib_none().0, - slave.into_glib(), - master.into_glib(), + observation_internal.into_glib(), + observation_external.into_glib(), r_squared.as_mut_ptr(), internal.as_mut_ptr(), external.as_mut_ptr(), diff --git a/gstreamer/src/auto/versions.txt b/gstreamer/src/auto/versions.txt index e20a6c61d..ba08203f4 100644 --- a/gstreamer/src/auto/versions.txt +++ b/gstreamer/src/auto/versions.txt @@ -1,3 +1,3 @@ Generated by gir (https://github.com/gtk-rs/gir @ 0a15f4e10c41) from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ db97a3ad67f5) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 05cc12709e2f) diff --git a/gstreamer/src/bus_windows.rs b/gstreamer/src/bus_windows.rs index f5c683f10..a27e9b865 100644 --- a/gstreamer/src/bus_windows.rs +++ b/gstreamer/src/bus_windows.rs @@ -16,8 +16,8 @@ cfg_if::cfg_if! { } } -use glib::prelude::*; use super::Bus; +use glib::prelude::*; pub trait WindowsBusExtManual: IsA + 'static { #[doc(alias = "get_pollfd")] diff --git a/gstreamer/sys/src/auto/versions.txt b/gstreamer/sys/src/auto/versions.txt index e20a6c61d..ba08203f4 100644 --- a/gstreamer/sys/src/auto/versions.txt +++ b/gstreamer/sys/src/auto/versions.txt @@ -1,3 +1,3 @@ Generated by gir (https://github.com/gtk-rs/gir @ 0a15f4e10c41) from gir-files (https://github.com/gtk-rs/gir-files @ e45712216c81) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ db97a3ad67f5) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 05cc12709e2f) diff --git a/gstreamer/sys/src/lib.rs b/gstreamer/sys/src/lib.rs index cd44f2021..a7b46fe00 100644 --- a/gstreamer/sys/src/lib.rs +++ b/gstreamer/sys/src/lib.rs @@ -1157,10 +1157,16 @@ pub type GstPluginInitFunc = Option gboo pub type GstPromiseChangeFunc = Option; pub type GstStructureFilterMapFunc = Option gboolean>; +pub type GstStructureFilterMapIdStrFunc = + Option gboolean>; pub type GstStructureForeachFunc = Option gboolean>; +pub type GstStructureForeachIdStrFunc = + Option gboolean>; pub type GstStructureMapFunc = Option gboolean>; +pub type GstStructureMapIdStrFunc = + Option gboolean>; pub type GstTagForeachFunc = Option; pub type GstTagMergeFunc = @@ -1981,6 +1987,19 @@ pub struct _GstGhostPadPrivate { pub type GstGhostPadPrivate = _GstGhostPadPrivate; +#[derive(Copy, Clone)] +#[repr(C)] +pub struct GstIdStr { + pub pointer: gpointer, + pub padding: [u8; 8], +} + +impl ::std::fmt::Debug for GstIdStr { + fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { + f.debug_struct(&format!("GstIdStr @ {self:p}")).finish() + } +} + #[derive(Copy, Clone)] #[repr(C)] pub struct GstIterator { @@ -4783,11 +4802,31 @@ extern "C" { pub fn gst_caps_new_empty_simple(media_type: *const c_char) -> *mut GstCaps; pub fn gst_caps_new_full(struct1: *mut GstStructure, ...) -> *mut GstCaps; //pub fn gst_caps_new_full_valist(structure: *mut GstStructure, var_args: /*Unimplemented*/va_list) -> *mut GstCaps; + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_caps_new_id_str_empty_simple(media_type: *const GstIdStr) -> *mut GstCaps; + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_caps_new_id_str_simple( + media_type: *const GstIdStr, + fieldname: *const GstIdStr, + ... + ) -> *mut GstCaps; pub fn gst_caps_new_simple( media_type: *const c_char, fieldname: *const c_char, ... ) -> *mut GstCaps; + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_caps_new_static_str_empty_simple(media_type: *const c_char) -> *mut GstCaps; + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_caps_new_static_str_simple( + media_type: *const c_char, + fieldname: *const c_char, + ... + ) -> *mut GstCaps; pub fn gst_caps_append(caps1: *mut GstCaps, caps2: *mut GstCaps); pub fn gst_caps_append_structure(caps: *mut GstCaps, structure: *mut GstStructure); pub fn gst_caps_append_structure_full( @@ -4816,6 +4855,19 @@ extern "C" { pub fn gst_caps_get_features(caps: *const GstCaps, index: c_uint) -> *mut GstCapsFeatures; pub fn gst_caps_get_size(caps: *const GstCaps) -> c_uint; pub fn gst_caps_get_structure(caps: *const GstCaps, index: c_uint) -> *mut GstStructure; + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_caps_id_str_set_simple(caps: *mut GstCaps, field: *const GstIdStr, ...); + //#[cfg(feature = "v1_26")] + //#[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + //pub fn gst_caps_id_str_set_simple_valist(caps: *mut GstCaps, field: *const GstIdStr, varargs: /*Unimplemented*/va_list); + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_caps_id_str_set_value( + caps: *mut GstCaps, + field: *const GstIdStr, + value: *const gobject::GValue, + ); pub fn gst_caps_intersect(caps1: *mut GstCaps, caps2: *mut GstCaps) -> *mut GstCaps; pub fn gst_caps_intersect_full( caps1: *mut GstCaps, @@ -4867,12 +4919,25 @@ extern "C" { #[cfg_attr(docsrs, doc(cfg(feature = "v1_16")))] pub fn gst_caps_set_features_simple(caps: *mut GstCaps, features: *mut GstCapsFeatures); pub fn gst_caps_set_simple(caps: *mut GstCaps, field: *const c_char, ...); + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_caps_set_simple_static_str(caps: *mut GstCaps, field: *const c_char, ...); + //#[cfg(feature = "v1_26")] + //#[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + //pub fn gst_caps_set_simple_static_str_valist(caps: *mut GstCaps, field: *const c_char, varargs: /*Unimplemented*/va_list); //pub fn gst_caps_set_simple_valist(caps: *mut GstCaps, field: *const c_char, varargs: /*Unimplemented*/va_list); pub fn gst_caps_set_value( caps: *mut GstCaps, field: *const c_char, value: *const gobject::GValue, ); + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_caps_set_value_static_str( + caps: *mut GstCaps, + field: *const c_char, + value: *const gobject::GValue, + ); pub fn gst_caps_simplify(caps: *mut GstCaps) -> *mut GstCaps; pub fn gst_caps_steal_structure(caps: *mut GstCaps, index: c_uint) -> *mut GstStructure; pub fn gst_caps_subtract(minuend: *mut GstCaps, subtrahend: *mut GstCaps) -> *mut GstCaps; @@ -4897,13 +4962,34 @@ extern "C" { pub fn gst_caps_features_new_any() -> *mut GstCapsFeatures; pub fn gst_caps_features_new_empty() -> *mut GstCapsFeatures; pub fn gst_caps_features_new_id(feature1: glib::GQuark, ...) -> *mut GstCapsFeatures; + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_caps_features_new_id_str(feature1: *const GstIdStr, ...) -> *mut GstCapsFeatures; + //#[cfg(feature = "v1_26")] + //#[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + //pub fn gst_caps_features_new_id_str_valist(feature1: *const GstIdStr, varargs: /*Unimplemented*/va_list) -> *mut GstCapsFeatures; //pub fn gst_caps_features_new_id_valist(feature1: glib::GQuark, varargs: /*Unimplemented*/va_list) -> *mut GstCapsFeatures; #[cfg(feature = "v1_20")] #[cfg_attr(docsrs, doc(cfg(feature = "v1_20")))] pub fn gst_caps_features_new_single(feature: *const c_char) -> *mut GstCapsFeatures; + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_caps_features_new_single_static_str(feature: *const c_char) -> *mut GstCapsFeatures; + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_caps_features_new_static_str(feature1: *const c_char, ...) -> *mut GstCapsFeatures; + //#[cfg(feature = "v1_26")] + //#[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + //pub fn gst_caps_features_new_static_str_valist(feature1: *const c_char, varargs: /*Unimplemented*/va_list) -> *mut GstCapsFeatures; //pub fn gst_caps_features_new_valist(feature1: *const c_char, varargs: /*Unimplemented*/va_list) -> *mut GstCapsFeatures; pub fn gst_caps_features_add(features: *mut GstCapsFeatures, feature: *const c_char); pub fn gst_caps_features_add_id(features: *mut GstCapsFeatures, feature: glib::GQuark); + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_caps_features_add_id_str(features: *mut GstCapsFeatures, feature: *const GstIdStr); + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_caps_features_add_static_str(features: *mut GstCapsFeatures, feature: *const c_char); pub fn gst_caps_features_contains( features: *const GstCapsFeatures, feature: *const c_char, @@ -4912,6 +4998,12 @@ extern "C" { features: *const GstCapsFeatures, feature: glib::GQuark, ) -> gboolean; + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_caps_features_contains_id_str( + features: *const GstCapsFeatures, + feature: *const GstIdStr, + ) -> gboolean; pub fn gst_caps_features_copy(features: *const GstCapsFeatures) -> *mut GstCapsFeatures; pub fn gst_caps_features_free(features: *mut GstCapsFeatures); pub fn gst_caps_features_get_nth(features: *const GstCapsFeatures, i: c_uint) -> *const c_char; @@ -4919,6 +5011,12 @@ extern "C" { features: *const GstCapsFeatures, i: c_uint, ) -> glib::GQuark; + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_caps_features_get_nth_id_str( + features: *const GstCapsFeatures, + i: c_uint, + ) -> *const GstIdStr; pub fn gst_caps_features_get_size(features: *const GstCapsFeatures) -> c_uint; pub fn gst_caps_features_is_any(features: *const GstCapsFeatures) -> gboolean; pub fn gst_caps_features_is_equal( @@ -4927,6 +5025,12 @@ extern "C" { ) -> gboolean; pub fn gst_caps_features_remove(features: *mut GstCapsFeatures, feature: *const c_char); pub fn gst_caps_features_remove_id(features: *mut GstCapsFeatures, feature: glib::GQuark); + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_caps_features_remove_id_str( + features: *mut GstCapsFeatures, + feature: *const GstIdStr, + ); pub fn gst_caps_features_set_parent_refcount( features: *mut GstCapsFeatures, refcount: *mut c_int, @@ -5329,6 +5433,65 @@ extern "C" { #[cfg_attr(docsrs, doc(cfg(feature = "v1_18_3")))] pub fn gst_event_take(old_event: *mut *mut GstEvent, new_event: *mut GstEvent) -> gboolean; + //========================================================================= + // GstIdStr + //========================================================================= + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_id_str_get_type() -> GType; + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_id_str_new() -> *mut GstIdStr; + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_id_str_as_str(s: *const GstIdStr) -> *const c_char; + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_id_str_clear(s: *mut GstIdStr); + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_id_str_copy(s: *const GstIdStr) -> *mut GstIdStr; + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_id_str_copy_into(d: *mut GstIdStr, s: *const GstIdStr); + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_id_str_free(s: *mut GstIdStr); + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_id_str_get_len(s: *const GstIdStr) -> size_t; + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_id_str_init(s: *mut GstIdStr); + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_id_str_is_equal(s1: *const GstIdStr, s2: *const GstIdStr) -> gboolean; + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_id_str_is_equal_to_str(s1: *const GstIdStr, s2: *const c_char) -> gboolean; + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_id_str_is_equal_to_str_with_len( + s1: *const GstIdStr, + s2: *const c_char, + len: size_t, + ) -> gboolean; + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_id_str_move(d: *mut GstIdStr, s: *mut GstIdStr); + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_id_str_set(s: *mut GstIdStr, value: *const c_char); + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_id_str_set_static_str(s: *mut GstIdStr, value: *const c_char); + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_id_str_set_static_str_with_len(s: *mut GstIdStr, value: *const c_char, len: size_t); + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_id_str_set_with_len(s: *mut GstIdStr, value: *const c_char, len: size_t); + //========================================================================= // GstIterator //========================================================================= @@ -6516,12 +6679,14 @@ extern "C" { //========================================================================= // GstStaticCaps //========================================================================= + pub fn gst_static_caps_get_type() -> GType; pub fn gst_static_caps_cleanup(static_caps: *mut GstStaticCaps); pub fn gst_static_caps_get(static_caps: *mut GstStaticCaps) -> *mut GstCaps; //========================================================================= // GstStaticPadTemplate //========================================================================= + pub fn gst_static_pad_template_get_type() -> GType; pub fn gst_static_pad_template_get( pad_template: *mut GstStaticPadTemplate, ) -> *mut GstPadTemplate; @@ -6548,6 +6713,32 @@ extern "C" { ... ) -> *mut GstStructure; pub fn gst_structure_new_id_empty(quark: glib::GQuark) -> *mut GstStructure; + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_structure_new_id_str( + name: *const GstIdStr, + fieldname: *const GstIdStr, + ... + ) -> *mut GstStructure; + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_structure_new_id_str_empty(name: *const GstIdStr) -> *mut GstStructure; + //#[cfg(feature = "v1_26")] + //#[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + //pub fn gst_structure_new_id_str_valist(name: *const GstIdStr, firstfield: *const GstIdStr, varargs: /*Unimplemented*/va_list) -> *mut GstStructure; + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_structure_new_static_str( + name: *const c_char, + firstfield: *const c_char, + ... + ) -> *mut GstStructure; + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_structure_new_static_str_empty(name: *const c_char) -> *mut GstStructure; + //#[cfg(feature = "v1_26")] + //#[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + //pub fn gst_structure_new_static_str_valist(name: *const c_char, firstfield: *const c_char, varargs: /*Unimplemented*/va_list) -> *mut GstStructure; //pub fn gst_structure_new_valist(name: *const c_char, firstfield: *const c_char, varargs: /*Unimplemented*/va_list) -> *mut GstStructure; pub fn gst_structure_can_intersect( struct1: *const GstStructure, @@ -6559,6 +6750,13 @@ extern "C" { func: GstStructureFilterMapFunc, user_data: gpointer, ); + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_structure_filter_and_map_in_place_id_str( + structure: *mut GstStructure, + func: GstStructureFilterMapIdStrFunc, + user_data: gpointer, + ); pub fn gst_structure_fixate(structure: *mut GstStructure); pub fn gst_structure_fixate_field( structure: *mut GstStructure, @@ -6595,6 +6793,13 @@ extern "C" { func: GstStructureForeachFunc, user_data: gpointer, ) -> gboolean; + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_structure_foreach_id_str( + structure: *const GstStructure, + func: GstStructureForeachIdStrFunc, + user_data: gpointer, + ) -> gboolean; pub fn gst_structure_free(structure: *mut GstStructure); pub fn gst_structure_get( structure: *const GstStructure, @@ -6678,6 +6883,9 @@ extern "C" { ) -> gboolean; pub fn gst_structure_get_name(structure: *const GstStructure) -> *const c_char; pub fn gst_structure_get_name_id(structure: *const GstStructure) -> glib::GQuark; + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_structure_get_name_id_str(structure: *const GstStructure) -> *const GstIdStr; pub fn gst_structure_get_string( structure: *const GstStructure, fieldname: *const c_char, @@ -6733,6 +6941,83 @@ extern "C" { field: glib::GQuark, value: *const gobject::GValue, ); + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_structure_id_str_get( + structure: *const GstStructure, + first_fieldname: *const GstIdStr, + ... + ) -> gboolean; + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_structure_id_str_get_field_type( + structure: *const GstStructure, + fieldname: *const GstIdStr, + ) -> GType; + //#[cfg(feature = "v1_26")] + //#[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + //pub fn gst_structure_id_str_get_valist(structure: *const GstStructure, first_fieldname: *const GstIdStr, args: /*Unimplemented*/va_list) -> gboolean; + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_structure_id_str_get_value( + structure: *const GstStructure, + fieldname: *const GstIdStr, + ) -> *const gobject::GValue; + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_structure_id_str_has_field( + structure: *const GstStructure, + fieldname: *const GstIdStr, + ) -> gboolean; + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_structure_id_str_has_field_typed( + structure: *const GstStructure, + fieldname: *const GstIdStr, + type_: GType, + ) -> gboolean; + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_structure_id_str_nth_field_name( + structure: *const GstStructure, + index: c_uint, + ) -> *const GstIdStr; + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_structure_id_str_remove_field( + structure: *mut GstStructure, + fieldname: *const GstIdStr, + ); + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_structure_id_str_remove_fields( + structure: *mut GstStructure, + fieldname: *const GstIdStr, + ... + ); + //#[cfg(feature = "v1_26")] + //#[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + //pub fn gst_structure_id_str_remove_fields_valist(structure: *mut GstStructure, fieldname: *const GstIdStr, varargs: /*Unimplemented*/va_list); + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_structure_id_str_set(structure: *mut GstStructure, fieldname: *const GstIdStr, ...); + //#[cfg(feature = "v1_26")] + //#[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + //pub fn gst_structure_id_str_set_valist(structure: *mut GstStructure, fieldname: *const GstIdStr, varargs: /*Unimplemented*/va_list); + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_structure_id_str_set_value( + structure: *mut GstStructure, + fieldname: *const GstIdStr, + value: *const gobject::GValue, + ); + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_structure_id_str_take_value( + structure: *mut GstStructure, + fieldname: *const GstIdStr, + value: *mut gobject::GValue, + ); pub fn gst_structure_id_take_value( structure: *mut GstStructure, field: glib::GQuark, @@ -6755,6 +7040,13 @@ extern "C" { func: GstStructureMapFunc, user_data: gpointer, ) -> gboolean; + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_structure_map_in_place_id_str( + structure: *mut GstStructure, + func: GstStructureMapIdStrFunc, + user_data: gpointer, + ) -> gboolean; pub fn gst_structure_n_fields(structure: *const GstStructure) -> c_int; pub fn gst_structure_nth_field_name( structure: *const GstStructure, @@ -6788,21 +7080,51 @@ extern "C" { array: *const gobject::GValueArray, ); pub fn gst_structure_set_name(structure: *mut GstStructure, name: *const c_char); + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_structure_set_name_id_str(structure: *mut GstStructure, name: *const GstIdStr); + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_structure_set_name_static_str(structure: *mut GstStructure, name: *const c_char); pub fn gst_structure_set_parent_refcount( structure: *mut GstStructure, refcount: *mut c_int, ) -> gboolean; + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_structure_set_static_str( + structure: *mut GstStructure, + fieldname: *const c_char, + ... + ); + //#[cfg(feature = "v1_26")] + //#[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + //pub fn gst_structure_set_static_str_valist(structure: *mut GstStructure, fieldname: *const c_char, varargs: /*Unimplemented*/va_list); //pub fn gst_structure_set_valist(structure: *mut GstStructure, fieldname: *const c_char, varargs: /*Unimplemented*/va_list); pub fn gst_structure_set_value( structure: *mut GstStructure, fieldname: *const c_char, value: *const gobject::GValue, ); + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_structure_set_value_static_str( + structure: *mut GstStructure, + fieldname: *const c_char, + value: *const gobject::GValue, + ); pub fn gst_structure_take_value( structure: *mut GstStructure, fieldname: *const c_char, value: *mut gobject::GValue, ); + #[cfg(feature = "v1_26")] + #[cfg_attr(docsrs, doc(cfg(feature = "v1_26")))] + pub fn gst_structure_take_value_static_str( + structure: *mut GstStructure, + fieldname: *const c_char, + value: *mut gobject::GValue, + ); pub fn gst_structure_to_string(structure: *const GstStructure) -> *mut c_char; #[cfg(feature = "v1_18")] #[cfg_attr(docsrs, doc(cfg(feature = "v1_18")))] @@ -7082,6 +7404,7 @@ extern "C" { //========================================================================= // GstTypeFind //========================================================================= + pub fn gst_type_find_get_type() -> GType; pub fn gst_type_find_get_length(find: *mut GstTypeFind) -> u64; pub fn gst_type_find_peek(find: *mut GstTypeFind, offset: i64, size: c_uint) -> *const u8; pub fn gst_type_find_suggest(find: *mut GstTypeFind, probability: c_uint, caps: *mut GstCaps); @@ -7505,14 +7828,14 @@ extern "C" { ) -> GstClockReturn; pub fn gst_clock_add_observation( clock: *mut GstClock, - slave: GstClockTime, - master: GstClockTime, + observation_internal: GstClockTime, + observation_external: GstClockTime, r_squared: *mut c_double, ) -> gboolean; pub fn gst_clock_add_observation_unapplied( clock: *mut GstClock, - slave: GstClockTime, - master: GstClockTime, + observation_internal: GstClockTime, + observation_external: GstClockTime, r_squared: *mut c_double, internal: *mut GstClockTime, external: *mut GstClockTime, @@ -9373,8 +9696,6 @@ extern "C" { pub fn gst_reference_timestamp_meta_api_get_type() -> GType; pub fn gst_segtrap_is_enabled() -> gboolean; pub fn gst_segtrap_set_enabled(enabled: gboolean); - pub fn gst_static_caps_get_type() -> GType; - pub fn gst_static_pad_template_get_type() -> GType; pub fn gst_tag_exists(tag: *const c_char) -> gboolean; pub fn gst_tag_get_description(tag: *const c_char) -> *const c_char; pub fn gst_tag_get_flag(tag: *const c_char) -> GstTagFlag; @@ -9410,7 +9731,6 @@ extern "C" { detail: *const c_char, func: gobject::GCallback, ); - pub fn gst_type_find_get_type() -> GType; #[cfg(feature = "v1_18")] #[cfg_attr(docsrs, doc(cfg(feature = "v1_18")))] pub fn gst_type_is_plugin_api(type_: GType, flags: *mut GstPluginAPIFlags) -> gboolean; diff --git a/gstreamer/sys/tests/abi.rs b/gstreamer/sys/tests/abi.rs index 95c945378..60fec821d 100644 --- a/gstreamer/sys/tests/abi.rs +++ b/gstreamer/sys/tests/abi.rs @@ -657,6 +657,13 @@ const RUST_LAYOUTS: &[(&str, Layout)] = &[ alignment: align_of::(), }, ), + ( + "GstIdStr", + Layout { + size: size_of::(), + alignment: align_of::(), + }, + ), ( "GstIterator", Layout { diff --git a/gstreamer/sys/tests/layout.c b/gstreamer/sys/tests/layout.c index 724d5b4c5..0baf6cdbe 100644 --- a/gstreamer/sys/tests/layout.c +++ b/gstreamer/sys/tests/layout.c @@ -73,6 +73,7 @@ int main() { printf("%s;%zu;%zu\n", "GstGapFlags", sizeof(GstGapFlags), alignof(GstGapFlags)); printf("%s;%zu;%zu\n", "GstGhostPad", sizeof(GstGhostPad), alignof(GstGhostPad)); printf("%s;%zu;%zu\n", "GstGhostPadClass", sizeof(GstGhostPadClass), alignof(GstGhostPadClass)); + printf("%s;%zu;%zu\n", "GstIdStr", sizeof(GstIdStr), alignof(GstIdStr)); printf("%s;%zu;%zu\n", "GstIterator", sizeof(GstIterator), alignof(GstIterator)); printf("%s;%zu;%zu\n", "GstIteratorItem", sizeof(GstIteratorItem), alignof(GstIteratorItem)); printf("%s;%zu;%zu\n", "GstIteratorResult", sizeof(GstIteratorResult), alignof(GstIteratorResult));