diff options
| author | Thibault Saunier <tsaunier@gnome.org> | 2016-01-19 23:22:35 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2016-01-20 10:07:08 +0200 |
| commit | 8ee35cab2e8e71988ae3ddb90973bcc25f39f952 (patch) | |
| tree | ad6e896fd0231c9168249f517a5e1f55a2d2c9ce | |
| parent | 437043dbdfd19163c13e5b3d5b2b16037f5959f3 (diff) | |
| download | gstreamer-plugins-base-8ee35cab2e8e71988ae3ddb90973bcc25f39f952.tar.gz | |
Revert "videoencoder: Release video frame when ->handle return ERROR or DROPPED"
This reverts commit 63517d0ed348784cce4ab4b295c2c0f1b78baa81.
It was wrong ref counting wise and we decided to deprecated DROPPED
return value
https://bugzilla.gnome.org/show_bug.cgi?id=760666
| -rw-r--r-- | gst-libs/gst/video/gstvideoencoder.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/gst-libs/gst/video/gstvideoencoder.c b/gst-libs/gst/video/gstvideoencoder.c index fc0c9a99a..c45bc7d38 100644 --- a/gst-libs/gst/video/gstvideoencoder.c +++ b/gst-libs/gst/video/gstvideoencoder.c @@ -212,9 +212,7 @@ static void gst_video_encoder_init (GstVideoEncoder * enc, GstVideoEncoderClass * klass); static void gst_video_encoder_finalize (GObject * object); -static void -gst_video_encoder_release_frame (GstVideoEncoder * enc, - GstVideoCodecFrame * frame); + static gboolean gst_video_encoder_setcaps (GstVideoEncoder * enc, GstCaps * caps); static GstCaps *gst_video_encoder_sink_getcaps (GstVideoEncoder * encoder, @@ -1481,11 +1479,6 @@ gst_video_encoder_chain (GstPad * pad, GstObject * parent, GstBuffer * buf) ret = klass->handle_frame (encoder, frame); - if (ret == GST_VIDEO_ENCODER_FLOW_DROPPED || ret == GST_FLOW_ERROR) { - GST_INFO_OBJECT (encoder, "Dropping frame %p", frame); - gst_video_encoder_release_frame (encoder, frame); - } - done: GST_VIDEO_ENCODER_STREAM_UNLOCK (encoder); |