diff options
Diffstat (limited to 'formats/format_wav_gsm.c')
| -rw-r--r-- | formats/format_wav_gsm.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/formats/format_wav_gsm.c b/formats/format_wav_gsm.c index c8d83ff4c..bbb1977a9 100644 --- a/formats/format_wav_gsm.c +++ b/formats/format_wav_gsm.c @@ -38,6 +38,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/mod_format.h" #include "asterisk/module.h" #include "asterisk/endian.h" +#include "asterisk/format_cache.h" #include "msgsm.h" @@ -409,11 +410,7 @@ static struct ast_frame *wav_read(struct ast_filestream *s, int *whennext) /* Send a frame from the file to the appropriate channel */ struct wavg_desc *fs = (struct wavg_desc *)s->_private; - s->fr.frametype = AST_FRAME_VOICE; - ast_format_set(&s->fr.subclass.format, AST_FORMAT_GSM, 0); - s->fr.offset = AST_FRIENDLY_OFFSET; s->fr.samples = GSM_SAMPLES; - s->fr.mallocd = 0; AST_FRAME_SET_BUFFER(&s->fr, s->buf, AST_FRIENDLY_OFFSET, GSM_FRAME_SIZE); if (fs->secondhalf) { /* Just return a frame based on the second GSM frame */ @@ -443,14 +440,6 @@ static int wav_write(struct ast_filestream *s, struct ast_frame *f) int size; struct wavg_desc *fs = (struct wavg_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.format.id != AST_FORMAT_GSM) { - ast_log(LOG_WARNING, "Asked to write non-GSM frame (%s)!\n", ast_getformatname(&f->subclass.format)); - return -1; - } /* XXX this might fail... if the input is a multiple of MSGSM_FRAME_SIZE * we assume it is already in the correct format. */ @@ -577,7 +566,7 @@ static struct ast_format_def wav49_f = { static int load_module(void) { - ast_format_set(&wav49_f.format, AST_FORMAT_GSM, 0); + wav49_f.format = ast_format_gsm; if (ast_format_def_register(&wav49_f)) return AST_MODULE_LOAD_FAILURE; return AST_MODULE_LOAD_SUCCESS; |