diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-08-18 23:20:37 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-08-18 23:20:37 -0700 |
| commit | 0eaa6d2a8bb7c0bcd0a84dc70f045cc05846799c (patch) | |
| tree | e54a65bed44fb0fc13c6bf31491ff72b5c973204 | |
| parent | 55b1c1cae23c1ed9378716565a5df658d2bddaa4 (diff) | |
| parent | 51c000515095f9968f7816c7138dea2473f92b8f (diff) | |
Merge "msm: vidc: Propagate time stamp information even filled length is zero"
| -rw-r--r-- | drivers/media/platform/msm/vidc/msm_vidc_common.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/platform/msm/vidc/msm_vidc_common.c b/drivers/media/platform/msm/vidc/msm_vidc_common.c index 587aa930cf9c..7bc88aa7caa5 100644 --- a/drivers/media/platform/msm/vidc/msm_vidc_common.c +++ b/drivers/media/platform/msm/vidc/msm_vidc_common.c @@ -2011,8 +2011,7 @@ static void handle_fbd(enum hal_command_response cmd, void *data) vb->planes[0].bytesused, vb->planes[0].length); if (!(fill_buf_done->flags1 & - HAL_BUFFERFLAG_TIMESTAMPINVALID) && - fill_buf_done->filled_len1) { + HAL_BUFFERFLAG_TIMESTAMPINVALID)) { time_usec = fill_buf_done->timestamp_hi; time_usec = (time_usec << 32) | fill_buf_done->timestamp_lo; |