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

Commit 63ded34b authored by Kevin DuBois's avatar Kevin DuBois Committed by Android (Google) Code Review
Browse files

Merge "SF: accommodate 1.2 format in sampling code"

parents 6ad055d4 73d0f48e

libs/ui/include/ui/GraphicTypes.h

+1 −1
Original line number Diff line number Diff line
@@ -25,11 +25,11 @@ 
namespace android {

namespace ui {



using android::hardware::graphics::common::V1_1::PixelFormat;

using android::hardware::graphics::common::V1_1::RenderIntent;

using android::hardware::graphics::common::V1_2::ColorMode;

using android::hardware::graphics::common::V1_2::Dataspace;

using android::hardware::graphics::common::V1_2::Hdr;

using android::hardware::graphics::common::V1_2::PixelFormat;



}  // namespace ui

}  // namespace android

services/surfaceflinger/DisplayHardware/ComposerHal.cpp

+13 −10
Original line number Diff line number Diff line
@@ -260,7 +260,9 @@ Error Composer::createVirtualDisplay(uint32_t width, uint32_t height, 
    const uint32_t bufferSlotCount = 1;

    Error error = kDefaultError;

    if (mClient_2_2) {

        mClient_2_2->createVirtualDisplay_2_2(width, height, *format, bufferSlotCount,

        mClient_2_2->createVirtualDisplay_2_2(width, height,

                                              static_cast<types::V1_1::PixelFormat>(*format),

                                              bufferSlotCount,

                                              [&](const auto& tmpError, const auto& tmpDisplay,

                                                  const auto& tmpFormat) {

                                                  error = tmpError;
@@ -269,7 +271,8 @@ Error Composer::createVirtualDisplay(uint32_t width, uint32_t height, 
                                                  }



                                                  *outDisplay = tmpDisplay;

                    *format = tmpFormat;

                                                  *format = static_cast<types::V1_2::PixelFormat>(

                                                          tmpFormat);

                                              });

    } else {

        mClient->createVirtualDisplay(width, height,

services/surfaceflinger/DisplayHardware/ComposerHal.h

+1 −1
Original line number Diff line number Diff line
@@ -48,11 +48,11 @@ namespace V2_3 = hardware::graphics::composer::V2_3; 


using types::V1_0::ColorTransform;

using types::V1_0::Transform;

using types::V1_1::PixelFormat;

using types::V1_1::RenderIntent;

using types::V1_2::ColorMode;

using types::V1_2::Dataspace;

using types::V1_2::Hdr;

using types::V1_2::PixelFormat;



using V2_1::Config;

using V2_1::Display;

services/surfaceflinger/SurfaceFlingerProperties.cpp

+1 −1
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ namespace android { 
namespace sysprop {

using namespace android::hardware::configstore;

using namespace android::hardware::configstore::V1_0;

using ::android::hardware::graphics::common::V1_1::PixelFormat;

using ::android::hardware::graphics::common::V1_2::Dataspace;

using ::android::hardware::graphics::common::V1_2::PixelFormat;



int64_t vsync_event_phase_offset_ns(int64_t defaultValue) {

    auto temp = SurfaceFlingerProperties::vsync_event_phase_offset_ns();

services/surfaceflinger/SurfaceFlingerProperties.h

+2 −2
Original line number Diff line number Diff line
@@ -46,13 +46,13 @@ int64_t default_composition_dataspace( 
        android::hardware::graphics::common::V1_2::Dataspace defaultValue);



int32_t default_composition_pixel_format(

        android::hardware::graphics::common::V1_1::PixelFormat defaultValue);

        android::hardware::graphics::common::V1_2::PixelFormat defaultValue);



int64_t wcg_composition_dataspace(

        android::hardware::graphics::common::V1_2::Dataspace defaultValue);



int32_t wcg_composition_pixel_format(

        android::hardware::graphics::common::V1_1::PixelFormat defaultValue);

        android::hardware::graphics::common::V1_2::PixelFormat defaultValue);

} // namespace sysprop

} // namespace android

#endif // SURFACEFLINGERPROPERTIES_H_