From 55c3a4f617171ad1138df684cbafa570807bc6a9 Mon Sep 17 00:00:00 2001 From: Mohamed Naufal Basheer Date: Thu, 17 Mar 2011 23:56:50 +0100 Subject: G.723.1 demuxer and decoder Signed-off-by: Kostya Shishkov --- libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/g723_1.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++++ libavformat/rtp.c | 2 +- 4 files changed, 88 insertions(+), 1 deletion(-) create mode 100644 libavformat/g723_1.c (limited to 'libavformat') diff --git a/libavformat/Makefile b/libavformat/Makefile index af3ebac5f6..43e42243bc 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -101,6 +101,7 @@ OBJS-$(CONFIG_GXF_DEMUXER) += gxf.o OBJS-$(CONFIG_GXF_MUXER) += gxfenc.o audiointerleave.o OBJS-$(CONFIG_G722_DEMUXER) += rawdec.o OBJS-$(CONFIG_G722_MUXER) += rawenc.o +OBJS-$(CONFIG_G723_1_DEMUXER) += g723_1.o OBJS-$(CONFIG_H261_DEMUXER) += h261dec.o rawdec.o OBJS-$(CONFIG_H261_MUXER) += rawenc.o OBJS-$(CONFIG_H263_DEMUXER) += h263dec.o rawdec.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 46b3bc7dad..34e9d610da 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -99,6 +99,7 @@ void av_register_all(void) REGISTER_MUXER (FRAMECRC, framecrc); REGISTER_MUXER (FRAMEMD5, framemd5); REGISTER_MUXDEMUX (G722, g722); + REGISTER_DEMUXER (G723_1, g723_1); REGISTER_MUXER (GIF, gif); REGISTER_DEMUXER (GSM, gsm); REGISTER_MUXDEMUX (GXF, gxf); diff --git a/libavformat/g723_1.c b/libavformat/g723_1.c new file mode 100644 index 0000000000..415d01b480 --- /dev/null +++ b/libavformat/g723_1.c @@ -0,0 +1,85 @@ +/* + * G.723.1 demuxer + * Copyright (c) 2010 Mohamed Naufal Basheer + * + * 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 + */ + +/** + * @file + * G.723.1 demuxer + */ + +#include "libavutil/audioconvert.h" +#include "avformat.h" +#include "internal.h" + +static const uint8_t frame_size[4] = { 24, 20, 4, 1 }; + +static int g723_1_init(AVFormatContext *s) +{ + AVStream *st; + + st = avformat_new_stream(s, NULL); + if (!st) + return AVERROR(ENOMEM); + + st->codec->codec_type = AVMEDIA_TYPE_AUDIO; + st->codec->codec_id = CODEC_ID_G723_1; + st->codec->channel_layout = AV_CH_LAYOUT_MONO; + st->codec->channels = 1; + st->codec->sample_rate = 8000; + + avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate); + st->start_time = 0; + + return 0; +} + +static int g723_1_read_packet(AVFormatContext *s, AVPacket *pkt) +{ + int size, byte, ret; + + pkt->pos = avio_tell(s->pb); + byte = avio_r8(s->pb); + size = frame_size[byte & 3]; + + ret = av_new_packet(pkt, size); + if (ret < 0) + return ret; + + pkt->data[0] = byte; + pkt->duration = 240; + pkt->stream_index = 0; + + ret = avio_read(s->pb, pkt->data + 1, size - 1); + if (ret < size - 1) { + av_free_packet(pkt); + return ret < 0 ? ret : AVERROR_EOF; + } + + return pkt->size; +} + +AVInputFormat ff_g723_1_demuxer = { + .name = "g723_1", + .long_name = NULL_IF_CONFIG_SMALL("G.723.1 format"), + .read_header = g723_1_init, + .read_packet = g723_1_read_packet, + .extensions = "tco", + .flags = AVFMT_GENERIC_INDEX +}; diff --git a/libavformat/rtp.c b/libavformat/rtp.c index 6516779feb..efc84ab249 100644 --- a/libavformat/rtp.c +++ b/libavformat/rtp.c @@ -44,7 +44,7 @@ static const struct { {0, "PCMU", AVMEDIA_TYPE_AUDIO, CODEC_ID_PCM_MULAW, 8000, 1}, {3, "GSM", AVMEDIA_TYPE_AUDIO, CODEC_ID_NONE, 8000, 1}, - {4, "G723", AVMEDIA_TYPE_AUDIO, CODEC_ID_NONE, 8000, 1}, + {4, "G723", AVMEDIA_TYPE_AUDIO, CODEC_ID_G723_1, 8000, 1}, {5, "DVI4", AVMEDIA_TYPE_AUDIO, CODEC_ID_NONE, 8000, 1}, {6, "DVI4", AVMEDIA_TYPE_AUDIO, CODEC_ID_NONE, 16000, 1}, {7, "LPC", AVMEDIA_TYPE_AUDIO, CODEC_ID_NONE, 8000, 1}, -- cgit v1.2.3