From: Jose Antonio Santos Cadenas Date: Wed, 18 Mar 2015 08:17:31 +0000 (+0100) Subject: srtpenc: Split chain functionality so it can be reused for buffer list X-Git-Tag: 1.19.3~507^2~9096 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2d3938c06321ad4f842d1cacd40180dd613901c0;p=platform%2Fupstream%2Fgstreamer.git srtpenc: Split chain functionality so it can be reused for buffer list https://bugzilla.gnome.org/show_bug.cgi?id=746387 --- diff --git a/ext/srtp/gstsrtpenc.c b/ext/srtp/gstsrtpenc.c index aa43441..1a43597 100644 --- a/ext/srtp/gstsrtpenc.c +++ b/ext/srtp/gstsrtpenc.c @@ -948,27 +948,17 @@ gst_srtp_enc_replace_random_key (GstSrtpEnc * filter) filter->key_changed = TRUE; } -static GstFlowReturn -gst_srtp_enc_chain (GstPad * pad, GstObject * parent, GstBuffer * buf, +static gboolean +gst_srtp_enc_check_buffer (GstSrtpEnc * filter, GstBuffer * buf, gboolean is_rtcp) { - GstSrtpEnc *filter = GST_SRTP_ENC (parent); - GstFlowReturn ret = GST_FLOW_OK; - GstPad *otherpad = NULL; - err_status_t err = err_status_ok; - gint size_max, size; - GstBuffer *bufout = NULL; - gboolean do_setcaps = FALSE; - GstMapInfo mapout; - if (!is_rtcp) { GstRTPBuffer rtpbuf = GST_RTP_BUFFER_INIT; if (!gst_rtp_buffer_map (buf, GST_MAP_READ, &rtpbuf)) { GST_ELEMENT_ERROR (filter, STREAM, WRONG_TYPE, (NULL), ("Could not map RTP buffer")); - ret = GST_FLOW_ERROR; - goto out; + return FALSE; } gst_rtp_buffer_unmap (&rtpbuf); @@ -978,49 +968,60 @@ gst_srtp_enc_chain (GstPad * pad, GstObject * parent, GstBuffer * buf, if (!gst_rtcp_buffer_map (buf, GST_MAP_READ, &rtcpbuf)) { GST_ELEMENT_ERROR (filter, STREAM, WRONG_TYPE, (NULL), ("Could not map RTCP buffer")); - ret = GST_FLOW_ERROR; - goto out; + return FALSE; } gst_rtcp_buffer_unmap (&rtcpbuf); } + return TRUE; +} + +static GstFlowReturn +gst_srtp_enc_check_set_caps (GstSrtpEnc * filter, GstPad * pad, + gboolean is_rtcp) +{ + gboolean do_setcaps = FALSE; + do_setcaps = filter->key_changed; - if (filter->key_changed) + + if (do_setcaps) { gst_srtp_enc_reset (filter); + } + if (filter->first_session) { err_status_t status = gst_srtp_enc_create_session (filter); + if (status != err_status_ok) { GST_ELEMENT_ERROR (filter, LIBRARY, INIT, ("Could not initialize SRTP encoder"), ("Failed to add stream to SRTP encoder (err: %d)", status)); - ret = GST_FLOW_ERROR; - goto out; + return GST_FLOW_ERROR; } } - GST_OBJECT_LOCK (filter); /* Update source caps if asked */ if (do_setcaps) { GstCaps *caps; - GST_OBJECT_UNLOCK (filter); caps = gst_pad_get_current_caps (pad); if (!gst_srtp_enc_sink_setcaps (pad, filter, caps, is_rtcp)) { gst_caps_unref (caps); - ret = GST_FLOW_NOT_NEGOTIATED; - goto out; + return GST_FLOW_NOT_NEGOTIATED; } gst_caps_unref (caps); - - GST_OBJECT_LOCK (filter); } - if (!HAS_CRYPTO (filter)) { - GST_OBJECT_UNLOCK (filter); - otherpad = get_rtp_other_pad (pad); - return gst_pad_push (otherpad, buf); - } + return GST_FLOW_OK; +} +static GstBuffer * +gst_srtp_enc_process_buffer (GstSrtpEnc * filter, GstPad * pad, + GstBuffer * buf, gboolean is_rtcp) +{ + gint size_max, size; + GstBuffer *bufout = NULL; + GstMapInfo mapout; + err_status_t err; /* Create a bigger buffer to add protection */ size = gst_buffer_get_size (buf); @@ -1031,6 +1032,8 @@ gst_srtp_enc_chain (GstPad * pad, GstObject * parent, GstBuffer * buf, gst_buffer_extract (buf, 0, mapout.data, size); + GST_OBJECT_LOCK (filter); + gst_srtp_init_event_reporter (); if (is_rtcp) @@ -1038,10 +1041,10 @@ gst_srtp_enc_chain (GstPad * pad, GstObject * parent, GstBuffer * buf, else err = srtp_protect (filter->session, mapout.data, &size); - gst_buffer_unmap (bufout, &mapout); - GST_OBJECT_UNLOCK (filter); + gst_buffer_unmap (bufout, &mapout); + if (err == err_status_ok) { /* Buffer protected */ gst_buffer_set_size (bufout, size); @@ -1050,36 +1053,76 @@ gst_srtp_enc_chain (GstPad * pad, GstObject * parent, GstBuffer * buf, GST_LOG_OBJECT (pad, "Encoding %s buffer of size %d", is_rtcp ? "RTCP" : "RTP", size); - /* Push buffer to source pad */ - otherpad = get_rtp_other_pad (pad); - ret = gst_pad_push (otherpad, bufout); - bufout = NULL; - - if (ret != GST_FLOW_OK) - goto out; - } else if (err == err_status_key_expired) { GST_ELEMENT_ERROR (GST_ELEMENT_CAST (filter), STREAM, ENCODE, ("Key usage limit has been reached"), ("Unable to protect buffer (hard key usage limit reached)")); - gst_buffer_unref (bufout); goto fail; } else { /* srtp_protect failed */ GST_ELEMENT_ERROR (filter, LIBRARY, FAILED, (NULL), ("Unable to protect buffer (protect failed) code %d", err)); - gst_buffer_unref (bufout); goto fail; } + return bufout; + +fail: + gst_buffer_unref (bufout); + return NULL; +} + +static GstFlowReturn +gst_srtp_enc_chain (GstPad * pad, GstObject * parent, GstBuffer * buf, + gboolean is_rtcp) +{ + GstSrtpEnc *filter = GST_SRTP_ENC (parent); + GstFlowReturn ret = GST_FLOW_OK; + GstPad *otherpad; + GstBuffer *bufout; + + if (!gst_srtp_enc_check_buffer (filter, buf, is_rtcp)) { + goto fail; + } + + if ((ret = gst_srtp_enc_check_set_caps (filter, pad, is_rtcp)) != GST_FLOW_OK) { + goto out; + } + + GST_OBJECT_LOCK (filter); + + if (!HAS_CRYPTO (filter)) { + GST_OBJECT_UNLOCK (filter); + otherpad = get_rtp_other_pad (pad); + return gst_pad_push (otherpad, buf); + } + + GST_OBJECT_UNLOCK (filter); + + if ((bufout = gst_srtp_enc_process_buffer (filter, pad, buf, is_rtcp))) { + /* Push buffer to source pad */ + otherpad = get_rtp_other_pad (pad); + ret = gst_pad_push (otherpad, bufout); + bufout = NULL; + + if (ret != GST_FLOW_OK) + goto out; + } else { + goto fail; + } + + GST_OBJECT_LOCK (filter); + if (gst_srtp_get_soft_limit_reached ()) { g_signal_emit (filter, gst_srtp_enc_signals[SIGNAL_SOFT_LIMIT], 0); if (filter->random_key && !filter->key_changed) gst_srtp_enc_replace_random_key (filter); } + GST_OBJECT_UNLOCK (filter); + out: gst_buffer_unref (buf);