summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pjmedia/src/pjmedia/stream.c9
-rw-r--r--pjmedia/src/pjmedia/vid_stream.c9
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;
}