Revert "Fix a stream configuration size calculation"
Revert "Update EVS service configurations"
Revert submission 12518161-evs_cherrypick
Reason for revert: Broken build 6821687 on git_rvc-qpr-dev-plus-aosp on aosp_hawk-userdebug
Reverted Changes:
Id4127d387:Rename the reference EVS HW service
Id4c489fd2:Fix a stream configuration size calculation
I393721d1b:Update EVS sepolicy
Ib771f95a4:Update EVS service configurations
I4f801ad03:Add a command line option for the test mode
Change-Id: I36f96bce44dc7440e05d2cdbe3e1014a5ae0675d
diff --git a/surround_view/service-impl/SurroundView2dSession.cpp b/surround_view/service-impl/SurroundView2dSession.cpp
index cbf652e..c2cc185 100644
--- a/surround_view/service-impl/SurroundView2dSession.cpp
+++ b/surround_view/service-impl/SurroundView2dSession.cpp
@@ -62,7 +62,7 @@
int32_t framerate;
} RawStreamConfig;
-static const size_t kStreamCfgSz = sizeof(RawStreamConfig) / sizeof(int32_t);
+static const size_t kStreamCfgSz = sizeof(RawStreamConfig);
static const uint8_t kGrayColor = 128;
static const int kInputNumChannels = 4;
static const int kOutputNumChannels = 3;
diff --git a/surround_view/service-impl/SurroundView3dSession.cpp b/surround_view/service-impl/SurroundView3dSession.cpp
index 3bb2203..18d7d4f 100644
--- a/surround_view/service-impl/SurroundView3dSession.cpp
+++ b/surround_view/service-impl/SurroundView3dSession.cpp
@@ -69,7 +69,7 @@
int32_t framerate;
} RawStreamConfig;
-static const size_t kStreamCfgSz = sizeof(RawStreamConfig) / sizeof(int32_t);
+static const size_t kStreamCfgSz = sizeof(RawStreamConfig);
static const uint8_t kGrayColor = 128;
static const int kNumFrames = 4;
static const int kInputNumChannels = 4;
