diff options
| author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-02-03 16:22:10 +0000 |
|---|---|---|
| committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-02-03 16:22:10 +0000 |
| commit | 4aca3187a3db25ff4d2208f116f618b363dec7d5 (patch) | |
| tree | 00da0caa5a07b7b25729f089dbcafb08129fa9be /formats/format_vox.c | |
| parent | 8170aae0a0882a93ca1ef80736cb95c2d6126865 (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: http://svn.digium.com/svn/asterisk/trunk@306010 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'formats/format_vox.c')
| -rw-r--r-- | formats/format_vox.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/formats/format_vox.c b/formats/format_vox.c index c13dd7ac5..05ecdeeaf 100644 --- a/formats/format_vox.c +++ b/formats/format_vox.c @@ -41,7 +41,7 @@ static struct ast_frame *vox_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.codec = AST_FORMAT_ADPCM; + ast_format_set(&s->fr.subclass.format, AST_FORMAT_ADPCM, 0); s->fr.mallocd = 0; AST_FRAME_SET_BUFFER(&s->fr, s->buf, AST_FRIENDLY_OFFSET, BUF_SIZE); if ((res = fread(s->fr.data.ptr, 1, s->fr.datalen, s->f)) < 1) { @@ -61,8 +61,8 @@ static int vox_write(struct ast_filestream *s, struct ast_frame *f) ast_log(LOG_WARNING, "Asked to write non-voice frame!\n"); return -1; } - if (f->subclass.codec != AST_FORMAT_ADPCM) { - ast_log(LOG_WARNING, "Asked to write non-ADPCM frame (%s)!\n", ast_getformatname(f->subclass.codec)); + if (f->subclass.format.id != AST_FORMAT_ADPCM) { + ast_log(LOG_WARNING, "Asked to write non-ADPCM frame (%s)!\n", ast_getformatname(&f->subclass.format)); return -1; } if ((res = fwrite(f->data.ptr, 1, f->datalen, s->f)) != f->datalen) { @@ -108,10 +108,9 @@ static off_t vox_tell(struct ast_filestream *fs) return offset; } -static const struct ast_format vox_f = { +static struct ast_format_def vox_f = { .name = "vox", .exts = "vox", - .format = AST_FORMAT_ADPCM, .write = vox_write, .seek = vox_seek, .trunc = vox_trunc, @@ -122,14 +121,15 @@ static const struct ast_format vox_f = { static int load_module(void) { - if (ast_format_register(&vox_f)) + ast_format_set(&vox_f.format, AST_FORMAT_ADPCM, 0); + if (ast_format_def_register(&vox_f)) return AST_MODULE_LOAD_FAILURE; return AST_MODULE_LOAD_SUCCESS; } static int unload_module(void) { - return ast_format_unregister(vox_f.name); + return ast_format_def_unregister(vox_f.name); } AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Dialogic VOX (ADPCM) File Format", |