diff options
author | Nipun Kwatra <nkwatra@google.com> | 2010-08-18 15:19:19 -0700 |
---|---|---|
committer | Nipun Kwatra <nkwatra@google.com> | 2010-08-20 14:06:48 -0700 |
commit | fb45748a1e1d0c4913cec195693c85bfdc45bd26 (patch) | |
tree | cf63ca0b2e196a95e2e59daab2bc4f4a9ad6e370 /media/libmediaplayerservice | |
parent | 4d42ccd1579da53aaaf132a6ad26a06e2baa5b98 (diff) | |
download | frameworks_base-fb45748a1e1d0c4913cec195693c85bfdc45bd26.zip frameworks_base-fb45748a1e1d0c4913cec195693c85bfdc45bd26.tar.gz frameworks_base-fb45748a1e1d0c4913cec195693c85bfdc45bd26.tar.bz2 |
setParamMaxFileDurationUs should allow zero time input as per API of setMaxDuration.
according to MediaRecorder::setMaxDuration documentation we should disable duration limit
when zero or negative time is passed. Currently setParamMaxFileDurationUs was treating
zero/negative as an error case. Fixed that.
Change-Id: I468c3bcc74cb5a34ee3e172cef5147550d6be096
Diffstat (limited to 'media/libmediaplayerservice')
-rw-r--r-- | media/libmediaplayerservice/StagefrightRecorder.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/StagefrightRecorder.cpp b/media/libmediaplayerservice/StagefrightRecorder.cpp index 3c6d01b..796731b 100644 --- a/media/libmediaplayerservice/StagefrightRecorder.cpp +++ b/media/libmediaplayerservice/StagefrightRecorder.cpp @@ -341,10 +341,14 @@ status_t StagefrightRecorder::setParamVideoEncodingBitRate(int32_t bitRate) { status_t StagefrightRecorder::setParamMaxFileDurationUs(int64_t 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); return BAD_VALUE; } + mMaxFileDurationUs = timeUs; return OK; } |