#endif
#include "network.h"
#include "rtsp.h"
-#include <libavutil/intreadwrite.h>
+#include "internal.h"
+#include "libavutil/intreadwrite.h"
static int rtsp_write_record(AVFormatContext *s)
{
static int rtsp_write_header(AVFormatContext *s)
{
- RTSPState *rt = s->priv_data;
int ret;
ret = ff_rtsp_connect(s);
if (rtsp_write_record(s) < 0) {
ff_rtsp_close_streams(s);
- url_close(rt->rtsp_hd);
+ ff_rtsp_close_connections(s);
return AVERROR_INVALIDDATA;
}
return 0;
AVFormatContext *rtpctx = rtsp_st->transport_priv;
uint8_t *buf, *ptr;
int size;
- uint8_t interleave_header[4];
+ uint8_t *interleave_header, *interleaved_packet;
size = url_close_dyn_buf(rtpctx->pb, &buf);
ptr = buf;
while (size > 4) {
uint32_t packet_len = AV_RB32(ptr);
int id;
+ /* The interleaving header is exactly 4 bytes, which happens to be
+ * the same size as the packet length header from
+ * url_open_dyn_packet_buf. So by writing the interleaving header
+ * over these bytes, we get a consecutive interleaved packet
+ * that can be written in one call. */
+ interleaved_packet = interleave_header = ptr;
ptr += 4;
size -= 4;
if (packet_len > size || packet_len < 2)
break;
- if (ptr[1] >= 200 && ptr[1] <= 204)
+ if (ptr[1] >= RTCP_SR && ptr[1] <= RTCP_APP)
id = rtsp_st->interleaved_max; /* RTCP */
else
id = rtsp_st->interleaved_min; /* RTP */
interleave_header[0] = '$';
interleave_header[1] = id;
AV_WB16(interleave_header + 2, packet_len);
- url_write(rt->rtsp_hd, interleave_header, 4);
- url_write(rt->rtsp_hd, ptr, packet_len);
+ url_write(rt->rtsp_hd_out, interleaved_packet, 4 + packet_len);
ptr += packet_len;
size -= packet_len;
}
int n, tcp_fd;
struct timeval tv;
AVFormatContext *rtpctx;
- AVPacket local_pkt;
int ret;
tcp_fd = url_get_file_handle(rt->rtsp_hd);
rtsp_st = rt->rtsp_streams[pkt->stream_index];
rtpctx = rtsp_st->transport_priv;
- /* Use a local packet for writing to the chained muxer, otherwise
- * the internal stream_index = 0 becomes visible to the muxer user. */
- local_pkt = *pkt;
- local_pkt.stream_index = 0;
- ret = av_write_frame(rtpctx, &local_pkt);
- /* av_write_frame does all the RTP packetization. If using TCP as
+ ret = ff_write_chained(rtpctx, 0, pkt, s);
+ /* ff_write_chained does all the RTP packetization. If using TCP as
* transport, rtpctx->pb is only a dyn_packet_buf that queues up the
* packets, so we need to send them out on the TCP connection separately.
*/
ff_rtsp_send_cmd_async(s, "TEARDOWN", rt->control_uri, NULL);
ff_rtsp_close_streams(s);
- url_close(rt->rtsp_hd);
+ ff_rtsp_close_connections(s);
ff_network_close();
return 0;
}
NULL,
NULL,
sizeof(RTSPState),
- CODEC_ID_PCM_MULAW,
- CODEC_ID_NONE,
+ CODEC_ID_AAC,
+ CODEC_ID_MPEG4,
rtsp_write_header,
rtsp_write_packet,
rtsp_write_close,