X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=mISDN.cpp;h=ab25d3be784592a5e886c3e6986d1f9071f18a7f;hp=546b39f3c933b984da298c46dcc4e79fbaee890c;hb=0562b894ff8302ad4ca2d0df1f659cc18f6af5fb;hpb=3f7ef909c907a374a1760ffae0c01b49487f18d7

diff --git a/mISDN.cpp b/mISDN.cpp
index 546b39f..ab25d3b 100644
--- a/mISDN.cpp
+++ b/mISDN.cpp
@@ -122,7 +122,7 @@ int load_timer(struct lcr_timer *timer, void *instance, int index);
 /*
  * constructor
  */
-PmISDN::PmISDN(int type, mISDNport *mISDNport, char *portname, struct port_settings *settings, int channel, int exclusive, int mode) : Port(type, portname, settings)
+PmISDN::PmISDN(int type, mISDNport *mISDNport, char *portname, struct port_settings *settings, struct interface *interface, int channel, int exclusive, int mode) : Port(type, portname, settings, interface)
 {
 	p_m_mISDNport = mISDNport;
 	p_m_portnum = mISDNport->portnum;
@@ -651,6 +651,7 @@ void bchannel_event(struct mISDNport *mISDNport, int i, int event)
 				_bchannel_configure(mISDNport, i);
 				state = B_STATE_ACTIVE;
 				b_port->p_m_load = 0;
+				b_port->update_load();
 			} else {
 				/* bchannel is active, but not used anymore (or has wrong stack config), so we deactivate */
 				_bchannel_activate(mISDNport, i, 0, 0);
@@ -913,10 +914,6 @@ on empty load, remote-audio causes the load with the remote audio to be increase
  */
 void PmISDN::update_load(void)
 {
-	/* don't trigger load event if: */
-	if (!p_tone_name[0] && !p_m_crypt_msg_loops && !p_m_inband_send_on)
-		return;
-
 	/* don't trigger load event if event already active */
 	if (p_m_loadtimer.active)
 		return;
@@ -950,7 +947,10 @@ void PmISDN::load_tx(void)
 	p_m_last_tv_msec = current_time.tv_usec/1000;
 
 	/* process only if we have samples and we are active */
-	if (elapsed && p_m_mISDNport->b_state[p_m_b_index] == B_STATE_ACTIVE) {
+	if (p_m_mISDNport->b_state[p_m_b_index] != B_STATE_ACTIVE)
+		return;
+
+	if (elapsed) {
 		/* update load */
 		if (elapsed < p_m_load)
 			p_m_load -= elapsed;
@@ -1015,9 +1015,7 @@ void PmISDN::load_tx(void)
 		}
 	}
 
-	if (p_tone_name[0] || p_m_crypt_msg_loops || p_m_inband_send_on || p_m_load) {
-		schedule_timer(&p_m_loadtimer, 0, PORT_TRANSMIT * 125);
-	}
+	schedule_timer(&p_m_loadtimer, 0, PORT_TRANSMIT * 125);
 }
 
 /* handle timeouts */
@@ -1398,7 +1396,6 @@ void PmISDN::message_crypt(unsigned int epoint_id, int message_id, union paramet
 		p_m_crypt_msg_current = 0; /* reset */
 		p_m_crypt_msg_loops = 6; /* enable */
 		update_rxoff();
-		update_load();
 #if 0
 		/* disable txmix, or we get corrupt data due to audio process */
 		if (p_m_txmix && p_m_b_index>=0 && p_m_mISDNport->b_mode[p_m_b_index] == B_MODE_TRANSPARENT) {
@@ -1500,7 +1497,7 @@ void PmISDN::update_rxoff(void)
 		tx_dejitter = 1;
 	if (p_m_tx_dejitter != tx_dejitter) {
 		p_m_tx_dejitter = tx_dejitter;
-		PDEBUG(DEBUG_BCHANNEL, "we change dejitter mode to delay=%d.\n", p_m_tx_dejitter);
+		PDEBUG(DEBUG_BCHANNEL, "we change dejitter mode to %s.\n", (p_m_tx_dejitter) ? "on" : "off");
 		if (p_m_b_index > -1)
 			if (p_m_mISDNport->b_state[p_m_b_index] == B_STATE_ACTIVE && p_m_mISDNport->b_mode[p_m_b_index] == B_MODE_TRANSPARENT)
 				ph_control(p_m_mISDNport, this, p_m_mISDNport->b_sock[p_m_b_index].fd, DSP_TX_DEJITTER, p_m_tx_dejitter, "DSP-TX_DEJITTER", p_m_tx_dejitter);
@@ -2174,8 +2171,11 @@ int PmISDN::bridge_rx(unsigned char *data, int length)
 	/* preload procedure
 	 * if transmit buffer in DSP module is empty,
 	 * preload it to DSP_LOAD to prevent jitter gaps.
+	 * 
+	 * if load runs empty, preload again.
 	 */
-	if ((!p_bridge || p_m_disable_dejitter) && p_m_load == 0 && p_m_preload > 0) {
+	if (p_m_disable_dejitter && p_m_load == 0 && p_m_preload > 0) {
+//printf("preload=%d\n", p_m_preload);
 		hh->prim = PH_DATA_REQ; 
 		hh->id = 0;
 		memset(buf+MISDN_HEADER_LEN, silence, p_m_preload);
@@ -2189,7 +2189,8 @@ int PmISDN::bridge_rx(unsigned char *data, int length)
 	/* drop if load would exceed ISDN_MAXLOAD
 	 * this keeps the delay not too high
 	 */
-	if (p_m_load+length > (p_m_preload << 1))
+//printf("load=%d len=%d 2*preload=%d\n", p_m_load, length, p_m_preload << 1);
+	if (p_m_disable_dejitter && p_m_preload > 0 && p_m_load+length > (p_m_preload << 1))
 		return -EINVAL;
 
 	/* make and send frame */
@@ -2214,8 +2215,6 @@ void PmISDN::inband_send_on(void)
 {
 	PDEBUG(DEBUG_PORT, "turning inband signalling send on.\n");
 	p_m_inband_send_on = 1;
-	/* trigger inband transmit */
-	update_load();
 }
 
 void PmISDN::inband_send_off(void)