Fix VideoStitch sample build

Author: rhutsAMD

amf/public/common/AMFSTL.cpp

@@ -46,6 +46,10 @@
     #include <codecvt>
 #endif
 
+#if !defined(__APPLE__) && !defined(_WIN32)
+#include <malloc.h>
+#endif
+
 #pragma warning(disable: 4996)
 
 #if defined(__linux) || defined(__APPLE__)
@@ -684,6 +688,28 @@ void AMF_STD_CALL amf_free(void* ptr)
     free(ptr);
 }
 //----------------------------------------------------------------------------------------
+void* AMF_STD_CALL amf_aligned_alloc(size_t count, size_t alignment)
+{
+#if defined(_WIN32)
+    return _aligned_malloc(count, alignment);
+#elif defined (__APPLE__)
+    void* p = nullptr;
+    posix_memalign(&p, alignment, count);
+    return p;
+#elif defined(__linux)
+    return memalign(alignment, count);
+#endif
+}
+//----------------------------------------------------------------------------------------
+void AMF_STD_CALL amf_aligned_free(void* ptr)
+{
+#if defined(_WIN32)
+    return _aligned_free(ptr);
+#else
+    return free(ptr);
+#endif
+}
+//----------------------------------------------------------------------------------------
 #if defined (__ANDROID__)
 template <typename CHAR_T>
 static bool isOneOf(CHAR_T p_ch, const CHAR_T* p_set)

amf/public/common/AMFSTL.h

@@ -62,6 +62,8 @@ extern "C"
     // allocator
     void* AMF_STD_CALL amf_alloc(amf_size count);
     void AMF_STD_CALL amf_free(void* ptr);
+    void* AMF_STD_CALL amf_aligned_alloc(size_t count, size_t alignment);
+    void AMF_STD_CALL amf_aligned_free(void* ptr);
 #if defined(__cplusplus)
 }
 #endif

amf/public/common/Linux/ThreadLinux.cpp

@@ -591,21 +591,6 @@ void AMF_STD_CALL amf_virtual_free(void* ptr)
     free(ptr); // according to linux help memory allocated by memalign() must be freed by free()
 }
 //----------------------------------------------------------------------------------------
-void* AMF_STD_CALL amf_aligned_alloc(size_t count, size_t alignment)
-{
-#if defined(__APPLE__)
-    void* p = nullptr;
-    posix_memalign(&p, alignment, count);
-    return p;
-#else
-    return memalign(alignment, count);
-#endif
-}
-//----------------------------------------------------------------------------------------
-void AMF_STD_CALL amf_aligned_free(void* ptr)
-{
-    return free(ptr);
-}
 
 amf_handle AMF_STD_CALL amf_load_library(const wchar_t* filename)
 {

amf/public/proj/vs2019/VideoStitch/VideoStitch.vcxproj

@@ -234,7 +234,6 @@
     <ClCompile Include="..\..\..\..\public\common\Thread.cpp" />
     <ClCompile Include="..\..\..\..\public\common\TraceAdapter.cpp" />
     <ClCompile Include="..\..\..\..\public\common\Windows\ThreadWindows.cpp" />
-    <ClCompile Include="..\..\..\..\runtime\src\common\windows\OSWrappersWindows.cpp" />
     <ClCompile Include="..\..\..\common\Linux\ThreadLinux.cpp" />
     <ClCompile Include="..\..\..\src\components\VideoStitch\DirectX11\StitchEngineDX11.cpp" />
     <ClCompile Include="..\..\..\src\components\VideoStitch\HistogramImpl.cpp" />

amf/public/proj/vs2019/VideoStitch/VideoStitch.vcxproj.filters

@@ -22,15 +22,6 @@
     <Filter Include="common">
       <UniqueIdentifier>{02f1f550-82ac-4ae6-889b-fe2fddbaf79a}</UniqueIdentifier>
     </Filter>
-    <Filter Include="runtime">
-      <UniqueIdentifier>{23658dc9-7f81-4be3-9cae-62a67632c47f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="runtime\src">
-      <UniqueIdentifier>{a3f484db-78f5-4e19-90d5-0307246590cf}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="runtime\src\common">
-      <UniqueIdentifier>{e430efb6-4198-4739-9196-1e291c340e46}</UniqueIdentifier>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\..\public\include\core\Buffer.h">
@@ -173,9 +164,6 @@
     <ClCompile Include="..\..\..\common\Linux\ThreadLinux.cpp">
       <Filter>common</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\runtime\src\common\windows\OSWrappersWindows.cpp">
-      <Filter>runtime\src\common</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\..\src\components\VideoStitch\DirectX11\StitchD3D11.hlsl">

amf/public/src/components/VideoStitch/DirectX11/StitchEngineDX11.cpp

@@ -52,6 +52,10 @@ using namespace DirectX;
 #define ALPHA_BLEND_ENABLED 1
 #define HIST_SIZE   256
 
+inline static amf_uint32 AlignValue(amf_uint32 value, amf_uint32 alignment)
+{
+    return ((value + (alignment - 1)) & ~(alignment - 1));
+}
 
 extern XMVECTOR MakeSphere(XMVECTOR src, float centerX,float centerY,float centerZ, float newRadius);
 

amf/public/src/components/VideoStitch/StitchEngineBase.h

@@ -34,12 +34,12 @@
 #include "public/include/core/Trace.h"
 #include "public/include/core/Context.h"
 #include "public/common/InterfaceImpl.h"
+#include "public/common/AMFSTL.h"
 #include "public/include/components/VideoStitch.h"
 #include "HistogramImpl.h"
 #include <DirectXMath.h>
 
 #include <vector>
-#include <runtime/include/core/Typedefs.h>
 
 //#define DEBUG_TRANSPARENT
 namespace amf