From a9c847c1baff09f954b12c1dcc832b4f601f6f6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Thu, 17 Jan 2013 15:08:03 +0200 Subject: rtpdec: Split handling of mpeg12 audio/video to a separate depacketizer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This also adds checking of mallocs. Signed-off-by: Martin Storsjö --- libavformat/rtpdec_mpeg12.c | 62 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 libavformat/rtpdec_mpeg12.c (limited to 'libavformat/rtpdec_mpeg12.c') diff --git a/libavformat/rtpdec_mpeg12.c b/libavformat/rtpdec_mpeg12.c new file mode 100644 index 0000000000..d111469364 --- /dev/null +++ b/libavformat/rtpdec_mpeg12.c @@ -0,0 +1,62 @@ +/* + * Common code for the RTP depacketization of MPEG-1/2 formats. + * Copyright (c) 2002 Fabrice Bellard + * + * This file is part of Libav. + * + * 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. + * + * 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 Libav; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "rtpdec_formats.h" +#include "libavutil/intreadwrite.h" + +static int mpeg_parse_packet(AVFormatContext *ctx, PayloadContext *data, + AVStream *st, AVPacket *pkt, uint32_t *timestamp, + const uint8_t *buf, int len, uint16_t seq, + int flags) +{ + unsigned int h; + if (len <= 4) + return AVERROR_INVALIDDATA; + h = AV_RB32(buf); + buf += 4; + len -= 4; + if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO && h & (1 << 26)) { + /* MPEG-2 */ + if (len <= 4) + return AVERROR_INVALIDDATA; + buf += 4; + len -= 4; + } + if (av_new_packet(pkt, len) < 0) + return AVERROR(ENOMEM); + memcpy(pkt->data, buf, len); + pkt->stream_index = st->index; + return 0; +} + +RTPDynamicProtocolHandler ff_mpeg_audio_dynamic_handler = { + .codec_type = AVMEDIA_TYPE_AUDIO, + .codec_id = AV_CODEC_ID_MP3, + .parse_packet = mpeg_parse_packet, + .static_payload_id = 14, +}; + +RTPDynamicProtocolHandler ff_mpeg_video_dynamic_handler = { + .codec_type = AVMEDIA_TYPE_VIDEO, + .codec_id = AV_CODEC_ID_MPEG2VIDEO, + .parse_packet = mpeg_parse_packet, + .static_payload_id = 32, +}; -- cgit v1.2.3