typedef struct {
UID track_essence_element_key;
- const UID *essence_container_ul;
+ int index; //<<< index in mxf_essence_container_uls table
const UID *codec_ul;
int64_t duration;
} MXFStreamContext;
UID element_ul;
UID codec_ul;
enum CodecID id;
-} MXFContainerEssencePair;
+ void (*write_desc)();
+} MXFContainerEssenceEntry;
-static const MXFContainerEssencePair mxf_essence_container_uls[] = {
+static void mxf_write_wav_desc(AVFormatContext *s, AVStream *st);
+static void mxf_write_mpegvideo_desc(AVFormatContext *s, AVStream *st);
+
+static const MXFContainerEssenceEntry mxf_essence_container_uls[] = {
{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x02,0x0D,0x01,0x03,0x01,0x02,0x04,0x60,0x01 },
{ 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x15,0x01,0x05,0x00 },
- { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x00,0x00,0x00 }, CODEC_ID_MPEG2VIDEO },
+ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x00,0x00,0x00 },
+ CODEC_ID_MPEG2VIDEO, mxf_write_mpegvideo_desc },
{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x06,0x01,0x00 },
{ 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x16,0x01,0x01,0x00 },
- { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x01,0x00,0x00,0x00,0x00 }, CODEC_ID_PCM_S16LE },
+ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x01,0x00,0x00,0x00,0x00 },
+ CODEC_ID_PCM_S16LE, mxf_write_wav_desc },
{ { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 },
{ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 },
- { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }, CODEC_ID_NONE },
+ { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 },
+ CODEC_ID_NONE, NULL },
};
typedef struct MXFContext {
- int64_t header_byte_count;
- int64_t header_byte_count_offset;
- int64_t header_footer_partition_offset;
+ int64_t footer_partition_offset;
int essence_container_count;
- uint8_t essence_containers_indices[sizeof(mxf_essence_container_uls)/
- sizeof(*mxf_essence_container_uls)];
+ uint8_t essence_containers_indices[FF_ARRAY_ELEMS(mxf_essence_container_uls)];
} MXFContext;
-typedef struct {
- const UID key;
- void (*write)();
- enum CodecType type;
-} MXFDescriptorWriteTableEntry;
-
static const uint8_t uuid_base[] = { 0xAD,0xAB,0x44,0x24,0x2f,0x25,0x4d,0xc7,0x92,0xff,0x29,0xbd };
-static const uint8_t umid_base[] = { 0x06,0x0A,0x2B,0x34,0x01,0x01,0x01,0x01,0x01,0x01,0x0F,0x00,0x13,0x00,0x00,0x00 };
+static const uint8_t umid_base[] = { 0x06,0x0A,0x2B,0x34,0x01,0x01,0x01,0x05,0x01,0x01,0x0D,0x00,0x13,0x00,0x00,0x00 };
/**
* complete key for operation pattern, partitions, and primer pack
*/
static const uint8_t op1a_ul[] = { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x02,0x01,0x01,0x01,0x01,0x00 };
-static const uint8_t header_partition_key[] = { 0x06,0x0E,0x2B,0x34,0x02,0x05,0x01,0x01,0x0D,0x01,0x02,0x01,0x01,0x02,0x04,0x00 }; // ClosedComplete
static const uint8_t footer_partition_key[] = { 0x06,0x0E,0x2B,0x34,0x02,0x05,0x01,0x01,0x0D,0x01,0x02,0x01,0x01,0x04,0x04,0x00 }; // ClosedComplete
static const uint8_t primer_pack_key[] = { 0x06,0x0E,0x2B,0x34,0x02,0x05,0x01,0x01,0x0D,0x01,0x02,0x01,0x01,0x05,0x01,0x00 };
+
+static const uint8_t header_open_partition_key[] = { 0x06,0x0E,0x2B,0x34,0x02,0x05,0x01,0x01,0x0D,0x01,0x02,0x01,0x01,0x02,0x01,0x00 }; // OpenIncomplete
+static const uint8_t header_closed_partition_key[] = { 0x06,0x0E,0x2B,0x34,0x02,0x05,0x01,0x01,0x0D,0x01,0x02,0x01,0x01,0x02,0x04,0x00 }; // ClosedComplete
+
/**
* partial key for header metadata
*/
{ 0x0202, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x07,0x02,0x02,0x01,0x01,0x03,0x00,0x00}}, /* Duration */
{ 0x1001, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x06,0x01,0x01,0x04,0x06,0x09,0x00,0x00}}, /* Structural Components reference array */
// Source Clip
- { 0x1201, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x05,0x07,0x02,0x01,0x03,0x01,0x0A,0x00,0x00}}, /* Start position */
+ { 0x1201, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x05,0x07,0x02,0x01,0x03,0x01,0x04,0x00,0x00}}, /* Start position */
{ 0x1101, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x06,0x01,0x01,0x03,0x01,0x00,0x00,0x00}}, /* SourcePackageID */
{ 0x1102, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x06,0x01,0x01,0x03,0x02,0x00,0x00,0x00}}, /* SourceTrackID */
// File Descriptor
{ 0x3D03, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x05,0x04,0x02,0x03,0x01,0x01,0x01,0x00,0x00}}, /* Audio sampling rate */
{ 0x3D07, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x05,0x04,0x02,0x01,0x01,0x04,0x00,0x00,0x00}}, /* ChannelCount */
{ 0x3D01, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x04,0x04,0x02,0x03,0x03,0x04,0x00,0x00,0x00}}, /* Quantization bits */
- { 0x3D06, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x04,0x01,0x06,0x01,0x00,0x00,0x00,0x00}}, /* Sound Essence Compression */
+ { 0x3D06, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x04,0x02,0x04,0x02,0x00,0x00,0x00,0x00}}, /* Sound Essence Compression */
};
-static void mxf_write_uuid(ByteIOContext *pb, enum CodecID type, int value)
+static void mxf_write_uuid(ByteIOContext *pb, enum MXFMetadataSetType type, int value)
{
put_buffer(pb, uuid_base, 12);
put_be16(pb, type);
put_be16(pb, value);
}
-static void mxf_write_umid(ByteIOContext *pb, enum CodecID type, int value)
+static void mxf_write_umid(ByteIOContext *pb, enum MXFMetadataSetType type, int value)
{
put_buffer(pb, umid_base, 16);
mxf_write_uuid(pb, type, value);
}
/*
- * Get essence container ul and return its index position
+ * Get essence container ul index
*/
-static const UID *mxf_get_essence_container_ul(enum CodecID type, int *index)
+static int mxf_get_essence_container_ul_index(enum CodecID id)
{
- const MXFContainerEssencePair *uls = mxf_essence_container_uls;
- for (*index = 0; *index < sizeof(mxf_essence_container_uls)/
- sizeof(*mxf_essence_container_uls); (*index)++)
- if (mxf_essence_container_uls[*index].id == type)
- return &uls->container_ul;
- *index = -1;
- return NULL;
+ int i;
+ for (i = 0; i < FF_ARRAY_ELEMS(mxf_essence_container_uls); i++)
+ if (mxf_essence_container_uls[i].id == id)
+ return i;
+ return -1;
}
static void mxf_write_primer_pack(AVFormatContext *s)
ByteIOContext *pb = s->pb;
int local_tag_number, i = 0;
- local_tag_number = sizeof(mxf_local_tag_batch)/sizeof(*mxf_local_tag_batch);
+ local_tag_number = FF_ARRAY_ELEMS(mxf_local_tag_batch);
put_buffer(pb, primer_pack_key, 16);
klv_encode_ber_length(pb, local_tag_number * 18 + 8);
mxf_write_uuid(pb, SourcePackage, 0);
}
-static void mxf_write_package(AVFormatContext *s, enum MXFMetadataSetType type)
-{
- ByteIOContext *pb = s->pb;
- int i;
-
- if (type == MaterialPackage) {
- mxf_write_metadata_key(pb, 0x013600);
- PRINT_KEY(s, "Material Package key", pb->buf_ptr - 16);
- klv_encode_ber_length(pb, 92 + 16 * s->nb_streams);
- } else {
- mxf_write_metadata_key(pb, 0x013700);
- PRINT_KEY(s, "Source Package key", pb->buf_ptr - 16);
- klv_encode_ber_length(pb, 112 + 16 * s->nb_streams); // 20 bytes length for descriptor reference
- }
-
- // write uid
- mxf_write_local_tag(pb, 16, 0x3C0A);
- mxf_write_uuid(pb, type, 0);
- av_log(s,AV_LOG_DEBUG, "package type:%d\n", type);
- PRINT_KEY(s, "package uid", pb->buf_ptr - 16);
-
- // write package umid
- mxf_write_local_tag(pb, 32, 0x4401);
- mxf_write_umid(pb, type, 0);
- PRINT_KEY(s, "package umid second part", pb->buf_ptr - 16);
-
- // write create date
- mxf_write_local_tag(pb, 8, 0x4405);
- put_be64(pb, 0);
-
- // write modified date
- mxf_write_local_tag(pb, 8, 0x4404);
- put_be64(pb, 0);
-
- // write track refs
- mxf_write_local_tag(pb, s->nb_streams * 16 + 8, 0x4403);
- mxf_write_refs_count(pb, s->nb_streams);
- for (i = 0; i < s->nb_streams; i++)
- mxf_write_uuid(pb, type == MaterialPackage ? Track : Track + TypeBottom, i);
-
- // write multiple descriptor reference
- if (type == SourcePackage) {
- mxf_write_local_tag(pb, 16, 0x4701);
- mxf_write_uuid(pb, MultipleDescriptor, 0);
- }
-}
-
static void mxf_write_track(AVFormatContext *s, AVStream *st, enum MXFMetadataSetType type)
{
ByteIOContext *pb = s->pb;
mxf_write_uuid(pb, SubDescriptor, i);
}
-static void mxf_write_generic_desc(ByteIOContext *pb, const MXFDescriptorWriteTableEntry *desc_tbl, AVStream *st)
+static void mxf_write_generic_desc(ByteIOContext *pb, AVStream *st, const UID key)
{
MXFStreamContext *sc = st->priv_data;
- put_buffer(pb, desc_tbl->key, 16);
+ put_buffer(pb, key, 16);
klv_encode_ber_length(pb, 108);
mxf_write_local_tag(pb, 16, 0x3C0A);
put_be32(pb, st->time_base.num);
mxf_write_local_tag(pb, 16, 0x3004);
- put_buffer(pb, *sc->essence_container_ul, 16);
+ put_buffer(pb, mxf_essence_container_uls[sc->index].container_ul, 16);
mxf_write_local_tag(pb, 16, 0x3201);
put_buffer(pb, *sc->codec_ul, 16);
}
-static void mxf_write_mpegvideo_desc(AVFormatContext *s, const MXFDescriptorWriteTableEntry *desc_tbl, AVStream *st)
+static const UID mxf_mpegvideo_descriptor_key = { 0x06,0x0E,0x2B,0x34,0x02,0x53,0x01,0x01,0x0d,0x01,0x01,0x01,0x01,0x01,0x51,0x00 };
+static const UID mxf_wav_descriptor_key = { 0x06,0x0E,0x2B,0x34,0x02,0x53,0x01,0x01,0x0d,0x01,0x01,0x01,0x01,0x01,0x48,0x00 };
+
+static void mxf_write_mpegvideo_desc(AVFormatContext *s, AVStream *st)
{
ByteIOContext *pb = s->pb;
- mxf_write_generic_desc(pb, desc_tbl, st);
+ mxf_write_generic_desc(pb, st, mxf_mpegvideo_descriptor_key);
mxf_write_local_tag(pb, 4, 0x3203);
put_be32(pb, st->codec->width);
put_be32(pb, st->codec->width * st->sample_aspect_ratio.num);
}
-static void mxf_write_wav_desc(AVFormatContext *s, const MXFDescriptorWriteTableEntry *desc_tbl, AVStream *st)
+static void mxf_write_wav_desc(AVFormatContext *s, AVStream *st)
{
ByteIOContext *pb = s->pb;
- mxf_write_generic_desc(pb, desc_tbl, st);
+ mxf_write_generic_desc(pb, st, mxf_wav_descriptor_key);
// write audio sampling rate
mxf_write_local_tag(pb, 8, 0x3D03);
put_be32(pb, st->codec->channels);
mxf_write_local_tag(pb, 4, 0x3D01);
- put_be32(pb, st->codec->bits_per_sample);
+ put_be32(pb, st->codec->bits_per_coded_sample);
}
-static const MXFDescriptorWriteTableEntry mxf_descriptor_write_table[] = {
- { { 0x06,0x0E,0x2B,0x34,0x02,0x53,0x01,0x01,0x0d,0x01,0x01,0x01,0x01,0x01,0x51,0x00 }, mxf_write_mpegvideo_desc, CODEC_ID_MPEG2VIDEO},
- { { 0x06,0x0E,0x2B,0x34,0x02,0x53,0x01,0x01,0x0d,0x01,0x01,0x01,0x01,0x01,0x48,0x00 }, mxf_write_wav_desc, CODEC_ID_PCM_S16LE},
- { { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }, NULL, CODEC_ID_NONE},
-};
-
-static void mxf_build_structural_metadata(AVFormatContext *s, enum MXFMetadataSetType type)
+static void mxf_write_package(AVFormatContext *s, enum MXFMetadataSetType type)
{
+ ByteIOContext *pb = s->pb;
int i;
- const MXFDescriptorWriteTableEntry *desc = NULL;
- mxf_write_package(s, type);
- if (type == SourcePackage)
- mxf_write_multi_descriptor(s);
+ if (type == MaterialPackage) {
+ mxf_write_metadata_key(pb, 0x013600);
+ PRINT_KEY(s, "Material Package key", pb->buf_ptr - 16);
+ klv_encode_ber_length(pb, 92 + 16 * s->nb_streams);
+ } else {
+ mxf_write_metadata_key(pb, 0x013700);
+ PRINT_KEY(s, "Source Package key", pb->buf_ptr - 16);
+ klv_encode_ber_length(pb, 112 + 16 * s->nb_streams); // 20 bytes length for descriptor reference
+ }
+
+ // write uid
+ mxf_write_local_tag(pb, 16, 0x3C0A);
+ mxf_write_uuid(pb, type, 0);
+ av_log(s,AV_LOG_DEBUG, "package type:%d\n", type);
+ PRINT_KEY(s, "package uid", pb->buf_ptr - 16);
+
+ // write package umid
+ mxf_write_local_tag(pb, 32, 0x4401);
+ mxf_write_umid(pb, type, 0);
+ PRINT_KEY(s, "package umid second part", pb->buf_ptr - 16);
+
+ // write create date
+ mxf_write_local_tag(pb, 8, 0x4405);
+ put_be64(pb, 0);
+
+ // write modified date
+ mxf_write_local_tag(pb, 8, 0x4404);
+ put_be64(pb, 0);
+
+ // write track refs
+ mxf_write_local_tag(pb, s->nb_streams * 16 + 8, 0x4403);
+ mxf_write_refs_count(pb, s->nb_streams);
+ for (i = 0; i < s->nb_streams; i++)
+ mxf_write_uuid(pb, type == MaterialPackage ? Track : Track + TypeBottom, i);
+
+ // write multiple descriptor reference
+ if (type == SourcePackage) {
+ mxf_write_local_tag(pb, 16, 0x4701);
+ if (s->nb_streams > 1) {
+ mxf_write_uuid(pb, MultipleDescriptor, 0);
+ mxf_write_multi_descriptor(s);
+ } else
+ mxf_write_uuid(pb, SubDescriptor, 0);
+ }
for (i = 0; i < s->nb_streams; i++) {
AVStream *st = s->streams[i];
mxf_write_structural_component(s, st, type);
if (type == SourcePackage) {
- for (desc = mxf_descriptor_write_table; desc->write; desc++) {
- if (s->streams[i]->codec->codec_id == desc->type) {
- desc->write(s, desc, st);
- break;
- }
- }
+ MXFStreamContext *sc = st->priv_data;
+ mxf_essence_container_uls[sc->index].write_desc(s, st);
}
}
}
mxf_write_preface(s);
mxf_write_identification(s);
mxf_write_content_storage(s);
- mxf_build_structural_metadata(s, MaterialPackage);
- mxf_build_structural_metadata(s, SourcePackage);
+ mxf_write_package(s, MaterialPackage);
+ mxf_write_package(s, SourcePackage);
return 0;
}
-static void mxf_write_partition(AVFormatContext *s, int64_t byte_position, int bodysid, const uint8_t *key)
+static void mxf_write_partition(AVFormatContext *s, int bodysid, const uint8_t *key, int write_metadata)
{
MXFContext *mxf = s->priv_data;
ByteIOContext *pb = s->pb;
+ int64_t header_byte_count_offset;
// write klv
put_buffer(pb, key, 16);
put_be16(pb, 2); // minorVersion
put_be32(pb, 1); // kagSize
- put_be64(pb, byte_position); // thisPartition
+ put_be64(pb, url_ftell(pb) - 25); // thisPartition
put_be64(pb, 0); // previousPartition
- // set offset
- if (!byte_position)
- mxf->header_footer_partition_offset = url_ftell(pb);
- put_be64(pb, byte_position); // footerPartition,update later
+ put_be64(pb, mxf->footer_partition_offset); // footerPartition
// set offset
- if (!byte_position)
- mxf->header_byte_count_offset = url_ftell(pb);
+ header_byte_count_offset = url_ftell(pb);
put_be64(pb, 0); // headerByteCount, update later
// no indexTable
// essence container
mxf_write_essence_container_refs(s);
+
+ if (write_metadata) {
+ // mark the start of the headermetadata and calculate metadata size
+ int64_t pos, start = url_ftell(s->pb);
+ mxf_write_primer_pack(s);
+ mxf_write_header_metadata_sets(s);
+ pos = url_ftell(s->pb);
+ // update header_byte_count
+ url_fseek(pb, header_byte_count_offset, SEEK_SET);
+ put_be64(pb, pos - start);
+ url_fseek(pb, pos, SEEK_SET);
+ }
+
+ put_flush_packet(pb);
}
static const UID mxf_mpeg2_codec_uls[] = {
return NULL;
}
-static int mux_write_header(AVFormatContext *s)
+static int mxf_write_header(AVFormatContext *s)
{
MXFContext *mxf = s->priv_data;
- ByteIOContext *pb = s->pb;
- int64_t header_metadata_start, offset_now;
- int i, index;
- uint8_t present[sizeof(mxf_essence_container_uls)/
- sizeof(*mxf_essence_container_uls)] = {0};
+ int i;
+ uint8_t present[FF_ARRAY_ELEMS(mxf_essence_container_uls)] = {0};
for (i = 0; i < s->nb_streams; i++) {
AVStream *st = s->streams[i];
av_set_pts_info(st, 64, 1, st->codec->sample_rate);
sc->duration = -1;
- sc->essence_container_ul = mxf_get_essence_container_ul(st->codec->codec_id, &index);
- if (!sc->essence_container_ul) {
+ sc->index = mxf_get_essence_container_ul_index(st->codec->codec_id);
+ if (sc->index == -1) {
av_log(s, AV_LOG_ERROR, "track %d: could not find essence container ul, "
"codec not currently supported in container\n", i);
return -1;
return -1;
}
} else
- sc->codec_ul = &mxf_essence_container_uls[index].codec_ul;
+ sc->codec_ul = &mxf_essence_container_uls[sc->index].codec_ul;
- if (!present[index]) {
- mxf->essence_containers_indices[mxf->essence_container_count++] = index;
- present[index] = 1;
+ if (!present[sc->index]) {
+ mxf->essence_containers_indices[mxf->essence_container_count++] = sc->index;
+ present[sc->index] = 1;
} else
- present[index]++;
- memcpy(sc->track_essence_element_key, mxf_essence_container_uls[index].element_ul, 15);
- sc->track_essence_element_key[15] = present[index];
+ present[sc->index]++;
+ memcpy(sc->track_essence_element_key, mxf_essence_container_uls[sc->index].element_ul, 15);
+ sc->track_essence_element_key[15] = present[sc->index];
PRINT_KEY(s, "track essence element key", sc->track_essence_element_key);
}
- mxf_write_partition(s, 0, 1, header_partition_key);
-
- // mark the start of the headermetadata and calculate metadata size
- header_metadata_start = url_ftell(s->pb);
- mxf_write_primer_pack(s);
- if (mxf_write_header_metadata_sets(s) < 0)
- goto fail;
- offset_now = url_ftell(s->pb);
- mxf->header_byte_count = offset_now - header_metadata_start;
- // update header_byte_count
- url_fseek(pb, mxf->header_byte_count_offset, SEEK_SET);
- put_be64(pb, mxf->header_byte_count);
- url_fseek(pb, offset_now, SEEK_SET);
+ mxf_write_partition(s, 1, header_open_partition_key, 1);
- put_flush_packet(pb);
return 0;
-fail:
- mxf_free(s);
- return -1;
}
-static int mux_write_packet(AVFormatContext *s, AVPacket *pkt)
+static int mxf_write_packet(AVFormatContext *s, AVPacket *pkt)
{
ByteIOContext *pb = s->pb;
AVStream *st = s->streams[pkt->stream_index];
klv_encode_ber_length(pb, pkt->size); // write length
put_buffer(pb, pkt->data, pkt->size); // write value
+ sc->duration = FFMAX(pkt->pts + pkt->duration, sc->duration);
+
put_flush_packet(pb);
return 0;
}
-static void mxf_update_header_partition(AVFormatContext *s, int64_t footer_partition_offset)
+static int mxf_write_footer(AVFormatContext *s)
{
MXFContext *mxf = s->priv_data;
ByteIOContext *pb = s->pb;
- url_fseek(pb, mxf->header_footer_partition_offset, SEEK_SET);
- put_be64(pb, footer_partition_offset);
- put_flush_packet(pb);
-}
-
-
-static int mux_write_footer(AVFormatContext *s)
-{
- ByteIOContext *pb = s->pb;
- int64_t byte_position= url_ftell(pb);
-
+ mxf->footer_partition_offset = url_ftell(pb);
+ mxf_write_partition(s, 0, footer_partition_key, 0);
if (!url_is_streamed(s->pb)) {
- mxf_write_partition(s, byte_position, 0, footer_partition_key);
- put_flush_packet(pb);
- mxf_update_header_partition(s, byte_position);
+ url_fseek(pb, 0, SEEK_SET);
+ mxf_write_partition(s, 1, header_closed_partition_key, 1);
}
mxf_free(s);
return 0;
sizeof(MXFContext),
CODEC_ID_PCM_S16LE,
CODEC_ID_MPEG2VIDEO,
- mux_write_header,
- mux_write_packet,
- mux_write_footer,
+ mxf_write_header,
+ mxf_write_packet,
+ mxf_write_footer,
};