diff options
| author | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2014-09-01 10:35:55 +0200 |
|---|---|---|
| committer | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2014-09-02 08:25:49 +0200 |
| commit | cac2438b0c33f54a6dcac55b55e8cfc33de197b2 (patch) | |
| tree | bf8b01402f20bfb5d49a4cf6204197061dcb0924 /openbsc/tests/mgcp/mgcp_test.c | |
| parent | 3713f78ac23ca815c361fe79378ff6d2e522ef6a (diff) | |
mgcp: Move the "codec" params to a struct
We might be offered multiple codecs by the remote and need to
switch between them once we receive data. Do this by moving it
to a struct so we can separate between proposed and current
codec. In SDP we can have multiple codecs but a global ptime.
The current code doesn't separate that clearly instead we write
it to the main codec.
Diffstat (limited to 'openbsc/tests/mgcp/mgcp_test.c')
| -rw-r--r-- | openbsc/tests/mgcp/mgcp_test.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/openbsc/tests/mgcp/mgcp_test.c b/openbsc/tests/mgcp/mgcp_test.c index 50c8b2d0a..06981dd44 100644 --- a/openbsc/tests/mgcp/mgcp_test.c +++ b/openbsc/tests/mgcp/mgcp_test.c @@ -410,7 +410,7 @@ static void test_messages(void) /* reset endpoints */ for (i = 0; i < cfg->trunk.number_endpoints; i++) { endp = &cfg->trunk.endpoints[i]; - endp->net_end.payload_type = PTYPE_NONE; + endp->net_end.codec.payload_type = PTYPE_NONE; endp->net_end.packet_duration_ms = -1; OSMO_ASSERT(endp->conn_mode == MGCP_CONN_NONE); @@ -498,18 +498,18 @@ static void test_messages(void) fprintf(stderr, "endpoint %d: " "payload type BTS %d (exp %d), NET %d (exp %d)\n", last_endpoint, - endp->bts_end.payload_type, t->exp_bts_ptype, - endp->net_end.payload_type, t->exp_net_ptype); + endp->bts_end.codec.payload_type, t->exp_bts_ptype, + endp->net_end.codec.payload_type, t->exp_net_ptype); if (t->exp_bts_ptype != PTYPE_IGNORE) - OSMO_ASSERT(endp->bts_end.payload_type == + OSMO_ASSERT(endp->bts_end.codec.payload_type == t->exp_bts_ptype); if (t->exp_net_ptype != PTYPE_IGNORE) - OSMO_ASSERT(endp->net_end.payload_type == + OSMO_ASSERT(endp->net_end.codec.payload_type == t->exp_net_ptype); /* Reset them again for next test */ - endp->net_end.payload_type = PTYPE_NONE; + endp->net_end.codec.payload_type = PTYPE_NONE; } } @@ -830,7 +830,7 @@ static void test_packet_error_detection(int patch_ssrc, int patch_ts) mgcp_initialize_endp(&endp); - rtp->payload_type = 98; + rtp->codec.payload_type = 98; for (i = 0; i < ARRAY_SIZE(test_rtp_packets1); ++i) { struct rtp_packet_info *info = test_rtp_packets1 + i; |