diff options
| author | James Dong <jdong@google.com> | 2012-12-20 14:08:05 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-12-20 14:08:05 -0800 |
| commit | 9c891ca36a7f2acecd70d41ff39a2025048bb0b1 (patch) | |
| tree | d139467a99bacfa604360d4ebb642e342cb10519 /libvideoeditor | |
| parent | 68c3de899f822acf3c735c681d206e852ad3821f (diff) | |
| parent | 2a55b5964c6ae167cc1bc57eca5ca7a1c4aa452c (diff) | |
| download | frameworks_av-9c891ca36a7f2acecd70d41ff39a2025048bb0b1.zip frameworks_av-9c891ca36a7f2acecd70d41ff39a2025048bb0b1.tar.gz frameworks_av-9c891ca36a7f2acecd70d41ff39a2025048bb0b1.tar.bz2 | |
am 2a55b596: Merge "libvideoeditor: fix cannot show some thumbnails in storyboard or no frame display in PreviewRenderer surface after importing video"
* commit '2a55b5964c6ae167cc1bc57eca5ca7a1c4aa452c':
libvideoeditor: fix cannot show some thumbnails in storyboard or no frame display in PreviewRenderer surface after importing video
Diffstat (limited to 'libvideoeditor')
| -rwxr-xr-x | libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp | 6 |
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 */ |