mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-18 22:36:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtpopuspay: Return upstream channel filter based on OPUS vs MULTICAPS

Browse source 
Only allow 1 or 2 channels if the caps are OPUS, or 3+ if they are
MULTIOPUS.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3674>
This commit is contained in:
Olivier Crête 2023-01-03 18:06:56 -05:00 committed by Olivier Crête
parent c51ae6112d
commit c52c66b575
1 changed files with 35 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
subprojects/gst-plugins-good/gst/rtp/gstrtpopuspay.c
View file

@ -371,9 +371,9 @@ static GstCaps *
gst_rtp_opus_pay_getcaps (GstRTPBasePayload * payload, gst_rtp_opus_pay_getcaps (GstRTPBasePayload * payload,
GstPad * pad, GstCaps * filter) GstPad * pad, GstCaps * filter)
{ {
GstCaps *caps, *peercaps, *tcaps;
GstStructure *s; GstStructure *s;
const gchar *stereo; const gchar *stereo;
GstCaps *caps, *peercaps, *tcaps, *tempcaps;
if (pad == GST_RTP_BASE_PAYLOAD_SRCPAD (payload)) if (pad == GST_RTP_BASE_PAYLOAD_SRCPAD (payload))
return return
@ -394,6 +394,40 @@ gst_rtp_opus_pay_getcaps (GstRTPBasePayload * payload,
caps = gst_pad_get_pad_template_caps (GST_RTP_BASE_PAYLOAD_SINKPAD (payload)); caps = gst_pad_get_pad_template_caps (GST_RTP_BASE_PAYLOAD_SINKPAD (payload));
tempcaps = gst_caps_from_string ("application/x-rtp, "
"encoding-name=(string) { \"OPUS\", \"X-GST-OPUS-DRAFT-SPITTKA-00\"}");
if (!gst_caps_can_intersect (peercaps, tempcaps)) {
GstCaps *multiopuscaps = gst_caps_new_simple ("audio/x-opus",
"channel-mapping-family", G_TYPE_INT, 1,
"channels", GST_TYPE_INT_RANGE, 3, 255,
NULL);
GstCaps *intersect_caps;
intersect_caps = gst_caps_intersect_full (caps, multiopuscaps,
GST_CAPS_INTERSECT_FIRST);
gst_caps_unref (caps);
gst_caps_unref (multiopuscaps);
caps = intersect_caps;
}
gst_caps_unref (tempcaps);
tempcaps = gst_caps_new_simple ("application/x-rtp",
"encoding-name", G_TYPE_STRING, "MULTIOPUS", NULL);
if (!gst_caps_can_intersect (peercaps, tempcaps)) {
GstCaps *opuscaps = gst_caps_new_simple ("audio/x-opus",
"channel-mapping-family", G_TYPE_INT, 0,
"channels", GST_TYPE_INT_RANGE, 1, 2,
NULL);
GstCaps *intersect_caps;
intersect_caps = gst_caps_intersect_full (caps, opuscaps,
GST_CAPS_INTERSECT_FIRST);
gst_caps_unref (caps);
gst_caps_unref (opuscaps);
caps = intersect_caps;
}
gst_caps_unref (tempcaps);
s = gst_caps_get_structure (peercaps, 0); s = gst_caps_get_structure (peercaps, 0);
stereo = gst_structure_get_string (s, "stereo"); stereo = gst_structure_get_string (s, "stereo");
if (stereo != NULL) { if (stereo != NULL) {