From 7dad262671187956c64a892d13c8eb89bad0a936 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <slomo@circular-chaos.org>
Date: Mon, 5 Jan 2009 13:41:07 +0000
Subject: gst/mxf/: "Generation UID" and "This Generation UID" are different so
 handle them different. Also both are not part o...

Original commit message from CVS:
* gst/mxf/Makefile.am:
* gst/mxf/mxfdemux.c:
* gst/mxf/mxfmetadata.c: (mxf_metadata_handle_tag),
(mxf_metadata_preface_handle_tag),
(mxf_metadata_identification_handle_tag),
(mxf_metadata_content_storage_handle_tag),
(mxf_metadata_essence_container_data_handle_tag),
(mxf_metadata_generic_package_handle_tag),
(mxf_metadata_track_handle_tag),
(mxf_metadata_sequence_handle_tag),
(mxf_metadata_structural_component_handle_tag),
(mxf_metadata_generic_descriptor_handle_tag),
(mxf_metadata_locator_handle_tag),
(mxf_metadata_locator_class_init):
* gst/mxf/mxfmetadata.h:
"Generation UID" and "This Generation UID" are different so handle
them different. Also both are not part of every metadata type.
---
 gst/mxf/mxfmetadata.h | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

(limited to 'gst/mxf/mxfmetadata.h')

diff --git a/gst/mxf/mxfmetadata.h b/gst/mxf/mxfmetadata.h
index f0797572..e5c455e8 100644
--- a/gst/mxf/mxfmetadata.h
+++ b/gst/mxf/mxfmetadata.h
@@ -343,7 +343,6 @@ struct _MXFMetadataBase {
   GstMiniObject parent;
 
   MXFUL instance_uid;
-  MXFUL generation_uid;
 
   MXFMetadataBaseResolveState resolved;
 
@@ -366,6 +365,8 @@ struct _MXFMetadata {
 struct _MXFMetadataPreface {
   MXFMetadata parent;
 
+  MXFUL generation_uid;
+
   MXFTimestamp last_modified_date;
   guint16 version;
 
@@ -393,6 +394,8 @@ struct _MXFMetadataPreface {
 struct _MXFMetadataIdentification {
   MXFMetadata parent;
 
+  MXFUL this_generation_uid;
+
   gchar *company_name;
 
   gchar *product_name;
@@ -412,6 +415,8 @@ struct _MXFMetadataIdentification {
 struct _MXFMetadataContentStorage {
   MXFMetadata parent;
 
+  MXFUL generation_uid;
+
   guint32 n_packages;
   MXFUL *packages_uids;
   MXFMetadataGenericPackage **packages;
@@ -424,6 +429,8 @@ struct _MXFMetadataContentStorage {
 struct _MXFMetadataEssenceContainerData {
   MXFMetadata parent;
 
+  MXFUL generation_uid;
+
   MXFUMID linked_package_uid;
   MXFMetadataSourcePackage *linked_package;
 
@@ -434,6 +441,8 @@ struct _MXFMetadataEssenceContainerData {
 struct _MXFMetadataGenericPackage {
   MXFMetadata parent;
 
+  MXFUL generation_uid;
+
   MXFUMID package_uid;
 
   gchar *name;
@@ -477,6 +486,8 @@ typedef enum {
 struct _MXFMetadataTrack {
   MXFMetadata parent;
 
+  MXFUL generation_uid;
+
   guint32 track_id;
   guint32 track_number;
 
@@ -508,6 +519,8 @@ struct _MXFMetadataEventTrack {
 struct _MXFMetadataSequence {
   MXFMetadata parent;
 
+  MXFUL generation_uid;
+
   MXFUL data_definition;
 
   gint64 duration;
@@ -520,6 +533,8 @@ struct _MXFMetadataSequence {
 struct _MXFMetadataStructuralComponent {
   MXFMetadata parent;
 
+  MXFUL generation_uid;
+
   MXFUL data_definition;
   gint64 duration;
 };
@@ -565,6 +580,8 @@ struct _MXFMetadataDMSegment {
 struct _MXFMetadataGenericDescriptor {
   MXFMetadata parent;
 
+  MXFUL generation_uid;
+
   guint32 n_locators;
   MXFUL *locators_uids;
   MXFMetadataLocator **locators;
@@ -681,6 +698,8 @@ struct _MXFMetadataMultipleDescriptor {
 
 struct _MXFMetadataLocator {
   MXFMetadata parent;
+
+  MXFUL generation_uid;
 };
 
 struct _MXFMetadataNetworkLocator {
-- 
cgit v1.2.1