From 8cef8f35e7d02faaaf2f20063887f1d73afdd14e Mon Sep 17 00:00:00 2001 From: Kevin Harwell Date: Wed, 13 Jul 2016 17:45:27 -0500 Subject: [PATCH] translate: explicit format destination not properly set If the destination format's name differed from the codec name then the translator's explict_dst field would be improperly set. In some circumstances it would end up setting it to a newly created format that has the same name as the codec when it actually needed to be the given destination codec. This could cause the translation path to use the wrong format. For instance, if an endpoint had specified 'myulaw' as a format the translator could end up using a 'ulaw' format (with whatever/default settings) instead. If the format attribute settings differed between the two then there may unexpected results during processing. This patch removes the name check when building the translation path. This should make it always set the translator's explicit_dst to the given destination format as long as the sample rate and types match. Change-Id: Iaf8a03831d68e657d89569d54b505074efbefab5 --- main/translate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/translate.c b/main/translate.c index 6a39bac1a5..73e03a82e0 100644 --- a/main/translate.c +++ b/main/translate.c @@ -494,7 +494,7 @@ struct ast_trans_pvt *ast_translator_build_path(struct ast_format *dst, struct a AST_RWLIST_UNLOCK(&translators); return NULL; } - if ((t->dst_codec.sample_rate == ast_format_get_sample_rate(dst)) && (t->dst_codec.type == ast_format_get_type(dst)) && (!strcmp(t->dst_codec.name, ast_format_get_name(dst)))) { + if ((t->dst_codec.sample_rate == ast_format_get_sample_rate(dst)) && (t->dst_codec.type == ast_format_get_type(dst))) { explicit_dst = dst; } if (!(cur = newpvt(t, explicit_dst))) { -- 2.47.2