annotate rtsp.c @ 5112:85e0a9761818 libavformat

Implement support for EOS as used by WMS and other RTSP servers that do not implement RTCP/bye. See "[PATCH] rtsp.c: EOS support" thread from a few months back.
author rbultje
date Mon, 27 Jul 2009 14:03:53 +0000
parents 43d99d0e12e0
children cad276e8f96e
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1 /*
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
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
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
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
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
8 * modify it under the terms of the GNU Lesser General Public
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
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
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
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
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
15 * Lesser General Public License for more details.
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
16 *
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
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
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
20 */
3286
6f61c3b36632 Use full path for #includes from another directory.
diego
parents: 3278
diff changeset
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
6f61c3b36632 Use full path for #includes from another directory.
diego
parents: 3278
diff changeset
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
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
27 #include "avformat.h"
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
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
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4201
diff changeset
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
3790cb6c893d strcasecmp() requires #include <strings.h>
aurel
parents: 3524
diff changeset
33 #include <strings.h>
1754
1f7a6dc01100 move networking #includes into separate file
mru
parents: 1670
diff changeset
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
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
36
4388
80f21f72d7d6 Split rtp.h in rtp.h, rtpdec.h, and rtpenc.h
lucabe
parents: 4386
diff changeset
37 #include "rtpdec.h"
3876
1026953d4ffe Implement Realmedia/RTSP-compatible SETUP command. This includes calculation
rbultje
parents: 3861
diff changeset
38 #include "rdt.h"
4744
51899c07a4f1 Add RTP/ASF header parsing, which is part of the SDP of these streams. See
rbultje
parents: 4667
diff changeset
39 #include "rtp_asf.h"
4875
13a2a1a475d5 Add a Vorbis payload parser. Implemented by Colin McQuillan as a GSoC
rbultje
parents: 4874
diff changeset
40 #include "rtp_vorbis.h"
1419
8fb4910bdcc0 Add support for H264 over RTP
gpoirier
parents: 1358
diff changeset
41
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
42 //#define DEBUG
172
9a0ab557b159 fixed RTP/TCP client support
bellard
parents: 64
diff changeset
43 //#define DEBUG_RTP_TCP
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
44
304
d58c8859ff8c initial seek support - more generic play/pause support
bellard
parents: 294
diff changeset
45 static int rtsp_read_play(AVFormatContext *s);
d58c8859ff8c initial seek support - more generic play/pause support
bellard
parents: 294
diff changeset
46
2884
e6e7ba123447 Drop RTSP default protocol.
diego
parents: 2866
diff changeset
47 #if LIBAVFORMAT_VERSION_INT < (53 << 16)
3957
9f943bb755f9 Rename RTSPProtocol to RTSPLowerTransport, so that its name properly tells us
rbultje
parents: 3941
diff changeset
48 int rtsp_default_protocols = (1 << RTSP_LOWER_TRANSPORT_UDP);
2884
e6e7ba123447 Drop RTSP default protocol.
diego
parents: 2866
diff changeset
49 #endif
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
50
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
51 static int rtsp_probe(AVProbeData *p)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
52 {
2193
5ce5fad0dfac replace the uses of old string functions that Reimar missed
mru
parents: 2189
diff changeset
53 if (av_strstart(p->filename, "rtsp:", NULL))
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
54 return AVPROBE_SCORE_MAX;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
55 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
56 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
57
4773
1c9751d3065c Merge functional code from get_word() and get_word_sep() into a single
rbultje
parents: 4772
diff changeset
58 #define SPACE_CHARS " \t\r\n"
4789
c18ea19a9771 strchr(string, '\0') returns non-NULL, and is thus not suited for use in
rbultje
parents: 4779
diff changeset
59 /* we use memchr() instead of strchr() here because strchr() will return
c18ea19a9771 strchr(string, '\0') returns non-NULL, and is thus not suited for use in
rbultje
parents: 4779
diff changeset
60 * the terminating '\0' of SPACE_CHARS instead of NULL if c is '\0'. */
c18ea19a9771 strchr(string, '\0') returns non-NULL, and is thus not suited for use in
rbultje
parents: 4779
diff changeset
61 #define redir_isspace(c) memchr(SPACE_CHARS, c, 4)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
62 static void skip_spaces(const char **pp)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
63 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
64 const char *p;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
65 p = *pp;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
66 while (redir_isspace(*p))
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
67 p++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
68 *pp = p;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
69 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
70
4773
1c9751d3065c Merge functional code from get_word() and get_word_sep() into a single
rbultje
parents: 4772
diff changeset
71 static void get_word_until_chars(char *buf, int buf_size,
1c9751d3065c Merge functional code from get_word() and get_word_sep() into a single
rbultje
parents: 4772
diff changeset
72 const char *sep, const char **pp)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
73 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
74 const char *p;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
75 char *q;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
76
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
77 p = *pp;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
78 skip_spaces(&p);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
79 q = buf;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
80 while (!strchr(sep, *p) && *p != '\0') {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
81 if ((q - buf) < buf_size - 1)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
82 *q++ = *p;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
83 p++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
84 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
85 if (buf_size > 0)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
86 *q = '\0';
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
87 *pp = p;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
88 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
89
4773
1c9751d3065c Merge functional code from get_word() and get_word_sep() into a single
rbultje
parents: 4772
diff changeset
90 static void get_word_sep(char *buf, int buf_size, const char *sep,
1c9751d3065c Merge functional code from get_word() and get_word_sep() into a single
rbultje
parents: 4772
diff changeset
91 const char **pp)
1c9751d3065c Merge functional code from get_word() and get_word_sep() into a single
rbultje
parents: 4772
diff changeset
92 {
1c9751d3065c Merge functional code from get_word() and get_word_sep() into a single
rbultje
parents: 4772
diff changeset
93 if (**pp == '/') (*pp)++;
1c9751d3065c Merge functional code from get_word() and get_word_sep() into a single
rbultje
parents: 4772
diff changeset
94 get_word_until_chars(buf, buf_size, sep, pp);
1c9751d3065c Merge functional code from get_word() and get_word_sep() into a single
rbultje
parents: 4772
diff changeset
95 }
1c9751d3065c Merge functional code from get_word() and get_word_sep() into a single
rbultje
parents: 4772
diff changeset
96
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
97 static void get_word(char *buf, int buf_size, const char **pp)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
98 {
4773
1c9751d3065c Merge functional code from get_word() and get_word_sep() into a single
rbultje
parents: 4772
diff changeset
99 get_word_until_chars(buf, buf_size, SPACE_CHARS, pp);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
100 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
101
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
102 /* parse the rtpmap description: <codec_name>/<clock_rate>[/<other
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
103 params>] */
1419
8fb4910bdcc0 Add support for H264 over RTP
gpoirier
parents: 1358
diff changeset
104 static int sdp_parse_rtpmap(AVCodecContext *codec, RTSPStream *rtsp_st, int payload_type, const char *p)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
105 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
106 char buf[256];
774
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
107 int i;
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
108 AVCodec *c;
1124
d3aff2c607f9 Add const to (mostly) char* and make some functions static, which aren't used
diego
parents: 1003
diff changeset
109 const char *c_name;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
110
774
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
111 /* Loop into AVRtpDynamicPayloadTypes[] and AVRtpPayloadTypes[] and
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
112 see if we can handle this kind of payload */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
113 get_word_sep(buf, sizeof(buf), "/", &p);
774
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
114 if (payload_type >= RTP_PT_PRIVATE) {
1419
8fb4910bdcc0 Add support for H264 over RTP
gpoirier
parents: 1358
diff changeset
115 RTPDynamicProtocolHandler *handler= RTPFirstDynamicPayloadHandler;
8fb4910bdcc0 Add support for H264 over RTP
gpoirier
parents: 1358
diff changeset
116 while(handler) {
4667
7d88e3f6943d rtpmap is case-insensitive, see comment from Luca in "[PATCH] rtsp.c:
rbultje
parents: 4663
diff changeset
117 if (!strcasecmp(buf, handler->enc_name) && (codec->codec_type == handler->codec_type)) {
1419
8fb4910bdcc0 Add support for H264 over RTP
gpoirier
parents: 1358
diff changeset
118 codec->codec_id = handler->codec_id;
8fb4910bdcc0 Add support for H264 over RTP
gpoirier
parents: 1358
diff changeset
119 rtsp_st->dynamic_handler= handler;
8fb4910bdcc0 Add support for H264 over RTP
gpoirier
parents: 1358
diff changeset
120 if(handler->open) {
8fb4910bdcc0 Add support for H264 over RTP
gpoirier
parents: 1358
diff changeset
121 rtsp_st->dynamic_protocol_context= handler->open();
8fb4910bdcc0 Add support for H264 over RTP
gpoirier
parents: 1358
diff changeset
122 }
774
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
123 break;
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
124 }
1419
8fb4910bdcc0 Add support for H264 over RTP
gpoirier
parents: 1358
diff changeset
125 handler= handler->next;
8fb4910bdcc0 Add support for H264 over RTP
gpoirier
parents: 1358
diff changeset
126 }
774
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
127 } else {
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
128 /* We are in a standard case ( from http://www.iana.org/assignments/rtp-parameters) */
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
129 /* search into AVRtpPayloadTypes[] */
2759
b252e318023a Remove the "AVRtpPayloadTypes[i].pt == i" assumption from RTP and RTSP
lucabe
parents: 2711
diff changeset
130 codec->codec_id = ff_rtp_codec_id(buf, codec->codec_type);
774
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
131 }
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
132
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
133 c = avcodec_find_decoder(codec->codec_id);
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
134 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
135 c_name = c->name;
774
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
136 else
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
137 c_name = (char *)NULL;
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
138
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
139 if (c_name) {
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
140 get_word_sep(buf, sizeof(buf), "/", &p);
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
141 i = atoi(buf);
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
142 switch (codec->codec_type) {
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
143 case CODEC_TYPE_AUDIO:
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
144 av_log(codec, AV_LOG_DEBUG, " audio codec set to : %s\n", c_name);
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
145 codec->sample_rate = RTSP_DEFAULT_AUDIO_SAMPLERATE;
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
146 codec->channels = RTSP_DEFAULT_NB_AUDIO_CHANNELS;
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
147 if (i > 0) {
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
148 codec->sample_rate = i;
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
149 get_word_sep(buf, sizeof(buf), "/", &p);
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
150 i = atoi(buf);
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
151 if (i > 0)
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
152 codec->channels = i;
1431
2d8a17631520 fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents: 1425
diff changeset
153 // 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
154 // frequency. No problem, but the sample rate is being set here by the sdp line. Upcoming patch forthcoming. (rdm)
774
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
155 }
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
156 av_log(codec, AV_LOG_DEBUG, " audio samplerate set to : %i\n", codec->sample_rate);
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
157 av_log(codec, AV_LOG_DEBUG, " audio channels set to : %i\n", codec->channels);
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
158 break;
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
159 case CODEC_TYPE_VIDEO:
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
160 av_log(codec, AV_LOG_DEBUG, " video codec set to : %s\n", c_name);
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
161 break;
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
162 default:
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
163 break;
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
164 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
165 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
166 }
774
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
167
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
168 return -1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
169 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
170
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
171 /* return the length and optionnaly the data */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
172 static int hex_to_data(uint8_t *data, const char *p)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
173 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
174 int c, len, v;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
175
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
176 len = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
177 v = 1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
178 for(;;) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
179 skip_spaces(&p);
4776
894e353aaeca Fix silly bug in hex_to_data() where it compares a string pointer for whether
rbultje
parents: 4775
diff changeset
180 if (*p == '\0')
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
181 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
182 c = toupper((unsigned char)*p++);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
183 if (c >= '0' && c <= '9')
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
184 c = c - '0';
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
185 else if (c >= 'A' && c <= 'F')
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
186 c = c - 'A' + 10;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
187 else
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
188 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
189 v = (v << 4) | c;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
190 if (v & 0x100) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
191 if (data)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
192 data[len] = v;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
193 len++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
194 v = 1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
195 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
196 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
197 return len;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
198 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
199
4875
13a2a1a475d5 Add a Vorbis payload parser. Implemented by Colin McQuillan as a GSoC
rbultje
parents: 4874
diff changeset
200 static void sdp_parse_fmtp_config(AVCodecContext * codec, void *ctx,
13a2a1a475d5 Add a Vorbis payload parser. Implemented by Colin McQuillan as a GSoC
rbultje
parents: 4874
diff changeset
201 char *attr, char *value)
774
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
202 {
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
203 switch (codec->codec_id) {
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
204 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
205 case CODEC_ID_AAC:
774
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
206 if (!strcmp(attr, "config")) {
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
207 /* decode the hexa encoded parameter */
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
208 int len = hex_to_data(NULL, value);
4777
31678a2764ee Free metadata if already allocated; fixes a memleak if the header occurs twice
rbultje
parents: 4776
diff changeset
209 if (codec->extradata)
31678a2764ee Free metadata if already allocated; fixes a memleak if the header occurs twice
rbultje
parents: 4776
diff changeset
210 av_free(codec->extradata);
774
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
211 codec->extradata = av_mallocz(len + FF_INPUT_BUFFER_PADDING_SIZE);
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
212 if (!codec->extradata)
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
213 return;
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
214 codec->extradata_size = len;
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
215 hex_to_data(codec->extradata, value);
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
216 }
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
217 break;
4875
13a2a1a475d5 Add a Vorbis payload parser. Implemented by Colin McQuillan as a GSoC
rbultje
parents: 4874
diff changeset
218 case CODEC_ID_VORBIS:
13a2a1a475d5 Add a Vorbis payload parser. Implemented by Colin McQuillan as a GSoC
rbultje
parents: 4874
diff changeset
219 ff_vorbis_parse_fmtp_config(codec, ctx, attr, value);
13a2a1a475d5 Add a Vorbis payload parser. Implemented by Colin McQuillan as a GSoC
rbultje
parents: 4874
diff changeset
220 break;
774
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
221 default:
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
222 break;
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
223 }
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
224 return;
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
225 }
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
226
4088
526755859ce5 Rename type to be consistent
lu_zero
parents: 4067
diff changeset
227 typedef struct {
1124
d3aff2c607f9 Add const to (mostly) char* and make some functions static, which aren't used
diego
parents: 1003
diff changeset
228 const char *str;
774
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
229 uint16_t type;
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
230 uint32_t offset;
4088
526755859ce5 Rename type to be consistent
lu_zero
parents: 4067
diff changeset
231 } AttrNameMap;
774
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
232
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
233 /* All known fmtp parmeters and the corresping RTPAttrTypeEnum */
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
234 #define ATTR_NAME_TYPE_INT 0
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
235 #define ATTR_NAME_TYPE_STR 1
4088
526755859ce5 Rename type to be consistent
lu_zero
parents: 4067
diff changeset
236 static const AttrNameMap attr_names[]=
774
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
237 {
4101
af2c0aef892b Rename rtp_payload_data_t to avoid clashes with the POSIX namespace
lucabe
parents: 4088
diff changeset
238 {"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
239 {"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
240 {"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
241 {"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
242 {"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
243 {"mode", ATTR_NAME_TYPE_STR, offsetof(RTPPayloadData, mode)},
774
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
244 {NULL, -1, -1},
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
245 };
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
246
1431
2d8a17631520 fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents: 1425
diff changeset
247 /** 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
248 * 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
249 */
2d8a17631520 fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents: 1425
diff changeset
250 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
251 {
2d8a17631520 fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents: 1425
diff changeset
252 skip_spaces(p);
4778
dd4e4ba1535f Reindent something where a if () --> { <-- is on a newline rather than on the
rbultje
parents: 4777
diff changeset
253 if(**p) {
1431
2d8a17631520 fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents: 1425
diff changeset
254 get_word_sep(attr, attr_size, "=", p);
2d8a17631520 fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents: 1425
diff changeset
255 if (**p == '=')
2d8a17631520 fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents: 1425
diff changeset
256 (*p)++;
2d8a17631520 fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents: 1425
diff changeset
257 get_word_sep(value, value_size, ";", p);
2d8a17631520 fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents: 1425
diff changeset
258 if (**p == ';')
2d8a17631520 fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents: 1425
diff changeset
259 (*p)++;
2d8a17631520 fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents: 1425
diff changeset
260 return 1;
2d8a17631520 fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents: 1425
diff changeset
261 }
2d8a17631520 fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents: 1425
diff changeset
262 return 0;
2d8a17631520 fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents: 1425
diff changeset
263 }
2d8a17631520 fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents: 1425
diff changeset
264
774
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
265 /* parse a SDP line and save stream attributes */
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
266 static void sdp_parse_fmtp(AVStream *st, const char *p)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
267 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
268 char attr[256];
4874
5370b0c1653c Increase the SDP buffer size (again!) and also increase the temporary
rbultje
parents: 4789
diff changeset
269 /* Vorbis setup headers can be up to 12KB and are sent base64
5370b0c1653c Increase the SDP buffer size (again!) and also increase the temporary
rbultje
parents: 4789
diff changeset
270 * encoded, giving a 12KB * (4/3) = 16KB FMTP line. */
5370b0c1653c Increase the SDP buffer size (again!) and also increase the temporary
rbultje
parents: 4789
diff changeset
271 char value[16384];
774
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
272 int i;
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
273
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
274 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
275 AVCodecContext *codec = st->codec;
4101
af2c0aef892b Rename rtp_payload_data_t to avoid clashes with the POSIX namespace
lucabe
parents: 4088
diff changeset
276 RTPPayloadData *rtp_payload_data = &rtsp_st->rtp_payload_data;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
277
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
278 /* loop on each attribute */
1514
958decd51c1f remove duplicate code, patch by Ryan Martell rdm4 A martellventures P com
gpoirier
parents: 1472
diff changeset
279 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
280 {
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
281 /* grab the codec extra_data from the config parameter of the fmtp line */
4875
13a2a1a475d5 Add a Vorbis payload parser. Implemented by Colin McQuillan as a GSoC
rbultje
parents: 4874
diff changeset
282 sdp_parse_fmtp_config(codec, rtsp_st->dynamic_protocol_context,
13a2a1a475d5 Add a Vorbis payload parser. Implemented by Colin McQuillan as a GSoC
rbultje
parents: 4874
diff changeset
283 attr, value);
774
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
284 /* Looking for a known attribute */
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
285 for (i = 0; attr_names[i].str; ++i) {
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
286 if (!strcasecmp(attr, attr_names[i].str)) {
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
287 if (attr_names[i].type == ATTR_NAME_TYPE_INT)
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
288 *(int *)((char *)rtp_payload_data + attr_names[i].offset) = atoi(value);
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
289 else if (attr_names[i].type == ATTR_NAME_TYPE_STR)
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
290 *(char **)((char *)rtp_payload_data + attr_names[i].offset) = av_strdup(value);
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
291 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
292 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
293 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
294 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
295
1453
c0235bab9e92 Add support for getting duration of a RTP stream (for seeking in stream)
gpoirier
parents: 1431
diff changeset
296 /** 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
297 * and end time.
c0235bab9e92 Add support for getting duration of a RTP stream (for seeking in stream)
gpoirier
parents: 1431
diff changeset
298 * 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
299 */
c0235bab9e92 Add support for getting duration of a RTP stream (for seeking in stream)
gpoirier
parents: 1431
diff changeset
300 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
301 {
c0235bab9e92 Add support for getting duration of a RTP stream (for seeking in stream)
gpoirier
parents: 1431
diff changeset
302 char buf[256];
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 skip_spaces(&p);
2193
5ce5fad0dfac replace the uses of old string functions that Reimar missed
mru
parents: 2189
diff changeset
305 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
306 return;
c0235bab9e92 Add support for getting duration of a RTP stream (for seeking in stream)
gpoirier
parents: 1431
diff changeset
307
c0235bab9e92 Add support for getting duration of a RTP stream (for seeking in stream)
gpoirier
parents: 1431
diff changeset
308 *start = AV_NOPTS_VALUE;
c0235bab9e92 Add support for getting duration of a RTP stream (for seeking in stream)
gpoirier
parents: 1431
diff changeset
309 *end = AV_NOPTS_VALUE;
c0235bab9e92 Add support for getting duration of a RTP stream (for seeking in stream)
gpoirier
parents: 1431
diff changeset
310
c0235bab9e92 Add support for getting duration of a RTP stream (for seeking in stream)
gpoirier
parents: 1431
diff changeset
311 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
312 *start = parse_date(buf, 1);
c0235bab9e92 Add support for getting duration of a RTP stream (for seeking in stream)
gpoirier
parents: 1431
diff changeset
313 if (*p == '-') {
c0235bab9e92 Add support for getting duration of a RTP stream (for seeking in stream)
gpoirier
parents: 1431
diff changeset
314 p++;
c0235bab9e92 Add support for getting duration of a RTP stream (for seeking in stream)
gpoirier
parents: 1431
diff changeset
315 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
316 *end = parse_date(buf, 1);
c0235bab9e92 Add support for getting duration of a RTP stream (for seeking in stream)
gpoirier
parents: 1431
diff changeset
317 }
c0235bab9e92 Add support for getting duration of a RTP stream (for seeking in stream)
gpoirier
parents: 1431
diff changeset
318 // 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
319 // 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
320 }
c0235bab9e92 Add support for getting duration of a RTP stream (for seeking in stream)
gpoirier
parents: 1431
diff changeset
321
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
322 typedef struct SDPParseState {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
323 /* SDP only */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
324 struct in_addr default_ip;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
325 int default_ttl;
4281
f1d8951d6813 Skip m= blocks in the SDP if the media type is unknown. This prevents
rbultje
parents: 4251
diff changeset
326 int skip_media; ///< set if an unknown m= line occurs
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
327 } SDPParseState;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
328
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
329 static void sdp_parse_line(AVFormatContext *s, SDPParseState *s1,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
330 int letter, const char *buf)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
331 {
294
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 229
diff changeset
332 RTSPState *rt = s->priv_data;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
333 char buf1[64], st_type[64];
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
334 const char *p;
3967
4fd67f05bad9 Use enum typers instead of int.
benoit
parents: 3966
diff changeset
335 enum CodecType codec_type;
4fd67f05bad9 Use enum typers instead of int.
benoit
parents: 3966
diff changeset
336 int payload_type, i;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
337 AVStream *st;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
338 RTSPStream *rtsp_st;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
339 struct in_addr sdp_ip;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
340 int ttl;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
341
4990
0b15fbb456f4 fix compilation with DEBUG defined
bcoudurier
parents: 4898
diff changeset
342 dprintf(s, "sdp: %c='%s'\n", letter, buf);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
343
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
344 p = buf;
4281
f1d8951d6813 Skip m= blocks in the SDP if the media type is unknown. This prevents
rbultje
parents: 4251
diff changeset
345 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
346 return;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
347 switch(letter) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
348 case 'c':
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
349 get_word(buf1, sizeof(buf1), &p);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
350 if (strcmp(buf1, "IN") != 0)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
351 return;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
352 get_word(buf1, sizeof(buf1), &p);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
353 if (strcmp(buf1, "IP4") != 0)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
354 return;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
355 get_word_sep(buf1, sizeof(buf1), "/", &p);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
356 if (inet_aton(buf1, &sdp_ip) == 0)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
357 return;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
358 ttl = 16;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
359 if (*p == '/') {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
360 p++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
361 get_word_sep(buf1, sizeof(buf1), "/", &p);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
362 ttl = atoi(buf1);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
363 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
364 if (s->nb_streams == 0) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
365 s1->default_ip = sdp_ip;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
366 s1->default_ttl = ttl;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
367 } else {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
368 st = s->streams[s->nb_streams - 1];
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
369 rtsp_st = st->priv_data;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
370 rtsp_st->sdp_ip = sdp_ip;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
371 rtsp_st->sdp_ttl = ttl;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
372 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
373 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
374 case 's':
4361
3ae604db67e0 use new metadata API in rtsp demuxer
aurel
parents: 4332
diff changeset
375 av_metadata_set(&s->metadata, "title", p);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
376 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
377 case 'i':
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
378 if (s->nb_streams == 0) {
4361
3ae604db67e0 use new metadata API in rtsp demuxer
aurel
parents: 4332
diff changeset
379 av_metadata_set(&s->metadata, "comment", p);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
380 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
381 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
382 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
383 case 'm':
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
384 /* new stream */
4281
f1d8951d6813 Skip m= blocks in the SDP if the media type is unknown. This prevents
rbultje
parents: 4251
diff changeset
385 s1->skip_media = 0;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
386 get_word(st_type, sizeof(st_type), &p);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
387 if (!strcmp(st_type, "audio")) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
388 codec_type = CODEC_TYPE_AUDIO;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
389 } else if (!strcmp(st_type, "video")) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
390 codec_type = CODEC_TYPE_VIDEO;
4637
eaf90db8cc42 Recognize the "application" data type, which is required for WMS/UDP
rbultje
parents: 4557
diff changeset
391 } else if (!strcmp(st_type, "application")) {
eaf90db8cc42 Recognize the "application" data type, which is required for WMS/UDP
rbultje
parents: 4557
diff changeset
392 codec_type = CODEC_TYPE_DATA;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
393 } else {
4281
f1d8951d6813 Skip m= blocks in the SDP if the media type is unknown. This prevents
rbultje
parents: 4251
diff changeset
394 s1->skip_media = 1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
395 return;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
396 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
397 rtsp_st = av_mallocz(sizeof(RTSPStream));
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
398 if (!rtsp_st)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
399 return;
294
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 229
diff changeset
400 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
401 dynarray_add(&rt->rtsp_streams, &rt->nb_rtsp_streams, rtsp_st);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
402
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
403 rtsp_st->sdp_ip = s1->default_ip;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
404 rtsp_st->sdp_ttl = s1->default_ttl;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
405
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
406 get_word(buf1, sizeof(buf1), &p); /* port */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
407 rtsp_st->sdp_port = atoi(buf1);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
408
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
409 get_word(buf1, sizeof(buf1), &p); /* protocol (ignored) */
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 820
diff changeset
410
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
411 /* XXX: handle list of formats */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
412 get_word(buf1, sizeof(buf1), &p); /* format list */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
413 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
414
2759
b252e318023a Remove the "AVRtpPayloadTypes[i].pt == i" assumption from RTP and RTSP
lucabe
parents: 2711
diff changeset
415 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
416 /* 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
417 } else {
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 229
diff changeset
418 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
419 if (!st)
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 229
diff changeset
420 return;
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 229
diff changeset
421 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
422 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
423 st->codec->codec_type = codec_type;
774
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
424 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
425 /* if standard payload type, we can find the codec right now */
4519
f4b9967e0131 Remame rtp_get_codec_info() to ff_rtp_get_codec_info(), as it is not
lucabe
parents: 4514
diff changeset
426 ff_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
427 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
428 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
429 /* put a default control url */
2189
da71207a7cf1 use new string functions
mru
parents: 2095
diff changeset
430 av_strlcpy(rtsp_st->control_url, s->filename, sizeof(rtsp_st->control_url));
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
431 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
432 case 'a':
2193
5ce5fad0dfac replace the uses of old string functions that Reimar missed
mru
parents: 2189
diff changeset
433 if (av_strstart(p, "control:", &p) && s->nb_streams > 0) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
434 char proto[32];
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
435 /* get the control url */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
436 st = s->streams[s->nb_streams - 1];
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
437 rtsp_st = st->priv_data;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 820
diff changeset
438
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
439 /* 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
440 url_split(proto, sizeof(proto), NULL, 0, NULL, 0, NULL, NULL, 0, p);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
441 if (proto[0] == '\0') {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
442 /* relative control URL */
2189
da71207a7cf1 use new string functions
mru
parents: 2095
diff changeset
443 av_strlcat(rtsp_st->control_url, "/", sizeof(rtsp_st->control_url));
da71207a7cf1 use new string functions
mru
parents: 2095
diff changeset
444 av_strlcat(rtsp_st->control_url, p, sizeof(rtsp_st->control_url));
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
445 } else {
2189
da71207a7cf1 use new string functions
mru
parents: 2095
diff changeset
446 av_strlcpy(rtsp_st->control_url, p, sizeof(rtsp_st->control_url));
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
447 }
4185
023976c45ae1 Apply rtpmap: SDP lines to the last m= line only, since they generally just
rbultje
parents: 4182
diff changeset
448 } else if (av_strstart(p, "rtpmap:", &p) && s->nb_streams > 0) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
449 /* NOTE: rtpmap is only supported AFTER the 'm=' tag */
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 820
diff changeset
450 get_word(buf1, sizeof(buf1), &p);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
451 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
452 st = s->streams[s->nb_streams - 1];
4186
076ba5bc16a4 Reindent after r16509.
rbultje
parents: 4185
diff changeset
453 rtsp_st = st->priv_data;
076ba5bc16a4 Reindent after r16509.
rbultje
parents: 4185
diff changeset
454 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
455 } else if (av_strstart(p, "fmtp:", &p)) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
456 /* NOTE: fmtp is only supported AFTER the 'a=rtpmap:xxx' tag */
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 820
diff changeset
457 get_word(buf1, sizeof(buf1), &p);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
458 payload_type = atoi(buf1);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
459 for(i = 0; i < s->nb_streams;i++) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
460 st = s->streams[i];
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
461 rtsp_st = st->priv_data;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
462 if (rtsp_st->sdp_payload_type == payload_type) {
1419
8fb4910bdcc0 Add support for H264 over RTP
gpoirier
parents: 1358
diff changeset
463 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
464 if(!rtsp_st->dynamic_handler->parse_sdp_a_line(s, i, rtsp_st->dynamic_protocol_context, buf)) {
1419
8fb4910bdcc0 Add support for H264 over RTP
gpoirier
parents: 1358
diff changeset
465 sdp_parse_fmtp(st, p);
8fb4910bdcc0 Add support for H264 over RTP
gpoirier
parents: 1358
diff changeset
466 }
8fb4910bdcc0 Add support for H264 over RTP
gpoirier
parents: 1358
diff changeset
467 } else {
1424
1c39ce5c6a5d indentation fix, patch by Ryan Martell % rdm4 A martellventures P com %
gpoirier
parents: 1419
diff changeset
468 sdp_parse_fmtp(st, p);
1419
8fb4910bdcc0 Add support for H264 over RTP
gpoirier
parents: 1358
diff changeset
469 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
470 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
471 }
2193
5ce5fad0dfac replace the uses of old string functions that Reimar missed
mru
parents: 2189
diff changeset
472 } else if(av_strstart(p, "framesize:", &p)) {
1431
2d8a17631520 fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents: 1425
diff changeset
473 // 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
474 get_word(buf1, sizeof(buf1), &p);
2d8a17631520 fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents: 1425
diff changeset
475 payload_type = atoi(buf1);
2d8a17631520 fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents: 1425
diff changeset
476 for(i = 0; i < s->nb_streams;i++) {
2d8a17631520 fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents: 1425
diff changeset
477 st = s->streams[i];
2d8a17631520 fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents: 1425
diff changeset
478 rtsp_st = st->priv_data;
2d8a17631520 fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents: 1425
diff changeset
479 if (rtsp_st->sdp_payload_type == payload_type) {
2d8a17631520 fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents: 1425
diff changeset
480 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
481 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
482 }
2d8a17631520 fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents: 1425
diff changeset
483 }
2d8a17631520 fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents: 1425
diff changeset
484 }
2193
5ce5fad0dfac replace the uses of old string functions that Reimar missed
mru
parents: 2189
diff changeset
485 } 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
486 int64_t start, end;
c0235bab9e92 Add support for getting duration of a RTP stream (for seeking in stream)
gpoirier
parents: 1431
diff changeset
487
c0235bab9e92 Add support for getting duration of a RTP stream (for seeking in stream)
gpoirier
parents: 1431
diff changeset
488 // 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
489 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
490 s->start_time= start;
c0235bab9e92 Add support for getting duration of a RTP stream (for seeking in stream)
gpoirier
parents: 1431
diff changeset
491 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
492 } else if (av_strstart(p, "IsRealDataType:integer;",&p)) {
13e9b0d3a314 Implement a RTSPTransport field, which allows proper separation of server
rbultje
parents: 3959
diff changeset
493 if (atoi(p) == 1)
13e9b0d3a314 Implement a RTSPTransport field, which allows proper separation of server
rbultje
parents: 3959
diff changeset
494 rt->transport = RTSP_TRANSPORT_RDT;
4744
51899c07a4f1 Add RTP/ASF header parsing, which is part of the SDP of these streams. See
rbultje
parents: 4667
diff changeset
495 } else {
51899c07a4f1 Add RTP/ASF header parsing, which is part of the SDP of these streams. See
rbultje
parents: 4667
diff changeset
496 if (rt->server_type == RTSP_SERVER_WMS)
51899c07a4f1 Add RTP/ASF header parsing, which is part of the SDP of these streams. See
rbultje
parents: 4667
diff changeset
497 ff_wms_parse_sdp_a_line(s, p);
51899c07a4f1 Add RTP/ASF header parsing, which is part of the SDP of these streams. See
rbultje
parents: 4667
diff changeset
498 if (s->nb_streams > 0) {
4745
06981cf19bc9 Reindent after r18023.
rbultje
parents: 4744
diff changeset
499 if (rt->server_type == RTSP_SERVER_REAL)
06981cf19bc9 Reindent after r18023.
rbultje
parents: 4744
diff changeset
500 ff_real_parse_sdp_a_line(s, s->nb_streams - 1, p);
4163
8d6512cbd657 Parse the ASMRuleBook SDP line to dynamically create one new AVStream for
rbultje
parents: 4109
diff changeset
501
4745
06981cf19bc9 Reindent after r18023.
rbultje
parents: 4744
diff changeset
502 rtsp_st = s->streams[s->nb_streams - 1]->priv_data;
06981cf19bc9 Reindent after r18023.
rbultje
parents: 4744
diff changeset
503 if (rtsp_st->dynamic_handler &&
06981cf19bc9 Reindent after r18023.
rbultje
parents: 4744
diff changeset
504 rtsp_st->dynamic_handler->parse_sdp_a_line)
06981cf19bc9 Reindent after r18023.
rbultje
parents: 4744
diff changeset
505 rtsp_st->dynamic_handler->parse_sdp_a_line(s, s->nb_streams - 1,
06981cf19bc9 Reindent after r18023.
rbultje
parents: 4744
diff changeset
506 rtsp_st->dynamic_protocol_context, buf);
4744
51899c07a4f1 Add RTP/ASF header parsing, which is part of the SDP of these streams. See
rbultje
parents: 4667
diff changeset
507 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
508 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
509 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
510 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
511 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
512
64
b0e0eb595e29 * static,const,compiler warning cleanup
kabi
parents: 0
diff changeset
513 static int sdp_parse(AVFormatContext *s, const char *content)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
514 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
515 const char *p;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
516 int letter;
4187
77af10d4d406 Reindent to properly fit a 80 chars terminal.
rbultje
parents: 4186
diff changeset
517 /* Some SDP lines, particularly for Realmedia or ASF RTSP streams,
77af10d4d406 Reindent to properly fit a 80 chars terminal.
rbultje
parents: 4186
diff changeset
518 * contain long SDP lines containing complete ASF Headers (several
77af10d4d406 Reindent to properly fit a 80 chars terminal.
rbultje
parents: 4186
diff changeset
519 * kB) or arrays of MDPR (RM stream descriptor) headers plus
77af10d4d406 Reindent to properly fit a 80 chars terminal.
rbultje
parents: 4186
diff changeset
520 * "rulebooks" describing their properties. Therefore, the SDP line
4874
5370b0c1653c Increase the SDP buffer size (again!) and also increase the temporary
rbultje
parents: 4789
diff changeset
521 * buffer is large.
5370b0c1653c Increase the SDP buffer size (again!) and also increase the temporary
rbultje
parents: 4789
diff changeset
522 *
5370b0c1653c Increase the SDP buffer size (again!) and also increase the temporary
rbultje
parents: 4789
diff changeset
523 * The Vorbis FMTP line can be up to 16KB - see sdp_parse_fmtp. */
5370b0c1653c Increase the SDP buffer size (again!) and also increase the temporary
rbultje
parents: 4789
diff changeset
524 char buf[16384], *q;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
525 SDPParseState sdp_parse_state, *s1 = &sdp_parse_state;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 820
diff changeset
526
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
527 memset(s1, 0, sizeof(SDPParseState));
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
528 p = content;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
529 for(;;) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
530 skip_spaces(&p);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
531 letter = *p;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
532 if (letter == '\0')
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
533 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
534 p++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
535 if (*p != '=')
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
536 goto next_line;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
537 p++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
538 /* get the content */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
539 q = buf;
172
9a0ab557b159 fixed RTP/TCP client support
bellard
parents: 64
diff changeset
540 while (*p != '\n' && *p != '\r' && *p != '\0') {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
541 if ((q - buf) < sizeof(buf) - 1)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
542 *q++ = *p;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
543 p++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
544 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
545 *q = '\0';
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
546 sdp_parse_line(s, s1, letter, buf);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
547 next_line:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
548 while (*p != '\n' && *p != '\0')
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
549 p++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
550 if (*p == '\n')
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
551 p++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
552 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
553 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
554 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
555
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
556 static void rtsp_parse_range(int *min_ptr, int *max_ptr, const char **pp)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
557 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
558 const char *p;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
559 int v;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
560
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
561 p = *pp;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
562 skip_spaces(&p);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
563 v = strtol(p, (char **)&p, 10);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
564 if (*p == '-') {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
565 p++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
566 *min_ptr = v;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
567 v = strtol(p, (char **)&p, 10);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
568 *max_ptr = v;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
569 } else {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
570 *min_ptr = v;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
571 *max_ptr = v;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
572 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
573 *pp = p;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
574 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
575
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
576 /* XXX: only one transport specification is parsed */
4557
bfe6fb676d46 Rename RTSPHeader to RTSPMessageHeader to reflect more clearly what the
rbultje
parents: 4549
diff changeset
577 static void rtsp_parse_transport(RTSPMessageHeader *reply, const char *p)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
578 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
579 char transport_protocol[16];
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
580 char profile[16];
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
581 char lower_transport[16];
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
582 char parameter[16];
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
583 RTSPTransportField *th;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
584 char buf[256];
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 820
diff changeset
585
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
586 reply->nb_transports = 0;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 820
diff changeset
587
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
588 for(;;) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
589 skip_spaces(&p);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
590 if (*p == '\0')
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
591 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
592
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
593 th = &reply->transports[reply->nb_transports];
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
594
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 820
diff changeset
595 get_word_sep(transport_protocol, sizeof(transport_protocol),
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
596 "/", &p);
2865
51aa1054528c Real RTSP support, from Ronald S. Bultje rsbultje gmail - part 2 x-pn-tng support
lu_zero
parents: 2864
diff changeset
597 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
598 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
599 lower_transport[0] = '\0';
ccbca87ccd5e Real RTSP support, from Ronald S. Bultje rsbultje gmail - part 3 Reindent
lu_zero
parents: 2865
diff changeset
600 /* rtp/avp/<protocol> */
ccbca87ccd5e Real RTSP support, from Ronald S. Bultje rsbultje gmail - part 3 Reindent
lu_zero
parents: 2865
diff changeset
601 if (*p == '/') {
ccbca87ccd5e Real RTSP support, from Ronald S. Bultje rsbultje gmail - part 3 Reindent
lu_zero
parents: 2865
diff changeset
602 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
603 ";,", &p);
3960
13e9b0d3a314 Implement a RTSPTransport field, which allows proper separation of server
rbultje
parents: 3959
diff changeset
604 }
13e9b0d3a314 Implement a RTSPTransport field, which allows proper separation of server
rbultje
parents: 3959
diff changeset
605 th->transport = RTSP_TRANSPORT_RTP;
13e9b0d3a314 Implement a RTSPTransport field, which allows proper separation of server
rbultje
parents: 3959
diff changeset
606 } else if (!strcasecmp (transport_protocol, "x-pn-tng") ||
13e9b0d3a314 Implement a RTSPTransport field, which allows proper separation of server
rbultje
parents: 3959
diff changeset
607 !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
608 /* 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
609 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
610 profile[0] = '\0';
3960
13e9b0d3a314 Implement a RTSPTransport field, which allows proper separation of server
rbultje
parents: 3959
diff changeset
611 th->transport = RTSP_TRANSPORT_RDT;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
612 }
172
9a0ab557b159 fixed RTP/TCP client support
bellard
parents: 64
diff changeset
613 if (!strcasecmp(lower_transport, "TCP"))
3957
9f943bb755f9 Rename RTSPProtocol to RTSPLowerTransport, so that its name properly tells us
rbultje
parents: 3941
diff changeset
614 th->lower_transport = RTSP_LOWER_TRANSPORT_TCP;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
615 else
3957
9f943bb755f9 Rename RTSPProtocol to RTSPLowerTransport, so that its name properly tells us
rbultje
parents: 3941
diff changeset
616 th->lower_transport = RTSP_LOWER_TRANSPORT_UDP;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 820
diff changeset
617
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
618 if (*p == ';')
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
619 p++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
620 /* get each parameter */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
621 while (*p != '\0' && *p != ',') {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
622 get_word_sep(parameter, sizeof(parameter), "=;,", &p);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
623 if (!strcmp(parameter, "port")) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
624 if (*p == '=') {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
625 p++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
626 rtsp_parse_range(&th->port_min, &th->port_max, &p);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
627 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
628 } else if (!strcmp(parameter, "client_port")) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
629 if (*p == '=') {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
630 p++;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 820
diff changeset
631 rtsp_parse_range(&th->client_port_min,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
632 &th->client_port_max, &p);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
633 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
634 } else if (!strcmp(parameter, "server_port")) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
635 if (*p == '=') {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
636 p++;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 820
diff changeset
637 rtsp_parse_range(&th->server_port_min,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
638 &th->server_port_max, &p);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
639 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
640 } else if (!strcmp(parameter, "interleaved")) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
641 if (*p == '=') {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
642 p++;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 820
diff changeset
643 rtsp_parse_range(&th->interleaved_min,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
644 &th->interleaved_max, &p);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
645 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
646 } else if (!strcmp(parameter, "multicast")) {
3957
9f943bb755f9 Rename RTSPProtocol to RTSPLowerTransport, so that its name properly tells us
rbultje
parents: 3941
diff changeset
647 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
648 th->lower_transport = RTSP_LOWER_TRANSPORT_UDP_MULTICAST;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
649 } else if (!strcmp(parameter, "ttl")) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
650 if (*p == '=') {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
651 p++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
652 th->ttl = strtol(p, (char **)&p, 10);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
653 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
654 } else if (!strcmp(parameter, "destination")) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
655 struct in_addr ipaddr;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
656
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
657 if (*p == '=') {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
658 p++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
659 get_word_sep(buf, sizeof(buf), ";,", &p);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 820
diff changeset
660 if (inet_aton(buf, &ipaddr))
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
661 th->destination = ntohl(ipaddr.s_addr);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
662 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
663 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
664 while (*p != ';' && *p != '\0' && *p != ',')
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
665 p++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
666 if (*p == ';')
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
667 p++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
668 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
669 if (*p == ',')
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
670 p++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
671
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
672 reply->nb_transports++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
673 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
674 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
675
4557
bfe6fb676d46 Rename RTSPHeader to RTSPMessageHeader to reflect more clearly what the
rbultje
parents: 4549
diff changeset
676 void rtsp_parse_line(RTSPMessageHeader *reply, const char *buf)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
677 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
678 const char *p;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
679
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
680 /* NOTE: we do case independent match for broken servers */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
681 p = buf;
2193
5ce5fad0dfac replace the uses of old string functions that Reimar missed
mru
parents: 2189
diff changeset
682 if (av_stristart(p, "Session:", &p)) {
4877
940946a4569b Send dummy requests over the TCP connection (WMS wants GET_PARAMETER,
rbultje
parents: 4875
diff changeset
683 int t;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
684 get_word_sep(reply->session_id, sizeof(reply->session_id), ";", &p);
4877
940946a4569b Send dummy requests over the TCP connection (WMS wants GET_PARAMETER,
rbultje
parents: 4875
diff changeset
685 if (av_stristart(p, ";timeout=", &p) &&
940946a4569b Send dummy requests over the TCP connection (WMS wants GET_PARAMETER,
rbultje
parents: 4875
diff changeset
686 (t = strtol(p, NULL, 10)) > 0) {
940946a4569b Send dummy requests over the TCP connection (WMS wants GET_PARAMETER,
rbultje
parents: 4875
diff changeset
687 reply->timeout = t;
940946a4569b Send dummy requests over the TCP connection (WMS wants GET_PARAMETER,
rbultje
parents: 4875
diff changeset
688 }
2193
5ce5fad0dfac replace the uses of old string functions that Reimar missed
mru
parents: 2189
diff changeset
689 } else if (av_stristart(p, "Content-Length:", &p)) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
690 reply->content_length = strtol(p, NULL, 10);
2193
5ce5fad0dfac replace the uses of old string functions that Reimar missed
mru
parents: 2189
diff changeset
691 } else if (av_stristart(p, "Transport:", &p)) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
692 rtsp_parse_transport(reply, p);
2193
5ce5fad0dfac replace the uses of old string functions that Reimar missed
mru
parents: 2189
diff changeset
693 } else if (av_stristart(p, "CSeq:", &p)) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
694 reply->seq = strtol(p, NULL, 10);
2193
5ce5fad0dfac replace the uses of old string functions that Reimar missed
mru
parents: 2189
diff changeset
695 } 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
696 rtsp_parse_range_npt(p, &reply->range_start, &reply->range_end);
3855
c9550824fd1c Read RealChallenge1 field from the server.
rbultje
parents: 3854
diff changeset
697 } else if (av_stristart(p, "RealChallenge1:", &p)) {
c9550824fd1c Read RealChallenge1 field from the server.
rbultje
parents: 3854
diff changeset
698 skip_spaces(&p);
c9550824fd1c Read RealChallenge1 field from the server.
rbultje
parents: 3854
diff changeset
699 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
700 } 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
701 skip_spaces(&p);
619845a9bab3 Use the "server" RTSP field to detect whether the server that we're talking
rbultje
parents: 4168
diff changeset
702 av_strlcpy(reply->server, p, sizeof(reply->server));
5112
85e0a9761818 Implement support for EOS as used by WMS and other RTSP servers that do not
rbultje
parents: 5013
diff changeset
703 } else if (av_stristart(p, "Notice:", &p) ||
85e0a9761818 Implement support for EOS as used by WMS and other RTSP servers that do not
rbultje
parents: 5013
diff changeset
704 av_stristart(p, "X-Notice:", &p)) {
85e0a9761818 Implement support for EOS as used by WMS and other RTSP servers that do not
rbultje
parents: 5013
diff changeset
705 reply->notice = strtol(p, NULL, 10);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
706 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
707 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
708
179
43ac45200138 suppressed RTSP abort hack - added PLAY/PAUSE
bellard
parents: 172
diff changeset
709 /* skip a RTP/TCP interleaved packet */
43ac45200138 suppressed RTSP abort hack - added PLAY/PAUSE
bellard
parents: 172
diff changeset
710 static void rtsp_skip_packet(AVFormatContext *s)
43ac45200138 suppressed RTSP abort hack - added PLAY/PAUSE
bellard
parents: 172
diff changeset
711 {
43ac45200138 suppressed RTSP abort hack - added PLAY/PAUSE
bellard
parents: 172
diff changeset
712 RTSPState *rt = s->priv_data;
43ac45200138 suppressed RTSP abort hack - added PLAY/PAUSE
bellard
parents: 172
diff changeset
713 int ret, len, len1;
43ac45200138 suppressed RTSP abort hack - added PLAY/PAUSE
bellard
parents: 172
diff changeset
714 uint8_t buf[1024];
43ac45200138 suppressed RTSP abort hack - added PLAY/PAUSE
bellard
parents: 172
diff changeset
715
5004
84a7b7a2f252 Move function for reading whole specified amount of data from RTSP
kostya
parents: 4990
diff changeset
716 ret = url_read_complete(rt->rtsp_hd, buf, 3);
179
43ac45200138 suppressed RTSP abort hack - added PLAY/PAUSE
bellard
parents: 172
diff changeset
717 if (ret != 3)
43ac45200138 suppressed RTSP abort hack - added PLAY/PAUSE
bellard
parents: 172
diff changeset
718 return;
2222
3427d0c63a32 Use AV_RB* macros where appropriate.
diego
parents: 2219
diff changeset
719 len = AV_RB16(buf + 1);
4990
0b15fbb456f4 fix compilation with DEBUG defined
bcoudurier
parents: 4898
diff changeset
720
0b15fbb456f4 fix compilation with DEBUG defined
bcoudurier
parents: 4898
diff changeset
721 dprintf(s, "skipping RTP packet len=%d\n", len);
0b15fbb456f4 fix compilation with DEBUG defined
bcoudurier
parents: 4898
diff changeset
722
179
43ac45200138 suppressed RTSP abort hack - added PLAY/PAUSE
bellard
parents: 172
diff changeset
723 /* skip payload */
43ac45200138 suppressed RTSP abort hack - added PLAY/PAUSE
bellard
parents: 172
diff changeset
724 while (len > 0) {
43ac45200138 suppressed RTSP abort hack - added PLAY/PAUSE
bellard
parents: 172
diff changeset
725 len1 = len;
43ac45200138 suppressed RTSP abort hack - added PLAY/PAUSE
bellard
parents: 172
diff changeset
726 if (len1 > sizeof(buf))
43ac45200138 suppressed RTSP abort hack - added PLAY/PAUSE
bellard
parents: 172
diff changeset
727 len1 = sizeof(buf);
5004
84a7b7a2f252 Move function for reading whole specified amount of data from RTSP
kostya
parents: 4990
diff changeset
728 ret = url_read_complete(rt->rtsp_hd, buf, len1);
179
43ac45200138 suppressed RTSP abort hack - added PLAY/PAUSE
bellard
parents: 172
diff changeset
729 if (ret != len1)
43ac45200138 suppressed RTSP abort hack - added PLAY/PAUSE
bellard
parents: 172
diff changeset
730 return;
43ac45200138 suppressed RTSP abort hack - added PLAY/PAUSE
bellard
parents: 172
diff changeset
731 len -= len1;
43ac45200138 suppressed RTSP abort hack - added PLAY/PAUSE
bellard
parents: 172
diff changeset
732 }
43ac45200138 suppressed RTSP abort hack - added PLAY/PAUSE
bellard
parents: 172
diff changeset
733 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
734
4772
fb0b1e68356c Allow (and parse) incoming server messages (notices) interleaved with TCP
rbultje
parents: 4745
diff changeset
735 /**
fb0b1e68356c Allow (and parse) incoming server messages (notices) interleaved with TCP
rbultje
parents: 4745
diff changeset
736 * Read a RTSP message from the server, or prepare to read data
fb0b1e68356c Allow (and parse) incoming server messages (notices) interleaved with TCP
rbultje
parents: 4745
diff changeset
737 * packets if we're reading data interleaved over the TCP/RTSP
fb0b1e68356c Allow (and parse) incoming server messages (notices) interleaved with TCP
rbultje
parents: 4745
diff changeset
738 * connection as well.
fb0b1e68356c Allow (and parse) incoming server messages (notices) interleaved with TCP
rbultje
parents: 4745
diff changeset
739 *
fb0b1e68356c Allow (and parse) incoming server messages (notices) interleaved with TCP
rbultje
parents: 4745
diff changeset
740 * @param s RTSP demuxer context
fb0b1e68356c Allow (and parse) incoming server messages (notices) interleaved with TCP
rbultje
parents: 4745
diff changeset
741 * @param reply pointer where the RTSP message header will be stored
fb0b1e68356c Allow (and parse) incoming server messages (notices) interleaved with TCP
rbultje
parents: 4745
diff changeset
742 * @param content_ptr pointer where the RTSP message body, if any, will
fb0b1e68356c Allow (and parse) incoming server messages (notices) interleaved with TCP
rbultje
parents: 4745
diff changeset
743 * be stored (length is in \p reply)
fb0b1e68356c Allow (and parse) incoming server messages (notices) interleaved with TCP
rbultje
parents: 4745
diff changeset
744 * @param return_on_interleaved_data whether the function may return if we
fb0b1e68356c Allow (and parse) incoming server messages (notices) interleaved with TCP
rbultje
parents: 4745
diff changeset
745 * encounter a data marker ('$'), which precedes data
fb0b1e68356c Allow (and parse) incoming server messages (notices) interleaved with TCP
rbultje
parents: 4745
diff changeset
746 * packets over interleaved TCP/RTSP connections. If this
fb0b1e68356c Allow (and parse) incoming server messages (notices) interleaved with TCP
rbultje
parents: 4745
diff changeset
747 * is set, this function will return 1 after encountering
fb0b1e68356c Allow (and parse) incoming server messages (notices) interleaved with TCP
rbultje
parents: 4745
diff changeset
748 * a '$'. If it is not set, the function will skip any
fb0b1e68356c Allow (and parse) incoming server messages (notices) interleaved with TCP
rbultje
parents: 4745
diff changeset
749 * data packets (if they are encountered), until a reply
fb0b1e68356c Allow (and parse) incoming server messages (notices) interleaved with TCP
rbultje
parents: 4745
diff changeset
750 * has been fully parsed. If no more data is available
fb0b1e68356c Allow (and parse) incoming server messages (notices) interleaved with TCP
rbultje
parents: 4745
diff changeset
751 * without parsing a reply, it will return an error.
fb0b1e68356c Allow (and parse) incoming server messages (notices) interleaved with TCP
rbultje
parents: 4745
diff changeset
752 *
fb0b1e68356c Allow (and parse) incoming server messages (notices) interleaved with TCP
rbultje
parents: 4745
diff changeset
753 * @returns 1 if a data packets is ready to be received, -1 on error,
fb0b1e68356c Allow (and parse) incoming server messages (notices) interleaved with TCP
rbultje
parents: 4745
diff changeset
754 * and 0 on success.
fb0b1e68356c Allow (and parse) incoming server messages (notices) interleaved with TCP
rbultje
parents: 4745
diff changeset
755 */
fb0b1e68356c Allow (and parse) incoming server messages (notices) interleaved with TCP
rbultje
parents: 4745
diff changeset
756 static int
4644
2962d395431b Split rtsp_send_cmd() into two functions, one for the actual sending of the
rbultje
parents: 4641
diff changeset
757 rtsp_read_reply (AVFormatContext *s, RTSPMessageHeader *reply,
4772
fb0b1e68356c Allow (and parse) incoming server messages (notices) interleaved with TCP
rbultje
parents: 4745
diff changeset
758 unsigned char **content_ptr, int return_on_interleaved_data)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
759 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
760 RTSPState *rt = s->priv_data;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
761 char buf[4096], buf1[1024], *q;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
762 unsigned char ch;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
763 const char *p;
4772
fb0b1e68356c Allow (and parse) incoming server messages (notices) interleaved with TCP
rbultje
parents: 4745
diff changeset
764 int ret, content_length, line_count = 0;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
765 unsigned char *content = NULL;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
766
4549
629bcd779fb8 Change sizeof(struct_type) to sizeof(variable).
rbultje
parents: 4519
diff changeset
767 memset(reply, 0, sizeof(*reply));
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
768
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
769 /* parse reply (XXX: use buffers) */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
770 rt->last_reply[0] = '\0';
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
771 for(;;) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
772 q = buf;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
773 for(;;) {
5004
84a7b7a2f252 Move function for reading whole specified amount of data from RTSP
kostya
parents: 4990
diff changeset
774 ret = url_read_complete(rt->rtsp_hd, &ch, 1);
4772
fb0b1e68356c Allow (and parse) incoming server messages (notices) interleaved with TCP
rbultje
parents: 4745
diff changeset
775 #ifdef DEBUG_RTP_TCP
4990
0b15fbb456f4 fix compilation with DEBUG defined
bcoudurier
parents: 4898
diff changeset
776 dprintf(s, "ret=%d c=%02x [%c]\n", ret, ch, ch);
4772
fb0b1e68356c Allow (and parse) incoming server messages (notices) interleaved with TCP
rbultje
parents: 4745
diff changeset
777 #endif
fb0b1e68356c Allow (and parse) incoming server messages (notices) interleaved with TCP
rbultje
parents: 4745
diff changeset
778 if (ret != 1)
fb0b1e68356c Allow (and parse) incoming server messages (notices) interleaved with TCP
rbultje
parents: 4745
diff changeset
779 return -1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
780 if (ch == '\n')
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
781 break;
179
43ac45200138 suppressed RTSP abort hack - added PLAY/PAUSE
bellard
parents: 172
diff changeset
782 if (ch == '$') {
43ac45200138 suppressed RTSP abort hack - added PLAY/PAUSE
bellard
parents: 172
diff changeset
783 /* XXX: only parse it if first char on line ? */
4772
fb0b1e68356c Allow (and parse) incoming server messages (notices) interleaved with TCP
rbultje
parents: 4745
diff changeset
784 if (return_on_interleaved_data) {
fb0b1e68356c Allow (and parse) incoming server messages (notices) interleaved with TCP
rbultje
parents: 4745
diff changeset
785 return 1;
fb0b1e68356c Allow (and parse) incoming server messages (notices) interleaved with TCP
rbultje
parents: 4745
diff changeset
786 } else
179
43ac45200138 suppressed RTSP abort hack - added PLAY/PAUSE
bellard
parents: 172
diff changeset
787 rtsp_skip_packet(s);
43ac45200138 suppressed RTSP abort hack - added PLAY/PAUSE
bellard
parents: 172
diff changeset
788 } else if (ch != '\r') {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
789 if ((q - buf) < sizeof(buf) - 1)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
790 *q++ = ch;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
791 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
792 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
793 *q = '\0';
4990
0b15fbb456f4 fix compilation with DEBUG defined
bcoudurier
parents: 4898
diff changeset
794
0b15fbb456f4 fix compilation with DEBUG defined
bcoudurier
parents: 4898
diff changeset
795 dprintf(s, "line='%s'\n", buf);
0b15fbb456f4 fix compilation with DEBUG defined
bcoudurier
parents: 4898
diff changeset
796
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
797 /* test if last line */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
798 if (buf[0] == '\0')
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
799 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
800 p = buf;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
801 if (line_count == 0) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
802 /* get reply code */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
803 get_word(buf1, sizeof(buf1), &p);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
804 get_word(buf1, sizeof(buf1), &p);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
805 reply->status_code = atoi(buf1);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
806 } else {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
807 rtsp_parse_line(reply, p);
2189
da71207a7cf1 use new string functions
mru
parents: 2095
diff changeset
808 av_strlcat(rt->last_reply, p, sizeof(rt->last_reply));
da71207a7cf1 use new string functions
mru
parents: 2095
diff changeset
809 av_strlcat(rt->last_reply, "\n", sizeof(rt->last_reply));
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
810 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
811 line_count++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
812 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 820
diff changeset
813
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
814 if (rt->session_id[0] == '\0' && reply->session_id[0] != '\0')
2189
da71207a7cf1 use new string functions
mru
parents: 2095
diff changeset
815 av_strlcpy(rt->session_id, reply->session_id, sizeof(rt->session_id));
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 820
diff changeset
816
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
817 content_length = reply->content_length;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
818 if (content_length > 0) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
819 /* leave some room for a trailing '\0' (useful for simple parsing) */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
820 content = av_malloc(content_length + 1);
5004
84a7b7a2f252 Move function for reading whole specified amount of data from RTSP
kostya
parents: 4990
diff changeset
821 (void)url_read_complete(rt->rtsp_hd, content, content_length);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
822 content[content_length] = '\0';
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
823 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
824 if (content_ptr)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
825 *content_ptr = content;
2263
f13dad8ba721 .memleak fix by Ronald Bultje. OK'd by Luca.
alex
parents: 2246
diff changeset
826 else
f13dad8ba721 .memleak fix by Ronald Bultje. OK'd by Luca.
alex
parents: 2246
diff changeset
827 av_free(content);
4772
fb0b1e68356c Allow (and parse) incoming server messages (notices) interleaved with TCP
rbultje
parents: 4745
diff changeset
828
5112
85e0a9761818 Implement support for EOS as used by WMS and other RTSP servers that do not
rbultje
parents: 5013
diff changeset
829 /* EOS */
85e0a9761818 Implement support for EOS as used by WMS and other RTSP servers that do not
rbultje
parents: 5013
diff changeset
830 if (reply->notice == 2101 /* End-of-Stream Reached */ ||
85e0a9761818 Implement support for EOS as used by WMS and other RTSP servers that do not
rbultje
parents: 5013
diff changeset
831 reply->notice == 2104 /* Start-of-Stream Reached */ ||
85e0a9761818 Implement support for EOS as used by WMS and other RTSP servers that do not
rbultje
parents: 5013
diff changeset
832 reply->notice == 2306 /* Continuous Feed Terminated */)
85e0a9761818 Implement support for EOS as used by WMS and other RTSP servers that do not
rbultje
parents: 5013
diff changeset
833 rt->state = RTSP_STATE_IDLE;
85e0a9761818 Implement support for EOS as used by WMS and other RTSP servers that do not
rbultje
parents: 5013
diff changeset
834 else if (reply->notice >= 4400 && reply->notice < 5500)
85e0a9761818 Implement support for EOS as used by WMS and other RTSP servers that do not
rbultje
parents: 5013
diff changeset
835 return AVERROR(EIO); /* data or server error */
85e0a9761818 Implement support for EOS as used by WMS and other RTSP servers that do not
rbultje
parents: 5013
diff changeset
836 else if (reply->notice == 2401 /* Ticket Expired */ ||
85e0a9761818 Implement support for EOS as used by WMS and other RTSP servers that do not
rbultje
parents: 5013
diff changeset
837 (reply->notice >= 5500 && reply->notice < 5600) /* end of term */ )
85e0a9761818 Implement support for EOS as used by WMS and other RTSP servers that do not
rbultje
parents: 5013
diff changeset
838 return AVERROR(EPERM);
85e0a9761818 Implement support for EOS as used by WMS and other RTSP servers that do not
rbultje
parents: 5013
diff changeset
839
4772
fb0b1e68356c Allow (and parse) incoming server messages (notices) interleaved with TCP
rbultje
parents: 4745
diff changeset
840 return 0;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
841 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
842
4877
940946a4569b Send dummy requests over the TCP connection (WMS wants GET_PARAMETER,
rbultje
parents: 4875
diff changeset
843 static void rtsp_send_cmd_async (AVFormatContext *s,
4644
2962d395431b Split rtsp_send_cmd() into two functions, one for the actual sending of the
rbultje
parents: 4641
diff changeset
844 const char *cmd, RTSPMessageHeader *reply,
2962d395431b Split rtsp_send_cmd() into two functions, one for the actual sending of the
rbultje
parents: 4641
diff changeset
845 unsigned char **content_ptr)
2962d395431b Split rtsp_send_cmd() into two functions, one for the actual sending of the
rbultje
parents: 4641
diff changeset
846 {
2962d395431b Split rtsp_send_cmd() into two functions, one for the actual sending of the
rbultje
parents: 4641
diff changeset
847 RTSPState *rt = s->priv_data;
2962d395431b Split rtsp_send_cmd() into two functions, one for the actual sending of the
rbultje
parents: 4641
diff changeset
848 char buf[4096], buf1[1024];
2962d395431b Split rtsp_send_cmd() into two functions, one for the actual sending of the
rbultje
parents: 4641
diff changeset
849
2962d395431b Split rtsp_send_cmd() into two functions, one for the actual sending of the
rbultje
parents: 4641
diff changeset
850 rt->seq++;
2962d395431b Split rtsp_send_cmd() into two functions, one for the actual sending of the
rbultje
parents: 4641
diff changeset
851 av_strlcpy(buf, cmd, sizeof(buf));
2962d395431b Split rtsp_send_cmd() into two functions, one for the actual sending of the
rbultje
parents: 4641
diff changeset
852 snprintf(buf1, sizeof(buf1), "CSeq: %d\r\n", rt->seq);
2962d395431b Split rtsp_send_cmd() into two functions, one for the actual sending of the
rbultje
parents: 4641
diff changeset
853 av_strlcat(buf, buf1, sizeof(buf));
2962d395431b Split rtsp_send_cmd() into two functions, one for the actual sending of the
rbultje
parents: 4641
diff changeset
854 if (rt->session_id[0] != '\0' && !strstr(cmd, "\nIf-Match:")) {
2962d395431b Split rtsp_send_cmd() into two functions, one for the actual sending of the
rbultje
parents: 4641
diff changeset
855 snprintf(buf1, sizeof(buf1), "Session: %s\r\n", rt->session_id);
2962d395431b Split rtsp_send_cmd() into two functions, one for the actual sending of the
rbultje
parents: 4641
diff changeset
856 av_strlcat(buf, buf1, sizeof(buf));
2962d395431b Split rtsp_send_cmd() into two functions, one for the actual sending of the
rbultje
parents: 4641
diff changeset
857 }
2962d395431b Split rtsp_send_cmd() into two functions, one for the actual sending of the
rbultje
parents: 4641
diff changeset
858 av_strlcat(buf, "\r\n", sizeof(buf));
4990
0b15fbb456f4 fix compilation with DEBUG defined
bcoudurier
parents: 4898
diff changeset
859
0b15fbb456f4 fix compilation with DEBUG defined
bcoudurier
parents: 4898
diff changeset
860 dprintf(s, "Sending:\n%s--\n", buf);
0b15fbb456f4 fix compilation with DEBUG defined
bcoudurier
parents: 4898
diff changeset
861
4644
2962d395431b Split rtsp_send_cmd() into two functions, one for the actual sending of the
rbultje
parents: 4641
diff changeset
862 url_write(rt->rtsp_hd, buf, strlen(buf));
4877
940946a4569b Send dummy requests over the TCP connection (WMS wants GET_PARAMETER,
rbultje
parents: 4875
diff changeset
863 rt->last_cmd_time = av_gettime();
940946a4569b Send dummy requests over the TCP connection (WMS wants GET_PARAMETER,
rbultje
parents: 4875
diff changeset
864 }
940946a4569b Send dummy requests over the TCP connection (WMS wants GET_PARAMETER,
rbultje
parents: 4875
diff changeset
865
940946a4569b Send dummy requests over the TCP connection (WMS wants GET_PARAMETER,
rbultje
parents: 4875
diff changeset
866 static void rtsp_send_cmd (AVFormatContext *s,
940946a4569b Send dummy requests over the TCP connection (WMS wants GET_PARAMETER,
rbultje
parents: 4875
diff changeset
867 const char *cmd, RTSPMessageHeader *reply,
940946a4569b Send dummy requests over the TCP connection (WMS wants GET_PARAMETER,
rbultje
parents: 4875
diff changeset
868 unsigned char **content_ptr)
940946a4569b Send dummy requests over the TCP connection (WMS wants GET_PARAMETER,
rbultje
parents: 4875
diff changeset
869 {
940946a4569b Send dummy requests over the TCP connection (WMS wants GET_PARAMETER,
rbultje
parents: 4875
diff changeset
870 rtsp_send_cmd_async(s, cmd, reply, content_ptr);
4644
2962d395431b Split rtsp_send_cmd() into two functions, one for the actual sending of the
rbultje
parents: 4641
diff changeset
871
4772
fb0b1e68356c Allow (and parse) incoming server messages (notices) interleaved with TCP
rbultje
parents: 4745
diff changeset
872 rtsp_read_reply(s, reply, content_ptr, 0);
4644
2962d395431b Split rtsp_send_cmd() into two functions, one for the actual sending of the
rbultje
parents: 4641
diff changeset
873 }
2962d395431b Split rtsp_send_cmd() into two functions, one for the actual sending of the
rbultje
parents: 4641
diff changeset
874
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
875
294
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 229
diff changeset
876 /* 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
877 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
878 {
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 229
diff changeset
879 int i;
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 229
diff changeset
880 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
881
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 229
diff changeset
882 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
883 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
884 if (rtsp_st) {
4386
3dbd7fa2c2af Rename "tx_ctx" and "cur_tx" variables to "transport_priv" and
rbultje
parents: 4361
diff changeset
885 if (rtsp_st->transport_priv) {
3979
e6bf0896a019 Implement RDTDemuxContext, which contains RDT-specific data (similar to
rbultje
parents: 3978
diff changeset
886 if (rt->transport == RTSP_TRANSPORT_RDT)
4386
3dbd7fa2c2af Rename "tx_ctx" and "cur_tx" variables to "transport_priv" and
rbultje
parents: 4361
diff changeset
887 ff_rdt_parse_close(rtsp_st->transport_priv);
3979
e6bf0896a019 Implement RDTDemuxContext, which contains RDT-specific data (similar to
rbultje
parents: 3978
diff changeset
888 else
4386
3dbd7fa2c2af Rename "tx_ctx" and "cur_tx" variables to "transport_priv" and
rbultje
parents: 4361
diff changeset
889 rtp_parse_close(rtsp_st->transport_priv);
3979
e6bf0896a019 Implement RDTDemuxContext, which contains RDT-specific data (similar to
rbultje
parents: 3978
diff changeset
890 }
294
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 229
diff changeset
891 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
892 url_close(rtsp_st->rtp_handle);
1419
8fb4910bdcc0 Add support for H264 over RTP
gpoirier
parents: 1358
diff changeset
893 if (rtsp_st->dynamic_handler && rtsp_st->dynamic_protocol_context)
8fb4910bdcc0 Add support for H264 over RTP
gpoirier
parents: 1358
diff changeset
894 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
895 }
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 229
diff changeset
896 }
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 229
diff changeset
897 av_free(rt->rtsp_streams);
4744
51899c07a4f1 Add RTP/ASF header parsing, which is part of the SDP of these streams. See
rbultje
parents: 4667
diff changeset
898 if (rt->asf_ctx) {
51899c07a4f1 Add RTP/ASF header parsing, which is part of the SDP of these streams. See
rbultje
parents: 4667
diff changeset
899 av_close_input_stream (rt->asf_ctx);
51899c07a4f1 Add RTP/ASF header parsing, which is part of the SDP of these streams. See
rbultje
parents: 4667
diff changeset
900 rt->asf_ctx = NULL;
51899c07a4f1 Add RTP/ASF header parsing, which is part of the SDP of these streams. See
rbultje
parents: 4667
diff changeset
901 }
294
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 229
diff changeset
902 }
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 229
diff changeset
903
3919
1879eab34f88 Factorize out common code for opening of the RTP parsing context between
rbultje
parents: 3905
diff changeset
904 static int
1879eab34f88 Factorize out common code for opening of the RTP parsing context between
rbultje
parents: 3905
diff changeset
905 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
906 {
3979
e6bf0896a019 Implement RDTDemuxContext, which contains RDT-specific data (similar to
rbultje
parents: 3978
diff changeset
907 RTSPState *rt = s->priv_data;
3919
1879eab34f88 Factorize out common code for opening of the RTP parsing context between
rbultje
parents: 3905
diff changeset
908 AVStream *st = NULL;
1879eab34f88 Factorize out common code for opening of the RTP parsing context between
rbultje
parents: 3905
diff changeset
909
3920
ae2d4ee06a94 Reindent after r15927, see discussion in "[PATCH] rtsp cleanup part 1:
rbultje
parents: 3919
diff changeset
910 /* open the RTP context */
ae2d4ee06a94 Reindent after r15927, see discussion in "[PATCH] rtsp cleanup part 1:
rbultje
parents: 3919
diff changeset
911 if (rtsp_st->stream_index >= 0)
ae2d4ee06a94 Reindent after r15927, see discussion in "[PATCH] rtsp cleanup part 1:
rbultje
parents: 3919
diff changeset
912 st = s->streams[rtsp_st->stream_index];
ae2d4ee06a94 Reindent after r15927, see discussion in "[PATCH] rtsp cleanup part 1:
rbultje
parents: 3919
diff changeset
913 if (!st)
ae2d4ee06a94 Reindent after r15927, see discussion in "[PATCH] rtsp cleanup part 1:
rbultje
parents: 3919
diff changeset
914 s->ctx_flags |= AVFMTCTX_NOHEADER;
3979
e6bf0896a019 Implement RDTDemuxContext, which contains RDT-specific data (similar to
rbultje
parents: 3978
diff changeset
915
e6bf0896a019 Implement RDTDemuxContext, which contains RDT-specific data (similar to
rbultje
parents: 3978
diff changeset
916 if (rt->transport == RTSP_TRANSPORT_RDT)
4386
3dbd7fa2c2af Rename "tx_ctx" and "cur_tx" variables to "transport_priv" and
rbultje
parents: 4361
diff changeset
917 rtsp_st->transport_priv = ff_rdt_parse_open(s, st->index,
3979
e6bf0896a019 Implement RDTDemuxContext, which contains RDT-specific data (similar to
rbultje
parents: 3978
diff changeset
918 rtsp_st->dynamic_protocol_context,
e6bf0896a019 Implement RDTDemuxContext, which contains RDT-specific data (similar to
rbultje
parents: 3978
diff changeset
919 rtsp_st->dynamic_handler);
e6bf0896a019 Implement RDTDemuxContext, which contains RDT-specific data (similar to
rbultje
parents: 3978
diff changeset
920 else
4386
3dbd7fa2c2af Rename "tx_ctx" and "cur_tx" variables to "transport_priv" and
rbultje
parents: 4361
diff changeset
921 rtsp_st->transport_priv = rtp_parse_open(s, st, rtsp_st->rtp_handle,
3980
566758832da5 Reindent after r15544.
rbultje
parents: 3979
diff changeset
922 rtsp_st->sdp_payload_type,
566758832da5 Reindent after r15544.
rbultje
parents: 3979
diff changeset
923 &rtsp_st->rtp_payload_data);
3919
1879eab34f88 Factorize out common code for opening of the RTP parsing context between
rbultje
parents: 3905
diff changeset
924
4386
3dbd7fa2c2af Rename "tx_ctx" and "cur_tx" variables to "transport_priv" and
rbultje
parents: 4361
diff changeset
925 if (!rtsp_st->transport_priv) {
3920
ae2d4ee06a94 Reindent after r15927, see discussion in "[PATCH] rtsp cleanup part 1:
rbultje
parents: 3919
diff changeset
926 return AVERROR(ENOMEM);
3979
e6bf0896a019 Implement RDTDemuxContext, which contains RDT-specific data (similar to
rbultje
parents: 3978
diff changeset
927 } 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
928 if(rtsp_st->dynamic_handler) {
4386
3dbd7fa2c2af Rename "tx_ctx" and "cur_tx" variables to "transport_priv" and
rbultje
parents: 4361
diff changeset
929 rtp_parse_set_dynamic_protocol(rtsp_st->transport_priv,
3977
1f1c4535f421 Remove access into RTPDemuxContext in rtsp.c, which allows making it opaque
rbultje
parents: 3975
diff changeset
930 rtsp_st->dynamic_protocol_context,
1f1c4535f421 Remove access into RTPDemuxContext in rtsp.c, which allows making it opaque
rbultje
parents: 3975
diff changeset
931 rtsp_st->dynamic_handler);
3919
1879eab34f88 Factorize out common code for opening of the RTP parsing context between
rbultje
parents: 3905
diff changeset
932 }
3920
ae2d4ee06a94 Reindent after r15927, see discussion in "[PATCH] rtsp cleanup part 1:
rbultje
parents: 3919
diff changeset
933 }
3919
1879eab34f88 Factorize out common code for opening of the RTP parsing context between
rbultje
parents: 3905
diff changeset
934
1879eab34f88 Factorize out common code for opening of the RTP parsing context between
rbultje
parents: 3905
diff changeset
935 return 0;
1879eab34f88 Factorize out common code for opening of the RTP parsing context between
rbultje
parents: 3905
diff changeset
936 }
1879eab34f88 Factorize out common code for opening of the RTP parsing context between
rbultje
parents: 3905
diff changeset
937
3147
91d65fdf91e1 Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents: 2884
diff changeset
938 /**
91d65fdf91e1 Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents: 2884
diff changeset
939 * @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
940 */
91d65fdf91e1 Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents: 2884
diff changeset
941 static int
3876
1026953d4ffe Implement Realmedia/RTSP-compatible SETUP command. This includes calculation
rbultje
parents: 3861
diff changeset
942 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
943 int lower_transport, const char *real_challenge)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
944 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
945 RTSPState *rt = s->priv_data;
4638
801468f16243 Make RTSP-MS-over-UDP negotiation work. See "[PATCH] RTSP-MS 8/15: fix
rbultje
parents: 4637
diff changeset
946 int rtx, j, i, err, interleave = 0;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
947 RTSPStream *rtsp_st;
4557
bfe6fb676d46 Rename RTSPHeader to RTSPMessageHeader to reflect more clearly what the
rbultje
parents: 4549
diff changeset
948 RTSPMessageHeader reply1, *reply = &reply1;
3147
91d65fdf91e1 Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents: 2884
diff changeset
949 char cmd[2048];
3876
1026953d4ffe Implement Realmedia/RTSP-compatible SETUP command. This includes calculation
rbultje
parents: 3861
diff changeset
950 const char *trans_pref;
1026953d4ffe Implement Realmedia/RTSP-compatible SETUP command. This includes calculation
rbultje
parents: 3861
diff changeset
951
3960
13e9b0d3a314 Implement a RTSPTransport field, which allows proper separation of server
rbultje
parents: 3959
diff changeset
952 if (rt->transport == RTSP_TRANSPORT_RDT)
3876
1026953d4ffe Implement Realmedia/RTSP-compatible SETUP command. This includes calculation
rbultje
parents: 3861
diff changeset
953 trans_pref = "x-pn-tng";
1026953d4ffe Implement Realmedia/RTSP-compatible SETUP command. This includes calculation
rbultje
parents: 3861
diff changeset
954 else
1026953d4ffe Implement Realmedia/RTSP-compatible SETUP command. This includes calculation
rbultje
parents: 3861
diff changeset
955 trans_pref = "RTP/AVP";
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 820
diff changeset
956
4877
940946a4569b Send dummy requests over the TCP connection (WMS wants GET_PARAMETER,
rbultje
parents: 4875
diff changeset
957 /* default timeout: 1 minute */
940946a4569b Send dummy requests over the TCP connection (WMS wants GET_PARAMETER,
rbultje
parents: 4875
diff changeset
958 rt->timeout = 60;
940946a4569b Send dummy requests over the TCP connection (WMS wants GET_PARAMETER,
rbultje
parents: 4875
diff changeset
959
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
960 /* for each stream, make the setup request */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
961 /* XXX: we assume the same server is used for the control of each
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
962 RTSP stream */
774
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
963
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
964 for(j = RTSP_RTP_PORT_MIN, i = 0; i < rt->nb_rtsp_streams; ++i) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
965 char transport[2048];
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
966
4638
801468f16243 Make RTSP-MS-over-UDP negotiation work. See "[PATCH] RTSP-MS 8/15: fix
rbultje
parents: 4637
diff changeset
967 /**
801468f16243 Make RTSP-MS-over-UDP negotiation work. See "[PATCH] RTSP-MS 8/15: fix
rbultje
parents: 4637
diff changeset
968 * WMS serves all UDP data over a single connection, the RTX, which
801468f16243 Make RTSP-MS-over-UDP negotiation work. See "[PATCH] RTSP-MS 8/15: fix
rbultje
parents: 4637
diff changeset
969 * isn't necessarily the first in the SDP but has to be the first
801468f16243 Make RTSP-MS-over-UDP negotiation work. See "[PATCH] RTSP-MS 8/15: fix
rbultje
parents: 4637
diff changeset
970 * to be set up, else the second/third SETUP will fail with a 461.
801468f16243 Make RTSP-MS-over-UDP negotiation work. See "[PATCH] RTSP-MS 8/15: fix
rbultje
parents: 4637
diff changeset
971 */
801468f16243 Make RTSP-MS-over-UDP negotiation work. See "[PATCH] RTSP-MS 8/15: fix
rbultje
parents: 4637
diff changeset
972 if (lower_transport == RTSP_LOWER_TRANSPORT_UDP &&
801468f16243 Make RTSP-MS-over-UDP negotiation work. See "[PATCH] RTSP-MS 8/15: fix
rbultje
parents: 4637
diff changeset
973 rt->server_type == RTSP_SERVER_WMS) {
801468f16243 Make RTSP-MS-over-UDP negotiation work. See "[PATCH] RTSP-MS 8/15: fix
rbultje
parents: 4637
diff changeset
974 if (i == 0) {
801468f16243 Make RTSP-MS-over-UDP negotiation work. See "[PATCH] RTSP-MS 8/15: fix
rbultje
parents: 4637
diff changeset
975 /* rtx first */
801468f16243 Make RTSP-MS-over-UDP negotiation work. See "[PATCH] RTSP-MS 8/15: fix
rbultje
parents: 4637
diff changeset
976 for (rtx = 0; rtx < rt->nb_rtsp_streams; rtx++) {
801468f16243 Make RTSP-MS-over-UDP negotiation work. See "[PATCH] RTSP-MS 8/15: fix
rbultje
parents: 4637
diff changeset
977 int len = strlen(rt->rtsp_streams[rtx]->control_url);
801468f16243 Make RTSP-MS-over-UDP negotiation work. See "[PATCH] RTSP-MS 8/15: fix
rbultje
parents: 4637
diff changeset
978 if (len >= 4 &&
801468f16243 Make RTSP-MS-over-UDP negotiation work. See "[PATCH] RTSP-MS 8/15: fix
rbultje
parents: 4637
diff changeset
979 !strcmp(rt->rtsp_streams[rtx]->control_url + len - 4, "/rtx"))
801468f16243 Make RTSP-MS-over-UDP negotiation work. See "[PATCH] RTSP-MS 8/15: fix
rbultje
parents: 4637
diff changeset
980 break;
801468f16243 Make RTSP-MS-over-UDP negotiation work. See "[PATCH] RTSP-MS 8/15: fix
rbultje
parents: 4637
diff changeset
981 }
801468f16243 Make RTSP-MS-over-UDP negotiation work. See "[PATCH] RTSP-MS 8/15: fix
rbultje
parents: 4637
diff changeset
982 if (rtx == rt->nb_rtsp_streams)
801468f16243 Make RTSP-MS-over-UDP negotiation work. See "[PATCH] RTSP-MS 8/15: fix
rbultje
parents: 4637
diff changeset
983 return -1; /* no RTX found */
801468f16243 Make RTSP-MS-over-UDP negotiation work. See "[PATCH] RTSP-MS 8/15: fix
rbultje
parents: 4637
diff changeset
984 rtsp_st = rt->rtsp_streams[rtx];
801468f16243 Make RTSP-MS-over-UDP negotiation work. See "[PATCH] RTSP-MS 8/15: fix
rbultje
parents: 4637
diff changeset
985 } else
801468f16243 Make RTSP-MS-over-UDP negotiation work. See "[PATCH] RTSP-MS 8/15: fix
rbultje
parents: 4637
diff changeset
986 rtsp_st = rt->rtsp_streams[i > rtx ? i : i - 1];
801468f16243 Make RTSP-MS-over-UDP negotiation work. See "[PATCH] RTSP-MS 8/15: fix
rbultje
parents: 4637
diff changeset
987 } else
4639
70321467b4f9 Reindent after r17777.
rbultje
parents: 4638
diff changeset
988 rtsp_st = rt->rtsp_streams[i];
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
989
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
990 /* RTP/UDP */
3957
9f943bb755f9 Rename RTSPProtocol to RTSPLowerTransport, so that its name properly tells us
rbultje
parents: 3941
diff changeset
991 if (lower_transport == RTSP_LOWER_TRANSPORT_UDP) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
992 char buf[256];
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
993
4638
801468f16243 Make RTSP-MS-over-UDP negotiation work. See "[PATCH] RTSP-MS 8/15: fix
rbultje
parents: 4637
diff changeset
994 if (rt->server_type == RTSP_SERVER_WMS && i > 1) {
801468f16243 Make RTSP-MS-over-UDP negotiation work. See "[PATCH] RTSP-MS 8/15: fix
rbultje
parents: 4637
diff changeset
995 port = reply->transports[0].client_port_min;
801468f16243 Make RTSP-MS-over-UDP negotiation work. See "[PATCH] RTSP-MS 8/15: fix
rbultje
parents: 4637
diff changeset
996 goto have_port;
801468f16243 Make RTSP-MS-over-UDP negotiation work. See "[PATCH] RTSP-MS 8/15: fix
rbultje
parents: 4637
diff changeset
997 }
801468f16243 Make RTSP-MS-over-UDP negotiation work. See "[PATCH] RTSP-MS 8/15: fix
rbultje
parents: 4637
diff changeset
998
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
999 /* first try in specified port range */
774
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
1000 if (RTSP_RTP_PORT_MIN != 0) {
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
1001 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
1002 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
1003 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
1004 if (url_open(&rtsp_st->rtp_handle, buf, URL_RDWR) == 0) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1005 goto rtp_opened;
774
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
1006 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1007 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1008 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1009
774
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
1010 /* then try on any port
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
1011 ** if (url_open(&rtsp_st->rtp_handle, "rtp://", URL_RDONLY) < 0) {
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
1012 ** err = AVERROR_INVALIDDATA;
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
1013 ** goto fail;
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
1014 ** }
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
1015 */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1016
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1017 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
1018 port = rtp_get_local_port(rtsp_st->rtp_handle);
4638
801468f16243 Make RTSP-MS-over-UDP negotiation work. See "[PATCH] RTSP-MS 8/15: fix
rbultje
parents: 4637
diff changeset
1019 have_port:
3877
3e0c7ad2a675 Remove unused code that used to handle protocol concatenation, i.e. trying
rbultje
parents: 3876
diff changeset
1020 snprintf(transport, sizeof(transport) - 1,
3958
ab2d2bc3a6e7 Send improper UDP SETUP request, which is what Realmedia servers expect.
rbultje
parents: 3957
diff changeset
1021 "%s/UDP;", trans_pref);
ab2d2bc3a6e7 Send improper UDP SETUP request, which is what Realmedia servers expect.
rbultje
parents: 3957
diff changeset
1022 if (rt->server_type != RTSP_SERVER_REAL)
ab2d2bc3a6e7 Send improper UDP SETUP request, which is what Realmedia servers expect.
rbultje
parents: 3957
diff changeset
1023 av_strlcat(transport, "unicast;", sizeof(transport));
ab2d2bc3a6e7 Send improper UDP SETUP request, which is what Realmedia servers expect.
rbultje
parents: 3957
diff changeset
1024 av_strlcatf(transport, sizeof(transport),
ab2d2bc3a6e7 Send improper UDP SETUP request, which is what Realmedia servers expect.
rbultje
parents: 3957
diff changeset
1025 "client_port=%d", port);
4638
801468f16243 Make RTSP-MS-over-UDP negotiation work. See "[PATCH] RTSP-MS 8/15: fix
rbultje
parents: 4637
diff changeset
1026 if (rt->transport == RTSP_TRANSPORT_RTP &&
801468f16243 Make RTSP-MS-over-UDP negotiation work. See "[PATCH] RTSP-MS 8/15: fix
rbultje
parents: 4637
diff changeset
1027 !(rt->server_type == RTSP_SERVER_WMS && i > 0))
3876
1026953d4ffe Implement Realmedia/RTSP-compatible SETUP command. This includes calculation
rbultje
parents: 3861
diff changeset
1028 av_strlcatf(transport, sizeof(transport), "-%d", port + 1);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1029 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1030
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1031 /* RTP/TCP */
3957
9f943bb755f9 Rename RTSPProtocol to RTSPLowerTransport, so that its name properly tells us
rbultje
parents: 3941
diff changeset
1032 else if (lower_transport == RTSP_LOWER_TRANSPORT_TCP) {
4637
eaf90db8cc42 Recognize the "application" data type, which is required for WMS/UDP
rbultje
parents: 4557
diff changeset
1033 /** For WMS streams, the application streams are only used for
eaf90db8cc42 Recognize the "application" data type, which is required for WMS/UDP
rbultje
parents: 4557
diff changeset
1034 * UDP. When trying to set it up for TCP streams, the server
eaf90db8cc42 Recognize the "application" data type, which is required for WMS/UDP
rbultje
parents: 4557
diff changeset
1035 * will return an error. Therefore, we skip those streams. */
eaf90db8cc42 Recognize the "application" data type, which is required for WMS/UDP
rbultje
parents: 4557
diff changeset
1036 if (rt->server_type == RTSP_SERVER_WMS &&
eaf90db8cc42 Recognize the "application" data type, which is required for WMS/UDP
rbultje
parents: 4557
diff changeset
1037 s->streams[rtsp_st->stream_index]->codec->codec_type == CODEC_TYPE_DATA)
eaf90db8cc42 Recognize the "application" data type, which is required for WMS/UDP
rbultje
parents: 4557
diff changeset
1038 continue;
3877
3e0c7ad2a675 Remove unused code that used to handle protocol concatenation, i.e. trying
rbultje
parents: 3876
diff changeset
1039 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
1040 "%s/TCP;", trans_pref);
0d776969b708 Fix the Transport: line in the SETUP request so that it works with WMS
rbultje
parents: 4291
diff changeset
1041 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
1042 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
1043 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
1044 "interleaved=%d-%d",
0d776969b708 Fix the Transport: line in the SETUP request so that it works with WMS
rbultje
parents: 4291
diff changeset
1045 interleave, interleave + 1);
0d776969b708 Fix the Transport: line in the SETUP request so that it works with WMS
rbultje
parents: 4291
diff changeset
1046 interleave += 2;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1047 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1048
3957
9f943bb755f9 Rename RTSPProtocol to RTSPLowerTransport, so that its name properly tells us
rbultje
parents: 3941
diff changeset
1049 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
1050 snprintf(transport, sizeof(transport) - 1,
3876
1026953d4ffe Implement Realmedia/RTSP-compatible SETUP command. This includes calculation
rbultje
parents: 3861
diff changeset
1051 "%s/UDP;multicast", trans_pref);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1052 }
4332
0d776969b708 Fix the Transport: line in the SETUP request so that it works with WMS
rbultje
parents: 4291
diff changeset
1053 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
1054 rt->server_type == RTSP_SERVER_WMS)
3876
1026953d4ffe Implement Realmedia/RTSP-compatible SETUP command. This includes calculation
rbultje
parents: 3861
diff changeset
1055 av_strlcat(transport, ";mode=play", sizeof(transport));
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 820
diff changeset
1056 snprintf(cmd, sizeof(cmd),
172
9a0ab557b159 fixed RTP/TCP client support
bellard
parents: 64
diff changeset
1057 "SETUP %s RTSP/1.0\r\n"
9a0ab557b159 fixed RTP/TCP client support
bellard
parents: 64
diff changeset
1058 "Transport: %s\r\n",
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1059 rtsp_st->control_url, transport);
3923
83e51bcb03c2 Rename RTSP_SERVER_RDT to RTSP_SERVER_REAL, because RDT (the transport
rbultje
parents: 3920
diff changeset
1060 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
1061 char real_res[41], real_csum[9];
1026953d4ffe Implement Realmedia/RTSP-compatible SETUP command. This includes calculation
rbultje
parents: 3861
diff changeset
1062 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
1063 real_challenge);
1026953d4ffe Implement Realmedia/RTSP-compatible SETUP command. This includes calculation
rbultje
parents: 3861
diff changeset
1064 av_strlcatf(cmd, sizeof(cmd),
1026953d4ffe Implement Realmedia/RTSP-compatible SETUP command. This includes calculation
rbultje
parents: 3861
diff changeset
1065 "If-Match: %s\r\n"
1026953d4ffe Implement Realmedia/RTSP-compatible SETUP command. This includes calculation
rbultje
parents: 3861
diff changeset
1066 "RealChallenge2: %s, sd=%s\r\n",
1026953d4ffe Implement Realmedia/RTSP-compatible SETUP command. This includes calculation
rbultje
parents: 3861
diff changeset
1067 rt->session_id, real_res, real_csum);
1026953d4ffe Implement Realmedia/RTSP-compatible SETUP command. This includes calculation
rbultje
parents: 3861
diff changeset
1068 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1069 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
1070 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
1071 err = 1;
5a7a7406ab1f Allow cycling between different protocols (TCP, UDP or multicast) so that if
rbultje
parents: 3147
diff changeset
1072 goto fail;
3151
65236eababe9 Reindent after rtsp-alternate-protocol* patches.
rbultje
parents: 3150
diff changeset
1073 } else if (reply->status_code != RTSP_STATUS_OK ||
65236eababe9 Reindent after rtsp-alternate-protocol* patches.
rbultje
parents: 3150
diff changeset
1074 reply->nb_transports != 1) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1075 err = AVERROR_INVALIDDATA;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1076 goto fail;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1077 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1078
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1079 /* XXX: same protocol for all streams is required */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1080 if (i > 0) {
3960
13e9b0d3a314 Implement a RTSPTransport field, which allows proper separation of server
rbultje
parents: 3959
diff changeset
1081 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
1082 reply->transports[0].transport != rt->transport) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1083 err = AVERROR_INVALIDDATA;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1084 goto fail;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1085 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1086 } else {
3957
9f943bb755f9 Rename RTSPProtocol to RTSPLowerTransport, so that its name properly tells us
rbultje
parents: 3941
diff changeset
1087 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
1088 rt->transport = reply->transports[0].transport;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1089 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1090
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1091 /* close RTP connection if not choosen */
3957
9f943bb755f9 Rename RTSPProtocol to RTSPLowerTransport, so that its name properly tells us
rbultje
parents: 3941
diff changeset
1092 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
1093 (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
1094 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
1095 rtsp_st->rtp_handle = NULL;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1096 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1097
3957
9f943bb755f9 Rename RTSPProtocol to RTSPLowerTransport, so that its name properly tells us
rbultje
parents: 3941
diff changeset
1098 switch(reply->transports[0].lower_transport) {
9f943bb755f9 Rename RTSPProtocol to RTSPLowerTransport, so that its name properly tells us
rbultje
parents: 3941
diff changeset
1099 case RTSP_LOWER_TRANSPORT_TCP:
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1100 rtsp_st->interleaved_min = reply->transports[0].interleaved_min;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1101 rtsp_st->interleaved_max = reply->transports[0].interleaved_max;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1102 break;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 820
diff changeset
1103
3957
9f943bb755f9 Rename RTSPProtocol to RTSPLowerTransport, so that its name properly tells us
rbultje
parents: 3941
diff changeset
1104 case RTSP_LOWER_TRANSPORT_UDP:
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1105 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1106 char url[1024];
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 820
diff changeset
1107
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1108 /* XXX: also use address if specified */
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 820
diff changeset
1109 snprintf(url, sizeof(url), "rtp://%s:%d",
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1110 host, reply->transports[0].server_port_min);
4638
801468f16243 Make RTSP-MS-over-UDP negotiation work. See "[PATCH] RTSP-MS 8/15: fix
rbultje
parents: 4637
diff changeset
1111 if (!(rt->server_type == RTSP_SERVER_WMS && i > 1) &&
801468f16243 Make RTSP-MS-over-UDP negotiation work. See "[PATCH] RTSP-MS 8/15: fix
rbultje
parents: 4637
diff changeset
1112 rtp_set_remote_url(rtsp_st->rtp_handle, url) < 0) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1113 err = AVERROR_INVALIDDATA;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1114 goto fail;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1115 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1116 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1117 break;
3957
9f943bb755f9 Rename RTSPProtocol to RTSPLowerTransport, so that its name properly tells us
rbultje
parents: 3941
diff changeset
1118 case RTSP_LOWER_TRANSPORT_UDP_MULTICAST:
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1119 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1120 char url[1024];
2246
6dade35dc9b3 rtsp multicast fix by Thijs Vermeir $1$2@gmail.com
lu_zero
parents: 2222
diff changeset
1121 struct in_addr in;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1122
2246
6dade35dc9b3 rtsp multicast fix by Thijs Vermeir $1$2@gmail.com
lu_zero
parents: 2222
diff changeset
1123 in.s_addr = htonl(reply->transports[0].destination);
3221
e17b25e8a34e Remove the "multicast=" tag from UDP and RTP URLs
lucabe
parents: 3202
diff changeset
1124 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
1125 inet_ntoa(in),
6dade35dc9b3 rtsp multicast fix by Thijs Vermeir $1$2@gmail.com
lu_zero
parents: 2222
diff changeset
1126 reply->transports[0].port_min,
6dade35dc9b3 rtsp multicast fix by Thijs Vermeir $1$2@gmail.com
lu_zero
parents: 2222
diff changeset
1127 reply->transports[0].ttl);
1425
00d9393a126f make ffmpeg able to send back a RTCP receiver report.
gpoirier
parents: 1424
diff changeset
1128 if (url_open(&rtsp_st->rtp_handle, url, URL_RDWR) < 0) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1129 err = AVERROR_INVALIDDATA;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1130 goto fail;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1131 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1132 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1133 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1134 }
774
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 706
diff changeset
1135
3919
1879eab34f88 Factorize out common code for opening of the RTP parsing context between
rbultje
parents: 3905
diff changeset
1136 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
1137 goto fail;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1138 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1139
4877
940946a4569b Send dummy requests over the TCP connection (WMS wants GET_PARAMETER,
rbultje
parents: 4875
diff changeset
1140 if (reply->timeout > 0)
940946a4569b Send dummy requests over the TCP connection (WMS wants GET_PARAMETER,
rbultje
parents: 4875
diff changeset
1141 rt->timeout = reply->timeout;
940946a4569b Send dummy requests over the TCP connection (WMS wants GET_PARAMETER,
rbultje
parents: 4875
diff changeset
1142
3923
83e51bcb03c2 Rename RTSP_SERVER_RDT to RTSP_SERVER_REAL, because RDT (the transport
rbultje
parents: 3920
diff changeset
1143 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
1144 rt->need_subscription = 1;
aeb79f68ba7e Implement a RDT-specific SET_PARAMETER command that subscribes to the
rbultje
parents: 3877
diff changeset
1145
3147
91d65fdf91e1 Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents: 2884
diff changeset
1146 return 0;
91d65fdf91e1 Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents: 2884
diff changeset
1147
91d65fdf91e1 Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents: 2884
diff changeset
1148 fail:
3149
5a7a7406ab1f Allow cycling between different protocols (TCP, UDP or multicast) so that if
rbultje
parents: 3147
diff changeset
1149 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
1150 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
1151 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
1152 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
1153 }
5a7a7406ab1f Allow cycling between different protocols (TCP, UDP or multicast) so that if
rbultje
parents: 3147
diff changeset
1154 }
3147
91d65fdf91e1 Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents: 2884
diff changeset
1155 return err;
91d65fdf91e1 Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents: 2884
diff changeset
1156 }
91d65fdf91e1 Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents: 2884
diff changeset
1157
91d65fdf91e1 Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents: 2884
diff changeset
1158 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
1159 AVFormatParameters *ap)
91d65fdf91e1 Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents: 2884
diff changeset
1160 {
91d65fdf91e1 Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents: 2884
diff changeset
1161 RTSPState *rt = s->priv_data;
91d65fdf91e1 Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents: 2884
diff changeset
1162 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
1163 URLContext *rtsp_hd;
91d65fdf91e1 Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents: 2884
diff changeset
1164 int port, ret, err;
4557
bfe6fb676d46 Rename RTSPHeader to RTSPMessageHeader to reflect more clearly what the
rbultje
parents: 4549
diff changeset
1165 RTSPMessageHeader reply1, *reply = &reply1;
3147
91d65fdf91e1 Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents: 2884
diff changeset
1166 unsigned char *content = NULL;
3957
9f943bb755f9 Rename RTSPProtocol to RTSPLowerTransport, so that its name properly tells us
rbultje
parents: 3941
diff changeset
1167 int lower_transport_mask = 0;
3856
055f8385670c Send RTSP OPTIONS command to detect server type.
rbultje
parents: 3855
diff changeset
1168 char real_challenge[64];
3147
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 /* extract hostname and port */
91d65fdf91e1 Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents: 2884
diff changeset
1171 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
1172 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
1173 if (port < 0)
91d65fdf91e1 Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents: 2884
diff changeset
1174 port = RTSP_DEFAULT_PORT;
91d65fdf91e1 Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents: 2884
diff changeset
1175
91d65fdf91e1 Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents: 2884
diff changeset
1176 /* search for options */
91d65fdf91e1 Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents: 2884
diff changeset
1177 option_list = strchr(path, '?');
91d65fdf91e1 Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents: 2884
diff changeset
1178 if (option_list) {
91d65fdf91e1 Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents: 2884
diff changeset
1179 /* 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
1180 *option_list++ = 0;
91d65fdf91e1 Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents: 2884
diff changeset
1181 while(option_list) {
91d65fdf91e1 Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents: 2884
diff changeset
1182 /* move the option pointer */
91d65fdf91e1 Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents: 2884
diff changeset
1183 option = option_list;
91d65fdf91e1 Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents: 2884
diff changeset
1184 option_list = strchr(option_list, '&');
91d65fdf91e1 Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents: 2884
diff changeset
1185 if (option_list)
91d65fdf91e1 Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents: 2884
diff changeset
1186 *(option_list++) = 0;
91d65fdf91e1 Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents: 2884
diff changeset
1187 /* handle the options */
91d65fdf91e1 Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents: 2884
diff changeset
1188 if (strcmp(option, "udp") == 0)
3957
9f943bb755f9 Rename RTSPProtocol to RTSPLowerTransport, so that its name properly tells us
rbultje
parents: 3941
diff changeset
1189 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
1190 else if (strcmp(option, "multicast") == 0)
3957
9f943bb755f9 Rename RTSPProtocol to RTSPLowerTransport, so that its name properly tells us
rbultje
parents: 3941
diff changeset
1191 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
1192 else if (strcmp(option, "tcp") == 0)
3957
9f943bb755f9 Rename RTSPProtocol to RTSPLowerTransport, so that its name properly tells us
rbultje
parents: 3941
diff changeset
1193 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
1194 }
91d65fdf91e1 Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents: 2884
diff changeset
1195 }
91d65fdf91e1 Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents: 2884
diff changeset
1196
3957
9f943bb755f9 Rename RTSPProtocol to RTSPLowerTransport, so that its name properly tells us
rbultje
parents: 3941
diff changeset
1197 if (!lower_transport_mask)
4514
2a84d46427d1 Rename RTSP_*_LAST to RTSP_*_NB in line with PIX_FMT_* in lavc. See "[PATCH]
rbultje
parents: 4388
diff changeset
1198 lower_transport_mask = (1 << RTSP_LOWER_TRANSPORT_NB) - 1;
3147
91d65fdf91e1 Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents: 2884
diff changeset
1199
91d65fdf91e1 Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents: 2884
diff changeset
1200 /* open the tcp connexion */
91d65fdf91e1 Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents: 2884
diff changeset
1201 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
1202 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
1203 return AVERROR(EIO);
91d65fdf91e1 Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents: 2884
diff changeset
1204 rt->rtsp_hd = rtsp_hd;
91d65fdf91e1 Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents: 2884
diff changeset
1205 rt->seq = 0;
91d65fdf91e1 Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents: 2884
diff changeset
1206
3856
055f8385670c Send RTSP OPTIONS command to detect server type.
rbultje
parents: 3855
diff changeset
1207 /* request options supported by the server; this also detects server type */
055f8385670c Send RTSP OPTIONS command to detect server type.
rbultje
parents: 3855
diff changeset
1208 for (rt->server_type = RTSP_SERVER_RTP;;) {
055f8385670c Send RTSP OPTIONS command to detect server type.
rbultje
parents: 3855
diff changeset
1209 snprintf(cmd, sizeof(cmd),
055f8385670c Send RTSP OPTIONS command to detect server type.
rbultje
parents: 3855
diff changeset
1210 "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
1211 if (rt->server_type == RTSP_SERVER_REAL)
3856
055f8385670c Send RTSP OPTIONS command to detect server type.
rbultje
parents: 3855
diff changeset
1212 av_strlcat(cmd,
055f8385670c Send RTSP OPTIONS command to detect server type.
rbultje
parents: 3855
diff changeset
1213 /**
055f8385670c Send RTSP OPTIONS command to detect server type.
rbultje
parents: 3855
diff changeset
1214 * The following entries are required for proper
055f8385670c Send RTSP OPTIONS command to detect server type.
rbultje
parents: 3855
diff changeset
1215 * streaming from a Realmedia server. They are
055f8385670c Send RTSP OPTIONS command to detect server type.
rbultje
parents: 3855
diff changeset
1216 * interdependent in some way although we currently
055f8385670c Send RTSP OPTIONS command to detect server type.
rbultje
parents: 3855
diff changeset
1217 * don't quite understand how. Values were copied
055f8385670c Send RTSP OPTIONS command to detect server type.
rbultje
parents: 3855
diff changeset
1218 * from mplayer SVN r23589.
055f8385670c Send RTSP OPTIONS command to detect server type.
rbultje
parents: 3855
diff changeset
1219 * @param CompanyID is a 16-byte ID in base64
055f8385670c Send RTSP OPTIONS command to detect server type.
rbultje
parents: 3855
diff changeset
1220 * @param ClientChallenge is a 16-byte ID in hex
055f8385670c Send RTSP OPTIONS command to detect server type.
rbultje
parents: 3855
diff changeset
1221 */
055f8385670c Send RTSP OPTIONS command to detect server type.
rbultje
parents: 3855
diff changeset
1222 "ClientChallenge: 9e26d33f2984236010ef6253fb1887f7\r\n"
055f8385670c Send RTSP OPTIONS command to detect server type.
rbultje
parents: 3855
diff changeset
1223 "PlayerStarttime: [28/03/2003:22:50:23 00:00]\r\n"
055f8385670c Send RTSP OPTIONS command to detect server type.
rbultje
parents: 3855
diff changeset
1224 "CompanyID: KnKV4M4I/B2FjJ1TToLycw==\r\n"
055f8385670c Send RTSP OPTIONS command to detect server type.
rbultje
parents: 3855
diff changeset
1225 "GUID: 00000000-0000-0000-0000-000000000000\r\n",
055f8385670c Send RTSP OPTIONS command to detect server type.
rbultje
parents: 3855
diff changeset
1226 sizeof(cmd));
055f8385670c Send RTSP OPTIONS command to detect server type.
rbultje
parents: 3855
diff changeset
1227 rtsp_send_cmd(s, cmd, reply, NULL);
055f8385670c Send RTSP OPTIONS command to detect server type.
rbultje
parents: 3855
diff changeset
1228 if (reply->status_code != RTSP_STATUS_OK) {
055f8385670c Send RTSP OPTIONS command to detect server type.
rbultje
parents: 3855
diff changeset
1229 err = AVERROR_INVALIDDATA;
055f8385670c Send RTSP OPTIONS command to detect server type.
rbultje
parents: 3855
diff changeset
1230 goto fail;
055f8385670c Send RTSP OPTIONS command to detect server type.
rbultje
parents: 3855
diff changeset
1231 }
055f8385670c Send RTSP OPTIONS command to detect server type.
rbultje
parents: 3855
diff changeset
1232
055f8385670c Send RTSP OPTIONS command to detect server type.
rbultje
parents: 3855
diff changeset
1233 /* 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
1234 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
1235 rt->server_type = RTSP_SERVER_REAL;
3856
055f8385670c Send RTSP OPTIONS command to detect server type.
rbultje
parents: 3855
diff changeset
1236 continue;
4169
619845a9bab3 Use the "server" RTSP field to detect whether the server that we're talking
rbultje
parents: 4168
diff changeset
1237 } 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
1238 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
1239 } else if (rt->server_type == RTSP_SERVER_REAL) {
3856
055f8385670c Send RTSP OPTIONS command to detect server type.
rbultje
parents: 3855
diff changeset
1240 strcpy(real_challenge, reply->real_challenge);
055f8385670c Send RTSP OPTIONS command to detect server type.
rbultje
parents: 3855
diff changeset
1241 }
055f8385670c Send RTSP OPTIONS command to detect server type.
rbultje
parents: 3855
diff changeset
1242 break;
055f8385670c Send RTSP OPTIONS command to detect server type.
rbultje
parents: 3855
diff changeset
1243 }
055f8385670c Send RTSP OPTIONS command to detect server type.
rbultje
parents: 3855
diff changeset
1244
3147
91d65fdf91e1 Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents: 2884
diff changeset
1245 /* describe the stream */
91d65fdf91e1 Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents: 2884
diff changeset
1246 snprintf(cmd, sizeof(cmd),
91d65fdf91e1 Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents: 2884
diff changeset
1247 "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
1248 "Accept: application/sdp\r\n",
91d65fdf91e1 Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents: 2884
diff changeset
1249 s->filename);
3923
83e51bcb03c2 Rename RTSP_SERVER_RDT to RTSP_SERVER_REAL, because RDT (the transport
rbultje
parents: 3920
diff changeset
1250 if (rt->server_type == RTSP_SERVER_REAL) {
3859
8bde52c0934c Implement Realmedia-compatible DESCRIBE command.
rbultje
parents: 3856
diff changeset
1251 /**
8bde52c0934c Implement Realmedia-compatible DESCRIBE command.
rbultje
parents: 3856
diff changeset
1252 * The Require: attribute is needed for proper streaming from
8bde52c0934c Implement Realmedia-compatible DESCRIBE command.
rbultje
parents: 3856
diff changeset
1253 * Realmedia servers.
8bde52c0934c Implement Realmedia-compatible DESCRIBE command.
rbultje
parents: 3856
diff changeset
1254 */
8bde52c0934c Implement Realmedia-compatible DESCRIBE command.
rbultje
parents: 3856
diff changeset
1255 av_strlcat(cmd,
8bde52c0934c Implement Realmedia-compatible DESCRIBE command.
rbultje
parents: 3856
diff changeset
1256 "Require: com.real.retain-entity-for-setup\r\n",
8bde52c0934c Implement Realmedia-compatible DESCRIBE command.
rbultje
parents: 3856
diff changeset
1257 sizeof(cmd));
8bde52c0934c Implement Realmedia-compatible DESCRIBE command.
rbultje
parents: 3856
diff changeset
1258 }
3147
91d65fdf91e1 Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents: 2884
diff changeset
1259 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
1260 if (!content) {
91d65fdf91e1 Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents: 2884
diff changeset
1261 err = AVERROR_INVALIDDATA;
91d65fdf91e1 Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents: 2884
diff changeset
1262 goto fail;
91d65fdf91e1 Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents: 2884
diff changeset
1263 }
91d65fdf91e1 Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents: 2884
diff changeset
1264 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
1265 err = AVERROR_INVALIDDATA;
91d65fdf91e1 Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents: 2884
diff changeset
1266 goto fail;
91d65fdf91e1 Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents: 2884
diff changeset
1267 }
91d65fdf91e1 Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents: 2884
diff changeset
1268
91d65fdf91e1 Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents: 2884
diff changeset
1269 /* 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
1270 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
1271 av_freep(&content);
91d65fdf91e1 Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents: 2884
diff changeset
1272 if (ret < 0) {
91d65fdf91e1 Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents: 2884
diff changeset
1273 err = AVERROR_INVALIDDATA;
91d65fdf91e1 Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents: 2884
diff changeset
1274 goto fail;
91d65fdf91e1 Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents: 2884
diff changeset
1275 }
91d65fdf91e1 Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents: 2884
diff changeset
1276
3149
5a7a7406ab1f Allow cycling between different protocols (TCP, UDP or multicast) so that if
rbultje
parents: 3147
diff changeset
1277 do {
3957
9f943bb755f9 Rename RTSPProtocol to RTSPLowerTransport, so that its name properly tells us
rbultje
parents: 3941
diff changeset
1278 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
1279
3957
9f943bb755f9 Rename RTSPProtocol to RTSPLowerTransport, so that its name properly tells us
rbultje
parents: 3941
diff changeset
1280 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
1281 rt->server_type == RTSP_SERVER_REAL ?
3876
1026953d4ffe Implement Realmedia/RTSP-compatible SETUP command. This includes calculation
rbultje
parents: 3861
diff changeset
1282 real_challenge : NULL);
3149
5a7a7406ab1f Allow cycling between different protocols (TCP, UDP or multicast) so that if
rbultje
parents: 3147
diff changeset
1283 if (err < 0)
3151
65236eababe9 Reindent after rtsp-alternate-protocol* patches.
rbultje
parents: 3150
diff changeset
1284 goto fail;
3957
9f943bb755f9 Rename RTSPProtocol to RTSPLowerTransport, so that its name properly tells us
rbultje
parents: 3941
diff changeset
1285 lower_transport_mask &= ~(1 << lower_transport);
9f943bb755f9 Rename RTSPProtocol to RTSPLowerTransport, so that its name properly tells us
rbultje
parents: 3941
diff changeset
1286 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
1287 err = AVERROR(FF_NETERROR(EPROTONOSUPPORT));
3149
5a7a7406ab1f Allow cycling between different protocols (TCP, UDP or multicast) so that if
rbultje
parents: 3147
diff changeset
1288 goto fail;
5a7a7406ab1f Allow cycling between different protocols (TCP, UDP or multicast) so that if
rbultje
parents: 3147
diff changeset
1289 }
5a7a7406ab1f Allow cycling between different protocols (TCP, UDP or multicast) so that if
rbultje
parents: 3147
diff changeset
1290 } while (err);
3147
91d65fdf91e1 Split the SETUP request into a separate function, as a prelude into allowing
rbultje
parents: 2884
diff changeset
1291
304
d58c8859ff8c initial seek support - more generic play/pause support
bellard
parents: 294
diff changeset
1292 rt->state = RTSP_STATE_IDLE;
d58c8859ff8c initial seek support - more generic play/pause support
bellard
parents: 294
diff changeset
1293 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
1294 zero */
1003
2d57ce58f576 simplify AVFormatParameters NULL checks
michael
parents: 896
diff changeset
1295 if (ap->initial_pause) {
304
d58c8859ff8c initial seek support - more generic play/pause support
bellard
parents: 294
diff changeset
1296 /* do not start immediately */
d58c8859ff8c initial seek support - more generic play/pause support
bellard
parents: 294
diff changeset
1297 } else {
d58c8859ff8c initial seek support - more generic play/pause support
bellard
parents: 294
diff changeset
1298 if (rtsp_read_play(s) < 0) {
d58c8859ff8c initial seek support - more generic play/pause support
bellard
parents: 294
diff changeset
1299 err = AVERROR_INVALIDDATA;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1300 goto fail;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1301 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1302 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1303 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1304 fail:
294
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 229
diff changeset
1305 rtsp_close_streams(rt);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1306 av_freep(&content);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1307 url_close(rt->rtsp_hd);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1308 return err;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1309 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1310
294
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 229
diff changeset
1311 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
1312 uint8_t *buf, int buf_size)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1313 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1314 RTSPState *rt = s->priv_data;
172
9a0ab557b159 fixed RTP/TCP client support
bellard
parents: 64
diff changeset
1315 int id, len, i, ret;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1316 RTSPStream *rtsp_st;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1317
172
9a0ab557b159 fixed RTP/TCP client support
bellard
parents: 64
diff changeset
1318 #ifdef DEBUG_RTP_TCP
4990
0b15fbb456f4 fix compilation with DEBUG defined
bcoudurier
parents: 4898
diff changeset
1319 dprintf(s, "tcp_read_packet:\n");
172
9a0ab557b159 fixed RTP/TCP client support
bellard
parents: 64
diff changeset
1320 #endif
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1321 redo:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1322 for(;;) {
4772
fb0b1e68356c Allow (and parse) incoming server messages (notices) interleaved with TCP
rbultje
parents: 4745
diff changeset
1323 RTSPMessageHeader reply;
fb0b1e68356c Allow (and parse) incoming server messages (notices) interleaved with TCP
rbultje
parents: 4745
diff changeset
1324
fb0b1e68356c Allow (and parse) incoming server messages (notices) interleaved with TCP
rbultje
parents: 4745
diff changeset
1325 ret = rtsp_read_reply(s, &reply, NULL, 1);
fb0b1e68356c Allow (and parse) incoming server messages (notices) interleaved with TCP
rbultje
parents: 4745
diff changeset
1326 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
1327 return -1;
4772
fb0b1e68356c Allow (and parse) incoming server messages (notices) interleaved with TCP
rbultje
parents: 4745
diff changeset
1328 if (ret == 1) /* received '$' */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1329 break;
4772
fb0b1e68356c Allow (and parse) incoming server messages (notices) interleaved with TCP
rbultje
parents: 4745
diff changeset
1330 /* XXX: parse message */
5112
85e0a9761818 Implement support for EOS as used by WMS and other RTSP servers that do not
rbultje
parents: 5013
diff changeset
1331 if (rt->state != RTSP_STATE_PLAYING)
85e0a9761818 Implement support for EOS as used by WMS and other RTSP servers that do not
rbultje
parents: 5013
diff changeset
1332 return 0;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1333 }
5004
84a7b7a2f252 Move function for reading whole specified amount of data from RTSP
kostya
parents: 4990
diff changeset
1334 ret = url_read_complete(rt->rtsp_hd, buf, 3);
172
9a0ab557b159 fixed RTP/TCP client support
bellard
parents: 64
diff changeset
1335 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
1336 return -1;
172
9a0ab557b159 fixed RTP/TCP client support
bellard
parents: 64
diff changeset
1337 id = buf[0];
2222
3427d0c63a32 Use AV_RB* macros where appropriate.
diego
parents: 2219
diff changeset
1338 len = AV_RB16(buf + 1);
172
9a0ab557b159 fixed RTP/TCP client support
bellard
parents: 64
diff changeset
1339 #ifdef DEBUG_RTP_TCP
4990
0b15fbb456f4 fix compilation with DEBUG defined
bcoudurier
parents: 4898
diff changeset
1340 dprintf(s, "id=%d len=%d\n", id, len);
172
9a0ab557b159 fixed RTP/TCP client support
bellard
parents: 64
diff changeset
1341 #endif
294
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 229
diff changeset
1342 if (len > buf_size || len < 12)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1343 goto redo;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1344 /* get the data */
5004
84a7b7a2f252 Move function for reading whole specified amount of data from RTSP
kostya
parents: 4990
diff changeset
1345 ret = url_read_complete(rt->rtsp_hd, buf, len);
172
9a0ab557b159 fixed RTP/TCP client support
bellard
parents: 64
diff changeset
1346 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
1347 return -1;
3962
72efef66f566 This patch refactors RDT packet header parsing so that it can be used in
rbultje
parents: 3961
diff changeset
1348 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
1349 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
1350 return -1;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 820
diff changeset
1351
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1352 /* 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
1353 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
1354 rtsp_st = rt->rtsp_streams[i];
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 820
diff changeset
1355 if (id >= rtsp_st->interleaved_min &&
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 820
diff changeset
1356 id <= rtsp_st->interleaved_max)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1357 goto found;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1358 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1359 goto redo;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1360 found:
294
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 229
diff changeset
1361 *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
1362 return len;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1363 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1364
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 820
diff changeset
1365 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
1366 uint8_t *buf, int buf_size)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1367 {
294
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 229
diff changeset
1368 RTSPState *rt = s->priv_data;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1369 RTSPStream *rtsp_st;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1370 fd_set rfds;
4772
fb0b1e68356c Allow (and parse) incoming server messages (notices) interleaved with TCP
rbultje
parents: 4745
diff changeset
1371 int fd, fd_max, n, i, ret, tcp_fd;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1372 struct timeval tv;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1373
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1374 for(;;) {
179
43ac45200138 suppressed RTSP abort hack - added PLAY/PAUSE
bellard
parents: 172
diff changeset
1375 if (url_interrupt_cb())
2772
b43dc2901f83 Make av_read_frame with rtsp client return EINTR on interrupt
lu_zero
parents: 2771
diff changeset
1376 return AVERROR(EINTR);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1377 FD_ZERO(&rfds);
4898
609322be76a6 Fix crash when receiving from SDP
lucabe
parents: 4877
diff changeset
1378 if (rt->rtsp_hd) {
609322be76a6 Fix crash when receiving from SDP
lucabe
parents: 4877
diff changeset
1379 tcp_fd = fd_max = url_get_file_handle(rt->rtsp_hd);
609322be76a6 Fix crash when receiving from SDP
lucabe
parents: 4877
diff changeset
1380 FD_SET(tcp_fd, &rfds);
609322be76a6 Fix crash when receiving from SDP
lucabe
parents: 4877
diff changeset
1381 } else {
609322be76a6 Fix crash when receiving from SDP
lucabe
parents: 4877
diff changeset
1382 fd_max = 0;
609322be76a6 Fix crash when receiving from SDP
lucabe
parents: 4877
diff changeset
1383 tcp_fd = -1;
609322be76a6 Fix crash when receiving from SDP
lucabe
parents: 4877
diff changeset
1384 }
294
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 229
diff changeset
1385 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
1386 rtsp_st = rt->rtsp_streams[i];
4638
801468f16243 Make RTSP-MS-over-UDP negotiation work. See "[PATCH] RTSP-MS 8/15: fix
rbultje
parents: 4637
diff changeset
1387 if (rtsp_st->rtp_handle) {
4639
70321467b4f9 Reindent after r17777.
rbultje
parents: 4638
diff changeset
1388 /* currently, we cannot probe RTCP handle because of
70321467b4f9 Reindent after r17777.
rbultje
parents: 4638
diff changeset
1389 * blocking restrictions */
4641
aa5dcae3f210 Rename "fd1" variable ro "fd". There were previously two variables (fd1 and
rbultje
parents: 4640
diff changeset
1390 fd = url_get_file_handle(rtsp_st->rtp_handle);
aa5dcae3f210 Rename "fd1" variable ro "fd". There were previously two variables (fd1 and
rbultje
parents: 4640
diff changeset
1391 if (fd > fd_max)
aa5dcae3f210 Rename "fd1" variable ro "fd". There were previously two variables (fd1 and
rbultje
parents: 4640
diff changeset
1392 fd_max = fd;
aa5dcae3f210 Rename "fd1" variable ro "fd". There were previously two variables (fd1 and
rbultje
parents: 4640
diff changeset
1393 FD_SET(fd, &rfds);
4638
801468f16243 Make RTSP-MS-over-UDP negotiation work. See "[PATCH] RTSP-MS 8/15: fix
rbultje
parents: 4637
diff changeset
1394 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1395 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1396 tv.tv_sec = 0;
179
43ac45200138 suppressed RTSP abort hack - added PLAY/PAUSE
bellard
parents: 172
diff changeset
1397 tv.tv_usec = 100 * 1000;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1398 n = select(fd_max + 1, &rfds, NULL, NULL, &tv);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1399 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
1400 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
1401 rtsp_st = rt->rtsp_streams[i];
4638
801468f16243 Make RTSP-MS-over-UDP negotiation work. See "[PATCH] RTSP-MS 8/15: fix
rbultje
parents: 4637
diff changeset
1402 if (rtsp_st->rtp_handle) {
4641
aa5dcae3f210 Rename "fd1" variable ro "fd". There were previously two variables (fd1 and
rbultje
parents: 4640
diff changeset
1403 fd = url_get_file_handle(rtsp_st->rtp_handle);
aa5dcae3f210 Rename "fd1" variable ro "fd". There were previously two variables (fd1 and
rbultje
parents: 4640
diff changeset
1404 if (FD_ISSET(fd, &rfds)) {
4639
70321467b4f9 Reindent after r17777.
rbultje
parents: 4638
diff changeset
1405 ret = url_read(rtsp_st->rtp_handle, buf, buf_size);
70321467b4f9 Reindent after r17777.
rbultje
parents: 4638
diff changeset
1406 if (ret > 0) {
70321467b4f9 Reindent after r17777.
rbultje
parents: 4638
diff changeset
1407 *prtsp_st = rtsp_st;
70321467b4f9 Reindent after r17777.
rbultje
parents: 4638
diff changeset
1408 return ret;
70321467b4f9 Reindent after r17777.
rbultje
parents: 4638
diff changeset
1409 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1410 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1411 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1412 }
4772
fb0b1e68356c Allow (and parse) incoming server messages (notices) interleaved with TCP
rbultje
parents: 4745
diff changeset
1413 if (FD_ISSET(tcp_fd, &rfds)) {
fb0b1e68356c Allow (and parse) incoming server messages (notices) interleaved with TCP
rbultje
parents: 4745
diff changeset
1414 RTSPMessageHeader reply;
fb0b1e68356c Allow (and parse) incoming server messages (notices) interleaved with TCP
rbultje
parents: 4745
diff changeset
1415
fb0b1e68356c Allow (and parse) incoming server messages (notices) interleaved with TCP
rbultje
parents: 4745
diff changeset
1416 rtsp_read_reply(s, &reply, NULL, 0);
fb0b1e68356c Allow (and parse) incoming server messages (notices) interleaved with TCP
rbultje
parents: 4745
diff changeset
1417 /* XXX: parse message */
5112
85e0a9761818 Implement support for EOS as used by WMS and other RTSP servers that do not
rbultje
parents: 5013
diff changeset
1418 if (rt->state != RTSP_STATE_PLAYING)
85e0a9761818 Implement support for EOS as used by WMS and other RTSP servers that do not
rbultje
parents: 5013
diff changeset
1419 return 0;
4772
fb0b1e68356c Allow (and parse) incoming server messages (notices) interleaved with TCP
rbultje
parents: 4745
diff changeset
1420 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1421 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1422 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1423 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1424
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1425 static int rtsp_read_packet(AVFormatContext *s,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1426 AVPacket *pkt)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1427 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1428 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
1429 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
1430 int ret, len;
4182
313d987dd2b4 Increase buffer size for RTP packet data because some ASF streams use a
rbultje
parents: 4169
diff changeset
1431 uint8_t buf[10 * RTP_MAX_PACKET_LENGTH];
4877
940946a4569b Send dummy requests over the TCP connection (WMS wants GET_PARAMETER,
rbultje
parents: 4875
diff changeset
1432 RTSPMessageHeader reply1, *reply = &reply1;
940946a4569b Send dummy requests over the TCP connection (WMS wants GET_PARAMETER,
rbultje
parents: 4875
diff changeset
1433 char cmd[1024];
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1434
4166
1dbda91eaebd Allow subscription to any of the streams, not just the first, available in
rbultje
parents: 4165
diff changeset
1435 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
1436 int i;
4166
1dbda91eaebd Allow subscription to any of the streams, not just the first, available in
rbultje
parents: 4165
diff changeset
1437 enum AVDiscard cache[MAX_STREAMS];
3903
aeb79f68ba7e Implement a RDT-specific SET_PARAMETER command that subscribes to the
rbultje
parents: 3877
diff changeset
1438
4166
1dbda91eaebd Allow subscription to any of the streams, not just the first, available in
rbultje
parents: 4165
diff changeset
1439 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
1440 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
1441
1dbda91eaebd Allow subscription to any of the streams, not just the first, available in
rbultje
parents: 4165
diff changeset
1442 if (!rt->need_subscription) {
1dbda91eaebd Allow subscription to any of the streams, not just the first, available in
rbultje
parents: 4165
diff changeset
1443 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
1444 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
1445 av_strlcatf(cmd, sizeof(cmd),
1dbda91eaebd Allow subscription to any of the streams, not just the first, available in
rbultje
parents: 4165
diff changeset
1446 "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
1447 "Unsubscribe: %s\r\n",
1dbda91eaebd Allow subscription to any of the streams, not just the first, available in
rbultje
parents: 4165
diff changeset
1448 s->filename, rt->last_subscription);
1dbda91eaebd Allow subscription to any of the streams, not just the first, available in
rbultje
parents: 4165
diff changeset
1449 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
1450 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
1451 return AVERROR_INVALIDDATA;
1dbda91eaebd Allow subscription to any of the streams, not just the first, available in
rbultje
parents: 4165
diff changeset
1452 rt->need_subscription = 1;
1dbda91eaebd Allow subscription to any of the streams, not just the first, available in
rbultje
parents: 4165
diff changeset
1453 }
3903
aeb79f68ba7e Implement a RDT-specific SET_PARAMETER command that subscribes to the
rbultje
parents: 3877
diff changeset
1454 }
4166
1dbda91eaebd Allow subscription to any of the streams, not just the first, available in
rbultje
parents: 4165
diff changeset
1455
1dbda91eaebd Allow subscription to any of the streams, not just the first, available in
rbultje
parents: 4165
diff changeset
1456 if (rt->need_subscription) {
1dbda91eaebd Allow subscription to any of the streams, not just the first, available in
rbultje
parents: 4165
diff changeset
1457 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
1458
1dbda91eaebd Allow subscription to any of the streams, not just the first, available in
rbultje
parents: 4165
diff changeset
1459 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
1460 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
1461 rt->last_subscription[0] = 0;
3903
aeb79f68ba7e Implement a RDT-specific SET_PARAMETER command that subscribes to the
rbultje
parents: 3877
diff changeset
1462
4166
1dbda91eaebd Allow subscription to any of the streams, not just the first, available in
rbultje
parents: 4165
diff changeset
1463 snprintf(cmd, sizeof(cmd),
1dbda91eaebd Allow subscription to any of the streams, not just the first, available in
rbultje
parents: 4165
diff changeset
1464 "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
1465 "Subscribe: ",
1dbda91eaebd Allow subscription to any of the streams, not just the first, available in
rbultje
parents: 4165
diff changeset
1466 s->filename);
1dbda91eaebd Allow subscription to any of the streams, not just the first, available in
rbultje
parents: 4165
diff changeset
1467 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
1468 rule_nr = 0;
1dbda91eaebd Allow subscription to any of the streams, not just the first, available in
rbultje
parents: 4165
diff changeset
1469 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
1470 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
1471 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
1472 if (!first)
1dbda91eaebd Allow subscription to any of the streams, not just the first, available in
rbultje
parents: 4165
diff changeset
1473 av_strlcat(rt->last_subscription, ",",
1dbda91eaebd Allow subscription to any of the streams, not just the first, available in
rbultje
parents: 4165
diff changeset
1474 sizeof(rt->last_subscription));
1dbda91eaebd Allow subscription to any of the streams, not just the first, available in
rbultje
parents: 4165
diff changeset
1475 ff_rdt_subscribe_rule(
1dbda91eaebd Allow subscription to any of the streams, not just the first, available in
rbultje
parents: 4165
diff changeset
1476 rt->last_subscription,
1dbda91eaebd Allow subscription to any of the streams, not just the first, available in
rbultje
parents: 4165
diff changeset
1477 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
1478 first = 0;
1dbda91eaebd Allow subscription to any of the streams, not just the first, available in
rbultje
parents: 4165
diff changeset
1479 }
1dbda91eaebd Allow subscription to any of the streams, not just the first, available in
rbultje
parents: 4165
diff changeset
1480 rule_nr++;
1dbda91eaebd Allow subscription to any of the streams, not just the first, available in
rbultje
parents: 4165
diff changeset
1481 }
1dbda91eaebd Allow subscription to any of the streams, not just the first, available in
rbultje
parents: 4165
diff changeset
1482 }
1dbda91eaebd Allow subscription to any of the streams, not just the first, available in
rbultje
parents: 4165
diff changeset
1483 }
1dbda91eaebd Allow subscription to any of the streams, not just the first, available in
rbultje
parents: 4165
diff changeset
1484 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
1485 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
1486 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
1487 return AVERROR_INVALIDDATA;
1dbda91eaebd Allow subscription to any of the streams, not just the first, available in
rbultje
parents: 4165
diff changeset
1488 rt->need_subscription = 0;
1dbda91eaebd Allow subscription to any of the streams, not just the first, available in
rbultje
parents: 4165
diff changeset
1489
1dbda91eaebd Allow subscription to any of the streams, not just the first, available in
rbultje
parents: 4165
diff changeset
1490 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
1491 rtsp_read_play (s);
1dbda91eaebd Allow subscription to any of the streams, not just the first, available in
rbultje
parents: 4165
diff changeset
1492 }
3903
aeb79f68ba7e Implement a RDT-specific SET_PARAMETER command that subscribes to the
rbultje
parents: 3877
diff changeset
1493 }
aeb79f68ba7e Implement a RDT-specific SET_PARAMETER command that subscribes to the
rbultje
parents: 3877
diff changeset
1494
294
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 229
diff changeset
1495 /* get next frames from the same RTP packet */
4386
3dbd7fa2c2af Rename "tx_ctx" and "cur_tx" variables to "transport_priv" and
rbultje
parents: 4361
diff changeset
1496 if (rt->cur_transport_priv) {
3960
13e9b0d3a314 Implement a RTSPTransport field, which allows proper separation of server
rbultje
parents: 3959
diff changeset
1497 if (rt->transport == RTSP_TRANSPORT_RDT)
4386
3dbd7fa2c2af Rename "tx_ctx" and "cur_tx" variables to "transport_priv" and
rbultje
parents: 4361
diff changeset
1498 ret = ff_rdt_parse_packet(rt->cur_transport_priv, pkt, NULL, 0);
3905
91987686113d Implement RDT-specific data parsing routines. After these changes, simple
rbultje
parents: 3904
diff changeset
1499 else
4386
3dbd7fa2c2af Rename "tx_ctx" and "cur_tx" variables to "transport_priv" and
rbultje
parents: 4361
diff changeset
1500 ret = rtp_parse_packet(rt->cur_transport_priv, 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
1501 if (ret == 0) {
4386
3dbd7fa2c2af Rename "tx_ctx" and "cur_tx" variables to "transport_priv" and
rbultje
parents: 4361
diff changeset
1502 rt->cur_transport_priv = NULL;
294
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 229
diff changeset
1503 return 0;
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 229
diff changeset
1504 } 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
1505 return 0;
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 229
diff changeset
1506 } else {
4386
3dbd7fa2c2af Rename "tx_ctx" and "cur_tx" variables to "transport_priv" and
rbultje
parents: 4361
diff changeset
1507 rt->cur_transport_priv = NULL;
294
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 229
diff changeset
1508 }
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 229
diff changeset
1509 }
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 229
diff changeset
1510
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 229
diff changeset
1511 /* 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
1512 redo:
3957
9f943bb755f9 Rename RTSPProtocol to RTSPLowerTransport, so that its name properly tells us
rbultje
parents: 3941
diff changeset
1513 switch(rt->lower_transport) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1514 default:
3957
9f943bb755f9 Rename RTSPProtocol to RTSPLowerTransport, so that its name properly tells us
rbultje
parents: 3941
diff changeset
1515 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
1516 len = tcp_read_packet(s, &rtsp_st, buf, sizeof(buf));
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1517 break;
3957
9f943bb755f9 Rename RTSPProtocol to RTSPLowerTransport, so that its name properly tells us
rbultje
parents: 3941
diff changeset
1518 case RTSP_LOWER_TRANSPORT_UDP:
9f943bb755f9 Rename RTSPProtocol to RTSPLowerTransport, so that its name properly tells us
rbultje
parents: 3941
diff changeset
1519 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
1520 len = udp_read_packet(s, &rtsp_st, buf, sizeof(buf));
4386
3dbd7fa2c2af Rename "tx_ctx" and "cur_tx" variables to "transport_priv" and
rbultje
parents: 4361
diff changeset
1521 if (len >=0 && rtsp_st->transport_priv && rt->transport == RTSP_TRANSPORT_RTP)
3dbd7fa2c2af Rename "tx_ctx" and "cur_tx" variables to "transport_priv" and
rbultje
parents: 4361
diff changeset
1522 rtp_check_and_send_back_rr(rtsp_st->transport_priv, len);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1523 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1524 }
294
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 229
diff changeset
1525 if (len < 0)
2775
1301147d9450 Make av_read_frame with rtsp client return EINTR on interrupt
lu_zero
parents: 2772
diff changeset
1526 return len;
5112
85e0a9761818 Implement support for EOS as used by WMS and other RTSP servers that do not
rbultje
parents: 5013
diff changeset
1527 if (len == 0)
85e0a9761818 Implement support for EOS as used by WMS and other RTSP servers that do not
rbultje
parents: 5013
diff changeset
1528 return AVERROR_EOF;
3960
13e9b0d3a314 Implement a RTSPTransport field, which allows proper separation of server
rbultje
parents: 3959
diff changeset
1529 if (rt->transport == RTSP_TRANSPORT_RDT)
4386
3dbd7fa2c2af Rename "tx_ctx" and "cur_tx" variables to "transport_priv" and
rbultje
parents: 4361
diff changeset
1530 ret = ff_rdt_parse_packet(rtsp_st->transport_priv, pkt, buf, len);
3905
91987686113d Implement RDT-specific data parsing routines. After these changes, simple
rbultje
parents: 3904
diff changeset
1531 else
4386
3dbd7fa2c2af Rename "tx_ctx" and "cur_tx" variables to "transport_priv" and
rbultje
parents: 4361
diff changeset
1532 ret = rtp_parse_packet(rtsp_st->transport_priv, 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
1533 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
1534 goto redo;
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 229
diff changeset
1535 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
1536 /* more packets may follow, so we save the RTP context */
4386
3dbd7fa2c2af Rename "tx_ctx" and "cur_tx" variables to "transport_priv" and
rbultje
parents: 4361
diff changeset
1537 rt->cur_transport_priv = rtsp_st->transport_priv;
294
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 229
diff changeset
1538 }
4877
940946a4569b Send dummy requests over the TCP connection (WMS wants GET_PARAMETER,
rbultje
parents: 4875
diff changeset
1539
940946a4569b Send dummy requests over the TCP connection (WMS wants GET_PARAMETER,
rbultje
parents: 4875
diff changeset
1540 /* send dummy request to keep TCP connection alive */
940946a4569b Send dummy requests over the TCP connection (WMS wants GET_PARAMETER,
rbultje
parents: 4875
diff changeset
1541 if ((rt->server_type == RTSP_SERVER_WMS ||
940946a4569b Send dummy requests over the TCP connection (WMS wants GET_PARAMETER,
rbultje
parents: 4875
diff changeset
1542 rt->server_type == RTSP_SERVER_REAL) &&
940946a4569b Send dummy requests over the TCP connection (WMS wants GET_PARAMETER,
rbultje
parents: 4875
diff changeset
1543 (av_gettime() - rt->last_cmd_time) / 1000000 >= rt->timeout / 2) {
940946a4569b Send dummy requests over the TCP connection (WMS wants GET_PARAMETER,
rbultje
parents: 4875
diff changeset
1544 if (rt->server_type == RTSP_SERVER_WMS) {
940946a4569b Send dummy requests over the TCP connection (WMS wants GET_PARAMETER,
rbultje
parents: 4875
diff changeset
1545 snprintf(cmd, sizeof(cmd) - 1,
940946a4569b Send dummy requests over the TCP connection (WMS wants GET_PARAMETER,
rbultje
parents: 4875
diff changeset
1546 "GET_PARAMETER %s RTSP/1.0\r\n",
940946a4569b Send dummy requests over the TCP connection (WMS wants GET_PARAMETER,
rbultje
parents: 4875
diff changeset
1547 s->filename);
940946a4569b Send dummy requests over the TCP connection (WMS wants GET_PARAMETER,
rbultje
parents: 4875
diff changeset
1548 rtsp_send_cmd_async(s, cmd, reply, NULL);
940946a4569b Send dummy requests over the TCP connection (WMS wants GET_PARAMETER,
rbultje
parents: 4875
diff changeset
1549 } else {
940946a4569b Send dummy requests over the TCP connection (WMS wants GET_PARAMETER,
rbultje
parents: 4875
diff changeset
1550 rtsp_send_cmd_async(s, "OPTIONS * RTSP/1.0\r\n",
940946a4569b Send dummy requests over the TCP connection (WMS wants GET_PARAMETER,
rbultje
parents: 4875
diff changeset
1551 reply, NULL);
940946a4569b Send dummy requests over the TCP connection (WMS wants GET_PARAMETER,
rbultje
parents: 4875
diff changeset
1552 }
940946a4569b Send dummy requests over the TCP connection (WMS wants GET_PARAMETER,
rbultje
parents: 4875
diff changeset
1553 }
940946a4569b Send dummy requests over the TCP connection (WMS wants GET_PARAMETER,
rbultje
parents: 4875
diff changeset
1554
294
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 229
diff changeset
1555 return 0;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1556 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1557
304
d58c8859ff8c initial seek support - more generic play/pause support
bellard
parents: 294
diff changeset
1558 static int rtsp_read_play(AVFormatContext *s)
179
43ac45200138 suppressed RTSP abort hack - added PLAY/PAUSE
bellard
parents: 172
diff changeset
1559 {
304
d58c8859ff8c initial seek support - more generic play/pause support
bellard
parents: 294
diff changeset
1560 RTSPState *rt = s->priv_data;
4557
bfe6fb676d46 Rename RTSPHeader to RTSPMessageHeader to reflect more clearly what the
rbultje
parents: 4549
diff changeset
1561 RTSPMessageHeader reply1, *reply = &reply1;
179
43ac45200138 suppressed RTSP abort hack - added PLAY/PAUSE
bellard
parents: 172
diff changeset
1562 char cmd[1024];
43ac45200138 suppressed RTSP abort hack - added PLAY/PAUSE
bellard
parents: 172
diff changeset
1563
370
845f9de2c883 av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 304
diff changeset
1564 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
1565
3923
83e51bcb03c2 Rename RTSP_SERVER_RDT to RTSP_SERVER_REAL, because RDT (the transport
rbultje
parents: 3920
diff changeset
1566 if (!(rt->server_type == RTSP_SERVER_REAL && rt->need_subscription)) {
3904
52e586c04402 Reindent after previous patch.
rbultje
parents: 3903
diff changeset
1567 if (rt->state == RTSP_STATE_PAUSED) {
52e586c04402 Reindent after previous patch.
rbultje
parents: 3903
diff changeset
1568 snprintf(cmd, sizeof(cmd),
52e586c04402 Reindent after previous patch.
rbultje
parents: 3903
diff changeset
1569 "PLAY %s RTSP/1.0\r\n",
52e586c04402 Reindent after previous patch.
rbultje
parents: 3903
diff changeset
1570 s->filename);
52e586c04402 Reindent after previous patch.
rbultje
parents: 3903
diff changeset
1571 } else {
52e586c04402 Reindent after previous patch.
rbultje
parents: 3903
diff changeset
1572 snprintf(cmd, sizeof(cmd),
52e586c04402 Reindent after previous patch.
rbultje
parents: 3903
diff changeset
1573 "PLAY %s RTSP/1.0\r\n"
52e586c04402 Reindent after previous patch.
rbultje
parents: 3903
diff changeset
1574 "Range: npt=%0.3f-\r\n",
52e586c04402 Reindent after previous patch.
rbultje
parents: 3903
diff changeset
1575 s->filename,
52e586c04402 Reindent after previous patch.
rbultje
parents: 3903
diff changeset
1576 (double)rt->seek_timestamp / AV_TIME_BASE);
52e586c04402 Reindent after previous patch.
rbultje
parents: 3903
diff changeset
1577 }
52e586c04402 Reindent after previous patch.
rbultje
parents: 3903
diff changeset
1578 rtsp_send_cmd(s, cmd, reply, NULL);
52e586c04402 Reindent after previous patch.
rbultje
parents: 3903
diff changeset
1579 if (reply->status_code != RTSP_STATUS_OK) {
52e586c04402 Reindent after previous patch.
rbultje
parents: 3903
diff changeset
1580 return -1;
52e586c04402 Reindent after previous patch.
rbultje
parents: 3903
diff changeset
1581 }
3903
aeb79f68ba7e Implement a RDT-specific SET_PARAMETER command that subscribes to the
rbultje
parents: 3877
diff changeset
1582 }
3861
a0098594ab90 Remove useless "else" case in if X { A; return }; else { B }. See discussion
rbultje
parents: 3860
diff changeset
1583 rt->state = RTSP_STATE_PLAYING;
a0098594ab90 Remove useless "else" case in if X { A; return }; else { B }. See discussion
rbultje
parents: 3860
diff changeset
1584 return 0;
304
d58c8859ff8c initial seek support - more generic play/pause support
bellard
parents: 294
diff changeset
1585 }
d58c8859ff8c initial seek support - more generic play/pause support
bellard
parents: 294
diff changeset
1586
d58c8859ff8c initial seek support - more generic play/pause support
bellard
parents: 294
diff changeset
1587 /* pause the stream */
d58c8859ff8c initial seek support - more generic play/pause support
bellard
parents: 294
diff changeset
1588 static int rtsp_read_pause(AVFormatContext *s)
d58c8859ff8c initial seek support - more generic play/pause support
bellard
parents: 294
diff changeset
1589 {
d58c8859ff8c initial seek support - more generic play/pause support
bellard
parents: 294
diff changeset
1590 RTSPState *rt = s->priv_data;
4557
bfe6fb676d46 Rename RTSPHeader to RTSPMessageHeader to reflect more clearly what the
rbultje
parents: 4549
diff changeset
1591 RTSPMessageHeader reply1, *reply = &reply1;
304
d58c8859ff8c initial seek support - more generic play/pause support
bellard
parents: 294
diff changeset
1592 char cmd[1024];
d58c8859ff8c initial seek support - more generic play/pause support
bellard
parents: 294
diff changeset
1593
179
43ac45200138 suppressed RTSP abort hack - added PLAY/PAUSE
bellard
parents: 172
diff changeset
1594 rt = s->priv_data;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 820
diff changeset
1595
304
d58c8859ff8c initial seek support - more generic play/pause support
bellard
parents: 294
diff changeset
1596 if (rt->state != RTSP_STATE_PLAYING)
d58c8859ff8c initial seek support - more generic play/pause support
bellard
parents: 294
diff changeset
1597 return 0;
3923
83e51bcb03c2 Rename RTSP_SERVER_RDT to RTSP_SERVER_REAL, because RDT (the transport
rbultje
parents: 3920
diff changeset
1598 else if (!(rt->server_type == RTSP_SERVER_REAL && rt->need_subscription)) {
3904
52e586c04402 Reindent after previous patch.
rbultje
parents: 3903
diff changeset
1599 snprintf(cmd, sizeof(cmd),
52e586c04402 Reindent after previous patch.
rbultje
parents: 3903
diff changeset
1600 "PAUSE %s RTSP/1.0\r\n",
52e586c04402 Reindent after previous patch.
rbultje
parents: 3903
diff changeset
1601 s->filename);
52e586c04402 Reindent after previous patch.
rbultje
parents: 3903
diff changeset
1602 rtsp_send_cmd(s, cmd, reply, NULL);
52e586c04402 Reindent after previous patch.
rbultje
parents: 3903
diff changeset
1603 if (reply->status_code != RTSP_STATUS_OK) {
52e586c04402 Reindent after previous patch.
rbultje
parents: 3903
diff changeset
1604 return -1;
52e586c04402 Reindent after previous patch.
rbultje
parents: 3903
diff changeset
1605 }
3903
aeb79f68ba7e Implement a RDT-specific SET_PARAMETER command that subscribes to the
rbultje
parents: 3877
diff changeset
1606 }
3861
a0098594ab90 Remove useless "else" case in if X { A; return }; else { B }. See discussion
rbultje
parents: 3860
diff changeset
1607 rt->state = RTSP_STATE_PAUSED;
a0098594ab90 Remove useless "else" case in if X { A; return }; else { B }. See discussion
rbultje
parents: 3860
diff changeset
1608 return 0;
179
43ac45200138 suppressed RTSP abort hack - added PLAY/PAUSE
bellard
parents: 172
diff changeset
1609 }
43ac45200138 suppressed RTSP abort hack - added PLAY/PAUSE
bellard
parents: 172
diff changeset
1610
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 820
diff changeset
1611 static int rtsp_read_seek(AVFormatContext *s, int stream_index,
558
89bd76208427 100l (forgoten seeking functions)
michael
parents: 511
diff changeset
1612 int64_t timestamp, int flags)
179
43ac45200138 suppressed RTSP abort hack - added PLAY/PAUSE
bellard
parents: 172
diff changeset
1613 {
304
d58c8859ff8c initial seek support - more generic play/pause support
bellard
parents: 294
diff changeset
1614 RTSPState *rt = s->priv_data;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 820
diff changeset
1615
2408
a32ac90d5d67 Use correct timescale in RTSP seeking
lucabe
parents: 2274
diff changeset
1616 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
1617 switch(rt->state) {
d58c8859ff8c initial seek support - more generic play/pause support
bellard
parents: 294
diff changeset
1618 default:
d58c8859ff8c initial seek support - more generic play/pause support
bellard
parents: 294
diff changeset
1619 case RTSP_STATE_IDLE:
d58c8859ff8c initial seek support - more generic play/pause support
bellard
parents: 294
diff changeset
1620 break;
d58c8859ff8c initial seek support - more generic play/pause support
bellard
parents: 294
diff changeset
1621 case RTSP_STATE_PLAYING:
5013
43d99d0e12e0 Support seeking as defined by the rfc
lu_zero
parents: 5004
diff changeset
1622 if (rtsp_read_pause(s) != 0)
43d99d0e12e0 Support seeking as defined by the rfc
lu_zero
parents: 5004
diff changeset
1623 return -1;
43d99d0e12e0 Support seeking as defined by the rfc
lu_zero
parents: 5004
diff changeset
1624 rt->state = RTSP_STATE_SEEKING;
304
d58c8859ff8c initial seek support - more generic play/pause support
bellard
parents: 294
diff changeset
1625 if (rtsp_read_play(s) != 0)
d58c8859ff8c initial seek support - more generic play/pause support
bellard
parents: 294
diff changeset
1626 return -1;
d58c8859ff8c initial seek support - more generic play/pause support
bellard
parents: 294
diff changeset
1627 break;
d58c8859ff8c initial seek support - more generic play/pause support
bellard
parents: 294
diff changeset
1628 case RTSP_STATE_PAUSED:
d58c8859ff8c initial seek support - more generic play/pause support
bellard
parents: 294
diff changeset
1629 rt->state = RTSP_STATE_IDLE;
d58c8859ff8c initial seek support - more generic play/pause support
bellard
parents: 294
diff changeset
1630 break;
179
43ac45200138 suppressed RTSP abort hack - added PLAY/PAUSE
bellard
parents: 172
diff changeset
1631 }
304
d58c8859ff8c initial seek support - more generic play/pause support
bellard
parents: 294
diff changeset
1632 return 0;
179
43ac45200138 suppressed RTSP abort hack - added PLAY/PAUSE
bellard
parents: 172
diff changeset
1633 }
43ac45200138 suppressed RTSP abort hack - added PLAY/PAUSE
bellard
parents: 172
diff changeset
1634
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1635 static int rtsp_read_close(AVFormatContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1636 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1637 RTSPState *rt = s->priv_data;
4557
bfe6fb676d46 Rename RTSPHeader to RTSPMessageHeader to reflect more clearly what the
rbultje
parents: 4549
diff changeset
1638 RTSPMessageHeader reply1, *reply = &reply1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1639 char cmd[1024];
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1640
172
9a0ab557b159 fixed RTP/TCP client support
bellard
parents: 64
diff changeset
1641 #if 0
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1642 /* 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
1643 if (rt->lower_transport == RTSP_LOWER_TRANSPORT_TCP) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1644 url_fclose(&rt->rtsp_gb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1645 }
172
9a0ab557b159 fixed RTP/TCP client support
bellard
parents: 64
diff changeset
1646 #endif
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 820
diff changeset
1647 snprintf(cmd, sizeof(cmd),
172
9a0ab557b159 fixed RTP/TCP client support
bellard
parents: 64
diff changeset
1648 "TEARDOWN %s RTSP/1.0\r\n",
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1649 s->filename);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1650 rtsp_send_cmd(s, cmd, reply, NULL);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1651
294
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 229
diff changeset
1652 rtsp_close_streams(rt);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1653 url_close(rt->rtsp_hd);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1654 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1655 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1656
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4201
diff changeset
1657 #if CONFIG_RTSP_DEMUXER
1167
d89d7ef290da give AVInput/OutputFormat structs consistent names
mru
parents: 1124
diff changeset
1658 AVInputFormat rtsp_demuxer = {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1659 "rtsp",
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3286
diff changeset
1660 NULL_IF_CONFIG_SMALL("RTSP input format"),
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1661 sizeof(RTSPState),
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1662 rtsp_probe,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1663 rtsp_read_header,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1664 rtsp_read_packet,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1665 rtsp_read_close,
304
d58c8859ff8c initial seek support - more generic play/pause support
bellard
parents: 294
diff changeset
1666 rtsp_read_seek,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1667 .flags = AVFMT_NOFILE,
304
d58c8859ff8c initial seek support - more generic play/pause support
bellard
parents: 294
diff changeset
1668 .read_play = rtsp_read_play,
d58c8859ff8c initial seek support - more generic play/pause support
bellard
parents: 294
diff changeset
1669 .read_pause = rtsp_read_pause,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1670 };
2054
9f93361c3dc2 Don't compile RTSP_DEMUXER if not requested
alex
parents: 2053
diff changeset
1671 #endif
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1672
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1673 static int sdp_probe(AVProbeData *p1)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1674 {
706
fc254f396f15 buffer overflow in sdp_probe() fix by (Gildas Bazin )gbazin altern org)
michael
parents: 587
diff changeset
1675 const char *p = p1->buf, *p_end = p1->buf + p1->buf_size;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1676
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1677 /* 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
1678 while (p < p_end && *p != '\0') {
2193
5ce5fad0dfac replace the uses of old string functions that Reimar missed
mru
parents: 2189
diff changeset
1679 if (p + sizeof("c=IN IP4") - 1 < p_end && av_strstart(p, "c=IN IP4", NULL))
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1680 return AVPROBE_SCORE_MAX / 2;
706
fc254f396f15 buffer overflow in sdp_probe() fix by (Gildas Bazin )gbazin altern org)
michael
parents: 587
diff changeset
1681
fc254f396f15 buffer overflow in sdp_probe() fix by (Gildas Bazin )gbazin altern org)
michael
parents: 587
diff changeset
1682 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
1683 if (++p >= p_end)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1684 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1685 if (*p == '\r')
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1686 p++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1687 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1688 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1689 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1690
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1691 #define SDP_MAX_SIZE 8192
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1692
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1693 static int sdp_read_header(AVFormatContext *s,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1694 AVFormatParameters *ap)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1695 {
294
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 229
diff changeset
1696 RTSPState *rt = s->priv_data;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1697 RTSPStream *rtsp_st;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1698 int size, i, err;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1699 char *content;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1700 char url[1024];
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1701
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1702 /* read the whole sdp file */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1703 /* XXX: better loading */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1704 content = av_malloc(SDP_MAX_SIZE);
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2759
diff changeset
1705 size = get_buffer(s->pb, content, SDP_MAX_SIZE - 1);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1706 if (size <= 0) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1707 av_free(content);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1708 return AVERROR_INVALIDDATA;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1709 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1710 content[size] ='\0';
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1711
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1712 sdp_parse(s, content);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1713 av_free(content);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1714
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1715 /* 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
1716 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
1717 rtsp_st = rt->rtsp_streams[i];
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 820
diff changeset
1718
3222
47e0fbaba376 Fix receiving from SDP with unicast destinations
lucabe
parents: 3221
diff changeset
1719 snprintf(url, sizeof(url), "rtp://%s:%d?localport=%d&ttl=%d",
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 820
diff changeset
1720 inet_ntoa(rtsp_st->sdp_ip),
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1721 rtsp_st->sdp_port,
3222
47e0fbaba376 Fix receiving from SDP with unicast destinations
lucabe
parents: 3221
diff changeset
1722 rtsp_st->sdp_port,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1723 rtsp_st->sdp_ttl);
1425
00d9393a126f make ffmpeg able to send back a RTCP receiver report.
gpoirier
parents: 1424
diff changeset
1724 if (url_open(&rtsp_st->rtp_handle, url, URL_RDWR) < 0) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1725 err = AVERROR_INVALIDDATA;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1726 goto fail;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1727 }
3919
1879eab34f88 Factorize out common code for opening of the RTP parsing context between
rbultje
parents: 3905
diff changeset
1728 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
1729 goto fail;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1730 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1731 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1732 fail:
294
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 229
diff changeset
1733 rtsp_close_streams(rt);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1734 return err;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1735 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1736
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1737 static int sdp_read_packet(AVFormatContext *s,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1738 AVPacket *pkt)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1739 {
294
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 229
diff changeset
1740 return rtsp_read_packet(s, pkt);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1741 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1742
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1743 static int sdp_read_close(AVFormatContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1744 {
294
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 229
diff changeset
1745 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
1746 rtsp_close_streams(rt);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1747 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1748 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1749
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4201
diff changeset
1750 #if CONFIG_SDP_DEMUXER
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
1751 AVInputFormat sdp_demuxer = {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1752 "sdp",
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3286
diff changeset
1753 NULL_IF_CONFIG_SMALL("SDP"),
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1754 sizeof(RTSPState),
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1755 sdp_probe,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1756 sdp_read_header,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1757 sdp_read_packet,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1758 sdp_read_close,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1759 };
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
1760 #endif
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1761
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4201
diff changeset
1762 #if CONFIG_REDIR_DEMUXER
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1763 /* dummy redirector format (used directly in av_open_input_file now) */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1764 static int redir_probe(AVProbeData *pd)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1765 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1766 const char *p;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1767 p = pd->buf;
4774
beca7e13cc3f Use skip_spaces() in the "redir" demuxer instead of "while (isspace(&p)) p++".
rbultje
parents: 4773
diff changeset
1768 skip_spaces(&p);
2193
5ce5fad0dfac replace the uses of old string functions that Reimar missed
mru
parents: 2189
diff changeset
1769 if (av_strstart(p, "http://", NULL) ||
5ce5fad0dfac replace the uses of old string functions that Reimar missed
mru
parents: 2189
diff changeset
1770 av_strstart(p, "rtsp://", NULL))
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1771 return AVPROBE_SCORE_MAX;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1772 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1773 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1774
2785
d3b3cfb538d8 Suppress the "redirector hack" from libavformat/utils.c:av_open_input_stream(),
lucabe
parents: 2775
diff changeset
1775 static int redir_read_header(AVFormatContext *s, AVFormatParameters *ap)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1776 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1777 char buf[4096], *q;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1778 int c;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1779 AVFormatContext *ic = NULL;
2785
d3b3cfb538d8 Suppress the "redirector hack" from libavformat/utils.c:av_open_input_stream(),
lucabe
parents: 2775
diff changeset
1780 ByteIOContext *f = s->pb;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1781
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1782 /* parse each URL and try to open it */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1783 c = url_fgetc(f);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1784 while (c != URL_EOF) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1785 /* skip spaces */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1786 for(;;) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1787 if (!redir_isspace(c))
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1788 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1789 c = url_fgetc(f);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1790 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1791 if (c == URL_EOF)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1792 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1793 /* record url */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1794 q = buf;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1795 for(;;) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1796 if (c == URL_EOF || redir_isspace(c))
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1797 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1798 if ((q - buf) < sizeof(buf) - 1)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1799 *q++ = c;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1800 c = url_fgetc(f);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1801 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1802 *q = '\0';
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1803 //printf("URL='%s'\n", buf);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1804 /* try to open the media file */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1805 if (av_open_input_file(&ic, buf, NULL, 0, NULL) == 0)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1806 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1807 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1808 if (!ic)
2274
b21c2af60bc9 Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents: 2273
diff changeset
1809 return AVERROR(EIO);
2785
d3b3cfb538d8 Suppress the "redirector hack" from libavformat/utils.c:av_open_input_stream(),
lucabe
parents: 2775
diff changeset
1810
d3b3cfb538d8 Suppress the "redirector hack" from libavformat/utils.c:av_open_input_stream(),
lucabe
parents: 2775
diff changeset
1811 *s = *ic;
d3b3cfb538d8 Suppress the "redirector hack" from libavformat/utils.c:av_open_input_stream(),
lucabe
parents: 2775
diff changeset
1812 url_fclose(f);
d3b3cfb538d8 Suppress the "redirector hack" from libavformat/utils.c:av_open_input_stream(),
lucabe
parents: 2775
diff changeset
1813
d3b3cfb538d8 Suppress the "redirector hack" from libavformat/utils.c:av_open_input_stream(),
lucabe
parents: 2775
diff changeset
1814 return 0;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1815 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1816
1167
d89d7ef290da give AVInput/OutputFormat structs consistent names
mru
parents: 1124
diff changeset
1817 AVInputFormat redir_demuxer = {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1818 "redir",
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3286
diff changeset
1819 NULL_IF_CONFIG_SMALL("Redirector format"),
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1820 0,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1821 redir_probe,
2785
d3b3cfb538d8 Suppress the "redirector hack" from libavformat/utils.c:av_open_input_stream(),
lucabe
parents: 2775
diff changeset
1822 redir_read_header,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1823 NULL,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1824 NULL,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1825 };
2053
4611fce2f394 properly compile code for REDIR_DEMUXER
alex
parents: 2048
diff changeset
1826 #endif