oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

decoder/ffmpeg: move formula to time_from_ffmpeg()

Browse Source
This commit is contained in:
Max Kellermann 2011-09-15 21:03:03 +02:00
parent 5aabee8996
commit 9aa91e0f17
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/decoder/ffmpeg_decoder_plugin.c
View File

@ -214,6 +214,15 @@ align16(void *p, size_t *length_p)
return (char *)p + add; return (char *)p + add;
} }
G_GNUC_CONST
static double
time_from_ffmpeg(int64_t t, const AVRational time_base)
{
assert(t != (int64_t)AV_NOPTS_VALUE);
return av_rescale_q(t, time_base, (AVRational){1, 1});
}
static enum decoder_command static enum decoder_command
ffmpeg_send_packet(struct decoder *decoder, struct input_stream *is, ffmpeg_send_packet(struct decoder *decoder, struct input_stream *is,
const AVPacket *packet, const AVPacket *packet,
@ -222,8 +231,7 @@ ffmpeg_send_packet(struct decoder *decoder, struct input_stream *is,
{ {
if (packet->pts != (int64_t)AV_NOPTS_VALUE) if (packet->pts != (int64_t)AV_NOPTS_VALUE)
decoder_timestamp(decoder, decoder_timestamp(decoder,
av_rescale_q(packet->pts, *time_base, time_from_ffmpeg(packet->pts, *time_base));
(AVRational){1, 1}));
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52,25,0) #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52,25,0)
AVPacket packet2 = *packet; AVPacket packet2 = *packet;