paulmataruso/osmo-bts
1
0
Fork 0
mirror of https://gitea.osmocom.org/cellular-infrastructure/osmo-bts.git synced 2025-11-01 20:53:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

osmo-bts-trx: pull the AMR header in tch_dl_dequeue()

Browse Source 
The goal is to unify encoding functions in tx_tch[fh]_fn(), so that
in a follow-up change adding CSD we could use a switch statement.

Change-Id: I15318e497b236128f779769e4fa99f307ea431ea
Related: OS#1572
This commit is contained in:
Vadim Yanitskiy
2023-07-12 00:15:13 +07:00
parent 34077236f2
commit f3a63758d1
2 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/osmo-bts-trx/sched_lchan_tchf.c
View File

@@ -402,6 +402,9 @@ struct msgb *tch_dl_dequeue(struct l1sched_ts *l1ts, struct trx_dl_burst_req *br
LOGL1SB(DL1P, LOGL_NOTICE, l1ts, br, "Transmitting 'bad AMR frame'\n");
goto free_bad_msg;
}
/* pull the AMR header, it's not being sent over Um */
msg_tch->l2h += sizeof(struct amr_hdr);
len -= sizeof(struct amr_hdr);
break;
default:
inval_mode2:
@@ -490,12 +493,13 @@ int tx_tchf_fn(struct l1sched_ts *l1ts, struct trx_dl_burst_req *br)
/* the first FN 4,13,21 defines that CMI is included in frame,
* the first FN 0,8,17 defines that CMR is included in frame.
*/
gsm0503_tch_afs_encode(bursts_p, msg->l2h + sizeof(struct amr_hdr),
msgb_l2len(msg) - sizeof(struct amr_hdr),
!sched_tchf_dl_amr_cmi_map[br->fn % 26],
chan_state->codec, chan_state->codecs,
chan_state->dl_ft,
chan_state->dl_cmr);
gsm0503_tch_afs_encode(bursts_p,
msgb_l2(msg), msgb_l2len(msg),
!sched_tchf_dl_amr_cmi_map[br->fn % 26],
chan_state->codec,
chan_state->codecs,
chan_state->dl_ft,
chan_state->dl_cmr);
} else {
gsm0503_tch_fr_encode(bursts_p, msg->l2h, msgb_l2len(msg), 1);
}

13
src/osmo-bts-trx/sched_lchan_tchh.c
View File

@@ -412,12 +412,13 @@ int tx_tchh_fn(struct l1sched_ts *l1ts, struct trx_dl_burst_req *br)
/* the first FN 4,13,21 or 5,14,22 defines that CMI is included
* in frame, the first FN 0,8,17 or 1,9,18 defines that CMR is
* included in frame. */
gsm0503_tch_ahs_encode(bursts_p, msg->l2h + sizeof(struct amr_hdr),
msgb_l2len(msg) - sizeof(struct amr_hdr),
!sched_tchh_dl_amr_cmi_map[br->fn % 26],
chan_state->codec, chan_state->codecs,
chan_state->dl_ft,
chan_state->dl_cmr);
gsm0503_tch_ahs_encode(bursts_p,
msgb_l2(msg), msgb_l2len(msg),
!sched_tchh_dl_amr_cmi_map[br->fn % 26],
chan_state->codec,
chan_state->codecs,
chan_state->dl_ft,
chan_state->dl_cmr);
} else {
gsm0503_tch_hr_encode(bursts_p, msg->l2h, msgb_l2len(msg));
}