Merge tag 'display-android-commonsys.lnx.1.1-200103' into display-sysintf.lnx.1.2
* tag 'display-android-commonsys.lnx.1.1-200103':
commonsys-intf: display: Add SmoMo mode interface
display: update frame scheduler interface
Change-Id: I7473b510e2672c4602f2036f75bc97f7ed0819eb
diff --git a/include/frame_scheduler_intf.h b/include/frame_scheduler_intf.h
index bfe30e5..2d706e1 100644
--- a/include/frame_scheduler_intf.h
+++ b/include/frame_scheduler_intf.h
@@ -30,11 +30,13 @@
#ifndef __FRAME_SCHEDULER_INTF_H__
#define __FRAME_SCHEDULER_INTF_H__
+#include <utils/Timers.h>
+
namespace composer {
class FrameSchedulerIntf {
public:
- virtual int UpdateFrame() = 0;
+ virtual int UpdateFrameScheduling(int fenceFd, nsecs_t *timeStamp) = 0;
protected:
virtual ~FrameSchedulerIntf() { }
};
diff --git a/include/smomo_config.h b/include/smomo_config.h
index e203102..ff409d6 100644
--- a/include/smomo_config.h
+++ b/include/smomo_config.h
@@ -32,10 +32,16 @@
#ifndef __SMOMO_CONFIG_H__
#define __SMOMO_CONFIG_H__
+#include <cstdint>
+
namespace smomoconfig {
int EnableSmomo(bool enable);
+int GetSmomoMode(uint32_t *mode_idx);
+
+int SetSmomoMode(uint32_t mode_idx);
+
} // namespace smomoconfig
#endif // __SMOMO_CONFIG_H__