git.videolan.org
/
vlc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
livehttp: simplify checks
[vlc.git]
/
modules
/
access_output
/
livehttp.c
diff --git
a/modules/access_output/livehttp.c
b/modules/access_output/livehttp.c
index
faf8f49
..
a6f4c9b
100644
(file)
--- a/
modules/access_output/livehttp.c
+++ b/
modules/access_output/livehttp.c
@@
-903,8
+903,8
@@
static int CheckSegmentChange( sout_access_out_t *p_access, block_t *p_buffer )
block_t *output = p_sys->block_buffer;
if( p_sys->i_handle > 0 &&
block_t *output = p_sys->block_buffer;
if( p_sys->i_handle > 0 &&
-
(
( p_buffer->i_dts - p_sys->i_opendts +
- ( p_buffer->i_length * CLOCK_FREQ / INT64_C(1000000) )
+
(
( p_buffer->i_dts - p_sys->i_opendts +
+ p_buffer->i_length
) >= p_sys->i_seglenm ) )
{
closeCurrentSegment( p_access, p_sys, false );
) >= p_sys->i_seglenm ) )
{
closeCurrentSegment( p_access, p_sys, false );
@@
-972,8
+972,8
@@
static ssize_t writeSegment( sout_access_out_t *p_access )
}
p_sys->f_seglen =
}
p_sys->f_seglen =
- (float)(output->i_length
/ INT64_C(1000000) )
+
-
(float)(
output->i_dts - p_sys->i_opendts) / CLOCK_FREQ;
+ (float)(output->i_length
+ p_sys->i_dts_offset
+
+
output->i_dts - p_sys->i_opendts) / CLOCK_FREQ;
if ( (size_t)val >= output->i_buffer )
{
if ( (size_t)val >= output->i_buffer )
{