Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

Isolate frames returned from a DSP instance or codec translator.

Browse Source 
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/branches/1.4@224931 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.4
Russell Bryant 16 years ago
parent 0db2d51ac1
commit 9d65850202
7 changed files with 12 additions and 123 deletions
Show Stats Download Patch File Download Diff File

12
codecs/codec_dahdi.c
Unescape View File

@ -249,10 +249,9 @@ static struct ast_frame *dahdi_encoder_frameout(struct ast_trans_pvt *pvt)
pvt->f.offset = 0;
pvt->f.datalen = 0;
pvt->f.mallocd = 0;
ast_set_flag(&pvt->f, AST_FRFLAG_FROM_TRANSLATOR);
pvt->samples = 0;
return &pvt->f;
return ast_frisolate(&pvt->f);
} else if (1 == ztp->fake) {
ztp->fake = 0;
@ -277,11 +276,10 @@ static struct ast_frame *dahdi_encoder_frameout(struct ast_trans_pvt *pvt)
pvt->f.offset = AST_FRIENDLY_OFFSET;
pvt->f.src = pvt->t->name;
pvt->f.data = pvt->outbuf;
ast_set_flag(&pvt->f, AST_FRFLAG_FROM_TRANSLATOR);
pvt->samples = 0;
pvt->datalen = 0;
return &pvt->f;
return ast_frisolate(&pvt->f);
}
/* Shouldn't get here... */
@ -324,9 +322,8 @@ static struct ast_frame *dahdi_decoder_frameout(struct ast_trans_pvt *pvt)
pvt->f.offset = 0;
pvt->f.datalen = 0;
pvt->f.mallocd = 0;
ast_set_flag(&pvt->f, AST_FRFLAG_FROM_TRANSLATOR);
pvt->samples = 0;
return &pvt->f;
return ast_frisolate(&pvt->f);
} else if (1 == ztp->fake) {
pvt->samples = 0;
ztp->fake = 0;
@ -363,10 +360,9 @@ static struct ast_frame *dahdi_decoder_frameout(struct ast_trans_pvt *pvt)
pvt->f.src = pvt->t->name;
pvt->f.data = pvt->outbuf;
pvt->f.samples = ztp->required_samples;
ast_set_flag(&pvt->f, AST_FRFLAG_FROM_TRANSLATOR);
pvt->samples = 0;
return &pvt->f;
return ast_frisolate(&pvt->f);
}
/* Shouldn't get here... */

13
include/asterisk/dsp.h
Unescape View File

@ -108,17 +108,4 @@ int ast_dsp_get_tstate(struct ast_dsp *dsp);
/*! \brief Get tcount (Threshold counter) */
int ast_dsp_get_tcount(struct ast_dsp *dsp);
/*!
* \brief Hint that a frame from a dsp was freed
*
* This is called from ast_frame_free if AST_FRFLAG_FROM_DSP is set. This occurs
* because it is possible for the dsp to be freed while someone still holds a reference
* to the frame that is in that dsp. This has been known to happen when the dsp on a Zap
* channel detects a busy signal. The channel is hung up, and the application that read the
* frame to begin with still has a reference to the frame.
*
* \return nothing
*/
void ast_dsp_frame_freed(struct ast_frame *fr);
#endif /* _ASTERISK_DSP_H */

8
include/asterisk/frame.h
Unescape View File

@ -127,14 +127,6 @@ enum ast_frame_type {
enum {
/*! This frame contains valid timing information */
AST_FRFLAG_HAS_TIMING_INFO = (1 << 0),
/*! This frame came from a translator and is still the original frame.
* The translator can not be free'd if the frame inside of it still has
* this flag set. */
AST_FRFLAG_FROM_TRANSLATOR = (1 << 1),
/*! This frame came from a dsp and is still the original frame.
* The dsp cannot be free'd if the frame inside of it still has
* this flag set. */
AST_FRFLAG_FROM_DSP = (1 << 2),
};
/*! \brief Data structure associated with a single frame of data

18
include/asterisk/translate.h
Unescape View File

@ -137,10 +137,6 @@ struct ast_trans_pvt {
int samples; /*!< samples available in outbuf */
/*!
* \brief actual space used in outbuf
*
* Also, for the sake of ABI compatability, a magic value of -1 in this
* field means that the pvt has been requested to be destroyed, but is
* pending destruction until ast_translate_frame_freed() gets called.
*/
int datalen;
void *pvt; /*!< more private data, if any */
@ -252,20 +248,6 @@ unsigned int ast_translate_path_steps(unsigned int dest, unsigned int src);
*/
unsigned int ast_translate_available_formats(unsigned int dest, unsigned int src);
/*!
* \brief Hint that a frame from a translator has been freed
*
* This is sort of a hack. This function gets called when ast_frame_free() gets
* called on a frame that has the AST_FRFLAG_FROM_TRANSLATOR flag set. This is
* because it is possible for a translation path to be destroyed while a frame
* from a translator is still in use. Specifically, this happens if a masquerade
* happens after a call to ast_read() but before the frame is done being processed,
* since the frame processing is generally done without the channel lock held.
*
* \return nothing
*/
void ast_translate_frame_freed(struct ast_frame *fr);
#if defined(__cplusplus) || defined(c_plusplus)
}
#endif

46
main/dsp.c
Unescape View File

@ -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);
}

8
main/frame.c
Unescape View File

@ -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;
}

30
main/translate.c
Unescape View File

@ -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);
}

Write Preview
Loading…
Cancel
Save