FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

mxfdemux: Don't use generic metadata parsers for unknown metadata, the results are useless anyway

Browse Source
This commit is contained in:
Sebastian Dröge 2009-02-15 09:51:25 +01:00
parent 571d51ac92
commit 2a93712ea1
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gst/mxf/mxfdemux.c
View File

@ -1220,8 +1220,9 @@ gst_mxf_demux_handle_metadata (GstMXFDemux * demux, const MXFUL * key,
GST_BUFFER_DATA (buffer), GST_BUFFER_SIZE (buffer)); GST_BUFFER_DATA (buffer), GST_BUFFER_SIZE (buffer));
if (!metadata) { if (!metadata) {
GST_ERROR_OBJECT (demux, "Parsing metadata failed"); GST_WARNING_OBJECT (demux,
return GST_FLOW_ERROR; "Unknown or unhandled metadata of type 0x%04x", type);
return GST_FLOW_OK;
} }
old = old =

3
gst/mxf/mxfdms1.c
View File

@ -37,7 +37,7 @@
GST_DEBUG_CATEGORY_EXTERN (mxf_debug); GST_DEBUG_CATEGORY_EXTERN (mxf_debug);
#define GST_CAT_DEFAULT mxf_debug #define GST_CAT_DEFAULT mxf_debug
G_DEFINE_TYPE (MXFDMS1, mxf_dms1, MXF_TYPE_DESCRIPTIVE_METADATA); G_DEFINE_ABSTRACT_TYPE (MXFDMS1, mxf_dms1, MXF_TYPE_DESCRIPTIVE_METADATA);
static gboolean static gboolean
mxf_dms1_handle_tag (MXFMetadataBase * metadata, MXFPrimerPack * primer, mxf_dms1_handle_tag (MXFMetadataBase * metadata, MXFPrimerPack * primer,
@ -5558,7 +5558,6 @@ mxf_dms1_initialize (void)
GSList *dms1_sets = NULL; GSList *dms1_sets = NULL;
MXFDescriptiveMetadataSet *set; MXFDescriptiveMetadataSet *set;
ADD_SET (0x000000, MXF_TYPE_DMS1);
/* SMPTE S380M Table 3 */ /* SMPTE S380M Table 3 */
ADD_SET (0x010100, MXF_TYPE_DMS1_PRODUCTION_FRAMEWORK); ADD_SET (0x010100, MXF_TYPE_DMS1_PRODUCTION_FRAMEWORK);
ADD_SET (0x010200, MXF_TYPE_DMS1_CLIP_FRAMEWORK); ADD_SET (0x010200, MXF_TYPE_DMS1_CLIP_FRAMEWORK);

6
gst/mxf/mxfmetadata.c
View File

@ -131,7 +131,7 @@ mxf_metadata_base_resolve (MXFMetadataBase * self, GHashTable * metadata)
return ret; return ret;
} }
G_DEFINE_TYPE (MXFMetadata, mxf_metadata, MXF_TYPE_METADATA_BASE); G_DEFINE_ABSTRACT_TYPE (MXFMetadata, mxf_metadata, MXF_TYPE_METADATA_BASE);
static gboolean static gboolean
mxf_metadata_handle_tag (MXFMetadataBase * metadata, MXFPrimerPack * primer, mxf_metadata_handle_tag (MXFMetadataBase * metadata, MXFPrimerPack * primer,
@ -286,7 +286,7 @@ mxf_metadata_new (guint16 type, MXFPrimerPack * primer, guint64 offset,
GST_WARNING GST_WARNING
("No handler for type 0x%04x found -- using generic metadata parser", ("No handler for type 0x%04x found -- using generic metadata parser",
type); type);
t = MXF_TYPE_METADATA; return NULL;
} }
@ -3444,8 +3444,6 @@ mxf_descriptive_metadata_new (guint8 scheme, guint32 type,
if (set->id == type) { if (set->id == type) {
t = set->type; t = set->type;
break; break;
} else if (set->id == 0x000000) {
t = set->type;
} }
} }