mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 04:01:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtph265pay: Remove sprop-parameter-sets property

Browse source 
There is no valid use case when this property is needed since the values
must be in either codec_data or buffer data.

https://bugzilla.gnome.org/show_bug.cgi?id=753760
This commit is contained in:
Jonas Holmberg 2016-06-17 13:00:48 +02:00 committed by Sebastian Dröge
parent 2039e0d881
commit 83ec89abdd
2 changed files with 6 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

96
gst/rtp/gstrtph265pay.c
View file

@ -102,13 +102,11 @@ GST_STATIC_PAD_TEMPLATE ("src",
/* "dec-parallel-cap = (string) ANY, " */
);
#define DEFAULT_SPROP_PARAMETER_SETS NULL
#define DEFAULT_CONFIG_INTERVAL 0
enum
{
PROP_0,
PROP_SPROP_PARAMETER_SETS,
PROP_CONFIG_INTERVAL
};
@ -149,14 +147,6 @@ gst_rtp_h265_pay_class_init (GstRtpH265PayClass * klass)
gobject_class->set_property = gst_rtp_h265_pay_set_property;
gobject_class->get_property = gst_rtp_h265_pay_get_property;
g_object_class_install_property (G_OBJECT_CLASS (klass),
PROP_SPROP_PARAMETER_SETS, g_param_spec_string ("sprop-parameter-sets",
"sprop-parameter-sets",
"The base64 sprop-parameter-sets to set in out caps (set to NULL to "
"extract from stream)",
DEFAULT_SPROP_PARAMETER_SETS,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (G_OBJECT_CLASS (klass),
PROP_CONFIG_INTERVAL,
g_param_spec_int ("config-interval",
@ -230,8 +220,6 @@ gst_rtp_h265_pay_finalize (GObject * object)
g_ptr_array_free (rtph265pay->pps, TRUE);
g_ptr_array_free (rtph265pay->vps, TRUE);
g_free (rtph265pay->sprop_parameter_sets);
g_object_unref (rtph265pay->adapter);
G_OBJECT_CLASS (parent_class)->finalize (object);
@ -723,53 +711,6 @@ error:
}
}
static void
gst_rtp_h265_pay_parse_sprop_parameter_sets (GstRtpH265Pay * rtph265pay)
{
const gchar *ps;
gchar **params;
guint len;
gint i;
GstBuffer *buf;
ps = rtph265pay->sprop_parameter_sets;
if (ps == NULL)
return;
gst_rtp_h265_pay_clear_vps_sps_pps (rtph265pay);
params = g_strsplit (ps, ",", 0);
len = g_strv_length (params);
GST_DEBUG_OBJECT (rtph265pay, "we have %d params", len);
for (i = 0; params[i]; i++) {
gsize nal_len;
GstMapInfo map;
guint8 *nalp;
guint save = 0;
gint state = 0;
nal_len = strlen (params[i]);
buf = gst_buffer_new_and_alloc (nal_len);
gst_buffer_map (buf, &map, GST_MAP_WRITE);
nalp = map.data;
nal_len = g_base64_decode_step (params[i], nal_len, nalp, &state, &save);
gst_buffer_unmap (buf, &map);
gst_buffer_resize (buf, 0, nal_len);
if (!nal_len) {
gst_buffer_unref (buf);
continue;
}
gst_rtp_h265_add_vps_sps_pps (GST_ELEMENT (rtph265pay), rtph265pay->vps,
rtph265pay->sps, rtph265pay->pps, buf);
}
g_strfreev (params);
}
static guint
next_start_code (const guint8 * data, guint size)
{
@ -1275,30 +1216,13 @@ gst_rtp_h265_pay_handle_buffer (GstRTPBasePayload * basepayload,
GST_DEBUG_OBJECT (basepayload, "found next start at %u of size %u", next,
nal_len);
if (rtph265pay->sprop_parameter_sets != NULL) {
/* explicitly set profile and sprop, use those */
if (rtph265pay->update_caps) {
if (!gst_rtp_base_payload_set_outcaps (basepayload,
"sprop-parameter-sets", G_TYPE_STRING,
rtph265pay->sprop_parameter_sets, NULL))
goto caps_rejected;
/* We know our stream is a valid H265 NAL packet,
* go parse it for SPS/PPS to enrich the caps */
/* order: make sure to check nal */
update =
gst_rtp_h265_pay_decode_nal (rtph265pay, data, nal_len, dts, pts)
|| update;
/* parse SPS and PPS from provided parameter set (for insertion) */
gst_rtp_h265_pay_parse_sprop_parameter_sets (rtph265pay);
rtph265pay->update_caps = FALSE;
GST_DEBUG ("outcaps update: sprop-parameter-sets=%s",
rtph265pay->sprop_parameter_sets);
}
} else {
/* We know our stream is a valid H265 NAL packet,
* go parse it for SPS/PPS to enrich the caps */
/* order: make sure to check nal */
update =
gst_rtp_h265_pay_decode_nal (rtph265pay, data, nal_len, dts, pts)
|| update;
}
/* move to next NAL packet */
data += nal_len;
size -= nal_len;
@ -1463,11 +1387,6 @@ gst_rtp_h265_pay_set_property (GObject * object, guint prop_id,
rtph265pay = GST_RTP_H265_PAY (object);
switch (prop_id) {
case PROP_SPROP_PARAMETER_SETS:
g_free (rtph265pay->sprop_parameter_sets);
rtph265pay->sprop_parameter_sets = g_value_dup_string (value);
rtph265pay->update_caps = TRUE;
break;
case PROP_CONFIG_INTERVAL:
rtph265pay->vps_sps_pps_interval = g_value_get_int (value);
break;
@ -1486,9 +1405,6 @@ gst_rtp_h265_pay_get_property (GObject * object, guint prop_id,
rtph265pay = GST_RTP_H265_PAY (object);
switch (prop_id) {
case PROP_SPROP_PARAMETER_SETS:
g_value_set_string (value, rtph265pay->sprop_parameter_sets);
break;
case PROP_CONFIG_INTERVAL:
g_value_set_int (value, rtph265pay->vps_sps_pps_interval);
break;

3
gst/rtp/gstrtph265pay.h
View file

@ -59,9 +59,6 @@ struct _GstRtpH265Pay
guint nal_length_size;
GArray *queue;
gchar *sprop_parameter_sets;
gboolean update_caps;
GstAdapter *adapter;
gint vps_sps_pps_interval;