mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-22 10:23:47 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtptheorapay: Extract pixel format from the ident header to put it into the sampling field of the caps

Browse source 
We always put 4:2:0 into the caps before, which obviously is wrong for 4:2:2
and 4:4:4 formats.
This commit is contained in:
Sebastian Dröge 2015-08-08 17:34:50 +02:00
parent 2e590a32eb
commit 983f57dc7d
2 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
gst/rtp/gstrtptheorapay.c
View file

@ -351,6 +351,7 @@ gst_rtp_theora_pay_finish_headers (GstRTPBasePayload * basepayload)
guint8 *data, *config; guint8 *data, *config;
guint32 ident; guint32 ident;
gboolean res; gboolean res;
const gchar *sampling = NULL;
GST_DEBUG_OBJECT (rtptheorapay, "finish headers"); GST_DEBUG_OBJECT (rtptheorapay, "finish headers");
@ -518,13 +519,27 @@ gst_rtp_theora_pay_finish_headers (GstRTPBasePayload * basepayload)
g_free (config); g_free (config);
/* configure payloader settings */ /* configure payloader settings */
switch (rtptheorapay->pixel_format) {
case 2:
sampling = "YCbCr-4:2:2";
break;
case 3:
sampling = "YCbCr-4:4:4";
break;
case 0:
default:
sampling = "YCbCr-4:2:0";
break;
}
wstr = g_strdup_printf ("%d", rtptheorapay->width); wstr = g_strdup_printf ("%d", rtptheorapay->width);
hstr = g_strdup_printf ("%d", rtptheorapay->height); hstr = g_strdup_printf ("%d", rtptheorapay->height);
gst_rtp_base_payload_set_options (basepayload, "video", TRUE, "THEORA", gst_rtp_base_payload_set_options (basepayload, "video", TRUE, "THEORA",
90000); 90000);
res = res =
gst_rtp_base_payload_set_outcaps (basepayload, "sampling", G_TYPE_STRING, gst_rtp_base_payload_set_outcaps (basepayload, "sampling", G_TYPE_STRING,
"YCbCr-4:2:0", "width", G_TYPE_STRING, wstr, "height", G_TYPE_STRING, sampling, "width", G_TYPE_STRING, wstr, "height", G_TYPE_STRING,
hstr, "configuration", G_TYPE_STRING, configuration, "delivery-method", hstr, "configuration", G_TYPE_STRING, configuration, "delivery-method",
G_TYPE_STRING, "inline", G_TYPE_STRING, "inline",
/* don't set the other defaults /* don't set the other defaults
@ -549,7 +564,7 @@ gst_rtp_theora_pay_parse_id (GstRTPBasePayload * basepayload, guint8 * data,
guint size) guint size)
{ {
GstRtpTheoraPay *rtptheorapay; GstRtpTheoraPay *rtptheorapay;
gint width, height; gint width, height, pixel_format;
rtptheorapay = GST_RTP_THEORA_PAY (basepayload); rtptheorapay = GST_RTP_THEORA_PAY (basepayload);
@ -569,11 +584,12 @@ gst_rtp_theora_pay_parse_id (GstRTPBasePayload * basepayload, guint8 * data,
width = GST_READ_UINT16_BE (data) << 4; width = GST_READ_UINT16_BE (data) << 4;
data += 2; data += 2;
height = GST_READ_UINT16_BE (data) << 4; height = GST_READ_UINT16_BE (data) << 4;
data += 2; data += 29;
/* FIXME, parse pixel format */ pixel_format = (GST_READ_UINT8 (data) >> 3) & 0x03;
/* store values */ /* store values */
rtptheorapay->pixel_format = pixel_format;
rtptheorapay->width = width; rtptheorapay->width = width;
rtptheorapay->height = height; rtptheorapay->height = height;

1
gst/rtp/gstrtptheorapay.h
View file

@ -66,6 +66,7 @@ struct _GstRtpTheoraPay
guint config_interval; guint config_interval;
GstClockTime last_config; GstClockTime last_config;
gint pixel_format;
gint width; gint width;
gint height; gint height;
}; };