paulmataruso/osmo-hnodeb
1
0
Fork 0
mirror of https://gitea.osmocom.org/cellular-infrastructure/osmo-hnodeb.git synced 2025-11-04 06:03:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

rtp: Update code to libosmogsm IuUP API changes

Browse Source 
NOTICE: This commit implies an API change when using libosmogsm.
However, the previous API was never available in any libosmogsm release,
and only available in both libosmogsm and osmo-hnodeb master, so we are
only breaking compatibility between different master versions, which is
acceptable.

Related: SYS#5969
Change-Id: Ia26a945147d68511bb1750d51ed91909e48b4139
This commit is contained in:
Pau Espin Pedrol
2022-05-25 18:55:07 +02:00
parent 8875abd3f9
commit 3dffff3147
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/osmo-hnodeb/rtp.c
View File

@@ -45,13 +45,17 @@ static struct osmo_iuup_rnl_prim *llsk_audio_ce_to_iuup_rnl_cfg(void *ctx, const
cfg->supported_versions_mask = ce_req->supported_versions_mask; cfg->supported_versions_mask = ce_req->supported_versions_mask;
cfg->num_rfci = ce_req->num_rfci; cfg->num_rfci = ce_req->num_rfci;
cfg->num_subflows = ce_req->num_subflows; cfg->num_subflows = ce_req->num_subflows;
OSMO_ASSERT(cfg->num_rfci <= ARRAY_SIZE(cfg->subflow_sizes));
OSMO_ASSERT(cfg->num_subflows <= ARRAY_SIZE(cfg->subflow_sizes[0]));
for (i = 0; i < cfg->num_rfci; i++)
memcpy(&cfg->subflow_sizes[i][0], &ce_req->subflow_sizes[i][0], cfg->num_subflows*sizeof(uint16_t));
cfg->IPTIs_present = ce_req->IPTIs_present; cfg->IPTIs_present = ce_req->IPTIs_present;
if (cfg->IPTIs_present) OSMO_ASSERT(cfg->num_rfci <= ARRAY_SIZE(cfg->rfci));
memcpy(cfg->IPTIs, ce_req->IPTIs, cfg->num_rfci); OSMO_ASSERT(cfg->num_subflows <= ARRAY_SIZE(cfg->rfci[0].subflow_sizes));
for (i = 0; i < cfg->num_rfci; i++) {
cfg->rfci[i].used = true;
cfg->rfci[i].id = i; /* Assume RFC ID from position, llsk_audio doesn't provide info */
if (cfg->IPTIs_present)
cfg->rfci[i].IPTI = ce_req->IPTIs[i];
if (cfg->num_subflows > 0)
memcpy(&cfg->rfci[i].subflow_sizes[0], &ce_req->subflow_sizes[i][0], cfg->num_subflows*sizeof(uint16_t));
}
cfg->t_init = (struct osmo_iuup_rnl_config_timer){ .t_ms = IUUP_TIMER_INIT_T_DEFAULT, .n_max = IUUP_TIMER_INIT_N_DEFAULT }; cfg->t_init = (struct osmo_iuup_rnl_config_timer){ .t_ms = IUUP_TIMER_INIT_T_DEFAULT, .n_max = IUUP_TIMER_INIT_N_DEFAULT };
cfg->t_ta = (struct osmo_iuup_rnl_config_timer){ .t_ms = IUUP_TIMER_TA_T_DEFAULT, .n_max = IUUP_TIMER_TA_N_DEFAULT }; cfg->t_ta = (struct osmo_iuup_rnl_config_timer){ .t_ms = IUUP_TIMER_TA_T_DEFAULT, .n_max = IUUP_TIMER_TA_N_DEFAULT };