diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2009-01-31 09:08:01 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2009-01-31 09:08:01 +0000 |
| commit | 4118d68f72596e55ac579da93762cbb5d9cb0e1c (patch) | |
| tree | 592c3f6bb5f9e229aabcd78652818e7aac8ae893 /libavformat | |
| parent | baed2ec4c2c2b0b5bf8b216fca28c88500bc1f61 (diff) | |
add frame layout local tag, best effort
Originally committed as revision 16896 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/mxfenc.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index 8c9ebad80b..03a2848ac3 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -173,6 +173,7 @@ static const MXFLocalTagPair mxf_local_tag_batch[] = { { 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 @@ static void mxf_write_mpegvideo_desc(AVFormatContext *s, AVStream *st) 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 @@ static void mxf_write_mpegvideo_desc(AVFormatContext *s, AVStream *st) 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, |