summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorqctecmdr <qctecmdr@localhost>2021-01-13 02:13:10 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2021-01-13 02:13:10 -0800
commit07ad127cf42cbdf42954418506892dc11411156d (patch)
tree778bde84c04b6b180955113420a2eaf143ce6637
parent2e4c39d6e67475a57a739b3bb1041f1692daefca (diff)
parent8fe98e9d2b3c80a116ff651e054c7c464fa83b7b (diff)
Merge "media: Avoid integer overflow for negative timestamps"
-rw-r--r--mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp b/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp
index 6a040ee9..3b1c9d61 100644
--- a/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp
+++ b/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp
@@ -6189,7 +6189,7 @@ OMX_ERRORTYPE omx_vdec::fill_buffer_done(OMX_HANDLETYPE hComp,
il_buffer = client_buffers.get_il_buf_hdr(buffer);
OMX_U32 current_framerate = (int)(drv_ctx.frame_rate.fps_numerator / drv_ctx.frame_rate.fps_denominator);
- if (il_buffer && m_dec_hfr_fps > 0 && buffer->nFilledLen > 0) {
+ if (il_buffer && il_buffer->nTimeStamp >= 0 && m_dec_hfr_fps > 0 && buffer->nFilledLen > 0) {
uint64_t tsDeltaUs = llabs(il_buffer->nTimeStamp - m_prev_timestampUs);
double vsyncUs = 1e6/m_dec_hfr_fps;
double vsync_start = (static_cast<uint64_t>(il_buffer->nTimeStamp/vsyncUs)) * vsyncUs;