summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2017-02-01 15:36:23 -0600
committerGerrit Code Review <gerrit2@gerrit.digium.api>2017-02-01 15:36:23 -0600
commit97d58add328cdfdbbf6d7ea7498e4789eaf47353 (patch)
treeafdcb8b46573110c3187d755df10d440a6422ad3
parente252aff9ad9e8448ec0bdcd031b3833dd460d7db (diff)
parent7a16524a83f5955624151d69bf1f9fe2b2211a9a (diff)
Merge "res_rtp_asterisk: Swap byte-order when sending signed linear"
-rw-r--r--res/res_rtp_asterisk.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/res/res_rtp_asterisk.c b/res/res_rtp_asterisk.c
index c4608db6c..3d124000a 100644
--- a/res/res_rtp_asterisk.c
+++ b/res/res_rtp_asterisk.c
@@ -3630,6 +3630,11 @@ static int ast_rtp_write(struct ast_rtp_instance *instance, struct ast_frame *fr
/* If no smoother is present see if we have to set one up */
if (!rtp->smoother && ast_format_can_be_smoothed(format)) {
unsigned int framing_ms = ast_rtp_codecs_get_framing(ast_rtp_instance_get_codecs(instance));
+ int is_slinear = ast_format_cache_is_slinear(format);
+
+ if (!framing_ms && is_slinear) {
+ framing_ms = ast_format_get_default_ms(format);
+ }
if (framing_ms) {
rtp->smoother = ast_smoother_new((framing_ms * ast_format_get_minimum_bytes(format)) / ast_format_get_minimum_ms(format));
@@ -3638,6 +3643,9 @@ static int ast_rtp_write(struct ast_rtp_instance *instance, struct ast_frame *fr
ast_format_get_name(format), framing_ms, ast_format_get_minimum_bytes(format));
return -1;
}
+ if (is_slinear) {
+ ast_smoother_set_flags(rtp->smoother, AST_SMOOTHER_FLAG_BE);
+ }
}
}