annotate rtpenc.c @ 3057:b2853b499660 libavformat

Fix computation of the "NTP time" field in RTCP SR packets, and do not export times with microsecond precision
author lucabe
date Wed, 20 Feb 2008 10:19:35 +0000
parents e5d44127b182
children 6f61c3b36632
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1 /*
2892
0d82fdf4fa94 Split the RTP muxer out of rtp.c, to simplify the RTSP demuxer's dependencies
lucabe
parents: 2891
diff changeset
2 * RTP output format
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
3 * Copyright (c) 2002 Fabrice Bellard.
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: 1332
diff changeset
5 * This file is part of FFmpeg.
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1332
diff changeset
6 *
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1332
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: 1332
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: 1332
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: 1332
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: 885
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 */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
21 #include "avformat.h"
294
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 241
diff changeset
22 #include "mpegts.h"
774
820863425158 RTP/RTSP and MPEG4-AAC audio
michael
parents: 743
diff changeset
23 #include "bitstream.h"
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
24
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
25 #include <unistd.h>
1754
1f7a6dc01100 move networking #includes into separate file
mru
parents: 1673
diff changeset
26 #include "network.h"
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
27
1419
8fb4910bdcc0 Add support for H264 over RTP
gpoirier
parents: 1358
diff changeset
28 #include "rtp_internal.h"
2406
18e94e5989d8 Move the RTP packetization code for MPEG12 video in its own file (rtp_mpv.c)
lucabe
parents: 2274
diff changeset
29 #include "rtp_mpv.h"
2550
e9c34ec665c6 Support for AAC streaming over RTP. Fragmentation is not implemented yet
lucabe
parents: 2540
diff changeset
30 #include "rtp_aac.h"
2960
e5d44127b182 Add support for H.264 video in the RTP muxer
lucabe
parents: 2892
diff changeset
31 #include "rtp_h264.h"
1419
8fb4910bdcc0 Add support for H264 over RTP
gpoirier
parents: 1358
diff changeset
32
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
33 //#define DEBUG
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
34
2705
cc693f9e80ee Use a symbolic name for the payload size of an RTCP Sender Report packet
lucabe
parents: 2587
diff changeset
35 #define RTCP_SR_SIZE 28
3057
b2853b499660 Fix computation of the "NTP time" field in RTCP SR packets, and do not
lucabe
parents: 2960
diff changeset
36 #define NTP_OFFSET 2208988800ULL
b2853b499660 Fix computation of the "NTP time" field in RTCP SR packets, and do not
lucabe
parents: 2960
diff changeset
37 #define NTP_OFFSET_US (NTP_OFFSET * 1000000ULL)
b2853b499660 Fix computation of the "NTP time" field in RTCP SR packets, and do not
lucabe
parents: 2960
diff changeset
38
b2853b499660 Fix computation of the "NTP time" field in RTCP SR packets, and do not
lucabe
parents: 2960
diff changeset
39 static uint64_t ntp_time(void)
b2853b499660 Fix computation of the "NTP time" field in RTCP SR packets, and do not
lucabe
parents: 2960
diff changeset
40 {
b2853b499660 Fix computation of the "NTP time" field in RTCP SR packets, and do not
lucabe
parents: 2960
diff changeset
41 return (av_gettime() / 1000) * 1000 + NTP_OFFSET_US;
b2853b499660 Fix computation of the "NTP time" field in RTCP SR packets, and do not
lucabe
parents: 2960
diff changeset
42 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
43
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
44 static int rtp_write_header(AVFormatContext *s1)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
45 {
294
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 241
diff changeset
46 RTPDemuxContext *s = s1->priv_data;
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 241
diff changeset
47 int payload_type, max_packet_size, n;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
48 AVStream *st;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
49
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
50 if (s1->nb_streams != 1)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
51 return -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
52 st = s1->streams[0];
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
53
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 777
diff changeset
54 payload_type = rtp_get_payload_type(st->codec);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
55 if (payload_type < 0)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
56 payload_type = RTP_PT_PRIVATE; /* private payload type */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
57 s->payload_type = payload_type;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
58
2790
dd1fbe36d103 Fix some spelling mistakes.
diego
parents: 2771
diff changeset
59 // following 2 FIXMEs could be set based on the current time, there is normally no info leak, as RTP will likely be transmitted immediately
1045
7f1b7f811f01 fix constraint violation: libavformat is not allowed to modify state of caller, including rng state
rfelker
parents: 986
diff changeset
60 s->base_timestamp = 0; /* FIXME: was random(), what should this be? */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
61 s->timestamp = s->base_timestamp;
2540
ca3cba9c641f Fix timestamps in RTP packets (now, MPEG1 video with B frames works correctly)
lucabe
parents: 2539
diff changeset
62 s->cur_timestamp = 0;
1045
7f1b7f811f01 fix constraint violation: libavformat is not allowed to modify state of caller, including rng state
rfelker
parents: 986
diff changeset
63 s->ssrc = 0; /* FIXME: was random(), what should this be? */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
64 s->first_packet = 1;
2539
ba933dfa4833 Properly set RTP and NTP timestamps in RTCP SR packets
lucabe
parents: 2406
diff changeset
65 s->first_rtcp_ntp_time = AV_NOPTS_VALUE;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
66
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2760
diff changeset
67 max_packet_size = url_fget_max_packet_size(s1->pb);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
68 if (max_packet_size <= 12)
2274
b21c2af60bc9 Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents: 2222
diff changeset
69 return AVERROR(EIO);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
70 s->max_payload_size = max_packet_size - 12;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
71
2587
d751acab2622 Allow to set the maximum number of frames per RTP packet (and add support for
lucabe
parents: 2569
diff changeset
72 s->max_frames_per_packet = 0;
d751acab2622 Allow to set the maximum number of frames per RTP packet (and add support for
lucabe
parents: 2569
diff changeset
73 if (s1->max_delay) {
d751acab2622 Allow to set the maximum number of frames per RTP packet (and add support for
lucabe
parents: 2569
diff changeset
74 if (st->codec->codec_type == CODEC_TYPE_AUDIO) {
d751acab2622 Allow to set the maximum number of frames per RTP packet (and add support for
lucabe
parents: 2569
diff changeset
75 if (st->codec->frame_size == 0) {
d751acab2622 Allow to set the maximum number of frames per RTP packet (and add support for
lucabe
parents: 2569
diff changeset
76 av_log(s1, AV_LOG_ERROR, "Cannot respect max delay: frame size = 0\n");
d751acab2622 Allow to set the maximum number of frames per RTP packet (and add support for
lucabe
parents: 2569
diff changeset
77 } else {
d751acab2622 Allow to set the maximum number of frames per RTP packet (and add support for
lucabe
parents: 2569
diff changeset
78 s->max_frames_per_packet = av_rescale_rnd(s1->max_delay, st->codec->sample_rate, AV_TIME_BASE * st->codec->frame_size, AV_ROUND_DOWN);
d751acab2622 Allow to set the maximum number of frames per RTP packet (and add support for
lucabe
parents: 2569
diff changeset
79 }
d751acab2622 Allow to set the maximum number of frames per RTP packet (and add support for
lucabe
parents: 2569
diff changeset
80 }
d751acab2622 Allow to set the maximum number of frames per RTP packet (and add support for
lucabe
parents: 2569
diff changeset
81 if (st->codec->codec_type == CODEC_TYPE_VIDEO) {
d751acab2622 Allow to set the maximum number of frames per RTP packet (and add support for
lucabe
parents: 2569
diff changeset
82 /* FIXME: We should round down here... */
d751acab2622 Allow to set the maximum number of frames per RTP packet (and add support for
lucabe
parents: 2569
diff changeset
83 s->max_frames_per_packet = av_rescale_q(s1->max_delay, AV_TIME_BASE_Q, st->codec->time_base);
d751acab2622 Allow to set the maximum number of frames per RTP packet (and add support for
lucabe
parents: 2569
diff changeset
84 }
d751acab2622 Allow to set the maximum number of frames per RTP packet (and add support for
lucabe
parents: 2569
diff changeset
85 }
d751acab2622 Allow to set the maximum number of frames per RTP packet (and add support for
lucabe
parents: 2569
diff changeset
86
2540
ca3cba9c641f Fix timestamps in RTP packets (now, MPEG1 video with B frames works correctly)
lucabe
parents: 2539
diff changeset
87 av_set_pts_info(st, 32, 1, 90000);
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 777
diff changeset
88 switch(st->codec->codec_id) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
89 case CODEC_ID_MP2:
232
eb90c0a5a1ba CODEC_ID_MP3LAME is obsolete
bellard
parents: 173
diff changeset
90 case CODEC_ID_MP3:
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
91 s->buf_ptr = s->buf + 4;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
92 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
93 case CODEC_ID_MPEG1VIDEO:
2760
034925441d67 Add MPEG2 support to the RTP muxer
lucabe
parents: 2759
diff changeset
94 case CODEC_ID_MPEG2VIDEO:
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
95 break;
294
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 241
diff changeset
96 case CODEC_ID_MPEG2TS:
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 241
diff changeset
97 n = s->max_payload_size / TS_PACKET_SIZE;
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 241
diff changeset
98 if (n < 1)
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 241
diff changeset
99 n = 1;
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 241
diff changeset
100 s->max_payload_size = n * TS_PACKET_SIZE;
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 241
diff changeset
101 s->buf_ptr = s->buf;
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 241
diff changeset
102 break;
2550
e9c34ec665c6 Support for AAC streaming over RTP. Fragmentation is not implemented yet
lucabe
parents: 2540
diff changeset
103 case CODEC_ID_AAC:
e9c34ec665c6 Support for AAC streaming over RTP. Fragmentation is not implemented yet
lucabe
parents: 2540
diff changeset
104 s->read_buf_index = 0;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
105 default:
2539
ba933dfa4833 Properly set RTP and NTP timestamps in RTCP SR packets
lucabe
parents: 2406
diff changeset
106 if (st->codec->codec_type == CODEC_TYPE_AUDIO) {
ba933dfa4833 Properly set RTP and NTP timestamps in RTCP SR packets
lucabe
parents: 2406
diff changeset
107 av_set_pts_info(st, 32, 1, st->codec->sample_rate);
ba933dfa4833 Properly set RTP and NTP timestamps in RTCP SR packets
lucabe
parents: 2406
diff changeset
108 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
109 s->buf_ptr = s->buf;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
110 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
111 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
112
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
113 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
114 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
115
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
116 /* send an rtcp sender report packet */
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 0
diff changeset
117 static void rtcp_send_sr(AVFormatContext *s1, int64_t ntp_time)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
118 {
294
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 241
diff changeset
119 RTPDemuxContext *s = s1->priv_data;
2539
ba933dfa4833 Properly set RTP and NTP timestamps in RTCP SR packets
lucabe
parents: 2406
diff changeset
120 uint32_t rtp_ts;
ba933dfa4833 Properly set RTP and NTP timestamps in RTCP SR packets
lucabe
parents: 2406
diff changeset
121
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
122 #if defined(DEBUG)
1443
404048ea11bc Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents: 1431
diff changeset
123 printf("RTCP: %02x %"PRIx64" %x\n", s->payload_type, ntp_time, s->timestamp);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
124 #endif
2539
ba933dfa4833 Properly set RTP and NTP timestamps in RTCP SR packets
lucabe
parents: 2406
diff changeset
125
ba933dfa4833 Properly set RTP and NTP timestamps in RTCP SR packets
lucabe
parents: 2406
diff changeset
126 if (s->first_rtcp_ntp_time == AV_NOPTS_VALUE) s->first_rtcp_ntp_time = ntp_time;
2706
b1723b8da595 Do not send too many RTCP packets (according to RFC 3550, the minimum
lucabe
parents: 2705
diff changeset
127 s->last_rtcp_ntp_time = ntp_time;
2539
ba933dfa4833 Properly set RTP and NTP timestamps in RTCP SR packets
lucabe
parents: 2406
diff changeset
128 rtp_ts = av_rescale_q(ntp_time - s->first_rtcp_ntp_time, AV_TIME_BASE_Q,
ba933dfa4833 Properly set RTP and NTP timestamps in RTCP SR packets
lucabe
parents: 2406
diff changeset
129 s1->streams[0]->time_base) + s->base_timestamp;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2760
diff changeset
130 put_byte(s1->pb, (RTP_VERSION << 6));
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2760
diff changeset
131 put_byte(s1->pb, 200);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2760
diff changeset
132 put_be16(s1->pb, 6); /* length in words - 1 */
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2760
diff changeset
133 put_be32(s1->pb, s->ssrc);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2760
diff changeset
134 put_be32(s1->pb, ntp_time / 1000000);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2760
diff changeset
135 put_be32(s1->pb, ((ntp_time % 1000000) << 32) / 1000000);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2760
diff changeset
136 put_be32(s1->pb, rtp_ts);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2760
diff changeset
137 put_be32(s1->pb, s->packet_count);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2760
diff changeset
138 put_be32(s1->pb, s->octet_count);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2760
diff changeset
139 put_flush_packet(s1->pb);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
140 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
141
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
142 /* send an rtp packet. sequence number is incremented, but the caller
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
143 must update the timestamp itself */
2406
18e94e5989d8 Move the RTP packetization code for MPEG12 video in its own file (rtp_mpv.c)
lucabe
parents: 2274
diff changeset
144 void ff_rtp_send_data(AVFormatContext *s1, const uint8_t *buf1, int len, int m)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
145 {
294
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 241
diff changeset
146 RTPDemuxContext *s = s1->priv_data;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
147
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
148 #ifdef DEBUG
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
149 printf("rtp_send_data size=%d\n", len);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
150 #endif
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
151
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
152 /* build the RTP header */
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2760
diff changeset
153 put_byte(s1->pb, (RTP_VERSION << 6));
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2760
diff changeset
154 put_byte(s1->pb, (s->payload_type & 0x7f) | ((m & 0x01) << 7));
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2760
diff changeset
155 put_be16(s1->pb, s->seq);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2760
diff changeset
156 put_be32(s1->pb, s->timestamp);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2760
diff changeset
157 put_be32(s1->pb, s->ssrc);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 827
diff changeset
158
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2760
diff changeset
159 put_buffer(s1->pb, buf1, len);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2760
diff changeset
160 put_flush_packet(s1->pb);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 827
diff changeset
161
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
162 s->seq++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
163 s->octet_count += len;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
164 s->packet_count++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
165 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
166
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
167 /* send an integer number of samples and compute time stamp and fill
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
168 the rtp send buffer before sending. */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
169 static void rtp_send_samples(AVFormatContext *s1,
241
3d92f793fd67 64 bit pts for writing - more const usage
bellard
parents: 232
diff changeset
170 const uint8_t *buf1, int size, int sample_size)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
171 {
294
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 241
diff changeset
172 RTPDemuxContext *s = s1->priv_data;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
173 int len, max_packet_size, n;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
174
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
175 max_packet_size = (s->max_payload_size / sample_size) * sample_size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
176 /* not needed, but who nows */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
177 if ((size % sample_size) != 0)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
178 av_abort();
2540
ca3cba9c641f Fix timestamps in RTP packets (now, MPEG1 video with B frames works correctly)
lucabe
parents: 2539
diff changeset
179 n = 0;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
180 while (size > 0) {
2540
ca3cba9c641f Fix timestamps in RTP packets (now, MPEG1 video with B frames works correctly)
lucabe
parents: 2539
diff changeset
181 s->buf_ptr = s->buf;
ca3cba9c641f Fix timestamps in RTP packets (now, MPEG1 video with B frames works correctly)
lucabe
parents: 2539
diff changeset
182 len = FFMIN(max_packet_size, size);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
183
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
184 /* copy data */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
185 memcpy(s->buf_ptr, buf1, len);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
186 s->buf_ptr += len;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
187 buf1 += len;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
188 size -= len;
2540
ca3cba9c641f Fix timestamps in RTP packets (now, MPEG1 video with B frames works correctly)
lucabe
parents: 2539
diff changeset
189 s->timestamp = s->cur_timestamp + n / sample_size;
ca3cba9c641f Fix timestamps in RTP packets (now, MPEG1 video with B frames works correctly)
lucabe
parents: 2539
diff changeset
190 ff_rtp_send_data(s1, s->buf, s->buf_ptr - s->buf, 0);
ca3cba9c641f Fix timestamps in RTP packets (now, MPEG1 video with B frames works correctly)
lucabe
parents: 2539
diff changeset
191 n += (s->buf_ptr - s->buf);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
192 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 827
diff changeset
193 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
194
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
195 /* NOTE: we suppose that exactly one frame is given as argument here */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
196 /* XXX: test it */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
197 static void rtp_send_mpegaudio(AVFormatContext *s1,
241
3d92f793fd67 64 bit pts for writing - more const usage
bellard
parents: 232
diff changeset
198 const uint8_t *buf1, int size)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
199 {
294
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 241
diff changeset
200 RTPDemuxContext *s = s1->priv_data;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
201 int len, count, max_packet_size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
202
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
203 max_packet_size = s->max_payload_size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
204
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
205 /* test if we must flush because not enough space */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
206 len = (s->buf_ptr - s->buf);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
207 if ((len + size) > max_packet_size) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
208 if (len > 4) {
2406
18e94e5989d8 Move the RTP packetization code for MPEG12 video in its own file (rtp_mpv.c)
lucabe
parents: 2274
diff changeset
209 ff_rtp_send_data(s1, s->buf, s->buf_ptr - s->buf, 0);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
210 s->buf_ptr = s->buf + 4;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
211 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
212 }
2540
ca3cba9c641f Fix timestamps in RTP packets (now, MPEG1 video with B frames works correctly)
lucabe
parents: 2539
diff changeset
213 if (s->buf_ptr == s->buf + 4) {
ca3cba9c641f Fix timestamps in RTP packets (now, MPEG1 video with B frames works correctly)
lucabe
parents: 2539
diff changeset
214 s->timestamp = s->cur_timestamp;
ca3cba9c641f Fix timestamps in RTP packets (now, MPEG1 video with B frames works correctly)
lucabe
parents: 2539
diff changeset
215 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
216
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
217 /* add the packet */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
218 if (size > max_packet_size) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
219 /* big packet: fragment */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
220 count = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
221 while (size > 0) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
222 len = max_packet_size - 4;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
223 if (len > size)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
224 len = size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
225 /* build fragmented packet */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
226 s->buf[0] = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
227 s->buf[1] = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
228 s->buf[2] = count >> 8;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
229 s->buf[3] = count;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
230 memcpy(s->buf + 4, buf1, len);
2406
18e94e5989d8 Move the RTP packetization code for MPEG12 video in its own file (rtp_mpv.c)
lucabe
parents: 2274
diff changeset
231 ff_rtp_send_data(s1, s->buf, len + 4, 0);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
232 size -= len;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
233 buf1 += len;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
234 count += len;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
235 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
236 } else {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
237 if (s->buf_ptr == s->buf + 4) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
238 /* no fragmentation possible */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
239 s->buf[0] = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
240 s->buf[1] = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
241 s->buf[2] = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
242 s->buf[3] = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
243 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
244 memcpy(s->buf_ptr, buf1, size);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
245 s->buf_ptr += size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
246 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
247 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
248
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
249 static void rtp_send_raw(AVFormatContext *s1,
241
3d92f793fd67 64 bit pts for writing - more const usage
bellard
parents: 232
diff changeset
250 const uint8_t *buf1, int size)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
251 {
294
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 241
diff changeset
252 RTPDemuxContext *s = s1->priv_data;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
253 int len, max_packet_size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
254
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
255 max_packet_size = s->max_payload_size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
256
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
257 while (size > 0) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
258 len = max_packet_size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
259 if (len > size)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
260 len = size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
261
2540
ca3cba9c641f Fix timestamps in RTP packets (now, MPEG1 video with B frames works correctly)
lucabe
parents: 2539
diff changeset
262 s->timestamp = s->cur_timestamp;
2406
18e94e5989d8 Move the RTP packetization code for MPEG12 video in its own file (rtp_mpv.c)
lucabe
parents: 2274
diff changeset
263 ff_rtp_send_data(s1, buf1, len, (len == size));
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
264
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
265 buf1 += len;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
266 size -= len;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
267 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
268 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
269
294
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 241
diff changeset
270 /* NOTE: size is assumed to be an integer multiple of TS_PACKET_SIZE */
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 241
diff changeset
271 static void rtp_send_mpegts_raw(AVFormatContext *s1,
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 241
diff changeset
272 const uint8_t *buf1, int size)
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 241
diff changeset
273 {
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 241
diff changeset
274 RTPDemuxContext *s = s1->priv_data;
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 241
diff changeset
275 int len, out_len;
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 241
diff changeset
276
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 241
diff changeset
277 while (size >= TS_PACKET_SIZE) {
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 241
diff changeset
278 len = s->max_payload_size - (s->buf_ptr - s->buf);
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 241
diff changeset
279 if (len > size)
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 241
diff changeset
280 len = size;
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 241
diff changeset
281 memcpy(s->buf_ptr, buf1, len);
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 241
diff changeset
282 buf1 += len;
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 241
diff changeset
283 size -= len;
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 241
diff changeset
284 s->buf_ptr += len;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 827
diff changeset
285
294
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 241
diff changeset
286 out_len = s->buf_ptr - s->buf;
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 241
diff changeset
287 if (out_len >= s->max_payload_size) {
2406
18e94e5989d8 Move the RTP packetization code for MPEG12 video in its own file (rtp_mpv.c)
lucabe
parents: 2274
diff changeset
288 ff_rtp_send_data(s1, s->buf, out_len, 0);
294
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 241
diff changeset
289 s->buf_ptr = s->buf;
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 241
diff changeset
290 }
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 241
diff changeset
291 }
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 241
diff changeset
292 }
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 241
diff changeset
293
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
294 /* write an RTP packet. 'buf1' must contain a single specific frame. */
468
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 370
diff changeset
295 static int rtp_write_packet(AVFormatContext *s1, AVPacket *pkt)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
296 {
294
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 241
diff changeset
297 RTPDemuxContext *s = s1->priv_data;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
298 AVStream *st = s1->streams[0];
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
299 int rtcp_bytes;
468
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 370
diff changeset
300 int size= pkt->size;
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 370
diff changeset
301 uint8_t *buf1= pkt->data;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 827
diff changeset
302
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
303 #ifdef DEBUG
468
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 370
diff changeset
304 printf("%d: write len=%d\n", pkt->stream_index, size);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
305 #endif
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
306
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
307 /* XXX: mpeg pts hardcoded. RTCP send every 0.5 seconds */
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 827
diff changeset
308 rtcp_bytes = ((s->octet_count - s->last_octet_count) * RTCP_TX_RATIO_NUM) /
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
309 RTCP_TX_RATIO_DEN;
2706
b1723b8da595 Do not send too many RTCP packets (according to RFC 3550, the minimum
lucabe
parents: 2705
diff changeset
310 if (s->first_packet || ((rtcp_bytes >= RTCP_SR_SIZE) &&
3057
b2853b499660 Fix computation of the "NTP time" field in RTCP SR packets, and do not
lucabe
parents: 2960
diff changeset
311 (ntp_time() - s->last_rtcp_ntp_time > 5000000))) {
b2853b499660 Fix computation of the "NTP time" field in RTCP SR packets, and do not
lucabe
parents: 2960
diff changeset
312 rtcp_send_sr(s1, ntp_time());
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
313 s->last_octet_count = s->octet_count;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
314 s->first_packet = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
315 }
2540
ca3cba9c641f Fix timestamps in RTP packets (now, MPEG1 video with B frames works correctly)
lucabe
parents: 2539
diff changeset
316 s->cur_timestamp = s->base_timestamp + pkt->pts;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
317
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 777
diff changeset
318 switch(st->codec->codec_id) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
319 case CODEC_ID_PCM_MULAW:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
320 case CODEC_ID_PCM_ALAW:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
321 case CODEC_ID_PCM_U8:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
322 case CODEC_ID_PCM_S8:
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 777
diff changeset
323 rtp_send_samples(s1, buf1, size, 1 * st->codec->channels);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
324 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
325 case CODEC_ID_PCM_U16BE:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
326 case CODEC_ID_PCM_U16LE:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
327 case CODEC_ID_PCM_S16BE:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
328 case CODEC_ID_PCM_S16LE:
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 777
diff changeset
329 rtp_send_samples(s1, buf1, size, 2 * st->codec->channels);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
330 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
331 case CODEC_ID_MP2:
232
eb90c0a5a1ba CODEC_ID_MP3LAME is obsolete
bellard
parents: 173
diff changeset
332 case CODEC_ID_MP3:
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
333 rtp_send_mpegaudio(s1, buf1, size);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
334 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
335 case CODEC_ID_MPEG1VIDEO:
2760
034925441d67 Add MPEG2 support to the RTP muxer
lucabe
parents: 2759
diff changeset
336 case CODEC_ID_MPEG2VIDEO:
2406
18e94e5989d8 Move the RTP packetization code for MPEG12 video in its own file (rtp_mpv.c)
lucabe
parents: 2274
diff changeset
337 ff_rtp_send_mpegvideo(s1, buf1, size);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
338 break;
2550
e9c34ec665c6 Support for AAC streaming over RTP. Fragmentation is not implemented yet
lucabe
parents: 2540
diff changeset
339 case CODEC_ID_AAC:
e9c34ec665c6 Support for AAC streaming over RTP. Fragmentation is not implemented yet
lucabe
parents: 2540
diff changeset
340 ff_rtp_send_aac(s1, buf1, size);
e9c34ec665c6 Support for AAC streaming over RTP. Fragmentation is not implemented yet
lucabe
parents: 2540
diff changeset
341 break;
294
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 241
diff changeset
342 case CODEC_ID_MPEG2TS:
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 241
diff changeset
343 rtp_send_mpegts_raw(s1, buf1, size);
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 241
diff changeset
344 break;
2960
e5d44127b182 Add support for H.264 video in the RTP muxer
lucabe
parents: 2892
diff changeset
345 case CODEC_ID_H264:
e5d44127b182 Add support for H.264 video in the RTP muxer
lucabe
parents: 2892
diff changeset
346 ff_rtp_send_h264(s1, buf1, size);
e5d44127b182 Add support for H.264 video in the RTP muxer
lucabe
parents: 2892
diff changeset
347 break;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
348 default:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
349 /* better than nothing : send the codec raw data */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
350 rtp_send_raw(s1, buf1, size);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
351 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
352 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
353 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
354 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
355
1167
d89d7ef290da give AVInput/OutputFormat structs consistent names
mru
parents: 1116
diff changeset
356 AVOutputFormat rtp_muxer = {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
357 "rtp",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
358 "RTP output format",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
359 NULL,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
360 NULL,
294
6091b76cfc2a added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents: 241
diff changeset
361 sizeof(RTPDemuxContext),
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
362 CODEC_ID_PCM_MULAW,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
363 CODEC_ID_NONE,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
364 rtp_write_header,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
365 rtp_write_packet,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
366 };