Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed memory leak in mips test #4247

Merged
merged 1 commit into from
Jan 13, 2025
Merged

Fixed memory leak in mips test #4247

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 56 additions & 14 deletions pjmedia/src/test/mips_test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,8 +402,8 @@ struct test_entry
void (*custom_run)(struct test_entry*);
void (*custom_deinit)(struct test_entry*);

void *pdata[4];
unsigned idata[4];
void *pdata[2*16+1];
// unsigned idata[4];
};


Expand Down Expand Up @@ -465,6 +465,22 @@ static pjmedia_port* gen_port_test_init(pj_pool_t *pool,


/***************************************************************************/

static void conf_port_custom_deinit(struct test_entry *te)
{
unsigned i;
pjmedia_conf *conf = (pjmedia_conf *)te->pdata[0];

if (conf)
pjmedia_conf_destroy(conf);

for (i = 1; i < PJ_ARRAY_SIZE(te->pdata); i++) {
if (!te->pdata[i])
break;
pjmedia_port_destroy((pjmedia_port *)te->pdata[i]);
}
}

static pjmedia_port* init_conf_port(unsigned nb_participant,
pj_pool_t *pool,
unsigned clock_rate,
Expand All @@ -474,18 +490,21 @@ static pjmedia_port* init_conf_port(unsigned nb_participant,
struct test_entry *te)
{
pjmedia_conf *conf;
unsigned i;
unsigned i, nport = 1;
pj_status_t status;

PJ_UNUSED_ARG(flags);
PJ_UNUSED_ARG(te);

te->custom_deinit = &conf_port_custom_deinit;
pj_bzero(te->pdata, sizeof(te->pdata));

/* Create conf */
status = pjmedia_conf_create(pool, 2+nb_participant*2, clock_rate,
channel_count, samples_per_frame, 16,
PJMEDIA_CONF_NO_DEVICE, &conf);
if (status != PJ_SUCCESS)
return NULL;
te->pdata[0] = conf;

for (i=0; i<nb_participant; ++i) {
pjmedia_port *gen_port, *null_port;
Expand All @@ -496,6 +515,7 @@ static pjmedia_port* init_conf_port(unsigned nb_participant,
samples_per_frame, 100 / nb_participant);
if (!gen_port)
return NULL;
te->pdata[nport++] = gen_port;

/* Add port */
status = pjmedia_conf_add_port(conf, pool, gen_port, NULL, &slot1);
Expand All @@ -512,6 +532,7 @@ static pjmedia_port* init_conf_port(unsigned nb_participant,
samples_per_frame, 16, &null_port);
if (status != PJ_SUCCESS)
return NULL;
te->pdata[nport++] = null_port;

/* add null port */
status = pjmedia_conf_add_port(conf, pool, null_port, NULL, &slot2);
Expand Down Expand Up @@ -727,9 +748,11 @@ static pj_status_t codec_on_destroy(struct pjmedia_port *this_port)
{
struct codec_port *cp = (struct codec_port*)this_port;

pjmedia_codec_close(cp->codec);
pjmedia_codec_mgr_dealloc_codec(pjmedia_endpt_get_codec_mgr(cp->endpt),
cp->codec);
if (cp->codec) {
pjmedia_codec_close(cp->codec);
pjmedia_codec_mgr_dealloc_codec(pjmedia_endpt_get_codec_mgr(cp->endpt),
cp->codec);
}
cp->codec_deinit();
pjmedia_endpt_destroy2(cp->endpt);
return PJ_SUCCESS;
Expand Down Expand Up @@ -770,33 +793,37 @@ static pjmedia_port* codec_encode_decode( pj_pool_t *pool,

status = codec_init(cp->endpt);
if (status != PJ_SUCCESS)
return NULL;
goto on_error;

count = 1;
status = pjmedia_codec_mgr_find_codecs_by_id(pjmedia_endpt_get_codec_mgr(cp->endpt),
&codec_id, &count, ci, NULL);
if (status != PJ_SUCCESS)
return NULL;
goto on_error;

status = pjmedia_codec_mgr_alloc_codec(pjmedia_endpt_get_codec_mgr(cp->endpt),
ci[0], &cp->codec);
if (status != PJ_SUCCESS)
return NULL;
goto on_error;

status = pjmedia_codec_mgr_get_default_param(pjmedia_endpt_get_codec_mgr(cp->endpt),
ci[0], &codec_param);
if (status != PJ_SUCCESS)
return NULL;
goto on_error;

status = pjmedia_codec_init(cp->codec, pool);
if (status != PJ_SUCCESS)
return NULL;
goto on_error;

status = pjmedia_codec_open(cp->codec, &codec_param);
if (status != PJ_SUCCESS)
return NULL;
goto on_error;

return &cp->base;

on_error:
codec_on_destroy(&cp->base);
return NULL;
}
#endif

Expand Down Expand Up @@ -1346,6 +1373,16 @@ static pjmedia_port* wsola_discard_50(pj_pool_t *pool,

/***************************************************************************/

static void ec_custom_deinit(struct test_entry *te)
{
unsigned i;

for (i = 0; i < PJ_ARRAY_SIZE(te->pdata); i++) {
if (!te->pdata[i]) break;
pjmedia_port_destroy((pjmedia_port *)te->pdata[i]);
}
}

static pjmedia_port* ec_create(unsigned ec_tail_msec,
pj_pool_t *pool,
unsigned clock_rate,
Expand All @@ -1357,17 +1394,20 @@ static pjmedia_port* ec_create(unsigned ec_tail_msec,
pjmedia_port *gen_port, *ec_port;
pj_status_t status;

PJ_UNUSED_ARG(te);
te->custom_deinit = &ec_custom_deinit;
pj_bzero(te->pdata, sizeof(te->pdata));

gen_port = create_gen_port(pool, clock_rate, channel_count,
samples_per_frame, 100);
if (gen_port == NULL)
return NULL;
te->pdata[0] = gen_port;

status = pjmedia_echo_port_create(pool, gen_port, ec_tail_msec, 0,
flags, &ec_port);
if (status != PJ_SUCCESS)
return NULL;
te->pdata[1] = ec_port;

return ec_port;
}
Expand Down Expand Up @@ -2386,6 +2426,8 @@ static pj_timestamp run_entry(unsigned clock_rate, struct test_entry *e)

pj_sub_timestamp(&t1, &t0);

pjmedia_port_destroy(gen_port);

if (e->custom_deinit)
e->custom_deinit(e);
else
Expand Down
Loading