mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-09-09 05:38:58 +00:00
rtph265depay: try to negotiate an allocator with downstream
This commit is contained in:
parent
528b7e01f1
commit
2d0ea4d381
2 changed files with 57 additions and 4 deletions
|
@ -157,7 +157,7 @@ gst_rtp_h265_depay_init (GstRtpH265Depay * rtph265depay)
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
gst_rtp_h265_depay_reset (GstRtpH265Depay * rtph265depay)
|
gst_rtp_h265_depay_reset (GstRtpH265Depay * rtph265depay, gboolean hard)
|
||||||
{
|
{
|
||||||
gst_adapter_clear (rtph265depay->adapter);
|
gst_adapter_clear (rtph265depay->adapter);
|
||||||
rtph265depay->wait_start = TRUE;
|
rtph265depay->wait_start = TRUE;
|
||||||
|
@ -170,6 +170,14 @@ gst_rtp_h265_depay_reset (GstRtpH265Depay * rtph265depay)
|
||||||
g_ptr_array_set_size (rtph265depay->vps, 0);
|
g_ptr_array_set_size (rtph265depay->vps, 0);
|
||||||
g_ptr_array_set_size (rtph265depay->sps, 0);
|
g_ptr_array_set_size (rtph265depay->sps, 0);
|
||||||
g_ptr_array_set_size (rtph265depay->pps, 0);
|
g_ptr_array_set_size (rtph265depay->pps, 0);
|
||||||
|
|
||||||
|
if (hard) {
|
||||||
|
if (rtph265depay->allocator != NULL) {
|
||||||
|
gst_object_unref (rtph265depay->allocator);
|
||||||
|
rtph265depay->allocator = NULL;
|
||||||
|
}
|
||||||
|
gst_allocation_params_init (&rtph265depay->params);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
@ -292,6 +300,44 @@ parse_pps (GstMapInfo * map, guint32 * sps_id, guint32 * pps_id)
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static gboolean
|
||||||
|
gst_rtp_h265_depay_set_output_caps (GstRtpH265Depay * rtph265depay,
|
||||||
|
GstCaps * caps)
|
||||||
|
{
|
||||||
|
GstAllocationParams params;
|
||||||
|
GstAllocator *allocator = NULL;
|
||||||
|
GstPad *srcpad;
|
||||||
|
gboolean res;
|
||||||
|
|
||||||
|
gst_allocation_params_init (¶ms);
|
||||||
|
|
||||||
|
srcpad = GST_RTP_BASE_DEPAYLOAD_SRCPAD (rtph265depay);
|
||||||
|
|
||||||
|
res = gst_pad_set_caps (srcpad, caps);
|
||||||
|
|
||||||
|
if (res) {
|
||||||
|
GstQuery *query;
|
||||||
|
|
||||||
|
query = gst_query_new_allocation (caps, TRUE);
|
||||||
|
if (!gst_pad_peer_query (srcpad, query)) {
|
||||||
|
GST_DEBUG_OBJECT (rtph265depay, "downstream ALLOCATION query failed");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (gst_query_get_n_allocation_params (query) > 0) {
|
||||||
|
gst_query_parse_nth_allocation_param (query, 0, &allocator, ¶ms);
|
||||||
|
}
|
||||||
|
|
||||||
|
gst_query_unref (query);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (rtph265depay->allocator)
|
||||||
|
gst_object_unref (rtph265depay->allocator);
|
||||||
|
|
||||||
|
rtph265depay->allocator = allocator;
|
||||||
|
rtph265depay->params = params;
|
||||||
|
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
|
||||||
static gboolean
|
static gboolean
|
||||||
gst_rtp_h265_set_src_caps (GstRtpH265Depay * rtph265depay)
|
gst_rtp_h265_set_src_caps (GstRtpH265Depay * rtph265depay)
|
||||||
|
@ -538,7 +584,7 @@ gst_rtp_h265_set_src_caps (GstRtpH265Depay * rtph265depay)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (update_caps) {
|
if (update_caps) {
|
||||||
res = gst_pad_set_caps (srcpad, srccaps);
|
res = gst_rtp_h265_depay_set_output_caps (rtph265depay, srccaps);
|
||||||
} else {
|
} else {
|
||||||
res = TRUE;
|
res = TRUE;
|
||||||
}
|
}
|
||||||
|
@ -1444,7 +1490,7 @@ gst_rtp_h265_depay_handle_event (GstRTPBaseDepayload * depay, GstEvent * event)
|
||||||
|
|
||||||
switch (GST_EVENT_TYPE (event)) {
|
switch (GST_EVENT_TYPE (event)) {
|
||||||
case GST_EVENT_FLUSH_STOP:
|
case GST_EVENT_FLUSH_STOP:
|
||||||
gst_rtp_h265_depay_reset (rtph265depay);
|
gst_rtp_h265_depay_reset (rtph265depay, FALSE);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
|
@ -1467,7 +1513,7 @@ gst_rtp_h265_depay_change_state (GstElement * element,
|
||||||
case GST_STATE_CHANGE_NULL_TO_READY:
|
case GST_STATE_CHANGE_NULL_TO_READY:
|
||||||
break;
|
break;
|
||||||
case GST_STATE_CHANGE_READY_TO_PAUSED:
|
case GST_STATE_CHANGE_READY_TO_PAUSED:
|
||||||
gst_rtp_h265_depay_reset (rtph265depay);
|
gst_rtp_h265_depay_reset (rtph265depay, TRUE);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
|
@ -1476,6 +1522,9 @@ gst_rtp_h265_depay_change_state (GstElement * element,
|
||||||
ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
|
ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
|
||||||
|
|
||||||
switch (transition) {
|
switch (transition) {
|
||||||
|
case GST_STATE_CHANGE_PAUSED_TO_READY:
|
||||||
|
gst_rtp_h265_depay_reset (rtph265depay, TRUE);
|
||||||
|
break;
|
||||||
case GST_STATE_CHANGE_READY_TO_NULL:
|
case GST_STATE_CHANGE_READY_TO_NULL:
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
|
|
@ -80,6 +80,10 @@ struct _GstRtpH265Depay
|
||||||
GPtrArray *sps;
|
GPtrArray *sps;
|
||||||
GPtrArray *pps;
|
GPtrArray *pps;
|
||||||
gboolean new_codec_data;
|
gboolean new_codec_data;
|
||||||
|
|
||||||
|
/* downstream allocator */
|
||||||
|
GstAllocator *allocator;
|
||||||
|
GstAllocationParams params;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct _GstRtpH265DepayClass
|
struct _GstRtpH265DepayClass
|
||||||
|
|
Loading…
Reference in a new issue