Skip to content

Commit

Permalink
Added APIs for conference
Browse files Browse the repository at this point in the history
  • Loading branch information
@nanangizz
nanangizz committed Jan 8, 2025
1 parent cfd75a7 commit bb0aabe
Show file tree
Hide file tree
Showing 5 changed files with 254 additions and 6 deletions.
45 changes: 45 additions & 0 deletions pjmedia/include/pjmedia/conference.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -425,6 +425,10 @@ PJ_DECL(unsigned) pjmedia_conf_get_connect_count(pjmedia_conf *conf);
* should not assume that the port will no longer receive/send audio frame
* after this function has returned.
*
* If the port uses any app's resources, application should maintain
* the resources validity until the port is completely removed. Application
* can schedule the resource release via #pjmedia_conf_add_destroy_handler().
*
* @param conf The conference bridge.
* @param slot The port index to be removed.
*
Expand Down Expand Up @@ -602,6 +606,47 @@ PJ_DECL(pj_status_t) pjmedia_conf_adjust_conn_level( pjmedia_conf *conf,
int adj_level );


/**
* Add port destructor handler.
*
* Application can use this function to schedule resource release.
* Note that application cannot release any app's resources used by the port,
* e.g: memory pool, database connection, immediately after removing the port
* from the conference bridge as port removal is asynchronous.
*
* Usually this function is called after adding the port to the conference
* bridge.
*
* @param conf The conference bridge.
* @param slot The port slot index.
* @param member A pointer to be passed to the handler.
* @param handler The destroy handler.
*
* @return PJ_SUCCESS on success.
*/
PJ_DECL(pj_status_t) pjmedia_conf_add_destroy_handler(
pjmedia_conf* conf,
unsigned slot,
void* member,
pj_grp_lock_handler handler);


/**
* Remove previously registered destructor handler.
*
* @param conf The conference bridge.
* @param slot The port slot index.
* @param member A pointer to be passed to the handler.
* @param handler The destroy handler.
*
* @return PJ_SUCCESS on success.
*/
PJ_DECL(pj_status_t) pjmedia_conf_del_destroy_handler(
pjmedia_conf* conf,
unsigned slot,
void* member,
pj_grp_lock_handler handler);


PJ_END_DECL

Expand Down
49 changes: 46 additions & 3 deletions pjmedia/include/pjmedia/vid_conf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ PJ_DECL(unsigned) pjmedia_vid_conf_get_port_count(pjmedia_vid_conf *vid_conf);
/**
* Enumerate occupied slots in the video conference bridge.
*
* @param vid_conf The video conference bridge.
* @param vid_conf The video conference bridge.
* @param slots Array of slot to be filled in.
* @param count On input, specifies the maximum number of slot
* in the array. On return, it will be filled with
Expand Down Expand Up @@ -253,7 +253,7 @@ PJ_DECL(pj_status_t) pjmedia_vid_conf_get_port_info(
* Enable unidirectional video flow from the specified source slot to
* the specified sink slot.
*
* @param vid_conf The video conference bridge.
* @param vid_conf The video conference bridge.
* @param src_slot Source slot.
* @param sink_slot Sink slot.
* @param opt The option, for future use, currently this must
Expand All @@ -272,7 +272,7 @@ PJ_DECL(pj_status_t) pjmedia_vid_conf_connect_port(
* Disconnect unidirectional video flow from the specified source to
* the specified sink slot.
*
* @param vid_conf The video conference bridge.
* @param vid_conf The video conference bridge.
* @param src_slot Source slot.
* @param sink_slot Sink slot.
*
Expand Down Expand Up @@ -301,6 +301,49 @@ PJ_DECL(pj_status_t) pjmedia_vid_conf_update_port(pjmedia_vid_conf *vid_conf,
unsigned slot);



/**
* Add port destructor handler.
*
* Application can use this function to schedule resource release.
* Note that application cannot release any app's resources used by the port,
* e.g: memory pool, database connection, immediately after removing the port
* from the conference bridge as port removal is asynchronous.
*
* Usually this function is called after adding the port to the conference
* bridge.
*
* @param vid_conf The video conference bridge.
* @param slot The port slot index.
* @param member A pointer to be passed to the handler.
* @param handler The destroy handler.
*
* @return PJ_SUCCESS on success.
*/
PJ_DECL(pj_status_t) pjmedia_vid_conf_add_destroy_handler(
pjmedia_vid_conf* vid_conf,
unsigned slot,
void* member,
pj_grp_lock_handler handler);


/**
* Remove previously registered destructor handler.
*
* @param conf The video conference bridge.
* @param slot The port slot index.
* @param member A pointer to be passed to the handler.
* @param handler The destroy handler.
*
* @return PJ_SUCCESS on success.
*/
PJ_DECL(pj_status_t) pjmedia_vid_conf_del_destroy_handler(
pjmedia_vid_conf* vid_conf,
unsigned slot,
void* member,
pj_grp_lock_handler handler);


PJ_END_DECL

/**
Expand Down
37 changes: 37 additions & 0 deletions pjmedia/src/pjmedia/conf_switch.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1585,4 +1585,41 @@ static pj_status_t put_frame(pjmedia_port *this_port,
return PJ_SUCCESS;
}


/*
* Add destructor handler.
*/
PJ_DEF(pj_status_t) pjmedia_conf_add_destroy_handler(
pjmedia_conf* conf,
unsigned slot,
void* member,
pj_grp_lock_handler handler)
{
PJ_UNUSED_ARG(conf);
PJ_UNUSED_ARG(slot);
PJ_UNUSED_ARG(member);
PJ_UNUSED_ARG(handler);

return PJ_ENOTSUP;
}


/*
* Remove previously registered destructor handler.
*/
PJ_DEF(pj_status_t) pjmedia_conf_del_destroy_handler(
pjmedia_conf* conf,
unsigned slot,
void* member,
pj_grp_lock_handler handler)
{
PJ_UNUSED_ARG(conf);
PJ_UNUSED_ARG(slot);
PJ_UNUSED_ARG(member);
PJ_UNUSED_ARG(handler);

return PJ_ENOTSUP;
}


#endif
67 changes: 64 additions & 3 deletions pjmedia/src/pjmedia/conference.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1413,11 +1413,11 @@ static void op_disconnect_ports(pjmedia_conf *conf,
/* Disconnect source -> sink */
if (src_port && dst_port) {
/* Check if connection has been made */
for (i=0; i<src_port->listener_cnt; ++i) {
for (i=0; i<(int)src_port->listener_cnt; ++i) {
if (src_port->listener_slots[i] == sink_slot)
break;
}
if (i == src_port->listener_cnt) {
if (i == (int)src_port->listener_cnt) {
PJ_LOG(3,(THIS_FILE, "Ports connection %d->%d does not exist",
src_slot, sink_slot));
return;
Expand Down Expand Up @@ -1458,7 +1458,7 @@ static void op_disconnect_ports(pjmedia_conf *conf,
(int)dst_port->name.slen,
dst_port->name.ptr));

for (i=0; i<conf->max_ports; ++i) {
for (i=0; i<(int)conf->max_ports; ++i) {
int j;

src_port = conf->ports[i];
Expand Down Expand Up @@ -2806,4 +2806,65 @@ static pj_status_t put_frame(pjmedia_port *this_port,
return status;
}


/*
* Add destructor handler.
*/
PJ_DEF(pj_status_t) pjmedia_conf_add_destroy_handler(
pjmedia_conf* conf,
unsigned slot,
void* member,
pj_grp_lock_handler handler)
{
struct conf_port *cport;
pj_grp_lock_t *grp_lock;

PJ_ASSERT_RETURN(conf && handler && slot < conf->max_ports, PJ_EINVAL);

pj_mutex_lock(conf->mutex);

/* Port must be valid and has group lock. */
cport = conf->ports[slot];
if (!cport || !cport->port || !cport->port->grp_lock) {
pj_mutex_unlock(conf->mutex);
return cport? PJ_EINVALIDOP : PJ_EINVAL;
}
grp_lock = cport->port->grp_lock;

pj_mutex_unlock(conf->mutex);

return pj_grp_lock_add_handler(grp_lock, NULL, member, handler);
}


/*
* Remove previously registered destructor handler.
*/
PJ_DEF(pj_status_t) pjmedia_conf_del_destroy_handler(
pjmedia_conf* conf,
unsigned slot,
void* member,
pj_grp_lock_handler handler)
{
struct conf_port* cport;
pj_grp_lock_t* grp_lock;

PJ_ASSERT_RETURN(conf && handler && slot < conf->max_ports, PJ_EINVAL);

pj_mutex_lock(conf->mutex);

/* Port must be valid and has group lock. */
cport = conf->ports[slot];
if (!cport || !cport->port || !cport->port->grp_lock) {
pj_mutex_unlock(conf->mutex);
return cport ? PJ_EINVALIDOP : PJ_EINVAL;
}
grp_lock = cport->port->grp_lock;

pj_mutex_unlock(conf->mutex);

return pj_grp_lock_del_handler(grp_lock, member, handler);
}


#endif
62 changes: 62 additions & 0 deletions pjmedia/src/pjmedia/vid_conf.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1733,4 +1733,66 @@ static void op_update_port(pjmedia_vid_conf *vid_conf,
}


/*
* Add destructor handler.
*/
PJ_DEF(pj_status_t) pjmedia_vid_conf_add_destroy_handler(
pjmedia_vid_conf* vid_conf,
unsigned slot,
void* member,
pj_grp_lock_handler handler)
{
struct vconf_port* cport;
pj_grp_lock_t* grp_lock;

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

pj_mutex_lock(vid_conf->mutex);

/* Port must be valid and has group lock. */
cport = vid_conf->ports[slot];
if (!cport || !cport->port || !cport->port->grp_lock) {
pj_mutex_unlock(vid_conf->mutex);
return cport ? PJ_EINVALIDOP : PJ_EINVAL;
}
grp_lock = cport->port->grp_lock;

pj_mutex_unlock(vid_conf->mutex);

return pj_grp_lock_add_handler(grp_lock, NULL, member, handler);
}


/*
* Remove previously registered destructor handler.
*/
PJ_DEF(pj_status_t) pjmedia_vid_conf_del_destroy_handler(
pjmedia_vid_conf* vid_conf,
unsigned slot,
void* member,
pj_grp_lock_handler handler)
{
struct vconf_port* cport;
pj_grp_lock_t* grp_lock;

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

pj_mutex_lock(vid_conf->mutex);

/* Port must be valid and has group lock. */
cport = vid_conf->ports[slot];
if (!cport || !cport->port || !cport->port->grp_lock) {
pj_mutex_unlock(vid_conf->mutex);
return cport ? PJ_EINVALIDOP : PJ_EINVAL;
}
grp_lock = cport->port->grp_lock;

pj_mutex_unlock(vid_conf->mutex);

return pj_grp_lock_del_handler(grp_lock, member, handler);
}


#endif /* PJMEDIA_HAS_VIDEO */

0 comments on commit bb0aabe

Please sign in to comment.