summaryrefslogtreecommitdiffstats
path: root/gst/mxf
diff options
context:
space:
mode:
Diffstat (limited to 'gst/mxf')
-rw-r--r--gst/mxf/mxfdemux.c5
-rw-r--r--gst/mxf/mxfdms1.c3
-rw-r--r--gst/mxf/mxfmetadata.c6
3 files changed, 6 insertions, 8 deletions
diff --git a/gst/mxf/mxfdemux.c b/gst/mxf/mxfdemux.c
index 6dfc93a8..d1badaf0 100644
--- a/gst/mxf/mxfdemux.c
+++ b/gst/mxf/mxfdemux.c
@@ -1220,8 +1220,9 @@ gst_mxf_demux_handle_metadata (GstMXFDemux * demux, const MXFUL * key,
GST_BUFFER_DATA (buffer), GST_BUFFER_SIZE (buffer));
if (!metadata) {
- GST_ERROR_OBJECT (demux, "Parsing metadata failed");
- return GST_FLOW_ERROR;
+ GST_WARNING_OBJECT (demux,
+ "Unknown or unhandled metadata of type 0x%04x", type);
+ return GST_FLOW_OK;
}
old =
diff --git a/gst/mxf/mxfdms1.c b/gst/mxf/mxfdms1.c
index 1433262f..86adf473 100644
--- a/gst/mxf/mxfdms1.c
+++ b/gst/mxf/mxfdms1.c
@@ -37,7 +37,7 @@
GST_DEBUG_CATEGORY_EXTERN (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
mxf_dms1_handle_tag (MXFMetadataBase * metadata, MXFPrimerPack * primer,
@@ -5558,7 +5558,6 @@ mxf_dms1_initialize (void)
GSList *dms1_sets = NULL;
MXFDescriptiveMetadataSet *set;
- ADD_SET (0x000000, MXF_TYPE_DMS1);
/* SMPTE S380M Table 3 */
ADD_SET (0x010100, MXF_TYPE_DMS1_PRODUCTION_FRAMEWORK);
ADD_SET (0x010200, MXF_TYPE_DMS1_CLIP_FRAMEWORK);
diff --git a/gst/mxf/mxfmetadata.c b/gst/mxf/mxfmetadata.c
index aa479f37..9826cd7b 100644
--- a/gst/mxf/mxfmetadata.c
+++ b/gst/mxf/mxfmetadata.c
@@ -131,7 +131,7 @@ mxf_metadata_base_resolve (MXFMetadataBase * self, GHashTable * metadata)
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
mxf_metadata_handle_tag (MXFMetadataBase * metadata, MXFPrimerPack * primer,
@@ -286,7 +286,7 @@ mxf_metadata_new (guint16 type, MXFPrimerPack * primer, guint64 offset,
GST_WARNING
("No handler for type 0x%04x found -- using generic metadata parser",
type);
- t = MXF_TYPE_METADATA;
+ return NULL;
}
@@ -3444,8 +3444,6 @@ mxf_descriptive_metadata_new (guint8 scheme, guint32 type,
if (set->id == type) {
t = set->type;
break;
- } else if (set->id == 0x000000) {
- t = set->type;
}
}