Skip to content
This repository has been archived by the owner on Nov 3, 2021. It is now read-only.

Commit

Permalink
Revert "Fix ANR in com.google.android.videoeditor"
Browse files Browse the repository at this point in the history 
This reverts commit 75b8e0d.

Bug: 5771270
Change-Id: I895db4c1677de8c1d41493449e59f1c8975fa419
  • Loading branch information
Jamie Gennis authored and The Android Automerger committed Dec 16, 2011
1 parent c0b824d commit c932ac3
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
3 changes: 1 addition & 2 deletions sec_mm/sec_omx/sec_omx_component/video/dec/h264dec/SEC_OMX_H264dec.c
View file
Expand Up @@ -1035,7 +1035,7 @@ OMX_ERRORTYPE SEC_MFC_H264_Decode(OMX_COMPONENTTYPE *pOMXComponent, SEC_OMX_DATA
if ((SsbSipMfcDecGetConfig(pH264Dec->hMFCH264Handle.hMFCHandle, MFC_DEC_GETCONF_FRAME_TAG, &indexTimestamp) != MFC_RET_OK) || if ((SsbSipMfcDecGetConfig(pH264Dec->hMFCH264Handle.hMFCHandle, MFC_DEC_GETCONF_FRAME_TAG, &indexTimestamp) != MFC_RET_OK) ||
(((indexTimestamp < 0) || (indexTimestamp >= MAX_TIMESTAMP)))) { (((indexTimestamp < 0) || (indexTimestamp >= MAX_TIMESTAMP)))) {
pOutputData->timeStamp = pInputData->timeStamp; pOutputData->timeStamp = pInputData->timeStamp;
pOutputData->nFlags = (pInputData->nFlags & (~OMX_BUFFERFLAG_EOS)); pOutputData->nFlags = pInputData->nFlags;
} else { } else {
pOutputData->timeStamp = pSECComponent->timeStamp[indexTimestamp]; pOutputData->timeStamp = pSECComponent->timeStamp[indexTimestamp];
pOutputData->nFlags = pSECComponent->nFlags[indexTimestamp]; pOutputData->nFlags = pSECComponent->nFlags[indexTimestamp];
Expand Down Expand Up @@ -1093,7 +1093,6 @@ OMX_ERRORTYPE SEC_MFC_H264_Decode(OMX_COMPONENTTYPE *pOMXComponent, SEC_OMX_DATA
} }
if ((pH264Dec->bFirstFrame == OMX_TRUE) && if ((pH264Dec->bFirstFrame == OMX_TRUE) &&
((pOutputData->nFlags & OMX_BUFFERFLAG_EOS) == OMX_BUFFERFLAG_EOS)) { ((pOutputData->nFlags & OMX_BUFFERFLAG_EOS) == OMX_BUFFERFLAG_EOS)) {
pInputData->nFlags = (pInputData->nFlags | OMX_BUFFERFLAG_EOS);
pOutputData->nFlags = (pOutputData->nFlags & (~OMX_BUFFERFLAG_EOS)); pOutputData->nFlags = (pOutputData->nFlags & (~OMX_BUFFERFLAG_EOS));
} }


Expand Down
3 changes: 1 addition & 2 deletions sec_mm/sec_omx/sec_omx_component/video/dec/mpeg4dec/SEC_OMX_Mpeg4dec.c
View file
Expand Up @@ -1180,7 +1180,7 @@ OMX_ERRORTYPE SEC_MFC_Mpeg4_Decode(OMX_COMPONENTTYPE *pOMXComponent, SEC_OMX_DAT
if ((SsbSipMfcDecGetConfig(hMFCHandle, MFC_DEC_GETCONF_FRAME_TAG, &indexTimestamp) != MFC_RET_OK) || if ((SsbSipMfcDecGetConfig(hMFCHandle, MFC_DEC_GETCONF_FRAME_TAG, &indexTimestamp) != MFC_RET_OK) ||
(((indexTimestamp < 0) || (indexTimestamp >= MAX_TIMESTAMP)))) { (((indexTimestamp < 0) || (indexTimestamp >= MAX_TIMESTAMP)))) {
pOutputData->timeStamp = pInputData->timeStamp; pOutputData->timeStamp = pInputData->timeStamp;
pOutputData->nFlags = (pInputData->nFlags & (~OMX_BUFFERFLAG_EOS)); pOutputData->nFlags = pInputData->nFlags;
} else { } else {
pOutputData->timeStamp = pSECComponent->timeStamp[indexTimestamp]; pOutputData->timeStamp = pSECComponent->timeStamp[indexTimestamp];
pOutputData->nFlags = pSECComponent->nFlags[indexTimestamp]; pOutputData->nFlags = pSECComponent->nFlags[indexTimestamp];
Expand Down Expand Up @@ -1238,7 +1238,6 @@ OMX_ERRORTYPE SEC_MFC_Mpeg4_Decode(OMX_COMPONENTTYPE *pOMXComponent, SEC_OMX_DAT
} }
if ((pMpeg4Dec->bFirstFrame == OMX_TRUE) && if ((pMpeg4Dec->bFirstFrame == OMX_TRUE) &&
((pOutputData->nFlags & OMX_BUFFERFLAG_EOS) == OMX_BUFFERFLAG_EOS)) { ((pOutputData->nFlags & OMX_BUFFERFLAG_EOS) == OMX_BUFFERFLAG_EOS)) {
pInputData->nFlags = (pInputData->nFlags | OMX_BUFFERFLAG_EOS);
pOutputData->nFlags = (pOutputData->nFlags & (~OMX_BUFFERFLAG_EOS)); pOutputData->nFlags = (pOutputData->nFlags & (~OMX_BUFFERFLAG_EOS));
} }


Expand Down

0 comments on commit c932ac3

Please sign in to comment.