Mercurial > mplayer.hg

comparison libmpdemux/librtsp/rtsp_session.c @ 18822:a48dead7424a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cosmetic changes to avoid constants redefinition
author ben
date Mon, 26 Jun 2006 17:27:38 +0000
parents e16345b97dab
children 317e0fd394c5
comparison
equal deleted inserted replaced
18821:ac61a42feb47 18822:a48dead7424a
51 51
52 /* 52 /*
53 #define LOG 53 #define LOG
54 */ 54 */
55 55
56 #define RTSP_OPTIONS_SERVER "Server"
57 #define RTSP_OPTIONS_LOCATION "Location"
58 #define RTSP_OPTIONS_REAL "RealChallenge1"
59 #define RTSP_SERVER_TYPE_REAL "Real"
60 #define RTSP_SERVER_TYPE_HELIX "Helix"
61 #define RTSP_SERVER_TYPE_UNKNOWN "unknown"
62
56 struct rtsp_session_s { 63 struct rtsp_session_s {
57 rtsp_t *s; 64 rtsp_t *s;
58 struct real_rtsp_session_t* real_session; 65 struct real_rtsp_session_t* real_session;
59 }; 66 };
60 67
81 free(rtsp_session); 88 free(rtsp_session);
82 return NULL; 89 return NULL;
83 } 90 }
84 91
85 /* looking for server type */ 92 /* looking for server type */
86 if (rtsp_search_answers(rtsp_session->s,"Server")) 93 if (rtsp_search_answers(rtsp_session->s,RTSP_OPTIONS_SERVER))
87 server=strdup(rtsp_search_answers(rtsp_session->s,"Server")); 94 server=strdup(rtsp_search_answers(rtsp_session->s,RTSP_OPTIONS_SERVER));
88 else { 95 else {
89 if (rtsp_search_answers(rtsp_session->s,"RealChallenge1")) 96 if (rtsp_search_answers(rtsp_session->s,RTSP_OPTIONS_REAL))
90 server=strdup("Real"); 97 server=strdup(RTSP_SERVER_TYPE_REAL);
91 else 98 else
92 server=strdup("unknown"); 99 server=strdup(RTSP_SERVER_TYPE_UNKNOWN);
93 } 100 }
94 if (strstr(server,"Real") || strstr(server,"Helix")) 101 if (strstr(server,RTSP_SERVER_TYPE_REAL) || strstr(server,RTSP_SERVER_TYPE_HELIX))
95 { 102 {
96 /* we are talking to a real server ... */ 103 /* we are talking to a real server ... */
97 104
98 h=real_setup_and_get_header(rtsp_session->s, bandwidth); 105 h=real_setup_and_get_header(rtsp_session->s, bandwidth);
99 if (!h) { 106 if (!h) {
100 /* got an redirect? */ 107 /* got an redirect? */
101 if (rtsp_search_answers(rtsp_session->s, "Location")) 108 if (rtsp_search_answers(rtsp_session->s, RTSP_OPTIONS_LOCATION))
102 { 109 {
103 free(mrl_line); 110 free(mrl_line);
104 mrl_line=strdup(rtsp_search_answers(rtsp_session->s, "Location")); 111 mrl_line=strdup(rtsp_search_answers(rtsp_session->s, RTSP_OPTIONS_LOCATION));
105 mp_msg (MSGT_OPEN, MSGL_INFO,"rtsp_session: redirected to %s\n", mrl_line); 112 mp_msg (MSGT_OPEN, MSGL_INFO,"rtsp_session: redirected to %s\n", mrl_line);
106 rtsp_close(rtsp_session->s); 113 rtsp_close(rtsp_session->s);
107 free(server); 114 free(server);
108 free(*mrl); 115 free(*mrl);
109 free(rtsp_session); 116 free(rtsp_session);