Merge "msm: vidc: Disable timestamp store-fetch logic"

This commit is contained in:
qctecmdr 2020-09-17 10:04:47 -07:00 committed by Gerrit - the friendly Code Review server
commit 6f06f41bfe

View File

@ -433,7 +433,7 @@ int msm_vidc_qbuf(void *instance, struct media_device *mdev,
timestamp_us = (s64)((b->timestamp.tv_sec * 1000000) +
b->timestamp.tv_usec);
if (is_decode_session(inst) && b->type == INPUT_MPLANE &&
!is_heif_decoder(inst)) {
!is_heif_decoder(inst) && !is_secure_session(inst)) {
if (inst->flush_timestamps)
msm_comm_release_timestamps(inst);
inst->flush_timestamps = false;
@ -515,7 +515,8 @@ int msm_vidc_dqbuf(void *instance, struct v4l2_buffer *b)
if (is_decode_session(inst) &&
b->type == OUTPUT_MPLANE &&
!(b->flags & V4L2_BUF_FLAG_CODECCONFIG) &&
!is_heif_decoder(inst))
!is_heif_decoder(inst) &&
!is_secure_session(inst))
msm_comm_fetch_ts_framerate(inst, b);
return rc;