oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)

Originally committed as revision 896 to svn://svn.ffmpeg.org/ffmpeg/trunk

5 files changed, 160 insertions, 0 deletions

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 89671dd6f7..2b226bc44f 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -34,6 +34,11 @@ OBJS += mp3lameaudio.o
 EXTRALIBS += -lmp3lame
 endif
 
+ifeq ($(CONFIG_VORBIS),yes)
+OBJS += oggvorbis.o
+EXTRALIBS += -lvorbis -lvorbisenc
+endif
+
 ifeq ($(TARGET_GPROF),yes)
 CFLAGS+=-p
 LDFLAGS+=-p
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index 7f0b1a4c64..39724d24e2 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -39,6 +39,9 @@ void avcodec_register_all(void)
 #ifdef CONFIG_MP3LAME
     register_avcodec(&mp3lame_encoder);
 #endif
+#ifdef CONFIG_VORBIS
+    register_avcodec(&oggvorbis_encoder);
+#endif
     register_avcodec(&mpeg1video_encoder);
     register_avcodec(&h263_encoder);
     register_avcodec(&h263p_encoder);
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index b65ac81cec..619623bb74 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -15,6 +15,7 @@ enum CodecID {
     CODEC_ID_RV10,
     CODEC_ID_MP2,
     CODEC_ID_MP3LAME,
+    CODEC_ID_VORBIS,
     CODEC_ID_AC3,
     CODEC_ID_MJPEG,
     CODEC_ID_MPEG4,
@@ -389,6 +390,7 @@ typedef struct AVPicture {
 extern AVCodec ac3_encoder;
 extern AVCodec mp2_encoder;
 extern AVCodec mp3lame_encoder;
+extern AVCodec oggvorbis_encoder;
 extern AVCodec mpeg1video_encoder;
 extern AVCodec h263_encoder;
 extern AVCodec h263p_encoder;
diff --git a/libavcodec/oggvorbis.c b/libavcodec/oggvorbis.c
new file mode 100644
index 0000000000..5b241ed4f1
--- /dev/null
+++ b/libavcodec/oggvorbis.c
@@ -0,0 +1,140 @@
+/*
+ * Ogg Vorbis codec support via libvorbisenc
+ * Mark Hills <mark@pogo.org.uk>
+ */
+
+#include <time.h>
+
+#include <vorbis/vorbisenc.h>
+
+#include "avcodec.h"
+#include "oggvorbis.h"
+
+#define OGGVORBIS_FRAME_SIZE 1024
+
+
+typedef struct OggVorbisContext {
+    vorbis_info vi ;
+    vorbis_dsp_state vd ;
+    vorbis_block vb ;
+} OggVorbisContext ;
+
+
+int oggvorbis_init_encoder(vorbis_info *vi, AVCodecContext *avccontext) {
+    if(avccontext->quality) { /* VBR requested */
+
+	fprintf(stderr, "init_encode: channels=%d quality=%d\n", 
+		avccontext->channels, avccontext->quality) ;
+
+	return vorbis_encode_init_vbr(vi, avccontext->channels,
+		  avccontext->sample_rate, (float)avccontext->quality / 1000) ;
+    }
+
+    fprintf(stderr, "init_encoder: channels=%d bitrate=%d tolerance=%d\n", 
+	    avccontext->channels, avccontext->bit_rate,
+	    avccontext->bit_rate_tolerance) ;
+
+    return vorbis_encode_init(vi, avccontext->channels,
+	          avccontext->sample_rate, -1, avccontext->bit_rate, -1) ;
+}
+
+
+static int oggvorbis_encode_init(AVCodecContext *avccontext) {
+    OggVorbisContext *context = avccontext->priv_data ;
+
+    fprintf(stderr, "oggvorbis_encode_init\n") ;
+
+    vorbis_info_init(&context->vi) ;
+
+    if(oggvorbis_init_encoder(&context->vi, avccontext) < 0) {
+	fprintf(stderr, "oggvorbis_encode_init: init_encoder failed") ;
+	return -1 ;
+    }
+
+    vorbis_analysis_init(&context->vd, &context->vi) ;
+    vorbis_block_init(&context->vd, &context->vb) ;
+
+    avccontext->frame_size = OGGVORBIS_FRAME_SIZE ;
+    
+    return 0 ;
+}
+
+
+int oggvorbis_encode_frame(AVCodecContext *avccontext, unsigned char *packets,
+			   int buf_size, void *data)
+{
+    OggVorbisContext *context = avccontext->priv_data ;
+    float **buffer ;
+    ogg_packet op ;
+    signed char *audio = data ;
+    int l, samples = buf_size / 16 ; /* samples = OGGVORBIS_FRAME_SIZE */ ;
+
+    buffer = vorbis_analysis_buffer(&context->vd, samples) ;
+
+    if(context->vi.channels == 1) {
+	for(l = 0 ; l < samples ; l++)
+	    buffer[0][l]=((audio[l*2+1]<<8)|(0x00ff&(int)audio[l*2]))/32768.f;
+    } else {
+	for(l = 0 ; l < samples ; l++){
+	    buffer[0][l]=((audio[l*4+1]<<8)|(0x00ff&(int)audio[l*4]))/32768.f;
+	    buffer[1][l]=((audio[l*4+3]<<8)|(0x00ff&(int)audio[l*4+2]))/32768.f;
+	}
+    }
+    
+    vorbis_analysis_wrote(&context->vd, samples) ; 
+
+    l = 0 ;
+
+    while(vorbis_analysis_blockout(&context->vd, &context->vb) == 1) {
+	vorbis_analysis(&context->vb, NULL);
+	vorbis_bitrate_addblock(&context->vb) ;
+
+	while(vorbis_bitrate_flushpacket(&context->vd, &op)) {
+	    memcpy(packets + l, &op, sizeof(ogg_packet)) ;
+	    memcpy(packets + l + sizeof(ogg_packet), op.packet, op.bytes) ;
+	    l += sizeof(ogg_packet) + op.bytes ;
+	}
+    }
+
+    return l ;
+}
+
+
+int oggvorbis_encode_close(AVCodecContext *avccontext) {
+    OggVorbisContext *context = avccontext->priv_data ;
+/*  ogg_packet op ; */
+    
+    fprintf(stderr, "oggvorbis_encode_close\n") ;
+    
+    vorbis_analysis_wrote(&context->vd, 0) ; /* notify vorbisenc this is EOF */
+
+    /* We need to write all the remaining packets into the stream
+     * on closing */
+    
+/*
+    while(vorbis_bitrate_flushpacket(&context->vd, &op)) {
+	memcpy(packets + l, &op, sizeof(ogg_packet)) ;
+	memcpy(packets + l + sizeof(ogg_packet), op.packet, op.bytes) ;
+	l += sizeof(ogg_packet) + op.bytes ;	
+    }
+*/
+
+    vorbis_block_clear(&context->vb);
+    vorbis_dsp_clear(&context->vd);
+    vorbis_info_clear(&context->vi);
+  
+    return 0 ;
+}
+
+
+AVCodec oggvorbis_encoder = {
+    "vorbis",
+    CODEC_TYPE_AUDIO,
+    CODEC_ID_VORBIS,
+    sizeof(OggVorbisContext),
+    oggvorbis_encode_init,
+    oggvorbis_encode_frame,
+    oggvorbis_encode_close
+};
+
+
diff --git a/libavcodec/oggvorbis.h b/libavcodec/oggvorbis.h
new file mode 100644
index 0000000000..0b206a1737
--- /dev/null
+++ b/libavcodec/oggvorbis.h
@@ -0,0 +1,10 @@
+#ifndef AVCODEC_OGGVORBIS_H
+#define AVCODEC_OGGVORBIS_H
+
+#include <vorbis/vorbisenc.h>
+
+#include "avcodec.h"
+
+int oggvorbis_init_encoder(vorbis_info *vi, AVCodecContext *avccontext) ;
+
+#endif