cellular-infrastructure
/
osmo-msc
mirror of https://gerrit.osmocom.org/osmo-msc
9
0
Fork 0
Code Issues Releases Wiki Activity

add sdp_audio_codec_to_speech_codec_list() 

Used by I8760feaa8598047369ef8c3ab2673013bac8ac8a to add just a single
codec to a speech codec list, instead of a list.

Change-Id: I6ac23c54bc26939e048ff2df06eb987421cfb1c5
This commit is contained in:
Neels Hofmeyr 2023-11-17 04:11:19 +01:00 committed by neels
parent cbabe1e32d
commit cefe594c72
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/osmocom/msc/codec_mapping.h
View File

@ -56,6 +56,7 @@ struct sdp_audio_codec *sdp_audio_codecs_add_speech_ver(struct sdp_audio_codecs
struct sdp_audio_codec *sdp_audio_codecs_add_mgcp_codec(struct sdp_audio_codecs *ac, enum mgcp_codecs mgcp_codec);
void sdp_audio_codecs_from_bearer_cap(struct sdp_audio_codecs *ac, const struct gsm_mncc_bearer_cap *bc);
int sdp_audio_codec_to_speech_codec_list(struct gsm0808_speech_codec_list *scl, const struct sdp_audio_codec *codec);
void sdp_audio_codecs_to_speech_codec_list(struct gsm0808_speech_codec_list *cl, const struct sdp_audio_codecs *ac);
void sdp_audio_codecs_from_speech_codec_list(struct sdp_audio_codecs *ac, const struct gsm0808_speech_codec_list *cl);

29
src/libmsc/codec_mapping.c
View File

@ -414,6 +414,24 @@ void sdp_audio_codecs_from_bearer_cap(struct sdp_audio_codecs *ac, const struct
}
}
/* Append an entry for the given sdp_audio_codec to the gsm0808_speech_codec_list.
* Return 0 if an entry was added, -ENOENT when there is no mapping to gsm0808_speech_codec for the given
* sdp_audio_codec, and -ENOSPC when scl is full and nothing could be added. */
int sdp_audio_codec_to_speech_codec_list(struct gsm0808_speech_codec_list *scl, const struct sdp_audio_codec *codec)
{
const struct codec_mapping *m = codec_mapping_by_subtype_name(codec->subtype_name);
if (!m)
return -ENOENT;
if (!m->has_gsm0808_speech_codec)
return -ENOENT;
if (scl->len >= ARRAY_SIZE(scl->codec))
return -ENOSPC;
scl->codec[scl->len] = m->gsm0808_speech_codec;
/* FIXME: apply AMR configuration according to codec->fmtp */
scl->len++;
return 0;
}
void sdp_audio_codecs_to_speech_codec_list(struct gsm0808_speech_codec_list *scl, const struct sdp_audio_codecs *ac)
{
const struct sdp_audio_codec *codec;
@ -421,16 +439,9 @@ void sdp_audio_codecs_to_speech_codec_list(struct gsm0808_speech_codec_list *scl
*scl = (struct gsm0808_speech_codec_list){};
foreach_sdp_audio_codec(codec, ac) {
const struct codec_mapping *m = codec_mapping_by_subtype_name(codec->subtype_name);
if (!m)
continue;
if (!m->has_gsm0808_speech_codec)
continue;
if (scl->len >= ARRAY_SIZE(scl->codec))
int rc = sdp_audio_codec_to_speech_codec_list(scl, codec);
if (rc == -ENOSPC)
break;
scl->codec[scl->len] = m->gsm0808_speech_codec;
/* FIXME: apply AMR configuration according to codec->fmtp */
scl->len++;
}
}