Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aea75231 authored by James Dong's avatar James Dong Committed by Android Git Automerger
Browse files

am e915b0ef: am d973a533: Merge "Lower the lower bound for max file duration... 

am e915b0ef: am d973a533: Merge "Lower the lower bound for max file duration check" into gingerbread

Merge commit 'e915b0ef'

* commit 'e915b0ef':
  Lower the lower bound for max file duration check
parents f1e4bd2a e915b0ef

media/libmediaplayerservice/StagefrightRecorder.cpp

+1 −1
Original line number Diff line number Diff line
@@ -345,7 +345,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;

    }