diff options
author | David Vossel <dvossel@digium.com> | 2011-02-03 16:22:10 +0000 |
---|---|---|
committer | David Vossel <dvossel@digium.com> | 2011-02-03 16:22:10 +0000 |
commit | c26c190711a1bbe3b5fff1a93facae333757c56e (patch) | |
tree | 00da0caa5a07b7b25729f089dbcafb08129fa9be /formats/format_jpeg.c | |
parent | 652fb64a01c7a8656697d07e606620ee0ced6929 (diff) |
Asterisk media architecture conversion - no more format bitfields
This patch is the foundation of an entire new way of looking at media in Asterisk.
The code present in this patch is everything required to complete phase1 of my
Media Architecture proposal. For more information about this project visit the link below.
https://wiki.asterisk.org/wiki/display/AST/Media+Architecture+Proposal
The primary function of this patch is to convert all the usages of format
bitfields in Asterisk to use the new format and format_cap APIs. Functionally
no change in behavior should be present in this patch. Thanks to twilson
and russell for all the time they spent reviewing these changes.
Review: https://reviewboard.asterisk.org/r/1083/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@306010 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'formats/format_jpeg.c')
-rw-r--r-- | formats/format_jpeg.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/formats/format_jpeg.c b/formats/format_jpeg.c index 9b1fb9965..99de8dac1 100644 --- a/formats/format_jpeg.c +++ b/formats/format_jpeg.c @@ -48,7 +48,7 @@ static struct ast_frame *jpeg_read_image(int fd, int len) } memset(&fr, 0, sizeof(fr)); fr.frametype = AST_FRAME_IMAGE; - fr.subclass.codec = AST_FORMAT_JPEG; + ast_format_set(&fr.subclass.format, AST_FORMAT_JPEG, 0); fr.data.ptr = buf; fr.src = "JPEG Read"; fr.datalen = len; @@ -74,7 +74,7 @@ static int jpeg_write_image(int fd, struct ast_frame *fr) ast_log(LOG_WARNING, "Not an image\n"); return -1; } - if (fr->subclass.codec != AST_FORMAT_JPEG) { + if (fr->subclass.format.id != AST_FORMAT_JPEG) { ast_log(LOG_WARNING, "Not a jpeg image\n"); return -1; } @@ -92,7 +92,6 @@ static struct ast_imager jpeg_format = { .name = "jpg", .desc = "JPEG (Joint Picture Experts Group)", .exts = "jpg|jpeg", - .format = AST_FORMAT_JPEG, .read_image = jpeg_read_image, .identify = jpeg_identify, .write_image = jpeg_write_image, @@ -100,6 +99,7 @@ static struct ast_imager jpeg_format = { static int load_module(void) { + 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; |