X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Frtpdec_mpeg4.c;h=4aedeea6bed0336daf9ea71e16cd3882fc33c9f9;hb=a28468d0daf4be14761c16a3ddd33266b2380123;hp=a4b3ae499771df366594880817049b39a2cae3cc;hpb=ca937a5508ab6054ca4d6969232afcdcad39f701;p=ffmpeg diff --git a/libavformat/rtpdec_mpeg4.c b/libavformat/rtpdec_mpeg4.c index a4b3ae49977..4aedeea6bed 100644 --- a/libavformat/rtpdec_mpeg4.c +++ b/libavformat/rtpdec_mpeg4.c @@ -1,22 +1,22 @@ -/** +/* * Common code for the RTP depacketization of MPEG-4 formats. * Copyright (c) 2010 Fabrice Bellard * Romain Degez * - * This file is part of FFmpeg. + * This file is part of Libav. * - * FFmpeg is free software; you can redistribute it and/or + * Libav is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * FFmpeg is distributed in the hope that it will be useful, + * Libav is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software + * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -27,15 +27,14 @@ * @author Romain Degez */ -#include "rtpdec_mpeg4.h" +#include "rtpdec_formats.h" #include "internal.h" +#include "libavutil/attributes.h" #include "libavutil/avstring.h" #include "libavcodec/get_bits.h" -#include -/** Structure listing useful vars to parse RTP packet payload*/ -struct PayloadContext -{ +/** Structure listing useful vars to parse RTP packet payload */ +struct PayloadContext { int sizelength; int indexlength; int indexdeltalength; @@ -59,36 +58,10 @@ struct PayloadContext int nb_au_headers; int au_headers_length_bytes; int cur_au_index; -}; -/* return the length and optionally the data */ -static int hex_to_data(uint8_t *data, const char *p) -{ - int c, len, v; - - len = 0; - v = 1; - for (;;) { - p += strspn(p, SPACE_CHARS); - if (*p == '\0') - break; - c = toupper((unsigned char) *p++); - if (c >= '0' && c <= '9') - c = c - '0'; - else if (c >= 'A' && c <= 'F') - c = c - 'A' + 10; - else - break; - v = (v << 4) | c; - if (v & 0x100) { - if (data) - data[len] = v; - len++; - v = 1; - } - } - return len; -} + uint8_t buf[RTP_MAX_PACKET_LENGTH]; + int buf_pos, buf_size; +}; typedef struct { const char *str; @@ -99,8 +72,7 @@ typedef struct { /* All known fmtp parameters and the corresponding RTPAttrTypeEnum */ #define ATTR_NAME_TYPE_INT 0 #define ATTR_NAME_TYPE_STR 1 -static const AttrNameMap attr_names[]= -{ +static const AttrNameMap attr_names[] = { { "SizeLength", ATTR_NAME_TYPE_INT, offsetof(PayloadContext, sizelength) }, { "IndexLength", ATTR_NAME_TYPE_INT, @@ -121,40 +93,34 @@ static PayloadContext *new_context(void) return av_mallocz(sizeof(PayloadContext)); } -static void free_context(PayloadContext * data) +static void free_context(PayloadContext *data) { - int i; - for (i = 0; i < data->nb_au_headers; i++) { - /* according to rtp_parse_mp4_au, we treat multiple - * au headers as one, so nb_au_headers is always 1. - * loop anyway in case this changes. - * (note: changes done carelessly might lead to a double free) - */ - av_free(&data->au_headers[i]); - } + av_free(data->au_headers); av_free(data->mode); av_free(data); } -static int parse_fmtp_config(AVCodecContext * codec, char *value) +static int parse_fmtp_config(AVCodecContext *codec, char *value) { /* decode the hexa encoded parameter */ - int len = hex_to_data(NULL, value); - if (codec->extradata) - av_free(codec->extradata); + int len = ff_hex_to_data(NULL, value); + av_free(codec->extradata); codec->extradata = av_mallocz(len + FF_INPUT_BUFFER_PADDING_SIZE); if (!codec->extradata) return AVERROR(ENOMEM); codec->extradata_size = len; - hex_to_data(codec->extradata, value); + ff_hex_to_data(codec->extradata, value); return 0; } -static int rtp_parse_mp4_au(PayloadContext *infos, const uint8_t *buf) +static int rtp_parse_mp4_au(PayloadContext *data, const uint8_t *buf, int len) { int au_headers_length, au_header_size, i; GetBitContext getbitcontext; + if (len < 2) + return AVERROR_INVALIDDATA; + /* decode the first 2 bytes where the AUHeader sections are stored length in bits */ au_headers_length = AV_RB16(buf); @@ -162,125 +128,155 @@ static int rtp_parse_mp4_au(PayloadContext *infos, const uint8_t *buf) if (au_headers_length > RTP_MAX_PACKET_LENGTH) return -1; - infos->au_headers_length_bytes = (au_headers_length + 7) / 8; + data->au_headers_length_bytes = (au_headers_length + 7) / 8; /* skip AU headers length section (2 bytes) */ buf += 2; + len -= 2; + + if (len < data->au_headers_length_bytes) + return AVERROR_INVALIDDATA; - init_get_bits(&getbitcontext, buf, infos->au_headers_length_bytes * 8); + init_get_bits(&getbitcontext, buf, data->au_headers_length_bytes * 8); /* XXX: Wrong if optionnal additional sections are present (cts, dts etc...) */ - au_header_size = infos->sizelength + infos->indexlength; + au_header_size = data->sizelength + data->indexlength; if (au_header_size <= 0 || (au_headers_length % au_header_size != 0)) return -1; - infos->nb_au_headers = au_headers_length / au_header_size; - if (!infos->au_headers || infos->au_headers_allocated < infos->nb_au_headers) { - av_free(infos->au_headers); - infos->au_headers = av_malloc(sizeof(struct AUHeaders) * infos->nb_au_headers); - infos->au_headers_allocated = infos->nb_au_headers; + data->nb_au_headers = au_headers_length / au_header_size; + if (!data->au_headers || data->au_headers_allocated < data->nb_au_headers) { + av_free(data->au_headers); + data->au_headers = av_malloc(sizeof(struct AUHeaders) * data->nb_au_headers); + if (!data->au_headers) + return AVERROR(ENOMEM); + data->au_headers_allocated = data->nb_au_headers; } - /* XXX: We handle multiple AU Section as only one (need to fix this for interleaving) - In my test, the FAAD decoder does not behave correctly when sending each AU one by one - but does when sending the whole as one big packet... */ - infos->au_headers[0].size = 0; - infos->au_headers[0].index = 0; - for (i = 0; i < infos->nb_au_headers; ++i) { - infos->au_headers[0].size += get_bits_long(&getbitcontext, infos->sizelength); - infos->au_headers[0].index = get_bits_long(&getbitcontext, infos->indexlength); + for (i = 0; i < data->nb_au_headers; ++i) { + data->au_headers[i].size = get_bits_long(&getbitcontext, data->sizelength); + data->au_headers[i].index = get_bits_long(&getbitcontext, data->indexlength); } - infos->nb_au_headers = 1; - return 0; } /* Follows RFC 3640 */ -static int aac_parse_packet(AVFormatContext *ctx, - PayloadContext *infos, - AVStream *st, - AVPacket *pkt, - uint32_t *timestamp, - const uint8_t *buf, int len, int flags) +static int aac_parse_packet(AVFormatContext *ctx, PayloadContext *data, + AVStream *st, AVPacket *pkt, uint32_t *timestamp, + const uint8_t *buf, int len, uint16_t seq, + int flags) { - if (rtp_parse_mp4_au(infos, buf)) - return -1; + int ret; + + if (!buf) { + if (data->cur_au_index > data->nb_au_headers) + return AVERROR_INVALIDDATA; + if (data->buf_size - data->buf_pos < data->au_headers[data->cur_au_index].size) + return AVERROR_INVALIDDATA; + if ((ret = av_new_packet(pkt, data->au_headers[data->cur_au_index].size)) < 0) + return ret; + memcpy(pkt->data, &data->buf[data->buf_pos], data->au_headers[data->cur_au_index].size); + data->buf_pos += data->au_headers[data->cur_au_index].size; + pkt->stream_index = st->index; + data->cur_au_index++; + return data->cur_au_index < data->nb_au_headers; + } - buf += infos->au_headers_length_bytes + 2; - len -= infos->au_headers_length_bytes + 2; + if (rtp_parse_mp4_au(data, buf, len)) + return -1; - /* XXX: Fixme we only handle the case where rtp_parse_mp4_au define - one au_header */ - av_new_packet(pkt, infos->au_headers[0].size); - memcpy(pkt->data, buf, infos->au_headers[0].size); + buf += data->au_headers_length_bytes + 2; + len -= data->au_headers_length_bytes + 2; + if (len < data->au_headers[0].size) + return AVERROR_INVALIDDATA; + if ((ret = av_new_packet(pkt, data->au_headers[0].size)) < 0) + return ret; + memcpy(pkt->data, buf, data->au_headers[0].size); + len -= data->au_headers[0].size; + buf += data->au_headers[0].size; pkt->stream_index = st->index; + + if (len > 0 && data->nb_au_headers > 1) { + data->buf_size = FFMIN(len, sizeof(data->buf)); + memcpy(data->buf, buf, data->buf_size); + data->cur_au_index = 1; + data->buf_pos = 0; + return 1; + } + return 0; } -static int parse_sdp_line(AVFormatContext *s, int st_index, - PayloadContext *rtp_payload_data, const char *line) +static int parse_fmtp(AVFormatContext *s, + AVStream *stream, PayloadContext *data, + char *attr, char *value) { - const char *p; - char value[4096], attr[25]; - int res = 0, i; - AVStream *st = s->streams[st_index]; - AVCodecContext* codec = st->codec; - - if (av_strstart(line, "fmtp:", &p)) { - // remove protocol identifier - while (*p && *p == ' ') p++; // strip spaces - while (*p && *p != ' ') p++; // eat protocol identifier - while (*p && *p == ' ') p++; // strip trailing spaces - - while (ff_rtsp_next_attr_and_value(&p, - attr, sizeof(attr), - value, sizeof(value))) { - if (!strcmp(attr, "config")) { - res = parse_fmtp_config(codec, value); - - if (res < 0) - return res; - } + AVCodecContext *codec = stream->codec; + int res, i; + + if (!strcmp(attr, "config")) { + res = parse_fmtp_config(codec, value); - if (codec->codec_id == CODEC_ID_AAC) { - /* Looking for a known attribute */ - for (i = 0; attr_names[i].str; ++i) { - if (!strcasecmp(attr, attr_names[i].str)) { - if (attr_names[i].type == ATTR_NAME_TYPE_INT) { - *(int *)((char *)rtp_payload_data + - attr_names[i].offset) = atoi(value); - } else if (attr_names[i].type == ATTR_NAME_TYPE_STR) - *(char **)((char *)rtp_payload_data + - attr_names[i].offset) = av_strdup(value); - } - } + if (res < 0) + return res; + } + + if (codec->codec_id == AV_CODEC_ID_AAC) { + /* Looking for a known attribute */ + for (i = 0; attr_names[i].str; ++i) { + if (!av_strcasecmp(attr, attr_names[i].str)) { + if (attr_names[i].type == ATTR_NAME_TYPE_INT) { + *(int *)((char *)data+ + attr_names[i].offset) = atoi(value); + } else if (attr_names[i].type == ATTR_NAME_TYPE_STR) + *(char **)((char *)data+ + attr_names[i].offset) = av_strdup(value); } } } + return 0; +} + +static int parse_sdp_line(AVFormatContext *s, int st_index, + PayloadContext *data, const char *line) +{ + const char *p; + + if (st_index < 0) + return 0; + + if (av_strstart(line, "fmtp:", &p)) + return ff_parse_fmtp(s, s->streams[st_index], data, p, parse_fmtp); return 0; +} +static av_cold int init_video(AVFormatContext *s, int st_index, + PayloadContext *data) +{ + if (st_index < 0) + return 0; + s->streams[st_index]->need_parsing = AVSTREAM_PARSE_FULL; + return 0; } RTPDynamicProtocolHandler ff_mp4v_es_dynamic_handler = { .enc_name = "MP4V-ES", .codec_type = AVMEDIA_TYPE_VIDEO, - .codec_id = CODEC_ID_MPEG4, + .codec_id = AV_CODEC_ID_MPEG4, + .init = init_video, .parse_sdp_a_line = parse_sdp_line, - .open = NULL, - .close = NULL, - .parse_packet = NULL }; RTPDynamicProtocolHandler ff_mpeg4_generic_dynamic_handler = { .enc_name = "mpeg4-generic", .codec_type = AVMEDIA_TYPE_AUDIO, - .codec_id = CODEC_ID_AAC, + .codec_id = AV_CODEC_ID_AAC, .parse_sdp_a_line = parse_sdp_line, - .open = new_context, - .close = free_context, + .alloc = new_context, + .free = free_context, .parse_packet = aac_parse_packet };