RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-13 18:55:08 +00:00
Code Issues Projects Releases Wiki Activity

Use rt->control_uri consequently instead of s->filename in all RTSP commands

Browse Source 
Originally committed as revision 22403 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Martin Storsjö 2010-03-09 16:04:41 +00:00
parent 28e5130b5f
commit db76ca7f35
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/rtsp.c
View File

@ -1300,7 +1300,7 @@ static int rtsp_setup_input_streams(AVFormatContext *s)
snprintf(cmd, sizeof(cmd), snprintf(cmd, sizeof(cmd),
"DESCRIBE %s RTSP/1.0\r\n" "DESCRIBE %s RTSP/1.0\r\n"
"Accept: application/sdp\r\n", "Accept: application/sdp\r\n",
s->filename); rt->control_uri);
if (rt->server_type == RTSP_SERVER_REAL) { if (rt->server_type == RTSP_SERVER_REAL) {
/** /**
* The Require: attribute is needed for proper streaming from * The Require: attribute is needed for proper streaming from
@ -1339,7 +1339,7 @@ static int rtsp_setup_output_streams(AVFormatContext *s)
snprintf(cmd, sizeof(cmd), snprintf(cmd, sizeof(cmd),
"ANNOUNCE %s RTSP/1.0\r\n" "ANNOUNCE %s RTSP/1.0\r\n"
"Content-Type: application/sdp\r\n", "Content-Type: application/sdp\r\n",
s->filename); rt->control_uri);
sdp = av_mallocz(8192); sdp = av_mallocz(8192);
if (sdp == NULL) if (sdp == NULL)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
@ -1366,7 +1366,7 @@ static int rtsp_setup_output_streams(AVFormatContext *s)
st->priv_data = rtsp_st; st->priv_data = rtsp_st;
rtsp_st->stream_index = i; rtsp_st->stream_index = i;
av_strlcpy(rtsp_st->control_url, s->filename, sizeof(rtsp_st->control_url)); av_strlcpy(rtsp_st->control_url, rt->control_uri, sizeof(rtsp_st->control_url));
/* Note, this must match the relative uri set in the sdp content */ /* Note, this must match the relative uri set in the sdp content */
av_strlcatf(rtsp_st->control_url, sizeof(rtsp_st->control_url), av_strlcatf(rtsp_st->control_url, sizeof(rtsp_st->control_url),
"/streamid=%d", i); "/streamid=%d", i);
@ -1469,7 +1469,7 @@ redirect:
sizeof(rt->control_uri)); sizeof(rt->control_uri));
for (rt->server_type = RTSP_SERVER_RTP;;) { for (rt->server_type = RTSP_SERVER_RTP;;) {
snprintf(cmd, sizeof(cmd), snprintf(cmd, sizeof(cmd),
"OPTIONS %s RTSP/1.0\r\n", s->filename); "OPTIONS %s RTSP/1.0\r\n", rt->control_uri);
if (rt->server_type == RTSP_SERVER_REAL) if (rt->server_type == RTSP_SERVER_REAL)
av_strlcat(cmd, av_strlcat(cmd,
/** /**
@ -1890,7 +1890,7 @@ static int rtsp_read_close(AVFormatContext *s)
#endif #endif
snprintf(cmd, sizeof(cmd), snprintf(cmd, sizeof(cmd),
"TEARDOWN %s RTSP/1.0\r\n", "TEARDOWN %s RTSP/1.0\r\n",
s->filename); rt->control_uri);
ff_rtsp_send_cmd_async(s, cmd); ff_rtsp_send_cmd_async(s, cmd);
ff_rtsp_close_streams(s); ff_rtsp_close_streams(s);

4
libavformat/rtspenc.c
View File

@ -37,7 +37,7 @@ static int rtsp_write_record(AVFormatContext *s)
snprintf(cmd, sizeof(cmd), snprintf(cmd, sizeof(cmd),
"RECORD %s RTSP/1.0\r\n" "RECORD %s RTSP/1.0\r\n"
"Range: npt=%0.3f-\r\n", "Range: npt=%0.3f-\r\n",
s->filename, rt->control_uri,
(double) 0); (double) 0);
ff_rtsp_send_cmd(s, cmd, reply, NULL); ff_rtsp_send_cmd(s, cmd, reply, NULL);
if (reply->status_code != RTSP_STATUS_OK) if (reply->status_code != RTSP_STATUS_OK)
@ -111,7 +111,7 @@ static int rtsp_write_close(AVFormatContext *s)
snprintf(cmd, sizeof(cmd), snprintf(cmd, sizeof(cmd),
"TEARDOWN %s RTSP/1.0\r\n", "TEARDOWN %s RTSP/1.0\r\n",
s->filename); rt->control_uri);
ff_rtsp_send_cmd_async(s, cmd); ff_rtsp_send_cmd_async(s, cmd);
ff_rtsp_close_streams(s); ff_rtsp_close_streams(s);