Mercurial > libavformat.hg
changeset 4480:b88326454853 libavformat
use correct field number for video according to specs, patch by Thierry Foucu, tfoucu at gmail dot com
| author | bcoudurier |
|---|---|
| date | Fri, 13 Feb 2009 21:36:36 +0000 |
| parents | 4e18c9ac9b10 |
| children | 27fd3af46000 |
| files | gxfenc.c |
| diffstat | 1 files changed, 11 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/gxfenc.c Fri Feb 13 21:32:18 2009 +0000 +++ b/gxfenc.c Fri Feb 13 21:36:36 2009 +0000 @@ -728,11 +728,19 @@ static int gxf_write_media_preamble(ByteIOContext *pb, GXFContext *ctx, AVPacket *pkt, int size) { GXFStreamContext *sc = ctx->fc->streams[pkt->stream_index]->priv_data; - int64_t dts = av_rescale_rnd(pkt->dts, ctx->sample_rate, sc->codec->time_base.den, AV_ROUND_UP); + unsigned field_nb; + /* If the video is frame-encoded, the frame numbers shall be represented by + * even field numbers. + * see SMPTE360M-2004 6.4.2.1.3 Media field number */ + if (sc->codec->codec_type == CODEC_TYPE_VIDEO) { + field_nb = ctx->nb_fields; + } else { + field_nb = av_rescale_rnd(pkt->dts, ctx->sample_rate, sc->codec->time_base.den, AV_ROUND_UP); + } put_byte(pb, sc->media_type); put_byte(pb, sc->index); - put_be32(pb, dts); + put_be32(pb, field_nb); if (sc->codec->codec_type == CODEC_TYPE_AUDIO) { put_be16(pb, 0); put_be16(pb, size / 2); @@ -754,7 +762,7 @@ put_be24(pb, 0); } else put_be32(pb, size); - put_be32(pb, dts); + put_be32(pb, field_nb); put_byte(pb, 1); /* flags */ put_byte(pb, 0); /* reserved */ return 16;