diff options
author | rizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-04-04 12:59:25 +0000 |
---|---|---|
committer | rizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-04-04 12:59:25 +0000 |
commit | 217ea2f1ea680d457c19aac1b563077f1f9ae67c (patch) | |
tree | c2ca953ad9722e235aa0205ca61e6b6a59c5e9e5 /formats/format_g729.c | |
parent | 577bc5cf68911578b9a529d3919a923f5a5b3436 (diff) |
Largely simplify format handlers (for file copy etc.)
collecting common functions in a single place and removing
them from the individual handlers.
The full description is on mantis,
http://bugs.digium.com/view.php?id=6375
and only the ogg_vorbis handler needs to be converted to
the new structure.
As a result of this change, format_au.c and format_pcm_alaw.c
should go away (in a separate commit) as their functionality
(trivial) has been merged in another file.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@17243 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'formats/format_g729.c')
-rw-r--r-- | formats/format_g729.c | 141 |
1 files changed, 28 insertions, 113 deletions
diff --git a/formats/format_g729.c b/formats/format_g729.c index 5194cea05..fc1e3e334 100644 --- a/formats/format_g729.c +++ b/formats/format_g729.c @@ -51,88 +51,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") /* Portions of the conversion code are by guido@sienanet.it */ -struct ast_filestream { - void *reserved[AST_RESERVED_POINTERS]; - /* Believe it or not, we must decode/recode to account for the - weird MS format */ - /* This is what a filestream means to us */ - FILE *f; /* Descriptor */ - struct ast_frame fr; /* Frame information */ - char waste[AST_FRIENDLY_OFFSET]; /* Buffer for sending frames, etc */ - char empty; /* Empty character */ - unsigned char g729[20]; /* Two Real G729 Frames */ -}; - - -AST_MUTEX_DEFINE_STATIC(g729_lock); -static int glistcnt = 0; - -static char *name = "g729"; -static char *desc = "Raw G729 data"; -static char *exts = "g729"; - -static struct ast_filestream *g729_open(FILE *f) -{ - /* We don't have any header to read or anything really, but - if we did, it would go here. We also might want to check - and be sure it's a valid file. */ - struct ast_filestream *tmp; - if ((tmp = malloc(sizeof(struct ast_filestream)))) { - memset(tmp, 0, sizeof(struct ast_filestream)); - if (ast_mutex_lock(&g729_lock)) { - ast_log(LOG_WARNING, "Unable to lock g729 list\n"); - free(tmp); - return NULL; - } - tmp->f = f; - tmp->fr.data = tmp->g729; - tmp->fr.frametype = AST_FRAME_VOICE; - tmp->fr.subclass = AST_FORMAT_G729A; - /* datalen will vary for each frame */ - tmp->fr.src = name; - tmp->fr.mallocd = 0; - glistcnt++; - ast_mutex_unlock(&g729_lock); - ast_update_use_count(); - } - return tmp; -} - -static struct ast_filestream *g729_rewrite(FILE *f, const char *comment) -{ - /* We don't have any header to read or anything really, but - if we did, it would go here. We also might want to check - and be sure it's a valid file. */ - struct ast_filestream *tmp; - if ((tmp = malloc(sizeof(struct ast_filestream)))) { - memset(tmp, 0, sizeof(struct ast_filestream)); - if (ast_mutex_lock(&g729_lock)) { - ast_log(LOG_WARNING, "Unable to lock g729 list\n"); - free(tmp); - return NULL; - } - tmp->f = f; - glistcnt++; - ast_mutex_unlock(&g729_lock); - ast_update_use_count(); - } else - ast_log(LOG_WARNING, "Out of memory\n"); - return tmp; -} - -static void g729_close(struct ast_filestream *s) -{ - if (ast_mutex_lock(&g729_lock)) { - ast_log(LOG_WARNING, "Unable to lock g729 list\n"); - return; - } - glistcnt--; - ast_mutex_unlock(&g729_lock); - ast_update_use_count(); - fclose(s->f); - free(s); - s = NULL; -} +#define BUF_SIZE 20 /* two G729 frames */ +#define G729A_SAMPLES 160 static struct ast_frame *g729_read(struct ast_filestream *s, int *whennext) { @@ -140,13 +60,11 @@ static struct ast_frame *g729_read(struct ast_filestream *s, int *whennext) /* Send a frame from the file to the appropriate channel */ s->fr.frametype = AST_FRAME_VOICE; s->fr.subclass = AST_FORMAT_G729A; - s->fr.offset = AST_FRIENDLY_OFFSET; - s->fr.samples = 160; - s->fr.datalen = 20; s->fr.mallocd = 0; - s->fr.data = s->g729; - if ((res = fread(s->g729, 1, 20, s->f)) != 20) { - if (res && (res != 10)) + s->fr.samples = G729A_SAMPLES; + FR_SET_BUF(&s->fr, s->buf, AST_FRIENDLY_OFFSET, BUF_SIZE); + if ((res = fread(s->fr.data, 1, s->fr.datalen, s->f)) != s->fr.datalen) { + if (res && (res != 10)) /* XXX what for ? */ ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno)); return NULL; } @@ -176,11 +94,6 @@ static int g729_write(struct ast_filestream *fs, struct ast_frame *f) return 0; } -static char *g729_getcomment(struct ast_filestream *s) -{ - return NULL; -} - static int g729_seek(struct ast_filestream *fs, off_t sample_offset, int whence) { long bytes; @@ -190,7 +103,7 @@ static int g729_seek(struct ast_filestream *fs, off_t sample_offset, int whence) fseeko(fs->f, 0, SEEK_END); max = ftello(fs->f); - bytes = 20 * (sample_offset / 160); + bytes = BUF_SIZE * (sample_offset / G729A_SAMPLES); if (whence == SEEK_SET) offset = bytes; else if (whence == SEEK_CUR || whence == SEEK_FORCECUR) @@ -217,43 +130,45 @@ static int g729_trunc(struct ast_filestream *fs) static off_t g729_tell(struct ast_filestream *fs) { - off_t offset; - offset = ftello(fs->f); - return (offset/20)*160; + off_t offset = ftello(fs->f); + return (offset/BUF_SIZE)*G729A_SAMPLES; } +static struct ast_format_lock me = { .usecnt = -1 }; + +static const struct ast_format g729_f = { + .name = "g729", + .exts = "g729", + .format = AST_FORMAT_G729A, + .write = g729_write, + .seek = g729_seek, + .trunc = g729_trunc, + .tell = g729_tell, + .read = g729_read, + .buf_size = BUF_SIZE + AST_FRIENDLY_OFFSET, + .lockp = &me, +}; + int load_module() { - return ast_format_register(name, exts, AST_FORMAT_G729A, - g729_open, - g729_rewrite, - g729_write, - g729_seek, - g729_trunc, - g729_tell, - g729_read, - g729_close, - g729_getcomment); - - + return ast_format_register(&g729_f); } int unload_module() { - return ast_format_unregister(name); + return ast_format_unregister(g729_f.name); } int usecount() { - return glistcnt; + return me.usecnt; } char *description() { - return desc; + return "Raw G729 data"; } - char *key() { return ASTERISK_GPL_KEY; |