p_g_notify_pending = NULL;
p_g_setup_pending = NULL;
p_g_connect_pending = NULL;
- p_g_decoder = gsm_audio_create();
- p_g_encoder = gsm_audio_create();
- if (!p_g_encoder || !p_g_decoder) {
- PERROR("Failed to create GSM audio codec instance\n");
+ p_g_fr_decoder = NULL;
+ p_g_fr_encoder = NULL;
+ p_g_hr_decoder = NULL;
+ p_g_hr_encoder = NULL;
+ p_g_amr_decoder = NULL;
+ p_g_amr_encoder = NULL;
+#ifdef WITH_GSMFR
+ p_g_fr_decoder = gsm_fr_create();
+ p_g_fr_encoder = gsm_fr_create();
+ if (!p_g_fr_encoder || !p_g_fr_decoder) {
+ PERROR("Failed to create GSM FR codec instance\n");
trigger_work(&p_g_delete);
}
+#endif
+#ifdef WITH_GSMAMR
+ p_g_amr_decoder = gsm_amr_create();
+ p_g_amr_encoder = gsm_amr_create();
+ if (!p_g_amr_encoder || !p_g_amr_decoder) {
+ PERROR("Failed to create GSM AMR codec instance\n");
+ trigger_work(&p_g_delete);
+ }
+#endif
p_g_rxpos = 0;
p_g_tch_connected = 0;
p_g_media_type = 0;
if (p_g_connect_pending)
message_free(p_g_connect_pending);
+//#ifdef WITH_GSMFR
+ /* close codec */
+ if (p_g_fr_encoder)
+ gsm_fr_destroy(p_g_fr_encoder);
+ if (p_g_fr_decoder)
+ gsm_fr_destroy(p_g_fr_decoder);
+//#endif
+#ifdef WITH_GSMAMR
/* close codec */
- if (p_g_encoder)
- gsm_audio_destroy(p_g_encoder);
- if (p_g_decoder)
- gsm_audio_destroy(p_g_decoder);
+ if (p_g_amr_encoder)
+ gsm_amr_destroy(p_g_amr_encoder);
+ if (p_g_amr_decoder)
+ gsm_amr_destroy(p_g_amr_decoder);
+#endif
}
unsigned char data[160];
int i;
- if (!p_g_decoder)
+ if (!p_g_fr_decoder)
return;
- 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);
-
+ switch (frame->msg_type) {
+ case GSM_TCHF_FRAME:
+ if (p_g_media_type != MEDIA_TYPE_GSM) {
+ PERROR("FR frame, but current media type mismatches.\n");
+ return;
+ }
+ if (!p_g_fr_decoder) {
+ PERROR("FR frame, but decoder not created.\n");
+ return;
+ }
+ if ((frame->data[0]>>4) != 0xd) {
+ PDEBUG(DEBUG_GSM, "received GSM frame with wrong magig 0x%x\n", frame->data[0]>>4);
+ goto bfi;
+ }
+#ifdef WITH_GSMFR
/* decode */
- gsm_audio_decode(p_g_decoder, frame->data, p_g_samples);
+ gsm_fr_decode(p_g_fr_decoder, frame->data, p_g_samples);
for (i = 0; i < 160; i++) {
data[i] = audio_s16_to_law[p_g_samples[i] & 0xffff];
}
- } else if (p_echotest) {
- /* beep on bad frame */
- for (i = 0; i < 160; i++) {
- if ((i & 3) > 2)
- p_g_samples[i] = 15000;
- else
- p_g_samples[i] = -15000;
- data[i] = audio_s16_to_law[p_g_samples[i] & 0xffff];
+#endif
+ break;
+ case GSM_TCHF_FRAME_EFR:
+ if (p_g_media_type != MEDIA_TYPE_GSM_EFR) {
+ PERROR("EFR frame, but current media type mismatches.\n");
+ return;
}
- } else {
- /* repeat on bad frame */
+ if (!p_g_amr_decoder) {
+ PERROR("EFR frame, but decoder not created.\n");
+ return;
+ }
+ if ((frame->data[0]>>4) != 0xc)
+ goto bfi;
+#ifdef WITH_GSMAMR
+ /* decode */
+ gsm_efr_decode(p_g_amr_decoder, frame->data, p_g_samples);
for (i = 0; i < 160; i++) {
- p_g_samples[i] = (p_g_samples[i] * 14) >> 4;
data[i] = audio_s16_to_law[p_g_samples[i] & 0xffff];
}
+#endif
+ break;
+ case GSM_BAD_FRAME:
+ default:
+bfi:
+ if (p_echotest) {
+ /* beep on bad frame */
+ for (i = 0; i < 160; i++) {
+ if ((i & 3) > 2)
+ p_g_samples[i] = 15000;
+ else
+ p_g_samples[i] = -15000;
+ data[i] = audio_s16_to_law[p_g_samples[i] & 0xffff];
+ }
+ } else {
+ /* repeat on bad frame */
+ for (i = 0; i < 160; i++) {
+ p_g_samples[i] = (p_g_samples[i] * 14) >> 4;
+ data[i] = audio_s16_to_law[p_g_samples[i] & 0xffff];
+ }
+ }
}
+ /* record data */
+ if (p_record)
+ record(data, 160, 0); // from down
+ if (p_tap)
+ tap(data, 160, 0); // from down
+
/* local echo */
if (p_echotest)
bridge_rx(data, 160);
{
unsigned char frame[33];
+ /* record data */
+ if (p_record)
+ record(data, len, 1); // from up
+ if (p_tap)
+ tap(data, len, 1); // from up
+
/* encoder init failed */
- if (!p_g_encoder)
+ if (!p_g_fr_encoder)
return -EINVAL;
/* (currently) not connected, so don't flood tch! */
/* write to rx buffer */
while(len--) {
p_g_rxdata[p_g_rxpos++] = audio_law_to_s32[*data++];
- if (p_g_rxpos == 160) {
- p_g_rxpos = 0;
-
+ if (p_g_rxpos != 160)
+ continue;
+ p_g_rxpos = 0;
+
+ switch (p_g_media_type) {
+ case MEDIA_TYPE_GSM:
+ if (!p_g_fr_encoder) {
+ PERROR("FR frame, but encoder not created.\n");
+ break;
+ }
+#ifdef WITH_GSMFR
+ /* encode data */
+ gsm_fr_encode(p_g_fr_encoder, p_g_rxdata, frame);
+ frame_send(frame, 33, GSM_TCHF_FRAME);
+#endif
+ break;
+ case MEDIA_TYPE_GSM_EFR:
+ if (!p_g_amr_encoder) {
+ PERROR("EFR frame, but encoder not created.\n");
+ break;
+ }
+#ifdef WITH_GSMAMR
/* encode data */
- gsm_audio_encode(p_g_encoder, p_g_rxdata, frame);
- frame_send(frame);
+ gsm_efr_encode(p_g_amr_encoder, p_g_rxdata, frame);
+ frame_send(frame, 31, GSM_TCHF_FRAME_EFR);
+#endif
+ break;
}
}
return 0;
}
-void Pgsm::frame_send(void *_frame)
+void Pgsm::frame_send(void *_frame, int len, int msg_type)
{
- unsigned char buffer[sizeof(struct gsm_data_frame) + 33];
+ unsigned char buffer[sizeof(struct gsm_data_frame) + len];
struct gsm_data_frame *frame = (struct gsm_data_frame *)buffer;
- frame->msg_type = GSM_TCHF_FRAME;
+ frame->msg_type = msg_type;
frame->callref = p_g_callref;
- memcpy(frame->data, _frame, 33);
+ memcpy(frame->data, _frame, len);
if (p_g_lcr_gsm) {
mncc_send(p_g_lcr_gsm, frame->msg_type, frame);
{
struct gsm_mncc *mode;
- /* already modified to that payload type */
+ /* already modified to that media type */
if (p_g_media_type == media_type)
return;
send_and_free_mncc(p_g_lcr_gsm, frame->msg_type, frame);
p_g_tch_connected = 1;
}
+
+ /* modify to GSM FR (this is GSM user side only, so there is FR supported only) */
+ modify_lchan(MEDIA_TYPE_GSM);
}
/* ALERTING INDICATION */
send_and_free_mncc(p_g_lcr_gsm, frame->msg_type, frame);
p_g_tch_connected = 1;
}
+
+ /* modify to GSM FR, if not already */
+ if (!p_g_media_type) {
+ modify_lchan(MEDIA_TYPE_GSM);
+ }
}
/* CONNECT INDICATION */
message->param.connectinfo.rtpinfo.media_types[0] = p_g_media_type;
message->param.connectinfo.rtpinfo.payload_types[0] = p_g_payload_type;
message->param.connectinfo.rtpinfo.payloads = 1;
+ } else {
+ /* modify to GSM FR, if not already
+ * for network side, this should have been already happened */
+ if (!p_g_media_type)
+ modify_lchan(MEDIA_TYPE_GSM);
}
+
if (p_g_rtp_bridge) {
struct gsm_mncc_rtp *rtp;
projects / lcr.git / blobdiff