GST_DEBUG_CATEGORY_STATIC (GST_CAT_PERFORMANCE);
+#define GST_FFMPEG_VIDEO_CODEC_FRAME_FLAG_ALLOCATED (1<<15)
+
#define MAX_TS_MASK 0xff
#define DEFAULT_LOWRES 0
if (frame->mapped)
gst_video_frame_unmap (&frame->vframe);
+ GST_VIDEO_CODEC_FRAME_FLAG_UNSET (frame->frame,
+ GST_FFMPEG_VIDEO_CODEC_FRAME_FLAG_ALLOCATED);
gst_video_decoder_release_frame (GST_VIDEO_DECODER (ffmpegdec), frame->frame);
gst_buffer_replace (&frame->buffer, NULL);
if (frame->avbuffer) {
/* now it has a buffer allocated, so it is real and will also
* be _released */
+ GST_VIDEO_CODEC_FRAME_FLAG_SET (frame,
+ GST_FFMPEG_VIDEO_CODEC_FRAME_FLAG_ALLOCATED);
GST_VIDEO_CODEC_FRAME_FLAG_UNSET (frame,
GST_VIDEO_CODEC_FRAME_FLAG_DECODE_ONLY);
GST_TIME_FORMAT, tmp, tmp->system_frame_number,
GST_TIME_ARGS (tmp->pts), GST_TIME_ARGS (tmp->dts));
/* drop extra ref and remove from frame list */
+ GST_VIDEO_CODEC_FRAME_FLAG_UNSET (tmp,
+ GST_FFMPEG_VIDEO_CODEC_FRAME_FLAG_ALLOCATED);
gst_video_decoder_release_frame (dec, tmp);
} else {
/* drop extra ref we got */
av_frame_unref (ffmpegdec->picture);
+ if (frame)
+ GST_VIDEO_CODEC_FRAME_FLAG_UNSET (frame,
+ GST_FFMPEG_VIDEO_CODEC_FRAME_FLAG_ALLOCATED);
+
/* FIXME: Ideally we would remap the buffer read-only now before pushing but
* libav might still have a reference to it!
*/
no_output:
{
GST_DEBUG_OBJECT (ffmpegdec, "no output buffer");
+ GST_VIDEO_CODEC_FRAME_FLAG_UNSET (frame,
+ GST_FFMPEG_VIDEO_CODEC_FRAME_FLAG_ALLOCATED);
gst_video_decoder_drop_frame (GST_VIDEO_DECODER (ffmpegdec), out_frame);
goto beach;
}
}
/* treat frame as void until a buffer is requested for it */
- GST_VIDEO_CODEC_FRAME_FLAG_SET (frame,
- GST_VIDEO_CODEC_FRAME_FLAG_DECODE_ONLY);
+ if (!GST_VIDEO_CODEC_FRAME_FLAG_IS_SET (frame,
+ GST_FFMPEG_VIDEO_CODEC_FRAME_FLAG_ALLOCATED))
+ GST_VIDEO_CODEC_FRAME_FLAG_SET (frame,
+ GST_VIDEO_CODEC_FRAME_FLAG_DECODE_ONLY);
data = minfo.data;
size = minfo.size;