Hi,
here is new patch version 0.0.4 which have fixed problems from the former
patch.
--
Best wishes~
Index: mxfenc.c
===================================================================
--- mxfenc.c (revision 14842)
+++ mxfenc.c (working copy)
@@ -48,6 +48,13 @@
int64_t header_footer_partition_offset;
int essence_container_count;
} MXFContext;
+
+typedef struct {
+ const UID key;
+ int (*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 };
@@ -59,6 +66,81 @@
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 };
+/**
+ * partial key for header metadata
+ */
+static const uint8_t header_metadata_key[] = { 0x06,0x0E,0x2B,0x34,0x02,0x53,0x01,0x01,0x0D,0x01,0x01,0x01,0x01 };
+
+static const MXFCodecUL mxf_essence_element_key[] = {
+ { { 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x15,0x01,0x05,0x00 }, 14, CODEC_ID_MPEG2VIDEO},
+ { { 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x16,0x01,0x01,0x00 }, 14, CODEC_ID_PCM_S16LE},
+ { { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }, 0, CODEC_ID_NONE},
+};
+
+static const uint8_t multiple_desc_ul[] = { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x0D,0x01,0x03,0x01,0x02,0x7F,0x01,0x00 };
+
+/**
+ * SMPTE RP210 http://www.smpte-ra.org/mdd/index.html
+ */
+static const MXFLocalTagPair mxf_local_tag_batch[] = {
+ // preface set
+ { 0x3C0A, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x01,0x01,0x15,0x02,0x00,0x00,0x00,0x00}}, /* Instance UID */
+ { 0x3B02, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x07,0x02,0x01,0x10,0x02,0x04,0x00,0x00}}, /* Last Modified Date */
+ { 0x3B05, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x03,0x01,0x02,0x01,0x05,0x00,0x00,0x00}}, /* Version */
+ { 0x3B06, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x06,0x01,0x01,0x04,0x06,0x04,0x00,0x00}}, /* Identifications reference */
+ { 0x3B03, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x06,0x01,0x01,0x04,0x02,0x01,0x00,0x00}}, /* Content Storage reference */
+ { 0x3B09, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x05,0x01,0x02,0x02,0x03,0x00,0x00,0x00,0x00}}, /* Operational Pattern UL */
+ { 0x3B0A, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x05,0x01,0x02,0x02,0x10,0x02,0x01,0x00,0x00}}, /* Essence Containers UL batch */
+ { 0x3B0B, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x05,0x01,0x02,0x02,0x10,0x02,0x02,0x00,0x00}}, /* DM Schemes UL batch */
+ // Identification
+ { 0x3C09, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x05,0x20,0x07,0x01,0x01,0x00,0x00,0x00}}, /* This Generation UID */
+ { 0x3C01, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x05,0x20,0x07,0x01,0x02,0x01,0x00,0x00}}, /* Company Name */
+ { 0x3C02, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x05,0x20,0x07,0x01,0x03,0x01,0x00,0x00}}, /* Product Name */
+ { 0x3C04, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x05,0x20,0x07,0x01,0x04,0x00,0x00,0x00}}, /* Version String */
+ { 0x3C05, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x05,0x20,0x07,0x01,0x07,0x00,0x00,0x00}}, /* Product ID */
+ { 0x3C06, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x07,0x02,0x01,0x10,0x02,0x03,0x00,0x00}}, /* Modification Date */
+ // Content Storage
+ { 0x1901, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x06,0x01,0x01,0x04,0x05,0x01,0x00,0x00}}, /* Package strong reference batch */
+ // Essence Container Data
+ { 0x2701, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x06,0x01,0x01,0x06,0x01,0x00,0x00,0x00}}, /* Linked Package UID */
+ { 0x3F07, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x04,0x01,0x03,0x04,0x04,0x00,0x00,0x00,0x00}}, /* BodySID */
+ // Package
+ { 0x4401, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x01,0x01,0x15,0x10,0x00,0x00,0x00,0x00}}, /* Package UID */
+ { 0x4405, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x07,0x02,0x01,0x10,0x01,0x03,0x00,0x00}}, /* Package Creation Date */
+ { 0x4404, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x07,0x02,0x01,0x10,0x02,0x05,0x00,0x00}}, /* Package Modified Date */
+ { 0x4403, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x06,0x01,0x01,0x04,0x06,0x05,0x00,0x00}}, /* Tracks Strong reference array */
+ { 0x4701, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x06,0x01,0x01,0x04,0x02,0x03,0x00,0x00}}, /* Descriptor */
+ // Track
+ { 0x4801, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x01,0x07,0x01,0x01,0x00,0x00,0x00,0x00}}, /* Track ID */
+ { 0x4804, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x06,0x01,0x01,0x04,0x01,0x03,0x00,0x00}}, /* Track Numberr */
+ { 0x4B01, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x05,0x30,0x04,0x05,0x00,0x00,0x00,0x00}}, /* Edit Rate */
+ { 0x4B02, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x07,0x02,0x01,0x03,0x01,0x03,0x00,0x00}}, /* Origin */
+ { 0x4803, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x06,0x01,0x01,0x04,0x02,0x04,0x00,0x00}}, /* Sequence reference */
+ // Sequence
+ { 0x0201, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x04,0x07,0x01,0x00,0x00,0x00,0x00,0x00}}, /* Data Definition UL */
+ { 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 */
+ { 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
+ { 0x3F01, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x04,0x06,0x01,0x01,0x04,0x06,0x0B,0x00,0x00}}, /* sub descriptor uid*/
+ { 0x3006, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x05,0x06,0x01,0x01,0x03,0x05,0x00,0x00,0x00}}, /* Linked Track ID */
+ { 0x3001, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x06,0x01,0x01,0x00,0x00,0x00,0x00}}, /* SampleRate */
+ { 0x3004, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x06,0x01,0x01,0x04,0x01,0x02,0x00,0x00}}, /* essence container ul */
+ // generic picture eseence descriptor
+ { 0x3203, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x01,0x05,0x02,0x02,0x00,0x00,0x00}}, /* stored width */
+ { 0x3202, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x01,0x05,0x02,0x01,0x00,0x00,0x00}}, /* stored heigth */
+ { 0x320E, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x01,0x01,0x01,0x01,0x00,0x00,0x00}}, /* aspect ratio*/
+ { 0x3201, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x04,0x01,0x06,0x01,0x00,0x00,0x00,0x00}}, /* picture essence coding*/
+ // generic sound essence 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}}, /* channel count */
+ { 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 */
+};
+
static void mxf_write_uuid(ByteIOContext *pb, enum CodecID type, int value)
{
put_buffer(pb, uuid_base, 12);
@@ -71,6 +153,13 @@
put_buffer(pb, umid_base, 16);
mxf_write_uuid(pb, type, value);
}
+
+static void mxf_write_refs_count(ByteIOContext *pb, int ref_count)
+{
+ put_be32(pb, ref_count);
+ put_be32(pb, 16);
+}
+
static int klv_encode_ber_length(ByteIOContext *pb, uint64_t len)
{
// Determine the best BER size
@@ -157,20 +246,485 @@
return uls;
}
-static int mux_write_packet(AVFormatContext *s, AVPacket *pkt)
+static int mxf_write_essence_container_refs(AVFormatContext *s, int write)
{
+ MXFContext *mxf = s->priv_data;
ByteIOContext *pb = s->pb;
- AVStream *st = s->streams[pkt->stream_index];
- MXFStreamContext *sc = st->priv_data;
+ AVStream *st;
+ int i, count = 0, j = 0;
+ int essence_container_ul_sign[32] = { 0 };
+ const MXFCodecUL *codec_ul;
- put_buffer(pb, sc->track_essence_element_key, 16); // write key
- klv_encode_ber_length(pb, pkt->size); // write length
- put_buffer(pb, pkt->data, pkt->size); // write value
+ for (codec_ul = ff_mxf_essence_container_uls; codec_ul->id; codec_ul++) {
+ for (i = 0; i < s->nb_streams; i++) {
+ st = s->streams[i];
+ if (st->codec->codec_id == codec_ul->id) {
+ essence_container_ul_sign[count] = j;
+ count++;
+ break;
+ }
+ }
+ j++;
+ // considering WAV/AES3 frame wrapped, when get the first CODEC_ID_PCM_S16LE, break;
+ // this is a temporary method, when we can get more information, modofy this.
+ if (codec_ul->id == CODEC_ID_PCM_S16LE)
+ break;
+ }
- put_flush_packet(pb);
+ // set the count of essence container for caculating the size of the references in other metadata sets
+ if (!write)
+ mxf->essence_container_count = count;
+
+ if (write) {
+ mxf_write_refs_count(pb, count);
+ for (i = 0; i < count; i++) {
+ put_buffer(pb, ff_mxf_essence_container_uls[essence_container_ul_sign[i]].uid, 16);
+ }
+ av_log(s,AV_LOG_DEBUG, "essence container count:%d\n", count);
+ for (i = 0; i < count; i++)
+ PRINT_KEY(s, "essence container ul:\n", ff_mxf_essence_container_uls[essence_container_ul_sign[i]].uid);
+ }
+ return mxf->essence_container_count;
+}
+
+static int mxf_write_preface(AVFormatContext *s)
+{
+ MXFContext *mxf = s->priv_data;
+ ByteIOContext *pb = s->pb;
+
+ mxf_write_metadata_key(pb, 0x012f00);
+ PRINT_KEY(s, "preface key", pb->buf_ptr - 16);
+ klv_encode_ber_length(pb, 130 + 16 * mxf->essence_container_count);
+
+ // write preface set uid
+ mxf_write_local_tag(pb, 16, 0x3C0A);
+ mxf_write_uuid(pb, Preface, 0);
+ PRINT_KEY(s, "preface uid", pb->buf_ptr - 16);
+
+ // write create date as unknown
+ mxf_write_local_tag(pb, 8, 0x3B02);
+ put_be64(pb, 0);
+
+ // write version
+ mxf_write_local_tag(pb, 2, 0x3B05);
+ put_be16(pb, 1);
+
+ // write identification_refs
+ mxf_write_local_tag(pb, 16 + 8, 0x3B06);
+ mxf_write_refs_count(pb, 1);
+ mxf_write_uuid(pb, Identification, 0);
+
+ // write content_storage_refs
+ mxf_write_local_tag(pb, 16, 0x3B03);
+ mxf_write_uuid(pb, ContentStorage, 0);
+
+ mxf_write_local_tag(pb, 16, 0x3B09);
+ put_buffer(pb, op1a_ul, 16);
+
+ // write essence_container_refs
+ mxf_write_local_tag(pb, 8 + 16 * mxf->essence_container_count, 0x3B0A);
+ mxf_write_essence_container_refs(s, 1);
+
+ // write dm_scheme_refs
+ mxf_write_local_tag(pb, 8, 0x3B0B);
+ put_be64(pb, 0);
return 0;
}
+static int mxf_write_identification(AVFormatContext *s)
+{
+ ByteIOContext *pb = s->pb;
+ int length, company_name_len, product_name_len, version_string_len;
+
+ mxf_write_metadata_key(pb, 0x013000);
+ PRINT_KEY(s, "identification key", pb->buf_ptr - 16);
+ company_name_len = sizeof("FFmpeg");
+ product_name_len = sizeof("OP1a Muxer");
+
+ length = 80 + company_name_len + product_name_len;
+ if (!(s->streams[0]->codec->flags & CODEC_FLAG_BITEXACT)) {
+ version_string_len = sizeof(LIBAVFORMAT_IDENT);
+ length += 4 + version_string_len;
+ }
+ klv_encode_ber_length(pb, length);
+
+ // write uid
+ mxf_write_local_tag(pb, 16, 0x3C0A);
+ mxf_write_uuid(pb, Identification, 0);
+ PRINT_KEY(s, "identification uid", pb->buf_ptr - 16);
+ // write generation uid
+ mxf_write_local_tag(pb, 16, 0x3C09);
+ mxf_write_uuid(pb, Identification, 1);
+
+ mxf_write_local_tag(pb, company_name_len, 0x3C01);
+ put_buffer(pb, "FFmpeg", company_name_len);
+
+ mxf_write_local_tag(pb, product_name_len, 0x3C02);
+ put_buffer(pb, "OP1a Muxer", product_name_len);
+
+ if (!(s->streams[0]->codec->flags & CODEC_FLAG_BITEXACT)) {
+ mxf_write_local_tag(pb, version_string_len, 0x3C04);
+ put_buffer(pb, LIBAVFORMAT_IDENT, version_string_len);
+ }
+
+ // write product uid
+ mxf_write_local_tag(pb, 16, 0x3C05);
+ mxf_write_uuid(pb, Identification, 2);
+
+ // write modified date
+ mxf_write_local_tag(pb, 8, 0x3C06);
+ put_be64(pb, 0);
+ return 0;
+}
+
+static int mxf_write_content_storage(AVFormatContext *s)
+{
+ ByteIOContext *pb = s->pb;
+
+ mxf_write_metadata_key(pb, 0x011800);
+ PRINT_KEY(s, "content storage key", pb->buf_ptr - 16);
+ klv_encode_ber_length(pb, 64);
+
+ // write uid
+ mxf_write_local_tag(pb, 16, 0x3C0A);
+ mxf_write_uuid(pb, ContentStorage, 0);
+ PRINT_KEY(s, "content storage uid", pb->buf_ptr - 16);
+ // write package reference
+ mxf_write_local_tag(pb, 16 * 2 + 8, 0x1901);
+ mxf_write_refs_count(pb, 2);
+ mxf_write_uuid(pb, MaterialPackage, 0);
+ mxf_write_uuid(pb, SourcePackage, 0);
+ return 0;
+}
+
+static int 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);
+ if (type == MaterialPackage) {
+ mxf_write_umid(pb, MaterialPackage, 0);
+ } else {
+ mxf_write_umid(pb, SourcePackage, 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 + 0xf0, i);
+
+ if (type == SourcePackage) {
+ // write multiple descriptor reference
+ mxf_write_local_tag(pb, 16, 0x4701);
+ mxf_write_uuid(pb, MultipleDescriptor, 0);
+ }
+ return 0;
+}
+
+static int mxf_write_track(AVFormatContext *s, int stream_index, enum MXFMetadataSetType type, int *track_number_sign)
+{
+ ByteIOContext *pb = s->pb;
+ AVStream *st;
+ MXFStreamContext *sc;
+ const MXFCodecUL *element;
+ int i = 0;
+
+ mxf_write_metadata_key(pb, 0x013b00);
+ PRINT_KEY(s, "track key", pb->buf_ptr - 16);
+ klv_encode_ber_length(pb, 80);
+
+ st = s->streams[stream_index];
+ sc = st->priv_data;
+
+ // write track uid
+ mxf_write_local_tag(pb, 16, 0x3C0A);
+ mxf_write_uuid(pb, type == MaterialPackage ? Track : Track + 0xf0, stream_index);
+ PRINT_KEY(s, "track uid", pb->buf_ptr - 16);
+ // write track id
+ mxf_write_local_tag(pb, 4, 0x4801);
+ put_be32(pb, stream_index);
+
+ mxf_write_local_tag(pb, 4, 0x4804);
+ if (type != MaterialPackage) {
+ for (element = mxf_essence_element_key; element->id != CODEC_ID_NONE; element++) {
+ if (st->codec->codec_id== element->id) {
+ // write track number
+ put_buffer(pb, element->uid + 12, 3);
+ put_byte(pb, element->uid[15] + track_number_sign[i]);
+
+ // set essence_element key
+ memcpy(sc->track_essence_element_key, element->uid, 16);
+ sc->track_essence_element_key[15] += track_number_sign[i];
+ track_number_sign[i] ++;
+ break;
+ }
+ i++;
+ }
+ } else {
+ put_be32(pb, 0); // track number of material package is 0
+ }
+
+ mxf_write_local_tag(pb, 8, 0x4B01);
+ put_be32(pb, st->time_base.den);
+ put_be32(pb, st->time_base.num);
+
+ // write origin
+ mxf_write_local_tag(pb, 8, 0x4B02);
+ put_be64(pb, 0);
+
+ // write sequence refs
+ mxf_write_local_tag(pb, 16, 0x4803);
+ mxf_write_uuid(pb, type == MaterialPackage ? Sequence: Sequence + 0xf0, stream_index);
+ return 0;
+}
+
+static void mxf_write_common_fields( ByteIOContext *pb, AVStream *st)
+{
+ const MXFDataDefinitionUL * data_def_ul;
+
+ // find data define uls
+ data_def_ul = mxf_get_data_definition_ul(st->codec->codec_type);
+ mxf_write_local_tag(pb, 16, 0x0201);
+ put_buffer(pb, data_def_ul->uid, 16);
+
+ // write duration
+ mxf_write_local_tag(pb, 8, 0x0202);
+ put_be64(pb, st->duration);
+}
+
+static int mxf_write_sequence(AVFormatContext *s, int stream_index, enum MXFMetadataSetType type)
+{
+ ByteIOContext *pb = s->pb;
+ AVStream *st;
+
+ mxf_write_metadata_key(pb, 0x010f00);
+ PRINT_KEY(s, "sequence key", pb->buf_ptr - 16);
+ klv_encode_ber_length(pb, 80);
+
+ st = s->streams[stream_index];
+
+ mxf_write_local_tag(pb, 16, 0x3C0A);
+ mxf_write_uuid(pb, type == MaterialPackage ? Sequence: Sequence + 0xf0, stream_index);
+
+ PRINT_KEY(s, "sequence uid", pb->buf_ptr - 16);
+ mxf_write_common_fields(pb, st);
+
+ // write structural component
+ mxf_write_local_tag(pb, 16 + 8, 0x1001);
+ mxf_write_refs_count(pb, 1);
+ mxf_write_uuid(pb, type == MaterialPackage ? SourceClip: SourceClip + 0xf0, stream_index);
+ return 0;
+}
+
+static int mxf_write_structural_component(AVFormatContext *s, int stream_index, enum MXFMetadataSetType type)
+{
+ ByteIOContext *pb = s->pb;
+ AVStream *st;
+ int i;
+
+ mxf_write_metadata_key(pb, 0x011100);
+ PRINT_KEY(s, "sturctural component key", pb->buf_ptr - 16);
+ klv_encode_ber_length(pb, 108);
+
+ st = s->streams[stream_index];
+
+ // write uid
+ mxf_write_local_tag(pb, 16, 0x3C0A);
+ mxf_write_uuid(pb, type == MaterialPackage ? SourceClip: SourceClip + 0xf0, stream_index);
+
+ PRINT_KEY(s, "structural component uid", pb->buf_ptr - 16);
+ mxf_write_common_fields(pb, st);
+
+ // write start_position
+ mxf_write_local_tag(pb, 8, 0x1201);
+ put_be64(pb, 0);
+
+ mxf_write_local_tag(pb, 32, 0x1101);
+ if (type == SourcePackage) {
+ // write source package uid, end of the reference
+ for (i = 0; i < 4; i++) {
+ put_be64(pb, 0);
+ }
+ } else
+ mxf_write_umid(pb, SourcePackage, 0);
+
+ mxf_write_local_tag(pb, 4, 0x1102);
+ if (type == SourcePackage)
+ // write source track id
+ put_be32(pb, 0);
+ else
+ put_be32(pb, stream_index);
+ return 0;
+}
+
+static int mxf_write_multi_descriptor(AVFormatContext *s)
+{
+ ByteIOContext *pb = s->pb;
+ int i;
+
+ mxf_write_metadata_key(pb, 0x014400);
+ PRINT_KEY(s, "multiple descriptor key", pb->buf_ptr - 16);
+ klv_encode_ber_length(pb, 64 + 16 * s->nb_streams);
+
+ mxf_write_local_tag(pb, 16, 0x3C0A);
+ mxf_write_uuid(pb, MultipleDescriptor, 0);
+ PRINT_KEY(s, "multi_desc uid", pb->buf_ptr - 16);
+ // write sample rate
+ // SMPTE377M D.1 says this field is necessary,
+ // but mxf.c actually do not read the field,so we set 0 as default.
+ mxf_write_local_tag(pb, 8, 0x3001);
+ put_be64(pb, 0);
+
+ // write essence container ul
+ mxf_write_local_tag(pb, 16, 0x3004);
+ put_buffer(pb, multiple_desc_ul, 16);
+
+ // write sub descriptor refs
+ mxf_write_local_tag(pb, s->nb_streams * 16 + 8, 0x3F01);
+ mxf_write_refs_count(pb, s->nb_streams);
+ for (i = 0; i < s->nb_streams; i++) {
+ mxf_write_uuid(pb, SubDescriptor, i);
+ }
+ return 0;
+}
+
+static void mxf_write_header_desc(ByteIOContext *pb, const MXFDescriptorWriteTableEntry *desc_tbl, AVStream *st)
+{
+ const MXFCodecUL *codec_ul;
+
+ put_buffer(pb, desc_tbl->key, 16);
+ klv_encode_ber_length(pb, 96);
+
+ mxf_write_local_tag(pb, 16, 0x3C0A);
+ mxf_write_uuid(pb, SubDescriptor, st->index);
+
+ mxf_write_local_tag(pb, 4, 0x3006);
+ put_be32(pb, st->index);
+
+ codec_ul = mxf_get_essence_container_ul(st->codec->codec_id);
+ mxf_write_local_tag(pb, 16, 0x3004);
+ put_buffer(pb, codec_ul->uid, 16);
+}
+
+static int mxf_write_mpeg_video_desc(AVFormatContext *s, const MXFDescriptorWriteTableEntry *desc_tbl, int stream_index)
+{
+ ByteIOContext *pb = s->pb;
+ AVStream *st;
+
+ st = s->streams[stream_index];
+ mxf_write_header_desc(pb, desc_tbl, st);
+
+ mxf_write_local_tag(pb, 4, 0x3203);
+ put_be32(pb, st->codec->width);
+
+ mxf_write_local_tag(pb, 4, 0x3202);
+ put_be32(pb, st->codec->height);
+
+ mxf_write_local_tag(pb, 8, 0x320E);
+ put_be32(pb, st->codec->height * st->codec->sample_aspect_ratio.den);
+ put_be32(pb, st->codec->width * st->codec->sample_aspect_ratio.num);
+
+ // tmp write, will modified later
+ mxf_write_local_tag(pb, 16, 0x3201);
+ put_buffer(pb, ff_mxf_codec_uls->uid, 16);
+ return 0;
+}
+
+static int mxf_write_wav_desc(AVFormatContext *s, const MXFDescriptorWriteTableEntry *desc_tbl, int stream_index)
+{
+ ByteIOContext *pb = s->pb;
+ AVStream *st;
+
+ st = s->streams[stream_index];
+ mxf_write_header_desc(pb, desc_tbl, st);
+
+ // write audio sampling rate
+ mxf_write_local_tag(pb, 8, 0x3D03);
+ put_be32(pb, st->codec->sample_rate);
+ put_be32(pb, 1);
+
+ mxf_write_local_tag(pb, 4, 0x3D07);
+ put_be32(pb, st->codec->channels);
+
+ mxf_write_local_tag(pb, 4, 0x3D01);
+ put_be32(pb, st->codec->bits_per_sample);
+
+ // tmp write, will modified later
+ mxf_write_local_tag(pb, 16, 0x3201);
+ put_buffer(pb, (ff_mxf_codec_uls + 8) ->uid, 16);
+ return 0;
+}
+
+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_mpeg_video_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 int mxf_build_structural_metadata(AVFormatContext *s, enum MXFMetadataSetType type)
+{
+ int i;
+ const MXFDescriptorWriteTableEntry *desc = NULL;
+ int track_number_sign[sizeof(mxf_essence_element_key)/sizeof(MXFCodecUL)] = { 0 };
+
+ if (mxf_write_package(s, type) < 0)
+ return -1;
+ if (type == SourcePackage) {
+ if (mxf_write_multi_descriptor(s) < 0)
+ return -1;
+ }
+
+ for (i = 0;i < s->nb_streams; i++) {
+ if ( mxf_write_track(s, i, type, track_number_sign) < 0)
+ return -1;
+ if ( mxf_write_sequence(s, i, type) < 0)
+ return -1;
+ if ( mxf_write_structural_component(s, i, type) < 0)
+ return -1;
+
+ if (type == SourcePackage) {
+ for (desc = mxf_descriptor_write_table; desc->write; desc++) {
+ if (s->streams[i]->codec->codec_id == desc->type) {
+ if ( desc->write(s, desc, i) < 0) {
+ av_log(s, AV_LOG_ERROR, "error writing descriptor\n");
+ return -1;
+ }
+ break;
+ }
+ }
+ }
+ }
+ return 0;
+}
+
static int mxf_write_header_metadata_sets(AVFormatContext *s)
{
AVStream *st;
@@ -207,20 +761,115 @@
return 0;
}
-static int mxf_update_header_partition(AVFormatContext *s, int64_t footer_partition_offset)
+static void mxf_write_partition(AVFormatContext *s, int64_t byte_position, int bodysid, const uint8_t *key)
{
MXFContext *mxf = s->priv_data;
ByteIOContext *pb = s->pb;
+ // write klv
+ put_buffer(pb, key, 16);
+ if (!mxf->essence_container_count)
+ mxf_write_essence_container_refs(s, 0);
+ klv_encode_ber_length(pb, 88 + 16 * mxf->essence_container_count);
+ // write partition value
+ put_be16(pb, 1); // majorVersion
+ put_be16(pb, 2); // minorVersion
+ put_be32(pb, 1); // kagSize
+
+ put_be64(pb, byte_position); // 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
+
+ // set offset
+ if (!byte_position)
+ mxf->header_byte_count_offset = url_ftell(pb);
+ put_be64(pb, 0); // headerByteCount, update later
+
+ // no indexTable
+ put_be64(pb, 0); // indexByteCount
+ put_be32(pb, 0); // indexSID
+ put_be64(pb, 0); // bodyOffset
+
+ put_be32(pb, bodysid); // bodySID
+ put_buffer(pb, op1a_ul, 16); // operational pattern
+
+ // essence container
+ mxf_write_essence_container_refs(s, 1);
+}
+
+static int mux_write_header(AVFormatContext *s)
+{
+ MXFContext *mxf = s->priv_data;
+ ByteIOContext *pb = s->pb;
+ int64_t header_metadata_start, offset_now;
+
+ 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);
+
put_flush_packet(pb);
+ return 0;
+fail:
+ mxf_free(s);
+ return -1;
+}
+static int mux_write_packet(AVFormatContext *s, AVPacket *pkt)
+{
+ ByteIOContext *pb = s->pb;
+ AVStream *st = s->streams[pkt->stream_index];
+ MXFStreamContext *sc = st->priv_data;
+
+ put_buffer(pb, sc->track_essence_element_key, 16); // write key
+ klv_encode_ber_length(pb, pkt->size); // write length
+ put_buffer(pb, pkt->data, pkt->size); // write value
+
+ put_flush_packet(pb);
+ return 0;
+}
+
+static int mxf_update_header_partition(AVFormatContext *s, int64_t footer_partition_offset)
+{
+ 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);
return 0;
}
+
+
+static int mux_write_footer(AVFormatContext *s)
+{
+ ByteIOContext *pb = s->pb;
+
+ int64_t byte_position= url_ftell(pb);
+ 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);
+ }
+ mxf_free(s);
+ return 0;
+}
+
AVOutputFormat mxf_muxer = {
"mxf",
NULL_IF_CONFIG_SMALL("Material eXchange Format"),
@@ -233,3 +882,5 @@
mux_write_packet,
mux_write_footer,
};
+
+
Index: mxfdec.c
===================================================================
--- mxfdec.c (revision 14842)
+++ mxfdec.c (working copy)
@@ -299,9 +299,7 @@
while (!url_feof(s->pb)) {
if (klv_read_packet(&klv, s->pb) < 0)
return -1;
-#ifdef DEBUG
PRINT_KEY(s, "read packet", klv.key);
-#endif
if (IS_KLV_KEY(klv.key, mxf_encrypted_triplet_key)) {
int res = mxf_decrypt_triplet(s, pkt, &klv);
if (res < 0) {
@@ -726,9 +724,7 @@
return -1;
}
-#ifdef DEBUG
PRINT_KEY(mxf->fc, "data definition ul", source_track->sequence->data_definition_ul);
-#endif
st->codec->codec_type = mxf_get_codec_type(ff_mxf_data_definition_uls, &source_track->sequence->data_definition_ul);
source_package->descriptor = mxf_resolve_strong_ref(mxf, &source_package->descriptor_ref, AnyType);
@@ -753,10 +749,8 @@
av_log(mxf->fc, AV_LOG_INFO, "source track %d: stream %d, no descriptor found\n", source_track->track_id, st->index);
continue;
}
-#ifdef DEBUG
PRINT_KEY(mxf->fc, "essence codec ul", descriptor->essence_codec_ul);
PRINT_KEY(mxf->fc, "essence container ul", descriptor->essence_container_ul);
-#endif
essence_container_ul = &descriptor->essence_container_ul;
/* HACK: replacing the original key with mxf_encrypted_essence_container
* is not allowed according to s429-6, try to find correct information anyway */
@@ -860,9 +854,7 @@
if (local_tag == tag) {
memcpy(uid, mxf->local_tags+i*18+2, 16);
dprintf(mxf->fc, "local tag 0x%04X\n", local_tag);
-#ifdef DEBUG
PRINT_KEY(mxf->fc, "uid", uid);
-#endif
}
}
}
@@ -893,9 +885,7 @@
if (klv_read_packet(&klv, s->pb) < 0)
return -1;
-#ifdef DEBUG
PRINT_KEY(s, "read header", klv.key);
-#endif
if (IS_KLV_KEY(klv.key, mxf_encrypted_triplet_key) ||
IS_KLV_KEY(klv.key, mxf_essence_element_key)) {
/* FIXME avoid seek */
Index: mxf.c
===================================================================
--- mxf.c (revision 14842)
+++ mxf.c (working copy)
@@ -21,6 +21,9 @@
#include "mxf.h"
+/**
+ * SMPTE RP224 http://www.smpte-ra.org/mdd/index.html
+ */
const MXFDataDefinitionUL ff_mxf_data_definition_uls[] = {
{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x01,0x03,0x02,0x02,0x01,0x00,0x00,0x00 }, CODEC_TYPE_VIDEO },
{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x01,0x03,0x02,0x02,0x02,0x00,0x00,0x00 }, CODEC_TYPE_AUDIO },
Index: mxf.h
===================================================================
--- mxf.h (revision 14842)
+++ mxf.h (working copy)
@@ -20,7 +20,6 @@
*/
#ifndef FFMPEG_MXF_H
#define FFMPEG_MXF_H
-
#include "avformat.h"
#include "libavcodec/bytestream.h"
@@ -64,7 +63,11 @@
extern const MXFCodecUL ff_mxf_codec_uls[];
extern const MXFCodecUL ff_mxf_essence_container_uls[];
+#ifndef DEBUG
+#define PRINT_KEY(pc, s, x)
+#else
#define PRINT_KEY(pc, s, x) dprintf(pc, "%s %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X\n", s, \
(x)[0], (x)[1], (x)[2], (x)[3], (x)[4], (x)[5], (x)[6], (x)[7], (x)[8], (x)[9], (x)[10], (x)[11], (x)[12], (x)[13], (x)[14], (x)[15])
+#endif
#endif /* FFMPEG_MXF_H */
_______________________________________________
FFmpeg-soc mailing list
[email protected]
https://lists.mplayerhq.hu/mailman/listinfo/ffmpeg-soc
