Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
94f9d6e0
Commit
94f9d6e0
authored
Mar 01, 2011
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
RTP: skip reordering timer in case of TCP
parent
05c3deaf
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
1 deletion
+17
-1
modules/access/rtp/input.c
modules/access/rtp/input.c
+1
-1
modules/access/rtp/rtp.h
modules/access/rtp/rtp.h
+1
-0
modules/access/rtp/session.c
modules/access/rtp/session.c
+15
-0
No files found.
modules/access/rtp/input.c
View file @
94f9d6e0
...
@@ -163,7 +163,6 @@ void *rtp_stream_thread (void *opaque)
...
@@ -163,7 +163,6 @@ void *rtp_stream_thread (void *opaque)
for
(;;)
for
(;;)
{
{
/* There is no reordering on stream sockets, so no timeout. */
/* There is no reordering on stream sockets, so no timeout. */
/* FIXME: hack rtp_dequeue() to skip the reordering/timer */
ssize_t
val
;
ssize_t
val
;
uint16_t
frame_len
;
uint16_t
frame_len
;
...
@@ -186,6 +185,7 @@ void *rtp_stream_thread (void *opaque)
...
@@ -186,6 +185,7 @@ void *rtp_stream_thread (void *opaque)
int
canc
=
vlc_savecancel
();
int
canc
=
vlc_savecancel
();
rtp_process
(
demux
,
block
);
rtp_process
(
demux
,
block
);
rtp_dequeue_force
(
demux
,
sys
->
session
);
vlc_restorecancel
(
canc
);
vlc_restorecancel
(
canc
);
}
}
#else
#else
...
...
modules/access/rtp/rtp.h
View file @
94f9d6e0
...
@@ -52,6 +52,7 @@ rtp_session_t *rtp_session_create (demux_t *);
...
@@ -52,6 +52,7 @@ rtp_session_t *rtp_session_create (demux_t *);
void
rtp_session_destroy
(
demux_t
*
,
rtp_session_t
*
);
void
rtp_session_destroy
(
demux_t
*
,
rtp_session_t
*
);
void
rtp_queue
(
demux_t
*
,
rtp_session_t
*
,
block_t
*
);
void
rtp_queue
(
demux_t
*
,
rtp_session_t
*
,
block_t
*
);
bool
rtp_dequeue
(
demux_t
*
,
const
rtp_session_t
*
,
mtime_t
*
);
bool
rtp_dequeue
(
demux_t
*
,
const
rtp_session_t
*
,
mtime_t
*
);
void
rtp_dequeue_force
(
demux_t
*
,
const
rtp_session_t
*
);
int
rtp_add_type
(
demux_t
*
demux
,
rtp_session_t
*
ses
,
const
rtp_pt_t
*
pt
);
int
rtp_add_type
(
demux_t
*
demux
,
rtp_session_t
*
ses
,
const
rtp_pt_t
*
pt
);
void
*
rtp_dgram_thread
(
void
*
data
);
void
*
rtp_dgram_thread
(
void
*
data
);
...
...
modules/access/rtp/session.c
View file @
94f9d6e0
...
@@ -461,6 +461,21 @@ bool rtp_dequeue (demux_t *demux, const rtp_session_t *session,
...
@@ -461,6 +461,21 @@ bool rtp_dequeue (demux_t *demux, const rtp_session_t *session,
return
pending
;
return
pending
;
}
}
/**
* Dequeues all RTP packets and pass them to decoder. Not cancellation-safe(?).
* This function can be used when the packet source is known not to reorder.
*/
void
rtp_dequeue_force
(
demux_t
*
demux
,
const
rtp_session_t
*
session
)
{
for
(
unsigned
i
=
0
,
max
=
session
->
srcc
;
i
<
max
;
i
++
)
{
rtp_source_t
*
src
=
session
->
srcv
[
i
];
block_t
*
block
;
while
(((
block
=
src
->
blocks
))
!=
NULL
)
rtp_decode
(
demux
,
session
,
src
);
}
}
/**
/**
* Decodes one RTP packet.
* Decodes one RTP packet.
...
...
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