diff options
author | Benny Prijono <bennylp@teluu.com> | 2006-05-02 17:44:28 +0000 |
---|---|---|
committer | Benny Prijono <bennylp@teluu.com> | 2006-05-02 17:44:28 +0000 |
commit | 2d364dc54fab29382aea6a381f2b344ec5e0df63 (patch) | |
tree | 53b7165938a54bd0ef2cf4e82c1185334d520b45 | |
parent | 48a492ee742bc593bc332cd5176d0c33b1a13604 (diff) |
Do not disable port if put_frame()/get_frame() returns error
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@426 74dad513-b988-da41-8d7b-12977e46ad98
-rw-r--r-- | pjmedia/src/pjmedia/conference.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/pjmedia/src/pjmedia/conference.c b/pjmedia/src/pjmedia/conference.c index daa0529d..bfdc24a9 100644 --- a/pjmedia/src/pjmedia/conference.c +++ b/pjmedia/src/pjmedia/conference.c @@ -1362,12 +1362,15 @@ static pj_status_t get_frame(pjmedia_port *this_port, conf->samples_per_frame, &frame_type); if (status != PJ_SUCCESS) { + /* bennylp: why do we need this???? + * Also see comments on similar issue with write_port(). PJ_LOG(4,(THIS_FILE, "Port %.*s get_frame() returned %d. " "Port is now disabled", (int)conf_port->name.slen, conf_port->name.ptr, status)); conf_port->rx_setting = PJMEDIA_PORT_DISABLE; + */ continue; } } @@ -1463,12 +1466,19 @@ static pj_status_t get_frame(pjmedia_port *this_port, status = write_port( conf, conf_port, frame->timestamp.u32.lo); if (status != PJ_SUCCESS) { + /* bennylp: why do we need this???? + One thing for sure, put_frame()/write_port() may return + non-successfull status on Win32 if there's temporary glitch + on network interface, so disabling the port here does not + sound like a good idea. + PJ_LOG(4,(THIS_FILE, "Port %.*s put_frame() returned %d. " "Port is now disabled", (int)conf_port->name.slen, conf_port->name.ptr, status)); conf_port->tx_setting = PJMEDIA_PORT_DISABLE; + */ continue; } } |