mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-01-11 18:05:37 +00:00
rtpgstpay: Add support for force-keyunit events
This triggers immediate re-sending of the configuration data in-band. https://bugzilla.gnome.org/show_bug.cgi?id=796877
This commit is contained in:
parent
f3631e6837
commit
9a80cdbb40
3 changed files with 33 additions and 1 deletions
|
@ -27,6 +27,8 @@
|
||||||
#include "gstrtpgstdepay.h"
|
#include "gstrtpgstdepay.h"
|
||||||
#include "gstrtputils.h"
|
#include "gstrtputils.h"
|
||||||
|
|
||||||
|
#include <gst/video/video.h>
|
||||||
|
|
||||||
GST_DEBUG_CATEGORY_STATIC (rtpgstdepay_debug);
|
GST_DEBUG_CATEGORY_STATIC (rtpgstdepay_debug);
|
||||||
#define GST_CAT_DEFAULT (rtpgstdepay_debug)
|
#define GST_CAT_DEFAULT (rtpgstdepay_debug)
|
||||||
|
|
||||||
|
@ -558,6 +560,11 @@ missing_caps:
|
||||||
{
|
{
|
||||||
GST_INFO_OBJECT (rtpgstdepay, "No caps received yet %u", CV);
|
GST_INFO_OBJECT (rtpgstdepay, "No caps received yet %u", CV);
|
||||||
gst_buffer_unref (outbuf);
|
gst_buffer_unref (outbuf);
|
||||||
|
|
||||||
|
gst_pad_push_event (GST_RTP_BASE_DEPAYLOAD_SINKPAD (rtpgstdepay),
|
||||||
|
gst_video_event_new_upstream_force_key_unit (GST_CLOCK_TIME_NONE,
|
||||||
|
TRUE, 0));
|
||||||
|
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -24,6 +24,7 @@
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include <gst/rtp/gstrtpbuffer.h>
|
#include <gst/rtp/gstrtpbuffer.h>
|
||||||
|
#include <gst/video/video.h>
|
||||||
|
|
||||||
#include "gstrtpgstpay.h"
|
#include "gstrtpgstpay.h"
|
||||||
#include "gstrtputils.h"
|
#include "gstrtputils.h"
|
||||||
|
@ -96,6 +97,8 @@ static GstFlowReturn gst_rtp_gst_pay_handle_buffer (GstRTPBasePayload * payload,
|
||||||
GstBuffer * buffer);
|
GstBuffer * buffer);
|
||||||
static gboolean gst_rtp_gst_pay_sink_event (GstRTPBasePayload * payload,
|
static gboolean gst_rtp_gst_pay_sink_event (GstRTPBasePayload * payload,
|
||||||
GstEvent * event);
|
GstEvent * event);
|
||||||
|
static gboolean gst_rtp_gst_pay_src_event (GstRTPBasePayload * payload,
|
||||||
|
GstEvent * event);
|
||||||
|
|
||||||
#define gst_rtp_gst_pay_parent_class parent_class
|
#define gst_rtp_gst_pay_parent_class parent_class
|
||||||
G_DEFINE_TYPE (GstRtpGSTPay, gst_rtp_gst_pay, GST_TYPE_RTP_BASE_PAYLOAD);
|
G_DEFINE_TYPE (GstRtpGSTPay, gst_rtp_gst_pay, GST_TYPE_RTP_BASE_PAYLOAD);
|
||||||
|
@ -139,6 +142,7 @@ gst_rtp_gst_pay_class_init (GstRtpGSTPayClass * klass)
|
||||||
gstrtpbasepayload_class->set_caps = gst_rtp_gst_pay_setcaps;
|
gstrtpbasepayload_class->set_caps = gst_rtp_gst_pay_setcaps;
|
||||||
gstrtpbasepayload_class->handle_buffer = gst_rtp_gst_pay_handle_buffer;
|
gstrtpbasepayload_class->handle_buffer = gst_rtp_gst_pay_handle_buffer;
|
||||||
gstrtpbasepayload_class->sink_event = gst_rtp_gst_pay_sink_event;
|
gstrtpbasepayload_class->sink_event = gst_rtp_gst_pay_sink_event;
|
||||||
|
gstrtpbasepayload_class->src_event = gst_rtp_gst_pay_src_event;
|
||||||
|
|
||||||
GST_DEBUG_CATEGORY_INIT (gst_rtp_pay_debug, "rtpgstpay", 0,
|
GST_DEBUG_CATEGORY_INIT (gst_rtp_pay_debug, "rtpgstpay", 0,
|
||||||
"rtpgstpay element");
|
"rtpgstpay element");
|
||||||
|
@ -504,6 +508,10 @@ gst_rtp_gst_pay_sink_event (GstRTPBasePayload * payload, GstEvent * event)
|
||||||
|
|
||||||
rtpgstpay = GST_RTP_GST_PAY (payload);
|
rtpgstpay = GST_RTP_GST_PAY (payload);
|
||||||
|
|
||||||
|
if (gst_video_event_is_force_key_unit (event)) {
|
||||||
|
g_atomic_int_set (&rtpgstpay->force_config, TRUE);
|
||||||
|
}
|
||||||
|
|
||||||
ret =
|
ret =
|
||||||
GST_RTP_BASE_PAYLOAD_CLASS (parent_class)->sink_event (payload,
|
GST_RTP_BASE_PAYLOAD_CLASS (parent_class)->sink_event (payload,
|
||||||
gst_event_ref (event));
|
gst_event_ref (event));
|
||||||
|
@ -572,6 +580,20 @@ gst_rtp_gst_pay_sink_event (GstRTPBasePayload * payload, GstEvent * event)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static gboolean
|
||||||
|
gst_rtp_gst_pay_src_event (GstRTPBasePayload * payload, GstEvent * event)
|
||||||
|
{
|
||||||
|
GstRtpGSTPay *rtpgstpay;
|
||||||
|
|
||||||
|
rtpgstpay = GST_RTP_GST_PAY (payload);
|
||||||
|
|
||||||
|
if (gst_video_event_is_force_key_unit (event)) {
|
||||||
|
g_atomic_int_set (&rtpgstpay->force_config, TRUE);
|
||||||
|
}
|
||||||
|
|
||||||
|
return GST_RTP_BASE_PAYLOAD_CLASS (parent_class)->src_event (payload, event);
|
||||||
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
gst_rtp_gst_pay_send_config (GstRtpGSTPay * rtpgstpay,
|
gst_rtp_gst_pay_send_config (GstRtpGSTPay * rtpgstpay,
|
||||||
GstClockTime running_time)
|
GstClockTime running_time)
|
||||||
|
@ -621,7 +643,9 @@ gst_rtp_gst_pay_handle_buffer (GstRTPBasePayload * basepayload,
|
||||||
timestamp);
|
timestamp);
|
||||||
|
|
||||||
/* check if we need to send the caps and taglist now */
|
/* check if we need to send the caps and taglist now */
|
||||||
if (rtpgstpay->config_interval > 0) {
|
if (rtpgstpay->config_interval > 0
|
||||||
|
|| g_atomic_int_compare_and_exchange (&rtpgstpay->force_config, TRUE,
|
||||||
|
FALSE)) {
|
||||||
GST_DEBUG_OBJECT (rtpgstpay,
|
GST_DEBUG_OBJECT (rtpgstpay,
|
||||||
"running time %" GST_TIME_FORMAT ", last config %" GST_TIME_FORMAT,
|
"running time %" GST_TIME_FORMAT ", last config %" GST_TIME_FORMAT,
|
||||||
GST_TIME_ARGS (running_time), GST_TIME_ARGS (rtpgstpay->last_config));
|
GST_TIME_ARGS (running_time), GST_TIME_ARGS (rtpgstpay->last_config));
|
||||||
|
|
|
@ -56,6 +56,7 @@ struct _GstRtpGSTPay
|
||||||
GstTagList *taglist;
|
GstTagList *taglist;
|
||||||
guint config_interval;
|
guint config_interval;
|
||||||
GstClockTime last_config;
|
GstClockTime last_config;
|
||||||
|
gboolean force_config;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct _GstRtpGSTPayClass
|
struct _GstRtpGSTPayClass
|
||||||
|
|
Loading…
Reference in a new issue