#include <time.h>
#include "libavutil/fifo.h"
+#include "libavutil/random_seed.h"
#include "libavcodec/bytestream.h"
#include "audiointerleave.h"
#include "avformat.h"
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 };
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)
// 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);
// 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);
// 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);
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;
// 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);
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)
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);
{
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
// 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
// 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) {
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);
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);
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));
// 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);
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
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
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);
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 |
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;
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));
sc->codec_ul = &mxf_essence_container_uls[sc->index].codec_ul;
- if (!present[sc->index]) {
- present[sc->index] = 1;
- mxf->essence_container_count++;
- } 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
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));
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;
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)
{
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;
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);
+ put_le32(pb, i);
}
}
if (mxf->edit_unit_byte_count)
put_be32(pb, 1); // BodySID of header partition
else
- put_be32(pb, 0); // BodySID of header partition
+ put_be32(pb, 0);
put_be64(pb, 0); // offset of header partition
for (i = 0; i < mxf->body_partitions_count; i++) {
}
}
+ put_flush_packet(pb);
+
ff_audio_interleave_close(s);
av_freep(&mxf->index_entries);
projects / ffmpeg / blobdiff