Merge "res_rtp_asterisk: Swap byte-order when sending signed linear"
This commit is contained in:
commit
97d58add32
|
@ -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 no smoother is present see if we have to set one up */
|
||||||
if (!rtp->smoother && ast_format_can_be_smoothed(format)) {
|
if (!rtp->smoother && ast_format_can_be_smoothed(format)) {
|
||||||
unsigned int framing_ms = ast_rtp_codecs_get_framing(ast_rtp_instance_get_codecs(instance));
|
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) {
|
if (framing_ms) {
|
||||||
rtp->smoother = ast_smoother_new((framing_ms * ast_format_get_minimum_bytes(format)) / ast_format_get_minimum_ms(format));
|
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));
|
ast_format_get_name(format), framing_ms, ast_format_get_minimum_bytes(format));
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
if (is_slinear) {
|
||||||
|
ast_smoother_set_flags(rtp->smoother, AST_SMOOTHER_FLAG_BE);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue