Skip to content

V
vlc-2-2
Commit 4970e57f authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Small corrections for stats.

parent ea9654b7
Hide whitespace changes
Inline Side-by-side
Showing with 417 additions and 300 deletions
modules/gui/qt4/components/infopanels.cpp
View file @ 4970e57f
...@@ -51,12 +51,12 @@ void InputStatsPanel::update( input_item_t *p_item ) ...@@ -51,12 +51,12 @@ void InputStatsPanel::update( input_item_t *p_item )
#define UPDATE( widget,format, calc... ) \ #define UPDATE( widget,format, calc... ) \
{ QString str; ui.widget->setText( str.sprintf( format, ## calc ) ); } { QString str; ui.widget->setText( str.sprintf( format, ## calc ) ); }
UPDATE( read_text, "%8.0f kB", (float)(p_item->p_stats->i_read_bytes)/1000); UPDATE( read_text, "%8.0f", (float)(p_item->p_stats->i_read_bytes)/1000);
UPDATE( input_bitrate_text, "%6.0f kb/s", UPDATE( input_bitrate_text, "%6.0f",
(float)(p_item->p_stats->f_input_bitrate * 8000 )); (float)(p_item->p_stats->f_input_bitrate * 8000 ));
UPDATE( demuxed_text, "%8.0f kB", UPDATE( demuxed_text, "%8.0f",
(float)(p_item->p_stats->i_demux_read_bytes)/1000 ); (float)(p_item->p_stats->i_demux_read_bytes)/1000 );
UPDATE( stream_bitrate_text, "%6.0f kb/s", UPDATE( stream_bitrate_text, "%6.0f",
(float)(p_item->p_stats->f_demux_bitrate * 8000 )); (float)(p_item->p_stats->f_demux_bitrate * 8000 ));
/* Video */ /* Video */
...@@ -66,9 +66,9 @@ void InputStatsPanel::update( input_item_t *p_item ) ...@@ -66,9 +66,9 @@ void InputStatsPanel::update( input_item_t *p_item )
/* Sout */ /* Sout */
UPDATE( sent_text, "%5i", p_item->p_stats->i_sent_packets ); UPDATE( sent_text, "%5i", p_item->p_stats->i_sent_packets );
UPDATE( sent_bytes_text, "%8.0f kB", UPDATE( sent_bytes_text, "%8.0f",
(float)(p_item->p_stats->i_sent_bytes)/1000 ); (float)(p_item->p_stats->i_sent_bytes)/1000 );
UPDATE( send_bitrate_text, "%6.0f kb/s", UPDATE( send_bitrate_text, "%6.0f",
(float)(p_item->p_stats->f_send_bitrate*8)*1000 ); (float)(p_item->p_stats->f_send_bitrate*8)*1000 );
/* Audio*/ /* Audio*/
...@@ -170,15 +170,14 @@ InfoTab::InfoTab( QWidget *parent, intf_thread_t *_p_intf, bool _stats ) : ...@@ -170,15 +170,14 @@ InfoTab::InfoTab( QWidget *parent, intf_thread_t *_p_intf, bool _stats ) :
// setGeometry(0, 0, 400, 500); // setGeometry(0, 0, 400, 500);
MP = new MetaPanel(NULL, p_intf); MP = new MetaPanel(NULL, p_intf);
addTab(MP, qtr("&Meta")); addTab(MP, qtr("&General"));
IP = new InfoPanel(NULL, p_intf);
addTab(IP, qtr("&Details"));
if( stats ) if( stats )
{ {
ISP = new InputStatsPanel( NULL, p_intf ); ISP = new InputStatsPanel( NULL, p_intf );
addTab(ISP, qtr("&Stats")); addTab(ISP, qtr("&Stats"));
} }
IP = new InfoPanel(NULL, p_intf);
addTab(IP, qtr("&Info"));
} }
InfoTab::~InfoTab() InfoTab::~InfoTab()
......
modules/gui/qt4/dialogs/streaminfo.cpp
View file @ 4970e57f
...@@ -51,7 +51,7 @@ StreamInfoDialog::StreamInfoDialog( intf_thread_t *_p_intf ) :QVLCFrame( _p_intf ...@@ -51,7 +51,7 @@ StreamInfoDialog::StreamInfoDialog( intf_thread_t *_p_intf ) :QVLCFrame( _p_intf
var_AddCallback( THEPL, "item-change", ItemChanged, this ); var_AddCallback( THEPL, "item-change", ItemChanged, this );
readSettings( "StreamInfo" , QSize( 470, 450 ) ); readSettings( "StreamInfo" , QSize( 500, 450 ) );
} }
StreamInfoDialog::~StreamInfoDialog() StreamInfoDialog::~StreamInfoDialog()
......
modules/gui/qt4/ui/input_stats.ui
View file @ 4970e57f
...@@ -8,302 +8,420 @@ ...@@ -8,302 +8,420 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>434</width> <width>470</width>
<height>294</height> <height>300</height>
</rect> </rect>
</property> </property>
<property name="windowTitle" > <property name="windowTitle" >
<string>_("Form")</string> <string>_("Form")</string>
</property> </property>
<layout class="QGridLayout" > <widget class="QGroupBox" name="groupBox_4" >
<property name="margin" > <property name="geometry" >
<number>9</number> <rect>
<x>240</x>
<y>150</y>
<width>215</width>
<height>135</height>
</rect>
</property> </property>
<property name="spacing" > <property name="title" >
<number>6</number> <string>_("Audio")</string>
</property> </property>
<item row="0" column="0" > <layout class="QGridLayout" >
<widget class="QGroupBox" name="groupBox" > <property name="margin" >
<property name="title" > <number>9</number>
<string>_("Input")</string> </property>
</property> <property name="spacing" >
<layout class="QGridLayout" > <number>6</number>
<property name="margin" > </property>
<number>9</number> <item row="1" column="1" >
</property> <widget class="QLabel" name="aplayed_text" >
<property name="spacing" > <property name="text" >
<number>6</number> <string>0</string>
</property> </property>
<item row="0" column="1" > <property name="alignment" >
<widget class="QLabel" name="read_text" > <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
<property name="text" > </property>
<string>0</string> </widget>
</property> </item>
<property name="alignment" > <item row="1" column="0" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <widget class="QLabel" name="label_9" >
</property> <property name="text" >
</widget> <string>_("Played buffers")</string>
</item> </property>
<item row="3" column="1" > </widget>
<widget class="QLabel" name="stream_bitrate_text" > </item>
<property name="text" > <item row="2" column="1" >
<string>0 kb/s</string> <widget class="QLabel" name="alost_text" >
</property> <property name="text" >
<property name="alignment" > <string>0</string>
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> </property>
</property> <property name="alignment" >
</widget> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</item> </property>
<item row="1" column="1" > </widget>
<widget class="QLabel" name="input_bitrate_text" > </item>
<property name="text" > <item row="2" column="0" >
<string>0 kb/s</string> <widget class="QLabel" name="label_10" >
</property> <property name="text" >
<property name="alignment" > <string>_("Lost buffers")</string>
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> </property>
</property> </widget>
</widget> </item>
</item> <item row="0" column="1" >
<item row="1" column="0" > <widget class="QLabel" name="adecoded_text" >
<widget class="QLabel" name="label_5" > <property name="text" >
<property name="text" > <string>0</string>
<string>_("Input bitrate")</string> </property>
</property> <property name="alignment" >
</widget> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</item> </property>
<item row="0" column="0" > </widget>
<widget class="QLabel" name="label" > </item>
<property name="text" > <item row="0" column="0" >
<string>_("Read at media")</string> <widget class="QLabel" name="label_8" >
</property> <property name="text" >
</widget> <string>_("Decoded blocks")</string>
</item> </property>
<item row="3" column="0" > </widget>
<widget class="QLabel" name="label_3" > </item>
<property name="text" > </layout>
<string>_("Stream bitrate")</string> </widget>
</property> <widget class="QGroupBox" name="groupBox" >
</widget> <property name="geometry" >
</item> <rect>
<item row="2" column="0" > <x>10</x>
<widget class="QLabel" name="label_7" > <y>10</y>
<property name="text" > <width>215</width>
<string>_("Demuxed")</string> <height>135</height>
</property> </rect>
</widget> </property>
</item> <property name="title" >
<item row="2" column="1" > <string>_("Input")</string>
<widget class="QLabel" name="demuxed_text" > </property>
<property name="text" > <layout class="QGridLayout" >
<string>0 kB</string> <property name="margin" >
</property> <number>9</number>
<property name="alignment" > </property>
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <property name="spacing" >
</property> <number>6</number>
</widget> </property>
</item> <item row="0" column="1" >
</layout> <widget class="QLabel" name="read_text" >
</widget> <property name="text" >
</item> <string>0</string>
<item row="0" column="1" > </property>
<widget class="QGroupBox" name="groupBox_2" > <property name="alignment" >
<property name="title" > <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
<string>_("Video")</string> </property>
</property> </widget>
<layout class="QGridLayout" > </item>
<property name="margin" > <item row="1" column="1" >
<number>9</number> <widget class="QLabel" name="input_bitrate_text" >
</property> <property name="text" >
<property name="spacing" > <string>0</string>
<number>6</number> </property>
</property> <property name="alignment" >
<item row="2" column="0" > <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
<widget class="QLabel" name="label_6" > </property>
<property name="text" > </widget>
<string>_("Lost frames")</string> </item>
</property> <item row="3" column="2" >
</widget> <widget class="QLabel" name="sent_bytes_text_6" >
</item> <property name="text" >
<item row="2" column="1" > <string>kb/s</string>
<widget class="QLabel" name="vlost_frames" > </property>
<property name="text" > </widget>
<string>0</string> </item>
</property> <item row="1" column="2" >
<property name="alignment" > <widget class="QLabel" name="sent_bytes_text_5" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <property name="text" >
</property> <string>kb/s</string>
</widget> </property>
</item> </widget>
<item row="1" column="0" > </item>
<widget class="QLabel" name="label_4" > <item row="2" column="2" >
<property name="text" > <widget class="QLabel" name="sent_bytes_text_4" >
<string>_("Displayed frames")</string> <property name="sizePolicy" >
</property> <sizepolicy>
</widget> <hsizetype>0</hsizetype>
</item> <vsizetype>0</vsizetype>
<item row="0" column="0" > <horstretch>0</horstretch>
<widget class="QLabel" name="label_2" > <verstretch>0</verstretch>
<property name="text" > </sizepolicy>
<string>_("Decoded blocks")</string> </property>
</property> <property name="text" >
</widget> <string>kB</string>
</item> </property>
<item row="0" column="1" > <property name="alignment" >
<widget class="QLabel" name="vdecoded_text" > <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
<property name="text" > </property>
<string>0</string> </widget>
</property> </item>
<property name="alignment" > <item row="3" column="1" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <widget class="QLabel" name="stream_bitrate_text" >
</property> <property name="text" >
</widget> <string>0</string>
</item> </property>
<item row="1" column="1" > <property name="alignment" >
<widget class="QLabel" name="vdisplayed_text" > <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
<property name="text" > </property>
<string>0</string> </widget>
</property> </item>
<property name="alignment" > <item row="2" column="1" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <widget class="QLabel" name="demuxed_text" >
</property> <property name="text" >
</widget> <string>0</string>
</item> </property>
</layout> <property name="alignment" >
</widget> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</item> </property>
<item row="1" column="1" > </widget>
<widget class="QGroupBox" name="groupBox_4" > </item>
<property name="title" > <item row="2" column="0" >
<string>_("Audio")</string> <widget class="QLabel" name="label_7" >
</property> <property name="text" >
<layout class="QGridLayout" > <string>_("Demuxed")</string>
<property name="margin" > </property>
<number>9</number> </widget>
</property> </item>
<property name="spacing" > <item row="3" column="0" >
<number>6</number> <widget class="QLabel" name="label_3" >
</property> <property name="text" >
<item row="2" column="1" > <string>_("Stream bitrate")</string>
<widget class="QLabel" name="alost_text" > </property>
<property name="text" > </widget>
<string>0</string> </item>
</property> <item row="0" column="0" >
<property name="alignment" > <widget class="QLabel" name="label" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <property name="text" >
</property> <string>_("Read at media")</string>
</widget> </property>
</item> </widget>
<item row="1" column="1" > </item>
<widget class="QLabel" name="aplayed_text" > <item row="1" column="0" >
<property name="text" > <widget class="QLabel" name="label_5" >
<string>0</string> <property name="text" >
</property> <string>_("Input bitrate")</string>
<property name="alignment" > </property>
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> </widget>
</property> </item>
</widget> <item row="0" column="2" >
</item> <widget class="QLabel" name="sent_bytes_text_7" >
<item row="0" column="1" > <property name="text" >
<widget class="QLabel" name="adecoded_text" > <string>kB</string>
<property name="text" > </property>
<string>0</string> <property name="alignment" >
</property> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
<property name="alignment" > </property>
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> </widget>
</property> </item>
</widget> </layout>
</item> </widget>
<item row="2" column="0" > <widget class="QGroupBox" name="groupBox_3" >
<widget class="QLabel" name="label_10" > <property name="geometry" >
<property name="text" > <rect>
<string>_("Lost buffers")</string> <x>240</x>
</property> <y>10</y>
</widget> <width>215</width>
</item> <height>135</height>
<item row="1" column="0" > </rect>
<widget class="QLabel" name="label_9" > </property>
<property name="text" > <property name="title" >
<string>_("Played buffers")</string> <string>_("Streaming")</string>
</property> </property>
</widget> <layout class="QGridLayout" >
</item> <property name="margin" >
<item row="0" column="0" > <number>9</number>
<widget class="QLabel" name="label_8" > </property>
<property name="text" > <property name="spacing" >
<string>_("Decoded blocks")</string> <number>6</number>
</property> </property>
</widget> <item row="2" column="2" >
</item> <widget class="QLabel" name="sent_bytes_text_3" >
</layout> <property name="sizePolicy" >
</widget> <sizepolicy>
</item> <hsizetype>0</hsizetype>
<item row="1" column="0" > <vsizetype>0</vsizetype>
<widget class="QGroupBox" name="groupBox_3" > <horstretch>0</horstretch>
<property name="title" > <verstretch>0</verstretch>
<string>_("Streaming")</string> </sizepolicy>
</property> </property>
<layout class="QGridLayout" > <property name="text" >
<property name="margin" > <string>kb/s</string>
<number>9</number> </property>
</property> </widget>
<property name="spacing" > </item>
<number>6</number> <item row="2" column="1" >
</property> <widget class="QLabel" name="send_bitrate_text" >
<item row="0" column="1" > <property name="text" >
<widget class="QLabel" name="sent_text" > <string>0</string>
<property name="text" > </property>
<string>0</string> <property name="alignment" >
</property> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
<property name="alignment" > </property>
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> </widget>
</property> </item>
</widget> <item row="1" column="1" >
</item> <widget class="QLabel" name="sent_bytes_text" >
<item row="2" column="1" > <property name="text" >
<widget class="QLabel" name="send_bitrate_text" > <string>0</string>
<property name="text" > </property>
<string>0 kb/s</string> <property name="alignment" >
</property> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
<property name="alignment" > </property>
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> </widget>
</property> </item>
</widget> <item row="0" column="1" >
</item> <widget class="QLabel" name="sent_text" >
<item row="1" column="1" > <property name="text" >
<widget class="QLabel" name="sent_bytes_text" > <string>0</string>
<property name="text" > </property>
<string>0 kB</string> <property name="alignment" >
</property> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
<property name="alignment" > </property>
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> </widget>
</property> </item>
</widget> <item row="1" column="2" >
</item> <widget class="QLabel" name="sent_bytes_text_2" >
<item row="2" column="0" > <property name="text" >
<widget class="QLabel" name="label_13" > <string>kB</string>
<property name="text" > </property>
<string>_("Send bitrate")</string> <property name="alignment" >
</property> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</widget> </property>
</item> </widget>
<item row="1" column="0" > </item>
<widget class="QLabel" name="label_12" > <item row="2" column="0" >
<property name="text" > <widget class="QLabel" name="label_13" >
<string>_("Sent bytes")</string> <property name="text" >
</property> <string>_("Send bitrate")</string>
</widget> </property>
</item> </widget>
<item row="0" column="0" > </item>
<widget class="QLabel" name="label_11" > <item row="1" column="0" >
<property name="text" > <widget class="QLabel" name="label_12" >
<string>_("Sent packets")</string> <property name="text" >
</property> <string>_("Sent bytes")</string>
</widget> </property>
</item> </widget>
</layout> </item>
</widget> <item row="0" column="0" >
</item> <widget class="QLabel" name="label_11" >
</layout> <property name="text" >
<string>_("Sent packets")</string>
</property>
</widget>
</item>
<item row="3" column="0" >
<widget class="QLabel" name="label_14" >
<property name="text" >
<string/>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QGroupBox" name="groupBox_2" >
<property name="geometry" >
<rect>
<x>10</x>
<y>150</y>
<width>215</width>
<height>135</height>
</rect>
</property>
<property name="title" >
<string>_("Video")</string>
</property>
<widget class="QLabel" name="label_4" >
<property name="geometry" >
<rect>
<x>11</x>
<y>62</y>
<width>133</width>
<height>28</height>
</rect>
</property>
<property name="text" >
<string>_("Displayed frames")</string>
</property>
</widget>
<widget class="QLabel" name="label_6" >
<property name="geometry" >
<rect>
<x>11</x>
<y>96</y>
<width>133</width>
<height>28</height>
</rect>
</property>
<property name="text" >
<string>_("Lost frames")</string>
</property>
</widget>
<widget class="QLabel" name="label_2" >
<property name="geometry" >
<rect>
<x>11</x>
<y>28</y>
<width>133</width>
<height>28</height>
</rect>
</property>
<property name="text" >
<string>_("Decoded blocks")</string>
</property>
</widget>
<widget class="QLabel" name="vlost_frames" >
<property name="geometry" >
<rect>
<x>150</x>
<y>96</y>
<width>50</width>
<height>28</height>
</rect>
</property>
<property name="text" >
<string>0</string>
</property>
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
<widget class="QLabel" name="vdisplayed_text" >
<property name="geometry" >
<rect>
<x>150</x>
<y>62</y>
<width>50</width>
<height>28</height>
</rect>
</property>
<property name="text" >
<string>0</string>
</property>
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
<widget class="QLabel" name="vdecoded_text" >
<property name="geometry" >
<rect>
<x>150</x>
<y>28</y>
<width>50</width>
<height>28</height>
</rect>
</property>
<property name="text" >
<string>0</string>
</property>
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</widget>
</widget> </widget>
<pixmapfunction></pixmapfunction> <pixmapfunction></pixmapfunction>
<resources/> <resources/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment