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

Commit d820714e authored by Nipun Kwatra's avatar Nipun Kwatra Committed by Android Git Automerger
Browse files

am 701b710c: am 300b0b7e: Merge "setParamMaxFileDurationUs should allow zero... 

am 701b710c: am 300b0b7e: Merge "setParamMaxFileDurationUs should allow zero time input as per API of setMaxDuration." into gingerbread

Merge commit '701b710c'

* commit '701b710c':
  setParamMaxFileDurationUs should allow zero time input as per API of setMaxDuration.
parents 37a1e237 701b710c

media/libmediaplayerservice/StagefrightRecorder.cpp

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

}