#include <math.h>
#include <time.h>
-#include "libavutil/fifo.h"
#include "libavutil/random_seed.h"
#include "libavcodec/bytestream.h"
#include "audiointerleave.h"
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 {
{ 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);
{ 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 */
ByteIOContext *pb = s->pb;
put_buffer(pb, key, 16);
- klv_encode_ber_length(pb, size+20+8+12+20);
+ klv_encode_ber4_length(pb, size+20+8+12+20);
mxf_write_local_tag(pb, 16, 0x3C0A);
mxf_write_uuid(pb, SubDescriptor, st->index);
static void mxf_write_mpegvideo_desc(AVFormatContext *s, AVStream *st)
{
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, 8);
+ 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)
// 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);
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;
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
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;
}
for(i = 0; i < pkt->size - 4; i++) {
c = (c<<8) + pkt->data[i];
- if (c == 0x1B5) {
+ 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;
break;
}
} else if (c == 0x1b8) { // gop
- 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);
- }
+ 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");
// 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;
last->next = NULL;
else {
s->packet_buffer = NULL;
+ s->packet_buffer_end= NULL;
goto out;
}
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 {
projects / ffmpeg / blobdiff