# HG changeset patch # User bcoudurier # Date 1233392881 0 # Node ID 68de70aa392be89efeaf974b4a6e6da697012bd2 # Parent 3524125567f370354ffc3a1c5afd66d1c0fd7618 add frame layout local tag, best effort diff -r 3524125567f3 -r 68de70aa392b mxfenc.c --- a/mxfenc.c Sat Jan 31 07:02:20 2009 +0000 +++ b/mxfenc.c Sat Jan 31 09:08:01 2009 +0000 @@ -173,6 +173,7 @@ { 0x3001, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x06,0x01,0x01,0x00,0x00,0x00,0x00}}, /* SampleRate */ { 0x3004, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x06,0x01,0x01,0x04,0x01,0x02,0x00,0x00}}, /* Essence Container */ // Generic Picture Essence Descriptor + { 0x320C, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x01,0x03,0x01,0x04,0x00,0x00,0x00}}, /* Frame Layout */ { 0x3203, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x01,0x05,0x02,0x02,0x00,0x00,0x00}}, /* Stored Width */ { 0x3202, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x01,0x05,0x02,0x01,0x00,0x00,0x00}}, /* Stored Height */ { 0x320E, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x01,0x01,0x01,0x01,0x00,0x00,0x00}}, /* Aspect Ratio */ @@ -589,7 +590,7 @@ int stored_height = (st->codec->height+15)/16*16; AVRational dar; - mxf_write_generic_desc(pb, st, mxf_mpegvideo_descriptor_key, 108); + mxf_write_generic_desc(pb, st, mxf_mpegvideo_descriptor_key, 113); mxf_write_local_tag(pb, 4, 0x3203); put_be32(pb, st->codec->width); @@ -597,6 +598,10 @@ mxf_write_local_tag(pb, 4, 0x3202); put_be32(pb, stored_height>>sc->interlaced); + // frame layout + mxf_write_local_tag(pb, 1, 0x320C); + put_byte(pb, sc->interlaced); + av_reduce(&dar.num, &dar.den, st->codec->width*st->codec->sample_aspect_ratio.num, st->codec->height*st->codec->sample_aspect_ratio.den,