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

Commit 62e949bc authored by Steven Thomas's avatar Steven Thomas Committed by Android (Google) Code Review
Browse files

Merge "Remove frame rate functions from buffer queue" into rvc-dev

parents 58b48f76 b13d750d

libs/gui/BufferHubConsumer.cpp

+0 −10
Original line number Diff line number Diff line
@@ -147,16 +147,6 @@ status_t BufferHubConsumer::discardFreeBuffers() { 
    return INVALID_OPERATION;

}



status_t BufferHubConsumer::setFrameRate(float /*frameRate*/) {

    ALOGE("BufferHubConsumer::setFrameRate: not implemented.");

    return INVALID_OPERATION;

}



status_t BufferHubConsumer::getFrameRate(float* /*frameRate*/) const {

    ALOGE("BufferHubConsumer::getFrameRate: not implemented.");

    return INVALID_OPERATION;

}



status_t BufferHubConsumer::dumpState(const String8& /*prefix*/, String8* /*outResult*/) const {

    ALOGE("BufferHubConsumer::dumpState: not implemented.");

    return INVALID_OPERATION;

libs/gui/BufferQueueConsumer.cpp

+0 −12
Original line number Diff line number Diff line
@@ -783,18 +783,6 @@ status_t BufferQueueConsumer::discardFreeBuffers() { 
    return NO_ERROR;

}



status_t BufferQueueConsumer::setFrameRate(float frameRate) {

    std::lock_guard<std::mutex> lock(mCore->mMutex);

    mCore->mFrameRate = frameRate;

    return NO_ERROR;

}



status_t BufferQueueConsumer::getFrameRate(float* frameRate) const {

    std::lock_guard<std::mutex> lock(mCore->mMutex);

    *frameRate = mCore->mFrameRate;

    return NO_ERROR;

}



status_t BufferQueueConsumer::dumpState(const String8& prefix, String8* outResult) const {

    struct passwd* pwd = getpwnam("shell");

    uid_t shellUid = pwd ? pwd->pw_uid : 0;

libs/gui/BufferQueueCore.cpp

+1 −2
Original line number Diff line number Diff line
@@ -130,8 +130,7 @@ BufferQueueCore::BufferQueueCore() 
        mLastQueuedSlot(INVALID_BUFFER_SLOT),

        mUniqueId(getUniqueId()),

        mAutoPrerotation(false),

        mTransformHintInUse(0),

        mFrameRate(0) {

        mTransformHintInUse(0) {

    int numStartingBuffers = getMaxBufferCountLocked();

    for (int s = 0; s < numStartingBuffers; s++) {

        mFreeSlots.insert(s);

libs/gui/BufferQueueProducer.cpp

+0 −10
Original line number Diff line number Diff line
@@ -1676,14 +1676,4 @@ status_t BufferQueueProducer::setAutoPrerotation(bool autoPrerotation) { 
    return NO_ERROR;

}



status_t BufferQueueProducer::setFrameRate(float frameRate) {

    ATRACE_CALL();

    BQ_LOGV("setFrameRate: %.0f", frameRate);



    std::lock_guard<std::mutex> lock(mCore->mMutex);



    mCore->mFrameRate = frameRate;

    return NO_ERROR;

}



} // namespace android

libs/gui/ConsumerBase.cpp

+0 −18
Original line number Diff line number Diff line
@@ -363,24 +363,6 @@ status_t ConsumerBase::discardFreeBuffers() { 
    return OK;

}



status_t ConsumerBase::setFrameRate(float frameRate) {

    Mutex::Autolock _l(mMutex);

    if (mAbandoned) {

        CB_LOGE("setFrameRate: ConsumerBase is abandoned!");

        return NO_INIT;

    }

    return mConsumer->setFrameRate(frameRate);

}



status_t ConsumerBase::getFrameRate(float* frameRate) {

    Mutex::Autolock _l(mMutex);

    if (mAbandoned) {

        CB_LOGE("getFrameRate: ConsumerBase is abandoned!");

        return NO_INIT;

    }

    return mConsumer->getFrameRate(frameRate);

}



void ConsumerBase::dumpState(String8& result) const {

    dumpState(result, "");

}