kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-04 12:12:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

res_rtp_asterisk: Swap byte-order when sending signed linear

Browse Source 
Before Asterisk 13, signed linear was converted into network byte order by a
smoother before being sent over the network. We restore this behavior by
forcing the creation of a smoother when slinear is in use and setting the
appropriate flags so that the byte order conversion is always done.

ASTERISK-24858 #close
Reported-by: Frankie Chin

Change-Id: I868449617d1a7819578f218c8c6b2111ad84f5a9
This commit is contained in:
Sean Bright
2017-01-30 10:02:14 -05:00
parent ea54c0e1fe
commit 339c30f2b6
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
res/res_rtp_asterisk.c
View File

@@ -3634,6 +3634,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));
@@ -3642,6 +3647,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);
}
} }
} }