commit e6c0750cd2927967f93a8811954f889d23fadb6e
author Dharmaray Kundargi <dharmaray@google.com> Fri Jan 21 16:58:31 2011 -0800
committer Dharmaray Kundargi <dharmaray@google.com> Wed Jan 26 00:38:02 2011 -0800
tree 6a6c676e385cf6af7c0e0624513323b2fd676d00
parent 2177d443f2d57b9d3045d535d8f2b186e5b76f25

Fix for ISSUE 3370836 - Overlay optmization.

Change-Id: I9c6657f6fdab0fa815201d8b26b8c90700663c12

libvideoeditor/lvpp/VideoEditorPreviewController.h

diff --git a/libvideoeditor/lvpp/VideoEditorPreviewController.h b/libvideoeditor/lvpp/VideoEditorPreviewController.h
index 5828c5f..d2a5645 100755
--- a/libvideoeditor/lvpp/VideoEditorPreviewController.h
+++ b/libvideoeditor/lvpp/VideoEditorPreviewController.h
@@ -53,7 +53,8 @@
 

 

 // Callback mechanism from PreviewController to Jni  */

-typedef void (*jni_progress_callback_fct)(void* cookie, M4OSA_UInt32 msgType, M4OSA_UInt32 argc);

+typedef void (*jni_progress_callback_fct)(void* cookie, M4OSA_UInt32 msgType, void *argc);

+

 

 class VideoEditorPreviewController {

 

@@ -62,26 +63,27 @@
     virtual ~VideoEditorPreviewController();

 

     M4OSA_ERR loadEditSettings(M4VSS3GPP_EditSettings* pSettings,

-     M4xVSS_AudioMixingSettings* bgmSettings);

+        M4xVSS_AudioMixingSettings* bgmSettings);

 

     M4OSA_ERR setSurface(const sp<Surface> &surface);

 

     M4OSA_ERR startPreview(M4OSA_UInt32 fromMS, M4OSA_Int32 toMs,

-     M4OSA_UInt16 callBackAfterFrameCount, M4OSA_Bool loop) ;

+        M4OSA_UInt16 callBackAfterFrameCount, M4OSA_Bool loop) ;

 

     M4OSA_ERR stopPreview();

 

     M4OSA_ERR renderPreviewFrame(const sp<Surface> &surface,

-     VideoEditor_renderPreviewFrameStr* pFrameInfo);

+        VideoEditor_renderPreviewFrameStr* pFrameInfo,

+        VideoEditorCurretEditInfo *pCurrEditInfo);

 

     M4OSA_ERR clearSurface(const sp<Surface> &surface,

      VideoEditor_renderPreviewFrameStr* pFrameInfo);

 

     M4OSA_Void setJniCallback(void* cookie,

-     jni_progress_callback_fct callbackFct);

+        jni_progress_callback_fct callbackFct);

 

     M4OSA_ERR setPreviewFrameRenderingMode(M4xVSS_MediaRendering mode,

-     M4VIDEOEDITING_VideoFrameSize outputVideoSize);

+        M4VIDEOEDITING_VideoFrameSize outputVideoSize);

 

 private:

     sp<VideoEditorPlayer> mVePlayer[NBPLAYER_INSTANCES];