Reset read/write translator while setting read/write format

This change helps resolve an issue in input audio format when an application invoked before MRCPRecog (and possibly MRCPSynth and SynthAndrecog) creates a translator but does not reset it on exit.
unispeech · Apr 15, 2021 · 828380a · 828380a
1 parent 8031d32
commit 828380a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 0 deletions.
diff --git a/app-unimrcp/app_mrcprecog.c b/app-unimrcp/app_mrcprecog.c
@@ -1184,6 +1184,7 @@ static int app_recog_exec(struct ast_channel *chan, ast_app_data data)
 	ast_format_compat *orawreadformat = ast_channel_get_rawreadformat(chan, app_session->pool);
 
 	/* Set read format. */
+	ast_channel_readtrans_set(chan, NULL);
 	ast_channel_set_readformat(chan, app_session->nreadformat);
 	ast_channel_set_rawreadformat(chan, app_session->nreadformat);
 

diff --git a/app-unimrcp/app_mrcpsynth.c b/app-unimrcp/app_mrcpsynth.c
@@ -640,6 +640,7 @@ static int app_synth_exec(struct ast_channel *chan, ast_app_data data)
 	ast_format_compat *orawwriteformat = ast_channel_get_rawwriteformat(chan, app_session->pool);
 
 	/* Set write format. */
+	ast_channel_writetrans_set(chan, NULL);
 	ast_channel_set_writeformat(chan, app_session->nwriteformat);
 	ast_channel_set_rawwriteformat(chan, app_session->nwriteformat);
 

diff --git a/app-unimrcp/app_synthandrecog.c b/app-unimrcp/app_synthandrecog.c
@@ -1468,13 +1468,15 @@ static int app_synthandrecog_exec(struct ast_channel *chan, ast_app_data data)
 	ast_format_compat *orawwriteformat = ast_channel_get_rawwriteformat(chan, app_session->pool);
 
 	/* Set read format. */
+	ast_channel_readtrans_set(chan, NULL);
 	ast_channel_set_readformat(chan, app_session->nreadformat);
 	ast_channel_set_rawreadformat(chan, app_session->nreadformat);
 	/* Store old read format. */
 	app_session->readformat = oreadformat;
 	app_session->rawreadformat = orawreadformat;
 
 	/* Set write format. */
+	ast_channel_writetrans_set(chan, NULL);
 	ast_channel_set_writeformat(chan, app_session->nwriteformat);
 	ast_channel_set_rawwriteformat(chan, app_session->nwriteformat);
 	/* Store old write format. */

diff --git a/include/ast_compat_defs.h b/include/ast_compat_defs.h
@@ -220,6 +220,14 @@ static APR_INLINE void ast_channel_set_rawwriteformat(struct ast_channel *chan,
 {
 	// Do nothing, defined for >= 13 only
 }
+static APR_INLINE void ast_channel_readtrans_set(struct ast_channel *chan, struct ast_trans_pvt *value)
+{
+	// Do nothing, defined for >= 11 only
+}
+static APR_INLINE void ast_channel_writetrans_set(struct ast_channel *chan, struct ast_trans_pvt *value)
+{
+	// Do nothing, defined for >= 11 only
+}
 #endif
 
 #if AST_VERSION_AT_LEAST(11,0,0)