diff options
| author | Gerald Combs <gerald@wireshark.org> | 2014-12-16 14:36:04 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2014-12-20 16:49:05 +0000 |
| commit | 2bb8255e29e26c7c14f7a83ce33b41f9af18501e (patch) | |
| tree | 9dbed760864c5780d48f2dd6c57a6bf28e613b74 /ui/cli/tap-rtp.c | |
| parent | 79b5bb418bc3834a842c86371eac47cb39706426 (diff) | |
Consolidate RTP stream structs.
Consolidate the three different RTP stream structs in ui/rtp_stream.h,
ui/gtk/rtp_player.c, and ui/voip_calls.c into one. Make the member names
a bit more consistent. Document what each GList contains. Use nstime_t
for timestamps since that's what we get from the frame data. Use g_new0
to initialize our structs.
Change-Id: I2b3f8f2051394a6a98a5c7bc49c117f07161d031
Reviewed-on: https://code.wireshark.org/review/5843
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui/cli/tap-rtp.c')
| -rw-r--r-- | ui/cli/tap-rtp.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ui/cli/tap-rtp.c b/ui/cli/tap-rtp.c index ee7596e0af..6c0a598760 100644 --- a/ui/cli/tap-rtp.c +++ b/ui/cli/tap-rtp.c @@ -84,15 +84,15 @@ rtp_streams_stat_draw(void *arg _U_) strinfo = (rtp_stream_info_t*)(list->data); /* payload type */ - if (strinfo->pt > 95) { - if (strinfo->info_payload_type_str != NULL) { - payload_type = g_strdup(strinfo->info_payload_type_str); + if (strinfo->payload_type > 95) { + if (strinfo->payload_type_name != NULL) { + payload_type = g_strdup(strinfo->payload_type_name); }else{ - payload_type = g_strdup_printf("Unknown(%u)", strinfo->pt); + payload_type = g_strdup_printf("Unknown(%u)", strinfo->payload_type); } }else{ - payload_type = g_strdup(val_to_str_ext(strinfo->pt, &rtp_payload_type_vals_ext, + payload_type = g_strdup(val_to_str_ext(strinfo->payload_type, &rtp_payload_type_vals_ext, "Unknown (%u)")); } @@ -113,7 +113,7 @@ rtp_streams_stat_draw(void *arg _U_) strinfo->dest_port, strinfo->ssrc, payload_type, - strinfo->npackets, + strinfo->packet_count, lost, perc, strinfo->rtp_stats.max_delta, strinfo->rtp_stats.max_jitter, |