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

Cleanup playback package selection and notify about the current package

Browse source
This commit is contained in:
Sebastian Dröge 2009-02-02 17:44:33 +01:00
parent 5277650a20
commit 18e2ffa484
1 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
gst/mxf/mxfdemux.c
View file

@ -603,26 +603,25 @@ gst_mxf_demux_choose_package (GstMXFDemux * demux)
guint i; guint i;
if (demux->requested_package_string) { if (demux->requested_package_string) {
MXFUMID umid; MXFUMID umid = { {0,}
};
if (!mxf_umid_from_string (demux->requested_package_string, &umid)) { if (!mxf_umid_from_string (demux->requested_package_string, &umid)) {
GST_ERROR_OBJECT (demux, "Invalid requested package"); GST_ERROR_OBJECT (demux, "Invalid requested package");
} else {
if (memcmp (&umid, &demux->current_package_uid, 32) != 0) {
gst_mxf_demux_remove_pads (demux);
memcpy (&demux->current_package_uid, &umid, 32);
}
} }
g_free (demux->requested_package_string); g_free (demux->requested_package_string);
demux->requested_package_string = NULL; demux->requested_package_string = NULL;
ret = gst_mxf_demux_find_package (demux, &umid);
} }
if (!mxf_umid_is_zero (&demux->current_package_uid)) if (!ret && !mxf_umid_is_zero (&demux->current_package_uid))
ret = gst_mxf_demux_find_package (demux, &demux->current_package_uid); ret = gst_mxf_demux_find_package (demux, &demux->current_package_uid);
if (ret && (MXF_IS_METADATA_MATERIAL_PACKAGE (ret) if (ret && (MXF_IS_METADATA_MATERIAL_PACKAGE (ret)
|| (MXF_IS_METADATA_SOURCE_PACKAGE (ret) || (MXF_IS_METADATA_SOURCE_PACKAGE (ret)
&& MXF_METADATA_SOURCE_PACKAGE (ret)->top_level))) && MXF_METADATA_SOURCE_PACKAGE (ret)->top_level)))
return ret; goto done;
else if (ret) else if (ret)
GST_WARNING_OBJECT (demux, GST_WARNING_OBJECT (demux,
"Current package is not a material package or top-level source package, choosing the first best"); "Current package is not a material package or top-level source package, choosing the first best");
@ -630,12 +629,12 @@ gst_mxf_demux_choose_package (GstMXFDemux * demux)
GST_WARNING_OBJECT (demux, GST_WARNING_OBJECT (demux,
"Current package not found, choosing the first best"); "Current package not found, choosing the first best");
if (demux->preface->primary_package) ret = demux->preface->primary_package;
ret = demux->preface->primary_package;
if (ret && (MXF_IS_METADATA_MATERIAL_PACKAGE (ret) if (ret && (MXF_IS_METADATA_MATERIAL_PACKAGE (ret)
|| (MXF_IS_METADATA_SOURCE_PACKAGE (ret) || (MXF_IS_METADATA_SOURCE_PACKAGE (ret)
&& MXF_METADATA_SOURCE_PACKAGE (ret)->top_level))) && MXF_METADATA_SOURCE_PACKAGE (ret)->top_level)))
return ret; goto done;
ret = NULL;
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] &&
@ -653,10 +652,18 @@ gst_mxf_demux_choose_package (GstMXFDemux * demux)
return NULL; return NULL;
} }
memcpy (&demux->current_package_uid, &ret->package_uid, 32); done:
if (memcmp (&ret->package_uid, &demux->current_package_uid, 32) != 0) {
gchar current_package_string[96];
if (!ret) gst_mxf_demux_remove_pads (demux);
GST_ERROR_OBJECT (demux, "No suitable package found"); memcpy (&demux->current_package_uid, &ret->package_uid, 32);
mxf_umid_to_string (&ret->package_uid, current_package_string);
demux->current_package = ret;
demux->current_package_string = g_strdup (current_package_string);
g_object_notify (G_OBJECT (demux), "package");
}
return ret; return ret;
} }
@ -853,7 +860,6 @@ gst_mxf_demux_update_tracks (GstMXFDemux * demux)
} }
first_run = (demux->src == NULL); first_run = (demux->src == NULL);
demux->current_package = current_package;
for (i = 0; i < current_package->n_tracks; i++) { for (i = 0; i < current_package->n_tracks; i++) {
MXFMetadataTimelineTrack *track = NULL; MXFMetadataTimelineTrack *track = NULL;