X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Frtpdec.c;h=03abb1dcff477eedfed76be793a0e4945bfc079b;hb=6dc7dc08ed66524f174ad2c0a5e32178a1173434;hp=f350251f1164d4f7390529e12b51a9984b22a238;hpb=51291e60052329b438ea26cbf6baf6ce79e44ad5;p=ffmpeg diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c index f350251f116..03abb1dcff4 100644 --- a/libavformat/rtpdec.c +++ b/libavformat/rtpdec.c @@ -27,6 +27,7 @@ #include "mpegts.h" #include +#include #include "network.h" #include "rtpdec.h" @@ -43,6 +44,12 @@ 'url_open_dyn_packet_buf') */ +RTPDynamicProtocolHandler ff_realmedia_mp3_dynamic_handler = { + .enc_name = "X-MP3-draft-00", + .codec_type = AVMEDIA_TYPE_AUDIO, + .codec_id = CODEC_ID_MP3ADU, +}; + /* statistics functions */ RTPDynamicProtocolHandler *RTPFirstDynamicPayloadHandler= NULL; @@ -67,20 +74,73 @@ void av_register_rtp_dynamic_payload_handlers(void) ff_register_dynamic_payload_handler(&ff_svq3_dynamic_handler); ff_register_dynamic_payload_handler(&ff_mp4a_latm_dynamic_handler); ff_register_dynamic_payload_handler(&ff_vp8_dynamic_handler); + ff_register_dynamic_payload_handler(&ff_qcelp_dynamic_handler); + ff_register_dynamic_payload_handler(&ff_realmedia_mp3_dynamic_handler); ff_register_dynamic_payload_handler(&ff_ms_rtp_asf_pfv_handler); ff_register_dynamic_payload_handler(&ff_ms_rtp_asf_pfa_handler); + + ff_register_dynamic_payload_handler(&ff_qt_rtp_aud_handler); + ff_register_dynamic_payload_handler(&ff_qt_rtp_vid_handler); + ff_register_dynamic_payload_handler(&ff_quicktime_rtp_aud_handler); + ff_register_dynamic_payload_handler(&ff_quicktime_rtp_vid_handler); +} + +RTPDynamicProtocolHandler *ff_rtp_handler_find_by_name(const char *name, + enum AVMediaType codec_type) +{ + RTPDynamicProtocolHandler *handler; + for (handler = RTPFirstDynamicPayloadHandler; + handler; handler = handler->next) + if (!strcasecmp(name, handler->enc_name) && + codec_type == handler->codec_type) + return handler; + return NULL; +} + +RTPDynamicProtocolHandler *ff_rtp_handler_find_by_id(int id, + enum AVMediaType codec_type) +{ + RTPDynamicProtocolHandler *handler; + for (handler = RTPFirstDynamicPayloadHandler; + handler; handler = handler->next) + if (handler->static_payload_id && handler->static_payload_id == id && + codec_type == handler->codec_type) + return handler; + return NULL; } static int rtcp_parse_packet(RTPDemuxContext *s, const unsigned char *buf, int len) { - if (buf[1] != 200) - return -1; - s->last_rtcp_ntp_time = AV_RB64(buf + 8); - if (s->first_rtcp_ntp_time == AV_NOPTS_VALUE) - s->first_rtcp_ntp_time = s->last_rtcp_ntp_time; - s->last_rtcp_timestamp = AV_RB32(buf + 16); - return 0; + int payload_len; + while (len >= 2) { + switch (buf[1]) { + case RTCP_SR: + if (len < 16) { + av_log(NULL, AV_LOG_ERROR, "Invalid length for RTCP SR packet\n"); + return AVERROR_INVALIDDATA; + } + payload_len = (AV_RB16(buf + 2) + 1) * 4; + + s->last_rtcp_ntp_time = AV_RB64(buf + 8); + s->last_rtcp_timestamp = AV_RB32(buf + 16); + if (s->first_rtcp_ntp_time == AV_NOPTS_VALUE) { + s->first_rtcp_ntp_time = s->last_rtcp_ntp_time; + if (!s->base_timestamp) + s->base_timestamp = s->last_rtcp_timestamp; + s->rtcp_ts_offset = s->last_rtcp_timestamp - s->base_timestamp; + } + + buf += payload_len; + len -= payload_len; + break; + case RTCP_BYE: + return -RTCP_BYE; + default: + return -1; + } + } + return -1; } #define RTP_SEQ_MOD (1<<16) @@ -209,10 +269,11 @@ int rtp_check_and_send_back_rr(RTPDemuxContext *s, int count) // Receiver Report put_byte(pb, (RTP_VERSION << 6) + 1); /* 1 report block */ - put_byte(pb, 201); + put_byte(pb, RTCP_RR); put_be16(pb, 7); /* length in words - 1 */ - put_be32(pb, s->ssrc); // our own SSRC - put_be32(pb, s->ssrc); // XXX: should be the server's here! + // our own SSRC: we use the server's SSRC + 1 to avoid conflicts + put_be32(pb, s->ssrc + 1); + put_be32(pb, s->ssrc); // server SSRC // some placeholders we should really fill... // RFC 1889/p64 extended_max= stats->cycles + stats->max_seq; @@ -247,7 +308,7 @@ int rtp_check_and_send_back_rr(RTPDemuxContext *s, int count) // CNAME put_byte(pb, (RTP_VERSION << 6) + 1); /* 1 report block */ - put_byte(pb, 202); + put_byte(pb, RTCP_SDES); len = strlen(s->hostname); put_be16(pb, (6 + len + 3) / 4); /* length in words - 1 */ put_be32(pb, s->ssrc); @@ -298,7 +359,7 @@ void rtp_send_punch_packets(URLContext* rtp_handle) return; put_byte(pb, (RTP_VERSION << 6)); - put_byte(pb, 201); /* receiver report */ + put_byte(pb, RTCP_RR); /* receiver report */ put_be16(pb, 1); /* length in words - 1 */ put_be32(pb, 0); /* our own SSRC */ @@ -315,7 +376,7 @@ void rtp_send_punch_packets(URLContext* rtp_handle) * MPEG2TS streams to indicate that they should be demuxed inside the * rtp demux (otherwise CODEC_ID_MPEG2TS packets are returned) */ -RTPDemuxContext *rtp_parse_open(AVFormatContext *s1, AVStream *st, URLContext *rtpc, int payload_type) +RTPDemuxContext *rtp_parse_open(AVFormatContext *s1, AVStream *st, URLContext *rtpc, int payload_type, int queue_size) { RTPDemuxContext *s; @@ -327,6 +388,7 @@ RTPDemuxContext *rtp_parse_open(AVFormatContext *s1, AVStream *st, URLContext *r s->first_rtcp_ntp_time = AV_NOPTS_VALUE; s->ic = s1; s->st = st; + s->queue_size = queue_size; rtp_init_statistics(&s->statistics, 0); // do we know the initial sequence from sdp? if (!strcmp(ff_rtp_enc_name(payload_type), "MP2T")) { s->ts = ff_mpegts_parse_open(s->ic); @@ -335,7 +397,6 @@ RTPDemuxContext *rtp_parse_open(AVFormatContext *s1, AVStream *st, URLContext *r return NULL; } } else { - av_set_pts_info(st, 32, 1, 90000); switch(st->codec->codec_id) { case CODEC_ID_MPEG1VIDEO: case CODEC_ID_MPEG2VIDEO: @@ -346,10 +407,13 @@ RTPDemuxContext *rtp_parse_open(AVFormatContext *s1, AVStream *st, URLContext *r case CODEC_ID_H264: st->need_parsing = AVSTREAM_PARSE_FULL; break; + case CODEC_ID_ADPCM_G722: + /* According to RFC 3551, the stream clock rate is 8000 + * even if the sample rate is 16000. */ + if (st->codec->sample_rate == 8000) + st->codec->sample_rate = 16000; + break; default: - if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO) { - av_set_pts_info(st, 32, 1, st->codec->sample_rate); - } break; } } @@ -372,6 +436,8 @@ rtp_parse_set_dynamic_protocol(RTPDemuxContext *s, PayloadContext *ctx, */ static void finalize_packet(RTPDemuxContext *s, AVPacket *pkt, uint32_t timestamp) { + if (pkt->pts != AV_NOPTS_VALUE || pkt->dts != AV_NOPTS_VALUE) + return; /* Timestamp already set by depacketizer */ if (s->last_rtcp_ntp_time != AV_NOPTS_VALUE && timestamp != RTP_NOTS_VALUE) { int64_t addend; int delta_timestamp; @@ -380,63 +446,28 @@ static void finalize_packet(RTPDemuxContext *s, AVPacket *pkt, uint32_t timestam delta_timestamp = timestamp - s->last_rtcp_timestamp; /* convert to the PTS timebase */ addend = av_rescale(s->last_rtcp_ntp_time - s->first_rtcp_ntp_time, s->st->time_base.den, (uint64_t)s->st->time_base.num << 32); - pkt->pts = s->range_start_offset + addend + delta_timestamp; + pkt->pts = s->range_start_offset + s->rtcp_ts_offset + addend + + delta_timestamp; + return; } + if (timestamp == RTP_NOTS_VALUE) + return; + if (!s->base_timestamp) + s->base_timestamp = timestamp; + pkt->pts = s->range_start_offset + timestamp - s->base_timestamp; } -/** - * Parse an RTP or RTCP packet directly sent as a buffer. - * @param s RTP parse context. - * @param pkt returned packet - * @param buf input buffer or NULL to read the next packets - * @param len buffer len - * @return 0 if a packet is returned, 1 if a packet is returned and more can follow - * (use buf as NULL to read the next). -1 if no packet (error or no more packet). - */ -int rtp_parse_packet(RTPDemuxContext *s, AVPacket *pkt, - const uint8_t *buf, int len) +static int rtp_parse_packet_internal(RTPDemuxContext *s, AVPacket *pkt, + const uint8_t *buf, int len) { unsigned int ssrc, h; int payload_type, seq, ret, flags = 0; + int ext; AVStream *st; uint32_t timestamp; int rv= 0; - if (!buf) { - /* return the next packets, if any */ - if(s->st && s->parse_packet) { - /* timestamp should be overwritten by parse_packet, if not, - * the packet is left with pts == AV_NOPTS_VALUE */ - timestamp = RTP_NOTS_VALUE; - rv= s->parse_packet(s->ic, s->dynamic_protocol_context, - s->st, pkt, ×tamp, NULL, 0, flags); - finalize_packet(s, pkt, timestamp); - return rv; - } else { - // TODO: Move to a dynamic packet handler (like above) - if (s->read_buf_index >= s->read_buf_size) - return -1; - ret = ff_mpegts_parse_packet(s->ts, pkt, s->buf + s->read_buf_index, - s->read_buf_size - s->read_buf_index); - if (ret < 0) - return -1; - s->read_buf_index += ret; - if (s->read_buf_index < s->read_buf_size) - return 1; - else - return 0; - } - } - - if (len < 12) - return -1; - - if ((buf[0] & 0xc0) != (RTP_VERSION << 6)) - return -1; - if (buf[1] >= 200 && buf[1] <= 204) { - rtcp_parse_packet(s, buf, len); - return -1; - } + ext = buf[0] & 0x10; payload_type = buf[1] & 0x7f; if (buf[1] & 0x80) flags |= RTP_FLAG_MARKER; @@ -459,15 +490,39 @@ int rtp_parse_packet(RTPDemuxContext *s, AVPacket *pkt, return -1; } + if (buf[0] & 0x20) { + int padding = buf[len - 1]; + if (len >= 12 + padding) + len -= padding; + } + s->seq = seq; len -= 12; buf += 12; + /* RFC 3550 Section 5.3.1 RTP Header Extension handling */ + if (ext) { + if (len < 4) + return -1; + /* calculate the header extension length (stored as number + * of 32-bit words) */ + ext = (AV_RB16(buf + 2) + 1) << 2; + + if (len < ext) + return -1; + // skip past RTP header extension + len -= ext; + buf += ext; + } + if (!st) { /* specific MPEG2TS demux support */ ret = ff_mpegts_parse_packet(s->ts, pkt, buf, len); + /* The only error that can be returned from ff_mpegts_parse_packet + * is "no more data to return from the provided buffer", so return + * AVERROR(EAGAIN) for all errors */ if (ret < 0) - return -1; + return AVERROR(EAGAIN); if (ret < len) { s->read_buf_size = len - ret; memcpy(s->buf, buf + ret, s->read_buf_size); @@ -525,8 +580,178 @@ int rtp_parse_packet(RTPDemuxContext *s, AVPacket *pkt, return rv; } +void ff_rtp_reset_packet_queue(RTPDemuxContext *s) +{ + while (s->queue) { + RTPPacket *next = s->queue->next; + av_free(s->queue->buf); + av_free(s->queue); + s->queue = next; + } + s->seq = 0; + s->queue_len = 0; + s->prev_ret = 0; +} + +static void enqueue_packet(RTPDemuxContext *s, uint8_t *buf, int len) +{ + uint16_t seq = AV_RB16(buf + 2); + RTPPacket *cur = s->queue, *prev = NULL, *packet; + + /* Find the correct place in the queue to insert the packet */ + while (cur) { + int16_t diff = seq - cur->seq; + if (diff < 0) + break; + prev = cur; + cur = cur->next; + } + + packet = av_mallocz(sizeof(*packet)); + if (!packet) + return; + packet->recvtime = av_gettime(); + packet->seq = seq; + packet->len = len; + packet->buf = buf; + packet->next = cur; + if (prev) + prev->next = packet; + else + s->queue = packet; + s->queue_len++; +} + +static int has_next_packet(RTPDemuxContext *s) +{ + return s->queue && s->queue->seq == (uint16_t) (s->seq + 1); +} + +int64_t ff_rtp_queued_packet_time(RTPDemuxContext *s) +{ + return s->queue ? s->queue->recvtime : 0; +} + +static int rtp_parse_queued_packet(RTPDemuxContext *s, AVPacket *pkt) +{ + int rv; + RTPPacket *next; + + if (s->queue_len <= 0) + return -1; + + if (!has_next_packet(s)) + av_log(s->st ? s->st->codec : NULL, AV_LOG_WARNING, + "RTP: missed %d packets\n", s->queue->seq - s->seq - 1); + + /* Parse the first packet in the queue, and dequeue it */ + rv = rtp_parse_packet_internal(s, pkt, s->queue->buf, s->queue->len); + next = s->queue->next; + av_free(s->queue->buf); + av_free(s->queue); + s->queue = next; + s->queue_len--; + return rv; +} + +static int rtp_parse_one_packet(RTPDemuxContext *s, AVPacket *pkt, + uint8_t **bufptr, int len) +{ + uint8_t* buf = bufptr ? *bufptr : NULL; + int ret, flags = 0; + uint32_t timestamp; + int rv= 0; + + if (!buf) { + /* If parsing of the previous packet actually returned 0 or an error, + * there's nothing more to be parsed from that packet, but we may have + * indicated that we can return the next enqueued packet. */ + if (s->prev_ret <= 0) + return rtp_parse_queued_packet(s, pkt); + /* return the next packets, if any */ + if(s->st && s->parse_packet) { + /* timestamp should be overwritten by parse_packet, if not, + * the packet is left with pts == AV_NOPTS_VALUE */ + timestamp = RTP_NOTS_VALUE; + rv= s->parse_packet(s->ic, s->dynamic_protocol_context, + s->st, pkt, ×tamp, NULL, 0, flags); + finalize_packet(s, pkt, timestamp); + return rv; + } else { + // TODO: Move to a dynamic packet handler (like above) + if (s->read_buf_index >= s->read_buf_size) + return AVERROR(EAGAIN); + ret = ff_mpegts_parse_packet(s->ts, pkt, s->buf + s->read_buf_index, + s->read_buf_size - s->read_buf_index); + if (ret < 0) + return AVERROR(EAGAIN); + s->read_buf_index += ret; + if (s->read_buf_index < s->read_buf_size) + return 1; + else + return 0; + } + } + + if (len < 12) + return -1; + + if ((buf[0] & 0xc0) != (RTP_VERSION << 6)) + return -1; + if (buf[1] >= RTCP_SR && buf[1] <= RTCP_APP) { + return rtcp_parse_packet(s, buf, len); + } + + if ((s->seq == 0 && !s->queue) || s->queue_size <= 1) { + /* First packet, or no reordering */ + return rtp_parse_packet_internal(s, pkt, buf, len); + } else { + uint16_t seq = AV_RB16(buf + 2); + int16_t diff = seq - s->seq; + if (diff < 0) { + /* Packet older than the previously emitted one, drop */ + av_log(s->st ? s->st->codec : NULL, AV_LOG_WARNING, + "RTP: dropping old packet received too late\n"); + return -1; + } else if (diff <= 1) { + /* Correct packet */ + rv = rtp_parse_packet_internal(s, pkt, buf, len); + return rv; + } else { + /* Still missing some packet, enqueue this one. */ + enqueue_packet(s, buf, len); + *bufptr = NULL; + /* Return the first enqueued packet if the queue is full, + * even if we're missing something */ + if (s->queue_len >= s->queue_size) + return rtp_parse_queued_packet(s, pkt); + return -1; + } + } +} + +/** + * Parse an RTP or RTCP packet directly sent as a buffer. + * @param s RTP parse context. + * @param pkt returned packet + * @param bufptr pointer to the input buffer or NULL to read the next packets + * @param len buffer len + * @return 0 if a packet is returned, 1 if a packet is returned and more can follow + * (use buf as NULL to read the next). -1 if no packet (error or no more packet). + */ +int rtp_parse_packet(RTPDemuxContext *s, AVPacket *pkt, + uint8_t **bufptr, int len) +{ + int rv = rtp_parse_one_packet(s, pkt, bufptr, len); + s->prev_ret = rv; + while (rv == AVERROR(EAGAIN) && has_next_packet(s)) + rv = rtp_parse_queued_packet(s, pkt); + return rv ? rv : has_next_packet(s); +} + void rtp_parse_close(RTPDemuxContext *s) { + ff_rtp_reset_packet_queue(s); if (!strcmp(ff_rtp_enc_name(s->payload_type), "MP2T")) { ff_mpegts_parse_close(s->ts); }