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

Commit 107788e8 authored by Ady Abraham's avatar Ady Abraham
Browse files

libgui: use flag MACRO for BQ_SETFRAMERATE 

Bug: 281695725
Test: presubmit
Change-Id: I644dadbfc72cd50d80c50d36da96078253bbc009
parent a1277efd

libs/bufferqueueconverter/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -34,5 +34,7 @@ cc_library { 
        "libbase",

        "liblog",

    ],

    static_libs: ["libguiflags"],

    export_include_dirs: ["include"],

    export_static_lib_headers: ["libguiflags"],

}

libs/gui/Android.bp

+25 −13
Original line number Diff line number Diff line
@@ -20,6 +20,25 @@ package { 
    default_applicable_licenses: ["frameworks_native_license"],

}



aconfig_declarations {

    name: "libgui_flags",

    package: "com.android.graphics.libgui.flags",

    srcs: ["libgui_flags.aconfig"],

}



cc_aconfig_library {

    name: "libguiflags",

    host_supported: true,

    vendor_available: true,

    min_sdk_version: "29",

    apex_available: [

        "//apex_available:platform",

        "com.android.media.swcodec",

        "test_com.android.media.swcodec",

    ],

    aconfig_declarations: "libgui_flags",

}



cc_library_headers {

    name: "libgui_headers",

    vendor_available: true,
@@ -36,6 +55,8 @@ cc_library_headers { 
        "android.hardware.graphics.bufferqueue@1.0",

        "android.hardware.graphics.bufferqueue@2.0",

    ],

    static_libs: ["libguiflags"],

    export_static_lib_headers: ["libguiflags"],

    min_sdk_version: "29",

    // TODO(b/218719284) can media use be constrained to libgui_bufferqueue_static?

    apex_available: [
@@ -192,19 +213,6 @@ cc_library_static { 
    },

}



aconfig_declarations {

    name: "libgui_flags",

    package: "com.android.graphics.libgui.flags",

    srcs: ["libgui_flags.aconfig"],

}



cc_aconfig_library {

    name: "libguiflags",

    host_supported: true,

    vendor_available: true,

    aconfig_declarations: "libgui_flags",

}



filegroup {

    name: "libgui-sources",

    srcs: [
@@ -265,6 +273,9 @@ cc_defaults { 
        "libbinder",

        "libGLESv2",

    ],

    export_static_lib_headers: [

        "libguiflags",

    ],

}



cc_library_shared {
@@ -460,6 +471,7 @@ cc_library_static { 
    static_libs: [

        "libgtest",

        "libgmock",

        "libguiflags",

    ],



    srcs: [

libs/gui/BLASTBufferQueue.cpp

+2 −4
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
#include <gui/BufferQueueConsumer.h>

#include <gui/BufferQueueCore.h>

#include <gui/BufferQueueProducer.h>

#include <gui/Flags.h>



#include <gui/FrameRateUtils.h>

#include <gui/GLConsumer.h>

#include <gui/IProducerListener.h>
@@ -41,8 +41,6 @@ 
#include <android-base/thread_annotations.h>

#include <chrono>



#include <com_android_graphics_libgui_flags.h>



using namespace com::android::graphics::libgui;

using namespace std::chrono_literals;
@@ -144,7 +142,7 @@ void BLASTBufferItemConsumer::onSidebandStreamChanged() { 
    }

}



#if FLAG_BQ_SET_FRAME_RATE

#if COM_ANDROID_GRAPHICS_LIBGUI_FLAGS(BQ_SETFRAMERATE)

void BLASTBufferItemConsumer::onSetFrameRate(float frameRate, int8_t compatibility,

                                             int8_t changeFrameRateStrategy) {

    sp<BLASTBufferQueue> bbq = mBLASTBufferQueue.promote();

libs/gui/BufferQueue.cpp

+1 −2
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
#include <gui/BufferQueueConsumer.h>

#include <gui/BufferQueueCore.h>

#include <gui/BufferQueueProducer.h>

#include <gui/Flags.h>



namespace android {
@@ -99,7 +98,7 @@ void BufferQueue::ProxyConsumerListener::addAndGetFrameTimestamps( 
    }

}



#if FLAG_BQ_SET_FRAME_RATE

#if COM_ANDROID_GRAPHICS_LIBGUI_FLAGS(BQ_SETFRAMERATE)

void BufferQueue::ProxyConsumerListener::onSetFrameRate(float frameRate, int8_t compatibility,

                                                        int8_t changeFrameRateStrategy) {

    sp<ConsumerListener> listener(mConsumerListener.promote());

libs/gui/BufferQueueProducer.cpp

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
#include <gui/BufferItem.h>

#include <gui/BufferQueueCore.h>

#include <gui/BufferQueueProducer.h>

#include <gui/Flags.h>



#include <gui/FrameRateUtils.h>

#include <gui/GLConsumer.h>

#include <gui/IConsumerListener.h>
@@ -1753,7 +1753,7 @@ status_t BufferQueueProducer::setAutoPrerotation(bool autoPrerotation) { 
    return NO_ERROR;

}



#if FLAG_BQ_SET_FRAME_RATE

#if COM_ANDROID_GRAPHICS_LIBGUI_FLAGS(BQ_SETFRAMERATE)

status_t BufferQueueProducer::setFrameRate(float frameRate, int8_t compatibility,

                                           int8_t changeFrameRateStrategy) {

    ATRACE_CALL();