Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
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-1.1
Commits
88b8f599
Commit
88b8f599
authored
Feb 23, 2004
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* livedotcom.cpp: a fix + a nasty hack that should fix playback of streams
using weird value after a synch with RTCP.
parent
a6f71ffa
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
26 additions
and
2 deletions
+26
-2
modules/demux/livedotcom.cpp
modules/demux/livedotcom.cpp
+26
-2
No files found.
modules/demux/livedotcom.cpp
View file @
88b8f599
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* live.cpp : live.com support.
* live.cpp : live.com support.
*****************************************************************************
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* Copyright (C) 2003 VideoLAN
* $Id: livedotcom.cpp,v 1.1
5 2004/02/22 16:01
:42 fenrir Exp $
* $Id: livedotcom.cpp,v 1.1
6 2004/02/23 20:35
:42 fenrir Exp $
*
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
*
...
@@ -106,6 +106,7 @@ typedef struct
...
@@ -106,6 +106,7 @@ typedef struct
RTPSource
*
rtpSource
;
RTPSource
*
rtpSource
;
FramedSource
*
readSource
;
FramedSource
*
readSource
;
vlc_bool_t
b_rtcp_sync
;
uint8_t
buffer
[
65536
];
uint8_t
buffer
[
65536
];
...
@@ -500,6 +501,7 @@ static int DemuxOpen ( vlc_object_t *p_this )
...
@@ -500,6 +501,7 @@ static int DemuxOpen ( vlc_object_t *p_this )
tk
->
waiting
=
0
;
tk
->
waiting
=
0
;
tk
->
i_pts
=
0
;
tk
->
i_pts
=
0
;
tk
->
b_quicktime
=
VLC_FALSE
;
tk
->
b_quicktime
=
VLC_FALSE
;
tk
->
b_rtcp_sync
=
VLC_FALSE
;
/* Value taken from mplayer */
/* Value taken from mplayer */
if
(
!
strcmp
(
sub
->
mediumName
(),
"audio"
)
)
if
(
!
strcmp
(
sub
->
mediumName
(),
"audio"
)
)
...
@@ -788,6 +790,25 @@ static int Demux ( input_thread_t *p_input )
...
@@ -788,6 +790,25 @@ static int Demux ( input_thread_t *p_input )
/* remove the task */
/* remove the task */
p_sys
->
scheduler
->
unscheduleDelayedTask
(
task
);
p_sys
->
scheduler
->
unscheduleDelayedTask
(
task
);
/* Check for gap in pts value */
for
(
i
=
0
;
i
<
p_sys
->
i_track
;
i
++
)
{
live_track_t
*
tk
=
p_sys
->
track
[
i
];
if
(
!
tk
->
b_rtcp_sync
&&
tk
->
rtpSource
->
hasBeenSynchronizedUsingRTCP
()
)
{
msg_Dbg
(
p_input
,
"tk->rtpSource->hasBeenSynchronizedUsingRTCP()"
);
p_input
->
stream
.
p_selected_program
->
i_synchro_state
=
SYNCHRO_REINIT
;
tk
->
b_rtcp_sync
=
VLC_TRUE
;
/* reset PCR and PCR start, mmh won't work well for multi-stream I fear */
tk
->
i_pts
=
0
;
p_sys
->
i_pcr_start
=
0
;
p_sys
->
i_pcr
=
0
;
i_pcr
=
0
;
}
}
return
p_input
->
b_error
?
0
:
1
;
return
p_input
->
b_error
?
0
:
1
;
}
}
...
@@ -867,7 +888,10 @@ static void StreamRead( void *p_private, unsigned int i_size, struct timeval pts
...
@@ -867,7 +888,10 @@ static void StreamRead( void *p_private, unsigned int i_size, struct timeval pts
demux_sys_t
*
p_sys
=
p_input
->
p_demux_data
;
demux_sys_t
*
p_sys
=
p_input
->
p_demux_data
;
block_t
*
p_block
;
block_t
*
p_block
;
mtime_t
i_pts
=
(
mtime_t
)
pts
.
tv_sec
*
1000000LL
+
(
mtime_t
)
pts
.
tv_usec
;
mtime_t
i_pts
=
(
uint64_t
)
pts
.
tv_sec
*
1000000ULL
+
(
uint64_t
)
pts
.
tv_usec
;
/* XXX Beurk beurk beurk Avoid having negative value XXX */
i_pts
&=
0x00ffffffffffffffULL
;
if
(
tk
->
b_quicktime
&&
tk
->
p_es
==
NULL
)
if
(
tk
->
b_quicktime
&&
tk
->
p_es
==
NULL
)
{
{
...
...
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