Skip to content

Commit

Permalink
Fix bug in video conference in disconnecting ports (#3325)
Browse files Browse the repository at this point in the history
  • Loading branch information
@nanangizz
nanangizz committed Jan 21, 2023
1 parent 0d3be5a commit d3f79e7
Showing 1 changed file with 51 additions and 22 deletions.
73 changes: 51 additions & 22 deletions pjmedia/src/pjmedia/vid_conf.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,7 @@ PJ_DEF(pj_status_t) pjmedia_vid_conf_create(
/* Create own pool */
pool = pj_pool_create(parent_pool->factory, "vidconf", 500, 500, NULL);
if (!pool) {
PJ_PERROR(1, (THIS_FILE, PJ_ENOMEM, "Create failed in alloc"));
return PJ_ENOMEM;
}

Expand All @@ -275,13 +276,15 @@ PJ_DEF(pj_status_t) pjmedia_vid_conf_create(
pj_pool_zalloc(pool, vid_conf->opt.max_slot_cnt *
sizeof(vconf_port*));
if (!vid_conf->ports) {
PJ_PERROR(1, (THIS_FILE, PJ_ENOMEM, "Create failed in alloc ports"));
pjmedia_vid_conf_destroy(vid_conf);
return PJ_ENOMEM;
}

/* Create mutex */
status = pj_mutex_create_recursive(pool, CONF_NAME, &vid_conf->mutex);
if (status != PJ_SUCCESS) {
PJ_PERROR(1, (THIS_FILE, status, "Create failed in create mutex"));
pjmedia_vid_conf_destroy(vid_conf);
return status;
}
Expand All @@ -293,6 +296,7 @@ PJ_DEF(pj_status_t) pjmedia_vid_conf_create(
status = pjmedia_clock_create2(pool, &clock_param, 0, &on_clock_tick,
vid_conf, &vid_conf->clock);
if (status != PJ_SUCCESS) {
PJ_PERROR(1, (THIS_FILE, status, "Create failed in create clock"));
pjmedia_vid_conf_destroy(vid_conf);
return status;
}
Expand All @@ -301,6 +305,7 @@ PJ_DEF(pj_status_t) pjmedia_vid_conf_create(
vid_conf->op_queue = PJ_POOL_ZALLOC_T(pool, op_entry);
vid_conf->op_queue_free = PJ_POOL_ZALLOC_T(pool, op_entry);
if (!vid_conf->op_queue || !vid_conf->op_queue_free) {
PJ_PERROR(1, (THIS_FILE, PJ_ENOMEM, "Create failed in create queues"));
pjmedia_vid_conf_destroy(vid_conf);
return PJ_ENOMEM;
}
Expand All @@ -310,7 +315,7 @@ PJ_DEF(pj_status_t) pjmedia_vid_conf_create(
/* Done */
*p_vid_conf = vid_conf;

PJ_LOG(5,(THIS_FILE, "Created video conference bridge with %d ports",
PJ_LOG(4,(THIS_FILE, "Created video conference bridge with %d ports",
vid_conf->opt.max_slot_cnt));

return PJ_SUCCESS;
Expand Down Expand Up @@ -354,7 +359,7 @@ PJ_DEF(pj_status_t) pjmedia_vid_conf_destroy(pjmedia_vid_conf *vid_conf)
pj_pool_safe_release(&vid_conf->pool);
}

PJ_LOG(5,(THIS_FILE, "Video conference bridge destroyed"));
PJ_LOG(4,(THIS_FILE, "Video conference bridge destroyed"));

return PJ_SUCCESS;
}
Expand All @@ -375,6 +380,8 @@ PJ_DEF(pj_status_t) pjmedia_vid_conf_add_port( pjmedia_vid_conf *vid_conf,
unsigned index;
pj_status_t status = PJ_SUCCESS;

PJ_LOG(5,(THIS_FILE, "Add port %s requested", port->info.name.ptr));

PJ_ASSERT_RETURN(vid_conf && parent_pool && port, PJ_EINVAL);
PJ_ASSERT_RETURN(port->info.fmt.type==PJMEDIA_TYPE_VIDEO &&
port->info.fmt.detail_type==PJMEDIA_FORMAT_DETAIL_VIDEO,
Expand All @@ -388,6 +395,7 @@ PJ_DEF(pj_status_t) pjmedia_vid_conf_add_port( pjmedia_vid_conf *vid_conf,
pj_mutex_lock(vid_conf->mutex);

if (vid_conf->port_cnt >= vid_conf->opt.max_slot_cnt) {
PJ_PERROR(3,(THIS_FILE, PJ_ETOOMANY, "Add port %s failed", name->ptr));
pj_assert(!"Too many ports");
pj_mutex_unlock(vid_conf->mutex);
return PJ_ETOOMANY;
Expand Down Expand Up @@ -457,7 +465,7 @@ PJ_DEF(pj_status_t) pjmedia_vid_conf_add_port( pjmedia_vid_conf *vid_conf,

vfi = pjmedia_get_video_format_info(NULL, port->info.fmt.id);
if (!vfi) {
PJ_LOG(4,(THIS_FILE, "pjmedia_vid_conf_add_port(): "
PJ_LOG(3,(THIS_FILE, "pjmedia_vid_conf_add_port(): "
"unrecognized format %04X",
port->info.fmt.id));
status = PJMEDIA_EBADFMT;
Expand All @@ -468,7 +476,7 @@ PJ_DEF(pj_status_t) pjmedia_vid_conf_add_port( pjmedia_vid_conf *vid_conf,
vafp.size = port->info.fmt.det.vid.size;
status = (*vfi->apply_fmt)(vfi, &vafp);
if (status != PJ_SUCCESS) {
PJ_LOG(4,(THIS_FILE, "pjmedia_vid_conf_add_port(): "
PJ_LOG(3,(THIS_FILE, "pjmedia_vid_conf_add_port(): "
"Failed to apply format %04X",
port->info.fmt.id));
goto on_error;
Expand All @@ -482,7 +490,7 @@ PJ_DEF(pj_status_t) pjmedia_vid_conf_add_port( pjmedia_vid_conf *vid_conf,
cport->put_buf,
cport->put_buf_size);
if (status != PJ_SUCCESS) {
PJ_PERROR(4,(THIS_FILE, status,
PJ_PERROR(3,(THIS_FILE, status,
"Warning: failed to init sink buffer "
" with black"));
}
Expand All @@ -496,7 +504,7 @@ PJ_DEF(pj_status_t) pjmedia_vid_conf_add_port( pjmedia_vid_conf *vid_conf,
cport->get_buf,
cport->get_buf_size);
if (status != PJ_SUCCESS) {
PJ_PERROR(4,(THIS_FILE, status,
PJ_PERROR(3,(THIS_FILE, status,
"Warning: failed to init source buffer "
"with black"));
}
Expand Down Expand Up @@ -564,6 +572,8 @@ PJ_DEF(pj_status_t) pjmedia_vid_conf_add_port( pjmedia_vid_conf *vid_conf,
if (pool)
pj_pool_release(pool);

PJ_PERROR(3, (THIS_FILE, status, "Add port %s failed", name->ptr));

pj_mutex_unlock(vid_conf->mutex);
return status;
}
Expand All @@ -578,18 +588,21 @@ PJ_DEF(pj_status_t) pjmedia_vid_conf_remove_port( pjmedia_vid_conf *vid_conf,
vconf_port *cport;
op_entry *ope;

PJ_LOG(5,(THIS_FILE, "Port %d remove requested", slot));

PJ_ASSERT_RETURN(vid_conf && slot<vid_conf->opt.max_slot_cnt, PJ_EINVAL);

pj_mutex_lock(vid_conf->mutex);

/* Port must be valid. */
cport = vid_conf->ports[slot];
if (cport == NULL) {
PJ_PERROR(3, (THIS_FILE, PJ_EINVAL, "Remove port failed"));
pj_mutex_unlock(vid_conf->mutex);
return PJ_EINVAL;
}

PJ_LOG(5,(THIS_FILE, "Video port %d remove requested", slot));
PJ_LOG(4,(THIS_FILE, "Video port %d remove queued", slot));

/* Queue the operation */
ope = get_free_op_entry(vid_conf);
Expand Down Expand Up @@ -646,7 +659,7 @@ static void op_remove_port(pjmedia_vid_conf *vid_conf,
/* Warning: will stuck if this is called from the clock thread */
status = pjmedia_clock_stop(vid_conf->clock);
if (status != PJ_SUCCESS) {
PJ_PERROR(4, (THIS_FILE, status, "Failed to stop clock"));
PJ_PERROR(3, (THIS_FILE, status, "Failed to stop clock"));
}
}
}
Expand Down Expand Up @@ -741,6 +754,9 @@ PJ_DEF(pj_status_t) pjmedia_vid_conf_connect_port(
vconf_port *src_port, *dst_port;
unsigned i;

PJ_LOG(5,(THIS_FILE, "Connect ports %d->%d requested",
src_slot, sink_slot));

/* Check arguments */
PJ_ASSERT_RETURN(vid_conf &&
src_slot<vid_conf->opt.max_slot_cnt &&
Expand All @@ -755,7 +771,7 @@ PJ_DEF(pj_status_t) pjmedia_vid_conf_connect_port(
if (!src_port || !src_port->port->get_frame ||
!dst_port || !dst_port->port->put_frame)
{
PJ_LOG(4,(THIS_FILE,"Failed connecting video ports, make sure that "
PJ_LOG(3,(THIS_FILE,"Failed connecting video ports, make sure that "
"source has get_frame() & sink has put_frame()"));
pj_mutex_unlock(vid_conf->mutex);
return PJ_EINVAL;
Expand All @@ -771,7 +787,7 @@ PJ_DEF(pj_status_t) pjmedia_vid_conf_connect_port(
if (i == src_port->listener_cnt) {
op_entry *ope;

PJ_LOG(5,(THIS_FILE, "Video connect ports %d->%d requested",
PJ_LOG(4,(THIS_FILE, "Video connect ports %d->%d queued",
src_slot, sink_slot));

ope = get_free_op_entry(vid_conf);
Expand All @@ -786,7 +802,7 @@ PJ_DEF(pj_status_t) pjmedia_vid_conf_connect_port(
pj_status_t status;
status = pjmedia_clock_start(vid_conf->clock);
if (status != PJ_SUCCESS) {
PJ_PERROR(4, (THIS_FILE, status, "Failed to start clock"));
PJ_PERROR(2, (THIS_FILE, status, "Failed to start clock"));
pj_mutex_unlock(vid_conf->mutex);
return status;
}
Expand Down Expand Up @@ -848,6 +864,9 @@ PJ_DEF(pj_status_t) pjmedia_vid_conf_disconnect_port(
vconf_port *src_port, *dst_port;
unsigned i, j;

PJ_LOG(5,(THIS_FILE, "Disconnect ports %d->%d requested",
src_slot, sink_slot));

/* Check arguments */
PJ_ASSERT_RETURN(vid_conf &&
src_slot<vid_conf->opt.max_slot_cnt &&
Expand All @@ -859,6 +878,9 @@ PJ_DEF(pj_status_t) pjmedia_vid_conf_disconnect_port(
src_port = vid_conf->ports[src_slot];
dst_port = vid_conf->ports[sink_slot];
if (!src_port || !dst_port) {
PJ_PERROR(3,(THIS_FILE, PJ_EINVAL,
"Disconnect ports failed, src=0x%p dst=0x%p",
src_port, dst_port));
pj_mutex_unlock(vid_conf->mutex);
return PJ_EINVAL;
}
Expand All @@ -874,24 +896,26 @@ PJ_DEF(pj_status_t) pjmedia_vid_conf_disconnect_port(
}

if (i != src_port->listener_cnt && j != dst_port->transmitter_cnt) {
op_entry *ope;

pj_assert(src_port->listener_cnt > 0 &&
src_port->listener_cnt < vid_conf->opt.max_slot_cnt);
pj_assert(dst_port->transmitter_cnt > 0 &&
dst_port->transmitter_cnt < vid_conf->opt.max_slot_cnt);

/* Queue the operation */
if (i == src_port->listener_cnt) {
op_entry *ope;

PJ_LOG(5,(THIS_FILE, "Video disconnect ports %d->%d requested",
src_slot, sink_slot));
PJ_LOG(4,(THIS_FILE, "Video disconnect ports %d->%d queued",
src_slot, sink_slot));

ope = get_free_op_entry(vid_conf);
ope->type = OP_DISCONNECT_PORTS;
ope->param.disconnect_ports.src = src_slot;
ope->param.disconnect_ports.sink = sink_slot;
pj_list_push_back(vid_conf->op_queue, ope);
}
ope = get_free_op_entry(vid_conf);
ope->type = OP_DISCONNECT_PORTS;
ope->param.disconnect_ports.src = src_slot;
ope->param.disconnect_ports.sink = sink_slot;
pj_list_push_back(vid_conf->op_queue, ope);
} else {
PJ_PERROR(3,(THIS_FILE, PJ_EINVAL,
"Disconnect ports failed, src=0x%p dst=0x%p",
src_port, dst_port));
}

pj_mutex_unlock(vid_conf->mutex);
Expand Down Expand Up @@ -1467,13 +1491,16 @@ PJ_DEF(pj_status_t) pjmedia_vid_conf_update_port( pjmedia_vid_conf *vid_conf,
vconf_port *cport;
op_entry *ope;

PJ_LOG(5,(THIS_FILE, "Update port %d requested", slot));

PJ_ASSERT_RETURN(vid_conf && slot<vid_conf->opt.max_slot_cnt, PJ_EINVAL);

pj_mutex_lock(vid_conf->mutex);

/* Port must be valid. */
cport = vid_conf->ports[slot];
if (cport == NULL) {
PJ_PERROR(3,(THIS_FILE, PJ_EINVAL, "Update port failed"));
pj_mutex_unlock(vid_conf->mutex);
return PJ_EINVAL;
}
Expand All @@ -1484,6 +1511,7 @@ PJ_DEF(pj_status_t) pjmedia_vid_conf_update_port( pjmedia_vid_conf *vid_conf,
ope->param.update_port.port = slot;
pj_list_push_back(vid_conf->op_queue, ope);

PJ_LOG(4,(THIS_FILE, "Update port %d queued", slot));
pj_mutex_unlock(vid_conf->mutex);

return PJ_SUCCESS;
Expand Down Expand Up @@ -1602,6 +1630,7 @@ static void op_update_port(pjmedia_vid_conf *vid_conf,

/* Update cport format info */
cport->format = *new_fmt;
PJ_LOG(4,(THIS_FILE, "Port %d updated", slot));
}


Expand Down

0 comments on commit d3f79e7

Please sign in to comment.