[FFmpeg-soc] [soc]: r3316 - in mxf: mxf.h mxfenc.c

[spyfeng]

Author: spyfeng
Date: Fri Aug 15 10:31:22 2008
New Revision: 3316

Log:
modify wrting Identification reference and instance uid


Modified:
   mxf/mxf.h
   mxf/mxfenc.c

Modified: mxf/mxf.h
==============================================================================
--- mxf/mxf.h	(original)
+++ mxf/mxf.h	Fri Aug 15 10:31:22 2008
@@ -38,6 +38,7 @@ enum MXFMetadataSetType {
     Track,
     CryptoContext,
     Preface,
+    Identification,
 };
 
 typedef struct {

Modified: mxf/mxfenc.c
==============================================================================
--- mxf/mxfenc.c	(original)
+++ mxf/mxfenc.c	Fri Aug 15 10:31:22 2008
@@ -350,10 +350,9 @@ static int mxf_write_preface(AVFormatCon
     put_be16(pb, 1);
 
     // write identification_refs
-    if (mxf_generate_reference(s, &refs->identification, 1) < 0)
-        return -1;
     mxf_write_local_tag(pb, 16 + 8, 0x3B06);
-    mxf_write_reference(pb, 1, *refs->identification);
+    mxf_write_refs_count(pb, 1);
+    mxf_write_uuid(pb, Identification, 0);
 
     // write content_storage_refs
     if (mxf_generate_reference(s, &refs->content_storage, 1) < 0)
@@ -398,10 +397,10 @@ static int mxf_write_identification(AVFo
 
     // write uid
     mxf_write_local_tag(pb, 16, 0x3C0A);
-    put_buffer(pb, *refs->identification, 16);
+    mxf_write_uuid(pb, Identification, 0);
 #ifdef DEBUG
     PRINT_KEY(s, "identification key", klv->key);
-    PRINT_KEY(s, "identification uid", *refs->identification);
+    PRINT_KEY(s, "identification uid", pb->buf_ptr - 16);
 #endif
     // write generation uid
     mxf_generate_uuid(s, uid);