diff options
| author | Rachad <rachad@google.com> | 2014-02-12 01:40:59 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-02-12 01:40:59 +0000 |
| commit | dc3b8b5ae07a6d7f42822b6215f4090b0ed185d2 (patch) | |
| tree | 300262e5e7b5d614119f9cc33c5f35463d94bd35 /media/libstagefright/MPEG4Writer.cpp | |
| parent | 90bdb98b8f8730074fcead63c33e8c3ce458b632 (diff) | |
| parent | 1f1f2b1678fd0d038dfc501252dd2b65ecf10cae (diff) | |
| download | frameworks_av-dc3b8b5ae07a6d7f42822b6215f4090b0ed185d2.zip frameworks_av-dc3b8b5ae07a6d7f42822b6215f4090b0ed185d2.tar.gz frameworks_av-dc3b8b5ae07a6d7f42822b6215f4090b0ed185d2.tar.bz2 | |
Merge "Increased recorded MP4 max file size to 4GB (more precisely 2^32-1 bytes -- FAT32 max file size)"
Diffstat (limited to 'media/libstagefright/MPEG4Writer.cpp')
| -rw-r--r-- | media/libstagefright/MPEG4Writer.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/media/libstagefright/MPEG4Writer.cpp b/media/libstagefright/MPEG4Writer.cpp index 2e8d6b3..fb316f9 100644 --- a/media/libstagefright/MPEG4Writer.cpp +++ b/media/libstagefright/MPEG4Writer.cpp @@ -44,7 +44,9 @@ namespace android { static const int64_t kMinStreamableFileSizeInBytes = 5 * 1024 * 1024; -static const int64_t kMax32BitFileSize = 0x007fffffffLL; +static const int64_t kMax32BitFileSize = 0x00ffffffffLL; // 2^32-1 : max FAT32 + // filesystem file size + // used by most SD cards static const uint8_t kNalUnitTypeSeqParamSet = 0x07; static const uint8_t kNalUnitTypePicParamSet = 0x08; static const int64_t kInitialDelayTimeUs = 700000LL; @@ -861,11 +863,11 @@ status_t MPEG4Writer::reset() { // Fix up the size of the 'mdat' chunk. if (mUse32BitOffset) { lseek64(mFd, mMdatOffset, SEEK_SET); - int32_t size = htonl(static_cast<int32_t>(mOffset - mMdatOffset)); + uint32_t size = htonl(static_cast<uint32_t>(mOffset - mMdatOffset)); ::write(mFd, &size, 4); } else { lseek64(mFd, mMdatOffset + 8, SEEK_SET); - int64_t size = mOffset - mMdatOffset; + uint64_t size = mOffset - mMdatOffset; size = hton64(size); ::write(mFd, &size, 8); } |