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

Improve detection of the end of the header metadata

Browse source 
Header metadata is finished after partition.header_byte_count
bytes after the first byte of the primer pack are handled.
After this there can only be index table segments, filler packets,
essence or the start of the next partition.

This fixes playback of some files that have non-standard metadata
packets in the header metadata.
This commit is contained in:
Sebastian Dröge 2009-01-26 14:33:02 +01:00
parent 6a0a9fc01e
commit 264e30abb9
2 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
gst/mxf/mxfdemux.c
View file

@ -490,6 +490,8 @@ gst_mxf_demux_handle_primer_pack (GstMXFDemux * demux, const MXFUL * key,
return GST_FLOW_ERROR; return GST_FLOW_ERROR;
} }
demux->current_partition->primer.offset = demux->offset;
return GST_FLOW_OK; return GST_FLOW_OK;
} }
@ -605,11 +607,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;
} }
} }
@ -1084,8 +1086,8 @@ gst_mxf_demux_pad_next_component (GstMXFDemux * demux, GstMXFDemuxPad * pad)
GST_DEBUG_OBJECT (demux, "Switching to component %u", pad->current_component); GST_DEBUG_OBJECT (demux, "Switching to component %u", pad->current_component);
pad->component = pad->component =
MXF_METADATA_SOURCE_CLIP (sequence-> MXF_METADATA_SOURCE_CLIP (sequence->structural_components[pad->
structural_components[pad->current_component]); current_component]);
if (pad->component == NULL) { if (pad->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;
@ -1093,8 +1095,8 @@ gst_mxf_demux_pad_next_component (GstMXFDemux * demux, GstMXFDemuxPad * pad)
if (!pad->component->source_package if (!pad->component->source_package
|| !pad->component->source_package->top_level || !pad->component->source_package->top_level
|| !MXF_METADATA_GENERIC_PACKAGE (pad->component->source_package)-> || !MXF_METADATA_GENERIC_PACKAGE (pad->component->
tracks) { source_package)->tracks) {
GST_ERROR_OBJECT (demux, "Invalid component"); GST_ERROR_OBJECT (demux, "Invalid component");
return GST_FLOW_ERROR; return GST_FLOW_ERROR;
} }
@ -1696,7 +1698,9 @@ next_try:
} }
/* parse metadata */ /* parse metadata */
while (TRUE) { while (demux->offset <
demux->run_in + demux->current_partition->primer.offset +
demux->current_partition->partition.header_byte_count) {
ret = ret =
gst_mxf_demux_pull_klv_packet (demux, demux->offset, &key, &buffer, gst_mxf_demux_pull_klv_packet (demux, demux->offset, &key, &buffer,
&read); &read);
@ -1732,7 +1736,9 @@ next_try:
gst_buffer_unref (buffer); gst_buffer_unref (buffer);
buffer = NULL; buffer = NULL;
} else { } else {
break; demux->offset += read;
gst_buffer_unref (buffer);
buffer = NULL;
} }
} }
@ -1768,8 +1774,9 @@ gst_mxf_demux_handle_klv_packet (GstMXFDemux * demux, const MXFUL * key,
if (demux->update_metadata if (demux->update_metadata
&& demux->preface && demux->preface
&& !mxf_is_metadata (key) && !mxf_is_descriptive_metadata (key) && demux->offset >=
&& !mxf_is_fill (key)) { demux->run_in + demux->current_partition->primer.offset +
demux->current_partition->partition.header_byte_count) {
demux->current_partition->parsed_metadata = TRUE; demux->current_partition->parsed_metadata = TRUE;
if ((ret = if ((ret =
gst_mxf_demux_handle_header_metadata_resolve_references (demux)) != gst_mxf_demux_handle_header_metadata_resolve_references (demux)) !=

1
gst/mxf/mxftypes.h
View file

@ -112,6 +112,7 @@ typedef struct {
/* SMPTE 377M 8.1 */ /* SMPTE 377M 8.1 */
typedef struct { typedef struct {
guint64 offset;
GHashTable *mappings; GHashTable *mappings;
} MXFPrimerPack; } MXFPrimerPack;