summaryrefslogtreecommitdiffstats
path: root/libvideoeditor
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2012-12-20 14:10:26 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-12-20 14:10:26 -0800
commitdf84d70d1da102995a5f1591c4af7c1807e4acd8 (patch)
treef080e9fc4cce89cbf755ff68efdcc3dc5479df4f /libvideoeditor
parente21c339f8aea46f6d406ccff61828e26b1689435 (diff)
parent9c891ca36a7f2acecd70d41ff39a2025048bb0b1 (diff)
downloadframeworks_av-df84d70d1da102995a5f1591c4af7c1807e4acd8.zip
frameworks_av-df84d70d1da102995a5f1591c4af7c1807e4acd8.tar.gz
frameworks_av-df84d70d1da102995a5f1591c4af7c1807e4acd8.tar.bz2
am 9c891ca3: am 2a55b596: Merge "libvideoeditor: fix cannot show some thumbnails in storyboard or no frame display in PreviewRenderer surface after importing video"
* commit '9c891ca36a7f2acecd70d41ff39a2025048bb0b1': libvideoeditor: fix cannot show some thumbnails in storyboard or no frame display in PreviewRenderer surface after importing video
Diffstat (limited to 'libvideoeditor')
-rwxr-xr-xlibvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp b/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp
index 21d3c30..de91731 100755
--- a/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp
+++ b/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp
@@ -1149,6 +1149,12 @@ M4OSA_ERR VideoEditorVideoSoftwareDecoder_create(M4OSA_Context *pContext,
pDecShellContext->mLastOutputCts = -1;
pDecShellContext->m_pDecBufferPool = M4OSA_NULL;
+ // Calculate the interval between two video frames.
+ if(pDecShellContext->m_pVideoStreamhandler->m_averageFrameRate > 0){
+ pDecShellContext->mFrameIntervalMs =
+ 1000.0 / pDecShellContext->m_pVideoStreamhandler->m_averageFrameRate;
+ }
+
/**
* StageFright graph building
*/