videodecoder: Expose _negotiate function

This is to be called by decoders once they have set the output format
in order for (re)negotiation to be triggered as early as possible.

https://bugzilla.gnome.org/show_bug.cgi?id=679878

Conflicts:
	gst-libs/gst/video/gstvideodecoder.c

2 files changed, 9 insertions, 8 deletions

diff --git a/gst-libs/gst/video/gstvideodecoder.c b/gst-libs/gst/video/gstvideodecoder.c
index fc5a6faa4..06e1810fc 100644
--- a/gst-libs/gst/video/gstvideodecoder.c
+++ b/gst-libs/gst/video/gstvideodecoder.c
@@ -424,7 +424,6 @@ static void gst_video_decoder_reset (GstVideoDecoder * decoder, gboolean full);
 
 static GstFlowReturn gst_video_decoder_decode_frame (GstVideoDecoder * decoder,
     GstVideoCodecFrame * frame);
-static gboolean gst_video_decoder_set_src_caps (GstVideoDecoder * decoder);
 
 static void gst_video_decoder_release_frame (GstVideoDecoder * dec,
     GstVideoCodecFrame * frame);
@@ -2214,7 +2213,7 @@ gst_video_decoder_finish_frame (GstVideoDecoder * decoder,
   GST_LOG_OBJECT (decoder, "finish frame %p", frame);
 
   if (G_UNLIKELY (priv->output_state_changed))
-    gst_video_decoder_set_src_caps (decoder);
+    gst_video_decoder_negotiate (decoder);
 
   GST_VIDEO_DECODER_STREAM_LOCK (decoder);
 
@@ -2709,17 +2708,17 @@ gst_video_decoder_get_frames (GstVideoDecoder * decoder)
 }
 
 /**
- * gst_video_decoder_set_src_caps:
+ * gst_video_decoder_negotiate:
  * @decoder: a #GstVideoDecoder
  *
- * Sets src pad caps according to currently configured #GstVideoCodecState.
+ * Negotiate with downstreame elements to currently configured #GstVideoCodecState.
  *
  * Returns: #TRUE if the caps were accepted downstream, else #FALSE.
  *
  * Since: 0.10.37
  */
-static gboolean
-gst_video_decoder_set_src_caps (GstVideoDecoder * decoder)
+gboolean
+gst_video_decoder_negotiate (GstVideoDecoder * decoder)
 {
   GstVideoCodecState *state = decoder->priv->output_state;
   gboolean ret;
@@ -2771,7 +2770,7 @@ gst_video_decoder_alloc_output_buffer (GstVideoDecoder * decoder)
 
   GST_VIDEO_DECODER_STREAM_LOCK (decoder);
   if (G_UNLIKELY (decoder->priv->output_state_changed))
-    gst_video_decoder_set_src_caps (decoder);
+    gst_video_decoder_negotiate (decoder);
 
   flow_ret =
       gst_pad_alloc_buffer_and_set_caps (decoder->srcpad,
@@ -2820,7 +2819,7 @@ gst_video_decoder_alloc_output_frame (GstVideoDecoder *
 
   GST_VIDEO_DECODER_STREAM_LOCK (decoder);
   if (G_UNLIKELY (decoder->priv->output_state_changed))
-    gst_video_decoder_set_src_caps (decoder);
+    gst_video_decoder_negotiate (decoder);
 
   g_return_val_if_fail (GST_PAD_CAPS (decoder->srcpad) != NULL, GST_FLOW_ERROR);
 
diff --git a/gst-libs/gst/video/gstvideodecoder.h b/gst-libs/gst/video/gstvideodecoder.h
index 38f3e2dbc..db19480d8 100644
--- a/gst-libs/gst/video/gstvideodecoder.h
+++ b/gst-libs/gst/video/gstvideodecoder.h
@@ -355,6 +355,8 @@ GstVideoCodecState *gst_video_decoder_set_output_state (GstVideoDecoder *decoder
 
 GstVideoCodecState *gst_video_decoder_get_output_state (GstVideoDecoder *decoder);
 
+gboolean         gst_video_decoder_negotiate           (GstVideoDecoder * decoder);
+
 GstClockTimeDiff gst_video_decoder_get_max_decode_time (GstVideoDecoder *decoder,
 							GstVideoCodecFrame *frame);