hqd: virtual display code clean up
Remove V4L2 based virtual display functions as it is
no longer used.
Change-Id: Ibd7685791de6baa1bbf12ffe343443fcd7725269
diff --git a/libhwcomposer/hwc_virtual.h b/libhwcomposer/hwc_virtual.h
index 5f7b20f..5ca99f7 100644
--- a/libhwcomposer/hwc_virtual.h
+++ b/libhwcomposer/hwc_virtual.h
@@ -22,26 +22,29 @@
#define HWC_VIRTUAL
#include <hwc_utils.h>
-#include <virtual.h>
namespace qhwc {
-namespace ovutils = overlay::utils;
-// Base and abstract class for VDS and V4L2 wfd design.
-class HWCVirtualBase {
+class HWCVirtualVDS {
public:
- explicit HWCVirtualBase(){};
- virtual ~HWCVirtualBase(){};
- // instantiates and returns the pointer to VDS or V4L2 object.
- static HWCVirtualBase* getObject(bool isVDSEnabled);
- virtual int prepare(hwc_composer_device_1 *dev,
- hwc_display_contents_1_t* list) = 0;
- virtual int set(hwc_context_t *ctx, hwc_display_contents_1_t *list) = 0;
- virtual void init(hwc_context_t *ctx) = 0;
- virtual void destroy(hwc_context_t *ctx, size_t numDisplays,
- hwc_display_contents_1_t** displays) = 0;
- virtual void pause(hwc_context_t* ctx, int dpy) = 0;
- virtual void resume(hwc_context_t* ctx, int dpy) = 0;
+ HWCVirtualVDS(){};
+ ~HWCVirtualVDS(){};
+ // Chooses composition type and configures pipe for each layer in virtual
+ // display list
+ int prepare(hwc_composer_device_1 *dev,
+ hwc_display_contents_1_t* list);
+ // Queues the buffer for each layer in virtual display list and call display
+ // commit.
+ int set(hwc_context_t *ctx, hwc_display_contents_1_t *list);
+ // instantiates mdpcomp, copybit and fbupdate objects and initialize those
+ // objects for virtual display during virtual display connect.
+ void init(hwc_context_t *ctx);
+ // Destroys mdpcomp, copybit and fbupdate objects and for virtual display
+ // during virtual display disconnect.
+ void destroy(hwc_context_t *ctx, size_t numDisplays,
+ hwc_display_contents_1_t** displays);
+ void pause(hwc_context_t* ctx, int dpy);
+ void resume(hwc_context_t* ctx, int dpy);
// We can dump the frame buffer and WB
// output buffer by dynamically enabling
// dumping via a binder call:
@@ -50,50 +53,5 @@
static void dynamicDebug(bool enable) {sVDDumpEnabled = enable;};
};
-class HWCVirtualVDS : public HWCVirtualBase {
-public:
- explicit HWCVirtualVDS(){};
- virtual ~HWCVirtualVDS(){};
- // Chooses composition type and configures pipe for each layer in virtual
- // display list
- virtual int prepare(hwc_composer_device_1 *dev,
- hwc_display_contents_1_t* list);
- // Queues the buffer for each layer in virtual display list and call display
- // commit.
- virtual int set(hwc_context_t *ctx, hwc_display_contents_1_t *list);
- // instantiates mdpcomp, copybit and fbupdate objects and initialize those
- // objects for virtual display during virtual display connect.
- virtual void init(hwc_context_t *ctx);
- // Destroys mdpcomp, copybit and fbupdate objects and for virtual display
- // during virtual display disconnect.
- virtual void destroy(hwc_context_t *ctx, size_t numDisplays,
- hwc_display_contents_1_t** displays);
- virtual void pause(hwc_context_t* ctx, int dpy);
- virtual void resume(hwc_context_t* ctx, int dpy);
-};
-
-class HWCVirtualV4L2 : public HWCVirtualBase {
-public:
- explicit HWCVirtualV4L2(){};
- virtual ~HWCVirtualV4L2(){};
- // Chooses composition type and configures pipe for each layer in virtual
- // display list
- virtual int prepare(hwc_composer_device_1 *dev,
- hwc_display_contents_1_t* list);
- // Queues the buffer for each layer in virtual display list and call
- // display commit.
- virtual int set(hwc_context_t *ctx, hwc_display_contents_1_t *list);
- // instantiates mdpcomp, copybit and fbupdate objects and initialize those
- // objects for virtual display during virtual display connect. This function
- // is no-op for V4L2 design
- virtual void init(hwc_context_t *) {};
- // Destroys mdpcomp, copybit and fbupdate objects and for virtual display
- // during virtual display disconnect. This function is no-op for V4L2 design
- virtual void destroy(hwc_context_t *, size_t ,
- hwc_display_contents_1_t** ) {};
- virtual void pause(hwc_context_t* ctx, int dpy);
- virtual void resume(hwc_context_t* ctx, int dpy);
-};
-
}; //namespace
#endif