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

Commit 300b0b7e authored by Nipun Kwatra's avatar Nipun Kwatra Committed by Android (Google) Code Review
Browse files

Merge "setParamMaxFileDurationUs should allow zero time input as per API of... 

Merge "setParamMaxFileDurationUs should allow zero time input as per API of setMaxDuration." into gingerbread
parents 32519259 fb45748a

media/libmediaplayerservice/StagefrightRecorder.cpp

+5 −1
Original line number Original line Diff line number Diff line
@@ -341,10 +341,14 @@ status_t StagefrightRecorder::setParamVideoEncodingBitRate(int32_t bitRate) { 




status_t StagefrightRecorder::setParamMaxFileDurationUs(int64_t timeUs) {

status_t StagefrightRecorder::setParamMaxFileDurationUs(int64_t timeUs) {

    LOGV("setParamMaxFileDurationUs: %lld us", 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);

        LOGE("Max file duration is too short: %lld us", timeUs);

        return BAD_VALUE;

        return BAD_VALUE;

    }

    }



    mMaxFileDurationUs = timeUs;

    mMaxFileDurationUs = timeUs;

    return OK;

    return OK;

}

}