Commit 67e87def authored by Peter Kjellerstedt's avatar Peter Kjellerstedt
Browse files

gst/rtp/gstrtpg726pay.c: No need to check for audio/G723 and audio/32KADPCM...

gst/rtp/gstrtpg726pay.c: No need to check for audio/G723 and audio/32KADPCM here as they are no longer supported.

Original commit message from CVS:
* gst/rtp/gstrtpg726pay.c: (gst_rtp_g726_pay_setcaps):
No need to check for audio/G723 and audio/32KADPCM here as they are
no longer supported.
parent 14d7abc2
2008-06-19 Peter Kjellerstedt <pkj@axis.com>
* gst/rtp/gstrtpg726pay.c: (gst_rtp_g726_pay_setcaps):
No need to check for audio/G723 and audio/32KADPCM here as they are
no longer supported.
2008-06-19 Sebastian Dröge <slomo@circular-chaos.org> 2008-06-19 Sebastian Dröge <slomo@circular-chaos.org>
   
* ext/wavpack/gstwavpackparse.c: (gst_wavpack_parse_reset), * ext/wavpack/gstwavpackparse.c: (gst_wavpack_parse_reset),
......
...@@ -116,15 +116,8 @@ gst_rtp_g726_pay_setcaps (GstBaseRTPPayload * payload, GstCaps * caps) ...@@ -116,15 +116,8 @@ gst_rtp_g726_pay_setcaps (GstBaseRTPPayload * payload, GstCaps * caps)
basertpaudiopayload = GST_BASE_RTP_AUDIO_PAYLOAD (payload); basertpaudiopayload = GST_BASE_RTP_AUDIO_PAYLOAD (payload);
if (strcmp ("audio/x-adpcm", stname) == 0) { if (!gst_structure_get_int (structure, "bitrate", &bitrate))
if (!gst_structure_get_int (structure, "bitrate", &bitrate))
bitrate = 32000;
} else if (strcmp ("audio/G723", stname) == 0) {
bitrate = 24000;
} else if (strcmp ("audio/32KADPCM", stname) == 0) {
bitrate = 32000; bitrate = 32000;
} else
goto invalid_caps;
switch (bitrate) { switch (bitrate) {
case 16000: case 16000:
...@@ -159,11 +152,6 @@ gst_rtp_g726_pay_setcaps (GstBaseRTPPayload * payload, GstCaps * caps) ...@@ -159,11 +152,6 @@ gst_rtp_g726_pay_setcaps (GstBaseRTPPayload * payload, GstCaps * caps)
return TRUE; return TRUE;
/* ERRORS */ /* ERRORS */
invalid_caps:
{
GST_ERROR_OBJECT (payload, "unknown caps specified");
return FALSE;
}
invalid_bitrate: invalid_bitrate:
{ {
GST_ERROR_OBJECT (payload, "invalid bitrate %d specified", bitrate); GST_ERROR_OBJECT (payload, "invalid bitrate %d specified", bitrate);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment