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

Commit dc87165e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Cleanup VR HWC type names in libdvr" into oc-dev

parents 430f8eae 736b6058

libs/vr/libdvr/dvr_hardware_composer_client.cpp

+11 −8
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ void dvrHwcFrameDestroy(DvrHwcFrame* frame) { 
  delete frame;

}



Display dvrHwcFrameGetDisplayId(DvrHwcFrame* frame) {

DvrHwcDisplay dvrHwcFrameGetDisplayId(DvrHwcFrame* frame) {

  return frame->frame.display_id;

}
@@ -104,7 +104,7 @@ size_t dvrHwcFrameGetLayerCount(DvrHwcFrame* frame) { 
  return frame->frame.layers.size();

}



Layer dvrHwcFrameGetLayerId(DvrHwcFrame* frame, size_t layer_index) {

DvrHwcLayer dvrHwcFrameGetLayerId(DvrHwcFrame* frame, size_t layer_index) {

  return frame->frame.layers[layer_index].id;

}
@@ -120,8 +120,9 @@ int dvrHwcFrameGetLayerFence(DvrHwcFrame* frame, size_t layer_index) { 
  return frame->frame.layers[layer_index].fence->dup();

}



Recti dvrHwcFrameGetLayerDisplayFrame(DvrHwcFrame* frame, size_t layer_index) {

  return Recti{

DvrHwcRecti dvrHwcFrameGetLayerDisplayFrame(DvrHwcFrame* frame,

                                            size_t layer_index) {

  return DvrHwcRecti{

    frame->frame.layers[layer_index].display_frame.left,

    frame->frame.layers[layer_index].display_frame.top,

    frame->frame.layers[layer_index].display_frame.right,
@@ -129,8 +130,8 @@ Recti dvrHwcFrameGetLayerDisplayFrame(DvrHwcFrame* frame, size_t layer_index) { 
  };

}



Rectf dvrHwcFrameGetLayerCrop(DvrHwcFrame* frame, size_t layer_index) {

  return Rectf{

DvrHwcRectf dvrHwcFrameGetLayerCrop(DvrHwcFrame* frame, size_t layer_index) {

  return DvrHwcRectf{

    frame->frame.layers[layer_index].crop.left,

    frame->frame.layers[layer_index].crop.top,

    frame->frame.layers[layer_index].crop.right,
@@ -138,8 +139,10 @@ Rectf dvrHwcFrameGetLayerCrop(DvrHwcFrame* frame, size_t layer_index) { 
  };

}



BlendMode dvrHwcFrameGetLayerBlendMode(DvrHwcFrame* frame, size_t layer_index) {

  return static_cast<BlendMode>(frame->frame.layers[layer_index].blend_mode);

DvrHwcBlendMode dvrHwcFrameGetLayerBlendMode(DvrHwcFrame* frame,

                                             size_t layer_index) {

  return static_cast<DvrHwcBlendMode>(

      frame->frame.layers[layer_index].blend_mode);

}



float dvrHwcFrameGetLayerAlpha(DvrHwcFrame* frame, size_t layer_index) {

libs/vr/libdvr/include/dvr/dvr_api.h

+9 −9
Original line number Diff line number Diff line
@@ -152,22 +152,22 @@ typedef DvrHwcClient* (*DvrHwcClientCreatePtr)(DvrHwcOnFrameCallback callback, 
                                               void* client_state);

typedef void (*DvrHwcClientDestroyPtr)(DvrHwcClient* client);

typedef void (*DvrHwcFrameDestroyPtr)(DvrHwcFrame* frame);

typedef Display (*DvrHwcFrameGetDisplayIdPtr)(DvrHwcFrame* frame);

typedef DvrHwcDisplay (*DvrHwcFrameGetDisplayIdPtr)(DvrHwcFrame* frame);

typedef int32_t (*DvrHwcFrameGetDisplayWidthPtr)(DvrHwcFrame* frame);

typedef int32_t (*DvrHwcFrameGetDisplayHeightPtr)(DvrHwcFrame* frame);

typedef bool (*DvrHwcFrameGetDisplayRemovedPtr)(DvrHwcFrame* frame);

typedef size_t (*DvrHwcFrameGetLayerCountPtr)(DvrHwcFrame* frame);

typedef Layer (*DvrHwcFrameGetLayerIdPtr)(DvrHwcFrame* frame,

typedef DvrHwcLayer (*DvrHwcFrameGetLayerIdPtr)(DvrHwcFrame* frame,

                                                size_t layer_index);

typedef AHardwareBuffer* (*DvrHwcFrameGetLayerBufferPtr)(DvrHwcFrame* frame,

                                                         size_t layer_index);

typedef int (*DvrHwcFrameGetLayerFencePtr)(DvrHwcFrame* frame,

                                           size_t layer_index);

typedef Recti (*DvrHwcFrameGetLayerDisplayFramePtr)(DvrHwcFrame* frame,

typedef DvrHwcRecti (*DvrHwcFrameGetLayerDisplayFramePtr)(DvrHwcFrame* frame,

                                                          size_t layer_index);

typedef Rectf (*DvrHwcFrameGetLayerCropPtr)(DvrHwcFrame* frame,

typedef DvrHwcRectf (*DvrHwcFrameGetLayerCropPtr)(DvrHwcFrame* frame,

                                                  size_t layer_index);

typedef BlendMode (*DvrHwcFrameGetLayerBlendModePtr)(DvrHwcFrame* frame,

typedef DvrHwcBlendMode (*DvrHwcFrameGetLayerBlendModePtr)(DvrHwcFrame* frame,

                                                           size_t layer_index);

typedef float (*DvrHwcFrameGetLayerAlphaPtr)(DvrHwcFrame* frame,

                                             size_t layer_index);

libs/vr/libdvr/include/dvr/dvr_hardware_composer_client.h

+7 −5
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ void dvrHwcClientDestroy(DvrHwcClient* client); 
// Called to free the frame information.

void dvrHwcFrameDestroy(DvrHwcFrame* frame);



Display dvrHwcFrameGetDisplayId(DvrHwcFrame* frame);

DvrHwcDisplay dvrHwcFrameGetDisplayId(DvrHwcFrame* frame);



int32_t dvrHwcFrameGetDisplayWidth(DvrHwcFrame* frame);
@@ -43,7 +43,7 @@ bool dvrHwcFrameGetDisplayRemoved(DvrHwcFrame* frame); 
// @return Number of layers in the frame.

size_t dvrHwcFrameGetLayerCount(DvrHwcFrame* frame);



Layer dvrHwcFrameGetLayerId(DvrHwcFrame* frame, size_t layer_index);

DvrHwcLayer dvrHwcFrameGetLayerId(DvrHwcFrame* frame, size_t layer_index);



// Return the graphic buffer associated with the layer at |layer_index| in

// |frame|.
@@ -58,11 +58,13 @@ AHardwareBuffer* dvrHwcFrameGetLayerBuffer(DvrHwcFrame* frame, 
// @return Fence FD. Caller owns the FD and is responsible for closing it.

int dvrHwcFrameGetLayerFence(DvrHwcFrame* frame, size_t layer_index);



Recti dvrHwcFrameGetLayerDisplayFrame(DvrHwcFrame* frame, size_t layer_index);

DvrHwcRecti dvrHwcFrameGetLayerDisplayFrame(DvrHwcFrame* frame,

                                            size_t layer_index);



Rectf dvrHwcFrameGetLayerCrop(DvrHwcFrame* frame, size_t layer_index);

DvrHwcRectf dvrHwcFrameGetLayerCrop(DvrHwcFrame* frame, size_t layer_index);



BlendMode dvrHwcFrameGetLayerBlendMode(DvrHwcFrame* frame, size_t layer_index);

DvrHwcBlendMode dvrHwcFrameGetLayerBlendMode(DvrHwcFrame* frame,

                                             size_t layer_index);



float dvrHwcFrameGetLayerAlpha(DvrHwcFrame* frame, size_t layer_index);

libs/vr/libdvr/include/dvr/dvr_hardware_composer_defs.h

+16 −16
Original line number Diff line number Diff line
@@ -10,33 +10,33 @@ extern "C" { 
// NOTE: These definitions must match the ones in

// //hardware/libhardware/include/hardware/hwcomposer2.h. They are used by the

// client side which does not have access to hwc2 headers.

enum BlendMode {

  BLEND_MODE_INVALID = 0,

  BLEND_MODE_NONE = 1,

  BLEND_MODE_PREMULTIPLIED = 2,

  BLEND_MODE_COVERAGE = 3,

enum DvrHwcBlendMode {

  DVR_HWC_BLEND_MODE_INVALID = 0,

  DVR_HWC_BLEND_MODE_NONE = 1,

  DVR_HWC_BLEND_MODE_PREMULTIPLIED = 2,

  DVR_HWC_BLEND_MODE_COVERAGE = 3,

};



enum Composition {

  COMPOSITION_INVALID = 0,

  COMPOSITION_CLIENT = 1,

  COMPOSITION_DEVICE = 2,

  COMPOSITION_SOLID_COLOR = 3,

  COMPOSITION_CURSOR = 4,

  COMPOSITION_SIDEBAND = 5,

enum DvrHwcComposition {

  DVR_HWC_COMPOSITION_INVALID = 0,

  DVR_HWC_COMPOSITION_CLIENT = 1,

  DVR_HWC_COMPOSITION_DEVICE = 2,

  DVR_HWC_COMPOSITION_SOLID_COLOR = 3,

  DVR_HWC_COMPOSITION_CURSOR = 4,

  DVR_HWC_COMPOSITION_SIDEBAND = 5,

};



typedef uint64_t Display;

typedef uint64_t Layer;

typedef uint64_t DvrHwcDisplay;

typedef uint64_t DvrHwcLayer;



struct Recti {

struct DvrHwcRecti {

  int32_t left;

  int32_t top;

  int32_t right;

  int32_t bottom;

};



struct Rectf {

struct DvrHwcRectf {

  float left;

  float top;

  float right;