DSDisplayDeviceHWC: make updateFrame return bool type.

Change-Id: I1a75b0b6e4cbb5634e59cffca1b5d549ad825535

diff --git a/src/DSDisplayDevice/DSDisplayDeviceHWCTDMImpl.cpp b/src/DSDisplayDevice/DSDisplayDeviceHWCTDMImpl.cpp
index bb52d70..f26f02a 100644 (file)
--- a/src/DSDisplayDevice/DSDisplayDeviceHWCTDMImpl.cpp
+++ b/src/DSDisplayDevice/DSDisplayDeviceHWCTDMImpl.cpp
@@ -121,10 +121,9 @@ bool DSDisplayDeviceHWCTDMImpl::commit()
 {
        tdm_error terror;
        uint32_t numChanges;
-       bool frameUpdate = false;
 
-       if (!__updateFrameWindows(frameUpdate)) {
-               DSLOG_ERR("HWCTDM", "__updateTarget fails.");
+       if (!__updateFrameWindows()) {
+               DSLOG_INF("HWCTDM", "no update windows.");
                return false;
        }
 
@@ -158,6 +157,8 @@ bool DSDisplayDeviceHWCTDMImpl::commit()
                return false;
        }
 
+       DSLOG_INF("HWCTDM", "HWC COMMIT COMMIT COMMIT ~#######");
+
        __presentFrameDoneWindows();
 
        return true;
@@ -248,9 +249,11 @@ bool DSDisplayDeviceHWCTDMImpl::__acceptValidation()
        return true;
 }
 
-bool DSDisplayDeviceHWCTDMImpl::__updateFrameWindows(bool &frameUpdate)
+bool DSDisplayDeviceHWCTDMImpl::__updateFrameWindows()
 {
-       __targetWindow->updateFrame(frameUpdate);
+       if (!__targetWindow->updateFrame()) {
+               return false;
+       }
 
        return true;
 }

diff --git a/src/DSDisplayDevice/DSDisplayDeviceHWCTDMImpl.h b/src/DSDisplayDevice/DSDisplayDeviceHWCTDMImpl.h
index f852caf..abdfc70 100644 (file)
--- a/src/DSDisplayDevice/DSDisplayDeviceHWCTDMImpl.h
+++ b/src/DSDisplayDevice/DSDisplayDeviceHWCTDMImpl.h
@@ -55,7 +55,7 @@ private:
        bool __validate(uint32_t &numChanges);
        bool __updateChanges(uint32_t numChanges);
        bool __acceptValidation();
-       bool __updateFrameWindows(bool &frameUpdate);
+       bool __updateFrameWindows();
        bool __presentFrameWindows();
        bool __presentFrameDoneWindows();
 };

diff --git a/src/DSDisplayDevice/DSDisplayDeviceHWCWindowTDMImpl.cpp b/src/DSDisplayDevice/DSDisplayDeviceHWCWindowTDMImpl.cpp
index cbb76e4..051cbd1 100644 (file)
--- a/src/DSDisplayDevice/DSDisplayDeviceHWCWindowTDMImpl.cpp
+++ b/src/DSDisplayDevice/DSDisplayDeviceHWCWindowTDMImpl.cpp
@@ -39,10 +39,10 @@ tdm_hwc_window *DSDisplayDeviceHWCWindowTDMImpl::getNativeHWCWindow()
        return __twindow;
 }
 
-void DSDisplayDeviceHWCWindowTDMImpl::updateFrame(bool &update)
+bool DSDisplayDeviceHWCWindowTDMImpl::updateFrame()
 {
        // temp always false update
-       update = false;
+       return false;
 }
 
 void DSDisplayDeviceHWCWindowTDMImpl::presentFrame()

diff --git a/src/DSDisplayDevice/DSDisplayDeviceHWCWindowTDMImpl.h b/src/DSDisplayDevice/DSDisplayDeviceHWCWindowTDMImpl.h
index 99796be..1a6fc6a 100644 (file)
--- a/src/DSDisplayDevice/DSDisplayDeviceHWCWindowTDMImpl.h
+++ b/src/DSDisplayDevice/DSDisplayDeviceHWCWindowTDMImpl.h
@@ -38,7 +38,7 @@ public:
        ~DSDisplayDeviceHWCWindowTDMImpl();
        tdm_hwc_window *getNativeHWCWindow();
 
-       void updateFrame(bool &update) override;
+       bool updateFrame() override;
        void presentFrame() override;
        void onPresentFrameDone() override;
        std::shared_ptr<DSWindow> getWindow() override;

diff --git a/src/DSDisplayDevice/DSDisplayDeviceHWCWindowTDMTargetImpl.cpp b/src/DSDisplayDevice/DSDisplayDeviceHWCWindowTDMTargetImpl.cpp
index a840510..983f4fa 100644 (file)
--- a/src/DSDisplayDevice/DSDisplayDeviceHWCWindowTDMTargetImpl.cpp
+++ b/src/DSDisplayDevice/DSDisplayDeviceHWCWindowTDMTargetImpl.cpp
@@ -44,16 +44,19 @@ DSDisplayDeviceHWCWindowTDMTargetImpl::~DSDisplayDeviceHWCWindowTDMTargetImpl()
        close(__eventFd);
 }
 
-void DSDisplayDeviceHWCWindowTDMTargetImpl::updateFrame(bool &update)
+bool DSDisplayDeviceHWCWindowTDMTargetImpl::updateFrame()
 {
        std::shared_ptr<IDSBuffer> dsBuffer;
 
-       if (!__bufferQueue->canAcquireBuffer(false)) return;
+       if (!__bufferQueue->canAcquireBuffer(false)) {
+               DSLOG_INF("TDM_HWC", "no acquirable buffer.");
+               return false;
+       }
 
        dsBuffer = __bufferQueue->acquireBuffer();
        if (!dsBuffer) {
                DSLOG_ERR("TDM_HWC", "acquire buffer fails.");
-               return;
+               return false;
        }
 
        if (__buffer) {
@@ -63,7 +66,7 @@ void DSDisplayDeviceHWCWindowTDMTargetImpl::updateFrame(bool &update)
 
        __buffer= dsBuffer;
 
-       update = true;
+       return true;
 }
 
 void DSDisplayDeviceHWCWindowTDMTargetImpl::presentFrame()

diff --git a/src/DSDisplayDevice/DSDisplayDeviceHWCWindowTDMTargetImpl.h b/src/DSDisplayDevice/DSDisplayDeviceHWCWindowTDMTargetImpl.h
index 2dadf75..756b920 100644 (file)
--- a/src/DSDisplayDevice/DSDisplayDeviceHWCWindowTDMTargetImpl.h
+++ b/src/DSDisplayDevice/DSDisplayDeviceHWCWindowTDMTargetImpl.h
@@ -40,7 +40,7 @@ public:
        DSDisplayDeviceHWCWindowTDMTargetImpl(IDSDisplayDeviceHWC *deviceHWC, std::shared_ptr<IDSBufferQueue> __bufferQueue);
        ~DSDisplayDeviceHWCWindowTDMTargetImpl();
 
-       void updateFrame(bool &update) override;
+       bool updateFrame() override;
        void presentFrame() override;
        void onPresentFrameDone() override;
        std::shared_ptr<DSWindow> getWindow() override;

diff --git a/src/DSDisplayDevice/IDSDisplayDeviceHWCWindow.h b/src/DSDisplayDevice/IDSDisplayDeviceHWCWindow.h
index 3379243..e8eb85f 100644 (file)
--- a/src/DSDisplayDevice/IDSDisplayDeviceHWCWindow.h
+++ b/src/DSDisplayDevice/IDSDisplayDeviceHWCWindow.h
@@ -32,7 +32,7 @@ class IDSDisplayDeviceHWCWindow
 {
 public:
        virtual ~IDSDisplayDeviceHWCWindow() = default;
-       virtual void updateFrame(bool &update) = 0;
+       virtual bool updateFrame() = 0;
        virtual void presentFrame() = 0;
        virtual void onPresentFrameDone() = 0;
        virtual std::shared_ptr<DSWindow> getWindow() = 0;