commit 0af4db6ace929b75e68834d01bd3175dbe39c1a0
author Chong Zhang <chz@google.com> Fri Aug 23 15:34:58 2019 -0700
committer Chong Zhang <chz@google.com> Mon Aug 26 14:50:23 2019 -0700
tree 0a93a037452fb6913cb9225a26ecea87b0de22b6
parent f53495687949faddd7666ec4b4206f99b8ec4c04

Fill in frame duration from sample meta

If sample duration is not available, use the average
frame duration of the sequence; if that's not available
default to 30fps.

bug: 120414514
bug: 139815242
test: test some 25fps heif sequence files, the reported
      duration should be 40ms instead of the default 33ms.

Change-Id: I5ddf0a6cbfb44021dee2955badf3f2772586bb1e

media/libheif/HeifDecoderImpl.cpp

diff --git a/media/libheif/HeifDecoderImpl.cpp b/media/libheif/HeifDecoderImpl.cpp
index a7c0f84..bad4210 100644
--- a/media/libheif/HeifDecoderImpl.cpp
+++ b/media/libheif/HeifDecoderImpl.cpp
@@ -44,8 +44,7 @@
     info->mHeight = videoFrame->mHeight;
     info->mRotationAngle = videoFrame->mRotationAngle;
     info->mBytesPerPixel = videoFrame->mBytesPerPixel;
-    // TODO: retrieve per-frame duration from extractor/metadataretriever.
-    info->mDurationUs = 33333;
+    info->mDurationUs = videoFrame->mDurationUs;
     if (videoFrame->mIccSize > 0) {
         info->mIccData.assign(
                 videoFrame->getFlattenedIccData(),