annotate rtspenc.c @ 5854:3dc78fb78b2a libavformat

Fix erroneous behaviour when format probe hits end of file If the format probe hits end of file, do not add the error code to the buffer position. This is obviously wrong, and with a small input file would cause a negative buffer overflow. Fixes issue 1818.
author mru
date Tue, 16 Mar 2010 21:45:30 +0000
parents d04ce2be0081
children 0ff0826b6c3d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5695
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
1 /*
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
2 * RTSP muxer
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
3 * Copyright (c) 2010 Martin Storsjo
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
4 *
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
5 * This file is part of FFmpeg.
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
6 *
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
7 * FFmpeg is free software; you can redistribute it and/or
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
8 * modify it under the terms of the GNU Lesser General Public
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
9 * License as published by the Free Software Foundation; either
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
10 * version 2.1 of the License, or (at your option) any later version.
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
11 *
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
12 * FFmpeg is distributed in the hope that it will be useful,
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
15 * Lesser General Public License for more details.
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
16 *
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
17 * You should have received a copy of the GNU Lesser General Public
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
18 * License along with FFmpeg; if not, write to the Free Software
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
20 */
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
21
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
22 #include "avformat.h"
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
23
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
24 #include <sys/time.h>
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
25 #if HAVE_SYS_SELECT_H
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
26 #include <sys/select.h>
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
27 #endif
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
28 #include "network.h"
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
29 #include "rtsp.h"
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
30
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
31 static int rtsp_write_record(AVFormatContext *s)
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
32 {
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
33 RTSPState *rt = s->priv_data;
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
34 RTSPMessageHeader reply1, *reply = &reply1;
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
35 char cmd[1024];
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
36
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
37 snprintf(cmd, sizeof(cmd),
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
38 "RECORD %s RTSP/1.0\r\n"
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
39 "Range: npt=%0.3f-\r\n",
5800
4410bccf6a8a Use rt->control_uri consequently instead of s->filename in all RTSP commands
mstorsjo
parents: 5756
diff changeset
40 rt->control_uri,
5695
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
41 (double) 0);
5697
484fceabfad2 Prefix non-static RTSP functions with ff_.
rbultje
parents: 5695
diff changeset
42 ff_rtsp_send_cmd(s, cmd, reply, NULL);
5695
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
43 if (reply->status_code != RTSP_STATUS_OK)
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
44 return -1;
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
45 rt->state = RTSP_STATE_STREAMING;
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
46 return 0;
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
47 }
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
48
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
49 static int rtsp_write_header(AVFormatContext *s)
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
50 {
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
51 RTSPState *rt = s->priv_data;
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
52 int ret;
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
53
5697
484fceabfad2 Prefix non-static RTSP functions with ff_.
rbultje
parents: 5695
diff changeset
54 ret = ff_rtsp_connect(s);
5695
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
55 if (ret)
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
56 return ret;
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
57
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
58 if (rtsp_write_record(s) < 0) {
5697
484fceabfad2 Prefix non-static RTSP functions with ff_.
rbultje
parents: 5695
diff changeset
59 ff_rtsp_close_streams(s);
5695
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
60 url_close(rt->rtsp_hd);
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
61 return AVERROR_INVALIDDATA;
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
62 }
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
63 return 0;
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
64 }
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
65
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
66 static int rtsp_write_packet(AVFormatContext *s, AVPacket *pkt)
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
67 {
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
68 RTSPState *rt = s->priv_data;
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
69 RTSPStream *rtsp_st;
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
70 fd_set rfds;
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
71 int n, tcp_fd;
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
72 struct timeval tv;
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
73 AVFormatContext *rtpctx;
5721
82b0dc4f052a RTSP muxer: Use a local copy of the AVPacket for sending to the chained muxer
mstorsjo
parents: 5697
diff changeset
74 AVPacket local_pkt;
5846
6821f3887d0e Don't let ff_rtsp_read_reply skip interleaved RTP/TCP packets in rtsp_write_packet.
mstorsjo
parents: 5800
diff changeset
75 int ret;
5695
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
76
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
77 tcp_fd = url_get_file_handle(rt->rtsp_hd);
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
78
5846
6821f3887d0e Don't let ff_rtsp_read_reply skip interleaved RTP/TCP packets in rtsp_write_packet.
mstorsjo
parents: 5800
diff changeset
79 while (1) {
6821f3887d0e Don't let ff_rtsp_read_reply skip interleaved RTP/TCP packets in rtsp_write_packet.
mstorsjo
parents: 5800
diff changeset
80 FD_ZERO(&rfds);
6821f3887d0e Don't let ff_rtsp_read_reply skip interleaved RTP/TCP packets in rtsp_write_packet.
mstorsjo
parents: 5800
diff changeset
81 FD_SET(tcp_fd, &rfds);
5847
d04ce2be0081 Reindent
mstorsjo
parents: 5846
diff changeset
82 tv.tv_sec = 0;
d04ce2be0081 Reindent
mstorsjo
parents: 5846
diff changeset
83 tv.tv_usec = 0;
d04ce2be0081 Reindent
mstorsjo
parents: 5846
diff changeset
84 n = select(tcp_fd + 1, &rfds, NULL, NULL, &tv);
5846
6821f3887d0e Don't let ff_rtsp_read_reply skip interleaved RTP/TCP packets in rtsp_write_packet.
mstorsjo
parents: 5800
diff changeset
85 if (n <= 0)
6821f3887d0e Don't let ff_rtsp_read_reply skip interleaved RTP/TCP packets in rtsp_write_packet.
mstorsjo
parents: 5800
diff changeset
86 break;
5695
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
87 if (FD_ISSET(tcp_fd, &rfds)) {
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
88 RTSPMessageHeader reply;
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
89
5846
6821f3887d0e Don't let ff_rtsp_read_reply skip interleaved RTP/TCP packets in rtsp_write_packet.
mstorsjo
parents: 5800
diff changeset
90 /* Don't let ff_rtsp_read_reply handle interleaved packets,
6821f3887d0e Don't let ff_rtsp_read_reply skip interleaved RTP/TCP packets in rtsp_write_packet.
mstorsjo
parents: 5800
diff changeset
91 * since it would block and wait for an RTSP reply on the socket
6821f3887d0e Don't let ff_rtsp_read_reply skip interleaved RTP/TCP packets in rtsp_write_packet.
mstorsjo
parents: 5800
diff changeset
92 * (which may not be coming any time soon) if it handles
6821f3887d0e Don't let ff_rtsp_read_reply skip interleaved RTP/TCP packets in rtsp_write_packet.
mstorsjo
parents: 5800
diff changeset
93 * interleaved packets internally. */
6821f3887d0e Don't let ff_rtsp_read_reply skip interleaved RTP/TCP packets in rtsp_write_packet.
mstorsjo
parents: 5800
diff changeset
94 ret = ff_rtsp_read_reply(s, &reply, NULL, 1);
6821f3887d0e Don't let ff_rtsp_read_reply skip interleaved RTP/TCP packets in rtsp_write_packet.
mstorsjo
parents: 5800
diff changeset
95 if (ret < 0)
5695
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
96 return AVERROR(EPIPE);
5846
6821f3887d0e Don't let ff_rtsp_read_reply skip interleaved RTP/TCP packets in rtsp_write_packet.
mstorsjo
parents: 5800
diff changeset
97 if (ret == 1)
6821f3887d0e Don't let ff_rtsp_read_reply skip interleaved RTP/TCP packets in rtsp_write_packet.
mstorsjo
parents: 5800
diff changeset
98 ff_rtsp_skip_packet(s);
5695
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
99 /* XXX: parse message */
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
100 if (rt->state != RTSP_STATE_STREAMING)
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
101 return AVERROR(EPIPE);
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
102 }
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
103 }
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
104
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
105 if (pkt->stream_index < 0 || pkt->stream_index >= rt->nb_rtsp_streams)
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
106 return AVERROR_INVALIDDATA;
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
107 rtsp_st = rt->rtsp_streams[pkt->stream_index];
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
108 rtpctx = rtsp_st->transport_priv;
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
109
5721
82b0dc4f052a RTSP muxer: Use a local copy of the AVPacket for sending to the chained muxer
mstorsjo
parents: 5697
diff changeset
110 /* Use a local packet for writing to the chained muxer, otherwise
82b0dc4f052a RTSP muxer: Use a local copy of the AVPacket for sending to the chained muxer
mstorsjo
parents: 5697
diff changeset
111 * the internal stream_index = 0 becomes visible to the muxer user. */
82b0dc4f052a RTSP muxer: Use a local copy of the AVPacket for sending to the chained muxer
mstorsjo
parents: 5697
diff changeset
112 local_pkt = *pkt;
82b0dc4f052a RTSP muxer: Use a local copy of the AVPacket for sending to the chained muxer
mstorsjo
parents: 5697
diff changeset
113 local_pkt.stream_index = 0;
82b0dc4f052a RTSP muxer: Use a local copy of the AVPacket for sending to the chained muxer
mstorsjo
parents: 5697
diff changeset
114 return av_write_frame(rtpctx, &local_pkt);
5695
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
115 }
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
116
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
117 static int rtsp_write_close(AVFormatContext *s)
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
118 {
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
119 RTSPState *rt = s->priv_data;
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
120 char cmd[1024];
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
121
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
122 snprintf(cmd, sizeof(cmd),
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
123 "TEARDOWN %s RTSP/1.0\r\n",
5800
4410bccf6a8a Use rt->control_uri consequently instead of s->filename in all RTSP commands
mstorsjo
parents: 5756
diff changeset
124 rt->control_uri);
5697
484fceabfad2 Prefix non-static RTSP functions with ff_.
rbultje
parents: 5695
diff changeset
125 ff_rtsp_send_cmd_async(s, cmd);
5695
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
126
5697
484fceabfad2 Prefix non-static RTSP functions with ff_.
rbultje
parents: 5695
diff changeset
127 ff_rtsp_close_streams(s);
5695
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
128 url_close(rt->rtsp_hd);
5756
7c7fe75728dd Use ff_url_join for assembling URLs, instead of snprintf
mstorsjo
parents: 5721
diff changeset
129 ff_network_close();
5695
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
130 return 0;
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
131 }
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
132
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
133 AVOutputFormat rtsp_muxer = {
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
134 "rtsp",
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
135 NULL_IF_CONFIG_SMALL("RTSP output format"),
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
136 NULL,
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
137 NULL,
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
138 sizeof(RTSPState),
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
139 CODEC_ID_PCM_MULAW,
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
140 CODEC_ID_NONE,
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
141 rtsp_write_header,
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
142 rtsp_write_packet,
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
143 rtsp_write_close,
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
144 .flags = AVFMT_NOFILE | AVFMT_GLOBALHEADER,
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
145 };
25062326d2f9 Add an RTSP muxer
mstorsjo
parents:
diff changeset
146