summaryrefslogtreecommitdiff
path: root/main/frame.c
diff options
context:
space:
mode:
authorDavid Vossel <dvossel@digium.com>2011-07-07 19:39:17 +0000
committerDavid Vossel <dvossel@digium.com>2011-07-07 19:39:17 +0000
commit513c680b8c13bc644d9a12ec818c42b7ab5ee072 (patch)
tree2ad8099f4523512b84dacc6d135c659bddf247eb /main/frame.c
parentb5609161e076a7357c7d9e96d889e11c72edbfa3 (diff)
Adds pass-through support for codec CELT.
This patch adds pass-through support for CELT. CELT formats are defined in codecs.conf and can be configured to any sample rate a CELT endpoint supports. This patch also addresses a crash in channel.c resulting from a frame list being freed incorrectly. This crash was discovered while testing a CELT translator which had to split encoded audio into multiple frames. The codec translator is not a part of this patch, but may be contributed in the future. Review: https://reviewboard.asterisk.org/r/1294/ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@326855 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/frame.c')
-rw-r--r--main/frame.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/main/frame.c b/main/frame.c
index bb32386ca..b664e2e84 100644
--- a/main/frame.c
+++ b/main/frame.c
@@ -1011,6 +1011,10 @@ int ast_codec_get_samples(struct ast_frame *f)
} else {
return 160;
}
+ case AST_FORMAT_CELT:
+ /* TODO The assumes 20ms delivery right now, which is incorrect */
+ samples = ast_format_rate(&f->subclass.format) / 50;
+ break;
default:
ast_log(LOG_WARNING, "Unable to calculate samples for format %s\n", ast_getformatname(&f->subclass.format));
}