[FFmpeg-soc] [soc]: r3322 - mxf/mxfenc.c

[spyfeng]

Author: spyfeng
Date: Fri Aug 15 12:01:18 2008
New Revision: 3322

Log:
modify sequence references and instance uids


Modified:
   mxf/mxfenc.c

Modified: mxf/mxfenc.c
==============================================================================
--- mxf/mxfenc.c	(original)
+++ mxf/mxfenc.c	Fri Aug 15 12:01:18 2008
@@ -572,14 +572,12 @@ static int mxf_write_track(AVFormatConte
     put_be64(pb, 0);
 
     // write sequence refs
-    if (mxf_generate_reference(s, &sc->sequence_refs, 1) < 0)
-        return -1;
     mxf_write_local_tag(pb, 16, 0x4803);
-    put_buffer(pb, *sc->sequence_refs, 16);
+    mxf_write_uuid(pb, Sequence * Track * type, stream_index);
     return 0;
 }
 
-static int mxf_write_sequence(AVFormatContext *s, KLVPacket *klv, int stream_index)
+static int mxf_write_sequence(AVFormatContext *s, KLVPacket *klv, int stream_index, enum MXFMetadataSetType type)
 {
     MXFContext *mxf = s->priv_data;
     ByteIOContext *pb = s->pb;
@@ -596,11 +594,11 @@ static int mxf_write_sequence(AVFormatCo
     sc = st->priv_data;
 
     mxf_write_local_tag(pb, 16, 0x3C0A);
-    put_buffer(pb, *sc->sequence_refs, 16);
+    mxf_write_uuid(pb, Sequence * Track * type, stream_index);
 
 #ifdef DEBUG
     PRINT_KEY(s, "sequence key", klv->key);
-    PRINT_KEY(s, "sequence uid", *sc->sequence_refs);
+    PRINT_KEY(s, "sequence uid", pb->buf_ptr - 16);
 #endif
     // find data define uls
     data_def_ul = mxf_get_data_definition_ul(st->codec->codec_type);
@@ -823,7 +821,7 @@ static int mxf_build_structural_metadata
         ret = mxf_write_track(s, klv, i, type);
         if ( ret < 0)
             goto fail;
-        ret = mxf_write_sequence(s, klv, i);
+        ret = mxf_write_sequence(s, klv, i, type);
         if ( ret < 0)
             goto fail;
         ret = mxf_write_structural_component(s, klv, i, type);