diff options
| author | Steve Kondik <steve@cyngn.com> | 2015-12-08 01:47:04 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-12-08 01:47:04 -0800 |
| commit | f8524bea5b8636f5c5a77152e3ac008ed051a9e2 (patch) | |
| tree | f27f72d4532bff00aaef427d70e74268e6967a04 | |
| parent | 216986d4d7f4763495bc293a2f932427f121c872 (diff) | |
| parent | 4193f60d9b89535fb74f8e98628a6ba61ec2e354 (diff) | |
| download | android_hardware_qcom_media-f8524bea5b8636f5c5a77152e3ac008ed051a9e2.tar.gz android_hardware_qcom_media-f8524bea5b8636f5c5a77152e3ac008ed051a9e2.tar.bz2 android_hardware_qcom_media-f8524bea5b8636f5c5a77152e3ac008ed051a9e2.zip | |
Merge branch 'LA.BF.1.1.3_rb1.5' of git://codeaurora.org/platform/hardware/qcom/media into cm-13.0
| -rw-r--r-- | mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp | 4 | ||||
| -rw-r--r-- | mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp b/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp index b55c3544..37c8a901 100644 --- a/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp +++ b/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp @@ -155,8 +155,8 @@ void* async_message_thread (void *input) if (!rc) { DEBUG_PRINT_ERROR("Poll timedout"); break; - } else if (rc < 0) { - DEBUG_PRINT_ERROR("Error while polling: %d", rc); + } else if (rc < 0 && errno != EINTR && errno != EAGAIN) { + DEBUG_PRINT_ERROR("Error while polling: %d, errno = %d", rc, errno); break; } if ((pfd.revents & POLLIN) || (pfd.revents & POLLRDNORM)) { diff --git a/mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2.cpp b/mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2.cpp index 644a1d33..62b40803 100644 --- a/mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2.cpp +++ b/mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2.cpp @@ -289,8 +289,8 @@ void* venc_dev::async_venc_message_thread (void *input) DEBUG_PRINT_HIGH("Poll timedout, pipeline stalled due to client/firmware ETB: %d, EBD: %d, FTB: %d, FBD: %d", omx->handle->etb, omx->handle->ebd, omx->handle->ftb, omx->handle->fbd); continue; - } else if (rc < 0) { - DEBUG_PRINT_ERROR("Error while polling: %d", rc); + } else if (rc < 0 && errno != EINTR && errno != EAGAIN) { + DEBUG_PRINT_ERROR("Error while polling: %d, errno = %d", rc, errno); break; } |