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, 1 insertions, 28 deletions

diff --git a/main/translate.c b/main/translate.c
index 711a7995c..e93f0a35b 100644
--- a/main/translate.c
+++ b/main/translate.c
@@ -134,17 +134,6 @@ static void destroy(struct ast_trans_pvt *pvt)
 {
 	struct ast_translator *t = pvt->t;
 
-	if (ast_test_flag(&pvt->f, AST_FRFLAG_FROM_TRANSLATOR)) {
-		/* If this flag is still set, that means that the translation path has
-		 * 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. */
-
-		pvt->destroy = 1;
-
-		return;
-	}
-
 	if (t->destroy)
 		t->destroy(pvt);
 	ast_free(pvt);
@@ -238,9 +227,7 @@ struct ast_frame *ast_trans_frameout(struct ast_trans_pvt *pvt,
 	f->src = pvt->t->name;
 	f->data = pvt->outbuf;
 
-	ast_set_flag(f, AST_FRFLAG_FROM_TRANSLATOR);
-
-	return f;
+	return ast_frisolate(f);
 }
 
 static struct ast_frame *default_frameout(struct ast_trans_pvt *pvt)
@@ -905,17 +892,3 @@ unsigned int ast_translate_available_formats(unsigned int dest, unsigned int src
 
 	return res;
 }
-
-void ast_translate_frame_freed(struct ast_frame *fr)
-{
-	struct ast_trans_pvt *pvt;
-
-	ast_clear_flag(fr, AST_FRFLAG_FROM_TRANSLATOR);
-
-	pvt = (struct ast_trans_pvt *) (((char *) fr) - offsetof(struct ast_trans_pvt, f));
-
-	if (!pvt->destroy)
-		return;
-	
-	destroy(pvt);
-}