diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-10-21 02:59:54 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-10-21 02:59:54 +0000 |
commit | fb85d4632c8233e0f171346a4fa5e41c1e1fdcff (patch) | |
tree | c8084946ae44afa6c899629f484b1ee91352d147 /main/dsp.c | |
parent | 734d64af9e1770c4594dac5a5844c692ae08051d (diff) |
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.4@224931 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/dsp.c')
-rw-r--r-- | main/dsp.c | 46 |
1 files changed, 7 insertions, 39 deletions
diff --git a/main/dsp.c b/main/dsp.c index 3caf65027..fd4bc9b73 100644 --- a/main/dsp.c +++ b/main/dsp.c @@ -1486,8 +1486,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; @@ -1495,8 +1494,7 @@ struct ast_frame *ast_dsp_process(struct ast_channel *chan, struct ast_dsp *dsp, dsp->f.frametype = AST_FRAME_CONTROL; dsp->f.subclass = AST_CONTROL_BUSY; 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_DTMF_DETECT)) { digit = __ast_dsp_digitdetect(dsp, shortdata, len, &writeback); @@ -1517,8 +1515,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) { @@ -1544,8 +1541,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') { @@ -1562,8 +1558,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) { @@ -1579,8 +1574,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->td.dtmf.current_digits) { @@ -1593,8 +1587,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); } } } @@ -1664,17 +1657,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 hint that this has been requested to be destroyed. */ - dsp->freqcount = -1; - - return; - } free(dsp); } @@ -1803,17 +1785,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); -} |