From c24995c31c171322865dcb4630d685bb84db9c35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Thu, 25 Jul 2013 10:53:14 +0200 Subject: [PATCH] videoencoder: There's no point in resetting the encoder when the caps change The subclass will be called with set_format() and there it can drain if necessary and reset whatever is necessary. This is the same behaviour as for the video decoder. --- gst-libs/gst/video/gstvideoencoder.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/gst-libs/gst/video/gstvideoencoder.c b/gst-libs/gst/video/gstvideoencoder.c index 006175d1b5..891d0ab574 100644 --- a/gst-libs/gst/video/gstvideoencoder.c +++ b/gst-libs/gst/video/gstvideoencoder.c @@ -485,23 +485,6 @@ gst_video_encoder_set_headers (GstVideoEncoder * video_encoder, GList * headers) GST_VIDEO_ENCODER_STREAM_UNLOCK (video_encoder); } -static gboolean -gst_video_encoder_drain (GstVideoEncoder * enc) -{ - GstVideoEncoderPrivate *priv; - - priv = enc->priv; - - GST_DEBUG_OBJECT (enc, "draining"); - - if (priv->drained) { - GST_DEBUG_OBJECT (enc, "already drained"); - return TRUE; - } - - return gst_video_encoder_reset (enc, FALSE); -} - static GstVideoCodecState * _new_output_state (GstCaps * caps, GstVideoCodecState * reference) { @@ -592,9 +575,6 @@ gst_video_encoder_setcaps (GstVideoEncoder * encoder, GstCaps * caps) goto caps_not_changed; } - /* arrange draining pending frames */ - gst_video_encoder_drain (encoder); - /* and subclass should be ready to configure format at any time around */ ret = encoder_class->set_format (encoder, state); if (ret) {