From cd10bd931a7f54a516255adc25cd5b6ab2f7a75a Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Wed, 21 Oct 2009 03:09:04 +0000 Subject: 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 --- main/dsp.c | 33 +++------------------------------ 1 file changed, 3 insertions(+), 30 deletions(-) (limited to 'main/dsp.c') diff --git a/main/dsp.c b/main/dsp.c index 83a6dd79b..585403786 100644 --- a/main/dsp.c +++ b/main/dsp.c @@ -391,7 +391,6 @@ struct ast_dsp { digit_detect_state_t digit_state; tone_detect_state_t cng_tone_state; tone_detect_state_t ced_tone_state; - int destroy; }; static void mute_fragment(struct ast_dsp *dsp, fragment_t *fragment) @@ -1350,8 +1349,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; @@ -1360,8 +1358,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_FAX_DETECT)) { @@ -1471,8 +1468,7 @@ done: ast_queue_frame(chan, af); } ast_frfree(af); - ast_set_flag(outf, AST_FRFLAG_FROM_DSP); - return outf; + return ast_frisolate(outf); } else { return af; } @@ -1522,16 +1518,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. */ - - dsp->destroy = 1; - - return; - } ast_free(dsp); } @@ -1697,16 +1683,3 @@ int ast_dsp_reload(void) return _dsp_init(1); } -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->destroy) - return; - - ast_dsp_free(dsp); -} -- cgit v1.2.3