Merged revisions 224932 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
  r224932 | russell | 2009-10-20 22:09:04 -0500 (Tue, 20 Oct 2009) | 12 lines
  
  Merged revisions 224931 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r224931 | russell | 2009-10-20 21:59:54 -0500 (Tue, 20 Oct 2009) | 5 lines
    
    Isolate frames returned from a DSP instance or codec translator.
    
    The reasoning for these changes are the same as what I wrote in the commit
    message for rev 222878.
  ........
................


git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@224933 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 6 insertions, 36 deletions

diff --git a/main/dsp.c b/main/dsp.c
index 72be1da5e..5cdfc6161 100644
--- a/main/dsp.c
+++ b/main/dsp.c
@@ -1241,8 +1241,7 @@ struct ast_frame *ast_dsp_process(struct ast_channel *chan, struct ast_dsp *dsp,
 		memset(&dsp->f, 0, sizeof(dsp->f));
 		dsp->f.frametype = AST_FRAME_NULL;
 		ast_frfree(af);
-		ast_set_flag(&dsp->f, AST_FRFLAG_FROM_DSP);
-		return &dsp->f;
+		return ast_frisolate(&dsp->f);
 	}
 	if ((dsp->features & DSP_FEATURE_BUSY_DETECT) && ast_dsp_busydetect(dsp)) {
 		chan->_softhangup |= AST_SOFTHANGUP_DEV;
@@ -1251,8 +1250,7 @@ struct ast_frame *ast_dsp_process(struct ast_channel *chan, struct ast_dsp *dsp,
 		dsp->f.subclass = AST_CONTROL_BUSY;
 		ast_frfree(af);
 		ast_debug(1, "Requesting Hangup because the busy tone was detected on channel %s\n", chan->name);
-		ast_set_flag(&dsp->f, AST_FRFLAG_FROM_DSP);
-		return &dsp->f;
+		return ast_frisolate(&dsp->f);
 	}
 	if (((dsp->features & DSP_FEATURE_DTMF_DETECT) || (dsp->features & DSP_FEATURE_FAX_DETECT))) {
 		digit = __ast_dsp_digitdetect(dsp, shortdata, len, &writeback);
@@ -1273,8 +1271,7 @@ struct ast_frame *ast_dsp_process(struct ast_channel *chan, struct ast_dsp *dsp,
 					if (chan)
 						ast_queue_frame(chan, af);
 					ast_frfree(af);
-					ast_set_flag(&dsp->f, AST_FRFLAG_FROM_DSP);
-					return &dsp->f;
+					return ast_frisolate(&dsp->f);
 				}
 			} else {
 				if (digit) {
@@ -1300,8 +1297,7 @@ struct ast_frame *ast_dsp_process(struct ast_channel *chan, struct ast_dsp *dsp,
 							ast_queue_frame(chan, af);
 						ast_frfree(af);
 					}
-					ast_set_flag(&dsp->f, AST_FRFLAG_FROM_DSP);
-					return &dsp->f;
+					return ast_frisolate(&dsp->f);
 				} else {
 					memset(&dsp->f, 0, sizeof(dsp->f));
 					if (dsp->thinkdigit != 'x') {
@@ -1318,8 +1314,7 @@ struct ast_frame *ast_dsp_process(struct ast_channel *chan, struct ast_dsp *dsp,
 					if (chan)
 						ast_queue_frame(chan, af);
 					ast_frfree(af);
-					ast_set_flag(&dsp->f, AST_FRFLAG_FROM_DSP);
-					return &dsp->f;
+					return ast_frisolate(&dsp->f);
 				}
 			}
 		} else if (dsp->digit_state.current_digits > 1 ||
@@ -1336,8 +1331,7 @@ struct ast_frame *ast_dsp_process(struct ast_channel *chan, struct ast_dsp *dsp,
 			if (chan)
 				ast_queue_frame(chan, af);
 			ast_frfree(af);
-			ast_set_flag(&dsp->f, AST_FRFLAG_FROM_DSP);
-			return &dsp->f;
+			return ast_frisolate(&dsp->f);
 		}
 	}
 	if ((dsp->features & DSP_FEATURE_CALL_PROGRESS)) {
@@ -1409,17 +1403,6 @@ void ast_dsp_set_features(struct ast_dsp *dsp, int features)
 
 void ast_dsp_free(struct ast_dsp *dsp)
 {
-	if (ast_test_flag(&dsp->f, AST_FRFLAG_FROM_DSP)) {
-		/* If this flag is still set, that means that the dsp's destruction 
-		 * been torn down, while we still have a frame out there being used.
-		 * When ast_frfree() gets called on that frame, this ast_trans_pvt
-		 * will get destroyed, too. */
-
-		/* Set the magic flag to destroy the dsp when the frame is freed */
-		dsp->freqcount = -1;
-
-		return;
-	}
 	ast_free(dsp);
 }
 
@@ -1534,16 +1517,3 @@ int ast_dsp_get_tcount(struct ast_dsp *dsp)
 	return dsp->tcount;
 }
 
-void ast_dsp_frame_freed(struct ast_frame *fr)
-{
-	struct ast_dsp *dsp;
-
-	ast_clear_flag(fr, AST_FRFLAG_FROM_DSP);
-
-	dsp = (struct ast_dsp *) (((char *) fr) - offsetof(struct ast_dsp, f));
-
-	if (dsp->freqcount != -1)
-		return;
-	
-	ast_dsp_free(dsp);
-}