Browse Source

TT#14008 fix CN passthrough

Change-Id: I39c75c6089ca3e4c90ebfd7298a81493066a7784
rfuchs/1283
Richard Fuchs 5 years ago
parent
commit
3a6a95f833
1 changed files with 4 additions and 8 deletions
  1. +4
    -8
      daemon/codec.c

+ 4
- 8
daemon/codec.c View File

@ -170,7 +170,7 @@ static codec_handler_func handler_func_passthrough_ssrc;
static codec_handler_func handler_func_transcode; static codec_handler_func handler_func_transcode;
static codec_handler_func handler_func_playback; static codec_handler_func handler_func_playback;
static codec_handler_func handler_func_inject_dtmf; static codec_handler_func handler_func_inject_dtmf;
static codec_handler_func handler_func_supplemental;
//static codec_handler_func handler_func_supplemental;
static codec_handler_func handler_func_dtmf; static codec_handler_func handler_func_dtmf;
static codec_handler_func handler_func_t38; static codec_handler_func handler_func_t38;
@ -258,8 +258,6 @@ static void __make_passthrough(struct codec_handler *handler) {
STR_FMT(&handler->source_pt.encoding_with_params)); STR_FMT(&handler->source_pt.encoding_with_params));
if (handler->source_pt.codec_def && handler->source_pt.codec_def->dtmf) if (handler->source_pt.codec_def && handler->source_pt.codec_def->dtmf)
handler->func = handler_func_dtmf; handler->func = handler_func_dtmf;
else if (handler->source_pt.codec_def && handler->source_pt.codec_def->supplemental)
handler->func = handler_func_supplemental;
else { else {
handler->func = handler_func_passthrough; handler->func = handler_func_passthrough;
handler->kernelize = 1; handler->kernelize = 1;
@ -273,8 +271,6 @@ static void __make_passthrough_ssrc(struct codec_handler *handler) {
STR_FMT(&handler->source_pt.encoding_with_params)); STR_FMT(&handler->source_pt.encoding_with_params));
if (handler->source_pt.codec_def && handler->source_pt.codec_def->dtmf) if (handler->source_pt.codec_def && handler->source_pt.codec_def->dtmf)
handler->func = handler_func_dtmf; handler->func = handler_func_dtmf;
else if (handler->source_pt.codec_def && handler->source_pt.codec_def->supplemental)
handler->func = handler_func_supplemental;
else { else {
handler->func = handler_func_passthrough_ssrc; handler->func = handler_func_passthrough_ssrc;
handler->kernelize = 1; handler->kernelize = 1;
@ -2166,9 +2162,9 @@ static int __handler_func_supplemental(struct codec_handler *h, struct media_pac
return __handler_func_sequencer(mp, packet); return __handler_func_sequencer(mp, packet);
} }
static int handler_func_supplemental(struct codec_handler *h, struct media_packet *mp) {
return __handler_func_supplemental(h, mp, packet_decode, NULL);
}
//static int handler_func_supplemental(struct codec_handler *h, struct media_packet *mp) {
//return __handler_func_supplemental(h, mp, packet_decode, NULL);
//}
static int handler_func_dtmf(struct codec_handler *h, struct media_packet *mp) { static int handler_func_dtmf(struct codec_handler *h, struct media_packet *mp) {
return __handler_func_supplemental(h, mp, packet_dtmf, packet_dtmf_dup); return __handler_func_supplemental(h, mp, packet_dtmf, packet_dtmf_dup);
} }


Loading…
Cancel
Save