diff options
Diffstat (limited to 'pjmedia/src/pjmedia/port.c')
| -rw-r--r-- | pjmedia/src/pjmedia/port.c | 90 |
1 files changed, 0 insertions, 90 deletions
diff --git a/pjmedia/src/pjmedia/port.c b/pjmedia/src/pjmedia/port.c index 50a008e9..96c07c08 100644 --- a/pjmedia/src/pjmedia/port.c +++ b/pjmedia/src/pjmedia/port.c @@ -25,84 +25,6 @@ /** - * Connect two ports. - */ -PJ_DEF(pj_status_t) pjmedia_port_connect( pj_pool_t *pool, - pjmedia_port *upstream_port, - pjmedia_port *downstream_port) -{ - pj_status_t status; - - PJ_ASSERT_RETURN(pool && upstream_port && downstream_port, PJ_EINVAL); - -#if 0 - /* They both MUST have the same media type. */ - PJ_ASSERT_RETURN(upstream_port->info.type == - downstream_port->info.type, PJMEDIA_ENCTYPE); - - /* They both MUST have the same clock rate. */ - PJ_ASSERT_RETURN(upstream_port->info.sample_rate == - downstream_port->info.sample_rate, PJMEDIA_ENCCLOCKRATE); - - /* They both MUST have the same samples per frame */ - PJ_ASSERT_RETURN(upstream_port->info.samples_per_frame == - downstream_port->info.samples_per_frame, - PJMEDIA_ENCSAMPLESPFRAME); - - /* They both MUST have the same bits per sample */ - PJ_ASSERT_RETURN(upstream_port->info.bits_per_sample == - downstream_port->info.bits_per_sample, - PJMEDIA_ENCBITS); - - /* They both MUST have the same bytes per frame */ - PJ_ASSERT_RETURN(upstream_port->info.bytes_per_frame == - downstream_port->info.bytes_per_frame, - PJMEDIA_ENCBYTES); -#endif - - /* Create mutual attachment. */ - if (upstream_port->on_downstream_connect) { - status = upstream_port->on_downstream_connect( pool, upstream_port, - downstream_port ); - if (status != PJ_SUCCESS) - return status; - } - - if (downstream_port->on_upstream_connect) { - status = downstream_port->on_upstream_connect( pool, downstream_port, - upstream_port ); - if (status != PJ_SUCCESS) - return status; - } - - /* Save the attachment. */ - upstream_port->downstream_port = downstream_port; - downstream_port->upstream_port = upstream_port; - - /* Done. */ - return PJ_SUCCESS; -} - - -/** - * Disconnect ports. - */ -PJ_DEF(pj_status_t) pjmedia_port_disconnect( pjmedia_port *upstream_port, - pjmedia_port *downstream_port) -{ - PJ_ASSERT_RETURN(upstream_port && downstream_port, PJ_EINVAL); - - if (upstream_port->downstream_port == downstream_port) - upstream_port->downstream_port = NULL; - - if (downstream_port->upstream_port == upstream_port) - downstream_port->upstream_port = NULL; - - return PJ_SUCCESS; -} - - -/** * Get a frame from the port (and subsequent downstream ports). */ PJ_DEF(pj_status_t) pjmedia_port_get_frame( pjmedia_port *port, @@ -115,7 +37,6 @@ PJ_DEF(pj_status_t) pjmedia_port_get_frame( pjmedia_port *port, } - /** * Put a frame to the port (and subsequent downstream ports). */ @@ -139,16 +60,6 @@ PJ_DEF(pj_status_t) pjmedia_port_destroy( pjmedia_port *port ) PJ_ASSERT_RETURN(port, PJ_EINVAL); - /* Recursively call this function again to destroy downstream - * port first. - */ - if (port->downstream_port) { - status = pjmedia_port_destroy(port->downstream_port); - if (status != PJ_SUCCESS) - return status; - pjmedia_port_disconnect(port, port->downstream_port); - } - if (port->on_destroy) status = port->on_destroy(port); else @@ -159,4 +70,3 @@ PJ_DEF(pj_status_t) pjmedia_port_destroy( pjmedia_port *port ) - |