projects
/
lcr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add conference mixing to LCR's internal bridge
[lcr.git]
/
gsm.cpp
diff --git
a/gsm.cpp
b/gsm.cpp
index
a4a220e
..
31a7967
100644
(file)
--- a/
gsm.cpp
+++ b/
gsm.cpp
@@
-20,7
+20,6
@@
extern "C" {
#include "gsm_audio.h"
}
#include "gsm_audio.h"
}
-#include <mISDN/mISDNcompat.h>
#include <assert.h>
#define SOCKET_RETRY_TIMER 5
#include <assert.h>
#define SOCKET_RETRY_TIMER 5
@@
-140,10
+139,10
@@
void Pgsm::send_mncc_rtp_connect(void)
nrtp->payload_msg_type = GSM_TCHF_FRAME_EFR;
break;
case MEDIA_TYPE_AMR:
nrtp->payload_msg_type = GSM_TCHF_FRAME_EFR;
break;
case MEDIA_TYPE_AMR:
- nrtp->payload_msg_type = GSM_TCH
F
_FRAME_AMR;
+ nrtp->payload_msg_type = GSM_TCH_FRAME_AMR;
break;
case MEDIA_TYPE_GSM_HR:
break;
case MEDIA_TYPE_GSM_HR:
- nrtp->payload_msg_type = GSM_TCH
F_FRAME_HR
;
+ nrtp->payload_msg_type = GSM_TCH
H_FRAME
;
break;
}
nrtp->payload_type = p_g_payload_type;
break;
}
nrtp->payload_type = p_g_payload_type;
@@
-230,7
+229,7
@@
void Pgsm::frame_receive(void *arg)
if (!p_g_decoder)
return;
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);
if ((frame->data[0]>>4) != 0xd)
PERROR("received GSM frame with wrong magig 0x%x\n", frame->data[0]>>4);
@@
-376,12
+375,8
@@
void Pgsm::modify_lchan(int media_type)
add_trace("speech", "version", "AMR given");
mode->lchan_mode = 0x41; /* GSM V3 */
break;
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:
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 */
mode->lchan_mode = 0x01; /* GSM V1 */
}
mode->lchan_type = 0x02; /* FIXME: unused */