mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-27 09:38:17 +00:00
Code Issues 1 Projects Releases Wiki Activity

Flush stream only if avcodec_decode_video() read something.

Browse source 
Otherwise, we might still have to seek into the stream.
i.e. keep the data longer.
This commit is contained in:
gb 2010-04-26 08:53:18 +00:00 committed by Gwenole Beauchesne
parent da3948bdeb
commit 0d7164c96c
1 changed files with 25 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
gst-libs/gst/vaapi/gstvaapidecoder_ffmpeg.c
View file

@ -191,6 +191,20 @@ get_raw_format(GstVaapiDecoder *decoder)
return av_find_input_format(raw_format);
}
/** Flushes n bytes from the stream */
static void
stream_flush(GstVaapiDecoder *decoder, int buf_size)
{
GstVaapiDecoderFfmpegPrivate * const priv =
GST_VAAPI_DECODER_FFMPEG(decoder)->priv;
gst_vaapi_decoder_flush(decoder, buf_size);
if (priv->iobuf_pos > buf_size)
priv->iobuf_pos -= buf_size;
else
priv->iobuf_pos = 0;
}
/** Reads one packet */
static int
stream_read(void *opaque, uint8_t *buf, int buf_size)
@ -200,10 +214,6 @@ stream_read(void *opaque, uint8_t *buf, int buf_size)
GST_VAAPI_DECODER_FFMPEG(decoder)->priv;
if (buf_size > 0) {
if (priv->is_constructed) {
buf_size = gst_vaapi_decoder_read(decoder, buf, buf_size);
}
else {
buf_size = gst_vaapi_decoder_copy(
decoder,
priv->iobuf_pos,
@ -211,7 +221,6 @@ stream_read(void *opaque, uint8_t *buf, int buf_size)
);
priv->iobuf_pos += buf_size;
}
}
return buf_size;
}
@ -472,10 +481,10 @@ decode_frame(GstVaapiDecoderFfmpeg *ffdecoder, guchar *buf, guint buf_size)
GstVaapiDecoderFfmpegPrivate * const priv = ffdecoder->priv;
GstVaapiDisplay * const display = GST_VAAPI_DECODER_DISPLAY(ffdecoder);
GstVaapiSurface *surface = NULL;
int got_picture = 0;
int bytes_read, got_picture = 0;
GST_VAAPI_DISPLAY_LOCK(display);
avcodec_decode_video(
bytes_read = avcodec_decode_video(
priv->avctx,
priv->frame,
&got_picture,
@ -483,6 +492,9 @@ decode_frame(GstVaapiDecoderFfmpeg *ffdecoder, guchar *buf, guint buf_size)
);
GST_VAAPI_DISPLAY_UNLOCK(display);
if (bytes_read > 0)
stream_flush(GST_VAAPI_DECODER_CAST(ffdecoder), bytes_read);
if (got_picture) {
surface = gst_vaapi_context_find_surface_by_id(
GST_VAAPI_DECODER_CONTEXT(ffdecoder),