Restore auto-framing (DEA). Imported from 1.4
[asterisk/asterisk.git] / formats / format_ogg_vorbis.c
index 0437a38..9d80b63 100644 (file)
  * \ingroup formats
  */
 
+/* the order of these dependencies is important... it also specifies
+   the link order of the libraries during linking
+*/
+
+/*** MODULEINFO
+       <depend>vorbis</depend>
+       <depend>ogg</depend>
+ ***/
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <sys/types.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <fcntl.h>
 #endif
 
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/module.h"
+
+/*
+ * this is the number of samples we deal with. Samples are converted
+ * to SLINEAR so each one uses 2 bytes in the buffer.
+ */
 #define SAMPLES_MAX 160
-#define BLOCK_SIZE 4096
+#define        BUF_SIZE        (2*SAMPLES_MAX)
 
-struct ast_filestream {
-       void *reserved[AST_RESERVED_POINTERS];
-       
-       FILE *f;
-       
+#define BLOCK_SIZE 4096                /* used internally in the vorbis routines */
+
+struct vorbis_desc {   /* format specific parameters */
        /* structures for handling the Ogg container */
        ogg_sync_state oy;
        ogg_stream_state os;
@@ -73,278 +85,175 @@ struct ast_filestream {
        
        /*! \brief Indicates whether an End of Stream condition has been detected. */
        int eos;
-       
-       /*! \brief Buffer to hold audio data. */
-       short buffer[SAMPLES_MAX];
-       
-       /*! \brief Asterisk frame object. */
-       struct ast_frame fr;
-       char waste[AST_FRIENDLY_OFFSET];
-       char empty;
 };
 
-AST_MUTEX_DEFINE_STATIC(ogg_vorbis_lock);
-
-static int glistcnt = 0;
-
-static char *name = "ogg_vorbis";
-static char *desc = "OGG/Vorbis audio";
-static char *exts = "ogg";
-
 /*!
  * \brief Create a new OGG/Vorbis filestream and set it up for reading.
- * \param f File that points to on disk storage of the OGG/Vorbis data.
+ * \param s File that points to on disk storage of the OGG/Vorbis data.
  * \return The new filestream.
  */
-static struct ast_filestream *ogg_vorbis_open(FILE * f)
+static int ogg_vorbis_open(struct ast_filestream *s)
 {
        int i;
        int bytes;
        int result;
        char **ptr;
        char *buffer;
+       struct vorbis_desc *tmp = (struct vorbis_desc *)s->private;
 
-       struct ast_filestream *tmp;
-
-       if ((tmp = malloc(sizeof(struct ast_filestream)))) {
-               memset(tmp, 0, sizeof(struct ast_filestream));
+       tmp->writing = 0;
 
-               tmp->writing = 0;
-               tmp->f = f;
+       ogg_sync_init(&tmp->oy);
 
-               ogg_sync_init(&tmp->oy);
-
-               buffer = ogg_sync_buffer(&tmp->oy, BLOCK_SIZE);
-               bytes = fread(buffer, 1, BLOCK_SIZE, f);
-               ogg_sync_wrote(&tmp->oy, bytes);
+       buffer = ogg_sync_buffer(&tmp->oy, BLOCK_SIZE);
+       bytes = fread(buffer, 1, BLOCK_SIZE, s->f);
+       ogg_sync_wrote(&tmp->oy, bytes);
 
-               result = ogg_sync_pageout(&tmp->oy, &tmp->og);
-               if (result != 1) {
-                       if (bytes < BLOCK_SIZE) {
-                               ast_log(LOG_ERROR, "Run out of data...\n");
-                       } else {
-                               ast_log(LOG_ERROR,
-                                               "Input does not appear to be an Ogg bitstream.\n");
-                       }
-                       fclose(f);
-                       ogg_sync_clear(&tmp->oy);
-                       free(tmp);
-                       return NULL;
-               }
-
-               ogg_stream_init(&tmp->os, ogg_page_serialno(&tmp->og));
-               vorbis_info_init(&tmp->vi);
-               vorbis_comment_init(&tmp->vc);
-
-               if (ogg_stream_pagein(&tmp->os, &tmp->og) < 0) {
-                       ast_log(LOG_ERROR,
-                                       "Error reading first page of Ogg bitstream data.\n");
-                       fclose(f);
-                       ogg_stream_clear(&tmp->os);
-                       vorbis_comment_clear(&tmp->vc);
-                       vorbis_info_clear(&tmp->vi);
-                       ogg_sync_clear(&tmp->oy);
-                       free(tmp);
-                       return NULL;
-               }
-
-               if (ogg_stream_packetout(&tmp->os, &tmp->op) != 1) {
-                       ast_log(LOG_ERROR, "Error reading initial header packet.\n");
-                       fclose(f);
-                       ogg_stream_clear(&tmp->os);
-                       vorbis_comment_clear(&tmp->vc);
-                       vorbis_info_clear(&tmp->vi);
-                       ogg_sync_clear(&tmp->oy);
-                       free(tmp);
-                       return NULL;
-               }
-
-               if (vorbis_synthesis_headerin(&tmp->vi, &tmp->vc, &tmp->op) < 0) {
-                       ast_log(LOG_ERROR, "This Ogg bitstream does not contain Vorbis audio data.\n");
-                       fclose(f);
-                       ogg_stream_clear(&tmp->os);
-                       vorbis_comment_clear(&tmp->vc);
-                       vorbis_info_clear(&tmp->vi);
-                       ogg_sync_clear(&tmp->oy);
-                       free(tmp);
-                       return NULL;
+       result = ogg_sync_pageout(&tmp->oy, &tmp->og);
+       if (result != 1) {
+               if(bytes < BLOCK_SIZE) {
+                       ast_log(LOG_ERROR, "Run out of data...\n");
+               } else {
+                       ast_log(LOG_ERROR, "Input does not appear to be an Ogg bitstream.\n");
                }
-
-               i = 0;
+               ogg_sync_clear(&tmp->oy);
+               return -1;
+       }
+       
+       ogg_stream_init(&tmp->os, ogg_page_serialno(&tmp->og));
+       vorbis_info_init(&tmp->vi);
+       vorbis_comment_init(&tmp->vc);
+
+       if (ogg_stream_pagein(&tmp->os, &tmp->og) < 0) { 
+               ast_log(LOG_ERROR, "Error reading first page of Ogg bitstream data.\n");
+error:
+               ogg_stream_clear(&tmp->os);
+               vorbis_comment_clear(&tmp->vc);
+               vorbis_info_clear(&tmp->vi);
+               ogg_sync_clear(&tmp->oy);
+               return -1;
+       }
+       
+       if (ogg_stream_packetout(&tmp->os, &tmp->op) != 1) { 
+               ast_log(LOG_ERROR, "Error reading initial header packet.\n");
+               goto error;
+       }
+       
+       if (vorbis_synthesis_headerin(&tmp->vi, &tmp->vc, &tmp->op) < 0) { 
+               ast_log(LOG_ERROR, "This Ogg bitstream does not contain Vorbis audio data.\n");
+               goto error;
+       }
+       
+       for (i = 0; i < 2 ; ) {
                while (i < 2) {
-                       while (i < 2) {
-                               result = ogg_sync_pageout(&tmp->oy, &tmp->og);
-                               if (result == 0)
-                                       break;
-                               if (result == 1) {
-                                       ogg_stream_pagein(&tmp->os, &tmp->og);
-                                       while (i < 2) {
-                                               result = ogg_stream_packetout(&tmp->os, &tmp->op);
-                                               if (result == 0)
-                                                       break;
-                                               if (result < 0) {
-                                                       ast_log(LOG_ERROR, "Corrupt secondary header.  Exiting.\n");
-                                                       fclose(f);
-                                                       ogg_stream_clear(&tmp->os);
-                                                       vorbis_comment_clear(&tmp->vc);
-                                                       vorbis_info_clear(&tmp->vi);
-                                                       ogg_sync_clear(&tmp->oy);
-                                                       free(tmp);
-                                                       return NULL;
-                                               }
-                                               vorbis_synthesis_headerin(&tmp->vi, &tmp->vc, &tmp->op);
-                                               i++;
+                       result = ogg_sync_pageout(&tmp->oy, &tmp->og);
+                       if (result == 0)
+                               break;
+                       if (result == 1) {
+                               ogg_stream_pagein(&tmp->os, &tmp->og);
+                               while(i < 2) {
+                                       result = ogg_stream_packetout(&tmp->os,&tmp->op);
+                                       if(result == 0)
+                                               break;
+                                       if(result < 0) {
+                                               ast_log(LOG_ERROR, "Corrupt secondary header.  Exiting.\n");
+                                               goto error;
                                        }
+                                       vorbis_synthesis_headerin(&tmp->vi, &tmp->vc, &tmp->op);
+                                       i++;
                                }
                        }
-
-                       buffer = ogg_sync_buffer(&tmp->oy, BLOCK_SIZE);
-                       bytes = fread(buffer, 1, BLOCK_SIZE, f);
-                       if (bytes == 0 && i < 2) {
-                               ast_log(LOG_ERROR, "End of file before finding all Vorbis headers!\n");
-                               fclose(f);
-                               ogg_stream_clear(&tmp->os);
-                               vorbis_comment_clear(&tmp->vc);
-                               vorbis_info_clear(&tmp->vi);
-                               ogg_sync_clear(&tmp->oy);
-                               free(tmp);
-                               return NULL;
-                       }
-                       ogg_sync_wrote(&tmp->oy, bytes);
-               }
-
-               ptr = tmp->vc.user_comments;
-               while (*ptr) {
-                       ast_log(LOG_DEBUG, "OGG/Vorbis comment: %s\n", *ptr);
-                       ++ptr;
-               }
-               ast_log(LOG_DEBUG, "OGG/Vorbis bitstream is %d channel, %ldHz\n",
-                       tmp->vi.channels, tmp->vi.rate);
-               ast_log(LOG_DEBUG, "OGG/Vorbis file encoded by: %s\n",
-                       tmp->vc.vendor);
-
-               if (tmp->vi.channels != 1) {
-                       ast_log(LOG_ERROR, "Only monophonic OGG/Vorbis files are currently supported!\n");
-                       ogg_stream_clear(&tmp->os);
-                       vorbis_comment_clear(&tmp->vc);
-                       vorbis_info_clear(&tmp->vi);
-                       ogg_sync_clear(&tmp->oy);
-                       free(tmp);
-                       return NULL;
-               }
-
-               if (tmp->vi.rate != 8000) {
-                       ast_log(LOG_ERROR, "Only 8000Hz OGG/Vorbis files are currently supported!\n");
-                       fclose(f);
-                       ogg_stream_clear(&tmp->os);
-                       vorbis_block_clear(&tmp->vb);
-                       vorbis_dsp_clear(&tmp->vd);
-                       vorbis_comment_clear(&tmp->vc);
-                       vorbis_info_clear(&tmp->vi);
-                       ogg_sync_clear(&tmp->oy);
-                       free(tmp);
-                       return NULL;
                }
 
-               vorbis_synthesis_init(&tmp->vd, &tmp->vi);
-               vorbis_block_init(&tmp->vd, &tmp->vb);
-
-               if (ast_mutex_lock(&ogg_vorbis_lock)) {
-                       ast_log(LOG_WARNING, "Unable to lock ogg_vorbis list\n");
-                       fclose(f);
-                       ogg_stream_clear(&tmp->os);
-                       vorbis_block_clear(&tmp->vb);
-                       vorbis_dsp_clear(&tmp->vd);
-                       vorbis_comment_clear(&tmp->vc);
-                       vorbis_info_clear(&tmp->vi);
-                       ogg_sync_clear(&tmp->oy);
-                       free(tmp);
-                       return NULL;
+               buffer = ogg_sync_buffer(&tmp->oy, BLOCK_SIZE);
+               bytes = fread(buffer, 1, BLOCK_SIZE, s->f);
+               if (bytes == 0 && i < 2) {
+                       ast_log(LOG_ERROR, "End of file before finding all Vorbis headers!\n");
+                       goto error;
                }
-               glistcnt++;
-               ast_mutex_unlock(&ogg_vorbis_lock);
-               ast_update_use_count();
+               ogg_sync_wrote(&tmp->oy, bytes);
+       }
+       
+       for (ptr = tmp->vc.user_comments; *ptr; ptr++)
+               ast_log(LOG_DEBUG, "OGG/Vorbis comment: %s\n", *ptr);
+       ast_log(LOG_DEBUG, "OGG/Vorbis bitstream is %d channel, %ldHz\n", tmp->vi.channels, tmp->vi.rate);
+       ast_log(LOG_DEBUG, "OGG/Vorbis file encoded by: %s\n", tmp->vc.vendor);
+
+       if (tmp->vi.channels != 1) {
+               ast_log(LOG_ERROR, "Only monophonic OGG/Vorbis files are currently supported!\n");
+               goto error;
        }
-       return tmp;
+       
+       if (tmp->vi.rate != DEFAULT_SAMPLE_RATE) {
+               ast_log(LOG_ERROR, "Only 8000Hz OGG/Vorbis files are currently supported!\n");
+               vorbis_block_clear(&tmp->vb);
+               vorbis_dsp_clear(&tmp->vd);
+               goto error;
+       }
+       
+       vorbis_synthesis_init(&tmp->vd, &tmp->vi);
+       vorbis_block_init(&tmp->vd, &tmp->vb);
+
+       return 0;
 }
 
 /*!
  * \brief Create a new OGG/Vorbis filestream and set it up for writing.
- * \param f File pointer that points to on-disk storage.
+ * \param s File pointer that points to on-disk storage.
  * \param comment Comment that should be embedded in the OGG/Vorbis file.
  * \return A new filestream.
  */
-static struct ast_filestream *ogg_vorbis_rewrite(FILE * f,
+static int ogg_vorbis_rewrite(struct ast_filestream *s,
                                                 const char *comment)
 {
        ogg_packet header;
        ogg_packet header_comm;
        ogg_packet header_code;
+       struct vorbis_desc *tmp = (struct vorbis_desc *)s->private;
 
-       struct ast_filestream *tmp;
-
-       if ((tmp = malloc(sizeof(struct ast_filestream)))) {
-               memset(tmp, 0, sizeof(struct ast_filestream));
+       tmp->writing = 1;
 
-               tmp->writing = 1;
-               tmp->f = f;
+       vorbis_info_init(&tmp->vi);
 
-               vorbis_info_init(&tmp->vi);
-
-               if (vorbis_encode_init_vbr(&tmp->vi, 1, 8000, 0.4)) {
-                       ast_log(LOG_ERROR, "Unable to initialize Vorbis encoder!\n");
-                       free(tmp);
-                       return NULL;
-               }
-
-               vorbis_comment_init(&tmp->vc);
-               vorbis_comment_add_tag(&tmp->vc, "ENCODER", "Asterisk PBX");
-               if (comment)
-                       vorbis_comment_add_tag(&tmp->vc, "COMMENT", (char *) comment);
+       if (vorbis_encode_init_vbr(&tmp->vi, 1, DEFAULT_SAMPLE_RATE, 0.4)) {
+               ast_log(LOG_ERROR, "Unable to initialize Vorbis encoder!\n");
+               return -1;
+       }
 
-               vorbis_analysis_init(&tmp->vd, &tmp->vi);
-               vorbis_block_init(&tmp->vd, &tmp->vb);
+       vorbis_comment_init(&tmp->vc);
+       vorbis_comment_add_tag(&tmp->vc, "ENCODER", "Asterisk PBX");
+       if (comment)
+               vorbis_comment_add_tag(&tmp->vc, "COMMENT", (char *) comment);
 
-               ogg_stream_init(&tmp->os, rand());
+       vorbis_analysis_init(&tmp->vd, &tmp->vi);
+       vorbis_block_init(&tmp->vd, &tmp->vb);
 
-               vorbis_analysis_headerout(&tmp->vd, &tmp->vc, &header, &header_comm,
-                                         &header_code);
-               ogg_stream_packetin(&tmp->os, &header);
-               ogg_stream_packetin(&tmp->os, &header_comm);
-               ogg_stream_packetin(&tmp->os, &header_code);
+       ogg_stream_init(&tmp->os, ast_random());
 
-               while (!tmp->eos) {
-                       if (ogg_stream_flush(&tmp->os, &tmp->og) == 0)
-                               break;
-                       fwrite(tmp->og.header, 1, tmp->og.header_len, tmp->f);
-                       fwrite(tmp->og.body, 1, tmp->og.body_len, tmp->f);
-                       if (ogg_page_eos(&tmp->og))
-                               tmp->eos = 1;
-               }
+       vorbis_analysis_headerout(&tmp->vd, &tmp->vc, &header, &header_comm,
+                                 &header_code);
+       ogg_stream_packetin(&tmp->os, &header);
+       ogg_stream_packetin(&tmp->os, &header_comm);
+       ogg_stream_packetin(&tmp->os, &header_code);
 
-               if (ast_mutex_lock(&ogg_vorbis_lock)) {
-                       ast_log(LOG_WARNING, "Unable to lock ogg_vorbis list\n");
-                       fclose(f);
-                       ogg_stream_clear(&tmp->os);
-                       vorbis_block_clear(&tmp->vb);
-                       vorbis_dsp_clear(&tmp->vd);
-                       vorbis_comment_clear(&tmp->vc);
-                       vorbis_info_clear(&tmp->vi);
-                       free(tmp);
-                       return NULL;
-               }
-               glistcnt++;
-               ast_mutex_unlock(&ogg_vorbis_lock);
-               ast_update_use_count();
+       while (!tmp->eos) {
+               if (ogg_stream_flush(&tmp->os, &tmp->og) == 0)
+                       break;
+               fwrite(tmp->og.header, 1, tmp->og.header_len, s->f);
+               fwrite(tmp->og.body, 1, tmp->og.body_len, s->f);
+               if (ogg_page_eos(&tmp->og))
+                       tmp->eos = 1;
        }
-       return tmp;
+
+       return 0;
 }
 
 /*!
  * \brief Write out any pending encoded data.
- * \param s A OGG/Vorbis filestream.
+ * \param s An OGG/Vorbis filestream.
+ * \param f The file to write to.
  */
-static void write_stream(struct ast_filestream *s)
+static void write_stream(struct vorbis_desc *s, FILE *f)
 {
        while (vorbis_analysis_blockout(&s->vd, &s->vb) == 1) {
                vorbis_analysis(&s->vb, NULL);
@@ -356,8 +265,8 @@ static void write_stream(struct ast_filestream *s)
                                if (ogg_stream_pageout(&s->os, &s->og) == 0) {
                                        break;
                                }
-                               fwrite(s->og.header, 1, s->og.header_len, s->f);
-                               fwrite(s->og.body, 1, s->og.body_len, s->f);
+                               fwrite(s->og.header, 1, s->og.header_len, f);
+                               fwrite(s->og.body, 1, s->og.body_len, f);
                                if (ogg_page_eos(&s->og)) {
                                        s->eos = 1;
                                }
@@ -368,15 +277,16 @@ static void write_stream(struct ast_filestream *s)
 
 /*!
  * \brief Write audio data from a frame to an OGG/Vorbis filestream.
- * \param s A OGG/Vorbis filestream.
- * \param f An frame containing audio to be written to the filestream.
- * \return -1 ifthere was an error, 0 on success.
+ * \param fs An OGG/Vorbis filestream.
+ * \param f A frame containing audio to be written to the filestream.
+ * \return -1 if there was an error, 0 on success.
  */
-static int ogg_vorbis_write(struct ast_filestream *s, struct ast_frame *f)
+static int ogg_vorbis_write(struct ast_filestream *fs, struct ast_frame *f)
 {
        int i;
        float **buffer;
        short *data;
+       struct vorbis_desc *s = (struct vorbis_desc *)fs->private;
 
        if (!s->writing) {
                ast_log(LOG_ERROR, "This stream is not set up for writing!\n");
@@ -399,36 +309,29 @@ static int ogg_vorbis_write(struct ast_filestream *s, struct ast_frame *f)
 
        buffer = vorbis_analysis_buffer(&s->vd, f->samples);
 
-       for (i = 0; i < f->samples; i++) {
-               buffer[0][i] = data[i] / 32768.f;
-       }
+       for (i = 0; i < f->samples; i++)
+               buffer[0][i] = (double)data[i] / 32768.0;
 
        vorbis_analysis_wrote(&s->vd, f->samples);
 
-       write_stream(s);
+       write_stream(s, fs->f);
 
        return 0;
 }
 
 /*!
  * \brief Close a OGG/Vorbis filestream.
- * \param s A OGG/Vorbis filestream.
+ * \param fs A OGG/Vorbis filestream.
  */
-static void ogg_vorbis_close(struct ast_filestream *s)
+static void ogg_vorbis_close(struct ast_filestream *fs)
 {
-       if (ast_mutex_lock(&ogg_vorbis_lock)) {
-               ast_log(LOG_WARNING, "Unable to lock ogg_vorbis list\n");
-               return;
-       }
-       glistcnt--;
-       ast_mutex_unlock(&ogg_vorbis_lock);
-       ast_update_use_count();
+       struct vorbis_desc *s = (struct vorbis_desc *)fs->private;
 
        if (s->writing) {
                /* Tell the Vorbis encoder that the stream is finished
                 * and write out the rest of the data */
                vorbis_analysis_wrote(&s->vd, 0);
-               write_stream(s);
+               write_stream(s, fs->f);
        }
 
        ogg_stream_clear(&s->os);
@@ -440,23 +343,21 @@ static void ogg_vorbis_close(struct ast_filestream *s)
        if (s->writing) {
                ogg_sync_clear(&s->oy);
        }
-
-       fclose(s->f);
-       free(s);
 }
 
 /*!
  * \brief Get audio data.
- * \param s An OGG/Vorbis filestream.
+ * \param fs An OGG/Vorbis filestream.
  * \param pcm Pointer to a buffere to store audio data in.
  */
 
-static int read_samples(struct ast_filestream *s, float ***pcm)
+static int read_samples(struct ast_filestream *fs, float ***pcm)
 {
        int samples_in;
        int result;
        char *buffer;
        int bytes;
+       struct vorbis_desc *s = (struct vorbis_desc *)fs->private;
 
        while (1) {
                samples_in = vorbis_synthesis_pcmout(&s->vd, pcm);
@@ -513,7 +414,7 @@ static int read_samples(struct ast_filestream *s, float ***pcm)
                        /* get a buffer from OGG to read the data into */
                        buffer = ogg_sync_buffer(&s->oy, BLOCK_SIZE);
                        /* read more data from the file descriptor */
-                       bytes = fread(buffer, 1, BLOCK_SIZE, s->f);
+                       bytes = fread(buffer, 1, BLOCK_SIZE, fs->f);
                        /* Tell OGG how many bytes we actually read into the buffer */
                        ogg_sync_wrote(&s->oy, bytes);
                        if (bytes == 0) {
@@ -525,30 +426,35 @@ static int read_samples(struct ast_filestream *s, float ***pcm)
 
 /*!
  * \brief Read a frame full of audio data from the filestream.
- * \param s The filestream.
+ * \param fs The filestream.
  * \param whennext Number of sample times to schedule the next call.
  * \return A pointer to a frame containing audio data or NULL ifthere is no more audio data.
  */
-static struct ast_frame *ogg_vorbis_read(struct ast_filestream *s,
+static struct ast_frame *ogg_vorbis_read(struct ast_filestream *fs,
                                         int *whennext)
 {
        int clipflag = 0;
        int i;
        int j;
-       float **pcm;
-       float *mono;
        double accumulator[SAMPLES_MAX];
        int val;
        int samples_in;
        int samples_out = 0;
+       struct vorbis_desc *s = (struct vorbis_desc *)fs->private;
+       short *buf;     /* SLIN data buffer */
 
-       while (1) {
-               /* See ifwe have filled up an audio frame yet */
-               if (samples_out == SAMPLES_MAX)
-                       break;
+       fs->fr.frametype = AST_FRAME_VOICE;
+       fs->fr.subclass = AST_FORMAT_SLINEAR;
+       fs->fr.mallocd = 0;
+       AST_FRAME_SET_BUFFER(&fs->fr, fs->buf, AST_FRIENDLY_OFFSET, BUF_SIZE);
+       buf = (short *)(fs->fr.data);   /* SLIN data buffer */
+
+       while (samples_out != SAMPLES_MAX) {
+               float **pcm;
+               int len = SAMPLES_MAX - samples_out;
 
                /* See ifVorbis decoder has some audio data for us ... */
-               samples_in = read_samples(s, &pcm);
+               samples_in = read_samples(fs, &pcm);
                if (samples_in <= 0)
                        break;
 
@@ -556,17 +462,15 @@ static struct ast_frame *ogg_vorbis_read(struct ast_filestream *s,
                /* Convert the float audio data to 16-bit signed linear */
 
                clipflag = 0;
-
-               samples_in = samples_in < (SAMPLES_MAX - samples_out) ? samples_in : (SAMPLES_MAX - samples_out);
-
+               if (samples_in > len)
+                       samples_in = len;
                for (j = 0; j < samples_in; j++)
                        accumulator[j] = 0.0;
 
                for (i = 0; i < s->vi.channels; i++) {
-                       mono = pcm[i];
-                       for (j = 0; j < samples_in; j++) {
+                       float *mono = pcm[i];
+                       for (j = 0; j < samples_in; j++)
                                accumulator[j] += mono[j];
-                       }
                }
 
                for (j = 0; j < samples_in; j++) {
@@ -574,12 +478,11 @@ static struct ast_frame *ogg_vorbis_read(struct ast_filestream *s,
                        if (val > 32767) {
                                val = 32767;
                                clipflag = 1;
-                       }
-                       if (val < -32768) {
+                       } else if (val < -32768) {
                                val = -32768;
                                clipflag = 1;
                        }
-                       s->buffer[samples_out + j] = val;
+                       buf[samples_out + j] = val;
                }
 
                if (clipflag)
@@ -590,17 +493,11 @@ static struct ast_frame *ogg_vorbis_read(struct ast_filestream *s,
        }
 
        if (samples_out > 0) {
-               s->fr.frametype = AST_FRAME_VOICE;
-               s->fr.subclass = AST_FORMAT_SLINEAR;
-               s->fr.offset = AST_FRIENDLY_OFFSET;
-               s->fr.datalen = samples_out * 2;
-               s->fr.data = s->buffer;
-               s->fr.src = name;
-               s->fr.mallocd = 0;
-               s->fr.samples = samples_out;
+               fs->fr.datalen = samples_out * 2;
+               fs->fr.samples = samples_out;
                *whennext = samples_out;
 
-               return &s->fr;
+               return &fs->fr;
        } else {
                return NULL;
        }
@@ -625,8 +522,8 @@ static int ogg_vorbis_trunc(struct ast_filestream *s)
  * \param whence Location to measure 
  * \return 0 on success, -1 on failure.
  */
-
-static int ogg_vorbis_seek(struct ast_filestream *s, off_t sample_offset, int whence) {
+static int ogg_vorbis_seek(struct ast_filestream *s, off_t sample_offset, int whence)
+{
        ast_log(LOG_WARNING, "Seeking is not supported on OGG/Vorbis streams!\n");
        return -1;
 }
@@ -637,43 +534,31 @@ static off_t ogg_vorbis_tell(struct ast_filestream *s)
        return -1;
 }
 
-static char *ogg_vorbis_getcomment(struct ast_filestream *s)
-{
-       ast_log(LOG_WARNING, "Getting comments is not supported on OGG/Vorbis streams!\n");
-       return NULL;
-}
-
-int load_module()
-{
-       return ast_format_register(name, exts, AST_FORMAT_SLINEAR,
-                                  ogg_vorbis_open,
-                                  ogg_vorbis_rewrite,
-                                  ogg_vorbis_write,
-                                  ogg_vorbis_seek,
-                                  ogg_vorbis_trunc,
-                                  ogg_vorbis_tell,
-                                  ogg_vorbis_read,
-                                  ogg_vorbis_close,
-                                  ogg_vorbis_getcomment);
-}
-
-int unload_module()
-{
-       return ast_format_unregister(name);
-}
+static const struct ast_format vorbis_f = {
+       .name = "ogg_vorbis",
+       .exts = "ogg",
+       .format = AST_FORMAT_SLINEAR,
+       .open = ogg_vorbis_open,
+       .rewrite = ogg_vorbis_rewrite,
+       .write = ogg_vorbis_write,
+       .seek = ogg_vorbis_seek,
+       .trunc = ogg_vorbis_trunc,
+       .tell = ogg_vorbis_tell,
+       .read = ogg_vorbis_read,
+       .close = ogg_vorbis_close,
+       .buf_size = BUF_SIZE + AST_FRIENDLY_OFFSET,
+       .desc_size = sizeof(struct vorbis_desc),
+};
 
-int usecount()
+static int load_module(void)
 {
-       return glistcnt;
+       return ast_format_register(&vorbis_f);
 }
 
-char *description()
+static int unload_module(void)
 {
-       return desc;
+       return ast_format_unregister(vorbis_f.name);
 }
 
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "OGG/Vorbis audio");
 
-char *key()
-{
-       return ASTERISK_GPL_KEY;
-}