mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-08 15:45:55 +00:00
Code Issues 1 Projects Releases Wiki Activity

ffdec: handle DTS/PTS

Browse source 
Now that we can know about PTS and DTS on incomming buffers, track them and set
the correct output timestamps.
We can remove the code to estimate if input buffers have pts or dts.
This commit is contained in:
Wim Taymans 2012-04-03 11:52:05 +02:00
parent 182af2df48
commit e438f20c93
1 changed files with 98 additions and 119 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

201
ext/ffmpeg/gstffmpegdec.c
View file

@ -52,7 +52,8 @@ typedef struct _GstFFMpegDec GstFFMpegDec;
typedef struct typedef struct
{ {
gint idx; gint idx;
GstClockTime timestamp; GstClockTime dts;
GstClockTime pts;
GstClockTime duration; GstClockTime duration;
gint64 offset; gint64 offset;
} GstTSInfo; } GstTSInfo;
@ -112,11 +113,9 @@ struct _GstFFMpegDec
/* for tracking DTS/PTS */ /* for tracking DTS/PTS */
gboolean has_b_frames; gboolean has_b_frames;
gboolean reordered_in; GstClockTime last_dts;
GstClockTime last_in;
GstClockTime last_diff; GstClockTime last_diff;
guint last_frames; guint last_frames;
gboolean reordered_out;
GstClockTime last_out; GstClockTime last_out;
GstClockTime next_out; GstClockTime next_out;
@ -172,12 +171,13 @@ struct _GstFFMpegDecClass
static const GstTSInfo ts_info_none = { -1, -1, -1, -1 }; static const GstTSInfo ts_info_none = { -1, -1, -1, -1 };
static const GstTSInfo * static const GstTSInfo *
gst_ts_info_store (GstFFMpegDec * dec, GstClockTime timestamp, gst_ts_info_store (GstFFMpegDec * dec, GstClockTime dts, GstClockTime pts,
GstClockTime duration, gint64 offset) GstClockTime duration, gint64 offset)
{ {
gint idx = dec->ts_idx; gint idx = dec->ts_idx;
dec->ts_info[idx].idx = idx; dec->ts_info[idx].idx = idx;
dec->ts_info[idx].timestamp = timestamp; dec->ts_info[idx].dts = dts;
dec->ts_info[idx].pts = pts;
dec->ts_info[idx].duration = duration; dec->ts_info[idx].duration = duration;
dec->ts_info[idx].offset = offset; dec->ts_info[idx].offset = offset;
dec->ts_idx = (idx + 1) & MAX_TS_MASK; dec->ts_idx = (idx + 1) & MAX_TS_MASK;
@ -518,13 +518,11 @@ gst_ffmpegdec_src_query (GstPad * pad, GstObject * parent, GstQuery * query)
static void static void
gst_ffmpegdec_reset_ts (GstFFMpegDec * ffmpegdec) gst_ffmpegdec_reset_ts (GstFFMpegDec * ffmpegdec)
{ {
ffmpegdec->last_in = GST_CLOCK_TIME_NONE; ffmpegdec->last_dts = GST_CLOCK_TIME_NONE;
ffmpegdec->last_diff = GST_CLOCK_TIME_NONE; ffmpegdec->last_diff = GST_CLOCK_TIME_NONE;
ffmpegdec->last_frames = 0; ffmpegdec->last_frames = 0;
ffmpegdec->last_out = GST_CLOCK_TIME_NONE; ffmpegdec->last_out = GST_CLOCK_TIME_NONE;
ffmpegdec->next_out = GST_CLOCK_TIME_NONE; ffmpegdec->next_out = GST_CLOCK_TIME_NONE;
ffmpegdec->reordered_in = FALSE;
ffmpegdec->reordered_out = FALSE;
} }
static void static void
@ -1448,8 +1446,8 @@ gst_ffmpegdec_audio_negotiate (GstFFMpegDec * ffmpegdec, gboolean force)
memcpy (ffmpegdec->format.audio.gst_layout, memcpy (ffmpegdec->format.audio.gst_layout,
ffmpegdec->format.audio.ffmpeg_layout, ffmpegdec->format.audio.ffmpeg_layout,
sizeof (GstAudioChannelPosition) * ffmpegdec->format.audio.channels); sizeof (GstAudioChannelPosition) * ffmpegdec->format.audio.channels);
gst_audio_channel_positions_to_valid_order (ffmpegdec->format. gst_audio_channel_positions_to_valid_order (ffmpegdec->format.audio.
audio.gst_layout, ffmpegdec->format.audio.channels); gst_layout, ffmpegdec->format.audio.channels);
GST_LOG_OBJECT (ffmpegdec, "output caps %" GST_PTR_FORMAT, caps); GST_LOG_OBJECT (ffmpegdec, "output caps %" GST_PTR_FORMAT, caps);
@ -1820,9 +1818,7 @@ gst_avpacket_init (AVPacket * packet, guint8 * data, guint size)
* ffmpegdec: * ffmpegdec:
* data: pointer to the data to decode * data: pointer to the data to decode
* size: size of data in bytes * size: size of data in bytes
* in_timestamp: incoming timestamp. * dec_info: timestamp info
* in_duration: incoming duration.
* in_offset: incoming offset (frame number).
* outbuf: outgoing buffer. Different from NULL ONLY if it contains decoded data. * outbuf: outgoing buffer. Different from NULL ONLY if it contains decoded data.
* ret: Return flow. * ret: Return flow.
* *
@ -1840,7 +1836,7 @@ gst_ffmpegdec_video_frame (GstFFMpegDec * ffmpegdec,
gboolean mode_switch; gboolean mode_switch;
gboolean decode; gboolean decode;
gint skip_frame = AVDISCARD_DEFAULT; gint skip_frame = AVDISCARD_DEFAULT;
GstClockTime out_timestamp, out_duration, out_pts; GstClockTime out_dts, out_pts, out_duration;
gint64 out_offset; gint64 out_offset;
const GstTSInfo *out_info; const GstTSInfo *out_info;
AVPacket packet; AVPacket packet;
@ -1855,7 +1851,7 @@ gst_ffmpegdec_video_frame (GstFFMpegDec * ffmpegdec,
/* run QoS code, we don't stop decoding the frame when we are late because /* run QoS code, we don't stop decoding the frame when we are late because
* else we might skip a reference frame */ * else we might skip a reference frame */
decode = gst_ffmpegdec_do_qos (ffmpegdec, dec_info->timestamp, &mode_switch); decode = gst_ffmpegdec_do_qos (ffmpegdec, dec_info->pts, &mode_switch);
if (ffmpegdec->is_realvideo && data != NULL) { if (ffmpegdec->is_realvideo && data != NULL) {
gint slice_count; gint slice_count;
@ -1918,13 +1914,15 @@ gst_ffmpegdec_video_frame (GstFFMpegDec * ffmpegdec,
/* get the output picture timing info again */ /* get the output picture timing info again */
out_info = gst_ts_info_get (ffmpegdec, ffmpegdec->picture->reordered_opaque); out_info = gst_ts_info_get (ffmpegdec, ffmpegdec->picture->reordered_opaque);
out_pts = out_info->timestamp; out_dts = out_info->dts;
out_pts = out_info->pts;
out_duration = out_info->duration; out_duration = out_info->duration;
out_offset = out_info->offset; out_offset = out_info->offset;
GST_DEBUG_OBJECT (ffmpegdec, GST_DEBUG_OBJECT (ffmpegdec,
"pts %" G_GUINT64_FORMAT " duration %" G_GUINT64_FORMAT " offset %" "dts %" G_GUINT64_FORMAT " pts %" G_GUINT64_FORMAT " duration %"
G_GINT64_FORMAT, out_pts, out_duration, out_offset); G_GUINT64_FORMAT " offset %" G_GINT64_FORMAT, out_dts, out_pts,
out_duration, out_offset);
GST_DEBUG_OBJECT (ffmpegdec, "picture: pts %" G_GUINT64_FORMAT, GST_DEBUG_OBJECT (ffmpegdec, "picture: pts %" G_GUINT64_FORMAT,
(guint64) ffmpegdec->picture->pts); (guint64) ffmpegdec->picture->pts);
GST_DEBUG_OBJECT (ffmpegdec, "picture: num %d", GST_DEBUG_OBJECT (ffmpegdec, "picture: num %d",
@ -1976,22 +1974,6 @@ gst_ffmpegdec_video_frame (GstFFMpegDec * ffmpegdec,
* are dealing with B frames. */ * are dealing with B frames. */
iskeyframe = check_keyframe (ffmpegdec); iskeyframe = check_keyframe (ffmpegdec);
/* check that the timestamps go upwards */
if (ffmpegdec->last_out != -1 && ffmpegdec->last_out > out_pts) {
/* timestamps go backwards, this means frames were reordered and we must
* be dealing with DTS as the buffer timestamps */
if (!ffmpegdec->reordered_out) {
GST_DEBUG_OBJECT (ffmpegdec, "detected reordered out timestamps");
ffmpegdec->reordered_out = TRUE;
}
if (ffmpegdec->reordered_in) {
/* we reset the input reordering here because we want to recover from an
* occasionally wrong reordered input timestamp */
GST_DEBUG_OBJECT (ffmpegdec, "assuming DTS input timestamps");
ffmpegdec->reordered_in = FALSE;
}
}
if (out_pts == 0 && out_pts == ffmpegdec->last_out) { if (out_pts == 0 && out_pts == ffmpegdec->last_out) {
GST_LOG_OBJECT (ffmpegdec, "ffmpeg returns 0 timestamps, ignoring"); GST_LOG_OBJECT (ffmpegdec, "ffmpeg returns 0 timestamps, ignoring");
/* some codecs only output 0 timestamps, when that happens, make us select an /* some codecs only output 0 timestamps, when that happens, make us select an
@ -2002,17 +1984,11 @@ gst_ffmpegdec_video_frame (GstFFMpegDec * ffmpegdec,
} else } else
ffmpegdec->last_out = out_pts; ffmpegdec->last_out = out_pts;
/* we assume DTS as input timestamps unless we see reordered input
* timestamps */ if (iskeyframe && out_pts == -1) {
if (!ffmpegdec->reordered_in && ffmpegdec->reordered_out) { GST_DEBUG_OBJECT (ffmpegdec, "keyframe, use DTS %" GST_TIME_FORMAT,
/* PTS and DTS are the same for keyframes */ GST_TIME_ARGS (out_dts));
if (!iskeyframe && ffmpegdec->next_out != -1) { out_pts = out_dts;
/* interpolate all timestamps except for keyframes, FIXME, this is
* wrong when QoS is active. */
GST_DEBUG_OBJECT (ffmpegdec, "interpolate timestamps");
out_pts = -1;
out_offset = -1;
}
} }
/* when we're waiting for a keyframe, see if we have one or drop the current /* when we're waiting for a keyframe, see if we have one or drop the current
@ -2037,24 +2013,21 @@ gst_ffmpegdec_video_frame (GstFFMpegDec * ffmpegdec,
* 2) else interpolate from previous output timestamp * 2) else interpolate from previous output timestamp
* 3) else copy input timestamp * 3) else copy input timestamp
*/ */
out_timestamp = -1;
if (out_pts != -1) { if (out_pts != -1) {
/* Get (interpolated) timestamp from FFMPEG */ /* Use (interpolated) timestamp from FFMPEG */
out_timestamp = (GstClockTime) out_pts;
GST_LOG_OBJECT (ffmpegdec, "using timestamp %" GST_TIME_FORMAT GST_LOG_OBJECT (ffmpegdec, "using timestamp %" GST_TIME_FORMAT
" returned by ffmpeg", GST_TIME_ARGS (out_timestamp)); " returned by ffmpeg", GST_TIME_ARGS (out_pts));
} } else if (ffmpegdec->next_out != -1) {
if (!GST_CLOCK_TIME_IS_VALID (out_timestamp) && ffmpegdec->next_out != -1) { out_pts = ffmpegdec->next_out;
out_timestamp = ffmpegdec->next_out;
GST_LOG_OBJECT (ffmpegdec, "using next timestamp %" GST_TIME_FORMAT, GST_LOG_OBJECT (ffmpegdec, "using next timestamp %" GST_TIME_FORMAT,
GST_TIME_ARGS (out_timestamp)); GST_TIME_ARGS (out_pts));
} } else {
if (!GST_CLOCK_TIME_IS_VALID (out_timestamp)) { out_pts = dec_info->pts;
out_timestamp = dec_info->timestamp;
GST_LOG_OBJECT (ffmpegdec, "using in timestamp %" GST_TIME_FORMAT, GST_LOG_OBJECT (ffmpegdec, "using in timestamp %" GST_TIME_FORMAT,
GST_TIME_ARGS (out_timestamp)); GST_TIME_ARGS (out_pts));
} }
GST_BUFFER_TIMESTAMP (*outbuf) = out_timestamp; GST_BUFFER_DTS (*outbuf) = out_pts;
GST_BUFFER_PTS (*outbuf) = out_pts;
/* /*
* Offset: * Offset:
@ -2065,7 +2038,7 @@ gst_ffmpegdec_video_frame (GstFFMpegDec * ffmpegdec,
if (out_offset != GST_BUFFER_OFFSET_NONE) { if (out_offset != GST_BUFFER_OFFSET_NONE) {
/* out_offset already contains the offset from ts_info */ /* out_offset already contains the offset from ts_info */
GST_LOG_OBJECT (ffmpegdec, "Using offset returned by ffmpeg"); GST_LOG_OBJECT (ffmpegdec, "Using offset returned by ffmpeg");
} else if (out_timestamp != GST_CLOCK_TIME_NONE) { } else if (out_pts != GST_CLOCK_TIME_NONE) {
GST_LOG_OBJECT (ffmpegdec, "Using offset converted from timestamp"); GST_LOG_OBJECT (ffmpegdec, "Using offset converted from timestamp");
/* FIXME, we should really remove this as it's not nice at all to do /* FIXME, we should really remove this as it's not nice at all to do
* upstream queries for each frame to get the frame offset. We also can't * upstream queries for each frame to get the frame offset. We also can't
@ -2073,7 +2046,7 @@ gst_ffmpegdec_video_frame (GstFFMpegDec * ffmpegdec,
* on outgoing buffers. We should have metadata so that the upstream peer * on outgoing buffers. We should have metadata so that the upstream peer
* can set a frame number on the encoded data. */ * can set a frame number on the encoded data. */
gst_pad_peer_query_convert (ffmpegdec->sinkpad, gst_pad_peer_query_convert (ffmpegdec->sinkpad,
GST_FORMAT_TIME, out_timestamp, GST_FORMAT_DEFAULT, &out_offset); GST_FORMAT_TIME, out_pts, GST_FORMAT_DEFAULT, &out_offset);
} else if (dec_info->offset != GST_BUFFER_OFFSET_NONE) { } else if (dec_info->offset != GST_BUFFER_OFFSET_NONE) {
/* FIXME, the input offset is input media specific and might not /* FIXME, the input offset is input media specific and might not
* be the same for the output media. (byte offset as input, frame number * be the same for the output media. (byte offset as input, frame number
@ -2097,31 +2070,38 @@ gst_ffmpegdec_video_frame (GstFFMpegDec * ffmpegdec,
*/ */
if (GST_CLOCK_TIME_IS_VALID (out_duration)) { if (GST_CLOCK_TIME_IS_VALID (out_duration)) {
/* We have a valid (reordered) duration */ /* We have a valid (reordered) duration */
GST_LOG_OBJECT (ffmpegdec, "Using duration returned by ffmpeg"); GST_LOG_OBJECT (ffmpegdec,
"Using duration returned by ffmpeg %" GST_TIME_FORMAT,
GST_TIME_ARGS (out_duration));
} else if (GST_CLOCK_TIME_IS_VALID (dec_info->duration)) { } else if (GST_CLOCK_TIME_IS_VALID (dec_info->duration)) {
GST_LOG_OBJECT (ffmpegdec, "using in_duration");
out_duration = dec_info->duration; out_duration = dec_info->duration;
GST_LOG_OBJECT (ffmpegdec, "using in_duration %" GST_TIME_FORMAT,
GST_TIME_ARGS (out_duration));
} else if (GST_CLOCK_TIME_IS_VALID (ffmpegdec->last_diff)) { } else if (GST_CLOCK_TIME_IS_VALID (ffmpegdec->last_diff)) {
GST_LOG_OBJECT (ffmpegdec, "using last-diff");
out_duration = ffmpegdec->last_diff; out_duration = ffmpegdec->last_diff;
GST_LOG_OBJECT (ffmpegdec, "using last-diff %" GST_TIME_FORMAT,
GST_TIME_ARGS (out_duration));
} else { } else {
/* if we have an input framerate, use that */ /* if we have an input framerate, use that */
if (ffmpegdec->out_info.fps_n != -1 && if (ffmpegdec->out_info.fps_n != -1 &&
(ffmpegdec->out_info.fps_n != 1000 && ffmpegdec->out_info.fps_d != 1)) { (ffmpegdec->out_info.fps_n != 1000 && ffmpegdec->out_info.fps_d != 1)) {
GST_LOG_OBJECT (ffmpegdec, "using input framerate for duration");
out_duration = gst_util_uint64_scale_int (GST_SECOND, out_duration = gst_util_uint64_scale_int (GST_SECOND,
ffmpegdec->out_info.fps_d, ffmpegdec->out_info.fps_n); ffmpegdec->out_info.fps_d, ffmpegdec->out_info.fps_n);
GST_LOG_OBJECT (ffmpegdec,
"using input framerate for duration %" GST_TIME_FORMAT,
GST_TIME_ARGS (out_duration));
} else { } else {
/* don't try to use the decoder's framerate when it seems a bit abnormal, /* don't try to use the decoder's framerate when it seems a bit abnormal,
* which we assume when den >= 1000... */ * which we assume when den >= 1000... */
if (ffmpegdec->context->time_base.num != 0 && if (ffmpegdec->context->time_base.num != 0 &&
(ffmpegdec->context->time_base.den > 0 && (ffmpegdec->context->time_base.den > 0 &&
ffmpegdec->context->time_base.den < 1000)) { ffmpegdec->context->time_base.den < 1000)) {
GST_LOG_OBJECT (ffmpegdec, "using decoder's framerate for duration");
out_duration = gst_util_uint64_scale_int (GST_SECOND, out_duration = gst_util_uint64_scale_int (GST_SECOND,
ffmpegdec->context->time_base.num * ffmpegdec->context->time_base.num *
ffmpegdec->context->ticks_per_frame, ffmpegdec->context->ticks_per_frame,
ffmpegdec->context->time_base.den); ffmpegdec->context->time_base.den);
GST_LOG_OBJECT (ffmpegdec, "using decoder's framerate for duration %"
GST_TIME_FORMAT, GST_TIME_ARGS (out_duration));
} else { } else {
GST_LOG_OBJECT (ffmpegdec, "no valid duration found"); GST_LOG_OBJECT (ffmpegdec, "no valid duration found");
} }
@ -2130,15 +2110,20 @@ gst_ffmpegdec_video_frame (GstFFMpegDec * ffmpegdec,
/* Take repeat_pict into account */ /* Take repeat_pict into account */
if (GST_CLOCK_TIME_IS_VALID (out_duration)) { if (GST_CLOCK_TIME_IS_VALID (out_duration)) {
GST_LOG_OBJECT (ffmpegdec, "repeat pict %d",
ffmpegdec->picture->repeat_pict);
out_duration += out_duration * ffmpegdec->picture->repeat_pict / 2; out_duration += out_duration * ffmpegdec->picture->repeat_pict / 2;
} }
GST_BUFFER_DURATION (*outbuf) = out_duration; GST_BUFFER_DURATION (*outbuf) = out_duration;
if (out_timestamp != -1 && out_duration != -1 && out_duration != 0) if (out_dts != -1 && out_duration != -1 && out_duration != 0)
ffmpegdec->next_out = out_timestamp + out_duration; ffmpegdec->next_out = out_pts + out_duration;
else else
ffmpegdec->next_out = -1; ffmpegdec->next_out = -1;
GST_LOG_OBJECT (ffmpegdec, "next out %" GST_TIME_FORMAT,
GST_TIME_ARGS (ffmpegdec->next_out));
/* palette is not part of raw video frame in gst and the size /* palette is not part of raw video frame in gst and the size
* of the outgoing buffer needs to be adjusted accordingly */ * of the outgoing buffer needs to be adjusted accordingly */
if (ffmpegdec->context->palctrl != NULL) { if (ffmpegdec->context->palctrl != NULL) {
@ -2148,7 +2133,7 @@ gst_ffmpegdec_video_frame (GstFFMpegDec * ffmpegdec,
} }
/* now see if we need to clip the buffer against the segment boundaries. */ /* now see if we need to clip the buffer against the segment boundaries. */
if (G_UNLIKELY (!clip_video_buffer (ffmpegdec, *outbuf, out_timestamp, if (G_UNLIKELY (!clip_video_buffer (ffmpegdec, *outbuf, out_pts,
out_duration))) out_duration)))
goto clipped; goto clipped;
@ -2269,17 +2254,18 @@ gst_ffmpegdec_audio_frame (GstFFMpegDec * ffmpegdec,
{ {
gint len = -1; gint len = -1;
gint have_data = AVCODEC_MAX_AUDIO_FRAME_SIZE; gint have_data = AVCODEC_MAX_AUDIO_FRAME_SIZE;
GstClockTime out_timestamp, out_duration; GstClockTime out_pts, out_duration;
GstMapInfo map; GstMapInfo map;
gint64 out_offset; gint64 out_offset;
int16_t *odata; int16_t *odata;
AVPacket packet; AVPacket packet;
GST_DEBUG_OBJECT (ffmpegdec, GST_DEBUG_OBJECT (ffmpegdec,
"size:%d, offset:%" G_GINT64_FORMAT ", ts:%" GST_TIME_FORMAT ", dur:%" "size:%d, offset:%" G_GINT64_FORMAT ", dts:%" GST_TIME_FORMAT ", pts:%"
GST_TIME_FORMAT ", ffmpegdec->next_out:%" GST_TIME_FORMAT, size, GST_TIME_FORMAT ", dur:%" GST_TIME_FORMAT ", ffmpegdec->next_out:%"
dec_info->offset, GST_TIME_ARGS (dec_info->timestamp), GST_TIME_FORMAT, size, dec_info->offset, GST_TIME_ARGS (dec_info->dts),
GST_TIME_ARGS (dec_info->duration), GST_TIME_ARGS (ffmpegdec->next_out)); GST_TIME_ARGS (dec_info->pts), GST_TIME_ARGS (dec_info->duration),
GST_TIME_ARGS (ffmpegdec->next_out));
*outbuf = new_aligned_buffer (AVCODEC_MAX_AUDIO_FRAME_SIZE); *outbuf = new_aligned_buffer (AVCODEC_MAX_AUDIO_FRAME_SIZE);
@ -2314,10 +2300,10 @@ gst_ffmpegdec_audio_frame (GstFFMpegDec * ffmpegdec,
* 2) else interpolate from previous input timestamp * 2) else interpolate from previous input timestamp
*/ */
/* always take timestamps from the input buffer if any */ /* always take timestamps from the input buffer if any */
if (GST_CLOCK_TIME_IS_VALID (dec_info->timestamp)) { if (GST_CLOCK_TIME_IS_VALID (dec_info->pts)) {
out_timestamp = dec_info->timestamp; out_pts = dec_info->pts;
} else { } else {
out_timestamp = ffmpegdec->next_out; out_pts = ffmpegdec->next_out;
} }
/* /*
@ -2336,20 +2322,20 @@ gst_ffmpegdec_audio_frame (GstFFMpegDec * ffmpegdec,
out_offset = dec_info->offset; out_offset = dec_info->offset;
GST_DEBUG_OBJECT (ffmpegdec, GST_DEBUG_OBJECT (ffmpegdec,
"Buffer created. Size:%d , timestamp:%" GST_TIME_FORMAT " , duration:%" "Buffer created. Size:%d , pts:%" GST_TIME_FORMAT " , duration:%"
GST_TIME_FORMAT, have_data, GST_TIME_FORMAT, have_data,
GST_TIME_ARGS (out_timestamp), GST_TIME_ARGS (out_duration)); GST_TIME_ARGS (out_pts), GST_TIME_ARGS (out_duration));
GST_BUFFER_TIMESTAMP (*outbuf) = out_timestamp; GST_BUFFER_PTS (*outbuf) = out_pts;
GST_BUFFER_DURATION (*outbuf) = out_duration; GST_BUFFER_DURATION (*outbuf) = out_duration;
GST_BUFFER_OFFSET (*outbuf) = out_offset; GST_BUFFER_OFFSET (*outbuf) = out_offset;
/* the next timestamp we'll use when interpolating */ /* the next timestamp we'll use when interpolating */
if (GST_CLOCK_TIME_IS_VALID (out_timestamp)) if (GST_CLOCK_TIME_IS_VALID (out_pts))
ffmpegdec->next_out = out_timestamp + out_duration; ffmpegdec->next_out = out_pts + out_duration;
/* now see if we need to clip the buffer against the segment boundaries. */ /* now see if we need to clip the buffer against the segment boundaries. */
if (G_UNLIKELY (!clip_audio_buffer (ffmpegdec, *outbuf, out_timestamp, if (G_UNLIKELY (!clip_audio_buffer (ffmpegdec, *outbuf, out_pts,
out_duration))) out_duration)))
goto clipped; goto clipped;
@ -2757,8 +2743,7 @@ gst_ffmpegdec_chain (GstPad * pad, GstObject * parent, GstBuffer * inbuf)
GstMapInfo map; GstMapInfo map;
gint size, bsize, len, have_data; gint size, bsize, len, have_data;
GstFlowReturn ret = GST_FLOW_OK; GstFlowReturn ret = GST_FLOW_OK;
GstClockTime in_timestamp; GstClockTime in_pts, in_dts, in_duration;
GstClockTime in_duration;
gboolean discont, do_padding; gboolean discont, do_padding;
gint64 in_offset; gint64 in_offset;
const GstTSInfo *in_info; const GstTSInfo *in_info;
@ -2810,25 +2795,19 @@ gst_ffmpegdec_chain (GstPad * pad, GstObject * parent, GstBuffer * inbuf)
ffmpegdec->pcache = NULL; ffmpegdec->pcache = NULL;
} }
in_timestamp = GST_BUFFER_TIMESTAMP (inbuf); in_dts = GST_BUFFER_DTS (inbuf);
in_pts = GST_BUFFER_PTS (inbuf);
in_duration = GST_BUFFER_DURATION (inbuf); in_duration = GST_BUFFER_DURATION (inbuf);
in_offset = GST_BUFFER_OFFSET (inbuf); in_offset = GST_BUFFER_OFFSET (inbuf);
/* get handle to timestamp info, we can pass this around to ffmpeg */ /* get handle to timestamp info, we can pass this around to ffmpeg */
in_info = gst_ts_info_store (ffmpegdec, in_timestamp, in_duration, in_offset); in_info =
gst_ts_info_store (ffmpegdec, in_dts, in_pts, in_duration, in_offset);
if (in_timestamp != -1) { if (in_dts != -1) {
/* check for increasing timestamps if they are jumping backwards, we
* probably are dealing with PTS as timestamps */
if (!ffmpegdec->reordered_in && ffmpegdec->last_in != -1) {
if (in_timestamp < ffmpegdec->last_in) {
GST_LOG_OBJECT (ffmpegdec, "detected reordered input timestamps");
ffmpegdec->reordered_in = TRUE;
ffmpegdec->last_diff = GST_CLOCK_TIME_NONE;
} else if (in_timestamp > ffmpegdec->last_in) {
GstClockTime diff; GstClockTime diff;
/* keep track of timestamp diff to estimate duration */ /* keep track of timestamp diff to estimate duration */
diff = in_timestamp - ffmpegdec->last_in; diff = in_dts - ffmpegdec->last_dts;
/* need to scale with amount of frames in the interval */ /* need to scale with amount of frames in the interval */
if (ffmpegdec->last_frames) if (ffmpegdec->last_frames)
diff /= ffmpegdec->last_frames; diff /= ffmpegdec->last_frames;
@ -2837,9 +2816,7 @@ gst_ffmpegdec_chain (GstPad * pad, GstObject * parent, GstBuffer * inbuf)
GST_TIME_ARGS (diff), ffmpegdec->last_frames); GST_TIME_ARGS (diff), ffmpegdec->last_frames);
ffmpegdec->last_diff = diff; ffmpegdec->last_diff = diff;
} ffmpegdec->last_dts = in_dts;
}
ffmpegdec->last_in = in_timestamp;
ffmpegdec->last_frames = 0; ffmpegdec->last_frames = 0;
} }
@ -2858,10 +2835,10 @@ gst_ffmpegdec_chain (GstPad * pad, GstObject * parent, GstBuffer * inbuf)
bsize = map.size; bsize = map.size;
GST_LOG_OBJECT (ffmpegdec, GST_LOG_OBJECT (ffmpegdec,
"Received new data of size %u, offset:%" G_GUINT64_FORMAT ", ts:%" "Received new data of size %u, offset:%" G_GUINT64_FORMAT ", dts:%"
GST_TIME_FORMAT ", dur:%" GST_TIME_FORMAT ", info %d", GST_TIME_FORMAT ", pts:%" GST_TIME_FORMAT ", dur:%" GST_TIME_FORMAT
bsize, in_offset, GST_TIME_ARGS (in_timestamp), ", info %d", bsize, in_offset, GST_TIME_ARGS (in_dts),
GST_TIME_ARGS (in_duration), in_info->idx); GST_TIME_ARGS (in_pts), GST_TIME_ARGS (in_duration), in_info->idx);
if (!GST_MEMORY_IS_ZERO_PADDED (map.memory) if (!GST_MEMORY_IS_ZERO_PADDED (map.memory)
|| (map.maxsize - map.size) < FF_INPUT_BUFFER_PADDING_SIZE) { || (map.maxsize - map.size) < FF_INPUT_BUFFER_PADDING_SIZE) {
@ -2890,8 +2867,7 @@ gst_ffmpegdec_chain (GstPad * pad, GstObject * parent, GstBuffer * inbuf)
do_padding = TRUE; do_padding = TRUE;
GST_LOG_OBJECT (ffmpegdec, GST_LOG_OBJECT (ffmpegdec,
"Calling av_parser_parse2 with offset %" G_GINT64_FORMAT ", ts:%" "Calling av_parser_parse2 with offset %" G_GINT64_FORMAT ", ts:%"
GST_TIME_FORMAT " size %d", in_offset, GST_TIME_ARGS (in_timestamp), GST_TIME_FORMAT " size %d", in_offset, GST_TIME_ARGS (in_pts), bsize);
bsize);
/* feed the parser. We pass the timestamp info so that we can recover all /* feed the parser. We pass the timestamp info so that we can recover all
* info again later */ * info again later */
@ -2999,7 +2975,8 @@ gst_ffmpegdec_chain (GstPad * pad, GstObject * parent, GstBuffer * inbuf)
/* make sure we don't use the same old timestamp for the next frame and let /* make sure we don't use the same old timestamp for the next frame and let
* the interpollation take care of it. */ * the interpollation take care of it. */
if (ffmpegdec->clear_ts) { if (ffmpegdec->clear_ts) {
in_timestamp = GST_CLOCK_TIME_NONE; in_dts = GST_CLOCK_TIME_NONE;
in_pts = GST_CLOCK_TIME_NONE;
in_duration = GST_CLOCK_TIME_NONE; in_duration = GST_CLOCK_TIME_NONE;
in_offset = GST_BUFFER_OFFSET_NONE; in_offset = GST_BUFFER_OFFSET_NONE;
in_info = GST_TS_INFO_NONE; in_info = GST_TS_INFO_NONE;
@ -3017,18 +2994,20 @@ gst_ffmpegdec_chain (GstPad * pad, GstObject * parent, GstBuffer * inbuf)
/* keep left-over */ /* keep left-over */
if (ffmpegdec->pctx && bsize > 0) { if (ffmpegdec->pctx && bsize > 0) {
in_timestamp = GST_BUFFER_TIMESTAMP (inbuf); in_pts = GST_BUFFER_PTS (inbuf);
in_dts = GST_BUFFER_DTS (inbuf);
in_offset = GST_BUFFER_OFFSET (inbuf); in_offset = GST_BUFFER_OFFSET (inbuf);
GST_LOG_OBJECT (ffmpegdec, GST_LOG_OBJECT (ffmpegdec,
"Keeping %d bytes of data with offset %" G_GINT64_FORMAT ", timestamp %" "Keeping %d bytes of data with offset %" G_GINT64_FORMAT ", pts %"
GST_TIME_FORMAT, bsize, in_offset, GST_TIME_ARGS (in_timestamp)); GST_TIME_FORMAT, bsize, in_offset, GST_TIME_ARGS (in_pts));
ffmpegdec->pcache = gst_buffer_copy_region (inbuf, GST_BUFFER_COPY_ALL, ffmpegdec->pcache = gst_buffer_copy_region (inbuf, GST_BUFFER_COPY_ALL,
gst_buffer_get_size (inbuf) - bsize, bsize); gst_buffer_get_size (inbuf) - bsize, bsize);
/* we keep timestamp, even though all we really know is that the correct /* we keep timestamp, even though all we really know is that the correct
* timestamp is not below the one from inbuf */ * timestamp is not below the one from inbuf */
GST_BUFFER_TIMESTAMP (ffmpegdec->pcache) = in_timestamp; GST_BUFFER_PTS (ffmpegdec->pcache) = in_pts;
GST_BUFFER_DTS (ffmpegdec->pcache) = in_dts;
GST_BUFFER_OFFSET (ffmpegdec->pcache) = in_offset; GST_BUFFER_OFFSET (ffmpegdec->pcache) = in_offset;
} else if (bsize > 0) { } else if (bsize > 0) {
GST_DEBUG_OBJECT (ffmpegdec, "Dropping %d bytes of data", bsize); GST_DEBUG_OBJECT (ffmpegdec, "Dropping %d bytes of data", bsize);