diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2009-02-16 12:48:45 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2009-02-16 12:48:45 +0000 |
| commit | e86a14ded9ce1f7592e46e10269b9de12993f24f (patch) | |
| tree | 19a5b494713b574c15fd1e43bb8c967052aec477 /libavformat/mxfenc.c | |
| parent | 3842560379cd7891ac147365e58d1dd1d89f51c4 (diff) | |
fetch display aspect ratio from mpeg-2 essence
Originally committed as revision 17371 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/mxfenc.c')
| -rw-r--r-- | libavformat/mxfenc.c | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index 849efaa49b..68c867940f 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -68,6 +68,7 @@ typedef struct { int order; ///< interleaving order if dts are equal int interlaced; ///< wether picture is interlaced int temporal_reordering; + AVRational aspect_ratio; ///< display aspect ratio } MXFStreamContext; typedef struct { @@ -778,7 +779,6 @@ 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); @@ -837,14 +837,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); @@ -1349,6 +1344,16 @@ static int mxf_parse_mpeg2_frame(AVFormatContext *s, AVStream *st, AVPacket *pkt } } else if (c == 0x1b3) { // seq *flags |= 0x40; + if (i + 4 < pkt->size) { + 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 |