Mercurial > libavformat.hg
annotate rtpdec.c @ 3233:e2bdb989f7da libavformat
Decrease returning probe score for WAV demuxer to avoid
probe conflict between WAV and future ACT demuxer.
This is necessary because ACT has standard WAV header
at top of it's own.
author | voroshil |
---|---|
date | Sat, 19 Apr 2008 14:52:19 +0000 |
parents | 8891d470ada3 |
children | 6f61c3b36632 |
rev | line source |
---|---|
0 | 1 /* |
2891
a6c922b05571
Split the RTP demuxing functions out of rtp.c, to simplify the RTP muxer's dependencies
lucabe
parents:
2790
diff
changeset
|
2 * RTP input format |
0 | 3 * Copyright (c) 2002 Fabrice Bellard. |
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 | 8 * modify it under the terms of the GNU Lesser General Public |
9 * License as published by the Free Software Foundation; either | |
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1332
diff
changeset
|
10 * version 2.1 of the License, or (at your option) any later version. |
0 | 11 * |
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1332
diff
changeset
|
12 * FFmpeg is distributed in the hope that it will be useful, |
0 | 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
15 * Lesser General Public License for more details. | |
16 * | |
17 * You should have received a copy of the GNU Lesser General Public | |
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
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 | 20 */ |
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 | 23 #include "bitstream.h" |
0 | 24 |
25 #include <unistd.h> | |
1754 | 26 #include "network.h" |
0 | 27 |
1419 | 28 #include "rtp_internal.h" |
1460 | 29 #include "rtp_h264.h" |
1419 | 30 |
0 | 31 //#define DEBUG |
32 | |
33 /* TODO: - add RTCP statistics reporting (should be optional). | |
34 | |
35 - add support for h263/mpeg4 packetized output : IDEA: send a | |
36 buffer to 'rtp_write_packet' contains all the packets for ONE | |
37 frame. Each packet should have a four byte header containing | |
38 the length in big endian format (same trick as | |
885 | 39 'url_open_dyn_packet_buf') |
0 | 40 */ |
41 | |
1419 | 42 /* statistics functions */ |
43 RTPDynamicProtocolHandler *RTPFirstDynamicPayloadHandler= NULL; | |
44 | |
45 static RTPDynamicProtocolHandler mp4v_es_handler= {"MP4V-ES", CODEC_TYPE_VIDEO, 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:
1460
diff
changeset
|
46 static RTPDynamicProtocolHandler mpeg4_generic_handler= {"mpeg4-generic", CODEC_TYPE_AUDIO, CODEC_ID_AAC}; |
0 | 47 |
1419 | 48 static void register_dynamic_payload_handler(RTPDynamicProtocolHandler *handler) |
49 { | |
50 handler->next= RTPFirstDynamicPayloadHandler; | |
51 RTPFirstDynamicPayloadHandler= handler; | |
52 } | |
885 | 53 |
1983
fbc66bf1f15d
changes some function declarations from () to (void) as per ansi c.
gpoirier
parents:
1857
diff
changeset
|
54 void av_register_rtp_dynamic_payload_handlers(void) |
1419 | 55 { |
56 register_dynamic_payload_handler(&mp4v_es_handler); | |
57 register_dynamic_payload_handler(&mpeg4_generic_handler); | |
58 register_dynamic_payload_handler(&ff_h264_dynamic_handler); | |
59 } | |
0 | 60 |
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
61 static int rtcp_parse_packet(RTPDemuxContext *s, const unsigned char *buf, int len) |
0 | 62 { |
63 if (buf[1] != 200) | |
64 return -1; | |
2167
c4244900f986
remove decode_be32/64 and replace them by AV_RB32/64
benoit
parents:
2164
diff
changeset
|
65 s->last_rtcp_ntp_time = AV_RB64(buf + 8); |
173 | 66 if (s->first_rtcp_ntp_time == AV_NOPTS_VALUE) |
67 s->first_rtcp_ntp_time = s->last_rtcp_ntp_time; | |
2167
c4244900f986
remove decode_be32/64 and replace them by AV_RB32/64
benoit
parents:
2164
diff
changeset
|
68 s->last_rtcp_timestamp = AV_RB32(buf + 16); |
0 | 69 return 0; |
70 } | |
71 | |
1445
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
72 #define RTP_SEQ_MOD (1<<16) |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
73 |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
74 /** |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
75 * called on parse open packet |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
76 */ |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
77 static void rtp_init_statistics(RTPStatistics *s, uint16_t base_sequence) // called on parse open packet. |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
78 { |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
79 memset(s, 0, sizeof(RTPStatistics)); |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
80 s->max_seq= base_sequence; |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
81 s->probation= 1; |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
82 } |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
83 |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
84 /** |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
85 * called whenever there is a large jump in sequence numbers, or when they get out of probation... |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
86 */ |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
87 static void rtp_init_sequence(RTPStatistics *s, uint16_t seq) |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
88 { |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
89 s->max_seq= seq; |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
90 s->cycles= 0; |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
91 s->base_seq= seq -1; |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
92 s->bad_seq= RTP_SEQ_MOD + 1; |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
93 s->received= 0; |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
94 s->expected_prior= 0; |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
95 s->received_prior= 0; |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
96 s->jitter= 0; |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
97 s->transit= 0; |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
98 } |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
99 |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
100 /** |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
101 * returns 1 if we should handle this packet. |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
102 */ |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
103 static int rtp_valid_packet_in_sequence(RTPStatistics *s, uint16_t seq) |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
104 { |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
105 uint16_t udelta= seq - s->max_seq; |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
106 const int MAX_DROPOUT= 3000; |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
107 const int MAX_MISORDER = 100; |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
108 const int MIN_SEQUENTIAL = 2; |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
109 |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
110 /* source not valid until MIN_SEQUENTIAL packets with sequence seq. numbers have been received */ |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
111 if(s->probation) |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
112 { |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
113 if(seq==s->max_seq + 1) { |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
114 s->probation--; |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
115 s->max_seq= seq; |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
116 if(s->probation==0) { |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
117 rtp_init_sequence(s, seq); |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
118 s->received++; |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
119 return 1; |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
120 } |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
121 } else { |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
122 s->probation= MIN_SEQUENTIAL - 1; |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
123 s->max_seq = seq; |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
124 } |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
125 } else if (udelta < MAX_DROPOUT) { |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
126 // in order, with permissible gap |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
127 if(seq < s->max_seq) { |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
128 //sequence number wrapped; count antother 64k cycles |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
129 s->cycles += RTP_SEQ_MOD; |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
130 } |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
131 s->max_seq= seq; |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
132 } else if (udelta <= RTP_SEQ_MOD - MAX_MISORDER) { |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
133 // sequence made a large jump... |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
134 if(seq==s->bad_seq) { |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
135 // two sequential packets-- assume that the other side restarted without telling us; just resync. |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
136 rtp_init_sequence(s, seq); |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
137 } else { |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
138 s->bad_seq= (seq + 1) & (RTP_SEQ_MOD-1); |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
139 return 0; |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
140 } |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
141 } else { |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
142 // duplicate or reordered packet... |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
143 } |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
144 s->received++; |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
145 return 1; |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
146 } |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
147 |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
148 #if 0 |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
149 /** |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
150 * This function is currently unused; without a valid local ntp time, I don't see how we could calculate the |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
151 * difference between the arrival and sent timestamp. As a result, the jitter and transit statistics values |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
152 * never change. I left this in in case someone else can see a way. (rdm) |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
153 */ |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
154 static void rtcp_update_jitter(RTPStatistics *s, uint32_t sent_timestamp, uint32_t arrival_timestamp) |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
155 { |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
156 uint32_t transit= arrival_timestamp - sent_timestamp; |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
157 int d; |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
158 s->transit= transit; |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
159 d= FFABS(transit - s->transit); |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
160 s->jitter += d - ((s->jitter + 8)>>4); |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
161 } |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
162 #endif |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
163 |
1425
00d9393a126f
make ffmpeg able to send back a RTCP receiver report.
gpoirier
parents:
1424
diff
changeset
|
164 int rtp_check_and_send_back_rr(RTPDemuxContext *s, int count) |
00d9393a126f
make ffmpeg able to send back a RTCP receiver report.
gpoirier
parents:
1424
diff
changeset
|
165 { |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2760
diff
changeset
|
166 ByteIOContext *pb; |
1425
00d9393a126f
make ffmpeg able to send back a RTCP receiver report.
gpoirier
parents:
1424
diff
changeset
|
167 uint8_t *buf; |
00d9393a126f
make ffmpeg able to send back a RTCP receiver report.
gpoirier
parents:
1424
diff
changeset
|
168 int len; |
00d9393a126f
make ffmpeg able to send back a RTCP receiver report.
gpoirier
parents:
1424
diff
changeset
|
169 int rtcp_bytes; |
1445
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
170 RTPStatistics *stats= &s->statistics; |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
171 uint32_t lost; |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
172 uint32_t extended_max; |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
173 uint32_t expected_interval; |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
174 uint32_t received_interval; |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
175 uint32_t lost_interval; |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
176 uint32_t expected; |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
177 uint32_t fraction; |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
178 uint64_t ntp_time= s->last_rtcp_ntp_time; // TODO: Get local ntp time? |
1425
00d9393a126f
make ffmpeg able to send back a RTCP receiver report.
gpoirier
parents:
1424
diff
changeset
|
179 |
00d9393a126f
make ffmpeg able to send back a RTCP receiver report.
gpoirier
parents:
1424
diff
changeset
|
180 if (!s->rtp_ctx || (count < 1)) |
00d9393a126f
make ffmpeg able to send back a RTCP receiver report.
gpoirier
parents:
1424
diff
changeset
|
181 return -1; |
00d9393a126f
make ffmpeg able to send back a RTCP receiver report.
gpoirier
parents:
1424
diff
changeset
|
182 |
1445
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
183 /* TODO: I think this is way too often; RFC 1889 has algorithm for this */ |
1425
00d9393a126f
make ffmpeg able to send back a RTCP receiver report.
gpoirier
parents:
1424
diff
changeset
|
184 /* XXX: mpeg pts hardcoded. RTCP send every 0.5 seconds */ |
00d9393a126f
make ffmpeg able to send back a RTCP receiver report.
gpoirier
parents:
1424
diff
changeset
|
185 s->octet_count += count; |
00d9393a126f
make ffmpeg able to send back a RTCP receiver report.
gpoirier
parents:
1424
diff
changeset
|
186 rtcp_bytes = ((s->octet_count - s->last_octet_count) * RTCP_TX_RATIO_NUM) / |
00d9393a126f
make ffmpeg able to send back a RTCP receiver report.
gpoirier
parents:
1424
diff
changeset
|
187 RTCP_TX_RATIO_DEN; |
00d9393a126f
make ffmpeg able to send back a RTCP receiver report.
gpoirier
parents:
1424
diff
changeset
|
188 rtcp_bytes /= 50; // mmu_man: that's enough for me... VLC sends much less btw !? |
00d9393a126f
make ffmpeg able to send back a RTCP receiver report.
gpoirier
parents:
1424
diff
changeset
|
189 if (rtcp_bytes < 28) |
00d9393a126f
make ffmpeg able to send back a RTCP receiver report.
gpoirier
parents:
1424
diff
changeset
|
190 return -1; |
00d9393a126f
make ffmpeg able to send back a RTCP receiver report.
gpoirier
parents:
1424
diff
changeset
|
191 s->last_octet_count = s->octet_count; |
00d9393a126f
make ffmpeg able to send back a RTCP receiver report.
gpoirier
parents:
1424
diff
changeset
|
192 |
00d9393a126f
make ffmpeg able to send back a RTCP receiver report.
gpoirier
parents:
1424
diff
changeset
|
193 if (url_open_dyn_buf(&pb) < 0) |
00d9393a126f
make ffmpeg able to send back a RTCP receiver report.
gpoirier
parents:
1424
diff
changeset
|
194 return -1; |
00d9393a126f
make ffmpeg able to send back a RTCP receiver report.
gpoirier
parents:
1424
diff
changeset
|
195 |
00d9393a126f
make ffmpeg able to send back a RTCP receiver report.
gpoirier
parents:
1424
diff
changeset
|
196 // Receiver Report |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2760
diff
changeset
|
197 put_byte(pb, (RTP_VERSION << 6) + 1); /* 1 report block */ |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2760
diff
changeset
|
198 put_byte(pb, 201); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2760
diff
changeset
|
199 put_be16(pb, 7); /* length in words - 1 */ |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2760
diff
changeset
|
200 put_be32(pb, s->ssrc); // our own SSRC |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2760
diff
changeset
|
201 put_be32(pb, s->ssrc); // XXX: should be the server's here! |
1425
00d9393a126f
make ffmpeg able to send back a RTCP receiver report.
gpoirier
parents:
1424
diff
changeset
|
202 // some placeholders we should really fill... |
1445
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
203 // RFC 1889/p64 |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
204 extended_max= stats->cycles + stats->max_seq; |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
205 expected= extended_max - stats->base_seq + 1; |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
206 lost= expected - stats->received; |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
207 lost= FFMIN(lost, 0xffffff); // clamp it since it's only 24 bits... |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
208 expected_interval= expected - stats->expected_prior; |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
209 stats->expected_prior= expected; |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
210 received_interval= stats->received - stats->received_prior; |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
211 stats->received_prior= stats->received; |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
212 lost_interval= expected_interval - received_interval; |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
213 if (expected_interval==0 || lost_interval<=0) fraction= 0; |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
214 else fraction = (lost_interval<<8)/expected_interval; |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
215 |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
216 fraction= (fraction<<24) | lost; |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
217 |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2760
diff
changeset
|
218 put_be32(pb, fraction); /* 8 bits of fraction, 24 bits of total packets lost */ |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2760
diff
changeset
|
219 put_be32(pb, extended_max); /* max sequence received */ |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2760
diff
changeset
|
220 put_be32(pb, stats->jitter>>4); /* jitter */ |
1445
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
221 |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
222 if(s->last_rtcp_ntp_time==AV_NOPTS_VALUE) |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
223 { |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2760
diff
changeset
|
224 put_be32(pb, 0); /* last SR timestamp */ |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2760
diff
changeset
|
225 put_be32(pb, 0); /* delay since last SR */ |
1445
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
226 } else { |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
227 uint32_t middle_32_bits= s->last_rtcp_ntp_time>>16; // this is valid, right? do we need to handle 64 bit values special? |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
228 uint32_t delay_since_last= ntp_time - s->last_rtcp_ntp_time; |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
229 |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2760
diff
changeset
|
230 put_be32(pb, middle_32_bits); /* last SR timestamp */ |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2760
diff
changeset
|
231 put_be32(pb, delay_since_last); /* delay since last SR */ |
1445
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
232 } |
1425
00d9393a126f
make ffmpeg able to send back a RTCP receiver report.
gpoirier
parents:
1424
diff
changeset
|
233 |
00d9393a126f
make ffmpeg able to send back a RTCP receiver report.
gpoirier
parents:
1424
diff
changeset
|
234 // CNAME |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2760
diff
changeset
|
235 put_byte(pb, (RTP_VERSION << 6) + 1); /* 1 report block */ |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2760
diff
changeset
|
236 put_byte(pb, 202); |
1425
00d9393a126f
make ffmpeg able to send back a RTCP receiver report.
gpoirier
parents:
1424
diff
changeset
|
237 len = strlen(s->hostname); |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2760
diff
changeset
|
238 put_be16(pb, (6 + len + 3) / 4); /* length in words - 1 */ |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2760
diff
changeset
|
239 put_be32(pb, s->ssrc); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2760
diff
changeset
|
240 put_byte(pb, 0x01); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2760
diff
changeset
|
241 put_byte(pb, len); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2760
diff
changeset
|
242 put_buffer(pb, s->hostname, len); |
1425
00d9393a126f
make ffmpeg able to send back a RTCP receiver report.
gpoirier
parents:
1424
diff
changeset
|
243 // padding |
00d9393a126f
make ffmpeg able to send back a RTCP receiver report.
gpoirier
parents:
1424
diff
changeset
|
244 for (len = (6 + len) % 4; len % 4; len++) { |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2760
diff
changeset
|
245 put_byte(pb, 0); |
1425
00d9393a126f
make ffmpeg able to send back a RTCP receiver report.
gpoirier
parents:
1424
diff
changeset
|
246 } |
00d9393a126f
make ffmpeg able to send back a RTCP receiver report.
gpoirier
parents:
1424
diff
changeset
|
247 |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2760
diff
changeset
|
248 put_flush_packet(pb); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2760
diff
changeset
|
249 len = url_close_dyn_buf(pb, &buf); |
1425
00d9393a126f
make ffmpeg able to send back a RTCP receiver report.
gpoirier
parents:
1424
diff
changeset
|
250 if ((len > 0) && buf) { |
1445
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
251 int result; |
1425
00d9393a126f
make ffmpeg able to send back a RTCP receiver report.
gpoirier
parents:
1424
diff
changeset
|
252 #if defined(DEBUG) |
00d9393a126f
make ffmpeg able to send back a RTCP receiver report.
gpoirier
parents:
1424
diff
changeset
|
253 printf("sending %d bytes of RR\n", len); |
00d9393a126f
make ffmpeg able to send back a RTCP receiver report.
gpoirier
parents:
1424
diff
changeset
|
254 #endif |
1445
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
255 result= url_write(s->rtp_ctx, buf, len); |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
256 #if defined(DEBUG) |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
257 printf("result from url_write: %d\n", result); |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
258 #endif |
1425
00d9393a126f
make ffmpeg able to send back a RTCP receiver report.
gpoirier
parents:
1424
diff
changeset
|
259 av_free(buf); |
00d9393a126f
make ffmpeg able to send back a RTCP receiver report.
gpoirier
parents:
1424
diff
changeset
|
260 } |
00d9393a126f
make ffmpeg able to send back a RTCP receiver report.
gpoirier
parents:
1424
diff
changeset
|
261 return 0; |
00d9393a126f
make ffmpeg able to send back a RTCP receiver report.
gpoirier
parents:
1424
diff
changeset
|
262 } |
00d9393a126f
make ffmpeg able to send back a RTCP receiver report.
gpoirier
parents:
1424
diff
changeset
|
263 |
00d9393a126f
make ffmpeg able to send back a RTCP receiver report.
gpoirier
parents:
1424
diff
changeset
|
264 /** |
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
265 * open a new RTP parse context for stream 'st'. 'st' can be NULL for |
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
266 * MPEG2TS streams to indicate that they should be demuxed inside the |
885 | 267 * rtp demux (otherwise CODEC_ID_MPEG2TS packets are returned) |
1431
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1427
diff
changeset
|
268 * TODO: change this to not take rtp_payload data, and use the new dynamic payload system. |
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
269 */ |
1425
00d9393a126f
make ffmpeg able to send back a RTCP receiver report.
gpoirier
parents:
1424
diff
changeset
|
270 RTPDemuxContext *rtp_parse_open(AVFormatContext *s1, AVStream *st, URLContext *rtpc, int payload_type, rtp_payload_data_t *rtp_payload_data) |
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
271 { |
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
272 RTPDemuxContext *s; |
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 s = av_mallocz(sizeof(RTPDemuxContext)); |
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
275 if (!s) |
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
276 return NULL; |
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
277 s->payload_type = payload_type; |
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
278 s->last_rtcp_ntp_time = AV_NOPTS_VALUE; |
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
279 s->first_rtcp_ntp_time = AV_NOPTS_VALUE; |
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
280 s->ic = s1; |
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
281 s->st = st; |
774 | 282 s->rtp_payload_data = rtp_payload_data; |
1445
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
283 rtp_init_statistics(&s->statistics, 0); // do we know the initial sequence from sdp? |
2759
b252e318023a
Remove the "AVRtpPayloadTypes[i].pt == i" assumption from RTP and RTSP
lucabe
parents:
2706
diff
changeset
|
284 if (!strcmp(ff_rtp_enc_name(payload_type), "MP2T")) { |
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
285 s->ts = mpegts_parse_open(s->ic); |
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
286 if (s->ts == NULL) { |
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
287 av_free(s); |
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
288 return NULL; |
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
289 } |
305 | 290 } else { |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
777
diff
changeset
|
291 switch(st->codec->codec_id) { |
305 | 292 case CODEC_ID_MPEG1VIDEO: |
293 case CODEC_ID_MPEG2VIDEO: | |
294 case CODEC_ID_MP2: | |
295 case CODEC_ID_MP3: | |
296 case CODEC_ID_MPEG4: | |
1419 | 297 case CODEC_ID_H264: |
2023 | 298 st->need_parsing = AVSTREAM_PARSE_FULL; |
305 | 299 break; |
300 default: | |
301 break; | |
302 } | |
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
303 } |
1425
00d9393a126f
make ffmpeg able to send back a RTCP receiver report.
gpoirier
parents:
1424
diff
changeset
|
304 // needed to send back RTCP RR in RTSP sessions |
00d9393a126f
make ffmpeg able to send back a RTCP receiver report.
gpoirier
parents:
1424
diff
changeset
|
305 s->rtp_ctx = rtpc; |
00d9393a126f
make ffmpeg able to send back a RTCP receiver report.
gpoirier
parents:
1424
diff
changeset
|
306 gethostname(s->hostname, sizeof(s->hostname)); |
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
307 return s; |
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
308 } |
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
309 |
774 | 310 static int rtp_parse_mp4_au(RTPDemuxContext *s, const uint8_t *buf) |
311 { | |
312 int au_headers_length, au_header_size, i; | |
313 GetBitContext getbitcontext; | |
314 rtp_payload_data_t *infos; | |
315 | |
316 infos = s->rtp_payload_data; | |
317 | |
318 if (infos == NULL) | |
319 return -1; | |
320 | |
3142 | 321 /* decode the first 2 bytes where the AUHeader sections are stored |
774 | 322 length in bits */ |
1673 | 323 au_headers_length = AV_RB16(buf); |
774 | 324 |
325 if (au_headers_length > RTP_MAX_PACKET_LENGTH) | |
326 return -1; | |
327 | |
328 infos->au_headers_length_bytes = (au_headers_length + 7) / 8; | |
329 | |
330 /* skip AU headers length section (2 bytes) */ | |
331 buf += 2; | |
332 | |
333 init_get_bits(&getbitcontext, buf, infos->au_headers_length_bytes * 8); | |
334 | |
335 /* XXX: Wrong if optionnal additional sections are present (cts, dts etc...) */ | |
336 au_header_size = infos->sizelength + infos->indexlength; | |
337 if (au_header_size <= 0 || (au_headers_length % au_header_size != 0)) | |
338 return -1; | |
339 | |
340 infos->nb_au_headers = au_headers_length / au_header_size; | |
341 infos->au_headers = av_malloc(sizeof(struct AUHeaders) * infos->nb_au_headers); | |
342 | |
343 /* XXX: We handle multiple AU Section as only one (need to fix this for interleaving) | |
2164 | 344 In my test, the FAAD decoder does not behave correctly when sending each AU one by one |
774 | 345 but does when sending the whole as one big packet... */ |
346 infos->au_headers[0].size = 0; | |
347 infos->au_headers[0].index = 0; | |
348 for (i = 0; i < infos->nb_au_headers; ++i) { | |
349 infos->au_headers[0].size += get_bits_long(&getbitcontext, infos->sizelength); | |
350 infos->au_headers[0].index = get_bits_long(&getbitcontext, infos->indexlength); | |
351 } | |
352 | |
353 infos->nb_au_headers = 1; | |
354 | |
355 return 0; | |
356 } | |
357 | |
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
358 /** |
1431
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1427
diff
changeset
|
359 * This was the second switch in rtp_parse packet. Normalizes time, if required, sets stream_index, etc. |
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1427
diff
changeset
|
360 */ |
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1427
diff
changeset
|
361 static void finalize_packet(RTPDemuxContext *s, AVPacket *pkt, uint32_t timestamp) |
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1427
diff
changeset
|
362 { |
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1427
diff
changeset
|
363 switch(s->st->codec->codec_id) { |
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1427
diff
changeset
|
364 case CODEC_ID_MP2: |
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1427
diff
changeset
|
365 case CODEC_ID_MPEG1VIDEO: |
2760 | 366 case CODEC_ID_MPEG2VIDEO: |
1431
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1427
diff
changeset
|
367 if (s->last_rtcp_ntp_time != AV_NOPTS_VALUE) { |
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1427
diff
changeset
|
368 int64_t addend; |
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1427
diff
changeset
|
369 |
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1427
diff
changeset
|
370 int delta_timestamp; |
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1427
diff
changeset
|
371 /* XXX: is it really necessary to unify the timestamp base ? */ |
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1427
diff
changeset
|
372 /* compute pts from timestamp with received ntp_time */ |
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1427
diff
changeset
|
373 delta_timestamp = timestamp - s->last_rtcp_timestamp; |
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1427
diff
changeset
|
374 /* convert to 90 kHz without overflow */ |
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1427
diff
changeset
|
375 addend = (s->last_rtcp_ntp_time - s->first_rtcp_ntp_time) >> 14; |
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1427
diff
changeset
|
376 addend = (addend * 5625) >> 14; |
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1427
diff
changeset
|
377 pkt->pts = addend + delta_timestamp; |
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1427
diff
changeset
|
378 } |
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1427
diff
changeset
|
379 break; |
1472
49d5a5ca2987
get rid of CODEC_ID_MPEG4AAC after next version bump, and change it to CODEC_ID_AAC where used
bcoudurier
parents:
1460
diff
changeset
|
380 case CODEC_ID_AAC: |
1431
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1427
diff
changeset
|
381 case CODEC_ID_H264: |
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1427
diff
changeset
|
382 case CODEC_ID_MPEG4: |
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1427
diff
changeset
|
383 pkt->pts = timestamp; |
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1427
diff
changeset
|
384 break; |
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1427
diff
changeset
|
385 default: |
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1427
diff
changeset
|
386 /* no timestamp info yet */ |
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1427
diff
changeset
|
387 break; |
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1427
diff
changeset
|
388 } |
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1427
diff
changeset
|
389 pkt->stream_index = s->st->index; |
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1427
diff
changeset
|
390 } |
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1427
diff
changeset
|
391 |
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1427
diff
changeset
|
392 /** |
885 | 393 * Parse an RTP or RTCP packet directly sent as a buffer. |
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
394 * @param s RTP parse context. |
0 | 395 * @param pkt returned packet |
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
396 * @param buf input buffer or NULL to read the next packets |
0 | 397 * @param len buffer len |
885 | 398 * @return 0 if a packet is returned, 1 if a packet is returned and more can follow |
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
399 * (use buf as NULL to read the next). -1 if no packet (error or no more packet). |
0 | 400 */ |
885 | 401 int rtp_parse_packet(RTPDemuxContext *s, AVPacket *pkt, |
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
402 const uint8_t *buf, int len) |
0 | 403 { |
404 unsigned int ssrc, h; | |
2941
6da0564c9d02
Add a flags field to the RTPDynamicPayloadPacketHandlerProc (PKT_FLAG_*).
rbultje
parents:
2918
diff
changeset
|
405 int payload_type, seq, ret, flags = 0; |
0 | 406 AVStream *st; |
65 | 407 uint32_t timestamp; |
1431
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1427
diff
changeset
|
408 int rv= 0; |
885 | 409 |
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
410 if (!buf) { |
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
411 /* return the next packets, if any */ |
1419 | 412 if(s->st && s->parse_packet) { |
1431
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1427
diff
changeset
|
413 timestamp= 0; ///< Should not be used if buf is NULL, but should be set to the timestamp of the packet returned.... |
2941
6da0564c9d02
Add a flags field to the RTPDynamicPayloadPacketHandlerProc (PKT_FLAG_*).
rbultje
parents:
2918
diff
changeset
|
414 rv= s->parse_packet(s, pkt, ×tamp, NULL, 0, flags); |
1431
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1427
diff
changeset
|
415 finalize_packet(s, pkt, timestamp); |
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1427
diff
changeset
|
416 return rv; |
1419 | 417 } else { |
1431
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1427
diff
changeset
|
418 // TODO: Move to a dynamic packet handler (like above) |
1424
1c39ce5c6a5d
indentation fix, patch by Ryan Martell % rdm4 A martellventures P com %
gpoirier
parents:
1419
diff
changeset
|
419 if (s->read_buf_index >= s->read_buf_size) |
1c39ce5c6a5d
indentation fix, patch by Ryan Martell % rdm4 A martellventures P com %
gpoirier
parents:
1419
diff
changeset
|
420 return -1; |
1c39ce5c6a5d
indentation fix, patch by Ryan Martell % rdm4 A martellventures P com %
gpoirier
parents:
1419
diff
changeset
|
421 ret = mpegts_parse_packet(s->ts, pkt, s->buf + s->read_buf_index, |
1c39ce5c6a5d
indentation fix, patch by Ryan Martell % rdm4 A martellventures P com %
gpoirier
parents:
1419
diff
changeset
|
422 s->read_buf_size - s->read_buf_index); |
1c39ce5c6a5d
indentation fix, patch by Ryan Martell % rdm4 A martellventures P com %
gpoirier
parents:
1419
diff
changeset
|
423 if (ret < 0) |
1c39ce5c6a5d
indentation fix, patch by Ryan Martell % rdm4 A martellventures P com %
gpoirier
parents:
1419
diff
changeset
|
424 return -1; |
1c39ce5c6a5d
indentation fix, patch by Ryan Martell % rdm4 A martellventures P com %
gpoirier
parents:
1419
diff
changeset
|
425 s->read_buf_index += ret; |
1c39ce5c6a5d
indentation fix, patch by Ryan Martell % rdm4 A martellventures P com %
gpoirier
parents:
1419
diff
changeset
|
426 if (s->read_buf_index < s->read_buf_size) |
1c39ce5c6a5d
indentation fix, patch by Ryan Martell % rdm4 A martellventures P com %
gpoirier
parents:
1419
diff
changeset
|
427 return 1; |
1c39ce5c6a5d
indentation fix, patch by Ryan Martell % rdm4 A martellventures P com %
gpoirier
parents:
1419
diff
changeset
|
428 else |
1c39ce5c6a5d
indentation fix, patch by Ryan Martell % rdm4 A martellventures P com %
gpoirier
parents:
1419
diff
changeset
|
429 return 0; |
1419 | 430 } |
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
431 } |
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
432 |
0 | 433 if (len < 12) |
434 return -1; | |
435 | |
436 if ((buf[0] & 0xc0) != (RTP_VERSION << 6)) | |
437 return -1; | |
438 if (buf[1] >= 200 && buf[1] <= 204) { | |
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
439 rtcp_parse_packet(s, buf, len); |
0 | 440 return -1; |
441 } | |
442 payload_type = buf[1] & 0x7f; | |
2222 | 443 seq = AV_RB16(buf + 2); |
2167
c4244900f986
remove decode_be32/64 and replace them by AV_RB32/64
benoit
parents:
2164
diff
changeset
|
444 timestamp = AV_RB32(buf + 4); |
c4244900f986
remove decode_be32/64 and replace them by AV_RB32/64
benoit
parents:
2164
diff
changeset
|
445 ssrc = AV_RB32(buf + 8); |
1425
00d9393a126f
make ffmpeg able to send back a RTCP receiver report.
gpoirier
parents:
1424
diff
changeset
|
446 /* store the ssrc in the RTPDemuxContext */ |
00d9393a126f
make ffmpeg able to send back a RTCP receiver report.
gpoirier
parents:
1424
diff
changeset
|
447 s->ssrc = ssrc; |
885 | 448 |
0 | 449 /* NOTE: we can handle only one payload type */ |
450 if (s->payload_type != payload_type) | |
451 return -1; | |
986
f5194ed612b5
fix debug code: do not try to take st->codec if st is NULL. This makes ffplay give me pics from FreeBoxTV \o/
mmu_man
parents:
896
diff
changeset
|
452 |
f5194ed612b5
fix debug code: do not try to take st->codec if st is NULL. This makes ffplay give me pics from FreeBoxTV \o/
mmu_man
parents:
896
diff
changeset
|
453 st = s->st; |
1445
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
454 // only do something with this if all the rtp checks pass... |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
455 if(!rtp_valid_packet_in_sequence(&s->statistics, seq)) |
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
456 { |
986
f5194ed612b5
fix debug code: do not try to take st->codec if st is NULL. This makes ffplay give me pics from FreeBoxTV \o/
mmu_man
parents:
896
diff
changeset
|
457 av_log(st?st->codec:NULL, AV_LOG_ERROR, "RTP: PT=%02x: bad cseq %04x expected=%04x\n", |
0 | 458 payload_type, seq, ((s->seq + 1) & 0xffff)); |
1445
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
459 return -1; |
0 | 460 } |
1445
db97355877b1
add valid statistics for the RTCP receiver report.
gpoirier
parents:
1443
diff
changeset
|
461 |
0 | 462 s->seq = seq; |
463 len -= 12; | |
464 buf += 12; | |
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
465 |
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
466 if (!st) { |
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
467 /* specific MPEG2TS demux support */ |
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
468 ret = mpegts_parse_packet(s->ts, pkt, buf, len); |
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
469 if (ret < 0) |
0 | 470 return -1; |
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
471 if (ret < len) { |
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
472 s->read_buf_size = len - ret; |
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
473 memcpy(s->buf, buf + ret, s->read_buf_size); |
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
474 s->read_buf_index = 0; |
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
475 return 1; |
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
476 } |
2917
62ff44e23c10
Make rtp_parse_packet() always call the vfunc of the dynamic payload handler
rbultje
parents:
2891
diff
changeset
|
477 } else if (s->parse_packet) { |
2941
6da0564c9d02
Add a flags field to the RTPDynamicPayloadPacketHandlerProc (PKT_FLAG_*).
rbultje
parents:
2918
diff
changeset
|
478 rv = s->parse_packet(s, pkt, ×tamp, buf, len, flags); |
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
479 } else { |
1419 | 480 // at this point, the RTP header has been stripped; This is ASSUMING that there is only 1 CSRC, which in't wise. |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
777
diff
changeset
|
481 switch(st->codec->codec_id) { |
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
482 case CODEC_ID_MP2: |
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
483 /* better than nothing: skip mpeg audio RTP header */ |
0 | 484 if (len <= 4) |
485 return -1; | |
2167
c4244900f986
remove decode_be32/64 and replace them by AV_RB32/64
benoit
parents:
2164
diff
changeset
|
486 h = AV_RB32(buf); |
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
487 len -= 4; |
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
488 buf += 4; |
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
489 av_new_packet(pkt, len); |
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
490 memcpy(pkt->data, buf, len); |
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
491 break; |
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
492 case CODEC_ID_MPEG1VIDEO: |
2760 | 493 case CODEC_ID_MPEG2VIDEO: |
305 | 494 /* better than nothing: skip mpeg video RTP header */ |
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
495 if (len <= 4) |
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
496 return -1; |
2167
c4244900f986
remove decode_be32/64 and replace them by AV_RB32/64
benoit
parents:
2164
diff
changeset
|
497 h = AV_RB32(buf); |
0 | 498 buf += 4; |
499 len -= 4; | |
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
500 if (h & (1 << 26)) { |
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
501 /* mpeg2 */ |
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
502 if (len <= 4) |
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
503 return -1; |
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
504 buf += 4; |
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
505 len -= 4; |
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
506 } |
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
507 av_new_packet(pkt, len); |
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
508 memcpy(pkt->data, buf, len); |
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
509 break; |
1427
f1614c754d5b
move up (in the file) AAC audio handling moved from below
gpoirier
parents:
1425
diff
changeset
|
510 // moved from below, verbatim. this is because this section handles packets, and the lower switch handles |
f1614c754d5b
move up (in the file) AAC audio handling moved from below
gpoirier
parents:
1425
diff
changeset
|
511 // timestamps. |
f1614c754d5b
move up (in the file) AAC audio handling moved from below
gpoirier
parents:
1425
diff
changeset
|
512 // TODO: Put this into a dynamic packet handler... |
1472
49d5a5ca2987
get rid of CODEC_ID_MPEG4AAC after next version bump, and change it to CODEC_ID_AAC where used
bcoudurier
parents:
1460
diff
changeset
|
513 case CODEC_ID_AAC: |
1427
f1614c754d5b
move up (in the file) AAC audio handling moved from below
gpoirier
parents:
1425
diff
changeset
|
514 if (rtp_parse_mp4_au(s, buf)) |
f1614c754d5b
move up (in the file) AAC audio handling moved from below
gpoirier
parents:
1425
diff
changeset
|
515 return -1; |
f1614c754d5b
move up (in the file) AAC audio handling moved from below
gpoirier
parents:
1425
diff
changeset
|
516 { |
f1614c754d5b
move up (in the file) AAC audio handling moved from below
gpoirier
parents:
1425
diff
changeset
|
517 rtp_payload_data_t *infos = s->rtp_payload_data; |
f1614c754d5b
move up (in the file) AAC audio handling moved from below
gpoirier
parents:
1425
diff
changeset
|
518 if (infos == NULL) |
f1614c754d5b
move up (in the file) AAC audio handling moved from below
gpoirier
parents:
1425
diff
changeset
|
519 return -1; |
f1614c754d5b
move up (in the file) AAC audio handling moved from below
gpoirier
parents:
1425
diff
changeset
|
520 buf += infos->au_headers_length_bytes + 2; |
f1614c754d5b
move up (in the file) AAC audio handling moved from below
gpoirier
parents:
1425
diff
changeset
|
521 len -= infos->au_headers_length_bytes + 2; |
f1614c754d5b
move up (in the file) AAC audio handling moved from below
gpoirier
parents:
1425
diff
changeset
|
522 |
f1614c754d5b
move up (in the file) AAC audio handling moved from below
gpoirier
parents:
1425
diff
changeset
|
523 /* XXX: Fixme we only handle the case where rtp_parse_mp4_au define |
f1614c754d5b
move up (in the file) AAC audio handling moved from below
gpoirier
parents:
1425
diff
changeset
|
524 one au_header */ |
f1614c754d5b
move up (in the file) AAC audio handling moved from below
gpoirier
parents:
1425
diff
changeset
|
525 av_new_packet(pkt, infos->au_headers[0].size); |
f1614c754d5b
move up (in the file) AAC audio handling moved from below
gpoirier
parents:
1425
diff
changeset
|
526 memcpy(pkt->data, buf, infos->au_headers[0].size); |
f1614c754d5b
move up (in the file) AAC audio handling moved from below
gpoirier
parents:
1425
diff
changeset
|
527 buf += infos->au_headers[0].size; |
f1614c754d5b
move up (in the file) AAC audio handling moved from below
gpoirier
parents:
1425
diff
changeset
|
528 len -= infos->au_headers[0].size; |
f1614c754d5b
move up (in the file) AAC audio handling moved from below
gpoirier
parents:
1425
diff
changeset
|
529 } |
f1614c754d5b
move up (in the file) AAC audio handling moved from below
gpoirier
parents:
1425
diff
changeset
|
530 s->read_buf_size = len; |
1431
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1427
diff
changeset
|
531 rv= 0; |
1427
f1614c754d5b
move up (in the file) AAC audio handling moved from below
gpoirier
parents:
1425
diff
changeset
|
532 break; |
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
533 default: |
2918
9e85e46922b5
Reindent after r11493 (always use parse_packet() vfunc in rtp_parse_packet()),
rbultje
parents:
2917
diff
changeset
|
534 av_new_packet(pkt, len); |
9e85e46922b5
Reindent after r11493 (always use parse_packet() vfunc in rtp_parse_packet()),
rbultje
parents:
2917
diff
changeset
|
535 memcpy(pkt->data, buf, len); |
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
536 break; |
0 | 537 } |
885 | 538 |
1431
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1427
diff
changeset
|
539 // now perform timestamp things.... |
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1427
diff
changeset
|
540 finalize_packet(s, pkt, timestamp); |
0 | 541 } |
1431
2d8a17631520
fix more dynamic protocol stuff, needed by the forthcoming h264
gpoirier
parents:
1427
diff
changeset
|
542 return rv; |
0 | 543 } |
544 | |
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
545 void rtp_parse_close(RTPDemuxContext *s) |
0 | 546 { |
1419 | 547 // TODO: fold this into the protocol specific data fields. |
2759
b252e318023a
Remove the "AVRtpPayloadTypes[i].pt == i" assumption from RTP and RTSP
lucabe
parents:
2706
diff
changeset
|
548 if (!strcmp(ff_rtp_enc_name(s->payload_type), "MP2T")) { |
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
549 mpegts_parse_close(s->ts); |
0 | 550 } |
294
6091b76cfc2a
added MPEG2TS support in RTP, SDP and RTSP - replaced fake RTP demux by a specific API
bellard
parents:
241
diff
changeset
|
551 av_free(s); |
0 | 552 } |