Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
15799211
Commit
15799211
authored
Dec 15, 2010
by
Pierre Ynard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rtsp: track muting support
parent
e054f6f0
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
55 additions
and
31 deletions
+55
-31
modules/stream_out/rtsp.c
modules/stream_out/rtsp.c
+55
-31
No files found.
modules/stream_out/rtsp.c
View file @
15799211
...
@@ -200,10 +200,9 @@ struct rtsp_strack_t
...
@@ -200,10 +200,9 @@ struct rtsp_strack_t
rtsp_stream_id_t
*
id
;
rtsp_stream_id_t
*
id
;
sout_stream_id_t
*
sout_id
;
sout_stream_id_t
*
sout_id
;
int
setup_fd
;
/* socket created by the SETUP request */
int
setup_fd
;
/* socket created by the SETUP request */
int
rtp_fd
;
/* socket used by the RTP output
*/
int
rtp_fd
;
/* socket used by the RTP output, when playing
*/
uint32_t
ssrc
;
uint32_t
ssrc
;
uint16_t
seq_init
;
uint16_t
seq_init
;
bool
playing
;
};
};
static
void
RtspTrackClose
(
rtsp_strack_t
*
tr
);
static
void
RtspTrackClose
(
rtsp_strack_t
*
tr
);
...
@@ -415,6 +414,19 @@ static void RtspClientAlive( rtsp_session_t *session )
...
@@ -415,6 +414,19 @@ static void RtspClientAlive( rtsp_session_t *session )
RtspUpdateTimer
(
session
->
stream
);
RtspUpdateTimer
(
session
->
stream
);
}
}
static
int
dup_socket
(
int
oldfd
)
{
int
newfd
;
#if !defined(WIN32) || defined(UNDER_CE)
newfd
=
vlc_dup
(
oldfd
);
#else
WSAPROTOCOL_INFO
info
;
WSADuplicateSocket
(
oldfd
,
GetCurrentProcessId
(),
&
info
);
newfd
=
WSASocket
(
info
.
iAddressFamily
,
info
.
iSocketType
,
info
.
iProtocol
,
&
info
,
0
,
0
);
#endif
return
newfd
;
}
/* Attach a starting VoD RTP id to its RTSP track, and let it
/* Attach a starting VoD RTP id to its RTSP track, and let it
* initialize with the parameters of the SETUP request */
* initialize with the parameters of the SETUP request */
...
@@ -436,31 +448,21 @@ int RtspTrackAttach( rtsp_stream_t *rtsp, const char *name,
...
@@ -436,31 +448,21 @@ int RtspTrackAttach( rtsp_stream_t *rtsp, const char *name,
rtsp_strack_t
*
tr
=
session
->
trackv
+
i
;
rtsp_strack_t
*
tr
=
session
->
trackv
+
i
;
if
(
tr
->
id
==
id
)
if
(
tr
->
id
==
id
)
{
{
int
rtp_fd
;
tr
->
rtp_fd
=
dup_socket
(
tr
->
setup_fd
);
#if !defined(WIN32) || defined(UNDER_CE)
if
(
tr
->
rtp_fd
==
-
1
)
rtp_fd
=
vlc_dup
(
tr
->
setup_fd
);
#else
WSAPROTOCOL_INFO
info
;
WSADuplicateSocket
(
tr
->
setup_fd
,
GetCurrentProcessId
(),
&
info
);
rtp_fd
=
WSASocket
(
info
.
iAddressFamily
,
info
.
iSocketType
,
info
.
iProtocol
,
&
info
,
0
,
0
);
#endif
if
(
rtp_fd
==
-
1
)
break
;
break
;
tr
->
sout_id
=
sout_id
;
uint16_t
seq
;
uint16_t
seq
;
*
ssrc
=
ntohl
(
tr
->
ssrc
);
*
ssrc
=
ntohl
(
tr
->
ssrc
);
*
seq_init
=
tr
->
seq_init
;
*
seq_init
=
tr
->
seq_init
;
rtp_add_sink
(
sout_id
,
rtp_fd
,
false
,
&
seq
);
rtp_add_sink
(
tr
->
sout_id
,
tr
->
rtp_fd
,
false
,
&
seq
);
/* To avoid race conditions, sout_id->i_seq_sent_next must
/* To avoid race conditions, sout_id->i_seq_sent_next must
* be set here and now. Make sure the caller did its job
* be set here and now. Make sure the caller did its job
* properly when passing seq_init. */
* properly when passing seq_init. */
assert
(
tr
->
seq_init
==
seq
);
assert
(
tr
->
seq_init
==
seq
);
tr
->
rtp_fd
=
rtp_fd
;
tr
->
sout_id
=
sout_id
;
tr
->
playing
=
true
;
val
=
VLC_SUCCESS
;
val
=
VLC_SUCCESS
;
break
;
break
;
}
}
...
@@ -490,8 +492,8 @@ void RtspTrackDetach( rtsp_stream_t *rtsp, const char *name,
...
@@ -490,8 +492,8 @@ void RtspTrackDetach( rtsp_stream_t *rtsp, const char *name,
if
(
tr
->
sout_id
==
sout_id
)
if
(
tr
->
sout_id
==
sout_id
)
{
{
tr
->
sout_id
=
NULL
;
tr
->
sout_id
=
NULL
;
tr
->
playing
=
false
;
rtp_del_sink
(
sout_id
,
tr
->
rtp_fd
);
rtp_del_sink
(
sout_id
,
tr
->
rtp_fd
);
tr
->
rtp_fd
=
-
1
;
break
;
break
;
}
}
}
}
...
@@ -504,10 +506,8 @@ out:
...
@@ -504,10 +506,8 @@ out:
/** rtsp must be locked */
/** rtsp must be locked */
static
void
RtspTrackClose
(
rtsp_strack_t
*
tr
)
static
void
RtspTrackClose
(
rtsp_strack_t
*
tr
)
{
{
if
(
tr
->
sout_id
!=
NULL
)
if
(
tr
->
rtp_fd
!=
-
1
)
rtp_del_sink
(
tr
->
sout_id
,
tr
->
rtp_fd
);
rtp_del_sink
(
tr
->
sout_id
,
tr
->
rtp_fd
);
/* rtp_fd is duplicated from setup_fd only in VoD mode. */
if
(
tr
->
id
->
stream
->
vod_media
!=
NULL
)
net_Close
(
tr
->
setup_fd
);
net_Close
(
tr
->
setup_fd
);
}
}
...
@@ -800,7 +800,7 @@ static int RtspHandler( rtsp_stream_t *rtsp, rtsp_stream_id_t *id,
...
@@ -800,7 +800,7 @@ static int RtspHandler( rtsp_stream_t *rtsp, rtsp_stream_id_t *id,
net_GetSockAddress
(
fd
,
src
,
&
sport
);
net_GetSockAddress
(
fd
,
src
,
&
sport
);
rtsp_strack_t
track
=
{
.
id
=
id
,
.
sout_id
=
id
->
sout_id
,
rtsp_strack_t
track
=
{
.
id
=
id
,
.
sout_id
=
id
->
sout_id
,
.
setup_fd
=
fd
,
.
playing
=
false
};
.
setup_fd
=
fd
,
.
rtp_fd
=
-
1
};
if
(
vod
)
if
(
vod
)
{
{
...
@@ -809,10 +809,7 @@ static int RtspHandler( rtsp_stream_t *rtsp, rtsp_stream_id_t *id,
...
@@ -809,10 +809,7 @@ static int RtspHandler( rtsp_stream_t *rtsp, rtsp_stream_id_t *id,
ssrc
=
track
.
ssrc
;
ssrc
=
track
.
ssrc
;
}
}
else
else
{
track
.
rtp_fd
=
track
.
setup_fd
;
ssrc
=
id
->
ssrc
;
ssrc
=
id
->
ssrc
;
}
vlc_mutex_lock
(
&
rtsp
->
lock
);
vlc_mutex_lock
(
&
rtsp
->
lock
);
if
(
psz_session
==
NULL
)
if
(
psz_session
==
NULL
)
...
@@ -938,7 +935,7 @@ static int RtspHandler( rtsp_stream_t *rtsp, rtsp_stream_id_t *id,
...
@@ -938,7 +935,7 @@ static int RtspHandler( rtsp_stream_t *rtsp, rtsp_stream_id_t *id,
if
(
(
id
==
NULL
)
||
(
tr
->
id
==
id
)
)
if
(
(
id
==
NULL
)
||
(
tr
->
id
==
id
)
)
{
{
uint16_t
seq
;
uint16_t
seq
;
if
(
!
tr
->
playing
)
if
(
tr
->
rtp_fd
==
-
1
)
{
{
if
(
vod
)
if
(
vod
)
/* TODO: if the RTP stream output is already
/* TODO: if the RTP stream output is already
...
@@ -948,7 +945,10 @@ static int RtspHandler( rtsp_stream_t *rtsp, rtsp_stream_id_t *id,
...
@@ -948,7 +945,10 @@ static int RtspHandler( rtsp_stream_t *rtsp, rtsp_stream_id_t *id,
seq
=
tr
->
seq_init
;
seq
=
tr
->
seq_init
;
else
else
{
{
tr
->
playing
=
true
;
tr
->
rtp_fd
=
dup_socket
(
tr
->
setup_fd
);
if
(
tr
->
rtp_fd
==
-
1
)
continue
;
rtp_add_sink
(
tr
->
sout_id
,
tr
->
rtp_fd
,
rtp_add_sink
(
tr
->
sout_id
,
tr
->
rtp_fd
,
false
,
&
seq
);
false
,
&
seq
);
}
}
...
@@ -1000,7 +1000,7 @@ static int RtspHandler( rtsp_stream_t *rtsp, rtsp_stream_id_t *id,
...
@@ -1000,7 +1000,7 @@ static int RtspHandler( rtsp_stream_t *rtsp, rtsp_stream_id_t *id,
case
HTTPD_MSG_PAUSE
:
case
HTTPD_MSG_PAUSE
:
{
{
if
(
!
vod
)
if
(
id
==
NULL
&&
!
vod
)
{
{
answer
->
i_status
=
405
;
answer
->
i_status
=
405
;
httpd_MsgAdd
(
answer
,
"Allow"
,
httpd_MsgAdd
(
answer
,
"Allow"
,
...
@@ -1016,7 +1016,31 @@ static int RtspHandler( rtsp_stream_t *rtsp, rtsp_stream_id_t *id,
...
@@ -1016,7 +1016,31 @@ static int RtspHandler( rtsp_stream_t *rtsp, rtsp_stream_id_t *id,
ses
=
RtspClientGet
(
rtsp
,
psz_session
);
ses
=
RtspClientGet
(
rtsp
,
psz_session
);
if
(
ses
!=
NULL
)
if
(
ses
!=
NULL
)
{
{
if
(
id
==
NULL
)
{
if
(
vod
)
vod_pause
(
rtsp
->
vod_media
,
psz_session
);
vod_pause
(
rtsp
->
vod_media
,
psz_session
);
}
else
/* "Mute" the selected track */
{
bool
found
=
false
;
for
(
int
i
=
0
;
i
<
ses
->
trackc
;
i
++
)
{
rtsp_strack_t
*
tr
=
ses
->
trackv
+
i
;;
if
(
tr
->
id
==
id
)
{
if
(
tr
->
rtp_fd
!=
-
1
)
{
rtp_del_sink
(
tr
->
sout_id
,
tr
->
rtp_fd
);
tr
->
rtp_fd
=
-
1
;
}
found
=
true
;
break
;
}
}
if
(
!
found
)
answer
->
i_status
=
455
;
}
RtspClientAlive
(
ses
);
RtspClientAlive
(
ses
);
}
}
vlc_mutex_unlock
(
&
rtsp
->
lock
);
vlc_mutex_unlock
(
&
rtsp
->
lock
);
...
...
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