generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix dts adjusting

Browse Source 
Originally committed as revision 7982 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2007-02-14 14:54:20 +00:00
parent 41536a6078
commit 2012121363
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libavformat/gxfenc.c
View File

@ -572,6 +572,8 @@ static int gxf_write_umf_packet(ByteIOContext *pb, GXFContext *ctx)
return updatePacketSize(pb, pos); return updatePacketSize(pb, pos);
} }
#define GXF_NODELAY -5000
static int gxf_write_header(AVFormatContext *s) static int gxf_write_header(AVFormatContext *s)
{ {
ByteIOContext *pb = &s->pb; ByteIOContext *pb = &s->pb;
@ -623,7 +625,8 @@ static int gxf_write_header(AVFormatContext *s)
gxf->flags |= 0x00000040; gxf->flags |= 0x00000040;
} }
gxf->sample_rate = sc->sample_rate; gxf->sample_rate = sc->sample_rate;
av_set_pts_info(st, 64, 1, sc->sample_rate); av_set_pts_info(st, 64, 1, st->codec->time_base.den);
sc->dts_delay = GXF_NODELAY;
if (gxf_find_lines_index(sc) < 0) if (gxf_find_lines_index(sc) < 0)
sc->lines_index = -1; sc->lines_index = -1;
sc->sample_size = st->codec->bit_rate; sc->sample_size = st->codec->bit_rate;
@ -707,7 +710,7 @@ static int gxf_parse_mpeg_frame(GXFStreamContext *sc, const uint8_t *buf, int si
static int gxf_write_media_preamble(ByteIOContext *pb, GXFContext *ctx, AVPacket *pkt, int size) static int gxf_write_media_preamble(ByteIOContext *pb, GXFContext *ctx, AVPacket *pkt, int size)
{ {
GXFStreamContext *sc = &ctx->streams[pkt->stream_index]; GXFStreamContext *sc = &ctx->streams[pkt->stream_index];
int64_t dts = av_rescale(pkt->dts, ctx->sample_rate, sc->sample_rate); int64_t dts = av_rescale(pkt->dts, ctx->sample_rate, sc->codec->time_base.den);
put_byte(pb, sc->media_type); put_byte(pb, sc->media_type);
put_byte(pb, sc->index); put_byte(pb, sc->index);
@ -799,13 +802,9 @@ static int gxf_interleave_packet(AVFormatContext *s, AVPacket *out, AVPacket *pk
break; /* add pkt right now into list */ break; /* add pkt right now into list */
} }
} }
} else if (pkt) { } else if (pkt && pkt->stream_index == i) {
/* adjust dts if negative */ if (sc->dts_delay == GXF_NODELAY) /* adjust dts if needed */
if (pkt->dts < 0 && !sc->dts_delay) { sc->dts_delay = pkt->dts;
/* XXX: rescale if codec time base is different from stream time base */
sc->dts_delay = av_rescale_q(pkt->dts, st->codec->time_base, st->time_base);
pkt->dts = sc->dts_delay; /* set to 0 */
}
pkt->dts -= sc->dts_delay; pkt->dts -= sc->dts_delay;
} }
} }