summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice
diff options
context:
space:
mode:
authorNipun Kwatra <nkwatra@google.com>2010-08-18 15:19:19 -0700
committerNipun Kwatra <nkwatra@google.com>2010-08-20 14:06:48 -0700
commitbe6fd201b9a04fe0f8fd409f10595ddb41832591 (patch)
treed2f5b13ca7fde33c24c488d195fa2483c4d5a271 /media/libmediaplayerservice
parent3eb2ff224a12b5670f4f62f07a47ffb2fde01548 (diff)
downloadframeworks_av-be6fd201b9a04fe0f8fd409f10595ddb41832591.zip
frameworks_av-be6fd201b9a04fe0f8fd409f10595ddb41832591.tar.gz
frameworks_av-be6fd201b9a04fe0f8fd409f10595ddb41832591.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.cpp6
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;
}