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

mgcp: Fix/test the case of a time jump and the resync 

In case the sender didn't send a couple of frames we will have
a time gap that is bigger than the accepted delta. Add a new
testcase for this and update the next_time.
This commit is contained in:
Holger Hans Peter Freyther 2014-07-04 20:55:20 +02:00
parent 4c18d79475
commit b936278b2e
2 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
openbsc/src/libmgcp/mgcp_transcode.c
View File

@ -450,6 +450,7 @@ int mgcp_transcoding_process_rtp(struct mgcp_endpoint *endp,
"0x%x dropping sample buffer due delta=%d sample_cnt=%d\n",
ENDPOINT_NUMBER(endp), delta, state->sample_cnt);
state->sample_cnt = 0;
state->next_time = ts_no;
} else if (delta < 0) {
LOGP(DMGCP, LOGL_NOTICE,
"RTP time jumps backwards, delta = %d, "

47
openbsc/tests/mgcp/mgcp_transcoding_test.c
View File

@ -384,6 +384,53 @@ static void test_transcode_result(void)
talloc_free(ctx);
}
{
/* from PCMA to GSM with a big time jump */
struct rtp_hdr *hdr;
uint32_t ts;
given_configured_endpoint(80, 160, "pcma", "gsm", &ctx, &endp);
state = endp->bts_end.rtp_process_data;
/* Add the first sample */
len = audio_packets_pcma[1].len;
memcpy(buf, audio_packets_pcma[1].data, len);
res = mgcp_transcoding_process_rtp(endp, &endp->bts_end, buf, &len, ARRAY_SIZE(buf));
OSMO_ASSERT(state->sample_cnt == 80);
OSMO_ASSERT(state->next_time == 232640);
OSMO_ASSERT(state->next_seq == 26527);
OSMO_ASSERT(res < 0);
/* Add a skip to the packet to force a 'resync' */
len = audio_packets_pcma[2].len;
memcpy(buf, audio_packets_pcma[2].data, len);
hdr = (struct rtp_hdr *) &buf[0];
/* jump the time and add alignment error */
ts = ntohl(hdr->timestamp) + 123 * 80 + 2;
hdr->timestamp = htonl(ts);
res = mgcp_transcoding_process_rtp(endp, &endp->bts_end, buf, &len, ARRAY_SIZE(buf));
OSMO_ASSERT(res < 0);
OSMO_ASSERT(state->sample_cnt == 80);
OSMO_ASSERT(state->next_time == ts);
OSMO_ASSERT(state->next_seq == 26527);
/* TODO: this can create alignment errors */
/* Now attempt to consume 160 samples */
len = audio_packets_pcma[2].len;
memcpy(buf, audio_packets_pcma[2].data, len);
hdr = (struct rtp_hdr *) &buf[0];
ts += 80;
hdr->timestamp = htonl(ts);
res = mgcp_transcoding_process_rtp(endp, &endp->bts_end, buf, &len, ARRAY_SIZE(buf));
OSMO_ASSERT(res == 12);
OSMO_ASSERT(state->sample_cnt == 0);
OSMO_ASSERT(state->next_time == ts + 160);
OSMO_ASSERT(state->next_seq == 26528);
talloc_free(ctx);
}
}
static int test_repacking(int in_samples, int out_samples, int no_transcode)