VideoEditor: Issue ID: 3371667: Fix Set1

Change-Id: I728bc27b86e0c8720a2d05e6cff8a76f820bf016

7 files changed, 24 insertions, 44 deletions

diff --git a/libvideoeditor/osal/src/LVOSA_FileReader_optim.c b/libvideoeditor/osal/src/LVOSA_FileReader_optim.c
index 36541f0..4cf5fd8 100755
--- a/libvideoeditor/osal/src/LVOSA_FileReader_optim.c
+++ b/libvideoeditor/osal/src/LVOSA_FileReader_optim.c
@@ -167,7 +167,7 @@ M4OSA_ERR M4OSA_FileReader_BufferInit(M4OSA_FileReader_Context_optim* apContext)
 
     for(i=0; i<M4OSA_READBUFFER_NB; i++)
     {
-        apContext->buffer[i].data = (M4OSA_MemAddr8) M4OSA_malloc(M4OSA_READBUFFER_SIZE, M4OSA_FILE_READER, "M4OSA_FileReader_BufferInit");
+        apContext->buffer[i].data = (M4OSA_MemAddr8) M4OSA_malloc(M4OSA_READBUFFER_SIZE, M4OSA_FILE_READER, (M4OSA_Char *)"M4OSA_FileReader_BufferInit");
         M4ERR_CHECK_NULL_RETURN_VALUE(M4ERR_ALLOC, apContext->buffer[i].data);
     }
 
@@ -545,7 +545,7 @@ M4OSA_ERR M4OSA_FileReader_CalculateSize(M4OSA_FileReader_Context_optim* apConte
 
     /*      Allocate memory for the File reader context. */
     apContext = (M4OSA_FileReader_Context_optim *)M4OSA_malloc(sizeof(M4OSA_FileReader_Context_optim),
-                                      M4OSA_FILE_READER, "M4OSA_FileReader_Context_optim");
+                                      M4OSA_FILE_READER, (M4OSA_Char *)"M4OSA_FileReader_Context_optim");
 
     M4ERR_CHECK_NULL_RETURN_VALUE(M4ERR_ALLOC, apContext);
 
@@ -555,10 +555,10 @@ M4OSA_ERR M4OSA_FileReader_CalculateSize(M4OSA_FileReader_Context_optim* apConte
     /*Set the optimized functions, to be called by the user*/
 
     apContext->FS = (M4OSA_FileReadPointer*) M4OSA_malloc(sizeof(M4OSA_FileReadPointer),
-                                       M4OSA_FILE_READER, "NXPSW_FileReaderOptim_init");
+                                       M4OSA_FILE_READER, (M4OSA_Char *)"M4OSA_FileReaderOptim_init");
     if (M4OSA_NULL==apContext->FS)
     {
-        M4OSA_TRACE1_0("NXPSW_FileReaderOptim_init - ERROR : allocation failed");
+        M4OSA_TRACE1_0("M4OSA_FileReaderOptim_init - ERROR : allocation failed");
         return M4ERR_ALLOC;
     }
     apContext->FS->openRead  = M4OSA_fileReadOpen;
@@ -567,7 +567,7 @@ M4OSA_ERR M4OSA_FileReader_CalculateSize(M4OSA_FileReader_Context_optim* apConte
     apContext->FS->closeRead = M4OSA_fileReadClose;
     apContext->FS->setOption = M4OSA_fileReadSetOption;
     apContext->FS->getOption = M4OSA_fileReadGetOption;
-   #else
+#else
     apContext->FS = FS;
 #endif
 
diff --git a/libvideoeditor/osal/src/M4OSA_FileCache.c b/libvideoeditor/osal/src/M4OSA_FileCache.c
index a804123..0f66f96 100755
--- a/libvideoeditor/osal/src/M4OSA_FileCache.c
+++ b/libvideoeditor/osal/src/M4OSA_FileCache.c
@@ -431,7 +431,7 @@ M4OSA_Void M4OSA_FileCache_QS_quickSort64 (M4OSA_Time array[], M4OSA_UInt32 size
         return;
     }
 
-    M4OSA_FileCache_internalQuicksort64(array,0,size-1);
+    M4OSA_FileCache_internalQuicksort64((M4OSA_Int64 * const)array, 0, size-1);
 }
 
 /* __________________________________________________________ */
diff --git a/libvideoeditor/osal/src/M4OSA_FileCommon.c b/libvideoeditor/osal/src/M4OSA_FileCommon.c
index 52fe781..d80d8cc 100755
--- a/libvideoeditor/osal/src/M4OSA_FileCommon.c
+++ b/libvideoeditor/osal/src/M4OSA_FileCommon.c
@@ -25,7 +25,7 @@
 
 #ifndef USE_STAGEFRIGHT_CODECS
 #error "USE_STAGEFRIGHT_CODECS is not defined"
-#endif USE_STAGEFRIGHT_CODECS
+#endif /*USE_STAGEFRIGHT_CODECS*/
 
 #ifdef UTF_CONVERSION
 #include <string.h>
diff --git a/libvideoeditor/vss/src/M4VSS3GPP_EditVideo.c b/libvideoeditor/vss/src/M4VSS3GPP_EditVideo.c
index d15707c..fdc919a 100755
--- a/libvideoeditor/vss/src/M4VSS3GPP_EditVideo.c
+++ b/libvideoeditor/vss/src/M4VSS3GPP_EditVideo.c
@@ -2015,9 +2015,9 @@ M4VSS3GPP_intCheckVideoEffects( M4VSS3GPP_InternalEditContext *pC,
             else
             {
                 /**< Are we into the effect duration? */
-                if ( (t + pC->pTransitionList[uiClipIndex].uiTransitionDuration
+                if ( ((M4OSA_Int32)(t + pC->pTransitionList[uiClipIndex].uiTransitionDuration)
                     >= (M4OSA_Int32)(pFx->uiStartTime))
-                    && (t + pC->pTransitionList[uiClipIndex].uiTransitionDuration
+                    && ( (M4OSA_Int32)(t + pC->pTransitionList[uiClipIndex].uiTransitionDuration)
                     <= (M4OSA_Int32)(pFx->uiStartTime + pFx->uiDuration)) ) {
                     /**
                      * Set the active effect(s) */
diff --git a/libvideoeditor/vss/src/M4VSS3GPP_MediaAndCodecSubscription.c b/libvideoeditor/vss/src/M4VSS3GPP_MediaAndCodecSubscription.c
index f7226a3..df14a54 100755
--- a/libvideoeditor/vss/src/M4VSS3GPP_MediaAndCodecSubscription.c
+++ b/libvideoeditor/vss/src/M4VSS3GPP_MediaAndCodecSubscription.c
@@ -305,7 +305,7 @@ M4OSA_ERR M4VSS3GPP_subscribeMediaAndCodec(M4VSS3GPP_MediaAndCodecCtxt *pContext
     err = M4VSS3GPP_registerAudioDecoder( pContext, audioDecoderType, pAudioDecoderInterface);
     M4OSA_DEBUG_IF1((err != M4NO_ERROR), err,
         "M4VSS3GPP_subscribeMediaAndCodec: can't register MP3 decoder");
-#endif  /* M4VSS_SUPPORT_AUDEC_MP3 */`
+#endif  /* M4VSS_SUPPORT_AUDEC_MP3 */
 
 
     /* --- NULL --- */
diff --git a/libvideoeditor/vss/src/M4xVSS_API.c b/libvideoeditor/vss/src/M4xVSS_API.c
index 42c24ed..84fb0cd 100755
--- a/libvideoeditor/vss/src/M4xVSS_API.c
+++ b/libvideoeditor/vss/src/M4xVSS_API.c
@@ -2459,22 +2459,14 @@ replaceJPG_3GP:
                             <= 0 || xVSS_context->pSettings->pClipList[i]->xVSS.
                             PanZoomTopleftXa > 1000
                             || xVSS_context->pSettings->pClipList[i]->xVSS.
-                            PanZoomTopleftXa < 0
-                            || xVSS_context->pSettings->pClipList[i]->xVSS.
                             PanZoomTopleftYa > 1000
-                            || xVSS_context->pSettings->pClipList[i]->xVSS.
-                            PanZoomTopleftYa < 0
                             || xVSS_context->pSettings->pClipList[i]->xVSS.PanZoomXb
                             > 1000
                             || xVSS_context->pSettings->pClipList[i]->xVSS.PanZoomXb
                             <= 0 || xVSS_context->pSettings->pClipList[i]->xVSS.
                             PanZoomTopleftXb > 1000
                             || xVSS_context->pSettings->pClipList[i]->xVSS.
-                            PanZoomTopleftXb < 0
-                            || xVSS_context->pSettings->pClipList[i]->xVSS.
-                            PanZoomTopleftYb > 1000
-                            || xVSS_context->pSettings->pClipList[i]->xVSS.
-                            PanZoomTopleftYb < 0 )
+                            PanZoomTopleftYb > 1000)
                         {
                             M4OSA_TRACE1_0("Allocation error in M4xVSS_SendCommand");
                             M4xVSS_freeCommand(xVSS_context);
@@ -3689,32 +3681,27 @@ replace3GP_3GP:
 
             /*Alpha blending*/
             /*Check if the alpha blending parameters are corrects*/
-            if( pSettings->Effects[j].xVSS.uialphaBlendingFadeInTime < 0
-                || pSettings->Effects[j].xVSS.uialphaBlendingFadeInTime > 100 )
+            if( pSettings->Effects[j].xVSS.uialphaBlendingFadeInTime > 100 )
             {
                 pSettings->Effects[j].xVSS.uialphaBlendingFadeInTime = 0;
             }
 
-            if( pSettings->Effects[j].xVSS.uialphaBlendingFadeOutTime < 0
-                || pSettings->Effects[j].xVSS.uialphaBlendingFadeOutTime > 100 )
+            if( pSettings->Effects[j].xVSS.uialphaBlendingFadeOutTime > 100 )
             {
                 pSettings->Effects[j].xVSS.uialphaBlendingFadeOutTime = 0;
             }
 
-            if( pSettings->Effects[j].xVSS.uialphaBlendingEnd < 0
-                || pSettings->Effects[j].xVSS.uialphaBlendingEnd > 100 )
+            if( pSettings->Effects[j].xVSS.uialphaBlendingEnd > 100 )
             {
                 pSettings->Effects[j].xVSS.uialphaBlendingEnd = 100;
             }
 
-            if( pSettings->Effects[j].xVSS.uialphaBlendingMiddle < 0
-                || pSettings->Effects[j].xVSS.uialphaBlendingMiddle > 100 )
+            if( pSettings->Effects[j].xVSS.uialphaBlendingMiddle > 100 )
             {
                 pSettings->Effects[j].xVSS.uialphaBlendingMiddle = 100;
             }
 
-            if( pSettings->Effects[j].xVSS.uialphaBlendingStart < 0
-                || pSettings->Effects[j].xVSS.uialphaBlendingStart > 100 )
+            if( pSettings->Effects[j].xVSS.uialphaBlendingStart > 100 )
             {
                 pSettings->Effects[j].xVSS.uialphaBlendingStart = 100;
             }
@@ -4088,34 +4075,27 @@ replace3GP_3GP:
 
                 /*Alpha blending*/
                 /*Check if the alpha blending parameters are corrects*/
-                if( pSettings->Effects[j].xVSS.uialphaBlendingFadeInTime < 0
-                    || pSettings->Effects[j].xVSS.uialphaBlendingFadeInTime
-                > 100 )
+                if( pSettings->Effects[j].xVSS.uialphaBlendingFadeInTime > 100 )
                 {
                     pSettings->Effects[j].xVSS.uialphaBlendingFadeInTime = 0;
                 }
 
-                if( pSettings->Effects[j].xVSS.uialphaBlendingFadeOutTime < 0
-                    || pSettings->Effects[j].xVSS.uialphaBlendingFadeOutTime
-                > 100 )
+                if( pSettings->Effects[j].xVSS.uialphaBlendingFadeOutTime > 100 )
                 {
                     pSettings->Effects[j].xVSS.uialphaBlendingFadeOutTime = 0;
                 }
 
-                if( pSettings->Effects[j].xVSS.uialphaBlendingEnd < 0
-                    || pSettings->Effects[j].xVSS.uialphaBlendingEnd > 100 )
+                if( pSettings->Effects[j].xVSS.uialphaBlendingEnd > 100 )
                 {
                     pSettings->Effects[j].xVSS.uialphaBlendingEnd = 100;
                 }
 
-                if( pSettings->Effects[j].xVSS.uialphaBlendingMiddle < 0
-                    || pSettings->Effects[j].xVSS.uialphaBlendingMiddle > 100 )
+                if( pSettings->Effects[j].xVSS.uialphaBlendingMiddle > 100 )
                 {
                     pSettings->Effects[j].xVSS.uialphaBlendingMiddle = 100;
                 }
 
-                if( pSettings->Effects[j].xVSS.uialphaBlendingStart < 0
-                    || pSettings->Effects[j].xVSS.uialphaBlendingStart > 100 )
+                if( pSettings->Effects[j].xVSS.uialphaBlendingStart > 100 )
                 {
                     pSettings->Effects[j].xVSS.uialphaBlendingStart = 100;
                 }
diff --git a/libvideoeditor/vss/src/M4xVSS_internal.c b/libvideoeditor/vss/src/M4xVSS_internal.c
index 192e1ba..f32257a 100755
--- a/libvideoeditor/vss/src/M4xVSS_internal.c
+++ b/libvideoeditor/vss/src/M4xVSS_internal.c
@@ -2157,7 +2157,7 @@ M4OSA_ERR M4xVSS_internalConvertARGB888toYUV420_FrammingEffect(M4OSA_Context pCo
         {
             M4OSA_TRACE1_0("Allocation error in \
                 M4xVSS_internalConvertARGB888toYUV420_FrammingEffect");
-            M4OSA_free((M4OSA_MemAddr8)rgbPlane.pac_data);
+            M4OSA_free((M4OSA_MemAddr32)rgbPlane.pac_data);
             return M4ERR_ALLOC;
         }
 
@@ -2176,7 +2176,7 @@ M4OSA_ERR M4xVSS_internalConvertARGB888toYUV420_FrammingEffect(M4OSA_Context pCo
 
             input_pac_data += ((rgbPlane.u_width-1)*2);
         }
-        M4OSA_free((M4OSA_MemAddr8)rgbPlane.pac_data);
+        M4OSA_free((M4OSA_MemAddr32)rgbPlane.pac_data);
         rgbPlane.pac_data = newRGBpac_data;
     }
 
@@ -4124,7 +4124,7 @@ M4OSA_ERR M4VSS3GPP_externalVideoEffectFraming( M4OSA_Void *userData,
 
                 if(alphaBlendingStruct != M4OSA_NULL)
                 {
-                    if(pProgress->uiProgress >= 0 && pProgress->uiProgress \
+                    if(pProgress->uiProgress \
                     < (M4OSA_UInt32)(alphaBlendingStruct->m_fadeInTime*10))
                     {
                         if(alphaBlendingStruct->m_fadeInTime == 0) {