kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 11:58:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 224931 via svnmerge from

Browse Source 
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:
Russell Bryant
2009-10-21 03:09:04 +00:00
parent c5b8e9af7c
commit cd10bd931a
7 changed files with 8 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
main/translate.c
View File

@@ -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.ptr = pvt->outbuf.c;
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);
}