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 /bridges | |
| 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 'bridges')
| -rw-r--r-- | bridges/bridge_softmix.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bridges/bridge_softmix.c b/bridges/bridge_softmix.c index a98038660..3cddc42e4 100644 --- a/bridges/bridge_softmix.c +++ b/bridges/bridge_softmix.c @@ -123,9 +123,9 @@ static int softmix_bridge_join(struct ast_bridge *bridge, struct ast_bridge_chan /* Setup frame parameters */ sc->frame.frametype = AST_FRAME_VOICE; #ifdef SOFTMIX_16_SUPPORT - sc->frame.subclass = AST_FORMAT_SLINEAR16; + sc->frame.subclass.codec = AST_FORMAT_SLINEAR16; #else - sc->frame.subclass = AST_FORMAT_SLINEAR; + sc->frame.subclass.codec = AST_FORMAT_SLINEAR; #endif sc->frame.data.ptr = sc->final_buf; sc->frame.datalen = SOFTMIX_DATALEN; @@ -168,9 +168,9 @@ static enum ast_bridge_write_result softmix_bridge_write(struct ast_bridge *brid /* If a frame was provided add it to the smoother */ #ifdef SOFTMIX_16_SUPPORT - if (frame->frametype == AST_FRAME_VOICE && frame->subclass == AST_FORMAT_SLINEAR16) { + if (frame->frametype == AST_FRAME_VOICE && frame->subclass.codec == AST_FORMAT_SLINEAR16) { #else - if (frame->frametype == AST_FRAME_VOICE && frame->subclass == AST_FORMAT_SLINEAR) { + if (frame->frametype == AST_FRAME_VOICE && frame->subclass.codec == AST_FORMAT_SLINEAR) { #endif ast_slinfactory_feed(&sc->factory, frame); } |