Merge "func_curl.c: Support custom http headers"
[asterisk/asterisk.git] / formats / format_ogg_vorbis.c
old mode 100755 (executable)
new mode 100644 (file)
index eecc89f..ba86842
  * \arg File name extension: ogg
  * \ingroup formats
  */
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <stdlib.h>
-#include <sys/time.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
 
+/* 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>
+       <support_level>core</support_level>
+ ***/
+
+#include "asterisk.h"
+
+#include <ogg/ogg.h>
 #include <vorbis/codec.h>
 #include <vorbis/vorbisenc.h>
+#include <vorbis/vorbisfile.h>
 
 #ifdef _WIN32
 #include <io.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/mod_format.h"
 #include "asterisk/module.h"
+#include "asterisk/format_cache.h"
 
-#define SAMPLES_MAX 160
-#define BLOCK_SIZE 4096
-
+/*
+ * 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 512
+#define        BUF_SIZE        (2*SAMPLES_MAX)
 
-struct ast_filestream {
-       void *reserved[AST_RESERVED_POINTERS];
+#define BLOCK_SIZE 4096                /* used internally in the vorbis routines */
 
-       FILE *f;
+struct ogg_vorbis_desc {       /* format specific parameters */
+       /* OggVorbis_File structure for libvorbisfile interface */
+       OggVorbis_File ov_f;
 
        /* structures for handling the Ogg container */
-       ogg_sync_state   oy;
        ogg_stream_state os;
-       ogg_page         og;
-       ogg_packet       op;
-       
+       ogg_page og;
+       ogg_packet op;
+
        /* structures for handling Vorbis audio data */
-       vorbis_info      vi;
-       vorbis_comment   vc;
+       vorbis_info vi;
+       vorbis_comment vc;
        vorbis_dsp_state vd;
-       vorbis_block     vb;
-       
+       vorbis_block vb;
+
        /*! \brief Indicates whether this filestream is set up for reading or writing. */
        int writing;
 
+       /*! \brief Stores the current pcm position to support tell() on writing mode. */
+       off_t writing_pcm_pos;
+
        /*! \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;
+#if !defined(HAVE_VORBIS_OPEN_CALLBACKS)
+/*
+ * Declared for backward compatibility with vorbisfile v1.1.2.
+ * Code taken from vorbisfile.h v1.2.0.
+ */
+static int _ov_header_fseek_wrap(FILE *f, ogg_int64_t off, int whence)
+{
+       if (f == NULL) {
+               return -1;
+       }
+       return fseek(f, off, whence);
+}
 
-static char *name = "ogg_vorbis";
-static char *desc = "OGG/Vorbis audio";
-static char *exts = "ogg";
+static ov_callbacks OV_CALLBACKS_NOCLOSE = {
+  (size_t (*)(void *, size_t, size_t, void *))  fread,
+  (int (*)(void *, ogg_int64_t, int))           _ov_header_fseek_wrap,
+  (int (*)(void *))                             NULL,
+  (long (*)(void *))                            ftell
+};
+#endif /* !defined(HAVE_VORBIS_OPEN_CALLBACKS) */
 
 /*!
  * \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 ast_filestream *tmp;
-
-       if((tmp = malloc(sizeof(struct ast_filestream)))) {
-               memset(tmp, 0, sizeof(struct ast_filestream));
-
-               tmp->writing = 0;
-               tmp->f = f;
+       struct ogg_vorbis_desc *desc = (struct ogg_vorbis_desc *) s->_private;
 
-               ogg_sync_init(&tmp->oy);
+       /* initialize private description block */
+       memset(desc, 0, sizeof(struct ogg_vorbis_desc));
+       desc->writing = 0;
 
-               buffer = ogg_sync_buffer(&tmp->oy, BLOCK_SIZE);
-               bytes = fread(buffer, 1, BLOCK_SIZE, f);
-               ogg_sync_wrote(&tmp->oy, bytes);
+       /* actually open file */
+       result = ov_open_callbacks(s->f, &desc->ov_f, NULL, 0, OV_CALLBACKS_NOCLOSE);
+       if (result != 0) {
+               ast_log(LOG_ERROR, "Error opening Ogg/Vorbis file stream.\n");
+               return -1;
+       }
 
-               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;
-               }
-               
-               i = 0;
-               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++;
-                                       }
-                               }
-                       }
+       /* check stream(s) type */
+       if (desc->ov_f.vi->channels != 1) {
+               ast_log(LOG_ERROR, "Only monophonic OGG/Vorbis files are currently supported!\n");
+               ov_clear(&desc->ov_f);
+               return -1;
+       }
 
-                       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;
-               }
-               glistcnt++;
-               ast_mutex_unlock(&ogg_vorbis_lock);
-               ast_update_use_count();
+       if (desc->ov_f.vi->rate != DEFAULT_SAMPLE_RATE) {
+               ast_log(LOG_ERROR, "Only 8000Hz OGG/Vorbis files are currently supported!\n");
+               ov_clear(&desc->ov_f);
+               return -1;
        }
-       return tmp;
+
+       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, const char *comment)
+static int ogg_vorbis_rewrite(struct ast_filestream *s,
+                                                const char *comment)
 {
        ogg_packet header;
        ogg_packet header_comm;
        ogg_packet header_code;
+       struct ogg_vorbis_desc *tmp = (struct ogg_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->f = f;
+       tmp->writing = 1;
+       tmp->writing_pcm_pos = 0;
 
-               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;
-               }
+       if (vorbis_encode_init_vbr(&tmp->vi, 1, DEFAULT_SAMPLE_RATE, 0.4)) {
+               ast_log(LOG_ERROR, "Unable to initialize Vorbis encoder!\n");
+               vorbis_info_clear(&tmp->vi);
+               return -1;
+       }
 
-               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);
+       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);
 
-               vorbis_analysis_init(&tmp->vd, &tmp->vi);
-               vorbis_block_init(&tmp->vd, &tmp->vb);
+       vorbis_analysis_init(&tmp->vd, &tmp->vi);
+       vorbis_block_init(&tmp->vd, &tmp->vb);
 
-               ogg_stream_init(&tmp->os, rand());
+       ogg_stream_init(&tmp->os, ast_random());
 
-               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);
+       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);
 
-               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;
+       while (!tmp->eos) {
+               if (ogg_stream_flush(&tmp->os, &tmp->og) == 0)
+                       break;
+               if (fwrite(tmp->og.header, 1, tmp->og.header_len, s->f) != tmp->og.header_len) {
+                       ast_log(LOG_WARNING, "fwrite() failed: %s\n", strerror(errno));
                }
-
-               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;
+               if (fwrite(tmp->og.body, 1, tmp->og.body_len, s->f) != tmp->og.body_len) {
+                       ast_log(LOG_WARNING, "fwrite() failed: %s\n", strerror(errno));
                }
-               glistcnt++;
-               ast_mutex_unlock(&ogg_vorbis_lock);
-               ast_update_use_count();
+               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 ogg_vorbis_desc *s, FILE *f)
 {
        while (vorbis_analysis_blockout(&s->vd, &s->vb) == 1) {
                vorbis_analysis(&s->vb, NULL);
                vorbis_bitrate_addblock(&s->vb);
-               
+
                while (vorbis_bitrate_flushpacket(&s->vd, &s->op)) {
                        ogg_stream_packetin(&s->os, &s->op);
                        while (!s->eos) {
-                               if(ogg_stream_pageout(&s->os, &s->og) == 0) {
+                               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);
-                               if(ogg_page_eos(&s->og)) {
+                               if (fwrite(s->og.header, 1, s->og.header_len, f) != s->og.header_len) {
+                                       ast_log(LOG_WARNING, "fwrite() failed: %s\n", strerror(errno));
+                               }
+                               if (fwrite(s->og.body, 1, s->og.body_len, f) != s->og.body_len) {
+                                       ast_log(LOG_WARNING, "fwrite() failed: %s\n", strerror(errno));
+                               }
+                               if (ogg_page_eos(&s->og)) {
                                        s->eos = 1;
                                }
                        }
@@ -363,314 +228,222 @@ 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 ogg_vorbis_desc *s = (struct ogg_vorbis_desc *) fs->_private;
 
-       if(!s->writing) {
+       if (!s->writing) {
                ast_log(LOG_ERROR, "This stream is not set up for writing!\n");
                return -1;
        }
-
-       if(f->frametype != AST_FRAME_VOICE) {
-               ast_log(LOG_WARNING, "Asked to write non-voice frame!\n");
-               return -1;
-       }
-       if(f->subclass != AST_FORMAT_SLINEAR) {
-               ast_log(LOG_WARNING, "Asked to write non-SLINEAR frame (%d)!\n", f->subclass);
-               return -1;
-       }
-       if(!f->datalen)
+       if (!f->datalen)
                return -1;
 
-       data = (short *) f->data;
+       data = (short *) f->data.ptr;
 
        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);
+
+       s->writing_pcm_pos +=  f->samples;
 
        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 ogg_vorbis_desc *s = (struct ogg_vorbis_desc *) fs->_private;
 
-       if(s->writing) {
+       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);
-       }
-
-       ogg_stream_clear(&s->os);
-       vorbis_block_clear(&s->vb);
-       vorbis_dsp_clear(&s->vd);
-       vorbis_comment_clear(&s->vc);
-       vorbis_info_clear(&s->vi);
-
-       if(s->writing) {
-               ogg_sync_clear(&s->oy);
-       }
-       
-       fclose(s->f);
-       free(s);
-}
-
-/*!
- * \brief Get audio data.
- * \param s 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)
-{
-       int samples_in;
-       int result;
-       char *buffer;
-       int bytes;
-
-       while (1) {
-               samples_in = vorbis_synthesis_pcmout(&s->vd, pcm);
-               if(samples_in > 0) {
-                       return samples_in;
-               }
-               
-               /* The Vorbis decoder needs more data... */
-               /* See ifOGG has any packets in the current page for the Vorbis decoder. */
-               result = ogg_stream_packetout(&s->os, &s->op);
-               if(result > 0) {
-                       /* Yes OGG had some more packets for the Vorbis decoder. */
-                       if(vorbis_synthesis(&s->vb, &s->op) == 0) {
-                               vorbis_synthesis_blockin(&s->vd, &s->vb);
-                       }
-                       
-                       continue;
-               }
-
-               if(result < 0)
-                       ast_log(LOG_WARNING, "Corrupt or missing data at this page position; continuing...\n");
-               
-               /* No more packets left in the current page... */
-
-               if(s->eos) {
-                       /* No more pages left in the stream */
-                       return -1;
-               }
-
-               while (!s->eos) {
-                       /* See ifOGG has any pages in it's internal buffers */
-                       result = ogg_sync_pageout(&s->oy, &s->og);
-                       if(result > 0) {
-                               /* Yes, OGG has more pages in it's internal buffers,
-                                  add the page to the stream state */
-                               result = ogg_stream_pagein(&s->os, &s->og);
-                               if(result == 0) {
-                                       /* Yes, got a new,valid page */
-                                       if(ogg_page_eos(&s->og)) {
-                                               s->eos = 1;
-                                       }
-                                       break;
-                               }
-                               ast_log(LOG_WARNING, "Invalid page in the bitstream; continuing...\n");
-                       }
-                       
-                       if(result < 0)
-                               ast_log(LOG_WARNING, "Corrupt or missing data in bitstream; continuing...\n");
-
-                       /* No, we need to read more data from the file descrptor */
-                       /* 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);
-                       /* Tell OGG how many bytes we actually read into the buffer */
-                       ogg_sync_wrote(&s->oy, bytes);
-                       if(bytes == 0) {
-                               s->eos = 1;
-                       }
-               }
+               write_stream(s, fs->f);
+
+               /* Cleanup */
+               ogg_stream_clear(&s->os);
+               vorbis_block_clear(&s->vb);
+               vorbis_dsp_clear(&s->vd);
+               vorbis_comment_clear(&s->vc);
+               vorbis_info_clear(&s->vi);
+       } else {
+               /* clear OggVorbis_File handle */
+               ov_clear(&s->ov_f);
        }
 }
 
 /*!
  * \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, int *whennext)
+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;
-
-       while (1) {
-               /* See ifwe have filled up an audio frame yet */
-               if(samples_out == SAMPLES_MAX)
-                       break;
-
-               /* See ifVorbis decoder has some audio data for us ... */
-               samples_in = read_samples(s, &pcm);
-               if(samples_in <= 0)
-                       break;
+       struct ogg_vorbis_desc *desc = (struct ogg_vorbis_desc *) fs->_private;
+       int current_bitstream = -10;
+       char *out_buf;
+       long bytes_read;
 
-               /* Got some audio data from Vorbis... */
-               /* 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);
-  
-               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++) {
-                               accumulator[j] += mono[j];
-                       }
-               }
-
-               for (j = 0; j < samples_in; j++) {
-                       val =  accumulator[j] * 32767.0 / s->vi.channels;
-                       if(val > 32767) {
-                               val = 32767;
-                               clipflag = 1;
-                       }
-                       if(val < -32768) {
-                               val = -32768;
-                               clipflag = 1;
-                       }
-                       s->buffer[samples_out + j] = val;
-               }
-                       
-               if(clipflag)
-                       ast_log(LOG_WARNING, "Clipping in frame %ld\n", (long)(s->vd.sequence));
-               
-               /* Tell the Vorbis decoder how many samples we actually used. */
-               vorbis_synthesis_read(&s->vd, samples_in);
-               samples_out += samples_in;
+       if (desc->writing) {
+               ast_log(LOG_WARNING, "Reading is not supported on OGG/Vorbis on write files.\n");
+               return NULL;
        }
 
-       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;
-               *whennext = samples_out;
-               
-               return &s->fr;
-       } else {
+       /* initialize frame */
+       AST_FRAME_SET_BUFFER(&fs->fr, fs->buf, AST_FRIENDLY_OFFSET, BUF_SIZE);
+       out_buf = (char *) (fs->fr.data.ptr);   /* SLIN data buffer */
+
+       /* read samples from OV interface */
+       bytes_read = ov_read(
+               &desc->ov_f,
+               out_buf,                                                /* Buffer to write data */
+               BUF_SIZE,                                               /* Size of buffer */
+               (__BYTE_ORDER == __BIG_ENDIAN), /* Endianes (0 for little) */
+               2,                                                              /* 1 = 8bit, 2 = 16bit */
+               1,                                                              /* 0 = unsigned, 1 = signed */
+               &current_bitstream                              /* Returns the current bitstream section */
+       );
+
+       /* check returned data */
+       if (bytes_read <= 0) {
+               /* End of stream */
                return NULL;
        }
+
+       /* Return decoded bytes */
+       fs->fr.datalen = bytes_read;
+       fs->fr.samples = bytes_read / 2;
+       *whennext = fs->fr.samples;
+       return &fs->fr;
 }
 
 /*!
  * \brief Trucate an OGG/Vorbis filestream.
- * \param s The filestream to truncate.
+ * \param fs The filestream to truncate.
  * \return 0 on success, -1 on failure.
  */
 
-static int ogg_vorbis_trunc(struct ast_filestream *s)
+static int ogg_vorbis_trunc(struct ast_filestream *fs)
 {
        ast_log(LOG_WARNING, "Truncation is not supported on OGG/Vorbis streams!\n");
        return -1;
 }
 
 /*!
- * \brief Seek to a specific position in an OGG/Vorbis filestream.
- * \param s The filestream to truncate.
- * \param sample_offset New position for the filestream, measured in 8KHz samples.
- * \param whence Location to measure 
- * \return 0 on success, -1 on failure.
+ * \brief Tell the current position in OGG/Vorbis filestream measured in pcms.
+ * \param fs The filestream to take action on.
+ * \return 0 or greater with the position measured in samples, or -1 for false.
  */
+static off_t ogg_vorbis_tell(struct ast_filestream *fs)
+{
+       off_t pos;
+       struct ogg_vorbis_desc *desc = (struct ogg_vorbis_desc *) fs->_private;
 
-static int ogg_vorbis_seek(struct ast_filestream *s, long sample_offset, int whence) {
-       ast_log(LOG_WARNING, "Seeking is not supported on OGG/Vorbis streams!\n");
-       return -1;
-}
-
-static long ogg_vorbis_tell(struct ast_filestream *s) {
-       ast_log(LOG_WARNING, "Telling is not supported on OGG/Vorbis streams!\n");
-       return -1;
-}
+       if (desc->writing) {
+               return desc->writing_pcm_pos;
+       }
 
-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;
+       if ((pos = ov_pcm_tell(&desc->ov_f)) < 0) {
+               return -1;
+       }
+       return pos;
 }
 
-int load_module()
+/*!
+ * \brief Seek to a specific position in an OGG/Vorbis filestream.
+ * \param fs The filestream to take action on.
+ * \param sample_offset New position for the filestream, measured in 8KHz samples.
+ * \param whence Location to measure
+ * \return 0 on success, -1 on failure.
+ */
+static int ogg_vorbis_seek(struct ast_filestream *fs, off_t sample_offset, int whence)
 {
-       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 seek_result = -1;
+       off_t relative_pcm_pos;
+       struct ogg_vorbis_desc *desc = (struct ogg_vorbis_desc *) fs->_private;
 
-int unload_module()
-{
-       return ast_format_unregister(name);
-}      
+       if (desc->writing) {
+               ast_log(LOG_WARNING, "Seeking is not supported on OGG/Vorbis streams in writing mode!\n");
+               return -1;
+       }
 
-int usecount()
-{
-       return glistcnt;
+       /* ov_pcm_seek support seeking only from begining (SEEK_SET), the rest must be emulated */
+       switch (whence) {
+       case SEEK_SET:
+               seek_result = ov_pcm_seek(&desc->ov_f, sample_offset);
+               break;
+       case SEEK_CUR:
+               if ((relative_pcm_pos = ogg_vorbis_tell(fs)) < 0) {
+                       seek_result = -1;
+                       break;
+               }
+               seek_result = ov_pcm_seek(&desc->ov_f, relative_pcm_pos + sample_offset);
+               break;
+       case SEEK_END:
+               if ((relative_pcm_pos = ov_pcm_total(&desc->ov_f, -1)) < 0) {
+                       seek_result = -1;
+                       break;
+               }
+               seek_result = ov_pcm_seek(&desc->ov_f, relative_pcm_pos - sample_offset);
+               break;
+       default:
+               ast_log(LOG_WARNING, "Unknown *whence* to seek on OGG/Vorbis streams!\n");
+               break;
+       }
+
+       /* normalize error value to -1,0 */
+       return (seek_result == 0) ? 0 : -1;
 }
 
-char *description()
+static struct ast_format_def vorbis_f = {
+       .name = "ogg_vorbis",
+       .exts = "ogg",
+       .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 ogg_vorbis_desc),
+};
+
+static int load_module(void)
 {
-       return desc;
+       vorbis_f.format = ast_format_slin;
+       if (ast_format_def_register(&vorbis_f))
+               return AST_MODULE_LOAD_DECLINE;
+       return AST_MODULE_LOAD_SUCCESS;
 }
 
-
-char *key()
+static int unload_module(void)
 {
-       return ASTERISK_GPL_KEY;
+       return ast_format_def_unregister(vorbis_f.name);
 }
 
-/*
-Local Variables:
-mode: C
-c-file-style: "linux"
-indent-tabs-mode: t
-End:
-*/
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "OGG/Vorbis audio",
+       .support_level = AST_MODULE_SUPPORT_CORE,
+       .load = load_module,
+       .unload = unload_module,
+       .load_pri = AST_MODPRI_APP_DEPEND
+);