[vlc-commits] input item: remove constant stat fields
Rémi Denis-Courmont
git at videolan.org
Tue Dec 12 19:36:51 CET 2017
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Dec 12 20:22:56 2017 +0200| [c624707de27da1d7009e7bb60fba311ac79ca25e] | committer: Rémi Denis-Courmont
input item: remove constant stat fields
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c624707de27da1d7009e7bb60fba311ac79ca25e
---
include/vlc_input_item.h | 5 -----
lib/media.c | 7 ++++---
modules/gui/macosx/VLCPlaylistInfo.m | 4 ++--
modules/lua/libs/input.c | 3 ---
src/input/stats.c | 5 -----
5 files changed, 6 insertions(+), 18 deletions(-)
diff --git a/include/vlc_input_item.h b/include/vlc_input_item.h
index cc2a78036b..62a81d31de 100644
--- a/include/vlc_input_item.h
+++ b/include/vlc_input_item.h
@@ -409,11 +409,6 @@ struct input_stats_t
int64_t i_displayed_pictures;
int64_t i_lost_pictures;
- /* Sout */
- int64_t i_sent_packets;
- int64_t i_sent_bytes;
- float f_send_bitrate;
-
/* Aout */
int64_t i_played_abuffers;
int64_t i_lost_abuffers;
diff --git a/lib/media.c b/lib/media.c
index 36f2b6eea6..58881e315f 100644
--- a/lib/media.c
+++ b/lib/media.c
@@ -729,9 +729,10 @@ int libvlc_media_get_stats( libvlc_media_t *p_md,
p_stats->i_played_abuffers = p_itm_stats->i_played_abuffers;
p_stats->i_lost_abuffers = p_itm_stats->i_lost_abuffers;
- p_stats->i_sent_packets = p_itm_stats->i_sent_packets;
- p_stats->i_sent_bytes = p_itm_stats->i_sent_bytes;
- p_stats->f_send_bitrate = p_itm_stats->f_send_bitrate;
+ p_stats->i_sent_packets = 0;
+ p_stats->i_sent_bytes = 0;
+ p_stats->f_send_bitrate = 0.;
+
vlc_mutex_unlock( &item->lock );
return true;
}
diff --git a/modules/gui/macosx/VLCPlaylistInfo.m b/modules/gui/macosx/VLCPlaylistInfo.m
index f11a091bb1..d13db2246b 100644
--- a/modules/gui/macosx/VLCPlaylistInfo.m
+++ b/modules/gui/macosx/VLCPlaylistInfo.m
@@ -294,9 +294,9 @@ FREENULL( psz_##foo );
/* Sout */
[_sentPacketsTextField setIntValue: p_item->p_stats->i_sent_packets];
[_sentBytesTextField setStringValue: [NSString stringWithFormat: @"%8.0f KiB",
- (float)(p_item->p_stats->i_sent_bytes)/1024]];
+ 0.f]];
[_sentBitrateTextField setStringValue: [NSString stringWithFormat:
- @"%6.0f kb/s", (float)(p_item->p_stats->f_send_bitrate*8)*1000]];
+ @"%6.0f kb/s", 0.f]];
/* Audio */
[_audioDecodedTextField setIntValue: p_item->p_stats->i_decoded_audio];
diff --git a/modules/lua/libs/input.c b/modules/lua/libs/input.c
index 6c947786dc..39e46c65ce 100644
--- a/modules/lua/libs/input.c
+++ b/modules/lua/libs/input.c
@@ -214,9 +214,6 @@ static int vlclua_input_item_stats( lua_State *L )
STATS_INT( decoded_video )
STATS_INT( displayed_pictures )
STATS_INT( lost_pictures )
- STATS_INT( sent_packets )
- STATS_INT( sent_bytes )
- STATS_FLOAT( send_bitrate )
STATS_INT( played_abuffers )
STATS_INT( lost_abuffers )
#undef STATS_INT
diff --git a/src/input/stats.c b/src/input/stats.c
index c271690e55..e0535346d4 100644
--- a/src/input/stats.c
+++ b/src/input/stats.c
@@ -71,11 +71,6 @@ void input_stats_Compute(input_thread_t *input, input_stats_t *st)
st->i_decoded_video = priv->counters.decoded_video;
st->i_decoded_audio = priv->counters.decoded_audio;
- /* Sout */
- st->i_sent_packets = 0;
- st->i_sent_bytes = 0;
- st->f_send_bitrate = 0.f;
-
/* Aout */
st->i_played_abuffers = priv->counters.played_abuffers;
st->i_lost_abuffers = priv->counters.lost_abuffers;
More information about the vlc-commits
mailing list