X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fmxfenc.c;h=eb53dbff214f9d040d4607aee93dc155eda960ad;hb=728ea23cce07467b732f538c87c13da13dd6dcf3;hp=75724240a7e88367d6e33a77891f783bdaf249d1;hpb=7a1011905708b8f071cbdfc5b921dd4010bec524;p=ffmpeg diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index 75724240a7e..eb53dbff214 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -3,20 +3,20 @@ * Copyright (c) 2008 GUCAS, Zhentan Feng * Copyright (c) 2008 Baptiste Coudurier * - * This file is part of FFmpeg. + * This file is part of Libav. * - * FFmpeg is free software; you can redistribute it and/or + * Libav is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * FFmpeg is distributed in the hope that it will be useful, + * Libav is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software + * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -30,64 +30,72 @@ * SMPTE RP224: Registry of SMPTE Universal Labels */ -//#define DEBUG - +#include #include #include -#include "libavutil/fifo.h" +#include "libavutil/random_seed.h" +#include "libavutil/time_internal.h" #include "libavcodec/bytestream.h" #include "audiointerleave.h" #include "avformat.h" +#include "internal.h" #include "mxf.h" static const int NTSC_samples_per_frame[] = { 1602, 1601, 1602, 1601, 1602, 0 }; static const int PAL_samples_per_frame[] = { 1920, 0 }; +extern AVOutputFormat ff_mxf_d10_muxer; + #define EDIT_UNITS_PER_BODY 250 #define KAG_SIZE 512 -typedef struct { +typedef struct MXFLocalTagPair { int local_tag; UID uid; } MXFLocalTagPair; -typedef struct { +typedef struct MXFIndexEntry { uint8_t flags; uint64_t offset; unsigned slice_offset; ///< offset of audio slice + uint16_t temporal_ref; } MXFIndexEntry; -typedef struct { +typedef struct MXFStreamContext { AudioInterleaveContext aic; UID track_essence_element_key; - int index; ///< index in mxf_essence_container_uls table + int index; ///< index in mxf_essence_container_uls table const UID *codec_ul; - int order; ///< interleaving order if dts are equal - int interlaced; ///< wether picture is interlaced + int order; ///< interleaving order if dts are equal + int interlaced; ///< whether picture is interlaced int temporal_reordering; + AVRational aspect_ratio; ///< display aspect ratio + int closed_gop; ///< gop is closed, used in mpeg-2 frame parsing } MXFStreamContext; -typedef struct { +typedef struct MXFContainerEssenceEntry { UID container_ul; UID element_ul; UID codec_ul; - void (*write_desc)(); + void (*write_desc)(AVFormatContext *, AVStream *); } MXFContainerEssenceEntry; static const struct { - enum CodecID id; + enum AVCodecID id; int index; } mxf_essence_mappings[] = { - { CODEC_ID_MPEG2VIDEO, 0 }, - { CODEC_ID_PCM_S24LE, 1 }, - { CODEC_ID_PCM_S16LE, 1 }, - { 0 } + { AV_CODEC_ID_MPEG2VIDEO, 0 }, + { AV_CODEC_ID_PCM_S24LE, 1 }, + { AV_CODEC_ID_PCM_S16LE, 1 }, + { AV_CODEC_ID_NONE } }; static void mxf_write_wav_desc(AVFormatContext *s, AVStream *st); static void mxf_write_aes3_desc(AVFormatContext *s, AVStream *st); static void mxf_write_mpegvideo_desc(AVFormatContext *s, AVStream *st); +static void mxf_write_cdci_desc(AVFormatContext *s, AVStream *st); +static void mxf_write_generic_sound_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 }, @@ -102,6 +110,60 @@ static const MXFContainerEssenceEntry mxf_essence_container_uls[] = { { 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 }, mxf_write_wav_desc }, + // D-10 625/50 PAL 50mb/s + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x01,0x01,0x01 }, + { 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x05,0x01,0x01,0x00 }, + { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x01,0x02,0x01,0x01 }, + mxf_write_cdci_desc }, + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x01,0x01,0x01 }, + { 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x06,0x01,0x10,0x00 }, + { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x01,0x00,0x00,0x00,0x00 }, + mxf_write_generic_sound_desc }, + // D-10 525/60 NTSC 50mb/s + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x01,0x02,0x01 }, + { 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x05,0x01,0x01,0x00 }, + { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x01,0x02,0x01,0x02 }, + mxf_write_cdci_desc }, + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x01,0x02,0x01 }, + { 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x06,0x01,0x10,0x00 }, + { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x01,0x00,0x00,0x00,0x00 }, + mxf_write_generic_sound_desc }, + // D-10 625/50 PAL 40mb/s + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x01,0x03,0x01 }, + { 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x05,0x01,0x01,0x00 }, + { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x01,0x02,0x01,0x03 }, + mxf_write_cdci_desc }, + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x01,0x03,0x01 }, + { 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x06,0x01,0x10,0x00 }, + { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x01,0x00,0x00,0x00,0x00 }, + mxf_write_generic_sound_desc }, + // D-10 525/60 NTSC 40mb/s + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x01,0x04,0x01 }, + { 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x05,0x01,0x01,0x00 }, + { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x01,0x02,0x01,0x04 }, + mxf_write_cdci_desc }, + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x01,0x04,0x01 }, + { 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x06,0x01,0x10,0x00 }, + { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x01,0x00,0x00,0x00,0x00 }, + mxf_write_generic_sound_desc }, + // D-10 625/50 PAL 30mb/s + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x01,0x05,0x01 }, + { 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x05,0x01,0x01,0x00 }, + { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x01,0x02,0x01,0x05 }, + mxf_write_cdci_desc }, + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x01,0x05,0x01 }, + { 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x06,0x01,0x10,0x00 }, + { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x01,0x00,0x00,0x00,0x00 }, + mxf_write_generic_sound_desc }, + // D-10 525/60 NTSC 30mb/s + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x01,0x06,0x01 }, + { 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x05,0x01,0x01,0x00 }, + { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x01,0x02,0x01,0x06 }, + mxf_write_cdci_desc }, + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x01,0x06,0x01 }, + { 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x06,0x01,0x10,0x00 }, + { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x01,0x00,0x00,0x00,0x00 }, + mxf_write_generic_sound_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 }, @@ -111,7 +173,6 @@ static const MXFContainerEssenceEntry mxf_essence_container_uls[] = { typedef struct MXFContext { int64_t footer_partition_offset; int essence_container_count; - uint8_t essence_containers_indices[FF_ARRAY_ELEMS(mxf_essence_container_uls)]; AVRational time_base; int header_written; MXFIndexEntry *index_entries; @@ -119,7 +180,6 @@ typedef struct MXFContext { uint64_t timestamp; ///< timestamp, as year(16),month(8),day(8),hour(8),minutes(8),msec/4(8) uint8_t slice_count; ///< index slice count minus 1 (1 if no audio, 0 otherwise) int last_indexed_edit_unit; - uint64_t first_edit_unit_offset; uint64_t *body_partition_offset; unsigned body_partitions_count; int last_key_index; ///< index of last key frame @@ -128,15 +188,19 @@ typedef struct MXFContext { int timecode_base; ///< rounded time code base (25 or 30) int timecode_start; ///< frame number computed from mpeg-2 gop header timecode int timecode_drop_frame; ///< time code use drop frame method frop mpeg-2 essence gop header + int edit_unit_byte_count; ///< fixed edit unit byte count + uint64_t body_offset; + uint32_t instance_number; + uint8_t umid[16]; ///< unique material identifier } MXFContext; 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,0x05,0x01,0x01,0x0D,0x00,0x13,0x00,0x00,0x00 }; +static const uint8_t umid_ul[] = { 0x06,0x0A,0x2B,0x34,0x01,0x01,0x01,0x05,0x01,0x01,0x0D,0x00,0x13 }; /** * 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 op1a_ul[] = { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x02,0x01,0x01,0x01,0x09,0x00 }; 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 index_table_segment_key[] = { 0x06,0x0E,0x2B,0x34,0x02,0x53,0x01,0x01,0x0d,0x01,0x02,0x01,0x01,0x10,0x01,0x00 }; @@ -236,28 +300,32 @@ static const MXFLocalTagPair mxf_local_tag_batch[] = { { 0x3F0A, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x05,0x04,0x04,0x04,0x02,0x05,0x00,0x00,0x00}}, /* Index Entry Array */ // MPEG video Descriptor { 0x8000, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x05,0x04,0x01,0x06,0x02,0x01,0x0B,0x00,0x00}}, /* BitRate */ + { 0x8007, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x05,0x04,0x01,0x06,0x02,0x01,0x0A,0x00,0x00}}, /* ProfileAndLevel */ // Wave Audio Essence Descriptor { 0x3D09, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x05,0x04,0x02,0x03,0x03,0x05,0x00,0x00,0x00}}, /* Average Bytes Per Second */ { 0x3D0A, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x05,0x04,0x02,0x03,0x02,0x01,0x00,0x00,0x00}}, /* Block Align */ }; -static void mxf_write_uuid(ByteIOContext *pb, enum MXFMetadataSetType type, int value) +static void mxf_write_uuid(AVIOContext *pb, enum MXFMetadataSetType type, int value) { - put_buffer(pb, uuid_base, 12); - put_be16(pb, type); - put_be16(pb, value); + avio_write(pb, uuid_base, 12); + avio_wb16(pb, type); + avio_wb16(pb, value); } -static void mxf_write_umid(ByteIOContext *pb, enum MXFMetadataSetType type, int value) +static void mxf_write_umid(AVFormatContext *s, int type) { - put_buffer(pb, umid_base, 16); - mxf_write_uuid(pb, type, value); + MXFContext *mxf = s->priv_data; + avio_write(s->pb, umid_ul, 13); + avio_wb24(s->pb, mxf->instance_number); + avio_write(s->pb, mxf->umid, 15); + avio_w8(s->pb, type); } -static void mxf_write_refs_count(ByteIOContext *pb, int ref_count) +static void mxf_write_refs_count(AVIOContext *pb, int ref_count) { - put_be32(pb, ref_count); - put_be32(pb, 16); + avio_wb32(pb, ref_count); + avio_wb32(pb, 16); } static int klv_ber_length(uint64_t len) @@ -268,31 +336,37 @@ static int klv_ber_length(uint64_t len) return (av_log2(len) >> 3) + 2; } -static int klv_encode_ber_length(ByteIOContext *pb, uint64_t len) +static int klv_encode_ber_length(AVIOContext *pb, uint64_t len) { // Determine the best BER size int size; if (len < 128) { //short form - put_byte(pb, len); + avio_w8(pb, len); return 1; } size = (av_log2(len) >> 3) + 1; // long form - put_byte(pb, 0x80 + size); + avio_w8(pb, 0x80 + size); while(size) { size--; - put_byte(pb, len >> 8 * size & 0xff); + avio_w8(pb, len >> 8 * size & 0xff); } return 0; } +static void klv_encode_ber4_length(AVIOContext *pb, int len) +{ + avio_w8(pb, 0x80 + 3); + avio_wb24(pb, len); +} + /* * Get essence container ul index */ -static int mxf_get_essence_container_ul_index(enum CodecID id) +static int mxf_get_essence_container_ul_index(enum AVCodecID id) { int i; for (i = 0; mxf_essence_mappings[i].id; i++) @@ -303,33 +377,33 @@ static int mxf_get_essence_container_ul_index(enum CodecID id) static void mxf_write_primer_pack(AVFormatContext *s) { - ByteIOContext *pb = s->pb; + AVIOContext *pb = s->pb; int local_tag_number, i = 0; local_tag_number = FF_ARRAY_ELEMS(mxf_local_tag_batch); - put_buffer(pb, primer_pack_key, 16); + avio_write(pb, primer_pack_key, 16); klv_encode_ber_length(pb, local_tag_number * 18 + 8); - put_be32(pb, local_tag_number); // local_tag num - put_be32(pb, 18); // item size, always 18 according to the specs + avio_wb32(pb, local_tag_number); // local_tag num + avio_wb32(pb, 18); // item size, always 18 according to the specs for (i = 0; i < local_tag_number; i++) { - put_be16(pb, mxf_local_tag_batch[i].local_tag); - put_buffer(pb, mxf_local_tag_batch[i].uid, 16); + avio_wb16(pb, mxf_local_tag_batch[i].local_tag); + avio_write(pb, mxf_local_tag_batch[i].uid, 16); } } -static void mxf_write_local_tag(ByteIOContext *pb, int size, int tag) +static void mxf_write_local_tag(AVIOContext *pb, int size, int tag) { - put_be16(pb, tag); - put_be16(pb, size); + avio_wb16(pb, tag); + avio_wb16(pb, size); } -static void mxf_write_metadata_key(ByteIOContext *pb, unsigned int value) +static void mxf_write_metadata_key(AVIOContext *pb, unsigned int value) { - put_buffer(pb, header_metadata_key, 13); - put_be24(pb, value); + avio_write(pb, header_metadata_key, 13); + avio_wb24(pb, value); } static void mxf_free(AVFormatContext *s) @@ -356,25 +430,25 @@ static const MXFCodecUL *mxf_get_data_definition_ul(int type) static void mxf_write_essence_container_refs(AVFormatContext *s) { MXFContext *c = s->priv_data; - ByteIOContext *pb = s->pb; + AVIOContext *pb = s->pb; int i; mxf_write_refs_count(pb, c->essence_container_count); av_log(s,AV_LOG_DEBUG, "essence container count:%d\n", c->essence_container_count); for (i = 0; i < c->essence_container_count; i++) { - put_buffer(pb, mxf_essence_container_uls[c->essence_containers_indices[i]].container_ul, 16); - PRINT_KEY(s, "essence container ul:\n", mxf_essence_container_uls[c->essence_containers_indices[i]].container_ul); + MXFStreamContext *sc = s->streams[i]->priv_data; + avio_write(pb, mxf_essence_container_uls[sc->index].container_ul, 16); } } static void mxf_write_preface(AVFormatContext *s) { MXFContext *mxf = s->priv_data; - ByteIOContext *pb = s->pb; + AVIOContext *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); + klv_encode_ber_length(pb, 130 + 16LL * mxf->essence_container_count); // write preface set uid mxf_write_local_tag(pb, 16, 0x3C0A); @@ -383,11 +457,11 @@ static void mxf_write_preface(AVFormatContext *s) // last modified date mxf_write_local_tag(pb, 8, 0x3B02); - put_be64(pb, mxf->timestamp); + avio_wb64(pb, mxf->timestamp); // write version mxf_write_local_tag(pb, 2, 0x3B05); - put_be16(pb, 1); + avio_wb16(pb, 258); // v1.2 // write identification_refs mxf_write_local_tag(pb, 16 + 8, 0x3B06); @@ -400,12 +474,7 @@ static void mxf_write_preface(AVFormatContext *s) // operational pattern mxf_write_local_tag(pb, 16, 0x3B09); - if (s->nb_streams > 1) { - put_buffer(pb, op1a_ul, 14); - put_be16(pb, 0x0900); // multi track - } else { - put_buffer(pb, op1a_ul, 16); - } + avio_write(pb, op1a_ul, 16); // write essence_container_refs mxf_write_local_tag(pb, 8 + 16 * mxf->essence_container_count, 0x3B0A); @@ -413,25 +482,25 @@ static void mxf_write_preface(AVFormatContext *s) // write dm_scheme_refs mxf_write_local_tag(pb, 8, 0x3B0B); - put_be64(pb, 0); + avio_wb64(pb, 0); } /* * Write a local tag containing an ascii string as utf-16 */ -static void mxf_write_local_tag_utf16(ByteIOContext *pb, int tag, const char *value) +static void mxf_write_local_tag_utf16(AVIOContext *pb, int tag, const char *value) { int i, size = strlen(value); mxf_write_local_tag(pb, size*2, tag); for (i = 0; i < size; i++) - put_be16(pb, value[i]); + avio_wb16(pb, value[i]); } static void mxf_write_identification(AVFormatContext *s) { MXFContext *mxf = s->priv_data; - ByteIOContext *pb = s->pb; - const char *company = "FFmpeg"; + AVIOContext *pb = s->pb; + const char *company = "Libav"; const char *product = "OP1a Muxer"; const char *version; int length; @@ -439,7 +508,7 @@ static void mxf_write_identification(AVFormatContext *s) mxf_write_metadata_key(pb, 0x013000); PRINT_KEY(s, "identification key", pb->buf_ptr - 16); - version = s->streams[0]->codec->flags & CODEC_FLAG_BITEXACT ? + version = s->flags & AVFMT_FLAG_BITEXACT ? "0.0.0" : AV_STRINGIFY(LIBAVFORMAT_VERSION); length = 84 + (strlen(company)+strlen(product)+strlen(version))*2; // utf-16 klv_encode_ber_length(pb, length); @@ -463,12 +532,12 @@ static void mxf_write_identification(AVFormatContext *s) // modification date mxf_write_local_tag(pb, 8, 0x3C06); - put_be64(pb, mxf->timestamp); + avio_wb64(pb, mxf->timestamp); } static void mxf_write_content_storage(AVFormatContext *s) { - ByteIOContext *pb = s->pb; + AVIOContext *pb = s->pb; mxf_write_metadata_key(pb, 0x011800); PRINT_KEY(s, "content storage key", pb->buf_ptr - 16); @@ -494,7 +563,7 @@ static void mxf_write_content_storage(AVFormatContext *s) static void mxf_write_track(AVFormatContext *s, AVStream *st, enum MXFMetadataSetType type) { MXFContext *mxf = s->priv_data; - ByteIOContext *pb = s->pb; + AVIOContext *pb = s->pb; MXFStreamContext *sc = st->priv_data; mxf_write_metadata_key(pb, 0x013b00); @@ -508,22 +577,22 @@ static void mxf_write_track(AVFormatContext *s, AVStream *st, enum MXFMetadataSe // write track id mxf_write_local_tag(pb, 4, 0x4801); - put_be32(pb, st->index); + avio_wb32(pb, st->index+2); // write track number mxf_write_local_tag(pb, 4, 0x4804); if (type == MaterialPackage) - put_be32(pb, 0); // track number of material package is 0 + avio_wb32(pb, 0); // track number of material package is 0 else - put_buffer(pb, sc->track_essence_element_key + 12, 4); + avio_write(pb, sc->track_essence_element_key + 12, 4); mxf_write_local_tag(pb, 8, 0x4B01); - put_be32(pb, mxf->time_base.den); - put_be32(pb, mxf->time_base.num); + avio_wb32(pb, mxf->time_base.den); + avio_wb32(pb, mxf->time_base.num); // write origin mxf_write_local_tag(pb, 8, 0x4B02); - put_be64(pb, 0); + avio_wb64(pb, 0); // write sequence refs mxf_write_local_tag(pb, 16, 0x4803); @@ -535,26 +604,26 @@ static const uint8_t smpte_12m_timecode_track_data_ul[] = { 0x06,0x0E,0x2B,0x34, static void mxf_write_common_fields(AVFormatContext *s, AVStream *st) { MXFContext *mxf = s->priv_data; - ByteIOContext *pb = s->pb; + AVIOContext *pb = s->pb; // find data define uls mxf_write_local_tag(pb, 16, 0x0201); if (st == mxf->timecode_track) - put_buffer(pb, smpte_12m_timecode_track_data_ul, 16); + avio_write(pb, smpte_12m_timecode_track_data_ul, 16); else { - const MXFCodecUL *data_def_ul = mxf_get_data_definition_ul(st->codec->codec_type); - put_buffer(pb, data_def_ul->uid, 16); + const MXFCodecUL *data_def_ul = mxf_get_data_definition_ul(st->codecpar->codec_type); + avio_write(pb, data_def_ul->uid, 16); } // write duration mxf_write_local_tag(pb, 8, 0x0202); - put_be64(pb, mxf->duration); + avio_wb64(pb, mxf->duration); } static void mxf_write_sequence(AVFormatContext *s, AVStream *st, enum MXFMetadataSetType type) { MXFContext *mxf = s->priv_data; - ByteIOContext *pb = s->pb; + AVIOContext *pb = s->pb; enum MXFMetadataSetType component; mxf_write_metadata_key(pb, 0x010f00); @@ -572,43 +641,44 @@ static void mxf_write_sequence(AVFormatContext *s, AVStream *st, enum MXFMetadat mxf_write_refs_count(pb, 1); if (st == mxf->timecode_track) component = TimecodeComponent; - else if (type == MaterialPackage) - component = SourceClip; else - component = SourceClip+TypeBottom; + component = SourceClip; + if (type == SourcePackage) + component += TypeBottom; mxf_write_uuid(pb, component, st->index); } -static void mxf_write_timecode_component(AVFormatContext *s, AVStream *st) +static void mxf_write_timecode_component(AVFormatContext *s, AVStream *st, enum MXFMetadataSetType type) { MXFContext *mxf = s->priv_data; - ByteIOContext *pb = s->pb; + AVIOContext *pb = s->pb; mxf_write_metadata_key(pb, 0x011400); klv_encode_ber_length(pb, 75); // UID mxf_write_local_tag(pb, 16, 0x3C0A); - mxf_write_uuid(pb, TimecodeComponent, st->index); + mxf_write_uuid(pb, type == MaterialPackage ? TimecodeComponent : + TimecodeComponent + TypeBottom, st->index); mxf_write_common_fields(s, st); // Start Time Code mxf_write_local_tag(pb, 8, 0x1501); - put_be64(pb, mxf->timecode_start); + avio_wb64(pb, mxf->timecode_start); // Rounded Time Code Base mxf_write_local_tag(pb, 2, 0x1502); - put_be16(pb, mxf->timecode_base); + avio_wb16(pb, mxf->timecode_base); // Drop Frame mxf_write_local_tag(pb, 1, 0x1503); - put_byte(pb, mxf->timecode_drop_frame); + avio_w8(pb, mxf->timecode_drop_frame); } static void mxf_write_structural_component(AVFormatContext *s, AVStream *st, enum MXFMetadataSetType type) { - ByteIOContext *pb = s->pb; + AVIOContext *pb = s->pb; int i; mxf_write_metadata_key(pb, 0x011100); @@ -624,33 +694,34 @@ static void mxf_write_structural_component(AVFormatContext *s, AVStream *st, enu // write start_position mxf_write_local_tag(pb, 8, 0x1201); - put_be64(pb, 0); + avio_wb64(pb, 0); // write source package uid, end of the reference mxf_write_local_tag(pb, 32, 0x1101); if (type == SourcePackage) { for (i = 0; i < 4; i++) - put_be64(pb, 0); + avio_wb64(pb, 0); } else - mxf_write_umid(pb, SourcePackage, 0); + mxf_write_umid(s, 1); // write source track id mxf_write_local_tag(pb, 4, 0x1102); if (type == SourcePackage) - put_be32(pb, 0); + avio_wb32(pb, 0); else - put_be32(pb, st->index); + avio_wb32(pb, st->index+2); } static void mxf_write_multi_descriptor(AVFormatContext *s) { MXFContext *mxf = s->priv_data; - ByteIOContext *pb = s->pb; + AVIOContext *pb = s->pb; + const uint8_t *ul; 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); + klv_encode_ber_length(pb, 64 + 16LL * s->nb_streams); mxf_write_local_tag(pb, 16, 0x3C0A); mxf_write_uuid(pb, MultipleDescriptor, 0); @@ -658,12 +729,18 @@ static void mxf_write_multi_descriptor(AVFormatContext *s) // write sample rate mxf_write_local_tag(pb, 8, 0x3001); - put_be32(pb, mxf->time_base.den); - put_be32(pb, mxf->time_base.num); + avio_wb32(pb, mxf->time_base.den); + avio_wb32(pb, mxf->time_base.num); // write essence container ul mxf_write_local_tag(pb, 16, 0x3004); - put_buffer(pb, multiple_desc_ul, 16); + if (mxf->essence_container_count > 1) + ul = multiple_desc_ul; + else { + MXFStreamContext *sc = s->streams[0]->priv_data; + ul = mxf_essence_container_uls[sc->index].container_ul; + } + avio_write(pb, ul, 16); // write sub descriptor refs mxf_write_local_tag(pb, s->nb_streams * 16 + 8, 0x3F01); @@ -676,69 +753,74 @@ static void mxf_write_generic_desc(AVFormatContext *s, AVStream *st, const UID k { MXFContext *mxf = s->priv_data; MXFStreamContext *sc = st->priv_data; - ByteIOContext *pb = s->pb; + AVIOContext *pb = s->pb; - put_buffer(pb, key, 16); - klv_encode_ber_length(pb, size); + avio_write(pb, key, 16); + klv_encode_ber4_length(pb, size+20+8+12+20); 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); + avio_wb32(pb, st->index+2); mxf_write_local_tag(pb, 8, 0x3001); - put_be32(pb, mxf->time_base.den); - put_be32(pb, mxf->time_base.num); + avio_wb32(pb, mxf->time_base.den); + avio_wb32(pb, mxf->time_base.num); mxf_write_local_tag(pb, 16, 0x3004); - put_buffer(pb, mxf_essence_container_uls[sc->index].container_ul, 16); + avio_write(pb, mxf_essence_container_uls[sc->index].container_ul, 16); } 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 const UID mxf_aes3_descriptor_key = { 0x06,0x0E,0x2B,0x34,0x02,0x53,0x01,0x01,0x0d,0x01,0x01,0x01,0x01,0x01,0x47,0x00 }; +static const UID mxf_cdci_descriptor_key = { 0x06,0x0E,0x2B,0x34,0x02,0x53,0x01,0x01,0x0D,0x01,0x01,0x01,0x01,0x01,0x28,0x00 }; +static const UID mxf_generic_sound_descriptor_key = { 0x06,0x0E,0x2B,0x34,0x02,0x53,0x01,0x01,0x0D,0x01,0x01,0x01,0x01,0x01,0x42,0x00 }; -static void mxf_write_mpegvideo_desc(AVFormatContext *s, AVStream *st) +static void mxf_write_cdci_common(AVFormatContext *s, AVStream *st, const UID key, unsigned size) { MXFStreamContext *sc = st->priv_data; - ByteIOContext *pb = s->pb; - int stored_height = (st->codec->height+15)/16*16; - AVRational dar; + AVIOContext *pb = s->pb; + int stored_height = (st->codecpar->height+15)/16*16; + int display_height; int f1, f2; - mxf_write_generic_desc(s, st, mxf_mpegvideo_descriptor_key, 169+sc->interlaced*4); + mxf_write_generic_desc(s, st, key, size+8+8+8+8+8+8+5+16+sc->interlaced*4+12+20); mxf_write_local_tag(pb, 4, 0x3203); - put_be32(pb, st->codec->width); + avio_wb32(pb, st->codecpar->width); mxf_write_local_tag(pb, 4, 0x3202); - put_be32(pb, stored_height>>sc->interlaced); + avio_wb32(pb, stored_height>>sc->interlaced); mxf_write_local_tag(pb, 4, 0x3209); - put_be32(pb, st->codec->width); + avio_wb32(pb, st->codecpar->width); + + if (st->codecpar->height == 608) // PAL + VBI + display_height = 576; + else if (st->codecpar->height == 512) // NTSC + VBI + display_height = 486; + else + display_height = st->codecpar->height; mxf_write_local_tag(pb, 4, 0x3208); - put_be32(pb, st->codec->height>>sc->interlaced); + avio_wb32(pb, display_height>>sc->interlaced); // component depth mxf_write_local_tag(pb, 4, 0x3301); - put_be32(pb, 8); + avio_wb32(pb, 8); // horizontal subsampling mxf_write_local_tag(pb, 4, 0x3302); - put_be32(pb, 2); - - // bit rate - mxf_write_local_tag(pb, 4, 0x8000); - put_be32(pb, st->codec->bit_rate); + avio_wb32(pb, 2); // frame layout mxf_write_local_tag(pb, 1, 0x320C); - put_byte(pb, sc->interlaced); + avio_w8(pb, sc->interlaced); // video line map - switch (st->codec->height) { + switch (st->codecpar->height) { case 576: f1 = 23; f2 = 336; break; case 608: f1 = 7; f2 = 320; break; case 480: f1 = 20; f2 = 283; break; @@ -754,84 +836,105 @@ static void mxf_write_mpegvideo_desc(AVFormatContext *s, AVStream *st) } mxf_write_local_tag(pb, 12+sc->interlaced*4, 0x320D); - put_be32(pb, sc->interlaced ? 2 : 1); - put_be32(pb, 4); - put_be32(pb, f1); + avio_wb32(pb, sc->interlaced ? 2 : 1); + avio_wb32(pb, 4); + avio_wb32(pb, f1); if (sc->interlaced) - put_be32(pb, f2); - - av_reduce(&dar.num, &dar.den, - st->codec->width*st->codec->sample_aspect_ratio.num, - st->codec->height*st->codec->sample_aspect_ratio.den, - 1024*1024); + avio_wb32(pb, f2); mxf_write_local_tag(pb, 8, 0x320E); - put_be32(pb, dar.num); - put_be32(pb, dar.den); + avio_wb32(pb, sc->aspect_ratio.num); + avio_wb32(pb, sc->aspect_ratio.den); mxf_write_local_tag(pb, 16, 0x3201); - put_buffer(pb, *sc->codec_ul, 16); + avio_write(pb, *sc->codec_ul, 16); } -static void mxf_write_generic_sound_desc(AVFormatContext *s, AVStream *st, const UID key, unsigned size) +static void mxf_write_cdci_desc(AVFormatContext *s, AVStream *st) { - ByteIOContext *pb = s->pb; + mxf_write_cdci_common(s, st, mxf_cdci_descriptor_key, 0); +} - mxf_write_generic_desc(s, st, key, size); +static void mxf_write_mpegvideo_desc(AVFormatContext *s, AVStream *st) +{ + AVIOContext *pb = s->pb; + int profile_and_level = (st->codecpar->profile<<4) | st->codecpar->level; + + mxf_write_cdci_common(s, st, mxf_mpegvideo_descriptor_key, 8+5); + + // bit rate + mxf_write_local_tag(pb, 4, 0x8000); + avio_wb32(pb, st->codecpar->bit_rate); + + // profile and level + mxf_write_local_tag(pb, 1, 0x8007); + if (!st->codecpar->profile) + profile_and_level |= 0x80; // escape bit + avio_w8(pb, profile_and_level); +} + +static void mxf_write_generic_sound_common(AVFormatContext *s, AVStream *st, const UID key, unsigned size) +{ + AVIOContext *pb = s->pb; + + mxf_write_generic_desc(s, st, key, size+5+12+8+8); // audio locked mxf_write_local_tag(pb, 1, 0x3D02); - put_byte(pb, 1); + avio_w8(pb, 1); // write audio sampling rate mxf_write_local_tag(pb, 8, 0x3D03); - put_be32(pb, st->codec->sample_rate); - put_be32(pb, 1); + avio_wb32(pb, st->codecpar->sample_rate); + avio_wb32(pb, 1); mxf_write_local_tag(pb, 4, 0x3D07); - put_be32(pb, st->codec->channels); + avio_wb32(pb, st->codecpar->channels); mxf_write_local_tag(pb, 4, 0x3D01); - put_be32(pb, av_get_bits_per_sample(st->codec->codec_id)); + avio_wb32(pb, av_get_bits_per_sample(st->codecpar->codec_id)); } -static void mxf_write_wav_common_desc(AVFormatContext *s, AVStream *st, const UID key, unsigned size) +static void mxf_write_wav_common(AVFormatContext *s, AVStream *st, const UID key, unsigned size) { - ByteIOContext *pb = s->pb; + AVIOContext *pb = s->pb; - mxf_write_generic_sound_desc(s, st, key, size); + mxf_write_generic_sound_common(s, st, key, size+6+8); mxf_write_local_tag(pb, 2, 0x3D0A); - put_be16(pb, st->codec->block_align); + avio_wb16(pb, st->codecpar->block_align); // avg bytes per sec mxf_write_local_tag(pb, 4, 0x3D09); - put_be32(pb, st->codec->block_align*st->codec->sample_rate); + avio_wb32(pb, st->codecpar->block_align*st->codecpar->sample_rate); } static void mxf_write_wav_desc(AVFormatContext *s, AVStream *st) { - mxf_write_wav_common_desc(s, st, mxf_wav_descriptor_key, 107); + mxf_write_wav_common(s, st, mxf_wav_descriptor_key, 0); } static void mxf_write_aes3_desc(AVFormatContext *s, AVStream *st) { - mxf_write_wav_common_desc(s, st, mxf_aes3_descriptor_key, 107); + mxf_write_wav_common(s, st, mxf_aes3_descriptor_key, 0); +} + +static void mxf_write_generic_sound_desc(AVFormatContext *s, AVStream *st) +{ + mxf_write_generic_sound_common(s, st, mxf_generic_sound_descriptor_key, 0); } static void mxf_write_package(AVFormatContext *s, enum MXFMetadataSetType type) { MXFContext *mxf = s->priv_data; - ByteIOContext *pb = s->pb; - int i, track_count; + AVIOContext *pb = s->pb; + int i, track_count = s->nb_streams+1; if (type == MaterialPackage) { - track_count = s->nb_streams + 1; // add timecode track mxf_write_metadata_key(pb, 0x013600); PRINT_KEY(s, "Material Package key", pb->buf_ptr - 16); klv_encode_ber_length(pb, 92 + 16*track_count); } else { - track_count = s->nb_streams; mxf_write_metadata_key(pb, 0x013700); PRINT_KEY(s, "Source Package key", pb->buf_ptr - 16); klv_encode_ber_length(pb, 112 + 16*track_count); // 20 bytes length for descriptor reference @@ -845,24 +948,24 @@ static void mxf_write_package(AVFormatContext *s, enum MXFMetadataSetType type) // write package umid mxf_write_local_tag(pb, 32, 0x4401); - mxf_write_umid(pb, type, 0); + mxf_write_umid(s, type == SourcePackage); PRINT_KEY(s, "package umid second part", pb->buf_ptr - 16); // package creation date mxf_write_local_tag(pb, 8, 0x4405); - put_be64(pb, mxf->timestamp); + avio_wb64(pb, mxf->timestamp); // package modified date mxf_write_local_tag(pb, 8, 0x4404); - put_be64(pb, mxf->timestamp); + avio_wb64(pb, mxf->timestamp); // write track refs mxf_write_local_tag(pb, track_count*16 + 8, 0x4403); mxf_write_refs_count(pb, track_count); + mxf_write_uuid(pb, type == MaterialPackage ? Track : + Track + TypeBottom, -1); // timecode track for (i = 0; i < s->nb_streams; i++) mxf_write_uuid(pb, type == MaterialPackage ? Track : Track + TypeBottom, i); - if (type == MaterialPackage) - mxf_write_uuid(pb, Track, s->nb_streams); // timecode track // write multiple descriptor reference if (type == SourcePackage) { @@ -872,13 +975,13 @@ static void mxf_write_package(AVFormatContext *s, enum MXFMetadataSetType type) mxf_write_multi_descriptor(s); } else mxf_write_uuid(pb, SubDescriptor, 0); - } else { - // write timecode track - mxf_write_track(s, mxf->timecode_track, type); - mxf_write_sequence(s, mxf->timecode_track, type); - mxf_write_timecode_component(s, mxf->timecode_track); } + // write timecode track + mxf_write_track(s, mxf->timecode_track, type); + mxf_write_sequence(s, mxf->timecode_track, type); + mxf_write_timecode_component(s, mxf->timecode_track, type); + for (i = 0; i < s->nb_streams; i++) { AVStream *st = s->streams[i]; mxf_write_track(s, st, type); @@ -894,7 +997,7 @@ static void mxf_write_package(AVFormatContext *s, enum MXFMetadataSetType type) static int mxf_write_essence_container_data(AVFormatContext *s) { - ByteIOContext *pb = s->pb; + AVIOContext *pb = s->pb; mxf_write_metadata_key(pb, 0x012300); klv_encode_ber_length(pb, 72); @@ -903,13 +1006,13 @@ static int mxf_write_essence_container_data(AVFormatContext *s) mxf_write_uuid(pb, EssenceContainerData, 0); mxf_write_local_tag(pb, 32, 0x2701); // Linked Package UID - mxf_write_umid(pb, SourcePackage, 0); + mxf_write_umid(s, 1); mxf_write_local_tag(pb, 4, 0x3F07); // BodySID - put_be32(pb, 1); + avio_wb32(pb, 1); mxf_write_local_tag(pb, 4, 0x3F06); // IndexSID - put_be32(pb, 2); + avio_wb32(pb, 2); return 0; } @@ -928,7 +1031,7 @@ static int mxf_write_header_metadata_sets(AVFormatContext *s) static unsigned klv_fill_size(uint64_t size) { unsigned pad = KAG_SIZE - (size & (KAG_SIZE-1)); - if (pad < 17) // smallest fill item possible + if (pad < 20) // smallest fill item possible return pad + KAG_SIZE; else return pad & (KAG_SIZE-1); @@ -937,19 +1040,23 @@ static unsigned klv_fill_size(uint64_t size) static void mxf_write_index_table_segment(AVFormatContext *s) { MXFContext *mxf = s->priv_data; - ByteIOContext *pb = s->pb; - int i, j; - int temporal_reordering = 0; + AVIOContext *pb = s->pb; + int i, j, temporal_reordering = 0; int key_index = mxf->last_key_index; av_log(s, AV_LOG_DEBUG, "edit units count %d\n", mxf->edit_units_count); - if (!mxf->edit_units_count) + if (!mxf->edit_units_count && !mxf->edit_unit_byte_count) return; - put_buffer(pb, index_table_segment_key, 16); - klv_encode_ber_length(pb, 109 + (s->nb_streams+1)*6 + - mxf->edit_units_count*(11+mxf->slice_count*4)); + avio_write(pb, index_table_segment_key, 16); + + if (mxf->edit_unit_byte_count) { + klv_encode_ber_length(pb, 80); + } else { + klv_encode_ber_length(pb, 85 + 12+(s->nb_streams+1LL)*6 + + 12+mxf->edit_units_count*(11+mxf->slice_count*4LL)); + } // instance id mxf_write_local_tag(pb, 16, 0x3C0A); @@ -957,194 +1064,195 @@ static void mxf_write_index_table_segment(AVFormatContext *s) // index edit rate mxf_write_local_tag(pb, 8, 0x3F0B); - put_be32(pb, mxf->time_base.num); - put_be32(pb, mxf->time_base.den); + avio_wb32(pb, mxf->time_base.den); + avio_wb32(pb, mxf->time_base.num); // index start position mxf_write_local_tag(pb, 8, 0x3F0C); - put_be64(pb, mxf->last_indexed_edit_unit); + avio_wb64(pb, mxf->last_indexed_edit_unit); // index duration mxf_write_local_tag(pb, 8, 0x3F0D); - put_be64(pb, mxf->edit_units_count); + if (mxf->edit_unit_byte_count) + avio_wb64(pb, 0); // index table covers whole container + else + avio_wb64(pb, mxf->edit_units_count); // edit unit byte count mxf_write_local_tag(pb, 4, 0x3F05); - put_be32(pb, 0); + avio_wb32(pb, mxf->edit_unit_byte_count); // index sid mxf_write_local_tag(pb, 4, 0x3F06); - put_be32(pb, 2); + avio_wb32(pb, 2); // body sid mxf_write_local_tag(pb, 4, 0x3F07); - put_be32(pb, 1); - - // real slice count - 1 - mxf_write_local_tag(pb, 1, 0x3F08); - put_byte(pb, mxf->slice_count); - - // delta entry array - mxf_write_local_tag(pb, 8 + (s->nb_streams+1)*6, 0x3F09); - put_be32(pb, s->nb_streams+1); // num of entries - put_be32(pb, 6); // size of one entry - // write system item delta entry - put_byte(pb, 0); - put_byte(pb, 0); // slice entry - put_be32(pb, 0); // element delta - for (i = 0; i < s->nb_streams; i++) { - AVStream *st = s->streams[i]; - MXFStreamContext *sc = st->priv_data; - put_byte(pb, sc->temporal_reordering); - if (sc->temporal_reordering) - temporal_reordering = 1; - // slice number - if (i == 0) { // video track - put_byte(pb, 0); // slice number - put_be32(pb, KAG_SIZE); // system item size including klv fill - } else { // audio track - unsigned audio_frame_size = sc->aic.samples[0]*sc->aic.sample_size; - audio_frame_size += klv_fill_size(audio_frame_size); - put_byte(pb, 1); - put_be32(pb, (i-1)*audio_frame_size); // element delta + avio_wb32(pb, 1); + + if (!mxf->edit_unit_byte_count) { + // real slice count - 1 + mxf_write_local_tag(pb, 1, 0x3F08); + avio_w8(pb, mxf->slice_count); + + // delta entry array + mxf_write_local_tag(pb, 8 + (s->nb_streams+1)*6, 0x3F09); + avio_wb32(pb, s->nb_streams+1); // num of entries + avio_wb32(pb, 6); // size of one entry + // write system item delta entry + avio_w8(pb, 0); + avio_w8(pb, 0); // slice entry + avio_wb32(pb, 0); // element delta + for (i = 0; i < s->nb_streams; i++) { + AVStream *st = s->streams[i]; + MXFStreamContext *sc = st->priv_data; + avio_w8(pb, sc->temporal_reordering); + if (sc->temporal_reordering) + temporal_reordering = 1; + if (i == 0) { // video track + avio_w8(pb, 0); // slice number + avio_wb32(pb, KAG_SIZE); // system item size including klv fill + } else { // audio track + unsigned audio_frame_size = sc->aic.samples[0]*sc->aic.sample_size; + audio_frame_size += klv_fill_size(audio_frame_size); + avio_w8(pb, 1); + avio_wb32(pb, (i-1)*audio_frame_size); // element delta + } } - } - mxf_write_local_tag(pb, 8 + mxf->edit_units_count*(11+mxf->slice_count*4), 0x3F0A); - put_be32(pb, mxf->edit_units_count); // num of entries - put_be32(pb, 11+mxf->slice_count*4); // size of one entry - for (i = 0; i < mxf->edit_units_count; i++) { - if (temporal_reordering) { + mxf_write_local_tag(pb, 8 + mxf->edit_units_count*(11+mxf->slice_count*4), 0x3F0A); + avio_wb32(pb, mxf->edit_units_count); // num of entries + avio_wb32(pb, 11+mxf->slice_count*4); // size of one entry + + for (i = 0; i < mxf->edit_units_count; i++) { int temporal_offset = 0; - for (j = i+1; j < mxf->edit_units_count; j++) { - temporal_offset++; - if (mxf->index_entries[j].flags & 0x10) { // backward prediction - // next is not b, so is reordered - if (!(mxf->index_entries[i+1].flags & 0x10)) { - if ((mxf->index_entries[i].flags & 0x11) == 0) // i frame - temporal_offset = 0; - else - temporal_offset = -temporal_offset; + + if (!(mxf->index_entries[i].flags & 0x33)) { // I-frame + mxf->last_key_index = key_index; + key_index = i; + } + + if (temporal_reordering) { + int pic_num_in_gop = i - key_index; + if (pic_num_in_gop != mxf->index_entries[i].temporal_ref) { + for (j = key_index; j < mxf->edit_units_count; j++) { + if (pic_num_in_gop == mxf->index_entries[j].temporal_ref) + break; } - break; + if (j == mxf->edit_units_count) + av_log(s, AV_LOG_WARNING, "missing frames\n"); + temporal_offset = j - key_index - pic_num_in_gop; } } - put_byte(pb, temporal_offset); - } else - put_byte(pb, 0); - if (!(mxf->index_entries[i].flags & 0x33)) { // I frame - mxf->last_key_index = key_index; - key_index = i; - } - if (mxf->index_entries[i].flags & 0x10 && // backward prediction - !(mxf->index_entries[key_index].flags & 0x80)) { // open gop - put_byte(pb, mxf->last_key_index - i); - } else { - put_byte(pb, key_index - i); // key frame offset - if ((mxf->index_entries[i].flags & 0x20) == 0x20) // only forward - mxf->last_key_index = key_index; + avio_w8(pb, temporal_offset); + + if ((mxf->index_entries[i].flags & 0x30) == 0x30) { // back and forward prediction + avio_w8(pb, mxf->last_key_index - i); + } else { + avio_w8(pb, key_index - i); // key frame offset + if ((mxf->index_entries[i].flags & 0x20) == 0x20) // only forward + mxf->last_key_index = key_index; + } + + if (!(mxf->index_entries[i].flags & 0x33) && // I-frame + mxf->index_entries[i].flags & 0x40 && !temporal_offset) + mxf->index_entries[i].flags |= 0x80; // random access + avio_w8(pb, mxf->index_entries[i].flags); + // stream offset + avio_wb64(pb, mxf->index_entries[i].offset); + if (s->nb_streams > 1) + avio_wb32(pb, mxf->index_entries[i].slice_offset); } - put_byte(pb, mxf->index_entries[i].flags); - // stream offset - put_be64(pb, mxf->index_entries[i].offset - mxf->first_edit_unit_offset); - if (s->nb_streams > 1) - put_be32(pb, mxf->index_entries[i].slice_offset); - } - mxf->last_key_index = key_index - mxf->edit_units_count; - mxf->last_indexed_edit_unit += mxf->edit_units_count; - mxf->edit_units_count = 0; + mxf->last_key_index = key_index - mxf->edit_units_count; + mxf->last_indexed_edit_unit += mxf->edit_units_count; + mxf->edit_units_count = 0; + } } static void mxf_write_klv_fill(AVFormatContext *s) { - unsigned pad = klv_fill_size(url_ftell(s->pb)); + unsigned pad = klv_fill_size(avio_tell(s->pb)); if (pad) { - put_buffer(s->pb, klv_fill_key, 16); - pad -= 16; - pad -= klv_ber_length(pad); - klv_encode_ber_length(s->pb, pad); - for (; pad > 7; pad -= 8) - put_be64(s->pb, 0); + avio_write(s->pb, klv_fill_key, 16); + pad -= 16 + 4; + klv_encode_ber4_length(s->pb, pad); for (; pad; pad--) - put_byte(s->pb, 0); - assert(!(url_ftell(s->pb) & (KAG_SIZE-1))); + avio_w8(s->pb, 0); + assert(!(avio_tell(s->pb) & (KAG_SIZE-1))); } } -static void mxf_write_partition(AVFormatContext *s, int bodysid, +static int mxf_write_partition(AVFormatContext *s, int bodysid, int indexsid, const uint8_t *key, int write_metadata) { MXFContext *mxf = s->priv_data; - ByteIOContext *pb = s->pb; + AVIOContext *pb = s->pb; int64_t header_byte_count_offset; unsigned index_byte_count = 0; - uint64_t partition_offset = url_ftell(pb); + uint64_t partition_offset = avio_tell(pb); + int err; - if (mxf->edit_units_count) { - index_byte_count = 109 + (s->nb_streams+1)*6 + - mxf->edit_units_count*(11+mxf->slice_count*4); + if (!mxf->edit_unit_byte_count && mxf->edit_units_count) + index_byte_count = 85 + 12+(s->nb_streams+1)*6 + + 12+mxf->edit_units_count*(11+mxf->slice_count*4); + else if (mxf->edit_unit_byte_count && indexsid) + index_byte_count = 80; + + if (index_byte_count) { // add encoded ber length index_byte_count += 16 + klv_ber_length(index_byte_count); index_byte_count += klv_fill_size(index_byte_count); } if (!memcmp(key, body_partition_key, 16)) { - mxf->body_partition_offset = - av_realloc(mxf->body_partition_offset, - (mxf->body_partitions_count+1)* - sizeof(*mxf->body_partition_offset)); + if ((err = av_reallocp_array(&mxf->body_partition_offset, mxf->body_partitions_count + 1, + sizeof(*mxf->body_partition_offset))) < 0) { + mxf->body_partitions_count = 0; + return err; + } mxf->body_partition_offset[mxf->body_partitions_count++] = partition_offset; } // write klv - put_buffer(pb, key, 16); - - klv_encode_ber_length(pb, 88 + 16 * mxf->essence_container_count); + avio_write(pb, key, 16); + klv_encode_ber_length(pb, 88 + 16LL * mxf->essence_container_count); // write partition value - put_be16(pb, 1); // majorVersion - put_be16(pb, 2); // minorVersion - put_be32(pb, KAG_SIZE); // KAGSize + avio_wb16(pb, 1); // majorVersion + avio_wb16(pb, 2); // minorVersion + avio_wb32(pb, KAG_SIZE); // KAGSize - put_be64(pb, partition_offset); // ThisPartition + avio_wb64(pb, partition_offset); // ThisPartition if (!memcmp(key, body_partition_key, 16) && mxf->body_partitions_count > 1) - put_be64(pb, mxf->body_partition_offset[mxf->body_partitions_count-2]); // PreviousPartition - else if (!memcmp(key, footer_partition_key, 16)) - put_be64(pb, mxf->body_partition_offset[mxf->body_partitions_count-1]); // PreviousPartition + avio_wb64(pb, mxf->body_partition_offset[mxf->body_partitions_count-2]); // PreviousPartition + else if (!memcmp(key, footer_partition_key, 16) && mxf->body_partitions_count) + avio_wb64(pb, mxf->body_partition_offset[mxf->body_partitions_count-1]); // PreviousPartition else - put_be64(pb, 0); + avio_wb64(pb, 0); - put_be64(pb, mxf->footer_partition_offset); // footerPartition + avio_wb64(pb, mxf->footer_partition_offset); // footerPartition // set offset - header_byte_count_offset = url_ftell(pb); - put_be64(pb, 0); // headerByteCount, update later + header_byte_count_offset = avio_tell(pb); + avio_wb64(pb, 0); // headerByteCount, update later // indexTable - put_be64(pb, index_byte_count); // indexByteCount - put_be32(pb, index_byte_count ? indexsid : 0); // indexSID + avio_wb64(pb, index_byte_count); // indexByteCount + avio_wb32(pb, index_byte_count ? indexsid : 0); // indexSID // BodyOffset - if (bodysid && mxf->edit_units_count) { - uint64_t partition_end = url_ftell(pb) + 8 + 4 + 16 + 8 + - 16*mxf->essence_container_count; - put_be64(pb, partition_end + klv_fill_size(partition_end) + - index_byte_count - mxf->first_edit_unit_offset); + if (bodysid && mxf->edit_units_count && mxf->body_partitions_count) { + avio_wb64(pb, mxf->body_offset); } else - put_be64(pb, 0); + avio_wb64(pb, 0); - put_be32(pb, bodysid); // bodySID + avio_wb32(pb, bodysid); // bodySID // operational pattern - if (s->nb_streams > 1) { - put_buffer(pb, op1a_ul, 14); - put_be16(pb, 0x0900); // multi track - } else { - put_buffer(pb, op1a_ul, 16); - } + avio_write(pb, op1a_ul, 16); // essence container mxf_write_essence_container_refs(s); @@ -1155,19 +1263,21 @@ static void mxf_write_partition(AVFormatContext *s, int bodysid, unsigned header_byte_count; mxf_write_klv_fill(s); - start = url_ftell(s->pb); + start = avio_tell(s->pb); mxf_write_primer_pack(s); mxf_write_header_metadata_sets(s); - pos = url_ftell(s->pb); + pos = avio_tell(s->pb); header_byte_count = pos - start + klv_fill_size(pos); // update header_byte_count - url_fseek(pb, header_byte_count_offset, SEEK_SET); - put_be64(pb, header_byte_count); - url_fseek(pb, pos, SEEK_SET); + avio_seek(pb, header_byte_count_offset, SEEK_SET); + avio_wb64(pb, header_byte_count); + avio_seek(pb, pos, SEEK_SET); } - put_flush_packet(pb); + avio_flush(pb); + + return 0; } static const UID mxf_mpeg2_codec_uls[] = { @@ -1179,80 +1289,90 @@ static const UID mxf_mpeg2_codec_uls[] = { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x03,0x03,0x00 }, // MP-HL Long GOP { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x04,0x02,0x00 }, // 422P-HL I-Frame { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x04,0x03,0x00 }, // 422P-HL Long GOP + { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x05,0x02,0x00 }, // MP@H-14 I-Frame + { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x05,0x03,0x00 }, // MP@H-14 Long GOP }; -static const UID *mxf_get_mpeg2_codec_ul(AVCodecContext *avctx) +static const UID *mxf_get_mpeg2_codec_ul(AVCodecParameters *par) { - if (avctx->profile == 4) { // Main - if (avctx->level == 8) // Main - return avctx->gop_size ? - &mxf_mpeg2_codec_uls[1] : - &mxf_mpeg2_codec_uls[0]; - else if (avctx->level == 4) // High - return avctx->gop_size ? - &mxf_mpeg2_codec_uls[5] : - &mxf_mpeg2_codec_uls[4]; - } else if (avctx->profile == 0) { // 422 - if (avctx->level == 5) // Main - return avctx->gop_size ? - &mxf_mpeg2_codec_uls[3] : - &mxf_mpeg2_codec_uls[2]; - else if (avctx->level == 2) // High - return avctx->gop_size ? - &mxf_mpeg2_codec_uls[7] : - &mxf_mpeg2_codec_uls[6]; + int long_gop = 1; + + if (par->profile == 4) { // Main + if (par->level == 8) // Main + return &mxf_mpeg2_codec_uls[0+long_gop]; + else if (par->level == 4) // High + return &mxf_mpeg2_codec_uls[4+long_gop]; + else if (par->level == 6) // High 14 + return &mxf_mpeg2_codec_uls[8+long_gop]; + } else if (par->profile == 0) { // 422 + if (par->level == 5) // Main + return &mxf_mpeg2_codec_uls[2+long_gop]; + else if (par->level == 2) // High + return &mxf_mpeg2_codec_uls[6+long_gop]; } return NULL; } -static int mxf_parse_mpeg2_frame(AVFormatContext *s, AVStream *st, AVPacket *pkt, int *flags) +static int mxf_parse_mpeg2_frame(AVFormatContext *s, AVStream *st, + AVPacket *pkt, MXFIndexEntry *e) { MXFStreamContext *sc = st->priv_data; MXFContext *mxf = s->priv_data; uint32_t c = -1; int i; - *flags = 0; - for(i = 0; i < pkt->size - 4; i++) { c = (c<<8) + pkt->data[i]; - if (c == 0x1B5) { - if (i + 2 < pkt->size && (pkt->data[i+1] & 0xf0) == 0x10) { // seq ext - st->codec->profile = pkt->data[i+1] & 0x07; - st->codec->level = pkt->data[i+2] >> 4; + if (c == 0x1b5) { + if ((pkt->data[i+1] & 0xf0) == 0x10) { // seq ext + st->codecpar->profile = pkt->data[i+1] & 0x07; + st->codecpar->level = pkt->data[i+2] >> 4; } else if (i + 5 < pkt->size && (pkt->data[i+1] & 0xf0) == 0x80) { // pict coding ext sc->interlaced = !(pkt->data[i+5] & 0x80); // progressive frame break; } } else if (c == 0x1b8) { // gop - if (i + 4 < pkt->size) { - if (pkt->data[i+4]>>6 & 0x01) // closed - *flags |= 0x80; // random access - if (!mxf->header_written) { - unsigned hours = (pkt->data[i+1]>>2) & 0x1f; - unsigned minutes = ((pkt->data[i+1] & 0x03) << 4) | (pkt->data[i+2]>>4); - unsigned seconds = ((pkt->data[i+2] & 0x07) << 3) | (pkt->data[i+3]>>5); - unsigned frames = ((pkt->data[i+3] & 0x1f) << 1) | (pkt->data[i+4]>>7); - mxf->timecode_drop_frame = !!(pkt->data[i+1] & 0x80); - mxf->timecode_start = (hours*3600 + minutes*60 + seconds) * - mxf->timecode_base + frames; - if (mxf->timecode_drop_frame) { - unsigned tminutes = 60 * hours + minutes; - mxf->timecode_start -= 2 * (tminutes - tminutes / 10); - } - av_log(s, AV_LOG_DEBUG, "frame %d %d:%d:%d%c%d\n", mxf->timecode_start, - hours, minutes, seconds, mxf->timecode_drop_frame ? ';':':', frames); + if (pkt->data[i+4]>>6 & 0x01) { // closed + sc->closed_gop = 1; + if (e->flags & 0x40) // sequence header present + e->flags |= 0x80; // random access + } + if (!mxf->header_written) { + unsigned hours = (pkt->data[i+1]>>2) & 0x1f; + unsigned minutes = ((pkt->data[i+1] & 0x03) << 4) | (pkt->data[i+2]>>4); + unsigned seconds = ((pkt->data[i+2] & 0x07) << 3) | (pkt->data[i+3]>>5); + unsigned frames = ((pkt->data[i+3] & 0x1f) << 1) | (pkt->data[i+4]>>7); + mxf->timecode_drop_frame = !!(pkt->data[i+1] & 0x80); + mxf->timecode_start = (hours*3600 + minutes*60 + seconds) * + mxf->timecode_base + frames; + if (mxf->timecode_drop_frame) { + unsigned tminutes = 60 * hours + minutes; + mxf->timecode_start -= 2 * (tminutes - tminutes / 10); } + av_log(s, AV_LOG_DEBUG, "frame %d %d:%d:%d%c%d\n", mxf->timecode_start, + hours, minutes, seconds, mxf->timecode_drop_frame ? ';':':', frames); } } else if (c == 0x1b3) { // seq - *flags |= 0x40; + e->flags |= 0x40; + switch ((pkt->data[i+4]>>4) & 0xf) { + case 2: sc->aspect_ratio = (AVRational){ 4, 3}; break; + case 3: sc->aspect_ratio = (AVRational){ 16, 9}; break; + case 4: sc->aspect_ratio = (AVRational){221,100}; break; + default: + av_reduce(&sc->aspect_ratio.num, &sc->aspect_ratio.den, + st->codecpar->width, st->codecpar->height, 1024*1024); + } } else if (c == 0x100) { // pic int pict_type = (pkt->data[i+2]>>3) & 0x07; - if (pict_type == 2) { // P frame - *flags |= 0x22; - st->codec->gop_size = 1; - } else if (pict_type == 3) { // B frame - *flags |= 0x33; + e->temporal_ref = (pkt->data[i+1]<<2) | (pkt->data[i+2]>>6); + if (pict_type == 2) { // P-frame + e->flags |= 0x22; + sc->closed_gop = 0; // reset closed GOP, don't matter anymore + } else if (pict_type == 3) { // B-frame + if (sc->closed_gop) + e->flags |= 0x13; // only backward prediction + else + e->flags |= 0x33; sc->temporal_reordering = -1; } else if (!pict_type) { av_log(s, AV_LOG_ERROR, "error parsing mpeg2 frame\n"); @@ -1260,13 +1380,17 @@ static int mxf_parse_mpeg2_frame(AVFormatContext *s, AVStream *st, AVPacket *pkt } } } - sc->codec_ul = mxf_get_mpeg2_codec_ul(st->codec); + if (s->oformat != &ff_mxf_d10_muxer) + sc->codec_ul = mxf_get_mpeg2_codec_ul(st->codecpar); return !!sc->codec_ul; } static uint64_t mxf_parse_timestamp(time_t timestamp) { - struct tm *time = localtime(×tamp); + struct tm tmbuf; + struct tm *time = gmtime_r(×tamp, &tmbuf); + if (!time) + return 0; return (uint64_t)(time->tm_year+1900) << 48 | (uint64_t)(time->tm_mon+1) << 40 | (uint64_t) time->tm_mday << 32 | @@ -1275,12 +1399,29 @@ static uint64_t mxf_parse_timestamp(time_t timestamp) time->tm_sec << 8; } +static void mxf_gen_umid(AVFormatContext *s) +{ + MXFContext *mxf = s->priv_data; + uint32_t seed = av_get_random_seed(); + uint64_t umid = seed + 0x5294713400000000LL; + + AV_WB64(mxf->umid , umid); + AV_WB64(mxf->umid+8, umid>>8); + + mxf->instance_number = seed; +} + static int mxf_write_header(AVFormatContext *s) { MXFContext *mxf = s->priv_data; int i; uint8_t present[FF_ARRAY_ELEMS(mxf_essence_container_uls)] = {0}; const int *samples_per_frame = NULL; + AVDictionaryEntry *t; + int64_t timestamp = 0; + + if (!s->nb_streams) + return -1; for (i = 0; i < s->nb_streams; i++) { AVStream *st = s->streams[i]; @@ -1289,16 +1430,17 @@ static int mxf_write_header(AVFormatContext *s) return AVERROR(ENOMEM); st->priv_data = sc; - if (st->codec->codec_type == CODEC_TYPE_VIDEO) { + if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) { if (i != 0) { av_log(s, AV_LOG_ERROR, "video stream must be first track\n"); return -1; } - if (fabs(av_q2d(st->codec->time_base) - 1/25.0) < 0.0001) { + // TODO: should be avg_frame_rate + if (fabs(av_q2d(st->time_base) - 1/25.0) < 0.0001) { samples_per_frame = PAL_samples_per_frame; mxf->time_base = (AVRational){ 1, 25 }; mxf->timecode_base = 25; - } else if (fabs(av_q2d(st->codec->time_base) - 1001/30000.0) < 0.0001) { + } else if (fabs(av_q2d(st->time_base) - 1001/30000.0) < 0.0001) { samples_per_frame = NTSC_samples_per_frame; mxf->time_base = (AVRational){ 1001, 30000 }; mxf->timecode_base = 30; @@ -1306,35 +1448,76 @@ static int mxf_write_header(AVFormatContext *s) av_log(s, AV_LOG_ERROR, "unsupported video frame rate\n"); return -1; } - av_set_pts_info(st, 64, mxf->time_base.num, mxf->time_base.den); - } else if (st->codec->codec_type == CODEC_TYPE_AUDIO) { - if (st->codec->sample_rate != 48000) { + avpriv_set_pts_info(st, 64, mxf->time_base.num, mxf->time_base.den); + if (s->oformat == &ff_mxf_d10_muxer) { + if (st->codecpar->bit_rate == 50000000) + if (mxf->time_base.den == 25) sc->index = 3; + else sc->index = 5; + else if (st->codecpar->bit_rate == 40000000) + if (mxf->time_base.den == 25) sc->index = 7; + else sc->index = 9; + else if (st->codecpar->bit_rate == 30000000) + if (mxf->time_base.den == 25) sc->index = 11; + else sc->index = 13; + else { + av_log(s, AV_LOG_ERROR, "error MXF D-10 only support 30/40/50 mbit/s\n"); + return -1; + } + + mxf->edit_unit_byte_count = KAG_SIZE; // system element + mxf->edit_unit_byte_count += 16 + 4 + (uint64_t)st->codecpar->bit_rate * + mxf->time_base.num / (8*mxf->time_base.den); + mxf->edit_unit_byte_count += klv_fill_size(mxf->edit_unit_byte_count); + mxf->edit_unit_byte_count += 16 + 4 + 4 + samples_per_frame[0]*8*4; + mxf->edit_unit_byte_count += klv_fill_size(mxf->edit_unit_byte_count); + } + } else if (st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) { + if (st->codecpar->sample_rate != 48000) { av_log(s, AV_LOG_ERROR, "only 48khz is implemented\n"); return -1; } - av_set_pts_info(st, 64, 1, st->codec->sample_rate); + avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate); + if (s->oformat == &ff_mxf_d10_muxer) { + if (st->index != 1) { + av_log(s, AV_LOG_ERROR, "MXF D-10 only support one audio track\n"); + return -1; + } + if (st->codecpar->codec_id != AV_CODEC_ID_PCM_S16LE && + st->codecpar->codec_id != AV_CODEC_ID_PCM_S24LE) { + av_log(s, AV_LOG_ERROR, "MXF D-10 only support 16 or 24 bits le audio\n"); + } + sc->index = ((MXFStreamContext*)s->streams[0]->priv_data)->index + 1; + } else mxf->slice_count = 1; } - 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; + if (!sc->index) { + sc->index = mxf_get_essence_container_ul_index(st->codecpar->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; + } } sc->codec_ul = &mxf_essence_container_uls[sc->index].codec_ul; - if (!present[sc->index]) { - mxf->essence_containers_indices[mxf->essence_container_count++] = sc->index; - present[sc->index] = 1; - } else - 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); + + if (!present[sc->index]) + mxf->essence_container_count++; + present[sc->index]++; + } + + if (s->oformat == &ff_mxf_d10_muxer) { + mxf->essence_container_count = 1; } + if (!(s->flags & AVFMT_FLAG_BITEXACT)) + mxf_gen_umid(s); + for (i = 0; i < s->nb_streams; i++) { MXFStreamContext *sc = s->streams[i]->priv_data; // update element count @@ -1342,7 +1525,10 @@ static int mxf_write_header(AVFormatContext *s) sc->order = AV_RB32(sc->track_essence_element_key+12); } - mxf->timestamp = mxf_parse_timestamp(s->timestamp); + if (t = av_dict_get(s->metadata, "creation_time", NULL, 0)) + timestamp = ff_iso8601_to_unix_time(t->value); + if (timestamp) + mxf->timestamp = mxf_parse_timestamp(timestamp); mxf->duration = -1; mxf->timecode_track = av_mallocz(sizeof(*mxf->timecode_track)); @@ -1351,7 +1537,7 @@ static int mxf_write_header(AVFormatContext *s) mxf->timecode_track->priv_data = av_mallocz(sizeof(MXFStreamContext)); if (!mxf->timecode_track->priv_data) return AVERROR(ENOMEM); - mxf->timecode_track->index = s->nb_streams; + mxf->timecode_track->index = -1; if (!samples_per_frame) samples_per_frame = PAL_samples_per_frame; @@ -1365,10 +1551,10 @@ static int mxf_write_header(AVFormatContext *s) static const uint8_t system_metadata_pack_key[] = { 0x06,0x0E,0x2B,0x34,0x02,0x05,0x01,0x01,0x0D,0x01,0x03,0x01,0x04,0x01,0x01,0x00 }; static const uint8_t system_metadata_package_set_key[] = { 0x06,0x0E,0x2B,0x34,0x02,0x43,0x01,0x01,0x0D,0x01,0x03,0x01,0x04,0x01,0x02,0x01 }; -static uint32_t ff_framenum_to_12m_time_code(unsigned frame, int drop, int fps) +static uint32_t framenum_to_12m_time_code(unsigned frame, int drop, int fps) { return (0 << 31) | // color frame flag - (0 << 30) | // drop frame flag + (drop << 30) | // drop frame flag ( ((frame % fps) / 10) << 28) | // tens of frames ( ((frame % fps) % 10) << 24) | // units of frames (0 << 23) | // field phase (NTSC), b0 (PAL) @@ -1378,7 +1564,7 @@ static uint32_t ff_framenum_to_12m_time_code(unsigned frame, int drop, int fps) ((((frame / (fps * 60)) % 60) / 10) << 12) | // tens of minutes ((((frame / (fps * 60)) % 60) % 10) << 8) | // units of minutes (0 << 7) | // b1 - (0 << 6) | // b2 (NSC), field phase (PAL) + (0 << 6) | // b2 (NTSC), field phase (PAL) ((((frame / (fps * 3600) % 24)) / 10) << 4) | // tens of hours ( (frame / (fps * 3600) % 24)) % 10; // units of hours } @@ -1386,147 +1572,250 @@ static uint32_t ff_framenum_to_12m_time_code(unsigned frame, int drop, int fps) static void mxf_write_system_item(AVFormatContext *s) { MXFContext *mxf = s->priv_data; - ByteIOContext *pb = s->pb; + AVIOContext *pb = s->pb; unsigned frame; uint32_t time_code; frame = mxf->timecode_start + mxf->last_indexed_edit_unit + mxf->edit_units_count; // write system metadata pack - put_buffer(pb, system_metadata_pack_key, 16); - klv_encode_ber_length(pb, 57); - put_byte(pb, 0x5c); // UL, user date/time stamp, picture and sound item present - put_byte(pb, 0x04); // content package rate - put_byte(pb, 0x00); // content package type - put_be16(pb, 0x00); // channel handle - put_be16(pb, frame); // continuity count + avio_write(pb, system_metadata_pack_key, 16); + klv_encode_ber4_length(pb, 57); + avio_w8(pb, 0x5c); // UL, user date/time stamp, picture and sound item present + avio_w8(pb, 0x04); // content package rate + avio_w8(pb, 0x00); // content package type + avio_wb16(pb, 0x00); // channel handle + avio_wb16(pb, frame); // continuity count if (mxf->essence_container_count > 1) - put_buffer(pb, multiple_desc_ul, 16); - else - put_buffer(pb, mxf_essence_container_uls[mxf->essence_containers_indices[0]].container_ul, 16); - put_byte(pb, 0); - put_be64(pb, 0); - put_be64(pb, 0); // creation date/time stamp + avio_write(pb, multiple_desc_ul, 16); + else { + MXFStreamContext *sc = s->streams[0]->priv_data; + avio_write(pb, mxf_essence_container_uls[sc->index].container_ul, 16); + } + avio_w8(pb, 0); + avio_wb64(pb, 0); + avio_wb64(pb, 0); // creation date/time stamp - put_byte(pb, 0x81); // SMPTE 12M time code - time_code = ff_framenum_to_12m_time_code(frame, mxf->timecode_drop_frame, mxf->timecode_base); - put_be32(pb, time_code); - put_be32(pb, 0); // binary group data - put_be64(pb, 0); + avio_w8(pb, 0x81); // SMPTE 12M time code + time_code = framenum_to_12m_time_code(frame, mxf->timecode_drop_frame, + mxf->timecode_base); + avio_wb32(pb, time_code); + avio_wb32(pb, 0); // binary group data + avio_wb64(pb, 0); // write system metadata package set - put_buffer(pb, system_metadata_package_set_key, 16); - klv_encode_ber_length(pb, 35); - put_byte(pb, 0x83); // UMID - put_be16(pb, 0x20); - mxf_write_umid(pb, SourcePackage, 0); + avio_write(pb, system_metadata_package_set_key, 16); + klv_encode_ber4_length(pb, 35); + avio_w8(pb, 0x83); // UMID + avio_wb16(pb, 0x20); + mxf_write_umid(s, 1); +} + +static void mxf_write_d10_video_packet(AVFormatContext *s, AVStream *st, AVPacket *pkt) +{ + MXFContext *mxf = s->priv_data; + AVIOContext *pb = s->pb; + int packet_size = (uint64_t)st->codecpar->bit_rate*mxf->time_base.num / + (8*mxf->time_base.den); // frame size + int pad; + + packet_size += 16 + 4; + packet_size += klv_fill_size(packet_size); + + klv_encode_ber4_length(pb, pkt->size); + avio_write(pb, pkt->data, pkt->size); + + // ensure CBR muxing by padding to correct video frame size + pad = packet_size - pkt->size - 16 - 4; + if (pad > 20) { + avio_write(s->pb, klv_fill_key, 16); + pad -= 16 + 4; + klv_encode_ber4_length(s->pb, pad); + for (; pad; pad--) + avio_w8(s->pb, 0); + assert(!(avio_tell(s->pb) & (KAG_SIZE-1))); + } else { + av_log(s, AV_LOG_WARNING, "cannot fill d-10 video packet\n"); + for (; pad > 0; pad--) + avio_w8(s->pb, 0); + } +} + +static void mxf_write_d10_audio_packet(AVFormatContext *s, AVStream *st, AVPacket *pkt) +{ + MXFContext *mxf = s->priv_data; + AVIOContext *pb = s->pb; + int frame_size = pkt->size / st->codecpar->block_align; + uint8_t *samples = pkt->data; + uint8_t *end = pkt->data + pkt->size; + int i; + + klv_encode_ber4_length(pb, 4 + frame_size*4*8); + + avio_w8(pb, (frame_size == 1920 ? 0 : (mxf->edit_units_count-1) % 5 + 1)); + avio_wl16(pb, frame_size); + avio_w8(pb, (1<codecpar->channels)-1); + + while (samples < end) { + for (i = 0; i < st->codecpar->channels; i++) { + uint32_t sample; + if (st->codecpar->codec_id == AV_CODEC_ID_PCM_S24LE) { + sample = AV_RL24(samples)<< 4; + samples += 3; + } else { + sample = AV_RL16(samples)<<12; + samples += 2; + } + avio_wl32(pb, sample | i); + } + for (; i < 8; i++) + avio_wl32(pb, i); + } } static int mxf_write_packet(AVFormatContext *s, AVPacket *pkt) { MXFContext *mxf = s->priv_data; - ByteIOContext *pb = s->pb; + AVIOContext *pb = s->pb; AVStream *st = s->streams[pkt->stream_index]; MXFStreamContext *sc = st->priv_data; - int flags = 0; + MXFIndexEntry ie = {0}; + int err; - if (!(mxf->edit_units_count % EDIT_UNITS_PER_BODY)) { - mxf->index_entries = av_realloc(mxf->index_entries, - (mxf->edit_units_count + EDIT_UNITS_PER_BODY)*sizeof(*mxf->index_entries)); - if (!mxf->index_entries) { + if (!mxf->edit_unit_byte_count && !(mxf->edit_units_count % EDIT_UNITS_PER_BODY)) { + if ((err = av_reallocp_array(&mxf->index_entries, mxf->edit_units_count + + EDIT_UNITS_PER_BODY, sizeof(*mxf->index_entries))) < 0) { + mxf->edit_units_count = 0; av_log(s, AV_LOG_ERROR, "could not allocate index entries\n"); - return -1; + return err; } } - if (st->codec->codec_id == CODEC_ID_MPEG2VIDEO) { - if (!mxf_parse_mpeg2_frame(s, st, pkt, &flags)) { + if (st->codecpar->codec_id == AV_CODEC_ID_MPEG2VIDEO) { + if (!mxf_parse_mpeg2_frame(s, st, pkt, &ie)) { av_log(s, AV_LOG_ERROR, "could not get mpeg2 profile and level\n"); return -1; } } if (!mxf->header_written) { - mxf_write_partition(s, 0, 0, header_open_partition_key, 1); + if (mxf->edit_unit_byte_count) { + if ((err = mxf_write_partition(s, 1, 2, header_open_partition_key, 1)) < 0) + return err; + mxf_write_klv_fill(s); + mxf_write_index_table_segment(s); + } else { + if ((err = mxf_write_partition(s, 0, 0, header_open_partition_key, 1)) < 0) + return err; + } mxf->header_written = 1; } if (st->index == 0) { - if ((!mxf->edit_units_count || mxf->edit_units_count > EDIT_UNITS_PER_BODY) && - !(flags & 0x33)) { // I frame, Gop start + if (!mxf->edit_unit_byte_count && + (!mxf->edit_units_count || mxf->edit_units_count > EDIT_UNITS_PER_BODY) && + !(ie.flags & 0x33)) { // I-frame, GOP start mxf_write_klv_fill(s); - mxf_write_partition(s, 1, 2, body_partition_key, 0); - + if ((err = mxf_write_partition(s, 1, 2, body_partition_key, 0)) < 0) + return err; mxf_write_klv_fill(s); mxf_write_index_table_segment(s); } mxf_write_klv_fill(s); - mxf->index_entries[mxf->edit_units_count].offset = url_ftell(pb); - mxf->index_entries[mxf->edit_units_count].flags = flags; - if (!mxf->first_edit_unit_offset) - mxf->first_edit_unit_offset = mxf->index_entries[0].offset; mxf_write_system_item(s); + if (!mxf->edit_unit_byte_count) { + mxf->index_entries[mxf->edit_units_count].offset = mxf->body_offset; + mxf->index_entries[mxf->edit_units_count].flags = ie.flags; + mxf->index_entries[mxf->edit_units_count].temporal_ref = ie.temporal_ref; + mxf->body_offset += KAG_SIZE; // size of system element + } mxf->edit_units_count++; - } else if (st->index == 1) { + } else if (!mxf->edit_unit_byte_count && st->index == 1) { mxf->index_entries[mxf->edit_units_count-1].slice_offset = - url_ftell(pb) - mxf->index_entries[mxf->edit_units_count-1].offset; + mxf->body_offset - mxf->index_entries[mxf->edit_units_count-1].offset; } mxf_write_klv_fill(s); - 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 + avio_write(pb, sc->track_essence_element_key, 16); // write key + if (s->oformat == &ff_mxf_d10_muxer) { + if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) + mxf_write_d10_video_packet(s, st, pkt); + else + mxf_write_d10_audio_packet(s, st, pkt); + } else { + klv_encode_ber4_length(pb, pkt->size); // write length + avio_write(pb, pkt->data, pkt->size); + mxf->body_offset += 16+4+pkt->size + klv_fill_size(16+4+pkt->size); + } + + avio_flush(pb); - put_flush_packet(pb); return 0; } static void mxf_write_random_index_pack(AVFormatContext *s) { MXFContext *mxf = s->priv_data; - ByteIOContext *pb = s->pb; - uint64_t pos = url_ftell(pb); + AVIOContext *pb = s->pb; + uint64_t pos = avio_tell(pb); int i; - put_buffer(pb, random_index_pack_key, 16); - klv_encode_ber_length(pb, 28 + 12*mxf->body_partitions_count); + avio_write(pb, random_index_pack_key, 16); + klv_encode_ber_length(pb, 28 + 12LL*mxf->body_partitions_count); - put_be32(pb, 0); // BodySID of header partition - put_be64(pb, 0); // offset of header partition + if (mxf->edit_unit_byte_count) + avio_wb32(pb, 1); // BodySID of header partition + else + avio_wb32(pb, 0); + avio_wb64(pb, 0); // offset of header partition for (i = 0; i < mxf->body_partitions_count; i++) { - put_be32(pb, 1); // BodySID - put_be64(pb, mxf->body_partition_offset[i]); + avio_wb32(pb, 1); // BodySID + avio_wb64(pb, mxf->body_partition_offset[i]); } - put_be32(pb, 0); // BodySID of footer partition - put_be64(pb, mxf->footer_partition_offset); + avio_wb32(pb, 0); // BodySID of footer partition + avio_wb64(pb, mxf->footer_partition_offset); - put_be32(pb, url_ftell(pb) - pos + 4); + avio_wb32(pb, avio_tell(pb) - pos + 4); } static int mxf_write_footer(AVFormatContext *s) { MXFContext *mxf = s->priv_data; - ByteIOContext *pb = s->pb; + AVIOContext *pb = s->pb; + int err; mxf->duration = mxf->last_indexed_edit_unit + mxf->edit_units_count; mxf_write_klv_fill(s); - mxf->footer_partition_offset = url_ftell(pb); - mxf_write_partition(s, 0, 2, footer_partition_key, 0); - - mxf_write_klv_fill(s); - mxf_write_index_table_segment(s); + mxf->footer_partition_offset = avio_tell(pb); + if (mxf->edit_unit_byte_count) { // no need to repeat index + if ((err = mxf_write_partition(s, 0, 0, footer_partition_key, 0)) < 0) + return err; + } else { + if ((err = mxf_write_partition(s, 0, 2, footer_partition_key, 0)) < 0) + return err; + mxf_write_klv_fill(s); + mxf_write_index_table_segment(s); + } mxf_write_klv_fill(s); mxf_write_random_index_pack(s); - if (!url_is_streamed(s->pb)) { - url_fseek(pb, 0, SEEK_SET); - mxf_write_partition(s, 0, 0, header_closed_partition_key, 1); + if (s->pb->seekable & AVIO_SEEKABLE_NORMAL) { + avio_seek(pb, 0, SEEK_SET); + if (mxf->edit_unit_byte_count) { + if ((err = mxf_write_partition(s, 1, 2, header_closed_partition_key, 1)) < 0) + return err; + mxf_write_klv_fill(s); + mxf_write_index_table_segment(s); + } else { + if ((err = mxf_write_partition(s, 0, 0, header_closed_partition_key, 1)) < 0) + return err; + } } ff_audio_interleave_close(s); @@ -1537,53 +1826,56 @@ static int mxf_write_footer(AVFormatContext *s) av_freep(&mxf->timecode_track); mxf_free(s); + return 0; } static int mxf_interleave_get_packet(AVFormatContext *s, AVPacket *out, AVPacket *pkt, int flush) { - AVPacketList *pktl; - int stream_count = 0; - int streams[MAX_STREAMS]; - - memset(streams, 0, sizeof(streams)); - pktl = s->packet_buffer; - while (pktl) { - //av_log(s, AV_LOG_DEBUG, "show st:%d dts:%lld\n", pktl->pkt.stream_index, pktl->pkt.dts); - if (!streams[pktl->pkt.stream_index]) - stream_count++; - streams[pktl->pkt.stream_index]++; - pktl = pktl->next; - } + int i, stream_count = 0; + + for (i = 0; i < s->nb_streams; i++) + stream_count += !!s->streams[i]->last_in_packet_buffer; if (stream_count && (s->nb_streams == stream_count || flush)) { - pktl = s->packet_buffer; + AVPacketList *pktl = s->internal->packet_buffer; if (s->nb_streams != stream_count) { - AVPacketList *first = NULL; - // find first packet in edit unit + AVPacketList *last = NULL; + // find last packet in edit unit while (pktl) { - AVStream *st = s->streams[pktl->pkt.stream_index]; - if (st->index == 0) + if (!stream_count || pktl->pkt.stream_index == 0) break; - else if (!first) - first = pktl; + last = pktl; pktl = pktl->next; + stream_count--; } // purge packet queue while (pktl) { AVPacketList *next = pktl->next; - av_free_packet(&pktl->pkt); + + if(s->streams[pktl->pkt.stream_index]->last_in_packet_buffer == pktl) + s->streams[pktl->pkt.stream_index]->last_in_packet_buffer= NULL; + av_packet_unref(&pktl->pkt); av_freep(&pktl); pktl = next; } - if (!first) + if (last) + last->next = NULL; + else { + s->internal->packet_buffer = NULL; + s->internal->packet_buffer_end= NULL; goto out; - pktl = first; + } + pktl = s->internal->packet_buffer; } *out = pktl->pkt; - //av_log(s, AV_LOG_DEBUG, "out st:%d dts:%lld\n", (*out).stream_index, (*out).dts); - s->packet_buffer = pktl->next; + av_log(s, AV_LOG_TRACE, "out st:%d dts:%"PRId64"\n", (*out).stream_index, (*out).dts); + s->internal->packet_buffer = pktl->next; + if(s->streams[pktl->pkt.stream_index]->last_in_packet_buffer == pktl) + s->streams[pktl->pkt.stream_index]->last_in_packet_buffer= NULL; + if(!s->internal->packet_buffer) + s->internal->packet_buffer_end= NULL; av_freep(&pktl); return 1; } else { @@ -1608,18 +1900,31 @@ static int mxf_interleave(AVFormatContext *s, AVPacket *out, AVPacket *pkt, int mxf_interleave_get_packet, mxf_compare_timestamps); } -AVOutputFormat mxf_muxer = { - "mxf", - NULL_IF_CONFIG_SMALL("Material eXchange Format"), - NULL, - "mxf", - sizeof(MXFContext), - CODEC_ID_PCM_S16LE, - CODEC_ID_MPEG2VIDEO, - mxf_write_header, - mxf_write_packet, - mxf_write_footer, - AVFMT_NOTIMESTAMPS, - NULL, - mxf_interleave, +AVOutputFormat ff_mxf_muxer = { + .name = "mxf", + .long_name = NULL_IF_CONFIG_SMALL("MXF (Material eXchange Format)"), + .mime_type = "application/mxf", + .extensions = "mxf", + .priv_data_size = sizeof(MXFContext), + .audio_codec = AV_CODEC_ID_PCM_S16LE, + .video_codec = AV_CODEC_ID_MPEG2VIDEO, + .write_header = mxf_write_header, + .write_packet = mxf_write_packet, + .write_trailer = mxf_write_footer, + .flags = AVFMT_NOTIMESTAMPS, + .interleave_packet = mxf_interleave, +}; + +AVOutputFormat ff_mxf_d10_muxer = { + .name = "mxf_d10", + .long_name = NULL_IF_CONFIG_SMALL("MXF (Material eXchange Format) D-10 Mapping"), + .mime_type = "application/mxf", + .priv_data_size = sizeof(MXFContext), + .audio_codec = AV_CODEC_ID_PCM_S16LE, + .video_codec = AV_CODEC_ID_MPEG2VIDEO, + .write_header = mxf_write_header, + .write_packet = mxf_write_packet, + .write_trailer = mxf_write_footer, + .flags = AVFMT_NOTIMESTAMPS, + .interleave_packet = mxf_interleave, };