scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-04-07 18:05:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

-t rtsp:uri(without rtsp://):port

Browse Source
This commit is contained in:
Castillo, Gerard
2013-07-24 17:45:27 +02:00
parent d5fc6d784f
commit 9eb224d03f
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/video_capture/rtsp.c
View File

@@ -254,7 +254,7 @@ void *vidcap_rtsp_init(char *fmt, unsigned int flags){
printf("\t-t rtsp:<uri>:<port>:<ethX>\n");
printf("\t\t <uri> uri server without 'rtsp://' \n");
printf("\t\t <port> receiver port \n");
printf("\t\t <ethX> receiver network interface\n");
// printf("\t\t <ethX> receiver network interface\n");
//show_codec_help("rtsp");
return &vidcap_init_noerr;
}
@@ -276,16 +276,17 @@ void *vidcap_rtsp_init(char *fmt, unsigned int flags){
}
s->port = atoi(tmp);
tmp = strtok_r(NULL, ":", &save_ptr);
if (!tmp) {
fprintf(stderr, "[rtsp] Wrong format for rtsp '%s' - no receiver interface specified\n", tmp);
free(s);
return NULL;
}
s->ethX = malloc(strlen(tmp) + 32);
sprintf(s->ethX, "%s",tmp);
s->addr=get_ip_from_ethX(s->ethX);//"127.0.0.1";
printf("\n[rtsp] network interface %s selected with IP %s\n",s->ethX,s->addr);
// tmp = strtok_r(NULL, ":", &save_ptr);
// if (!tmp) {
// fprintf(stderr, "[rtsp] Wrong format for rtsp '%s' - no receiver interface specified\n", tmp);
// free(s);
// return NULL;
// }
// s->ethX = malloc(strlen(tmp) + 32);
// sprintf(s->ethX, "%s",tmp);
// s->addr=get_ip_from_ethX(s->ethX);//"127.0.0.1";
// printf("\n[rtsp] network interface %s selected with IP %s\n",s->ethX,s->addr);
s->addr="127.0.0.1";
s->should_exit = false;
@@ -583,7 +584,5 @@ void vidcap_rtsp_done(void *state){
/* forced sigaction handler when rtsp init waits... */
void sigaction_handler()
{
vidcap_rtsp_done(s_global);
}