summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2010-09-08 15:13:36 -0700
committerJames Dong <jdong@google.com>2010-09-08 17:56:11 -0700
commita4fb816bd59a452445114e065874d7004bdc6b0f (patch)
tree2b605a65e101f19d45cd5be6df495f15236df64f /media
parent468394fc6d1cb0c9078c2f98aa056860f7e0d743 (diff)
downloadframeworks_base-a4fb816bd59a452445114e065874d7004bdc6b0f.zip
frameworks_base-a4fb816bd59a452445114e065874d7004bdc6b0f.tar.gz
frameworks_base-a4fb816bd59a452445114e065874d7004bdc6b0f.tar.bz2
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. Change-Id: Ie74cbed98469721d4280a0b87491e888948f0046
Diffstat (limited to 'media')
-rw-r--r--media/libstagefright/MPEG4Writer.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/media/libstagefright/MPEG4Writer.cpp b/media/libstagefright/MPEG4Writer.cpp
index 806836d..de4233d 100644
--- a/media/libstagefright/MPEG4Writer.cpp
+++ b/media/libstagefright/MPEG4Writer.cpp
@@ -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;
}
}