Merged revisions 328247 via svnmerge from
[asterisk/asterisk.git] / formats / format_jpeg.c
old mode 100755 (executable)
new mode 100644 (file)
index a3530cf..d673302
  * at the top of the source tree.
  */
 
-/*
+/*! \file
  *
- * JPEG File format support.
+ * \brief JPEG File format support.
  * 
+ * \arg File name extension: jpeg, jpg
+ * \ingroup formats
  */
-#include <sys/types.h>
-#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>
 
+/*** MODULEINFO
+       <support_level>extended</support_level>
+ ***/
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#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/image.h"
-#include "asterisk/lock.h"
 #include "asterisk/endian.h"
 
-static char *desc = "JPEG (Joint Picture Experts Group) Image Format";
-
-
 static struct ast_frame *jpeg_read_image(int fd, int len)
 {
        struct ast_frame fr;
        int res;
        char buf[65536];
-       if (len > sizeof(buf)) {
+       if (len > sizeof(buf) || len < 0) {
                ast_log(LOG_WARNING, "JPEG image too large to read\n");
                return NULL;
        }
@@ -63,8 +52,8 @@ static struct ast_frame *jpeg_read_image(int fd, int len)
        }
        memset(&fr, 0, sizeof(fr));
        fr.frametype = AST_FRAME_IMAGE;
-       fr.subclass = AST_FORMAT_JPEG;
-       fr.data = buf;
+       ast_format_set(&fr.subclass.format, AST_FORMAT_JPEG, 0);
+       fr.data.ptr = buf;
        fr.src = "JPEG Read";
        fr.datalen = len;
        return ast_frisolate(&fr);
@@ -89,12 +78,12 @@ static int jpeg_write_image(int fd, struct ast_frame *fr)
                ast_log(LOG_WARNING, "Not an image\n");
                return -1;
        }
-       if (fr->subclass != AST_FORMAT_JPEG) {
+       if (fr->subclass.format.id != AST_FORMAT_JPEG) {
                ast_log(LOG_WARNING, "Not a jpeg image\n");
                return -1;
        }
        if (fr->datalen) {
-               res = write(fd, fr->data, fr->datalen);
+               res = write(fd, fr->data.ptr, fr->datalen);
                if (res != fr->datalen) {
                        ast_log(LOG_WARNING, "Only wrote %d of %d bytes: %s\n", res, fr->datalen, strerror(errno));
                        return -1;
@@ -104,39 +93,31 @@ static int jpeg_write_image(int fd, struct ast_frame *fr)
 }
 
 static struct ast_imager jpeg_format = {
-       "jpg",
-       "JPEG (Joint Picture Experts Group)",
-       "jpg|jpeg",
-       AST_FORMAT_JPEG,
-       jpeg_read_image,
-       jpeg_identify,
-       jpeg_write_image,
+       .name = "jpg",
+       .desc = "JPEG (Joint Picture Experts Group)",
+       .exts = "jpg|jpeg",
+       .read_image = jpeg_read_image,
+       .identify = jpeg_identify,
+       .write_image = jpeg_write_image,
 };
 
-int load_module()
+static int load_module(void)
 {
-       return ast_image_register(&jpeg_format);
+       ast_format_set(&jpeg_format.format, AST_FORMAT_JPEG, 0);
+       if (ast_image_register(&jpeg_format))
+               return AST_MODULE_LOAD_FAILURE;
+       return AST_MODULE_LOAD_SUCCESS;
 }
 
-int unload_module()
+static int unload_module(void)
 {
        ast_image_unregister(&jpeg_format);
-       return 0;
-}      
 
-int usecount()
-{
-       /* We never really have any users */
        return 0;
 }
 
-char *description()
-{
-       return desc;
-}
-
-
-char *key()
-{
-       return ASTERISK_GPL_KEY;
-}
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "jpeg (joint picture experts group) image format",
+       .load = load_module,
+       .unload = unload_module,
+       .load_pri = AST_MODPRI_APP_DEPEND
+);