Promote to AMF Version 1.4.18

Author: fanghAMD

README.md

@@ -9,7 +9,7 @@ AMF is a light-weight, portable multimedia framework that abstracts away most of
 ### Prerequisites
 * Windows® 7 (SP1 with the [Platform Update](https://msdn.microsoft.com/en-us/library/windows/desktop/jj863687.aspx)), Windows® 8.1, or Windows® 10
 * Visual Studio® 2017 or Visual Studio® 2019
-* Version 1.4.16: AMD Radeon Software Adrenalin Edition 20.2.1 or newer. Added the Pre-Analysis component to improve perceptual quality of encoded video.
+* Version 1.4.18: AMD Radeon Software Adrenalin Edition 20.11.2 or newer. Added the Pre-Analysis component to improve perceptual quality of encoded video.
 * Version 1.4.9 or later requires Vulkan SDK for some samples: https://vulkan.lunarg.com/  and AMD Radeon Software Adrenalin Edition 18.8.1 (18.30.01.01) or newer. This version supports Linux (see amd.com for driver support)
 * Version 1.4.4 or later requires OCL_SDK_Light: https://github.com/GPUOpen-LibrariesAndSDKs/OCL-SDK/releases. Previous versions of AMF require the AMD APP SDK (Version 3.0 or later), Windows 10 SDK (Version 10586). This version requires AMD Radeon Software Crimson Edition 17.7.2 (17.30.1041) or newer
 * Version 1.4: AMD Radeon Software Crimson Edition 17.1.1 (16.50.2611) or newer

amf/doc/AMF_Video_Converter_API.pdf

@@ -0,0 +1,34 @@
+# Advanced Media Framework (AMF) SDK
+
+AMF is a light-weight, portable multimedia framework that abstracts away most of the platform and API-specific details and allows for easy implementation of multimedia applications using a variety of technologies, such as DirectX 11, OpenGL, and OpenCL and facilitates an efficient interop between them.
+
+<div>
+  <a href="https://github.com/GPUOpen-LibrariesAndSDKs/AMF/releases/latest/"><img src="http://gpuopen-librariesandsdks.github.io/media/latest-release-button.svg" alt="Latest release" title="Latest release"></a>
+</div>
+
+### Prerequisites
+* Windows&reg; 7 (SP1 with the [Platform Update](https://msdn.microsoft.com/en-us/library/windows/desktop/jj863687.aspx)), Windows&reg; 8.1, or Windows&reg; 10
+* Visual Studio&reg; 2017 or Visual Studio&reg; 2019
+* Version 1.4.14: AMD Radeon Software Adrenalin Edition 19.7.1 or newer
+* Version 1.4.9 or later requires Vulkan SDK for some samples: https://vulkan.lunarg.com/  and AMD Radeon Software Adrenalin Edition 18.8.1 (18.30.01.01) or newer. This version supports Linux (see amd.com for driver support)
+* Version 1.4.4 or later requires OCL_SDK_Light: https://github.com/GPUOpen-LibrariesAndSDKs/OCL-SDK/releases. Previous versions of AMF require the AMD APP SDK (Version 3.0 or later), Windows 10 SDK (Version 10586). This version requires AMD Radeon Software Crimson Edition 17.7.2 (17.30.1041) or newer
+* Version 1.4: AMD Radeon Software Crimson Edition 17.1.1 (16.50.2611) or newer
+* Version 1.3: AMD Radeon Software Crimson Edition 16.7.3 (16.30.2311) or newer
+
+
+The AMF framework is compatible with most recent Radeon GPUs starting with the Southern Islands family and APUs of the Kabini, Kaveri, Carrizo families and newer.
+
+### Getting Started
+* Visual Studio solutions can be found in the `amf\public\samples` directory.
+* Additional documentation can be found in the `amf\doc` directory.
+* To build samples on Linux use 'makefile' in `amf\public\samples`
+
+### Third-Party Software
+* FFmpeg is distributed under the terms of the LGPLv2.1.
+
+### Attribution
+* AMD, the AMD Arrow logo, Radeon, and combinations thereof are either registered trademarks or trademarks of Advanced Micro Devices, Inc. in the United States and/or other countries.
+* Microsoft, DirectX, Visual Studio, and Windows are either registered trademarks or trademarks of Microsoft Corporation in the United States and/or other countries.
+* OpenGL and the oval logo are trademarks or registered trademarks of Silicon Graphics, Inc. in the United States and/or other countries worldwide.
+* OpenCL and the OpenCL logo are trademarks of Apple Inc. used by permission by Khronos.
+* Vulkan and the Vulkan logo are registered trademarks of the Khronos Group Inc.

amf/doc/AMF_Video_Decode_API.pdf

@@ -27,15 +27,21 @@
 // THE SOFTWARE.
 //
 
-New features are available in Driver: Radeon Software Adrenalin 2019 Edition; 20.2.1 Software: 19.50.19.01 and later 
+New features are available in 
+Driver: Radeon Software Adrenalin 2019 Edition; 19.7.1 Software: 19.30 and later 
 
-1.4.16.0 (04.02.2020) version
+1.4.18.0 (16.09.2020) version
 --------------------------
-	- Added encode pre-analysis component to improve perceived quality of encoded video
+   - AV1 decoding
+   - VP9 decoding
+   - DX12 decoding and color conversion
+   - Pre-analysis component  (PA)
+   - Pre-processing filter 
+   - Encoder: output timeout support, throughput information, picture management , statistic
 
 1.4.14.0 (08.07.2019) version
 --------------------------
-    - Support for RX5700 (Navi) GPUs
+   - Support for RX5700 (Navi) GPUs
 	- FFmpeg updated to version 4.1.3
 	- Added sample projects for Visual Studio 2019
 	- Dropped support for Visual Studio 2013 and 1015

amf/doc/AMF_Video_Encode_API.pdf

@@ -56,6 +56,8 @@ class AMFFactoryHelper
     amf::AMFTrace* GetTrace();
 
     amf_uint64 AMFQueryVersion();
+
+    amf_handle    GetAMFDLLHandle() { return m_hDLLHandle; }
 protected:
     struct ComponentHolder
     {

amf/doc/AMF_Video_Encode_HEVC_API.pdf

@@ -585,6 +585,14 @@ namespace amf
             return *this;
         }
 
+        inline bool operator==(const Matrix& other) const 
+        {
+            return memcmp(this, &other, sizeof(*this)) == 0;
+        }
+        inline bool operator!=(const Matrix& other) const
+        {
+            return memcmp(this, &other, sizeof(*this)) != 0;
+        }
 
         inline Vector operator*(const Vector& v)
         {
@@ -976,98 +984,56 @@ namespace amf
         inline Matrix Inverse(Vector *pDeterminant)
         {
 
-            Matrix MT = Transpose();
-
-            Vector V0[4], V1[4];
-            V0[0] = Vector(MT.r[2].x, MT.r[2].x, MT.r[2].y, MT.r[2].y);
-            V1[0] = Vector(MT.r[3].z, MT.r[3].w, MT.r[3].z, MT.r[3].w);
-            V0[1] = Vector(MT.r[0].x, MT.r[0].x, MT.r[0].y, MT.r[0].y);
-            V1[1] = Vector(MT.r[1].z, MT.r[1].w, MT.r[1].z, MT.r[1].w);
-            V0[2] = MT.r[2].VectorPermute(MT.r[0], AMF_PERMUTE_0X, AMF_PERMUTE_0Z, AMF_PERMUTE_1X, AMF_PERMUTE_1Z);
-            V1[2] = MT.r[3].VectorPermute(MT.r[1], AMF_PERMUTE_0Y, AMF_PERMUTE_0W, AMF_PERMUTE_1Y, AMF_PERMUTE_1W);
-
-            Vector D0 = V0[0] *V1[0];
-            Vector D1 = V0[1] *V1[1];
-            Vector D2 = V0[2] *V1[2];
-
-            V0[0] = Vector(MT.r[2].z, MT.r[2].w, MT.r[2].z, MT.r[2].w);
-            V1[0] = Vector(MT.r[3].x, MT.r[3].x, MT.r[3].y, MT.r[3].y);
-            V0[1] = Vector(MT.r[0].z, MT.r[0].w, MT.r[0].z, MT.r[0].w);
-            V1[1] = Vector(MT.r[1].x, MT.r[1].x, MT.r[1].y, MT.r[1].y);
-            V0[2] = MT.r[2].VectorPermute(MT.r[0], AMF_PERMUTE_0Y, AMF_PERMUTE_0W, AMF_PERMUTE_1Y, AMF_PERMUTE_1W);
-            V1[2] = MT.r[3].VectorPermute(MT.r[1], AMF_PERMUTE_0X, AMF_PERMUTE_0Z, AMF_PERMUTE_1X, AMF_PERMUTE_1Z);
-
-            D0 -= V0[0] * V1[0];
-            D1 -= V0[1] * V1[1];
-            D2 -= V0[2] * V1[2];
-
-            V0[0] = Vector(MT.r[1].y, MT.r[1].z, MT.r[1].x, MT.r[1].y);
-            V1[0] = D0.VectorPermute(D2, AMF_PERMUTE_1Y, AMF_PERMUTE_0Y, AMF_PERMUTE_0W, AMF_PERMUTE_0X);
-            V0[1] = Vector(MT.r[0].z, MT.r[0].z, MT.r[0].y, MT.r[0].x);
-            V1[1] = D0.VectorPermute(D2, AMF_PERMUTE_0W, AMF_PERMUTE_1Y, AMF_PERMUTE_0Y, AMF_PERMUTE_0Z);
-            V0[2] = Vector(MT.r[3].y, MT.r[3].z, MT.r[3].x, MT.r[3].y);
-            V1[2] = D1.VectorPermute(D2, AMF_PERMUTE_1W, AMF_PERMUTE_0Y, AMF_PERMUTE_0W, AMF_PERMUTE_0X);
-            V0[3] = Vector(MT.r[2].z, MT.r[2].x, MT.r[2].y, MT.r[2].x);
-            V1[3] = D1.VectorPermute(D2, AMF_PERMUTE_0W, AMF_PERMUTE_1W, AMF_PERMUTE_0Y, AMF_PERMUTE_0Z);
-
-            Vector C0 = V0[0] * V1[0];
-            Vector C2 = V0[1] * V1[1];
-            Vector C4 = V0[2] * V1[2];
-            Vector C6 = V0[3] * V1[3];
-
-            V0[0] = Vector(MT.r[1].z, MT.r[1].w, MT.r[1].y, MT.r[1].z);
-            V1[0] = D0.VectorPermute(D2, AMF_PERMUTE_0W, AMF_PERMUTE_0X, AMF_PERMUTE_0Y, AMF_PERMUTE_1X);
-            V0[1] = Vector(MT.r[0].w, MT.r[0].z, MT.r[0].w, MT.r[0].y);
-            V1[1] = D0.VectorPermute(D2, AMF_PERMUTE_0Z, AMF_PERMUTE_0Y, AMF_PERMUTE_1X, AMF_PERMUTE_0X);
-            V0[2] = Vector(MT.r[3].z, MT.r[3].w, MT.r[3].y, MT.r[3].z);
-            V1[2] = D1.VectorPermute(D2, AMF_PERMUTE_0W, AMF_PERMUTE_0X, AMF_PERMUTE_0Y, AMF_PERMUTE_1Z);
-            V0[3] = Vector(MT.r[2].w, MT.r[2].z, MT.r[2].w, MT.r[2].y);
-            V1[3] = D1.VectorPermute(D2, AMF_PERMUTE_0Z, AMF_PERMUTE_0Y, AMF_PERMUTE_1Z, AMF_PERMUTE_0X);
-
-            C0 -= V0[0] * V1[0];
-            C2 -= V0[1] * V1[1];
-            C4 -= V0[2] * V1[2];
-            C6 -= V0[3] * V1[3];
-
-            V0[0] = Vector(MT.r[1].w, MT.r[1].x, MT.r[1].w, MT.r[1].x);
-            V1[0] = D0.VectorPermute(D2, AMF_PERMUTE_0Z, AMF_PERMUTE_1Y, AMF_PERMUTE_1X, AMF_PERMUTE_0Z);
-            V0[1] = Vector(MT.r[0].y, MT.r[0].w, MT.r[0].x, MT.r[0].z);
-            V1[1] = D0.VectorPermute(D2, AMF_PERMUTE_1Y, AMF_PERMUTE_0X, AMF_PERMUTE_0W, AMF_PERMUTE_1X);
-            V0[2] = Vector(MT.r[3].w, MT.r[3].x, MT.r[3].w, MT.r[3].x);
-            V1[2] = D1.VectorPermute(D2, AMF_PERMUTE_0Z, AMF_PERMUTE_1W, AMF_PERMUTE_1Z, AMF_PERMUTE_0Z);
-            V0[3] = Vector(MT.r[2].y, MT.r[2].w, MT.r[2].x, MT.r[2].z);
-            V1[3] = D1.VectorPermute(D2, AMF_PERMUTE_1W, AMF_PERMUTE_0X, AMF_PERMUTE_0W, AMF_PERMUTE_1Z);
-
-            Vector C1 = C0 - V0[0] * V1[0];
-            C0 += V0[0] * V1[0];
-            Vector C3 = C2 + V0[1] * V1[1];
-            C2 -= V0[1] * V1[1];
-            Vector C5 = C4 - V0[2] * V1[2];
-            C4 += V0[2] * V1[2];
-            Vector C7 = C6 + V0[3] * V1[3];
-            C6 -= V0[3] * V1[3];
-
-            Matrix R;
-            R.r[0] = Vector(C0.x, C1.y, C0.z, C1.w);
-            R.r[1] = Vector(C2.x, C3.y, C2.z, C3.w);
-            R.r[2] = Vector(C4.x, C5.y, C4.z, C5.w);
-            R.r[3] = Vector(C6.x, C7.y, C6.z, C7.w);
-
-            Vector Determinant = R.r[0].Dot4(MT.r[0]);
+            float A2323 = m[2][2] * m[3][3] - m[2][3] * m[3][2];
+            float A1323 = m[2][1] * m[3][3] - m[2][3] * m[3][1];
+            float A1223 = m[2][1] * m[3][2] - m[2][2] * m[3][1];
+            float A0323 = m[2][0] * m[3][3] - m[2][3] * m[3][0];
+            float A0223 = m[2][0] * m[3][2] - m[2][2] * m[3][0];
+            float A0123 = m[2][0] * m[3][1] - m[2][1] * m[3][0];
+            float A2313 = m[1][2] * m[3][3] - m[1][3] * m[3][2];
+            float A1313 = m[1][1] * m[3][3] - m[1][3] * m[3][1];
+            float A1213 = m[1][1] * m[3][2] - m[1][2] * m[3][1];
+            float A2312 = m[1][2] * m[2][3] - m[1][3] * m[2][2];
+            float A1312 = m[1][1] * m[2][3] - m[1][3] * m[2][1];
+            float A1212 = m[1][1] * m[2][2] - m[1][2] * m[2][1];
+            float A0313 = m[1][0] * m[3][3] - m[1][3] * m[3][0];
+            float A0213 = m[1][0] * m[3][2] - m[1][2] * m[3][0];
+            float A0312 = m[1][0] * m[2][3] - m[1][3] * m[2][0];
+            float A0212 = m[1][0] * m[2][2] - m[1][2] * m[2][0];
+            float A0113 = m[1][0] * m[3][1] - m[1][1] * m[3][0];
+            float A0112 = m[1][0] * m[2][1] - m[1][1] * m[2][0];
+
+            float det =
+              m[0][0] * (m[1][1] * A2323 - m[1][2] * A1323 + m[1][3] * A1223)
+            - m[0][1] * (m[1][0] * A2323 - m[1][2] * A0323 + m[1][3] * A0223)
+            + m[0][2] * (m[1][0] * A1323 - m[1][1] * A0323 + m[1][3] * A0123)
+            - m[0][3] * (m[1][0] * A1223 - m[1][1] * A0223 + m[1][2] * A0123);
+            det = 1.0f / det;
+            Matrix ret;
+            ret.m[0][0] = det *  (m[1][1] * A2323 - m[1][2] * A1323 + m[1][3] * A1223);
+            ret.m[0][1] = det * -(m[0][1] * A2323 - m[0][2] * A1323 + m[0][3] * A1223);
+            ret.m[0][2] = det *  (m[0][1] * A2313 - m[0][2] * A1313 + m[0][3] * A1213);
+            ret.m[0][3] = det * -(m[0][1] * A2312 - m[0][2] * A1312 + m[0][3] * A1212);
+            ret.m[1][0] = det * -(m[1][0] * A2323 - m[1][2] * A0323 + m[1][3] * A0223);
+            ret.m[1][1] = det *  (m[0][0] * A2323 - m[0][2] * A0323 + m[0][3] * A0223);
+            ret.m[1][2] = det * -(m[0][0] * A2313 - m[0][2] * A0313 + m[0][3] * A0213);
+            ret.m[1][3] = det *  (m[0][0] * A2312 - m[0][2] * A0312 + m[0][3] * A0212);
+            ret.m[2][0] = det *  (m[1][0] * A1323 - m[1][1] * A0323 + m[1][3] * A0123);
+            ret.m[2][1] = det * -(m[0][0] * A1323 - m[0][1] * A0323 + m[0][3] * A0123);
+            ret.m[2][2] = det *  (m[0][0] * A1313 - m[0][1] * A0313 + m[0][3] * A0113);
+            ret.m[2][3] = det * -(m[0][0] * A1312 - m[0][1] * A0312 + m[0][3] * A0112);
+            ret.m[3][0] = det * -(m[1][0] * A1223 - m[1][1] * A0223 + m[1][2] * A0123);
+            ret.m[3][1] = det *  (m[0][0] * A1223 - m[0][1] * A0223 + m[0][2] * A0123);
+            ret.m[3][2] = det * -(m[0][0] * A1213 - m[0][1] * A0213 + m[0][2] * A0113);
+            ret.m[3][3] = det *  (m[0][0] * A1212 - m[0][1] * A0212 + m[0][2] * A0112);
 
             if (pDeterminant != nullptr)
-                *pDeterminant = Determinant;
-
-            Vector Reciprocal = Determinant.Reciprocal();
-
-            Matrix Result;
-            Result.r[0] = R.r[0] * Reciprocal;
-            Result.r[1] = R.r[1] * Reciprocal;
-            Result.r[2] = R.r[2] * Reciprocal;
-            Result.r[3] = R.r[3] * Reciprocal;
-            return Result;
-
+            {
+                *pDeterminant = Vector(det,det,det,det);
+            }
+            return ret;
         }
+
     };
 
     class Pose