mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

mxfmux: Index table segments must not use the primer pack

Browse source 
According to S377-1-2009c 9.2 the local tags must not be resolved from the
primer pack, which as a result means that there can't be any other tags than
statically assigned ones.
This commit is contained in:
Sebastian Dröge 2015-12-07 18:59:36 +02:00
parent 612f16936c
commit 01f0d16db3
3 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gst/mxf/mxfdemux.c
View file

@ -2034,8 +2034,7 @@ gst_mxf_demux_handle_index_table_segment (GstMXFDemux * demux,
segment = g_new0 (MXFIndexTableSegment, 1); segment = g_new0 (MXFIndexTableSegment, 1);
gst_buffer_map (buffer, &map, GST_MAP_READ); gst_buffer_map (buffer, &map, GST_MAP_READ);
ret = mxf_index_table_segment_parse (key, segment, ret = mxf_index_table_segment_parse (key, segment, map.data, map.size);
&demux->current_partition->primer, map.data, map.size);
gst_buffer_unmap (buffer, &map); gst_buffer_unmap (buffer, &map);
if (!ret) { if (!ret) {

16
gst/mxf/mxftypes.c
View file

@ -1061,8 +1061,7 @@ mxf_random_index_pack_to_buffer (const GArray * array)
/* SMPTE 377M 10.2.3 */ /* SMPTE 377M 10.2.3 */
gboolean gboolean
mxf_index_table_segment_parse (const MXFUL * ul, mxf_index_table_segment_parse (const MXFUL * ul,
MXFIndexTableSegment * segment, const MXFPrimerPack * primer, MXFIndexTableSegment * segment, const guint8 * data, guint size)
const guint8 * data, guint size)
{ {
#ifndef GST_DISABLE_GST_DEBUG #ifndef GST_DISABLE_GST_DEBUG
gchar str[48]; gchar str[48];
@ -1072,7 +1071,6 @@ mxf_index_table_segment_parse (const MXFUL * ul,
g_return_val_if_fail (ul != NULL, FALSE); g_return_val_if_fail (ul != NULL, FALSE);
g_return_val_if_fail (data != NULL, FALSE); g_return_val_if_fail (data != NULL, FALSE);
g_return_val_if_fail (primer != NULL, FALSE);
memset (segment, 0, sizeof (MXFIndexTableSegment)); memset (segment, 0, sizeof (MXFIndexTableSegment));
@ -1265,12 +1263,9 @@ mxf_index_table_segment_parse (const MXFUL * ul,
break; break;
} }
default: default:
if (!primer->mappings) { GST_WARNING
GST_WARNING ("No valid primer pack for this partition"); ("Unknown local tag 0x%04x of size %d in index table segment", tag,
} else if (!mxf_local_tag_add_to_hash_table (primer, tag, tag_data, tag_size);
tag_size, &segment->other_tags)) {
goto error;
}
break; break;
} }
@ -1301,9 +1296,6 @@ mxf_index_table_segment_reset (MXFIndexTableSegment * segment)
g_free (segment->index_entries); g_free (segment->index_entries);
g_free (segment->delta_entries); g_free (segment->delta_entries);
if (segment->other_tags)
g_hash_table_destroy (segment->other_tags);
memset (segment, 0, sizeof (MXFIndexTableSegment)); memset (segment, 0, sizeof (MXFIndexTableSegment));
} }

5
gst/mxf/mxftypes.h
View file

@ -170,7 +170,8 @@ typedef struct {
guint32 n_index_entries; guint32 n_index_entries;
MXFIndexEntry *index_entries; MXFIndexEntry *index_entries;
GHashTable *other_tags; /* FIXME: The stream_offset is only used by mxfdemux
* and not part of the standard, and used wrong */
guint64 stream_offset; guint64 stream_offset;
} MXFIndexTableSegment; } MXFIndexTableSegment;
@ -254,7 +255,7 @@ GstBuffer * mxf_primer_pack_to_buffer (const MXFPrimerPack *pack);
gboolean mxf_random_index_pack_parse (const MXFUL *ul, const guint8 *data, guint size, GArray **array); gboolean mxf_random_index_pack_parse (const MXFUL *ul, const guint8 *data, guint size, GArray **array);
GstBuffer * mxf_random_index_pack_to_buffer (const GArray *array); GstBuffer * mxf_random_index_pack_to_buffer (const GArray *array);
gboolean mxf_index_table_segment_parse (const MXFUL *ul, MXFIndexTableSegment *segment, const MXFPrimerPack *primer, const guint8 *data, guint size); gboolean mxf_index_table_segment_parse (const MXFUL *ul, MXFIndexTableSegment *segment, const guint8 *data, guint size);
void mxf_index_table_segment_reset (MXFIndexTableSegment *segment); void mxf_index_table_segment_reset (MXFIndexTableSegment *segment);
gboolean mxf_local_tag_parse (const guint8 * data, guint size, guint16 * tag, gboolean mxf_local_tag_parse (const guint8 * data, guint size, guint16 * tag,