summaryrefslogtreecommitdiff
path: root/mm-video-v4l2
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@quicinc.com>2017-05-21 19:42:16 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-05-21 19:42:16 -0700
commit07657f967683f07d9384abb8cac1862dcd041933 (patch)
treece88ec269f35d67eda1587087fb0aa7b9fbf4e28 /mm-video-v4l2
parent984740ea7e0c812383e81daa86650b5519f5d24f (diff)
parent2febf0e3f9f5135a392da0fedde9c85cbd6eb386 (diff)
downloadmedia-07657f967683f07d9384abb8cac1862dcd041933.tar.gz
Merge "mm-video-v4l2: venc: Skip buffer queue defer if timestamp is not initialized" into video-userspace.lnx.3.0-dev
Diffstat (limited to 'mm-video-v4l2')
-rw-r--r--mm-video-v4l2/vidc/venc/src/omx_video_encoder.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/mm-video-v4l2/vidc/venc/src/omx_video_encoder.cpp b/mm-video-v4l2/vidc/venc/src/omx_video_encoder.cpp
index 8b16fb72..17cf246a 100644
--- a/mm-video-v4l2/vidc/venc/src/omx_video_encoder.cpp
+++ b/mm-video-v4l2/vidc/venc/src/omx_video_encoder.cpp
@@ -2133,6 +2133,10 @@ bool omx_venc::dev_buffer_ready_to_queue(OMX_BUFFERHEADERTYPE *buffer)
{
bool bRet = true;
+ /* do not defer the buffer if m_TimeStamp is not initialized */
+ if (!timestamp.m_TimeStamp)
+ return true;
+
pthread_mutex_lock(&timestamp.m_lock);
if ((OMX_U64)buffer->nTimeStamp == (OMX_U64)timestamp.m_TimeStamp) {