diff options
| author | James Dong <jdong@google.com> | 2010-07-30 14:28:26 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-07-30 14:28:26 -0700 |
| commit | d973a533da16a1fbf13aa1b58ddf60d7d7c9b4ec (patch) | |
| tree | 8825970e242c9a2ead5d61cff364b20ae9cc5dbb /media | |
| parent | 131ce67d276416e3cb23a5e31121fdff1a8bf290 (diff) | |
| parent | 8894de6d3e81649b3005bdbd0a95cbada0a6e418 (diff) | |
| download | frameworks_base-d973a533da16a1fbf13aa1b58ddf60d7d7c9b4ec.zip frameworks_base-d973a533da16a1fbf13aa1b58ddf60d7d7c9b4ec.tar.gz frameworks_base-d973a533da16a1fbf13aa1b58ddf60d7d7c9b4ec.tar.bz2 | |
Merge "Lower the lower bound for max file duration check" into gingerbread
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmediaplayerservice/StagefrightRecorder.cpp | 2 |
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; } |