mirror of
				https://github.com/asterisk/asterisk.git
				synced 2025-11-04 05:15:22 +00:00 
			
		
		
		
	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: https://origsvn.digium.com/svn/asterisk/trunk@224932 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
		@@ -332,12 +332,6 @@ static void frame_cache_cleanup(void *data)
 | 
			
		||||
 | 
			
		||||
static void __frame_free(struct ast_frame *fr, int cache)
 | 
			
		||||
{
 | 
			
		||||
	if (ast_test_flag(fr, AST_FRFLAG_FROM_TRANSLATOR)) {
 | 
			
		||||
		ast_translate_frame_freed(fr);
 | 
			
		||||
	} else if (ast_test_flag(fr, AST_FRFLAG_FROM_DSP)) {
 | 
			
		||||
		ast_dsp_frame_freed(fr);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if (!fr->mallocd)
 | 
			
		||||
		return;
 | 
			
		||||
 | 
			
		||||
@@ -422,8 +416,6 @@ struct ast_frame *ast_frisolate(struct ast_frame *fr)
 | 
			
		||||
			out->seqno = fr->seqno;
 | 
			
		||||
		}
 | 
			
		||||
	} else {
 | 
			
		||||
		ast_clear_flag(fr, AST_FRFLAG_FROM_TRANSLATOR);
 | 
			
		||||
		ast_clear_flag(fr, AST_FRFLAG_FROM_DSP);
 | 
			
		||||
		out = fr;
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user