X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fmxfenc.c;h=766327ded34eb13c3934acf4e57bfebcc09e3de0;hb=855e7732c6bcc7d52cd0863407a721c2bf00fcf1;hp=0fe162bbc3d6726e52e13409350ffea843e59a97;hpb=8d1a5af700c7942d16b6643f357657b240ff8ab3;p=ffmpeg diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index 0fe162bbc3d..766327ded34 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -35,7 +35,7 @@ #include #include -#include "libavutil/fifo.h" +#include "libavutil/random_seed.h" #include "libavcodec/bytestream.h" #include "audiointerleave.h" #include "avformat.h" @@ -63,11 +63,13 @@ typedef struct { typedef struct { 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; ///< wether 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 { @@ -84,7 +86,7 @@ static const struct { { CODEC_ID_MPEG2VIDEO, 0 }, { CODEC_ID_PCM_S24LE, 1 }, { CODEC_ID_PCM_S16LE, 1 }, - { 0 } + { CODEC_ID_NONE } }; static void mxf_write_wav_desc(AVFormatContext *s, AVStream *st); @@ -169,7 +171,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; @@ -177,7 +178,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 @@ -187,15 +187,18 @@ typedef struct MXFContext { 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 }; @@ -295,6 +298,7 @@ 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 */ @@ -307,10 +311,13 @@ static void mxf_write_uuid(ByteIOContext *pb, enum MXFMetadataSetType type, int put_be16(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; + put_buffer(s->pb, umid_ul, 13); + put_be24(s->pb, mxf->instance_number); + put_buffer(s->pb, mxf->umid, 15); + put_byte(s->pb, type); } static void mxf_write_refs_count(ByteIOContext *pb, int ref_count) @@ -427,8 +434,8 @@ static void mxf_write_essence_container_refs(AVFormatContext *s) 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; + put_buffer(pb, mxf_essence_container_uls[sc->index].container_ul, 16); } } @@ -452,7 +459,7 @@ static void mxf_write_preface(AVFormatContext *s) // write version mxf_write_local_tag(pb, 2, 0x3B05); - put_be16(pb, 1); + put_be16(pb, 258); // v1.2 // write identification_refs mxf_write_local_tag(pb, 16 + 8, 0x3B06); @@ -465,12 +472,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); - } + put_buffer(pb, op1a_ul, 16); // write essence_container_refs mxf_write_local_tag(pb, 8 + 16 * mxf->essence_container_count, 0x3B0A); @@ -573,7 +575,7 @@ 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); + put_be32(pb, st->index+2); // write track number mxf_write_local_tag(pb, 4, 0x4804); @@ -637,14 +639,14 @@ 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; @@ -654,7 +656,8 @@ static void mxf_write_timecode_component(AVFormatContext *s, AVStream *st) // 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); @@ -697,14 +700,14 @@ static void mxf_write_structural_component(AVFormatContext *s, AVStream *st, enu for (i = 0; i < 4; i++) put_be64(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); else - put_be32(pb, st->index); + put_be32(pb, st->index+2); } static void mxf_write_multi_descriptor(AVFormatContext *s) @@ -731,8 +734,10 @@ static void mxf_write_multi_descriptor(AVFormatContext *s) mxf_write_local_tag(pb, 16, 0x3004); if (mxf->essence_container_count > 1) ul = multiple_desc_ul; - else - ul = mxf_essence_container_uls[mxf->essence_containers_indices[0]].container_ul; + else { + MXFStreamContext *sc = s->streams[0]->priv_data; + ul = mxf_essence_container_uls[sc->index].container_ul; + } put_buffer(pb, ul, 16); // write sub descriptor refs @@ -749,13 +754,13 @@ static void mxf_write_generic_desc(AVFormatContext *s, AVStream *st, const UID k ByteIOContext *pb = s->pb; put_buffer(pb, key, 16); - klv_encode_ber_length(pb, size); + 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); + put_be32(pb, st->index+2); mxf_write_local_tag(pb, 8, 0x3001); put_be32(pb, mxf->time_base.den); @@ -777,10 +782,9 @@ static void mxf_write_cdci_common(AVFormatContext *s, AVStream *st, const UID ke ByteIOContext *pb = s->pb; int stored_height = (st->codec->height+15)/16*16; int display_height; - AVRational dar; int f1, f2; - mxf_write_generic_desc(s, st, key, size); + 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); @@ -836,14 +840,9 @@ static void mxf_write_cdci_common(AVFormatContext *s, AVStream *st, const UID ke 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); - mxf_write_local_tag(pb, 8, 0x320E); - put_be32(pb, dar.num); - put_be32(pb, dar.den); + put_be32(pb, sc->aspect_ratio.num); + put_be32(pb, sc->aspect_ratio.den); mxf_write_local_tag(pb, 16, 0x3201); put_buffer(pb, *sc->codec_ul, 16); @@ -851,27 +850,32 @@ static void mxf_write_cdci_common(AVFormatContext *s, AVStream *st, const UID ke static void mxf_write_cdci_desc(AVFormatContext *s, AVStream *st) { - MXFStreamContext *sc = st->priv_data; - mxf_write_cdci_common(s, st, mxf_cdci_descriptor_key, 161+sc->interlaced*4); + mxf_write_cdci_common(s, st, mxf_cdci_descriptor_key, 0); } static void mxf_write_mpegvideo_desc(AVFormatContext *s, AVStream *st) { - MXFStreamContext *sc = st->priv_data; ByteIOContext *pb = s->pb; + int profile_and_level = (st->codec->profile<<4) | st->codec->level; - mxf_write_cdci_common(s, st, mxf_mpegvideo_descriptor_key, 169+sc->interlaced*4); + mxf_write_cdci_common(s, st, mxf_mpegvideo_descriptor_key, 8+5); // bit rate mxf_write_local_tag(pb, 4, 0x8000); put_be32(pb, st->codec->bit_rate); + + // profile and level + mxf_write_local_tag(pb, 1, 0x8007); + if (!st->codec->profile) + profile_and_level |= 0x80; // escape bit + put_byte(pb, profile_and_level); } static void mxf_write_generic_sound_common(AVFormatContext *s, AVStream *st, const UID key, unsigned size) { ByteIOContext *pb = s->pb; - mxf_write_generic_desc(s, st, key, size); + mxf_write_generic_desc(s, st, key, size+5+12+8+8); // audio locked mxf_write_local_tag(pb, 1, 0x3D02); @@ -893,7 +897,7 @@ static void mxf_write_wav_common(AVFormatContext *s, AVStream *st, const UID key { ByteIOContext *pb = s->pb; - mxf_write_generic_sound_common(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); @@ -905,32 +909,30 @@ static void mxf_write_wav_common(AVFormatContext *s, AVStream *st, const UID key static void mxf_write_wav_desc(AVFormatContext *s, AVStream *st) { - mxf_write_wav_common(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(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, 93); + 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; + 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 @@ -944,7 +946,7 @@ 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 @@ -958,10 +960,10 @@ static void mxf_write_package(AVFormatContext *s, enum MXFMetadataSetType type) // 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) { @@ -971,13 +973,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); @@ -1002,7 +1004,7 @@ 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); @@ -1049,7 +1051,7 @@ static void mxf_write_index_table_segment(AVFormatContext *s) put_buffer(pb, index_table_segment_key, 16); if (mxf->edit_unit_byte_count) { - klv_encode_ber_length(pb, 85); + klv_encode_ber_length(pb, 80); } else { klv_encode_ber_length(pb, 85 + 12+(s->nb_streams+1)*6 + 12+mxf->edit_units_count*(11+mxf->slice_count*4)); @@ -1061,8 +1063,8 @@ 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); + put_be32(pb, mxf->time_base.num); // index start position mxf_write_local_tag(pb, 8, 0x3F0C); @@ -1070,7 +1072,10 @@ static void mxf_write_index_table_segment(AVFormatContext *s) // index duration mxf_write_local_tag(pb, 8, 0x3F0D); - put_be64(pb, mxf->edit_units_count); + if (mxf->edit_unit_byte_count) + put_be64(pb, 0); // index table covers whole container + else + put_be64(pb, mxf->edit_units_count); // edit unit byte count mxf_write_local_tag(pb, 4, 0x3F05); @@ -1084,11 +1089,11 @@ static void mxf_write_index_table_segment(AVFormatContext *s) 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); - if (!mxf->edit_unit_byte_count) { + // 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 @@ -1118,14 +1123,14 @@ static void mxf_write_index_table_segment(AVFormatContext *s) 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++) { + int temporal_offset = 0; if (temporal_reordering) { - 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 + if ((mxf->index_entries[i].flags & 0x11) == 0) // I frame temporal_offset = 0; else temporal_offset = -temporal_offset; @@ -1133,15 +1138,17 @@ static void mxf_write_index_table_segment(AVFormatContext *s) break; } } - put_byte(pb, temporal_offset); - } else - put_byte(pb, 0); + } + put_byte(pb, temporal_offset); + if (!(mxf->index_entries[i].flags & 0x33)) { // I frame + if (mxf->index_entries[i].flags & 0x40 && // seq header + (!temporal_reordering || !temporal_offset)) + mxf->index_entries[i].flags |= 0x80; // random access 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 + if ((mxf->index_entries[i].flags & 0x30) == 0x30) { // back and forward prediction put_byte(pb, mxf->last_key_index - i); } else { put_byte(pb, key_index - i); // key frame offset @@ -1150,7 +1157,7 @@ static void mxf_write_index_table_segment(AVFormatContext *s) } put_byte(pb, mxf->index_entries[i].flags); // stream offset - put_be64(pb, mxf->index_entries[i].offset - mxf->first_edit_unit_offset); + put_be64(pb, mxf->index_entries[i].offset); if (s->nb_streams > 1) put_be32(pb, mxf->index_entries[i].slice_offset); } @@ -1188,7 +1195,7 @@ static void mxf_write_partition(AVFormatContext *s, int bodysid, 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 = 85; + index_byte_count = 80; if (index_byte_count) { // add encoded ber length @@ -1234,22 +1241,14 @@ static void mxf_write_partition(AVFormatContext *s, int bodysid, // BodyOffset if (bodysid && mxf->edit_units_count && mxf->body_partitions_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); + put_be64(pb, mxf->body_offset); } else put_be64(pb, 0); put_be32(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); - } + put_buffer(pb, op1a_ul, 16); // essence container mxf_write_essence_container_refs(s); @@ -1288,24 +1287,18 @@ static const UID mxf_mpeg2_codec_uls[] = { static const UID *mxf_get_mpeg2_codec_ul(AVCodecContext *avctx) { + int long_gop = avctx->gop_size > 1 || avctx->has_b_frames; + if (avctx->profile == 4) { // Main if (avctx->level == 8) // Main - return avctx->gop_size ? - &mxf_mpeg2_codec_uls[1] : - &mxf_mpeg2_codec_uls[0]; + return &mxf_mpeg2_codec_uls[0+long_gop]; else if (avctx->level == 4) // High - return avctx->gop_size ? - &mxf_mpeg2_codec_uls[5] : - &mxf_mpeg2_codec_uls[4]; + return &mxf_mpeg2_codec_uls[4+long_gop]; } 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]; + return &mxf_mpeg2_codec_uls[2+long_gop]; else if (avctx->level == 2) // High - return avctx->gop_size ? - &mxf_mpeg2_codec_uls[7] : - &mxf_mpeg2_codec_uls[6]; + return &mxf_mpeg2_codec_uls[6+long_gop]; } return NULL; } @@ -1321,8 +1314,8 @@ static int mxf_parse_mpeg2_frame(AVFormatContext *s, AVStream *st, AVPacket *pkt 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 + if (c == 0x1b5) { + if ((pkt->data[i+1] & 0xf0) == 0x10) { // seq ext st->codec->profile = pkt->data[i+1] & 0x07; st->codec->level = pkt->data[i+2] >> 4; } else if (i + 5 < pkt->size && (pkt->data[i+1] & 0xf0) == 0x80) { // pict coding ext @@ -1330,34 +1323,46 @@ static int mxf_parse_mpeg2_frame(AVFormatContext *s, AVStream *st, AVPacket *pkt break; } } else if (c == 0x1b8) { // gop - if (i + 4 < pkt->size) { - if (pkt->data[i+4]>>6 & 0x01) // closed + if (pkt->data[i+4]>>6 & 0x01) { // closed + sc->closed_gop = 1; + if (*flags & 0x40) // sequence header present *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 (!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; + 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->codec->width, st->codec->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; + sc->closed_gop = 0; // reset closed gop, don't matter anymore } else if (pict_type == 3) { // B frame - *flags |= 0x33; + if (sc->closed_gop) + *flags |= 0x13; // only backward prediction + else + *flags |= 0x33; sc->temporal_reordering = -1; } else if (!pict_type) { av_log(s, AV_LOG_ERROR, "error parsing mpeg2 frame\n"); @@ -1372,7 +1377,7 @@ static int mxf_parse_mpeg2_frame(AVFormatContext *s, AVStream *st, AVPacket *pkt static uint64_t mxf_parse_timestamp(time_t timestamp) { - struct tm *time = localtime(×tamp); + struct tm *time = gmtime(×tamp); return (uint64_t)(time->tm_year+1900) << 48 | (uint64_t)(time->tm_mon+1) << 40 | (uint64_t) time->tm_mday << 32 | @@ -1381,6 +1386,18 @@ 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 = ff_random_get_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; @@ -1388,6 +1405,9 @@ static int mxf_write_header(AVFormatContext *s) uint8_t present[FF_ARRAY_ELEMS(mxf_essence_container_uls)] = {0}; const int *samples_per_frame = NULL; + if (!s->nb_streams) + return -1; + for (i = 0; i < s->nb_streams; i++) { AVStream *st = s->streams[i]; MXFStreamContext *sc = av_mallocz(sizeof(*sc)); @@ -1466,21 +1486,22 @@ static int mxf_write_header(AVFormatContext *s) 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 == &mxf_d10_muxer) { mxf->essence_container_count = 1; } + if (!(s->streams[0]->codec->flags & CODEC_FLAG_BITEXACT)) + mxf_gen_umid(s); + for (i = 0; i < s->nb_streams; i++) { MXFStreamContext *sc = s->streams[i]->priv_data; // update element count @@ -1488,7 +1509,8 @@ 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 (s->timestamp) + mxf->timestamp = mxf_parse_timestamp(s->timestamp); mxf->duration = -1; mxf->timecode_track = av_mallocz(sizeof(*mxf->timecode_track)); @@ -1497,7 +1519,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; @@ -1548,8 +1570,10 @@ static void mxf_write_system_item(AVFormatContext *s) put_be16(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); + else { + MXFStreamContext *sc = s->streams[0]->priv_data; + put_buffer(pb, mxf_essence_container_uls[sc->index].container_ul, 16); + } put_byte(pb, 0); put_be64(pb, 0); put_be64(pb, 0); // creation date/time stamp @@ -1565,7 +1589,7 @@ static void mxf_write_system_item(AVFormatContext *s) klv_encode_ber4_length(pb, 35); put_byte(pb, 0x83); // UMID put_be16(pb, 0x20); - mxf_write_umid(pb, SourcePackage, 0); + mxf_write_umid(s, 1); } static void mxf_write_d10_video_packet(AVFormatContext *s, AVStream *st, AVPacket *pkt) @@ -1602,8 +1626,7 @@ static void mxf_write_d10_audio_packet(AVFormatContext *s, AVStream *st, AVPacke { MXFContext *mxf = s->priv_data; ByteIOContext *pb = s->pb; - int frame_size = (pkt->size<<3) / - (st->codec->channels*av_get_bits_per_sample(st->codec->codec_id)); + int frame_size = pkt->size / st->codec->block_align; uint8_t *samples = pkt->data; uint8_t *end = pkt->data + pkt->size; int i; @@ -1618,58 +1641,17 @@ static void mxf_write_d10_audio_packet(AVFormatContext *s, AVStream *st, AVPacke for (i = 0; i < st->codec->channels; i++) { uint32_t sample; if (st->codec->codec_id == CODEC_ID_PCM_S24LE) { - sample = (AV_RL24(samples)<< 4)|((samples==pkt->data)<<3) | i; + sample = AV_RL24(samples)<< 4; samples += 3; } else { - sample = (AV_RL16(samples)<<12)|((samples==pkt->data)<<3) | i; + sample = AV_RL16(samples)<<12; samples += 2; } - put_le32(pb, sample); + put_le32(pb, sample | i); } for (; i < 8; i++) - put_le32(pb, 0); - } -} - -static int mxf_write_d10_packet(AVFormatContext *s, AVPacket *pkt) -{ - MXFContext *mxf = s->priv_data; - ByteIOContext *pb = s->pb; - AVStream *st = s->streams[pkt->stream_index]; - MXFStreamContext *sc = st->priv_data; - int flags = 0; - - if (st->codec->codec_id == CODEC_ID_MPEG2VIDEO) { - if (!mxf_parse_mpeg2_frame(s, st, pkt, &flags)) { - av_log(s, AV_LOG_ERROR, "could not get mpeg2 profile and level\n"); - return -1; - } - } - - if (!mxf->header_written) { - mxf_write_partition(s, 1, 2, header_open_partition_key, 1); - mxf->header_written = 1; - mxf_write_klv_fill(s); - mxf_write_index_table_segment(s); - } - - if (st->index == 0) { - mxf_write_klv_fill(s); - mxf_write_system_item(s); - - mxf->edit_units_count++; + put_le32(pb, i); } - - mxf_write_klv_fill(s); - put_buffer(pb, sc->track_essence_element_key, 16); // write key - if (st->codec->codec_type == CODEC_TYPE_VIDEO) - mxf_write_d10_video_packet(s, st, pkt); - else - mxf_write_d10_audio_packet(s, st, pkt); - - put_flush_packet(pb); - - return 0; } static int mxf_write_packet(AVFormatContext *s, AVPacket *pkt) @@ -1680,7 +1662,7 @@ static int mxf_write_packet(AVFormatContext *s, AVPacket *pkt) MXFStreamContext *sc = st->priv_data; int flags = 0; - if (!(mxf->edit_units_count % EDIT_UNITS_PER_BODY)) { + if (!mxf->edit_unit_byte_count && !(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) { @@ -1697,12 +1679,19 @@ static int mxf_write_packet(AVFormatContext *s, AVPacket *pkt) } if (!mxf->header_written) { - mxf_write_partition(s, 0, 0, header_open_partition_key, 1); + if (mxf->edit_unit_byte_count) { + mxf_write_partition(s, 1, 2, header_open_partition_key, 1); + mxf_write_klv_fill(s); + mxf_write_index_table_segment(s); + } else { + mxf_write_partition(s, 0, 0, header_open_partition_key, 1); + } mxf->header_written = 1; } if (st->index == 0) { - if ((!mxf->edit_units_count || mxf->edit_units_count > EDIT_UNITS_PER_BODY) && + if (!mxf->edit_unit_byte_count && + (!mxf->edit_units_count || mxf->edit_units_count > EDIT_UNITS_PER_BODY) && !(flags & 0x33)) { // I frame, Gop start mxf_write_klv_fill(s); mxf_write_partition(s, 1, 2, body_partition_key, 0); @@ -1712,24 +1701,34 @@ static int mxf_write_packet(AVFormatContext *s, AVPacket *pkt) } 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 = flags; + 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_ber4_length(pb, pkt->size); // write length - put_buffer(pb, pkt->data, pkt->size); // write value + if (s->oformat == &mxf_d10_muxer) { + if (st->codec->codec_type == CODEC_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 + put_buffer(pb, pkt->data, pkt->size); + mxf->body_offset += 16+4+pkt->size + klv_fill_size(16+4+pkt->size); + } put_flush_packet(pb); + return 0; } @@ -1743,7 +1742,10 @@ static void mxf_write_random_index_pack(AVFormatContext *s) put_buffer(pb, random_index_pack_key, 16); klv_encode_ber_length(pb, 28 + 12*mxf->body_partitions_count); - put_be32(pb, 0); // BodySID of header partition + if (mxf->edit_unit_byte_count) + put_be32(pb, 1); // BodySID of header partition + else + put_be32(pb, 0); put_be64(pb, 0); // offset of header partition for (i = 0; i < mxf->body_partitions_count; i++) { @@ -1779,24 +1781,18 @@ static int mxf_write_footer(AVFormatContext *s) mxf_write_random_index_pack(s); if (!url_is_streamed(s->pb)) { - int index; url_fseek(pb, 0, SEEK_SET); - if (s->oformat == &mxf_d10_muxer) { + if (mxf->edit_unit_byte_count) { mxf_write_partition(s, 1, 2, header_closed_partition_key, 1); - index = 1; - } else if (mxf->edit_unit_byte_count) { - mxf_write_partition(s, 0, 2, header_closed_partition_key, 1); - index = 1; - } else { - mxf_write_partition(s, 0, 0, header_closed_partition_key, 1); - index = 0; - } - if (index) { mxf_write_klv_fill(s); mxf_write_index_table_segment(s); + } else { + mxf_write_partition(s, 0, 0, header_closed_partition_key, 1); } } + put_flush_packet(pb); + ff_audio_interleave_close(s); av_freep(&mxf->index_entries); @@ -1811,52 +1807,50 @@ static int mxf_write_footer(AVFormatContext *s) 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->packet_buffer; if (s->nb_streams != stream_count) { - AVPacketList *first = NULL; AVPacketList *last = NULL; - // find first packet in edit unit + // 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--; } - if (last) - last->next = NULL; // purge packet queue while (pktl) { AVPacketList *next = 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; av_free_packet(&pktl->pkt); av_freep(&pktl); pktl = next; } - if (!first) + if (last) + last->next = NULL; + else { + s->packet_buffer = NULL; + s->packet_buffer_end= NULL; goto out; - pktl = first; + } + pktl = s->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; + 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->packet_buffer) + s->packet_buffer_end= NULL; av_freep(&pktl); return 1; } else { @@ -1884,7 +1878,7 @@ static int mxf_interleave(AVFormatContext *s, AVPacket *out, AVPacket *pkt, int AVOutputFormat mxf_muxer = { "mxf", NULL_IF_CONFIG_SMALL("Material eXchange Format"), - NULL, + "application/mxf", "mxf", sizeof(MXFContext), CODEC_ID_PCM_S16LE, @@ -1906,7 +1900,7 @@ AVOutputFormat mxf_d10_muxer = { CODEC_ID_PCM_S16LE, CODEC_ID_MPEG2VIDEO, mxf_write_header, - mxf_write_d10_packet, + mxf_write_packet, mxf_write_footer, AVFMT_NOTIMESTAMPS, NULL,