audio_audiohook_write_list() does not correctly update sample size after ast_translate.

audio_audiohook_write_list() does not take into account that the sample size may change after translation depending on if the original frame is is 8khz or 16khz.  While no 16kz codecs are supported in 1.4 at the moment, this will save headaches in the future if they ever are.  the sample size is now updated after translating to reflect this possibility.  Thanks to jcolp and mmichelson for helping me work this out.

(issue AST-197)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@188287 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/audiohook.c b/main/audiohook.c
index fdd241db2ce950089edfd156eea5d4e3c99b8dae..d055a73f1939f34bdba1f6b87692ad5e2fdee305 100644 (file)
--- a/main/audiohook.c
+++ b/main/audiohook.c
@@ -588,6 +588,7 @@ static struct ast_frame *audio_audiohook_write_list(struct ast_channel *chan, st
                }
                if (!(middle_frame = ast_translate(in_translate->trans_pvt, frame, 0)))
                        return frame;
+               samples = middle_frame->samples;
        }
 
        /* Queue up signed linear frame to each spy */