diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2016-01-15 03:32:26 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2016-01-15 03:32:26 +0000 |
| commit | a852b979a9ddcb1537a71f2f8fe924a52f273370 (patch) | |
| tree | 2308c4a47378d173f7fc732be5b6ffd0b65d7e40 | |
| parent | 8b7500b4b8cf93c54ea4a1c70eaa6d04a86e51ea (diff) | |
Misc (re #1882): Suppress EAGAIN recv() error log in pjmedia stream.c & vid_stream.c (thanks Christian Ambach for the patch).
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5234 74dad513-b988-da41-8d7b-12977e46ad98
| -rw-r--r-- | pjmedia/src/pjmedia/stream.c | 9 | ||||
| -rw-r--r-- | pjmedia/src/pjmedia/vid_stream.c | 9 |
2 files changed, 14 insertions, 4 deletions
diff --git a/pjmedia/src/pjmedia/stream.c b/pjmedia/src/pjmedia/stream.c index e4618541..1b66dd87 100644 --- a/pjmedia/src/pjmedia/stream.c +++ b/pjmedia/src/pjmedia/stream.c @@ -1628,6 +1628,9 @@ static void on_rx_rtp( void *data, /* Check for errors */ if (bytes_read < 0) { status = (pj_status_t)-bytes_read; + if (status == PJ_STATUS_FROM_OS(OSERR_EWOULDBLOCK)) { + return; + } if (stream->rtp_rx_last_err != status) { char errmsg[PJ_ERR_MSG_SIZE]; pj_strerror(status, errmsg, sizeof(errmsg)); @@ -1894,8 +1897,10 @@ static void on_rx_rtcp( void *data, /* Check for errors */ if (bytes_read < 0) { - LOGERR_((stream->port.info.name.ptr, "RTCP recv() error", - (pj_status_t)-bytes_read)); + if (bytes_read != -PJ_STATUS_FROM_OS(OSERR_EWOULDBLOCK)) { + LOGERR_((stream->port.info.name.ptr, "RTCP recv() error", + (pj_status_t)-bytes_read)); + } return; } diff --git a/pjmedia/src/pjmedia/vid_stream.c b/pjmedia/src/pjmedia/vid_stream.c index 5deef379..69891ffb 100644 --- a/pjmedia/src/pjmedia/vid_stream.c +++ b/pjmedia/src/pjmedia/vid_stream.c @@ -607,6 +607,9 @@ static void on_rx_rtp( void *data, /* Check for errors */ if (bytes_read < 0) { status = (pj_status_t)-bytes_read; + if (status == PJ_STATUS_FROM_OS(OSERR_EWOULDBLOCK)) { + return; + } if (stream->rtp_rx_last_err != status) { char errmsg[PJ_ERR_MSG_SIZE]; pj_strerror(status, errmsg, sizeof(errmsg)); @@ -786,8 +789,10 @@ static void on_rx_rtcp( void *data, /* Check for errors */ if (bytes_read < 0) { - LOGERR_((stream->cname.ptr, "RTCP recv() error", - (pj_status_t)-bytes_read)); + if (bytes_read != -PJ_STATUS_FROM_OS(OSERR_EWOULDBLOCK)) { + LOGERR_((stream->cname.ptr, "RTCP recv() error", + (pj_status_t)-bytes_read)); + } return; } |