diff options
| author | Santosh Madhava <smadhava@google.com> | 2011-02-17 19:09:39 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-02-17 19:09:39 -0800 |
| commit | 7e006bd24cccffb9c9fd48fd3b2709b6639bc5f1 (patch) | |
| tree | cf3c922e29f8df4c21e816ac1d3b5a240ac6f56f /libvideoeditor/lvpp/VideoEditorPreviewController.h | |
| parent | f84f29a3b43d903989f10288bfd3934d446228b3 (diff) | |
| parent | b2d6e0f74a12e5cce5b429e646172c63346346c3 (diff) | |
| download | frameworks_av-7e006bd24cccffb9c9fd48fd3b2709b6639bc5f1.zip frameworks_av-7e006bd24cccffb9c9fd48fd3b2709b6639bc5f1.tar.gz frameworks_av-7e006bd24cccffb9c9fd48fd3b2709b6639bc5f1.tar.bz2 | |
Merge "Fix for issue 3439595 : Movie studio playback previous frames"
Diffstat (limited to 'libvideoeditor/lvpp/VideoEditorPreviewController.h')
| -rwxr-xr-x | libvideoeditor/lvpp/VideoEditorPreviewController.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libvideoeditor/lvpp/VideoEditorPreviewController.h b/libvideoeditor/lvpp/VideoEditorPreviewController.h index be40c7c..216b077 100755 --- a/libvideoeditor/lvpp/VideoEditorPreviewController.h +++ b/libvideoeditor/lvpp/VideoEditorPreviewController.h @@ -74,7 +74,7 @@ public: M4OSA_ERR startPreview(M4OSA_UInt32 fromMS, M4OSA_Int32 toMs,
M4OSA_UInt16 callBackAfterFrameCount, M4OSA_Bool loop) ;
- M4OSA_ERR stopPreview();
+ M4OSA_UInt32 stopPreview();
M4OSA_ERR renderPreviewFrame(const sp<Surface> &surface,
VideoEditor_renderPreviewFrameStr* pFrameInfo,
@@ -122,6 +122,7 @@ private: M4OSA_UInt32 mLastPreviewClipEndTime;
M4OSA_UInt32 mVideoStoryBoardTimeMsUptoFirstPreviewClip;
OverlayState mOverlayState;
+ int mActivePlayerIndex;
M4xVSS_MediaRendering mRenderingMode;
uint32_t mOutputVideoWidth;
|