virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

rtsp: Pass RTSPState to ff_rtsp_parse_line, instead of HTTPAuthState

Browse Source 
This allows ff_rtsp_parse_line to do more changes directly in RTSPState
when parsing the reply, instead of having to store large amounts of
temporary data in RTSPMessageHeader.

Originally committed as revision 26190 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Martin Storsjö 2011-01-02 10:07:56 +00:00
parent 3df54c6bf2
commit acc9ed1450
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/rtsp.c
View File

@ -685,7 +685,7 @@ static void rtsp_parse_transport(RTSPMessageHeader *reply, const char *p)
}
void ff_rtsp_parse_line(RTSPMessageHeader *reply, const char *buf,
HTTPAuthState *auth_state)
RTSPState *rt)
{
const char *p;
@ -718,12 +718,12 @@ void ff_rtsp_parse_line(RTSPMessageHeader *reply, const char *buf,
} else if (av_stristart(p, "Location:", &p)) {
p += strspn(p, SPACE_CHARS);
av_strlcpy(reply->location, p , sizeof(reply->location));
} else if (av_stristart(p, "WWW-Authenticate:", &p) && auth_state) {
} else if (av_stristart(p, "WWW-Authenticate:", &p) && rt) {
p += strspn(p, SPACE_CHARS);
ff_http_auth_handle_header(auth_state, "WWW-Authenticate", p);
} else if (av_stristart(p, "Authentication-Info:", &p) && auth_state) {
ff_http_auth_handle_header(&rt->auth_state, "WWW-Authenticate", p);
} else if (av_stristart(p, "Authentication-Info:", &p) && rt) {
p += strspn(p, SPACE_CHARS);
ff_http_auth_handle_header(auth_state, "Authentication-Info", p);
ff_http_auth_handle_header(&rt->auth_state, "Authentication-Info", p);
} else if (av_stristart(p, "Content-Base:", &p)) {
p += strspn(p, SPACE_CHARS);
av_strlcpy(reply->content_base, p , sizeof(reply->content_base));
@ -808,7 +808,7 @@ int ff_rtsp_read_reply(AVFormatContext *s, RTSPMessageHeader *reply,
reply->status_code = atoi(buf1);
av_strlcpy(reply->reason, p, sizeof(reply->reason));
} else {
ff_rtsp_parse_line(reply, p, &rt->auth_state);
ff_rtsp_parse_line(reply, p, rt);
av_strlcat(rt->last_reply, p, sizeof(rt->last_reply));
av_strlcat(rt->last_reply, "\n", sizeof(rt->last_reply));
}

2
libavformat/rtsp.h
View File

@ -353,7 +353,7 @@ typedef struct RTSPStream {
} RTSPStream;
void ff_rtsp_parse_line(RTSPMessageHeader *reply, const char *buf,
HTTPAuthState *auth_state);
RTSPState *rt);
extern int rtsp_rtp_port_min;
extern int rtsp_rtp_port_max;