nrtp->payload_msg_type = GSM_TCHF_FRAME_EFR;
break;
case MEDIA_TYPE_AMR:
- nrtp->payload_msg_type = GSM_TCHF_FRAME_AMR;
+ nrtp->payload_msg_type = GSM_TCH_FRAME_AMR;
break;
case MEDIA_TYPE_GSM_HR:
- nrtp->payload_msg_type = GSM_TCHF_FRAME_HR;
+ nrtp->payload_msg_type = GSM_TCHH_FRAME;
break;
}
nrtp->payload_type = p_g_payload_type;
if (!p_g_decoder)
return;
- if (frame->msg_type != GSM_TCHF_BAD_FRAME) {
+ if (frame->msg_type != GSM_BAD_FRAME) {
if ((frame->data[0]>>4) != 0xd)
PERROR("received GSM frame with wrong magig 0x%x\n", frame->data[0]>>4);
add_trace("speech", "version", "AMR given");
mode->lchan_mode = 0x41; /* GSM V3 */
break;
- case MEDIA_TYPE_GSM_HR:
- add_trace("speech", "version", "Half Rate given");
- mode->lchan_mode = 0x05; /* GSM V1 HR */
- break;
default:
- add_trace("speech", "version", "Full Rate given");
+ add_trace("speech", "version", "Full/Half Rate given");
mode->lchan_mode = 0x01; /* GSM V1 */
}
mode->lchan_type = 0x02; /* FIXME: unused */
media_type = MEDIA_TYPE_GSM_HR;
payload_type = dynamic_type++;
break;
+ case 5:
+ add_trace("speech", "version", "AMR Half Rate given");
+ media_type = MEDIA_TYPE_AMR;
+ payload_type = dynamic_type++;
+ break;
default:
add_trace("speech", "version", "%d given", mncc->bearer_cap.speech_ver[i]);
media_type = 0;
}
if (msg_type == GSM_TCHF_FRAME
- || msg_type == GSM_TCHF_BAD_FRAME) {
+ || msg_type == GSM_BAD_FRAME) {
if (port) {
/* inject DTMF, if enabled */
if (pgsm_bs->p_g_dtmf) {
}
if (msg_type == GSM_TCHF_FRAME
- || msg_type == GSM_TCHF_BAD_FRAME) {
+ || msg_type == GSM_BAD_FRAME) {
if (port)
pgsm_ms->frame_receive(arg);
return 0;
#define MNCC_RTP_CONNECT 0x0205
#define MNCC_RTP_FREE 0x0206
-#define GSM_TCHF_FRAME 0x0300
-#define GSM_TCHF_FRAME_EFR 0x0301
-#define GSM_TCHF_FRAME_HR 0x0302
-#define GSM_TCHF_FRAME_AMR 0x0303
-#define GSM_TCHF_BAD_FRAME 0x03ff
+#define GSM_TCHF_FRAME 0x0300
+#define GSM_TCHF_FRAME_EFR 0x0301
+#define GSM_TCHH_FRAME 0x0302
+#define GSM_TCH_FRAME_AMR 0x0303
+#define GSM_BAD_FRAME 0x03ff
#define GSM_MAX_FACILITY 128
#define GSM_MAX_SSVERSION 128