diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-11-04 14:05:12 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-11-04 14:05:12 +0000 |
| commit | 3bacd4082e2d3a2dd5b8b13635df956aa4f415cd (patch) | |
| tree | dd3bc244b8a45aacb932109dc8c12d1f21769d55 /formats/format_pcm.c | |
| parent | 1d3ce2ae5f81e30ec0704efe840bc2c9a24c7e8a (diff) | |
Expand codec bitfield from 32 bits to 64 bits.
Reviewboard: https://reviewboard.asterisk.org/r/416/
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@227580 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'formats/format_pcm.c')
| -rw-r--r-- | formats/format_pcm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/formats/format_pcm.c b/formats/format_pcm.c index 1a5637f3a..b8517af6e 100644 --- a/formats/format_pcm.c +++ b/formats/format_pcm.c @@ -80,7 +80,7 @@ static struct ast_frame *pcm_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 = s->fmt->format; + s->fr.subclass.codec = s->fmt->format; 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) { @@ -163,8 +163,8 @@ static int pcm_write(struct ast_filestream *fs, struct ast_frame *f) ast_log(LOG_WARNING, "Asked to write non-voice frame!\n"); return -1; } - if (f->subclass != fs->fmt->format) { - ast_log(LOG_WARNING, "Asked to write incompatible format frame (%d)!\n", f->subclass); + if (f->subclass.codec != fs->fmt->format) { + ast_log(LOG_WARNING, "Asked to write incompatible format frame (%s)!\n", ast_getformatname(f->subclass.codec)); return -1; } |