summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2010-07-30 14:28:26 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-07-30 14:28:26 -0700
commit489d78dcde35ef7ecaed5fac5b777fabfcd0525b (patch)
treea0a617a80f6eb19cb4f406dbdf3b26b5803f4b8a /media/libmediaplayerservice
parent9da2070b6d6d20550de7da61478c325f0928d020 (diff)
parente4fc55de48241c5fb4c4b9d652fd2d4cd0b71138 (diff)
downloadframeworks_av-489d78dcde35ef7ecaed5fac5b777fabfcd0525b.zip
frameworks_av-489d78dcde35ef7ecaed5fac5b777fabfcd0525b.tar.gz
frameworks_av-489d78dcde35ef7ecaed5fac5b777fabfcd0525b.tar.bz2
Merge "Lower the lower bound for max file duration check" into gingerbread
Diffstat (limited to 'media/libmediaplayerservice')
-rw-r--r--media/libmediaplayerservice/StagefrightRecorder.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/StagefrightRecorder.cpp b/media/libmediaplayerservice/StagefrightRecorder.cpp
index f26676d..c40d285 100644
--- a/media/libmediaplayerservice/StagefrightRecorder.cpp
+++ b/media/libmediaplayerservice/StagefrightRecorder.cpp
@@ -344,7 +344,7 @@ status_t StagefrightRecorder::setParamVideoEncodingBitRate(int32_t bitRate) {
status_t StagefrightRecorder::setParamMaxFileDurationUs(int64_t timeUs) {
LOGV("setParamMaxFileDurationUs: %lld us", timeUs);
- if (timeUs <= 1000000LL) { // XXX: 1 second
+ if (timeUs <= 100000LL) { // XXX: 100 milli-seconds
LOGE("Max file duration is too short: %lld us", timeUs);
return BAD_VALUE;
}