diff options
author | James Dong <jdong@google.com> | 2010-12-20 12:00:52 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-12-20 12:00:52 -0800 |
commit | 2a1cc5ac30efc05880a12a2114c09364fc38e032 (patch) | |
tree | 9ba7796c75446f0b1f8088bf7ccc8ac8b46fddec | |
parent | 19e353e722322ca295bdf3c5fc13030c7e634c45 (diff) | |
parent | 26ea64c7442b0554d8864e8ad3822a3cc32c5a58 (diff) | |
download | frameworks_base-2a1cc5ac30efc05880a12a2114c09364fc38e032.zip frameworks_base-2a1cc5ac30efc05880a12a2114c09364fc38e032.tar.gz frameworks_base-2a1cc5ac30efc05880a12a2114c09364fc38e032.tar.bz2 |
Merge "Backward-compatibility max file size support, ignoring 0 or negative file size limit"
-rw-r--r-- | media/libmediaplayerservice/StagefrightRecorder.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/StagefrightRecorder.cpp b/media/libmediaplayerservice/StagefrightRecorder.cpp index 576b009..d372ee6 100644 --- a/media/libmediaplayerservice/StagefrightRecorder.cpp +++ b/media/libmediaplayerservice/StagefrightRecorder.cpp @@ -358,6 +358,8 @@ status_t StagefrightRecorder::setParamVideoRotation(int32_t degrees) { status_t StagefrightRecorder::setParamMaxFileDurationUs(int64_t timeUs) { LOGV("setParamMaxFileDurationUs: %lld us", timeUs); + + // This is meant for backward compatibility for MediaRecorder.java 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. @@ -375,7 +377,13 @@ status_t StagefrightRecorder::setParamMaxFileDurationUs(int64_t timeUs) { status_t StagefrightRecorder::setParamMaxFileSizeBytes(int64_t bytes) { LOGV("setParamMaxFileSizeBytes: %lld bytes", bytes); - if (bytes <= 1024) { // XXX: 1 kB + + // This is meant for backward compatibility for MediaRecorder.java + if (bytes <= 0) { + LOGW("Max file size is not positive: %lld bytes. " + "Disabling file size limit.", bytes); + bytes = 0; // Disable the file size limit for zero or negative values. + } else if (bytes <= 1024) { // XXX: 1 kB LOGE("Max file size is too small: %lld bytes", bytes); return BAD_VALUE; } |