Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 524f4386 authored by James Dong's avatar James Dong Committed by Android (Google) Code Review
Browse files

Merge "Fixed a video editor crash due to "divided by 0""

parents a01992a0 53f69c19

libvideoeditor/vss/stagefrightshells/src/VideoEditor3gpReader.cpp

+8 −4
Original line number Diff line number Diff line
@@ -1483,11 +1483,15 @@ M4OSA_ERR VideoEditor3gpReader_getNextStreamHandler(M4OSA_Context context, 
                    (int32_t*)&(pVideoStreamHandler->m_videoHeight));



                (*pStreamHandler)  = (M4_StreamHandler*)(pVideoStreamHandler);

                meta->findInt64(kKeyDuration,

                    (int64_t*)&(Duration));

                ((*pStreamHandler)->m_duration) =

                    (int32_t)((Duration)/1000); // conversion to mS

                meta->findInt64(kKeyDuration, (int64_t*)&(Duration));

                ((*pStreamHandler)->m_duration) = (int32_t)((Duration)/1000); // conversion to mS

                pC->mMaxDuration = ((*pStreamHandler)->m_duration);

                if (pC->mMaxDuration == 0) {

                    ALOGE("Video is too short: %lld Us", Duration);

                    delete pVideoStreamHandler;

                    pVideoStreamHandler = NULL;

                    return M4ERR_PARAMETER;

                }

                ALOGV("VideoEditor3gpReader_getNextStreamHandler m_duration %d",

                    (*pStreamHandler)->m_duration);