2011/7/8 Måns Rullgård <[email protected]>: > Alex Converse <[email protected]> writes: > >> 2011/7/8 Måns Rullgård <[email protected]> >> >>> Alex Converse <[email protected]> writes: >>> >>> > + version = AV_RL32(p + 28); >>> > + //header_size = AV_RL32(p + 32); >>> > + sample_rate = AV_RL32(p + 36); >>> > + nb_channels = AV_RL32(p + 40); >>> > + frame_size = AV_RL32(p + 44); >>> > + overlap = AV_RL32(p + 48); >>> > + //bytes_per_packet = AV_RL32(p + 52); >>> > + extra_headers = AV_RL32(p + 56); >>> >>> What's with the commented out lines? >>> >> >> They are fields we don't need to read. Other options: completely remove >> them, add av_unused vars to read them. > > Drop it. > >> Personally, I like having them documented. > > I assume there's a bitstream spec somewhere with sufficient documentation. >
fixed
From 57fd2302452bdf9d92428f57094977455e5017d4 Mon Sep 17 00:00:00 2001 From: Nicolas George <[email protected]> Date: Fri, 15 Apr 2011 19:18:04 +0200 Subject: [PATCH 1/2] Ogg: add support for Xiph's CELT (Opus) codec. This patch also introduces CODEC_ID_CELT. Signed-off-by: Alex Converse <[email protected]> --- libavcodec/avcodec.h | 1 + libavformat/Makefile | 1 + libavformat/oggdec.c | 1 + libavformat/oggdec.h | 1 + libavformat/oggparsecelt.c | 88 ++++++++++++++++++++++++++++++++++++++++++++ libavformat/utils.c | 3 +- 6 files changed, 94 insertions(+), 1 deletions(-) create mode 100644 libavformat/oggparsecelt.c diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index b26bac7..5984c43 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -337,6 +337,7 @@ enum CodecID { CODEC_ID_BINKAUDIO_DCT, CODEC_ID_AAC_LATM, CODEC_ID_QDMC, + CODEC_ID_CELT, /* subtitle codecs */ CODEC_ID_DVD_SUBTITLE= 0x17000, diff --git a/libavformat/Makefile b/libavformat/Makefile index a20db26..d09147c 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -159,6 +159,7 @@ OBJS-$(CONFIG_NUT_DEMUXER) += nutdec.o nut.o riff.o OBJS-$(CONFIG_NUT_MUXER) += nutenc.o nut.o riff.o OBJS-$(CONFIG_NUV_DEMUXER) += nuv.o riff.o OBJS-$(CONFIG_OGG_DEMUXER) += oggdec.o \ + oggparsecelt.o \ oggparsedirac.o \ oggparseflac.o \ oggparseogm.o \ diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c index e33de7d..8b3a572 100644 --- a/libavformat/oggdec.c +++ b/libavformat/oggdec.c @@ -45,6 +45,7 @@ static const struct ogg_codec * const ogg_codecs[] = { &ff_vorbis_codec, &ff_theora_codec, &ff_flac_codec, + &ff_celt_codec, &ff_old_dirac_codec, &ff_old_flac_codec, &ff_ogm_video_codec, diff --git a/libavformat/oggdec.h b/libavformat/oggdec.h index e7d1022..184a628 100644 --- a/libavformat/oggdec.h +++ b/libavformat/oggdec.h @@ -98,6 +98,7 @@ struct ogg { #define OGG_FLAG_BOS 2 #define OGG_FLAG_EOS 4 +extern const struct ogg_codec ff_celt_codec; extern const struct ogg_codec ff_dirac_codec; extern const struct ogg_codec ff_flac_codec; extern const struct ogg_codec ff_ogm_audio_codec; diff --git a/libavformat/oggparsecelt.c b/libavformat/oggparsecelt.c new file mode 100644 index 0000000..c711546 --- /dev/null +++ b/libavformat/oggparsecelt.c @@ -0,0 +1,88 @@ +/* + * Xiph CELT / Opus parser for Ogg + * Copyright (c) 2011 Nicolas George + * + * 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 <string.h> +#include "avformat.h" +#include "oggdec.h" +#include "libavutil/intreadwrite.h" + +struct oggcelt_private { + int extra_headers_left; +}; + +#define CELT_EXTRADATA_SIZE 8 + +static int celt_header(AVFormatContext *s, int idx) +{ + struct ogg *ogg = s->priv_data; + struct ogg_stream *os = ogg->streams + idx; + AVStream *st = s->streams[idx]; + struct oggcelt_private *priv = os->private; + uint8_t *p = os->buf + os->pstart; + + if (os->psize == 60 && !memcmp(p, ff_celt_codec.magic, ff_celt_codec.magicsize)) { + uint32_t version, sample_rate, nb_channels, frame_size; + uint32_t overlap, extra_headers; + uint8_t *extradata; + + extradata = av_malloc(CELT_EXTRADATA_SIZE + + FF_INPUT_BUFFER_PADDING_SIZE); + priv = av_malloc(sizeof(struct oggcelt_private)); + if (!extradata || !priv) { + av_free(extradata); + av_free(priv); + return AVERROR(ENOMEM); + } + version = AV_RL32(p + 28); + sample_rate = AV_RL32(p + 36); + nb_channels = AV_RL32(p + 40); + frame_size = AV_RL32(p + 44); + overlap = AV_RL32(p + 48); + extra_headers = AV_RL32(p + 56); + st->codec->codec_type = AVMEDIA_TYPE_AUDIO; + st->codec->codec_id = CODEC_ID_CELT; + st->codec->sample_rate = sample_rate; + st->codec->channels = nb_channels; + st->codec->frame_size = frame_size; + st->codec->sample_fmt = AV_SAMPLE_FMT_S16; + av_set_pts_info(st, 64, 1, sample_rate); + priv->extra_headers_left = 1 + extra_headers; + av_free(os->private); + os->private = priv; + AV_WL32(extradata + 0, overlap); + AV_WL32(extradata + 4, version); + av_free(st->codec->extradata); + st->codec->extradata = extradata; + st->codec->extradata_size = CELT_EXTRADATA_SIZE; + return 1; + } else if (priv && priv->extra_headers_left) { + ff_vorbis_comment(s, &st->metadata, p, os->psize); + priv->extra_headers_left--; + return 1; + } + return 0; +} + +const struct ogg_codec ff_celt_codec = { + .magic = "CELT ", + .magicsize = 8, + .header = celt_header, +}; diff --git a/libavformat/utils.c b/libavformat/utils.c index 060e58e..8240bff 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2055,7 +2055,8 @@ static int has_codec_parameters(AVCodecContext *enc) enc->codec_id == CODEC_ID_MP1 || enc->codec_id == CODEC_ID_MP2 || enc->codec_id == CODEC_ID_MP3 || - enc->codec_id == CODEC_ID_SPEEX)) + enc->codec_id == CODEC_ID_SPEEX || + enc->codec_id == CODEC_ID_CELT)) return 0; break; case AVMEDIA_TYPE_VIDEO: -- 1.7.3.1
_______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
