Put my slinfactory changes back in.
authorJoshua Colp <jcolp@digium.com>
Mon, 7 Apr 2008 14:54:42 +0000 (14:54 +0000)
committerJoshua Colp <jcolp@digium.com>
Mon, 7 Apr 2008 14:54:42 +0000 (14:54 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@113009 65c4cc65-6c06-0410-ace0-fbb531ad65f3

include/asterisk/slinfactory.h
main/slinfactory.c

index 386cf51..4d3e8ea 100644 (file)
 extern "C" {
 #endif
 
+#define AST_SLINFACTORY_MAX_HOLD 1280
+
 struct ast_slinfactory {
        AST_LIST_HEAD_NOLOCK(, ast_frame) queue; /*!< A list of unaltered frames */
        struct ast_trans_pvt *trans;             /*!< Translation path that converts fed frames into signed linear */
-       short hold[1280];                        /*!< Hold for audio that no longer belongs to a frame (ie: if only some samples were taken from a frame) */
+       short hold[AST_SLINFACTORY_MAX_HOLD];    /*!< Hold for audio that no longer belongs to a frame (ie: if only some samples were taken from a frame) */
        short *offset;                           /*!< Offset into the hold where audio begins */
        size_t holdlen;                          /*!< Number of samples currently in the hold */
        unsigned int size;                       /*!< Number of samples currently in the factory */
index 6c1bdd6..af70399 100644 (file)
@@ -172,6 +172,9 @@ int ast_slinfactory_read(struct ast_slinfactory *sf, short *buf, size_t samples)
                                memcpy(offset, frame_data, ineed * sizeof(*offset));
                                sofar += ineed;
                                frame_data += ineed;
+                               if (remain > (AST_SLINFACTORY_MAX_HOLD - sf->holdlen)) {
+                                       remain = AST_SLINFACTORY_MAX_HOLD - sf->holdlen;
+                               }
                                memcpy(sf->hold, frame_data, remain * sizeof(*offset));
                                sf->holdlen = remain;
                        }