mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-02 08:42:32 +00:00
Code Issues 1 Projects Releases Wiki Activity

mxfdemux: Fix build on GLib < 2.16 some more

Browse source
This commit is contained in:
Jan Schmidt 2009-03-18 10:35:43 +00:00
parent e1c71b1b88
commit cf4485133b
2 changed files with 42 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
gst/mxf/mxfdemux.c
View file

@ -496,6 +496,14 @@ set_resolve_state_none (gpointer key, gpointer value, gpointer user_data)
MXFMetadataBase *m = (MXFMetadataBase *) value; MXFMetadataBase *m = (MXFMetadataBase *) value;
m->resolved = MXF_METADATA_BASE_RESOLVE_STATE_NONE; m->resolved = MXF_METADATA_BASE_RESOLVE_STATE_NONE;
} }
static void
build_values_in_hash_table (gpointer key, gpointer value, gpointer user_data)
{
GList **valuelist = (GList **) (user_data);
*valuelist = g_list_prepend (*valuelist, value);
}
#endif #endif
static GstFlowReturn static GstFlowReturn
@ -505,7 +513,7 @@ gst_mxf_demux_resolve_references (GstMXFDemux * demux)
#if GLIB_CHECK_VERSION (2, 16, 0) #if GLIB_CHECK_VERSION (2, 16, 0)
GHashTableIter iter; GHashTableIter iter;
#else #else
GList *l, *values; GList *l, *values = NULL;
#endif #endif
MXFMetadataBase *m = NULL; MXFMetadataBase *m = NULL;
GstStructure *structure; GstStructure *structure;
@ -532,6 +540,7 @@ gst_mxf_demux_resolve_references (GstMXFDemux * demux)
while (g_hash_table_iter_next (&iter, NULL, (gpointer) & m)) { while (g_hash_table_iter_next (&iter, NULL, (gpointer) & m)) {
gboolean resolved; gboolean resolved;
#else #else
g_hash_table_foreach (demux->metadata, build_values_in_hash_table, &values);
for (l = values; l; l = l->next) { for (l = values; l; l = l->next) {
gboolean resolved; gboolean resolved;
@ -641,11 +650,11 @@ gst_mxf_demux_choose_package (GstMXFDemux * demux)
for (i = 0; i < demux->preface->content_storage->n_packages; i++) { for (i = 0; i < demux->preface->content_storage->n_packages; i++) {
if (demux->preface->content_storage->packages[i] && if (demux->preface->content_storage->packages[i] &&
MXF_IS_METADATA_MATERIAL_PACKAGE (demux->preface-> MXF_IS_METADATA_MATERIAL_PACKAGE (demux->preface->content_storage->
content_storage->packages[i])) { packages[i])) {
ret = ret =
MXF_METADATA_GENERIC_PACKAGE (demux->preface-> MXF_METADATA_GENERIC_PACKAGE (demux->preface->content_storage->
content_storage->packages[i]); packages[i]);
break; break;
} }
} }
@ -805,8 +814,8 @@ gst_mxf_demux_update_essence_tracks (GstMXFDemux * demux)
essence_container); essence_container);
if (track->parent.type == MXF_METADATA_TRACK_PICTURE_ESSENCE) { if (track->parent.type == MXF_METADATA_TRACK_PICTURE_ESSENCE) {
if (MXF_IS_METADATA_GENERIC_PICTURE_ESSENCE_DESCRIPTOR (track-> if (MXF_IS_METADATA_GENERIC_PICTURE_ESSENCE_DESCRIPTOR (track->parent.
parent.descriptor[0])) descriptor[0]))
mxf_ul_to_string (&MXF_METADATA_GENERIC_PICTURE_ESSENCE_DESCRIPTOR mxf_ul_to_string (&MXF_METADATA_GENERIC_PICTURE_ESSENCE_DESCRIPTOR
(track->parent.descriptor[0])->picture_essence_coding, (track->parent.descriptor[0])->picture_essence_coding,
essence_compression); essence_compression);
@ -815,8 +824,8 @@ gst_mxf_demux_update_essence_tracks (GstMXFDemux * demux)
g_strdup_printf ("video/x-mxf-%s-%s", essence_container, g_strdup_printf ("video/x-mxf-%s-%s", essence_container,
essence_compression); essence_compression);
} else if (track->parent.type == MXF_METADATA_TRACK_SOUND_ESSENCE) { } else if (track->parent.type == MXF_METADATA_TRACK_SOUND_ESSENCE) {
if (MXF_IS_METADATA_GENERIC_SOUND_ESSENCE_DESCRIPTOR (track-> if (MXF_IS_METADATA_GENERIC_SOUND_ESSENCE_DESCRIPTOR (track->parent.
parent.descriptor[0])) descriptor[0]))
mxf_ul_to_string (&MXF_METADATA_GENERIC_SOUND_ESSENCE_DESCRIPTOR mxf_ul_to_string (&MXF_METADATA_GENERIC_SOUND_ESSENCE_DESCRIPTOR
(track->parent.descriptor[0])->sound_essence_compression, (track->parent.descriptor[0])->sound_essence_compression,
essence_compression); essence_compression);
@ -825,8 +834,8 @@ gst_mxf_demux_update_essence_tracks (GstMXFDemux * demux)
g_strdup_printf ("audio/x-mxf-%s-%s", essence_container, g_strdup_printf ("audio/x-mxf-%s-%s", essence_container,
essence_compression); essence_compression);
} else if (track->parent.type == MXF_METADATA_TRACK_DATA_ESSENCE) { } else if (track->parent.type == MXF_METADATA_TRACK_DATA_ESSENCE) {
if (MXF_IS_METADATA_GENERIC_DATA_ESSENCE_DESCRIPTOR (track-> if (MXF_IS_METADATA_GENERIC_DATA_ESSENCE_DESCRIPTOR (track->parent.
parent.descriptor[0])) descriptor[0]))
mxf_ul_to_string (&MXF_METADATA_GENERIC_DATA_ESSENCE_DESCRIPTOR mxf_ul_to_string (&MXF_METADATA_GENERIC_DATA_ESSENCE_DESCRIPTOR
(track->parent.descriptor[0])->data_essence_coding, (track->parent.descriptor[0])->data_essence_coding,
essence_compression); essence_compression);
@ -1417,8 +1426,8 @@ gst_mxf_demux_pad_set_component (GstMXFDemux * demux, GstMXFDemuxPad * pad,
pad->current_component_index); pad->current_component_index);
pad->current_component = pad->current_component =
MXF_METADATA_SOURCE_CLIP (sequence-> MXF_METADATA_SOURCE_CLIP (sequence->structural_components[pad->
structural_components[pad->current_component_index]); current_component_index]);
if (pad->current_component == NULL) { if (pad->current_component == NULL) {
GST_ERROR_OBJECT (demux, "No such structural component"); GST_ERROR_OBJECT (demux, "No such structural component");
return GST_FLOW_ERROR; return GST_FLOW_ERROR;
@ -1426,8 +1435,8 @@ gst_mxf_demux_pad_set_component (GstMXFDemux * demux, GstMXFDemuxPad * pad,
if (!pad->current_component->source_package if (!pad->current_component->source_package
|| !pad->current_component->source_package->top_level || !pad->current_component->source_package->top_level
|| !MXF_METADATA_GENERIC_PACKAGE (pad-> || !MXF_METADATA_GENERIC_PACKAGE (pad->current_component->
current_component->source_package)->tracks) { source_package)->tracks) {
GST_ERROR_OBJECT (demux, "Invalid component"); GST_ERROR_OBJECT (demux, "Invalid component");
return GST_FLOW_ERROR; return GST_FLOW_ERROR;
} }
@ -3002,8 +3011,8 @@ gst_mxf_demux_pad_set_last_stop (GstMXFDemux * demux, GstMXFDemuxPad * p,
for (i = 0; i < p->material_track->parent.sequence->n_structural_components; for (i = 0; i < p->material_track->parent.sequence->n_structural_components;
i++) { i++) {
clip = clip =
MXF_METADATA_SOURCE_CLIP (p->material_track->parent. MXF_METADATA_SOURCE_CLIP (p->material_track->parent.sequence->
sequence->structural_components[i]); structural_components[i]);
if (clip->parent.duration <= 0) if (clip->parent.duration <= 0)
break; break;

31
gst/mxf/mxfmetadata.c
View file

@ -64,8 +64,9 @@ mxf_metadata_base_resolve_default (MXFMetadataBase * self,
#if !GLIB_CHECK_VERSION (2, 16, 0) #if !GLIB_CHECK_VERSION (2, 16, 0)
static void static void
build_values_in_hash_table (gpointer key, gpointer value, GList ** valuelist) build_values_in_hash_table (gpointer key, gpointer value, gpointer user_data)
{ {
GList **valuelist = (GList **) (user_data);
*valuelist = g_list_prepend (*valuelist, value); *valuelist = g_list_prepend (*valuelist, value);
} }
#endif #endif
@ -1595,8 +1596,8 @@ mxf_metadata_material_package_resolve (MXFMetadataBase * m,
MXFMetadataTimelineTrack *tmp; MXFMetadataTimelineTrack *tmp;
if (!sc->source_package->parent.tracks[k] || if (!sc->source_package->parent.tracks[k] ||
!MXF_IS_METADATA_TIMELINE_TRACK (sc->source_package-> !MXF_IS_METADATA_TIMELINE_TRACK (sc->source_package->parent.
parent.tracks[k])) tracks[k]))
continue; continue;
tmp = tmp =
@ -3444,8 +3445,8 @@ mxf_metadata_generic_picture_essence_descriptor_handle_tag (MXFMetadataBase *
default: default:
ret = ret =
MXF_METADATA_BASE_CLASS MXF_METADATA_BASE_CLASS
(mxf_metadata_generic_picture_essence_descriptor_parent_class)-> (mxf_metadata_generic_picture_essence_descriptor_parent_class)->handle_tag
handle_tag (metadata, primer, tag, tag_data, tag_size); (metadata, primer, tag, tag_data, tag_size);
break; break;
} }
@ -3466,8 +3467,8 @@ mxf_metadata_generic_picture_essence_descriptor_to_structure (MXFMetadataBase *
{ {
GstStructure *ret = GstStructure *ret =
MXF_METADATA_BASE_CLASS MXF_METADATA_BASE_CLASS
(mxf_metadata_generic_picture_essence_descriptor_parent_class)-> (mxf_metadata_generic_picture_essence_descriptor_parent_class)->to_structure
to_structure (m); (m);
MXFMetadataGenericPictureEssenceDescriptor *self = MXFMetadataGenericPictureEssenceDescriptor *self =
MXF_METADATA_GENERIC_PICTURE_ESSENCE_DESCRIPTOR (m); MXF_METADATA_GENERIC_PICTURE_ESSENCE_DESCRIPTOR (m);
gchar str[48]; gchar str[48];
@ -3710,8 +3711,8 @@ mxf_metadata_generic_sound_essence_descriptor_handle_tag (MXFMetadataBase *
default: default:
ret = ret =
MXF_METADATA_BASE_CLASS MXF_METADATA_BASE_CLASS
(mxf_metadata_generic_sound_essence_descriptor_parent_class)-> (mxf_metadata_generic_sound_essence_descriptor_parent_class)->handle_tag
handle_tag (metadata, primer, tag, tag_data, tag_size); (metadata, primer, tag, tag_data, tag_size);
break; break;
} }
@ -3894,8 +3895,8 @@ mxf_metadata_cdci_picture_essence_descriptor_handle_tag (MXFMetadataBase *
default: default:
ret = ret =
MXF_METADATA_BASE_CLASS MXF_METADATA_BASE_CLASS
(mxf_metadata_cdci_picture_essence_descriptor_parent_class)-> (mxf_metadata_cdci_picture_essence_descriptor_parent_class)->handle_tag
handle_tag (metadata, primer, tag, tag_data, tag_size); (metadata, primer, tag, tag_data, tag_size);
break; break;
} }
@ -4077,8 +4078,8 @@ mxf_metadata_rgba_picture_essence_descriptor_handle_tag (MXFMetadataBase *
default: default:
ret = ret =
MXF_METADATA_BASE_CLASS MXF_METADATA_BASE_CLASS
(mxf_metadata_rgba_picture_essence_descriptor_parent_class)-> (mxf_metadata_rgba_picture_essence_descriptor_parent_class)->handle_tag
handle_tag (metadata, primer, tag, tag_data, tag_size); (metadata, primer, tag, tag_data, tag_size);
break; break;
} }
@ -4190,8 +4191,8 @@ mxf_metadata_generic_data_essence_descriptor_handle_tag (MXFMetadataBase *
default: default:
ret = ret =
MXF_METADATA_BASE_CLASS MXF_METADATA_BASE_CLASS
(mxf_metadata_generic_data_essence_descriptor_parent_class)-> (mxf_metadata_generic_data_essence_descriptor_parent_class)->handle_tag
handle_tag (metadata, primer, tag, tag_data, tag_size); (metadata, primer, tag, tag_data, tag_size);
break; break;
} }