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

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

Merge "When 32-bit offset is used, if the requested max file size is greater... 

Merge "When 32-bit offset is used, if the requested max file size is greater than the 32-bit offset limit, set the limit to the max 32-bit offset limit." into gingerbread
parents ab86b782 a4fb816b

media/libstagefright/MPEG4Writer.cpp

+4 −3
Original line number Diff line number Diff line
@@ -346,9 +346,10 @@ status_t MPEG4Writer::start(MetaData *param) { 
        // If file size is set to be larger than the 32 bit file

        // size limit, treat it as an error.

        if (mMaxFileSizeLimitBytes > kMax32BitFileSize) {

            LOGE("32-bit file size limit too big: %lld bytes",

                mMaxFileSizeLimitBytes);

            return UNKNOWN_ERROR;

            LOGW("32-bi file size limit (%lld bytes) too big. "

                 "It is changed to %lld bytes",

                mMaxFileSizeLimitBytes, kMax32BitFileSize);

            mMaxFileSizeLimitBytes = kMax32BitFileSize;

        }

    }