[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[573] mplayerxp/libmpstream2
Brought to you by:
olov
Menu
▾
▴
[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[573] mplayerxp/libmpstream2
|
From: <nic...@us...> - 2012-12-18 15:10:04
|
Revision: 573
http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=573&view=rev
Author: nickols_k
Date: 2012-12-18 15:09:54 +0000 (Tue, 18 Dec 2012)
Log Message:
-----------
convert librtsp into classes
Modified Paths:
--------------
mplayerxp/libmpstream2/librtsp/rtsp.cpp
mplayerxp/libmpstream2/librtsp/rtsp.h
mplayerxp/libmpstream2/librtsp/rtsp_rtp.cpp
mplayerxp/libmpstream2/librtsp/rtsp_rtp.h
mplayerxp/libmpstream2/librtsp/rtsp_session.cpp
mplayerxp/libmpstream2/librtsp/rtsp_session.h
mplayerxp/libmpstream2/network_real_rtsp.cpp
mplayerxp/libmpstream2/network_rtsp.cpp
mplayerxp/libmpstream2/realrtsp/real.cpp
mplayerxp/libmpstream2/realrtsp/real.h
Modified: mplayerxp/libmpstream2/librtsp/rtsp.cpp
===================================================================
--- mplayerxp/libmpstream2/librtsp/rtsp.cpp 2012-12-18 13:04:29 UTC (rev 572)
+++ mplayerxp/libmpstream2/librtsp/rtsp.cpp 2012-12-18 15:09:54 UTC (rev 573)
@@ -60,34 +60,14 @@
#include "osdep/timer.h"
#include "stream_msg.h"
+namespace mpxp {
/*
#define LOG
*/
-#define BUF_SIZE 4096
-#define HEADER_SIZE 1024
-#define MAX_FIELDS 256
-
-struct rtsp_t {
-
- Tcp* tcp;
-
- const char* host;
- int port;
- const char* path;
- const char* param;
- char* mrl;
- const char* user_agent;
-
- const char* server;
- unsigned server_state;
- uint32_t server_caps;
-
- unsigned cseq;
- const char* session;
-
- char* answers[MAX_FIELDS]; /* data of last message */
- char* scheduled[MAX_FIELDS]; /* will be sent with next message */
+enum {
+ BUF_SIZE=4096,
+ HEADER_SIZE=1024
};
/*
@@ -97,28 +77,43 @@
#define RTSP_PROTOCOL_VERSION "RTSP/1.0"
/* server states */
-#define RTSP_CONNECTED 1
-#define RTSP_INIT 2
-#define RTSP_READY 4
-#define RTSP_PLAYING 8
-#define RTSP_RECORDING 16
+enum {
+ RTSP_CONNECTED=1,
+ RTSP_INIT=2,
+ RTSP_READY=4,
+ RTSP_PLAYING=8,
+ RTSP_RECORDING=16
+};
/* server capabilities */
-#define RTSP_OPTIONS 0x001
-#define RTSP_DESCRIBE 0x002
-#define RTSP_ANNOUNCE 0x004
-#define RTSP_SETUP 0x008
-#define RTSP_GET_PARAMETER 0x010
-#define RTSP_SET_PARAMETER 0x020
-#define RTSP_TEARDOWN 0x040
-#define RTSP_PLAY 0x080
-#define RTSP_RECORD 0x100
+enum {
+ RTSP_OPTIONS=0x001,
+ RTSP_DESCRIBE=0x002,
+ RTSP_ANNOUNCE=0x004,
+ RTSP_SETUP=0x008,
+ RTSP_GET_PARAMETER=0x010,
+ RTSP_SET_PARAMETER=0x020,
+ RTSP_TEARDOWN=0x040,
+ RTSP_PLAY=0x080,
+ RTSP_RECORD=0x100
+};
+Rtsp::Rtsp(Tcp& _tcp):tcp(_tcp) {}
+Rtsp::~Rtsp() {
+ if (path) delete path;
+ if (host) delete host;
+ if (mrl) delete mrl;
+ if (session) delete session;
+ if (user_agent) delete user_agent;
+ free_answers();
+ unschedule_all();
+}
+
/*
* network utilities
*/
-static int write_stream(Tcp& tcp, const char *buf, int len) {
+int Rtsp::write_stream(const char *buf, int len) const {
int total, timeout;
total = 0; timeout = 30;
@@ -144,13 +139,13 @@
return total;
}
-static ssize_t read_stream(Tcp& tcp, any_t*buf, size_t count) {
+ssize_t Rtsp::read_stream(any_t*buf, size_t count) const {
ssize_t ret, total;
total = 0;
- while (total < count) {
+ while (total < ssize_t(count)) {
ret=tcp.read(((uint8_t*)buf)+total, count-total);
@@ -171,211 +166,193 @@
* and returns a null terminated string.
*/
-static char *rtsp_get(rtsp_t *s) {
+char* Rtsp::get() const {
+ int n=1;
+ char *buffer = new char [BUF_SIZE];
+ char *string = NULL;
- int n=1;
- char *buffer = new char [BUF_SIZE];
- char *string = NULL;
+ read_stream(buffer, 1);
+ while (n<BUF_SIZE) {
+ read_stream(&(buffer[n]), 1);
+ if ((buffer[n-1]==0x0d)&&(buffer[n]==0x0a)) break;
+ n++;
+ }
- read_stream(*s->tcp, buffer, 1);
- while (n<BUF_SIZE) {
- read_stream(*s->tcp, &(buffer[n]), 1);
- if ((buffer[n-1]==0x0d)&&(buffer[n]==0x0a)) break;
- n++;
- }
+ if (n>=BUF_SIZE) {
+ MSG_FATAL("librtsp: buffer overflow in rtsp_get\n");
+ exit(1);
+ }
+ string=new char [n];
+ memcpy(string,buffer,n-1);
+ string[n-1]=0;
- if (n>=BUF_SIZE) {
- MSG_FATAL("librtsp: buffer overflow in rtsp_get\n");
- exit(1);
- }
- string=new char [n];
- memcpy(string,buffer,n-1);
- string[n-1]=0;
-
#ifdef LOG
- MSG_INFO("librtsp: << '%s'\n", string);
+ MSG_INFO("librtsp: << '%s'\n", string);
#endif
- delete buffer;
- return string;
+ delete buffer;
+ return string;
}
/*
* rtsp_put puts a line on stream
*/
-static void rtsp_put(rtsp_t *s, const char *string) {
+void Rtsp::put(const char *string) const {
+ int len=strlen(string);
+ char *buf=new char [len+2];
- int len=strlen(string);
- char *buf=new char [len+2];
-
#ifdef LOG
- MSG_INFO("librtsp: >> '%s'", string);
+ MSG_INFO("librtsp: >> '%s'", string);
#endif
- memcpy(buf,string,len);
- buf[len]=0x0d;
- buf[len+1]=0x0a;
+ memcpy(buf,string,len);
+ buf[len]=0x0d;
+ buf[len+1]=0x0a;
- write_stream(*s->tcp, buf, len+2);
+ write_stream(buf, len+2);
#ifdef LOG
- MSG_INFO(" done.\n");
+ MSG_INFO(" done.\n");
#endif
-
- delete buf;
+ delete buf;
}
/*
* extract server status code
*/
-static int rtsp_get_code(const char *string) {
+int Rtsp::get_code(const char *string) const {
+ char buf[4];
+ int code=0;
- char buf[4];
- int code=0;
-
- if (!strncmp(string, RTSP_PROTOCOL_VERSION, strlen(RTSP_PROTOCOL_VERSION)))
- {
- memcpy(buf, string+strlen(RTSP_PROTOCOL_VERSION)+1, 3);
- buf[3]=0;
- code=atoi(buf);
- } else if (!strncmp(string, RTSP_METHOD_SET_PARAMETER,8))
- {
- return RTSP_STATUS_SET_PARAMETER;
- }
-
- if(code != RTSP_STATUS_OK) MSG_INFO("librtsp: server responds: '%s'\n",string);
-
- return code;
+ if (!strncmp(string, RTSP_PROTOCOL_VERSION, strlen(RTSP_PROTOCOL_VERSION))) {
+ memcpy(buf, string+strlen(RTSP_PROTOCOL_VERSION)+1, 3);
+ buf[3]=0;
+ code=atoi(buf);
+ } else if (!strncmp(string, RTSP_METHOD_SET_PARAMETER,8)) {
+ return RTSP_STATUS_SET_PARAMETER;
+ }
+ if(code != RTSP_STATUS_OK) MSG_INFO("librtsp: server responds: '%s'\n",string);
+ return code;
}
/*
* send a request
*/
-static void rtsp_send_request(rtsp_t *s, const char *type, const char *what) {
+void Rtsp::send_request(const char *type, const char *what) {
+ char *const *payload=scheduled;
+ char *buf;
- char **payload=s->scheduled;
- char *buf;
+ buf = new char [strlen(type)+strlen(what)+strlen(RTSP_PROTOCOL_VERSION)+3];
- buf = new char [strlen(type)+strlen(what)+strlen(RTSP_PROTOCOL_VERSION)+3];
-
- sprintf(buf,"%s %s %s",type, what, RTSP_PROTOCOL_VERSION);
- rtsp_put(s,buf);
- delete buf;
- if (payload)
- while (*payload) {
- rtsp_put(s,*payload);
- payload++;
- }
- rtsp_put(s,"");
- rtsp_unschedule_all(s);
+ sprintf(buf,"%s %s %s",type, what, RTSP_PROTOCOL_VERSION);
+ put(buf);
+ delete buf;
+ if (payload)
+ while (*payload) {
+ put(*payload);
+ payload++;
+ }
+ put("");
+ unschedule_all();
}
/*
* schedule standard fields
*/
-static void rtsp_schedule_standard(rtsp_t *s) {
+void Rtsp::schedule_standard() {
+ char tmp[17];
- char tmp[17];
+ snprintf(tmp, 17, "CSeq: %u", cseq);
+ schedule_field(tmp);
- snprintf(tmp, 17, "CSeq: %u", s->cseq);
- rtsp_schedule_field(s, tmp);
-
- if (s->session) {
- char *buf;
- buf = new char [strlen(s->session)+15];
- sprintf(buf, "Session: %s", s->session);
- rtsp_schedule_field(s, buf);
- delete buf;
- }
+ if (session) {
+ char *buf;
+ buf = new char [strlen(session)+15];
+ sprintf(buf, "Session: %s", session);
+ schedule_field(buf);
+ delete buf;
+ }
}
/*
* get the answers, if server responses with something != 200, return NULL
*/
-static int rtsp_get_answers(rtsp_t *s) {
+int Rtsp::get_answers() {
+ char *answer=NULL;
+ unsigned int answer_seq;
+ char **answer_ptr=answers;
+ int code;
+ int ans_count = 0;
- char *answer=NULL;
- unsigned int answer_seq;
- char **answer_ptr=s->answers;
- int code;
- int ans_count = 0;
+ answer=get();
+ if (!answer) return 0;
+ code=get_code(answer);
+ delete answer;
- answer=rtsp_get(s);
- if (!answer)
- return 0;
- code=rtsp_get_code(answer);
- delete answer;
+ free_answers();
- rtsp_free_answers(s);
+ do { /* while we get answer lines */
+ answer=get();
+ if (!answer) return 0;
- do { /* while we get answer lines */
-
- answer=rtsp_get(s);
- if (!answer)
- return 0;
-
- if (!strncasecmp(answer,"CSeq:",5)) {
- sscanf(answer,"%*s %u",&answer_seq);
- if (s->cseq != answer_seq) {
+ if (!strncasecmp(answer,"CSeq:",5)) {
+ sscanf(answer,"%*s %u",&answer_seq);
+ if (cseq != answer_seq) {
#ifdef LOG
- MSG_WARN("librtsp: warning: CSeq mismatch. got %u, assumed %u", answer_seq, s->cseq);
+ MSG_WARN("librtsp: warning: CSeq mismatch. got %u, assumed %u", answer_seq, s->cseq);
#endif
- s->cseq=answer_seq;
- }
- }
- if (!strncasecmp(answer,"Server:",7)) {
- char *buf = new char [strlen(answer)];
- sscanf(answer,"%*s %s",buf);
- if (s->server) delete s->server;
- s->server=mp_strdup(buf);
- delete buf;
- }
- if (!strncasecmp(answer,"Session:",8)) {
- char *buf = new(zeromem) char [strlen(answer)];
- sscanf(answer,"%*s %s",buf);
- if (s->session) {
- if (strcmp(buf, s->session)) {
- MSG_WARN("rtsp: warning: setting NEW session: %s\n", buf);
- delete s->session;
- s->session=mp_strdup(buf);
+ cseq=answer_seq;
+ }
}
- } else
- {
+ if (!strncasecmp(answer,"Server:",7)) {
+ char *buf = new char [strlen(answer)];
+ sscanf(answer,"%*s %s",buf);
+ if (server) delete server;
+ server=mp_strdup(buf);
+ delete buf;
+ }
+ if (!strncasecmp(answer,"Session:",8)) {
+ char *buf = new(zeromem) char [strlen(answer)];
+ sscanf(answer,"%*s %s",buf);
+ if (session) {
+ if (strcmp(buf, session)) {
+ MSG_WARN("rtsp: warning: setting NEW session: %s\n", buf);
+ delete session;
+ session=mp_strdup(buf);
+ }
+ } else {
#ifdef LOG
- MSG_INFO("rtsp: setting session id to: %s\n", buf);
+ MSG_INFO("rtsp: setting session id to: %s\n", buf);
#endif
- s->session=mp_strdup(buf);
- }
- delete buf;
- }
- *answer_ptr=answer;
- answer_ptr++;
- } while ((strlen(answer)!=0) && (++ans_count < MAX_FIELDS));
-
- s->cseq++;
-
- *answer_ptr=NULL;
- rtsp_schedule_standard(s);
-
- return code;
+ session=mp_strdup(buf);
+ }
+ delete buf;
+ }
+ *answer_ptr=answer;
+ answer_ptr++;
+ } while ((strlen(answer)!=0) && (++ans_count < RTSP_MAX_FIELDS));
+ cseq++;
+ *answer_ptr=NULL;
+ schedule_standard();
+ return code;
}
/*
* send an ok message
*/
-int rtsp_send_ok(rtsp_t *s) {
- char cseq[16];
+int Rtsp::send_ok() const {
+ char _cseq[16];
- rtsp_put(s, "RTSP/1.0 200 OK");
- sprintf(cseq,"CSeq: %u", s->cseq);
- rtsp_put(s, cseq);
- rtsp_put(s, "");
- return 0;
+ put("RTSP/1.0 200 OK");
+ sprintf(_cseq,"CSeq: %u", cseq);
+ put(_cseq);
+ put("");
+ return 0;
}
/*
@@ -383,174 +360,140 @@
* server status code.
*/
-int rtsp_request_options(rtsp_t *s, const char *what) {
+int Rtsp::request_options(const char *what) {
+ char *buf;
- char *buf;
-
- if (what) {
- buf=mp_strdup(what);
- } else
- {
- buf=new char [strlen(s->host)+16];
- sprintf(buf,"rtsp://%s:%i", s->host, s->port);
- }
- rtsp_send_request(s,RTSP_METHOD_OPTIONS,buf);
- delete buf;
-
- return rtsp_get_answers(s);
+ if (what) buf=mp_strdup(what);
+ else {
+ buf=new char [strlen(host)+16];
+ sprintf(buf,"rtsp://%s:%i", host, port);
+ }
+ send_request(RTSP_METHOD_OPTIONS,buf);
+ delete buf;
+ return get_answers();
}
-int rtsp_request_describe(rtsp_t *s, const char *what) {
+int Rtsp::request_describe(const char *what) {
+ char *buf;
- char *buf;
-
- if (what) {
- buf=mp_strdup(what);
- } else
- {
- buf=new char [strlen(s->host)+strlen(s->path)+16];
- sprintf(buf,"rtsp://%s:%i/%s", s->host, s->port, s->path);
- }
- rtsp_send_request(s,RTSP_METHOD_DESCRIBE,buf);
- delete buf;
-
- return rtsp_get_answers(s);
+ if (what) buf=mp_strdup(what);
+ else {
+ buf=new char [strlen(host)+strlen(path)+16];
+ sprintf(buf,"rtsp://%s:%i/%s", host, port, path);
+ }
+ send_request(RTSP_METHOD_DESCRIBE,buf);
+ delete buf;
+ return get_answers();
}
-int rtsp_request_setup(rtsp_t *s, const char *what, char *control) {
+int Rtsp::request_setup(const char *what, char *control) {
+ char *buf = NULL;
- char *buf = NULL;
-
- if (what)
- buf = mp_strdup (what);
- else
- {
- int len = strlen (s->host) + strlen (s->path) + 16;
- if (control)
- len += strlen (control) + 1;
-
- buf = new char [len];
- sprintf (buf, "rtsp://%s:%i/%s%s%s", s->host, s->port, s->path,
+ if (what) buf = mp_strdup (what);
+ else {
+ int len = strlen (host) + strlen (path) + 16;
+ if (control) len += strlen (control) + 1;
+ buf = new char [len];
+ sprintf (buf, "rtsp://%s:%i/%s%s%s", host, port, path,
control ? "/" : "", control ? control : "");
- }
-
- rtsp_send_request (s, RTSP_METHOD_SETUP, buf);
- delete buf;
- return rtsp_get_answers (s);
+ }
+ send_request (RTSP_METHOD_SETUP, buf);
+ delete buf;
+ return get_answers ();
}
-int rtsp_request_setparameter(rtsp_t *s, const char *what) {
+int Rtsp::request_setparameter(const char *what) {
+ char *buf;
- char *buf;
-
- if (what) {
- buf=mp_strdup(what);
- } else
- {
- buf=new char [strlen(s->host)+strlen(s->path)+16];
- sprintf(buf,"rtsp://%s:%i/%s", s->host, s->port, s->path);
- }
- rtsp_send_request(s,RTSP_METHOD_SET_PARAMETER,buf);
- delete buf;
-
- return rtsp_get_answers(s);
+ if (what) buf=mp_strdup(what);
+ else {
+ buf=new char [strlen(host)+strlen(path)+16];
+ sprintf(buf,"rtsp://%s:%i/%s", host, port, path);
+ }
+ send_request(RTSP_METHOD_SET_PARAMETER,buf);
+ delete buf;
+ return get_answers();
}
-int rtsp_request_play(rtsp_t *s, const char *what) {
+int Rtsp::request_play(const char *what) {
+ char *buf;
+ int ret;
- char *buf;
- int ret;
+ if (what) buf=mp_strdup(what);
+ else {
+ buf=new char [strlen(host)+strlen(path)+16];
+ sprintf(buf,"rtsp://%s:%i/%s", host, port, path);
+ }
+ send_request(RTSP_METHOD_PLAY,buf);
+ delete buf;
- if (what) {
- buf=mp_strdup(what);
- } else
- {
- buf=new char [strlen(s->host)+strlen(s->path)+16];
- sprintf(buf,"rtsp://%s:%i/%s", s->host, s->port, s->path);
- }
- rtsp_send_request(s,RTSP_METHOD_PLAY,buf);
- delete buf;
-
- ret = rtsp_get_answers (s);
- if (ret == RTSP_STATUS_OK)
- s->server_state = RTSP_PLAYING;
-
- return ret;
+ ret = get_answers ();
+ if (ret == RTSP_STATUS_OK) server_state = RTSP_PLAYING;
+ return ret;
}
-int rtsp_request_teardown(rtsp_t *s, const char *what) {
+int Rtsp::request_teardown(const char *what) {
+ char *buf;
- char *buf;
+ if (what) buf = mp_strdup (what);
+ else {
+ buf = new char [strlen (host) + strlen (path) + 16];
+ sprintf (buf, "rtsp://%s:%i/%s", host, port, path);
+ }
+ send_request (RTSP_METHOD_TEARDOWN, buf);
+ delete buf;
- if (what)
- buf = mp_strdup (what);
- else
- {
- buf = new char [strlen (s->host) + strlen (s->path) + 16];
- sprintf (buf, "rtsp://%s:%i/%s", s->host, s->port, s->path);
- }
- rtsp_send_request (s, RTSP_METHOD_TEARDOWN, buf);
- delete buf;
-
- /* after teardown we're done with RTSP streaming, no need to get answer as
- reading more will only result to garbage and buffer overflow */
- return RTSP_STATUS_OK;
+ /* after teardown we're done with RTSP streaming, no need to get answer as
+ reading more will only result to garbage and buffer overflow */
+ return RTSP_STATUS_OK;
}
/*
* read opaque data from stream
*/
-int rtsp_read_data(rtsp_t *s, char *buffer, unsigned int size) {
+int Rtsp::read_data(char *buffer, unsigned int size) const {
+ int i,seq;
- int i,seq;
-
- if (size>=4) {
- i=read_stream(*s->tcp, buffer, 4);
- if (i<4) return i;
- if (((buffer[0]=='S')&&(buffer[1]=='E')&&(buffer[2]=='T')&&(buffer[3]=='_')) ||
- ((buffer[0]=='O')&&(buffer[1]=='P')&&(buffer[2]=='T')&&(buffer[3]=='I'))) // OPTIONS
- {
- char *rest=rtsp_get(s);
- if (!rest)
- return -1;
-
- seq=-1;
- do {
- delete rest;
- rest=rtsp_get(s);
- if (!rest)
- return -1;
- if (!strncasecmp(rest,"CSeq:",5))
- sscanf(rest,"%*s %u",&seq);
- } while (strlen(rest)!=0);
- delete rest;
- if (seq<0) {
+ if (size>=4) {
+ i=read_stream(buffer, 4);
+ if (i<4) return i;
+ if (((buffer[0]=='S')&&(buffer[1]=='E')&&(buffer[2]=='T')&&(buffer[3]=='_')) ||
+ ((buffer[0]=='O')&&(buffer[1]=='P')&&(buffer[2]=='T')&&(buffer[3]=='I'))) { // OPTIONS
+ char *rest=get();
+ if (!rest) return -1;
+ seq=-1;
+ do {
+ delete rest;
+ rest=get();
+ if (!rest) return -1;
+ if (!strncasecmp(rest,"CSeq:",5))
+ sscanf(rest,"%*s %u",&seq);
+ } while (strlen(rest)!=0);
+ delete rest;
+ if (seq<0) {
#ifdef LOG
- MSG_WARN("rtsp: warning: CSeq not recognized!\n");
+ MSG_WARN("rtsp: warning: CSeq not recognized!\n");
#endif
- seq=1;
- }
- /* let's make the server happy */
- rtsp_put(s, "RTSP/1.0 451 Parameter Not Understood");
- rest=new char [17];
- sprintf(rest,"CSeq: %u", seq);
- rtsp_put(s, rest);
- delete rest;
- rtsp_put(s, "");
- i=read_stream(*s->tcp, buffer, size);
- } else
- {
- i=read_stream(*s->tcp, buffer+4, size-4);
- i+=4;
- }
- } else
- i=read_stream(*s->tcp, buffer, size);
+ seq=1;
+ }
+ /* let's make the server happy */
+ put("RTSP/1.0 451 Parameter Not Understood");
+ rest=new char [17];
+ sprintf(rest,"CSeq: %u", seq);
+ put(rest);
+ delete rest;
+ put("");
+ i=read_stream(buffer, size);
+ } else {
+ i=read_stream(buffer+4, size-4);
+ i+=4;
+ }
+ } else i=read_stream(buffer, size);
#ifdef LOG
- MSG_INFO("librtsp: << %d of %d bytes\n", i, size);
+ MSG_INFO("librtsp: << %d of %d bytes\n", i, size);
#endif
-
- return i;
+ return i;
}
/*
@@ -558,59 +501,59 @@
*/
//rtsp_t *rtsp_connect(const char *mrl, const char *user_agent) {
-rtsp_t *rtsp_connect(Tcp& tcp, char* mrl,const char *path,const char *host, int port,const char *user_agent) {
+Rtsp* Rtsp::connect(Tcp& tcp, char* mrl,const char *path,const char *host, int port,const char *user_agent) {
- rtsp_t *s=new rtsp_t;
+ Rtsp& s=*new(zeromem) Rtsp(tcp);
int i;
- for (i=0; i<MAX_FIELDS; i++) {
- s->answers[i]=NULL;
- s->scheduled[i]=NULL;
+ for (i=0; i<RTSP_MAX_FIELDS; i++) {
+ s.answers[i]=NULL;
+ s.scheduled[i]=NULL;
}
- s->server=NULL;
- s->server_state=0;
- s->server_caps=0;
+ s.server=NULL;
+ s.server_state=0;
+ s.server_caps=0;
- s->cseq=0;
- s->session=NULL;
+ s.cseq=0;
+ s.session=NULL;
if (user_agent)
- s->user_agent=mp_strdup(user_agent);
+ s.user_agent=mp_strdup(user_agent);
else
- s->user_agent=mp_strdup("User-Agent: RealMedia Player Version 6.0.9.1235 (linux-2.0-libc6-i386-gcc2.95)");
+ s.user_agent=mp_strdup("User-Agent: RealMedia Player Version 6.0.9.1235 (linux-2.0-libc6-i386-gcc2.95)");
- s->mrl = mp_strdup(mrl);
- s->host = mp_strdup(host);
- s->port = port;
- s->path = mp_strdup(path);
+ s.mrl = mp_strdup(mrl);
+ s.host = mp_strdup(host);
+ s.port = port;
+ s.path = mp_strdup(path);
while (*path == '/')
path++;
- if ((s->param = strchr(s->path, '?')) != NULL)
- s->param++;
- s->tcp = &tcp;
+ if ((s.param = strchr(s.path, '?')) != NULL)
+ s.param++;
if (!tcp.established()) {
- MSG_ERR("rtsp: failed to connect to '%s'\n", s->host);
- rtsp_close(s);
+ MSG_ERR("rtsp: failed to connect to '%s'\n", s.host);
+ s.close();
+ delete &s;
return NULL;
}
- s->server_state=RTSP_CONNECTED;
+ s.server_state=RTSP_CONNECTED;
/* now let's send an options request. */
- rtsp_schedule_field(s, "CSeq: 1");
- rtsp_schedule_field(s, s->user_agent);
- rtsp_schedule_field(s, "ClientChallenge: 9e26d33f2984236010ef6253fb1887f7");
- rtsp_schedule_field(s, "PlayerStarttime: [28/03/2003:22:50:23 00:00]");
- rtsp_schedule_field(s, "CompanyID: KnKV4M4I/B2FjJ1TToLycw==");
- rtsp_schedule_field(s, "GUID: 00000000-0000-0000-0000-000000000000");
- rtsp_schedule_field(s, "RegionData: 0");
- rtsp_schedule_field(s, "ClientID: Linux_2.4_6.0.9.1235_play32_RN01_EN_586");
+ s.schedule_field("CSeq: 1");
+ s.schedule_field(s.user_agent);
+ s.schedule_field("ClientChallenge: 9e26d33f2984236010ef6253fb1887f7");
+ s.schedule_field("PlayerStarttime: [28/03/2003:22:50:23 00:00]");
+ s.schedule_field("CompanyID: KnKV4M4I/B2FjJ1TToLycw==");
+ s.schedule_field("GUID: 00000000-0000-0000-0000-000000000000");
+ s.schedule_field("RegionData: 0");
+ s.schedule_field("ClientID: Linux_2.4_6.0.9.1235_play32_RN01_EN_586");
/*rtsp_schedule_field(s, "Pragma: initiate-session");*/
- rtsp_request_options(s, NULL);
+ s.request_options(NULL);
- return s;
+ return &s;
}
@@ -618,23 +561,12 @@
* closes an rtsp connection
*/
-void rtsp_close(rtsp_t *s) {
-
- if (s->server_state)
- {
- if (s->server_state == RTSP_PLAYING)
- rtsp_request_teardown (s, NULL);
- s->tcp->close();
- }
-
- if (s->path) delete s->path;
- if (s->host) delete s->host;
- if (s->mrl) delete s->mrl;
- if (s->session) delete s->session;
- if (s->user_agent) delete s->user_agent;
- rtsp_free_answers(s);
- rtsp_unschedule_all(s);
- delete s;
+void Rtsp::close() {
+ if (server_state) {
+ if (server_state == RTSP_PLAYING)
+ request_teardown (NULL);
+ tcp.close();
+ }
}
/*
@@ -642,146 +574,118 @@
* after the first matched tag. returns NULL if no match found.
*/
-char *rtsp_search_answers(rtsp_t *s, const char *tag) {
+char* Rtsp::search_answers(const char *tag) const {
+ char *const *answer;
+ char *ptr;
- char **answer;
- char *ptr;
+ if (!answers) return NULL;
+ answer=answers;
- if (!s->answers) return NULL;
- answer=s->answers;
-
- while (*answer) {
- if (!strncasecmp(*answer,tag,strlen(tag))) {
- ptr=strchr(*answer,':');
- if (!ptr) return NULL;
- ptr++;
- while(*ptr==' ') ptr++;
- return ptr;
+ while (*answer) {
+ if (!strncasecmp(*answer,tag,strlen(tag))) {
+ ptr=strchr(*answer,':');
+ if (!ptr) return NULL;
+ ptr++;
+ while(*ptr==' ') ptr++;
+ return ptr;
+ }
+ answer++;
}
- answer++;
- }
-
- return NULL;
+ return NULL;
}
/*
* session id management
*/
-void rtsp_set_session(rtsp_t *s, const char *id) {
-
- if (s->session) delete s->session;
-
- s->session=mp_strdup(id);
-
+void Rtsp::set_session(const char *id) {
+ if (session) delete session;
+ session=mp_strdup(id);
}
-const char *rtsp_get_session(rtsp_t *s) {
+const char* Rtsp::get_session() const { return session; }
+char* Rtsp::get_mrl() const { return mrl; }
- return s->session;
-
-}
-
-char *rtsp_get_mrl(rtsp_t *s) {
-
- return s->mrl;
-
-}
-
-char *rtsp_get_param(rtsp_t *s,const char *p) {
- int len;
- const char *param;
- if (!s->param)
- return NULL;
- if (!p)
- return mp_strdup(s->param);
- len = strlen(p);
- param = s->param;
- while (param && *param) {
- const char *nparam = strchr(param, '&');
- if (strncmp(param, p, len) == 0 && param[len] == '=') {
- param += len + 1;
- len = nparam ? nparam - param : strlen(param);
- char* _nparam = new char [len + 1];
- memcpy(_nparam, param, len);
- _nparam[len] = 0;
- return _nparam;
+char* Rtsp::get_param(const char *p) const {
+ int len;
+ const char *_param;
+ if (!param) return NULL;
+ if (!p) return mp_strdup(param);
+ len = strlen(p);
+ _param = param;
+ while (_param && *_param) {
+ const char *nparam = strchr(_param, '&');
+ if (strncmp(_param, p, len) == 0 && _param[len] == '=') {
+ _param += len + 1;
+ len = nparam ? nparam - _param : strlen(_param);
+ char* _nparam = new char [len + 1];
+ memcpy(_nparam, _param, len);
+ _nparam[len] = 0;
+ return _nparam;
+ }
+ _param = nparam ? nparam + 1 : NULL;
}
- param = nparam ? nparam + 1 : NULL;
- }
- return NULL;
+ return NULL;
}
/*
* schedules a field for transmission
*/
-void rtsp_schedule_field(rtsp_t *s, const char *string) {
-
- int i=0;
-
- if (!string) return;
-
- while(s->scheduled[i]) {
- i++;
- }
- s->scheduled[i]=mp_strdup(string);
+void Rtsp::schedule_field(const char *string) {
+ int i=0;
+ if (!string) return;
+ while(scheduled[i]) i++;
+ scheduled[i]=mp_strdup(string);
}
/*
* removes the first scheduled field which prefix matches string.
*/
-void rtsp_unschedule_field(rtsp_t *s, const char *string) {
-
- char **ptr=s->scheduled;
-
- if (!string) return;
-
- while(*ptr) {
- if (!strncmp(*ptr, string, strlen(string)))
- break;
- else
- ptr++;
- }
- if (*ptr) delete *ptr;
- ptr++;
- do {
- *(ptr-1)=*ptr;
- } while(*ptr);
+void Rtsp::unschedule_field(const char *string) {
+ char **ptr=scheduled;
+ if (!string) return;
+ while(*ptr) {
+ if (!strncmp(*ptr, string, strlen(string))) break;
+ else ptr++;
+ }
+ if (*ptr) delete *ptr;
+ ptr++;
+ do {
+ *(ptr-1)=*ptr;
+ } while(*ptr);
}
/*
* unschedule all fields
*/
-void rtsp_unschedule_all(rtsp_t *s) {
+void Rtsp::unschedule_all() {
+ char **ptr;
- char **ptr;
+ if (!scheduled) return;
+ ptr=scheduled;
- if (!s->scheduled) return;
- ptr=s->scheduled;
-
- while (*ptr) {
- delete *ptr;
- *ptr=NULL;
- ptr++;
- }
+ while (*ptr) {
+ delete *ptr;
+ *ptr=NULL;
+ ptr++;
+ }
}
/*
* mp_free answers
*/
-void rtsp_free_answers(rtsp_t *s) {
+void Rtsp::free_answers() {
+ char **answer;
- char **answer;
-
- if (!s->answers) return;
- answer=s->answers;
-
- while (*answer) {
- delete *answer;
- *answer=NULL;
- answer++;
- }
+ if (!answers) return;
+ answer=answers;
+ while (*answer) {
+ delete *answer;
+ *answer=NULL;
+ answer++;
+ }
}
+} // namespace mpxp
Modified: mplayerxp/libmpstream2/librtsp/rtsp.h
===================================================================
--- mplayerxp/libmpstream2/librtsp/rtsp.h 2012-12-18 13:04:29 UTC (rev 572)
+++ mplayerxp/libmpstream2/librtsp/rtsp.h 2012-12-18 15:09:54 UTC (rev 573)
@@ -33,11 +33,13 @@
#define HAVE_RTSP_H
#include "libmpstream2/tcp.h"
+namespace mpxp {
/* some codes returned by rtsp_request_* functions */
-enum {
- RTSP_STATUS_SET_PARAMETER =10,
- RTSP_STATUS_OK =200
-};
+ enum {
+ RTSP_STATUS_SET_PARAMETER =10,
+ RTSP_STATUS_OK =200,
+ RTSP_MAX_FIELDS =256
+ };
#define RTSP_METHOD_OPTIONS "OPTIONS"
#define RTSP_METHOD_DESCRIBE "DESCRIBE"
#define RTSP_METHOD_SETUP "SETUP"
@@ -45,40 +47,67 @@
#define RTSP_METHOD_TEARDOWN "TEARDOWN"
#define RTSP_METHOD_SET_PARAMETER "SET_PARAMETER"
-struct rtsp_t;
+ class Rtsp : public Opaque {
+ public:
+ Rtsp(Tcp& tcp);
+ virtual ~Rtsp();
-rtsp_t* rtsp_connect (Tcp& tcp, char *mrl, const char *path, const char *host, int port, const char *user_agent);
+ static Rtsp* connect (Tcp& tcp, char *mrl, const char *path, const char *host, int port, const char *user_agent);
-int rtsp_request_options(rtsp_t *s, const char *what);
-int rtsp_request_describe(rtsp_t *s, const char *what);
-int rtsp_request_setup(rtsp_t *s, const char *what, char *control);
-int rtsp_request_setparameter(rtsp_t *s, const char *what);
-int rtsp_request_play(rtsp_t *s, const char *what);
-int rtsp_request_teardown(rtsp_t *s, const char *what);
+ virtual int request_options(const char *what);
+ virtual int request_describe(const char *what);
+ virtual int request_setup(const char *what, char *control);
+ virtual int request_setparameter(const char *what);
+ virtual int request_play(const char *what);
+ virtual int request_teardown(const char *what);
-int rtsp_send_ok(rtsp_t *s);
+ virtual int send_ok() const;
+ virtual int read_data(char *buffer, unsigned int size) const;
-int rtsp_read_data(rtsp_t *s, char *buffer, unsigned int size);
+ virtual char* search_answers(const char *tag) const;
-char* rtsp_search_answers(rtsp_t *s, const char *tag);
-void rtsp_add_to_payload(char **payload, const char *string);
+ virtual void free_answers();
-void rtsp_free_answers(rtsp_t *self);
+ virtual void close ();
-int rtsp_read (rtsp_t *self, char *data, int len);
-void rtsp_close (rtsp_t *self);
+ virtual void set_session(const char *id);
+ virtual const char* get_session() const;
-void rtsp_set_session(rtsp_t *s, const char *id);
-const char *rtsp_get_session(rtsp_t *s);
+ virtual char* get_mrl() const;
+ virtual char* get_param(const char *param) const;
-char *rtsp_get_mrl(rtsp_t *s);
-char *rtsp_get_param(rtsp_t *s,const char *param);
+ virtual void schedule_field(const char *string);
+ virtual void unschedule_field(const char *string);
+ virtual void unschedule_all();
+ private:
+ char* get() const;
+ void put(const char *string) const;
+ int get_code(const char *string) const;
+ void send_request(const char *type, const char *what);
+ void schedule_standard();
+ int get_answers();
+ int write_stream(const char *buf, int len) const;
+ ssize_t read_stream(any_t*buf, size_t count) const;
-/*int rtsp_peek_header (rtsp_t *self, char *data); */
+ Tcp& tcp;
-void rtsp_schedule_field(rtsp_t *s, const char *string);
-void rtsp_unschedule_field(rtsp_t *s, const char *string);
-void rtsp_unschedule_all(rtsp_t *s);
+ const char* host;
+ int port;
+ const char* path;
+ const char* param;
+ char* mrl;
+ const char* user_agent;
+ const char* server;
+ unsigned server_state;
+ uint32_t server_caps;
+
+ unsigned cseq;
+ const char* session;
+
+ char* answers[RTSP_MAX_FIELDS]; /* data of last message */
+ char* scheduled[RTSP_MAX_FIELDS]; /* will be sent with next message */
+ };
+} // namespace mpxp
#endif
Modified: mplayerxp/libmpstream2/librtsp/rtsp_rtp.cpp
===================================================================
--- mplayerxp/libmpstream2/librtsp/rtsp_rtp.cpp 2012-12-18 13:04:29 UTC (rev 572)
+++ mplayerxp/libmpstream2/librtsp/rtsp_rtp.cpp 2012-12-18 15:09:54 UTC (rev 573)
@@ -48,6 +48,7 @@
#include "freesdp/parser.h"
#include "stream_msg.h"
+namespace mpxp {
#define RTSP_DEFAULT_PORT 31336
#define MAX_LENGTH 256
@@ -76,596 +77,467 @@
#define RTCP_RR "\201\311\0\7(.JD\31+\306\343\0\0\0\0\0\0/E\0\0\2&\0\0\0\0\0\0\0\0\201"
#define RTCP_SEND_FREQUENCY 1024
-int rtsp_port = 0;
-char *rtsp_destination = NULL;
-
-void
-rtcp_send_rr (rtsp_t *s, struct rtp_rtsp_session_t *st)
-{
- if (st->rtcp_socket == -1)
- return;
-
+void Rtp_Rtsp_Session::rtcp_send_rr (Rtsp& s) {
+ if (rtcp_socket == -1) return;
/* send RTCP RR every RTCP_SEND_FREQUENCY packets
* FIXME : NOT CORRECT, HARDCODED, BUT MAKES SOME SERVERS HAPPY
* not rfc compliant
* http://www.faqs.org/rfcs/rfc1889.html chapter 6 for RTCP
*/
+ if (count == RTCP_SEND_FREQUENCY) {
+ char rtcp_content[RTCP_RR_SIZE];
+ strcpy (rtcp_content, RTCP_RR);
+ send (rtcp_socket, rtcp_content, RTCP_RR_SIZE, 0);
- if (st->count == RTCP_SEND_FREQUENCY)
- {
- char rtcp_content[RTCP_RR_SIZE];
- strcpy (rtcp_content, RTCP_RR);
- send (st->rtcp_socket, rtcp_content, RTCP_RR_SIZE, 0);
-
- /* ping RTSP server to keep connection alive.
- we use OPTIONS instead of PING as not all servers support it */
- rtsp_request_options (s, "*");
- st->count = 0;
- }
- else
- st->count++;
+ /* ping RTSP server to keep connection alive.
+ we use OPTIONS instead of PING as not all servers support it */
+ s.request_options ("*");
+ count = 0;
+ } else count++;
}
-static struct rtp_rtsp_session_t *
-rtp_session_new (void)
-{
- struct rtp_rtsp_session_t *st = NULL;
-
- st = new struct rtp_rtsp_session_t;
-
- st->rtp_socket = -1;
- st->rtcp_socket = -1;
- st->control_url = NULL;
- st->count = 0;
-
- return st;
+Rtp_Rtsp_Session::Rtp_Rtsp_Session() {
+ rtp_socket = -1;
+ rtcp_socket = -1;
}
-void
-rtp_session_free (struct rtp_rtsp_session_t *st)
-{
- if (!st)
- return;
-
- if (st->rtp_socket != -1)
- close (st->rtp_socket);
- if (st->rtcp_socket != -1)
- close (st->rtcp_socket);
-
- if (st->control_url)
- delete st->control_url;
- delete st;
+Rtp_Rtsp_Session::~Rtp_Rtsp_Session() {
+ if (rtp_socket != -1) ::close (rtp_socket);
+ if (rtcp_socket != -1) ::close (rtcp_socket);
+ if (control_url) delete control_url;
}
-static void
-rtp_session_set_fd (struct rtp_rtsp_session_t *st,
- int rtp_sock, int rtcp_sock)
-{
- if (!st)
- return;
-
- st->rtp_socket = rtp_sock;
- st->rtcp_socket = rtcp_sock;
+void Rtp_Rtsp_Session::set_fd (int rtp_sock, int rtcp_sock) {
+ rtp_socket = rtp_sock;
+ rtcp_socket = rtcp_sock;
}
-static int
-parse_port (const char *line, const char *param,
- int *rtp_port, int *rtcp_port)
-{
- char *parse1;
- char *parse2;
- char *parse3;
+int Rtp_Rtsp_Session::parse_port (const char *line, const char *param, int *rtp_port, int *rtcp_port) const {
+ char *parse1;
+ char *parse2;
+ char *parse3;
- char *line_copy = mp_strdup (line);
+ char *line_copy = mp_strdup (line);
- parse1 = strstr (line_copy, param);
+ parse1 = strstr (line_copy, param);
- if (parse1)
- {
- parse2 = strstr (parse1, "-");
-
- if (parse2)
- {
- parse3 = strstr (parse2, ";");
-
- if (parse3)
- parse3[0] = 0;
-
- parse2[0] = 0;
+ if (parse1) {
+ parse2 = strstr (parse1, "-");
+ if (parse2) {
+ parse3 = strstr (parse2, ";");
+ if (parse3) parse3[0] = 0;
+ parse2[0] = 0;
+ } else {
+ delete line_copy;
+ return 0;
+ }
+ } else {
+ delete line_copy;
+ return 0;
}
- else
- {
- delete line_copy;
- return 0;
- }
- }
- else
- {
+ *rtp_port = atoi (parse1 + strlen (param));
+ *rtcp_port = atoi (parse2 + 1);
delete line_copy;
- return 0;
- }
-
- *rtp_port = atoi (parse1 + strlen (param));
- *rtcp_port = atoi (parse2 + 1);
-
- delete line_copy;
-
- return 1;
+ return 1;
}
-static char *
-parse_destination (const char *line)
-{
- char *parse1;
- char *parse2;
+char* Rtp_Rtsp_Session::parse_destination (const char *line) const {
+ char *parse1;
+ char *parse2;
- char *dest = NULL;
- char *line_copy = mp_strdup (line);
- int len;
+ char *dest = NULL;
+ char *line_copy = mp_strdup (line);
+ int len;
- parse1 = strstr (line_copy, RTSP_SETUP_DESTINATION);
- if (!parse1)
- {
+ parse1 = strstr (line_copy, RTSP_SETUP_DESTINATION);
+ if (!parse1) {
+ delete line_copy;
+ return NULL;
+ }
+ parse2 = strstr (parse1, ";");
+ if (!parse2) {
+ delete line_copy;
+ return NULL;
+ }
+ len = strlen(parse1)-strlen (parse2)-strlen(RTSP_SETUP_DESTINATION)+1;
+ dest = new char [len + 1];
+ snprintf (dest, len, parse1 + strlen (RTSP_SETUP_DESTINATION));
delete line_copy;
- return NULL;
- }
-
- parse2 = strstr (parse1, ";");
- if (!parse2)
- {
- delete line_copy;
- return NULL;
- }
-
- len = strlen (parse1) - strlen (parse2)
- - strlen (RTSP_SETUP_DESTINATION) + 1;
- dest = (char *) mp_malloc (len + 1);
- snprintf (dest, len, parse1 + strlen (RTSP_SETUP_DESTINATION));
- delete line_copy;
-
- return dest;
+ return dest;
}
-static int
-rtcp_connect (int client_port, int server_port, const char* server_hostname)
-{
- struct sockaddr_in sin;
- struct hostent *hp;
- int s;
+int Rtp_Rtsp_Session::rtcp_connect(int client_port, int server_port, const char* server_hostname) const {
+ struct sockaddr_in sin;
+ struct hostent *hp;
+ int s;
- if (client_port <= 1023)
- return -1;
+ if (client_port <= 1023) return -1;
- s = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP);
- if (s == -1)
- return -1;
+ s = ::socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP);
+ if (s == -1) return -1;
- hp = gethostbyname (server_hostname);
- if (!hp)
- {
- close (s);
- return -1;
- }
+ hp = gethostbyname (server_hostname);
+ if (!hp) {
+ ::close (s);
+ return -1;
+ }
- sin.sin_family = AF_INET;
- sin.sin_addr.s_addr = INADDR_ANY;
- sin.sin_port = htons (client_port);
+ sin.sin_family = AF_INET;
+ sin.sin_addr.s_addr = INADDR_ANY;
+ sin.sin_port = htons (client_port);
- if (bind (s, (struct sockaddr *) &sin, sizeof (sin)))
- {
+ if (::bind (s, (struct sockaddr *) &sin, sizeof (sin))) {
#ifndef HAVE_WINSOCK2
- if (errno != EINPROGRESS)
+ if (errno != EINPROGRESS)
#else
- if (WSAGetLastError() != WSAEINPROGRESS)
+ if (WSAGetLastError() != WSAEINPROGRESS)
#endif
- {
- close (s);
- return -1;
+ {
+ ::close (s);
+ return -1;
+ }
}
- }
- sin.sin_family = AF_INET;
- memcpy (&(sin.sin_addr.s_addr), hp->h_addr, sizeof (hp->h_addr));
- sin.sin_port = htons (server_port);
+ sin.sin_family = AF_INET;
+ memcpy (&(sin.sin_addr.s_addr), hp->h_addr, sizeof (hp->h_addr));
+ sin.sin_port = htons (server_port);
/* datagram socket */
- if (connect (s, (struct sockaddr *) &sin, sizeof (sin)) < 0)
- {
- close (s);
- return -1;
- }
-
- return s;
+ if (::connect (s, (struct sockaddr *) &sin, sizeof (sin)) < 0) {
+ ::close (s);
+ return -1;
+ }
+ return s;
}
-static int
-rtp_connect (char *hostname, int port)
-{
- struct sockaddr_in sin;
- struct timeval tv;
- int err, err_len;
- int rxsockbufsz;
- int s;
- fd_set set;
+int Rtp_Rtsp_Session::rtp_connect (const char *hostname, int port) const {
+ struct sockaddr_in sin;
+ struct timeval tv;
+ int err, err_len;
+ int rxsockbufsz;
+ int s;
+ fd_set set;
- if (port <= 1023)
- return -1;
+ if (port <= 1023) return -1;
- s = socket (PF_INET, SOCK_DGRAM, 0);
- if (s == -1)
- return -1;
+ s = ::socket (PF_INET, SOCK_DGRAM, 0);
+ if (s == -1) return -1;
- sin.sin_family = AF_INET;
- if (!hostname || !strcmp (hostname, "0.0.0.0"))
- sin.sin_addr.s_addr = htonl (INADDR_ANY);
- else
+ sin.sin_family = AF_INET;
+ if (!hostname || !strcmp (hostname, "0.0.0.0"))
+ sin.sin_addr.s_addr = htonl (INADDR_ANY);
+ else
#ifndef HAVE_WINSOCK2
#ifdef USE_ATON
- inet_aton (hostname, &sin.sin_addr);
+ ::inet_aton (hostname, &sin.sin_addr);
#else
- inet_pton (AF_INET, hostname, &sin.sin_addr);
+ ::inet_pton (AF_INET, hostname, &sin.sin_addr);
#endif
#else
- sin.sin_addr.s_addr = htonl (INADDR_ANY);
+ sin.sin_addr.s_addr = ::htonl (INADDR_ANY);
#endif
- sin.sin_port = htons (port);
+ sin.sin_port = htons (port);
- /* Increase the socket rx buffer size to maximum -- this is UDP */
- rxsockbufsz = 240 * 1024;
- if (setsockopt (s, SOL_SOCKET, SO_RCVBUF,
- &rxsockbufsz, sizeof (rxsockbufsz)))
- MSG_ERR("Couldn't set receive socket buffer size\n");
+ /* Increase the socket rx buffer size to maximum -- this is UDP */
+ rxsockbufsz = 240 * 1024;
+ if (::setsockopt (s, SOL_SOCKET, SO_RCVBUF, &rxsockbufsz, sizeof (rxsockbufsz)))
+ MSG_ERR("Couldn't set receive socket buffer size\n");
- /* if multicast address, add membership */
- if ((ntohl (sin.sin_addr.s_addr) >> 28) == 0xe)
- {
- struct ip_mreq mcast;
- mcast.imr_multiaddr.s_addr = sin.sin_addr.s_addr;
- mcast.imr_interface.s_addr = 0;
+ /* if multicast address, add membership */
+ if ((::ntohl (sin.sin_addr.s_addr) >> 28) == 0xe) {
+ struct ip_mreq mcast;
+ mcast.imr_multiaddr.s_addr = sin.sin_addr.s_addr;
+ mcast.imr_interface.s_addr = 0;
- if (setsockopt (s, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mcast, sizeof (mcast)))
- {
- MSG_ERR("IP_ADD_MEMBERSHIP failed\n");
- close (s);
- return -1;
+ if (::setsockopt (s, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mcast, sizeof (mcast))) {
+ MSG_ERR("IP_ADD_MEMBERSHIP failed\n");
+ ::close (s);
+ return -1;
+ }
}
- }
- /* datagram socket */
- if (bind (s, (struct sockaddr *) &sin, sizeof (sin)))
- {
+ /* datagram socket */
+ if (::bind (s, (struct sockaddr *) &sin, sizeof (sin))) {
#ifndef HAVE_WINSOCK2
- if (errno != EINPROGRESS)
+ if (errno != EINPROGRESS)
#else
- if (WSAGetLastError() != WSAEINPROGRESS)
+ if (WSAGetLastError() != WSAEINPROGRESS)
#endif
- {
- MSG_ERR("bind: %s\n", strerror (errno));
- close (s);
- return -1;
+ {
+ MSG_ERR("bind: %s\n", strerror (errno));
+ ::close (s);
+ return -1;
+ }
}
- }
- tv.tv_sec = 0;
- tv.tv_usec = (1 * 1000000); /* 1 second timeout */
+ tv.tv_sec = 0;
+ tv.tv_usec = (1 * 1000000); /* 1 second timeout */
- FD_ZERO (&set);
- FD_SET (s, &set);
+ FD_ZERO (&set);
+ FD_SET (s, &set);
- err = select (s + 1, &set, NULL, NULL, &tv);
- if (err < 0)
- {
- MSG_ERR("Select failed: %s\n", strerror (errno));
- close (s);
- return -1;
- }
- else if (err == 0)
- {
- MSG_ERR("Timeout! No data from host %s\n", hostname);
- close (s);
- return -1;
- }
+ err = ::select (s + 1, &set, NULL, NULL, &tv);
+ if (err < 0) {
+ MSG_ERR("Select failed: %s\n", strerror (errno));
+ ::close (s);
+ return -1;
+ } else if (err == 0) {
+ MSG_ERR("Timeout! No data from host %s\n", hostname);
+ ::close (s);
+ return -1;
+ }
- err_len = sizeof (err);
- getsockopt (s, SOL_SOCKET, SO_ERROR, &err, (socklen_t *) &err_len);
- if (err)
- {
- MSG_ERR("Socket error: %d\n", err);
- close (s);
- return -1;
- }
-
- return s;
+ err_len = sizeof (err);
+ ::getsockopt (s, SOL_SOCKET, SO_ERROR, &err, (socklen_t *) &err_len);
+ if (err) {
+ MSG_ERR("Socket error: %d\n", err);
+ ::close (s);
+ return -1;
+ }
+ return s;
}
-static int
-is_multicast_address (char *addr)
-{
- struct sockaddr_in sin;
+int Rtp_Rtsp_Session::is_multicast_address (const char *addr) const {
+ struct sockaddr_in sin;
- if (!addr)
- return -1;
+ if (!addr) return -1;
+ sin.sin_family = AF_INET;
- sin.sin_family = AF_INET;
-
#ifndef HAVE_WINSOCK2
#ifdef USE_ATON
- inet_aton (addr, &sin.sin_addr);
+ ::inet_aton (addr, &sin.sin_addr);
#else
- inet_pton (AF_INET, addr, &sin.sin_addr);
+ ::inet_pton (AF_INET, addr, &sin.sin_addr);
#endif
#else
sin.sin_addr.s_addr = htonl (INADDR_ANY);
#endif
-
- if ((ntohl (sin.sin_addr.s_addr) >> 28) == 0xe)
- return 1;
-
- return 0;
+ if ((::ntohl (sin.sin_addr.s_addr) >> 28) == 0xe) return 1;
+ return 0;
}
-struct rtp_rtsp_session_t *
-rtp_setup_and_play (rtsp_t *rtsp_session)
-{
- struct rtp_rtsp_session_t* rtp_session = NULL;
- const fsdp_media_description_t *med_dsc = NULL;
- char temp_buf[MAX_LENGTH + 1];
- char npt[256];
+Rtp_Rtsp_Session* Rtp_Rtsp_Session::setup_and_play (Rtsp& rtsp) {
+ struct Rtp_Rtsp_Session* rtp_session = NULL;
+ const fsdp_media_description_t *med_dsc = NULL;
+ char temp_buf[MAX_LENGTH + 1];
+ char npt[256];
- char* answer;
- char* sdp;
- char *server_addr = NULL;
- char *destination = NULL;
+ char* answer;
+ char* sdp;
+ char *server_addr = NULL;
+ char *destination = NULL;
- int statut;
- int content_length = 0;
- int is_multicast = 0;
+ int statut;
+ int content_length = 0;
+ int is_multicast = 0;
- fsdp_description_t *dsc = NULL;
- fsdp_error_t result;
+ fsdp_description_t *dsc = NULL;
+ fsdp_error_t result;
- int client_rtp_port = -1;
- int client_rtcp_port = -1;
- int server_rtp_port = -1;
- int server_rtcp_port = -1;
- int rtp_sock = -1;
- int rtcp_sock = -1;
+ int client_rtp_port = -1;
+ int client_rtcp_port = -1;
+ int server_rtp_port = -1;
+ int server_rtcp_port = -1;
+ int rtp_sock = -1;
+ int rtcp_sock = -1;
/* 1. send a RTSP DESCRIBE request to server */
- rtsp_schedule_field (rtsp_session, RTSP_ACCEPT_SDP);
- statut = rtsp_request_describe (rtsp_session, NULL);
- if (statut < 200 || statut > 299)
- return NULL;
+ rtsp.schedule_field (RTSP_ACCEPT_SDP);
+ statut = rtsp.request_describe (NULL);
+ if (statut < 200 || statut > 299) return NULL;
- answer = rtsp_search_answers (rtsp_session, RTSP_CONTENT_LENGTH);
- if (answer)
- content_length = atoi (answer);
- else
- return NULL;
+ answer = rtsp.search_answers (RTSP_CONTENT_LENGTH);
+ if (answer) content_length = atoi (answer);
+ else return NULL;
- answer = rtsp_search_answers (rtsp_session, RTSP_CONTENT_TYPE);
- if (!answer || !strstr (answer, RTSP_APPLICATION_SDP))
- return NULL;
+ answer = rtsp.search_answers (RTSP_CONTENT_TYPE);
+ if (!answer || !strstr (answer, RTSP_APPLICATION_SDP)) return NULL;
- /* 2. read SDP message from server */
- sdp = (char *) mp_malloc (content_length + 1);
- if (rtsp_read_data (rtsp_session, sdp, content_length) <= 0)
- {
- delete sdp;
- return NULL;
- }
- sdp[content_length] = 0;
+ /* 2. read SDP message from server */
+ sdp = (char *) mp_malloc (content_length + 1);
+ if (rtsp.read_data (sdp, content_length) <= 0) {
+ delete sdp;
+ return NULL;
+ }
+ sdp[content_length] = 0;
- /* 3. parse SDP message */
- dsc = fsdp_description_new ();
- result = fsdp_parse (sdp, dsc);
- if (result != FSDPE_OK)
- {
+ /* 3. parse SDP message */
+ dsc = fsdp_description_new ();
+ result = fsdp_parse (sdp, dsc);
+ if (result != FSDPE_OK) {
+ delete sdp;
+ fsdp_description_delete (dsc);
+ return NULL;
+ }
+ MSG_V("SDP:\n%s\n", sdp);
delete sdp;
- fsdp_description_delete (dsc);
- return NULL;
- }
- MSG_V("SDP:\n%s\n", sdp);
- delete sdp;
- /* 4. check for number of media streams: only one is supported */
- if (fsdp_get_media_count (dsc) != 1)
- {
- MSG_ERR("A single media stream only is supported atm.\n");
- fsdp_description_delete (dsc);
- return NULL;
- }
+ /* 4. check for number of media streams: only one is supported */
+ if (fsdp_get_media_count (dsc) != 1) {
+ MSG_ERR("A single media stream only is supported atm.\n");
+ fsdp_description_delete (dsc);
+ return NULL;
+ }
- /* 5. set the Normal Play Time parameter
- * use range provided by server in SDP or start now if empty */
- sprintf (npt, RTSP_RANGE);
- if (fsdp_get_range (dsc))
- strcat (npt, fsdp_get_range (dsc));
- else
- strcat (npt, RTSP_NPT_NOW);
+ /* 5. set the Normal Play Time parameter
+ * use range provided by server in SDP or start now if empty */
+ sprintf (npt, RTSP_RANGE);
+ if (fsdp_get_range (dsc)) strcat (npt, fsdp_get_range (dsc));
+ else strcat (npt, RTSP_NPT_NOW);
- /* 5. check for a valid media stream */
- med_dsc = fsdp_get_media (dsc, 0);
- if (!med_dsc)
- {
- fsdp_description_delete (dsc);
- return NULL;
- }
+ /* 5. check for a valid media stream */
+ med_dsc = fsdp_get_media (dsc, 0);
+ if (!med_dsc) {
+ fsdp_description_delete (dsc);
+ return NULL;
+ }
+ /* 6. parse the `m=<media> <port> <transport> <fmt list>' line */
+ /* check for an A/V media */
+ if (fsdp_get_media_type (med_dsc) != FSDP_MEDIA_VIDEO &&
+ fsdp_get_media_type (med_dsc) != FSDP_MEDIA_AUDIO) {
+ fsdp_description_delete (dsc);
+ return NULL;
+ }
- /* 6. parse the `m=<media> <port> <transport> <fmt list>' line */
+ /* only RTP/AVP transport method is supported right now */
+ if (fsdp_get_media_transport_protocol (med_dsc) != FSDP_TP_RTP_AVP) {
+ fsdp_description_delete (dsc);
+ return NULL;
+ }
- /* check for an A/V media */
- if (fsdp_get_media_type (med_dsc) != FSDP_MEDIA_VIDEO &&
- fsdp_get_media_type (med_dsc) != FSDP_MEDIA_AUDIO)
- {
- fsdp_description_delete (dsc);
- return NULL;
- }
+ /* only MPEG-TS is supported at the moment */
+ if (!strstr (fsdp_get_media_format (med_dsc, 0),
+ RTSP_MEDIA_CONTAINER_MPEG_TS)) {
+ fsdp_description_delete (dsc);
+ return NULL;
+ }
- /* only RTP/AVP transport method is supported right now */
- if (fsdp_get_media_transport_protocol (med_dsc) != FSDP_TP_RTP_AVP)
- {
- fsdp_description_delete (dsc);
- return NULL;
- }
+ /* get client port (if any) advised by server */
+ client_rtp_port = fsdp_get_media_port (med_dsc);
+ if (client_rtp_port == -1) {
+ fsdp_description_delete (dsc);
+ return NULL;
+ }
- /* only MPEG-TS is supported at the moment */
- if (!strstr (fsdp_get_media_format (med_dsc, 0),
- RTSP_MEDIA_CONTAINER_MPEG_TS))
- {
- fsdp_description_delete (dsc);
- return NULL;
- }
+ /* if client_rtp_port = 0 => let client randomly pick one */
+ if (client_rtp_port == 0) {
+ /* TODO: we should check if the port is in use first */
+ if (rtp_session->rtsp_port) client_rtp_port = rtp_session->rtsp_port;
+ else client_rtp_port = RTSP_DEFAULT_PORT;
+ }
- /* get client port (if any) advised by server */
- client_rtp_port = fsdp_get_media_port (med_dsc);
- if (client_rtp_port == -1)
- {
- fsdp_description_delete (dsc);
- return NULL;
- }
+ /* RTCP port generally is RTP port + 1 */
+ client_rtcp_port = client_rtp_port + 1;
- /* if client_rtp_port = 0 => let client randomly pick one */
- if (client_rtp_port == 0)
- {
- /* TODO: we should check if the port is in use first */
- if (rtsp_port)
- client_rtp_port = rtsp_port;
- else
- client_rtp_port = RTSP_DEFAULT_PORT;
- }
+ MSG_V("RTP Port from SDP appears to be: %d\n", client_rtp_port);
+ MSG_V("RTCP Port from SDP appears to be: %d\n", client_rtcp_port);
- /* RTCP port generally is RTP port + 1 */
- client_rtcp_port = client_rtp_port + 1;
+ /* 7. parse the `c=<network type> <addr type> <connection address>' line */
+ /* check for a valid media network type (inet) */
+ if (fsdp_get_media_network_type (med_dsc) != FSDP_NETWORK_TYPE_INET) {
+ /* no control for media: try global one instead */
+ if (fsdp_get_global_conn_network_type (dsc) != FSDP_NETWORK_TYPE_INET) {
+ fsdp_description_delete (dsc);
+ return NULL;
+ }
+ }
- MSG_V("RTP Port from SDP appears to be: %d\n", client_rtp_port);
- MSG_V("RTCP Port from SDP appears to be: %d\n", client_rtcp_port);
+ /* only IPv4 is supported atm. */
+ if (fsdp_get_media_address_type (med_dsc) != FSDP_ADDRESS_TYPE_IPV4) {
+ /* no control for media: try global one instead */
+ if (fsdp_get_global_conn_address_type (dsc) != FSDP_ADDRESS_TYPE_IPV4) {
+ fsdp_description_delete (dsc);
+ return NULL;
+ }
+ }
- /* 7. parse the `c=<network type> <addr type> <connection address>' line */
-
- /* check for a valid media network type (inet) */
- if (fsdp_get_media_network_type (med_dsc) != FSDP_NETWORK_TYPE_INET)
- {
- /* no control for media: try global one instead */
- if (fsdp_get_global_conn_network_type (dsc) != FSDP_NETWORK_TYPE_INET)
- {
- fsdp_description_delete (dsc);
- return NULL;
+ /* get the media server address to connect to */
+ if (fsdp_get_media_address (med_dsc)) server_addr = mp_strdup (fsdp_get_media_address (med_dsc));
+ else if (fsdp_get_global_conn_address (dsc)) {
+ /* no control for media: try global one instead */
+ server_addr = mp_strdup (fsdp_get_global_conn_address (dsc));
}
- }
- /* only IPv4 is supported atm. */
- if (fsdp_get_media_address_type (med_dsc) != FSDP_ADDRESS_TYPE_IPV4)
- {
- /* no control for media: try global one instead */
- if (fsdp_get_global_conn_address_type (dsc) != FSDP_ADDRESS_TYPE_IPV4)
- {
- fsdp_description_delete (dsc);
- return NULL;
+ if (!server_addr) {
+ fsdp_description_delete (dsc);
+ return NULL;
}
- }
- /* get the media server address to connect to */
- if (fsdp_get_media_address (med_dsc))
- server_addr = mp_strdup (fsdp_get_media_address (med_dsc));
- else if (fsdp_get_global_conn_address (dsc))
- {
- /* no control for media: try global one instead */
- server_addr = mp_strdup (fsdp_get_global_conn_address (dsc));
- }
+ /* check for a UNICAST or MULTICAST address to connect to */
+ is_multicast = rtp_session->is_multicast_address (server_addr);
- if (!server_addr)
- {
- fsdp_description_delete (dsc);
- return NULL;
- }
+ /* 8. initiate an RTP session */
+ rtp_session = new(zeromem) Rtp_Rtsp_Session;
+ if (!rtp_session) {
+ delete server_addr;
+ fsdp_description_delete (dsc);
+ return NULL;
+ }
- /* check for a UNICAST or MULTICAST address to connect to */
- is_multicast = is_multicast_address (server_addr);
-
- /* 8. initiate an RTP session */
- rtp_session = rtp_session_new ();
- if (!rtp_session)
- {
- delete server_addr;
+ /* get the media control URL */
+ if (fsdp_get_media_control (med_dsc, 0))
+ rtp_session->control_url = mp_strdup (fsdp_get_media_control (med_dsc, 0));
fsdp_description_delete (dsc);
- return NULL;
- }
+ if (!rtp_session->control_url) {
+ delete server_addr;
+ delete rtp_session;
+ return NULL;
+ }
- /* get the media control URL */
- if (fsdp_get_media_control (med_dsc, 0))
- rtp_session->control_url = mp_strdup (fsdp_get_media_control (med_dsc, 0));
- fsdp_description_delete (dsc);
- if (!rtp_session->control_url)
- {
- delete server_addr;
- rtp_session_free (rtp_session);
- return NULL;
- }
-
- /* 9. create the payload for RTSP SETUP request */
- memset (temp_buf, '\0', MAX_LENGTH);
- snprintf (temp_buf, MAX_LENGTH,
+ /* 9. create the payload for RTSP SETUP request */
+ memset (temp_buf, '\0', MAX_LENGTH);
+ snprintf (temp_buf, MAX_LENGTH,
RTSP_TRANSPORT_REQUEST,
is_multicast ? RTSP_TRANSPORT_MULTICAST : RTSP_TRANSPORT_UNICAST,
is_multicast ? RTSP_MULTICAST_PORT : RTSP_UNICAST_CLIENT_PORT,
client_rtp_port, client_rtcp_port);
- MSG_V("RTSP Transport: %s\n", temp_buf);
+ MSG_V("RTSP Transport: %s\n", temp_buf);
- rtsp_unschedule_field (rtsp_session, RTSP_SESSION);
- rtsp_schedule_field (rtsp_session, temp_buf);
+ rtsp.unschedule_field (RTSP_SESSION);
+ rtsp.schedule_field (temp_buf);
- /* 10. check for the media control URL type and initiate RTSP SETUP */
- if (!strncmp (rtp_session->control_url, "rtsp://", 7)) /* full URL */
- statut = rtsp_request_setup (rtsp_session,
- rtp_session->control_url, NULL);
- else /* relative URL */
- statut = rtsp_request_setup (rtsp_session,
- NULL, rtp_session->control_url);
+ /* 10. check for the media control URL type and initiate RTSP SETUP */
+ if (!strncmp (rtp_session->control_url, "rtsp://", 7)) /* full URL */
+ statut = rtsp.request_setup (rtp_session->control_url, NULL);
+ else /* relative URL */
+ statut = rtsp.request_setup (NULL, rtp_session->control_url);
- if (statut < 200 || statut > 299)
- {
- delete server_addr;
- rtp_session_free (rtp_session);
- return NULL;
- }
+ if (statut < 200 || statut > 299) {
+ delete server_addr;
+ delete rtp_session;
+ return NULL;
+ }
- /* 11. parse RTSP SETUP response: we need it to actually determine
- * the real address and port to connect to */
- answer = rtsp_search_answers (rtsp_session, RTSP_TRANSPORT);
- if (!answer)
- {
- delete server_addr;
- rtp_session_free (rtp_session);
- return NULL;
- }
+ /* 11. parse RTSP SETUP response: we need it to actually determine
+ * the real address and port to connect to */
+ answer = rtsp.search_answers (RTSP_TRANSPORT);
+ if (!answer) {
+ delete server_addr;
+ delete rtp_session;
+ return NULL;
+ }
- /* check for RTP and RTCP ports to bind according to how request was done */
- is_multicast = 0;
- if (strstr (answer, RTSP_TRANSPORT_MULTICAST))
- is_multicast = 1;
+ /* check for RTP and RTCP ports to bind according to how request was done */
+ is_multicast = 0;
+ if (strstr (answer, RTSP_TRANSPORT_MULTICAST)) is_multicast = 1;
- if (is_multicast)
- parse_port (answer, RTSP_MULTICAST_PORT,
+ if (is_multicast)
+ rtp_session->parse_port (answer, RTSP_MULTICAST_PORT,
+ &client_rtp_port, &client_rtcp_port);
+ else {
+ rtp_session->parse_port (answer, RTSP_UNICAST_CLIENT_PORT,
&client_rtp_port, &client_rtcp_port);
- else
- {
- parse_port (answer, RTSP_UNICAST_CLIENT_PORT,
- &client_rtp_port, &client_rtcp_port);
- parse_port (answer, RTSP_UNICAST_SERVER_PORT,
+ rtp_session->parse_port (answer, RTSP_UNICAST_SERVER_PORT,
&server_rtp_port, &server_rtcp_port);
- }
+ }
- /* now check network settings as determined by server */
- if (rtsp_destination)
- destination = mp_strdup (rtsp_destination);
- else
- destination = parse_destination (answer);
- if (!destination)
- destination = mp_strdup (server_addr);
- delete server_addr;
+ /* now check network settings as determined by server */
+ if (rtp_session->rtsp_destination) destination = mp_strdup (rtp_session->rtsp_destination);
+ else destination = rtp_session->parse_destination (answer);
+ if (!destination) destination = mp_strdup (server_addr);
+ delete server_addr;
- MSG_V("RTSP Destination: %s\n"
+ MSG_V("RTSP Destination: %s\n"
"Client RTP port : %d\n"
"Client RTCP port : %d\n"
"Server RTP port : %d\n"
@@ -676,29 +548,28 @@
, server_rtp_port
, server_rtcp_port);
- /* 12. performs RTSP PLAY request */
- rtsp_schedule_field (rtsp_session, npt);
- statut = rtsp_request_play (rtsp_session, NULL);
- if (statut < 200 || statut > 299)
- {
+ /* 12. performs RTSP PLAY request */
+ rtsp.schedule_field (npt);
+ statut = rtsp.request_play (NULL);
+ if (statut < 200 || statut > 299) {
+ delete destination;
+ delete rtp_session;
+ return NULL;
+ }
+
+ /* 13. create RTP and RTCP connections */
+ rtp_sock = rtp_session->rtp_connect (destination, client_rtp_port);
+ rtcp_sock = rtp_session->rtcp_connect (client_rtcp_port, server_rtcp_port, destination);
+ rtp_session->set_fd (rtp_sock, rtcp_sock);
delete destination;
- rtp_session_free (rtp_session);
- return NULL;
- }
- /* 13. create RTP and RTCP connections */
- rtp_sock = rtp_connect (destination, client_rtp_port);
- rtcp_sock = rtcp_connect (client_rtcp_port, server_rtcp_port, destination);
- rtp_session_set_fd (rtp_session, rtp_sock, rtcp_sock);
- delete destination;
+ MSG_V("RTP Sock : %d\nRTCP Sock : %d\n",rtp_session->rtp_socket, rtp_session->rtcp_socket);
- MSG_V("RTP Sock : %d\nRTCP Sock : %d\n",rtp_session->rtp_socket, rtp_session->rtcp_socket);
-
- if (rtp_session->rtp_socket == -1)
- {
- rtp_session_free (rtp_session);
- return NULL;
- }
-
- return rtp_session;
+ if (rtp_session->rtp_socket == -1) {
+ delete rtp_session;
+ return NULL;
+ }
+ return rtp_session;
}
+int Rtp_Rtsp_Session::get_rtp_socket() const { return rtp_socket; }
+} // namespace mpxp
Modified: mplayerxp/libmpstream2/librtsp/rtsp_rtp.h
===================================================================
--- mplayerxp/libmpstream2/librtsp/rtsp_rtp.h 2012-12-18 13:04:29 UTC (rev 572)
+++ mplayerxp/libmpstream2/librtsp/rtsp_rtp.h 2012-12-18 15:09:54 UTC (rev 573)
@@ -23,19 +23,31 @@
#include "rtsp.h"
+namespace mpxp {
#define MAX_PREVIEW_SIZE 4096
+ class Rtp_Rtsp_Session : public Opaque {
+ public:
+ Rtp_Rtsp_Session();
+ virtual ~Rtp_Rtsp_Session();
-struct rtp_rtsp_session_t {
- int rtp_socket;
- int rtcp_socket;
- char *control_url;
- int count;
-};
+ static Rtp_Rtsp_Session* setup_and_play(Rtsp& rtsp_session);
+ virtual void rtcp_send_rr (Rtsp& s);
+ virtual int get_rtp_socket() const;
+ private:
+ void set_fd (int rtp_sock, int rtcp_sock);
+ int parse_port (const char *line, const char *param, int *rtp_port, int *rtcp_port) const;
+ char* parse_destination (const char *line) const;
+ int rtcp_connect (int client_port, int server_port, const char* server_hostname) const;
+ int rtp_connect (const char *hostname, int port) const;
+ int is_multicast_address (const char *addr) const;
-struct rtp_rtsp_session_t *rtp_setup_and_play (rtsp_t* rtsp_session);
-off_t rtp_read (struct rtp_rtsp_session_t* st, char *buf, off_t length);
-void rtp_session_free (struct rtp_rtsp_session_t *st);
-void rtcp_send_rr (rtsp_t *s, struct rtp_rtsp_session_t *st);
-
+ int rtp_socket;
+ int rtcp_socket;
+ char* control_url;
+ int count;
+ int rtsp_port;
+ char* rtsp_destination;
+ };
+} // names...
[truncated message content] |
