mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-03-30 12:49:40 +00:00
Code Issues 1 Projects Releases Wiki Activity

Revert "rtph264pay: Restructuring to allow for adding optional caps"

Browse source 
This reverts commit 61666898cf.

This commit changes what the set_sps_pps() function does, not it doesn't
set caps anymore (and should have been renamed). The main problem is that
not all call sites are updated and thus leak the string.
This commit is contained in:
Wim Taymans 2013-05-31 15:12:08 +02:00
parent 1516c14881
commit 1f0600ee6f
1 changed files with 19 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
gst/rtp/gstrtph264pay.c
View file

@ -344,14 +344,16 @@ done:
/* take the currently configured SPS and PPS lists and set them on the caps as
* sprop-parameter-sets */
static gchar *
static gboolean
gst_rtp_h264_pay_set_sps_pps (GstRTPBasePayload * basepayload)
{
GstRtpH264Pay *payloader = GST_RTP_H264_PAY (basepayload);
gchar *profile;
gchar *set;
GList *walk;
GString *sprops;
guint count;
gboolean res;
GstMapInfo map;
sprops = g_string_new ("");
@ -381,12 +383,19 @@ gst_rtp_h264_pay_set_sps_pps (GstRTPBasePayload * basepayload)
count++;
}
if (G_UNLIKELY (count == 0)) {
g_string_free (sprops, TRUE);
return NULL;
if (G_LIKELY (count)) {
/* profile is 24 bit. Force it to respect the limit */
profile = g_strdup_printf ("%06x", payloader->profile & 0xffffff);
/* combine into output caps */
res = gst_rtp_base_payload_set_outcaps (basepayload,
"sprop-parameter-sets", G_TYPE_STRING, sprops->str, NULL);
g_free (profile);
} else {
res = gst_rtp_base_payload_set_outcaps (basepayload, NULL);
}
g_string_free (sprops, TRUE);
return g_string_free (sprops, FALSE);
return res;
}
static GList *
@ -424,8 +433,6 @@ gst_rtp_h264_pay_setcaps (GstRTPBasePayload * basepayload, GstCaps * caps)
gsize size;
GstBuffer *buffer;
const gchar *alignment, *stream_format;
gchar *sprops;
gboolean caps_set;
rtph264pay = GST_RTP_H264_PAY (basepayload);
@ -551,25 +558,10 @@ gst_rtp_h264_pay_setcaps (GstRTPBasePayload * basepayload, GstCaps * caps)
}
gst_buffer_unmap (buffer, &map);
/* and update the caps with the collected data */
sprops = gst_rtp_h264_pay_set_sps_pps (basepayload);
if (!gst_rtp_h264_pay_set_sps_pps (basepayload))
goto set_sps_pps_failed;
} else {
GST_DEBUG_OBJECT (rtph264pay, "have bytestream h264");
sprops = NULL;
}
if (sprops != NULL) {
caps_set = gst_rtp_base_payload_set_outcaps (basepayload,
"sprop-parameter-sets", G_TYPE_STRING, sprops, NULL);
} else {
caps_set = gst_rtp_base_payload_set_outcaps (basepayload, NULL);
}
if (sprops != NULL) {
g_free (sprops);
}
if (!caps_set) {
goto set_caps_failed;
}
return TRUE;
@ -589,10 +581,10 @@ avcc_error:
GST_ERROR_OBJECT (rtph264pay, "avcC too small ");
goto error;
}
set_caps_failed:
set_sps_pps_failed:
{
GST_ERROR_OBJECT (rtph264pay, "failed to set caps");
return FALSE;
GST_ERROR_OBJECT (rtph264pay, "failed to set sps/pps");
goto error;
}
error:
{