highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

store display height without vbi

Browse Source 
Originally committed as revision 17203 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier
2009-02-13 07:13:36 +00:00
parent db6db7e505
commit 6249143da8
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/mxfenc.c
View File

@ -710,6 +710,7 @@ static void mxf_write_cdci_common(AVFormatContext *s, AVStream *st, const UID ke
MXFStreamContext *sc = st->priv_data; MXFStreamContext *sc = st->priv_data;
ByteIOContext *pb = s->pb; ByteIOContext *pb = s->pb;
int stored_height = (st->codec->height+15)/16*16; int stored_height = (st->codec->height+15)/16*16;
int display_height;
AVRational dar; AVRational dar;
int f1, f2; int f1, f2;
@ -724,8 +725,15 @@ static void mxf_write_cdci_common(AVFormatContext *s, AVStream *st, const UID ke
mxf_write_local_tag(pb, 4, 0x3209); mxf_write_local_tag(pb, 4, 0x3209);
put_be32(pb, st->codec->width); put_be32(pb, st->codec->width);
if (st->codec->height == 608) // PAL + VBI
display_height = 576;
else if (st->codec->height == 512) // NTSC + VBI
display_height = 486;
else
display_height = st->codec->height;
mxf_write_local_tag(pb, 4, 0x3208); mxf_write_local_tag(pb, 4, 0x3208);
put_be32(pb, st->codec->height>>sc->interlaced); put_be32(pb, display_height>>sc->interlaced);
// component depth // component depth
mxf_write_local_tag(pb, 4, 0x3301); mxf_write_local_tag(pb, 4, 0x3301);