[asterisk-commits] qwell: branch 1.6.0 r111247 - in /branches/1.6.0: ./ main/frame.c

[SVN commits to the Asterisk project]

Author: qwell
Date: Wed Mar 26 18:28:00 2008
New Revision: 111247

URL: http://svn.digium.com/view/asterisk?view=rev&rev=111247
Log:
Merged revisions 111246 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r111246 | qwell | 2008-03-26 18:27:33 -0500 (Wed, 26 Mar 2008) | 17 lines

Merged revisions 111245 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r111245 | qwell | 2008-03-26 18:26:33 -0500 (Wed, 26 Mar 2008) | 9 lines

Remove excessive smoother optimization that was causing audio glitches (small "pops")
 after (about 200ms later) an "incorrectly" sized frame was received.

While it would be very nice to keep this as optimized as possible, it makes no sense
 for the smoother to be dropping random bits of audio like this.  Isn't that the
 whole point of a smoother?

Closes issue #12093.

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/frame.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/frame.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/frame.c?view=diff&rev=111247&r1=111246&r2=111247
==============================================================================
--- branches/1.6.0/main/frame.c (original)
+++ branches/1.6.0/main/frame.c Wed Mar 26 18:28:00 2008
@@ -85,7 +85,6 @@
 	int size;
 	int format;
 	int readdata;
-	int optimizablestream;
 	int flags;
 	float samplesperbyte;
 	struct ast_frame f;
@@ -182,23 +181,8 @@
 				ast_swapcopy_samples(f->data, f->data, f->samples);
 			s->opt = f;
 			return 0;
-		} else {
-			s->optimizablestream++;
-			if (s->optimizablestream > 10) {
-				/* For the past 10 rounds, we have input and output
-				   frames of the correct size for this smoother, yet
-				   we were unable to optimize because there was still
-				   some cruft left over.  Lets just drop the cruft so
-				   we can move to a fully optimized path */
-				if (swap)
-					ast_swapcopy_samples(f->data, f->data, f->samples);
-				s->len = 0;
-				s->opt = f;
-				return 0;
-			}
-		}
-	} else 
-		s->optimizablestream = 0;
+		}
+	}
 	if (s->flags & AST_SMOOTHER_FLAG_G729) {
 		if (s->len % 10) {
 			ast_log(LOG_NOTICE, "Dropping extra frame of G.729 since we already have a VAD frame at the end\n");