ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-19 21:06:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use the "server" RTSP field to detect whether the server that we're talking

Browse Source 
to is a Microsoft Windows Media Server (the field will be "WMServer/version").
See "[PATCH] RTSP-MS 3/15: Add Windows Media Server type" thread on
mailinglist.

Originally committed as revision 16472 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Ronald S. Bultje 2009-01-07 14:55:47 +00:00
parent 74272b1c0c
commit 7a86bafa20
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/rtsp.c
View File

@ -688,6 +688,9 @@ void rtsp_parse_line(RTSPHeader *reply, const char *buf)
} else if (av_stristart(p, "RealChallenge1:", &p)) {
skip_spaces(&p);
av_strlcpy(reply->real_challenge, p, sizeof(reply->real_challenge));
} else if (av_stristart(p, "Server:", &p)) {
skip_spaces(&p);
av_strlcpy(reply->server, p, sizeof(reply->server));
}
}
@ -1123,6 +1126,8 @@ static int rtsp_read_header(AVFormatContext *s,
if (rt->server_type != RTSP_SERVER_REAL && reply->real_challenge[0]) {
rt->server_type = RTSP_SERVER_REAL;
continue;
} else if (!strncasecmp(reply->server, "WMServer/", 9)) {
rt->server_type = RTSP_SERVER_WMS;
} else if (rt->server_type == RTSP_SERVER_REAL) {
strcpy(real_challenge, reply->real_challenge);
}

2
libavformat/rtsp.h
View File

@ -66,6 +66,7 @@ typedef struct RTSPHeader {
int seq; /**< sequence number */
char session_id[512];
char real_challenge[64]; /**< the RealChallenge1 field from the server */
char server[64];
} RTSPHeader;
enum RTSPClientState {
@ -77,6 +78,7 @@ enum RTSPClientState {
enum RTSPServerType {
RTSP_SERVER_RTP, /*< Standard-compliant RTP-server */
RTSP_SERVER_REAL, /*< Realmedia-style server */
RTSP_SERVER_WMS, /*< Windows Media server */
RTSP_SERVER_LAST
};