[FFmpeg-cvslog] r11878 - in trunk: libavcodec/avcodec.h libavformat/Makefile libavformat/oggdec.c libavformat/oggdec.h libavformat/oggparsespeex.c

[reimar]

Author: reimar
Date: Wed Feb  6 13:37:37 2008
New Revision: 11878

Log:
Add support for speex in ogg


Added:
   trunk/libavformat/oggparsespeex.c
Modified:
   trunk/libavcodec/avcodec.h
   trunk/libavformat/Makefile
   trunk/libavformat/oggdec.c
   trunk/libavformat/oggdec.h

Modified: trunk/libavcodec/avcodec.h
==============================================================================
--- trunk/libavcodec/avcodec.h	(original)
+++ trunk/libavcodec/avcodec.h	Wed Feb  6 13:37:37 2008
@@ -276,6 +276,7 @@ enum CodecID {
     CODEC_ID_APE,
     CODEC_ID_NELLYMOSER,
     CODEC_ID_MUSEPACK8,
+    CODEC_ID_SPEEX,
 
     /* subtitle codecs */
     CODEC_ID_DVD_SUBTITLE= 0x17000,

Modified: trunk/libavformat/Makefile
==============================================================================
--- trunk/libavformat/Makefile	(original)
+++ trunk/libavformat/Makefile	Wed Feb  6 13:37:37 2008
@@ -110,6 +110,7 @@ OBJS-$(CONFIG_NUV_DEMUXER)              
 OBJS-$(CONFIG_OGG_DEMUXER)               += oggdec.o         \
                                             oggparseflac.o   \
                                             oggparseogm.o    \
+                                            oggparsespeex.o  \
                                             oggparsetheora.o \
                                             oggparsevorbis.o \
                                             riff.o

Modified: trunk/libavformat/oggdec.c
==============================================================================
--- trunk/libavformat/oggdec.c	(original)
+++ trunk/libavformat/oggdec.c	Wed Feb  6 13:37:37 2008
@@ -38,6 +38,7 @@
 #define DECODER_BUFFER_SIZE MAX_PAGE_SIZE
 
 static ogg_codec_t *ogg_codecs[] = {
+    &speex_codec,
     &vorbis_codec,
     &theora_codec,
     &flac_codec,

Modified: trunk/libavformat/oggdec.h
==============================================================================
--- trunk/libavformat/oggdec.h	(original)
+++ trunk/libavformat/oggdec.h	Wed Feb  6 13:37:37 2008
@@ -81,6 +81,7 @@ extern ogg_codec_t ogm_old_codec;
 extern ogg_codec_t ogm_text_codec;
 extern ogg_codec_t ogm_video_codec;
 extern ogg_codec_t old_flac_codec;
+extern ogg_codec_t speex_codec;
 extern ogg_codec_t theora_codec;
 extern ogg_codec_t vorbis_codec;
 

Added: trunk/libavformat/oggparsespeex.c
==============================================================================
--- (empty file)
+++ trunk/libavformat/oggparsespeex.c	Wed Feb  6 13:37:37 2008
@@ -0,0 +1,61 @@
+/*
+      Copyright (C) 2008  Reimar D?ffinger
+
+      Permission is hereby granted, free of charge, to any person
+      obtaining a copy of this software and associated documentation
+      files (the "Software"), to deal in the Software without
+      restriction, including without limitation the rights to use, copy,
+      modify, merge, publish, distribute, sublicense, and/or sell copies
+      of the Software, and to permit persons to whom the Software is
+      furnished to do so, subject to the following conditions:
+
+      The above copyright notice and this permission notice shall be
+      included in all copies or substantial portions of the Software.
+
+      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+      EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+      MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+      NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+      HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+      WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+      OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+      DEALINGS IN THE SOFTWARE.
+**/
+
+#include <stdlib.h>
+#include "avformat.h"
+#include "bitstream.h"
+#include "bytestream.h"
+#include "bswap.h"
+#include "oggdec.h"
+#include "avstring.h"
+
+static int speex_header(AVFormatContext *s, int idx) {
+    ogg_t *ogg = s->priv_data;
+    ogg_stream_t *os = ogg->streams + idx;
+    AVStream *st = s->streams[idx];
+    uint8_t *p = os->buf + os->pstart;
+
+    if (os->psize < 80)
+        return 1;
+
+    st->codec->codec_type = CODEC_TYPE_AUDIO;
+    st->codec->codec_id = CODEC_ID_SPEEX;
+
+    st->codec->sample_rate = AV_RL32(p + 36);
+    st->codec->channels = AV_RL32(p + 48);
+    st->codec->extradata_size = os->psize;
+    st->codec->extradata = av_malloc(st->codec->extradata_size);
+    memcpy(st->codec->extradata, p, st->codec->extradata_size);
+
+    st->time_base.num = 1;
+    st->time_base.den = st->codec->sample_rate;
+
+    return 0;
+}
+
+ogg_codec_t speex_codec = {
+    .magic = "Speex   ",
+    .magicsize = 8,
+    .header = speex_header
+};