Merge "loader: Miscellaneous fixes."
[asterisk/asterisk.git] / formats / format_g726.c
index b0e123b..bb769bc 100644 (file)
@@ -19,7 +19,7 @@
 /*!\file
  *
  * \brief Headerless G.726 (16/24/32/40kbps) data format for Asterisk.
- * 
+ *
  * File name extensions:
  * \arg 40 kbps: g726-40
  * \arg 32 kbps: g726-32
  * \arg 16 kbps: g726-16
  * \ingroup formats
  */
-#include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+/*** MODULEINFO
+       <support_level>core</support_level>
+ ***/
 
-#include <unistd.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <stdlib.h>
-#include <sys/time.h>
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
+#include "asterisk.h"
 
-#include "asterisk/lock.h"
-#include "asterisk/options.h"
-#include "asterisk/channel.h"
-#include "asterisk/file.h"
-#include "asterisk/logger.h"
-#include "asterisk/sched.h"
+#include "asterisk/mod_format.h"
 #include "asterisk/module.h"
 #include "asterisk/endian.h"
+#include "asterisk/format_cache.h"
 
 #define        RATE_40         0
 #define        RATE_32         1
@@ -60,7 +49,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #define        BUF_SIZE        (5*FRAME_TIME)  /* max frame size in bytes ? */
 /* Frame sizes in bytes */
-static int frame_size[4] = { 
+static int frame_size[4] = {
                FRAME_TIME * 5,
                FRAME_TIME * 4,
                FRAME_TIME * 3,
@@ -76,11 +65,9 @@ struct g726_desc  {
  */
 static int g726_open(struct ast_filestream *tmp, int rate)
 {
-       struct g726_desc *s = (struct g726_desc *)tmp->private;
+       struct g726_desc *s = (struct g726_desc *)tmp->_private;
        s->rate = rate;
-       if (option_debug)
-               ast_log(LOG_DEBUG, "Created filestream G.726-%dk.\n", 
-                               40 - s->rate * 8);
+       ast_debug(1, "Created filestream G.726-%dk.\n", 40 - s->rate * 8);
        return 0;
 }
 
@@ -130,18 +117,18 @@ static int g726_16_rewrite(struct ast_filestream *s, const char *comment)
 
 static struct ast_frame *g726_read(struct ast_filestream *s, int *whennext)
 {
-       int res;
-       struct g726_desc *fs = (struct g726_desc *)s->private;
+       size_t res;
+       struct g726_desc *fs = (struct g726_desc *)s->_private;
 
        /* Send a frame from the file to the appropriate channel */
-       s->fr.frametype = AST_FRAME_VOICE;
-       s->fr.subclass = AST_FORMAT_G726;
-       s->fr.mallocd = 0;
        AST_FRAME_SET_BUFFER(&s->fr, s->buf, AST_FRIENDLY_OFFSET, frame_size[fs->rate]);
        s->fr.samples = 8 * FRAME_TIME;
-       if ((res = fread(s->fr.data, 1, s->fr.datalen, s->f)) != s->fr.datalen) {
-               if (res)
-                       ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno));
+       if ((res = fread(s->fr.data.ptr, 1, s->fr.datalen, s->f)) != s->fr.datalen) {
+               if (res) {
+                       ast_log(LOG_WARNING, "Short read of %s data (expected %d bytes, read %zu): %s\n",
+                                       ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res,
+                                       strerror(errno));
+               }
                return NULL;
        }
        *whennext = s->fr.samples;
@@ -151,24 +138,15 @@ static struct ast_frame *g726_read(struct ast_filestream *s, int *whennext)
 static int g726_write(struct ast_filestream *s, struct ast_frame *f)
 {
        int res;
-       struct g726_desc *fs = (struct g726_desc *)s->private;
+       struct g726_desc *fs = (struct g726_desc *)s->_private;
 
-       if (f->frametype != AST_FRAME_VOICE) {
-               ast_log(LOG_WARNING, "Asked to write non-voice frame!\n");
-               return -1;
-       }
-       if (f->subclass != AST_FORMAT_G726) {
-               ast_log(LOG_WARNING, "Asked to write non-G726 frame (%d)!\n", 
-                                               f->subclass);
-               return -1;
-       }
        if (f->datalen % frame_size[fs->rate]) {
-               ast_log(LOG_WARNING, "Invalid data length %d, should be multiple of %d\n", 
+               ast_log(LOG_WARNING, "Invalid data length %d, should be multiple of %d\n",
                                                f->datalen, frame_size[fs->rate]);
                return -1;
        }
-       if ((res = fwrite(f->data, 1, f->datalen, s->f)) != f->datalen) {
-               ast_log(LOG_WARNING, "Bad write (%d/%d): %s\n", 
+       if ((res = fwrite(f->data.ptr, 1, f->datalen, s->f)) != f->datalen) {
+               ast_log(LOG_WARNING, "Bad write (%d/%d): %s\n",
                                res, frame_size[fs->rate], strerror(errno));
                        return -1;
        }
@@ -190,11 +168,10 @@ static off_t g726_tell(struct ast_filestream *fs)
        return -1;
 }
 
-static const struct ast_format f[] = {
+static struct ast_format_def f[] = {
        {
                .name = "g726-40",
                .exts = "g726-40",
-               .format = AST_FORMAT_G726,
                .open = g726_40_open,
                .rewrite = g726_40_rewrite,
                .write = g726_write,
@@ -204,12 +181,10 @@ static const struct ast_format f[] = {
                .read = g726_read,
                .buf_size = BUF_SIZE + AST_FRIENDLY_OFFSET,
                .desc_size = sizeof(struct g726_desc),
-               .module = &mod_data, /* XXX */
        },
        {
                .name = "g726-32",
                .exts = "g726-32",
-               .format = AST_FORMAT_G726,
                .open = g726_32_open,
                .rewrite = g726_32_rewrite,
                .write = g726_write,
@@ -219,12 +194,10 @@ static const struct ast_format f[] = {
                .read = g726_read,
                .buf_size = BUF_SIZE + AST_FRIENDLY_OFFSET,
                .desc_size = sizeof(struct g726_desc),
-               .module = &mod_data, /* XXX */
        },
        {
                .name = "g726-24",
                .exts = "g726-24",
-               .format = AST_FORMAT_G726,
                .open = g726_24_open,
                .rewrite = g726_24_rewrite,
                .write = g726_write,
@@ -234,12 +207,10 @@ static const struct ast_format f[] = {
                .read = g726_read,
                .buf_size = BUF_SIZE + AST_FRIENDLY_OFFSET,
                .desc_size = sizeof(struct g726_desc),
-               .module = &mod_data, /* XXX */
        },
        {
                .name = "g726-16",
                .exts = "g726-16",
-               .format = AST_FORMAT_G726,
                .open = g726_16_open,
                .rewrite = g726_16_rewrite,
                .write = g726_write,
@@ -249,46 +220,39 @@ static const struct ast_format f[] = {
                .read = g726_read,
                .buf_size = BUF_SIZE + AST_FRIENDLY_OFFSET,
                .desc_size = sizeof(struct g726_desc),
-               .module = &mod_data, /* XXX */
        },
-       {       .format = 0 }   /* terminator */
+       {       .desc_size = 0 }        /* terminator */
 };
 
-/*
- * Module interface (load_module, unload_module, usecount, description, key)
- */
-static int load_module(void *mod)
+static int unload_module(void)
 {
        int i;
 
-       for (i = 0; f[i].format ; i++) {
-               if (ast_format_register(&f[i])) {       /* errors are fatal */
-                       ast_log(LOG_WARNING, "Failed to register format %s.\n", f[i].name);
-                       return -1;
-               }
+       for (i = 0; f[i].desc_size ; i++) {
+               if (ast_format_def_unregister(f[i].name))
+                       ast_log(LOG_WARNING, "Failed to unregister format %s.\n", f[i].name);
        }
-       return 0;
+       return(0);
 }
 
-static int unload_module(void *mod)
+static int load_module(void)
 {
        int i;
 
-       for (i = 0; f[i].format ; i++) {
-               if (ast_format_unregister(f[i].name))
-                       ast_log(LOG_WARNING, "Failed to unregister format %s.\n", f[i].name);
+       for (i = 0; f[i].desc_size ; i++) {
+               f[i].format = ast_format_g726;
+               if (ast_format_def_register(&f[i])) {   /* errors are fatal */
+                       ast_log(LOG_WARNING, "Failed to register format %s.\n", f[i].name);
+                       unload_module();
+                       return AST_MODULE_LOAD_DECLINE;
+               }
        }
-       return(0);
-}      
-
-static const char *description(void)
-{
-       return "Raw G.726 (16/24/32/40kbps) data";
-}
-
-static const char *key(void)
-{
-       return ASTERISK_GPL_KEY;
+       return AST_MODULE_LOAD_SUCCESS;
 }
 
-STD_MOD1;
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Raw G.726 (16/24/32/40kbps) data",
+       .support_level = AST_MODULE_SUPPORT_CORE,
+       .load = load_module,
+       .unload = unload_module,
+       .load_pri = AST_MODPRI_APP_DEPEND
+);