AMF v.1.4.21 release

Author: fanghAMD

README.md

@@ -10,6 +10,7 @@ AMF is a light-weight, portable multimedia framework that abstracts away most of
 * 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
 * AMF SDK is backward compatible with all previous driver versions.
+* Version 1.4.21: AMD Radeon Software Adrenalin Edition 21.6.1 (21.20.01.14) or newer. Added PSNR/SSIM score feedback, new QVBR rate control mode and LTR mode for encoders, added HDR support for HEVC encoder and color converter, new EncoderLatency sample app.
 * Version 1.4.18: AMD Radeon Software Adrenalin Edition 20.11.2 or newer. Added Pre-Encode filter within Pre-Processing component in 1.4.18.
 * 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

Thirdparty/file_to_header/file_to_header.exe

@@ -10,8 +10,8 @@ AMF is a light-weight, portable multimedia framework that abstracts away most of
 * 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
 * AMF SDK is backward compatible with all previous driver versions.
-* 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.14: AMD Radeon Software Adrenalin Edition 19.7.1 or newer
+* Version 1.4.21: AMD Radeon Software Adrenalin Edition 21.6.1 (21.20.01.14) or newer. Added PSNR/SSIM score feedback, new QVBR rate control mode and LTR mode for encoders, added HDR support for HEVC encoder and color converter, new EncoderLatency sample app.
+* Version 1.4.18: AMD Radeon Software Adrenalin Edition 20.11.2 or newer. Added Pre-Encode filter within Pre-Processing component in 1.4.18.
 * 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_Encode_API.pdf

@@ -30,6 +30,15 @@
 New features are available in 
 Driver: Radeon Software Adrenalin 2019 Edition; 19.7.1 Software: 19.30 and later 
 
+1.4.21.0 (07.05.2021) version
+--------------------------
+   - HDR color conversion updated
+   - HDR color conversion in encoder
+   - QVBR rate control mode in encoder 
+   - Extended statistic and quality metrics in encoder
+   - Frame rate parameter became dynamic
+   - new LTR encoder mode
+
 1.4.18.0 (16.09.2020) version
 --------------------------
    - AV1 decoding

amf/doc/AMF_Video_Encode_HEVC_API.pdf

@@ -33,7 +33,16 @@
 #include "AMFFactory.h"
 #include "Thread.h"
 
+#ifdef __clang__
+    #pragma clang diagnostic push
+    #pragma clang diagnostic ignored "-Wexit-time-destructors"
+    #pragma clang diagnostic ignored "-Wglobal-constructors"
+#endif
+
 AMFFactoryHelper g_AMFFactory;
+#ifdef __clang__
+    #pragma clang diagnostic pop
+#endif
 
 #ifdef AMF_CORE_STATIC
 extern "C"
@@ -66,7 +75,11 @@ AMF_RESULT AMFFactoryHelper::Init()
         amf_atomic_inc(&m_iRefCount);
         return AMF_OK;
     }
+#ifdef _WIN32
     m_hDLLHandle = amf_load_library(AMF_DLL_NAME);
+#else 
+    m_hDLLHandle = amf_load_library1(AMF_DLL_NAME, false); //load with local flags
+#endif
     if(m_hDLLHandle == NULL)
     {
         return AMF_FAIL;
@@ -183,7 +196,11 @@ AMF_RESULT  AMFFactoryHelper::LoadExternalComponent(amf::AMFContext* pContext, c
         component.m_hDLLHandle = NULL;
         component.m_DLL = dll;
 
+#ifdef _WIN32
         hDll = amf_load_library(dll);
+#else
+        hDll = amf_load_library1(dll, false); //global flag set to true
+#endif
         if (hDll == NULL)
             return AMF_FAIL;
 

amf/doc/README.md

@@ -65,9 +65,20 @@ extern "C"
 
 using namespace amf;
 
+#ifdef __clang__
+    #pragma clang diagnostic push
+    #pragma clang diagnostic ignored "-Wexit-time-destructors"
+    #pragma clang diagnostic ignored "-Wglobal-constructors"
+#endif
+
 static const amf_string AMF_FORBIDDEN_SYMBOLS = ":? %,;@&=+$<>#\"";
 static const amf_string AMF_FORBIDDEN_SYMBOLS_QUERY = ":? %,;@+$<>#\"";
 
+#ifdef __clang__
+    #pragma clang diagnostic pop
+#endif
+
+
 //MM: in question:  unwise      = "{" | "}" | "|" | "\" | "^" | "[" | "]" | "`"
 
 //----------------------------------------------------------------------------------------

amf/doc/Readme.txt

@@ -23,9 +23,9 @@
 #ifndef AMF_CurrentTimeImpl_h
 #define AMF_CurrentTimeImpl_h
 
-#include "public/include/core/CurrentTime.h"
-#include "public/common/InterfaceImpl.h"
-#include "public/common/Thread.h"
+#include "../include/core/CurrentTime.h"
+#include "InterfaceImpl.h"
+#include "Thread.h"
 
 namespace amf
 {

amf/public/common/AMFFactory.cpp

@@ -626,6 +626,27 @@ amf_handle AMF_STD_CALL amf_load_library(const wchar_t* filename)
     return ret;
 }
 
+amf_handle AMF_STD_CALL amf_load_library1(const wchar_t* filename, bool bGlobal)
+{
+    void *ret;
+    if (bGlobal) {
+        ret = dlopen(amf_from_unicode_to_multibyte(filename).c_str(), RTLD_NOW | RTLD_GLOBAL);
+    } else {
+#if defined(__ANDROID__)
+        ret = dlopen(amf_from_unicode_to_multibyte(filename).c_str(), RTLD_NOW | RTLD_LOCAL);
+#else
+        ret = dlopen(amf_from_unicode_to_multibyte(filename).c_str(), RTLD_NOW | RTLD_LOCAL| RTLD_DEEPBIND);
+#endif
+    }
+    
+    if(ret == 0)
+    {
+        const char *err = dlerror();
+        int a=1;
+    }
+    return ret;
+}
+
 void* AMF_STD_CALL amf_get_proc_address(amf_handle module, const char* procName)
 {
     return dlsym(module, procName);