From c4666a42084bac3c1be8ffe2dda5a5bf833103dd Mon Sep 17 00:00:00 2001 From: Russel Winder Date: Thu, 8 Nov 2018 09:06:47 +0000 Subject: [PATCH] mpegts: Updates for the new boxed types in MPEG-TS library of gst_plugins_bad. --- gir-files/GstMpegts-1.0.gir | 91 +++++++++++++++++++++++++++------ gstreamer-mpegts-sys/src/lib.rs | 85 ++++++++++++++++++++++++++++++ 2 files changed, 159 insertions(+), 17 deletions(-) diff --git a/gir-files/GstMpegts-1.0.gir b/gir-files/GstMpegts-1.0.gir index 0677e14ae..7b3834901 100644 --- a/gir-files/GstMpegts-1.0.gir +++ b/gir-files/GstMpegts-1.0.gir @@ -565,7 +565,11 @@ Consult the relevant specifications for more details. c:identifier="GST_MPEGTS_STREAM_CONTENT_SRM_CPCM"> - + @@ -1070,7 +1074,11 @@ Consult the relevant specifications for more details. - + @@ -1082,7 +1090,10 @@ Consult the relevant specifications for more details. + c:type="GstMpegtsDVBLinkageExtendedEvent" + glib:type-name="GstMpegtsDVBLinkageExtendedEvent" + glib:get-type="gst_mpegts_dvb_linkage_extended_event_get_type" + c:symbol-prefix="dvb_linkage_extended_event"> @@ -1137,7 +1148,10 @@ Consult the relevant specifications for more details. + c:type="GstMpegtsDVBLinkageMobileHandOver" + glib:type-name="GstMpegtsDVBLinkageMobileHandOver" + glib:get-type="gst_mpegts_dvb_linkage_mobile_hand_over_get_type" + c:symbol-prefix="dvb_linkage_mobile_hand_over"> @@ -1214,7 +1228,10 @@ Consult the relevant specifications for more details. + c:type="GstMpegtsDVBParentalRatingItem" + glib:type-name="GstMpegtsDVBParentalRatingItem" + glib:get-type="gst_mpegts_dvb_parental_rating_item_get_type" + c:symbol-prefix="dvb_parental_rating_item"> @@ -1261,7 +1278,11 @@ Consult the relevant specifications for more details. c:identifier="GST_MPEGTS_DVB_SCRAMBLING_MODE_ATIS_F"> - + the id of a service @@ -2813,7 +2834,10 @@ Consult the relevant specifications for more details. + c:type="GstMpegtsDvbMultilingualBouquetNameItem" + glib:type-name="GstMpegtsDvbMultilingualBouquetNameItem" + glib:get-type="gst_mpegts_dvb_multilingual_bouquet_name_item_get_type" + c:symbol-prefix="dvb_multilingual_bouquet_name_item"> a multilingual bouquet name entry the ISO 639 language code @@ -2825,7 +2849,10 @@ Consult the relevant specifications for more details. + c:type="GstMpegtsDvbMultilingualComponentItem" + glib:type-name="GstMpegtsDvbMultilingualComponentItem" + glib:get-type="gst_mpegts_dvb_multilingual_component_item_get_type" + c:symbol-prefix="dvb_multilingual_component_item"> the ISO 639 language code @@ -2836,7 +2863,10 @@ Consult the relevant specifications for more details. + c:type="GstMpegtsDvbMultilingualNetworkNameItem" + glib:type-name="GstMpegtsDvbMultilingualNetworkNameItem" + glib:get-type="gst_mpegts_dvb_multilingual_network_name_item_get_type" + c:symbol-prefix="dvb_multilingual_network_name_item"> a multilingual network name entry the ISO 639 language code @@ -2848,7 +2878,10 @@ Consult the relevant specifications for more details. + c:type="GstMpegtsDvbMultilingualServiceNameItem" + glib:type-name="GstMpegtsDvbMultilingualServiceNameItem" + glib:get-type="gst_mpegts_dvb_multilingual_service_name_item_get_type" + c:symbol-prefix="dvb_multilingual_service_name_item"> a multilingual service name entry the ISO 639 language code @@ -2960,7 +2993,11 @@ Consult the relevant specifications for more details. - + @@ -3154,7 +3191,11 @@ Consult the relevant specifications for more details. c:identifier="GST_MPEGTS_AUDIO_TYPE_VISUAL_IMPAIRED_COMMENTARY"> - + @@ -3166,7 +3207,10 @@ Consult the relevant specifications for more details. + c:type="GstMpegtsLogicalChannelDescriptor" + glib:type-name="GstMpegtsLogicalChannelDescriptor" + glib:get-type="gst_mpegts_logical_channel_descriptor_get_type" + c:symbol-prefix="logical_channel_descriptor"> @@ -3507,7 +3551,10 @@ Corresponds to table 6 of ETSI EN 300 468 (v1.13.0) + c:type="GstMpegtsSatelliteDeliverySystemDescriptor" + glib:type-name="GstMpegtsSatelliteDeliverySystemDescriptor" + glib:get-type="gst_mpegts_satellite_delivery_system_descriptor_get_type" + c:symbol-prefix="satellite_delivery_system_descriptor"> Satellite Delivery System Descriptor (EN 300 468 v.1.13.1) the frequency in kHz (kiloHertz) @@ -4702,7 +4749,11 @@ profiles defined in Annex A for service-compatible stereoscopic 3D servicesIPMP stream - + id of the cell @@ -4720,7 +4771,10 @@ profiles defined in Annex A for service-compatible stereoscopic 3D services + c:type="GstMpegtsT2DeliverySystemCellExtension" + glib:type-name="GstMpegtsT2DeliverySystemCellExtension" + glib:get-type="gst_mpegts_t2_delivery_system_cell_extension_get_type" + c:symbol-prefix="t2_delivery_system_cell_extension"> id of the sub cell @@ -4797,7 +4851,10 @@ profiles defined in Annex A for service-compatible stereoscopic 3D services + c:type="GstMpegtsTerrestrialDeliverySystemDescriptor" + glib:type-name="GstMpegtsTerrestrialDeliverySystemDescriptor" + glib:get-type="gst_mpegts_terrestrial_delivery_system_descriptor_get_type" + c:symbol-prefix="terrestrial_delivery_system_descriptor"> Terrestrial Delivery System Descriptor (EN 300 468 v.1.13.1) the frequency in Hz (Hertz) diff --git a/gstreamer-mpegts-sys/src/lib.rs b/gstreamer-mpegts-sys/src/lib.rs index cfcac18d2..d12d6e5a2 100644 --- a/gstreamer-mpegts-sys/src/lib.rs +++ b/gstreamer-mpegts-sys/src/lib.rs @@ -1679,6 +1679,11 @@ extern "C" { //========================================================================= pub fn gst_mpegts_component_descriptor_get_type() -> GType; + //========================================================================= + // GstMpegtsContent + //========================================================================= + pub fn gst_mpegts_content_get_type() -> GType; + //========================================================================= // GstMpegtsDVBLinkageDescriptor //========================================================================= @@ -1688,6 +1693,31 @@ extern "C" { pub fn gst_mpegts_dvb_linkage_descriptor_get_extended_event(desc: *const GstMpegtsDVBLinkageDescriptor) -> *const glib::GPtrArray; pub fn gst_mpegts_dvb_linkage_descriptor_get_mobile_hand_over(desc: *const GstMpegtsDVBLinkageDescriptor) -> *const GstMpegtsDVBLinkageMobileHandOver; + //========================================================================= + // GstMpegtsDVBLinkageEvent + //========================================================================= + pub fn gst_mpegts_dvb_linkage_event_get_type() -> GType; + + //========================================================================= + // GstMpegtsDVBLinkageExtendedEvent + //========================================================================= + pub fn gst_mpegts_dvb_linkage_extended_event_get_type() -> GType; + + //========================================================================= + // GstMpegtsDVBLinkageMobileHandOver + //========================================================================= + pub fn gst_mpegts_dvb_linkage_mobile_hand_over_get_type() -> GType; + + //========================================================================= + // GstMpegtsDVBParentalRatingItem + //========================================================================= + pub fn gst_mpegts_dvb_parental_rating_item_get_type() -> GType; + + //========================================================================= + // GstMpegtsDVBServiceListItem + //========================================================================= + pub fn gst_mpegts_dvb_service_list_item_get_type() -> GType; + //========================================================================= // GstMpegtsDataBroadcastDescriptor //========================================================================= @@ -1742,6 +1772,26 @@ extern "C" { pub fn gst_mpegts_descriptor_from_iso_639_language(language: *const c_char) -> *mut GstMpegtsDescriptor; pub fn gst_mpegts_descriptor_from_registration(format_identifier: *const c_char, additional_info: *mut u8, additional_info_length: size_t) -> *mut GstMpegtsDescriptor; + //========================================================================= + // GstMpegtsDvbMultilingualBouquetNameItem + //========================================================================= + pub fn gst_mpegts_dvb_multilingual_bouquet_name_item_get_type() -> GType; + + //========================================================================= + // GstMpegtsDvbMultilingualComponentItem + //========================================================================= + pub fn gst_mpegts_dvb_multilingual_component_item_get_type() -> GType; + + //========================================================================= + // GstMpegtsDvbMultilingualNetworkNameItem + //========================================================================= + pub fn gst_mpegts_dvb_multilingual_network_name_item_get_type() -> GType; + + //========================================================================= + // GstMpegtsDvbMultilingualServiceNameItem + //========================================================================= + pub fn gst_mpegts_dvb_multilingual_service_name_item_get_type() -> GType; + //========================================================================= // GstMpegtsEIT //========================================================================= @@ -1758,12 +1808,27 @@ extern "C" { pub fn gst_mpegts_extended_event_descriptor_get_type() -> GType; pub fn gst_mpegts_extended_event_descriptor_free(source: *mut GstMpegtsExtendedEventDescriptor); + //========================================================================= + // GstMpegtsExtendedEventItem + //========================================================================= + pub fn gst_mpegts_extended_event_item_get_type() -> GType; + //========================================================================= // GstMpegtsISO639LanguageDescriptor //========================================================================= pub fn gst_mpegts_iso_639_language_get_type() -> GType; pub fn gst_mpegts_iso_639_language_descriptor_free(desc: *mut GstMpegtsISO639LanguageDescriptor); + //========================================================================= + // GstMpegtsLogicalChannel + //========================================================================= + pub fn gst_mpegts_logical_channel_get_type() -> GType; + + //========================================================================= + // GstMpegtsLogicalChannelDescriptor + //========================================================================= + pub fn gst_mpegts_logical_channel_descriptor_get_type() -> GType; + //========================================================================= // GstMpegtsNIT //========================================================================= @@ -1806,6 +1871,11 @@ extern "C" { pub fn gst_mpegts_sdt_service_get_type() -> GType; pub fn gst_mpegts_sdt_service_new() -> *mut GstMpegtsSDTService; + //========================================================================= + // GstMpegtsSatelliteDeliverySystemDescriptor + //========================================================================= + pub fn gst_mpegts_satellite_delivery_system_descriptor_get_type() -> GType; + //========================================================================= // GstMpegtsSection //========================================================================= @@ -1835,6 +1905,16 @@ extern "C" { pub fn gst_mpegts_section_from_pmt(pmt: *mut GstMpegtsPMT, pid: u16) -> *mut GstMpegtsSection; pub fn gst_mpegts_section_from_sdt(sdt: *mut GstMpegtsSDT) -> *mut GstMpegtsSection; + //========================================================================= + // GstMpegtsT2DeliverySystemCell + //========================================================================= + pub fn gst_mpegts_t2_delivery_system_cell_get_type() -> GType; + + //========================================================================= + // GstMpegtsT2DeliverySystemCellExtension + //========================================================================= + pub fn gst_mpegts_t2_delivery_system_cell_extension_get_type() -> GType; + //========================================================================= // GstMpegtsT2DeliverySystemDescriptor //========================================================================= @@ -1846,6 +1926,11 @@ extern "C" { //========================================================================= pub fn gst_mpegts_tot_get_type() -> GType; + //========================================================================= + // GstMpegtsTerrestrialDeliverySystemDescriptor + //========================================================================= + pub fn gst_mpegts_terrestrial_delivery_system_descriptor_get_type() -> GType; + //========================================================================= // Other functions //=========================================================================