mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

avvidenc: Properly wrap and free the output AVPackets generated during draining

Browse source
This commit is contained in:
Sebastian Dröge 2015-06-28 16:30:54 +02:00
parent 3943cdf18a
commit 6998d982c7
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ext/libav/gstavvidenc.c
View file

@ -711,7 +711,7 @@ gst_ffmpegvidenc_flush_buffers (GstFFMpegVidEnc * ffmpegenc, gboolean send)
GstFlowReturn flow_ret = GST_FLOW_OK; GstFlowReturn flow_ret = GST_FLOW_OK;
GstBuffer *outbuf; GstBuffer *outbuf;
gint ret; gint ret;
AVPacket pkt; AVPacket *pkt;
int have_data = 0; int have_data = 0;
GST_DEBUG_OBJECT (ffmpegenc, "flushing buffers with sending %d", send); GST_DEBUG_OBJECT (ffmpegenc, "flushing buffers with sending %d", send);
@ -722,12 +722,13 @@ gst_ffmpegvidenc_flush_buffers (GstFFMpegVidEnc * ffmpegenc, gboolean send)
while ((frame = while ((frame =
gst_video_encoder_get_oldest_frame (GST_VIDEO_ENCODER (ffmpegenc)))) { gst_video_encoder_get_oldest_frame (GST_VIDEO_ENCODER (ffmpegenc)))) {
memset (&pkt, 0, sizeof (pkt)); pkt = g_slice_new0 (AVPacket);
have_data = 0; have_data = 0;
ret = avcodec_encode_video2 (ffmpegenc->context, &pkt, NULL, &have_data); ret = avcodec_encode_video2 (ffmpegenc->context, pkt, NULL, &have_data);
if (ret < 0) { /* there should be something, notify and give up */ if (ret < 0) { /* there should be something, notify and give up */
g_slice_free (AVPacket, pkt);
#ifndef GST_DISABLE_GST_DEBUG #ifndef GST_DISABLE_GST_DEBUG
GstFFMpegVidEncClass *oclass = GstFFMpegVidEncClass *oclass =
(GstFFMpegVidEncClass *) (G_OBJECT_GET_CLASS (ffmpegenc)); (GstFFMpegVidEncClass *) (G_OBJECT_GET_CLASS (ffmpegenc));
@ -746,8 +747,9 @@ gst_ffmpegvidenc_flush_buffers (GstFFMpegVidEnc * ffmpegenc, gboolean send)
GST_ERROR_SYSTEM); GST_ERROR_SYSTEM);
if (send && have_data) { if (send && have_data) {
outbuf = gst_buffer_new_wrapped_full (0, pkt.data, pkt.size, 0, pkt.size, outbuf =
pkt.data, av_free); gst_buffer_new_wrapped_full (0, pkt->data, pkt->size, 0, pkt->size,
pkt->data, gst_ffmpegvidenc_free_avpacket);
frame->output_buffer = outbuf; frame->output_buffer = outbuf;
if (ffmpegenc->context->coded_frame->key_frame) if (ffmpegenc->context->coded_frame->key_frame)