Mercurial > libavformat.hg
annotate rtsp.c @ 4332:0d776969b708 libavformat
Fix the Transport: line in the SETUP request so that it works with WMS
servers when trying to set up a session over TCP:
- add the interleave property
- add unicast, only for WMS (since it is normally only UDP, but WMS expects it
for UDP and TCP)
- add mode=play
See discussion in "[PATCH] RTSP-MS 9/15: add interleave property to the TCP
transport line of the SETUP request" thread on mailinglist.
| author | rbultje |
|---|---|
| date | Sun, 01 Feb 2009 13:37:45 +0000 |
| parents | f49e5d92ab26 |
| children | 3ae604db67e0 |
| rev | line source |
|---|---|
| 0 | 1 /* |
| 2 * RTSP/SDP client | |
|
4251
77e0c7511d41
cosmetics: Remove pointless period after copyright statement non-sentences.
diego
parents:
4206
diff
changeset
|
3 * Copyright (c) 2002 Fabrice Bellard |
| 0 | 4 * |
|
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1169
diff
changeset
|
5 * This file is part of FFmpeg. |
|
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1169
diff
changeset
|
6 * |
|
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1169
diff
changeset
|
7 * FFmpeg is free software; you can redistribute it and/or |
| 0 | 8 * modify it under the terms of the GNU Lesser General Public |
| 9 * License as published by the Free Software Foundation; either | |
|
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1169
diff
changeset
|
10 * version 2.1 of the License, or (at your option) any later version. |
| 0 | 11 * |
|
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1169
diff
changeset
|
12 * FFmpeg is distributed in the hope that it will be useful, |
| 0 | 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 15 * Lesser General Public License for more details. | |
| 16 * | |
| 17 * You should have received a copy of the GNU Lesser General Public | |
|
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1169
diff
changeset
|
18 * License along with FFmpeg; if not, write to the Free Software |
|
896
edbe5c3717f9
Update licensing information: The FSF changed postal address.
diego
parents:
887
diff
changeset
|
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 0 | 20 */ |
| 3286 | 21 |
|
3722
68749aaea50f
ensure we get explicit definition of various _XOPEN_SOURCE functions we use
aurel
parents:
3714
diff
changeset
|
22 /* needed by inet_aton() */ |
|
68749aaea50f
ensure we get explicit definition of various _XOPEN_SOURCE functions we use
aurel
parents:
3714
diff
changeset
|
23 #define _SVID_SOURCE |
|
68749aaea50f
ensure we get explicit definition of various _XOPEN_SOURCE functions we use
aurel
parents:
3714
diff
changeset
|
24 |
| 3286 | 25 #include "libavutil/avstring.h" |
|
4201
7d2f3f1b68d8
Fix build: Add intreadwrite.h and bswap.h #includes where necessary.
diego
parents:
4187
diff
changeset
|
26 #include "libavutil/intreadwrite.h" |
| 0 | 27 #include "avformat.h" |
| 28 | |
|
1808
572ce77d7333
Fix compilation on Mac OS X, patch by Marc Hoffman, mmh pleasantst com.
diego
parents:
1754
diff
changeset
|
29 #include <sys/time.h> |
| 4206 | 30 #if HAVE_SYS_SELECT_H |
|
3936
6154f62ef652
include sys/select.h instead of unistd.h to get select,
bcoudurier
parents:
3924
diff
changeset
|
31 #include <sys/select.h> |
|
3941
53c5b89b8dff
only include sys/select.h if present, fix mingw compilation
bcoudurier
parents:
3936
diff
changeset
|
32 #endif |
| 3714 | 33 #include <strings.h> |
| 1754 | 34 #include "network.h" |
|
2681
6037eb4919fb
Remove the inclusion of rtsp.h and rtp.h from avformat.h, and
lucabe
parents:
2408
diff
changeset
|
35 #include "rtsp.h" |
| 0 | 36 |
|
4291
f49e5d92ab26
Merge rtp_internal.h in rtp.h, and remove rtp_internal.h
lucabe
parents:
4281
diff
changeset
|
37 #include "rtp.h" |
|
3876
1026953d4ffe
Implement Realmedia/RTSP-compatible SETUP command. This includes calculation
rbultje
parents:
3861
diff
changeset
|
38 #include "rdt.h" |
| 1419 | 39 |
| 0 | 40 //#define DEBUG |
| 172 | 41 //#define DEBUG_RTP_TCP |
| 0 | 42 |
|
304
d58c8859ff8c
initial seek support - more generic play/pause support
bellard
parents:
294
diff
changeset
|
43 static int rtsp_read_play(AVFormatContext *s); |
|
d58c8859ff8c
initial seek support - more generic play/pause support
bellard
parents:
294
diff
changeset
|
44 |
| 0 | 45 /* XXX: currently, the only way to change the protocols consists in |
| 46 changing this variable */ | |
| 47 | |
| 2884 | 48 #if LIBAVFORMAT_VERSION_INT < (53 << 16) |
|
3957
9f943bb755f9
Rename RTSPProtocol to RTSPLowerTransport, so that its name properly tells us
rbultje
parents:
3941
diff
changeset
|
49 int rtsp_default_protocols = (1 << RTSP_LOWER_TRANSPORT_UDP); |
| 2884 | 50 #endif |
| 0 | 51 |
| 52 static int rtsp_probe(AVProbeData *p) | |
| 53 { | |
|
2193
5ce5fad0dfac
replace the uses of old string functions that Reimar missed
mru
parents:
2189
diff
changeset
|
54 if (av_strstart(p->filename, "rtsp:", NULL)) |
| 0 | 55 return AVPROBE_SCORE_MAX; |
| 56 return 0; | |
| 57 } | |
| 58 | |
| 59 static int redir_isspace(int c) | |
| 60 { | |
| 3278 | 61 return c == ' ' || c == '\t' || c == '\n' || c == '\r'; |
| 0 | 62 } |
| 63 | |
| 64 static void skip_spaces(const char **pp) | |
| 65 { | |
| 66 const char *p; | |
| 67 p = *pp; | |
| 68 while (redir_isspace(*p)) | |
| 69 p++; | |
| 70 *pp = p; | |
| 71 } | |
| 72 | |
| 885 | 73 static void get_word_sep(char *buf, int buf_size, const char *sep, |
| 0 | 74 const char **pp) |
| 75 { | |
| 76 const char *p; | |
| 77 char *q; | |
| 78 | |
| 79 p = *pp; | |
| 774 | 80 if (*p == '/') |
| 81 p++; | |
| 0 | 82 skip_spaces(&p); |
| 83 q = buf; | |
| 84 while (!strchr(sep, *p) && *p != '\0') { | |
| 85 if ((q - buf) < buf_size - 1) | |
| 86 *q++ = *p; | |
| 87 p++; | |
| 88 } | |
| 89 if (buf_size > 0) | |
| 90 *q = '\0'; | |
| 91 *pp = p; | |
| 92 } | |
| 93 | |
| 94 static void get_word(char *buf, int buf_size, const char **pp) | |
| 95 { | |
| 96 const char *p; | |
| 97 char *q; | |
| 98 | |
| 99 p = *pp; | |
| 100 skip_spaces(&p); | |
| 101 q = buf; | |
| 102 while (!redir_isspace(*p) && *p != '\0') { | |
| 103 if ((q - buf) < buf_size - 1) | |
| 104 *q++ = *p; | |
| 105 p++; | |
| 106 } | |
| 107 if (buf_size > 0) | |
| 108 *q = '\0'; | |
| 109 *pp = p; | |
| 110 } | |
| 111 | |
| 112 /* parse the rtpmap description: <codec_name>/<clock_rate>[/<other | |
| 113 params>] */ | |
| 1419 | 114 static int sdp_parse_rtpmap(AVCodecContext *codec, RTSPStream *rtsp_st, int payload_type, const char *p) |
| 0 | 115 { |
| 116 char buf[256]; | |
| 774 | 117 int i; |
| 118 AVCodec *c; | |
|
1124
d3aff2c607f9
Add const to (mostly) char* and make some functions static, which aren't used
diego
parents:
1003
diff
changeset
|
119 const char *c_name; |
| 0 | 120 |
| 774 | 121 /* Loop into AVRtpDynamicPayloadTypes[] and AVRtpPayloadTypes[] and |
| 122 see if we can handle this kind of payload */ | |
| 0 | 123 get_word_sep(buf, sizeof(buf), "/", &p); |
| 774 | 124 if (payload_type >= RTP_PT_PRIVATE) { |
| 1419 | 125 RTPDynamicProtocolHandler *handler= RTPFirstDynamicPayloadHandler; |
| 126 while(handler) { | |
| 127 if (!strcmp(buf, handler->enc_name) && (codec->codec_type == handler->codec_type)) { | |
| 128 codec->codec_id = handler->codec_id; | |
| 129 rtsp_st->dynamic_handler= handler; | |
| 130 if(handler->open) { | |
| 131 rtsp_st->dynamic_protocol_context= handler->open(); | |
| 132 } | |
| 774 | 133 break; |
| 134 } | |
| 1419 | 135 handler= handler->next; |
| 136 } | |
| 774 | 137 } else { |
| 138 /* We are in a standard case ( from http://www.iana.org/assignments/rtp-parameters) */ | |
| 139 /* search into AVRtpPayloadTypes[] */ | |
|
2759
b252e318023a
Remove the "AVRtpPayloadTypes[i].pt == i" assumption from RTP and RTSP
lucabe
parents:
2711
diff
changeset
|
140 codec->codec_id = ff_rtp_codec_id(buf, codec->codec_type); |
| 774 | 141 } |
| 142 | |
| 143 c = avcodec_find_decoder(codec->codec_id); | |
| 144 if (c && c->name) | |
|
1124
d3aff2c607f9
Add const to (mostly) char* and make some functions static, which aren't used
diego
parents:
1003
diff
changeset
|
145 c_name = c->name; |
| 774 | 146 else |
| 147 c_name = (char *)NULL; | |
| 148 | |
| 149 if (c_name) { | |
| 150 get_word_sep(buf, sizeof(buf), "/", &p); | |
| 151 i = atoi(buf); | |
| 152 switch (codec->codec_type) { | |
| 153 case CODEC_TYPE_AUDIO: | |
| 154 av_log(codec, AV_LOG_DEBUG, " audio codec set to : %s\n", c_name); | |
| 155 codec->sample_rate = RTSP_DEFAULT_AUDIO_SAMPLERATE; | |
| 156 codec->channels = RTSP_DEFAULT_NB_AUDIO_CHANNELS; | |
| 157 if (i > 0) { | |
| 158 codec->sample_rate = i; | |
| 159 get_word_sep(buf, sizeof(buf), "/", &p); | |
| 160 i = atoi(buf); | |
| 161 if (i > 0) | |
| 162 codec->channels = i; | |
|
1431
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1425
diff
changeset
|
163 // TODO: there is a bug here; if it is a mono stream, and less than 22000Hz, faad upconverts to stereo and twice the |
|
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1425
diff
changeset
|
164 // frequency. No problem, but the sample rate is being set here by the sdp line. Upcoming patch forthcoming. (rdm) |
| 774 | 165 } |
| 166 av_log(codec, AV_LOG_DEBUG, " audio samplerate set to : %i\n", codec->sample_rate); | |
| 167 av_log(codec, AV_LOG_DEBUG, " audio channels set to : %i\n", codec->channels); | |
| 168 break; | |
| 169 case CODEC_TYPE_VIDEO: | |
| 170 av_log(codec, AV_LOG_DEBUG, " video codec set to : %s\n", c_name); | |
| 171 break; | |
| 172 default: | |
| 173 break; | |
| 174 } | |
| 0 | 175 return 0; |
| 176 } | |
| 774 | 177 |
| 178 return -1; | |
| 0 | 179 } |
| 180 | |
| 181 /* return the length and optionnaly the data */ | |
| 182 static int hex_to_data(uint8_t *data, const char *p) | |
| 183 { | |
| 184 int c, len, v; | |
| 185 | |
| 186 len = 0; | |
| 187 v = 1; | |
| 188 for(;;) { | |
| 189 skip_spaces(&p); | |
| 190 if (p == '\0') | |
| 191 break; | |
| 192 c = toupper((unsigned char)*p++); | |
| 193 if (c >= '0' && c <= '9') | |
| 194 c = c - '0'; | |
| 195 else if (c >= 'A' && c <= 'F') | |
| 196 c = c - 'A' + 10; | |
| 197 else | |
| 198 break; | |
| 199 v = (v << 4) | c; | |
| 200 if (v & 0x100) { | |
| 201 if (data) | |
| 202 data[len] = v; | |
| 203 len++; | |
| 204 v = 1; | |
| 205 } | |
| 206 } | |
| 207 return len; | |
| 208 } | |
| 209 | |
| 774 | 210 static void sdp_parse_fmtp_config(AVCodecContext *codec, char *attr, char *value) |
| 211 { | |
| 212 switch (codec->codec_id) { | |
| 213 case CODEC_ID_MPEG4: | |
|
1472
49d5a5ca2987
get rid of CODEC_ID_MPEG4AAC after next version bump, and change it to CODEC_ID_AAC where used
bcoudurier
parents:
1453
diff
changeset
|
214 case CODEC_ID_AAC: |
| 774 | 215 if (!strcmp(attr, "config")) { |
| 216 /* decode the hexa encoded parameter */ | |
| 217 int len = hex_to_data(NULL, value); | |
| 218 codec->extradata = av_mallocz(len + FF_INPUT_BUFFER_PADDING_SIZE); | |
| 219 if (!codec->extradata) | |
| 220 return; | |
| 221 codec->extradata_size = len; | |
| 222 hex_to_data(codec->extradata, value); | |
| 223 } | |
| 224 break; | |
| 225 default: | |
| 226 break; | |
| 227 } | |
| 228 return; | |
| 229 } | |
| 230 | |
| 4088 | 231 typedef struct { |
|
1124
d3aff2c607f9
Add const to (mostly) char* and make some functions static, which aren't used
diego
parents:
1003
diff
changeset
|
232 const char *str; |
| 774 | 233 uint16_t type; |
| 234 uint32_t offset; | |
| 4088 | 235 } AttrNameMap; |
| 774 | 236 |
| 237 /* All known fmtp parmeters and the corresping RTPAttrTypeEnum */ | |
| 238 #define ATTR_NAME_TYPE_INT 0 | |
| 239 #define ATTR_NAME_TYPE_STR 1 | |
| 4088 | 240 static const AttrNameMap attr_names[]= |
| 774 | 241 { |
|
4101
af2c0aef892b
Rename rtp_payload_data_t to avoid clashes with the POSIX namespace
lucabe
parents:
4088
diff
changeset
|
242 {"SizeLength", ATTR_NAME_TYPE_INT, offsetof(RTPPayloadData, sizelength)}, |
|
af2c0aef892b
Rename rtp_payload_data_t to avoid clashes with the POSIX namespace
lucabe
parents:
4088
diff
changeset
|
243 {"IndexLength", ATTR_NAME_TYPE_INT, offsetof(RTPPayloadData, indexlength)}, |
|
af2c0aef892b
Rename rtp_payload_data_t to avoid clashes with the POSIX namespace
lucabe
parents:
4088
diff
changeset
|
244 {"IndexDeltaLength", ATTR_NAME_TYPE_INT, offsetof(RTPPayloadData, indexdeltalength)}, |
|
af2c0aef892b
Rename rtp_payload_data_t to avoid clashes with the POSIX namespace
lucabe
parents:
4088
diff
changeset
|
245 {"profile-level-id", ATTR_NAME_TYPE_INT, offsetof(RTPPayloadData, profile_level_id)}, |
|
af2c0aef892b
Rename rtp_payload_data_t to avoid clashes with the POSIX namespace
lucabe
parents:
4088
diff
changeset
|
246 {"StreamType", ATTR_NAME_TYPE_INT, offsetof(RTPPayloadData, streamtype)}, |
|
af2c0aef892b
Rename rtp_payload_data_t to avoid clashes with the POSIX namespace
lucabe
parents:
4088
diff
changeset
|
247 {"mode", ATTR_NAME_TYPE_STR, offsetof(RTPPayloadData, mode)}, |
| 774 | 248 {NULL, -1, -1}, |
| 249 }; | |
| 250 | |
|
1431
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1425
diff
changeset
|
251 /** parse the attribute line from the fmtp a line of an sdp resonse. This is broken out as a function |
|
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1425
diff
changeset
|
252 * because it is used in rtp_h264.c, which is forthcoming. |
|
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1425
diff
changeset
|
253 */ |
|
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1425
diff
changeset
|
254 int rtsp_next_attr_and_value(const char **p, char *attr, int attr_size, char *value, int value_size) |
|
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1425
diff
changeset
|
255 { |
|
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1425
diff
changeset
|
256 skip_spaces(p); |
|
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1425
diff
changeset
|
257 if(**p) |
|
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1425
diff
changeset
|
258 { |
|
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1425
diff
changeset
|
259 get_word_sep(attr, attr_size, "=", p); |
|
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1425
diff
changeset
|
260 if (**p == '=') |
|
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1425
diff
changeset
|
261 (*p)++; |
|
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1425
diff
changeset
|
262 get_word_sep(value, value_size, ";", p); |
|
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1425
diff
changeset
|
263 if (**p == ';') |
|
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1425
diff
changeset
|
264 (*p)++; |
|
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1425
diff
changeset
|
265 return 1; |
|
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1425
diff
changeset
|
266 } |
|
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1425
diff
changeset
|
267 return 0; |
|
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1425
diff
changeset
|
268 } |
|
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1425
diff
changeset
|
269 |
| 774 | 270 /* parse a SDP line and save stream attributes */ |
| 271 static void sdp_parse_fmtp(AVStream *st, const char *p) | |
| 0 | 272 { |
| 273 char attr[256]; | |
| 274 char value[4096]; | |
| 774 | 275 int i; |
| 276 | |
| 277 RTSPStream *rtsp_st = st->priv_data; | |
|
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
774
diff
changeset
|
278 AVCodecContext *codec = st->codec; |
|
4101
af2c0aef892b
Rename rtp_payload_data_t to avoid clashes with the POSIX namespace
lucabe
parents:
4088
diff
changeset
|
279 RTPPayloadData *rtp_payload_data = &rtsp_st->rtp_payload_data; |
| 0 | 280 |
| 281 /* loop on each attribute */ | |
|
1514
958decd51c1f
remove duplicate code, patch by Ryan Martell rdm4 A martellventures P com
gpoirier
parents:
1472
diff
changeset
|
282 while(rtsp_next_attr_and_value(&p, attr, sizeof(attr), value, sizeof(value))) |
|
958decd51c1f
remove duplicate code, patch by Ryan Martell rdm4 A martellventures P com
gpoirier
parents:
1472
diff
changeset
|
283 { |
| 887 | 284 /* grab the codec extra_data from the config parameter of the fmtp line */ |
| 774 | 285 sdp_parse_fmtp_config(codec, attr, value); |
| 286 /* Looking for a known attribute */ | |
| 287 for (i = 0; attr_names[i].str; ++i) { | |
| 288 if (!strcasecmp(attr, attr_names[i].str)) { | |
| 289 if (attr_names[i].type == ATTR_NAME_TYPE_INT) | |
| 290 *(int *)((char *)rtp_payload_data + attr_names[i].offset) = atoi(value); | |
| 291 else if (attr_names[i].type == ATTR_NAME_TYPE_STR) | |
| 292 *(char **)((char *)rtp_payload_data + attr_names[i].offset) = av_strdup(value); | |
| 887 | 293 } |
| 0 | 294 } |
| 295 } | |
| 296 } | |
| 297 | |
|
1453
c0235bab9e92
Add support for getting duration of a RTP stream (for seeking in stream)
gpoirier
parents:
1431
diff
changeset
|
298 /** Parse a string \p in the form of Range:npt=xx-xx, and determine the start |
|
c0235bab9e92
Add support for getting duration of a RTP stream (for seeking in stream)
gpoirier
parents:
1431
diff
changeset
|
299 * and end time. |
|
c0235bab9e92
Add support for getting duration of a RTP stream (for seeking in stream)
gpoirier
parents:
1431
diff
changeset
|
300 * Used for seeking in the rtp stream. |
|
c0235bab9e92
Add support for getting duration of a RTP stream (for seeking in stream)
gpoirier
parents:
1431
diff
changeset
|
301 */ |
|
c0235bab9e92
Add support for getting duration of a RTP stream (for seeking in stream)
gpoirier
parents:
1431
diff
changeset
|
302 static void rtsp_parse_range_npt(const char *p, int64_t *start, int64_t *end) |
|
c0235bab9e92
Add support for getting duration of a RTP stream (for seeking in stream)
gpoirier
parents:
1431
diff
changeset
|
303 { |
|
c0235bab9e92
Add support for getting duration of a RTP stream (for seeking in stream)
gpoirier
parents:
1431
diff
changeset
|
304 char buf[256]; |
|
c0235bab9e92
Add support for getting duration of a RTP stream (for seeking in stream)
gpoirier
parents:
1431
diff
changeset
|
305 |
|
c0235bab9e92
Add support for getting duration of a RTP stream (for seeking in stream)
gpoirier
parents:
1431
diff
changeset
|
306 skip_spaces(&p); |
|
2193
5ce5fad0dfac
replace the uses of old string functions that Reimar missed
mru
parents:
2189
diff
changeset
|
307 if (!av_stristart(p, "npt=", &p)) |
|
1453
c0235bab9e92
Add support for getting duration of a RTP stream (for seeking in stream)
gpoirier
parents:
1431
diff
changeset
|
308 return; |
|
c0235bab9e92
Add support for getting duration of a RTP stream (for seeking in stream)
gpoirier
parents:
1431
diff
changeset
|
309 |
|
c0235bab9e92
Add support for getting duration of a RTP stream (for seeking in stream)
gpoirier
parents:
1431
diff
changeset
|
310 *start = AV_NOPTS_VALUE; |
|
c0235bab9e92
Add support for getting duration of a RTP stream (for seeking in stream)
gpoirier
parents:
1431
diff
changeset
|
311 *end = AV_NOPTS_VALUE; |
|
c0235bab9e92
Add support for getting duration of a RTP stream (for seeking in stream)
gpoirier
parents:
1431
diff
changeset
|
312 |
|
c0235bab9e92
Add support for getting duration of a RTP stream (for seeking in stream)
gpoirier
parents:
1431
diff
changeset
|
313 get_word_sep(buf, sizeof(buf), "-", &p); |
|
c0235bab9e92
Add support for getting duration of a RTP stream (for seeking in stream)
gpoirier
parents:
1431
diff
changeset
|
314 *start = parse_date(buf, 1); |
|
c0235bab9e92
Add support for getting duration of a RTP stream (for seeking in stream)
gpoirier
parents:
1431
diff
changeset
|
315 if (*p == '-') { |
|
c0235bab9e92
Add support for getting duration of a RTP stream (for seeking in stream)
gpoirier
parents:
1431
diff
changeset
|
316 p++; |
|
c0235bab9e92
Add support for getting duration of a RTP stream (for seeking in stream)
gpoirier
parents:
1431
diff
changeset
|
317 get_word_sep(buf, sizeof(buf), "-", &p); |
|
c0235bab9e92
Add support for getting duration of a RTP stream (for seeking in stream)
gpoirier
parents:
1431
diff
changeset
|
318 *end = parse_date(buf, 1); |
|
c0235bab9e92
Add support for getting duration of a RTP stream (for seeking in stream)
gpoirier
parents:
1431
diff
changeset
|
319 } |
|
c0235bab9e92
Add support for getting duration of a RTP stream (for seeking in stream)
gpoirier
parents:
1431
diff
changeset
|
320 // av_log(NULL, AV_LOG_DEBUG, "Range Start: %lld\n", *start); |
|
c0235bab9e92
Add support for getting duration of a RTP stream (for seeking in stream)
gpoirier
parents:
1431
diff
changeset
|
321 // av_log(NULL, AV_LOG_DEBUG, "Range End: %lld\n", *end); |
|
c0235bab9e92
Add support for getting duration of a RTP stream (for seeking in stream)
gpoirier
parents:
1431
diff
changeset
|
322 } |
|
c0235bab9e92
Add support for getting duration of a RTP stream (for seeking in stream)
gpoirier
parents:
1431
diff
changeset
|
323 |
| 0 | 324 typedef struct SDPParseState { |
| 325 /* SDP only */ | |
| 326 struct in_addr default_ip; | |
| 327 int default_ttl; | |
|
4281
f1d8951d6813
Skip m= blocks in the SDP if the media type is unknown. This prevents
rbultje
parents:
4251
diff
changeset
|
328 int skip_media; ///< set if an unknown m= line occurs |
| 0 | 329 } SDPParseState; |
| 330 | |
| 331 static void sdp_parse_line(AVFormatContext *s, SDPParseState *s1, | |
| 332 int letter, const char *buf) | |
| 333 { | |
|
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
334 RTSPState *rt = s->priv_data; |
| 0 | 335 char buf1[64], st_type[64]; |
| 336 const char *p; | |
| 3967 | 337 enum CodecType codec_type; |
| 338 int payload_type, i; | |
| 0 | 339 AVStream *st; |
| 340 RTSPStream *rtsp_st; | |
| 341 struct in_addr sdp_ip; | |
| 342 int ttl; | |
| 343 | |
| 344 #ifdef DEBUG | |
| 345 printf("sdp: %c='%s'\n", letter, buf); | |
| 346 #endif | |
| 347 | |
| 348 p = buf; | |
|
4281
f1d8951d6813
Skip m= blocks in the SDP if the media type is unknown. This prevents
rbultje
parents:
4251
diff
changeset
|
349 if (s1->skip_media && letter != 'm') |
|
f1d8951d6813
Skip m= blocks in the SDP if the media type is unknown. This prevents
rbultje
parents:
4251
diff
changeset
|
350 return; |
| 0 | 351 switch(letter) { |
| 352 case 'c': | |
| 353 get_word(buf1, sizeof(buf1), &p); | |
| 354 if (strcmp(buf1, "IN") != 0) | |
| 355 return; | |
| 356 get_word(buf1, sizeof(buf1), &p); | |
| 357 if (strcmp(buf1, "IP4") != 0) | |
| 358 return; | |
| 359 get_word_sep(buf1, sizeof(buf1), "/", &p); | |
| 360 if (inet_aton(buf1, &sdp_ip) == 0) | |
| 361 return; | |
| 362 ttl = 16; | |
| 363 if (*p == '/') { | |
| 364 p++; | |
| 365 get_word_sep(buf1, sizeof(buf1), "/", &p); | |
| 366 ttl = atoi(buf1); | |
| 367 } | |
| 368 if (s->nb_streams == 0) { | |
| 369 s1->default_ip = sdp_ip; | |
| 370 s1->default_ttl = ttl; | |
| 371 } else { | |
| 372 st = s->streams[s->nb_streams - 1]; | |
| 373 rtsp_st = st->priv_data; | |
| 374 rtsp_st->sdp_ip = sdp_ip; | |
| 375 rtsp_st->sdp_ttl = ttl; | |
| 376 } | |
| 377 break; | |
| 378 case 's': | |
| 2189 | 379 av_strlcpy(s->title, p, sizeof(s->title)); |
| 0 | 380 break; |
| 381 case 'i': | |
| 382 if (s->nb_streams == 0) { | |
| 2189 | 383 av_strlcpy(s->comment, p, sizeof(s->comment)); |
| 0 | 384 break; |
| 385 } | |
| 386 break; | |
| 387 case 'm': | |
| 388 /* new stream */ | |
|
4281
f1d8951d6813
Skip m= blocks in the SDP if the media type is unknown. This prevents
rbultje
parents:
4251
diff
changeset
|
389 s1->skip_media = 0; |
| 0 | 390 get_word(st_type, sizeof(st_type), &p); |
| 391 if (!strcmp(st_type, "audio")) { | |
| 392 codec_type = CODEC_TYPE_AUDIO; | |
| 393 } else if (!strcmp(st_type, "video")) { | |
| 394 codec_type = CODEC_TYPE_VIDEO; | |
| 395 } else { | |
|
4281
f1d8951d6813
Skip m= blocks in the SDP if the media type is unknown. This prevents
rbultje
parents:
4251
diff
changeset
|
396 s1->skip_media = 1; |
| 0 | 397 return; |
| 398 } | |
| 399 rtsp_st = av_mallocz(sizeof(RTSPStream)); | |
| 400 if (!rtsp_st) | |
| 401 return; | |
|
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
402 rtsp_st->stream_index = -1; |
|
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
403 dynarray_add(&rt->rtsp_streams, &rt->nb_rtsp_streams, rtsp_st); |
| 0 | 404 |
| 405 rtsp_st->sdp_ip = s1->default_ip; | |
| 406 rtsp_st->sdp_ttl = s1->default_ttl; | |
| 407 | |
| 408 get_word(buf1, sizeof(buf1), &p); /* port */ | |
| 409 rtsp_st->sdp_port = atoi(buf1); | |
| 410 | |
| 411 get_word(buf1, sizeof(buf1), &p); /* protocol (ignored) */ | |
| 885 | 412 |
| 0 | 413 /* XXX: handle list of formats */ |
| 414 get_word(buf1, sizeof(buf1), &p); /* format list */ | |
| 415 rtsp_st->sdp_payload_type = atoi(buf1); | |
|
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
416 |
|
2759
b252e318023a
Remove the "AVRtpPayloadTypes[i].pt == i" assumption from RTP and RTSP
lucabe
parents:
2711
diff
changeset
|
417 if (!strcmp(ff_rtp_enc_name(rtsp_st->sdp_payload_type), "MP2T")) { |
|
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
418 /* no corresponding stream */ |
|
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
419 } else { |
|
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
420 st = av_new_stream(s, 0); |
|
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
421 if (!st) |
|
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
422 return; |
|
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
423 st->priv_data = rtsp_st; |
|
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
424 rtsp_st->stream_index = st->index; |
|
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
774
diff
changeset
|
425 st->codec->codec_type = codec_type; |
| 774 | 426 if (rtsp_st->sdp_payload_type < RTP_PT_PRIVATE) { |
|
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
427 /* if standard payload type, we can find the codec right now */ |
|
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
774
diff
changeset
|
428 rtp_get_codec_info(st->codec, rtsp_st->sdp_payload_type); |
|
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
429 } |
| 0 | 430 } |
| 431 /* put a default control url */ | |
| 2189 | 432 av_strlcpy(rtsp_st->control_url, s->filename, sizeof(rtsp_st->control_url)); |
| 0 | 433 break; |
| 434 case 'a': | |
|
2193
5ce5fad0dfac
replace the uses of old string functions that Reimar missed
mru
parents:
2189
diff
changeset
|
435 if (av_strstart(p, "control:", &p) && s->nb_streams > 0) { |
| 0 | 436 char proto[32]; |
| 437 /* get the control url */ | |
| 438 st = s->streams[s->nb_streams - 1]; | |
| 439 rtsp_st = st->priv_data; | |
| 885 | 440 |
| 0 | 441 /* XXX: may need to add full url resolution */ |
|
511
056991ab9f10
HTTP Authentication Patch by (Petr Doubek <doubek at vision dot ee dot ethz dot ch>)
michael
parents:
391
diff
changeset
|
442 url_split(proto, sizeof(proto), NULL, 0, NULL, 0, NULL, NULL, 0, p); |
| 0 | 443 if (proto[0] == '\0') { |
| 444 /* relative control URL */ | |
| 2189 | 445 av_strlcat(rtsp_st->control_url, "/", sizeof(rtsp_st->control_url)); |
| 446 av_strlcat(rtsp_st->control_url, p, sizeof(rtsp_st->control_url)); | |
| 0 | 447 } else { |
| 2189 | 448 av_strlcpy(rtsp_st->control_url, p, sizeof(rtsp_st->control_url)); |
| 0 | 449 } |
|
4185
023976c45ae1
Apply rtpmap: SDP lines to the last m= line only, since they generally just
rbultje
parents:
4182
diff
changeset
|
450 } else if (av_strstart(p, "rtpmap:", &p) && s->nb_streams > 0) { |
| 0 | 451 /* NOTE: rtpmap is only supported AFTER the 'm=' tag */ |
| 885 | 452 get_word(buf1, sizeof(buf1), &p); |
| 0 | 453 payload_type = atoi(buf1); |
|
4185
023976c45ae1
Apply rtpmap: SDP lines to the last m= line only, since they generally just
rbultje
parents:
4182
diff
changeset
|
454 st = s->streams[s->nb_streams - 1]; |
| 4186 | 455 rtsp_st = st->priv_data; |
| 456 sdp_parse_rtpmap(st->codec, rtsp_st, payload_type, p); | |
|
2193
5ce5fad0dfac
replace the uses of old string functions that Reimar missed
mru
parents:
2189
diff
changeset
|
457 } else if (av_strstart(p, "fmtp:", &p)) { |
| 0 | 458 /* NOTE: fmtp is only supported AFTER the 'a=rtpmap:xxx' tag */ |
| 885 | 459 get_word(buf1, sizeof(buf1), &p); |
| 0 | 460 payload_type = atoi(buf1); |
| 461 for(i = 0; i < s->nb_streams;i++) { | |
| 462 st = s->streams[i]; | |
| 463 rtsp_st = st->priv_data; | |
| 464 if (rtsp_st->sdp_payload_type == payload_type) { | |
| 1419 | 465 if(rtsp_st->dynamic_handler && rtsp_st->dynamic_handler->parse_sdp_a_line) { |
|
4067
8adccfc01be3
Change function prototype of the sdp_parse_a_line in DynamicProtocolHandler.
rbultje
parents:
4050
diff
changeset
|
466 if(!rtsp_st->dynamic_handler->parse_sdp_a_line(s, i, rtsp_st->dynamic_protocol_context, buf)) { |
| 1419 | 467 sdp_parse_fmtp(st, p); |
| 468 } | |
| 469 } else { | |
|
1424
1c39ce5c6a5d
indentation fix, patch by Ryan Martell % rdm4 A martellventures P com %
gpoirier
parents:
1419
diff
changeset
|
470 sdp_parse_fmtp(st, p); |
| 1419 | 471 } |
| 0 | 472 } |
| 473 } | |
|
2193
5ce5fad0dfac
replace the uses of old string functions that Reimar missed
mru
parents:
2189
diff
changeset
|
474 } else if(av_strstart(p, "framesize:", &p)) { |
|
1431
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1425
diff
changeset
|
475 // let dynamic protocol handlers have a stab at the line. |
|
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1425
diff
changeset
|
476 get_word(buf1, sizeof(buf1), &p); |
|
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1425
diff
changeset
|
477 payload_type = atoi(buf1); |
|
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1425
diff
changeset
|
478 for(i = 0; i < s->nb_streams;i++) { |
|
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1425
diff
changeset
|
479 st = s->streams[i]; |
|
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1425
diff
changeset
|
480 rtsp_st = st->priv_data; |
|
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1425
diff
changeset
|
481 if (rtsp_st->sdp_payload_type == payload_type) { |
|
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1425
diff
changeset
|
482 if(rtsp_st->dynamic_handler && rtsp_st->dynamic_handler->parse_sdp_a_line) { |
|
4067
8adccfc01be3
Change function prototype of the sdp_parse_a_line in DynamicProtocolHandler.
rbultje
parents:
4050
diff
changeset
|
483 rtsp_st->dynamic_handler->parse_sdp_a_line(s, i, rtsp_st->dynamic_protocol_context, buf); |
|
1431
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1425
diff
changeset
|
484 } |
|
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1425
diff
changeset
|
485 } |
|
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1425
diff
changeset
|
486 } |
|
2193
5ce5fad0dfac
replace the uses of old string functions that Reimar missed
mru
parents:
2189
diff
changeset
|
487 } else if(av_strstart(p, "range:", &p)) { |
|
1453
c0235bab9e92
Add support for getting duration of a RTP stream (for seeking in stream)
gpoirier
parents:
1431
diff
changeset
|
488 int64_t start, end; |
|
c0235bab9e92
Add support for getting duration of a RTP stream (for seeking in stream)
gpoirier
parents:
1431
diff
changeset
|
489 |
|
c0235bab9e92
Add support for getting duration of a RTP stream (for seeking in stream)
gpoirier
parents:
1431
diff
changeset
|
490 // this is so that seeking on a streamed file can work. |
|
c0235bab9e92
Add support for getting duration of a RTP stream (for seeking in stream)
gpoirier
parents:
1431
diff
changeset
|
491 rtsp_parse_range_npt(p, &start, &end); |
|
c0235bab9e92
Add support for getting duration of a RTP stream (for seeking in stream)
gpoirier
parents:
1431
diff
changeset
|
492 s->start_time= start; |
|
c0235bab9e92
Add support for getting duration of a RTP stream (for seeking in stream)
gpoirier
parents:
1431
diff
changeset
|
493 s->duration= (end==AV_NOPTS_VALUE)?AV_NOPTS_VALUE:end-start; // AV_NOPTS_VALUE means live broadcast (and can't seek) |
|
3960
13e9b0d3a314
Implement a RTSPTransport field, which allows proper separation of server
rbultje
parents:
3959
diff
changeset
|
494 } else if (av_strstart(p, "IsRealDataType:integer;",&p)) { |
|
13e9b0d3a314
Implement a RTSPTransport field, which allows proper separation of server
rbultje
parents:
3959
diff
changeset
|
495 if (atoi(p) == 1) |
|
13e9b0d3a314
Implement a RTSPTransport field, which allows proper separation of server
rbultje
parents:
3959
diff
changeset
|
496 rt->transport = RTSP_TRANSPORT_RDT; |
|
3784
d370d80ad1df
Use RTPDynamicProtocol parse_sdp_a_line() handlers in case of unknown SDP
rbultje
parents:
3722
diff
changeset
|
497 } else if (s->nb_streams > 0) { |
|
4163
8d6512cbd657
Parse the ASMRuleBook SDP line to dynamically create one new AVStream for
rbultje
parents:
4109
diff
changeset
|
498 if (rt->server_type == RTSP_SERVER_REAL) |
|
8d6512cbd657
Parse the ASMRuleBook SDP line to dynamically create one new AVStream for
rbultje
parents:
4109
diff
changeset
|
499 ff_real_parse_sdp_a_line(s, s->nb_streams - 1, p); |
|
8d6512cbd657
Parse the ASMRuleBook SDP line to dynamically create one new AVStream for
rbultje
parents:
4109
diff
changeset
|
500 |
|
3784
d370d80ad1df
Use RTPDynamicProtocol parse_sdp_a_line() handlers in case of unknown SDP
rbultje
parents:
3722
diff
changeset
|
501 rtsp_st = s->streams[s->nb_streams - 1]->priv_data; |
|
d370d80ad1df
Use RTPDynamicProtocol parse_sdp_a_line() handlers in case of unknown SDP
rbultje
parents:
3722
diff
changeset
|
502 if (rtsp_st->dynamic_handler && |
|
d370d80ad1df
Use RTPDynamicProtocol parse_sdp_a_line() handlers in case of unknown SDP
rbultje
parents:
3722
diff
changeset
|
503 rtsp_st->dynamic_handler->parse_sdp_a_line) |
|
4067
8adccfc01be3
Change function prototype of the sdp_parse_a_line in DynamicProtocolHandler.
rbultje
parents:
4050
diff
changeset
|
504 rtsp_st->dynamic_handler->parse_sdp_a_line(s, s->nb_streams - 1, |
|
3784
d370d80ad1df
Use RTPDynamicProtocol parse_sdp_a_line() handlers in case of unknown SDP
rbultje
parents:
3722
diff
changeset
|
505 rtsp_st->dynamic_protocol_context, buf); |
| 0 | 506 } |
| 507 break; | |
| 508 } | |
| 509 } | |
| 510 | |
| 64 | 511 static int sdp_parse(AVFormatContext *s, const char *content) |
| 0 | 512 { |
| 513 const char *p; | |
| 514 int letter; | |
| 4187 | 515 /* Some SDP lines, particularly for Realmedia or ASF RTSP streams, |
| 516 * contain long SDP lines containing complete ASF Headers (several | |
| 517 * kB) or arrays of MDPR (RM stream descriptor) headers plus | |
| 518 * "rulebooks" describing their properties. Therefore, the SDP line | |
| 519 * buffer is large. */ | |
|
4108
132640f78cb2
Increase SDP line buffer size because ASF headers in RTSP-MS are very big. See ML discussion
rbultje
parents:
4101
diff
changeset
|
520 char buf[8192], *q; |
| 0 | 521 SDPParseState sdp_parse_state, *s1 = &sdp_parse_state; |
| 885 | 522 |
| 0 | 523 memset(s1, 0, sizeof(SDPParseState)); |
| 524 p = content; | |
| 525 for(;;) { | |
| 526 skip_spaces(&p); | |
| 527 letter = *p; | |
| 528 if (letter == '\0') | |
| 529 break; | |
| 530 p++; | |
| 531 if (*p != '=') | |
| 532 goto next_line; | |
| 533 p++; | |
| 534 /* get the content */ | |
| 535 q = buf; | |
| 172 | 536 while (*p != '\n' && *p != '\r' && *p != '\0') { |
| 0 | 537 if ((q - buf) < sizeof(buf) - 1) |
| 538 *q++ = *p; | |
| 539 p++; | |
| 540 } | |
| 541 *q = '\0'; | |
| 542 sdp_parse_line(s, s1, letter, buf); | |
| 543 next_line: | |
| 544 while (*p != '\n' && *p != '\0') | |
| 545 p++; | |
| 546 if (*p == '\n') | |
| 547 p++; | |
| 548 } | |
| 549 return 0; | |
| 550 } | |
| 551 | |
| 552 static void rtsp_parse_range(int *min_ptr, int *max_ptr, const char **pp) | |
| 553 { | |
| 554 const char *p; | |
| 555 int v; | |
| 556 | |
| 557 p = *pp; | |
| 558 skip_spaces(&p); | |
| 559 v = strtol(p, (char **)&p, 10); | |
| 560 if (*p == '-') { | |
| 561 p++; | |
| 562 *min_ptr = v; | |
| 563 v = strtol(p, (char **)&p, 10); | |
| 564 *max_ptr = v; | |
| 565 } else { | |
| 566 *min_ptr = v; | |
| 567 *max_ptr = v; | |
| 568 } | |
| 569 *pp = p; | |
| 570 } | |
| 571 | |
| 572 /* XXX: only one transport specification is parsed */ | |
| 573 static void rtsp_parse_transport(RTSPHeader *reply, const char *p) | |
| 574 { | |
| 575 char transport_protocol[16]; | |
| 576 char profile[16]; | |
| 577 char lower_transport[16]; | |
| 578 char parameter[16]; | |
| 579 RTSPTransportField *th; | |
| 580 char buf[256]; | |
| 885 | 581 |
| 0 | 582 reply->nb_transports = 0; |
| 885 | 583 |
| 0 | 584 for(;;) { |
| 585 skip_spaces(&p); | |
| 586 if (*p == '\0') | |
| 587 break; | |
| 588 | |
| 589 th = &reply->transports[reply->nb_transports]; | |
| 590 | |
| 885 | 591 get_word_sep(transport_protocol, sizeof(transport_protocol), |
| 0 | 592 "/", &p); |
| 593 if (*p == '/') | |
| 594 p++; | |
|
2865
51aa1054528c
Real RTSP support, from Ronald S. Bultje rsbultje gmail - part 2 x-pn-tng support
lu_zero
parents:
2864
diff
changeset
|
595 if (!strcasecmp (transport_protocol, "rtp")) { |
|
2866
ccbca87ccd5e
Real RTSP support, from Ronald S. Bultje rsbultje gmail - part 3 Reindent
lu_zero
parents:
2865
diff
changeset
|
596 get_word_sep(profile, sizeof(profile), "/;,", &p); |
|
ccbca87ccd5e
Real RTSP support, from Ronald S. Bultje rsbultje gmail - part 3 Reindent
lu_zero
parents:
2865
diff
changeset
|
597 lower_transport[0] = '\0'; |
|
ccbca87ccd5e
Real RTSP support, from Ronald S. Bultje rsbultje gmail - part 3 Reindent
lu_zero
parents:
2865
diff
changeset
|
598 /* rtp/avp/<protocol> */ |
|
ccbca87ccd5e
Real RTSP support, from Ronald S. Bultje rsbultje gmail - part 3 Reindent
lu_zero
parents:
2865
diff
changeset
|
599 if (*p == '/') { |
|
ccbca87ccd5e
Real RTSP support, from Ronald S. Bultje rsbultje gmail - part 3 Reindent
lu_zero
parents:
2865
diff
changeset
|
600 p++; |
|
ccbca87ccd5e
Real RTSP support, from Ronald S. Bultje rsbultje gmail - part 3 Reindent
lu_zero
parents:
2865
diff
changeset
|
601 get_word_sep(lower_transport, sizeof(lower_transport), |
|
ccbca87ccd5e
Real RTSP support, from Ronald S. Bultje rsbultje gmail - part 3 Reindent
lu_zero
parents:
2865
diff
changeset
|
602 ";,", &p); |
|
3960
13e9b0d3a314
Implement a RTSPTransport field, which allows proper separation of server
rbultje
parents:
3959
diff
changeset
|
603 } |
|
13e9b0d3a314
Implement a RTSPTransport field, which allows proper separation of server
rbultje
parents:
3959
diff
changeset
|
604 th->transport = RTSP_TRANSPORT_RTP; |
|
13e9b0d3a314
Implement a RTSPTransport field, which allows proper separation of server
rbultje
parents:
3959
diff
changeset
|
605 } else if (!strcasecmp (transport_protocol, "x-pn-tng") || |
|
13e9b0d3a314
Implement a RTSPTransport field, which allows proper separation of server
rbultje
parents:
3959
diff
changeset
|
606 !strcasecmp (transport_protocol, "x-real-rdt")) { |
|
2866
ccbca87ccd5e
Real RTSP support, from Ronald S. Bultje rsbultje gmail - part 3 Reindent
lu_zero
parents:
2865
diff
changeset
|
607 /* x-pn-tng/<protocol> */ |
|
2865
51aa1054528c
Real RTSP support, from Ronald S. Bultje rsbultje gmail - part 2 x-pn-tng support
lu_zero
parents:
2864
diff
changeset
|
608 get_word_sep(lower_transport, sizeof(lower_transport), "/;,", &p); |
|
51aa1054528c
Real RTSP support, from Ronald S. Bultje rsbultje gmail - part 2 x-pn-tng support
lu_zero
parents:
2864
diff
changeset
|
609 profile[0] = '\0'; |
|
3960
13e9b0d3a314
Implement a RTSPTransport field, which allows proper separation of server
rbultje
parents:
3959
diff
changeset
|
610 th->transport = RTSP_TRANSPORT_RDT; |
| 0 | 611 } |
| 172 | 612 if (!strcasecmp(lower_transport, "TCP")) |
|
3957
9f943bb755f9
Rename RTSPProtocol to RTSPLowerTransport, so that its name properly tells us
rbultje
parents:
3941
diff
changeset
|
613 th->lower_transport = RTSP_LOWER_TRANSPORT_TCP; |
| 0 | 614 else |
|
3957
9f943bb755f9
Rename RTSPProtocol to RTSPLowerTransport, so that its name properly tells us
rbultje
parents:
3941
diff
changeset
|
615 th->lower_transport = RTSP_LOWER_TRANSPORT_UDP; |
| 885 | 616 |
| 0 | 617 if (*p == ';') |
| 618 p++; | |
| 619 /* get each parameter */ | |
| 620 while (*p != '\0' && *p != ',') { | |
| 621 get_word_sep(parameter, sizeof(parameter), "=;,", &p); | |
| 622 if (!strcmp(parameter, "port")) { | |
| 623 if (*p == '=') { | |
| 624 p++; | |
| 625 rtsp_parse_range(&th->port_min, &th->port_max, &p); | |
| 626 } | |
| 627 } else if (!strcmp(parameter, "client_port")) { | |
| 628 if (*p == '=') { | |
| 629 p++; | |
| 885 | 630 rtsp_parse_range(&th->client_port_min, |
| 0 | 631 &th->client_port_max, &p); |
| 632 } | |
| 633 } else if (!strcmp(parameter, "server_port")) { | |
| 634 if (*p == '=') { | |
| 635 p++; | |
| 885 | 636 rtsp_parse_range(&th->server_port_min, |
| 0 | 637 &th->server_port_max, &p); |
| 638 } | |
| 639 } else if (!strcmp(parameter, "interleaved")) { | |
| 640 if (*p == '=') { | |
| 641 p++; | |
| 885 | 642 rtsp_parse_range(&th->interleaved_min, |
| 0 | 643 &th->interleaved_max, &p); |
| 644 } | |
| 645 } else if (!strcmp(parameter, "multicast")) { | |
|
3957
9f943bb755f9
Rename RTSPProtocol to RTSPLowerTransport, so that its name properly tells us
rbultje
parents:
3941
diff
changeset
|
646 if (th->lower_transport == RTSP_LOWER_TRANSPORT_UDP) |
|
9f943bb755f9
Rename RTSPProtocol to RTSPLowerTransport, so that its name properly tells us
rbultje
parents:
3941
diff
changeset
|
647 th->lower_transport = RTSP_LOWER_TRANSPORT_UDP_MULTICAST; |
| 0 | 648 } else if (!strcmp(parameter, "ttl")) { |
| 649 if (*p == '=') { | |
| 650 p++; | |
| 651 th->ttl = strtol(p, (char **)&p, 10); | |
| 652 } | |
| 653 } else if (!strcmp(parameter, "destination")) { | |
| 654 struct in_addr ipaddr; | |
| 655 | |
| 656 if (*p == '=') { | |
| 657 p++; | |
| 658 get_word_sep(buf, sizeof(buf), ";,", &p); | |
| 885 | 659 if (inet_aton(buf, &ipaddr)) |
| 0 | 660 th->destination = ntohl(ipaddr.s_addr); |
| 661 } | |
| 662 } | |
| 663 while (*p != ';' && *p != '\0' && *p != ',') | |
| 664 p++; | |
| 665 if (*p == ';') | |
| 666 p++; | |
| 667 } | |
| 668 if (*p == ',') | |
| 669 p++; | |
| 670 | |
| 671 reply->nb_transports++; | |
| 672 } | |
| 673 } | |
| 674 | |
| 675 void rtsp_parse_line(RTSPHeader *reply, const char *buf) | |
| 676 { | |
| 677 const char *p; | |
| 678 | |
| 679 /* NOTE: we do case independent match for broken servers */ | |
| 680 p = buf; | |
|
2193
5ce5fad0dfac
replace the uses of old string functions that Reimar missed
mru
parents:
2189
diff
changeset
|
681 if (av_stristart(p, "Session:", &p)) { |
| 0 | 682 get_word_sep(reply->session_id, sizeof(reply->session_id), ";", &p); |
|
2193
5ce5fad0dfac
replace the uses of old string functions that Reimar missed
mru
parents:
2189
diff
changeset
|
683 } else if (av_stristart(p, "Content-Length:", &p)) { |
| 0 | 684 reply->content_length = strtol(p, NULL, 10); |
|
2193
5ce5fad0dfac
replace the uses of old string functions that Reimar missed
mru
parents:
2189
diff
changeset
|
685 } else if (av_stristart(p, "Transport:", &p)) { |
| 0 | 686 rtsp_parse_transport(reply, p); |
|
2193
5ce5fad0dfac
replace the uses of old string functions that Reimar missed
mru
parents:
2189
diff
changeset
|
687 } else if (av_stristart(p, "CSeq:", &p)) { |
| 0 | 688 reply->seq = strtol(p, NULL, 10); |
|
2193
5ce5fad0dfac
replace the uses of old string functions that Reimar missed
mru
parents:
2189
diff
changeset
|
689 } else if (av_stristart(p, "Range:", &p)) { |
|
1453
c0235bab9e92
Add support for getting duration of a RTP stream (for seeking in stream)
gpoirier
parents:
1431
diff
changeset
|
690 rtsp_parse_range_npt(p, &reply->range_start, &reply->range_end); |
| 3855 | 691 } else if (av_stristart(p, "RealChallenge1:", &p)) { |
| 692 skip_spaces(&p); | |
| 693 av_strlcpy(reply->real_challenge, p, sizeof(reply->real_challenge)); | |
|
4169
619845a9bab3
Use the "server" RTSP field to detect whether the server that we're talking
rbultje
parents:
4168
diff
changeset
|
694 } else if (av_stristart(p, "Server:", &p)) { |
|
619845a9bab3
Use the "server" RTSP field to detect whether the server that we're talking
rbultje
parents:
4168
diff
changeset
|
695 skip_spaces(&p); |
|
619845a9bab3
Use the "server" RTSP field to detect whether the server that we're talking
rbultje
parents:
4168
diff
changeset
|
696 av_strlcpy(reply->server, p, sizeof(reply->server)); |
| 0 | 697 } |
| 698 } | |
| 699 | |
|
391
1cf22651d33b
support url_read which reads less then requested patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents:
370
diff
changeset
|
700 static int url_readbuf(URLContext *h, unsigned char *buf, int size) |
|
1cf22651d33b
support url_read which reads less then requested patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents:
370
diff
changeset
|
701 { |
|
1cf22651d33b
support url_read which reads less then requested patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents:
370
diff
changeset
|
702 int ret, len; |
|
1cf22651d33b
support url_read which reads less then requested patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents:
370
diff
changeset
|
703 |
|
1cf22651d33b
support url_read which reads less then requested patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents:
370
diff
changeset
|
704 len = 0; |
|
1cf22651d33b
support url_read which reads less then requested patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents:
370
diff
changeset
|
705 while (len < size) { |
|
1cf22651d33b
support url_read which reads less then requested patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents:
370
diff
changeset
|
706 ret = url_read(h, buf+len, size-len); |
|
1cf22651d33b
support url_read which reads less then requested patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents:
370
diff
changeset
|
707 if (ret < 1) |
|
1cf22651d33b
support url_read which reads less then requested patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents:
370
diff
changeset
|
708 return ret; |
|
1cf22651d33b
support url_read which reads less then requested patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents:
370
diff
changeset
|
709 len += ret; |
|
1cf22651d33b
support url_read which reads less then requested patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents:
370
diff
changeset
|
710 } |
|
1cf22651d33b
support url_read which reads less then requested patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents:
370
diff
changeset
|
711 return len; |
|
1cf22651d33b
support url_read which reads less then requested patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents:
370
diff
changeset
|
712 } |
|
1cf22651d33b
support url_read which reads less then requested patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents:
370
diff
changeset
|
713 |
| 179 | 714 /* skip a RTP/TCP interleaved packet */ |
| 715 static void rtsp_skip_packet(AVFormatContext *s) | |
| 716 { | |
| 717 RTSPState *rt = s->priv_data; | |
| 718 int ret, len, len1; | |
| 719 uint8_t buf[1024]; | |
| 720 | |
|
391
1cf22651d33b
support url_read which reads less then requested patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents:
370
diff
changeset
|
721 ret = url_readbuf(rt->rtsp_hd, buf, 3); |
| 179 | 722 if (ret != 3) |
| 723 return; | |
| 2222 | 724 len = AV_RB16(buf + 1); |
| 179 | 725 #ifdef DEBUG |
| 726 printf("skipping RTP packet len=%d\n", len); | |
| 727 #endif | |
| 728 /* skip payload */ | |
| 729 while (len > 0) { | |
| 730 len1 = len; | |
| 731 if (len1 > sizeof(buf)) | |
| 732 len1 = sizeof(buf); | |
|
391
1cf22651d33b
support url_read which reads less then requested patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents:
370
diff
changeset
|
733 ret = url_readbuf(rt->rtsp_hd, buf, len1); |
| 179 | 734 if (ret != len1) |
| 735 return; | |
| 736 len -= len1; | |
| 737 } | |
| 738 } | |
| 0 | 739 |
| 885 | 740 static void rtsp_send_cmd(AVFormatContext *s, |
| 741 const char *cmd, RTSPHeader *reply, | |
| 0 | 742 unsigned char **content_ptr) |
| 743 { | |
| 744 RTSPState *rt = s->priv_data; | |
| 745 char buf[4096], buf1[1024], *q; | |
| 746 unsigned char ch; | |
| 747 const char *p; | |
| 748 int content_length, line_count; | |
| 749 unsigned char *content = NULL; | |
| 750 | |
| 751 memset(reply, 0, sizeof(RTSPHeader)); | |
| 752 | |
| 753 rt->seq++; | |
| 2189 | 754 av_strlcpy(buf, cmd, sizeof(buf)); |
| 172 | 755 snprintf(buf1, sizeof(buf1), "CSeq: %d\r\n", rt->seq); |
| 2189 | 756 av_strlcat(buf, buf1, sizeof(buf)); |
| 0 | 757 if (rt->session_id[0] != '\0' && !strstr(cmd, "\nIf-Match:")) { |
| 172 | 758 snprintf(buf1, sizeof(buf1), "Session: %s\r\n", rt->session_id); |
| 2189 | 759 av_strlcat(buf, buf1, sizeof(buf)); |
| 0 | 760 } |
| 2189 | 761 av_strlcat(buf, "\r\n", sizeof(buf)); |
| 0 | 762 #ifdef DEBUG |
| 763 printf("Sending:\n%s--\n", buf); | |
| 764 #endif | |
| 765 url_write(rt->rtsp_hd, buf, strlen(buf)); | |
| 766 | |
| 767 /* parse reply (XXX: use buffers) */ | |
| 768 line_count = 0; | |
| 769 rt->last_reply[0] = '\0'; | |
| 770 for(;;) { | |
| 771 q = buf; | |
| 772 for(;;) { | |
|
391
1cf22651d33b
support url_read which reads less then requested patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents:
370
diff
changeset
|
773 if (url_readbuf(rt->rtsp_hd, &ch, 1) != 1) |
| 0 | 774 break; |
| 775 if (ch == '\n') | |
| 776 break; | |
| 179 | 777 if (ch == '$') { |
| 778 /* XXX: only parse it if first char on line ? */ | |
| 779 rtsp_skip_packet(s); | |
| 780 } else if (ch != '\r') { | |
| 0 | 781 if ((q - buf) < sizeof(buf) - 1) |
| 782 *q++ = ch; | |
| 783 } | |
| 784 } | |
| 785 *q = '\0'; | |
| 786 #ifdef DEBUG | |
| 787 printf("line='%s'\n", buf); | |
| 788 #endif | |
| 789 /* test if last line */ | |
| 790 if (buf[0] == '\0') | |
| 791 break; | |
| 792 p = buf; | |
| 793 if (line_count == 0) { | |
| 794 /* get reply code */ | |
| 795 get_word(buf1, sizeof(buf1), &p); | |
| 796 get_word(buf1, sizeof(buf1), &p); | |
| 797 reply->status_code = atoi(buf1); | |
| 798 } else { | |
| 799 rtsp_parse_line(reply, p); | |
| 2189 | 800 av_strlcat(rt->last_reply, p, sizeof(rt->last_reply)); |
| 801 av_strlcat(rt->last_reply, "\n", sizeof(rt->last_reply)); | |
| 0 | 802 } |
| 803 line_count++; | |
| 804 } | |
| 885 | 805 |
| 0 | 806 if (rt->session_id[0] == '\0' && reply->session_id[0] != '\0') |
| 2189 | 807 av_strlcpy(rt->session_id, reply->session_id, sizeof(rt->session_id)); |
| 885 | 808 |
| 0 | 809 content_length = reply->content_length; |
| 810 if (content_length > 0) { | |
| 811 /* leave some room for a trailing '\0' (useful for simple parsing) */ | |
| 812 content = av_malloc(content_length + 1); | |
|
391
1cf22651d33b
support url_read which reads less then requested patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents:
370
diff
changeset
|
813 (void)url_readbuf(rt->rtsp_hd, content, content_length); |
| 0 | 814 content[content_length] = '\0'; |
| 815 } | |
| 816 if (content_ptr) | |
| 817 *content_ptr = content; | |
| 2263 | 818 else |
| 819 av_free(content); | |
| 0 | 820 } |
| 821 | |
| 822 | |
|
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
823 /* close and free RTSP streams */ |
|
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
824 static void rtsp_close_streams(RTSPState *rt) |
|
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
825 { |
|
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
826 int i; |
|
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
827 RTSPStream *rtsp_st; |
|
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
828 |
|
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
829 for(i=0;i<rt->nb_rtsp_streams;i++) { |
|
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
830 rtsp_st = rt->rtsp_streams[i]; |
|
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
831 if (rtsp_st) { |
|
3979
e6bf0896a019
Implement RDTDemuxContext, which contains RDT-specific data (similar to
rbultje
parents:
3978
diff
changeset
|
832 if (rtsp_st->tx_ctx) { |
|
e6bf0896a019
Implement RDTDemuxContext, which contains RDT-specific data (similar to
rbultje
parents:
3978
diff
changeset
|
833 if (rt->transport == RTSP_TRANSPORT_RDT) |
|
e6bf0896a019
Implement RDTDemuxContext, which contains RDT-specific data (similar to
rbultje
parents:
3978
diff
changeset
|
834 ff_rdt_parse_close(rtsp_st->tx_ctx); |
|
e6bf0896a019
Implement RDTDemuxContext, which contains RDT-specific data (similar to
rbultje
parents:
3978
diff
changeset
|
835 else |
| 3980 | 836 rtp_parse_close(rtsp_st->tx_ctx); |
|
3979
e6bf0896a019
Implement RDTDemuxContext, which contains RDT-specific data (similar to
rbultje
parents:
3978
diff
changeset
|
837 } |
|
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
838 if (rtsp_st->rtp_handle) |
|
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
839 url_close(rtsp_st->rtp_handle); |
| 1419 | 840 if (rtsp_st->dynamic_handler && rtsp_st->dynamic_protocol_context) |
| 841 rtsp_st->dynamic_handler->close(rtsp_st->dynamic_protocol_context); | |
|
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
842 } |
|
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
843 } |
|
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
844 av_free(rt->rtsp_streams); |
|
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
845 } |
|
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
846 |
|
3919
1879eab34f88
Factorize out common code for opening of the RTP parsing context between
rbultje
parents:
3905
diff
changeset
|
847 static int |
|
1879eab34f88
Factorize out common code for opening of the RTP parsing context between
rbultje
parents:
3905
diff
changeset
|
848 rtsp_open_transport_ctx(AVFormatContext *s, RTSPStream *rtsp_st) |
|
1879eab34f88
Factorize out common code for opening of the RTP parsing context between
rbultje
parents:
3905
diff
changeset
|
849 { |
|
3979
e6bf0896a019
Implement RDTDemuxContext, which contains RDT-specific data (similar to
rbultje
parents:
3978
diff
changeset
|
850 RTSPState *rt = s->priv_data; |
|
3919
1879eab34f88
Factorize out common code for opening of the RTP parsing context between
rbultje
parents:
3905
diff
changeset
|
851 AVStream *st = NULL; |
|
1879eab34f88
Factorize out common code for opening of the RTP parsing context between
rbultje
parents:
3905
diff
changeset
|
852 |
|
3920
ae2d4ee06a94
Reindent after r15927, see discussion in "[PATCH] rtsp cleanup part 1:
rbultje
parents:
3919
diff
changeset
|
853 /* open the RTP context */ |
|
ae2d4ee06a94
Reindent after r15927, see discussion in "[PATCH] rtsp cleanup part 1:
rbultje
parents:
3919
diff
changeset
|
854 if (rtsp_st->stream_index >= 0) |
|
ae2d4ee06a94
Reindent after r15927, see discussion in "[PATCH] rtsp cleanup part 1:
rbultje
parents:
3919
diff
changeset
|
855 st = s->streams[rtsp_st->stream_index]; |
|
ae2d4ee06a94
Reindent after r15927, see discussion in "[PATCH] rtsp cleanup part 1:
rbultje
parents:
3919
diff
changeset
|
856 if (!st) |
|
ae2d4ee06a94
Reindent after r15927, see discussion in "[PATCH] rtsp cleanup part 1:
rbultje
parents:
3919
diff
changeset
|
857 s->ctx_flags |= AVFMTCTX_NOHEADER; |
|
3979
e6bf0896a019
Implement RDTDemuxContext, which contains RDT-specific data (similar to
rbultje
parents:
3978
diff
changeset
|
858 |
|
e6bf0896a019
Implement RDTDemuxContext, which contains RDT-specific data (similar to
rbultje
parents:
3978
diff
changeset
|
859 if (rt->transport == RTSP_TRANSPORT_RDT) |
|
4050
7bc64c735f8b
Change function prototype from taking an AVStream to taking an index to the
rbultje
parents:
4029
diff
changeset
|
860 rtsp_st->tx_ctx = ff_rdt_parse_open(s, st->index, |
|
3979
e6bf0896a019
Implement RDTDemuxContext, which contains RDT-specific data (similar to
rbultje
parents:
3978
diff
changeset
|
861 rtsp_st->dynamic_protocol_context, |
|
e6bf0896a019
Implement RDTDemuxContext, which contains RDT-specific data (similar to
rbultje
parents:
3978
diff
changeset
|
862 rtsp_st->dynamic_handler); |
|
e6bf0896a019
Implement RDTDemuxContext, which contains RDT-specific data (similar to
rbultje
parents:
3978
diff
changeset
|
863 else |
| 3980 | 864 rtsp_st->tx_ctx = rtp_parse_open(s, st, rtsp_st->rtp_handle, |
| 865 rtsp_st->sdp_payload_type, | |
| 866 &rtsp_st->rtp_payload_data); | |
|
3919
1879eab34f88
Factorize out common code for opening of the RTP parsing context between
rbultje
parents:
3905
diff
changeset
|
867 |
|
3978
0033b09d74b9
Make RTPDemuxContext opaque in rtsp.c, renaming it to tx_ctx (tx=transport)
rbultje
parents:
3977
diff
changeset
|
868 if (!rtsp_st->tx_ctx) { |
|
3920
ae2d4ee06a94
Reindent after r15927, see discussion in "[PATCH] rtsp cleanup part 1:
rbultje
parents:
3919
diff
changeset
|
869 return AVERROR(ENOMEM); |
|
3979
e6bf0896a019
Implement RDTDemuxContext, which contains RDT-specific data (similar to
rbultje
parents:
3978
diff
changeset
|
870 } else if (rt->transport != RTSP_TRANSPORT_RDT) { |
|
3920
ae2d4ee06a94
Reindent after r15927, see discussion in "[PATCH] rtsp cleanup part 1:
rbultje
parents:
3919
diff
changeset
|
871 if(rtsp_st->dynamic_handler) { |
|
3978
0033b09d74b9
Make RTPDemuxContext opaque in rtsp.c, renaming it to tx_ctx (tx=transport)
rbultje
parents:
3977
diff
changeset
|
872 rtp_parse_set_dynamic_protocol(rtsp_st->tx_ctx, |
|
3977
1f1c4535f421
Remove access into RTPDemuxContext in rtsp.c, which allows making it opaque
rbultje
parents:
3975
diff
changeset
|
873 rtsp_st->dynamic_protocol_context, |
|
1f1c4535f421
Remove access into RTPDemuxContext in rtsp.c, which allows making it opaque
rbultje
parents:
3975
diff
changeset
|
874 rtsp_st->dynamic_handler); |
|
3919
1879eab34f88
Factorize out common code for opening of the RTP parsing context between
rbultje
parents:
3905
diff
changeset
|
875 } |
|
3920
ae2d4ee06a94
Reindent after r15927, see discussion in "[PATCH] rtsp cleanup part 1:
rbultje
parents:
3919
diff
changeset
|
876 } |
|
3919
1879eab34f88
Factorize out common code for opening of the RTP parsing context between
rbultje
parents:
3905
diff
changeset
|
877 |
|
1879eab34f88
Factorize out common code for opening of the RTP parsing context between
rbultje
parents:
3905
diff
changeset
|
878 return 0; |
|
1879eab34f88
Factorize out common code for opening of the RTP parsing context between
rbultje
parents:
3905
diff
changeset
|
879 } |
|
1879eab34f88
Factorize out common code for opening of the RTP parsing context between
rbultje
parents:
3905
diff
changeset
|
880 |
|
3147
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
881 /** |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
882 * @returns 0 on success, <0 on error, 1 if protocol is unavailable. |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
883 */ |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
884 static int |
|
3876
1026953d4ffe
Implement Realmedia/RTSP-compatible SETUP command. This includes calculation
rbultje
parents:
3861
diff
changeset
|
885 make_setup_request (AVFormatContext *s, const char *host, int port, |
|
3957
9f943bb755f9
Rename RTSPProtocol to RTSPLowerTransport, so that its name properly tells us
rbultje
parents:
3941
diff
changeset
|
886 int lower_transport, const char *real_challenge) |
| 0 | 887 { |
| 888 RTSPState *rt = s->priv_data; | |
|
4332
0d776969b708
Fix the Transport: line in the SETUP request so that it works with WMS
rbultje
parents:
4291
diff
changeset
|
889 int j, i, err, interleave = 0; |
| 0 | 890 RTSPStream *rtsp_st; |
|
3147
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
891 RTSPHeader reply1, *reply = &reply1; |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
892 char cmd[2048]; |
|
3876
1026953d4ffe
Implement Realmedia/RTSP-compatible SETUP command. This includes calculation
rbultje
parents:
3861
diff
changeset
|
893 const char *trans_pref; |
|
1026953d4ffe
Implement Realmedia/RTSP-compatible SETUP command. This includes calculation
rbultje
parents:
3861
diff
changeset
|
894 |
|
3960
13e9b0d3a314
Implement a RTSPTransport field, which allows proper separation of server
rbultje
parents:
3959
diff
changeset
|
895 if (rt->transport == RTSP_TRANSPORT_RDT) |
|
3876
1026953d4ffe
Implement Realmedia/RTSP-compatible SETUP command. This includes calculation
rbultje
parents:
3861
diff
changeset
|
896 trans_pref = "x-pn-tng"; |
|
1026953d4ffe
Implement Realmedia/RTSP-compatible SETUP command. This includes calculation
rbultje
parents:
3861
diff
changeset
|
897 else |
|
1026953d4ffe
Implement Realmedia/RTSP-compatible SETUP command. This includes calculation
rbultje
parents:
3861
diff
changeset
|
898 trans_pref = "RTP/AVP"; |
| 885 | 899 |
| 0 | 900 /* for each stream, make the setup request */ |
| 901 /* XXX: we assume the same server is used for the control of each | |
| 902 RTSP stream */ | |
| 774 | 903 |
| 904 for(j = RTSP_RTP_PORT_MIN, i = 0; i < rt->nb_rtsp_streams; ++i) { | |
| 0 | 905 char transport[2048]; |
| 906 | |
|
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
907 rtsp_st = rt->rtsp_streams[i]; |
| 0 | 908 |
| 909 /* RTP/UDP */ | |
|
3957
9f943bb755f9
Rename RTSPProtocol to RTSPLowerTransport, so that its name properly tells us
rbultje
parents:
3941
diff
changeset
|
910 if (lower_transport == RTSP_LOWER_TRANSPORT_UDP) { |
| 0 | 911 char buf[256]; |
| 912 | |
| 913 /* first try in specified port range */ | |
| 774 | 914 if (RTSP_RTP_PORT_MIN != 0) { |
| 915 while(j <= RTSP_RTP_PORT_MAX) { | |
|
2711
0ff7c5289e68
Specify the server address when opening an rtp:// URL in rtsp.c, so
lucabe
parents:
2684
diff
changeset
|
916 snprintf(buf, sizeof(buf), "rtp://%s?localport=%d", host, j); |
|
2684
3dd4b622f4e3
If local port n is not available, try n + 2 instead of continuing to bind
lucabe
parents:
2681
diff
changeset
|
917 j += 2; /* we will use two port by rtp stream (rtp and rtcp) */ |
|
1425
00d9393a126f
make ffmpeg able to send back a RTCP receiver report.
gpoirier
parents:
1424
diff
changeset
|
918 if (url_open(&rtsp_st->rtp_handle, buf, URL_RDWR) == 0) { |
| 0 | 919 goto rtp_opened; |
| 774 | 920 } |
| 0 | 921 } |
| 922 } | |
| 923 | |
| 774 | 924 /* then try on any port |
| 925 ** if (url_open(&rtsp_st->rtp_handle, "rtp://", URL_RDONLY) < 0) { | |
| 926 ** err = AVERROR_INVALIDDATA; | |
| 927 ** goto fail; | |
| 928 ** } | |
| 929 */ | |
| 0 | 930 |
| 931 rtp_opened: | |
|
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
932 port = rtp_get_local_port(rtsp_st->rtp_handle); |
|
3877
3e0c7ad2a675
Remove unused code that used to handle protocol concatenation, i.e. trying
rbultje
parents:
3876
diff
changeset
|
933 snprintf(transport, sizeof(transport) - 1, |
|
3958
ab2d2bc3a6e7
Send improper UDP SETUP request, which is what Realmedia servers expect.
rbultje
parents:
3957
diff
changeset
|
934 "%s/UDP;", trans_pref); |
|
ab2d2bc3a6e7
Send improper UDP SETUP request, which is what Realmedia servers expect.
rbultje
parents:
3957
diff
changeset
|
935 if (rt->server_type != RTSP_SERVER_REAL) |
|
ab2d2bc3a6e7
Send improper UDP SETUP request, which is what Realmedia servers expect.
rbultje
parents:
3957
diff
changeset
|
936 av_strlcat(transport, "unicast;", sizeof(transport)); |
|
ab2d2bc3a6e7
Send improper UDP SETUP request, which is what Realmedia servers expect.
rbultje
parents:
3957
diff
changeset
|
937 av_strlcatf(transport, sizeof(transport), |
|
ab2d2bc3a6e7
Send improper UDP SETUP request, which is what Realmedia servers expect.
rbultje
parents:
3957
diff
changeset
|
938 "client_port=%d", port); |
|
3960
13e9b0d3a314
Implement a RTSPTransport field, which allows proper separation of server
rbultje
parents:
3959
diff
changeset
|
939 if (rt->transport == RTSP_TRANSPORT_RTP) |
|
3876
1026953d4ffe
Implement Realmedia/RTSP-compatible SETUP command. This includes calculation
rbultje
parents:
3861
diff
changeset
|
940 av_strlcatf(transport, sizeof(transport), "-%d", port + 1); |
| 0 | 941 } |
| 942 | |
| 943 /* RTP/TCP */ | |
|
3957
9f943bb755f9
Rename RTSPProtocol to RTSPLowerTransport, so that its name properly tells us
rbultje
parents:
3941
diff
changeset
|
944 else if (lower_transport == RTSP_LOWER_TRANSPORT_TCP) { |
|
3877
3e0c7ad2a675
Remove unused code that used to handle protocol concatenation, i.e. trying
rbultje
parents:
3876
diff
changeset
|
945 snprintf(transport, sizeof(transport) - 1, |
|
4332
0d776969b708
Fix the Transport: line in the SETUP request so that it works with WMS
rbultje
parents:
4291
diff
changeset
|
946 "%s/TCP;", trans_pref); |
|
0d776969b708
Fix the Transport: line in the SETUP request so that it works with WMS
rbultje
parents:
4291
diff
changeset
|
947 if (rt->server_type == RTSP_SERVER_WMS) |
|
0d776969b708
Fix the Transport: line in the SETUP request so that it works with WMS
rbultje
parents:
4291
diff
changeset
|
948 av_strlcat(transport, "unicast;", sizeof(transport)); |
|
0d776969b708
Fix the Transport: line in the SETUP request so that it works with WMS
rbultje
parents:
4291
diff
changeset
|
949 av_strlcatf(transport, sizeof(transport), |
|
0d776969b708
Fix the Transport: line in the SETUP request so that it works with WMS
rbultje
parents:
4291
diff
changeset
|
950 "interleaved=%d-%d", |
|
0d776969b708
Fix the Transport: line in the SETUP request so that it works with WMS
rbultje
parents:
4291
diff
changeset
|
951 interleave, interleave + 1); |
|
0d776969b708
Fix the Transport: line in the SETUP request so that it works with WMS
rbultje
parents:
4291
diff
changeset
|
952 interleave += 2; |
| 0 | 953 } |
| 954 | |
|
3957
9f943bb755f9
Rename RTSPProtocol to RTSPLowerTransport, so that its name properly tells us
rbultje
parents:
3941
diff
changeset
|
955 else if (lower_transport == RTSP_LOWER_TRANSPORT_UDP_MULTICAST) { |
|
3877
3e0c7ad2a675
Remove unused code that used to handle protocol concatenation, i.e. trying
rbultje
parents:
3876
diff
changeset
|
956 snprintf(transport, sizeof(transport) - 1, |
|
3876
1026953d4ffe
Implement Realmedia/RTSP-compatible SETUP command. This includes calculation
rbultje
parents:
3861
diff
changeset
|
957 "%s/UDP;multicast", trans_pref); |
| 0 | 958 } |
|
4332
0d776969b708
Fix the Transport: line in the SETUP request so that it works with WMS
rbultje
parents:
4291
diff
changeset
|
959 if (rt->server_type == RTSP_SERVER_REAL || |
|
0d776969b708
Fix the Transport: line in the SETUP request so that it works with WMS
rbultje
parents:
4291
diff
changeset
|
960 rt->server_type == RTSP_SERVER_WMS) |
|
3876
1026953d4ffe
Implement Realmedia/RTSP-compatible SETUP command. This includes calculation
rbultje
parents:
3861
diff
changeset
|
961 av_strlcat(transport, ";mode=play", sizeof(transport)); |
| 885 | 962 snprintf(cmd, sizeof(cmd), |
| 172 | 963 "SETUP %s RTSP/1.0\r\n" |
| 964 "Transport: %s\r\n", | |
| 0 | 965 rtsp_st->control_url, transport); |
|
3923
83e51bcb03c2
Rename RTSP_SERVER_RDT to RTSP_SERVER_REAL, because RDT (the transport
rbultje
parents:
3920
diff
changeset
|
966 if (i == 0 && rt->server_type == RTSP_SERVER_REAL) { |
|
3876
1026953d4ffe
Implement Realmedia/RTSP-compatible SETUP command. This includes calculation
rbultje
parents:
3861
diff
changeset
|
967 char real_res[41], real_csum[9]; |
|
1026953d4ffe
Implement Realmedia/RTSP-compatible SETUP command. This includes calculation
rbultje
parents:
3861
diff
changeset
|
968 ff_rdt_calc_response_and_checksum(real_res, real_csum, |
|
1026953d4ffe
Implement Realmedia/RTSP-compatible SETUP command. This includes calculation
rbultje
parents:
3861
diff
changeset
|
969 real_challenge); |
|
1026953d4ffe
Implement Realmedia/RTSP-compatible SETUP command. This includes calculation
rbultje
parents:
3861
diff
changeset
|
970 av_strlcatf(cmd, sizeof(cmd), |
|
1026953d4ffe
Implement Realmedia/RTSP-compatible SETUP command. This includes calculation
rbultje
parents:
3861
diff
changeset
|
971 "If-Match: %s\r\n" |
|
1026953d4ffe
Implement Realmedia/RTSP-compatible SETUP command. This includes calculation
rbultje
parents:
3861
diff
changeset
|
972 "RealChallenge2: %s, sd=%s\r\n", |
|
1026953d4ffe
Implement Realmedia/RTSP-compatible SETUP command. This includes calculation
rbultje
parents:
3861
diff
changeset
|
973 rt->session_id, real_res, real_csum); |
|
1026953d4ffe
Implement Realmedia/RTSP-compatible SETUP command. This includes calculation
rbultje
parents:
3861
diff
changeset
|
974 } |
| 0 | 975 rtsp_send_cmd(s, cmd, reply, NULL); |
|
3149
5a7a7406ab1f
Allow cycling between different protocols (TCP, UDP or multicast) so that if
rbultje
parents:
3147
diff
changeset
|
976 if (reply->status_code == 461 /* Unsupported protocol */ && i == 0) { |
|
5a7a7406ab1f
Allow cycling between different protocols (TCP, UDP or multicast) so that if
rbultje
parents:
3147
diff
changeset
|
977 err = 1; |
|
5a7a7406ab1f
Allow cycling between different protocols (TCP, UDP or multicast) so that if
rbultje
parents:
3147
diff
changeset
|
978 goto fail; |
| 3151 | 979 } else if (reply->status_code != RTSP_STATUS_OK || |
| 980 reply->nb_transports != 1) { | |
| 0 | 981 err = AVERROR_INVALIDDATA; |
| 982 goto fail; | |
| 983 } | |
| 984 | |
| 985 /* XXX: same protocol for all streams is required */ | |
| 986 if (i > 0) { | |
|
3960
13e9b0d3a314
Implement a RTSPTransport field, which allows proper separation of server
rbultje
parents:
3959
diff
changeset
|
987 if (reply->transports[0].lower_transport != rt->lower_transport || |
|
13e9b0d3a314
Implement a RTSPTransport field, which allows proper separation of server
rbultje
parents:
3959
diff
changeset
|
988 reply->transports[0].transport != rt->transport) { |
| 0 | 989 err = AVERROR_INVALIDDATA; |
| 990 goto fail; | |
| 991 } | |
| 992 } else { | |
|
3957
9f943bb755f9
Rename RTSPProtocol to RTSPLowerTransport, so that its name properly tells us
rbultje
parents:
3941
diff
changeset
|
993 rt->lower_transport = reply->transports[0].lower_transport; |
|
3960
13e9b0d3a314
Implement a RTSPTransport field, which allows proper separation of server
rbultje
parents:
3959
diff
changeset
|
994 rt->transport = reply->transports[0].transport; |
| 0 | 995 } |
| 996 | |
| 997 /* close RTP connection if not choosen */ | |
|
3957
9f943bb755f9
Rename RTSPProtocol to RTSPLowerTransport, so that its name properly tells us
rbultje
parents:
3941
diff
changeset
|
998 if (reply->transports[0].lower_transport != RTSP_LOWER_TRANSPORT_UDP && |
|
9f943bb755f9
Rename RTSPProtocol to RTSPLowerTransport, so that its name properly tells us
rbultje
parents:
3941
diff
changeset
|
999 (lower_transport == RTSP_LOWER_TRANSPORT_UDP)) { |
|
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
1000 url_close(rtsp_st->rtp_handle); |
|
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
1001 rtsp_st->rtp_handle = NULL; |
| 0 | 1002 } |
| 1003 | |
|
3957
9f943bb755f9
Rename RTSPProtocol to RTSPLowerTransport, so that its name properly tells us
rbultje
parents:
3941
diff
changeset
|
1004 switch(reply->transports[0].lower_transport) { |
|
9f943bb755f9
Rename RTSPProtocol to RTSPLowerTransport, so that its name properly tells us
rbultje
parents:
3941
diff
changeset
|
1005 case RTSP_LOWER_TRANSPORT_TCP: |
| 0 | 1006 rtsp_st->interleaved_min = reply->transports[0].interleaved_min; |
| 1007 rtsp_st->interleaved_max = reply->transports[0].interleaved_max; | |
| 1008 break; | |
| 885 | 1009 |
|
3957
9f943bb755f9
Rename RTSPProtocol to RTSPLowerTransport, so that its name properly tells us
rbultje
parents:
3941
diff
changeset
|
1010 case RTSP_LOWER_TRANSPORT_UDP: |
| 0 | 1011 { |
| 1012 char url[1024]; | |
| 885 | 1013 |
| 0 | 1014 /* XXX: also use address if specified */ |
| 885 | 1015 snprintf(url, sizeof(url), "rtp://%s:%d", |
| 0 | 1016 host, reply->transports[0].server_port_min); |
|
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
1017 if (rtp_set_remote_url(rtsp_st->rtp_handle, url) < 0) { |
| 0 | 1018 err = AVERROR_INVALIDDATA; |
| 1019 goto fail; | |
| 1020 } | |
| 1021 } | |
| 1022 break; | |
|
3957
9f943bb755f9
Rename RTSPProtocol to RTSPLowerTransport, so that its name properly tells us
rbultje
parents:
3941
diff
changeset
|
1023 case RTSP_LOWER_TRANSPORT_UDP_MULTICAST: |
| 0 | 1024 { |
| 1025 char url[1024]; | |
|
2246
6dade35dc9b3
rtsp multicast fix by Thijs Vermeir $1$2@gmail.com
lu_zero
parents:
2222
diff
changeset
|
1026 struct in_addr in; |
| 0 | 1027 |
|
2246
6dade35dc9b3
rtsp multicast fix by Thijs Vermeir $1$2@gmail.com
lu_zero
parents:
2222
diff
changeset
|
1028 in.s_addr = htonl(reply->transports[0].destination); |
| 3221 | 1029 snprintf(url, sizeof(url), "rtp://%s:%d?ttl=%d", |
|
2246
6dade35dc9b3
rtsp multicast fix by Thijs Vermeir $1$2@gmail.com
lu_zero
parents:
2222
diff
changeset
|
1030 inet_ntoa(in), |
|
6dade35dc9b3
rtsp multicast fix by Thijs Vermeir $1$2@gmail.com
lu_zero
parents:
2222
diff
changeset
|
1031 reply->transports[0].port_min, |
|
6dade35dc9b3
rtsp multicast fix by Thijs Vermeir $1$2@gmail.com
lu_zero
parents:
2222
diff
changeset
|
1032 reply->transports[0].ttl); |
|
1425
00d9393a126f
make ffmpeg able to send back a RTCP receiver report.
gpoirier
parents:
1424
diff
changeset
|
1033 if (url_open(&rtsp_st->rtp_handle, url, URL_RDWR) < 0) { |
| 0 | 1034 err = AVERROR_INVALIDDATA; |
| 1035 goto fail; | |
| 1036 } | |
| 1037 } | |
| 1038 break; | |
| 1039 } | |
| 774 | 1040 |
|
3919
1879eab34f88
Factorize out common code for opening of the RTP parsing context between
rbultje
parents:
3905
diff
changeset
|
1041 if ((err = rtsp_open_transport_ctx(s, rtsp_st))) |
|
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
1042 goto fail; |
| 0 | 1043 } |
| 1044 | |
|
3923
83e51bcb03c2
Rename RTSP_SERVER_RDT to RTSP_SERVER_REAL, because RDT (the transport
rbultje
parents:
3920
diff
changeset
|
1045 if (rt->server_type == RTSP_SERVER_REAL) |
|
3903
aeb79f68ba7e
Implement a RDT-specific SET_PARAMETER command that subscribes to the
rbultje
parents:
3877
diff
changeset
|
1046 rt->need_subscription = 1; |
|
aeb79f68ba7e
Implement a RDT-specific SET_PARAMETER command that subscribes to the
rbultje
parents:
3877
diff
changeset
|
1047 |
|
3147
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1048 return 0; |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1049 |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1050 fail: |
|
3149
5a7a7406ab1f
Allow cycling between different protocols (TCP, UDP or multicast) so that if
rbultje
parents:
3147
diff
changeset
|
1051 for (i=0; i<rt->nb_rtsp_streams; i++) { |
|
5a7a7406ab1f
Allow cycling between different protocols (TCP, UDP or multicast) so that if
rbultje
parents:
3147
diff
changeset
|
1052 if (rt->rtsp_streams[i]->rtp_handle) { |
|
5a7a7406ab1f
Allow cycling between different protocols (TCP, UDP or multicast) so that if
rbultje
parents:
3147
diff
changeset
|
1053 url_close(rt->rtsp_streams[i]->rtp_handle); |
|
5a7a7406ab1f
Allow cycling between different protocols (TCP, UDP or multicast) so that if
rbultje
parents:
3147
diff
changeset
|
1054 rt->rtsp_streams[i]->rtp_handle = NULL; |
|
5a7a7406ab1f
Allow cycling between different protocols (TCP, UDP or multicast) so that if
rbultje
parents:
3147
diff
changeset
|
1055 } |
|
5a7a7406ab1f
Allow cycling between different protocols (TCP, UDP or multicast) so that if
rbultje
parents:
3147
diff
changeset
|
1056 } |
|
3147
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1057 return err; |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1058 } |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1059 |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1060 static int rtsp_read_header(AVFormatContext *s, |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1061 AVFormatParameters *ap) |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1062 { |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1063 RTSPState *rt = s->priv_data; |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1064 char host[1024], path[1024], tcpname[1024], cmd[2048], *option_list, *option; |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1065 URLContext *rtsp_hd; |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1066 int port, ret, err; |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1067 RTSPHeader reply1, *reply = &reply1; |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1068 unsigned char *content = NULL; |
|
3957
9f943bb755f9
Rename RTSPProtocol to RTSPLowerTransport, so that its name properly tells us
rbultje
parents:
3941
diff
changeset
|
1069 int lower_transport_mask = 0; |
| 3856 | 1070 char real_challenge[64]; |
|
3147
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1071 |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1072 /* extract hostname and port */ |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1073 url_split(NULL, 0, NULL, 0, |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1074 host, sizeof(host), &port, path, sizeof(path), s->filename); |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1075 if (port < 0) |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1076 port = RTSP_DEFAULT_PORT; |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1077 |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1078 /* search for options */ |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1079 option_list = strchr(path, '?'); |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1080 if (option_list) { |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1081 /* remove the options from the path */ |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1082 *option_list++ = 0; |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1083 while(option_list) { |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1084 /* move the option pointer */ |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1085 option = option_list; |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1086 option_list = strchr(option_list, '&'); |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1087 if (option_list) |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1088 *(option_list++) = 0; |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1089 /* handle the options */ |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1090 if (strcmp(option, "udp") == 0) |
|
3957
9f943bb755f9
Rename RTSPProtocol to RTSPLowerTransport, so that its name properly tells us
rbultje
parents:
3941
diff
changeset
|
1091 lower_transport_mask = (1<< RTSP_LOWER_TRANSPORT_UDP); |
|
3147
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1092 else if (strcmp(option, "multicast") == 0) |
|
3957
9f943bb755f9
Rename RTSPProtocol to RTSPLowerTransport, so that its name properly tells us
rbultje
parents:
3941
diff
changeset
|
1093 lower_transport_mask = (1<< RTSP_LOWER_TRANSPORT_UDP_MULTICAST); |
|
3147
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1094 else if (strcmp(option, "tcp") == 0) |
|
3957
9f943bb755f9
Rename RTSPProtocol to RTSPLowerTransport, so that its name properly tells us
rbultje
parents:
3941
diff
changeset
|
1095 lower_transport_mask = (1<< RTSP_LOWER_TRANSPORT_TCP); |
|
3147
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1096 } |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1097 } |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1098 |
|
3957
9f943bb755f9
Rename RTSPProtocol to RTSPLowerTransport, so that its name properly tells us
rbultje
parents:
3941
diff
changeset
|
1099 if (!lower_transport_mask) |
|
9f943bb755f9
Rename RTSPProtocol to RTSPLowerTransport, so that its name properly tells us
rbultje
parents:
3941
diff
changeset
|
1100 lower_transport_mask = (1 << RTSP_LOWER_TRANSPORT_LAST) - 1; |
|
3147
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1101 |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1102 /* open the tcp connexion */ |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1103 snprintf(tcpname, sizeof(tcpname), "tcp://%s:%d", host, port); |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1104 if (url_open(&rtsp_hd, tcpname, URL_RDWR) < 0) |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1105 return AVERROR(EIO); |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1106 rt->rtsp_hd = rtsp_hd; |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1107 rt->seq = 0; |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1108 |
| 3856 | 1109 /* request options supported by the server; this also detects server type */ |
| 1110 for (rt->server_type = RTSP_SERVER_RTP;;) { | |
| 1111 snprintf(cmd, sizeof(cmd), | |
| 1112 "OPTIONS %s RTSP/1.0\r\n", s->filename); | |
|
3923
83e51bcb03c2
Rename RTSP_SERVER_RDT to RTSP_SERVER_REAL, because RDT (the transport
rbultje
parents:
3920
diff
changeset
|
1113 if (rt->server_type == RTSP_SERVER_REAL) |
| 3856 | 1114 av_strlcat(cmd, |
| 1115 /** | |
| 1116 * The following entries are required for proper | |
| 1117 * streaming from a Realmedia server. They are | |
| 1118 * interdependent in some way although we currently | |
| 1119 * don't quite understand how. Values were copied | |
| 1120 * from mplayer SVN r23589. | |
| 1121 * @param CompanyID is a 16-byte ID in base64 | |
| 1122 * @param ClientChallenge is a 16-byte ID in hex | |
| 1123 */ | |
| 1124 "ClientChallenge: 9e26d33f2984236010ef6253fb1887f7\r\n" | |
| 1125 "PlayerStarttime: [28/03/2003:22:50:23 00:00]\r\n" | |
| 1126 "CompanyID: KnKV4M4I/B2FjJ1TToLycw==\r\n" | |
| 1127 "GUID: 00000000-0000-0000-0000-000000000000\r\n", | |
| 1128 sizeof(cmd)); | |
| 1129 rtsp_send_cmd(s, cmd, reply, NULL); | |
| 1130 if (reply->status_code != RTSP_STATUS_OK) { | |
| 1131 err = AVERROR_INVALIDDATA; | |
| 1132 goto fail; | |
| 1133 } | |
| 1134 | |
| 1135 /* detect server type if not standard-compliant RTP */ | |
|
3923
83e51bcb03c2
Rename RTSP_SERVER_RDT to RTSP_SERVER_REAL, because RDT (the transport
rbultje
parents:
3920
diff
changeset
|
1136 if (rt->server_type != RTSP_SERVER_REAL && reply->real_challenge[0]) { |
|
83e51bcb03c2
Rename RTSP_SERVER_RDT to RTSP_SERVER_REAL, because RDT (the transport
rbultje
parents:
3920
diff
changeset
|
1137 rt->server_type = RTSP_SERVER_REAL; |
| 3856 | 1138 continue; |
|
4169
619845a9bab3
Use the "server" RTSP field to detect whether the server that we're talking
rbultje
parents:
4168
diff
changeset
|
1139 } else if (!strncasecmp(reply->server, "WMServer/", 9)) { |
|
619845a9bab3
Use the "server" RTSP field to detect whether the server that we're talking
rbultje
parents:
4168
diff
changeset
|
1140 rt->server_type = RTSP_SERVER_WMS; |
|
3923
83e51bcb03c2
Rename RTSP_SERVER_RDT to RTSP_SERVER_REAL, because RDT (the transport
rbultje
parents:
3920
diff
changeset
|
1141 } else if (rt->server_type == RTSP_SERVER_REAL) { |
| 3856 | 1142 strcpy(real_challenge, reply->real_challenge); |
| 1143 } | |
| 1144 break; | |
| 1145 } | |
| 1146 | |
|
3147
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1147 /* describe the stream */ |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1148 snprintf(cmd, sizeof(cmd), |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1149 "DESCRIBE %s RTSP/1.0\r\n" |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1150 "Accept: application/sdp\r\n", |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1151 s->filename); |
|
3923
83e51bcb03c2
Rename RTSP_SERVER_RDT to RTSP_SERVER_REAL, because RDT (the transport
rbultje
parents:
3920
diff
changeset
|
1152 if (rt->server_type == RTSP_SERVER_REAL) { |
| 3859 | 1153 /** |
| 1154 * The Require: attribute is needed for proper streaming from | |
| 1155 * Realmedia servers. | |
| 1156 */ | |
| 1157 av_strlcat(cmd, | |
| 1158 "Require: com.real.retain-entity-for-setup\r\n", | |
| 1159 sizeof(cmd)); | |
| 1160 } | |
|
3147
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1161 rtsp_send_cmd(s, cmd, reply, &content); |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1162 if (!content) { |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1163 err = AVERROR_INVALIDDATA; |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1164 goto fail; |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1165 } |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1166 if (reply->status_code != RTSP_STATUS_OK) { |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1167 err = AVERROR_INVALIDDATA; |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1168 goto fail; |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1169 } |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1170 |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1171 /* now we got the SDP description, we parse it */ |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1172 ret = sdp_parse(s, (const char *)content); |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1173 av_freep(&content); |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1174 if (ret < 0) { |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1175 err = AVERROR_INVALIDDATA; |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1176 goto fail; |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1177 } |
|
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1178 |
|
3149
5a7a7406ab1f
Allow cycling between different protocols (TCP, UDP or multicast) so that if
rbultje
parents:
3147
diff
changeset
|
1179 do { |
|
3957
9f943bb755f9
Rename RTSPProtocol to RTSPLowerTransport, so that its name properly tells us
rbultje
parents:
3941
diff
changeset
|
1180 int lower_transport = ff_log2_tab[lower_transport_mask & ~(lower_transport_mask - 1)]; |
|
3149
5a7a7406ab1f
Allow cycling between different protocols (TCP, UDP or multicast) so that if
rbultje
parents:
3147
diff
changeset
|
1181 |
|
3957
9f943bb755f9
Rename RTSPProtocol to RTSPLowerTransport, so that its name properly tells us
rbultje
parents:
3941
diff
changeset
|
1182 err = make_setup_request(s, host, port, lower_transport, |
|
3923
83e51bcb03c2
Rename RTSP_SERVER_RDT to RTSP_SERVER_REAL, because RDT (the transport
rbultje
parents:
3920
diff
changeset
|
1183 rt->server_type == RTSP_SERVER_REAL ? |
|
3876
1026953d4ffe
Implement Realmedia/RTSP-compatible SETUP command. This includes calculation
rbultje
parents:
3861
diff
changeset
|
1184 real_challenge : NULL); |
|
3149
5a7a7406ab1f
Allow cycling between different protocols (TCP, UDP or multicast) so that if
rbultje
parents:
3147
diff
changeset
|
1185 if (err < 0) |
| 3151 | 1186 goto fail; |
|
3957
9f943bb755f9
Rename RTSPProtocol to RTSPLowerTransport, so that its name properly tells us
rbultje
parents:
3941
diff
changeset
|
1187 lower_transport_mask &= ~(1 << lower_transport); |
|
9f943bb755f9
Rename RTSPProtocol to RTSPLowerTransport, so that its name properly tells us
rbultje
parents:
3941
diff
changeset
|
1188 if (lower_transport_mask == 0 && err == 1) { |
|
3202
98e633b72d38
use FF_NETERROR to make winsock happy, patch from prossATxvidDoTorg
lu_zero
parents:
3151
diff
changeset
|
1189 err = AVERROR(FF_NETERROR(EPROTONOSUPPORT)); |
|
3149
5a7a7406ab1f
Allow cycling between different protocols (TCP, UDP or multicast) so that if
rbultje
parents:
3147
diff
changeset
|
1190 goto fail; |
|
5a7a7406ab1f
Allow cycling between different protocols (TCP, UDP or multicast) so that if
rbultje
parents:
3147
diff
changeset
|
1191 } |
|
5a7a7406ab1f
Allow cycling between different protocols (TCP, UDP or multicast) so that if
rbultje
parents:
3147
diff
changeset
|
1192 } while (err); |
|
3147
91d65fdf91e1
Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents:
2884
diff
changeset
|
1193 |
|
304
d58c8859ff8c
initial seek support - more generic play/pause support
bellard
parents:
294
diff
changeset
|
1194 rt->state = RTSP_STATE_IDLE; |
|
d58c8859ff8c
initial seek support - more generic play/pause support
bellard
parents:
294
diff
changeset
|
1195 rt->seek_timestamp = 0; /* default is to start stream at position |
|
d58c8859ff8c
initial seek support - more generic play/pause support
bellard
parents:
294
diff
changeset
|
1196 zero */ |
| 1003 | 1197 if (ap->initial_pause) { |
|
304
d58c8859ff8c
initial seek support - more generic play/pause support
bellard
parents:
294
diff
changeset
|
1198 /* do not start immediately */ |
|
d58c8859ff8c
initial seek support - more generic play/pause support
bellard
parents:
294
diff
changeset
|
1199 } else { |
|
d58c8859ff8c
initial seek support - more generic play/pause support
bellard
parents:
294
diff
changeset
|
1200 if (rtsp_read_play(s) < 0) { |
|
d58c8859ff8c
initial seek support - more generic play/pause support
bellard
parents:
294
diff
changeset
|
1201 err = AVERROR_INVALIDDATA; |
| 0 | 1202 goto fail; |
| 1203 } | |
| 1204 } | |
| 1205 return 0; | |
| 1206 fail: | |
|
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
1207 rtsp_close_streams(rt); |
| 0 | 1208 av_freep(&content); |
| 1209 url_close(rt->rtsp_hd); | |
| 1210 return err; | |
| 1211 } | |
| 1212 | |
|
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
1213 static int tcp_read_packet(AVFormatContext *s, RTSPStream **prtsp_st, |
|
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
1214 uint8_t *buf, int buf_size) |
| 0 | 1215 { |
| 1216 RTSPState *rt = s->priv_data; | |
| 172 | 1217 int id, len, i, ret; |
| 0 | 1218 RTSPStream *rtsp_st; |
| 1219 | |
| 172 | 1220 #ifdef DEBUG_RTP_TCP |
| 1221 printf("tcp_read_packet:\n"); | |
| 1222 #endif | |
| 0 | 1223 redo: |
| 1224 for(;;) { | |
|
391
1cf22651d33b
support url_read which reads less then requested patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents:
370
diff
changeset
|
1225 ret = url_readbuf(rt->rtsp_hd, buf, 1); |
| 172 | 1226 #ifdef DEBUG_RTP_TCP |
| 1227 printf("ret=%d c=%02x [%c]\n", ret, buf[0], buf[0]); | |
| 1228 #endif | |
| 1229 if (ret != 1) | |
|
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
1230 return -1; |
| 172 | 1231 if (buf[0] == '$') |
| 0 | 1232 break; |
| 1233 } | |
|
391
1cf22651d33b
support url_read which reads less then requested patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents:
370
diff
changeset
|
1234 ret = url_readbuf(rt->rtsp_hd, buf, 3); |
| 172 | 1235 if (ret != 3) |
|
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
1236 return -1; |
| 172 | 1237 id = buf[0]; |
| 2222 | 1238 len = AV_RB16(buf + 1); |
| 172 | 1239 #ifdef DEBUG_RTP_TCP |
| 1240 printf("id=%d len=%d\n", id, len); | |
| 1241 #endif | |
|
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
1242 if (len > buf_size || len < 12) |
| 0 | 1243 goto redo; |
| 1244 /* get the data */ | |
|
391
1cf22651d33b
support url_read which reads less then requested patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents:
370
diff
changeset
|
1245 ret = url_readbuf(rt->rtsp_hd, buf, len); |
| 172 | 1246 if (ret != len) |
|
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
1247 return -1; |
|
3962
72efef66f566
This patch refactors RDT packet header parsing so that it can be used in
rbultje
parents:
3961
diff
changeset
|
1248 if (rt->transport == RTSP_TRANSPORT_RDT && |
|
4029
9a0a46d465ae
Add is_keyframe param to ff_rdt_parse_header(). See ML discussion in
rbultje
parents:
4026
diff
changeset
|
1249 ff_rdt_parse_header(buf, len, &id, NULL, NULL, NULL, NULL) < 0) |
|
3962
72efef66f566
This patch refactors RDT packet header parsing so that it can be used in
rbultje
parents:
3961
diff
changeset
|
1250 return -1; |
| 885 | 1251 |
| 0 | 1252 /* find the matching stream */ |
|
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
1253 for(i = 0; i < rt->nb_rtsp_streams; i++) { |
|
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
1254 rtsp_st = rt->rtsp_streams[i]; |
| 885 | 1255 if (id >= rtsp_st->interleaved_min && |
| 1256 id <= rtsp_st->interleaved_max) | |
| 0 | 1257 goto found; |
| 1258 } | |
| 1259 goto redo; | |
| 1260 found: | |
|
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
1261 *prtsp_st = rtsp_st; |
|
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
1262 return len; |
| 0 | 1263 } |
| 1264 | |
| 885 | 1265 static int udp_read_packet(AVFormatContext *s, RTSPStream **prtsp_st, |
|
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
1266 uint8_t *buf, int buf_size) |
| 0 | 1267 { |
|
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
1268 RTSPState *rt = s->priv_data; |
| 0 | 1269 RTSPStream *rtsp_st; |
| 1270 fd_set rfds; | |
| 1271 int fd1, fd2, fd_max, n, i, ret; | |
| 1272 struct timeval tv; | |
| 1273 | |
| 1274 for(;;) { | |
| 179 | 1275 if (url_interrupt_cb()) |
|
2772
b43dc2901f83
Make av_read_frame with rtsp client return EINTR on interrupt
lu_zero
parents:
2771
diff
changeset
|
1276 return AVERROR(EINTR); |
| 0 | 1277 FD_ZERO(&rfds); |
| 1278 fd_max = -1; | |
|
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
1279 for(i = 0; i < rt->nb_rtsp_streams; i++) { |
|
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
1280 rtsp_st = rt->rtsp_streams[i]; |
| 0 | 1281 /* currently, we cannot probe RTCP handle because of blocking restrictions */ |
|
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
1282 rtp_get_file_handles(rtsp_st->rtp_handle, &fd1, &fd2); |
| 0 | 1283 if (fd1 > fd_max) |
| 1284 fd_max = fd1; | |
| 1285 FD_SET(fd1, &rfds); | |
| 1286 } | |
| 1287 tv.tv_sec = 0; | |
| 179 | 1288 tv.tv_usec = 100 * 1000; |
| 0 | 1289 n = select(fd_max + 1, &rfds, NULL, NULL, &tv); |
| 1290 if (n > 0) { | |
|
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
1291 for(i = 0; i < rt->nb_rtsp_streams; i++) { |
|
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
1292 rtsp_st = rt->rtsp_streams[i]; |
|
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
1293 rtp_get_file_handles(rtsp_st->rtp_handle, &fd1, &fd2); |
| 0 | 1294 if (FD_ISSET(fd1, &rfds)) { |
|
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
1295 ret = url_read(rtsp_st->rtp_handle, buf, buf_size); |
|
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
1296 if (ret > 0) { |
|
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
1297 *prtsp_st = rtsp_st; |
| 0 | 1298 return ret; |
| 1299 } | |
| 1300 } | |
| 1301 } | |
| 1302 } | |
| 1303 } | |
| 1304 } | |
| 1305 | |
| 1306 static int rtsp_read_packet(AVFormatContext *s, | |
| 1307 AVPacket *pkt) | |
| 1308 { | |
| 1309 RTSPState *rt = s->priv_data; | |
|
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
1310 RTSPStream *rtsp_st; |
|
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
1311 int ret, len; |
|
4182
313d987dd2b4
Increase buffer size for RTP packet data because some ASF streams use a
rbultje
parents:
4169
diff
changeset
|
1312 uint8_t buf[10 * RTP_MAX_PACKET_LENGTH]; |
| 0 | 1313 |
|
4166
1dbda91eaebd
Allow subscription to any of the streams, not just the first, available in
rbultje
parents:
4165
diff
changeset
|
1314 if (rt->server_type == RTSP_SERVER_REAL) { |
|
3903
aeb79f68ba7e
Implement a RDT-specific SET_PARAMETER command that subscribes to the
rbultje
parents:
3877
diff
changeset
|
1315 int i; |
|
aeb79f68ba7e
Implement a RDT-specific SET_PARAMETER command that subscribes to the
rbultje
parents:
3877
diff
changeset
|
1316 RTSPHeader reply1, *reply = &reply1; |
|
4166
1dbda91eaebd
Allow subscription to any of the streams, not just the first, available in
rbultje
parents:
4165
diff
changeset
|
1317 enum AVDiscard cache[MAX_STREAMS]; |
|
3903
aeb79f68ba7e
Implement a RDT-specific SET_PARAMETER command that subscribes to the
rbultje
parents:
3877
diff
changeset
|
1318 char cmd[1024]; |
|
aeb79f68ba7e
Implement a RDT-specific SET_PARAMETER command that subscribes to the
rbultje
parents:
3877
diff
changeset
|
1319 |
|
4166
1dbda91eaebd
Allow subscription to any of the streams, not just the first, available in
rbultje
parents:
4165
diff
changeset
|
1320 for (i = 0; i < s->nb_streams; i++) |
|
1dbda91eaebd
Allow subscription to any of the streams, not just the first, available in
rbultje
parents:
4165
diff
changeset
|
1321 cache[i] = s->streams[i]->discard; |
|
1dbda91eaebd
Allow subscription to any of the streams, not just the first, available in
rbultje
parents:
4165
diff
changeset
|
1322 |
|
1dbda91eaebd
Allow subscription to any of the streams, not just the first, available in
rbultje
parents:
4165
diff
changeset
|
1323 if (!rt->need_subscription) { |
|
1dbda91eaebd
Allow subscription to any of the streams, not just the first, available in
rbultje
parents:
4165
diff
changeset
|
1324 if (memcmp (cache, rt->real_setup_cache, |
|
1dbda91eaebd
Allow subscription to any of the streams, not just the first, available in
rbultje
parents:
4165
diff
changeset
|
1325 sizeof(enum AVDiscard) * s->nb_streams)) { |
|
1dbda91eaebd
Allow subscription to any of the streams, not just the first, available in
rbultje
parents:
4165
diff
changeset
|
1326 av_strlcatf(cmd, sizeof(cmd), |
|
1dbda91eaebd
Allow subscription to any of the streams, not just the first, available in
rbultje
parents:
4165
diff
changeset
|
1327 "SET_PARAMETER %s RTSP/1.0\r\n" |
|
1dbda91eaebd
Allow subscription to any of the streams, not just the first, available in
rbultje
parents:
4165
diff
changeset
|
1328 "Unsubscribe: %s\r\n", |
|
1dbda91eaebd
Allow subscription to any of the streams, not just the first, available in
rbultje
parents:
4165
diff
changeset
|
1329 s->filename, rt->last_subscription); |
|
1dbda91eaebd
Allow subscription to any of the streams, not just the first, available in
rbultje
parents:
4165
diff
changeset
|
1330 rtsp_send_cmd(s, cmd, reply, NULL); |
|
1dbda91eaebd
Allow subscription to any of the streams, not just the first, available in
rbultje
parents:
4165
diff
changeset
|
1331 if (reply->status_code != RTSP_STATUS_OK) |
|
1dbda91eaebd
Allow subscription to any of the streams, not just the first, available in
rbultje
parents:
4165
diff
changeset
|
1332 return AVERROR_INVALIDDATA; |
|
1dbda91eaebd
Allow subscription to any of the streams, not just the first, available in
rbultje
parents:
4165
diff
changeset
|
1333 rt->need_subscription = 1; |
|
1dbda91eaebd
Allow subscription to any of the streams, not just the first, available in
rbultje
parents:
4165
diff
changeset
|
1334 } |
|
3903
aeb79f68ba7e
Implement a RDT-specific SET_PARAMETER command that subscribes to the
rbultje
parents:
3877
diff
changeset
|
1335 } |
|
4166
1dbda91eaebd
Allow subscription to any of the streams, not just the first, available in
rbultje
parents:
4165
diff
changeset
|
1336 |
|
1dbda91eaebd
Allow subscription to any of the streams, not just the first, available in
rbultje
parents:
4165
diff
changeset
|
1337 if (rt->need_subscription) { |
|
1dbda91eaebd
Allow subscription to any of the streams, not just the first, available in
rbultje
parents:
4165
diff
changeset
|
1338 int r, rule_nr, first = 1; |
|
1dbda91eaebd
Allow subscription to any of the streams, not just the first, available in
rbultje
parents:
4165
diff
changeset
|
1339 |
|
1dbda91eaebd
Allow subscription to any of the streams, not just the first, available in
rbultje
parents:
4165
diff
changeset
|
1340 memcpy(rt->real_setup_cache, cache, |
|
1dbda91eaebd
Allow subscription to any of the streams, not just the first, available in
rbultje
parents:
4165
diff
changeset
|
1341 sizeof(enum AVDiscard) * s->nb_streams); |
|
1dbda91eaebd
Allow subscription to any of the streams, not just the first, available in
rbultje
parents:
4165
diff
changeset
|
1342 rt->last_subscription[0] = 0; |
|
3903
aeb79f68ba7e
Implement a RDT-specific SET_PARAMETER command that subscribes to the
rbultje
parents:
3877
diff
changeset
|
1343 |
|
4166
1dbda91eaebd
Allow subscription to any of the streams, not just the first, available in
rbultje
parents:
4165
diff
changeset
|
1344 snprintf(cmd, sizeof(cmd), |
|
1dbda91eaebd
Allow subscription to any of the streams, not just the first, available in
rbultje
parents:
4165
diff
changeset
|
1345 "SET_PARAMETER %s RTSP/1.0\r\n" |
|
1dbda91eaebd
Allow subscription to any of the streams, not just the first, available in
rbultje
parents:
4165
diff
changeset
|
1346 "Subscribe: ", |
|
1dbda91eaebd
Allow subscription to any of the streams, not just the first, available in
rbultje
parents:
4165
diff
changeset
|
1347 s->filename); |
|
1dbda91eaebd
Allow subscription to any of the streams, not just the first, available in
rbultje
parents:
4165
diff
changeset
|
1348 for (i = 0; i < rt->nb_rtsp_streams; i++) { |
|
1dbda91eaebd
Allow subscription to any of the streams, not just the first, available in
rbultje
parents:
4165
diff
changeset
|
1349 rule_nr = 0; |
|
1dbda91eaebd
Allow subscription to any of the streams, not just the first, available in
rbultje
parents:
4165
diff
changeset
|
1350 for (r = 0; r < s->nb_streams; r++) { |
|
1dbda91eaebd
Allow subscription to any of the streams, not just the first, available in
rbultje
parents:
4165
diff
changeset
|
1351 if (s->streams[r]->priv_data == rt->rtsp_streams[i]) { |
|
1dbda91eaebd
Allow subscription to any of the streams, not just the first, available in
rbultje
parents:
4165
diff
changeset
|
1352 if (s->streams[r]->discard != AVDISCARD_ALL) { |
|
1dbda91eaebd
Allow subscription to any of the streams, not just the first, available in
rbultje
parents:
4165
diff
changeset
|
1353 if (!first) |
|
1dbda91eaebd
Allow subscription to any of the streams, not just the first, available in
rbultje
parents:
4165
diff
changeset
|
1354 av_strlcat(rt->last_subscription, ",", |
|
1dbda91eaebd
Allow subscription to any of the streams, not just the first, available in
rbultje
parents:
4165
diff
changeset
|
1355 sizeof(rt->last_subscription)); |
|
1dbda91eaebd
Allow subscription to any of the streams, not just the first, available in
rbultje
parents:
4165
diff
changeset
|
1356 ff_rdt_subscribe_rule( |
|
1dbda91eaebd
Allow subscription to any of the streams, not just the first, available in
rbultje
parents:
4165
diff
changeset
|
1357 rt->last_subscription, |
|
1dbda91eaebd
Allow subscription to any of the streams, not just the first, available in
rbultje
parents:
4165
diff
changeset
|
1358 sizeof(rt->last_subscription), i, rule_nr); |
|
1dbda91eaebd
Allow subscription to any of the streams, not just the first, available in
rbultje
parents:
4165
diff
changeset
|
1359 first = 0; |
|
1dbda91eaebd
Allow subscription to any of the streams, not just the first, available in
rbultje
parents:
4165
diff
changeset
|
1360 } |
|
1dbda91eaebd
Allow subscription to any of the streams, not just the first, available in
rbultje
parents:
4165
diff
changeset
|
1361 rule_nr++; |
|
1dbda91eaebd
Allow subscription to any of the streams, not just the first, available in
rbultje
parents:
4165
diff
changeset
|
1362 } |
|
1dbda91eaebd
Allow subscription to any of the streams, not just the first, available in
rbultje
parents:
4165
diff
changeset
|
1363 } |
|
1dbda91eaebd
Allow subscription to any of the streams, not just the first, available in
rbultje
parents:
4165
diff
changeset
|
1364 } |
|
1dbda91eaebd
Allow subscription to any of the streams, not just the first, available in
rbultje
parents:
4165
diff
changeset
|
1365 av_strlcatf(cmd, sizeof(cmd), "%s\r\n", rt->last_subscription); |
|
1dbda91eaebd
Allow subscription to any of the streams, not just the first, available in
rbultje
parents:
4165
diff
changeset
|
1366 rtsp_send_cmd(s, cmd, reply, NULL); |
|
1dbda91eaebd
Allow subscription to any of the streams, not just the first, available in
rbultje
parents:
4165
diff
changeset
|
1367 if (reply->status_code != RTSP_STATUS_OK) |
|
1dbda91eaebd
Allow subscription to any of the streams, not just the first, available in
rbultje
parents:
4165
diff
changeset
|
1368 return AVERROR_INVALIDDATA; |
|
1dbda91eaebd
Allow subscription to any of the streams, not just the first, available in
rbultje
parents:
4165
diff
changeset
|
1369 rt->need_subscription = 0; |
|
1dbda91eaebd
Allow subscription to any of the streams, not just the first, available in
rbultje
parents:
4165
diff
changeset
|
1370 |
|
1dbda91eaebd
Allow subscription to any of the streams, not just the first, available in
rbultje
parents:
4165
diff
changeset
|
1371 if (rt->state == RTSP_STATE_PLAYING) |
|
1dbda91eaebd
Allow subscription to any of the streams, not just the first, available in
rbultje
parents:
4165
diff
changeset
|
1372 rtsp_read_play (s); |
|
1dbda91eaebd
Allow subscription to any of the streams, not just the first, available in
rbultje
parents:
4165
diff
changeset
|
1373 } |
|
3903
aeb79f68ba7e
Implement a RDT-specific SET_PARAMETER command that subscribes to the
rbultje
parents:
3877
diff
changeset
|
1374 } |
|
aeb79f68ba7e
Implement a RDT-specific SET_PARAMETER command that subscribes to the
rbultje
parents:
3877
diff
changeset
|
1375 |
|
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
1376 /* get next frames from the same RTP packet */ |
|
3978
0033b09d74b9
Make RTPDemuxContext opaque in rtsp.c, renaming it to tx_ctx (tx=transport)
rbultje
parents:
3977
diff
changeset
|
1377 if (rt->cur_tx) { |
|
3960
13e9b0d3a314
Implement a RTSPTransport field, which allows proper separation of server
rbultje
parents:
3959
diff
changeset
|
1378 if (rt->transport == RTSP_TRANSPORT_RDT) |
|
3978
0033b09d74b9
Make RTPDemuxContext opaque in rtsp.c, renaming it to tx_ctx (tx=transport)
rbultje
parents:
3977
diff
changeset
|
1379 ret = ff_rdt_parse_packet(rt->cur_tx, pkt, NULL, 0); |
|
3905
91987686113d
Implement RDT-specific data parsing routines. After these changes, simple
rbultje
parents:
3904
diff
changeset
|
1380 else |
|
3978
0033b09d74b9
Make RTPDemuxContext opaque in rtsp.c, renaming it to tx_ctx (tx=transport)
rbultje
parents:
3977
diff
changeset
|
1381 ret = rtp_parse_packet(rt->cur_tx, pkt, NULL, 0); |
|
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
1382 if (ret == 0) { |
|
3978
0033b09d74b9
Make RTPDemuxContext opaque in rtsp.c, renaming it to tx_ctx (tx=transport)
rbultje
parents:
3977
diff
changeset
|
1383 rt->cur_tx = NULL; |
|
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
1384 return 0; |
|
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
1385 } else if (ret == 1) { |
|
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
1386 return 0; |
|
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
1387 } else { |
|
3978
0033b09d74b9
Make RTPDemuxContext opaque in rtsp.c, renaming it to tx_ctx (tx=transport)
rbultje
parents:
3977
diff
changeset
|
1388 rt->cur_tx = NULL; |
|
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
1389 } |
|
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
1390 } |
|
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
1391 |
|
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
1392 /* read next RTP packet */ |
|
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
1393 redo: |
|
3957
9f943bb755f9
Rename RTSPProtocol to RTSPLowerTransport, so that its name properly tells us
rbultje
parents:
3941
diff
changeset
|
1394 switch(rt->lower_transport) { |
| 0 | 1395 default: |
|
3957
9f943bb755f9
Rename RTSPProtocol to RTSPLowerTransport, so that its name properly tells us
rbultje
parents:
3941
diff
changeset
|
1396 case RTSP_LOWER_TRANSPORT_TCP: |
|
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
1397 len = tcp_read_packet(s, &rtsp_st, buf, sizeof(buf)); |
| 0 | 1398 break; |
|
3957
9f943bb755f9
Rename RTSPProtocol to RTSPLowerTransport, so that its name properly tells us
rbultje
parents:
3941
diff
changeset
|
1399 case RTSP_LOWER_TRANSPORT_UDP: |
|
9f943bb755f9
Rename RTSPProtocol to RTSPLowerTransport, so that its name properly tells us
rbultje
parents:
3941
diff
changeset
|
1400 case RTSP_LOWER_TRANSPORT_UDP_MULTICAST: |
|
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
1401 len = udp_read_packet(s, &rtsp_st, buf, sizeof(buf)); |
|
4026
bd11db44dfba
Call check_back_and_send_rr() function only in case of RTP as a transport.
rbultje
parents:
3980
diff
changeset
|
1402 if (len >=0 && rtsp_st->tx_ctx && rt->transport == RTSP_TRANSPORT_RTP) |
|
3978
0033b09d74b9
Make RTPDemuxContext opaque in rtsp.c, renaming it to tx_ctx (tx=transport)
rbultje
parents:
3977
diff
changeset
|
1403 rtp_check_and_send_back_rr(rtsp_st->tx_ctx, len); |
| 0 | 1404 break; |
| 1405 } | |
|
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
1406 if (len < 0) |
|
2775
1301147d9450
Make av_read_frame with rtsp client return EINTR on interrupt
lu_zero
parents:
2772
diff
changeset
|
1407 return len; |
|
3960
13e9b0d3a314
Implement a RTSPTransport field, which allows proper separation of server
rbultje
parents:
3959
diff
changeset
|
1408 if (rt->transport == RTSP_TRANSPORT_RDT) |
|
3978
0033b09d74b9
Make RTPDemuxContext opaque in rtsp.c, renaming it to tx_ctx (tx=transport)
rbultje
parents:
3977
diff
changeset
|
1409 ret = ff_rdt_parse_packet(rtsp_st->tx_ctx, pkt, buf, len); |
|
3905
91987686113d
Implement RDT-specific data parsing routines. After these changes, simple
rbultje
parents:
3904
diff
changeset
|
1410 else |
|
3978
0033b09d74b9
Make RTPDemuxContext opaque in rtsp.c, renaming it to tx_ctx (tx=transport)
rbultje
parents:
3977
diff
changeset
|
1411 ret = rtp_parse_packet(rtsp_st->tx_ctx, pkt, buf, len); |
|
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
1412 if (ret < 0) |
|
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
1413 goto redo; |
|
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
1414 if (ret == 1) { |
|
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
1415 /* more packets may follow, so we save the RTP context */ |
|
3978
0033b09d74b9
Make RTPDemuxContext opaque in rtsp.c, renaming it to tx_ctx (tx=transport)
rbultje
parents:
3977
diff
changeset
|
1416 rt->cur_tx = rtsp_st->tx_ctx; |
|
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
1417 } |
|
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
1418 return 0; |
| 0 | 1419 } |
| 1420 | |
|
304
d58c8859ff8c
initial seek support - more generic play/pause support
bellard
parents:
294
diff
changeset
|
1421 static int rtsp_read_play(AVFormatContext *s) |
| 179 | 1422 { |
|
304
d58c8859ff8c
initial seek support - more generic play/pause support
bellard
parents:
294
diff
changeset
|
1423 RTSPState *rt = s->priv_data; |
| 179 | 1424 RTSPHeader reply1, *reply = &reply1; |
| 1425 char cmd[1024]; | |
| 1426 | |
|
370
845f9de2c883
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
304
diff
changeset
|
1427 av_log(s, AV_LOG_DEBUG, "hello state=%d\n", rt->state); |
|
304
d58c8859ff8c
initial seek support - more generic play/pause support
bellard
parents:
294
diff
changeset
|
1428 |
|
3923
83e51bcb03c2
Rename RTSP_SERVER_RDT to RTSP_SERVER_REAL, because RDT (the transport
rbultje
parents:
3920
diff
changeset
|
1429 if (!(rt->server_type == RTSP_SERVER_REAL && rt->need_subscription)) { |
| 3904 | 1430 if (rt->state == RTSP_STATE_PAUSED) { |
| 1431 snprintf(cmd, sizeof(cmd), | |
| 1432 "PLAY %s RTSP/1.0\r\n", | |
| 1433 s->filename); | |
| 1434 } else { | |
| 1435 snprintf(cmd, sizeof(cmd), | |
| 1436 "PLAY %s RTSP/1.0\r\n" | |
| 1437 "Range: npt=%0.3f-\r\n", | |
| 1438 s->filename, | |
| 1439 (double)rt->seek_timestamp / AV_TIME_BASE); | |
| 1440 } | |
| 1441 rtsp_send_cmd(s, cmd, reply, NULL); | |
| 1442 if (reply->status_code != RTSP_STATUS_OK) { | |
| 1443 return -1; | |
| 1444 } | |
|
3903
aeb79f68ba7e
Implement a RDT-specific SET_PARAMETER command that subscribes to the
rbultje
parents:
3877
diff
changeset
|
1445 } |
|
3861
a0098594ab90
Remove useless "else" case in if X { A; return }; else { B }. See discussion
rbultje
parents:
3860
diff
changeset
|
1446 rt->state = RTSP_STATE_PLAYING; |
|
a0098594ab90
Remove useless "else" case in if X { A; return }; else { B }. See discussion
rbultje
parents:
3860
diff
changeset
|
1447 return 0; |
|
304
d58c8859ff8c
initial seek support - more generic play/pause support
bellard
parents:
294
diff
changeset
|
1448 } |
|
d58c8859ff8c
initial seek support - more generic play/pause support
bellard
parents:
294
diff
changeset
|
1449 |
|
d58c8859ff8c
initial seek support - more generic play/pause support
bellard
parents:
294
diff
changeset
|
1450 /* pause the stream */ |
|
d58c8859ff8c
initial seek support - more generic play/pause support
bellard
parents:
294
diff
changeset
|
1451 static int rtsp_read_pause(AVFormatContext *s) |
|
d58c8859ff8c
initial seek support - more generic play/pause support
bellard
parents:
294
diff
changeset
|
1452 { |
|
d58c8859ff8c
initial seek support - more generic play/pause support
bellard
parents:
294
diff
changeset
|
1453 RTSPState *rt = s->priv_data; |
|
d58c8859ff8c
initial seek support - more generic play/pause support
bellard
parents:
294
diff
changeset
|
1454 RTSPHeader reply1, *reply = &reply1; |
|
d58c8859ff8c
initial seek support - more generic play/pause support
bellard
parents:
294
diff
changeset
|
1455 char cmd[1024]; |
|
d58c8859ff8c
initial seek support - more generic play/pause support
bellard
parents:
294
diff
changeset
|
1456 |
| 179 | 1457 rt = s->priv_data; |
| 885 | 1458 |
|
304
d58c8859ff8c
initial seek support - more generic play/pause support
bellard
parents:
294
diff
changeset
|
1459 if (rt->state != RTSP_STATE_PLAYING) |
|
d58c8859ff8c
initial seek support - more generic play/pause support
bellard
parents:
294
diff
changeset
|
1460 return 0; |
|
3923
83e51bcb03c2
Rename RTSP_SERVER_RDT to RTSP_SERVER_REAL, because RDT (the transport
rbultje
parents:
3920
diff
changeset
|
1461 else if (!(rt->server_type == RTSP_SERVER_REAL && rt->need_subscription)) { |
| 3904 | 1462 snprintf(cmd, sizeof(cmd), |
| 1463 "PAUSE %s RTSP/1.0\r\n", | |
| 1464 s->filename); | |
| 1465 rtsp_send_cmd(s, cmd, reply, NULL); | |
| 1466 if (reply->status_code != RTSP_STATUS_OK) { | |
| 1467 return -1; | |
| 1468 } | |
|
3903
aeb79f68ba7e
Implement a RDT-specific SET_PARAMETER command that subscribes to the
rbultje
parents:
3877
diff
changeset
|
1469 } |
|
3861
a0098594ab90
Remove useless "else" case in if X { A; return }; else { B }. See discussion
rbultje
parents:
3860
diff
changeset
|
1470 rt->state = RTSP_STATE_PAUSED; |
|
a0098594ab90
Remove useless "else" case in if X { A; return }; else { B }. See discussion
rbultje
parents:
3860
diff
changeset
|
1471 return 0; |
| 179 | 1472 } |
| 1473 | |
| 885 | 1474 static int rtsp_read_seek(AVFormatContext *s, int stream_index, |
| 558 | 1475 int64_t timestamp, int flags) |
| 179 | 1476 { |
|
304
d58c8859ff8c
initial seek support - more generic play/pause support
bellard
parents:
294
diff
changeset
|
1477 RTSPState *rt = s->priv_data; |
| 885 | 1478 |
| 2408 | 1479 rt->seek_timestamp = av_rescale_q(timestamp, s->streams[stream_index]->time_base, AV_TIME_BASE_Q); |
|
304
d58c8859ff8c
initial seek support - more generic play/pause support
bellard
parents:
294
diff
changeset
|
1480 switch(rt->state) { |
|
d58c8859ff8c
initial seek support - more generic play/pause support
bellard
parents:
294
diff
changeset
|
1481 default: |
|
d58c8859ff8c
initial seek support - more generic play/pause support
bellard
parents:
294
diff
changeset
|
1482 case RTSP_STATE_IDLE: |
|
d58c8859ff8c
initial seek support - more generic play/pause support
bellard
parents:
294
diff
changeset
|
1483 break; |
|
d58c8859ff8c
initial seek support - more generic play/pause support
bellard
parents:
294
diff
changeset
|
1484 case RTSP_STATE_PLAYING: |
|
d58c8859ff8c
initial seek support - more generic play/pause support
bellard
parents:
294
diff
changeset
|
1485 if (rtsp_read_play(s) != 0) |
|
d58c8859ff8c
initial seek support - more generic play/pause support
bellard
parents:
294
diff
changeset
|
1486 return -1; |
|
d58c8859ff8c
initial seek support - more generic play/pause support
bellard
parents:
294
diff
changeset
|
1487 break; |
|
d58c8859ff8c
initial seek support - more generic play/pause support
bellard
parents:
294
diff
changeset
|
1488 case RTSP_STATE_PAUSED: |
|
d58c8859ff8c
initial seek support - more generic play/pause support
bellard
parents:
294
diff
changeset
|
1489 rt->state = RTSP_STATE_IDLE; |
|
d58c8859ff8c
initial seek support - more generic play/pause support
bellard
parents:
294
diff
changeset
|
1490 break; |
| 179 | 1491 } |
|
304
d58c8859ff8c
initial seek support - more generic play/pause support
bellard
parents:
294
diff
changeset
|
1492 return 0; |
| 179 | 1493 } |
| 1494 | |
| 0 | 1495 static int rtsp_read_close(AVFormatContext *s) |
| 1496 { | |
| 1497 RTSPState *rt = s->priv_data; | |
| 1498 RTSPHeader reply1, *reply = &reply1; | |
| 1499 char cmd[1024]; | |
| 1500 | |
| 172 | 1501 #if 0 |
| 0 | 1502 /* NOTE: it is valid to flush the buffer here */ |
|
3957
9f943bb755f9
Rename RTSPProtocol to RTSPLowerTransport, so that its name properly tells us
rbultje
parents:
3941
diff
changeset
|
1503 if (rt->lower_transport == RTSP_LOWER_TRANSPORT_TCP) { |
| 0 | 1504 url_fclose(&rt->rtsp_gb); |
| 1505 } | |
| 172 | 1506 #endif |
| 885 | 1507 snprintf(cmd, sizeof(cmd), |
| 172 | 1508 "TEARDOWN %s RTSP/1.0\r\n", |
| 0 | 1509 s->filename); |
| 1510 rtsp_send_cmd(s, cmd, reply, NULL); | |
| 1511 | |
|
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
1512 rtsp_close_streams(rt); |
| 0 | 1513 url_close(rt->rtsp_hd); |
| 1514 return 0; | |
| 1515 } | |
| 1516 | |
| 4206 | 1517 #if CONFIG_RTSP_DEMUXER |
| 1167 | 1518 AVInputFormat rtsp_demuxer = { |
| 0 | 1519 "rtsp", |
|
3424
7a0230981402
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents:
3286
diff
changeset
|
1520 NULL_IF_CONFIG_SMALL("RTSP input format"), |
| 0 | 1521 sizeof(RTSPState), |
| 1522 rtsp_probe, | |
| 1523 rtsp_read_header, | |
| 1524 rtsp_read_packet, | |
| 1525 rtsp_read_close, | |
|
304
d58c8859ff8c
initial seek support - more generic play/pause support
bellard
parents:
294
diff
changeset
|
1526 rtsp_read_seek, |
| 0 | 1527 .flags = AVFMT_NOFILE, |
|
304
d58c8859ff8c
initial seek support - more generic play/pause support
bellard
parents:
294
diff
changeset
|
1528 .read_play = rtsp_read_play, |
|
d58c8859ff8c
initial seek support - more generic play/pause support
bellard
parents:
294
diff
changeset
|
1529 .read_pause = rtsp_read_pause, |
| 0 | 1530 }; |
| 2054 | 1531 #endif |
| 0 | 1532 |
| 1533 static int sdp_probe(AVProbeData *p1) | |
| 1534 { | |
|
706
fc254f396f15
buffer overflow in sdp_probe() fix by (Gildas Bazin )gbazin altern org)
michael
parents:
587
diff
changeset
|
1535 const char *p = p1->buf, *p_end = p1->buf + p1->buf_size; |
| 0 | 1536 |
| 1537 /* we look for a line beginning "c=IN IP4" */ | |
|
706
fc254f396f15
buffer overflow in sdp_probe() fix by (Gildas Bazin )gbazin altern org)
michael
parents:
587
diff
changeset
|
1538 while (p < p_end && *p != '\0') { |
|
2193
5ce5fad0dfac
replace the uses of old string functions that Reimar missed
mru
parents:
2189
diff
changeset
|
1539 if (p + sizeof("c=IN IP4") - 1 < p_end && av_strstart(p, "c=IN IP4", NULL)) |
| 0 | 1540 return AVPROBE_SCORE_MAX / 2; |
|
706
fc254f396f15
buffer overflow in sdp_probe() fix by (Gildas Bazin )gbazin altern org)
michael
parents:
587
diff
changeset
|
1541 |
|
fc254f396f15
buffer overflow in sdp_probe() fix by (Gildas Bazin )gbazin altern org)
michael
parents:
587
diff
changeset
|
1542 while(p < p_end - 1 && *p != '\n') p++; |
|
fc254f396f15
buffer overflow in sdp_probe() fix by (Gildas Bazin )gbazin altern org)
michael
parents:
587
diff
changeset
|
1543 if (++p >= p_end) |
| 0 | 1544 break; |
| 1545 if (*p == '\r') | |
| 1546 p++; | |
| 1547 } | |
| 1548 return 0; | |
| 1549 } | |
| 1550 | |
| 1551 #define SDP_MAX_SIZE 8192 | |
| 1552 | |
| 1553 static int sdp_read_header(AVFormatContext *s, | |
| 1554 AVFormatParameters *ap) | |
| 1555 { | |
|
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
1556 RTSPState *rt = s->priv_data; |
| 0 | 1557 RTSPStream *rtsp_st; |
| 1558 int size, i, err; | |
| 1559 char *content; | |
| 1560 char url[1024]; | |
| 1561 | |
| 1562 /* read the whole sdp file */ | |
| 1563 /* XXX: better loading */ | |
| 1564 content = av_malloc(SDP_MAX_SIZE); | |
|
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2759
diff
changeset
|
1565 size = get_buffer(s->pb, content, SDP_MAX_SIZE - 1); |
| 0 | 1566 if (size <= 0) { |
| 1567 av_free(content); | |
| 1568 return AVERROR_INVALIDDATA; | |
| 1569 } | |
| 1570 content[size] ='\0'; | |
| 1571 | |
| 1572 sdp_parse(s, content); | |
| 1573 av_free(content); | |
| 1574 | |
| 1575 /* open each RTP stream */ | |
|
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
1576 for(i=0;i<rt->nb_rtsp_streams;i++) { |
|
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
1577 rtsp_st = rt->rtsp_streams[i]; |
| 885 | 1578 |
| 3222 | 1579 snprintf(url, sizeof(url), "rtp://%s:%d?localport=%d&ttl=%d", |
| 885 | 1580 inet_ntoa(rtsp_st->sdp_ip), |
| 0 | 1581 rtsp_st->sdp_port, |
| 3222 | 1582 rtsp_st->sdp_port, |
| 0 | 1583 rtsp_st->sdp_ttl); |
|
1425
00d9393a126f
make ffmpeg able to send back a RTCP receiver report.
gpoirier
parents:
1424
diff
changeset
|
1584 if (url_open(&rtsp_st->rtp_handle, url, URL_RDWR) < 0) { |
| 0 | 1585 err = AVERROR_INVALIDDATA; |
| 1586 goto fail; | |
| 1587 } | |
|
3919
1879eab34f88
Factorize out common code for opening of the RTP parsing context between
rbultje
parents:
3905
diff
changeset
|
1588 if ((err = rtsp_open_transport_ctx(s, rtsp_st))) |
|
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
1589 goto fail; |
| 0 | 1590 } |
| 1591 return 0; | |
| 1592 fail: | |
|
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
1593 rtsp_close_streams(rt); |
| 0 | 1594 return err; |
| 1595 } | |
| 1596 | |
| 1597 static int sdp_read_packet(AVFormatContext *s, | |
| 1598 AVPacket *pkt) | |
| 1599 { | |
|
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
1600 return rtsp_read_packet(s, pkt); |
| 0 | 1601 } |
| 1602 | |
| 1603 static int sdp_read_close(AVFormatContext *s) | |
| 1604 { | |
|
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
1605 RTSPState *rt = s->priv_data; |
|
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
229
diff
changeset
|
1606 rtsp_close_streams(rt); |
| 0 | 1607 return 0; |
| 1608 } | |
| 1609 | |
| 4206 | 1610 #if CONFIG_SDP_DEMUXER |
| 1169 | 1611 AVInputFormat sdp_demuxer = { |
| 0 | 1612 "sdp", |
|
3424
7a0230981402
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents:
3286
diff
changeset
|
1613 NULL_IF_CONFIG_SMALL("SDP"), |
| 0 | 1614 sizeof(RTSPState), |
| 1615 sdp_probe, | |
| 1616 sdp_read_header, | |
| 1617 sdp_read_packet, | |
| 1618 sdp_read_close, | |
| 1619 }; | |
| 1169 | 1620 #endif |
| 0 | 1621 |
| 4206 | 1622 #if CONFIG_REDIR_DEMUXER |
| 0 | 1623 /* dummy redirector format (used directly in av_open_input_file now) */ |
| 1624 static int redir_probe(AVProbeData *pd) | |
| 1625 { | |
| 1626 const char *p; | |
| 1627 p = pd->buf; | |
| 1628 while (redir_isspace(*p)) | |
| 1629 p++; | |
|
2193
5ce5fad0dfac
replace the uses of old string functions that Reimar missed
mru
parents:
2189
diff
changeset
|
1630 if (av_strstart(p, "http://", NULL) || |
|
5ce5fad0dfac
replace the uses of old string functions that Reimar missed
mru
parents:
2189
diff
changeset
|
1631 av_strstart(p, "rtsp://", NULL)) |
| 0 | 1632 return AVPROBE_SCORE_MAX; |
| 1633 return 0; | |
| 1634 } | |
| 1635 | |
|
2785
d3b3cfb538d8
Suppress the "redirector hack" from libavformat/utils.c:av_open_input_stream(),
lucabe
parents:
2775
diff
changeset
|
1636 static int redir_read_header(AVFormatContext *s, AVFormatParameters *ap) |
| 0 | 1637 { |
| 1638 char buf[4096], *q; | |
| 1639 int c; | |
| 1640 AVFormatContext *ic = NULL; | |
|
2785
d3b3cfb538d8
Suppress the "redirector hack" from libavformat/utils.c:av_open_input_stream(),
lucabe
parents:
2775
diff
changeset
|
1641 ByteIOContext *f = s->pb; |
| 0 | 1642 |
| 1643 /* parse each URL and try to open it */ | |
| 1644 c = url_fgetc(f); | |
| 1645 while (c != URL_EOF) { | |
| 1646 /* skip spaces */ | |
| 1647 for(;;) { | |
| 1648 if (!redir_isspace(c)) | |
| 1649 break; | |
| 1650 c = url_fgetc(f); | |
| 1651 } | |
| 1652 if (c == URL_EOF) | |
| 1653 break; | |
| 1654 /* record url */ | |
| 1655 q = buf; | |
| 1656 for(;;) { | |
| 1657 if (c == URL_EOF || redir_isspace(c)) | |
| 1658 break; | |
| 1659 if ((q - buf) < sizeof(buf) - 1) | |
| 1660 *q++ = c; | |
| 1661 c = url_fgetc(f); | |
| 1662 } | |
| 1663 *q = '\0'; | |
| 1664 //printf("URL='%s'\n", buf); | |
| 1665 /* try to open the media file */ | |
| 1666 if (av_open_input_file(&ic, buf, NULL, 0, NULL) == 0) | |
| 1667 break; | |
| 1668 } | |
| 1669 if (!ic) | |
|
2274
b21c2af60bc9
Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents:
2273
diff
changeset
|
1670 return AVERROR(EIO); |
|
2785
d3b3cfb538d8
Suppress the "redirector hack" from libavformat/utils.c:av_open_input_stream(),
lucabe
parents:
2775
diff
changeset
|
1671 |
|
d3b3cfb538d8
Suppress the "redirector hack" from libavformat/utils.c:av_open_input_stream(),
lucabe
parents:
2775
diff
changeset
|
1672 *s = *ic; |
|
d3b3cfb538d8
Suppress the "redirector hack" from libavformat/utils.c:av_open_input_stream(),
lucabe
parents:
2775
diff
changeset
|
1673 url_fclose(f); |
|
d3b3cfb538d8
Suppress the "redirector hack" from libavformat/utils.c:av_open_input_stream(),
lucabe
parents:
2775
diff
changeset
|
1674 |
|
d3b3cfb538d8
Suppress the "redirector hack" from libavformat/utils.c:av_open_input_stream(),
lucabe
parents:
2775
diff
changeset
|
1675 return 0; |
| 0 | 1676 } |
| 1677 | |
| 1167 | 1678 AVInputFormat redir_demuxer = { |
| 0 | 1679 "redir", |
|
3424
7a0230981402
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents:
3286
diff
changeset
|
1680 NULL_IF_CONFIG_SMALL("Redirector format"), |
| 0 | 1681 0, |
| 1682 redir_probe, | |
|
2785
d3b3cfb538d8
Suppress the "redirector hack" from libavformat/utils.c:av_open_input_stream(),
lucabe
parents:
2775
diff
changeset
|
1683 redir_read_header, |
| 0 | 1684 NULL, |
| 1685 NULL, | |
| 1686 }; | |
| 2053 | 1687 #endif |
