diff options
author | Basavapatna Dattaguru <dattaguru@google.com> | 2011-02-23 20:25:47 -0800 |
---|---|---|
committer | Basavapatna Dattaguru <dattaguru@google.com> | 2011-02-23 20:25:47 -0800 |
commit | d67e9da63323d965760337913f86de28024531a4 (patch) | |
tree | 602acfaeb5a23fd013f7f885b45e9845bd70fc8d /libvideoeditor/vss/src | |
parent | 3b84c8f8ab84915c93e2f6d0b32f2139afd95ed6 (diff) | |
download | frameworks_av-d67e9da63323d965760337913f86de28024531a4.zip frameworks_av-d67e9da63323d965760337913f86de28024531a4.tar.gz frameworks_av-d67e9da63323d965760337913f86de28024531a4.tar.bz2 |
VideoEditor: Issue ID: 3371667: Fix Set1
Change-Id: I728bc27b86e0c8720a2d05e6cff8a76f820bf016
Diffstat (limited to 'libvideoeditor/vss/src')
-rwxr-xr-x | libvideoeditor/vss/src/M4VSS3GPP_EditVideo.c | 4 | ||||
-rwxr-xr-x | libvideoeditor/vss/src/M4VSS3GPP_MediaAndCodecSubscription.c | 2 | ||||
-rwxr-xr-x | libvideoeditor/vss/src/M4xVSS_API.c | 42 | ||||
-rwxr-xr-x | libvideoeditor/vss/src/M4xVSS_internal.c | 6 |
4 files changed, 17 insertions, 37 deletions
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) { |