mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-03 11:25:35 +00:00
Expand codec bitfield from 32 bits to 64 bits.
Reviewboard: https://reviewboard.asterisk.org/r/416/ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@227580 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -85,19 +85,19 @@ int ast_slinfactory_feed(struct ast_slinfactory *sf, struct ast_frame *f)
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (f->subclass != sf->output_format) {
|
||||
if (sf->trans && f->subclass != sf->format) {
|
||||
if (f->subclass.codec != sf->output_format) {
|
||||
if (sf->trans && f->subclass.codec != sf->format) {
|
||||
ast_translator_free_path(sf->trans);
|
||||
sf->trans = NULL;
|
||||
}
|
||||
|
||||
if (!sf->trans) {
|
||||
if (!(sf->trans = ast_translator_build_path(sf->output_format, f->subclass))) {
|
||||
ast_log(LOG_WARNING, "Cannot build a path from %s to %s\n", ast_getformatname(f->subclass),
|
||||
if (!(sf->trans = ast_translator_build_path(sf->output_format, f->subclass.codec))) {
|
||||
ast_log(LOG_WARNING, "Cannot build a path from %s to %s\n", ast_getformatname(f->subclass.codec),
|
||||
ast_getformatname(sf->output_format));
|
||||
return 0;
|
||||
}
|
||||
sf->format = f->subclass;
|
||||
sf->format = f->subclass.codec;
|
||||
}
|
||||
|
||||
if (!(begin_frame = ast_translate(sf->trans, f, 0))) {
|
||||
|
Reference in New Issue
Block a user