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
4107b41c
Commit
4107b41c
authored
Aug 22, 2007
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bunch of conformance fixes:
- "handle" Require header - return 459/460 when appropriate
parent
b60e4d34
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
24 additions
and
5 deletions
+24
-5
modules/stream_out/rtp.c
modules/stream_out/rtp.c
+24
-5
No files found.
modules/stream_out/rtp.c
View file @
4107b41c
...
@@ -1244,9 +1244,11 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
...
@@ -1244,9 +1244,11 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
if
(
id
->
p_rtsp_url
)
if
(
id
->
p_rtsp_url
)
{
{
httpd_UrlCatch
(
id
->
p_rtsp_url
,
HTTPD_MSG_DESCRIBE
,
RtspCallbackId
,
(
void
*
)
id
);
httpd_UrlCatch
(
id
->
p_rtsp_url
,
HTTPD_MSG_SETUP
,
RtspCallbackId
,
(
void
*
)
id
);
httpd_UrlCatch
(
id
->
p_rtsp_url
,
HTTPD_MSG_SETUP
,
RtspCallbackId
,
(
void
*
)
id
);
//httpd_UrlCatch( id->p_rtsp_url, HTTPD_MSG_PLAY, RtspCallback, (void*)p_stream );
httpd_UrlCatch
(
id
->
p_rtsp_url
,
HTTPD_MSG_PLAY
,
RtspCallbackId
,
(
void
*
)
id
);
//httpd_UrlCatch( id->p_rtsp_url, HTTPD_MSG_PAUSE, RtspCallback, (void*)p_stream );
httpd_UrlCatch
(
id
->
p_rtsp_url
,
HTTPD_MSG_PAUSE
,
RtspCallbackId
,
(
void
*
)
id
);
httpd_UrlCatch
(
id
->
p_rtsp_url
,
HTTPD_MSG_TEARDOWN
,
RtspCallbackId
,
(
void
*
)
id
);
}
}
}
}
...
@@ -1610,6 +1612,7 @@ static int RtspSetup( sout_stream_t *p_stream, vlc_url_t *url )
...
@@ -1610,6 +1612,7 @@ static int RtspSetup( sout_stream_t *p_stream, vlc_url_t *url )
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
}
}
httpd_UrlCatch
(
p_sys
->
p_rtsp_url
,
HTTPD_MSG_DESCRIBE
,
RtspCallback
,
(
void
*
)
p_stream
);
httpd_UrlCatch
(
p_sys
->
p_rtsp_url
,
HTTPD_MSG_DESCRIBE
,
RtspCallback
,
(
void
*
)
p_stream
);
httpd_UrlCatch
(
p_sys
->
p_rtsp_url
,
HTTPD_MSG_SETUP
,
RtspCallback
,
(
void
*
)
p_stream
);
httpd_UrlCatch
(
p_sys
->
p_rtsp_url
,
HTTPD_MSG_PLAY
,
RtspCallback
,
(
void
*
)
p_stream
);
httpd_UrlCatch
(
p_sys
->
p_rtsp_url
,
HTTPD_MSG_PLAY
,
RtspCallback
,
(
void
*
)
p_stream
);
httpd_UrlCatch
(
p_sys
->
p_rtsp_url
,
HTTPD_MSG_PAUSE
,
RtspCallback
,
(
void
*
)
p_stream
);
httpd_UrlCatch
(
p_sys
->
p_rtsp_url
,
HTTPD_MSG_PAUSE
,
RtspCallback
,
(
void
*
)
p_stream
);
httpd_UrlCatch
(
p_sys
->
p_rtsp_url
,
HTTPD_MSG_TEARDOWN
,
RtspCallback
,
(
void
*
)
p_stream
);
httpd_UrlCatch
(
p_sys
->
p_rtsp_url
,
HTTPD_MSG_TEARDOWN
,
RtspCallback
,
(
void
*
)
p_stream
);
...
@@ -1639,6 +1642,9 @@ static int RtspCallback( httpd_callback_sys_t *p_args,
...
@@ -1639,6 +1642,9 @@ static int RtspCallback( httpd_callback_sys_t *p_args,
answer
->
i_body
=
0
;
answer
->
i_body
=
0
;
answer
->
p_body
=
NULL
;
answer
->
p_body
=
NULL
;
if
(
httpd_MsgGet
(
query
,
"Require"
)
!=
NULL
)
answer
->
i_status
=
551
;
else
switch
(
query
->
i_type
)
switch
(
query
->
i_type
)
{
{
case
HTTPD_MSG_DESCRIBE
:
case
HTTPD_MSG_DESCRIBE
:
...
@@ -1646,13 +1652,17 @@ static int RtspCallback( httpd_callback_sys_t *p_args,
...
@@ -1646,13 +1652,17 @@ static int RtspCallback( httpd_callback_sys_t *p_args,
char
*
psz_sdp
=
SDPGenerate
(
p_stream
,
psz_destination
?
psz_destination
:
"0.0.0.0"
,
VLC_TRUE
);
char
*
psz_sdp
=
SDPGenerate
(
p_stream
,
psz_destination
?
psz_destination
:
"0.0.0.0"
,
VLC_TRUE
);
answer
->
i_status
=
200
;
answer
->
i_status
=
200
;
httpd_MsgAdd
(
answer
,
"Content-
t
ype"
,
"%s"
,
"application/sdp"
);
httpd_MsgAdd
(
answer
,
"Content-
T
ype"
,
"%s"
,
"application/sdp"
);
httpd_MsgAdd
(
answer
,
"Content-Base"
,
"%s"
,
p_sys
->
psz_rtsp_control
);
httpd_MsgAdd
(
answer
,
"Content-Base"
,
"%s"
,
p_sys
->
psz_rtsp_control
);
answer
->
p_body
=
(
uint8_t
*
)
psz_sdp
;
answer
->
p_body
=
(
uint8_t
*
)
psz_sdp
;
answer
->
i_body
=
strlen
(
psz_sdp
);
answer
->
i_body
=
strlen
(
psz_sdp
);
break
;
break
;
}
}
case
HTTPD_MSG_SETUP
:
answer
->
i_status
=
459
;
break
;
case
HTTPD_MSG_PLAY
:
case
HTTPD_MSG_PLAY
:
{
{
rtsp_client_t
*
rtsp
;
rtsp_client_t
*
rtsp
;
...
@@ -1688,9 +1698,12 @@ static int RtspCallback( httpd_callback_sys_t *p_args,
...
@@ -1688,9 +1698,12 @@ static int RtspCallback( httpd_callback_sys_t *p_args,
}
}
break
;
break
;
}
}
case
HTTPD_MSG_PAUSE
:
case
HTTPD_MSG_PAUSE
:
/* FIXME */
answer
->
i_status
=
405
;
return
VLC_EGENERIC
;
httpd_MsgAdd
(
answer
,
"Allow"
,
"DESCRIBE, PLAY, TEARDOWN"
);
break
;
case
HTTPD_MSG_TEARDOWN
:
case
HTTPD_MSG_TEARDOWN
:
{
{
rtsp_client_t
*
rtsp
;
rtsp_client_t
*
rtsp
;
...
@@ -1769,6 +1782,9 @@ static int RtspCallbackId( httpd_callback_sys_t *p_args,
...
@@ -1769,6 +1782,9 @@ static int RtspCallbackId( httpd_callback_sys_t *p_args,
answer
->
i_body
=
0
;
answer
->
i_body
=
0
;
answer
->
p_body
=
NULL
;
answer
->
p_body
=
NULL
;
if
(
httpd_MsgGet
(
query
,
"Require"
)
!=
NULL
)
answer
->
i_status
=
551
;
else
switch
(
query
->
i_type
)
switch
(
query
->
i_type
)
{
{
case
HTTPD_MSG_SETUP
:
case
HTTPD_MSG_SETUP
:
...
@@ -1864,6 +1880,9 @@ static int RtspCallbackId( httpd_callback_sys_t *p_args,
...
@@ -1864,6 +1880,9 @@ static int RtspCallbackId( httpd_callback_sys_t *p_args,
}
}
default:
default:
answer
->
i_status
=
460
;
break
;
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
}
}
...
...
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