diff options
Diffstat (limited to 'media/jni')
| -rw-r--r-- | media/jni/mediaeditor/VideoEditorMain.cpp | 25 | ||||
| -rw-r--r-- | media/jni/mediaeditor/VideoEditorPropertiesMain.cpp | 10 |
2 files changed, 1 insertions, 34 deletions
diff --git a/media/jni/mediaeditor/VideoEditorMain.cpp b/media/jni/mediaeditor/VideoEditorMain.cpp index 058012b..c0f6a95 100644 --- a/media/jni/mediaeditor/VideoEditorMain.cpp +++ b/media/jni/mediaeditor/VideoEditorMain.cpp @@ -24,7 +24,6 @@ #include <VideoEditorJava.h> #include <VideoEditorOsal.h> #include <VideoEditorLogging.h> -#include <marker.h> #include <VideoEditorClasses.h> #include <VideoEditorThumbnailMain.h> #include <M4OSA_Debug.h> @@ -438,7 +437,7 @@ static void jniPreviewProgressCallback (void* cookie, M4OSA_UInt32 msgType, M4VS, (M4OSA_Char*)"videoEdito JNI overlayFile"); if (pContext->mOverlayFileName != NULL) { strncpy (pContext->mOverlayFileName, - (const char*)pContext->pEditSettings->\ + (const char*)pContext->pEditSettings-> Effects[overlayEffectIndex].xVSS.pFramingFilePath, overlayFileNameLen); //Change the name to png file extPos = strstr(pContext->mOverlayFileName, ".rgb"); @@ -1560,9 +1559,6 @@ videoEditor_populateSettings( int *pOverlayIndex = M4OSA_NULL; M4OSA_Char* pTempChar = M4OSA_NULL; - // Add a code marker (the condition must always be true). - ADD_CODE_MARKER_FUN(NULL != pEnv) - // Validate the settings parameter. videoEditJava_checkAndThrowIllegalArgumentException(&needToBeLoaded, pEnv, (NULL == settings), @@ -2196,10 +2192,6 @@ static jint videoEditor_getPixels( M4OSA_Context mContext = M4OSA_NULL; jint* m_dst32 = M4OSA_NULL; - - // Add a text marker (the condition must always be true). - ADD_TEXT_MARKER_FUN(NULL != env) - const char *pString = env->GetStringUTFChars(path, NULL); if (pString == M4OSA_NULL) { if (env != NULL) { @@ -2537,9 +2529,6 @@ videoEditor_init( VIDEOEDIT_LOG_API(ANDROID_LOG_INFO, "VIDEO_EDITOR", "videoEditor_init()"); - // Add a text marker (the condition must always be true). - ADD_TEXT_MARKER_FUN(NULL != pEnv) - // Get the context. pContext = (ManualEditContext*)videoEditClasses_getContext(&initialized, pEnv, thiz); @@ -2948,9 +2937,6 @@ videoEditor_loadSettings( VIDEOEDIT_LOG_API(ANDROID_LOG_INFO, "VIDEO_EDITOR", "videoEditor_loadSettings()"); - // Add a code marker (the condition must always be true). - ADD_CODE_MARKER_FUN(NULL != pEnv) - // Get the context. pContext = (ManualEditContext*)videoEditClasses_getContext(&needToBeLoaded, pEnv, thiz); @@ -3123,9 +3109,6 @@ videoEditor_release( VIDEOEDIT_LOG_API(ANDROID_LOG_INFO, "VIDEO_EDITOR", "videoEditor_release()"); - // Add a text marker (the condition must always be true). - ADD_TEXT_MARKER_FUN(NULL != pEnv) - // Get the context. pContext = (ManualEditContext*)videoEditClasses_getContext(&released, pEnv, thiz); @@ -3633,15 +3616,9 @@ jint JNI_OnLoad( VIDEOEDIT_LOG_FUNCTION(ANDROID_LOG_INFO, "VIDEO_EDITOR", "JNI_OnLoad()"); - // Add a text marker (the condition must always be true). - ADD_TEXT_MARKER_FUN(NULL != pVm) - // Check the JNI version. if (pVm->GetEnv(&pEnv, JNI_VERSION_1_4) == JNI_OK) { - // Add a code marker (the condition must always be true). - ADD_CODE_MARKER_FUN(NULL != pEnv) - // Register the manual edit JNI methods. if (videoEditor_registerManualEditMethods((JNIEnv*)pEnv) == 0) { diff --git a/media/jni/mediaeditor/VideoEditorPropertiesMain.cpp b/media/jni/mediaeditor/VideoEditorPropertiesMain.cpp index 2f8e357..ae1a80e 100644 --- a/media/jni/mediaeditor/VideoEditorPropertiesMain.cpp +++ b/media/jni/mediaeditor/VideoEditorPropertiesMain.cpp @@ -26,7 +26,6 @@ #include <VideoEditorOsal.h> #include <VideoEditorLogging.h> #include <VideoEditorOsal.h> -#include <marker.h> extern "C" { #include <M4OSA_Clock.h> @@ -107,9 +106,6 @@ jobject videoEditProp_getProperties( ANDROID_LOG_INFO, "VIDEO_EDITOR_PROPERTIES", "videoEditProp_getProperties()"); - // Add a text marker (the condition must always be true). - ADD_TEXT_MARKER_FUN(NULL != pEnv) - // Initialize the classes. videoEditPropClass_init(&initialized, (JNIEnv*)pEnv); @@ -192,9 +188,6 @@ jobject videoEditProp_getProperties( // dereferencing of pClipProperties). if (gotten) { - // Add a code marker (the condition must always be true). - ADD_CODE_MARKER_FUN(NULL != pClipProperties) - // Log the API call. VIDEOEDIT_LOG_API( ANDROID_LOG_INFO, "VIDEO_EDITOR_PROPERTIES", @@ -316,9 +309,6 @@ jobject videoEditProp_getProperties( videoEditOsal_free(pFile); pFile = M4OSA_NULL; - // Add a text marker (the condition must always be true). - ADD_TEXT_MARKER_FUN(NULL != pEnv) - // Return the Properties object. return(properties); } |