fixeria
/
lcr
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

For chan_lcr with Asterisk 1.8, set the codec type of a frame into the correct 

union member ast_frame_subclass::codec (instead of ast_frame_subclass::integer).

The old code caused an error in some environments, eg big endian Arm (armeb):
"__ast_read: Dropping incompatible voice frame on lcr/1 of format alaw ..."

Signed-off-by: Arnold Schulz <arnysch@gmx.net>
Signed-off-by: Andreas Eversberg <andreas@eversberg.eu>
This commit is contained in:
Arnold Schulz 2011-11-08 16:14:57 +01:00 committed by Andreas Eversberg
parent 92b9d54385
commit 77bacac2bd
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
chan_lcr.c
View File

@ -2584,14 +2584,14 @@ static int lcr_write(struct ast_channel *ast, struct ast_frame *fr)
struct ast_frame * f = fr;
#ifdef AST_1_8_OR_HIGHER
if (!f->subclass.integer)
if (!f->subclass.codec)
#else
if (!f->subclass)
#endif
CDEBUG(NULL, ast, "No subclass\n");
#ifdef AST_1_8_OR_HIGHER
#if ASTERISK_VERSION_NUM < 100000
if (!(f->subclass.integer & ast->nativeformats)) {
if (!(f->subclass.codec & ast->nativeformats)) {
#else
if (!ast_format_cap_iscompatible(ast->nativeformats, &f->subclass.format)) {
#endif
@ -2604,7 +2604,7 @@ static int lcr_write(struct ast_channel *ast, struct ast_frame *fr)
#ifdef AST_1_8_OR_HIGHER
#if ASTERISK_VERSION_NUM < 100000
ast_set_write_format(ast, f->subclass.integer);
ast_set_write_format(ast, f->subclass.codec);
#else
ast_set_write_format(ast, &f->subclass.format);
#endif
@ -2683,7 +2683,7 @@ static struct ast_frame *lcr_read(struct ast_channel *ast)
call->read_fr.frametype = AST_FRAME_VOICE;
#ifdef AST_1_8_OR_HIGHER
#if ASTERISK_VERSION_NUM < 100000
call->read_fr.subclass.integer = ast->nativeformats;
call->read_fr.subclass.codec = ast->nativeformats;
#else
ast_best_codec(ast->nativeformats, &call->read_fr.subclass.format);
call->read_fr.subclass.integer = call->read_fr.subclass.format.id;