mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-17 11:45:25 +00:00
Code Issues 1 Projects Releases Wiki Activity

x264enc: Port to new way of passing frame reference

Browse source
This commit is contained in:
Nicolas Dufresne 2012-05-01 18:45:33 +00:00 committed by Sebastian Dröge
parent 2656e42bb7
commit 43093dffea
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ext/x264/gstx264enc.c
View file

@ -1662,8 +1662,11 @@ gst_x264_enc_encode_frame (GstX264Enc * encoder, x264_picture_t * pic_in,
guint8 *data;
GstPad *srcpad;
if (G_UNLIKELY (encoder->x264enc == NULL))
if (G_UNLIKELY (encoder->x264enc == NULL)) {
if (input_frame)
gst_video_codec_frame_unref (input_frame);
return GST_FLOW_NOT_NEGOTIATED;
}
GST_OBJECT_LOCK (encoder);
if (encoder->reconfig) {
@ -1696,8 +1699,9 @@ gst_x264_enc_encode_frame (GstX264Enc * encoder, x264_picture_t * pic_in,
goto out;
}
/* This frame is now queued */
frame = NULL;
/* Input frame is now queued */
if (input_frame)
gst_video_codec_frame_unref (input_frame);
if (!*i_nal) {
ret = GST_FLOW_OK;
@ -1731,10 +1735,8 @@ gst_x264_enc_encode_frame (GstX264Enc * encoder, x264_picture_t * pic_in,
}
out:
if (frame) {
if (frame)
gst_video_encoder_finish_frame (GST_VIDEO_ENCODER (encoder), frame);
gst_video_codec_frame_unref (frame);
}
return ret;
}