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

Merge "setParamMaxFileDurationUs should allow zero time input as per API of setMaxDuration." into gingerbread

Browse Source
This commit is contained in:
Nipun Kwatra
2010-08-20 14:16:08 -07:00
committed by Android (Google) Code Review
parent 325192593b fb45748a1e
commit 300b0b7e2b
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
media/libmediaplayerservice/StagefrightRecorder.cpp
View File

@@ -341,10 +341,14 @@ status_t StagefrightRecorder::setParamVideoEncodingBitRate(int32_t bitRate) {
status_t StagefrightRecorder::setParamMaxFileDurationUs(int64_t timeUs) { status_t StagefrightRecorder::setParamMaxFileDurationUs(int64_t timeUs) {
LOGV("setParamMaxFileDurationUs: %lld us", timeUs); LOGV("setParamMaxFileDurationUs: %lld us", timeUs);
if (timeUs <= 100000LL) { // XXX: 100 milli-seconds if (timeUs <= 0) {
LOGW("Max file duration is not positive: %lld us. Disabling duration limit.", timeUs);
timeUs = 0; // Disable the duration limit for zero or negative values.
} else if (timeUs <= 100000LL) { // XXX: 100 milli-seconds
LOGE("Max file duration is too short: %lld us", timeUs); LOGE("Max file duration is too short: %lld us", timeUs);
return BAD_VALUE; return BAD_VALUE;
} }
mMaxFileDurationUs = timeUs; mMaxFileDurationUs = timeUs;
return OK; return OK;
} }