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

decoder/ffmpeg: move code to StreamRelativePts()

Browse Source
This commit is contained in:
Max Kellermann 2015-06-19 18:56:29 +02:00
parent 947e902288
commit f768ca3a2d
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/decoder/plugins/FfmpegDecoderPlugin.cxx
View File

@ -305,6 +305,22 @@ copy_interleave_frame(const AVCodecContext *codec_context,
return data_size; return data_size;
} }
/**
* Convert AVPacket::pts to a stream-relative time stamp (still in
* AVStream::time_base units). Returns a negative value on error.
*/
gcc_pure
static int64_t
StreamRelativePts(const AVPacket &packet, const AVStream &stream)
{
auto pts = packet.pts;
if (pts < 0 || pts == int64_t(AV_NOPTS_VALUE))
return -1;
auto start = start_time_fallback(stream);
return pts - start;
}
static DecoderCommand static DecoderCommand
ffmpeg_send_packet(Decoder &decoder, InputStream &is, ffmpeg_send_packet(Decoder &decoder, InputStream &is,
const AVPacket *packet, const AVPacket *packet,
@ -313,12 +329,10 @@ ffmpeg_send_packet(Decoder &decoder, InputStream &is,
AVFrame *frame, AVFrame *frame,
uint8_t **buffer, int *buffer_size) uint8_t **buffer, int *buffer_size)
{ {
if (packet->pts >= 0 && packet->pts != (int64_t)AV_NOPTS_VALUE) { const auto pts = StreamRelativePts(*packet, *stream);
auto start = start_time_fallback(*stream); if (pts >= 0) {
if (packet->pts >= start) decoder_timestamp(decoder,
decoder_timestamp(decoder, time_from_ffmpeg(pts, stream->time_base));
time_from_ffmpeg(packet->pts - start,
stream->time_base));
} }
AVPacket packet2 = *packet; AVPacket packet2 = *packet;