diff options
Diffstat (limited to 'main')
-rw-r--r-- | main/dsp.c | 46 | ||||
-rw-r--r-- | main/frame.c | 8 | ||||
-rw-r--r-- | main/translate.c | 30 |
3 files changed, 8 insertions, 76 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); -} diff --git a/main/frame.c b/main/frame.c index 6cd886123..d35769488 100644 --- a/main/frame.c +++ b/main/frame.c @@ -342,12 +342,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; @@ -432,8 +426,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; } diff --git a/main/translate.c b/main/translate.c index 5c92dee57..a928470bf 100644 --- a/main/translate.c +++ b/main/translate.c @@ -140,18 +140,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. */ - - /* Set the magic hint that this has been requested to be destroyed. */ - pvt->datalen = -1; - - return; - } - if (t->destroy) t->destroy(pvt); free(pvt); @@ -245,9 +233,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) @@ -970,17 +956,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->datalen != -1) - return; - - destroy(pvt); -} |