Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixed an issue where the reserved free space in the file writer was larger than intended" into gingerbread

Browse Source
This commit is contained in:
James Dong
2010-10-04 18:37:48 -07:00
committed by Android (Google) Code Review
parent 15f107b151 6a9e39ac55
commit 6f1c7bda39
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/media/stagefright/MPEG4Writer.h
View File

@@ -64,6 +64,7 @@ private:
FILE *mFile; FILE *mFile;
bool mUse4ByteNalLength; bool mUse4ByteNalLength;
bool mUse32BitOffset; bool mUse32BitOffset;
bool mIsFileSizeLimitExplicitlyRequested;
bool mPaused; bool mPaused;
bool mStarted; bool mStarted;
off_t mOffset; off_t mOffset;

16
media/libstagefright/MPEG4Writer.cpp
View File

@@ -212,6 +212,7 @@ MPEG4Writer::MPEG4Writer(const char *filename)
: mFile(fopen(filename, "wb")), : mFile(fopen(filename, "wb")),
mUse4ByteNalLength(true), mUse4ByteNalLength(true),
mUse32BitOffset(true), mUse32BitOffset(true),
mIsFileSizeLimitExplicitlyRequested(false),
mPaused(false), mPaused(false),
mStarted(false), mStarted(false),
mOffset(0), mOffset(0),
@@ -225,6 +226,7 @@ MPEG4Writer::MPEG4Writer(int fd)
: mFile(fdopen(fd, "wb")), : mFile(fdopen(fd, "wb")),
mUse4ByteNalLength(true), mUse4ByteNalLength(true),
mUse32BitOffset(true), mUse32BitOffset(true),
mIsFileSizeLimitExplicitlyRequested(false),
mPaused(false), mPaused(false),
mStarted(false), mStarted(false),
mOffset(0), mOffset(0),
@@ -322,7 +324,7 @@ int64_t MPEG4Writer::estimateMoovBoxSize(int32_t bitRate) {
static const int64_t MAX_MOOV_BOX_SIZE = (180 * 3000000 * 6LL / 8000); static const int64_t MAX_MOOV_BOX_SIZE = (180 * 3000000 * 6LL / 8000);
int64_t size = MIN_MOOV_BOX_SIZE; int64_t size = MIN_MOOV_BOX_SIZE;
if (mMaxFileSizeLimitBytes != 0) { if (mMaxFileSizeLimitBytes != 0 && mIsFileSizeLimitExplicitlyRequested) {
size = mMaxFileSizeLimitBytes * 4 / 1000; size = mMaxFileSizeLimitBytes * 4 / 1000;
} else if (mMaxFileDurationLimitUs != 0) { } else if (mMaxFileDurationLimitUs != 0) {
if (bitRate <= 0) { if (bitRate <= 0) {
@@ -342,7 +344,7 @@ int64_t MPEG4Writer::estimateMoovBoxSize(int32_t bitRate) {
size = MAX_MOOV_BOX_SIZE; size = MAX_MOOV_BOX_SIZE;
} }
LOGV("limits: %lld/%lld bytes/us, bit rate: %d bps and the estimated" LOGI("limits: %lld/%lld bytes/us, bit rate: %d bps and the estimated"
" moov size %lld bytes", " moov size %lld bytes",
mMaxFileSizeLimitBytes, mMaxFileDurationLimitUs, bitRate, size); mMaxFileSizeLimitBytes, mMaxFileDurationLimitUs, bitRate, size);
return factor * size; return factor * size;
@@ -353,6 +355,16 @@ status_t MPEG4Writer::start(MetaData *param) {
return UNKNOWN_ERROR; return UNKNOWN_ERROR;
} }
/*
* Check mMaxFileSizeLimitBytes at the beginning
* since mMaxFileSizeLimitBytes may be implicitly
* changed later for 32-bit file offset even if
* user does not ask to set it explicitly.
*/
if (mMaxFileSizeLimitBytes != 0) {
mIsFileSizeLimitExplicitlyRequested = true;
}
int32_t use64BitOffset; int32_t use64BitOffset;
if (param && if (param &&
param->findInt32(kKey64BitFileOffset, &use64BitOffset) && param->findInt32(kKey64BitFileOffset, &use64BitOffset) &&