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
fa8f4854
Commit
fa8f4854
authored
Oct 22, 2008
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cosmetic fixes
parent
c0d37c7c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
8 deletions
+8
-8
modules/demux/live555.cpp
modules/demux/live555.cpp
+8
-8
No files found.
modules/demux/live555.cpp
View file @
fa8f4854
...
@@ -528,10 +528,10 @@ createnew:
...
@@ -528,10 +528,10 @@ createnew:
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
}
}
/* Kasenna enables KeepAlive by analysing the User-Agent string.
/* Kasenna enables KeepAlive by analysing the User-Agent string.
* Appending _KA to the string should be enough to enable this feature,
* Appending _KA to the string should be enough to enable this feature,
* however, there is a bug where the _KA doesn't get parsed from the
* however, there is a bug where the _KA doesn't get parsed from the
* default User-Agent as created by VLC/Live555 code. This is probably due
* default User-Agent as created by VLC/Live555 code. This is probably due
* to spaces in the string or the string being too long. Here we override
* to spaces in the string or the string being too long. Here we override
* the default string with a more compact version.
* the default string with a more compact version.
*/
*/
...
@@ -1380,8 +1380,8 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
...
@@ -1380,8 +1380,8 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
}
}
/* When we Pause, we'll need the TimeoutPrevention thread to
/* When we Pause, we'll need the TimeoutPrevention thread to
* handle sending the "Keep Alive" message to the server.
* handle sending the "Keep Alive" message to the server.
* Unfortunately Live555 isn't thread safe and so can't
* Unfortunately Live555 isn't thread safe and so can't
* do this normally while the main Demux thread is handling
* do this normally while the main Demux thread is handling
* a live stream. We end up with the Timeout thread blocking
* a live stream. We end up with the Timeout thread blocking
* waiting for a response from the server. So when we PAUSE
* waiting for a response from the server. So when we PAUSE
...
@@ -1389,7 +1389,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
...
@@ -1389,7 +1389,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
* and if it's set, it will trigger the GET_PARAMETER message */
* and if it's set, it will trigger the GET_PARAMETER message */
if
(
b_bool
&&
p_sys
->
p_timeout
!=
NULL
)
if
(
b_bool
&&
p_sys
->
p_timeout
!=
NULL
)
p_sys
->
p_timeout
->
b_handle_keep_alive
=
true
;
p_sys
->
p_timeout
->
b_handle_keep_alive
=
true
;
else
if
(
!
b_bool
&&
p_sys
->
p_timeout
!=
NULL
)
else
if
(
!
b_bool
&&
p_sys
->
p_timeout
!=
NULL
)
p_sys
->
p_timeout
->
b_handle_keep_alive
=
false
;
p_sys
->
p_timeout
->
b_handle_keep_alive
=
false
;
for
(
i
=
0
;
!
b_bool
&&
i
<
p_sys
->
i_track
;
i
++
)
for
(
i
=
0
;
!
b_bool
&&
i
<
p_sys
->
i_track
;
i
++
)
...
@@ -1659,7 +1659,7 @@ static void StreamRead( void *p_private, unsigned int i_size,
...
@@ -1659,7 +1659,7 @@ static void StreamRead( void *p_private, unsigned int i_size,
/* Update our global npt value */
/* Update our global npt value */
if
(
tk
->
i_npt
>
0
&&
tk
->
i_npt
>
p_sys
->
i_npt
&&
tk
->
i_npt
<
p_sys
->
i_npt_length
)
if
(
tk
->
i_npt
>
0
&&
tk
->
i_npt
>
p_sys
->
i_npt
&&
tk
->
i_npt
<
p_sys
->
i_npt_length
)
p_sys
->
i_npt
=
tk
->
i_npt
;
p_sys
->
i_npt
=
tk
->
i_npt
;
if
(
!
tk
->
b_muxed
)
if
(
!
tk
->
b_muxed
)
{
{
...
...
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