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

Commit 453ba68c authored by Pawin Vongmasa's avatar Pawin Vongmasa Committed by android-build-merger
Browse files

DO NOT MERGE - Fix build breakage caused by commit 940829f6. 

am: ad929db7

Change-Id: Ib2ef17356334d2340a5aa0250a4b5ffbdd9c4dd0
parents 920b0f78 ad929db7

media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp

+6 −2
Original line number Original line Diff line number Diff line
@@ -27,6 +27,10 @@ 




#include "mp4dec_api.h"

#include "mp4dec_api.h"





#ifndef UINT32_MAX

#define UINT32_MAX (4294967295U)

#endif



namespace android {

namespace android {





static const CodecProfileLevel kM4VProfileLevels[] = {

static const CodecProfileLevel kM4VProfileLevels[] = {
@@ -193,8 +197,8 @@ void SoftMPEG4::onQueueFilled(OMX_U32 portIndex) { 
            OMX_U32 yFrameSize = sizeof(uint8) * mHandle->size;

            OMX_U32 yFrameSize = sizeof(uint8) * mHandle->size;

            if ((outHeader->nAllocLen < yFrameSize) ||

            if ((outHeader->nAllocLen < yFrameSize) ||

                    (outHeader->nAllocLen - yFrameSize < yFrameSize / 2)) {

                    (outHeader->nAllocLen - yFrameSize < yFrameSize / 2)) {

                ALOGE("Too small output buffer for reference frame: %zu bytes",

                ALOGE("Too small output buffer for reference frame: %lu bytes",

                        outHeader->nAllocLen);

                        (unsigned long)outHeader->nAllocLen);

                android_errorWriteLog(0x534e4554, "30033990");

                android_errorWriteLog(0x534e4554, "30033990");

                notify(OMX_EventError, OMX_ErrorUndefined, 0, NULL);

                notify(OMX_EventError, OMX_ErrorUndefined, 0, NULL);

                mSignalledError = true;

                mSignalledError = true;