diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-21 17:00:03 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-21 17:02:01 +0400 |
commit | 0a5da9cc148b2ac7102b4a0653c38735672629f6 (patch) | |
tree | f20d33699f6f79a2daaaaa2513bb7fcc0f396a7e /libavformat/rtpdec_mpeg12.c | |
parent | 950482bf587889c507340ae5893a851be8e99fcc (diff) | |
parent | c6f1dc8e4cd967ae056698eafb891a08003c211c (diff) |
Merge commit 'c6f1dc8e4cd967ae056698eafb891a08003c211c'
* commit 'c6f1dc8e4cd967ae056698eafb891a08003c211c':
rtpdec: Move setting the parsing flags to the actual depacketizers
rtpdec: Split handling of mpeg12 audio/video to a separate depacketizer
Conflicts:
libavformat/rtpdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpdec_mpeg12.c')
-rw-r--r-- | libavformat/rtpdec_mpeg12.c | 72 |
1 files changed, 72 insertions, 0 deletions
diff --git a/libavformat/rtpdec_mpeg12.c b/libavformat/rtpdec_mpeg12.c new file mode 100644 index 0000000000..82e58a097a --- /dev/null +++ b/libavformat/rtpdec_mpeg12.c @@ -0,0 +1,72 @@ +/* + * Common code for the RTP depacketization of MPEG-1/2 formats. + * Copyright (c) 2002 Fabrice Bellard + * + * This file is part of FFmpeg. + * + * FFmpeg 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, + * 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 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "rtpdec_formats.h" +#include "libavutil/intreadwrite.h" + +static int mpeg_init(AVFormatContext *ctx, int st_index, PayloadContext *data) +{ + if (st_index < 0) + return 0; + ctx->streams[st_index]->need_parsing = AVSTREAM_PARSE_FULL; + return 0; +} + +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, + .init = mpeg_init, + .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, + .init = mpeg_init, + .parse_packet = mpeg_parse_packet, + .static_payload_id = 32, +}; |