Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-gpu
Commits
e6f3d0a6
Commit
e6f3d0a6
authored
Feb 03, 2006
by
Sigmund Augdal Helberg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix --no-stats in a few cases (there are more remaining)
parent
502d2180
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
16 deletions
+25
-16
src/input/es_out.c
src/input/es_out.c
+8
-5
src/input/stream.c
src/input/stream.c
+1
-1
src/stream_output/stream_output.c
src/stream_output/stream_output.c
+16
-10
No files found.
src/input/es_out.c
View file @
e6f3d0a6
...
@@ -1022,7 +1022,7 @@ static int EsOutSend( es_out_t *out, es_out_id_t *es, block_t *p_block )
...
@@ -1022,7 +1022,7 @@ static int EsOutSend( es_out_t *out, es_out_id_t *es, block_t *p_block )
input_thread_t
*
p_input
=
p_sys
->
p_input
;
input_thread_t
*
p_input
=
p_sys
->
p_input
;
es_out_pgrm_t
*
p_pgrm
=
es
->
p_pgrm
;
es_out_pgrm_t
*
p_pgrm
=
es
->
p_pgrm
;
int64_t
i_delay
;
int64_t
i_delay
;
int
i_total
;
int
i_total
=
0
;
if
(
es
->
fmt
.
i_cat
==
AUDIO_ES
)
if
(
es
->
fmt
.
i_cat
==
AUDIO_ES
)
i_delay
=
p_sys
->
i_audio_delay
;
i_delay
=
p_sys
->
i_audio_delay
;
...
@@ -1031,10 +1031,13 @@ static int EsOutSend( es_out_t *out, es_out_id_t *es, block_t *p_block )
...
@@ -1031,10 +1031,13 @@ static int EsOutSend( es_out_t *out, es_out_id_t *es, block_t *p_block )
else
else
i_delay
=
0
;
i_delay
=
0
;
stats_UpdateInteger
(
p_input
,
"demux_read"
,
p_block
->
i_buffer
);
if
(
p_input
->
p_libvlc
->
b_stats
)
stats_GetInteger
(
p_input
,
p_input
->
i_object_id
,
"demux_read"
,
{
&
i_total
);
stats_UpdateInteger
(
p_input
,
"demux_read"
,
p_block
->
i_buffer
);
stats_UpdateFloat
(
p_input
,
"demux_bitrate"
,
(
float
)
i_total
);
stats_GetInteger
(
p_input
,
p_input
->
i_object_id
,
"demux_read"
,
&
i_total
);
stats_UpdateFloat
(
p_input
,
"demux_bitrate"
,
(
float
)
i_total
);
}
/* Mark preroll blocks */
/* Mark preroll blocks */
if
(
es
->
i_preroll_end
>=
0
)
if
(
es
->
i_preroll_end
>=
0
)
...
...
src/input/stream.c
View file @
e6f3d0a6
...
@@ -1635,7 +1635,7 @@ static block_t *AReadBlock( stream_t *s, vlc_bool_t *pb_eof )
...
@@ -1635,7 +1635,7 @@ static block_t *AReadBlock( stream_t *s, vlc_bool_t *pb_eof )
{
{
p_block
=
p_access
->
pf_block
(
p_access
);
p_block
=
p_access
->
pf_block
(
p_access
);
if
(
pb_eof
)
*
pb_eof
=
p_access
->
info
.
b_eof
;
if
(
pb_eof
)
*
pb_eof
=
p_access
->
info
.
b_eof
;
if
(
p_block
)
if
(
p_block
&&
p_access
->
p_libvlc
->
b_stats
)
{
{
stats_UpdateInteger
(
s
->
p_parent
->
p_parent
,
"read_bytes"
,
stats_UpdateInteger
(
s
->
p_parent
->
p_parent
,
"read_bytes"
,
p_block
->
i_buffer
);
p_block
->
i_buffer
);
...
...
src/stream_output/stream_output.c
View file @
e6f3d0a6
...
@@ -367,17 +367,23 @@ int sout_AccessOutRead( sout_access_out_t *p_access, block_t *p_buffer )
...
@@ -367,17 +367,23 @@ int sout_AccessOutRead( sout_access_out_t *p_access, block_t *p_buffer )
int
sout_AccessOutWrite
(
sout_access_out_t
*
p_access
,
block_t
*
p_buffer
)
int
sout_AccessOutWrite
(
sout_access_out_t
*
p_access
,
block_t
*
p_buffer
)
{
{
int
i_total
;
int
i_total
;
/* Access_out -> sout_instance -> input_thread_t */
if
(
p_access
->
p_libvlc
->
b_stats
)
input_thread_t
*
p_input
=
(
input_thread_t
*
)
vlc_object_find
(
p_access
,
VLC_OBJECT_INPUT
,
FIND_PARENT
);
if
(
p_input
)
{
{
stats_UpdateInteger
(
p_input
,
"sout_sent_packets"
,
1
);
/* Access_out -> sout_instance -> input_thread_t */
stats_UpdateInteger
(
p_input
,
"sout_sent_bytes"
,
p_buffer
->
i_buffer
);
input_thread_t
*
p_input
=
stats_GetInteger
(
p_input
,
p_access
->
p_parent
->
p_parent
->
i_object_id
,
(
input_thread_t
*
)
vlc_object_find
(
p_access
,
VLC_OBJECT_INPUT
,
"sout_sent_bytes"
,
&
i_total
);
FIND_PARENT
);
stats_UpdateFloat
(
p_input
,
"sout_send_bitrate"
,
(
float
)
i_total
);
if
(
p_input
)
vlc_object_release
(
p_input
);
{
stats_UpdateInteger
(
p_input
,
"sout_sent_packets"
,
1
);
stats_UpdateInteger
(
p_input
,
"sout_sent_bytes"
,
p_buffer
->
i_buffer
);
stats_GetInteger
(
p_input
,
p_access
->
p_parent
->
p_parent
->
i_object_id
,
"sout_sent_bytes"
,
&
i_total
);
stats_UpdateFloat
(
p_input
,
"sout_send_bitrate"
,
(
float
)
i_total
);
vlc_object_release
(
p_input
);
}
}
}
return
p_access
->
pf_write
(
p_access
,
p_buffer
);
return
p_access
->
pf_write
(
p_access
,
p_buffer
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment