From ae6e0d182ef343e96af665171e09233c2ec4dc24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Fri, 5 Apr 2024 17:17:23 +0200 Subject: [PATCH 001/719] Vulkan: Fix function loading regression affecting MSAA When loading function that have been merged into core, use the core names. --- Common/GPU/Vulkan/VulkanContext.cpp | 19 ++++++++------ Common/GPU/Vulkan/VulkanContext.h | 6 +++-- Common/GPU/Vulkan/VulkanFramebuffer.cpp | 2 +- Common/GPU/Vulkan/VulkanLoader.cpp | 33 ++++++++++++++----------- Common/GPU/Vulkan/VulkanLoader.h | 15 +++++------ 5 files changed, 43 insertions(+), 32 deletions(-) diff --git a/Common/GPU/Vulkan/VulkanContext.cpp b/Common/GPU/Vulkan/VulkanContext.cpp index dc5b9246bc..56f99d1ce7 100644 --- a/Common/GPU/Vulkan/VulkanContext.cpp +++ b/Common/GPU/Vulkan/VulkanContext.cpp @@ -161,12 +161,12 @@ VkResult VulkanContext::CreateInstance(const CreateInfo &info) { // Temporary hack for libretro. For some reason, when we try to load the functions from this extension, // we get null pointers when running libretro. Quite strange. #if !defined(__LIBRETRO__) - if (EnableInstanceExtension(VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME)) { + if (EnableInstanceExtension(VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME, VK_API_VERSION_1_1)) { extensionsLookup_.KHR_get_physical_device_properties2 = true; } #endif - if (EnableInstanceExtension(VK_EXT_SWAPCHAIN_COLOR_SPACE_EXTENSION_NAME)) { + if (EnableInstanceExtension(VK_EXT_SWAPCHAIN_COLOR_SPACE_EXTENSION_NAME, 0)) { extensionsLookup_.EXT_swapchain_colorspace = true; } @@ -217,7 +217,7 @@ VkResult VulkanContext::CreateInstance(const CreateInfo &info) { return res; } - VulkanLoadInstanceFunctions(instance_, extensionsLookup_); + VulkanLoadInstanceFunctions(instance_, extensionsLookup_, vulkanApiVersion_); if (!CheckLayers(instance_layer_properties_, instance_layer_names_)) { WARN_LOG(G3D, "CheckLayers for instance failed"); // init_error_ = "Failed to validate instance layers"; @@ -259,7 +259,7 @@ VkResult VulkanContext::CreateInstance(const CreateInfo &info) { props2.pNext = &pushProps; pushProps.pNext = &extHostMemProps; extHostMemProps.pNext = &depthStencilResolveProps; - vkGetPhysicalDeviceProperties2KHR(physical_devices_[i], &props2); + vkGetPhysicalDeviceProperties2(physical_devices_[i], &props2); // Don't want bad pointers sitting around. props2.pNext = nullptr; pushProps.pNext = nullptr; @@ -604,7 +604,7 @@ void VulkanContext::ChooseDevice(int physical_device) { presentWaitFeatures.pNext = &presentIdFeatures; presentIdFeatures.pNext = nullptr; - vkGetPhysicalDeviceFeatures2KHR(physical_devices_[physical_device_], &features2); + vkGetPhysicalDeviceFeatures2(physical_devices_[physical_device_], &features2); deviceFeatures_.available.standard = features2.features; deviceFeatures_.available.multiview = multiViewFeatures; deviceFeatures_.available.presentWait = presentWaitFeatures; @@ -632,7 +632,10 @@ bool VulkanContext::EnableDeviceExtension(const char *extension, uint32_t coreVe return false; } -bool VulkanContext::EnableInstanceExtension(const char *extension) { +bool VulkanContext::EnableInstanceExtension(const char *extension, uint32_t coreVersion) { + if (coreVersion != 0 && vulkanApiVersion_ >= coreVersion) { + return true; + } for (auto &iter : instance_extension_properties_) { if (!strcmp(iter.extensionName, extension)) { instance_extensions_enabled_.push_back(extension); @@ -747,7 +750,7 @@ VkResult VulkanContext::CreateDevice() { init_error_ = "Unable to create Vulkan device"; ERROR_LOG(G3D, "Unable to create Vulkan device"); } else { - VulkanLoadDeviceFunctions(device_, extensionsLookup_); + VulkanLoadDeviceFunctions(device_, extensionsLookup_, vulkanApiVersion_); } INFO_LOG(G3D, "Vulkan Device created: %s", physicalDeviceProperties_[physical_device_].properties.deviceName); @@ -1762,7 +1765,7 @@ void VulkanContext::GetImageMemoryRequirements(VkImage image, VkMemoryRequiremen VkMemoryDedicatedRequirementsKHR memDedicatedReq{VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS_KHR}; memReq2.pNext = &memDedicatedReq; - vkGetImageMemoryRequirements2KHR(GetDevice(), &memReqInfo2, &memReq2); + vkGetImageMemoryRequirements2(GetDevice(), &memReqInfo2, &memReq2); *mem_reqs = memReq2.memoryRequirements; *dedicatedAllocation = diff --git a/Common/GPU/Vulkan/VulkanContext.h b/Common/GPU/Vulkan/VulkanContext.h index 516b41d6e3..a3d494fa4a 100644 --- a/Common/GPU/Vulkan/VulkanContext.h +++ b/Common/GPU/Vulkan/VulkanContext.h @@ -182,9 +182,11 @@ public: int GetBestPhysicalDevice(); int GetPhysicalDeviceByName(const std::string &name); void ChooseDevice(int physical_device); - bool EnableInstanceExtension(const char *extension); - // The core version is to avoid enabling extensions that are merged into core Vulkan from a certain version. + + // The coreVersion is to avoid enabling extensions that are merged into core Vulkan from a certain version. + bool EnableInstanceExtension(const char *extension, uint32_t coreVersion); bool EnableDeviceExtension(const char *extension, uint32_t coreVersion); + VkResult CreateDevice(); const std::string &InitError() const { return init_error_; } diff --git a/Common/GPU/Vulkan/VulkanFramebuffer.cpp b/Common/GPU/Vulkan/VulkanFramebuffer.cpp index 815d68bb61..f91c49a1aa 100644 --- a/Common/GPU/Vulkan/VulkanFramebuffer.cpp +++ b/Common/GPU/Vulkan/VulkanFramebuffer.cpp @@ -524,7 +524,7 @@ VkRenderPass CreateRenderPass(VulkanContext *vulkan, const RPKey &key, RenderPas rp2.pCorrelatedViewMasks = multiview ? &viewMask : nullptr; rp2.pSubpasses = &subpass2; rp2.subpassCount = 1; - res = vkCreateRenderPass2KHR(vulkan->GetDevice(), &rp2, nullptr, &pass); + res = vkCreateRenderPass2(vulkan->GetDevice(), &rp2, nullptr, &pass); } else { res = vkCreateRenderPass(vulkan->GetDevice(), &rp, nullptr, &pass); } diff --git a/Common/GPU/Vulkan/VulkanLoader.cpp b/Common/GPU/Vulkan/VulkanLoader.cpp index ca404021f8..34abe21723 100644 --- a/Common/GPU/Vulkan/VulkanLoader.cpp +++ b/Common/GPU/Vulkan/VulkanLoader.cpp @@ -74,10 +74,8 @@ PFN_vkBindBufferMemory2 vkBindBufferMemory2; PFN_vkBindImageMemory vkBindImageMemory; PFN_vkBindImageMemory2 vkBindImageMemory2; PFN_vkGetBufferMemoryRequirements vkGetBufferMemoryRequirements; -PFN_vkGetBufferMemoryRequirements2 vkGetBufferMemoryRequirements2; PFN_vkGetDeviceBufferMemoryRequirements vkGetDeviceBufferMemoryRequirements; PFN_vkGetImageMemoryRequirements vkGetImageMemoryRequirements; -PFN_vkGetImageMemoryRequirements2 vkGetImageMemoryRequirements2; PFN_vkGetDeviceImageMemoryRequirements vkGetDeviceImageMemoryRequirements; PFN_vkCreateFence vkCreateFence; PFN_vkDestroyFence vkDestroyFence; @@ -233,11 +231,12 @@ PFN_vkSetDebugUtilsObjectNameEXT vkSetDebugUtilsObjectNameEXT; PFN_vkSetDebugUtilsObjectTagEXT vkSetDebugUtilsObjectTagEXT; // Assorted other extensions. -PFN_vkGetBufferMemoryRequirements2KHR vkGetBufferMemoryRequirements2KHR; -PFN_vkGetImageMemoryRequirements2KHR vkGetImageMemoryRequirements2KHR; -PFN_vkGetPhysicalDeviceProperties2KHR vkGetPhysicalDeviceProperties2KHR; -PFN_vkGetPhysicalDeviceFeatures2KHR vkGetPhysicalDeviceFeatures2KHR; -PFN_vkCreateRenderPass2KHR vkCreateRenderPass2KHR; +PFN_vkGetBufferMemoryRequirements2 vkGetBufferMemoryRequirements2; +PFN_vkGetImageMemoryRequirements2 vkGetImageMemoryRequirements2; +PFN_vkGetPhysicalDeviceProperties2 vkGetPhysicalDeviceProperties2; +PFN_vkGetPhysicalDeviceFeatures2 vkGetPhysicalDeviceFeatures2; +PFN_vkCreateRenderPass2 vkCreateRenderPass2; + PFN_vkWaitForPresentKHR vkWaitForPresentKHR; PFN_vkGetPastPresentationTimingGOOGLE vkGetPastPresentationTimingGOOGLE; PFN_vkGetRefreshCycleDurationGOOGLE vkGetRefreshCycleDurationGOOGLE; @@ -263,7 +262,13 @@ bool g_vulkanAvailabilityChecked = false; bool g_vulkanMayBeAvailable = false; #define LOAD_INSTANCE_FUNC(instance, x) x = (PFN_ ## x)vkGetInstanceProcAddr(instance, #x); if (!x) {INFO_LOG(G3D, "Missing (instance): %s", #x);} +#define LOAD_INSTANCE_FUNC_CORE(instance, x, ext_x, min_core) \ + x = (PFN_ ## x)vkGetInstanceProcAddr(instance, vulkanApiVersion >= min_core ? #x : #ext_x); \ + if (!x) {INFO_LOG(G3D, "Missing (instance): %s (%s)", #x, #ext_x);} #define LOAD_DEVICE_FUNC(instance, x) x = (PFN_ ## x)vkGetDeviceProcAddr(instance, #x); if (!x) {INFO_LOG(G3D, "Missing (device): %s", #x);} +#define LOAD_DEVICE_FUNC_CORE(instance, x, ext_x, min_core) \ + x = (PFN_ ## x)vkGetDeviceProcAddr(instance, vulkanApiVersion >= min_core ? #x : #ext_x); \ + if (!x) {INFO_LOG(G3D, "Missing (device): %s (%s)", #x, #ext_x);} #define LOAD_GLOBAL_FUNC(x) x = (PFN_ ## x)dlsym(vulkanLibrary, #x); if (!x) {INFO_LOG(G3D,"Missing (global): %s", #x);} #define LOAD_GLOBAL_FUNC_LOCAL(lib, x) (PFN_ ## x)dlsym(lib, #x); @@ -579,7 +584,7 @@ bool VulkanLoad(std::string *errorStr) { } } -void VulkanLoadInstanceFunctions(VkInstance instance, const VulkanExtensions &enabledExtensions) { +void VulkanLoadInstanceFunctions(VkInstance instance, const VulkanExtensions &enabledExtensions, uint32_t vulkanApiVersion) { // OK, let's use the above functions to get the rest. LOAD_INSTANCE_FUNC(instance, vkDestroyInstance); LOAD_INSTANCE_FUNC(instance, vkEnumeratePhysicalDevices); @@ -632,8 +637,8 @@ void VulkanLoadInstanceFunctions(VkInstance instance, const VulkanExtensions &en LOAD_INSTANCE_FUNC(instance, vkDestroySurfaceKHR); if (enabledExtensions.KHR_get_physical_device_properties2) { - LOAD_INSTANCE_FUNC(instance, vkGetPhysicalDeviceProperties2KHR); - LOAD_INSTANCE_FUNC(instance, vkGetPhysicalDeviceFeatures2KHR); + LOAD_INSTANCE_FUNC_CORE(instance, vkGetPhysicalDeviceProperties2, vkGetPhysicalDeviceProperties2KHR, VK_API_VERSION_1_1); + LOAD_INSTANCE_FUNC_CORE(instance, vkGetPhysicalDeviceFeatures2, vkGetPhysicalDeviceFeatures2KHR, VK_API_VERSION_1_1); } if (enabledExtensions.EXT_debug_utils) { @@ -652,7 +657,7 @@ void VulkanLoadInstanceFunctions(VkInstance instance, const VulkanExtensions &en // On some implementations, loading functions (that have Device as their first parameter) via vkGetDeviceProcAddr may // increase performance - but then these function pointers will only work on that specific device. Thus, this loader is not very // good for multi-device - not likely we'll ever try that anyway though. -void VulkanLoadDeviceFunctions(VkDevice device, const VulkanExtensions &enabledExtensions) { +void VulkanLoadDeviceFunctions(VkDevice device, const VulkanExtensions &enabledExtensions, uint32_t vulkanApiVersion) { INFO_LOG(G3D, "Vulkan device functions loaded."); LOAD_DEVICE_FUNC(device, vkQueueSubmit); @@ -785,11 +790,11 @@ void VulkanLoadDeviceFunctions(VkDevice device, const VulkanExtensions &enabledE LOAD_DEVICE_FUNC(device, vkGetRefreshCycleDurationGOOGLE); } if (enabledExtensions.KHR_dedicated_allocation) { - LOAD_DEVICE_FUNC(device, vkGetBufferMemoryRequirements2KHR); - LOAD_DEVICE_FUNC(device, vkGetImageMemoryRequirements2KHR); + LOAD_DEVICE_FUNC_CORE(device, vkGetBufferMemoryRequirements2, vkGetBufferMemoryRequirements2KHR, VK_API_VERSION_1_1); + LOAD_DEVICE_FUNC_CORE(device, vkGetImageMemoryRequirements2, vkGetImageMemoryRequirements2KHR, VK_API_VERSION_1_1); } if (enabledExtensions.KHR_create_renderpass2) { - LOAD_DEVICE_FUNC(device, vkCreateRenderPass2KHR); + LOAD_DEVICE_FUNC_CORE(device, vkCreateRenderPass2, vkCreateRenderPass2KHR, VK_API_VERSION_1_2); } } diff --git a/Common/GPU/Vulkan/VulkanLoader.h b/Common/GPU/Vulkan/VulkanLoader.h index a08c232daa..1d1c3d0a17 100644 --- a/Common/GPU/Vulkan/VulkanLoader.h +++ b/Common/GPU/Vulkan/VulkanLoader.h @@ -230,12 +230,13 @@ extern PFN_vkSetDebugUtilsObjectNameEXT vkSetDebugUtilsObjectNameEXT; extern PFN_vkSetDebugUtilsObjectTagEXT vkSetDebugUtilsObjectTagEXT; // Assorted other extensions. -extern PFN_vkGetBufferMemoryRequirements2KHR vkGetBufferMemoryRequirements2KHR; -extern PFN_vkGetImageMemoryRequirements2KHR vkGetImageMemoryRequirements2KHR; +extern PFN_vkGetBufferMemoryRequirements2 vkGetBufferMemoryRequirements2; +extern PFN_vkGetImageMemoryRequirements2 vkGetImageMemoryRequirements2; +extern PFN_vkGetPhysicalDeviceProperties2 vkGetPhysicalDeviceProperties2; +extern PFN_vkGetPhysicalDeviceFeatures2 vkGetPhysicalDeviceFeatures2; +extern PFN_vkCreateRenderPass2 vkCreateRenderPass2; + extern PFN_vkGetMemoryHostPointerPropertiesEXT vkGetMemoryHostPointerPropertiesEXT; -extern PFN_vkGetPhysicalDeviceProperties2KHR vkGetPhysicalDeviceProperties2KHR; -extern PFN_vkGetPhysicalDeviceFeatures2KHR vkGetPhysicalDeviceFeatures2KHR; -extern PFN_vkCreateRenderPass2KHR vkCreateRenderPass2KHR; extern PFN_vkWaitForPresentKHR vkWaitForPresentKHR; extern PFN_vkGetPastPresentationTimingGOOGLE vkGetPastPresentationTimingGOOGLE; extern PFN_vkGetRefreshCycleDurationGOOGLE vkGetRefreshCycleDurationGOOGLE; @@ -268,8 +269,8 @@ bool VulkanMayBeAvailable(); void VulkanSetAvailable(bool available); bool VulkanLoad(std::string *errorStr); -void VulkanLoadInstanceFunctions(VkInstance instance, const VulkanExtensions &enabledExtensions); -void VulkanLoadDeviceFunctions(VkDevice device, const VulkanExtensions &enabledExtensions); +void VulkanLoadInstanceFunctions(VkInstance instance, const VulkanExtensions &enabledExtensions, uint32_t vulkanApiVersion); +void VulkanLoadDeviceFunctions(VkDevice device, const VulkanExtensions &enabledExtensions, uint32_t vulkanApiVersion); void VulkanFree(); const char *VulkanResultToString(VkResult res); From f54b5e03becdec32aca2bcea5f77afe5c0ff2e30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Fri, 5 Apr 2024 11:03:33 +0200 Subject: [PATCH 002/719] Use remove_if correctly. --- Core/Config.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Core/Config.cpp b/Core/Config.cpp index f4d77b1de7..b62a5e2dfa 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -1516,10 +1516,12 @@ void Config::RemoveRecent(const std::string &file) { std::lock_guard guard(private_->recentIsosLock); const auto &filename = File::ResolvePath(file); - std::remove_if(recentIsos.begin(), recentIsos.end(), [filename](const auto &str) { + auto iter = std::remove_if(recentIsos.begin(), recentIsos.end(), [filename](const auto &str) { const auto &recent = File::ResolvePath(str); return filename == recent; }); + // remove_if is weird. + recentIsos.erase(iter, recentIsos.end()); } void Config::CleanRecent() { From 5a8140c301aff3250976c4d9da3e0cec57343556 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Fri, 5 Apr 2024 11:07:57 +0200 Subject: [PATCH 003/719] Initialize RAIntegration support if available. Untested. --- .gitignore | 2 + Common/System/System.h | 4 +- Core/Config.cpp | 1 + Core/Config.h | 1 + Core/Core.vcxproj | 8 +- Core/RetroAchievements.cpp | 129 ++++++++++++++++++-- Core/RetroAchievements.h | 17 +-- Qt/QtMain.cpp | 2 +- SDL/SDLMain.cpp | 2 +- UI/MiscScreens.cpp | 4 +- UI/PauseScreen.cpp | 24 +++- UI/PauseScreen.h | 2 + UI/RetroAchievementScreens.cpp | 3 + UI/UI.vcxproj | 8 +- UWP/PPSSPP_UWPMain.cpp | 2 +- Windows/MainWindowMenu.cpp | 11 +- Windows/PPSSPP.vcxproj | 8 +- Windows/main.cpp | 4 +- android/jni/app-android.cpp | 2 +- ext/rcheevos-build/rcheevos.vcxproj | 9 +- ext/rcheevos-build/rcheevos.vcxproj.filters | 3 + headless/Headless.cpp | 2 +- ios/main.mm | 2 +- libretro/libretro.cpp | 2 +- unittest/UnitTest.cpp | 2 +- 25 files changed, 201 insertions(+), 53 deletions(-) diff --git a/.gitignore b/.gitignore index 71c0425320..cc442f2568 100644 --- a/.gitignore +++ b/.gitignore @@ -136,6 +136,8 @@ build libretro/obj/local ppsspp_retroachievements.dat +RACache +RAPrefs_PPSSPP.cfg # For CLion cmake-build-*/ diff --git a/Common/System/System.h b/Common/System/System.h index 0812930090..f0d1575de4 100644 --- a/Common/System/System.h +++ b/Common/System/System.h @@ -192,6 +192,8 @@ enum SystemProperty { SYSPROP_USER_DOCUMENTS_DIR, SYSPROP_OK_BUTTON_LEFT, + + SYSPROP_MAIN_WINDOW_HANDLE, }; enum class SystemNotification { @@ -252,7 +254,7 @@ enum class UIMessage { std::string System_GetProperty(SystemProperty prop); std::vector System_GetPropertyStringVec(SystemProperty prop); -int System_GetPropertyInt(SystemProperty prop); +int64_t System_GetPropertyInt(SystemProperty prop); float System_GetPropertyFloat(SystemProperty prop); bool System_GetPropertyBool(SystemProperty prop); diff --git a/Core/Config.cpp b/Core/Config.cpp index b62a5e2dfa..c063bb1546 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -314,6 +314,7 @@ static bool DefaultSasThread() { static const ConfigSetting achievementSettings[] = { // Core settings ConfigSetting("AchievementsEnable", &g_Config.bAchievementsEnable, true, CfgFlag::DEFAULT), + ConfigSetting("AchievementsEnableRAIntegration", &g_Config.bAchievementsEnableRAIntegration, false, CfgFlag::DEFAULT), ConfigSetting("AchievementsChallengeMode", &g_Config.bAchievementsChallengeMode, true, CfgFlag::PER_GAME | CfgFlag::DEFAULT), ConfigSetting("AchievementsEncoreMode", &g_Config.bAchievementsEncoreMode, false, CfgFlag::PER_GAME | CfgFlag::DEFAULT), ConfigSetting("AchievementsUnofficial", &g_Config.bAchievementsUnofficial, false, CfgFlag::PER_GAME | CfgFlag::DEFAULT), diff --git a/Core/Config.h b/Core/Config.h index c6f6e55a9a..399a526698 100644 --- a/Core/Config.h +++ b/Core/Config.h @@ -528,6 +528,7 @@ public: bool bAchievementsSoundEffects; bool bAchievementsLogBadMemReads; bool bAchievementsSaveStateInHardcoreMode; + bool bAchievementsEnableRAIntegration; // Positioning of the various notifications int iAchievementsLeaderboardTrackerPos; diff --git a/Core/Core.vcxproj b/Core/Core.vcxproj index c9acd32dc1..7c24591a85 100644 --- a/Core/Core.vcxproj +++ b/Core/Core.vcxproj @@ -139,7 +139,7 @@ Level3 ..\ffmpeg\WindowsInclude;..\ext\libchdr\include;..\ffmpeg\Windows\x86\include;../common;..;../ext/glew;../ext/snappy;../ext/libpng17;../ext/zlib;../ext;../ext/zstd/lib - _CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;USE_FFMPEG;WITH_UPNP;WIN32;_ARCH_32=1;_M_IX86=1;_DEBUG;_LIB;_UNICODE;UNICODE;MINIUPNP_STATICLIB;ARMIPS_USE_STD_FILESYSTEM;%(PreprocessorDefinitions) + RC_CLIENT_SUPPORTS_RAINTEGRATION;_CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;USE_FFMPEG;WITH_UPNP;WIN32;_ARCH_32=1;_M_IX86=1;_DEBUG;_LIB;_UNICODE;UNICODE;MINIUPNP_STATICLIB;ARMIPS_USE_STD_FILESYSTEM;%(PreprocessorDefinitions) StreamingSIMDExtensions2 Precise true @@ -166,7 +166,7 @@ Level3 ..\ffmpeg\WindowsInclude;..\ext\libchdr\include;..\ffmpeg\Windows\x86_64\include;../common;..;../ext/glew;../ext/snappy;../ext/libpng17;../ext/zlib;../ext;../ext/zstd/lib;../ext/zstd/lib - _CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;USE_FFMPEG;WITH_UPNP;WIN32;_ARCH_64=1;_M_X64=1;_DEBUG;_LIB;_UNICODE;UNICODE;MINIUPNP_STATICLIB;ARMIPS_USE_STD_FILESYSTEM;%(PreprocessorDefinitions) + RC_CLIENT_SUPPORTS_RAINTEGRATION;_CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;USE_FFMPEG;WITH_UPNP;WIN32;_ARCH_64=1;_M_X64=1;_DEBUG;_LIB;_UNICODE;UNICODE;MINIUPNP_STATICLIB;ARMIPS_USE_STD_FILESYSTEM;%(PreprocessorDefinitions) NotSet Precise false @@ -257,7 +257,7 @@ false StreamingSIMDExtensions2 Precise - USING_WIN_UI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;USE_FFMPEG;WITH_UPNP;WIN32;_ARCH_32=1;_M_IX86=1;_LIB;NDEBUG;_UNICODE;UNICODE;MINIUPNP_STATICLIB;ARMIPS_USE_STD_FILESYSTEM;%(PreprocessorDefinitions) + RC_CLIENT_SUPPORTS_RAINTEGRATION;USING_WIN_UI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;USE_FFMPEG;WITH_UPNP;WIN32;_ARCH_32=1;_M_IX86=1;_LIB;NDEBUG;_UNICODE;UNICODE;MINIUPNP_STATICLIB;ARMIPS_USE_STD_FILESYSTEM;%(PreprocessorDefinitions) Speed MultiThreaded true @@ -294,7 +294,7 @@ Speed false true - USING_WIN_UI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;USE_FFMPEG;WITH_UPNP;WIN32;_ARCH_64=1;_M_X64=1;_LIB;NDEBUG;_UNICODE;UNICODE;MINIUPNP_STATICLIB;ARMIPS_USE_STD_FILESYSTEM;%(PreprocessorDefinitions) + RC_CLIENT_SUPPORTS_RAINTEGRATION;USING_WIN_UI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;USE_FFMPEG;WITH_UPNP;WIN32;_ARCH_64=1;_M_X64=1;_LIB;NDEBUG;_UNICODE;UNICODE;MINIUPNP_STATICLIB;ARMIPS_USE_STD_FILESYSTEM;%(PreprocessorDefinitions) false MultiThreaded true diff --git a/Core/RetroAchievements.cpp b/Core/RetroAchievements.cpp index 8ef5be7b89..9b743bc99b 100644 --- a/Core/RetroAchievements.cpp +++ b/Core/RetroAchievements.cpp @@ -25,6 +25,7 @@ #include "ext/rcheevos/include/rcheevos.h" #include "ext/rcheevos/include/rc_client.h" +#include "ext/rcheevos/include/rc_client_raintegration.h" #include "ext/rcheevos/include/rc_api_user.h" #include "ext/rcheevos/include/rc_api_info.h" #include "ext/rcheevos/include/rc_api_request.h" @@ -38,8 +39,6 @@ #include "Common/Log.h" #include "Common/File/Path.h" #include "Common/File/FileUtil.h" -#include "Core/FileLoaders/LocalFileLoader.h" -#include "Core/FileSystems/BlockDevices.h" #include "Common/Net/HTTPClient.h" #include "Common/System/OSD.h" #include "Common/System/System.h" @@ -55,19 +54,28 @@ #include "Core/MemMap.h" #include "Core/Config.h" #include "Core/CoreParameter.h" -#include "Core/ELF/ParamSFO.h" +#include "Core/Core.h" #include "Core/System.h" +#include "Core/FileLoaders/LocalFileLoader.h" +#include "Core/FileSystems/BlockDevices.h" +#include "Core/ELF/ParamSFO.h" #include "Core/FileSystems/MetaFileSystem.h" #include "Core/FileSystems/ISOFileSystem.h" #include "Core/RetroAchievements.h" +#if RC_CLIENT_SUPPORTS_RAINTEGRATION + +#include "Windows/MainWindow.h" + +#endif + static bool HashISOFile(ISOFileSystem *fs, const std::string filename, md5_context *md5) { int handle = fs->OpenFile(filename, FILEACCESS_READ); if (handle < 0) { return false; } - uint32_t sz = fs->SeekFile(handle, 0, FILEMOVE_END); + uint32_t sz = (uint32_t)fs->SeekFile(handle, 0, FILEMOVE_END); fs->SeekFile(handle, 0, FILEMOVE_BEGIN); if (!sz) { return false; @@ -131,7 +139,7 @@ static Achievements::Statistics g_stats; const std::string g_gameIconCachePrefix = "game:"; const std::string g_iconCachePrefix = "badge:"; -Path s_game_path; +Path g_gamePath; std::string s_game_hash; std::set g_activeChallenges; @@ -461,6 +469,93 @@ static void login_token_callback(int result, const char *error_message, rc_clien g_isLoggingIn = false; } +bool RAIntegrationDirty() { +#ifdef RC_CLIENT_SUPPORTS_RAINTEGRATION + return rc_client_raintegration_has_modifications(g_rcClient); +#else + return false; +#endif +} + +#ifdef RC_CLIENT_SUPPORTS_RAINTEGRATION + +static void raintegration_get_game_name_handler(char *buffer, uint32_t buffer_size, rc_client_t *client) { + snprintf(buffer, buffer_size, "%s", g_gamePath.GetFilename().c_str()); +} + +static void raintegration_write_memory_handler(uint32_t address, uint8_t *buffer, uint32_t num_bytes, rc_client_t *client) { + // convert_retroachievements_address_to_real_address + uint32_t realAddress = address + PSP_MEMORY_OFFSET; + uint8_t *writePtr = Memory::GetPointerWriteRange(address, num_bytes); + if (writePtr) { + memcpy(writePtr, buffer, num_bytes); + } +} + +static void raintegration_event_handler(const rc_client_raintegration_event_t *event, rc_client_t *client) { + switch (event->type) { + case RC_CLIENT_RAINTEGRATION_EVENT_MENUITEM_CHECKED_CHANGED: + // The checked state of one of the menu items has changed and should be reflected in the UI. + // Call the handy helper function if the menu was created by rc_client_raintegration_rebuild_submenu. + rc_client_raintegration_update_menu_item(client, event->menu_item); + break; + case RC_CLIENT_RAINTEGRATION_EVENT_PAUSE: + // The toolkit has hit a breakpoint and wants to pause the emulator. Do so. + Core_EnableStepping(true, "ra_breakpoint"); + break; + case RC_CLIENT_RAINTEGRATION_EVENT_HARDCORE_CHANGED: + // Hardcore mode has been changed (either directly by the user, or disabled through the use of the tools). + // The frontend doesn't necessarily need to know that this value changed, they can still query it whenever + // it's appropriate, but the event lets the frontend do things like enable/disable rewind or cheats. + // handle_hardcore_changed(); + break; + default: + ERROR_LOG(ACHIEVEMENTS, "Unsupported raintegration event %u\n", event->type); + break; + } +} + +static void load_integration_callback(int result, const char *error_message, rc_client_t *client, void *userdata) { + auto ac = GetI18NCategory(I18NCat::ACHIEVEMENTS); + + // If DLL not present, do nothing. User can still play without the toolkit. + switch (result) { + case RC_OK: + { + // If not successful, just report the error and bail. Shouldn't happen. + + // DLL was loaded. + g_OSD.Show(OSDType::MESSAGE_SUCCESS, ac->T("RAIntegration DLL loaded.")); + + // Hook up menu. + HWND hWnd = (HWND)userdata; + rc_client_raintegration_set_event_handler(g_rcClient, &raintegration_event_handler); + rc_client_raintegration_set_write_memory_function(g_rcClient, &raintegration_write_memory_handler); + rc_client_raintegration_set_get_game_name_function(g_rcClient, &raintegration_get_game_name_handler); + rc_client_raintegration_rebuild_submenu(g_rcClient, GetMenu(hWnd)); + break; + } + case RC_MISSING_VALUE: + // This is fine, proceeding to login. + g_OSD.Show(OSDType::MESSAGE_WARNING, ac->T("RAIntegration is enabled, but RAIntegration-x64.dll was not found.")); + break; + case RC_ABORTED: + // This is fine, proceeding to login. + g_OSD.Show(OSDType::MESSAGE_WARNING, ac->T("Wrong version of RAIntegration-x64.dll?")); + break; + default: + g_OSD.Show(OSDType::MESSAGE_ERROR, StringFromFormat("RAIntegration init failed: %s", error_message)); + // Bailing. + return; + } + + // Things are ready to load a game. If the DLL was initialized, calling rc_client_begin_load_game will be redirected + // through the DLL so the toolkit has access to the game data. Similarly, things like rc_create_leaderboard_list will + // be redirected through the DLL to reflect any local changes made by the user. + TryLoginByToken(true); +} +#endif + void Initialize() { if (!g_Config.bAchievementsEnable) { _dbg_assert_(!g_rcClient); @@ -477,7 +572,6 @@ void Initialize() { // Provide a logging function to simplify debugging rc_client_enable_logging(g_rcClient, RC_CLIENT_LOG_LEVEL_VERBOSE, log_message_callback); - if (!System_GetPropertyBool(SYSPROP_SUPPORTS_HTTPS)) { // Disable SSL if not supported by our platform implementation. rc_client_set_host(g_rcClient, "http://retroachievements.org"); @@ -485,6 +579,21 @@ void Initialize() { rc_client_set_event_handler(g_rcClient, event_handler_callback); +#ifdef RC_CLIENT_SUPPORTS_RAINTEGRATION + if (g_Config.bAchievementsEnableRAIntegration) { + wchar_t szFilePath[MAX_PATH]; + GetModuleFileNameW(NULL, szFilePath, MAX_PATH); + for (int64_t i = wcslen(szFilePath) - 1; i > 0; i--) { + if (szFilePath[i] == '\\') { + szFilePath[i] = '\0'; + break; + } + } + HWND hWnd = (HWND)System_GetPropertyInt(SYSPROP_MAIN_WINDOW_HANDLE); + rc_client_begin_load_raintegration(g_rcClient, szFilePath, hWnd, "PPSSPP", "1.0", &load_integration_callback, hWnd); + return; + } +#endif TryLoginByToken(true); } @@ -551,7 +660,7 @@ static void login_password_callback(int result, const char *error_message, rc_cl bool LoginAsync(const char *username, const char *password) { auto di = GetI18NCategory(I18NCat::DIALOG); - if (IsLoggedIn() || std::strlen(username) == 0 || std::strlen(password) == 0 || IsUsingRAIntegration()) + if (IsLoggedIn() || std::strlen(username) == 0 || std::strlen(password) == 0) return false; g_OSD.SetProgressBar("cheevos_async_login", di->T("Logging in..."), 0, 0, 0, 0.0f); @@ -587,6 +696,9 @@ void UpdateSettings() { bool Shutdown() { g_activeChallenges.clear(); +#ifdef RC_CLIENT_SUPPORTS_RAINTEGRATION + rc_client_unload_raintegration(g_rcClient); +#endif rc_client_destroy(g_rcClient); g_rcClient = nullptr; INFO_LOG(ACHIEVEMENTS, "Achievements shut down."); @@ -832,6 +944,7 @@ void SetGame(const Path &path, IdentifiedFileType fileType, FileLoader *fileLoad } // The caller should hold off on executing game code until this turns false, checking with IsBlockingExecution() + g_gamePath = path; g_isIdentifying = true; // TODO: Fish the block device out of the loading process somewhere else. Though, probably easier to just do it here. @@ -861,6 +974,8 @@ void SetGame(const Path &path, IdentifiedFileType fileType, FileLoader *fileLoad void UnloadGame() { if (g_rcClient) { rc_client_unload_game(g_rcClient); + g_gamePath.clear(); + s_game_hash.clear(); } } diff --git a/Core/RetroAchievements.h b/Core/RetroAchievements.h index 324976128b..2d68258a3b 100644 --- a/Core/RetroAchievements.h +++ b/Core/RetroAchievements.h @@ -34,20 +34,6 @@ struct Statistics { int badMemoryAccessCount; }; -// RAIntegration only exists for Windows, so no point checking it on other platforms. -#ifdef WITH_RAINTEGRATION - -bool IsUsingRAIntegration(); - -#else - -static inline bool IsUsingRAIntegration() -{ - return false; -} - -#endif - // Returns true if the user is logged in properly, and everything is set up for playing games with achievements. bool IsLoggedIn(); @@ -80,6 +66,9 @@ bool WarnUserIfHardcoreModeActive(bool isSaveStateAction, std::string_view messa // Returns the length of the string. If (size_t)-1, there's no message. size_t GetRichPresenceMessage(char *buffer, size_t bufSize); +// Returns true if the user has unsaved RAIntegration changes. Should prompt the user to be sure they want to exit. +bool RAIntegrationDirty(); + // The new API is so much nicer that we can use it directly instead of wrapping it. So let's expose the client. // Will of course return nullptr if not active. rc_client_t *GetClient(); diff --git a/Qt/QtMain.cpp b/Qt/QtMain.cpp index c20058af25..85151fc1b5 100644 --- a/Qt/QtMain.cpp +++ b/Qt/QtMain.cpp @@ -185,7 +185,7 @@ std::vector System_GetPropertyStringVec(SystemProperty prop) { } } -int System_GetPropertyInt(SystemProperty prop) { +int64_t System_GetPropertyInt(SystemProperty prop) { switch (prop) { #if defined(SDL) case SYSPROP_AUDIO_SAMPLE_RATE: diff --git a/SDL/SDLMain.cpp b/SDL/SDLMain.cpp index cbd90ae514..9a5044be8a 100644 --- a/SDL/SDLMain.cpp +++ b/SDL/SDLMain.cpp @@ -492,7 +492,7 @@ std::vector System_GetPropertyStringVec(SystemProperty prop) { } } -int System_GetPropertyInt(SystemProperty prop) { +int64_t System_GetPropertyInt(SystemProperty prop) { switch (prop) { case SYSPROP_AUDIO_SAMPLE_RATE: return g_retFmt.freq; diff --git a/UI/MiscScreens.cpp b/UI/MiscScreens.cpp index a038f5e6f5..dc5764ecea 100644 --- a/UI/MiscScreens.cpp +++ b/UI/MiscScreens.cpp @@ -553,7 +553,9 @@ UI::EventReturn PromptScreen::OnNo(UI::EventParams &e) { } void PromptScreen::TriggerFinish(DialogResult result) { - callback_(result == DR_OK || result == DR_YES); + if (callback_) { + callback_(result == DR_OK || result == DR_YES); + } UIDialogScreenWithBackground::TriggerFinish(result); } diff --git a/UI/PauseScreen.cpp b/UI/PauseScreen.cpp index 2b384e44bb..fbf939f25e 100644 --- a/UI/PauseScreen.cpp +++ b/UI/PauseScreen.cpp @@ -258,7 +258,7 @@ void GamePauseScreen::update() { UIScreen::update(); if (finishNextFrame_) { - TriggerFinish(DR_CANCEL); + TriggerFinish(finishNextFrameResult_); finishNextFrame_ = false; } @@ -494,10 +494,26 @@ UI::EventReturn GamePauseScreen::OnScreenshotClicked(UI::EventParams &e) { } UI::EventReturn GamePauseScreen::OnExitToMenu(UI::EventParams &e) { - if (g_Config.bPauseMenuExitsEmulator) { - System_ExitApp(); + // If RAIntegration has dirty info, ask for confirmation. + if (Achievements::RAIntegrationDirty()) { + auto ac = GetI18NCategory(I18NCat::ACHIEVEMENTS); + auto di = GetI18NCategory(I18NCat::DIALOG); + screenManager()->push(new PromptScreen(gamePath_, ac->T("You have unsaved RAIntegration changes. Exit?"), di->T("Yes"), di->T("No"), [=](bool result) { + if (result) { + if (g_Config.bPauseMenuExitsEmulator) { + System_ExitApp(); + } else { + finishNextFrameResult_ = DR_OK; // exit game + finishNextFrame_ = true; + } + } + })); } else { - TriggerFinish(DR_OK); + if (g_Config.bPauseMenuExitsEmulator) { + System_ExitApp(); + } else { + TriggerFinish(DR_OK); + } } return UI::EVENT_DONE; } diff --git a/UI/PauseScreen.h b/UI/PauseScreen.h index 64f2c6cf8e..3e039338a2 100644 --- a/UI/PauseScreen.h +++ b/UI/PauseScreen.h @@ -24,6 +24,7 @@ #include "Common/UI/UIScreen.h" #include "Common/UI/ViewGroup.h" #include "UI/MiscScreens.h" +#include "UI/Screen.h" enum class PauseScreenMode { MAIN, @@ -65,6 +66,7 @@ private: // hack bool finishNextFrame_ = false; + DialogResult finishNextFrameResult_ = DR_CANCEL; PauseScreenMode mode_ = PauseScreenMode::MAIN; UI::Button *playButton_ = nullptr; diff --git a/UI/RetroAchievementScreens.cpp b/UI/RetroAchievementScreens.cpp index 71535bc81a..f7efd65fac 100644 --- a/UI/RetroAchievementScreens.cpp +++ b/UI/RetroAchievementScreens.cpp @@ -382,6 +382,9 @@ void RetroAchievementsSettingsScreen::CreateDeveloperToolsTab(UI::ViewGroup *vie using namespace UI; viewGroup->Add(new ItemHeader(di->T("Settings"))); +#ifdef RC_CLIENT_SUPPORTS_RAINTEGRATION + viewGroup->Add(new CheckBox(&g_Config.bAchievementsEnableRAIntegration, ac->T("Enable RAIntegration (for achievement development)")))->SetEnabledPtr(&g_Config.bAchievementsEnable); +#endif viewGroup->Add(new CheckBox(&g_Config.bAchievementsEncoreMode, ac->T("Encore Mode")))->SetEnabledPtr(&g_Config.bAchievementsEnable); viewGroup->Add(new CheckBox(&g_Config.bAchievementsUnofficial, ac->T("Unofficial achievements")))->SetEnabledPtr(&g_Config.bAchievementsEnable); viewGroup->Add(new CheckBox(&g_Config.bAchievementsLogBadMemReads, ac->T("Log bad memory accesses")))->SetEnabledPtr(&g_Config.bAchievementsEnable); diff --git a/UI/UI.vcxproj b/UI/UI.vcxproj index aff7187e61..74aefd02e6 100644 --- a/UI/UI.vcxproj +++ b/UI/UI.vcxproj @@ -221,7 +221,7 @@ Level3 - _CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;_ARCH_32=1;WIN32;_DEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions) + RC_CLIENT_SUPPORTS_RAINTEGRATION;_CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;_ARCH_32=1;WIN32;_DEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions) ..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/zlib;../ext true false @@ -242,7 +242,7 @@ Level3 - _CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;_ARCH_64=1;WIN32;_DEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions) + RC_CLIENT_SUPPORTS_RAINTEGRATION;_CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;_ARCH_64=1;WIN32;_DEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions) ..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/zlib;../ext true false @@ -312,7 +312,7 @@ MaxSpeed true true - USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;_ARCH_32=1;WIN32;NDEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions) + RC_CLIENT_SUPPORTS_RAINTEGRATION;USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;_ARCH_32=1;WIN32;NDEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions) ..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/zlib;../ext false Size @@ -339,7 +339,7 @@ MaxSpeed true true - USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;_ARCH_64=1;WIN32;NDEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions) + RC_CLIENT_SUPPORTS_RAINTEGRATION;USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;_ARCH_64=1;WIN32;NDEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions) ..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/zlib;../ext false true diff --git a/UWP/PPSSPP_UWPMain.cpp b/UWP/PPSSPP_UWPMain.cpp index f90e96ae50..17ab3a38ab 100644 --- a/UWP/PPSSPP_UWPMain.cpp +++ b/UWP/PPSSPP_UWPMain.cpp @@ -354,7 +354,7 @@ std::vector System_GetPropertyStringVec(SystemProperty prop) { } } -int System_GetPropertyInt(SystemProperty prop) { +int64_t System_GetPropertyInt(SystemProperty prop) { switch (prop) { case SYSPROP_AUDIO_SAMPLE_RATE: return winAudioBackend ? winAudioBackend->GetSampleRate() : -1; diff --git a/Windows/MainWindowMenu.cpp b/Windows/MainWindowMenu.cpp index 22ab1e0e86..af6a81f5c5 100644 --- a/Windows/MainWindowMenu.cpp +++ b/Windows/MainWindowMenu.cpp @@ -53,6 +53,10 @@ #include "Core/Core.h" #include "Core/RetroAchievements.h" +#ifdef RC_CLIENT_SUPPORTS_RAINTEGRATION +#include "ext/rcheevos/include/rc_client_raintegration.h" +#endif + extern bool g_TakeScreenshot; namespace MainWindow { @@ -946,7 +950,12 @@ namespace MainWindow { break; default: - MessageBox(hWnd, L"Unimplemented", L"Sorry", 0); +#ifdef RC_CLIENT_SUPPORTS_RAINTEGRATION + if (rc_client_raintegration_activate_menu_item(Achievements::GetClient(), LOWORD(wParam))) { + break; + } +#endif + MessageBox(hWnd, L"Unhandled menu item", L"Sorry", 0); break; } } diff --git a/Windows/PPSSPP.vcxproj b/Windows/PPSSPP.vcxproj index 01128f75fb..c9835d7268 100644 --- a/Windows/PPSSPP.vcxproj +++ b/Windows/PPSSPP.vcxproj @@ -231,7 +231,7 @@ - _CRTDBG_MAP_ALLOC;USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_ARCH_32=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) + RC_CLIENT_SUPPORTS_RAINTEGRATION;_CRTDBG_MAP_ALLOC;USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_ARCH_32=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) false Sync Use @@ -271,7 +271,7 @@ false - _CRTDBG_MAP_ALLOC;USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_ARCH_64=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) + RC_CLIENT_SUPPORTS_RAINTEGRATION;_CRTDBG_MAP_ALLOC;USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_ARCH_64=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) Sync Use Level3 @@ -378,7 +378,7 @@ AnySuitable true Speed - USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_ARCH_32=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) + RC_CLIENT_SUPPORTS_RAINTEGRATION;USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_ARCH_32=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) true Sync MultiThreaded @@ -428,7 +428,7 @@ true Speed false - USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_ARCH_64=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) + RC_CLIENT_SUPPORTS_RAINTEGRATION;USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_ARCH_64=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) true Sync MultiThreaded diff --git a/Windows/main.cpp b/Windows/main.cpp index 2e0eed488f..12c259ce70 100644 --- a/Windows/main.cpp +++ b/Windows/main.cpp @@ -307,8 +307,10 @@ static int ScreenRefreshRateHz() { return rate; } -int System_GetPropertyInt(SystemProperty prop) { +int64_t System_GetPropertyInt(SystemProperty prop) { switch (prop) { + case SYSPROP_MAIN_WINDOW_HANDLE: + return (int64_t)MainWindow::GetHWND(); case SYSPROP_AUDIO_SAMPLE_RATE: return winAudioBackend ? winAudioBackend->GetSampleRate() : -1; case SYSPROP_DEVICE_TYPE: diff --git a/android/jni/app-android.cpp b/android/jni/app-android.cpp index 6dcb3d79a5..c81cf9efeb 100644 --- a/android/jni/app-android.cpp +++ b/android/jni/app-android.cpp @@ -441,7 +441,7 @@ std::vector System_GetPropertyStringVec(SystemProperty prop) { } } -int System_GetPropertyInt(SystemProperty prop) { +int64_t System_GetPropertyInt(SystemProperty prop) { switch (prop) { case SYSPROP_SYSTEMVERSION: return androidVersion; diff --git a/ext/rcheevos-build/rcheevos.vcxproj b/ext/rcheevos-build/rcheevos.vcxproj index 79b363f0d1..cf48da65c5 100644 --- a/ext/rcheevos-build/rcheevos.vcxproj +++ b/ext/rcheevos-build/rcheevos.vcxproj @@ -55,6 +55,7 @@ + @@ -174,7 +175,7 @@ Level3 - RC_DISABLE_LUA;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + RC_DISABLE_LUA;RC_CLIENT_SUPPORTS_RAINTEGRATION;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true pch.h ../rcheevos/include @@ -217,7 +218,7 @@ MaxSpeed true true - RC_DISABLE_LUA;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + RC_DISABLE_LUA;RC_CLIENT_SUPPORTS_RAINTEGRATION;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true pch.h ../rcheevos/include @@ -268,7 +269,7 @@ Level3 true - RC_DISABLE_LUA;_DEBUG;_LIB;%(PreprocessorDefinitions) + RC_DISABLE_LUA;RC_CLIENT_SUPPORTS_RAINTEGRATION;_DEBUG;_LIB;%(PreprocessorDefinitions) true pch.h ../rcheevos/include @@ -314,7 +315,7 @@ MaxSpeed true true - RC_DISABLE_LUA;NDEBUG;_LIB;%(PreprocessorDefinitions) + RC_DISABLE_LUA;RC_CLIENT_SUPPORTS_RAINTEGRATION;NDEBUG;_LIB;%(PreprocessorDefinitions) true pch.h ../rcheevos/include diff --git a/ext/rcheevos-build/rcheevos.vcxproj.filters b/ext/rcheevos-build/rcheevos.vcxproj.filters index ecfebb17c1..3428444b59 100644 --- a/ext/rcheevos-build/rcheevos.vcxproj.filters +++ b/ext/rcheevos-build/rcheevos.vcxproj.filters @@ -84,6 +84,9 @@ rhash + + rcheevos + diff --git a/headless/Headless.cpp b/headless/Headless.cpp index 815d1d622e..2a802a2cc2 100644 --- a/headless/Headless.cpp +++ b/headless/Headless.cpp @@ -99,7 +99,7 @@ void NativeResized() { } std::string System_GetProperty(SystemProperty prop) { return ""; } std::vector System_GetPropertyStringVec(SystemProperty prop) { return std::vector(); } -int System_GetPropertyInt(SystemProperty prop) { +int64_t System_GetPropertyInt(SystemProperty prop) { if (prop == SYSPROP_SYSTEMVERSION) return 31; return -1; diff --git a/ios/main.mm b/ios/main.mm index f9c0c11430..2425469e6e 100644 --- a/ios/main.mm +++ b/ios/main.mm @@ -303,7 +303,7 @@ std::vector System_GetPropertyStringVec(SystemProperty prop) { } } -int System_GetPropertyInt(SystemProperty prop) { +int64_t System_GetPropertyInt(SystemProperty prop) { switch (prop) { case SYSPROP_AUDIO_SAMPLE_RATE: return 44100; diff --git a/libretro/libretro.cpp b/libretro/libretro.cpp index 9ec91fc3ce..220afbda3a 100644 --- a/libretro/libretro.cpp +++ b/libretro/libretro.cpp @@ -1640,7 +1640,7 @@ void retro_cheat_set(unsigned index, bool enabled, const char *code) { } } -int System_GetPropertyInt(SystemProperty prop) +int64_t System_GetPropertyInt(SystemProperty prop) { switch (prop) { diff --git a/unittest/UnitTest.cpp b/unittest/UnitTest.cpp index 8cea9a5329..c71a19bf4b 100644 --- a/unittest/UnitTest.cpp +++ b/unittest/UnitTest.cpp @@ -85,7 +85,7 @@ std::string System_GetProperty(SystemProperty prop) { return ""; } std::vector System_GetPropertyStringVec(SystemProperty prop) { return std::vector(); } -int System_GetPropertyInt(SystemProperty prop) { +int64_t System_GetPropertyInt(SystemProperty prop) { return -1; } float System_GetPropertyFloat(SystemProperty prop) { From 8a1ec96626de713dbbd5cfd34c5829a563f29524 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Fri, 5 Apr 2024 18:16:46 +0200 Subject: [PATCH 004/719] Correctly submit the version string --- Core/RetroAchievements.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/RetroAchievements.cpp b/Core/RetroAchievements.cpp index 9b743bc99b..506cb25325 100644 --- a/Core/RetroAchievements.cpp +++ b/Core/RetroAchievements.cpp @@ -590,7 +590,7 @@ void Initialize() { } } HWND hWnd = (HWND)System_GetPropertyInt(SYSPROP_MAIN_WINDOW_HANDLE); - rc_client_begin_load_raintegration(g_rcClient, szFilePath, hWnd, "PPSSPP", "1.0", &load_integration_callback, hWnd); + rc_client_begin_load_raintegration(g_rcClient, szFilePath, hWnd, "PPSSPP", PPSSPP_GIT_VERSION, &load_integration_callback, hWnd); return; } #endif From 6f825e4ff37f24e8e02d8fdada8e7b7b578110e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Fri, 5 Apr 2024 18:21:02 +0200 Subject: [PATCH 005/719] Minor comment fix --- Core/RetroAchievements.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Core/RetroAchievements.cpp b/Core/RetroAchievements.cpp index 506cb25325..1db3cc138f 100644 --- a/Core/RetroAchievements.cpp +++ b/Core/RetroAchievements.cpp @@ -522,16 +522,13 @@ static void load_integration_callback(int result, const char *error_message, rc_ switch (result) { case RC_OK: { - // If not successful, just report the error and bail. Shouldn't happen. - - // DLL was loaded. + // DLL was loaded correctly. g_OSD.Show(OSDType::MESSAGE_SUCCESS, ac->T("RAIntegration DLL loaded.")); - // Hook up menu. - HWND hWnd = (HWND)userdata; rc_client_raintegration_set_event_handler(g_rcClient, &raintegration_event_handler); rc_client_raintegration_set_write_memory_function(g_rcClient, &raintegration_write_memory_handler); rc_client_raintegration_set_get_game_name_function(g_rcClient, &raintegration_get_game_name_handler); + HWND hWnd = (HWND)userdata; rc_client_raintegration_rebuild_submenu(g_rcClient, GetMenu(hWnd)); break; } From d39b606931925a7c0e9ed4892b003b9d0ca2319a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Fri, 5 Apr 2024 21:00:12 +0200 Subject: [PATCH 006/719] RAIntegration: Fix memory writes --- Core/RetroAchievements.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/Core/RetroAchievements.cpp b/Core/RetroAchievements.cpp index 1db3cc138f..650cf268fb 100644 --- a/Core/RetroAchievements.cpp +++ b/Core/RetroAchievements.cpp @@ -236,6 +236,15 @@ bool IsActive() { return GetGameID() != 0; } +static void raintegration_write_memory_handler(uint32_t address, uint8_t *buffer, uint32_t num_bytes, rc_client_t *client) { + // convert_retroachievements_address_to_real_address + uint32_t realAddress = address + PSP_MEMORY_OFFSET; + uint8_t *writePtr = Memory::GetPointerWriteRange(realAddress, num_bytes); + if (writePtr) { + memcpy(writePtr, buffer, num_bytes); + } +} + static uint32_t read_memory_callback(uint32_t address, uint8_t *buffer, uint32_t num_bytes, rc_client_t *client) { // Achievements are traditionally defined relative to the base of main memory of the emulated console. // This is some kind of RetroArch-related legacy. In the PSP's case, this is simply a straight offset of 0x08000000. @@ -483,14 +492,7 @@ static void raintegration_get_game_name_handler(char *buffer, uint32_t buffer_si snprintf(buffer, buffer_size, "%s", g_gamePath.GetFilename().c_str()); } -static void raintegration_write_memory_handler(uint32_t address, uint8_t *buffer, uint32_t num_bytes, rc_client_t *client) { - // convert_retroachievements_address_to_real_address - uint32_t realAddress = address + PSP_MEMORY_OFFSET; - uint8_t *writePtr = Memory::GetPointerWriteRange(address, num_bytes); - if (writePtr) { - memcpy(writePtr, buffer, num_bytes); - } -} +static void raintegration_write_memory_handler(uint32_t address, uint8_t *buffer, uint32_t num_bytes, rc_client_t *client); static void raintegration_event_handler(const rc_client_raintegration_event_t *event, rc_client_t *client) { switch (event->type) { From 770e5b4f4af39d743de396ca6601c9f470158d9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Fri, 5 Apr 2024 22:41:08 +0200 Subject: [PATCH 007/719] Fix shortcut translation so we don't eat Ctrl+C for RAIntegration windows --- Core/Config.cpp | 2 +- Core/Config.h | 2 +- Core/RetroAchievements.cpp | 9 +++++++-- UI/RetroAchievementScreens.cpp | 2 +- Windows/Debugger/Debugger_Disasm.cpp | 5 +++-- Windows/GEDebugger/GEDebugger.cpp | 2 ++ Windows/MainWindow.cpp | 8 ++------ Windows/main.h | 2 +- 8 files changed, 18 insertions(+), 14 deletions(-) diff --git a/Core/Config.cpp b/Core/Config.cpp index c063bb1546..16931b749c 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -315,7 +315,7 @@ static const ConfigSetting achievementSettings[] = { // Core settings ConfigSetting("AchievementsEnable", &g_Config.bAchievementsEnable, true, CfgFlag::DEFAULT), ConfigSetting("AchievementsEnableRAIntegration", &g_Config.bAchievementsEnableRAIntegration, false, CfgFlag::DEFAULT), - ConfigSetting("AchievementsChallengeMode", &g_Config.bAchievementsChallengeMode, true, CfgFlag::PER_GAME | CfgFlag::DEFAULT), + ConfigSetting("AchievementsChallengeMode", &g_Config.bAchievementsHardcoreMode, true, CfgFlag::PER_GAME | CfgFlag::DEFAULT), ConfigSetting("AchievementsEncoreMode", &g_Config.bAchievementsEncoreMode, false, CfgFlag::PER_GAME | CfgFlag::DEFAULT), ConfigSetting("AchievementsUnofficial", &g_Config.bAchievementsUnofficial, false, CfgFlag::PER_GAME | CfgFlag::DEFAULT), ConfigSetting("AchievementsLogBadMemReads", &g_Config.bAchievementsLogBadMemReads, false, CfgFlag::DEFAULT), diff --git a/Core/Config.h b/Core/Config.h index 399a526698..4596423313 100644 --- a/Core/Config.h +++ b/Core/Config.h @@ -522,7 +522,7 @@ public: // Retro Achievement settings // Copied from Duckstation, we might want to remove some. bool bAchievementsEnable; - bool bAchievementsChallengeMode; + bool bAchievementsHardcoreMode; bool bAchievementsEncoreMode; bool bAchievementsUnofficial; bool bAchievementsSoundEffects; diff --git a/Core/RetroAchievements.cpp b/Core/RetroAchievements.cpp index 650cf268fb..ed0e78d6af 100644 --- a/Core/RetroAchievements.cpp +++ b/Core/RetroAchievements.cpp @@ -509,7 +509,7 @@ static void raintegration_event_handler(const rc_client_raintegration_event_t *e // Hardcore mode has been changed (either directly by the user, or disabled through the use of the tools). // The frontend doesn't necessarily need to know that this value changed, they can still query it whenever // it's appropriate, but the event lets the frontend do things like enable/disable rewind or cheats. - // handle_hardcore_changed(); + g_Config.bAchievementsHardcoreMode = rc_client_get_hardcore_enabled(client); break; default: ERROR_LOG(ACHIEVEMENTS, "Unsupported raintegration event %u\n", event->type); @@ -578,6 +578,11 @@ void Initialize() { rc_client_set_event_handler(g_rcClient, event_handler_callback); + // Set initial settings properly. Hardcore mode is checked by RAIntegration. + rc_client_set_hardcore_enabled(g_rcClient, g_Config.bAchievementsHardcoreMode ? 1 : 0); + rc_client_set_encore_mode_enabled(g_rcClient, g_Config.bAchievementsEncoreMode ? 1 : 0); + rc_client_set_unofficial_enabled(g_rcClient, g_Config.bAchievementsUnofficial ? 1 : 0); + #ifdef RC_CLIENT_SUPPORTS_RAINTEGRATION if (g_Config.bAchievementsEnableRAIntegration) { wchar_t szFilePath[MAX_PATH]; @@ -963,7 +968,7 @@ void SetGame(const Path &path, IdentifiedFileType fileType, FileLoader *fileLoad } // Apply pre-load settings. - rc_client_set_hardcore_enabled(g_rcClient, g_Config.bAchievementsChallengeMode ? 1 : 0); + rc_client_set_hardcore_enabled(g_rcClient, g_Config.bAchievementsHardcoreMode ? 1 : 0); rc_client_set_encore_mode_enabled(g_rcClient, g_Config.bAchievementsEncoreMode ? 1 : 0); rc_client_set_unofficial_enabled(g_rcClient, g_Config.bAchievementsUnofficial ? 1 : 0); diff --git a/UI/RetroAchievementScreens.cpp b/UI/RetroAchievementScreens.cpp index f7efd65fac..2f4cabdc14 100644 --- a/UI/RetroAchievementScreens.cpp +++ b/UI/RetroAchievementScreens.cpp @@ -337,7 +337,7 @@ void RetroAchievementsSettingsScreen::CreateAccountTab(UI::ViewGroup *viewGroup) RecreateViews(); return UI::EVENT_DONE; }); - viewGroup->Add(new CheckBox(&g_Config.bAchievementsChallengeMode, ac->T("Hardcore Mode (no savestates)")))->SetEnabledPtr(&g_Config.bAchievementsEnable); + viewGroup->Add(new CheckBox(&g_Config.bAchievementsHardcoreMode, ac->T("Hardcore Mode (no savestates)")))->SetEnabledPtr(&g_Config.bAchievementsEnable); viewGroup->Add(new CheckBox(&g_Config.bAchievementsSoundEffects, ac->T("Sound Effects")))->SetEnabledPtr(&g_Config.bAchievementsEnable); // not yet implemented viewGroup->Add(new ItemHeader(di->T("Links"))); diff --git a/Windows/Debugger/Debugger_Disasm.cpp b/Windows/Debugger/Debugger_Disasm.cpp index 05b36f12aa..d72e0a90b3 100644 --- a/Windows/Debugger/Debugger_Disasm.cpp +++ b/Windows/Debugger/Debugger_Disasm.cpp @@ -676,9 +676,10 @@ BOOL CDisasm::DlgProc(UINT message, WPARAM wParam, LPARAM lParam) Show(false); return TRUE; case WM_ACTIVATE: - if (wParam == WA_ACTIVE || wParam == WA_CLICKACTIVE) - { + if (wParam == WA_ACTIVE || wParam == WA_CLICKACTIVE) { g_activeWindow = WINDOW_CPUDEBUGGER; + } else { + g_activeWindow = WINDOW_OTHER; } break; diff --git a/Windows/GEDebugger/GEDebugger.cpp b/Windows/GEDebugger/GEDebugger.cpp index e33e882e6f..12ab35ea97 100644 --- a/Windows/GEDebugger/GEDebugger.cpp +++ b/Windows/GEDebugger/GEDebugger.cpp @@ -1073,6 +1073,8 @@ BOOL CGEDebugger::DlgProc(UINT message, WPARAM wParam, LPARAM lParam) { case WM_ACTIVATE: if (wParam == WA_ACTIVE || wParam == WA_CLICKACTIVE) { g_activeWindow = WINDOW_GEDEBUGGER; + } else { + g_activeWindow = WINDOW_OTHER; } break; diff --git a/Windows/MainWindow.cpp b/Windows/MainWindow.cpp index 2cdafcaccf..0bfb82a7bf 100644 --- a/Windows/MainWindow.cpp +++ b/Windows/MainWindow.cpp @@ -599,12 +599,6 @@ namespace MainWindow static bool firstErase = true; switch (message) { - case WM_ACTIVATE: - if (wParam == WA_ACTIVE || wParam == WA_CLICKACTIVE) { - g_activeWindow = WINDOW_MAINWINDOW; - } - break; - case WM_SIZE: break; @@ -829,6 +823,8 @@ namespace MainWindow } g_activeWindow = WINDOW_MAINWINDOW; pause = false; + } else { + g_activeWindow = WINDOW_OTHER; } if (!noFocusPause && g_Config.bPauseOnLostFocus && GetUIState() == UISTATE_INGAME) { if (pause != Core_IsStepping()) { // != is xor for bools diff --git a/Windows/main.h b/Windows/main.h index 44cdbd621a..610197d208 100644 --- a/Windows/main.h +++ b/Windows/main.h @@ -37,4 +37,4 @@ extern CGEDebugger* geDebuggerWindow; extern int g_activeWindow; -enum { WINDOW_MAINWINDOW, WINDOW_CPUDEBUGGER, WINDOW_GEDEBUGGER }; +enum { WINDOW_MAINWINDOW, WINDOW_CPUDEBUGGER, WINDOW_GEDEBUGGER, WINDOW_OTHER }; From 329628f44874926965415bba1958355525da0759 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Fri, 5 Apr 2024 22:55:31 +0200 Subject: [PATCH 008/719] Force the menubar to repaint after building the RA submenu --- Core/RetroAchievements.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Core/RetroAchievements.cpp b/Core/RetroAchievements.cpp index ed0e78d6af..5bdcdb7d34 100644 --- a/Core/RetroAchievements.cpp +++ b/Core/RetroAchievements.cpp @@ -532,6 +532,7 @@ static void load_integration_callback(int result, const char *error_message, rc_ rc_client_raintegration_set_get_game_name_function(g_rcClient, &raintegration_get_game_name_handler); HWND hWnd = (HWND)userdata; rc_client_raintegration_rebuild_submenu(g_rcClient, GetMenu(hWnd)); + DrawMenuBar(hWnd); break; } case RC_MISSING_VALUE: From 616ee81f84d753669e3c182c4f04a5757e421939 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sat, 6 Apr 2024 12:04:45 +0200 Subject: [PATCH 009/719] Add another parameter to the internal "request" framework. --- Common/System/Request.cpp | 5 ++--- Common/System/Request.h | 3 ++- Common/System/System.h | 2 +- Common/VR/VRRenderer.cpp | 4 ++-- Core/RetroAchievements.cpp | 2 +- Qt/QtMain.cpp | 4 ++-- SDL/CocoaBarItems.mm | 2 +- SDL/SDLMain.cpp | 2 +- UWP/PPSSPP_UWPMain.cpp | 4 ++-- Windows/main.cpp | 3 ++- android/jni/app-android.cpp | 2 +- headless/Headless.cpp | 2 +- ios/main.mm | 2 +- libretro/libretro.cpp | 2 +- unittest/JitHarness.cpp | 2 +- 15 files changed, 21 insertions(+), 20 deletions(-) diff --git a/Common/System/Request.cpp b/Common/System/Request.cpp index ccaf5622f1..d6368c1042 100644 --- a/Common/System/Request.cpp +++ b/Common/System/Request.cpp @@ -31,7 +31,7 @@ const char *RequestTypeAsString(SystemRequestType type) { } } -bool RequestManager::MakeSystemRequest(SystemRequestType type, RequesterToken token, RequestCallback callback, RequestFailedCallback failedCallback, std::string_view param1, std::string_view param2, int param3) { +bool RequestManager::MakeSystemRequest(SystemRequestType type, RequesterToken token, RequestCallback callback, RequestFailedCallback failedCallback, std::string_view param1, std::string_view param2, int64_t param3, int64_t param4) { if (token == NO_REQUESTER_TOKEN) { _dbg_assert_(!callback); _dbg_assert_(!failedCallback); @@ -52,14 +52,13 @@ bool RequestManager::MakeSystemRequest(SystemRequestType type, RequesterToken to std::string p1(param1); std::string p2(param2); // TODO: Convert to string_view - if (!System_MakeRequest(type, requestId, p1, p2, param3)) { + if (!System_MakeRequest(type, requestId, p1, p2, param3, param4)) { if (callback || failedCallback) { std::lock_guard guard(callbackMutex_); callbackMap_.erase(requestId); } return false; } - return true; } diff --git a/Common/System/Request.h b/Common/System/Request.h index ec82214884..6e6e922b2a 100644 --- a/Common/System/Request.h +++ b/Common/System/Request.h @@ -27,7 +27,8 @@ public: // The callback you pass in will be called on the main thread later. // Params are at the end since it's the part most likely to recieve additions in the future, // now that we have both callbacks. - bool MakeSystemRequest(SystemRequestType type, RequesterToken token, RequestCallback callback, RequestFailedCallback failedCallback, std::string_view param1, std::string_view param2, int param3); + // Pointers can be passed through param3 and param4 if needed, by casting. + bool MakeSystemRequest(SystemRequestType type, RequesterToken token, RequestCallback callback, RequestFailedCallback failedCallback, std::string_view param1, std::string_view param2, int64_t param3, int64_t param4 = 0); // Called by the platform implementation, when it's finished with a request. void PostSystemSuccess(int requestId, const char *responseString, int responseValue = 0); diff --git a/Common/System/System.h b/Common/System/System.h index f0d1575de4..6763f79dc4 100644 --- a/Common/System/System.h +++ b/Common/System/System.h @@ -93,7 +93,7 @@ enum class SystemRequestType { // This can return false if it's known that the platform doesn't support the request, the app is supposed to handle // or ignore that cleanly. // Some requests don't use responses. -bool System_MakeRequest(SystemRequestType type, int requestId, const std::string ¶m1, const std::string ¶m2, int param3); +bool System_MakeRequest(SystemRequestType type, int requestId, const std::string ¶m1, const std::string ¶m2, int64_t param3, int64_t param4); PermissionStatus System_GetPermissionStatus(SystemPermission permission); void System_AskForPermission(SystemPermission permission); diff --git a/Common/VR/VRRenderer.cpp b/Common/VR/VRRenderer.cpp index 76184844d1..352d20f9c9 100644 --- a/Common/VR/VRRenderer.cpp +++ b/Common/VR/VRRenderer.cpp @@ -295,13 +295,13 @@ bool VR_InitFrame( engine_t* engine ) { } // Update passthrough - if (passthroughRunning != VR_GetConfig(VR_CONFIG_PASSTHROUGH)) { + if (passthroughRunning != (VR_GetConfig(VR_CONFIG_PASSTHROUGH) != 0)) { if (VR_GetConfig(VR_CONFIG_PASSTHROUGH)) { OXR(xrPassthroughLayerResumeFB(passthroughLayer)); } else { OXR(xrPassthroughLayerPauseFB(passthroughLayer)); } - passthroughRunning = VR_GetConfig(VR_CONFIG_PASSTHROUGH); + passthroughRunning = (VR_GetConfig(VR_CONFIG_PASSTHROUGH) != 0); } // NOTE: OpenXR does not use the concept of frame indices. Instead, diff --git a/Core/RetroAchievements.cpp b/Core/RetroAchievements.cpp index 5bdcdb7d34..7185adb529 100644 --- a/Core/RetroAchievements.cpp +++ b/Core/RetroAchievements.cpp @@ -530,9 +530,9 @@ static void load_integration_callback(int result, const char *error_message, rc_ rc_client_raintegration_set_event_handler(g_rcClient, &raintegration_event_handler); rc_client_raintegration_set_write_memory_function(g_rcClient, &raintegration_write_memory_handler); rc_client_raintegration_set_get_game_name_function(g_rcClient, &raintegration_get_game_name_handler); + HWND hWnd = (HWND)userdata; rc_client_raintegration_rebuild_submenu(g_rcClient, GetMenu(hWnd)); - DrawMenuBar(hWnd); break; } case RC_MISSING_VALUE: diff --git a/Qt/QtMain.cpp b/Qt/QtMain.cpp index 85151fc1b5..235856423a 100644 --- a/Qt/QtMain.cpp +++ b/Qt/QtMain.cpp @@ -354,7 +354,7 @@ bool MainUI::HandleCustomEvent(QEvent *e) { return true; } -bool System_MakeRequest(SystemRequestType type, int requestId, const std::string ¶m1, const std::string ¶m2, int param3) { +bool System_MakeRequest(SystemRequestType type, int requestId, const std::string ¶m1, const std::string ¶m2, int64_t param3, int64_t param4) { switch (type) { case SystemRequestType::EXIT_APP: qApp->exit(0); @@ -388,7 +388,7 @@ bool System_MakeRequest(SystemRequestType type, int requestId, const std::string } case SystemRequestType::BROWSE_FOR_IMAGE: // Fall back to file browser. - return System_MakeRequest(SystemRequestType::BROWSE_FOR_FILE, requestId, param1, param2, (int)BrowseFileType::IMAGE); + return System_MakeRequest(SystemRequestType::BROWSE_FOR_FILE, requestId, param1, param2, (int)BrowseFileType::IMAGE, 0); case SystemRequestType::BROWSE_FOR_FILE: g_requestId = requestId; g_param1 = param1; diff --git a/SDL/CocoaBarItems.mm b/SDL/CocoaBarItems.mm index 90703899f4..ed064c6428 100644 --- a/SDL/CocoaBarItems.mm +++ b/SDL/CocoaBarItems.mm @@ -548,7 +548,7 @@ TOGGLE_METHOD_INVERSE(BreakOnLoad, g_Config.bAutoRun) TOGGLE_METHOD(IgnoreIllegalRWs, g_Config.bIgnoreBadMemAccess) TOGGLE_METHOD(AutoFrameSkip, g_Config.bAutoFrameSkip, g_Config.UpdateAfterSettingAutoFrameSkip()) TOGGLE_METHOD(SoftwareRendering, g_Config.bSoftwareRendering) -TOGGLE_METHOD(FullScreen, g_Config.bFullScreen, System_MakeRequest(SystemRequestType::TOGGLE_FULLSCREEN_STATE, 0, g_Config.UseFullScreen() ? "1" : "0", "", 3)) +TOGGLE_METHOD(FullScreen, g_Config.bFullScreen, System_MakeRequest(SystemRequestType::TOGGLE_FULLSCREEN_STATE, 0, g_Config.UseFullScreen() ? "1" : "0", "", 3, 0)) // TOGGLE_METHOD(VSync, g_Config.bVSync) #undef TOGGLE_METHOD diff --git a/SDL/SDLMain.cpp b/SDL/SDLMain.cpp index 9a5044be8a..ce527a2a14 100644 --- a/SDL/SDLMain.cpp +++ b/SDL/SDLMain.cpp @@ -223,7 +223,7 @@ void System_Vibrate(int length_ms) { // Ignore on PC } -bool System_MakeRequest(SystemRequestType type, int requestId, const std::string ¶m1, const std::string ¶m2, int param3) { +bool System_MakeRequest(SystemRequestType type, int requestId, const std::string ¶m1, const std::string ¶m2, int64_t param3, int64_t param4) { switch (type) { case SystemRequestType::RESTART_APP: g_RestartRequested = true; diff --git a/UWP/PPSSPP_UWPMain.cpp b/UWP/PPSSPP_UWPMain.cpp index 17ab3a38ab..ccd510d4a9 100644 --- a/UWP/PPSSPP_UWPMain.cpp +++ b/UWP/PPSSPP_UWPMain.cpp @@ -460,7 +460,7 @@ void System_Notify(SystemNotification notification) { } } -bool System_MakeRequest(SystemRequestType type, int requestId, const std::string ¶m1, const std::string ¶m2, int param3) { +bool System_MakeRequest(SystemRequestType type, int requestId, const std::string ¶m1, const std::string ¶m2, int64_t param3, int64_t param4) { switch (type) { case SystemRequestType::EXIT_APP: @@ -478,7 +478,7 @@ bool System_MakeRequest(SystemRequestType type, int requestId, const std::string ExecuteTask(error, Windows::ApplicationModel::Core::CoreApplication::RequestRestartAsync(nullptr)); if (error != Windows::ApplicationModel::Core::AppRestartFailureReason::RestartPending) { // Shutdown - System_MakeRequest(SystemRequestType::EXIT_APP, requestId, param1, param2, param3); + System_MakeRequest(SystemRequestType::EXIT_APP, requestId, param1, param2, param3, param4); } return true; } diff --git a/Windows/main.cpp b/Windows/main.cpp index 12c259ce70..7bdda88582 100644 --- a/Windows/main.cpp +++ b/Windows/main.cpp @@ -488,7 +488,7 @@ std::wstring MakeFilter(std::wstring filter) { return filter; } -bool System_MakeRequest(SystemRequestType type, int requestId, const std::string ¶m1, const std::string ¶m2, int param3) { +bool System_MakeRequest(SystemRequestType type, int requestId, const std::string ¶m1, const std::string ¶m2, int64_t param3, int64_t param4) { switch (type) { case SystemRequestType::EXIT_APP: if (!NativeIsRestarting()) { @@ -636,6 +636,7 @@ bool System_MakeRequest(SystemRequestType type, int requestId, const std::string } case SystemRequestType::CREATE_GAME_SHORTCUT: return W32Util::CreateDesktopShortcut(param1, param2); + default: return false; } diff --git a/android/jni/app-android.cpp b/android/jni/app-android.cpp index c81cf9efeb..74a30bfc94 100644 --- a/android/jni/app-android.cpp +++ b/android/jni/app-android.cpp @@ -1097,7 +1097,7 @@ void System_Notify(SystemNotification notification) { } } -bool System_MakeRequest(SystemRequestType type, int requestId, const std::string ¶m1, const std::string ¶m2, int param3) { +bool System_MakeRequest(SystemRequestType type, int requestId, const std::string ¶m1, const std::string ¶m2, int64_t param3, int64_t param4) { switch (type) { case SystemRequestType::EXIT_APP: PushCommand("finish", ""); diff --git a/headless/Headless.cpp b/headless/Headless.cpp index 2a802a2cc2..a396c591a0 100644 --- a/headless/Headless.cpp +++ b/headless/Headless.cpp @@ -117,7 +117,7 @@ bool System_GetPropertyBool(SystemProperty prop) { } void System_Notify(SystemNotification notification) {} void System_PostUIMessage(UIMessage message, const std::string ¶m) {} -bool System_MakeRequest(SystemRequestType type, int requestId, const std::string ¶m1, const std::string ¶m2, int param3) { +bool System_MakeRequest(SystemRequestType type, int requestId, const std::string ¶m1, const std::string ¶m2, int64_t param3, int64_t param4) { switch (type) { case SystemRequestType::SEND_DEBUG_OUTPUT: if (g_headlessHost) { diff --git a/ios/main.mm b/ios/main.mm index 2425469e6e..5be93aae33 100644 --- a/ios/main.mm +++ b/ios/main.mm @@ -363,7 +363,7 @@ void System_Notify(SystemNotification notification) { } } -bool System_MakeRequest(SystemRequestType type, int requestId, const std::string ¶m1, const std::string ¶m2, int param3) { +bool System_MakeRequest(SystemRequestType type, int requestId, const std::string ¶m1, const std::string ¶m2, int64_t param3, int64_t param4) { switch (type) { case SystemRequestType::EXIT_APP: exit(0); diff --git a/libretro/libretro.cpp b/libretro/libretro.cpp index 220afbda3a..4788a15964 100644 --- a/libretro/libretro.cpp +++ b/libretro/libretro.cpp @@ -1709,7 +1709,7 @@ void System_Notify(SystemNotification notification) { break; } } -bool System_MakeRequest(SystemRequestType type, int requestId, const std::string ¶m1, const std::string ¶m2, int param3) { return false; } +bool System_MakeRequest(SystemRequestType type, int requestId, const std::string ¶m1, const std::string ¶m2, int64_t param3, int64_t param4) { return false; } void System_PostUIMessage(UIMessage message, const std::string ¶m) {} void NativeFrame(GraphicsContext *graphicsContext) {} void NativeResized() {} diff --git a/unittest/JitHarness.cpp b/unittest/JitHarness.cpp index 088416e2bc..71dd8f92c5 100644 --- a/unittest/JitHarness.cpp +++ b/unittest/JitHarness.cpp @@ -41,7 +41,7 @@ void NativeFrame(GraphicsContext *graphicsContext) { } void NativeResized() { } -bool System_MakeRequest(SystemRequestType type, int requestId, const std::string ¶m1, const std::string ¶m2, int param3) { return false; } +bool System_MakeRequest(SystemRequestType type, int requestId, const std::string ¶m1, const std::string ¶m2, int64_t param3, int64_t param4) { return false; } void System_InputBoxGetString(const std::string &title, const std::string &defaultValue, std::function cb) { cb(false, ""); } void System_AskForPermission(SystemPermission permission) {} PermissionStatus System_GetPermissionStatus(SystemPermission permission) { return PERMISSION_STATUS_GRANTED; } From 9ec5efdcc573291c10bc54b0126e5d19387cfbfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sat, 6 Apr 2024 12:14:29 +0200 Subject: [PATCH 010/719] Add facility to run callbacks on the window thread --- Common/System/Request.cpp | 6 ++++++ Common/System/Request.h | 2 ++ Common/System/System.h | 2 ++ Windows/MainWindow.cpp | 11 +++++++++++ Windows/MainWindow.h | 4 +++- Windows/main.cpp | 8 +++++++- 6 files changed, 31 insertions(+), 2 deletions(-) diff --git a/Common/System/Request.cpp b/Common/System/Request.cpp index d6368c1042..436a02d216 100644 --- a/Common/System/Request.cpp +++ b/Common/System/Request.cpp @@ -144,3 +144,9 @@ void System_ShowFileInFolder(const Path &path) { void System_BrowseForFolder(RequesterToken token, std::string_view title, const Path &initialPath, RequestCallback callback, RequestFailedCallback failedCallback) { g_requestManager.MakeSystemRequest(SystemRequestType::BROWSE_FOR_FOLDER, token, callback, failedCallback, title, initialPath.ToCString(), 0); } + +void System_RunCallbackInWndProc(void (*callback)(void *, void *), void *userdata) { + int64_t castPtr = (int64_t)callback; + int64_t castUserData = (int64_t)userdata; + g_requestManager.MakeSystemRequest(SystemRequestType::RUN_CALLBACK_IN_WNDPROC, NO_REQUESTER_TOKEN, nullptr, nullptr, "", "", castPtr, castUserData); +} diff --git a/Common/System/Request.h b/Common/System/Request.h index 6e6e922b2a..e9f23bab8b 100644 --- a/Common/System/Request.h +++ b/Common/System/Request.h @@ -176,6 +176,8 @@ inline void System_SendDebugScreenshot(std::string_view data, int height) { g_requestManager.MakeSystemRequest(SystemRequestType::SEND_DEBUG_SCREENSHOT, NO_REQUESTER_TOKEN, nullptr, nullptr, data, "", height); } +void System_RunCallbackInWndProc(void (*callback)(void *, void *), void *userdata); + // Non-inline to avoid including Path.h void System_CreateGameShortcut(const Path &path, std::string_view title); void System_ShowFileInFolder(const Path &path); diff --git a/Common/System/System.h b/Common/System/System.h index 6763f79dc4..763c31f517 100644 --- a/Common/System/System.h +++ b/Common/System/System.h @@ -86,6 +86,8 @@ enum class SystemRequestType { GPS_COMMAND, INFRARED_COMMAND, MICROPHONE_COMMAND, + + RUN_CALLBACK_IN_WNDPROC, }; // Implementations are supposed to process the request, and post the response to the g_RequestManager (see Message.h). diff --git a/Windows/MainWindow.cpp b/Windows/MainWindow.cpp index 0bfb82a7bf..c162a510ee 100644 --- a/Windows/MainWindow.cpp +++ b/Windows/MainWindow.cpp @@ -764,6 +764,13 @@ namespace MainWindow } break; + case WM_USER_RUN_CALLBACK: + { + auto callback = reinterpret_cast(wParam); + void *userdata = reinterpret_cast(lParam); + callback(hWnd, userdata); + break; + } case WM_USER_GET_BASE_POINTER: Reporting::NotifyDebugger(); switch (lParam) { @@ -1135,4 +1142,8 @@ namespace MainWindow return g_isFullscreen; } + void RunCallbackInWndProc(void (*callback)(void *, void *), void *userdata) { + PostMessage(hwndMain, WM_USER_RUN_CALLBACK, reinterpret_cast(callback), reinterpret_cast(userdata)); + } + } // namespace diff --git a/Windows/MainWindow.h b/Windows/MainWindow.h index c4ed9f81fd..b79a10b2af 100644 --- a/Windows/MainWindow.h +++ b/Windows/MainWindow.h @@ -18,7 +18,8 @@ namespace MainWindow WM_USER_WINDOW_TITLE_CHANGED = WM_USER + 103, WM_USER_TOGGLE_FULLSCREEN = WM_USER + 105, WM_USER_RESTART_EMUTHREAD = WM_USER + 106, - WM_USER_SWITCHUMD_UPDATED = WM_USER + 107 + WM_USER_SWITCHUMD_UPDATED = WM_USER + 107, + WM_USER_RUN_CALLBACK = WM_USER + 108, }; enum { @@ -79,6 +80,7 @@ namespace MainWindow void ToggleDebugConsoleVisibility(); void SetInternalResolution(int res = -1); void SetWindowSize(int zoom); + void RunCallbackInWndProc(void (*callback)(void *window, void *userdata), void *userdata); } #endif diff --git a/Windows/main.cpp b/Windows/main.cpp index 7bdda88582..5e273b423e 100644 --- a/Windows/main.cpp +++ b/Windows/main.cpp @@ -636,7 +636,13 @@ bool System_MakeRequest(SystemRequestType type, int requestId, const std::string } case SystemRequestType::CREATE_GAME_SHORTCUT: return W32Util::CreateDesktopShortcut(param1, param2); - + case SystemRequestType::RUN_CALLBACK_IN_WNDPROC: + { + auto func = reinterpret_cast(param3); + void *userdata = reinterpret_cast(param4); + MainWindow::RunCallbackInWndProc(func, userdata); + return true; + } default: return false; } From 00acaa32996e05809b8f86371309f4553e91887b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sat, 6 Apr 2024 12:14:53 +0200 Subject: [PATCH 011/719] Build the RAIntegration menu on the right thread --- Core/RetroAchievements.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Core/RetroAchievements.cpp b/Core/RetroAchievements.cpp index 7185adb529..d97d9427ba 100644 --- a/Core/RetroAchievements.cpp +++ b/Core/RetroAchievements.cpp @@ -531,8 +531,10 @@ static void load_integration_callback(int result, const char *error_message, rc_ rc_client_raintegration_set_write_memory_function(g_rcClient, &raintegration_write_memory_handler); rc_client_raintegration_set_get_game_name_function(g_rcClient, &raintegration_get_game_name_handler); - HWND hWnd = (HWND)userdata; - rc_client_raintegration_rebuild_submenu(g_rcClient, GetMenu(hWnd)); + System_RunCallbackInWndProc([](void *vhWnd, void *userdata) { + HWND hWnd = reinterpret_cast(vhWnd); + rc_client_raintegration_rebuild_submenu(g_rcClient, GetMenu(hWnd)); + }, nullptr); break; } case RC_MISSING_VALUE: From 80a12ca102d26a4fc1f80de6aadf4340fefebce1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sat, 6 Apr 2024 12:18:28 +0200 Subject: [PATCH 012/719] Run the update menu item thing on the window thread too. --- Core/RetroAchievements.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Core/RetroAchievements.cpp b/Core/RetroAchievements.cpp index d97d9427ba..5b85f08075 100644 --- a/Core/RetroAchievements.cpp +++ b/Core/RetroAchievements.cpp @@ -499,7 +499,10 @@ static void raintegration_event_handler(const rc_client_raintegration_event_t *e case RC_CLIENT_RAINTEGRATION_EVENT_MENUITEM_CHECKED_CHANGED: // The checked state of one of the menu items has changed and should be reflected in the UI. // Call the handy helper function if the menu was created by rc_client_raintegration_rebuild_submenu. - rc_client_raintegration_update_menu_item(client, event->menu_item); + System_RunCallbackInWndProc([](void *vhWnd, void *userdata) { + auto menuItem = reinterpret_cast(userdata); + rc_client_raintegration_update_menu_item(g_rcClient, menuItem); + }, reinterpret_cast(reinterpret_cast(event->menu_item))); break; case RC_CLIENT_RAINTEGRATION_EVENT_PAUSE: // The toolkit has hit a breakpoint and wants to pause the emulator. Do so. From 7da728996398b03bb0c2772eb20d81501234b940 Mon Sep 17 00:00:00 2001 From: AdamN <7974720+anr2me@users.noreply.github.com> Date: Sat, 6 Apr 2024 19:48:01 +0700 Subject: [PATCH 013/719] [Workflow] Updated manual generate android workflow (#19001) * Added a couple of VR Build Variants * oops * using VR instead of Vr works too --- .github/workflows/manual_generate_apk.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/manual_generate_apk.yml b/.github/workflows/manual_generate_apk.yml index 3fdca44207..44566c30fc 100644 --- a/.github/workflows/manual_generate_apk.yml +++ b/.github/workflows/manual_generate_apk.yml @@ -11,6 +11,8 @@ on: options: - NormalOptimized - NormalDebug + - VROptimized + - VRDebug jobs: From d28e9dc006697bd9ab424a1a5060da2ee7b80525 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Fri, 5 Apr 2024 16:36:47 +0200 Subject: [PATCH 014/719] Minor cleanup --- Common/GPU/Vulkan/VulkanContext.cpp | 14 ++ Common/GPU/Vulkan/VulkanContext.h | 7 +- Common/GPU/Vulkan/VulkanQueueRunner.cpp | 165 ++++++++++++------------ 3 files changed, 103 insertions(+), 83 deletions(-) diff --git a/Common/GPU/Vulkan/VulkanContext.cpp b/Common/GPU/Vulkan/VulkanContext.cpp index 56f99d1ce7..238c15ab1b 100644 --- a/Common/GPU/Vulkan/VulkanContext.cpp +++ b/Common/GPU/Vulkan/VulkanContext.cpp @@ -76,6 +76,20 @@ const char *VulkanPresentModeToString(VkPresentModeKHR presentMode) { } } +const char *VulkanImageLayoutToString(VkImageLayout imageLayout) { + switch (imageLayout) { + case VK_IMAGE_LAYOUT_UNDEFINED: return "UNDEFINED"; + case VK_IMAGE_LAYOUT_GENERAL: return "GENERAL"; + case VK_IMAGE_LAYOUT_PREINITIALIZED: return "PREINITIALIZED"; + case VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL: return "TRANSFER_SRC_OPTIMAL"; + case VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL: return "TRANSFER_DST_OPTIMAL"; + case VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL: return "SHADER_READ_ONLY_OPTIMAL"; + case VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL: return "COLOR_ATTACHMENT_OPTIMAL"; + case VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL: return "DEPTH_STENCIL_ATTACHMENT_OPTIMAL"; + default: return "OTHER"; + } +} + VulkanContext::VulkanContext() { // Do nothing here. } diff --git a/Common/GPU/Vulkan/VulkanContext.h b/Common/GPU/Vulkan/VulkanContext.h index a3d494fa4a..5683bc2713 100644 --- a/Common/GPU/Vulkan/VulkanContext.h +++ b/Common/GPU/Vulkan/VulkanContext.h @@ -419,7 +419,7 @@ private: bool CheckLayers(const std::vector &layer_props, const std::vector &layer_names) const; - WindowSystem winsys_; + WindowSystem winsys_{}; // Don't use the real types here to avoid having to include platform-specific stuff // that we really don't want in everything that uses VulkanContext. @@ -483,7 +483,7 @@ private: std::vector utils_callbacks; VkSwapchainKHR swapchain_ = VK_NULL_HANDLE; - VkFormat swapchainFormat_; + VkFormat swapchainFormat_ = VK_FORMAT_UNDEFINED; uint32_t queue_count = 0; @@ -492,7 +492,7 @@ private: VkSurfaceCapabilitiesKHR surfCapabilities_{}; std::vector surfFormats_{}; - VkPresentModeKHR presentMode_; + VkPresentModeKHR presentMode_ = VK_PRESENT_MODE_FIFO_KHR; std::vector availablePresentModes_; std::vector cmdQueue_; @@ -515,6 +515,7 @@ bool GLSLtoSPV(const VkShaderStageFlagBits shader_type, const char *sourceCode, const char *VulkanColorSpaceToString(VkColorSpaceKHR colorSpace); const char *VulkanFormatToString(VkFormat format); const char *VulkanPresentModeToString(VkPresentModeKHR presentMode); +const char *VulkanImageLayoutToString(VkImageLayout imageLayout); std::string FormatDriverVersion(const VkPhysicalDeviceProperties &props); diff --git a/Common/GPU/Vulkan/VulkanQueueRunner.cpp b/Common/GPU/Vulkan/VulkanQueueRunner.cpp index 949355e81d..716aa3ead8 100644 --- a/Common/GPU/Vulkan/VulkanQueueRunner.cpp +++ b/Common/GPU/Vulkan/VulkanQueueRunner.cpp @@ -931,86 +931,84 @@ void VulkanQueueRunner::LogReadbackImage(const VKRStep &step) { INFO_LOG(G3D, "%s", StepToString(vulkan_, step).c_str()); } -void TransitionToOptimal(VkCommandBuffer cmd, VkImage colorImage, VkImageLayout colorLayout, VkImage depthStencilImage, VkImageLayout depthStencilLayout, int numLayers, VulkanBarrierBatch *recordBarrier) { - if (colorLayout != VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL) { - VkPipelineStageFlags srcStageMask = 0; - VkAccessFlags srcAccessMask = 0; - switch (colorLayout) { - case VK_IMAGE_LAYOUT_UNDEFINED: - // No need to specify stage or access. - break; - case VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL: - // Already the right color layout. Unclear that we need to do a lot here.. - break; - case VK_IMAGE_LAYOUT_GENERAL: - // We came from the Mali workaround, and are transitioning back to COLOR_ATTACHMENT_OPTIMAL. - srcAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT; - srcStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT; - break; - case VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL: - srcAccessMask = VK_ACCESS_SHADER_READ_BIT; - srcStageMask = VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT; - break; - case VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL: - srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT; - srcStageMask = VK_PIPELINE_STAGE_TRANSFER_BIT; - break; - case VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL: - srcAccessMask = VK_ACCESS_TRANSFER_READ_BIT; - srcStageMask = VK_PIPELINE_STAGE_TRANSFER_BIT; - break; - default: - _dbg_assert_msg_(false, "TransitionToOptimal: Unexpected color layout %d", (int)colorLayout); - break; - } - recordBarrier->TransitionImage( - colorImage, 0, 1, numLayers, VK_IMAGE_ASPECT_COLOR_BIT, - colorLayout, - VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL, - srcAccessMask, - VK_ACCESS_COLOR_ATTACHMENT_READ_BIT | VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT, - srcStageMask, - VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT); - } - - if (depthStencilImage != VK_NULL_HANDLE && depthStencilLayout != VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL) { - VkPipelineStageFlags srcStageMask = 0; - VkAccessFlags srcAccessMask = 0; - switch (depthStencilLayout) { - case VK_IMAGE_LAYOUT_UNDEFINED: - // No need to specify stage or access. - break; - case VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL: - // Already the right depth layout. Unclear that we need to do a lot here.. - break; - case VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL: - srcAccessMask = VK_ACCESS_SHADER_READ_BIT; - srcStageMask = VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT; - break; - case VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL: - srcAccessMask = VK_ACCESS_TRANSFER_READ_BIT; - srcStageMask = VK_PIPELINE_STAGE_TRANSFER_BIT; - break; - case VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL: - srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT; - srcStageMask = VK_PIPELINE_STAGE_TRANSFER_BIT; - break; - default: - _dbg_assert_msg_(false, "TransitionToOptimal: Unexpected depth layout %d", (int)depthStencilLayout); - break; - } - recordBarrier->TransitionImage( - depthStencilImage, 0, 1, numLayers, VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT, - depthStencilLayout, - VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL, - srcAccessMask, - VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT | VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT, - srcStageMask, - VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT | VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT); +void TransitionColorToOptimal(VkCommandBuffer cmd, VkImage colorImage, VkImageLayout colorLayout, int numLayers, VulkanBarrierBatch *recordBarrier) { + VkPipelineStageFlags srcStageMask = 0; + VkAccessFlags srcAccessMask = 0; + switch (colorLayout) { + case VK_IMAGE_LAYOUT_UNDEFINED: + // No need to specify stage or access. + break; + case VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL: + // Already the right color layout. Unclear that we need to do a lot here.. + return; + case VK_IMAGE_LAYOUT_GENERAL: + // We came from the Mali workaround, and are transitioning back to COLOR_ATTACHMENT_OPTIMAL. + srcAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT; + srcStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT; + break; + case VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL: + srcAccessMask = VK_ACCESS_SHADER_READ_BIT; + srcStageMask = VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT; + break; + case VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL: + srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT; + srcStageMask = VK_PIPELINE_STAGE_TRANSFER_BIT; + break; + case VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL: + srcAccessMask = VK_ACCESS_TRANSFER_READ_BIT; + srcStageMask = VK_PIPELINE_STAGE_TRANSFER_BIT; + break; + default: + _dbg_assert_msg_(false, "TransitionColorToOptimal: Unexpected layout %d", (int)colorLayout); + break; } + recordBarrier->TransitionImage( + colorImage, 0, 1, numLayers, VK_IMAGE_ASPECT_COLOR_BIT, + colorLayout, + VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL, + srcAccessMask, + VK_ACCESS_COLOR_ATTACHMENT_READ_BIT | VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT, + srcStageMask, + VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT); } -void TransitionFromOptimal(VkCommandBuffer cmd, VkImage colorImage, VkImageLayout colorLayout, VkImage depthStencilImage, int numLayers, VkImageLayout depthStencilLayout) { +void TransitionDepthToOptimal(VkCommandBuffer cmd, VkImage depthStencilImage, VkImageLayout depthStencilLayout, int numLayers, VulkanBarrierBatch *recordBarrier) { + VkPipelineStageFlags srcStageMask = 0; + VkAccessFlags srcAccessMask = 0; + switch (depthStencilLayout) { + case VK_IMAGE_LAYOUT_UNDEFINED: + // No need to specify stage or access. + break; + case VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL: + // Already the right depth layout. Unclear that we need to do a lot here.. + return; + case VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL: + srcAccessMask = VK_ACCESS_SHADER_READ_BIT; + srcStageMask = VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT; + break; + case VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL: + srcAccessMask = VK_ACCESS_TRANSFER_READ_BIT; + srcStageMask = VK_PIPELINE_STAGE_TRANSFER_BIT; + break; + case VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL: + srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT; + srcStageMask = VK_PIPELINE_STAGE_TRANSFER_BIT; + break; + default: + _dbg_assert_msg_(false, "TransitionDepthToOptimal: Unexpected layout %d", (int)depthStencilLayout); + break; + } + recordBarrier->TransitionImage( + depthStencilImage, 0, 1, numLayers, VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT, + depthStencilLayout, + VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL, + srcAccessMask, + VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT | VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT, + srcStageMask, + VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT | VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT); +} + +void TransitionFromOptimal(VkCommandBuffer cmd, VkImage colorImage, VkImageLayout colorLayout, VkImage depthStencilImage, VkImageLayout depthStencilLayout, int numLayers) { VkPipelineStageFlags srcStageMask = 0; VkPipelineStageFlags dstStageMask = 0; @@ -1180,7 +1178,7 @@ void VulkanQueueRunner::PerformRenderPass(const VKRStep &step, VkCommandBuffer c // This reads the layout of the color and depth images, and chooses a render pass using them that // will transition to the desired final layout. // - // NOTE: Flushes recordBarrier_. + // NOTE: Unconditionally flushes recordBarrier_. VKRRenderPass *renderPass = PerformBindFramebufferAsRenderTarget(step, cmd); int curWidth = step.render.framebuffer ? step.render.framebuffer->width : vulkan_->GetBackbufferWidth(); @@ -1401,9 +1399,11 @@ void VulkanQueueRunner::PerformRenderPass(const VKRStep &step, VkCommandBuffer c } vkCmdEndRenderPass(cmd); + _dbg_assert_(recordBarrier_.empty()); + if (fb) { // If the desired final layout aren't the optimal layout for rendering, transition. - TransitionFromOptimal(cmd, fb->color.image, step.render.finalColorLayout, fb->depth.image, fb->numLayers, step.render.finalDepthStencilLayout); + TransitionFromOptimal(cmd, fb->color.image, step.render.finalColorLayout, fb->depth.image, step.render.finalDepthStencilLayout, fb->numLayers); fb->color.layout = step.render.finalColorLayout; fb->depth.layout = step.render.finalDepthStencilLayout; @@ -1422,6 +1422,8 @@ VKRRenderPass *VulkanQueueRunner::PerformBindFramebufferAsRenderTarget(const VKR VkSampleCountFlagBits sampleCount; + recordBarrier_.Flush(cmd); + if (step.render.framebuffer) { _dbg_assert_(step.render.finalColorLayout != VK_IMAGE_LAYOUT_UNDEFINED); _dbg_assert_(step.render.finalDepthStencilLayout != VK_IMAGE_LAYOUT_UNDEFINED); @@ -1455,7 +1457,10 @@ VKRRenderPass *VulkanQueueRunner::PerformBindFramebufferAsRenderTarget(const VKR fb->color.layout = VK_IMAGE_LAYOUT_GENERAL; } - TransitionToOptimal(cmd, fb->color.image, fb->color.layout, fb->depth.image, fb->depth.layout, fb->numLayers, &recordBarrier_); + TransitionColorToOptimal(cmd, fb->color.image, fb->color.layout, fb->numLayers, &recordBarrier_); + if (fb->depth.image && RenderPassTypeHasDepth(step.render.renderPassType)) { + TransitionDepthToOptimal(cmd, fb->depth.image, fb->depth.layout, fb->numLayers, &recordBarrier_); + } // The transition from the optimal format happens after EndRenderPass, now that we don't // do it as part of the renderpass itself anymore. From 4a5eb4bdfbb36bdd70963a48c7d74ef392f1799a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Fri, 5 Apr 2024 17:09:57 +0200 Subject: [PATCH 015/719] More cleanup --- Common/GPU/Vulkan/VulkanDebug.cpp | 7 -- Common/GPU/Vulkan/VulkanQueueRunner.cpp | 95 +++++++++++-------------- 2 files changed, 40 insertions(+), 62 deletions(-) diff --git a/Common/GPU/Vulkan/VulkanDebug.cpp b/Common/GPU/Vulkan/VulkanDebug.cpp index b9638394ad..bc7dafb4e4 100644 --- a/Common/GPU/Vulkan/VulkanDebug.cpp +++ b/Common/GPU/Vulkan/VulkanDebug.cpp @@ -62,13 +62,6 @@ VKAPI_ATTR VkBool32 VKAPI_CALL VulkanDebugUtilsCallback( return false; break; - case 606910136: - case -392708513: - case -384083808: - // VUID-vkCmdDraw-None-02686 - // Kinda false positive, or at least very unnecessary, now that I solved the real issue. - // See https://github.com/hrydgard/ppsspp/pull/16354 - return false; case -375211665: // VUID-vkAllocateMemory-pAllocateInfo-01713 // Can happen when VMA aggressively tries to allocate aperture memory for upload. It gracefully diff --git a/Common/GPU/Vulkan/VulkanQueueRunner.cpp b/Common/GPU/Vulkan/VulkanQueueRunner.cpp index 716aa3ead8..5618fe602b 100644 --- a/Common/GPU/Vulkan/VulkanQueueRunner.cpp +++ b/Common/GPU/Vulkan/VulkanQueueRunner.cpp @@ -931,7 +931,7 @@ void VulkanQueueRunner::LogReadbackImage(const VKRStep &step) { INFO_LOG(G3D, "%s", StepToString(vulkan_, step).c_str()); } -void TransitionColorToOptimal(VkCommandBuffer cmd, VkImage colorImage, VkImageLayout colorLayout, int numLayers, VulkanBarrierBatch *recordBarrier) { +static void TransitionColorToOptimal(VkCommandBuffer cmd, VkImage colorImage, VkImageLayout colorLayout, int numLayers, VulkanBarrierBatch *recordBarrier) { VkPipelineStageFlags srcStageMask = 0; VkAccessFlags srcAccessMask = 0; switch (colorLayout) { @@ -972,7 +972,7 @@ void TransitionColorToOptimal(VkCommandBuffer cmd, VkImage colorImage, VkImageLa VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT); } -void TransitionDepthToOptimal(VkCommandBuffer cmd, VkImage depthStencilImage, VkImageLayout depthStencilLayout, int numLayers, VulkanBarrierBatch *recordBarrier) { +static void TransitionDepthToOptimal(VkCommandBuffer cmd, VkImage depthStencilImage, VkImageLayout depthStencilLayout, int numLayers, VulkanBarrierBatch *recordBarrier) { VkPipelineStageFlags srcStageMask = 0; VkAccessFlags srcAccessMask = 0; switch (depthStencilLayout) { @@ -1008,33 +1008,24 @@ void TransitionDepthToOptimal(VkCommandBuffer cmd, VkImage depthStencilImage, Vk VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT | VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT); } -void TransitionFromOptimal(VkCommandBuffer cmd, VkImage colorImage, VkImageLayout colorLayout, VkImage depthStencilImage, VkImageLayout depthStencilLayout, int numLayers) { - VkPipelineStageFlags srcStageMask = 0; - VkPipelineStageFlags dstStageMask = 0; - - // If layouts aren't optimal, transition them. - VkImageMemoryBarrier barrier[2]{}; - - int barrierCount = 0; +static void TransitionFromOptimal(VkCommandBuffer cmd, VkImage colorImage, VkImageLayout colorLayout, VkImage depthStencilImage, VkImageLayout depthStencilLayout, int numLayers, VulkanBarrierBatch *recordBarrier) { if (colorLayout != VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL) { - barrier[0].sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER; - barrier[0].pNext = nullptr; - srcStageMask |= VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT; - barrier[0].srcAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT; + VkPipelineStageFlags dstStageMask = 0; + VkAccessFlags dstAccessMask = 0; // And the final transition. // Don't need to transition it if VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL. switch (colorLayout) { case VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL: - barrier[0].dstAccessMask = VK_ACCESS_SHADER_READ_BIT; - dstStageMask |= VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT; + dstAccessMask = VK_ACCESS_SHADER_READ_BIT; + dstStageMask = VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT; break; case VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL: - barrier[0].dstAccessMask = VK_ACCESS_TRANSFER_READ_BIT; - dstStageMask |= VK_PIPELINE_STAGE_TRANSFER_BIT; + dstAccessMask = VK_ACCESS_TRANSFER_READ_BIT; + dstStageMask = VK_PIPELINE_STAGE_TRANSFER_BIT; break; case VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL: - barrier[0].dstAccessMask = VK_ACCESS_TRANSFER_READ_BIT; - dstStageMask |= VK_PIPELINE_STAGE_TRANSFER_BIT; + dstAccessMask = VK_ACCESS_TRANSFER_READ_BIT; + dstStageMask = VK_PIPELINE_STAGE_TRANSFER_BIT; break; case VK_IMAGE_LAYOUT_UNDEFINED: case VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL: @@ -1044,36 +1035,32 @@ void TransitionFromOptimal(VkCommandBuffer cmd, VkImage colorImage, VkImageLayou _dbg_assert_msg_(false, "TransitionFromOptimal: Unexpected final color layout %d", (int)colorLayout); break; } - barrier[0].oldLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - barrier[0].newLayout = colorLayout; - barrier[0].image = colorImage; - barrier[0].subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; - barrier[0].subresourceRange.baseMipLevel = 0; - barrier[0].subresourceRange.levelCount = 1; - barrier[0].subresourceRange.layerCount = numLayers; - barrier[0].srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; - barrier[0].dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; - barrierCount++; + recordBarrier->TransitionImage( + colorImage, 0, 1, numLayers, VK_IMAGE_ASPECT_COLOR_BIT, + VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL, + colorLayout, + VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT, // srcAccessMask + dstAccessMask, + VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT, + dstStageMask + ); } if (depthStencilImage && depthStencilLayout != VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL) { - barrier[barrierCount].sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER; - barrier[barrierCount].pNext = nullptr; - - srcStageMask |= VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT | VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT; - barrier[barrierCount].srcAccessMask = VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT; + VkPipelineStageFlags dstStageMask = 0; + VkAccessFlags dstAccessMask = 0; switch (depthStencilLayout) { case VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL: - barrier[barrierCount].dstAccessMask |= VK_ACCESS_SHADER_READ_BIT; - dstStageMask |= VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT; + dstAccessMask = VK_ACCESS_SHADER_READ_BIT; + dstStageMask = VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT; break; case VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL: - barrier[barrierCount].dstAccessMask |= VK_ACCESS_TRANSFER_READ_BIT; - dstStageMask |= VK_PIPELINE_STAGE_TRANSFER_BIT; + dstAccessMask = VK_ACCESS_TRANSFER_READ_BIT; + dstStageMask = VK_PIPELINE_STAGE_TRANSFER_BIT; break; case VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL: - barrier[barrierCount].dstAccessMask |= VK_ACCESS_TRANSFER_READ_BIT; - dstStageMask |= VK_PIPELINE_STAGE_TRANSFER_BIT; + dstAccessMask = VK_ACCESS_TRANSFER_READ_BIT; + dstStageMask = VK_PIPELINE_STAGE_TRANSFER_BIT; break; case VK_IMAGE_LAYOUT_UNDEFINED: case VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL: @@ -1083,19 +1070,15 @@ void TransitionFromOptimal(VkCommandBuffer cmd, VkImage colorImage, VkImageLayou _dbg_assert_msg_(false, "TransitionFromOptimal: Unexpected final depth layout %d", (int)depthStencilLayout); break; } - barrier[barrierCount].oldLayout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; - barrier[barrierCount].newLayout = depthStencilLayout; - barrier[barrierCount].image = depthStencilImage; - barrier[barrierCount].subresourceRange.aspectMask = VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT; - barrier[barrierCount].subresourceRange.baseMipLevel = 0; - barrier[barrierCount].subresourceRange.levelCount = 1; - barrier[barrierCount].subresourceRange.layerCount = numLayers; - barrier[barrierCount].srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; - barrier[barrierCount].dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; - barrierCount++; - } - if (barrierCount) { - vkCmdPipelineBarrier(cmd, srcStageMask, dstStageMask, VK_DEPENDENCY_BY_REGION_BIT, 0, nullptr, 0, nullptr, barrierCount, barrier); + recordBarrier->TransitionImage( + depthStencilImage, 0, 1, numLayers, VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT, + VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL, + depthStencilLayout, + VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT, // srcAccessMask + dstAccessMask, + VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT | VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT, + dstStageMask + ); } } @@ -1403,7 +1386,9 @@ void VulkanQueueRunner::PerformRenderPass(const VKRStep &step, VkCommandBuffer c if (fb) { // If the desired final layout aren't the optimal layout for rendering, transition. - TransitionFromOptimal(cmd, fb->color.image, step.render.finalColorLayout, fb->depth.image, step.render.finalDepthStencilLayout, fb->numLayers); + // TODO: Not sure when we use this now? + TransitionFromOptimal(cmd, fb->color.image, step.render.finalColorLayout, fb->depth.image, step.render.finalDepthStencilLayout, fb->numLayers, &recordBarrier_); + recordBarrier_.Flush(cmd); fb->color.layout = step.render.finalColorLayout; fb->depth.layout = step.render.finalDepthStencilLayout; From e00f1f10a304001911183a288e654989c04afc22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Fri, 5 Apr 2024 17:48:07 +0200 Subject: [PATCH 016/719] More barrier code simplification --- Common/GPU/Vulkan/VulkanQueueRunner.cpp | 144 ++++++++++++------------ 1 file changed, 72 insertions(+), 72 deletions(-) diff --git a/Common/GPU/Vulkan/VulkanQueueRunner.cpp b/Common/GPU/Vulkan/VulkanQueueRunner.cpp index 5618fe602b..30a6e91a84 100644 --- a/Common/GPU/Vulkan/VulkanQueueRunner.cpp +++ b/Common/GPU/Vulkan/VulkanQueueRunner.cpp @@ -1008,78 +1008,76 @@ static void TransitionDepthToOptimal(VkCommandBuffer cmd, VkImage depthStencilIm VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT | VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT); } -static void TransitionFromOptimal(VkCommandBuffer cmd, VkImage colorImage, VkImageLayout colorLayout, VkImage depthStencilImage, VkImageLayout depthStencilLayout, int numLayers, VulkanBarrierBatch *recordBarrier) { - if (colorLayout != VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL) { - VkPipelineStageFlags dstStageMask = 0; - VkAccessFlags dstAccessMask = 0; - // And the final transition. - // Don't need to transition it if VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL. - switch (colorLayout) { - case VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL: - dstAccessMask = VK_ACCESS_SHADER_READ_BIT; - dstStageMask = VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT; - break; - case VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL: - dstAccessMask = VK_ACCESS_TRANSFER_READ_BIT; - dstStageMask = VK_PIPELINE_STAGE_TRANSFER_BIT; - break; - case VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL: - dstAccessMask = VK_ACCESS_TRANSFER_READ_BIT; - dstStageMask = VK_PIPELINE_STAGE_TRANSFER_BIT; - break; - case VK_IMAGE_LAYOUT_UNDEFINED: - case VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL: - // Nothing to do. - break; - default: - _dbg_assert_msg_(false, "TransitionFromOptimal: Unexpected final color layout %d", (int)colorLayout); - break; - } - recordBarrier->TransitionImage( - colorImage, 0, 1, numLayers, VK_IMAGE_ASPECT_COLOR_BIT, - VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL, - colorLayout, - VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT, // srcAccessMask - dstAccessMask, - VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT, - dstStageMask - ); +static void TransitionColorFromOptimal(VkCommandBuffer cmd, VkImage colorImage, VkImageLayout colorLayout, int numLayers, VulkanBarrierBatch *recordBarrier) { + VkPipelineStageFlags dstStageMask = 0; + VkAccessFlags dstAccessMask = 0; + // And the final transition. + // Don't need to transition it if VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL. + switch (colorLayout) { + case VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL: + dstAccessMask = VK_ACCESS_SHADER_READ_BIT; + dstStageMask = VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT; + break; + case VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL: + dstAccessMask = VK_ACCESS_TRANSFER_READ_BIT; + dstStageMask = VK_PIPELINE_STAGE_TRANSFER_BIT; + break; + case VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL: + dstAccessMask = VK_ACCESS_TRANSFER_READ_BIT; + dstStageMask = VK_PIPELINE_STAGE_TRANSFER_BIT; + break; + case VK_IMAGE_LAYOUT_UNDEFINED: + case VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL: + // Nothing to do. + return; + default: + _dbg_assert_msg_(false, "TransitionFromOptimal: Unexpected final color layout %d", (int)colorLayout); + break; } + recordBarrier->TransitionImage( + colorImage, 0, 1, numLayers, VK_IMAGE_ASPECT_COLOR_BIT, + VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL, + colorLayout, + VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT, // srcAccessMask + dstAccessMask, + VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT, + dstStageMask + ); +} - if (depthStencilImage && depthStencilLayout != VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL) { - VkPipelineStageFlags dstStageMask = 0; - VkAccessFlags dstAccessMask = 0; - switch (depthStencilLayout) { - case VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL: - dstAccessMask = VK_ACCESS_SHADER_READ_BIT; - dstStageMask = VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT; - break; - case VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL: - dstAccessMask = VK_ACCESS_TRANSFER_READ_BIT; - dstStageMask = VK_PIPELINE_STAGE_TRANSFER_BIT; - break; - case VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL: - dstAccessMask = VK_ACCESS_TRANSFER_READ_BIT; - dstStageMask = VK_PIPELINE_STAGE_TRANSFER_BIT; - break; - case VK_IMAGE_LAYOUT_UNDEFINED: - case VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL: - // Nothing to do. - break; - default: - _dbg_assert_msg_(false, "TransitionFromOptimal: Unexpected final depth layout %d", (int)depthStencilLayout); - break; - } - recordBarrier->TransitionImage( - depthStencilImage, 0, 1, numLayers, VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT, - VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL, - depthStencilLayout, - VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT, // srcAccessMask - dstAccessMask, - VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT | VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT, - dstStageMask - ); +static void TransitionDepthFromOptimal(VkCommandBuffer cmd, VkImage depthStencilImage, VkImageLayout depthStencilLayout, int numLayers, VulkanBarrierBatch *recordBarrier) { + VkPipelineStageFlags dstStageMask = 0; + VkAccessFlags dstAccessMask = 0; + switch (depthStencilLayout) { + case VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL: + dstAccessMask = VK_ACCESS_SHADER_READ_BIT; + dstStageMask = VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT; + break; + case VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL: + dstAccessMask = VK_ACCESS_TRANSFER_READ_BIT; + dstStageMask = VK_PIPELINE_STAGE_TRANSFER_BIT; + break; + case VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL: + dstAccessMask = VK_ACCESS_TRANSFER_READ_BIT; + dstStageMask = VK_PIPELINE_STAGE_TRANSFER_BIT; + break; + case VK_IMAGE_LAYOUT_UNDEFINED: + case VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL: + // Nothing to do. + return; + default: + _dbg_assert_msg_(false, "TransitionFromOptimal: Unexpected final depth layout %d", (int)depthStencilLayout); + break; } + recordBarrier->TransitionImage( + depthStencilImage, 0, 1, numLayers, VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT, + VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL, + depthStencilLayout, + VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT, // srcAccessMask + dstAccessMask, + VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT | VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT, + dstStageMask + ); } void VulkanQueueRunner::PerformRenderPass(const VKRStep &step, VkCommandBuffer cmd, int curFrame, QueueProfileContext &profile) { @@ -1385,9 +1383,11 @@ void VulkanQueueRunner::PerformRenderPass(const VKRStep &step, VkCommandBuffer c _dbg_assert_(recordBarrier_.empty()); if (fb) { - // If the desired final layout aren't the optimal layout for rendering, transition. - // TODO: Not sure when we use this now? - TransitionFromOptimal(cmd, fb->color.image, step.render.finalColorLayout, fb->depth.image, step.render.finalDepthStencilLayout, fb->numLayers, &recordBarrier_); + // If the desired final layout aren't the optimal layout needed next, transition. + TransitionColorFromOptimal(cmd, fb->color.image, step.render.finalColorLayout, fb->numLayers, &recordBarrier_); + if (fb->depth.image) { + TransitionDepthFromOptimal(cmd, fb->depth.image, step.render.finalDepthStencilLayout, fb->numLayers, &recordBarrier_); + } recordBarrier_.Flush(cmd); fb->color.layout = step.render.finalColorLayout; From a3d0cb1f12e994615678179fbff21e7e888a2b33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sat, 6 Apr 2024 17:09:36 +0200 Subject: [PATCH 017/719] Switch away from TransitionImageLayout2 --- Common/GPU/Vulkan/VulkanImage.cpp | 8 ++++---- Common/GPU/Vulkan/VulkanImage.h | 2 +- Common/GPU/Vulkan/VulkanQueueRunner.cpp | 23 +++++++++++++---------- Common/GPU/Vulkan/thin3d_vulkan.cpp | 10 +++++++--- GPU/Vulkan/TextureCacheVulkan.cpp | 8 ++++++-- 5 files changed, 31 insertions(+), 20 deletions(-) diff --git a/Common/GPU/Vulkan/VulkanImage.cpp b/Common/GPU/Vulkan/VulkanImage.cpp index 0361d66d4a..f5406a5698 100644 --- a/Common/GPU/Vulkan/VulkanImage.cpp +++ b/Common/GPU/Vulkan/VulkanImage.cpp @@ -38,7 +38,7 @@ static bool IsDepthStencilFormat(VkFormat format) { } } -bool VulkanTexture::CreateDirect(VkCommandBuffer cmd, int w, int h, int depth, int numMips, VkFormat format, VkImageLayout initialLayout, VkImageUsageFlags usage, const VkComponentMapping *mapping) { +bool VulkanTexture::CreateDirect(int w, int h, int depth, int numMips, VkFormat format, VkImageLayout initialLayout, VkImageUsageFlags usage, VulkanBarrierBatch *barrierBatch, const VkComponentMapping *mapping) { if (w == 0 || h == 0 || numMips == 0) { ERROR_LOG(G3D, "Can't create a zero-size VulkanTexture"); return false; @@ -113,10 +113,10 @@ bool VulkanTexture::CreateDirect(VkCommandBuffer cmd, int w, int h, int depth, i _assert_(false); break; } - TransitionImageLayout2(cmd, image_, 0, numMips, 1, VK_IMAGE_ASPECT_COLOR_BIT, + barrierBatch->TransitionImage(image_, 0, numMips, 1, VK_IMAGE_ASPECT_COLOR_BIT, VK_IMAGE_LAYOUT_UNDEFINED, initialLayout, - VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, dstStage, - 0, dstAccessFlags); + 0, dstAccessFlags, + VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, dstStage); } // Create the view while we're at it. diff --git a/Common/GPU/Vulkan/VulkanImage.h b/Common/GPU/Vulkan/VulkanImage.h index 4adaf4f1a1..05e6039108 100644 --- a/Common/GPU/Vulkan/VulkanImage.h +++ b/Common/GPU/Vulkan/VulkanImage.h @@ -28,7 +28,7 @@ public: // Fast uploads from buffer. Mipmaps supported. // Usage must at least include VK_IMAGE_USAGE_TRANSFER_DST_BIT in order to use UploadMip. // When using UploadMip, initialLayout should be VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL. - bool CreateDirect(VkCommandBuffer cmd, int w, int h, int depth, int numMips, VkFormat format, VkImageLayout initialLayout, VkImageUsageFlags usage = VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_SAMPLED_BIT, const VkComponentMapping *mapping = nullptr); + bool CreateDirect(int w, int h, int depth, int numMips, VkFormat format, VkImageLayout initialLayout, VkImageUsageFlags usage, VulkanBarrierBatch *barrierBatch, const VkComponentMapping *mapping = nullptr); void ClearMip(VkCommandBuffer cmd, int mip, uint32_t value); // Can also be used to copy individual levels of a 3D texture. diff --git a/Common/GPU/Vulkan/VulkanQueueRunner.cpp b/Common/GPU/Vulkan/VulkanQueueRunner.cpp index 30a6e91a84..a0164c03ad 100644 --- a/Common/GPU/Vulkan/VulkanQueueRunner.cpp +++ b/Common/GPU/Vulkan/VulkanQueueRunner.cpp @@ -1913,10 +1913,10 @@ void VulkanQueueRunner::PerformReadback(const VKRStep &step, VkCommandBuffer cmd // We only take screenshots after the main render pass (anything else would be stupid) so we need to transition out of PRESENT, // and then back into it. // Regarding layers, backbuffer currently only has one layer. - TransitionImageLayout2(cmd, backbufferImage_, 0, 1, 1, VK_IMAGE_ASPECT_COLOR_BIT, + recordBarrier_.TransitionImage(backbufferImage_, 0, 1, 1, VK_IMAGE_ASPECT_COLOR_BIT, VK_IMAGE_LAYOUT_PRESENT_SRC_KHR, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, - VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, - 0, VK_ACCESS_TRANSFER_READ_BIT); + 0, VK_ACCESS_TRANSFER_READ_BIT, + VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT); copyLayout = VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL; image = backbufferImage_; } else { @@ -1933,12 +1933,13 @@ void VulkanQueueRunner::PerformReadback(const VKRStep &step, VkCommandBuffer cmd if (srcImage->layout != VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL) { SetupTransitionToTransferSrc(*srcImage, step.readback.aspectMask, &recordBarrier_); - recordBarrier_.Flush(cmd); } image = srcImage->image; copyLayout = srcImage->layout; } + recordBarrier_.Flush(cmd); + // TODO: Handle different readback formats! u32 readbackSizeInBytes = sizeof(uint32_t) * step.readback.srcRect.extent.width * step.readback.srcRect.extent.height; @@ -1980,10 +1981,11 @@ void VulkanQueueRunner::PerformReadback(const VKRStep &step, VkCommandBuffer cmd // We only take screenshots after the main render pass (anything else would be stupid) so we need to transition out of PRESENT, // and then back into it. // Regarding layers, backbuffer currently only has one layer. - TransitionImageLayout2(cmd, backbufferImage_, 0, 1, 1, VK_IMAGE_ASPECT_COLOR_BIT, + recordBarrier_.TransitionImage(backbufferImage_, 0, 1, 1, VK_IMAGE_ASPECT_COLOR_BIT, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, VK_IMAGE_LAYOUT_PRESENT_SRC_KHR, - VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, - VK_ACCESS_TRANSFER_READ_BIT, 0); + VK_ACCESS_TRANSFER_READ_BIT, 0, + VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT); + recordBarrier_.Flush(cmd); // probably not needed copyLayout = VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL; } } @@ -2012,11 +2014,12 @@ void VulkanQueueRunner::PerformReadbackImage(const VKRStep &step, VkCommandBuffe vkCmdCopyImageToBuffer(cmd, step.readback_image.image, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, syncReadback_.buffer, 1, ®ion); // Now transfer it back to a texture. - TransitionImageLayout2(cmd, step.readback_image.image, 0, 1, 1, // I don't think we have any multilayer cases for regular textures. Above in PerformReadback, though.. + recordBarrier_.TransitionImage(step.readback_image.image, 0, 1, 1, // I don't think we have any multilayer cases for regular textures. Above in PerformReadback, though.. VK_IMAGE_ASPECT_COLOR_BIT, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL, - VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT, - VK_ACCESS_TRANSFER_READ_BIT, VK_ACCESS_SHADER_READ_BIT); + VK_ACCESS_TRANSFER_READ_BIT, VK_ACCESS_SHADER_READ_BIT, + VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT); + recordBarrier_.Flush(cmd); // probably not needed // NOTE: Can't read the buffer using the CPU here - need to sync first. // Doing that will also act like a heavyweight barrier ensuring that device writes are visible on the host. diff --git a/Common/GPU/Vulkan/thin3d_vulkan.cpp b/Common/GPU/Vulkan/thin3d_vulkan.cpp index eaace00be0..8061ba1cf7 100644 --- a/Common/GPU/Vulkan/thin3d_vulkan.cpp +++ b/Common/GPU/Vulkan/thin3d_vulkan.cpp @@ -699,8 +699,10 @@ VulkanTexture *VKContext::GetNullTexture() { nullTexture_ = new VulkanTexture(vulkan_, "Null"); int w = 8; int h = 8; - nullTexture_->CreateDirect(cmdInit, w, h, 1, 1, VK_FORMAT_A8B8G8R8_UNORM_PACK32, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, - VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_SAMPLED_BIT); + VulkanBarrierBatch barrier; + nullTexture_->CreateDirect(w, h, 1, 1, VK_FORMAT_A8B8G8R8_UNORM_PACK32, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, + VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_SAMPLED_BIT, &barrier); + barrier.Flush(cmdInit); uint32_t bindOffset; VkBuffer bindBuf; uint32_t *data = (uint32_t *)push_->Allocate(w * h * 4, 4, &bindBuf, &bindOffset); @@ -791,10 +793,12 @@ bool VKTexture::Create(VkCommandBuffer cmd, VulkanBarrierBatch *postBarriers, Vu VkComponentMapping r8AsAlpha[4] = { VK_COMPONENT_SWIZZLE_ONE, VK_COMPONENT_SWIZZLE_ONE, VK_COMPONENT_SWIZZLE_ONE, VK_COMPONENT_SWIZZLE_R }; - if (!vkTex_->CreateDirect(cmd, width_, height_, 1, mipLevels_, vulkanFormat, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, usageBits, desc.swizzle == TextureSwizzle::R8_AS_ALPHA ? r8AsAlpha : nullptr)) { + VulkanBarrierBatch barrier; + if (!vkTex_->CreateDirect(width_, height_, 1, mipLevels_, vulkanFormat, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, usageBits, &barrier, desc.swizzle == TextureSwizzle::R8_AS_ALPHA ? r8AsAlpha : nullptr)) { ERROR_LOG(G3D, "Failed to create VulkanTexture: %dx%dx%d fmt %d, %d levels", width_, height_, depth_, (int)vulkanFormat, mipLevels_); return false; } + barrier.Flush(cmd); VkImageLayout layout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL; if (desc.initData.size()) { UpdateInternal(cmd, pushBuffer, desc.initData.data(), desc.initDataCallback, (int)desc.initData.size()); diff --git a/GPU/Vulkan/TextureCacheVulkan.cpp b/GPU/Vulkan/TextureCacheVulkan.cpp index 08efbc62ed..d12b3267fc 100644 --- a/GPU/Vulkan/TextureCacheVulkan.cpp +++ b/GPU/Vulkan/TextureCacheVulkan.cpp @@ -512,7 +512,10 @@ void TextureCacheVulkan::BuildTexture(TexCacheEntry *const entry) { snprintf(texName, sizeof(texName), "tex_%08x_%s_%s", entry->addr, GeTextureFormatToString((GETextureFormat)entry->format, gstate.getClutPaletteFormat()), gstate.isTextureSwizzled() ? "swz" : "lin"); entry->vkTex = new VulkanTexture(vulkan, texName); VulkanTexture *image = entry->vkTex; - bool allocSuccess = image->CreateDirect(cmdInit, plan.createW, plan.createH, plan.depth, plan.levelsToCreate, actualFmt, imageLayout, usage, mapping); + + VulkanBarrierBatch barrier; + bool allocSuccess = image->CreateDirect(plan.createW, plan.createH, plan.depth, plan.levelsToCreate, actualFmt, imageLayout, usage, &barrier, mapping); + barrier.Flush(cmdInit); if (!allocSuccess && !lowMemoryMode_) { WARN_LOG_REPORT(G3D, "Texture cache ran out of GPU memory; switching to low memory mode"); lowMemoryMode_ = true; @@ -537,7 +540,8 @@ void TextureCacheVulkan::BuildTexture(TexCacheEntry *const entry) { plan.scaleFactor = 1; actualFmt = dstFmt; - allocSuccess = image->CreateDirect(cmdInit, plan.createW, plan.createH, plan.depth, plan.levelsToCreate, actualFmt, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_SAMPLED_BIT, mapping); + allocSuccess = image->CreateDirect(plan.createW, plan.createH, plan.depth, plan.levelsToCreate, actualFmt, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_SAMPLED_BIT, &barrier, mapping); + barrier.Flush(cmdInit); } if (!allocSuccess) { From a66affe5db2bc1658b58e776f938c8b68da7aba0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sat, 6 Apr 2024 17:12:40 +0200 Subject: [PATCH 018/719] Delete the function TransitionImageLayout2 --- Common/GPU/Vulkan/VulkanBarrier.cpp | 19 ------------------- Common/GPU/Vulkan/VulkanBarrier.h | 6 ------ 2 files changed, 25 deletions(-) diff --git a/Common/GPU/Vulkan/VulkanBarrier.cpp b/Common/GPU/Vulkan/VulkanBarrier.cpp index 585fe98c04..c99a48a10e 100644 --- a/Common/GPU/Vulkan/VulkanBarrier.cpp +++ b/Common/GPU/Vulkan/VulkanBarrier.cpp @@ -114,22 +114,3 @@ void VulkanBarrierBatch::TransitionImageAuto( imageBarrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; imageBarrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; } - -void TransitionImageLayout2(VkCommandBuffer cmd, VkImage image, int baseMip, int numMipLevels, int numLayers, VkImageAspectFlags aspectMask, - VkImageLayout oldImageLayout, VkImageLayout newImageLayout, - VkPipelineStageFlags srcStageMask, VkPipelineStageFlags dstStageMask, - VkAccessFlags srcAccessMask, VkAccessFlags dstAccessMask) { - VkImageMemoryBarrier image_memory_barrier{ VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER }; - image_memory_barrier.srcAccessMask = srcAccessMask; - image_memory_barrier.dstAccessMask = dstAccessMask; - image_memory_barrier.oldLayout = oldImageLayout; - image_memory_barrier.newLayout = newImageLayout; - image_memory_barrier.image = image; - image_memory_barrier.subresourceRange.aspectMask = aspectMask; - image_memory_barrier.subresourceRange.baseMipLevel = baseMip; - image_memory_barrier.subresourceRange.levelCount = numMipLevels; - image_memory_barrier.subresourceRange.layerCount = numLayers; // We never use more than one layer, and old Mali drivers have problems with VK_REMAINING_ARRAY_LAYERS/VK_REMAINING_MIP_LEVELS. - image_memory_barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; - image_memory_barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; - vkCmdPipelineBarrier(cmd, srcStageMask, dstStageMask, 0, 0, nullptr, 0, nullptr, 1, &image_memory_barrier); -} diff --git a/Common/GPU/Vulkan/VulkanBarrier.h b/Common/GPU/Vulkan/VulkanBarrier.h index 60b1ea3fc0..824515786c 100644 --- a/Common/GPU/Vulkan/VulkanBarrier.h +++ b/Common/GPU/Vulkan/VulkanBarrier.h @@ -55,9 +55,3 @@ private: VkPipelineStageFlags dstStageMask_ = 0; VkDependencyFlags dependencyFlags_ = 0; }; - -// Detailed control, but just a single image. Use the barrier batch when possible. -void TransitionImageLayout2(VkCommandBuffer cmd, VkImage image, int baseMip, int mipLevels, int numLayers, VkImageAspectFlags aspectMask, - VkImageLayout oldImageLayout, VkImageLayout newImageLayout, - VkPipelineStageFlags srcStageMask, VkPipelineStageFlags dstStageMask, - VkAccessFlags srcAccessMask, VkAccessFlags dstAccessMask); From f2345edba13b4a366a4987e9423c1100c8f4adfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sat, 6 Apr 2024 17:53:58 +0200 Subject: [PATCH 019/719] Update to the latest Vulkan header files --- ext/vulkan/vk_platform.h | 2 +- ext/vulkan/vk_sdk_platform.h | 81 - .../vk_video/vulkan_video_codec_av1std.h | 392 ++++ .../vulkan_video_codec_av1std_decode.h | 109 + .../vk_video/vulkan_video_codec_h264std.h | 3 +- .../vulkan_video_codec_h264std_decode.h | 2 +- .../vulkan_video_codec_h264std_encode.h | 13 +- .../vk_video/vulkan_video_codec_h265std.h | 3 +- .../vulkan_video_codec_h265std_decode.h | 2 +- .../vulkan_video_codec_h265std_encode.h | 39 +- .../vk_video/vulkan_video_codecs_common.h | 2 +- ext/vulkan/vulkan.h | 2 +- ext/vulkan/vulkan_android.h | 28 +- ext/vulkan/vulkan_beta.h | 594 +---- ext/vulkan/vulkan_core.h | 2059 +++++++++++++++-- ext/vulkan/vulkan_directfb.h | 2 +- ext/vulkan/vulkan_fuchsia.h | 2 +- ext/vulkan/vulkan_ggp.h | 2 +- ext/vulkan/vulkan_ios.h | 2 +- ext/vulkan/vulkan_macos.h | 2 +- ext/vulkan/vulkan_metal.h | 2 +- ext/vulkan/vulkan_screen.h | 2 +- ext/vulkan/vulkan_vi.h | 2 +- ext/vulkan/vulkan_wayland.h | 2 +- ext/vulkan/vulkan_win32.h | 2 +- ext/vulkan/vulkan_xcb.h | 2 +- ext/vulkan/vulkan_xlib.h | 2 +- ext/vulkan/vulkan_xlib_xrandr.h | 2 +- 28 files changed, 2385 insertions(+), 972 deletions(-) delete mode 100644 ext/vulkan/vk_sdk_platform.h create mode 100644 ext/vulkan/vk_video/vulkan_video_codec_av1std.h create mode 100644 ext/vulkan/vk_video/vulkan_video_codec_av1std_decode.h diff --git a/ext/vulkan/vk_platform.h b/ext/vulkan/vk_platform.h index ed67a6004a..0ecd4f6471 100644 --- a/ext/vulkan/vk_platform.h +++ b/ext/vulkan/vk_platform.h @@ -2,7 +2,7 @@ // File: vk_platform.h // /* -** Copyright 2014-2023 The Khronos Group Inc. +** Copyright 2014-2024 The Khronos Group Inc. ** ** SPDX-License-Identifier: Apache-2.0 */ diff --git a/ext/vulkan/vk_sdk_platform.h b/ext/vulkan/vk_sdk_platform.h deleted file mode 100644 index 3bdf5057bf..0000000000 --- a/ext/vulkan/vk_sdk_platform.h +++ /dev/null @@ -1,81 +0,0 @@ -// -// File: vk_sdk_platform.h -// -/* - * Copyright (c) 2015-2023 LunarG, Inc. - * Copyright (c) 2015-2023 The Khronos Group Inc. - * Copyright (c) 2015-2023 Valve Corporation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#pragma once - -// Allow users to suppress warnings generated by this header file by defining VK_SDK_PLATFORM_SUPRRESS_DEPRECATION_WARNING -#ifndef VK_SDK_PLATFORM_SUPRRESS_DEPRECATION_WARNING - -#if defined(__GNUC__) && __GNUC__ >= 4 -#warning "vk_sdk_platform.h is deprecated and will be removed in future release! Use VK_SDK_PLATFORM_SUPRRESS_DEPRECATION_WARNING to suppress warning!" -#endif - -// MSVC doesn't support warning directive -#if defined(_MSC_VER) -#pragma message("vk_sdk_platform.h is deprecated and will be removed in future release! Use VK_SDK_PLATFORM_SUPRRESS_DEPRECATION_WARNING to suppress warning!") -#endif - -#endif - -#if defined(_WIN32) -#ifndef NOMINMAX -#define NOMINMAX -#endif -#ifndef __cplusplus -#undef inline -#define inline __inline -#endif // __cplusplus - -#if (defined(_MSC_VER) && _MSC_VER < 1900 /*vs2015*/) -// C99: -// Microsoft didn't implement C99 in Visual Studio; but started adding it with -// VS2013. However, VS2013 still didn't have snprintf(). The following is a -// work-around (Note: The _CRT_SECURE_NO_WARNINGS macro must be set in the -// "CMakeLists.txt" file). -// NOTE: This is fixed in Visual Studio 2015. -#define snprintf _snprintf -#endif - -#define strdup _strdup - -#endif // _WIN32 - -// Check for noexcept support using clang, with fallback to Windows or GCC version numbers -#ifndef NOEXCEPT -#if defined(__clang__) -#if __has_feature(cxx_noexcept) -#define HAS_NOEXCEPT -#endif -#else -#if defined(__GXX_EXPERIMENTAL_CXX0X__) && __GNUC__ * 10 + __GNUC_MINOR__ >= 46 -#define HAS_NOEXCEPT -#else -#if defined(_MSC_FULL_VER) && _MSC_FULL_VER >= 190023026 && defined(_HAS_EXCEPTIONS) && _HAS_EXCEPTIONS -#define HAS_NOEXCEPT -#endif -#endif -#endif - -#ifdef HAS_NOEXCEPT -#define NOEXCEPT noexcept -#else -#define NOEXCEPT -#endif -#endif diff --git a/ext/vulkan/vk_video/vulkan_video_codec_av1std.h b/ext/vulkan/vk_video/vulkan_video_codec_av1std.h new file mode 100644 index 0000000000..8ce283e8a8 --- /dev/null +++ b/ext/vulkan/vk_video/vulkan_video_codec_av1std.h @@ -0,0 +1,392 @@ +#ifndef VULKAN_VIDEO_CODEC_AV1STD_H_ +#define VULKAN_VIDEO_CODEC_AV1STD_H_ 1 + +/* +** Copyright 2015-2024 The Khronos Group Inc. +** +** SPDX-License-Identifier: Apache-2.0 +*/ + +/* +** This header is generated from the Khronos Vulkan XML API Registry. +** +*/ + + +#ifdef __cplusplus +extern "C" { +#endif + + + +// vulkan_video_codec_av1std is a preprocessor guard. Do not pass it to API calls. +#define vulkan_video_codec_av1std 1 +#include "vulkan_video_codecs_common.h" +#define STD_VIDEO_AV1_NUM_REF_FRAMES 8 +#define STD_VIDEO_AV1_REFS_PER_FRAME 7 +#define STD_VIDEO_AV1_TOTAL_REFS_PER_FRAME 8 +#define STD_VIDEO_AV1_MAX_TILE_COLS 64 +#define STD_VIDEO_AV1_MAX_TILE_ROWS 64 +#define STD_VIDEO_AV1_MAX_SEGMENTS 8 +#define STD_VIDEO_AV1_SEG_LVL_MAX 8 +#define STD_VIDEO_AV1_PRIMARY_REF_NONE 7 +#define STD_VIDEO_AV1_SELECT_INTEGER_MV 2 +#define STD_VIDEO_AV1_SELECT_SCREEN_CONTENT_TOOLS 2 +#define STD_VIDEO_AV1_SKIP_MODE_FRAMES 2 +#define STD_VIDEO_AV1_MAX_LOOP_FILTER_STRENGTHS 4 +#define STD_VIDEO_AV1_LOOP_FILTER_ADJUSTMENTS 2 +#define STD_VIDEO_AV1_MAX_CDEF_FILTER_STRENGTHS 8 +#define STD_VIDEO_AV1_MAX_NUM_PLANES 3 +#define STD_VIDEO_AV1_GLOBAL_MOTION_PARAMS 6 +#define STD_VIDEO_AV1_MAX_NUM_Y_POINTS 14 +#define STD_VIDEO_AV1_MAX_NUM_CB_POINTS 10 +#define STD_VIDEO_AV1_MAX_NUM_CR_POINTS 10 +#define STD_VIDEO_AV1_MAX_NUM_POS_LUMA 24 +#define STD_VIDEO_AV1_MAX_NUM_POS_CHROMA 25 + +typedef enum StdVideoAV1Profile { + STD_VIDEO_AV1_PROFILE_MAIN = 0, + STD_VIDEO_AV1_PROFILE_HIGH = 1, + STD_VIDEO_AV1_PROFILE_PROFESSIONAL = 2, + STD_VIDEO_AV1_PROFILE_INVALID = 0x7FFFFFFF, + STD_VIDEO_AV1_PROFILE_MAX_ENUM = 0x7FFFFFFF +} StdVideoAV1Profile; + +typedef enum StdVideoAV1Level { + STD_VIDEO_AV1_LEVEL_2_0 = 0, + STD_VIDEO_AV1_LEVEL_2_1 = 1, + STD_VIDEO_AV1_LEVEL_2_2 = 2, + STD_VIDEO_AV1_LEVEL_2_3 = 3, + STD_VIDEO_AV1_LEVEL_3_0 = 4, + STD_VIDEO_AV1_LEVEL_3_1 = 5, + STD_VIDEO_AV1_LEVEL_3_2 = 6, + STD_VIDEO_AV1_LEVEL_3_3 = 7, + STD_VIDEO_AV1_LEVEL_4_0 = 8, + STD_VIDEO_AV1_LEVEL_4_1 = 9, + STD_VIDEO_AV1_LEVEL_4_2 = 10, + STD_VIDEO_AV1_LEVEL_4_3 = 11, + STD_VIDEO_AV1_LEVEL_5_0 = 12, + STD_VIDEO_AV1_LEVEL_5_1 = 13, + STD_VIDEO_AV1_LEVEL_5_2 = 14, + STD_VIDEO_AV1_LEVEL_5_3 = 15, + STD_VIDEO_AV1_LEVEL_6_0 = 16, + STD_VIDEO_AV1_LEVEL_6_1 = 17, + STD_VIDEO_AV1_LEVEL_6_2 = 18, + STD_VIDEO_AV1_LEVEL_6_3 = 19, + STD_VIDEO_AV1_LEVEL_7_0 = 20, + STD_VIDEO_AV1_LEVEL_7_1 = 21, + STD_VIDEO_AV1_LEVEL_7_2 = 22, + STD_VIDEO_AV1_LEVEL_7_3 = 23, + STD_VIDEO_AV1_LEVEL_INVALID = 0x7FFFFFFF, + STD_VIDEO_AV1_LEVEL_MAX_ENUM = 0x7FFFFFFF +} StdVideoAV1Level; + +typedef enum StdVideoAV1FrameType { + STD_VIDEO_AV1_FRAME_TYPE_KEY = 0, + STD_VIDEO_AV1_FRAME_TYPE_INTER = 1, + STD_VIDEO_AV1_FRAME_TYPE_INTRA_ONLY = 2, + STD_VIDEO_AV1_FRAME_TYPE_SWITCH = 3, + STD_VIDEO_AV1_FRAME_TYPE_INVALID = 0x7FFFFFFF, + STD_VIDEO_AV1_FRAME_TYPE_MAX_ENUM = 0x7FFFFFFF +} StdVideoAV1FrameType; + +typedef enum StdVideoAV1ReferenceName { + STD_VIDEO_AV1_REFERENCE_NAME_INTRA_FRAME = 0, + STD_VIDEO_AV1_REFERENCE_NAME_LAST_FRAME = 1, + STD_VIDEO_AV1_REFERENCE_NAME_LAST2_FRAME = 2, + STD_VIDEO_AV1_REFERENCE_NAME_LAST3_FRAME = 3, + STD_VIDEO_AV1_REFERENCE_NAME_GOLDEN_FRAME = 4, + STD_VIDEO_AV1_REFERENCE_NAME_BWDREF_FRAME = 5, + STD_VIDEO_AV1_REFERENCE_NAME_ALTREF2_FRAME = 6, + STD_VIDEO_AV1_REFERENCE_NAME_ALTREF_FRAME = 7, + STD_VIDEO_AV1_REFERENCE_NAME_INVALID = 0x7FFFFFFF, + STD_VIDEO_AV1_REFERENCE_NAME_MAX_ENUM = 0x7FFFFFFF +} StdVideoAV1ReferenceName; + +typedef enum StdVideoAV1InterpolationFilter { + STD_VIDEO_AV1_INTERPOLATION_FILTER_EIGHTTAP = 0, + STD_VIDEO_AV1_INTERPOLATION_FILTER_EIGHTTAP_SMOOTH = 1, + STD_VIDEO_AV1_INTERPOLATION_FILTER_EIGHTTAP_SHARP = 2, + STD_VIDEO_AV1_INTERPOLATION_FILTER_BILINEAR = 3, + STD_VIDEO_AV1_INTERPOLATION_FILTER_SWITCHABLE = 4, + STD_VIDEO_AV1_INTERPOLATION_FILTER_INVALID = 0x7FFFFFFF, + STD_VIDEO_AV1_INTERPOLATION_FILTER_MAX_ENUM = 0x7FFFFFFF +} StdVideoAV1InterpolationFilter; + +typedef enum StdVideoAV1TxMode { + STD_VIDEO_AV1_TX_MODE_ONLY_4X4 = 0, + STD_VIDEO_AV1_TX_MODE_LARGEST = 1, + STD_VIDEO_AV1_TX_MODE_SELECT = 2, + STD_VIDEO_AV1_TX_MODE_INVALID = 0x7FFFFFFF, + STD_VIDEO_AV1_TX_MODE_MAX_ENUM = 0x7FFFFFFF +} StdVideoAV1TxMode; + +typedef enum StdVideoAV1FrameRestorationType { + STD_VIDEO_AV1_FRAME_RESTORATION_TYPE_NONE = 0, + STD_VIDEO_AV1_FRAME_RESTORATION_TYPE_WIENER = 1, + STD_VIDEO_AV1_FRAME_RESTORATION_TYPE_SGRPROJ = 2, + STD_VIDEO_AV1_FRAME_RESTORATION_TYPE_SWITCHABLE = 3, + STD_VIDEO_AV1_FRAME_RESTORATION_TYPE_INVALID = 0x7FFFFFFF, + STD_VIDEO_AV1_FRAME_RESTORATION_TYPE_MAX_ENUM = 0x7FFFFFFF +} StdVideoAV1FrameRestorationType; + +typedef enum StdVideoAV1ColorPrimaries { + STD_VIDEO_AV1_COLOR_PRIMARIES_BT_709 = 1, + STD_VIDEO_AV1_COLOR_PRIMARIES_BT_UNSPECIFIED = 2, + STD_VIDEO_AV1_COLOR_PRIMARIES_BT_470_M = 4, + STD_VIDEO_AV1_COLOR_PRIMARIES_BT_470_B_G = 5, + STD_VIDEO_AV1_COLOR_PRIMARIES_BT_601 = 6, + STD_VIDEO_AV1_COLOR_PRIMARIES_SMPTE_240 = 7, + STD_VIDEO_AV1_COLOR_PRIMARIES_GENERIC_FILM = 8, + STD_VIDEO_AV1_COLOR_PRIMARIES_BT_2020 = 9, + STD_VIDEO_AV1_COLOR_PRIMARIES_XYZ = 10, + STD_VIDEO_AV1_COLOR_PRIMARIES_SMPTE_431 = 11, + STD_VIDEO_AV1_COLOR_PRIMARIES_SMPTE_432 = 12, + STD_VIDEO_AV1_COLOR_PRIMARIES_EBU_3213 = 22, + STD_VIDEO_AV1_COLOR_PRIMARIES_INVALID = 0x7FFFFFFF, + STD_VIDEO_AV1_COLOR_PRIMARIES_MAX_ENUM = 0x7FFFFFFF +} StdVideoAV1ColorPrimaries; + +typedef enum StdVideoAV1TransferCharacteristics { + STD_VIDEO_AV1_TRANSFER_CHARACTERISTICS_RESERVED_0 = 0, + STD_VIDEO_AV1_TRANSFER_CHARACTERISTICS_BT_709 = 1, + STD_VIDEO_AV1_TRANSFER_CHARACTERISTICS_UNSPECIFIED = 2, + STD_VIDEO_AV1_TRANSFER_CHARACTERISTICS_RESERVED_3 = 3, + STD_VIDEO_AV1_TRANSFER_CHARACTERISTICS_BT_470_M = 4, + STD_VIDEO_AV1_TRANSFER_CHARACTERISTICS_BT_470_B_G = 5, + STD_VIDEO_AV1_TRANSFER_CHARACTERISTICS_BT_601 = 6, + STD_VIDEO_AV1_TRANSFER_CHARACTERISTICS_SMPTE_240 = 7, + STD_VIDEO_AV1_TRANSFER_CHARACTERISTICS_LINEAR = 8, + STD_VIDEO_AV1_TRANSFER_CHARACTERISTICS_LOG_100 = 9, + STD_VIDEO_AV1_TRANSFER_CHARACTERISTICS_LOG_100_SQRT10 = 10, + STD_VIDEO_AV1_TRANSFER_CHARACTERISTICS_IEC_61966 = 11, + STD_VIDEO_AV1_TRANSFER_CHARACTERISTICS_BT_1361 = 12, + STD_VIDEO_AV1_TRANSFER_CHARACTERISTICS_SRGB = 13, + STD_VIDEO_AV1_TRANSFER_CHARACTERISTICS_BT_2020_10_BIT = 14, + STD_VIDEO_AV1_TRANSFER_CHARACTERISTICS_BT_2020_12_BIT = 15, + STD_VIDEO_AV1_TRANSFER_CHARACTERISTICS_SMPTE_2084 = 16, + STD_VIDEO_AV1_TRANSFER_CHARACTERISTICS_SMPTE_428 = 17, + STD_VIDEO_AV1_TRANSFER_CHARACTERISTICS_HLG = 18, + STD_VIDEO_AV1_TRANSFER_CHARACTERISTICS_INVALID = 0x7FFFFFFF, + STD_VIDEO_AV1_TRANSFER_CHARACTERISTICS_MAX_ENUM = 0x7FFFFFFF +} StdVideoAV1TransferCharacteristics; + +typedef enum StdVideoAV1MatrixCoefficients { + STD_VIDEO_AV1_MATRIX_COEFFICIENTS_IDENTITY = 0, + STD_VIDEO_AV1_MATRIX_COEFFICIENTS_BT_709 = 1, + STD_VIDEO_AV1_MATRIX_COEFFICIENTS_UNSPECIFIED = 2, + STD_VIDEO_AV1_MATRIX_COEFFICIENTS_RESERVED_3 = 3, + STD_VIDEO_AV1_MATRIX_COEFFICIENTS_FCC = 4, + STD_VIDEO_AV1_MATRIX_COEFFICIENTS_BT_470_B_G = 5, + STD_VIDEO_AV1_MATRIX_COEFFICIENTS_BT_601 = 6, + STD_VIDEO_AV1_MATRIX_COEFFICIENTS_SMPTE_240 = 7, + STD_VIDEO_AV1_MATRIX_COEFFICIENTS_SMPTE_YCGCO = 8, + STD_VIDEO_AV1_MATRIX_COEFFICIENTS_BT_2020_NCL = 9, + STD_VIDEO_AV1_MATRIX_COEFFICIENTS_BT_2020_CL = 10, + STD_VIDEO_AV1_MATRIX_COEFFICIENTS_SMPTE_2085 = 11, + STD_VIDEO_AV1_MATRIX_COEFFICIENTS_CHROMAT_NCL = 12, + STD_VIDEO_AV1_MATRIX_COEFFICIENTS_CHROMAT_CL = 13, + STD_VIDEO_AV1_MATRIX_COEFFICIENTS_ICTCP = 14, + STD_VIDEO_AV1_MATRIX_COEFFICIENTS_INVALID = 0x7FFFFFFF, + STD_VIDEO_AV1_MATRIX_COEFFICIENTS_MAX_ENUM = 0x7FFFFFFF +} StdVideoAV1MatrixCoefficients; + +typedef enum StdVideoAV1ChromaSamplePosition { + STD_VIDEO_AV1_CHROMA_SAMPLE_POSITION_UNKNOWN = 0, + STD_VIDEO_AV1_CHROMA_SAMPLE_POSITION_VERTICAL = 1, + STD_VIDEO_AV1_CHROMA_SAMPLE_POSITION_COLOCATED = 2, + STD_VIDEO_AV1_CHROMA_SAMPLE_POSITION_RESERVED = 3, + STD_VIDEO_AV1_CHROMA_SAMPLE_POSITION_INVALID = 0x7FFFFFFF, + STD_VIDEO_AV1_CHROMA_SAMPLE_POSITION_MAX_ENUM = 0x7FFFFFFF +} StdVideoAV1ChromaSamplePosition; +typedef struct StdVideoAV1ColorConfigFlags { + uint32_t mono_chrome : 1; + uint32_t color_range : 1; + uint32_t separate_uv_delta_q : 1; + uint32_t color_description_present_flag : 1; + uint32_t reserved : 28; +} StdVideoAV1ColorConfigFlags; + +typedef struct StdVideoAV1ColorConfig { + StdVideoAV1ColorConfigFlags flags; + uint8_t BitDepth; + uint8_t subsampling_x; + uint8_t subsampling_y; + uint8_t reserved1; + StdVideoAV1ColorPrimaries color_primaries; + StdVideoAV1TransferCharacteristics transfer_characteristics; + StdVideoAV1MatrixCoefficients matrix_coefficients; + StdVideoAV1ChromaSamplePosition chroma_sample_position; +} StdVideoAV1ColorConfig; + +typedef struct StdVideoAV1TimingInfoFlags { + uint32_t equal_picture_interval : 1; + uint32_t reserved : 31; +} StdVideoAV1TimingInfoFlags; + +typedef struct StdVideoAV1TimingInfo { + StdVideoAV1TimingInfoFlags flags; + uint32_t num_units_in_display_tick; + uint32_t time_scale; + uint32_t num_ticks_per_picture_minus_1; +} StdVideoAV1TimingInfo; + +typedef struct StdVideoAV1LoopFilterFlags { + uint32_t loop_filter_delta_enabled : 1; + uint32_t loop_filter_delta_update : 1; + uint32_t reserved : 30; +} StdVideoAV1LoopFilterFlags; + +typedef struct StdVideoAV1LoopFilter { + StdVideoAV1LoopFilterFlags flags; + uint8_t loop_filter_level[STD_VIDEO_AV1_MAX_LOOP_FILTER_STRENGTHS]; + uint8_t loop_filter_sharpness; + uint8_t update_ref_delta; + int8_t loop_filter_ref_deltas[STD_VIDEO_AV1_TOTAL_REFS_PER_FRAME]; + uint8_t update_mode_delta; + int8_t loop_filter_mode_deltas[STD_VIDEO_AV1_LOOP_FILTER_ADJUSTMENTS]; +} StdVideoAV1LoopFilter; + +typedef struct StdVideoAV1QuantizationFlags { + uint32_t using_qmatrix : 1; + uint32_t diff_uv_delta : 1; + uint32_t reserved : 30; +} StdVideoAV1QuantizationFlags; + +typedef struct StdVideoAV1Quantization { + StdVideoAV1QuantizationFlags flags; + uint8_t base_q_idx; + int8_t DeltaQYDc; + int8_t DeltaQUDc; + int8_t DeltaQUAc; + int8_t DeltaQVDc; + int8_t DeltaQVAc; + uint8_t qm_y; + uint8_t qm_u; + uint8_t qm_v; +} StdVideoAV1Quantization; + +typedef struct StdVideoAV1Segmentation { + uint8_t FeatureEnabled[STD_VIDEO_AV1_MAX_SEGMENTS]; + int16_t FeatureData[STD_VIDEO_AV1_MAX_SEGMENTS][STD_VIDEO_AV1_SEG_LVL_MAX]; +} StdVideoAV1Segmentation; + +typedef struct StdVideoAV1TileInfoFlags { + uint32_t uniform_tile_spacing_flag : 1; + uint32_t reserved : 31; +} StdVideoAV1TileInfoFlags; + +typedef struct StdVideoAV1TileInfo { + StdVideoAV1TileInfoFlags flags; + uint8_t TileCols; + uint8_t TileRows; + uint16_t context_update_tile_id; + uint8_t tile_size_bytes_minus_1; + uint8_t reserved1[7]; + const uint16_t* pMiColStarts; + const uint16_t* pMiRowStarts; + const uint16_t* pWidthInSbsMinus1; + const uint16_t* pHeightInSbsMinus1; +} StdVideoAV1TileInfo; + +typedef struct StdVideoAV1CDEF { + uint8_t cdef_damping_minus_3; + uint8_t cdef_bits; + uint8_t cdef_y_pri_strength[STD_VIDEO_AV1_MAX_CDEF_FILTER_STRENGTHS]; + uint8_t cdef_y_sec_strength[STD_VIDEO_AV1_MAX_CDEF_FILTER_STRENGTHS]; + uint8_t cdef_uv_pri_strength[STD_VIDEO_AV1_MAX_CDEF_FILTER_STRENGTHS]; + uint8_t cdef_uv_sec_strength[STD_VIDEO_AV1_MAX_CDEF_FILTER_STRENGTHS]; +} StdVideoAV1CDEF; + +typedef struct StdVideoAV1LoopRestoration { + StdVideoAV1FrameRestorationType FrameRestorationType[STD_VIDEO_AV1_MAX_NUM_PLANES]; + uint16_t LoopRestorationSize[STD_VIDEO_AV1_MAX_NUM_PLANES]; +} StdVideoAV1LoopRestoration; + +typedef struct StdVideoAV1GlobalMotion { + uint8_t GmType[STD_VIDEO_AV1_NUM_REF_FRAMES]; + int32_t gm_params[STD_VIDEO_AV1_NUM_REF_FRAMES][STD_VIDEO_AV1_GLOBAL_MOTION_PARAMS]; +} StdVideoAV1GlobalMotion; + +typedef struct StdVideoAV1FilmGrainFlags { + uint32_t chroma_scaling_from_luma : 1; + uint32_t overlap_flag : 1; + uint32_t clip_to_restricted_range : 1; + uint32_t update_grain : 1; + uint32_t reserved : 28; +} StdVideoAV1FilmGrainFlags; + +typedef struct StdVideoAV1FilmGrain { + StdVideoAV1FilmGrainFlags flags; + uint8_t grain_scaling_minus_8; + uint8_t ar_coeff_lag; + uint8_t ar_coeff_shift_minus_6; + uint8_t grain_scale_shift; + uint16_t grain_seed; + uint8_t film_grain_params_ref_idx; + uint8_t num_y_points; + uint8_t point_y_value[STD_VIDEO_AV1_MAX_NUM_Y_POINTS]; + uint8_t point_y_scaling[STD_VIDEO_AV1_MAX_NUM_Y_POINTS]; + uint8_t num_cb_points; + uint8_t point_cb_value[STD_VIDEO_AV1_MAX_NUM_CB_POINTS]; + uint8_t point_cb_scaling[STD_VIDEO_AV1_MAX_NUM_CB_POINTS]; + uint8_t num_cr_points; + uint8_t point_cr_value[STD_VIDEO_AV1_MAX_NUM_CR_POINTS]; + uint8_t point_cr_scaling[STD_VIDEO_AV1_MAX_NUM_CR_POINTS]; + int8_t ar_coeffs_y_plus_128[STD_VIDEO_AV1_MAX_NUM_POS_LUMA]; + int8_t ar_coeffs_cb_plus_128[STD_VIDEO_AV1_MAX_NUM_POS_CHROMA]; + int8_t ar_coeffs_cr_plus_128[STD_VIDEO_AV1_MAX_NUM_POS_CHROMA]; + uint8_t cb_mult; + uint8_t cb_luma_mult; + uint16_t cb_offset; + uint8_t cr_mult; + uint8_t cr_luma_mult; + uint16_t cr_offset; +} StdVideoAV1FilmGrain; + +typedef struct StdVideoAV1SequenceHeaderFlags { + uint32_t still_picture : 1; + uint32_t reduced_still_picture_header : 1; + uint32_t use_128x128_superblock : 1; + uint32_t enable_filter_intra : 1; + uint32_t enable_intra_edge_filter : 1; + uint32_t enable_interintra_compound : 1; + uint32_t enable_masked_compound : 1; + uint32_t enable_warped_motion : 1; + uint32_t enable_dual_filter : 1; + uint32_t enable_order_hint : 1; + uint32_t enable_jnt_comp : 1; + uint32_t enable_ref_frame_mvs : 1; + uint32_t frame_id_numbers_present_flag : 1; + uint32_t enable_superres : 1; + uint32_t enable_cdef : 1; + uint32_t enable_restoration : 1; + uint32_t film_grain_params_present : 1; + uint32_t timing_info_present_flag : 1; + uint32_t initial_display_delay_present_flag : 1; + uint32_t reserved : 13; +} StdVideoAV1SequenceHeaderFlags; + +typedef struct StdVideoAV1SequenceHeader { + StdVideoAV1SequenceHeaderFlags flags; + StdVideoAV1Profile seq_profile; + uint8_t frame_width_bits_minus_1; + uint8_t frame_height_bits_minus_1; + uint16_t max_frame_width_minus_1; + uint16_t max_frame_height_minus_1; + uint8_t delta_frame_id_length_minus_2; + uint8_t additional_frame_id_length_minus_1; + uint8_t order_hint_bits_minus_1; + uint8_t seq_force_integer_mv; + uint8_t seq_force_screen_content_tools; + uint8_t reserved1[5]; + const StdVideoAV1ColorConfig* pColorConfig; + const StdVideoAV1TimingInfo* pTimingInfo; +} StdVideoAV1SequenceHeader; + + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/ext/vulkan/vk_video/vulkan_video_codec_av1std_decode.h b/ext/vulkan/vk_video/vulkan_video_codec_av1std_decode.h new file mode 100644 index 0000000000..6b8130cd9f --- /dev/null +++ b/ext/vulkan/vk_video/vulkan_video_codec_av1std_decode.h @@ -0,0 +1,109 @@ +#ifndef VULKAN_VIDEO_CODEC_AV1STD_DECODE_H_ +#define VULKAN_VIDEO_CODEC_AV1STD_DECODE_H_ 1 + +/* +** Copyright 2015-2024 The Khronos Group Inc. +** +** SPDX-License-Identifier: Apache-2.0 +*/ + +/* +** This header is generated from the Khronos Vulkan XML API Registry. +** +*/ + + +#ifdef __cplusplus +extern "C" { +#endif + + + +// vulkan_video_codec_av1std_decode is a preprocessor guard. Do not pass it to API calls. +#define vulkan_video_codec_av1std_decode 1 +#include "vulkan_video_codec_av1std.h" + +#define VK_STD_VULKAN_VIDEO_CODEC_AV1_DECODE_API_VERSION_1_0_0 VK_MAKE_VIDEO_STD_VERSION(1, 0, 0) + +#define VK_STD_VULKAN_VIDEO_CODEC_AV1_DECODE_SPEC_VERSION VK_STD_VULKAN_VIDEO_CODEC_AV1_DECODE_API_VERSION_1_0_0 +#define VK_STD_VULKAN_VIDEO_CODEC_AV1_DECODE_EXTENSION_NAME "VK_STD_vulkan_video_codec_av1_decode" +typedef struct StdVideoDecodeAV1PictureInfoFlags { + uint32_t error_resilient_mode : 1; + uint32_t disable_cdf_update : 1; + uint32_t use_superres : 1; + uint32_t render_and_frame_size_different : 1; + uint32_t allow_screen_content_tools : 1; + uint32_t is_filter_switchable : 1; + uint32_t force_integer_mv : 1; + uint32_t frame_size_override_flag : 1; + uint32_t buffer_removal_time_present_flag : 1; + uint32_t allow_intrabc : 1; + uint32_t frame_refs_short_signaling : 1; + uint32_t allow_high_precision_mv : 1; + uint32_t is_motion_mode_switchable : 1; + uint32_t use_ref_frame_mvs : 1; + uint32_t disable_frame_end_update_cdf : 1; + uint32_t allow_warped_motion : 1; + uint32_t reduced_tx_set : 1; + uint32_t reference_select : 1; + uint32_t skip_mode_present : 1; + uint32_t delta_q_present : 1; + uint32_t delta_lf_present : 1; + uint32_t delta_lf_multi : 1; + uint32_t segmentation_enabled : 1; + uint32_t segmentation_update_map : 1; + uint32_t segmentation_temporal_update : 1; + uint32_t segmentation_update_data : 1; + uint32_t UsesLr : 1; + uint32_t usesChromaLr : 1; + uint32_t apply_grain : 1; + uint32_t reserved : 3; +} StdVideoDecodeAV1PictureInfoFlags; + +typedef struct StdVideoDecodeAV1PictureInfo { + StdVideoDecodeAV1PictureInfoFlags flags; + StdVideoAV1FrameType frame_type; + uint32_t current_frame_id; + uint8_t OrderHint; + uint8_t primary_ref_frame; + uint8_t refresh_frame_flags; + uint8_t reserved1; + StdVideoAV1InterpolationFilter interpolation_filter; + StdVideoAV1TxMode TxMode; + uint8_t delta_q_res; + uint8_t delta_lf_res; + uint8_t SkipModeFrame[STD_VIDEO_AV1_SKIP_MODE_FRAMES]; + uint8_t coded_denom; + uint8_t reserved2[3]; + uint8_t OrderHints[STD_VIDEO_AV1_NUM_REF_FRAMES]; + uint32_t expectedFrameId[STD_VIDEO_AV1_NUM_REF_FRAMES]; + const StdVideoAV1TileInfo* pTileInfo; + const StdVideoAV1Quantization* pQuantization; + const StdVideoAV1Segmentation* pSegmentation; + const StdVideoAV1LoopFilter* pLoopFilter; + const StdVideoAV1CDEF* pCDEF; + const StdVideoAV1LoopRestoration* pLoopRestoration; + const StdVideoAV1GlobalMotion* pGlobalMotion; + const StdVideoAV1FilmGrain* pFilmGrain; +} StdVideoDecodeAV1PictureInfo; + +typedef struct StdVideoDecodeAV1ReferenceInfoFlags { + uint32_t disable_frame_end_update_cdf : 1; + uint32_t segmentation_enabled : 1; + uint32_t reserved : 30; +} StdVideoDecodeAV1ReferenceInfoFlags; + +typedef struct StdVideoDecodeAV1ReferenceInfo { + StdVideoDecodeAV1ReferenceInfoFlags flags; + uint8_t frame_type; + uint8_t RefFrameSignBias; + uint8_t OrderHint; + uint8_t SavedOrderHints[STD_VIDEO_AV1_NUM_REF_FRAMES]; +} StdVideoDecodeAV1ReferenceInfo; + + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/ext/vulkan/vk_video/vulkan_video_codec_h264std.h b/ext/vulkan/vk_video/vulkan_video_codec_h264std.h index a23789c68a..6d27af37b7 100644 --- a/ext/vulkan/vk_video/vulkan_video_codec_h264std.h +++ b/ext/vulkan/vk_video/vulkan_video_codec_h264std.h @@ -2,7 +2,7 @@ #define VULKAN_VIDEO_CODEC_H264STD_H_ 1 /* -** Copyright 2015-2023 The Khronos Group Inc. +** Copyright 2015-2024 The Khronos Group Inc. ** ** SPDX-License-Identifier: Apache-2.0 */ @@ -29,6 +29,7 @@ extern "C" { #define STD_VIDEO_H264_SCALING_LIST_8X8_NUM_ELEMENTS 64 #define STD_VIDEO_H264_MAX_NUM_LIST_REF 32 #define STD_VIDEO_H264_MAX_CHROMA_PLANES 2 +#define STD_VIDEO_H264_NO_REFERENCE_PICTURE 0xFF typedef enum StdVideoH264ChromaFormatIdc { STD_VIDEO_H264_CHROMA_FORMAT_IDC_MONOCHROME = 0, diff --git a/ext/vulkan/vk_video/vulkan_video_codec_h264std_decode.h b/ext/vulkan/vk_video/vulkan_video_codec_h264std_decode.h index dd24112e2c..439cb885e7 100644 --- a/ext/vulkan/vk_video/vulkan_video_codec_h264std_decode.h +++ b/ext/vulkan/vk_video/vulkan_video_codec_h264std_decode.h @@ -2,7 +2,7 @@ #define VULKAN_VIDEO_CODEC_H264STD_DECODE_H_ 1 /* -** Copyright 2015-2023 The Khronos Group Inc. +** Copyright 2015-2024 The Khronos Group Inc. ** ** SPDX-License-Identifier: Apache-2.0 */ diff --git a/ext/vulkan/vk_video/vulkan_video_codec_h264std_encode.h b/ext/vulkan/vk_video/vulkan_video_codec_h264std_encode.h index 2e0d706f6c..9e24aa5d99 100644 --- a/ext/vulkan/vk_video/vulkan_video_codec_h264std_encode.h +++ b/ext/vulkan/vk_video/vulkan_video_codec_h264std_encode.h @@ -2,7 +2,7 @@ #define VULKAN_VIDEO_CODEC_H264STD_ENCODE_H_ 1 /* -** Copyright 2015-2023 The Khronos Group Inc. +** Copyright 2015-2024 The Khronos Group Inc. ** ** SPDX-License-Identifier: Apache-2.0 */ @@ -22,10 +22,10 @@ extern "C" { // vulkan_video_codec_h264std_encode is a preprocessor guard. Do not pass it to API calls. #define vulkan_video_codec_h264std_encode 1 #include "vulkan_video_codec_h264std.h" -// Vulkan 0.9 provisional Vulkan video H.264 encode std specification version number -#define VK_STD_VULKAN_VIDEO_CODEC_H264_ENCODE_API_VERSION_0_9_10 VK_MAKE_VIDEO_STD_VERSION(0, 9, 10) -#define VK_STD_VULKAN_VIDEO_CODEC_H264_ENCODE_SPEC_VERSION VK_STD_VULKAN_VIDEO_CODEC_H264_ENCODE_API_VERSION_0_9_10 +#define VK_STD_VULKAN_VIDEO_CODEC_H264_ENCODE_API_VERSION_1_0_0 VK_MAKE_VIDEO_STD_VERSION(1, 0, 0) + +#define VK_STD_VULKAN_VIDEO_CODEC_H264_ENCODE_SPEC_VERSION VK_STD_VULKAN_VIDEO_CODEC_H264_ENCODE_API_VERSION_1_0_0 #define VK_STD_VULKAN_VIDEO_CODEC_H264_ENCODE_EXTENSION_NAME "VK_STD_vulkan_video_codec_h264_encode" typedef struct StdVideoEncodeH264WeightTableFlags { uint32_t luma_weight_l0_flag; @@ -81,7 +81,7 @@ typedef struct StdVideoEncodeH264RefListModEntry { } StdVideoEncodeH264RefListModEntry; typedef struct StdVideoEncodeH264RefPicMarkingEntry { - StdVideoH264MemMgmtControlOp operation; + StdVideoH264MemMgmtControlOp memory_management_control_operation; uint16_t difference_of_pic_nums_minus1; uint16_t long_term_pic_num; uint16_t long_term_frame_idx; @@ -132,7 +132,8 @@ typedef struct StdVideoEncodeH264SliceHeader { StdVideoH264SliceType slice_type; int8_t slice_alpha_c0_offset_div2; int8_t slice_beta_offset_div2; - uint16_t reserved1; + int8_t slice_qp_delta; + uint8_t reserved1; StdVideoH264CabacInitIdc cabac_init_idc; StdVideoH264DisableDeblockingFilterIdc disable_deblocking_filter_idc; const StdVideoEncodeH264WeightTable* pWeightTable; diff --git a/ext/vulkan/vk_video/vulkan_video_codec_h265std.h b/ext/vulkan/vk_video/vulkan_video_codec_h265std.h index 793bdbcff9..d0a1bacbea 100644 --- a/ext/vulkan/vk_video/vulkan_video_codec_h265std.h +++ b/ext/vulkan/vk_video/vulkan_video_codec_h265std.h @@ -2,7 +2,7 @@ #define VULKAN_VIDEO_CODEC_H265STD_H_ 1 /* -** Copyright 2015-2023 The Khronos Group Inc. +** Copyright 2015-2024 The Khronos Group Inc. ** ** SPDX-License-Identifier: Apache-2.0 */ @@ -44,6 +44,7 @@ extern "C" { #define STD_VIDEO_H265_MAX_LONG_TERM_REF_PICS_SPS 32 #define STD_VIDEO_H265_MAX_LONG_TERM_PICS 16 #define STD_VIDEO_H265_MAX_DELTA_POC 48 +#define STD_VIDEO_H265_NO_REFERENCE_PICTURE 0xFF typedef enum StdVideoH265ChromaFormatIdc { STD_VIDEO_H265_CHROMA_FORMAT_IDC_MONOCHROME = 0, diff --git a/ext/vulkan/vk_video/vulkan_video_codec_h265std_decode.h b/ext/vulkan/vk_video/vulkan_video_codec_h265std_decode.h index 75cf4d0946..0178793e51 100644 --- a/ext/vulkan/vk_video/vulkan_video_codec_h265std_decode.h +++ b/ext/vulkan/vk_video/vulkan_video_codec_h265std_decode.h @@ -2,7 +2,7 @@ #define VULKAN_VIDEO_CODEC_H265STD_DECODE_H_ 1 /* -** Copyright 2015-2023 The Khronos Group Inc. +** Copyright 2015-2024 The Khronos Group Inc. ** ** SPDX-License-Identifier: Apache-2.0 */ diff --git a/ext/vulkan/vk_video/vulkan_video_codec_h265std_encode.h b/ext/vulkan/vk_video/vulkan_video_codec_h265std_encode.h index 25740398a4..ee34491f4e 100644 --- a/ext/vulkan/vk_video/vulkan_video_codec_h265std_encode.h +++ b/ext/vulkan/vk_video/vulkan_video_codec_h265std_encode.h @@ -2,7 +2,7 @@ #define VULKAN_VIDEO_CODEC_H265STD_ENCODE_H_ 1 /* -** Copyright 2015-2023 The Khronos Group Inc. +** Copyright 2015-2024 The Khronos Group Inc. ** ** SPDX-License-Identifier: Apache-2.0 */ @@ -22,10 +22,10 @@ extern "C" { // vulkan_video_codec_h265std_encode is a preprocessor guard. Do not pass it to API calls. #define vulkan_video_codec_h265std_encode 1 #include "vulkan_video_codec_h265std.h" -// Vulkan 0.9 provisional Vulkan video H.265 encode std specification version number -#define VK_STD_VULKAN_VIDEO_CODEC_H265_ENCODE_API_VERSION_0_9_11 VK_MAKE_VIDEO_STD_VERSION(0, 9, 11) -#define VK_STD_VULKAN_VIDEO_CODEC_H265_ENCODE_SPEC_VERSION VK_STD_VULKAN_VIDEO_CODEC_H265_ENCODE_API_VERSION_0_9_11 +#define VK_STD_VULKAN_VIDEO_CODEC_H265_ENCODE_API_VERSION_1_0_0 VK_MAKE_VIDEO_STD_VERSION(1, 0, 0) + +#define VK_STD_VULKAN_VIDEO_CODEC_H265_ENCODE_SPEC_VERSION VK_STD_VULKAN_VIDEO_CODEC_H265_ENCODE_API_VERSION_1_0_0 #define VK_STD_VULKAN_VIDEO_CODEC_H265_ENCODE_EXTENSION_NAME "VK_STD_vulkan_video_codec_h265_encode" typedef struct StdVideoEncodeH265WeightTableFlags { uint16_t luma_weight_l0_flag; @@ -77,7 +77,8 @@ typedef struct StdVideoEncodeH265SliceSegmentHeader { int8_t slice_act_y_qp_offset; int8_t slice_act_cb_qp_offset; int8_t slice_act_cr_qp_offset; - uint8_t reserved1[3]; + int8_t slice_qp_delta; + uint16_t reserved1; const StdVideoEncodeH265WeightTable* pWeightTable; } StdVideoEncodeH265SliceSegmentHeader; @@ -110,7 +111,7 @@ typedef struct StdVideoEncodeH265PictureInfoFlags { uint32_t reserved : 23; } StdVideoEncodeH265PictureInfoFlags; -typedef struct StdVideoEncodeH265SliceSegmentLongTermRefPics { +typedef struct StdVideoEncodeH265LongTermRefPics { uint8_t num_long_term_sps; uint8_t num_long_term_pics; uint8_t lt_idx_sps[STD_VIDEO_H265_MAX_LONG_TERM_REF_PICS_SPS]; @@ -118,21 +119,21 @@ typedef struct StdVideoEncodeH265SliceSegmentLongTermRefPics { uint16_t used_by_curr_pic_lt_flag; uint8_t delta_poc_msb_present_flag[STD_VIDEO_H265_MAX_DELTA_POC]; uint8_t delta_poc_msb_cycle_lt[STD_VIDEO_H265_MAX_DELTA_POC]; -} StdVideoEncodeH265SliceSegmentLongTermRefPics; +} StdVideoEncodeH265LongTermRefPics; typedef struct StdVideoEncodeH265PictureInfo { - StdVideoEncodeH265PictureInfoFlags flags; - StdVideoH265PictureType pic_type; - uint8_t sps_video_parameter_set_id; - uint8_t pps_seq_parameter_set_id; - uint8_t pps_pic_parameter_set_id; - uint8_t short_term_ref_pic_set_idx; - int32_t PicOrderCntVal; - uint8_t TemporalId; - uint8_t reserved1[7]; - const StdVideoEncodeH265ReferenceListsInfo* pRefLists; - const StdVideoH265ShortTermRefPicSet* pShortTermRefPicSet; - const StdVideoEncodeH265SliceSegmentLongTermRefPics* pLongTermRefPics; + StdVideoEncodeH265PictureInfoFlags flags; + StdVideoH265PictureType pic_type; + uint8_t sps_video_parameter_set_id; + uint8_t pps_seq_parameter_set_id; + uint8_t pps_pic_parameter_set_id; + uint8_t short_term_ref_pic_set_idx; + int32_t PicOrderCntVal; + uint8_t TemporalId; + uint8_t reserved1[7]; + const StdVideoEncodeH265ReferenceListsInfo* pRefLists; + const StdVideoH265ShortTermRefPicSet* pShortTermRefPicSet; + const StdVideoEncodeH265LongTermRefPics* pLongTermRefPics; } StdVideoEncodeH265PictureInfo; typedef struct StdVideoEncodeH265ReferenceInfoFlags { diff --git a/ext/vulkan/vk_video/vulkan_video_codecs_common.h b/ext/vulkan/vk_video/vulkan_video_codecs_common.h index 6568975ee3..5e6ef1db48 100644 --- a/ext/vulkan/vk_video/vulkan_video_codecs_common.h +++ b/ext/vulkan/vk_video/vulkan_video_codecs_common.h @@ -2,7 +2,7 @@ #define VULKAN_VIDEO_CODECS_COMMON_H_ 1 /* -** Copyright 2015-2023 The Khronos Group Inc. +** Copyright 2015-2024 The Khronos Group Inc. ** ** SPDX-License-Identifier: Apache-2.0 */ diff --git a/ext/vulkan/vulkan.h b/ext/vulkan/vulkan.h index 426cff58d7..ef94006bb3 100644 --- a/ext/vulkan/vulkan.h +++ b/ext/vulkan/vulkan.h @@ -2,7 +2,7 @@ #define VULKAN_H_ 1 /* -** Copyright 2015-2023 The Khronos Group Inc. +** Copyright 2015-2024 The Khronos Group Inc. ** ** SPDX-License-Identifier: Apache-2.0 */ diff --git a/ext/vulkan/vulkan_android.h b/ext/vulkan/vulkan_android.h index d86f43f2d2..61ff40ba8c 100644 --- a/ext/vulkan/vulkan_android.h +++ b/ext/vulkan/vulkan_android.h @@ -2,7 +2,7 @@ #define VULKAN_ANDROID_H_ 1 /* -** Copyright 2015-2023 The Khronos Group Inc. +** Copyright 2015-2024 The Khronos Group Inc. ** ** SPDX-License-Identifier: Apache-2.0 */ @@ -120,6 +120,32 @@ VKAPI_ATTR VkResult VKAPI_CALL vkGetMemoryAndroidHardwareBufferANDROID( struct AHardwareBuffer** pBuffer); #endif + +// VK_ANDROID_external_format_resolve is a preprocessor guard. Do not pass it to API calls. +#define VK_ANDROID_external_format_resolve 1 +#define VK_ANDROID_EXTERNAL_FORMAT_RESOLVE_SPEC_VERSION 1 +#define VK_ANDROID_EXTERNAL_FORMAT_RESOLVE_EXTENSION_NAME "VK_ANDROID_external_format_resolve" +typedef struct VkPhysicalDeviceExternalFormatResolveFeaturesANDROID { + VkStructureType sType; + void* pNext; + VkBool32 externalFormatResolve; +} VkPhysicalDeviceExternalFormatResolveFeaturesANDROID; + +typedef struct VkPhysicalDeviceExternalFormatResolvePropertiesANDROID { + VkStructureType sType; + void* pNext; + VkBool32 nullColorAttachmentWithExternalFormatResolve; + VkChromaLocation externalFormatResolveChromaOffsetX; + VkChromaLocation externalFormatResolveChromaOffsetY; +} VkPhysicalDeviceExternalFormatResolvePropertiesANDROID; + +typedef struct VkAndroidHardwareBufferFormatResolvePropertiesANDROID { + VkStructureType sType; + void* pNext; + VkFormat colorAttachmentFormat; +} VkAndroidHardwareBufferFormatResolvePropertiesANDROID; + + #ifdef __cplusplus } #endif diff --git a/ext/vulkan/vulkan_beta.h b/ext/vulkan/vulkan_beta.h index f00ed3ff1f..df18b4042b 100644 --- a/ext/vulkan/vulkan_beta.h +++ b/ext/vulkan/vulkan_beta.h @@ -2,7 +2,7 @@ #define VULKAN_BETA_H_ 1 /* -** Copyright 2015-2023 The Khronos Group Inc. +** Copyright 2015-2024 The Khronos Group Inc. ** ** SPDX-License-Identifier: Apache-2.0 */ @@ -51,598 +51,6 @@ typedef struct VkPhysicalDevicePortabilitySubsetPropertiesKHR { -// VK_KHR_video_encode_queue is a preprocessor guard. Do not pass it to API calls. -#define VK_KHR_video_encode_queue 1 -#define VK_KHR_VIDEO_ENCODE_QUEUE_SPEC_VERSION 9 -#define VK_KHR_VIDEO_ENCODE_QUEUE_EXTENSION_NAME "VK_KHR_video_encode_queue" - -typedef enum VkVideoEncodeTuningModeKHR { - VK_VIDEO_ENCODE_TUNING_MODE_DEFAULT_KHR = 0, - VK_VIDEO_ENCODE_TUNING_MODE_HIGH_QUALITY_KHR = 1, - VK_VIDEO_ENCODE_TUNING_MODE_LOW_LATENCY_KHR = 2, - VK_VIDEO_ENCODE_TUNING_MODE_ULTRA_LOW_LATENCY_KHR = 3, - VK_VIDEO_ENCODE_TUNING_MODE_LOSSLESS_KHR = 4, - VK_VIDEO_ENCODE_TUNING_MODE_MAX_ENUM_KHR = 0x7FFFFFFF -} VkVideoEncodeTuningModeKHR; -typedef VkFlags VkVideoEncodeFlagsKHR; - -typedef enum VkVideoEncodeCapabilityFlagBitsKHR { - VK_VIDEO_ENCODE_CAPABILITY_PRECEDING_EXTERNALLY_ENCODED_BYTES_BIT_KHR = 0x00000001, - VK_VIDEO_ENCODE_CAPABILITY_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF -} VkVideoEncodeCapabilityFlagBitsKHR; -typedef VkFlags VkVideoEncodeCapabilityFlagsKHR; - -typedef enum VkVideoEncodeRateControlModeFlagBitsKHR { - VK_VIDEO_ENCODE_RATE_CONTROL_MODE_DEFAULT_KHR = 0, - VK_VIDEO_ENCODE_RATE_CONTROL_MODE_DISABLED_BIT_KHR = 0x00000001, - VK_VIDEO_ENCODE_RATE_CONTROL_MODE_CBR_BIT_KHR = 0x00000002, - VK_VIDEO_ENCODE_RATE_CONTROL_MODE_VBR_BIT_KHR = 0x00000004, - VK_VIDEO_ENCODE_RATE_CONTROL_MODE_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF -} VkVideoEncodeRateControlModeFlagBitsKHR; -typedef VkFlags VkVideoEncodeRateControlModeFlagsKHR; - -typedef enum VkVideoEncodeFeedbackFlagBitsKHR { - VK_VIDEO_ENCODE_FEEDBACK_BITSTREAM_BUFFER_OFFSET_BIT_KHR = 0x00000001, - VK_VIDEO_ENCODE_FEEDBACK_BITSTREAM_BYTES_WRITTEN_BIT_KHR = 0x00000002, - VK_VIDEO_ENCODE_FEEDBACK_BITSTREAM_HAS_OVERRIDES_BIT_KHR = 0x00000004, - VK_VIDEO_ENCODE_FEEDBACK_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF -} VkVideoEncodeFeedbackFlagBitsKHR; -typedef VkFlags VkVideoEncodeFeedbackFlagsKHR; - -typedef enum VkVideoEncodeUsageFlagBitsKHR { - VK_VIDEO_ENCODE_USAGE_DEFAULT_KHR = 0, - VK_VIDEO_ENCODE_USAGE_TRANSCODING_BIT_KHR = 0x00000001, - VK_VIDEO_ENCODE_USAGE_STREAMING_BIT_KHR = 0x00000002, - VK_VIDEO_ENCODE_USAGE_RECORDING_BIT_KHR = 0x00000004, - VK_VIDEO_ENCODE_USAGE_CONFERENCING_BIT_KHR = 0x00000008, - VK_VIDEO_ENCODE_USAGE_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF -} VkVideoEncodeUsageFlagBitsKHR; -typedef VkFlags VkVideoEncodeUsageFlagsKHR; - -typedef enum VkVideoEncodeContentFlagBitsKHR { - VK_VIDEO_ENCODE_CONTENT_DEFAULT_KHR = 0, - VK_VIDEO_ENCODE_CONTENT_CAMERA_BIT_KHR = 0x00000001, - VK_VIDEO_ENCODE_CONTENT_DESKTOP_BIT_KHR = 0x00000002, - VK_VIDEO_ENCODE_CONTENT_RENDERED_BIT_KHR = 0x00000004, - VK_VIDEO_ENCODE_CONTENT_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF -} VkVideoEncodeContentFlagBitsKHR; -typedef VkFlags VkVideoEncodeContentFlagsKHR; -typedef VkFlags VkVideoEncodeRateControlFlagsKHR; -typedef struct VkVideoEncodeInfoKHR { - VkStructureType sType; - const void* pNext; - VkVideoEncodeFlagsKHR flags; - VkBuffer dstBuffer; - VkDeviceSize dstBufferOffset; - VkDeviceSize dstBufferRange; - VkVideoPictureResourceInfoKHR srcPictureResource; - const VkVideoReferenceSlotInfoKHR* pSetupReferenceSlot; - uint32_t referenceSlotCount; - const VkVideoReferenceSlotInfoKHR* pReferenceSlots; - uint32_t precedingExternallyEncodedBytes; -} VkVideoEncodeInfoKHR; - -typedef struct VkVideoEncodeCapabilitiesKHR { - VkStructureType sType; - void* pNext; - VkVideoEncodeCapabilityFlagsKHR flags; - VkVideoEncodeRateControlModeFlagsKHR rateControlModes; - uint32_t maxRateControlLayers; - uint64_t maxBitrate; - uint32_t maxQualityLevels; - VkExtent2D encodeInputPictureGranularity; - VkVideoEncodeFeedbackFlagsKHR supportedEncodeFeedbackFlags; -} VkVideoEncodeCapabilitiesKHR; - -typedef struct VkQueryPoolVideoEncodeFeedbackCreateInfoKHR { - VkStructureType sType; - const void* pNext; - VkVideoEncodeFeedbackFlagsKHR encodeFeedbackFlags; -} VkQueryPoolVideoEncodeFeedbackCreateInfoKHR; - -typedef struct VkVideoEncodeUsageInfoKHR { - VkStructureType sType; - const void* pNext; - VkVideoEncodeUsageFlagsKHR videoUsageHints; - VkVideoEncodeContentFlagsKHR videoContentHints; - VkVideoEncodeTuningModeKHR tuningMode; -} VkVideoEncodeUsageInfoKHR; - -typedef struct VkVideoEncodeRateControlLayerInfoKHR { - VkStructureType sType; - const void* pNext; - uint64_t averageBitrate; - uint64_t maxBitrate; - uint32_t frameRateNumerator; - uint32_t frameRateDenominator; -} VkVideoEncodeRateControlLayerInfoKHR; - -typedef struct VkVideoEncodeRateControlInfoKHR { - VkStructureType sType; - const void* pNext; - VkVideoEncodeRateControlFlagsKHR flags; - VkVideoEncodeRateControlModeFlagBitsKHR rateControlMode; - uint32_t layerCount; - const VkVideoEncodeRateControlLayerInfoKHR* pLayers; - uint32_t virtualBufferSizeInMs; - uint32_t initialVirtualBufferSizeInMs; -} VkVideoEncodeRateControlInfoKHR; - -typedef struct VkPhysicalDeviceVideoEncodeQualityLevelInfoKHR { - VkStructureType sType; - const void* pNext; - const VkVideoProfileInfoKHR* pVideoProfile; - uint32_t qualityLevel; -} VkPhysicalDeviceVideoEncodeQualityLevelInfoKHR; - -typedef struct VkVideoEncodeQualityLevelPropertiesKHR { - VkStructureType sType; - void* pNext; - VkVideoEncodeRateControlModeFlagBitsKHR preferredRateControlMode; - uint32_t preferredRateControlLayerCount; -} VkVideoEncodeQualityLevelPropertiesKHR; - -typedef struct VkVideoEncodeQualityLevelInfoKHR { - VkStructureType sType; - const void* pNext; - uint32_t qualityLevel; -} VkVideoEncodeQualityLevelInfoKHR; - -typedef struct VkVideoEncodeSessionParametersGetInfoKHR { - VkStructureType sType; - const void* pNext; - VkVideoSessionParametersKHR videoSessionParameters; -} VkVideoEncodeSessionParametersGetInfoKHR; - -typedef struct VkVideoEncodeSessionParametersFeedbackInfoKHR { - VkStructureType sType; - void* pNext; - VkBool32 hasOverrides; -} VkVideoEncodeSessionParametersFeedbackInfoKHR; - -typedef VkResult (VKAPI_PTR *PFN_vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR)(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceVideoEncodeQualityLevelInfoKHR* pQualityLevelInfo, VkVideoEncodeQualityLevelPropertiesKHR* pQualityLevelProperties); -typedef VkResult (VKAPI_PTR *PFN_vkGetEncodedVideoSessionParametersKHR)(VkDevice device, const VkVideoEncodeSessionParametersGetInfoKHR* pVideoSessionParametersInfo, VkVideoEncodeSessionParametersFeedbackInfoKHR* pFeedbackInfo, size_t* pDataSize, void* pData); -typedef void (VKAPI_PTR *PFN_vkCmdEncodeVideoKHR)(VkCommandBuffer commandBuffer, const VkVideoEncodeInfoKHR* pEncodeInfo); - -#ifndef VK_NO_PROTOTYPES -VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR( - VkPhysicalDevice physicalDevice, - const VkPhysicalDeviceVideoEncodeQualityLevelInfoKHR* pQualityLevelInfo, - VkVideoEncodeQualityLevelPropertiesKHR* pQualityLevelProperties); - -VKAPI_ATTR VkResult VKAPI_CALL vkGetEncodedVideoSessionParametersKHR( - VkDevice device, - const VkVideoEncodeSessionParametersGetInfoKHR* pVideoSessionParametersInfo, - VkVideoEncodeSessionParametersFeedbackInfoKHR* pFeedbackInfo, - size_t* pDataSize, - void* pData); - -VKAPI_ATTR void VKAPI_CALL vkCmdEncodeVideoKHR( - VkCommandBuffer commandBuffer, - const VkVideoEncodeInfoKHR* pEncodeInfo); -#endif - - -// VK_EXT_video_encode_h264 is a preprocessor guard. Do not pass it to API calls. -#define VK_EXT_video_encode_h264 1 -#include "vk_video/vulkan_video_codec_h264std.h" -#include "vk_video/vulkan_video_codec_h264std_encode.h" -#define VK_EXT_VIDEO_ENCODE_H264_SPEC_VERSION 11 -#define VK_EXT_VIDEO_ENCODE_H264_EXTENSION_NAME "VK_EXT_video_encode_h264" - -typedef enum VkVideoEncodeH264CapabilityFlagBitsEXT { - VK_VIDEO_ENCODE_H264_CAPABILITY_HRD_COMPLIANCE_BIT_EXT = 0x00000001, - VK_VIDEO_ENCODE_H264_CAPABILITY_PREDICTION_WEIGHT_TABLE_GENERATED_BIT_EXT = 0x00000002, - VK_VIDEO_ENCODE_H264_CAPABILITY_ROW_UNALIGNED_SLICE_BIT_EXT = 0x00000004, - VK_VIDEO_ENCODE_H264_CAPABILITY_DIFFERENT_SLICE_TYPE_BIT_EXT = 0x00000008, - VK_VIDEO_ENCODE_H264_CAPABILITY_B_FRAME_IN_L0_LIST_BIT_EXT = 0x00000010, - VK_VIDEO_ENCODE_H264_CAPABILITY_B_FRAME_IN_L1_LIST_BIT_EXT = 0x00000020, - VK_VIDEO_ENCODE_H264_CAPABILITY_PER_PICTURE_TYPE_MIN_MAX_QP_BIT_EXT = 0x00000040, - VK_VIDEO_ENCODE_H264_CAPABILITY_PER_SLICE_CONSTANT_QP_BIT_EXT = 0x00000080, - VK_VIDEO_ENCODE_H264_CAPABILITY_GENERATE_PREFIX_NALU_BIT_EXT = 0x00000100, - VK_VIDEO_ENCODE_H264_CAPABILITY_FLAG_BITS_MAX_ENUM_EXT = 0x7FFFFFFF -} VkVideoEncodeH264CapabilityFlagBitsEXT; -typedef VkFlags VkVideoEncodeH264CapabilityFlagsEXT; - -typedef enum VkVideoEncodeH264StdFlagBitsEXT { - VK_VIDEO_ENCODE_H264_STD_SEPARATE_COLOR_PLANE_FLAG_SET_BIT_EXT = 0x00000001, - VK_VIDEO_ENCODE_H264_STD_QPPRIME_Y_ZERO_TRANSFORM_BYPASS_FLAG_SET_BIT_EXT = 0x00000002, - VK_VIDEO_ENCODE_H264_STD_SCALING_MATRIX_PRESENT_FLAG_SET_BIT_EXT = 0x00000004, - VK_VIDEO_ENCODE_H264_STD_CHROMA_QP_INDEX_OFFSET_BIT_EXT = 0x00000008, - VK_VIDEO_ENCODE_H264_STD_SECOND_CHROMA_QP_INDEX_OFFSET_BIT_EXT = 0x00000010, - VK_VIDEO_ENCODE_H264_STD_PIC_INIT_QP_MINUS26_BIT_EXT = 0x00000020, - VK_VIDEO_ENCODE_H264_STD_WEIGHTED_PRED_FLAG_SET_BIT_EXT = 0x00000040, - VK_VIDEO_ENCODE_H264_STD_WEIGHTED_BIPRED_IDC_EXPLICIT_BIT_EXT = 0x00000080, - VK_VIDEO_ENCODE_H264_STD_WEIGHTED_BIPRED_IDC_IMPLICIT_BIT_EXT = 0x00000100, - VK_VIDEO_ENCODE_H264_STD_TRANSFORM_8X8_MODE_FLAG_SET_BIT_EXT = 0x00000200, - VK_VIDEO_ENCODE_H264_STD_DIRECT_SPATIAL_MV_PRED_FLAG_UNSET_BIT_EXT = 0x00000400, - VK_VIDEO_ENCODE_H264_STD_ENTROPY_CODING_MODE_FLAG_UNSET_BIT_EXT = 0x00000800, - VK_VIDEO_ENCODE_H264_STD_ENTROPY_CODING_MODE_FLAG_SET_BIT_EXT = 0x00001000, - VK_VIDEO_ENCODE_H264_STD_DIRECT_8X8_INFERENCE_FLAG_UNSET_BIT_EXT = 0x00002000, - VK_VIDEO_ENCODE_H264_STD_CONSTRAINED_INTRA_PRED_FLAG_SET_BIT_EXT = 0x00004000, - VK_VIDEO_ENCODE_H264_STD_DEBLOCKING_FILTER_DISABLED_BIT_EXT = 0x00008000, - VK_VIDEO_ENCODE_H264_STD_DEBLOCKING_FILTER_ENABLED_BIT_EXT = 0x00010000, - VK_VIDEO_ENCODE_H264_STD_DEBLOCKING_FILTER_PARTIAL_BIT_EXT = 0x00020000, - VK_VIDEO_ENCODE_H264_STD_FLAG_BITS_MAX_ENUM_EXT = 0x7FFFFFFF -} VkVideoEncodeH264StdFlagBitsEXT; -typedef VkFlags VkVideoEncodeH264StdFlagsEXT; - -typedef enum VkVideoEncodeH264RateControlFlagBitsEXT { - VK_VIDEO_ENCODE_H264_RATE_CONTROL_ATTEMPT_HRD_COMPLIANCE_BIT_EXT = 0x00000001, - VK_VIDEO_ENCODE_H264_RATE_CONTROL_REGULAR_GOP_BIT_EXT = 0x00000002, - VK_VIDEO_ENCODE_H264_RATE_CONTROL_REFERENCE_PATTERN_FLAT_BIT_EXT = 0x00000004, - VK_VIDEO_ENCODE_H264_RATE_CONTROL_REFERENCE_PATTERN_DYADIC_BIT_EXT = 0x00000008, - VK_VIDEO_ENCODE_H264_RATE_CONTROL_TEMPORAL_LAYER_PATTERN_DYADIC_BIT_EXT = 0x00000010, - VK_VIDEO_ENCODE_H264_RATE_CONTROL_FLAG_BITS_MAX_ENUM_EXT = 0x7FFFFFFF -} VkVideoEncodeH264RateControlFlagBitsEXT; -typedef VkFlags VkVideoEncodeH264RateControlFlagsEXT; -typedef struct VkVideoEncodeH264CapabilitiesEXT { - VkStructureType sType; - void* pNext; - VkVideoEncodeH264CapabilityFlagsEXT flags; - StdVideoH264LevelIdc maxLevelIdc; - uint32_t maxSliceCount; - uint32_t maxPPictureL0ReferenceCount; - uint32_t maxBPictureL0ReferenceCount; - uint32_t maxL1ReferenceCount; - uint32_t maxTemporalLayerCount; - VkBool32 expectDyadicTemporalLayerPattern; - int32_t minQp; - int32_t maxQp; - VkBool32 prefersGopRemainingFrames; - VkBool32 requiresGopRemainingFrames; - VkVideoEncodeH264StdFlagsEXT stdSyntaxFlags; -} VkVideoEncodeH264CapabilitiesEXT; - -typedef struct VkVideoEncodeH264QpEXT { - int32_t qpI; - int32_t qpP; - int32_t qpB; -} VkVideoEncodeH264QpEXT; - -typedef struct VkVideoEncodeH264QualityLevelPropertiesEXT { - VkStructureType sType; - void* pNext; - VkVideoEncodeH264RateControlFlagsEXT preferredRateControlFlags; - uint32_t preferredGopFrameCount; - uint32_t preferredIdrPeriod; - uint32_t preferredConsecutiveBFrameCount; - uint32_t preferredTemporalLayerCount; - VkVideoEncodeH264QpEXT preferredConstantQp; - uint32_t preferredMaxL0ReferenceCount; - uint32_t preferredMaxL1ReferenceCount; - VkBool32 preferredStdEntropyCodingModeFlag; -} VkVideoEncodeH264QualityLevelPropertiesEXT; - -typedef struct VkVideoEncodeH264SessionCreateInfoEXT { - VkStructureType sType; - const void* pNext; - VkBool32 useMaxLevelIdc; - StdVideoH264LevelIdc maxLevelIdc; -} VkVideoEncodeH264SessionCreateInfoEXT; - -typedef struct VkVideoEncodeH264SessionParametersAddInfoEXT { - VkStructureType sType; - const void* pNext; - uint32_t stdSPSCount; - const StdVideoH264SequenceParameterSet* pStdSPSs; - uint32_t stdPPSCount; - const StdVideoH264PictureParameterSet* pStdPPSs; -} VkVideoEncodeH264SessionParametersAddInfoEXT; - -typedef struct VkVideoEncodeH264SessionParametersCreateInfoEXT { - VkStructureType sType; - const void* pNext; - uint32_t maxStdSPSCount; - uint32_t maxStdPPSCount; - const VkVideoEncodeH264SessionParametersAddInfoEXT* pParametersAddInfo; -} VkVideoEncodeH264SessionParametersCreateInfoEXT; - -typedef struct VkVideoEncodeH264SessionParametersGetInfoEXT { - VkStructureType sType; - const void* pNext; - VkBool32 writeStdSPS; - VkBool32 writeStdPPS; - uint32_t stdSPSId; - uint32_t stdPPSId; -} VkVideoEncodeH264SessionParametersGetInfoEXT; - -typedef struct VkVideoEncodeH264SessionParametersFeedbackInfoEXT { - VkStructureType sType; - void* pNext; - VkBool32 hasStdSPSOverrides; - VkBool32 hasStdPPSOverrides; -} VkVideoEncodeH264SessionParametersFeedbackInfoEXT; - -typedef struct VkVideoEncodeH264NaluSliceInfoEXT { - VkStructureType sType; - const void* pNext; - int32_t constantQp; - const StdVideoEncodeH264SliceHeader* pStdSliceHeader; -} VkVideoEncodeH264NaluSliceInfoEXT; - -typedef struct VkVideoEncodeH264PictureInfoEXT { - VkStructureType sType; - const void* pNext; - uint32_t naluSliceEntryCount; - const VkVideoEncodeH264NaluSliceInfoEXT* pNaluSliceEntries; - const StdVideoEncodeH264PictureInfo* pStdPictureInfo; - VkBool32 generatePrefixNalu; -} VkVideoEncodeH264PictureInfoEXT; - -typedef struct VkVideoEncodeH264DpbSlotInfoEXT { - VkStructureType sType; - const void* pNext; - const StdVideoEncodeH264ReferenceInfo* pStdReferenceInfo; -} VkVideoEncodeH264DpbSlotInfoEXT; - -typedef struct VkVideoEncodeH264ProfileInfoEXT { - VkStructureType sType; - const void* pNext; - StdVideoH264ProfileIdc stdProfileIdc; -} VkVideoEncodeH264ProfileInfoEXT; - -typedef struct VkVideoEncodeH264RateControlInfoEXT { - VkStructureType sType; - const void* pNext; - VkVideoEncodeH264RateControlFlagsEXT flags; - uint32_t gopFrameCount; - uint32_t idrPeriod; - uint32_t consecutiveBFrameCount; - uint32_t temporalLayerCount; -} VkVideoEncodeH264RateControlInfoEXT; - -typedef struct VkVideoEncodeH264FrameSizeEXT { - uint32_t frameISize; - uint32_t framePSize; - uint32_t frameBSize; -} VkVideoEncodeH264FrameSizeEXT; - -typedef struct VkVideoEncodeH264RateControlLayerInfoEXT { - VkStructureType sType; - const void* pNext; - VkBool32 useMinQp; - VkVideoEncodeH264QpEXT minQp; - VkBool32 useMaxQp; - VkVideoEncodeH264QpEXT maxQp; - VkBool32 useMaxFrameSize; - VkVideoEncodeH264FrameSizeEXT maxFrameSize; -} VkVideoEncodeH264RateControlLayerInfoEXT; - -typedef struct VkVideoEncodeH264GopRemainingFrameInfoEXT { - VkStructureType sType; - const void* pNext; - VkBool32 useGopRemainingFrames; - uint32_t gopRemainingI; - uint32_t gopRemainingP; - uint32_t gopRemainingB; -} VkVideoEncodeH264GopRemainingFrameInfoEXT; - - - -// VK_EXT_video_encode_h265 is a preprocessor guard. Do not pass it to API calls. -#define VK_EXT_video_encode_h265 1 -#include "vk_video/vulkan_video_codec_h265std.h" -#include "vk_video/vulkan_video_codec_h265std_encode.h" -#define VK_EXT_VIDEO_ENCODE_H265_SPEC_VERSION 11 -#define VK_EXT_VIDEO_ENCODE_H265_EXTENSION_NAME "VK_EXT_video_encode_h265" - -typedef enum VkVideoEncodeH265CapabilityFlagBitsEXT { - VK_VIDEO_ENCODE_H265_CAPABILITY_HRD_COMPLIANCE_BIT_EXT = 0x00000001, - VK_VIDEO_ENCODE_H265_CAPABILITY_PREDICTION_WEIGHT_TABLE_GENERATED_BIT_EXT = 0x00000002, - VK_VIDEO_ENCODE_H265_CAPABILITY_ROW_UNALIGNED_SLICE_SEGMENT_BIT_EXT = 0x00000004, - VK_VIDEO_ENCODE_H265_CAPABILITY_DIFFERENT_SLICE_SEGMENT_TYPE_BIT_EXT = 0x00000008, - VK_VIDEO_ENCODE_H265_CAPABILITY_B_FRAME_IN_L0_LIST_BIT_EXT = 0x00000010, - VK_VIDEO_ENCODE_H265_CAPABILITY_B_FRAME_IN_L1_LIST_BIT_EXT = 0x00000020, - VK_VIDEO_ENCODE_H265_CAPABILITY_PER_PICTURE_TYPE_MIN_MAX_QP_BIT_EXT = 0x00000040, - VK_VIDEO_ENCODE_H265_CAPABILITY_PER_SLICE_SEGMENT_CONSTANT_QP_BIT_EXT = 0x00000080, - VK_VIDEO_ENCODE_H265_CAPABILITY_MULTIPLE_TILES_PER_SLICE_SEGMENT_BIT_EXT = 0x00000100, - VK_VIDEO_ENCODE_H265_CAPABILITY_MULTIPLE_SLICE_SEGMENTS_PER_TILE_BIT_EXT = 0x00000200, - VK_VIDEO_ENCODE_H265_CAPABILITY_FLAG_BITS_MAX_ENUM_EXT = 0x7FFFFFFF -} VkVideoEncodeH265CapabilityFlagBitsEXT; -typedef VkFlags VkVideoEncodeH265CapabilityFlagsEXT; - -typedef enum VkVideoEncodeH265StdFlagBitsEXT { - VK_VIDEO_ENCODE_H265_STD_SEPARATE_COLOR_PLANE_FLAG_SET_BIT_EXT = 0x00000001, - VK_VIDEO_ENCODE_H265_STD_SAMPLE_ADAPTIVE_OFFSET_ENABLED_FLAG_SET_BIT_EXT = 0x00000002, - VK_VIDEO_ENCODE_H265_STD_SCALING_LIST_DATA_PRESENT_FLAG_SET_BIT_EXT = 0x00000004, - VK_VIDEO_ENCODE_H265_STD_PCM_ENABLED_FLAG_SET_BIT_EXT = 0x00000008, - VK_VIDEO_ENCODE_H265_STD_SPS_TEMPORAL_MVP_ENABLED_FLAG_SET_BIT_EXT = 0x00000010, - VK_VIDEO_ENCODE_H265_STD_INIT_QP_MINUS26_BIT_EXT = 0x00000020, - VK_VIDEO_ENCODE_H265_STD_WEIGHTED_PRED_FLAG_SET_BIT_EXT = 0x00000040, - VK_VIDEO_ENCODE_H265_STD_WEIGHTED_BIPRED_FLAG_SET_BIT_EXT = 0x00000080, - VK_VIDEO_ENCODE_H265_STD_LOG2_PARALLEL_MERGE_LEVEL_MINUS2_BIT_EXT = 0x00000100, - VK_VIDEO_ENCODE_H265_STD_SIGN_DATA_HIDING_ENABLED_FLAG_SET_BIT_EXT = 0x00000200, - VK_VIDEO_ENCODE_H265_STD_TRANSFORM_SKIP_ENABLED_FLAG_SET_BIT_EXT = 0x00000400, - VK_VIDEO_ENCODE_H265_STD_TRANSFORM_SKIP_ENABLED_FLAG_UNSET_BIT_EXT = 0x00000800, - VK_VIDEO_ENCODE_H265_STD_PPS_SLICE_CHROMA_QP_OFFSETS_PRESENT_FLAG_SET_BIT_EXT = 0x00001000, - VK_VIDEO_ENCODE_H265_STD_TRANSQUANT_BYPASS_ENABLED_FLAG_SET_BIT_EXT = 0x00002000, - VK_VIDEO_ENCODE_H265_STD_CONSTRAINED_INTRA_PRED_FLAG_SET_BIT_EXT = 0x00004000, - VK_VIDEO_ENCODE_H265_STD_ENTROPY_CODING_SYNC_ENABLED_FLAG_SET_BIT_EXT = 0x00008000, - VK_VIDEO_ENCODE_H265_STD_DEBLOCKING_FILTER_OVERRIDE_ENABLED_FLAG_SET_BIT_EXT = 0x00010000, - VK_VIDEO_ENCODE_H265_STD_DEPENDENT_SLICE_SEGMENTS_ENABLED_FLAG_SET_BIT_EXT = 0x00020000, - VK_VIDEO_ENCODE_H265_STD_DEPENDENT_SLICE_SEGMENT_FLAG_SET_BIT_EXT = 0x00040000, - VK_VIDEO_ENCODE_H265_STD_FLAG_BITS_MAX_ENUM_EXT = 0x7FFFFFFF -} VkVideoEncodeH265StdFlagBitsEXT; -typedef VkFlags VkVideoEncodeH265StdFlagsEXT; - -typedef enum VkVideoEncodeH265CtbSizeFlagBitsEXT { - VK_VIDEO_ENCODE_H265_CTB_SIZE_16_BIT_EXT = 0x00000001, - VK_VIDEO_ENCODE_H265_CTB_SIZE_32_BIT_EXT = 0x00000002, - VK_VIDEO_ENCODE_H265_CTB_SIZE_64_BIT_EXT = 0x00000004, - VK_VIDEO_ENCODE_H265_CTB_SIZE_FLAG_BITS_MAX_ENUM_EXT = 0x7FFFFFFF -} VkVideoEncodeH265CtbSizeFlagBitsEXT; -typedef VkFlags VkVideoEncodeH265CtbSizeFlagsEXT; - -typedef enum VkVideoEncodeH265TransformBlockSizeFlagBitsEXT { - VK_VIDEO_ENCODE_H265_TRANSFORM_BLOCK_SIZE_4_BIT_EXT = 0x00000001, - VK_VIDEO_ENCODE_H265_TRANSFORM_BLOCK_SIZE_8_BIT_EXT = 0x00000002, - VK_VIDEO_ENCODE_H265_TRANSFORM_BLOCK_SIZE_16_BIT_EXT = 0x00000004, - VK_VIDEO_ENCODE_H265_TRANSFORM_BLOCK_SIZE_32_BIT_EXT = 0x00000008, - VK_VIDEO_ENCODE_H265_TRANSFORM_BLOCK_SIZE_FLAG_BITS_MAX_ENUM_EXT = 0x7FFFFFFF -} VkVideoEncodeH265TransformBlockSizeFlagBitsEXT; -typedef VkFlags VkVideoEncodeH265TransformBlockSizeFlagsEXT; - -typedef enum VkVideoEncodeH265RateControlFlagBitsEXT { - VK_VIDEO_ENCODE_H265_RATE_CONTROL_ATTEMPT_HRD_COMPLIANCE_BIT_EXT = 0x00000001, - VK_VIDEO_ENCODE_H265_RATE_CONTROL_REGULAR_GOP_BIT_EXT = 0x00000002, - VK_VIDEO_ENCODE_H265_RATE_CONTROL_REFERENCE_PATTERN_FLAT_BIT_EXT = 0x00000004, - VK_VIDEO_ENCODE_H265_RATE_CONTROL_REFERENCE_PATTERN_DYADIC_BIT_EXT = 0x00000008, - VK_VIDEO_ENCODE_H265_RATE_CONTROL_TEMPORAL_SUB_LAYER_PATTERN_DYADIC_BIT_EXT = 0x00000010, - VK_VIDEO_ENCODE_H265_RATE_CONTROL_FLAG_BITS_MAX_ENUM_EXT = 0x7FFFFFFF -} VkVideoEncodeH265RateControlFlagBitsEXT; -typedef VkFlags VkVideoEncodeH265RateControlFlagsEXT; -typedef struct VkVideoEncodeH265CapabilitiesEXT { - VkStructureType sType; - void* pNext; - VkVideoEncodeH265CapabilityFlagsEXT flags; - StdVideoH265LevelIdc maxLevelIdc; - uint32_t maxSliceSegmentCount; - VkExtent2D maxTiles; - VkVideoEncodeH265CtbSizeFlagsEXT ctbSizes; - VkVideoEncodeH265TransformBlockSizeFlagsEXT transformBlockSizes; - uint32_t maxPPictureL0ReferenceCount; - uint32_t maxBPictureL0ReferenceCount; - uint32_t maxL1ReferenceCount; - uint32_t maxSubLayerCount; - VkBool32 expectDyadicTemporalSubLayerPattern; - int32_t minQp; - int32_t maxQp; - VkBool32 prefersGopRemainingFrames; - VkBool32 requiresGopRemainingFrames; - VkVideoEncodeH265StdFlagsEXT stdSyntaxFlags; -} VkVideoEncodeH265CapabilitiesEXT; - -typedef struct VkVideoEncodeH265SessionCreateInfoEXT { - VkStructureType sType; - const void* pNext; - VkBool32 useMaxLevelIdc; - StdVideoH265LevelIdc maxLevelIdc; -} VkVideoEncodeH265SessionCreateInfoEXT; - -typedef struct VkVideoEncodeH265QpEXT { - int32_t qpI; - int32_t qpP; - int32_t qpB; -} VkVideoEncodeH265QpEXT; - -typedef struct VkVideoEncodeH265QualityLevelPropertiesEXT { - VkStructureType sType; - void* pNext; - VkVideoEncodeH265RateControlFlagsEXT preferredRateControlFlags; - uint32_t preferredGopFrameCount; - uint32_t preferredIdrPeriod; - uint32_t preferredConsecutiveBFrameCount; - uint32_t preferredSubLayerCount; - VkVideoEncodeH265QpEXT preferredConstantQp; - uint32_t preferredMaxL0ReferenceCount; - uint32_t preferredMaxL1ReferenceCount; -} VkVideoEncodeH265QualityLevelPropertiesEXT; - -typedef struct VkVideoEncodeH265SessionParametersAddInfoEXT { - VkStructureType sType; - const void* pNext; - uint32_t stdVPSCount; - const StdVideoH265VideoParameterSet* pStdVPSs; - uint32_t stdSPSCount; - const StdVideoH265SequenceParameterSet* pStdSPSs; - uint32_t stdPPSCount; - const StdVideoH265PictureParameterSet* pStdPPSs; -} VkVideoEncodeH265SessionParametersAddInfoEXT; - -typedef struct VkVideoEncodeH265SessionParametersCreateInfoEXT { - VkStructureType sType; - const void* pNext; - uint32_t maxStdVPSCount; - uint32_t maxStdSPSCount; - uint32_t maxStdPPSCount; - const VkVideoEncodeH265SessionParametersAddInfoEXT* pParametersAddInfo; -} VkVideoEncodeH265SessionParametersCreateInfoEXT; - -typedef struct VkVideoEncodeH265SessionParametersGetInfoEXT { - VkStructureType sType; - const void* pNext; - VkBool32 writeStdVPS; - VkBool32 writeStdSPS; - VkBool32 writeStdPPS; - uint32_t stdVPSId; - uint32_t stdSPSId; - uint32_t stdPPSId; -} VkVideoEncodeH265SessionParametersGetInfoEXT; - -typedef struct VkVideoEncodeH265SessionParametersFeedbackInfoEXT { - VkStructureType sType; - void* pNext; - VkBool32 hasStdVPSOverrides; - VkBool32 hasStdSPSOverrides; - VkBool32 hasStdPPSOverrides; -} VkVideoEncodeH265SessionParametersFeedbackInfoEXT; - -typedef struct VkVideoEncodeH265NaluSliceSegmentInfoEXT { - VkStructureType sType; - const void* pNext; - int32_t constantQp; - const StdVideoEncodeH265SliceSegmentHeader* pStdSliceSegmentHeader; -} VkVideoEncodeH265NaluSliceSegmentInfoEXT; - -typedef struct VkVideoEncodeH265PictureInfoEXT { - VkStructureType sType; - const void* pNext; - uint32_t naluSliceSegmentEntryCount; - const VkVideoEncodeH265NaluSliceSegmentInfoEXT* pNaluSliceSegmentEntries; - const StdVideoEncodeH265PictureInfo* pStdPictureInfo; -} VkVideoEncodeH265PictureInfoEXT; - -typedef struct VkVideoEncodeH265DpbSlotInfoEXT { - VkStructureType sType; - const void* pNext; - const StdVideoEncodeH265ReferenceInfo* pStdReferenceInfo; -} VkVideoEncodeH265DpbSlotInfoEXT; - -typedef struct VkVideoEncodeH265ProfileInfoEXT { - VkStructureType sType; - const void* pNext; - StdVideoH265ProfileIdc stdProfileIdc; -} VkVideoEncodeH265ProfileInfoEXT; - -typedef struct VkVideoEncodeH265RateControlInfoEXT { - VkStructureType sType; - const void* pNext; - VkVideoEncodeH265RateControlFlagsEXT flags; - uint32_t gopFrameCount; - uint32_t idrPeriod; - uint32_t consecutiveBFrameCount; - uint32_t subLayerCount; -} VkVideoEncodeH265RateControlInfoEXT; - -typedef struct VkVideoEncodeH265FrameSizeEXT { - uint32_t frameISize; - uint32_t framePSize; - uint32_t frameBSize; -} VkVideoEncodeH265FrameSizeEXT; - -typedef struct VkVideoEncodeH265RateControlLayerInfoEXT { - VkStructureType sType; - const void* pNext; - VkBool32 useMinQp; - VkVideoEncodeH265QpEXT minQp; - VkBool32 useMaxQp; - VkVideoEncodeH265QpEXT maxQp; - VkBool32 useMaxFrameSize; - VkVideoEncodeH265FrameSizeEXT maxFrameSize; -} VkVideoEncodeH265RateControlLayerInfoEXT; - -typedef struct VkVideoEncodeH265GopRemainingFrameInfoEXT { - VkStructureType sType; - const void* pNext; - VkBool32 useGopRemainingFrames; - uint32_t gopRemainingI; - uint32_t gopRemainingP; - uint32_t gopRemainingB; -} VkVideoEncodeH265GopRemainingFrameInfoEXT; - - - // VK_AMDX_shader_enqueue is a preprocessor guard. Do not pass it to API calls. #define VK_AMDX_shader_enqueue 1 #define VK_AMDX_SHADER_ENQUEUE_SPEC_VERSION 1 diff --git a/ext/vulkan/vulkan_core.h b/ext/vulkan/vulkan_core.h index c574858134..7e6b040971 100644 --- a/ext/vulkan/vulkan_core.h +++ b/ext/vulkan/vulkan_core.h @@ -2,7 +2,7 @@ #define VULKAN_CORE_H_ 1 /* -** Copyright 2015-2023 The Khronos Group Inc. +** Copyright 2015-2024 The Khronos Group Inc. ** ** SPDX-License-Identifier: Apache-2.0 */ @@ -27,7 +27,7 @@ extern "C" { #ifndef VK_USE_64_BIT_PTR_DEFINES - #if defined(__LP64__) || defined(_WIN64) || (defined(__x86_64__) && !defined(__ILP32__) ) || defined(_M_X64) || defined(__ia64) || defined (_M_IA64) || defined(__aarch64__) || defined(__powerpc64__) + #if defined(__LP64__) || defined(_WIN64) || (defined(__x86_64__) && !defined(__ILP32__) ) || defined(_M_X64) || defined(__ia64) || defined (_M_IA64) || defined(__aarch64__) || defined(__powerpc64__) || (defined(__riscv) && __riscv_xlen == 64) #define VK_USE_64_BIT_PTR_DEFINES 1 #else #define VK_USE_64_BIT_PTR_DEFINES 0 @@ -69,7 +69,7 @@ extern "C" { #define VK_API_VERSION_1_0 VK_MAKE_API_VERSION(0, 1, 0, 0)// Patch version should always be set to 0 // Version of this file -#define VK_HEADER_VERSION 261 +#define VK_HEADER_VERSION 278 // Complete version of this file #define VK_HEADER_VERSION_COMPLETE VK_MAKE_API_VERSION(0, 1, 3, VK_HEADER_VERSION) @@ -182,11 +182,9 @@ typedef enum VkResult { VK_THREAD_DONE_KHR = 1000268001, VK_OPERATION_DEFERRED_KHR = 1000268002, VK_OPERATION_NOT_DEFERRED_KHR = 1000268003, -#ifdef VK_ENABLE_BETA_EXTENSIONS VK_ERROR_INVALID_VIDEO_STD_PARAMETERS_KHR = -1000299000, -#endif VK_ERROR_COMPRESSION_EXHAUSTED_EXT = -1000338000, - VK_ERROR_INCOMPATIBLE_SHADER_BINARY_EXT = 1000482000, + VK_INCOMPATIBLE_SHADER_BINARY_EXT = 1000482000, VK_ERROR_OUT_OF_POOL_MEMORY_KHR = VK_ERROR_OUT_OF_POOL_MEMORY, VK_ERROR_INVALID_EXTERNAL_HANDLE_KHR = VK_ERROR_INVALID_EXTERNAL_HANDLE, VK_ERROR_FRAGMENTATION_EXT = VK_ERROR_FRAGMENTATION, @@ -195,6 +193,7 @@ typedef enum VkResult { VK_ERROR_INVALID_OPAQUE_CAPTURE_ADDRESS_KHR = VK_ERROR_INVALID_OPAQUE_CAPTURE_ADDRESS, VK_PIPELINE_COMPILE_REQUIRED_EXT = VK_PIPELINE_COMPILE_REQUIRED, VK_ERROR_PIPELINE_COMPILE_REQUIRED_EXT = VK_PIPELINE_COMPILE_REQUIRED, + VK_ERROR_INCOMPATIBLE_SHADER_BINARY_EXT = VK_INCOMPATIBLE_SHADER_BINARY_EXT, VK_RESULT_MAX_ENUM = 0x7FFFFFFF } VkResult; @@ -467,90 +466,34 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_CU_LAUNCH_INFO_NVX = 1000029002, VK_STRUCTURE_TYPE_IMAGE_VIEW_HANDLE_INFO_NVX = 1000030000, VK_STRUCTURE_TYPE_IMAGE_VIEW_ADDRESS_PROPERTIES_NVX = 1000030001, -#ifdef VK_ENABLE_BETA_EXTENSIONS - VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_CAPABILITIES_EXT = 1000038000, -#endif -#ifdef VK_ENABLE_BETA_EXTENSIONS - VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_SESSION_PARAMETERS_CREATE_INFO_EXT = 1000038001, -#endif -#ifdef VK_ENABLE_BETA_EXTENSIONS - VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_SESSION_PARAMETERS_ADD_INFO_EXT = 1000038002, -#endif -#ifdef VK_ENABLE_BETA_EXTENSIONS - VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_PICTURE_INFO_EXT = 1000038003, -#endif -#ifdef VK_ENABLE_BETA_EXTENSIONS - VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_DPB_SLOT_INFO_EXT = 1000038004, -#endif -#ifdef VK_ENABLE_BETA_EXTENSIONS - VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_NALU_SLICE_INFO_EXT = 1000038005, -#endif -#ifdef VK_ENABLE_BETA_EXTENSIONS - VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_GOP_REMAINING_FRAME_INFO_EXT = 1000038006, -#endif -#ifdef VK_ENABLE_BETA_EXTENSIONS - VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_PROFILE_INFO_EXT = 1000038007, -#endif -#ifdef VK_ENABLE_BETA_EXTENSIONS - VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_RATE_CONTROL_INFO_EXT = 1000038008, -#endif -#ifdef VK_ENABLE_BETA_EXTENSIONS - VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_RATE_CONTROL_LAYER_INFO_EXT = 1000038009, -#endif -#ifdef VK_ENABLE_BETA_EXTENSIONS - VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_SESSION_CREATE_INFO_EXT = 1000038010, -#endif -#ifdef VK_ENABLE_BETA_EXTENSIONS - VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_QUALITY_LEVEL_PROPERTIES_EXT = 1000038011, -#endif -#ifdef VK_ENABLE_BETA_EXTENSIONS - VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_SESSION_PARAMETERS_GET_INFO_EXT = 1000038012, -#endif -#ifdef VK_ENABLE_BETA_EXTENSIONS - VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_SESSION_PARAMETERS_FEEDBACK_INFO_EXT = 1000038013, -#endif -#ifdef VK_ENABLE_BETA_EXTENSIONS - VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_CAPABILITIES_EXT = 1000039000, -#endif -#ifdef VK_ENABLE_BETA_EXTENSIONS - VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_SESSION_PARAMETERS_CREATE_INFO_EXT = 1000039001, -#endif -#ifdef VK_ENABLE_BETA_EXTENSIONS - VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_SESSION_PARAMETERS_ADD_INFO_EXT = 1000039002, -#endif -#ifdef VK_ENABLE_BETA_EXTENSIONS - VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_PICTURE_INFO_EXT = 1000039003, -#endif -#ifdef VK_ENABLE_BETA_EXTENSIONS - VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_DPB_SLOT_INFO_EXT = 1000039004, -#endif -#ifdef VK_ENABLE_BETA_EXTENSIONS - VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_NALU_SLICE_SEGMENT_INFO_EXT = 1000039005, -#endif -#ifdef VK_ENABLE_BETA_EXTENSIONS - VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_GOP_REMAINING_FRAME_INFO_EXT = 1000039006, -#endif -#ifdef VK_ENABLE_BETA_EXTENSIONS - VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_PROFILE_INFO_EXT = 1000039007, -#endif -#ifdef VK_ENABLE_BETA_EXTENSIONS - VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_RATE_CONTROL_INFO_EXT = 1000039009, -#endif -#ifdef VK_ENABLE_BETA_EXTENSIONS - VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_RATE_CONTROL_LAYER_INFO_EXT = 1000039010, -#endif -#ifdef VK_ENABLE_BETA_EXTENSIONS - VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_SESSION_CREATE_INFO_EXT = 1000039011, -#endif -#ifdef VK_ENABLE_BETA_EXTENSIONS - VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_QUALITY_LEVEL_PROPERTIES_EXT = 1000039012, -#endif -#ifdef VK_ENABLE_BETA_EXTENSIONS - VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_SESSION_PARAMETERS_GET_INFO_EXT = 1000039013, -#endif -#ifdef VK_ENABLE_BETA_EXTENSIONS - VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_SESSION_PARAMETERS_FEEDBACK_INFO_EXT = 1000039014, -#endif + VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_CAPABILITIES_KHR = 1000038000, + VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_SESSION_PARAMETERS_CREATE_INFO_KHR = 1000038001, + VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_SESSION_PARAMETERS_ADD_INFO_KHR = 1000038002, + VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_PICTURE_INFO_KHR = 1000038003, + VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_DPB_SLOT_INFO_KHR = 1000038004, + VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_NALU_SLICE_INFO_KHR = 1000038005, + VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_GOP_REMAINING_FRAME_INFO_KHR = 1000038006, + VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_PROFILE_INFO_KHR = 1000038007, + VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_RATE_CONTROL_INFO_KHR = 1000038008, + VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_RATE_CONTROL_LAYER_INFO_KHR = 1000038009, + VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_SESSION_CREATE_INFO_KHR = 1000038010, + VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_QUALITY_LEVEL_PROPERTIES_KHR = 1000038011, + VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_SESSION_PARAMETERS_GET_INFO_KHR = 1000038012, + VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_SESSION_PARAMETERS_FEEDBACK_INFO_KHR = 1000038013, + VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_CAPABILITIES_KHR = 1000039000, + VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_SESSION_PARAMETERS_CREATE_INFO_KHR = 1000039001, + VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_SESSION_PARAMETERS_ADD_INFO_KHR = 1000039002, + VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_PICTURE_INFO_KHR = 1000039003, + VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_DPB_SLOT_INFO_KHR = 1000039004, + VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_NALU_SLICE_SEGMENT_INFO_KHR = 1000039005, + VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_GOP_REMAINING_FRAME_INFO_KHR = 1000039006, + VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_PROFILE_INFO_KHR = 1000039007, + VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_RATE_CONTROL_INFO_KHR = 1000039009, + VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_RATE_CONTROL_LAYER_INFO_KHR = 1000039010, + VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_SESSION_CREATE_INFO_KHR = 1000039011, + VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_QUALITY_LEVEL_PROPERTIES_KHR = 1000039012, + VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_SESSION_PARAMETERS_GET_INFO_KHR = 1000039013, + VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_SESSION_PARAMETERS_FEEDBACK_INFO_KHR = 1000039014, VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_CAPABILITIES_KHR = 1000040000, VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_PICTURE_INFO_KHR = 1000040001, VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_PROFILE_INFO_KHR = 1000040003, @@ -611,6 +554,7 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_CLIP_ENABLE_FEATURES_EXT = 1000102000, VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_DEPTH_CLIP_STATE_CREATE_INFO_EXT = 1000102001, VK_STRUCTURE_TYPE_HDR_METADATA_EXT = 1000105000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RELAXED_LINE_RASTERIZATION_FEATURES_IMG = 1000110000, VK_STRUCTURE_TYPE_SHARED_PRESENT_SURFACE_CAPABILITIES_KHR = 1000111000, VK_STRUCTURE_TYPE_IMPORT_FENCE_WIN32_HANDLE_INFO_KHR = 1000114000, VK_STRUCTURE_TYPE_EXPORT_FENCE_WIN32_HANDLE_INFO_KHR = 1000114001, @@ -732,7 +676,6 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_MEMORY_HOST_PROPERTIES_EXT = 1000178002, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CLOCK_FEATURES_KHR = 1000181000, VK_STRUCTURE_TYPE_PIPELINE_COMPILER_CONTROL_CREATE_INFO_AMD = 1000183000, - VK_STRUCTURE_TYPE_CALIBRATED_TIMESTAMP_INFO_EXT = 1000184000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_PROPERTIES_AMD = 1000185000, VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_CAPABILITIES_KHR = 1000187000, VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_SESSION_PARAMETERS_CREATE_INFO_KHR = 1000187001, @@ -745,8 +688,6 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_QUEUE_FAMILY_GLOBAL_PRIORITY_PROPERTIES_KHR = 1000388001, VK_STRUCTURE_TYPE_DEVICE_MEMORY_OVERALLOCATION_CREATE_INFO_AMD = 1000189000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES_EXT = 1000190000, - VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO_EXT = 1000190001, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_EXT = 1000190002, VK_STRUCTURE_TYPE_PRESENT_FRAME_TOKEN_GGP = 1000191000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COMPUTE_SHADER_DERIVATIVES_FEATURES_NV = 1000201000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MESH_SHADER_FEATURES_NV = 1000202000, @@ -778,7 +719,11 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADING_RATE_KHR = 1000226004, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_PROPERTIES_2_AMD = 1000227000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COHERENT_MEMORY_FEATURES_AMD = 1000229000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DYNAMIC_RENDERING_LOCAL_READ_FEATURES_KHR = 1000232000, + VK_STRUCTURE_TYPE_RENDERING_ATTACHMENT_LOCATION_INFO_KHR = 1000232001, + VK_STRUCTURE_TYPE_RENDERING_INPUT_ATTACHMENT_INDEX_INFO_KHR = 1000232002, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_IMAGE_ATOMIC_INT64_FEATURES_EXT = 1000234000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_QUAD_CONTROL_FEATURES_KHR = 1000235000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_BUDGET_PROPERTIES_EXT = 1000237000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_PRIORITY_FEATURES_EXT = 1000238000, VK_STRUCTURE_TYPE_MEMORY_PRIORITY_ALLOCATE_INFO_EXT = 1000238001, @@ -803,11 +748,7 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_SURFACE_CAPABILITIES_FULL_SCREEN_EXCLUSIVE_EXT = 1000255002, VK_STRUCTURE_TYPE_SURFACE_FULL_SCREEN_EXCLUSIVE_WIN32_INFO_EXT = 1000255001, VK_STRUCTURE_TYPE_HEADLESS_SURFACE_CREATE_INFO_EXT = 1000256000, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_FEATURES_EXT = 1000259000, - VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_LINE_STATE_CREATE_INFO_EXT = 1000259001, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_PROPERTIES_EXT = 1000259002, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_FLOAT_FEATURES_EXT = 1000260000, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INDEX_TYPE_UINT8_FEATURES_EXT = 1000265000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTENDED_DYNAMIC_STATE_FEATURES_EXT = 1000267000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_EXECUTABLE_PROPERTIES_FEATURES_KHR = 1000269000, VK_STRUCTURE_TYPE_PIPELINE_INFO_KHR = 1000269001, @@ -827,6 +768,9 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_HOST_IMAGE_COPY_DEVICE_PERFORMANCE_QUERY_EXT = 1000270009, VK_STRUCTURE_TYPE_MEMORY_MAP_INFO_KHR = 1000271000, VK_STRUCTURE_TYPE_MEMORY_UNMAP_INFO_KHR = 1000271001, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAP_MEMORY_PLACED_FEATURES_EXT = 1000272000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAP_MEMORY_PLACED_PROPERTIES_EXT = 1000272001, + VK_STRUCTURE_TYPE_MEMORY_MAP_PLACED_INFO_EXT = 1000272002, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_FLOAT_2_FEATURES_EXT = 1000273000, VK_STRUCTURE_TYPE_SURFACE_PRESENT_MODE_EXT = 1000274000, VK_STRUCTURE_TYPE_SURFACE_PRESENT_SCALING_CAPABILITIES_EXT = 1000274001, @@ -867,41 +811,24 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_BARRIER_CREATE_INFO_NV = 1000292002, VK_STRUCTURE_TYPE_PRESENT_ID_KHR = 1000294000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_ID_FEATURES_KHR = 1000294001, -#ifdef VK_ENABLE_BETA_EXTENSIONS VK_STRUCTURE_TYPE_VIDEO_ENCODE_INFO_KHR = 1000299000, -#endif -#ifdef VK_ENABLE_BETA_EXTENSIONS VK_STRUCTURE_TYPE_VIDEO_ENCODE_RATE_CONTROL_INFO_KHR = 1000299001, -#endif -#ifdef VK_ENABLE_BETA_EXTENSIONS VK_STRUCTURE_TYPE_VIDEO_ENCODE_RATE_CONTROL_LAYER_INFO_KHR = 1000299002, -#endif -#ifdef VK_ENABLE_BETA_EXTENSIONS VK_STRUCTURE_TYPE_VIDEO_ENCODE_CAPABILITIES_KHR = 1000299003, -#endif -#ifdef VK_ENABLE_BETA_EXTENSIONS VK_STRUCTURE_TYPE_VIDEO_ENCODE_USAGE_INFO_KHR = 1000299004, -#endif -#ifdef VK_ENABLE_BETA_EXTENSIONS VK_STRUCTURE_TYPE_QUERY_POOL_VIDEO_ENCODE_FEEDBACK_CREATE_INFO_KHR = 1000299005, -#endif -#ifdef VK_ENABLE_BETA_EXTENSIONS VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VIDEO_ENCODE_QUALITY_LEVEL_INFO_KHR = 1000299006, -#endif -#ifdef VK_ENABLE_BETA_EXTENSIONS VK_STRUCTURE_TYPE_VIDEO_ENCODE_QUALITY_LEVEL_PROPERTIES_KHR = 1000299007, -#endif -#ifdef VK_ENABLE_BETA_EXTENSIONS VK_STRUCTURE_TYPE_VIDEO_ENCODE_QUALITY_LEVEL_INFO_KHR = 1000299008, -#endif -#ifdef VK_ENABLE_BETA_EXTENSIONS VK_STRUCTURE_TYPE_VIDEO_ENCODE_SESSION_PARAMETERS_GET_INFO_KHR = 1000299009, -#endif -#ifdef VK_ENABLE_BETA_EXTENSIONS VK_STRUCTURE_TYPE_VIDEO_ENCODE_SESSION_PARAMETERS_FEEDBACK_INFO_KHR = 1000299010, -#endif VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DIAGNOSTICS_CONFIG_FEATURES_NV = 1000300000, VK_STRUCTURE_TYPE_DEVICE_DIAGNOSTICS_CONFIG_CREATE_INFO_NV = 1000300001, + VK_STRUCTURE_TYPE_CUDA_MODULE_CREATE_INFO_NV = 1000307000, + VK_STRUCTURE_TYPE_CUDA_FUNCTION_CREATE_INFO_NV = 1000307001, + VK_STRUCTURE_TYPE_CUDA_LAUNCH_INFO_NV = 1000307002, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUDA_KERNEL_LAUNCH_FEATURES_NV = 1000307003, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUDA_KERNEL_LAUNCH_PROPERTIES_NV = 1000307004, VK_STRUCTURE_TYPE_QUERY_LOW_LATENCY_SUPPORT_NV = 1000310000, VK_STRUCTURE_TYPE_EXPORT_METAL_OBJECT_CREATE_INFO_EXT = 1000311000, VK_STRUCTURE_TYPE_EXPORT_METAL_OBJECTS_INFO_EXT = 1000311001, @@ -992,6 +919,8 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_MEMORY_RDMA_FEATURES_NV = 1000371001, VK_STRUCTURE_TYPE_PIPELINE_PROPERTIES_IDENTIFIER_EXT = 1000372000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_PROPERTIES_FEATURES_EXT = 1000372001, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAME_BOUNDARY_FEATURES_EXT = 1000375000, + VK_STRUCTURE_TYPE_FRAME_BOUNDARY_EXT = 1000375001, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTISAMPLED_RENDER_TO_SINGLE_SAMPLED_FEATURES_EXT = 1000376000, VK_STRUCTURE_TYPE_SUBPASS_RESOLVE_PERFORMANCE_QUERY_EXT = 1000376001, VK_STRUCTURE_TYPE_MULTISAMPLED_RENDER_TO_SINGLE_SAMPLED_INFO_EXT = 1000376002, @@ -1029,10 +958,15 @@ typedef enum VkStructureType { #endif VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CLUSTER_CULLING_SHADER_FEATURES_HUAWEI = 1000404000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CLUSTER_CULLING_SHADER_PROPERTIES_HUAWEI = 1000404001, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CLUSTER_CULLING_SHADER_VRS_FEATURES_HUAWEI = 1000404002, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BORDER_COLOR_SWIZZLE_FEATURES_EXT = 1000411000, VK_STRUCTURE_TYPE_SAMPLER_BORDER_COLOR_COMPONENT_MAPPING_CREATE_INFO_EXT = 1000411001, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PAGEABLE_DEVICE_LOCAL_MEMORY_FEATURES_EXT = 1000412000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_PROPERTIES_ARM = 1000415000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_ROTATE_FEATURES_KHR = 1000416000, + VK_STRUCTURE_TYPE_DEVICE_QUEUE_SHADER_CORE_CONTROL_CREATE_INFO_ARM = 1000417000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCHEDULING_CONTROLS_FEATURES_ARM = 1000417001, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCHEDULING_CONTROLS_PROPERTIES_ARM = 1000417002, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_SLICED_VIEW_OF_3D_FEATURES_EXT = 1000418000, VK_STRUCTURE_TYPE_IMAGE_VIEW_SLICED_CREATE_INFO_EXT = 1000418001, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_SET_HOST_MAPPING_FEATURES_VALVE = 1000420000, @@ -1040,6 +974,11 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_HOST_MAPPING_INFO_VALVE = 1000420002, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_CLAMP_ZERO_ONE_FEATURES_EXT = 1000421000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_NON_SEAMLESS_CUBE_MAP_FEATURES_EXT = 1000422000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RENDER_PASS_STRIPED_FEATURES_ARM = 1000424000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RENDER_PASS_STRIPED_PROPERTIES_ARM = 1000424001, + VK_STRUCTURE_TYPE_RENDER_PASS_STRIPE_BEGIN_INFO_ARM = 1000424002, + VK_STRUCTURE_TYPE_RENDER_PASS_STRIPE_INFO_ARM = 1000424003, + VK_STRUCTURE_TYPE_RENDER_PASS_STRIPE_SUBMIT_INFO_ARM = 1000424004, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_FEATURES_QCOM = 1000425000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_PROPERTIES_QCOM = 1000425001, VK_STRUCTURE_TYPE_SUBPASS_FRAGMENT_DENSITY_MAP_OFFSET_END_INFO_QCOM = 1000425002, @@ -1051,10 +990,13 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_COMPUTE_PIPELINE_INDIRECT_BUFFER_INFO_NV = 1000428001, VK_STRUCTURE_TYPE_PIPELINE_INDIRECT_DEVICE_ADDRESS_INFO_NV = 1000428002, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINEAR_COLOR_ATTACHMENT_FEATURES_NV = 1000430000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_MAXIMAL_RECONVERGENCE_FEATURES_KHR = 1000434000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_COMPRESSION_CONTROL_SWAPCHAIN_FEATURES_EXT = 1000437000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_PROCESSING_FEATURES_QCOM = 1000440000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_PROCESSING_PROPERTIES_QCOM = 1000440001, VK_STRUCTURE_TYPE_IMAGE_VIEW_SAMPLE_WEIGHT_CREATE_INFO_QCOM = 1000440002, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_NESTED_COMMAND_BUFFER_FEATURES_EXT = 1000451000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_NESTED_COMMAND_BUFFER_PROPERTIES_EXT = 1000451001, VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_ACQUIRE_UNMODIFIED_EXT = 1000453000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTENDED_DYNAMIC_STATE_3_FEATURES_EXT = 1000455000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTENDED_DYNAMIC_STATE_3_PROPERTIES_EXT = 1000455001, @@ -1078,6 +1020,9 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_OPTICAL_FLOW_SESSION_CREATE_PRIVATE_DATA_INFO_NV = 1000464010, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LEGACY_DITHERING_FEATURES_EXT = 1000465000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_PROTECTED_ACCESS_FEATURES_EXT = 1000466000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_FORMAT_RESOLVE_FEATURES_ANDROID = 1000468000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_FORMAT_RESOLVE_PROPERTIES_ANDROID = 1000468001, + VK_STRUCTURE_TYPE_ANDROID_HARDWARE_BUFFER_FORMAT_RESOLVE_PROPERTIES_ANDROID = 1000468002, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_5_FEATURES_KHR = 1000470000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_5_PROPERTIES_KHR = 1000470001, VK_STRUCTURE_TYPE_RENDERING_AREA_INFO_KHR = 1000470003, @@ -1097,23 +1042,74 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PER_VIEW_VIEWPORTS_FEATURES_QCOM = 1000488000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_INVOCATION_REORDER_FEATURES_NV = 1000490000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_INVOCATION_REORDER_PROPERTIES_NV = 1000490001, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTENDED_SPARSE_ADDRESS_SPACE_FEATURES_NV = 1000492000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTENDED_SPARSE_ADDRESS_SPACE_PROPERTIES_NV = 1000492001, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MUTABLE_DESCRIPTOR_TYPE_FEATURES_EXT = 1000351000, VK_STRUCTURE_TYPE_MUTABLE_DESCRIPTOR_TYPE_CREATE_INFO_EXT = 1000351002, + VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT = 1000496000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_BUILTINS_FEATURES_ARM = 1000497000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_BUILTINS_PROPERTIES_ARM = 1000497001, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_LIBRARY_GROUP_HANDLES_FEATURES_EXT = 1000498000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DYNAMIC_RENDERING_UNUSED_ATTACHMENTS_FEATURES_EXT = 1000499000, + VK_STRUCTURE_TYPE_LATENCY_SLEEP_MODE_INFO_NV = 1000505000, + VK_STRUCTURE_TYPE_LATENCY_SLEEP_INFO_NV = 1000505001, + VK_STRUCTURE_TYPE_SET_LATENCY_MARKER_INFO_NV = 1000505002, + VK_STRUCTURE_TYPE_GET_LATENCY_MARKER_INFO_NV = 1000505003, + VK_STRUCTURE_TYPE_LATENCY_TIMINGS_FRAME_REPORT_NV = 1000505004, + VK_STRUCTURE_TYPE_LATENCY_SUBMISSION_PRESENT_ID_NV = 1000505005, + VK_STRUCTURE_TYPE_OUT_OF_BAND_QUEUE_TYPE_INFO_NV = 1000505006, + VK_STRUCTURE_TYPE_SWAPCHAIN_LATENCY_CREATE_INFO_NV = 1000505007, + VK_STRUCTURE_TYPE_LATENCY_SURFACE_CAPABILITIES_NV = 1000505008, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COOPERATIVE_MATRIX_FEATURES_KHR = 1000506000, VK_STRUCTURE_TYPE_COOPERATIVE_MATRIX_PROPERTIES_KHR = 1000506001, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COOPERATIVE_MATRIX_PROPERTIES_KHR = 1000506002, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PER_VIEW_RENDER_AREAS_FEATURES_QCOM = 1000510000, VK_STRUCTURE_TYPE_MULTIVIEW_PER_VIEW_RENDER_AREAS_RENDER_PASS_BEGIN_INFO_QCOM = 1000510001, + VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_CAPABILITIES_KHR = 1000512000, + VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_PICTURE_INFO_KHR = 1000512001, + VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_PROFILE_INFO_KHR = 1000512003, + VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_SESSION_PARAMETERS_CREATE_INFO_KHR = 1000512004, + VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_DPB_SLOT_INFO_KHR = 1000512005, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VIDEO_MAINTENANCE_1_FEATURES_KHR = 1000515000, + VK_STRUCTURE_TYPE_VIDEO_INLINE_QUERY_INFO_KHR = 1000515001, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PER_STAGE_DESCRIPTOR_SET_FEATURES_NV = 1000516000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_PROCESSING_2_FEATURES_QCOM = 1000518000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_PROCESSING_2_PROPERTIES_QCOM = 1000518001, + VK_STRUCTURE_TYPE_SAMPLER_BLOCK_MATCH_WINDOW_CREATE_INFO_QCOM = 1000518002, + VK_STRUCTURE_TYPE_SAMPLER_CUBIC_WEIGHTS_CREATE_INFO_QCOM = 1000519000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUBIC_WEIGHTS_FEATURES_QCOM = 1000519001, + VK_STRUCTURE_TYPE_BLIT_IMAGE_CUBIC_WEIGHTS_INFO_QCOM = 1000519002, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_YCBCR_DEGAMMA_FEATURES_QCOM = 1000520000, + VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_YCBCR_DEGAMMA_CREATE_INFO_QCOM = 1000520001, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUBIC_CLAMP_FEATURES_QCOM = 1000521000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ATTACHMENT_FEEDBACK_LOOP_DYNAMIC_STATE_FEATURES_EXT = 1000524000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES_KHR = 1000525000, + VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO_KHR = 1000190001, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_KHR = 1000190002, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FLOAT_CONTROLS_2_FEATURES_KHR = 1000528000, VK_STRUCTURE_TYPE_SCREEN_BUFFER_PROPERTIES_QNX = 1000529000, VK_STRUCTURE_TYPE_SCREEN_BUFFER_FORMAT_PROPERTIES_QNX = 1000529001, VK_STRUCTURE_TYPE_IMPORT_SCREEN_BUFFER_INFO_QNX = 1000529002, VK_STRUCTURE_TYPE_EXTERNAL_FORMAT_QNX = 1000529003, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_MEMORY_SCREEN_BUFFER_FEATURES_QNX = 1000529004, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LAYERED_DRIVER_PROPERTIES_MSFT = 1000530000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INDEX_TYPE_UINT8_FEATURES_KHR = 1000265000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_FEATURES_KHR = 1000259000, + VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_LINE_STATE_CREATE_INFO_KHR = 1000259001, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_PROPERTIES_KHR = 1000259002, + VK_STRUCTURE_TYPE_CALIBRATED_TIMESTAMP_INFO_KHR = 1000184000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_EXPECT_ASSUME_FEATURES_KHR = 1000544000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_6_FEATURES_KHR = 1000545000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_6_PROPERTIES_KHR = 1000545001, + VK_STRUCTURE_TYPE_BIND_MEMORY_STATUS_KHR = 1000545002, + VK_STRUCTURE_TYPE_BIND_DESCRIPTOR_SETS_INFO_KHR = 1000545003, + VK_STRUCTURE_TYPE_PUSH_CONSTANTS_INFO_KHR = 1000545004, + VK_STRUCTURE_TYPE_PUSH_DESCRIPTOR_SET_INFO_KHR = 1000545005, + VK_STRUCTURE_TYPE_PUSH_DESCRIPTOR_SET_WITH_TEMPLATE_INFO_KHR = 1000545006, + VK_STRUCTURE_TYPE_SET_DESCRIPTOR_BUFFER_OFFSETS_INFO_EXT = 1000545007, + VK_STRUCTURE_TYPE_BIND_DESCRIPTOR_BUFFER_EMBEDDED_SAMPLERS_INFO_EXT = 1000545008, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_POOL_OVERALLOCATION_FEATURES_NV = 1000546000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_FLOAT16_VECTOR_FEATURES_NV = 1000563000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTER_FEATURES = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTERS_FEATURES, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DRAW_PARAMETER_FEATURES = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DRAW_PARAMETERS_FEATURES, VK_STRUCTURE_TYPE_DEBUG_REPORT_CREATE_INFO_EXT = VK_STRUCTURE_TYPE_DEBUG_REPORT_CALLBACK_CREATE_INFO_EXT, @@ -1214,6 +1210,9 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_EXTENDED_TYPES_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_EXTENDED_TYPES_FEATURES, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_8BIT_STORAGE_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_8BIT_STORAGE_FEATURES, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_INT64_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_INT64_FEATURES, + VK_STRUCTURE_TYPE_CALIBRATED_TIMESTAMP_INFO_EXT = VK_STRUCTURE_TYPE_CALIBRATED_TIMESTAMP_INFO_KHR, + VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO_EXT = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO_KHR, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_KHR, VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO_EXT = VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FLOAT_CONTROLS_PROPERTIES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FLOAT_CONTROLS_PROPERTIES, @@ -1246,7 +1245,11 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_BUFFER_OPAQUE_CAPTURE_ADDRESS_CREATE_INFO_KHR = VK_STRUCTURE_TYPE_BUFFER_OPAQUE_CAPTURE_ADDRESS_CREATE_INFO, VK_STRUCTURE_TYPE_MEMORY_OPAQUE_CAPTURE_ADDRESS_ALLOCATE_INFO_KHR = VK_STRUCTURE_TYPE_MEMORY_OPAQUE_CAPTURE_ADDRESS_ALLOCATE_INFO, VK_STRUCTURE_TYPE_DEVICE_MEMORY_OPAQUE_CAPTURE_ADDRESS_INFO_KHR = VK_STRUCTURE_TYPE_DEVICE_MEMORY_OPAQUE_CAPTURE_ADDRESS_INFO, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_FEATURES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_FEATURES_KHR, + VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_LINE_STATE_CREATE_INFO_EXT = VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_LINE_STATE_CREATE_INFO_KHR, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_PROPERTIES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_PROPERTIES_KHR, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_QUERY_RESET_FEATURES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_QUERY_RESET_FEATURES, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INDEX_TYPE_UINT8_FEATURES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INDEX_TYPE_UINT8_FEATURES_KHR, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DEMOTE_TO_HELPER_INVOCATION_FEATURES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DEMOTE_TO_HELPER_INVOCATION_FEATURES, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_FEATURES, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_PROPERTIES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_PROPERTIES, @@ -1323,15 +1326,10 @@ typedef enum VkImageLayout { VK_IMAGE_LAYOUT_SHARED_PRESENT_KHR = 1000111000, VK_IMAGE_LAYOUT_FRAGMENT_DENSITY_MAP_OPTIMAL_EXT = 1000218000, VK_IMAGE_LAYOUT_FRAGMENT_SHADING_RATE_ATTACHMENT_OPTIMAL_KHR = 1000164003, -#ifdef VK_ENABLE_BETA_EXTENSIONS + VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ_KHR = 1000232000, VK_IMAGE_LAYOUT_VIDEO_ENCODE_DST_KHR = 1000299000, -#endif -#ifdef VK_ENABLE_BETA_EXTENSIONS VK_IMAGE_LAYOUT_VIDEO_ENCODE_SRC_KHR = 1000299001, -#endif -#ifdef VK_ENABLE_BETA_EXTENSIONS VK_IMAGE_LAYOUT_VIDEO_ENCODE_DPB_KHR = 1000299002, -#endif VK_IMAGE_LAYOUT_ATTACHMENT_FEEDBACK_LOOP_OPTIMAL_EXT = 1000339000, VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_OPTIMAL_KHR = VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_OPTIMAL, VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY_OPTIMAL_KHR = VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY_OPTIMAL, @@ -1391,6 +1389,8 @@ typedef enum VkObjectType { VK_OBJECT_TYPE_PERFORMANCE_CONFIGURATION_INTEL = 1000210000, VK_OBJECT_TYPE_DEFERRED_OPERATION_KHR = 1000268000, VK_OBJECT_TYPE_INDIRECT_COMMANDS_LAYOUT_NV = 1000277000, + VK_OBJECT_TYPE_CUDA_MODULE_NV = 1000307000, + VK_OBJECT_TYPE_CUDA_FUNCTION_NV = 1000307001, VK_OBJECT_TYPE_BUFFER_COLLECTION_FUCHSIA = 1000366000, VK_OBJECT_TYPE_MICROMAP_EXT = 1000396000, VK_OBJECT_TYPE_OPTICAL_FLOW_SESSION_NV = 1000464000, @@ -1768,9 +1768,7 @@ typedef enum VkQueryType { VK_QUERY_TYPE_ACCELERATION_STRUCTURE_SERIALIZATION_SIZE_KHR = 1000150001, VK_QUERY_TYPE_ACCELERATION_STRUCTURE_COMPACTED_SIZE_NV = 1000165000, VK_QUERY_TYPE_PERFORMANCE_QUERY_INTEL = 1000210000, -#ifdef VK_ENABLE_BETA_EXTENSIONS VK_QUERY_TYPE_VIDEO_ENCODE_FEEDBACK_KHR = 1000299000, -#endif VK_QUERY_TYPE_MESH_PRIMITIVES_GENERATED_EXT = 1000328000, VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT = 1000382000, VK_QUERY_TYPE_ACCELERATION_STRUCTURE_SERIALIZATION_BOTTOM_LEVEL_POINTERS_KHR = 1000386000, @@ -1934,12 +1932,10 @@ typedef enum VkDynamicState { VK_DYNAMIC_STATE_EXCLUSIVE_SCISSOR_ENABLE_NV = 1000205000, VK_DYNAMIC_STATE_EXCLUSIVE_SCISSOR_NV = 1000205001, VK_DYNAMIC_STATE_FRAGMENT_SHADING_RATE_KHR = 1000226000, - VK_DYNAMIC_STATE_LINE_STIPPLE_EXT = 1000259000, VK_DYNAMIC_STATE_VERTEX_INPUT_EXT = 1000352000, VK_DYNAMIC_STATE_PATCH_CONTROL_POINTS_EXT = 1000377000, VK_DYNAMIC_STATE_LOGIC_OP_EXT = 1000377003, VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT = 1000381000, - VK_DYNAMIC_STATE_TESSELLATION_DOMAIN_ORIGIN_EXT = 1000455002, VK_DYNAMIC_STATE_DEPTH_CLAMP_ENABLE_EXT = 1000455003, VK_DYNAMIC_STATE_POLYGON_MODE_EXT = 1000455004, VK_DYNAMIC_STATE_RASTERIZATION_SAMPLES_EXT = 1000455005, @@ -1950,6 +1946,7 @@ typedef enum VkDynamicState { VK_DYNAMIC_STATE_COLOR_BLEND_ENABLE_EXT = 1000455010, VK_DYNAMIC_STATE_COLOR_BLEND_EQUATION_EXT = 1000455011, VK_DYNAMIC_STATE_COLOR_WRITE_MASK_EXT = 1000455012, + VK_DYNAMIC_STATE_TESSELLATION_DOMAIN_ORIGIN_EXT = 1000455002, VK_DYNAMIC_STATE_RASTERIZATION_STREAM_EXT = 1000455013, VK_DYNAMIC_STATE_CONSERVATIVE_RASTERIZATION_MODE_EXT = 1000455014, VK_DYNAMIC_STATE_EXTRA_PRIMITIVE_OVERESTIMATION_SIZE_EXT = 1000455015, @@ -1971,6 +1968,8 @@ typedef enum VkDynamicState { VK_DYNAMIC_STATE_REPRESENTATIVE_FRAGMENT_TEST_ENABLE_NV = 1000455031, VK_DYNAMIC_STATE_COVERAGE_REDUCTION_MODE_NV = 1000455032, VK_DYNAMIC_STATE_ATTACHMENT_FEEDBACK_LOOP_ENABLE_EXT = 1000524000, + VK_DYNAMIC_STATE_LINE_STIPPLE_KHR = 1000259000, + VK_DYNAMIC_STATE_LINE_STIPPLE_EXT = VK_DYNAMIC_STATE_LINE_STIPPLE_KHR, VK_DYNAMIC_STATE_CULL_MODE_EXT = VK_DYNAMIC_STATE_CULL_MODE, VK_DYNAMIC_STATE_FRONT_FACE_EXT = VK_DYNAMIC_STATE_FRONT_FACE, VK_DYNAMIC_STATE_PRIMITIVE_TOPOLOGY_EXT = VK_DYNAMIC_STATE_PRIMITIVE_TOPOLOGY, @@ -2119,7 +2118,8 @@ typedef enum VkAttachmentLoadOp { VK_ATTACHMENT_LOAD_OP_LOAD = 0, VK_ATTACHMENT_LOAD_OP_CLEAR = 1, VK_ATTACHMENT_LOAD_OP_DONT_CARE = 2, - VK_ATTACHMENT_LOAD_OP_NONE_EXT = 1000400000, + VK_ATTACHMENT_LOAD_OP_NONE_KHR = 1000400000, + VK_ATTACHMENT_LOAD_OP_NONE_EXT = VK_ATTACHMENT_LOAD_OP_NONE_KHR, VK_ATTACHMENT_LOAD_OP_MAX_ENUM = 0x7FFFFFFF } VkAttachmentLoadOp; @@ -2155,14 +2155,16 @@ typedef enum VkIndexType { VK_INDEX_TYPE_UINT16 = 0, VK_INDEX_TYPE_UINT32 = 1, VK_INDEX_TYPE_NONE_KHR = 1000165000, - VK_INDEX_TYPE_UINT8_EXT = 1000265000, + VK_INDEX_TYPE_UINT8_KHR = 1000265000, VK_INDEX_TYPE_NONE_NV = VK_INDEX_TYPE_NONE_KHR, + VK_INDEX_TYPE_UINT8_EXT = VK_INDEX_TYPE_UINT8_KHR, VK_INDEX_TYPE_MAX_ENUM = 0x7FFFFFFF } VkIndexType; typedef enum VkSubpassContents { VK_SUBPASS_CONTENTS_INLINE = 0, VK_SUBPASS_CONTENTS_SECONDARY_COMMAND_BUFFERS = 1, + VK_SUBPASS_CONTENTS_INLINE_AND_SECONDARY_COMMAND_BUFFERS_EXT = 1000451000, VK_SUBPASS_CONTENTS_MAX_ENUM = 0x7FFFFFFF } VkSubpassContents; @@ -2255,12 +2257,8 @@ typedef enum VkFormatFeatureFlagBits { VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_CUBIC_BIT_EXT = 0x00002000, VK_FORMAT_FEATURE_FRAGMENT_DENSITY_MAP_BIT_EXT = 0x01000000, VK_FORMAT_FEATURE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR = 0x40000000, -#ifdef VK_ENABLE_BETA_EXTENSIONS VK_FORMAT_FEATURE_VIDEO_ENCODE_INPUT_BIT_KHR = 0x08000000, -#endif -#ifdef VK_ENABLE_BETA_EXTENSIONS VK_FORMAT_FEATURE_VIDEO_ENCODE_DPB_BIT_KHR = 0x10000000, -#endif VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_CUBIC_BIT_IMG = VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_CUBIC_BIT_EXT, VK_FORMAT_FEATURE_TRANSFER_SRC_BIT_KHR = VK_FORMAT_FEATURE_TRANSFER_SRC_BIT, VK_FORMAT_FEATURE_TRANSFER_DST_BIT_KHR = VK_FORMAT_FEATURE_TRANSFER_DST_BIT, @@ -2296,6 +2294,7 @@ typedef enum VkImageCreateFlagBits { VK_IMAGE_CREATE_MULTISAMPLED_RENDER_TO_SINGLE_SAMPLED_BIT_EXT = 0x00040000, VK_IMAGE_CREATE_2D_VIEW_COMPATIBLE_BIT_EXT = 0x00020000, VK_IMAGE_CREATE_FRAGMENT_DENSITY_MAP_OFFSET_BIT_QCOM = 0x00008000, + VK_IMAGE_CREATE_VIDEO_PROFILE_INDEPENDENT_BIT_KHR = 0x00100000, VK_IMAGE_CREATE_SPLIT_INSTANCE_BIND_REGIONS_BIT_KHR = VK_IMAGE_CREATE_SPLIT_INSTANCE_BIND_REGIONS_BIT, VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT_KHR = VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT, VK_IMAGE_CREATE_BLOCK_TEXEL_VIEW_COMPATIBLE_BIT_KHR = VK_IMAGE_CREATE_BLOCK_TEXEL_VIEW_COMPATIBLE_BIT, @@ -2333,15 +2332,9 @@ typedef enum VkImageUsageFlagBits { VK_IMAGE_USAGE_FRAGMENT_DENSITY_MAP_BIT_EXT = 0x00000200, VK_IMAGE_USAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR = 0x00000100, VK_IMAGE_USAGE_HOST_TRANSFER_BIT_EXT = 0x00400000, -#ifdef VK_ENABLE_BETA_EXTENSIONS VK_IMAGE_USAGE_VIDEO_ENCODE_DST_BIT_KHR = 0x00002000, -#endif -#ifdef VK_ENABLE_BETA_EXTENSIONS VK_IMAGE_USAGE_VIDEO_ENCODE_SRC_BIT_KHR = 0x00004000, -#endif -#ifdef VK_ENABLE_BETA_EXTENSIONS VK_IMAGE_USAGE_VIDEO_ENCODE_DPB_BIT_KHR = 0x00008000, -#endif VK_IMAGE_USAGE_ATTACHMENT_FEEDBACK_LOOP_BIT_EXT = 0x00080000, VK_IMAGE_USAGE_INVOCATION_MASK_BIT_HUAWEI = 0x00040000, VK_IMAGE_USAGE_SAMPLE_WEIGHT_BIT_QCOM = 0x00100000, @@ -2386,9 +2379,7 @@ typedef enum VkQueueFlagBits { VK_QUEUE_SPARSE_BINDING_BIT = 0x00000008, VK_QUEUE_PROTECTED_BIT = 0x00000010, VK_QUEUE_VIDEO_DECODE_BIT_KHR = 0x00000020, -#ifdef VK_ENABLE_BETA_EXTENSIONS VK_QUEUE_VIDEO_ENCODE_BIT_KHR = 0x00000040, -#endif VK_QUEUE_OPTICAL_FLOW_BIT_NV = 0x00000100, VK_QUEUE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF } VkQueueFlagBits; @@ -2438,6 +2429,11 @@ typedef enum VkPipelineStageFlagBits { VK_PIPELINE_STAGE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF } VkPipelineStageFlagBits; typedef VkFlags VkPipelineStageFlags; + +typedef enum VkMemoryMapFlagBits { + VK_MEMORY_MAP_PLACED_BIT_EXT = 0x00000001, + VK_MEMORY_MAP_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF +} VkMemoryMapFlagBits; typedef VkFlags VkMemoryMapFlags; typedef enum VkSparseMemoryBindFlagBits { @@ -2505,6 +2501,7 @@ typedef enum VkBufferCreateFlagBits { VK_BUFFER_CREATE_PROTECTED_BIT = 0x00000008, VK_BUFFER_CREATE_DEVICE_ADDRESS_CAPTURE_REPLAY_BIT = 0x00000010, VK_BUFFER_CREATE_DESCRIPTOR_BUFFER_CAPTURE_REPLAY_BIT_EXT = 0x00000020, + VK_BUFFER_CREATE_VIDEO_PROFILE_INDEPENDENT_BIT_KHR = 0x00000040, VK_BUFFER_CREATE_DEVICE_ADDRESS_CAPTURE_REPLAY_BIT_EXT = VK_BUFFER_CREATE_DEVICE_ADDRESS_CAPTURE_REPLAY_BIT, VK_BUFFER_CREATE_DEVICE_ADDRESS_CAPTURE_REPLAY_BIT_KHR = VK_BUFFER_CREATE_DEVICE_ADDRESS_CAPTURE_REPLAY_BIT, VK_BUFFER_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF @@ -2533,12 +2530,8 @@ typedef enum VkBufferUsageFlagBits { VK_BUFFER_USAGE_ACCELERATION_STRUCTURE_BUILD_INPUT_READ_ONLY_BIT_KHR = 0x00080000, VK_BUFFER_USAGE_ACCELERATION_STRUCTURE_STORAGE_BIT_KHR = 0x00100000, VK_BUFFER_USAGE_SHADER_BINDING_TABLE_BIT_KHR = 0x00000400, -#ifdef VK_ENABLE_BETA_EXTENSIONS VK_BUFFER_USAGE_VIDEO_ENCODE_DST_BIT_KHR = 0x00008000, -#endif -#ifdef VK_ENABLE_BETA_EXTENSIONS VK_BUFFER_USAGE_VIDEO_ENCODE_SRC_BIT_KHR = 0x00010000, -#endif VK_BUFFER_USAGE_SAMPLER_DESCRIPTOR_BUFFER_BIT_EXT = 0x00200000, VK_BUFFER_USAGE_RESOURCE_DESCRIPTOR_BUFFER_BIT_EXT = 0x00400000, VK_BUFFER_USAGE_PUSH_DESCRIPTORS_DESCRIPTOR_BUFFER_BIT_EXT = 0x04000000, @@ -2714,6 +2707,8 @@ typedef enum VkDescriptorPoolCreateFlagBits { VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT = 0x00000001, VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT = 0x00000002, VK_DESCRIPTOR_POOL_CREATE_HOST_ONLY_BIT_EXT = 0x00000004, + VK_DESCRIPTOR_POOL_CREATE_ALLOW_OVERALLOCATION_SETS_BIT_NV = 0x00000008, + VK_DESCRIPTOR_POOL_CREATE_ALLOW_OVERALLOCATION_POOLS_BIT_NV = 0x00000010, VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT_EXT = VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT, VK_DESCRIPTOR_POOL_CREATE_HOST_ONLY_BIT_VALVE = VK_DESCRIPTOR_POOL_CREATE_HOST_ONLY_BIT_EXT, VK_DESCRIPTOR_POOL_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF @@ -2728,6 +2723,7 @@ typedef enum VkDescriptorSetLayoutCreateFlagBits { VK_DESCRIPTOR_SET_LAYOUT_CREATE_EMBEDDED_IMMUTABLE_SAMPLERS_BIT_EXT = 0x00000020, VK_DESCRIPTOR_SET_LAYOUT_CREATE_INDIRECT_BINDABLE_BIT_NV = 0x00000080, VK_DESCRIPTOR_SET_LAYOUT_CREATE_HOST_ONLY_POOL_BIT_EXT = 0x00000004, + VK_DESCRIPTOR_SET_LAYOUT_CREATE_PER_STAGE_BIT_NV = 0x00000040, VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT_EXT = VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT, VK_DESCRIPTOR_SET_LAYOUT_CREATE_HOST_ONLY_POOL_BIT_VALVE = VK_DESCRIPTOR_SET_LAYOUT_CREATE_HOST_ONLY_POOL_BIT_EXT, VK_DESCRIPTOR_SET_LAYOUT_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF @@ -4957,6 +4953,8 @@ typedef enum VkSubgroupFeatureFlagBits { VK_SUBGROUP_FEATURE_CLUSTERED_BIT = 0x00000040, VK_SUBGROUP_FEATURE_QUAD_BIT = 0x00000080, VK_SUBGROUP_FEATURE_PARTITIONED_BIT_NV = 0x00000100, + VK_SUBGROUP_FEATURE_ROTATE_BIT_KHR = 0x00000200, + VK_SUBGROUP_FEATURE_ROTATE_CLUSTERED_BIT_KHR = 0x00000400, VK_SUBGROUP_FEATURE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF } VkSubgroupFeatureFlagBits; typedef VkFlags VkSubgroupFeatureFlags; @@ -5784,6 +5782,7 @@ typedef enum VkDriverId { VK_DRIVER_ID_MESA_DOZEN = 23, VK_DRIVER_ID_MESA_NVK = 24, VK_DRIVER_ID_IMAGINATION_OPEN_SOURCE_MESA = 25, + VK_DRIVER_ID_MESA_AGXV = 26, VK_DRIVER_ID_AMD_PROPRIETARY_KHR = VK_DRIVER_ID_AMD_PROPRIETARY, VK_DRIVER_ID_AMD_OPEN_SOURCE_KHR = VK_DRIVER_ID_AMD_OPEN_SOURCE, VK_DRIVER_ID_MESA_RADV_KHR = VK_DRIVER_ID_MESA_RADV, @@ -5813,6 +5812,7 @@ typedef enum VkSamplerReductionMode { VK_SAMPLER_REDUCTION_MODE_WEIGHTED_AVERAGE = 0, VK_SAMPLER_REDUCTION_MODE_MIN = 1, VK_SAMPLER_REDUCTION_MODE_MAX = 2, + VK_SAMPLER_REDUCTION_MODE_WEIGHTED_AVERAGE_RANGECLAMP_QCOM = 1000521000, VK_SAMPLER_REDUCTION_MODE_WEIGHTED_AVERAGE_EXT = VK_SAMPLER_REDUCTION_MODE_WEIGHTED_AVERAGE, VK_SAMPLER_REDUCTION_MODE_MIN_EXT = VK_SAMPLER_REDUCTION_MODE_MIN, VK_SAMPLER_REDUCTION_MODE_MAX_EXT = VK_SAMPLER_REDUCTION_MODE_MAX, @@ -5833,6 +5833,7 @@ typedef enum VkResolveModeFlagBits { VK_RESOLVE_MODE_AVERAGE_BIT = 0x00000002, VK_RESOLVE_MODE_MIN_BIT = 0x00000004, VK_RESOLVE_MODE_MAX_BIT = 0x00000008, + VK_RESOLVE_MODE_EXTERNAL_FORMAT_DOWNSAMPLE_ANDROID = 0x00000010, VK_RESOLVE_MODE_NONE_KHR = VK_RESOLVE_MODE_NONE, VK_RESOLVE_MODE_SAMPLE_ZERO_BIT_KHR = VK_RESOLVE_MODE_SAMPLE_ZERO_BIT, VK_RESOLVE_MODE_AVERAGE_BIT_KHR = VK_RESOLVE_MODE_AVERAGE_BIT, @@ -6598,9 +6599,7 @@ static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_VERTEX_ATTRIBUTE_INPUT static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_PRE_RASTERIZATION_SHADERS_BIT = 0x4000000000ULL; static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_PRE_RASTERIZATION_SHADERS_BIT_KHR = 0x4000000000ULL; static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_VIDEO_DECODE_BIT_KHR = 0x04000000ULL; -#ifdef VK_ENABLE_BETA_EXTENSIONS static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_VIDEO_ENCODE_BIT_KHR = 0x08000000ULL; -#endif static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_TRANSFORM_FEEDBACK_BIT_EXT = 0x01000000ULL; static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_CONDITIONAL_RENDERING_BIT_EXT = 0x00040000ULL; static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_COMMAND_PREPROCESS_BIT_NV = 0x00020000ULL; @@ -6671,12 +6670,8 @@ static const VkAccessFlagBits2 VK_ACCESS_2_SHADER_STORAGE_WRITE_BIT = 0x40000000 static const VkAccessFlagBits2 VK_ACCESS_2_SHADER_STORAGE_WRITE_BIT_KHR = 0x400000000ULL; static const VkAccessFlagBits2 VK_ACCESS_2_VIDEO_DECODE_READ_BIT_KHR = 0x800000000ULL; static const VkAccessFlagBits2 VK_ACCESS_2_VIDEO_DECODE_WRITE_BIT_KHR = 0x1000000000ULL; -#ifdef VK_ENABLE_BETA_EXTENSIONS static const VkAccessFlagBits2 VK_ACCESS_2_VIDEO_ENCODE_READ_BIT_KHR = 0x2000000000ULL; -#endif -#ifdef VK_ENABLE_BETA_EXTENSIONS static const VkAccessFlagBits2 VK_ACCESS_2_VIDEO_ENCODE_WRITE_BIT_KHR = 0x4000000000ULL; -#endif static const VkAccessFlagBits2 VK_ACCESS_2_TRANSFORM_FEEDBACK_WRITE_BIT_EXT = 0x02000000ULL; static const VkAccessFlagBits2 VK_ACCESS_2_TRANSFORM_FEEDBACK_COUNTER_READ_BIT_EXT = 0x04000000ULL; static const VkAccessFlagBits2 VK_ACCESS_2_TRANSFORM_FEEDBACK_COUNTER_WRITE_BIT_EXT = 0x08000000ULL; @@ -6711,6 +6706,7 @@ typedef enum VkRenderingFlagBits { VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT = 0x00000001, VK_RENDERING_SUSPENDING_BIT = 0x00000002, VK_RENDERING_RESUMING_BIT = 0x00000004, + VK_RENDERING_CONTENTS_INLINE_BIT_EXT = 0x00000010, VK_RENDERING_ENABLE_LEGACY_DITHERING_BIT_EXT = 0x00000008, VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT_KHR = VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT, VK_RENDERING_SUSPENDING_BIT_KHR = VK_RENDERING_SUSPENDING_BIT, @@ -6782,12 +6778,8 @@ static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_ACCELERATION_STRUCTURE static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_FRAGMENT_DENSITY_MAP_BIT_EXT = 0x01000000ULL; static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR = 0x40000000ULL; static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_HOST_IMAGE_TRANSFER_BIT_EXT = 0x400000000000ULL; -#ifdef VK_ENABLE_BETA_EXTENSIONS static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_VIDEO_ENCODE_INPUT_BIT_KHR = 0x08000000ULL; -#endif -#ifdef VK_ENABLE_BETA_EXTENSIONS static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_VIDEO_ENCODE_DPB_BIT_KHR = 0x10000000ULL; -#endif static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_LINEAR_COLOR_ATTACHMENT_BIT_NV = 0x4000000000ULL; static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_WEIGHT_IMAGE_BIT_QCOM = 0x400000000ULL; static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_WEIGHT_SAMPLED_IMAGE_BIT_QCOM = 0x800000000ULL; @@ -7992,19 +7984,17 @@ typedef enum VkQueryResultStatusKHR { VK_QUERY_RESULT_STATUS_ERROR_KHR = -1, VK_QUERY_RESULT_STATUS_NOT_READY_KHR = 0, VK_QUERY_RESULT_STATUS_COMPLETE_KHR = 1, + VK_QUERY_RESULT_STATUS_INSUFFICIENT_BITSTREAM_BUFFER_RANGE_KHR = -1000299000, VK_QUERY_RESULT_STATUS_MAX_ENUM_KHR = 0x7FFFFFFF } VkQueryResultStatusKHR; typedef enum VkVideoCodecOperationFlagBitsKHR { VK_VIDEO_CODEC_OPERATION_NONE_KHR = 0, -#ifdef VK_ENABLE_BETA_EXTENSIONS - VK_VIDEO_CODEC_OPERATION_ENCODE_H264_BIT_EXT = 0x00010000, -#endif -#ifdef VK_ENABLE_BETA_EXTENSIONS - VK_VIDEO_CODEC_OPERATION_ENCODE_H265_BIT_EXT = 0x00020000, -#endif + VK_VIDEO_CODEC_OPERATION_ENCODE_H264_BIT_KHR = 0x00010000, + VK_VIDEO_CODEC_OPERATION_ENCODE_H265_BIT_KHR = 0x00020000, VK_VIDEO_CODEC_OPERATION_DECODE_H264_BIT_KHR = 0x00000001, VK_VIDEO_CODEC_OPERATION_DECODE_H265_BIT_KHR = 0x00000002, + VK_VIDEO_CODEC_OPERATION_DECODE_AV1_BIT_KHR = 0x00000004, VK_VIDEO_CODEC_OPERATION_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF } VkVideoCodecOperationFlagBitsKHR; typedef VkFlags VkVideoCodecOperationFlagsKHR; @@ -8037,9 +8027,8 @@ typedef VkFlags VkVideoCapabilityFlagsKHR; typedef enum VkVideoSessionCreateFlagBitsKHR { VK_VIDEO_SESSION_CREATE_PROTECTED_CONTENT_BIT_KHR = 0x00000001, -#ifdef VK_ENABLE_BETA_EXTENSIONS VK_VIDEO_SESSION_CREATE_ALLOW_ENCODE_PARAMETER_OPTIMIZATIONS_BIT_KHR = 0x00000002, -#endif + VK_VIDEO_SESSION_CREATE_INLINE_QUERIES_BIT_KHR = 0x00000004, VK_VIDEO_SESSION_CREATE_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF } VkVideoSessionCreateFlagBitsKHR; typedef VkFlags VkVideoSessionCreateFlagsKHR; @@ -8049,12 +8038,8 @@ typedef VkFlags VkVideoEndCodingFlagsKHR; typedef enum VkVideoCodingControlFlagBitsKHR { VK_VIDEO_CODING_CONTROL_RESET_BIT_KHR = 0x00000001, -#ifdef VK_ENABLE_BETA_EXTENSIONS VK_VIDEO_CODING_CONTROL_ENCODE_RATE_CONTROL_BIT_KHR = 0x00000002, -#endif -#ifdef VK_ENABLE_BETA_EXTENSIONS VK_VIDEO_CODING_CONTROL_ENCODE_QUALITY_LEVEL_BIT_KHR = 0x00000004, -#endif VK_VIDEO_CODING_CONTROL_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF } VkVideoCodingControlFlagBitsKHR; typedef VkFlags VkVideoCodingControlFlagsKHR; @@ -8279,7 +8264,7 @@ VKAPI_ATTR void VKAPI_CALL vkCmdControlVideoCodingKHR( // VK_KHR_video_decode_queue is a preprocessor guard. Do not pass it to API calls. #define VK_KHR_video_decode_queue 1 -#define VK_KHR_VIDEO_DECODE_QUEUE_SPEC_VERSION 7 +#define VK_KHR_VIDEO_DECODE_QUEUE_SPEC_VERSION 8 #define VK_KHR_VIDEO_DECODE_QUEUE_EXTENSION_NAME "VK_KHR_video_decode_queue" typedef enum VkVideoDecodeCapabilityFlagBitsKHR { @@ -8332,11 +8317,434 @@ VKAPI_ATTR void VKAPI_CALL vkCmdDecodeVideoKHR( #endif +// VK_KHR_video_encode_h264 is a preprocessor guard. Do not pass it to API calls. +#define VK_KHR_video_encode_h264 1 +#include "vk_video/vulkan_video_codec_h264std.h" +#include "vk_video/vulkan_video_codec_h264std_encode.h" +#define VK_KHR_VIDEO_ENCODE_H264_SPEC_VERSION 14 +#define VK_KHR_VIDEO_ENCODE_H264_EXTENSION_NAME "VK_KHR_video_encode_h264" + +typedef enum VkVideoEncodeH264CapabilityFlagBitsKHR { + VK_VIDEO_ENCODE_H264_CAPABILITY_HRD_COMPLIANCE_BIT_KHR = 0x00000001, + VK_VIDEO_ENCODE_H264_CAPABILITY_PREDICTION_WEIGHT_TABLE_GENERATED_BIT_KHR = 0x00000002, + VK_VIDEO_ENCODE_H264_CAPABILITY_ROW_UNALIGNED_SLICE_BIT_KHR = 0x00000004, + VK_VIDEO_ENCODE_H264_CAPABILITY_DIFFERENT_SLICE_TYPE_BIT_KHR = 0x00000008, + VK_VIDEO_ENCODE_H264_CAPABILITY_B_FRAME_IN_L0_LIST_BIT_KHR = 0x00000010, + VK_VIDEO_ENCODE_H264_CAPABILITY_B_FRAME_IN_L1_LIST_BIT_KHR = 0x00000020, + VK_VIDEO_ENCODE_H264_CAPABILITY_PER_PICTURE_TYPE_MIN_MAX_QP_BIT_KHR = 0x00000040, + VK_VIDEO_ENCODE_H264_CAPABILITY_PER_SLICE_CONSTANT_QP_BIT_KHR = 0x00000080, + VK_VIDEO_ENCODE_H264_CAPABILITY_GENERATE_PREFIX_NALU_BIT_KHR = 0x00000100, + VK_VIDEO_ENCODE_H264_CAPABILITY_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF +} VkVideoEncodeH264CapabilityFlagBitsKHR; +typedef VkFlags VkVideoEncodeH264CapabilityFlagsKHR; + +typedef enum VkVideoEncodeH264StdFlagBitsKHR { + VK_VIDEO_ENCODE_H264_STD_SEPARATE_COLOR_PLANE_FLAG_SET_BIT_KHR = 0x00000001, + VK_VIDEO_ENCODE_H264_STD_QPPRIME_Y_ZERO_TRANSFORM_BYPASS_FLAG_SET_BIT_KHR = 0x00000002, + VK_VIDEO_ENCODE_H264_STD_SCALING_MATRIX_PRESENT_FLAG_SET_BIT_KHR = 0x00000004, + VK_VIDEO_ENCODE_H264_STD_CHROMA_QP_INDEX_OFFSET_BIT_KHR = 0x00000008, + VK_VIDEO_ENCODE_H264_STD_SECOND_CHROMA_QP_INDEX_OFFSET_BIT_KHR = 0x00000010, + VK_VIDEO_ENCODE_H264_STD_PIC_INIT_QP_MINUS26_BIT_KHR = 0x00000020, + VK_VIDEO_ENCODE_H264_STD_WEIGHTED_PRED_FLAG_SET_BIT_KHR = 0x00000040, + VK_VIDEO_ENCODE_H264_STD_WEIGHTED_BIPRED_IDC_EXPLICIT_BIT_KHR = 0x00000080, + VK_VIDEO_ENCODE_H264_STD_WEIGHTED_BIPRED_IDC_IMPLICIT_BIT_KHR = 0x00000100, + VK_VIDEO_ENCODE_H264_STD_TRANSFORM_8X8_MODE_FLAG_SET_BIT_KHR = 0x00000200, + VK_VIDEO_ENCODE_H264_STD_DIRECT_SPATIAL_MV_PRED_FLAG_UNSET_BIT_KHR = 0x00000400, + VK_VIDEO_ENCODE_H264_STD_ENTROPY_CODING_MODE_FLAG_UNSET_BIT_KHR = 0x00000800, + VK_VIDEO_ENCODE_H264_STD_ENTROPY_CODING_MODE_FLAG_SET_BIT_KHR = 0x00001000, + VK_VIDEO_ENCODE_H264_STD_DIRECT_8X8_INFERENCE_FLAG_UNSET_BIT_KHR = 0x00002000, + VK_VIDEO_ENCODE_H264_STD_CONSTRAINED_INTRA_PRED_FLAG_SET_BIT_KHR = 0x00004000, + VK_VIDEO_ENCODE_H264_STD_DEBLOCKING_FILTER_DISABLED_BIT_KHR = 0x00008000, + VK_VIDEO_ENCODE_H264_STD_DEBLOCKING_FILTER_ENABLED_BIT_KHR = 0x00010000, + VK_VIDEO_ENCODE_H264_STD_DEBLOCKING_FILTER_PARTIAL_BIT_KHR = 0x00020000, + VK_VIDEO_ENCODE_H264_STD_SLICE_QP_DELTA_BIT_KHR = 0x00080000, + VK_VIDEO_ENCODE_H264_STD_DIFFERENT_SLICE_QP_DELTA_BIT_KHR = 0x00100000, + VK_VIDEO_ENCODE_H264_STD_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF +} VkVideoEncodeH264StdFlagBitsKHR; +typedef VkFlags VkVideoEncodeH264StdFlagsKHR; + +typedef enum VkVideoEncodeH264RateControlFlagBitsKHR { + VK_VIDEO_ENCODE_H264_RATE_CONTROL_ATTEMPT_HRD_COMPLIANCE_BIT_KHR = 0x00000001, + VK_VIDEO_ENCODE_H264_RATE_CONTROL_REGULAR_GOP_BIT_KHR = 0x00000002, + VK_VIDEO_ENCODE_H264_RATE_CONTROL_REFERENCE_PATTERN_FLAT_BIT_KHR = 0x00000004, + VK_VIDEO_ENCODE_H264_RATE_CONTROL_REFERENCE_PATTERN_DYADIC_BIT_KHR = 0x00000008, + VK_VIDEO_ENCODE_H264_RATE_CONTROL_TEMPORAL_LAYER_PATTERN_DYADIC_BIT_KHR = 0x00000010, + VK_VIDEO_ENCODE_H264_RATE_CONTROL_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF +} VkVideoEncodeH264RateControlFlagBitsKHR; +typedef VkFlags VkVideoEncodeH264RateControlFlagsKHR; +typedef struct VkVideoEncodeH264CapabilitiesKHR { + VkStructureType sType; + void* pNext; + VkVideoEncodeH264CapabilityFlagsKHR flags; + StdVideoH264LevelIdc maxLevelIdc; + uint32_t maxSliceCount; + uint32_t maxPPictureL0ReferenceCount; + uint32_t maxBPictureL0ReferenceCount; + uint32_t maxL1ReferenceCount; + uint32_t maxTemporalLayerCount; + VkBool32 expectDyadicTemporalLayerPattern; + int32_t minQp; + int32_t maxQp; + VkBool32 prefersGopRemainingFrames; + VkBool32 requiresGopRemainingFrames; + VkVideoEncodeH264StdFlagsKHR stdSyntaxFlags; +} VkVideoEncodeH264CapabilitiesKHR; + +typedef struct VkVideoEncodeH264QpKHR { + int32_t qpI; + int32_t qpP; + int32_t qpB; +} VkVideoEncodeH264QpKHR; + +typedef struct VkVideoEncodeH264QualityLevelPropertiesKHR { + VkStructureType sType; + void* pNext; + VkVideoEncodeH264RateControlFlagsKHR preferredRateControlFlags; + uint32_t preferredGopFrameCount; + uint32_t preferredIdrPeriod; + uint32_t preferredConsecutiveBFrameCount; + uint32_t preferredTemporalLayerCount; + VkVideoEncodeH264QpKHR preferredConstantQp; + uint32_t preferredMaxL0ReferenceCount; + uint32_t preferredMaxL1ReferenceCount; + VkBool32 preferredStdEntropyCodingModeFlag; +} VkVideoEncodeH264QualityLevelPropertiesKHR; + +typedef struct VkVideoEncodeH264SessionCreateInfoKHR { + VkStructureType sType; + const void* pNext; + VkBool32 useMaxLevelIdc; + StdVideoH264LevelIdc maxLevelIdc; +} VkVideoEncodeH264SessionCreateInfoKHR; + +typedef struct VkVideoEncodeH264SessionParametersAddInfoKHR { + VkStructureType sType; + const void* pNext; + uint32_t stdSPSCount; + const StdVideoH264SequenceParameterSet* pStdSPSs; + uint32_t stdPPSCount; + const StdVideoH264PictureParameterSet* pStdPPSs; +} VkVideoEncodeH264SessionParametersAddInfoKHR; + +typedef struct VkVideoEncodeH264SessionParametersCreateInfoKHR { + VkStructureType sType; + const void* pNext; + uint32_t maxStdSPSCount; + uint32_t maxStdPPSCount; + const VkVideoEncodeH264SessionParametersAddInfoKHR* pParametersAddInfo; +} VkVideoEncodeH264SessionParametersCreateInfoKHR; + +typedef struct VkVideoEncodeH264SessionParametersGetInfoKHR { + VkStructureType sType; + const void* pNext; + VkBool32 writeStdSPS; + VkBool32 writeStdPPS; + uint32_t stdSPSId; + uint32_t stdPPSId; +} VkVideoEncodeH264SessionParametersGetInfoKHR; + +typedef struct VkVideoEncodeH264SessionParametersFeedbackInfoKHR { + VkStructureType sType; + void* pNext; + VkBool32 hasStdSPSOverrides; + VkBool32 hasStdPPSOverrides; +} VkVideoEncodeH264SessionParametersFeedbackInfoKHR; + +typedef struct VkVideoEncodeH264NaluSliceInfoKHR { + VkStructureType sType; + const void* pNext; + int32_t constantQp; + const StdVideoEncodeH264SliceHeader* pStdSliceHeader; +} VkVideoEncodeH264NaluSliceInfoKHR; + +typedef struct VkVideoEncodeH264PictureInfoKHR { + VkStructureType sType; + const void* pNext; + uint32_t naluSliceEntryCount; + const VkVideoEncodeH264NaluSliceInfoKHR* pNaluSliceEntries; + const StdVideoEncodeH264PictureInfo* pStdPictureInfo; + VkBool32 generatePrefixNalu; +} VkVideoEncodeH264PictureInfoKHR; + +typedef struct VkVideoEncodeH264DpbSlotInfoKHR { + VkStructureType sType; + const void* pNext; + const StdVideoEncodeH264ReferenceInfo* pStdReferenceInfo; +} VkVideoEncodeH264DpbSlotInfoKHR; + +typedef struct VkVideoEncodeH264ProfileInfoKHR { + VkStructureType sType; + const void* pNext; + StdVideoH264ProfileIdc stdProfileIdc; +} VkVideoEncodeH264ProfileInfoKHR; + +typedef struct VkVideoEncodeH264RateControlInfoKHR { + VkStructureType sType; + const void* pNext; + VkVideoEncodeH264RateControlFlagsKHR flags; + uint32_t gopFrameCount; + uint32_t idrPeriod; + uint32_t consecutiveBFrameCount; + uint32_t temporalLayerCount; +} VkVideoEncodeH264RateControlInfoKHR; + +typedef struct VkVideoEncodeH264FrameSizeKHR { + uint32_t frameISize; + uint32_t framePSize; + uint32_t frameBSize; +} VkVideoEncodeH264FrameSizeKHR; + +typedef struct VkVideoEncodeH264RateControlLayerInfoKHR { + VkStructureType sType; + const void* pNext; + VkBool32 useMinQp; + VkVideoEncodeH264QpKHR minQp; + VkBool32 useMaxQp; + VkVideoEncodeH264QpKHR maxQp; + VkBool32 useMaxFrameSize; + VkVideoEncodeH264FrameSizeKHR maxFrameSize; +} VkVideoEncodeH264RateControlLayerInfoKHR; + +typedef struct VkVideoEncodeH264GopRemainingFrameInfoKHR { + VkStructureType sType; + const void* pNext; + VkBool32 useGopRemainingFrames; + uint32_t gopRemainingI; + uint32_t gopRemainingP; + uint32_t gopRemainingB; +} VkVideoEncodeH264GopRemainingFrameInfoKHR; + + + +// VK_KHR_video_encode_h265 is a preprocessor guard. Do not pass it to API calls. +#define VK_KHR_video_encode_h265 1 +#include "vk_video/vulkan_video_codec_h265std.h" +#include "vk_video/vulkan_video_codec_h265std_encode.h" +#define VK_KHR_VIDEO_ENCODE_H265_SPEC_VERSION 14 +#define VK_KHR_VIDEO_ENCODE_H265_EXTENSION_NAME "VK_KHR_video_encode_h265" + +typedef enum VkVideoEncodeH265CapabilityFlagBitsKHR { + VK_VIDEO_ENCODE_H265_CAPABILITY_HRD_COMPLIANCE_BIT_KHR = 0x00000001, + VK_VIDEO_ENCODE_H265_CAPABILITY_PREDICTION_WEIGHT_TABLE_GENERATED_BIT_KHR = 0x00000002, + VK_VIDEO_ENCODE_H265_CAPABILITY_ROW_UNALIGNED_SLICE_SEGMENT_BIT_KHR = 0x00000004, + VK_VIDEO_ENCODE_H265_CAPABILITY_DIFFERENT_SLICE_SEGMENT_TYPE_BIT_KHR = 0x00000008, + VK_VIDEO_ENCODE_H265_CAPABILITY_B_FRAME_IN_L0_LIST_BIT_KHR = 0x00000010, + VK_VIDEO_ENCODE_H265_CAPABILITY_B_FRAME_IN_L1_LIST_BIT_KHR = 0x00000020, + VK_VIDEO_ENCODE_H265_CAPABILITY_PER_PICTURE_TYPE_MIN_MAX_QP_BIT_KHR = 0x00000040, + VK_VIDEO_ENCODE_H265_CAPABILITY_PER_SLICE_SEGMENT_CONSTANT_QP_BIT_KHR = 0x00000080, + VK_VIDEO_ENCODE_H265_CAPABILITY_MULTIPLE_TILES_PER_SLICE_SEGMENT_BIT_KHR = 0x00000100, + VK_VIDEO_ENCODE_H265_CAPABILITY_MULTIPLE_SLICE_SEGMENTS_PER_TILE_BIT_KHR = 0x00000200, + VK_VIDEO_ENCODE_H265_CAPABILITY_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF +} VkVideoEncodeH265CapabilityFlagBitsKHR; +typedef VkFlags VkVideoEncodeH265CapabilityFlagsKHR; + +typedef enum VkVideoEncodeH265StdFlagBitsKHR { + VK_VIDEO_ENCODE_H265_STD_SEPARATE_COLOR_PLANE_FLAG_SET_BIT_KHR = 0x00000001, + VK_VIDEO_ENCODE_H265_STD_SAMPLE_ADAPTIVE_OFFSET_ENABLED_FLAG_SET_BIT_KHR = 0x00000002, + VK_VIDEO_ENCODE_H265_STD_SCALING_LIST_DATA_PRESENT_FLAG_SET_BIT_KHR = 0x00000004, + VK_VIDEO_ENCODE_H265_STD_PCM_ENABLED_FLAG_SET_BIT_KHR = 0x00000008, + VK_VIDEO_ENCODE_H265_STD_SPS_TEMPORAL_MVP_ENABLED_FLAG_SET_BIT_KHR = 0x00000010, + VK_VIDEO_ENCODE_H265_STD_INIT_QP_MINUS26_BIT_KHR = 0x00000020, + VK_VIDEO_ENCODE_H265_STD_WEIGHTED_PRED_FLAG_SET_BIT_KHR = 0x00000040, + VK_VIDEO_ENCODE_H265_STD_WEIGHTED_BIPRED_FLAG_SET_BIT_KHR = 0x00000080, + VK_VIDEO_ENCODE_H265_STD_LOG2_PARALLEL_MERGE_LEVEL_MINUS2_BIT_KHR = 0x00000100, + VK_VIDEO_ENCODE_H265_STD_SIGN_DATA_HIDING_ENABLED_FLAG_SET_BIT_KHR = 0x00000200, + VK_VIDEO_ENCODE_H265_STD_TRANSFORM_SKIP_ENABLED_FLAG_SET_BIT_KHR = 0x00000400, + VK_VIDEO_ENCODE_H265_STD_TRANSFORM_SKIP_ENABLED_FLAG_UNSET_BIT_KHR = 0x00000800, + VK_VIDEO_ENCODE_H265_STD_PPS_SLICE_CHROMA_QP_OFFSETS_PRESENT_FLAG_SET_BIT_KHR = 0x00001000, + VK_VIDEO_ENCODE_H265_STD_TRANSQUANT_BYPASS_ENABLED_FLAG_SET_BIT_KHR = 0x00002000, + VK_VIDEO_ENCODE_H265_STD_CONSTRAINED_INTRA_PRED_FLAG_SET_BIT_KHR = 0x00004000, + VK_VIDEO_ENCODE_H265_STD_ENTROPY_CODING_SYNC_ENABLED_FLAG_SET_BIT_KHR = 0x00008000, + VK_VIDEO_ENCODE_H265_STD_DEBLOCKING_FILTER_OVERRIDE_ENABLED_FLAG_SET_BIT_KHR = 0x00010000, + VK_VIDEO_ENCODE_H265_STD_DEPENDENT_SLICE_SEGMENTS_ENABLED_FLAG_SET_BIT_KHR = 0x00020000, + VK_VIDEO_ENCODE_H265_STD_DEPENDENT_SLICE_SEGMENT_FLAG_SET_BIT_KHR = 0x00040000, + VK_VIDEO_ENCODE_H265_STD_SLICE_QP_DELTA_BIT_KHR = 0x00080000, + VK_VIDEO_ENCODE_H265_STD_DIFFERENT_SLICE_QP_DELTA_BIT_KHR = 0x00100000, + VK_VIDEO_ENCODE_H265_STD_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF +} VkVideoEncodeH265StdFlagBitsKHR; +typedef VkFlags VkVideoEncodeH265StdFlagsKHR; + +typedef enum VkVideoEncodeH265CtbSizeFlagBitsKHR { + VK_VIDEO_ENCODE_H265_CTB_SIZE_16_BIT_KHR = 0x00000001, + VK_VIDEO_ENCODE_H265_CTB_SIZE_32_BIT_KHR = 0x00000002, + VK_VIDEO_ENCODE_H265_CTB_SIZE_64_BIT_KHR = 0x00000004, + VK_VIDEO_ENCODE_H265_CTB_SIZE_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF +} VkVideoEncodeH265CtbSizeFlagBitsKHR; +typedef VkFlags VkVideoEncodeH265CtbSizeFlagsKHR; + +typedef enum VkVideoEncodeH265TransformBlockSizeFlagBitsKHR { + VK_VIDEO_ENCODE_H265_TRANSFORM_BLOCK_SIZE_4_BIT_KHR = 0x00000001, + VK_VIDEO_ENCODE_H265_TRANSFORM_BLOCK_SIZE_8_BIT_KHR = 0x00000002, + VK_VIDEO_ENCODE_H265_TRANSFORM_BLOCK_SIZE_16_BIT_KHR = 0x00000004, + VK_VIDEO_ENCODE_H265_TRANSFORM_BLOCK_SIZE_32_BIT_KHR = 0x00000008, + VK_VIDEO_ENCODE_H265_TRANSFORM_BLOCK_SIZE_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF +} VkVideoEncodeH265TransformBlockSizeFlagBitsKHR; +typedef VkFlags VkVideoEncodeH265TransformBlockSizeFlagsKHR; + +typedef enum VkVideoEncodeH265RateControlFlagBitsKHR { + VK_VIDEO_ENCODE_H265_RATE_CONTROL_ATTEMPT_HRD_COMPLIANCE_BIT_KHR = 0x00000001, + VK_VIDEO_ENCODE_H265_RATE_CONTROL_REGULAR_GOP_BIT_KHR = 0x00000002, + VK_VIDEO_ENCODE_H265_RATE_CONTROL_REFERENCE_PATTERN_FLAT_BIT_KHR = 0x00000004, + VK_VIDEO_ENCODE_H265_RATE_CONTROL_REFERENCE_PATTERN_DYADIC_BIT_KHR = 0x00000008, + VK_VIDEO_ENCODE_H265_RATE_CONTROL_TEMPORAL_SUB_LAYER_PATTERN_DYADIC_BIT_KHR = 0x00000010, + VK_VIDEO_ENCODE_H265_RATE_CONTROL_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF +} VkVideoEncodeH265RateControlFlagBitsKHR; +typedef VkFlags VkVideoEncodeH265RateControlFlagsKHR; +typedef struct VkVideoEncodeH265CapabilitiesKHR { + VkStructureType sType; + void* pNext; + VkVideoEncodeH265CapabilityFlagsKHR flags; + StdVideoH265LevelIdc maxLevelIdc; + uint32_t maxSliceSegmentCount; + VkExtent2D maxTiles; + VkVideoEncodeH265CtbSizeFlagsKHR ctbSizes; + VkVideoEncodeH265TransformBlockSizeFlagsKHR transformBlockSizes; + uint32_t maxPPictureL0ReferenceCount; + uint32_t maxBPictureL0ReferenceCount; + uint32_t maxL1ReferenceCount; + uint32_t maxSubLayerCount; + VkBool32 expectDyadicTemporalSubLayerPattern; + int32_t minQp; + int32_t maxQp; + VkBool32 prefersGopRemainingFrames; + VkBool32 requiresGopRemainingFrames; + VkVideoEncodeH265StdFlagsKHR stdSyntaxFlags; +} VkVideoEncodeH265CapabilitiesKHR; + +typedef struct VkVideoEncodeH265SessionCreateInfoKHR { + VkStructureType sType; + const void* pNext; + VkBool32 useMaxLevelIdc; + StdVideoH265LevelIdc maxLevelIdc; +} VkVideoEncodeH265SessionCreateInfoKHR; + +typedef struct VkVideoEncodeH265QpKHR { + int32_t qpI; + int32_t qpP; + int32_t qpB; +} VkVideoEncodeH265QpKHR; + +typedef struct VkVideoEncodeH265QualityLevelPropertiesKHR { + VkStructureType sType; + void* pNext; + VkVideoEncodeH265RateControlFlagsKHR preferredRateControlFlags; + uint32_t preferredGopFrameCount; + uint32_t preferredIdrPeriod; + uint32_t preferredConsecutiveBFrameCount; + uint32_t preferredSubLayerCount; + VkVideoEncodeH265QpKHR preferredConstantQp; + uint32_t preferredMaxL0ReferenceCount; + uint32_t preferredMaxL1ReferenceCount; +} VkVideoEncodeH265QualityLevelPropertiesKHR; + +typedef struct VkVideoEncodeH265SessionParametersAddInfoKHR { + VkStructureType sType; + const void* pNext; + uint32_t stdVPSCount; + const StdVideoH265VideoParameterSet* pStdVPSs; + uint32_t stdSPSCount; + const StdVideoH265SequenceParameterSet* pStdSPSs; + uint32_t stdPPSCount; + const StdVideoH265PictureParameterSet* pStdPPSs; +} VkVideoEncodeH265SessionParametersAddInfoKHR; + +typedef struct VkVideoEncodeH265SessionParametersCreateInfoKHR { + VkStructureType sType; + const void* pNext; + uint32_t maxStdVPSCount; + uint32_t maxStdSPSCount; + uint32_t maxStdPPSCount; + const VkVideoEncodeH265SessionParametersAddInfoKHR* pParametersAddInfo; +} VkVideoEncodeH265SessionParametersCreateInfoKHR; + +typedef struct VkVideoEncodeH265SessionParametersGetInfoKHR { + VkStructureType sType; + const void* pNext; + VkBool32 writeStdVPS; + VkBool32 writeStdSPS; + VkBool32 writeStdPPS; + uint32_t stdVPSId; + uint32_t stdSPSId; + uint32_t stdPPSId; +} VkVideoEncodeH265SessionParametersGetInfoKHR; + +typedef struct VkVideoEncodeH265SessionParametersFeedbackInfoKHR { + VkStructureType sType; + void* pNext; + VkBool32 hasStdVPSOverrides; + VkBool32 hasStdSPSOverrides; + VkBool32 hasStdPPSOverrides; +} VkVideoEncodeH265SessionParametersFeedbackInfoKHR; + +typedef struct VkVideoEncodeH265NaluSliceSegmentInfoKHR { + VkStructureType sType; + const void* pNext; + int32_t constantQp; + const StdVideoEncodeH265SliceSegmentHeader* pStdSliceSegmentHeader; +} VkVideoEncodeH265NaluSliceSegmentInfoKHR; + +typedef struct VkVideoEncodeH265PictureInfoKHR { + VkStructureType sType; + const void* pNext; + uint32_t naluSliceSegmentEntryCount; + const VkVideoEncodeH265NaluSliceSegmentInfoKHR* pNaluSliceSegmentEntries; + const StdVideoEncodeH265PictureInfo* pStdPictureInfo; +} VkVideoEncodeH265PictureInfoKHR; + +typedef struct VkVideoEncodeH265DpbSlotInfoKHR { + VkStructureType sType; + const void* pNext; + const StdVideoEncodeH265ReferenceInfo* pStdReferenceInfo; +} VkVideoEncodeH265DpbSlotInfoKHR; + +typedef struct VkVideoEncodeH265ProfileInfoKHR { + VkStructureType sType; + const void* pNext; + StdVideoH265ProfileIdc stdProfileIdc; +} VkVideoEncodeH265ProfileInfoKHR; + +typedef struct VkVideoEncodeH265RateControlInfoKHR { + VkStructureType sType; + const void* pNext; + VkVideoEncodeH265RateControlFlagsKHR flags; + uint32_t gopFrameCount; + uint32_t idrPeriod; + uint32_t consecutiveBFrameCount; + uint32_t subLayerCount; +} VkVideoEncodeH265RateControlInfoKHR; + +typedef struct VkVideoEncodeH265FrameSizeKHR { + uint32_t frameISize; + uint32_t framePSize; + uint32_t frameBSize; +} VkVideoEncodeH265FrameSizeKHR; + +typedef struct VkVideoEncodeH265RateControlLayerInfoKHR { + VkStructureType sType; + const void* pNext; + VkBool32 useMinQp; + VkVideoEncodeH265QpKHR minQp; + VkBool32 useMaxQp; + VkVideoEncodeH265QpKHR maxQp; + VkBool32 useMaxFrameSize; + VkVideoEncodeH265FrameSizeKHR maxFrameSize; +} VkVideoEncodeH265RateControlLayerInfoKHR; + +typedef struct VkVideoEncodeH265GopRemainingFrameInfoKHR { + VkStructureType sType; + const void* pNext; + VkBool32 useGopRemainingFrames; + uint32_t gopRemainingI; + uint32_t gopRemainingP; + uint32_t gopRemainingB; +} VkVideoEncodeH265GopRemainingFrameInfoKHR; + + + // VK_KHR_video_decode_h264 is a preprocessor guard. Do not pass it to API calls. #define VK_KHR_video_decode_h264 1 -#include "vk_video/vulkan_video_codec_h264std.h" #include "vk_video/vulkan_video_codec_h264std_decode.h" -#define VK_KHR_VIDEO_DECODE_H264_SPEC_VERSION 8 +#define VK_KHR_VIDEO_DECODE_H264_SPEC_VERSION 9 #define VK_KHR_VIDEO_DECODE_H264_EXTENSION_NAME "VK_KHR_video_decode_h264" typedef enum VkVideoDecodeH264PictureLayoutFlagBitsKHR { @@ -9550,9 +9958,8 @@ typedef struct VkPhysicalDeviceShaderClockFeaturesKHR { // VK_KHR_video_decode_h265 is a preprocessor guard. Do not pass it to API calls. #define VK_KHR_video_decode_h265 1 -#include "vk_video/vulkan_video_codec_h265std.h" #include "vk_video/vulkan_video_codec_h265std_decode.h" -#define VK_KHR_VIDEO_DECODE_H265_SPEC_VERSION 7 +#define VK_KHR_VIDEO_DECODE_H265_SPEC_VERSION 8 #define VK_KHR_VIDEO_DECODE_H265_EXTENSION_NAME "VK_KHR_video_decode_h265" typedef struct VkVideoDecodeH265ProfileInfoKHR { VkStructureType sType; @@ -9823,6 +10230,58 @@ VKAPI_ATTR void VKAPI_CALL vkCmdSetFragmentShadingRateKHR( #endif +// VK_KHR_dynamic_rendering_local_read is a preprocessor guard. Do not pass it to API calls. +#define VK_KHR_dynamic_rendering_local_read 1 +#define VK_KHR_DYNAMIC_RENDERING_LOCAL_READ_SPEC_VERSION 1 +#define VK_KHR_DYNAMIC_RENDERING_LOCAL_READ_EXTENSION_NAME "VK_KHR_dynamic_rendering_local_read" +typedef struct VkPhysicalDeviceDynamicRenderingLocalReadFeaturesKHR { + VkStructureType sType; + void* pNext; + VkBool32 dynamicRenderingLocalRead; +} VkPhysicalDeviceDynamicRenderingLocalReadFeaturesKHR; + +typedef struct VkRenderingAttachmentLocationInfoKHR { + VkStructureType sType; + const void* pNext; + uint32_t colorAttachmentCount; + const uint32_t* pColorAttachmentLocations; +} VkRenderingAttachmentLocationInfoKHR; + +typedef struct VkRenderingInputAttachmentIndexInfoKHR { + VkStructureType sType; + const void* pNext; + uint32_t colorAttachmentCount; + const uint32_t* pColorAttachmentInputIndices; + const uint32_t* pDepthInputAttachmentIndex; + const uint32_t* pStencilInputAttachmentIndex; +} VkRenderingInputAttachmentIndexInfoKHR; + +typedef void (VKAPI_PTR *PFN_vkCmdSetRenderingAttachmentLocationsKHR)(VkCommandBuffer commandBuffer, const VkRenderingAttachmentLocationInfoKHR* pLocationInfo); +typedef void (VKAPI_PTR *PFN_vkCmdSetRenderingInputAttachmentIndicesKHR)(VkCommandBuffer commandBuffer, const VkRenderingInputAttachmentIndexInfoKHR* pLocationInfo); + +#ifndef VK_NO_PROTOTYPES +VKAPI_ATTR void VKAPI_CALL vkCmdSetRenderingAttachmentLocationsKHR( + VkCommandBuffer commandBuffer, + const VkRenderingAttachmentLocationInfoKHR* pLocationInfo); + +VKAPI_ATTR void VKAPI_CALL vkCmdSetRenderingInputAttachmentIndicesKHR( + VkCommandBuffer commandBuffer, + const VkRenderingInputAttachmentIndexInfoKHR* pLocationInfo); +#endif + + +// VK_KHR_shader_quad_control is a preprocessor guard. Do not pass it to API calls. +#define VK_KHR_shader_quad_control 1 +#define VK_KHR_SHADER_QUAD_CONTROL_SPEC_VERSION 1 +#define VK_KHR_SHADER_QUAD_CONTROL_EXTENSION_NAME "VK_KHR_shader_quad_control" +typedef struct VkPhysicalDeviceShaderQuadControlFeaturesKHR { + VkStructureType sType; + void* pNext; + VkBool32 shaderQuadControl; +} VkPhysicalDeviceShaderQuadControlFeaturesKHR; + + + // VK_KHR_spirv_1_4 is a preprocessor guard. Do not pass it to API calls. #define VK_KHR_spirv_1_4 1 #define VK_KHR_SPIRV_1_4_SPEC_VERSION 1 @@ -10046,6 +10505,11 @@ VKAPI_ATTR VkResult VKAPI_CALL vkGetPipelineExecutableInternalRepresentationsKHR #define VK_KHR_map_memory2 1 #define VK_KHR_MAP_MEMORY_2_SPEC_VERSION 1 #define VK_KHR_MAP_MEMORY_2_EXTENSION_NAME "VK_KHR_map_memory2" + +typedef enum VkMemoryUnmapFlagBitsKHR { + VK_MEMORY_UNMAP_RESERVE_BIT_EXT = 0x00000001, + VK_MEMORY_UNMAP_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF +} VkMemoryUnmapFlagBitsKHR; typedef VkFlags VkMemoryUnmapFlagsKHR; typedef struct VkMemoryMapInfoKHR { VkStructureType sType; @@ -10126,6 +10590,183 @@ typedef struct VkPhysicalDevicePresentIdFeaturesKHR { +// VK_KHR_video_encode_queue is a preprocessor guard. Do not pass it to API calls. +#define VK_KHR_video_encode_queue 1 +#define VK_KHR_VIDEO_ENCODE_QUEUE_SPEC_VERSION 12 +#define VK_KHR_VIDEO_ENCODE_QUEUE_EXTENSION_NAME "VK_KHR_video_encode_queue" + +typedef enum VkVideoEncodeTuningModeKHR { + VK_VIDEO_ENCODE_TUNING_MODE_DEFAULT_KHR = 0, + VK_VIDEO_ENCODE_TUNING_MODE_HIGH_QUALITY_KHR = 1, + VK_VIDEO_ENCODE_TUNING_MODE_LOW_LATENCY_KHR = 2, + VK_VIDEO_ENCODE_TUNING_MODE_ULTRA_LOW_LATENCY_KHR = 3, + VK_VIDEO_ENCODE_TUNING_MODE_LOSSLESS_KHR = 4, + VK_VIDEO_ENCODE_TUNING_MODE_MAX_ENUM_KHR = 0x7FFFFFFF +} VkVideoEncodeTuningModeKHR; + +typedef enum VkVideoEncodeFlagBitsKHR { + VK_VIDEO_ENCODE_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF +} VkVideoEncodeFlagBitsKHR; +typedef VkFlags VkVideoEncodeFlagsKHR; + +typedef enum VkVideoEncodeCapabilityFlagBitsKHR { + VK_VIDEO_ENCODE_CAPABILITY_PRECEDING_EXTERNALLY_ENCODED_BYTES_BIT_KHR = 0x00000001, + VK_VIDEO_ENCODE_CAPABILITY_INSUFFICIENT_BITSTREAM_BUFFER_RANGE_DETECTION_BIT_KHR = 0x00000002, + VK_VIDEO_ENCODE_CAPABILITY_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF +} VkVideoEncodeCapabilityFlagBitsKHR; +typedef VkFlags VkVideoEncodeCapabilityFlagsKHR; + +typedef enum VkVideoEncodeRateControlModeFlagBitsKHR { + VK_VIDEO_ENCODE_RATE_CONTROL_MODE_DEFAULT_KHR = 0, + VK_VIDEO_ENCODE_RATE_CONTROL_MODE_DISABLED_BIT_KHR = 0x00000001, + VK_VIDEO_ENCODE_RATE_CONTROL_MODE_CBR_BIT_KHR = 0x00000002, + VK_VIDEO_ENCODE_RATE_CONTROL_MODE_VBR_BIT_KHR = 0x00000004, + VK_VIDEO_ENCODE_RATE_CONTROL_MODE_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF +} VkVideoEncodeRateControlModeFlagBitsKHR; +typedef VkFlags VkVideoEncodeRateControlModeFlagsKHR; + +typedef enum VkVideoEncodeFeedbackFlagBitsKHR { + VK_VIDEO_ENCODE_FEEDBACK_BITSTREAM_BUFFER_OFFSET_BIT_KHR = 0x00000001, + VK_VIDEO_ENCODE_FEEDBACK_BITSTREAM_BYTES_WRITTEN_BIT_KHR = 0x00000002, + VK_VIDEO_ENCODE_FEEDBACK_BITSTREAM_HAS_OVERRIDES_BIT_KHR = 0x00000004, + VK_VIDEO_ENCODE_FEEDBACK_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF +} VkVideoEncodeFeedbackFlagBitsKHR; +typedef VkFlags VkVideoEncodeFeedbackFlagsKHR; + +typedef enum VkVideoEncodeUsageFlagBitsKHR { + VK_VIDEO_ENCODE_USAGE_DEFAULT_KHR = 0, + VK_VIDEO_ENCODE_USAGE_TRANSCODING_BIT_KHR = 0x00000001, + VK_VIDEO_ENCODE_USAGE_STREAMING_BIT_KHR = 0x00000002, + VK_VIDEO_ENCODE_USAGE_RECORDING_BIT_KHR = 0x00000004, + VK_VIDEO_ENCODE_USAGE_CONFERENCING_BIT_KHR = 0x00000008, + VK_VIDEO_ENCODE_USAGE_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF +} VkVideoEncodeUsageFlagBitsKHR; +typedef VkFlags VkVideoEncodeUsageFlagsKHR; + +typedef enum VkVideoEncodeContentFlagBitsKHR { + VK_VIDEO_ENCODE_CONTENT_DEFAULT_KHR = 0, + VK_VIDEO_ENCODE_CONTENT_CAMERA_BIT_KHR = 0x00000001, + VK_VIDEO_ENCODE_CONTENT_DESKTOP_BIT_KHR = 0x00000002, + VK_VIDEO_ENCODE_CONTENT_RENDERED_BIT_KHR = 0x00000004, + VK_VIDEO_ENCODE_CONTENT_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF +} VkVideoEncodeContentFlagBitsKHR; +typedef VkFlags VkVideoEncodeContentFlagsKHR; +typedef VkFlags VkVideoEncodeRateControlFlagsKHR; +typedef struct VkVideoEncodeInfoKHR { + VkStructureType sType; + const void* pNext; + VkVideoEncodeFlagsKHR flags; + VkBuffer dstBuffer; + VkDeviceSize dstBufferOffset; + VkDeviceSize dstBufferRange; + VkVideoPictureResourceInfoKHR srcPictureResource; + const VkVideoReferenceSlotInfoKHR* pSetupReferenceSlot; + uint32_t referenceSlotCount; + const VkVideoReferenceSlotInfoKHR* pReferenceSlots; + uint32_t precedingExternallyEncodedBytes; +} VkVideoEncodeInfoKHR; + +typedef struct VkVideoEncodeCapabilitiesKHR { + VkStructureType sType; + void* pNext; + VkVideoEncodeCapabilityFlagsKHR flags; + VkVideoEncodeRateControlModeFlagsKHR rateControlModes; + uint32_t maxRateControlLayers; + uint64_t maxBitrate; + uint32_t maxQualityLevels; + VkExtent2D encodeInputPictureGranularity; + VkVideoEncodeFeedbackFlagsKHR supportedEncodeFeedbackFlags; +} VkVideoEncodeCapabilitiesKHR; + +typedef struct VkQueryPoolVideoEncodeFeedbackCreateInfoKHR { + VkStructureType sType; + const void* pNext; + VkVideoEncodeFeedbackFlagsKHR encodeFeedbackFlags; +} VkQueryPoolVideoEncodeFeedbackCreateInfoKHR; + +typedef struct VkVideoEncodeUsageInfoKHR { + VkStructureType sType; + const void* pNext; + VkVideoEncodeUsageFlagsKHR videoUsageHints; + VkVideoEncodeContentFlagsKHR videoContentHints; + VkVideoEncodeTuningModeKHR tuningMode; +} VkVideoEncodeUsageInfoKHR; + +typedef struct VkVideoEncodeRateControlLayerInfoKHR { + VkStructureType sType; + const void* pNext; + uint64_t averageBitrate; + uint64_t maxBitrate; + uint32_t frameRateNumerator; + uint32_t frameRateDenominator; +} VkVideoEncodeRateControlLayerInfoKHR; + +typedef struct VkVideoEncodeRateControlInfoKHR { + VkStructureType sType; + const void* pNext; + VkVideoEncodeRateControlFlagsKHR flags; + VkVideoEncodeRateControlModeFlagBitsKHR rateControlMode; + uint32_t layerCount; + const VkVideoEncodeRateControlLayerInfoKHR* pLayers; + uint32_t virtualBufferSizeInMs; + uint32_t initialVirtualBufferSizeInMs; +} VkVideoEncodeRateControlInfoKHR; + +typedef struct VkPhysicalDeviceVideoEncodeQualityLevelInfoKHR { + VkStructureType sType; + const void* pNext; + const VkVideoProfileInfoKHR* pVideoProfile; + uint32_t qualityLevel; +} VkPhysicalDeviceVideoEncodeQualityLevelInfoKHR; + +typedef struct VkVideoEncodeQualityLevelPropertiesKHR { + VkStructureType sType; + void* pNext; + VkVideoEncodeRateControlModeFlagBitsKHR preferredRateControlMode; + uint32_t preferredRateControlLayerCount; +} VkVideoEncodeQualityLevelPropertiesKHR; + +typedef struct VkVideoEncodeQualityLevelInfoKHR { + VkStructureType sType; + const void* pNext; + uint32_t qualityLevel; +} VkVideoEncodeQualityLevelInfoKHR; + +typedef struct VkVideoEncodeSessionParametersGetInfoKHR { + VkStructureType sType; + const void* pNext; + VkVideoSessionParametersKHR videoSessionParameters; +} VkVideoEncodeSessionParametersGetInfoKHR; + +typedef struct VkVideoEncodeSessionParametersFeedbackInfoKHR { + VkStructureType sType; + void* pNext; + VkBool32 hasOverrides; +} VkVideoEncodeSessionParametersFeedbackInfoKHR; + +typedef VkResult (VKAPI_PTR *PFN_vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR)(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceVideoEncodeQualityLevelInfoKHR* pQualityLevelInfo, VkVideoEncodeQualityLevelPropertiesKHR* pQualityLevelProperties); +typedef VkResult (VKAPI_PTR *PFN_vkGetEncodedVideoSessionParametersKHR)(VkDevice device, const VkVideoEncodeSessionParametersGetInfoKHR* pVideoSessionParametersInfo, VkVideoEncodeSessionParametersFeedbackInfoKHR* pFeedbackInfo, size_t* pDataSize, void* pData); +typedef void (VKAPI_PTR *PFN_vkCmdEncodeVideoKHR)(VkCommandBuffer commandBuffer, const VkVideoEncodeInfoKHR* pEncodeInfo); + +#ifndef VK_NO_PROTOTYPES +VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR( + VkPhysicalDevice physicalDevice, + const VkPhysicalDeviceVideoEncodeQualityLevelInfoKHR* pQualityLevelInfo, + VkVideoEncodeQualityLevelPropertiesKHR* pQualityLevelProperties); + +VKAPI_ATTR VkResult VKAPI_CALL vkGetEncodedVideoSessionParametersKHR( + VkDevice device, + const VkVideoEncodeSessionParametersGetInfoKHR* pVideoSessionParametersInfo, + VkVideoEncodeSessionParametersFeedbackInfoKHR* pFeedbackInfo, + size_t* pDataSize, + void* pData); + +VKAPI_ATTR void VKAPI_CALL vkCmdEncodeVideoKHR( + VkCommandBuffer commandBuffer, + const VkVideoEncodeInfoKHR* pEncodeInfo); +#endif + + // VK_KHR_synchronization2 is a preprocessor guard. Do not pass it to API calls. #define VK_KHR_synchronization2 1 #define VK_KHR_SYNCHRONIZATION_2_SPEC_VERSION 1 @@ -10430,6 +11071,31 @@ VKAPI_ATTR void VKAPI_CALL vkGetDeviceImageSparseMemoryRequirementsKHR( #endif +// VK_KHR_shader_subgroup_rotate is a preprocessor guard. Do not pass it to API calls. +#define VK_KHR_shader_subgroup_rotate 1 +#define VK_KHR_SHADER_SUBGROUP_ROTATE_SPEC_VERSION 2 +#define VK_KHR_SHADER_SUBGROUP_ROTATE_EXTENSION_NAME "VK_KHR_shader_subgroup_rotate" +typedef struct VkPhysicalDeviceShaderSubgroupRotateFeaturesKHR { + VkStructureType sType; + void* pNext; + VkBool32 shaderSubgroupRotate; + VkBool32 shaderSubgroupRotateClustered; +} VkPhysicalDeviceShaderSubgroupRotateFeaturesKHR; + + + +// VK_KHR_shader_maximal_reconvergence is a preprocessor guard. Do not pass it to API calls. +#define VK_KHR_shader_maximal_reconvergence 1 +#define VK_KHR_SHADER_MAXIMAL_RECONVERGENCE_SPEC_VERSION 1 +#define VK_KHR_SHADER_MAXIMAL_RECONVERGENCE_EXTENSION_NAME "VK_KHR_shader_maximal_reconvergence" +typedef struct VkPhysicalDeviceShaderMaximalReconvergenceFeaturesKHR { + VkStructureType sType; + void* pNext; + VkBool32 shaderMaximalReconvergence; +} VkPhysicalDeviceShaderMaximalReconvergenceFeaturesKHR; + + + // VK_KHR_maintenance5 is a preprocessor guard. Do not pass it to API calls. #define VK_KHR_maintenance5 1 #define VK_KHR_MAINTENANCE_5_SPEC_VERSION 1 @@ -10686,6 +11352,355 @@ VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR #endif +// VK_KHR_video_decode_av1 is a preprocessor guard. Do not pass it to API calls. +#define VK_KHR_video_decode_av1 1 +#include "vk_video/vulkan_video_codec_av1std.h" +#include "vk_video/vulkan_video_codec_av1std_decode.h" +#define VK_MAX_VIDEO_AV1_REFERENCES_PER_FRAME_KHR 7U +#define VK_KHR_VIDEO_DECODE_AV1_SPEC_VERSION 1 +#define VK_KHR_VIDEO_DECODE_AV1_EXTENSION_NAME "VK_KHR_video_decode_av1" +typedef struct VkVideoDecodeAV1ProfileInfoKHR { + VkStructureType sType; + const void* pNext; + StdVideoAV1Profile stdProfile; + VkBool32 filmGrainSupport; +} VkVideoDecodeAV1ProfileInfoKHR; + +typedef struct VkVideoDecodeAV1CapabilitiesKHR { + VkStructureType sType; + void* pNext; + StdVideoAV1Level maxLevel; +} VkVideoDecodeAV1CapabilitiesKHR; + +typedef struct VkVideoDecodeAV1SessionParametersCreateInfoKHR { + VkStructureType sType; + const void* pNext; + const StdVideoAV1SequenceHeader* pStdSequenceHeader; +} VkVideoDecodeAV1SessionParametersCreateInfoKHR; + +typedef struct VkVideoDecodeAV1PictureInfoKHR { + VkStructureType sType; + const void* pNext; + const StdVideoDecodeAV1PictureInfo* pStdPictureInfo; + int32_t referenceNameSlotIndices[VK_MAX_VIDEO_AV1_REFERENCES_PER_FRAME_KHR]; + uint32_t frameHeaderOffset; + uint32_t tileCount; + const uint32_t* pTileOffsets; + const uint32_t* pTileSizes; +} VkVideoDecodeAV1PictureInfoKHR; + +typedef struct VkVideoDecodeAV1DpbSlotInfoKHR { + VkStructureType sType; + const void* pNext; + const StdVideoDecodeAV1ReferenceInfo* pStdReferenceInfo; +} VkVideoDecodeAV1DpbSlotInfoKHR; + + + +// VK_KHR_video_maintenance1 is a preprocessor guard. Do not pass it to API calls. +#define VK_KHR_video_maintenance1 1 +#define VK_KHR_VIDEO_MAINTENANCE_1_SPEC_VERSION 1 +#define VK_KHR_VIDEO_MAINTENANCE_1_EXTENSION_NAME "VK_KHR_video_maintenance1" +typedef struct VkPhysicalDeviceVideoMaintenance1FeaturesKHR { + VkStructureType sType; + void* pNext; + VkBool32 videoMaintenance1; +} VkPhysicalDeviceVideoMaintenance1FeaturesKHR; + +typedef struct VkVideoInlineQueryInfoKHR { + VkStructureType sType; + const void* pNext; + VkQueryPool queryPool; + uint32_t firstQuery; + uint32_t queryCount; +} VkVideoInlineQueryInfoKHR; + + + +// VK_KHR_vertex_attribute_divisor is a preprocessor guard. Do not pass it to API calls. +#define VK_KHR_vertex_attribute_divisor 1 +#define VK_KHR_VERTEX_ATTRIBUTE_DIVISOR_SPEC_VERSION 1 +#define VK_KHR_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME "VK_KHR_vertex_attribute_divisor" +typedef struct VkPhysicalDeviceVertexAttributeDivisorPropertiesKHR { + VkStructureType sType; + void* pNext; + uint32_t maxVertexAttribDivisor; + VkBool32 supportsNonZeroFirstInstance; +} VkPhysicalDeviceVertexAttributeDivisorPropertiesKHR; + +typedef struct VkVertexInputBindingDivisorDescriptionKHR { + uint32_t binding; + uint32_t divisor; +} VkVertexInputBindingDivisorDescriptionKHR; + +typedef struct VkPipelineVertexInputDivisorStateCreateInfoKHR { + VkStructureType sType; + const void* pNext; + uint32_t vertexBindingDivisorCount; + const VkVertexInputBindingDivisorDescriptionKHR* pVertexBindingDivisors; +} VkPipelineVertexInputDivisorStateCreateInfoKHR; + +typedef struct VkPhysicalDeviceVertexAttributeDivisorFeaturesKHR { + VkStructureType sType; + void* pNext; + VkBool32 vertexAttributeInstanceRateDivisor; + VkBool32 vertexAttributeInstanceRateZeroDivisor; +} VkPhysicalDeviceVertexAttributeDivisorFeaturesKHR; + + + +// VK_KHR_load_store_op_none is a preprocessor guard. Do not pass it to API calls. +#define VK_KHR_load_store_op_none 1 +#define VK_KHR_LOAD_STORE_OP_NONE_SPEC_VERSION 1 +#define VK_KHR_LOAD_STORE_OP_NONE_EXTENSION_NAME "VK_KHR_load_store_op_none" + + +// VK_KHR_shader_float_controls2 is a preprocessor guard. Do not pass it to API calls. +#define VK_KHR_shader_float_controls2 1 +#define VK_KHR_SHADER_FLOAT_CONTROLS_2_SPEC_VERSION 1 +#define VK_KHR_SHADER_FLOAT_CONTROLS_2_EXTENSION_NAME "VK_KHR_shader_float_controls2" +typedef struct VkPhysicalDeviceShaderFloatControls2FeaturesKHR { + VkStructureType sType; + void* pNext; + VkBool32 shaderFloatControls2; +} VkPhysicalDeviceShaderFloatControls2FeaturesKHR; + + + +// VK_KHR_index_type_uint8 is a preprocessor guard. Do not pass it to API calls. +#define VK_KHR_index_type_uint8 1 +#define VK_KHR_INDEX_TYPE_UINT8_SPEC_VERSION 1 +#define VK_KHR_INDEX_TYPE_UINT8_EXTENSION_NAME "VK_KHR_index_type_uint8" +typedef struct VkPhysicalDeviceIndexTypeUint8FeaturesKHR { + VkStructureType sType; + void* pNext; + VkBool32 indexTypeUint8; +} VkPhysicalDeviceIndexTypeUint8FeaturesKHR; + + + +// VK_KHR_line_rasterization is a preprocessor guard. Do not pass it to API calls. +#define VK_KHR_line_rasterization 1 +#define VK_KHR_LINE_RASTERIZATION_SPEC_VERSION 1 +#define VK_KHR_LINE_RASTERIZATION_EXTENSION_NAME "VK_KHR_line_rasterization" + +typedef enum VkLineRasterizationModeKHR { + VK_LINE_RASTERIZATION_MODE_DEFAULT_KHR = 0, + VK_LINE_RASTERIZATION_MODE_RECTANGULAR_KHR = 1, + VK_LINE_RASTERIZATION_MODE_BRESENHAM_KHR = 2, + VK_LINE_RASTERIZATION_MODE_RECTANGULAR_SMOOTH_KHR = 3, + VK_LINE_RASTERIZATION_MODE_DEFAULT_EXT = VK_LINE_RASTERIZATION_MODE_DEFAULT_KHR, + VK_LINE_RASTERIZATION_MODE_RECTANGULAR_EXT = VK_LINE_RASTERIZATION_MODE_RECTANGULAR_KHR, + VK_LINE_RASTERIZATION_MODE_BRESENHAM_EXT = VK_LINE_RASTERIZATION_MODE_BRESENHAM_KHR, + VK_LINE_RASTERIZATION_MODE_RECTANGULAR_SMOOTH_EXT = VK_LINE_RASTERIZATION_MODE_RECTANGULAR_SMOOTH_KHR, + VK_LINE_RASTERIZATION_MODE_MAX_ENUM_KHR = 0x7FFFFFFF +} VkLineRasterizationModeKHR; +typedef struct VkPhysicalDeviceLineRasterizationFeaturesKHR { + VkStructureType sType; + void* pNext; + VkBool32 rectangularLines; + VkBool32 bresenhamLines; + VkBool32 smoothLines; + VkBool32 stippledRectangularLines; + VkBool32 stippledBresenhamLines; + VkBool32 stippledSmoothLines; +} VkPhysicalDeviceLineRasterizationFeaturesKHR; + +typedef struct VkPhysicalDeviceLineRasterizationPropertiesKHR { + VkStructureType sType; + void* pNext; + uint32_t lineSubPixelPrecisionBits; +} VkPhysicalDeviceLineRasterizationPropertiesKHR; + +typedef struct VkPipelineRasterizationLineStateCreateInfoKHR { + VkStructureType sType; + const void* pNext; + VkLineRasterizationModeKHR lineRasterizationMode; + VkBool32 stippledLineEnable; + uint32_t lineStippleFactor; + uint16_t lineStipplePattern; +} VkPipelineRasterizationLineStateCreateInfoKHR; + +typedef void (VKAPI_PTR *PFN_vkCmdSetLineStippleKHR)(VkCommandBuffer commandBuffer, uint32_t lineStippleFactor, uint16_t lineStipplePattern); + +#ifndef VK_NO_PROTOTYPES +VKAPI_ATTR void VKAPI_CALL vkCmdSetLineStippleKHR( + VkCommandBuffer commandBuffer, + uint32_t lineStippleFactor, + uint16_t lineStipplePattern); +#endif + + +// VK_KHR_calibrated_timestamps is a preprocessor guard. Do not pass it to API calls. +#define VK_KHR_calibrated_timestamps 1 +#define VK_KHR_CALIBRATED_TIMESTAMPS_SPEC_VERSION 1 +#define VK_KHR_CALIBRATED_TIMESTAMPS_EXTENSION_NAME "VK_KHR_calibrated_timestamps" + +typedef enum VkTimeDomainKHR { + VK_TIME_DOMAIN_DEVICE_KHR = 0, + VK_TIME_DOMAIN_CLOCK_MONOTONIC_KHR = 1, + VK_TIME_DOMAIN_CLOCK_MONOTONIC_RAW_KHR = 2, + VK_TIME_DOMAIN_QUERY_PERFORMANCE_COUNTER_KHR = 3, + VK_TIME_DOMAIN_DEVICE_EXT = VK_TIME_DOMAIN_DEVICE_KHR, + VK_TIME_DOMAIN_CLOCK_MONOTONIC_EXT = VK_TIME_DOMAIN_CLOCK_MONOTONIC_KHR, + VK_TIME_DOMAIN_CLOCK_MONOTONIC_RAW_EXT = VK_TIME_DOMAIN_CLOCK_MONOTONIC_RAW_KHR, + VK_TIME_DOMAIN_QUERY_PERFORMANCE_COUNTER_EXT = VK_TIME_DOMAIN_QUERY_PERFORMANCE_COUNTER_KHR, + VK_TIME_DOMAIN_MAX_ENUM_KHR = 0x7FFFFFFF +} VkTimeDomainKHR; +typedef struct VkCalibratedTimestampInfoKHR { + VkStructureType sType; + const void* pNext; + VkTimeDomainKHR timeDomain; +} VkCalibratedTimestampInfoKHR; + +typedef VkResult (VKAPI_PTR *PFN_vkGetPhysicalDeviceCalibrateableTimeDomainsKHR)(VkPhysicalDevice physicalDevice, uint32_t* pTimeDomainCount, VkTimeDomainKHR* pTimeDomains); +typedef VkResult (VKAPI_PTR *PFN_vkGetCalibratedTimestampsKHR)(VkDevice device, uint32_t timestampCount, const VkCalibratedTimestampInfoKHR* pTimestampInfos, uint64_t* pTimestamps, uint64_t* pMaxDeviation); + +#ifndef VK_NO_PROTOTYPES +VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceCalibrateableTimeDomainsKHR( + VkPhysicalDevice physicalDevice, + uint32_t* pTimeDomainCount, + VkTimeDomainKHR* pTimeDomains); + +VKAPI_ATTR VkResult VKAPI_CALL vkGetCalibratedTimestampsKHR( + VkDevice device, + uint32_t timestampCount, + const VkCalibratedTimestampInfoKHR* pTimestampInfos, + uint64_t* pTimestamps, + uint64_t* pMaxDeviation); +#endif + + +// VK_KHR_shader_expect_assume is a preprocessor guard. Do not pass it to API calls. +#define VK_KHR_shader_expect_assume 1 +#define VK_KHR_SHADER_EXPECT_ASSUME_SPEC_VERSION 1 +#define VK_KHR_SHADER_EXPECT_ASSUME_EXTENSION_NAME "VK_KHR_shader_expect_assume" +typedef struct VkPhysicalDeviceShaderExpectAssumeFeaturesKHR { + VkStructureType sType; + void* pNext; + VkBool32 shaderExpectAssume; +} VkPhysicalDeviceShaderExpectAssumeFeaturesKHR; + + + +// VK_KHR_maintenance6 is a preprocessor guard. Do not pass it to API calls. +#define VK_KHR_maintenance6 1 +#define VK_KHR_MAINTENANCE_6_SPEC_VERSION 1 +#define VK_KHR_MAINTENANCE_6_EXTENSION_NAME "VK_KHR_maintenance6" +typedef struct VkPhysicalDeviceMaintenance6FeaturesKHR { + VkStructureType sType; + void* pNext; + VkBool32 maintenance6; +} VkPhysicalDeviceMaintenance6FeaturesKHR; + +typedef struct VkPhysicalDeviceMaintenance6PropertiesKHR { + VkStructureType sType; + void* pNext; + VkBool32 blockTexelViewCompatibleMultipleLayers; + uint32_t maxCombinedImageSamplerDescriptorCount; + VkBool32 fragmentShadingRateClampCombinerInputs; +} VkPhysicalDeviceMaintenance6PropertiesKHR; + +typedef struct VkBindMemoryStatusKHR { + VkStructureType sType; + const void* pNext; + VkResult* pResult; +} VkBindMemoryStatusKHR; + +typedef struct VkBindDescriptorSetsInfoKHR { + VkStructureType sType; + const void* pNext; + VkShaderStageFlags stageFlags; + VkPipelineLayout layout; + uint32_t firstSet; + uint32_t descriptorSetCount; + const VkDescriptorSet* pDescriptorSets; + uint32_t dynamicOffsetCount; + const uint32_t* pDynamicOffsets; +} VkBindDescriptorSetsInfoKHR; + +typedef struct VkPushConstantsInfoKHR { + VkStructureType sType; + const void* pNext; + VkPipelineLayout layout; + VkShaderStageFlags stageFlags; + uint32_t offset; + uint32_t size; + const void* pValues; +} VkPushConstantsInfoKHR; + +typedef struct VkPushDescriptorSetInfoKHR { + VkStructureType sType; + const void* pNext; + VkShaderStageFlags stageFlags; + VkPipelineLayout layout; + uint32_t set; + uint32_t descriptorWriteCount; + const VkWriteDescriptorSet* pDescriptorWrites; +} VkPushDescriptorSetInfoKHR; + +typedef struct VkPushDescriptorSetWithTemplateInfoKHR { + VkStructureType sType; + const void* pNext; + VkDescriptorUpdateTemplate descriptorUpdateTemplate; + VkPipelineLayout layout; + uint32_t set; + const void* pData; +} VkPushDescriptorSetWithTemplateInfoKHR; + +typedef struct VkSetDescriptorBufferOffsetsInfoEXT { + VkStructureType sType; + const void* pNext; + VkShaderStageFlags stageFlags; + VkPipelineLayout layout; + uint32_t firstSet; + uint32_t setCount; + const uint32_t* pBufferIndices; + const VkDeviceSize* pOffsets; +} VkSetDescriptorBufferOffsetsInfoEXT; + +typedef struct VkBindDescriptorBufferEmbeddedSamplersInfoEXT { + VkStructureType sType; + const void* pNext; + VkShaderStageFlags stageFlags; + VkPipelineLayout layout; + uint32_t set; +} VkBindDescriptorBufferEmbeddedSamplersInfoEXT; + +typedef void (VKAPI_PTR *PFN_vkCmdBindDescriptorSets2KHR)(VkCommandBuffer commandBuffer, const VkBindDescriptorSetsInfoKHR* pBindDescriptorSetsInfo); +typedef void (VKAPI_PTR *PFN_vkCmdPushConstants2KHR)(VkCommandBuffer commandBuffer, const VkPushConstantsInfoKHR* pPushConstantsInfo); +typedef void (VKAPI_PTR *PFN_vkCmdPushDescriptorSet2KHR)(VkCommandBuffer commandBuffer, const VkPushDescriptorSetInfoKHR* pPushDescriptorSetInfo); +typedef void (VKAPI_PTR *PFN_vkCmdPushDescriptorSetWithTemplate2KHR)(VkCommandBuffer commandBuffer, const VkPushDescriptorSetWithTemplateInfoKHR* pPushDescriptorSetWithTemplateInfo); +typedef void (VKAPI_PTR *PFN_vkCmdSetDescriptorBufferOffsets2EXT)(VkCommandBuffer commandBuffer, const VkSetDescriptorBufferOffsetsInfoEXT* pSetDescriptorBufferOffsetsInfo); +typedef void (VKAPI_PTR *PFN_vkCmdBindDescriptorBufferEmbeddedSamplers2EXT)(VkCommandBuffer commandBuffer, const VkBindDescriptorBufferEmbeddedSamplersInfoEXT* pBindDescriptorBufferEmbeddedSamplersInfo); + +#ifndef VK_NO_PROTOTYPES +VKAPI_ATTR void VKAPI_CALL vkCmdBindDescriptorSets2KHR( + VkCommandBuffer commandBuffer, + const VkBindDescriptorSetsInfoKHR* pBindDescriptorSetsInfo); + +VKAPI_ATTR void VKAPI_CALL vkCmdPushConstants2KHR( + VkCommandBuffer commandBuffer, + const VkPushConstantsInfoKHR* pPushConstantsInfo); + +VKAPI_ATTR void VKAPI_CALL vkCmdPushDescriptorSet2KHR( + VkCommandBuffer commandBuffer, + const VkPushDescriptorSetInfoKHR* pPushDescriptorSetInfo); + +VKAPI_ATTR void VKAPI_CALL vkCmdPushDescriptorSetWithTemplate2KHR( + VkCommandBuffer commandBuffer, + const VkPushDescriptorSetWithTemplateInfoKHR* pPushDescriptorSetWithTemplateInfo); + +VKAPI_ATTR void VKAPI_CALL vkCmdSetDescriptorBufferOffsets2EXT( + VkCommandBuffer commandBuffer, + const VkSetDescriptorBufferOffsetsInfoEXT* pSetDescriptorBufferOffsetsInfo); + +VKAPI_ATTR void VKAPI_CALL vkCmdBindDescriptorBufferEmbeddedSamplers2EXT( + VkCommandBuffer commandBuffer, + const VkBindDescriptorBufferEmbeddedSamplersInfoEXT* pBindDescriptorBufferEmbeddedSamplersInfo); +#endif + + // VK_EXT_debug_report is a preprocessor guard. Do not pass it to API calls. #define VK_EXT_debug_report 1 VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkDebugReportCallbackEXT) @@ -10731,6 +11746,8 @@ typedef enum VkDebugReportObjectTypeEXT { VK_DEBUG_REPORT_OBJECT_TYPE_CU_FUNCTION_NVX_EXT = 1000029001, VK_DEBUG_REPORT_OBJECT_TYPE_ACCELERATION_STRUCTURE_KHR_EXT = 1000150000, VK_DEBUG_REPORT_OBJECT_TYPE_ACCELERATION_STRUCTURE_NV_EXT = 1000165000, + VK_DEBUG_REPORT_OBJECT_TYPE_CUDA_MODULE_NV_EXT = 1000307000, + VK_DEBUG_REPORT_OBJECT_TYPE_CUDA_FUNCTION_NV_EXT = 1000307001, VK_DEBUG_REPORT_OBJECT_TYPE_BUFFER_COLLECTION_FUCHSIA_EXT = 1000366000, VK_DEBUG_REPORT_OBJECT_TYPE_DEBUG_REPORT_EXT = VK_DEBUG_REPORT_OBJECT_TYPE_DEBUG_REPORT_CALLBACK_EXT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_VALIDATION_CACHE_EXT = VK_DEBUG_REPORT_OBJECT_TYPE_VALIDATION_CACHE_EXT_EXT, @@ -11311,7 +12328,7 @@ typedef struct VkExportMemoryAllocateInfoNV { // VK_EXT_validation_flags is a preprocessor guard. Do not pass it to API calls. #define VK_EXT_validation_flags 1 -#define VK_EXT_VALIDATION_FLAGS_SPEC_VERSION 2 +#define VK_EXT_VALIDATION_FLAGS_SPEC_VERSION 3 #define VK_EXT_VALIDATION_FLAGS_EXTENSION_NAME "VK_EXT_validation_flags" typedef enum VkValidationCheckEXT { @@ -11864,6 +12881,18 @@ VKAPI_ATTR void VKAPI_CALL vkSetHdrMetadataEXT( #endif +// VK_IMG_relaxed_line_rasterization is a preprocessor guard. Do not pass it to API calls. +#define VK_IMG_relaxed_line_rasterization 1 +#define VK_IMG_RELAXED_LINE_RASTERIZATION_SPEC_VERSION 1 +#define VK_IMG_RELAXED_LINE_RASTERIZATION_EXTENSION_NAME "VK_IMG_relaxed_line_rasterization" +typedef struct VkPhysicalDeviceRelaxedLineRasterizationFeaturesIMG { + VkStructureType sType; + void* pNext; + VkBool32 relaxedLineRasterization; +} VkPhysicalDeviceRelaxedLineRasterizationFeaturesIMG; + + + // VK_EXT_external_memory_dma_buf is a preprocessor guard. Do not pass it to API calls. #define VK_EXT_external_memory_dma_buf 1 #define VK_EXT_EXTERNAL_MEMORY_DMA_BUF_SPEC_VERSION 1 @@ -13010,33 +14039,23 @@ typedef struct VkPipelineCompilerControlCreateInfoAMD { #define VK_EXT_calibrated_timestamps 1 #define VK_EXT_CALIBRATED_TIMESTAMPS_SPEC_VERSION 2 #define VK_EXT_CALIBRATED_TIMESTAMPS_EXTENSION_NAME "VK_EXT_calibrated_timestamps" +typedef VkTimeDomainKHR VkTimeDomainEXT; -typedef enum VkTimeDomainEXT { - VK_TIME_DOMAIN_DEVICE_EXT = 0, - VK_TIME_DOMAIN_CLOCK_MONOTONIC_EXT = 1, - VK_TIME_DOMAIN_CLOCK_MONOTONIC_RAW_EXT = 2, - VK_TIME_DOMAIN_QUERY_PERFORMANCE_COUNTER_EXT = 3, - VK_TIME_DOMAIN_MAX_ENUM_EXT = 0x7FFFFFFF -} VkTimeDomainEXT; -typedef struct VkCalibratedTimestampInfoEXT { - VkStructureType sType; - const void* pNext; - VkTimeDomainEXT timeDomain; -} VkCalibratedTimestampInfoEXT; +typedef VkCalibratedTimestampInfoKHR VkCalibratedTimestampInfoEXT; -typedef VkResult (VKAPI_PTR *PFN_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT)(VkPhysicalDevice physicalDevice, uint32_t* pTimeDomainCount, VkTimeDomainEXT* pTimeDomains); -typedef VkResult (VKAPI_PTR *PFN_vkGetCalibratedTimestampsEXT)(VkDevice device, uint32_t timestampCount, const VkCalibratedTimestampInfoEXT* pTimestampInfos, uint64_t* pTimestamps, uint64_t* pMaxDeviation); +typedef VkResult (VKAPI_PTR *PFN_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT)(VkPhysicalDevice physicalDevice, uint32_t* pTimeDomainCount, VkTimeDomainKHR* pTimeDomains); +typedef VkResult (VKAPI_PTR *PFN_vkGetCalibratedTimestampsEXT)(VkDevice device, uint32_t timestampCount, const VkCalibratedTimestampInfoKHR* pTimestampInfos, uint64_t* pTimestamps, uint64_t* pMaxDeviation); #ifndef VK_NO_PROTOTYPES VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceCalibrateableTimeDomainsEXT( VkPhysicalDevice physicalDevice, uint32_t* pTimeDomainCount, - VkTimeDomainEXT* pTimeDomains); + VkTimeDomainKHR* pTimeDomains); VKAPI_ATTR VkResult VKAPI_CALL vkGetCalibratedTimestampsEXT( VkDevice device, uint32_t timestampCount, - const VkCalibratedTimestampInfoEXT* pTimestampInfos, + const VkCalibratedTimestampInfoKHR* pTimestampInfos, uint64_t* pTimestamps, uint64_t* pMaxDeviation); #endif @@ -13096,24 +14115,11 @@ typedef struct VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT { uint32_t maxVertexAttribDivisor; } VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT; -typedef struct VkVertexInputBindingDivisorDescriptionEXT { - uint32_t binding; - uint32_t divisor; -} VkVertexInputBindingDivisorDescriptionEXT; +typedef VkVertexInputBindingDivisorDescriptionKHR VkVertexInputBindingDivisorDescriptionEXT; -typedef struct VkPipelineVertexInputDivisorStateCreateInfoEXT { - VkStructureType sType; - const void* pNext; - uint32_t vertexBindingDivisorCount; - const VkVertexInputBindingDivisorDescriptionEXT* pVertexBindingDivisors; -} VkPipelineVertexInputDivisorStateCreateInfoEXT; +typedef VkPipelineVertexInputDivisorStateCreateInfoKHR VkPipelineVertexInputDivisorStateCreateInfoEXT; -typedef struct VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT { - VkStructureType sType; - void* pNext; - VkBool32 vertexAttributeInstanceRateDivisor; - VkBool32 vertexAttributeInstanceRateZeroDivisor; -} VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT; +typedef VkPhysicalDeviceVertexAttributeDivisorFeaturesKHR VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT; @@ -13700,7 +14706,7 @@ typedef VkImageStencilUsageCreateInfo VkImageStencilUsageCreateInfoEXT; // VK_EXT_validation_features is a preprocessor guard. Do not pass it to API calls. #define VK_EXT_validation_features 1 -#define VK_EXT_VALIDATION_FEATURES_SPEC_VERSION 5 +#define VK_EXT_VALIDATION_FEATURES_SPEC_VERSION 6 #define VK_EXT_VALIDATION_FEATURES_EXTENSION_NAME "VK_EXT_validation_features" typedef enum VkValidationFeatureEnableEXT { @@ -13905,39 +14911,13 @@ VKAPI_ATTR VkResult VKAPI_CALL vkCreateHeadlessSurfaceEXT( #define VK_EXT_line_rasterization 1 #define VK_EXT_LINE_RASTERIZATION_SPEC_VERSION 1 #define VK_EXT_LINE_RASTERIZATION_EXTENSION_NAME "VK_EXT_line_rasterization" +typedef VkLineRasterizationModeKHR VkLineRasterizationModeEXT; -typedef enum VkLineRasterizationModeEXT { - VK_LINE_RASTERIZATION_MODE_DEFAULT_EXT = 0, - VK_LINE_RASTERIZATION_MODE_RECTANGULAR_EXT = 1, - VK_LINE_RASTERIZATION_MODE_BRESENHAM_EXT = 2, - VK_LINE_RASTERIZATION_MODE_RECTANGULAR_SMOOTH_EXT = 3, - VK_LINE_RASTERIZATION_MODE_MAX_ENUM_EXT = 0x7FFFFFFF -} VkLineRasterizationModeEXT; -typedef struct VkPhysicalDeviceLineRasterizationFeaturesEXT { - VkStructureType sType; - void* pNext; - VkBool32 rectangularLines; - VkBool32 bresenhamLines; - VkBool32 smoothLines; - VkBool32 stippledRectangularLines; - VkBool32 stippledBresenhamLines; - VkBool32 stippledSmoothLines; -} VkPhysicalDeviceLineRasterizationFeaturesEXT; +typedef VkPhysicalDeviceLineRasterizationFeaturesKHR VkPhysicalDeviceLineRasterizationFeaturesEXT; -typedef struct VkPhysicalDeviceLineRasterizationPropertiesEXT { - VkStructureType sType; - void* pNext; - uint32_t lineSubPixelPrecisionBits; -} VkPhysicalDeviceLineRasterizationPropertiesEXT; +typedef VkPhysicalDeviceLineRasterizationPropertiesKHR VkPhysicalDeviceLineRasterizationPropertiesEXT; -typedef struct VkPipelineRasterizationLineStateCreateInfoEXT { - VkStructureType sType; - const void* pNext; - VkLineRasterizationModeEXT lineRasterizationMode; - VkBool32 stippledLineEnable; - uint32_t lineStippleFactor; - uint16_t lineStipplePattern; -} VkPipelineRasterizationLineStateCreateInfoEXT; +typedef VkPipelineRasterizationLineStateCreateInfoKHR VkPipelineRasterizationLineStateCreateInfoEXT; typedef void (VKAPI_PTR *PFN_vkCmdSetLineStippleEXT)(VkCommandBuffer commandBuffer, uint32_t lineStippleFactor, uint16_t lineStipplePattern); @@ -13993,11 +14973,7 @@ VKAPI_ATTR void VKAPI_CALL vkResetQueryPoolEXT( #define VK_EXT_index_type_uint8 1 #define VK_EXT_INDEX_TYPE_UINT8_SPEC_VERSION 1 #define VK_EXT_INDEX_TYPE_UINT8_EXTENSION_NAME "VK_EXT_index_type_uint8" -typedef struct VkPhysicalDeviceIndexTypeUint8FeaturesEXT { - VkStructureType sType; - void* pNext; - VkBool32 indexTypeUint8; -} VkPhysicalDeviceIndexTypeUint8FeaturesEXT; +typedef VkPhysicalDeviceIndexTypeUint8FeaturesKHR VkPhysicalDeviceIndexTypeUint8FeaturesEXT; @@ -14225,6 +15201,32 @@ VKAPI_ATTR void VKAPI_CALL vkGetImageSubresourceLayout2EXT( #endif +// VK_EXT_map_memory_placed is a preprocessor guard. Do not pass it to API calls. +#define VK_EXT_map_memory_placed 1 +#define VK_EXT_MAP_MEMORY_PLACED_SPEC_VERSION 1 +#define VK_EXT_MAP_MEMORY_PLACED_EXTENSION_NAME "VK_EXT_map_memory_placed" +typedef struct VkPhysicalDeviceMapMemoryPlacedFeaturesEXT { + VkStructureType sType; + void* pNext; + VkBool32 memoryMapPlaced; + VkBool32 memoryMapRangePlaced; + VkBool32 memoryUnmapReserve; +} VkPhysicalDeviceMapMemoryPlacedFeaturesEXT; + +typedef struct VkPhysicalDeviceMapMemoryPlacedPropertiesEXT { + VkStructureType sType; + void* pNext; + VkDeviceSize minPlacedMemoryMapAlignment; +} VkPhysicalDeviceMapMemoryPlacedPropertiesEXT; + +typedef struct VkMemoryMapPlacedInfoEXT { + VkStructureType sType; + const void* pNext; + void* pPlacedAddress; +} VkMemoryMapPlacedInfoEXT; + + + // VK_EXT_shader_atomic_float2 is a preprocessor guard. Do not pass it to API calls. #define VK_EXT_shader_atomic_float2 1 #define VK_EXT_SHADER_ATOMIC_FLOAT_2_SPEC_VERSION 1 @@ -14587,7 +15589,7 @@ typedef VkPhysicalDeviceTexelBufferAlignmentProperties VkPhysicalDeviceTexelBuff // VK_QCOM_render_pass_transform is a preprocessor guard. Do not pass it to API calls. #define VK_QCOM_render_pass_transform 1 -#define VK_QCOM_RENDER_PASS_TRANSFORM_SPEC_VERSION 3 +#define VK_QCOM_RENDER_PASS_TRANSFORM_SPEC_VERSION 4 #define VK_QCOM_RENDER_PASS_TRANSFORM_EXTENSION_NAME "VK_QCOM_render_pass_transform" typedef struct VkRenderPassTransformBeginInfoQCOM { VkStructureType sType; @@ -14880,6 +15882,98 @@ typedef struct VkDeviceDiagnosticsConfigCreateInfoNV { #define VK_QCOM_RENDER_PASS_STORE_OPS_EXTENSION_NAME "VK_QCOM_render_pass_store_ops" +// VK_NV_cuda_kernel_launch is a preprocessor guard. Do not pass it to API calls. +#define VK_NV_cuda_kernel_launch 1 +VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkCudaModuleNV) +VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkCudaFunctionNV) +#define VK_NV_CUDA_KERNEL_LAUNCH_SPEC_VERSION 2 +#define VK_NV_CUDA_KERNEL_LAUNCH_EXTENSION_NAME "VK_NV_cuda_kernel_launch" +typedef struct VkCudaModuleCreateInfoNV { + VkStructureType sType; + const void* pNext; + size_t dataSize; + const void* pData; +} VkCudaModuleCreateInfoNV; + +typedef struct VkCudaFunctionCreateInfoNV { + VkStructureType sType; + const void* pNext; + VkCudaModuleNV module; + const char* pName; +} VkCudaFunctionCreateInfoNV; + +typedef struct VkCudaLaunchInfoNV { + VkStructureType sType; + const void* pNext; + VkCudaFunctionNV function; + uint32_t gridDimX; + uint32_t gridDimY; + uint32_t gridDimZ; + uint32_t blockDimX; + uint32_t blockDimY; + uint32_t blockDimZ; + uint32_t sharedMemBytes; + size_t paramCount; + const void* const * pParams; + size_t extraCount; + const void* const * pExtras; +} VkCudaLaunchInfoNV; + +typedef struct VkPhysicalDeviceCudaKernelLaunchFeaturesNV { + VkStructureType sType; + void* pNext; + VkBool32 cudaKernelLaunchFeatures; +} VkPhysicalDeviceCudaKernelLaunchFeaturesNV; + +typedef struct VkPhysicalDeviceCudaKernelLaunchPropertiesNV { + VkStructureType sType; + void* pNext; + uint32_t computeCapabilityMinor; + uint32_t computeCapabilityMajor; +} VkPhysicalDeviceCudaKernelLaunchPropertiesNV; + +typedef VkResult (VKAPI_PTR *PFN_vkCreateCudaModuleNV)(VkDevice device, const VkCudaModuleCreateInfoNV* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkCudaModuleNV* pModule); +typedef VkResult (VKAPI_PTR *PFN_vkGetCudaModuleCacheNV)(VkDevice device, VkCudaModuleNV module, size_t* pCacheSize, void* pCacheData); +typedef VkResult (VKAPI_PTR *PFN_vkCreateCudaFunctionNV)(VkDevice device, const VkCudaFunctionCreateInfoNV* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkCudaFunctionNV* pFunction); +typedef void (VKAPI_PTR *PFN_vkDestroyCudaModuleNV)(VkDevice device, VkCudaModuleNV module, const VkAllocationCallbacks* pAllocator); +typedef void (VKAPI_PTR *PFN_vkDestroyCudaFunctionNV)(VkDevice device, VkCudaFunctionNV function, const VkAllocationCallbacks* pAllocator); +typedef void (VKAPI_PTR *PFN_vkCmdCudaLaunchKernelNV)(VkCommandBuffer commandBuffer, const VkCudaLaunchInfoNV* pLaunchInfo); + +#ifndef VK_NO_PROTOTYPES +VKAPI_ATTR VkResult VKAPI_CALL vkCreateCudaModuleNV( + VkDevice device, + const VkCudaModuleCreateInfoNV* pCreateInfo, + const VkAllocationCallbacks* pAllocator, + VkCudaModuleNV* pModule); + +VKAPI_ATTR VkResult VKAPI_CALL vkGetCudaModuleCacheNV( + VkDevice device, + VkCudaModuleNV module, + size_t* pCacheSize, + void* pCacheData); + +VKAPI_ATTR VkResult VKAPI_CALL vkCreateCudaFunctionNV( + VkDevice device, + const VkCudaFunctionCreateInfoNV* pCreateInfo, + const VkAllocationCallbacks* pAllocator, + VkCudaFunctionNV* pFunction); + +VKAPI_ATTR void VKAPI_CALL vkDestroyCudaModuleNV( + VkDevice device, + VkCudaModuleNV module, + const VkAllocationCallbacks* pAllocator); + +VKAPI_ATTR void VKAPI_CALL vkDestroyCudaFunctionNV( + VkDevice device, + VkCudaFunctionNV function, + const VkAllocationCallbacks* pAllocator); + +VKAPI_ATTR void VKAPI_CALL vkCmdCudaLaunchKernelNV( + VkCommandBuffer commandBuffer, + const VkCudaLaunchInfoNV* pLaunchInfo); +#endif + + // VK_NV_low_latency is a preprocessor guard. Do not pass it to API calls. #define VK_NV_low_latency 1 #define VK_NV_LOW_LATENCY_SPEC_VERSION 1 @@ -15335,7 +16429,7 @@ typedef struct VkPhysicalDeviceFragmentDensityMap2PropertiesEXT { // VK_QCOM_rotated_copy_commands is a preprocessor guard. Do not pass it to API calls. #define VK_QCOM_rotated_copy_commands 1 -#define VK_QCOM_ROTATED_COPY_COMMANDS_SPEC_VERSION 1 +#define VK_QCOM_ROTATED_COPY_COMMANDS_SPEC_VERSION 2 #define VK_QCOM_ROTATED_COPY_COMMANDS_EXTENSION_NAME "VK_QCOM_rotated_copy_commands" typedef struct VkCopyCommandTransformInfoQCOM { VkStructureType sType; @@ -15816,6 +16910,38 @@ VKAPI_ATTR VkResult VKAPI_CALL vkGetPipelinePropertiesEXT( #endif +// VK_EXT_frame_boundary is a preprocessor guard. Do not pass it to API calls. +#define VK_EXT_frame_boundary 1 +#define VK_EXT_FRAME_BOUNDARY_SPEC_VERSION 1 +#define VK_EXT_FRAME_BOUNDARY_EXTENSION_NAME "VK_EXT_frame_boundary" + +typedef enum VkFrameBoundaryFlagBitsEXT { + VK_FRAME_BOUNDARY_FRAME_END_BIT_EXT = 0x00000001, + VK_FRAME_BOUNDARY_FLAG_BITS_MAX_ENUM_EXT = 0x7FFFFFFF +} VkFrameBoundaryFlagBitsEXT; +typedef VkFlags VkFrameBoundaryFlagsEXT; +typedef struct VkPhysicalDeviceFrameBoundaryFeaturesEXT { + VkStructureType sType; + void* pNext; + VkBool32 frameBoundary; +} VkPhysicalDeviceFrameBoundaryFeaturesEXT; + +typedef struct VkFrameBoundaryEXT { + VkStructureType sType; + const void* pNext; + VkFrameBoundaryFlagsEXT flags; + uint64_t frameID; + uint32_t imageCount; + const VkImage* pImages; + uint32_t bufferCount; + const VkBuffer* pBuffers; + uint64_t tagName; + size_t tagSize; + const void* pTag; +} VkFrameBoundaryEXT; + + + // VK_EXT_multisampled_render_to_single_sampled is a preprocessor guard. Do not pass it to API calls. #define VK_EXT_multisampled_render_to_single_sampled 1 #define VK_EXT_MULTISAMPLED_RENDER_TO_SINGLE_SAMPLED_SPEC_VERSION 1 @@ -16317,7 +17443,7 @@ VKAPI_ATTR void VKAPI_CALL vkGetMicromapBuildSizesEXT( // VK_HUAWEI_cluster_culling_shader is a preprocessor guard. Do not pass it to API calls. #define VK_HUAWEI_cluster_culling_shader 1 -#define VK_HUAWEI_CLUSTER_CULLING_SHADER_SPEC_VERSION 2 +#define VK_HUAWEI_CLUSTER_CULLING_SHADER_SPEC_VERSION 3 #define VK_HUAWEI_CLUSTER_CULLING_SHADER_EXTENSION_NAME "VK_HUAWEI_cluster_culling_shader" typedef struct VkPhysicalDeviceClusterCullingShaderFeaturesHUAWEI { VkStructureType sType; @@ -16335,6 +17461,12 @@ typedef struct VkPhysicalDeviceClusterCullingShaderPropertiesHUAWEI { VkDeviceSize indirectBufferOffsetAlignment; } VkPhysicalDeviceClusterCullingShaderPropertiesHUAWEI; +typedef struct VkPhysicalDeviceClusterCullingShaderVrsFeaturesHUAWEI { + VkStructureType sType; + void* pNext; + VkBool32 clusterShadingRate; +} VkPhysicalDeviceClusterCullingShaderVrsFeaturesHUAWEI; + typedef void (VKAPI_PTR *PFN_vkCmdDrawClusterHUAWEI)(VkCommandBuffer commandBuffer, uint32_t groupCountX, uint32_t groupCountY, uint32_t groupCountZ); typedef void (VKAPI_PTR *PFN_vkCmdDrawClusterIndirectHUAWEI)(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset); @@ -16406,6 +17538,36 @@ typedef struct VkPhysicalDeviceShaderCorePropertiesARM { +// VK_ARM_scheduling_controls is a preprocessor guard. Do not pass it to API calls. +#define VK_ARM_scheduling_controls 1 +#define VK_ARM_SCHEDULING_CONTROLS_SPEC_VERSION 1 +#define VK_ARM_SCHEDULING_CONTROLS_EXTENSION_NAME "VK_ARM_scheduling_controls" +typedef VkFlags64 VkPhysicalDeviceSchedulingControlsFlagsARM; + +// Flag bits for VkPhysicalDeviceSchedulingControlsFlagBitsARM +typedef VkFlags64 VkPhysicalDeviceSchedulingControlsFlagBitsARM; +static const VkPhysicalDeviceSchedulingControlsFlagBitsARM VK_PHYSICAL_DEVICE_SCHEDULING_CONTROLS_SHADER_CORE_COUNT_ARM = 0x00000001ULL; + +typedef struct VkDeviceQueueShaderCoreControlCreateInfoARM { + VkStructureType sType; + void* pNext; + uint32_t shaderCoreCount; +} VkDeviceQueueShaderCoreControlCreateInfoARM; + +typedef struct VkPhysicalDeviceSchedulingControlsFeaturesARM { + VkStructureType sType; + void* pNext; + VkBool32 schedulingControls; +} VkPhysicalDeviceSchedulingControlsFeaturesARM; + +typedef struct VkPhysicalDeviceSchedulingControlsPropertiesARM { + VkStructureType sType; + void* pNext; + VkPhysicalDeviceSchedulingControlsFlagsARM schedulingControlsFlags; +} VkPhysicalDeviceSchedulingControlsPropertiesARM; + + + // VK_EXT_image_sliced_view_of_3d is a preprocessor guard. Do not pass it to API calls. #define VK_EXT_image_sliced_view_of_3d 1 #define VK_EXT_IMAGE_SLICED_VIEW_OF_3D_SPEC_VERSION 1 @@ -16490,6 +17652,45 @@ typedef struct VkPhysicalDeviceNonSeamlessCubeMapFeaturesEXT { +// VK_ARM_render_pass_striped is a preprocessor guard. Do not pass it to API calls. +#define VK_ARM_render_pass_striped 1 +#define VK_ARM_RENDER_PASS_STRIPED_SPEC_VERSION 1 +#define VK_ARM_RENDER_PASS_STRIPED_EXTENSION_NAME "VK_ARM_render_pass_striped" +typedef struct VkPhysicalDeviceRenderPassStripedFeaturesARM { + VkStructureType sType; + void* pNext; + VkBool32 renderPassStriped; +} VkPhysicalDeviceRenderPassStripedFeaturesARM; + +typedef struct VkPhysicalDeviceRenderPassStripedPropertiesARM { + VkStructureType sType; + void* pNext; + VkExtent2D renderPassStripeGranularity; + uint32_t maxRenderPassStripes; +} VkPhysicalDeviceRenderPassStripedPropertiesARM; + +typedef struct VkRenderPassStripeInfoARM { + VkStructureType sType; + const void* pNext; + VkRect2D stripeArea; +} VkRenderPassStripeInfoARM; + +typedef struct VkRenderPassStripeBeginInfoARM { + VkStructureType sType; + const void* pNext; + uint32_t stripeInfoCount; + const VkRenderPassStripeInfoARM* pStripeInfos; +} VkRenderPassStripeBeginInfoARM; + +typedef struct VkRenderPassStripeSubmitInfoARM { + VkStructureType sType; + const void* pNext; + uint32_t stripeSemaphoreInfoCount; + const VkSemaphoreSubmitInfo* pStripeSemaphoreInfos; +} VkRenderPassStripeSubmitInfoARM; + + + // VK_QCOM_fragment_density_map_offset is a preprocessor guard. Do not pass it to API calls. #define VK_QCOM_fragment_density_map_offset 1 #define VK_QCOM_FRAGMENT_DENSITY_MAP_OFFSET_SPEC_VERSION 1 @@ -16728,6 +17929,26 @@ typedef struct VkPhysicalDeviceImageProcessingPropertiesQCOM { +// VK_EXT_nested_command_buffer is a preprocessor guard. Do not pass it to API calls. +#define VK_EXT_nested_command_buffer 1 +#define VK_EXT_NESTED_COMMAND_BUFFER_SPEC_VERSION 1 +#define VK_EXT_NESTED_COMMAND_BUFFER_EXTENSION_NAME "VK_EXT_nested_command_buffer" +typedef struct VkPhysicalDeviceNestedCommandBufferFeaturesEXT { + VkStructureType sType; + void* pNext; + VkBool32 nestedCommandBuffer; + VkBool32 nestedCommandBufferRendering; + VkBool32 nestedCommandBufferSimultaneousUse; +} VkPhysicalDeviceNestedCommandBufferFeaturesEXT; + +typedef struct VkPhysicalDeviceNestedCommandBufferPropertiesEXT { + VkStructureType sType; + void* pNext; + uint32_t maxCommandBufferNestingLevel; +} VkPhysicalDeviceNestedCommandBufferPropertiesEXT; + + + // VK_EXT_external_memory_acquire_unmodified is a preprocessor guard. Do not pass it to API calls. #define VK_EXT_external_memory_acquire_unmodified 1 #define VK_EXT_EXTERNAL_MEMORY_ACQUIRE_UNMODIFIED_SPEC_VERSION 1 @@ -16803,7 +18024,6 @@ typedef struct VkColorBlendAdvancedEXT { VkBool32 clampResults; } VkColorBlendAdvancedEXT; -typedef void (VKAPI_PTR *PFN_vkCmdSetTessellationDomainOriginEXT)(VkCommandBuffer commandBuffer, VkTessellationDomainOrigin domainOrigin); typedef void (VKAPI_PTR *PFN_vkCmdSetDepthClampEnableEXT)(VkCommandBuffer commandBuffer, VkBool32 depthClampEnable); typedef void (VKAPI_PTR *PFN_vkCmdSetPolygonModeEXT)(VkCommandBuffer commandBuffer, VkPolygonMode polygonMode); typedef void (VKAPI_PTR *PFN_vkCmdSetRasterizationSamplesEXT)(VkCommandBuffer commandBuffer, VkSampleCountFlagBits rasterizationSamples); @@ -16814,6 +18034,7 @@ typedef void (VKAPI_PTR *PFN_vkCmdSetLogicOpEnableEXT)(VkCommandBuffer commandBu typedef void (VKAPI_PTR *PFN_vkCmdSetColorBlendEnableEXT)(VkCommandBuffer commandBuffer, uint32_t firstAttachment, uint32_t attachmentCount, const VkBool32* pColorBlendEnables); typedef void (VKAPI_PTR *PFN_vkCmdSetColorBlendEquationEXT)(VkCommandBuffer commandBuffer, uint32_t firstAttachment, uint32_t attachmentCount, const VkColorBlendEquationEXT* pColorBlendEquations); typedef void (VKAPI_PTR *PFN_vkCmdSetColorWriteMaskEXT)(VkCommandBuffer commandBuffer, uint32_t firstAttachment, uint32_t attachmentCount, const VkColorComponentFlags* pColorWriteMasks); +typedef void (VKAPI_PTR *PFN_vkCmdSetTessellationDomainOriginEXT)(VkCommandBuffer commandBuffer, VkTessellationDomainOrigin domainOrigin); typedef void (VKAPI_PTR *PFN_vkCmdSetRasterizationStreamEXT)(VkCommandBuffer commandBuffer, uint32_t rasterizationStream); typedef void (VKAPI_PTR *PFN_vkCmdSetConservativeRasterizationModeEXT)(VkCommandBuffer commandBuffer, VkConservativeRasterizationModeEXT conservativeRasterizationMode); typedef void (VKAPI_PTR *PFN_vkCmdSetExtraPrimitiveOverestimationSizeEXT)(VkCommandBuffer commandBuffer, float extraPrimitiveOverestimationSize); @@ -16836,10 +18057,6 @@ typedef void (VKAPI_PTR *PFN_vkCmdSetRepresentativeFragmentTestEnableNV)(VkComma typedef void (VKAPI_PTR *PFN_vkCmdSetCoverageReductionModeNV)(VkCommandBuffer commandBuffer, VkCoverageReductionModeNV coverageReductionMode); #ifndef VK_NO_PROTOTYPES -VKAPI_ATTR void VKAPI_CALL vkCmdSetTessellationDomainOriginEXT( - VkCommandBuffer commandBuffer, - VkTessellationDomainOrigin domainOrigin); - VKAPI_ATTR void VKAPI_CALL vkCmdSetDepthClampEnableEXT( VkCommandBuffer commandBuffer, VkBool32 depthClampEnable); @@ -16887,6 +18104,10 @@ VKAPI_ATTR void VKAPI_CALL vkCmdSetColorWriteMaskEXT( uint32_t attachmentCount, const VkColorComponentFlags* pColorWriteMasks); +VKAPI_ATTR void VKAPI_CALL vkCmdSetTessellationDomainOriginEXT( + VkCommandBuffer commandBuffer, + VkTessellationDomainOrigin domainOrigin); + VKAPI_ATTR void VKAPI_CALL vkCmdSetRasterizationStreamEXT( VkCommandBuffer commandBuffer, uint32_t rasterizationStream); @@ -17055,7 +18276,7 @@ typedef struct VkDirectDriverLoadingInfoLUNARG { typedef struct VkDirectDriverLoadingListLUNARG { VkStructureType sType; - void* pNext; + const void* pNext; VkDirectDriverLoadingModeLUNARG mode; uint32_t driverCount; const VkDirectDriverLoadingInfoLUNARG* pDrivers; @@ -17482,12 +18703,65 @@ typedef struct VkPhysicalDeviceRayTracingInvocationReorderFeaturesNV { +// VK_NV_extended_sparse_address_space is a preprocessor guard. Do not pass it to API calls. +#define VK_NV_extended_sparse_address_space 1 +#define VK_NV_EXTENDED_SPARSE_ADDRESS_SPACE_SPEC_VERSION 1 +#define VK_NV_EXTENDED_SPARSE_ADDRESS_SPACE_EXTENSION_NAME "VK_NV_extended_sparse_address_space" +typedef struct VkPhysicalDeviceExtendedSparseAddressSpaceFeaturesNV { + VkStructureType sType; + void* pNext; + VkBool32 extendedSparseAddressSpace; +} VkPhysicalDeviceExtendedSparseAddressSpaceFeaturesNV; + +typedef struct VkPhysicalDeviceExtendedSparseAddressSpacePropertiesNV { + VkStructureType sType; + void* pNext; + VkDeviceSize extendedSparseAddressSpaceSize; + VkImageUsageFlags extendedSparseImageUsageFlags; + VkBufferUsageFlags extendedSparseBufferUsageFlags; +} VkPhysicalDeviceExtendedSparseAddressSpacePropertiesNV; + + + // VK_EXT_mutable_descriptor_type is a preprocessor guard. Do not pass it to API calls. #define VK_EXT_mutable_descriptor_type 1 #define VK_EXT_MUTABLE_DESCRIPTOR_TYPE_SPEC_VERSION 1 #define VK_EXT_MUTABLE_DESCRIPTOR_TYPE_EXTENSION_NAME "VK_EXT_mutable_descriptor_type" +// VK_EXT_layer_settings is a preprocessor guard. Do not pass it to API calls. +#define VK_EXT_layer_settings 1 +#define VK_EXT_LAYER_SETTINGS_SPEC_VERSION 2 +#define VK_EXT_LAYER_SETTINGS_EXTENSION_NAME "VK_EXT_layer_settings" + +typedef enum VkLayerSettingTypeEXT { + VK_LAYER_SETTING_TYPE_BOOL32_EXT = 0, + VK_LAYER_SETTING_TYPE_INT32_EXT = 1, + VK_LAYER_SETTING_TYPE_INT64_EXT = 2, + VK_LAYER_SETTING_TYPE_UINT32_EXT = 3, + VK_LAYER_SETTING_TYPE_UINT64_EXT = 4, + VK_LAYER_SETTING_TYPE_FLOAT32_EXT = 5, + VK_LAYER_SETTING_TYPE_FLOAT64_EXT = 6, + VK_LAYER_SETTING_TYPE_STRING_EXT = 7, + VK_LAYER_SETTING_TYPE_MAX_ENUM_EXT = 0x7FFFFFFF +} VkLayerSettingTypeEXT; +typedef struct VkLayerSettingEXT { + const char* pLayerName; + const char* pSettingName; + VkLayerSettingTypeEXT type; + uint32_t valueCount; + const void* pValues; +} VkLayerSettingEXT; + +typedef struct VkLayerSettingsCreateInfoEXT { + VkStructureType sType; + const void* pNext; + uint32_t settingCount; + const VkLayerSettingEXT* pSettings; +} VkLayerSettingsCreateInfoEXT; + + + // VK_ARM_shader_core_builtins is a preprocessor guard. Do not pass it to API calls. #define VK_ARM_shader_core_builtins 1 #define VK_ARM_SHADER_CORE_BUILTINS_SPEC_VERSION 2 @@ -17532,6 +18806,138 @@ typedef struct VkPhysicalDeviceDynamicRenderingUnusedAttachmentsFeaturesEXT { +// VK_NV_low_latency2 is a preprocessor guard. Do not pass it to API calls. +#define VK_NV_low_latency2 1 +#define VK_NV_LOW_LATENCY_2_SPEC_VERSION 2 +#define VK_NV_LOW_LATENCY_2_EXTENSION_NAME "VK_NV_low_latency2" + +typedef enum VkLatencyMarkerNV { + VK_LATENCY_MARKER_SIMULATION_START_NV = 0, + VK_LATENCY_MARKER_SIMULATION_END_NV = 1, + VK_LATENCY_MARKER_RENDERSUBMIT_START_NV = 2, + VK_LATENCY_MARKER_RENDERSUBMIT_END_NV = 3, + VK_LATENCY_MARKER_PRESENT_START_NV = 4, + VK_LATENCY_MARKER_PRESENT_END_NV = 5, + VK_LATENCY_MARKER_INPUT_SAMPLE_NV = 6, + VK_LATENCY_MARKER_TRIGGER_FLASH_NV = 7, + VK_LATENCY_MARKER_OUT_OF_BAND_RENDERSUBMIT_START_NV = 8, + VK_LATENCY_MARKER_OUT_OF_BAND_RENDERSUBMIT_END_NV = 9, + VK_LATENCY_MARKER_OUT_OF_BAND_PRESENT_START_NV = 10, + VK_LATENCY_MARKER_OUT_OF_BAND_PRESENT_END_NV = 11, + VK_LATENCY_MARKER_MAX_ENUM_NV = 0x7FFFFFFF +} VkLatencyMarkerNV; + +typedef enum VkOutOfBandQueueTypeNV { + VK_OUT_OF_BAND_QUEUE_TYPE_RENDER_NV = 0, + VK_OUT_OF_BAND_QUEUE_TYPE_PRESENT_NV = 1, + VK_OUT_OF_BAND_QUEUE_TYPE_MAX_ENUM_NV = 0x7FFFFFFF +} VkOutOfBandQueueTypeNV; +typedef struct VkLatencySleepModeInfoNV { + VkStructureType sType; + const void* pNext; + VkBool32 lowLatencyMode; + VkBool32 lowLatencyBoost; + uint32_t minimumIntervalUs; +} VkLatencySleepModeInfoNV; + +typedef struct VkLatencySleepInfoNV { + VkStructureType sType; + const void* pNext; + VkSemaphore signalSemaphore; + uint64_t value; +} VkLatencySleepInfoNV; + +typedef struct VkSetLatencyMarkerInfoNV { + VkStructureType sType; + const void* pNext; + uint64_t presentID; + VkLatencyMarkerNV marker; +} VkSetLatencyMarkerInfoNV; + +typedef struct VkLatencyTimingsFrameReportNV { + VkStructureType sType; + const void* pNext; + uint64_t presentID; + uint64_t inputSampleTimeUs; + uint64_t simStartTimeUs; + uint64_t simEndTimeUs; + uint64_t renderSubmitStartTimeUs; + uint64_t renderSubmitEndTimeUs; + uint64_t presentStartTimeUs; + uint64_t presentEndTimeUs; + uint64_t driverStartTimeUs; + uint64_t driverEndTimeUs; + uint64_t osRenderQueueStartTimeUs; + uint64_t osRenderQueueEndTimeUs; + uint64_t gpuRenderStartTimeUs; + uint64_t gpuRenderEndTimeUs; +} VkLatencyTimingsFrameReportNV; + +typedef struct VkGetLatencyMarkerInfoNV { + VkStructureType sType; + const void* pNext; + uint32_t timingCount; + VkLatencyTimingsFrameReportNV* pTimings; +} VkGetLatencyMarkerInfoNV; + +typedef struct VkLatencySubmissionPresentIdNV { + VkStructureType sType; + const void* pNext; + uint64_t presentID; +} VkLatencySubmissionPresentIdNV; + +typedef struct VkSwapchainLatencyCreateInfoNV { + VkStructureType sType; + const void* pNext; + VkBool32 latencyModeEnable; +} VkSwapchainLatencyCreateInfoNV; + +typedef struct VkOutOfBandQueueTypeInfoNV { + VkStructureType sType; + const void* pNext; + VkOutOfBandQueueTypeNV queueType; +} VkOutOfBandQueueTypeInfoNV; + +typedef struct VkLatencySurfaceCapabilitiesNV { + VkStructureType sType; + const void* pNext; + uint32_t presentModeCount; + VkPresentModeKHR* pPresentModes; +} VkLatencySurfaceCapabilitiesNV; + +typedef VkResult (VKAPI_PTR *PFN_vkSetLatencySleepModeNV)(VkDevice device, VkSwapchainKHR swapchain, const VkLatencySleepModeInfoNV* pSleepModeInfo); +typedef VkResult (VKAPI_PTR *PFN_vkLatencySleepNV)(VkDevice device, VkSwapchainKHR swapchain, const VkLatencySleepInfoNV* pSleepInfo); +typedef void (VKAPI_PTR *PFN_vkSetLatencyMarkerNV)(VkDevice device, VkSwapchainKHR swapchain, const VkSetLatencyMarkerInfoNV* pLatencyMarkerInfo); +typedef void (VKAPI_PTR *PFN_vkGetLatencyTimingsNV)(VkDevice device, VkSwapchainKHR swapchain, VkGetLatencyMarkerInfoNV* pLatencyMarkerInfo); +typedef void (VKAPI_PTR *PFN_vkQueueNotifyOutOfBandNV)(VkQueue queue, const VkOutOfBandQueueTypeInfoNV* pQueueTypeInfo); + +#ifndef VK_NO_PROTOTYPES +VKAPI_ATTR VkResult VKAPI_CALL vkSetLatencySleepModeNV( + VkDevice device, + VkSwapchainKHR swapchain, + const VkLatencySleepModeInfoNV* pSleepModeInfo); + +VKAPI_ATTR VkResult VKAPI_CALL vkLatencySleepNV( + VkDevice device, + VkSwapchainKHR swapchain, + const VkLatencySleepInfoNV* pSleepInfo); + +VKAPI_ATTR void VKAPI_CALL vkSetLatencyMarkerNV( + VkDevice device, + VkSwapchainKHR swapchain, + const VkSetLatencyMarkerInfoNV* pLatencyMarkerInfo); + +VKAPI_ATTR void VKAPI_CALL vkGetLatencyTimingsNV( + VkDevice device, + VkSwapchainKHR swapchain, + VkGetLatencyMarkerInfoNV* pLatencyMarkerInfo); + +VKAPI_ATTR void VKAPI_CALL vkQueueNotifyOutOfBandNV( + VkQueue queue, + const VkOutOfBandQueueTypeInfoNV* pQueueTypeInfo); +#endif + + // VK_QCOM_multiview_per_view_render_areas is a preprocessor guard. Do not pass it to API calls. #define VK_QCOM_multiview_per_view_render_areas 1 #define VK_QCOM_MULTIVIEW_PER_VIEW_RENDER_AREAS_SPEC_VERSION 1 @@ -17551,6 +18957,113 @@ typedef struct VkMultiviewPerViewRenderAreasRenderPassBeginInfoQCOM { +// VK_NV_per_stage_descriptor_set is a preprocessor guard. Do not pass it to API calls. +#define VK_NV_per_stage_descriptor_set 1 +#define VK_NV_PER_STAGE_DESCRIPTOR_SET_SPEC_VERSION 1 +#define VK_NV_PER_STAGE_DESCRIPTOR_SET_EXTENSION_NAME "VK_NV_per_stage_descriptor_set" +typedef struct VkPhysicalDevicePerStageDescriptorSetFeaturesNV { + VkStructureType sType; + void* pNext; + VkBool32 perStageDescriptorSet; + VkBool32 dynamicPipelineLayout; +} VkPhysicalDevicePerStageDescriptorSetFeaturesNV; + + + +// VK_QCOM_image_processing2 is a preprocessor guard. Do not pass it to API calls. +#define VK_QCOM_image_processing2 1 +#define VK_QCOM_IMAGE_PROCESSING_2_SPEC_VERSION 1 +#define VK_QCOM_IMAGE_PROCESSING_2_EXTENSION_NAME "VK_QCOM_image_processing2" + +typedef enum VkBlockMatchWindowCompareModeQCOM { + VK_BLOCK_MATCH_WINDOW_COMPARE_MODE_MIN_QCOM = 0, + VK_BLOCK_MATCH_WINDOW_COMPARE_MODE_MAX_QCOM = 1, + VK_BLOCK_MATCH_WINDOW_COMPARE_MODE_MAX_ENUM_QCOM = 0x7FFFFFFF +} VkBlockMatchWindowCompareModeQCOM; +typedef struct VkPhysicalDeviceImageProcessing2FeaturesQCOM { + VkStructureType sType; + void* pNext; + VkBool32 textureBlockMatch2; +} VkPhysicalDeviceImageProcessing2FeaturesQCOM; + +typedef struct VkPhysicalDeviceImageProcessing2PropertiesQCOM { + VkStructureType sType; + void* pNext; + VkExtent2D maxBlockMatchWindow; +} VkPhysicalDeviceImageProcessing2PropertiesQCOM; + +typedef struct VkSamplerBlockMatchWindowCreateInfoQCOM { + VkStructureType sType; + const void* pNext; + VkExtent2D windowExtent; + VkBlockMatchWindowCompareModeQCOM windowCompareMode; +} VkSamplerBlockMatchWindowCreateInfoQCOM; + + + +// VK_QCOM_filter_cubic_weights is a preprocessor guard. Do not pass it to API calls. +#define VK_QCOM_filter_cubic_weights 1 +#define VK_QCOM_FILTER_CUBIC_WEIGHTS_SPEC_VERSION 1 +#define VK_QCOM_FILTER_CUBIC_WEIGHTS_EXTENSION_NAME "VK_QCOM_filter_cubic_weights" + +typedef enum VkCubicFilterWeightsQCOM { + VK_CUBIC_FILTER_WEIGHTS_CATMULL_ROM_QCOM = 0, + VK_CUBIC_FILTER_WEIGHTS_ZERO_TANGENT_CARDINAL_QCOM = 1, + VK_CUBIC_FILTER_WEIGHTS_B_SPLINE_QCOM = 2, + VK_CUBIC_FILTER_WEIGHTS_MITCHELL_NETRAVALI_QCOM = 3, + VK_CUBIC_FILTER_WEIGHTS_MAX_ENUM_QCOM = 0x7FFFFFFF +} VkCubicFilterWeightsQCOM; +typedef struct VkPhysicalDeviceCubicWeightsFeaturesQCOM { + VkStructureType sType; + void* pNext; + VkBool32 selectableCubicWeights; +} VkPhysicalDeviceCubicWeightsFeaturesQCOM; + +typedef struct VkSamplerCubicWeightsCreateInfoQCOM { + VkStructureType sType; + const void* pNext; + VkCubicFilterWeightsQCOM cubicWeights; +} VkSamplerCubicWeightsCreateInfoQCOM; + +typedef struct VkBlitImageCubicWeightsInfoQCOM { + VkStructureType sType; + const void* pNext; + VkCubicFilterWeightsQCOM cubicWeights; +} VkBlitImageCubicWeightsInfoQCOM; + + + +// VK_QCOM_ycbcr_degamma is a preprocessor guard. Do not pass it to API calls. +#define VK_QCOM_ycbcr_degamma 1 +#define VK_QCOM_YCBCR_DEGAMMA_SPEC_VERSION 1 +#define VK_QCOM_YCBCR_DEGAMMA_EXTENSION_NAME "VK_QCOM_ycbcr_degamma" +typedef struct VkPhysicalDeviceYcbcrDegammaFeaturesQCOM { + VkStructureType sType; + void* pNext; + VkBool32 ycbcrDegamma; +} VkPhysicalDeviceYcbcrDegammaFeaturesQCOM; + +typedef struct VkSamplerYcbcrConversionYcbcrDegammaCreateInfoQCOM { + VkStructureType sType; + void* pNext; + VkBool32 enableYDegamma; + VkBool32 enableCbCrDegamma; +} VkSamplerYcbcrConversionYcbcrDegammaCreateInfoQCOM; + + + +// VK_QCOM_filter_cubic_clamp is a preprocessor guard. Do not pass it to API calls. +#define VK_QCOM_filter_cubic_clamp 1 +#define VK_QCOM_FILTER_CUBIC_CLAMP_SPEC_VERSION 1 +#define VK_QCOM_FILTER_CUBIC_CLAMP_EXTENSION_NAME "VK_QCOM_filter_cubic_clamp" +typedef struct VkPhysicalDeviceCubicClampFeaturesQCOM { + VkStructureType sType; + void* pNext; + VkBool32 cubicRangeClamp; +} VkPhysicalDeviceCubicClampFeaturesQCOM; + + + // VK_EXT_attachment_feedback_loop_dynamic_state is a preprocessor guard. Do not pass it to API calls. #define VK_EXT_attachment_feedback_loop_dynamic_state 1 #define VK_EXT_ATTACHMENT_FEEDBACK_LOOP_DYNAMIC_STATE_SPEC_VERSION 1 @@ -17570,6 +19083,48 @@ VKAPI_ATTR void VKAPI_CALL vkCmdSetAttachmentFeedbackLoopEnableEXT( #endif +// VK_MSFT_layered_driver is a preprocessor guard. Do not pass it to API calls. +#define VK_MSFT_layered_driver 1 +#define VK_MSFT_LAYERED_DRIVER_SPEC_VERSION 1 +#define VK_MSFT_LAYERED_DRIVER_EXTENSION_NAME "VK_MSFT_layered_driver" + +typedef enum VkLayeredDriverUnderlyingApiMSFT { + VK_LAYERED_DRIVER_UNDERLYING_API_NONE_MSFT = 0, + VK_LAYERED_DRIVER_UNDERLYING_API_D3D12_MSFT = 1, + VK_LAYERED_DRIVER_UNDERLYING_API_MAX_ENUM_MSFT = 0x7FFFFFFF +} VkLayeredDriverUnderlyingApiMSFT; +typedef struct VkPhysicalDeviceLayeredDriverPropertiesMSFT { + VkStructureType sType; + void* pNext; + VkLayeredDriverUnderlyingApiMSFT underlyingAPI; +} VkPhysicalDeviceLayeredDriverPropertiesMSFT; + + + +// VK_NV_descriptor_pool_overallocation is a preprocessor guard. Do not pass it to API calls. +#define VK_NV_descriptor_pool_overallocation 1 +#define VK_NV_DESCRIPTOR_POOL_OVERALLOCATION_SPEC_VERSION 1 +#define VK_NV_DESCRIPTOR_POOL_OVERALLOCATION_EXTENSION_NAME "VK_NV_descriptor_pool_overallocation" +typedef struct VkPhysicalDeviceDescriptorPoolOverallocationFeaturesNV { + VkStructureType sType; + void* pNext; + VkBool32 descriptorPoolOverallocation; +} VkPhysicalDeviceDescriptorPoolOverallocationFeaturesNV; + + + +// VK_NV_shader_atomic_float16_vector is a preprocessor guard. Do not pass it to API calls. +#define VK_NV_shader_atomic_float16_vector 1 +#define VK_NV_SHADER_ATOMIC_FLOAT16_VECTOR_SPEC_VERSION 1 +#define VK_NV_SHADER_ATOMIC_FLOAT16_VECTOR_EXTENSION_NAME "VK_NV_shader_atomic_float16_vector" +typedef struct VkPhysicalDeviceShaderAtomicFloat16VectorFeaturesNV { + VkStructureType sType; + void* pNext; + VkBool32 shaderFloat16VectorAtomics; +} VkPhysicalDeviceShaderAtomicFloat16VectorFeaturesNV; + + + // VK_KHR_acceleration_structure is a preprocessor guard. Do not pass it to API calls. #define VK_KHR_acceleration_structure 1 #define VK_KHR_ACCELERATION_STRUCTURE_SPEC_VERSION 13 diff --git a/ext/vulkan/vulkan_directfb.h b/ext/vulkan/vulkan_directfb.h index 1f11a08273..f06f80b70e 100644 --- a/ext/vulkan/vulkan_directfb.h +++ b/ext/vulkan/vulkan_directfb.h @@ -2,7 +2,7 @@ #define VULKAN_DIRECTFB_H_ 1 /* -** Copyright 2015-2023 The Khronos Group Inc. +** Copyright 2015-2024 The Khronos Group Inc. ** ** SPDX-License-Identifier: Apache-2.0 */ diff --git a/ext/vulkan/vulkan_fuchsia.h b/ext/vulkan/vulkan_fuchsia.h index 76e1564832..f60907d10b 100644 --- a/ext/vulkan/vulkan_fuchsia.h +++ b/ext/vulkan/vulkan_fuchsia.h @@ -2,7 +2,7 @@ #define VULKAN_FUCHSIA_H_ 1 /* -** Copyright 2015-2023 The Khronos Group Inc. +** Copyright 2015-2024 The Khronos Group Inc. ** ** SPDX-License-Identifier: Apache-2.0 */ diff --git a/ext/vulkan/vulkan_ggp.h b/ext/vulkan/vulkan_ggp.h index 9783aa3b38..0a8863a14b 100644 --- a/ext/vulkan/vulkan_ggp.h +++ b/ext/vulkan/vulkan_ggp.h @@ -2,7 +2,7 @@ #define VULKAN_GGP_H_ 1 /* -** Copyright 2015-2023 The Khronos Group Inc. +** Copyright 2015-2024 The Khronos Group Inc. ** ** SPDX-License-Identifier: Apache-2.0 */ diff --git a/ext/vulkan/vulkan_ios.h b/ext/vulkan/vulkan_ios.h index 211429ff45..22ed2c039a 100644 --- a/ext/vulkan/vulkan_ios.h +++ b/ext/vulkan/vulkan_ios.h @@ -2,7 +2,7 @@ #define VULKAN_IOS_H_ 1 /* -** Copyright 2015-2023 The Khronos Group Inc. +** Copyright 2015-2024 The Khronos Group Inc. ** ** SPDX-License-Identifier: Apache-2.0 */ diff --git a/ext/vulkan/vulkan_macos.h b/ext/vulkan/vulkan_macos.h index c6509cc8cf..a7f5613a05 100644 --- a/ext/vulkan/vulkan_macos.h +++ b/ext/vulkan/vulkan_macos.h @@ -2,7 +2,7 @@ #define VULKAN_MACOS_H_ 1 /* -** Copyright 2015-2023 The Khronos Group Inc. +** Copyright 2015-2024 The Khronos Group Inc. ** ** SPDX-License-Identifier: Apache-2.0 */ diff --git a/ext/vulkan/vulkan_metal.h b/ext/vulkan/vulkan_metal.h index 94563a003a..e6f7bf7a70 100644 --- a/ext/vulkan/vulkan_metal.h +++ b/ext/vulkan/vulkan_metal.h @@ -2,7 +2,7 @@ #define VULKAN_METAL_H_ 1 /* -** Copyright 2015-2023 The Khronos Group Inc. +** Copyright 2015-2024 The Khronos Group Inc. ** ** SPDX-License-Identifier: Apache-2.0 */ diff --git a/ext/vulkan/vulkan_screen.h b/ext/vulkan/vulkan_screen.h index 981738f738..7e84d4d965 100644 --- a/ext/vulkan/vulkan_screen.h +++ b/ext/vulkan/vulkan_screen.h @@ -2,7 +2,7 @@ #define VULKAN_SCREEN_H_ 1 /* -** Copyright 2015-2023 The Khronos Group Inc. +** Copyright 2015-2024 The Khronos Group Inc. ** ** SPDX-License-Identifier: Apache-2.0 */ diff --git a/ext/vulkan/vulkan_vi.h b/ext/vulkan/vulkan_vi.h index c9227e8226..c145f4a800 100644 --- a/ext/vulkan/vulkan_vi.h +++ b/ext/vulkan/vulkan_vi.h @@ -2,7 +2,7 @@ #define VULKAN_VI_H_ 1 /* -** Copyright 2015-2023 The Khronos Group Inc. +** Copyright 2015-2024 The Khronos Group Inc. ** ** SPDX-License-Identifier: Apache-2.0 */ diff --git a/ext/vulkan/vulkan_wayland.h b/ext/vulkan/vulkan_wayland.h index c93b217872..ec706a114b 100644 --- a/ext/vulkan/vulkan_wayland.h +++ b/ext/vulkan/vulkan_wayland.h @@ -2,7 +2,7 @@ #define VULKAN_WAYLAND_H_ 1 /* -** Copyright 2015-2023 The Khronos Group Inc. +** Copyright 2015-2024 The Khronos Group Inc. ** ** SPDX-License-Identifier: Apache-2.0 */ diff --git a/ext/vulkan/vulkan_win32.h b/ext/vulkan/vulkan_win32.h index fae3b8532c..d7a0b2bab4 100644 --- a/ext/vulkan/vulkan_win32.h +++ b/ext/vulkan/vulkan_win32.h @@ -2,7 +2,7 @@ #define VULKAN_WIN32_H_ 1 /* -** Copyright 2015-2023 The Khronos Group Inc. +** Copyright 2015-2024 The Khronos Group Inc. ** ** SPDX-License-Identifier: Apache-2.0 */ diff --git a/ext/vulkan/vulkan_xcb.h b/ext/vulkan/vulkan_xcb.h index de7405524a..cdf6b5269f 100644 --- a/ext/vulkan/vulkan_xcb.h +++ b/ext/vulkan/vulkan_xcb.h @@ -2,7 +2,7 @@ #define VULKAN_XCB_H_ 1 /* -** Copyright 2015-2023 The Khronos Group Inc. +** Copyright 2015-2024 The Khronos Group Inc. ** ** SPDX-License-Identifier: Apache-2.0 */ diff --git a/ext/vulkan/vulkan_xlib.h b/ext/vulkan/vulkan_xlib.h index 1aa632f2ef..b3c3e27d77 100644 --- a/ext/vulkan/vulkan_xlib.h +++ b/ext/vulkan/vulkan_xlib.h @@ -2,7 +2,7 @@ #define VULKAN_XLIB_H_ 1 /* -** Copyright 2015-2023 The Khronos Group Inc. +** Copyright 2015-2024 The Khronos Group Inc. ** ** SPDX-License-Identifier: Apache-2.0 */ diff --git a/ext/vulkan/vulkan_xlib_xrandr.h b/ext/vulkan/vulkan_xlib_xrandr.h index e164ffc91e..8e99190b4f 100644 --- a/ext/vulkan/vulkan_xlib_xrandr.h +++ b/ext/vulkan/vulkan_xlib_xrandr.h @@ -2,7 +2,7 @@ #define VULKAN_XLIB_XRANDR_H_ 1 /* -** Copyright 2015-2023 The Khronos Group Inc. +** Copyright 2015-2024 The Khronos Group Inc. ** ** SPDX-License-Identifier: Apache-2.0 */ From 1bff3c12b45ea2c026ae3614448a75e1d3d13a1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sat, 6 Apr 2024 17:57:32 +0200 Subject: [PATCH 020/719] Update VMA (Vulkan Memory Allocator) to the latest --- ext/vma/vk_mem_alloc.h | 26393 +++++++++++++++++++-------------------- 1 file changed, 12649 insertions(+), 13744 deletions(-) diff --git a/ext/vma/vk_mem_alloc.h b/ext/vma/vk_mem_alloc.h index 90719c1615..3fda4d3ebe 100644 --- a/ext/vma/vk_mem_alloc.h +++ b/ext/vma/vk_mem_alloc.h @@ -45,68 +45,74 @@ Version 3.1.0-development -Copyright (c) 2017-2022 Advanced Micro Devices, Inc. All rights reserved. \n -License: MIT +Copyright (c) 2017-2024 Advanced Micro Devices, Inc. All rights reserved. \n +License: MIT \n +See also: [product page on GPUOpen](https://gpuopen.com/gaming-product/vulkan-memory-allocator/), +[repository on GitHub](https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator) -API documentation divided into groups: [Modules](modules.html) -\section main_table_of_contents Table of contents +API documentation divided into groups: [Topics](topics.html) + +General documentation chapters: - User guide - \subpage quick_start - - [Project setup](@ref quick_start_project_setup) - - [Initialization](@ref quick_start_initialization) - - [Resource allocation](@ref quick_start_resource_allocation) + - [Project setup](@ref quick_start_project_setup) + - [Initialization](@ref quick_start_initialization) + - [Resource allocation](@ref quick_start_resource_allocation) - \subpage choosing_memory_type - - [Usage](@ref choosing_memory_type_usage) - - [Required and preferred flags](@ref choosing_memory_type_required_preferred_flags) - - [Explicit memory types](@ref choosing_memory_type_explicit_memory_types) - - [Custom memory pools](@ref choosing_memory_type_custom_memory_pools) - - [Dedicated allocations](@ref choosing_memory_type_dedicated_allocations) + - [Usage](@ref choosing_memory_type_usage) + - [Required and preferred flags](@ref choosing_memory_type_required_preferred_flags) + - [Explicit memory types](@ref choosing_memory_type_explicit_memory_types) + - [Custom memory pools](@ref choosing_memory_type_custom_memory_pools) + - [Dedicated allocations](@ref choosing_memory_type_dedicated_allocations) - \subpage memory_mapping - - [Mapping functions](@ref memory_mapping_mapping_functions) - - [Persistently mapped memory](@ref memory_mapping_persistently_mapped_memory) - - [Cache flush and invalidate](@ref memory_mapping_cache_control) + - [Copy functions](@ref memory_mapping_copy_functions) + - [Mapping functions](@ref memory_mapping_mapping_functions) + - [Persistently mapped memory](@ref memory_mapping_persistently_mapped_memory) + - [Cache flush and invalidate](@ref memory_mapping_cache_control) - \subpage staying_within_budget - - [Querying for budget](@ref staying_within_budget_querying_for_budget) - - [Controlling memory usage](@ref staying_within_budget_controlling_memory_usage) + - [Querying for budget](@ref staying_within_budget_querying_for_budget) + - [Controlling memory usage](@ref staying_within_budget_controlling_memory_usage) - \subpage resource_aliasing - \subpage custom_memory_pools - - [Choosing memory type index](@ref custom_memory_pools_MemTypeIndex) - - [Linear allocation algorithm](@ref linear_algorithm) - - [Free-at-once](@ref linear_algorithm_free_at_once) - - [Stack](@ref linear_algorithm_stack) - - [Double stack](@ref linear_algorithm_double_stack) - - [Ring buffer](@ref linear_algorithm_ring_buffer) + - [Choosing memory type index](@ref custom_memory_pools_MemTypeIndex) + - [When not to use custom pools](@ref custom_memory_pools_when_not_use) + - [Linear allocation algorithm](@ref linear_algorithm) + - [Free-at-once](@ref linear_algorithm_free_at_once) + - [Stack](@ref linear_algorithm_stack) + - [Double stack](@ref linear_algorithm_double_stack) + - [Ring buffer](@ref linear_algorithm_ring_buffer) - \subpage defragmentation - \subpage statistics - - [Numeric statistics](@ref statistics_numeric_statistics) - - [JSON dump](@ref statistics_json_dump) + - [Numeric statistics](@ref statistics_numeric_statistics) + - [JSON dump](@ref statistics_json_dump) - \subpage allocation_annotation - - [Allocation user data](@ref allocation_user_data) - - [Allocation names](@ref allocation_names) + - [Allocation user data](@ref allocation_user_data) + - [Allocation names](@ref allocation_names) - \subpage virtual_allocator - \subpage debugging_memory_usage - - [Memory initialization](@ref debugging_memory_usage_initialization) - - [Margins](@ref debugging_memory_usage_margins) - - [Corruption detection](@ref debugging_memory_usage_corruption_detection) - - \subpage opengl_interop + - [Memory initialization](@ref debugging_memory_usage_initialization) + - [Margins](@ref debugging_memory_usage_margins) + - [Corruption detection](@ref debugging_memory_usage_corruption_detection) + - [Leak detection features](@ref debugging_memory_usage_leak_detection) + - \subpage other_api_interop - \subpage usage_patterns - - [GPU-only resource](@ref usage_patterns_gpu_only) - - [Staging copy for upload](@ref usage_patterns_staging_copy_upload) - - [Readback](@ref usage_patterns_readback) - - [Advanced data uploading](@ref usage_patterns_advanced_data_uploading) - - [Other use cases](@ref usage_patterns_other_use_cases) + - [GPU-only resource](@ref usage_patterns_gpu_only) + - [Staging copy for upload](@ref usage_patterns_staging_copy_upload) + - [Readback](@ref usage_patterns_readback) + - [Advanced data uploading](@ref usage_patterns_advanced_data_uploading) + - [Other use cases](@ref usage_patterns_other_use_cases) - \subpage configuration - [Pointers to Vulkan functions](@ref config_Vulkan_functions) - [Custom host memory allocator](@ref custom_memory_allocator) - [Device memory allocation callbacks](@ref allocation_callbacks) - [Device heap memory limit](@ref heap_memory_limit) - Extension support - - \subpage vk_khr_dedicated_allocation - - \subpage enabling_buffer_device_address - - \subpage vk_ext_memory_priority - - \subpage vk_amd_device_coherent_memory + - \subpage vk_khr_dedicated_allocation + - \subpage enabling_buffer_device_address + - \subpage vk_ext_memory_priority + - \subpage vk_amd_device_coherent_memory - \subpage general_considerations - [Thread safety](@ref general_considerations_thread_safety) - [Versioning and compatibility](@ref general_considerations_versioning_and_compatibility) @@ -114,11 +120,6 @@ License: MIT - [Allocation algorithm](@ref general_considerations_allocation_algorithm) - [Features not supported](@ref general_considerations_features_not_supported) -\section main_see_also See also - -- [**Product page on GPUOpen**](https://gpuopen.com/gaming-product/vulkan-memory-allocator/) -- [**Source repository on GitHub**](https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator) - \defgroup group_init Library initialization \brief API elements related to the initialization and management of the entire library, especially #VmaAllocator object. @@ -144,100 +145,119 @@ See documentation chapter: \ref statistics. extern "C" { #endif -#ifndef VULKAN_H_ - #include +#ifndef VULKAN_H_ // PPSSPP HACK +#include #endif #if !defined(VMA_VULKAN_VERSION) - #if defined(VK_VERSION_1_3) - #define VMA_VULKAN_VERSION 1003000 - #elif defined(VK_VERSION_1_2) - #define VMA_VULKAN_VERSION 1002000 - #elif defined(VK_VERSION_1_1) - #define VMA_VULKAN_VERSION 1001000 - #else - #define VMA_VULKAN_VERSION 1000000 - #endif +#if defined(VK_VERSION_1_3) +#define VMA_VULKAN_VERSION 1003000 +#elif defined(VK_VERSION_1_2) +#define VMA_VULKAN_VERSION 1002000 +#elif defined(VK_VERSION_1_1) +#define VMA_VULKAN_VERSION 1001000 +#else +#define VMA_VULKAN_VERSION 1000000 +#endif #endif #if defined(__ANDROID__) && defined(VK_NO_PROTOTYPES) && VMA_STATIC_VULKAN_FUNCTIONS - extern PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr; - extern PFN_vkGetDeviceProcAddr vkGetDeviceProcAddr; - extern PFN_vkGetPhysicalDeviceProperties vkGetPhysicalDeviceProperties; - extern PFN_vkGetPhysicalDeviceMemoryProperties vkGetPhysicalDeviceMemoryProperties; - extern PFN_vkAllocateMemory vkAllocateMemory; - extern PFN_vkFreeMemory vkFreeMemory; - extern PFN_vkMapMemory vkMapMemory; - extern PFN_vkUnmapMemory vkUnmapMemory; - extern PFN_vkFlushMappedMemoryRanges vkFlushMappedMemoryRanges; - extern PFN_vkInvalidateMappedMemoryRanges vkInvalidateMappedMemoryRanges; - extern PFN_vkBindBufferMemory vkBindBufferMemory; - extern PFN_vkBindImageMemory vkBindImageMemory; - extern PFN_vkGetBufferMemoryRequirements vkGetBufferMemoryRequirements; - extern PFN_vkGetImageMemoryRequirements vkGetImageMemoryRequirements; - extern PFN_vkCreateBuffer vkCreateBuffer; - extern PFN_vkDestroyBuffer vkDestroyBuffer; - extern PFN_vkCreateImage vkCreateImage; - extern PFN_vkDestroyImage vkDestroyImage; - extern PFN_vkCmdCopyBuffer vkCmdCopyBuffer; - #if VMA_VULKAN_VERSION >= 1001000 - extern PFN_vkGetBufferMemoryRequirements2 vkGetBufferMemoryRequirements2; - extern PFN_vkGetImageMemoryRequirements2 vkGetImageMemoryRequirements2; - extern PFN_vkBindBufferMemory2 vkBindBufferMemory2; - extern PFN_vkBindImageMemory2 vkBindImageMemory2; - extern PFN_vkGetPhysicalDeviceMemoryProperties2 vkGetPhysicalDeviceMemoryProperties2; - #endif // #if VMA_VULKAN_VERSION >= 1001000 + extern PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr; + extern PFN_vkGetDeviceProcAddr vkGetDeviceProcAddr; + extern PFN_vkGetPhysicalDeviceProperties vkGetPhysicalDeviceProperties; + extern PFN_vkGetPhysicalDeviceMemoryProperties vkGetPhysicalDeviceMemoryProperties; + extern PFN_vkAllocateMemory vkAllocateMemory; + extern PFN_vkFreeMemory vkFreeMemory; + extern PFN_vkMapMemory vkMapMemory; + extern PFN_vkUnmapMemory vkUnmapMemory; + extern PFN_vkFlushMappedMemoryRanges vkFlushMappedMemoryRanges; + extern PFN_vkInvalidateMappedMemoryRanges vkInvalidateMappedMemoryRanges; + extern PFN_vkBindBufferMemory vkBindBufferMemory; + extern PFN_vkBindImageMemory vkBindImageMemory; + extern PFN_vkGetBufferMemoryRequirements vkGetBufferMemoryRequirements; + extern PFN_vkGetImageMemoryRequirements vkGetImageMemoryRequirements; + extern PFN_vkCreateBuffer vkCreateBuffer; + extern PFN_vkDestroyBuffer vkDestroyBuffer; + extern PFN_vkCreateImage vkCreateImage; + extern PFN_vkDestroyImage vkDestroyImage; + extern PFN_vkCmdCopyBuffer vkCmdCopyBuffer; +#if VMA_VULKAN_VERSION >= 1001000 + extern PFN_vkGetBufferMemoryRequirements2 vkGetBufferMemoryRequirements2; + extern PFN_vkGetImageMemoryRequirements2 vkGetImageMemoryRequirements2; + extern PFN_vkBindBufferMemory2 vkBindBufferMemory2; + extern PFN_vkBindImageMemory2 vkBindImageMemory2; + extern PFN_vkGetPhysicalDeviceMemoryProperties2 vkGetPhysicalDeviceMemoryProperties2; +#endif // #if VMA_VULKAN_VERSION >= 1001000 #endif // #if defined(__ANDROID__) && VMA_STATIC_VULKAN_FUNCTIONS && VK_NO_PROTOTYPES #if !defined(VMA_DEDICATED_ALLOCATION) - #if VK_KHR_get_memory_requirements2 && VK_KHR_dedicated_allocation - #define VMA_DEDICATED_ALLOCATION 1 - #else - #define VMA_DEDICATED_ALLOCATION 0 - #endif +#if VK_KHR_get_memory_requirements2 && VK_KHR_dedicated_allocation +#define VMA_DEDICATED_ALLOCATION 1 +#else +#define VMA_DEDICATED_ALLOCATION 0 +#endif #endif #if !defined(VMA_BIND_MEMORY2) - #if VK_KHR_bind_memory2 - #define VMA_BIND_MEMORY2 1 - #else - #define VMA_BIND_MEMORY2 0 - #endif +#if VK_KHR_bind_memory2 +#define VMA_BIND_MEMORY2 1 +#else +#define VMA_BIND_MEMORY2 0 +#endif #endif #if !defined(VMA_MEMORY_BUDGET) - #if VK_EXT_memory_budget && (VK_KHR_get_physical_device_properties2 || VMA_VULKAN_VERSION >= 1001000) - #define VMA_MEMORY_BUDGET 1 - #else - #define VMA_MEMORY_BUDGET 0 - #endif +#if VK_EXT_memory_budget && (VK_KHR_get_physical_device_properties2 || VMA_VULKAN_VERSION >= 1001000) +#define VMA_MEMORY_BUDGET 1 +#else +#define VMA_MEMORY_BUDGET 0 +#endif #endif -// Defined to 1 when VK_KHR_buffer_device_address device extension or equivalent core Vulkan 1.2 feature is defined in its headers. + // Defined to 1 when VK_KHR_buffer_device_address device extension or equivalent core Vulkan 1.2 feature is defined in its headers. #if !defined(VMA_BUFFER_DEVICE_ADDRESS) - #if VK_KHR_buffer_device_address || VMA_VULKAN_VERSION >= 1002000 - #define VMA_BUFFER_DEVICE_ADDRESS 1 - #else - #define VMA_BUFFER_DEVICE_ADDRESS 0 - #endif +#if VK_KHR_buffer_device_address || VMA_VULKAN_VERSION >= 1002000 +#define VMA_BUFFER_DEVICE_ADDRESS 1 +#else +#define VMA_BUFFER_DEVICE_ADDRESS 0 +#endif #endif // Defined to 1 when VK_EXT_memory_priority device extension is defined in Vulkan headers. #if !defined(VMA_MEMORY_PRIORITY) - #if VK_EXT_memory_priority - #define VMA_MEMORY_PRIORITY 1 - #else - #define VMA_MEMORY_PRIORITY 0 - #endif +#if VK_EXT_memory_priority +#define VMA_MEMORY_PRIORITY 1 +#else +#define VMA_MEMORY_PRIORITY 0 #endif +#endif + +// Defined to 1 when VK_KHR_maintenance4 device extension is defined in Vulkan headers. +#if !defined(VMA_KHR_MAINTENANCE4) +#if VK_KHR_maintenance4 +#define VMA_KHR_MAINTENANCE4 1 +#else +#define VMA_KHR_MAINTENANCE4 0 +#endif +#endif + +// Defined to 1 when VK_KHR_maintenance5 device extension is defined in Vulkan headers. +#if !defined(VMA_KHR_MAINTENANCE5) +#if VK_KHR_maintenance5 +#define VMA_KHR_MAINTENANCE5 1 +#else +#define VMA_KHR_MAINTENANCE5 0 +#endif +#endif + // Defined to 1 when VK_KHR_external_memory device extension is defined in Vulkan headers. #if !defined(VMA_EXTERNAL_MEMORY) - #if VK_KHR_external_memory - #define VMA_EXTERNAL_MEMORY 1 - #else - #define VMA_EXTERNAL_MEMORY 0 - #endif +#if VK_KHR_external_memory +#define VMA_EXTERNAL_MEMORY 1 +#else +#define VMA_EXTERNAL_MEMORY 0 +#endif #endif // Define these macros to decorate all public functions with additional code, @@ -246,10 +266,16 @@ extern "C" { // #define VMA_CALL_PRE __declspec(dllexport) // #define VMA_CALL_POST __cdecl #ifndef VMA_CALL_PRE - #define VMA_CALL_PRE +#define VMA_CALL_PRE #endif #ifndef VMA_CALL_POST - #define VMA_CALL_POST +#define VMA_CALL_POST +#endif + +// Define this macro to decorate pNext pointers with an attribute specifying the Vulkan +// structure that will be extended via the pNext chain. +#ifndef VMA_EXTENDS_VK_STRUCT +#define VMA_EXTENDS_VK_STRUCT(vkStruct) #endif // Define this macro to decorate pointers with an attribute specifying the @@ -264,49 +290,49 @@ extern "C" { // this means the number of memory heaps available in the device associated // with the VmaAllocator being dealt with. #ifndef VMA_LEN_IF_NOT_NULL - #define VMA_LEN_IF_NOT_NULL(len) +#define VMA_LEN_IF_NOT_NULL(len) #endif // The VMA_NULLABLE macro is defined to be _Nullable when compiling with Clang. // see: https://clang.llvm.org/docs/AttributeReference.html#nullable #ifndef VMA_NULLABLE - #ifdef __clang__ - #define VMA_NULLABLE _Nullable - #else - #define VMA_NULLABLE - #endif +#ifdef __clang__ +#define VMA_NULLABLE _Nullable +#else +#define VMA_NULLABLE +#endif #endif // The VMA_NOT_NULL macro is defined to be _Nonnull when compiling with Clang. // see: https://clang.llvm.org/docs/AttributeReference.html#nonnull #ifndef VMA_NOT_NULL - #ifdef __clang__ - #define VMA_NOT_NULL _Nonnull - #else - #define VMA_NOT_NULL - #endif +#ifdef __clang__ +#define VMA_NOT_NULL _Nonnull +#else +#define VMA_NOT_NULL +#endif #endif // If non-dispatchable handles are represented as pointers then we can give // then nullability annotations #ifndef VMA_NOT_NULL_NON_DISPATCHABLE - #if defined(__LP64__) || defined(_WIN64) || (defined(__x86_64__) && !defined(__ILP32__) ) || defined(_M_X64) || defined(__ia64) || defined (_M_IA64) || defined(__aarch64__) || defined(__powerpc64__) - #define VMA_NOT_NULL_NON_DISPATCHABLE VMA_NOT_NULL - #else - #define VMA_NOT_NULL_NON_DISPATCHABLE - #endif +#if defined(__LP64__) || defined(_WIN64) || (defined(__x86_64__) && !defined(__ILP32__) ) || defined(_M_X64) || defined(__ia64) || defined (_M_IA64) || defined(__aarch64__) || defined(__powerpc64__) +#define VMA_NOT_NULL_NON_DISPATCHABLE VMA_NOT_NULL +#else +#define VMA_NOT_NULL_NON_DISPATCHABLE +#endif #endif #ifndef VMA_NULLABLE_NON_DISPATCHABLE - #if defined(__LP64__) || defined(_WIN64) || (defined(__x86_64__) && !defined(__ILP32__) ) || defined(_M_X64) || defined(__ia64) || defined (_M_IA64) || defined(__aarch64__) || defined(__powerpc64__) - #define VMA_NULLABLE_NON_DISPATCHABLE VMA_NULLABLE - #else - #define VMA_NULLABLE_NON_DISPATCHABLE - #endif +#if defined(__LP64__) || defined(_WIN64) || (defined(__x86_64__) && !defined(__ILP32__) ) || defined(_M_X64) || defined(__ia64) || defined (_M_IA64) || defined(__aarch64__) || defined(__powerpc64__) +#define VMA_NULLABLE_NON_DISPATCHABLE VMA_NULLABLE +#else +#define VMA_NULLABLE_NON_DISPATCHABLE +#endif #endif #ifndef VMA_STATS_STRING_ENABLED - #define VMA_STATS_STRING_ENABLED 1 +#define VMA_STATS_STRING_ENABLED 1 #endif //////////////////////////////////////////////////////////////////////////////// @@ -326,500 +352,517 @@ extern "C" { */ /// Flags for created #VmaAllocator. -typedef enum VmaAllocatorCreateFlagBits -{ - /** \brief Allocator and all objects created from it will not be synchronized internally, so you must guarantee they are used from only one thread at a time or synchronized externally by you. - - Using this flag may increase performance because internal mutexes are not used. - */ - VMA_ALLOCATOR_CREATE_EXTERNALLY_SYNCHRONIZED_BIT = 0x00000001, - /** \brief Enables usage of VK_KHR_dedicated_allocation extension. - - The flag works only if VmaAllocatorCreateInfo::vulkanApiVersion `== VK_API_VERSION_1_0`. - When it is `VK_API_VERSION_1_1`, the flag is ignored because the extension has been promoted to Vulkan 1.1. - - Using this extension will automatically allocate dedicated blocks of memory for - some buffers and images instead of suballocating place for them out of bigger - memory blocks (as if you explicitly used #VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT - flag) when it is recommended by the driver. It may improve performance on some - GPUs. - - You may set this flag only if you found out that following device extensions are - supported, you enabled them while creating Vulkan device passed as - VmaAllocatorCreateInfo::device, and you want them to be used internally by this - library: - - - VK_KHR_get_memory_requirements2 (device extension) - - VK_KHR_dedicated_allocation (device extension) - - When this flag is set, you can experience following warnings reported by Vulkan - validation layer. You can ignore them. - - > vkBindBufferMemory(): Binding memory to buffer 0x2d but vkGetBufferMemoryRequirements() has not been called on that buffer. - */ - VMA_ALLOCATOR_CREATE_KHR_DEDICATED_ALLOCATION_BIT = 0x00000002, - /** - Enables usage of VK_KHR_bind_memory2 extension. - - The flag works only if VmaAllocatorCreateInfo::vulkanApiVersion `== VK_API_VERSION_1_0`. - When it is `VK_API_VERSION_1_1`, the flag is ignored because the extension has been promoted to Vulkan 1.1. - - You may set this flag only if you found out that this device extension is supported, - you enabled it while creating Vulkan device passed as VmaAllocatorCreateInfo::device, - and you want it to be used internally by this library. - - The extension provides functions `vkBindBufferMemory2KHR` and `vkBindImageMemory2KHR`, - which allow to pass a chain of `pNext` structures while binding. - This flag is required if you use `pNext` parameter in vmaBindBufferMemory2() or vmaBindImageMemory2(). - */ - VMA_ALLOCATOR_CREATE_KHR_BIND_MEMORY2_BIT = 0x00000004, - /** - Enables usage of VK_EXT_memory_budget extension. - - You may set this flag only if you found out that this device extension is supported, - you enabled it while creating Vulkan device passed as VmaAllocatorCreateInfo::device, - and you want it to be used internally by this library, along with another instance extension - VK_KHR_get_physical_device_properties2, which is required by it (or Vulkan 1.1, where this extension is promoted). - - The extension provides query for current memory usage and budget, which will probably - be more accurate than an estimation used by the library otherwise. - */ - VMA_ALLOCATOR_CREATE_EXT_MEMORY_BUDGET_BIT = 0x00000008, - /** - Enables usage of VK_AMD_device_coherent_memory extension. - - You may set this flag only if you: - - - found out that this device extension is supported and enabled it while creating Vulkan device passed as VmaAllocatorCreateInfo::device, - - checked that `VkPhysicalDeviceCoherentMemoryFeaturesAMD::deviceCoherentMemory` is true and set it while creating the Vulkan device, - - want it to be used internally by this library. - - The extension and accompanying device feature provide access to memory types with - `VK_MEMORY_PROPERTY_DEVICE_COHERENT_BIT_AMD` and `VK_MEMORY_PROPERTY_DEVICE_UNCACHED_BIT_AMD` flags. - They are useful mostly for writing breadcrumb markers - a common method for debugging GPU crash/hang/TDR. - - When the extension is not enabled, such memory types are still enumerated, but their usage is illegal. - To protect from this error, if you don't create the allocator with this flag, it will refuse to allocate any memory or create a custom pool in such memory type, - returning `VK_ERROR_FEATURE_NOT_PRESENT`. - */ - VMA_ALLOCATOR_CREATE_AMD_DEVICE_COHERENT_MEMORY_BIT = 0x00000010, - /** - Enables usage of "buffer device address" feature, which allows you to use function - `vkGetBufferDeviceAddress*` to get raw GPU pointer to a buffer and pass it for usage inside a shader. - - You may set this flag only if you: - - 1. (For Vulkan version < 1.2) Found as available and enabled device extension - VK_KHR_buffer_device_address. - This extension is promoted to core Vulkan 1.2. - 2. Found as available and enabled device feature `VkPhysicalDeviceBufferDeviceAddressFeatures::bufferDeviceAddress`. - - When this flag is set, you can create buffers with `VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT` using VMA. - The library automatically adds `VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT` to - allocated memory blocks wherever it might be needed. - - For more information, see documentation chapter \ref enabling_buffer_device_address. - */ - VMA_ALLOCATOR_CREATE_BUFFER_DEVICE_ADDRESS_BIT = 0x00000020, - /** - Enables usage of VK_EXT_memory_priority extension in the library. - - You may set this flag only if you found available and enabled this device extension, - along with `VkPhysicalDeviceMemoryPriorityFeaturesEXT::memoryPriority == VK_TRUE`, - while creating Vulkan device passed as VmaAllocatorCreateInfo::device. - - When this flag is used, VmaAllocationCreateInfo::priority and VmaPoolCreateInfo::priority - are used to set priorities of allocated Vulkan memory. Without it, these variables are ignored. - - A priority must be a floating-point value between 0 and 1, indicating the priority of the allocation relative to other memory allocations. - Larger values are higher priority. The granularity of the priorities is implementation-dependent. - It is automatically passed to every call to `vkAllocateMemory` done by the library using structure `VkMemoryPriorityAllocateInfoEXT`. - The value to be used for default priority is 0.5. - For more details, see the documentation of the VK_EXT_memory_priority extension. - */ - VMA_ALLOCATOR_CREATE_EXT_MEMORY_PRIORITY_BIT = 0x00000040, - - VMA_ALLOCATOR_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF -} VmaAllocatorCreateFlagBits; -/// See #VmaAllocatorCreateFlagBits. -typedef VkFlags VmaAllocatorCreateFlags; - -/** @} */ - -/** -\addtogroup group_alloc -@{ -*/ - -/// \brief Intended usage of the allocated memory. -typedef enum VmaMemoryUsage -{ - /** No intended memory usage specified. - Use other members of VmaAllocationCreateInfo to specify your requirements. - */ - VMA_MEMORY_USAGE_UNKNOWN = 0, - /** - \deprecated Obsolete, preserved for backward compatibility. - Prefers `VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT`. - */ - VMA_MEMORY_USAGE_GPU_ONLY = 1, - /** - \deprecated Obsolete, preserved for backward compatibility. - Guarantees `VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT` and `VK_MEMORY_PROPERTY_HOST_COHERENT_BIT`. - */ - VMA_MEMORY_USAGE_CPU_ONLY = 2, - /** - \deprecated Obsolete, preserved for backward compatibility. - Guarantees `VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT`, prefers `VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT`. - */ - VMA_MEMORY_USAGE_CPU_TO_GPU = 3, - /** - \deprecated Obsolete, preserved for backward compatibility. - Guarantees `VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT`, prefers `VK_MEMORY_PROPERTY_HOST_CACHED_BIT`. - */ - VMA_MEMORY_USAGE_GPU_TO_CPU = 4, - /** - \deprecated Obsolete, preserved for backward compatibility. - Prefers not `VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT`. - */ - VMA_MEMORY_USAGE_CPU_COPY = 5, - /** - Lazily allocated GPU memory having `VK_MEMORY_PROPERTY_LAZILY_ALLOCATED_BIT`. - Exists mostly on mobile platforms. Using it on desktop PC or other GPUs with no such memory type present will fail the allocation. - - Usage: Memory for transient attachment images (color attachments, depth attachments etc.), created with `VK_IMAGE_USAGE_TRANSIENT_ATTACHMENT_BIT`. - - Allocations with this usage are always created as dedicated - it implies #VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT. - */ - VMA_MEMORY_USAGE_GPU_LAZILY_ALLOCATED = 6, - /** - Selects best memory type automatically. - This flag is recommended for most common use cases. - - When using this flag, if you want to map the allocation (using vmaMapMemory() or #VMA_ALLOCATION_CREATE_MAPPED_BIT), - you must pass one of the flags: #VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT or #VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT - in VmaAllocationCreateInfo::flags. - - It can be used only with functions that let the library know `VkBufferCreateInfo` or `VkImageCreateInfo`, e.g. - vmaCreateBuffer(), vmaCreateImage(), vmaFindMemoryTypeIndexForBufferInfo(), vmaFindMemoryTypeIndexForImageInfo() - and not with generic memory allocation functions. - */ - VMA_MEMORY_USAGE_AUTO = 7, - /** - Selects best memory type automatically with preference for GPU (device) memory. - - When using this flag, if you want to map the allocation (using vmaMapMemory() or #VMA_ALLOCATION_CREATE_MAPPED_BIT), - you must pass one of the flags: #VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT or #VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT - in VmaAllocationCreateInfo::flags. - - It can be used only with functions that let the library know `VkBufferCreateInfo` or `VkImageCreateInfo`, e.g. - vmaCreateBuffer(), vmaCreateImage(), vmaFindMemoryTypeIndexForBufferInfo(), vmaFindMemoryTypeIndexForImageInfo() - and not with generic memory allocation functions. - */ - VMA_MEMORY_USAGE_AUTO_PREFER_DEVICE = 8, - /** - Selects best memory type automatically with preference for CPU (host) memory. - - When using this flag, if you want to map the allocation (using vmaMapMemory() or #VMA_ALLOCATION_CREATE_MAPPED_BIT), - you must pass one of the flags: #VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT or #VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT - in VmaAllocationCreateInfo::flags. - - It can be used only with functions that let the library know `VkBufferCreateInfo` or `VkImageCreateInfo`, e.g. - vmaCreateBuffer(), vmaCreateImage(), vmaFindMemoryTypeIndexForBufferInfo(), vmaFindMemoryTypeIndexForImageInfo() - and not with generic memory allocation functions. - */ - VMA_MEMORY_USAGE_AUTO_PREFER_HOST = 9, - - VMA_MEMORY_USAGE_MAX_ENUM = 0x7FFFFFFF -} VmaMemoryUsage; - -/// Flags to be passed as VmaAllocationCreateInfo::flags. -typedef enum VmaAllocationCreateFlagBits -{ - /** \brief Set this flag if the allocation should have its own memory block. - - Use it for special, big resources, like fullscreen images used as attachments. - */ - VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT = 0x00000001, - - /** \brief Set this flag to only try to allocate from existing `VkDeviceMemory` blocks and never create new such block. - - If new allocation cannot be placed in any of the existing blocks, allocation - fails with `VK_ERROR_OUT_OF_DEVICE_MEMORY` error. - - You should not use #VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT and - #VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT at the same time. It makes no sense. - */ - VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT = 0x00000002, - /** \brief Set this flag to use a memory that will be persistently mapped and retrieve pointer to it. - - Pointer to mapped memory will be returned through VmaAllocationInfo::pMappedData. - - It is valid to use this flag for allocation made from memory type that is not - `HOST_VISIBLE`. This flag is then ignored and memory is not mapped. This is - useful if you need an allocation that is efficient to use on GPU - (`DEVICE_LOCAL`) and still want to map it directly if possible on platforms that - support it (e.g. Intel GPU). - */ - VMA_ALLOCATION_CREATE_MAPPED_BIT = 0x00000004, - /** \deprecated Preserved for backward compatibility. Consider using vmaSetAllocationName() instead. - - Set this flag to treat VmaAllocationCreateInfo::pUserData as pointer to a - null-terminated string. Instead of copying pointer value, a local copy of the - string is made and stored in allocation's `pName`. The string is automatically - freed together with the allocation. It is also used in vmaBuildStatsString(). - */ - VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT = 0x00000020, - /** Allocation will be created from upper stack in a double stack pool. - - This flag is only allowed for custom pools created with #VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT flag. - */ - VMA_ALLOCATION_CREATE_UPPER_ADDRESS_BIT = 0x00000040, - /** Create both buffer/image and allocation, but don't bind them together. - It is useful when you want to bind yourself to do some more advanced binding, e.g. using some extensions. - The flag is meaningful only with functions that bind by default: vmaCreateBuffer(), vmaCreateImage(). - Otherwise it is ignored. - - If you want to make sure the new buffer/image is not tied to the new memory allocation - through `VkMemoryDedicatedAllocateInfoKHR` structure in case the allocation ends up in its own memory block, - use also flag #VMA_ALLOCATION_CREATE_CAN_ALIAS_BIT. - */ - VMA_ALLOCATION_CREATE_DONT_BIND_BIT = 0x00000080, - /** Create allocation only if additional device memory required for it, if any, won't exceed - memory budget. Otherwise return `VK_ERROR_OUT_OF_DEVICE_MEMORY`. - */ - VMA_ALLOCATION_CREATE_WITHIN_BUDGET_BIT = 0x00000100, - /** \brief Set this flag if the allocated memory will have aliasing resources. - - Usage of this flag prevents supplying `VkMemoryDedicatedAllocateInfoKHR` when #VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT is specified. - Otherwise created dedicated memory will not be suitable for aliasing resources, resulting in Vulkan Validation Layer errors. - */ - VMA_ALLOCATION_CREATE_CAN_ALIAS_BIT = 0x00000200, - /** - Requests possibility to map the allocation (using vmaMapMemory() or #VMA_ALLOCATION_CREATE_MAPPED_BIT). - - - If you use #VMA_MEMORY_USAGE_AUTO or other `VMA_MEMORY_USAGE_AUTO*` value, - you must use this flag to be able to map the allocation. Otherwise, mapping is incorrect. - - If you use other value of #VmaMemoryUsage, this flag is ignored and mapping is always possible in memory types that are `HOST_VISIBLE`. - This includes allocations created in \ref custom_memory_pools. - - Declares that mapped memory will only be written sequentially, e.g. using `memcpy()` or a loop writing number-by-number, - never read or accessed randomly, so a memory type can be selected that is uncached and write-combined. - - \warning Violating this declaration may work correctly, but will likely be very slow. - Watch out for implicit reads introduced by doing e.g. `pMappedData[i] += x;` - Better prepare your data in a local variable and `memcpy()` it to the mapped pointer all at once. - */ - VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT = 0x00000400, - /** - Requests possibility to map the allocation (using vmaMapMemory() or #VMA_ALLOCATION_CREATE_MAPPED_BIT). - - - If you use #VMA_MEMORY_USAGE_AUTO or other `VMA_MEMORY_USAGE_AUTO*` value, - you must use this flag to be able to map the allocation. Otherwise, mapping is incorrect. - - If you use other value of #VmaMemoryUsage, this flag is ignored and mapping is always possible in memory types that are `HOST_VISIBLE`. - This includes allocations created in \ref custom_memory_pools. - - Declares that mapped memory can be read, written, and accessed in random order, - so a `HOST_CACHED` memory type is required. - */ - VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT = 0x00000800, - /** - Together with #VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT or #VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT, - it says that despite request for host access, a not-`HOST_VISIBLE` memory type can be selected - if it may improve performance. - - By using this flag, you declare that you will check if the allocation ended up in a `HOST_VISIBLE` memory type - (e.g. using vmaGetAllocationMemoryProperties()) and if not, you will create some "staging" buffer and - issue an explicit transfer to write/read your data. - To prepare for this possibility, don't forget to add appropriate flags like - `VK_BUFFER_USAGE_TRANSFER_DST_BIT`, `VK_BUFFER_USAGE_TRANSFER_SRC_BIT` to the parameters of created buffer or image. - */ - VMA_ALLOCATION_CREATE_HOST_ACCESS_ALLOW_TRANSFER_INSTEAD_BIT = 0x00001000, - /** Allocation strategy that chooses smallest possible free range for the allocation - to minimize memory usage and fragmentation, possibly at the expense of allocation time. - */ - VMA_ALLOCATION_CREATE_STRATEGY_MIN_MEMORY_BIT = 0x00010000, - /** Allocation strategy that chooses first suitable free range for the allocation - - not necessarily in terms of the smallest offset but the one that is easiest and fastest to find - to minimize allocation time, possibly at the expense of allocation quality. - */ - VMA_ALLOCATION_CREATE_STRATEGY_MIN_TIME_BIT = 0x00020000, - /** Allocation strategy that chooses always the lowest offset in available space. - This is not the most efficient strategy but achieves highly packed data. - Used internally by defragmentation, not recommended in typical usage. - */ - VMA_ALLOCATION_CREATE_STRATEGY_MIN_OFFSET_BIT = 0x00040000, - /** Alias to #VMA_ALLOCATION_CREATE_STRATEGY_MIN_MEMORY_BIT. - */ - VMA_ALLOCATION_CREATE_STRATEGY_BEST_FIT_BIT = VMA_ALLOCATION_CREATE_STRATEGY_MIN_MEMORY_BIT, - /** Alias to #VMA_ALLOCATION_CREATE_STRATEGY_MIN_TIME_BIT. - */ - VMA_ALLOCATION_CREATE_STRATEGY_FIRST_FIT_BIT = VMA_ALLOCATION_CREATE_STRATEGY_MIN_TIME_BIT, - /** A bit mask to extract only `STRATEGY` bits from entire set of flags. - */ - VMA_ALLOCATION_CREATE_STRATEGY_MASK = - VMA_ALLOCATION_CREATE_STRATEGY_MIN_MEMORY_BIT | - VMA_ALLOCATION_CREATE_STRATEGY_MIN_TIME_BIT | - VMA_ALLOCATION_CREATE_STRATEGY_MIN_OFFSET_BIT, - - VMA_ALLOCATION_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF -} VmaAllocationCreateFlagBits; -/// See #VmaAllocationCreateFlagBits. -typedef VkFlags VmaAllocationCreateFlags; - -/// Flags to be passed as VmaPoolCreateInfo::flags. -typedef enum VmaPoolCreateFlagBits -{ - /** \brief Use this flag if you always allocate only buffers and linear images or only optimal images out of this pool and so Buffer-Image Granularity can be ignored. - - This is an optional optimization flag. - - If you always allocate using vmaCreateBuffer(), vmaCreateImage(), - vmaAllocateMemoryForBuffer(), then you don't need to use it because allocator - knows exact type of your allocations so it can handle Buffer-Image Granularity - in the optimal way. - - If you also allocate using vmaAllocateMemoryForImage() or vmaAllocateMemory(), - exact type of such allocations is not known, so allocator must be conservative - in handling Buffer-Image Granularity, which can lead to suboptimal allocation - (wasted memory). In that case, if you can make sure you always allocate only - buffers and linear images or only optimal images out of this pool, use this flag - to make allocator disregard Buffer-Image Granularity and so make allocations - faster and more optimal. - */ - VMA_POOL_CREATE_IGNORE_BUFFER_IMAGE_GRANULARITY_BIT = 0x00000002, - - /** \brief Enables alternative, linear allocation algorithm in this pool. - - Specify this flag to enable linear allocation algorithm, which always creates - new allocations after last one and doesn't reuse space from allocations freed in - between. It trades memory consumption for simplified algorithm and data - structure, which has better performance and uses less memory for metadata. - - By using this flag, you can achieve behavior of free-at-once, stack, - ring buffer, and double stack. - For details, see documentation chapter \ref linear_algorithm. - */ - VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT = 0x00000004, - - /** Bit mask to extract only `ALGORITHM` bits from entire set of flags. - */ - VMA_POOL_CREATE_ALGORITHM_MASK = - VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT, - - VMA_POOL_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF -} VmaPoolCreateFlagBits; -/// Flags to be passed as VmaPoolCreateInfo::flags. See #VmaPoolCreateFlagBits. -typedef VkFlags VmaPoolCreateFlags; - -/// Flags to be passed as VmaDefragmentationInfo::flags. -typedef enum VmaDefragmentationFlagBits -{ - /* \brief Use simple but fast algorithm for defragmentation. - May not achieve best results but will require least time to compute and least allocations to copy. - */ - VMA_DEFRAGMENTATION_FLAG_ALGORITHM_FAST_BIT = 0x1, - /* \brief Default defragmentation algorithm, applied also when no `ALGORITHM` flag is specified. - Offers a balance between defragmentation quality and the amount of allocations and bytes that need to be moved. - */ - VMA_DEFRAGMENTATION_FLAG_ALGORITHM_BALANCED_BIT = 0x2, - /* \brief Perform full defragmentation of memory. - Can result in notably more time to compute and allocations to copy, but will achieve best memory packing. - */ - VMA_DEFRAGMENTATION_FLAG_ALGORITHM_FULL_BIT = 0x4, - /** \brief Use the most roboust algorithm at the cost of time to compute and number of copies to make. - Only available when bufferImageGranularity is greater than 1, since it aims to reduce - alignment issues between different types of resources. - Otherwise falls back to same behavior as #VMA_DEFRAGMENTATION_FLAG_ALGORITHM_FULL_BIT. - */ - VMA_DEFRAGMENTATION_FLAG_ALGORITHM_EXTENSIVE_BIT = 0x8, - - /// A bit mask to extract only `ALGORITHM` bits from entire set of flags. - VMA_DEFRAGMENTATION_FLAG_ALGORITHM_MASK = - VMA_DEFRAGMENTATION_FLAG_ALGORITHM_FAST_BIT | - VMA_DEFRAGMENTATION_FLAG_ALGORITHM_BALANCED_BIT | - VMA_DEFRAGMENTATION_FLAG_ALGORITHM_FULL_BIT | - VMA_DEFRAGMENTATION_FLAG_ALGORITHM_EXTENSIVE_BIT, - - VMA_DEFRAGMENTATION_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF -} VmaDefragmentationFlagBits; -/// See #VmaDefragmentationFlagBits. -typedef VkFlags VmaDefragmentationFlags; - -/// Operation performed on single defragmentation move. See structure #VmaDefragmentationMove. -typedef enum VmaDefragmentationMoveOperation -{ - /// Buffer/image has been recreated at `dstTmpAllocation`, data has been copied, old buffer/image has been destroyed. `srcAllocation` should be changed to point to the new place. This is the default value set by vmaBeginDefragmentationPass(). - VMA_DEFRAGMENTATION_MOVE_OPERATION_COPY = 0, - /// Set this value if you cannot move the allocation. New place reserved at `dstTmpAllocation` will be freed. `srcAllocation` will remain unchanged. - VMA_DEFRAGMENTATION_MOVE_OPERATION_IGNORE = 1, - /// Set this value if you decide to abandon the allocation and you destroyed the buffer/image. New place reserved at `dstTmpAllocation` will be freed, along with `srcAllocation`, which will be destroyed. - VMA_DEFRAGMENTATION_MOVE_OPERATION_DESTROY = 2, -} VmaDefragmentationMoveOperation; - -/** @} */ - -/** -\addtogroup group_virtual -@{ -*/ - -/// Flags to be passed as VmaVirtualBlockCreateInfo::flags. -typedef enum VmaVirtualBlockCreateFlagBits -{ - /** \brief Enables alternative, linear allocation algorithm in this virtual block. - - Specify this flag to enable linear allocation algorithm, which always creates - new allocations after last one and doesn't reuse space from allocations freed in - between. It trades memory consumption for simplified algorithm and data - structure, which has better performance and uses less memory for metadata. - - By using this flag, you can achieve behavior of free-at-once, stack, - ring buffer, and double stack. - For details, see documentation chapter \ref linear_algorithm. - */ - VMA_VIRTUAL_BLOCK_CREATE_LINEAR_ALGORITHM_BIT = 0x00000001, - - /** \brief Bit mask to extract only `ALGORITHM` bits from entire set of flags. - */ - VMA_VIRTUAL_BLOCK_CREATE_ALGORITHM_MASK = - VMA_VIRTUAL_BLOCK_CREATE_LINEAR_ALGORITHM_BIT, - - VMA_VIRTUAL_BLOCK_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF -} VmaVirtualBlockCreateFlagBits; -/// Flags to be passed as VmaVirtualBlockCreateInfo::flags. See #VmaVirtualBlockCreateFlagBits. -typedef VkFlags VmaVirtualBlockCreateFlags; - -/// Flags to be passed as VmaVirtualAllocationCreateInfo::flags. -typedef enum VmaVirtualAllocationCreateFlagBits -{ - /** \brief Allocation will be created from upper stack in a double stack pool. - - This flag is only allowed for virtual blocks created with #VMA_VIRTUAL_BLOCK_CREATE_LINEAR_ALGORITHM_BIT flag. - */ - VMA_VIRTUAL_ALLOCATION_CREATE_UPPER_ADDRESS_BIT = VMA_ALLOCATION_CREATE_UPPER_ADDRESS_BIT, - /** \brief Allocation strategy that tries to minimize memory usage. - */ - VMA_VIRTUAL_ALLOCATION_CREATE_STRATEGY_MIN_MEMORY_BIT = VMA_ALLOCATION_CREATE_STRATEGY_MIN_MEMORY_BIT, - /** \brief Allocation strategy that tries to minimize allocation time. - */ - VMA_VIRTUAL_ALLOCATION_CREATE_STRATEGY_MIN_TIME_BIT = VMA_ALLOCATION_CREATE_STRATEGY_MIN_TIME_BIT, - /** Allocation strategy that chooses always the lowest offset in available space. - This is not the most efficient strategy but achieves highly packed data. - */ - VMA_VIRTUAL_ALLOCATION_CREATE_STRATEGY_MIN_OFFSET_BIT = VMA_ALLOCATION_CREATE_STRATEGY_MIN_OFFSET_BIT, - /** \brief A bit mask to extract only `STRATEGY` bits from entire set of flags. - - These strategy flags are binary compatible with equivalent flags in #VmaAllocationCreateFlagBits. - */ - VMA_VIRTUAL_ALLOCATION_CREATE_STRATEGY_MASK = VMA_ALLOCATION_CREATE_STRATEGY_MASK, - - VMA_VIRTUAL_ALLOCATION_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF -} VmaVirtualAllocationCreateFlagBits; -/// Flags to be passed as VmaVirtualAllocationCreateInfo::flags. See #VmaVirtualAllocationCreateFlagBits. -typedef VkFlags VmaVirtualAllocationCreateFlags; - -/** @} */ + typedef enum VmaAllocatorCreateFlagBits + { + /** \brief Allocator and all objects created from it will not be synchronized internally, so you must guarantee they are used from only one thread at a time or synchronized externally by you. + + Using this flag may increase performance because internal mutexes are not used. + */ + VMA_ALLOCATOR_CREATE_EXTERNALLY_SYNCHRONIZED_BIT = 0x00000001, + /** \brief Enables usage of VK_KHR_dedicated_allocation extension. + + The flag works only if VmaAllocatorCreateInfo::vulkanApiVersion `== VK_API_VERSION_1_0`. + When it is `VK_API_VERSION_1_1`, the flag is ignored because the extension has been promoted to Vulkan 1.1. + + Using this extension will automatically allocate dedicated blocks of memory for + some buffers and images instead of suballocating place for them out of bigger + memory blocks (as if you explicitly used #VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT + flag) when it is recommended by the driver. It may improve performance on some + GPUs. + + You may set this flag only if you found out that following device extensions are + supported, you enabled them while creating Vulkan device passed as + VmaAllocatorCreateInfo::device, and you want them to be used internally by this + library: + + - VK_KHR_get_memory_requirements2 (device extension) + - VK_KHR_dedicated_allocation (device extension) + + When this flag is set, you can experience following warnings reported by Vulkan + validation layer. You can ignore them. + + > vkBindBufferMemory(): Binding memory to buffer 0x2d but vkGetBufferMemoryRequirements() has not been called on that buffer. + */ + VMA_ALLOCATOR_CREATE_KHR_DEDICATED_ALLOCATION_BIT = 0x00000002, + /** + Enables usage of VK_KHR_bind_memory2 extension. + + The flag works only if VmaAllocatorCreateInfo::vulkanApiVersion `== VK_API_VERSION_1_0`. + When it is `VK_API_VERSION_1_1`, the flag is ignored because the extension has been promoted to Vulkan 1.1. + + You may set this flag only if you found out that this device extension is supported, + you enabled it while creating Vulkan device passed as VmaAllocatorCreateInfo::device, + and you want it to be used internally by this library. + + The extension provides functions `vkBindBufferMemory2KHR` and `vkBindImageMemory2KHR`, + which allow to pass a chain of `pNext` structures while binding. + This flag is required if you use `pNext` parameter in vmaBindBufferMemory2() or vmaBindImageMemory2(). + */ + VMA_ALLOCATOR_CREATE_KHR_BIND_MEMORY2_BIT = 0x00000004, + /** + Enables usage of VK_EXT_memory_budget extension. + + You may set this flag only if you found out that this device extension is supported, + you enabled it while creating Vulkan device passed as VmaAllocatorCreateInfo::device, + and you want it to be used internally by this library, along with another instance extension + VK_KHR_get_physical_device_properties2, which is required by it (or Vulkan 1.1, where this extension is promoted). + + The extension provides query for current memory usage and budget, which will probably + be more accurate than an estimation used by the library otherwise. + */ + VMA_ALLOCATOR_CREATE_EXT_MEMORY_BUDGET_BIT = 0x00000008, + /** + Enables usage of VK_AMD_device_coherent_memory extension. + + You may set this flag only if you: + + - found out that this device extension is supported and enabled it while creating Vulkan device passed as VmaAllocatorCreateInfo::device, + - checked that `VkPhysicalDeviceCoherentMemoryFeaturesAMD::deviceCoherentMemory` is true and set it while creating the Vulkan device, + - want it to be used internally by this library. + + The extension and accompanying device feature provide access to memory types with + `VK_MEMORY_PROPERTY_DEVICE_COHERENT_BIT_AMD` and `VK_MEMORY_PROPERTY_DEVICE_UNCACHED_BIT_AMD` flags. + They are useful mostly for writing breadcrumb markers - a common method for debugging GPU crash/hang/TDR. + + When the extension is not enabled, such memory types are still enumerated, but their usage is illegal. + To protect from this error, if you don't create the allocator with this flag, it will refuse to allocate any memory or create a custom pool in such memory type, + returning `VK_ERROR_FEATURE_NOT_PRESENT`. + */ + VMA_ALLOCATOR_CREATE_AMD_DEVICE_COHERENT_MEMORY_BIT = 0x00000010, + /** + Enables usage of "buffer device address" feature, which allows you to use function + `vkGetBufferDeviceAddress*` to get raw GPU pointer to a buffer and pass it for usage inside a shader. + + You may set this flag only if you: + + 1. (For Vulkan version < 1.2) Found as available and enabled device extension + VK_KHR_buffer_device_address. + This extension is promoted to core Vulkan 1.2. + 2. Found as available and enabled device feature `VkPhysicalDeviceBufferDeviceAddressFeatures::bufferDeviceAddress`. + + When this flag is set, you can create buffers with `VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT` using VMA. + The library automatically adds `VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT` to + allocated memory blocks wherever it might be needed. + + For more information, see documentation chapter \ref enabling_buffer_device_address. + */ + VMA_ALLOCATOR_CREATE_BUFFER_DEVICE_ADDRESS_BIT = 0x00000020, + /** + Enables usage of VK_EXT_memory_priority extension in the library. + + You may set this flag only if you found available and enabled this device extension, + along with `VkPhysicalDeviceMemoryPriorityFeaturesEXT::memoryPriority == VK_TRUE`, + while creating Vulkan device passed as VmaAllocatorCreateInfo::device. + + When this flag is used, VmaAllocationCreateInfo::priority and VmaPoolCreateInfo::priority + are used to set priorities of allocated Vulkan memory. Without it, these variables are ignored. + + A priority must be a floating-point value between 0 and 1, indicating the priority of the allocation relative to other memory allocations. + Larger values are higher priority. The granularity of the priorities is implementation-dependent. + It is automatically passed to every call to `vkAllocateMemory` done by the library using structure `VkMemoryPriorityAllocateInfoEXT`. + The value to be used for default priority is 0.5. + For more details, see the documentation of the VK_EXT_memory_priority extension. + */ + VMA_ALLOCATOR_CREATE_EXT_MEMORY_PRIORITY_BIT = 0x00000040, + /** + Enables usage of VK_KHR_maintenance4 extension in the library. + + You may set this flag only if you found available and enabled this device extension, + while creating Vulkan device passed as VmaAllocatorCreateInfo::device. + */ + VMA_ALLOCATOR_CREATE_KHR_MAINTENANCE4_BIT = 0x00000080, + /** + Enables usage of VK_KHR_maintenance5 extension in the library. + + You should set this flag if you found available and enabled this device extension, + while creating Vulkan device passed as VmaAllocatorCreateInfo::device. + */ + VMA_ALLOCATOR_CREATE_KHR_MAINTENANCE5_BIT = 0x00000100, + + VMA_ALLOCATOR_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF + } VmaAllocatorCreateFlagBits; + /// See #VmaAllocatorCreateFlagBits. + typedef VkFlags VmaAllocatorCreateFlags; + + /** @} */ + + /** + \addtogroup group_alloc + @{ + */ + + /// \brief Intended usage of the allocated memory. + typedef enum VmaMemoryUsage + { + /** No intended memory usage specified. + Use other members of VmaAllocationCreateInfo to specify your requirements. + */ + VMA_MEMORY_USAGE_UNKNOWN = 0, + /** + \deprecated Obsolete, preserved for backward compatibility. + Prefers `VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT`. + */ + VMA_MEMORY_USAGE_GPU_ONLY = 1, + /** + \deprecated Obsolete, preserved for backward compatibility. + Guarantees `VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT` and `VK_MEMORY_PROPERTY_HOST_COHERENT_BIT`. + */ + VMA_MEMORY_USAGE_CPU_ONLY = 2, + /** + \deprecated Obsolete, preserved for backward compatibility. + Guarantees `VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT`, prefers `VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT`. + */ + VMA_MEMORY_USAGE_CPU_TO_GPU = 3, + /** + \deprecated Obsolete, preserved for backward compatibility. + Guarantees `VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT`, prefers `VK_MEMORY_PROPERTY_HOST_CACHED_BIT`. + */ + VMA_MEMORY_USAGE_GPU_TO_CPU = 4, + /** + \deprecated Obsolete, preserved for backward compatibility. + Prefers not `VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT`. + */ + VMA_MEMORY_USAGE_CPU_COPY = 5, + /** + Lazily allocated GPU memory having `VK_MEMORY_PROPERTY_LAZILY_ALLOCATED_BIT`. + Exists mostly on mobile platforms. Using it on desktop PC or other GPUs with no such memory type present will fail the allocation. + + Usage: Memory for transient attachment images (color attachments, depth attachments etc.), created with `VK_IMAGE_USAGE_TRANSIENT_ATTACHMENT_BIT`. + + Allocations with this usage are always created as dedicated - it implies #VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT. + */ + VMA_MEMORY_USAGE_GPU_LAZILY_ALLOCATED = 6, + /** + Selects best memory type automatically. + This flag is recommended for most common use cases. + + When using this flag, if you want to map the allocation (using vmaMapMemory() or #VMA_ALLOCATION_CREATE_MAPPED_BIT), + you must pass one of the flags: #VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT or #VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT + in VmaAllocationCreateInfo::flags. + + It can be used only with functions that let the library know `VkBufferCreateInfo` or `VkImageCreateInfo`, e.g. + vmaCreateBuffer(), vmaCreateImage(), vmaFindMemoryTypeIndexForBufferInfo(), vmaFindMemoryTypeIndexForImageInfo() + and not with generic memory allocation functions. + */ + VMA_MEMORY_USAGE_AUTO = 7, + /** + Selects best memory type automatically with preference for GPU (device) memory. + + When using this flag, if you want to map the allocation (using vmaMapMemory() or #VMA_ALLOCATION_CREATE_MAPPED_BIT), + you must pass one of the flags: #VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT or #VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT + in VmaAllocationCreateInfo::flags. + + It can be used only with functions that let the library know `VkBufferCreateInfo` or `VkImageCreateInfo`, e.g. + vmaCreateBuffer(), vmaCreateImage(), vmaFindMemoryTypeIndexForBufferInfo(), vmaFindMemoryTypeIndexForImageInfo() + and not with generic memory allocation functions. + */ + VMA_MEMORY_USAGE_AUTO_PREFER_DEVICE = 8, + /** + Selects best memory type automatically with preference for CPU (host) memory. + + When using this flag, if you want to map the allocation (using vmaMapMemory() or #VMA_ALLOCATION_CREATE_MAPPED_BIT), + you must pass one of the flags: #VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT or #VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT + in VmaAllocationCreateInfo::flags. + + It can be used only with functions that let the library know `VkBufferCreateInfo` or `VkImageCreateInfo`, e.g. + vmaCreateBuffer(), vmaCreateImage(), vmaFindMemoryTypeIndexForBufferInfo(), vmaFindMemoryTypeIndexForImageInfo() + and not with generic memory allocation functions. + */ + VMA_MEMORY_USAGE_AUTO_PREFER_HOST = 9, + + VMA_MEMORY_USAGE_MAX_ENUM = 0x7FFFFFFF + } VmaMemoryUsage; + + /// Flags to be passed as VmaAllocationCreateInfo::flags. + typedef enum VmaAllocationCreateFlagBits + { + /** \brief Set this flag if the allocation should have its own memory block. + + Use it for special, big resources, like fullscreen images used as attachments. + + If you use this flag while creating a buffer or an image, `VkMemoryDedicatedAllocateInfo` + structure is applied if possible. + */ + VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT = 0x00000001, + + /** \brief Set this flag to only try to allocate from existing `VkDeviceMemory` blocks and never create new such block. + + If new allocation cannot be placed in any of the existing blocks, allocation + fails with `VK_ERROR_OUT_OF_DEVICE_MEMORY` error. + + You should not use #VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT and + #VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT at the same time. It makes no sense. + */ + VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT = 0x00000002, + /** \brief Set this flag to use a memory that will be persistently mapped and retrieve pointer to it. + + Pointer to mapped memory will be returned through VmaAllocationInfo::pMappedData. + + It is valid to use this flag for allocation made from memory type that is not + `HOST_VISIBLE`. This flag is then ignored and memory is not mapped. This is + useful if you need an allocation that is efficient to use on GPU + (`DEVICE_LOCAL`) and still want to map it directly if possible on platforms that + support it (e.g. Intel GPU). + */ + VMA_ALLOCATION_CREATE_MAPPED_BIT = 0x00000004, + /** \deprecated Preserved for backward compatibility. Consider using vmaSetAllocationName() instead. + + Set this flag to treat VmaAllocationCreateInfo::pUserData as pointer to a + null-terminated string. Instead of copying pointer value, a local copy of the + string is made and stored in allocation's `pName`. The string is automatically + freed together with the allocation. It is also used in vmaBuildStatsString(). + */ + VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT = 0x00000020, + /** Allocation will be created from upper stack in a double stack pool. + + This flag is only allowed for custom pools created with #VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT flag. + */ + VMA_ALLOCATION_CREATE_UPPER_ADDRESS_BIT = 0x00000040, + /** Create both buffer/image and allocation, but don't bind them together. + It is useful when you want to bind yourself to do some more advanced binding, e.g. using some extensions. + The flag is meaningful only with functions that bind by default: vmaCreateBuffer(), vmaCreateImage(). + Otherwise it is ignored. + + If you want to make sure the new buffer/image is not tied to the new memory allocation + through `VkMemoryDedicatedAllocateInfoKHR` structure in case the allocation ends up in its own memory block, + use also flag #VMA_ALLOCATION_CREATE_CAN_ALIAS_BIT. + */ + VMA_ALLOCATION_CREATE_DONT_BIND_BIT = 0x00000080, + /** Create allocation only if additional device memory required for it, if any, won't exceed + memory budget. Otherwise return `VK_ERROR_OUT_OF_DEVICE_MEMORY`. + */ + VMA_ALLOCATION_CREATE_WITHIN_BUDGET_BIT = 0x00000100, + /** \brief Set this flag if the allocated memory will have aliasing resources. + + Usage of this flag prevents supplying `VkMemoryDedicatedAllocateInfoKHR` when #VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT is specified. + Otherwise created dedicated memory will not be suitable for aliasing resources, resulting in Vulkan Validation Layer errors. + */ + VMA_ALLOCATION_CREATE_CAN_ALIAS_BIT = 0x00000200, + /** + Requests possibility to map the allocation (using vmaMapMemory() or #VMA_ALLOCATION_CREATE_MAPPED_BIT). + + - If you use #VMA_MEMORY_USAGE_AUTO or other `VMA_MEMORY_USAGE_AUTO*` value, + you must use this flag to be able to map the allocation. Otherwise, mapping is incorrect. + - If you use other value of #VmaMemoryUsage, this flag is ignored and mapping is always possible in memory types that are `HOST_VISIBLE`. + This includes allocations created in \ref custom_memory_pools. + + Declares that mapped memory will only be written sequentially, e.g. using `memcpy()` or a loop writing number-by-number, + never read or accessed randomly, so a memory type can be selected that is uncached and write-combined. + + \warning Violating this declaration may work correctly, but will likely be very slow. + Watch out for implicit reads introduced by doing e.g. `pMappedData[i] += x;` + Better prepare your data in a local variable and `memcpy()` it to the mapped pointer all at once. + */ + VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT = 0x00000400, + /** + Requests possibility to map the allocation (using vmaMapMemory() or #VMA_ALLOCATION_CREATE_MAPPED_BIT). + + - If you use #VMA_MEMORY_USAGE_AUTO or other `VMA_MEMORY_USAGE_AUTO*` value, + you must use this flag to be able to map the allocation. Otherwise, mapping is incorrect. + - If you use other value of #VmaMemoryUsage, this flag is ignored and mapping is always possible in memory types that are `HOST_VISIBLE`. + This includes allocations created in \ref custom_memory_pools. + + Declares that mapped memory can be read, written, and accessed in random order, + so a `HOST_CACHED` memory type is preferred. + */ + VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT = 0x00000800, + /** + Together with #VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT or #VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT, + it says that despite request for host access, a not-`HOST_VISIBLE` memory type can be selected + if it may improve performance. + + By using this flag, you declare that you will check if the allocation ended up in a `HOST_VISIBLE` memory type + (e.g. using vmaGetAllocationMemoryProperties()) and if not, you will create some "staging" buffer and + issue an explicit transfer to write/read your data. + To prepare for this possibility, don't forget to add appropriate flags like + `VK_BUFFER_USAGE_TRANSFER_DST_BIT`, `VK_BUFFER_USAGE_TRANSFER_SRC_BIT` to the parameters of created buffer or image. + */ + VMA_ALLOCATION_CREATE_HOST_ACCESS_ALLOW_TRANSFER_INSTEAD_BIT = 0x00001000, + /** Allocation strategy that chooses smallest possible free range for the allocation + to minimize memory usage and fragmentation, possibly at the expense of allocation time. + */ + VMA_ALLOCATION_CREATE_STRATEGY_MIN_MEMORY_BIT = 0x00010000, + /** Allocation strategy that chooses first suitable free range for the allocation - + not necessarily in terms of the smallest offset but the one that is easiest and fastest to find + to minimize allocation time, possibly at the expense of allocation quality. + */ + VMA_ALLOCATION_CREATE_STRATEGY_MIN_TIME_BIT = 0x00020000, + /** Allocation strategy that chooses always the lowest offset in available space. + This is not the most efficient strategy but achieves highly packed data. + Used internally by defragmentation, not recommended in typical usage. + */ + VMA_ALLOCATION_CREATE_STRATEGY_MIN_OFFSET_BIT = 0x00040000, + /** Alias to #VMA_ALLOCATION_CREATE_STRATEGY_MIN_MEMORY_BIT. + */ + VMA_ALLOCATION_CREATE_STRATEGY_BEST_FIT_BIT = VMA_ALLOCATION_CREATE_STRATEGY_MIN_MEMORY_BIT, + /** Alias to #VMA_ALLOCATION_CREATE_STRATEGY_MIN_TIME_BIT. + */ + VMA_ALLOCATION_CREATE_STRATEGY_FIRST_FIT_BIT = VMA_ALLOCATION_CREATE_STRATEGY_MIN_TIME_BIT, + /** A bit mask to extract only `STRATEGY` bits from entire set of flags. + */ + VMA_ALLOCATION_CREATE_STRATEGY_MASK = + VMA_ALLOCATION_CREATE_STRATEGY_MIN_MEMORY_BIT | + VMA_ALLOCATION_CREATE_STRATEGY_MIN_TIME_BIT | + VMA_ALLOCATION_CREATE_STRATEGY_MIN_OFFSET_BIT, + + VMA_ALLOCATION_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF + } VmaAllocationCreateFlagBits; + /// See #VmaAllocationCreateFlagBits. + typedef VkFlags VmaAllocationCreateFlags; + + /// Flags to be passed as VmaPoolCreateInfo::flags. + typedef enum VmaPoolCreateFlagBits + { + /** \brief Use this flag if you always allocate only buffers and linear images or only optimal images out of this pool and so Buffer-Image Granularity can be ignored. + + This is an optional optimization flag. + + If you always allocate using vmaCreateBuffer(), vmaCreateImage(), + vmaAllocateMemoryForBuffer(), then you don't need to use it because allocator + knows exact type of your allocations so it can handle Buffer-Image Granularity + in the optimal way. + + If you also allocate using vmaAllocateMemoryForImage() or vmaAllocateMemory(), + exact type of such allocations is not known, so allocator must be conservative + in handling Buffer-Image Granularity, which can lead to suboptimal allocation + (wasted memory). In that case, if you can make sure you always allocate only + buffers and linear images or only optimal images out of this pool, use this flag + to make allocator disregard Buffer-Image Granularity and so make allocations + faster and more optimal. + */ + VMA_POOL_CREATE_IGNORE_BUFFER_IMAGE_GRANULARITY_BIT = 0x00000002, + + /** \brief Enables alternative, linear allocation algorithm in this pool. + + Specify this flag to enable linear allocation algorithm, which always creates + new allocations after last one and doesn't reuse space from allocations freed in + between. It trades memory consumption for simplified algorithm and data + structure, which has better performance and uses less memory for metadata. + + By using this flag, you can achieve behavior of free-at-once, stack, + ring buffer, and double stack. + For details, see documentation chapter \ref linear_algorithm. + */ + VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT = 0x00000004, + + /** Bit mask to extract only `ALGORITHM` bits from entire set of flags. + */ + VMA_POOL_CREATE_ALGORITHM_MASK = + VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT, + + VMA_POOL_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF + } VmaPoolCreateFlagBits; + /// Flags to be passed as VmaPoolCreateInfo::flags. See #VmaPoolCreateFlagBits. + typedef VkFlags VmaPoolCreateFlags; + + /// Flags to be passed as VmaDefragmentationInfo::flags. + typedef enum VmaDefragmentationFlagBits + { + /* \brief Use simple but fast algorithm for defragmentation. + May not achieve best results but will require least time to compute and least allocations to copy. + */ + VMA_DEFRAGMENTATION_FLAG_ALGORITHM_FAST_BIT = 0x1, + /* \brief Default defragmentation algorithm, applied also when no `ALGORITHM` flag is specified. + Offers a balance between defragmentation quality and the amount of allocations and bytes that need to be moved. + */ + VMA_DEFRAGMENTATION_FLAG_ALGORITHM_BALANCED_BIT = 0x2, + /* \brief Perform full defragmentation of memory. + Can result in notably more time to compute and allocations to copy, but will achieve best memory packing. + */ + VMA_DEFRAGMENTATION_FLAG_ALGORITHM_FULL_BIT = 0x4, + /** \brief Use the most roboust algorithm at the cost of time to compute and number of copies to make. + Only available when bufferImageGranularity is greater than 1, since it aims to reduce + alignment issues between different types of resources. + Otherwise falls back to same behavior as #VMA_DEFRAGMENTATION_FLAG_ALGORITHM_FULL_BIT. + */ + VMA_DEFRAGMENTATION_FLAG_ALGORITHM_EXTENSIVE_BIT = 0x8, + + /// A bit mask to extract only `ALGORITHM` bits from entire set of flags. + VMA_DEFRAGMENTATION_FLAG_ALGORITHM_MASK = + VMA_DEFRAGMENTATION_FLAG_ALGORITHM_FAST_BIT | + VMA_DEFRAGMENTATION_FLAG_ALGORITHM_BALANCED_BIT | + VMA_DEFRAGMENTATION_FLAG_ALGORITHM_FULL_BIT | + VMA_DEFRAGMENTATION_FLAG_ALGORITHM_EXTENSIVE_BIT, + + VMA_DEFRAGMENTATION_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF + } VmaDefragmentationFlagBits; + /// See #VmaDefragmentationFlagBits. + typedef VkFlags VmaDefragmentationFlags; + + /// Operation performed on single defragmentation move. See structure #VmaDefragmentationMove. + typedef enum VmaDefragmentationMoveOperation + { + /// Buffer/image has been recreated at `dstTmpAllocation`, data has been copied, old buffer/image has been destroyed. `srcAllocation` should be changed to point to the new place. This is the default value set by vmaBeginDefragmentationPass(). + VMA_DEFRAGMENTATION_MOVE_OPERATION_COPY = 0, + /// Set this value if you cannot move the allocation. New place reserved at `dstTmpAllocation` will be freed. `srcAllocation` will remain unchanged. + VMA_DEFRAGMENTATION_MOVE_OPERATION_IGNORE = 1, + /// Set this value if you decide to abandon the allocation and you destroyed the buffer/image. New place reserved at `dstTmpAllocation` will be freed, along with `srcAllocation`, which will be destroyed. + VMA_DEFRAGMENTATION_MOVE_OPERATION_DESTROY = 2, + } VmaDefragmentationMoveOperation; + + /** @} */ + + /** + \addtogroup group_virtual + @{ + */ + + /// Flags to be passed as VmaVirtualBlockCreateInfo::flags. + typedef enum VmaVirtualBlockCreateFlagBits + { + /** \brief Enables alternative, linear allocation algorithm in this virtual block. + + Specify this flag to enable linear allocation algorithm, which always creates + new allocations after last one and doesn't reuse space from allocations freed in + between. It trades memory consumption for simplified algorithm and data + structure, which has better performance and uses less memory for metadata. + + By using this flag, you can achieve behavior of free-at-once, stack, + ring buffer, and double stack. + For details, see documentation chapter \ref linear_algorithm. + */ + VMA_VIRTUAL_BLOCK_CREATE_LINEAR_ALGORITHM_BIT = 0x00000001, + + /** \brief Bit mask to extract only `ALGORITHM` bits from entire set of flags. + */ + VMA_VIRTUAL_BLOCK_CREATE_ALGORITHM_MASK = + VMA_VIRTUAL_BLOCK_CREATE_LINEAR_ALGORITHM_BIT, + + VMA_VIRTUAL_BLOCK_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF + } VmaVirtualBlockCreateFlagBits; + /// Flags to be passed as VmaVirtualBlockCreateInfo::flags. See #VmaVirtualBlockCreateFlagBits. + typedef VkFlags VmaVirtualBlockCreateFlags; + + /// Flags to be passed as VmaVirtualAllocationCreateInfo::flags. + typedef enum VmaVirtualAllocationCreateFlagBits + { + /** \brief Allocation will be created from upper stack in a double stack pool. + + This flag is only allowed for virtual blocks created with #VMA_VIRTUAL_BLOCK_CREATE_LINEAR_ALGORITHM_BIT flag. + */ + VMA_VIRTUAL_ALLOCATION_CREATE_UPPER_ADDRESS_BIT = VMA_ALLOCATION_CREATE_UPPER_ADDRESS_BIT, + /** \brief Allocation strategy that tries to minimize memory usage. + */ + VMA_VIRTUAL_ALLOCATION_CREATE_STRATEGY_MIN_MEMORY_BIT = VMA_ALLOCATION_CREATE_STRATEGY_MIN_MEMORY_BIT, + /** \brief Allocation strategy that tries to minimize allocation time. + */ + VMA_VIRTUAL_ALLOCATION_CREATE_STRATEGY_MIN_TIME_BIT = VMA_ALLOCATION_CREATE_STRATEGY_MIN_TIME_BIT, + /** Allocation strategy that chooses always the lowest offset in available space. + This is not the most efficient strategy but achieves highly packed data. + */ + VMA_VIRTUAL_ALLOCATION_CREATE_STRATEGY_MIN_OFFSET_BIT = VMA_ALLOCATION_CREATE_STRATEGY_MIN_OFFSET_BIT, + /** \brief A bit mask to extract only `STRATEGY` bits from entire set of flags. + + These strategy flags are binary compatible with equivalent flags in #VmaAllocationCreateFlagBits. + */ + VMA_VIRTUAL_ALLOCATION_CREATE_STRATEGY_MASK = VMA_ALLOCATION_CREATE_STRATEGY_MASK, + + VMA_VIRTUAL_ALLOCATION_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF + } VmaVirtualAllocationCreateFlagBits; + /// Flags to be passed as VmaVirtualAllocationCreateInfo::flags. See #VmaVirtualAllocationCreateFlagBits. + typedef VkFlags VmaVirtualAllocationCreateFlags; + + /** @} */ #endif // _VMA_ENUM_DECLARATIONS @@ -838,735 +881,776 @@ Call function vmaDestroyAllocator() to destroy it. It is recommended to create just one object of this type per `VkDevice` object, right after Vulkan is initialized and keep it alive until before Vulkan device is destroyed. */ -VK_DEFINE_HANDLE(VmaAllocator) + VK_DEFINE_HANDLE(VmaAllocator) -/** @} */ + /** @} */ -/** -\addtogroup group_alloc -@{ -*/ + /** + \addtogroup group_alloc + @{ + */ -/** \struct VmaPool -\brief Represents custom memory pool + /** \struct VmaPool + \brief Represents custom memory pool -Fill structure VmaPoolCreateInfo and call function vmaCreatePool() to create it. -Call function vmaDestroyPool() to destroy it. + Fill structure VmaPoolCreateInfo and call function vmaCreatePool() to create it. + Call function vmaDestroyPool() to destroy it. -For more information see [Custom memory pools](@ref choosing_memory_type_custom_memory_pools). -*/ -VK_DEFINE_HANDLE(VmaPool) + For more information see [Custom memory pools](@ref choosing_memory_type_custom_memory_pools). + */ + VK_DEFINE_HANDLE(VmaPool) -/** \struct VmaAllocation -\brief Represents single memory allocation. + /** \struct VmaAllocation + \brief Represents single memory allocation. -It may be either dedicated block of `VkDeviceMemory` or a specific region of a bigger block of this type -plus unique offset. + It may be either dedicated block of `VkDeviceMemory` or a specific region of a bigger block of this type + plus unique offset. -There are multiple ways to create such object. -You need to fill structure VmaAllocationCreateInfo. -For more information see [Choosing memory type](@ref choosing_memory_type). + There are multiple ways to create such object. + You need to fill structure VmaAllocationCreateInfo. + For more information see [Choosing memory type](@ref choosing_memory_type). -Although the library provides convenience functions that create Vulkan buffer or image, -allocate memory for it and bind them together, -binding of the allocation to a buffer or an image is out of scope of the allocation itself. -Allocation object can exist without buffer/image bound, -binding can be done manually by the user, and destruction of it can be done -independently of destruction of the allocation. + Although the library provides convenience functions that create Vulkan buffer or image, + allocate memory for it and bind them together, + binding of the allocation to a buffer or an image is out of scope of the allocation itself. + Allocation object can exist without buffer/image bound, + binding can be done manually by the user, and destruction of it can be done + independently of destruction of the allocation. -The object also remembers its size and some other information. -To retrieve this information, use function vmaGetAllocationInfo() and inspect -returned structure VmaAllocationInfo. -*/ -VK_DEFINE_HANDLE(VmaAllocation) + The object also remembers its size and some other information. + To retrieve this information, use function vmaGetAllocationInfo() and inspect + returned structure VmaAllocationInfo. + */ + VK_DEFINE_HANDLE(VmaAllocation) -/** \struct VmaDefragmentationContext -\brief An opaque object that represents started defragmentation process. + /** \struct VmaDefragmentationContext + \brief An opaque object that represents started defragmentation process. -Fill structure #VmaDefragmentationInfo and call function vmaBeginDefragmentation() to create it. -Call function vmaEndDefragmentation() to destroy it. -*/ -VK_DEFINE_HANDLE(VmaDefragmentationContext) + Fill structure #VmaDefragmentationInfo and call function vmaBeginDefragmentation() to create it. + Call function vmaEndDefragmentation() to destroy it. + */ + VK_DEFINE_HANDLE(VmaDefragmentationContext) -/** @} */ + /** @} */ -/** -\addtogroup group_virtual -@{ -*/ + /** + \addtogroup group_virtual + @{ + */ -/** \struct VmaVirtualAllocation -\brief Represents single memory allocation done inside VmaVirtualBlock. + /** \struct VmaVirtualAllocation + \brief Represents single memory allocation done inside VmaVirtualBlock. -Use it as a unique identifier to virtual allocation within the single block. + Use it as a unique identifier to virtual allocation within the single block. -Use value `VK_NULL_HANDLE` to represent a null/invalid allocation. -*/ -VK_DEFINE_NON_DISPATCHABLE_HANDLE(VmaVirtualAllocation); + Use value `VK_NULL_HANDLE` to represent a null/invalid allocation. + */ + VK_DEFINE_NON_DISPATCHABLE_HANDLE(VmaVirtualAllocation) -/** @} */ + /** @} */ -/** -\addtogroup group_virtual -@{ -*/ + /** + \addtogroup group_virtual + @{ + */ -/** \struct VmaVirtualBlock -\brief Handle to a virtual block object that allows to use core allocation algorithm without allocating any real GPU memory. + /** \struct VmaVirtualBlock + \brief Handle to a virtual block object that allows to use core allocation algorithm without allocating any real GPU memory. -Fill in #VmaVirtualBlockCreateInfo structure and use vmaCreateVirtualBlock() to create it. Use vmaDestroyVirtualBlock() to destroy it. -For more information, see documentation chapter \ref virtual_allocator. + Fill in #VmaVirtualBlockCreateInfo structure and use vmaCreateVirtualBlock() to create it. Use vmaDestroyVirtualBlock() to destroy it. + For more information, see documentation chapter \ref virtual_allocator. -This object is not thread-safe - should not be used from multiple threads simultaneously, must be synchronized externally. -*/ -VK_DEFINE_HANDLE(VmaVirtualBlock) + This object is not thread-safe - should not be used from multiple threads simultaneously, must be synchronized externally. + */ + VK_DEFINE_HANDLE(VmaVirtualBlock) -/** @} */ + /** @} */ -/** -\addtogroup group_init -@{ -*/ + /** + \addtogroup group_init + @{ + */ -/// Callback function called after successful vkAllocateMemory. -typedef void (VKAPI_PTR* PFN_vmaAllocateDeviceMemoryFunction)( - VmaAllocator VMA_NOT_NULL allocator, - uint32_t memoryType, - VkDeviceMemory VMA_NOT_NULL_NON_DISPATCHABLE memory, - VkDeviceSize size, - void* VMA_NULLABLE pUserData); + /// Callback function called after successful vkAllocateMemory. + typedef void (VKAPI_PTR* PFN_vmaAllocateDeviceMemoryFunction)( + VmaAllocator VMA_NOT_NULL allocator, + uint32_t memoryType, + VkDeviceMemory VMA_NOT_NULL_NON_DISPATCHABLE memory, + VkDeviceSize size, + void* VMA_NULLABLE pUserData); -/// Callback function called before vkFreeMemory. -typedef void (VKAPI_PTR* PFN_vmaFreeDeviceMemoryFunction)( - VmaAllocator VMA_NOT_NULL allocator, - uint32_t memoryType, - VkDeviceMemory VMA_NOT_NULL_NON_DISPATCHABLE memory, - VkDeviceSize size, - void* VMA_NULLABLE pUserData); + /// Callback function called before vkFreeMemory. + typedef void (VKAPI_PTR* PFN_vmaFreeDeviceMemoryFunction)( + VmaAllocator VMA_NOT_NULL allocator, + uint32_t memoryType, + VkDeviceMemory VMA_NOT_NULL_NON_DISPATCHABLE memory, + VkDeviceSize size, + void* VMA_NULLABLE pUserData); -/** \brief Set of callbacks that the library will call for `vkAllocateMemory` and `vkFreeMemory`. + /** \brief Set of callbacks that the library will call for `vkAllocateMemory` and `vkFreeMemory`. -Provided for informative purpose, e.g. to gather statistics about number of -allocations or total amount of memory allocated in Vulkan. + Provided for informative purpose, e.g. to gather statistics about number of + allocations or total amount of memory allocated in Vulkan. -Used in VmaAllocatorCreateInfo::pDeviceMemoryCallbacks. -*/ -typedef struct VmaDeviceMemoryCallbacks -{ - /// Optional, can be null. - PFN_vmaAllocateDeviceMemoryFunction VMA_NULLABLE pfnAllocate; - /// Optional, can be null. - PFN_vmaFreeDeviceMemoryFunction VMA_NULLABLE pfnFree; - /// Optional, can be null. - void* VMA_NULLABLE pUserData; -} VmaDeviceMemoryCallbacks; + Used in VmaAllocatorCreateInfo::pDeviceMemoryCallbacks. + */ + typedef struct VmaDeviceMemoryCallbacks + { + /// Optional, can be null. + PFN_vmaAllocateDeviceMemoryFunction VMA_NULLABLE pfnAllocate; + /// Optional, can be null. + PFN_vmaFreeDeviceMemoryFunction VMA_NULLABLE pfnFree; + /// Optional, can be null. + void* VMA_NULLABLE pUserData; + } VmaDeviceMemoryCallbacks; -/** \brief Pointers to some Vulkan functions - a subset used by the library. + /** \brief Pointers to some Vulkan functions - a subset used by the library. -Used in VmaAllocatorCreateInfo::pVulkanFunctions. -*/ -typedef struct VmaVulkanFunctions -{ - /// Required when using VMA_DYNAMIC_VULKAN_FUNCTIONS. - PFN_vkGetInstanceProcAddr VMA_NULLABLE vkGetInstanceProcAddr; - /// Required when using VMA_DYNAMIC_VULKAN_FUNCTIONS. - PFN_vkGetDeviceProcAddr VMA_NULLABLE vkGetDeviceProcAddr; - PFN_vkGetPhysicalDeviceProperties VMA_NULLABLE vkGetPhysicalDeviceProperties; - PFN_vkGetPhysicalDeviceMemoryProperties VMA_NULLABLE vkGetPhysicalDeviceMemoryProperties; - PFN_vkAllocateMemory VMA_NULLABLE vkAllocateMemory; - PFN_vkFreeMemory VMA_NULLABLE vkFreeMemory; - PFN_vkMapMemory VMA_NULLABLE vkMapMemory; - PFN_vkUnmapMemory VMA_NULLABLE vkUnmapMemory; - PFN_vkFlushMappedMemoryRanges VMA_NULLABLE vkFlushMappedMemoryRanges; - PFN_vkInvalidateMappedMemoryRanges VMA_NULLABLE vkInvalidateMappedMemoryRanges; - PFN_vkBindBufferMemory VMA_NULLABLE vkBindBufferMemory; - PFN_vkBindImageMemory VMA_NULLABLE vkBindImageMemory; - PFN_vkGetBufferMemoryRequirements VMA_NULLABLE vkGetBufferMemoryRequirements; - PFN_vkGetImageMemoryRequirements VMA_NULLABLE vkGetImageMemoryRequirements; - PFN_vkCreateBuffer VMA_NULLABLE vkCreateBuffer; - PFN_vkDestroyBuffer VMA_NULLABLE vkDestroyBuffer; - PFN_vkCreateImage VMA_NULLABLE vkCreateImage; - PFN_vkDestroyImage VMA_NULLABLE vkDestroyImage; - PFN_vkCmdCopyBuffer VMA_NULLABLE vkCmdCopyBuffer; + Used in VmaAllocatorCreateInfo::pVulkanFunctions. + */ + typedef struct VmaVulkanFunctions + { + /// Required when using VMA_DYNAMIC_VULKAN_FUNCTIONS. + PFN_vkGetInstanceProcAddr VMA_NULLABLE vkGetInstanceProcAddr; + /// Required when using VMA_DYNAMIC_VULKAN_FUNCTIONS. + PFN_vkGetDeviceProcAddr VMA_NULLABLE vkGetDeviceProcAddr; + PFN_vkGetPhysicalDeviceProperties VMA_NULLABLE vkGetPhysicalDeviceProperties; + PFN_vkGetPhysicalDeviceMemoryProperties VMA_NULLABLE vkGetPhysicalDeviceMemoryProperties; + PFN_vkAllocateMemory VMA_NULLABLE vkAllocateMemory; + PFN_vkFreeMemory VMA_NULLABLE vkFreeMemory; + PFN_vkMapMemory VMA_NULLABLE vkMapMemory; + PFN_vkUnmapMemory VMA_NULLABLE vkUnmapMemory; + PFN_vkFlushMappedMemoryRanges VMA_NULLABLE vkFlushMappedMemoryRanges; + PFN_vkInvalidateMappedMemoryRanges VMA_NULLABLE vkInvalidateMappedMemoryRanges; + PFN_vkBindBufferMemory VMA_NULLABLE vkBindBufferMemory; + PFN_vkBindImageMemory VMA_NULLABLE vkBindImageMemory; + PFN_vkGetBufferMemoryRequirements VMA_NULLABLE vkGetBufferMemoryRequirements; + PFN_vkGetImageMemoryRequirements VMA_NULLABLE vkGetImageMemoryRequirements; + PFN_vkCreateBuffer VMA_NULLABLE vkCreateBuffer; + PFN_vkDestroyBuffer VMA_NULLABLE vkDestroyBuffer; + PFN_vkCreateImage VMA_NULLABLE vkCreateImage; + PFN_vkDestroyImage VMA_NULLABLE vkDestroyImage; + PFN_vkCmdCopyBuffer VMA_NULLABLE vkCmdCopyBuffer; #if VMA_DEDICATED_ALLOCATION || VMA_VULKAN_VERSION >= 1001000 - /// Fetch "vkGetBufferMemoryRequirements2" on Vulkan >= 1.1, fetch "vkGetBufferMemoryRequirements2KHR" when using VK_KHR_dedicated_allocation extension. - PFN_vkGetBufferMemoryRequirements2KHR VMA_NULLABLE vkGetBufferMemoryRequirements2KHR; - /// Fetch "vkGetImageMemoryRequirements2" on Vulkan >= 1.1, fetch "vkGetImageMemoryRequirements2KHR" when using VK_KHR_dedicated_allocation extension. - PFN_vkGetImageMemoryRequirements2KHR VMA_NULLABLE vkGetImageMemoryRequirements2KHR; + /// Fetch "vkGetBufferMemoryRequirements2" on Vulkan >= 1.1, fetch "vkGetBufferMemoryRequirements2KHR" when using VK_KHR_dedicated_allocation extension. + PFN_vkGetBufferMemoryRequirements2KHR VMA_NULLABLE vkGetBufferMemoryRequirements2KHR; + /// Fetch "vkGetImageMemoryRequirements2" on Vulkan >= 1.1, fetch "vkGetImageMemoryRequirements2KHR" when using VK_KHR_dedicated_allocation extension. + PFN_vkGetImageMemoryRequirements2KHR VMA_NULLABLE vkGetImageMemoryRequirements2KHR; #endif #if VMA_BIND_MEMORY2 || VMA_VULKAN_VERSION >= 1001000 - /// Fetch "vkBindBufferMemory2" on Vulkan >= 1.1, fetch "vkBindBufferMemory2KHR" when using VK_KHR_bind_memory2 extension. - PFN_vkBindBufferMemory2KHR VMA_NULLABLE vkBindBufferMemory2KHR; - /// Fetch "vkBindImageMemory2" on Vulkan >= 1.1, fetch "vkBindImageMemory2KHR" when using VK_KHR_bind_memory2 extension. - PFN_vkBindImageMemory2KHR VMA_NULLABLE vkBindImageMemory2KHR; + /// Fetch "vkBindBufferMemory2" on Vulkan >= 1.1, fetch "vkBindBufferMemory2KHR" when using VK_KHR_bind_memory2 extension. + PFN_vkBindBufferMemory2KHR VMA_NULLABLE vkBindBufferMemory2KHR; + /// Fetch "vkBindImageMemory2" on Vulkan >= 1.1, fetch "vkBindImageMemory2KHR" when using VK_KHR_bind_memory2 extension. + PFN_vkBindImageMemory2KHR VMA_NULLABLE vkBindImageMemory2KHR; #endif #if VMA_MEMORY_BUDGET || VMA_VULKAN_VERSION >= 1001000 - PFN_vkGetPhysicalDeviceMemoryProperties2KHR VMA_NULLABLE vkGetPhysicalDeviceMemoryProperties2KHR; + /// Fetch from "vkGetPhysicalDeviceMemoryProperties2" on Vulkan >= 1.1, but you can also fetch it from "vkGetPhysicalDeviceMemoryProperties2KHR" if you enabled extension VK_KHR_get_physical_device_properties2. + PFN_vkGetPhysicalDeviceMemoryProperties2KHR VMA_NULLABLE vkGetPhysicalDeviceMemoryProperties2KHR; #endif -#if VMA_VULKAN_VERSION >= 1003000 - /// Fetch from "vkGetDeviceBufferMemoryRequirements" on Vulkan >= 1.3, but you can also fetch it from "vkGetDeviceBufferMemoryRequirementsKHR" if you enabled extension VK_KHR_maintenance4. - PFN_vkGetDeviceBufferMemoryRequirements VMA_NULLABLE vkGetDeviceBufferMemoryRequirements; - /// Fetch from "vkGetDeviceImageMemoryRequirements" on Vulkan >= 1.3, but you can also fetch it from "vkGetDeviceImageMemoryRequirementsKHR" if you enabled extension VK_KHR_maintenance4. - PFN_vkGetDeviceImageMemoryRequirements VMA_NULLABLE vkGetDeviceImageMemoryRequirements; +#if VMA_KHR_MAINTENANCE4 || VMA_VULKAN_VERSION >= 1003000 + /// Fetch from "vkGetDeviceBufferMemoryRequirements" on Vulkan >= 1.3, but you can also fetch it from "vkGetDeviceBufferMemoryRequirementsKHR" if you enabled extension VK_KHR_maintenance4. + PFN_vkGetDeviceBufferMemoryRequirementsKHR VMA_NULLABLE vkGetDeviceBufferMemoryRequirements; + /// Fetch from "vkGetDeviceImageMemoryRequirements" on Vulkan >= 1.3, but you can also fetch it from "vkGetDeviceImageMemoryRequirementsKHR" if you enabled extension VK_KHR_maintenance4. + PFN_vkGetDeviceImageMemoryRequirementsKHR VMA_NULLABLE vkGetDeviceImageMemoryRequirements; #endif -} VmaVulkanFunctions; + } VmaVulkanFunctions; -/// Description of a Allocator to be created. -typedef struct VmaAllocatorCreateInfo -{ - /// Flags for created allocator. Use #VmaAllocatorCreateFlagBits enum. - VmaAllocatorCreateFlags flags; - /// Vulkan physical device. - /** It must be valid throughout whole lifetime of created allocator. */ - VkPhysicalDevice VMA_NOT_NULL physicalDevice; - /// Vulkan device. - /** It must be valid throughout whole lifetime of created allocator. */ - VkDevice VMA_NOT_NULL device; - /// Preferred size of a single `VkDeviceMemory` block to be allocated from large heaps > 1 GiB. Optional. - /** Set to 0 to use default, which is currently 256 MiB. */ - VkDeviceSize preferredLargeHeapBlockSize; - /// Custom CPU memory allocation callbacks. Optional. - /** Optional, can be null. When specified, will also be used for all CPU-side memory allocations. */ - const VkAllocationCallbacks* VMA_NULLABLE pAllocationCallbacks; - /// Informative callbacks for `vkAllocateMemory`, `vkFreeMemory`. Optional. - /** Optional, can be null. */ - const VmaDeviceMemoryCallbacks* VMA_NULLABLE pDeviceMemoryCallbacks; - /** \brief Either null or a pointer to an array of limits on maximum number of bytes that can be allocated out of particular Vulkan memory heap. + /// Description of a Allocator to be created. + typedef struct VmaAllocatorCreateInfo + { + /// Flags for created allocator. Use #VmaAllocatorCreateFlagBits enum. + VmaAllocatorCreateFlags flags; + /// Vulkan physical device. + /** It must be valid throughout whole lifetime of created allocator. */ + VkPhysicalDevice VMA_NOT_NULL physicalDevice; + /// Vulkan device. + /** It must be valid throughout whole lifetime of created allocator. */ + VkDevice VMA_NOT_NULL device; + /// Preferred size of a single `VkDeviceMemory` block to be allocated from large heaps > 1 GiB. Optional. + /** Set to 0 to use default, which is currently 256 MiB. */ + VkDeviceSize preferredLargeHeapBlockSize; + /// Custom CPU memory allocation callbacks. Optional. + /** Optional, can be null. When specified, will also be used for all CPU-side memory allocations. */ + const VkAllocationCallbacks* VMA_NULLABLE pAllocationCallbacks; + /// Informative callbacks for `vkAllocateMemory`, `vkFreeMemory`. Optional. + /** Optional, can be null. */ + const VmaDeviceMemoryCallbacks* VMA_NULLABLE pDeviceMemoryCallbacks; + /** \brief Either null or a pointer to an array of limits on maximum number of bytes that can be allocated out of particular Vulkan memory heap. - If not NULL, it must be a pointer to an array of - `VkPhysicalDeviceMemoryProperties::memoryHeapCount` elements, defining limit on - maximum number of bytes that can be allocated out of particular Vulkan memory - heap. + If not NULL, it must be a pointer to an array of + `VkPhysicalDeviceMemoryProperties::memoryHeapCount` elements, defining limit on + maximum number of bytes that can be allocated out of particular Vulkan memory + heap. - Any of the elements may be equal to `VK_WHOLE_SIZE`, which means no limit on that - heap. This is also the default in case of `pHeapSizeLimit` = NULL. + Any of the elements may be equal to `VK_WHOLE_SIZE`, which means no limit on that + heap. This is also the default in case of `pHeapSizeLimit` = NULL. - If there is a limit defined for a heap: + If there is a limit defined for a heap: - - If user tries to allocate more memory from that heap using this allocator, - the allocation fails with `VK_ERROR_OUT_OF_DEVICE_MEMORY`. - - If the limit is smaller than heap size reported in `VkMemoryHeap::size`, the - value of this limit will be reported instead when using vmaGetMemoryProperties(). + - If user tries to allocate more memory from that heap using this allocator, + the allocation fails with `VK_ERROR_OUT_OF_DEVICE_MEMORY`. + - If the limit is smaller than heap size reported in `VkMemoryHeap::size`, the + value of this limit will be reported instead when using vmaGetMemoryProperties(). - Warning! Using this feature may not be equivalent to installing a GPU with - smaller amount of memory, because graphics driver doesn't necessary fail new - allocations with `VK_ERROR_OUT_OF_DEVICE_MEMORY` result when memory capacity is - exceeded. It may return success and just silently migrate some device memory - blocks to system RAM. This driver behavior can also be controlled using - VK_AMD_memory_overallocation_behavior extension. - */ - const VkDeviceSize* VMA_NULLABLE VMA_LEN_IF_NOT_NULL("VkPhysicalDeviceMemoryProperties::memoryHeapCount") pHeapSizeLimit; + Warning! Using this feature may not be equivalent to installing a GPU with + smaller amount of memory, because graphics driver doesn't necessary fail new + allocations with `VK_ERROR_OUT_OF_DEVICE_MEMORY` result when memory capacity is + exceeded. It may return success and just silently migrate some device memory + blocks to system RAM. This driver behavior can also be controlled using + VK_AMD_memory_overallocation_behavior extension. + */ + const VkDeviceSize* VMA_NULLABLE VMA_LEN_IF_NOT_NULL("VkPhysicalDeviceMemoryProperties::memoryHeapCount") pHeapSizeLimit; - /** \brief Pointers to Vulkan functions. Can be null. + /** \brief Pointers to Vulkan functions. Can be null. - For details see [Pointers to Vulkan functions](@ref config_Vulkan_functions). - */ - const VmaVulkanFunctions* VMA_NULLABLE pVulkanFunctions; - /** \brief Handle to Vulkan instance object. + For details see [Pointers to Vulkan functions](@ref config_Vulkan_functions). + */ + const VmaVulkanFunctions* VMA_NULLABLE pVulkanFunctions; + /** \brief Handle to Vulkan instance object. - Starting from version 3.0.0 this member is no longer optional, it must be set! - */ - VkInstance VMA_NOT_NULL instance; - /** \brief Optional. The highest version of Vulkan that the application is designed to use. + Starting from version 3.0.0 this member is no longer optional, it must be set! + */ + VkInstance VMA_NOT_NULL instance; + /** \brief Optional. Vulkan version that the application uses. - It must be a value in the format as created by macro `VK_MAKE_VERSION` or a constant like: `VK_API_VERSION_1_1`, `VK_API_VERSION_1_0`. - The patch version number specified is ignored. Only the major and minor versions are considered. - It must be less or equal (preferably equal) to value as passed to `vkCreateInstance` as `VkApplicationInfo::apiVersion`. - Only versions 1.0, 1.1, 1.2, 1.3 are supported by the current implementation. - Leaving it initialized to zero is equivalent to `VK_API_VERSION_1_0`. - */ - uint32_t vulkanApiVersion; + It must be a value in the format as created by macro `VK_MAKE_VERSION` or a constant like: `VK_API_VERSION_1_1`, `VK_API_VERSION_1_0`. + The patch version number specified is ignored. Only the major and minor versions are considered. + Only versions 1.0, 1.1, 1.2, 1.3 are supported by the current implementation. + Leaving it initialized to zero is equivalent to `VK_API_VERSION_1_0`. + It must match the Vulkan version used by the application and supported on the selected physical device, + so it must be no higher than `VkApplicationInfo::apiVersion` passed to `vkCreateInstance` + and no higher than `VkPhysicalDeviceProperties::apiVersion` found on the physical device used. + */ + uint32_t vulkanApiVersion; #if VMA_EXTERNAL_MEMORY - /** \brief Either null or a pointer to an array of external memory handle types for each Vulkan memory type. + /** \brief Either null or a pointer to an array of external memory handle types for each Vulkan memory type. - If not NULL, it must be a pointer to an array of `VkPhysicalDeviceMemoryProperties::memoryTypeCount` - elements, defining external memory handle types of particular Vulkan memory type, - to be passed using `VkExportMemoryAllocateInfoKHR`. + If not NULL, it must be a pointer to an array of `VkPhysicalDeviceMemoryProperties::memoryTypeCount` + elements, defining external memory handle types of particular Vulkan memory type, + to be passed using `VkExportMemoryAllocateInfoKHR`. - Any of the elements may be equal to 0, which means not to use `VkExportMemoryAllocateInfoKHR` on this memory type. - This is also the default in case of `pTypeExternalMemoryHandleTypes` = NULL. - */ - const VkExternalMemoryHandleTypeFlagsKHR* VMA_NULLABLE VMA_LEN_IF_NOT_NULL("VkPhysicalDeviceMemoryProperties::memoryTypeCount") pTypeExternalMemoryHandleTypes; + Any of the elements may be equal to 0, which means not to use `VkExportMemoryAllocateInfoKHR` on this memory type. + This is also the default in case of `pTypeExternalMemoryHandleTypes` = NULL. + */ + const VkExternalMemoryHandleTypeFlagsKHR* VMA_NULLABLE VMA_LEN_IF_NOT_NULL("VkPhysicalDeviceMemoryProperties::memoryTypeCount") pTypeExternalMemoryHandleTypes; #endif // #if VMA_EXTERNAL_MEMORY -} VmaAllocatorCreateInfo; - -/// Information about existing #VmaAllocator object. -typedef struct VmaAllocatorInfo -{ - /** \brief Handle to Vulkan instance object. - - This is the same value as has been passed through VmaAllocatorCreateInfo::instance. - */ - VkInstance VMA_NOT_NULL instance; - /** \brief Handle to Vulkan physical device object. - - This is the same value as has been passed through VmaAllocatorCreateInfo::physicalDevice. - */ - VkPhysicalDevice VMA_NOT_NULL physicalDevice; - /** \brief Handle to Vulkan device object. - - This is the same value as has been passed through VmaAllocatorCreateInfo::device. - */ - VkDevice VMA_NOT_NULL device; -} VmaAllocatorInfo; - -/** @} */ - -/** -\addtogroup group_stats -@{ -*/ - -/** \brief Calculated statistics of memory usage e.g. in a specific memory type, heap, custom pool, or total. - -These are fast to calculate. -See functions: vmaGetHeapBudgets(), vmaGetPoolStatistics(). -*/ -typedef struct VmaStatistics -{ - /** \brief Number of `VkDeviceMemory` objects - Vulkan memory blocks allocated. - */ - uint32_t blockCount; - /** \brief Number of #VmaAllocation objects allocated. - - Dedicated allocations have their own blocks, so each one adds 1 to `allocationCount` as well as `blockCount`. - */ - uint32_t allocationCount; - /** \brief Number of bytes allocated in `VkDeviceMemory` blocks. - - \note To avoid confusion, please be aware that what Vulkan calls an "allocation" - a whole `VkDeviceMemory` object - (e.g. as in `VkPhysicalDeviceLimits::maxMemoryAllocationCount`) is called a "block" in VMA, while VMA calls - "allocation" a #VmaAllocation object that represents a memory region sub-allocated from such block, usually for a single buffer or image. - */ - VkDeviceSize blockBytes; - /** \brief Total number of bytes occupied by all #VmaAllocation objects. - - Always less or equal than `blockBytes`. - Difference `(blockBytes - allocationBytes)` is the amount of memory allocated from Vulkan - but unused by any #VmaAllocation. - */ - VkDeviceSize allocationBytes; -} VmaStatistics; - -/** \brief More detailed statistics than #VmaStatistics. - -These are slower to calculate. Use for debugging purposes. -See functions: vmaCalculateStatistics(), vmaCalculatePoolStatistics(). - -Previous version of the statistics API provided averages, but they have been removed -because they can be easily calculated as: - -\code -VkDeviceSize allocationSizeAvg = detailedStats.statistics.allocationBytes / detailedStats.statistics.allocationCount; -VkDeviceSize unusedBytes = detailedStats.statistics.blockBytes - detailedStats.statistics.allocationBytes; -VkDeviceSize unusedRangeSizeAvg = unusedBytes / detailedStats.unusedRangeCount; -\endcode -*/ -typedef struct VmaDetailedStatistics -{ - /// Basic statistics. - VmaStatistics statistics; - /// Number of free ranges of memory between allocations. - uint32_t unusedRangeCount; - /// Smallest allocation size. `VK_WHOLE_SIZE` if there are 0 allocations. - VkDeviceSize allocationSizeMin; - /// Largest allocation size. 0 if there are 0 allocations. - VkDeviceSize allocationSizeMax; - /// Smallest empty range size. `VK_WHOLE_SIZE` if there are 0 empty ranges. - VkDeviceSize unusedRangeSizeMin; - /// Largest empty range size. 0 if there are 0 empty ranges. - VkDeviceSize unusedRangeSizeMax; -} VmaDetailedStatistics; - -/** \brief General statistics from current state of the Allocator - -total memory usage across all memory heaps and types. - -These are slower to calculate. Use for debugging purposes. -See function vmaCalculateStatistics(). -*/ -typedef struct VmaTotalStatistics -{ - VmaDetailedStatistics memoryType[VK_MAX_MEMORY_TYPES]; - VmaDetailedStatistics memoryHeap[VK_MAX_MEMORY_HEAPS]; - VmaDetailedStatistics total; -} VmaTotalStatistics; - -/** \brief Statistics of current memory usage and available budget for a specific memory heap. - -These are fast to calculate. -See function vmaGetHeapBudgets(). -*/ -typedef struct VmaBudget -{ - /** \brief Statistics fetched from the library. - */ - VmaStatistics statistics; - /** \brief Estimated current memory usage of the program, in bytes. - - Fetched from system using VK_EXT_memory_budget extension if enabled. - - It might be different than `statistics.blockBytes` (usually higher) due to additional implicit objects - also occupying the memory, like swapchain, pipelines, descriptor heaps, command buffers, or - `VkDeviceMemory` blocks allocated outside of this library, if any. - */ - VkDeviceSize usage; - /** \brief Estimated amount of memory available to the program, in bytes. - - Fetched from system using VK_EXT_memory_budget extension if enabled. - - It might be different (most probably smaller) than `VkMemoryHeap::size[heapIndex]` due to factors - external to the program, decided by the operating system. - Difference `budget - usage` is the amount of additional memory that can probably - be allocated without problems. Exceeding the budget may result in various problems. - */ - VkDeviceSize budget; -} VmaBudget; - -/** @} */ - -/** -\addtogroup group_alloc -@{ -*/ - -/** \brief Parameters of new #VmaAllocation. - -To be used with functions like vmaCreateBuffer(), vmaCreateImage(), and many others. -*/ -typedef struct VmaAllocationCreateInfo -{ - /// Use #VmaAllocationCreateFlagBits enum. - VmaAllocationCreateFlags flags; - /** \brief Intended usage of memory. - - You can leave #VMA_MEMORY_USAGE_UNKNOWN if you specify memory requirements in other way. \n - If `pool` is not null, this member is ignored. - */ - VmaMemoryUsage usage; - /** \brief Flags that must be set in a Memory Type chosen for an allocation. - - Leave 0 if you specify memory requirements in other way. \n - If `pool` is not null, this member is ignored.*/ - VkMemoryPropertyFlags requiredFlags; - /** \brief Flags that preferably should be set in a memory type chosen for an allocation. - - Set to 0 if no additional flags are preferred. \n - If `pool` is not null, this member is ignored. */ - VkMemoryPropertyFlags preferredFlags; - /** \brief Bitmask containing one bit set for every memory type acceptable for this allocation. - - Value 0 is equivalent to `UINT32_MAX` - it means any memory type is accepted if - it meets other requirements specified by this structure, with no further - restrictions on memory type index. \n - If `pool` is not null, this member is ignored. - */ - uint32_t memoryTypeBits; - /** \brief Pool that this allocation should be created in. - - Leave `VK_NULL_HANDLE` to allocate from default pool. If not null, members: - `usage`, `requiredFlags`, `preferredFlags`, `memoryTypeBits` are ignored. - */ - VmaPool VMA_NULLABLE pool; - /** \brief Custom general-purpose pointer that will be stored in #VmaAllocation, can be read as VmaAllocationInfo::pUserData and changed using vmaSetAllocationUserData(). - - If #VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT is used, it must be either - null or pointer to a null-terminated string. The string will be then copied to - internal buffer, so it doesn't need to be valid after allocation call. - */ - void* VMA_NULLABLE pUserData; - /** \brief A floating-point value between 0 and 1, indicating the priority of the allocation relative to other memory allocations. - - It is used only when #VMA_ALLOCATOR_CREATE_EXT_MEMORY_PRIORITY_BIT flag was used during creation of the #VmaAllocator object - and this allocation ends up as dedicated or is explicitly forced as dedicated using #VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT. - Otherwise, it has the priority of a memory block where it is placed and this variable is ignored. - */ - float priority; -} VmaAllocationCreateInfo; - -/// Describes parameter of created #VmaPool. -typedef struct VmaPoolCreateInfo -{ - /** \brief Vulkan memory type index to allocate this pool from. - */ - uint32_t memoryTypeIndex; - /** \brief Use combination of #VmaPoolCreateFlagBits. - */ - VmaPoolCreateFlags flags; - /** \brief Size of a single `VkDeviceMemory` block to be allocated as part of this pool, in bytes. Optional. - - Specify nonzero to set explicit, constant size of memory blocks used by this - pool. - - Leave 0 to use default and let the library manage block sizes automatically. - Sizes of particular blocks may vary. - In this case, the pool will also support dedicated allocations. - */ - VkDeviceSize blockSize; - /** \brief Minimum number of blocks to be always allocated in this pool, even if they stay empty. - - Set to 0 to have no preallocated blocks and allow the pool be completely empty. - */ - size_t minBlockCount; - /** \brief Maximum number of blocks that can be allocated in this pool. Optional. - - Set to 0 to use default, which is `SIZE_MAX`, which means no limit. - - Set to same value as VmaPoolCreateInfo::minBlockCount to have fixed amount of memory allocated - throughout whole lifetime of this pool. - */ - size_t maxBlockCount; - /** \brief A floating-point value between 0 and 1, indicating the priority of the allocations in this pool relative to other memory allocations. - - It is used only when #VMA_ALLOCATOR_CREATE_EXT_MEMORY_PRIORITY_BIT flag was used during creation of the #VmaAllocator object. - Otherwise, this variable is ignored. - */ - float priority; - /** \brief Additional minimum alignment to be used for all allocations created from this pool. Can be 0. - - Leave 0 (default) not to impose any additional alignment. If not 0, it must be a power of two. - It can be useful in cases where alignment returned by Vulkan by functions like `vkGetBufferMemoryRequirements` is not enough, - e.g. when doing interop with OpenGL. - */ - VkDeviceSize minAllocationAlignment; - /** \brief Additional `pNext` chain to be attached to `VkMemoryAllocateInfo` used for every allocation made by this pool. Optional. - - Optional, can be null. If not null, it must point to a `pNext` chain of structures that can be attached to `VkMemoryAllocateInfo`. - It can be useful for special needs such as adding `VkExportMemoryAllocateInfoKHR`. - Structures pointed by this member must remain alive and unchanged for the whole lifetime of the custom pool. - - Please note that some structures, e.g. `VkMemoryPriorityAllocateInfoEXT`, `VkMemoryDedicatedAllocateInfoKHR`, - can be attached automatically by this library when using other, more convenient of its features. - */ - void* VMA_NULLABLE pMemoryAllocateNext; -} VmaPoolCreateInfo; - -/** @} */ - -/** -\addtogroup group_alloc -@{ -*/ - -/// Parameters of #VmaAllocation objects, that can be retrieved using function vmaGetAllocationInfo(). -typedef struct VmaAllocationInfo -{ - /** \brief Memory type index that this allocation was allocated from. - - It never changes. - */ - uint32_t memoryType; - /** \brief Handle to Vulkan memory object. - - Same memory object can be shared by multiple allocations. - - It can change after the allocation is moved during \ref defragmentation. - */ - VkDeviceMemory VMA_NULLABLE_NON_DISPATCHABLE deviceMemory; - /** \brief Offset in `VkDeviceMemory` object to the beginning of this allocation, in bytes. `(deviceMemory, offset)` pair is unique to this allocation. - - You usually don't need to use this offset. If you create a buffer or an image together with the allocation using e.g. function - vmaCreateBuffer(), vmaCreateImage(), functions that operate on these resources refer to the beginning of the buffer or image, - not entire device memory block. Functions like vmaMapMemory(), vmaBindBufferMemory() also refer to the beginning of the allocation - and apply this offset automatically. - - It can change after the allocation is moved during \ref defragmentation. - */ - VkDeviceSize offset; - /** \brief Size of this allocation, in bytes. - - It never changes. - - \note Allocation size returned in this variable may be greater than the size - requested for the resource e.g. as `VkBufferCreateInfo::size`. Whole size of the - allocation is accessible for operations on memory e.g. using a pointer after - mapping with vmaMapMemory(), but operations on the resource e.g. using - `vkCmdCopyBuffer` must be limited to the size of the resource. - */ - VkDeviceSize size; - /** \brief Pointer to the beginning of this allocation as mapped data. - - If the allocation hasn't been mapped using vmaMapMemory() and hasn't been - created with #VMA_ALLOCATION_CREATE_MAPPED_BIT flag, this value is null. - - It can change after call to vmaMapMemory(), vmaUnmapMemory(). - It can also change after the allocation is moved during \ref defragmentation. - */ - void* VMA_NULLABLE pMappedData; - /** \brief Custom general-purpose pointer that was passed as VmaAllocationCreateInfo::pUserData or set using vmaSetAllocationUserData(). - - It can change after call to vmaSetAllocationUserData() for this allocation. - */ - void* VMA_NULLABLE pUserData; - /** \brief Custom allocation name that was set with vmaSetAllocationName(). - - It can change after call to vmaSetAllocationName() for this allocation. - - Another way to set custom name is to pass it in VmaAllocationCreateInfo::pUserData with - additional flag #VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT set [DEPRECATED]. - */ - const char* VMA_NULLABLE pName; -} VmaAllocationInfo; - -/** \brief Parameters for defragmentation. - -To be used with function vmaBeginDefragmentation(). -*/ -typedef struct VmaDefragmentationInfo -{ - /// \brief Use combination of #VmaDefragmentationFlagBits. - VmaDefragmentationFlags flags; - /** \brief Custom pool to be defragmented. - - If null then default pools will undergo defragmentation process. - */ - VmaPool VMA_NULLABLE pool; - /** \brief Maximum numbers of bytes that can be copied during single pass, while moving allocations to different places. - - `0` means no limit. - */ - VkDeviceSize maxBytesPerPass; - /** \brief Maximum number of allocations that can be moved during single pass to a different place. - - `0` means no limit. - */ - uint32_t maxAllocationsPerPass; -} VmaDefragmentationInfo; - -/// Single move of an allocation to be done for defragmentation. -typedef struct VmaDefragmentationMove -{ - /// Operation to be performed on the allocation by vmaEndDefragmentationPass(). Default value is #VMA_DEFRAGMENTATION_MOVE_OPERATION_COPY. You can modify it. - VmaDefragmentationMoveOperation operation; - /// Allocation that should be moved. - VmaAllocation VMA_NOT_NULL srcAllocation; - /** \brief Temporary allocation pointing to destination memory that will replace `srcAllocation`. - - \warning Do not store this allocation in your data structures! It exists only temporarily, for the duration of the defragmentation pass, - to be used for binding new buffer/image to the destination memory using e.g. vmaBindBufferMemory(). - vmaEndDefragmentationPass() will destroy it and make `srcAllocation` point to this memory. - */ - VmaAllocation VMA_NOT_NULL dstTmpAllocation; -} VmaDefragmentationMove; - -/** \brief Parameters for incremental defragmentation steps. - -To be used with function vmaBeginDefragmentationPass(). -*/ -typedef struct VmaDefragmentationPassMoveInfo -{ - /// Number of elements in the `pMoves` array. - uint32_t moveCount; - /** \brief Array of moves to be performed by the user in the current defragmentation pass. - - Pointer to an array of `moveCount` elements, owned by VMA, created in vmaBeginDefragmentationPass(), destroyed in vmaEndDefragmentationPass(). - - For each element, you should: - - 1. Create a new buffer/image in the place pointed by VmaDefragmentationMove::dstMemory + VmaDefragmentationMove::dstOffset. - 2. Copy data from the VmaDefragmentationMove::srcAllocation e.g. using `vkCmdCopyBuffer`, `vkCmdCopyImage`. - 3. Make sure these commands finished executing on the GPU. - 4. Destroy the old buffer/image. - - Only then you can finish defragmentation pass by calling vmaEndDefragmentationPass(). - After this call, the allocation will point to the new place in memory. - - Alternatively, if you cannot move specific allocation, you can set VmaDefragmentationMove::operation to #VMA_DEFRAGMENTATION_MOVE_OPERATION_IGNORE. - - Alternatively, if you decide you want to completely remove the allocation: - - 1. Destroy its buffer/image. - 2. Set VmaDefragmentationMove::operation to #VMA_DEFRAGMENTATION_MOVE_OPERATION_DESTROY. - - Then, after vmaEndDefragmentationPass() the allocation will be freed. - */ - VmaDefragmentationMove* VMA_NULLABLE VMA_LEN_IF_NOT_NULL(moveCount) pMoves; -} VmaDefragmentationPassMoveInfo; - -/// Statistics returned for defragmentation process in function vmaEndDefragmentation(). -typedef struct VmaDefragmentationStats -{ - /// Total number of bytes that have been copied while moving allocations to different places. - VkDeviceSize bytesMoved; - /// Total number of bytes that have been released to the system by freeing empty `VkDeviceMemory` objects. - VkDeviceSize bytesFreed; - /// Number of allocations that have been moved to different places. - uint32_t allocationsMoved; - /// Number of empty `VkDeviceMemory` objects that have been released to the system. - uint32_t deviceMemoryBlocksFreed; -} VmaDefragmentationStats; - -/** @} */ - -/** -\addtogroup group_virtual -@{ -*/ - -/// Parameters of created #VmaVirtualBlock object to be passed to vmaCreateVirtualBlock(). -typedef struct VmaVirtualBlockCreateInfo -{ - /** \brief Total size of the virtual block. - - Sizes can be expressed in bytes or any units you want as long as you are consistent in using them. - For example, if you allocate from some array of structures, 1 can mean single instance of entire structure. - */ - VkDeviceSize size; - - /** \brief Use combination of #VmaVirtualBlockCreateFlagBits. - */ - VmaVirtualBlockCreateFlags flags; - - /** \brief Custom CPU memory allocation callbacks. Optional. - - Optional, can be null. When specified, they will be used for all CPU-side memory allocations. - */ - const VkAllocationCallbacks* VMA_NULLABLE pAllocationCallbacks; -} VmaVirtualBlockCreateInfo; - -/// Parameters of created virtual allocation to be passed to vmaVirtualAllocate(). -typedef struct VmaVirtualAllocationCreateInfo -{ - /** \brief Size of the allocation. - - Cannot be zero. - */ - VkDeviceSize size; - /** \brief Required alignment of the allocation. Optional. - - Must be power of two. Special value 0 has the same meaning as 1 - means no special alignment is required, so allocation can start at any offset. - */ - VkDeviceSize alignment; - /** \brief Use combination of #VmaVirtualAllocationCreateFlagBits. - */ - VmaVirtualAllocationCreateFlags flags; - /** \brief Custom pointer to be associated with the allocation. Optional. - - It can be any value and can be used for user-defined purposes. It can be fetched or changed later. - */ - void* VMA_NULLABLE pUserData; -} VmaVirtualAllocationCreateInfo; - -/// Parameters of an existing virtual allocation, returned by vmaGetVirtualAllocationInfo(). -typedef struct VmaVirtualAllocationInfo -{ - /** \brief Offset of the allocation. - - Offset at which the allocation was made. - */ - VkDeviceSize offset; - /** \brief Size of the allocation. - - Same value as passed in VmaVirtualAllocationCreateInfo::size. - */ - VkDeviceSize size; - /** \brief Custom pointer associated with the allocation. - - Same value as passed in VmaVirtualAllocationCreateInfo::pUserData or to vmaSetVirtualAllocationUserData(). - */ - void* VMA_NULLABLE pUserData; -} VmaVirtualAllocationInfo; - -/** @} */ + } VmaAllocatorCreateInfo; + + /// Information about existing #VmaAllocator object. + typedef struct VmaAllocatorInfo + { + /** \brief Handle to Vulkan instance object. + + This is the same value as has been passed through VmaAllocatorCreateInfo::instance. + */ + VkInstance VMA_NOT_NULL instance; + /** \brief Handle to Vulkan physical device object. + + This is the same value as has been passed through VmaAllocatorCreateInfo::physicalDevice. + */ + VkPhysicalDevice VMA_NOT_NULL physicalDevice; + /** \brief Handle to Vulkan device object. + + This is the same value as has been passed through VmaAllocatorCreateInfo::device. + */ + VkDevice VMA_NOT_NULL device; + } VmaAllocatorInfo; + + /** @} */ + + /** + \addtogroup group_stats + @{ + */ + + /** \brief Calculated statistics of memory usage e.g. in a specific memory type, heap, custom pool, or total. + + These are fast to calculate. + See functions: vmaGetHeapBudgets(), vmaGetPoolStatistics(). + */ + typedef struct VmaStatistics + { + /** \brief Number of `VkDeviceMemory` objects - Vulkan memory blocks allocated. + */ + uint32_t blockCount; + /** \brief Number of #VmaAllocation objects allocated. + + Dedicated allocations have their own blocks, so each one adds 1 to `allocationCount` as well as `blockCount`. + */ + uint32_t allocationCount; + /** \brief Number of bytes allocated in `VkDeviceMemory` blocks. + + \note To avoid confusion, please be aware that what Vulkan calls an "allocation" - a whole `VkDeviceMemory` object + (e.g. as in `VkPhysicalDeviceLimits::maxMemoryAllocationCount`) is called a "block" in VMA, while VMA calls + "allocation" a #VmaAllocation object that represents a memory region sub-allocated from such block, usually for a single buffer or image. + */ + VkDeviceSize blockBytes; + /** \brief Total number of bytes occupied by all #VmaAllocation objects. + + Always less or equal than `blockBytes`. + Difference `(blockBytes - allocationBytes)` is the amount of memory allocated from Vulkan + but unused by any #VmaAllocation. + */ + VkDeviceSize allocationBytes; + } VmaStatistics; + + /** \brief More detailed statistics than #VmaStatistics. + + These are slower to calculate. Use for debugging purposes. + See functions: vmaCalculateStatistics(), vmaCalculatePoolStatistics(). + + Previous version of the statistics API provided averages, but they have been removed + because they can be easily calculated as: + + \code + VkDeviceSize allocationSizeAvg = detailedStats.statistics.allocationBytes / detailedStats.statistics.allocationCount; + VkDeviceSize unusedBytes = detailedStats.statistics.blockBytes - detailedStats.statistics.allocationBytes; + VkDeviceSize unusedRangeSizeAvg = unusedBytes / detailedStats.unusedRangeCount; + \endcode + */ + typedef struct VmaDetailedStatistics + { + /// Basic statistics. + VmaStatistics statistics; + /// Number of free ranges of memory between allocations. + uint32_t unusedRangeCount; + /// Smallest allocation size. `VK_WHOLE_SIZE` if there are 0 allocations. + VkDeviceSize allocationSizeMin; + /// Largest allocation size. 0 if there are 0 allocations. + VkDeviceSize allocationSizeMax; + /// Smallest empty range size. `VK_WHOLE_SIZE` if there are 0 empty ranges. + VkDeviceSize unusedRangeSizeMin; + /// Largest empty range size. 0 if there are 0 empty ranges. + VkDeviceSize unusedRangeSizeMax; + } VmaDetailedStatistics; + + /** \brief General statistics from current state of the Allocator - + total memory usage across all memory heaps and types. + + These are slower to calculate. Use for debugging purposes. + See function vmaCalculateStatistics(). + */ + typedef struct VmaTotalStatistics + { + VmaDetailedStatistics memoryType[VK_MAX_MEMORY_TYPES]; + VmaDetailedStatistics memoryHeap[VK_MAX_MEMORY_HEAPS]; + VmaDetailedStatistics total; + } VmaTotalStatistics; + + /** \brief Statistics of current memory usage and available budget for a specific memory heap. + + These are fast to calculate. + See function vmaGetHeapBudgets(). + */ + typedef struct VmaBudget + { + /** \brief Statistics fetched from the library. + */ + VmaStatistics statistics; + /** \brief Estimated current memory usage of the program, in bytes. + + Fetched from system using VK_EXT_memory_budget extension if enabled. + + It might be different than `statistics.blockBytes` (usually higher) due to additional implicit objects + also occupying the memory, like swapchain, pipelines, descriptor heaps, command buffers, or + `VkDeviceMemory` blocks allocated outside of this library, if any. + */ + VkDeviceSize usage; + /** \brief Estimated amount of memory available to the program, in bytes. + + Fetched from system using VK_EXT_memory_budget extension if enabled. + + It might be different (most probably smaller) than `VkMemoryHeap::size[heapIndex]` due to factors + external to the program, decided by the operating system. + Difference `budget - usage` is the amount of additional memory that can probably + be allocated without problems. Exceeding the budget may result in various problems. + */ + VkDeviceSize budget; + } VmaBudget; + + /** @} */ + + /** + \addtogroup group_alloc + @{ + */ + + /** \brief Parameters of new #VmaAllocation. + + To be used with functions like vmaCreateBuffer(), vmaCreateImage(), and many others. + */ + typedef struct VmaAllocationCreateInfo + { + /// Use #VmaAllocationCreateFlagBits enum. + VmaAllocationCreateFlags flags; + /** \brief Intended usage of memory. + + You can leave #VMA_MEMORY_USAGE_UNKNOWN if you specify memory requirements in other way. \n + If `pool` is not null, this member is ignored. + */ + VmaMemoryUsage usage; + /** \brief Flags that must be set in a Memory Type chosen for an allocation. + + Leave 0 if you specify memory requirements in other way. \n + If `pool` is not null, this member is ignored.*/ + VkMemoryPropertyFlags requiredFlags; + /** \brief Flags that preferably should be set in a memory type chosen for an allocation. + + Set to 0 if no additional flags are preferred. \n + If `pool` is not null, this member is ignored. */ + VkMemoryPropertyFlags preferredFlags; + /** \brief Bitmask containing one bit set for every memory type acceptable for this allocation. + + Value 0 is equivalent to `UINT32_MAX` - it means any memory type is accepted if + it meets other requirements specified by this structure, with no further + restrictions on memory type index. \n + If `pool` is not null, this member is ignored. + */ + uint32_t memoryTypeBits; + /** \brief Pool that this allocation should be created in. + + Leave `VK_NULL_HANDLE` to allocate from default pool. If not null, members: + `usage`, `requiredFlags`, `preferredFlags`, `memoryTypeBits` are ignored. + */ + VmaPool VMA_NULLABLE pool; + /** \brief Custom general-purpose pointer that will be stored in #VmaAllocation, can be read as VmaAllocationInfo::pUserData and changed using vmaSetAllocationUserData(). + + If #VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT is used, it must be either + null or pointer to a null-terminated string. The string will be then copied to + internal buffer, so it doesn't need to be valid after allocation call. + */ + void* VMA_NULLABLE pUserData; + /** \brief A floating-point value between 0 and 1, indicating the priority of the allocation relative to other memory allocations. + + It is used only when #VMA_ALLOCATOR_CREATE_EXT_MEMORY_PRIORITY_BIT flag was used during creation of the #VmaAllocator object + and this allocation ends up as dedicated or is explicitly forced as dedicated using #VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT. + Otherwise, it has the priority of a memory block where it is placed and this variable is ignored. + */ + float priority; + } VmaAllocationCreateInfo; + + /// Describes parameter of created #VmaPool. + typedef struct VmaPoolCreateInfo + { + /** \brief Vulkan memory type index to allocate this pool from. + */ + uint32_t memoryTypeIndex; + /** \brief Use combination of #VmaPoolCreateFlagBits. + */ + VmaPoolCreateFlags flags; + /** \brief Size of a single `VkDeviceMemory` block to be allocated as part of this pool, in bytes. Optional. + + Specify nonzero to set explicit, constant size of memory blocks used by this + pool. + + Leave 0 to use default and let the library manage block sizes automatically. + Sizes of particular blocks may vary. + In this case, the pool will also support dedicated allocations. + */ + VkDeviceSize blockSize; + /** \brief Minimum number of blocks to be always allocated in this pool, even if they stay empty. + + Set to 0 to have no preallocated blocks and allow the pool be completely empty. + */ + size_t minBlockCount; + /** \brief Maximum number of blocks that can be allocated in this pool. Optional. + + Set to 0 to use default, which is `SIZE_MAX`, which means no limit. + + Set to same value as VmaPoolCreateInfo::minBlockCount to have fixed amount of memory allocated + throughout whole lifetime of this pool. + */ + size_t maxBlockCount; + /** \brief A floating-point value between 0 and 1, indicating the priority of the allocations in this pool relative to other memory allocations. + + It is used only when #VMA_ALLOCATOR_CREATE_EXT_MEMORY_PRIORITY_BIT flag was used during creation of the #VmaAllocator object. + Otherwise, this variable is ignored. + */ + float priority; + /** \brief Additional minimum alignment to be used for all allocations created from this pool. Can be 0. + + Leave 0 (default) not to impose any additional alignment. If not 0, it must be a power of two. + It can be useful in cases where alignment returned by Vulkan by functions like `vkGetBufferMemoryRequirements` is not enough, + e.g. when doing interop with OpenGL. + */ + VkDeviceSize minAllocationAlignment; + /** \brief Additional `pNext` chain to be attached to `VkMemoryAllocateInfo` used for every allocation made by this pool. Optional. + + Optional, can be null. If not null, it must point to a `pNext` chain of structures that can be attached to `VkMemoryAllocateInfo`. + It can be useful for special needs such as adding `VkExportMemoryAllocateInfoKHR`. + Structures pointed by this member must remain alive and unchanged for the whole lifetime of the custom pool. + + Please note that some structures, e.g. `VkMemoryPriorityAllocateInfoEXT`, `VkMemoryDedicatedAllocateInfoKHR`, + can be attached automatically by this library when using other, more convenient of its features. + */ + void* VMA_NULLABLE VMA_EXTENDS_VK_STRUCT(VkMemoryAllocateInfo) pMemoryAllocateNext; + } VmaPoolCreateInfo; + + /** @} */ + + /** + \addtogroup group_alloc + @{ + */ + + /** + Parameters of #VmaAllocation objects, that can be retrieved using function vmaGetAllocationInfo(). + + There is also an extended version of this structure that carries additional parameters: #VmaAllocationInfo2. + */ + typedef struct VmaAllocationInfo + { + /** \brief Memory type index that this allocation was allocated from. + + It never changes. + */ + uint32_t memoryType; + /** \brief Handle to Vulkan memory object. + + Same memory object can be shared by multiple allocations. + + It can change after the allocation is moved during \ref defragmentation. + */ + VkDeviceMemory VMA_NULLABLE_NON_DISPATCHABLE deviceMemory; + /** \brief Offset in `VkDeviceMemory` object to the beginning of this allocation, in bytes. `(deviceMemory, offset)` pair is unique to this allocation. + + You usually don't need to use this offset. If you create a buffer or an image together with the allocation using e.g. function + vmaCreateBuffer(), vmaCreateImage(), functions that operate on these resources refer to the beginning of the buffer or image, + not entire device memory block. Functions like vmaMapMemory(), vmaBindBufferMemory() also refer to the beginning of the allocation + and apply this offset automatically. + + It can change after the allocation is moved during \ref defragmentation. + */ + VkDeviceSize offset; + /** \brief Size of this allocation, in bytes. + + It never changes. + + \note Allocation size returned in this variable may be greater than the size + requested for the resource e.g. as `VkBufferCreateInfo::size`. Whole size of the + allocation is accessible for operations on memory e.g. using a pointer after + mapping with vmaMapMemory(), but operations on the resource e.g. using + `vkCmdCopyBuffer` must be limited to the size of the resource. + */ + VkDeviceSize size; + /** \brief Pointer to the beginning of this allocation as mapped data. + + If the allocation hasn't been mapped using vmaMapMemory() and hasn't been + created with #VMA_ALLOCATION_CREATE_MAPPED_BIT flag, this value is null. + + It can change after call to vmaMapMemory(), vmaUnmapMemory(). + It can also change after the allocation is moved during \ref defragmentation. + */ + void* VMA_NULLABLE pMappedData; + /** \brief Custom general-purpose pointer that was passed as VmaAllocationCreateInfo::pUserData or set using vmaSetAllocationUserData(). + + It can change after call to vmaSetAllocationUserData() for this allocation. + */ + void* VMA_NULLABLE pUserData; + /** \brief Custom allocation name that was set with vmaSetAllocationName(). + + It can change after call to vmaSetAllocationName() for this allocation. + + Another way to set custom name is to pass it in VmaAllocationCreateInfo::pUserData with + additional flag #VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT set [DEPRECATED]. + */ + const char* VMA_NULLABLE pName; + } VmaAllocationInfo; + + /// Extended parameters of a #VmaAllocation object that can be retrieved using function vmaGetAllocationInfo2(). + typedef struct VmaAllocationInfo2 + { + /** \brief Basic parameters of the allocation. + + If you need only these, you can use function vmaGetAllocationInfo() and structure #VmaAllocationInfo instead. + */ + VmaAllocationInfo allocationInfo; + /** \brief Size of the `VkDeviceMemory` block that the allocation belongs to. + + In case of an allocation with dedicated memory, it will be equal to `allocationInfo.size`. + */ + VkDeviceSize blockSize; + /** \brief `VK_TRUE` if the allocation has dedicated memory, `VK_FALSE` if it was placed as part of a larger memory block. + + When `VK_TRUE`, it also means `VkMemoryDedicatedAllocateInfo` was used when creating the allocation + (if VK_KHR_dedicated_allocation extension or Vulkan version >= 1.1 is enabled). + */ + VkBool32 dedicatedMemory; + } VmaAllocationInfo2; + + /** Callback function called during vmaBeginDefragmentation() to check custom criterion about ending current defragmentation pass. + + Should return true if the defragmentation needs to stop current pass. + */ + typedef VkBool32(VKAPI_PTR* PFN_vmaCheckDefragmentationBreakFunction)(void* VMA_NULLABLE pUserData); + + /** \brief Parameters for defragmentation. + + To be used with function vmaBeginDefragmentation(). + */ + typedef struct VmaDefragmentationInfo + { + /// \brief Use combination of #VmaDefragmentationFlagBits. + VmaDefragmentationFlags flags; + /** \brief Custom pool to be defragmented. + + If null then default pools will undergo defragmentation process. + */ + VmaPool VMA_NULLABLE pool; + /** \brief Maximum numbers of bytes that can be copied during single pass, while moving allocations to different places. + + `0` means no limit. + */ + VkDeviceSize maxBytesPerPass; + /** \brief Maximum number of allocations that can be moved during single pass to a different place. + + `0` means no limit. + */ + uint32_t maxAllocationsPerPass; + /** \brief Optional custom callback for stopping vmaBeginDefragmentation(). + + Have to return true for breaking current defragmentation pass. + */ + PFN_vmaCheckDefragmentationBreakFunction VMA_NULLABLE pfnBreakCallback; + /// \brief Optional data to pass to custom callback for stopping pass of defragmentation. + void* VMA_NULLABLE pBreakCallbackUserData; + } VmaDefragmentationInfo; + + /// Single move of an allocation to be done for defragmentation. + typedef struct VmaDefragmentationMove + { + /// Operation to be performed on the allocation by vmaEndDefragmentationPass(). Default value is #VMA_DEFRAGMENTATION_MOVE_OPERATION_COPY. You can modify it. + VmaDefragmentationMoveOperation operation; + /// Allocation that should be moved. + VmaAllocation VMA_NOT_NULL srcAllocation; + /** \brief Temporary allocation pointing to destination memory that will replace `srcAllocation`. + + \warning Do not store this allocation in your data structures! It exists only temporarily, for the duration of the defragmentation pass, + to be used for binding new buffer/image to the destination memory using e.g. vmaBindBufferMemory(). + vmaEndDefragmentationPass() will destroy it and make `srcAllocation` point to this memory. + */ + VmaAllocation VMA_NOT_NULL dstTmpAllocation; + } VmaDefragmentationMove; + + /** \brief Parameters for incremental defragmentation steps. + + To be used with function vmaBeginDefragmentationPass(). + */ + typedef struct VmaDefragmentationPassMoveInfo + { + /// Number of elements in the `pMoves` array. + uint32_t moveCount; + /** \brief Array of moves to be performed by the user in the current defragmentation pass. + + Pointer to an array of `moveCount` elements, owned by VMA, created in vmaBeginDefragmentationPass(), destroyed in vmaEndDefragmentationPass(). + + For each element, you should: + + 1. Create a new buffer/image in the place pointed by VmaDefragmentationMove::dstMemory + VmaDefragmentationMove::dstOffset. + 2. Copy data from the VmaDefragmentationMove::srcAllocation e.g. using `vkCmdCopyBuffer`, `vkCmdCopyImage`. + 3. Make sure these commands finished executing on the GPU. + 4. Destroy the old buffer/image. + + Only then you can finish defragmentation pass by calling vmaEndDefragmentationPass(). + After this call, the allocation will point to the new place in memory. + + Alternatively, if you cannot move specific allocation, you can set VmaDefragmentationMove::operation to #VMA_DEFRAGMENTATION_MOVE_OPERATION_IGNORE. + + Alternatively, if you decide you want to completely remove the allocation: + + 1. Destroy its buffer/image. + 2. Set VmaDefragmentationMove::operation to #VMA_DEFRAGMENTATION_MOVE_OPERATION_DESTROY. + + Then, after vmaEndDefragmentationPass() the allocation will be freed. + */ + VmaDefragmentationMove* VMA_NULLABLE VMA_LEN_IF_NOT_NULL(moveCount) pMoves; + } VmaDefragmentationPassMoveInfo; + + /// Statistics returned for defragmentation process in function vmaEndDefragmentation(). + typedef struct VmaDefragmentationStats + { + /// Total number of bytes that have been copied while moving allocations to different places. + VkDeviceSize bytesMoved; + /// Total number of bytes that have been released to the system by freeing empty `VkDeviceMemory` objects. + VkDeviceSize bytesFreed; + /// Number of allocations that have been moved to different places. + uint32_t allocationsMoved; + /// Number of empty `VkDeviceMemory` objects that have been released to the system. + uint32_t deviceMemoryBlocksFreed; + } VmaDefragmentationStats; + + /** @} */ + + /** + \addtogroup group_virtual + @{ + */ + + /// Parameters of created #VmaVirtualBlock object to be passed to vmaCreateVirtualBlock(). + typedef struct VmaVirtualBlockCreateInfo + { + /** \brief Total size of the virtual block. + + Sizes can be expressed in bytes or any units you want as long as you are consistent in using them. + For example, if you allocate from some array of structures, 1 can mean single instance of entire structure. + */ + VkDeviceSize size; + + /** \brief Use combination of #VmaVirtualBlockCreateFlagBits. + */ + VmaVirtualBlockCreateFlags flags; + + /** \brief Custom CPU memory allocation callbacks. Optional. + + Optional, can be null. When specified, they will be used for all CPU-side memory allocations. + */ + const VkAllocationCallbacks* VMA_NULLABLE pAllocationCallbacks; + } VmaVirtualBlockCreateInfo; + + /// Parameters of created virtual allocation to be passed to vmaVirtualAllocate(). + typedef struct VmaVirtualAllocationCreateInfo + { + /** \brief Size of the allocation. + + Cannot be zero. + */ + VkDeviceSize size; + /** \brief Required alignment of the allocation. Optional. + + Must be power of two. Special value 0 has the same meaning as 1 - means no special alignment is required, so allocation can start at any offset. + */ + VkDeviceSize alignment; + /** \brief Use combination of #VmaVirtualAllocationCreateFlagBits. + */ + VmaVirtualAllocationCreateFlags flags; + /** \brief Custom pointer to be associated with the allocation. Optional. + + It can be any value and can be used for user-defined purposes. It can be fetched or changed later. + */ + void* VMA_NULLABLE pUserData; + } VmaVirtualAllocationCreateInfo; + + /// Parameters of an existing virtual allocation, returned by vmaGetVirtualAllocationInfo(). + typedef struct VmaVirtualAllocationInfo + { + /** \brief Offset of the allocation. + + Offset at which the allocation was made. + */ + VkDeviceSize offset; + /** \brief Size of the allocation. + + Same value as passed in VmaVirtualAllocationCreateInfo::size. + */ + VkDeviceSize size; + /** \brief Custom pointer associated with the allocation. + + Same value as passed in VmaVirtualAllocationCreateInfo::pUserData or to vmaSetVirtualAllocationUserData(). + */ + void* VMA_NULLABLE pUserData; + } VmaVirtualAllocationInfo; + + /** @} */ #endif // _VMA_DATA_TYPES_DECLARATIONS @@ -1578,981 +1662,1051 @@ typedef struct VmaVirtualAllocationInfo */ /// Creates #VmaAllocator object. -VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateAllocator( - const VmaAllocatorCreateInfo* VMA_NOT_NULL pCreateInfo, - VmaAllocator VMA_NULLABLE* VMA_NOT_NULL pAllocator); - -/// Destroys allocator object. -VMA_CALL_PRE void VMA_CALL_POST vmaDestroyAllocator( - VmaAllocator VMA_NULLABLE allocator); - -/** \brief Returns information about existing #VmaAllocator object - handle to Vulkan device etc. - -It might be useful if you want to keep just the #VmaAllocator handle and fetch other required handles to -`VkPhysicalDevice`, `VkDevice` etc. every time using this function. -*/ -VMA_CALL_PRE void VMA_CALL_POST vmaGetAllocatorInfo( - VmaAllocator VMA_NOT_NULL allocator, - VmaAllocatorInfo* VMA_NOT_NULL pAllocatorInfo); - -/** -PhysicalDeviceProperties are fetched from physicalDevice by the allocator. -You can access it here, without fetching it again on your own. -*/ -VMA_CALL_PRE void VMA_CALL_POST vmaGetPhysicalDeviceProperties( - VmaAllocator VMA_NOT_NULL allocator, - const VkPhysicalDeviceProperties* VMA_NULLABLE* VMA_NOT_NULL ppPhysicalDeviceProperties); - -/** -PhysicalDeviceMemoryProperties are fetched from physicalDevice by the allocator. -You can access it here, without fetching it again on your own. -*/ -VMA_CALL_PRE void VMA_CALL_POST vmaGetMemoryProperties( - VmaAllocator VMA_NOT_NULL allocator, - const VkPhysicalDeviceMemoryProperties* VMA_NULLABLE* VMA_NOT_NULL ppPhysicalDeviceMemoryProperties); - -/** -\brief Given Memory Type Index, returns Property Flags of this memory type. - -This is just a convenience function. Same information can be obtained using -vmaGetMemoryProperties(). -*/ -VMA_CALL_PRE void VMA_CALL_POST vmaGetMemoryTypeProperties( - VmaAllocator VMA_NOT_NULL allocator, - uint32_t memoryTypeIndex, - VkMemoryPropertyFlags* VMA_NOT_NULL pFlags); - -/** \brief Sets index of the current frame. -*/ -VMA_CALL_PRE void VMA_CALL_POST vmaSetCurrentFrameIndex( - VmaAllocator VMA_NOT_NULL allocator, - uint32_t frameIndex); - -/** @} */ - -/** -\addtogroup group_stats -@{ -*/ - -/** \brief Retrieves statistics from current state of the Allocator. - -This function is called "calculate" not "get" because it has to traverse all -internal data structures, so it may be quite slow. Use it for debugging purposes. -For faster but more brief statistics suitable to be called every frame or every allocation, -use vmaGetHeapBudgets(). - -Note that when using allocator from multiple threads, returned information may immediately -become outdated. -*/ -VMA_CALL_PRE void VMA_CALL_POST vmaCalculateStatistics( - VmaAllocator VMA_NOT_NULL allocator, - VmaTotalStatistics* VMA_NOT_NULL pStats); - -/** \brief Retrieves information about current memory usage and budget for all memory heaps. - -\param allocator -\param[out] pBudgets Must point to array with number of elements at least equal to number of memory heaps in physical device used. - -This function is called "get" not "calculate" because it is very fast, suitable to be called -every frame or every allocation. For more detailed statistics use vmaCalculateStatistics(). - -Note that when using allocator from multiple threads, returned information may immediately -become outdated. -*/ -VMA_CALL_PRE void VMA_CALL_POST vmaGetHeapBudgets( - VmaAllocator VMA_NOT_NULL allocator, - VmaBudget* VMA_NOT_NULL VMA_LEN_IF_NOT_NULL("VkPhysicalDeviceMemoryProperties::memoryHeapCount") pBudgets); - -/** @} */ - -/** -\addtogroup group_alloc -@{ -*/ - -/** -\brief Helps to find memoryTypeIndex, given memoryTypeBits and VmaAllocationCreateInfo. - -This algorithm tries to find a memory type that: - -- Is allowed by memoryTypeBits. -- Contains all the flags from pAllocationCreateInfo->requiredFlags. -- Matches intended usage. -- Has as many flags from pAllocationCreateInfo->preferredFlags as possible. - -\return Returns VK_ERROR_FEATURE_NOT_PRESENT if not found. Receiving such result -from this function or any other allocating function probably means that your -device doesn't support any memory type with requested features for the specific -type of resource you want to use it for. Please check parameters of your -resource, like image layout (OPTIMAL versus LINEAR) or mip level count. -*/ -VMA_CALL_PRE VkResult VMA_CALL_POST vmaFindMemoryTypeIndex( - VmaAllocator VMA_NOT_NULL allocator, - uint32_t memoryTypeBits, - const VmaAllocationCreateInfo* VMA_NOT_NULL pAllocationCreateInfo, - uint32_t* VMA_NOT_NULL pMemoryTypeIndex); - -/** -\brief Helps to find memoryTypeIndex, given VkBufferCreateInfo and VmaAllocationCreateInfo. - -It can be useful e.g. to determine value to be used as VmaPoolCreateInfo::memoryTypeIndex. -It internally creates a temporary, dummy buffer that never has memory bound. -*/ -VMA_CALL_PRE VkResult VMA_CALL_POST vmaFindMemoryTypeIndexForBufferInfo( - VmaAllocator VMA_NOT_NULL allocator, - const VkBufferCreateInfo* VMA_NOT_NULL pBufferCreateInfo, - const VmaAllocationCreateInfo* VMA_NOT_NULL pAllocationCreateInfo, - uint32_t* VMA_NOT_NULL pMemoryTypeIndex); - -/** -\brief Helps to find memoryTypeIndex, given VkImageCreateInfo and VmaAllocationCreateInfo. - -It can be useful e.g. to determine value to be used as VmaPoolCreateInfo::memoryTypeIndex. -It internally creates a temporary, dummy image that never has memory bound. -*/ -VMA_CALL_PRE VkResult VMA_CALL_POST vmaFindMemoryTypeIndexForImageInfo( - VmaAllocator VMA_NOT_NULL allocator, - const VkImageCreateInfo* VMA_NOT_NULL pImageCreateInfo, - const VmaAllocationCreateInfo* VMA_NOT_NULL pAllocationCreateInfo, - uint32_t* VMA_NOT_NULL pMemoryTypeIndex); - -/** \brief Allocates Vulkan device memory and creates #VmaPool object. - -\param allocator Allocator object. -\param pCreateInfo Parameters of pool to create. -\param[out] pPool Handle to created pool. -*/ -VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreatePool( - VmaAllocator VMA_NOT_NULL allocator, - const VmaPoolCreateInfo* VMA_NOT_NULL pCreateInfo, - VmaPool VMA_NULLABLE* VMA_NOT_NULL pPool); - -/** \brief Destroys #VmaPool object and frees Vulkan device memory. -*/ -VMA_CALL_PRE void VMA_CALL_POST vmaDestroyPool( - VmaAllocator VMA_NOT_NULL allocator, - VmaPool VMA_NULLABLE pool); - -/** @} */ - -/** -\addtogroup group_stats -@{ -*/ - -/** \brief Retrieves statistics of existing #VmaPool object. - -\param allocator Allocator object. -\param pool Pool object. -\param[out] pPoolStats Statistics of specified pool. -*/ -VMA_CALL_PRE void VMA_CALL_POST vmaGetPoolStatistics( - VmaAllocator VMA_NOT_NULL allocator, - VmaPool VMA_NOT_NULL pool, - VmaStatistics* VMA_NOT_NULL pPoolStats); - -/** \brief Retrieves detailed statistics of existing #VmaPool object. - -\param allocator Allocator object. -\param pool Pool object. -\param[out] pPoolStats Statistics of specified pool. -*/ -VMA_CALL_PRE void VMA_CALL_POST vmaCalculatePoolStatistics( - VmaAllocator VMA_NOT_NULL allocator, - VmaPool VMA_NOT_NULL pool, - VmaDetailedStatistics* VMA_NOT_NULL pPoolStats); - -/** @} */ - -/** -\addtogroup group_alloc -@{ -*/ - -/** \brief Checks magic number in margins around all allocations in given memory pool in search for corruptions. - -Corruption detection is enabled only when `VMA_DEBUG_DETECT_CORRUPTION` macro is defined to nonzero, -`VMA_DEBUG_MARGIN` is defined to nonzero and the pool is created in memory type that is -`HOST_VISIBLE` and `HOST_COHERENT`. For more information, see [Corruption detection](@ref debugging_memory_usage_corruption_detection). - -Possible return values: - -- `VK_ERROR_FEATURE_NOT_PRESENT` - corruption detection is not enabled for specified pool. -- `VK_SUCCESS` - corruption detection has been performed and succeeded. -- `VK_ERROR_UNKNOWN` - corruption detection has been performed and found memory corruptions around one of the allocations. - `VMA_ASSERT` is also fired in that case. -- Other value: Error returned by Vulkan, e.g. memory mapping failure. -*/ -VMA_CALL_PRE VkResult VMA_CALL_POST vmaCheckPoolCorruption( - VmaAllocator VMA_NOT_NULL allocator, - VmaPool VMA_NOT_NULL pool); - -/** \brief Retrieves name of a custom pool. - -After the call `ppName` is either null or points to an internally-owned null-terminated string -containing name of the pool that was previously set. The pointer becomes invalid when the pool is -destroyed or its name is changed using vmaSetPoolName(). -*/ -VMA_CALL_PRE void VMA_CALL_POST vmaGetPoolName( - VmaAllocator VMA_NOT_NULL allocator, - VmaPool VMA_NOT_NULL pool, - const char* VMA_NULLABLE* VMA_NOT_NULL ppName); - -/** \brief Sets name of a custom pool. - -`pName` can be either null or pointer to a null-terminated string with new name for the pool. -Function makes internal copy of the string, so it can be changed or freed immediately after this call. -*/ -VMA_CALL_PRE void VMA_CALL_POST vmaSetPoolName( - VmaAllocator VMA_NOT_NULL allocator, - VmaPool VMA_NOT_NULL pool, - const char* VMA_NULLABLE pName); - -/** \brief General purpose memory allocation. - -\param allocator -\param pVkMemoryRequirements -\param pCreateInfo -\param[out] pAllocation Handle to allocated memory. -\param[out] pAllocationInfo Optional. Information about allocated memory. It can be later fetched using function vmaGetAllocationInfo(). - -You should free the memory using vmaFreeMemory() or vmaFreeMemoryPages(). - -It is recommended to use vmaAllocateMemoryForBuffer(), vmaAllocateMemoryForImage(), -vmaCreateBuffer(), vmaCreateImage() instead whenever possible. -*/ -VMA_CALL_PRE VkResult VMA_CALL_POST vmaAllocateMemory( - VmaAllocator VMA_NOT_NULL allocator, - const VkMemoryRequirements* VMA_NOT_NULL pVkMemoryRequirements, - const VmaAllocationCreateInfo* VMA_NOT_NULL pCreateInfo, - VmaAllocation VMA_NULLABLE* VMA_NOT_NULL pAllocation, - VmaAllocationInfo* VMA_NULLABLE pAllocationInfo); - -/** \brief General purpose memory allocation for multiple allocation objects at once. - -\param allocator Allocator object. -\param pVkMemoryRequirements Memory requirements for each allocation. -\param pCreateInfo Creation parameters for each allocation. -\param allocationCount Number of allocations to make. -\param[out] pAllocations Pointer to array that will be filled with handles to created allocations. -\param[out] pAllocationInfo Optional. Pointer to array that will be filled with parameters of created allocations. - -You should free the memory using vmaFreeMemory() or vmaFreeMemoryPages(). - -Word "pages" is just a suggestion to use this function to allocate pieces of memory needed for sparse binding. -It is just a general purpose allocation function able to make multiple allocations at once. -It may be internally optimized to be more efficient than calling vmaAllocateMemory() `allocationCount` times. - -All allocations are made using same parameters. All of them are created out of the same memory pool and type. -If any allocation fails, all allocations already made within this function call are also freed, so that when -returned result is not `VK_SUCCESS`, `pAllocation` array is always entirely filled with `VK_NULL_HANDLE`. -*/ -VMA_CALL_PRE VkResult VMA_CALL_POST vmaAllocateMemoryPages( - VmaAllocator VMA_NOT_NULL allocator, - const VkMemoryRequirements* VMA_NOT_NULL VMA_LEN_IF_NOT_NULL(allocationCount) pVkMemoryRequirements, - const VmaAllocationCreateInfo* VMA_NOT_NULL VMA_LEN_IF_NOT_NULL(allocationCount) pCreateInfo, - size_t allocationCount, - VmaAllocation VMA_NULLABLE* VMA_NOT_NULL VMA_LEN_IF_NOT_NULL(allocationCount) pAllocations, - VmaAllocationInfo* VMA_NULLABLE VMA_LEN_IF_NOT_NULL(allocationCount) pAllocationInfo); - -/** \brief Allocates memory suitable for given `VkBuffer`. - -\param allocator -\param buffer -\param pCreateInfo -\param[out] pAllocation Handle to allocated memory. -\param[out] pAllocationInfo Optional. Information about allocated memory. It can be later fetched using function vmaGetAllocationInfo(). - -It only creates #VmaAllocation. To bind the memory to the buffer, use vmaBindBufferMemory(). - -This is a special-purpose function. In most cases you should use vmaCreateBuffer(). - -You must free the allocation using vmaFreeMemory() when no longer needed. -*/ -VMA_CALL_PRE VkResult VMA_CALL_POST vmaAllocateMemoryForBuffer( - VmaAllocator VMA_NOT_NULL allocator, - VkBuffer VMA_NOT_NULL_NON_DISPATCHABLE buffer, - const VmaAllocationCreateInfo* VMA_NOT_NULL pCreateInfo, - VmaAllocation VMA_NULLABLE* VMA_NOT_NULL pAllocation, - VmaAllocationInfo* VMA_NULLABLE pAllocationInfo); - -/** \brief Allocates memory suitable for given `VkImage`. - -\param allocator -\param image -\param pCreateInfo -\param[out] pAllocation Handle to allocated memory. -\param[out] pAllocationInfo Optional. Information about allocated memory. It can be later fetched using function vmaGetAllocationInfo(). - -It only creates #VmaAllocation. To bind the memory to the buffer, use vmaBindImageMemory(). - -This is a special-purpose function. In most cases you should use vmaCreateImage(). - -You must free the allocation using vmaFreeMemory() when no longer needed. -*/ -VMA_CALL_PRE VkResult VMA_CALL_POST vmaAllocateMemoryForImage( - VmaAllocator VMA_NOT_NULL allocator, - VkImage VMA_NOT_NULL_NON_DISPATCHABLE image, - const VmaAllocationCreateInfo* VMA_NOT_NULL pCreateInfo, - VmaAllocation VMA_NULLABLE* VMA_NOT_NULL pAllocation, - VmaAllocationInfo* VMA_NULLABLE pAllocationInfo); - -/** \brief Frees memory previously allocated using vmaAllocateMemory(), vmaAllocateMemoryForBuffer(), or vmaAllocateMemoryForImage(). - -Passing `VK_NULL_HANDLE` as `allocation` is valid. Such function call is just skipped. -*/ -VMA_CALL_PRE void VMA_CALL_POST vmaFreeMemory( - VmaAllocator VMA_NOT_NULL allocator, - const VmaAllocation VMA_NULLABLE allocation); - -/** \brief Frees memory and destroys multiple allocations. - -Word "pages" is just a suggestion to use this function to free pieces of memory used for sparse binding. -It is just a general purpose function to free memory and destroy allocations made using e.g. vmaAllocateMemory(), -vmaAllocateMemoryPages() and other functions. -It may be internally optimized to be more efficient than calling vmaFreeMemory() `allocationCount` times. - -Allocations in `pAllocations` array can come from any memory pools and types. -Passing `VK_NULL_HANDLE` as elements of `pAllocations` array is valid. Such entries are just skipped. -*/ -VMA_CALL_PRE void VMA_CALL_POST vmaFreeMemoryPages( - VmaAllocator VMA_NOT_NULL allocator, - size_t allocationCount, - const VmaAllocation VMA_NULLABLE* VMA_NOT_NULL VMA_LEN_IF_NOT_NULL(allocationCount) pAllocations); - -/** \brief Returns current information about specified allocation. - -Current parameters of given allocation are returned in `pAllocationInfo`. - -Although this function doesn't lock any mutex, so it should be quite efficient, -you should avoid calling it too often. -You can retrieve same VmaAllocationInfo structure while creating your resource, from function -vmaCreateBuffer(), vmaCreateImage(). You can remember it if you are sure parameters don't change -(e.g. due to defragmentation). -*/ -VMA_CALL_PRE void VMA_CALL_POST vmaGetAllocationInfo( - VmaAllocator VMA_NOT_NULL allocator, - VmaAllocation VMA_NOT_NULL allocation, - VmaAllocationInfo* VMA_NOT_NULL pAllocationInfo); - -/** \brief Sets pUserData in given allocation to new value. - -The value of pointer `pUserData` is copied to allocation's `pUserData`. -It is opaque, so you can use it however you want - e.g. -as a pointer, ordinal number or some handle to you own data. -*/ -VMA_CALL_PRE void VMA_CALL_POST vmaSetAllocationUserData( - VmaAllocator VMA_NOT_NULL allocator, - VmaAllocation VMA_NOT_NULL allocation, - void* VMA_NULLABLE pUserData); - -/** \brief Sets pName in given allocation to new value. - -`pName` must be either null, or pointer to a null-terminated string. The function -makes local copy of the string and sets it as allocation's `pName`. String -passed as pName doesn't need to be valid for whole lifetime of the allocation - -you can free it after this call. String previously pointed by allocation's -`pName` is freed from memory. -*/ -VMA_CALL_PRE void VMA_CALL_POST vmaSetAllocationName( - VmaAllocator VMA_NOT_NULL allocator, - VmaAllocation VMA_NOT_NULL allocation, - const char* VMA_NULLABLE pName); - -/** -\brief Given an allocation, returns Property Flags of its memory type. - -This is just a convenience function. Same information can be obtained using -vmaGetAllocationInfo() + vmaGetMemoryProperties(). -*/ -VMA_CALL_PRE void VMA_CALL_POST vmaGetAllocationMemoryProperties( - VmaAllocator VMA_NOT_NULL allocator, - VmaAllocation VMA_NOT_NULL allocation, - VkMemoryPropertyFlags* VMA_NOT_NULL pFlags); - -/** \brief Maps memory represented by given allocation and returns pointer to it. - -Maps memory represented by given allocation to make it accessible to CPU code. -When succeeded, `*ppData` contains pointer to first byte of this memory. - -\warning -If the allocation is part of a bigger `VkDeviceMemory` block, returned pointer is -correctly offsetted to the beginning of region assigned to this particular allocation. -Unlike the result of `vkMapMemory`, it points to the allocation, not to the beginning of the whole block. -You should not add VmaAllocationInfo::offset to it! - -Mapping is internally reference-counted and synchronized, so despite raw Vulkan -function `vkMapMemory()` cannot be used to map same block of `VkDeviceMemory` -multiple times simultaneously, it is safe to call this function on allocations -assigned to the same memory block. Actual Vulkan memory will be mapped on first -mapping and unmapped on last unmapping. - -If the function succeeded, you must call vmaUnmapMemory() to unmap the -allocation when mapping is no longer needed or before freeing the allocation, at -the latest. - -It also safe to call this function multiple times on the same allocation. You -must call vmaUnmapMemory() same number of times as you called vmaMapMemory(). - -It is also safe to call this function on allocation created with -#VMA_ALLOCATION_CREATE_MAPPED_BIT flag. Its memory stays mapped all the time. -You must still call vmaUnmapMemory() same number of times as you called -vmaMapMemory(). You must not call vmaUnmapMemory() additional time to free the -"0-th" mapping made automatically due to #VMA_ALLOCATION_CREATE_MAPPED_BIT flag. - -This function fails when used on allocation made in memory type that is not -`HOST_VISIBLE`. - -This function doesn't automatically flush or invalidate caches. -If the allocation is made from a memory types that is not `HOST_COHERENT`, -you also need to use vmaInvalidateAllocation() / vmaFlushAllocation(), as required by Vulkan specification. -*/ -VMA_CALL_PRE VkResult VMA_CALL_POST vmaMapMemory( - VmaAllocator VMA_NOT_NULL allocator, - VmaAllocation VMA_NOT_NULL allocation, - void* VMA_NULLABLE* VMA_NOT_NULL ppData); - -/** \brief Unmaps memory represented by given allocation, mapped previously using vmaMapMemory(). - -For details, see description of vmaMapMemory(). - -This function doesn't automatically flush or invalidate caches. -If the allocation is made from a memory types that is not `HOST_COHERENT`, -you also need to use vmaInvalidateAllocation() / vmaFlushAllocation(), as required by Vulkan specification. -*/ -VMA_CALL_PRE void VMA_CALL_POST vmaUnmapMemory( - VmaAllocator VMA_NOT_NULL allocator, - VmaAllocation VMA_NOT_NULL allocation); - -/** \brief Flushes memory of given allocation. - -Calls `vkFlushMappedMemoryRanges()` for memory associated with given range of given allocation. -It needs to be called after writing to a mapped memory for memory types that are not `HOST_COHERENT`. -Unmap operation doesn't do that automatically. - -- `offset` must be relative to the beginning of allocation. -- `size` can be `VK_WHOLE_SIZE`. It means all memory from `offset` the the end of given allocation. -- `offset` and `size` don't have to be aligned. - They are internally rounded down/up to multiply of `nonCoherentAtomSize`. -- If `size` is 0, this call is ignored. -- If memory type that the `allocation` belongs to is not `HOST_VISIBLE` or it is `HOST_COHERENT`, - this call is ignored. - -Warning! `offset` and `size` are relative to the contents of given `allocation`. -If you mean whole allocation, you can pass 0 and `VK_WHOLE_SIZE`, respectively. -Do not pass allocation's offset as `offset`!!! - -This function returns the `VkResult` from `vkFlushMappedMemoryRanges` if it is -called, otherwise `VK_SUCCESS`. -*/ -VMA_CALL_PRE VkResult VMA_CALL_POST vmaFlushAllocation( - VmaAllocator VMA_NOT_NULL allocator, - VmaAllocation VMA_NOT_NULL allocation, - VkDeviceSize offset, - VkDeviceSize size); - -/** \brief Invalidates memory of given allocation. - -Calls `vkInvalidateMappedMemoryRanges()` for memory associated with given range of given allocation. -It needs to be called before reading from a mapped memory for memory types that are not `HOST_COHERENT`. -Map operation doesn't do that automatically. - -- `offset` must be relative to the beginning of allocation. -- `size` can be `VK_WHOLE_SIZE`. It means all memory from `offset` the the end of given allocation. -- `offset` and `size` don't have to be aligned. - They are internally rounded down/up to multiply of `nonCoherentAtomSize`. -- If `size` is 0, this call is ignored. -- If memory type that the `allocation` belongs to is not `HOST_VISIBLE` or it is `HOST_COHERENT`, - this call is ignored. - -Warning! `offset` and `size` are relative to the contents of given `allocation`. -If you mean whole allocation, you can pass 0 and `VK_WHOLE_SIZE`, respectively. -Do not pass allocation's offset as `offset`!!! - -This function returns the `VkResult` from `vkInvalidateMappedMemoryRanges` if -it is called, otherwise `VK_SUCCESS`. -*/ -VMA_CALL_PRE VkResult VMA_CALL_POST vmaInvalidateAllocation( - VmaAllocator VMA_NOT_NULL allocator, - VmaAllocation VMA_NOT_NULL allocation, - VkDeviceSize offset, - VkDeviceSize size); - -/** \brief Flushes memory of given set of allocations. - -Calls `vkFlushMappedMemoryRanges()` for memory associated with given ranges of given allocations. -For more information, see documentation of vmaFlushAllocation(). - -\param allocator -\param allocationCount -\param allocations -\param offsets If not null, it must point to an array of offsets of regions to flush, relative to the beginning of respective allocations. Null means all ofsets are zero. -\param sizes If not null, it must point to an array of sizes of regions to flush in respective allocations. Null means `VK_WHOLE_SIZE` for all allocations. - -This function returns the `VkResult` from `vkFlushMappedMemoryRanges` if it is -called, otherwise `VK_SUCCESS`. -*/ -VMA_CALL_PRE VkResult VMA_CALL_POST vmaFlushAllocations( - VmaAllocator VMA_NOT_NULL allocator, - uint32_t allocationCount, - const VmaAllocation VMA_NOT_NULL* VMA_NULLABLE VMA_LEN_IF_NOT_NULL(allocationCount) allocations, - const VkDeviceSize* VMA_NULLABLE VMA_LEN_IF_NOT_NULL(allocationCount) offsets, - const VkDeviceSize* VMA_NULLABLE VMA_LEN_IF_NOT_NULL(allocationCount) sizes); - -/** \brief Invalidates memory of given set of allocations. - -Calls `vkInvalidateMappedMemoryRanges()` for memory associated with given ranges of given allocations. -For more information, see documentation of vmaInvalidateAllocation(). - -\param allocator -\param allocationCount -\param allocations -\param offsets If not null, it must point to an array of offsets of regions to flush, relative to the beginning of respective allocations. Null means all ofsets are zero. -\param sizes If not null, it must point to an array of sizes of regions to flush in respective allocations. Null means `VK_WHOLE_SIZE` for all allocations. - -This function returns the `VkResult` from `vkInvalidateMappedMemoryRanges` if it is -called, otherwise `VK_SUCCESS`. -*/ -VMA_CALL_PRE VkResult VMA_CALL_POST vmaInvalidateAllocations( - VmaAllocator VMA_NOT_NULL allocator, - uint32_t allocationCount, - const VmaAllocation VMA_NOT_NULL* VMA_NULLABLE VMA_LEN_IF_NOT_NULL(allocationCount) allocations, - const VkDeviceSize* VMA_NULLABLE VMA_LEN_IF_NOT_NULL(allocationCount) offsets, - const VkDeviceSize* VMA_NULLABLE VMA_LEN_IF_NOT_NULL(allocationCount) sizes); - -/** \brief Checks magic number in margins around all allocations in given memory types (in both default and custom pools) in search for corruptions. - -\param allocator -\param memoryTypeBits Bit mask, where each bit set means that a memory type with that index should be checked. - -Corruption detection is enabled only when `VMA_DEBUG_DETECT_CORRUPTION` macro is defined to nonzero, -`VMA_DEBUG_MARGIN` is defined to nonzero and only for memory types that are -`HOST_VISIBLE` and `HOST_COHERENT`. For more information, see [Corruption detection](@ref debugging_memory_usage_corruption_detection). - -Possible return values: - -- `VK_ERROR_FEATURE_NOT_PRESENT` - corruption detection is not enabled for any of specified memory types. -- `VK_SUCCESS` - corruption detection has been performed and succeeded. -- `VK_ERROR_UNKNOWN` - corruption detection has been performed and found memory corruptions around one of the allocations. - `VMA_ASSERT` is also fired in that case. -- Other value: Error returned by Vulkan, e.g. memory mapping failure. -*/ -VMA_CALL_PRE VkResult VMA_CALL_POST vmaCheckCorruption( - VmaAllocator VMA_NOT_NULL allocator, - uint32_t memoryTypeBits); - -/** \brief Begins defragmentation process. - -\param allocator Allocator object. -\param pInfo Structure filled with parameters of defragmentation. -\param[out] pContext Context object that must be passed to vmaEndDefragmentation() to finish defragmentation. -\returns -- `VK_SUCCESS` if defragmentation can begin. -- `VK_ERROR_FEATURE_NOT_PRESENT` if defragmentation is not supported. - -For more information about defragmentation, see documentation chapter: -[Defragmentation](@ref defragmentation). -*/ -VMA_CALL_PRE VkResult VMA_CALL_POST vmaBeginDefragmentation( - VmaAllocator VMA_NOT_NULL allocator, - const VmaDefragmentationInfo* VMA_NOT_NULL pInfo, - VmaDefragmentationContext VMA_NULLABLE* VMA_NOT_NULL pContext); - -/** \brief Ends defragmentation process. - -\param allocator Allocator object. -\param context Context object that has been created by vmaBeginDefragmentation(). -\param[out] pStats Optional stats for the defragmentation. Can be null. - -Use this function to finish defragmentation started by vmaBeginDefragmentation(). -*/ -VMA_CALL_PRE void VMA_CALL_POST vmaEndDefragmentation( - VmaAllocator VMA_NOT_NULL allocator, - VmaDefragmentationContext VMA_NOT_NULL context, - VmaDefragmentationStats* VMA_NULLABLE pStats); - -/** \brief Starts single defragmentation pass. - -\param allocator Allocator object. -\param context Context object that has been created by vmaBeginDefragmentation(). -\param[out] pPassInfo Computed information for current pass. -\returns -- `VK_SUCCESS` if no more moves are possible. Then you can omit call to vmaEndDefragmentationPass() and simply end whole defragmentation. -- `VK_INCOMPLETE` if there are pending moves returned in `pPassInfo`. You need to perform them, call vmaEndDefragmentationPass(), - and then preferably try another pass with vmaBeginDefragmentationPass(). -*/ -VMA_CALL_PRE VkResult VMA_CALL_POST vmaBeginDefragmentationPass( - VmaAllocator VMA_NOT_NULL allocator, - VmaDefragmentationContext VMA_NOT_NULL context, - VmaDefragmentationPassMoveInfo* VMA_NOT_NULL pPassInfo); - -/** \brief Ends single defragmentation pass. - -\param allocator Allocator object. -\param context Context object that has been created by vmaBeginDefragmentation(). -\param pPassInfo Computed information for current pass filled by vmaBeginDefragmentationPass() and possibly modified by you. - -Returns `VK_SUCCESS` if no more moves are possible or `VK_INCOMPLETE` if more defragmentations are possible. - -Ends incremental defragmentation pass and commits all defragmentation moves from `pPassInfo`. -After this call: - -- Allocations at `pPassInfo[i].srcAllocation` that had `pPassInfo[i].operation ==` #VMA_DEFRAGMENTATION_MOVE_OPERATION_COPY - (which is the default) will be pointing to the new destination place. -- Allocation at `pPassInfo[i].srcAllocation` that had `pPassInfo[i].operation ==` #VMA_DEFRAGMENTATION_MOVE_OPERATION_DESTROY - will be freed. - -If no more moves are possible you can end whole defragmentation. -*/ -VMA_CALL_PRE VkResult VMA_CALL_POST vmaEndDefragmentationPass( - VmaAllocator VMA_NOT_NULL allocator, - VmaDefragmentationContext VMA_NOT_NULL context, - VmaDefragmentationPassMoveInfo* VMA_NOT_NULL pPassInfo); - -/** \brief Binds buffer to allocation. - -Binds specified buffer to region of memory represented by specified allocation. -Gets `VkDeviceMemory` handle and offset from the allocation. -If you want to create a buffer, allocate memory for it and bind them together separately, -you should use this function for binding instead of standard `vkBindBufferMemory()`, -because it ensures proper synchronization so that when a `VkDeviceMemory` object is used by multiple -allocations, calls to `vkBind*Memory()` or `vkMapMemory()` won't happen from multiple threads simultaneously -(which is illegal in Vulkan). - -It is recommended to use function vmaCreateBuffer() instead of this one. -*/ -VMA_CALL_PRE VkResult VMA_CALL_POST vmaBindBufferMemory( - VmaAllocator VMA_NOT_NULL allocator, - VmaAllocation VMA_NOT_NULL allocation, - VkBuffer VMA_NOT_NULL_NON_DISPATCHABLE buffer); - -/** \brief Binds buffer to allocation with additional parameters. - -\param allocator -\param allocation -\param allocationLocalOffset Additional offset to be added while binding, relative to the beginning of the `allocation`. Normally it should be 0. -\param buffer -\param pNext A chain of structures to be attached to `VkBindBufferMemoryInfoKHR` structure used internally. Normally it should be null. - -This function is similar to vmaBindBufferMemory(), but it provides additional parameters. - -If `pNext` is not null, #VmaAllocator object must have been created with #VMA_ALLOCATOR_CREATE_KHR_BIND_MEMORY2_BIT flag -or with VmaAllocatorCreateInfo::vulkanApiVersion `>= VK_API_VERSION_1_1`. Otherwise the call fails. -*/ -VMA_CALL_PRE VkResult VMA_CALL_POST vmaBindBufferMemory2( - VmaAllocator VMA_NOT_NULL allocator, - VmaAllocation VMA_NOT_NULL allocation, - VkDeviceSize allocationLocalOffset, - VkBuffer VMA_NOT_NULL_NON_DISPATCHABLE buffer, - const void* VMA_NULLABLE pNext); - -/** \brief Binds image to allocation. - -Binds specified image to region of memory represented by specified allocation. -Gets `VkDeviceMemory` handle and offset from the allocation. -If you want to create an image, allocate memory for it and bind them together separately, -you should use this function for binding instead of standard `vkBindImageMemory()`, -because it ensures proper synchronization so that when a `VkDeviceMemory` object is used by multiple -allocations, calls to `vkBind*Memory()` or `vkMapMemory()` won't happen from multiple threads simultaneously -(which is illegal in Vulkan). - -It is recommended to use function vmaCreateImage() instead of this one. -*/ -VMA_CALL_PRE VkResult VMA_CALL_POST vmaBindImageMemory( - VmaAllocator VMA_NOT_NULL allocator, - VmaAllocation VMA_NOT_NULL allocation, - VkImage VMA_NOT_NULL_NON_DISPATCHABLE image); - -/** \brief Binds image to allocation with additional parameters. - -\param allocator -\param allocation -\param allocationLocalOffset Additional offset to be added while binding, relative to the beginning of the `allocation`. Normally it should be 0. -\param image -\param pNext A chain of structures to be attached to `VkBindImageMemoryInfoKHR` structure used internally. Normally it should be null. - -This function is similar to vmaBindImageMemory(), but it provides additional parameters. - -If `pNext` is not null, #VmaAllocator object must have been created with #VMA_ALLOCATOR_CREATE_KHR_BIND_MEMORY2_BIT flag -or with VmaAllocatorCreateInfo::vulkanApiVersion `>= VK_API_VERSION_1_1`. Otherwise the call fails. -*/ -VMA_CALL_PRE VkResult VMA_CALL_POST vmaBindImageMemory2( - VmaAllocator VMA_NOT_NULL allocator, - VmaAllocation VMA_NOT_NULL allocation, - VkDeviceSize allocationLocalOffset, - VkImage VMA_NOT_NULL_NON_DISPATCHABLE image, - const void* VMA_NULLABLE pNext); - -/** \brief Creates a new `VkBuffer`, allocates and binds memory for it. - -\param allocator -\param pBufferCreateInfo -\param pAllocationCreateInfo -\param[out] pBuffer Buffer that was created. -\param[out] pAllocation Allocation that was created. -\param[out] pAllocationInfo Optional. Information about allocated memory. It can be later fetched using function vmaGetAllocationInfo(). - -This function automatically: - --# Creates buffer. --# Allocates appropriate memory for it. --# Binds the buffer with the memory. - -If any of these operations fail, buffer and allocation are not created, -returned value is negative error code, `*pBuffer` and `*pAllocation` are null. - -If the function succeeded, you must destroy both buffer and allocation when you -no longer need them using either convenience function vmaDestroyBuffer() or -separately, using `vkDestroyBuffer()` and vmaFreeMemory(). - -If #VMA_ALLOCATOR_CREATE_KHR_DEDICATED_ALLOCATION_BIT flag was used, -VK_KHR_dedicated_allocation extension is used internally to query driver whether -it requires or prefers the new buffer to have dedicated allocation. If yes, -and if dedicated allocation is possible -(#VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT is not used), it creates dedicated -allocation for this buffer, just like when using -#VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT. - -\note This function creates a new `VkBuffer`. Sub-allocation of parts of one large buffer, -although recommended as a good practice, is out of scope of this library and could be implemented -by the user as a higher-level logic on top of VMA. -*/ -VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateBuffer( - VmaAllocator VMA_NOT_NULL allocator, - const VkBufferCreateInfo* VMA_NOT_NULL pBufferCreateInfo, - const VmaAllocationCreateInfo* VMA_NOT_NULL pAllocationCreateInfo, - VkBuffer VMA_NULLABLE_NON_DISPATCHABLE* VMA_NOT_NULL pBuffer, - VmaAllocation VMA_NULLABLE* VMA_NOT_NULL pAllocation, - VmaAllocationInfo* VMA_NULLABLE pAllocationInfo); - -/** \brief Creates a buffer with additional minimum alignment. - -Similar to vmaCreateBuffer() but provides additional parameter `minAlignment` which allows to specify custom, -minimum alignment to be used when placing the buffer inside a larger memory block, which may be needed e.g. -for interop with OpenGL. -*/ -VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateBufferWithAlignment( - VmaAllocator VMA_NOT_NULL allocator, - const VkBufferCreateInfo* VMA_NOT_NULL pBufferCreateInfo, - const VmaAllocationCreateInfo* VMA_NOT_NULL pAllocationCreateInfo, - VkDeviceSize minAlignment, - VkBuffer VMA_NULLABLE_NON_DISPATCHABLE* VMA_NOT_NULL pBuffer, - VmaAllocation VMA_NULLABLE* VMA_NOT_NULL pAllocation, - VmaAllocationInfo* VMA_NULLABLE pAllocationInfo); - -/** \brief Creates a new `VkBuffer`, binds already created memory for it. - -\param allocator -\param allocation Allocation that provides memory to be used for binding new buffer to it. -\param pBufferCreateInfo -\param[out] pBuffer Buffer that was created. - -This function automatically: - --# Creates buffer. --# Binds the buffer with the supplied memory. - -If any of these operations fail, buffer is not created, -returned value is negative error code and `*pBuffer` is null. - -If the function succeeded, you must destroy the buffer when you -no longer need it using `vkDestroyBuffer()`. If you want to also destroy the corresponding -allocation you can use convenience function vmaDestroyBuffer(). - -\note There is a new version of this function augmented with parameter `allocationLocalOffset` - see vmaCreateAliasingBuffer2(). -*/ -VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateAliasingBuffer( - VmaAllocator VMA_NOT_NULL allocator, - VmaAllocation VMA_NOT_NULL allocation, - const VkBufferCreateInfo* VMA_NOT_NULL pBufferCreateInfo, - VkBuffer VMA_NULLABLE_NON_DISPATCHABLE* VMA_NOT_NULL pBuffer); - -/** \brief Creates a new `VkBuffer`, binds already created memory for it. - -\param allocator -\param allocation Allocation that provides memory to be used for binding new buffer to it. -\param allocationLocalOffset Additional offset to be added while binding, relative to the beginning of the allocation. Normally it should be 0. -\param pBufferCreateInfo -\param[out] pBuffer Buffer that was created. - -This function automatically: - --# Creates buffer. --# Binds the buffer with the supplied memory. - -If any of these operations fail, buffer is not created, -returned value is negative error code and `*pBuffer` is null. - -If the function succeeded, you must destroy the buffer when you -no longer need it using `vkDestroyBuffer()`. If you want to also destroy the corresponding -allocation you can use convenience function vmaDestroyBuffer(). - -\note This is a new version of the function augmented with parameter `allocationLocalOffset`. -*/ -VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateAliasingBuffer2( - VmaAllocator VMA_NOT_NULL allocator, - VmaAllocation VMA_NOT_NULL allocation, - VkDeviceSize allocationLocalOffset, - const VkBufferCreateInfo* VMA_NOT_NULL pBufferCreateInfo, - VkBuffer VMA_NULLABLE_NON_DISPATCHABLE* VMA_NOT_NULL pBuffer); - -/** \brief Destroys Vulkan buffer and frees allocated memory. - -This is just a convenience function equivalent to: - -\code -vkDestroyBuffer(device, buffer, allocationCallbacks); -vmaFreeMemory(allocator, allocation); -\endcode - -It is safe to pass null as buffer and/or allocation. -*/ -VMA_CALL_PRE void VMA_CALL_POST vmaDestroyBuffer( - VmaAllocator VMA_NOT_NULL allocator, - VkBuffer VMA_NULLABLE_NON_DISPATCHABLE buffer, - VmaAllocation VMA_NULLABLE allocation); - -/// Function similar to vmaCreateBuffer(). -VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateImage( - VmaAllocator VMA_NOT_NULL allocator, - const VkImageCreateInfo* VMA_NOT_NULL pImageCreateInfo, - const VmaAllocationCreateInfo* VMA_NOT_NULL pAllocationCreateInfo, - VkImage VMA_NULLABLE_NON_DISPATCHABLE* VMA_NOT_NULL pImage, - VmaAllocation VMA_NULLABLE* VMA_NOT_NULL pAllocation, - VmaAllocationInfo* VMA_NULLABLE pAllocationInfo); - -/// Function similar to vmaCreateAliasingBuffer() but for images. -VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateAliasingImage( - VmaAllocator VMA_NOT_NULL allocator, - VmaAllocation VMA_NOT_NULL allocation, - const VkImageCreateInfo* VMA_NOT_NULL pImageCreateInfo, - VkImage VMA_NULLABLE_NON_DISPATCHABLE* VMA_NOT_NULL pImage); - -/// Function similar to vmaCreateAliasingBuffer2() but for images. -VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateAliasingImage2( - VmaAllocator VMA_NOT_NULL allocator, - VmaAllocation VMA_NOT_NULL allocation, - VkDeviceSize allocationLocalOffset, - const VkImageCreateInfo* VMA_NOT_NULL pImageCreateInfo, - VkImage VMA_NULLABLE_NON_DISPATCHABLE* VMA_NOT_NULL pImage); - -/** \brief Destroys Vulkan image and frees allocated memory. - -This is just a convenience function equivalent to: - -\code -vkDestroyImage(device, image, allocationCallbacks); -vmaFreeMemory(allocator, allocation); -\endcode - -It is safe to pass null as image and/or allocation. -*/ -VMA_CALL_PRE void VMA_CALL_POST vmaDestroyImage( - VmaAllocator VMA_NOT_NULL allocator, - VkImage VMA_NULLABLE_NON_DISPATCHABLE image, - VmaAllocation VMA_NULLABLE allocation); - -/** @} */ - -/** -\addtogroup group_virtual -@{ -*/ - -/** \brief Creates new #VmaVirtualBlock object. - -\param pCreateInfo Parameters for creation. -\param[out] pVirtualBlock Returned virtual block object or `VMA_NULL` if creation failed. -*/ -VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateVirtualBlock( - const VmaVirtualBlockCreateInfo* VMA_NOT_NULL pCreateInfo, - VmaVirtualBlock VMA_NULLABLE* VMA_NOT_NULL pVirtualBlock); - -/** \brief Destroys #VmaVirtualBlock object. - -Please note that you should consciously handle virtual allocations that could remain unfreed in the block. -You should either free them individually using vmaVirtualFree() or call vmaClearVirtualBlock() -if you are sure this is what you want. If you do neither, an assert is called. - -If you keep pointers to some additional metadata associated with your virtual allocations in their `pUserData`, -don't forget to free them. -*/ -VMA_CALL_PRE void VMA_CALL_POST vmaDestroyVirtualBlock( - VmaVirtualBlock VMA_NULLABLE virtualBlock); - -/** \brief Returns true of the #VmaVirtualBlock is empty - contains 0 virtual allocations and has all its space available for new allocations. -*/ -VMA_CALL_PRE VkBool32 VMA_CALL_POST vmaIsVirtualBlockEmpty( - VmaVirtualBlock VMA_NOT_NULL virtualBlock); - -/** \brief Returns information about a specific virtual allocation within a virtual block, like its size and `pUserData` pointer. -*/ -VMA_CALL_PRE void VMA_CALL_POST vmaGetVirtualAllocationInfo( - VmaVirtualBlock VMA_NOT_NULL virtualBlock, - VmaVirtualAllocation VMA_NOT_NULL_NON_DISPATCHABLE allocation, VmaVirtualAllocationInfo* VMA_NOT_NULL pVirtualAllocInfo); - -/** \brief Allocates new virtual allocation inside given #VmaVirtualBlock. - -If the allocation fails due to not enough free space available, `VK_ERROR_OUT_OF_DEVICE_MEMORY` is returned -(despite the function doesn't ever allocate actual GPU memory). -`pAllocation` is then set to `VK_NULL_HANDLE` and `pOffset`, if not null, it set to `UINT64_MAX`. - -\param virtualBlock Virtual block -\param pCreateInfo Parameters for the allocation -\param[out] pAllocation Returned handle of the new allocation -\param[out] pOffset Returned offset of the new allocation. Optional, can be null. -*/ -VMA_CALL_PRE VkResult VMA_CALL_POST vmaVirtualAllocate( - VmaVirtualBlock VMA_NOT_NULL virtualBlock, - const VmaVirtualAllocationCreateInfo* VMA_NOT_NULL pCreateInfo, - VmaVirtualAllocation VMA_NULLABLE_NON_DISPATCHABLE* VMA_NOT_NULL pAllocation, - VkDeviceSize* VMA_NULLABLE pOffset); - -/** \brief Frees virtual allocation inside given #VmaVirtualBlock. - -It is correct to call this function with `allocation == VK_NULL_HANDLE` - it does nothing. -*/ -VMA_CALL_PRE void VMA_CALL_POST vmaVirtualFree( - VmaVirtualBlock VMA_NOT_NULL virtualBlock, - VmaVirtualAllocation VMA_NULLABLE_NON_DISPATCHABLE allocation); - -/** \brief Frees all virtual allocations inside given #VmaVirtualBlock. - -You must either call this function or free each virtual allocation individually with vmaVirtualFree() -before destroying a virtual block. Otherwise, an assert is called. - -If you keep pointer to some additional metadata associated with your virtual allocation in its `pUserData`, -don't forget to free it as well. -*/ -VMA_CALL_PRE void VMA_CALL_POST vmaClearVirtualBlock( - VmaVirtualBlock VMA_NOT_NULL virtualBlock); - -/** \brief Changes custom pointer associated with given virtual allocation. -*/ -VMA_CALL_PRE void VMA_CALL_POST vmaSetVirtualAllocationUserData( - VmaVirtualBlock VMA_NOT_NULL virtualBlock, - VmaVirtualAllocation VMA_NOT_NULL_NON_DISPATCHABLE allocation, - void* VMA_NULLABLE pUserData); - -/** \brief Calculates and returns statistics about virtual allocations and memory usage in given #VmaVirtualBlock. - -This function is fast to call. For more detailed statistics, see vmaCalculateVirtualBlockStatistics(). -*/ -VMA_CALL_PRE void VMA_CALL_POST vmaGetVirtualBlockStatistics( - VmaVirtualBlock VMA_NOT_NULL virtualBlock, - VmaStatistics* VMA_NOT_NULL pStats); - -/** \brief Calculates and returns detailed statistics about virtual allocations and memory usage in given #VmaVirtualBlock. - -This function is slow to call. Use for debugging purposes. -For less detailed statistics, see vmaGetVirtualBlockStatistics(). -*/ -VMA_CALL_PRE void VMA_CALL_POST vmaCalculateVirtualBlockStatistics( - VmaVirtualBlock VMA_NOT_NULL virtualBlock, - VmaDetailedStatistics* VMA_NOT_NULL pStats); - -/** @} */ + VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateAllocator( + const VmaAllocatorCreateInfo* VMA_NOT_NULL pCreateInfo, + VmaAllocator VMA_NULLABLE* VMA_NOT_NULL pAllocator); + + /// Destroys allocator object. + VMA_CALL_PRE void VMA_CALL_POST vmaDestroyAllocator( + VmaAllocator VMA_NULLABLE allocator); + + /** \brief Returns information about existing #VmaAllocator object - handle to Vulkan device etc. + + It might be useful if you want to keep just the #VmaAllocator handle and fetch other required handles to + `VkPhysicalDevice`, `VkDevice` etc. every time using this function. + */ + VMA_CALL_PRE void VMA_CALL_POST vmaGetAllocatorInfo( + VmaAllocator VMA_NOT_NULL allocator, + VmaAllocatorInfo* VMA_NOT_NULL pAllocatorInfo); + + /** + PhysicalDeviceProperties are fetched from physicalDevice by the allocator. + You can access it here, without fetching it again on your own. + */ + VMA_CALL_PRE void VMA_CALL_POST vmaGetPhysicalDeviceProperties( + VmaAllocator VMA_NOT_NULL allocator, + const VkPhysicalDeviceProperties* VMA_NULLABLE* VMA_NOT_NULL ppPhysicalDeviceProperties); + + /** + PhysicalDeviceMemoryProperties are fetched from physicalDevice by the allocator. + You can access it here, without fetching it again on your own. + */ + VMA_CALL_PRE void VMA_CALL_POST vmaGetMemoryProperties( + VmaAllocator VMA_NOT_NULL allocator, + const VkPhysicalDeviceMemoryProperties* VMA_NULLABLE* VMA_NOT_NULL ppPhysicalDeviceMemoryProperties); + + /** + \brief Given Memory Type Index, returns Property Flags of this memory type. + + This is just a convenience function. Same information can be obtained using + vmaGetMemoryProperties(). + */ + VMA_CALL_PRE void VMA_CALL_POST vmaGetMemoryTypeProperties( + VmaAllocator VMA_NOT_NULL allocator, + uint32_t memoryTypeIndex, + VkMemoryPropertyFlags* VMA_NOT_NULL pFlags); + + /** \brief Sets index of the current frame. + */ + VMA_CALL_PRE void VMA_CALL_POST vmaSetCurrentFrameIndex( + VmaAllocator VMA_NOT_NULL allocator, + uint32_t frameIndex); + + /** @} */ + + /** + \addtogroup group_stats + @{ + */ + + /** \brief Retrieves statistics from current state of the Allocator. + + This function is called "calculate" not "get" because it has to traverse all + internal data structures, so it may be quite slow. Use it for debugging purposes. + For faster but more brief statistics suitable to be called every frame or every allocation, + use vmaGetHeapBudgets(). + + Note that when using allocator from multiple threads, returned information may immediately + become outdated. + */ + VMA_CALL_PRE void VMA_CALL_POST vmaCalculateStatistics( + VmaAllocator VMA_NOT_NULL allocator, + VmaTotalStatistics* VMA_NOT_NULL pStats); + + /** \brief Retrieves information about current memory usage and budget for all memory heaps. + + \param allocator + \param[out] pBudgets Must point to array with number of elements at least equal to number of memory heaps in physical device used. + + This function is called "get" not "calculate" because it is very fast, suitable to be called + every frame or every allocation. For more detailed statistics use vmaCalculateStatistics(). + + Note that when using allocator from multiple threads, returned information may immediately + become outdated. + */ + VMA_CALL_PRE void VMA_CALL_POST vmaGetHeapBudgets( + VmaAllocator VMA_NOT_NULL allocator, + VmaBudget* VMA_NOT_NULL VMA_LEN_IF_NOT_NULL("VkPhysicalDeviceMemoryProperties::memoryHeapCount") pBudgets); + + /** @} */ + + /** + \addtogroup group_alloc + @{ + */ + + /** + \brief Helps to find memoryTypeIndex, given memoryTypeBits and VmaAllocationCreateInfo. + + This algorithm tries to find a memory type that: + + - Is allowed by memoryTypeBits. + - Contains all the flags from pAllocationCreateInfo->requiredFlags. + - Matches intended usage. + - Has as many flags from pAllocationCreateInfo->preferredFlags as possible. + + \return Returns VK_ERROR_FEATURE_NOT_PRESENT if not found. Receiving such result + from this function or any other allocating function probably means that your + device doesn't support any memory type with requested features for the specific + type of resource you want to use it for. Please check parameters of your + resource, like image layout (OPTIMAL versus LINEAR) or mip level count. + */ + VMA_CALL_PRE VkResult VMA_CALL_POST vmaFindMemoryTypeIndex( + VmaAllocator VMA_NOT_NULL allocator, + uint32_t memoryTypeBits, + const VmaAllocationCreateInfo* VMA_NOT_NULL pAllocationCreateInfo, + uint32_t* VMA_NOT_NULL pMemoryTypeIndex); + + /** + \brief Helps to find memoryTypeIndex, given VkBufferCreateInfo and VmaAllocationCreateInfo. + + It can be useful e.g. to determine value to be used as VmaPoolCreateInfo::memoryTypeIndex. + It internally creates a temporary, dummy buffer that never has memory bound. + */ + VMA_CALL_PRE VkResult VMA_CALL_POST vmaFindMemoryTypeIndexForBufferInfo( + VmaAllocator VMA_NOT_NULL allocator, + const VkBufferCreateInfo* VMA_NOT_NULL pBufferCreateInfo, + const VmaAllocationCreateInfo* VMA_NOT_NULL pAllocationCreateInfo, + uint32_t* VMA_NOT_NULL pMemoryTypeIndex); + + /** + \brief Helps to find memoryTypeIndex, given VkImageCreateInfo and VmaAllocationCreateInfo. + + It can be useful e.g. to determine value to be used as VmaPoolCreateInfo::memoryTypeIndex. + It internally creates a temporary, dummy image that never has memory bound. + */ + VMA_CALL_PRE VkResult VMA_CALL_POST vmaFindMemoryTypeIndexForImageInfo( + VmaAllocator VMA_NOT_NULL allocator, + const VkImageCreateInfo* VMA_NOT_NULL pImageCreateInfo, + const VmaAllocationCreateInfo* VMA_NOT_NULL pAllocationCreateInfo, + uint32_t* VMA_NOT_NULL pMemoryTypeIndex); + + /** \brief Allocates Vulkan device memory and creates #VmaPool object. + + \param allocator Allocator object. + \param pCreateInfo Parameters of pool to create. + \param[out] pPool Handle to created pool. + */ + VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreatePool( + VmaAllocator VMA_NOT_NULL allocator, + const VmaPoolCreateInfo* VMA_NOT_NULL pCreateInfo, + VmaPool VMA_NULLABLE* VMA_NOT_NULL pPool); + + /** \brief Destroys #VmaPool object and frees Vulkan device memory. + */ + VMA_CALL_PRE void VMA_CALL_POST vmaDestroyPool( + VmaAllocator VMA_NOT_NULL allocator, + VmaPool VMA_NULLABLE pool); + + /** @} */ + + /** + \addtogroup group_stats + @{ + */ + + /** \brief Retrieves statistics of existing #VmaPool object. + + \param allocator Allocator object. + \param pool Pool object. + \param[out] pPoolStats Statistics of specified pool. + */ + VMA_CALL_PRE void VMA_CALL_POST vmaGetPoolStatistics( + VmaAllocator VMA_NOT_NULL allocator, + VmaPool VMA_NOT_NULL pool, + VmaStatistics* VMA_NOT_NULL pPoolStats); + + /** \brief Retrieves detailed statistics of existing #VmaPool object. + + \param allocator Allocator object. + \param pool Pool object. + \param[out] pPoolStats Statistics of specified pool. + */ + VMA_CALL_PRE void VMA_CALL_POST vmaCalculatePoolStatistics( + VmaAllocator VMA_NOT_NULL allocator, + VmaPool VMA_NOT_NULL pool, + VmaDetailedStatistics* VMA_NOT_NULL pPoolStats); + + /** @} */ + + /** + \addtogroup group_alloc + @{ + */ + + /** \brief Checks magic number in margins around all allocations in given memory pool in search for corruptions. + + Corruption detection is enabled only when `VMA_DEBUG_DETECT_CORRUPTION` macro is defined to nonzero, + `VMA_DEBUG_MARGIN` is defined to nonzero and the pool is created in memory type that is + `HOST_VISIBLE` and `HOST_COHERENT`. For more information, see [Corruption detection](@ref debugging_memory_usage_corruption_detection). + + Possible return values: + + - `VK_ERROR_FEATURE_NOT_PRESENT` - corruption detection is not enabled for specified pool. + - `VK_SUCCESS` - corruption detection has been performed and succeeded. + - `VK_ERROR_UNKNOWN` - corruption detection has been performed and found memory corruptions around one of the allocations. + `VMA_ASSERT` is also fired in that case. + - Other value: Error returned by Vulkan, e.g. memory mapping failure. + */ + VMA_CALL_PRE VkResult VMA_CALL_POST vmaCheckPoolCorruption( + VmaAllocator VMA_NOT_NULL allocator, + VmaPool VMA_NOT_NULL pool); + + /** \brief Retrieves name of a custom pool. + + After the call `ppName` is either null or points to an internally-owned null-terminated string + containing name of the pool that was previously set. The pointer becomes invalid when the pool is + destroyed or its name is changed using vmaSetPoolName(). + */ + VMA_CALL_PRE void VMA_CALL_POST vmaGetPoolName( + VmaAllocator VMA_NOT_NULL allocator, + VmaPool VMA_NOT_NULL pool, + const char* VMA_NULLABLE* VMA_NOT_NULL ppName); + + /** \brief Sets name of a custom pool. + + `pName` can be either null or pointer to a null-terminated string with new name for the pool. + Function makes internal copy of the string, so it can be changed or freed immediately after this call. + */ + VMA_CALL_PRE void VMA_CALL_POST vmaSetPoolName( + VmaAllocator VMA_NOT_NULL allocator, + VmaPool VMA_NOT_NULL pool, + const char* VMA_NULLABLE pName); + + /** \brief General purpose memory allocation. + + \param allocator + \param pVkMemoryRequirements + \param pCreateInfo + \param[out] pAllocation Handle to allocated memory. + \param[out] pAllocationInfo Optional. Information about allocated memory. It can be later fetched using function vmaGetAllocationInfo(). + + You should free the memory using vmaFreeMemory() or vmaFreeMemoryPages(). + + It is recommended to use vmaAllocateMemoryForBuffer(), vmaAllocateMemoryForImage(), + vmaCreateBuffer(), vmaCreateImage() instead whenever possible. + */ + VMA_CALL_PRE VkResult VMA_CALL_POST vmaAllocateMemory( + VmaAllocator VMA_NOT_NULL allocator, + const VkMemoryRequirements* VMA_NOT_NULL pVkMemoryRequirements, + const VmaAllocationCreateInfo* VMA_NOT_NULL pCreateInfo, + VmaAllocation VMA_NULLABLE* VMA_NOT_NULL pAllocation, + VmaAllocationInfo* VMA_NULLABLE pAllocationInfo); + + /** \brief General purpose memory allocation for multiple allocation objects at once. + + \param allocator Allocator object. + \param pVkMemoryRequirements Memory requirements for each allocation. + \param pCreateInfo Creation parameters for each allocation. + \param allocationCount Number of allocations to make. + \param[out] pAllocations Pointer to array that will be filled with handles to created allocations. + \param[out] pAllocationInfo Optional. Pointer to array that will be filled with parameters of created allocations. + + You should free the memory using vmaFreeMemory() or vmaFreeMemoryPages(). + + Word "pages" is just a suggestion to use this function to allocate pieces of memory needed for sparse binding. + It is just a general purpose allocation function able to make multiple allocations at once. + It may be internally optimized to be more efficient than calling vmaAllocateMemory() `allocationCount` times. + + All allocations are made using same parameters. All of them are created out of the same memory pool and type. + If any allocation fails, all allocations already made within this function call are also freed, so that when + returned result is not `VK_SUCCESS`, `pAllocation` array is always entirely filled with `VK_NULL_HANDLE`. + */ + VMA_CALL_PRE VkResult VMA_CALL_POST vmaAllocateMemoryPages( + VmaAllocator VMA_NOT_NULL allocator, + const VkMemoryRequirements* VMA_NOT_NULL VMA_LEN_IF_NOT_NULL(allocationCount) pVkMemoryRequirements, + const VmaAllocationCreateInfo* VMA_NOT_NULL VMA_LEN_IF_NOT_NULL(allocationCount) pCreateInfo, + size_t allocationCount, + VmaAllocation VMA_NULLABLE* VMA_NOT_NULL VMA_LEN_IF_NOT_NULL(allocationCount) pAllocations, + VmaAllocationInfo* VMA_NULLABLE VMA_LEN_IF_NOT_NULL(allocationCount) pAllocationInfo); + + /** \brief Allocates memory suitable for given `VkBuffer`. + + \param allocator + \param buffer + \param pCreateInfo + \param[out] pAllocation Handle to allocated memory. + \param[out] pAllocationInfo Optional. Information about allocated memory. It can be later fetched using function vmaGetAllocationInfo(). + + It only creates #VmaAllocation. To bind the memory to the buffer, use vmaBindBufferMemory(). + + This is a special-purpose function. In most cases you should use vmaCreateBuffer(). + + You must free the allocation using vmaFreeMemory() when no longer needed. + */ + VMA_CALL_PRE VkResult VMA_CALL_POST vmaAllocateMemoryForBuffer( + VmaAllocator VMA_NOT_NULL allocator, + VkBuffer VMA_NOT_NULL_NON_DISPATCHABLE buffer, + const VmaAllocationCreateInfo* VMA_NOT_NULL pCreateInfo, + VmaAllocation VMA_NULLABLE* VMA_NOT_NULL pAllocation, + VmaAllocationInfo* VMA_NULLABLE pAllocationInfo); + + /** \brief Allocates memory suitable for given `VkImage`. + + \param allocator + \param image + \param pCreateInfo + \param[out] pAllocation Handle to allocated memory. + \param[out] pAllocationInfo Optional. Information about allocated memory. It can be later fetched using function vmaGetAllocationInfo(). + + It only creates #VmaAllocation. To bind the memory to the buffer, use vmaBindImageMemory(). + + This is a special-purpose function. In most cases you should use vmaCreateImage(). + + You must free the allocation using vmaFreeMemory() when no longer needed. + */ + VMA_CALL_PRE VkResult VMA_CALL_POST vmaAllocateMemoryForImage( + VmaAllocator VMA_NOT_NULL allocator, + VkImage VMA_NOT_NULL_NON_DISPATCHABLE image, + const VmaAllocationCreateInfo* VMA_NOT_NULL pCreateInfo, + VmaAllocation VMA_NULLABLE* VMA_NOT_NULL pAllocation, + VmaAllocationInfo* VMA_NULLABLE pAllocationInfo); + + /** \brief Frees memory previously allocated using vmaAllocateMemory(), vmaAllocateMemoryForBuffer(), or vmaAllocateMemoryForImage(). + + Passing `VK_NULL_HANDLE` as `allocation` is valid. Such function call is just skipped. + */ + VMA_CALL_PRE void VMA_CALL_POST vmaFreeMemory( + VmaAllocator VMA_NOT_NULL allocator, + const VmaAllocation VMA_NULLABLE allocation); + + /** \brief Frees memory and destroys multiple allocations. + + Word "pages" is just a suggestion to use this function to free pieces of memory used for sparse binding. + It is just a general purpose function to free memory and destroy allocations made using e.g. vmaAllocateMemory(), + vmaAllocateMemoryPages() and other functions. + It may be internally optimized to be more efficient than calling vmaFreeMemory() `allocationCount` times. + + Allocations in `pAllocations` array can come from any memory pools and types. + Passing `VK_NULL_HANDLE` as elements of `pAllocations` array is valid. Such entries are just skipped. + */ + VMA_CALL_PRE void VMA_CALL_POST vmaFreeMemoryPages( + VmaAllocator VMA_NOT_NULL allocator, + size_t allocationCount, + const VmaAllocation VMA_NULLABLE* VMA_NOT_NULL VMA_LEN_IF_NOT_NULL(allocationCount) pAllocations); + + /** \brief Returns current information about specified allocation. + + Current parameters of given allocation are returned in `pAllocationInfo`. + + Although this function doesn't lock any mutex, so it should be quite efficient, + you should avoid calling it too often. + You can retrieve same VmaAllocationInfo structure while creating your resource, from function + vmaCreateBuffer(), vmaCreateImage(). You can remember it if you are sure parameters don't change + (e.g. due to defragmentation). + + There is also a new function vmaGetAllocationInfo2() that offers extended information + about the allocation, returned using new structure #VmaAllocationInfo2. + */ + VMA_CALL_PRE void VMA_CALL_POST vmaGetAllocationInfo( + VmaAllocator VMA_NOT_NULL allocator, + VmaAllocation VMA_NOT_NULL allocation, + VmaAllocationInfo* VMA_NOT_NULL pAllocationInfo); + + /** \brief Returns extended information about specified allocation. + + Current parameters of given allocation are returned in `pAllocationInfo`. + Extended parameters in structure #VmaAllocationInfo2 include memory block size + and a flag telling whether the allocation has dedicated memory. + It can be useful e.g. for interop with OpenGL. + */ + VMA_CALL_PRE void VMA_CALL_POST vmaGetAllocationInfo2( + VmaAllocator VMA_NOT_NULL allocator, + VmaAllocation VMA_NOT_NULL allocation, + VmaAllocationInfo2* VMA_NOT_NULL pAllocationInfo); + + /** \brief Sets pUserData in given allocation to new value. + + The value of pointer `pUserData` is copied to allocation's `pUserData`. + It is opaque, so you can use it however you want - e.g. + as a pointer, ordinal number or some handle to you own data. + */ + VMA_CALL_PRE void VMA_CALL_POST vmaSetAllocationUserData( + VmaAllocator VMA_NOT_NULL allocator, + VmaAllocation VMA_NOT_NULL allocation, + void* VMA_NULLABLE pUserData); + + /** \brief Sets pName in given allocation to new value. + + `pName` must be either null, or pointer to a null-terminated string. The function + makes local copy of the string and sets it as allocation's `pName`. String + passed as pName doesn't need to be valid for whole lifetime of the allocation - + you can free it after this call. String previously pointed by allocation's + `pName` is freed from memory. + */ + VMA_CALL_PRE void VMA_CALL_POST vmaSetAllocationName( + VmaAllocator VMA_NOT_NULL allocator, + VmaAllocation VMA_NOT_NULL allocation, + const char* VMA_NULLABLE pName); + + /** + \brief Given an allocation, returns Property Flags of its memory type. + + This is just a convenience function. Same information can be obtained using + vmaGetAllocationInfo() + vmaGetMemoryProperties(). + */ + VMA_CALL_PRE void VMA_CALL_POST vmaGetAllocationMemoryProperties( + VmaAllocator VMA_NOT_NULL allocator, + VmaAllocation VMA_NOT_NULL allocation, + VkMemoryPropertyFlags* VMA_NOT_NULL pFlags); + + /** \brief Maps memory represented by given allocation and returns pointer to it. + + Maps memory represented by given allocation to make it accessible to CPU code. + When succeeded, `*ppData` contains pointer to first byte of this memory. + + \warning + If the allocation is part of a bigger `VkDeviceMemory` block, returned pointer is + correctly offsetted to the beginning of region assigned to this particular allocation. + Unlike the result of `vkMapMemory`, it points to the allocation, not to the beginning of the whole block. + You should not add VmaAllocationInfo::offset to it! + + Mapping is internally reference-counted and synchronized, so despite raw Vulkan + function `vkMapMemory()` cannot be used to map same block of `VkDeviceMemory` + multiple times simultaneously, it is safe to call this function on allocations + assigned to the same memory block. Actual Vulkan memory will be mapped on first + mapping and unmapped on last unmapping. + + If the function succeeded, you must call vmaUnmapMemory() to unmap the + allocation when mapping is no longer needed or before freeing the allocation, at + the latest. + + It also safe to call this function multiple times on the same allocation. You + must call vmaUnmapMemory() same number of times as you called vmaMapMemory(). + + It is also safe to call this function on allocation created with + #VMA_ALLOCATION_CREATE_MAPPED_BIT flag. Its memory stays mapped all the time. + You must still call vmaUnmapMemory() same number of times as you called + vmaMapMemory(). You must not call vmaUnmapMemory() additional time to free the + "0-th" mapping made automatically due to #VMA_ALLOCATION_CREATE_MAPPED_BIT flag. + + This function fails when used on allocation made in memory type that is not + `HOST_VISIBLE`. + + This function doesn't automatically flush or invalidate caches. + If the allocation is made from a memory types that is not `HOST_COHERENT`, + you also need to use vmaInvalidateAllocation() / vmaFlushAllocation(), as required by Vulkan specification. + */ + VMA_CALL_PRE VkResult VMA_CALL_POST vmaMapMemory( + VmaAllocator VMA_NOT_NULL allocator, + VmaAllocation VMA_NOT_NULL allocation, + void* VMA_NULLABLE* VMA_NOT_NULL ppData); + + /** \brief Unmaps memory represented by given allocation, mapped previously using vmaMapMemory(). + + For details, see description of vmaMapMemory(). + + This function doesn't automatically flush or invalidate caches. + If the allocation is made from a memory types that is not `HOST_COHERENT`, + you also need to use vmaInvalidateAllocation() / vmaFlushAllocation(), as required by Vulkan specification. + */ + VMA_CALL_PRE void VMA_CALL_POST vmaUnmapMemory( + VmaAllocator VMA_NOT_NULL allocator, + VmaAllocation VMA_NOT_NULL allocation); + + /** \brief Flushes memory of given allocation. + + Calls `vkFlushMappedMemoryRanges()` for memory associated with given range of given allocation. + It needs to be called after writing to a mapped memory for memory types that are not `HOST_COHERENT`. + Unmap operation doesn't do that automatically. + + - `offset` must be relative to the beginning of allocation. + - `size` can be `VK_WHOLE_SIZE`. It means all memory from `offset` the the end of given allocation. + - `offset` and `size` don't have to be aligned. + They are internally rounded down/up to multiply of `nonCoherentAtomSize`. + - If `size` is 0, this call is ignored. + - If memory type that the `allocation` belongs to is not `HOST_VISIBLE` or it is `HOST_COHERENT`, + this call is ignored. + + Warning! `offset` and `size` are relative to the contents of given `allocation`. + If you mean whole allocation, you can pass 0 and `VK_WHOLE_SIZE`, respectively. + Do not pass allocation's offset as `offset`!!! + + This function returns the `VkResult` from `vkFlushMappedMemoryRanges` if it is + called, otherwise `VK_SUCCESS`. + */ + VMA_CALL_PRE VkResult VMA_CALL_POST vmaFlushAllocation( + VmaAllocator VMA_NOT_NULL allocator, + VmaAllocation VMA_NOT_NULL allocation, + VkDeviceSize offset, + VkDeviceSize size); + + /** \brief Invalidates memory of given allocation. + + Calls `vkInvalidateMappedMemoryRanges()` for memory associated with given range of given allocation. + It needs to be called before reading from a mapped memory for memory types that are not `HOST_COHERENT`. + Map operation doesn't do that automatically. + + - `offset` must be relative to the beginning of allocation. + - `size` can be `VK_WHOLE_SIZE`. It means all memory from `offset` the the end of given allocation. + - `offset` and `size` don't have to be aligned. + They are internally rounded down/up to multiply of `nonCoherentAtomSize`. + - If `size` is 0, this call is ignored. + - If memory type that the `allocation` belongs to is not `HOST_VISIBLE` or it is `HOST_COHERENT`, + this call is ignored. + + Warning! `offset` and `size` are relative to the contents of given `allocation`. + If you mean whole allocation, you can pass 0 and `VK_WHOLE_SIZE`, respectively. + Do not pass allocation's offset as `offset`!!! + + This function returns the `VkResult` from `vkInvalidateMappedMemoryRanges` if + it is called, otherwise `VK_SUCCESS`. + */ + VMA_CALL_PRE VkResult VMA_CALL_POST vmaInvalidateAllocation( + VmaAllocator VMA_NOT_NULL allocator, + VmaAllocation VMA_NOT_NULL allocation, + VkDeviceSize offset, + VkDeviceSize size); + + /** \brief Flushes memory of given set of allocations. + + Calls `vkFlushMappedMemoryRanges()` for memory associated with given ranges of given allocations. + For more information, see documentation of vmaFlushAllocation(). + + \param allocator + \param allocationCount + \param allocations + \param offsets If not null, it must point to an array of offsets of regions to flush, relative to the beginning of respective allocations. Null means all ofsets are zero. + \param sizes If not null, it must point to an array of sizes of regions to flush in respective allocations. Null means `VK_WHOLE_SIZE` for all allocations. + + This function returns the `VkResult` from `vkFlushMappedMemoryRanges` if it is + called, otherwise `VK_SUCCESS`. + */ + VMA_CALL_PRE VkResult VMA_CALL_POST vmaFlushAllocations( + VmaAllocator VMA_NOT_NULL allocator, + uint32_t allocationCount, + const VmaAllocation VMA_NOT_NULL* VMA_NULLABLE VMA_LEN_IF_NOT_NULL(allocationCount) allocations, + const VkDeviceSize* VMA_NULLABLE VMA_LEN_IF_NOT_NULL(allocationCount) offsets, + const VkDeviceSize* VMA_NULLABLE VMA_LEN_IF_NOT_NULL(allocationCount) sizes); + + /** \brief Invalidates memory of given set of allocations. + + Calls `vkInvalidateMappedMemoryRanges()` for memory associated with given ranges of given allocations. + For more information, see documentation of vmaInvalidateAllocation(). + + \param allocator + \param allocationCount + \param allocations + \param offsets If not null, it must point to an array of offsets of regions to flush, relative to the beginning of respective allocations. Null means all ofsets are zero. + \param sizes If not null, it must point to an array of sizes of regions to flush in respective allocations. Null means `VK_WHOLE_SIZE` for all allocations. + + This function returns the `VkResult` from `vkInvalidateMappedMemoryRanges` if it is + called, otherwise `VK_SUCCESS`. + */ + VMA_CALL_PRE VkResult VMA_CALL_POST vmaInvalidateAllocations( + VmaAllocator VMA_NOT_NULL allocator, + uint32_t allocationCount, + const VmaAllocation VMA_NOT_NULL* VMA_NULLABLE VMA_LEN_IF_NOT_NULL(allocationCount) allocations, + const VkDeviceSize* VMA_NULLABLE VMA_LEN_IF_NOT_NULL(allocationCount) offsets, + const VkDeviceSize* VMA_NULLABLE VMA_LEN_IF_NOT_NULL(allocationCount) sizes); + + /** \brief Maps the allocation temporarily if needed, copies data from specified host pointer to it, and flushes the memory from the host caches if needed. + + \param allocator + \param pSrcHostPointer Pointer to the host data that become source of the copy. + \param dstAllocation Handle to the allocation that becomes destination of the copy. + \param dstAllocationLocalOffset Offset within `dstAllocation` where to write copied data, in bytes. + \param size Number of bytes to copy. + + This is a convenience function that allows to copy data from a host pointer to an allocation easily. + Same behavior can be achieved by calling vmaMapMemory(), `memcpy()`, vmaUnmapMemory(), vmaFlushAllocation(). + + This function can be called only for allocations created in a memory type that has `VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT` flag. + It can be ensured e.g. by using #VMA_MEMORY_USAGE_AUTO and #VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT or + #VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT. + Otherwise, the function will fail and generate a Validation Layers error. + + `dstAllocationLocalOffset` is relative to the contents of given `dstAllocation`. + If you mean whole allocation, you should pass 0. + Do not pass allocation's offset within device memory block this parameter! + */ + VMA_CALL_PRE VkResult VMA_CALL_POST vmaCopyMemoryToAllocation( + VmaAllocator VMA_NOT_NULL allocator, + const void* VMA_NOT_NULL VMA_LEN_IF_NOT_NULL(size) pSrcHostPointer, + VmaAllocation VMA_NOT_NULL dstAllocation, + VkDeviceSize dstAllocationLocalOffset, + VkDeviceSize size); + + /** \brief Invalidates memory in the host caches if needed, maps the allocation temporarily if needed, and copies data from it to a specified host pointer. + + \param allocator + \param srcAllocation Handle to the allocation that becomes source of the copy. + \param srcAllocationLocalOffset Offset within `srcAllocation` where to read copied data, in bytes. + \param pDstHostPointer Pointer to the host memory that become destination of the copy. + \param size Number of bytes to copy. + + This is a convenience function that allows to copy data from an allocation to a host pointer easily. + Same behavior can be achieved by calling vmaInvalidateAllocation(), vmaMapMemory(), `memcpy()`, vmaUnmapMemory(). + + This function should be called only for allocations created in a memory type that has `VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT` + and `VK_MEMORY_PROPERTY_HOST_CACHED_BIT` flag. + It can be ensured e.g. by using #VMA_MEMORY_USAGE_AUTO and #VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT. + Otherwise, the function may fail and generate a Validation Layers error. + It may also work very slowly when reading from an uncached memory. + + `srcAllocationLocalOffset` is relative to the contents of given `srcAllocation`. + If you mean whole allocation, you should pass 0. + Do not pass allocation's offset within device memory block as this parameter! + */ + VMA_CALL_PRE VkResult VMA_CALL_POST vmaCopyAllocationToMemory( + VmaAllocator VMA_NOT_NULL allocator, + VmaAllocation VMA_NOT_NULL srcAllocation, + VkDeviceSize srcAllocationLocalOffset, + void* VMA_NOT_NULL VMA_LEN_IF_NOT_NULL(size) pDstHostPointer, + VkDeviceSize size); + + /** \brief Checks magic number in margins around all allocations in given memory types (in both default and custom pools) in search for corruptions. + + \param allocator + \param memoryTypeBits Bit mask, where each bit set means that a memory type with that index should be checked. + + Corruption detection is enabled only when `VMA_DEBUG_DETECT_CORRUPTION` macro is defined to nonzero, + `VMA_DEBUG_MARGIN` is defined to nonzero and only for memory types that are + `HOST_VISIBLE` and `HOST_COHERENT`. For more information, see [Corruption detection](@ref debugging_memory_usage_corruption_detection). + + Possible return values: + + - `VK_ERROR_FEATURE_NOT_PRESENT` - corruption detection is not enabled for any of specified memory types. + - `VK_SUCCESS` - corruption detection has been performed and succeeded. + - `VK_ERROR_UNKNOWN` - corruption detection has been performed and found memory corruptions around one of the allocations. + `VMA_ASSERT` is also fired in that case. + - Other value: Error returned by Vulkan, e.g. memory mapping failure. + */ + VMA_CALL_PRE VkResult VMA_CALL_POST vmaCheckCorruption( + VmaAllocator VMA_NOT_NULL allocator, + uint32_t memoryTypeBits); + + /** \brief Begins defragmentation process. + + \param allocator Allocator object. + \param pInfo Structure filled with parameters of defragmentation. + \param[out] pContext Context object that must be passed to vmaEndDefragmentation() to finish defragmentation. + \returns + - `VK_SUCCESS` if defragmentation can begin. + - `VK_ERROR_FEATURE_NOT_PRESENT` if defragmentation is not supported. + + For more information about defragmentation, see documentation chapter: + [Defragmentation](@ref defragmentation). + */ + VMA_CALL_PRE VkResult VMA_CALL_POST vmaBeginDefragmentation( + VmaAllocator VMA_NOT_NULL allocator, + const VmaDefragmentationInfo* VMA_NOT_NULL pInfo, + VmaDefragmentationContext VMA_NULLABLE* VMA_NOT_NULL pContext); + + /** \brief Ends defragmentation process. + + \param allocator Allocator object. + \param context Context object that has been created by vmaBeginDefragmentation(). + \param[out] pStats Optional stats for the defragmentation. Can be null. + + Use this function to finish defragmentation started by vmaBeginDefragmentation(). + */ + VMA_CALL_PRE void VMA_CALL_POST vmaEndDefragmentation( + VmaAllocator VMA_NOT_NULL allocator, + VmaDefragmentationContext VMA_NOT_NULL context, + VmaDefragmentationStats* VMA_NULLABLE pStats); + + /** \brief Starts single defragmentation pass. + + \param allocator Allocator object. + \param context Context object that has been created by vmaBeginDefragmentation(). + \param[out] pPassInfo Computed information for current pass. + \returns + - `VK_SUCCESS` if no more moves are possible. Then you can omit call to vmaEndDefragmentationPass() and simply end whole defragmentation. + - `VK_INCOMPLETE` if there are pending moves returned in `pPassInfo`. You need to perform them, call vmaEndDefragmentationPass(), + and then preferably try another pass with vmaBeginDefragmentationPass(). + */ + VMA_CALL_PRE VkResult VMA_CALL_POST vmaBeginDefragmentationPass( + VmaAllocator VMA_NOT_NULL allocator, + VmaDefragmentationContext VMA_NOT_NULL context, + VmaDefragmentationPassMoveInfo* VMA_NOT_NULL pPassInfo); + + /** \brief Ends single defragmentation pass. + + \param allocator Allocator object. + \param context Context object that has been created by vmaBeginDefragmentation(). + \param pPassInfo Computed information for current pass filled by vmaBeginDefragmentationPass() and possibly modified by you. + + Returns `VK_SUCCESS` if no more moves are possible or `VK_INCOMPLETE` if more defragmentations are possible. + + Ends incremental defragmentation pass and commits all defragmentation moves from `pPassInfo`. + After this call: + + - Allocations at `pPassInfo[i].srcAllocation` that had `pPassInfo[i].operation ==` #VMA_DEFRAGMENTATION_MOVE_OPERATION_COPY + (which is the default) will be pointing to the new destination place. + - Allocation at `pPassInfo[i].srcAllocation` that had `pPassInfo[i].operation ==` #VMA_DEFRAGMENTATION_MOVE_OPERATION_DESTROY + will be freed. + + If no more moves are possible you can end whole defragmentation. + */ + VMA_CALL_PRE VkResult VMA_CALL_POST vmaEndDefragmentationPass( + VmaAllocator VMA_NOT_NULL allocator, + VmaDefragmentationContext VMA_NOT_NULL context, + VmaDefragmentationPassMoveInfo* VMA_NOT_NULL pPassInfo); + + /** \brief Binds buffer to allocation. + + Binds specified buffer to region of memory represented by specified allocation. + Gets `VkDeviceMemory` handle and offset from the allocation. + If you want to create a buffer, allocate memory for it and bind them together separately, + you should use this function for binding instead of standard `vkBindBufferMemory()`, + because it ensures proper synchronization so that when a `VkDeviceMemory` object is used by multiple + allocations, calls to `vkBind*Memory()` or `vkMapMemory()` won't happen from multiple threads simultaneously + (which is illegal in Vulkan). + + It is recommended to use function vmaCreateBuffer() instead of this one. + */ + VMA_CALL_PRE VkResult VMA_CALL_POST vmaBindBufferMemory( + VmaAllocator VMA_NOT_NULL allocator, + VmaAllocation VMA_NOT_NULL allocation, + VkBuffer VMA_NOT_NULL_NON_DISPATCHABLE buffer); + + /** \brief Binds buffer to allocation with additional parameters. + + \param allocator + \param allocation + \param allocationLocalOffset Additional offset to be added while binding, relative to the beginning of the `allocation`. Normally it should be 0. + \param buffer + \param pNext A chain of structures to be attached to `VkBindBufferMemoryInfoKHR` structure used internally. Normally it should be null. + + This function is similar to vmaBindBufferMemory(), but it provides additional parameters. + + If `pNext` is not null, #VmaAllocator object must have been created with #VMA_ALLOCATOR_CREATE_KHR_BIND_MEMORY2_BIT flag + or with VmaAllocatorCreateInfo::vulkanApiVersion `>= VK_API_VERSION_1_1`. Otherwise the call fails. + */ + VMA_CALL_PRE VkResult VMA_CALL_POST vmaBindBufferMemory2( + VmaAllocator VMA_NOT_NULL allocator, + VmaAllocation VMA_NOT_NULL allocation, + VkDeviceSize allocationLocalOffset, + VkBuffer VMA_NOT_NULL_NON_DISPATCHABLE buffer, + const void* VMA_NULLABLE VMA_EXTENDS_VK_STRUCT(VkBindBufferMemoryInfoKHR) pNext); + + /** \brief Binds image to allocation. + + Binds specified image to region of memory represented by specified allocation. + Gets `VkDeviceMemory` handle and offset from the allocation. + If you want to create an image, allocate memory for it and bind them together separately, + you should use this function for binding instead of standard `vkBindImageMemory()`, + because it ensures proper synchronization so that when a `VkDeviceMemory` object is used by multiple + allocations, calls to `vkBind*Memory()` or `vkMapMemory()` won't happen from multiple threads simultaneously + (which is illegal in Vulkan). + + It is recommended to use function vmaCreateImage() instead of this one. + */ + VMA_CALL_PRE VkResult VMA_CALL_POST vmaBindImageMemory( + VmaAllocator VMA_NOT_NULL allocator, + VmaAllocation VMA_NOT_NULL allocation, + VkImage VMA_NOT_NULL_NON_DISPATCHABLE image); + + /** \brief Binds image to allocation with additional parameters. + + \param allocator + \param allocation + \param allocationLocalOffset Additional offset to be added while binding, relative to the beginning of the `allocation`. Normally it should be 0. + \param image + \param pNext A chain of structures to be attached to `VkBindImageMemoryInfoKHR` structure used internally. Normally it should be null. + + This function is similar to vmaBindImageMemory(), but it provides additional parameters. + + If `pNext` is not null, #VmaAllocator object must have been created with #VMA_ALLOCATOR_CREATE_KHR_BIND_MEMORY2_BIT flag + or with VmaAllocatorCreateInfo::vulkanApiVersion `>= VK_API_VERSION_1_1`. Otherwise the call fails. + */ + VMA_CALL_PRE VkResult VMA_CALL_POST vmaBindImageMemory2( + VmaAllocator VMA_NOT_NULL allocator, + VmaAllocation VMA_NOT_NULL allocation, + VkDeviceSize allocationLocalOffset, + VkImage VMA_NOT_NULL_NON_DISPATCHABLE image, + const void* VMA_NULLABLE VMA_EXTENDS_VK_STRUCT(VkBindImageMemoryInfoKHR) pNext); + + /** \brief Creates a new `VkBuffer`, allocates and binds memory for it. + + \param allocator + \param pBufferCreateInfo + \param pAllocationCreateInfo + \param[out] pBuffer Buffer that was created. + \param[out] pAllocation Allocation that was created. + \param[out] pAllocationInfo Optional. Information about allocated memory. It can be later fetched using function vmaGetAllocationInfo(). + + This function automatically: + + -# Creates buffer. + -# Allocates appropriate memory for it. + -# Binds the buffer with the memory. + + If any of these operations fail, buffer and allocation are not created, + returned value is negative error code, `*pBuffer` and `*pAllocation` are null. + + If the function succeeded, you must destroy both buffer and allocation when you + no longer need them using either convenience function vmaDestroyBuffer() or + separately, using `vkDestroyBuffer()` and vmaFreeMemory(). + + If #VMA_ALLOCATOR_CREATE_KHR_DEDICATED_ALLOCATION_BIT flag was used, + VK_KHR_dedicated_allocation extension is used internally to query driver whether + it requires or prefers the new buffer to have dedicated allocation. If yes, + and if dedicated allocation is possible + (#VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT is not used), it creates dedicated + allocation for this buffer, just like when using + #VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT. + + \note This function creates a new `VkBuffer`. Sub-allocation of parts of one large buffer, + although recommended as a good practice, is out of scope of this library and could be implemented + by the user as a higher-level logic on top of VMA. + */ + VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateBuffer( + VmaAllocator VMA_NOT_NULL allocator, + const VkBufferCreateInfo* VMA_NOT_NULL pBufferCreateInfo, + const VmaAllocationCreateInfo* VMA_NOT_NULL pAllocationCreateInfo, + VkBuffer VMA_NULLABLE_NON_DISPATCHABLE* VMA_NOT_NULL pBuffer, + VmaAllocation VMA_NULLABLE* VMA_NOT_NULL pAllocation, + VmaAllocationInfo* VMA_NULLABLE pAllocationInfo); + + /** \brief Creates a buffer with additional minimum alignment. + + Similar to vmaCreateBuffer() but provides additional parameter `minAlignment` which allows to specify custom, + minimum alignment to be used when placing the buffer inside a larger memory block, which may be needed e.g. + for interop with OpenGL. + */ + VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateBufferWithAlignment( + VmaAllocator VMA_NOT_NULL allocator, + const VkBufferCreateInfo* VMA_NOT_NULL pBufferCreateInfo, + const VmaAllocationCreateInfo* VMA_NOT_NULL pAllocationCreateInfo, + VkDeviceSize minAlignment, + VkBuffer VMA_NULLABLE_NON_DISPATCHABLE* VMA_NOT_NULL pBuffer, + VmaAllocation VMA_NULLABLE* VMA_NOT_NULL pAllocation, + VmaAllocationInfo* VMA_NULLABLE pAllocationInfo); + + /** \brief Creates a new `VkBuffer`, binds already created memory for it. + + \param allocator + \param allocation Allocation that provides memory to be used for binding new buffer to it. + \param pBufferCreateInfo + \param[out] pBuffer Buffer that was created. + + This function automatically: + + -# Creates buffer. + -# Binds the buffer with the supplied memory. + + If any of these operations fail, buffer is not created, + returned value is negative error code and `*pBuffer` is null. + + If the function succeeded, you must destroy the buffer when you + no longer need it using `vkDestroyBuffer()`. If you want to also destroy the corresponding + allocation you can use convenience function vmaDestroyBuffer(). + + \note There is a new version of this function augmented with parameter `allocationLocalOffset` - see vmaCreateAliasingBuffer2(). + */ + VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateAliasingBuffer( + VmaAllocator VMA_NOT_NULL allocator, + VmaAllocation VMA_NOT_NULL allocation, + const VkBufferCreateInfo* VMA_NOT_NULL pBufferCreateInfo, + VkBuffer VMA_NULLABLE_NON_DISPATCHABLE* VMA_NOT_NULL pBuffer); + + /** \brief Creates a new `VkBuffer`, binds already created memory for it. + + \param allocator + \param allocation Allocation that provides memory to be used for binding new buffer to it. + \param allocationLocalOffset Additional offset to be added while binding, relative to the beginning of the allocation. Normally it should be 0. + \param pBufferCreateInfo + \param[out] pBuffer Buffer that was created. + + This function automatically: + + -# Creates buffer. + -# Binds the buffer with the supplied memory. + + If any of these operations fail, buffer is not created, + returned value is negative error code and `*pBuffer` is null. + + If the function succeeded, you must destroy the buffer when you + no longer need it using `vkDestroyBuffer()`. If you want to also destroy the corresponding + allocation you can use convenience function vmaDestroyBuffer(). + + \note This is a new version of the function augmented with parameter `allocationLocalOffset`. + */ + VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateAliasingBuffer2( + VmaAllocator VMA_NOT_NULL allocator, + VmaAllocation VMA_NOT_NULL allocation, + VkDeviceSize allocationLocalOffset, + const VkBufferCreateInfo* VMA_NOT_NULL pBufferCreateInfo, + VkBuffer VMA_NULLABLE_NON_DISPATCHABLE* VMA_NOT_NULL pBuffer); + + /** \brief Destroys Vulkan buffer and frees allocated memory. + + This is just a convenience function equivalent to: + + \code + vkDestroyBuffer(device, buffer, allocationCallbacks); + vmaFreeMemory(allocator, allocation); + \endcode + + It is safe to pass null as buffer and/or allocation. + */ + VMA_CALL_PRE void VMA_CALL_POST vmaDestroyBuffer( + VmaAllocator VMA_NOT_NULL allocator, + VkBuffer VMA_NULLABLE_NON_DISPATCHABLE buffer, + VmaAllocation VMA_NULLABLE allocation); + + /// Function similar to vmaCreateBuffer(). + VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateImage( + VmaAllocator VMA_NOT_NULL allocator, + const VkImageCreateInfo* VMA_NOT_NULL pImageCreateInfo, + const VmaAllocationCreateInfo* VMA_NOT_NULL pAllocationCreateInfo, + VkImage VMA_NULLABLE_NON_DISPATCHABLE* VMA_NOT_NULL pImage, + VmaAllocation VMA_NULLABLE* VMA_NOT_NULL pAllocation, + VmaAllocationInfo* VMA_NULLABLE pAllocationInfo); + + /// Function similar to vmaCreateAliasingBuffer() but for images. + VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateAliasingImage( + VmaAllocator VMA_NOT_NULL allocator, + VmaAllocation VMA_NOT_NULL allocation, + const VkImageCreateInfo* VMA_NOT_NULL pImageCreateInfo, + VkImage VMA_NULLABLE_NON_DISPATCHABLE* VMA_NOT_NULL pImage); + + /// Function similar to vmaCreateAliasingBuffer2() but for images. + VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateAliasingImage2( + VmaAllocator VMA_NOT_NULL allocator, + VmaAllocation VMA_NOT_NULL allocation, + VkDeviceSize allocationLocalOffset, + const VkImageCreateInfo* VMA_NOT_NULL pImageCreateInfo, + VkImage VMA_NULLABLE_NON_DISPATCHABLE* VMA_NOT_NULL pImage); + + /** \brief Destroys Vulkan image and frees allocated memory. + + This is just a convenience function equivalent to: + + \code + vkDestroyImage(device, image, allocationCallbacks); + vmaFreeMemory(allocator, allocation); + \endcode + + It is safe to pass null as image and/or allocation. + */ + VMA_CALL_PRE void VMA_CALL_POST vmaDestroyImage( + VmaAllocator VMA_NOT_NULL allocator, + VkImage VMA_NULLABLE_NON_DISPATCHABLE image, + VmaAllocation VMA_NULLABLE allocation); + + /** @} */ + + /** + \addtogroup group_virtual + @{ + */ + + /** \brief Creates new #VmaVirtualBlock object. + + \param pCreateInfo Parameters for creation. + \param[out] pVirtualBlock Returned virtual block object or `VMA_NULL` if creation failed. + */ + VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateVirtualBlock( + const VmaVirtualBlockCreateInfo* VMA_NOT_NULL pCreateInfo, + VmaVirtualBlock VMA_NULLABLE* VMA_NOT_NULL pVirtualBlock); + + /** \brief Destroys #VmaVirtualBlock object. + + Please note that you should consciously handle virtual allocations that could remain unfreed in the block. + You should either free them individually using vmaVirtualFree() or call vmaClearVirtualBlock() + if you are sure this is what you want. If you do neither, an assert is called. + + If you keep pointers to some additional metadata associated with your virtual allocations in their `pUserData`, + don't forget to free them. + */ + VMA_CALL_PRE void VMA_CALL_POST vmaDestroyVirtualBlock( + VmaVirtualBlock VMA_NULLABLE virtualBlock); + + /** \brief Returns true of the #VmaVirtualBlock is empty - contains 0 virtual allocations and has all its space available for new allocations. + */ + VMA_CALL_PRE VkBool32 VMA_CALL_POST vmaIsVirtualBlockEmpty( + VmaVirtualBlock VMA_NOT_NULL virtualBlock); + + /** \brief Returns information about a specific virtual allocation within a virtual block, like its size and `pUserData` pointer. + */ + VMA_CALL_PRE void VMA_CALL_POST vmaGetVirtualAllocationInfo( + VmaVirtualBlock VMA_NOT_NULL virtualBlock, + VmaVirtualAllocation VMA_NOT_NULL_NON_DISPATCHABLE allocation, VmaVirtualAllocationInfo* VMA_NOT_NULL pVirtualAllocInfo); + + /** \brief Allocates new virtual allocation inside given #VmaVirtualBlock. + + If the allocation fails due to not enough free space available, `VK_ERROR_OUT_OF_DEVICE_MEMORY` is returned + (despite the function doesn't ever allocate actual GPU memory). + `pAllocation` is then set to `VK_NULL_HANDLE` and `pOffset`, if not null, it set to `UINT64_MAX`. + + \param virtualBlock Virtual block + \param pCreateInfo Parameters for the allocation + \param[out] pAllocation Returned handle of the new allocation + \param[out] pOffset Returned offset of the new allocation. Optional, can be null. + */ + VMA_CALL_PRE VkResult VMA_CALL_POST vmaVirtualAllocate( + VmaVirtualBlock VMA_NOT_NULL virtualBlock, + const VmaVirtualAllocationCreateInfo* VMA_NOT_NULL pCreateInfo, + VmaVirtualAllocation VMA_NULLABLE_NON_DISPATCHABLE* VMA_NOT_NULL pAllocation, + VkDeviceSize* VMA_NULLABLE pOffset); + + /** \brief Frees virtual allocation inside given #VmaVirtualBlock. + + It is correct to call this function with `allocation == VK_NULL_HANDLE` - it does nothing. + */ + VMA_CALL_PRE void VMA_CALL_POST vmaVirtualFree( + VmaVirtualBlock VMA_NOT_NULL virtualBlock, + VmaVirtualAllocation VMA_NULLABLE_NON_DISPATCHABLE allocation); + + /** \brief Frees all virtual allocations inside given #VmaVirtualBlock. + + You must either call this function or free each virtual allocation individually with vmaVirtualFree() + before destroying a virtual block. Otherwise, an assert is called. + + If you keep pointer to some additional metadata associated with your virtual allocation in its `pUserData`, + don't forget to free it as well. + */ + VMA_CALL_PRE void VMA_CALL_POST vmaClearVirtualBlock( + VmaVirtualBlock VMA_NOT_NULL virtualBlock); + + /** \brief Changes custom pointer associated with given virtual allocation. + */ + VMA_CALL_PRE void VMA_CALL_POST vmaSetVirtualAllocationUserData( + VmaVirtualBlock VMA_NOT_NULL virtualBlock, + VmaVirtualAllocation VMA_NOT_NULL_NON_DISPATCHABLE allocation, + void* VMA_NULLABLE pUserData); + + /** \brief Calculates and returns statistics about virtual allocations and memory usage in given #VmaVirtualBlock. + + This function is fast to call. For more detailed statistics, see vmaCalculateVirtualBlockStatistics(). + */ + VMA_CALL_PRE void VMA_CALL_POST vmaGetVirtualBlockStatistics( + VmaVirtualBlock VMA_NOT_NULL virtualBlock, + VmaStatistics* VMA_NOT_NULL pStats); + + /** \brief Calculates and returns detailed statistics about virtual allocations and memory usage in given #VmaVirtualBlock. + + This function is slow to call. Use for debugging purposes. + For less detailed statistics, see vmaGetVirtualBlockStatistics(). + */ + VMA_CALL_PRE void VMA_CALL_POST vmaCalculateVirtualBlockStatistics( + VmaVirtualBlock VMA_NOT_NULL virtualBlock, + VmaDetailedStatistics* VMA_NOT_NULL pStats); + + /** @} */ #if VMA_STATS_STRING_ENABLED /** @@ -2567,31 +2721,31 @@ VMA_CALL_PRE void VMA_CALL_POST vmaCalculateVirtualBlockStatistics( Returned string must be freed using vmaFreeVirtualBlockStatsString(). */ -VMA_CALL_PRE void VMA_CALL_POST vmaBuildVirtualBlockStatsString( - VmaVirtualBlock VMA_NOT_NULL virtualBlock, - char* VMA_NULLABLE* VMA_NOT_NULL ppStatsString, - VkBool32 detailedMap); + VMA_CALL_PRE void VMA_CALL_POST vmaBuildVirtualBlockStatsString( + VmaVirtualBlock VMA_NOT_NULL virtualBlock, + char* VMA_NULLABLE* VMA_NOT_NULL ppStatsString, + VkBool32 detailedMap); -/// Frees a string returned by vmaBuildVirtualBlockStatsString(). -VMA_CALL_PRE void VMA_CALL_POST vmaFreeVirtualBlockStatsString( - VmaVirtualBlock VMA_NOT_NULL virtualBlock, - char* VMA_NULLABLE pStatsString); + /// Frees a string returned by vmaBuildVirtualBlockStatsString(). + VMA_CALL_PRE void VMA_CALL_POST vmaFreeVirtualBlockStatsString( + VmaVirtualBlock VMA_NOT_NULL virtualBlock, + char* VMA_NULLABLE pStatsString); -/** \brief Builds and returns statistics as a null-terminated string in JSON format. -\param allocator -\param[out] ppStatsString Must be freed using vmaFreeStatsString() function. -\param detailedMap -*/ -VMA_CALL_PRE void VMA_CALL_POST vmaBuildStatsString( - VmaAllocator VMA_NOT_NULL allocator, - char* VMA_NULLABLE* VMA_NOT_NULL ppStatsString, - VkBool32 detailedMap); + /** \brief Builds and returns statistics as a null-terminated string in JSON format. + \param allocator + \param[out] ppStatsString Must be freed using vmaFreeStatsString() function. + \param detailedMap + */ + VMA_CALL_PRE void VMA_CALL_POST vmaBuildStatsString( + VmaAllocator VMA_NOT_NULL allocator, + char* VMA_NULLABLE* VMA_NOT_NULL ppStatsString, + VkBool32 detailedMap); -VMA_CALL_PRE void VMA_CALL_POST vmaFreeStatsString( - VmaAllocator VMA_NOT_NULL allocator, - char* VMA_NULLABLE pStatsString); + VMA_CALL_PRE void VMA_CALL_POST vmaFreeStatsString( + VmaAllocator VMA_NOT_NULL allocator, + char* VMA_NULLABLE pStatsString); -/** @} */ + /** @} */ #endif // VMA_STATS_STRING_ENABLED @@ -2622,15 +2776,27 @@ VMA_CALL_PRE void VMA_CALL_POST vmaFreeStatsString( #include #include #include +#include #include #include -#include + +#if !defined(VMA_CPP20) +#if __cplusplus >= 202002L || _MSVC_LANG >= 202002L // C++20 +#define VMA_CPP20 1 +#else +#define VMA_CPP20 0 +#endif +#endif #ifdef _MSC_VER - #include // For functions like __popcnt, _BitScanForward etc. +#include // For functions like __popcnt, _BitScanForward etc. #endif -#if __cplusplus >= 202002L || _MSVC_LANG >= 202002L // C++20 - #include // For std::popcount +#if VMA_CPP20 +#include +#endif + +#if VMA_STATS_STRING_ENABLED +#include // For snprintf #endif /******************************************************************************* @@ -2645,84 +2811,120 @@ here if you need other then default behavior depending on your environment. Define this macro to 1 to make the library fetch pointers to Vulkan functions internally, like: - vulkanFunctions.vkAllocateMemory = &vkAllocateMemory; + vulkanFunctions.vkAllocateMemory = &vkAllocateMemory; */ #if !defined(VMA_STATIC_VULKAN_FUNCTIONS) && !defined(VK_NO_PROTOTYPES) - #define VMA_STATIC_VULKAN_FUNCTIONS 1 +#define VMA_STATIC_VULKAN_FUNCTIONS 1 #endif /* Define this macro to 1 to make the library fetch pointers to Vulkan functions internally, like: - vulkanFunctions.vkAllocateMemory = (PFN_vkAllocateMemory)vkGetDeviceProcAddr(device, "vkAllocateMemory"); + vulkanFunctions.vkAllocateMemory = (PFN_vkAllocateMemory)vkGetDeviceProcAddr(device, "vkAllocateMemory"); To use this feature in new versions of VMA you now have to pass VmaVulkanFunctions::vkGetInstanceProcAddr and vkGetDeviceProcAddr as VmaAllocatorCreateInfo::pVulkanFunctions. Other members can be null. */ #if !defined(VMA_DYNAMIC_VULKAN_FUNCTIONS) - #define VMA_DYNAMIC_VULKAN_FUNCTIONS 1 +#define VMA_DYNAMIC_VULKAN_FUNCTIONS 1 #endif #ifndef VMA_USE_STL_SHARED_MUTEX - // Compiler conforms to C++17. - #if __cplusplus >= 201703L - #define VMA_USE_STL_SHARED_MUTEX 1 - // Visual studio defines __cplusplus properly only when passed additional parameter: /Zc:__cplusplus - // Otherwise it is always 199711L, despite shared_mutex works since Visual Studio 2015 Update 2. - #elif defined(_MSC_FULL_VER) && _MSC_FULL_VER >= 190023918 && __cplusplus == 199711L && _MSVC_LANG >= 201703L - #define VMA_USE_STL_SHARED_MUTEX 1 - #else - #define VMA_USE_STL_SHARED_MUTEX 0 - #endif +#if __cplusplus >= 201703L || _MSVC_LANG >= 201703L // C++17 +#define VMA_USE_STL_SHARED_MUTEX 1 +// Visual studio defines __cplusplus properly only when passed additional parameter: /Zc:__cplusplus +// Otherwise it is always 199711L, despite shared_mutex works since Visual Studio 2015 Update 2. +#elif defined(_MSC_FULL_VER) && _MSC_FULL_VER >= 190023918 && __cplusplus == 199711L && _MSVC_LANG >= 201703L +#define VMA_USE_STL_SHARED_MUTEX 1 +#else +#define VMA_USE_STL_SHARED_MUTEX 0 +#endif #endif /* Define this macro to include custom header files without having to edit this file directly, e.g.: - // Inside of "my_vma_configuration_user_includes.h": + // Inside of "my_vma_configuration_user_includes.h": - #include "my_custom_assert.h" // for MY_CUSTOM_ASSERT - #include "my_custom_min.h" // for my_custom_min - #include - #include + #include "my_custom_assert.h" // for MY_CUSTOM_ASSERT + #include "my_custom_min.h" // for my_custom_min + #include + #include - // Inside a different file, which includes "vk_mem_alloc.h": + // Inside a different file, which includes "vk_mem_alloc.h": - #define VMA_CONFIGURATION_USER_INCLUDES_H "my_vma_configuration_user_includes.h" - #define VMA_ASSERT(expr) MY_CUSTOM_ASSERT(expr) - #define VMA_MIN(v1, v2) (my_custom_min(v1, v2)) - #include "vk_mem_alloc.h" - ... + #define VMA_CONFIGURATION_USER_INCLUDES_H "my_vma_configuration_user_includes.h" + #define VMA_ASSERT(expr) MY_CUSTOM_ASSERT(expr) + #define VMA_MIN(v1, v2) (my_custom_min(v1, v2)) + #include "vk_mem_alloc.h" + ... The following headers are used in this CONFIGURATION section only, so feel free to remove them if not needed. */ #if !defined(VMA_CONFIGURATION_USER_INCLUDES_H) - #include // for assert - #include // for min, max - #include +#include // for assert +#include // for min, max, swap +#include #else - #include VMA_CONFIGURATION_USER_INCLUDES_H +#include VMA_CONFIGURATION_USER_INCLUDES_H #endif #ifndef VMA_NULL - // Value used as null pointer. Define it to e.g.: nullptr, NULL, 0, (void*)0. - #define VMA_NULL nullptr +// Value used as null pointer. Define it to e.g.: nullptr, NULL, 0, (void*)0. +#define VMA_NULL nullptr #endif +#ifndef VMA_FALLTHROUGH +#if __cplusplus >= 201703L || _MSVC_LANG >= 201703L // C++17 +#define VMA_FALLTHROUGH [[fallthrough]] +#else +#define VMA_FALLTHROUGH +#endif +#endif + +// Normal assert to check for programmer's errors, especially in Debug configuration. +#ifndef VMA_ASSERT +#ifdef NDEBUG +#define VMA_ASSERT(expr) +#else +#define VMA_ASSERT(expr) assert(expr) +#endif +#endif + +// Assert that will be called very often, like inside data structures e.g. operator[]. +// Making it non-empty can make program slow. +#ifndef VMA_HEAVY_ASSERT +#ifdef NDEBUG +#define VMA_HEAVY_ASSERT(expr) +#else +#define VMA_HEAVY_ASSERT(expr) //VMA_ASSERT(expr) +#endif +#endif + +// Assert used for reporting memory leaks - unfreed allocations. +#ifndef VMA_ASSERT_LEAK +#define VMA_ASSERT_LEAK(expr) VMA_ASSERT(expr) +#endif + +// If your compiler is not compatible with C++17 and definition of +// aligned_alloc() function is missing, uncommenting following line may help: + +//#include + #if defined(__ANDROID_API__) && (__ANDROID_API__ < 16) #include static void* vma_aligned_alloc(size_t alignment, size_t size) { - // alignment must be >= sizeof(void*) - if(alignment < sizeof(void*)) - { - alignment = sizeof(void*); - } + // alignment must be >= sizeof(void*) + if (alignment < sizeof(void*)) + { + alignment = sizeof(void*); + } - return memalign(alignment, size); + return memalign(alignment, size); } #elif defined(__APPLE__) || defined(__ANDROID__) || (defined(__linux__) && defined(__GLIBCXX__) && !defined(_GLIBCXX_HAVE_ALIGNED_ALLOC)) #include @@ -2733,310 +2935,313 @@ static void* vma_aligned_alloc(size_t alignment, size_t size) static void* vma_aligned_alloc(size_t alignment, size_t size) { - // Unfortunately, aligned_alloc causes VMA to crash due to it returning null pointers. (At least under 11.4) - // Therefore, for now disable this specific exception until a proper solution is found. - //#if defined(__APPLE__) && (defined(MAC_OS_X_VERSION_10_16) || defined(__IPHONE_14_0)) - //#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_16 || __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_14_0 - // // For C++14, usr/include/malloc/_malloc.h declares aligned_alloc()) only - // // with the MacOSX11.0 SDK in Xcode 12 (which is what adds - // // MAC_OS_X_VERSION_10_16), even though the function is marked - // // available for 10.15. That is why the preprocessor checks for 10.16 but - // // the __builtin_available checks for 10.15. - // // People who use C++17 could call aligned_alloc with the 10.15 SDK already. - // if (__builtin_available(macOS 10.15, iOS 13, *)) - // return aligned_alloc(alignment, size); - //#endif - //#endif + // Unfortunately, aligned_alloc causes VMA to crash due to it returning null pointers. (At least under 11.4) + // Therefore, for now disable this specific exception until a proper solution is found. + //#if defined(__APPLE__) && (defined(MAC_OS_X_VERSION_10_16) || defined(__IPHONE_14_0)) + //#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_16 || __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_14_0 + // // For C++14, usr/include/malloc/_malloc.h declares aligned_alloc()) only + // // with the MacOSX11.0 SDK in Xcode 12 (which is what adds + // // MAC_OS_X_VERSION_10_16), even though the function is marked + // // available for 10.15. That is why the preprocessor checks for 10.16 but + // // the __builtin_available checks for 10.15. + // // People who use C++17 could call aligned_alloc with the 10.15 SDK already. + // if (__builtin_available(macOS 10.15, iOS 13, *)) + // return aligned_alloc(alignment, size); + //#endif + //#endif - // alignment must be >= sizeof(void*) - if(alignment < sizeof(void*)) - { - alignment = sizeof(void*); - } + // alignment must be >= sizeof(void*) + if (alignment < sizeof(void*)) + { + alignment = sizeof(void*); + } - void *pointer; - if(posix_memalign(&pointer, alignment, size) == 0) - return pointer; - return VMA_NULL; + void *pointer; + if (posix_memalign(&pointer, alignment, size) == 0) + return pointer; + return VMA_NULL; } #elif defined(_WIN32) static void* vma_aligned_alloc(size_t alignment, size_t size) { - return _aligned_malloc(size, alignment); + return _aligned_malloc(size, alignment); +} +#elif __cplusplus >= 201703L || _MSVC_LANG >= 201703L // C++17 +static void* vma_aligned_alloc(size_t alignment, size_t size) +{ + return aligned_alloc(alignment, size); } #else static void* vma_aligned_alloc(size_t alignment, size_t size) { - return aligned_alloc(alignment, size); + VMA_ASSERT(0 && "Could not implement aligned_alloc automatically. Please enable C++17 or later in your compiler or provide custom implementation of macro VMA_SYSTEM_ALIGNED_MALLOC (and VMA_SYSTEM_ALIGNED_FREE if needed) using the API of your system."); + return VMA_NULL; } #endif #if defined(_WIN32) static void vma_aligned_free(void* ptr) { - _aligned_free(ptr); + _aligned_free(ptr); } #else static void vma_aligned_free(void* VMA_NULLABLE ptr) { - free(ptr); + free(ptr); } #endif -// If your compiler is not compatible with C++11 and definition of -// aligned_alloc() function is missing, uncommeting following line may help: - -//#include - -// Normal assert to check for programmer's errors, especially in Debug configuration. -#ifndef VMA_ASSERT - #ifdef NDEBUG - #define VMA_ASSERT(expr) - #else - #define VMA_ASSERT(expr) assert(expr) - #endif -#endif - -// Assert that will be called very often, like inside data structures e.g. operator[]. -// Making it non-empty can make program slow. -#ifndef VMA_HEAVY_ASSERT - #ifdef NDEBUG - #define VMA_HEAVY_ASSERT(expr) - #else - #define VMA_HEAVY_ASSERT(expr) //VMA_ASSERT(expr) - #endif -#endif - #ifndef VMA_ALIGN_OF - #define VMA_ALIGN_OF(type) (__alignof(type)) +#define VMA_ALIGN_OF(type) (alignof(type)) #endif #ifndef VMA_SYSTEM_ALIGNED_MALLOC - #define VMA_SYSTEM_ALIGNED_MALLOC(size, alignment) vma_aligned_alloc((alignment), (size)) +#define VMA_SYSTEM_ALIGNED_MALLOC(size, alignment) vma_aligned_alloc((alignment), (size)) #endif #ifndef VMA_SYSTEM_ALIGNED_FREE - // VMA_SYSTEM_FREE is the old name, but might have been defined by the user - #if defined(VMA_SYSTEM_FREE) - #define VMA_SYSTEM_ALIGNED_FREE(ptr) VMA_SYSTEM_FREE(ptr) - #else - #define VMA_SYSTEM_ALIGNED_FREE(ptr) vma_aligned_free(ptr) - #endif +// VMA_SYSTEM_FREE is the old name, but might have been defined by the user +#if defined(VMA_SYSTEM_FREE) +#define VMA_SYSTEM_ALIGNED_FREE(ptr) VMA_SYSTEM_FREE(ptr) +#else +#define VMA_SYSTEM_ALIGNED_FREE(ptr) vma_aligned_free(ptr) +#endif #endif #ifndef VMA_COUNT_BITS_SET - // Returns number of bits set to 1 in (v) - #define VMA_COUNT_BITS_SET(v) VmaCountBitsSet(v) + // Returns number of bits set to 1 in (v) +#define VMA_COUNT_BITS_SET(v) VmaCountBitsSet(v) #endif #ifndef VMA_BITSCAN_LSB - // Scans integer for index of first nonzero value from the Least Significant Bit (LSB). If mask is 0 then returns UINT8_MAX - #define VMA_BITSCAN_LSB(mask) VmaBitScanLSB(mask) + // Scans integer for index of first nonzero value from the Least Significant Bit (LSB). If mask is 0 then returns UINT8_MAX +#define VMA_BITSCAN_LSB(mask) VmaBitScanLSB(mask) #endif #ifndef VMA_BITSCAN_MSB - // Scans integer for index of first nonzero value from the Most Significant Bit (MSB). If mask is 0 then returns UINT8_MAX - #define VMA_BITSCAN_MSB(mask) VmaBitScanMSB(mask) + // Scans integer for index of first nonzero value from the Most Significant Bit (MSB). If mask is 0 then returns UINT8_MAX +#define VMA_BITSCAN_MSB(mask) VmaBitScanMSB(mask) #endif #ifndef VMA_MIN - #define VMA_MIN(v1, v2) ((std::min)((v1), (v2))) +#define VMA_MIN(v1, v2) ((std::min)((v1), (v2))) #endif #ifndef VMA_MAX - #define VMA_MAX(v1, v2) ((std::max)((v1), (v2))) -#endif - -#ifndef VMA_SWAP - #define VMA_SWAP(v1, v2) std::swap((v1), (v2)) +#define VMA_MAX(v1, v2) ((std::max)((v1), (v2))) #endif #ifndef VMA_SORT - #define VMA_SORT(beg, end, cmp) std::sort(beg, end, cmp) +#define VMA_SORT(beg, end, cmp) std::sort(beg, end, cmp) +#endif + +#ifndef VMA_DEBUG_LOG_FORMAT +#define VMA_DEBUG_LOG_FORMAT(format, ...) +/* +#define VMA_DEBUG_LOG_FORMAT(format, ...) do { \ + printf((format), __VA_ARGS__); \ + printf("\n"); \ +} while(false) +*/ #endif #ifndef VMA_DEBUG_LOG - #define VMA_DEBUG_LOG(format, ...) - /* - #define VMA_DEBUG_LOG(format, ...) do { \ - printf(format, __VA_ARGS__); \ - printf("\n"); \ - } while(false) - */ +#define VMA_DEBUG_LOG(str) VMA_DEBUG_LOG_FORMAT("%s", (str)) +#endif + +#ifndef VMA_LEAK_LOG_FORMAT +#define VMA_LEAK_LOG_FORMAT(format, ...) VMA_DEBUG_LOG_FORMAT(format, __VA_ARGS__) +#endif + +#ifndef VMA_CLASS_NO_COPY +#define VMA_CLASS_NO_COPY(className) \ + private: \ + className(const className&) = delete; \ + className& operator=(const className&) = delete; +#endif +#ifndef VMA_CLASS_NO_COPY_NO_MOVE +#define VMA_CLASS_NO_COPY_NO_MOVE(className) \ + private: \ + className(const className&) = delete; \ + className(className&&) = delete; \ + className& operator=(const className&) = delete; \ + className& operator=(className&&) = delete; #endif // Define this macro to 1 to enable functions: vmaBuildStatsString, vmaFreeStatsString. #if VMA_STATS_STRING_ENABLED - static inline void VmaUint32ToStr(char* VMA_NOT_NULL outStr, size_t strLen, uint32_t num) - { - snprintf(outStr, strLen, "%u", static_cast(num)); - } - static inline void VmaUint64ToStr(char* VMA_NOT_NULL outStr, size_t strLen, uint64_t num) - { - snprintf(outStr, strLen, "%llu", static_cast(num)); - } - static inline void VmaPtrToStr(char* VMA_NOT_NULL outStr, size_t strLen, const void* ptr) - { - snprintf(outStr, strLen, "%p", ptr); - } +static inline void VmaUint32ToStr(char* VMA_NOT_NULL outStr, size_t strLen, uint32_t num) +{ + snprintf(outStr, strLen, "%" PRIu32, num); +} +static inline void VmaUint64ToStr(char* VMA_NOT_NULL outStr, size_t strLen, uint64_t num) +{ + snprintf(outStr, strLen, "%" PRIu64, num); +} +static inline void VmaPtrToStr(char* VMA_NOT_NULL outStr, size_t strLen, const void* ptr) +{ + snprintf(outStr, strLen, "%p", ptr); +} #endif #ifndef VMA_MUTEX - class VmaMutex - { - public: - void Lock() { m_Mutex.lock(); } - void Unlock() { m_Mutex.unlock(); } - bool TryLock() { return m_Mutex.try_lock(); } - private: - std::mutex m_Mutex; - }; - #define VMA_MUTEX VmaMutex +class VmaMutex +{ + VMA_CLASS_NO_COPY_NO_MOVE(VmaMutex) +public: + VmaMutex() { } + void Lock() { m_Mutex.lock(); } + void Unlock() { m_Mutex.unlock(); } + bool TryLock() { return m_Mutex.try_lock(); } +private: + std::mutex m_Mutex; +}; +#define VMA_MUTEX VmaMutex #endif // Read-write mutex, where "read" is shared access, "write" is exclusive access. #ifndef VMA_RW_MUTEX - #if VMA_USE_STL_SHARED_MUTEX - // Use std::shared_mutex from C++17. - #include - class VmaRWMutex - { - public: - void LockRead() { m_Mutex.lock_shared(); } - void UnlockRead() { m_Mutex.unlock_shared(); } - bool TryLockRead() { return m_Mutex.try_lock_shared(); } - void LockWrite() { m_Mutex.lock(); } - void UnlockWrite() { m_Mutex.unlock(); } - bool TryLockWrite() { return m_Mutex.try_lock(); } - private: - std::shared_mutex m_Mutex; - }; - #define VMA_RW_MUTEX VmaRWMutex - #elif defined(_WIN32) && defined(WINVER) && WINVER >= 0x0600 - // Use SRWLOCK from WinAPI. - // Minimum supported client = Windows Vista, server = Windows Server 2008. - class VmaRWMutex - { - public: - VmaRWMutex() { InitializeSRWLock(&m_Lock); } - void LockRead() { AcquireSRWLockShared(&m_Lock); } - void UnlockRead() { ReleaseSRWLockShared(&m_Lock); } - bool TryLockRead() { return TryAcquireSRWLockShared(&m_Lock) != FALSE; } - void LockWrite() { AcquireSRWLockExclusive(&m_Lock); } - void UnlockWrite() { ReleaseSRWLockExclusive(&m_Lock); } - bool TryLockWrite() { return TryAcquireSRWLockExclusive(&m_Lock) != FALSE; } - private: - SRWLOCK m_Lock; - }; - #define VMA_RW_MUTEX VmaRWMutex - #else - // Less efficient fallback: Use normal mutex. - class VmaRWMutex - { - public: - void LockRead() { m_Mutex.Lock(); } - void UnlockRead() { m_Mutex.Unlock(); } - bool TryLockRead() { return m_Mutex.TryLock(); } - void LockWrite() { m_Mutex.Lock(); } - void UnlockWrite() { m_Mutex.Unlock(); } - bool TryLockWrite() { return m_Mutex.TryLock(); } - private: - VMA_MUTEX m_Mutex; - }; - #define VMA_RW_MUTEX VmaRWMutex - #endif // #if VMA_USE_STL_SHARED_MUTEX +#if VMA_USE_STL_SHARED_MUTEX + // Use std::shared_mutex from C++17. +#include +class VmaRWMutex +{ +public: + void LockRead() { m_Mutex.lock_shared(); } + void UnlockRead() { m_Mutex.unlock_shared(); } + bool TryLockRead() { return m_Mutex.try_lock_shared(); } + void LockWrite() { m_Mutex.lock(); } + void UnlockWrite() { m_Mutex.unlock(); } + bool TryLockWrite() { return m_Mutex.try_lock(); } +private: + std::shared_mutex m_Mutex; +}; +#define VMA_RW_MUTEX VmaRWMutex +#elif defined(_WIN32) && defined(WINVER) && WINVER >= 0x0600 + // Use SRWLOCK from WinAPI. + // Minimum supported client = Windows Vista, server = Windows Server 2008. +class VmaRWMutex +{ +public: + VmaRWMutex() { InitializeSRWLock(&m_Lock); } + void LockRead() { AcquireSRWLockShared(&m_Lock); } + void UnlockRead() { ReleaseSRWLockShared(&m_Lock); } + bool TryLockRead() { return TryAcquireSRWLockShared(&m_Lock) != FALSE; } + void LockWrite() { AcquireSRWLockExclusive(&m_Lock); } + void UnlockWrite() { ReleaseSRWLockExclusive(&m_Lock); } + bool TryLockWrite() { return TryAcquireSRWLockExclusive(&m_Lock) != FALSE; } +private: + SRWLOCK m_Lock; +}; +#define VMA_RW_MUTEX VmaRWMutex +#else + // Less efficient fallback: Use normal mutex. +class VmaRWMutex +{ +public: + void LockRead() { m_Mutex.Lock(); } + void UnlockRead() { m_Mutex.Unlock(); } + bool TryLockRead() { return m_Mutex.TryLock(); } + void LockWrite() { m_Mutex.Lock(); } + void UnlockWrite() { m_Mutex.Unlock(); } + bool TryLockWrite() { return m_Mutex.TryLock(); } +private: + VMA_MUTEX m_Mutex; +}; +#define VMA_RW_MUTEX VmaRWMutex +#endif // #if VMA_USE_STL_SHARED_MUTEX #endif // #ifndef VMA_RW_MUTEX /* If providing your own implementation, you need to implement a subset of std::atomic. */ #ifndef VMA_ATOMIC_UINT32 - #include - #define VMA_ATOMIC_UINT32 std::atomic +#include +#define VMA_ATOMIC_UINT32 std::atomic #endif #ifndef VMA_ATOMIC_UINT64 - #include - #define VMA_ATOMIC_UINT64 std::atomic +#include +#define VMA_ATOMIC_UINT64 std::atomic #endif #ifndef VMA_DEBUG_ALWAYS_DEDICATED_MEMORY - /** - Every allocation will have its own memory block. - Define to 1 for debugging purposes only. - */ - #define VMA_DEBUG_ALWAYS_DEDICATED_MEMORY (0) +/** +Every allocation will have its own memory block. +Define to 1 for debugging purposes only. +*/ +#define VMA_DEBUG_ALWAYS_DEDICATED_MEMORY (0) #endif #ifndef VMA_MIN_ALIGNMENT - /** - Minimum alignment of all allocations, in bytes. - Set to more than 1 for debugging purposes. Must be power of two. - */ - #ifdef VMA_DEBUG_ALIGNMENT // Old name - #define VMA_MIN_ALIGNMENT VMA_DEBUG_ALIGNMENT - #else - #define VMA_MIN_ALIGNMENT (1) - #endif +/** +Minimum alignment of all allocations, in bytes. +Set to more than 1 for debugging purposes. Must be power of two. +*/ +#ifdef VMA_DEBUG_ALIGNMENT // Old name +#define VMA_MIN_ALIGNMENT VMA_DEBUG_ALIGNMENT +#else +#define VMA_MIN_ALIGNMENT (1) +#endif #endif #ifndef VMA_DEBUG_MARGIN - /** - Minimum margin after every allocation, in bytes. - Set nonzero for debugging purposes only. - */ - #define VMA_DEBUG_MARGIN (0) +/** +Minimum margin after every allocation, in bytes. +Set nonzero for debugging purposes only. +*/ +#define VMA_DEBUG_MARGIN (0) #endif #ifndef VMA_DEBUG_INITIALIZE_ALLOCATIONS - /** - Define this macro to 1 to automatically fill new allocations and destroyed - allocations with some bit pattern. - */ - #define VMA_DEBUG_INITIALIZE_ALLOCATIONS (0) +/** +Define this macro to 1 to automatically fill new allocations and destroyed +allocations with some bit pattern. +*/ +#define VMA_DEBUG_INITIALIZE_ALLOCATIONS (0) #endif #ifndef VMA_DEBUG_DETECT_CORRUPTION - /** - Define this macro to 1 together with non-zero value of VMA_DEBUG_MARGIN to - enable writing magic value to the margin after every allocation and - validating it, so that memory corruptions (out-of-bounds writes) are detected. - */ - #define VMA_DEBUG_DETECT_CORRUPTION (0) +/** +Define this macro to 1 together with non-zero value of VMA_DEBUG_MARGIN to +enable writing magic value to the margin after every allocation and +validating it, so that memory corruptions (out-of-bounds writes) are detected. +*/ +#define VMA_DEBUG_DETECT_CORRUPTION (0) #endif #ifndef VMA_DEBUG_GLOBAL_MUTEX - /** - Set this to 1 for debugging purposes only, to enable single mutex protecting all - entry calls to the library. Can be useful for debugging multithreading issues. - */ - #define VMA_DEBUG_GLOBAL_MUTEX (0) +/** +Set this to 1 for debugging purposes only, to enable single mutex protecting all +entry calls to the library. Can be useful for debugging multithreading issues. +*/ +#define VMA_DEBUG_GLOBAL_MUTEX (0) #endif #ifndef VMA_DEBUG_MIN_BUFFER_IMAGE_GRANULARITY - /** - Minimum value for VkPhysicalDeviceLimits::bufferImageGranularity. - Set to more than 1 for debugging purposes only. Must be power of two. - */ - #define VMA_DEBUG_MIN_BUFFER_IMAGE_GRANULARITY (1) +/** +Minimum value for VkPhysicalDeviceLimits::bufferImageGranularity. +Set to more than 1 for debugging purposes only. Must be power of two. +*/ +#define VMA_DEBUG_MIN_BUFFER_IMAGE_GRANULARITY (1) #endif #ifndef VMA_DEBUG_DONT_EXCEED_MAX_MEMORY_ALLOCATION_COUNT - /* - Set this to 1 to make VMA never exceed VkPhysicalDeviceLimits::maxMemoryAllocationCount - and return error instead of leaving up to Vulkan implementation what to do in such cases. - */ - #define VMA_DEBUG_DONT_EXCEED_MAX_MEMORY_ALLOCATION_COUNT (0) +/* +Set this to 1 to make VMA never exceed VkPhysicalDeviceLimits::maxMemoryAllocationCount +and return error instead of leaving up to Vulkan implementation what to do in such cases. +*/ +#define VMA_DEBUG_DONT_EXCEED_MAX_MEMORY_ALLOCATION_COUNT (0) #endif #ifndef VMA_SMALL_HEAP_MAX_SIZE - /// Maximum size of a memory heap in Vulkan to consider it "small". - #define VMA_SMALL_HEAP_MAX_SIZE (1024ull * 1024 * 1024) +/// Maximum size of a memory heap in Vulkan to consider it "small". +#define VMA_SMALL_HEAP_MAX_SIZE (1024ull * 1024 * 1024) #endif #ifndef VMA_DEFAULT_LARGE_HEAP_BLOCK_SIZE /// Default size of a block allocated as single VkDeviceMemory from a "large" heap. - #define VMA_DEFAULT_LARGE_HEAP_BLOCK_SIZE (256ull * 1024 * 1024) +#define VMA_DEFAULT_LARGE_HEAP_BLOCK_SIZE (256ull * 1024 * 1024) #endif /* @@ -3044,17 +3249,10 @@ Mapping hysteresis is a logic that launches when vmaMapMemory/vmaUnmapMemory is or a persistently mapped allocation is created and destroyed several times in a row. It keeps additional +1 mapping of a device memory block to prevent calling actual vkMapMemory/vkUnmapMemory too many times, which may improve performance and help -tools like RenderDOc. +tools like RenderDoc. */ #ifndef VMA_MAPPING_HYSTERESIS_ENABLED - #define VMA_MAPPING_HYSTERESIS_ENABLED 1 -#endif - -#ifndef VMA_CLASS_NO_COPY - #define VMA_CLASS_NO_COPY(className) \ - private: \ - className(const className&) = delete; \ - className& operator=(const className&) = delete; +#define VMA_MAPPING_HYSTERESIS_ENABLED 1 #endif #define VMA_VALIDATE(cond) do { if(!(cond)) { \ @@ -3093,46 +3291,46 @@ static const uint32_t VMA_VENDOR_ID_AMD = 4098; // Correspond to values of enum VmaSuballocationType. static const char* VMA_SUBALLOCATION_TYPE_NAMES[] = { - "FREE", - "UNKNOWN", - "BUFFER", - "IMAGE_UNKNOWN", - "IMAGE_LINEAR", - "IMAGE_OPTIMAL", + "FREE", + "UNKNOWN", + "BUFFER", + "IMAGE_UNKNOWN", + "IMAGE_LINEAR", + "IMAGE_OPTIMAL", }; #endif static VkAllocationCallbacks VmaEmptyAllocationCallbacks = - { VMA_NULL, VMA_NULL, VMA_NULL, VMA_NULL, VMA_NULL, VMA_NULL }; +{ VMA_NULL, VMA_NULL, VMA_NULL, VMA_NULL, VMA_NULL, VMA_NULL }; #ifndef _VMA_ENUM_DECLARATIONS enum VmaSuballocationType { - VMA_SUBALLOCATION_TYPE_FREE = 0, - VMA_SUBALLOCATION_TYPE_UNKNOWN = 1, - VMA_SUBALLOCATION_TYPE_BUFFER = 2, - VMA_SUBALLOCATION_TYPE_IMAGE_UNKNOWN = 3, - VMA_SUBALLOCATION_TYPE_IMAGE_LINEAR = 4, - VMA_SUBALLOCATION_TYPE_IMAGE_OPTIMAL = 5, - VMA_SUBALLOCATION_TYPE_MAX_ENUM = 0x7FFFFFFF + VMA_SUBALLOCATION_TYPE_FREE = 0, + VMA_SUBALLOCATION_TYPE_UNKNOWN = 1, + VMA_SUBALLOCATION_TYPE_BUFFER = 2, + VMA_SUBALLOCATION_TYPE_IMAGE_UNKNOWN = 3, + VMA_SUBALLOCATION_TYPE_IMAGE_LINEAR = 4, + VMA_SUBALLOCATION_TYPE_IMAGE_OPTIMAL = 5, + VMA_SUBALLOCATION_TYPE_MAX_ENUM = 0x7FFFFFFF }; enum VMA_CACHE_OPERATION { - VMA_CACHE_FLUSH, - VMA_CACHE_INVALIDATE + VMA_CACHE_FLUSH, + VMA_CACHE_INVALIDATE }; enum class VmaAllocationRequestType { - Normal, - TLSF, - // Used by "Linear" algorithm. - UpperAddress, - EndOf1st, - EndOf2nd, + Normal, + TLSF, + // Used by "Linear" algorithm. + UpperAddress, + EndOf1st, + EndOf2nd, }; #endif // _VMA_ENUM_DECLARATIONS @@ -3172,17 +3370,6 @@ class VmaList; template class VmaIntrusiveLinkedList; -// Unused in this version -#if 0 -template -struct VmaPair; -template -struct VmaPairFirstLess; - -template -class VmaMap; -#endif - #if VMA_STATS_STRING_ENABLED class VmaStringBuilder; class VmaJsonWriter; @@ -3225,113 +3412,127 @@ Returns number of bits set to 1 in (v). On specific platforms and compilers you can use instrinsics like: Visual Studio: - return __popcnt(v); + return __popcnt(v); GCC, Clang: - return static_cast(__builtin_popcount(v)); + return static_cast(__builtin_popcount(v)); Define macro VMA_COUNT_BITS_SET to provide your optimized implementation. But you need to check in runtime whether user's CPU supports these, as some old processors don't. */ static inline uint32_t VmaCountBitsSet(uint32_t v) { -#if __cplusplus >= 202002L || _MSVC_LANG >= 202002L // C++20 - return std::popcount(v); +#if VMA_CPP20 + return std::popcount(v); #else - uint32_t c = v - ((v >> 1) & 0x55555555); - c = ((c >> 2) & 0x33333333) + (c & 0x33333333); - c = ((c >> 4) + c) & 0x0F0F0F0F; - c = ((c >> 8) + c) & 0x00FF00FF; - c = ((c >> 16) + c) & 0x0000FFFF; - return c; + uint32_t c = v - ((v >> 1) & 0x55555555); + c = ((c >> 2) & 0x33333333) + (c & 0x33333333); + c = ((c >> 4) + c) & 0x0F0F0F0F; + c = ((c >> 8) + c) & 0x00FF00FF; + c = ((c >> 16) + c) & 0x0000FFFF; + return c; #endif } static inline uint8_t VmaBitScanLSB(uint64_t mask) { #if defined(_MSC_VER) && defined(_WIN64) - unsigned long pos; - if (_BitScanForward64(&pos, mask)) - return static_cast(pos); - return UINT8_MAX; + unsigned long pos; + if (_BitScanForward64(&pos, mask)) + return static_cast(pos); + return UINT8_MAX; +#elif VMA_CPP20 + if (mask) + return static_cast(std::countr_zero(mask)); + return UINT8_MAX; #elif defined __GNUC__ || defined __clang__ - return static_cast(__builtin_ffsll(mask)) - 1U; + return static_cast(__builtin_ffsll(mask)) - 1U; #else - uint8_t pos = 0; - uint64_t bit = 1; - do - { - if (mask & bit) - return pos; - bit <<= 1; - } while (pos++ < 63); - return UINT8_MAX; + uint8_t pos = 0; + uint64_t bit = 1; + do + { + if (mask & bit) + return pos; + bit <<= 1; + } while (pos++ < 63); + return UINT8_MAX; #endif } static inline uint8_t VmaBitScanLSB(uint32_t mask) { #ifdef _MSC_VER - unsigned long pos; - if (_BitScanForward(&pos, mask)) - return static_cast(pos); - return UINT8_MAX; + unsigned long pos; + if (_BitScanForward(&pos, mask)) + return static_cast(pos); + return UINT8_MAX; +#elif VMA_CPP20 + if (mask) + return static_cast(std::countr_zero(mask)); + return UINT8_MAX; #elif defined __GNUC__ || defined __clang__ - return static_cast(__builtin_ffs(mask)) - 1U; + return static_cast(__builtin_ffs(mask)) - 1U; #else - uint8_t pos = 0; - uint32_t bit = 1; - do - { - if (mask & bit) - return pos; - bit <<= 1; - } while (pos++ < 31); - return UINT8_MAX; + uint8_t pos = 0; + uint32_t bit = 1; + do + { + if (mask & bit) + return pos; + bit <<= 1; + } while (pos++ < 31); + return UINT8_MAX; #endif } static inline uint8_t VmaBitScanMSB(uint64_t mask) { #if defined(_MSC_VER) && defined(_WIN64) - unsigned long pos; - if (_BitScanReverse64(&pos, mask)) - return static_cast(pos); + unsigned long pos; + if (_BitScanReverse64(&pos, mask)) + return static_cast(pos); +#elif VMA_CPP20 + if (mask) + return 63 - static_cast(std::countl_zero(mask)); #elif defined __GNUC__ || defined __clang__ - if (mask) - return 63 - static_cast(__builtin_clzll(mask)); + if (mask) + return 63 - static_cast(__builtin_clzll(mask)); #else - uint8_t pos = 63; - uint64_t bit = 1ULL << 63; - do - { - if (mask & bit) - return pos; - bit >>= 1; - } while (pos-- > 0); + uint8_t pos = 63; + uint64_t bit = 1ULL << 63; + do + { + if (mask & bit) + return pos; + bit >>= 1; + } while (pos-- > 0); #endif - return UINT8_MAX; + return UINT8_MAX; } static inline uint8_t VmaBitScanMSB(uint32_t mask) { #ifdef _MSC_VER - unsigned long pos; - if (_BitScanReverse(&pos, mask)) - return static_cast(pos); + unsigned long pos; + if (_BitScanReverse(&pos, mask)) + return static_cast(pos); +#elif VMA_CPP20 + if (mask) + return 31 - static_cast(std::countl_zero(mask)); #elif defined __GNUC__ || defined __clang__ - if (mask) - return 31 - static_cast(__builtin_clz(mask)); + if (mask) + return 31 - static_cast(__builtin_clz(mask)); #else - uint8_t pos = 31; - uint32_t bit = 1UL << 31; - do - { - if (mask & bit) - return pos; - bit >>= 1; - } while (pos-- > 0); + uint8_t pos = 31; + uint32_t bit = 1UL << 31; + do + { + if (mask & bit) + return pos; + bit >>= 1; + } while (pos-- > 0); #endif - return UINT8_MAX; + return UINT8_MAX; } /* @@ -3342,7 +3543,7 @@ For 0 returns true. template inline bool VmaIsPow2(T x) { - return (x & (x - 1)) == 0; + return (x & (x - 1)) == 0; } // Aligns given value up to nearest multiply of align value. For example: VmaAlignUp(11, 8) = 16. @@ -3350,86 +3551,86 @@ inline bool VmaIsPow2(T x) template static inline T VmaAlignUp(T val, T alignment) { - VMA_HEAVY_ASSERT(VmaIsPow2(alignment)); - return (val + alignment - 1) & ~(alignment - 1); + VMA_HEAVY_ASSERT(VmaIsPow2(alignment)); + return (val + alignment - 1) & ~(alignment - 1); } -// Aligns given value down to nearest multiply of align value. For example: VmaAlignUp(11, 8) = 8. +// Aligns given value down to nearest multiply of align value. For example: VmaAlignDown(11, 8) = 8. // Use types like uint32_t, uint64_t as T. template static inline T VmaAlignDown(T val, T alignment) { - VMA_HEAVY_ASSERT(VmaIsPow2(alignment)); - return val & ~(alignment - 1); + VMA_HEAVY_ASSERT(VmaIsPow2(alignment)); + return val & ~(alignment - 1); } // Division with mathematical rounding to nearest number. template static inline T VmaRoundDiv(T x, T y) { - return (x + (y / (T)2)) / y; + return (x + (y / (T)2)) / y; } // Divide by 'y' and round up to nearest integer. template static inline T VmaDivideRoundingUp(T x, T y) { - return (x + y - (T)1) / y; + return (x + y - (T)1) / y; } // Returns smallest power of 2 greater or equal to v. static inline uint32_t VmaNextPow2(uint32_t v) { - v--; - v |= v >> 1; - v |= v >> 2; - v |= v >> 4; - v |= v >> 8; - v |= v >> 16; - v++; - return v; + v--; + v |= v >> 1; + v |= v >> 2; + v |= v >> 4; + v |= v >> 8; + v |= v >> 16; + v++; + return v; } static inline uint64_t VmaNextPow2(uint64_t v) { - v--; - v |= v >> 1; - v |= v >> 2; - v |= v >> 4; - v |= v >> 8; - v |= v >> 16; - v |= v >> 32; - v++; - return v; + v--; + v |= v >> 1; + v |= v >> 2; + v |= v >> 4; + v |= v >> 8; + v |= v >> 16; + v |= v >> 32; + v++; + return v; } // Returns largest power of 2 less or equal to v. static inline uint32_t VmaPrevPow2(uint32_t v) { - v |= v >> 1; - v |= v >> 2; - v |= v >> 4; - v |= v >> 8; - v |= v >> 16; - v = v ^ (v >> 1); - return v; + v |= v >> 1; + v |= v >> 2; + v |= v >> 4; + v |= v >> 8; + v |= v >> 16; + v = v ^ (v >> 1); + return v; } static inline uint64_t VmaPrevPow2(uint64_t v) { - v |= v >> 1; - v |= v >> 2; - v |= v >> 4; - v |= v >> 8; - v |= v >> 16; - v |= v >> 32; - v = v ^ (v >> 1); - return v; + v |= v >> 1; + v |= v >> 2; + v |= v >> 4; + v |= v >> 8; + v |= v >> 16; + v |= v >> 32; + v = v ^ (v >> 1); + return v; } static inline bool VmaStrIsEmpty(const char* pStr) { - return pStr == VMA_NULL || *pStr == '\0'; + return pStr == VMA_NULL || *pStr == '\0'; } /* @@ -3440,17 +3641,17 @@ Algorithm is based on "Vulkan 1.0.39 - A Specification (with all registered Vulk chapter 11.6 "Resource Memory Association", paragraph "Buffer-Image Granularity". */ static inline bool VmaBlocksOnSamePage( - VkDeviceSize resourceAOffset, - VkDeviceSize resourceASize, - VkDeviceSize resourceBOffset, - VkDeviceSize pageSize) + VkDeviceSize resourceAOffset, + VkDeviceSize resourceASize, + VkDeviceSize resourceBOffset, + VkDeviceSize pageSize) { - VMA_ASSERT(resourceAOffset + resourceASize <= resourceBOffset && resourceASize > 0 && pageSize > 0); - VkDeviceSize resourceAEnd = resourceAOffset + resourceASize - 1; - VkDeviceSize resourceAEndPage = resourceAEnd & ~(pageSize - 1); - VkDeviceSize resourceBStart = resourceBOffset; - VkDeviceSize resourceBStartPage = resourceBStart & ~(pageSize - 1); - return resourceAEndPage == resourceBStartPage; + VMA_ASSERT(resourceAOffset + resourceASize <= resourceBOffset && resourceASize > 0 && pageSize > 0); + VkDeviceSize resourceAEnd = resourceAOffset + resourceASize - 1; + VkDeviceSize resourceAEndPage = resourceAEnd & ~(pageSize - 1); + VkDeviceSize resourceBStart = resourceBOffset; + VkDeviceSize resourceBStartPage = resourceBStart & ~(pageSize - 1); + return resourceAEndPage == resourceBStartPage; } /* @@ -3460,68 +3661,68 @@ or linear image and another one is optimal image. If type is unknown, behave conservatively. */ static inline bool VmaIsBufferImageGranularityConflict( - VmaSuballocationType suballocType1, - VmaSuballocationType suballocType2) + VmaSuballocationType suballocType1, + VmaSuballocationType suballocType2) { - if (suballocType1 > suballocType2) - { - VMA_SWAP(suballocType1, suballocType2); - } + if (suballocType1 > suballocType2) + { + std::swap(suballocType1, suballocType2); + } - switch (suballocType1) - { - case VMA_SUBALLOCATION_TYPE_FREE: - return false; - case VMA_SUBALLOCATION_TYPE_UNKNOWN: - return true; - case VMA_SUBALLOCATION_TYPE_BUFFER: - return - suballocType2 == VMA_SUBALLOCATION_TYPE_IMAGE_UNKNOWN || - suballocType2 == VMA_SUBALLOCATION_TYPE_IMAGE_OPTIMAL; - case VMA_SUBALLOCATION_TYPE_IMAGE_UNKNOWN: - return - suballocType2 == VMA_SUBALLOCATION_TYPE_IMAGE_UNKNOWN || - suballocType2 == VMA_SUBALLOCATION_TYPE_IMAGE_LINEAR || - suballocType2 == VMA_SUBALLOCATION_TYPE_IMAGE_OPTIMAL; - case VMA_SUBALLOCATION_TYPE_IMAGE_LINEAR: - return - suballocType2 == VMA_SUBALLOCATION_TYPE_IMAGE_OPTIMAL; - case VMA_SUBALLOCATION_TYPE_IMAGE_OPTIMAL: - return false; - default: - VMA_ASSERT(0); - return true; - } + switch (suballocType1) + { + case VMA_SUBALLOCATION_TYPE_FREE: + return false; + case VMA_SUBALLOCATION_TYPE_UNKNOWN: + return true; + case VMA_SUBALLOCATION_TYPE_BUFFER: + return + suballocType2 == VMA_SUBALLOCATION_TYPE_IMAGE_UNKNOWN || + suballocType2 == VMA_SUBALLOCATION_TYPE_IMAGE_OPTIMAL; + case VMA_SUBALLOCATION_TYPE_IMAGE_UNKNOWN: + return + suballocType2 == VMA_SUBALLOCATION_TYPE_IMAGE_UNKNOWN || + suballocType2 == VMA_SUBALLOCATION_TYPE_IMAGE_LINEAR || + suballocType2 == VMA_SUBALLOCATION_TYPE_IMAGE_OPTIMAL; + case VMA_SUBALLOCATION_TYPE_IMAGE_LINEAR: + return + suballocType2 == VMA_SUBALLOCATION_TYPE_IMAGE_OPTIMAL; + case VMA_SUBALLOCATION_TYPE_IMAGE_OPTIMAL: + return false; + default: + VMA_ASSERT(0); + return true; + } } static void VmaWriteMagicValue(void* pData, VkDeviceSize offset) { #if VMA_DEBUG_MARGIN > 0 && VMA_DEBUG_DETECT_CORRUPTION - uint32_t* pDst = (uint32_t*)((char*)pData + offset); - const size_t numberCount = VMA_DEBUG_MARGIN / sizeof(uint32_t); - for (size_t i = 0; i < numberCount; ++i, ++pDst) - { - *pDst = VMA_CORRUPTION_DETECTION_MAGIC_VALUE; - } + uint32_t* pDst = (uint32_t*)((char*)pData + offset); + const size_t numberCount = VMA_DEBUG_MARGIN / sizeof(uint32_t); + for (size_t i = 0; i < numberCount; ++i, ++pDst) + { + *pDst = VMA_CORRUPTION_DETECTION_MAGIC_VALUE; + } #else - // no-op + // no-op #endif } static bool VmaValidateMagicValue(const void* pData, VkDeviceSize offset) { #if VMA_DEBUG_MARGIN > 0 && VMA_DEBUG_DETECT_CORRUPTION - const uint32_t* pSrc = (const uint32_t*)((const char*)pData + offset); - const size_t numberCount = VMA_DEBUG_MARGIN / sizeof(uint32_t); - for (size_t i = 0; i < numberCount; ++i, ++pSrc) - { - if (*pSrc != VMA_CORRUPTION_DETECTION_MAGIC_VALUE) - { - return false; - } - } + const uint32_t* pSrc = (const uint32_t*)((const char*)pData + offset); + const size_t numberCount = VMA_DEBUG_MARGIN / sizeof(uint32_t); + for (size_t i = 0; i < numberCount; ++i, ++pSrc) + { + if (*pSrc != VMA_CORRUPTION_DETECTION_MAGIC_VALUE) + { + return false; + } + } #endif - return true; + return true; } /* @@ -3530,10 +3731,10 @@ during GPU memory defragmentation. */ static void VmaFillGpuDefragmentationBufferCreateInfo(VkBufferCreateInfo& outBufCreateInfo) { - memset(&outBufCreateInfo, 0, sizeof(outBufCreateInfo)); - outBufCreateInfo.sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO; - outBufCreateInfo.usage = VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT; - outBufCreateInfo.size = (VkDeviceSize)VMA_DEFAULT_LARGE_HEAP_BLOCK_SIZE; // Example size. + memset(&outBufCreateInfo, 0, sizeof(outBufCreateInfo)); + outBufCreateInfo.sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO; + outBufCreateInfo.usage = VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT; + outBufCreateInfo.size = (VkDeviceSize)VMA_DEFAULT_LARGE_HEAP_BLOCK_SIZE; // Example size. } @@ -3549,33 +3750,32 @@ new element with value (key) should be inserted. template static IterT VmaBinaryFindFirstNotLess(IterT beg, IterT end, const KeyT& key, const CmpLess& cmp) { - size_t down = 0, up = (end - beg); - while (down < up) - { - const size_t mid = down + (up - down) / 2; // Overflow-safe midpoint calculation - if (cmp(*(beg + mid), key)) - { - down = mid + 1; - } - else - { - up = mid; - } - } - return beg + down; + size_t down = 0, up = size_t(end - beg); + while (down < up) + { + const size_t mid = down + (up - down) / 2; // Overflow-safe midpoint calculation + if (cmp(*(beg + mid), key)) + { + down = mid + 1; + } else + { + up = mid; + } + } + return beg + down; } template IterT VmaBinaryFindSorted(const IterT& beg, const IterT& end, const KeyT& value, const CmpLess& cmp) { - IterT it = VmaBinaryFindFirstNotLess( - beg, end, value, cmp); - if (it == end || - (!cmp(*it, value) && !cmp(value, *it))) - { - return it; - } - return end; + IterT it = VmaBinaryFindFirstNotLess( + beg, end, value, cmp); + if (it == end || + (!cmp(*it, value) && !cmp(value, *it))) + { + return it; + } + return end; } /* @@ -3586,177 +3786,260 @@ T must be pointer type, e.g. VmaAllocation, VmaPool. template static bool VmaValidatePointerArray(uint32_t count, const T* arr) { - for (uint32_t i = 0; i < count; ++i) - { - const T iPtr = arr[i]; - if (iPtr == VMA_NULL) - { - return false; - } - for (uint32_t j = i + 1; j < count; ++j) - { - if (iPtr == arr[j]) - { - return false; - } - } - } - return true; + for (uint32_t i = 0; i < count; ++i) + { + const T iPtr = arr[i]; + if (iPtr == VMA_NULL) + { + return false; + } + for (uint32_t j = i + 1; j < count; ++j) + { + if (iPtr == arr[j]) + { + return false; + } + } + } + return true; } template static inline void VmaPnextChainPushFront(MainT* mainStruct, NewT* newStruct) { - newStruct->pNext = mainStruct->pNext; - mainStruct->pNext = newStruct; + newStruct->pNext = mainStruct->pNext; + mainStruct->pNext = newStruct; +} +// Finds structure with s->sType == sType in mainStruct->pNext chain. +// Returns pointer to it. If not found, returns null. +template +static inline const FindT* VmaPnextChainFind(const MainT* mainStruct, VkStructureType sType) +{ + for (const VkBaseInStructure* s = (const VkBaseInStructure*)mainStruct->pNext; + s != VMA_NULL; s = s->pNext) + { + if (s->sType == sType) + { + return (const FindT*)s; + } + } + return VMA_NULL; +} + +// An abstraction over buffer or image `usage` flags, depending on available extensions. +struct VmaBufferImageUsage +{ +#if VMA_KHR_MAINTENANCE5 + typedef uint64_t BaseType; // VkFlags64 +#else + typedef uint32_t BaseType; // VkFlags32 +#endif + + static const VmaBufferImageUsage UNKNOWN; + + BaseType Value; + + VmaBufferImageUsage() { *this = UNKNOWN; } + explicit VmaBufferImageUsage(BaseType usage) : Value(usage) { } + VmaBufferImageUsage(const VkBufferCreateInfo &createInfo, bool useKhrMaintenance5); + explicit VmaBufferImageUsage(const VkImageCreateInfo &createInfo); + + bool operator==(const VmaBufferImageUsage& rhs) const { return Value == rhs.Value; } + bool operator!=(const VmaBufferImageUsage& rhs) const { return Value != rhs.Value; } + + bool Contains(BaseType flag) const { return (Value & flag) != 0; } + bool ContainsDeviceAccess() const + { + // This relies on values of VK_IMAGE_USAGE_TRANSFER* being the same as VK_BUFFER_IMAGE_TRANSFER*. + return (Value & ~BaseType(VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK_BUFFER_USAGE_TRANSFER_SRC_BIT)) != 0; + } +}; + +const VmaBufferImageUsage VmaBufferImageUsage::UNKNOWN = VmaBufferImageUsage(0); + +static void swap(VmaBufferImageUsage& lhs, VmaBufferImageUsage& rhs) noexcept +{ + using std::swap; + swap(lhs.Value, rhs.Value); +} + +VmaBufferImageUsage::VmaBufferImageUsage(const VkBufferCreateInfo &createInfo, + bool useKhrMaintenance5) +{ +#if VMA_KHR_MAINTENANCE5 + if (useKhrMaintenance5) + { + // If VkBufferCreateInfo::pNext chain contains VkBufferUsageFlags2CreateInfoKHR, + // take usage from it and ignore VkBufferCreateInfo::usage, per specification + // of the VK_KHR_maintenance5 extension. + const VkBufferUsageFlags2CreateInfoKHR* const usageFlags2 = + VmaPnextChainFind(&createInfo, VK_STRUCTURE_TYPE_BUFFER_USAGE_FLAGS_2_CREATE_INFO_KHR); + if (usageFlags2) + { + this->Value = usageFlags2->usage; + return; + } + } +#endif + + this->Value = (BaseType)createInfo.usage; +} + +VmaBufferImageUsage::VmaBufferImageUsage(const VkImageCreateInfo &createInfo) +{ + // Maybe in the future there will be VK_KHR_maintenanceN extension with structure + // VkImageUsageFlags2CreateInfoKHR, like the one for buffers... + + this->Value = (BaseType)createInfo.usage; } // This is the main algorithm that guides the selection of a memory type best for an allocation - // converts usage to required/preferred/not preferred flags. static bool FindMemoryPreferences( - bool isIntegratedGPU, - const VmaAllocationCreateInfo& allocCreateInfo, - VkFlags bufImgUsage, // VkBufferCreateInfo::usage or VkImageCreateInfo::usage. UINT32_MAX if unknown. - VkMemoryPropertyFlags& outRequiredFlags, - VkMemoryPropertyFlags& outPreferredFlags, - VkMemoryPropertyFlags& outNotPreferredFlags) + bool isIntegratedGPU, + const VmaAllocationCreateInfo& allocCreateInfo, + VmaBufferImageUsage bufImgUsage, + VkMemoryPropertyFlags& outRequiredFlags, + VkMemoryPropertyFlags& outPreferredFlags, + VkMemoryPropertyFlags& outNotPreferredFlags) { - outRequiredFlags = allocCreateInfo.requiredFlags; - outPreferredFlags = allocCreateInfo.preferredFlags; - outNotPreferredFlags = 0; + outRequiredFlags = allocCreateInfo.requiredFlags; + outPreferredFlags = allocCreateInfo.preferredFlags; + outNotPreferredFlags = 0; - switch(allocCreateInfo.usage) - { - case VMA_MEMORY_USAGE_UNKNOWN: - break; - case VMA_MEMORY_USAGE_GPU_ONLY: - if(!isIntegratedGPU || (outPreferredFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) == 0) - { - outPreferredFlags |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; - } - break; - case VMA_MEMORY_USAGE_CPU_ONLY: - outRequiredFlags |= VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT; - break; - case VMA_MEMORY_USAGE_CPU_TO_GPU: - outRequiredFlags |= VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT; - if(!isIntegratedGPU || (outPreferredFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) == 0) - { - outPreferredFlags |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; - } - break; - case VMA_MEMORY_USAGE_GPU_TO_CPU: - outRequiredFlags |= VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT; - outPreferredFlags |= VK_MEMORY_PROPERTY_HOST_CACHED_BIT; - break; - case VMA_MEMORY_USAGE_CPU_COPY: - outNotPreferredFlags |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; - break; - case VMA_MEMORY_USAGE_GPU_LAZILY_ALLOCATED: - outRequiredFlags |= VK_MEMORY_PROPERTY_LAZILY_ALLOCATED_BIT; - break; - case VMA_MEMORY_USAGE_AUTO: - case VMA_MEMORY_USAGE_AUTO_PREFER_DEVICE: - case VMA_MEMORY_USAGE_AUTO_PREFER_HOST: - { - if(bufImgUsage == UINT32_MAX) - { - VMA_ASSERT(0 && "VMA_MEMORY_USAGE_AUTO* values can only be used with functions like vmaCreateBuffer, vmaCreateImage so that the details of the created resource are known."); - return false; - } - // This relies on values of VK_IMAGE_USAGE_TRANSFER* being the same VK_BUFFER_IMAGE_TRANSFER*. - const bool deviceAccess = (bufImgUsage & ~(VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK_BUFFER_USAGE_TRANSFER_SRC_BIT)) != 0; - const bool hostAccessSequentialWrite = (allocCreateInfo.flags & VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT) != 0; - const bool hostAccessRandom = (allocCreateInfo.flags & VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT) != 0; - const bool hostAccessAllowTransferInstead = (allocCreateInfo.flags & VMA_ALLOCATION_CREATE_HOST_ACCESS_ALLOW_TRANSFER_INSTEAD_BIT) != 0; - const bool preferDevice = allocCreateInfo.usage == VMA_MEMORY_USAGE_AUTO_PREFER_DEVICE; - const bool preferHost = allocCreateInfo.usage == VMA_MEMORY_USAGE_AUTO_PREFER_HOST; + switch (allocCreateInfo.usage) + { + case VMA_MEMORY_USAGE_UNKNOWN: + break; + case VMA_MEMORY_USAGE_GPU_ONLY: + if (!isIntegratedGPU || (outPreferredFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) == 0) + { + outPreferredFlags |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; + } + break; + case VMA_MEMORY_USAGE_CPU_ONLY: + outRequiredFlags |= VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT; + break; + case VMA_MEMORY_USAGE_CPU_TO_GPU: + outRequiredFlags |= VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT; + if (!isIntegratedGPU || (outPreferredFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) == 0) + { + outPreferredFlags |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; + } + break; + case VMA_MEMORY_USAGE_GPU_TO_CPU: + outRequiredFlags |= VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT; + outPreferredFlags |= VK_MEMORY_PROPERTY_HOST_CACHED_BIT; + break; + case VMA_MEMORY_USAGE_CPU_COPY: + outNotPreferredFlags |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; + break; + case VMA_MEMORY_USAGE_GPU_LAZILY_ALLOCATED: + outRequiredFlags |= VK_MEMORY_PROPERTY_LAZILY_ALLOCATED_BIT; + break; + case VMA_MEMORY_USAGE_AUTO: + case VMA_MEMORY_USAGE_AUTO_PREFER_DEVICE: + case VMA_MEMORY_USAGE_AUTO_PREFER_HOST: + { + if (bufImgUsage == VmaBufferImageUsage::UNKNOWN) + { + VMA_ASSERT(0 && "VMA_MEMORY_USAGE_AUTO* values can only be used with functions like vmaCreateBuffer, vmaCreateImage so that the details of the created resource are known." + " Maybe you use VkBufferUsageFlags2CreateInfoKHR but forgot to use VMA_ALLOCATOR_CREATE_KHR_MAINTENANCE5_BIT?"); + return false; + } - // CPU random access - e.g. a buffer written to or transferred from GPU to read back on CPU. - if(hostAccessRandom) - { - if(!isIntegratedGPU && deviceAccess && hostAccessAllowTransferInstead && !preferHost) - { - // Nice if it will end up in HOST_VISIBLE, but more importantly prefer DEVICE_LOCAL. - // Omitting HOST_VISIBLE here is intentional. - // In case there is DEVICE_LOCAL | HOST_VISIBLE | HOST_CACHED, it will pick that one. - // Otherwise, this will give same weight to DEVICE_LOCAL as HOST_VISIBLE | HOST_CACHED and select the former if occurs first on the list. - outPreferredFlags |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT | VK_MEMORY_PROPERTY_HOST_CACHED_BIT; - } - else - { - // Always CPU memory, cached. - outRequiredFlags |= VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_CACHED_BIT; - } - } - // CPU sequential write - may be CPU or host-visible GPU memory, uncached and write-combined. - else if(hostAccessSequentialWrite) - { - // Want uncached and write-combined. - outNotPreferredFlags |= VK_MEMORY_PROPERTY_HOST_CACHED_BIT; + const bool deviceAccess = bufImgUsage.ContainsDeviceAccess(); + const bool hostAccessSequentialWrite = (allocCreateInfo.flags & VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT) != 0; + const bool hostAccessRandom = (allocCreateInfo.flags & VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT) != 0; + const bool hostAccessAllowTransferInstead = (allocCreateInfo.flags & VMA_ALLOCATION_CREATE_HOST_ACCESS_ALLOW_TRANSFER_INSTEAD_BIT) != 0; + const bool preferDevice = allocCreateInfo.usage == VMA_MEMORY_USAGE_AUTO_PREFER_DEVICE; + const bool preferHost = allocCreateInfo.usage == VMA_MEMORY_USAGE_AUTO_PREFER_HOST; - if(!isIntegratedGPU && deviceAccess && hostAccessAllowTransferInstead && !preferHost) - { - outPreferredFlags |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT | VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT; - } - else - { - outRequiredFlags |= VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT; - // Direct GPU access, CPU sequential write (e.g. a dynamic uniform buffer updated every frame) - if(deviceAccess) - { - // Could go to CPU memory or GPU BAR/unified. Up to the user to decide. If no preference, choose GPU memory. - if(preferHost) - outNotPreferredFlags |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; - else - outPreferredFlags |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; - } - // GPU no direct access, CPU sequential write (e.g. an upload buffer to be transferred to the GPU) - else - { - // Could go to CPU memory or GPU BAR/unified. Up to the user to decide. If no preference, choose CPU memory. - if(preferDevice) - outPreferredFlags |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; - else - outNotPreferredFlags |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; - } - } - } - // No CPU access - else - { - // GPU access, no CPU access (e.g. a color attachment image) - prefer GPU memory - if(deviceAccess) - { - // ...unless there is a clear preference from the user not to do so. - if(preferHost) - outNotPreferredFlags |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; - else - outPreferredFlags |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; - } - // No direct GPU access, no CPU access, just transfers. - // It may be staging copy intended for e.g. preserving image for next frame (then better GPU memory) or - // a "swap file" copy to free some GPU memory (then better CPU memory). - // Up to the user to decide. If no preferece, assume the former and choose GPU memory. - if(preferHost) - outNotPreferredFlags |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; - else - outPreferredFlags |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; - } - break; - } - default: - VMA_ASSERT(0); - } + // CPU random access - e.g. a buffer written to or transferred from GPU to read back on CPU. + if (hostAccessRandom) + { + // Prefer cached. Cannot require it, because some platforms don't have it (e.g. Raspberry Pi - see #362)! + outPreferredFlags |= VK_MEMORY_PROPERTY_HOST_CACHED_BIT; - // Avoid DEVICE_COHERENT unless explicitly requested. - if(((allocCreateInfo.requiredFlags | allocCreateInfo.preferredFlags) & - (VK_MEMORY_PROPERTY_DEVICE_COHERENT_BIT_AMD_COPY | VK_MEMORY_PROPERTY_DEVICE_UNCACHED_BIT_AMD_COPY)) == 0) - { - outNotPreferredFlags |= VK_MEMORY_PROPERTY_DEVICE_UNCACHED_BIT_AMD_COPY; - } + if (!isIntegratedGPU && deviceAccess && hostAccessAllowTransferInstead && !preferHost) + { + // Nice if it will end up in HOST_VISIBLE, but more importantly prefer DEVICE_LOCAL. + // Omitting HOST_VISIBLE here is intentional. + // In case there is DEVICE_LOCAL | HOST_VISIBLE | HOST_CACHED, it will pick that one. + // Otherwise, this will give same weight to DEVICE_LOCAL as HOST_VISIBLE | HOST_CACHED and select the former if occurs first on the list. + outPreferredFlags |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; + } else + { + // Always CPU memory. + outRequiredFlags |= VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT; + } + } + // CPU sequential write - may be CPU or host-visible GPU memory, uncached and write-combined. + else if (hostAccessSequentialWrite) + { + // Want uncached and write-combined. + outNotPreferredFlags |= VK_MEMORY_PROPERTY_HOST_CACHED_BIT; - return true; + if (!isIntegratedGPU && deviceAccess && hostAccessAllowTransferInstead && !preferHost) + { + outPreferredFlags |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT | VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT; + } else + { + outRequiredFlags |= VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT; + // Direct GPU access, CPU sequential write (e.g. a dynamic uniform buffer updated every frame) + if (deviceAccess) + { + // Could go to CPU memory or GPU BAR/unified. Up to the user to decide. If no preference, choose GPU memory. + if (preferHost) + outNotPreferredFlags |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; + else + outPreferredFlags |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; + } + // GPU no direct access, CPU sequential write (e.g. an upload buffer to be transferred to the GPU) + else + { + // Could go to CPU memory or GPU BAR/unified. Up to the user to decide. If no preference, choose CPU memory. + if (preferDevice) + outPreferredFlags |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; + else + outNotPreferredFlags |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; + } + } + } + // No CPU access + else + { + // if(deviceAccess) + // + // GPU access, no CPU access (e.g. a color attachment image) - prefer GPU memory, + // unless there is a clear preference from the user not to do so. + // + // else: + // + // No direct GPU access, no CPU access, just transfers. + // It may be staging copy intended for e.g. preserving image for next frame (then better GPU memory) or + // a "swap file" copy to free some GPU memory (then better CPU memory). + // Up to the user to decide. If no preferece, assume the former and choose GPU memory. + + if (preferHost) + outNotPreferredFlags |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; + else + outPreferredFlags |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; + } + break; + } + default: + VMA_ASSERT(0); + } + + // Avoid DEVICE_COHERENT unless explicitly requested. + if (((allocCreateInfo.requiredFlags | allocCreateInfo.preferredFlags) & + (VK_MEMORY_PROPERTY_DEVICE_COHERENT_BIT_AMD_COPY | VK_MEMORY_PROPERTY_DEVICE_UNCACHED_BIT_AMD_COPY)) == 0) + { + outNotPreferredFlags |= VK_MEMORY_PROPERTY_DEVICE_UNCACHED_BIT_AMD_COPY; + } + + return true; } //////////////////////////////////////////////////////////////////////////////// @@ -3764,47 +4047,45 @@ static bool FindMemoryPreferences( static void* VmaMalloc(const VkAllocationCallbacks* pAllocationCallbacks, size_t size, size_t alignment) { - void* result = VMA_NULL; - if ((pAllocationCallbacks != VMA_NULL) && - (pAllocationCallbacks->pfnAllocation != VMA_NULL)) - { - result = (*pAllocationCallbacks->pfnAllocation)( - pAllocationCallbacks->pUserData, - size, - alignment, - VK_SYSTEM_ALLOCATION_SCOPE_OBJECT); - } - else - { - result = VMA_SYSTEM_ALIGNED_MALLOC(size, alignment); - } - VMA_ASSERT(result != VMA_NULL && "CPU memory allocation failed."); - return result; + void* result = VMA_NULL; + if ((pAllocationCallbacks != VMA_NULL) && + (pAllocationCallbacks->pfnAllocation != VMA_NULL)) + { + result = (*pAllocationCallbacks->pfnAllocation)( + pAllocationCallbacks->pUserData, + size, + alignment, + VK_SYSTEM_ALLOCATION_SCOPE_OBJECT); + } else + { + result = VMA_SYSTEM_ALIGNED_MALLOC(size, alignment); + } + VMA_ASSERT(result != VMA_NULL && "CPU memory allocation failed."); + return result; } static void VmaFree(const VkAllocationCallbacks* pAllocationCallbacks, void* ptr) { - if ((pAllocationCallbacks != VMA_NULL) && - (pAllocationCallbacks->pfnFree != VMA_NULL)) - { - (*pAllocationCallbacks->pfnFree)(pAllocationCallbacks->pUserData, ptr); - } - else - { - VMA_SYSTEM_ALIGNED_FREE(ptr); - } + if ((pAllocationCallbacks != VMA_NULL) && + (pAllocationCallbacks->pfnFree != VMA_NULL)) + { + (*pAllocationCallbacks->pfnFree)(pAllocationCallbacks->pUserData, ptr); + } else + { + VMA_SYSTEM_ALIGNED_FREE(ptr); + } } template static T* VmaAllocate(const VkAllocationCallbacks* pAllocationCallbacks) { - return (T*)VmaMalloc(pAllocationCallbacks, sizeof(T), VMA_ALIGN_OF(T)); + return (T*)VmaMalloc(pAllocationCallbacks, sizeof(T), VMA_ALIGN_OF(T)); } template static T* VmaAllocateArray(const VkAllocationCallbacks* pAllocationCallbacks, size_t count) { - return (T*)VmaMalloc(pAllocationCallbacks, sizeof(T) * count, VMA_ALIGN_OF(T)); + return (T*)VmaMalloc(pAllocationCallbacks, sizeof(T) * count, VMA_ALIGN_OF(T)); } #define vma_new(allocator, type) new(VmaAllocate(allocator))(type) @@ -3814,86 +4095,86 @@ static T* VmaAllocateArray(const VkAllocationCallbacks* pAllocationCallbacks, si template static void vma_delete(const VkAllocationCallbacks* pAllocationCallbacks, T* ptr) { - ptr->~T(); - VmaFree(pAllocationCallbacks, ptr); + ptr->~T(); + VmaFree(pAllocationCallbacks, ptr); } template static void vma_delete_array(const VkAllocationCallbacks* pAllocationCallbacks, T* ptr, size_t count) { - if (ptr != VMA_NULL) - { - for (size_t i = count; i--; ) - { - ptr[i].~T(); - } - VmaFree(pAllocationCallbacks, ptr); - } + if (ptr != VMA_NULL) + { + for (size_t i = count; i--; ) + { + ptr[i].~T(); + } + VmaFree(pAllocationCallbacks, ptr); + } } static char* VmaCreateStringCopy(const VkAllocationCallbacks* allocs, const char* srcStr) { - if (srcStr != VMA_NULL) - { - const size_t len = strlen(srcStr); - char* const result = vma_new_array(allocs, char, len + 1); - memcpy(result, srcStr, len + 1); - return result; - } - return VMA_NULL; + if (srcStr != VMA_NULL) + { + const size_t len = strlen(srcStr); + char* const result = vma_new_array(allocs, char, len + 1); + memcpy(result, srcStr, len + 1); + return result; + } + return VMA_NULL; } #if VMA_STATS_STRING_ENABLED static char* VmaCreateStringCopy(const VkAllocationCallbacks* allocs, const char* srcStr, size_t strLen) { - if (srcStr != VMA_NULL) - { - char* const result = vma_new_array(allocs, char, strLen + 1); - memcpy(result, srcStr, strLen); - result[strLen] = '\0'; - return result; - } - return VMA_NULL; + if (srcStr != VMA_NULL) + { + char* const result = vma_new_array(allocs, char, strLen + 1); + memcpy(result, srcStr, strLen); + result[strLen] = '\0'; + return result; + } + return VMA_NULL; } #endif // VMA_STATS_STRING_ENABLED static void VmaFreeString(const VkAllocationCallbacks* allocs, char* str) { - if (str != VMA_NULL) - { - const size_t len = strlen(str); - vma_delete_array(allocs, str, len + 1); - } + if (str != VMA_NULL) + { + const size_t len = strlen(str); + vma_delete_array(allocs, str, len + 1); + } } template size_t VmaVectorInsertSorted(VectorT& vector, const typename VectorT::value_type& value) { - const size_t indexToInsert = VmaBinaryFindFirstNotLess( - vector.data(), - vector.data() + vector.size(), - value, - CmpLess()) - vector.data(); - VmaVectorInsert(vector, indexToInsert, value); - return indexToInsert; + const size_t indexToInsert = VmaBinaryFindFirstNotLess( + vector.data(), + vector.data() + vector.size(), + value, + CmpLess()) - vector.data(); + VmaVectorInsert(vector, indexToInsert, value); + return indexToInsert; } template bool VmaVectorRemoveSorted(VectorT& vector, const typename VectorT::value_type& value) { - CmpLess comparator; - typename VectorT::iterator it = VmaBinaryFindFirstNotLess( - vector.begin(), - vector.end(), - value, - comparator); - if ((it != vector.end()) && !comparator(*it, value) && !comparator(value, *it)) - { - size_t indexToRemove = it - vector.begin(); - VmaVectorRemove(vector, indexToRemove); - return true; - } - return false; + CmpLess comparator; + typename VectorT::iterator it = VmaBinaryFindFirstNotLess( + vector.begin(), + vector.end(), + value, + comparator); + if ((it != vector.end()) && !comparator(*it, value) && !comparator(value, *it)) + { + size_t indexToRemove = it - vector.begin(); + VmaVectorRemove(vector, indexToRemove); + return true; + } + return false; } #endif // _VMA_FUNCTIONS @@ -3901,53 +4182,53 @@ bool VmaVectorRemoveSorted(VectorT& vector, const typename VectorT::value_type& static void VmaClearStatistics(VmaStatistics& outStats) { - outStats.blockCount = 0; - outStats.allocationCount = 0; - outStats.blockBytes = 0; - outStats.allocationBytes = 0; + outStats.blockCount = 0; + outStats.allocationCount = 0; + outStats.blockBytes = 0; + outStats.allocationBytes = 0; } static void VmaAddStatistics(VmaStatistics& inoutStats, const VmaStatistics& src) { - inoutStats.blockCount += src.blockCount; - inoutStats.allocationCount += src.allocationCount; - inoutStats.blockBytes += src.blockBytes; - inoutStats.allocationBytes += src.allocationBytes; + inoutStats.blockCount += src.blockCount; + inoutStats.allocationCount += src.allocationCount; + inoutStats.blockBytes += src.blockBytes; + inoutStats.allocationBytes += src.allocationBytes; } static void VmaClearDetailedStatistics(VmaDetailedStatistics& outStats) { - VmaClearStatistics(outStats.statistics); - outStats.unusedRangeCount = 0; - outStats.allocationSizeMin = VK_WHOLE_SIZE; - outStats.allocationSizeMax = 0; - outStats.unusedRangeSizeMin = VK_WHOLE_SIZE; - outStats.unusedRangeSizeMax = 0; + VmaClearStatistics(outStats.statistics); + outStats.unusedRangeCount = 0; + outStats.allocationSizeMin = VK_WHOLE_SIZE; + outStats.allocationSizeMax = 0; + outStats.unusedRangeSizeMin = VK_WHOLE_SIZE; + outStats.unusedRangeSizeMax = 0; } static void VmaAddDetailedStatisticsAllocation(VmaDetailedStatistics& inoutStats, VkDeviceSize size) { - inoutStats.statistics.allocationCount++; - inoutStats.statistics.allocationBytes += size; - inoutStats.allocationSizeMin = VMA_MIN(inoutStats.allocationSizeMin, size); - inoutStats.allocationSizeMax = VMA_MAX(inoutStats.allocationSizeMax, size); + inoutStats.statistics.allocationCount++; + inoutStats.statistics.allocationBytes += size; + inoutStats.allocationSizeMin = VMA_MIN(inoutStats.allocationSizeMin, size); + inoutStats.allocationSizeMax = VMA_MAX(inoutStats.allocationSizeMax, size); } static void VmaAddDetailedStatisticsUnusedRange(VmaDetailedStatistics& inoutStats, VkDeviceSize size) { - inoutStats.unusedRangeCount++; - inoutStats.unusedRangeSizeMin = VMA_MIN(inoutStats.unusedRangeSizeMin, size); - inoutStats.unusedRangeSizeMax = VMA_MAX(inoutStats.unusedRangeSizeMax, size); + inoutStats.unusedRangeCount++; + inoutStats.unusedRangeSizeMin = VMA_MIN(inoutStats.unusedRangeSizeMin, size); + inoutStats.unusedRangeSizeMax = VMA_MAX(inoutStats.unusedRangeSizeMax, size); } static void VmaAddDetailedStatistics(VmaDetailedStatistics& inoutStats, const VmaDetailedStatistics& src) { - VmaAddStatistics(inoutStats.statistics, src.statistics); - inoutStats.unusedRangeCount += src.unusedRangeCount; - inoutStats.allocationSizeMin = VMA_MIN(inoutStats.allocationSizeMin, src.allocationSizeMin); - inoutStats.allocationSizeMax = VMA_MAX(inoutStats.allocationSizeMax, src.allocationSizeMax); - inoutStats.unusedRangeSizeMin = VMA_MIN(inoutStats.unusedRangeSizeMin, src.unusedRangeSizeMin); - inoutStats.unusedRangeSizeMax = VMA_MAX(inoutStats.unusedRangeSizeMax, src.unusedRangeSizeMax); + VmaAddStatistics(inoutStats.statistics, src.statistics); + inoutStats.unusedRangeCount += src.unusedRangeCount; + inoutStats.allocationSizeMin = VMA_MIN(inoutStats.allocationSizeMin, src.allocationSizeMin); + inoutStats.allocationSizeMax = VMA_MAX(inoutStats.allocationSizeMax, src.allocationSizeMax); + inoutStats.unusedRangeSizeMin = VMA_MIN(inoutStats.unusedRangeSizeMin, src.unusedRangeSizeMin); + inoutStats.unusedRangeSizeMax = VMA_MAX(inoutStats.unusedRangeSizeMax, src.unusedRangeSizeMax); } #endif // _VMA_STATISTICS_FUNCTIONS @@ -3956,82 +4237,82 @@ static void VmaAddDetailedStatistics(VmaDetailedStatistics& inoutStats, const Vm // Helper RAII class to lock a mutex in constructor and unlock it in destructor (at the end of scope). struct VmaMutexLock { - VMA_CLASS_NO_COPY(VmaMutexLock) + VMA_CLASS_NO_COPY_NO_MOVE(VmaMutexLock) public: - VmaMutexLock(VMA_MUTEX& mutex, bool useMutex = true) : - m_pMutex(useMutex ? &mutex : VMA_NULL) - { - if (m_pMutex) { m_pMutex->Lock(); } - } - ~VmaMutexLock() { if (m_pMutex) { m_pMutex->Unlock(); } } + VmaMutexLock(VMA_MUTEX& mutex, bool useMutex = true) : + m_pMutex(useMutex ? &mutex : VMA_NULL) + { + if (m_pMutex) { m_pMutex->Lock(); } + } + ~VmaMutexLock() { if (m_pMutex) { m_pMutex->Unlock(); } } private: - VMA_MUTEX* m_pMutex; + VMA_MUTEX* m_pMutex; }; // Helper RAII class to lock a RW mutex in constructor and unlock it in destructor (at the end of scope), for reading. struct VmaMutexLockRead { - VMA_CLASS_NO_COPY(VmaMutexLockRead) + VMA_CLASS_NO_COPY_NO_MOVE(VmaMutexLockRead) public: - VmaMutexLockRead(VMA_RW_MUTEX& mutex, bool useMutex) : - m_pMutex(useMutex ? &mutex : VMA_NULL) - { - if (m_pMutex) { m_pMutex->LockRead(); } - } - ~VmaMutexLockRead() { if (m_pMutex) { m_pMutex->UnlockRead(); } } + VmaMutexLockRead(VMA_RW_MUTEX& mutex, bool useMutex) : + m_pMutex(useMutex ? &mutex : VMA_NULL) + { + if (m_pMutex) { m_pMutex->LockRead(); } + } + ~VmaMutexLockRead() { if (m_pMutex) { m_pMutex->UnlockRead(); } } private: - VMA_RW_MUTEX* m_pMutex; + VMA_RW_MUTEX* m_pMutex; }; // Helper RAII class to lock a RW mutex in constructor and unlock it in destructor (at the end of scope), for writing. struct VmaMutexLockWrite { - VMA_CLASS_NO_COPY(VmaMutexLockWrite) + VMA_CLASS_NO_COPY_NO_MOVE(VmaMutexLockWrite) public: - VmaMutexLockWrite(VMA_RW_MUTEX& mutex, bool useMutex) - : m_pMutex(useMutex ? &mutex : VMA_NULL) - { - if (m_pMutex) { m_pMutex->LockWrite(); } - } - ~VmaMutexLockWrite() { if (m_pMutex) { m_pMutex->UnlockWrite(); } } + VmaMutexLockWrite(VMA_RW_MUTEX& mutex, bool useMutex) + : m_pMutex(useMutex ? &mutex : VMA_NULL) + { + if (m_pMutex) { m_pMutex->LockWrite(); } + } + ~VmaMutexLockWrite() { if (m_pMutex) { m_pMutex->UnlockWrite(); } } private: - VMA_RW_MUTEX* m_pMutex; + VMA_RW_MUTEX* m_pMutex; }; #if VMA_DEBUG_GLOBAL_MUTEX - static VMA_MUTEX gDebugGlobalMutex; - #define VMA_DEBUG_GLOBAL_MUTEX_LOCK VmaMutexLock debugGlobalMutexLock(gDebugGlobalMutex, true); +static VMA_MUTEX gDebugGlobalMutex; +#define VMA_DEBUG_GLOBAL_MUTEX_LOCK VmaMutexLock debugGlobalMutexLock(gDebugGlobalMutex, true); #else - #define VMA_DEBUG_GLOBAL_MUTEX_LOCK +#define VMA_DEBUG_GLOBAL_MUTEX_LOCK #endif #endif // _VMA_MUTEX_LOCK #ifndef _VMA_ATOMIC_TRANSACTIONAL_INCREMENT // An object that increments given atomic but decrements it back in the destructor unless Commit() is called. -template +template struct AtomicTransactionalIncrement { public: - typedef std::atomic AtomicT; + using T = decltype(AtomicT().load()); - ~AtomicTransactionalIncrement() - { - if(m_Atomic) - --(*m_Atomic); - } + ~AtomicTransactionalIncrement() + { + if (m_Atomic) + --(*m_Atomic); + } - void Commit() { m_Atomic = nullptr; } - T Increment(AtomicT* atomic) - { - m_Atomic = atomic; - return m_Atomic->fetch_add(1); - } + void Commit() { m_Atomic = VMA_NULL; } + T Increment(AtomicT* atomic) + { + m_Atomic = atomic; + return m_Atomic->fetch_add(1); + } private: - AtomicT* m_Atomic = nullptr; + AtomicT* m_Atomic = VMA_NULL; }; #endif // _VMA_ATOMIC_TRANSACTIONAL_INCREMENT @@ -4040,28 +4321,28 @@ private: template struct VmaStlAllocator { - const VkAllocationCallbacks* const m_pCallbacks; - typedef T value_type; + const VkAllocationCallbacks* const m_pCallbacks; + typedef T value_type; - VmaStlAllocator(const VkAllocationCallbacks* pCallbacks) : m_pCallbacks(pCallbacks) {} - template - VmaStlAllocator(const VmaStlAllocator& src) : m_pCallbacks(src.m_pCallbacks) {} - VmaStlAllocator(const VmaStlAllocator&) = default; - VmaStlAllocator& operator=(const VmaStlAllocator&) = delete; + VmaStlAllocator(const VkAllocationCallbacks* pCallbacks) : m_pCallbacks(pCallbacks) {} + template + VmaStlAllocator(const VmaStlAllocator& src) : m_pCallbacks(src.m_pCallbacks) {} + VmaStlAllocator(const VmaStlAllocator&) = default; + VmaStlAllocator& operator=(const VmaStlAllocator&) = delete; - T* allocate(size_t n) { return VmaAllocateArray(m_pCallbacks, n); } - void deallocate(T* p, size_t n) { VmaFree(m_pCallbacks, p); } + T* allocate(size_t n) { return VmaAllocateArray(m_pCallbacks, n); } + void deallocate(T* p, size_t n) { VmaFree(m_pCallbacks, p); } - template - bool operator==(const VmaStlAllocator& rhs) const - { - return m_pCallbacks == rhs.m_pCallbacks; - } - template - bool operator!=(const VmaStlAllocator& rhs) const - { - return m_pCallbacks != rhs.m_pCallbacks; - } + template + bool operator==(const VmaStlAllocator& rhs) const + { + return m_pCallbacks == rhs.m_pCallbacks; + } + template + bool operator!=(const VmaStlAllocator& rhs) const + { + return m_pCallbacks != rhs.m_pCallbacks; + } }; #endif // _VMA_STL_ALLOCATOR @@ -4073,208 +4354,208 @@ template class VmaVector { public: - typedef T value_type; - typedef T* iterator; - typedef const T* const_iterator; + typedef T value_type; + typedef T* iterator; + typedef const T* const_iterator; - VmaVector(const AllocatorT& allocator); - VmaVector(size_t count, const AllocatorT& allocator); - // This version of the constructor is here for compatibility with pre-C++14 std::vector. - // value is unused. - VmaVector(size_t count, const T& value, const AllocatorT& allocator) : VmaVector(count, allocator) {} - VmaVector(const VmaVector& src); - VmaVector& operator=(const VmaVector& rhs); - ~VmaVector() { VmaFree(m_Allocator.m_pCallbacks, m_pArray); } + VmaVector(const AllocatorT& allocator); + VmaVector(size_t count, const AllocatorT& allocator); + // This version of the constructor is here for compatibility with pre-C++14 std::vector. + // value is unused. + VmaVector(size_t count, const T& value, const AllocatorT& allocator) : VmaVector(count, allocator) {} + VmaVector(const VmaVector& src); + VmaVector& operator=(const VmaVector& rhs); + ~VmaVector() { VmaFree(m_Allocator.m_pCallbacks, m_pArray); } - bool empty() const { return m_Count == 0; } - size_t size() const { return m_Count; } - T* data() { return m_pArray; } - T& front() { VMA_HEAVY_ASSERT(m_Count > 0); return m_pArray[0]; } - T& back() { VMA_HEAVY_ASSERT(m_Count > 0); return m_pArray[m_Count - 1]; } - const T* data() const { return m_pArray; } - const T& front() const { VMA_HEAVY_ASSERT(m_Count > 0); return m_pArray[0]; } - const T& back() const { VMA_HEAVY_ASSERT(m_Count > 0); return m_pArray[m_Count - 1]; } + bool empty() const { return m_Count == 0; } + size_t size() const { return m_Count; } + T* data() { return m_pArray; } + T& front() { VMA_HEAVY_ASSERT(m_Count > 0); return m_pArray[0]; } + T& back() { VMA_HEAVY_ASSERT(m_Count > 0); return m_pArray[m_Count - 1]; } + const T* data() const { return m_pArray; } + const T& front() const { VMA_HEAVY_ASSERT(m_Count > 0); return m_pArray[0]; } + const T& back() const { VMA_HEAVY_ASSERT(m_Count > 0); return m_pArray[m_Count - 1]; } - iterator begin() { return m_pArray; } - iterator end() { return m_pArray + m_Count; } - const_iterator cbegin() const { return m_pArray; } - const_iterator cend() const { return m_pArray + m_Count; } - const_iterator begin() const { return cbegin(); } - const_iterator end() const { return cend(); } + iterator begin() { return m_pArray; } + iterator end() { return m_pArray + m_Count; } + const_iterator cbegin() const { return m_pArray; } + const_iterator cend() const { return m_pArray + m_Count; } + const_iterator begin() const { return cbegin(); } + const_iterator end() const { return cend(); } - void pop_front() { VMA_HEAVY_ASSERT(m_Count > 0); remove(0); } - void pop_back() { VMA_HEAVY_ASSERT(m_Count > 0); resize(size() - 1); } - void push_front(const T& src) { insert(0, src); } + void pop_front() { VMA_HEAVY_ASSERT(m_Count > 0); remove(0); } + void pop_back() { VMA_HEAVY_ASSERT(m_Count > 0); resize(size() - 1); } + void push_front(const T& src) { insert(0, src); } - void push_back(const T& src); - void reserve(size_t newCapacity, bool freeMemory = false); - void resize(size_t newCount); - void clear() { resize(0); } - void shrink_to_fit(); - void insert(size_t index, const T& src); - void remove(size_t index); + void push_back(const T& src); + void reserve(size_t newCapacity, bool freeMemory = false); + void resize(size_t newCount); + void clear() { resize(0); } + void shrink_to_fit(); + void insert(size_t index, const T& src); + void remove(size_t index); - T& operator[](size_t index) { VMA_HEAVY_ASSERT(index < m_Count); return m_pArray[index]; } - const T& operator[](size_t index) const { VMA_HEAVY_ASSERT(index < m_Count); return m_pArray[index]; } + T& operator[](size_t index) { VMA_HEAVY_ASSERT(index < m_Count); return m_pArray[index]; } + const T& operator[](size_t index) const { VMA_HEAVY_ASSERT(index < m_Count); return m_pArray[index]; } private: - AllocatorT m_Allocator; - T* m_pArray; - size_t m_Count; - size_t m_Capacity; + AllocatorT m_Allocator; + T* m_pArray; + size_t m_Count; + size_t m_Capacity; }; #ifndef _VMA_VECTOR_FUNCTIONS template VmaVector::VmaVector(const AllocatorT& allocator) - : m_Allocator(allocator), - m_pArray(VMA_NULL), - m_Count(0), - m_Capacity(0) {} + : m_Allocator(allocator), + m_pArray(VMA_NULL), + m_Count(0), + m_Capacity(0) {} template VmaVector::VmaVector(size_t count, const AllocatorT& allocator) - : m_Allocator(allocator), - m_pArray(count ? (T*)VmaAllocateArray(allocator.m_pCallbacks, count) : VMA_NULL), - m_Count(count), - m_Capacity(count) {} + : m_Allocator(allocator), + m_pArray(count ? (T*)VmaAllocateArray(allocator.m_pCallbacks, count) : VMA_NULL), + m_Count(count), + m_Capacity(count) {} template VmaVector::VmaVector(const VmaVector& src) - : m_Allocator(src.m_Allocator), - m_pArray(src.m_Count ? (T*)VmaAllocateArray(src.m_Allocator.m_pCallbacks, src.m_Count) : VMA_NULL), - m_Count(src.m_Count), - m_Capacity(src.m_Count) + : m_Allocator(src.m_Allocator), + m_pArray(src.m_Count ? (T*)VmaAllocateArray(src.m_Allocator.m_pCallbacks, src.m_Count) : VMA_NULL), + m_Count(src.m_Count), + m_Capacity(src.m_Count) { - if (m_Count != 0) - { - memcpy(m_pArray, src.m_pArray, m_Count * sizeof(T)); - } + if (m_Count != 0) + { + memcpy(m_pArray, src.m_pArray, m_Count * sizeof(T)); + } } template VmaVector& VmaVector::operator=(const VmaVector& rhs) { - if (&rhs != this) - { - resize(rhs.m_Count); - if (m_Count != 0) - { - memcpy(m_pArray, rhs.m_pArray, m_Count * sizeof(T)); - } - } - return *this; + if (&rhs != this) + { + resize(rhs.m_Count); + if (m_Count != 0) + { + memcpy(m_pArray, rhs.m_pArray, m_Count * sizeof(T)); + } + } + return *this; } template void VmaVector::push_back(const T& src) { - const size_t newIndex = size(); - resize(newIndex + 1); - m_pArray[newIndex] = src; + const size_t newIndex = size(); + resize(newIndex + 1); + m_pArray[newIndex] = src; } template void VmaVector::reserve(size_t newCapacity, bool freeMemory) { - newCapacity = VMA_MAX(newCapacity, m_Count); + newCapacity = VMA_MAX(newCapacity, m_Count); - if ((newCapacity < m_Capacity) && !freeMemory) - { - newCapacity = m_Capacity; - } + if ((newCapacity < m_Capacity) && !freeMemory) + { + newCapacity = m_Capacity; + } - if (newCapacity != m_Capacity) - { - T* const newArray = newCapacity ? VmaAllocateArray(m_Allocator, newCapacity) : VMA_NULL; - if (m_Count != 0) - { - memcpy(newArray, m_pArray, m_Count * sizeof(T)); - } - VmaFree(m_Allocator.m_pCallbacks, m_pArray); - m_Capacity = newCapacity; - m_pArray = newArray; - } + if (newCapacity != m_Capacity) + { + T* const newArray = newCapacity ? VmaAllocateArray(m_Allocator, newCapacity) : VMA_NULL; + if (m_Count != 0) + { + memcpy(newArray, m_pArray, m_Count * sizeof(T)); + } + VmaFree(m_Allocator.m_pCallbacks, m_pArray); + m_Capacity = newCapacity; + m_pArray = newArray; + } } template void VmaVector::resize(size_t newCount) { - size_t newCapacity = m_Capacity; - if (newCount > m_Capacity) - { - newCapacity = VMA_MAX(newCount, VMA_MAX(m_Capacity * 3 / 2, (size_t)8)); - } + size_t newCapacity = m_Capacity; + if (newCount > m_Capacity) + { + newCapacity = VMA_MAX(newCount, VMA_MAX(m_Capacity * 3 / 2, (size_t)8)); + } - if (newCapacity != m_Capacity) - { - T* const newArray = newCapacity ? VmaAllocateArray(m_Allocator.m_pCallbacks, newCapacity) : VMA_NULL; - const size_t elementsToCopy = VMA_MIN(m_Count, newCount); - if (elementsToCopy != 0) - { - memcpy(newArray, m_pArray, elementsToCopy * sizeof(T)); - } - VmaFree(m_Allocator.m_pCallbacks, m_pArray); - m_Capacity = newCapacity; - m_pArray = newArray; - } + if (newCapacity != m_Capacity) + { + T* const newArray = newCapacity ? VmaAllocateArray(m_Allocator.m_pCallbacks, newCapacity) : VMA_NULL; + const size_t elementsToCopy = VMA_MIN(m_Count, newCount); + if (elementsToCopy != 0) + { + memcpy(newArray, m_pArray, elementsToCopy * sizeof(T)); + } + VmaFree(m_Allocator.m_pCallbacks, m_pArray); + m_Capacity = newCapacity; + m_pArray = newArray; + } - m_Count = newCount; + m_Count = newCount; } template void VmaVector::shrink_to_fit() { - if (m_Capacity > m_Count) - { - T* newArray = VMA_NULL; - if (m_Count > 0) - { - newArray = VmaAllocateArray(m_Allocator.m_pCallbacks, m_Count); - memcpy(newArray, m_pArray, m_Count * sizeof(T)); - } - VmaFree(m_Allocator.m_pCallbacks, m_pArray); - m_Capacity = m_Count; - m_pArray = newArray; - } + if (m_Capacity > m_Count) + { + T* newArray = VMA_NULL; + if (m_Count > 0) + { + newArray = VmaAllocateArray(m_Allocator.m_pCallbacks, m_Count); + memcpy(newArray, m_pArray, m_Count * sizeof(T)); + } + VmaFree(m_Allocator.m_pCallbacks, m_pArray); + m_Capacity = m_Count; + m_pArray = newArray; + } } template void VmaVector::insert(size_t index, const T& src) { - VMA_HEAVY_ASSERT(index <= m_Count); - const size_t oldCount = size(); - resize(oldCount + 1); - if (index < oldCount) - { - memmove(m_pArray + (index + 1), m_pArray + index, (oldCount - index) * sizeof(T)); - } - m_pArray[index] = src; + VMA_HEAVY_ASSERT(index <= m_Count); + const size_t oldCount = size(); + resize(oldCount + 1); + if (index < oldCount) + { + memmove(m_pArray + (index + 1), m_pArray + index, (oldCount - index) * sizeof(T)); + } + m_pArray[index] = src; } template void VmaVector::remove(size_t index) { - VMA_HEAVY_ASSERT(index < m_Count); - const size_t oldCount = size(); - if (index < oldCount - 1) - { - memmove(m_pArray + index, m_pArray + (index + 1), (oldCount - index - 1) * sizeof(T)); - } - resize(oldCount - 1); + VMA_HEAVY_ASSERT(index < m_Count); + const size_t oldCount = size(); + if (index < oldCount - 1) + { + memmove(m_pArray + index, m_pArray + (index + 1), (oldCount - index - 1) * sizeof(T)); + } + resize(oldCount - 1); } #endif // _VMA_VECTOR_FUNCTIONS template static void VmaVectorInsert(VmaVector& vec, size_t index, const T& item) { - vec.insert(index, item); + vec.insert(index, item); } template static void VmaVectorRemove(VmaVector& vec, size_t index) { - vec.remove(index); + vec.remove(index); } #endif // _VMA_VECTOR @@ -4290,146 +4571,143 @@ template class VmaSmallVector { public: - typedef T value_type; - typedef T* iterator; + typedef T value_type; + typedef T* iterator; - VmaSmallVector(const AllocatorT& allocator); - VmaSmallVector(size_t count, const AllocatorT& allocator); - template - VmaSmallVector(const VmaSmallVector&) = delete; - template - VmaSmallVector& operator=(const VmaSmallVector&) = delete; - ~VmaSmallVector() = default; + VmaSmallVector(const AllocatorT& allocator); + VmaSmallVector(size_t count, const AllocatorT& allocator); + template + VmaSmallVector(const VmaSmallVector&) = delete; + template + VmaSmallVector& operator=(const VmaSmallVector&) = delete; + ~VmaSmallVector() = default; - bool empty() const { return m_Count == 0; } - size_t size() const { return m_Count; } - T* data() { return m_Count > N ? m_DynamicArray.data() : m_StaticArray; } - T& front() { VMA_HEAVY_ASSERT(m_Count > 0); return data()[0]; } - T& back() { VMA_HEAVY_ASSERT(m_Count > 0); return data()[m_Count - 1]; } - const T* data() const { return m_Count > N ? m_DynamicArray.data() : m_StaticArray; } - const T& front() const { VMA_HEAVY_ASSERT(m_Count > 0); return data()[0]; } - const T& back() const { VMA_HEAVY_ASSERT(m_Count > 0); return data()[m_Count - 1]; } + bool empty() const { return m_Count == 0; } + size_t size() const { return m_Count; } + T* data() { return m_Count > N ? m_DynamicArray.data() : m_StaticArray; } + T& front() { VMA_HEAVY_ASSERT(m_Count > 0); return data()[0]; } + T& back() { VMA_HEAVY_ASSERT(m_Count > 0); return data()[m_Count - 1]; } + const T* data() const { return m_Count > N ? m_DynamicArray.data() : m_StaticArray; } + const T& front() const { VMA_HEAVY_ASSERT(m_Count > 0); return data()[0]; } + const T& back() const { VMA_HEAVY_ASSERT(m_Count > 0); return data()[m_Count - 1]; } - iterator begin() { return data(); } - iterator end() { return data() + m_Count; } + iterator begin() { return data(); } + iterator end() { return data() + m_Count; } - void pop_front() { VMA_HEAVY_ASSERT(m_Count > 0); remove(0); } - void pop_back() { VMA_HEAVY_ASSERT(m_Count > 0); resize(size() - 1); } - void push_front(const T& src) { insert(0, src); } + void pop_front() { VMA_HEAVY_ASSERT(m_Count > 0); remove(0); } + void pop_back() { VMA_HEAVY_ASSERT(m_Count > 0); resize(size() - 1); } + void push_front(const T& src) { insert(0, src); } - void push_back(const T& src); - void resize(size_t newCount, bool freeMemory = false); - void clear(bool freeMemory = false); - void insert(size_t index, const T& src); - void remove(size_t index); + void push_back(const T& src); + void resize(size_t newCount, bool freeMemory = false); + void clear(bool freeMemory = false); + void insert(size_t index, const T& src); + void remove(size_t index); - T& operator[](size_t index) { VMA_HEAVY_ASSERT(index < m_Count); return data()[index]; } - const T& operator[](size_t index) const { VMA_HEAVY_ASSERT(index < m_Count); return data()[index]; } + T& operator[](size_t index) { VMA_HEAVY_ASSERT(index < m_Count); return data()[index]; } + const T& operator[](size_t index) const { VMA_HEAVY_ASSERT(index < m_Count); return data()[index]; } private: - size_t m_Count; - T m_StaticArray[N]; // Used when m_Size <= N - VmaVector m_DynamicArray; // Used when m_Size > N + size_t m_Count; + T m_StaticArray[N]; // Used when m_Size <= N + VmaVector m_DynamicArray; // Used when m_Size > N }; #ifndef _VMA_SMALL_VECTOR_FUNCTIONS template VmaSmallVector::VmaSmallVector(const AllocatorT& allocator) - : m_Count(0), - m_DynamicArray(allocator) {} + : m_Count(0), + m_DynamicArray(allocator) {} template VmaSmallVector::VmaSmallVector(size_t count, const AllocatorT& allocator) - : m_Count(count), - m_DynamicArray(count > N ? count : 0, allocator) {} + : m_Count(count), + m_DynamicArray(count > N ? count : 0, allocator) {} template void VmaSmallVector::push_back(const T& src) { - const size_t newIndex = size(); - resize(newIndex + 1); - data()[newIndex] = src; + const size_t newIndex = size(); + resize(newIndex + 1); + data()[newIndex] = src; } template void VmaSmallVector::resize(size_t newCount, bool freeMemory) { - if (newCount > N && m_Count > N) - { - // Any direction, staying in m_DynamicArray - m_DynamicArray.resize(newCount); - if (freeMemory) - { - m_DynamicArray.shrink_to_fit(); - } - } - else if (newCount > N && m_Count <= N) - { - // Growing, moving from m_StaticArray to m_DynamicArray - m_DynamicArray.resize(newCount); - if (m_Count > 0) - { - memcpy(m_DynamicArray.data(), m_StaticArray, m_Count * sizeof(T)); - } - } - else if (newCount <= N && m_Count > N) - { - // Shrinking, moving from m_DynamicArray to m_StaticArray - if (newCount > 0) - { - memcpy(m_StaticArray, m_DynamicArray.data(), newCount * sizeof(T)); - } - m_DynamicArray.resize(0); - if (freeMemory) - { - m_DynamicArray.shrink_to_fit(); - } - } - else - { - // Any direction, staying in m_StaticArray - nothing to do here - } - m_Count = newCount; + if (newCount > N && m_Count > N) + { + // Any direction, staying in m_DynamicArray + m_DynamicArray.resize(newCount); + if (freeMemory) + { + m_DynamicArray.shrink_to_fit(); + } + } else if (newCount > N && m_Count <= N) + { + // Growing, moving from m_StaticArray to m_DynamicArray + m_DynamicArray.resize(newCount); + if (m_Count > 0) + { + memcpy(m_DynamicArray.data(), m_StaticArray, m_Count * sizeof(T)); + } + } else if (newCount <= N && m_Count > N) + { + // Shrinking, moving from m_DynamicArray to m_StaticArray + if (newCount > 0) + { + memcpy(m_StaticArray, m_DynamicArray.data(), newCount * sizeof(T)); + } + m_DynamicArray.resize(0); + if (freeMemory) + { + m_DynamicArray.shrink_to_fit(); + } + } else + { + // Any direction, staying in m_StaticArray - nothing to do here + } + m_Count = newCount; } template void VmaSmallVector::clear(bool freeMemory) { - m_DynamicArray.clear(); - if (freeMemory) - { - m_DynamicArray.shrink_to_fit(); - } - m_Count = 0; + m_DynamicArray.clear(); + if (freeMemory) + { + m_DynamicArray.shrink_to_fit(); + } + m_Count = 0; } template void VmaSmallVector::insert(size_t index, const T& src) { - VMA_HEAVY_ASSERT(index <= m_Count); - const size_t oldCount = size(); - resize(oldCount + 1); - T* const dataPtr = data(); - if (index < oldCount) - { - // I know, this could be more optimal for case where memmove can be memcpy directly from m_StaticArray to m_DynamicArray. - memmove(dataPtr + (index + 1), dataPtr + index, (oldCount - index) * sizeof(T)); - } - dataPtr[index] = src; + VMA_HEAVY_ASSERT(index <= m_Count); + const size_t oldCount = size(); + resize(oldCount + 1); + T* const dataPtr = data(); + if (index < oldCount) + { + // I know, this could be more optimal for case where memmove can be memcpy directly from m_StaticArray to m_DynamicArray. + memmove(dataPtr + (index + 1), dataPtr + index, (oldCount - index) * sizeof(T)); + } + dataPtr[index] = src; } template void VmaSmallVector::remove(size_t index) { - VMA_HEAVY_ASSERT(index < m_Count); - const size_t oldCount = size(); - if (index < oldCount - 1) - { - // I know, this could be more optimal for case where memmove can be memcpy directly from m_DynamicArray to m_StaticArray. - T* const dataPtr = data(); - memmove(dataPtr + index, dataPtr + (index + 1), (oldCount - index - 1) * sizeof(T)); - } - resize(oldCount - 1); + VMA_HEAVY_ASSERT(index < m_Count); + const size_t oldCount = size(); + if (index < oldCount - 1) + { + // I know, this could be more optimal for case where memmove can be memcpy directly from m_DynamicArray to m_StaticArray. + T* const dataPtr = data(); + memmove(dataPtr + index, dataPtr + (index + 1), (oldCount - index - 1) * sizeof(T)); + } + resize(oldCount - 1); } #endif // _VMA_SMALL_VECTOR_FUNCTIONS #endif // _VMA_SMALL_VECTOR @@ -4443,122 +4721,122 @@ allocator can create multiple blocks. template class VmaPoolAllocator { - VMA_CLASS_NO_COPY(VmaPoolAllocator) + VMA_CLASS_NO_COPY_NO_MOVE(VmaPoolAllocator) public: - VmaPoolAllocator(const VkAllocationCallbacks* pAllocationCallbacks, uint32_t firstBlockCapacity); - ~VmaPoolAllocator(); - template T* Alloc(Types&&... args); - void Free(T* ptr); + VmaPoolAllocator(const VkAllocationCallbacks* pAllocationCallbacks, uint32_t firstBlockCapacity); + ~VmaPoolAllocator(); + template T* Alloc(Types&&... args); + void Free(T* ptr); private: - union Item - { - uint32_t NextFreeIndex; - alignas(T) char Value[sizeof(T)]; - }; - struct ItemBlock - { - Item* pItems; - uint32_t Capacity; - uint32_t FirstFreeIndex; - }; + union Item + { + uint32_t NextFreeIndex; + alignas(T) char Value[sizeof(T)]; + }; + struct ItemBlock + { + Item* pItems; + uint32_t Capacity; + uint32_t FirstFreeIndex; + }; - const VkAllocationCallbacks* m_pAllocationCallbacks; - const uint32_t m_FirstBlockCapacity; - VmaVector> m_ItemBlocks; + const VkAllocationCallbacks* m_pAllocationCallbacks; + const uint32_t m_FirstBlockCapacity; + VmaVector> m_ItemBlocks; - ItemBlock& CreateNewBlock(); + ItemBlock& CreateNewBlock(); }; #ifndef _VMA_POOL_ALLOCATOR_FUNCTIONS template VmaPoolAllocator::VmaPoolAllocator(const VkAllocationCallbacks* pAllocationCallbacks, uint32_t firstBlockCapacity) - : m_pAllocationCallbacks(pAllocationCallbacks), - m_FirstBlockCapacity(firstBlockCapacity), - m_ItemBlocks(VmaStlAllocator(pAllocationCallbacks)) + : m_pAllocationCallbacks(pAllocationCallbacks), + m_FirstBlockCapacity(firstBlockCapacity), + m_ItemBlocks(VmaStlAllocator(pAllocationCallbacks)) { - VMA_ASSERT(m_FirstBlockCapacity > 1); + VMA_ASSERT(m_FirstBlockCapacity > 1); } template VmaPoolAllocator::~VmaPoolAllocator() { - for (size_t i = m_ItemBlocks.size(); i--;) - vma_delete_array(m_pAllocationCallbacks, m_ItemBlocks[i].pItems, m_ItemBlocks[i].Capacity); - m_ItemBlocks.clear(); + for (size_t i = m_ItemBlocks.size(); i--;) + vma_delete_array(m_pAllocationCallbacks, m_ItemBlocks[i].pItems, m_ItemBlocks[i].Capacity); + m_ItemBlocks.clear(); } template template T* VmaPoolAllocator::Alloc(Types&&... args) { - for (size_t i = m_ItemBlocks.size(); i--; ) - { - ItemBlock& block = m_ItemBlocks[i]; - // This block has some free items: Use first one. - if (block.FirstFreeIndex != UINT32_MAX) - { - Item* const pItem = &block.pItems[block.FirstFreeIndex]; - block.FirstFreeIndex = pItem->NextFreeIndex; - T* result = (T*)&pItem->Value; - new(result)T(std::forward(args)...); // Explicit constructor call. - return result; - } - } + for (size_t i = m_ItemBlocks.size(); i--; ) + { + ItemBlock& block = m_ItemBlocks[i]; + // This block has some free items: Use first one. + if (block.FirstFreeIndex != UINT32_MAX) + { + Item* const pItem = &block.pItems[block.FirstFreeIndex]; + block.FirstFreeIndex = pItem->NextFreeIndex; + T* result = (T*)&pItem->Value; + new(result)T(std::forward(args)...); // Explicit constructor call. + return result; + } + } - // No block has free item: Create new one and use it. - ItemBlock& newBlock = CreateNewBlock(); - Item* const pItem = &newBlock.pItems[0]; - newBlock.FirstFreeIndex = pItem->NextFreeIndex; - T* result = (T*)&pItem->Value; - new(result) T(std::forward(args)...); // Explicit constructor call. - return result; + // No block has free item: Create new one and use it. + ItemBlock& newBlock = CreateNewBlock(); + Item* const pItem = &newBlock.pItems[0]; + newBlock.FirstFreeIndex = pItem->NextFreeIndex; + T* result = (T*)&pItem->Value; + new(result) T(std::forward(args)...); // Explicit constructor call. + return result; } template void VmaPoolAllocator::Free(T* ptr) { - // Search all memory blocks to find ptr. - for (size_t i = m_ItemBlocks.size(); i--; ) - { - ItemBlock& block = m_ItemBlocks[i]; + // Search all memory blocks to find ptr. + for (size_t i = m_ItemBlocks.size(); i--; ) + { + ItemBlock& block = m_ItemBlocks[i]; - // Casting to union. - Item* pItemPtr; - memcpy(&pItemPtr, &ptr, sizeof(pItemPtr)); + // Casting to union. + Item* pItemPtr; + memcpy(&pItemPtr, &ptr, sizeof(pItemPtr)); - // Check if pItemPtr is in address range of this block. - if ((pItemPtr >= block.pItems) && (pItemPtr < block.pItems + block.Capacity)) - { - ptr->~T(); // Explicit destructor call. - const uint32_t index = static_cast(pItemPtr - block.pItems); - pItemPtr->NextFreeIndex = block.FirstFreeIndex; - block.FirstFreeIndex = index; - return; - } - } - VMA_ASSERT(0 && "Pointer doesn't belong to this memory pool."); + // Check if pItemPtr is in address range of this block. + if ((pItemPtr >= block.pItems) && (pItemPtr < block.pItems + block.Capacity)) + { + ptr->~T(); // Explicit destructor call. + const uint32_t index = static_cast(pItemPtr - block.pItems); + pItemPtr->NextFreeIndex = block.FirstFreeIndex; + block.FirstFreeIndex = index; + return; + } + } + VMA_ASSERT(0 && "Pointer doesn't belong to this memory pool."); } template typename VmaPoolAllocator::ItemBlock& VmaPoolAllocator::CreateNewBlock() { - const uint32_t newBlockCapacity = m_ItemBlocks.empty() ? - m_FirstBlockCapacity : m_ItemBlocks.back().Capacity * 3 / 2; + const uint32_t newBlockCapacity = m_ItemBlocks.empty() ? + m_FirstBlockCapacity : m_ItemBlocks.back().Capacity * 3 / 2; - const ItemBlock newBlock = - { - vma_new_array(m_pAllocationCallbacks, Item, newBlockCapacity), - newBlockCapacity, - 0 - }; + const ItemBlock newBlock = + { + vma_new_array(m_pAllocationCallbacks, Item, newBlockCapacity), + newBlockCapacity, + 0 + }; - m_ItemBlocks.push_back(newBlock); + m_ItemBlocks.push_back(newBlock); - // Setup singly-linked list of all free items in this block. - for (uint32_t i = 0; i < newBlockCapacity - 1; ++i) - newBlock.pItems[i].NextFreeIndex = i + 1; - newBlock.pItems[newBlockCapacity - 1].NextFreeIndex = UINT32_MAX; - return m_ItemBlocks.back(); + // Setup singly-linked list of all free items in this block. + for (uint32_t i = 0; i < newBlockCapacity - 1; ++i) + newBlock.pItems[i].NextFreeIndex = i + 1; + newBlock.pItems[newBlockCapacity - 1].NextFreeIndex = UINT32_MAX; + return m_ItemBlocks.back(); } #endif // _VMA_POOL_ALLOCATOR_FUNCTIONS #endif // _VMA_POOL_ALLOCATOR @@ -4567,270 +4845,262 @@ typename VmaPoolAllocator::ItemBlock& VmaPoolAllocator::CreateNewBlock() template struct VmaListItem { - VmaListItem* pPrev; - VmaListItem* pNext; - T Value; + VmaListItem* pPrev; + VmaListItem* pNext; + T Value; }; // Doubly linked list. template class VmaRawList { - VMA_CLASS_NO_COPY(VmaRawList) + VMA_CLASS_NO_COPY_NO_MOVE(VmaRawList) public: - typedef VmaListItem ItemType; + typedef VmaListItem ItemType; - VmaRawList(const VkAllocationCallbacks* pAllocationCallbacks); - // Intentionally not calling Clear, because that would be unnecessary - // computations to return all items to m_ItemAllocator as free. - ~VmaRawList() = default; + VmaRawList(const VkAllocationCallbacks* pAllocationCallbacks); + // Intentionally not calling Clear, because that would be unnecessary + // computations to return all items to m_ItemAllocator as free. + ~VmaRawList() = default; - size_t GetCount() const { return m_Count; } - bool IsEmpty() const { return m_Count == 0; } + size_t GetCount() const { return m_Count; } + bool IsEmpty() const { return m_Count == 0; } - ItemType* Front() { return m_pFront; } - ItemType* Back() { return m_pBack; } - const ItemType* Front() const { return m_pFront; } - const ItemType* Back() const { return m_pBack; } + ItemType* Front() { return m_pFront; } + ItemType* Back() { return m_pBack; } + const ItemType* Front() const { return m_pFront; } + const ItemType* Back() const { return m_pBack; } - ItemType* PushFront(); - ItemType* PushBack(); - ItemType* PushFront(const T& value); - ItemType* PushBack(const T& value); - void PopFront(); - void PopBack(); + ItemType* PushFront(); + ItemType* PushBack(); + ItemType* PushFront(const T& value); + ItemType* PushBack(const T& value); + void PopFront(); + void PopBack(); - // Item can be null - it means PushBack. - ItemType* InsertBefore(ItemType* pItem); - // Item can be null - it means PushFront. - ItemType* InsertAfter(ItemType* pItem); - ItemType* InsertBefore(ItemType* pItem, const T& value); - ItemType* InsertAfter(ItemType* pItem, const T& value); + // Item can be null - it means PushBack. + ItemType* InsertBefore(ItemType* pItem); + // Item can be null - it means PushFront. + ItemType* InsertAfter(ItemType* pItem); + ItemType* InsertBefore(ItemType* pItem, const T& value); + ItemType* InsertAfter(ItemType* pItem, const T& value); - void Clear(); - void Remove(ItemType* pItem); + void Clear(); + void Remove(ItemType* pItem); private: - const VkAllocationCallbacks* const m_pAllocationCallbacks; - VmaPoolAllocator m_ItemAllocator; - ItemType* m_pFront; - ItemType* m_pBack; - size_t m_Count; + const VkAllocationCallbacks* const m_pAllocationCallbacks; + VmaPoolAllocator m_ItemAllocator; + ItemType* m_pFront; + ItemType* m_pBack; + size_t m_Count; }; #ifndef _VMA_RAW_LIST_FUNCTIONS template VmaRawList::VmaRawList(const VkAllocationCallbacks* pAllocationCallbacks) - : m_pAllocationCallbacks(pAllocationCallbacks), - m_ItemAllocator(pAllocationCallbacks, 128), - m_pFront(VMA_NULL), - m_pBack(VMA_NULL), - m_Count(0) {} + : m_pAllocationCallbacks(pAllocationCallbacks), + m_ItemAllocator(pAllocationCallbacks, 128), + m_pFront(VMA_NULL), + m_pBack(VMA_NULL), + m_Count(0) {} template VmaListItem* VmaRawList::PushFront() { - ItemType* const pNewItem = m_ItemAllocator.Alloc(); - pNewItem->pPrev = VMA_NULL; - if (IsEmpty()) - { - pNewItem->pNext = VMA_NULL; - m_pFront = pNewItem; - m_pBack = pNewItem; - m_Count = 1; - } - else - { - pNewItem->pNext = m_pFront; - m_pFront->pPrev = pNewItem; - m_pFront = pNewItem; - ++m_Count; - } - return pNewItem; + ItemType* const pNewItem = m_ItemAllocator.Alloc(); + pNewItem->pPrev = VMA_NULL; + if (IsEmpty()) + { + pNewItem->pNext = VMA_NULL; + m_pFront = pNewItem; + m_pBack = pNewItem; + m_Count = 1; + } else + { + pNewItem->pNext = m_pFront; + m_pFront->pPrev = pNewItem; + m_pFront = pNewItem; + ++m_Count; + } + return pNewItem; } template VmaListItem* VmaRawList::PushBack() { - ItemType* const pNewItem = m_ItemAllocator.Alloc(); - pNewItem->pNext = VMA_NULL; - if(IsEmpty()) - { - pNewItem->pPrev = VMA_NULL; - m_pFront = pNewItem; - m_pBack = pNewItem; - m_Count = 1; - } - else - { - pNewItem->pPrev = m_pBack; - m_pBack->pNext = pNewItem; - m_pBack = pNewItem; - ++m_Count; - } - return pNewItem; + ItemType* const pNewItem = m_ItemAllocator.Alloc(); + pNewItem->pNext = VMA_NULL; + if (IsEmpty()) + { + pNewItem->pPrev = VMA_NULL; + m_pFront = pNewItem; + m_pBack = pNewItem; + m_Count = 1; + } else + { + pNewItem->pPrev = m_pBack; + m_pBack->pNext = pNewItem; + m_pBack = pNewItem; + ++m_Count; + } + return pNewItem; } template VmaListItem* VmaRawList::PushFront(const T& value) { - ItemType* const pNewItem = PushFront(); - pNewItem->Value = value; - return pNewItem; + ItemType* const pNewItem = PushFront(); + pNewItem->Value = value; + return pNewItem; } template VmaListItem* VmaRawList::PushBack(const T& value) { - ItemType* const pNewItem = PushBack(); - pNewItem->Value = value; - return pNewItem; + ItemType* const pNewItem = PushBack(); + pNewItem->Value = value; + return pNewItem; } template void VmaRawList::PopFront() { - VMA_HEAVY_ASSERT(m_Count > 0); - ItemType* const pFrontItem = m_pFront; - ItemType* const pNextItem = pFrontItem->pNext; - if (pNextItem != VMA_NULL) - { - pNextItem->pPrev = VMA_NULL; - } - m_pFront = pNextItem; - m_ItemAllocator.Free(pFrontItem); - --m_Count; + VMA_HEAVY_ASSERT(m_Count > 0); + ItemType* const pFrontItem = m_pFront; + ItemType* const pNextItem = pFrontItem->pNext; + if (pNextItem != VMA_NULL) + { + pNextItem->pPrev = VMA_NULL; + } + m_pFront = pNextItem; + m_ItemAllocator.Free(pFrontItem); + --m_Count; } template void VmaRawList::PopBack() { - VMA_HEAVY_ASSERT(m_Count > 0); - ItemType* const pBackItem = m_pBack; - ItemType* const pPrevItem = pBackItem->pPrev; - if(pPrevItem != VMA_NULL) - { - pPrevItem->pNext = VMA_NULL; - } - m_pBack = pPrevItem; - m_ItemAllocator.Free(pBackItem); - --m_Count; + VMA_HEAVY_ASSERT(m_Count > 0); + ItemType* const pBackItem = m_pBack; + ItemType* const pPrevItem = pBackItem->pPrev; + if (pPrevItem != VMA_NULL) + { + pPrevItem->pNext = VMA_NULL; + } + m_pBack = pPrevItem; + m_ItemAllocator.Free(pBackItem); + --m_Count; } template void VmaRawList::Clear() { - if (IsEmpty() == false) - { - ItemType* pItem = m_pBack; - while (pItem != VMA_NULL) - { - ItemType* const pPrevItem = pItem->pPrev; - m_ItemAllocator.Free(pItem); - pItem = pPrevItem; - } - m_pFront = VMA_NULL; - m_pBack = VMA_NULL; - m_Count = 0; - } + if (IsEmpty() == false) + { + ItemType* pItem = m_pBack; + while (pItem != VMA_NULL) + { + ItemType* const pPrevItem = pItem->pPrev; + m_ItemAllocator.Free(pItem); + pItem = pPrevItem; + } + m_pFront = VMA_NULL; + m_pBack = VMA_NULL; + m_Count = 0; + } } template void VmaRawList::Remove(ItemType* pItem) { - VMA_HEAVY_ASSERT(pItem != VMA_NULL); - VMA_HEAVY_ASSERT(m_Count > 0); + VMA_HEAVY_ASSERT(pItem != VMA_NULL); + VMA_HEAVY_ASSERT(m_Count > 0); - if(pItem->pPrev != VMA_NULL) - { - pItem->pPrev->pNext = pItem->pNext; - } - else - { - VMA_HEAVY_ASSERT(m_pFront == pItem); - m_pFront = pItem->pNext; - } + if (pItem->pPrev != VMA_NULL) + { + pItem->pPrev->pNext = pItem->pNext; + } else + { + VMA_HEAVY_ASSERT(m_pFront == pItem); + m_pFront = pItem->pNext; + } - if(pItem->pNext != VMA_NULL) - { - pItem->pNext->pPrev = pItem->pPrev; - } - else - { - VMA_HEAVY_ASSERT(m_pBack == pItem); - m_pBack = pItem->pPrev; - } + if (pItem->pNext != VMA_NULL) + { + pItem->pNext->pPrev = pItem->pPrev; + } else + { + VMA_HEAVY_ASSERT(m_pBack == pItem); + m_pBack = pItem->pPrev; + } - m_ItemAllocator.Free(pItem); - --m_Count; + m_ItemAllocator.Free(pItem); + --m_Count; } template VmaListItem* VmaRawList::InsertBefore(ItemType* pItem) { - if(pItem != VMA_NULL) - { - ItemType* const prevItem = pItem->pPrev; - ItemType* const newItem = m_ItemAllocator.Alloc(); - newItem->pPrev = prevItem; - newItem->pNext = pItem; - pItem->pPrev = newItem; - if(prevItem != VMA_NULL) - { - prevItem->pNext = newItem; - } - else - { - VMA_HEAVY_ASSERT(m_pFront == pItem); - m_pFront = newItem; - } - ++m_Count; - return newItem; - } - else - return PushBack(); + if (pItem != VMA_NULL) + { + ItemType* const prevItem = pItem->pPrev; + ItemType* const newItem = m_ItemAllocator.Alloc(); + newItem->pPrev = prevItem; + newItem->pNext = pItem; + pItem->pPrev = newItem; + if (prevItem != VMA_NULL) + { + prevItem->pNext = newItem; + } else + { + VMA_HEAVY_ASSERT(m_pFront == pItem); + m_pFront = newItem; + } + ++m_Count; + return newItem; + } else + return PushBack(); } template VmaListItem* VmaRawList::InsertAfter(ItemType* pItem) { - if(pItem != VMA_NULL) - { - ItemType* const nextItem = pItem->pNext; - ItemType* const newItem = m_ItemAllocator.Alloc(); - newItem->pNext = nextItem; - newItem->pPrev = pItem; - pItem->pNext = newItem; - if(nextItem != VMA_NULL) - { - nextItem->pPrev = newItem; - } - else - { - VMA_HEAVY_ASSERT(m_pBack == pItem); - m_pBack = newItem; - } - ++m_Count; - return newItem; - } - else - return PushFront(); + if (pItem != VMA_NULL) + { + ItemType* const nextItem = pItem->pNext; + ItemType* const newItem = m_ItemAllocator.Alloc(); + newItem->pNext = nextItem; + newItem->pPrev = pItem; + pItem->pNext = newItem; + if (nextItem != VMA_NULL) + { + nextItem->pPrev = newItem; + } else + { + VMA_HEAVY_ASSERT(m_pBack == pItem); + m_pBack = newItem; + } + ++m_Count; + return newItem; + } else + return PushFront(); } template VmaListItem* VmaRawList::InsertBefore(ItemType* pItem, const T& value) { - ItemType* const newItem = InsertBefore(pItem); - newItem->Value = value; - return newItem; + ItemType* const newItem = InsertBefore(pItem); + newItem->Value = value; + return newItem; } template VmaListItem* VmaRawList::InsertAfter(ItemType* pItem, const T& value) { - ItemType* const newItem = InsertAfter(pItem); - newItem->Value = value; - return newItem; + ItemType* const newItem = InsertAfter(pItem); + newItem->Value = value; + return newItem; } #endif // _VMA_RAW_LIST_FUNCTIONS #endif // _VMA_RAW_LIST @@ -4839,213 +5109,209 @@ VmaListItem* VmaRawList::InsertAfter(ItemType* pItem, const T& value) template class VmaList { - VMA_CLASS_NO_COPY(VmaList) + VMA_CLASS_NO_COPY_NO_MOVE(VmaList) public: - class reverse_iterator; - class const_iterator; - class const_reverse_iterator; + class reverse_iterator; + class const_iterator; + class const_reverse_iterator; - class iterator - { - friend class const_iterator; - friend class VmaList; - public: - iterator() : m_pList(VMA_NULL), m_pItem(VMA_NULL) {} - iterator(const reverse_iterator& src) : m_pList(src.m_pList), m_pItem(src.m_pItem) {} + class iterator + { + friend class const_iterator; + friend class VmaList; + public: + iterator() : m_pList(VMA_NULL), m_pItem(VMA_NULL) {} + iterator(const reverse_iterator& src) : m_pList(src.m_pList), m_pItem(src.m_pItem) {} - T& operator*() const { VMA_HEAVY_ASSERT(m_pItem != VMA_NULL); return m_pItem->Value; } - T* operator->() const { VMA_HEAVY_ASSERT(m_pItem != VMA_NULL); return &m_pItem->Value; } + T& operator*() const { VMA_HEAVY_ASSERT(m_pItem != VMA_NULL); return m_pItem->Value; } + T* operator->() const { VMA_HEAVY_ASSERT(m_pItem != VMA_NULL); return &m_pItem->Value; } - bool operator==(const iterator& rhs) const { VMA_HEAVY_ASSERT(m_pList == rhs.m_pList); return m_pItem == rhs.m_pItem; } - bool operator!=(const iterator& rhs) const { VMA_HEAVY_ASSERT(m_pList == rhs.m_pList); return m_pItem != rhs.m_pItem; } + bool operator==(const iterator& rhs) const { VMA_HEAVY_ASSERT(m_pList == rhs.m_pList); return m_pItem == rhs.m_pItem; } + bool operator!=(const iterator& rhs) const { VMA_HEAVY_ASSERT(m_pList == rhs.m_pList); return m_pItem != rhs.m_pItem; } - iterator operator++(int) { iterator result = *this; ++*this; return result; } - iterator operator--(int) { iterator result = *this; --*this; return result; } + iterator operator++(int) { iterator result = *this; ++*this; return result; } + iterator operator--(int) { iterator result = *this; --*this; return result; } - iterator& operator++() { VMA_HEAVY_ASSERT(m_pItem != VMA_NULL); m_pItem = m_pItem->pNext; return *this; } - iterator& operator--(); + iterator& operator++() { VMA_HEAVY_ASSERT(m_pItem != VMA_NULL); m_pItem = m_pItem->pNext; return *this; } + iterator& operator--(); - private: - VmaRawList* m_pList; - VmaListItem* m_pItem; + private: + VmaRawList* m_pList; + VmaListItem* m_pItem; - iterator(VmaRawList* pList, VmaListItem* pItem) : m_pList(pList), m_pItem(pItem) {} - }; - class reverse_iterator - { - friend class const_reverse_iterator; - friend class VmaList; - public: - reverse_iterator() : m_pList(VMA_NULL), m_pItem(VMA_NULL) {} - reverse_iterator(const iterator& src) : m_pList(src.m_pList), m_pItem(src.m_pItem) {} + iterator(VmaRawList* pList, VmaListItem* pItem) : m_pList(pList), m_pItem(pItem) {} + }; + class reverse_iterator + { + friend class const_reverse_iterator; + friend class VmaList; + public: + reverse_iterator() : m_pList(VMA_NULL), m_pItem(VMA_NULL) {} + reverse_iterator(const iterator& src) : m_pList(src.m_pList), m_pItem(src.m_pItem) {} - T& operator*() const { VMA_HEAVY_ASSERT(m_pItem != VMA_NULL); return m_pItem->Value; } - T* operator->() const { VMA_HEAVY_ASSERT(m_pItem != VMA_NULL); return &m_pItem->Value; } + T& operator*() const { VMA_HEAVY_ASSERT(m_pItem != VMA_NULL); return m_pItem->Value; } + T* operator->() const { VMA_HEAVY_ASSERT(m_pItem != VMA_NULL); return &m_pItem->Value; } - bool operator==(const reverse_iterator& rhs) const { VMA_HEAVY_ASSERT(m_pList == rhs.m_pList); return m_pItem == rhs.m_pItem; } - bool operator!=(const reverse_iterator& rhs) const { VMA_HEAVY_ASSERT(m_pList == rhs.m_pList); return m_pItem != rhs.m_pItem; } + bool operator==(const reverse_iterator& rhs) const { VMA_HEAVY_ASSERT(m_pList == rhs.m_pList); return m_pItem == rhs.m_pItem; } + bool operator!=(const reverse_iterator& rhs) const { VMA_HEAVY_ASSERT(m_pList == rhs.m_pList); return m_pItem != rhs.m_pItem; } - reverse_iterator operator++(int) { reverse_iterator result = *this; ++* this; return result; } - reverse_iterator operator--(int) { reverse_iterator result = *this; --* this; return result; } + reverse_iterator operator++(int) { reverse_iterator result = *this; ++*this; return result; } + reverse_iterator operator--(int) { reverse_iterator result = *this; --*this; return result; } - reverse_iterator& operator++() { VMA_HEAVY_ASSERT(m_pItem != VMA_NULL); m_pItem = m_pItem->pPrev; return *this; } - reverse_iterator& operator--(); + reverse_iterator& operator++() { VMA_HEAVY_ASSERT(m_pItem != VMA_NULL); m_pItem = m_pItem->pPrev; return *this; } + reverse_iterator& operator--(); - private: - VmaRawList* m_pList; - VmaListItem* m_pItem; + private: + VmaRawList* m_pList; + VmaListItem* m_pItem; - reverse_iterator(VmaRawList* pList, VmaListItem* pItem) : m_pList(pList), m_pItem(pItem) {} - }; - class const_iterator - { - friend class VmaList; - public: - const_iterator() : m_pList(VMA_NULL), m_pItem(VMA_NULL) {} - const_iterator(const iterator& src) : m_pList(src.m_pList), m_pItem(src.m_pItem) {} - const_iterator(const reverse_iterator& src) : m_pList(src.m_pList), m_pItem(src.m_pItem) {} + reverse_iterator(VmaRawList* pList, VmaListItem* pItem) : m_pList(pList), m_pItem(pItem) {} + }; + class const_iterator + { + friend class VmaList; + public: + const_iterator() : m_pList(VMA_NULL), m_pItem(VMA_NULL) {} + const_iterator(const iterator& src) : m_pList(src.m_pList), m_pItem(src.m_pItem) {} + const_iterator(const reverse_iterator& src) : m_pList(src.m_pList), m_pItem(src.m_pItem) {} - iterator drop_const() { return { const_cast*>(m_pList), const_cast*>(m_pItem) }; } + iterator drop_const() { return { const_cast*>(m_pList), const_cast*>(m_pItem) }; } - const T& operator*() const { VMA_HEAVY_ASSERT(m_pItem != VMA_NULL); return m_pItem->Value; } - const T* operator->() const { VMA_HEAVY_ASSERT(m_pItem != VMA_NULL); return &m_pItem->Value; } + const T& operator*() const { VMA_HEAVY_ASSERT(m_pItem != VMA_NULL); return m_pItem->Value; } + const T* operator->() const { VMA_HEAVY_ASSERT(m_pItem != VMA_NULL); return &m_pItem->Value; } - bool operator==(const const_iterator& rhs) const { VMA_HEAVY_ASSERT(m_pList == rhs.m_pList); return m_pItem == rhs.m_pItem; } - bool operator!=(const const_iterator& rhs) const { VMA_HEAVY_ASSERT(m_pList == rhs.m_pList); return m_pItem != rhs.m_pItem; } + bool operator==(const const_iterator& rhs) const { VMA_HEAVY_ASSERT(m_pList == rhs.m_pList); return m_pItem == rhs.m_pItem; } + bool operator!=(const const_iterator& rhs) const { VMA_HEAVY_ASSERT(m_pList == rhs.m_pList); return m_pItem != rhs.m_pItem; } - const_iterator operator++(int) { const_iterator result = *this; ++* this; return result; } - const_iterator operator--(int) { const_iterator result = *this; --* this; return result; } + const_iterator operator++(int) { const_iterator result = *this; ++*this; return result; } + const_iterator operator--(int) { const_iterator result = *this; --*this; return result; } - const_iterator& operator++() { VMA_HEAVY_ASSERT(m_pItem != VMA_NULL); m_pItem = m_pItem->pNext; return *this; } - const_iterator& operator--(); + const_iterator& operator++() { VMA_HEAVY_ASSERT(m_pItem != VMA_NULL); m_pItem = m_pItem->pNext; return *this; } + const_iterator& operator--(); - private: - const VmaRawList* m_pList; - const VmaListItem* m_pItem; + private: + const VmaRawList* m_pList; + const VmaListItem* m_pItem; - const_iterator(const VmaRawList* pList, const VmaListItem* pItem) : m_pList(pList), m_pItem(pItem) {} - }; - class const_reverse_iterator - { - friend class VmaList; - public: - const_reverse_iterator() : m_pList(VMA_NULL), m_pItem(VMA_NULL) {} - const_reverse_iterator(const reverse_iterator& src) : m_pList(src.m_pList), m_pItem(src.m_pItem) {} - const_reverse_iterator(const iterator& src) : m_pList(src.m_pList), m_pItem(src.m_pItem) {} + const_iterator(const VmaRawList* pList, const VmaListItem* pItem) : m_pList(pList), m_pItem(pItem) {} + }; + class const_reverse_iterator + { + friend class VmaList; + public: + const_reverse_iterator() : m_pList(VMA_NULL), m_pItem(VMA_NULL) {} + const_reverse_iterator(const reverse_iterator& src) : m_pList(src.m_pList), m_pItem(src.m_pItem) {} + const_reverse_iterator(const iterator& src) : m_pList(src.m_pList), m_pItem(src.m_pItem) {} - reverse_iterator drop_const() { return { const_cast*>(m_pList), const_cast*>(m_pItem) }; } + reverse_iterator drop_const() { return { const_cast*>(m_pList), const_cast*>(m_pItem) }; } - const T& operator*() const { VMA_HEAVY_ASSERT(m_pItem != VMA_NULL); return m_pItem->Value; } - const T* operator->() const { VMA_HEAVY_ASSERT(m_pItem != VMA_NULL); return &m_pItem->Value; } + const T& operator*() const { VMA_HEAVY_ASSERT(m_pItem != VMA_NULL); return m_pItem->Value; } + const T* operator->() const { VMA_HEAVY_ASSERT(m_pItem != VMA_NULL); return &m_pItem->Value; } - bool operator==(const const_reverse_iterator& rhs) const { VMA_HEAVY_ASSERT(m_pList == rhs.m_pList); return m_pItem == rhs.m_pItem; } - bool operator!=(const const_reverse_iterator& rhs) const { VMA_HEAVY_ASSERT(m_pList == rhs.m_pList); return m_pItem != rhs.m_pItem; } + bool operator==(const const_reverse_iterator& rhs) const { VMA_HEAVY_ASSERT(m_pList == rhs.m_pList); return m_pItem == rhs.m_pItem; } + bool operator!=(const const_reverse_iterator& rhs) const { VMA_HEAVY_ASSERT(m_pList == rhs.m_pList); return m_pItem != rhs.m_pItem; } - const_reverse_iterator operator++(int) { const_reverse_iterator result = *this; ++* this; return result; } - const_reverse_iterator operator--(int) { const_reverse_iterator result = *this; --* this; return result; } + const_reverse_iterator operator++(int) { const_reverse_iterator result = *this; ++*this; return result; } + const_reverse_iterator operator--(int) { const_reverse_iterator result = *this; --*this; return result; } - const_reverse_iterator& operator++() { VMA_HEAVY_ASSERT(m_pItem != VMA_NULL); m_pItem = m_pItem->pPrev; return *this; } - const_reverse_iterator& operator--(); + const_reverse_iterator& operator++() { VMA_HEAVY_ASSERT(m_pItem != VMA_NULL); m_pItem = m_pItem->pPrev; return *this; } + const_reverse_iterator& operator--(); - private: - const VmaRawList* m_pList; - const VmaListItem* m_pItem; + private: + const VmaRawList* m_pList; + const VmaListItem* m_pItem; - const_reverse_iterator(const VmaRawList* pList, const VmaListItem* pItem) : m_pList(pList), m_pItem(pItem) {} - }; + const_reverse_iterator(const VmaRawList* pList, const VmaListItem* pItem) : m_pList(pList), m_pItem(pItem) {} + }; - VmaList(const AllocatorT& allocator) : m_RawList(allocator.m_pCallbacks) {} + VmaList(const AllocatorT& allocator) : m_RawList(allocator.m_pCallbacks) {} - bool empty() const { return m_RawList.IsEmpty(); } - size_t size() const { return m_RawList.GetCount(); } + bool empty() const { return m_RawList.IsEmpty(); } + size_t size() const { return m_RawList.GetCount(); } - iterator begin() { return iterator(&m_RawList, m_RawList.Front()); } - iterator end() { return iterator(&m_RawList, VMA_NULL); } + iterator begin() { return iterator(&m_RawList, m_RawList.Front()); } + iterator end() { return iterator(&m_RawList, VMA_NULL); } - const_iterator cbegin() const { return const_iterator(&m_RawList, m_RawList.Front()); } - const_iterator cend() const { return const_iterator(&m_RawList, VMA_NULL); } + const_iterator cbegin() const { return const_iterator(&m_RawList, m_RawList.Front()); } + const_iterator cend() const { return const_iterator(&m_RawList, VMA_NULL); } - const_iterator begin() const { return cbegin(); } - const_iterator end() const { return cend(); } + const_iterator begin() const { return cbegin(); } + const_iterator end() const { return cend(); } - reverse_iterator rbegin() { return reverse_iterator(&m_RawList, m_RawList.Back()); } - reverse_iterator rend() { return reverse_iterator(&m_RawList, VMA_NULL); } + reverse_iterator rbegin() { return reverse_iterator(&m_RawList, m_RawList.Back()); } + reverse_iterator rend() { return reverse_iterator(&m_RawList, VMA_NULL); } - const_reverse_iterator crbegin() const { return const_reverse_iterator(&m_RawList, m_RawList.Back()); } - const_reverse_iterator crend() const { return const_reverse_iterator(&m_RawList, VMA_NULL); } + const_reverse_iterator crbegin() const { return const_reverse_iterator(&m_RawList, m_RawList.Back()); } + const_reverse_iterator crend() const { return const_reverse_iterator(&m_RawList, VMA_NULL); } - const_reverse_iterator rbegin() const { return crbegin(); } - const_reverse_iterator rend() const { return crend(); } + const_reverse_iterator rbegin() const { return crbegin(); } + const_reverse_iterator rend() const { return crend(); } - void push_back(const T& value) { m_RawList.PushBack(value); } - iterator insert(iterator it, const T& value) { return iterator(&m_RawList, m_RawList.InsertBefore(it.m_pItem, value)); } + void push_back(const T& value) { m_RawList.PushBack(value); } + iterator insert(iterator it, const T& value) { return iterator(&m_RawList, m_RawList.InsertBefore(it.m_pItem, value)); } - void clear() { m_RawList.Clear(); } - void erase(iterator it) { m_RawList.Remove(it.m_pItem); } + void clear() { m_RawList.Clear(); } + void erase(iterator it) { m_RawList.Remove(it.m_pItem); } private: - VmaRawList m_RawList; + VmaRawList m_RawList; }; #ifndef _VMA_LIST_FUNCTIONS template typename VmaList::iterator& VmaList::iterator::operator--() { - if (m_pItem != VMA_NULL) - { - m_pItem = m_pItem->pPrev; - } - else - { - VMA_HEAVY_ASSERT(!m_pList->IsEmpty()); - m_pItem = m_pList->Back(); - } - return *this; + if (m_pItem != VMA_NULL) + { + m_pItem = m_pItem->pPrev; + } else + { + VMA_HEAVY_ASSERT(!m_pList->IsEmpty()); + m_pItem = m_pList->Back(); + } + return *this; } template typename VmaList::reverse_iterator& VmaList::reverse_iterator::operator--() { - if (m_pItem != VMA_NULL) - { - m_pItem = m_pItem->pNext; - } - else - { - VMA_HEAVY_ASSERT(!m_pList->IsEmpty()); - m_pItem = m_pList->Front(); - } - return *this; + if (m_pItem != VMA_NULL) + { + m_pItem = m_pItem->pNext; + } else + { + VMA_HEAVY_ASSERT(!m_pList->IsEmpty()); + m_pItem = m_pList->Front(); + } + return *this; } template typename VmaList::const_iterator& VmaList::const_iterator::operator--() { - if (m_pItem != VMA_NULL) - { - m_pItem = m_pItem->pPrev; - } - else - { - VMA_HEAVY_ASSERT(!m_pList->IsEmpty()); - m_pItem = m_pList->Back(); - } - return *this; + if (m_pItem != VMA_NULL) + { + m_pItem = m_pItem->pPrev; + } else + { + VMA_HEAVY_ASSERT(!m_pList->IsEmpty()); + m_pItem = m_pList->Back(); + } + return *this; } template typename VmaList::const_reverse_iterator& VmaList::const_reverse_iterator::operator--() { - if (m_pItem != VMA_NULL) - { - m_pItem = m_pItem->pNext; - } - else - { - VMA_HEAVY_ASSERT(!m_pList->IsEmpty()); - m_pItem = m_pList->Back(); - } - return *this; + if (m_pItem != VMA_NULL) + { + m_pItem = m_pItem->pNext; + } else + { + VMA_HEAVY_ASSERT(!m_pList->IsEmpty()); + m_pItem = m_pList->Back(); + } + return *this; } #endif // _VMA_LIST_FUNCTIONS #endif // _VMA_LIST @@ -5055,406 +5321,305 @@ typename VmaList::const_reverse_iterator& VmaList: Expected interface of ItemTypeTraits: struct MyItemTypeTraits { - typedef MyItem ItemType; - static ItemType* GetPrev(const ItemType* item) { return item->myPrevPtr; } - static ItemType* GetNext(const ItemType* item) { return item->myNextPtr; } - static ItemType*& AccessPrev(ItemType* item) { return item->myPrevPtr; } - static ItemType*& AccessNext(ItemType* item) { return item->myNextPtr; } + typedef MyItem ItemType; + static ItemType* GetPrev(const ItemType* item) { return item->myPrevPtr; } + static ItemType* GetNext(const ItemType* item) { return item->myNextPtr; } + static ItemType*& AccessPrev(ItemType* item) { return item->myPrevPtr; } + static ItemType*& AccessNext(ItemType* item) { return item->myNextPtr; } }; */ template class VmaIntrusiveLinkedList { public: - typedef typename ItemTypeTraits::ItemType ItemType; - static ItemType* GetPrev(const ItemType* item) { return ItemTypeTraits::GetPrev(item); } - static ItemType* GetNext(const ItemType* item) { return ItemTypeTraits::GetNext(item); } + typedef typename ItemTypeTraits::ItemType ItemType; + static ItemType* GetPrev(const ItemType* item) { return ItemTypeTraits::GetPrev(item); } + static ItemType* GetNext(const ItemType* item) { return ItemTypeTraits::GetNext(item); } - // Movable, not copyable. - VmaIntrusiveLinkedList() = default; - VmaIntrusiveLinkedList(VmaIntrusiveLinkedList && src); - VmaIntrusiveLinkedList(const VmaIntrusiveLinkedList&) = delete; - VmaIntrusiveLinkedList& operator=(VmaIntrusiveLinkedList&& src); - VmaIntrusiveLinkedList& operator=(const VmaIntrusiveLinkedList&) = delete; - ~VmaIntrusiveLinkedList() { VMA_HEAVY_ASSERT(IsEmpty()); } + // Movable, not copyable. + VmaIntrusiveLinkedList() = default; + VmaIntrusiveLinkedList(VmaIntrusiveLinkedList && src); + VmaIntrusiveLinkedList(const VmaIntrusiveLinkedList&) = delete; + VmaIntrusiveLinkedList& operator=(VmaIntrusiveLinkedList&& src); + VmaIntrusiveLinkedList& operator=(const VmaIntrusiveLinkedList&) = delete; + ~VmaIntrusiveLinkedList() { VMA_HEAVY_ASSERT(IsEmpty()); } - size_t GetCount() const { return m_Count; } - bool IsEmpty() const { return m_Count == 0; } - ItemType* Front() { return m_Front; } - ItemType* Back() { return m_Back; } - const ItemType* Front() const { return m_Front; } - const ItemType* Back() const { return m_Back; } + size_t GetCount() const { return m_Count; } + bool IsEmpty() const { return m_Count == 0; } + ItemType* Front() { return m_Front; } + ItemType* Back() { return m_Back; } + const ItemType* Front() const { return m_Front; } + const ItemType* Back() const { return m_Back; } - void PushBack(ItemType* item); - void PushFront(ItemType* item); - ItemType* PopBack(); - ItemType* PopFront(); + void PushBack(ItemType* item); + void PushFront(ItemType* item); + ItemType* PopBack(); + ItemType* PopFront(); - // MyItem can be null - it means PushBack. - void InsertBefore(ItemType* existingItem, ItemType* newItem); - // MyItem can be null - it means PushFront. - void InsertAfter(ItemType* existingItem, ItemType* newItem); - void Remove(ItemType* item); - void RemoveAll(); + // MyItem can be null - it means PushBack. + void InsertBefore(ItemType* existingItem, ItemType* newItem); + // MyItem can be null - it means PushFront. + void InsertAfter(ItemType* existingItem, ItemType* newItem); + void Remove(ItemType* item); + void RemoveAll(); private: - ItemType* m_Front = VMA_NULL; - ItemType* m_Back = VMA_NULL; - size_t m_Count = 0; + ItemType* m_Front = VMA_NULL; + ItemType* m_Back = VMA_NULL; + size_t m_Count = 0; }; #ifndef _VMA_INTRUSIVE_LINKED_LIST_FUNCTIONS template VmaIntrusiveLinkedList::VmaIntrusiveLinkedList(VmaIntrusiveLinkedList&& src) - : m_Front(src.m_Front), m_Back(src.m_Back), m_Count(src.m_Count) + : m_Front(src.m_Front), m_Back(src.m_Back), m_Count(src.m_Count) { - src.m_Front = src.m_Back = VMA_NULL; - src.m_Count = 0; + src.m_Front = src.m_Back = VMA_NULL; + src.m_Count = 0; } template VmaIntrusiveLinkedList& VmaIntrusiveLinkedList::operator=(VmaIntrusiveLinkedList&& src) { - if (&src != this) - { - VMA_HEAVY_ASSERT(IsEmpty()); - m_Front = src.m_Front; - m_Back = src.m_Back; - m_Count = src.m_Count; - src.m_Front = src.m_Back = VMA_NULL; - src.m_Count = 0; - } - return *this; + if (&src != this) + { + VMA_HEAVY_ASSERT(IsEmpty()); + m_Front = src.m_Front; + m_Back = src.m_Back; + m_Count = src.m_Count; + src.m_Front = src.m_Back = VMA_NULL; + src.m_Count = 0; + } + return *this; } template void VmaIntrusiveLinkedList::PushBack(ItemType* item) { - VMA_HEAVY_ASSERT(ItemTypeTraits::GetPrev(item) == VMA_NULL && ItemTypeTraits::GetNext(item) == VMA_NULL); - if (IsEmpty()) - { - m_Front = item; - m_Back = item; - m_Count = 1; - } - else - { - ItemTypeTraits::AccessPrev(item) = m_Back; - ItemTypeTraits::AccessNext(m_Back) = item; - m_Back = item; - ++m_Count; - } + VMA_HEAVY_ASSERT(ItemTypeTraits::GetPrev(item) == VMA_NULL && ItemTypeTraits::GetNext(item) == VMA_NULL); + if (IsEmpty()) + { + m_Front = item; + m_Back = item; + m_Count = 1; + } else + { + ItemTypeTraits::AccessPrev(item) = m_Back; + ItemTypeTraits::AccessNext(m_Back) = item; + m_Back = item; + ++m_Count; + } } template void VmaIntrusiveLinkedList::PushFront(ItemType* item) { - VMA_HEAVY_ASSERT(ItemTypeTraits::GetPrev(item) == VMA_NULL && ItemTypeTraits::GetNext(item) == VMA_NULL); - if (IsEmpty()) - { - m_Front = item; - m_Back = item; - m_Count = 1; - } - else - { - ItemTypeTraits::AccessNext(item) = m_Front; - ItemTypeTraits::AccessPrev(m_Front) = item; - m_Front = item; - ++m_Count; - } + VMA_HEAVY_ASSERT(ItemTypeTraits::GetPrev(item) == VMA_NULL && ItemTypeTraits::GetNext(item) == VMA_NULL); + if (IsEmpty()) + { + m_Front = item; + m_Back = item; + m_Count = 1; + } else + { + ItemTypeTraits::AccessNext(item) = m_Front; + ItemTypeTraits::AccessPrev(m_Front) = item; + m_Front = item; + ++m_Count; + } } template typename VmaIntrusiveLinkedList::ItemType* VmaIntrusiveLinkedList::PopBack() { - VMA_HEAVY_ASSERT(m_Count > 0); - ItemType* const backItem = m_Back; - ItemType* const prevItem = ItemTypeTraits::GetPrev(backItem); - if (prevItem != VMA_NULL) - { - ItemTypeTraits::AccessNext(prevItem) = VMA_NULL; - } - m_Back = prevItem; - --m_Count; - ItemTypeTraits::AccessPrev(backItem) = VMA_NULL; - ItemTypeTraits::AccessNext(backItem) = VMA_NULL; - return backItem; + VMA_HEAVY_ASSERT(m_Count > 0); + ItemType* const backItem = m_Back; + ItemType* const prevItem = ItemTypeTraits::GetPrev(backItem); + if (prevItem != VMA_NULL) + { + ItemTypeTraits::AccessNext(prevItem) = VMA_NULL; + } + m_Back = prevItem; + --m_Count; + ItemTypeTraits::AccessPrev(backItem) = VMA_NULL; + ItemTypeTraits::AccessNext(backItem) = VMA_NULL; + return backItem; } template typename VmaIntrusiveLinkedList::ItemType* VmaIntrusiveLinkedList::PopFront() { - VMA_HEAVY_ASSERT(m_Count > 0); - ItemType* const frontItem = m_Front; - ItemType* const nextItem = ItemTypeTraits::GetNext(frontItem); - if (nextItem != VMA_NULL) - { - ItemTypeTraits::AccessPrev(nextItem) = VMA_NULL; - } - m_Front = nextItem; - --m_Count; - ItemTypeTraits::AccessPrev(frontItem) = VMA_NULL; - ItemTypeTraits::AccessNext(frontItem) = VMA_NULL; - return frontItem; + VMA_HEAVY_ASSERT(m_Count > 0); + ItemType* const frontItem = m_Front; + ItemType* const nextItem = ItemTypeTraits::GetNext(frontItem); + if (nextItem != VMA_NULL) + { + ItemTypeTraits::AccessPrev(nextItem) = VMA_NULL; + } + m_Front = nextItem; + --m_Count; + ItemTypeTraits::AccessPrev(frontItem) = VMA_NULL; + ItemTypeTraits::AccessNext(frontItem) = VMA_NULL; + return frontItem; } template void VmaIntrusiveLinkedList::InsertBefore(ItemType* existingItem, ItemType* newItem) { - VMA_HEAVY_ASSERT(newItem != VMA_NULL && ItemTypeTraits::GetPrev(newItem) == VMA_NULL && ItemTypeTraits::GetNext(newItem) == VMA_NULL); - if (existingItem != VMA_NULL) - { - ItemType* const prevItem = ItemTypeTraits::GetPrev(existingItem); - ItemTypeTraits::AccessPrev(newItem) = prevItem; - ItemTypeTraits::AccessNext(newItem) = existingItem; - ItemTypeTraits::AccessPrev(existingItem) = newItem; - if (prevItem != VMA_NULL) - { - ItemTypeTraits::AccessNext(prevItem) = newItem; - } - else - { - VMA_HEAVY_ASSERT(m_Front == existingItem); - m_Front = newItem; - } - ++m_Count; - } - else - PushBack(newItem); + VMA_HEAVY_ASSERT(newItem != VMA_NULL && ItemTypeTraits::GetPrev(newItem) == VMA_NULL && ItemTypeTraits::GetNext(newItem) == VMA_NULL); + if (existingItem != VMA_NULL) + { + ItemType* const prevItem = ItemTypeTraits::GetPrev(existingItem); + ItemTypeTraits::AccessPrev(newItem) = prevItem; + ItemTypeTraits::AccessNext(newItem) = existingItem; + ItemTypeTraits::AccessPrev(existingItem) = newItem; + if (prevItem != VMA_NULL) + { + ItemTypeTraits::AccessNext(prevItem) = newItem; + } else + { + VMA_HEAVY_ASSERT(m_Front == existingItem); + m_Front = newItem; + } + ++m_Count; + } else + PushBack(newItem); } template void VmaIntrusiveLinkedList::InsertAfter(ItemType* existingItem, ItemType* newItem) { - VMA_HEAVY_ASSERT(newItem != VMA_NULL && ItemTypeTraits::GetPrev(newItem) == VMA_NULL && ItemTypeTraits::GetNext(newItem) == VMA_NULL); - if (existingItem != VMA_NULL) - { - ItemType* const nextItem = ItemTypeTraits::GetNext(existingItem); - ItemTypeTraits::AccessNext(newItem) = nextItem; - ItemTypeTraits::AccessPrev(newItem) = existingItem; - ItemTypeTraits::AccessNext(existingItem) = newItem; - if (nextItem != VMA_NULL) - { - ItemTypeTraits::AccessPrev(nextItem) = newItem; - } - else - { - VMA_HEAVY_ASSERT(m_Back == existingItem); - m_Back = newItem; - } - ++m_Count; - } - else - return PushFront(newItem); + VMA_HEAVY_ASSERT(newItem != VMA_NULL && ItemTypeTraits::GetPrev(newItem) == VMA_NULL && ItemTypeTraits::GetNext(newItem) == VMA_NULL); + if (existingItem != VMA_NULL) + { + ItemType* const nextItem = ItemTypeTraits::GetNext(existingItem); + ItemTypeTraits::AccessNext(newItem) = nextItem; + ItemTypeTraits::AccessPrev(newItem) = existingItem; + ItemTypeTraits::AccessNext(existingItem) = newItem; + if (nextItem != VMA_NULL) + { + ItemTypeTraits::AccessPrev(nextItem) = newItem; + } else + { + VMA_HEAVY_ASSERT(m_Back == existingItem); + m_Back = newItem; + } + ++m_Count; + } else + return PushFront(newItem); } template void VmaIntrusiveLinkedList::Remove(ItemType* item) { - VMA_HEAVY_ASSERT(item != VMA_NULL && m_Count > 0); - if (ItemTypeTraits::GetPrev(item) != VMA_NULL) - { - ItemTypeTraits::AccessNext(ItemTypeTraits::AccessPrev(item)) = ItemTypeTraits::GetNext(item); - } - else - { - VMA_HEAVY_ASSERT(m_Front == item); - m_Front = ItemTypeTraits::GetNext(item); - } + VMA_HEAVY_ASSERT(item != VMA_NULL && m_Count > 0); + if (ItemTypeTraits::GetPrev(item) != VMA_NULL) + { + ItemTypeTraits::AccessNext(ItemTypeTraits::AccessPrev(item)) = ItemTypeTraits::GetNext(item); + } else + { + VMA_HEAVY_ASSERT(m_Front == item); + m_Front = ItemTypeTraits::GetNext(item); + } - if (ItemTypeTraits::GetNext(item) != VMA_NULL) - { - ItemTypeTraits::AccessPrev(ItemTypeTraits::AccessNext(item)) = ItemTypeTraits::GetPrev(item); - } - else - { - VMA_HEAVY_ASSERT(m_Back == item); - m_Back = ItemTypeTraits::GetPrev(item); - } - ItemTypeTraits::AccessPrev(item) = VMA_NULL; - ItemTypeTraits::AccessNext(item) = VMA_NULL; - --m_Count; + if (ItemTypeTraits::GetNext(item) != VMA_NULL) + { + ItemTypeTraits::AccessPrev(ItemTypeTraits::AccessNext(item)) = ItemTypeTraits::GetPrev(item); + } else + { + VMA_HEAVY_ASSERT(m_Back == item); + m_Back = ItemTypeTraits::GetPrev(item); + } + ItemTypeTraits::AccessPrev(item) = VMA_NULL; + ItemTypeTraits::AccessNext(item) = VMA_NULL; + --m_Count; } template void VmaIntrusiveLinkedList::RemoveAll() { - if (!IsEmpty()) - { - ItemType* item = m_Back; - while (item != VMA_NULL) - { - ItemType* const prevItem = ItemTypeTraits::AccessPrev(item); - ItemTypeTraits::AccessPrev(item) = VMA_NULL; - ItemTypeTraits::AccessNext(item) = VMA_NULL; - item = prevItem; - } - m_Front = VMA_NULL; - m_Back = VMA_NULL; - m_Count = 0; - } + if (!IsEmpty()) + { + ItemType* item = m_Back; + while (item != VMA_NULL) + { + ItemType* const prevItem = ItemTypeTraits::AccessPrev(item); + ItemTypeTraits::AccessPrev(item) = VMA_NULL; + ItemTypeTraits::AccessNext(item) = VMA_NULL; + item = prevItem; + } + m_Front = VMA_NULL; + m_Back = VMA_NULL; + m_Count = 0; + } } #endif // _VMA_INTRUSIVE_LINKED_LIST_FUNCTIONS #endif // _VMA_INTRUSIVE_LINKED_LIST -// Unused in this version. -#if 0 - -#ifndef _VMA_PAIR -template -struct VmaPair -{ - T1 first; - T2 second; - - VmaPair() : first(), second() {} - VmaPair(const T1& firstSrc, const T2& secondSrc) : first(firstSrc), second(secondSrc) {} -}; - -template -struct VmaPairFirstLess -{ - bool operator()(const VmaPair& lhs, const VmaPair& rhs) const - { - return lhs.first < rhs.first; - } - bool operator()(const VmaPair& lhs, const FirstT& rhsFirst) const - { - return lhs.first < rhsFirst; - } -}; -#endif // _VMA_PAIR - -#ifndef _VMA_MAP -/* Class compatible with subset of interface of std::unordered_map. -KeyT, ValueT must be POD because they will be stored in VmaVector. -*/ -template -class VmaMap -{ -public: - typedef VmaPair PairType; - typedef PairType* iterator; - - VmaMap(const VmaStlAllocator& allocator) : m_Vector(allocator) {} - - iterator begin() { return m_Vector.begin(); } - iterator end() { return m_Vector.end(); } - size_t size() { return m_Vector.size(); } - - void insert(const PairType& pair); - iterator find(const KeyT& key); - void erase(iterator it); - -private: - VmaVector< PairType, VmaStlAllocator> m_Vector; -}; - -#ifndef _VMA_MAP_FUNCTIONS -template -void VmaMap::insert(const PairType& pair) -{ - const size_t indexToInsert = VmaBinaryFindFirstNotLess( - m_Vector.data(), - m_Vector.data() + m_Vector.size(), - pair, - VmaPairFirstLess()) - m_Vector.data(); - VmaVectorInsert(m_Vector, indexToInsert, pair); -} - -template -VmaPair* VmaMap::find(const KeyT& key) -{ - PairType* it = VmaBinaryFindFirstNotLess( - m_Vector.data(), - m_Vector.data() + m_Vector.size(), - key, - VmaPairFirstLess()); - if ((it != m_Vector.end()) && (it->first == key)) - { - return it; - } - else - { - return m_Vector.end(); - } -} - -template -void VmaMap::erase(iterator it) -{ - VmaVectorRemove(m_Vector, it - m_Vector.begin()); -} -#endif // _VMA_MAP_FUNCTIONS -#endif // _VMA_MAP - -#endif // #if 0 - #if !defined(_VMA_STRING_BUILDER) && VMA_STATS_STRING_ENABLED class VmaStringBuilder { public: - VmaStringBuilder(const VkAllocationCallbacks* allocationCallbacks) : m_Data(VmaStlAllocator(allocationCallbacks)) {} - ~VmaStringBuilder() = default; + VmaStringBuilder(const VkAllocationCallbacks* allocationCallbacks) : m_Data(VmaStlAllocator(allocationCallbacks)) {} + ~VmaStringBuilder() = default; - size_t GetLength() const { return m_Data.size(); } - const char* GetData() const { return m_Data.data(); } - void AddNewLine() { Add('\n'); } - void Add(char ch) { m_Data.push_back(ch); } + size_t GetLength() const { return m_Data.size(); } + const char* GetData() const { return m_Data.data(); } + void AddNewLine() { Add('\n'); } + void Add(char ch) { m_Data.push_back(ch); } - void Add(const char* pStr); - void AddNumber(uint32_t num); - void AddNumber(uint64_t num); - void AddPointer(const void* ptr); + void Add(const char* pStr); + void AddNumber(uint32_t num); + void AddNumber(uint64_t num); + void AddPointer(const void* ptr); private: - VmaVector> m_Data; + VmaVector> m_Data; }; #ifndef _VMA_STRING_BUILDER_FUNCTIONS void VmaStringBuilder::Add(const char* pStr) { - const size_t strLen = strlen(pStr); - if (strLen > 0) - { - const size_t oldCount = m_Data.size(); - m_Data.resize(oldCount + strLen); - memcpy(m_Data.data() + oldCount, pStr, strLen); - } + const size_t strLen = strlen(pStr); + if (strLen > 0) + { + const size_t oldCount = m_Data.size(); + m_Data.resize(oldCount + strLen); + memcpy(m_Data.data() + oldCount, pStr, strLen); + } } void VmaStringBuilder::AddNumber(uint32_t num) { - char buf[11]; - buf[10] = '\0'; - char* p = &buf[10]; - do - { - *--p = '0' + (num % 10); - num /= 10; - } while (num); - Add(p); + char buf[11]; + buf[10] = '\0'; + char* p = &buf[10]; + do + { + *--p = '0' + (char)(num % 10); + num /= 10; + } while (num); + Add(p); } void VmaStringBuilder::AddNumber(uint64_t num) { - char buf[21]; - buf[20] = '\0'; - char* p = &buf[20]; - do - { - *--p = '0' + (num % 10); - num /= 10; - } while (num); - Add(p); + char buf[21]; + buf[20] = '\0'; + char* p = &buf[20]; + do + { + *--p = '0' + (char)(num % 10); + num /= 10; + } while (num); + Add(p); } void VmaStringBuilder::AddPointer(const void* ptr) { - char buf[21]; - VmaPtrToStr(buf, sizeof(buf), ptr); - Add(buf); + char buf[21]; + VmaPtrToStr(buf, sizeof(buf), ptr); + Add(buf); } #endif //_VMA_STRING_BUILDER_FUNCTIONS #endif // _VMA_STRING_BUILDER @@ -5466,362 +5631,332 @@ VmaStringBuilder passed to the constructor. */ class VmaJsonWriter { - VMA_CLASS_NO_COPY(VmaJsonWriter) + VMA_CLASS_NO_COPY_NO_MOVE(VmaJsonWriter) public: - // sb - string builder to write the document to. Must remain alive for the whole lifetime of this object. - VmaJsonWriter(const VkAllocationCallbacks* pAllocationCallbacks, VmaStringBuilder& sb); - ~VmaJsonWriter(); + // sb - string builder to write the document to. Must remain alive for the whole lifetime of this object. + VmaJsonWriter(const VkAllocationCallbacks* pAllocationCallbacks, VmaStringBuilder& sb); + ~VmaJsonWriter(); - // Begins object by writing "{". - // Inside an object, you must call pairs of WriteString and a value, e.g.: - // j.BeginObject(true); j.WriteString("A"); j.WriteNumber(1); j.WriteString("B"); j.WriteNumber(2); j.EndObject(); - // Will write: { "A": 1, "B": 2 } - void BeginObject(bool singleLine = false); - // Ends object by writing "}". - void EndObject(); + // Begins object by writing "{". + // Inside an object, you must call pairs of WriteString and a value, e.g.: + // j.BeginObject(true); j.WriteString("A"); j.WriteNumber(1); j.WriteString("B"); j.WriteNumber(2); j.EndObject(); + // Will write: { "A": 1, "B": 2 } + void BeginObject(bool singleLine = false); + // Ends object by writing "}". + void EndObject(); - // Begins array by writing "[". - // Inside an array, you can write a sequence of any values. - void BeginArray(bool singleLine = false); - // Ends array by writing "[". - void EndArray(); + // Begins array by writing "[". + // Inside an array, you can write a sequence of any values. + void BeginArray(bool singleLine = false); + // Ends array by writing "[". + void EndArray(); - // Writes a string value inside "". - // pStr can contain any ANSI characters, including '"', new line etc. - they will be properly escaped. - void WriteString(const char* pStr); + // Writes a string value inside "". + // pStr can contain any ANSI characters, including '"', new line etc. - they will be properly escaped. + void WriteString(const char* pStr); - // Begins writing a string value. - // Call BeginString, ContinueString, ContinueString, ..., EndString instead of - // WriteString to conveniently build the string content incrementally, made of - // parts including numbers. - void BeginString(const char* pStr = VMA_NULL); - // Posts next part of an open string. - void ContinueString(const char* pStr); - // Posts next part of an open string. The number is converted to decimal characters. - void ContinueString(uint32_t n); - void ContinueString(uint64_t n); - void ContinueString_Size(size_t n); - // Posts next part of an open string. Pointer value is converted to characters - // using "%p" formatting - shown as hexadecimal number, e.g.: 000000081276Ad00 - void ContinueString_Pointer(const void* ptr); - // Ends writing a string value by writing '"'. - void EndString(const char* pStr = VMA_NULL); + // Begins writing a string value. + // Call BeginString, ContinueString, ContinueString, ..., EndString instead of + // WriteString to conveniently build the string content incrementally, made of + // parts including numbers. + void BeginString(const char* pStr = VMA_NULL); + // Posts next part of an open string. + void ContinueString(const char* pStr); + // Posts next part of an open string. The number is converted to decimal characters. + void ContinueString(uint32_t n); + void ContinueString(uint64_t n); + // Posts next part of an open string. Pointer value is converted to characters + // using "%p" formatting - shown as hexadecimal number, e.g.: 000000081276Ad00 + void ContinueString_Pointer(const void* ptr); + // Ends writing a string value by writing '"'. + void EndString(const char* pStr = VMA_NULL); - // Writes a number value. - void WriteNumber(uint32_t n); - void WriteNumber(uint64_t n); - void WriteSize(size_t n); - // Writes a boolean value - false or true. - void WriteBool(bool b); - // Writes a null value. - void WriteNull(); + // Writes a number value. + void WriteNumber(uint32_t n); + void WriteNumber(uint64_t n); + // Writes a boolean value - false or true. + void WriteBool(bool b); + // Writes a null value. + void WriteNull(); private: - enum COLLECTION_TYPE - { - COLLECTION_TYPE_OBJECT, - COLLECTION_TYPE_ARRAY, - }; - struct StackItem - { - COLLECTION_TYPE type; - uint32_t valueCount; - bool singleLineMode; - }; + enum COLLECTION_TYPE + { + COLLECTION_TYPE_OBJECT, + COLLECTION_TYPE_ARRAY, + }; + struct StackItem + { + COLLECTION_TYPE type; + uint32_t valueCount; + bool singleLineMode; + }; - static const char* const INDENT; + static const char* const INDENT; - VmaStringBuilder& m_SB; - VmaVector< StackItem, VmaStlAllocator > m_Stack; - bool m_InsideString; + VmaStringBuilder& m_SB; + VmaVector< StackItem, VmaStlAllocator > m_Stack; + bool m_InsideString; - // Write size_t for less than 64bits - void WriteSize(size_t n, std::integral_constant) { m_SB.AddNumber(static_cast(n)); } - // Write size_t for 64bits - void WriteSize(size_t n, std::integral_constant) { m_SB.AddNumber(static_cast(n)); } - - void BeginValue(bool isString); - void WriteIndent(bool oneLess = false); + void BeginValue(bool isString); + void WriteIndent(bool oneLess = false); }; const char* const VmaJsonWriter::INDENT = " "; #ifndef _VMA_JSON_WRITER_FUNCTIONS VmaJsonWriter::VmaJsonWriter(const VkAllocationCallbacks* pAllocationCallbacks, VmaStringBuilder& sb) - : m_SB(sb), - m_Stack(VmaStlAllocator(pAllocationCallbacks)), - m_InsideString(false) {} + : m_SB(sb), + m_Stack(VmaStlAllocator(pAllocationCallbacks)), + m_InsideString(false) {} VmaJsonWriter::~VmaJsonWriter() { - VMA_ASSERT(!m_InsideString); - VMA_ASSERT(m_Stack.empty()); + VMA_ASSERT(!m_InsideString); + VMA_ASSERT(m_Stack.empty()); } void VmaJsonWriter::BeginObject(bool singleLine) { - VMA_ASSERT(!m_InsideString); + VMA_ASSERT(!m_InsideString); - BeginValue(false); - m_SB.Add('{'); + BeginValue(false); + m_SB.Add('{'); - StackItem item; - item.type = COLLECTION_TYPE_OBJECT; - item.valueCount = 0; - item.singleLineMode = singleLine; - m_Stack.push_back(item); + StackItem item; + item.type = COLLECTION_TYPE_OBJECT; + item.valueCount = 0; + item.singleLineMode = singleLine; + m_Stack.push_back(item); } void VmaJsonWriter::EndObject() { - VMA_ASSERT(!m_InsideString); + VMA_ASSERT(!m_InsideString); - WriteIndent(true); - m_SB.Add('}'); + WriteIndent(true); + m_SB.Add('}'); - VMA_ASSERT(!m_Stack.empty() && m_Stack.back().type == COLLECTION_TYPE_OBJECT); - m_Stack.pop_back(); + VMA_ASSERT(!m_Stack.empty() && m_Stack.back().type == COLLECTION_TYPE_OBJECT); + m_Stack.pop_back(); } void VmaJsonWriter::BeginArray(bool singleLine) { - VMA_ASSERT(!m_InsideString); + VMA_ASSERT(!m_InsideString); - BeginValue(false); - m_SB.Add('['); + BeginValue(false); + m_SB.Add('['); - StackItem item; - item.type = COLLECTION_TYPE_ARRAY; - item.valueCount = 0; - item.singleLineMode = singleLine; - m_Stack.push_back(item); + StackItem item; + item.type = COLLECTION_TYPE_ARRAY; + item.valueCount = 0; + item.singleLineMode = singleLine; + m_Stack.push_back(item); } void VmaJsonWriter::EndArray() { - VMA_ASSERT(!m_InsideString); + VMA_ASSERT(!m_InsideString); - WriteIndent(true); - m_SB.Add(']'); + WriteIndent(true); + m_SB.Add(']'); - VMA_ASSERT(!m_Stack.empty() && m_Stack.back().type == COLLECTION_TYPE_ARRAY); - m_Stack.pop_back(); + VMA_ASSERT(!m_Stack.empty() && m_Stack.back().type == COLLECTION_TYPE_ARRAY); + m_Stack.pop_back(); } void VmaJsonWriter::WriteString(const char* pStr) { - BeginString(pStr); - EndString(); + BeginString(pStr); + EndString(); } void VmaJsonWriter::BeginString(const char* pStr) { - VMA_ASSERT(!m_InsideString); + VMA_ASSERT(!m_InsideString); - BeginValue(true); - m_SB.Add('"'); - m_InsideString = true; - if (pStr != VMA_NULL && pStr[0] != '\0') - { - ContinueString(pStr); - } + BeginValue(true); + m_SB.Add('"'); + m_InsideString = true; + if (pStr != VMA_NULL && pStr[0] != '\0') + { + ContinueString(pStr); + } } void VmaJsonWriter::ContinueString(const char* pStr) { - VMA_ASSERT(m_InsideString); + VMA_ASSERT(m_InsideString); - const size_t strLen = strlen(pStr); - for (size_t i = 0; i < strLen; ++i) - { - char ch = pStr[i]; - if (ch == '\\') - { - m_SB.Add("\\\\"); - } - else if (ch == '"') - { - m_SB.Add("\\\""); - } - else if (ch >= 32) - { - m_SB.Add(ch); - } - else switch (ch) - { - case '\b': - m_SB.Add("\\b"); - break; - case '\f': - m_SB.Add("\\f"); - break; - case '\n': - m_SB.Add("\\n"); - break; - case '\r': - m_SB.Add("\\r"); - break; - case '\t': - m_SB.Add("\\t"); - break; - default: - VMA_ASSERT(0 && "Character not currently supported."); - break; - } - } + const size_t strLen = strlen(pStr); + for (size_t i = 0; i < strLen; ++i) + { + char ch = pStr[i]; + if (ch == '\\') + { + m_SB.Add("\\\\"); + } else if (ch == '"') + { + m_SB.Add("\\\""); + } else if ((uint8_t)ch >= 32) + { + m_SB.Add(ch); + } else switch (ch) + { + case '\b': + m_SB.Add("\\b"); + break; + case '\f': + m_SB.Add("\\f"); + break; + case '\n': + m_SB.Add("\\n"); + break; + case '\r': + m_SB.Add("\\r"); + break; + case '\t': + m_SB.Add("\\t"); + break; + default: + VMA_ASSERT(0 && "Character not currently supported."); + } + } } void VmaJsonWriter::ContinueString(uint32_t n) { - VMA_ASSERT(m_InsideString); - m_SB.AddNumber(n); + VMA_ASSERT(m_InsideString); + m_SB.AddNumber(n); } void VmaJsonWriter::ContinueString(uint64_t n) { - VMA_ASSERT(m_InsideString); - m_SB.AddNumber(n); -} - -void VmaJsonWriter::ContinueString_Size(size_t n) -{ - VMA_ASSERT(m_InsideString); - // Fix for AppleClang incorrect type casting - // TODO: Change to if constexpr when C++17 used as minimal standard - WriteSize(n, std::is_same{}); + VMA_ASSERT(m_InsideString); + m_SB.AddNumber(n); } void VmaJsonWriter::ContinueString_Pointer(const void* ptr) { - VMA_ASSERT(m_InsideString); - m_SB.AddPointer(ptr); + VMA_ASSERT(m_InsideString); + m_SB.AddPointer(ptr); } void VmaJsonWriter::EndString(const char* pStr) { - VMA_ASSERT(m_InsideString); - if (pStr != VMA_NULL && pStr[0] != '\0') - { - ContinueString(pStr); - } - m_SB.Add('"'); - m_InsideString = false; + VMA_ASSERT(m_InsideString); + if (pStr != VMA_NULL && pStr[0] != '\0') + { + ContinueString(pStr); + } + m_SB.Add('"'); + m_InsideString = false; } void VmaJsonWriter::WriteNumber(uint32_t n) { - VMA_ASSERT(!m_InsideString); - BeginValue(false); - m_SB.AddNumber(n); + VMA_ASSERT(!m_InsideString); + BeginValue(false); + m_SB.AddNumber(n); } void VmaJsonWriter::WriteNumber(uint64_t n) { - VMA_ASSERT(!m_InsideString); - BeginValue(false); - m_SB.AddNumber(n); -} - -void VmaJsonWriter::WriteSize(size_t n) -{ - VMA_ASSERT(!m_InsideString); - BeginValue(false); - // Fix for AppleClang incorrect type casting - // TODO: Change to if constexpr when C++17 used as minimal standard - WriteSize(n, std::is_same{}); + VMA_ASSERT(!m_InsideString); + BeginValue(false); + m_SB.AddNumber(n); } void VmaJsonWriter::WriteBool(bool b) { - VMA_ASSERT(!m_InsideString); - BeginValue(false); - m_SB.Add(b ? "true" : "false"); + VMA_ASSERT(!m_InsideString); + BeginValue(false); + m_SB.Add(b ? "true" : "false"); } void VmaJsonWriter::WriteNull() { - VMA_ASSERT(!m_InsideString); - BeginValue(false); - m_SB.Add("null"); + VMA_ASSERT(!m_InsideString); + BeginValue(false); + m_SB.Add("null"); } void VmaJsonWriter::BeginValue(bool isString) { - if (!m_Stack.empty()) - { - StackItem& currItem = m_Stack.back(); - if (currItem.type == COLLECTION_TYPE_OBJECT && - currItem.valueCount % 2 == 0) - { - VMA_ASSERT(isString); - } + if (!m_Stack.empty()) + { + StackItem& currItem = m_Stack.back(); + if (currItem.type == COLLECTION_TYPE_OBJECT && + currItem.valueCount % 2 == 0) + { + VMA_ASSERT(isString); + } - if (currItem.type == COLLECTION_TYPE_OBJECT && - currItem.valueCount % 2 != 0) - { - m_SB.Add(": "); - } - else if (currItem.valueCount > 0) - { - m_SB.Add(", "); - WriteIndent(); - } - else - { - WriteIndent(); - } - ++currItem.valueCount; - } + if (currItem.type == COLLECTION_TYPE_OBJECT && + currItem.valueCount % 2 != 0) + { + m_SB.Add(": "); + } else if (currItem.valueCount > 0) + { + m_SB.Add(", "); + WriteIndent(); + } else + { + WriteIndent(); + } + ++currItem.valueCount; + } } void VmaJsonWriter::WriteIndent(bool oneLess) { - if (!m_Stack.empty() && !m_Stack.back().singleLineMode) - { - m_SB.AddNewLine(); + if (!m_Stack.empty() && !m_Stack.back().singleLineMode) + { + m_SB.AddNewLine(); - size_t count = m_Stack.size(); - if (count > 0 && oneLess) - { - --count; - } - for (size_t i = 0; i < count; ++i) - { - m_SB.Add(INDENT); - } - } + size_t count = m_Stack.size(); + if (count > 0 && oneLess) + { + --count; + } + for (size_t i = 0; i < count; ++i) + { + m_SB.Add(INDENT); + } + } } #endif // _VMA_JSON_WRITER_FUNCTIONS static void VmaPrintDetailedStatistics(VmaJsonWriter& json, const VmaDetailedStatistics& stat) { - json.BeginObject(); + json.BeginObject(); - json.WriteString("BlockCount"); - json.WriteNumber(stat.statistics.blockCount); - json.WriteString("BlockBytes"); - json.WriteNumber(stat.statistics.blockBytes); - json.WriteString("AllocationCount"); - json.WriteNumber(stat.statistics.allocationCount); - json.WriteString("AllocationBytes"); - json.WriteNumber(stat.statistics.allocationBytes); - json.WriteString("UnusedRangeCount"); - json.WriteNumber(stat.unusedRangeCount); + json.WriteString("BlockCount"); + json.WriteNumber(stat.statistics.blockCount); + json.WriteString("BlockBytes"); + json.WriteNumber(stat.statistics.blockBytes); + json.WriteString("AllocationCount"); + json.WriteNumber(stat.statistics.allocationCount); + json.WriteString("AllocationBytes"); + json.WriteNumber(stat.statistics.allocationBytes); + json.WriteString("UnusedRangeCount"); + json.WriteNumber(stat.unusedRangeCount); - if (stat.statistics.allocationCount > 1) - { - json.WriteString("AllocationSizeMin"); - json.WriteNumber(stat.allocationSizeMin); - json.WriteString("AllocationSizeMax"); - json.WriteNumber(stat.allocationSizeMax); - } - if (stat.unusedRangeCount > 1) - { - json.WriteString("UnusedRangeSizeMin"); - json.WriteNumber(stat.unusedRangeSizeMin); - json.WriteString("UnusedRangeSizeMax"); - json.WriteNumber(stat.unusedRangeSizeMax); - } - json.EndObject(); + if (stat.statistics.allocationCount > 1) + { + json.WriteString("AllocationSizeMin"); + json.WriteNumber(stat.allocationSizeMin); + json.WriteString("AllocationSizeMax"); + json.WriteNumber(stat.allocationSizeMax); + } + if (stat.unusedRangeCount > 1) + { + json.WriteString("UnusedRangeSizeMin"); + json.WriteNumber(stat.unusedRangeSizeMin); + json.WriteString("UnusedRangeSizeMax"); + json.WriteNumber(stat.unusedRangeSizeMax); + } + json.EndObject(); } #endif // _VMA_JSON_WRITER @@ -5829,98 +5964,95 @@ static void VmaPrintDetailedStatistics(VmaJsonWriter& json, const VmaDetailedSta class VmaMappingHysteresis { - VMA_CLASS_NO_COPY(VmaMappingHysteresis) + VMA_CLASS_NO_COPY_NO_MOVE(VmaMappingHysteresis) public: - VmaMappingHysteresis() = default; + VmaMappingHysteresis() = default; - uint32_t GetExtraMapping() const { return m_ExtraMapping; } + uint32_t GetExtraMapping() const { return m_ExtraMapping; } - // Call when Map was called. - // Returns true if switched to extra +1 mapping reference count. - bool PostMap() - { + // Call when Map was called. + // Returns true if switched to extra +1 mapping reference count. + bool PostMap() + { #if VMA_MAPPING_HYSTERESIS_ENABLED - if(m_ExtraMapping == 0) - { - ++m_MajorCounter; - if(m_MajorCounter >= COUNTER_MIN_EXTRA_MAPPING) - { - m_ExtraMapping = 1; - m_MajorCounter = 0; - m_MinorCounter = 0; - return true; - } - } - else // m_ExtraMapping == 1 - PostMinorCounter(); + if (m_ExtraMapping == 0) + { + ++m_MajorCounter; + if (m_MajorCounter >= COUNTER_MIN_EXTRA_MAPPING) + { + m_ExtraMapping = 1; + m_MajorCounter = 0; + m_MinorCounter = 0; + return true; + } + } else // m_ExtraMapping == 1 + PostMinorCounter(); #endif // #if VMA_MAPPING_HYSTERESIS_ENABLED - return false; - } + return false; + } - // Call when Unmap was called. - void PostUnmap() - { + // Call when Unmap was called. + void PostUnmap() + { #if VMA_MAPPING_HYSTERESIS_ENABLED - if(m_ExtraMapping == 0) - ++m_MajorCounter; - else // m_ExtraMapping == 1 - PostMinorCounter(); + if (m_ExtraMapping == 0) + ++m_MajorCounter; + else // m_ExtraMapping == 1 + PostMinorCounter(); #endif // #if VMA_MAPPING_HYSTERESIS_ENABLED - } + } - // Call when allocation was made from the memory block. - void PostAlloc() - { + // Call when allocation was made from the memory block. + void PostAlloc() + { #if VMA_MAPPING_HYSTERESIS_ENABLED - if(m_ExtraMapping == 1) - ++m_MajorCounter; - else // m_ExtraMapping == 0 - PostMinorCounter(); + if (m_ExtraMapping == 1) + ++m_MajorCounter; + else // m_ExtraMapping == 0 + PostMinorCounter(); #endif // #if VMA_MAPPING_HYSTERESIS_ENABLED - } + } - // Call when allocation was freed from the memory block. - // Returns true if switched to extra -1 mapping reference count. - bool PostFree() - { + // Call when allocation was freed from the memory block. + // Returns true if switched to extra -1 mapping reference count. + bool PostFree() + { #if VMA_MAPPING_HYSTERESIS_ENABLED - if(m_ExtraMapping == 1) - { - ++m_MajorCounter; - if(m_MajorCounter >= COUNTER_MIN_EXTRA_MAPPING && - m_MajorCounter > m_MinorCounter + 1) - { - m_ExtraMapping = 0; - m_MajorCounter = 0; - m_MinorCounter = 0; - return true; - } - } - else // m_ExtraMapping == 0 - PostMinorCounter(); + if (m_ExtraMapping == 1) + { + ++m_MajorCounter; + if (m_MajorCounter >= COUNTER_MIN_EXTRA_MAPPING && + m_MajorCounter > m_MinorCounter + 1) + { + m_ExtraMapping = 0; + m_MajorCounter = 0; + m_MinorCounter = 0; + return true; + } + } else // m_ExtraMapping == 0 + PostMinorCounter(); #endif // #if VMA_MAPPING_HYSTERESIS_ENABLED - return false; - } + return false; + } private: - static const int32_t COUNTER_MIN_EXTRA_MAPPING = 7; + static const int32_t COUNTER_MIN_EXTRA_MAPPING = 7; - uint32_t m_MinorCounter = 0; - uint32_t m_MajorCounter = 0; - uint32_t m_ExtraMapping = 0; // 0 or 1. + uint32_t m_MinorCounter = 0; + uint32_t m_MajorCounter = 0; + uint32_t m_ExtraMapping = 0; // 0 or 1. - void PostMinorCounter() - { - if(m_MinorCounter < m_MajorCounter) - { - ++m_MinorCounter; - } - else if(m_MajorCounter > 0) - { - --m_MajorCounter; - --m_MinorCounter; - } - } + void PostMinorCounter() + { + if (m_MinorCounter < m_MajorCounter) + { + ++m_MinorCounter; + } else if (m_MajorCounter > 0) + { + --m_MajorCounter; + --m_MinorCounter; + } + } }; #endif // _VMA_MAPPING_HYSTERESIS @@ -5936,190 +6068,198 @@ Thread-safety: */ class VmaDeviceMemoryBlock { - VMA_CLASS_NO_COPY(VmaDeviceMemoryBlock) + VMA_CLASS_NO_COPY_NO_MOVE(VmaDeviceMemoryBlock) public: - VmaBlockMetadata* m_pMetadata; + VmaBlockMetadata* m_pMetadata; - VmaDeviceMemoryBlock(VmaAllocator hAllocator); - ~VmaDeviceMemoryBlock(); + VmaDeviceMemoryBlock(VmaAllocator hAllocator); + ~VmaDeviceMemoryBlock(); - // Always call after construction. - void Init( - VmaAllocator hAllocator, - VmaPool hParentPool, - uint32_t newMemoryTypeIndex, - VkDeviceMemory newMemory, - VkDeviceSize newSize, - uint32_t id, - uint32_t algorithm, - VkDeviceSize bufferImageGranularity); - // Always call before destruction. - void Destroy(VmaAllocator allocator); + // Always call after construction. + void Init( + VmaAllocator hAllocator, + VmaPool hParentPool, + uint32_t newMemoryTypeIndex, + VkDeviceMemory newMemory, + VkDeviceSize newSize, + uint32_t id, + uint32_t algorithm, + VkDeviceSize bufferImageGranularity); + // Always call before destruction. + void Destroy(VmaAllocator allocator); - VmaPool GetParentPool() const { return m_hParentPool; } - VkDeviceMemory GetDeviceMemory() const { return m_hMemory; } - uint32_t GetMemoryTypeIndex() const { return m_MemoryTypeIndex; } - uint32_t GetId() const { return m_Id; } - void* GetMappedData() const { return m_pMappedData; } - uint32_t GetMapRefCount() const { return m_MapCount; } + VmaPool GetParentPool() const { return m_hParentPool; } + VkDeviceMemory GetDeviceMemory() const { return m_hMemory; } + uint32_t GetMemoryTypeIndex() const { return m_MemoryTypeIndex; } + uint32_t GetId() const { return m_Id; } + void* GetMappedData() const { return m_pMappedData; } + uint32_t GetMapRefCount() const { return m_MapCount; } - // Call when allocation/free was made from m_pMetadata. - // Used for m_MappingHysteresis. - void PostAlloc(VmaAllocator hAllocator); - void PostFree(VmaAllocator hAllocator); + // Call when allocation/free was made from m_pMetadata. + // Used for m_MappingHysteresis. + void PostAlloc(VmaAllocator hAllocator); + void PostFree(VmaAllocator hAllocator); - // Validates all data structures inside this object. If not valid, returns false. - bool Validate() const; - VkResult CheckCorruption(VmaAllocator hAllocator); + // Validates all data structures inside this object. If not valid, returns false. + bool Validate() const; + VkResult CheckCorruption(VmaAllocator hAllocator); - // ppData can be null. - VkResult Map(VmaAllocator hAllocator, uint32_t count, void** ppData); - void Unmap(VmaAllocator hAllocator, uint32_t count); + // ppData can be null. + VkResult Map(VmaAllocator hAllocator, uint32_t count, void** ppData); + void Unmap(VmaAllocator hAllocator, uint32_t count); - VkResult WriteMagicValueAfterAllocation(VmaAllocator hAllocator, VkDeviceSize allocOffset, VkDeviceSize allocSize); - VkResult ValidateMagicValueAfterAllocation(VmaAllocator hAllocator, VkDeviceSize allocOffset, VkDeviceSize allocSize); + VkResult WriteMagicValueAfterAllocation(VmaAllocator hAllocator, VkDeviceSize allocOffset, VkDeviceSize allocSize); + VkResult ValidateMagicValueAfterAllocation(VmaAllocator hAllocator, VkDeviceSize allocOffset, VkDeviceSize allocSize); - VkResult BindBufferMemory( - const VmaAllocator hAllocator, - const VmaAllocation hAllocation, - VkDeviceSize allocationLocalOffset, - VkBuffer hBuffer, - const void* pNext); - VkResult BindImageMemory( - const VmaAllocator hAllocator, - const VmaAllocation hAllocation, - VkDeviceSize allocationLocalOffset, - VkImage hImage, - const void* pNext); + VkResult BindBufferMemory( + const VmaAllocator hAllocator, + const VmaAllocation hAllocation, + VkDeviceSize allocationLocalOffset, + VkBuffer hBuffer, + const void* pNext); + VkResult BindImageMemory( + const VmaAllocator hAllocator, + const VmaAllocation hAllocation, + VkDeviceSize allocationLocalOffset, + VkImage hImage, + const void* pNext); private: - VmaPool m_hParentPool; // VK_NULL_HANDLE if not belongs to custom pool. - uint32_t m_MemoryTypeIndex; - uint32_t m_Id; - VkDeviceMemory m_hMemory; + VmaPool m_hParentPool; // VK_NULL_HANDLE if not belongs to custom pool. + uint32_t m_MemoryTypeIndex; + uint32_t m_Id; + VkDeviceMemory m_hMemory; - /* - Protects access to m_hMemory so it is not used by multiple threads simultaneously, e.g. vkMapMemory, vkBindBufferMemory. - Also protects m_MapCount, m_pMappedData. - Allocations, deallocations, any change in m_pMetadata is protected by parent's VmaBlockVector::m_Mutex. - */ - VMA_MUTEX m_MapAndBindMutex; - VmaMappingHysteresis m_MappingHysteresis; - uint32_t m_MapCount; - void* m_pMappedData; + /* + Protects access to m_hMemory so it is not used by multiple threads simultaneously, e.g. vkMapMemory, vkBindBufferMemory. + Also protects m_MapCount, m_pMappedData. + Allocations, deallocations, any change in m_pMetadata is protected by parent's VmaBlockVector::m_Mutex. + */ + VMA_MUTEX m_MapAndBindMutex; + VmaMappingHysteresis m_MappingHysteresis; + uint32_t m_MapCount; + void* m_pMappedData; }; #endif // _VMA_DEVICE_MEMORY_BLOCK #ifndef _VMA_ALLOCATION_T struct VmaAllocation_T { - friend struct VmaDedicatedAllocationListItemTraits; + friend struct VmaDedicatedAllocationListItemTraits; - enum FLAGS - { - FLAG_PERSISTENT_MAP = 0x01, - FLAG_MAPPING_ALLOWED = 0x02, - }; + enum FLAGS + { + FLAG_PERSISTENT_MAP = 0x01, + FLAG_MAPPING_ALLOWED = 0x02, + }; public: - enum ALLOCATION_TYPE - { - ALLOCATION_TYPE_NONE, - ALLOCATION_TYPE_BLOCK, - ALLOCATION_TYPE_DEDICATED, - }; + enum ALLOCATION_TYPE + { + ALLOCATION_TYPE_NONE, + ALLOCATION_TYPE_BLOCK, + ALLOCATION_TYPE_DEDICATED, + }; - // This struct is allocated using VmaPoolAllocator. - VmaAllocation_T(bool mappingAllowed); - ~VmaAllocation_T(); + // This struct is allocated using VmaPoolAllocator. + VmaAllocation_T(bool mappingAllowed); + ~VmaAllocation_T(); - void InitBlockAllocation( - VmaDeviceMemoryBlock* block, - VmaAllocHandle allocHandle, - VkDeviceSize alignment, - VkDeviceSize size, - uint32_t memoryTypeIndex, - VmaSuballocationType suballocationType, - bool mapped); - // pMappedData not null means allocation is created with MAPPED flag. - void InitDedicatedAllocation( - VmaPool hParentPool, - uint32_t memoryTypeIndex, - VkDeviceMemory hMemory, - VmaSuballocationType suballocationType, - void* pMappedData, - VkDeviceSize size); + void InitBlockAllocation( + VmaDeviceMemoryBlock* block, + VmaAllocHandle allocHandle, + VkDeviceSize alignment, + VkDeviceSize size, + uint32_t memoryTypeIndex, + VmaSuballocationType suballocationType, + bool mapped); + // pMappedData not null means allocation is created with MAPPED flag. + void InitDedicatedAllocation( + VmaPool hParentPool, + uint32_t memoryTypeIndex, + VkDeviceMemory hMemory, + VmaSuballocationType suballocationType, + void* pMappedData, + VkDeviceSize size); - ALLOCATION_TYPE GetType() const { return (ALLOCATION_TYPE)m_Type; } - VkDeviceSize GetAlignment() const { return m_Alignment; } - VkDeviceSize GetSize() const { return m_Size; } - void* GetUserData() const { return m_pUserData; } - const char* GetName() const { return m_pName; } - VmaSuballocationType GetSuballocationType() const { return (VmaSuballocationType)m_SuballocationType; } + ALLOCATION_TYPE GetType() const { return (ALLOCATION_TYPE)m_Type; } + VkDeviceSize GetAlignment() const { return m_Alignment; } + VkDeviceSize GetSize() const { return m_Size; } + void* GetUserData() const { return m_pUserData; } + const char* GetName() const { return m_pName; } + VmaSuballocationType GetSuballocationType() const { return (VmaSuballocationType)m_SuballocationType; } - VmaDeviceMemoryBlock* GetBlock() const { VMA_ASSERT(m_Type == ALLOCATION_TYPE_BLOCK); return m_BlockAllocation.m_Block; } - uint32_t GetMemoryTypeIndex() const { return m_MemoryTypeIndex; } - bool IsPersistentMap() const { return (m_Flags & FLAG_PERSISTENT_MAP) != 0; } - bool IsMappingAllowed() const { return (m_Flags & FLAG_MAPPING_ALLOWED) != 0; } + VmaDeviceMemoryBlock* GetBlock() const { VMA_ASSERT(m_Type == ALLOCATION_TYPE_BLOCK); return m_BlockAllocation.m_Block; } + uint32_t GetMemoryTypeIndex() const { return m_MemoryTypeIndex; } + bool IsPersistentMap() const { return (m_Flags & FLAG_PERSISTENT_MAP) != 0; } + bool IsMappingAllowed() const { return (m_Flags & FLAG_MAPPING_ALLOWED) != 0; } - void SetUserData(VmaAllocator hAllocator, void* pUserData) { m_pUserData = pUserData; } - void SetName(VmaAllocator hAllocator, const char* pName); - void FreeName(VmaAllocator hAllocator); - uint8_t SwapBlockAllocation(VmaAllocator hAllocator, VmaAllocation allocation); - VmaAllocHandle GetAllocHandle() const; - VkDeviceSize GetOffset() const; - VmaPool GetParentPool() const; - VkDeviceMemory GetMemory() const; - void* GetMappedData() const; + void SetUserData(VmaAllocator hAllocator, void* pUserData) { m_pUserData = pUserData; } + void SetName(VmaAllocator hAllocator, const char* pName); + void FreeName(VmaAllocator hAllocator); + uint8_t SwapBlockAllocation(VmaAllocator hAllocator, VmaAllocation allocation); + VmaAllocHandle GetAllocHandle() const; + VkDeviceSize GetOffset() const; + VmaPool GetParentPool() const; + VkDeviceMemory GetMemory() const; + void* GetMappedData() const; - void BlockAllocMap(); - void BlockAllocUnmap(); - VkResult DedicatedAllocMap(VmaAllocator hAllocator, void** ppData); - void DedicatedAllocUnmap(VmaAllocator hAllocator); + void BlockAllocMap(); + void BlockAllocUnmap(); + VkResult DedicatedAllocMap(VmaAllocator hAllocator, void** ppData); + void DedicatedAllocUnmap(VmaAllocator hAllocator); #if VMA_STATS_STRING_ENABLED - uint32_t GetBufferImageUsage() const { return m_BufferImageUsage; } - - void InitBufferImageUsage(uint32_t bufferImageUsage); - void PrintParameters(class VmaJsonWriter& json) const; + VmaBufferImageUsage GetBufferImageUsage() const { return m_BufferImageUsage; } + void InitBufferUsage(const VkBufferCreateInfo &createInfo, bool useKhrMaintenance5) + { + VMA_ASSERT(m_BufferImageUsage == VmaBufferImageUsage::UNKNOWN); + m_BufferImageUsage = VmaBufferImageUsage(createInfo, useKhrMaintenance5); + } + void InitImageUsage(const VkImageCreateInfo &createInfo) + { + VMA_ASSERT(m_BufferImageUsage == VmaBufferImageUsage::UNKNOWN); + m_BufferImageUsage = VmaBufferImageUsage(createInfo); + } + void PrintParameters(class VmaJsonWriter& json) const; #endif private: - // Allocation out of VmaDeviceMemoryBlock. - struct BlockAllocation - { - VmaDeviceMemoryBlock* m_Block; - VmaAllocHandle m_AllocHandle; - }; - // Allocation for an object that has its own private VkDeviceMemory. - struct DedicatedAllocation - { - VmaPool m_hParentPool; // VK_NULL_HANDLE if not belongs to custom pool. - VkDeviceMemory m_hMemory; - void* m_pMappedData; // Not null means memory is mapped. - VmaAllocation_T* m_Prev; - VmaAllocation_T* m_Next; - }; - union - { - // Allocation out of VmaDeviceMemoryBlock. - BlockAllocation m_BlockAllocation; - // Allocation for an object that has its own private VkDeviceMemory. - DedicatedAllocation m_DedicatedAllocation; - }; + // Allocation out of VmaDeviceMemoryBlock. + struct BlockAllocation + { + VmaDeviceMemoryBlock* m_Block; + VmaAllocHandle m_AllocHandle; + }; + // Allocation for an object that has its own private VkDeviceMemory. + struct DedicatedAllocation + { + VmaPool m_hParentPool; // VK_NULL_HANDLE if not belongs to custom pool. + VkDeviceMemory m_hMemory; + void* m_pMappedData; // Not null means memory is mapped. + VmaAllocation_T* m_Prev; + VmaAllocation_T* m_Next; + }; + union + { + // Allocation out of VmaDeviceMemoryBlock. + BlockAllocation m_BlockAllocation; + // Allocation for an object that has its own private VkDeviceMemory. + DedicatedAllocation m_DedicatedAllocation; + }; - VkDeviceSize m_Alignment; - VkDeviceSize m_Size; - void* m_pUserData; - char* m_pName; - uint32_t m_MemoryTypeIndex; - uint8_t m_Type; // ALLOCATION_TYPE - uint8_t m_SuballocationType; // VmaSuballocationType - // Reference counter for vmaMapMemory()/vmaUnmapMemory(). - uint8_t m_MapCount; - uint8_t m_Flags; // enum FLAGS + VkDeviceSize m_Alignment; + VkDeviceSize m_Size; + void* m_pUserData; + char* m_pName; + uint32_t m_MemoryTypeIndex; + uint8_t m_Type; // ALLOCATION_TYPE + uint8_t m_SuballocationType; // VmaSuballocationType + // Reference counter for vmaMapMemory()/vmaUnmapMemory(). + uint8_t m_MapCount; + uint8_t m_Flags; // enum FLAGS #if VMA_STATS_STRING_ENABLED - uint32_t m_BufferImageUsage; // 0 if unknown. + VmaBufferImageUsage m_BufferImageUsage; // 0 if unknown. #endif }; #endif // _VMA_ALLOCATION_T @@ -6127,28 +6267,28 @@ private: #ifndef _VMA_DEDICATED_ALLOCATION_LIST_ITEM_TRAITS struct VmaDedicatedAllocationListItemTraits { - typedef VmaAllocation_T ItemType; + typedef VmaAllocation_T ItemType; - static ItemType* GetPrev(const ItemType* item) - { - VMA_HEAVY_ASSERT(item->GetType() == VmaAllocation_T::ALLOCATION_TYPE_DEDICATED); - return item->m_DedicatedAllocation.m_Prev; - } - static ItemType* GetNext(const ItemType* item) - { - VMA_HEAVY_ASSERT(item->GetType() == VmaAllocation_T::ALLOCATION_TYPE_DEDICATED); - return item->m_DedicatedAllocation.m_Next; - } - static ItemType*& AccessPrev(ItemType* item) - { - VMA_HEAVY_ASSERT(item->GetType() == VmaAllocation_T::ALLOCATION_TYPE_DEDICATED); - return item->m_DedicatedAllocation.m_Prev; - } - static ItemType*& AccessNext(ItemType* item) - { - VMA_HEAVY_ASSERT(item->GetType() == VmaAllocation_T::ALLOCATION_TYPE_DEDICATED); - return item->m_DedicatedAllocation.m_Next; - } + static ItemType* GetPrev(const ItemType* item) + { + VMA_HEAVY_ASSERT(item->GetType() == VmaAllocation_T::ALLOCATION_TYPE_DEDICATED); + return item->m_DedicatedAllocation.m_Prev; + } + static ItemType* GetNext(const ItemType* item) + { + VMA_HEAVY_ASSERT(item->GetType() == VmaAllocation_T::ALLOCATION_TYPE_DEDICATED); + return item->m_DedicatedAllocation.m_Next; + } + static ItemType*& AccessPrev(ItemType* item) + { + VMA_HEAVY_ASSERT(item->GetType() == VmaAllocation_T::ALLOCATION_TYPE_DEDICATED); + return item->m_DedicatedAllocation.m_Prev; + } + static ItemType*& AccessNext(ItemType* item) + { + VMA_HEAVY_ASSERT(item->GetType() == VmaAllocation_T::ALLOCATION_TYPE_DEDICATED); + return item->m_DedicatedAllocation.m_Next; + } }; #endif // _VMA_DEDICATED_ALLOCATION_LIST_ITEM_TRAITS @@ -6159,118 +6299,119 @@ Thread-safe, synchronized internally. */ class VmaDedicatedAllocationList { + VMA_CLASS_NO_COPY_NO_MOVE(VmaDedicatedAllocationList) public: - VmaDedicatedAllocationList() {} - ~VmaDedicatedAllocationList(); + VmaDedicatedAllocationList() {} + ~VmaDedicatedAllocationList(); - void Init(bool useMutex) { m_UseMutex = useMutex; } - bool Validate(); + void Init(bool useMutex) { m_UseMutex = useMutex; } + bool Validate(); - void AddDetailedStatistics(VmaDetailedStatistics& inoutStats); - void AddStatistics(VmaStatistics& inoutStats); + void AddDetailedStatistics(VmaDetailedStatistics& inoutStats); + void AddStatistics(VmaStatistics& inoutStats); #if VMA_STATS_STRING_ENABLED - // Writes JSON array with the list of allocations. - void BuildStatsString(VmaJsonWriter& json); + // Writes JSON array with the list of allocations. + void BuildStatsString(VmaJsonWriter& json); #endif - bool IsEmpty(); - void Register(VmaAllocation alloc); - void Unregister(VmaAllocation alloc); + bool IsEmpty(); + void Register(VmaAllocation alloc); + void Unregister(VmaAllocation alloc); private: - typedef VmaIntrusiveLinkedList DedicatedAllocationLinkedList; + typedef VmaIntrusiveLinkedList DedicatedAllocationLinkedList; - bool m_UseMutex = true; - VMA_RW_MUTEX m_Mutex; - DedicatedAllocationLinkedList m_AllocationList; + bool m_UseMutex = true; + VMA_RW_MUTEX m_Mutex; + DedicatedAllocationLinkedList m_AllocationList; }; #ifndef _VMA_DEDICATED_ALLOCATION_LIST_FUNCTIONS VmaDedicatedAllocationList::~VmaDedicatedAllocationList() { - VMA_HEAVY_ASSERT(Validate()); + VMA_HEAVY_ASSERT(Validate()); - if (!m_AllocationList.IsEmpty()) - { - VMA_ASSERT(false && "Unfreed dedicated allocations found!"); - } + if (!m_AllocationList.IsEmpty()) + { + VMA_ASSERT_LEAK(false && "Unfreed dedicated allocations found!"); + } } bool VmaDedicatedAllocationList::Validate() { - const size_t declaredCount = m_AllocationList.GetCount(); - size_t actualCount = 0; - VmaMutexLockRead lock(m_Mutex, m_UseMutex); - for (VmaAllocation alloc = m_AllocationList.Front(); - alloc != VMA_NULL; alloc = m_AllocationList.GetNext(alloc)) - { - ++actualCount; - } - VMA_VALIDATE(actualCount == declaredCount); + const size_t declaredCount = m_AllocationList.GetCount(); + size_t actualCount = 0; + VmaMutexLockRead lock(m_Mutex, m_UseMutex); + for (VmaAllocation alloc = m_AllocationList.Front(); + alloc != VMA_NULL; alloc = m_AllocationList.GetNext(alloc)) + { + ++actualCount; + } + VMA_VALIDATE(actualCount == declaredCount); - return true; + return true; } void VmaDedicatedAllocationList::AddDetailedStatistics(VmaDetailedStatistics& inoutStats) { - for(auto* item = m_AllocationList.Front(); item != nullptr; item = DedicatedAllocationLinkedList::GetNext(item)) - { - const VkDeviceSize size = item->GetSize(); - inoutStats.statistics.blockCount++; - inoutStats.statistics.blockBytes += size; - VmaAddDetailedStatisticsAllocation(inoutStats, item->GetSize()); - } + for (auto* item = m_AllocationList.Front(); item != VMA_NULL; item = DedicatedAllocationLinkedList::GetNext(item)) + { + const VkDeviceSize size = item->GetSize(); + inoutStats.statistics.blockCount++; + inoutStats.statistics.blockBytes += size; + VmaAddDetailedStatisticsAllocation(inoutStats, item->GetSize()); + } } void VmaDedicatedAllocationList::AddStatistics(VmaStatistics& inoutStats) { - VmaMutexLockRead lock(m_Mutex, m_UseMutex); + VmaMutexLockRead lock(m_Mutex, m_UseMutex); - const uint32_t allocCount = (uint32_t)m_AllocationList.GetCount(); - inoutStats.blockCount += allocCount; - inoutStats.allocationCount += allocCount; + const uint32_t allocCount = (uint32_t)m_AllocationList.GetCount(); + inoutStats.blockCount += allocCount; + inoutStats.allocationCount += allocCount; - for(auto* item = m_AllocationList.Front(); item != nullptr; item = DedicatedAllocationLinkedList::GetNext(item)) - { - const VkDeviceSize size = item->GetSize(); - inoutStats.blockBytes += size; - inoutStats.allocationBytes += size; - } + for (auto* item = m_AllocationList.Front(); item != VMA_NULL; item = DedicatedAllocationLinkedList::GetNext(item)) + { + const VkDeviceSize size = item->GetSize(); + inoutStats.blockBytes += size; + inoutStats.allocationBytes += size; + } } #if VMA_STATS_STRING_ENABLED void VmaDedicatedAllocationList::BuildStatsString(VmaJsonWriter& json) { - VmaMutexLockRead lock(m_Mutex, m_UseMutex); - json.BeginArray(); - for (VmaAllocation alloc = m_AllocationList.Front(); - alloc != VMA_NULL; alloc = m_AllocationList.GetNext(alloc)) - { - json.BeginObject(true); - alloc->PrintParameters(json); - json.EndObject(); - } - json.EndArray(); + VmaMutexLockRead lock(m_Mutex, m_UseMutex); + json.BeginArray(); + for (VmaAllocation alloc = m_AllocationList.Front(); + alloc != VMA_NULL; alloc = m_AllocationList.GetNext(alloc)) + { + json.BeginObject(true); + alloc->PrintParameters(json); + json.EndObject(); + } + json.EndArray(); } #endif // VMA_STATS_STRING_ENABLED bool VmaDedicatedAllocationList::IsEmpty() { - VmaMutexLockRead lock(m_Mutex, m_UseMutex); - return m_AllocationList.IsEmpty(); + VmaMutexLockRead lock(m_Mutex, m_UseMutex); + return m_AllocationList.IsEmpty(); } void VmaDedicatedAllocationList::Register(VmaAllocation alloc) { - VmaMutexLockWrite lock(m_Mutex, m_UseMutex); - m_AllocationList.PushBack(alloc); + VmaMutexLockWrite lock(m_Mutex, m_UseMutex); + m_AllocationList.PushBack(alloc); } void VmaDedicatedAllocationList::Unregister(VmaAllocation alloc) { - VmaMutexLockWrite lock(m_Mutex, m_UseMutex); - m_AllocationList.Remove(alloc); + VmaMutexLockWrite lock(m_Mutex, m_UseMutex); + m_AllocationList.Remove(alloc); } #endif // _VMA_DEDICATED_ALLOCATION_LIST_FUNCTIONS #endif // _VMA_DEDICATED_ALLOCATION_LIST @@ -6282,42 +6423,42 @@ allocated memory block or free. */ struct VmaSuballocation { - VkDeviceSize offset; - VkDeviceSize size; - void* userData; - VmaSuballocationType type; + VkDeviceSize offset; + VkDeviceSize size; + void* userData; + VmaSuballocationType type; }; // Comparator for offsets. struct VmaSuballocationOffsetLess { - bool operator()(const VmaSuballocation& lhs, const VmaSuballocation& rhs) const - { - return lhs.offset < rhs.offset; - } + bool operator()(const VmaSuballocation& lhs, const VmaSuballocation& rhs) const + { + return lhs.offset < rhs.offset; + } }; struct VmaSuballocationOffsetGreater { - bool operator()(const VmaSuballocation& lhs, const VmaSuballocation& rhs) const - { - return lhs.offset > rhs.offset; - } + bool operator()(const VmaSuballocation& lhs, const VmaSuballocation& rhs) const + { + return lhs.offset > rhs.offset; + } }; struct VmaSuballocationItemSizeLess { - bool operator()(const VmaSuballocationList::iterator lhs, - const VmaSuballocationList::iterator rhs) const - { - return lhs->size < rhs->size; - } + bool operator()(const VmaSuballocationList::iterator lhs, + const VmaSuballocationList::iterator rhs) const + { + return lhs->size < rhs->size; + } - bool operator()(const VmaSuballocationList::iterator lhs, - VkDeviceSize rhsSize) const - { - return lhs->size < rhsSize; - } + bool operator()(const VmaSuballocationList::iterator lhs, + VkDeviceSize rhsSize) const + { + return lhs->size < rhsSize; + } }; #endif // _VMA_SUBALLOCATION @@ -6328,12 +6469,12 @@ item points to a FREE suballocation. */ struct VmaAllocationRequest { - VmaAllocHandle allocHandle; - VkDeviceSize size; - VmaSuballocationList::iterator item; - void* customData; - uint64_t algorithmData; - VmaAllocationRequestType type; + VmaAllocHandle allocHandle; + VkDeviceSize size; + VmaSuballocationList::iterator item; + void* customData; + uint64_t algorithmData; + VmaAllocationRequestType type; }; #endif // _VMA_ALLOCATION_REQUEST @@ -6344,200 +6485,199 @@ in a single VkDeviceMemory block. */ class VmaBlockMetadata { + VMA_CLASS_NO_COPY_NO_MOVE(VmaBlockMetadata) public: - // pAllocationCallbacks, if not null, must be owned externally - alive and unchanged for the whole lifetime of this object. - VmaBlockMetadata(const VkAllocationCallbacks* pAllocationCallbacks, - VkDeviceSize bufferImageGranularity, bool isVirtual); - virtual ~VmaBlockMetadata() = default; + // pAllocationCallbacks, if not null, must be owned externally - alive and unchanged for the whole lifetime of this object. + VmaBlockMetadata(const VkAllocationCallbacks* pAllocationCallbacks, + VkDeviceSize bufferImageGranularity, bool isVirtual); + virtual ~VmaBlockMetadata() = default; - virtual void Init(VkDeviceSize size) { m_Size = size; } - bool IsVirtual() const { return m_IsVirtual; } - VkDeviceSize GetSize() const { return m_Size; } + virtual void Init(VkDeviceSize size) { m_Size = size; } + bool IsVirtual() const { return m_IsVirtual; } + VkDeviceSize GetSize() const { return m_Size; } - // Validates all data structures inside this object. If not valid, returns false. - virtual bool Validate() const = 0; - virtual size_t GetAllocationCount() const = 0; - virtual size_t GetFreeRegionsCount() const = 0; - virtual VkDeviceSize GetSumFreeSize() const = 0; - // Returns true if this block is empty - contains only single free suballocation. - virtual bool IsEmpty() const = 0; - virtual void GetAllocationInfo(VmaAllocHandle allocHandle, VmaVirtualAllocationInfo& outInfo) = 0; - virtual VkDeviceSize GetAllocationOffset(VmaAllocHandle allocHandle) const = 0; - virtual void* GetAllocationUserData(VmaAllocHandle allocHandle) const = 0; + // Validates all data structures inside this object. If not valid, returns false. + virtual bool Validate() const = 0; + virtual size_t GetAllocationCount() const = 0; + virtual size_t GetFreeRegionsCount() const = 0; + virtual VkDeviceSize GetSumFreeSize() const = 0; + // Returns true if this block is empty - contains only single free suballocation. + virtual bool IsEmpty() const = 0; + virtual void GetAllocationInfo(VmaAllocHandle allocHandle, VmaVirtualAllocationInfo& outInfo) = 0; + virtual VkDeviceSize GetAllocationOffset(VmaAllocHandle allocHandle) const = 0; + virtual void* GetAllocationUserData(VmaAllocHandle allocHandle) const = 0; - virtual VmaAllocHandle GetAllocationListBegin() const = 0; - virtual VmaAllocHandle GetNextAllocation(VmaAllocHandle prevAlloc) const = 0; - virtual VkDeviceSize GetNextFreeRegionSize(VmaAllocHandle alloc) const = 0; + virtual VmaAllocHandle GetAllocationListBegin() const = 0; + virtual VmaAllocHandle GetNextAllocation(VmaAllocHandle prevAlloc) const = 0; + virtual VkDeviceSize GetNextFreeRegionSize(VmaAllocHandle alloc) const = 0; - // Shouldn't modify blockCount. - virtual void AddDetailedStatistics(VmaDetailedStatistics& inoutStats) const = 0; - virtual void AddStatistics(VmaStatistics& inoutStats) const = 0; + // Shouldn't modify blockCount. + virtual void AddDetailedStatistics(VmaDetailedStatistics& inoutStats) const = 0; + virtual void AddStatistics(VmaStatistics& inoutStats) const = 0; #if VMA_STATS_STRING_ENABLED - virtual void PrintDetailedMap(class VmaJsonWriter& json) const = 0; + virtual void PrintDetailedMap(class VmaJsonWriter& json) const = 0; #endif - // Tries to find a place for suballocation with given parameters inside this block. - // If succeeded, fills pAllocationRequest and returns true. - // If failed, returns false. - virtual bool CreateAllocationRequest( - VkDeviceSize allocSize, - VkDeviceSize allocAlignment, - bool upperAddress, - VmaSuballocationType allocType, - // Always one of VMA_ALLOCATION_CREATE_STRATEGY_* or VMA_ALLOCATION_INTERNAL_STRATEGY_* flags. - uint32_t strategy, - VmaAllocationRequest* pAllocationRequest) = 0; + // Tries to find a place for suballocation with given parameters inside this block. + // If succeeded, fills pAllocationRequest and returns true. + // If failed, returns false. + virtual bool CreateAllocationRequest( + VkDeviceSize allocSize, + VkDeviceSize allocAlignment, + bool upperAddress, + VmaSuballocationType allocType, + // Always one of VMA_ALLOCATION_CREATE_STRATEGY_* or VMA_ALLOCATION_INTERNAL_STRATEGY_* flags. + uint32_t strategy, + VmaAllocationRequest* pAllocationRequest) = 0; - virtual VkResult CheckCorruption(const void* pBlockData) = 0; + virtual VkResult CheckCorruption(const void* pBlockData) = 0; - // Makes actual allocation based on request. Request must already be checked and valid. - virtual void Alloc( - const VmaAllocationRequest& request, - VmaSuballocationType type, - void* userData) = 0; + // Makes actual allocation based on request. Request must already be checked and valid. + virtual void Alloc( + const VmaAllocationRequest& request, + VmaSuballocationType type, + void* userData) = 0; - // Frees suballocation assigned to given memory region. - virtual void Free(VmaAllocHandle allocHandle) = 0; + // Frees suballocation assigned to given memory region. + virtual void Free(VmaAllocHandle allocHandle) = 0; - // Frees all allocations. - // Careful! Don't call it if there are VmaAllocation objects owned by userData of cleared allocations! - virtual void Clear() = 0; + // Frees all allocations. + // Careful! Don't call it if there are VmaAllocation objects owned by userData of cleared allocations! + virtual void Clear() = 0; - virtual void SetAllocationUserData(VmaAllocHandle allocHandle, void* userData) = 0; - virtual void DebugLogAllAllocations() const = 0; + virtual void SetAllocationUserData(VmaAllocHandle allocHandle, void* userData) = 0; + virtual void DebugLogAllAllocations() const = 0; protected: - const VkAllocationCallbacks* GetAllocationCallbacks() const { return m_pAllocationCallbacks; } - VkDeviceSize GetBufferImageGranularity() const { return m_BufferImageGranularity; } - VkDeviceSize GetDebugMargin() const { return IsVirtual() ? 0 : VMA_DEBUG_MARGIN; } + const VkAllocationCallbacks* GetAllocationCallbacks() const { return m_pAllocationCallbacks; } + VkDeviceSize GetBufferImageGranularity() const { return m_BufferImageGranularity; } + VkDeviceSize GetDebugMargin() const { return VkDeviceSize(IsVirtual() ? 0 : VMA_DEBUG_MARGIN); } - void DebugLogAllocation(VkDeviceSize offset, VkDeviceSize size, void* userData) const; + void DebugLogAllocation(VkDeviceSize offset, VkDeviceSize size, void* userData) const; #if VMA_STATS_STRING_ENABLED - // mapRefCount == UINT32_MAX means unspecified. - void PrintDetailedMap_Begin(class VmaJsonWriter& json, - VkDeviceSize unusedBytes, - size_t allocationCount, - size_t unusedRangeCount) const; - void PrintDetailedMap_Allocation(class VmaJsonWriter& json, - VkDeviceSize offset, VkDeviceSize size, void* userData) const; - void PrintDetailedMap_UnusedRange(class VmaJsonWriter& json, - VkDeviceSize offset, - VkDeviceSize size) const; - void PrintDetailedMap_End(class VmaJsonWriter& json) const; + // mapRefCount == UINT32_MAX means unspecified. + void PrintDetailedMap_Begin(class VmaJsonWriter& json, + VkDeviceSize unusedBytes, + size_t allocationCount, + size_t unusedRangeCount) const; + void PrintDetailedMap_Allocation(class VmaJsonWriter& json, + VkDeviceSize offset, VkDeviceSize size, void* userData) const; + void PrintDetailedMap_UnusedRange(class VmaJsonWriter& json, + VkDeviceSize offset, + VkDeviceSize size) const; + void PrintDetailedMap_End(class VmaJsonWriter& json) const; #endif private: - VkDeviceSize m_Size; - const VkAllocationCallbacks* m_pAllocationCallbacks; - const VkDeviceSize m_BufferImageGranularity; - const bool m_IsVirtual; + VkDeviceSize m_Size; + const VkAllocationCallbacks* m_pAllocationCallbacks; + const VkDeviceSize m_BufferImageGranularity; + const bool m_IsVirtual; }; #ifndef _VMA_BLOCK_METADATA_FUNCTIONS VmaBlockMetadata::VmaBlockMetadata(const VkAllocationCallbacks* pAllocationCallbacks, - VkDeviceSize bufferImageGranularity, bool isVirtual) - : m_Size(0), - m_pAllocationCallbacks(pAllocationCallbacks), - m_BufferImageGranularity(bufferImageGranularity), - m_IsVirtual(isVirtual) {} + VkDeviceSize bufferImageGranularity, bool isVirtual) + : m_Size(0), + m_pAllocationCallbacks(pAllocationCallbacks), + m_BufferImageGranularity(bufferImageGranularity), + m_IsVirtual(isVirtual) {} void VmaBlockMetadata::DebugLogAllocation(VkDeviceSize offset, VkDeviceSize size, void* userData) const { - if (IsVirtual()) - { - VMA_DEBUG_LOG("UNFREED VIRTUAL ALLOCATION; Offset: %llu; Size: %llu; UserData: %p", offset, size, userData); - } - else - { - VMA_ASSERT(userData != VMA_NULL); - VmaAllocation allocation = reinterpret_cast(userData); + if (IsVirtual()) + { + VMA_LEAK_LOG_FORMAT("UNFREED VIRTUAL ALLOCATION; Offset: %" PRIu64 "; Size: %" PRIu64 "; UserData: %p", offset, size, userData); + } else + { + VMA_ASSERT(userData != VMA_NULL); + VmaAllocation allocation = reinterpret_cast(userData); - userData = allocation->GetUserData(); - const char* name = allocation->GetName(); + userData = allocation->GetUserData(); + const char* name = allocation->GetName(); #if VMA_STATS_STRING_ENABLED - VMA_DEBUG_LOG("UNFREED ALLOCATION; Offset: %llu; Size: %llu; UserData: %p; Name: %s; Type: %s; Usage: %u", - offset, size, userData, name ? name : "vma_empty", - VMA_SUBALLOCATION_TYPE_NAMES[allocation->GetSuballocationType()], - allocation->GetBufferImageUsage()); + VMA_LEAK_LOG_FORMAT("UNFREED ALLOCATION; Offset: %" PRIu64 "; Size: %" PRIu64 "; UserData: %p; Name: %s; Type: %s; Usage: %" PRIu64, + offset, size, userData, name ? name : "vma_empty", + VMA_SUBALLOCATION_TYPE_NAMES[allocation->GetSuballocationType()], + (uint64_t)allocation->GetBufferImageUsage().Value); #else - VMA_DEBUG_LOG("UNFREED ALLOCATION; Offset: %llu; Size: %llu; UserData: %p; Name: %s; Type: %u", - offset, size, userData, name ? name : "vma_empty", - (uint32_t)allocation->GetSuballocationType()); + VMA_LEAK_LOG_FORMAT("UNFREED ALLOCATION; Offset: %" PRIu64 "; Size: %" PRIu64 "; UserData: %p; Name: %s; Type: %u", + offset, size, userData, name ? name : "vma_empty", + (unsigned)allocation->GetSuballocationType()); #endif // VMA_STATS_STRING_ENABLED - } + } } #if VMA_STATS_STRING_ENABLED void VmaBlockMetadata::PrintDetailedMap_Begin(class VmaJsonWriter& json, - VkDeviceSize unusedBytes, size_t allocationCount, size_t unusedRangeCount) const + VkDeviceSize unusedBytes, size_t allocationCount, size_t unusedRangeCount) const { - json.WriteString("TotalBytes"); - json.WriteNumber(GetSize()); + json.WriteString("TotalBytes"); + json.WriteNumber(GetSize()); - json.WriteString("UnusedBytes"); - json.WriteSize(unusedBytes); + json.WriteString("UnusedBytes"); + json.WriteNumber(unusedBytes); - json.WriteString("Allocations"); - json.WriteSize(allocationCount); + json.WriteString("Allocations"); + json.WriteNumber((uint64_t)allocationCount); - json.WriteString("UnusedRanges"); - json.WriteSize(unusedRangeCount); + json.WriteString("UnusedRanges"); + json.WriteNumber((uint64_t)unusedRangeCount); - json.WriteString("Suballocations"); - json.BeginArray(); + json.WriteString("Suballocations"); + json.BeginArray(); } void VmaBlockMetadata::PrintDetailedMap_Allocation(class VmaJsonWriter& json, - VkDeviceSize offset, VkDeviceSize size, void* userData) const + VkDeviceSize offset, VkDeviceSize size, void* userData) const { - json.BeginObject(true); + json.BeginObject(true); - json.WriteString("Offset"); - json.WriteNumber(offset); + json.WriteString("Offset"); + json.WriteNumber(offset); - if (IsVirtual()) - { - json.WriteString("Size"); - json.WriteNumber(size); - if (userData) - { - json.WriteString("CustomData"); - json.BeginString(); - json.ContinueString_Pointer(userData); - json.EndString(); - } - } - else - { - ((VmaAllocation)userData)->PrintParameters(json); - } + if (IsVirtual()) + { + json.WriteString("Size"); + json.WriteNumber(size); + if (userData) + { + json.WriteString("CustomData"); + json.BeginString(); + json.ContinueString_Pointer(userData); + json.EndString(); + } + } else + { + ((VmaAllocation)userData)->PrintParameters(json); + } - json.EndObject(); + json.EndObject(); } void VmaBlockMetadata::PrintDetailedMap_UnusedRange(class VmaJsonWriter& json, - VkDeviceSize offset, VkDeviceSize size) const + VkDeviceSize offset, VkDeviceSize size) const { - json.BeginObject(true); + json.BeginObject(true); - json.WriteString("Offset"); - json.WriteNumber(offset); + json.WriteString("Offset"); + json.WriteNumber(offset); - json.WriteString("Type"); - json.WriteString(VMA_SUBALLOCATION_TYPE_NAMES[VMA_SUBALLOCATION_TYPE_FREE]); + json.WriteString("Type"); + json.WriteString(VMA_SUBALLOCATION_TYPE_NAMES[VMA_SUBALLOCATION_TYPE_FREE]); - json.WriteString("Size"); - json.WriteNumber(size); + json.WriteString("Size"); + json.WriteNumber(size); - json.EndObject(); + json.EndObject(); } void VmaBlockMetadata::PrintDetailedMap_End(class VmaJsonWriter& json) const { - json.EndArray(); + json.EndArray(); } #endif // VMA_STATS_STRING_ENABLED #endif // _VMA_BLOCK_METADATA_FUNCTIONS @@ -6548,3431 +6688,1915 @@ void VmaBlockMetadata::PrintDetailedMap_End(class VmaJsonWriter& json) const class VmaBlockBufferImageGranularity final { public: - struct ValidationContext - { - const VkAllocationCallbacks* allocCallbacks; - uint16_t* pageAllocs; - }; + struct ValidationContext + { + const VkAllocationCallbacks* allocCallbacks; + uint16_t* pageAllocs; + }; - VmaBlockBufferImageGranularity(VkDeviceSize bufferImageGranularity); - ~VmaBlockBufferImageGranularity(); + VmaBlockBufferImageGranularity(VkDeviceSize bufferImageGranularity); + ~VmaBlockBufferImageGranularity(); - bool IsEnabled() const { return m_BufferImageGranularity > MAX_LOW_BUFFER_IMAGE_GRANULARITY; } + bool IsEnabled() const { return m_BufferImageGranularity > MAX_LOW_BUFFER_IMAGE_GRANULARITY; } - void Init(const VkAllocationCallbacks* pAllocationCallbacks, VkDeviceSize size); - // Before destroying object you must call free it's memory - void Destroy(const VkAllocationCallbacks* pAllocationCallbacks); + void Init(const VkAllocationCallbacks* pAllocationCallbacks, VkDeviceSize size); + // Before destroying object you must call free it's memory + void Destroy(const VkAllocationCallbacks* pAllocationCallbacks); - void RoundupAllocRequest(VmaSuballocationType allocType, - VkDeviceSize& inOutAllocSize, - VkDeviceSize& inOutAllocAlignment) const; + void RoundupAllocRequest(VmaSuballocationType allocType, + VkDeviceSize& inOutAllocSize, + VkDeviceSize& inOutAllocAlignment) const; - bool CheckConflictAndAlignUp(VkDeviceSize& inOutAllocOffset, - VkDeviceSize allocSize, - VkDeviceSize blockOffset, - VkDeviceSize blockSize, - VmaSuballocationType allocType) const; + bool CheckConflictAndAlignUp(VkDeviceSize& inOutAllocOffset, + VkDeviceSize allocSize, + VkDeviceSize blockOffset, + VkDeviceSize blockSize, + VmaSuballocationType allocType) const; - void AllocPages(uint8_t allocType, VkDeviceSize offset, VkDeviceSize size); - void FreePages(VkDeviceSize offset, VkDeviceSize size); - void Clear(); + void AllocPages(uint8_t allocType, VkDeviceSize offset, VkDeviceSize size); + void FreePages(VkDeviceSize offset, VkDeviceSize size); + void Clear(); - ValidationContext StartValidation(const VkAllocationCallbacks* pAllocationCallbacks, - bool isVirutal) const; - bool Validate(ValidationContext& ctx, VkDeviceSize offset, VkDeviceSize size) const; - bool FinishValidation(ValidationContext& ctx) const; + ValidationContext StartValidation(const VkAllocationCallbacks* pAllocationCallbacks, + bool isVirutal) const; + bool Validate(ValidationContext& ctx, VkDeviceSize offset, VkDeviceSize size) const; + bool FinishValidation(ValidationContext& ctx) const; private: - static const uint16_t MAX_LOW_BUFFER_IMAGE_GRANULARITY = 256; + static const uint16_t MAX_LOW_BUFFER_IMAGE_GRANULARITY = 256; - struct RegionInfo - { - uint8_t allocType; - uint16_t allocCount; - }; + struct RegionInfo + { + uint8_t allocType; + uint16_t allocCount; + }; - VkDeviceSize m_BufferImageGranularity; - uint32_t m_RegionCount; - RegionInfo* m_RegionInfo; + VkDeviceSize m_BufferImageGranularity; + uint32_t m_RegionCount; + RegionInfo* m_RegionInfo; - uint32_t GetStartPage(VkDeviceSize offset) const { return OffsetToPageIndex(offset & ~(m_BufferImageGranularity - 1)); } - uint32_t GetEndPage(VkDeviceSize offset, VkDeviceSize size) const { return OffsetToPageIndex((offset + size - 1) & ~(m_BufferImageGranularity - 1)); } + uint32_t GetStartPage(VkDeviceSize offset) const { return OffsetToPageIndex(offset & ~(m_BufferImageGranularity - 1)); } + uint32_t GetEndPage(VkDeviceSize offset, VkDeviceSize size) const { return OffsetToPageIndex((offset + size - 1) & ~(m_BufferImageGranularity - 1)); } - uint32_t OffsetToPageIndex(VkDeviceSize offset) const; - void AllocPage(RegionInfo& page, uint8_t allocType); + uint32_t OffsetToPageIndex(VkDeviceSize offset) const; + void AllocPage(RegionInfo& page, uint8_t allocType); }; #ifndef _VMA_BLOCK_BUFFER_IMAGE_GRANULARITY_FUNCTIONS VmaBlockBufferImageGranularity::VmaBlockBufferImageGranularity(VkDeviceSize bufferImageGranularity) - : m_BufferImageGranularity(bufferImageGranularity), - m_RegionCount(0), - m_RegionInfo(VMA_NULL) {} + : m_BufferImageGranularity(bufferImageGranularity), + m_RegionCount(0), + m_RegionInfo(VMA_NULL) {} VmaBlockBufferImageGranularity::~VmaBlockBufferImageGranularity() { - VMA_ASSERT(m_RegionInfo == VMA_NULL && "Free not called before destroying object!"); + VMA_ASSERT(m_RegionInfo == VMA_NULL && "Free not called before destroying object!"); } void VmaBlockBufferImageGranularity::Init(const VkAllocationCallbacks* pAllocationCallbacks, VkDeviceSize size) { - if (IsEnabled()) - { - m_RegionCount = static_cast(VmaDivideRoundingUp(size, m_BufferImageGranularity)); - m_RegionInfo = vma_new_array(pAllocationCallbacks, RegionInfo, m_RegionCount); - memset(m_RegionInfo, 0, m_RegionCount * sizeof(RegionInfo)); - } + if (IsEnabled()) + { + m_RegionCount = static_cast(VmaDivideRoundingUp(size, m_BufferImageGranularity)); + m_RegionInfo = vma_new_array(pAllocationCallbacks, RegionInfo, m_RegionCount); + memset(m_RegionInfo, 0, m_RegionCount * sizeof(RegionInfo)); + } } void VmaBlockBufferImageGranularity::Destroy(const VkAllocationCallbacks* pAllocationCallbacks) { - if (m_RegionInfo) - { - vma_delete_array(pAllocationCallbacks, m_RegionInfo, m_RegionCount); - m_RegionInfo = VMA_NULL; - } + if (m_RegionInfo) + { + vma_delete_array(pAllocationCallbacks, m_RegionInfo, m_RegionCount); + m_RegionInfo = VMA_NULL; + } } void VmaBlockBufferImageGranularity::RoundupAllocRequest(VmaSuballocationType allocType, - VkDeviceSize& inOutAllocSize, - VkDeviceSize& inOutAllocAlignment) const + VkDeviceSize& inOutAllocSize, + VkDeviceSize& inOutAllocAlignment) const { - if (m_BufferImageGranularity > 1 && - m_BufferImageGranularity <= MAX_LOW_BUFFER_IMAGE_GRANULARITY) - { - if (allocType == VMA_SUBALLOCATION_TYPE_UNKNOWN || - allocType == VMA_SUBALLOCATION_TYPE_IMAGE_UNKNOWN || - allocType == VMA_SUBALLOCATION_TYPE_IMAGE_OPTIMAL) - { - inOutAllocAlignment = VMA_MAX(inOutAllocAlignment, m_BufferImageGranularity); - inOutAllocSize = VmaAlignUp(inOutAllocSize, m_BufferImageGranularity); - } - } + if (m_BufferImageGranularity > 1 && + m_BufferImageGranularity <= MAX_LOW_BUFFER_IMAGE_GRANULARITY) + { + if (allocType == VMA_SUBALLOCATION_TYPE_UNKNOWN || + allocType == VMA_SUBALLOCATION_TYPE_IMAGE_UNKNOWN || + allocType == VMA_SUBALLOCATION_TYPE_IMAGE_OPTIMAL) + { + inOutAllocAlignment = VMA_MAX(inOutAllocAlignment, m_BufferImageGranularity); + inOutAllocSize = VmaAlignUp(inOutAllocSize, m_BufferImageGranularity); + } + } } bool VmaBlockBufferImageGranularity::CheckConflictAndAlignUp(VkDeviceSize& inOutAllocOffset, - VkDeviceSize allocSize, - VkDeviceSize blockOffset, - VkDeviceSize blockSize, - VmaSuballocationType allocType) const + VkDeviceSize allocSize, + VkDeviceSize blockOffset, + VkDeviceSize blockSize, + VmaSuballocationType allocType) const { - if (IsEnabled()) - { - uint32_t startPage = GetStartPage(inOutAllocOffset); - if (m_RegionInfo[startPage].allocCount > 0 && - VmaIsBufferImageGranularityConflict(static_cast(m_RegionInfo[startPage].allocType), allocType)) - { - inOutAllocOffset = VmaAlignUp(inOutAllocOffset, m_BufferImageGranularity); - if (blockSize < allocSize + inOutAllocOffset - blockOffset) - return true; - ++startPage; - } - uint32_t endPage = GetEndPage(inOutAllocOffset, allocSize); - if (endPage != startPage && - m_RegionInfo[endPage].allocCount > 0 && - VmaIsBufferImageGranularityConflict(static_cast(m_RegionInfo[endPage].allocType), allocType)) - { - return true; - } - } - return false; + if (IsEnabled()) + { + uint32_t startPage = GetStartPage(inOutAllocOffset); + if (m_RegionInfo[startPage].allocCount > 0 && + VmaIsBufferImageGranularityConflict(static_cast(m_RegionInfo[startPage].allocType), allocType)) + { + inOutAllocOffset = VmaAlignUp(inOutAllocOffset, m_BufferImageGranularity); + if (blockSize < allocSize + inOutAllocOffset - blockOffset) + return true; + ++startPage; + } + uint32_t endPage = GetEndPage(inOutAllocOffset, allocSize); + if (endPage != startPage && + m_RegionInfo[endPage].allocCount > 0 && + VmaIsBufferImageGranularityConflict(static_cast(m_RegionInfo[endPage].allocType), allocType)) + { + return true; + } + } + return false; } void VmaBlockBufferImageGranularity::AllocPages(uint8_t allocType, VkDeviceSize offset, VkDeviceSize size) { - if (IsEnabled()) - { - uint32_t startPage = GetStartPage(offset); - AllocPage(m_RegionInfo[startPage], allocType); + if (IsEnabled()) + { + uint32_t startPage = GetStartPage(offset); + AllocPage(m_RegionInfo[startPage], allocType); - uint32_t endPage = GetEndPage(offset, size); - if (startPage != endPage) - AllocPage(m_RegionInfo[endPage], allocType); - } + uint32_t endPage = GetEndPage(offset, size); + if (startPage != endPage) + AllocPage(m_RegionInfo[endPage], allocType); + } } void VmaBlockBufferImageGranularity::FreePages(VkDeviceSize offset, VkDeviceSize size) { - if (IsEnabled()) - { - uint32_t startPage = GetStartPage(offset); - --m_RegionInfo[startPage].allocCount; - if (m_RegionInfo[startPage].allocCount == 0) - m_RegionInfo[startPage].allocType = VMA_SUBALLOCATION_TYPE_FREE; - uint32_t endPage = GetEndPage(offset, size); - if (startPage != endPage) - { - --m_RegionInfo[endPage].allocCount; - if (m_RegionInfo[endPage].allocCount == 0) - m_RegionInfo[endPage].allocType = VMA_SUBALLOCATION_TYPE_FREE; - } - } + if (IsEnabled()) + { + uint32_t startPage = GetStartPage(offset); + --m_RegionInfo[startPage].allocCount; + if (m_RegionInfo[startPage].allocCount == 0) + m_RegionInfo[startPage].allocType = VMA_SUBALLOCATION_TYPE_FREE; + uint32_t endPage = GetEndPage(offset, size); + if (startPage != endPage) + { + --m_RegionInfo[endPage].allocCount; + if (m_RegionInfo[endPage].allocCount == 0) + m_RegionInfo[endPage].allocType = VMA_SUBALLOCATION_TYPE_FREE; + } + } } void VmaBlockBufferImageGranularity::Clear() { - if (m_RegionInfo) - memset(m_RegionInfo, 0, m_RegionCount * sizeof(RegionInfo)); + if (m_RegionInfo) + memset(m_RegionInfo, 0, m_RegionCount * sizeof(RegionInfo)); } VmaBlockBufferImageGranularity::ValidationContext VmaBlockBufferImageGranularity::StartValidation( - const VkAllocationCallbacks* pAllocationCallbacks, bool isVirutal) const + const VkAllocationCallbacks* pAllocationCallbacks, bool isVirutal) const { - ValidationContext ctx{ pAllocationCallbacks, VMA_NULL }; - if (!isVirutal && IsEnabled()) - { - ctx.pageAllocs = vma_new_array(pAllocationCallbacks, uint16_t, m_RegionCount); - memset(ctx.pageAllocs, 0, m_RegionCount * sizeof(uint16_t)); - } - return ctx; + ValidationContext ctx{ pAllocationCallbacks, VMA_NULL }; + if (!isVirutal && IsEnabled()) + { + ctx.pageAllocs = vma_new_array(pAllocationCallbacks, uint16_t, m_RegionCount); + memset(ctx.pageAllocs, 0, m_RegionCount * sizeof(uint16_t)); + } + return ctx; } bool VmaBlockBufferImageGranularity::Validate(ValidationContext& ctx, - VkDeviceSize offset, VkDeviceSize size) const + VkDeviceSize offset, VkDeviceSize size) const { - if (IsEnabled()) - { - uint32_t start = GetStartPage(offset); - ++ctx.pageAllocs[start]; - VMA_VALIDATE(m_RegionInfo[start].allocCount > 0); + if (IsEnabled()) + { + uint32_t start = GetStartPage(offset); + ++ctx.pageAllocs[start]; + VMA_VALIDATE(m_RegionInfo[start].allocCount > 0); - uint32_t end = GetEndPage(offset, size); - if (start != end) - { - ++ctx.pageAllocs[end]; - VMA_VALIDATE(m_RegionInfo[end].allocCount > 0); - } - } - return true; + uint32_t end = GetEndPage(offset, size); + if (start != end) + { + ++ctx.pageAllocs[end]; + VMA_VALIDATE(m_RegionInfo[end].allocCount > 0); + } + } + return true; } bool VmaBlockBufferImageGranularity::FinishValidation(ValidationContext& ctx) const { - // Check proper page structure - if (IsEnabled()) - { - VMA_ASSERT(ctx.pageAllocs != VMA_NULL && "Validation context not initialized!"); + // Check proper page structure + if (IsEnabled()) + { + VMA_ASSERT(ctx.pageAllocs != VMA_NULL && "Validation context not initialized!"); - for (uint32_t page = 0; page < m_RegionCount; ++page) - { - VMA_VALIDATE(ctx.pageAllocs[page] == m_RegionInfo[page].allocCount); - } - vma_delete_array(ctx.allocCallbacks, ctx.pageAllocs, m_RegionCount); - ctx.pageAllocs = VMA_NULL; - } - return true; + for (uint32_t page = 0; page < m_RegionCount; ++page) + { + VMA_VALIDATE(ctx.pageAllocs[page] == m_RegionInfo[page].allocCount); + } + vma_delete_array(ctx.allocCallbacks, ctx.pageAllocs, m_RegionCount); + ctx.pageAllocs = VMA_NULL; + } + return true; } uint32_t VmaBlockBufferImageGranularity::OffsetToPageIndex(VkDeviceSize offset) const { - return static_cast(offset >> VMA_BITSCAN_MSB(m_BufferImageGranularity)); + return static_cast(offset >> VMA_BITSCAN_MSB(m_BufferImageGranularity)); } void VmaBlockBufferImageGranularity::AllocPage(RegionInfo& page, uint8_t allocType) { - // When current alloc type is free then it can be overridden by new type - if (page.allocCount == 0 || (page.allocCount > 0 && page.allocType == VMA_SUBALLOCATION_TYPE_FREE)) - page.allocType = allocType; + // When current alloc type is free then it can be overridden by new type + if (page.allocCount == 0 || (page.allocCount > 0 && page.allocType == VMA_SUBALLOCATION_TYPE_FREE)) + page.allocType = allocType; - ++page.allocCount; + ++page.allocCount; } #endif // _VMA_BLOCK_BUFFER_IMAGE_GRANULARITY_FUNCTIONS #endif // _VMA_BLOCK_BUFFER_IMAGE_GRANULARITY -#if 0 -#ifndef _VMA_BLOCK_METADATA_GENERIC -class VmaBlockMetadata_Generic : public VmaBlockMetadata -{ - friend class VmaDefragmentationAlgorithm_Generic; - friend class VmaDefragmentationAlgorithm_Fast; - VMA_CLASS_NO_COPY(VmaBlockMetadata_Generic) -public: - VmaBlockMetadata_Generic(const VkAllocationCallbacks* pAllocationCallbacks, - VkDeviceSize bufferImageGranularity, bool isVirtual); - virtual ~VmaBlockMetadata_Generic() = default; - - size_t GetAllocationCount() const override { return m_Suballocations.size() - m_FreeCount; } - VkDeviceSize GetSumFreeSize() const override { return m_SumFreeSize; } - bool IsEmpty() const override { return (m_Suballocations.size() == 1) && (m_FreeCount == 1); } - void Free(VmaAllocHandle allocHandle) override { FreeSuballocation(FindAtOffset((VkDeviceSize)allocHandle - 1)); } - VkDeviceSize GetAllocationOffset(VmaAllocHandle allocHandle) const override { return (VkDeviceSize)allocHandle - 1; }; - - void Init(VkDeviceSize size) override; - bool Validate() const override; - - void AddDetailedStatistics(VmaDetailedStatistics& inoutStats) const override; - void AddStatistics(VmaStatistics& inoutStats) const override; - -#if VMA_STATS_STRING_ENABLED - void PrintDetailedMap(class VmaJsonWriter& json, uint32_t mapRefCount) const override; -#endif - - bool CreateAllocationRequest( - VkDeviceSize allocSize, - VkDeviceSize allocAlignment, - bool upperAddress, - VmaSuballocationType allocType, - uint32_t strategy, - VmaAllocationRequest* pAllocationRequest) override; - - VkResult CheckCorruption(const void* pBlockData) override; - - void Alloc( - const VmaAllocationRequest& request, - VmaSuballocationType type, - void* userData) override; - - void GetAllocationInfo(VmaAllocHandle allocHandle, VmaVirtualAllocationInfo& outInfo) override; - void* GetAllocationUserData(VmaAllocHandle allocHandle) const override; - VmaAllocHandle GetAllocationListBegin() const override; - VmaAllocHandle GetNextAllocation(VmaAllocHandle prevAlloc) const override; - void Clear() override; - void SetAllocationUserData(VmaAllocHandle allocHandle, void* userData) override; - void DebugLogAllAllocations() const override; - -private: - uint32_t m_FreeCount; - VkDeviceSize m_SumFreeSize; - VmaSuballocationList m_Suballocations; - // Suballocations that are free. Sorted by size, ascending. - VmaVector> m_FreeSuballocationsBySize; - - VkDeviceSize AlignAllocationSize(VkDeviceSize size) const { return IsVirtual() ? size : VmaAlignUp(size, (VkDeviceSize)16); } - - VmaSuballocationList::iterator FindAtOffset(VkDeviceSize offset) const; - bool ValidateFreeSuballocationList() const; - - // Checks if requested suballocation with given parameters can be placed in given pFreeSuballocItem. - // If yes, fills pOffset and returns true. If no, returns false. - bool CheckAllocation( - VkDeviceSize allocSize, - VkDeviceSize allocAlignment, - VmaSuballocationType allocType, - VmaSuballocationList::const_iterator suballocItem, - VmaAllocHandle* pAllocHandle) const; - - // Given free suballocation, it merges it with following one, which must also be free. - void MergeFreeWithNext(VmaSuballocationList::iterator item); - // Releases given suballocation, making it free. - // Merges it with adjacent free suballocations if applicable. - // Returns iterator to new free suballocation at this place. - VmaSuballocationList::iterator FreeSuballocation(VmaSuballocationList::iterator suballocItem); - // Given free suballocation, it inserts it into sorted list of - // m_FreeSuballocationsBySize if it is suitable. - void RegisterFreeSuballocation(VmaSuballocationList::iterator item); - // Given free suballocation, it removes it from sorted list of - // m_FreeSuballocationsBySize if it is suitable. - void UnregisterFreeSuballocation(VmaSuballocationList::iterator item); -}; - -#ifndef _VMA_BLOCK_METADATA_GENERIC_FUNCTIONS -VmaBlockMetadata_Generic::VmaBlockMetadata_Generic(const VkAllocationCallbacks* pAllocationCallbacks, - VkDeviceSize bufferImageGranularity, bool isVirtual) - : VmaBlockMetadata(pAllocationCallbacks, bufferImageGranularity, isVirtual), - m_FreeCount(0), - m_SumFreeSize(0), - m_Suballocations(VmaStlAllocator(pAllocationCallbacks)), - m_FreeSuballocationsBySize(VmaStlAllocator(pAllocationCallbacks)) {} - -void VmaBlockMetadata_Generic::Init(VkDeviceSize size) -{ - VmaBlockMetadata::Init(size); - - m_FreeCount = 1; - m_SumFreeSize = size; - - VmaSuballocation suballoc = {}; - suballoc.offset = 0; - suballoc.size = size; - suballoc.type = VMA_SUBALLOCATION_TYPE_FREE; - - m_Suballocations.push_back(suballoc); - m_FreeSuballocationsBySize.push_back(m_Suballocations.begin()); -} - -bool VmaBlockMetadata_Generic::Validate() const -{ - VMA_VALIDATE(!m_Suballocations.empty()); - - // Expected offset of new suballocation as calculated from previous ones. - VkDeviceSize calculatedOffset = 0; - // Expected number of free suballocations as calculated from traversing their list. - uint32_t calculatedFreeCount = 0; - // Expected sum size of free suballocations as calculated from traversing their list. - VkDeviceSize calculatedSumFreeSize = 0; - // Expected number of free suballocations that should be registered in - // m_FreeSuballocationsBySize calculated from traversing their list. - size_t freeSuballocationsToRegister = 0; - // True if previous visited suballocation was free. - bool prevFree = false; - - const VkDeviceSize debugMargin = GetDebugMargin(); - - for (const auto& subAlloc : m_Suballocations) - { - // Actual offset of this suballocation doesn't match expected one. - VMA_VALIDATE(subAlloc.offset == calculatedOffset); - - const bool currFree = (subAlloc.type == VMA_SUBALLOCATION_TYPE_FREE); - // Two adjacent free suballocations are invalid. They should be merged. - VMA_VALIDATE(!prevFree || !currFree); - - VmaAllocation alloc = (VmaAllocation)subAlloc.userData; - if (!IsVirtual()) - { - VMA_VALIDATE(currFree == (alloc == VK_NULL_HANDLE)); - } - - if (currFree) - { - calculatedSumFreeSize += subAlloc.size; - ++calculatedFreeCount; - ++freeSuballocationsToRegister; - - // Margin required between allocations - every free space must be at least that large. - VMA_VALIDATE(subAlloc.size >= debugMargin); - } - else - { - if (!IsVirtual()) - { - VMA_VALIDATE((VkDeviceSize)alloc->GetAllocHandle() == subAlloc.offset + 1); - VMA_VALIDATE(alloc->GetSize() == subAlloc.size); - } - - // Margin required between allocations - previous allocation must be free. - VMA_VALIDATE(debugMargin == 0 || prevFree); - } - - calculatedOffset += subAlloc.size; - prevFree = currFree; - } - - // Number of free suballocations registered in m_FreeSuballocationsBySize doesn't - // match expected one. - VMA_VALIDATE(m_FreeSuballocationsBySize.size() == freeSuballocationsToRegister); - - VkDeviceSize lastSize = 0; - for (size_t i = 0; i < m_FreeSuballocationsBySize.size(); ++i) - { - VmaSuballocationList::iterator suballocItem = m_FreeSuballocationsBySize[i]; - - // Only free suballocations can be registered in m_FreeSuballocationsBySize. - VMA_VALIDATE(suballocItem->type == VMA_SUBALLOCATION_TYPE_FREE); - // They must be sorted by size ascending. - VMA_VALIDATE(suballocItem->size >= lastSize); - - lastSize = suballocItem->size; - } - - // Check if totals match calculated values. - VMA_VALIDATE(ValidateFreeSuballocationList()); - VMA_VALIDATE(calculatedOffset == GetSize()); - VMA_VALIDATE(calculatedSumFreeSize == m_SumFreeSize); - VMA_VALIDATE(calculatedFreeCount == m_FreeCount); - - return true; -} - -void VmaBlockMetadata_Generic::AddDetailedStatistics(VmaDetailedStatistics& inoutStats) const -{ - const uint32_t rangeCount = (uint32_t)m_Suballocations.size(); - inoutStats.statistics.blockCount++; - inoutStats.statistics.blockBytes += GetSize(); - - for (const auto& suballoc : m_Suballocations) - { - if (suballoc.type != VMA_SUBALLOCATION_TYPE_FREE) - VmaAddDetailedStatisticsAllocation(inoutStats, suballoc.size); - else - VmaAddDetailedStatisticsUnusedRange(inoutStats, suballoc.size); - } -} - -void VmaBlockMetadata_Generic::AddStatistics(VmaStatistics& inoutStats) const -{ - inoutStats.blockCount++; - inoutStats.allocationCount += (uint32_t)m_Suballocations.size() - m_FreeCount; - inoutStats.blockBytes += GetSize(); - inoutStats.allocationBytes += GetSize() - m_SumFreeSize; -} - -#if VMA_STATS_STRING_ENABLED -void VmaBlockMetadata_Generic::PrintDetailedMap(class VmaJsonWriter& json, uint32_t mapRefCount) const -{ - PrintDetailedMap_Begin(json, - m_SumFreeSize, // unusedBytes - m_Suballocations.size() - (size_t)m_FreeCount, // allocationCount - m_FreeCount, // unusedRangeCount - mapRefCount); - - for (const auto& suballoc : m_Suballocations) - { - if (suballoc.type == VMA_SUBALLOCATION_TYPE_FREE) - { - PrintDetailedMap_UnusedRange(json, suballoc.offset, suballoc.size); - } - else - { - PrintDetailedMap_Allocation(json, suballoc.offset, suballoc.size, suballoc.userData); - } - } - - PrintDetailedMap_End(json); -} -#endif // VMA_STATS_STRING_ENABLED - -bool VmaBlockMetadata_Generic::CreateAllocationRequest( - VkDeviceSize allocSize, - VkDeviceSize allocAlignment, - bool upperAddress, - VmaSuballocationType allocType, - uint32_t strategy, - VmaAllocationRequest* pAllocationRequest) -{ - VMA_ASSERT(allocSize > 0); - VMA_ASSERT(!upperAddress); - VMA_ASSERT(allocType != VMA_SUBALLOCATION_TYPE_FREE); - VMA_ASSERT(pAllocationRequest != VMA_NULL); - VMA_HEAVY_ASSERT(Validate()); - - allocSize = AlignAllocationSize(allocSize); - - pAllocationRequest->type = VmaAllocationRequestType::Normal; - pAllocationRequest->size = allocSize; - - const VkDeviceSize debugMargin = GetDebugMargin(); - - // There is not enough total free space in this block to fulfill the request: Early return. - if (m_SumFreeSize < allocSize + debugMargin) - { - return false; - } - - // New algorithm, efficiently searching freeSuballocationsBySize. - const size_t freeSuballocCount = m_FreeSuballocationsBySize.size(); - if (freeSuballocCount > 0) - { - if (strategy == 0 || - strategy == VMA_ALLOCATION_CREATE_STRATEGY_MIN_MEMORY_BIT) - { - // Find first free suballocation with size not less than allocSize + debugMargin. - VmaSuballocationList::iterator* const it = VmaBinaryFindFirstNotLess( - m_FreeSuballocationsBySize.data(), - m_FreeSuballocationsBySize.data() + freeSuballocCount, - allocSize + debugMargin, - VmaSuballocationItemSizeLess()); - size_t index = it - m_FreeSuballocationsBySize.data(); - for (; index < freeSuballocCount; ++index) - { - if (CheckAllocation( - allocSize, - allocAlignment, - allocType, - m_FreeSuballocationsBySize[index], - &pAllocationRequest->allocHandle)) - { - pAllocationRequest->item = m_FreeSuballocationsBySize[index]; - return true; - } - } - } - else if (strategy == VMA_ALLOCATION_INTERNAL_STRATEGY_MIN_OFFSET) - { - for (VmaSuballocationList::iterator it = m_Suballocations.begin(); - it != m_Suballocations.end(); - ++it) - { - if (it->type == VMA_SUBALLOCATION_TYPE_FREE && CheckAllocation( - allocSize, - allocAlignment, - allocType, - it, - &pAllocationRequest->allocHandle)) - { - pAllocationRequest->item = it; - return true; - } - } - } - else - { - VMA_ASSERT(strategy & (VMA_ALLOCATION_CREATE_STRATEGY_MIN_TIME_BIT | VMA_ALLOCATION_CREATE_STRATEGY_MIN_OFFSET_BIT )); - // Search staring from biggest suballocations. - for (size_t index = freeSuballocCount; index--; ) - { - if (CheckAllocation( - allocSize, - allocAlignment, - allocType, - m_FreeSuballocationsBySize[index], - &pAllocationRequest->allocHandle)) - { - pAllocationRequest->item = m_FreeSuballocationsBySize[index]; - return true; - } - } - } - } - - return false; -} - -VkResult VmaBlockMetadata_Generic::CheckCorruption(const void* pBlockData) -{ - for (auto& suballoc : m_Suballocations) - { - if (suballoc.type != VMA_SUBALLOCATION_TYPE_FREE) - { - if (!VmaValidateMagicValue(pBlockData, suballoc.offset + suballoc.size)) - { - VMA_ASSERT(0 && "MEMORY CORRUPTION DETECTED AFTER VALIDATED ALLOCATION!"); - return VK_ERROR_UNKNOWN_COPY; - } - } - } - - return VK_SUCCESS; -} - -void VmaBlockMetadata_Generic::Alloc( - const VmaAllocationRequest& request, - VmaSuballocationType type, - void* userData) -{ - VMA_ASSERT(request.type == VmaAllocationRequestType::Normal); - VMA_ASSERT(request.item != m_Suballocations.end()); - VmaSuballocation& suballoc = *request.item; - // Given suballocation is a free block. - VMA_ASSERT(suballoc.type == VMA_SUBALLOCATION_TYPE_FREE); - - // Given offset is inside this suballocation. - VMA_ASSERT((VkDeviceSize)request.allocHandle - 1 >= suballoc.offset); - const VkDeviceSize paddingBegin = (VkDeviceSize)request.allocHandle - suballoc.offset - 1; - VMA_ASSERT(suballoc.size >= paddingBegin + request.size); - const VkDeviceSize paddingEnd = suballoc.size - paddingBegin - request.size; - - // Unregister this free suballocation from m_FreeSuballocationsBySize and update - // it to become used. - UnregisterFreeSuballocation(request.item); - - suballoc.offset = (VkDeviceSize)request.allocHandle - 1; - suballoc.size = request.size; - suballoc.type = type; - suballoc.userData = userData; - - // If there are any free bytes remaining at the end, insert new free suballocation after current one. - if (paddingEnd) - { - VmaSuballocation paddingSuballoc = {}; - paddingSuballoc.offset = suballoc.offset + suballoc.size; - paddingSuballoc.size = paddingEnd; - paddingSuballoc.type = VMA_SUBALLOCATION_TYPE_FREE; - VmaSuballocationList::iterator next = request.item; - ++next; - const VmaSuballocationList::iterator paddingEndItem = - m_Suballocations.insert(next, paddingSuballoc); - RegisterFreeSuballocation(paddingEndItem); - } - - // If there are any free bytes remaining at the beginning, insert new free suballocation before current one. - if (paddingBegin) - { - VmaSuballocation paddingSuballoc = {}; - paddingSuballoc.offset = suballoc.offset - paddingBegin; - paddingSuballoc.size = paddingBegin; - paddingSuballoc.type = VMA_SUBALLOCATION_TYPE_FREE; - const VmaSuballocationList::iterator paddingBeginItem = - m_Suballocations.insert(request.item, paddingSuballoc); - RegisterFreeSuballocation(paddingBeginItem); - } - - // Update totals. - m_FreeCount = m_FreeCount - 1; - if (paddingBegin > 0) - { - ++m_FreeCount; - } - if (paddingEnd > 0) - { - ++m_FreeCount; - } - m_SumFreeSize -= request.size; -} - -void VmaBlockMetadata_Generic::GetAllocationInfo(VmaAllocHandle allocHandle, VmaVirtualAllocationInfo& outInfo) -{ - outInfo.offset = (VkDeviceSize)allocHandle - 1; - const VmaSuballocation& suballoc = *FindAtOffset(outInfo.offset); - outInfo.size = suballoc.size; - outInfo.pUserData = suballoc.userData; -} - -void* VmaBlockMetadata_Generic::GetAllocationUserData(VmaAllocHandle allocHandle) const -{ - return FindAtOffset((VkDeviceSize)allocHandle - 1)->userData; -} - -VmaAllocHandle VmaBlockMetadata_Generic::GetAllocationListBegin() const -{ - if (IsEmpty()) - return VK_NULL_HANDLE; - - for (const auto& suballoc : m_Suballocations) - { - if (suballoc.type != VMA_SUBALLOCATION_TYPE_FREE) - return (VmaAllocHandle)(suballoc.offset + 1); - } - VMA_ASSERT(false && "Should contain at least 1 allocation!"); - return VK_NULL_HANDLE; -} - -VmaAllocHandle VmaBlockMetadata_Generic::GetNextAllocation(VmaAllocHandle prevAlloc) const -{ - VmaSuballocationList::const_iterator prev = FindAtOffset((VkDeviceSize)prevAlloc - 1); - - for (VmaSuballocationList::const_iterator it = ++prev; it != m_Suballocations.end(); ++it) - { - if (it->type != VMA_SUBALLOCATION_TYPE_FREE) - return (VmaAllocHandle)(it->offset + 1); - } - return VK_NULL_HANDLE; -} - -void VmaBlockMetadata_Generic::Clear() -{ - const VkDeviceSize size = GetSize(); - - VMA_ASSERT(IsVirtual()); - m_FreeCount = 1; - m_SumFreeSize = size; - m_Suballocations.clear(); - m_FreeSuballocationsBySize.clear(); - - VmaSuballocation suballoc = {}; - suballoc.offset = 0; - suballoc.size = size; - suballoc.type = VMA_SUBALLOCATION_TYPE_FREE; - m_Suballocations.push_back(suballoc); - - m_FreeSuballocationsBySize.push_back(m_Suballocations.begin()); -} - -void VmaBlockMetadata_Generic::SetAllocationUserData(VmaAllocHandle allocHandle, void* userData) -{ - VmaSuballocation& suballoc = *FindAtOffset((VkDeviceSize)allocHandle - 1); - suballoc.userData = userData; -} - -void VmaBlockMetadata_Generic::DebugLogAllAllocations() const -{ - for (const auto& suballoc : m_Suballocations) - { - if (suballoc.type != VMA_SUBALLOCATION_TYPE_FREE) - DebugLogAllocation(suballoc.offset, suballoc.size, suballoc.userData); - } -} - -VmaSuballocationList::iterator VmaBlockMetadata_Generic::FindAtOffset(VkDeviceSize offset) const -{ - VMA_HEAVY_ASSERT(!m_Suballocations.empty()); - const VkDeviceSize last = m_Suballocations.rbegin()->offset; - if (last == offset) - return m_Suballocations.rbegin().drop_const(); - const VkDeviceSize first = m_Suballocations.begin()->offset; - if (first == offset) - return m_Suballocations.begin().drop_const(); - - const size_t suballocCount = m_Suballocations.size(); - const VkDeviceSize step = (last - first + m_Suballocations.begin()->size) / suballocCount; - auto findSuballocation = [&](auto begin, auto end) -> VmaSuballocationList::iterator - { - for (auto suballocItem = begin; - suballocItem != end; - ++suballocItem) - { - if (suballocItem->offset == offset) - return suballocItem.drop_const(); - } - VMA_ASSERT(false && "Not found!"); - return m_Suballocations.end().drop_const(); - }; - // If requested offset is closer to the end of range, search from the end - if (offset - first > suballocCount * step / 2) - { - return findSuballocation(m_Suballocations.rbegin(), m_Suballocations.rend()); - } - return findSuballocation(m_Suballocations.begin(), m_Suballocations.end()); -} - -bool VmaBlockMetadata_Generic::ValidateFreeSuballocationList() const -{ - VkDeviceSize lastSize = 0; - for (size_t i = 0, count = m_FreeSuballocationsBySize.size(); i < count; ++i) - { - const VmaSuballocationList::iterator it = m_FreeSuballocationsBySize[i]; - - VMA_VALIDATE(it->type == VMA_SUBALLOCATION_TYPE_FREE); - VMA_VALIDATE(it->size >= lastSize); - lastSize = it->size; - } - return true; -} - -bool VmaBlockMetadata_Generic::CheckAllocation( - VkDeviceSize allocSize, - VkDeviceSize allocAlignment, - VmaSuballocationType allocType, - VmaSuballocationList::const_iterator suballocItem, - VmaAllocHandle* pAllocHandle) const -{ - VMA_ASSERT(allocSize > 0); - VMA_ASSERT(allocType != VMA_SUBALLOCATION_TYPE_FREE); - VMA_ASSERT(suballocItem != m_Suballocations.cend()); - VMA_ASSERT(pAllocHandle != VMA_NULL); - - const VkDeviceSize debugMargin = GetDebugMargin(); - const VkDeviceSize bufferImageGranularity = GetBufferImageGranularity(); - - const VmaSuballocation& suballoc = *suballocItem; - VMA_ASSERT(suballoc.type == VMA_SUBALLOCATION_TYPE_FREE); - - // Size of this suballocation is too small for this request: Early return. - if (suballoc.size < allocSize) - { - return false; - } - - // Start from offset equal to beginning of this suballocation. - VkDeviceSize offset = suballoc.offset + (suballocItem == m_Suballocations.cbegin() ? 0 : GetDebugMargin()); - - // Apply debugMargin from the end of previous alloc. - if (debugMargin > 0) - { - offset += debugMargin; - } - - // Apply alignment. - offset = VmaAlignUp(offset, allocAlignment); - - // Check previous suballocations for BufferImageGranularity conflicts. - // Make bigger alignment if necessary. - if (bufferImageGranularity > 1 && bufferImageGranularity != allocAlignment) - { - bool bufferImageGranularityConflict = false; - VmaSuballocationList::const_iterator prevSuballocItem = suballocItem; - while (prevSuballocItem != m_Suballocations.cbegin()) - { - --prevSuballocItem; - const VmaSuballocation& prevSuballoc = *prevSuballocItem; - if (VmaBlocksOnSamePage(prevSuballoc.offset, prevSuballoc.size, offset, bufferImageGranularity)) - { - if (VmaIsBufferImageGranularityConflict(prevSuballoc.type, allocType)) - { - bufferImageGranularityConflict = true; - break; - } - } - else - // Already on previous page. - break; - } - if (bufferImageGranularityConflict) - { - offset = VmaAlignUp(offset, bufferImageGranularity); - } - } - - // Calculate padding at the beginning based on current offset. - const VkDeviceSize paddingBegin = offset - suballoc.offset; - - // Fail if requested size plus margin after is bigger than size of this suballocation. - if (paddingBegin + allocSize + debugMargin > suballoc.size) - { - return false; - } - - // Check next suballocations for BufferImageGranularity conflicts. - // If conflict exists, allocation cannot be made here. - if (allocSize % bufferImageGranularity || offset % bufferImageGranularity) - { - VmaSuballocationList::const_iterator nextSuballocItem = suballocItem; - ++nextSuballocItem; - while (nextSuballocItem != m_Suballocations.cend()) - { - const VmaSuballocation& nextSuballoc = *nextSuballocItem; - if (VmaBlocksOnSamePage(offset, allocSize, nextSuballoc.offset, bufferImageGranularity)) - { - if (VmaIsBufferImageGranularityConflict(allocType, nextSuballoc.type)) - { - return false; - } - } - else - { - // Already on next page. - break; - } - ++nextSuballocItem; - } - } - - *pAllocHandle = (VmaAllocHandle)(offset + 1); - // All tests passed: Success. pAllocHandle is already filled. - return true; -} - -void VmaBlockMetadata_Generic::MergeFreeWithNext(VmaSuballocationList::iterator item) -{ - VMA_ASSERT(item != m_Suballocations.end()); - VMA_ASSERT(item->type == VMA_SUBALLOCATION_TYPE_FREE); - - VmaSuballocationList::iterator nextItem = item; - ++nextItem; - VMA_ASSERT(nextItem != m_Suballocations.end()); - VMA_ASSERT(nextItem->type == VMA_SUBALLOCATION_TYPE_FREE); - - item->size += nextItem->size; - --m_FreeCount; - m_Suballocations.erase(nextItem); -} - -VmaSuballocationList::iterator VmaBlockMetadata_Generic::FreeSuballocation(VmaSuballocationList::iterator suballocItem) -{ - // Change this suballocation to be marked as free. - VmaSuballocation& suballoc = *suballocItem; - suballoc.type = VMA_SUBALLOCATION_TYPE_FREE; - suballoc.userData = VMA_NULL; - - // Update totals. - ++m_FreeCount; - m_SumFreeSize += suballoc.size; - - // Merge with previous and/or next suballocation if it's also free. - bool mergeWithNext = false; - bool mergeWithPrev = false; - - VmaSuballocationList::iterator nextItem = suballocItem; - ++nextItem; - if ((nextItem != m_Suballocations.end()) && (nextItem->type == VMA_SUBALLOCATION_TYPE_FREE)) - { - mergeWithNext = true; - } - - VmaSuballocationList::iterator prevItem = suballocItem; - if (suballocItem != m_Suballocations.begin()) - { - --prevItem; - if (prevItem->type == VMA_SUBALLOCATION_TYPE_FREE) - { - mergeWithPrev = true; - } - } - - if (mergeWithNext) - { - UnregisterFreeSuballocation(nextItem); - MergeFreeWithNext(suballocItem); - } - - if (mergeWithPrev) - { - UnregisterFreeSuballocation(prevItem); - MergeFreeWithNext(prevItem); - RegisterFreeSuballocation(prevItem); - return prevItem; - } - else - { - RegisterFreeSuballocation(suballocItem); - return suballocItem; - } -} - -void VmaBlockMetadata_Generic::RegisterFreeSuballocation(VmaSuballocationList::iterator item) -{ - VMA_ASSERT(item->type == VMA_SUBALLOCATION_TYPE_FREE); - VMA_ASSERT(item->size > 0); - - // You may want to enable this validation at the beginning or at the end of - // this function, depending on what do you want to check. - VMA_HEAVY_ASSERT(ValidateFreeSuballocationList()); - - if (m_FreeSuballocationsBySize.empty()) - { - m_FreeSuballocationsBySize.push_back(item); - } - else - { - VmaVectorInsertSorted(m_FreeSuballocationsBySize, item); - } - - //VMA_HEAVY_ASSERT(ValidateFreeSuballocationList()); -} - -void VmaBlockMetadata_Generic::UnregisterFreeSuballocation(VmaSuballocationList::iterator item) -{ - VMA_ASSERT(item->type == VMA_SUBALLOCATION_TYPE_FREE); - VMA_ASSERT(item->size > 0); - - // You may want to enable this validation at the beginning or at the end of - // this function, depending on what do you want to check. - VMA_HEAVY_ASSERT(ValidateFreeSuballocationList()); - - VmaSuballocationList::iterator* const it = VmaBinaryFindFirstNotLess( - m_FreeSuballocationsBySize.data(), - m_FreeSuballocationsBySize.data() + m_FreeSuballocationsBySize.size(), - item, - VmaSuballocationItemSizeLess()); - for (size_t index = it - m_FreeSuballocationsBySize.data(); - index < m_FreeSuballocationsBySize.size(); - ++index) - { - if (m_FreeSuballocationsBySize[index] == item) - { - VmaVectorRemove(m_FreeSuballocationsBySize, index); - return; - } - VMA_ASSERT((m_FreeSuballocationsBySize[index]->size == item->size) && "Not found."); - } - VMA_ASSERT(0 && "Not found."); - - //VMA_HEAVY_ASSERT(ValidateFreeSuballocationList()); -} -#endif // _VMA_BLOCK_METADATA_GENERIC_FUNCTIONS -#endif // _VMA_BLOCK_METADATA_GENERIC -#endif // #if 0 - #ifndef _VMA_BLOCK_METADATA_LINEAR /* Allocations and their references in internal data structure look like this: if(m_2ndVectorMode == SECOND_VECTOR_EMPTY): - 0 +-------+ - | | - | | - | | - +-------+ - | Alloc | 1st[m_1stNullItemsBeginCount] - +-------+ - | Alloc | 1st[m_1stNullItemsBeginCount + 1] - +-------+ - | ... | - +-------+ - | Alloc | 1st[1st.size() - 1] - +-------+ - | | - | | - | | + 0 +-------+ + | | + | | + | | + +-------+ + | Alloc | 1st[m_1stNullItemsBeginCount] + +-------+ + | Alloc | 1st[m_1stNullItemsBeginCount + 1] + +-------+ + | ... | + +-------+ + | Alloc | 1st[1st.size() - 1] + +-------+ + | | + | | + | | GetSize() +-------+ if(m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER): - 0 +-------+ - | Alloc | 2nd[0] - +-------+ - | Alloc | 2nd[1] - +-------+ - | ... | - +-------+ - | Alloc | 2nd[2nd.size() - 1] - +-------+ - | | - | | - | | - +-------+ - | Alloc | 1st[m_1stNullItemsBeginCount] - +-------+ - | Alloc | 1st[m_1stNullItemsBeginCount + 1] - +-------+ - | ... | - +-------+ - | Alloc | 1st[1st.size() - 1] - +-------+ - | | + 0 +-------+ + | Alloc | 2nd[0] + +-------+ + | Alloc | 2nd[1] + +-------+ + | ... | + +-------+ + | Alloc | 2nd[2nd.size() - 1] + +-------+ + | | + | | + | | + +-------+ + | Alloc | 1st[m_1stNullItemsBeginCount] + +-------+ + | Alloc | 1st[m_1stNullItemsBeginCount + 1] + +-------+ + | ... | + +-------+ + | Alloc | 1st[1st.size() - 1] + +-------+ + | | GetSize() +-------+ if(m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK): - 0 +-------+ - | | - | | - | | - +-------+ - | Alloc | 1st[m_1stNullItemsBeginCount] - +-------+ - | Alloc | 1st[m_1stNullItemsBeginCount + 1] - +-------+ - | ... | - +-------+ - | Alloc | 1st[1st.size() - 1] - +-------+ - | | - | | - | | - +-------+ - | Alloc | 2nd[2nd.size() - 1] - +-------+ - | ... | - +-------+ - | Alloc | 2nd[1] - +-------+ - | Alloc | 2nd[0] + 0 +-------+ + | | + | | + | | + +-------+ + | Alloc | 1st[m_1stNullItemsBeginCount] + +-------+ + | Alloc | 1st[m_1stNullItemsBeginCount + 1] + +-------+ + | ... | + +-------+ + | Alloc | 1st[1st.size() - 1] + +-------+ + | | + | | + | | + +-------+ + | Alloc | 2nd[2nd.size() - 1] + +-------+ + | ... | + +-------+ + | Alloc | 2nd[1] + +-------+ + | Alloc | 2nd[0] GetSize() +-------+ */ class VmaBlockMetadata_Linear : public VmaBlockMetadata { - VMA_CLASS_NO_COPY(VmaBlockMetadata_Linear) + VMA_CLASS_NO_COPY_NO_MOVE(VmaBlockMetadata_Linear) public: - VmaBlockMetadata_Linear(const VkAllocationCallbacks* pAllocationCallbacks, - VkDeviceSize bufferImageGranularity, bool isVirtual); - virtual ~VmaBlockMetadata_Linear() = default; + VmaBlockMetadata_Linear(const VkAllocationCallbacks* pAllocationCallbacks, + VkDeviceSize bufferImageGranularity, bool isVirtual); + virtual ~VmaBlockMetadata_Linear() = default; - VkDeviceSize GetSumFreeSize() const override { return m_SumFreeSize; } - bool IsEmpty() const override { return GetAllocationCount() == 0; } - VkDeviceSize GetAllocationOffset(VmaAllocHandle allocHandle) const override { return (VkDeviceSize)allocHandle - 1; }; + VkDeviceSize GetSumFreeSize() const override { return m_SumFreeSize; } + bool IsEmpty() const override { return GetAllocationCount() == 0; } + VkDeviceSize GetAllocationOffset(VmaAllocHandle allocHandle) const override { return (VkDeviceSize)allocHandle - 1; } - void Init(VkDeviceSize size) override; - bool Validate() const override; - size_t GetAllocationCount() const override; - size_t GetFreeRegionsCount() const override; + void Init(VkDeviceSize size) override; + bool Validate() const override; + size_t GetAllocationCount() const override; + size_t GetFreeRegionsCount() const override; - void AddDetailedStatistics(VmaDetailedStatistics& inoutStats) const override; - void AddStatistics(VmaStatistics& inoutStats) const override; + void AddDetailedStatistics(VmaDetailedStatistics& inoutStats) const override; + void AddStatistics(VmaStatistics& inoutStats) const override; #if VMA_STATS_STRING_ENABLED - void PrintDetailedMap(class VmaJsonWriter& json) const override; + void PrintDetailedMap(class VmaJsonWriter& json) const override; #endif - bool CreateAllocationRequest( - VkDeviceSize allocSize, - VkDeviceSize allocAlignment, - bool upperAddress, - VmaSuballocationType allocType, - uint32_t strategy, - VmaAllocationRequest* pAllocationRequest) override; + bool CreateAllocationRequest( + VkDeviceSize allocSize, + VkDeviceSize allocAlignment, + bool upperAddress, + VmaSuballocationType allocType, + uint32_t strategy, + VmaAllocationRequest* pAllocationRequest) override; - VkResult CheckCorruption(const void* pBlockData) override; + VkResult CheckCorruption(const void* pBlockData) override; - void Alloc( - const VmaAllocationRequest& request, - VmaSuballocationType type, - void* userData) override; + void Alloc( + const VmaAllocationRequest& request, + VmaSuballocationType type, + void* userData) override; - void Free(VmaAllocHandle allocHandle) override; - void GetAllocationInfo(VmaAllocHandle allocHandle, VmaVirtualAllocationInfo& outInfo) override; - void* GetAllocationUserData(VmaAllocHandle allocHandle) const override; - VmaAllocHandle GetAllocationListBegin() const override; - VmaAllocHandle GetNextAllocation(VmaAllocHandle prevAlloc) const override; - VkDeviceSize GetNextFreeRegionSize(VmaAllocHandle alloc) const override; - void Clear() override; - void SetAllocationUserData(VmaAllocHandle allocHandle, void* userData) override; - void DebugLogAllAllocations() const override; + void Free(VmaAllocHandle allocHandle) override; + void GetAllocationInfo(VmaAllocHandle allocHandle, VmaVirtualAllocationInfo& outInfo) override; + void* GetAllocationUserData(VmaAllocHandle allocHandle) const override; + VmaAllocHandle GetAllocationListBegin() const override; + VmaAllocHandle GetNextAllocation(VmaAllocHandle prevAlloc) const override; + VkDeviceSize GetNextFreeRegionSize(VmaAllocHandle alloc) const override; + void Clear() override; + void SetAllocationUserData(VmaAllocHandle allocHandle, void* userData) override; + void DebugLogAllAllocations() const override; private: - /* - There are two suballocation vectors, used in ping-pong way. - The one with index m_1stVectorIndex is called 1st. - The one with index (m_1stVectorIndex ^ 1) is called 2nd. - 2nd can be non-empty only when 1st is not empty. - When 2nd is not empty, m_2ndVectorMode indicates its mode of operation. - */ - typedef VmaVector> SuballocationVectorType; + /* + There are two suballocation vectors, used in ping-pong way. + The one with index m_1stVectorIndex is called 1st. + The one with index (m_1stVectorIndex ^ 1) is called 2nd. + 2nd can be non-empty only when 1st is not empty. + When 2nd is not empty, m_2ndVectorMode indicates its mode of operation. + */ + typedef VmaVector> SuballocationVectorType; - enum SECOND_VECTOR_MODE - { - SECOND_VECTOR_EMPTY, - /* - Suballocations in 2nd vector are created later than the ones in 1st, but they - all have smaller offset. - */ - SECOND_VECTOR_RING_BUFFER, - /* - Suballocations in 2nd vector are upper side of double stack. - They all have offsets higher than those in 1st vector. - Top of this stack means smaller offsets, but higher indices in this vector. - */ - SECOND_VECTOR_DOUBLE_STACK, - }; + enum SECOND_VECTOR_MODE + { + SECOND_VECTOR_EMPTY, + /* + Suballocations in 2nd vector are created later than the ones in 1st, but they + all have smaller offset. + */ + SECOND_VECTOR_RING_BUFFER, + /* + Suballocations in 2nd vector are upper side of double stack. + They all have offsets higher than those in 1st vector. + Top of this stack means smaller offsets, but higher indices in this vector. + */ + SECOND_VECTOR_DOUBLE_STACK, + }; - VkDeviceSize m_SumFreeSize; - SuballocationVectorType m_Suballocations0, m_Suballocations1; - uint32_t m_1stVectorIndex; - SECOND_VECTOR_MODE m_2ndVectorMode; - // Number of items in 1st vector with hAllocation = null at the beginning. - size_t m_1stNullItemsBeginCount; - // Number of other items in 1st vector with hAllocation = null somewhere in the middle. - size_t m_1stNullItemsMiddleCount; - // Number of items in 2nd vector with hAllocation = null. - size_t m_2ndNullItemsCount; + VkDeviceSize m_SumFreeSize; + SuballocationVectorType m_Suballocations0, m_Suballocations1; + uint32_t m_1stVectorIndex; + SECOND_VECTOR_MODE m_2ndVectorMode; + // Number of items in 1st vector with hAllocation = null at the beginning. + size_t m_1stNullItemsBeginCount; + // Number of other items in 1st vector with hAllocation = null somewhere in the middle. + size_t m_1stNullItemsMiddleCount; + // Number of items in 2nd vector with hAllocation = null. + size_t m_2ndNullItemsCount; - SuballocationVectorType& AccessSuballocations1st() { return m_1stVectorIndex ? m_Suballocations1 : m_Suballocations0; } - SuballocationVectorType& AccessSuballocations2nd() { return m_1stVectorIndex ? m_Suballocations0 : m_Suballocations1; } - const SuballocationVectorType& AccessSuballocations1st() const { return m_1stVectorIndex ? m_Suballocations1 : m_Suballocations0; } - const SuballocationVectorType& AccessSuballocations2nd() const { return m_1stVectorIndex ? m_Suballocations0 : m_Suballocations1; } + SuballocationVectorType& AccessSuballocations1st() { return m_1stVectorIndex ? m_Suballocations1 : m_Suballocations0; } + SuballocationVectorType& AccessSuballocations2nd() { return m_1stVectorIndex ? m_Suballocations0 : m_Suballocations1; } + const SuballocationVectorType& AccessSuballocations1st() const { return m_1stVectorIndex ? m_Suballocations1 : m_Suballocations0; } + const SuballocationVectorType& AccessSuballocations2nd() const { return m_1stVectorIndex ? m_Suballocations0 : m_Suballocations1; } - VmaSuballocation& FindSuballocation(VkDeviceSize offset) const; - bool ShouldCompact1st() const; - void CleanupAfterFree(); + VmaSuballocation& FindSuballocation(VkDeviceSize offset) const; + bool ShouldCompact1st() const; + void CleanupAfterFree(); - bool CreateAllocationRequest_LowerAddress( - VkDeviceSize allocSize, - VkDeviceSize allocAlignment, - VmaSuballocationType allocType, - uint32_t strategy, - VmaAllocationRequest* pAllocationRequest); - bool CreateAllocationRequest_UpperAddress( - VkDeviceSize allocSize, - VkDeviceSize allocAlignment, - VmaSuballocationType allocType, - uint32_t strategy, - VmaAllocationRequest* pAllocationRequest); + bool CreateAllocationRequest_LowerAddress( + VkDeviceSize allocSize, + VkDeviceSize allocAlignment, + VmaSuballocationType allocType, + uint32_t strategy, + VmaAllocationRequest* pAllocationRequest); + bool CreateAllocationRequest_UpperAddress( + VkDeviceSize allocSize, + VkDeviceSize allocAlignment, + VmaSuballocationType allocType, + uint32_t strategy, + VmaAllocationRequest* pAllocationRequest); }; #ifndef _VMA_BLOCK_METADATA_LINEAR_FUNCTIONS VmaBlockMetadata_Linear::VmaBlockMetadata_Linear(const VkAllocationCallbacks* pAllocationCallbacks, - VkDeviceSize bufferImageGranularity, bool isVirtual) - : VmaBlockMetadata(pAllocationCallbacks, bufferImageGranularity, isVirtual), - m_SumFreeSize(0), - m_Suballocations0(VmaStlAllocator(pAllocationCallbacks)), - m_Suballocations1(VmaStlAllocator(pAllocationCallbacks)), - m_1stVectorIndex(0), - m_2ndVectorMode(SECOND_VECTOR_EMPTY), - m_1stNullItemsBeginCount(0), - m_1stNullItemsMiddleCount(0), - m_2ndNullItemsCount(0) {} + VkDeviceSize bufferImageGranularity, bool isVirtual) + : VmaBlockMetadata(pAllocationCallbacks, bufferImageGranularity, isVirtual), + m_SumFreeSize(0), + m_Suballocations0(VmaStlAllocator(pAllocationCallbacks)), + m_Suballocations1(VmaStlAllocator(pAllocationCallbacks)), + m_1stVectorIndex(0), + m_2ndVectorMode(SECOND_VECTOR_EMPTY), + m_1stNullItemsBeginCount(0), + m_1stNullItemsMiddleCount(0), + m_2ndNullItemsCount(0) {} void VmaBlockMetadata_Linear::Init(VkDeviceSize size) { - VmaBlockMetadata::Init(size); - m_SumFreeSize = size; + VmaBlockMetadata::Init(size); + m_SumFreeSize = size; } bool VmaBlockMetadata_Linear::Validate() const { - const SuballocationVectorType& suballocations1st = AccessSuballocations1st(); - const SuballocationVectorType& suballocations2nd = AccessSuballocations2nd(); + const SuballocationVectorType& suballocations1st = AccessSuballocations1st(); + const SuballocationVectorType& suballocations2nd = AccessSuballocations2nd(); - VMA_VALIDATE(suballocations2nd.empty() == (m_2ndVectorMode == SECOND_VECTOR_EMPTY)); - VMA_VALIDATE(!suballocations1st.empty() || - suballocations2nd.empty() || - m_2ndVectorMode != SECOND_VECTOR_RING_BUFFER); + VMA_VALIDATE(suballocations2nd.empty() == (m_2ndVectorMode == SECOND_VECTOR_EMPTY)); + VMA_VALIDATE(!suballocations1st.empty() || + suballocations2nd.empty() || + m_2ndVectorMode != SECOND_VECTOR_RING_BUFFER); - if (!suballocations1st.empty()) - { - // Null item at the beginning should be accounted into m_1stNullItemsBeginCount. - VMA_VALIDATE(suballocations1st[m_1stNullItemsBeginCount].type != VMA_SUBALLOCATION_TYPE_FREE); - // Null item at the end should be just pop_back(). - VMA_VALIDATE(suballocations1st.back().type != VMA_SUBALLOCATION_TYPE_FREE); - } - if (!suballocations2nd.empty()) - { - // Null item at the end should be just pop_back(). - VMA_VALIDATE(suballocations2nd.back().type != VMA_SUBALLOCATION_TYPE_FREE); - } + if (!suballocations1st.empty()) + { + // Null item at the beginning should be accounted into m_1stNullItemsBeginCount. + VMA_VALIDATE(suballocations1st[m_1stNullItemsBeginCount].type != VMA_SUBALLOCATION_TYPE_FREE); + // Null item at the end should be just pop_back(). + VMA_VALIDATE(suballocations1st.back().type != VMA_SUBALLOCATION_TYPE_FREE); + } + if (!suballocations2nd.empty()) + { + // Null item at the end should be just pop_back(). + VMA_VALIDATE(suballocations2nd.back().type != VMA_SUBALLOCATION_TYPE_FREE); + } - VMA_VALIDATE(m_1stNullItemsBeginCount + m_1stNullItemsMiddleCount <= suballocations1st.size()); - VMA_VALIDATE(m_2ndNullItemsCount <= suballocations2nd.size()); + VMA_VALIDATE(m_1stNullItemsBeginCount + m_1stNullItemsMiddleCount <= suballocations1st.size()); + VMA_VALIDATE(m_2ndNullItemsCount <= suballocations2nd.size()); - VkDeviceSize sumUsedSize = 0; - const size_t suballoc1stCount = suballocations1st.size(); - const VkDeviceSize debugMargin = GetDebugMargin(); - VkDeviceSize offset = 0; + VkDeviceSize sumUsedSize = 0; + const size_t suballoc1stCount = suballocations1st.size(); + const VkDeviceSize debugMargin = GetDebugMargin(); + VkDeviceSize offset = 0; - if (m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER) - { - const size_t suballoc2ndCount = suballocations2nd.size(); - size_t nullItem2ndCount = 0; - for (size_t i = 0; i < suballoc2ndCount; ++i) - { - const VmaSuballocation& suballoc = suballocations2nd[i]; - const bool currFree = (suballoc.type == VMA_SUBALLOCATION_TYPE_FREE); + if (m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER) + { + const size_t suballoc2ndCount = suballocations2nd.size(); + size_t nullItem2ndCount = 0; + for (size_t i = 0; i < suballoc2ndCount; ++i) + { + const VmaSuballocation& suballoc = suballocations2nd[i]; + const bool currFree = (suballoc.type == VMA_SUBALLOCATION_TYPE_FREE); - VmaAllocation const alloc = (VmaAllocation)suballoc.userData; - if (!IsVirtual()) - { - VMA_VALIDATE(currFree == (alloc == VK_NULL_HANDLE)); - } - VMA_VALIDATE(suballoc.offset >= offset); + VmaAllocation const alloc = (VmaAllocation)suballoc.userData; + if (!IsVirtual()) + { + VMA_VALIDATE(currFree == (alloc == VK_NULL_HANDLE)); + } + VMA_VALIDATE(suballoc.offset >= offset); - if (!currFree) - { - if (!IsVirtual()) - { - VMA_VALIDATE((VkDeviceSize)alloc->GetAllocHandle() == suballoc.offset + 1); - VMA_VALIDATE(alloc->GetSize() == suballoc.size); - } - sumUsedSize += suballoc.size; - } - else - { - ++nullItem2ndCount; - } + if (!currFree) + { + if (!IsVirtual()) + { + VMA_VALIDATE((VkDeviceSize)alloc->GetAllocHandle() == suballoc.offset + 1); + VMA_VALIDATE(alloc->GetSize() == suballoc.size); + } + sumUsedSize += suballoc.size; + } else + { + ++nullItem2ndCount; + } - offset = suballoc.offset + suballoc.size + debugMargin; - } + offset = suballoc.offset + suballoc.size + debugMargin; + } - VMA_VALIDATE(nullItem2ndCount == m_2ndNullItemsCount); - } + VMA_VALIDATE(nullItem2ndCount == m_2ndNullItemsCount); + } - for (size_t i = 0; i < m_1stNullItemsBeginCount; ++i) - { - const VmaSuballocation& suballoc = suballocations1st[i]; - VMA_VALIDATE(suballoc.type == VMA_SUBALLOCATION_TYPE_FREE && - suballoc.userData == VMA_NULL); - } + for (size_t i = 0; i < m_1stNullItemsBeginCount; ++i) + { + const VmaSuballocation& suballoc = suballocations1st[i]; + VMA_VALIDATE(suballoc.type == VMA_SUBALLOCATION_TYPE_FREE && + suballoc.userData == VMA_NULL); + } - size_t nullItem1stCount = m_1stNullItemsBeginCount; + size_t nullItem1stCount = m_1stNullItemsBeginCount; - for (size_t i = m_1stNullItemsBeginCount; i < suballoc1stCount; ++i) - { - const VmaSuballocation& suballoc = suballocations1st[i]; - const bool currFree = (suballoc.type == VMA_SUBALLOCATION_TYPE_FREE); + for (size_t i = m_1stNullItemsBeginCount; i < suballoc1stCount; ++i) + { + const VmaSuballocation& suballoc = suballocations1st[i]; + const bool currFree = (suballoc.type == VMA_SUBALLOCATION_TYPE_FREE); - VmaAllocation const alloc = (VmaAllocation)suballoc.userData; - if (!IsVirtual()) - { - VMA_VALIDATE(currFree == (alloc == VK_NULL_HANDLE)); - } - VMA_VALIDATE(suballoc.offset >= offset); - VMA_VALIDATE(i >= m_1stNullItemsBeginCount || currFree); + VmaAllocation const alloc = (VmaAllocation)suballoc.userData; + if (!IsVirtual()) + { + VMA_VALIDATE(currFree == (alloc == VK_NULL_HANDLE)); + } + VMA_VALIDATE(suballoc.offset >= offset); + VMA_VALIDATE(i >= m_1stNullItemsBeginCount || currFree); - if (!currFree) - { - if (!IsVirtual()) - { - VMA_VALIDATE((VkDeviceSize)alloc->GetAllocHandle() == suballoc.offset + 1); - VMA_VALIDATE(alloc->GetSize() == suballoc.size); - } - sumUsedSize += suballoc.size; - } - else - { - ++nullItem1stCount; - } + if (!currFree) + { + if (!IsVirtual()) + { + VMA_VALIDATE((VkDeviceSize)alloc->GetAllocHandle() == suballoc.offset + 1); + VMA_VALIDATE(alloc->GetSize() == suballoc.size); + } + sumUsedSize += suballoc.size; + } else + { + ++nullItem1stCount; + } - offset = suballoc.offset + suballoc.size + debugMargin; - } - VMA_VALIDATE(nullItem1stCount == m_1stNullItemsBeginCount + m_1stNullItemsMiddleCount); + offset = suballoc.offset + suballoc.size + debugMargin; + } + VMA_VALIDATE(nullItem1stCount == m_1stNullItemsBeginCount + m_1stNullItemsMiddleCount); - if (m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK) - { - const size_t suballoc2ndCount = suballocations2nd.size(); - size_t nullItem2ndCount = 0; - for (size_t i = suballoc2ndCount; i--; ) - { - const VmaSuballocation& suballoc = suballocations2nd[i]; - const bool currFree = (suballoc.type == VMA_SUBALLOCATION_TYPE_FREE); + if (m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK) + { + const size_t suballoc2ndCount = suballocations2nd.size(); + size_t nullItem2ndCount = 0; + for (size_t i = suballoc2ndCount; i--; ) + { + const VmaSuballocation& suballoc = suballocations2nd[i]; + const bool currFree = (suballoc.type == VMA_SUBALLOCATION_TYPE_FREE); - VmaAllocation const alloc = (VmaAllocation)suballoc.userData; - if (!IsVirtual()) - { - VMA_VALIDATE(currFree == (alloc == VK_NULL_HANDLE)); - } - VMA_VALIDATE(suballoc.offset >= offset); + VmaAllocation const alloc = (VmaAllocation)suballoc.userData; + if (!IsVirtual()) + { + VMA_VALIDATE(currFree == (alloc == VK_NULL_HANDLE)); + } + VMA_VALIDATE(suballoc.offset >= offset); - if (!currFree) - { - if (!IsVirtual()) - { - VMA_VALIDATE((VkDeviceSize)alloc->GetAllocHandle() == suballoc.offset + 1); - VMA_VALIDATE(alloc->GetSize() == suballoc.size); - } - sumUsedSize += suballoc.size; - } - else - { - ++nullItem2ndCount; - } + if (!currFree) + { + if (!IsVirtual()) + { + VMA_VALIDATE((VkDeviceSize)alloc->GetAllocHandle() == suballoc.offset + 1); + VMA_VALIDATE(alloc->GetSize() == suballoc.size); + } + sumUsedSize += suballoc.size; + } else + { + ++nullItem2ndCount; + } - offset = suballoc.offset + suballoc.size + debugMargin; - } + offset = suballoc.offset + suballoc.size + debugMargin; + } - VMA_VALIDATE(nullItem2ndCount == m_2ndNullItemsCount); - } + VMA_VALIDATE(nullItem2ndCount == m_2ndNullItemsCount); + } - VMA_VALIDATE(offset <= GetSize()); - VMA_VALIDATE(m_SumFreeSize == GetSize() - sumUsedSize); + VMA_VALIDATE(offset <= GetSize()); + VMA_VALIDATE(m_SumFreeSize == GetSize() - sumUsedSize); - return true; + return true; } size_t VmaBlockMetadata_Linear::GetAllocationCount() const { - return AccessSuballocations1st().size() - m_1stNullItemsBeginCount - m_1stNullItemsMiddleCount + - AccessSuballocations2nd().size() - m_2ndNullItemsCount; + return AccessSuballocations1st().size() - m_1stNullItemsBeginCount - m_1stNullItemsMiddleCount + + AccessSuballocations2nd().size() - m_2ndNullItemsCount; } size_t VmaBlockMetadata_Linear::GetFreeRegionsCount() const { - // Function only used for defragmentation, which is disabled for this algorithm - VMA_ASSERT(0); - return SIZE_MAX; + // Function only used for defragmentation, which is disabled for this algorithm + VMA_ASSERT(0); + return SIZE_MAX; } void VmaBlockMetadata_Linear::AddDetailedStatistics(VmaDetailedStatistics& inoutStats) const { - const VkDeviceSize size = GetSize(); - const SuballocationVectorType& suballocations1st = AccessSuballocations1st(); - const SuballocationVectorType& suballocations2nd = AccessSuballocations2nd(); - const size_t suballoc1stCount = suballocations1st.size(); - const size_t suballoc2ndCount = suballocations2nd.size(); + const VkDeviceSize size = GetSize(); + const SuballocationVectorType& suballocations1st = AccessSuballocations1st(); + const SuballocationVectorType& suballocations2nd = AccessSuballocations2nd(); + const size_t suballoc1stCount = suballocations1st.size(); + const size_t suballoc2ndCount = suballocations2nd.size(); - inoutStats.statistics.blockCount++; - inoutStats.statistics.blockBytes += size; + inoutStats.statistics.blockCount++; + inoutStats.statistics.blockBytes += size; - VkDeviceSize lastOffset = 0; + VkDeviceSize lastOffset = 0; - if (m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER) - { - const VkDeviceSize freeSpace2ndTo1stEnd = suballocations1st[m_1stNullItemsBeginCount].offset; - size_t nextAlloc2ndIndex = 0; - while (lastOffset < freeSpace2ndTo1stEnd) - { - // Find next non-null allocation or move nextAllocIndex to the end. - while (nextAlloc2ndIndex < suballoc2ndCount && - suballocations2nd[nextAlloc2ndIndex].userData == VMA_NULL) - { - ++nextAlloc2ndIndex; - } + if (m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER) + { + const VkDeviceSize freeSpace2ndTo1stEnd = suballocations1st[m_1stNullItemsBeginCount].offset; + size_t nextAlloc2ndIndex = 0; + while (lastOffset < freeSpace2ndTo1stEnd) + { + // Find next non-null allocation or move nextAllocIndex to the end. + while (nextAlloc2ndIndex < suballoc2ndCount && + suballocations2nd[nextAlloc2ndIndex].userData == VMA_NULL) + { + ++nextAlloc2ndIndex; + } - // Found non-null allocation. - if (nextAlloc2ndIndex < suballoc2ndCount) - { - const VmaSuballocation& suballoc = suballocations2nd[nextAlloc2ndIndex]; + // Found non-null allocation. + if (nextAlloc2ndIndex < suballoc2ndCount) + { + const VmaSuballocation& suballoc = suballocations2nd[nextAlloc2ndIndex]; - // 1. Process free space before this allocation. - if (lastOffset < suballoc.offset) - { - // There is free space from lastOffset to suballoc.offset. - const VkDeviceSize unusedRangeSize = suballoc.offset - lastOffset; - VmaAddDetailedStatisticsUnusedRange(inoutStats, unusedRangeSize); - } + // 1. Process free space before this allocation. + if (lastOffset < suballoc.offset) + { + // There is free space from lastOffset to suballoc.offset. + const VkDeviceSize unusedRangeSize = suballoc.offset - lastOffset; + VmaAddDetailedStatisticsUnusedRange(inoutStats, unusedRangeSize); + } - // 2. Process this allocation. - // There is allocation with suballoc.offset, suballoc.size. - VmaAddDetailedStatisticsAllocation(inoutStats, suballoc.size); + // 2. Process this allocation. + // There is allocation with suballoc.offset, suballoc.size. + VmaAddDetailedStatisticsAllocation(inoutStats, suballoc.size); - // 3. Prepare for next iteration. - lastOffset = suballoc.offset + suballoc.size; - ++nextAlloc2ndIndex; - } - // We are at the end. - else - { - // There is free space from lastOffset to freeSpace2ndTo1stEnd. - if (lastOffset < freeSpace2ndTo1stEnd) - { - const VkDeviceSize unusedRangeSize = freeSpace2ndTo1stEnd - lastOffset; - VmaAddDetailedStatisticsUnusedRange(inoutStats, unusedRangeSize); - } + // 3. Prepare for next iteration. + lastOffset = suballoc.offset + suballoc.size; + ++nextAlloc2ndIndex; + } + // We are at the end. + else + { + // There is free space from lastOffset to freeSpace2ndTo1stEnd. + if (lastOffset < freeSpace2ndTo1stEnd) + { + const VkDeviceSize unusedRangeSize = freeSpace2ndTo1stEnd - lastOffset; + VmaAddDetailedStatisticsUnusedRange(inoutStats, unusedRangeSize); + } - // End of loop. - lastOffset = freeSpace2ndTo1stEnd; - } - } - } + // End of loop. + lastOffset = freeSpace2ndTo1stEnd; + } + } + } - size_t nextAlloc1stIndex = m_1stNullItemsBeginCount; - const VkDeviceSize freeSpace1stTo2ndEnd = - m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK ? suballocations2nd.back().offset : size; - while (lastOffset < freeSpace1stTo2ndEnd) - { - // Find next non-null allocation or move nextAllocIndex to the end. - while (nextAlloc1stIndex < suballoc1stCount && - suballocations1st[nextAlloc1stIndex].userData == VMA_NULL) - { - ++nextAlloc1stIndex; - } + size_t nextAlloc1stIndex = m_1stNullItemsBeginCount; + const VkDeviceSize freeSpace1stTo2ndEnd = + m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK ? suballocations2nd.back().offset : size; + while (lastOffset < freeSpace1stTo2ndEnd) + { + // Find next non-null allocation or move nextAllocIndex to the end. + while (nextAlloc1stIndex < suballoc1stCount && + suballocations1st[nextAlloc1stIndex].userData == VMA_NULL) + { + ++nextAlloc1stIndex; + } - // Found non-null allocation. - if (nextAlloc1stIndex < suballoc1stCount) - { - const VmaSuballocation& suballoc = suballocations1st[nextAlloc1stIndex]; + // Found non-null allocation. + if (nextAlloc1stIndex < suballoc1stCount) + { + const VmaSuballocation& suballoc = suballocations1st[nextAlloc1stIndex]; - // 1. Process free space before this allocation. - if (lastOffset < suballoc.offset) - { - // There is free space from lastOffset to suballoc.offset. - const VkDeviceSize unusedRangeSize = suballoc.offset - lastOffset; - VmaAddDetailedStatisticsUnusedRange(inoutStats, unusedRangeSize); - } + // 1. Process free space before this allocation. + if (lastOffset < suballoc.offset) + { + // There is free space from lastOffset to suballoc.offset. + const VkDeviceSize unusedRangeSize = suballoc.offset - lastOffset; + VmaAddDetailedStatisticsUnusedRange(inoutStats, unusedRangeSize); + } - // 2. Process this allocation. - // There is allocation with suballoc.offset, suballoc.size. - VmaAddDetailedStatisticsAllocation(inoutStats, suballoc.size); + // 2. Process this allocation. + // There is allocation with suballoc.offset, suballoc.size. + VmaAddDetailedStatisticsAllocation(inoutStats, suballoc.size); - // 3. Prepare for next iteration. - lastOffset = suballoc.offset + suballoc.size; - ++nextAlloc1stIndex; - } - // We are at the end. - else - { - // There is free space from lastOffset to freeSpace1stTo2ndEnd. - if (lastOffset < freeSpace1stTo2ndEnd) - { - const VkDeviceSize unusedRangeSize = freeSpace1stTo2ndEnd - lastOffset; - VmaAddDetailedStatisticsUnusedRange(inoutStats, unusedRangeSize); - } + // 3. Prepare for next iteration. + lastOffset = suballoc.offset + suballoc.size; + ++nextAlloc1stIndex; + } + // We are at the end. + else + { + // There is free space from lastOffset to freeSpace1stTo2ndEnd. + if (lastOffset < freeSpace1stTo2ndEnd) + { + const VkDeviceSize unusedRangeSize = freeSpace1stTo2ndEnd - lastOffset; + VmaAddDetailedStatisticsUnusedRange(inoutStats, unusedRangeSize); + } - // End of loop. - lastOffset = freeSpace1stTo2ndEnd; - } - } + // End of loop. + lastOffset = freeSpace1stTo2ndEnd; + } + } - if (m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK) - { - size_t nextAlloc2ndIndex = suballocations2nd.size() - 1; - while (lastOffset < size) - { - // Find next non-null allocation or move nextAllocIndex to the end. - while (nextAlloc2ndIndex != SIZE_MAX && - suballocations2nd[nextAlloc2ndIndex].userData == VMA_NULL) - { - --nextAlloc2ndIndex; - } + if (m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK) + { + size_t nextAlloc2ndIndex = suballocations2nd.size() - 1; + while (lastOffset < size) + { + // Find next non-null allocation or move nextAllocIndex to the end. + while (nextAlloc2ndIndex != SIZE_MAX && + suballocations2nd[nextAlloc2ndIndex].userData == VMA_NULL) + { + --nextAlloc2ndIndex; + } - // Found non-null allocation. - if (nextAlloc2ndIndex != SIZE_MAX) - { - const VmaSuballocation& suballoc = suballocations2nd[nextAlloc2ndIndex]; + // Found non-null allocation. + if (nextAlloc2ndIndex != SIZE_MAX) + { + const VmaSuballocation& suballoc = suballocations2nd[nextAlloc2ndIndex]; - // 1. Process free space before this allocation. - if (lastOffset < suballoc.offset) - { - // There is free space from lastOffset to suballoc.offset. - const VkDeviceSize unusedRangeSize = suballoc.offset - lastOffset; - VmaAddDetailedStatisticsUnusedRange(inoutStats, unusedRangeSize); - } + // 1. Process free space before this allocation. + if (lastOffset < suballoc.offset) + { + // There is free space from lastOffset to suballoc.offset. + const VkDeviceSize unusedRangeSize = suballoc.offset - lastOffset; + VmaAddDetailedStatisticsUnusedRange(inoutStats, unusedRangeSize); + } - // 2. Process this allocation. - // There is allocation with suballoc.offset, suballoc.size. - VmaAddDetailedStatisticsAllocation(inoutStats, suballoc.size); + // 2. Process this allocation. + // There is allocation with suballoc.offset, suballoc.size. + VmaAddDetailedStatisticsAllocation(inoutStats, suballoc.size); - // 3. Prepare for next iteration. - lastOffset = suballoc.offset + suballoc.size; - --nextAlloc2ndIndex; - } - // We are at the end. - else - { - // There is free space from lastOffset to size. - if (lastOffset < size) - { - const VkDeviceSize unusedRangeSize = size - lastOffset; - VmaAddDetailedStatisticsUnusedRange(inoutStats, unusedRangeSize); - } + // 3. Prepare for next iteration. + lastOffset = suballoc.offset + suballoc.size; + --nextAlloc2ndIndex; + } + // We are at the end. + else + { + // There is free space from lastOffset to size. + if (lastOffset < size) + { + const VkDeviceSize unusedRangeSize = size - lastOffset; + VmaAddDetailedStatisticsUnusedRange(inoutStats, unusedRangeSize); + } - // End of loop. - lastOffset = size; - } - } - } + // End of loop. + lastOffset = size; + } + } + } } void VmaBlockMetadata_Linear::AddStatistics(VmaStatistics& inoutStats) const { - const SuballocationVectorType& suballocations1st = AccessSuballocations1st(); - const SuballocationVectorType& suballocations2nd = AccessSuballocations2nd(); - const VkDeviceSize size = GetSize(); - const size_t suballoc1stCount = suballocations1st.size(); - const size_t suballoc2ndCount = suballocations2nd.size(); + const SuballocationVectorType& suballocations1st = AccessSuballocations1st(); + const SuballocationVectorType& suballocations2nd = AccessSuballocations2nd(); + const VkDeviceSize size = GetSize(); + const size_t suballoc1stCount = suballocations1st.size(); + const size_t suballoc2ndCount = suballocations2nd.size(); - inoutStats.blockCount++; - inoutStats.blockBytes += size; - inoutStats.allocationBytes += size - m_SumFreeSize; + inoutStats.blockCount++; + inoutStats.blockBytes += size; + inoutStats.allocationBytes += size - m_SumFreeSize; - VkDeviceSize lastOffset = 0; + VkDeviceSize lastOffset = 0; - if (m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER) - { - const VkDeviceSize freeSpace2ndTo1stEnd = suballocations1st[m_1stNullItemsBeginCount].offset; - size_t nextAlloc2ndIndex = m_1stNullItemsBeginCount; - while (lastOffset < freeSpace2ndTo1stEnd) - { - // Find next non-null allocation or move nextAlloc2ndIndex to the end. - while (nextAlloc2ndIndex < suballoc2ndCount && - suballocations2nd[nextAlloc2ndIndex].userData == VMA_NULL) - { - ++nextAlloc2ndIndex; - } + if (m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER) + { + const VkDeviceSize freeSpace2ndTo1stEnd = suballocations1st[m_1stNullItemsBeginCount].offset; + size_t nextAlloc2ndIndex = m_1stNullItemsBeginCount; + while (lastOffset < freeSpace2ndTo1stEnd) + { + // Find next non-null allocation or move nextAlloc2ndIndex to the end. + while (nextAlloc2ndIndex < suballoc2ndCount && + suballocations2nd[nextAlloc2ndIndex].userData == VMA_NULL) + { + ++nextAlloc2ndIndex; + } - // Found non-null allocation. - if (nextAlloc2ndIndex < suballoc2ndCount) - { - const VmaSuballocation& suballoc = suballocations2nd[nextAlloc2ndIndex]; + // Found non-null allocation. + if (nextAlloc2ndIndex < suballoc2ndCount) + { + const VmaSuballocation& suballoc = suballocations2nd[nextAlloc2ndIndex]; - // 1. Process free space before this allocation. - if (lastOffset < suballoc.offset) - { - // There is free space from lastOffset to suballoc.offset. - const VkDeviceSize unusedRangeSize = suballoc.offset - lastOffset; - } + // Process this allocation. + // There is allocation with suballoc.offset, suballoc.size. + ++inoutStats.allocationCount; - // 2. Process this allocation. - // There is allocation with suballoc.offset, suballoc.size. - ++inoutStats.allocationCount; + // Prepare for next iteration. + lastOffset = suballoc.offset + suballoc.size; + ++nextAlloc2ndIndex; + } + // We are at the end. + else + { + // End of loop. + lastOffset = freeSpace2ndTo1stEnd; + } + } + } - // 3. Prepare for next iteration. - lastOffset = suballoc.offset + suballoc.size; - ++nextAlloc2ndIndex; - } - // We are at the end. - else - { - if (lastOffset < freeSpace2ndTo1stEnd) - { - // There is free space from lastOffset to freeSpace2ndTo1stEnd. - const VkDeviceSize unusedRangeSize = freeSpace2ndTo1stEnd - lastOffset; - } + size_t nextAlloc1stIndex = m_1stNullItemsBeginCount; + const VkDeviceSize freeSpace1stTo2ndEnd = + m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK ? suballocations2nd.back().offset : size; + while (lastOffset < freeSpace1stTo2ndEnd) + { + // Find next non-null allocation or move nextAllocIndex to the end. + while (nextAlloc1stIndex < suballoc1stCount && + suballocations1st[nextAlloc1stIndex].userData == VMA_NULL) + { + ++nextAlloc1stIndex; + } - // End of loop. - lastOffset = freeSpace2ndTo1stEnd; - } - } - } + // Found non-null allocation. + if (nextAlloc1stIndex < suballoc1stCount) + { + const VmaSuballocation& suballoc = suballocations1st[nextAlloc1stIndex]; - size_t nextAlloc1stIndex = m_1stNullItemsBeginCount; - const VkDeviceSize freeSpace1stTo2ndEnd = - m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK ? suballocations2nd.back().offset : size; - while (lastOffset < freeSpace1stTo2ndEnd) - { - // Find next non-null allocation or move nextAllocIndex to the end. - while (nextAlloc1stIndex < suballoc1stCount && - suballocations1st[nextAlloc1stIndex].userData == VMA_NULL) - { - ++nextAlloc1stIndex; - } + // Process this allocation. + // There is allocation with suballoc.offset, suballoc.size. + ++inoutStats.allocationCount; - // Found non-null allocation. - if (nextAlloc1stIndex < suballoc1stCount) - { - const VmaSuballocation& suballoc = suballocations1st[nextAlloc1stIndex]; + // Prepare for next iteration. + lastOffset = suballoc.offset + suballoc.size; + ++nextAlloc1stIndex; + } + // We are at the end. + else + { + // End of loop. + lastOffset = freeSpace1stTo2ndEnd; + } + } - // 1. Process free space before this allocation. - if (lastOffset < suballoc.offset) - { - // There is free space from lastOffset to suballoc.offset. - const VkDeviceSize unusedRangeSize = suballoc.offset - lastOffset; - } + if (m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK) + { + size_t nextAlloc2ndIndex = suballocations2nd.size() - 1; + while (lastOffset < size) + { + // Find next non-null allocation or move nextAlloc2ndIndex to the end. + while (nextAlloc2ndIndex != SIZE_MAX && + suballocations2nd[nextAlloc2ndIndex].userData == VMA_NULL) + { + --nextAlloc2ndIndex; + } - // 2. Process this allocation. - // There is allocation with suballoc.offset, suballoc.size. - ++inoutStats.allocationCount; + // Found non-null allocation. + if (nextAlloc2ndIndex != SIZE_MAX) + { + const VmaSuballocation& suballoc = suballocations2nd[nextAlloc2ndIndex]; - // 3. Prepare for next iteration. - lastOffset = suballoc.offset + suballoc.size; - ++nextAlloc1stIndex; - } - // We are at the end. - else - { - if (lastOffset < freeSpace1stTo2ndEnd) - { - // There is free space from lastOffset to freeSpace1stTo2ndEnd. - const VkDeviceSize unusedRangeSize = freeSpace1stTo2ndEnd - lastOffset; - } + // Process this allocation. + // There is allocation with suballoc.offset, suballoc.size. + ++inoutStats.allocationCount; - // End of loop. - lastOffset = freeSpace1stTo2ndEnd; - } - } - - if (m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK) - { - size_t nextAlloc2ndIndex = suballocations2nd.size() - 1; - while (lastOffset < size) - { - // Find next non-null allocation or move nextAlloc2ndIndex to the end. - while (nextAlloc2ndIndex != SIZE_MAX && - suballocations2nd[nextAlloc2ndIndex].userData == VMA_NULL) - { - --nextAlloc2ndIndex; - } - - // Found non-null allocation. - if (nextAlloc2ndIndex != SIZE_MAX) - { - const VmaSuballocation& suballoc = suballocations2nd[nextAlloc2ndIndex]; - - // 1. Process free space before this allocation. - if (lastOffset < suballoc.offset) - { - // There is free space from lastOffset to suballoc.offset. - const VkDeviceSize unusedRangeSize = suballoc.offset - lastOffset; - } - - // 2. Process this allocation. - // There is allocation with suballoc.offset, suballoc.size. - ++inoutStats.allocationCount; - - // 3. Prepare for next iteration. - lastOffset = suballoc.offset + suballoc.size; - --nextAlloc2ndIndex; - } - // We are at the end. - else - { - if (lastOffset < size) - { - // There is free space from lastOffset to size. - const VkDeviceSize unusedRangeSize = size - lastOffset; - } - - // End of loop. - lastOffset = size; - } - } - } + // Prepare for next iteration. + lastOffset = suballoc.offset + suballoc.size; + --nextAlloc2ndIndex; + } + // We are at the end. + else + { + // End of loop. + lastOffset = size; + } + } + } } #if VMA_STATS_STRING_ENABLED void VmaBlockMetadata_Linear::PrintDetailedMap(class VmaJsonWriter& json) const { - const VkDeviceSize size = GetSize(); - const SuballocationVectorType& suballocations1st = AccessSuballocations1st(); - const SuballocationVectorType& suballocations2nd = AccessSuballocations2nd(); - const size_t suballoc1stCount = suballocations1st.size(); - const size_t suballoc2ndCount = suballocations2nd.size(); + const VkDeviceSize size = GetSize(); + const SuballocationVectorType& suballocations1st = AccessSuballocations1st(); + const SuballocationVectorType& suballocations2nd = AccessSuballocations2nd(); + const size_t suballoc1stCount = suballocations1st.size(); + const size_t suballoc2ndCount = suballocations2nd.size(); - // FIRST PASS + // FIRST PASS - size_t unusedRangeCount = 0; - VkDeviceSize usedBytes = 0; + size_t unusedRangeCount = 0; + VkDeviceSize usedBytes = 0; - VkDeviceSize lastOffset = 0; + VkDeviceSize lastOffset = 0; - size_t alloc2ndCount = 0; - if (m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER) - { - const VkDeviceSize freeSpace2ndTo1stEnd = suballocations1st[m_1stNullItemsBeginCount].offset; - size_t nextAlloc2ndIndex = 0; - while (lastOffset < freeSpace2ndTo1stEnd) - { - // Find next non-null allocation or move nextAlloc2ndIndex to the end. - while (nextAlloc2ndIndex < suballoc2ndCount && - suballocations2nd[nextAlloc2ndIndex].userData == VMA_NULL) - { - ++nextAlloc2ndIndex; - } + size_t alloc2ndCount = 0; + if (m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER) + { + const VkDeviceSize freeSpace2ndTo1stEnd = suballocations1st[m_1stNullItemsBeginCount].offset; + size_t nextAlloc2ndIndex = 0; + while (lastOffset < freeSpace2ndTo1stEnd) + { + // Find next non-null allocation or move nextAlloc2ndIndex to the end. + while (nextAlloc2ndIndex < suballoc2ndCount && + suballocations2nd[nextAlloc2ndIndex].userData == VMA_NULL) + { + ++nextAlloc2ndIndex; + } - // Found non-null allocation. - if (nextAlloc2ndIndex < suballoc2ndCount) - { - const VmaSuballocation& suballoc = suballocations2nd[nextAlloc2ndIndex]; + // Found non-null allocation. + if (nextAlloc2ndIndex < suballoc2ndCount) + { + const VmaSuballocation& suballoc = suballocations2nd[nextAlloc2ndIndex]; - // 1. Process free space before this allocation. - if (lastOffset < suballoc.offset) - { - // There is free space from lastOffset to suballoc.offset. - ++unusedRangeCount; - } + // 1. Process free space before this allocation. + if (lastOffset < suballoc.offset) + { + // There is free space from lastOffset to suballoc.offset. + ++unusedRangeCount; + } - // 2. Process this allocation. - // There is allocation with suballoc.offset, suballoc.size. - ++alloc2ndCount; - usedBytes += suballoc.size; + // 2. Process this allocation. + // There is allocation with suballoc.offset, suballoc.size. + ++alloc2ndCount; + usedBytes += suballoc.size; - // 3. Prepare for next iteration. - lastOffset = suballoc.offset + suballoc.size; - ++nextAlloc2ndIndex; - } - // We are at the end. - else - { - if (lastOffset < freeSpace2ndTo1stEnd) - { - // There is free space from lastOffset to freeSpace2ndTo1stEnd. - ++unusedRangeCount; - } + // 3. Prepare for next iteration. + lastOffset = suballoc.offset + suballoc.size; + ++nextAlloc2ndIndex; + } + // We are at the end. + else + { + if (lastOffset < freeSpace2ndTo1stEnd) + { + // There is free space from lastOffset to freeSpace2ndTo1stEnd. + ++unusedRangeCount; + } - // End of loop. - lastOffset = freeSpace2ndTo1stEnd; - } - } - } + // End of loop. + lastOffset = freeSpace2ndTo1stEnd; + } + } + } - size_t nextAlloc1stIndex = m_1stNullItemsBeginCount; - size_t alloc1stCount = 0; - const VkDeviceSize freeSpace1stTo2ndEnd = - m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK ? suballocations2nd.back().offset : size; - while (lastOffset < freeSpace1stTo2ndEnd) - { - // Find next non-null allocation or move nextAllocIndex to the end. - while (nextAlloc1stIndex < suballoc1stCount && - suballocations1st[nextAlloc1stIndex].userData == VMA_NULL) - { - ++nextAlloc1stIndex; - } + size_t nextAlloc1stIndex = m_1stNullItemsBeginCount; + size_t alloc1stCount = 0; + const VkDeviceSize freeSpace1stTo2ndEnd = + m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK ? suballocations2nd.back().offset : size; + while (lastOffset < freeSpace1stTo2ndEnd) + { + // Find next non-null allocation or move nextAllocIndex to the end. + while (nextAlloc1stIndex < suballoc1stCount && + suballocations1st[nextAlloc1stIndex].userData == VMA_NULL) + { + ++nextAlloc1stIndex; + } - // Found non-null allocation. - if (nextAlloc1stIndex < suballoc1stCount) - { - const VmaSuballocation& suballoc = suballocations1st[nextAlloc1stIndex]; + // Found non-null allocation. + if (nextAlloc1stIndex < suballoc1stCount) + { + const VmaSuballocation& suballoc = suballocations1st[nextAlloc1stIndex]; - // 1. Process free space before this allocation. - if (lastOffset < suballoc.offset) - { - // There is free space from lastOffset to suballoc.offset. - ++unusedRangeCount; - } + // 1. Process free space before this allocation. + if (lastOffset < suballoc.offset) + { + // There is free space from lastOffset to suballoc.offset. + ++unusedRangeCount; + } - // 2. Process this allocation. - // There is allocation with suballoc.offset, suballoc.size. - ++alloc1stCount; - usedBytes += suballoc.size; + // 2. Process this allocation. + // There is allocation with suballoc.offset, suballoc.size. + ++alloc1stCount; + usedBytes += suballoc.size; - // 3. Prepare for next iteration. - lastOffset = suballoc.offset + suballoc.size; - ++nextAlloc1stIndex; - } - // We are at the end. - else - { - if (lastOffset < size) - { - // There is free space from lastOffset to freeSpace1stTo2ndEnd. - ++unusedRangeCount; - } + // 3. Prepare for next iteration. + lastOffset = suballoc.offset + suballoc.size; + ++nextAlloc1stIndex; + } + // We are at the end. + else + { + if (lastOffset < freeSpace1stTo2ndEnd) + { + // There is free space from lastOffset to freeSpace1stTo2ndEnd. + ++unusedRangeCount; + } - // End of loop. - lastOffset = freeSpace1stTo2ndEnd; - } - } + // End of loop. + lastOffset = freeSpace1stTo2ndEnd; + } + } - if (m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK) - { - size_t nextAlloc2ndIndex = suballocations2nd.size() - 1; - while (lastOffset < size) - { - // Find next non-null allocation or move nextAlloc2ndIndex to the end. - while (nextAlloc2ndIndex != SIZE_MAX && - suballocations2nd[nextAlloc2ndIndex].userData == VMA_NULL) - { - --nextAlloc2ndIndex; - } + if (m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK) + { + size_t nextAlloc2ndIndex = suballocations2nd.size() - 1; + while (lastOffset < size) + { + // Find next non-null allocation or move nextAlloc2ndIndex to the end. + while (nextAlloc2ndIndex != SIZE_MAX && + suballocations2nd[nextAlloc2ndIndex].userData == VMA_NULL) + { + --nextAlloc2ndIndex; + } - // Found non-null allocation. - if (nextAlloc2ndIndex != SIZE_MAX) - { - const VmaSuballocation& suballoc = suballocations2nd[nextAlloc2ndIndex]; + // Found non-null allocation. + if (nextAlloc2ndIndex != SIZE_MAX) + { + const VmaSuballocation& suballoc = suballocations2nd[nextAlloc2ndIndex]; - // 1. Process free space before this allocation. - if (lastOffset < suballoc.offset) - { - // There is free space from lastOffset to suballoc.offset. - ++unusedRangeCount; - } + // 1. Process free space before this allocation. + if (lastOffset < suballoc.offset) + { + // There is free space from lastOffset to suballoc.offset. + ++unusedRangeCount; + } - // 2. Process this allocation. - // There is allocation with suballoc.offset, suballoc.size. - ++alloc2ndCount; - usedBytes += suballoc.size; + // 2. Process this allocation. + // There is allocation with suballoc.offset, suballoc.size. + ++alloc2ndCount; + usedBytes += suballoc.size; - // 3. Prepare for next iteration. - lastOffset = suballoc.offset + suballoc.size; - --nextAlloc2ndIndex; - } - // We are at the end. - else - { - if (lastOffset < size) - { - // There is free space from lastOffset to size. - ++unusedRangeCount; - } + // 3. Prepare for next iteration. + lastOffset = suballoc.offset + suballoc.size; + --nextAlloc2ndIndex; + } + // We are at the end. + else + { + if (lastOffset < size) + { + // There is free space from lastOffset to size. + ++unusedRangeCount; + } - // End of loop. - lastOffset = size; - } - } - } + // End of loop. + lastOffset = size; + } + } + } - const VkDeviceSize unusedBytes = size - usedBytes; - PrintDetailedMap_Begin(json, unusedBytes, alloc1stCount + alloc2ndCount, unusedRangeCount); + const VkDeviceSize unusedBytes = size - usedBytes; + PrintDetailedMap_Begin(json, unusedBytes, alloc1stCount + alloc2ndCount, unusedRangeCount); - // SECOND PASS - lastOffset = 0; + // SECOND PASS + lastOffset = 0; - if (m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER) - { - const VkDeviceSize freeSpace2ndTo1stEnd = suballocations1st[m_1stNullItemsBeginCount].offset; - size_t nextAlloc2ndIndex = 0; - while (lastOffset < freeSpace2ndTo1stEnd) - { - // Find next non-null allocation or move nextAlloc2ndIndex to the end. - while (nextAlloc2ndIndex < suballoc2ndCount && - suballocations2nd[nextAlloc2ndIndex].userData == VMA_NULL) - { - ++nextAlloc2ndIndex; - } + if (m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER) + { + const VkDeviceSize freeSpace2ndTo1stEnd = suballocations1st[m_1stNullItemsBeginCount].offset; + size_t nextAlloc2ndIndex = 0; + while (lastOffset < freeSpace2ndTo1stEnd) + { + // Find next non-null allocation or move nextAlloc2ndIndex to the end. + while (nextAlloc2ndIndex < suballoc2ndCount && + suballocations2nd[nextAlloc2ndIndex].userData == VMA_NULL) + { + ++nextAlloc2ndIndex; + } - // Found non-null allocation. - if (nextAlloc2ndIndex < suballoc2ndCount) - { - const VmaSuballocation& suballoc = suballocations2nd[nextAlloc2ndIndex]; + // Found non-null allocation. + if (nextAlloc2ndIndex < suballoc2ndCount) + { + const VmaSuballocation& suballoc = suballocations2nd[nextAlloc2ndIndex]; - // 1. Process free space before this allocation. - if (lastOffset < suballoc.offset) - { - // There is free space from lastOffset to suballoc.offset. - const VkDeviceSize unusedRangeSize = suballoc.offset - lastOffset; - PrintDetailedMap_UnusedRange(json, lastOffset, unusedRangeSize); - } + // 1. Process free space before this allocation. + if (lastOffset < suballoc.offset) + { + // There is free space from lastOffset to suballoc.offset. + const VkDeviceSize unusedRangeSize = suballoc.offset - lastOffset; + PrintDetailedMap_UnusedRange(json, lastOffset, unusedRangeSize); + } - // 2. Process this allocation. - // There is allocation with suballoc.offset, suballoc.size. - PrintDetailedMap_Allocation(json, suballoc.offset, suballoc.size, suballoc.userData); + // 2. Process this allocation. + // There is allocation with suballoc.offset, suballoc.size. + PrintDetailedMap_Allocation(json, suballoc.offset, suballoc.size, suballoc.userData); - // 3. Prepare for next iteration. - lastOffset = suballoc.offset + suballoc.size; - ++nextAlloc2ndIndex; - } - // We are at the end. - else - { - if (lastOffset < freeSpace2ndTo1stEnd) - { - // There is free space from lastOffset to freeSpace2ndTo1stEnd. - const VkDeviceSize unusedRangeSize = freeSpace2ndTo1stEnd - lastOffset; - PrintDetailedMap_UnusedRange(json, lastOffset, unusedRangeSize); - } + // 3. Prepare for next iteration. + lastOffset = suballoc.offset + suballoc.size; + ++nextAlloc2ndIndex; + } + // We are at the end. + else + { + if (lastOffset < freeSpace2ndTo1stEnd) + { + // There is free space from lastOffset to freeSpace2ndTo1stEnd. + const VkDeviceSize unusedRangeSize = freeSpace2ndTo1stEnd - lastOffset; + PrintDetailedMap_UnusedRange(json, lastOffset, unusedRangeSize); + } - // End of loop. - lastOffset = freeSpace2ndTo1stEnd; - } - } - } + // End of loop. + lastOffset = freeSpace2ndTo1stEnd; + } + } + } - nextAlloc1stIndex = m_1stNullItemsBeginCount; - while (lastOffset < freeSpace1stTo2ndEnd) - { - // Find next non-null allocation or move nextAllocIndex to the end. - while (nextAlloc1stIndex < suballoc1stCount && - suballocations1st[nextAlloc1stIndex].userData == VMA_NULL) - { - ++nextAlloc1stIndex; - } + nextAlloc1stIndex = m_1stNullItemsBeginCount; + while (lastOffset < freeSpace1stTo2ndEnd) + { + // Find next non-null allocation or move nextAllocIndex to the end. + while (nextAlloc1stIndex < suballoc1stCount && + suballocations1st[nextAlloc1stIndex].userData == VMA_NULL) + { + ++nextAlloc1stIndex; + } - // Found non-null allocation. - if (nextAlloc1stIndex < suballoc1stCount) - { - const VmaSuballocation& suballoc = suballocations1st[nextAlloc1stIndex]; + // Found non-null allocation. + if (nextAlloc1stIndex < suballoc1stCount) + { + const VmaSuballocation& suballoc = suballocations1st[nextAlloc1stIndex]; - // 1. Process free space before this allocation. - if (lastOffset < suballoc.offset) - { - // There is free space from lastOffset to suballoc.offset. - const VkDeviceSize unusedRangeSize = suballoc.offset - lastOffset; - PrintDetailedMap_UnusedRange(json, lastOffset, unusedRangeSize); - } + // 1. Process free space before this allocation. + if (lastOffset < suballoc.offset) + { + // There is free space from lastOffset to suballoc.offset. + const VkDeviceSize unusedRangeSize = suballoc.offset - lastOffset; + PrintDetailedMap_UnusedRange(json, lastOffset, unusedRangeSize); + } - // 2. Process this allocation. - // There is allocation with suballoc.offset, suballoc.size. - PrintDetailedMap_Allocation(json, suballoc.offset, suballoc.size, suballoc.userData); + // 2. Process this allocation. + // There is allocation with suballoc.offset, suballoc.size. + PrintDetailedMap_Allocation(json, suballoc.offset, suballoc.size, suballoc.userData); - // 3. Prepare for next iteration. - lastOffset = suballoc.offset + suballoc.size; - ++nextAlloc1stIndex; - } - // We are at the end. - else - { - if (lastOffset < freeSpace1stTo2ndEnd) - { - // There is free space from lastOffset to freeSpace1stTo2ndEnd. - const VkDeviceSize unusedRangeSize = freeSpace1stTo2ndEnd - lastOffset; - PrintDetailedMap_UnusedRange(json, lastOffset, unusedRangeSize); - } + // 3. Prepare for next iteration. + lastOffset = suballoc.offset + suballoc.size; + ++nextAlloc1stIndex; + } + // We are at the end. + else + { + if (lastOffset < freeSpace1stTo2ndEnd) + { + // There is free space from lastOffset to freeSpace1stTo2ndEnd. + const VkDeviceSize unusedRangeSize = freeSpace1stTo2ndEnd - lastOffset; + PrintDetailedMap_UnusedRange(json, lastOffset, unusedRangeSize); + } - // End of loop. - lastOffset = freeSpace1stTo2ndEnd; - } - } + // End of loop. + lastOffset = freeSpace1stTo2ndEnd; + } + } - if (m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK) - { - size_t nextAlloc2ndIndex = suballocations2nd.size() - 1; - while (lastOffset < size) - { - // Find next non-null allocation or move nextAlloc2ndIndex to the end. - while (nextAlloc2ndIndex != SIZE_MAX && - suballocations2nd[nextAlloc2ndIndex].userData == VMA_NULL) - { - --nextAlloc2ndIndex; - } + if (m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK) + { + size_t nextAlloc2ndIndex = suballocations2nd.size() - 1; + while (lastOffset < size) + { + // Find next non-null allocation or move nextAlloc2ndIndex to the end. + while (nextAlloc2ndIndex != SIZE_MAX && + suballocations2nd[nextAlloc2ndIndex].userData == VMA_NULL) + { + --nextAlloc2ndIndex; + } - // Found non-null allocation. - if (nextAlloc2ndIndex != SIZE_MAX) - { - const VmaSuballocation& suballoc = suballocations2nd[nextAlloc2ndIndex]; + // Found non-null allocation. + if (nextAlloc2ndIndex != SIZE_MAX) + { + const VmaSuballocation& suballoc = suballocations2nd[nextAlloc2ndIndex]; - // 1. Process free space before this allocation. - if (lastOffset < suballoc.offset) - { - // There is free space from lastOffset to suballoc.offset. - const VkDeviceSize unusedRangeSize = suballoc.offset - lastOffset; - PrintDetailedMap_UnusedRange(json, lastOffset, unusedRangeSize); - } + // 1. Process free space before this allocation. + if (lastOffset < suballoc.offset) + { + // There is free space from lastOffset to suballoc.offset. + const VkDeviceSize unusedRangeSize = suballoc.offset - lastOffset; + PrintDetailedMap_UnusedRange(json, lastOffset, unusedRangeSize); + } - // 2. Process this allocation. - // There is allocation with suballoc.offset, suballoc.size. - PrintDetailedMap_Allocation(json, suballoc.offset, suballoc.size, suballoc.userData); + // 2. Process this allocation. + // There is allocation with suballoc.offset, suballoc.size. + PrintDetailedMap_Allocation(json, suballoc.offset, suballoc.size, suballoc.userData); - // 3. Prepare for next iteration. - lastOffset = suballoc.offset + suballoc.size; - --nextAlloc2ndIndex; - } - // We are at the end. - else - { - if (lastOffset < size) - { - // There is free space from lastOffset to size. - const VkDeviceSize unusedRangeSize = size - lastOffset; - PrintDetailedMap_UnusedRange(json, lastOffset, unusedRangeSize); - } + // 3. Prepare for next iteration. + lastOffset = suballoc.offset + suballoc.size; + --nextAlloc2ndIndex; + } + // We are at the end. + else + { + if (lastOffset < size) + { + // There is free space from lastOffset to size. + const VkDeviceSize unusedRangeSize = size - lastOffset; + PrintDetailedMap_UnusedRange(json, lastOffset, unusedRangeSize); + } - // End of loop. - lastOffset = size; - } - } - } + // End of loop. + lastOffset = size; + } + } + } - PrintDetailedMap_End(json); + PrintDetailedMap_End(json); } #endif // VMA_STATS_STRING_ENABLED bool VmaBlockMetadata_Linear::CreateAllocationRequest( - VkDeviceSize allocSize, - VkDeviceSize allocAlignment, - bool upperAddress, - VmaSuballocationType allocType, - uint32_t strategy, - VmaAllocationRequest* pAllocationRequest) + VkDeviceSize allocSize, + VkDeviceSize allocAlignment, + bool upperAddress, + VmaSuballocationType allocType, + uint32_t strategy, + VmaAllocationRequest* pAllocationRequest) { - VMA_ASSERT(allocSize > 0); - VMA_ASSERT(allocType != VMA_SUBALLOCATION_TYPE_FREE); - VMA_ASSERT(pAllocationRequest != VMA_NULL); - VMA_HEAVY_ASSERT(Validate()); - pAllocationRequest->size = allocSize; - return upperAddress ? - CreateAllocationRequest_UpperAddress( - allocSize, allocAlignment, allocType, strategy, pAllocationRequest) : - CreateAllocationRequest_LowerAddress( - allocSize, allocAlignment, allocType, strategy, pAllocationRequest); + VMA_ASSERT(allocSize > 0); + VMA_ASSERT(allocType != VMA_SUBALLOCATION_TYPE_FREE); + VMA_ASSERT(pAllocationRequest != VMA_NULL); + VMA_HEAVY_ASSERT(Validate()); + + if (allocSize > GetSize()) + return false; + + pAllocationRequest->size = allocSize; + return upperAddress ? + CreateAllocationRequest_UpperAddress( + allocSize, allocAlignment, allocType, strategy, pAllocationRequest) : + CreateAllocationRequest_LowerAddress( + allocSize, allocAlignment, allocType, strategy, pAllocationRequest); } VkResult VmaBlockMetadata_Linear::CheckCorruption(const void* pBlockData) { - VMA_ASSERT(!IsVirtual()); - SuballocationVectorType& suballocations1st = AccessSuballocations1st(); - for (size_t i = m_1stNullItemsBeginCount, count = suballocations1st.size(); i < count; ++i) - { - const VmaSuballocation& suballoc = suballocations1st[i]; - if (suballoc.type != VMA_SUBALLOCATION_TYPE_FREE) - { - if (!VmaValidateMagicValue(pBlockData, suballoc.offset + suballoc.size)) - { - VMA_ASSERT(0 && "MEMORY CORRUPTION DETECTED AFTER VALIDATED ALLOCATION!"); - return VK_ERROR_UNKNOWN_COPY; - } - } - } + VMA_ASSERT(!IsVirtual()); + SuballocationVectorType& suballocations1st = AccessSuballocations1st(); + for (size_t i = m_1stNullItemsBeginCount, count = suballocations1st.size(); i < count; ++i) + { + const VmaSuballocation& suballoc = suballocations1st[i]; + if (suballoc.type != VMA_SUBALLOCATION_TYPE_FREE) + { + if (!VmaValidateMagicValue(pBlockData, suballoc.offset + suballoc.size)) + { + VMA_ASSERT(0 && "MEMORY CORRUPTION DETECTED AFTER VALIDATED ALLOCATION!"); + return VK_ERROR_UNKNOWN_COPY; + } + } + } - SuballocationVectorType& suballocations2nd = AccessSuballocations2nd(); - for (size_t i = 0, count = suballocations2nd.size(); i < count; ++i) - { - const VmaSuballocation& suballoc = suballocations2nd[i]; - if (suballoc.type != VMA_SUBALLOCATION_TYPE_FREE) - { - if (!VmaValidateMagicValue(pBlockData, suballoc.offset + suballoc.size)) - { - VMA_ASSERT(0 && "MEMORY CORRUPTION DETECTED AFTER VALIDATED ALLOCATION!"); - return VK_ERROR_UNKNOWN_COPY; - } - } - } + SuballocationVectorType& suballocations2nd = AccessSuballocations2nd(); + for (size_t i = 0, count = suballocations2nd.size(); i < count; ++i) + { + const VmaSuballocation& suballoc = suballocations2nd[i]; + if (suballoc.type != VMA_SUBALLOCATION_TYPE_FREE) + { + if (!VmaValidateMagicValue(pBlockData, suballoc.offset + suballoc.size)) + { + VMA_ASSERT(0 && "MEMORY CORRUPTION DETECTED AFTER VALIDATED ALLOCATION!"); + return VK_ERROR_UNKNOWN_COPY; + } + } + } - return VK_SUCCESS; + return VK_SUCCESS; } void VmaBlockMetadata_Linear::Alloc( - const VmaAllocationRequest& request, - VmaSuballocationType type, - void* userData) + const VmaAllocationRequest& request, + VmaSuballocationType type, + void* userData) { - const VkDeviceSize offset = (VkDeviceSize)request.allocHandle - 1; - const VmaSuballocation newSuballoc = { offset, request.size, userData, type }; + const VkDeviceSize offset = (VkDeviceSize)request.allocHandle - 1; + const VmaSuballocation newSuballoc = { offset, request.size, userData, type }; - switch (request.type) - { - case VmaAllocationRequestType::UpperAddress: - { - VMA_ASSERT(m_2ndVectorMode != SECOND_VECTOR_RING_BUFFER && - "CRITICAL ERROR: Trying to use linear allocator as double stack while it was already used as ring buffer."); - SuballocationVectorType& suballocations2nd = AccessSuballocations2nd(); - suballocations2nd.push_back(newSuballoc); - m_2ndVectorMode = SECOND_VECTOR_DOUBLE_STACK; - } - break; - case VmaAllocationRequestType::EndOf1st: - { - SuballocationVectorType& suballocations1st = AccessSuballocations1st(); + switch (request.type) + { + case VmaAllocationRequestType::UpperAddress: + { + VMA_ASSERT(m_2ndVectorMode != SECOND_VECTOR_RING_BUFFER && + "CRITICAL ERROR: Trying to use linear allocator as double stack while it was already used as ring buffer."); + SuballocationVectorType& suballocations2nd = AccessSuballocations2nd(); + suballocations2nd.push_back(newSuballoc); + m_2ndVectorMode = SECOND_VECTOR_DOUBLE_STACK; + } + break; + case VmaAllocationRequestType::EndOf1st: + { + SuballocationVectorType& suballocations1st = AccessSuballocations1st(); - VMA_ASSERT(suballocations1st.empty() || - offset >= suballocations1st.back().offset + suballocations1st.back().size); - // Check if it fits before the end of the block. - VMA_ASSERT(offset + request.size <= GetSize()); + VMA_ASSERT(suballocations1st.empty() || + offset >= suballocations1st.back().offset + suballocations1st.back().size); + // Check if it fits before the end of the block. + VMA_ASSERT(offset + request.size <= GetSize()); - suballocations1st.push_back(newSuballoc); - } - break; - case VmaAllocationRequestType::EndOf2nd: - { - SuballocationVectorType& suballocations1st = AccessSuballocations1st(); - // New allocation at the end of 2-part ring buffer, so before first allocation from 1st vector. - VMA_ASSERT(!suballocations1st.empty() && - offset + request.size <= suballocations1st[m_1stNullItemsBeginCount].offset); - SuballocationVectorType& suballocations2nd = AccessSuballocations2nd(); + suballocations1st.push_back(newSuballoc); + } + break; + case VmaAllocationRequestType::EndOf2nd: + { + SuballocationVectorType& suballocations1st = AccessSuballocations1st(); + // New allocation at the end of 2-part ring buffer, so before first allocation from 1st vector. + VMA_ASSERT(!suballocations1st.empty() && + offset + request.size <= suballocations1st[m_1stNullItemsBeginCount].offset); + SuballocationVectorType& suballocations2nd = AccessSuballocations2nd(); - switch (m_2ndVectorMode) - { - case SECOND_VECTOR_EMPTY: - // First allocation from second part ring buffer. - VMA_ASSERT(suballocations2nd.empty()); - m_2ndVectorMode = SECOND_VECTOR_RING_BUFFER; - break; - case SECOND_VECTOR_RING_BUFFER: - // 2-part ring buffer is already started. - VMA_ASSERT(!suballocations2nd.empty()); - break; - case SECOND_VECTOR_DOUBLE_STACK: - VMA_ASSERT(0 && "CRITICAL ERROR: Trying to use linear allocator as ring buffer while it was already used as double stack."); - break; - default: - VMA_ASSERT(0); - } + switch (m_2ndVectorMode) + { + case SECOND_VECTOR_EMPTY: + // First allocation from second part ring buffer. + VMA_ASSERT(suballocations2nd.empty()); + m_2ndVectorMode = SECOND_VECTOR_RING_BUFFER; + break; + case SECOND_VECTOR_RING_BUFFER: + // 2-part ring buffer is already started. + VMA_ASSERT(!suballocations2nd.empty()); + break; + case SECOND_VECTOR_DOUBLE_STACK: + VMA_ASSERT(0 && "CRITICAL ERROR: Trying to use linear allocator as ring buffer while it was already used as double stack."); + break; + default: + VMA_ASSERT(0); + } - suballocations2nd.push_back(newSuballoc); - } - break; - default: - VMA_ASSERT(0 && "CRITICAL INTERNAL ERROR."); - } + suballocations2nd.push_back(newSuballoc); + } + break; + default: + VMA_ASSERT(0 && "CRITICAL INTERNAL ERROR."); + } - m_SumFreeSize -= newSuballoc.size; + m_SumFreeSize -= newSuballoc.size; } void VmaBlockMetadata_Linear::Free(VmaAllocHandle allocHandle) { - SuballocationVectorType& suballocations1st = AccessSuballocations1st(); - SuballocationVectorType& suballocations2nd = AccessSuballocations2nd(); - VkDeviceSize offset = (VkDeviceSize)allocHandle - 1; + SuballocationVectorType& suballocations1st = AccessSuballocations1st(); + SuballocationVectorType& suballocations2nd = AccessSuballocations2nd(); + VkDeviceSize offset = (VkDeviceSize)allocHandle - 1; - if (!suballocations1st.empty()) - { - // First allocation: Mark it as next empty at the beginning. - VmaSuballocation& firstSuballoc = suballocations1st[m_1stNullItemsBeginCount]; - if (firstSuballoc.offset == offset) - { - firstSuballoc.type = VMA_SUBALLOCATION_TYPE_FREE; - firstSuballoc.userData = VMA_NULL; - m_SumFreeSize += firstSuballoc.size; - ++m_1stNullItemsBeginCount; - CleanupAfterFree(); - return; - } - } + if (!suballocations1st.empty()) + { + // First allocation: Mark it as next empty at the beginning. + VmaSuballocation& firstSuballoc = suballocations1st[m_1stNullItemsBeginCount]; + if (firstSuballoc.offset == offset) + { + firstSuballoc.type = VMA_SUBALLOCATION_TYPE_FREE; + firstSuballoc.userData = VMA_NULL; + m_SumFreeSize += firstSuballoc.size; + ++m_1stNullItemsBeginCount; + CleanupAfterFree(); + return; + } + } - // Last allocation in 2-part ring buffer or top of upper stack (same logic). - if (m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER || - m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK) - { - VmaSuballocation& lastSuballoc = suballocations2nd.back(); - if (lastSuballoc.offset == offset) - { - m_SumFreeSize += lastSuballoc.size; - suballocations2nd.pop_back(); - CleanupAfterFree(); - return; - } - } - // Last allocation in 1st vector. - else if (m_2ndVectorMode == SECOND_VECTOR_EMPTY) - { - VmaSuballocation& lastSuballoc = suballocations1st.back(); - if (lastSuballoc.offset == offset) - { - m_SumFreeSize += lastSuballoc.size; - suballocations1st.pop_back(); - CleanupAfterFree(); - return; - } - } + // Last allocation in 2-part ring buffer or top of upper stack (same logic). + if (m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER || + m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK) + { + VmaSuballocation& lastSuballoc = suballocations2nd.back(); + if (lastSuballoc.offset == offset) + { + m_SumFreeSize += lastSuballoc.size; + suballocations2nd.pop_back(); + CleanupAfterFree(); + return; + } + } + // Last allocation in 1st vector. + else if (m_2ndVectorMode == SECOND_VECTOR_EMPTY) + { + VmaSuballocation& lastSuballoc = suballocations1st.back(); + if (lastSuballoc.offset == offset) + { + m_SumFreeSize += lastSuballoc.size; + suballocations1st.pop_back(); + CleanupAfterFree(); + return; + } + } - VmaSuballocation refSuballoc; - refSuballoc.offset = offset; - // Rest of members stays uninitialized intentionally for better performance. + VmaSuballocation refSuballoc; + refSuballoc.offset = offset; + // Rest of members stays uninitialized intentionally for better performance. - // Item from the middle of 1st vector. - { - const SuballocationVectorType::iterator it = VmaBinaryFindSorted( - suballocations1st.begin() + m_1stNullItemsBeginCount, - suballocations1st.end(), - refSuballoc, - VmaSuballocationOffsetLess()); - if (it != suballocations1st.end()) - { - it->type = VMA_SUBALLOCATION_TYPE_FREE; - it->userData = VMA_NULL; - ++m_1stNullItemsMiddleCount; - m_SumFreeSize += it->size; - CleanupAfterFree(); - return; - } - } + // Item from the middle of 1st vector. + { + const SuballocationVectorType::iterator it = VmaBinaryFindSorted( + suballocations1st.begin() + m_1stNullItemsBeginCount, + suballocations1st.end(), + refSuballoc, + VmaSuballocationOffsetLess()); + if (it != suballocations1st.end()) + { + it->type = VMA_SUBALLOCATION_TYPE_FREE; + it->userData = VMA_NULL; + ++m_1stNullItemsMiddleCount; + m_SumFreeSize += it->size; + CleanupAfterFree(); + return; + } + } - if (m_2ndVectorMode != SECOND_VECTOR_EMPTY) - { - // Item from the middle of 2nd vector. - const SuballocationVectorType::iterator it = m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER ? - VmaBinaryFindSorted(suballocations2nd.begin(), suballocations2nd.end(), refSuballoc, VmaSuballocationOffsetLess()) : - VmaBinaryFindSorted(suballocations2nd.begin(), suballocations2nd.end(), refSuballoc, VmaSuballocationOffsetGreater()); - if (it != suballocations2nd.end()) - { - it->type = VMA_SUBALLOCATION_TYPE_FREE; - it->userData = VMA_NULL; - ++m_2ndNullItemsCount; - m_SumFreeSize += it->size; - CleanupAfterFree(); - return; - } - } + if (m_2ndVectorMode != SECOND_VECTOR_EMPTY) + { + // Item from the middle of 2nd vector. + const SuballocationVectorType::iterator it = m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER ? + VmaBinaryFindSorted(suballocations2nd.begin(), suballocations2nd.end(), refSuballoc, VmaSuballocationOffsetLess()) : + VmaBinaryFindSorted(suballocations2nd.begin(), suballocations2nd.end(), refSuballoc, VmaSuballocationOffsetGreater()); + if (it != suballocations2nd.end()) + { + it->type = VMA_SUBALLOCATION_TYPE_FREE; + it->userData = VMA_NULL; + ++m_2ndNullItemsCount; + m_SumFreeSize += it->size; + CleanupAfterFree(); + return; + } + } - VMA_ASSERT(0 && "Allocation to free not found in linear allocator!"); + VMA_ASSERT(0 && "Allocation to free not found in linear allocator!"); } void VmaBlockMetadata_Linear::GetAllocationInfo(VmaAllocHandle allocHandle, VmaVirtualAllocationInfo& outInfo) { - outInfo.offset = (VkDeviceSize)allocHandle - 1; - VmaSuballocation& suballoc = FindSuballocation(outInfo.offset); - outInfo.size = suballoc.size; - outInfo.pUserData = suballoc.userData; + outInfo.offset = (VkDeviceSize)allocHandle - 1; + VmaSuballocation& suballoc = FindSuballocation(outInfo.offset); + outInfo.size = suballoc.size; + outInfo.pUserData = suballoc.userData; } void* VmaBlockMetadata_Linear::GetAllocationUserData(VmaAllocHandle allocHandle) const { - return FindSuballocation((VkDeviceSize)allocHandle - 1).userData; + return FindSuballocation((VkDeviceSize)allocHandle - 1).userData; } VmaAllocHandle VmaBlockMetadata_Linear::GetAllocationListBegin() const { - // Function only used for defragmentation, which is disabled for this algorithm - VMA_ASSERT(0); - return VK_NULL_HANDLE; + // Function only used for defragmentation, which is disabled for this algorithm + VMA_ASSERT(0); + return VK_NULL_HANDLE; } VmaAllocHandle VmaBlockMetadata_Linear::GetNextAllocation(VmaAllocHandle prevAlloc) const { - // Function only used for defragmentation, which is disabled for this algorithm - VMA_ASSERT(0); - return VK_NULL_HANDLE; + // Function only used for defragmentation, which is disabled for this algorithm + VMA_ASSERT(0); + return VK_NULL_HANDLE; } VkDeviceSize VmaBlockMetadata_Linear::GetNextFreeRegionSize(VmaAllocHandle alloc) const { - // Function only used for defragmentation, which is disabled for this algorithm - VMA_ASSERT(0); - return 0; + // Function only used for defragmentation, which is disabled for this algorithm + VMA_ASSERT(0); + return 0; } void VmaBlockMetadata_Linear::Clear() { - m_SumFreeSize = GetSize(); - m_Suballocations0.clear(); - m_Suballocations1.clear(); - // Leaving m_1stVectorIndex unchanged - it doesn't matter. - m_2ndVectorMode = SECOND_VECTOR_EMPTY; - m_1stNullItemsBeginCount = 0; - m_1stNullItemsMiddleCount = 0; - m_2ndNullItemsCount = 0; + m_SumFreeSize = GetSize(); + m_Suballocations0.clear(); + m_Suballocations1.clear(); + // Leaving m_1stVectorIndex unchanged - it doesn't matter. + m_2ndVectorMode = SECOND_VECTOR_EMPTY; + m_1stNullItemsBeginCount = 0; + m_1stNullItemsMiddleCount = 0; + m_2ndNullItemsCount = 0; } void VmaBlockMetadata_Linear::SetAllocationUserData(VmaAllocHandle allocHandle, void* userData) { - VmaSuballocation& suballoc = FindSuballocation((VkDeviceSize)allocHandle - 1); - suballoc.userData = userData; + VmaSuballocation& suballoc = FindSuballocation((VkDeviceSize)allocHandle - 1); + suballoc.userData = userData; } void VmaBlockMetadata_Linear::DebugLogAllAllocations() const { - const SuballocationVectorType& suballocations1st = AccessSuballocations1st(); - for (auto it = suballocations1st.begin() + m_1stNullItemsBeginCount; it != suballocations1st.end(); ++it) - if (it->type != VMA_SUBALLOCATION_TYPE_FREE) - DebugLogAllocation(it->offset, it->size, it->userData); + const SuballocationVectorType& suballocations1st = AccessSuballocations1st(); + for (auto it = suballocations1st.begin() + m_1stNullItemsBeginCount; it != suballocations1st.end(); ++it) + if (it->type != VMA_SUBALLOCATION_TYPE_FREE) + DebugLogAllocation(it->offset, it->size, it->userData); - const SuballocationVectorType& suballocations2nd = AccessSuballocations2nd(); - for (auto it = suballocations2nd.begin(); it != suballocations2nd.end(); ++it) - if (it->type != VMA_SUBALLOCATION_TYPE_FREE) - DebugLogAllocation(it->offset, it->size, it->userData); + const SuballocationVectorType& suballocations2nd = AccessSuballocations2nd(); + for (auto it = suballocations2nd.begin(); it != suballocations2nd.end(); ++it) + if (it->type != VMA_SUBALLOCATION_TYPE_FREE) + DebugLogAllocation(it->offset, it->size, it->userData); } VmaSuballocation& VmaBlockMetadata_Linear::FindSuballocation(VkDeviceSize offset) const { - const SuballocationVectorType& suballocations1st = AccessSuballocations1st(); - const SuballocationVectorType& suballocations2nd = AccessSuballocations2nd(); + const SuballocationVectorType& suballocations1st = AccessSuballocations1st(); + const SuballocationVectorType& suballocations2nd = AccessSuballocations2nd(); - VmaSuballocation refSuballoc; - refSuballoc.offset = offset; - // Rest of members stays uninitialized intentionally for better performance. + VmaSuballocation refSuballoc; + refSuballoc.offset = offset; + // Rest of members stays uninitialized intentionally for better performance. - // Item from the 1st vector. - { - SuballocationVectorType::const_iterator it = VmaBinaryFindSorted( - suballocations1st.begin() + m_1stNullItemsBeginCount, - suballocations1st.end(), - refSuballoc, - VmaSuballocationOffsetLess()); - if (it != suballocations1st.end()) - { - return const_cast(*it); - } - } + // Item from the 1st vector. + { + SuballocationVectorType::const_iterator it = VmaBinaryFindSorted( + suballocations1st.begin() + m_1stNullItemsBeginCount, + suballocations1st.end(), + refSuballoc, + VmaSuballocationOffsetLess()); + if (it != suballocations1st.end()) + { + return const_cast(*it); + } + } - if (m_2ndVectorMode != SECOND_VECTOR_EMPTY) - { - // Rest of members stays uninitialized intentionally for better performance. - SuballocationVectorType::const_iterator it = m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER ? - VmaBinaryFindSorted(suballocations2nd.begin(), suballocations2nd.end(), refSuballoc, VmaSuballocationOffsetLess()) : - VmaBinaryFindSorted(suballocations2nd.begin(), suballocations2nd.end(), refSuballoc, VmaSuballocationOffsetGreater()); - if (it != suballocations2nd.end()) - { - return const_cast(*it); - } - } + if (m_2ndVectorMode != SECOND_VECTOR_EMPTY) + { + // Rest of members stays uninitialized intentionally for better performance. + SuballocationVectorType::const_iterator it = m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER ? + VmaBinaryFindSorted(suballocations2nd.begin(), suballocations2nd.end(), refSuballoc, VmaSuballocationOffsetLess()) : + VmaBinaryFindSorted(suballocations2nd.begin(), suballocations2nd.end(), refSuballoc, VmaSuballocationOffsetGreater()); + if (it != suballocations2nd.end()) + { + return const_cast(*it); + } + } - VMA_ASSERT(0 && "Allocation not found in linear allocator!"); - return const_cast(suballocations1st.back()); // Should never occur. + VMA_ASSERT(0 && "Allocation not found in linear allocator!"); + return const_cast(suballocations1st.back()); // Should never occur. } bool VmaBlockMetadata_Linear::ShouldCompact1st() const { - const size_t nullItemCount = m_1stNullItemsBeginCount + m_1stNullItemsMiddleCount; - const size_t suballocCount = AccessSuballocations1st().size(); - return suballocCount > 32 && nullItemCount * 2 >= (suballocCount - nullItemCount) * 3; + const size_t nullItemCount = m_1stNullItemsBeginCount + m_1stNullItemsMiddleCount; + const size_t suballocCount = AccessSuballocations1st().size(); + return suballocCount > 32 && nullItemCount * 2 >= (suballocCount - nullItemCount) * 3; } void VmaBlockMetadata_Linear::CleanupAfterFree() { - SuballocationVectorType& suballocations1st = AccessSuballocations1st(); - SuballocationVectorType& suballocations2nd = AccessSuballocations2nd(); + SuballocationVectorType& suballocations1st = AccessSuballocations1st(); + SuballocationVectorType& suballocations2nd = AccessSuballocations2nd(); - if (IsEmpty()) - { - suballocations1st.clear(); - suballocations2nd.clear(); - m_1stNullItemsBeginCount = 0; - m_1stNullItemsMiddleCount = 0; - m_2ndNullItemsCount = 0; - m_2ndVectorMode = SECOND_VECTOR_EMPTY; - } - else - { - const size_t suballoc1stCount = suballocations1st.size(); - const size_t nullItem1stCount = m_1stNullItemsBeginCount + m_1stNullItemsMiddleCount; - VMA_ASSERT(nullItem1stCount <= suballoc1stCount); + if (IsEmpty()) + { + suballocations1st.clear(); + suballocations2nd.clear(); + m_1stNullItemsBeginCount = 0; + m_1stNullItemsMiddleCount = 0; + m_2ndNullItemsCount = 0; + m_2ndVectorMode = SECOND_VECTOR_EMPTY; + } else + { + const size_t suballoc1stCount = suballocations1st.size(); + const size_t nullItem1stCount = m_1stNullItemsBeginCount + m_1stNullItemsMiddleCount; + VMA_ASSERT(nullItem1stCount <= suballoc1stCount); - // Find more null items at the beginning of 1st vector. - while (m_1stNullItemsBeginCount < suballoc1stCount && - suballocations1st[m_1stNullItemsBeginCount].type == VMA_SUBALLOCATION_TYPE_FREE) - { - ++m_1stNullItemsBeginCount; - --m_1stNullItemsMiddleCount; - } + // Find more null items at the beginning of 1st vector. + while (m_1stNullItemsBeginCount < suballoc1stCount && + suballocations1st[m_1stNullItemsBeginCount].type == VMA_SUBALLOCATION_TYPE_FREE) + { + ++m_1stNullItemsBeginCount; + --m_1stNullItemsMiddleCount; + } - // Find more null items at the end of 1st vector. - while (m_1stNullItemsMiddleCount > 0 && - suballocations1st.back().type == VMA_SUBALLOCATION_TYPE_FREE) - { - --m_1stNullItemsMiddleCount; - suballocations1st.pop_back(); - } + // Find more null items at the end of 1st vector. + while (m_1stNullItemsMiddleCount > 0 && + suballocations1st.back().type == VMA_SUBALLOCATION_TYPE_FREE) + { + --m_1stNullItemsMiddleCount; + suballocations1st.pop_back(); + } - // Find more null items at the end of 2nd vector. - while (m_2ndNullItemsCount > 0 && - suballocations2nd.back().type == VMA_SUBALLOCATION_TYPE_FREE) - { - --m_2ndNullItemsCount; - suballocations2nd.pop_back(); - } + // Find more null items at the end of 2nd vector. + while (m_2ndNullItemsCount > 0 && + suballocations2nd.back().type == VMA_SUBALLOCATION_TYPE_FREE) + { + --m_2ndNullItemsCount; + suballocations2nd.pop_back(); + } - // Find more null items at the beginning of 2nd vector. - while (m_2ndNullItemsCount > 0 && - suballocations2nd[0].type == VMA_SUBALLOCATION_TYPE_FREE) - { - --m_2ndNullItemsCount; - VmaVectorRemove(suballocations2nd, 0); - } + // Find more null items at the beginning of 2nd vector. + while (m_2ndNullItemsCount > 0 && + suballocations2nd[0].type == VMA_SUBALLOCATION_TYPE_FREE) + { + --m_2ndNullItemsCount; + VmaVectorRemove(suballocations2nd, 0); + } - if (ShouldCompact1st()) - { - const size_t nonNullItemCount = suballoc1stCount - nullItem1stCount; - size_t srcIndex = m_1stNullItemsBeginCount; - for (size_t dstIndex = 0; dstIndex < nonNullItemCount; ++dstIndex) - { - while (suballocations1st[srcIndex].type == VMA_SUBALLOCATION_TYPE_FREE) - { - ++srcIndex; - } - if (dstIndex != srcIndex) - { - suballocations1st[dstIndex] = suballocations1st[srcIndex]; - } - ++srcIndex; - } - suballocations1st.resize(nonNullItemCount); - m_1stNullItemsBeginCount = 0; - m_1stNullItemsMiddleCount = 0; - } + if (ShouldCompact1st()) + { + const size_t nonNullItemCount = suballoc1stCount - nullItem1stCount; + size_t srcIndex = m_1stNullItemsBeginCount; + for (size_t dstIndex = 0; dstIndex < nonNullItemCount; ++dstIndex) + { + while (suballocations1st[srcIndex].type == VMA_SUBALLOCATION_TYPE_FREE) + { + ++srcIndex; + } + if (dstIndex != srcIndex) + { + suballocations1st[dstIndex] = suballocations1st[srcIndex]; + } + ++srcIndex; + } + suballocations1st.resize(nonNullItemCount); + m_1stNullItemsBeginCount = 0; + m_1stNullItemsMiddleCount = 0; + } - // 2nd vector became empty. - if (suballocations2nd.empty()) - { - m_2ndVectorMode = SECOND_VECTOR_EMPTY; - } + // 2nd vector became empty. + if (suballocations2nd.empty()) + { + m_2ndVectorMode = SECOND_VECTOR_EMPTY; + } - // 1st vector became empty. - if (suballocations1st.size() - m_1stNullItemsBeginCount == 0) - { - suballocations1st.clear(); - m_1stNullItemsBeginCount = 0; + // 1st vector became empty. + if (suballocations1st.size() - m_1stNullItemsBeginCount == 0) + { + suballocations1st.clear(); + m_1stNullItemsBeginCount = 0; - if (!suballocations2nd.empty() && m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER) - { - // Swap 1st with 2nd. Now 2nd is empty. - m_2ndVectorMode = SECOND_VECTOR_EMPTY; - m_1stNullItemsMiddleCount = m_2ndNullItemsCount; - while (m_1stNullItemsBeginCount < suballocations2nd.size() && - suballocations2nd[m_1stNullItemsBeginCount].type == VMA_SUBALLOCATION_TYPE_FREE) - { - ++m_1stNullItemsBeginCount; - --m_1stNullItemsMiddleCount; - } - m_2ndNullItemsCount = 0; - m_1stVectorIndex ^= 1; - } - } - } + if (!suballocations2nd.empty() && m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER) + { + // Swap 1st with 2nd. Now 2nd is empty. + m_2ndVectorMode = SECOND_VECTOR_EMPTY; + m_1stNullItemsMiddleCount = m_2ndNullItemsCount; + while (m_1stNullItemsBeginCount < suballocations2nd.size() && + suballocations2nd[m_1stNullItemsBeginCount].type == VMA_SUBALLOCATION_TYPE_FREE) + { + ++m_1stNullItemsBeginCount; + --m_1stNullItemsMiddleCount; + } + m_2ndNullItemsCount = 0; + m_1stVectorIndex ^= 1; + } + } + } - VMA_HEAVY_ASSERT(Validate()); + VMA_HEAVY_ASSERT(Validate()); } bool VmaBlockMetadata_Linear::CreateAllocationRequest_LowerAddress( - VkDeviceSize allocSize, - VkDeviceSize allocAlignment, - VmaSuballocationType allocType, - uint32_t strategy, - VmaAllocationRequest* pAllocationRequest) + VkDeviceSize allocSize, + VkDeviceSize allocAlignment, + VmaSuballocationType allocType, + uint32_t strategy, + VmaAllocationRequest* pAllocationRequest) { - const VkDeviceSize blockSize = GetSize(); - const VkDeviceSize debugMargin = GetDebugMargin(); - const VkDeviceSize bufferImageGranularity = GetBufferImageGranularity(); - SuballocationVectorType& suballocations1st = AccessSuballocations1st(); - SuballocationVectorType& suballocations2nd = AccessSuballocations2nd(); + const VkDeviceSize blockSize = GetSize(); + const VkDeviceSize debugMargin = GetDebugMargin(); + const VkDeviceSize bufferImageGranularity = GetBufferImageGranularity(); + SuballocationVectorType& suballocations1st = AccessSuballocations1st(); + SuballocationVectorType& suballocations2nd = AccessSuballocations2nd(); - if (m_2ndVectorMode == SECOND_VECTOR_EMPTY || m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK) - { - // Try to allocate at the end of 1st vector. + if (m_2ndVectorMode == SECOND_VECTOR_EMPTY || m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK) + { + // Try to allocate at the end of 1st vector. - VkDeviceSize resultBaseOffset = 0; - if (!suballocations1st.empty()) - { - const VmaSuballocation& lastSuballoc = suballocations1st.back(); - resultBaseOffset = lastSuballoc.offset + lastSuballoc.size + debugMargin; - } + VkDeviceSize resultBaseOffset = 0; + if (!suballocations1st.empty()) + { + const VmaSuballocation& lastSuballoc = suballocations1st.back(); + resultBaseOffset = lastSuballoc.offset + lastSuballoc.size + debugMargin; + } - // Start from offset equal to beginning of free space. - VkDeviceSize resultOffset = resultBaseOffset; + // Start from offset equal to beginning of free space. + VkDeviceSize resultOffset = resultBaseOffset; - // Apply alignment. - resultOffset = VmaAlignUp(resultOffset, allocAlignment); + // Apply alignment. + resultOffset = VmaAlignUp(resultOffset, allocAlignment); - // Check previous suballocations for BufferImageGranularity conflicts. - // Make bigger alignment if necessary. - if (bufferImageGranularity > 1 && bufferImageGranularity != allocAlignment && !suballocations1st.empty()) - { - bool bufferImageGranularityConflict = false; - for (size_t prevSuballocIndex = suballocations1st.size(); prevSuballocIndex--; ) - { - const VmaSuballocation& prevSuballoc = suballocations1st[prevSuballocIndex]; - if (VmaBlocksOnSamePage(prevSuballoc.offset, prevSuballoc.size, resultOffset, bufferImageGranularity)) - { - if (VmaIsBufferImageGranularityConflict(prevSuballoc.type, allocType)) - { - bufferImageGranularityConflict = true; - break; - } - } - else - // Already on previous page. - break; - } - if (bufferImageGranularityConflict) - { - resultOffset = VmaAlignUp(resultOffset, bufferImageGranularity); - } - } + // Check previous suballocations for BufferImageGranularity conflicts. + // Make bigger alignment if necessary. + if (bufferImageGranularity > 1 && bufferImageGranularity != allocAlignment && !suballocations1st.empty()) + { + bool bufferImageGranularityConflict = false; + for (size_t prevSuballocIndex = suballocations1st.size(); prevSuballocIndex--; ) + { + const VmaSuballocation& prevSuballoc = suballocations1st[prevSuballocIndex]; + if (VmaBlocksOnSamePage(prevSuballoc.offset, prevSuballoc.size, resultOffset, bufferImageGranularity)) + { + if (VmaIsBufferImageGranularityConflict(prevSuballoc.type, allocType)) + { + bufferImageGranularityConflict = true; + break; + } + } else + // Already on previous page. + break; + } + if (bufferImageGranularityConflict) + { + resultOffset = VmaAlignUp(resultOffset, bufferImageGranularity); + } + } - const VkDeviceSize freeSpaceEnd = m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK ? - suballocations2nd.back().offset : blockSize; + const VkDeviceSize freeSpaceEnd = m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK ? + suballocations2nd.back().offset : blockSize; - // There is enough free space at the end after alignment. - if (resultOffset + allocSize + debugMargin <= freeSpaceEnd) - { - // Check next suballocations for BufferImageGranularity conflicts. - // If conflict exists, allocation cannot be made here. - if ((allocSize % bufferImageGranularity || resultOffset % bufferImageGranularity) && m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK) - { - for (size_t nextSuballocIndex = suballocations2nd.size(); nextSuballocIndex--; ) - { - const VmaSuballocation& nextSuballoc = suballocations2nd[nextSuballocIndex]; - if (VmaBlocksOnSamePage(resultOffset, allocSize, nextSuballoc.offset, bufferImageGranularity)) - { - if (VmaIsBufferImageGranularityConflict(allocType, nextSuballoc.type)) - { - return false; - } - } - else - { - // Already on previous page. - break; - } - } - } + // There is enough free space at the end after alignment. + if (resultOffset + allocSize + debugMargin <= freeSpaceEnd) + { + // Check next suballocations for BufferImageGranularity conflicts. + // If conflict exists, allocation cannot be made here. + if ((allocSize % bufferImageGranularity || resultOffset % bufferImageGranularity) && m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK) + { + for (size_t nextSuballocIndex = suballocations2nd.size(); nextSuballocIndex--; ) + { + const VmaSuballocation& nextSuballoc = suballocations2nd[nextSuballocIndex]; + if (VmaBlocksOnSamePage(resultOffset, allocSize, nextSuballoc.offset, bufferImageGranularity)) + { + if (VmaIsBufferImageGranularityConflict(allocType, nextSuballoc.type)) + { + return false; + } + } else + { + // Already on previous page. + break; + } + } + } - // All tests passed: Success. - pAllocationRequest->allocHandle = (VmaAllocHandle)(resultOffset + 1); - // pAllocationRequest->item, customData unused. - pAllocationRequest->type = VmaAllocationRequestType::EndOf1st; - return true; - } - } + // All tests passed: Success. + pAllocationRequest->allocHandle = (VmaAllocHandle)(resultOffset + 1); + // pAllocationRequest->item, customData unused. + pAllocationRequest->type = VmaAllocationRequestType::EndOf1st; + return true; + } + } - // Wrap-around to end of 2nd vector. Try to allocate there, watching for the - // beginning of 1st vector as the end of free space. - if (m_2ndVectorMode == SECOND_VECTOR_EMPTY || m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER) - { - VMA_ASSERT(!suballocations1st.empty()); + // Wrap-around to end of 2nd vector. Try to allocate there, watching for the + // beginning of 1st vector as the end of free space. + if (m_2ndVectorMode == SECOND_VECTOR_EMPTY || m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER) + { + VMA_ASSERT(!suballocations1st.empty()); - VkDeviceSize resultBaseOffset = 0; - if (!suballocations2nd.empty()) - { - const VmaSuballocation& lastSuballoc = suballocations2nd.back(); - resultBaseOffset = lastSuballoc.offset + lastSuballoc.size + debugMargin; - } + VkDeviceSize resultBaseOffset = 0; + if (!suballocations2nd.empty()) + { + const VmaSuballocation& lastSuballoc = suballocations2nd.back(); + resultBaseOffset = lastSuballoc.offset + lastSuballoc.size + debugMargin; + } - // Start from offset equal to beginning of free space. - VkDeviceSize resultOffset = resultBaseOffset; + // Start from offset equal to beginning of free space. + VkDeviceSize resultOffset = resultBaseOffset; - // Apply alignment. - resultOffset = VmaAlignUp(resultOffset, allocAlignment); + // Apply alignment. + resultOffset = VmaAlignUp(resultOffset, allocAlignment); - // Check previous suballocations for BufferImageGranularity conflicts. - // Make bigger alignment if necessary. - if (bufferImageGranularity > 1 && bufferImageGranularity != allocAlignment && !suballocations2nd.empty()) - { - bool bufferImageGranularityConflict = false; - for (size_t prevSuballocIndex = suballocations2nd.size(); prevSuballocIndex--; ) - { - const VmaSuballocation& prevSuballoc = suballocations2nd[prevSuballocIndex]; - if (VmaBlocksOnSamePage(prevSuballoc.offset, prevSuballoc.size, resultOffset, bufferImageGranularity)) - { - if (VmaIsBufferImageGranularityConflict(prevSuballoc.type, allocType)) - { - bufferImageGranularityConflict = true; - break; - } - } - else - // Already on previous page. - break; - } - if (bufferImageGranularityConflict) - { - resultOffset = VmaAlignUp(resultOffset, bufferImageGranularity); - } - } + // Check previous suballocations for BufferImageGranularity conflicts. + // Make bigger alignment if necessary. + if (bufferImageGranularity > 1 && bufferImageGranularity != allocAlignment && !suballocations2nd.empty()) + { + bool bufferImageGranularityConflict = false; + for (size_t prevSuballocIndex = suballocations2nd.size(); prevSuballocIndex--; ) + { + const VmaSuballocation& prevSuballoc = suballocations2nd[prevSuballocIndex]; + if (VmaBlocksOnSamePage(prevSuballoc.offset, prevSuballoc.size, resultOffset, bufferImageGranularity)) + { + if (VmaIsBufferImageGranularityConflict(prevSuballoc.type, allocType)) + { + bufferImageGranularityConflict = true; + break; + } + } else + // Already on previous page. + break; + } + if (bufferImageGranularityConflict) + { + resultOffset = VmaAlignUp(resultOffset, bufferImageGranularity); + } + } - size_t index1st = m_1stNullItemsBeginCount; + size_t index1st = m_1stNullItemsBeginCount; - // There is enough free space at the end after alignment. - if ((index1st == suballocations1st.size() && resultOffset + allocSize + debugMargin <= blockSize) || - (index1st < suballocations1st.size() && resultOffset + allocSize + debugMargin <= suballocations1st[index1st].offset)) - { - // Check next suballocations for BufferImageGranularity conflicts. - // If conflict exists, allocation cannot be made here. - if (allocSize % bufferImageGranularity || resultOffset % bufferImageGranularity) - { - for (size_t nextSuballocIndex = index1st; - nextSuballocIndex < suballocations1st.size(); - nextSuballocIndex++) - { - const VmaSuballocation& nextSuballoc = suballocations1st[nextSuballocIndex]; - if (VmaBlocksOnSamePage(resultOffset, allocSize, nextSuballoc.offset, bufferImageGranularity)) - { - if (VmaIsBufferImageGranularityConflict(allocType, nextSuballoc.type)) - { - return false; - } - } - else - { - // Already on next page. - break; - } - } - } + // There is enough free space at the end after alignment. + if ((index1st == suballocations1st.size() && resultOffset + allocSize + debugMargin <= blockSize) || + (index1st < suballocations1st.size() && resultOffset + allocSize + debugMargin <= suballocations1st[index1st].offset)) + { + // Check next suballocations for BufferImageGranularity conflicts. + // If conflict exists, allocation cannot be made here. + if (allocSize % bufferImageGranularity || resultOffset % bufferImageGranularity) + { + for (size_t nextSuballocIndex = index1st; + nextSuballocIndex < suballocations1st.size(); + nextSuballocIndex++) + { + const VmaSuballocation& nextSuballoc = suballocations1st[nextSuballocIndex]; + if (VmaBlocksOnSamePage(resultOffset, allocSize, nextSuballoc.offset, bufferImageGranularity)) + { + if (VmaIsBufferImageGranularityConflict(allocType, nextSuballoc.type)) + { + return false; + } + } else + { + // Already on next page. + break; + } + } + } - // All tests passed: Success. - pAllocationRequest->allocHandle = (VmaAllocHandle)(resultOffset + 1); - pAllocationRequest->type = VmaAllocationRequestType::EndOf2nd; - // pAllocationRequest->item, customData unused. - return true; - } - } + // All tests passed: Success. + pAllocationRequest->allocHandle = (VmaAllocHandle)(resultOffset + 1); + pAllocationRequest->type = VmaAllocationRequestType::EndOf2nd; + // pAllocationRequest->item, customData unused. + return true; + } + } - return false; + return false; } bool VmaBlockMetadata_Linear::CreateAllocationRequest_UpperAddress( - VkDeviceSize allocSize, - VkDeviceSize allocAlignment, - VmaSuballocationType allocType, - uint32_t strategy, - VmaAllocationRequest* pAllocationRequest) + VkDeviceSize allocSize, + VkDeviceSize allocAlignment, + VmaSuballocationType allocType, + uint32_t strategy, + VmaAllocationRequest* pAllocationRequest) { - const VkDeviceSize blockSize = GetSize(); - const VkDeviceSize bufferImageGranularity = GetBufferImageGranularity(); - SuballocationVectorType& suballocations1st = AccessSuballocations1st(); - SuballocationVectorType& suballocations2nd = AccessSuballocations2nd(); + const VkDeviceSize blockSize = GetSize(); + const VkDeviceSize bufferImageGranularity = GetBufferImageGranularity(); + SuballocationVectorType& suballocations1st = AccessSuballocations1st(); + SuballocationVectorType& suballocations2nd = AccessSuballocations2nd(); - if (m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER) - { - VMA_ASSERT(0 && "Trying to use pool with linear algorithm as double stack, while it is already being used as ring buffer."); - return false; - } + if (m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER) + { + VMA_ASSERT(0 && "Trying to use pool with linear algorithm as double stack, while it is already being used as ring buffer."); + return false; + } - // Try to allocate before 2nd.back(), or end of block if 2nd.empty(). - if (allocSize > blockSize) - { - return false; - } - VkDeviceSize resultBaseOffset = blockSize - allocSize; - if (!suballocations2nd.empty()) - { - const VmaSuballocation& lastSuballoc = suballocations2nd.back(); - resultBaseOffset = lastSuballoc.offset - allocSize; - if (allocSize > lastSuballoc.offset) - { - return false; - } - } + // Try to allocate before 2nd.back(), or end of block if 2nd.empty(). + if (allocSize > blockSize) + { + return false; + } + VkDeviceSize resultBaseOffset = blockSize - allocSize; + if (!suballocations2nd.empty()) + { + const VmaSuballocation& lastSuballoc = suballocations2nd.back(); + resultBaseOffset = lastSuballoc.offset - allocSize; + if (allocSize > lastSuballoc.offset) + { + return false; + } + } - // Start from offset equal to end of free space. - VkDeviceSize resultOffset = resultBaseOffset; + // Start from offset equal to end of free space. + VkDeviceSize resultOffset = resultBaseOffset; - const VkDeviceSize debugMargin = GetDebugMargin(); + const VkDeviceSize debugMargin = GetDebugMargin(); - // Apply debugMargin at the end. - if (debugMargin > 0) - { - if (resultOffset < debugMargin) - { - return false; - } - resultOffset -= debugMargin; - } + // Apply debugMargin at the end. + if (debugMargin > 0) + { + if (resultOffset < debugMargin) + { + return false; + } + resultOffset -= debugMargin; + } - // Apply alignment. - resultOffset = VmaAlignDown(resultOffset, allocAlignment); + // Apply alignment. + resultOffset = VmaAlignDown(resultOffset, allocAlignment); - // Check next suballocations from 2nd for BufferImageGranularity conflicts. - // Make bigger alignment if necessary. - if (bufferImageGranularity > 1 && bufferImageGranularity != allocAlignment && !suballocations2nd.empty()) - { - bool bufferImageGranularityConflict = false; - for (size_t nextSuballocIndex = suballocations2nd.size(); nextSuballocIndex--; ) - { - const VmaSuballocation& nextSuballoc = suballocations2nd[nextSuballocIndex]; - if (VmaBlocksOnSamePage(resultOffset, allocSize, nextSuballoc.offset, bufferImageGranularity)) - { - if (VmaIsBufferImageGranularityConflict(nextSuballoc.type, allocType)) - { - bufferImageGranularityConflict = true; - break; - } - } - else - // Already on previous page. - break; - } - if (bufferImageGranularityConflict) - { - resultOffset = VmaAlignDown(resultOffset, bufferImageGranularity); - } - } + // Check next suballocations from 2nd for BufferImageGranularity conflicts. + // Make bigger alignment if necessary. + if (bufferImageGranularity > 1 && bufferImageGranularity != allocAlignment && !suballocations2nd.empty()) + { + bool bufferImageGranularityConflict = false; + for (size_t nextSuballocIndex = suballocations2nd.size(); nextSuballocIndex--; ) + { + const VmaSuballocation& nextSuballoc = suballocations2nd[nextSuballocIndex]; + if (VmaBlocksOnSamePage(resultOffset, allocSize, nextSuballoc.offset, bufferImageGranularity)) + { + if (VmaIsBufferImageGranularityConflict(nextSuballoc.type, allocType)) + { + bufferImageGranularityConflict = true; + break; + } + } else + // Already on previous page. + break; + } + if (bufferImageGranularityConflict) + { + resultOffset = VmaAlignDown(resultOffset, bufferImageGranularity); + } + } - // There is enough free space. - const VkDeviceSize endOf1st = !suballocations1st.empty() ? - suballocations1st.back().offset + suballocations1st.back().size : - 0; - if (endOf1st + debugMargin <= resultOffset) - { - // Check previous suballocations for BufferImageGranularity conflicts. - // If conflict exists, allocation cannot be made here. - if (bufferImageGranularity > 1) - { - for (size_t prevSuballocIndex = suballocations1st.size(); prevSuballocIndex--; ) - { - const VmaSuballocation& prevSuballoc = suballocations1st[prevSuballocIndex]; - if (VmaBlocksOnSamePage(prevSuballoc.offset, prevSuballoc.size, resultOffset, bufferImageGranularity)) - { - if (VmaIsBufferImageGranularityConflict(allocType, prevSuballoc.type)) - { - return false; - } - } - else - { - // Already on next page. - break; - } - } - } + // There is enough free space. + const VkDeviceSize endOf1st = !suballocations1st.empty() ? + suballocations1st.back().offset + suballocations1st.back().size : + 0; + if (endOf1st + debugMargin <= resultOffset) + { + // Check previous suballocations for BufferImageGranularity conflicts. + // If conflict exists, allocation cannot be made here. + if (bufferImageGranularity > 1) + { + for (size_t prevSuballocIndex = suballocations1st.size(); prevSuballocIndex--; ) + { + const VmaSuballocation& prevSuballoc = suballocations1st[prevSuballocIndex]; + if (VmaBlocksOnSamePage(prevSuballoc.offset, prevSuballoc.size, resultOffset, bufferImageGranularity)) + { + if (VmaIsBufferImageGranularityConflict(allocType, prevSuballoc.type)) + { + return false; + } + } else + { + // Already on next page. + break; + } + } + } - // All tests passed: Success. - pAllocationRequest->allocHandle = (VmaAllocHandle)(resultOffset + 1); - // pAllocationRequest->item unused. - pAllocationRequest->type = VmaAllocationRequestType::UpperAddress; - return true; - } + // All tests passed: Success. + pAllocationRequest->allocHandle = (VmaAllocHandle)(resultOffset + 1); + // pAllocationRequest->item unused. + pAllocationRequest->type = VmaAllocationRequestType::UpperAddress; + return true; + } - return false; + return false; } #endif // _VMA_BLOCK_METADATA_LINEAR_FUNCTIONS #endif // _VMA_BLOCK_METADATA_LINEAR -#if 0 -#ifndef _VMA_BLOCK_METADATA_BUDDY -/* -- GetSize() is the original size of allocated memory block. -- m_UsableSize is this size aligned down to a power of two. - All allocations and calculations happen relative to m_UsableSize. -- GetUnusableSize() is the difference between them. - It is reported as separate, unused range, not available for allocations. - -Node at level 0 has size = m_UsableSize. -Each next level contains nodes with size 2 times smaller than current level. -m_LevelCount is the maximum number of levels to use in the current object. -*/ -class VmaBlockMetadata_Buddy : public VmaBlockMetadata -{ - VMA_CLASS_NO_COPY(VmaBlockMetadata_Buddy) -public: - VmaBlockMetadata_Buddy(const VkAllocationCallbacks* pAllocationCallbacks, - VkDeviceSize bufferImageGranularity, bool isVirtual); - virtual ~VmaBlockMetadata_Buddy(); - - size_t GetAllocationCount() const override { return m_AllocationCount; } - VkDeviceSize GetSumFreeSize() const override { return m_SumFreeSize + GetUnusableSize(); } - bool IsEmpty() const override { return m_Root->type == Node::TYPE_FREE; } - VkResult CheckCorruption(const void* pBlockData) override { return VK_ERROR_FEATURE_NOT_PRESENT; } - VkDeviceSize GetAllocationOffset(VmaAllocHandle allocHandle) const override { return (VkDeviceSize)allocHandle - 1; }; - void DebugLogAllAllocations() const override { DebugLogAllAllocationNode(m_Root, 0); } - - void Init(VkDeviceSize size) override; - bool Validate() const override; - - void AddDetailedStatistics(VmaDetailedStatistics& inoutStats) const override; - void AddStatistics(VmaStatistics& inoutStats) const override; - -#if VMA_STATS_STRING_ENABLED - void PrintDetailedMap(class VmaJsonWriter& json, uint32_t mapRefCount) const override; -#endif - - bool CreateAllocationRequest( - VkDeviceSize allocSize, - VkDeviceSize allocAlignment, - bool upperAddress, - VmaSuballocationType allocType, - uint32_t strategy, - VmaAllocationRequest* pAllocationRequest) override; - - void Alloc( - const VmaAllocationRequest& request, - VmaSuballocationType type, - void* userData) override; - - void Free(VmaAllocHandle allocHandle) override; - void GetAllocationInfo(VmaAllocHandle allocHandle, VmaVirtualAllocationInfo& outInfo) override; - void* GetAllocationUserData(VmaAllocHandle allocHandle) const override; - VmaAllocHandle GetAllocationListBegin() const override; - VmaAllocHandle GetNextAllocation(VmaAllocHandle prevAlloc) const override; - void Clear() override; - void SetAllocationUserData(VmaAllocHandle allocHandle, void* userData) override; - -private: - static const size_t MAX_LEVELS = 48; - - struct ValidationContext - { - size_t calculatedAllocationCount = 0; - size_t calculatedFreeCount = 0; - VkDeviceSize calculatedSumFreeSize = 0; - }; - struct Node - { - VkDeviceSize offset; - enum TYPE - { - TYPE_FREE, - TYPE_ALLOCATION, - TYPE_SPLIT, - TYPE_COUNT - } type; - Node* parent; - Node* buddy; - - union - { - struct - { - Node* prev; - Node* next; - } free; - struct - { - void* userData; - } allocation; - struct - { - Node* leftChild; - } split; - }; - }; - - // Size of the memory block aligned down to a power of two. - VkDeviceSize m_UsableSize; - uint32_t m_LevelCount; - VmaPoolAllocator m_NodeAllocator; - Node* m_Root; - struct - { - Node* front; - Node* back; - } m_FreeList[MAX_LEVELS]; - - // Number of nodes in the tree with type == TYPE_ALLOCATION. - size_t m_AllocationCount; - // Number of nodes in the tree with type == TYPE_FREE. - size_t m_FreeCount; - // Doesn't include space wasted due to internal fragmentation - allocation sizes are just aligned up to node sizes. - // Doesn't include unusable size. - VkDeviceSize m_SumFreeSize; - - VkDeviceSize GetUnusableSize() const { return GetSize() - m_UsableSize; } - VkDeviceSize LevelToNodeSize(uint32_t level) const { return m_UsableSize >> level; } - - VkDeviceSize AlignAllocationSize(VkDeviceSize size) const - { - if (!IsVirtual()) - { - size = VmaAlignUp(size, (VkDeviceSize)16); - } - return VmaNextPow2(size); - } - Node* FindAllocationNode(VkDeviceSize offset, uint32_t& outLevel) const; - void DeleteNodeChildren(Node* node); - bool ValidateNode(ValidationContext& ctx, const Node* parent, const Node* curr, uint32_t level, VkDeviceSize levelNodeSize) const; - uint32_t AllocSizeToLevel(VkDeviceSize allocSize) const; - void AddNodeToDetailedStatistics(VmaDetailedStatistics& inoutStats, const Node* node, VkDeviceSize levelNodeSize) const; - // Adds node to the front of FreeList at given level. - // node->type must be FREE. - // node->free.prev, next can be undefined. - void AddToFreeListFront(uint32_t level, Node* node); - // Removes node from FreeList at given level. - // node->type must be FREE. - // node->free.prev, next stay untouched. - void RemoveFromFreeList(uint32_t level, Node* node); - void DebugLogAllAllocationNode(Node* node, uint32_t level) const; - -#if VMA_STATS_STRING_ENABLED - void PrintDetailedMapNode(class VmaJsonWriter& json, const Node* node, VkDeviceSize levelNodeSize) const; -#endif -}; - -#ifndef _VMA_BLOCK_METADATA_BUDDY_FUNCTIONS -VmaBlockMetadata_Buddy::VmaBlockMetadata_Buddy(const VkAllocationCallbacks* pAllocationCallbacks, - VkDeviceSize bufferImageGranularity, bool isVirtual) - : VmaBlockMetadata(pAllocationCallbacks, bufferImageGranularity, isVirtual), - m_NodeAllocator(pAllocationCallbacks, 32), // firstBlockCapacity - m_Root(VMA_NULL), - m_AllocationCount(0), - m_FreeCount(1), - m_SumFreeSize(0) -{ - memset(m_FreeList, 0, sizeof(m_FreeList)); -} - -VmaBlockMetadata_Buddy::~VmaBlockMetadata_Buddy() -{ - DeleteNodeChildren(m_Root); - m_NodeAllocator.Free(m_Root); -} - -void VmaBlockMetadata_Buddy::Init(VkDeviceSize size) -{ - VmaBlockMetadata::Init(size); - - m_UsableSize = VmaPrevPow2(size); - m_SumFreeSize = m_UsableSize; - - // Calculate m_LevelCount. - const VkDeviceSize minNodeSize = IsVirtual() ? 1 : 16; - m_LevelCount = 1; - while (m_LevelCount < MAX_LEVELS && - LevelToNodeSize(m_LevelCount) >= minNodeSize) - { - ++m_LevelCount; - } - - Node* rootNode = m_NodeAllocator.Alloc(); - rootNode->offset = 0; - rootNode->type = Node::TYPE_FREE; - rootNode->parent = VMA_NULL; - rootNode->buddy = VMA_NULL; - - m_Root = rootNode; - AddToFreeListFront(0, rootNode); -} - -bool VmaBlockMetadata_Buddy::Validate() const -{ - // Validate tree. - ValidationContext ctx; - if (!ValidateNode(ctx, VMA_NULL, m_Root, 0, LevelToNodeSize(0))) - { - VMA_VALIDATE(false && "ValidateNode failed."); - } - VMA_VALIDATE(m_AllocationCount == ctx.calculatedAllocationCount); - VMA_VALIDATE(m_SumFreeSize == ctx.calculatedSumFreeSize); - - // Validate free node lists. - for (uint32_t level = 0; level < m_LevelCount; ++level) - { - VMA_VALIDATE(m_FreeList[level].front == VMA_NULL || - m_FreeList[level].front->free.prev == VMA_NULL); - - for (Node* node = m_FreeList[level].front; - node != VMA_NULL; - node = node->free.next) - { - VMA_VALIDATE(node->type == Node::TYPE_FREE); - - if (node->free.next == VMA_NULL) - { - VMA_VALIDATE(m_FreeList[level].back == node); - } - else - { - VMA_VALIDATE(node->free.next->free.prev == node); - } - } - } - - // Validate that free lists ar higher levels are empty. - for (uint32_t level = m_LevelCount; level < MAX_LEVELS; ++level) - { - VMA_VALIDATE(m_FreeList[level].front == VMA_NULL && m_FreeList[level].back == VMA_NULL); - } - - return true; -} - -void VmaBlockMetadata_Buddy::AddDetailedStatistics(VmaDetailedStatistics& inoutStats) const -{ - inoutStats.statistics.blockCount++; - inoutStats.statistics.blockBytes += GetSize(); - - AddNodeToDetailedStatistics(inoutStats, m_Root, LevelToNodeSize(0)); - - const VkDeviceSize unusableSize = GetUnusableSize(); - if (unusableSize > 0) - VmaAddDetailedStatisticsUnusedRange(inoutStats, unusableSize); -} - -void VmaBlockMetadata_Buddy::AddStatistics(VmaStatistics& inoutStats) const -{ - inoutStats.blockCount++; - inoutStats.allocationCount += (uint32_t)m_AllocationCount; - inoutStats.blockBytes += GetSize(); - inoutStats.allocationBytes += GetSize() - m_SumFreeSize; -} - -#if VMA_STATS_STRING_ENABLED -void VmaBlockMetadata_Buddy::PrintDetailedMap(class VmaJsonWriter& json, uint32_t mapRefCount) const -{ - VmaDetailedStatistics stats; - VmaClearDetailedStatistics(stats); - AddDetailedStatistics(stats); - - PrintDetailedMap_Begin( - json, - stats.statistics.blockBytes - stats.statistics.allocationBytes, - stats.statistics.allocationCount, - stats.unusedRangeCount, - mapRefCount); - - PrintDetailedMapNode(json, m_Root, LevelToNodeSize(0)); - - const VkDeviceSize unusableSize = GetUnusableSize(); - if (unusableSize > 0) - { - PrintDetailedMap_UnusedRange(json, - m_UsableSize, // offset - unusableSize); // size - } - - PrintDetailedMap_End(json); -} -#endif // VMA_STATS_STRING_ENABLED - -bool VmaBlockMetadata_Buddy::CreateAllocationRequest( - VkDeviceSize allocSize, - VkDeviceSize allocAlignment, - bool upperAddress, - VmaSuballocationType allocType, - uint32_t strategy, - VmaAllocationRequest* pAllocationRequest) -{ - VMA_ASSERT(!upperAddress && "VMA_ALLOCATION_CREATE_UPPER_ADDRESS_BIT can be used only with linear algorithm."); - - allocSize = AlignAllocationSize(allocSize); - - // Simple way to respect bufferImageGranularity. May be optimized some day. - // Whenever it might be an OPTIMAL image... - if (allocType == VMA_SUBALLOCATION_TYPE_UNKNOWN || - allocType == VMA_SUBALLOCATION_TYPE_IMAGE_UNKNOWN || - allocType == VMA_SUBALLOCATION_TYPE_IMAGE_OPTIMAL) - { - allocAlignment = VMA_MAX(allocAlignment, GetBufferImageGranularity()); - allocSize = VmaAlignUp(allocSize, GetBufferImageGranularity()); - } - - if (allocSize > m_UsableSize) - { - return false; - } - - const uint32_t targetLevel = AllocSizeToLevel(allocSize); - for (uint32_t level = targetLevel; level--; ) - { - for (Node* freeNode = m_FreeList[level].front; - freeNode != VMA_NULL; - freeNode = freeNode->free.next) - { - if (freeNode->offset % allocAlignment == 0) - { - pAllocationRequest->type = VmaAllocationRequestType::Normal; - pAllocationRequest->allocHandle = (VmaAllocHandle)(freeNode->offset + 1); - pAllocationRequest->size = allocSize; - pAllocationRequest->customData = (void*)(uintptr_t)level; - return true; - } - } - } - - return false; -} - -void VmaBlockMetadata_Buddy::Alloc( - const VmaAllocationRequest& request, - VmaSuballocationType type, - void* userData) -{ - VMA_ASSERT(request.type == VmaAllocationRequestType::Normal); - - const uint32_t targetLevel = AllocSizeToLevel(request.size); - uint32_t currLevel = (uint32_t)(uintptr_t)request.customData; - - Node* currNode = m_FreeList[currLevel].front; - VMA_ASSERT(currNode != VMA_NULL && currNode->type == Node::TYPE_FREE); - const VkDeviceSize offset = (VkDeviceSize)request.allocHandle - 1; - while (currNode->offset != offset) - { - currNode = currNode->free.next; - VMA_ASSERT(currNode != VMA_NULL && currNode->type == Node::TYPE_FREE); - } - - // Go down, splitting free nodes. - while (currLevel < targetLevel) - { - // currNode is already first free node at currLevel. - // Remove it from list of free nodes at this currLevel. - RemoveFromFreeList(currLevel, currNode); - - const uint32_t childrenLevel = currLevel + 1; - - // Create two free sub-nodes. - Node* leftChild = m_NodeAllocator.Alloc(); - Node* rightChild = m_NodeAllocator.Alloc(); - - leftChild->offset = currNode->offset; - leftChild->type = Node::TYPE_FREE; - leftChild->parent = currNode; - leftChild->buddy = rightChild; - - rightChild->offset = currNode->offset + LevelToNodeSize(childrenLevel); - rightChild->type = Node::TYPE_FREE; - rightChild->parent = currNode; - rightChild->buddy = leftChild; - - // Convert current currNode to split type. - currNode->type = Node::TYPE_SPLIT; - currNode->split.leftChild = leftChild; - - // Add child nodes to free list. Order is important! - AddToFreeListFront(childrenLevel, rightChild); - AddToFreeListFront(childrenLevel, leftChild); - - ++m_FreeCount; - ++currLevel; - currNode = m_FreeList[currLevel].front; - - /* - We can be sure that currNode, as left child of node previously split, - also fulfills the alignment requirement. - */ - } - - // Remove from free list. - VMA_ASSERT(currLevel == targetLevel && - currNode != VMA_NULL && - currNode->type == Node::TYPE_FREE); - RemoveFromFreeList(currLevel, currNode); - - // Convert to allocation node. - currNode->type = Node::TYPE_ALLOCATION; - currNode->allocation.userData = userData; - - ++m_AllocationCount; - --m_FreeCount; - m_SumFreeSize -= request.size; -} - -void VmaBlockMetadata_Buddy::GetAllocationInfo(VmaAllocHandle allocHandle, VmaVirtualAllocationInfo& outInfo) -{ - uint32_t level = 0; - outInfo.offset = (VkDeviceSize)allocHandle - 1; - const Node* const node = FindAllocationNode(outInfo.offset, level); - outInfo.size = LevelToNodeSize(level); - outInfo.pUserData = node->allocation.userData; -} - -void* VmaBlockMetadata_Buddy::GetAllocationUserData(VmaAllocHandle allocHandle) const -{ - uint32_t level = 0; - const Node* const node = FindAllocationNode((VkDeviceSize)allocHandle - 1, level); - return node->allocation.userData; -} - -VmaAllocHandle VmaBlockMetadata_Buddy::GetAllocationListBegin() const -{ - // Function only used for defragmentation, which is disabled for this algorithm - return VK_NULL_HANDLE; -} - -VmaAllocHandle VmaBlockMetadata_Buddy::GetNextAllocation(VmaAllocHandle prevAlloc) const -{ - // Function only used for defragmentation, which is disabled for this algorithm - return VK_NULL_HANDLE; -} - -void VmaBlockMetadata_Buddy::DeleteNodeChildren(Node* node) -{ - if (node->type == Node::TYPE_SPLIT) - { - DeleteNodeChildren(node->split.leftChild->buddy); - DeleteNodeChildren(node->split.leftChild); - const VkAllocationCallbacks* allocationCallbacks = GetAllocationCallbacks(); - m_NodeAllocator.Free(node->split.leftChild->buddy); - m_NodeAllocator.Free(node->split.leftChild); - } -} - -void VmaBlockMetadata_Buddy::Clear() -{ - DeleteNodeChildren(m_Root); - m_Root->type = Node::TYPE_FREE; - m_AllocationCount = 0; - m_FreeCount = 1; - m_SumFreeSize = m_UsableSize; -} - -void VmaBlockMetadata_Buddy::SetAllocationUserData(VmaAllocHandle allocHandle, void* userData) -{ - uint32_t level = 0; - Node* const node = FindAllocationNode((VkDeviceSize)allocHandle - 1, level); - node->allocation.userData = userData; -} - -VmaBlockMetadata_Buddy::Node* VmaBlockMetadata_Buddy::FindAllocationNode(VkDeviceSize offset, uint32_t& outLevel) const -{ - Node* node = m_Root; - VkDeviceSize nodeOffset = 0; - outLevel = 0; - VkDeviceSize levelNodeSize = LevelToNodeSize(0); - while (node->type == Node::TYPE_SPLIT) - { - const VkDeviceSize nextLevelNodeSize = levelNodeSize >> 1; - if (offset < nodeOffset + nextLevelNodeSize) - { - node = node->split.leftChild; - } - else - { - node = node->split.leftChild->buddy; - nodeOffset += nextLevelNodeSize; - } - ++outLevel; - levelNodeSize = nextLevelNodeSize; - } - - VMA_ASSERT(node != VMA_NULL && node->type == Node::TYPE_ALLOCATION); - return node; -} - -bool VmaBlockMetadata_Buddy::ValidateNode(ValidationContext& ctx, const Node* parent, const Node* curr, uint32_t level, VkDeviceSize levelNodeSize) const -{ - VMA_VALIDATE(level < m_LevelCount); - VMA_VALIDATE(curr->parent == parent); - VMA_VALIDATE((curr->buddy == VMA_NULL) == (parent == VMA_NULL)); - VMA_VALIDATE(curr->buddy == VMA_NULL || curr->buddy->buddy == curr); - switch (curr->type) - { - case Node::TYPE_FREE: - // curr->free.prev, next are validated separately. - ctx.calculatedSumFreeSize += levelNodeSize; - ++ctx.calculatedFreeCount; - break; - case Node::TYPE_ALLOCATION: - ++ctx.calculatedAllocationCount; - if (!IsVirtual()) - { - VMA_VALIDATE(curr->allocation.userData != VMA_NULL); - } - break; - case Node::TYPE_SPLIT: - { - const uint32_t childrenLevel = level + 1; - const VkDeviceSize childrenLevelNodeSize = levelNodeSize >> 1; - const Node* const leftChild = curr->split.leftChild; - VMA_VALIDATE(leftChild != VMA_NULL); - VMA_VALIDATE(leftChild->offset == curr->offset); - if (!ValidateNode(ctx, curr, leftChild, childrenLevel, childrenLevelNodeSize)) - { - VMA_VALIDATE(false && "ValidateNode for left child failed."); - } - const Node* const rightChild = leftChild->buddy; - VMA_VALIDATE(rightChild->offset == curr->offset + childrenLevelNodeSize); - if (!ValidateNode(ctx, curr, rightChild, childrenLevel, childrenLevelNodeSize)) - { - VMA_VALIDATE(false && "ValidateNode for right child failed."); - } - } - break; - default: - return false; - } - - return true; -} - -uint32_t VmaBlockMetadata_Buddy::AllocSizeToLevel(VkDeviceSize allocSize) const -{ - // I know this could be optimized somehow e.g. by using std::log2p1 from C++20. - uint32_t level = 0; - VkDeviceSize currLevelNodeSize = m_UsableSize; - VkDeviceSize nextLevelNodeSize = currLevelNodeSize >> 1; - while (allocSize <= nextLevelNodeSize && level + 1 < m_LevelCount) - { - ++level; - currLevelNodeSize >>= 1; - nextLevelNodeSize >>= 1; - } - return level; -} - -void VmaBlockMetadata_Buddy::Free(VmaAllocHandle allocHandle) -{ - uint32_t level = 0; - Node* node = FindAllocationNode((VkDeviceSize)allocHandle - 1, level); - - ++m_FreeCount; - --m_AllocationCount; - m_SumFreeSize += LevelToNodeSize(level); - - node->type = Node::TYPE_FREE; - - // Join free nodes if possible. - while (level > 0 && node->buddy->type == Node::TYPE_FREE) - { - RemoveFromFreeList(level, node->buddy); - Node* const parent = node->parent; - - m_NodeAllocator.Free(node->buddy); - m_NodeAllocator.Free(node); - parent->type = Node::TYPE_FREE; - - node = parent; - --level; - --m_FreeCount; - } - - AddToFreeListFront(level, node); -} - -void VmaBlockMetadata_Buddy::AddNodeToDetailedStatistics(VmaDetailedStatistics& inoutStats, const Node* node, VkDeviceSize levelNodeSize) const -{ - switch (node->type) - { - case Node::TYPE_FREE: - VmaAddDetailedStatisticsUnusedRange(inoutStats, levelNodeSize); - break; - case Node::TYPE_ALLOCATION: - VmaAddDetailedStatisticsAllocation(inoutStats, levelNodeSize); - break; - case Node::TYPE_SPLIT: - { - const VkDeviceSize childrenNodeSize = levelNodeSize / 2; - const Node* const leftChild = node->split.leftChild; - AddNodeToDetailedStatistics(inoutStats, leftChild, childrenNodeSize); - const Node* const rightChild = leftChild->buddy; - AddNodeToDetailedStatistics(inoutStats, rightChild, childrenNodeSize); - } - break; - default: - VMA_ASSERT(0); - } -} - -void VmaBlockMetadata_Buddy::AddToFreeListFront(uint32_t level, Node* node) -{ - VMA_ASSERT(node->type == Node::TYPE_FREE); - - // List is empty. - Node* const frontNode = m_FreeList[level].front; - if (frontNode == VMA_NULL) - { - VMA_ASSERT(m_FreeList[level].back == VMA_NULL); - node->free.prev = node->free.next = VMA_NULL; - m_FreeList[level].front = m_FreeList[level].back = node; - } - else - { - VMA_ASSERT(frontNode->free.prev == VMA_NULL); - node->free.prev = VMA_NULL; - node->free.next = frontNode; - frontNode->free.prev = node; - m_FreeList[level].front = node; - } -} - -void VmaBlockMetadata_Buddy::RemoveFromFreeList(uint32_t level, Node* node) -{ - VMA_ASSERT(m_FreeList[level].front != VMA_NULL); - - // It is at the front. - if (node->free.prev == VMA_NULL) - { - VMA_ASSERT(m_FreeList[level].front == node); - m_FreeList[level].front = node->free.next; - } - else - { - Node* const prevFreeNode = node->free.prev; - VMA_ASSERT(prevFreeNode->free.next == node); - prevFreeNode->free.next = node->free.next; - } - - // It is at the back. - if (node->free.next == VMA_NULL) - { - VMA_ASSERT(m_FreeList[level].back == node); - m_FreeList[level].back = node->free.prev; - } - else - { - Node* const nextFreeNode = node->free.next; - VMA_ASSERT(nextFreeNode->free.prev == node); - nextFreeNode->free.prev = node->free.prev; - } -} - -void VmaBlockMetadata_Buddy::DebugLogAllAllocationNode(Node* node, uint32_t level) const -{ - switch (node->type) - { - case Node::TYPE_FREE: - break; - case Node::TYPE_ALLOCATION: - DebugLogAllocation(node->offset, LevelToNodeSize(level), node->allocation.userData); - break; - case Node::TYPE_SPLIT: - { - ++level; - DebugLogAllAllocationNode(node->split.leftChild, level); - DebugLogAllAllocationNode(node->split.leftChild->buddy, level); - } - break; - default: - VMA_ASSERT(0); - } -} - -#if VMA_STATS_STRING_ENABLED -void VmaBlockMetadata_Buddy::PrintDetailedMapNode(class VmaJsonWriter& json, const Node* node, VkDeviceSize levelNodeSize) const -{ - switch (node->type) - { - case Node::TYPE_FREE: - PrintDetailedMap_UnusedRange(json, node->offset, levelNodeSize); - break; - case Node::TYPE_ALLOCATION: - PrintDetailedMap_Allocation(json, node->offset, levelNodeSize, node->allocation.userData); - break; - case Node::TYPE_SPLIT: - { - const VkDeviceSize childrenNodeSize = levelNodeSize / 2; - const Node* const leftChild = node->split.leftChild; - PrintDetailedMapNode(json, leftChild, childrenNodeSize); - const Node* const rightChild = leftChild->buddy; - PrintDetailedMapNode(json, rightChild, childrenNodeSize); - } - break; - default: - VMA_ASSERT(0); - } -} -#endif // VMA_STATS_STRING_ENABLED -#endif // _VMA_BLOCK_METADATA_BUDDY_FUNCTIONS -#endif // _VMA_BLOCK_METADATA_BUDDY -#endif // #if 0 - #ifndef _VMA_BLOCK_METADATA_TLSF // To not search current larger region if first allocation won't succeed and skip to smaller range // use with VMA_ALLOCATION_CREATE_STRATEGY_MIN_MEMORY_BIT as strategy in CreateAllocationRequest(). @@ -9980,931 +8604,922 @@ void VmaBlockMetadata_Buddy::PrintDetailedMapNode(class VmaJsonWriter& json, con // VMA_ALLOCATION_CREATE_STRATEGY_MIN_TIME_BIT for fastest alloc time possible. class VmaBlockMetadata_TLSF : public VmaBlockMetadata { - VMA_CLASS_NO_COPY(VmaBlockMetadata_TLSF) + VMA_CLASS_NO_COPY_NO_MOVE(VmaBlockMetadata_TLSF) public: - VmaBlockMetadata_TLSF(const VkAllocationCallbacks* pAllocationCallbacks, - VkDeviceSize bufferImageGranularity, bool isVirtual); - virtual ~VmaBlockMetadata_TLSF(); + VmaBlockMetadata_TLSF(const VkAllocationCallbacks* pAllocationCallbacks, + VkDeviceSize bufferImageGranularity, bool isVirtual); + virtual ~VmaBlockMetadata_TLSF(); - size_t GetAllocationCount() const override { return m_AllocCount; } - size_t GetFreeRegionsCount() const override { return m_BlocksFreeCount + 1; } - VkDeviceSize GetSumFreeSize() const override { return m_BlocksFreeSize + m_NullBlock->size; } - bool IsEmpty() const override { return m_NullBlock->offset == 0; } - VkDeviceSize GetAllocationOffset(VmaAllocHandle allocHandle) const override { return ((Block*)allocHandle)->offset; }; + size_t GetAllocationCount() const override { return m_AllocCount; } + size_t GetFreeRegionsCount() const override { return m_BlocksFreeCount + 1; } + VkDeviceSize GetSumFreeSize() const override { return m_BlocksFreeSize + m_NullBlock->size; } + bool IsEmpty() const override { return m_NullBlock->offset == 0; } + VkDeviceSize GetAllocationOffset(VmaAllocHandle allocHandle) const override { return ((Block*)allocHandle)->offset; } - void Init(VkDeviceSize size) override; - bool Validate() const override; + void Init(VkDeviceSize size) override; + bool Validate() const override; - void AddDetailedStatistics(VmaDetailedStatistics& inoutStats) const override; - void AddStatistics(VmaStatistics& inoutStats) const override; + void AddDetailedStatistics(VmaDetailedStatistics& inoutStats) const override; + void AddStatistics(VmaStatistics& inoutStats) const override; #if VMA_STATS_STRING_ENABLED - void PrintDetailedMap(class VmaJsonWriter& json) const override; + void PrintDetailedMap(class VmaJsonWriter& json) const override; #endif - bool CreateAllocationRequest( - VkDeviceSize allocSize, - VkDeviceSize allocAlignment, - bool upperAddress, - VmaSuballocationType allocType, - uint32_t strategy, - VmaAllocationRequest* pAllocationRequest) override; + bool CreateAllocationRequest( + VkDeviceSize allocSize, + VkDeviceSize allocAlignment, + bool upperAddress, + VmaSuballocationType allocType, + uint32_t strategy, + VmaAllocationRequest* pAllocationRequest) override; - VkResult CheckCorruption(const void* pBlockData) override; - void Alloc( - const VmaAllocationRequest& request, - VmaSuballocationType type, - void* userData) override; + VkResult CheckCorruption(const void* pBlockData) override; + void Alloc( + const VmaAllocationRequest& request, + VmaSuballocationType type, + void* userData) override; - void Free(VmaAllocHandle allocHandle) override; - void GetAllocationInfo(VmaAllocHandle allocHandle, VmaVirtualAllocationInfo& outInfo) override; - void* GetAllocationUserData(VmaAllocHandle allocHandle) const override; - VmaAllocHandle GetAllocationListBegin() const override; - VmaAllocHandle GetNextAllocation(VmaAllocHandle prevAlloc) const override; - VkDeviceSize GetNextFreeRegionSize(VmaAllocHandle alloc) const override; - void Clear() override; - void SetAllocationUserData(VmaAllocHandle allocHandle, void* userData) override; - void DebugLogAllAllocations() const override; + void Free(VmaAllocHandle allocHandle) override; + void GetAllocationInfo(VmaAllocHandle allocHandle, VmaVirtualAllocationInfo& outInfo) override; + void* GetAllocationUserData(VmaAllocHandle allocHandle) const override; + VmaAllocHandle GetAllocationListBegin() const override; + VmaAllocHandle GetNextAllocation(VmaAllocHandle prevAlloc) const override; + VkDeviceSize GetNextFreeRegionSize(VmaAllocHandle alloc) const override; + void Clear() override; + void SetAllocationUserData(VmaAllocHandle allocHandle, void* userData) override; + void DebugLogAllAllocations() const override; private: - // According to original paper it should be preferable 4 or 5: - // M. Masmano, I. Ripoll, A. Crespo, and J. Real "TLSF: a New Dynamic Memory Allocator for Real-Time Systems" - // http://www.gii.upv.es/tlsf/files/ecrts04_tlsf.pdf - static const uint8_t SECOND_LEVEL_INDEX = 5; - static const uint16_t SMALL_BUFFER_SIZE = 256; - static const uint32_t INITIAL_BLOCK_ALLOC_COUNT = 16; - static const uint8_t MEMORY_CLASS_SHIFT = 7; - static const uint8_t MAX_MEMORY_CLASSES = 65 - MEMORY_CLASS_SHIFT; + // According to original paper it should be preferable 4 or 5: + // M. Masmano, I. Ripoll, A. Crespo, and J. Real "TLSF: a New Dynamic Memory Allocator for Real-Time Systems" + // http://www.gii.upv.es/tlsf/files/ecrts04_tlsf.pdf + static const uint8_t SECOND_LEVEL_INDEX = 5; + static const uint16_t SMALL_BUFFER_SIZE = 256; + static const uint32_t INITIAL_BLOCK_ALLOC_COUNT = 16; + static const uint8_t MEMORY_CLASS_SHIFT = 7; + static const uint8_t MAX_MEMORY_CLASSES = 65 - MEMORY_CLASS_SHIFT; - class Block - { - public: - VkDeviceSize offset; - VkDeviceSize size; - Block* prevPhysical; - Block* nextPhysical; + class Block + { + public: + VkDeviceSize offset; + VkDeviceSize size; + Block* prevPhysical; + Block* nextPhysical; - void MarkFree() { prevFree = VMA_NULL; } - void MarkTaken() { prevFree = this; } - bool IsFree() const { return prevFree != this; } - void*& UserData() { VMA_HEAVY_ASSERT(!IsFree()); return userData; } - Block*& PrevFree() { return prevFree; } - Block*& NextFree() { VMA_HEAVY_ASSERT(IsFree()); return nextFree; } + void MarkFree() { prevFree = VMA_NULL; } + void MarkTaken() { prevFree = this; } + bool IsFree() const { return prevFree != this; } + void*& UserData() { VMA_HEAVY_ASSERT(!IsFree()); return userData; } + Block*& PrevFree() { return prevFree; } + Block*& NextFree() { VMA_HEAVY_ASSERT(IsFree()); return nextFree; } - private: - Block* prevFree; // Address of the same block here indicates that block is taken - union - { - Block* nextFree; - void* userData; - }; - }; + private: + Block* prevFree; // Address of the same block here indicates that block is taken + union + { + Block* nextFree; + void* userData; + }; + }; - size_t m_AllocCount; - // Total number of free blocks besides null block - size_t m_BlocksFreeCount; - // Total size of free blocks excluding null block - VkDeviceSize m_BlocksFreeSize; - uint32_t m_IsFreeBitmap; - uint8_t m_MemoryClasses; - uint32_t m_InnerIsFreeBitmap[MAX_MEMORY_CLASSES]; - uint32_t m_ListsCount; - /* - * 0: 0-3 lists for small buffers - * 1+: 0-(2^SLI-1) lists for normal buffers - */ - Block** m_FreeList; - VmaPoolAllocator m_BlockAllocator; - Block* m_NullBlock; - VmaBlockBufferImageGranularity m_GranularityHandler; + size_t m_AllocCount; + // Total number of free blocks besides null block + size_t m_BlocksFreeCount; + // Total size of free blocks excluding null block + VkDeviceSize m_BlocksFreeSize; + uint32_t m_IsFreeBitmap; + uint8_t m_MemoryClasses; + uint32_t m_InnerIsFreeBitmap[MAX_MEMORY_CLASSES]; + uint32_t m_ListsCount; + /* + * 0: 0-3 lists for small buffers + * 1+: 0-(2^SLI-1) lists for normal buffers + */ + Block** m_FreeList; + VmaPoolAllocator m_BlockAllocator; + Block* m_NullBlock; + VmaBlockBufferImageGranularity m_GranularityHandler; - uint8_t SizeToMemoryClass(VkDeviceSize size) const; - uint16_t SizeToSecondIndex(VkDeviceSize size, uint8_t memoryClass) const; - uint32_t GetListIndex(uint8_t memoryClass, uint16_t secondIndex) const; - uint32_t GetListIndex(VkDeviceSize size) const; + uint8_t SizeToMemoryClass(VkDeviceSize size) const; + uint16_t SizeToSecondIndex(VkDeviceSize size, uint8_t memoryClass) const; + uint32_t GetListIndex(uint8_t memoryClass, uint16_t secondIndex) const; + uint32_t GetListIndex(VkDeviceSize size) const; - void RemoveFreeBlock(Block* block); - void InsertFreeBlock(Block* block); - void MergeBlock(Block* block, Block* prev); + void RemoveFreeBlock(Block* block); + void InsertFreeBlock(Block* block); + void MergeBlock(Block* block, Block* prev); - Block* FindFreeBlock(VkDeviceSize size, uint32_t& listIndex) const; - bool CheckBlock( - Block& block, - uint32_t listIndex, - VkDeviceSize allocSize, - VkDeviceSize allocAlignment, - VmaSuballocationType allocType, - VmaAllocationRequest* pAllocationRequest); + Block* FindFreeBlock(VkDeviceSize size, uint32_t& listIndex) const; + bool CheckBlock( + Block& block, + uint32_t listIndex, + VkDeviceSize allocSize, + VkDeviceSize allocAlignment, + VmaSuballocationType allocType, + VmaAllocationRequest* pAllocationRequest); }; #ifndef _VMA_BLOCK_METADATA_TLSF_FUNCTIONS VmaBlockMetadata_TLSF::VmaBlockMetadata_TLSF(const VkAllocationCallbacks* pAllocationCallbacks, - VkDeviceSize bufferImageGranularity, bool isVirtual) - : VmaBlockMetadata(pAllocationCallbacks, bufferImageGranularity, isVirtual), - m_AllocCount(0), - m_BlocksFreeCount(0), - m_BlocksFreeSize(0), - m_IsFreeBitmap(0), - m_MemoryClasses(0), - m_ListsCount(0), - m_FreeList(VMA_NULL), - m_BlockAllocator(pAllocationCallbacks, INITIAL_BLOCK_ALLOC_COUNT), - m_NullBlock(VMA_NULL), - m_GranularityHandler(bufferImageGranularity) {} + VkDeviceSize bufferImageGranularity, bool isVirtual) + : VmaBlockMetadata(pAllocationCallbacks, bufferImageGranularity, isVirtual), + m_AllocCount(0), + m_BlocksFreeCount(0), + m_BlocksFreeSize(0), + m_IsFreeBitmap(0), + m_MemoryClasses(0), + m_ListsCount(0), + m_FreeList(VMA_NULL), + m_BlockAllocator(pAllocationCallbacks, INITIAL_BLOCK_ALLOC_COUNT), + m_NullBlock(VMA_NULL), + m_GranularityHandler(bufferImageGranularity) {} VmaBlockMetadata_TLSF::~VmaBlockMetadata_TLSF() { - if (m_FreeList) - vma_delete_array(GetAllocationCallbacks(), m_FreeList, m_ListsCount); - m_GranularityHandler.Destroy(GetAllocationCallbacks()); + if (m_FreeList) + vma_delete_array(GetAllocationCallbacks(), m_FreeList, m_ListsCount); + m_GranularityHandler.Destroy(GetAllocationCallbacks()); } void VmaBlockMetadata_TLSF::Init(VkDeviceSize size) { - VmaBlockMetadata::Init(size); + VmaBlockMetadata::Init(size); - if (!IsVirtual()) - m_GranularityHandler.Init(GetAllocationCallbacks(), size); + if (!IsVirtual()) + m_GranularityHandler.Init(GetAllocationCallbacks(), size); - m_NullBlock = m_BlockAllocator.Alloc(); - m_NullBlock->size = size; - m_NullBlock->offset = 0; - m_NullBlock->prevPhysical = VMA_NULL; - m_NullBlock->nextPhysical = VMA_NULL; - m_NullBlock->MarkFree(); - m_NullBlock->NextFree() = VMA_NULL; - m_NullBlock->PrevFree() = VMA_NULL; - uint8_t memoryClass = SizeToMemoryClass(size); - uint16_t sli = SizeToSecondIndex(size, memoryClass); - m_ListsCount = (memoryClass == 0 ? 0 : (memoryClass - 1) * (1UL << SECOND_LEVEL_INDEX) + sli) + 1; - if (IsVirtual()) - m_ListsCount += 1UL << SECOND_LEVEL_INDEX; - else - m_ListsCount += 4; + m_NullBlock = m_BlockAllocator.Alloc(); + m_NullBlock->size = size; + m_NullBlock->offset = 0; + m_NullBlock->prevPhysical = VMA_NULL; + m_NullBlock->nextPhysical = VMA_NULL; + m_NullBlock->MarkFree(); + m_NullBlock->NextFree() = VMA_NULL; + m_NullBlock->PrevFree() = VMA_NULL; + uint8_t memoryClass = SizeToMemoryClass(size); + uint16_t sli = SizeToSecondIndex(size, memoryClass); + m_ListsCount = (memoryClass == 0 ? 0 : (memoryClass - 1) * (1UL << SECOND_LEVEL_INDEX) + sli) + 1; + if (IsVirtual()) + m_ListsCount += 1UL << SECOND_LEVEL_INDEX; + else + m_ListsCount += 4; - m_MemoryClasses = memoryClass + 2; - memset(m_InnerIsFreeBitmap, 0, MAX_MEMORY_CLASSES * sizeof(uint32_t)); + m_MemoryClasses = memoryClass + uint8_t(2); + memset(m_InnerIsFreeBitmap, 0, MAX_MEMORY_CLASSES * sizeof(uint32_t)); - m_FreeList = vma_new_array(GetAllocationCallbacks(), Block*, m_ListsCount); - memset(m_FreeList, 0, m_ListsCount * sizeof(Block*)); + m_FreeList = vma_new_array(GetAllocationCallbacks(), Block*, m_ListsCount); + memset(m_FreeList, 0, m_ListsCount * sizeof(Block*)); } bool VmaBlockMetadata_TLSF::Validate() const { - VMA_VALIDATE(GetSumFreeSize() <= GetSize()); + VMA_VALIDATE(GetSumFreeSize() <= GetSize()); - VkDeviceSize calculatedSize = m_NullBlock->size; - VkDeviceSize calculatedFreeSize = m_NullBlock->size; - size_t allocCount = 0; - size_t freeCount = 0; + VkDeviceSize calculatedSize = m_NullBlock->size; + VkDeviceSize calculatedFreeSize = m_NullBlock->size; + size_t allocCount = 0; + size_t freeCount = 0; - // Check integrity of free lists - for (uint32_t list = 0; list < m_ListsCount; ++list) - { - Block* block = m_FreeList[list]; - if (block != VMA_NULL) - { - VMA_VALIDATE(block->IsFree()); - VMA_VALIDATE(block->PrevFree() == VMA_NULL); - while (block->NextFree()) - { - VMA_VALIDATE(block->NextFree()->IsFree()); - VMA_VALIDATE(block->NextFree()->PrevFree() == block); - block = block->NextFree(); - } - } - } + // Check integrity of free lists + for (uint32_t list = 0; list < m_ListsCount; ++list) + { + Block* block = m_FreeList[list]; + if (block != VMA_NULL) + { + VMA_VALIDATE(block->IsFree()); + VMA_VALIDATE(block->PrevFree() == VMA_NULL); + while (block->NextFree()) + { + VMA_VALIDATE(block->NextFree()->IsFree()); + VMA_VALIDATE(block->NextFree()->PrevFree() == block); + block = block->NextFree(); + } + } + } - VkDeviceSize nextOffset = m_NullBlock->offset; - auto validateCtx = m_GranularityHandler.StartValidation(GetAllocationCallbacks(), IsVirtual()); + VkDeviceSize nextOffset = m_NullBlock->offset; + auto validateCtx = m_GranularityHandler.StartValidation(GetAllocationCallbacks(), IsVirtual()); - VMA_VALIDATE(m_NullBlock->nextPhysical == VMA_NULL); - if (m_NullBlock->prevPhysical) - { - VMA_VALIDATE(m_NullBlock->prevPhysical->nextPhysical == m_NullBlock); - } - // Check all blocks - for (Block* prev = m_NullBlock->prevPhysical; prev != VMA_NULL; prev = prev->prevPhysical) - { - VMA_VALIDATE(prev->offset + prev->size == nextOffset); - nextOffset = prev->offset; - calculatedSize += prev->size; + VMA_VALIDATE(m_NullBlock->nextPhysical == VMA_NULL); + if (m_NullBlock->prevPhysical) + { + VMA_VALIDATE(m_NullBlock->prevPhysical->nextPhysical == m_NullBlock); + } + // Check all blocks + for (Block* prev = m_NullBlock->prevPhysical; prev != VMA_NULL; prev = prev->prevPhysical) + { + VMA_VALIDATE(prev->offset + prev->size == nextOffset); + nextOffset = prev->offset; + calculatedSize += prev->size; - uint32_t listIndex = GetListIndex(prev->size); - if (prev->IsFree()) - { - ++freeCount; - // Check if free block belongs to free list - Block* freeBlock = m_FreeList[listIndex]; - VMA_VALIDATE(freeBlock != VMA_NULL); + uint32_t listIndex = GetListIndex(prev->size); + if (prev->IsFree()) + { + ++freeCount; + // Check if free block belongs to free list + Block* freeBlock = m_FreeList[listIndex]; + VMA_VALIDATE(freeBlock != VMA_NULL); - bool found = false; - do - { - if (freeBlock == prev) - found = true; + bool found = false; + do + { + if (freeBlock == prev) + found = true; - freeBlock = freeBlock->NextFree(); - } while (!found && freeBlock != VMA_NULL); + freeBlock = freeBlock->NextFree(); + } while (!found && freeBlock != VMA_NULL); - VMA_VALIDATE(found); - calculatedFreeSize += prev->size; - } - else - { - ++allocCount; - // Check if taken block is not on a free list - Block* freeBlock = m_FreeList[listIndex]; - while (freeBlock) - { - VMA_VALIDATE(freeBlock != prev); - freeBlock = freeBlock->NextFree(); - } + VMA_VALIDATE(found); + calculatedFreeSize += prev->size; + } else + { + ++allocCount; + // Check if taken block is not on a free list + Block* freeBlock = m_FreeList[listIndex]; + while (freeBlock) + { + VMA_VALIDATE(freeBlock != prev); + freeBlock = freeBlock->NextFree(); + } - if (!IsVirtual()) - { - VMA_VALIDATE(m_GranularityHandler.Validate(validateCtx, prev->offset, prev->size)); - } - } + if (!IsVirtual()) + { + VMA_VALIDATE(m_GranularityHandler.Validate(validateCtx, prev->offset, prev->size)); + } + } - if (prev->prevPhysical) - { - VMA_VALIDATE(prev->prevPhysical->nextPhysical == prev); - } - } + if (prev->prevPhysical) + { + VMA_VALIDATE(prev->prevPhysical->nextPhysical == prev); + } + } - if (!IsVirtual()) - { - VMA_VALIDATE(m_GranularityHandler.FinishValidation(validateCtx)); - } + if (!IsVirtual()) + { + VMA_VALIDATE(m_GranularityHandler.FinishValidation(validateCtx)); + } - VMA_VALIDATE(nextOffset == 0); - VMA_VALIDATE(calculatedSize == GetSize()); - VMA_VALIDATE(calculatedFreeSize == GetSumFreeSize()); - VMA_VALIDATE(allocCount == m_AllocCount); - VMA_VALIDATE(freeCount == m_BlocksFreeCount); + VMA_VALIDATE(nextOffset == 0); + VMA_VALIDATE(calculatedSize == GetSize()); + VMA_VALIDATE(calculatedFreeSize == GetSumFreeSize()); + VMA_VALIDATE(allocCount == m_AllocCount); + VMA_VALIDATE(freeCount == m_BlocksFreeCount); - return true; + return true; } void VmaBlockMetadata_TLSF::AddDetailedStatistics(VmaDetailedStatistics& inoutStats) const { - inoutStats.statistics.blockCount++; - inoutStats.statistics.blockBytes += GetSize(); - if (m_NullBlock->size > 0) - VmaAddDetailedStatisticsUnusedRange(inoutStats, m_NullBlock->size); + inoutStats.statistics.blockCount++; + inoutStats.statistics.blockBytes += GetSize(); + if (m_NullBlock->size > 0) + VmaAddDetailedStatisticsUnusedRange(inoutStats, m_NullBlock->size); - for (Block* block = m_NullBlock->prevPhysical; block != VMA_NULL; block = block->prevPhysical) - { - if (block->IsFree()) - VmaAddDetailedStatisticsUnusedRange(inoutStats, block->size); - else - VmaAddDetailedStatisticsAllocation(inoutStats, block->size); - } + for (Block* block = m_NullBlock->prevPhysical; block != VMA_NULL; block = block->prevPhysical) + { + if (block->IsFree()) + VmaAddDetailedStatisticsUnusedRange(inoutStats, block->size); + else + VmaAddDetailedStatisticsAllocation(inoutStats, block->size); + } } void VmaBlockMetadata_TLSF::AddStatistics(VmaStatistics& inoutStats) const { - inoutStats.blockCount++; - inoutStats.allocationCount += (uint32_t)m_AllocCount; - inoutStats.blockBytes += GetSize(); - inoutStats.allocationBytes += GetSize() - GetSumFreeSize(); + inoutStats.blockCount++; + inoutStats.allocationCount += (uint32_t)m_AllocCount; + inoutStats.blockBytes += GetSize(); + inoutStats.allocationBytes += GetSize() - GetSumFreeSize(); } #if VMA_STATS_STRING_ENABLED void VmaBlockMetadata_TLSF::PrintDetailedMap(class VmaJsonWriter& json) const { - size_t blockCount = m_AllocCount + m_BlocksFreeCount; - VmaStlAllocator allocator(GetAllocationCallbacks()); - VmaVector> blockList(blockCount, allocator); + size_t blockCount = m_AllocCount + m_BlocksFreeCount; + VmaStlAllocator allocator(GetAllocationCallbacks()); + VmaVector> blockList(blockCount, allocator); - size_t i = blockCount; - for (Block* block = m_NullBlock->prevPhysical; block != VMA_NULL; block = block->prevPhysical) - { - blockList[--i] = block; - } - VMA_ASSERT(i == 0); + size_t i = blockCount; + for (Block* block = m_NullBlock->prevPhysical; block != VMA_NULL; block = block->prevPhysical) + { + blockList[--i] = block; + } + VMA_ASSERT(i == 0); - VmaDetailedStatistics stats; - VmaClearDetailedStatistics(stats); - AddDetailedStatistics(stats); + VmaDetailedStatistics stats; + VmaClearDetailedStatistics(stats); + AddDetailedStatistics(stats); - PrintDetailedMap_Begin(json, - stats.statistics.blockBytes - stats.statistics.allocationBytes, - stats.statistics.allocationCount, - stats.unusedRangeCount); + PrintDetailedMap_Begin(json, + stats.statistics.blockBytes - stats.statistics.allocationBytes, + stats.statistics.allocationCount, + stats.unusedRangeCount); - for (; i < blockCount; ++i) - { - Block* block = blockList[i]; - if (block->IsFree()) - PrintDetailedMap_UnusedRange(json, block->offset, block->size); - else - PrintDetailedMap_Allocation(json, block->offset, block->size, block->UserData()); - } - if (m_NullBlock->size > 0) - PrintDetailedMap_UnusedRange(json, m_NullBlock->offset, m_NullBlock->size); + for (; i < blockCount; ++i) + { + Block* block = blockList[i]; + if (block->IsFree()) + PrintDetailedMap_UnusedRange(json, block->offset, block->size); + else + PrintDetailedMap_Allocation(json, block->offset, block->size, block->UserData()); + } + if (m_NullBlock->size > 0) + PrintDetailedMap_UnusedRange(json, m_NullBlock->offset, m_NullBlock->size); - PrintDetailedMap_End(json); + PrintDetailedMap_End(json); } #endif bool VmaBlockMetadata_TLSF::CreateAllocationRequest( - VkDeviceSize allocSize, - VkDeviceSize allocAlignment, - bool upperAddress, - VmaSuballocationType allocType, - uint32_t strategy, - VmaAllocationRequest* pAllocationRequest) + VkDeviceSize allocSize, + VkDeviceSize allocAlignment, + bool upperAddress, + VmaSuballocationType allocType, + uint32_t strategy, + VmaAllocationRequest* pAllocationRequest) { - VMA_ASSERT(allocSize > 0 && "Cannot allocate empty block!"); - VMA_ASSERT(!upperAddress && "VMA_ALLOCATION_CREATE_UPPER_ADDRESS_BIT can be used only with linear algorithm."); + VMA_ASSERT(allocSize > 0 && "Cannot allocate empty block!"); + VMA_ASSERT(!upperAddress && "VMA_ALLOCATION_CREATE_UPPER_ADDRESS_BIT can be used only with linear algorithm."); - // For small granularity round up - if (!IsVirtual()) - m_GranularityHandler.RoundupAllocRequest(allocType, allocSize, allocAlignment); + // For small granularity round up + if (!IsVirtual()) + m_GranularityHandler.RoundupAllocRequest(allocType, allocSize, allocAlignment); - allocSize += GetDebugMargin(); - // Quick check for too small pool - if (allocSize > GetSumFreeSize()) - return false; + allocSize += GetDebugMargin(); + // Quick check for too small pool + if (allocSize > GetSumFreeSize()) + return false; - // If no free blocks in pool then check only null block - if (m_BlocksFreeCount == 0) - return CheckBlock(*m_NullBlock, m_ListsCount, allocSize, allocAlignment, allocType, pAllocationRequest); + // If no free blocks in pool then check only null block + if (m_BlocksFreeCount == 0) + return CheckBlock(*m_NullBlock, m_ListsCount, allocSize, allocAlignment, allocType, pAllocationRequest); - // Round up to the next block - VkDeviceSize sizeForNextList = allocSize; - VkDeviceSize smallSizeStep = SMALL_BUFFER_SIZE / (IsVirtual() ? 1 << SECOND_LEVEL_INDEX : 4); - if (allocSize > SMALL_BUFFER_SIZE) - { - sizeForNextList += (1ULL << (VMA_BITSCAN_MSB(allocSize) - SECOND_LEVEL_INDEX)); - } - else if (allocSize > SMALL_BUFFER_SIZE - smallSizeStep) - sizeForNextList = SMALL_BUFFER_SIZE + 1; - else - sizeForNextList += smallSizeStep; + // Round up to the next block + VkDeviceSize sizeForNextList = allocSize; + VkDeviceSize smallSizeStep = VkDeviceSize(SMALL_BUFFER_SIZE / (IsVirtual() ? 1 << SECOND_LEVEL_INDEX : 4)); + if (allocSize > SMALL_BUFFER_SIZE) + { + sizeForNextList += (1ULL << (VMA_BITSCAN_MSB(allocSize) - SECOND_LEVEL_INDEX)); + } else if (allocSize > SMALL_BUFFER_SIZE - smallSizeStep) + sizeForNextList = SMALL_BUFFER_SIZE + 1; + else + sizeForNextList += smallSizeStep; - uint32_t nextListIndex = 0; - uint32_t prevListIndex = 0; - Block* nextListBlock = VMA_NULL; - Block* prevListBlock = VMA_NULL; + uint32_t nextListIndex = m_ListsCount; + uint32_t prevListIndex = m_ListsCount; + Block* nextListBlock = VMA_NULL; + Block* prevListBlock = VMA_NULL; - // Check blocks according to strategies - if (strategy & VMA_ALLOCATION_CREATE_STRATEGY_MIN_TIME_BIT) - { - // Quick check for larger block first - nextListBlock = FindFreeBlock(sizeForNextList, nextListIndex); - if (nextListBlock != VMA_NULL && CheckBlock(*nextListBlock, nextListIndex, allocSize, allocAlignment, allocType, pAllocationRequest)) - return true; + // Check blocks according to strategies + if (strategy & VMA_ALLOCATION_CREATE_STRATEGY_MIN_TIME_BIT) + { + // Quick check for larger block first + nextListBlock = FindFreeBlock(sizeForNextList, nextListIndex); + if (nextListBlock != VMA_NULL && CheckBlock(*nextListBlock, nextListIndex, allocSize, allocAlignment, allocType, pAllocationRequest)) + return true; - // If not fitted then null block - if (CheckBlock(*m_NullBlock, m_ListsCount, allocSize, allocAlignment, allocType, pAllocationRequest)) - return true; + // If not fitted then null block + if (CheckBlock(*m_NullBlock, m_ListsCount, allocSize, allocAlignment, allocType, pAllocationRequest)) + return true; - // Null block failed, search larger bucket - while (nextListBlock) - { - if (CheckBlock(*nextListBlock, nextListIndex, allocSize, allocAlignment, allocType, pAllocationRequest)) - return true; - nextListBlock = nextListBlock->NextFree(); - } + // Null block failed, search larger bucket + while (nextListBlock) + { + if (CheckBlock(*nextListBlock, nextListIndex, allocSize, allocAlignment, allocType, pAllocationRequest)) + return true; + nextListBlock = nextListBlock->NextFree(); + } - // Failed again, check best fit bucket - prevListBlock = FindFreeBlock(allocSize, prevListIndex); - while (prevListBlock) - { - if (CheckBlock(*prevListBlock, prevListIndex, allocSize, allocAlignment, allocType, pAllocationRequest)) - return true; - prevListBlock = prevListBlock->NextFree(); - } - } - else if (strategy & VMA_ALLOCATION_CREATE_STRATEGY_MIN_MEMORY_BIT) - { - // Check best fit bucket - prevListBlock = FindFreeBlock(allocSize, prevListIndex); - while (prevListBlock) - { - if (CheckBlock(*prevListBlock, prevListIndex, allocSize, allocAlignment, allocType, pAllocationRequest)) - return true; - prevListBlock = prevListBlock->NextFree(); - } + // Failed again, check best fit bucket + prevListBlock = FindFreeBlock(allocSize, prevListIndex); + while (prevListBlock) + { + if (CheckBlock(*prevListBlock, prevListIndex, allocSize, allocAlignment, allocType, pAllocationRequest)) + return true; + prevListBlock = prevListBlock->NextFree(); + } + } else if (strategy & VMA_ALLOCATION_CREATE_STRATEGY_MIN_MEMORY_BIT) + { + // Check best fit bucket + prevListBlock = FindFreeBlock(allocSize, prevListIndex); + while (prevListBlock) + { + if (CheckBlock(*prevListBlock, prevListIndex, allocSize, allocAlignment, allocType, pAllocationRequest)) + return true; + prevListBlock = prevListBlock->NextFree(); + } - // If failed check null block - if (CheckBlock(*m_NullBlock, m_ListsCount, allocSize, allocAlignment, allocType, pAllocationRequest)) - return true; + // If failed check null block + if (CheckBlock(*m_NullBlock, m_ListsCount, allocSize, allocAlignment, allocType, pAllocationRequest)) + return true; - // Check larger bucket - nextListBlock = FindFreeBlock(sizeForNextList, nextListIndex); - while (nextListBlock) - { - if (CheckBlock(*nextListBlock, nextListIndex, allocSize, allocAlignment, allocType, pAllocationRequest)) - return true; - nextListBlock = nextListBlock->NextFree(); - } - } - else if (strategy & VMA_ALLOCATION_CREATE_STRATEGY_MIN_OFFSET_BIT ) - { - // Perform search from the start - VmaStlAllocator allocator(GetAllocationCallbacks()); - VmaVector> blockList(m_BlocksFreeCount, allocator); + // Check larger bucket + nextListBlock = FindFreeBlock(sizeForNextList, nextListIndex); + while (nextListBlock) + { + if (CheckBlock(*nextListBlock, nextListIndex, allocSize, allocAlignment, allocType, pAllocationRequest)) + return true; + nextListBlock = nextListBlock->NextFree(); + } + } else if (strategy & VMA_ALLOCATION_CREATE_STRATEGY_MIN_OFFSET_BIT) + { + // Perform search from the start + VmaStlAllocator allocator(GetAllocationCallbacks()); + VmaVector> blockList(m_BlocksFreeCount, allocator); - size_t i = m_BlocksFreeCount; - for (Block* block = m_NullBlock->prevPhysical; block != VMA_NULL; block = block->prevPhysical) - { - if (block->IsFree() && block->size >= allocSize) - blockList[--i] = block; - } + size_t i = m_BlocksFreeCount; + for (Block* block = m_NullBlock->prevPhysical; block != VMA_NULL; block = block->prevPhysical) + { + if (block->IsFree() && block->size >= allocSize) + blockList[--i] = block; + } - for (; i < m_BlocksFreeCount; ++i) - { - Block& block = *blockList[i]; - if (CheckBlock(block, GetListIndex(block.size), allocSize, allocAlignment, allocType, pAllocationRequest)) - return true; - } + for (; i < m_BlocksFreeCount; ++i) + { + Block& block = *blockList[i]; + if (CheckBlock(block, GetListIndex(block.size), allocSize, allocAlignment, allocType, pAllocationRequest)) + return true; + } - // If failed check null block - if (CheckBlock(*m_NullBlock, m_ListsCount, allocSize, allocAlignment, allocType, pAllocationRequest)) - return true; + // If failed check null block + if (CheckBlock(*m_NullBlock, m_ListsCount, allocSize, allocAlignment, allocType, pAllocationRequest)) + return true; - // Whole range searched, no more memory - return false; - } - else - { - // Check larger bucket - nextListBlock = FindFreeBlock(sizeForNextList, nextListIndex); - while (nextListBlock) - { - if (CheckBlock(*nextListBlock, nextListIndex, allocSize, allocAlignment, allocType, pAllocationRequest)) - return true; - nextListBlock = nextListBlock->NextFree(); - } + // Whole range searched, no more memory + return false; + } else + { + // Check larger bucket + nextListBlock = FindFreeBlock(sizeForNextList, nextListIndex); + while (nextListBlock) + { + if (CheckBlock(*nextListBlock, nextListIndex, allocSize, allocAlignment, allocType, pAllocationRequest)) + return true; + nextListBlock = nextListBlock->NextFree(); + } - // If failed check null block - if (CheckBlock(*m_NullBlock, m_ListsCount, allocSize, allocAlignment, allocType, pAllocationRequest)) - return true; + // If failed check null block + if (CheckBlock(*m_NullBlock, m_ListsCount, allocSize, allocAlignment, allocType, pAllocationRequest)) + return true; - // Check best fit bucket - prevListBlock = FindFreeBlock(allocSize, prevListIndex); - while (prevListBlock) - { - if (CheckBlock(*prevListBlock, prevListIndex, allocSize, allocAlignment, allocType, pAllocationRequest)) - return true; - prevListBlock = prevListBlock->NextFree(); - } - } + // Check best fit bucket + prevListBlock = FindFreeBlock(allocSize, prevListIndex); + while (prevListBlock) + { + if (CheckBlock(*prevListBlock, prevListIndex, allocSize, allocAlignment, allocType, pAllocationRequest)) + return true; + prevListBlock = prevListBlock->NextFree(); + } + } - // Worst case, full search has to be done - while (++nextListIndex < m_ListsCount) - { - nextListBlock = m_FreeList[nextListIndex]; - while (nextListBlock) - { - if (CheckBlock(*nextListBlock, nextListIndex, allocSize, allocAlignment, allocType, pAllocationRequest)) - return true; - nextListBlock = nextListBlock->NextFree(); - } - } + // Worst case, full search has to be done + while (++nextListIndex < m_ListsCount) + { + nextListBlock = m_FreeList[nextListIndex]; + while (nextListBlock) + { + if (CheckBlock(*nextListBlock, nextListIndex, allocSize, allocAlignment, allocType, pAllocationRequest)) + return true; + nextListBlock = nextListBlock->NextFree(); + } + } - // No more memory sadly - return false; + // No more memory sadly + return false; } VkResult VmaBlockMetadata_TLSF::CheckCorruption(const void* pBlockData) { - for (Block* block = m_NullBlock->prevPhysical; block != VMA_NULL; block = block->prevPhysical) - { - if (!block->IsFree()) - { - if (!VmaValidateMagicValue(pBlockData, block->offset + block->size)) - { - VMA_ASSERT(0 && "MEMORY CORRUPTION DETECTED AFTER VALIDATED ALLOCATION!"); - return VK_ERROR_UNKNOWN_COPY; - } - } - } + for (Block* block = m_NullBlock->prevPhysical; block != VMA_NULL; block = block->prevPhysical) + { + if (!block->IsFree()) + { + if (!VmaValidateMagicValue(pBlockData, block->offset + block->size)) + { + VMA_ASSERT(0 && "MEMORY CORRUPTION DETECTED AFTER VALIDATED ALLOCATION!"); + return VK_ERROR_UNKNOWN_COPY; + } + } + } - return VK_SUCCESS; + return VK_SUCCESS; } void VmaBlockMetadata_TLSF::Alloc( - const VmaAllocationRequest& request, - VmaSuballocationType type, - void* userData) + const VmaAllocationRequest& request, + VmaSuballocationType type, + void* userData) { - VMA_ASSERT(request.type == VmaAllocationRequestType::TLSF); + VMA_ASSERT(request.type == VmaAllocationRequestType::TLSF); - // Get block and pop it from the free list - Block* currentBlock = (Block*)request.allocHandle; - VkDeviceSize offset = request.algorithmData; - VMA_ASSERT(currentBlock != VMA_NULL); - VMA_ASSERT(currentBlock->offset <= offset); + // Get block and pop it from the free list + Block* currentBlock = (Block*)request.allocHandle; + VkDeviceSize offset = request.algorithmData; + VMA_ASSERT(currentBlock != VMA_NULL); + VMA_ASSERT(currentBlock->offset <= offset); - if (currentBlock != m_NullBlock) - RemoveFreeBlock(currentBlock); + if (currentBlock != m_NullBlock) + RemoveFreeBlock(currentBlock); - VkDeviceSize debugMargin = GetDebugMargin(); - VkDeviceSize misssingAlignment = offset - currentBlock->offset; + VkDeviceSize debugMargin = GetDebugMargin(); + VkDeviceSize misssingAlignment = offset - currentBlock->offset; - // Append missing alignment to prev block or create new one - if (misssingAlignment) - { - Block* prevBlock = currentBlock->prevPhysical; - VMA_ASSERT(prevBlock != VMA_NULL && "There should be no missing alignment at offset 0!"); + // Append missing alignment to prev block or create new one + if (misssingAlignment) + { + Block* prevBlock = currentBlock->prevPhysical; + VMA_ASSERT(prevBlock != VMA_NULL && "There should be no missing alignment at offset 0!"); - if (prevBlock->IsFree() && prevBlock->size != debugMargin) - { - uint32_t oldList = GetListIndex(prevBlock->size); - prevBlock->size += misssingAlignment; - // Check if new size crosses list bucket - if (oldList != GetListIndex(prevBlock->size)) - { - prevBlock->size -= misssingAlignment; - RemoveFreeBlock(prevBlock); - prevBlock->size += misssingAlignment; - InsertFreeBlock(prevBlock); - } - else - m_BlocksFreeSize += misssingAlignment; - } - else - { - Block* newBlock = m_BlockAllocator.Alloc(); - currentBlock->prevPhysical = newBlock; - prevBlock->nextPhysical = newBlock; - newBlock->prevPhysical = prevBlock; - newBlock->nextPhysical = currentBlock; - newBlock->size = misssingAlignment; - newBlock->offset = currentBlock->offset; - newBlock->MarkTaken(); + if (prevBlock->IsFree() && prevBlock->size != debugMargin) + { + uint32_t oldList = GetListIndex(prevBlock->size); + prevBlock->size += misssingAlignment; + // Check if new size crosses list bucket + if (oldList != GetListIndex(prevBlock->size)) + { + prevBlock->size -= misssingAlignment; + RemoveFreeBlock(prevBlock); + prevBlock->size += misssingAlignment; + InsertFreeBlock(prevBlock); + } else + m_BlocksFreeSize += misssingAlignment; + } else + { + Block* newBlock = m_BlockAllocator.Alloc(); + currentBlock->prevPhysical = newBlock; + prevBlock->nextPhysical = newBlock; + newBlock->prevPhysical = prevBlock; + newBlock->nextPhysical = currentBlock; + newBlock->size = misssingAlignment; + newBlock->offset = currentBlock->offset; + newBlock->MarkTaken(); - InsertFreeBlock(newBlock); - } + InsertFreeBlock(newBlock); + } - currentBlock->size -= misssingAlignment; - currentBlock->offset += misssingAlignment; - } + currentBlock->size -= misssingAlignment; + currentBlock->offset += misssingAlignment; + } - VkDeviceSize size = request.size + debugMargin; - if (currentBlock->size == size) - { - if (currentBlock == m_NullBlock) - { - // Setup new null block - m_NullBlock = m_BlockAllocator.Alloc(); - m_NullBlock->size = 0; - m_NullBlock->offset = currentBlock->offset + size; - m_NullBlock->prevPhysical = currentBlock; - m_NullBlock->nextPhysical = VMA_NULL; - m_NullBlock->MarkFree(); - m_NullBlock->PrevFree() = VMA_NULL; - m_NullBlock->NextFree() = VMA_NULL; - currentBlock->nextPhysical = m_NullBlock; - currentBlock->MarkTaken(); - } - } - else - { - VMA_ASSERT(currentBlock->size > size && "Proper block already found, shouldn't find smaller one!"); + VkDeviceSize size = request.size + debugMargin; + if (currentBlock->size == size) + { + if (currentBlock == m_NullBlock) + { + // Setup new null block + m_NullBlock = m_BlockAllocator.Alloc(); + m_NullBlock->size = 0; + m_NullBlock->offset = currentBlock->offset + size; + m_NullBlock->prevPhysical = currentBlock; + m_NullBlock->nextPhysical = VMA_NULL; + m_NullBlock->MarkFree(); + m_NullBlock->PrevFree() = VMA_NULL; + m_NullBlock->NextFree() = VMA_NULL; + currentBlock->nextPhysical = m_NullBlock; + currentBlock->MarkTaken(); + } + } else + { + VMA_ASSERT(currentBlock->size > size && "Proper block already found, shouldn't find smaller one!"); - // Create new free block - Block* newBlock = m_BlockAllocator.Alloc(); - newBlock->size = currentBlock->size - size; - newBlock->offset = currentBlock->offset + size; - newBlock->prevPhysical = currentBlock; - newBlock->nextPhysical = currentBlock->nextPhysical; - currentBlock->nextPhysical = newBlock; - currentBlock->size = size; + // Create new free block + Block* newBlock = m_BlockAllocator.Alloc(); + newBlock->size = currentBlock->size - size; + newBlock->offset = currentBlock->offset + size; + newBlock->prevPhysical = currentBlock; + newBlock->nextPhysical = currentBlock->nextPhysical; + currentBlock->nextPhysical = newBlock; + currentBlock->size = size; - if (currentBlock == m_NullBlock) - { - m_NullBlock = newBlock; - m_NullBlock->MarkFree(); - m_NullBlock->NextFree() = VMA_NULL; - m_NullBlock->PrevFree() = VMA_NULL; - currentBlock->MarkTaken(); - } - else - { - newBlock->nextPhysical->prevPhysical = newBlock; - newBlock->MarkTaken(); - InsertFreeBlock(newBlock); - } - } - currentBlock->UserData() = userData; + if (currentBlock == m_NullBlock) + { + m_NullBlock = newBlock; + m_NullBlock->MarkFree(); + m_NullBlock->NextFree() = VMA_NULL; + m_NullBlock->PrevFree() = VMA_NULL; + currentBlock->MarkTaken(); + } else + { + newBlock->nextPhysical->prevPhysical = newBlock; + newBlock->MarkTaken(); + InsertFreeBlock(newBlock); + } + } + currentBlock->UserData() = userData; - if (debugMargin > 0) - { - currentBlock->size -= debugMargin; - Block* newBlock = m_BlockAllocator.Alloc(); - newBlock->size = debugMargin; - newBlock->offset = currentBlock->offset + currentBlock->size; - newBlock->prevPhysical = currentBlock; - newBlock->nextPhysical = currentBlock->nextPhysical; - newBlock->MarkTaken(); - currentBlock->nextPhysical->prevPhysical = newBlock; - currentBlock->nextPhysical = newBlock; - InsertFreeBlock(newBlock); - } + if (debugMargin > 0) + { + currentBlock->size -= debugMargin; + Block* newBlock = m_BlockAllocator.Alloc(); + newBlock->size = debugMargin; + newBlock->offset = currentBlock->offset + currentBlock->size; + newBlock->prevPhysical = currentBlock; + newBlock->nextPhysical = currentBlock->nextPhysical; + newBlock->MarkTaken(); + currentBlock->nextPhysical->prevPhysical = newBlock; + currentBlock->nextPhysical = newBlock; + InsertFreeBlock(newBlock); + } - if (!IsVirtual()) - m_GranularityHandler.AllocPages((uint8_t)(uintptr_t)request.customData, - currentBlock->offset, currentBlock->size); - ++m_AllocCount; + if (!IsVirtual()) + m_GranularityHandler.AllocPages((uint8_t)(uintptr_t)request.customData, + currentBlock->offset, currentBlock->size); + ++m_AllocCount; } void VmaBlockMetadata_TLSF::Free(VmaAllocHandle allocHandle) { - Block* block = (Block*)allocHandle; - Block* next = block->nextPhysical; - VMA_ASSERT(!block->IsFree() && "Block is already free!"); + Block* block = (Block*)allocHandle; + Block* next = block->nextPhysical; + VMA_ASSERT(!block->IsFree() && "Block is already free!"); - if (!IsVirtual()) - m_GranularityHandler.FreePages(block->offset, block->size); - --m_AllocCount; + if (!IsVirtual()) + m_GranularityHandler.FreePages(block->offset, block->size); + --m_AllocCount; - VkDeviceSize debugMargin = GetDebugMargin(); - if (debugMargin > 0) - { - RemoveFreeBlock(next); - MergeBlock(next, block); - block = next; - next = next->nextPhysical; - } + VkDeviceSize debugMargin = GetDebugMargin(); + if (debugMargin > 0) + { + RemoveFreeBlock(next); + MergeBlock(next, block); + block = next; + next = next->nextPhysical; + } - // Try merging - Block* prev = block->prevPhysical; - if (prev != VMA_NULL && prev->IsFree() && prev->size != debugMargin) - { - RemoveFreeBlock(prev); - MergeBlock(block, prev); - } + // Try merging + Block* prev = block->prevPhysical; + if (prev != VMA_NULL && prev->IsFree() && prev->size != debugMargin) + { + RemoveFreeBlock(prev); + MergeBlock(block, prev); + } - if (!next->IsFree()) - InsertFreeBlock(block); - else if (next == m_NullBlock) - MergeBlock(m_NullBlock, block); - else - { - RemoveFreeBlock(next); - MergeBlock(next, block); - InsertFreeBlock(next); - } + if (!next->IsFree()) + InsertFreeBlock(block); + else if (next == m_NullBlock) + MergeBlock(m_NullBlock, block); + else + { + RemoveFreeBlock(next); + MergeBlock(next, block); + InsertFreeBlock(next); + } } void VmaBlockMetadata_TLSF::GetAllocationInfo(VmaAllocHandle allocHandle, VmaVirtualAllocationInfo& outInfo) { - Block* block = (Block*)allocHandle; - VMA_ASSERT(!block->IsFree() && "Cannot get allocation info for free block!"); - outInfo.offset = block->offset; - outInfo.size = block->size; - outInfo.pUserData = block->UserData(); + Block* block = (Block*)allocHandle; + VMA_ASSERT(!block->IsFree() && "Cannot get allocation info for free block!"); + outInfo.offset = block->offset; + outInfo.size = block->size; + outInfo.pUserData = block->UserData(); } void* VmaBlockMetadata_TLSF::GetAllocationUserData(VmaAllocHandle allocHandle) const { - Block* block = (Block*)allocHandle; - VMA_ASSERT(!block->IsFree() && "Cannot get user data for free block!"); - return block->UserData(); + Block* block = (Block*)allocHandle; + VMA_ASSERT(!block->IsFree() && "Cannot get user data for free block!"); + return block->UserData(); } VmaAllocHandle VmaBlockMetadata_TLSF::GetAllocationListBegin() const { - if (m_AllocCount == 0) - return VK_NULL_HANDLE; + if (m_AllocCount == 0) + return VK_NULL_HANDLE; - for (Block* block = m_NullBlock->prevPhysical; block; block = block->prevPhysical) - { - if (!block->IsFree()) - return (VmaAllocHandle)block; - } - VMA_ASSERT(false && "If m_AllocCount > 0 then should find any allocation!"); - return VK_NULL_HANDLE; + for (Block* block = m_NullBlock->prevPhysical; block; block = block->prevPhysical) + { + if (!block->IsFree()) + return (VmaAllocHandle)block; + } + VMA_ASSERT(false && "If m_AllocCount > 0 then should find any allocation!"); + return VK_NULL_HANDLE; } VmaAllocHandle VmaBlockMetadata_TLSF::GetNextAllocation(VmaAllocHandle prevAlloc) const { - Block* startBlock = (Block*)prevAlloc; - VMA_ASSERT(!startBlock->IsFree() && "Incorrect block!"); + Block* startBlock = (Block*)prevAlloc; + VMA_ASSERT(!startBlock->IsFree() && "Incorrect block!"); - for (Block* block = startBlock->prevPhysical; block; block = block->prevPhysical) - { - if (!block->IsFree()) - return (VmaAllocHandle)block; - } - return VK_NULL_HANDLE; + for (Block* block = startBlock->prevPhysical; block; block = block->prevPhysical) + { + if (!block->IsFree()) + return (VmaAllocHandle)block; + } + return VK_NULL_HANDLE; } VkDeviceSize VmaBlockMetadata_TLSF::GetNextFreeRegionSize(VmaAllocHandle alloc) const { - Block* block = (Block*)alloc; - VMA_ASSERT(!block->IsFree() && "Incorrect block!"); + Block* block = (Block*)alloc; + VMA_ASSERT(!block->IsFree() && "Incorrect block!"); - if (block->prevPhysical) - return block->prevPhysical->IsFree() ? block->prevPhysical->size : 0; - return 0; + if (block->prevPhysical) + return block->prevPhysical->IsFree() ? block->prevPhysical->size : 0; + return 0; } void VmaBlockMetadata_TLSF::Clear() { - m_AllocCount = 0; - m_BlocksFreeCount = 0; - m_BlocksFreeSize = 0; - m_IsFreeBitmap = 0; - m_NullBlock->offset = 0; - m_NullBlock->size = GetSize(); - Block* block = m_NullBlock->prevPhysical; - m_NullBlock->prevPhysical = VMA_NULL; - while (block) - { - Block* prev = block->prevPhysical; - m_BlockAllocator.Free(block); - block = prev; - } - memset(m_FreeList, 0, m_ListsCount * sizeof(Block*)); - memset(m_InnerIsFreeBitmap, 0, m_MemoryClasses * sizeof(uint32_t)); - m_GranularityHandler.Clear(); + m_AllocCount = 0; + m_BlocksFreeCount = 0; + m_BlocksFreeSize = 0; + m_IsFreeBitmap = 0; + m_NullBlock->offset = 0; + m_NullBlock->size = GetSize(); + Block* block = m_NullBlock->prevPhysical; + m_NullBlock->prevPhysical = VMA_NULL; + while (block) + { + Block* prev = block->prevPhysical; + m_BlockAllocator.Free(block); + block = prev; + } + memset(m_FreeList, 0, m_ListsCount * sizeof(Block*)); + memset(m_InnerIsFreeBitmap, 0, m_MemoryClasses * sizeof(uint32_t)); + m_GranularityHandler.Clear(); } void VmaBlockMetadata_TLSF::SetAllocationUserData(VmaAllocHandle allocHandle, void* userData) { - Block* block = (Block*)allocHandle; - VMA_ASSERT(!block->IsFree() && "Trying to set user data for not allocated block!"); - block->UserData() = userData; + Block* block = (Block*)allocHandle; + VMA_ASSERT(!block->IsFree() && "Trying to set user data for not allocated block!"); + block->UserData() = userData; } void VmaBlockMetadata_TLSF::DebugLogAllAllocations() const { - for (Block* block = m_NullBlock->prevPhysical; block != VMA_NULL; block = block->prevPhysical) - if (!block->IsFree()) - DebugLogAllocation(block->offset, block->size, block->UserData()); + for (Block* block = m_NullBlock->prevPhysical; block != VMA_NULL; block = block->prevPhysical) + if (!block->IsFree()) + DebugLogAllocation(block->offset, block->size, block->UserData()); } uint8_t VmaBlockMetadata_TLSF::SizeToMemoryClass(VkDeviceSize size) const { - if (size > SMALL_BUFFER_SIZE) - return VMA_BITSCAN_MSB(size) - MEMORY_CLASS_SHIFT; - return 0; + if (size > SMALL_BUFFER_SIZE) + return uint8_t(VMA_BITSCAN_MSB(size) - MEMORY_CLASS_SHIFT); + return 0; } uint16_t VmaBlockMetadata_TLSF::SizeToSecondIndex(VkDeviceSize size, uint8_t memoryClass) const { - if (memoryClass == 0) - { - if (IsVirtual()) - return static_cast((size - 1) / 8); - else - return static_cast((size - 1) / 64); - } - return static_cast((size >> (memoryClass + MEMORY_CLASS_SHIFT - SECOND_LEVEL_INDEX)) ^ (1U << SECOND_LEVEL_INDEX)); + if (memoryClass == 0) + { + if (IsVirtual()) + return static_cast((size - 1) / 8); + else + return static_cast((size - 1) / 64); + } + return static_cast((size >> (memoryClass + MEMORY_CLASS_SHIFT - SECOND_LEVEL_INDEX)) ^ (1U << SECOND_LEVEL_INDEX)); } uint32_t VmaBlockMetadata_TLSF::GetListIndex(uint8_t memoryClass, uint16_t secondIndex) const { - if (memoryClass == 0) - return secondIndex; + if (memoryClass == 0) + return secondIndex; - const uint32_t index = static_cast(memoryClass - 1) * (1 << SECOND_LEVEL_INDEX) + secondIndex; - if (IsVirtual()) - return index + (1 << SECOND_LEVEL_INDEX); - else - return index + 4; + const uint32_t index = static_cast(memoryClass - 1) * (1 << SECOND_LEVEL_INDEX) + secondIndex; + if (IsVirtual()) + return index + (1 << SECOND_LEVEL_INDEX); + else + return index + 4; } uint32_t VmaBlockMetadata_TLSF::GetListIndex(VkDeviceSize size) const { - uint8_t memoryClass = SizeToMemoryClass(size); - return GetListIndex(memoryClass, SizeToSecondIndex(size, memoryClass)); + uint8_t memoryClass = SizeToMemoryClass(size); + return GetListIndex(memoryClass, SizeToSecondIndex(size, memoryClass)); } void VmaBlockMetadata_TLSF::RemoveFreeBlock(Block* block) { - VMA_ASSERT(block != m_NullBlock); - VMA_ASSERT(block->IsFree()); + VMA_ASSERT(block != m_NullBlock); + VMA_ASSERT(block->IsFree()); - if (block->NextFree() != VMA_NULL) - block->NextFree()->PrevFree() = block->PrevFree(); - if (block->PrevFree() != VMA_NULL) - block->PrevFree()->NextFree() = block->NextFree(); - else - { - uint8_t memClass = SizeToMemoryClass(block->size); - uint16_t secondIndex = SizeToSecondIndex(block->size, memClass); - uint32_t index = GetListIndex(memClass, secondIndex); - VMA_ASSERT(m_FreeList[index] == block); - m_FreeList[index] = block->NextFree(); - if (block->NextFree() == VMA_NULL) - { - m_InnerIsFreeBitmap[memClass] &= ~(1U << secondIndex); - if (m_InnerIsFreeBitmap[memClass] == 0) - m_IsFreeBitmap &= ~(1UL << memClass); - } - } - block->MarkTaken(); - block->UserData() = VMA_NULL; - --m_BlocksFreeCount; - m_BlocksFreeSize -= block->size; + if (block->NextFree() != VMA_NULL) + block->NextFree()->PrevFree() = block->PrevFree(); + if (block->PrevFree() != VMA_NULL) + block->PrevFree()->NextFree() = block->NextFree(); + else + { + uint8_t memClass = SizeToMemoryClass(block->size); + uint16_t secondIndex = SizeToSecondIndex(block->size, memClass); + uint32_t index = GetListIndex(memClass, secondIndex); + VMA_ASSERT(m_FreeList[index] == block); + m_FreeList[index] = block->NextFree(); + if (block->NextFree() == VMA_NULL) + { + m_InnerIsFreeBitmap[memClass] &= ~(1U << secondIndex); + if (m_InnerIsFreeBitmap[memClass] == 0) + m_IsFreeBitmap &= ~(1UL << memClass); + } + } + block->MarkTaken(); + block->UserData() = VMA_NULL; + --m_BlocksFreeCount; + m_BlocksFreeSize -= block->size; } void VmaBlockMetadata_TLSF::InsertFreeBlock(Block* block) { - VMA_ASSERT(block != m_NullBlock); - VMA_ASSERT(!block->IsFree() && "Cannot insert block twice!"); + VMA_ASSERT(block != m_NullBlock); + VMA_ASSERT(!block->IsFree() && "Cannot insert block twice!"); - uint8_t memClass = SizeToMemoryClass(block->size); - uint16_t secondIndex = SizeToSecondIndex(block->size, memClass); - uint32_t index = GetListIndex(memClass, secondIndex); - VMA_ASSERT(index < m_ListsCount); - block->PrevFree() = VMA_NULL; - block->NextFree() = m_FreeList[index]; - m_FreeList[index] = block; - if (block->NextFree() != VMA_NULL) - block->NextFree()->PrevFree() = block; - else - { - m_InnerIsFreeBitmap[memClass] |= 1U << secondIndex; - m_IsFreeBitmap |= 1UL << memClass; - } - ++m_BlocksFreeCount; - m_BlocksFreeSize += block->size; + uint8_t memClass = SizeToMemoryClass(block->size); + uint16_t secondIndex = SizeToSecondIndex(block->size, memClass); + uint32_t index = GetListIndex(memClass, secondIndex); + VMA_ASSERT(index < m_ListsCount); + block->PrevFree() = VMA_NULL; + block->NextFree() = m_FreeList[index]; + m_FreeList[index] = block; + if (block->NextFree() != VMA_NULL) + block->NextFree()->PrevFree() = block; + else + { + m_InnerIsFreeBitmap[memClass] |= 1U << secondIndex; + m_IsFreeBitmap |= 1UL << memClass; + } + ++m_BlocksFreeCount; + m_BlocksFreeSize += block->size; } void VmaBlockMetadata_TLSF::MergeBlock(Block* block, Block* prev) { - VMA_ASSERT(block->prevPhysical == prev && "Cannot merge separate physical regions!"); - VMA_ASSERT(!prev->IsFree() && "Cannot merge block that belongs to free list!"); + VMA_ASSERT(block->prevPhysical == prev && "Cannot merge separate physical regions!"); + VMA_ASSERT(!prev->IsFree() && "Cannot merge block that belongs to free list!"); - block->offset = prev->offset; - block->size += prev->size; - block->prevPhysical = prev->prevPhysical; - if (block->prevPhysical) - block->prevPhysical->nextPhysical = block; - m_BlockAllocator.Free(prev); + block->offset = prev->offset; + block->size += prev->size; + block->prevPhysical = prev->prevPhysical; + if (block->prevPhysical) + block->prevPhysical->nextPhysical = block; + m_BlockAllocator.Free(prev); } VmaBlockMetadata_TLSF::Block* VmaBlockMetadata_TLSF::FindFreeBlock(VkDeviceSize size, uint32_t& listIndex) const { - uint8_t memoryClass = SizeToMemoryClass(size); - uint32_t innerFreeMap = m_InnerIsFreeBitmap[memoryClass] & (~0U << SizeToSecondIndex(size, memoryClass)); - if (!innerFreeMap) - { - // Check higher levels for available blocks - uint32_t freeMap = m_IsFreeBitmap & (~0UL << (memoryClass + 1)); - if (!freeMap) - return VMA_NULL; // No more memory available + uint8_t memoryClass = SizeToMemoryClass(size); + uint32_t innerFreeMap = m_InnerIsFreeBitmap[memoryClass] & (~0U << SizeToSecondIndex(size, memoryClass)); + if (!innerFreeMap) + { + // Check higher levels for available blocks + uint32_t freeMap = m_IsFreeBitmap & (~0UL << (memoryClass + 1)); + if (!freeMap) + return VMA_NULL; // No more memory available - // Find lowest free region - memoryClass = VMA_BITSCAN_LSB(freeMap); - innerFreeMap = m_InnerIsFreeBitmap[memoryClass]; - VMA_ASSERT(innerFreeMap != 0); - } - // Find lowest free subregion - listIndex = GetListIndex(memoryClass, VMA_BITSCAN_LSB(innerFreeMap)); - VMA_ASSERT(m_FreeList[listIndex]); - return m_FreeList[listIndex]; + // Find lowest free region + memoryClass = VMA_BITSCAN_LSB(freeMap); + innerFreeMap = m_InnerIsFreeBitmap[memoryClass]; + VMA_ASSERT(innerFreeMap != 0); + } + // Find lowest free subregion + listIndex = GetListIndex(memoryClass, VMA_BITSCAN_LSB(innerFreeMap)); + VMA_ASSERT(m_FreeList[listIndex]); + return m_FreeList[listIndex]; } bool VmaBlockMetadata_TLSF::CheckBlock( - Block& block, - uint32_t listIndex, - VkDeviceSize allocSize, - VkDeviceSize allocAlignment, - VmaSuballocationType allocType, - VmaAllocationRequest* pAllocationRequest) + Block& block, + uint32_t listIndex, + VkDeviceSize allocSize, + VkDeviceSize allocAlignment, + VmaSuballocationType allocType, + VmaAllocationRequest* pAllocationRequest) { - VMA_ASSERT(block.IsFree() && "Block is already taken!"); + VMA_ASSERT(block.IsFree() && "Block is already taken!"); - VkDeviceSize alignedOffset = VmaAlignUp(block.offset, allocAlignment); - if (block.size < allocSize + alignedOffset - block.offset) - return false; + VkDeviceSize alignedOffset = VmaAlignUp(block.offset, allocAlignment); + if (block.size < allocSize + alignedOffset - block.offset) + return false; - // Check for granularity conflicts - if (!IsVirtual() && - m_GranularityHandler.CheckConflictAndAlignUp(alignedOffset, allocSize, block.offset, block.size, allocType)) - return false; + // Check for granularity conflicts + if (!IsVirtual() && + m_GranularityHandler.CheckConflictAndAlignUp(alignedOffset, allocSize, block.offset, block.size, allocType)) + return false; - // Alloc successful - pAllocationRequest->type = VmaAllocationRequestType::TLSF; - pAllocationRequest->allocHandle = (VmaAllocHandle)█ - pAllocationRequest->size = allocSize - GetDebugMargin(); - pAllocationRequest->customData = (void*)allocType; - pAllocationRequest->algorithmData = alignedOffset; + // Alloc successful + pAllocationRequest->type = VmaAllocationRequestType::TLSF; + pAllocationRequest->allocHandle = (VmaAllocHandle)█ + pAllocationRequest->size = allocSize - GetDebugMargin(); + pAllocationRequest->customData = (void*)allocType; + pAllocationRequest->algorithmData = alignedOffset; - // Place block at the start of list if it's normal block - if (listIndex != m_ListsCount && block.PrevFree()) - { - block.PrevFree()->NextFree() = block.NextFree(); - if (block.NextFree()) - block.NextFree()->PrevFree() = block.PrevFree(); - block.PrevFree() = VMA_NULL; - block.NextFree() = m_FreeList[listIndex]; - m_FreeList[listIndex] = █ - if (block.NextFree()) - block.NextFree()->PrevFree() = █ - } + // Place block at the start of list if it's normal block + if (listIndex != m_ListsCount && block.PrevFree()) + { + block.PrevFree()->NextFree() = block.NextFree(); + if (block.NextFree()) + block.NextFree()->PrevFree() = block.PrevFree(); + block.PrevFree() = VMA_NULL; + block.NextFree() = m_FreeList[listIndex]; + m_FreeList[listIndex] = █ + if (block.NextFree()) + block.NextFree()->PrevFree() = █ + } - return true; + return true; } #endif // _VMA_BLOCK_METADATA_TLSF_FUNCTIONS #endif // _VMA_BLOCK_METADATA_TLSF @@ -10918,312 +9533,317 @@ Synchronized internally with a mutex. */ class VmaBlockVector { - friend struct VmaDefragmentationContext_T; - VMA_CLASS_NO_COPY(VmaBlockVector) + friend struct VmaDefragmentationContext_T; + VMA_CLASS_NO_COPY_NO_MOVE(VmaBlockVector) public: - VmaBlockVector( - VmaAllocator hAllocator, - VmaPool hParentPool, - uint32_t memoryTypeIndex, - VkDeviceSize preferredBlockSize, - size_t minBlockCount, - size_t maxBlockCount, - VkDeviceSize bufferImageGranularity, - bool explicitBlockSize, - uint32_t algorithm, - float priority, - VkDeviceSize minAllocationAlignment, - void* pMemoryAllocateNext); - ~VmaBlockVector(); + VmaBlockVector( + VmaAllocator hAllocator, + VmaPool hParentPool, + uint32_t memoryTypeIndex, + VkDeviceSize preferredBlockSize, + size_t minBlockCount, + size_t maxBlockCount, + VkDeviceSize bufferImageGranularity, + bool explicitBlockSize, + uint32_t algorithm, + float priority, + VkDeviceSize minAllocationAlignment, + void* pMemoryAllocateNext); + ~VmaBlockVector(); - VmaAllocator GetAllocator() const { return m_hAllocator; } - VmaPool GetParentPool() const { return m_hParentPool; } - bool IsCustomPool() const { return m_hParentPool != VMA_NULL; } - uint32_t GetMemoryTypeIndex() const { return m_MemoryTypeIndex; } - VkDeviceSize GetPreferredBlockSize() const { return m_PreferredBlockSize; } - VkDeviceSize GetBufferImageGranularity() const { return m_BufferImageGranularity; } - uint32_t GetAlgorithm() const { return m_Algorithm; } - bool HasExplicitBlockSize() const { return m_ExplicitBlockSize; } - float GetPriority() const { return m_Priority; } - const void* GetAllocationNextPtr() const { return m_pMemoryAllocateNext; } - // To be used only while the m_Mutex is locked. Used during defragmentation. - size_t GetBlockCount() const { return m_Blocks.size(); } - // To be used only while the m_Mutex is locked. Used during defragmentation. - VmaDeviceMemoryBlock* GetBlock(size_t index) const { return m_Blocks[index]; } - VMA_RW_MUTEX &GetMutex() { return m_Mutex; } + VmaAllocator GetAllocator() const { return m_hAllocator; } + VmaPool GetParentPool() const { return m_hParentPool; } + bool IsCustomPool() const { return m_hParentPool != VMA_NULL; } + uint32_t GetMemoryTypeIndex() const { return m_MemoryTypeIndex; } + VkDeviceSize GetPreferredBlockSize() const { return m_PreferredBlockSize; } + VkDeviceSize GetBufferImageGranularity() const { return m_BufferImageGranularity; } + uint32_t GetAlgorithm() const { return m_Algorithm; } + bool HasExplicitBlockSize() const { return m_ExplicitBlockSize; } + float GetPriority() const { return m_Priority; } + const void* GetAllocationNextPtr() const { return m_pMemoryAllocateNext; } + // To be used only while the m_Mutex is locked. Used during defragmentation. + size_t GetBlockCount() const { return m_Blocks.size(); } + // To be used only while the m_Mutex is locked. Used during defragmentation. + VmaDeviceMemoryBlock* GetBlock(size_t index) const { return m_Blocks[index]; } + VMA_RW_MUTEX &GetMutex() { return m_Mutex; } - VkResult CreateMinBlocks(); - void AddStatistics(VmaStatistics& inoutStats); - void AddDetailedStatistics(VmaDetailedStatistics& inoutStats); - bool IsEmpty(); - bool IsCorruptionDetectionEnabled() const; + VkResult CreateMinBlocks(); + void AddStatistics(VmaStatistics& inoutStats); + void AddDetailedStatistics(VmaDetailedStatistics& inoutStats); + bool IsEmpty(); + bool IsCorruptionDetectionEnabled() const; - VkResult Allocate( - VkDeviceSize size, - VkDeviceSize alignment, - const VmaAllocationCreateInfo& createInfo, - VmaSuballocationType suballocType, - size_t allocationCount, - VmaAllocation* pAllocations); + VkResult Allocate( + VkDeviceSize size, + VkDeviceSize alignment, + const VmaAllocationCreateInfo& createInfo, + VmaSuballocationType suballocType, + size_t allocationCount, + VmaAllocation* pAllocations); - void Free(const VmaAllocation hAllocation); + void Free(const VmaAllocation hAllocation); #if VMA_STATS_STRING_ENABLED - void PrintDetailedMap(class VmaJsonWriter& json); + void PrintDetailedMap(class VmaJsonWriter& json); #endif - VkResult CheckCorruption(); + VkResult CheckCorruption(); private: - const VmaAllocator m_hAllocator; - const VmaPool m_hParentPool; - const uint32_t m_MemoryTypeIndex; - const VkDeviceSize m_PreferredBlockSize; - const size_t m_MinBlockCount; - const size_t m_MaxBlockCount; - const VkDeviceSize m_BufferImageGranularity; - const bool m_ExplicitBlockSize; - const uint32_t m_Algorithm; - const float m_Priority; - const VkDeviceSize m_MinAllocationAlignment; + const VmaAllocator m_hAllocator; + const VmaPool m_hParentPool; + const uint32_t m_MemoryTypeIndex; + const VkDeviceSize m_PreferredBlockSize; + const size_t m_MinBlockCount; + const size_t m_MaxBlockCount; + const VkDeviceSize m_BufferImageGranularity; + const bool m_ExplicitBlockSize; + const uint32_t m_Algorithm; + const float m_Priority; + const VkDeviceSize m_MinAllocationAlignment; - void* const m_pMemoryAllocateNext; - VMA_RW_MUTEX m_Mutex; - // Incrementally sorted by sumFreeSize, ascending. - VmaVector> m_Blocks; - uint32_t m_NextBlockId; - bool m_IncrementalSort = true; + void* const m_pMemoryAllocateNext; + VMA_RW_MUTEX m_Mutex; + // Incrementally sorted by sumFreeSize, ascending. + VmaVector> m_Blocks; + uint32_t m_NextBlockId; + bool m_IncrementalSort = true; - void SetIncrementalSort(bool val) { m_IncrementalSort = val; } + void SetIncrementalSort(bool val) { m_IncrementalSort = val; } - VkDeviceSize CalcMaxBlockSize() const; - // Finds and removes given block from vector. - void Remove(VmaDeviceMemoryBlock* pBlock); - // Performs single step in sorting m_Blocks. They may not be fully sorted - // after this call. - void IncrementallySortBlocks(); - void SortByFreeSize(); + VkDeviceSize CalcMaxBlockSize() const; + // Finds and removes given block from vector. + void Remove(VmaDeviceMemoryBlock* pBlock); + // Performs single step in sorting m_Blocks. They may not be fully sorted + // after this call. + void IncrementallySortBlocks(); + void SortByFreeSize(); - VkResult AllocatePage( - VkDeviceSize size, - VkDeviceSize alignment, - const VmaAllocationCreateInfo& createInfo, - VmaSuballocationType suballocType, - VmaAllocation* pAllocation); + VkResult AllocatePage( + VkDeviceSize size, + VkDeviceSize alignment, + const VmaAllocationCreateInfo& createInfo, + VmaSuballocationType suballocType, + VmaAllocation* pAllocation); - VkResult AllocateFromBlock( - VmaDeviceMemoryBlock* pBlock, - VkDeviceSize size, - VkDeviceSize alignment, - VmaAllocationCreateFlags allocFlags, - void* pUserData, - VmaSuballocationType suballocType, - uint32_t strategy, - VmaAllocation* pAllocation); + VkResult AllocateFromBlock( + VmaDeviceMemoryBlock* pBlock, + VkDeviceSize size, + VkDeviceSize alignment, + VmaAllocationCreateFlags allocFlags, + void* pUserData, + VmaSuballocationType suballocType, + uint32_t strategy, + VmaAllocation* pAllocation); - VkResult CommitAllocationRequest( - VmaAllocationRequest& allocRequest, - VmaDeviceMemoryBlock* pBlock, - VkDeviceSize alignment, - VmaAllocationCreateFlags allocFlags, - void* pUserData, - VmaSuballocationType suballocType, - VmaAllocation* pAllocation); + VkResult CommitAllocationRequest( + VmaAllocationRequest& allocRequest, + VmaDeviceMemoryBlock* pBlock, + VkDeviceSize alignment, + VmaAllocationCreateFlags allocFlags, + void* pUserData, + VmaSuballocationType suballocType, + VmaAllocation* pAllocation); - VkResult CreateBlock(VkDeviceSize blockSize, size_t* pNewBlockIndex); - bool HasEmptyBlock(); + VkResult CreateBlock(VkDeviceSize blockSize, size_t* pNewBlockIndex); + bool HasEmptyBlock(); }; #endif // _VMA_BLOCK_VECTOR #ifndef _VMA_DEFRAGMENTATION_CONTEXT struct VmaDefragmentationContext_T { - VMA_CLASS_NO_COPY(VmaDefragmentationContext_T) + VMA_CLASS_NO_COPY_NO_MOVE(VmaDefragmentationContext_T) public: - VmaDefragmentationContext_T( - VmaAllocator hAllocator, - const VmaDefragmentationInfo& info); - ~VmaDefragmentationContext_T(); + VmaDefragmentationContext_T( + VmaAllocator hAllocator, + const VmaDefragmentationInfo& info); + ~VmaDefragmentationContext_T(); - void GetStats(VmaDefragmentationStats& outStats) { outStats = m_GlobalStats; } + void GetStats(VmaDefragmentationStats& outStats) { outStats = m_GlobalStats; } - VkResult DefragmentPassBegin(VmaDefragmentationPassMoveInfo& moveInfo); - VkResult DefragmentPassEnd(VmaDefragmentationPassMoveInfo& moveInfo); + VkResult DefragmentPassBegin(VmaDefragmentationPassMoveInfo& moveInfo); + VkResult DefragmentPassEnd(VmaDefragmentationPassMoveInfo& moveInfo); private: - // Max number of allocations to ignore due to size constraints before ending single pass - static const uint8_t MAX_ALLOCS_TO_IGNORE = 16; - enum class CounterStatus { Pass, Ignore, End }; + // Max number of allocations to ignore due to size constraints before ending single pass + static const uint8_t MAX_ALLOCS_TO_IGNORE = 16; + enum class CounterStatus { Pass, Ignore, End }; - struct FragmentedBlock - { - uint32_t data; - VmaDeviceMemoryBlock* block; - }; - struct StateBalanced - { - VkDeviceSize avgFreeSize = 0; - VkDeviceSize avgAllocSize = UINT64_MAX; - }; - struct StateExtensive - { - enum class Operation : uint8_t - { - FindFreeBlockBuffer, FindFreeBlockTexture, FindFreeBlockAll, - MoveBuffers, MoveTextures, MoveAll, - Cleanup, Done - }; + struct FragmentedBlock + { + uint32_t data; + VmaDeviceMemoryBlock* block; + }; + struct StateBalanced + { + VkDeviceSize avgFreeSize = 0; + VkDeviceSize avgAllocSize = UINT64_MAX; + }; + struct StateExtensive + { + enum class Operation : uint8_t + { + FindFreeBlockBuffer, FindFreeBlockTexture, FindFreeBlockAll, + MoveBuffers, MoveTextures, MoveAll, + Cleanup, Done + }; - Operation operation = Operation::FindFreeBlockTexture; - size_t firstFreeBlock = SIZE_MAX; - }; - struct MoveAllocationData - { - VkDeviceSize size; - VkDeviceSize alignment; - VmaSuballocationType type; - VmaAllocationCreateFlags flags; - VmaDefragmentationMove move = {}; - }; + Operation operation = Operation::FindFreeBlockTexture; + size_t firstFreeBlock = SIZE_MAX; + }; + struct MoveAllocationData + { + VkDeviceSize size; + VkDeviceSize alignment; + VmaSuballocationType type; + VmaAllocationCreateFlags flags; + VmaDefragmentationMove move = {}; + }; - const VkDeviceSize m_MaxPassBytes; - const uint32_t m_MaxPassAllocations; + const VkDeviceSize m_MaxPassBytes; + const uint32_t m_MaxPassAllocations; + const PFN_vmaCheckDefragmentationBreakFunction m_BreakCallback; + void* m_BreakCallbackUserData; - VmaStlAllocator m_MoveAllocator; - VmaVector> m_Moves; + VmaStlAllocator m_MoveAllocator; + VmaVector> m_Moves; - uint8_t m_IgnoredAllocs = 0; - uint32_t m_Algorithm; - uint32_t m_BlockVectorCount; - VmaBlockVector* m_PoolBlockVector; - VmaBlockVector** m_pBlockVectors; - size_t m_ImmovableBlockCount = 0; - VmaDefragmentationStats m_GlobalStats = { 0 }; - VmaDefragmentationStats m_PassStats = { 0 }; - void* m_AlgorithmState = VMA_NULL; + uint8_t m_IgnoredAllocs = 0; + uint32_t m_Algorithm; + uint32_t m_BlockVectorCount; + VmaBlockVector* m_PoolBlockVector; + VmaBlockVector** m_pBlockVectors; + size_t m_ImmovableBlockCount = 0; + VmaDefragmentationStats m_GlobalStats = { 0 }; + VmaDefragmentationStats m_PassStats = { 0 }; + void* m_AlgorithmState = VMA_NULL; - static MoveAllocationData GetMoveData(VmaAllocHandle handle, VmaBlockMetadata* metadata); - CounterStatus CheckCounters(VkDeviceSize bytes); - bool IncrementCounters(VkDeviceSize bytes); - bool ReallocWithinBlock(VmaBlockVector& vector, VmaDeviceMemoryBlock* block); - bool AllocInOtherBlock(size_t start, size_t end, MoveAllocationData& data, VmaBlockVector& vector); + static MoveAllocationData GetMoveData(VmaAllocHandle handle, VmaBlockMetadata* metadata); + CounterStatus CheckCounters(VkDeviceSize bytes); + bool IncrementCounters(VkDeviceSize bytes); + bool ReallocWithinBlock(VmaBlockVector& vector, VmaDeviceMemoryBlock* block); + bool AllocInOtherBlock(size_t start, size_t end, MoveAllocationData& data, VmaBlockVector& vector); - bool ComputeDefragmentation(VmaBlockVector& vector, size_t index); - bool ComputeDefragmentation_Fast(VmaBlockVector& vector); - bool ComputeDefragmentation_Balanced(VmaBlockVector& vector, size_t index, bool update); - bool ComputeDefragmentation_Full(VmaBlockVector& vector); - bool ComputeDefragmentation_Extensive(VmaBlockVector& vector, size_t index); + bool ComputeDefragmentation(VmaBlockVector& vector, size_t index); + bool ComputeDefragmentation_Fast(VmaBlockVector& vector); + bool ComputeDefragmentation_Balanced(VmaBlockVector& vector, size_t index, bool update); + bool ComputeDefragmentation_Full(VmaBlockVector& vector); + bool ComputeDefragmentation_Extensive(VmaBlockVector& vector, size_t index); - void UpdateVectorStatistics(VmaBlockVector& vector, StateBalanced& state); - bool MoveDataToFreeBlocks(VmaSuballocationType currentType, - VmaBlockVector& vector, size_t firstFreeBlock, - bool& texturePresent, bool& bufferPresent, bool& otherPresent); + void UpdateVectorStatistics(VmaBlockVector& vector, StateBalanced& state); + bool MoveDataToFreeBlocks(VmaSuballocationType currentType, + VmaBlockVector& vector, size_t firstFreeBlock, + bool& texturePresent, bool& bufferPresent, bool& otherPresent); }; #endif // _VMA_DEFRAGMENTATION_CONTEXT #ifndef _VMA_POOL_T struct VmaPool_T { - friend struct VmaPoolListItemTraits; - VMA_CLASS_NO_COPY(VmaPool_T) + friend struct VmaPoolListItemTraits; + VMA_CLASS_NO_COPY_NO_MOVE(VmaPool_T) public: - VmaBlockVector m_BlockVector; - VmaDedicatedAllocationList m_DedicatedAllocations; + VmaBlockVector m_BlockVector; + VmaDedicatedAllocationList m_DedicatedAllocations; - VmaPool_T( - VmaAllocator hAllocator, - const VmaPoolCreateInfo& createInfo, - VkDeviceSize preferredBlockSize); - ~VmaPool_T(); + VmaPool_T( + VmaAllocator hAllocator, + const VmaPoolCreateInfo& createInfo, + VkDeviceSize preferredBlockSize); + ~VmaPool_T(); - uint32_t GetId() const { return m_Id; } - void SetId(uint32_t id) { VMA_ASSERT(m_Id == 0); m_Id = id; } + uint32_t GetId() const { return m_Id; } + void SetId(uint32_t id) { VMA_ASSERT(m_Id == 0); m_Id = id; } - const char* GetName() const { return m_Name; } - void SetName(const char* pName); + const char* GetName() const { return m_Name; } + void SetName(const char* pName); #if VMA_STATS_STRING_ENABLED - //void PrintDetailedMap(class VmaStringBuilder& sb); + //void PrintDetailedMap(class VmaStringBuilder& sb); #endif private: - uint32_t m_Id; - char* m_Name; - VmaPool_T* m_PrevPool = VMA_NULL; - VmaPool_T* m_NextPool = VMA_NULL; + uint32_t m_Id; + char* m_Name; + VmaPool_T* m_PrevPool = VMA_NULL; + VmaPool_T* m_NextPool = VMA_NULL; }; struct VmaPoolListItemTraits { - typedef VmaPool_T ItemType; + typedef VmaPool_T ItemType; - static ItemType* GetPrev(const ItemType* item) { return item->m_PrevPool; } - static ItemType* GetNext(const ItemType* item) { return item->m_NextPool; } - static ItemType*& AccessPrev(ItemType* item) { return item->m_PrevPool; } - static ItemType*& AccessNext(ItemType* item) { return item->m_NextPool; } + static ItemType* GetPrev(const ItemType* item) { return item->m_PrevPool; } + static ItemType* GetNext(const ItemType* item) { return item->m_NextPool; } + static ItemType*& AccessPrev(ItemType* item) { return item->m_PrevPool; } + static ItemType*& AccessNext(ItemType* item) { return item->m_NextPool; } }; #endif // _VMA_POOL_T #ifndef _VMA_CURRENT_BUDGET_DATA struct VmaCurrentBudgetData { - VMA_ATOMIC_UINT32 m_BlockCount[VK_MAX_MEMORY_HEAPS]; - VMA_ATOMIC_UINT32 m_AllocationCount[VK_MAX_MEMORY_HEAPS]; - VMA_ATOMIC_UINT64 m_BlockBytes[VK_MAX_MEMORY_HEAPS]; - VMA_ATOMIC_UINT64 m_AllocationBytes[VK_MAX_MEMORY_HEAPS]; + VMA_CLASS_NO_COPY_NO_MOVE(VmaCurrentBudgetData) +public: + + VMA_ATOMIC_UINT32 m_BlockCount[VK_MAX_MEMORY_HEAPS]; + VMA_ATOMIC_UINT32 m_AllocationCount[VK_MAX_MEMORY_HEAPS]; + VMA_ATOMIC_UINT64 m_BlockBytes[VK_MAX_MEMORY_HEAPS]; + VMA_ATOMIC_UINT64 m_AllocationBytes[VK_MAX_MEMORY_HEAPS]; #if VMA_MEMORY_BUDGET - VMA_ATOMIC_UINT32 m_OperationsSinceBudgetFetch; - VMA_RW_MUTEX m_BudgetMutex; - uint64_t m_VulkanUsage[VK_MAX_MEMORY_HEAPS]; - uint64_t m_VulkanBudget[VK_MAX_MEMORY_HEAPS]; - uint64_t m_BlockBytesAtBudgetFetch[VK_MAX_MEMORY_HEAPS]; + VMA_ATOMIC_UINT32 m_OperationsSinceBudgetFetch; + VMA_RW_MUTEX m_BudgetMutex; + uint64_t m_VulkanUsage[VK_MAX_MEMORY_HEAPS]; + uint64_t m_VulkanBudget[VK_MAX_MEMORY_HEAPS]; + uint64_t m_BlockBytesAtBudgetFetch[VK_MAX_MEMORY_HEAPS]; #endif // VMA_MEMORY_BUDGET - VmaCurrentBudgetData(); + VmaCurrentBudgetData(); - void AddAllocation(uint32_t heapIndex, VkDeviceSize allocationSize); - void RemoveAllocation(uint32_t heapIndex, VkDeviceSize allocationSize); + void AddAllocation(uint32_t heapIndex, VkDeviceSize allocationSize); + void RemoveAllocation(uint32_t heapIndex, VkDeviceSize allocationSize); }; #ifndef _VMA_CURRENT_BUDGET_DATA_FUNCTIONS VmaCurrentBudgetData::VmaCurrentBudgetData() { - for (uint32_t heapIndex = 0; heapIndex < VK_MAX_MEMORY_HEAPS; ++heapIndex) - { - m_BlockCount[heapIndex] = 0; - m_AllocationCount[heapIndex] = 0; - m_BlockBytes[heapIndex] = 0; - m_AllocationBytes[heapIndex] = 0; + for (uint32_t heapIndex = 0; heapIndex < VK_MAX_MEMORY_HEAPS; ++heapIndex) + { + m_BlockCount[heapIndex] = 0; + m_AllocationCount[heapIndex] = 0; + m_BlockBytes[heapIndex] = 0; + m_AllocationBytes[heapIndex] = 0; #if VMA_MEMORY_BUDGET - m_VulkanUsage[heapIndex] = 0; - m_VulkanBudget[heapIndex] = 0; - m_BlockBytesAtBudgetFetch[heapIndex] = 0; + m_VulkanUsage[heapIndex] = 0; + m_VulkanBudget[heapIndex] = 0; + m_BlockBytesAtBudgetFetch[heapIndex] = 0; #endif - } + } #if VMA_MEMORY_BUDGET - m_OperationsSinceBudgetFetch = 0; + m_OperationsSinceBudgetFetch = 0; #endif } void VmaCurrentBudgetData::AddAllocation(uint32_t heapIndex, VkDeviceSize allocationSize) { - m_AllocationBytes[heapIndex] += allocationSize; - ++m_AllocationCount[heapIndex]; + m_AllocationBytes[heapIndex] += allocationSize; + ++m_AllocationCount[heapIndex]; #if VMA_MEMORY_BUDGET - ++m_OperationsSinceBudgetFetch; + ++m_OperationsSinceBudgetFetch; #endif } void VmaCurrentBudgetData::RemoveAllocation(uint32_t heapIndex, VkDeviceSize allocationSize) { - VMA_ASSERT(m_AllocationBytes[heapIndex] >= allocationSize); - m_AllocationBytes[heapIndex] -= allocationSize; - VMA_ASSERT(m_AllocationCount[heapIndex] > 0); - --m_AllocationCount[heapIndex]; + VMA_ASSERT(m_AllocationBytes[heapIndex] >= allocationSize); + m_AllocationBytes[heapIndex] -= allocationSize; + VMA_ASSERT(m_AllocationCount[heapIndex] > 0); + --m_AllocationCount[heapIndex]; #if VMA_MEMORY_BUDGET - ++m_OperationsSinceBudgetFetch; + ++m_OperationsSinceBudgetFetch; #endif } #endif // _VMA_CURRENT_BUDGET_DATA_FUNCTIONS @@ -11235,166 +9855,168 @@ Thread-safe wrapper over VmaPoolAllocator free list, for allocation of VmaAlloca */ class VmaAllocationObjectAllocator { - VMA_CLASS_NO_COPY(VmaAllocationObjectAllocator) + VMA_CLASS_NO_COPY_NO_MOVE(VmaAllocationObjectAllocator) public: - VmaAllocationObjectAllocator(const VkAllocationCallbacks* pAllocationCallbacks) - : m_Allocator(pAllocationCallbacks, 1024) {} + VmaAllocationObjectAllocator(const VkAllocationCallbacks* pAllocationCallbacks) + : m_Allocator(pAllocationCallbacks, 1024) {} - template VmaAllocation Allocate(Types&&... args); - void Free(VmaAllocation hAlloc); + template VmaAllocation Allocate(Types&&... args); + void Free(VmaAllocation hAlloc); private: - VMA_MUTEX m_Mutex; - VmaPoolAllocator m_Allocator; + VMA_MUTEX m_Mutex; + VmaPoolAllocator m_Allocator; }; template VmaAllocation VmaAllocationObjectAllocator::Allocate(Types&&... args) { - VmaMutexLock mutexLock(m_Mutex); - return m_Allocator.Alloc(std::forward(args)...); + VmaMutexLock mutexLock(m_Mutex); + return m_Allocator.Alloc(std::forward(args)...); } void VmaAllocationObjectAllocator::Free(VmaAllocation hAlloc) { - VmaMutexLock mutexLock(m_Mutex); - m_Allocator.Free(hAlloc); + VmaMutexLock mutexLock(m_Mutex); + m_Allocator.Free(hAlloc); } #endif // _VMA_ALLOCATION_OBJECT_ALLOCATOR #ifndef _VMA_VIRTUAL_BLOCK_T struct VmaVirtualBlock_T { - VMA_CLASS_NO_COPY(VmaVirtualBlock_T) + VMA_CLASS_NO_COPY_NO_MOVE(VmaVirtualBlock_T) public: - const bool m_AllocationCallbacksSpecified; - const VkAllocationCallbacks m_AllocationCallbacks; + const bool m_AllocationCallbacksSpecified; + const VkAllocationCallbacks m_AllocationCallbacks; - VmaVirtualBlock_T(const VmaVirtualBlockCreateInfo& createInfo); - ~VmaVirtualBlock_T(); + VmaVirtualBlock_T(const VmaVirtualBlockCreateInfo& createInfo); + ~VmaVirtualBlock_T(); - VkResult Init() { return VK_SUCCESS; } - bool IsEmpty() const { return m_Metadata->IsEmpty(); } - void Free(VmaVirtualAllocation allocation) { m_Metadata->Free((VmaAllocHandle)allocation); } - void SetAllocationUserData(VmaVirtualAllocation allocation, void* userData) { m_Metadata->SetAllocationUserData((VmaAllocHandle)allocation, userData); } - void Clear() { m_Metadata->Clear(); } + VkResult Init() { return VK_SUCCESS; } + bool IsEmpty() const { return m_Metadata->IsEmpty(); } + void Free(VmaVirtualAllocation allocation) { m_Metadata->Free((VmaAllocHandle)allocation); } + void SetAllocationUserData(VmaVirtualAllocation allocation, void* userData) { m_Metadata->SetAllocationUserData((VmaAllocHandle)allocation, userData); } + void Clear() { m_Metadata->Clear(); } - const VkAllocationCallbacks* GetAllocationCallbacks() const; - void GetAllocationInfo(VmaVirtualAllocation allocation, VmaVirtualAllocationInfo& outInfo); - VkResult Allocate(const VmaVirtualAllocationCreateInfo& createInfo, VmaVirtualAllocation& outAllocation, - VkDeviceSize* outOffset); - void GetStatistics(VmaStatistics& outStats) const; - void CalculateDetailedStatistics(VmaDetailedStatistics& outStats) const; + const VkAllocationCallbacks* GetAllocationCallbacks() const; + void GetAllocationInfo(VmaVirtualAllocation allocation, VmaVirtualAllocationInfo& outInfo); + VkResult Allocate(const VmaVirtualAllocationCreateInfo& createInfo, VmaVirtualAllocation& outAllocation, + VkDeviceSize* outOffset); + void GetStatistics(VmaStatistics& outStats) const; + void CalculateDetailedStatistics(VmaDetailedStatistics& outStats) const; #if VMA_STATS_STRING_ENABLED - void BuildStatsString(bool detailedMap, VmaStringBuilder& sb) const; + void BuildStatsString(bool detailedMap, VmaStringBuilder& sb) const; #endif private: - VmaBlockMetadata* m_Metadata; + VmaBlockMetadata* m_Metadata; }; #ifndef _VMA_VIRTUAL_BLOCK_T_FUNCTIONS VmaVirtualBlock_T::VmaVirtualBlock_T(const VmaVirtualBlockCreateInfo& createInfo) - : m_AllocationCallbacksSpecified(createInfo.pAllocationCallbacks != VMA_NULL), - m_AllocationCallbacks(createInfo.pAllocationCallbacks != VMA_NULL ? *createInfo.pAllocationCallbacks : VmaEmptyAllocationCallbacks) + : m_AllocationCallbacksSpecified(createInfo.pAllocationCallbacks != VMA_NULL), + m_AllocationCallbacks(createInfo.pAllocationCallbacks != VMA_NULL ? *createInfo.pAllocationCallbacks : VmaEmptyAllocationCallbacks) { - const uint32_t algorithm = createInfo.flags & VMA_VIRTUAL_BLOCK_CREATE_ALGORITHM_MASK; - switch (algorithm) - { - default: - VMA_ASSERT(0); - case 0: - m_Metadata = vma_new(GetAllocationCallbacks(), VmaBlockMetadata_TLSF)(VK_NULL_HANDLE, 1, true); - break; - case VMA_VIRTUAL_BLOCK_CREATE_LINEAR_ALGORITHM_BIT: - m_Metadata = vma_new(GetAllocationCallbacks(), VmaBlockMetadata_Linear)(VK_NULL_HANDLE, 1, true); - break; - } + const uint32_t algorithm = createInfo.flags & VMA_VIRTUAL_BLOCK_CREATE_ALGORITHM_MASK; + switch (algorithm) + { + case 0: + m_Metadata = vma_new(GetAllocationCallbacks(), VmaBlockMetadata_TLSF)(VK_NULL_HANDLE, 1, true); + break; + case VMA_VIRTUAL_BLOCK_CREATE_LINEAR_ALGORITHM_BIT: + m_Metadata = vma_new(GetAllocationCallbacks(), VmaBlockMetadata_Linear)(VK_NULL_HANDLE, 1, true); + break; + default: + VMA_ASSERT(0); + m_Metadata = vma_new(GetAllocationCallbacks(), VmaBlockMetadata_TLSF)(VK_NULL_HANDLE, 1, true); + } - m_Metadata->Init(createInfo.size); + m_Metadata->Init(createInfo.size); } VmaVirtualBlock_T::~VmaVirtualBlock_T() { - // Define macro VMA_DEBUG_LOG to receive the list of the unfreed allocations - if (!m_Metadata->IsEmpty()) - m_Metadata->DebugLogAllAllocations(); - // This is the most important assert in the entire library. - // Hitting it means you have some memory leak - unreleased virtual allocations. - VMA_ASSERT(m_Metadata->IsEmpty() && "Some virtual allocations were not freed before destruction of this virtual block!"); + // Define macro VMA_DEBUG_LOG_FORMAT or more specialized VMA_LEAK_LOG_FORMAT + // to receive the list of the unfreed allocations. + if (!m_Metadata->IsEmpty()) + m_Metadata->DebugLogAllAllocations(); + // This is the most important assert in the entire library. + // Hitting it means you have some memory leak - unreleased virtual allocations. + VMA_ASSERT_LEAK(m_Metadata->IsEmpty() && "Some virtual allocations were not freed before destruction of this virtual block!"); - vma_delete(GetAllocationCallbacks(), m_Metadata); + vma_delete(GetAllocationCallbacks(), m_Metadata); } const VkAllocationCallbacks* VmaVirtualBlock_T::GetAllocationCallbacks() const { - return m_AllocationCallbacksSpecified ? &m_AllocationCallbacks : VMA_NULL; + return m_AllocationCallbacksSpecified ? &m_AllocationCallbacks : VMA_NULL; } void VmaVirtualBlock_T::GetAllocationInfo(VmaVirtualAllocation allocation, VmaVirtualAllocationInfo& outInfo) { - m_Metadata->GetAllocationInfo((VmaAllocHandle)allocation, outInfo); + m_Metadata->GetAllocationInfo((VmaAllocHandle)allocation, outInfo); } VkResult VmaVirtualBlock_T::Allocate(const VmaVirtualAllocationCreateInfo& createInfo, VmaVirtualAllocation& outAllocation, - VkDeviceSize* outOffset) + VkDeviceSize* outOffset) { - VmaAllocationRequest request = {}; - if (m_Metadata->CreateAllocationRequest( - createInfo.size, // allocSize - VMA_MAX(createInfo.alignment, (VkDeviceSize)1), // allocAlignment - (createInfo.flags & VMA_VIRTUAL_ALLOCATION_CREATE_UPPER_ADDRESS_BIT) != 0, // upperAddress - VMA_SUBALLOCATION_TYPE_UNKNOWN, // allocType - unimportant - createInfo.flags & VMA_VIRTUAL_ALLOCATION_CREATE_STRATEGY_MASK, // strategy - &request)) - { - m_Metadata->Alloc(request, - VMA_SUBALLOCATION_TYPE_UNKNOWN, // type - unimportant - createInfo.pUserData); - outAllocation = (VmaVirtualAllocation)request.allocHandle; - if(outOffset) - *outOffset = m_Metadata->GetAllocationOffset(request.allocHandle); - return VK_SUCCESS; - } - outAllocation = (VmaVirtualAllocation)VK_NULL_HANDLE; - if (outOffset) - *outOffset = UINT64_MAX; - return VK_ERROR_OUT_OF_DEVICE_MEMORY; + VmaAllocationRequest request = {}; + if (m_Metadata->CreateAllocationRequest( + createInfo.size, // allocSize + VMA_MAX(createInfo.alignment, (VkDeviceSize)1), // allocAlignment + (createInfo.flags & VMA_VIRTUAL_ALLOCATION_CREATE_UPPER_ADDRESS_BIT) != 0, // upperAddress + VMA_SUBALLOCATION_TYPE_UNKNOWN, // allocType - unimportant + createInfo.flags & VMA_VIRTUAL_ALLOCATION_CREATE_STRATEGY_MASK, // strategy + &request)) + { + m_Metadata->Alloc(request, + VMA_SUBALLOCATION_TYPE_UNKNOWN, // type - unimportant + createInfo.pUserData); + outAllocation = (VmaVirtualAllocation)request.allocHandle; + if (outOffset) + *outOffset = m_Metadata->GetAllocationOffset(request.allocHandle); + return VK_SUCCESS; + } + outAllocation = (VmaVirtualAllocation)VK_NULL_HANDLE; + if (outOffset) + *outOffset = UINT64_MAX; + return VK_ERROR_OUT_OF_DEVICE_MEMORY; } void VmaVirtualBlock_T::GetStatistics(VmaStatistics& outStats) const { - VmaClearStatistics(outStats); - m_Metadata->AddStatistics(outStats); + VmaClearStatistics(outStats); + m_Metadata->AddStatistics(outStats); } void VmaVirtualBlock_T::CalculateDetailedStatistics(VmaDetailedStatistics& outStats) const { - VmaClearDetailedStatistics(outStats); - m_Metadata->AddDetailedStatistics(outStats); + VmaClearDetailedStatistics(outStats); + m_Metadata->AddDetailedStatistics(outStats); } #if VMA_STATS_STRING_ENABLED void VmaVirtualBlock_T::BuildStatsString(bool detailedMap, VmaStringBuilder& sb) const { - VmaJsonWriter json(GetAllocationCallbacks(), sb); - json.BeginObject(); + VmaJsonWriter json(GetAllocationCallbacks(), sb); + json.BeginObject(); - VmaDetailedStatistics stats; - CalculateDetailedStatistics(stats); + VmaDetailedStatistics stats; + CalculateDetailedStatistics(stats); - json.WriteString("Stats"); - VmaPrintDetailedStatistics(json, stats); + json.WriteString("Stats"); + VmaPrintDetailedStatistics(json, stats); - if (detailedMap) - { - json.WriteString("Details"); - json.BeginObject(); - m_Metadata->PrintDetailedMap(json); - json.EndObject(); - } + if (detailedMap) + { + json.WriteString("Details"); + json.BeginObject(); + m_Metadata->PrintDetailedMap(json); + json.EndObject(); + } - json.EndObject(); + json.EndObject(); } #endif // VMA_STATS_STRING_ENABLED #endif // _VMA_VIRTUAL_BLOCK_T_FUNCTIONS @@ -11404,311 +10026,325 @@ void VmaVirtualBlock_T::BuildStatsString(bool detailedMap, VmaStringBuilder& sb) // Main allocator object. struct VmaAllocator_T { - VMA_CLASS_NO_COPY(VmaAllocator_T) + VMA_CLASS_NO_COPY_NO_MOVE(VmaAllocator_T) public: - bool m_UseMutex; - uint32_t m_VulkanApiVersion; - bool m_UseKhrDedicatedAllocation; // Can be set only if m_VulkanApiVersion < VK_MAKE_VERSION(1, 1, 0). - bool m_UseKhrBindMemory2; // Can be set only if m_VulkanApiVersion < VK_MAKE_VERSION(1, 1, 0). - bool m_UseExtMemoryBudget; - bool m_UseAmdDeviceCoherentMemory; - bool m_UseKhrBufferDeviceAddress; - bool m_UseExtMemoryPriority; - VkDevice m_hDevice; - VkInstance m_hInstance; - bool m_AllocationCallbacksSpecified; - VkAllocationCallbacks m_AllocationCallbacks; - VmaDeviceMemoryCallbacks m_DeviceMemoryCallbacks; - VmaAllocationObjectAllocator m_AllocationObjectAllocator; + const bool m_UseMutex; + const uint32_t m_VulkanApiVersion; + bool m_UseKhrDedicatedAllocation; // Can be set only if m_VulkanApiVersion < VK_MAKE_VERSION(1, 1, 0). + bool m_UseKhrBindMemory2; // Can be set only if m_VulkanApiVersion < VK_MAKE_VERSION(1, 1, 0). + bool m_UseExtMemoryBudget; + bool m_UseAmdDeviceCoherentMemory; + bool m_UseKhrBufferDeviceAddress; + bool m_UseExtMemoryPriority; + bool m_UseKhrMaintenance4; + bool m_UseKhrMaintenance5; + const VkDevice m_hDevice; + const VkInstance m_hInstance; + const bool m_AllocationCallbacksSpecified; + const VkAllocationCallbacks m_AllocationCallbacks; + VmaDeviceMemoryCallbacks m_DeviceMemoryCallbacks; + VmaAllocationObjectAllocator m_AllocationObjectAllocator; - // Each bit (1 << i) is set if HeapSizeLimit is enabled for that heap, so cannot allocate more than the heap size. - uint32_t m_HeapSizeLimitMask; + // Each bit (1 << i) is set if HeapSizeLimit is enabled for that heap, so cannot allocate more than the heap size. + uint32_t m_HeapSizeLimitMask; - VkPhysicalDeviceProperties m_PhysicalDeviceProperties; - VkPhysicalDeviceMemoryProperties m_MemProps; + VkPhysicalDeviceProperties m_PhysicalDeviceProperties; + VkPhysicalDeviceMemoryProperties m_MemProps; - // Default pools. - VmaBlockVector* m_pBlockVectors[VK_MAX_MEMORY_TYPES]; - VmaDedicatedAllocationList m_DedicatedAllocations[VK_MAX_MEMORY_TYPES]; + // Default pools. + VmaBlockVector* m_pBlockVectors[VK_MAX_MEMORY_TYPES]; + VmaDedicatedAllocationList m_DedicatedAllocations[VK_MAX_MEMORY_TYPES]; - VmaCurrentBudgetData m_Budget; - VMA_ATOMIC_UINT32 m_DeviceMemoryCount; // Total number of VkDeviceMemory objects. + VmaCurrentBudgetData m_Budget; + VMA_ATOMIC_UINT32 m_DeviceMemoryCount; // Total number of VkDeviceMemory objects. - VmaAllocator_T(const VmaAllocatorCreateInfo* pCreateInfo); - VkResult Init(const VmaAllocatorCreateInfo* pCreateInfo); - ~VmaAllocator_T(); + VmaAllocator_T(const VmaAllocatorCreateInfo* pCreateInfo); + VkResult Init(const VmaAllocatorCreateInfo* pCreateInfo); + ~VmaAllocator_T(); - const VkAllocationCallbacks* GetAllocationCallbacks() const - { - return m_AllocationCallbacksSpecified ? &m_AllocationCallbacks : VMA_NULL; - } - const VmaVulkanFunctions& GetVulkanFunctions() const - { - return m_VulkanFunctions; - } + const VkAllocationCallbacks* GetAllocationCallbacks() const + { + return m_AllocationCallbacksSpecified ? &m_AllocationCallbacks : VMA_NULL; + } + const VmaVulkanFunctions& GetVulkanFunctions() const + { + return m_VulkanFunctions; + } - VkPhysicalDevice GetPhysicalDevice() const { return m_PhysicalDevice; } + VkPhysicalDevice GetPhysicalDevice() const { return m_PhysicalDevice; } - VkDeviceSize GetBufferImageGranularity() const - { - return VMA_MAX( - static_cast(VMA_DEBUG_MIN_BUFFER_IMAGE_GRANULARITY), - m_PhysicalDeviceProperties.limits.bufferImageGranularity); - } + VkDeviceSize GetBufferImageGranularity() const + { + return VMA_MAX( + static_cast(VMA_DEBUG_MIN_BUFFER_IMAGE_GRANULARITY), + m_PhysicalDeviceProperties.limits.bufferImageGranularity); + } - uint32_t GetMemoryHeapCount() const { return m_MemProps.memoryHeapCount; } - uint32_t GetMemoryTypeCount() const { return m_MemProps.memoryTypeCount; } + uint32_t GetMemoryHeapCount() const { return m_MemProps.memoryHeapCount; } + uint32_t GetMemoryTypeCount() const { return m_MemProps.memoryTypeCount; } - uint32_t MemoryTypeIndexToHeapIndex(uint32_t memTypeIndex) const - { - VMA_ASSERT(memTypeIndex < m_MemProps.memoryTypeCount); - return m_MemProps.memoryTypes[memTypeIndex].heapIndex; - } - // True when specific memory type is HOST_VISIBLE but not HOST_COHERENT. - bool IsMemoryTypeNonCoherent(uint32_t memTypeIndex) const - { - return (m_MemProps.memoryTypes[memTypeIndex].propertyFlags & (VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT)) == - VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT; - } - // Minimum alignment for all allocations in specific memory type. - VkDeviceSize GetMemoryTypeMinAlignment(uint32_t memTypeIndex) const - { - return IsMemoryTypeNonCoherent(memTypeIndex) ? - VMA_MAX((VkDeviceSize)VMA_MIN_ALIGNMENT, m_PhysicalDeviceProperties.limits.nonCoherentAtomSize) : - (VkDeviceSize)VMA_MIN_ALIGNMENT; - } + uint32_t MemoryTypeIndexToHeapIndex(uint32_t memTypeIndex) const + { + VMA_ASSERT(memTypeIndex < m_MemProps.memoryTypeCount); + return m_MemProps.memoryTypes[memTypeIndex].heapIndex; + } + // True when specific memory type is HOST_VISIBLE but not HOST_COHERENT. + bool IsMemoryTypeNonCoherent(uint32_t memTypeIndex) const + { + return (m_MemProps.memoryTypes[memTypeIndex].propertyFlags & (VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT)) == + VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT; + } + // Minimum alignment for all allocations in specific memory type. + VkDeviceSize GetMemoryTypeMinAlignment(uint32_t memTypeIndex) const + { + return IsMemoryTypeNonCoherent(memTypeIndex) ? + VMA_MAX((VkDeviceSize)VMA_MIN_ALIGNMENT, m_PhysicalDeviceProperties.limits.nonCoherentAtomSize) : + (VkDeviceSize)VMA_MIN_ALIGNMENT; + } - bool IsIntegratedGpu() const - { - return m_PhysicalDeviceProperties.deviceType == VK_PHYSICAL_DEVICE_TYPE_INTEGRATED_GPU; - } + bool IsIntegratedGpu() const + { + return m_PhysicalDeviceProperties.deviceType == VK_PHYSICAL_DEVICE_TYPE_INTEGRATED_GPU; + } - uint32_t GetGlobalMemoryTypeBits() const { return m_GlobalMemoryTypeBits; } + uint32_t GetGlobalMemoryTypeBits() const { return m_GlobalMemoryTypeBits; } - void GetBufferMemoryRequirements( - VkBuffer hBuffer, - VkMemoryRequirements& memReq, - bool& requiresDedicatedAllocation, - bool& prefersDedicatedAllocation) const; - void GetImageMemoryRequirements( - VkImage hImage, - VkMemoryRequirements& memReq, - bool& requiresDedicatedAllocation, - bool& prefersDedicatedAllocation) const; - VkResult FindMemoryTypeIndex( - uint32_t memoryTypeBits, - const VmaAllocationCreateInfo* pAllocationCreateInfo, - VkFlags bufImgUsage, // VkBufferCreateInfo::usage or VkImageCreateInfo::usage. UINT32_MAX if unknown. - uint32_t* pMemoryTypeIndex) const; + void GetBufferMemoryRequirements( + VkBuffer hBuffer, + VkMemoryRequirements& memReq, + bool& requiresDedicatedAllocation, + bool& prefersDedicatedAllocation) const; + void GetImageMemoryRequirements( + VkImage hImage, + VkMemoryRequirements& memReq, + bool& requiresDedicatedAllocation, + bool& prefersDedicatedAllocation) const; + VkResult FindMemoryTypeIndex( + uint32_t memoryTypeBits, + const VmaAllocationCreateInfo* pAllocationCreateInfo, + VmaBufferImageUsage bufImgUsage, + uint32_t* pMemoryTypeIndex) const; - // Main allocation function. - VkResult AllocateMemory( - const VkMemoryRequirements& vkMemReq, - bool requiresDedicatedAllocation, - bool prefersDedicatedAllocation, - VkBuffer dedicatedBuffer, - VkImage dedicatedImage, - VkFlags dedicatedBufferImageUsage, // UINT32_MAX if unknown. - const VmaAllocationCreateInfo& createInfo, - VmaSuballocationType suballocType, - size_t allocationCount, - VmaAllocation* pAllocations); + // Main allocation function. + VkResult AllocateMemory( + const VkMemoryRequirements& vkMemReq, + bool requiresDedicatedAllocation, + bool prefersDedicatedAllocation, + VkBuffer dedicatedBuffer, + VkImage dedicatedImage, + VmaBufferImageUsage dedicatedBufferImageUsage, + const VmaAllocationCreateInfo& createInfo, + VmaSuballocationType suballocType, + size_t allocationCount, + VmaAllocation* pAllocations); - // Main deallocation function. - void FreeMemory( - size_t allocationCount, - const VmaAllocation* pAllocations); + // Main deallocation function. + void FreeMemory( + size_t allocationCount, + const VmaAllocation* pAllocations); - void CalculateStatistics(VmaTotalStatistics* pStats); + void CalculateStatistics(VmaTotalStatistics* pStats); - void GetHeapBudgets( - VmaBudget* outBudgets, uint32_t firstHeap, uint32_t heapCount); + void GetHeapBudgets( + VmaBudget* outBudgets, uint32_t firstHeap, uint32_t heapCount); #if VMA_STATS_STRING_ENABLED - void PrintDetailedMap(class VmaJsonWriter& json); + void PrintDetailedMap(class VmaJsonWriter& json); #endif - void GetAllocationInfo(VmaAllocation hAllocation, VmaAllocationInfo* pAllocationInfo); + void GetAllocationInfo(VmaAllocation hAllocation, VmaAllocationInfo* pAllocationInfo); + void GetAllocationInfo2(VmaAllocation hAllocation, VmaAllocationInfo2* pAllocationInfo); - VkResult CreatePool(const VmaPoolCreateInfo* pCreateInfo, VmaPool* pPool); - void DestroyPool(VmaPool pool); - void GetPoolStatistics(VmaPool pool, VmaStatistics* pPoolStats); - void CalculatePoolStatistics(VmaPool pool, VmaDetailedStatistics* pPoolStats); + VkResult CreatePool(const VmaPoolCreateInfo* pCreateInfo, VmaPool* pPool); + void DestroyPool(VmaPool pool); + void GetPoolStatistics(VmaPool pool, VmaStatistics* pPoolStats); + void CalculatePoolStatistics(VmaPool pool, VmaDetailedStatistics* pPoolStats); - void SetCurrentFrameIndex(uint32_t frameIndex); - uint32_t GetCurrentFrameIndex() const { return m_CurrentFrameIndex.load(); } + void SetCurrentFrameIndex(uint32_t frameIndex); + uint32_t GetCurrentFrameIndex() const { return m_CurrentFrameIndex.load(); } - VkResult CheckPoolCorruption(VmaPool hPool); - VkResult CheckCorruption(uint32_t memoryTypeBits); + VkResult CheckPoolCorruption(VmaPool hPool); + VkResult CheckCorruption(uint32_t memoryTypeBits); - // Call to Vulkan function vkAllocateMemory with accompanying bookkeeping. - VkResult AllocateVulkanMemory(const VkMemoryAllocateInfo* pAllocateInfo, VkDeviceMemory* pMemory); - // Call to Vulkan function vkFreeMemory with accompanying bookkeeping. - void FreeVulkanMemory(uint32_t memoryType, VkDeviceSize size, VkDeviceMemory hMemory); - // Call to Vulkan function vkBindBufferMemory or vkBindBufferMemory2KHR. - VkResult BindVulkanBuffer( - VkDeviceMemory memory, - VkDeviceSize memoryOffset, - VkBuffer buffer, - const void* pNext); - // Call to Vulkan function vkBindImageMemory or vkBindImageMemory2KHR. - VkResult BindVulkanImage( - VkDeviceMemory memory, - VkDeviceSize memoryOffset, - VkImage image, - const void* pNext); + // Call to Vulkan function vkAllocateMemory with accompanying bookkeeping. + VkResult AllocateVulkanMemory(const VkMemoryAllocateInfo* pAllocateInfo, VkDeviceMemory* pMemory); + // Call to Vulkan function vkFreeMemory with accompanying bookkeeping. + void FreeVulkanMemory(uint32_t memoryType, VkDeviceSize size, VkDeviceMemory hMemory); + // Call to Vulkan function vkBindBufferMemory or vkBindBufferMemory2KHR. + VkResult BindVulkanBuffer( + VkDeviceMemory memory, + VkDeviceSize memoryOffset, + VkBuffer buffer, + const void* pNext); + // Call to Vulkan function vkBindImageMemory or vkBindImageMemory2KHR. + VkResult BindVulkanImage( + VkDeviceMemory memory, + VkDeviceSize memoryOffset, + VkImage image, + const void* pNext); - VkResult Map(VmaAllocation hAllocation, void** ppData); - void Unmap(VmaAllocation hAllocation); + VkResult Map(VmaAllocation hAllocation, void** ppData); + void Unmap(VmaAllocation hAllocation); - VkResult BindBufferMemory( - VmaAllocation hAllocation, - VkDeviceSize allocationLocalOffset, - VkBuffer hBuffer, - const void* pNext); - VkResult BindImageMemory( - VmaAllocation hAllocation, - VkDeviceSize allocationLocalOffset, - VkImage hImage, - const void* pNext); + VkResult BindBufferMemory( + VmaAllocation hAllocation, + VkDeviceSize allocationLocalOffset, + VkBuffer hBuffer, + const void* pNext); + VkResult BindImageMemory( + VmaAllocation hAllocation, + VkDeviceSize allocationLocalOffset, + VkImage hImage, + const void* pNext); - VkResult FlushOrInvalidateAllocation( - VmaAllocation hAllocation, - VkDeviceSize offset, VkDeviceSize size, - VMA_CACHE_OPERATION op); - VkResult FlushOrInvalidateAllocations( - uint32_t allocationCount, - const VmaAllocation* allocations, - const VkDeviceSize* offsets, const VkDeviceSize* sizes, - VMA_CACHE_OPERATION op); + VkResult FlushOrInvalidateAllocation( + VmaAllocation hAllocation, + VkDeviceSize offset, VkDeviceSize size, + VMA_CACHE_OPERATION op); + VkResult FlushOrInvalidateAllocations( + uint32_t allocationCount, + const VmaAllocation* allocations, + const VkDeviceSize* offsets, const VkDeviceSize* sizes, + VMA_CACHE_OPERATION op); - void FillAllocation(const VmaAllocation hAllocation, uint8_t pattern); + VkResult CopyMemoryToAllocation( + const void* pSrcHostPointer, + VmaAllocation dstAllocation, + VkDeviceSize dstAllocationLocalOffset, + VkDeviceSize size); + VkResult CopyAllocationToMemory( + VmaAllocation srcAllocation, + VkDeviceSize srcAllocationLocalOffset, + void* pDstHostPointer, + VkDeviceSize size); - /* - Returns bit mask of memory types that can support defragmentation on GPU as - they support creation of required buffer for copy operations. - */ - uint32_t GetGpuDefragmentationMemoryTypeBits(); + void FillAllocation(const VmaAllocation hAllocation, uint8_t pattern); + + /* + Returns bit mask of memory types that can support defragmentation on GPU as + they support creation of required buffer for copy operations. + */ + uint32_t GetGpuDefragmentationMemoryTypeBits(); #if VMA_EXTERNAL_MEMORY - VkExternalMemoryHandleTypeFlagsKHR GetExternalMemoryHandleTypeFlags(uint32_t memTypeIndex) const - { - return m_TypeExternalMemoryHandleTypes[memTypeIndex]; - } + VkExternalMemoryHandleTypeFlagsKHR GetExternalMemoryHandleTypeFlags(uint32_t memTypeIndex) const + { + return m_TypeExternalMemoryHandleTypes[memTypeIndex]; + } #endif // #if VMA_EXTERNAL_MEMORY private: - VkDeviceSize m_PreferredLargeHeapBlockSize; + VkDeviceSize m_PreferredLargeHeapBlockSize; - VkPhysicalDevice m_PhysicalDevice; - VMA_ATOMIC_UINT32 m_CurrentFrameIndex; - VMA_ATOMIC_UINT32 m_GpuDefragmentationMemoryTypeBits; // UINT32_MAX means uninitialized. + VkPhysicalDevice m_PhysicalDevice; + VMA_ATOMIC_UINT32 m_CurrentFrameIndex; + VMA_ATOMIC_UINT32 m_GpuDefragmentationMemoryTypeBits; // UINT32_MAX means uninitialized. #if VMA_EXTERNAL_MEMORY - VkExternalMemoryHandleTypeFlagsKHR m_TypeExternalMemoryHandleTypes[VK_MAX_MEMORY_TYPES]; + VkExternalMemoryHandleTypeFlagsKHR m_TypeExternalMemoryHandleTypes[VK_MAX_MEMORY_TYPES]; #endif // #if VMA_EXTERNAL_MEMORY - VMA_RW_MUTEX m_PoolsMutex; - typedef VmaIntrusiveLinkedList PoolList; - // Protected by m_PoolsMutex. - PoolList m_Pools; - uint32_t m_NextPoolId; + VMA_RW_MUTEX m_PoolsMutex; + typedef VmaIntrusiveLinkedList PoolList; + // Protected by m_PoolsMutex. + PoolList m_Pools; + uint32_t m_NextPoolId; - VmaVulkanFunctions m_VulkanFunctions; + VmaVulkanFunctions m_VulkanFunctions; - // Global bit mask AND-ed with any memoryTypeBits to disallow certain memory types. - uint32_t m_GlobalMemoryTypeBits; + // Global bit mask AND-ed with any memoryTypeBits to disallow certain memory types. + uint32_t m_GlobalMemoryTypeBits; - void ImportVulkanFunctions(const VmaVulkanFunctions* pVulkanFunctions); + void ImportVulkanFunctions(const VmaVulkanFunctions* pVulkanFunctions); #if VMA_STATIC_VULKAN_FUNCTIONS == 1 - void ImportVulkanFunctions_Static(); + void ImportVulkanFunctions_Static(); #endif - void ImportVulkanFunctions_Custom(const VmaVulkanFunctions* pVulkanFunctions); + void ImportVulkanFunctions_Custom(const VmaVulkanFunctions* pVulkanFunctions); #if VMA_DYNAMIC_VULKAN_FUNCTIONS == 1 - void ImportVulkanFunctions_Dynamic(); + void ImportVulkanFunctions_Dynamic(); #endif - void ValidateVulkanFunctions(); + void ValidateVulkanFunctions(); - VkDeviceSize CalcPreferredBlockSize(uint32_t memTypeIndex); + VkDeviceSize CalcPreferredBlockSize(uint32_t memTypeIndex); - VkResult AllocateMemoryOfType( - VmaPool pool, - VkDeviceSize size, - VkDeviceSize alignment, - bool dedicatedPreferred, - VkBuffer dedicatedBuffer, - VkImage dedicatedImage, - VkFlags dedicatedBufferImageUsage, - const VmaAllocationCreateInfo& createInfo, - uint32_t memTypeIndex, - VmaSuballocationType suballocType, - VmaDedicatedAllocationList& dedicatedAllocations, - VmaBlockVector& blockVector, - size_t allocationCount, - VmaAllocation* pAllocations); + VkResult AllocateMemoryOfType( + VmaPool pool, + VkDeviceSize size, + VkDeviceSize alignment, + bool dedicatedPreferred, + VkBuffer dedicatedBuffer, + VkImage dedicatedImage, + VmaBufferImageUsage dedicatedBufferImageUsage, + const VmaAllocationCreateInfo& createInfo, + uint32_t memTypeIndex, + VmaSuballocationType suballocType, + VmaDedicatedAllocationList& dedicatedAllocations, + VmaBlockVector& blockVector, + size_t allocationCount, + VmaAllocation* pAllocations); - // Helper function only to be used inside AllocateDedicatedMemory. - VkResult AllocateDedicatedMemoryPage( - VmaPool pool, - VkDeviceSize size, - VmaSuballocationType suballocType, - uint32_t memTypeIndex, - const VkMemoryAllocateInfo& allocInfo, - bool map, - bool isUserDataString, - bool isMappingAllowed, - void* pUserData, - VmaAllocation* pAllocation); + // Helper function only to be used inside AllocateDedicatedMemory. + VkResult AllocateDedicatedMemoryPage( + VmaPool pool, + VkDeviceSize size, + VmaSuballocationType suballocType, + uint32_t memTypeIndex, + const VkMemoryAllocateInfo& allocInfo, + bool map, + bool isUserDataString, + bool isMappingAllowed, + void* pUserData, + VmaAllocation* pAllocation); - // Allocates and registers new VkDeviceMemory specifically for dedicated allocations. - VkResult AllocateDedicatedMemory( - VmaPool pool, - VkDeviceSize size, - VmaSuballocationType suballocType, - VmaDedicatedAllocationList& dedicatedAllocations, - uint32_t memTypeIndex, - bool map, - bool isUserDataString, - bool isMappingAllowed, - bool canAliasMemory, - void* pUserData, - float priority, - VkBuffer dedicatedBuffer, - VkImage dedicatedImage, - VkFlags dedicatedBufferImageUsage, - size_t allocationCount, - VmaAllocation* pAllocations, - const void* pNextChain = nullptr); + // Allocates and registers new VkDeviceMemory specifically for dedicated allocations. + VkResult AllocateDedicatedMemory( + VmaPool pool, + VkDeviceSize size, + VmaSuballocationType suballocType, + VmaDedicatedAllocationList& dedicatedAllocations, + uint32_t memTypeIndex, + bool map, + bool isUserDataString, + bool isMappingAllowed, + bool canAliasMemory, + void* pUserData, + float priority, + VkBuffer dedicatedBuffer, + VkImage dedicatedImage, + VmaBufferImageUsage dedicatedBufferImageUsage, + size_t allocationCount, + VmaAllocation* pAllocations, + const void* pNextChain = VMA_NULL); - void FreeDedicatedMemory(const VmaAllocation allocation); + void FreeDedicatedMemory(const VmaAllocation allocation); - VkResult CalcMemTypeParams( - VmaAllocationCreateInfo& outCreateInfo, - uint32_t memTypeIndex, - VkDeviceSize size, - size_t allocationCount); - VkResult CalcAllocationParams( - VmaAllocationCreateInfo& outCreateInfo, - bool dedicatedRequired, - bool dedicatedPreferred); + VkResult CalcMemTypeParams( + VmaAllocationCreateInfo& outCreateInfo, + uint32_t memTypeIndex, + VkDeviceSize size, + size_t allocationCount); + VkResult CalcAllocationParams( + VmaAllocationCreateInfo& outCreateInfo, + bool dedicatedRequired, + bool dedicatedPreferred); - /* - Calculates and returns bit mask of memory types that can support defragmentation - on GPU as they support creation of required buffer for copy operations. - */ - uint32_t CalculateGpuDefragmentationMemoryTypeBits() const; - uint32_t CalculateGlobalMemoryTypeBits() const; + /* + Calculates and returns bit mask of memory types that can support defragmentation + on GPU as they support creation of required buffer for copy operations. + */ + uint32_t CalculateGpuDefragmentationMemoryTypeBits() const; + uint32_t CalculateGlobalMemoryTypeBits() const; - bool GetFlushOrInvalidateRange( - VmaAllocation allocation, - VkDeviceSize offset, VkDeviceSize size, - VkMappedMemoryRange& outRange) const; + bool GetFlushOrInvalidateRange( + VmaAllocation allocation, + VkDeviceSize offset, VkDeviceSize size, + VkMappedMemoryRange& outRange) const; #if VMA_MEMORY_BUDGET - void UpdateVulkanBudget(); + void UpdateVulkanBudget(); #endif // #if VMA_MEMORY_BUDGET }; @@ -11716,2573 +10352,2568 @@ private: #ifndef _VMA_MEMORY_FUNCTIONS static void* VmaMalloc(VmaAllocator hAllocator, size_t size, size_t alignment) { - return VmaMalloc(&hAllocator->m_AllocationCallbacks, size, alignment); + return VmaMalloc(&hAllocator->m_AllocationCallbacks, size, alignment); } static void VmaFree(VmaAllocator hAllocator, void* ptr) { - VmaFree(&hAllocator->m_AllocationCallbacks, ptr); + VmaFree(&hAllocator->m_AllocationCallbacks, ptr); } template static T* VmaAllocate(VmaAllocator hAllocator) { - return (T*)VmaMalloc(hAllocator, sizeof(T), VMA_ALIGN_OF(T)); + return (T*)VmaMalloc(hAllocator, sizeof(T), VMA_ALIGN_OF(T)); } template static T* VmaAllocateArray(VmaAllocator hAllocator, size_t count) { - return (T*)VmaMalloc(hAllocator, sizeof(T) * count, VMA_ALIGN_OF(T)); + return (T*)VmaMalloc(hAllocator, sizeof(T) * count, VMA_ALIGN_OF(T)); } template static void vma_delete(VmaAllocator hAllocator, T* ptr) { - if(ptr != VMA_NULL) - { - ptr->~T(); - VmaFree(hAllocator, ptr); - } + if (ptr != VMA_NULL) + { + ptr->~T(); + VmaFree(hAllocator, ptr); + } } template static void vma_delete_array(VmaAllocator hAllocator, T* ptr, size_t count) { - if(ptr != VMA_NULL) - { - for(size_t i = count; i--; ) - ptr[i].~T(); - VmaFree(hAllocator, ptr); - } + if (ptr != VMA_NULL) + { + for (size_t i = count; i--; ) + ptr[i].~T(); + VmaFree(hAllocator, ptr); + } } #endif // _VMA_MEMORY_FUNCTIONS #ifndef _VMA_DEVICE_MEMORY_BLOCK_FUNCTIONS VmaDeviceMemoryBlock::VmaDeviceMemoryBlock(VmaAllocator hAllocator) - : m_pMetadata(VMA_NULL), - m_MemoryTypeIndex(UINT32_MAX), - m_Id(0), - m_hMemory(VK_NULL_HANDLE), - m_MapCount(0), - m_pMappedData(VMA_NULL) {} + : m_pMetadata(VMA_NULL), + m_MemoryTypeIndex(UINT32_MAX), + m_Id(0), + m_hMemory(VK_NULL_HANDLE), + m_MapCount(0), + m_pMappedData(VMA_NULL) {} VmaDeviceMemoryBlock::~VmaDeviceMemoryBlock() { - VMA_ASSERT(m_MapCount == 0 && "VkDeviceMemory block is being destroyed while it is still mapped."); - VMA_ASSERT(m_hMemory == VK_NULL_HANDLE); + VMA_ASSERT_LEAK(m_MapCount == 0 && "VkDeviceMemory block is being destroyed while it is still mapped."); + VMA_ASSERT_LEAK(m_hMemory == VK_NULL_HANDLE); } void VmaDeviceMemoryBlock::Init( - VmaAllocator hAllocator, - VmaPool hParentPool, - uint32_t newMemoryTypeIndex, - VkDeviceMemory newMemory, - VkDeviceSize newSize, - uint32_t id, - uint32_t algorithm, - VkDeviceSize bufferImageGranularity) + VmaAllocator hAllocator, + VmaPool hParentPool, + uint32_t newMemoryTypeIndex, + VkDeviceMemory newMemory, + VkDeviceSize newSize, + uint32_t id, + uint32_t algorithm, + VkDeviceSize bufferImageGranularity) { - VMA_ASSERT(m_hMemory == VK_NULL_HANDLE); + VMA_ASSERT(m_hMemory == VK_NULL_HANDLE); - m_hParentPool = hParentPool; - m_MemoryTypeIndex = newMemoryTypeIndex; - m_Id = id; - m_hMemory = newMemory; + m_hParentPool = hParentPool; + m_MemoryTypeIndex = newMemoryTypeIndex; + m_Id = id; + m_hMemory = newMemory; - switch (algorithm) - { - case VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT: - m_pMetadata = vma_new(hAllocator, VmaBlockMetadata_Linear)(hAllocator->GetAllocationCallbacks(), - bufferImageGranularity, false); // isVirtual - break; - default: - VMA_ASSERT(0); - // Fall-through. - case 0: - m_pMetadata = vma_new(hAllocator, VmaBlockMetadata_TLSF)(hAllocator->GetAllocationCallbacks(), - bufferImageGranularity, false); // isVirtual - } - m_pMetadata->Init(newSize); + switch (algorithm) + { + case 0: + m_pMetadata = vma_new(hAllocator, VmaBlockMetadata_TLSF)(hAllocator->GetAllocationCallbacks(), + bufferImageGranularity, false); // isVirtual + break; + case VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT: + m_pMetadata = vma_new(hAllocator, VmaBlockMetadata_Linear)(hAllocator->GetAllocationCallbacks(), + bufferImageGranularity, false); // isVirtual + break; + default: + VMA_ASSERT(0); + m_pMetadata = vma_new(hAllocator, VmaBlockMetadata_TLSF)(hAllocator->GetAllocationCallbacks(), + bufferImageGranularity, false); // isVirtual + } + m_pMetadata->Init(newSize); } void VmaDeviceMemoryBlock::Destroy(VmaAllocator allocator) { - // Define macro VMA_DEBUG_LOG to receive the list of the unfreed allocations - if (!m_pMetadata->IsEmpty()) - m_pMetadata->DebugLogAllAllocations(); - // This is the most important assert in the entire library. - // Hitting it means you have some memory leak - unreleased VmaAllocation objects. - VMA_ASSERT(m_pMetadata->IsEmpty() && "Some allocations were not freed before destruction of this memory block!"); + // Define macro VMA_DEBUG_LOG_FORMAT or more specialized VMA_LEAK_LOG_FORMAT + // to receive the list of the unfreed allocations. + if (!m_pMetadata->IsEmpty()) + m_pMetadata->DebugLogAllAllocations(); + // This is the most important assert in the entire library. + // Hitting it means you have some memory leak - unreleased VmaAllocation objects. + VMA_ASSERT_LEAK(m_pMetadata->IsEmpty() && "Some allocations were not freed before destruction of this memory block!"); - VMA_ASSERT(m_hMemory != VK_NULL_HANDLE); - allocator->FreeVulkanMemory(m_MemoryTypeIndex, m_pMetadata->GetSize(), m_hMemory); - m_hMemory = VK_NULL_HANDLE; + VMA_ASSERT_LEAK(m_hMemory != VK_NULL_HANDLE); + allocator->FreeVulkanMemory(m_MemoryTypeIndex, m_pMetadata->GetSize(), m_hMemory); + m_hMemory = VK_NULL_HANDLE; - vma_delete(allocator, m_pMetadata); - m_pMetadata = VMA_NULL; + vma_delete(allocator, m_pMetadata); + m_pMetadata = VMA_NULL; } void VmaDeviceMemoryBlock::PostAlloc(VmaAllocator hAllocator) { - VmaMutexLock lock(m_MapAndBindMutex, hAllocator->m_UseMutex); - m_MappingHysteresis.PostAlloc(); + VmaMutexLock lock(m_MapAndBindMutex, hAllocator->m_UseMutex); + m_MappingHysteresis.PostAlloc(); } void VmaDeviceMemoryBlock::PostFree(VmaAllocator hAllocator) { - VmaMutexLock lock(m_MapAndBindMutex, hAllocator->m_UseMutex); - if(m_MappingHysteresis.PostFree()) - { - VMA_ASSERT(m_MappingHysteresis.GetExtraMapping() == 0); - if (m_MapCount == 0) - { - m_pMappedData = VMA_NULL; - (*hAllocator->GetVulkanFunctions().vkUnmapMemory)(hAllocator->m_hDevice, m_hMemory); - } - } + VmaMutexLock lock(m_MapAndBindMutex, hAllocator->m_UseMutex); + if (m_MappingHysteresis.PostFree()) + { + VMA_ASSERT(m_MappingHysteresis.GetExtraMapping() == 0); + if (m_MapCount == 0) + { + m_pMappedData = VMA_NULL; + (*hAllocator->GetVulkanFunctions().vkUnmapMemory)(hAllocator->m_hDevice, m_hMemory); + } + } } bool VmaDeviceMemoryBlock::Validate() const { - VMA_VALIDATE((m_hMemory != VK_NULL_HANDLE) && - (m_pMetadata->GetSize() != 0)); + VMA_VALIDATE((m_hMemory != VK_NULL_HANDLE) && + (m_pMetadata->GetSize() != 0)); - return m_pMetadata->Validate(); + return m_pMetadata->Validate(); } VkResult VmaDeviceMemoryBlock::CheckCorruption(VmaAllocator hAllocator) { - void* pData = nullptr; - VkResult res = Map(hAllocator, 1, &pData); - if (res != VK_SUCCESS) - { - return res; - } + void* pData = VMA_NULL; + VkResult res = Map(hAllocator, 1, &pData); + if (res != VK_SUCCESS) + { + return res; + } - res = m_pMetadata->CheckCorruption(pData); + res = m_pMetadata->CheckCorruption(pData); - Unmap(hAllocator, 1); + Unmap(hAllocator, 1); - return res; + return res; } VkResult VmaDeviceMemoryBlock::Map(VmaAllocator hAllocator, uint32_t count, void** ppData) { - if (count == 0) - { - return VK_SUCCESS; - } + if (count == 0) + { + return VK_SUCCESS; + } - VmaMutexLock lock(m_MapAndBindMutex, hAllocator->m_UseMutex); - const uint32_t oldTotalMapCount = m_MapCount + m_MappingHysteresis.GetExtraMapping(); - m_MappingHysteresis.PostMap(); - if (oldTotalMapCount != 0) - { - m_MapCount += count; - VMA_ASSERT(m_pMappedData != VMA_NULL); - if (ppData != VMA_NULL) - { - *ppData = m_pMappedData; - } - return VK_SUCCESS; - } - else - { - VkResult result = (*hAllocator->GetVulkanFunctions().vkMapMemory)( - hAllocator->m_hDevice, - m_hMemory, - 0, // offset - VK_WHOLE_SIZE, - 0, // flags - &m_pMappedData); - if (result == VK_SUCCESS) - { - if (ppData != VMA_NULL) - { - *ppData = m_pMappedData; - } - m_MapCount = count; - } - return result; - } + VmaMutexLock lock(m_MapAndBindMutex, hAllocator->m_UseMutex); + const uint32_t oldTotalMapCount = m_MapCount + m_MappingHysteresis.GetExtraMapping(); + if (oldTotalMapCount != 0) + { + VMA_ASSERT(m_pMappedData != VMA_NULL); + m_MappingHysteresis.PostMap(); + m_MapCount += count; + if (ppData != VMA_NULL) + { + *ppData = m_pMappedData; + } + return VK_SUCCESS; + } else + { + VkResult result = (*hAllocator->GetVulkanFunctions().vkMapMemory)( + hAllocator->m_hDevice, + m_hMemory, + 0, // offset + VK_WHOLE_SIZE, + 0, // flags + &m_pMappedData); + if (result == VK_SUCCESS) + { + VMA_ASSERT(m_pMappedData != VMA_NULL); + m_MappingHysteresis.PostMap(); + m_MapCount = count; + if (ppData != VMA_NULL) + { + *ppData = m_pMappedData; + } + } + return result; + } } void VmaDeviceMemoryBlock::Unmap(VmaAllocator hAllocator, uint32_t count) { - if (count == 0) - { - return; - } + if (count == 0) + { + return; + } - VmaMutexLock lock(m_MapAndBindMutex, hAllocator->m_UseMutex); - if (m_MapCount >= count) - { - m_MapCount -= count; - const uint32_t totalMapCount = m_MapCount + m_MappingHysteresis.GetExtraMapping(); - if (totalMapCount == 0) - { - m_pMappedData = VMA_NULL; - (*hAllocator->GetVulkanFunctions().vkUnmapMemory)(hAllocator->m_hDevice, m_hMemory); - } - m_MappingHysteresis.PostUnmap(); - } - else - { - VMA_ASSERT(0 && "VkDeviceMemory block is being unmapped while it was not previously mapped."); - } + VmaMutexLock lock(m_MapAndBindMutex, hAllocator->m_UseMutex); + if (m_MapCount >= count) + { + m_MapCount -= count; + const uint32_t totalMapCount = m_MapCount + m_MappingHysteresis.GetExtraMapping(); + if (totalMapCount == 0) + { + m_pMappedData = VMA_NULL; + (*hAllocator->GetVulkanFunctions().vkUnmapMemory)(hAllocator->m_hDevice, m_hMemory); + } + m_MappingHysteresis.PostUnmap(); + } else + { + VMA_ASSERT(0 && "VkDeviceMemory block is being unmapped while it was not previously mapped."); + } } VkResult VmaDeviceMemoryBlock::WriteMagicValueAfterAllocation(VmaAllocator hAllocator, VkDeviceSize allocOffset, VkDeviceSize allocSize) { - VMA_ASSERT(VMA_DEBUG_MARGIN > 0 && VMA_DEBUG_MARGIN % 4 == 0 && VMA_DEBUG_DETECT_CORRUPTION); + VMA_ASSERT(VMA_DEBUG_MARGIN > 0 && VMA_DEBUG_MARGIN % 4 == 0 && VMA_DEBUG_DETECT_CORRUPTION); - void* pData; - VkResult res = Map(hAllocator, 1, &pData); - if (res != VK_SUCCESS) - { - return res; - } + void* pData; + VkResult res = Map(hAllocator, 1, &pData); + if (res != VK_SUCCESS) + { + return res; + } - VmaWriteMagicValue(pData, allocOffset + allocSize); + VmaWriteMagicValue(pData, allocOffset + allocSize); - Unmap(hAllocator, 1); - return VK_SUCCESS; + Unmap(hAllocator, 1); + return VK_SUCCESS; } VkResult VmaDeviceMemoryBlock::ValidateMagicValueAfterAllocation(VmaAllocator hAllocator, VkDeviceSize allocOffset, VkDeviceSize allocSize) { - VMA_ASSERT(VMA_DEBUG_MARGIN > 0 && VMA_DEBUG_MARGIN % 4 == 0 && VMA_DEBUG_DETECT_CORRUPTION); + VMA_ASSERT(VMA_DEBUG_MARGIN > 0 && VMA_DEBUG_MARGIN % 4 == 0 && VMA_DEBUG_DETECT_CORRUPTION); - void* pData; - VkResult res = Map(hAllocator, 1, &pData); - if (res != VK_SUCCESS) - { - return res; - } + void* pData; + VkResult res = Map(hAllocator, 1, &pData); + if (res != VK_SUCCESS) + { + return res; + } - if (!VmaValidateMagicValue(pData, allocOffset + allocSize)) - { - VMA_ASSERT(0 && "MEMORY CORRUPTION DETECTED AFTER FREED ALLOCATION!"); - } + if (!VmaValidateMagicValue(pData, allocOffset + allocSize)) + { + VMA_ASSERT(0 && "MEMORY CORRUPTION DETECTED AFTER FREED ALLOCATION!"); + } - Unmap(hAllocator, 1); - return VK_SUCCESS; + Unmap(hAllocator, 1); + return VK_SUCCESS; } VkResult VmaDeviceMemoryBlock::BindBufferMemory( - const VmaAllocator hAllocator, - const VmaAllocation hAllocation, - VkDeviceSize allocationLocalOffset, - VkBuffer hBuffer, - const void* pNext) + const VmaAllocator hAllocator, + const VmaAllocation hAllocation, + VkDeviceSize allocationLocalOffset, + VkBuffer hBuffer, + const void* pNext) { - VMA_ASSERT(hAllocation->GetType() == VmaAllocation_T::ALLOCATION_TYPE_BLOCK && - hAllocation->GetBlock() == this); - VMA_ASSERT(allocationLocalOffset < hAllocation->GetSize() && - "Invalid allocationLocalOffset. Did you forget that this offset is relative to the beginning of the allocation, not the whole memory block?"); - const VkDeviceSize memoryOffset = hAllocation->GetOffset() + allocationLocalOffset; - // This lock is important so that we don't call vkBind... and/or vkMap... simultaneously on the same VkDeviceMemory from multiple threads. - VmaMutexLock lock(m_MapAndBindMutex, hAllocator->m_UseMutex); - return hAllocator->BindVulkanBuffer(m_hMemory, memoryOffset, hBuffer, pNext); + VMA_ASSERT(hAllocation->GetType() == VmaAllocation_T::ALLOCATION_TYPE_BLOCK && + hAllocation->GetBlock() == this); + VMA_ASSERT(allocationLocalOffset < hAllocation->GetSize() && + "Invalid allocationLocalOffset. Did you forget that this offset is relative to the beginning of the allocation, not the whole memory block?"); + const VkDeviceSize memoryOffset = hAllocation->GetOffset() + allocationLocalOffset; + // This lock is important so that we don't call vkBind... and/or vkMap... simultaneously on the same VkDeviceMemory from multiple threads. + VmaMutexLock lock(m_MapAndBindMutex, hAllocator->m_UseMutex); + return hAllocator->BindVulkanBuffer(m_hMemory, memoryOffset, hBuffer, pNext); } VkResult VmaDeviceMemoryBlock::BindImageMemory( - const VmaAllocator hAllocator, - const VmaAllocation hAllocation, - VkDeviceSize allocationLocalOffset, - VkImage hImage, - const void* pNext) + const VmaAllocator hAllocator, + const VmaAllocation hAllocation, + VkDeviceSize allocationLocalOffset, + VkImage hImage, + const void* pNext) { - VMA_ASSERT(hAllocation->GetType() == VmaAllocation_T::ALLOCATION_TYPE_BLOCK && - hAllocation->GetBlock() == this); - VMA_ASSERT(allocationLocalOffset < hAllocation->GetSize() && - "Invalid allocationLocalOffset. Did you forget that this offset is relative to the beginning of the allocation, not the whole memory block?"); - const VkDeviceSize memoryOffset = hAllocation->GetOffset() + allocationLocalOffset; - // This lock is important so that we don't call vkBind... and/or vkMap... simultaneously on the same VkDeviceMemory from multiple threads. - VmaMutexLock lock(m_MapAndBindMutex, hAllocator->m_UseMutex); - return hAllocator->BindVulkanImage(m_hMemory, memoryOffset, hImage, pNext); + VMA_ASSERT(hAllocation->GetType() == VmaAllocation_T::ALLOCATION_TYPE_BLOCK && + hAllocation->GetBlock() == this); + VMA_ASSERT(allocationLocalOffset < hAllocation->GetSize() && + "Invalid allocationLocalOffset. Did you forget that this offset is relative to the beginning of the allocation, not the whole memory block?"); + const VkDeviceSize memoryOffset = hAllocation->GetOffset() + allocationLocalOffset; + // This lock is important so that we don't call vkBind... and/or vkMap... simultaneously on the same VkDeviceMemory from multiple threads. + VmaMutexLock lock(m_MapAndBindMutex, hAllocator->m_UseMutex); + return hAllocator->BindVulkanImage(m_hMemory, memoryOffset, hImage, pNext); } #endif // _VMA_DEVICE_MEMORY_BLOCK_FUNCTIONS #ifndef _VMA_ALLOCATION_T_FUNCTIONS VmaAllocation_T::VmaAllocation_T(bool mappingAllowed) - : m_Alignment{ 1 }, - m_Size{ 0 }, - m_pUserData{ VMA_NULL }, - m_pName{ VMA_NULL }, - m_MemoryTypeIndex{ 0 }, - m_Type{ (uint8_t)ALLOCATION_TYPE_NONE }, - m_SuballocationType{ (uint8_t)VMA_SUBALLOCATION_TYPE_UNKNOWN }, - m_MapCount{ 0 }, - m_Flags{ 0 } + : m_Alignment{ 1 }, + m_Size{ 0 }, + m_pUserData{ VMA_NULL }, + m_pName{ VMA_NULL }, + m_MemoryTypeIndex{ 0 }, + m_Type{ (uint8_t)ALLOCATION_TYPE_NONE }, + m_SuballocationType{ (uint8_t)VMA_SUBALLOCATION_TYPE_UNKNOWN }, + m_MapCount{ 0 }, + m_Flags{ 0 } { - if(mappingAllowed) - m_Flags |= (uint8_t)FLAG_MAPPING_ALLOWED; - -#if VMA_STATS_STRING_ENABLED - m_BufferImageUsage = 0; -#endif + if (mappingAllowed) + m_Flags |= (uint8_t)FLAG_MAPPING_ALLOWED; } VmaAllocation_T::~VmaAllocation_T() { - VMA_ASSERT(m_MapCount == 0 && "Allocation was not unmapped before destruction."); + VMA_ASSERT_LEAK(m_MapCount == 0 && "Allocation was not unmapped before destruction."); - // Check if owned string was freed. - VMA_ASSERT(m_pName == VMA_NULL); + // Check if owned string was freed. + VMA_ASSERT(m_pName == VMA_NULL); } void VmaAllocation_T::InitBlockAllocation( - VmaDeviceMemoryBlock* block, - VmaAllocHandle allocHandle, - VkDeviceSize alignment, - VkDeviceSize size, - uint32_t memoryTypeIndex, - VmaSuballocationType suballocationType, - bool mapped) + VmaDeviceMemoryBlock* block, + VmaAllocHandle allocHandle, + VkDeviceSize alignment, + VkDeviceSize size, + uint32_t memoryTypeIndex, + VmaSuballocationType suballocationType, + bool mapped) { - VMA_ASSERT(m_Type == ALLOCATION_TYPE_NONE); - VMA_ASSERT(block != VMA_NULL); - m_Type = (uint8_t)ALLOCATION_TYPE_BLOCK; - m_Alignment = alignment; - m_Size = size; - m_MemoryTypeIndex = memoryTypeIndex; - if(mapped) - { - VMA_ASSERT(IsMappingAllowed() && "Mapping is not allowed on this allocation! Please use one of the new VMA_ALLOCATION_CREATE_HOST_ACCESS_* flags when creating it."); - m_Flags |= (uint8_t)FLAG_PERSISTENT_MAP; - } - m_SuballocationType = (uint8_t)suballocationType; - m_BlockAllocation.m_Block = block; - m_BlockAllocation.m_AllocHandle = allocHandle; + VMA_ASSERT(m_Type == ALLOCATION_TYPE_NONE); + VMA_ASSERT(block != VMA_NULL); + m_Type = (uint8_t)ALLOCATION_TYPE_BLOCK; + m_Alignment = alignment; + m_Size = size; + m_MemoryTypeIndex = memoryTypeIndex; + if (mapped) + { + VMA_ASSERT(IsMappingAllowed() && "Mapping is not allowed on this allocation! Please use one of the new VMA_ALLOCATION_CREATE_HOST_ACCESS_* flags when creating it."); + m_Flags |= (uint8_t)FLAG_PERSISTENT_MAP; + } + m_SuballocationType = (uint8_t)suballocationType; + m_BlockAllocation.m_Block = block; + m_BlockAllocation.m_AllocHandle = allocHandle; } void VmaAllocation_T::InitDedicatedAllocation( - VmaPool hParentPool, - uint32_t memoryTypeIndex, - VkDeviceMemory hMemory, - VmaSuballocationType suballocationType, - void* pMappedData, - VkDeviceSize size) + VmaPool hParentPool, + uint32_t memoryTypeIndex, + VkDeviceMemory hMemory, + VmaSuballocationType suballocationType, + void* pMappedData, + VkDeviceSize size) { - VMA_ASSERT(m_Type == ALLOCATION_TYPE_NONE); - VMA_ASSERT(hMemory != VK_NULL_HANDLE); - m_Type = (uint8_t)ALLOCATION_TYPE_DEDICATED; - m_Alignment = 0; - m_Size = size; - m_MemoryTypeIndex = memoryTypeIndex; - m_SuballocationType = (uint8_t)suballocationType; - if(pMappedData != VMA_NULL) - { - VMA_ASSERT(IsMappingAllowed() && "Mapping is not allowed on this allocation! Please use one of the new VMA_ALLOCATION_CREATE_HOST_ACCESS_* flags when creating it."); - m_Flags |= (uint8_t)FLAG_PERSISTENT_MAP; - } - m_DedicatedAllocation.m_hParentPool = hParentPool; - m_DedicatedAllocation.m_hMemory = hMemory; - m_DedicatedAllocation.m_pMappedData = pMappedData; - m_DedicatedAllocation.m_Prev = VMA_NULL; - m_DedicatedAllocation.m_Next = VMA_NULL; + VMA_ASSERT(m_Type == ALLOCATION_TYPE_NONE); + VMA_ASSERT(hMemory != VK_NULL_HANDLE); + m_Type = (uint8_t)ALLOCATION_TYPE_DEDICATED; + m_Alignment = 0; + m_Size = size; + m_MemoryTypeIndex = memoryTypeIndex; + m_SuballocationType = (uint8_t)suballocationType; + if (pMappedData != VMA_NULL) + { + VMA_ASSERT(IsMappingAllowed() && "Mapping is not allowed on this allocation! Please use one of the new VMA_ALLOCATION_CREATE_HOST_ACCESS_* flags when creating it."); + m_Flags |= (uint8_t)FLAG_PERSISTENT_MAP; + } + m_DedicatedAllocation.m_hParentPool = hParentPool; + m_DedicatedAllocation.m_hMemory = hMemory; + m_DedicatedAllocation.m_pMappedData = pMappedData; + m_DedicatedAllocation.m_Prev = VMA_NULL; + m_DedicatedAllocation.m_Next = VMA_NULL; } void VmaAllocation_T::SetName(VmaAllocator hAllocator, const char* pName) { - VMA_ASSERT(pName == VMA_NULL || pName != m_pName); + VMA_ASSERT(pName == VMA_NULL || pName != m_pName); - FreeName(hAllocator); + FreeName(hAllocator); - if (pName != VMA_NULL) - m_pName = VmaCreateStringCopy(hAllocator->GetAllocationCallbacks(), pName); + if (pName != VMA_NULL) + m_pName = VmaCreateStringCopy(hAllocator->GetAllocationCallbacks(), pName); } uint8_t VmaAllocation_T::SwapBlockAllocation(VmaAllocator hAllocator, VmaAllocation allocation) { - VMA_ASSERT(allocation != VMA_NULL); - VMA_ASSERT(m_Type == ALLOCATION_TYPE_BLOCK); - VMA_ASSERT(allocation->m_Type == ALLOCATION_TYPE_BLOCK); + VMA_ASSERT(allocation != VMA_NULL); + VMA_ASSERT(m_Type == ALLOCATION_TYPE_BLOCK); + VMA_ASSERT(allocation->m_Type == ALLOCATION_TYPE_BLOCK); - if (m_MapCount != 0) - m_BlockAllocation.m_Block->Unmap(hAllocator, m_MapCount); + if (m_MapCount != 0) + m_BlockAllocation.m_Block->Unmap(hAllocator, m_MapCount); - m_BlockAllocation.m_Block->m_pMetadata->SetAllocationUserData(m_BlockAllocation.m_AllocHandle, allocation); - VMA_SWAP(m_BlockAllocation, allocation->m_BlockAllocation); - m_BlockAllocation.m_Block->m_pMetadata->SetAllocationUserData(m_BlockAllocation.m_AllocHandle, this); + m_BlockAllocation.m_Block->m_pMetadata->SetAllocationUserData(m_BlockAllocation.m_AllocHandle, allocation); + std::swap(m_BlockAllocation, allocation->m_BlockAllocation); + m_BlockAllocation.m_Block->m_pMetadata->SetAllocationUserData(m_BlockAllocation.m_AllocHandle, this); #if VMA_STATS_STRING_ENABLED - VMA_SWAP(m_BufferImageUsage, allocation->m_BufferImageUsage); + std::swap(m_BufferImageUsage, allocation->m_BufferImageUsage); #endif - return m_MapCount; + return m_MapCount; } VmaAllocHandle VmaAllocation_T::GetAllocHandle() const { - switch (m_Type) - { - case ALLOCATION_TYPE_BLOCK: - return m_BlockAllocation.m_AllocHandle; - case ALLOCATION_TYPE_DEDICATED: - return VK_NULL_HANDLE; - default: - VMA_ASSERT(0); - return VK_NULL_HANDLE; - } + switch (m_Type) + { + case ALLOCATION_TYPE_BLOCK: + return m_BlockAllocation.m_AllocHandle; + case ALLOCATION_TYPE_DEDICATED: + return VK_NULL_HANDLE; + default: + VMA_ASSERT(0); + return VK_NULL_HANDLE; + } } VkDeviceSize VmaAllocation_T::GetOffset() const { - switch (m_Type) - { - case ALLOCATION_TYPE_BLOCK: - return m_BlockAllocation.m_Block->m_pMetadata->GetAllocationOffset(m_BlockAllocation.m_AllocHandle); - case ALLOCATION_TYPE_DEDICATED: - return 0; - default: - VMA_ASSERT(0); - return 0; - } + switch (m_Type) + { + case ALLOCATION_TYPE_BLOCK: + return m_BlockAllocation.m_Block->m_pMetadata->GetAllocationOffset(m_BlockAllocation.m_AllocHandle); + case ALLOCATION_TYPE_DEDICATED: + return 0; + default: + VMA_ASSERT(0); + return 0; + } } VmaPool VmaAllocation_T::GetParentPool() const { - switch (m_Type) - { - case ALLOCATION_TYPE_BLOCK: - return m_BlockAllocation.m_Block->GetParentPool(); - case ALLOCATION_TYPE_DEDICATED: - return m_DedicatedAllocation.m_hParentPool; - default: - VMA_ASSERT(0); - return VK_NULL_HANDLE; - } + switch (m_Type) + { + case ALLOCATION_TYPE_BLOCK: + return m_BlockAllocation.m_Block->GetParentPool(); + case ALLOCATION_TYPE_DEDICATED: + return m_DedicatedAllocation.m_hParentPool; + default: + VMA_ASSERT(0); + return VK_NULL_HANDLE; + } } VkDeviceMemory VmaAllocation_T::GetMemory() const { - switch (m_Type) - { - case ALLOCATION_TYPE_BLOCK: - return m_BlockAllocation.m_Block->GetDeviceMemory(); - case ALLOCATION_TYPE_DEDICATED: - return m_DedicatedAllocation.m_hMemory; - default: - VMA_ASSERT(0); - return VK_NULL_HANDLE; - } + switch (m_Type) + { + case ALLOCATION_TYPE_BLOCK: + return m_BlockAllocation.m_Block->GetDeviceMemory(); + case ALLOCATION_TYPE_DEDICATED: + return m_DedicatedAllocation.m_hMemory; + default: + VMA_ASSERT(0); + return VK_NULL_HANDLE; + } } void* VmaAllocation_T::GetMappedData() const { - switch (m_Type) - { - case ALLOCATION_TYPE_BLOCK: - if (m_MapCount != 0 || IsPersistentMap()) - { - void* pBlockData = m_BlockAllocation.m_Block->GetMappedData(); - VMA_ASSERT(pBlockData != VMA_NULL); - return (char*)pBlockData + GetOffset(); - } - else - { - return VMA_NULL; - } - break; - case ALLOCATION_TYPE_DEDICATED: - VMA_ASSERT((m_DedicatedAllocation.m_pMappedData != VMA_NULL) == (m_MapCount != 0 || IsPersistentMap())); - return m_DedicatedAllocation.m_pMappedData; - default: - VMA_ASSERT(0); - return VMA_NULL; - } + switch (m_Type) + { + case ALLOCATION_TYPE_BLOCK: + if (m_MapCount != 0 || IsPersistentMap()) + { + void* pBlockData = m_BlockAllocation.m_Block->GetMappedData(); + VMA_ASSERT(pBlockData != VMA_NULL); + return (char*)pBlockData + GetOffset(); + } else + { + return VMA_NULL; + } + break; + case ALLOCATION_TYPE_DEDICATED: + VMA_ASSERT((m_DedicatedAllocation.m_pMappedData != VMA_NULL) == (m_MapCount != 0 || IsPersistentMap())); + return m_DedicatedAllocation.m_pMappedData; + default: + VMA_ASSERT(0); + return VMA_NULL; + } } void VmaAllocation_T::BlockAllocMap() { - VMA_ASSERT(GetType() == ALLOCATION_TYPE_BLOCK); - VMA_ASSERT(IsMappingAllowed() && "Mapping is not allowed on this allocation! Please use one of the new VMA_ALLOCATION_CREATE_HOST_ACCESS_* flags when creating it."); + VMA_ASSERT(GetType() == ALLOCATION_TYPE_BLOCK); + VMA_ASSERT(IsMappingAllowed() && "Mapping is not allowed on this allocation! Please use one of the new VMA_ALLOCATION_CREATE_HOST_ACCESS_* flags when creating it."); - if (m_MapCount < 0xFF) - { - ++m_MapCount; - } - else - { - VMA_ASSERT(0 && "Allocation mapped too many times simultaneously."); - } + if (m_MapCount < 0xFF) + { + ++m_MapCount; + } else + { + VMA_ASSERT(0 && "Allocation mapped too many times simultaneously."); + } } void VmaAllocation_T::BlockAllocUnmap() { - VMA_ASSERT(GetType() == ALLOCATION_TYPE_BLOCK); + VMA_ASSERT(GetType() == ALLOCATION_TYPE_BLOCK); - if (m_MapCount > 0) - { - --m_MapCount; - } - else - { - VMA_ASSERT(0 && "Unmapping allocation not previously mapped."); - } + if (m_MapCount > 0) + { + --m_MapCount; + } else + { + VMA_ASSERT(0 && "Unmapping allocation not previously mapped."); + } } VkResult VmaAllocation_T::DedicatedAllocMap(VmaAllocator hAllocator, void** ppData) { - VMA_ASSERT(GetType() == ALLOCATION_TYPE_DEDICATED); - VMA_ASSERT(IsMappingAllowed() && "Mapping is not allowed on this allocation! Please use one of the new VMA_ALLOCATION_CREATE_HOST_ACCESS_* flags when creating it."); + VMA_ASSERT(GetType() == ALLOCATION_TYPE_DEDICATED); + VMA_ASSERT(IsMappingAllowed() && "Mapping is not allowed on this allocation! Please use one of the new VMA_ALLOCATION_CREATE_HOST_ACCESS_* flags when creating it."); - if (m_MapCount != 0 || IsPersistentMap()) - { - if (m_MapCount < 0xFF) - { - VMA_ASSERT(m_DedicatedAllocation.m_pMappedData != VMA_NULL); - *ppData = m_DedicatedAllocation.m_pMappedData; - ++m_MapCount; - return VK_SUCCESS; - } - else - { - VMA_ASSERT(0 && "Dedicated allocation mapped too many times simultaneously."); - return VK_ERROR_MEMORY_MAP_FAILED; - } - } - else - { - VkResult result = (*hAllocator->GetVulkanFunctions().vkMapMemory)( - hAllocator->m_hDevice, - m_DedicatedAllocation.m_hMemory, - 0, // offset - VK_WHOLE_SIZE, - 0, // flags - ppData); - if (result == VK_SUCCESS) - { - m_DedicatedAllocation.m_pMappedData = *ppData; - m_MapCount = 1; - } - return result; - } + if (m_MapCount != 0 || IsPersistentMap()) + { + if (m_MapCount < 0xFF) + { + VMA_ASSERT(m_DedicatedAllocation.m_pMappedData != VMA_NULL); + *ppData = m_DedicatedAllocation.m_pMappedData; + ++m_MapCount; + return VK_SUCCESS; + } else + { + VMA_ASSERT(0 && "Dedicated allocation mapped too many times simultaneously."); + return VK_ERROR_MEMORY_MAP_FAILED; + } + } else + { + VkResult result = (*hAllocator->GetVulkanFunctions().vkMapMemory)( + hAllocator->m_hDevice, + m_DedicatedAllocation.m_hMemory, + 0, // offset + VK_WHOLE_SIZE, + 0, // flags + ppData); + if (result == VK_SUCCESS) + { + m_DedicatedAllocation.m_pMappedData = *ppData; + m_MapCount = 1; + } + return result; + } } void VmaAllocation_T::DedicatedAllocUnmap(VmaAllocator hAllocator) { - VMA_ASSERT(GetType() == ALLOCATION_TYPE_DEDICATED); + VMA_ASSERT(GetType() == ALLOCATION_TYPE_DEDICATED); - if (m_MapCount > 0) - { - --m_MapCount; - if (m_MapCount == 0 && !IsPersistentMap()) - { - m_DedicatedAllocation.m_pMappedData = VMA_NULL; - (*hAllocator->GetVulkanFunctions().vkUnmapMemory)( - hAllocator->m_hDevice, - m_DedicatedAllocation.m_hMemory); - } - } - else - { - VMA_ASSERT(0 && "Unmapping dedicated allocation not previously mapped."); - } + if (m_MapCount > 0) + { + --m_MapCount; + if (m_MapCount == 0 && !IsPersistentMap()) + { + m_DedicatedAllocation.m_pMappedData = VMA_NULL; + (*hAllocator->GetVulkanFunctions().vkUnmapMemory)( + hAllocator->m_hDevice, + m_DedicatedAllocation.m_hMemory); + } + } else + { + VMA_ASSERT(0 && "Unmapping dedicated allocation not previously mapped."); + } } #if VMA_STATS_STRING_ENABLED -void VmaAllocation_T::InitBufferImageUsage(uint32_t bufferImageUsage) -{ - VMA_ASSERT(m_BufferImageUsage == 0); - m_BufferImageUsage = bufferImageUsage; -} - void VmaAllocation_T::PrintParameters(class VmaJsonWriter& json) const { - json.WriteString("Type"); - json.WriteString(VMA_SUBALLOCATION_TYPE_NAMES[m_SuballocationType]); + json.WriteString("Type"); + json.WriteString(VMA_SUBALLOCATION_TYPE_NAMES[m_SuballocationType]); - json.WriteString("Size"); - json.WriteNumber(m_Size); - json.WriteString("Usage"); - json.WriteNumber(m_BufferImageUsage); + json.WriteString("Size"); + json.WriteNumber(m_Size); + json.WriteString("Usage"); + json.WriteNumber(m_BufferImageUsage.Value); // It may be uint32_t or uint64_t. - if (m_pUserData != VMA_NULL) - { - json.WriteString("CustomData"); - json.BeginString(); - json.ContinueString_Pointer(m_pUserData); - json.EndString(); - } - if (m_pName != VMA_NULL) - { - json.WriteString("Name"); - json.WriteString(m_pName); - } + if (m_pUserData != VMA_NULL) + { + json.WriteString("CustomData"); + json.BeginString(); + json.ContinueString_Pointer(m_pUserData); + json.EndString(); + } + if (m_pName != VMA_NULL) + { + json.WriteString("Name"); + json.WriteString(m_pName); + } } #endif // VMA_STATS_STRING_ENABLED void VmaAllocation_T::FreeName(VmaAllocator hAllocator) { - if(m_pName) - { - VmaFreeString(hAllocator->GetAllocationCallbacks(), m_pName); - m_pName = VMA_NULL; - } + if (m_pName) + { + VmaFreeString(hAllocator->GetAllocationCallbacks(), m_pName); + m_pName = VMA_NULL; + } } #endif // _VMA_ALLOCATION_T_FUNCTIONS #ifndef _VMA_BLOCK_VECTOR_FUNCTIONS VmaBlockVector::VmaBlockVector( - VmaAllocator hAllocator, - VmaPool hParentPool, - uint32_t memoryTypeIndex, - VkDeviceSize preferredBlockSize, - size_t minBlockCount, - size_t maxBlockCount, - VkDeviceSize bufferImageGranularity, - bool explicitBlockSize, - uint32_t algorithm, - float priority, - VkDeviceSize minAllocationAlignment, - void* pMemoryAllocateNext) - : m_hAllocator(hAllocator), - m_hParentPool(hParentPool), - m_MemoryTypeIndex(memoryTypeIndex), - m_PreferredBlockSize(preferredBlockSize), - m_MinBlockCount(minBlockCount), - m_MaxBlockCount(maxBlockCount), - m_BufferImageGranularity(bufferImageGranularity), - m_ExplicitBlockSize(explicitBlockSize), - m_Algorithm(algorithm), - m_Priority(priority), - m_MinAllocationAlignment(minAllocationAlignment), - m_pMemoryAllocateNext(pMemoryAllocateNext), - m_Blocks(VmaStlAllocator(hAllocator->GetAllocationCallbacks())), - m_NextBlockId(0) {} + VmaAllocator hAllocator, + VmaPool hParentPool, + uint32_t memoryTypeIndex, + VkDeviceSize preferredBlockSize, + size_t minBlockCount, + size_t maxBlockCount, + VkDeviceSize bufferImageGranularity, + bool explicitBlockSize, + uint32_t algorithm, + float priority, + VkDeviceSize minAllocationAlignment, + void* pMemoryAllocateNext) + : m_hAllocator(hAllocator), + m_hParentPool(hParentPool), + m_MemoryTypeIndex(memoryTypeIndex), + m_PreferredBlockSize(preferredBlockSize), + m_MinBlockCount(minBlockCount), + m_MaxBlockCount(maxBlockCount), + m_BufferImageGranularity(bufferImageGranularity), + m_ExplicitBlockSize(explicitBlockSize), + m_Algorithm(algorithm), + m_Priority(priority), + m_MinAllocationAlignment(minAllocationAlignment), + m_pMemoryAllocateNext(pMemoryAllocateNext), + m_Blocks(VmaStlAllocator(hAllocator->GetAllocationCallbacks())), + m_NextBlockId(0) {} VmaBlockVector::~VmaBlockVector() { - for (size_t i = m_Blocks.size(); i--; ) - { - m_Blocks[i]->Destroy(m_hAllocator); - vma_delete(m_hAllocator, m_Blocks[i]); - } + for (size_t i = m_Blocks.size(); i--; ) + { + m_Blocks[i]->Destroy(m_hAllocator); + vma_delete(m_hAllocator, m_Blocks[i]); + } } VkResult VmaBlockVector::CreateMinBlocks() { - for (size_t i = 0; i < m_MinBlockCount; ++i) - { - VkResult res = CreateBlock(m_PreferredBlockSize, VMA_NULL); - if (res != VK_SUCCESS) - { - return res; - } - } - return VK_SUCCESS; + for (size_t i = 0; i < m_MinBlockCount; ++i) + { + VkResult res = CreateBlock(m_PreferredBlockSize, VMA_NULL); + if (res != VK_SUCCESS) + { + return res; + } + } + return VK_SUCCESS; } void VmaBlockVector::AddStatistics(VmaStatistics& inoutStats) { - VmaMutexLockRead lock(m_Mutex, m_hAllocator->m_UseMutex); + VmaMutexLockRead lock(m_Mutex, m_hAllocator->m_UseMutex); - const size_t blockCount = m_Blocks.size(); - for (uint32_t blockIndex = 0; blockIndex < blockCount; ++blockIndex) - { - const VmaDeviceMemoryBlock* const pBlock = m_Blocks[blockIndex]; - VMA_ASSERT(pBlock); - VMA_HEAVY_ASSERT(pBlock->Validate()); - pBlock->m_pMetadata->AddStatistics(inoutStats); - } + const size_t blockCount = m_Blocks.size(); + for (uint32_t blockIndex = 0; blockIndex < blockCount; ++blockIndex) + { + const VmaDeviceMemoryBlock* const pBlock = m_Blocks[blockIndex]; + VMA_ASSERT(pBlock); + VMA_HEAVY_ASSERT(pBlock->Validate()); + pBlock->m_pMetadata->AddStatistics(inoutStats); + } } void VmaBlockVector::AddDetailedStatistics(VmaDetailedStatistics& inoutStats) { - VmaMutexLockRead lock(m_Mutex, m_hAllocator->m_UseMutex); + VmaMutexLockRead lock(m_Mutex, m_hAllocator->m_UseMutex); - const size_t blockCount = m_Blocks.size(); - for (uint32_t blockIndex = 0; blockIndex < blockCount; ++blockIndex) - { - const VmaDeviceMemoryBlock* const pBlock = m_Blocks[blockIndex]; - VMA_ASSERT(pBlock); - VMA_HEAVY_ASSERT(pBlock->Validate()); - pBlock->m_pMetadata->AddDetailedStatistics(inoutStats); - } + const size_t blockCount = m_Blocks.size(); + for (uint32_t blockIndex = 0; blockIndex < blockCount; ++blockIndex) + { + const VmaDeviceMemoryBlock* const pBlock = m_Blocks[blockIndex]; + VMA_ASSERT(pBlock); + VMA_HEAVY_ASSERT(pBlock->Validate()); + pBlock->m_pMetadata->AddDetailedStatistics(inoutStats); + } } bool VmaBlockVector::IsEmpty() { - VmaMutexLockRead lock(m_Mutex, m_hAllocator->m_UseMutex); - return m_Blocks.empty(); + VmaMutexLockRead lock(m_Mutex, m_hAllocator->m_UseMutex); + return m_Blocks.empty(); } bool VmaBlockVector::IsCorruptionDetectionEnabled() const { - const uint32_t requiredMemFlags = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT; - return (VMA_DEBUG_DETECT_CORRUPTION != 0) && - (VMA_DEBUG_MARGIN > 0) && - (m_Algorithm == 0 || m_Algorithm == VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT) && - (m_hAllocator->m_MemProps.memoryTypes[m_MemoryTypeIndex].propertyFlags & requiredMemFlags) == requiredMemFlags; + const uint32_t requiredMemFlags = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT; + return (VMA_DEBUG_DETECT_CORRUPTION != 0) && + (VMA_DEBUG_MARGIN > 0) && + (m_Algorithm == 0 || m_Algorithm == VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT) && + (m_hAllocator->m_MemProps.memoryTypes[m_MemoryTypeIndex].propertyFlags & requiredMemFlags) == requiredMemFlags; } VkResult VmaBlockVector::Allocate( - VkDeviceSize size, - VkDeviceSize alignment, - const VmaAllocationCreateInfo& createInfo, - VmaSuballocationType suballocType, - size_t allocationCount, - VmaAllocation* pAllocations) + VkDeviceSize size, + VkDeviceSize alignment, + const VmaAllocationCreateInfo& createInfo, + VmaSuballocationType suballocType, + size_t allocationCount, + VmaAllocation* pAllocations) { - size_t allocIndex; - VkResult res = VK_SUCCESS; + size_t allocIndex; + VkResult res = VK_SUCCESS; - alignment = VMA_MAX(alignment, m_MinAllocationAlignment); + alignment = VMA_MAX(alignment, m_MinAllocationAlignment); - if (IsCorruptionDetectionEnabled()) - { - size = VmaAlignUp(size, sizeof(VMA_CORRUPTION_DETECTION_MAGIC_VALUE)); - alignment = VmaAlignUp(alignment, sizeof(VMA_CORRUPTION_DETECTION_MAGIC_VALUE)); - } + if (IsCorruptionDetectionEnabled()) + { + size = VmaAlignUp(size, sizeof(VMA_CORRUPTION_DETECTION_MAGIC_VALUE)); + alignment = VmaAlignUp(alignment, sizeof(VMA_CORRUPTION_DETECTION_MAGIC_VALUE)); + } - { - VmaMutexLockWrite lock(m_Mutex, m_hAllocator->m_UseMutex); - for (allocIndex = 0; allocIndex < allocationCount; ++allocIndex) - { - res = AllocatePage( - size, - alignment, - createInfo, - suballocType, - pAllocations + allocIndex); - if (res != VK_SUCCESS) - { - break; - } - } - } + { + VmaMutexLockWrite lock(m_Mutex, m_hAllocator->m_UseMutex); + for (allocIndex = 0; allocIndex < allocationCount; ++allocIndex) + { + res = AllocatePage( + size, + alignment, + createInfo, + suballocType, + pAllocations + allocIndex); + if (res != VK_SUCCESS) + { + break; + } + } + } - if (res != VK_SUCCESS) - { - // Free all already created allocations. - while (allocIndex--) - Free(pAllocations[allocIndex]); - memset(pAllocations, 0, sizeof(VmaAllocation) * allocationCount); - } + if (res != VK_SUCCESS) + { + // Free all already created allocations. + while (allocIndex--) + Free(pAllocations[allocIndex]); + memset(pAllocations, 0, sizeof(VmaAllocation) * allocationCount); + } - return res; + return res; } VkResult VmaBlockVector::AllocatePage( - VkDeviceSize size, - VkDeviceSize alignment, - const VmaAllocationCreateInfo& createInfo, - VmaSuballocationType suballocType, - VmaAllocation* pAllocation) + VkDeviceSize size, + VkDeviceSize alignment, + const VmaAllocationCreateInfo& createInfo, + VmaSuballocationType suballocType, + VmaAllocation* pAllocation) { - const bool isUpperAddress = (createInfo.flags & VMA_ALLOCATION_CREATE_UPPER_ADDRESS_BIT) != 0; + const bool isUpperAddress = (createInfo.flags & VMA_ALLOCATION_CREATE_UPPER_ADDRESS_BIT) != 0; - VkDeviceSize freeMemory; - { - const uint32_t heapIndex = m_hAllocator->MemoryTypeIndexToHeapIndex(m_MemoryTypeIndex); - VmaBudget heapBudget = {}; - m_hAllocator->GetHeapBudgets(&heapBudget, heapIndex, 1); - freeMemory = (heapBudget.usage < heapBudget.budget) ? (heapBudget.budget - heapBudget.usage) : 0; - } + VkDeviceSize freeMemory; + { + const uint32_t heapIndex = m_hAllocator->MemoryTypeIndexToHeapIndex(m_MemoryTypeIndex); + VmaBudget heapBudget = {}; + m_hAllocator->GetHeapBudgets(&heapBudget, heapIndex, 1); + freeMemory = (heapBudget.usage < heapBudget.budget) ? (heapBudget.budget - heapBudget.usage) : 0; + } - const bool canFallbackToDedicated = !HasExplicitBlockSize() && - (createInfo.flags & VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT) == 0; - const bool canCreateNewBlock = - ((createInfo.flags & VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT) == 0) && - (m_Blocks.size() < m_MaxBlockCount) && - (freeMemory >= size || !canFallbackToDedicated); - uint32_t strategy = createInfo.flags & VMA_ALLOCATION_CREATE_STRATEGY_MASK; + const bool canFallbackToDedicated = !HasExplicitBlockSize() && + (createInfo.flags & VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT) == 0; + const bool canCreateNewBlock = + ((createInfo.flags & VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT) == 0) && + (m_Blocks.size() < m_MaxBlockCount) && + (freeMemory >= size || !canFallbackToDedicated); + uint32_t strategy = createInfo.flags & VMA_ALLOCATION_CREATE_STRATEGY_MASK; - // Upper address can only be used with linear allocator and within single memory block. - if (isUpperAddress && - (m_Algorithm != VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT || m_MaxBlockCount > 1)) - { - return VK_ERROR_FEATURE_NOT_PRESENT; - } + // Upper address can only be used with linear allocator and within single memory block. + if (isUpperAddress && + (m_Algorithm != VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT || m_MaxBlockCount > 1)) + { + return VK_ERROR_FEATURE_NOT_PRESENT; + } - // Early reject: requested allocation size is larger that maximum block size for this block vector. - if (size + VMA_DEBUG_MARGIN > m_PreferredBlockSize) - { - return VK_ERROR_OUT_OF_DEVICE_MEMORY; - } + // Early reject: requested allocation size is larger that maximum block size for this block vector. + if (size + VMA_DEBUG_MARGIN > m_PreferredBlockSize) + { + return VK_ERROR_OUT_OF_DEVICE_MEMORY; + } - // 1. Search existing allocations. Try to allocate. - if (m_Algorithm == VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT) - { - // Use only last block. - if (!m_Blocks.empty()) - { - VmaDeviceMemoryBlock* const pCurrBlock = m_Blocks.back(); - VMA_ASSERT(pCurrBlock); - VkResult res = AllocateFromBlock( - pCurrBlock, size, alignment, createInfo.flags, createInfo.pUserData, suballocType, strategy, pAllocation); - if (res == VK_SUCCESS) - { - VMA_DEBUG_LOG(" Returned from last block #%u", pCurrBlock->GetId()); - IncrementallySortBlocks(); - return VK_SUCCESS; - } - } - } - else - { - if (strategy != VMA_ALLOCATION_CREATE_STRATEGY_MIN_TIME_BIT) // MIN_MEMORY or default - { - const bool isHostVisible = - (m_hAllocator->m_MemProps.memoryTypes[m_MemoryTypeIndex].propertyFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) != 0; - if(isHostVisible) - { - const bool isMappingAllowed = (createInfo.flags & - (VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT | VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT)) != 0; - /* - For non-mappable allocations, check blocks that are not mapped first. - For mappable allocations, check blocks that are already mapped first. - This way, having many blocks, we will separate mappable and non-mappable allocations, - hopefully limiting the number of blocks that are mapped, which will help tools like RenderDoc. - */ - for(size_t mappingI = 0; mappingI < 2; ++mappingI) - { - // Forward order in m_Blocks - prefer blocks with smallest amount of free space. - for (size_t blockIndex = 0; blockIndex < m_Blocks.size(); ++blockIndex) - { - VmaDeviceMemoryBlock* const pCurrBlock = m_Blocks[blockIndex]; - VMA_ASSERT(pCurrBlock); - const bool isBlockMapped = pCurrBlock->GetMappedData() != VMA_NULL; - if((mappingI == 0) == (isMappingAllowed == isBlockMapped)) - { - VkResult res = AllocateFromBlock( - pCurrBlock, size, alignment, createInfo.flags, createInfo.pUserData, suballocType, strategy, pAllocation); - if (res == VK_SUCCESS) - { - VMA_DEBUG_LOG(" Returned from existing block #%u", pCurrBlock->GetId()); - IncrementallySortBlocks(); - return VK_SUCCESS; - } - } - } - } - } - else - { - // Forward order in m_Blocks - prefer blocks with smallest amount of free space. - for (size_t blockIndex = 0; blockIndex < m_Blocks.size(); ++blockIndex) - { - VmaDeviceMemoryBlock* const pCurrBlock = m_Blocks[blockIndex]; - VMA_ASSERT(pCurrBlock); - VkResult res = AllocateFromBlock( - pCurrBlock, size, alignment, createInfo.flags, createInfo.pUserData, suballocType, strategy, pAllocation); - if (res == VK_SUCCESS) - { - VMA_DEBUG_LOG(" Returned from existing block #%u", pCurrBlock->GetId()); - IncrementallySortBlocks(); - return VK_SUCCESS; - } - } - } - } - else // VMA_ALLOCATION_CREATE_STRATEGY_MIN_TIME_BIT - { - // Backward order in m_Blocks - prefer blocks with largest amount of free space. - for (size_t blockIndex = m_Blocks.size(); blockIndex--; ) - { - VmaDeviceMemoryBlock* const pCurrBlock = m_Blocks[blockIndex]; - VMA_ASSERT(pCurrBlock); - VkResult res = AllocateFromBlock(pCurrBlock, size, alignment, createInfo.flags, createInfo.pUserData, suballocType, strategy, pAllocation); - if (res == VK_SUCCESS) - { - VMA_DEBUG_LOG(" Returned from existing block #%u", pCurrBlock->GetId()); - IncrementallySortBlocks(); - return VK_SUCCESS; - } - } - } - } + // 1. Search existing allocations. Try to allocate. + if (m_Algorithm == VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT) + { + // Use only last block. + if (!m_Blocks.empty()) + { + VmaDeviceMemoryBlock* const pCurrBlock = m_Blocks.back(); + VMA_ASSERT(pCurrBlock); + VkResult res = AllocateFromBlock( + pCurrBlock, size, alignment, createInfo.flags, createInfo.pUserData, suballocType, strategy, pAllocation); + if (res == VK_SUCCESS) + { + VMA_DEBUG_LOG_FORMAT(" Returned from last block #%" PRIu32, pCurrBlock->GetId()); + IncrementallySortBlocks(); + return VK_SUCCESS; + } + } + } else + { + if (strategy != VMA_ALLOCATION_CREATE_STRATEGY_MIN_TIME_BIT) // MIN_MEMORY or default + { + const bool isHostVisible = + (m_hAllocator->m_MemProps.memoryTypes[m_MemoryTypeIndex].propertyFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) != 0; + if (isHostVisible) + { + const bool isMappingAllowed = (createInfo.flags & + (VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT | VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT)) != 0; + /* + For non-mappable allocations, check blocks that are not mapped first. + For mappable allocations, check blocks that are already mapped first. + This way, having many blocks, we will separate mappable and non-mappable allocations, + hopefully limiting the number of blocks that are mapped, which will help tools like RenderDoc. + */ + for (size_t mappingI = 0; mappingI < 2; ++mappingI) + { + // Forward order in m_Blocks - prefer blocks with smallest amount of free space. + for (size_t blockIndex = 0; blockIndex < m_Blocks.size(); ++blockIndex) + { + VmaDeviceMemoryBlock* const pCurrBlock = m_Blocks[blockIndex]; + VMA_ASSERT(pCurrBlock); + const bool isBlockMapped = pCurrBlock->GetMappedData() != VMA_NULL; + if ((mappingI == 0) == (isMappingAllowed == isBlockMapped)) + { + VkResult res = AllocateFromBlock( + pCurrBlock, size, alignment, createInfo.flags, createInfo.pUserData, suballocType, strategy, pAllocation); + if (res == VK_SUCCESS) + { + VMA_DEBUG_LOG_FORMAT(" Returned from existing block #%" PRIu32, pCurrBlock->GetId()); + IncrementallySortBlocks(); + return VK_SUCCESS; + } + } + } + } + } else + { + // Forward order in m_Blocks - prefer blocks with smallest amount of free space. + for (size_t blockIndex = 0; blockIndex < m_Blocks.size(); ++blockIndex) + { + VmaDeviceMemoryBlock* const pCurrBlock = m_Blocks[blockIndex]; + VMA_ASSERT(pCurrBlock); + VkResult res = AllocateFromBlock( + pCurrBlock, size, alignment, createInfo.flags, createInfo.pUserData, suballocType, strategy, pAllocation); + if (res == VK_SUCCESS) + { + VMA_DEBUG_LOG_FORMAT(" Returned from existing block #%" PRIu32, pCurrBlock->GetId()); + IncrementallySortBlocks(); + return VK_SUCCESS; + } + } + } + } else // VMA_ALLOCATION_CREATE_STRATEGY_MIN_TIME_BIT + { + // Backward order in m_Blocks - prefer blocks with largest amount of free space. + for (size_t blockIndex = m_Blocks.size(); blockIndex--; ) + { + VmaDeviceMemoryBlock* const pCurrBlock = m_Blocks[blockIndex]; + VMA_ASSERT(pCurrBlock); + VkResult res = AllocateFromBlock(pCurrBlock, size, alignment, createInfo.flags, createInfo.pUserData, suballocType, strategy, pAllocation); + if (res == VK_SUCCESS) + { + VMA_DEBUG_LOG_FORMAT(" Returned from existing block #%" PRIu32, pCurrBlock->GetId()); + IncrementallySortBlocks(); + return VK_SUCCESS; + } + } + } + } - // 2. Try to create new block. - if (canCreateNewBlock) - { - // Calculate optimal size for new block. - VkDeviceSize newBlockSize = m_PreferredBlockSize; - uint32_t newBlockSizeShift = 0; - const uint32_t NEW_BLOCK_SIZE_SHIFT_MAX = 3; + // 2. Try to create new block. + if (canCreateNewBlock) + { + // Calculate optimal size for new block. + VkDeviceSize newBlockSize = m_PreferredBlockSize; + uint32_t newBlockSizeShift = 0; + const uint32_t NEW_BLOCK_SIZE_SHIFT_MAX = 3; - if (!m_ExplicitBlockSize) - { - // Allocate 1/8, 1/4, 1/2 as first blocks. - const VkDeviceSize maxExistingBlockSize = CalcMaxBlockSize(); - for (uint32_t i = 0; i < NEW_BLOCK_SIZE_SHIFT_MAX; ++i) - { - const VkDeviceSize smallerNewBlockSize = newBlockSize / 2; - if (smallerNewBlockSize > maxExistingBlockSize && smallerNewBlockSize >= size * 2) - { - newBlockSize = smallerNewBlockSize; - ++newBlockSizeShift; - } - else - { - break; - } - } - } + if (!m_ExplicitBlockSize) + { + // Allocate 1/8, 1/4, 1/2 as first blocks. + const VkDeviceSize maxExistingBlockSize = CalcMaxBlockSize(); + for (uint32_t i = 0; i < NEW_BLOCK_SIZE_SHIFT_MAX; ++i) + { + const VkDeviceSize smallerNewBlockSize = newBlockSize / 2; + if (smallerNewBlockSize > maxExistingBlockSize && smallerNewBlockSize >= size * 2) + { + newBlockSize = smallerNewBlockSize; + ++newBlockSizeShift; + } else + { + break; + } + } + } - size_t newBlockIndex = 0; - VkResult res = (newBlockSize <= freeMemory || !canFallbackToDedicated) ? - CreateBlock(newBlockSize, &newBlockIndex) : VK_ERROR_OUT_OF_DEVICE_MEMORY; - // Allocation of this size failed? Try 1/2, 1/4, 1/8 of m_PreferredBlockSize. - if (!m_ExplicitBlockSize) - { - while (res < 0 && newBlockSizeShift < NEW_BLOCK_SIZE_SHIFT_MAX) - { - const VkDeviceSize smallerNewBlockSize = newBlockSize / 2; - if (smallerNewBlockSize >= size) - { - newBlockSize = smallerNewBlockSize; - ++newBlockSizeShift; - res = (newBlockSize <= freeMemory || !canFallbackToDedicated) ? - CreateBlock(newBlockSize, &newBlockIndex) : VK_ERROR_OUT_OF_DEVICE_MEMORY; - } - else - { - break; - } - } - } + size_t newBlockIndex = 0; + VkResult res = (newBlockSize <= freeMemory || !canFallbackToDedicated) ? + CreateBlock(newBlockSize, &newBlockIndex) : VK_ERROR_OUT_OF_DEVICE_MEMORY; + // Allocation of this size failed? Try 1/2, 1/4, 1/8 of m_PreferredBlockSize. + if (!m_ExplicitBlockSize) + { + while (res < 0 && newBlockSizeShift < NEW_BLOCK_SIZE_SHIFT_MAX) + { + const VkDeviceSize smallerNewBlockSize = newBlockSize / 2; + if (smallerNewBlockSize >= size) + { + newBlockSize = smallerNewBlockSize; + ++newBlockSizeShift; + res = (newBlockSize <= freeMemory || !canFallbackToDedicated) ? + CreateBlock(newBlockSize, &newBlockIndex) : VK_ERROR_OUT_OF_DEVICE_MEMORY; + } else + { + break; + } + } + } - if (res == VK_SUCCESS) - { - VmaDeviceMemoryBlock* const pBlock = m_Blocks[newBlockIndex]; - VMA_ASSERT(pBlock->m_pMetadata->GetSize() >= size); + if (res == VK_SUCCESS) + { + VmaDeviceMemoryBlock* const pBlock = m_Blocks[newBlockIndex]; + VMA_ASSERT(pBlock->m_pMetadata->GetSize() >= size); - res = AllocateFromBlock( - pBlock, size, alignment, createInfo.flags, createInfo.pUserData, suballocType, strategy, pAllocation); - if (res == VK_SUCCESS) - { - VMA_DEBUG_LOG(" Created new block #%u Size=%llu", pBlock->GetId(), newBlockSize); - IncrementallySortBlocks(); - return VK_SUCCESS; - } - else - { - // Allocation from new block failed, possibly due to VMA_DEBUG_MARGIN or alignment. - return VK_ERROR_OUT_OF_DEVICE_MEMORY; - } - } - } + res = AllocateFromBlock( + pBlock, size, alignment, createInfo.flags, createInfo.pUserData, suballocType, strategy, pAllocation); + if (res == VK_SUCCESS) + { + VMA_DEBUG_LOG_FORMAT(" Created new block #%" PRIu32 " Size=%" PRIu64, pBlock->GetId(), newBlockSize); + IncrementallySortBlocks(); + return VK_SUCCESS; + } else + { + // Allocation from new block failed, possibly due to VMA_DEBUG_MARGIN or alignment. + return VK_ERROR_OUT_OF_DEVICE_MEMORY; + } + } + } - return VK_ERROR_OUT_OF_DEVICE_MEMORY; + return VK_ERROR_OUT_OF_DEVICE_MEMORY; } void VmaBlockVector::Free(const VmaAllocation hAllocation) { - VmaDeviceMemoryBlock* pBlockToDelete = VMA_NULL; + VmaDeviceMemoryBlock* pBlockToDelete = VMA_NULL; - bool budgetExceeded = false; - { - const uint32_t heapIndex = m_hAllocator->MemoryTypeIndexToHeapIndex(m_MemoryTypeIndex); - VmaBudget heapBudget = {}; - m_hAllocator->GetHeapBudgets(&heapBudget, heapIndex, 1); - budgetExceeded = heapBudget.usage >= heapBudget.budget; - } + bool budgetExceeded = false; + { + const uint32_t heapIndex = m_hAllocator->MemoryTypeIndexToHeapIndex(m_MemoryTypeIndex); + VmaBudget heapBudget = {}; + m_hAllocator->GetHeapBudgets(&heapBudget, heapIndex, 1); + budgetExceeded = heapBudget.usage >= heapBudget.budget; + } - // Scope for lock. - { - VmaMutexLockWrite lock(m_Mutex, m_hAllocator->m_UseMutex); + // Scope for lock. + { + VmaMutexLockWrite lock(m_Mutex, m_hAllocator->m_UseMutex); - VmaDeviceMemoryBlock* pBlock = hAllocation->GetBlock(); + VmaDeviceMemoryBlock* pBlock = hAllocation->GetBlock(); - if (IsCorruptionDetectionEnabled()) - { - VkResult res = pBlock->ValidateMagicValueAfterAllocation(m_hAllocator, hAllocation->GetOffset(), hAllocation->GetSize()); - VMA_ASSERT(res == VK_SUCCESS && "Couldn't map block memory to validate magic value."); - } + if (IsCorruptionDetectionEnabled()) + { + VkResult res = pBlock->ValidateMagicValueAfterAllocation(m_hAllocator, hAllocation->GetOffset(), hAllocation->GetSize()); + VMA_ASSERT(res == VK_SUCCESS && "Couldn't map block memory to validate magic value."); + } - if (hAllocation->IsPersistentMap()) - { - pBlock->Unmap(m_hAllocator, 1); - } + if (hAllocation->IsPersistentMap()) + { + pBlock->Unmap(m_hAllocator, 1); + } - const bool hadEmptyBlockBeforeFree = HasEmptyBlock(); - pBlock->m_pMetadata->Free(hAllocation->GetAllocHandle()); - pBlock->PostFree(m_hAllocator); - VMA_HEAVY_ASSERT(pBlock->Validate()); + const bool hadEmptyBlockBeforeFree = HasEmptyBlock(); + pBlock->m_pMetadata->Free(hAllocation->GetAllocHandle()); + pBlock->PostFree(m_hAllocator); + VMA_HEAVY_ASSERT(pBlock->Validate()); - VMA_DEBUG_LOG(" Freed from MemoryTypeIndex=%u", m_MemoryTypeIndex); + VMA_DEBUG_LOG_FORMAT(" Freed from MemoryTypeIndex=%" PRIu32, m_MemoryTypeIndex); - const bool canDeleteBlock = m_Blocks.size() > m_MinBlockCount; - // pBlock became empty after this deallocation. - if (pBlock->m_pMetadata->IsEmpty()) - { - // Already had empty block. We don't want to have two, so delete this one. - if ((hadEmptyBlockBeforeFree || budgetExceeded) && canDeleteBlock) - { - pBlockToDelete = pBlock; - Remove(pBlock); - } - // else: We now have one empty block - leave it. A hysteresis to avoid allocating whole block back and forth. - } - // pBlock didn't become empty, but we have another empty block - find and free that one. - // (This is optional, heuristics.) - else if (hadEmptyBlockBeforeFree && canDeleteBlock) - { - VmaDeviceMemoryBlock* pLastBlock = m_Blocks.back(); - if (pLastBlock->m_pMetadata->IsEmpty()) - { - pBlockToDelete = pLastBlock; - m_Blocks.pop_back(); - } - } + const bool canDeleteBlock = m_Blocks.size() > m_MinBlockCount; + // pBlock became empty after this deallocation. + if (pBlock->m_pMetadata->IsEmpty()) + { + // Already had empty block. We don't want to have two, so delete this one. + if ((hadEmptyBlockBeforeFree || budgetExceeded) && canDeleteBlock) + { + pBlockToDelete = pBlock; + Remove(pBlock); + } + // else: We now have one empty block - leave it. A hysteresis to avoid allocating whole block back and forth. + } + // pBlock didn't become empty, but we have another empty block - find and free that one. + // (This is optional, heuristics.) + else if (hadEmptyBlockBeforeFree && canDeleteBlock) + { + VmaDeviceMemoryBlock* pLastBlock = m_Blocks.back(); + if (pLastBlock->m_pMetadata->IsEmpty()) + { + pBlockToDelete = pLastBlock; + m_Blocks.pop_back(); + } + } - IncrementallySortBlocks(); - } + IncrementallySortBlocks(); + } - // Destruction of a free block. Deferred until this point, outside of mutex - // lock, for performance reason. - if (pBlockToDelete != VMA_NULL) - { - VMA_DEBUG_LOG(" Deleted empty block #%u", pBlockToDelete->GetId()); - pBlockToDelete->Destroy(m_hAllocator); - vma_delete(m_hAllocator, pBlockToDelete); - } + // Destruction of a free block. Deferred until this point, outside of mutex + // lock, for performance reason. + if (pBlockToDelete != VMA_NULL) + { + VMA_DEBUG_LOG_FORMAT(" Deleted empty block #%" PRIu32, pBlockToDelete->GetId()); + pBlockToDelete->Destroy(m_hAllocator); + vma_delete(m_hAllocator, pBlockToDelete); + } - m_hAllocator->m_Budget.RemoveAllocation(m_hAllocator->MemoryTypeIndexToHeapIndex(m_MemoryTypeIndex), hAllocation->GetSize()); - m_hAllocator->m_AllocationObjectAllocator.Free(hAllocation); + m_hAllocator->m_Budget.RemoveAllocation(m_hAllocator->MemoryTypeIndexToHeapIndex(m_MemoryTypeIndex), hAllocation->GetSize()); + m_hAllocator->m_AllocationObjectAllocator.Free(hAllocation); } VkDeviceSize VmaBlockVector::CalcMaxBlockSize() const { - VkDeviceSize result = 0; - for (size_t i = m_Blocks.size(); i--; ) - { - result = VMA_MAX(result, m_Blocks[i]->m_pMetadata->GetSize()); - if (result >= m_PreferredBlockSize) - { - break; - } - } - return result; + VkDeviceSize result = 0; + for (size_t i = m_Blocks.size(); i--; ) + { + result = VMA_MAX(result, m_Blocks[i]->m_pMetadata->GetSize()); + if (result >= m_PreferredBlockSize) + { + break; + } + } + return result; } void VmaBlockVector::Remove(VmaDeviceMemoryBlock* pBlock) { - for (uint32_t blockIndex = 0; blockIndex < m_Blocks.size(); ++blockIndex) - { - if (m_Blocks[blockIndex] == pBlock) - { - VmaVectorRemove(m_Blocks, blockIndex); - return; - } - } - VMA_ASSERT(0); + for (uint32_t blockIndex = 0; blockIndex < m_Blocks.size(); ++blockIndex) + { + if (m_Blocks[blockIndex] == pBlock) + { + VmaVectorRemove(m_Blocks, blockIndex); + return; + } + } + VMA_ASSERT(0); } void VmaBlockVector::IncrementallySortBlocks() { - if (!m_IncrementalSort) - return; - if (m_Algorithm != VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT) - { - // Bubble sort only until first swap. - for (size_t i = 1; i < m_Blocks.size(); ++i) - { - if (m_Blocks[i - 1]->m_pMetadata->GetSumFreeSize() > m_Blocks[i]->m_pMetadata->GetSumFreeSize()) - { - VMA_SWAP(m_Blocks[i - 1], m_Blocks[i]); - return; - } - } - } + if (!m_IncrementalSort) + return; + if (m_Algorithm != VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT) + { + // Bubble sort only until first swap. + for (size_t i = 1; i < m_Blocks.size(); ++i) + { + if (m_Blocks[i - 1]->m_pMetadata->GetSumFreeSize() > m_Blocks[i]->m_pMetadata->GetSumFreeSize()) + { + std::swap(m_Blocks[i - 1], m_Blocks[i]); + return; + } + } + } } void VmaBlockVector::SortByFreeSize() { - VMA_SORT(m_Blocks.begin(), m_Blocks.end(), - [](VmaDeviceMemoryBlock* b1, VmaDeviceMemoryBlock* b2) -> bool - { - return b1->m_pMetadata->GetSumFreeSize() < b2->m_pMetadata->GetSumFreeSize(); - }); + VMA_SORT(m_Blocks.begin(), m_Blocks.end(), + [](VmaDeviceMemoryBlock* b1, VmaDeviceMemoryBlock* b2) -> bool + { + return b1->m_pMetadata->GetSumFreeSize() < b2->m_pMetadata->GetSumFreeSize(); + }); } VkResult VmaBlockVector::AllocateFromBlock( - VmaDeviceMemoryBlock* pBlock, - VkDeviceSize size, - VkDeviceSize alignment, - VmaAllocationCreateFlags allocFlags, - void* pUserData, - VmaSuballocationType suballocType, - uint32_t strategy, - VmaAllocation* pAllocation) + VmaDeviceMemoryBlock* pBlock, + VkDeviceSize size, + VkDeviceSize alignment, + VmaAllocationCreateFlags allocFlags, + void* pUserData, + VmaSuballocationType suballocType, + uint32_t strategy, + VmaAllocation* pAllocation) { - const bool isUpperAddress = (allocFlags & VMA_ALLOCATION_CREATE_UPPER_ADDRESS_BIT) != 0; + const bool isUpperAddress = (allocFlags & VMA_ALLOCATION_CREATE_UPPER_ADDRESS_BIT) != 0; - VmaAllocationRequest currRequest = {}; - if (pBlock->m_pMetadata->CreateAllocationRequest( - size, - alignment, - isUpperAddress, - suballocType, - strategy, - &currRequest)) - { - return CommitAllocationRequest(currRequest, pBlock, alignment, allocFlags, pUserData, suballocType, pAllocation); - } - return VK_ERROR_OUT_OF_DEVICE_MEMORY; + VmaAllocationRequest currRequest = {}; + if (pBlock->m_pMetadata->CreateAllocationRequest( + size, + alignment, + isUpperAddress, + suballocType, + strategy, + &currRequest)) + { + return CommitAllocationRequest(currRequest, pBlock, alignment, allocFlags, pUserData, suballocType, pAllocation); + } + return VK_ERROR_OUT_OF_DEVICE_MEMORY; } VkResult VmaBlockVector::CommitAllocationRequest( - VmaAllocationRequest& allocRequest, - VmaDeviceMemoryBlock* pBlock, - VkDeviceSize alignment, - VmaAllocationCreateFlags allocFlags, - void* pUserData, - VmaSuballocationType suballocType, - VmaAllocation* pAllocation) + VmaAllocationRequest& allocRequest, + VmaDeviceMemoryBlock* pBlock, + VkDeviceSize alignment, + VmaAllocationCreateFlags allocFlags, + void* pUserData, + VmaSuballocationType suballocType, + VmaAllocation* pAllocation) { - const bool mapped = (allocFlags & VMA_ALLOCATION_CREATE_MAPPED_BIT) != 0; - const bool isUserDataString = (allocFlags & VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT) != 0; - const bool isMappingAllowed = (allocFlags & - (VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT | VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT)) != 0; + const bool mapped = (allocFlags & VMA_ALLOCATION_CREATE_MAPPED_BIT) != 0; + const bool isUserDataString = (allocFlags & VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT) != 0; + const bool isMappingAllowed = (allocFlags & + (VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT | VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT)) != 0; - pBlock->PostAlloc(m_hAllocator); - // Allocate from pCurrBlock. - if (mapped) - { - VkResult res = pBlock->Map(m_hAllocator, 1, VMA_NULL); - if (res != VK_SUCCESS) - { - return res; - } - } + pBlock->PostAlloc(m_hAllocator); + // Allocate from pCurrBlock. + if (mapped) + { + VkResult res = pBlock->Map(m_hAllocator, 1, VMA_NULL); + if (res != VK_SUCCESS) + { + return res; + } + } - *pAllocation = m_hAllocator->m_AllocationObjectAllocator.Allocate(isMappingAllowed); - pBlock->m_pMetadata->Alloc(allocRequest, suballocType, *pAllocation); - (*pAllocation)->InitBlockAllocation( - pBlock, - allocRequest.allocHandle, - alignment, - allocRequest.size, // Not size, as actual allocation size may be larger than requested! - m_MemoryTypeIndex, - suballocType, - mapped); - VMA_HEAVY_ASSERT(pBlock->Validate()); - if (isUserDataString) - (*pAllocation)->SetName(m_hAllocator, (const char*)pUserData); - else - (*pAllocation)->SetUserData(m_hAllocator, pUserData); - m_hAllocator->m_Budget.AddAllocation(m_hAllocator->MemoryTypeIndexToHeapIndex(m_MemoryTypeIndex), allocRequest.size); - if (VMA_DEBUG_INITIALIZE_ALLOCATIONS) - { - m_hAllocator->FillAllocation(*pAllocation, VMA_ALLOCATION_FILL_PATTERN_CREATED); - } - if (IsCorruptionDetectionEnabled()) - { - VkResult res = pBlock->WriteMagicValueAfterAllocation(m_hAllocator, (*pAllocation)->GetOffset(), allocRequest.size); - VMA_ASSERT(res == VK_SUCCESS && "Couldn't map block memory to write magic value."); - } - return VK_SUCCESS; + *pAllocation = m_hAllocator->m_AllocationObjectAllocator.Allocate(isMappingAllowed); + pBlock->m_pMetadata->Alloc(allocRequest, suballocType, *pAllocation); + (*pAllocation)->InitBlockAllocation( + pBlock, + allocRequest.allocHandle, + alignment, + allocRequest.size, // Not size, as actual allocation size may be larger than requested! + m_MemoryTypeIndex, + suballocType, + mapped); + VMA_HEAVY_ASSERT(pBlock->Validate()); + if (isUserDataString) + (*pAllocation)->SetName(m_hAllocator, (const char*)pUserData); + else + (*pAllocation)->SetUserData(m_hAllocator, pUserData); + m_hAllocator->m_Budget.AddAllocation(m_hAllocator->MemoryTypeIndexToHeapIndex(m_MemoryTypeIndex), allocRequest.size); + if (VMA_DEBUG_INITIALIZE_ALLOCATIONS) + { + m_hAllocator->FillAllocation(*pAllocation, VMA_ALLOCATION_FILL_PATTERN_CREATED); + } + if (IsCorruptionDetectionEnabled()) + { + VkResult res = pBlock->WriteMagicValueAfterAllocation(m_hAllocator, (*pAllocation)->GetOffset(), allocRequest.size); + VMA_ASSERT(res == VK_SUCCESS && "Couldn't map block memory to write magic value."); + } + return VK_SUCCESS; } VkResult VmaBlockVector::CreateBlock(VkDeviceSize blockSize, size_t* pNewBlockIndex) { - VkMemoryAllocateInfo allocInfo = { VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO }; - allocInfo.pNext = m_pMemoryAllocateNext; - allocInfo.memoryTypeIndex = m_MemoryTypeIndex; - allocInfo.allocationSize = blockSize; + VkMemoryAllocateInfo allocInfo = { VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO }; + allocInfo.pNext = m_pMemoryAllocateNext; + allocInfo.memoryTypeIndex = m_MemoryTypeIndex; + allocInfo.allocationSize = blockSize; #if VMA_BUFFER_DEVICE_ADDRESS - // Every standalone block can potentially contain a buffer with VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT - always enable the feature. - VkMemoryAllocateFlagsInfoKHR allocFlagsInfo = { VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_FLAGS_INFO_KHR }; - if (m_hAllocator->m_UseKhrBufferDeviceAddress) - { - allocFlagsInfo.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT_KHR; - VmaPnextChainPushFront(&allocInfo, &allocFlagsInfo); - } + // Every standalone block can potentially contain a buffer with VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT - always enable the feature. + VkMemoryAllocateFlagsInfoKHR allocFlagsInfo = { VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_FLAGS_INFO_KHR }; + if (m_hAllocator->m_UseKhrBufferDeviceAddress) + { + allocFlagsInfo.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT_KHR; + VmaPnextChainPushFront(&allocInfo, &allocFlagsInfo); + } #endif // VMA_BUFFER_DEVICE_ADDRESS #if VMA_MEMORY_PRIORITY - VkMemoryPriorityAllocateInfoEXT priorityInfo = { VK_STRUCTURE_TYPE_MEMORY_PRIORITY_ALLOCATE_INFO_EXT }; - if (m_hAllocator->m_UseExtMemoryPriority) - { - VMA_ASSERT(m_Priority >= 0.f && m_Priority <= 1.f); - priorityInfo.priority = m_Priority; - VmaPnextChainPushFront(&allocInfo, &priorityInfo); - } + VkMemoryPriorityAllocateInfoEXT priorityInfo = { VK_STRUCTURE_TYPE_MEMORY_PRIORITY_ALLOCATE_INFO_EXT }; + if (m_hAllocator->m_UseExtMemoryPriority) + { + VMA_ASSERT(m_Priority >= 0.f && m_Priority <= 1.f); + priorityInfo.priority = m_Priority; + VmaPnextChainPushFront(&allocInfo, &priorityInfo); + } #endif // VMA_MEMORY_PRIORITY #if VMA_EXTERNAL_MEMORY - // Attach VkExportMemoryAllocateInfoKHR if necessary. - VkExportMemoryAllocateInfoKHR exportMemoryAllocInfo = { VK_STRUCTURE_TYPE_EXPORT_MEMORY_ALLOCATE_INFO_KHR }; - exportMemoryAllocInfo.handleTypes = m_hAllocator->GetExternalMemoryHandleTypeFlags(m_MemoryTypeIndex); - if (exportMemoryAllocInfo.handleTypes != 0) - { - VmaPnextChainPushFront(&allocInfo, &exportMemoryAllocInfo); - } + // Attach VkExportMemoryAllocateInfoKHR if necessary. + VkExportMemoryAllocateInfoKHR exportMemoryAllocInfo = { VK_STRUCTURE_TYPE_EXPORT_MEMORY_ALLOCATE_INFO_KHR }; + exportMemoryAllocInfo.handleTypes = m_hAllocator->GetExternalMemoryHandleTypeFlags(m_MemoryTypeIndex); + if (exportMemoryAllocInfo.handleTypes != 0) + { + VmaPnextChainPushFront(&allocInfo, &exportMemoryAllocInfo); + } #endif // VMA_EXTERNAL_MEMORY - VkDeviceMemory mem = VK_NULL_HANDLE; - VkResult res = m_hAllocator->AllocateVulkanMemory(&allocInfo, &mem); - if (res < 0) - { - return res; - } + VkDeviceMemory mem = VK_NULL_HANDLE; + VkResult res = m_hAllocator->AllocateVulkanMemory(&allocInfo, &mem); + if (res < 0) + { + return res; + } - // New VkDeviceMemory successfully created. + // New VkDeviceMemory successfully created. - // Create new Allocation for it. - VmaDeviceMemoryBlock* const pBlock = vma_new(m_hAllocator, VmaDeviceMemoryBlock)(m_hAllocator); - pBlock->Init( - m_hAllocator, - m_hParentPool, - m_MemoryTypeIndex, - mem, - allocInfo.allocationSize, - m_NextBlockId++, - m_Algorithm, - m_BufferImageGranularity); + // Create new Allocation for it. + VmaDeviceMemoryBlock* const pBlock = vma_new(m_hAllocator, VmaDeviceMemoryBlock)(m_hAllocator); + pBlock->Init( + m_hAllocator, + m_hParentPool, + m_MemoryTypeIndex, + mem, + allocInfo.allocationSize, + m_NextBlockId++, + m_Algorithm, + m_BufferImageGranularity); - m_Blocks.push_back(pBlock); - if (pNewBlockIndex != VMA_NULL) - { - *pNewBlockIndex = m_Blocks.size() - 1; - } + m_Blocks.push_back(pBlock); + if (pNewBlockIndex != VMA_NULL) + { + *pNewBlockIndex = m_Blocks.size() - 1; + } - return VK_SUCCESS; + return VK_SUCCESS; } bool VmaBlockVector::HasEmptyBlock() { - for (size_t index = 0, count = m_Blocks.size(); index < count; ++index) - { - VmaDeviceMemoryBlock* const pBlock = m_Blocks[index]; - if (pBlock->m_pMetadata->IsEmpty()) - { - return true; - } - } - return false; + for (size_t index = 0, count = m_Blocks.size(); index < count; ++index) + { + VmaDeviceMemoryBlock* const pBlock = m_Blocks[index]; + if (pBlock->m_pMetadata->IsEmpty()) + { + return true; + } + } + return false; } #if VMA_STATS_STRING_ENABLED void VmaBlockVector::PrintDetailedMap(class VmaJsonWriter& json) { - VmaMutexLockRead lock(m_Mutex, m_hAllocator->m_UseMutex); + VmaMutexLockRead lock(m_Mutex, m_hAllocator->m_UseMutex); - json.BeginObject(); - for (size_t i = 0; i < m_Blocks.size(); ++i) - { - json.BeginString(); - json.ContinueString(m_Blocks[i]->GetId()); - json.EndString(); + json.BeginObject(); + for (size_t i = 0; i < m_Blocks.size(); ++i) + { + json.BeginString(); + json.ContinueString(m_Blocks[i]->GetId()); + json.EndString(); - json.BeginObject(); - json.WriteString("MapRefCount"); - json.WriteNumber(m_Blocks[i]->GetMapRefCount()); + json.BeginObject(); + json.WriteString("MapRefCount"); + json.WriteNumber(m_Blocks[i]->GetMapRefCount()); - m_Blocks[i]->m_pMetadata->PrintDetailedMap(json); - json.EndObject(); - } - json.EndObject(); + m_Blocks[i]->m_pMetadata->PrintDetailedMap(json); + json.EndObject(); + } + json.EndObject(); } #endif // VMA_STATS_STRING_ENABLED VkResult VmaBlockVector::CheckCorruption() { - if (!IsCorruptionDetectionEnabled()) - { - return VK_ERROR_FEATURE_NOT_PRESENT; - } + if (!IsCorruptionDetectionEnabled()) + { + return VK_ERROR_FEATURE_NOT_PRESENT; + } - VmaMutexLockRead lock(m_Mutex, m_hAllocator->m_UseMutex); - for (uint32_t blockIndex = 0; blockIndex < m_Blocks.size(); ++blockIndex) - { - VmaDeviceMemoryBlock* const pBlock = m_Blocks[blockIndex]; - VMA_ASSERT(pBlock); - VkResult res = pBlock->CheckCorruption(m_hAllocator); - if (res != VK_SUCCESS) - { - return res; - } - } - return VK_SUCCESS; + VmaMutexLockRead lock(m_Mutex, m_hAllocator->m_UseMutex); + for (uint32_t blockIndex = 0; blockIndex < m_Blocks.size(); ++blockIndex) + { + VmaDeviceMemoryBlock* const pBlock = m_Blocks[blockIndex]; + VMA_ASSERT(pBlock); + VkResult res = pBlock->CheckCorruption(m_hAllocator); + if (res != VK_SUCCESS) + { + return res; + } + } + return VK_SUCCESS; } #endif // _VMA_BLOCK_VECTOR_FUNCTIONS #ifndef _VMA_DEFRAGMENTATION_CONTEXT_FUNCTIONS VmaDefragmentationContext_T::VmaDefragmentationContext_T( - VmaAllocator hAllocator, - const VmaDefragmentationInfo& info) - : m_MaxPassBytes(info.maxBytesPerPass == 0 ? VK_WHOLE_SIZE : info.maxBytesPerPass), - m_MaxPassAllocations(info.maxAllocationsPerPass == 0 ? UINT32_MAX : info.maxAllocationsPerPass), - m_MoveAllocator(hAllocator->GetAllocationCallbacks()), - m_Moves(m_MoveAllocator) + VmaAllocator hAllocator, + const VmaDefragmentationInfo& info) + : m_MaxPassBytes(info.maxBytesPerPass == 0 ? VK_WHOLE_SIZE : info.maxBytesPerPass), + m_MaxPassAllocations(info.maxAllocationsPerPass == 0 ? UINT32_MAX : info.maxAllocationsPerPass), + m_BreakCallback(info.pfnBreakCallback), + m_BreakCallbackUserData(info.pBreakCallbackUserData), + m_MoveAllocator(hAllocator->GetAllocationCallbacks()), + m_Moves(m_MoveAllocator) { - m_Algorithm = info.flags & VMA_DEFRAGMENTATION_FLAG_ALGORITHM_MASK; + m_Algorithm = info.flags & VMA_DEFRAGMENTATION_FLAG_ALGORITHM_MASK; - if (info.pool != VMA_NULL) - { - m_BlockVectorCount = 1; - m_PoolBlockVector = &info.pool->m_BlockVector; - m_pBlockVectors = &m_PoolBlockVector; - m_PoolBlockVector->SetIncrementalSort(false); - m_PoolBlockVector->SortByFreeSize(); - } - else - { - m_BlockVectorCount = hAllocator->GetMemoryTypeCount(); - m_PoolBlockVector = VMA_NULL; - m_pBlockVectors = hAllocator->m_pBlockVectors; - for (uint32_t i = 0; i < m_BlockVectorCount; ++i) - { - VmaBlockVector* vector = m_pBlockVectors[i]; - if (vector != VMA_NULL) - { - vector->SetIncrementalSort(false); - vector->SortByFreeSize(); - } - } - } + if (info.pool != VMA_NULL) + { + m_BlockVectorCount = 1; + m_PoolBlockVector = &info.pool->m_BlockVector; + m_pBlockVectors = &m_PoolBlockVector; + m_PoolBlockVector->SetIncrementalSort(false); + m_PoolBlockVector->SortByFreeSize(); + } else + { + m_BlockVectorCount = hAllocator->GetMemoryTypeCount(); + m_PoolBlockVector = VMA_NULL; + m_pBlockVectors = hAllocator->m_pBlockVectors; + for (uint32_t i = 0; i < m_BlockVectorCount; ++i) + { + VmaBlockVector* vector = m_pBlockVectors[i]; + if (vector != VMA_NULL) + { + vector->SetIncrementalSort(false); + vector->SortByFreeSize(); + } + } + } - switch (m_Algorithm) - { - case 0: // Default algorithm - m_Algorithm = VMA_DEFRAGMENTATION_FLAG_ALGORITHM_BALANCED_BIT; - case VMA_DEFRAGMENTATION_FLAG_ALGORITHM_BALANCED_BIT: - { - m_AlgorithmState = vma_new_array(hAllocator, StateBalanced, m_BlockVectorCount); - break; - } - case VMA_DEFRAGMENTATION_FLAG_ALGORITHM_EXTENSIVE_BIT: - { - if (hAllocator->GetBufferImageGranularity() > 1) - { - m_AlgorithmState = vma_new_array(hAllocator, StateExtensive, m_BlockVectorCount); - } - break; - } - } + switch (m_Algorithm) + { + case 0: // Default algorithm + m_Algorithm = VMA_DEFRAGMENTATION_FLAG_ALGORITHM_BALANCED_BIT; + m_AlgorithmState = vma_new_array(hAllocator, StateBalanced, m_BlockVectorCount); + break; + case VMA_DEFRAGMENTATION_FLAG_ALGORITHM_BALANCED_BIT: + m_AlgorithmState = vma_new_array(hAllocator, StateBalanced, m_BlockVectorCount); + break; + case VMA_DEFRAGMENTATION_FLAG_ALGORITHM_EXTENSIVE_BIT: + if (hAllocator->GetBufferImageGranularity() > 1) + { + m_AlgorithmState = vma_new_array(hAllocator, StateExtensive, m_BlockVectorCount); + } + break; + } } VmaDefragmentationContext_T::~VmaDefragmentationContext_T() { - if (m_PoolBlockVector != VMA_NULL) - { - m_PoolBlockVector->SetIncrementalSort(true); - } - else - { - for (uint32_t i = 0; i < m_BlockVectorCount; ++i) - { - VmaBlockVector* vector = m_pBlockVectors[i]; - if (vector != VMA_NULL) - vector->SetIncrementalSort(true); - } - } + if (m_PoolBlockVector != VMA_NULL) + { + m_PoolBlockVector->SetIncrementalSort(true); + } else + { + for (uint32_t i = 0; i < m_BlockVectorCount; ++i) + { + VmaBlockVector* vector = m_pBlockVectors[i]; + if (vector != VMA_NULL) + vector->SetIncrementalSort(true); + } + } - if (m_AlgorithmState) - { - switch (m_Algorithm) - { - case VMA_DEFRAGMENTATION_FLAG_ALGORITHM_BALANCED_BIT: - vma_delete_array(m_MoveAllocator.m_pCallbacks, reinterpret_cast(m_AlgorithmState), m_BlockVectorCount); - break; - case VMA_DEFRAGMENTATION_FLAG_ALGORITHM_EXTENSIVE_BIT: - vma_delete_array(m_MoveAllocator.m_pCallbacks, reinterpret_cast(m_AlgorithmState), m_BlockVectorCount); - break; - default: - VMA_ASSERT(0); - } - } + if (m_AlgorithmState) + { + switch (m_Algorithm) + { + case VMA_DEFRAGMENTATION_FLAG_ALGORITHM_BALANCED_BIT: + vma_delete_array(m_MoveAllocator.m_pCallbacks, reinterpret_cast(m_AlgorithmState), m_BlockVectorCount); + break; + case VMA_DEFRAGMENTATION_FLAG_ALGORITHM_EXTENSIVE_BIT: + vma_delete_array(m_MoveAllocator.m_pCallbacks, reinterpret_cast(m_AlgorithmState), m_BlockVectorCount); + break; + default: + VMA_ASSERT(0); + } + } } VkResult VmaDefragmentationContext_T::DefragmentPassBegin(VmaDefragmentationPassMoveInfo& moveInfo) { - if (m_PoolBlockVector != VMA_NULL) - { - VmaMutexLockWrite lock(m_PoolBlockVector->GetMutex(), m_PoolBlockVector->GetAllocator()->m_UseMutex); + if (m_PoolBlockVector != VMA_NULL) + { + VmaMutexLockWrite lock(m_PoolBlockVector->GetMutex(), m_PoolBlockVector->GetAllocator()->m_UseMutex); - if (m_PoolBlockVector->GetBlockCount() > 1) - ComputeDefragmentation(*m_PoolBlockVector, 0); - else if (m_PoolBlockVector->GetBlockCount() == 1) - ReallocWithinBlock(*m_PoolBlockVector, m_PoolBlockVector->GetBlock(0)); - } - else - { - for (uint32_t i = 0; i < m_BlockVectorCount; ++i) - { - if (m_pBlockVectors[i] != VMA_NULL) - { - VmaMutexLockWrite lock(m_pBlockVectors[i]->GetMutex(), m_pBlockVectors[i]->GetAllocator()->m_UseMutex); + if (m_PoolBlockVector->GetBlockCount() > 1) + ComputeDefragmentation(*m_PoolBlockVector, 0); + else if (m_PoolBlockVector->GetBlockCount() == 1) + ReallocWithinBlock(*m_PoolBlockVector, m_PoolBlockVector->GetBlock(0)); + } else + { + for (uint32_t i = 0; i < m_BlockVectorCount; ++i) + { + if (m_pBlockVectors[i] != VMA_NULL) + { + VmaMutexLockWrite lock(m_pBlockVectors[i]->GetMutex(), m_pBlockVectors[i]->GetAllocator()->m_UseMutex); - if (m_pBlockVectors[i]->GetBlockCount() > 1) - { - if (ComputeDefragmentation(*m_pBlockVectors[i], i)) - break; - } - else if (m_pBlockVectors[i]->GetBlockCount() == 1) - { - if (ReallocWithinBlock(*m_pBlockVectors[i], m_pBlockVectors[i]->GetBlock(0))) - break; - } - } - } - } + if (m_pBlockVectors[i]->GetBlockCount() > 1) + { + if (ComputeDefragmentation(*m_pBlockVectors[i], i)) + break; + } else if (m_pBlockVectors[i]->GetBlockCount() == 1) + { + if (ReallocWithinBlock(*m_pBlockVectors[i], m_pBlockVectors[i]->GetBlock(0))) + break; + } + } + } + } - moveInfo.moveCount = static_cast(m_Moves.size()); - if (moveInfo.moveCount > 0) - { - moveInfo.pMoves = m_Moves.data(); - return VK_INCOMPLETE; - } + moveInfo.moveCount = static_cast(m_Moves.size()); + if (moveInfo.moveCount > 0) + { + moveInfo.pMoves = m_Moves.data(); + return VK_INCOMPLETE; + } - moveInfo.pMoves = VMA_NULL; - return VK_SUCCESS; + moveInfo.pMoves = VMA_NULL; + return VK_SUCCESS; } VkResult VmaDefragmentationContext_T::DefragmentPassEnd(VmaDefragmentationPassMoveInfo& moveInfo) { - VMA_ASSERT(moveInfo.moveCount > 0 ? moveInfo.pMoves != VMA_NULL : true); + VMA_ASSERT(moveInfo.moveCount > 0 ? moveInfo.pMoves != VMA_NULL : true); - VkResult result = VK_SUCCESS; - VmaStlAllocator blockAllocator(m_MoveAllocator.m_pCallbacks); - VmaVector> immovableBlocks(blockAllocator); - VmaVector> mappedBlocks(blockAllocator); + VkResult result = VK_SUCCESS; + VmaStlAllocator blockAllocator(m_MoveAllocator.m_pCallbacks); + VmaVector> immovableBlocks(blockAllocator); + VmaVector> mappedBlocks(blockAllocator); - VmaAllocator allocator = VMA_NULL; - for (uint32_t i = 0; i < moveInfo.moveCount; ++i) - { - VmaDefragmentationMove& move = moveInfo.pMoves[i]; - size_t prevCount = 0, currentCount = 0; - VkDeviceSize freedBlockSize = 0; + VmaAllocator allocator = VMA_NULL; + for (uint32_t i = 0; i < moveInfo.moveCount; ++i) + { + VmaDefragmentationMove& move = moveInfo.pMoves[i]; + size_t prevCount = 0, currentCount = 0; + VkDeviceSize freedBlockSize = 0; - uint32_t vectorIndex; - VmaBlockVector* vector; - if (m_PoolBlockVector != VMA_NULL) - { - vectorIndex = 0; - vector = m_PoolBlockVector; - } - else - { - vectorIndex = move.srcAllocation->GetMemoryTypeIndex(); - vector = m_pBlockVectors[vectorIndex]; - VMA_ASSERT(vector != VMA_NULL); - } + uint32_t vectorIndex; + VmaBlockVector* vector; + if (m_PoolBlockVector != VMA_NULL) + { + vectorIndex = 0; + vector = m_PoolBlockVector; + } else + { + vectorIndex = move.srcAllocation->GetMemoryTypeIndex(); + vector = m_pBlockVectors[vectorIndex]; + VMA_ASSERT(vector != VMA_NULL); + } - switch (move.operation) - { - case VMA_DEFRAGMENTATION_MOVE_OPERATION_COPY: - { - uint8_t mapCount = move.srcAllocation->SwapBlockAllocation(vector->m_hAllocator, move.dstTmpAllocation); - if (mapCount > 0) - { - allocator = vector->m_hAllocator; - VmaDeviceMemoryBlock* newMapBlock = move.srcAllocation->GetBlock(); - bool notPresent = true; - for (FragmentedBlock& block : mappedBlocks) - { - if (block.block == newMapBlock) - { - notPresent = false; - block.data += mapCount; - break; - } - } - if (notPresent) - mappedBlocks.push_back({ mapCount, newMapBlock }); - } + switch (move.operation) + { + case VMA_DEFRAGMENTATION_MOVE_OPERATION_COPY: + { + uint8_t mapCount = move.srcAllocation->SwapBlockAllocation(vector->m_hAllocator, move.dstTmpAllocation); + if (mapCount > 0) + { + allocator = vector->m_hAllocator; + VmaDeviceMemoryBlock* newMapBlock = move.srcAllocation->GetBlock(); + bool notPresent = true; + for (FragmentedBlock& block : mappedBlocks) + { + if (block.block == newMapBlock) + { + notPresent = false; + block.data += mapCount; + break; + } + } + if (notPresent) + mappedBlocks.push_back({ mapCount, newMapBlock }); + } - // Scope for locks, Free have it's own lock - { - VmaMutexLockRead lock(vector->GetMutex(), vector->GetAllocator()->m_UseMutex); - prevCount = vector->GetBlockCount(); - freedBlockSize = move.dstTmpAllocation->GetBlock()->m_pMetadata->GetSize(); - } - vector->Free(move.dstTmpAllocation); - { - VmaMutexLockRead lock(vector->GetMutex(), vector->GetAllocator()->m_UseMutex); - currentCount = vector->GetBlockCount(); - } + // Scope for locks, Free have it's own lock + { + VmaMutexLockRead lock(vector->GetMutex(), vector->GetAllocator()->m_UseMutex); + prevCount = vector->GetBlockCount(); + freedBlockSize = move.dstTmpAllocation->GetBlock()->m_pMetadata->GetSize(); + } + vector->Free(move.dstTmpAllocation); + { + VmaMutexLockRead lock(vector->GetMutex(), vector->GetAllocator()->m_UseMutex); + currentCount = vector->GetBlockCount(); + } - result = VK_INCOMPLETE; - break; - } - case VMA_DEFRAGMENTATION_MOVE_OPERATION_IGNORE: - { - m_PassStats.bytesMoved -= move.srcAllocation->GetSize(); - --m_PassStats.allocationsMoved; - vector->Free(move.dstTmpAllocation); + result = VK_INCOMPLETE; + break; + } + case VMA_DEFRAGMENTATION_MOVE_OPERATION_IGNORE: + { + m_PassStats.bytesMoved -= move.srcAllocation->GetSize(); + --m_PassStats.allocationsMoved; + vector->Free(move.dstTmpAllocation); - VmaDeviceMemoryBlock* newBlock = move.srcAllocation->GetBlock(); - bool notPresent = true; - for (const FragmentedBlock& block : immovableBlocks) - { - if (block.block == newBlock) - { - notPresent = false; - break; - } - } - if (notPresent) - immovableBlocks.push_back({ vectorIndex, newBlock }); - break; - } - case VMA_DEFRAGMENTATION_MOVE_OPERATION_DESTROY: - { - m_PassStats.bytesMoved -= move.srcAllocation->GetSize(); - --m_PassStats.allocationsMoved; - // Scope for locks, Free have it's own lock - { - VmaMutexLockRead lock(vector->GetMutex(), vector->GetAllocator()->m_UseMutex); - prevCount = vector->GetBlockCount(); - freedBlockSize = move.srcAllocation->GetBlock()->m_pMetadata->GetSize(); - } - vector->Free(move.srcAllocation); - { - VmaMutexLockRead lock(vector->GetMutex(), vector->GetAllocator()->m_UseMutex); - currentCount = vector->GetBlockCount(); - } - freedBlockSize *= prevCount - currentCount; + VmaDeviceMemoryBlock* newBlock = move.srcAllocation->GetBlock(); + bool notPresent = true; + for (const FragmentedBlock& block : immovableBlocks) + { + if (block.block == newBlock) + { + notPresent = false; + break; + } + } + if (notPresent) + immovableBlocks.push_back({ vectorIndex, newBlock }); + break; + } + case VMA_DEFRAGMENTATION_MOVE_OPERATION_DESTROY: + { + m_PassStats.bytesMoved -= move.srcAllocation->GetSize(); + --m_PassStats.allocationsMoved; + // Scope for locks, Free have it's own lock + { + VmaMutexLockRead lock(vector->GetMutex(), vector->GetAllocator()->m_UseMutex); + prevCount = vector->GetBlockCount(); + freedBlockSize = move.srcAllocation->GetBlock()->m_pMetadata->GetSize(); + } + vector->Free(move.srcAllocation); + { + VmaMutexLockRead lock(vector->GetMutex(), vector->GetAllocator()->m_UseMutex); + currentCount = vector->GetBlockCount(); + } + freedBlockSize *= prevCount - currentCount; - VkDeviceSize dstBlockSize; - { - VmaMutexLockRead lock(vector->GetMutex(), vector->GetAllocator()->m_UseMutex); - dstBlockSize = move.dstTmpAllocation->GetBlock()->m_pMetadata->GetSize(); - } - vector->Free(move.dstTmpAllocation); - { - VmaMutexLockRead lock(vector->GetMutex(), vector->GetAllocator()->m_UseMutex); - freedBlockSize += dstBlockSize * (currentCount - vector->GetBlockCount()); - currentCount = vector->GetBlockCount(); - } + VkDeviceSize dstBlockSize; + { + VmaMutexLockRead lock(vector->GetMutex(), vector->GetAllocator()->m_UseMutex); + dstBlockSize = move.dstTmpAllocation->GetBlock()->m_pMetadata->GetSize(); + } + vector->Free(move.dstTmpAllocation); + { + VmaMutexLockRead lock(vector->GetMutex(), vector->GetAllocator()->m_UseMutex); + freedBlockSize += dstBlockSize * (currentCount - vector->GetBlockCount()); + currentCount = vector->GetBlockCount(); + } - result = VK_INCOMPLETE; - break; - } - default: - VMA_ASSERT(0); - } + result = VK_INCOMPLETE; + break; + } + default: + VMA_ASSERT(0); + } - if (prevCount > currentCount) - { - size_t freedBlocks = prevCount - currentCount; - m_PassStats.deviceMemoryBlocksFreed += static_cast(freedBlocks); - m_PassStats.bytesFreed += freedBlockSize; - } + if (prevCount > currentCount) + { + size_t freedBlocks = prevCount - currentCount; + m_PassStats.deviceMemoryBlocksFreed += static_cast(freedBlocks); + m_PassStats.bytesFreed += freedBlockSize; + } - switch (m_Algorithm) - { - case VMA_DEFRAGMENTATION_FLAG_ALGORITHM_EXTENSIVE_BIT: - { - if (m_AlgorithmState != VMA_NULL) - { - // Avoid unnecessary tries to allocate when new free block is available - StateExtensive& state = reinterpret_cast(m_AlgorithmState)[vectorIndex]; - if (state.firstFreeBlock != SIZE_MAX) - { - const size_t diff = prevCount - currentCount; - if (state.firstFreeBlock >= diff) - { - state.firstFreeBlock -= diff; - if (state.firstFreeBlock != 0) - state.firstFreeBlock -= vector->GetBlock(state.firstFreeBlock - 1)->m_pMetadata->IsEmpty(); - } - else - state.firstFreeBlock = 0; - } - } - } - } - } - moveInfo.moveCount = 0; - moveInfo.pMoves = VMA_NULL; - m_Moves.clear(); + if (m_Algorithm == VMA_DEFRAGMENTATION_FLAG_ALGORITHM_EXTENSIVE_BIT && + m_AlgorithmState != VMA_NULL) + { + // Avoid unnecessary tries to allocate when new free block is available + StateExtensive& state = reinterpret_cast(m_AlgorithmState)[vectorIndex]; + if (state.firstFreeBlock != SIZE_MAX) + { + const size_t diff = prevCount - currentCount; + if (state.firstFreeBlock >= diff) + { + state.firstFreeBlock -= diff; + if (state.firstFreeBlock != 0) + state.firstFreeBlock -= vector->GetBlock(state.firstFreeBlock - 1)->m_pMetadata->IsEmpty(); + } else + state.firstFreeBlock = 0; + } + } + } + moveInfo.moveCount = 0; + moveInfo.pMoves = VMA_NULL; + m_Moves.clear(); - // Update stats - m_GlobalStats.allocationsMoved += m_PassStats.allocationsMoved; - m_GlobalStats.bytesFreed += m_PassStats.bytesFreed; - m_GlobalStats.bytesMoved += m_PassStats.bytesMoved; - m_GlobalStats.deviceMemoryBlocksFreed += m_PassStats.deviceMemoryBlocksFreed; - m_PassStats = { 0 }; + // Update stats + m_GlobalStats.allocationsMoved += m_PassStats.allocationsMoved; + m_GlobalStats.bytesFreed += m_PassStats.bytesFreed; + m_GlobalStats.bytesMoved += m_PassStats.bytesMoved; + m_GlobalStats.deviceMemoryBlocksFreed += m_PassStats.deviceMemoryBlocksFreed; + m_PassStats = { 0 }; - // Move blocks with immovable allocations according to algorithm - if (immovableBlocks.size() > 0) - { - switch (m_Algorithm) - { - case VMA_DEFRAGMENTATION_FLAG_ALGORITHM_EXTENSIVE_BIT: - { - if (m_AlgorithmState != VMA_NULL) - { - bool swapped = false; - // Move to the start of free blocks range - for (const FragmentedBlock& block : immovableBlocks) - { - StateExtensive& state = reinterpret_cast(m_AlgorithmState)[block.data]; - if (state.operation != StateExtensive::Operation::Cleanup) - { - VmaBlockVector* vector = m_pBlockVectors[block.data]; - VmaMutexLockWrite lock(vector->GetMutex(), vector->GetAllocator()->m_UseMutex); + // Move blocks with immovable allocations according to algorithm + if (immovableBlocks.size() > 0) + { + do + { + if (m_Algorithm == VMA_DEFRAGMENTATION_FLAG_ALGORITHM_EXTENSIVE_BIT) + { + if (m_AlgorithmState != VMA_NULL) + { + bool swapped = false; + // Move to the start of free blocks range + for (const FragmentedBlock& block : immovableBlocks) + { + StateExtensive& state = reinterpret_cast(m_AlgorithmState)[block.data]; + if (state.operation != StateExtensive::Operation::Cleanup) + { + VmaBlockVector* vector = m_pBlockVectors[block.data]; + VmaMutexLockWrite lock(vector->GetMutex(), vector->GetAllocator()->m_UseMutex); - for (size_t i = 0, count = vector->GetBlockCount() - m_ImmovableBlockCount; i < count; ++i) - { - if (vector->GetBlock(i) == block.block) - { - VMA_SWAP(vector->m_Blocks[i], vector->m_Blocks[vector->GetBlockCount() - ++m_ImmovableBlockCount]); - if (state.firstFreeBlock != SIZE_MAX) - { - if (i + 1 < state.firstFreeBlock) - { - if (state.firstFreeBlock > 1) - VMA_SWAP(vector->m_Blocks[i], vector->m_Blocks[--state.firstFreeBlock]); - else - --state.firstFreeBlock; - } - } - swapped = true; - break; - } - } - } - } - if (swapped) - result = VK_INCOMPLETE; - break; - } - } - default: - { - // Move to the beginning - for (const FragmentedBlock& block : immovableBlocks) - { - VmaBlockVector* vector = m_pBlockVectors[block.data]; - VmaMutexLockWrite lock(vector->GetMutex(), vector->GetAllocator()->m_UseMutex); + for (size_t i = 0, count = vector->GetBlockCount() - m_ImmovableBlockCount; i < count; ++i) + { + if (vector->GetBlock(i) == block.block) + { + std::swap(vector->m_Blocks[i], vector->m_Blocks[vector->GetBlockCount() - ++m_ImmovableBlockCount]); + if (state.firstFreeBlock != SIZE_MAX) + { + if (i + 1 < state.firstFreeBlock) + { + if (state.firstFreeBlock > 1) + std::swap(vector->m_Blocks[i], vector->m_Blocks[--state.firstFreeBlock]); + else + --state.firstFreeBlock; + } + } + swapped = true; + break; + } + } + } + } + if (swapped) + result = VK_INCOMPLETE; + break; + } + } - for (size_t i = m_ImmovableBlockCount; i < vector->GetBlockCount(); ++i) - { - if (vector->GetBlock(i) == block.block) - { - VMA_SWAP(vector->m_Blocks[i], vector->m_Blocks[m_ImmovableBlockCount++]); - break; - } - } - } - break; - } - } - } + // Move to the beginning + for (const FragmentedBlock& block : immovableBlocks) + { + VmaBlockVector* vector = m_pBlockVectors[block.data]; + VmaMutexLockWrite lock(vector->GetMutex(), vector->GetAllocator()->m_UseMutex); - // Bulk-map destination blocks - for (const FragmentedBlock& block : mappedBlocks) - { - VkResult res = block.block->Map(allocator, block.data, VMA_NULL); - VMA_ASSERT(res == VK_SUCCESS); - } - return result; + for (size_t i = m_ImmovableBlockCount; i < vector->GetBlockCount(); ++i) + { + if (vector->GetBlock(i) == block.block) + { + std::swap(vector->m_Blocks[i], vector->m_Blocks[m_ImmovableBlockCount++]); + break; + } + } + } + } while (false); + } + + // Bulk-map destination blocks + for (const FragmentedBlock& block : mappedBlocks) + { + VkResult res = block.block->Map(allocator, block.data, VMA_NULL); + VMA_ASSERT(res == VK_SUCCESS); + } + return result; } bool VmaDefragmentationContext_T::ComputeDefragmentation(VmaBlockVector& vector, size_t index) { - switch (m_Algorithm) - { - case VMA_DEFRAGMENTATION_FLAG_ALGORITHM_FAST_BIT: - return ComputeDefragmentation_Fast(vector); - default: - VMA_ASSERT(0); - case VMA_DEFRAGMENTATION_FLAG_ALGORITHM_BALANCED_BIT: - return ComputeDefragmentation_Balanced(vector, index, true); - case VMA_DEFRAGMENTATION_FLAG_ALGORITHM_FULL_BIT: - return ComputeDefragmentation_Full(vector); - case VMA_DEFRAGMENTATION_FLAG_ALGORITHM_EXTENSIVE_BIT: - return ComputeDefragmentation_Extensive(vector, index); - } + switch (m_Algorithm) + { + case VMA_DEFRAGMENTATION_FLAG_ALGORITHM_FAST_BIT: + return ComputeDefragmentation_Fast(vector); + case VMA_DEFRAGMENTATION_FLAG_ALGORITHM_BALANCED_BIT: + return ComputeDefragmentation_Balanced(vector, index, true); + case VMA_DEFRAGMENTATION_FLAG_ALGORITHM_FULL_BIT: + return ComputeDefragmentation_Full(vector); + case VMA_DEFRAGMENTATION_FLAG_ALGORITHM_EXTENSIVE_BIT: + return ComputeDefragmentation_Extensive(vector, index); + default: + VMA_ASSERT(0); + return ComputeDefragmentation_Balanced(vector, index, true); + } } VmaDefragmentationContext_T::MoveAllocationData VmaDefragmentationContext_T::GetMoveData( - VmaAllocHandle handle, VmaBlockMetadata* metadata) + VmaAllocHandle handle, VmaBlockMetadata* metadata) { - MoveAllocationData moveData; - moveData.move.srcAllocation = (VmaAllocation)metadata->GetAllocationUserData(handle); - moveData.size = moveData.move.srcAllocation->GetSize(); - moveData.alignment = moveData.move.srcAllocation->GetAlignment(); - moveData.type = moveData.move.srcAllocation->GetSuballocationType(); - moveData.flags = 0; + MoveAllocationData moveData; + moveData.move.srcAllocation = (VmaAllocation)metadata->GetAllocationUserData(handle); + moveData.size = moveData.move.srcAllocation->GetSize(); + moveData.alignment = moveData.move.srcAllocation->GetAlignment(); + moveData.type = moveData.move.srcAllocation->GetSuballocationType(); + moveData.flags = 0; - if (moveData.move.srcAllocation->IsPersistentMap()) - moveData.flags |= VMA_ALLOCATION_CREATE_MAPPED_BIT; - if (moveData.move.srcAllocation->IsMappingAllowed()) - moveData.flags |= VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT | VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT; + if (moveData.move.srcAllocation->IsPersistentMap()) + moveData.flags |= VMA_ALLOCATION_CREATE_MAPPED_BIT; + if (moveData.move.srcAllocation->IsMappingAllowed()) + moveData.flags |= VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT | VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT; - return moveData; + return moveData; } VmaDefragmentationContext_T::CounterStatus VmaDefragmentationContext_T::CheckCounters(VkDeviceSize bytes) { - // Ignore allocation if will exceed max size for copy - if (m_PassStats.bytesMoved + bytes > m_MaxPassBytes) - { - if (++m_IgnoredAllocs < MAX_ALLOCS_TO_IGNORE) - return CounterStatus::Ignore; - else - return CounterStatus::End; - } - return CounterStatus::Pass; + // Check custom criteria if exists + if (m_BreakCallback && m_BreakCallback(m_BreakCallbackUserData)) + return CounterStatus::End; + + // Ignore allocation if will exceed max size for copy + if (m_PassStats.bytesMoved + bytes > m_MaxPassBytes) + { + if (++m_IgnoredAllocs < MAX_ALLOCS_TO_IGNORE) + return CounterStatus::Ignore; + else + return CounterStatus::End; + } else + m_IgnoredAllocs = 0; + return CounterStatus::Pass; } bool VmaDefragmentationContext_T::IncrementCounters(VkDeviceSize bytes) { - m_PassStats.bytesMoved += bytes; - // Early return when max found - if (++m_PassStats.allocationsMoved >= m_MaxPassAllocations || m_PassStats.bytesMoved >= m_MaxPassBytes) - { - VMA_ASSERT(m_PassStats.allocationsMoved == m_MaxPassAllocations || - m_PassStats.bytesMoved == m_MaxPassBytes && "Exceeded maximal pass threshold!"); - return true; - } - return false; + m_PassStats.bytesMoved += bytes; + // Early return when max found + if (++m_PassStats.allocationsMoved >= m_MaxPassAllocations || m_PassStats.bytesMoved >= m_MaxPassBytes) + { + VMA_ASSERT((m_PassStats.allocationsMoved == m_MaxPassAllocations || + m_PassStats.bytesMoved == m_MaxPassBytes) && "Exceeded maximal pass threshold!"); + return true; + } + return false; } bool VmaDefragmentationContext_T::ReallocWithinBlock(VmaBlockVector& vector, VmaDeviceMemoryBlock* block) { - VmaBlockMetadata* metadata = block->m_pMetadata; + VmaBlockMetadata* metadata = block->m_pMetadata; - for (VmaAllocHandle handle = metadata->GetAllocationListBegin(); - handle != VK_NULL_HANDLE; - handle = metadata->GetNextAllocation(handle)) - { - MoveAllocationData moveData = GetMoveData(handle, metadata); - // Ignore newly created allocations by defragmentation algorithm - if (moveData.move.srcAllocation->GetUserData() == this) - continue; - switch (CheckCounters(moveData.move.srcAllocation->GetSize())) - { - case CounterStatus::Ignore: - continue; - case CounterStatus::End: - return true; - default: - VMA_ASSERT(0); - case CounterStatus::Pass: - break; - } + for (VmaAllocHandle handle = metadata->GetAllocationListBegin(); + handle != VK_NULL_HANDLE; + handle = metadata->GetNextAllocation(handle)) + { + MoveAllocationData moveData = GetMoveData(handle, metadata); + // Ignore newly created allocations by defragmentation algorithm + if (moveData.move.srcAllocation->GetUserData() == this) + continue; + switch (CheckCounters(moveData.move.srcAllocation->GetSize())) + { + case CounterStatus::Ignore: + continue; + case CounterStatus::End: + return true; + case CounterStatus::Pass: + break; + default: + VMA_ASSERT(0); + } - VkDeviceSize offset = moveData.move.srcAllocation->GetOffset(); - if (offset != 0 && metadata->GetSumFreeSize() >= moveData.size) - { - VmaAllocationRequest request = {}; - if (metadata->CreateAllocationRequest( - moveData.size, - moveData.alignment, - false, - moveData.type, - VMA_ALLOCATION_CREATE_STRATEGY_MIN_OFFSET_BIT, - &request)) - { - if (metadata->GetAllocationOffset(request.allocHandle) < offset) - { - if (vector.CommitAllocationRequest( - request, - block, - moveData.alignment, - moveData.flags, - this, - moveData.type, - &moveData.move.dstTmpAllocation) == VK_SUCCESS) - { - m_Moves.push_back(moveData.move); - if (IncrementCounters(moveData.size)) - return true; - } - } - } - } - } - return false; + VkDeviceSize offset = moveData.move.srcAllocation->GetOffset(); + if (offset != 0 && metadata->GetSumFreeSize() >= moveData.size) + { + VmaAllocationRequest request = {}; + if (metadata->CreateAllocationRequest( + moveData.size, + moveData.alignment, + false, + moveData.type, + VMA_ALLOCATION_CREATE_STRATEGY_MIN_OFFSET_BIT, + &request)) + { + if (metadata->GetAllocationOffset(request.allocHandle) < offset) + { + if (vector.CommitAllocationRequest( + request, + block, + moveData.alignment, + moveData.flags, + this, + moveData.type, + &moveData.move.dstTmpAllocation) == VK_SUCCESS) + { + m_Moves.push_back(moveData.move); + if (IncrementCounters(moveData.size)) + return true; + } + } + } + } + } + return false; } bool VmaDefragmentationContext_T::AllocInOtherBlock(size_t start, size_t end, MoveAllocationData& data, VmaBlockVector& vector) { - for (; start < end; ++start) - { - VmaDeviceMemoryBlock* dstBlock = vector.GetBlock(start); - if (dstBlock->m_pMetadata->GetSumFreeSize() >= data.size) - { - if (vector.AllocateFromBlock(dstBlock, - data.size, - data.alignment, - data.flags, - this, - data.type, - 0, - &data.move.dstTmpAllocation) == VK_SUCCESS) - { - m_Moves.push_back(data.move); - if (IncrementCounters(data.size)) - return true; - break; - } - } - } - return false; + for (; start < end; ++start) + { + VmaDeviceMemoryBlock* dstBlock = vector.GetBlock(start); + if (dstBlock->m_pMetadata->GetSumFreeSize() >= data.size) + { + if (vector.AllocateFromBlock(dstBlock, + data.size, + data.alignment, + data.flags, + this, + data.type, + 0, + &data.move.dstTmpAllocation) == VK_SUCCESS) + { + m_Moves.push_back(data.move); + if (IncrementCounters(data.size)) + return true; + break; + } + } + } + return false; } bool VmaDefragmentationContext_T::ComputeDefragmentation_Fast(VmaBlockVector& vector) { - // Move only between blocks + // Move only between blocks - // Go through allocations in last blocks and try to fit them inside first ones - for (size_t i = vector.GetBlockCount() - 1; i > m_ImmovableBlockCount; --i) - { - VmaBlockMetadata* metadata = vector.GetBlock(i)->m_pMetadata; + // Go through allocations in last blocks and try to fit them inside first ones + for (size_t i = vector.GetBlockCount() - 1; i > m_ImmovableBlockCount; --i) + { + VmaBlockMetadata* metadata = vector.GetBlock(i)->m_pMetadata; - for (VmaAllocHandle handle = metadata->GetAllocationListBegin(); - handle != VK_NULL_HANDLE; - handle = metadata->GetNextAllocation(handle)) - { - MoveAllocationData moveData = GetMoveData(handle, metadata); - // Ignore newly created allocations by defragmentation algorithm - if (moveData.move.srcAllocation->GetUserData() == this) - continue; - switch (CheckCounters(moveData.move.srcAllocation->GetSize())) - { - case CounterStatus::Ignore: - continue; - case CounterStatus::End: - return true; - default: - VMA_ASSERT(0); - case CounterStatus::Pass: - break; - } + for (VmaAllocHandle handle = metadata->GetAllocationListBegin(); + handle != VK_NULL_HANDLE; + handle = metadata->GetNextAllocation(handle)) + { + MoveAllocationData moveData = GetMoveData(handle, metadata); + // Ignore newly created allocations by defragmentation algorithm + if (moveData.move.srcAllocation->GetUserData() == this) + continue; + switch (CheckCounters(moveData.move.srcAllocation->GetSize())) + { + case CounterStatus::Ignore: + continue; + case CounterStatus::End: + return true; + case CounterStatus::Pass: + break; + default: + VMA_ASSERT(0); + } - // Check all previous blocks for free space - if (AllocInOtherBlock(0, i, moveData, vector)) - return true; - } - } - return false; + // Check all previous blocks for free space + if (AllocInOtherBlock(0, i, moveData, vector)) + return true; + } + } + return false; } bool VmaDefragmentationContext_T::ComputeDefragmentation_Balanced(VmaBlockVector& vector, size_t index, bool update) { - // Go over every allocation and try to fit it in previous blocks at lowest offsets, - // if not possible: realloc within single block to minimize offset (exclude offset == 0), - // but only if there are noticeable gaps between them (some heuristic, ex. average size of allocation in block) - VMA_ASSERT(m_AlgorithmState != VMA_NULL); + // Go over every allocation and try to fit it in previous blocks at lowest offsets, + // if not possible: realloc within single block to minimize offset (exclude offset == 0), + // but only if there are noticeable gaps between them (some heuristic, ex. average size of allocation in block) + VMA_ASSERT(m_AlgorithmState != VMA_NULL); - StateBalanced& vectorState = reinterpret_cast(m_AlgorithmState)[index]; - if (update && vectorState.avgAllocSize == UINT64_MAX) - UpdateVectorStatistics(vector, vectorState); + StateBalanced& vectorState = reinterpret_cast(m_AlgorithmState)[index]; + if (update && vectorState.avgAllocSize == UINT64_MAX) + UpdateVectorStatistics(vector, vectorState); - const size_t startMoveCount = m_Moves.size(); - VkDeviceSize minimalFreeRegion = vectorState.avgFreeSize / 2; - for (size_t i = vector.GetBlockCount() - 1; i > m_ImmovableBlockCount; --i) - { - VmaDeviceMemoryBlock* block = vector.GetBlock(i); - VmaBlockMetadata* metadata = block->m_pMetadata; - VkDeviceSize prevFreeRegionSize = 0; + const size_t startMoveCount = m_Moves.size(); + VkDeviceSize minimalFreeRegion = vectorState.avgFreeSize / 2; + for (size_t i = vector.GetBlockCount() - 1; i > m_ImmovableBlockCount; --i) + { + VmaDeviceMemoryBlock* block = vector.GetBlock(i); + VmaBlockMetadata* metadata = block->m_pMetadata; + VkDeviceSize prevFreeRegionSize = 0; - for (VmaAllocHandle handle = metadata->GetAllocationListBegin(); - handle != VK_NULL_HANDLE; - handle = metadata->GetNextAllocation(handle)) - { - MoveAllocationData moveData = GetMoveData(handle, metadata); - // Ignore newly created allocations by defragmentation algorithm - if (moveData.move.srcAllocation->GetUserData() == this) - continue; - switch (CheckCounters(moveData.move.srcAllocation->GetSize())) - { - case CounterStatus::Ignore: - continue; - case CounterStatus::End: - return true; - default: - VMA_ASSERT(0); - case CounterStatus::Pass: - break; - } + for (VmaAllocHandle handle = metadata->GetAllocationListBegin(); + handle != VK_NULL_HANDLE; + handle = metadata->GetNextAllocation(handle)) + { + MoveAllocationData moveData = GetMoveData(handle, metadata); + // Ignore newly created allocations by defragmentation algorithm + if (moveData.move.srcAllocation->GetUserData() == this) + continue; + switch (CheckCounters(moveData.move.srcAllocation->GetSize())) + { + case CounterStatus::Ignore: + continue; + case CounterStatus::End: + return true; + case CounterStatus::Pass: + break; + default: + VMA_ASSERT(0); + } - // Check all previous blocks for free space - const size_t prevMoveCount = m_Moves.size(); - if (AllocInOtherBlock(0, i, moveData, vector)) - return true; + // Check all previous blocks for free space + const size_t prevMoveCount = m_Moves.size(); + if (AllocInOtherBlock(0, i, moveData, vector)) + return true; - VkDeviceSize nextFreeRegionSize = metadata->GetNextFreeRegionSize(handle); - // If no room found then realloc within block for lower offset - VkDeviceSize offset = moveData.move.srcAllocation->GetOffset(); - if (prevMoveCount == m_Moves.size() && offset != 0 && metadata->GetSumFreeSize() >= moveData.size) - { - // Check if realloc will make sense - if (prevFreeRegionSize >= minimalFreeRegion || - nextFreeRegionSize >= minimalFreeRegion || - moveData.size <= vectorState.avgFreeSize || - moveData.size <= vectorState.avgAllocSize) - { - VmaAllocationRequest request = {}; - if (metadata->CreateAllocationRequest( - moveData.size, - moveData.alignment, - false, - moveData.type, - VMA_ALLOCATION_CREATE_STRATEGY_MIN_OFFSET_BIT, - &request)) - { - if (metadata->GetAllocationOffset(request.allocHandle) < offset) - { - if (vector.CommitAllocationRequest( - request, - block, - moveData.alignment, - moveData.flags, - this, - moveData.type, - &moveData.move.dstTmpAllocation) == VK_SUCCESS) - { - m_Moves.push_back(moveData.move); - if (IncrementCounters(moveData.size)) - return true; - } - } - } - } - } - prevFreeRegionSize = nextFreeRegionSize; - } - } + VkDeviceSize nextFreeRegionSize = metadata->GetNextFreeRegionSize(handle); + // If no room found then realloc within block for lower offset + VkDeviceSize offset = moveData.move.srcAllocation->GetOffset(); + if (prevMoveCount == m_Moves.size() && offset != 0 && metadata->GetSumFreeSize() >= moveData.size) + { + // Check if realloc will make sense + if (prevFreeRegionSize >= minimalFreeRegion || + nextFreeRegionSize >= minimalFreeRegion || + moveData.size <= vectorState.avgFreeSize || + moveData.size <= vectorState.avgAllocSize) + { + VmaAllocationRequest request = {}; + if (metadata->CreateAllocationRequest( + moveData.size, + moveData.alignment, + false, + moveData.type, + VMA_ALLOCATION_CREATE_STRATEGY_MIN_OFFSET_BIT, + &request)) + { + if (metadata->GetAllocationOffset(request.allocHandle) < offset) + { + if (vector.CommitAllocationRequest( + request, + block, + moveData.alignment, + moveData.flags, + this, + moveData.type, + &moveData.move.dstTmpAllocation) == VK_SUCCESS) + { + m_Moves.push_back(moveData.move); + if (IncrementCounters(moveData.size)) + return true; + } + } + } + } + } + prevFreeRegionSize = nextFreeRegionSize; + } + } - // No moves performed, update statistics to current vector state - if (startMoveCount == m_Moves.size() && !update) - { - vectorState.avgAllocSize = UINT64_MAX; - return ComputeDefragmentation_Balanced(vector, index, false); - } - return false; + // No moves performed, update statistics to current vector state + if (startMoveCount == m_Moves.size() && !update) + { + vectorState.avgAllocSize = UINT64_MAX; + return ComputeDefragmentation_Balanced(vector, index, false); + } + return false; } bool VmaDefragmentationContext_T::ComputeDefragmentation_Full(VmaBlockVector& vector) { - // Go over every allocation and try to fit it in previous blocks at lowest offsets, - // if not possible: realloc within single block to minimize offset (exclude offset == 0) + // Go over every allocation and try to fit it in previous blocks at lowest offsets, + // if not possible: realloc within single block to minimize offset (exclude offset == 0) - for (size_t i = vector.GetBlockCount() - 1; i > m_ImmovableBlockCount; --i) - { - VmaDeviceMemoryBlock* block = vector.GetBlock(i); - VmaBlockMetadata* metadata = block->m_pMetadata; + for (size_t i = vector.GetBlockCount() - 1; i > m_ImmovableBlockCount; --i) + { + VmaDeviceMemoryBlock* block = vector.GetBlock(i); + VmaBlockMetadata* metadata = block->m_pMetadata; - for (VmaAllocHandle handle = metadata->GetAllocationListBegin(); - handle != VK_NULL_HANDLE; - handle = metadata->GetNextAllocation(handle)) - { - MoveAllocationData moveData = GetMoveData(handle, metadata); - // Ignore newly created allocations by defragmentation algorithm - if (moveData.move.srcAllocation->GetUserData() == this) - continue; - switch (CheckCounters(moveData.move.srcAllocation->GetSize())) - { - case CounterStatus::Ignore: - continue; - case CounterStatus::End: - return true; - default: - VMA_ASSERT(0); - case CounterStatus::Pass: - break; - } + for (VmaAllocHandle handle = metadata->GetAllocationListBegin(); + handle != VK_NULL_HANDLE; + handle = metadata->GetNextAllocation(handle)) + { + MoveAllocationData moveData = GetMoveData(handle, metadata); + // Ignore newly created allocations by defragmentation algorithm + if (moveData.move.srcAllocation->GetUserData() == this) + continue; + switch (CheckCounters(moveData.move.srcAllocation->GetSize())) + { + case CounterStatus::Ignore: + continue; + case CounterStatus::End: + return true; + case CounterStatus::Pass: + break; + default: + VMA_ASSERT(0); + } - // Check all previous blocks for free space - const size_t prevMoveCount = m_Moves.size(); - if (AllocInOtherBlock(0, i, moveData, vector)) - return true; + // Check all previous blocks for free space + const size_t prevMoveCount = m_Moves.size(); + if (AllocInOtherBlock(0, i, moveData, vector)) + return true; - // If no room found then realloc within block for lower offset - VkDeviceSize offset = moveData.move.srcAllocation->GetOffset(); - if (prevMoveCount == m_Moves.size() && offset != 0 && metadata->GetSumFreeSize() >= moveData.size) - { - VmaAllocationRequest request = {}; - if (metadata->CreateAllocationRequest( - moveData.size, - moveData.alignment, - false, - moveData.type, - VMA_ALLOCATION_CREATE_STRATEGY_MIN_OFFSET_BIT, - &request)) - { - if (metadata->GetAllocationOffset(request.allocHandle) < offset) - { - if (vector.CommitAllocationRequest( - request, - block, - moveData.alignment, - moveData.flags, - this, - moveData.type, - &moveData.move.dstTmpAllocation) == VK_SUCCESS) - { - m_Moves.push_back(moveData.move); - if (IncrementCounters(moveData.size)) - return true; - } - } - } - } - } - } - return false; + // If no room found then realloc within block for lower offset + VkDeviceSize offset = moveData.move.srcAllocation->GetOffset(); + if (prevMoveCount == m_Moves.size() && offset != 0 && metadata->GetSumFreeSize() >= moveData.size) + { + VmaAllocationRequest request = {}; + if (metadata->CreateAllocationRequest( + moveData.size, + moveData.alignment, + false, + moveData.type, + VMA_ALLOCATION_CREATE_STRATEGY_MIN_OFFSET_BIT, + &request)) + { + if (metadata->GetAllocationOffset(request.allocHandle) < offset) + { + if (vector.CommitAllocationRequest( + request, + block, + moveData.alignment, + moveData.flags, + this, + moveData.type, + &moveData.move.dstTmpAllocation) == VK_SUCCESS) + { + m_Moves.push_back(moveData.move); + if (IncrementCounters(moveData.size)) + return true; + } + } + } + } + } + } + return false; } bool VmaDefragmentationContext_T::ComputeDefragmentation_Extensive(VmaBlockVector& vector, size_t index) { - // First free single block, then populate it to the brim, then free another block, and so on + // First free single block, then populate it to the brim, then free another block, and so on - // Fallback to previous algorithm since without granularity conflicts it can achieve max packing - if (vector.m_BufferImageGranularity == 1) - return ComputeDefragmentation_Full(vector); + // Fallback to previous algorithm since without granularity conflicts it can achieve max packing + if (vector.m_BufferImageGranularity == 1) + return ComputeDefragmentation_Full(vector); - VMA_ASSERT(m_AlgorithmState != VMA_NULL); + VMA_ASSERT(m_AlgorithmState != VMA_NULL); - StateExtensive& vectorState = reinterpret_cast(m_AlgorithmState)[index]; + StateExtensive& vectorState = reinterpret_cast(m_AlgorithmState)[index]; - bool texturePresent = false, bufferPresent = false, otherPresent = false; - switch (vectorState.operation) - { - case StateExtensive::Operation::Done: // Vector defragmented - return false; - case StateExtensive::Operation::FindFreeBlockBuffer: - case StateExtensive::Operation::FindFreeBlockTexture: - case StateExtensive::Operation::FindFreeBlockAll: - { - // No more blocks to free, just perform fast realloc and move to cleanup - if (vectorState.firstFreeBlock == 0) - { - vectorState.operation = StateExtensive::Operation::Cleanup; - return ComputeDefragmentation_Fast(vector); - } + bool texturePresent = false, bufferPresent = false, otherPresent = false; + switch (vectorState.operation) + { + case StateExtensive::Operation::Done: // Vector defragmented + return false; + case StateExtensive::Operation::FindFreeBlockBuffer: + case StateExtensive::Operation::FindFreeBlockTexture: + case StateExtensive::Operation::FindFreeBlockAll: + { + // No more blocks to free, just perform fast realloc and move to cleanup + if (vectorState.firstFreeBlock == 0) + { + vectorState.operation = StateExtensive::Operation::Cleanup; + return ComputeDefragmentation_Fast(vector); + } - // No free blocks, have to clear last one - size_t last = (vectorState.firstFreeBlock == SIZE_MAX ? vector.GetBlockCount() : vectorState.firstFreeBlock) - 1; - VmaBlockMetadata* freeMetadata = vector.GetBlock(last)->m_pMetadata; + // No free blocks, have to clear last one + size_t last = (vectorState.firstFreeBlock == SIZE_MAX ? vector.GetBlockCount() : vectorState.firstFreeBlock) - 1; + VmaBlockMetadata* freeMetadata = vector.GetBlock(last)->m_pMetadata; - const size_t prevMoveCount = m_Moves.size(); - for (VmaAllocHandle handle = freeMetadata->GetAllocationListBegin(); - handle != VK_NULL_HANDLE; - handle = freeMetadata->GetNextAllocation(handle)) - { - MoveAllocationData moveData = GetMoveData(handle, freeMetadata); - switch (CheckCounters(moveData.move.srcAllocation->GetSize())) - { - case CounterStatus::Ignore: - continue; - case CounterStatus::End: - return true; - default: - VMA_ASSERT(0); - case CounterStatus::Pass: - break; - } + const size_t prevMoveCount = m_Moves.size(); + for (VmaAllocHandle handle = freeMetadata->GetAllocationListBegin(); + handle != VK_NULL_HANDLE; + handle = freeMetadata->GetNextAllocation(handle)) + { + MoveAllocationData moveData = GetMoveData(handle, freeMetadata); + switch (CheckCounters(moveData.move.srcAllocation->GetSize())) + { + case CounterStatus::Ignore: + continue; + case CounterStatus::End: + return true; + case CounterStatus::Pass: + break; + default: + VMA_ASSERT(0); + } - // Check all previous blocks for free space - if (AllocInOtherBlock(0, last, moveData, vector)) - { - // Full clear performed already - if (prevMoveCount != m_Moves.size() && freeMetadata->GetNextAllocation(handle) == VK_NULL_HANDLE) - reinterpret_cast(m_AlgorithmState)[index] = last; - return true; - } - } + // Check all previous blocks for free space + if (AllocInOtherBlock(0, last, moveData, vector)) + { + // Full clear performed already + if (prevMoveCount != m_Moves.size() && freeMetadata->GetNextAllocation(handle) == VK_NULL_HANDLE) + vectorState.firstFreeBlock = last; + return true; + } + } - if (prevMoveCount == m_Moves.size()) - { - // Cannot perform full clear, have to move data in other blocks around - if (last != 0) - { - for (size_t i = last - 1; i; --i) - { - if (ReallocWithinBlock(vector, vector.GetBlock(i))) - return true; - } - } + if (prevMoveCount == m_Moves.size()) + { + // Cannot perform full clear, have to move data in other blocks around + if (last != 0) + { + for (size_t i = last - 1; i; --i) + { + if (ReallocWithinBlock(vector, vector.GetBlock(i))) + return true; + } + } - if (prevMoveCount == m_Moves.size()) - { - // No possible reallocs within blocks, try to move them around fast - return ComputeDefragmentation_Fast(vector); - } - } - else - { - switch (vectorState.operation) - { - case StateExtensive::Operation::FindFreeBlockBuffer: - vectorState.operation = StateExtensive::Operation::MoveBuffers; - break; - default: - VMA_ASSERT(0); - case StateExtensive::Operation::FindFreeBlockTexture: - vectorState.operation = StateExtensive::Operation::MoveTextures; - break; - case StateExtensive::Operation::FindFreeBlockAll: - vectorState.operation = StateExtensive::Operation::MoveAll; - break; - } - vectorState.firstFreeBlock = last; - // Nothing done, block found without reallocations, can perform another reallocs in same pass - return ComputeDefragmentation_Extensive(vector, index); - } - break; - } - case StateExtensive::Operation::MoveTextures: - { - if (MoveDataToFreeBlocks(VMA_SUBALLOCATION_TYPE_IMAGE_OPTIMAL, vector, - vectorState.firstFreeBlock, texturePresent, bufferPresent, otherPresent)) - { - if (texturePresent) - { - vectorState.operation = StateExtensive::Operation::FindFreeBlockTexture; - return ComputeDefragmentation_Extensive(vector, index); - } + if (prevMoveCount == m_Moves.size()) + { + // No possible reallocs within blocks, try to move them around fast + return ComputeDefragmentation_Fast(vector); + } + } else + { + switch (vectorState.operation) + { + case StateExtensive::Operation::FindFreeBlockBuffer: + vectorState.operation = StateExtensive::Operation::MoveBuffers; + break; + case StateExtensive::Operation::FindFreeBlockTexture: + vectorState.operation = StateExtensive::Operation::MoveTextures; + break; + case StateExtensive::Operation::FindFreeBlockAll: + vectorState.operation = StateExtensive::Operation::MoveAll; + break; + default: + VMA_ASSERT(0); + vectorState.operation = StateExtensive::Operation::MoveTextures; + } + vectorState.firstFreeBlock = last; + // Nothing done, block found without reallocations, can perform another reallocs in same pass + return ComputeDefragmentation_Extensive(vector, index); + } + break; + } + case StateExtensive::Operation::MoveTextures: + { + if (MoveDataToFreeBlocks(VMA_SUBALLOCATION_TYPE_IMAGE_OPTIMAL, vector, + vectorState.firstFreeBlock, texturePresent, bufferPresent, otherPresent)) + { + if (texturePresent) + { + vectorState.operation = StateExtensive::Operation::FindFreeBlockTexture; + return ComputeDefragmentation_Extensive(vector, index); + } - if (!bufferPresent && !otherPresent) - { - vectorState.operation = StateExtensive::Operation::Cleanup; - break; - } + if (!bufferPresent && !otherPresent) + { + vectorState.operation = StateExtensive::Operation::Cleanup; + break; + } - // No more textures to move, check buffers - vectorState.operation = StateExtensive::Operation::MoveBuffers; - bufferPresent = false; - otherPresent = false; - } - else - break; - } - case StateExtensive::Operation::MoveBuffers: - { - if (MoveDataToFreeBlocks(VMA_SUBALLOCATION_TYPE_BUFFER, vector, - vectorState.firstFreeBlock, texturePresent, bufferPresent, otherPresent)) - { - if (bufferPresent) - { - vectorState.operation = StateExtensive::Operation::FindFreeBlockBuffer; - return ComputeDefragmentation_Extensive(vector, index); - } + // No more textures to move, check buffers + vectorState.operation = StateExtensive::Operation::MoveBuffers; + bufferPresent = false; + otherPresent = false; + } else + break; + VMA_FALLTHROUGH; // Fallthrough + } + case StateExtensive::Operation::MoveBuffers: + { + if (MoveDataToFreeBlocks(VMA_SUBALLOCATION_TYPE_BUFFER, vector, + vectorState.firstFreeBlock, texturePresent, bufferPresent, otherPresent)) + { + if (bufferPresent) + { + vectorState.operation = StateExtensive::Operation::FindFreeBlockBuffer; + return ComputeDefragmentation_Extensive(vector, index); + } - if (!otherPresent) - { - vectorState.operation = StateExtensive::Operation::Cleanup; - break; - } + if (!otherPresent) + { + vectorState.operation = StateExtensive::Operation::Cleanup; + break; + } - // No more buffers to move, check all others - vectorState.operation = StateExtensive::Operation::MoveAll; - otherPresent = false; - } - else - break; - } - case StateExtensive::Operation::MoveAll: - { - if (MoveDataToFreeBlocks(VMA_SUBALLOCATION_TYPE_FREE, vector, - vectorState.firstFreeBlock, texturePresent, bufferPresent, otherPresent)) - { - if (otherPresent) - { - vectorState.operation = StateExtensive::Operation::FindFreeBlockBuffer; - return ComputeDefragmentation_Extensive(vector, index); - } - // Everything moved - vectorState.operation = StateExtensive::Operation::Cleanup; - } - break; - } - case StateExtensive::Operation::Cleanup: - // Cleanup is handled below so that other operations may reuse the cleanup code. This case is here to prevent the unhandled enum value warning (C4062). - break; - } + // No more buffers to move, check all others + vectorState.operation = StateExtensive::Operation::MoveAll; + otherPresent = false; + } else + break; + VMA_FALLTHROUGH; // Fallthrough + } + case StateExtensive::Operation::MoveAll: + { + if (MoveDataToFreeBlocks(VMA_SUBALLOCATION_TYPE_FREE, vector, + vectorState.firstFreeBlock, texturePresent, bufferPresent, otherPresent)) + { + if (otherPresent) + { + vectorState.operation = StateExtensive::Operation::FindFreeBlockBuffer; + return ComputeDefragmentation_Extensive(vector, index); + } + // Everything moved + vectorState.operation = StateExtensive::Operation::Cleanup; + } + break; + } + case StateExtensive::Operation::Cleanup: + // Cleanup is handled below so that other operations may reuse the cleanup code. This case is here to prevent the unhandled enum value warning (C4062). + break; + } - if (vectorState.operation == StateExtensive::Operation::Cleanup) - { - // All other work done, pack data in blocks even tighter if possible - const size_t prevMoveCount = m_Moves.size(); - for (size_t i = 0; i < vector.GetBlockCount(); ++i) - { - if (ReallocWithinBlock(vector, vector.GetBlock(i))) - return true; - } + if (vectorState.operation == StateExtensive::Operation::Cleanup) + { + // All other work done, pack data in blocks even tighter if possible + const size_t prevMoveCount = m_Moves.size(); + for (size_t i = 0; i < vector.GetBlockCount(); ++i) + { + if (ReallocWithinBlock(vector, vector.GetBlock(i))) + return true; + } - if (prevMoveCount == m_Moves.size()) - vectorState.operation = StateExtensive::Operation::Done; - } - return false; + if (prevMoveCount == m_Moves.size()) + vectorState.operation = StateExtensive::Operation::Done; + } + return false; } void VmaDefragmentationContext_T::UpdateVectorStatistics(VmaBlockVector& vector, StateBalanced& state) { - size_t allocCount = 0; - size_t freeCount = 0; - state.avgFreeSize = 0; - state.avgAllocSize = 0; + size_t allocCount = 0; + size_t freeCount = 0; + state.avgFreeSize = 0; + state.avgAllocSize = 0; - for (size_t i = 0; i < vector.GetBlockCount(); ++i) - { - VmaBlockMetadata* metadata = vector.GetBlock(i)->m_pMetadata; + for (size_t i = 0; i < vector.GetBlockCount(); ++i) + { + VmaBlockMetadata* metadata = vector.GetBlock(i)->m_pMetadata; - allocCount += metadata->GetAllocationCount(); - freeCount += metadata->GetFreeRegionsCount(); - state.avgFreeSize += metadata->GetSumFreeSize(); - state.avgAllocSize += metadata->GetSize(); - } + allocCount += metadata->GetAllocationCount(); + freeCount += metadata->GetFreeRegionsCount(); + state.avgFreeSize += metadata->GetSumFreeSize(); + state.avgAllocSize += metadata->GetSize(); + } - state.avgAllocSize = (state.avgAllocSize - state.avgFreeSize) / allocCount; - state.avgFreeSize /= freeCount; + state.avgAllocSize = (state.avgAllocSize - state.avgFreeSize) / allocCount; + state.avgFreeSize /= freeCount; } bool VmaDefragmentationContext_T::MoveDataToFreeBlocks(VmaSuballocationType currentType, - VmaBlockVector& vector, size_t firstFreeBlock, - bool& texturePresent, bool& bufferPresent, bool& otherPresent) + VmaBlockVector& vector, size_t firstFreeBlock, + bool& texturePresent, bool& bufferPresent, bool& otherPresent) { - const size_t prevMoveCount = m_Moves.size(); - for (size_t i = firstFreeBlock ; i;) - { - VmaDeviceMemoryBlock* block = vector.GetBlock(--i); - VmaBlockMetadata* metadata = block->m_pMetadata; + const size_t prevMoveCount = m_Moves.size(); + for (size_t i = firstFreeBlock; i;) + { + VmaDeviceMemoryBlock* block = vector.GetBlock(--i); + VmaBlockMetadata* metadata = block->m_pMetadata; - for (VmaAllocHandle handle = metadata->GetAllocationListBegin(); - handle != VK_NULL_HANDLE; - handle = metadata->GetNextAllocation(handle)) - { - MoveAllocationData moveData = GetMoveData(handle, metadata); - // Ignore newly created allocations by defragmentation algorithm - if (moveData.move.srcAllocation->GetUserData() == this) - continue; - switch (CheckCounters(moveData.move.srcAllocation->GetSize())) - { - case CounterStatus::Ignore: - continue; - case CounterStatus::End: - return true; - default: - VMA_ASSERT(0); - case CounterStatus::Pass: - break; - } + for (VmaAllocHandle handle = metadata->GetAllocationListBegin(); + handle != VK_NULL_HANDLE; + handle = metadata->GetNextAllocation(handle)) + { + MoveAllocationData moveData = GetMoveData(handle, metadata); + // Ignore newly created allocations by defragmentation algorithm + if (moveData.move.srcAllocation->GetUserData() == this) + continue; + switch (CheckCounters(moveData.move.srcAllocation->GetSize())) + { + case CounterStatus::Ignore: + continue; + case CounterStatus::End: + return true; + case CounterStatus::Pass: + break; + default: + VMA_ASSERT(0); + } - // Move only single type of resources at once - if (!VmaIsBufferImageGranularityConflict(moveData.type, currentType)) - { - // Try to fit allocation into free blocks - if (AllocInOtherBlock(firstFreeBlock, vector.GetBlockCount(), moveData, vector)) - return false; - } + // Move only single type of resources at once + if (!VmaIsBufferImageGranularityConflict(moveData.type, currentType)) + { + // Try to fit allocation into free blocks + if (AllocInOtherBlock(firstFreeBlock, vector.GetBlockCount(), moveData, vector)) + return false; + } - if (!VmaIsBufferImageGranularityConflict(moveData.type, VMA_SUBALLOCATION_TYPE_IMAGE_OPTIMAL)) - texturePresent = true; - else if (!VmaIsBufferImageGranularityConflict(moveData.type, VMA_SUBALLOCATION_TYPE_BUFFER)) - bufferPresent = true; - else - otherPresent = true; - } - } - return prevMoveCount == m_Moves.size(); + if (!VmaIsBufferImageGranularityConflict(moveData.type, VMA_SUBALLOCATION_TYPE_IMAGE_OPTIMAL)) + texturePresent = true; + else if (!VmaIsBufferImageGranularityConflict(moveData.type, VMA_SUBALLOCATION_TYPE_BUFFER)) + bufferPresent = true; + else + otherPresent = true; + } + } + return prevMoveCount == m_Moves.size(); } #endif // _VMA_DEFRAGMENTATION_CONTEXT_FUNCTIONS #ifndef _VMA_POOL_T_FUNCTIONS VmaPool_T::VmaPool_T( - VmaAllocator hAllocator, - const VmaPoolCreateInfo& createInfo, - VkDeviceSize preferredBlockSize) - : m_BlockVector( - hAllocator, - this, // hParentPool - createInfo.memoryTypeIndex, - createInfo.blockSize != 0 ? createInfo.blockSize : preferredBlockSize, - createInfo.minBlockCount, - createInfo.maxBlockCount, - (createInfo.flags& VMA_POOL_CREATE_IGNORE_BUFFER_IMAGE_GRANULARITY_BIT) != 0 ? 1 : hAllocator->GetBufferImageGranularity(), - createInfo.blockSize != 0, // explicitBlockSize - createInfo.flags & VMA_POOL_CREATE_ALGORITHM_MASK, // algorithm - createInfo.priority, - VMA_MAX(hAllocator->GetMemoryTypeMinAlignment(createInfo.memoryTypeIndex), createInfo.minAllocationAlignment), - createInfo.pMemoryAllocateNext), - m_Id(0), - m_Name(VMA_NULL) {} + VmaAllocator hAllocator, + const VmaPoolCreateInfo& createInfo, + VkDeviceSize preferredBlockSize) + : m_BlockVector( + hAllocator, + this, // hParentPool + createInfo.memoryTypeIndex, + createInfo.blockSize != 0 ? createInfo.blockSize : preferredBlockSize, + createInfo.minBlockCount, + createInfo.maxBlockCount, + (createInfo.flags& VMA_POOL_CREATE_IGNORE_BUFFER_IMAGE_GRANULARITY_BIT) != 0 ? 1 : hAllocator->GetBufferImageGranularity(), + createInfo.blockSize != 0, // explicitBlockSize + createInfo.flags & VMA_POOL_CREATE_ALGORITHM_MASK, // algorithm + createInfo.priority, + VMA_MAX(hAllocator->GetMemoryTypeMinAlignment(createInfo.memoryTypeIndex), createInfo.minAllocationAlignment), + createInfo.pMemoryAllocateNext), + m_Id(0), + m_Name(VMA_NULL) {} VmaPool_T::~VmaPool_T() { - VMA_ASSERT(m_PrevPool == VMA_NULL && m_NextPool == VMA_NULL); + VMA_ASSERT(m_PrevPool == VMA_NULL && m_NextPool == VMA_NULL); + + const VkAllocationCallbacks* allocs = m_BlockVector.GetAllocator()->GetAllocationCallbacks(); + VmaFreeString(allocs, m_Name); } void VmaPool_T::SetName(const char* pName) { - const VkAllocationCallbacks* allocs = m_BlockVector.GetAllocator()->GetAllocationCallbacks(); - VmaFreeString(allocs, m_Name); + const VkAllocationCallbacks* allocs = m_BlockVector.GetAllocator()->GetAllocationCallbacks(); + VmaFreeString(allocs, m_Name); - if (pName != VMA_NULL) - { - m_Name = VmaCreateStringCopy(allocs, pName); - } - else - { - m_Name = VMA_NULL; - } + if (pName != VMA_NULL) + { + m_Name = VmaCreateStringCopy(allocs, pName); + } else + { + m_Name = VMA_NULL; + } } #endif // _VMA_POOL_T_FUNCTIONS #ifndef _VMA_ALLOCATOR_T_FUNCTIONS VmaAllocator_T::VmaAllocator_T(const VmaAllocatorCreateInfo* pCreateInfo) : - m_UseMutex((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_EXTERNALLY_SYNCHRONIZED_BIT) == 0), - m_VulkanApiVersion(pCreateInfo->vulkanApiVersion != 0 ? pCreateInfo->vulkanApiVersion : VK_API_VERSION_1_0), - m_UseKhrDedicatedAllocation((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_KHR_DEDICATED_ALLOCATION_BIT) != 0), - m_UseKhrBindMemory2((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_KHR_BIND_MEMORY2_BIT) != 0), - m_UseExtMemoryBudget((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_EXT_MEMORY_BUDGET_BIT) != 0), - m_UseAmdDeviceCoherentMemory((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_AMD_DEVICE_COHERENT_MEMORY_BIT) != 0), - m_UseKhrBufferDeviceAddress((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_BUFFER_DEVICE_ADDRESS_BIT) != 0), - m_UseExtMemoryPriority((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_EXT_MEMORY_PRIORITY_BIT) != 0), - m_hDevice(pCreateInfo->device), - m_hInstance(pCreateInfo->instance), - m_AllocationCallbacksSpecified(pCreateInfo->pAllocationCallbacks != VMA_NULL), - m_AllocationCallbacks(pCreateInfo->pAllocationCallbacks ? - *pCreateInfo->pAllocationCallbacks : VmaEmptyAllocationCallbacks), - m_AllocationObjectAllocator(&m_AllocationCallbacks), - m_HeapSizeLimitMask(0), - m_DeviceMemoryCount(0), - m_PreferredLargeHeapBlockSize(0), - m_PhysicalDevice(pCreateInfo->physicalDevice), - m_GpuDefragmentationMemoryTypeBits(UINT32_MAX), - m_NextPoolId(0), - m_GlobalMemoryTypeBits(UINT32_MAX) + m_UseMutex((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_EXTERNALLY_SYNCHRONIZED_BIT) == 0), + m_VulkanApiVersion(pCreateInfo->vulkanApiVersion != 0 ? pCreateInfo->vulkanApiVersion : VK_API_VERSION_1_0), + m_UseKhrDedicatedAllocation((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_KHR_DEDICATED_ALLOCATION_BIT) != 0), + m_UseKhrBindMemory2((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_KHR_BIND_MEMORY2_BIT) != 0), + m_UseExtMemoryBudget((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_EXT_MEMORY_BUDGET_BIT) != 0), + m_UseAmdDeviceCoherentMemory((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_AMD_DEVICE_COHERENT_MEMORY_BIT) != 0), + m_UseKhrBufferDeviceAddress((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_BUFFER_DEVICE_ADDRESS_BIT) != 0), + m_UseExtMemoryPriority((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_EXT_MEMORY_PRIORITY_BIT) != 0), + m_UseKhrMaintenance4((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_KHR_MAINTENANCE4_BIT) != 0), + m_UseKhrMaintenance5((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_KHR_MAINTENANCE5_BIT) != 0), + m_hDevice(pCreateInfo->device), + m_hInstance(pCreateInfo->instance), + m_AllocationCallbacksSpecified(pCreateInfo->pAllocationCallbacks != VMA_NULL), + m_AllocationCallbacks(pCreateInfo->pAllocationCallbacks ? + *pCreateInfo->pAllocationCallbacks : VmaEmptyAllocationCallbacks), + m_AllocationObjectAllocator(&m_AllocationCallbacks), + m_HeapSizeLimitMask(0), + m_DeviceMemoryCount(0), + m_PreferredLargeHeapBlockSize(0), + m_PhysicalDevice(pCreateInfo->physicalDevice), + m_GpuDefragmentationMemoryTypeBits(UINT32_MAX), + m_NextPoolId(0), + m_GlobalMemoryTypeBits(UINT32_MAX) { - if(m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0)) - { - m_UseKhrDedicatedAllocation = false; - m_UseKhrBindMemory2 = false; - } + if (m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0)) + { + m_UseKhrDedicatedAllocation = false; + m_UseKhrBindMemory2 = false; + } - if(VMA_DEBUG_DETECT_CORRUPTION) - { - // Needs to be multiply of uint32_t size because we are going to write VMA_CORRUPTION_DETECTION_MAGIC_VALUE to it. - VMA_ASSERT(VMA_DEBUG_MARGIN % sizeof(uint32_t) == 0); - } + if (VMA_DEBUG_DETECT_CORRUPTION) + { + // Needs to be multiply of uint32_t size because we are going to write VMA_CORRUPTION_DETECTION_MAGIC_VALUE to it. + VMA_ASSERT(VMA_DEBUG_MARGIN % sizeof(uint32_t) == 0); + } - VMA_ASSERT(pCreateInfo->physicalDevice && pCreateInfo->device && pCreateInfo->instance); + VMA_ASSERT(pCreateInfo->physicalDevice && pCreateInfo->device && pCreateInfo->instance); - if(m_VulkanApiVersion < VK_MAKE_VERSION(1, 1, 0)) - { + if (m_VulkanApiVersion < VK_MAKE_VERSION(1, 1, 0)) + { #if !(VMA_DEDICATED_ALLOCATION) - if((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_KHR_DEDICATED_ALLOCATION_BIT) != 0) - { - VMA_ASSERT(0 && "VMA_ALLOCATOR_CREATE_KHR_DEDICATED_ALLOCATION_BIT set but required extensions are disabled by preprocessor macros."); - } + if ((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_KHR_DEDICATED_ALLOCATION_BIT) != 0) + { + VMA_ASSERT(0 && "VMA_ALLOCATOR_CREATE_KHR_DEDICATED_ALLOCATION_BIT set but required extensions are disabled by preprocessor macros."); + } #endif #if !(VMA_BIND_MEMORY2) - if((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_KHR_BIND_MEMORY2_BIT) != 0) - { - VMA_ASSERT(0 && "VMA_ALLOCATOR_CREATE_KHR_BIND_MEMORY2_BIT set but required extension is disabled by preprocessor macros."); - } + if ((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_KHR_BIND_MEMORY2_BIT) != 0) + { + VMA_ASSERT(0 && "VMA_ALLOCATOR_CREATE_KHR_BIND_MEMORY2_BIT set but required extension is disabled by preprocessor macros."); + } #endif - } + } #if !(VMA_MEMORY_BUDGET) - if((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_EXT_MEMORY_BUDGET_BIT) != 0) - { - VMA_ASSERT(0 && "VMA_ALLOCATOR_CREATE_EXT_MEMORY_BUDGET_BIT set but required extension is disabled by preprocessor macros."); - } + if ((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_EXT_MEMORY_BUDGET_BIT) != 0) + { + VMA_ASSERT(0 && "VMA_ALLOCATOR_CREATE_EXT_MEMORY_BUDGET_BIT set but required extension is disabled by preprocessor macros."); + } #endif #if !(VMA_BUFFER_DEVICE_ADDRESS) - if(m_UseKhrBufferDeviceAddress) - { - VMA_ASSERT(0 && "VMA_ALLOCATOR_CREATE_BUFFER_DEVICE_ADDRESS_BIT is set but required extension or Vulkan 1.2 is not available in your Vulkan header or its support in VMA has been disabled by a preprocessor macro."); - } + if (m_UseKhrBufferDeviceAddress) + { + VMA_ASSERT(0 && "VMA_ALLOCATOR_CREATE_BUFFER_DEVICE_ADDRESS_BIT is set but required extension or Vulkan 1.2 is not available in your Vulkan header or its support in VMA has been disabled by a preprocessor macro."); + } #endif #if VMA_VULKAN_VERSION < 1003000 - if(m_VulkanApiVersion >= VK_MAKE_VERSION(1, 3, 0)) - { - VMA_ASSERT(0 && "vulkanApiVersion >= VK_API_VERSION_1_3 but required Vulkan version is disabled by preprocessor macros."); - } + if (m_VulkanApiVersion >= VK_MAKE_VERSION(1, 3, 0)) + { + VMA_ASSERT(0 && "vulkanApiVersion >= VK_API_VERSION_1_3 but required Vulkan version is disabled by preprocessor macros."); + } #endif #if VMA_VULKAN_VERSION < 1002000 - if(m_VulkanApiVersion >= VK_MAKE_VERSION(1, 2, 0)) - { - VMA_ASSERT(0 && "vulkanApiVersion >= VK_API_VERSION_1_2 but required Vulkan version is disabled by preprocessor macros."); - } + if (m_VulkanApiVersion >= VK_MAKE_VERSION(1, 2, 0)) + { + VMA_ASSERT(0 && "vulkanApiVersion >= VK_API_VERSION_1_2 but required Vulkan version is disabled by preprocessor macros."); + } #endif #if VMA_VULKAN_VERSION < 1001000 - if(m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0)) - { - VMA_ASSERT(0 && "vulkanApiVersion >= VK_API_VERSION_1_1 but required Vulkan version is disabled by preprocessor macros."); - } + if (m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0)) + { + VMA_ASSERT(0 && "vulkanApiVersion >= VK_API_VERSION_1_1 but required Vulkan version is disabled by preprocessor macros."); + } #endif #if !(VMA_MEMORY_PRIORITY) - if(m_UseExtMemoryPriority) - { - VMA_ASSERT(0 && "VMA_ALLOCATOR_CREATE_EXT_MEMORY_PRIORITY_BIT is set but required extension is not available in your Vulkan header or its support in VMA has been disabled by a preprocessor macro."); - } + if (m_UseExtMemoryPriority) + { + VMA_ASSERT(0 && "VMA_ALLOCATOR_CREATE_EXT_MEMORY_PRIORITY_BIT is set but required extension is not available in your Vulkan header or its support in VMA has been disabled by a preprocessor macro."); + } +#endif +#if !(VMA_KHR_MAINTENANCE4) + if (m_UseKhrMaintenance4) + { + VMA_ASSERT(0 && "VMA_ALLOCATOR_CREATE_KHR_MAINTENANCE4_BIT is set but required extension is not available in your Vulkan header or its support in VMA has been disabled by a preprocessor macro."); + } +#endif +#if !(VMA_KHR_MAINTENANCE5) + if (m_UseKhrMaintenance5) + { + VMA_ASSERT(0 && "VMA_ALLOCATOR_CREATE_KHR_MAINTENANCE5_BIT is set but required extension is not available in your Vulkan header or its support in VMA has been disabled by a preprocessor macro."); + } #endif - memset(&m_DeviceMemoryCallbacks, 0 ,sizeof(m_DeviceMemoryCallbacks)); - memset(&m_PhysicalDeviceProperties, 0, sizeof(m_PhysicalDeviceProperties)); - memset(&m_MemProps, 0, sizeof(m_MemProps)); + memset(&m_DeviceMemoryCallbacks, 0, sizeof(m_DeviceMemoryCallbacks)); + memset(&m_PhysicalDeviceProperties, 0, sizeof(m_PhysicalDeviceProperties)); + memset(&m_MemProps, 0, sizeof(m_MemProps)); - memset(&m_pBlockVectors, 0, sizeof(m_pBlockVectors)); - memset(&m_VulkanFunctions, 0, sizeof(m_VulkanFunctions)); + memset(&m_pBlockVectors, 0, sizeof(m_pBlockVectors)); + memset(&m_VulkanFunctions, 0, sizeof(m_VulkanFunctions)); #if VMA_EXTERNAL_MEMORY - memset(&m_TypeExternalMemoryHandleTypes, 0, sizeof(m_TypeExternalMemoryHandleTypes)); + memset(&m_TypeExternalMemoryHandleTypes, 0, sizeof(m_TypeExternalMemoryHandleTypes)); #endif // #if VMA_EXTERNAL_MEMORY - if(pCreateInfo->pDeviceMemoryCallbacks != VMA_NULL) - { - m_DeviceMemoryCallbacks.pUserData = pCreateInfo->pDeviceMemoryCallbacks->pUserData; - m_DeviceMemoryCallbacks.pfnAllocate = pCreateInfo->pDeviceMemoryCallbacks->pfnAllocate; - m_DeviceMemoryCallbacks.pfnFree = pCreateInfo->pDeviceMemoryCallbacks->pfnFree; - } + if (pCreateInfo->pDeviceMemoryCallbacks != VMA_NULL) + { + m_DeviceMemoryCallbacks.pUserData = pCreateInfo->pDeviceMemoryCallbacks->pUserData; + m_DeviceMemoryCallbacks.pfnAllocate = pCreateInfo->pDeviceMemoryCallbacks->pfnAllocate; + m_DeviceMemoryCallbacks.pfnFree = pCreateInfo->pDeviceMemoryCallbacks->pfnFree; + } - ImportVulkanFunctions(pCreateInfo->pVulkanFunctions); + ImportVulkanFunctions(pCreateInfo->pVulkanFunctions); - (*m_VulkanFunctions.vkGetPhysicalDeviceProperties)(m_PhysicalDevice, &m_PhysicalDeviceProperties); - (*m_VulkanFunctions.vkGetPhysicalDeviceMemoryProperties)(m_PhysicalDevice, &m_MemProps); + (*m_VulkanFunctions.vkGetPhysicalDeviceProperties)(m_PhysicalDevice, &m_PhysicalDeviceProperties); + (*m_VulkanFunctions.vkGetPhysicalDeviceMemoryProperties)(m_PhysicalDevice, &m_MemProps); - VMA_ASSERT(VmaIsPow2(VMA_MIN_ALIGNMENT)); - VMA_ASSERT(VmaIsPow2(VMA_DEBUG_MIN_BUFFER_IMAGE_GRANULARITY)); - VMA_ASSERT(VmaIsPow2(m_PhysicalDeviceProperties.limits.bufferImageGranularity)); - VMA_ASSERT(VmaIsPow2(m_PhysicalDeviceProperties.limits.nonCoherentAtomSize)); + VMA_ASSERT(VmaIsPow2(VMA_MIN_ALIGNMENT)); + VMA_ASSERT(VmaIsPow2(VMA_DEBUG_MIN_BUFFER_IMAGE_GRANULARITY)); + VMA_ASSERT(VmaIsPow2(m_PhysicalDeviceProperties.limits.bufferImageGranularity)); + VMA_ASSERT(VmaIsPow2(m_PhysicalDeviceProperties.limits.nonCoherentAtomSize)); - m_PreferredLargeHeapBlockSize = (pCreateInfo->preferredLargeHeapBlockSize != 0) ? - pCreateInfo->preferredLargeHeapBlockSize : static_cast(VMA_DEFAULT_LARGE_HEAP_BLOCK_SIZE); + m_PreferredLargeHeapBlockSize = (pCreateInfo->preferredLargeHeapBlockSize != 0) ? + pCreateInfo->preferredLargeHeapBlockSize : static_cast(VMA_DEFAULT_LARGE_HEAP_BLOCK_SIZE); - m_GlobalMemoryTypeBits = CalculateGlobalMemoryTypeBits(); + m_GlobalMemoryTypeBits = CalculateGlobalMemoryTypeBits(); #if VMA_EXTERNAL_MEMORY - if(pCreateInfo->pTypeExternalMemoryHandleTypes != VMA_NULL) - { - memcpy(m_TypeExternalMemoryHandleTypes, pCreateInfo->pTypeExternalMemoryHandleTypes, - sizeof(VkExternalMemoryHandleTypeFlagsKHR) * GetMemoryTypeCount()); - } + if (pCreateInfo->pTypeExternalMemoryHandleTypes != VMA_NULL) + { + memcpy(m_TypeExternalMemoryHandleTypes, pCreateInfo->pTypeExternalMemoryHandleTypes, + sizeof(VkExternalMemoryHandleTypeFlagsKHR) * GetMemoryTypeCount()); + } #endif // #if VMA_EXTERNAL_MEMORY - if(pCreateInfo->pHeapSizeLimit != VMA_NULL) - { - for(uint32_t heapIndex = 0; heapIndex < GetMemoryHeapCount(); ++heapIndex) - { - const VkDeviceSize limit = pCreateInfo->pHeapSizeLimit[heapIndex]; - if(limit != VK_WHOLE_SIZE) - { - m_HeapSizeLimitMask |= 1u << heapIndex; - if(limit < m_MemProps.memoryHeaps[heapIndex].size) - { - m_MemProps.memoryHeaps[heapIndex].size = limit; - } - } - } - } + if (pCreateInfo->pHeapSizeLimit != VMA_NULL) + { + for (uint32_t heapIndex = 0; heapIndex < GetMemoryHeapCount(); ++heapIndex) + { + const VkDeviceSize limit = pCreateInfo->pHeapSizeLimit[heapIndex]; + if (limit != VK_WHOLE_SIZE) + { + m_HeapSizeLimitMask |= 1u << heapIndex; + if (limit < m_MemProps.memoryHeaps[heapIndex].size) + { + m_MemProps.memoryHeaps[heapIndex].size = limit; + } + } + } + } - for(uint32_t memTypeIndex = 0; memTypeIndex < GetMemoryTypeCount(); ++memTypeIndex) - { - // Create only supported types - if((m_GlobalMemoryTypeBits & (1u << memTypeIndex)) != 0) - { - const VkDeviceSize preferredBlockSize = CalcPreferredBlockSize(memTypeIndex); - m_pBlockVectors[memTypeIndex] = vma_new(this, VmaBlockVector)( - this, - VK_NULL_HANDLE, // hParentPool - memTypeIndex, - preferredBlockSize, - 0, - SIZE_MAX, - GetBufferImageGranularity(), - false, // explicitBlockSize - 0, // algorithm - 0.5f, // priority (0.5 is the default per Vulkan spec) - GetMemoryTypeMinAlignment(memTypeIndex), // minAllocationAlignment - VMA_NULL); // // pMemoryAllocateNext - // No need to call m_pBlockVectors[memTypeIndex][blockVectorTypeIndex]->CreateMinBlocks here, - // becase minBlockCount is 0. - } - } + for (uint32_t memTypeIndex = 0; memTypeIndex < GetMemoryTypeCount(); ++memTypeIndex) + { + // Create only supported types + if ((m_GlobalMemoryTypeBits & (1u << memTypeIndex)) != 0) + { + const VkDeviceSize preferredBlockSize = CalcPreferredBlockSize(memTypeIndex); + m_pBlockVectors[memTypeIndex] = vma_new(this, VmaBlockVector)( + this, + VK_NULL_HANDLE, // hParentPool + memTypeIndex, + preferredBlockSize, + 0, + SIZE_MAX, + GetBufferImageGranularity(), + false, // explicitBlockSize + 0, // algorithm + 0.5f, // priority (0.5 is the default per Vulkan spec) + GetMemoryTypeMinAlignment(memTypeIndex), // minAllocationAlignment + VMA_NULL); // // pMemoryAllocateNext + // No need to call m_pBlockVectors[memTypeIndex][blockVectorTypeIndex]->CreateMinBlocks here, + // becase minBlockCount is 0. + } + } } VkResult VmaAllocator_T::Init(const VmaAllocatorCreateInfo* pCreateInfo) { - VkResult res = VK_SUCCESS; + VkResult res = VK_SUCCESS; #if VMA_MEMORY_BUDGET - if(m_UseExtMemoryBudget) - { - UpdateVulkanBudget(); - } + if (m_UseExtMemoryBudget) + { + UpdateVulkanBudget(); + } #endif // #if VMA_MEMORY_BUDGET - return res; + return res; } VmaAllocator_T::~VmaAllocator_T() { - VMA_ASSERT(m_Pools.IsEmpty()); + VMA_ASSERT(m_Pools.IsEmpty()); - for(size_t memTypeIndex = GetMemoryTypeCount(); memTypeIndex--; ) - { - vma_delete(this, m_pBlockVectors[memTypeIndex]); - } + for (size_t memTypeIndex = GetMemoryTypeCount(); memTypeIndex--; ) + { + vma_delete(this, m_pBlockVectors[memTypeIndex]); + } } void VmaAllocator_T::ImportVulkanFunctions(const VmaVulkanFunctions* pVulkanFunctions) { #if VMA_STATIC_VULKAN_FUNCTIONS == 1 - ImportVulkanFunctions_Static(); + ImportVulkanFunctions_Static(); #endif - if(pVulkanFunctions != VMA_NULL) - { - ImportVulkanFunctions_Custom(pVulkanFunctions); - } + if (pVulkanFunctions != VMA_NULL) + { + ImportVulkanFunctions_Custom(pVulkanFunctions); + } #if VMA_DYNAMIC_VULKAN_FUNCTIONS == 1 - ImportVulkanFunctions_Dynamic(); + ImportVulkanFunctions_Dynamic(); #endif - ValidateVulkanFunctions(); + ValidateVulkanFunctions(); } #if VMA_STATIC_VULKAN_FUNCTIONS == 1 void VmaAllocator_T::ImportVulkanFunctions_Static() { - // Vulkan 1.0 - m_VulkanFunctions.vkGetInstanceProcAddr = (PFN_vkGetInstanceProcAddr)vkGetInstanceProcAddr; - m_VulkanFunctions.vkGetDeviceProcAddr = (PFN_vkGetDeviceProcAddr)vkGetDeviceProcAddr; - m_VulkanFunctions.vkGetPhysicalDeviceProperties = (PFN_vkGetPhysicalDeviceProperties)vkGetPhysicalDeviceProperties; - m_VulkanFunctions.vkGetPhysicalDeviceMemoryProperties = (PFN_vkGetPhysicalDeviceMemoryProperties)vkGetPhysicalDeviceMemoryProperties; - m_VulkanFunctions.vkAllocateMemory = (PFN_vkAllocateMemory)vkAllocateMemory; - m_VulkanFunctions.vkFreeMemory = (PFN_vkFreeMemory)vkFreeMemory; - m_VulkanFunctions.vkMapMemory = (PFN_vkMapMemory)vkMapMemory; - m_VulkanFunctions.vkUnmapMemory = (PFN_vkUnmapMemory)vkUnmapMemory; - m_VulkanFunctions.vkFlushMappedMemoryRanges = (PFN_vkFlushMappedMemoryRanges)vkFlushMappedMemoryRanges; - m_VulkanFunctions.vkInvalidateMappedMemoryRanges = (PFN_vkInvalidateMappedMemoryRanges)vkInvalidateMappedMemoryRanges; - m_VulkanFunctions.vkBindBufferMemory = (PFN_vkBindBufferMemory)vkBindBufferMemory; - m_VulkanFunctions.vkBindImageMemory = (PFN_vkBindImageMemory)vkBindImageMemory; - m_VulkanFunctions.vkGetBufferMemoryRequirements = (PFN_vkGetBufferMemoryRequirements)vkGetBufferMemoryRequirements; - m_VulkanFunctions.vkGetImageMemoryRequirements = (PFN_vkGetImageMemoryRequirements)vkGetImageMemoryRequirements; - m_VulkanFunctions.vkCreateBuffer = (PFN_vkCreateBuffer)vkCreateBuffer; - m_VulkanFunctions.vkDestroyBuffer = (PFN_vkDestroyBuffer)vkDestroyBuffer; - m_VulkanFunctions.vkCreateImage = (PFN_vkCreateImage)vkCreateImage; - m_VulkanFunctions.vkDestroyImage = (PFN_vkDestroyImage)vkDestroyImage; - m_VulkanFunctions.vkCmdCopyBuffer = (PFN_vkCmdCopyBuffer)vkCmdCopyBuffer; + // Vulkan 1.0 + m_VulkanFunctions.vkGetInstanceProcAddr = (PFN_vkGetInstanceProcAddr)vkGetInstanceProcAddr; + m_VulkanFunctions.vkGetDeviceProcAddr = (PFN_vkGetDeviceProcAddr)vkGetDeviceProcAddr; + m_VulkanFunctions.vkGetPhysicalDeviceProperties = (PFN_vkGetPhysicalDeviceProperties)vkGetPhysicalDeviceProperties; + m_VulkanFunctions.vkGetPhysicalDeviceMemoryProperties = (PFN_vkGetPhysicalDeviceMemoryProperties)vkGetPhysicalDeviceMemoryProperties; + m_VulkanFunctions.vkAllocateMemory = (PFN_vkAllocateMemory)vkAllocateMemory; + m_VulkanFunctions.vkFreeMemory = (PFN_vkFreeMemory)vkFreeMemory; + m_VulkanFunctions.vkMapMemory = (PFN_vkMapMemory)vkMapMemory; + m_VulkanFunctions.vkUnmapMemory = (PFN_vkUnmapMemory)vkUnmapMemory; + m_VulkanFunctions.vkFlushMappedMemoryRanges = (PFN_vkFlushMappedMemoryRanges)vkFlushMappedMemoryRanges; + m_VulkanFunctions.vkInvalidateMappedMemoryRanges = (PFN_vkInvalidateMappedMemoryRanges)vkInvalidateMappedMemoryRanges; + m_VulkanFunctions.vkBindBufferMemory = (PFN_vkBindBufferMemory)vkBindBufferMemory; + m_VulkanFunctions.vkBindImageMemory = (PFN_vkBindImageMemory)vkBindImageMemory; + m_VulkanFunctions.vkGetBufferMemoryRequirements = (PFN_vkGetBufferMemoryRequirements)vkGetBufferMemoryRequirements; + m_VulkanFunctions.vkGetImageMemoryRequirements = (PFN_vkGetImageMemoryRequirements)vkGetImageMemoryRequirements; + m_VulkanFunctions.vkCreateBuffer = (PFN_vkCreateBuffer)vkCreateBuffer; + m_VulkanFunctions.vkDestroyBuffer = (PFN_vkDestroyBuffer)vkDestroyBuffer; + m_VulkanFunctions.vkCreateImage = (PFN_vkCreateImage)vkCreateImage; + m_VulkanFunctions.vkDestroyImage = (PFN_vkDestroyImage)vkDestroyImage; + m_VulkanFunctions.vkCmdCopyBuffer = (PFN_vkCmdCopyBuffer)vkCmdCopyBuffer; - // Vulkan 1.1 + // Vulkan 1.1 #if VMA_VULKAN_VERSION >= 1001000 - if(m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0)) - { - m_VulkanFunctions.vkGetBufferMemoryRequirements2KHR = (PFN_vkGetBufferMemoryRequirements2)vkGetBufferMemoryRequirements2; - m_VulkanFunctions.vkGetImageMemoryRequirements2KHR = (PFN_vkGetImageMemoryRequirements2)vkGetImageMemoryRequirements2; - m_VulkanFunctions.vkBindBufferMemory2KHR = (PFN_vkBindBufferMemory2)vkBindBufferMemory2; - m_VulkanFunctions.vkBindImageMemory2KHR = (PFN_vkBindImageMemory2)vkBindImageMemory2; - m_VulkanFunctions.vkGetPhysicalDeviceMemoryProperties2KHR = (PFN_vkGetPhysicalDeviceMemoryProperties2)vkGetPhysicalDeviceMemoryProperties2; - } + if (m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0)) + { + m_VulkanFunctions.vkGetBufferMemoryRequirements2KHR = (PFN_vkGetBufferMemoryRequirements2)vkGetBufferMemoryRequirements2; + m_VulkanFunctions.vkGetImageMemoryRequirements2KHR = (PFN_vkGetImageMemoryRequirements2)vkGetImageMemoryRequirements2; + m_VulkanFunctions.vkBindBufferMemory2KHR = (PFN_vkBindBufferMemory2)vkBindBufferMemory2; + m_VulkanFunctions.vkBindImageMemory2KHR = (PFN_vkBindImageMemory2)vkBindImageMemory2; + } +#endif + +#if VMA_VULKAN_VERSION >= 1001000 + if (m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0)) + { + m_VulkanFunctions.vkGetPhysicalDeviceMemoryProperties2KHR = (PFN_vkGetPhysicalDeviceMemoryProperties2)vkGetPhysicalDeviceMemoryProperties2; + } #endif #if VMA_VULKAN_VERSION >= 1003000 - if(m_VulkanApiVersion >= VK_MAKE_VERSION(1, 3, 0)) - { - m_VulkanFunctions.vkGetDeviceBufferMemoryRequirements = (PFN_vkGetDeviceBufferMemoryRequirements)vkGetDeviceBufferMemoryRequirements; - m_VulkanFunctions.vkGetDeviceImageMemoryRequirements = (PFN_vkGetDeviceImageMemoryRequirements)vkGetDeviceImageMemoryRequirements; - } + if (m_VulkanApiVersion >= VK_MAKE_VERSION(1, 3, 0)) + { + m_VulkanFunctions.vkGetDeviceBufferMemoryRequirements = (PFN_vkGetDeviceBufferMemoryRequirements)vkGetDeviceBufferMemoryRequirements; + m_VulkanFunctions.vkGetDeviceImageMemoryRequirements = (PFN_vkGetDeviceImageMemoryRequirements)vkGetDeviceImageMemoryRequirements; + } #endif } @@ -14290,48 +12921,48 @@ void VmaAllocator_T::ImportVulkanFunctions_Static() void VmaAllocator_T::ImportVulkanFunctions_Custom(const VmaVulkanFunctions* pVulkanFunctions) { - VMA_ASSERT(pVulkanFunctions != VMA_NULL); + VMA_ASSERT(pVulkanFunctions != VMA_NULL); #define VMA_COPY_IF_NOT_NULL(funcName) \ if(pVulkanFunctions->funcName != VMA_NULL) m_VulkanFunctions.funcName = pVulkanFunctions->funcName; - VMA_COPY_IF_NOT_NULL(vkGetInstanceProcAddr); - VMA_COPY_IF_NOT_NULL(vkGetDeviceProcAddr); - VMA_COPY_IF_NOT_NULL(vkGetPhysicalDeviceProperties); - VMA_COPY_IF_NOT_NULL(vkGetPhysicalDeviceMemoryProperties); - VMA_COPY_IF_NOT_NULL(vkAllocateMemory); - VMA_COPY_IF_NOT_NULL(vkFreeMemory); - VMA_COPY_IF_NOT_NULL(vkMapMemory); - VMA_COPY_IF_NOT_NULL(vkUnmapMemory); - VMA_COPY_IF_NOT_NULL(vkFlushMappedMemoryRanges); - VMA_COPY_IF_NOT_NULL(vkInvalidateMappedMemoryRanges); - VMA_COPY_IF_NOT_NULL(vkBindBufferMemory); - VMA_COPY_IF_NOT_NULL(vkBindImageMemory); - VMA_COPY_IF_NOT_NULL(vkGetBufferMemoryRequirements); - VMA_COPY_IF_NOT_NULL(vkGetImageMemoryRequirements); - VMA_COPY_IF_NOT_NULL(vkCreateBuffer); - VMA_COPY_IF_NOT_NULL(vkDestroyBuffer); - VMA_COPY_IF_NOT_NULL(vkCreateImage); - VMA_COPY_IF_NOT_NULL(vkDestroyImage); - VMA_COPY_IF_NOT_NULL(vkCmdCopyBuffer); + VMA_COPY_IF_NOT_NULL(vkGetInstanceProcAddr); + VMA_COPY_IF_NOT_NULL(vkGetDeviceProcAddr); + VMA_COPY_IF_NOT_NULL(vkGetPhysicalDeviceProperties); + VMA_COPY_IF_NOT_NULL(vkGetPhysicalDeviceMemoryProperties); + VMA_COPY_IF_NOT_NULL(vkAllocateMemory); + VMA_COPY_IF_NOT_NULL(vkFreeMemory); + VMA_COPY_IF_NOT_NULL(vkMapMemory); + VMA_COPY_IF_NOT_NULL(vkUnmapMemory); + VMA_COPY_IF_NOT_NULL(vkFlushMappedMemoryRanges); + VMA_COPY_IF_NOT_NULL(vkInvalidateMappedMemoryRanges); + VMA_COPY_IF_NOT_NULL(vkBindBufferMemory); + VMA_COPY_IF_NOT_NULL(vkBindImageMemory); + VMA_COPY_IF_NOT_NULL(vkGetBufferMemoryRequirements); + VMA_COPY_IF_NOT_NULL(vkGetImageMemoryRequirements); + VMA_COPY_IF_NOT_NULL(vkCreateBuffer); + VMA_COPY_IF_NOT_NULL(vkDestroyBuffer); + VMA_COPY_IF_NOT_NULL(vkCreateImage); + VMA_COPY_IF_NOT_NULL(vkDestroyImage); + VMA_COPY_IF_NOT_NULL(vkCmdCopyBuffer); #if VMA_DEDICATED_ALLOCATION || VMA_VULKAN_VERSION >= 1001000 - VMA_COPY_IF_NOT_NULL(vkGetBufferMemoryRequirements2KHR); - VMA_COPY_IF_NOT_NULL(vkGetImageMemoryRequirements2KHR); + VMA_COPY_IF_NOT_NULL(vkGetBufferMemoryRequirements2KHR); + VMA_COPY_IF_NOT_NULL(vkGetImageMemoryRequirements2KHR); #endif #if VMA_BIND_MEMORY2 || VMA_VULKAN_VERSION >= 1001000 - VMA_COPY_IF_NOT_NULL(vkBindBufferMemory2KHR); - VMA_COPY_IF_NOT_NULL(vkBindImageMemory2KHR); + VMA_COPY_IF_NOT_NULL(vkBindBufferMemory2KHR); + VMA_COPY_IF_NOT_NULL(vkBindImageMemory2KHR); #endif -#if VMA_MEMORY_BUDGET - VMA_COPY_IF_NOT_NULL(vkGetPhysicalDeviceMemoryProperties2KHR); +#if VMA_MEMORY_BUDGET || VMA_VULKAN_VERSION >= 1001000 + VMA_COPY_IF_NOT_NULL(vkGetPhysicalDeviceMemoryProperties2KHR); #endif -#if VMA_VULKAN_VERSION >= 1003000 - VMA_COPY_IF_NOT_NULL(vkGetDeviceBufferMemoryRequirements); - VMA_COPY_IF_NOT_NULL(vkGetDeviceImageMemoryRequirements); +#if VMA_KHR_MAINTENANCE4 || VMA_VULKAN_VERSION >= 1003000 + VMA_COPY_IF_NOT_NULL(vkGetDeviceBufferMemoryRequirements); + VMA_COPY_IF_NOT_NULL(vkGetDeviceImageMemoryRequirements); #endif #undef VMA_COPY_IF_NOT_NULL @@ -14341,10 +12972,10 @@ void VmaAllocator_T::ImportVulkanFunctions_Custom(const VmaVulkanFunctions* pVul void VmaAllocator_T::ImportVulkanFunctions_Dynamic() { - VMA_ASSERT(m_VulkanFunctions.vkGetInstanceProcAddr && m_VulkanFunctions.vkGetDeviceProcAddr && - "To use VMA_DYNAMIC_VULKAN_FUNCTIONS in new versions of VMA you now have to pass " - "VmaVulkanFunctions::vkGetInstanceProcAddr and vkGetDeviceProcAddr as VmaAllocatorCreateInfo::pVulkanFunctions. " - "Other members can be null."); + VMA_ASSERT(m_VulkanFunctions.vkGetInstanceProcAddr && m_VulkanFunctions.vkGetDeviceProcAddr && + "To use VMA_DYNAMIC_VULKAN_FUNCTIONS in new versions of VMA you now have to pass " + "VmaVulkanFunctions::vkGetInstanceProcAddr and vkGetDeviceProcAddr as VmaAllocatorCreateInfo::pVulkanFunctions. " + "Other members can be null."); #define VMA_FETCH_INSTANCE_FUNC(memberName, functionPointerType, functionNameString) \ if(m_VulkanFunctions.memberName == VMA_NULL) \ @@ -14355,64 +12986,83 @@ void VmaAllocator_T::ImportVulkanFunctions_Dynamic() m_VulkanFunctions.memberName = \ (functionPointerType)m_VulkanFunctions.vkGetDeviceProcAddr(m_hDevice, functionNameString); - VMA_FETCH_INSTANCE_FUNC(vkGetPhysicalDeviceProperties, PFN_vkGetPhysicalDeviceProperties, "vkGetPhysicalDeviceProperties"); - VMA_FETCH_INSTANCE_FUNC(vkGetPhysicalDeviceMemoryProperties, PFN_vkGetPhysicalDeviceMemoryProperties, "vkGetPhysicalDeviceMemoryProperties"); - VMA_FETCH_DEVICE_FUNC(vkAllocateMemory, PFN_vkAllocateMemory, "vkAllocateMemory"); - VMA_FETCH_DEVICE_FUNC(vkFreeMemory, PFN_vkFreeMemory, "vkFreeMemory"); - VMA_FETCH_DEVICE_FUNC(vkMapMemory, PFN_vkMapMemory, "vkMapMemory"); - VMA_FETCH_DEVICE_FUNC(vkUnmapMemory, PFN_vkUnmapMemory, "vkUnmapMemory"); - VMA_FETCH_DEVICE_FUNC(vkFlushMappedMemoryRanges, PFN_vkFlushMappedMemoryRanges, "vkFlushMappedMemoryRanges"); - VMA_FETCH_DEVICE_FUNC(vkInvalidateMappedMemoryRanges, PFN_vkInvalidateMappedMemoryRanges, "vkInvalidateMappedMemoryRanges"); - VMA_FETCH_DEVICE_FUNC(vkBindBufferMemory, PFN_vkBindBufferMemory, "vkBindBufferMemory"); - VMA_FETCH_DEVICE_FUNC(vkBindImageMemory, PFN_vkBindImageMemory, "vkBindImageMemory"); - VMA_FETCH_DEVICE_FUNC(vkGetBufferMemoryRequirements, PFN_vkGetBufferMemoryRequirements, "vkGetBufferMemoryRequirements"); - VMA_FETCH_DEVICE_FUNC(vkGetImageMemoryRequirements, PFN_vkGetImageMemoryRequirements, "vkGetImageMemoryRequirements"); - VMA_FETCH_DEVICE_FUNC(vkCreateBuffer, PFN_vkCreateBuffer, "vkCreateBuffer"); - VMA_FETCH_DEVICE_FUNC(vkDestroyBuffer, PFN_vkDestroyBuffer, "vkDestroyBuffer"); - VMA_FETCH_DEVICE_FUNC(vkCreateImage, PFN_vkCreateImage, "vkCreateImage"); - VMA_FETCH_DEVICE_FUNC(vkDestroyImage, PFN_vkDestroyImage, "vkDestroyImage"); - VMA_FETCH_DEVICE_FUNC(vkCmdCopyBuffer, PFN_vkCmdCopyBuffer, "vkCmdCopyBuffer"); + VMA_FETCH_INSTANCE_FUNC(vkGetPhysicalDeviceProperties, PFN_vkGetPhysicalDeviceProperties, "vkGetPhysicalDeviceProperties"); + VMA_FETCH_INSTANCE_FUNC(vkGetPhysicalDeviceMemoryProperties, PFN_vkGetPhysicalDeviceMemoryProperties, "vkGetPhysicalDeviceMemoryProperties"); + VMA_FETCH_DEVICE_FUNC(vkAllocateMemory, PFN_vkAllocateMemory, "vkAllocateMemory"); + VMA_FETCH_DEVICE_FUNC(vkFreeMemory, PFN_vkFreeMemory, "vkFreeMemory"); + VMA_FETCH_DEVICE_FUNC(vkMapMemory, PFN_vkMapMemory, "vkMapMemory"); + VMA_FETCH_DEVICE_FUNC(vkUnmapMemory, PFN_vkUnmapMemory, "vkUnmapMemory"); + VMA_FETCH_DEVICE_FUNC(vkFlushMappedMemoryRanges, PFN_vkFlushMappedMemoryRanges, "vkFlushMappedMemoryRanges"); + VMA_FETCH_DEVICE_FUNC(vkInvalidateMappedMemoryRanges, PFN_vkInvalidateMappedMemoryRanges, "vkInvalidateMappedMemoryRanges"); + VMA_FETCH_DEVICE_FUNC(vkBindBufferMemory, PFN_vkBindBufferMemory, "vkBindBufferMemory"); + VMA_FETCH_DEVICE_FUNC(vkBindImageMemory, PFN_vkBindImageMemory, "vkBindImageMemory"); + VMA_FETCH_DEVICE_FUNC(vkGetBufferMemoryRequirements, PFN_vkGetBufferMemoryRequirements, "vkGetBufferMemoryRequirements"); + VMA_FETCH_DEVICE_FUNC(vkGetImageMemoryRequirements, PFN_vkGetImageMemoryRequirements, "vkGetImageMemoryRequirements"); + VMA_FETCH_DEVICE_FUNC(vkCreateBuffer, PFN_vkCreateBuffer, "vkCreateBuffer"); + VMA_FETCH_DEVICE_FUNC(vkDestroyBuffer, PFN_vkDestroyBuffer, "vkDestroyBuffer"); + VMA_FETCH_DEVICE_FUNC(vkCreateImage, PFN_vkCreateImage, "vkCreateImage"); + VMA_FETCH_DEVICE_FUNC(vkDestroyImage, PFN_vkDestroyImage, "vkDestroyImage"); + VMA_FETCH_DEVICE_FUNC(vkCmdCopyBuffer, PFN_vkCmdCopyBuffer, "vkCmdCopyBuffer"); #if VMA_VULKAN_VERSION >= 1001000 - if(m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0)) - { - VMA_FETCH_DEVICE_FUNC(vkGetBufferMemoryRequirements2KHR, PFN_vkGetBufferMemoryRequirements2, "vkGetBufferMemoryRequirements2"); - VMA_FETCH_DEVICE_FUNC(vkGetImageMemoryRequirements2KHR, PFN_vkGetImageMemoryRequirements2, "vkGetImageMemoryRequirements2"); - VMA_FETCH_DEVICE_FUNC(vkBindBufferMemory2KHR, PFN_vkBindBufferMemory2, "vkBindBufferMemory2"); - VMA_FETCH_DEVICE_FUNC(vkBindImageMemory2KHR, PFN_vkBindImageMemory2, "vkBindImageMemory2"); - VMA_FETCH_INSTANCE_FUNC(vkGetPhysicalDeviceMemoryProperties2KHR, PFN_vkGetPhysicalDeviceMemoryProperties2, "vkGetPhysicalDeviceMemoryProperties2"); - } + if (m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0)) + { + VMA_FETCH_DEVICE_FUNC(vkGetBufferMemoryRequirements2KHR, PFN_vkGetBufferMemoryRequirements2, "vkGetBufferMemoryRequirements2"); + VMA_FETCH_DEVICE_FUNC(vkGetImageMemoryRequirements2KHR, PFN_vkGetImageMemoryRequirements2, "vkGetImageMemoryRequirements2"); + VMA_FETCH_DEVICE_FUNC(vkBindBufferMemory2KHR, PFN_vkBindBufferMemory2, "vkBindBufferMemory2"); + VMA_FETCH_DEVICE_FUNC(vkBindImageMemory2KHR, PFN_vkBindImageMemory2, "vkBindImageMemory2"); + } +#endif + +#if VMA_MEMORY_BUDGET || VMA_VULKAN_VERSION >= 1001000 + if (m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0)) + { + VMA_FETCH_INSTANCE_FUNC(vkGetPhysicalDeviceMemoryProperties2KHR, PFN_vkGetPhysicalDeviceMemoryProperties2KHR, "vkGetPhysicalDeviceMemoryProperties2"); + } else if (m_UseExtMemoryBudget) + { + VMA_FETCH_INSTANCE_FUNC(vkGetPhysicalDeviceMemoryProperties2KHR, PFN_vkGetPhysicalDeviceMemoryProperties2KHR, "vkGetPhysicalDeviceMemoryProperties2KHR"); + } #endif #if VMA_DEDICATED_ALLOCATION - if(m_UseKhrDedicatedAllocation) - { - VMA_FETCH_DEVICE_FUNC(vkGetBufferMemoryRequirements2KHR, PFN_vkGetBufferMemoryRequirements2KHR, "vkGetBufferMemoryRequirements2KHR"); - VMA_FETCH_DEVICE_FUNC(vkGetImageMemoryRequirements2KHR, PFN_vkGetImageMemoryRequirements2KHR, "vkGetImageMemoryRequirements2KHR"); - } + if (m_UseKhrDedicatedAllocation) + { + VMA_FETCH_DEVICE_FUNC(vkGetBufferMemoryRequirements2KHR, PFN_vkGetBufferMemoryRequirements2KHR, "vkGetBufferMemoryRequirements2KHR"); + VMA_FETCH_DEVICE_FUNC(vkGetImageMemoryRequirements2KHR, PFN_vkGetImageMemoryRequirements2KHR, "vkGetImageMemoryRequirements2KHR"); + } #endif #if VMA_BIND_MEMORY2 - if(m_UseKhrBindMemory2) - { - VMA_FETCH_DEVICE_FUNC(vkBindBufferMemory2KHR, PFN_vkBindBufferMemory2KHR, "vkBindBufferMemory2KHR"); - VMA_FETCH_DEVICE_FUNC(vkBindImageMemory2KHR, PFN_vkBindImageMemory2KHR, "vkBindImageMemory2KHR"); - } + if (m_UseKhrBindMemory2) + { + VMA_FETCH_DEVICE_FUNC(vkBindBufferMemory2KHR, PFN_vkBindBufferMemory2KHR, "vkBindBufferMemory2KHR"); + VMA_FETCH_DEVICE_FUNC(vkBindImageMemory2KHR, PFN_vkBindImageMemory2KHR, "vkBindImageMemory2KHR"); + } #endif // #if VMA_BIND_MEMORY2 -#if VMA_MEMORY_BUDGET - if(m_UseExtMemoryBudget) - { - VMA_FETCH_INSTANCE_FUNC(vkGetPhysicalDeviceMemoryProperties2KHR, PFN_vkGetPhysicalDeviceMemoryProperties2KHR, "vkGetPhysicalDeviceMemoryProperties2KHR"); - } +#if VMA_MEMORY_BUDGET || VMA_VULKAN_VERSION >= 1001000 + if (m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0)) + { + VMA_FETCH_INSTANCE_FUNC(vkGetPhysicalDeviceMemoryProperties2KHR, PFN_vkGetPhysicalDeviceMemoryProperties2KHR, "vkGetPhysicalDeviceMemoryProperties2"); + } else if (m_UseExtMemoryBudget) + { + VMA_FETCH_INSTANCE_FUNC(vkGetPhysicalDeviceMemoryProperties2KHR, PFN_vkGetPhysicalDeviceMemoryProperties2KHR, "vkGetPhysicalDeviceMemoryProperties2KHR"); + } #endif // #if VMA_MEMORY_BUDGET #if VMA_VULKAN_VERSION >= 1003000 - if(m_VulkanApiVersion >= VK_MAKE_VERSION(1, 3, 0)) - { - VMA_FETCH_DEVICE_FUNC(vkGetDeviceBufferMemoryRequirements, PFN_vkGetDeviceBufferMemoryRequirements, "vkGetDeviceBufferMemoryRequirements"); - VMA_FETCH_DEVICE_FUNC(vkGetDeviceImageMemoryRequirements, PFN_vkGetDeviceImageMemoryRequirements, "vkGetDeviceImageMemoryRequirements"); - } + if (m_VulkanApiVersion >= VK_MAKE_VERSION(1, 3, 0)) + { + VMA_FETCH_DEVICE_FUNC(vkGetDeviceBufferMemoryRequirements, PFN_vkGetDeviceBufferMemoryRequirements, "vkGetDeviceBufferMemoryRequirements"); + VMA_FETCH_DEVICE_FUNC(vkGetDeviceImageMemoryRequirements, PFN_vkGetDeviceImageMemoryRequirements, "vkGetDeviceImageMemoryRequirements"); + } +#endif +#if VMA_KHR_MAINTENANCE4 + if (m_UseKhrMaintenance4) + { + VMA_FETCH_DEVICE_FUNC(vkGetDeviceBufferMemoryRequirements, PFN_vkGetDeviceBufferMemoryRequirementsKHR, "vkGetDeviceBufferMemoryRequirementsKHR"); + VMA_FETCH_DEVICE_FUNC(vkGetDeviceImageMemoryRequirements, PFN_vkGetDeviceImageMemoryRequirementsKHR, "vkGetDeviceImageMemoryRequirementsKHR"); + } #endif #undef VMA_FETCH_DEVICE_FUNC @@ -14423,1635 +13073,1670 @@ void VmaAllocator_T::ImportVulkanFunctions_Dynamic() void VmaAllocator_T::ValidateVulkanFunctions() { - VMA_ASSERT(m_VulkanFunctions.vkGetPhysicalDeviceProperties != VMA_NULL); - VMA_ASSERT(m_VulkanFunctions.vkGetPhysicalDeviceMemoryProperties != VMA_NULL); - VMA_ASSERT(m_VulkanFunctions.vkAllocateMemory != VMA_NULL); - VMA_ASSERT(m_VulkanFunctions.vkFreeMemory != VMA_NULL); - VMA_ASSERT(m_VulkanFunctions.vkMapMemory != VMA_NULL); - VMA_ASSERT(m_VulkanFunctions.vkUnmapMemory != VMA_NULL); - VMA_ASSERT(m_VulkanFunctions.vkFlushMappedMemoryRanges != VMA_NULL); - VMA_ASSERT(m_VulkanFunctions.vkInvalidateMappedMemoryRanges != VMA_NULL); - VMA_ASSERT(m_VulkanFunctions.vkBindBufferMemory != VMA_NULL); - VMA_ASSERT(m_VulkanFunctions.vkBindImageMemory != VMA_NULL); - VMA_ASSERT(m_VulkanFunctions.vkGetBufferMemoryRequirements != VMA_NULL); - VMA_ASSERT(m_VulkanFunctions.vkGetImageMemoryRequirements != VMA_NULL); - VMA_ASSERT(m_VulkanFunctions.vkCreateBuffer != VMA_NULL); - VMA_ASSERT(m_VulkanFunctions.vkDestroyBuffer != VMA_NULL); - VMA_ASSERT(m_VulkanFunctions.vkCreateImage != VMA_NULL); - VMA_ASSERT(m_VulkanFunctions.vkDestroyImage != VMA_NULL); - VMA_ASSERT(m_VulkanFunctions.vkCmdCopyBuffer != VMA_NULL); + VMA_ASSERT(m_VulkanFunctions.vkGetPhysicalDeviceProperties != VMA_NULL); + VMA_ASSERT(m_VulkanFunctions.vkGetPhysicalDeviceMemoryProperties != VMA_NULL); + VMA_ASSERT(m_VulkanFunctions.vkAllocateMemory != VMA_NULL); + VMA_ASSERT(m_VulkanFunctions.vkFreeMemory != VMA_NULL); + VMA_ASSERT(m_VulkanFunctions.vkMapMemory != VMA_NULL); + VMA_ASSERT(m_VulkanFunctions.vkUnmapMemory != VMA_NULL); + VMA_ASSERT(m_VulkanFunctions.vkFlushMappedMemoryRanges != VMA_NULL); + VMA_ASSERT(m_VulkanFunctions.vkInvalidateMappedMemoryRanges != VMA_NULL); + VMA_ASSERT(m_VulkanFunctions.vkBindBufferMemory != VMA_NULL); + VMA_ASSERT(m_VulkanFunctions.vkBindImageMemory != VMA_NULL); + VMA_ASSERT(m_VulkanFunctions.vkGetBufferMemoryRequirements != VMA_NULL); + VMA_ASSERT(m_VulkanFunctions.vkGetImageMemoryRequirements != VMA_NULL); + VMA_ASSERT(m_VulkanFunctions.vkCreateBuffer != VMA_NULL); + VMA_ASSERT(m_VulkanFunctions.vkDestroyBuffer != VMA_NULL); + VMA_ASSERT(m_VulkanFunctions.vkCreateImage != VMA_NULL); + VMA_ASSERT(m_VulkanFunctions.vkDestroyImage != VMA_NULL); + VMA_ASSERT(m_VulkanFunctions.vkCmdCopyBuffer != VMA_NULL); #if VMA_DEDICATED_ALLOCATION || VMA_VULKAN_VERSION >= 1001000 - if(m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0) || m_UseKhrDedicatedAllocation) - { - VMA_ASSERT(m_VulkanFunctions.vkGetBufferMemoryRequirements2KHR != VMA_NULL); - VMA_ASSERT(m_VulkanFunctions.vkGetImageMemoryRequirements2KHR != VMA_NULL); - } + if (m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0) || m_UseKhrDedicatedAllocation) + { + VMA_ASSERT(m_VulkanFunctions.vkGetBufferMemoryRequirements2KHR != VMA_NULL); + VMA_ASSERT(m_VulkanFunctions.vkGetImageMemoryRequirements2KHR != VMA_NULL); + } #endif #if VMA_BIND_MEMORY2 || VMA_VULKAN_VERSION >= 1001000 - if(m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0) || m_UseKhrBindMemory2) - { - VMA_ASSERT(m_VulkanFunctions.vkBindBufferMemory2KHR != VMA_NULL); - VMA_ASSERT(m_VulkanFunctions.vkBindImageMemory2KHR != VMA_NULL); - } + if (m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0) || m_UseKhrBindMemory2) + { + VMA_ASSERT(m_VulkanFunctions.vkBindBufferMemory2KHR != VMA_NULL); + VMA_ASSERT(m_VulkanFunctions.vkBindImageMemory2KHR != VMA_NULL); + } #endif #if VMA_MEMORY_BUDGET || VMA_VULKAN_VERSION >= 1001000 - if(m_UseExtMemoryBudget || m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0)) - { - VMA_ASSERT(m_VulkanFunctions.vkGetPhysicalDeviceMemoryProperties2KHR != VMA_NULL); - } + if (m_UseExtMemoryBudget || m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0)) + { + VMA_ASSERT(m_VulkanFunctions.vkGetPhysicalDeviceMemoryProperties2KHR != VMA_NULL); + } #endif -#if VMA_VULKAN_VERSION >= 1003000 - if(m_VulkanApiVersion >= VK_MAKE_VERSION(1, 3, 0)) - { - VMA_ASSERT(m_VulkanFunctions.vkGetDeviceBufferMemoryRequirements != VMA_NULL); - VMA_ASSERT(m_VulkanFunctions.vkGetDeviceImageMemoryRequirements != VMA_NULL); - } -#endif + // Not validating these due to suspected driver bugs with these function + // pointers being null despite correct extension or Vulkan version is enabled. + // See issue #397. Their usage in VMA is optional anyway. + // + // VMA_ASSERT(m_VulkanFunctions.vkGetDeviceBufferMemoryRequirements != VMA_NULL); + // VMA_ASSERT(m_VulkanFunctions.vkGetDeviceImageMemoryRequirements != VMA_NULL); } VkDeviceSize VmaAllocator_T::CalcPreferredBlockSize(uint32_t memTypeIndex) { - const uint32_t heapIndex = MemoryTypeIndexToHeapIndex(memTypeIndex); - const VkDeviceSize heapSize = m_MemProps.memoryHeaps[heapIndex].size; - const bool isSmallHeap = heapSize <= VMA_SMALL_HEAP_MAX_SIZE; - return VmaAlignUp(isSmallHeap ? (heapSize / 8) : m_PreferredLargeHeapBlockSize, (VkDeviceSize)32); + const uint32_t heapIndex = MemoryTypeIndexToHeapIndex(memTypeIndex); + const VkDeviceSize heapSize = m_MemProps.memoryHeaps[heapIndex].size; + const bool isSmallHeap = heapSize <= VMA_SMALL_HEAP_MAX_SIZE; + return VmaAlignUp(isSmallHeap ? (heapSize / 8) : m_PreferredLargeHeapBlockSize, (VkDeviceSize)32); } VkResult VmaAllocator_T::AllocateMemoryOfType( - VmaPool pool, - VkDeviceSize size, - VkDeviceSize alignment, - bool dedicatedPreferred, - VkBuffer dedicatedBuffer, - VkImage dedicatedImage, - VkFlags dedicatedBufferImageUsage, - const VmaAllocationCreateInfo& createInfo, - uint32_t memTypeIndex, - VmaSuballocationType suballocType, - VmaDedicatedAllocationList& dedicatedAllocations, - VmaBlockVector& blockVector, - size_t allocationCount, - VmaAllocation* pAllocations) + VmaPool pool, + VkDeviceSize size, + VkDeviceSize alignment, + bool dedicatedPreferred, + VkBuffer dedicatedBuffer, + VkImage dedicatedImage, + VmaBufferImageUsage dedicatedBufferImageUsage, + const VmaAllocationCreateInfo& createInfo, + uint32_t memTypeIndex, + VmaSuballocationType suballocType, + VmaDedicatedAllocationList& dedicatedAllocations, + VmaBlockVector& blockVector, + size_t allocationCount, + VmaAllocation* pAllocations) { - VMA_ASSERT(pAllocations != VMA_NULL); - VMA_DEBUG_LOG(" AllocateMemory: MemoryTypeIndex=%u, AllocationCount=%zu, Size=%llu", memTypeIndex, allocationCount, size); + VMA_ASSERT(pAllocations != VMA_NULL); + VMA_DEBUG_LOG_FORMAT(" AllocateMemory: MemoryTypeIndex=%" PRIu32 ", AllocationCount=%zu, Size=%" PRIu64, memTypeIndex, allocationCount, size); - VmaAllocationCreateInfo finalCreateInfo = createInfo; - VkResult res = CalcMemTypeParams( - finalCreateInfo, - memTypeIndex, - size, - allocationCount); - if(res != VK_SUCCESS) - return res; + VmaAllocationCreateInfo finalCreateInfo = createInfo; + VkResult res = CalcMemTypeParams( + finalCreateInfo, + memTypeIndex, + size, + allocationCount); + if (res != VK_SUCCESS) + return res; - if((finalCreateInfo.flags & VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT) != 0) - { - return AllocateDedicatedMemory( - pool, - size, - suballocType, - dedicatedAllocations, - memTypeIndex, - (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_MAPPED_BIT) != 0, - (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT) != 0, - (finalCreateInfo.flags & - (VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT | VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT)) != 0, - (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_CAN_ALIAS_BIT) != 0, - finalCreateInfo.pUserData, - finalCreateInfo.priority, - dedicatedBuffer, - dedicatedImage, - dedicatedBufferImageUsage, - allocationCount, - pAllocations, - blockVector.GetAllocationNextPtr()); - } - else - { - const bool canAllocateDedicated = - (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT) == 0 && - (pool == VK_NULL_HANDLE || !blockVector.HasExplicitBlockSize()); + if ((finalCreateInfo.flags & VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT) != 0) + { + return AllocateDedicatedMemory( + pool, + size, + suballocType, + dedicatedAllocations, + memTypeIndex, + (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_MAPPED_BIT) != 0, + (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT) != 0, + (finalCreateInfo.flags & + (VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT | VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT)) != 0, + (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_CAN_ALIAS_BIT) != 0, + finalCreateInfo.pUserData, + finalCreateInfo.priority, + dedicatedBuffer, + dedicatedImage, + dedicatedBufferImageUsage, + allocationCount, + pAllocations, + blockVector.GetAllocationNextPtr()); + } else + { + const bool canAllocateDedicated = + (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT) == 0 && + (pool == VK_NULL_HANDLE || !blockVector.HasExplicitBlockSize()); - if(canAllocateDedicated) - { - // Heuristics: Allocate dedicated memory if requested size if greater than half of preferred block size. - if(size > blockVector.GetPreferredBlockSize() / 2) - { - dedicatedPreferred = true; - } - // Protection against creating each allocation as dedicated when we reach or exceed heap size/budget, - // which can quickly deplete maxMemoryAllocationCount: Don't prefer dedicated allocations when above - // 3/4 of the maximum allocation count. - if(m_DeviceMemoryCount.load() > m_PhysicalDeviceProperties.limits.maxMemoryAllocationCount * 3 / 4) - { - dedicatedPreferred = false; - } + if (canAllocateDedicated) + { + // Heuristics: Allocate dedicated memory if requested size if greater than half of preferred block size. + if (size > blockVector.GetPreferredBlockSize() / 2) + { + dedicatedPreferred = true; + } + // Protection against creating each allocation as dedicated when we reach or exceed heap size/budget, + // which can quickly deplete maxMemoryAllocationCount: Don't prefer dedicated allocations when above + // 3/4 of the maximum allocation count. + if (m_PhysicalDeviceProperties.limits.maxMemoryAllocationCount < UINT32_MAX / 4 && + m_DeviceMemoryCount.load() > m_PhysicalDeviceProperties.limits.maxMemoryAllocationCount * 3 / 4) + { + dedicatedPreferred = false; + } - if(dedicatedPreferred) - { - res = AllocateDedicatedMemory( - pool, - size, - suballocType, - dedicatedAllocations, - memTypeIndex, - (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_MAPPED_BIT) != 0, - (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT) != 0, - (finalCreateInfo.flags & - (VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT | VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT)) != 0, - (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_CAN_ALIAS_BIT) != 0, - finalCreateInfo.pUserData, - finalCreateInfo.priority, - dedicatedBuffer, - dedicatedImage, - dedicatedBufferImageUsage, - allocationCount, - pAllocations, - blockVector.GetAllocationNextPtr()); - if(res == VK_SUCCESS) - { - // Succeeded: AllocateDedicatedMemory function already filled pMemory, nothing more to do here. - VMA_DEBUG_LOG(" Allocated as DedicatedMemory"); - return VK_SUCCESS; - } - } - } + if (dedicatedPreferred) + { + res = AllocateDedicatedMemory( + pool, + size, + suballocType, + dedicatedAllocations, + memTypeIndex, + (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_MAPPED_BIT) != 0, + (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT) != 0, + (finalCreateInfo.flags & + (VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT | VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT)) != 0, + (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_CAN_ALIAS_BIT) != 0, + finalCreateInfo.pUserData, + finalCreateInfo.priority, + dedicatedBuffer, + dedicatedImage, + dedicatedBufferImageUsage, + allocationCount, + pAllocations, + blockVector.GetAllocationNextPtr()); + if (res == VK_SUCCESS) + { + // Succeeded: AllocateDedicatedMemory function already filled pMemory, nothing more to do here. + VMA_DEBUG_LOG(" Allocated as DedicatedMemory"); + return VK_SUCCESS; + } + } + } - res = blockVector.Allocate( - size, - alignment, - finalCreateInfo, - suballocType, - allocationCount, - pAllocations); - if(res == VK_SUCCESS) - return VK_SUCCESS; + res = blockVector.Allocate( + size, + alignment, + finalCreateInfo, + suballocType, + allocationCount, + pAllocations); + if (res == VK_SUCCESS) + return VK_SUCCESS; - // Try dedicated memory. - if(canAllocateDedicated && !dedicatedPreferred) - { - res = AllocateDedicatedMemory( - pool, - size, - suballocType, - dedicatedAllocations, - memTypeIndex, - (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_MAPPED_BIT) != 0, - (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT) != 0, - (finalCreateInfo.flags & - (VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT | VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT)) != 0, - (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_CAN_ALIAS_BIT) != 0, - finalCreateInfo.pUserData, - finalCreateInfo.priority, - dedicatedBuffer, - dedicatedImage, - dedicatedBufferImageUsage, - allocationCount, - pAllocations, - blockVector.GetAllocationNextPtr()); - if(res == VK_SUCCESS) - { - // Succeeded: AllocateDedicatedMemory function already filled pMemory, nothing more to do here. - VMA_DEBUG_LOG(" Allocated as DedicatedMemory"); - return VK_SUCCESS; - } - } - // Everything failed: Return error code. - VMA_DEBUG_LOG(" vkAllocateMemory FAILED"); - return res; - } + // Try dedicated memory. + if (canAllocateDedicated && !dedicatedPreferred) + { + res = AllocateDedicatedMemory( + pool, + size, + suballocType, + dedicatedAllocations, + memTypeIndex, + (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_MAPPED_BIT) != 0, + (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT) != 0, + (finalCreateInfo.flags & + (VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT | VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT)) != 0, + (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_CAN_ALIAS_BIT) != 0, + finalCreateInfo.pUserData, + finalCreateInfo.priority, + dedicatedBuffer, + dedicatedImage, + dedicatedBufferImageUsage, + allocationCount, + pAllocations, + blockVector.GetAllocationNextPtr()); + if (res == VK_SUCCESS) + { + // Succeeded: AllocateDedicatedMemory function already filled pMemory, nothing more to do here. + VMA_DEBUG_LOG(" Allocated as DedicatedMemory"); + return VK_SUCCESS; + } + } + // Everything failed: Return error code. + VMA_DEBUG_LOG(" vkAllocateMemory FAILED"); + return res; + } } VkResult VmaAllocator_T::AllocateDedicatedMemory( - VmaPool pool, - VkDeviceSize size, - VmaSuballocationType suballocType, - VmaDedicatedAllocationList& dedicatedAllocations, - uint32_t memTypeIndex, - bool map, - bool isUserDataString, - bool isMappingAllowed, - bool canAliasMemory, - void* pUserData, - float priority, - VkBuffer dedicatedBuffer, - VkImage dedicatedImage, - VkFlags dedicatedBufferImageUsage, - size_t allocationCount, - VmaAllocation* pAllocations, - const void* pNextChain) + VmaPool pool, + VkDeviceSize size, + VmaSuballocationType suballocType, + VmaDedicatedAllocationList& dedicatedAllocations, + uint32_t memTypeIndex, + bool map, + bool isUserDataString, + bool isMappingAllowed, + bool canAliasMemory, + void* pUserData, + float priority, + VkBuffer dedicatedBuffer, + VkImage dedicatedImage, + VmaBufferImageUsage dedicatedBufferImageUsage, + size_t allocationCount, + VmaAllocation* pAllocations, + const void* pNextChain) { - VMA_ASSERT(allocationCount > 0 && pAllocations); + VMA_ASSERT(allocationCount > 0 && pAllocations); - VkMemoryAllocateInfo allocInfo = { VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO }; - allocInfo.memoryTypeIndex = memTypeIndex; - allocInfo.allocationSize = size; - allocInfo.pNext = pNextChain; + VkMemoryAllocateInfo allocInfo = { VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO }; + allocInfo.memoryTypeIndex = memTypeIndex; + allocInfo.allocationSize = size; + allocInfo.pNext = pNextChain; #if VMA_DEDICATED_ALLOCATION || VMA_VULKAN_VERSION >= 1001000 - VkMemoryDedicatedAllocateInfoKHR dedicatedAllocInfo = { VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO_KHR }; - if(!canAliasMemory) - { - if(m_UseKhrDedicatedAllocation || m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0)) - { - if(dedicatedBuffer != VK_NULL_HANDLE) - { - VMA_ASSERT(dedicatedImage == VK_NULL_HANDLE); - dedicatedAllocInfo.buffer = dedicatedBuffer; - VmaPnextChainPushFront(&allocInfo, &dedicatedAllocInfo); - } - else if(dedicatedImage != VK_NULL_HANDLE) - { - dedicatedAllocInfo.image = dedicatedImage; - VmaPnextChainPushFront(&allocInfo, &dedicatedAllocInfo); - } - } - } + VkMemoryDedicatedAllocateInfoKHR dedicatedAllocInfo = { VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO_KHR }; + if (!canAliasMemory) + { + if (m_UseKhrDedicatedAllocation || m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0)) + { + if (dedicatedBuffer != VK_NULL_HANDLE) + { + VMA_ASSERT(dedicatedImage == VK_NULL_HANDLE); + dedicatedAllocInfo.buffer = dedicatedBuffer; + VmaPnextChainPushFront(&allocInfo, &dedicatedAllocInfo); + } else if (dedicatedImage != VK_NULL_HANDLE) + { + dedicatedAllocInfo.image = dedicatedImage; + VmaPnextChainPushFront(&allocInfo, &dedicatedAllocInfo); + } + } + } #endif // #if VMA_DEDICATED_ALLOCATION || VMA_VULKAN_VERSION >= 1001000 #if VMA_BUFFER_DEVICE_ADDRESS - VkMemoryAllocateFlagsInfoKHR allocFlagsInfo = { VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_FLAGS_INFO_KHR }; - if(m_UseKhrBufferDeviceAddress) - { - bool canContainBufferWithDeviceAddress = true; - if(dedicatedBuffer != VK_NULL_HANDLE) - { - canContainBufferWithDeviceAddress = dedicatedBufferImageUsage == UINT32_MAX || // Usage flags unknown - (dedicatedBufferImageUsage & VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT_EXT) != 0; - } - else if(dedicatedImage != VK_NULL_HANDLE) - { - canContainBufferWithDeviceAddress = false; - } - if(canContainBufferWithDeviceAddress) - { - allocFlagsInfo.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT_KHR; - VmaPnextChainPushFront(&allocInfo, &allocFlagsInfo); - } - } + VkMemoryAllocateFlagsInfoKHR allocFlagsInfo = { VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_FLAGS_INFO_KHR }; + if (m_UseKhrBufferDeviceAddress) + { + bool canContainBufferWithDeviceAddress = true; + if (dedicatedBuffer != VK_NULL_HANDLE) + { + canContainBufferWithDeviceAddress = dedicatedBufferImageUsage == VmaBufferImageUsage::UNKNOWN || + dedicatedBufferImageUsage.Contains(VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT_EXT); + } else if (dedicatedImage != VK_NULL_HANDLE) + { + canContainBufferWithDeviceAddress = false; + } + if (canContainBufferWithDeviceAddress) + { + allocFlagsInfo.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT_KHR; + VmaPnextChainPushFront(&allocInfo, &allocFlagsInfo); + } + } #endif // #if VMA_BUFFER_DEVICE_ADDRESS #if VMA_MEMORY_PRIORITY - VkMemoryPriorityAllocateInfoEXT priorityInfo = { VK_STRUCTURE_TYPE_MEMORY_PRIORITY_ALLOCATE_INFO_EXT }; - if(m_UseExtMemoryPriority) - { - VMA_ASSERT(priority >= 0.f && priority <= 1.f); - priorityInfo.priority = priority; - VmaPnextChainPushFront(&allocInfo, &priorityInfo); - } + VkMemoryPriorityAllocateInfoEXT priorityInfo = { VK_STRUCTURE_TYPE_MEMORY_PRIORITY_ALLOCATE_INFO_EXT }; + if (m_UseExtMemoryPriority) + { + VMA_ASSERT(priority >= 0.f && priority <= 1.f); + priorityInfo.priority = priority; + VmaPnextChainPushFront(&allocInfo, &priorityInfo); + } #endif // #if VMA_MEMORY_PRIORITY #if VMA_EXTERNAL_MEMORY - // Attach VkExportMemoryAllocateInfoKHR if necessary. - VkExportMemoryAllocateInfoKHR exportMemoryAllocInfo = { VK_STRUCTURE_TYPE_EXPORT_MEMORY_ALLOCATE_INFO_KHR }; - exportMemoryAllocInfo.handleTypes = GetExternalMemoryHandleTypeFlags(memTypeIndex); - if(exportMemoryAllocInfo.handleTypes != 0) - { - VmaPnextChainPushFront(&allocInfo, &exportMemoryAllocInfo); - } + // Attach VkExportMemoryAllocateInfoKHR if necessary. + VkExportMemoryAllocateInfoKHR exportMemoryAllocInfo = { VK_STRUCTURE_TYPE_EXPORT_MEMORY_ALLOCATE_INFO_KHR }; + exportMemoryAllocInfo.handleTypes = GetExternalMemoryHandleTypeFlags(memTypeIndex); + if (exportMemoryAllocInfo.handleTypes != 0) + { + VmaPnextChainPushFront(&allocInfo, &exportMemoryAllocInfo); + } #endif // #if VMA_EXTERNAL_MEMORY - size_t allocIndex; - VkResult res = VK_SUCCESS; - for(allocIndex = 0; allocIndex < allocationCount; ++allocIndex) - { - res = AllocateDedicatedMemoryPage( - pool, - size, - suballocType, - memTypeIndex, - allocInfo, - map, - isUserDataString, - isMappingAllowed, - pUserData, - pAllocations + allocIndex); - if(res != VK_SUCCESS) - { - break; - } - } + size_t allocIndex; + VkResult res = VK_SUCCESS; + for (allocIndex = 0; allocIndex < allocationCount; ++allocIndex) + { + res = AllocateDedicatedMemoryPage( + pool, + size, + suballocType, + memTypeIndex, + allocInfo, + map, + isUserDataString, + isMappingAllowed, + pUserData, + pAllocations + allocIndex); + if (res != VK_SUCCESS) + { + break; + } + } - if(res == VK_SUCCESS) - { - for (allocIndex = 0; allocIndex < allocationCount; ++allocIndex) - { - dedicatedAllocations.Register(pAllocations[allocIndex]); - } - VMA_DEBUG_LOG(" Allocated DedicatedMemory Count=%zu, MemoryTypeIndex=#%u", allocationCount, memTypeIndex); - } - else - { - // Free all already created allocations. - while(allocIndex--) - { - VmaAllocation currAlloc = pAllocations[allocIndex]; - VkDeviceMemory hMemory = currAlloc->GetMemory(); + if (res == VK_SUCCESS) + { + for (allocIndex = 0; allocIndex < allocationCount; ++allocIndex) + { + dedicatedAllocations.Register(pAllocations[allocIndex]); + } + VMA_DEBUG_LOG_FORMAT(" Allocated DedicatedMemory Count=%zu, MemoryTypeIndex=#%" PRIu32, allocationCount, memTypeIndex); + } else + { + // Free all already created allocations. + while (allocIndex--) + { + VmaAllocation currAlloc = pAllocations[allocIndex]; + VkDeviceMemory hMemory = currAlloc->GetMemory(); - /* - There is no need to call this, because Vulkan spec allows to skip vkUnmapMemory - before vkFreeMemory. + /* + There is no need to call this, because Vulkan spec allows to skip vkUnmapMemory + before vkFreeMemory. - if(currAlloc->GetMappedData() != VMA_NULL) - { - (*m_VulkanFunctions.vkUnmapMemory)(m_hDevice, hMemory); - } - */ + if(currAlloc->GetMappedData() != VMA_NULL) + { + (*m_VulkanFunctions.vkUnmapMemory)(m_hDevice, hMemory); + } + */ - FreeVulkanMemory(memTypeIndex, currAlloc->GetSize(), hMemory); - m_Budget.RemoveAllocation(MemoryTypeIndexToHeapIndex(memTypeIndex), currAlloc->GetSize()); - m_AllocationObjectAllocator.Free(currAlloc); - } + FreeVulkanMemory(memTypeIndex, currAlloc->GetSize(), hMemory); + m_Budget.RemoveAllocation(MemoryTypeIndexToHeapIndex(memTypeIndex), currAlloc->GetSize()); + m_AllocationObjectAllocator.Free(currAlloc); + } - memset(pAllocations, 0, sizeof(VmaAllocation) * allocationCount); - } + memset(pAllocations, 0, sizeof(VmaAllocation) * allocationCount); + } - return res; + return res; } VkResult VmaAllocator_T::AllocateDedicatedMemoryPage( - VmaPool pool, - VkDeviceSize size, - VmaSuballocationType suballocType, - uint32_t memTypeIndex, - const VkMemoryAllocateInfo& allocInfo, - bool map, - bool isUserDataString, - bool isMappingAllowed, - void* pUserData, - VmaAllocation* pAllocation) + VmaPool pool, + VkDeviceSize size, + VmaSuballocationType suballocType, + uint32_t memTypeIndex, + const VkMemoryAllocateInfo& allocInfo, + bool map, + bool isUserDataString, + bool isMappingAllowed, + void* pUserData, + VmaAllocation* pAllocation) { - VkDeviceMemory hMemory = VK_NULL_HANDLE; - VkResult res = AllocateVulkanMemory(&allocInfo, &hMemory); - if(res < 0) - { - VMA_DEBUG_LOG(" vkAllocateMemory FAILED"); - return res; - } + VkDeviceMemory hMemory = VK_NULL_HANDLE; + VkResult res = AllocateVulkanMemory(&allocInfo, &hMemory); + if (res < 0) + { + VMA_DEBUG_LOG(" vkAllocateMemory FAILED"); + return res; + } - void* pMappedData = VMA_NULL; - if(map) - { - res = (*m_VulkanFunctions.vkMapMemory)( - m_hDevice, - hMemory, - 0, - VK_WHOLE_SIZE, - 0, - &pMappedData); - if(res < 0) - { - VMA_DEBUG_LOG(" vkMapMemory FAILED"); - FreeVulkanMemory(memTypeIndex, size, hMemory); - return res; - } - } + void* pMappedData = VMA_NULL; + if (map) + { + res = (*m_VulkanFunctions.vkMapMemory)( + m_hDevice, + hMemory, + 0, + VK_WHOLE_SIZE, + 0, + &pMappedData); + if (res < 0) + { + VMA_DEBUG_LOG(" vkMapMemory FAILED"); + FreeVulkanMemory(memTypeIndex, size, hMemory); + return res; + } + } - *pAllocation = m_AllocationObjectAllocator.Allocate(isMappingAllowed); - (*pAllocation)->InitDedicatedAllocation(pool, memTypeIndex, hMemory, suballocType, pMappedData, size); - if (isUserDataString) - (*pAllocation)->SetName(this, (const char*)pUserData); - else - (*pAllocation)->SetUserData(this, pUserData); - m_Budget.AddAllocation(MemoryTypeIndexToHeapIndex(memTypeIndex), size); - if(VMA_DEBUG_INITIALIZE_ALLOCATIONS) - { - FillAllocation(*pAllocation, VMA_ALLOCATION_FILL_PATTERN_CREATED); - } + *pAllocation = m_AllocationObjectAllocator.Allocate(isMappingAllowed); + (*pAllocation)->InitDedicatedAllocation(pool, memTypeIndex, hMemory, suballocType, pMappedData, size); + if (isUserDataString) + (*pAllocation)->SetName(this, (const char*)pUserData); + else + (*pAllocation)->SetUserData(this, pUserData); + m_Budget.AddAllocation(MemoryTypeIndexToHeapIndex(memTypeIndex), size); + if (VMA_DEBUG_INITIALIZE_ALLOCATIONS) + { + FillAllocation(*pAllocation, VMA_ALLOCATION_FILL_PATTERN_CREATED); + } - return VK_SUCCESS; + return VK_SUCCESS; } void VmaAllocator_T::GetBufferMemoryRequirements( - VkBuffer hBuffer, - VkMemoryRequirements& memReq, - bool& requiresDedicatedAllocation, - bool& prefersDedicatedAllocation) const + VkBuffer hBuffer, + VkMemoryRequirements& memReq, + bool& requiresDedicatedAllocation, + bool& prefersDedicatedAllocation) const { #if VMA_DEDICATED_ALLOCATION || VMA_VULKAN_VERSION >= 1001000 - if(m_UseKhrDedicatedAllocation || m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0)) - { - VkBufferMemoryRequirementsInfo2KHR memReqInfo = { VK_STRUCTURE_TYPE_BUFFER_MEMORY_REQUIREMENTS_INFO_2_KHR }; - memReqInfo.buffer = hBuffer; + if (m_UseKhrDedicatedAllocation || m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0)) + { + VkBufferMemoryRequirementsInfo2KHR memReqInfo = { VK_STRUCTURE_TYPE_BUFFER_MEMORY_REQUIREMENTS_INFO_2_KHR }; + memReqInfo.buffer = hBuffer; - VkMemoryDedicatedRequirementsKHR memDedicatedReq = { VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS_KHR }; + VkMemoryDedicatedRequirementsKHR memDedicatedReq = { VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS_KHR }; - VkMemoryRequirements2KHR memReq2 = { VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2_KHR }; - VmaPnextChainPushFront(&memReq2, &memDedicatedReq); + VkMemoryRequirements2KHR memReq2 = { VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2_KHR }; + VmaPnextChainPushFront(&memReq2, &memDedicatedReq); - (*m_VulkanFunctions.vkGetBufferMemoryRequirements2KHR)(m_hDevice, &memReqInfo, &memReq2); + (*m_VulkanFunctions.vkGetBufferMemoryRequirements2KHR)(m_hDevice, &memReqInfo, &memReq2); - memReq = memReq2.memoryRequirements; - requiresDedicatedAllocation = (memDedicatedReq.requiresDedicatedAllocation != VK_FALSE); - prefersDedicatedAllocation = (memDedicatedReq.prefersDedicatedAllocation != VK_FALSE); - } - else + memReq = memReq2.memoryRequirements; + requiresDedicatedAllocation = (memDedicatedReq.requiresDedicatedAllocation != VK_FALSE); + prefersDedicatedAllocation = (memDedicatedReq.prefersDedicatedAllocation != VK_FALSE); + } else #endif // #if VMA_DEDICATED_ALLOCATION || VMA_VULKAN_VERSION >= 1001000 - { - (*m_VulkanFunctions.vkGetBufferMemoryRequirements)(m_hDevice, hBuffer, &memReq); - requiresDedicatedAllocation = false; - prefersDedicatedAllocation = false; - } + { + (*m_VulkanFunctions.vkGetBufferMemoryRequirements)(m_hDevice, hBuffer, &memReq); + requiresDedicatedAllocation = false; + prefersDedicatedAllocation = false; + } } void VmaAllocator_T::GetImageMemoryRequirements( - VkImage hImage, - VkMemoryRequirements& memReq, - bool& requiresDedicatedAllocation, - bool& prefersDedicatedAllocation) const + VkImage hImage, + VkMemoryRequirements& memReq, + bool& requiresDedicatedAllocation, + bool& prefersDedicatedAllocation) const { #if VMA_DEDICATED_ALLOCATION || VMA_VULKAN_VERSION >= 1001000 - if(m_UseKhrDedicatedAllocation || m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0)) - { - VkImageMemoryRequirementsInfo2KHR memReqInfo = { VK_STRUCTURE_TYPE_IMAGE_MEMORY_REQUIREMENTS_INFO_2_KHR }; - memReqInfo.image = hImage; + if (m_UseKhrDedicatedAllocation || m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0)) + { + VkImageMemoryRequirementsInfo2KHR memReqInfo = { VK_STRUCTURE_TYPE_IMAGE_MEMORY_REQUIREMENTS_INFO_2_KHR }; + memReqInfo.image = hImage; - VkMemoryDedicatedRequirementsKHR memDedicatedReq = { VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS_KHR }; + VkMemoryDedicatedRequirementsKHR memDedicatedReq = { VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS_KHR }; - VkMemoryRequirements2KHR memReq2 = { VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2_KHR }; - VmaPnextChainPushFront(&memReq2, &memDedicatedReq); + VkMemoryRequirements2KHR memReq2 = { VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2_KHR }; + VmaPnextChainPushFront(&memReq2, &memDedicatedReq); - (*m_VulkanFunctions.vkGetImageMemoryRequirements2KHR)(m_hDevice, &memReqInfo, &memReq2); + (*m_VulkanFunctions.vkGetImageMemoryRequirements2KHR)(m_hDevice, &memReqInfo, &memReq2); - memReq = memReq2.memoryRequirements; - requiresDedicatedAllocation = (memDedicatedReq.requiresDedicatedAllocation != VK_FALSE); - prefersDedicatedAllocation = (memDedicatedReq.prefersDedicatedAllocation != VK_FALSE); - } - else + memReq = memReq2.memoryRequirements; + requiresDedicatedAllocation = (memDedicatedReq.requiresDedicatedAllocation != VK_FALSE); + prefersDedicatedAllocation = (memDedicatedReq.prefersDedicatedAllocation != VK_FALSE); + } else #endif // #if VMA_DEDICATED_ALLOCATION || VMA_VULKAN_VERSION >= 1001000 - { - (*m_VulkanFunctions.vkGetImageMemoryRequirements)(m_hDevice, hImage, &memReq); - requiresDedicatedAllocation = false; - prefersDedicatedAllocation = false; - } + { + (*m_VulkanFunctions.vkGetImageMemoryRequirements)(m_hDevice, hImage, &memReq); + requiresDedicatedAllocation = false; + prefersDedicatedAllocation = false; + } } VkResult VmaAllocator_T::FindMemoryTypeIndex( - uint32_t memoryTypeBits, - const VmaAllocationCreateInfo* pAllocationCreateInfo, - VkFlags bufImgUsage, - uint32_t* pMemoryTypeIndex) const + uint32_t memoryTypeBits, + const VmaAllocationCreateInfo* pAllocationCreateInfo, + VmaBufferImageUsage bufImgUsage, + uint32_t* pMemoryTypeIndex) const { - memoryTypeBits &= GetGlobalMemoryTypeBits(); + memoryTypeBits &= GetGlobalMemoryTypeBits(); - if(pAllocationCreateInfo->memoryTypeBits != 0) - { - memoryTypeBits &= pAllocationCreateInfo->memoryTypeBits; - } + if (pAllocationCreateInfo->memoryTypeBits != 0) + { + memoryTypeBits &= pAllocationCreateInfo->memoryTypeBits; + } - VkMemoryPropertyFlags requiredFlags = 0, preferredFlags = 0, notPreferredFlags = 0; - if(!FindMemoryPreferences( - IsIntegratedGpu(), - *pAllocationCreateInfo, - bufImgUsage, - requiredFlags, preferredFlags, notPreferredFlags)) - { - return VK_ERROR_FEATURE_NOT_PRESENT; - } + VkMemoryPropertyFlags requiredFlags = 0, preferredFlags = 0, notPreferredFlags = 0; + if (!FindMemoryPreferences( + IsIntegratedGpu(), + *pAllocationCreateInfo, + bufImgUsage, + requiredFlags, preferredFlags, notPreferredFlags)) + { + return VK_ERROR_FEATURE_NOT_PRESENT; + } - *pMemoryTypeIndex = UINT32_MAX; - uint32_t minCost = UINT32_MAX; - for(uint32_t memTypeIndex = 0, memTypeBit = 1; - memTypeIndex < GetMemoryTypeCount(); - ++memTypeIndex, memTypeBit <<= 1) - { - // This memory type is acceptable according to memoryTypeBits bitmask. - if((memTypeBit & memoryTypeBits) != 0) - { - const VkMemoryPropertyFlags currFlags = - m_MemProps.memoryTypes[memTypeIndex].propertyFlags; - // This memory type contains requiredFlags. - if((requiredFlags & ~currFlags) == 0) - { - // Calculate cost as number of bits from preferredFlags not present in this memory type. - uint32_t currCost = VMA_COUNT_BITS_SET(preferredFlags & ~currFlags) + - VMA_COUNT_BITS_SET(currFlags & notPreferredFlags); - // Remember memory type with lowest cost. - if(currCost < minCost) - { - *pMemoryTypeIndex = memTypeIndex; - if(currCost == 0) - { - return VK_SUCCESS; - } - minCost = currCost; - } - } - } - } - return (*pMemoryTypeIndex != UINT32_MAX) ? VK_SUCCESS : VK_ERROR_FEATURE_NOT_PRESENT; + *pMemoryTypeIndex = UINT32_MAX; + uint32_t minCost = UINT32_MAX; + for (uint32_t memTypeIndex = 0, memTypeBit = 1; + memTypeIndex < GetMemoryTypeCount(); + ++memTypeIndex, memTypeBit <<= 1) + { + // This memory type is acceptable according to memoryTypeBits bitmask. + if ((memTypeBit & memoryTypeBits) != 0) + { + const VkMemoryPropertyFlags currFlags = + m_MemProps.memoryTypes[memTypeIndex].propertyFlags; + // This memory type contains requiredFlags. + if ((requiredFlags & ~currFlags) == 0) + { + // Calculate cost as number of bits from preferredFlags not present in this memory type. + uint32_t currCost = VMA_COUNT_BITS_SET(preferredFlags & ~currFlags) + + VMA_COUNT_BITS_SET(currFlags & notPreferredFlags); + // Remember memory type with lowest cost. + if (currCost < minCost) + { + *pMemoryTypeIndex = memTypeIndex; + if (currCost == 0) + { + return VK_SUCCESS; + } + minCost = currCost; + } + } + } + } + return (*pMemoryTypeIndex != UINT32_MAX) ? VK_SUCCESS : VK_ERROR_FEATURE_NOT_PRESENT; } VkResult VmaAllocator_T::CalcMemTypeParams( - VmaAllocationCreateInfo& inoutCreateInfo, - uint32_t memTypeIndex, - VkDeviceSize size, - size_t allocationCount) + VmaAllocationCreateInfo& inoutCreateInfo, + uint32_t memTypeIndex, + VkDeviceSize size, + size_t allocationCount) { - // If memory type is not HOST_VISIBLE, disable MAPPED. - if((inoutCreateInfo.flags & VMA_ALLOCATION_CREATE_MAPPED_BIT) != 0 && - (m_MemProps.memoryTypes[memTypeIndex].propertyFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) == 0) - { - inoutCreateInfo.flags &= ~VMA_ALLOCATION_CREATE_MAPPED_BIT; - } + // If memory type is not HOST_VISIBLE, disable MAPPED. + if ((inoutCreateInfo.flags & VMA_ALLOCATION_CREATE_MAPPED_BIT) != 0 && + (m_MemProps.memoryTypes[memTypeIndex].propertyFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) == 0) + { + inoutCreateInfo.flags &= ~VMA_ALLOCATION_CREATE_MAPPED_BIT; + } - if((inoutCreateInfo.flags & VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT) != 0 && - (inoutCreateInfo.flags & VMA_ALLOCATION_CREATE_WITHIN_BUDGET_BIT) != 0) - { - const uint32_t heapIndex = MemoryTypeIndexToHeapIndex(memTypeIndex); - VmaBudget heapBudget = {}; - GetHeapBudgets(&heapBudget, heapIndex, 1); - if(heapBudget.usage + size * allocationCount > heapBudget.budget) - { - return VK_ERROR_OUT_OF_DEVICE_MEMORY; - } - } - return VK_SUCCESS; + if ((inoutCreateInfo.flags & VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT) != 0 && + (inoutCreateInfo.flags & VMA_ALLOCATION_CREATE_WITHIN_BUDGET_BIT) != 0) + { + const uint32_t heapIndex = MemoryTypeIndexToHeapIndex(memTypeIndex); + VmaBudget heapBudget = {}; + GetHeapBudgets(&heapBudget, heapIndex, 1); + if (heapBudget.usage + size * allocationCount > heapBudget.budget) + { + return VK_ERROR_OUT_OF_DEVICE_MEMORY; + } + } + return VK_SUCCESS; } VkResult VmaAllocator_T::CalcAllocationParams( - VmaAllocationCreateInfo& inoutCreateInfo, - bool dedicatedRequired, - bool dedicatedPreferred) + VmaAllocationCreateInfo& inoutCreateInfo, + bool dedicatedRequired, + bool dedicatedPreferred) { - VMA_ASSERT((inoutCreateInfo.flags & - (VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT | VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT)) != - (VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT | VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT) && - "Specifying both flags VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT and VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT is incorrect."); - VMA_ASSERT((((inoutCreateInfo.flags & VMA_ALLOCATION_CREATE_HOST_ACCESS_ALLOW_TRANSFER_INSTEAD_BIT) == 0 || - (inoutCreateInfo.flags & (VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT | VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT)) != 0)) && - "Specifying VMA_ALLOCATION_CREATE_HOST_ACCESS_ALLOW_TRANSFER_INSTEAD_BIT requires also VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT or VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT."); - if(inoutCreateInfo.usage == VMA_MEMORY_USAGE_AUTO || inoutCreateInfo.usage == VMA_MEMORY_USAGE_AUTO_PREFER_DEVICE || inoutCreateInfo.usage == VMA_MEMORY_USAGE_AUTO_PREFER_HOST) - { - if((inoutCreateInfo.flags & VMA_ALLOCATION_CREATE_MAPPED_BIT) != 0) - { - VMA_ASSERT((inoutCreateInfo.flags & (VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT | VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT)) != 0 && - "When using VMA_ALLOCATION_CREATE_MAPPED_BIT and usage = VMA_MEMORY_USAGE_AUTO*, you must also specify VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT or VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT."); - } - } + VMA_ASSERT((inoutCreateInfo.flags & + (VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT | VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT)) != + (VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT | VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT) && + "Specifying both flags VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT and VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT is incorrect."); + VMA_ASSERT((((inoutCreateInfo.flags & VMA_ALLOCATION_CREATE_HOST_ACCESS_ALLOW_TRANSFER_INSTEAD_BIT) == 0 || + (inoutCreateInfo.flags & (VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT | VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT)) != 0)) && + "Specifying VMA_ALLOCATION_CREATE_HOST_ACCESS_ALLOW_TRANSFER_INSTEAD_BIT requires also VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT or VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT."); + if (inoutCreateInfo.usage == VMA_MEMORY_USAGE_AUTO || inoutCreateInfo.usage == VMA_MEMORY_USAGE_AUTO_PREFER_DEVICE || inoutCreateInfo.usage == VMA_MEMORY_USAGE_AUTO_PREFER_HOST) + { + if ((inoutCreateInfo.flags & VMA_ALLOCATION_CREATE_MAPPED_BIT) != 0) + { + VMA_ASSERT((inoutCreateInfo.flags & (VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT | VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT)) != 0 && + "When using VMA_ALLOCATION_CREATE_MAPPED_BIT and usage = VMA_MEMORY_USAGE_AUTO*, you must also specify VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT or VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT."); + } + } - // If memory is lazily allocated, it should be always dedicated. - if(dedicatedRequired || - inoutCreateInfo.usage == VMA_MEMORY_USAGE_GPU_LAZILY_ALLOCATED) - { - inoutCreateInfo.flags |= VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT; - } + // If memory is lazily allocated, it should be always dedicated. + if (dedicatedRequired || + inoutCreateInfo.usage == VMA_MEMORY_USAGE_GPU_LAZILY_ALLOCATED) + { + inoutCreateInfo.flags |= VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT; + } - if(inoutCreateInfo.pool != VK_NULL_HANDLE) - { - if(inoutCreateInfo.pool->m_BlockVector.HasExplicitBlockSize() && - (inoutCreateInfo.flags & VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT) != 0) - { - VMA_ASSERT(0 && "Specifying VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT while current custom pool doesn't support dedicated allocations."); - return VK_ERROR_FEATURE_NOT_PRESENT; - } - inoutCreateInfo.priority = inoutCreateInfo.pool->m_BlockVector.GetPriority(); - } + if (inoutCreateInfo.pool != VK_NULL_HANDLE) + { + if (inoutCreateInfo.pool->m_BlockVector.HasExplicitBlockSize() && + (inoutCreateInfo.flags & VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT) != 0) + { + VMA_ASSERT(0 && "Specifying VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT while current custom pool doesn't support dedicated allocations."); + return VK_ERROR_FEATURE_NOT_PRESENT; + } + inoutCreateInfo.priority = inoutCreateInfo.pool->m_BlockVector.GetPriority(); + } - if((inoutCreateInfo.flags & VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT) != 0 && - (inoutCreateInfo.flags & VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT) != 0) - { - VMA_ASSERT(0 && "Specifying VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT together with VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT makes no sense."); - return VK_ERROR_FEATURE_NOT_PRESENT; - } + if ((inoutCreateInfo.flags & VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT) != 0 && + (inoutCreateInfo.flags & VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT) != 0) + { + VMA_ASSERT(0 && "Specifying VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT together with VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT makes no sense."); + return VK_ERROR_FEATURE_NOT_PRESENT; + } - if(VMA_DEBUG_ALWAYS_DEDICATED_MEMORY && - (inoutCreateInfo.flags & VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT) != 0) - { - inoutCreateInfo.flags |= VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT; - } + if (VMA_DEBUG_ALWAYS_DEDICATED_MEMORY && + (inoutCreateInfo.flags & VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT) != 0) + { + inoutCreateInfo.flags |= VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT; + } - // Non-auto USAGE values imply HOST_ACCESS flags. - // And so does VMA_MEMORY_USAGE_UNKNOWN because it is used with custom pools. - // Which specific flag is used doesn't matter. They change things only when used with VMA_MEMORY_USAGE_AUTO*. - // Otherwise they just protect from assert on mapping. - if(inoutCreateInfo.usage != VMA_MEMORY_USAGE_AUTO && - inoutCreateInfo.usage != VMA_MEMORY_USAGE_AUTO_PREFER_DEVICE && - inoutCreateInfo.usage != VMA_MEMORY_USAGE_AUTO_PREFER_HOST) - { - if((inoutCreateInfo.flags & (VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT | VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT)) == 0) - { - inoutCreateInfo.flags |= VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT; - } - } + // Non-auto USAGE values imply HOST_ACCESS flags. + // And so does VMA_MEMORY_USAGE_UNKNOWN because it is used with custom pools. + // Which specific flag is used doesn't matter. They change things only when used with VMA_MEMORY_USAGE_AUTO*. + // Otherwise they just protect from assert on mapping. + if (inoutCreateInfo.usage != VMA_MEMORY_USAGE_AUTO && + inoutCreateInfo.usage != VMA_MEMORY_USAGE_AUTO_PREFER_DEVICE && + inoutCreateInfo.usage != VMA_MEMORY_USAGE_AUTO_PREFER_HOST) + { + if ((inoutCreateInfo.flags & (VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT | VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT)) == 0) + { + inoutCreateInfo.flags |= VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT; + } + } - return VK_SUCCESS; + return VK_SUCCESS; } VkResult VmaAllocator_T::AllocateMemory( - const VkMemoryRequirements& vkMemReq, - bool requiresDedicatedAllocation, - bool prefersDedicatedAllocation, - VkBuffer dedicatedBuffer, - VkImage dedicatedImage, - VkFlags dedicatedBufferImageUsage, - const VmaAllocationCreateInfo& createInfo, - VmaSuballocationType suballocType, - size_t allocationCount, - VmaAllocation* pAllocations) + const VkMemoryRequirements& vkMemReq, + bool requiresDedicatedAllocation, + bool prefersDedicatedAllocation, + VkBuffer dedicatedBuffer, + VkImage dedicatedImage, + VmaBufferImageUsage dedicatedBufferImageUsage, + const VmaAllocationCreateInfo& createInfo, + VmaSuballocationType suballocType, + size_t allocationCount, + VmaAllocation* pAllocations) { - memset(pAllocations, 0, sizeof(VmaAllocation) * allocationCount); + memset(pAllocations, 0, sizeof(VmaAllocation) * allocationCount); - VMA_ASSERT(VmaIsPow2(vkMemReq.alignment)); + VMA_ASSERT(VmaIsPow2(vkMemReq.alignment)); - if(vkMemReq.size == 0) - { - return VK_ERROR_INITIALIZATION_FAILED; - } + if (vkMemReq.size == 0) + { + return VK_ERROR_INITIALIZATION_FAILED; + } - VmaAllocationCreateInfo createInfoFinal = createInfo; - VkResult res = CalcAllocationParams(createInfoFinal, requiresDedicatedAllocation, prefersDedicatedAllocation); - if(res != VK_SUCCESS) - return res; + VmaAllocationCreateInfo createInfoFinal = createInfo; + VkResult res = CalcAllocationParams(createInfoFinal, requiresDedicatedAllocation, prefersDedicatedAllocation); + if (res != VK_SUCCESS) + return res; - if(createInfoFinal.pool != VK_NULL_HANDLE) - { - VmaBlockVector& blockVector = createInfoFinal.pool->m_BlockVector; - return AllocateMemoryOfType( - createInfoFinal.pool, - vkMemReq.size, - vkMemReq.alignment, - prefersDedicatedAllocation, - dedicatedBuffer, - dedicatedImage, - dedicatedBufferImageUsage, - createInfoFinal, - blockVector.GetMemoryTypeIndex(), - suballocType, - createInfoFinal.pool->m_DedicatedAllocations, - blockVector, - allocationCount, - pAllocations); - } - else - { - // Bit mask of memory Vulkan types acceptable for this allocation. - uint32_t memoryTypeBits = vkMemReq.memoryTypeBits; - uint32_t memTypeIndex = UINT32_MAX; - res = FindMemoryTypeIndex(memoryTypeBits, &createInfoFinal, dedicatedBufferImageUsage, &memTypeIndex); - // Can't find any single memory type matching requirements. res is VK_ERROR_FEATURE_NOT_PRESENT. - if(res != VK_SUCCESS) - return res; - do - { - VmaBlockVector* blockVector = m_pBlockVectors[memTypeIndex]; - VMA_ASSERT(blockVector && "Trying to use unsupported memory type!"); - res = AllocateMemoryOfType( - VK_NULL_HANDLE, - vkMemReq.size, - vkMemReq.alignment, - requiresDedicatedAllocation || prefersDedicatedAllocation, - dedicatedBuffer, - dedicatedImage, - dedicatedBufferImageUsage, - createInfoFinal, - memTypeIndex, - suballocType, - m_DedicatedAllocations[memTypeIndex], - *blockVector, - allocationCount, - pAllocations); - // Allocation succeeded - if(res == VK_SUCCESS) - return VK_SUCCESS; + if (createInfoFinal.pool != VK_NULL_HANDLE) + { + VmaBlockVector& blockVector = createInfoFinal.pool->m_BlockVector; + return AllocateMemoryOfType( + createInfoFinal.pool, + vkMemReq.size, + vkMemReq.alignment, + prefersDedicatedAllocation, + dedicatedBuffer, + dedicatedImage, + dedicatedBufferImageUsage, + createInfoFinal, + blockVector.GetMemoryTypeIndex(), + suballocType, + createInfoFinal.pool->m_DedicatedAllocations, + blockVector, + allocationCount, + pAllocations); + } else + { + // Bit mask of memory Vulkan types acceptable for this allocation. + uint32_t memoryTypeBits = vkMemReq.memoryTypeBits; + uint32_t memTypeIndex = UINT32_MAX; + res = FindMemoryTypeIndex(memoryTypeBits, &createInfoFinal, dedicatedBufferImageUsage, &memTypeIndex); + // Can't find any single memory type matching requirements. res is VK_ERROR_FEATURE_NOT_PRESENT. + if (res != VK_SUCCESS) + return res; + do + { + VmaBlockVector* blockVector = m_pBlockVectors[memTypeIndex]; + VMA_ASSERT(blockVector && "Trying to use unsupported memory type!"); + res = AllocateMemoryOfType( + VK_NULL_HANDLE, + vkMemReq.size, + vkMemReq.alignment, + requiresDedicatedAllocation || prefersDedicatedAllocation, + dedicatedBuffer, + dedicatedImage, + dedicatedBufferImageUsage, + createInfoFinal, + memTypeIndex, + suballocType, + m_DedicatedAllocations[memTypeIndex], + *blockVector, + allocationCount, + pAllocations); + // Allocation succeeded + if (res == VK_SUCCESS) + return VK_SUCCESS; - // Remove old memTypeIndex from list of possibilities. - memoryTypeBits &= ~(1u << memTypeIndex); - // Find alternative memTypeIndex. - res = FindMemoryTypeIndex(memoryTypeBits, &createInfoFinal, dedicatedBufferImageUsage, &memTypeIndex); - } while(res == VK_SUCCESS); + // Remove old memTypeIndex from list of possibilities. + memoryTypeBits &= ~(1u << memTypeIndex); + // Find alternative memTypeIndex. + res = FindMemoryTypeIndex(memoryTypeBits, &createInfoFinal, dedicatedBufferImageUsage, &memTypeIndex); + } while (res == VK_SUCCESS); - // No other matching memory type index could be found. - // Not returning res, which is VK_ERROR_FEATURE_NOT_PRESENT, because we already failed to allocate once. - return VK_ERROR_OUT_OF_DEVICE_MEMORY; - } + // No other matching memory type index could be found. + // Not returning res, which is VK_ERROR_FEATURE_NOT_PRESENT, because we already failed to allocate once. + return VK_ERROR_OUT_OF_DEVICE_MEMORY; + } } void VmaAllocator_T::FreeMemory( - size_t allocationCount, - const VmaAllocation* pAllocations) + size_t allocationCount, + const VmaAllocation* pAllocations) { - VMA_ASSERT(pAllocations); + VMA_ASSERT(pAllocations); - for(size_t allocIndex = allocationCount; allocIndex--; ) - { - VmaAllocation allocation = pAllocations[allocIndex]; + for (size_t allocIndex = allocationCount; allocIndex--; ) + { + VmaAllocation allocation = pAllocations[allocIndex]; - if(allocation != VK_NULL_HANDLE) - { - if(VMA_DEBUG_INITIALIZE_ALLOCATIONS) - { - FillAllocation(allocation, VMA_ALLOCATION_FILL_PATTERN_DESTROYED); - } + if (allocation != VK_NULL_HANDLE) + { + if (VMA_DEBUG_INITIALIZE_ALLOCATIONS) + { + FillAllocation(allocation, VMA_ALLOCATION_FILL_PATTERN_DESTROYED); + } - allocation->FreeName(this); + allocation->FreeName(this); - switch(allocation->GetType()) - { - case VmaAllocation_T::ALLOCATION_TYPE_BLOCK: - { - VmaBlockVector* pBlockVector = VMA_NULL; - VmaPool hPool = allocation->GetParentPool(); - if(hPool != VK_NULL_HANDLE) - { - pBlockVector = &hPool->m_BlockVector; - } - else - { - const uint32_t memTypeIndex = allocation->GetMemoryTypeIndex(); - pBlockVector = m_pBlockVectors[memTypeIndex]; - VMA_ASSERT(pBlockVector && "Trying to free memory of unsupported type!"); - } - pBlockVector->Free(allocation); - } - break; - case VmaAllocation_T::ALLOCATION_TYPE_DEDICATED: - FreeDedicatedMemory(allocation); - break; - default: - VMA_ASSERT(0); - } - } - } + switch (allocation->GetType()) + { + case VmaAllocation_T::ALLOCATION_TYPE_BLOCK: + { + VmaBlockVector* pBlockVector = VMA_NULL; + VmaPool hPool = allocation->GetParentPool(); + if (hPool != VK_NULL_HANDLE) + { + pBlockVector = &hPool->m_BlockVector; + } else + { + const uint32_t memTypeIndex = allocation->GetMemoryTypeIndex(); + pBlockVector = m_pBlockVectors[memTypeIndex]; + VMA_ASSERT(pBlockVector && "Trying to free memory of unsupported type!"); + } + pBlockVector->Free(allocation); + } + break; + case VmaAllocation_T::ALLOCATION_TYPE_DEDICATED: + FreeDedicatedMemory(allocation); + break; + default: + VMA_ASSERT(0); + } + } + } } void VmaAllocator_T::CalculateStatistics(VmaTotalStatistics* pStats) { - // Initialize. - VmaClearDetailedStatistics(pStats->total); - for(uint32_t i = 0; i < VK_MAX_MEMORY_TYPES; ++i) - VmaClearDetailedStatistics(pStats->memoryType[i]); - for(uint32_t i = 0; i < VK_MAX_MEMORY_HEAPS; ++i) - VmaClearDetailedStatistics(pStats->memoryHeap[i]); + // Initialize. + VmaClearDetailedStatistics(pStats->total); + for (uint32_t i = 0; i < VK_MAX_MEMORY_TYPES; ++i) + VmaClearDetailedStatistics(pStats->memoryType[i]); + for (uint32_t i = 0; i < VK_MAX_MEMORY_HEAPS; ++i) + VmaClearDetailedStatistics(pStats->memoryHeap[i]); - // Process default pools. - for(uint32_t memTypeIndex = 0; memTypeIndex < GetMemoryTypeCount(); ++memTypeIndex) - { - VmaBlockVector* const pBlockVector = m_pBlockVectors[memTypeIndex]; - if (pBlockVector != VMA_NULL) - pBlockVector->AddDetailedStatistics(pStats->memoryType[memTypeIndex]); - } + // Process default pools. + for (uint32_t memTypeIndex = 0; memTypeIndex < GetMemoryTypeCount(); ++memTypeIndex) + { + VmaBlockVector* const pBlockVector = m_pBlockVectors[memTypeIndex]; + if (pBlockVector != VMA_NULL) + pBlockVector->AddDetailedStatistics(pStats->memoryType[memTypeIndex]); + } - // Process custom pools. - { - VmaMutexLockRead lock(m_PoolsMutex, m_UseMutex); - for(VmaPool pool = m_Pools.Front(); pool != VMA_NULL; pool = m_Pools.GetNext(pool)) - { - VmaBlockVector& blockVector = pool->m_BlockVector; - const uint32_t memTypeIndex = blockVector.GetMemoryTypeIndex(); - blockVector.AddDetailedStatistics(pStats->memoryType[memTypeIndex]); - pool->m_DedicatedAllocations.AddDetailedStatistics(pStats->memoryType[memTypeIndex]); - } - } + // Process custom pools. + { + VmaMutexLockRead lock(m_PoolsMutex, m_UseMutex); + for (VmaPool pool = m_Pools.Front(); pool != VMA_NULL; pool = m_Pools.GetNext(pool)) + { + VmaBlockVector& blockVector = pool->m_BlockVector; + const uint32_t memTypeIndex = blockVector.GetMemoryTypeIndex(); + blockVector.AddDetailedStatistics(pStats->memoryType[memTypeIndex]); + pool->m_DedicatedAllocations.AddDetailedStatistics(pStats->memoryType[memTypeIndex]); + } + } - // Process dedicated allocations. - for(uint32_t memTypeIndex = 0; memTypeIndex < GetMemoryTypeCount(); ++memTypeIndex) - { - m_DedicatedAllocations[memTypeIndex].AddDetailedStatistics(pStats->memoryType[memTypeIndex]); - } + // Process dedicated allocations. + for (uint32_t memTypeIndex = 0; memTypeIndex < GetMemoryTypeCount(); ++memTypeIndex) + { + m_DedicatedAllocations[memTypeIndex].AddDetailedStatistics(pStats->memoryType[memTypeIndex]); + } - // Sum from memory types to memory heaps. - for(uint32_t memTypeIndex = 0; memTypeIndex < GetMemoryTypeCount(); ++memTypeIndex) - { - const uint32_t memHeapIndex = m_MemProps.memoryTypes[memTypeIndex].heapIndex; - VmaAddDetailedStatistics(pStats->memoryHeap[memHeapIndex], pStats->memoryType[memTypeIndex]); - } + // Sum from memory types to memory heaps. + for (uint32_t memTypeIndex = 0; memTypeIndex < GetMemoryTypeCount(); ++memTypeIndex) + { + const uint32_t memHeapIndex = m_MemProps.memoryTypes[memTypeIndex].heapIndex; + VmaAddDetailedStatistics(pStats->memoryHeap[memHeapIndex], pStats->memoryType[memTypeIndex]); + } - // Sum from memory heaps to total. - for(uint32_t memHeapIndex = 0; memHeapIndex < GetMemoryHeapCount(); ++memHeapIndex) - VmaAddDetailedStatistics(pStats->total, pStats->memoryHeap[memHeapIndex]); + // Sum from memory heaps to total. + for (uint32_t memHeapIndex = 0; memHeapIndex < GetMemoryHeapCount(); ++memHeapIndex) + VmaAddDetailedStatistics(pStats->total, pStats->memoryHeap[memHeapIndex]); - VMA_ASSERT(pStats->total.statistics.allocationCount == 0 || - pStats->total.allocationSizeMax >= pStats->total.allocationSizeMin); - VMA_ASSERT(pStats->total.unusedRangeCount == 0 || - pStats->total.unusedRangeSizeMax >= pStats->total.unusedRangeSizeMin); + VMA_ASSERT(pStats->total.statistics.allocationCount == 0 || + pStats->total.allocationSizeMax >= pStats->total.allocationSizeMin); + VMA_ASSERT(pStats->total.unusedRangeCount == 0 || + pStats->total.unusedRangeSizeMax >= pStats->total.unusedRangeSizeMin); } void VmaAllocator_T::GetHeapBudgets(VmaBudget* outBudgets, uint32_t firstHeap, uint32_t heapCount) { #if VMA_MEMORY_BUDGET - if(m_UseExtMemoryBudget) - { - if(m_Budget.m_OperationsSinceBudgetFetch < 30) - { - VmaMutexLockRead lockRead(m_Budget.m_BudgetMutex, m_UseMutex); - for(uint32_t i = 0; i < heapCount; ++i, ++outBudgets) - { - const uint32_t heapIndex = firstHeap + i; + if (m_UseExtMemoryBudget) + { + if (m_Budget.m_OperationsSinceBudgetFetch < 30) + { + VmaMutexLockRead lockRead(m_Budget.m_BudgetMutex, m_UseMutex); + for (uint32_t i = 0; i < heapCount; ++i, ++outBudgets) + { + const uint32_t heapIndex = firstHeap + i; - outBudgets->statistics.blockCount = m_Budget.m_BlockCount[heapIndex]; - outBudgets->statistics.allocationCount = m_Budget.m_AllocationCount[heapIndex]; - outBudgets->statistics.blockBytes = m_Budget.m_BlockBytes[heapIndex]; - outBudgets->statistics.allocationBytes = m_Budget.m_AllocationBytes[heapIndex]; + outBudgets->statistics.blockCount = m_Budget.m_BlockCount[heapIndex]; + outBudgets->statistics.allocationCount = m_Budget.m_AllocationCount[heapIndex]; + outBudgets->statistics.blockBytes = m_Budget.m_BlockBytes[heapIndex]; + outBudgets->statistics.allocationBytes = m_Budget.m_AllocationBytes[heapIndex]; - if(m_Budget.m_VulkanUsage[heapIndex] + outBudgets->statistics.blockBytes > m_Budget.m_BlockBytesAtBudgetFetch[heapIndex]) - { - outBudgets->usage = m_Budget.m_VulkanUsage[heapIndex] + - outBudgets->statistics.blockBytes - m_Budget.m_BlockBytesAtBudgetFetch[heapIndex]; - } - else - { - outBudgets->usage = 0; - } + if (m_Budget.m_VulkanUsage[heapIndex] + outBudgets->statistics.blockBytes > m_Budget.m_BlockBytesAtBudgetFetch[heapIndex]) + { + outBudgets->usage = m_Budget.m_VulkanUsage[heapIndex] + + outBudgets->statistics.blockBytes - m_Budget.m_BlockBytesAtBudgetFetch[heapIndex]; + } else + { + outBudgets->usage = 0; + } - // Have to take MIN with heap size because explicit HeapSizeLimit is included in it. - outBudgets->budget = VMA_MIN( - m_Budget.m_VulkanBudget[heapIndex], m_MemProps.memoryHeaps[heapIndex].size); - } - } - else - { - UpdateVulkanBudget(); // Outside of mutex lock - GetHeapBudgets(outBudgets, firstHeap, heapCount); // Recursion - } - } - else + // Have to take MIN with heap size because explicit HeapSizeLimit is included in it. + outBudgets->budget = VMA_MIN( + m_Budget.m_VulkanBudget[heapIndex], m_MemProps.memoryHeaps[heapIndex].size); + } + } else + { + UpdateVulkanBudget(); // Outside of mutex lock + GetHeapBudgets(outBudgets, firstHeap, heapCount); // Recursion + } + } else #endif - { - for(uint32_t i = 0; i < heapCount; ++i, ++outBudgets) - { - const uint32_t heapIndex = firstHeap + i; + { + for (uint32_t i = 0; i < heapCount; ++i, ++outBudgets) + { + const uint32_t heapIndex = firstHeap + i; - outBudgets->statistics.blockCount = m_Budget.m_BlockCount[heapIndex]; - outBudgets->statistics.allocationCount = m_Budget.m_AllocationCount[heapIndex]; - outBudgets->statistics.blockBytes = m_Budget.m_BlockBytes[heapIndex]; - outBudgets->statistics.allocationBytes = m_Budget.m_AllocationBytes[heapIndex]; + outBudgets->statistics.blockCount = m_Budget.m_BlockCount[heapIndex]; + outBudgets->statistics.allocationCount = m_Budget.m_AllocationCount[heapIndex]; + outBudgets->statistics.blockBytes = m_Budget.m_BlockBytes[heapIndex]; + outBudgets->statistics.allocationBytes = m_Budget.m_AllocationBytes[heapIndex]; - outBudgets->usage = outBudgets->statistics.blockBytes; - outBudgets->budget = m_MemProps.memoryHeaps[heapIndex].size * 8 / 10; // 80% heuristics. - } - } + outBudgets->usage = outBudgets->statistics.blockBytes; + outBudgets->budget = m_MemProps.memoryHeaps[heapIndex].size * 8 / 10; // 80% heuristics. + } + } } void VmaAllocator_T::GetAllocationInfo(VmaAllocation hAllocation, VmaAllocationInfo* pAllocationInfo) { - pAllocationInfo->memoryType = hAllocation->GetMemoryTypeIndex(); - pAllocationInfo->deviceMemory = hAllocation->GetMemory(); - pAllocationInfo->offset = hAllocation->GetOffset(); - pAllocationInfo->size = hAllocation->GetSize(); - pAllocationInfo->pMappedData = hAllocation->GetMappedData(); - pAllocationInfo->pUserData = hAllocation->GetUserData(); - pAllocationInfo->pName = hAllocation->GetName(); + pAllocationInfo->memoryType = hAllocation->GetMemoryTypeIndex(); + pAllocationInfo->deviceMemory = hAllocation->GetMemory(); + pAllocationInfo->offset = hAllocation->GetOffset(); + pAllocationInfo->size = hAllocation->GetSize(); + pAllocationInfo->pMappedData = hAllocation->GetMappedData(); + pAllocationInfo->pUserData = hAllocation->GetUserData(); + pAllocationInfo->pName = hAllocation->GetName(); +} + +void VmaAllocator_T::GetAllocationInfo2(VmaAllocation hAllocation, VmaAllocationInfo2* pAllocationInfo) +{ + GetAllocationInfo(hAllocation, &pAllocationInfo->allocationInfo); + + switch (hAllocation->GetType()) + { + case VmaAllocation_T::ALLOCATION_TYPE_BLOCK: + pAllocationInfo->blockSize = hAllocation->GetBlock()->m_pMetadata->GetSize(); + pAllocationInfo->dedicatedMemory = VK_FALSE; + break; + case VmaAllocation_T::ALLOCATION_TYPE_DEDICATED: + pAllocationInfo->blockSize = pAllocationInfo->allocationInfo.size; + pAllocationInfo->dedicatedMemory = VK_TRUE; + break; + default: + VMA_ASSERT(0); + } } VkResult VmaAllocator_T::CreatePool(const VmaPoolCreateInfo* pCreateInfo, VmaPool* pPool) { - VMA_DEBUG_LOG(" CreatePool: MemoryTypeIndex=%u, flags=%u", pCreateInfo->memoryTypeIndex, pCreateInfo->flags); + VMA_DEBUG_LOG_FORMAT(" CreatePool: MemoryTypeIndex=%" PRIu32 ", flags=%" PRIu32, pCreateInfo->memoryTypeIndex, pCreateInfo->flags); - VmaPoolCreateInfo newCreateInfo = *pCreateInfo; + VmaPoolCreateInfo newCreateInfo = *pCreateInfo; - // Protection against uninitialized new structure member. If garbage data are left there, this pointer dereference would crash. - if(pCreateInfo->pMemoryAllocateNext) - { - VMA_ASSERT(((const VkBaseInStructure*)pCreateInfo->pMemoryAllocateNext)->sType != 0); - } + // Protection against uninitialized new structure member. If garbage data are left there, this pointer dereference would crash. + if (pCreateInfo->pMemoryAllocateNext) + { + VMA_ASSERT(((const VkBaseInStructure*)pCreateInfo->pMemoryAllocateNext)->sType != 0); + } - if(newCreateInfo.maxBlockCount == 0) - { - newCreateInfo.maxBlockCount = SIZE_MAX; - } - if(newCreateInfo.minBlockCount > newCreateInfo.maxBlockCount) - { - return VK_ERROR_INITIALIZATION_FAILED; - } - // Memory type index out of range or forbidden. - if(pCreateInfo->memoryTypeIndex >= GetMemoryTypeCount() || - ((1u << pCreateInfo->memoryTypeIndex) & m_GlobalMemoryTypeBits) == 0) - { - return VK_ERROR_FEATURE_NOT_PRESENT; - } - if(newCreateInfo.minAllocationAlignment > 0) - { - VMA_ASSERT(VmaIsPow2(newCreateInfo.minAllocationAlignment)); - } + if (newCreateInfo.maxBlockCount == 0) + { + newCreateInfo.maxBlockCount = SIZE_MAX; + } + if (newCreateInfo.minBlockCount > newCreateInfo.maxBlockCount) + { + return VK_ERROR_INITIALIZATION_FAILED; + } + // Memory type index out of range or forbidden. + if (pCreateInfo->memoryTypeIndex >= GetMemoryTypeCount() || + ((1u << pCreateInfo->memoryTypeIndex) & m_GlobalMemoryTypeBits) == 0) + { + return VK_ERROR_FEATURE_NOT_PRESENT; + } + if (newCreateInfo.minAllocationAlignment > 0) + { + VMA_ASSERT(VmaIsPow2(newCreateInfo.minAllocationAlignment)); + } - const VkDeviceSize preferredBlockSize = CalcPreferredBlockSize(newCreateInfo.memoryTypeIndex); + const VkDeviceSize preferredBlockSize = CalcPreferredBlockSize(newCreateInfo.memoryTypeIndex); - *pPool = vma_new(this, VmaPool_T)(this, newCreateInfo, preferredBlockSize); + *pPool = vma_new(this, VmaPool_T)(this, newCreateInfo, preferredBlockSize); - VkResult res = (*pPool)->m_BlockVector.CreateMinBlocks(); - if(res != VK_SUCCESS) - { - vma_delete(this, *pPool); - *pPool = VMA_NULL; - return res; - } + VkResult res = (*pPool)->m_BlockVector.CreateMinBlocks(); + if (res != VK_SUCCESS) + { + vma_delete(this, *pPool); + *pPool = VMA_NULL; + return res; + } - // Add to m_Pools. - { - VmaMutexLockWrite lock(m_PoolsMutex, m_UseMutex); - (*pPool)->SetId(m_NextPoolId++); - m_Pools.PushBack(*pPool); - } + // Add to m_Pools. + { + VmaMutexLockWrite lock(m_PoolsMutex, m_UseMutex); + (*pPool)->SetId(m_NextPoolId++); + m_Pools.PushBack(*pPool); + } - return VK_SUCCESS; + return VK_SUCCESS; } void VmaAllocator_T::DestroyPool(VmaPool pool) { - // Remove from m_Pools. - { - VmaMutexLockWrite lock(m_PoolsMutex, m_UseMutex); - m_Pools.Remove(pool); - } + // Remove from m_Pools. + { + VmaMutexLockWrite lock(m_PoolsMutex, m_UseMutex); + m_Pools.Remove(pool); + } - vma_delete(this, pool); + vma_delete(this, pool); } void VmaAllocator_T::GetPoolStatistics(VmaPool pool, VmaStatistics* pPoolStats) { - VmaClearStatistics(*pPoolStats); - pool->m_BlockVector.AddStatistics(*pPoolStats); - pool->m_DedicatedAllocations.AddStatistics(*pPoolStats); + VmaClearStatistics(*pPoolStats); + pool->m_BlockVector.AddStatistics(*pPoolStats); + pool->m_DedicatedAllocations.AddStatistics(*pPoolStats); } void VmaAllocator_T::CalculatePoolStatistics(VmaPool pool, VmaDetailedStatistics* pPoolStats) { - VmaClearDetailedStatistics(*pPoolStats); - pool->m_BlockVector.AddDetailedStatistics(*pPoolStats); - pool->m_DedicatedAllocations.AddDetailedStatistics(*pPoolStats); + VmaClearDetailedStatistics(*pPoolStats); + pool->m_BlockVector.AddDetailedStatistics(*pPoolStats); + pool->m_DedicatedAllocations.AddDetailedStatistics(*pPoolStats); } void VmaAllocator_T::SetCurrentFrameIndex(uint32_t frameIndex) { - m_CurrentFrameIndex.store(frameIndex); + m_CurrentFrameIndex.store(frameIndex); #if VMA_MEMORY_BUDGET - if(m_UseExtMemoryBudget) - { - UpdateVulkanBudget(); - } + if (m_UseExtMemoryBudget) + { + UpdateVulkanBudget(); + } #endif // #if VMA_MEMORY_BUDGET } VkResult VmaAllocator_T::CheckPoolCorruption(VmaPool hPool) { - return hPool->m_BlockVector.CheckCorruption(); + return hPool->m_BlockVector.CheckCorruption(); } VkResult VmaAllocator_T::CheckCorruption(uint32_t memoryTypeBits) { - VkResult finalRes = VK_ERROR_FEATURE_NOT_PRESENT; + VkResult finalRes = VK_ERROR_FEATURE_NOT_PRESENT; - // Process default pools. - for(uint32_t memTypeIndex = 0; memTypeIndex < GetMemoryTypeCount(); ++memTypeIndex) - { - VmaBlockVector* const pBlockVector = m_pBlockVectors[memTypeIndex]; - if(pBlockVector != VMA_NULL) - { - VkResult localRes = pBlockVector->CheckCorruption(); - switch(localRes) - { - case VK_ERROR_FEATURE_NOT_PRESENT: - break; - case VK_SUCCESS: - finalRes = VK_SUCCESS; - break; - default: - return localRes; - } - } - } + // Process default pools. + for (uint32_t memTypeIndex = 0; memTypeIndex < GetMemoryTypeCount(); ++memTypeIndex) + { + VmaBlockVector* const pBlockVector = m_pBlockVectors[memTypeIndex]; + if (pBlockVector != VMA_NULL) + { + VkResult localRes = pBlockVector->CheckCorruption(); + switch (localRes) + { + case VK_ERROR_FEATURE_NOT_PRESENT: + break; + case VK_SUCCESS: + finalRes = VK_SUCCESS; + break; + default: + return localRes; + } + } + } - // Process custom pools. - { - VmaMutexLockRead lock(m_PoolsMutex, m_UseMutex); - for(VmaPool pool = m_Pools.Front(); pool != VMA_NULL; pool = m_Pools.GetNext(pool)) - { - if(((1u << pool->m_BlockVector.GetMemoryTypeIndex()) & memoryTypeBits) != 0) - { - VkResult localRes = pool->m_BlockVector.CheckCorruption(); - switch(localRes) - { - case VK_ERROR_FEATURE_NOT_PRESENT: - break; - case VK_SUCCESS: - finalRes = VK_SUCCESS; - break; - default: - return localRes; - } - } - } - } + // Process custom pools. + { + VmaMutexLockRead lock(m_PoolsMutex, m_UseMutex); + for (VmaPool pool = m_Pools.Front(); pool != VMA_NULL; pool = m_Pools.GetNext(pool)) + { + if (((1u << pool->m_BlockVector.GetMemoryTypeIndex()) & memoryTypeBits) != 0) + { + VkResult localRes = pool->m_BlockVector.CheckCorruption(); + switch (localRes) + { + case VK_ERROR_FEATURE_NOT_PRESENT: + break; + case VK_SUCCESS: + finalRes = VK_SUCCESS; + break; + default: + return localRes; + } + } + } + } - return finalRes; + return finalRes; } VkResult VmaAllocator_T::AllocateVulkanMemory(const VkMemoryAllocateInfo* pAllocateInfo, VkDeviceMemory* pMemory) { - AtomicTransactionalIncrement deviceMemoryCountIncrement; - const uint64_t prevDeviceMemoryCount = deviceMemoryCountIncrement.Increment(&m_DeviceMemoryCount); + AtomicTransactionalIncrement deviceMemoryCountIncrement; + const uint64_t prevDeviceMemoryCount = deviceMemoryCountIncrement.Increment(&m_DeviceMemoryCount); #if VMA_DEBUG_DONT_EXCEED_MAX_MEMORY_ALLOCATION_COUNT - if(prevDeviceMemoryCount >= m_PhysicalDeviceProperties.limits.maxMemoryAllocationCount) - { - return VK_ERROR_TOO_MANY_OBJECTS; - } + if (prevDeviceMemoryCount >= m_PhysicalDeviceProperties.limits.maxMemoryAllocationCount) + { + return VK_ERROR_TOO_MANY_OBJECTS; + } #endif - const uint32_t heapIndex = MemoryTypeIndexToHeapIndex(pAllocateInfo->memoryTypeIndex); + const uint32_t heapIndex = MemoryTypeIndexToHeapIndex(pAllocateInfo->memoryTypeIndex); - // HeapSizeLimit is in effect for this heap. - if((m_HeapSizeLimitMask & (1u << heapIndex)) != 0) - { - const VkDeviceSize heapSize = m_MemProps.memoryHeaps[heapIndex].size; - VkDeviceSize blockBytes = m_Budget.m_BlockBytes[heapIndex]; - for(;;) - { - const VkDeviceSize blockBytesAfterAllocation = blockBytes + pAllocateInfo->allocationSize; - if(blockBytesAfterAllocation > heapSize) - { - return VK_ERROR_OUT_OF_DEVICE_MEMORY; - } - if(m_Budget.m_BlockBytes[heapIndex].compare_exchange_strong(blockBytes, blockBytesAfterAllocation)) - { - break; - } - } - } - else - { - m_Budget.m_BlockBytes[heapIndex] += pAllocateInfo->allocationSize; - } - ++m_Budget.m_BlockCount[heapIndex]; + // HeapSizeLimit is in effect for this heap. + if ((m_HeapSizeLimitMask & (1u << heapIndex)) != 0) + { + const VkDeviceSize heapSize = m_MemProps.memoryHeaps[heapIndex].size; + VkDeviceSize blockBytes = m_Budget.m_BlockBytes[heapIndex]; + for (;;) + { + const VkDeviceSize blockBytesAfterAllocation = blockBytes + pAllocateInfo->allocationSize; + if (blockBytesAfterAllocation > heapSize) + { + return VK_ERROR_OUT_OF_DEVICE_MEMORY; + } + if (m_Budget.m_BlockBytes[heapIndex].compare_exchange_strong(blockBytes, blockBytesAfterAllocation)) + { + break; + } + } + } else + { + m_Budget.m_BlockBytes[heapIndex] += pAllocateInfo->allocationSize; + } + ++m_Budget.m_BlockCount[heapIndex]; - // VULKAN CALL vkAllocateMemory. - VkResult res = (*m_VulkanFunctions.vkAllocateMemory)(m_hDevice, pAllocateInfo, GetAllocationCallbacks(), pMemory); + // VULKAN CALL vkAllocateMemory. + VkResult res = (*m_VulkanFunctions.vkAllocateMemory)(m_hDevice, pAllocateInfo, GetAllocationCallbacks(), pMemory); - if(res == VK_SUCCESS) - { + if (res == VK_SUCCESS) + { #if VMA_MEMORY_BUDGET - ++m_Budget.m_OperationsSinceBudgetFetch; + ++m_Budget.m_OperationsSinceBudgetFetch; #endif - // Informative callback. - if(m_DeviceMemoryCallbacks.pfnAllocate != VMA_NULL) - { - (*m_DeviceMemoryCallbacks.pfnAllocate)(this, pAllocateInfo->memoryTypeIndex, *pMemory, pAllocateInfo->allocationSize, m_DeviceMemoryCallbacks.pUserData); - } + // Informative callback. + if (m_DeviceMemoryCallbacks.pfnAllocate != VMA_NULL) + { + (*m_DeviceMemoryCallbacks.pfnAllocate)(this, pAllocateInfo->memoryTypeIndex, *pMemory, pAllocateInfo->allocationSize, m_DeviceMemoryCallbacks.pUserData); + } - deviceMemoryCountIncrement.Commit(); - } - else - { - --m_Budget.m_BlockCount[heapIndex]; - m_Budget.m_BlockBytes[heapIndex] -= pAllocateInfo->allocationSize; - } + deviceMemoryCountIncrement.Commit(); + } else + { + --m_Budget.m_BlockCount[heapIndex]; + m_Budget.m_BlockBytes[heapIndex] -= pAllocateInfo->allocationSize; + } - return res; + return res; } void VmaAllocator_T::FreeVulkanMemory(uint32_t memoryType, VkDeviceSize size, VkDeviceMemory hMemory) { - // Informative callback. - if(m_DeviceMemoryCallbacks.pfnFree != VMA_NULL) - { - (*m_DeviceMemoryCallbacks.pfnFree)(this, memoryType, hMemory, size, m_DeviceMemoryCallbacks.pUserData); - } + // Informative callback. + if (m_DeviceMemoryCallbacks.pfnFree != VMA_NULL) + { + (*m_DeviceMemoryCallbacks.pfnFree)(this, memoryType, hMemory, size, m_DeviceMemoryCallbacks.pUserData); + } - // VULKAN CALL vkFreeMemory. - (*m_VulkanFunctions.vkFreeMemory)(m_hDevice, hMemory, GetAllocationCallbacks()); + // VULKAN CALL vkFreeMemory. + (*m_VulkanFunctions.vkFreeMemory)(m_hDevice, hMemory, GetAllocationCallbacks()); - const uint32_t heapIndex = MemoryTypeIndexToHeapIndex(memoryType); - --m_Budget.m_BlockCount[heapIndex]; - m_Budget.m_BlockBytes[heapIndex] -= size; + const uint32_t heapIndex = MemoryTypeIndexToHeapIndex(memoryType); + --m_Budget.m_BlockCount[heapIndex]; + m_Budget.m_BlockBytes[heapIndex] -= size; - --m_DeviceMemoryCount; + --m_DeviceMemoryCount; } VkResult VmaAllocator_T::BindVulkanBuffer( - VkDeviceMemory memory, - VkDeviceSize memoryOffset, - VkBuffer buffer, - const void* pNext) + VkDeviceMemory memory, + VkDeviceSize memoryOffset, + VkBuffer buffer, + const void* pNext) { - if(pNext != VMA_NULL) - { + if (pNext != VMA_NULL) + { #if VMA_VULKAN_VERSION >= 1001000 || VMA_BIND_MEMORY2 - if((m_UseKhrBindMemory2 || m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0)) && - m_VulkanFunctions.vkBindBufferMemory2KHR != VMA_NULL) - { - VkBindBufferMemoryInfoKHR bindBufferMemoryInfo = { VK_STRUCTURE_TYPE_BIND_BUFFER_MEMORY_INFO_KHR }; - bindBufferMemoryInfo.pNext = pNext; - bindBufferMemoryInfo.buffer = buffer; - bindBufferMemoryInfo.memory = memory; - bindBufferMemoryInfo.memoryOffset = memoryOffset; - return (*m_VulkanFunctions.vkBindBufferMemory2KHR)(m_hDevice, 1, &bindBufferMemoryInfo); - } - else + if ((m_UseKhrBindMemory2 || m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0)) && + m_VulkanFunctions.vkBindBufferMemory2KHR != VMA_NULL) + { + VkBindBufferMemoryInfoKHR bindBufferMemoryInfo = { VK_STRUCTURE_TYPE_BIND_BUFFER_MEMORY_INFO_KHR }; + bindBufferMemoryInfo.pNext = pNext; + bindBufferMemoryInfo.buffer = buffer; + bindBufferMemoryInfo.memory = memory; + bindBufferMemoryInfo.memoryOffset = memoryOffset; + return (*m_VulkanFunctions.vkBindBufferMemory2KHR)(m_hDevice, 1, &bindBufferMemoryInfo); + } else #endif // #if VMA_VULKAN_VERSION >= 1001000 || VMA_BIND_MEMORY2 - { - return VK_ERROR_EXTENSION_NOT_PRESENT; - } - } - else - { - return (*m_VulkanFunctions.vkBindBufferMemory)(m_hDevice, buffer, memory, memoryOffset); - } + { + return VK_ERROR_EXTENSION_NOT_PRESENT; + } + } else + { + return (*m_VulkanFunctions.vkBindBufferMemory)(m_hDevice, buffer, memory, memoryOffset); + } } VkResult VmaAllocator_T::BindVulkanImage( - VkDeviceMemory memory, - VkDeviceSize memoryOffset, - VkImage image, - const void* pNext) + VkDeviceMemory memory, + VkDeviceSize memoryOffset, + VkImage image, + const void* pNext) { - if(pNext != VMA_NULL) - { + if (pNext != VMA_NULL) + { #if VMA_VULKAN_VERSION >= 1001000 || VMA_BIND_MEMORY2 - if((m_UseKhrBindMemory2 || m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0)) && - m_VulkanFunctions.vkBindImageMemory2KHR != VMA_NULL) - { - VkBindImageMemoryInfoKHR bindBufferMemoryInfo = { VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_INFO_KHR }; - bindBufferMemoryInfo.pNext = pNext; - bindBufferMemoryInfo.image = image; - bindBufferMemoryInfo.memory = memory; - bindBufferMemoryInfo.memoryOffset = memoryOffset; - return (*m_VulkanFunctions.vkBindImageMemory2KHR)(m_hDevice, 1, &bindBufferMemoryInfo); - } - else + if ((m_UseKhrBindMemory2 || m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0)) && + m_VulkanFunctions.vkBindImageMemory2KHR != VMA_NULL) + { + VkBindImageMemoryInfoKHR bindBufferMemoryInfo = { VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_INFO_KHR }; + bindBufferMemoryInfo.pNext = pNext; + bindBufferMemoryInfo.image = image; + bindBufferMemoryInfo.memory = memory; + bindBufferMemoryInfo.memoryOffset = memoryOffset; + return (*m_VulkanFunctions.vkBindImageMemory2KHR)(m_hDevice, 1, &bindBufferMemoryInfo); + } else #endif // #if VMA_BIND_MEMORY2 - { - return VK_ERROR_EXTENSION_NOT_PRESENT; - } - } - else - { - return (*m_VulkanFunctions.vkBindImageMemory)(m_hDevice, image, memory, memoryOffset); - } + { + return VK_ERROR_EXTENSION_NOT_PRESENT; + } + } else + { + return (*m_VulkanFunctions.vkBindImageMemory)(m_hDevice, image, memory, memoryOffset); + } } VkResult VmaAllocator_T::Map(VmaAllocation hAllocation, void** ppData) { - switch(hAllocation->GetType()) - { - case VmaAllocation_T::ALLOCATION_TYPE_BLOCK: - { - VmaDeviceMemoryBlock* const pBlock = hAllocation->GetBlock(); - char *pBytes = VMA_NULL; - VkResult res = pBlock->Map(this, 1, (void**)&pBytes); - if(res == VK_SUCCESS) - { - *ppData = pBytes + (ptrdiff_t)hAllocation->GetOffset(); - hAllocation->BlockAllocMap(); - } - return res; - } - case VmaAllocation_T::ALLOCATION_TYPE_DEDICATED: - return hAllocation->DedicatedAllocMap(this, ppData); - default: - VMA_ASSERT(0); - return VK_ERROR_MEMORY_MAP_FAILED; - } + switch (hAllocation->GetType()) + { + case VmaAllocation_T::ALLOCATION_TYPE_BLOCK: + { + VmaDeviceMemoryBlock* const pBlock = hAllocation->GetBlock(); + char *pBytes = VMA_NULL; + VkResult res = pBlock->Map(this, 1, (void**)&pBytes); + if (res == VK_SUCCESS) + { + *ppData = pBytes + (ptrdiff_t)hAllocation->GetOffset(); + hAllocation->BlockAllocMap(); + } + return res; + } + VMA_FALLTHROUGH; // Fallthrough + case VmaAllocation_T::ALLOCATION_TYPE_DEDICATED: + return hAllocation->DedicatedAllocMap(this, ppData); + default: + VMA_ASSERT(0); + return VK_ERROR_MEMORY_MAP_FAILED; + } } void VmaAllocator_T::Unmap(VmaAllocation hAllocation) { - switch(hAllocation->GetType()) - { - case VmaAllocation_T::ALLOCATION_TYPE_BLOCK: - { - VmaDeviceMemoryBlock* const pBlock = hAllocation->GetBlock(); - hAllocation->BlockAllocUnmap(); - pBlock->Unmap(this, 1); - } - break; - case VmaAllocation_T::ALLOCATION_TYPE_DEDICATED: - hAllocation->DedicatedAllocUnmap(this); - break; - default: - VMA_ASSERT(0); - } + switch (hAllocation->GetType()) + { + case VmaAllocation_T::ALLOCATION_TYPE_BLOCK: + { + VmaDeviceMemoryBlock* const pBlock = hAllocation->GetBlock(); + hAllocation->BlockAllocUnmap(); + pBlock->Unmap(this, 1); + } + break; + case VmaAllocation_T::ALLOCATION_TYPE_DEDICATED: + hAllocation->DedicatedAllocUnmap(this); + break; + default: + VMA_ASSERT(0); + } } VkResult VmaAllocator_T::BindBufferMemory( - VmaAllocation hAllocation, - VkDeviceSize allocationLocalOffset, - VkBuffer hBuffer, - const void* pNext) + VmaAllocation hAllocation, + VkDeviceSize allocationLocalOffset, + VkBuffer hBuffer, + const void* pNext) { - VkResult res = VK_SUCCESS; - switch(hAllocation->GetType()) - { - case VmaAllocation_T::ALLOCATION_TYPE_DEDICATED: - res = BindVulkanBuffer(hAllocation->GetMemory(), allocationLocalOffset, hBuffer, pNext); - break; - case VmaAllocation_T::ALLOCATION_TYPE_BLOCK: - { - VmaDeviceMemoryBlock* const pBlock = hAllocation->GetBlock(); - VMA_ASSERT(pBlock && "Binding buffer to allocation that doesn't belong to any block."); - res = pBlock->BindBufferMemory(this, hAllocation, allocationLocalOffset, hBuffer, pNext); - break; - } - default: - VMA_ASSERT(0); - } - return res; + VkResult res = VK_ERROR_UNKNOWN_COPY; + switch (hAllocation->GetType()) + { + case VmaAllocation_T::ALLOCATION_TYPE_DEDICATED: + res = BindVulkanBuffer(hAllocation->GetMemory(), allocationLocalOffset, hBuffer, pNext); + break; + case VmaAllocation_T::ALLOCATION_TYPE_BLOCK: + { + VmaDeviceMemoryBlock* const pBlock = hAllocation->GetBlock(); + VMA_ASSERT(pBlock && "Binding buffer to allocation that doesn't belong to any block."); + res = pBlock->BindBufferMemory(this, hAllocation, allocationLocalOffset, hBuffer, pNext); + break; + } + default: + VMA_ASSERT(0); + } + return res; } VkResult VmaAllocator_T::BindImageMemory( - VmaAllocation hAllocation, - VkDeviceSize allocationLocalOffset, - VkImage hImage, - const void* pNext) + VmaAllocation hAllocation, + VkDeviceSize allocationLocalOffset, + VkImage hImage, + const void* pNext) { - VkResult res = VK_SUCCESS; - switch(hAllocation->GetType()) - { - case VmaAllocation_T::ALLOCATION_TYPE_DEDICATED: - res = BindVulkanImage(hAllocation->GetMemory(), allocationLocalOffset, hImage, pNext); - break; - case VmaAllocation_T::ALLOCATION_TYPE_BLOCK: - { - VmaDeviceMemoryBlock* pBlock = hAllocation->GetBlock(); - VMA_ASSERT(pBlock && "Binding image to allocation that doesn't belong to any block."); - res = pBlock->BindImageMemory(this, hAllocation, allocationLocalOffset, hImage, pNext); - break; - } - default: - VMA_ASSERT(0); - } - return res; + VkResult res = VK_ERROR_UNKNOWN_COPY; + switch (hAllocation->GetType()) + { + case VmaAllocation_T::ALLOCATION_TYPE_DEDICATED: + res = BindVulkanImage(hAllocation->GetMemory(), allocationLocalOffset, hImage, pNext); + break; + case VmaAllocation_T::ALLOCATION_TYPE_BLOCK: + { + VmaDeviceMemoryBlock* pBlock = hAllocation->GetBlock(); + VMA_ASSERT(pBlock && "Binding image to allocation that doesn't belong to any block."); + res = pBlock->BindImageMemory(this, hAllocation, allocationLocalOffset, hImage, pNext); + break; + } + default: + VMA_ASSERT(0); + } + return res; } VkResult VmaAllocator_T::FlushOrInvalidateAllocation( - VmaAllocation hAllocation, - VkDeviceSize offset, VkDeviceSize size, - VMA_CACHE_OPERATION op) + VmaAllocation hAllocation, + VkDeviceSize offset, VkDeviceSize size, + VMA_CACHE_OPERATION op) { - VkResult res = VK_SUCCESS; + VkResult res = VK_SUCCESS; - VkMappedMemoryRange memRange = {}; - if(GetFlushOrInvalidateRange(hAllocation, offset, size, memRange)) - { - switch(op) - { - case VMA_CACHE_FLUSH: - res = (*GetVulkanFunctions().vkFlushMappedMemoryRanges)(m_hDevice, 1, &memRange); - break; - case VMA_CACHE_INVALIDATE: - res = (*GetVulkanFunctions().vkInvalidateMappedMemoryRanges)(m_hDevice, 1, &memRange); - break; - default: - VMA_ASSERT(0); - } - } - // else: Just ignore this call. - return res; + VkMappedMemoryRange memRange = {}; + if (GetFlushOrInvalidateRange(hAllocation, offset, size, memRange)) + { + switch (op) + { + case VMA_CACHE_FLUSH: + res = (*GetVulkanFunctions().vkFlushMappedMemoryRanges)(m_hDevice, 1, &memRange); + break; + case VMA_CACHE_INVALIDATE: + res = (*GetVulkanFunctions().vkInvalidateMappedMemoryRanges)(m_hDevice, 1, &memRange); + break; + default: + VMA_ASSERT(0); + } + } + // else: Just ignore this call. + return res; } VkResult VmaAllocator_T::FlushOrInvalidateAllocations( - uint32_t allocationCount, - const VmaAllocation* allocations, - const VkDeviceSize* offsets, const VkDeviceSize* sizes, - VMA_CACHE_OPERATION op) + uint32_t allocationCount, + const VmaAllocation* allocations, + const VkDeviceSize* offsets, const VkDeviceSize* sizes, + VMA_CACHE_OPERATION op) { - typedef VmaStlAllocator RangeAllocator; - typedef VmaSmallVector RangeVector; - RangeVector ranges = RangeVector(RangeAllocator(GetAllocationCallbacks())); + typedef VmaStlAllocator RangeAllocator; + typedef VmaSmallVector RangeVector; + RangeVector ranges = RangeVector(RangeAllocator(GetAllocationCallbacks())); - for(uint32_t allocIndex = 0; allocIndex < allocationCount; ++allocIndex) - { - const VmaAllocation alloc = allocations[allocIndex]; - const VkDeviceSize offset = offsets != VMA_NULL ? offsets[allocIndex] : 0; - const VkDeviceSize size = sizes != VMA_NULL ? sizes[allocIndex] : VK_WHOLE_SIZE; - VkMappedMemoryRange newRange; - if(GetFlushOrInvalidateRange(alloc, offset, size, newRange)) - { - ranges.push_back(newRange); - } - } + for (uint32_t allocIndex = 0; allocIndex < allocationCount; ++allocIndex) + { + const VmaAllocation alloc = allocations[allocIndex]; + const VkDeviceSize offset = offsets != VMA_NULL ? offsets[allocIndex] : 0; + const VkDeviceSize size = sizes != VMA_NULL ? sizes[allocIndex] : VK_WHOLE_SIZE; + VkMappedMemoryRange newRange; + if (GetFlushOrInvalidateRange(alloc, offset, size, newRange)) + { + ranges.push_back(newRange); + } + } - VkResult res = VK_SUCCESS; - if(!ranges.empty()) - { - switch(op) - { - case VMA_CACHE_FLUSH: - res = (*GetVulkanFunctions().vkFlushMappedMemoryRanges)(m_hDevice, (uint32_t)ranges.size(), ranges.data()); - break; - case VMA_CACHE_INVALIDATE: - res = (*GetVulkanFunctions().vkInvalidateMappedMemoryRanges)(m_hDevice, (uint32_t)ranges.size(), ranges.data()); - break; - default: - VMA_ASSERT(0); - } - } - // else: Just ignore this call. - return res; + VkResult res = VK_SUCCESS; + if (!ranges.empty()) + { + switch (op) + { + case VMA_CACHE_FLUSH: + res = (*GetVulkanFunctions().vkFlushMappedMemoryRanges)(m_hDevice, (uint32_t)ranges.size(), ranges.data()); + break; + case VMA_CACHE_INVALIDATE: + res = (*GetVulkanFunctions().vkInvalidateMappedMemoryRanges)(m_hDevice, (uint32_t)ranges.size(), ranges.data()); + break; + default: + VMA_ASSERT(0); + } + } + // else: Just ignore this call. + return res; +} + +VkResult VmaAllocator_T::CopyMemoryToAllocation( + const void* pSrcHostPointer, + VmaAllocation dstAllocation, + VkDeviceSize dstAllocationLocalOffset, + VkDeviceSize size) +{ + void* dstMappedData = VMA_NULL; + VkResult res = Map(dstAllocation, &dstMappedData); + if (res == VK_SUCCESS) + { + memcpy((char*)dstMappedData + dstAllocationLocalOffset, pSrcHostPointer, (size_t)size); + Unmap(dstAllocation); + res = FlushOrInvalidateAllocation(dstAllocation, dstAllocationLocalOffset, size, VMA_CACHE_FLUSH); + } + return res; +} + +VkResult VmaAllocator_T::CopyAllocationToMemory( + VmaAllocation srcAllocation, + VkDeviceSize srcAllocationLocalOffset, + void* pDstHostPointer, + VkDeviceSize size) +{ + void* srcMappedData = VMA_NULL; + VkResult res = Map(srcAllocation, &srcMappedData); + if (res == VK_SUCCESS) + { + res = FlushOrInvalidateAllocation(srcAllocation, srcAllocationLocalOffset, size, VMA_CACHE_INVALIDATE); + if (res == VK_SUCCESS) + { + memcpy(pDstHostPointer, (const char*)srcMappedData + srcAllocationLocalOffset, (size_t)size); + Unmap(srcAllocation); + } + } + return res; } void VmaAllocator_T::FreeDedicatedMemory(const VmaAllocation allocation) { - VMA_ASSERT(allocation && allocation->GetType() == VmaAllocation_T::ALLOCATION_TYPE_DEDICATED); + VMA_ASSERT(allocation && allocation->GetType() == VmaAllocation_T::ALLOCATION_TYPE_DEDICATED); - const uint32_t memTypeIndex = allocation->GetMemoryTypeIndex(); - VmaPool parentPool = allocation->GetParentPool(); - if(parentPool == VK_NULL_HANDLE) - { - // Default pool - m_DedicatedAllocations[memTypeIndex].Unregister(allocation); - } - else - { - // Custom pool - parentPool->m_DedicatedAllocations.Unregister(allocation); - } + const uint32_t memTypeIndex = allocation->GetMemoryTypeIndex(); + VmaPool parentPool = allocation->GetParentPool(); + if (parentPool == VK_NULL_HANDLE) + { + // Default pool + m_DedicatedAllocations[memTypeIndex].Unregister(allocation); + } else + { + // Custom pool + parentPool->m_DedicatedAllocations.Unregister(allocation); + } - VkDeviceMemory hMemory = allocation->GetMemory(); + VkDeviceMemory hMemory = allocation->GetMemory(); - /* - There is no need to call this, because Vulkan spec allows to skip vkUnmapMemory - before vkFreeMemory. + /* + There is no need to call this, because Vulkan spec allows to skip vkUnmapMemory + before vkFreeMemory. - if(allocation->GetMappedData() != VMA_NULL) - { - (*m_VulkanFunctions.vkUnmapMemory)(m_hDevice, hMemory); - } - */ + if(allocation->GetMappedData() != VMA_NULL) + { + (*m_VulkanFunctions.vkUnmapMemory)(m_hDevice, hMemory); + } + */ - FreeVulkanMemory(memTypeIndex, allocation->GetSize(), hMemory); + FreeVulkanMemory(memTypeIndex, allocation->GetSize(), hMemory); - m_Budget.RemoveAllocation(MemoryTypeIndexToHeapIndex(allocation->GetMemoryTypeIndex()), allocation->GetSize()); - m_AllocationObjectAllocator.Free(allocation); + m_Budget.RemoveAllocation(MemoryTypeIndexToHeapIndex(allocation->GetMemoryTypeIndex()), allocation->GetSize()); + m_AllocationObjectAllocator.Free(allocation); - VMA_DEBUG_LOG(" Freed DedicatedMemory MemoryTypeIndex=%u", memTypeIndex); + VMA_DEBUG_LOG_FORMAT(" Freed DedicatedMemory MemoryTypeIndex=%" PRIu32, memTypeIndex); } uint32_t VmaAllocator_T::CalculateGpuDefragmentationMemoryTypeBits() const { - VkBufferCreateInfo dummyBufCreateInfo; - VmaFillGpuDefragmentationBufferCreateInfo(dummyBufCreateInfo); + VkBufferCreateInfo dummyBufCreateInfo; + VmaFillGpuDefragmentationBufferCreateInfo(dummyBufCreateInfo); - uint32_t memoryTypeBits = 0; + uint32_t memoryTypeBits = 0; - // Create buffer. - VkBuffer buf = VK_NULL_HANDLE; - VkResult res = (*GetVulkanFunctions().vkCreateBuffer)( - m_hDevice, &dummyBufCreateInfo, GetAllocationCallbacks(), &buf); - if(res == VK_SUCCESS) - { - // Query for supported memory types. - VkMemoryRequirements memReq; - (*GetVulkanFunctions().vkGetBufferMemoryRequirements)(m_hDevice, buf, &memReq); - memoryTypeBits = memReq.memoryTypeBits; + // Create buffer. + VkBuffer buf = VK_NULL_HANDLE; + VkResult res = (*GetVulkanFunctions().vkCreateBuffer)( + m_hDevice, &dummyBufCreateInfo, GetAllocationCallbacks(), &buf); + if (res == VK_SUCCESS) + { + // Query for supported memory types. + VkMemoryRequirements memReq; + (*GetVulkanFunctions().vkGetBufferMemoryRequirements)(m_hDevice, buf, &memReq); + memoryTypeBits = memReq.memoryTypeBits; - // Destroy buffer. - (*GetVulkanFunctions().vkDestroyBuffer)(m_hDevice, buf, GetAllocationCallbacks()); - } + // Destroy buffer. + (*GetVulkanFunctions().vkDestroyBuffer)(m_hDevice, buf, GetAllocationCallbacks()); + } - return memoryTypeBits; + return memoryTypeBits; } uint32_t VmaAllocator_T::CalculateGlobalMemoryTypeBits() const { - // Make sure memory information is already fetched. - VMA_ASSERT(GetMemoryTypeCount() > 0); + // Make sure memory information is already fetched. + VMA_ASSERT(GetMemoryTypeCount() > 0); - uint32_t memoryTypeBits = UINT32_MAX; + uint32_t memoryTypeBits = UINT32_MAX; - if(!m_UseAmdDeviceCoherentMemory) - { - // Exclude memory types that have VK_MEMORY_PROPERTY_DEVICE_COHERENT_BIT_AMD. - for(uint32_t memTypeIndex = 0; memTypeIndex < GetMemoryTypeCount(); ++memTypeIndex) - { - if((m_MemProps.memoryTypes[memTypeIndex].propertyFlags & VK_MEMORY_PROPERTY_DEVICE_COHERENT_BIT_AMD_COPY) != 0) - { - memoryTypeBits &= ~(1u << memTypeIndex); - } - } - } + if (!m_UseAmdDeviceCoherentMemory) + { + // Exclude memory types that have VK_MEMORY_PROPERTY_DEVICE_COHERENT_BIT_AMD. + for (uint32_t memTypeIndex = 0; memTypeIndex < GetMemoryTypeCount(); ++memTypeIndex) + { + if ((m_MemProps.memoryTypes[memTypeIndex].propertyFlags & VK_MEMORY_PROPERTY_DEVICE_COHERENT_BIT_AMD_COPY) != 0) + { + memoryTypeBits &= ~(1u << memTypeIndex); + } + } + } - return memoryTypeBits; + return memoryTypeBits; } bool VmaAllocator_T::GetFlushOrInvalidateRange( - VmaAllocation allocation, - VkDeviceSize offset, VkDeviceSize size, - VkMappedMemoryRange& outRange) const + VmaAllocation allocation, + VkDeviceSize offset, VkDeviceSize size, + VkMappedMemoryRange& outRange) const { - const uint32_t memTypeIndex = allocation->GetMemoryTypeIndex(); - if(size > 0 && IsMemoryTypeNonCoherent(memTypeIndex)) - { - const VkDeviceSize nonCoherentAtomSize = m_PhysicalDeviceProperties.limits.nonCoherentAtomSize; - const VkDeviceSize allocationSize = allocation->GetSize(); - VMA_ASSERT(offset <= allocationSize); + const uint32_t memTypeIndex = allocation->GetMemoryTypeIndex(); + if (size > 0 && IsMemoryTypeNonCoherent(memTypeIndex)) + { + const VkDeviceSize nonCoherentAtomSize = m_PhysicalDeviceProperties.limits.nonCoherentAtomSize; + const VkDeviceSize allocationSize = allocation->GetSize(); + VMA_ASSERT(offset <= allocationSize); - outRange.sType = VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE; - outRange.pNext = VMA_NULL; - outRange.memory = allocation->GetMemory(); + outRange.sType = VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE; + outRange.pNext = VMA_NULL; + outRange.memory = allocation->GetMemory(); - switch(allocation->GetType()) - { - case VmaAllocation_T::ALLOCATION_TYPE_DEDICATED: - outRange.offset = VmaAlignDown(offset, nonCoherentAtomSize); - if(size == VK_WHOLE_SIZE) - { - outRange.size = allocationSize - outRange.offset; - } - else - { - VMA_ASSERT(offset + size <= allocationSize); - outRange.size = VMA_MIN( - VmaAlignUp(size + (offset - outRange.offset), nonCoherentAtomSize), - allocationSize - outRange.offset); - } - break; - case VmaAllocation_T::ALLOCATION_TYPE_BLOCK: - { - // 1. Still within this allocation. - outRange.offset = VmaAlignDown(offset, nonCoherentAtomSize); - if(size == VK_WHOLE_SIZE) - { - size = allocationSize - offset; - } - else - { - VMA_ASSERT(offset + size <= allocationSize); - } - outRange.size = VmaAlignUp(size + (offset - outRange.offset), nonCoherentAtomSize); + switch (allocation->GetType()) + { + case VmaAllocation_T::ALLOCATION_TYPE_DEDICATED: + outRange.offset = VmaAlignDown(offset, nonCoherentAtomSize); + if (size == VK_WHOLE_SIZE) + { + outRange.size = allocationSize - outRange.offset; + } else + { + VMA_ASSERT(offset + size <= allocationSize); + outRange.size = VMA_MIN( + VmaAlignUp(size + (offset - outRange.offset), nonCoherentAtomSize), + allocationSize - outRange.offset); + } + break; + case VmaAllocation_T::ALLOCATION_TYPE_BLOCK: + { + // 1. Still within this allocation. + outRange.offset = VmaAlignDown(offset, nonCoherentAtomSize); + if (size == VK_WHOLE_SIZE) + { + size = allocationSize - offset; + } else + { + VMA_ASSERT(offset + size <= allocationSize); + } + outRange.size = VmaAlignUp(size + (offset - outRange.offset), nonCoherentAtomSize); - // 2. Adjust to whole block. - const VkDeviceSize allocationOffset = allocation->GetOffset(); - VMA_ASSERT(allocationOffset % nonCoherentAtomSize == 0); - const VkDeviceSize blockSize = allocation->GetBlock()->m_pMetadata->GetSize(); - outRange.offset += allocationOffset; - outRange.size = VMA_MIN(outRange.size, blockSize - outRange.offset); + // 2. Adjust to whole block. + const VkDeviceSize allocationOffset = allocation->GetOffset(); + VMA_ASSERT(allocationOffset % nonCoherentAtomSize == 0); + const VkDeviceSize blockSize = allocation->GetBlock()->m_pMetadata->GetSize(); + outRange.offset += allocationOffset; + outRange.size = VMA_MIN(outRange.size, blockSize - outRange.offset); - break; - } - default: - VMA_ASSERT(0); - } - return true; - } - return false; + break; + } + default: + VMA_ASSERT(0); + } + return true; + } + return false; } #if VMA_MEMORY_BUDGET void VmaAllocator_T::UpdateVulkanBudget() { - VMA_ASSERT(m_UseExtMemoryBudget); + VMA_ASSERT(m_UseExtMemoryBudget); - VkPhysicalDeviceMemoryProperties2KHR memProps = { VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_PROPERTIES_2_KHR }; + VkPhysicalDeviceMemoryProperties2KHR memProps = { VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_PROPERTIES_2_KHR }; - VkPhysicalDeviceMemoryBudgetPropertiesEXT budgetProps = { VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_BUDGET_PROPERTIES_EXT }; - VmaPnextChainPushFront(&memProps, &budgetProps); + VkPhysicalDeviceMemoryBudgetPropertiesEXT budgetProps = { VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_BUDGET_PROPERTIES_EXT }; + VmaPnextChainPushFront(&memProps, &budgetProps); - GetVulkanFunctions().vkGetPhysicalDeviceMemoryProperties2KHR(m_PhysicalDevice, &memProps); + GetVulkanFunctions().vkGetPhysicalDeviceMemoryProperties2KHR(m_PhysicalDevice, &memProps); - { - VmaMutexLockWrite lockWrite(m_Budget.m_BudgetMutex, m_UseMutex); + { + VmaMutexLockWrite lockWrite(m_Budget.m_BudgetMutex, m_UseMutex); - for(uint32_t heapIndex = 0; heapIndex < GetMemoryHeapCount(); ++heapIndex) - { - m_Budget.m_VulkanUsage[heapIndex] = budgetProps.heapUsage[heapIndex]; - m_Budget.m_VulkanBudget[heapIndex] = budgetProps.heapBudget[heapIndex]; - m_Budget.m_BlockBytesAtBudgetFetch[heapIndex] = m_Budget.m_BlockBytes[heapIndex].load(); + for (uint32_t heapIndex = 0; heapIndex < GetMemoryHeapCount(); ++heapIndex) + { + m_Budget.m_VulkanUsage[heapIndex] = budgetProps.heapUsage[heapIndex]; + m_Budget.m_VulkanBudget[heapIndex] = budgetProps.heapBudget[heapIndex]; + m_Budget.m_BlockBytesAtBudgetFetch[heapIndex] = m_Budget.m_BlockBytes[heapIndex].load(); - // Some bugged drivers return the budget incorrectly, e.g. 0 or much bigger than heap size. - if(m_Budget.m_VulkanBudget[heapIndex] == 0) - { - m_Budget.m_VulkanBudget[heapIndex] = m_MemProps.memoryHeaps[heapIndex].size * 8 / 10; // 80% heuristics. - } - else if(m_Budget.m_VulkanBudget[heapIndex] > m_MemProps.memoryHeaps[heapIndex].size) - { - m_Budget.m_VulkanBudget[heapIndex] = m_MemProps.memoryHeaps[heapIndex].size; - } - if(m_Budget.m_VulkanUsage[heapIndex] == 0 && m_Budget.m_BlockBytesAtBudgetFetch[heapIndex] > 0) - { - m_Budget.m_VulkanUsage[heapIndex] = m_Budget.m_BlockBytesAtBudgetFetch[heapIndex]; - } - } - m_Budget.m_OperationsSinceBudgetFetch = 0; - } + // Some bugged drivers return the budget incorrectly, e.g. 0 or much bigger than heap size. + if (m_Budget.m_VulkanBudget[heapIndex] == 0) + { + m_Budget.m_VulkanBudget[heapIndex] = m_MemProps.memoryHeaps[heapIndex].size * 8 / 10; // 80% heuristics. + } else if (m_Budget.m_VulkanBudget[heapIndex] > m_MemProps.memoryHeaps[heapIndex].size) + { + m_Budget.m_VulkanBudget[heapIndex] = m_MemProps.memoryHeaps[heapIndex].size; + } + if (m_Budget.m_VulkanUsage[heapIndex] == 0 && m_Budget.m_BlockBytesAtBudgetFetch[heapIndex] > 0) + { + m_Budget.m_VulkanUsage[heapIndex] = m_Budget.m_BlockBytesAtBudgetFetch[heapIndex]; + } + } + m_Budget.m_OperationsSinceBudgetFetch = 0; + } } #endif // VMA_MEMORY_BUDGET void VmaAllocator_T::FillAllocation(const VmaAllocation hAllocation, uint8_t pattern) { - if(VMA_DEBUG_INITIALIZE_ALLOCATIONS && - hAllocation->IsMappingAllowed() && - (m_MemProps.memoryTypes[hAllocation->GetMemoryTypeIndex()].propertyFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) != 0) - { - void* pData = VMA_NULL; - VkResult res = Map(hAllocation, &pData); - if(res == VK_SUCCESS) - { - memset(pData, (int)pattern, (size_t)hAllocation->GetSize()); - FlushOrInvalidateAllocation(hAllocation, 0, VK_WHOLE_SIZE, VMA_CACHE_FLUSH); - Unmap(hAllocation); - } - else - { - VMA_ASSERT(0 && "VMA_DEBUG_INITIALIZE_ALLOCATIONS is enabled, but couldn't map memory to fill allocation."); - } - } + if (VMA_DEBUG_INITIALIZE_ALLOCATIONS && + hAllocation->IsMappingAllowed() && + (m_MemProps.memoryTypes[hAllocation->GetMemoryTypeIndex()].propertyFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) != 0) + { + void* pData = VMA_NULL; + VkResult res = Map(hAllocation, &pData); + if (res == VK_SUCCESS) + { + memset(pData, (int)pattern, (size_t)hAllocation->GetSize()); + FlushOrInvalidateAllocation(hAllocation, 0, VK_WHOLE_SIZE, VMA_CACHE_FLUSH); + Unmap(hAllocation); + } else + { + VMA_ASSERT(0 && "VMA_DEBUG_INITIALIZE_ALLOCATIONS is enabled, but couldn't map memory to fill allocation."); + } + } } uint32_t VmaAllocator_T::GetGpuDefragmentationMemoryTypeBits() { - uint32_t memoryTypeBits = m_GpuDefragmentationMemoryTypeBits.load(); - if(memoryTypeBits == UINT32_MAX) - { - memoryTypeBits = CalculateGpuDefragmentationMemoryTypeBits(); - m_GpuDefragmentationMemoryTypeBits.store(memoryTypeBits); - } - return memoryTypeBits; + uint32_t memoryTypeBits = m_GpuDefragmentationMemoryTypeBits.load(); + if (memoryTypeBits == UINT32_MAX) + { + memoryTypeBits = CalculateGpuDefragmentationMemoryTypeBits(); + m_GpuDefragmentationMemoryTypeBits.store(memoryTypeBits); + } + return memoryTypeBits; } #if VMA_STATS_STRING_ENABLED void VmaAllocator_T::PrintDetailedMap(VmaJsonWriter& json) { - json.WriteString("DefaultPools"); - json.BeginObject(); - { - for (uint32_t memTypeIndex = 0; memTypeIndex < GetMemoryTypeCount(); ++memTypeIndex) - { - VmaBlockVector* pBlockVector = m_pBlockVectors[memTypeIndex]; - VmaDedicatedAllocationList& dedicatedAllocList = m_DedicatedAllocations[memTypeIndex]; - if (pBlockVector != VMA_NULL) - { - json.BeginString("Type "); - json.ContinueString(memTypeIndex); - json.EndString(); - json.BeginObject(); - { - json.WriteString("PreferredBlockSize"); - json.WriteNumber(pBlockVector->GetPreferredBlockSize()); + json.WriteString("DefaultPools"); + json.BeginObject(); + { + for (uint32_t memTypeIndex = 0; memTypeIndex < GetMemoryTypeCount(); ++memTypeIndex) + { + VmaBlockVector* pBlockVector = m_pBlockVectors[memTypeIndex]; + VmaDedicatedAllocationList& dedicatedAllocList = m_DedicatedAllocations[memTypeIndex]; + if (pBlockVector != VMA_NULL) + { + json.BeginString("Type "); + json.ContinueString(memTypeIndex); + json.EndString(); + json.BeginObject(); + { + json.WriteString("PreferredBlockSize"); + json.WriteNumber(pBlockVector->GetPreferredBlockSize()); - json.WriteString("Blocks"); - pBlockVector->PrintDetailedMap(json); + json.WriteString("Blocks"); + pBlockVector->PrintDetailedMap(json); - json.WriteString("DedicatedAllocations"); - dedicatedAllocList.BuildStatsString(json); - } - json.EndObject(); - } - } - } - json.EndObject(); + json.WriteString("DedicatedAllocations"); + dedicatedAllocList.BuildStatsString(json); + } + json.EndObject(); + } + } + } + json.EndObject(); - json.WriteString("CustomPools"); - json.BeginObject(); - { - VmaMutexLockRead lock(m_PoolsMutex, m_UseMutex); - if (!m_Pools.IsEmpty()) - { - for (uint32_t memTypeIndex = 0; memTypeIndex < GetMemoryTypeCount(); ++memTypeIndex) - { - bool displayType = true; - size_t index = 0; - for (VmaPool pool = m_Pools.Front(); pool != VMA_NULL; pool = m_Pools.GetNext(pool)) - { - VmaBlockVector& blockVector = pool->m_BlockVector; - if (blockVector.GetMemoryTypeIndex() == memTypeIndex) - { - if (displayType) - { - json.BeginString("Type "); - json.ContinueString(memTypeIndex); - json.EndString(); - json.BeginArray(); - displayType = false; - } + json.WriteString("CustomPools"); + json.BeginObject(); + { + VmaMutexLockRead lock(m_PoolsMutex, m_UseMutex); + if (!m_Pools.IsEmpty()) + { + for (uint32_t memTypeIndex = 0; memTypeIndex < GetMemoryTypeCount(); ++memTypeIndex) + { + bool displayType = true; + size_t index = 0; + for (VmaPool pool = m_Pools.Front(); pool != VMA_NULL; pool = m_Pools.GetNext(pool)) + { + VmaBlockVector& blockVector = pool->m_BlockVector; + if (blockVector.GetMemoryTypeIndex() == memTypeIndex) + { + if (displayType) + { + json.BeginString("Type "); + json.ContinueString(memTypeIndex); + json.EndString(); + json.BeginArray(); + displayType = false; + } - json.BeginObject(); - { - json.WriteString("Name"); - json.BeginString(); - json.ContinueString_Size(index++); - if (pool->GetName()) - { - json.ContinueString(" - "); - json.ContinueString(pool->GetName()); - } - json.EndString(); + json.BeginObject(); + { + json.WriteString("Name"); + json.BeginString(); + json.ContinueString((uint64_t)index++); + if (pool->GetName()) + { + json.ContinueString(" - "); + json.ContinueString(pool->GetName()); + } + json.EndString(); - json.WriteString("PreferredBlockSize"); - json.WriteNumber(blockVector.GetPreferredBlockSize()); + json.WriteString("PreferredBlockSize"); + json.WriteNumber(blockVector.GetPreferredBlockSize()); - json.WriteString("Blocks"); - blockVector.PrintDetailedMap(json); + json.WriteString("Blocks"); + blockVector.PrintDetailedMap(json); - json.WriteString("DedicatedAllocations"); - pool->m_DedicatedAllocations.BuildStatsString(json); - } - json.EndObject(); - } - } + json.WriteString("DedicatedAllocations"); + pool->m_DedicatedAllocations.BuildStatsString(json); + } + json.EndObject(); + } + } - if (!displayType) - json.EndArray(); - } - } - } - json.EndObject(); + if (!displayType) + json.EndArray(); + } + } + } + json.EndObject(); } #endif // VMA_STATS_STRING_ENABLED #endif // _VMA_ALLOCATOR_T_FUNCTIONS @@ -16059,295 +14744,295 @@ void VmaAllocator_T::PrintDetailedMap(VmaJsonWriter& json) #ifndef _VMA_PUBLIC_INTERFACE VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateAllocator( - const VmaAllocatorCreateInfo* pCreateInfo, - VmaAllocator* pAllocator) + const VmaAllocatorCreateInfo* pCreateInfo, + VmaAllocator* pAllocator) { - VMA_ASSERT(pCreateInfo && pAllocator); - VMA_ASSERT(pCreateInfo->vulkanApiVersion == 0 || - (VK_VERSION_MAJOR(pCreateInfo->vulkanApiVersion) == 1 && VK_VERSION_MINOR(pCreateInfo->vulkanApiVersion) <= 3)); - VMA_DEBUG_LOG("vmaCreateAllocator"); - *pAllocator = vma_new(pCreateInfo->pAllocationCallbacks, VmaAllocator_T)(pCreateInfo); - VkResult result = (*pAllocator)->Init(pCreateInfo); - if(result < 0) - { - vma_delete(pCreateInfo->pAllocationCallbacks, *pAllocator); - *pAllocator = VK_NULL_HANDLE; - } - return result; + VMA_ASSERT(pCreateInfo && pAllocator); + VMA_ASSERT(pCreateInfo->vulkanApiVersion == 0 || + (VK_VERSION_MAJOR(pCreateInfo->vulkanApiVersion) == 1 && VK_VERSION_MINOR(pCreateInfo->vulkanApiVersion) <= 3)); + VMA_DEBUG_LOG("vmaCreateAllocator"); + *pAllocator = vma_new(pCreateInfo->pAllocationCallbacks, VmaAllocator_T)(pCreateInfo); + VkResult result = (*pAllocator)->Init(pCreateInfo); + if (result < 0) + { + vma_delete(pCreateInfo->pAllocationCallbacks, *pAllocator); + *pAllocator = VK_NULL_HANDLE; + } + return result; } VMA_CALL_PRE void VMA_CALL_POST vmaDestroyAllocator( - VmaAllocator allocator) + VmaAllocator allocator) { - if(allocator != VK_NULL_HANDLE) - { - VMA_DEBUG_LOG("vmaDestroyAllocator"); - VkAllocationCallbacks allocationCallbacks = allocator->m_AllocationCallbacks; // Have to copy the callbacks when destroying. - vma_delete(&allocationCallbacks, allocator); - } + if (allocator != VK_NULL_HANDLE) + { + VMA_DEBUG_LOG("vmaDestroyAllocator"); + VkAllocationCallbacks allocationCallbacks = allocator->m_AllocationCallbacks; // Have to copy the callbacks when destroying. + vma_delete(&allocationCallbacks, allocator); + } } VMA_CALL_PRE void VMA_CALL_POST vmaGetAllocatorInfo(VmaAllocator allocator, VmaAllocatorInfo* pAllocatorInfo) { - VMA_ASSERT(allocator && pAllocatorInfo); - pAllocatorInfo->instance = allocator->m_hInstance; - pAllocatorInfo->physicalDevice = allocator->GetPhysicalDevice(); - pAllocatorInfo->device = allocator->m_hDevice; + VMA_ASSERT(allocator && pAllocatorInfo); + pAllocatorInfo->instance = allocator->m_hInstance; + pAllocatorInfo->physicalDevice = allocator->GetPhysicalDevice(); + pAllocatorInfo->device = allocator->m_hDevice; } VMA_CALL_PRE void VMA_CALL_POST vmaGetPhysicalDeviceProperties( - VmaAllocator allocator, - const VkPhysicalDeviceProperties **ppPhysicalDeviceProperties) + VmaAllocator allocator, + const VkPhysicalDeviceProperties **ppPhysicalDeviceProperties) { - VMA_ASSERT(allocator && ppPhysicalDeviceProperties); - *ppPhysicalDeviceProperties = &allocator->m_PhysicalDeviceProperties; + VMA_ASSERT(allocator && ppPhysicalDeviceProperties); + *ppPhysicalDeviceProperties = &allocator->m_PhysicalDeviceProperties; } VMA_CALL_PRE void VMA_CALL_POST vmaGetMemoryProperties( - VmaAllocator allocator, - const VkPhysicalDeviceMemoryProperties** ppPhysicalDeviceMemoryProperties) + VmaAllocator allocator, + const VkPhysicalDeviceMemoryProperties** ppPhysicalDeviceMemoryProperties) { - VMA_ASSERT(allocator && ppPhysicalDeviceMemoryProperties); - *ppPhysicalDeviceMemoryProperties = &allocator->m_MemProps; + VMA_ASSERT(allocator && ppPhysicalDeviceMemoryProperties); + *ppPhysicalDeviceMemoryProperties = &allocator->m_MemProps; } VMA_CALL_PRE void VMA_CALL_POST vmaGetMemoryTypeProperties( - VmaAllocator allocator, - uint32_t memoryTypeIndex, - VkMemoryPropertyFlags* pFlags) + VmaAllocator allocator, + uint32_t memoryTypeIndex, + VkMemoryPropertyFlags* pFlags) { - VMA_ASSERT(allocator && pFlags); - VMA_ASSERT(memoryTypeIndex < allocator->GetMemoryTypeCount()); - *pFlags = allocator->m_MemProps.memoryTypes[memoryTypeIndex].propertyFlags; + VMA_ASSERT(allocator && pFlags); + VMA_ASSERT(memoryTypeIndex < allocator->GetMemoryTypeCount()); + *pFlags = allocator->m_MemProps.memoryTypes[memoryTypeIndex].propertyFlags; } VMA_CALL_PRE void VMA_CALL_POST vmaSetCurrentFrameIndex( - VmaAllocator allocator, - uint32_t frameIndex) + VmaAllocator allocator, + uint32_t frameIndex) { - VMA_ASSERT(allocator); + VMA_ASSERT(allocator); - VMA_DEBUG_GLOBAL_MUTEX_LOCK + VMA_DEBUG_GLOBAL_MUTEX_LOCK - allocator->SetCurrentFrameIndex(frameIndex); + allocator->SetCurrentFrameIndex(frameIndex); } VMA_CALL_PRE void VMA_CALL_POST vmaCalculateStatistics( - VmaAllocator allocator, - VmaTotalStatistics* pStats) + VmaAllocator allocator, + VmaTotalStatistics* pStats) { - VMA_ASSERT(allocator && pStats); - VMA_DEBUG_GLOBAL_MUTEX_LOCK - allocator->CalculateStatistics(pStats); + VMA_ASSERT(allocator && pStats); + VMA_DEBUG_GLOBAL_MUTEX_LOCK + allocator->CalculateStatistics(pStats); } VMA_CALL_PRE void VMA_CALL_POST vmaGetHeapBudgets( - VmaAllocator allocator, - VmaBudget* pBudgets) + VmaAllocator allocator, + VmaBudget* pBudgets) { - VMA_ASSERT(allocator && pBudgets); - VMA_DEBUG_GLOBAL_MUTEX_LOCK - allocator->GetHeapBudgets(pBudgets, 0, allocator->GetMemoryHeapCount()); + VMA_ASSERT(allocator && pBudgets); + VMA_DEBUG_GLOBAL_MUTEX_LOCK + allocator->GetHeapBudgets(pBudgets, 0, allocator->GetMemoryHeapCount()); } #if VMA_STATS_STRING_ENABLED VMA_CALL_PRE void VMA_CALL_POST vmaBuildStatsString( - VmaAllocator allocator, - char** ppStatsString, - VkBool32 detailedMap) + VmaAllocator allocator, + char** ppStatsString, + VkBool32 detailedMap) { - VMA_ASSERT(allocator && ppStatsString); - VMA_DEBUG_GLOBAL_MUTEX_LOCK + VMA_ASSERT(allocator && ppStatsString); + VMA_DEBUG_GLOBAL_MUTEX_LOCK - VmaStringBuilder sb(allocator->GetAllocationCallbacks()); - { - VmaBudget budgets[VK_MAX_MEMORY_HEAPS]; - allocator->GetHeapBudgets(budgets, 0, allocator->GetMemoryHeapCount()); + VmaStringBuilder sb(allocator->GetAllocationCallbacks()); + { + VmaBudget budgets[VK_MAX_MEMORY_HEAPS]; + allocator->GetHeapBudgets(budgets, 0, allocator->GetMemoryHeapCount()); - VmaTotalStatistics stats; - allocator->CalculateStatistics(&stats); + VmaTotalStatistics stats; + allocator->CalculateStatistics(&stats); - VmaJsonWriter json(allocator->GetAllocationCallbacks(), sb); - json.BeginObject(); - { - json.WriteString("General"); - json.BeginObject(); - { - const VkPhysicalDeviceProperties& deviceProperties = allocator->m_PhysicalDeviceProperties; - const VkPhysicalDeviceMemoryProperties& memoryProperties = allocator->m_MemProps; + VmaJsonWriter json(allocator->GetAllocationCallbacks(), sb); + json.BeginObject(); + { + json.WriteString("General"); + json.BeginObject(); + { + const VkPhysicalDeviceProperties& deviceProperties = allocator->m_PhysicalDeviceProperties; + const VkPhysicalDeviceMemoryProperties& memoryProperties = allocator->m_MemProps; - json.WriteString("API"); - json.WriteString("Vulkan"); + json.WriteString("API"); + json.WriteString("Vulkan"); - json.WriteString("apiVersion"); - json.BeginString(); - json.ContinueString(VK_API_VERSION_MAJOR(deviceProperties.apiVersion)); - json.ContinueString("."); - json.ContinueString(VK_API_VERSION_MINOR(deviceProperties.apiVersion)); - json.ContinueString("."); - json.ContinueString(VK_API_VERSION_PATCH(deviceProperties.apiVersion)); - json.EndString(); + json.WriteString("apiVersion"); + json.BeginString(); + json.ContinueString(VK_VERSION_MAJOR(deviceProperties.apiVersion)); + json.ContinueString("."); + json.ContinueString(VK_VERSION_MINOR(deviceProperties.apiVersion)); + json.ContinueString("."); + json.ContinueString(VK_VERSION_PATCH(deviceProperties.apiVersion)); + json.EndString(); - json.WriteString("GPU"); - json.WriteString(deviceProperties.deviceName); - json.WriteString("deviceType"); - json.WriteNumber(static_cast(deviceProperties.deviceType)); + json.WriteString("GPU"); + json.WriteString(deviceProperties.deviceName); + json.WriteString("deviceType"); + json.WriteNumber(static_cast(deviceProperties.deviceType)); - json.WriteString("maxMemoryAllocationCount"); - json.WriteNumber(deviceProperties.limits.maxMemoryAllocationCount); - json.WriteString("bufferImageGranularity"); - json.WriteNumber(deviceProperties.limits.bufferImageGranularity); - json.WriteString("nonCoherentAtomSize"); - json.WriteNumber(deviceProperties.limits.nonCoherentAtomSize); + json.WriteString("maxMemoryAllocationCount"); + json.WriteNumber(deviceProperties.limits.maxMemoryAllocationCount); + json.WriteString("bufferImageGranularity"); + json.WriteNumber(deviceProperties.limits.bufferImageGranularity); + json.WriteString("nonCoherentAtomSize"); + json.WriteNumber(deviceProperties.limits.nonCoherentAtomSize); - json.WriteString("memoryHeapCount"); - json.WriteNumber(memoryProperties.memoryHeapCount); - json.WriteString("memoryTypeCount"); - json.WriteNumber(memoryProperties.memoryTypeCount); - } - json.EndObject(); - } - { - json.WriteString("Total"); - VmaPrintDetailedStatistics(json, stats.total); - } - { - json.WriteString("MemoryInfo"); - json.BeginObject(); - { - for (uint32_t heapIndex = 0; heapIndex < allocator->GetMemoryHeapCount(); ++heapIndex) - { - json.BeginString("Heap "); - json.ContinueString(heapIndex); - json.EndString(); - json.BeginObject(); - { - const VkMemoryHeap& heapInfo = allocator->m_MemProps.memoryHeaps[heapIndex]; - json.WriteString("Flags"); - json.BeginArray(true); - { - if (heapInfo.flags & VK_MEMORY_HEAP_DEVICE_LOCAL_BIT) - json.WriteString("DEVICE_LOCAL"); - #if VMA_VULKAN_VERSION >= 1001000 - if (heapInfo.flags & VK_MEMORY_HEAP_MULTI_INSTANCE_BIT) - json.WriteString("MULTI_INSTANCE"); - #endif + json.WriteString("memoryHeapCount"); + json.WriteNumber(memoryProperties.memoryHeapCount); + json.WriteString("memoryTypeCount"); + json.WriteNumber(memoryProperties.memoryTypeCount); + } + json.EndObject(); + } + { + json.WriteString("Total"); + VmaPrintDetailedStatistics(json, stats.total); + } + { + json.WriteString("MemoryInfo"); + json.BeginObject(); + { + for (uint32_t heapIndex = 0; heapIndex < allocator->GetMemoryHeapCount(); ++heapIndex) + { + json.BeginString("Heap "); + json.ContinueString(heapIndex); + json.EndString(); + json.BeginObject(); + { + const VkMemoryHeap& heapInfo = allocator->m_MemProps.memoryHeaps[heapIndex]; + json.WriteString("Flags"); + json.BeginArray(true); + { + if (heapInfo.flags & VK_MEMORY_HEAP_DEVICE_LOCAL_BIT) + json.WriteString("DEVICE_LOCAL"); +#if VMA_VULKAN_VERSION >= 1001000 + if (heapInfo.flags & VK_MEMORY_HEAP_MULTI_INSTANCE_BIT) + json.WriteString("MULTI_INSTANCE"); +#endif - VkMemoryHeapFlags flags = heapInfo.flags & - ~(VK_MEMORY_HEAP_DEVICE_LOCAL_BIT - #if VMA_VULKAN_VERSION >= 1001000 - | VK_MEMORY_HEAP_MULTI_INSTANCE_BIT - #endif - ); - if (flags != 0) - json.WriteNumber(flags); - } - json.EndArray(); + VkMemoryHeapFlags flags = heapInfo.flags & + ~(VK_MEMORY_HEAP_DEVICE_LOCAL_BIT +#if VMA_VULKAN_VERSION >= 1001000 + | VK_MEMORY_HEAP_MULTI_INSTANCE_BIT +#endif + ); + if (flags != 0) + json.WriteNumber(flags); + } + json.EndArray(); - json.WriteString("Size"); - json.WriteNumber(heapInfo.size); + json.WriteString("Size"); + json.WriteNumber(heapInfo.size); - json.WriteString("Budget"); - json.BeginObject(); - { - json.WriteString("BudgetBytes"); - json.WriteNumber(budgets[heapIndex].budget); - json.WriteString("UsageBytes"); - json.WriteNumber(budgets[heapIndex].usage); - } - json.EndObject(); + json.WriteString("Budget"); + json.BeginObject(); + { + json.WriteString("BudgetBytes"); + json.WriteNumber(budgets[heapIndex].budget); + json.WriteString("UsageBytes"); + json.WriteNumber(budgets[heapIndex].usage); + } + json.EndObject(); - json.WriteString("Stats"); - VmaPrintDetailedStatistics(json, stats.memoryHeap[heapIndex]); + json.WriteString("Stats"); + VmaPrintDetailedStatistics(json, stats.memoryHeap[heapIndex]); - json.WriteString("MemoryPools"); - json.BeginObject(); - { - for (uint32_t typeIndex = 0; typeIndex < allocator->GetMemoryTypeCount(); ++typeIndex) - { - if (allocator->MemoryTypeIndexToHeapIndex(typeIndex) == heapIndex) - { - json.BeginString("Type "); - json.ContinueString(typeIndex); - json.EndString(); - json.BeginObject(); - { - json.WriteString("Flags"); - json.BeginArray(true); - { - VkMemoryPropertyFlags flags = allocator->m_MemProps.memoryTypes[typeIndex].propertyFlags; - if (flags & VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT) - json.WriteString("DEVICE_LOCAL"); - if (flags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) - json.WriteString("HOST_VISIBLE"); - if (flags & VK_MEMORY_PROPERTY_HOST_COHERENT_BIT) - json.WriteString("HOST_COHERENT"); - if (flags & VK_MEMORY_PROPERTY_HOST_CACHED_BIT) - json.WriteString("HOST_CACHED"); - if (flags & VK_MEMORY_PROPERTY_LAZILY_ALLOCATED_BIT) - json.WriteString("LAZILY_ALLOCATED"); - #if VMA_VULKAN_VERSION >= 1001000 - if (flags & VK_MEMORY_PROPERTY_PROTECTED_BIT) - json.WriteString("PROTECTED"); - #endif - #if VK_AMD_device_coherent_memory - if (flags & VK_MEMORY_PROPERTY_DEVICE_COHERENT_BIT_AMD_COPY) - json.WriteString("DEVICE_COHERENT_AMD"); - if (flags & VK_MEMORY_PROPERTY_DEVICE_UNCACHED_BIT_AMD_COPY) - json.WriteString("DEVICE_UNCACHED_AMD"); - #endif + json.WriteString("MemoryPools"); + json.BeginObject(); + { + for (uint32_t typeIndex = 0; typeIndex < allocator->GetMemoryTypeCount(); ++typeIndex) + { + if (allocator->MemoryTypeIndexToHeapIndex(typeIndex) == heapIndex) + { + json.BeginString("Type "); + json.ContinueString(typeIndex); + json.EndString(); + json.BeginObject(); + { + json.WriteString("Flags"); + json.BeginArray(true); + { + VkMemoryPropertyFlags flags = allocator->m_MemProps.memoryTypes[typeIndex].propertyFlags; + if (flags & VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT) + json.WriteString("DEVICE_LOCAL"); + if (flags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) + json.WriteString("HOST_VISIBLE"); + if (flags & VK_MEMORY_PROPERTY_HOST_COHERENT_BIT) + json.WriteString("HOST_COHERENT"); + if (flags & VK_MEMORY_PROPERTY_HOST_CACHED_BIT) + json.WriteString("HOST_CACHED"); + if (flags & VK_MEMORY_PROPERTY_LAZILY_ALLOCATED_BIT) + json.WriteString("LAZILY_ALLOCATED"); +#if VMA_VULKAN_VERSION >= 1001000 + if (flags & VK_MEMORY_PROPERTY_PROTECTED_BIT) + json.WriteString("PROTECTED"); +#endif +#if VK_AMD_device_coherent_memory + if (flags & VK_MEMORY_PROPERTY_DEVICE_COHERENT_BIT_AMD_COPY) + json.WriteString("DEVICE_COHERENT_AMD"); + if (flags & VK_MEMORY_PROPERTY_DEVICE_UNCACHED_BIT_AMD_COPY) + json.WriteString("DEVICE_UNCACHED_AMD"); +#endif - flags &= ~(VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT - #if VMA_VULKAN_VERSION >= 1001000 - | VK_MEMORY_PROPERTY_LAZILY_ALLOCATED_BIT - #endif - #if VK_AMD_device_coherent_memory - | VK_MEMORY_PROPERTY_DEVICE_COHERENT_BIT_AMD_COPY - | VK_MEMORY_PROPERTY_DEVICE_UNCACHED_BIT_AMD_COPY - #endif - | VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT - | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT - | VK_MEMORY_PROPERTY_HOST_CACHED_BIT); - if (flags != 0) - json.WriteNumber(flags); - } - json.EndArray(); + flags &= ~(VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT +#if VMA_VULKAN_VERSION >= 1001000 + | VK_MEMORY_PROPERTY_LAZILY_ALLOCATED_BIT +#endif +#if VK_AMD_device_coherent_memory + | VK_MEMORY_PROPERTY_DEVICE_COHERENT_BIT_AMD_COPY + | VK_MEMORY_PROPERTY_DEVICE_UNCACHED_BIT_AMD_COPY +#endif + | VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT + | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT + | VK_MEMORY_PROPERTY_HOST_CACHED_BIT); + if (flags != 0) + json.WriteNumber(flags); + } + json.EndArray(); - json.WriteString("Stats"); - VmaPrintDetailedStatistics(json, stats.memoryType[typeIndex]); - } - json.EndObject(); - } - } + json.WriteString("Stats"); + VmaPrintDetailedStatistics(json, stats.memoryType[typeIndex]); + } + json.EndObject(); + } + } - } - json.EndObject(); - } - json.EndObject(); - } - } - json.EndObject(); - } + } + json.EndObject(); + } + json.EndObject(); + } + } + json.EndObject(); + } - if (detailedMap == VK_TRUE) - allocator->PrintDetailedMap(json); + if (detailedMap == VK_TRUE) + allocator->PrintDetailedMap(json); - json.EndObject(); - } + json.EndObject(); + } - *ppStatsString = VmaCreateStringCopy(allocator->GetAllocationCallbacks(), sb.GetData(), sb.GetLength()); + *ppStatsString = VmaCreateStringCopy(allocator->GetAllocationCallbacks(), sb.GetData(), sb.GetLength()); } VMA_CALL_PRE void VMA_CALL_POST vmaFreeStatsString( - VmaAllocator allocator, - char* pStatsString) + VmaAllocator allocator, + char* pStatsString) { - if(pStatsString != VMA_NULL) - { - VMA_ASSERT(allocator); - VmaFreeString(allocator->GetAllocationCallbacks(), pStatsString); - } + if (pStatsString != VMA_NULL) + { + VMA_ASSERT(allocator); + VmaFreeString(allocator->GetAllocationCallbacks(), pStatsString); + } } #endif // VMA_STATS_STRING_ENABLED @@ -16356,1262 +15041,1310 @@ VMA_CALL_PRE void VMA_CALL_POST vmaFreeStatsString( This function is not protected by any mutex because it just reads immutable data. */ VMA_CALL_PRE VkResult VMA_CALL_POST vmaFindMemoryTypeIndex( - VmaAllocator allocator, - uint32_t memoryTypeBits, - const VmaAllocationCreateInfo* pAllocationCreateInfo, - uint32_t* pMemoryTypeIndex) + VmaAllocator allocator, + uint32_t memoryTypeBits, + const VmaAllocationCreateInfo* pAllocationCreateInfo, + uint32_t* pMemoryTypeIndex) { - VMA_ASSERT(allocator != VK_NULL_HANDLE); - VMA_ASSERT(pAllocationCreateInfo != VMA_NULL); - VMA_ASSERT(pMemoryTypeIndex != VMA_NULL); + VMA_ASSERT(allocator != VK_NULL_HANDLE); + VMA_ASSERT(pAllocationCreateInfo != VMA_NULL); + VMA_ASSERT(pMemoryTypeIndex != VMA_NULL); - return allocator->FindMemoryTypeIndex(memoryTypeBits, pAllocationCreateInfo, UINT32_MAX, pMemoryTypeIndex); + return allocator->FindMemoryTypeIndex(memoryTypeBits, pAllocationCreateInfo, VmaBufferImageUsage::UNKNOWN, pMemoryTypeIndex); } VMA_CALL_PRE VkResult VMA_CALL_POST vmaFindMemoryTypeIndexForBufferInfo( - VmaAllocator allocator, - const VkBufferCreateInfo* pBufferCreateInfo, - const VmaAllocationCreateInfo* pAllocationCreateInfo, - uint32_t* pMemoryTypeIndex) + VmaAllocator allocator, + const VkBufferCreateInfo* pBufferCreateInfo, + const VmaAllocationCreateInfo* pAllocationCreateInfo, + uint32_t* pMemoryTypeIndex) { - VMA_ASSERT(allocator != VK_NULL_HANDLE); - VMA_ASSERT(pBufferCreateInfo != VMA_NULL); - VMA_ASSERT(pAllocationCreateInfo != VMA_NULL); - VMA_ASSERT(pMemoryTypeIndex != VMA_NULL); + VMA_ASSERT(allocator != VK_NULL_HANDLE); + VMA_ASSERT(pBufferCreateInfo != VMA_NULL); + VMA_ASSERT(pAllocationCreateInfo != VMA_NULL); + VMA_ASSERT(pMemoryTypeIndex != VMA_NULL); - const VkDevice hDev = allocator->m_hDevice; - const VmaVulkanFunctions* funcs = &allocator->GetVulkanFunctions(); - VkResult res; + const VkDevice hDev = allocator->m_hDevice; + const VmaVulkanFunctions* funcs = &allocator->GetVulkanFunctions(); + VkResult res; -#if VMA_VULKAN_VERSION >= 1003000 - if(funcs->vkGetDeviceBufferMemoryRequirements) - { - // Can query straight from VkBufferCreateInfo :) - VkDeviceBufferMemoryRequirements devBufMemReq = {VK_STRUCTURE_TYPE_DEVICE_BUFFER_MEMORY_REQUIREMENTS}; - devBufMemReq.pCreateInfo = pBufferCreateInfo; +#if VMA_KHR_MAINTENANCE4 || VMA_VULKAN_VERSION >= 1003000 + if (funcs->vkGetDeviceBufferMemoryRequirements) + { + // Can query straight from VkBufferCreateInfo :) + VkDeviceBufferMemoryRequirementsKHR devBufMemReq = { VK_STRUCTURE_TYPE_DEVICE_BUFFER_MEMORY_REQUIREMENTS_KHR }; + devBufMemReq.pCreateInfo = pBufferCreateInfo; - VkMemoryRequirements2 memReq = {VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2}; - (*funcs->vkGetDeviceBufferMemoryRequirements)(hDev, &devBufMemReq, &memReq); + VkMemoryRequirements2 memReq = { VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2 }; + (*funcs->vkGetDeviceBufferMemoryRequirements)(hDev, &devBufMemReq, &memReq); - res = allocator->FindMemoryTypeIndex( - memReq.memoryRequirements.memoryTypeBits, pAllocationCreateInfo, pBufferCreateInfo->usage, pMemoryTypeIndex); - } - else -#endif // #if VMA_VULKAN_VERSION >= 1003000 - { - // Must create a dummy buffer to query :( - VkBuffer hBuffer = VK_NULL_HANDLE; - res = funcs->vkCreateBuffer( - hDev, pBufferCreateInfo, allocator->GetAllocationCallbacks(), &hBuffer); - if(res == VK_SUCCESS) - { - VkMemoryRequirements memReq = {}; - funcs->vkGetBufferMemoryRequirements(hDev, hBuffer, &memReq); + res = allocator->FindMemoryTypeIndex( + memReq.memoryRequirements.memoryTypeBits, pAllocationCreateInfo, + VmaBufferImageUsage(*pBufferCreateInfo, allocator->m_UseKhrMaintenance5), pMemoryTypeIndex); + } else +#endif // VMA_KHR_MAINTENANCE4 || VMA_VULKAN_VERSION >= 1003000 + { + // Must create a dummy buffer to query :( + VkBuffer hBuffer = VK_NULL_HANDLE; + res = funcs->vkCreateBuffer( + hDev, pBufferCreateInfo, allocator->GetAllocationCallbacks(), &hBuffer); + if (res == VK_SUCCESS) + { + VkMemoryRequirements memReq = {}; + funcs->vkGetBufferMemoryRequirements(hDev, hBuffer, &memReq); - res = allocator->FindMemoryTypeIndex( - memReq.memoryTypeBits, pAllocationCreateInfo, pBufferCreateInfo->usage, pMemoryTypeIndex); + res = allocator->FindMemoryTypeIndex( + memReq.memoryTypeBits, pAllocationCreateInfo, + VmaBufferImageUsage(*pBufferCreateInfo, allocator->m_UseKhrMaintenance5), pMemoryTypeIndex); - funcs->vkDestroyBuffer( - hDev, hBuffer, allocator->GetAllocationCallbacks()); - } - } - return res; + funcs->vkDestroyBuffer( + hDev, hBuffer, allocator->GetAllocationCallbacks()); + } + } + return res; } VMA_CALL_PRE VkResult VMA_CALL_POST vmaFindMemoryTypeIndexForImageInfo( - VmaAllocator allocator, - const VkImageCreateInfo* pImageCreateInfo, - const VmaAllocationCreateInfo* pAllocationCreateInfo, - uint32_t* pMemoryTypeIndex) + VmaAllocator allocator, + const VkImageCreateInfo* pImageCreateInfo, + const VmaAllocationCreateInfo* pAllocationCreateInfo, + uint32_t* pMemoryTypeIndex) { - VMA_ASSERT(allocator != VK_NULL_HANDLE); - VMA_ASSERT(pImageCreateInfo != VMA_NULL); - VMA_ASSERT(pAllocationCreateInfo != VMA_NULL); - VMA_ASSERT(pMemoryTypeIndex != VMA_NULL); + VMA_ASSERT(allocator != VK_NULL_HANDLE); + VMA_ASSERT(pImageCreateInfo != VMA_NULL); + VMA_ASSERT(pAllocationCreateInfo != VMA_NULL); + VMA_ASSERT(pMemoryTypeIndex != VMA_NULL); - const VkDevice hDev = allocator->m_hDevice; - const VmaVulkanFunctions* funcs = &allocator->GetVulkanFunctions(); - VkResult res; + const VkDevice hDev = allocator->m_hDevice; + const VmaVulkanFunctions* funcs = &allocator->GetVulkanFunctions(); + VkResult res; -#if VMA_VULKAN_VERSION >= 1003000 - if(funcs->vkGetDeviceImageMemoryRequirements) - { - // Can query straight from VkImageCreateInfo :) - VkDeviceImageMemoryRequirements devImgMemReq = {VK_STRUCTURE_TYPE_DEVICE_IMAGE_MEMORY_REQUIREMENTS}; - devImgMemReq.pCreateInfo = pImageCreateInfo; - VMA_ASSERT(pImageCreateInfo->tiling != VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT_COPY && (pImageCreateInfo->flags & VK_IMAGE_CREATE_DISJOINT_BIT_COPY) == 0 && - "Cannot use this VkImageCreateInfo with vmaFindMemoryTypeIndexForImageInfo as I don't know what to pass as VkDeviceImageMemoryRequirements::planeAspect."); +#if VMA_KHR_MAINTENANCE4 || VMA_VULKAN_VERSION >= 1003000 + if (funcs->vkGetDeviceImageMemoryRequirements) + { + // Can query straight from VkImageCreateInfo :) + VkDeviceImageMemoryRequirementsKHR devImgMemReq = { VK_STRUCTURE_TYPE_DEVICE_IMAGE_MEMORY_REQUIREMENTS_KHR }; + devImgMemReq.pCreateInfo = pImageCreateInfo; + VMA_ASSERT(pImageCreateInfo->tiling != VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT_COPY && (pImageCreateInfo->flags & VK_IMAGE_CREATE_DISJOINT_BIT_COPY) == 0 && + "Cannot use this VkImageCreateInfo with vmaFindMemoryTypeIndexForImageInfo as I don't know what to pass as VkDeviceImageMemoryRequirements::planeAspect."); - VkMemoryRequirements2 memReq = {VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2}; - (*funcs->vkGetDeviceImageMemoryRequirements)(hDev, &devImgMemReq, &memReq); + VkMemoryRequirements2 memReq = { VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2 }; + (*funcs->vkGetDeviceImageMemoryRequirements)(hDev, &devImgMemReq, &memReq); - res = allocator->FindMemoryTypeIndex( - memReq.memoryRequirements.memoryTypeBits, pAllocationCreateInfo, pImageCreateInfo->usage, pMemoryTypeIndex); - } - else -#endif // #if VMA_VULKAN_VERSION >= 1003000 - { - // Must create a dummy image to query :( - VkImage hImage = VK_NULL_HANDLE; - res = funcs->vkCreateImage( - hDev, pImageCreateInfo, allocator->GetAllocationCallbacks(), &hImage); - if(res == VK_SUCCESS) - { - VkMemoryRequirements memReq = {}; - funcs->vkGetImageMemoryRequirements(hDev, hImage, &memReq); + res = allocator->FindMemoryTypeIndex( + memReq.memoryRequirements.memoryTypeBits, pAllocationCreateInfo, + VmaBufferImageUsage(*pImageCreateInfo), pMemoryTypeIndex); + } else +#endif // VMA_KHR_MAINTENANCE4 || VMA_VULKAN_VERSION >= 1003000 + { + // Must create a dummy image to query :( + VkImage hImage = VK_NULL_HANDLE; + res = funcs->vkCreateImage( + hDev, pImageCreateInfo, allocator->GetAllocationCallbacks(), &hImage); + if (res == VK_SUCCESS) + { + VkMemoryRequirements memReq = {}; + funcs->vkGetImageMemoryRequirements(hDev, hImage, &memReq); - res = allocator->FindMemoryTypeIndex( - memReq.memoryTypeBits, pAllocationCreateInfo, pImageCreateInfo->usage, pMemoryTypeIndex); + res = allocator->FindMemoryTypeIndex( + memReq.memoryTypeBits, pAllocationCreateInfo, + VmaBufferImageUsage(*pImageCreateInfo), pMemoryTypeIndex); - funcs->vkDestroyImage( - hDev, hImage, allocator->GetAllocationCallbacks()); - } - } - return res; + funcs->vkDestroyImage( + hDev, hImage, allocator->GetAllocationCallbacks()); + } + } + return res; } VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreatePool( - VmaAllocator allocator, - const VmaPoolCreateInfo* pCreateInfo, - VmaPool* pPool) + VmaAllocator allocator, + const VmaPoolCreateInfo* pCreateInfo, + VmaPool* pPool) { - VMA_ASSERT(allocator && pCreateInfo && pPool); + VMA_ASSERT(allocator && pCreateInfo && pPool); - VMA_DEBUG_LOG("vmaCreatePool"); + VMA_DEBUG_LOG("vmaCreatePool"); - VMA_DEBUG_GLOBAL_MUTEX_LOCK + VMA_DEBUG_GLOBAL_MUTEX_LOCK - return allocator->CreatePool(pCreateInfo, pPool); + return allocator->CreatePool(pCreateInfo, pPool); } VMA_CALL_PRE void VMA_CALL_POST vmaDestroyPool( - VmaAllocator allocator, - VmaPool pool) + VmaAllocator allocator, + VmaPool pool) { - VMA_ASSERT(allocator); + VMA_ASSERT(allocator); - if(pool == VK_NULL_HANDLE) - { - return; - } + if (pool == VK_NULL_HANDLE) + { + return; + } - VMA_DEBUG_LOG("vmaDestroyPool"); + VMA_DEBUG_LOG("vmaDestroyPool"); - VMA_DEBUG_GLOBAL_MUTEX_LOCK + VMA_DEBUG_GLOBAL_MUTEX_LOCK - allocator->DestroyPool(pool); + allocator->DestroyPool(pool); } VMA_CALL_PRE void VMA_CALL_POST vmaGetPoolStatistics( - VmaAllocator allocator, - VmaPool pool, - VmaStatistics* pPoolStats) + VmaAllocator allocator, + VmaPool pool, + VmaStatistics* pPoolStats) { - VMA_ASSERT(allocator && pool && pPoolStats); + VMA_ASSERT(allocator && pool && pPoolStats); - VMA_DEBUG_GLOBAL_MUTEX_LOCK + VMA_DEBUG_GLOBAL_MUTEX_LOCK - allocator->GetPoolStatistics(pool, pPoolStats); + allocator->GetPoolStatistics(pool, pPoolStats); } VMA_CALL_PRE void VMA_CALL_POST vmaCalculatePoolStatistics( - VmaAllocator allocator, - VmaPool pool, - VmaDetailedStatistics* pPoolStats) + VmaAllocator allocator, + VmaPool pool, + VmaDetailedStatistics* pPoolStats) { - VMA_ASSERT(allocator && pool && pPoolStats); + VMA_ASSERT(allocator && pool && pPoolStats); - VMA_DEBUG_GLOBAL_MUTEX_LOCK + VMA_DEBUG_GLOBAL_MUTEX_LOCK - allocator->CalculatePoolStatistics(pool, pPoolStats); + allocator->CalculatePoolStatistics(pool, pPoolStats); } VMA_CALL_PRE VkResult VMA_CALL_POST vmaCheckPoolCorruption(VmaAllocator allocator, VmaPool pool) { - VMA_ASSERT(allocator && pool); + VMA_ASSERT(allocator && pool); - VMA_DEBUG_GLOBAL_MUTEX_LOCK + VMA_DEBUG_GLOBAL_MUTEX_LOCK - VMA_DEBUG_LOG("vmaCheckPoolCorruption"); + VMA_DEBUG_LOG("vmaCheckPoolCorruption"); - return allocator->CheckPoolCorruption(pool); + return allocator->CheckPoolCorruption(pool); } VMA_CALL_PRE void VMA_CALL_POST vmaGetPoolName( - VmaAllocator allocator, - VmaPool pool, - const char** ppName) + VmaAllocator allocator, + VmaPool pool, + const char** ppName) { - VMA_ASSERT(allocator && pool && ppName); + VMA_ASSERT(allocator && pool && ppName); - VMA_DEBUG_LOG("vmaGetPoolName"); + VMA_DEBUG_LOG("vmaGetPoolName"); - VMA_DEBUG_GLOBAL_MUTEX_LOCK + VMA_DEBUG_GLOBAL_MUTEX_LOCK - *ppName = pool->GetName(); + *ppName = pool->GetName(); } VMA_CALL_PRE void VMA_CALL_POST vmaSetPoolName( - VmaAllocator allocator, - VmaPool pool, - const char* pName) + VmaAllocator allocator, + VmaPool pool, + const char* pName) { - VMA_ASSERT(allocator && pool); + VMA_ASSERT(allocator && pool); - VMA_DEBUG_LOG("vmaSetPoolName"); + VMA_DEBUG_LOG("vmaSetPoolName"); - VMA_DEBUG_GLOBAL_MUTEX_LOCK + VMA_DEBUG_GLOBAL_MUTEX_LOCK - pool->SetName(pName); + pool->SetName(pName); } VMA_CALL_PRE VkResult VMA_CALL_POST vmaAllocateMemory( - VmaAllocator allocator, - const VkMemoryRequirements* pVkMemoryRequirements, - const VmaAllocationCreateInfo* pCreateInfo, - VmaAllocation* pAllocation, - VmaAllocationInfo* pAllocationInfo) + VmaAllocator allocator, + const VkMemoryRequirements* pVkMemoryRequirements, + const VmaAllocationCreateInfo* pCreateInfo, + VmaAllocation* pAllocation, + VmaAllocationInfo* pAllocationInfo) { - VMA_ASSERT(allocator && pVkMemoryRequirements && pCreateInfo && pAllocation); + VMA_ASSERT(allocator && pVkMemoryRequirements && pCreateInfo && pAllocation); - VMA_DEBUG_LOG("vmaAllocateMemory"); + VMA_DEBUG_LOG("vmaAllocateMemory"); - VMA_DEBUG_GLOBAL_MUTEX_LOCK + VMA_DEBUG_GLOBAL_MUTEX_LOCK - VkResult result = allocator->AllocateMemory( - *pVkMemoryRequirements, - false, // requiresDedicatedAllocation - false, // prefersDedicatedAllocation - VK_NULL_HANDLE, // dedicatedBuffer - VK_NULL_HANDLE, // dedicatedImage - UINT32_MAX, // dedicatedBufferImageUsage - *pCreateInfo, - VMA_SUBALLOCATION_TYPE_UNKNOWN, - 1, // allocationCount - pAllocation); + VkResult result = allocator->AllocateMemory( + *pVkMemoryRequirements, + false, // requiresDedicatedAllocation + false, // prefersDedicatedAllocation + VK_NULL_HANDLE, // dedicatedBuffer + VK_NULL_HANDLE, // dedicatedImage + VmaBufferImageUsage::UNKNOWN, // dedicatedBufferImageUsage + *pCreateInfo, + VMA_SUBALLOCATION_TYPE_UNKNOWN, + 1, // allocationCount + pAllocation); - if(pAllocationInfo != VMA_NULL && result == VK_SUCCESS) - { - allocator->GetAllocationInfo(*pAllocation, pAllocationInfo); - } + if (pAllocationInfo != VMA_NULL && result == VK_SUCCESS) + { + allocator->GetAllocationInfo(*pAllocation, pAllocationInfo); + } - return result; + return result; } VMA_CALL_PRE VkResult VMA_CALL_POST vmaAllocateMemoryPages( - VmaAllocator allocator, - const VkMemoryRequirements* pVkMemoryRequirements, - const VmaAllocationCreateInfo* pCreateInfo, - size_t allocationCount, - VmaAllocation* pAllocations, - VmaAllocationInfo* pAllocationInfo) + VmaAllocator allocator, + const VkMemoryRequirements* pVkMemoryRequirements, + const VmaAllocationCreateInfo* pCreateInfo, + size_t allocationCount, + VmaAllocation* pAllocations, + VmaAllocationInfo* pAllocationInfo) { - if(allocationCount == 0) - { - return VK_SUCCESS; - } + if (allocationCount == 0) + { + return VK_SUCCESS; + } - VMA_ASSERT(allocator && pVkMemoryRequirements && pCreateInfo && pAllocations); + VMA_ASSERT(allocator && pVkMemoryRequirements && pCreateInfo && pAllocations); - VMA_DEBUG_LOG("vmaAllocateMemoryPages"); + VMA_DEBUG_LOG("vmaAllocateMemoryPages"); - VMA_DEBUG_GLOBAL_MUTEX_LOCK + VMA_DEBUG_GLOBAL_MUTEX_LOCK - VkResult result = allocator->AllocateMemory( - *pVkMemoryRequirements, - false, // requiresDedicatedAllocation - false, // prefersDedicatedAllocation - VK_NULL_HANDLE, // dedicatedBuffer - VK_NULL_HANDLE, // dedicatedImage - UINT32_MAX, // dedicatedBufferImageUsage - *pCreateInfo, - VMA_SUBALLOCATION_TYPE_UNKNOWN, - allocationCount, - pAllocations); + VkResult result = allocator->AllocateMemory( + *pVkMemoryRequirements, + false, // requiresDedicatedAllocation + false, // prefersDedicatedAllocation + VK_NULL_HANDLE, // dedicatedBuffer + VK_NULL_HANDLE, // dedicatedImage + VmaBufferImageUsage::UNKNOWN, // dedicatedBufferImageUsage + *pCreateInfo, + VMA_SUBALLOCATION_TYPE_UNKNOWN, + allocationCount, + pAllocations); - if(pAllocationInfo != VMA_NULL && result == VK_SUCCESS) - { - for(size_t i = 0; i < allocationCount; ++i) - { - allocator->GetAllocationInfo(pAllocations[i], pAllocationInfo + i); - } - } + if (pAllocationInfo != VMA_NULL && result == VK_SUCCESS) + { + for (size_t i = 0; i < allocationCount; ++i) + { + allocator->GetAllocationInfo(pAllocations[i], pAllocationInfo + i); + } + } - return result; + return result; } VMA_CALL_PRE VkResult VMA_CALL_POST vmaAllocateMemoryForBuffer( - VmaAllocator allocator, - VkBuffer buffer, - const VmaAllocationCreateInfo* pCreateInfo, - VmaAllocation* pAllocation, - VmaAllocationInfo* pAllocationInfo) + VmaAllocator allocator, + VkBuffer buffer, + const VmaAllocationCreateInfo* pCreateInfo, + VmaAllocation* pAllocation, + VmaAllocationInfo* pAllocationInfo) { - VMA_ASSERT(allocator && buffer != VK_NULL_HANDLE && pCreateInfo && pAllocation); + VMA_ASSERT(allocator && buffer != VK_NULL_HANDLE && pCreateInfo && pAllocation); - VMA_DEBUG_LOG("vmaAllocateMemoryForBuffer"); + VMA_DEBUG_LOG("vmaAllocateMemoryForBuffer"); - VMA_DEBUG_GLOBAL_MUTEX_LOCK + VMA_DEBUG_GLOBAL_MUTEX_LOCK - VkMemoryRequirements vkMemReq = {}; - bool requiresDedicatedAllocation = false; - bool prefersDedicatedAllocation = false; - allocator->GetBufferMemoryRequirements(buffer, vkMemReq, - requiresDedicatedAllocation, - prefersDedicatedAllocation); + VkMemoryRequirements vkMemReq = {}; + bool requiresDedicatedAllocation = false; + bool prefersDedicatedAllocation = false; + allocator->GetBufferMemoryRequirements(buffer, vkMemReq, + requiresDedicatedAllocation, + prefersDedicatedAllocation); - VkResult result = allocator->AllocateMemory( - vkMemReq, - requiresDedicatedAllocation, - prefersDedicatedAllocation, - buffer, // dedicatedBuffer - VK_NULL_HANDLE, // dedicatedImage - UINT32_MAX, // dedicatedBufferImageUsage - *pCreateInfo, - VMA_SUBALLOCATION_TYPE_BUFFER, - 1, // allocationCount - pAllocation); + VkResult result = allocator->AllocateMemory( + vkMemReq, + requiresDedicatedAllocation, + prefersDedicatedAllocation, + buffer, // dedicatedBuffer + VK_NULL_HANDLE, // dedicatedImage + VmaBufferImageUsage::UNKNOWN, // dedicatedBufferImageUsage + *pCreateInfo, + VMA_SUBALLOCATION_TYPE_BUFFER, + 1, // allocationCount + pAllocation); - if(pAllocationInfo && result == VK_SUCCESS) - { - allocator->GetAllocationInfo(*pAllocation, pAllocationInfo); - } + if (pAllocationInfo && result == VK_SUCCESS) + { + allocator->GetAllocationInfo(*pAllocation, pAllocationInfo); + } - return result; + return result; } VMA_CALL_PRE VkResult VMA_CALL_POST vmaAllocateMemoryForImage( - VmaAllocator allocator, - VkImage image, - const VmaAllocationCreateInfo* pCreateInfo, - VmaAllocation* pAllocation, - VmaAllocationInfo* pAllocationInfo) + VmaAllocator allocator, + VkImage image, + const VmaAllocationCreateInfo* pCreateInfo, + VmaAllocation* pAllocation, + VmaAllocationInfo* pAllocationInfo) { - VMA_ASSERT(allocator && image != VK_NULL_HANDLE && pCreateInfo && pAllocation); + VMA_ASSERT(allocator && image != VK_NULL_HANDLE && pCreateInfo && pAllocation); - VMA_DEBUG_LOG("vmaAllocateMemoryForImage"); + VMA_DEBUG_LOG("vmaAllocateMemoryForImage"); - VMA_DEBUG_GLOBAL_MUTEX_LOCK + VMA_DEBUG_GLOBAL_MUTEX_LOCK - VkMemoryRequirements vkMemReq = {}; - bool requiresDedicatedAllocation = false; - bool prefersDedicatedAllocation = false; - allocator->GetImageMemoryRequirements(image, vkMemReq, - requiresDedicatedAllocation, prefersDedicatedAllocation); + VkMemoryRequirements vkMemReq = {}; + bool requiresDedicatedAllocation = false; + bool prefersDedicatedAllocation = false; + allocator->GetImageMemoryRequirements(image, vkMemReq, + requiresDedicatedAllocation, prefersDedicatedAllocation); - VkResult result = allocator->AllocateMemory( - vkMemReq, - requiresDedicatedAllocation, - prefersDedicatedAllocation, - VK_NULL_HANDLE, // dedicatedBuffer - image, // dedicatedImage - UINT32_MAX, // dedicatedBufferImageUsage - *pCreateInfo, - VMA_SUBALLOCATION_TYPE_IMAGE_UNKNOWN, - 1, // allocationCount - pAllocation); + VkResult result = allocator->AllocateMemory( + vkMemReq, + requiresDedicatedAllocation, + prefersDedicatedAllocation, + VK_NULL_HANDLE, // dedicatedBuffer + image, // dedicatedImage + VmaBufferImageUsage::UNKNOWN, // dedicatedBufferImageUsage + *pCreateInfo, + VMA_SUBALLOCATION_TYPE_IMAGE_UNKNOWN, + 1, // allocationCount + pAllocation); - if(pAllocationInfo && result == VK_SUCCESS) - { - allocator->GetAllocationInfo(*pAllocation, pAllocationInfo); - } + if (pAllocationInfo && result == VK_SUCCESS) + { + allocator->GetAllocationInfo(*pAllocation, pAllocationInfo); + } - return result; + return result; } VMA_CALL_PRE void VMA_CALL_POST vmaFreeMemory( - VmaAllocator allocator, - VmaAllocation allocation) + VmaAllocator allocator, + VmaAllocation allocation) { - VMA_ASSERT(allocator); + VMA_ASSERT(allocator); - if(allocation == VK_NULL_HANDLE) - { - return; - } + if (allocation == VK_NULL_HANDLE) + { + return; + } - VMA_DEBUG_LOG("vmaFreeMemory"); + VMA_DEBUG_LOG("vmaFreeMemory"); - VMA_DEBUG_GLOBAL_MUTEX_LOCK + VMA_DEBUG_GLOBAL_MUTEX_LOCK - allocator->FreeMemory( - 1, // allocationCount - &allocation); + allocator->FreeMemory( + 1, // allocationCount + &allocation); } VMA_CALL_PRE void VMA_CALL_POST vmaFreeMemoryPages( - VmaAllocator allocator, - size_t allocationCount, - const VmaAllocation* pAllocations) + VmaAllocator allocator, + size_t allocationCount, + const VmaAllocation* pAllocations) { - if(allocationCount == 0) - { - return; - } + if (allocationCount == 0) + { + return; + } - VMA_ASSERT(allocator); + VMA_ASSERT(allocator); - VMA_DEBUG_LOG("vmaFreeMemoryPages"); + VMA_DEBUG_LOG("vmaFreeMemoryPages"); - VMA_DEBUG_GLOBAL_MUTEX_LOCK + VMA_DEBUG_GLOBAL_MUTEX_LOCK - allocator->FreeMemory(allocationCount, pAllocations); + allocator->FreeMemory(allocationCount, pAllocations); } VMA_CALL_PRE void VMA_CALL_POST vmaGetAllocationInfo( - VmaAllocator allocator, - VmaAllocation allocation, - VmaAllocationInfo* pAllocationInfo) + VmaAllocator allocator, + VmaAllocation allocation, + VmaAllocationInfo* pAllocationInfo) { - VMA_ASSERT(allocator && allocation && pAllocationInfo); + VMA_ASSERT(allocator && allocation && pAllocationInfo); - VMA_DEBUG_GLOBAL_MUTEX_LOCK + VMA_DEBUG_GLOBAL_MUTEX_LOCK - allocator->GetAllocationInfo(allocation, pAllocationInfo); + allocator->GetAllocationInfo(allocation, pAllocationInfo); +} + +VMA_CALL_PRE void VMA_CALL_POST vmaGetAllocationInfo2( + VmaAllocator allocator, + VmaAllocation allocation, + VmaAllocationInfo2* pAllocationInfo) +{ + VMA_ASSERT(allocator && allocation && pAllocationInfo); + + VMA_DEBUG_GLOBAL_MUTEX_LOCK + + allocator->GetAllocationInfo2(allocation, pAllocationInfo); } VMA_CALL_PRE void VMA_CALL_POST vmaSetAllocationUserData( - VmaAllocator allocator, - VmaAllocation allocation, - void* pUserData) + VmaAllocator allocator, + VmaAllocation allocation, + void* pUserData) { - VMA_ASSERT(allocator && allocation); + VMA_ASSERT(allocator && allocation); - VMA_DEBUG_GLOBAL_MUTEX_LOCK + VMA_DEBUG_GLOBAL_MUTEX_LOCK - allocation->SetUserData(allocator, pUserData); + allocation->SetUserData(allocator, pUserData); } VMA_CALL_PRE void VMA_CALL_POST vmaSetAllocationName( - VmaAllocator VMA_NOT_NULL allocator, - VmaAllocation VMA_NOT_NULL allocation, - const char* VMA_NULLABLE pName) + VmaAllocator VMA_NOT_NULL allocator, + VmaAllocation VMA_NOT_NULL allocation, + const char* VMA_NULLABLE pName) { - allocation->SetName(allocator, pName); + allocation->SetName(allocator, pName); } VMA_CALL_PRE void VMA_CALL_POST vmaGetAllocationMemoryProperties( - VmaAllocator VMA_NOT_NULL allocator, - VmaAllocation VMA_NOT_NULL allocation, - VkMemoryPropertyFlags* VMA_NOT_NULL pFlags) + VmaAllocator VMA_NOT_NULL allocator, + VmaAllocation VMA_NOT_NULL allocation, + VkMemoryPropertyFlags* VMA_NOT_NULL pFlags) { - VMA_ASSERT(allocator && allocation && pFlags); - const uint32_t memTypeIndex = allocation->GetMemoryTypeIndex(); - *pFlags = allocator->m_MemProps.memoryTypes[memTypeIndex].propertyFlags; + VMA_ASSERT(allocator && allocation && pFlags); + const uint32_t memTypeIndex = allocation->GetMemoryTypeIndex(); + *pFlags = allocator->m_MemProps.memoryTypes[memTypeIndex].propertyFlags; } VMA_CALL_PRE VkResult VMA_CALL_POST vmaMapMemory( - VmaAllocator allocator, - VmaAllocation allocation, - void** ppData) + VmaAllocator allocator, + VmaAllocation allocation, + void** ppData) { - VMA_ASSERT(allocator && allocation && ppData); + VMA_ASSERT(allocator && allocation && ppData); - VMA_DEBUG_GLOBAL_MUTEX_LOCK + VMA_DEBUG_GLOBAL_MUTEX_LOCK - return allocator->Map(allocation, ppData); + return allocator->Map(allocation, ppData); } VMA_CALL_PRE void VMA_CALL_POST vmaUnmapMemory( - VmaAllocator allocator, - VmaAllocation allocation) + VmaAllocator allocator, + VmaAllocation allocation) { - VMA_ASSERT(allocator && allocation); + VMA_ASSERT(allocator && allocation); - VMA_DEBUG_GLOBAL_MUTEX_LOCK + VMA_DEBUG_GLOBAL_MUTEX_LOCK - allocator->Unmap(allocation); + allocator->Unmap(allocation); } VMA_CALL_PRE VkResult VMA_CALL_POST vmaFlushAllocation( - VmaAllocator allocator, - VmaAllocation allocation, - VkDeviceSize offset, - VkDeviceSize size) + VmaAllocator allocator, + VmaAllocation allocation, + VkDeviceSize offset, + VkDeviceSize size) { - VMA_ASSERT(allocator && allocation); + VMA_ASSERT(allocator && allocation); - VMA_DEBUG_LOG("vmaFlushAllocation"); + VMA_DEBUG_LOG("vmaFlushAllocation"); - VMA_DEBUG_GLOBAL_MUTEX_LOCK + VMA_DEBUG_GLOBAL_MUTEX_LOCK - const VkResult res = allocator->FlushOrInvalidateAllocation(allocation, offset, size, VMA_CACHE_FLUSH); - - return res; + return allocator->FlushOrInvalidateAllocation(allocation, offset, size, VMA_CACHE_FLUSH); } VMA_CALL_PRE VkResult VMA_CALL_POST vmaInvalidateAllocation( - VmaAllocator allocator, - VmaAllocation allocation, - VkDeviceSize offset, - VkDeviceSize size) + VmaAllocator allocator, + VmaAllocation allocation, + VkDeviceSize offset, + VkDeviceSize size) { - VMA_ASSERT(allocator && allocation); + VMA_ASSERT(allocator && allocation); - VMA_DEBUG_LOG("vmaInvalidateAllocation"); + VMA_DEBUG_LOG("vmaInvalidateAllocation"); - VMA_DEBUG_GLOBAL_MUTEX_LOCK + VMA_DEBUG_GLOBAL_MUTEX_LOCK - const VkResult res = allocator->FlushOrInvalidateAllocation(allocation, offset, size, VMA_CACHE_INVALIDATE); - - return res; + return allocator->FlushOrInvalidateAllocation(allocation, offset, size, VMA_CACHE_INVALIDATE); } VMA_CALL_PRE VkResult VMA_CALL_POST vmaFlushAllocations( - VmaAllocator allocator, - uint32_t allocationCount, - const VmaAllocation* allocations, - const VkDeviceSize* offsets, - const VkDeviceSize* sizes) + VmaAllocator allocator, + uint32_t allocationCount, + const VmaAllocation* allocations, + const VkDeviceSize* offsets, + const VkDeviceSize* sizes) { - VMA_ASSERT(allocator); + VMA_ASSERT(allocator); - if(allocationCount == 0) - { - return VK_SUCCESS; - } + if (allocationCount == 0) + { + return VK_SUCCESS; + } - VMA_ASSERT(allocations); + VMA_ASSERT(allocations); - VMA_DEBUG_LOG("vmaFlushAllocations"); + VMA_DEBUG_LOG("vmaFlushAllocations"); - VMA_DEBUG_GLOBAL_MUTEX_LOCK + VMA_DEBUG_GLOBAL_MUTEX_LOCK - const VkResult res = allocator->FlushOrInvalidateAllocations(allocationCount, allocations, offsets, sizes, VMA_CACHE_FLUSH); - - return res; + return allocator->FlushOrInvalidateAllocations(allocationCount, allocations, offsets, sizes, VMA_CACHE_FLUSH); } VMA_CALL_PRE VkResult VMA_CALL_POST vmaInvalidateAllocations( - VmaAllocator allocator, - uint32_t allocationCount, - const VmaAllocation* allocations, - const VkDeviceSize* offsets, - const VkDeviceSize* sizes) + VmaAllocator allocator, + uint32_t allocationCount, + const VmaAllocation* allocations, + const VkDeviceSize* offsets, + const VkDeviceSize* sizes) { - VMA_ASSERT(allocator); + VMA_ASSERT(allocator); - if(allocationCount == 0) - { - return VK_SUCCESS; - } + if (allocationCount == 0) + { + return VK_SUCCESS; + } - VMA_ASSERT(allocations); + VMA_ASSERT(allocations); - VMA_DEBUG_LOG("vmaInvalidateAllocations"); + VMA_DEBUG_LOG("vmaInvalidateAllocations"); - VMA_DEBUG_GLOBAL_MUTEX_LOCK + VMA_DEBUG_GLOBAL_MUTEX_LOCK - const VkResult res = allocator->FlushOrInvalidateAllocations(allocationCount, allocations, offsets, sizes, VMA_CACHE_INVALIDATE); + return allocator->FlushOrInvalidateAllocations(allocationCount, allocations, offsets, sizes, VMA_CACHE_INVALIDATE); +} - return res; +VMA_CALL_PRE VkResult VMA_CALL_POST vmaCopyMemoryToAllocation( + VmaAllocator allocator, + const void* pSrcHostPointer, + VmaAllocation dstAllocation, + VkDeviceSize dstAllocationLocalOffset, + VkDeviceSize size) +{ + VMA_ASSERT(allocator && pSrcHostPointer && dstAllocation); + + if (size == 0) + { + return VK_SUCCESS; + } + + VMA_DEBUG_LOG("vmaCopyMemoryToAllocation"); + + VMA_DEBUG_GLOBAL_MUTEX_LOCK + + return allocator->CopyMemoryToAllocation(pSrcHostPointer, dstAllocation, dstAllocationLocalOffset, size); +} + +VMA_CALL_PRE VkResult VMA_CALL_POST vmaCopyAllocationToMemory( + VmaAllocator allocator, + VmaAllocation srcAllocation, + VkDeviceSize srcAllocationLocalOffset, + void* pDstHostPointer, + VkDeviceSize size) +{ + VMA_ASSERT(allocator && srcAllocation && pDstHostPointer); + + if (size == 0) + { + return VK_SUCCESS; + } + + VMA_DEBUG_LOG("vmaCopyAllocationToMemory"); + + VMA_DEBUG_GLOBAL_MUTEX_LOCK + + return allocator->CopyAllocationToMemory(srcAllocation, srcAllocationLocalOffset, pDstHostPointer, size); } VMA_CALL_PRE VkResult VMA_CALL_POST vmaCheckCorruption( - VmaAllocator allocator, - uint32_t memoryTypeBits) + VmaAllocator allocator, + uint32_t memoryTypeBits) { - VMA_ASSERT(allocator); + VMA_ASSERT(allocator); - VMA_DEBUG_LOG("vmaCheckCorruption"); + VMA_DEBUG_LOG("vmaCheckCorruption"); - VMA_DEBUG_GLOBAL_MUTEX_LOCK + VMA_DEBUG_GLOBAL_MUTEX_LOCK - return allocator->CheckCorruption(memoryTypeBits); + return allocator->CheckCorruption(memoryTypeBits); } VMA_CALL_PRE VkResult VMA_CALL_POST vmaBeginDefragmentation( - VmaAllocator allocator, - const VmaDefragmentationInfo* pInfo, - VmaDefragmentationContext* pContext) + VmaAllocator allocator, + const VmaDefragmentationInfo* pInfo, + VmaDefragmentationContext* pContext) { - VMA_ASSERT(allocator && pInfo && pContext); + VMA_ASSERT(allocator && pInfo && pContext); - VMA_DEBUG_LOG("vmaBeginDefragmentation"); + VMA_DEBUG_LOG("vmaBeginDefragmentation"); - if (pInfo->pool != VMA_NULL) - { - // Check if run on supported algorithms - if (pInfo->pool->m_BlockVector.GetAlgorithm() & VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT) - return VK_ERROR_FEATURE_NOT_PRESENT; - } + if (pInfo->pool != VMA_NULL) + { + // Check if run on supported algorithms + if (pInfo->pool->m_BlockVector.GetAlgorithm() & VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT) + return VK_ERROR_FEATURE_NOT_PRESENT; + } - VMA_DEBUG_GLOBAL_MUTEX_LOCK + VMA_DEBUG_GLOBAL_MUTEX_LOCK - *pContext = vma_new(allocator, VmaDefragmentationContext_T)(allocator, *pInfo); - return VK_SUCCESS; + *pContext = vma_new(allocator, VmaDefragmentationContext_T)(allocator, *pInfo); + return VK_SUCCESS; } VMA_CALL_PRE void VMA_CALL_POST vmaEndDefragmentation( - VmaAllocator allocator, - VmaDefragmentationContext context, - VmaDefragmentationStats* pStats) + VmaAllocator allocator, + VmaDefragmentationContext context, + VmaDefragmentationStats* pStats) { - VMA_ASSERT(allocator && context); + VMA_ASSERT(allocator && context); - VMA_DEBUG_LOG("vmaEndDefragmentation"); + VMA_DEBUG_LOG("vmaEndDefragmentation"); - VMA_DEBUG_GLOBAL_MUTEX_LOCK + VMA_DEBUG_GLOBAL_MUTEX_LOCK - if (pStats) - context->GetStats(*pStats); - vma_delete(allocator, context); + if (pStats) + context->GetStats(*pStats); + vma_delete(allocator, context); } VMA_CALL_PRE VkResult VMA_CALL_POST vmaBeginDefragmentationPass( - VmaAllocator VMA_NOT_NULL allocator, - VmaDefragmentationContext VMA_NOT_NULL context, - VmaDefragmentationPassMoveInfo* VMA_NOT_NULL pPassInfo) + VmaAllocator VMA_NOT_NULL allocator, + VmaDefragmentationContext VMA_NOT_NULL context, + VmaDefragmentationPassMoveInfo* VMA_NOT_NULL pPassInfo) { - VMA_ASSERT(context && pPassInfo); + VMA_ASSERT(context && pPassInfo); - VMA_DEBUG_LOG("vmaBeginDefragmentationPass"); + VMA_DEBUG_LOG("vmaBeginDefragmentationPass"); - VMA_DEBUG_GLOBAL_MUTEX_LOCK + VMA_DEBUG_GLOBAL_MUTEX_LOCK - return context->DefragmentPassBegin(*pPassInfo); + return context->DefragmentPassBegin(*pPassInfo); } VMA_CALL_PRE VkResult VMA_CALL_POST vmaEndDefragmentationPass( - VmaAllocator VMA_NOT_NULL allocator, - VmaDefragmentationContext VMA_NOT_NULL context, - VmaDefragmentationPassMoveInfo* VMA_NOT_NULL pPassInfo) + VmaAllocator VMA_NOT_NULL allocator, + VmaDefragmentationContext VMA_NOT_NULL context, + VmaDefragmentationPassMoveInfo* VMA_NOT_NULL pPassInfo) { - VMA_ASSERT(context && pPassInfo); + VMA_ASSERT(context && pPassInfo); - VMA_DEBUG_LOG("vmaEndDefragmentationPass"); + VMA_DEBUG_LOG("vmaEndDefragmentationPass"); - VMA_DEBUG_GLOBAL_MUTEX_LOCK + VMA_DEBUG_GLOBAL_MUTEX_LOCK - return context->DefragmentPassEnd(*pPassInfo); + return context->DefragmentPassEnd(*pPassInfo); } VMA_CALL_PRE VkResult VMA_CALL_POST vmaBindBufferMemory( - VmaAllocator allocator, - VmaAllocation allocation, - VkBuffer buffer) + VmaAllocator allocator, + VmaAllocation allocation, + VkBuffer buffer) { - VMA_ASSERT(allocator && allocation && buffer); + VMA_ASSERT(allocator && allocation && buffer); - VMA_DEBUG_LOG("vmaBindBufferMemory"); + VMA_DEBUG_LOG("vmaBindBufferMemory"); - VMA_DEBUG_GLOBAL_MUTEX_LOCK + VMA_DEBUG_GLOBAL_MUTEX_LOCK - return allocator->BindBufferMemory(allocation, 0, buffer, VMA_NULL); + return allocator->BindBufferMemory(allocation, 0, buffer, VMA_NULL); } VMA_CALL_PRE VkResult VMA_CALL_POST vmaBindBufferMemory2( - VmaAllocator allocator, - VmaAllocation allocation, - VkDeviceSize allocationLocalOffset, - VkBuffer buffer, - const void* pNext) + VmaAllocator allocator, + VmaAllocation allocation, + VkDeviceSize allocationLocalOffset, + VkBuffer buffer, + const void* pNext) { - VMA_ASSERT(allocator && allocation && buffer); + VMA_ASSERT(allocator && allocation && buffer); - VMA_DEBUG_LOG("vmaBindBufferMemory2"); + VMA_DEBUG_LOG("vmaBindBufferMemory2"); - VMA_DEBUG_GLOBAL_MUTEX_LOCK + VMA_DEBUG_GLOBAL_MUTEX_LOCK - return allocator->BindBufferMemory(allocation, allocationLocalOffset, buffer, pNext); + return allocator->BindBufferMemory(allocation, allocationLocalOffset, buffer, pNext); } VMA_CALL_PRE VkResult VMA_CALL_POST vmaBindImageMemory( - VmaAllocator allocator, - VmaAllocation allocation, - VkImage image) + VmaAllocator allocator, + VmaAllocation allocation, + VkImage image) { - VMA_ASSERT(allocator && allocation && image); + VMA_ASSERT(allocator && allocation && image); - VMA_DEBUG_LOG("vmaBindImageMemory"); + VMA_DEBUG_LOG("vmaBindImageMemory"); - VMA_DEBUG_GLOBAL_MUTEX_LOCK + VMA_DEBUG_GLOBAL_MUTEX_LOCK - return allocator->BindImageMemory(allocation, 0, image, VMA_NULL); + return allocator->BindImageMemory(allocation, 0, image, VMA_NULL); } VMA_CALL_PRE VkResult VMA_CALL_POST vmaBindImageMemory2( - VmaAllocator allocator, - VmaAllocation allocation, - VkDeviceSize allocationLocalOffset, - VkImage image, - const void* pNext) + VmaAllocator allocator, + VmaAllocation allocation, + VkDeviceSize allocationLocalOffset, + VkImage image, + const void* pNext) { - VMA_ASSERT(allocator && allocation && image); + VMA_ASSERT(allocator && allocation && image); - VMA_DEBUG_LOG("vmaBindImageMemory2"); + VMA_DEBUG_LOG("vmaBindImageMemory2"); - VMA_DEBUG_GLOBAL_MUTEX_LOCK + VMA_DEBUG_GLOBAL_MUTEX_LOCK - return allocator->BindImageMemory(allocation, allocationLocalOffset, image, pNext); + return allocator->BindImageMemory(allocation, allocationLocalOffset, image, pNext); } VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateBuffer( - VmaAllocator allocator, - const VkBufferCreateInfo* pBufferCreateInfo, - const VmaAllocationCreateInfo* pAllocationCreateInfo, - VkBuffer* pBuffer, - VmaAllocation* pAllocation, - VmaAllocationInfo* pAllocationInfo) + VmaAllocator allocator, + const VkBufferCreateInfo* pBufferCreateInfo, + const VmaAllocationCreateInfo* pAllocationCreateInfo, + VkBuffer* pBuffer, + VmaAllocation* pAllocation, + VmaAllocationInfo* pAllocationInfo) { - VMA_ASSERT(allocator && pBufferCreateInfo && pAllocationCreateInfo && pBuffer && pAllocation); + VMA_ASSERT(allocator && pBufferCreateInfo && pAllocationCreateInfo && pBuffer && pAllocation); - if(pBufferCreateInfo->size == 0) - { - return VK_ERROR_INITIALIZATION_FAILED; - } - if((pBufferCreateInfo->usage & VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT_COPY) != 0 && - !allocator->m_UseKhrBufferDeviceAddress) - { - VMA_ASSERT(0 && "Creating a buffer with VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT is not valid if VMA_ALLOCATOR_CREATE_BUFFER_DEVICE_ADDRESS_BIT was not used."); - return VK_ERROR_INITIALIZATION_FAILED; - } + if (pBufferCreateInfo->size == 0) + { + return VK_ERROR_INITIALIZATION_FAILED; + } + if ((pBufferCreateInfo->usage & VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT_COPY) != 0 && + !allocator->m_UseKhrBufferDeviceAddress) + { + VMA_ASSERT(0 && "Creating a buffer with VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT is not valid if VMA_ALLOCATOR_CREATE_BUFFER_DEVICE_ADDRESS_BIT was not used."); + return VK_ERROR_INITIALIZATION_FAILED; + } - VMA_DEBUG_LOG("vmaCreateBuffer"); + VMA_DEBUG_LOG("vmaCreateBuffer"); - VMA_DEBUG_GLOBAL_MUTEX_LOCK + VMA_DEBUG_GLOBAL_MUTEX_LOCK - *pBuffer = VK_NULL_HANDLE; - *pAllocation = VK_NULL_HANDLE; + *pBuffer = VK_NULL_HANDLE; + *pAllocation = VK_NULL_HANDLE; - // 1. Create VkBuffer. - VkResult res = (*allocator->GetVulkanFunctions().vkCreateBuffer)( - allocator->m_hDevice, - pBufferCreateInfo, - allocator->GetAllocationCallbacks(), - pBuffer); - if(res >= 0) - { - // 2. vkGetBufferMemoryRequirements. - VkMemoryRequirements vkMemReq = {}; - bool requiresDedicatedAllocation = false; - bool prefersDedicatedAllocation = false; - allocator->GetBufferMemoryRequirements(*pBuffer, vkMemReq, - requiresDedicatedAllocation, prefersDedicatedAllocation); + // 1. Create VkBuffer. + VkResult res = (*allocator->GetVulkanFunctions().vkCreateBuffer)( + allocator->m_hDevice, + pBufferCreateInfo, + allocator->GetAllocationCallbacks(), + pBuffer); + if (res >= 0) + { + // 2. vkGetBufferMemoryRequirements. + VkMemoryRequirements vkMemReq = {}; + bool requiresDedicatedAllocation = false; + bool prefersDedicatedAllocation = false; + allocator->GetBufferMemoryRequirements(*pBuffer, vkMemReq, + requiresDedicatedAllocation, prefersDedicatedAllocation); - // 3. Allocate memory using allocator. - res = allocator->AllocateMemory( - vkMemReq, - requiresDedicatedAllocation, - prefersDedicatedAllocation, - *pBuffer, // dedicatedBuffer - VK_NULL_HANDLE, // dedicatedImage - pBufferCreateInfo->usage, // dedicatedBufferImageUsage - *pAllocationCreateInfo, - VMA_SUBALLOCATION_TYPE_BUFFER, - 1, // allocationCount - pAllocation); + // 3. Allocate memory using allocator. + res = allocator->AllocateMemory( + vkMemReq, + requiresDedicatedAllocation, + prefersDedicatedAllocation, + *pBuffer, // dedicatedBuffer + VK_NULL_HANDLE, // dedicatedImage + VmaBufferImageUsage(*pBufferCreateInfo, allocator->m_UseKhrMaintenance5), // dedicatedBufferImageUsage + *pAllocationCreateInfo, + VMA_SUBALLOCATION_TYPE_BUFFER, + 1, // allocationCount + pAllocation); - if(res >= 0) - { - // 3. Bind buffer with memory. - if((pAllocationCreateInfo->flags & VMA_ALLOCATION_CREATE_DONT_BIND_BIT) == 0) - { - res = allocator->BindBufferMemory(*pAllocation, 0, *pBuffer, VMA_NULL); - } - if(res >= 0) - { - // All steps succeeded. - #if VMA_STATS_STRING_ENABLED - (*pAllocation)->InitBufferImageUsage(pBufferCreateInfo->usage); - #endif - if(pAllocationInfo != VMA_NULL) - { - allocator->GetAllocationInfo(*pAllocation, pAllocationInfo); - } + if (res >= 0) + { + // 3. Bind buffer with memory. + if ((pAllocationCreateInfo->flags & VMA_ALLOCATION_CREATE_DONT_BIND_BIT) == 0) + { + res = allocator->BindBufferMemory(*pAllocation, 0, *pBuffer, VMA_NULL); + } + if (res >= 0) + { + // All steps succeeded. +#if VMA_STATS_STRING_ENABLED + (*pAllocation)->InitBufferUsage(*pBufferCreateInfo, allocator->m_UseKhrMaintenance5); +#endif + if (pAllocationInfo != VMA_NULL) + { + allocator->GetAllocationInfo(*pAllocation, pAllocationInfo); + } - return VK_SUCCESS; - } - allocator->FreeMemory( - 1, // allocationCount - pAllocation); - *pAllocation = VK_NULL_HANDLE; - (*allocator->GetVulkanFunctions().vkDestroyBuffer)(allocator->m_hDevice, *pBuffer, allocator->GetAllocationCallbacks()); - *pBuffer = VK_NULL_HANDLE; - return res; - } - (*allocator->GetVulkanFunctions().vkDestroyBuffer)(allocator->m_hDevice, *pBuffer, allocator->GetAllocationCallbacks()); - *pBuffer = VK_NULL_HANDLE; - return res; - } - return res; + return VK_SUCCESS; + } + allocator->FreeMemory( + 1, // allocationCount + pAllocation); + *pAllocation = VK_NULL_HANDLE; + (*allocator->GetVulkanFunctions().vkDestroyBuffer)(allocator->m_hDevice, *pBuffer, allocator->GetAllocationCallbacks()); + *pBuffer = VK_NULL_HANDLE; + return res; + } + (*allocator->GetVulkanFunctions().vkDestroyBuffer)(allocator->m_hDevice, *pBuffer, allocator->GetAllocationCallbacks()); + *pBuffer = VK_NULL_HANDLE; + return res; + } + return res; } VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateBufferWithAlignment( - VmaAllocator allocator, - const VkBufferCreateInfo* pBufferCreateInfo, - const VmaAllocationCreateInfo* pAllocationCreateInfo, - VkDeviceSize minAlignment, - VkBuffer* pBuffer, - VmaAllocation* pAllocation, - VmaAllocationInfo* pAllocationInfo) + VmaAllocator allocator, + const VkBufferCreateInfo* pBufferCreateInfo, + const VmaAllocationCreateInfo* pAllocationCreateInfo, + VkDeviceSize minAlignment, + VkBuffer* pBuffer, + VmaAllocation* pAllocation, + VmaAllocationInfo* pAllocationInfo) { - VMA_ASSERT(allocator && pBufferCreateInfo && pAllocationCreateInfo && VmaIsPow2(minAlignment) && pBuffer && pAllocation); + VMA_ASSERT(allocator && pBufferCreateInfo && pAllocationCreateInfo && VmaIsPow2(minAlignment) && pBuffer && pAllocation); - if(pBufferCreateInfo->size == 0) - { - return VK_ERROR_INITIALIZATION_FAILED; - } - if((pBufferCreateInfo->usage & VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT_COPY) != 0 && - !allocator->m_UseKhrBufferDeviceAddress) - { - VMA_ASSERT(0 && "Creating a buffer with VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT is not valid if VMA_ALLOCATOR_CREATE_BUFFER_DEVICE_ADDRESS_BIT was not used."); - return VK_ERROR_INITIALIZATION_FAILED; - } + if (pBufferCreateInfo->size == 0) + { + return VK_ERROR_INITIALIZATION_FAILED; + } + if ((pBufferCreateInfo->usage & VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT_COPY) != 0 && + !allocator->m_UseKhrBufferDeviceAddress) + { + VMA_ASSERT(0 && "Creating a buffer with VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT is not valid if VMA_ALLOCATOR_CREATE_BUFFER_DEVICE_ADDRESS_BIT was not used."); + return VK_ERROR_INITIALIZATION_FAILED; + } - VMA_DEBUG_LOG("vmaCreateBufferWithAlignment"); + VMA_DEBUG_LOG("vmaCreateBufferWithAlignment"); - VMA_DEBUG_GLOBAL_MUTEX_LOCK + VMA_DEBUG_GLOBAL_MUTEX_LOCK - *pBuffer = VK_NULL_HANDLE; - *pAllocation = VK_NULL_HANDLE; + *pBuffer = VK_NULL_HANDLE; + *pAllocation = VK_NULL_HANDLE; - // 1. Create VkBuffer. - VkResult res = (*allocator->GetVulkanFunctions().vkCreateBuffer)( - allocator->m_hDevice, - pBufferCreateInfo, - allocator->GetAllocationCallbacks(), - pBuffer); - if(res >= 0) - { - // 2. vkGetBufferMemoryRequirements. - VkMemoryRequirements vkMemReq = {}; - bool requiresDedicatedAllocation = false; - bool prefersDedicatedAllocation = false; - allocator->GetBufferMemoryRequirements(*pBuffer, vkMemReq, - requiresDedicatedAllocation, prefersDedicatedAllocation); + // 1. Create VkBuffer. + VkResult res = (*allocator->GetVulkanFunctions().vkCreateBuffer)( + allocator->m_hDevice, + pBufferCreateInfo, + allocator->GetAllocationCallbacks(), + pBuffer); + if (res >= 0) + { + // 2. vkGetBufferMemoryRequirements. + VkMemoryRequirements vkMemReq = {}; + bool requiresDedicatedAllocation = false; + bool prefersDedicatedAllocation = false; + allocator->GetBufferMemoryRequirements(*pBuffer, vkMemReq, + requiresDedicatedAllocation, prefersDedicatedAllocation); - // 2a. Include minAlignment - vkMemReq.alignment = VMA_MAX(vkMemReq.alignment, minAlignment); + // 2a. Include minAlignment + vkMemReq.alignment = VMA_MAX(vkMemReq.alignment, minAlignment); - // 3. Allocate memory using allocator. - res = allocator->AllocateMemory( - vkMemReq, - requiresDedicatedAllocation, - prefersDedicatedAllocation, - *pBuffer, // dedicatedBuffer - VK_NULL_HANDLE, // dedicatedImage - pBufferCreateInfo->usage, // dedicatedBufferImageUsage - *pAllocationCreateInfo, - VMA_SUBALLOCATION_TYPE_BUFFER, - 1, // allocationCount - pAllocation); + // 3. Allocate memory using allocator. + res = allocator->AllocateMemory( + vkMemReq, + requiresDedicatedAllocation, + prefersDedicatedAllocation, + *pBuffer, // dedicatedBuffer + VK_NULL_HANDLE, // dedicatedImage + VmaBufferImageUsage(*pBufferCreateInfo, allocator->m_UseKhrMaintenance5), // dedicatedBufferImageUsage + *pAllocationCreateInfo, + VMA_SUBALLOCATION_TYPE_BUFFER, + 1, // allocationCount + pAllocation); - if(res >= 0) - { - // 3. Bind buffer with memory. - if((pAllocationCreateInfo->flags & VMA_ALLOCATION_CREATE_DONT_BIND_BIT) == 0) - { - res = allocator->BindBufferMemory(*pAllocation, 0, *pBuffer, VMA_NULL); - } - if(res >= 0) - { - // All steps succeeded. - #if VMA_STATS_STRING_ENABLED - (*pAllocation)->InitBufferImageUsage(pBufferCreateInfo->usage); - #endif - if(pAllocationInfo != VMA_NULL) - { - allocator->GetAllocationInfo(*pAllocation, pAllocationInfo); - } + if (res >= 0) + { + // 3. Bind buffer with memory. + if ((pAllocationCreateInfo->flags & VMA_ALLOCATION_CREATE_DONT_BIND_BIT) == 0) + { + res = allocator->BindBufferMemory(*pAllocation, 0, *pBuffer, VMA_NULL); + } + if (res >= 0) + { + // All steps succeeded. +#if VMA_STATS_STRING_ENABLED + (*pAllocation)->InitBufferUsage(*pBufferCreateInfo, allocator->m_UseKhrMaintenance5); +#endif + if (pAllocationInfo != VMA_NULL) + { + allocator->GetAllocationInfo(*pAllocation, pAllocationInfo); + } - return VK_SUCCESS; - } - allocator->FreeMemory( - 1, // allocationCount - pAllocation); - *pAllocation = VK_NULL_HANDLE; - (*allocator->GetVulkanFunctions().vkDestroyBuffer)(allocator->m_hDevice, *pBuffer, allocator->GetAllocationCallbacks()); - *pBuffer = VK_NULL_HANDLE; - return res; - } - (*allocator->GetVulkanFunctions().vkDestroyBuffer)(allocator->m_hDevice, *pBuffer, allocator->GetAllocationCallbacks()); - *pBuffer = VK_NULL_HANDLE; - return res; - } - return res; + return VK_SUCCESS; + } + allocator->FreeMemory( + 1, // allocationCount + pAllocation); + *pAllocation = VK_NULL_HANDLE; + (*allocator->GetVulkanFunctions().vkDestroyBuffer)(allocator->m_hDevice, *pBuffer, allocator->GetAllocationCallbacks()); + *pBuffer = VK_NULL_HANDLE; + return res; + } + (*allocator->GetVulkanFunctions().vkDestroyBuffer)(allocator->m_hDevice, *pBuffer, allocator->GetAllocationCallbacks()); + *pBuffer = VK_NULL_HANDLE; + return res; + } + return res; } VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateAliasingBuffer( - VmaAllocator VMA_NOT_NULL allocator, - VmaAllocation VMA_NOT_NULL allocation, - const VkBufferCreateInfo* VMA_NOT_NULL pBufferCreateInfo, - VkBuffer VMA_NULLABLE_NON_DISPATCHABLE* VMA_NOT_NULL pBuffer) + VmaAllocator VMA_NOT_NULL allocator, + VmaAllocation VMA_NOT_NULL allocation, + const VkBufferCreateInfo* VMA_NOT_NULL pBufferCreateInfo, + VkBuffer VMA_NULLABLE_NON_DISPATCHABLE* VMA_NOT_NULL pBuffer) { - return vmaCreateAliasingBuffer2(allocator, allocation, 0, pBufferCreateInfo, pBuffer); + return vmaCreateAliasingBuffer2(allocator, allocation, 0, pBufferCreateInfo, pBuffer); } VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateAliasingBuffer2( - VmaAllocator VMA_NOT_NULL allocator, - VmaAllocation VMA_NOT_NULL allocation, - VkDeviceSize allocationLocalOffset, - const VkBufferCreateInfo* VMA_NOT_NULL pBufferCreateInfo, - VkBuffer VMA_NULLABLE_NON_DISPATCHABLE* VMA_NOT_NULL pBuffer) + VmaAllocator VMA_NOT_NULL allocator, + VmaAllocation VMA_NOT_NULL allocation, + VkDeviceSize allocationLocalOffset, + const VkBufferCreateInfo* VMA_NOT_NULL pBufferCreateInfo, + VkBuffer VMA_NULLABLE_NON_DISPATCHABLE* VMA_NOT_NULL pBuffer) { - VMA_ASSERT(allocator && pBufferCreateInfo && pBuffer && allocation); - VMA_ASSERT(allocationLocalOffset + pBufferCreateInfo->size <= allocation->GetSize()); + VMA_ASSERT(allocator && pBufferCreateInfo && pBuffer && allocation); + VMA_ASSERT(allocationLocalOffset + pBufferCreateInfo->size <= allocation->GetSize()); - VMA_DEBUG_LOG("vmaCreateAliasingBuffer2"); + VMA_DEBUG_LOG("vmaCreateAliasingBuffer2"); - *pBuffer = VK_NULL_HANDLE; + *pBuffer = VK_NULL_HANDLE; - if (pBufferCreateInfo->size == 0) - { - return VK_ERROR_INITIALIZATION_FAILED; - } - if ((pBufferCreateInfo->usage & VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT_COPY) != 0 && - !allocator->m_UseKhrBufferDeviceAddress) - { - VMA_ASSERT(0 && "Creating a buffer with VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT is not valid if VMA_ALLOCATOR_CREATE_BUFFER_DEVICE_ADDRESS_BIT was not used."); - return VK_ERROR_INITIALIZATION_FAILED; - } + if (pBufferCreateInfo->size == 0) + { + return VK_ERROR_INITIALIZATION_FAILED; + } + if ((pBufferCreateInfo->usage & VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT_COPY) != 0 && + !allocator->m_UseKhrBufferDeviceAddress) + { + VMA_ASSERT(0 && "Creating a buffer with VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT is not valid if VMA_ALLOCATOR_CREATE_BUFFER_DEVICE_ADDRESS_BIT was not used."); + return VK_ERROR_INITIALIZATION_FAILED; + } - VMA_DEBUG_GLOBAL_MUTEX_LOCK + VMA_DEBUG_GLOBAL_MUTEX_LOCK - // 1. Create VkBuffer. - VkResult res = (*allocator->GetVulkanFunctions().vkCreateBuffer)( - allocator->m_hDevice, - pBufferCreateInfo, - allocator->GetAllocationCallbacks(), - pBuffer); - if (res >= 0) - { - // 2. Bind buffer with memory. - res = allocator->BindBufferMemory(allocation, allocationLocalOffset, *pBuffer, VMA_NULL); - if (res >= 0) - { - return VK_SUCCESS; - } - (*allocator->GetVulkanFunctions().vkDestroyBuffer)(allocator->m_hDevice, *pBuffer, allocator->GetAllocationCallbacks()); - } - return res; + // 1. Create VkBuffer. + VkResult res = (*allocator->GetVulkanFunctions().vkCreateBuffer)( + allocator->m_hDevice, + pBufferCreateInfo, + allocator->GetAllocationCallbacks(), + pBuffer); + if (res >= 0) + { + // 2. Bind buffer with memory. + res = allocator->BindBufferMemory(allocation, allocationLocalOffset, *pBuffer, VMA_NULL); + if (res >= 0) + { + return VK_SUCCESS; + } + (*allocator->GetVulkanFunctions().vkDestroyBuffer)(allocator->m_hDevice, *pBuffer, allocator->GetAllocationCallbacks()); + } + return res; } VMA_CALL_PRE void VMA_CALL_POST vmaDestroyBuffer( - VmaAllocator allocator, - VkBuffer buffer, - VmaAllocation allocation) + VmaAllocator allocator, + VkBuffer buffer, + VmaAllocation allocation) { - VMA_ASSERT(allocator); + VMA_ASSERT(allocator); - if(buffer == VK_NULL_HANDLE && allocation == VK_NULL_HANDLE) - { - return; - } + if (buffer == VK_NULL_HANDLE && allocation == VK_NULL_HANDLE) + { + return; + } - VMA_DEBUG_LOG("vmaDestroyBuffer"); + VMA_DEBUG_LOG("vmaDestroyBuffer"); - VMA_DEBUG_GLOBAL_MUTEX_LOCK + VMA_DEBUG_GLOBAL_MUTEX_LOCK - if(buffer != VK_NULL_HANDLE) - { - (*allocator->GetVulkanFunctions().vkDestroyBuffer)(allocator->m_hDevice, buffer, allocator->GetAllocationCallbacks()); - } + if (buffer != VK_NULL_HANDLE) + { + (*allocator->GetVulkanFunctions().vkDestroyBuffer)(allocator->m_hDevice, buffer, allocator->GetAllocationCallbacks()); + } - if(allocation != VK_NULL_HANDLE) - { - allocator->FreeMemory( - 1, // allocationCount - &allocation); - } + if (allocation != VK_NULL_HANDLE) + { + allocator->FreeMemory( + 1, // allocationCount + &allocation); + } } VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateImage( - VmaAllocator allocator, - const VkImageCreateInfo* pImageCreateInfo, - const VmaAllocationCreateInfo* pAllocationCreateInfo, - VkImage* pImage, - VmaAllocation* pAllocation, - VmaAllocationInfo* pAllocationInfo) + VmaAllocator allocator, + const VkImageCreateInfo* pImageCreateInfo, + const VmaAllocationCreateInfo* pAllocationCreateInfo, + VkImage* pImage, + VmaAllocation* pAllocation, + VmaAllocationInfo* pAllocationInfo) { - VMA_ASSERT(allocator && pImageCreateInfo && pAllocationCreateInfo && pImage && pAllocation); + VMA_ASSERT(allocator && pImageCreateInfo && pAllocationCreateInfo && pImage && pAllocation); - if(pImageCreateInfo->extent.width == 0 || - pImageCreateInfo->extent.height == 0 || - pImageCreateInfo->extent.depth == 0 || - pImageCreateInfo->mipLevels == 0 || - pImageCreateInfo->arrayLayers == 0) - { - return VK_ERROR_INITIALIZATION_FAILED; - } + if (pImageCreateInfo->extent.width == 0 || + pImageCreateInfo->extent.height == 0 || + pImageCreateInfo->extent.depth == 0 || + pImageCreateInfo->mipLevels == 0 || + pImageCreateInfo->arrayLayers == 0) + { + return VK_ERROR_INITIALIZATION_FAILED; + } - VMA_DEBUG_LOG("vmaCreateImage"); + VMA_DEBUG_LOG("vmaCreateImage"); - VMA_DEBUG_GLOBAL_MUTEX_LOCK + VMA_DEBUG_GLOBAL_MUTEX_LOCK - *pImage = VK_NULL_HANDLE; - *pAllocation = VK_NULL_HANDLE; + *pImage = VK_NULL_HANDLE; + *pAllocation = VK_NULL_HANDLE; - // 1. Create VkImage. - VkResult res = (*allocator->GetVulkanFunctions().vkCreateImage)( - allocator->m_hDevice, - pImageCreateInfo, - allocator->GetAllocationCallbacks(), - pImage); - if(res >= 0) - { - VmaSuballocationType suballocType = pImageCreateInfo->tiling == VK_IMAGE_TILING_OPTIMAL ? - VMA_SUBALLOCATION_TYPE_IMAGE_OPTIMAL : - VMA_SUBALLOCATION_TYPE_IMAGE_LINEAR; + // 1. Create VkImage. + VkResult res = (*allocator->GetVulkanFunctions().vkCreateImage)( + allocator->m_hDevice, + pImageCreateInfo, + allocator->GetAllocationCallbacks(), + pImage); + if (res >= 0) + { + VmaSuballocationType suballocType = pImageCreateInfo->tiling == VK_IMAGE_TILING_OPTIMAL ? + VMA_SUBALLOCATION_TYPE_IMAGE_OPTIMAL : + VMA_SUBALLOCATION_TYPE_IMAGE_LINEAR; - // 2. Allocate memory using allocator. - VkMemoryRequirements vkMemReq = {}; - bool requiresDedicatedAllocation = false; - bool prefersDedicatedAllocation = false; - allocator->GetImageMemoryRequirements(*pImage, vkMemReq, - requiresDedicatedAllocation, prefersDedicatedAllocation); + // 2. Allocate memory using allocator. + VkMemoryRequirements vkMemReq = {}; + bool requiresDedicatedAllocation = false; + bool prefersDedicatedAllocation = false; + allocator->GetImageMemoryRequirements(*pImage, vkMemReq, + requiresDedicatedAllocation, prefersDedicatedAllocation); - res = allocator->AllocateMemory( - vkMemReq, - requiresDedicatedAllocation, - prefersDedicatedAllocation, - VK_NULL_HANDLE, // dedicatedBuffer - *pImage, // dedicatedImage - pImageCreateInfo->usage, // dedicatedBufferImageUsage - *pAllocationCreateInfo, - suballocType, - 1, // allocationCount - pAllocation); + res = allocator->AllocateMemory( + vkMemReq, + requiresDedicatedAllocation, + prefersDedicatedAllocation, + VK_NULL_HANDLE, // dedicatedBuffer + *pImage, // dedicatedImage + VmaBufferImageUsage(*pImageCreateInfo), // dedicatedBufferImageUsage + *pAllocationCreateInfo, + suballocType, + 1, // allocationCount + pAllocation); - if(res >= 0) - { - // 3. Bind image with memory. - if((pAllocationCreateInfo->flags & VMA_ALLOCATION_CREATE_DONT_BIND_BIT) == 0) - { - res = allocator->BindImageMemory(*pAllocation, 0, *pImage, VMA_NULL); - } - if(res >= 0) - { - // All steps succeeded. - #if VMA_STATS_STRING_ENABLED - (*pAllocation)->InitBufferImageUsage(pImageCreateInfo->usage); - #endif - if(pAllocationInfo != VMA_NULL) - { - allocator->GetAllocationInfo(*pAllocation, pAllocationInfo); - } + if (res >= 0) + { + // 3. Bind image with memory. + if ((pAllocationCreateInfo->flags & VMA_ALLOCATION_CREATE_DONT_BIND_BIT) == 0) + { + res = allocator->BindImageMemory(*pAllocation, 0, *pImage, VMA_NULL); + } + if (res >= 0) + { + // All steps succeeded. +#if VMA_STATS_STRING_ENABLED + (*pAllocation)->InitImageUsage(*pImageCreateInfo); +#endif + if (pAllocationInfo != VMA_NULL) + { + allocator->GetAllocationInfo(*pAllocation, pAllocationInfo); + } - return VK_SUCCESS; - } - allocator->FreeMemory( - 1, // allocationCount - pAllocation); - *pAllocation = VK_NULL_HANDLE; - (*allocator->GetVulkanFunctions().vkDestroyImage)(allocator->m_hDevice, *pImage, allocator->GetAllocationCallbacks()); - *pImage = VK_NULL_HANDLE; - return res; - } - (*allocator->GetVulkanFunctions().vkDestroyImage)(allocator->m_hDevice, *pImage, allocator->GetAllocationCallbacks()); - *pImage = VK_NULL_HANDLE; - return res; - } - return res; + return VK_SUCCESS; + } + allocator->FreeMemory( + 1, // allocationCount + pAllocation); + *pAllocation = VK_NULL_HANDLE; + (*allocator->GetVulkanFunctions().vkDestroyImage)(allocator->m_hDevice, *pImage, allocator->GetAllocationCallbacks()); + *pImage = VK_NULL_HANDLE; + return res; + } + (*allocator->GetVulkanFunctions().vkDestroyImage)(allocator->m_hDevice, *pImage, allocator->GetAllocationCallbacks()); + *pImage = VK_NULL_HANDLE; + return res; + } + return res; } VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateAliasingImage( - VmaAllocator VMA_NOT_NULL allocator, - VmaAllocation VMA_NOT_NULL allocation, - const VkImageCreateInfo* VMA_NOT_NULL pImageCreateInfo, - VkImage VMA_NULLABLE_NON_DISPATCHABLE* VMA_NOT_NULL pImage) + VmaAllocator VMA_NOT_NULL allocator, + VmaAllocation VMA_NOT_NULL allocation, + const VkImageCreateInfo* VMA_NOT_NULL pImageCreateInfo, + VkImage VMA_NULLABLE_NON_DISPATCHABLE* VMA_NOT_NULL pImage) { - return vmaCreateAliasingImage2(allocator, allocation, 0, pImageCreateInfo, pImage); + return vmaCreateAliasingImage2(allocator, allocation, 0, pImageCreateInfo, pImage); } VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateAliasingImage2( - VmaAllocator VMA_NOT_NULL allocator, - VmaAllocation VMA_NOT_NULL allocation, - VkDeviceSize allocationLocalOffset, - const VkImageCreateInfo* VMA_NOT_NULL pImageCreateInfo, - VkImage VMA_NULLABLE_NON_DISPATCHABLE* VMA_NOT_NULL pImage) + VmaAllocator VMA_NOT_NULL allocator, + VmaAllocation VMA_NOT_NULL allocation, + VkDeviceSize allocationLocalOffset, + const VkImageCreateInfo* VMA_NOT_NULL pImageCreateInfo, + VkImage VMA_NULLABLE_NON_DISPATCHABLE* VMA_NOT_NULL pImage) { - VMA_ASSERT(allocator && pImageCreateInfo && pImage && allocation); + VMA_ASSERT(allocator && pImageCreateInfo && pImage && allocation); - *pImage = VK_NULL_HANDLE; + *pImage = VK_NULL_HANDLE; - VMA_DEBUG_LOG("vmaCreateImage2"); + VMA_DEBUG_LOG("vmaCreateImage2"); - if (pImageCreateInfo->extent.width == 0 || - pImageCreateInfo->extent.height == 0 || - pImageCreateInfo->extent.depth == 0 || - pImageCreateInfo->mipLevels == 0 || - pImageCreateInfo->arrayLayers == 0) - { - return VK_ERROR_INITIALIZATION_FAILED; - } + if (pImageCreateInfo->extent.width == 0 || + pImageCreateInfo->extent.height == 0 || + pImageCreateInfo->extent.depth == 0 || + pImageCreateInfo->mipLevels == 0 || + pImageCreateInfo->arrayLayers == 0) + { + return VK_ERROR_INITIALIZATION_FAILED; + } - VMA_DEBUG_GLOBAL_MUTEX_LOCK + VMA_DEBUG_GLOBAL_MUTEX_LOCK - // 1. Create VkImage. - VkResult res = (*allocator->GetVulkanFunctions().vkCreateImage)( - allocator->m_hDevice, - pImageCreateInfo, - allocator->GetAllocationCallbacks(), - pImage); - if (res >= 0) - { - // 2. Bind image with memory. - res = allocator->BindImageMemory(allocation, allocationLocalOffset, *pImage, VMA_NULL); - if (res >= 0) - { - return VK_SUCCESS; - } - (*allocator->GetVulkanFunctions().vkDestroyImage)(allocator->m_hDevice, *pImage, allocator->GetAllocationCallbacks()); - } - return res; + // 1. Create VkImage. + VkResult res = (*allocator->GetVulkanFunctions().vkCreateImage)( + allocator->m_hDevice, + pImageCreateInfo, + allocator->GetAllocationCallbacks(), + pImage); + if (res >= 0) + { + // 2. Bind image with memory. + res = allocator->BindImageMemory(allocation, allocationLocalOffset, *pImage, VMA_NULL); + if (res >= 0) + { + return VK_SUCCESS; + } + (*allocator->GetVulkanFunctions().vkDestroyImage)(allocator->m_hDevice, *pImage, allocator->GetAllocationCallbacks()); + } + return res; } VMA_CALL_PRE void VMA_CALL_POST vmaDestroyImage( - VmaAllocator VMA_NOT_NULL allocator, - VkImage VMA_NULLABLE_NON_DISPATCHABLE image, - VmaAllocation VMA_NULLABLE allocation) + VmaAllocator VMA_NOT_NULL allocator, + VkImage VMA_NULLABLE_NON_DISPATCHABLE image, + VmaAllocation VMA_NULLABLE allocation) { - VMA_ASSERT(allocator); + VMA_ASSERT(allocator); - if(image == VK_NULL_HANDLE && allocation == VK_NULL_HANDLE) - { - return; - } + if (image == VK_NULL_HANDLE && allocation == VK_NULL_HANDLE) + { + return; + } - VMA_DEBUG_LOG("vmaDestroyImage"); + VMA_DEBUG_LOG("vmaDestroyImage"); - VMA_DEBUG_GLOBAL_MUTEX_LOCK + VMA_DEBUG_GLOBAL_MUTEX_LOCK - if(image != VK_NULL_HANDLE) - { - (*allocator->GetVulkanFunctions().vkDestroyImage)(allocator->m_hDevice, image, allocator->GetAllocationCallbacks()); - } - if(allocation != VK_NULL_HANDLE) - { - allocator->FreeMemory( - 1, // allocationCount - &allocation); - } + if (image != VK_NULL_HANDLE) + { + (*allocator->GetVulkanFunctions().vkDestroyImage)(allocator->m_hDevice, image, allocator->GetAllocationCallbacks()); + } + if (allocation != VK_NULL_HANDLE) + { + allocator->FreeMemory( + 1, // allocationCount + &allocation); + } } VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateVirtualBlock( - const VmaVirtualBlockCreateInfo* VMA_NOT_NULL pCreateInfo, - VmaVirtualBlock VMA_NULLABLE * VMA_NOT_NULL pVirtualBlock) + const VmaVirtualBlockCreateInfo* VMA_NOT_NULL pCreateInfo, + VmaVirtualBlock VMA_NULLABLE * VMA_NOT_NULL pVirtualBlock) { - VMA_ASSERT(pCreateInfo && pVirtualBlock); - VMA_ASSERT(pCreateInfo->size > 0); - VMA_DEBUG_LOG("vmaCreateVirtualBlock"); - VMA_DEBUG_GLOBAL_MUTEX_LOCK; - *pVirtualBlock = vma_new(pCreateInfo->pAllocationCallbacks, VmaVirtualBlock_T)(*pCreateInfo); - VkResult res = (*pVirtualBlock)->Init(); - if(res < 0) - { - vma_delete(pCreateInfo->pAllocationCallbacks, *pVirtualBlock); - *pVirtualBlock = VK_NULL_HANDLE; - } - return res; + VMA_ASSERT(pCreateInfo && pVirtualBlock); + VMA_ASSERT(pCreateInfo->size > 0); + VMA_DEBUG_LOG("vmaCreateVirtualBlock"); + VMA_DEBUG_GLOBAL_MUTEX_LOCK; + *pVirtualBlock = vma_new(pCreateInfo->pAllocationCallbacks, VmaVirtualBlock_T)(*pCreateInfo); + VkResult res = (*pVirtualBlock)->Init(); + if (res < 0) + { + vma_delete(pCreateInfo->pAllocationCallbacks, *pVirtualBlock); + *pVirtualBlock = VK_NULL_HANDLE; + } + return res; } VMA_CALL_PRE void VMA_CALL_POST vmaDestroyVirtualBlock(VmaVirtualBlock VMA_NULLABLE virtualBlock) { - if(virtualBlock != VK_NULL_HANDLE) - { - VMA_DEBUG_LOG("vmaDestroyVirtualBlock"); - VMA_DEBUG_GLOBAL_MUTEX_LOCK; - VkAllocationCallbacks allocationCallbacks = virtualBlock->m_AllocationCallbacks; // Have to copy the callbacks when destroying. - vma_delete(&allocationCallbacks, virtualBlock); - } + if (virtualBlock != VK_NULL_HANDLE) + { + VMA_DEBUG_LOG("vmaDestroyVirtualBlock"); + VMA_DEBUG_GLOBAL_MUTEX_LOCK; + VkAllocationCallbacks allocationCallbacks = virtualBlock->m_AllocationCallbacks; // Have to copy the callbacks when destroying. + vma_delete(&allocationCallbacks, virtualBlock); + } } VMA_CALL_PRE VkBool32 VMA_CALL_POST vmaIsVirtualBlockEmpty(VmaVirtualBlock VMA_NOT_NULL virtualBlock) { - VMA_ASSERT(virtualBlock != VK_NULL_HANDLE); - VMA_DEBUG_LOG("vmaIsVirtualBlockEmpty"); - VMA_DEBUG_GLOBAL_MUTEX_LOCK; - return virtualBlock->IsEmpty() ? VK_TRUE : VK_FALSE; + VMA_ASSERT(virtualBlock != VK_NULL_HANDLE); + VMA_DEBUG_LOG("vmaIsVirtualBlockEmpty"); + VMA_DEBUG_GLOBAL_MUTEX_LOCK; + return virtualBlock->IsEmpty() ? VK_TRUE : VK_FALSE; } VMA_CALL_PRE void VMA_CALL_POST vmaGetVirtualAllocationInfo(VmaVirtualBlock VMA_NOT_NULL virtualBlock, - VmaVirtualAllocation VMA_NOT_NULL_NON_DISPATCHABLE allocation, VmaVirtualAllocationInfo* VMA_NOT_NULL pVirtualAllocInfo) + VmaVirtualAllocation VMA_NOT_NULL_NON_DISPATCHABLE allocation, VmaVirtualAllocationInfo* VMA_NOT_NULL pVirtualAllocInfo) { - VMA_ASSERT(virtualBlock != VK_NULL_HANDLE && pVirtualAllocInfo != VMA_NULL); - VMA_DEBUG_LOG("vmaGetVirtualAllocationInfo"); - VMA_DEBUG_GLOBAL_MUTEX_LOCK; - virtualBlock->GetAllocationInfo(allocation, *pVirtualAllocInfo); + VMA_ASSERT(virtualBlock != VK_NULL_HANDLE && pVirtualAllocInfo != VMA_NULL); + VMA_DEBUG_LOG("vmaGetVirtualAllocationInfo"); + VMA_DEBUG_GLOBAL_MUTEX_LOCK; + virtualBlock->GetAllocationInfo(allocation, *pVirtualAllocInfo); } VMA_CALL_PRE VkResult VMA_CALL_POST vmaVirtualAllocate(VmaVirtualBlock VMA_NOT_NULL virtualBlock, - const VmaVirtualAllocationCreateInfo* VMA_NOT_NULL pCreateInfo, VmaVirtualAllocation VMA_NULLABLE_NON_DISPATCHABLE* VMA_NOT_NULL pAllocation, - VkDeviceSize* VMA_NULLABLE pOffset) + const VmaVirtualAllocationCreateInfo* VMA_NOT_NULL pCreateInfo, VmaVirtualAllocation VMA_NULLABLE_NON_DISPATCHABLE* VMA_NOT_NULL pAllocation, + VkDeviceSize* VMA_NULLABLE pOffset) { - VMA_ASSERT(virtualBlock != VK_NULL_HANDLE && pCreateInfo != VMA_NULL && pAllocation != VMA_NULL); - VMA_DEBUG_LOG("vmaVirtualAllocate"); - VMA_DEBUG_GLOBAL_MUTEX_LOCK; - return virtualBlock->Allocate(*pCreateInfo, *pAllocation, pOffset); + VMA_ASSERT(virtualBlock != VK_NULL_HANDLE && pCreateInfo != VMA_NULL && pAllocation != VMA_NULL); + VMA_DEBUG_LOG("vmaVirtualAllocate"); + VMA_DEBUG_GLOBAL_MUTEX_LOCK; + return virtualBlock->Allocate(*pCreateInfo, *pAllocation, pOffset); } VMA_CALL_PRE void VMA_CALL_POST vmaVirtualFree(VmaVirtualBlock VMA_NOT_NULL virtualBlock, VmaVirtualAllocation VMA_NULLABLE_NON_DISPATCHABLE allocation) { - if(allocation != VK_NULL_HANDLE) - { - VMA_ASSERT(virtualBlock != VK_NULL_HANDLE); - VMA_DEBUG_LOG("vmaVirtualFree"); - VMA_DEBUG_GLOBAL_MUTEX_LOCK; - virtualBlock->Free(allocation); - } + if (allocation != VK_NULL_HANDLE) + { + VMA_ASSERT(virtualBlock != VK_NULL_HANDLE); + VMA_DEBUG_LOG("vmaVirtualFree"); + VMA_DEBUG_GLOBAL_MUTEX_LOCK; + virtualBlock->Free(allocation); + } } VMA_CALL_PRE void VMA_CALL_POST vmaClearVirtualBlock(VmaVirtualBlock VMA_NOT_NULL virtualBlock) { - VMA_ASSERT(virtualBlock != VK_NULL_HANDLE); - VMA_DEBUG_LOG("vmaClearVirtualBlock"); - VMA_DEBUG_GLOBAL_MUTEX_LOCK; - virtualBlock->Clear(); + VMA_ASSERT(virtualBlock != VK_NULL_HANDLE); + VMA_DEBUG_LOG("vmaClearVirtualBlock"); + VMA_DEBUG_GLOBAL_MUTEX_LOCK; + virtualBlock->Clear(); } VMA_CALL_PRE void VMA_CALL_POST vmaSetVirtualAllocationUserData(VmaVirtualBlock VMA_NOT_NULL virtualBlock, - VmaVirtualAllocation VMA_NOT_NULL_NON_DISPATCHABLE allocation, void* VMA_NULLABLE pUserData) + VmaVirtualAllocation VMA_NOT_NULL_NON_DISPATCHABLE allocation, void* VMA_NULLABLE pUserData) { - VMA_ASSERT(virtualBlock != VK_NULL_HANDLE); - VMA_DEBUG_LOG("vmaSetVirtualAllocationUserData"); - VMA_DEBUG_GLOBAL_MUTEX_LOCK; - virtualBlock->SetAllocationUserData(allocation, pUserData); + VMA_ASSERT(virtualBlock != VK_NULL_HANDLE); + VMA_DEBUG_LOG("vmaSetVirtualAllocationUserData"); + VMA_DEBUG_GLOBAL_MUTEX_LOCK; + virtualBlock->SetAllocationUserData(allocation, pUserData); } VMA_CALL_PRE void VMA_CALL_POST vmaGetVirtualBlockStatistics(VmaVirtualBlock VMA_NOT_NULL virtualBlock, - VmaStatistics* VMA_NOT_NULL pStats) + VmaStatistics* VMA_NOT_NULL pStats) { - VMA_ASSERT(virtualBlock != VK_NULL_HANDLE && pStats != VMA_NULL); - VMA_DEBUG_LOG("vmaGetVirtualBlockStatistics"); - VMA_DEBUG_GLOBAL_MUTEX_LOCK; - virtualBlock->GetStatistics(*pStats); + VMA_ASSERT(virtualBlock != VK_NULL_HANDLE && pStats != VMA_NULL); + VMA_DEBUG_LOG("vmaGetVirtualBlockStatistics"); + VMA_DEBUG_GLOBAL_MUTEX_LOCK; + virtualBlock->GetStatistics(*pStats); } VMA_CALL_PRE void VMA_CALL_POST vmaCalculateVirtualBlockStatistics(VmaVirtualBlock VMA_NOT_NULL virtualBlock, - VmaDetailedStatistics* VMA_NOT_NULL pStats) + VmaDetailedStatistics* VMA_NOT_NULL pStats) { - VMA_ASSERT(virtualBlock != VK_NULL_HANDLE && pStats != VMA_NULL); - VMA_DEBUG_LOG("vmaCalculateVirtualBlockStatistics"); - VMA_DEBUG_GLOBAL_MUTEX_LOCK; - virtualBlock->CalculateDetailedStatistics(*pStats); + VMA_ASSERT(virtualBlock != VK_NULL_HANDLE && pStats != VMA_NULL); + VMA_DEBUG_LOG("vmaCalculateVirtualBlockStatistics"); + VMA_DEBUG_GLOBAL_MUTEX_LOCK; + virtualBlock->CalculateDetailedStatistics(*pStats); } #if VMA_STATS_STRING_ENABLED VMA_CALL_PRE void VMA_CALL_POST vmaBuildVirtualBlockStatsString(VmaVirtualBlock VMA_NOT_NULL virtualBlock, - char* VMA_NULLABLE * VMA_NOT_NULL ppStatsString, VkBool32 detailedMap) + char* VMA_NULLABLE * VMA_NOT_NULL ppStatsString, VkBool32 detailedMap) { - VMA_ASSERT(virtualBlock != VK_NULL_HANDLE && ppStatsString != VMA_NULL); - VMA_DEBUG_GLOBAL_MUTEX_LOCK; - const VkAllocationCallbacks* allocationCallbacks = virtualBlock->GetAllocationCallbacks(); - VmaStringBuilder sb(allocationCallbacks); - virtualBlock->BuildStatsString(detailedMap != VK_FALSE, sb); - *ppStatsString = VmaCreateStringCopy(allocationCallbacks, sb.GetData(), sb.GetLength()); + VMA_ASSERT(virtualBlock != VK_NULL_HANDLE && ppStatsString != VMA_NULL); + VMA_DEBUG_GLOBAL_MUTEX_LOCK; + const VkAllocationCallbacks* allocationCallbacks = virtualBlock->GetAllocationCallbacks(); + VmaStringBuilder sb(allocationCallbacks); + virtualBlock->BuildStatsString(detailedMap != VK_FALSE, sb); + *ppStatsString = VmaCreateStringCopy(allocationCallbacks, sb.GetData(), sb.GetLength()); } VMA_CALL_PRE void VMA_CALL_POST vmaFreeVirtualBlockStatsString(VmaVirtualBlock VMA_NOT_NULL virtualBlock, - char* VMA_NULLABLE pStatsString) + char* VMA_NULLABLE pStatsString) { - if(pStatsString != VMA_NULL) - { - VMA_ASSERT(virtualBlock != VK_NULL_HANDLE); - VMA_DEBUG_GLOBAL_MUTEX_LOCK; - VmaFreeString(virtualBlock->GetAllocationCallbacks(), pStatsString); - } + if (pStatsString != VMA_NULL) + { + VMA_ASSERT(virtualBlock != VK_NULL_HANDLE); + VMA_DEBUG_GLOBAL_MUTEX_LOCK; + VmaFreeString(virtualBlock->GetAllocationCallbacks(), pStatsString); + } } #endif // VMA_STATS_STRING_ENABLED #endif // _VMA_PUBLIC_INTERFACE @@ -17623,13 +16356,14 @@ VMA_CALL_PRE void VMA_CALL_POST vmaFreeVirtualBlockStatsString(VmaVirtualBlock V \section quick_start_project_setup Project setup Vulkan Memory Allocator comes in form of a "stb-style" single header file. -You don't need to build it as a separate library project. -You can add this file directly to your project and submit it to code repository next to your other source files. +While you can pull the entire repository e.g. as Git module, there is also Cmake script provided, +you don't need to build it as a separate library project. +You can add file "vk_mem_alloc.h" directly to your project and submit it to code repository next to your other source files. "Single header" doesn't mean that everything is contained in C/C++ declarations, like it tends to be in case of inline functions or C++ templates. It means that implementation is bundled with interface in a single file and needs to be extracted using preprocessor macro. -If you don't do it properly, you will get linker errors. +If you don't do it properly, it will result in linker errors. To do it properly: @@ -17643,33 +16377,46 @@ To do it properly: #include "vk_mem_alloc.h" \endcode -It may be a good idea to create dedicated CPP file just for this purpose. +It may be a good idea to create dedicated CPP file just for this purpose, e.g. "VmaUsage.cpp". This library includes header ``, which in turn includes `` on Windows. If you need some specific macros defined before including these headers (like `WIN32_LEAN_AND_MEAN` or `WINVER` for Windows, `VK_USE_PLATFORM_WIN32_KHR` for Vulkan), you must define them before every `#include` of this library. +It may be a good idea to create a dedicate header file for this purpose, e.g. "VmaUsage.h", +that will be included in other source files instead of VMA header directly. This library is written in C++, but has C-compatible interface. -Thus you can include and use vk_mem_alloc.h in C or C++ code, but full +Thus, you can include and use "vk_mem_alloc.h" in C or C++ code, but full implementation with `VMA_IMPLEMENTATION` macro must be compiled as C++, NOT as C. -Some features of C++14 are used. STL containers, RTTI, or C++ exceptions are not used. +Some features of C++14 are used and required. Features of C++20 are used optionally when available. +Some headers of standard C and C++ library are used, but STL containers, RTTI, or C++ exceptions are not used. \section quick_start_initialization Initialization +VMA offers library interface in a style similar to Vulkan, with object handles like #VmaAllocation, +structures describing parameters of objects to be created like #VmaAllocationCreateInfo, +and errors codes returned from functions using `VkResult` type. + +The first and the main object that needs to be created is #VmaAllocator. +It represents the initialization of the entire library. +Only one such object should be created per `VkDevice`. +You should create it at program startup, after `VkDevice` was created, and before any device memory allocator needs to be made. +It must be destroyed before `VkDevice` is destroyed. + At program startup: --# Initialize Vulkan to have `VkPhysicalDevice`, `VkDevice` and `VkInstance` object. --# Fill VmaAllocatorCreateInfo structure and create #VmaAllocator object by - calling vmaCreateAllocator(). +-# Initialize Vulkan to have `VkInstance`, `VkPhysicalDevice`, `VkDevice` object. +-# Fill VmaAllocatorCreateInfo structure and call vmaCreateAllocator() to create #VmaAllocator object. Only members `physicalDevice`, `device`, `instance` are required. However, you should inform the library which Vulkan version do you use by setting VmaAllocatorCreateInfo::vulkanApiVersion and which extensions did you enable -by setting VmaAllocatorCreateInfo::flags (like #VMA_ALLOCATOR_CREATE_BUFFER_DEVICE_ADDRESS_BIT for VK_KHR_buffer_device_address). +by setting VmaAllocatorCreateInfo::flags. Otherwise, VMA would use only features of Vulkan 1.0 core with no extensions. +See below for details. \subsection quick_start_initialization_selecting_vulkan_version Selecting Vulkan version @@ -17708,14 +16455,32 @@ You may need to configure importing Vulkan functions. There are 3 ways to do thi `vkGetDeviceProcAddr` (this is the option presented in the example below): - Define `VMA_STATIC_VULKAN_FUNCTIONS` to 0, `VMA_DYNAMIC_VULKAN_FUNCTIONS` to 1. - Provide pointers to these two functions via VmaVulkanFunctions::vkGetInstanceProcAddr, - VmaVulkanFunctions::vkGetDeviceProcAddr. + VmaVulkanFunctions::vkGetDeviceProcAddr. - The library will fetch pointers to all other functions it needs internally. -# **If you fetch pointers to all Vulkan functions in a custom way**, e.g. using some loader like [Volk](https://github.com/zeux/volk): - Define `VMA_STATIC_VULKAN_FUNCTIONS` and `VMA_DYNAMIC_VULKAN_FUNCTIONS` to 0. - Pass these pointers via structure #VmaVulkanFunctions. -Example for case 2: +\subsection quick_start_initialization_enabling_extensions Enabling extensions + +VMA can automatically use following Vulkan extensions. +If you found them availeble on the selected physical device and you enabled them +while creating `VkInstance` / `VkDevice` object, inform VMA about their availability +by setting appropriate flags in VmaAllocatorCreateInfo::flags. + +Vulkan extension | VMA flag +------------------------------|----------------------------------------------------- +VK_KHR_dedicated_allocation | #VMA_ALLOCATOR_CREATE_KHR_DEDICATED_ALLOCATION_BIT +VK_KHR_bind_memory2 | #VMA_ALLOCATOR_CREATE_KHR_BIND_MEMORY2_BIT +VK_KHR_maintenance4 | #VMA_ALLOCATOR_CREATE_KHR_MAINTENANCE4_BIT +VK_KHR_maintenance5 | #VMA_ALLOCATOR_CREATE_KHR_MAINTENANCE5_BIT +VK_EXT_memory_budget | #VMA_ALLOCATOR_CREATE_EXT_MEMORY_BUDGET_BIT +VK_KHR_buffer_device_address | #VMA_ALLOCATOR_CREATE_BUFFER_DEVICE_ADDRESS_BIT +VK_EXT_memory_priority | #VMA_ALLOCATOR_CREATE_EXT_MEMORY_PRIORITY_BIT +VK_AMD_device_coherent_memory | #VMA_ALLOCATOR_CREATE_AMD_DEVICE_COHERENT_MEMORY_BIT + +Example with fetching pointers to Vulkan functions dynamically: \code #define VMA_STATIC_VULKAN_FUNCTIONS 0 @@ -17729,6 +16494,7 @@ vulkanFunctions.vkGetInstanceProcAddr = &vkGetInstanceProcAddr; vulkanFunctions.vkGetDeviceProcAddr = &vkGetDeviceProcAddr; VmaAllocatorCreateInfo allocatorCreateInfo = {}; +allocatorCreateInfo.flags = VMA_ALLOCATOR_CREATE_EXT_MEMORY_BUDGET_BIT; allocatorCreateInfo.vulkanApiVersion = VK_API_VERSION_1_2; allocatorCreateInfo.physicalDevice = physicalDevice; allocatorCreateInfo.device = device; @@ -17737,9 +16503,24 @@ allocatorCreateInfo.pVulkanFunctions = &vulkanFunctions; VmaAllocator allocator; vmaCreateAllocator(&allocatorCreateInfo, &allocator); + +// Entire program... + +// At the end, don't forget to: +vmaDestroyAllocator(allocator); \endcode +\subsection quick_start_initialization_other_config Other configuration options + +There are additional configuration options available through preprocessor macros that you can define +before including VMA header and through parameters passed in #VmaAllocatorCreateInfo. +They include a possibility to use your own callbacks for host memory allocations (`VkAllocationCallbacks`), +callbacks for device memory allocations (instead of `vkAllocateMemory`, `vkFreeMemory`), +or your custom `VMA_ASSERT` macro, among others. +For more information, see: @ref configuration. + + \section quick_start_resource_allocation Resource allocation When you want to create a buffer or image: @@ -17762,13 +16543,19 @@ VmaAllocation allocation; vmaCreateBuffer(allocator, &bufferInfo, &allocInfo, &buffer, &allocation, nullptr); \endcode -Don't forget to destroy your objects when no longer needed: +Don't forget to destroy your buffer and allocation objects when no longer needed: \code vmaDestroyBuffer(allocator, buffer, allocation); -vmaDestroyAllocator(allocator); \endcode +If you need to map the buffer, you must set flag +#VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT or #VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT +in VmaAllocationCreateInfo::flags. +There are many additional parameters that can control the choice of memory type to be used for the allocation +and other features. +For more information, see documentation chapters: @ref choosing_memory_type, @ref memory_mapping. + \page choosing_memory_type Choosing memory type @@ -17791,10 +16578,10 @@ You can also combine multiple methods. vmaAllocateMemoryForBuffer(), vmaAllocateMemoryForImage(). For binding you should use functions: vmaBindBufferMemory(), vmaBindImageMemory() or their extended versions: vmaBindBufferMemory2(), vmaBindImageMemory2(). --# **This is the easiest and recommended way to use this library:** - If you want to create a buffer or an image, allocate memory for it and bind +-# If you want to create a buffer or an image, allocate memory for it, and bind them together, all in one call, you can use function vmaCreateBuffer(), vmaCreateImage(). + This is the easiest and recommended way to use this library! When using 3. or 4., the library internally queries Vulkan for memory types supported for that buffer or image (function `vkGetBufferMemoryRequirements()`) @@ -17844,7 +16631,7 @@ so you can map it. For example, a staging buffer that will be filled via mapped pointer and then used as a source of transfer to the buffer described previously can be created like this. -It will likely and up in a memory type that is `HOST_VISIBLE` and `HOST_COHERENT` +It will likely end up in a memory type that is `HOST_VISIBLE` and `HOST_COHERENT` but not `HOST_CACHED` (meaning uncached, write-combined) and not `DEVICE_LOCAL` (meaning system RAM). \code @@ -17862,6 +16649,7 @@ vmaCreateBuffer(allocator, &stagingBufferInfo, &stagingAllocInfo, &stagingBuffer \endcode For more examples of creating different kinds of resources, see chapter \ref usage_patterns. +See also: @ref memory_mapping. Usage values `VMA_MEMORY_USAGE_AUTO*` are legal to use only when the library knows about the resource being created by having `VkBufferCreateInfo` / `VkImageCreateInfo` passed, @@ -17873,7 +16661,7 @@ memory type, as described below. Old usage values (`VMA_MEMORY_USAGE_GPU_ONLY`, `VMA_MEMORY_USAGE_CPU_ONLY`, `VMA_MEMORY_USAGE_CPU_TO_GPU`, `VMA_MEMORY_USAGE_GPU_TO_CPU`, `VMA_MEMORY_USAGE_CPU_COPY`) are still available and work same way as in previous versions of the library -for backward compatibility, but they are not recommended. +for backward compatibility, but they are deprecated. \section choosing_memory_type_required_preferred_flags Required and preferred flags @@ -17903,8 +16691,8 @@ plus some extra "magic" (heuristics). \section choosing_memory_type_explicit_memory_types Explicit memory types -If you inspected memory types available on the physical device and you have -a preference for memory types that you want to use, you can fill member +If you inspected memory types available on the physical device and you have +a preference for memory types that you want to use, you can fill member VmaAllocationCreateInfo::memoryTypeBits. It is a bit mask, where each bit set means that a memory type with that index is allowed to be used for the allocation. Special value 0, just like `UINT32_MAX`, means there are no @@ -17926,6 +16714,21 @@ VmaAllocation allocation; vmaCreateBuffer(allocator, &bufferInfo, &allocInfo, &buffer, &allocation, nullptr); \endcode +You can also use this parameter to exclude some memory types. +If you inspect memory heaps and types available on the current physical device and +you determine that for some reason you don't want to use a specific memory type for the allocation, +you can enable automatic memory type selection but exclude certain memory type or types +by setting all bits of `memoryTypeBits` to 1 except the ones you choose. + +\code +// ... +uint32_t excludedMemoryTypeIndex = 2; +VmaAllocationCreateInfo allocInfo = {}; +allocInfo.usage = VMA_MEMORY_USAGE_AUTO; +allocInfo.memoryTypeBits = ~(1u << excludedMemoryTypeIndex); +// ... +\endcode + \section choosing_memory_type_custom_memory_pools Custom memory pools @@ -17964,6 +16767,7 @@ You can use them directly with memory allocated by this library, but it is not recommended because of following issue: Mapping the same `VkDeviceMemory` block multiple times is illegal - only one mapping at a time is allowed. This includes mapping disjoint regions. Mapping is not reference-counted internally by Vulkan. +It is also not thread-safe. Because of this, Vulkan Memory Allocator provides following facilities: \note If you want to be able to map an allocation, you need to specify one of the flags @@ -17971,11 +16775,44 @@ Because of this, Vulkan Memory Allocator provides following facilities: in VmaAllocationCreateInfo::flags. These flags are required for an allocation to be mappable when using #VMA_MEMORY_USAGE_AUTO or other `VMA_MEMORY_USAGE_AUTO*` enum values. For other usage values they are ignored and every such allocation made in `HOST_VISIBLE` memory type is mappable, -but they can still be used for consistency. +but these flags can still be used for consistency. + +\section memory_mapping_copy_functions Copy functions + +The easiest way to copy data from a host pointer to an allocation is to use convenience function vmaCopyMemoryToAllocation(). +It automatically maps the Vulkan memory temporarily (if not already mapped), performs `memcpy`, +and calls `vkFlushMappedMemoryRanges` (if required - if memory type is not `HOST_COHERENT`). + +It is also the safest one, because using `memcpy` avoids a risk of accidentally introducing memory reads +(e.g. by doing `pMappedVectors[i] += v`), which may be very slow on memory types that are not `HOST_CACHED`. + +\code +struct ConstantBuffer +{ + ... +}; +ConstantBuffer constantBufferData = ... + +VkBufferCreateInfo bufCreateInfo = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO }; +bufCreateInfo.size = sizeof(ConstantBuffer); +bufCreateInfo.usage = VK_BUFFER_USAGE_TRANSFER_SRC_BIT; + +VmaAllocationCreateInfo allocCreateInfo = {}; +allocCreateInfo.usage = VMA_MEMORY_USAGE_AUTO; +allocCreateInfo.flags = VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT; + +VkBuffer buf; +VmaAllocation alloc; +vmaCreateBuffer(allocator, &bufCreateInfo, &allocCreateInfo, &buf, &alloc, nullptr); + +vmaCopyMemoryToAllocation(allocator, &constantBufferData, alloc, 0, sizeof(ConstantBuffer)); +\endcode + +Copy in the other direction - from an allocation to a host pointer can be performed the same way using function vmaCopyAllocationToMemory(). \section memory_mapping_mapping_functions Mapping functions -The library provides following functions for mapping of a specific #VmaAllocation: vmaMapMemory(), vmaUnmapMemory(). +The library provides following functions for mapping of a specific allocation: vmaMapMemory(), vmaUnmapMemory(). They are safer and more convenient to use than standard Vulkan functions. You can map an allocation multiple times simultaneously - mapping is reference-counted internally. You can also map different allocations simultaneously regardless of whether they use the same `VkDeviceMemory` block. @@ -17987,7 +16824,7 @@ Example: // Having these objects initialized: struct ConstantBuffer { - ... + ... }; ConstantBuffer constantBufferData = ... @@ -18032,7 +16869,7 @@ bufCreateInfo.usage = VK_BUFFER_USAGE_TRANSFER_SRC_BIT; VmaAllocationCreateInfo allocCreateInfo = {}; allocCreateInfo.usage = VMA_MEMORY_USAGE_AUTO; allocCreateInfo.flags = VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT | - VMA_ALLOCATION_CREATE_MAPPED_BIT; + VMA_ALLOCATION_CREATE_MAPPED_BIT; VkBuffer buf; VmaAllocation alloc; @@ -18236,6 +17073,12 @@ vkDestroyImage(allocator, img2, nullptr); vkDestroyImage(allocator, img1, nullptr); \endcode +VMA also provides convenience functions that create a buffer or image and bind it to memory +represented by an existing #VmaAllocation: +vmaCreateAliasingBuffer(), vmaCreateAliasingBuffer2(), +vmaCreateAliasingImage(), vmaCreateAliasingImage2(). +Versions with "2" offer additional parameter `allocationLocalOffset`. + Remember that using resources that alias in memory requires proper synchronization. You need to issue a memory barrier to make sure commands that use `img1` and `img2` don't overlap on GPU timeline. @@ -18265,6 +17108,7 @@ A memory pool contains a number of `VkDeviceMemory` blocks. The library automatically creates and manages default pool for each memory type available on the device. Default memory pool automatically grows in size. Size of allocated blocks is also variable and managed automatically. +You are using default pools whenever you leave VmaAllocationCreateInfo::pool = null. You can create custom pool and allocate memory out of it. It can be useful if you want to: @@ -18297,7 +17141,7 @@ sampleAllocCreateInfo.usage = VMA_MEMORY_USAGE_AUTO; uint32_t memTypeIndex; VkResult res = vmaFindMemoryTypeIndexForBufferInfo(allocator, - &sampleBufCreateInfo, &sampleAllocCreateInfo, &memTypeIndex); + &sampleBufCreateInfo, &sampleAllocCreateInfo, &memTypeIndex); // Check res... // Create a pool that can have at most 2 blocks, 128 MiB each. @@ -18336,13 +17180,6 @@ It is supported only when VmaPoolCreateInfo::blockSize = 0. To use this feature, set VmaAllocationCreateInfo::pool to the pointer to your custom pool and VmaAllocationCreateInfo::flags to #VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT. -\note Excessive use of custom pools is a common mistake when using this library. -Custom pools may be useful for special purposes - when you want to -keep certain type of resources separate e.g. to reserve minimum amount of memory -for them or limit maximum amount of memory they can occupy. For most -resources this is not needed and so it is not recommended to create #VmaPool -objects and allocations out of them. Allocating from the default pool is sufficient. - \section custom_memory_pools_MemTypeIndex Choosing memory type index @@ -18377,6 +17214,51 @@ When creating buffers/images allocated in that pool, provide following parameter - VmaAllocationCreateInfo: You don't need to pass same parameters. Fill only `pool` member. Other members are ignored anyway. + +\section custom_memory_pools_when_not_use When not to use custom pools + +Custom pools are commonly overused by VMA users. +While it may feel natural to keep some logical groups of resources separate in memory, +in most cases it does more harm than good. +Using custom pool shouldn't be your first choice. +Instead, please make all allocations from default pools first and only use custom pools +if you can prove and measure that it is beneficial in some way, +e.g. it results in lower memory usage, better performance, etc. + +Using custom pools has disadvantages: + +- Each pool has its own collection of `VkDeviceMemory` blocks. + Some of them may be partially or even completely empty. + Spreading allocations across multiple pools increases the amount of wasted (allocated but unbound) memory. +- You must manually choose specific memory type to be used by a custom pool (set as VmaPoolCreateInfo::memoryTypeIndex). + When using default pools, best memory type for each of your allocations can be selected automatically + using a carefully design algorithm that works across all kinds of GPUs. +- If an allocation from a custom pool at specific memory type fails, entire allocation operation returns failure. + When using default pools, VMA tries another compatible memory type. +- If you set VmaPoolCreateInfo::blockSize != 0, each memory block has the same size, + while default pools start from small blocks and only allocate next blocks larger and larger + up to the preferred block size. + +Many of the common concerns can be addressed in a different way than using custom pools: + +- If you want to keep your allocations of certain size (small versus large) or certain lifetime (transient versus long lived) + separate, you likely don't need to. + VMA uses a high quality allocation algorithm that manages memory well in various cases. + Please mesure and check if using custom pools provides a benefit. +- If you want to keep your images and buffers separate, you don't need to. + VMA respects `bufferImageGranularity` limit automatically. +- If you want to keep your mapped and not mapped allocations separate, you don't need to. + VMA respects `nonCoherentAtomSize` limit automatically. + It also maps only those `VkDeviceMemory` blocks that need to map any allocation. + It even tries to keep mappable and non-mappable allocations in separate blocks to minimize the amount of mapped memory. +- If you want to choose a custom size for the default memory block, you can set it globally instead + using VmaAllocatorCreateInfo::preferredLargeHeapBlockSize. +- If you want to select specific memory type for your allocation, + you can set VmaAllocationCreateInfo::memoryTypeBits to `(1u << myMemoryTypeIndex)` instead. +- If you need to create a buffer with certain minimum alignment, you can still do it + using default pools with dedicated function vmaCreateBufferWithAlignment(). + + \section linear_algorithm Linear allocation algorithm Each Vulkan memory block managed by this library has accompanying metadata that @@ -18489,49 +17371,49 @@ VkResult res = vmaBeginDefragmentation(allocator, &defragInfo, &defragCtx); for(;;) { - VmaDefragmentationPassMoveInfo pass; - res = vmaBeginDefragmentationPass(allocator, defragCtx, &pass); - if(res == VK_SUCCESS) - break; - else if(res != VK_INCOMPLETE) - // Handle error... + VmaDefragmentationPassMoveInfo pass; + res = vmaBeginDefragmentationPass(allocator, defragCtx, &pass); + if(res == VK_SUCCESS) + break; + else if(res != VK_INCOMPLETE) + // Handle error... - for(uint32_t i = 0; i < pass.moveCount; ++i) - { - // Inspect pass.pMoves[i].srcAllocation, identify what buffer/image it represents. - VmaAllocationInfo allocInfo; - vmaGetAllocationInfo(allocator, pMoves[i].srcAllocation, &allocInfo); - MyEngineResourceData* resData = (MyEngineResourceData*)allocInfo.pUserData; + for(uint32_t i = 0; i < pass.moveCount; ++i) + { + // Inspect pass.pMoves[i].srcAllocation, identify what buffer/image it represents. + VmaAllocationInfo allocInfo; + vmaGetAllocationInfo(allocator, pass.pMoves[i].srcAllocation, &allocInfo); + MyEngineResourceData* resData = (MyEngineResourceData*)allocInfo.pUserData; - // Recreate and bind this buffer/image at: pass.pMoves[i].dstMemory, pass.pMoves[i].dstOffset. - VkImageCreateInfo imgCreateInfo = ... - VkImage newImg; - res = vkCreateImage(device, &imgCreateInfo, nullptr, &newImg); - // Check res... - res = vmaBindImageMemory(allocator, pMoves[i].dstTmpAllocation, newImg); - // Check res... + // Recreate and bind this buffer/image at: pass.pMoves[i].dstMemory, pass.pMoves[i].dstOffset. + VkImageCreateInfo imgCreateInfo = ... + VkImage newImg; + res = vkCreateImage(device, &imgCreateInfo, nullptr, &newImg); + // Check res... + res = vmaBindImageMemory(allocator, pass.pMoves[i].dstTmpAllocation, newImg); + // Check res... - // Issue a vkCmdCopyBuffer/vkCmdCopyImage to copy its content to the new place. - vkCmdCopyImage(cmdBuf, resData->img, ..., newImg, ...); - } + // Issue a vkCmdCopyBuffer/vkCmdCopyImage to copy its content to the new place. + vkCmdCopyImage(cmdBuf, resData->img, ..., newImg, ...); + } - // Make sure the copy commands finished executing. - vkWaitForFences(...); + // Make sure the copy commands finished executing. + vkWaitForFences(...); - // Destroy old buffers/images bound with pass.pMoves[i].srcAllocation. - for(uint32_t i = 0; i < pass.moveCount; ++i) - { - // ... - vkDestroyImage(device, resData->img, nullptr); - } + // Destroy old buffers/images bound with pass.pMoves[i].srcAllocation. + for(uint32_t i = 0; i < pass.moveCount; ++i) + { + // ... + vkDestroyImage(device, resData->img, nullptr); + } - // Update appropriate descriptors to point to the new places... + // Update appropriate descriptors to point to the new places... - res = vmaEndDefragmentationPass(allocator, defragCtx, &pass); - if(res == VK_SUCCESS) - break; - else if(res != VK_INCOMPLETE) - // Handle error... + res = vmaEndDefragmentationPass(allocator, defragCtx, &pass); + if(res == VK_SUCCESS) + break; + else if(res != VK_INCOMPLETE) + // Handle error... } vmaEndDefragmentation(allocator, defragCtx, nullptr); @@ -18547,9 +17429,9 @@ In each pass: 1. vmaBeginDefragmentationPass() function call: - Calculates and returns the list of allocations to be moved in this pass. - Note this can be a time-consuming process. + Note this can be a time-consuming process. - Reserves destination memory for them by creating temporary destination allocations - that you can query for their `VkDeviceMemory` + offset using vmaGetAllocationInfo(). + that you can query for their `VkDeviceMemory` + offset using vmaGetAllocationInfo(). 2. Inside the pass, **you should**: - Inspect the returned list of allocations to be moved. - Create new buffers/images and bind them at the returned destination temporary allocations. @@ -18579,7 +17461,7 @@ Inside a pass, for each allocation that should be moved: - If you cannot move the allocation, you can set `pass.pMoves[i].operation` to #VMA_DEFRAGMENTATION_MOVE_OPERATION_IGNORE. This will cancel the move. - vmaEndDefragmentationPass() will then free the destination memory - not the source memory of the allocation, leaving it unchanged. + not the source memory of the allocation, leaving it unchanged. - If you decide the allocation is unimportant and can be destroyed instead of moved (e.g. it wasn't used for long time), you can set `pass.pMoves[i].operation` to #VMA_DEFRAGMENTATION_MOVE_OPERATION_DESTROY. - vmaEndDefragmentationPass() will then free both source and destination memory, and will destroy the source #VmaAllocation object. @@ -18629,14 +17511,14 @@ VmaBudget budgets[VK_MAX_MEMORY_HEAPS]; vmaGetHeapBudgets(allocator, budgets); printf("My heap currently has %u allocations taking %llu B,\n", - budgets[heapIndex].statistics.allocationCount, - budgets[heapIndex].statistics.allocationBytes); + budgets[heapIndex].statistics.allocationCount, + budgets[heapIndex].statistics.allocationBytes); printf("allocated out of %u Vulkan device memory blocks taking %llu B,\n", - budgets[heapIndex].statistics.blockCount, - budgets[heapIndex].statistics.blockBytes); + budgets[heapIndex].statistics.blockCount, + budgets[heapIndex].statistics.blockBytes); printf("Vulkan reports total usage %llu B with budget %llu B.\n", - budgets[heapIndex].usage, - budgets[heapIndex].budget); + budgets[heapIndex].usage, + budgets[heapIndex].budget); \endcode You can query for more detailed statistics per memory heap, type, and totals, @@ -18780,11 +17662,11 @@ VkDeviceSize offset; res = vmaVirtualAllocate(block, &allocCreateInfo, &alloc, &offset); if(res == VK_SUCCESS) { - // Use the 4 KB of your memory starting at offset. + // Use the 4 KB of your memory starting at offset. } else { - // Allocation failed - no space for it could be found. Handle this error! + // Allocation failed - no space for it could be found. Handle this error! } \endcode @@ -18814,7 +17696,7 @@ larger data structure containing more information. Example: \code struct CustomAllocData { - std::string m_AllocName; + std::string m_AllocName; }; CustomAllocData* allocData = new CustomAllocData(); allocData->m_AllocName = "My allocation 1"; @@ -18870,7 +17752,7 @@ Example: VmaStatistics stats; vmaGetVirtualBlockStatistics(block, &stats); printf("My virtual block has %llu bytes used by %u virtual allocations\n", - stats.allocationBytes, stats.allocationCount); + stats.allocationBytes, stats.allocationCount); \endcode You can also request a full list of allocations and free regions as a string in JSON format by calling @@ -18987,22 +17869,35 @@ Margin validation (corruption detection) works only for memory types that are `HOST_VISIBLE` and `HOST_COHERENT`. -\page opengl_interop OpenGL Interop +\section debugging_memory_usage_leak_detection Leak detection features -VMA provides some features that help with interoperability with OpenGL. +At allocation and allocator destruction time VMA checks for unfreed and unmapped blocks using +`VMA_ASSERT_LEAK()`. This macro defaults to an assertion, triggering a typically fatal error in Debug +builds, and doing nothing in Release builds. You can provide your own definition of `VMA_ASSERT_LEAK()` +to change this behavior. + +At memory block destruction time VMA lists out all unfreed allocations using the `VMA_LEAK_LOG_FORMAT()` +macro, which defaults to `VMA_DEBUG_LOG_FORMAT`, which in turn defaults to a no-op. +If you're having trouble with leaks - for example, the aforementioned assertion triggers, but you don't +quite know \em why -, overriding this macro to print out the the leaking blocks, combined with assigning +individual names to allocations using vmaSetAllocationName(), can greatly aid in fixing them. + +\page other_api_interop Interop with other graphics APIs + +VMA provides some features that help with interoperability with other graphics APIs, e.g. OpenGL. \section opengl_interop_exporting_memory Exporting memory -If you want to attach `VkExportMemoryAllocateInfoKHR` structure to `pNext` chain of memory allocations made by the library: +If you want to attach `VkExportMemoryAllocateInfoKHR` or other structure to `pNext` chain of memory allocations made by the library: -It is recommended to create \ref custom_memory_pools for such allocations. +You can create \ref custom_memory_pools for such allocations. Define and fill in your `VkExportMemoryAllocateInfoKHR` structure and attach it to VmaPoolCreateInfo::pMemoryAllocateNext while creating the custom pool. Please note that the structure must remain alive and unchanged for the whole lifetime of the #VmaPool, not only while creating it, as no copy of the structure is made, but its original pointer is used for each allocation instead. -If you want to export all memory allocated by the library from certain memory types, +If you want to export all memory allocated by VMA from certain memory types, also dedicated allocations or other allocations made from default pools, an alternative solution is to fill in VmaAllocatorCreateInfo::pTypeExternalMemoryHandleTypes. It should point to an array with `VkExternalMemoryHandleTypeFlagsKHR` to be automatically passed by the library @@ -19019,7 +17914,7 @@ Buffers or images exported to a different API like OpenGL may require a differen higher than the one used by the library automatically, queried from functions like `vkGetBufferMemoryRequirements`. To impose such alignment: -It is recommended to create \ref custom_memory_pools for such allocations. +You can create \ref custom_memory_pools for such allocations. Set VmaPoolCreateInfo::minAllocationAlignment member to the minimum alignment required for each allocation to be made out of this pool. The alignment actually used will be the maximum of this member and the alignment returned for the specific buffer or image @@ -19030,8 +17925,17 @@ use special function vmaCreateBufferWithAlignment(), which takes additional para Note the problem of alignment affects only resources placed inside bigger `VkDeviceMemory` blocks and not dedicated allocations, as these, by definition, always have alignment = 0 because the resource is bound to the beginning of its dedicated block. +You can ensure that an allocation is created as dedicated by using #VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT. Contrary to Direct3D 12, Vulkan doesn't have a concept of alignment of the entire memory block passed on its allocation. +\section opengl_interop_extended_allocation_information Extended allocation information + +If you want to rely on VMA to allocate your buffers and images inside larger memory blocks, +but you need to know the size of the entire block and whether the allocation was made +with its own dedicated memory, use function vmaGetAllocationInfo2() to retrieve +extended allocation information in structure #VmaAllocationInfo2. + + \page usage_patterns Recommended usage patterns @@ -19087,7 +17991,7 @@ to decrease chances to be evicted to system memory by the operating system. \section usage_patterns_staging_copy_upload Staging copy for upload When: -A "staging" buffer than you want to map and fill from CPU code, then use as a source od transfer +A "staging" buffer than you want to map and fill from CPU code, then use as a source of transfer to some GPU resource. What to do: @@ -19102,7 +18006,7 @@ bufCreateInfo.usage = VK_BUFFER_USAGE_TRANSFER_SRC_BIT; VmaAllocationCreateInfo allocCreateInfo = {}; allocCreateInfo.usage = VMA_MEMORY_USAGE_AUTO; allocCreateInfo.flags = VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT | - VMA_ALLOCATION_CREATE_MAPPED_BIT; + VMA_ALLOCATION_CREATE_MAPPED_BIT; VkBuffer buf; VmaAllocation alloc; @@ -19138,7 +18042,7 @@ bufCreateInfo.usage = VK_BUFFER_USAGE_TRANSFER_DST_BIT; VmaAllocationCreateInfo allocCreateInfo = {}; allocCreateInfo.usage = VMA_MEMORY_USAGE_AUTO; allocCreateInfo.flags = VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT | - VMA_ALLOCATION_CREATE_MAPPED_BIT; + VMA_ALLOCATION_CREATE_MAPPED_BIT; VkBuffer buf; VmaAllocation alloc; @@ -19154,15 +18058,15 @@ const float* downloadedData = (const float*)allocInfo.pMappedData; \section usage_patterns_advanced_data_uploading Advanced data uploading For resources that you frequently write on CPU via mapped pointer and -freqnently read on GPU e.g. as a uniform buffer (also called "dynamic"), multiple options are possible: +frequently read on GPU e.g. as a uniform buffer (also called "dynamic"), multiple options are possible: -# Easiest solution is to have one copy of the resource in `HOST_VISIBLE` memory, even if it means system RAM (not `DEVICE_LOCAL`) on systems with a discrete graphics card, and make the device reach out to that resource directly. - Reads performed by the device will then go through PCI Express bus. - The performance of this access may be limited, but it may be fine depending on the size - of this resource (whether it is small enough to quickly end up in GPU cache) and the sparsity - of access. + The performance of this access may be limited, but it may be fine depending on the size + of this resource (whether it is small enough to quickly end up in GPU cache) and the sparsity + of access. -# On systems with unified memory (e.g. AMD APU or Intel integrated graphics, mobile chips), a memory type may be available that is both `HOST_VISIBLE` (available for mapping) and `DEVICE_LOCAL` (fast to access from the GPU). Then, it is likely the best choice for such type of resource. @@ -19171,8 +18075,8 @@ freqnently read on GPU e.g. as a uniform buffer (also called "dynamic"), multipl If they do, it represents a piece of VRAM (or entire VRAM, if ReBAR is enabled in the motherboard BIOS) that is available to CPU for mapping. - Writes performed by the host to that memory go through PCI Express bus. - The performance of these writes may be limited, but it may be fine, especially on PCIe 4.0, - as long as rules of using uncached and write-combined memory are followed - only sequential writes and no reads. + The performance of these writes may be limited, but it may be fine, especially on PCIe 4.0, + as long as rules of using uncached and write-combined memory are followed - only sequential writes and no reads. -# Finally, you may need or prefer to create a separate copy of the resource in `DEVICE_LOCAL` memory, a separate "staging" copy in `HOST_VISIBLE` memory and perform an explicit transfer command between them. @@ -19195,8 +18099,8 @@ bufCreateInfo.usage = VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT | VK_BUFFER_USAGE_TRANS VmaAllocationCreateInfo allocCreateInfo = {}; allocCreateInfo.usage = VMA_MEMORY_USAGE_AUTO; allocCreateInfo.flags = VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT | - VMA_ALLOCATION_CREATE_HOST_ACCESS_ALLOW_TRANSFER_INSTEAD_BIT | - VMA_ALLOCATION_CREATE_MAPPED_BIT; + VMA_ALLOCATION_CREATE_HOST_ACCESS_ALLOW_TRANSFER_INSTEAD_BIT | + VMA_ALLOCATION_CREATE_MAPPED_BIT; VkBuffer buf; VmaAllocation alloc; @@ -19208,37 +18112,38 @@ vmaGetAllocationMemoryProperties(allocator, alloc, &memPropFlags); if(memPropFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) { - // Allocation ended up in a mappable memory and is already mapped - write to it directly. + // Allocation ended up in a mappable memory and is already mapped - write to it directly. - // [Executed in runtime]: - memcpy(allocInfo.pMappedData, myData, myDataSize); + // [Executed in runtime]: + memcpy(allocInfo.pMappedData, myData, myDataSize); } else { - // Allocation ended up in a non-mappable memory - need to transfer. - VkBufferCreateInfo stagingBufCreateInfo = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO }; - stagingBufCreateInfo.size = 65536; - stagingBufCreateInfo.usage = VK_BUFFER_USAGE_TRANSFER_SRC_BIT; + // Allocation ended up in a non-mappable memory - need to transfer. + VkBufferCreateInfo stagingBufCreateInfo = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO }; + stagingBufCreateInfo.size = 65536; + stagingBufCreateInfo.usage = VK_BUFFER_USAGE_TRANSFER_SRC_BIT; - VmaAllocationCreateInfo stagingAllocCreateInfo = {}; - stagingAllocCreateInfo.usage = VMA_MEMORY_USAGE_AUTO; - stagingAllocCreateInfo.flags = VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT | - VMA_ALLOCATION_CREATE_MAPPED_BIT; + VmaAllocationCreateInfo stagingAllocCreateInfo = {}; + stagingAllocCreateInfo.usage = VMA_MEMORY_USAGE_AUTO; + stagingAllocCreateInfo.flags = VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT | + VMA_ALLOCATION_CREATE_MAPPED_BIT; - VkBuffer stagingBuf; - VmaAllocation stagingAlloc; - VmaAllocationInfo stagingAllocInfo; - vmaCreateBuffer(allocator, &stagingBufCreateInfo, &stagingAllocCreateInfo, - &stagingBuf, &stagingAlloc, stagingAllocInfo); + VkBuffer stagingBuf; + VmaAllocation stagingAlloc; + VmaAllocationInfo stagingAllocInfo; + vmaCreateBuffer(allocator, &stagingBufCreateInfo, &stagingAllocCreateInfo, + &stagingBuf, &stagingAlloc, stagingAllocInfo); - // [Executed in runtime]: - memcpy(stagingAllocInfo.pMappedData, myData, myDataSize); - //vkCmdPipelineBarrier: VK_ACCESS_HOST_WRITE_BIT --> VK_ACCESS_TRANSFER_READ_BIT - VkBufferCopy bufCopy = { - 0, // srcOffset - 0, // dstOffset, - myDataSize); // size - vkCmdCopyBuffer(cmdBuf, stagingBuf, buf, 1, &bufCopy); + // [Executed in runtime]: + memcpy(stagingAllocInfo.pMappedData, myData, myDataSize); + vmaFlushAllocation(allocator, stagingAlloc, 0, VK_WHOLE_SIZE); + //vkCmdPipelineBarrier: VK_ACCESS_HOST_WRITE_BIT --> VK_ACCESS_TRANSFER_READ_BIT + VkBufferCopy bufCopy = { + 0, // srcOffset + 0, // dstOffset, + myDataSize); // size + vkCmdCopyBuffer(cmdBuf, stagingBuf, buf, 1, &bufCopy); } \endcode @@ -19256,7 +18161,7 @@ Here are some other, less obvious use cases and their recommended settings: least recently used textures from VRAM. - Use `VkImageCreateInfo::usage = VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT` - Use VmaAllocationCreateInfo::usage = #VMA_MEMORY_USAGE_AUTO_PREFER_HOST, - as VMA needs a hint here to differentiate from the previous case. + as VMA needs a hint here to differentiate from the previous case. - A buffer that you want to map and write from the CPU, directly read from the GPU (e.g. as a uniform or vertex buffer), but you have a clear preference to place it in device or host memory due to its large size. @@ -19630,11 +18535,11 @@ to just ignore them. - *vkBindBufferMemory(): Binding memory to buffer 0xeb8e4 but vkGetBufferMemoryRequirements() has not been called on that buffer.* - It happens when VK_KHR_dedicated_allocation extension is enabled. - `vkGetBufferMemoryRequirements2KHR` function is used instead, while validation layer seems to be unaware of it. + `vkGetBufferMemoryRequirements2KHR` function is used instead, while validation layer seems to be unaware of it. - *Mapping an image with layout VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL can result in undefined behavior if this memory is used by the device. Only GENERAL or PREINITIALIZED should be used.* - It happens when you map a buffer or image, because the library maps entire - `VkDeviceMemory` block, where different types of images and buffers may end - up together, especially on GPUs with unified memory like Intel. + `VkDeviceMemory` block, where different types of images and buffers may end + up together, especially on GPUs with unified memory like Intel. - *Non-linear image 0xebc91 is aliased with linear buffer 0xeb8e4 which may indicate a bug.* - It may happen when you use [defragmentation](@ref defragmentation). From 77133dd82c4f0c7e5a8742b0874e6f9ad57b0b9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 7 Apr 2024 11:37:35 +0200 Subject: [PATCH 021/719] Fix a long-standing buffer overflow in savedata encryption BuildHash pads the buffer up to its 16-byte aligned size with zeroes, so there needs to be space for that. Or, we should just remove that write, but let's do the smallest change that fixes the bug for now. --- Core/Dialog/SavedataParam.cpp | 2 +- Core/ELF/ParamSFO.cpp | 9 ++++----- Core/ELF/ParamSFO.h | 6 ++++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Core/Dialog/SavedataParam.cpp b/Core/Dialog/SavedataParam.cpp index fc944483ee..c9533f2f68 100644 --- a/Core/Dialog/SavedataParam.cpp +++ b/Core/Dialog/SavedataParam.cpp @@ -473,7 +473,7 @@ int SavedataParam::Save(SceUtilitySavedataParam* param, const std::string &saveD u8 *data_ = param->dataBuf; int aligned_len = align16(cryptedSize); - cryptedData = new u8[aligned_len + 0x10]; + cryptedData = new u8[aligned_len + 0x10]{}; memcpy(cryptedData, data_, cryptedSize); int decryptMode = DetermineCryptMode(param); diff --git a/Core/ELF/ParamSFO.cpp b/Core/ELF/ParamSFO.cpp index bbd14ca454..856221d36c 100644 --- a/Core/ELF/ParamSFO.cpp +++ b/Core/ELF/ParamSFO.cpp @@ -219,7 +219,7 @@ int ParamSFOData::GetDataOffset(const u8 *paramsfo, const std::string &dataName) return -1; } -bool ParamSFOData::WriteSFO(u8 **paramsfo, size_t *size) const { +void ParamSFOData::WriteSFO(u8 **paramsfo, size_t *size) const { size_t total_size = 0; size_t key_size = 0; size_t data_size = 0; @@ -251,9 +251,10 @@ bool ParamSFOData::WriteSFO(u8 **paramsfo, size_t *size) const { total_size += data_size; *size = total_size; - u8* data = new u8[total_size]; + size_t aligned_size = (total_size + 15) & ~15; + u8* data = new u8[aligned_size]; *paramsfo = data; - memset(data, 0, total_size); + memset(data, 0, aligned_size); memcpy(data, &header, sizeof(Header)); // Now fill @@ -300,8 +301,6 @@ bool ParamSFOData::WriteSFO(u8 **paramsfo, size_t *size) const { index_ptr++; } - - return true; } void ParamSFOData::Clear() { diff --git a/Core/ELF/ParamSFO.h b/Core/ELF/ParamSFO.h index 23af2f0c3f..3d7a719e50 100644 --- a/Core/ELF/ParamSFO.h +++ b/Core/ELF/ParamSFO.h @@ -42,9 +42,11 @@ public: std::string GetDiscID(); - bool ReadSFO(const u8 *paramsfo, size_t size); - bool WriteSFO(u8 **paramsfo, size_t *size) const; + // This allocates a buffer (*paramsfo) using new[], whose size is zero-filled up to a multiple of 16 bytes. + // This is required for SavedataParam::BuildHash. + void WriteSFO(u8 **paramsfo, size_t *size) const; + bool ReadSFO(const u8 *paramsfo, size_t size); bool ReadSFO(const std::vector ¶msfo) { if (!paramsfo.empty()) { return ReadSFO(¶msfo[0], paramsfo.size()); From 404600faa37dd87b994f3e9d1ea6cbc67dffa9b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 7 Apr 2024 11:33:47 +0200 Subject: [PATCH 022/719] SavedataParam/ParamSFO: Minor code cleanups --- Core/Dialog/SavedataParam.cpp | 8 +++----- Core/Dialog/SavedataParam.h | 2 ++ Core/ELF/ParamSFO.cpp | 4 ++-- Core/ELF/ParamSFO.h | 3 ++- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Core/Dialog/SavedataParam.cpp b/Core/Dialog/SavedataParam.cpp index c9533f2f68..f22b8ac13c 100644 --- a/Core/Dialog/SavedataParam.cpp +++ b/Core/Dialog/SavedataParam.cpp @@ -145,7 +145,7 @@ namespace int align16(int address) { - return ((address + 0xF) >> 4) << 4; + return (address + 15) & ~15; } int GetSDKMainVersion(int sdkVersion) @@ -537,10 +537,8 @@ int SavedataParam::Save(SceUtilitySavedataParam* param, const std::string &saveD delete[] updatedList; // Init param with 0. This will be used to detect crypted save or not on loading - u8 *tmpData = new u8[128]; - memset(tmpData, 0, 128); - sfoFile->SetValue("SAVEDATA_PARAMS", tmpData, 128, 128); - delete[] tmpData; + u8 zeroes[128]{}; + sfoFile->SetValue("SAVEDATA_PARAMS", zeroes, 128, 128); u8 *sfoData; size_t sfoSize; diff --git a/Core/Dialog/SavedataParam.h b/Core/Dialog/SavedataParam.h index 04c8dca5e4..b10cfe6c6b 100644 --- a/Core/Dialog/SavedataParam.h +++ b/Core/Dialog/SavedataParam.h @@ -375,6 +375,8 @@ private: int DecryptSave(unsigned int mode, unsigned char *data, int *dataLen, int *alignedLen, unsigned char *cryptkey, const u8 *expectedHash); int EncryptData(unsigned int mode, unsigned char *data, int *dataLen, int *alignedLen, unsigned char *hash, unsigned char *cryptkey); int UpdateHash(u8* sfoData, int sfoSize, int sfoDataParamsOffset, int encryptmode); + + // WARNING: this writes zeroes to data from len to alignedLen. This means that data must have space for the full alignedLen! int BuildHash(unsigned char *output, unsigned char *data, unsigned int len, unsigned int alignedLen, int mode, unsigned char *cryptkey); int DetermineCryptMode(const SceUtilitySavedataParam *param) const; diff --git a/Core/ELF/ParamSFO.cpp b/Core/ELF/ParamSFO.cpp index 856221d36c..0703b8f2af 100644 --- a/Core/ELF/ParamSFO.cpp +++ b/Core/ELF/ParamSFO.cpp @@ -195,7 +195,7 @@ bool ParamSFOData::ReadSFO(const u8 *paramsfo, size_t size) { return true; } -int ParamSFOData::GetDataOffset(const u8 *paramsfo, const std::string &dataName) { +int ParamSFOData::GetDataOffset(const u8 *paramsfo, const char *dataName) { const Header *header = (const Header *)paramsfo; if (header->magic != 0x46535000) return -1; @@ -210,7 +210,7 @@ int ParamSFOData::GetDataOffset(const u8 *paramsfo, const std::string &dataName) for (u32 i = 0; i < header->index_table_entries; i++) { const char *key = (const char *)(key_start + indexTables[i].key_table_offset); - if (!strcmp(key, dataName.c_str())) + if (!strcmp(key, dataName)) { return data_start + indexTables[i].data_table_offset; } diff --git a/Core/ELF/ParamSFO.h b/Core/ELF/ParamSFO.h index 3d7a719e50..8531ded275 100644 --- a/Core/ELF/ParamSFO.h +++ b/Core/ELF/ParamSFO.h @@ -55,7 +55,8 @@ public: } } - int GetDataOffset(const u8 *paramsfo, const std::string &dataName); + // If not found, returns a negative value. + int GetDataOffset(const u8 *paramsfo, const char *dataName); void Clear(); From 79c553d004d1e9be82a2a19ce853bc11a463d5e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 7 Apr 2024 11:56:51 +0200 Subject: [PATCH 023/719] Remove the zero-write in BuildHash --- Core/Dialog/SavedataParam.cpp | 5 +++-- Core/Dialog/SavedataParam.h | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Core/Dialog/SavedataParam.cpp b/Core/Dialog/SavedataParam.cpp index f22b8ac13c..ad78b52fec 100644 --- a/Core/Dialog/SavedataParam.cpp +++ b/Core/Dialog/SavedataParam.cpp @@ -1008,6 +1008,7 @@ int SavedataParam::DecryptSave(unsigned int mode, unsigned char *data, int *data return 0; } +// Requires sfoData to be padded with zeroes to the next 16-byte boundary (due to BuildHash) int SavedataParam::UpdateHash(u8* sfoData, int sfoSize, int sfoDataParamsOffset, int encryptmode) { int alignedLen = align16(sfoSize); @@ -1057,8 +1058,9 @@ int SavedataParam::UpdateHash(u8* sfoData, int sfoSize, int sfoDataParamsOffset, return 0; } +// Requires sfoData to be padded with zeroes to the next 16-byte boundary. int SavedataParam::BuildHash(unsigned char *output, - unsigned char *data, + const unsigned char *data, unsigned int len, unsigned int alignedLen, int mode, @@ -1069,7 +1071,6 @@ int SavedataParam::BuildHash(unsigned char *output, /* Set up buffers */ memset(&ctx1, 0, sizeof(pspChnnlsvContext1)); memset(output, 0, 0x10); - memset(data + len, 0, alignedLen - len); /* Perform the magic */ if (sceSdSetIndex_(ctx1, mode & 0xFF) < 0) diff --git a/Core/Dialog/SavedataParam.h b/Core/Dialog/SavedataParam.h index b10cfe6c6b..d580aabb29 100644 --- a/Core/Dialog/SavedataParam.h +++ b/Core/Dialog/SavedataParam.h @@ -376,8 +376,8 @@ private: int EncryptData(unsigned int mode, unsigned char *data, int *dataLen, int *alignedLen, unsigned char *hash, unsigned char *cryptkey); int UpdateHash(u8* sfoData, int sfoSize, int sfoDataParamsOffset, int encryptmode); - // WARNING: this writes zeroes to data from len to alignedLen. This means that data must have space for the full alignedLen! - int BuildHash(unsigned char *output, unsigned char *data, unsigned int len, unsigned int alignedLen, int mode, unsigned char *cryptkey); + // data must be zero-padded from len to alignedLen! + int BuildHash(unsigned char *output, const unsigned char *data, unsigned int len, unsigned int alignedLen, int mode, unsigned char *cryptkey); int DetermineCryptMode(const SceUtilitySavedataParam *param) const; std::vector GetSFOEntries(const std::string &dirPath); From 79bdc8a9ff50a82ed856b47feaa37760c715935d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 7 Apr 2024 11:57:08 +0200 Subject: [PATCH 024/719] Some constification in sceChnnlsv --- Core/HLE/sceChnnlsv.cpp | 8 ++++---- Core/HLE/sceChnnlsv.h | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Core/HLE/sceChnnlsv.cpp b/Core/HLE/sceChnnlsv.cpp index b82e447151..c7fcd2cef3 100644 --- a/Core/HLE/sceChnnlsv.cpp +++ b/Core/HLE/sceChnnlsv.cpp @@ -134,7 +134,7 @@ static int sub_15B0(u8* data, int alignedLen, u8* buf, int val) return 0; } -static int sub_0000(u8* data_out, u8* data, int alignedLen, u8* data2, int& data3, int mode) +static int sub_0000(u8* data_out, u8* data, int alignedLen, const u8* data2, int& data3, int mode) { memcpy(data_out+20, data2, 16); // Mode 1:2 is 83, 3:4 is 87, 5:6 is 100 @@ -222,7 +222,7 @@ static int sceSdGetLastIndex(u32 addressCtx, u32 addressHash, u32 addressKey) { return hleLogSuccessI(SCEMISC, sceSdGetLastIndex_(*ctx, hash, Memory::GetPointerWrite(addressKey))); } -int sceSdGetLastIndex_(pspChnnlsvContext1& ctx, u8* in_hash, u8* in_key) +int sceSdGetLastIndex_(pspChnnlsvContext1& ctx, u8* in_hash, const u8* in_key) { if(ctx.keyLength >= 17) return -1026; @@ -348,7 +348,7 @@ static int sceSdRemoveValue(u32 addressCtx, u32 addressData, int length) { return hleLogSuccessI(SCEMISC, sceSdRemoveValue_(*ctx, Memory::GetPointerWrite(addressData), length)); } -int sceSdRemoveValue_(pspChnnlsvContext1& ctx, u8* data, int length) +int sceSdRemoveValue_(pspChnnlsvContext1& ctx, const u8* data, int length) { if(ctx.keyLength >= 17) return -1026; @@ -400,7 +400,7 @@ static int sceSdCreateList(u32 ctx2Addr, int mode, int unkwn, u32 dataAddr, u32 return hleLogSuccessI(SCEMISC, sceSdCreateList_(*ctx2, mode, unkwn, data, cryptkey)); } -int sceSdCreateList_(pspChnnlsvContext2& ctx2, int mode, int uknw, u8* data, u8* cryptkey) +int sceSdCreateList_(pspChnnlsvContext2& ctx2, int mode, int uknw, u8* data, const u8* cryptkey) { ctx2.mode = mode; ctx2.unkn = 1; diff --git a/Core/HLE/sceChnnlsv.h b/Core/HLE/sceChnnlsv.h index 3636e14b08..d8a030932c 100644 --- a/Core/HLE/sceChnnlsv.h +++ b/Core/HLE/sceChnnlsv.h @@ -35,10 +35,10 @@ typedef struct _pspChnnlsvContext2 { } pspChnnlsvContext2; int sceSdSetIndex_(pspChnnlsvContext1& ctx, int value); -int sceSdRemoveValue_(pspChnnlsvContext1& ctx, u8* data, int length); -int sceSdCreateList_(pspChnnlsvContext2& ctx2, int mode, int uknw, u8* data, u8* cryptkey); +int sceSdRemoveValue_(pspChnnlsvContext1& ctx, const u8* data, int length); +int sceSdCreateList_(pspChnnlsvContext2& ctx2, int mode, int uknw, u8* data, const u8* cryptkey); int sceSdSetMember_(pspChnnlsvContext2& ctx, u8* data, int alignedLen); int sceSdCleanList_(pspChnnlsvContext2& ctx); -int sceSdGetLastIndex_(pspChnnlsvContext1& ctx, u8* in_hash, u8* in_key); +int sceSdGetLastIndex_(pspChnnlsvContext1& ctx, u8* in_hash, const u8* in_key); void Register_sceChnnlsv(); From b7f0a9029eb8216f38a084c8013468654d471bd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 7 Apr 2024 12:36:32 +0200 Subject: [PATCH 025/719] More cleanup --- Core/Dialog/SavedataParam.cpp | 13 +++++-------- Core/Dialog/SavedataParam.h | 4 +++- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Core/Dialog/SavedataParam.cpp b/Core/Dialog/SavedataParam.cpp index ad78b52fec..fd0477f572 100644 --- a/Core/Dialog/SavedataParam.cpp +++ b/Core/Dialog/SavedataParam.cpp @@ -581,16 +581,14 @@ int SavedataParam::Save(SceUtilitySavedataParam* param, const std::string &saveD // copy back save name in request strncpy(param->saveName, saveDirName.c_str(), 20); - if (fileName.empty()) { - delete[] cryptedData; - } else { + if (!fileName.empty()) { if (!WritePSPFile(filePath, data_, saveSize)) { ERROR_LOG(SCEUTILITY, "Error writing file %s", filePath.c_str()); delete[] cryptedData; return SCE_UTILITY_SAVEDATA_ERROR_SAVE_MS_NOSPACE; } - delete[] cryptedData; } + delete[] cryptedData; } @@ -1059,13 +1057,12 @@ int SavedataParam::UpdateHash(u8* sfoData, int sfoSize, int sfoDataParamsOffset, } // Requires sfoData to be padded with zeroes to the next 16-byte boundary. -int SavedataParam::BuildHash(unsigned char *output, - const unsigned char *data, +int SavedataParam::BuildHash(uint8_t *output, + const uint8_t *data, unsigned int len, unsigned int alignedLen, int mode, - unsigned char *cryptkey) -{ + const uint8_t *cryptkey) { pspChnnlsvContext1 ctx1; /* Set up buffers */ diff --git a/Core/Dialog/SavedataParam.h b/Core/Dialog/SavedataParam.h index d580aabb29..15e7015d57 100644 --- a/Core/Dialog/SavedataParam.h +++ b/Core/Dialog/SavedataParam.h @@ -21,6 +21,8 @@ #include #include #include +#include + #include "Common/CommonTypes.h" #include "Core/ELF/ParamSFO.h" #include "Core/MemMap.h" @@ -377,7 +379,7 @@ private: int UpdateHash(u8* sfoData, int sfoSize, int sfoDataParamsOffset, int encryptmode); // data must be zero-padded from len to alignedLen! - int BuildHash(unsigned char *output, const unsigned char *data, unsigned int len, unsigned int alignedLen, int mode, unsigned char *cryptkey); + int BuildHash(uint8_t *output, const uint8_t *data, unsigned int len, unsigned int alignedLen, int mode, const uint8_t *cryptkey); int DetermineCryptMode(const SceUtilitySavedataParam *param) const; std::vector GetSFOEntries(const std::string &dirPath); From d52651f1d29d1cc99f721dfd845e12ad986202e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 7 Apr 2024 19:54:18 +0200 Subject: [PATCH 026/719] Replace links to Orphis buildbot with /devbuilds --- .github/ISSUE_TEMPLATE/bug.yml | 2 +- .github/ISSUE_TEMPLATE/build.yml | 2 +- .github/ISSUE_TEMPLATE/feature.yml | 2 +- .github/ISSUE_TEMPLATE/graphics.yml | 2 +- .github/ISSUE_TEMPLATE/performance.yml | 2 +- README.md | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml index 95dd9e21d5..7ee80bae84 100644 --- a/.github/ISSUE_TEMPLATE/bug.yml +++ b/.github/ISSUE_TEMPLATE/bug.yml @@ -127,7 +127,7 @@ body: attributes: label: Checklist options: - - label: "Test in the [latest git build](https://buildbot.orphis.net/ppsspp/) in case it's already fixed." + - label: "Test in the [latest git build](https://www.ppsspp.org/devbuilds) in case it's already fixed." required: true - label: "[Search for other reports](https://github.com/hrydgard/ppsspp/search?q=my+issue&type=issues) of the same issue." required: true diff --git a/.github/ISSUE_TEMPLATE/build.yml b/.github/ISSUE_TEMPLATE/build.yml index 01830ac853..675fee7b33 100644 --- a/.github/ISSUE_TEMPLATE/build.yml +++ b/.github/ISSUE_TEMPLATE/build.yml @@ -84,7 +84,7 @@ body: attributes: label: Checklist options: - - label: "Test in the [latest git build](https://buildbot.orphis.net/ppsspp/) in case it's already fixed." + - label: "Test in the [latest git build](https://www.ppsspp.org/devbuilds) in case it's already fixed." required: true - label: "Make sure to run `git submodule update --init --recursive` before building." required: true diff --git a/.github/ISSUE_TEMPLATE/feature.yml b/.github/ISSUE_TEMPLATE/feature.yml index 8af90a3f0c..bc107fb505 100644 --- a/.github/ISSUE_TEMPLATE/feature.yml +++ b/.github/ISSUE_TEMPLATE/feature.yml @@ -68,7 +68,7 @@ body: attributes: label: Checklist options: - - label: "Check the [latest git build](https://buildbot.orphis.net/ppsspp/) in case it's already implemented." + - label: "Check the [latest git build](https://www.ppsspp.org/devbuilds) in case it's already implemented." required: true - label: "[Search for other requests](https://github.com/hrydgard/ppsspp/search?q=my+issue&type=issues) of the same feature." required: true diff --git a/.github/ISSUE_TEMPLATE/graphics.yml b/.github/ISSUE_TEMPLATE/graphics.yml index 1c473ec033..6ac8e5f1ac 100644 --- a/.github/ISSUE_TEMPLATE/graphics.yml +++ b/.github/ISSUE_TEMPLATE/graphics.yml @@ -141,7 +141,7 @@ body: attributes: label: Checklist options: - - label: "Test in the [latest git build](https://buildbot.orphis.net/ppsspp/) in case it's already fixed." + - label: "Test in the [latest git build](https://www.ppsspp.org/devbuilds) in case it's already fixed." required: true - label: "[Search for other reports](https://github.com/hrydgard/ppsspp/search?q=my+issue&type=issues) of the same issue." required: true diff --git a/.github/ISSUE_TEMPLATE/performance.yml b/.github/ISSUE_TEMPLATE/performance.yml index 7ee87a8543..737048b70f 100644 --- a/.github/ISSUE_TEMPLATE/performance.yml +++ b/.github/ISSUE_TEMPLATE/performance.yml @@ -125,7 +125,7 @@ body: attributes: label: Checklist options: - - label: "Test in the [latest git build](https://buildbot.orphis.net/ppsspp/) in case it's already fixed." + - label: "Test in the [latest git build](https://www.ppsspp.org/devbuilds) in case it's already fixed." required: true - label: "[Search for other reports](https://github.com/hrydgard/ppsspp/search?q=my+issue&type=issues) of the same issue." required: true diff --git a/README.md b/README.md index 4039c3dd04..42755c2e4e 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ For documentation of all kinds (usage, reference, development), see the [documen For build instructions and other development tutorials, see [the wiki](https://github.com/hrydgard/ppsspp/wiki). -If you want to download regularly updated builds for Android, Windows x86 and x64, [visit Orphis' buildbot](https://buildbot.orphis.net/ppsspp/) +To download fresh development builds for Android, Windows and Mac, [go to the /devbuilds page](https://www.ppsspp.org/devbuilds) For game compatibility, see [community compatibility feedback](https://report.ppsspp.org/games). @@ -399,4 +399,4 @@ Credit goes to: [#18822]: https://github.com/hrydgard/ppsspp/issues/18822 "Avoid vertically merging the two main framebuffers, even if FramebufferAllowLargeVerticalOffset is on." [#18813]: https://github.com/hrydgard/ppsspp/issues/18813 "Mali: Turn off any depth writes in the shader if depth test == NEVER" [#18819]: https://github.com/hrydgard/ppsspp/issues/18819 "Temporarily disable MSAA on Adreno GPUs" -[#18823]: https://github.com/hrydgard/ppsspp/issues/18823 "Memory exception handler: Don't disassemble if ignoring the exception" \ No newline at end of file +[#18823]: https://github.com/hrydgard/ppsspp/issues/18823 "Memory exception handler: Don't disassemble if ignoring the exception" From 0bdbffd12f316dfb2c1c2306dc39efe07b0ac5e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 7 Apr 2024 15:15:24 +0200 Subject: [PATCH 027/719] Revert minor optimization that needs some more work first --- Common/GPU/Vulkan/VulkanQueueRunner.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common/GPU/Vulkan/VulkanQueueRunner.cpp b/Common/GPU/Vulkan/VulkanQueueRunner.cpp index a0164c03ad..085ab52e88 100644 --- a/Common/GPU/Vulkan/VulkanQueueRunner.cpp +++ b/Common/GPU/Vulkan/VulkanQueueRunner.cpp @@ -1443,7 +1443,7 @@ VKRRenderPass *VulkanQueueRunner::PerformBindFramebufferAsRenderTarget(const VKR } TransitionColorToOptimal(cmd, fb->color.image, fb->color.layout, fb->numLayers, &recordBarrier_); - if (fb->depth.image && RenderPassTypeHasDepth(step.render.renderPassType)) { + if (fb->depth.image) { // } && RenderPassTypeHasDepth(step.render.renderPassType)) { TransitionDepthToOptimal(cmd, fb->depth.image, fb->depth.layout, fb->numLayers, &recordBarrier_); } From 6ac5a21846c75456f5f8c7715dfbb77f29628f06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 7 Apr 2024 15:17:02 +0200 Subject: [PATCH 028/719] Update the layout from within TransitionImageAuto --- Common/GPU/Vulkan/VulkanBarrier.cpp | 12 +++++++----- Common/GPU/Vulkan/VulkanBarrier.h | 2 +- Common/GPU/Vulkan/VulkanQueueRunner.cpp | 6 ++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Common/GPU/Vulkan/VulkanBarrier.cpp b/Common/GPU/Vulkan/VulkanBarrier.cpp index c99a48a10e..2e3b23c8aa 100644 --- a/Common/GPU/Vulkan/VulkanBarrier.cpp +++ b/Common/GPU/Vulkan/VulkanBarrier.cpp @@ -52,12 +52,12 @@ void VulkanBarrierBatch::TransitionImage( void VulkanBarrierBatch::TransitionImageAuto( VkImage image, int baseMip, int numMipLevels, int numLayers, VkImageAspectFlags aspectMask, - VkImageLayout oldImageLayout, VkImageLayout newImageLayout) { + VkImageLayout *imageLayout, VkImageLayout newImageLayout) { _dbg_assert_(image != VK_NULL_HANDLE); VkAccessFlags srcAccessMask = 0; VkAccessFlags dstAccessMask = 0; - switch (oldImageLayout) { + switch (*imageLayout) { case VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL: // Assert aspect here? srcAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT | VK_ACCESS_COLOR_ATTACHMENT_READ_BIT; @@ -84,7 +84,7 @@ void VulkanBarrierBatch::TransitionImageAuto( srcStageMask_ |= VK_PIPELINE_STAGE_TRANSFER_BIT; break; default: - _assert_msg_(false, "Unexpected oldLayout: %d", (int)oldImageLayout); + _assert_msg_(false, "Unexpected oldLayout: %s", VulkanImageLayoutToString(*imageLayout)); break; } @@ -94,7 +94,7 @@ void VulkanBarrierBatch::TransitionImageAuto( dstStageMask_ |= VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT; break; default: - _assert_msg_(false, "Unexpected newLayout: %d", (int)newImageLayout); + _assert_msg_(false, "Unexpected newLayout: %s", VulkanImageLayoutToString(newImageLayout)); break; } @@ -103,7 +103,7 @@ void VulkanBarrierBatch::TransitionImageAuto( imageBarrier.pNext = nullptr; imageBarrier.srcAccessMask = srcAccessMask; imageBarrier.dstAccessMask = dstAccessMask; - imageBarrier.oldLayout = oldImageLayout; + imageBarrier.oldLayout = *imageLayout; imageBarrier.newLayout = newImageLayout; imageBarrier.image = image; imageBarrier.subresourceRange.aspectMask = aspectMask; @@ -113,4 +113,6 @@ void VulkanBarrierBatch::TransitionImageAuto( imageBarrier.subresourceRange.baseArrayLayer = 0; imageBarrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; imageBarrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + + *imageLayout = newImageLayout; } diff --git a/Common/GPU/Vulkan/VulkanBarrier.h b/Common/GPU/Vulkan/VulkanBarrier.h index 824515786c..677f99b2ee 100644 --- a/Common/GPU/Vulkan/VulkanBarrier.h +++ b/Common/GPU/Vulkan/VulkanBarrier.h @@ -45,7 +45,7 @@ public: // Automatically determines access and stage masks from layouts. // Not universally usable, but works for PPSSPP's use. void TransitionImageAuto(VkImage image, int baseMip, int numMipLevels, int numLayers, VkImageAspectFlags aspectMask, - VkImageLayout oldImageLayout, VkImageLayout newImageLayout); + VkImageLayout *imageLayout, VkImageLayout newImageLayout); void Flush(VkCommandBuffer cmd); diff --git a/Common/GPU/Vulkan/VulkanQueueRunner.cpp b/Common/GPU/Vulkan/VulkanQueueRunner.cpp index 085ab52e88..3d7a10c7d8 100644 --- a/Common/GPU/Vulkan/VulkanQueueRunner.cpp +++ b/Common/GPU/Vulkan/VulkanQueueRunner.cpp @@ -1090,10 +1090,9 @@ void VulkanQueueRunner::PerformRenderPass(const VKRStep &step, VkCommandBuffer c 1, iter.fb->numLayers, VK_IMAGE_ASPECT_COLOR_BIT, - iter.fb->color.layout, + &iter.fb->color.layout, iter.targetLayout ); - iter.fb->color.layout = iter.targetLayout; } else if (iter.fb->depth.image != VK_NULL_HANDLE && (iter.aspect & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT)) && iter.fb->depth.layout != iter.targetLayout) { recordBarrier_.TransitionImageAuto( iter.fb->depth.image, @@ -1101,10 +1100,9 @@ void VulkanQueueRunner::PerformRenderPass(const VKRStep &step, VkCommandBuffer c 1, iter.fb->numLayers, VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT, - iter.fb->depth.layout, + &iter.fb->depth.layout, iter.targetLayout ); - iter.fb->depth.layout = iter.targetLayout; } } From 58fea04b8a58b00de150cc29a49d5b0e9fe8361f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 7 Apr 2024 15:29:45 +0200 Subject: [PATCH 029/719] Split the auto image layout transition function (color/depth-stencil) --- Common/GPU/Vulkan/VulkanBarrier.cpp | 78 ++++++++++++++++++++----- Common/GPU/Vulkan/VulkanBarrier.h | 4 +- Common/GPU/Vulkan/VulkanQueueRunner.cpp | 18 +++--- 3 files changed, 73 insertions(+), 27 deletions(-) diff --git a/Common/GPU/Vulkan/VulkanBarrier.cpp b/Common/GPU/Vulkan/VulkanBarrier.cpp index 2e3b23c8aa..d467e3b948 100644 --- a/Common/GPU/Vulkan/VulkanBarrier.cpp +++ b/Common/GPU/Vulkan/VulkanBarrier.cpp @@ -50,11 +50,9 @@ void VulkanBarrierBatch::TransitionImage( imageBarrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; } -void VulkanBarrierBatch::TransitionImageAuto( - VkImage image, int baseMip, int numMipLevels, int numLayers, VkImageAspectFlags aspectMask, - VkImageLayout *imageLayout, VkImageLayout newImageLayout) { +void VulkanBarrierBatch::TransitionColorImageAuto( + VkImage image, VkImageLayout *imageLayout, VkImageLayout newImageLayout, int baseMip, int numMipLevels, int numLayers) { _dbg_assert_(image != VK_NULL_HANDLE); - VkAccessFlags srcAccessMask = 0; VkAccessFlags dstAccessMask = 0; switch (*imageLayout) { @@ -63,17 +61,9 @@ void VulkanBarrierBatch::TransitionImageAuto( srcAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT | VK_ACCESS_COLOR_ATTACHMENT_READ_BIT; srcStageMask_ |= VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT; break; - case VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL: - // Assert aspect here? - srcAccessMask = VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT | VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT; - srcStageMask_ |= VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT | VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT; - break; case VK_IMAGE_LAYOUT_UNDEFINED: - // Actually this seems wrong? - if (aspectMask == VK_IMAGE_ASPECT_COLOR_BIT) { - srcAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT | VK_ACCESS_COLOR_ATTACHMENT_READ_BIT; - srcStageMask_ |= VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT; - } + srcAccessMask = 0; + srcStageMask_ |= VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT; break; case VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL: srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT; @@ -106,7 +96,65 @@ void VulkanBarrierBatch::TransitionImageAuto( imageBarrier.oldLayout = *imageLayout; imageBarrier.newLayout = newImageLayout; imageBarrier.image = image; - imageBarrier.subresourceRange.aspectMask = aspectMask; + imageBarrier.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; + imageBarrier.subresourceRange.baseMipLevel = baseMip; + imageBarrier.subresourceRange.levelCount = numMipLevels; + imageBarrier.subresourceRange.layerCount = numLayers; // NOTE: We could usually use VK_REMAINING_ARRAY_LAYERS/VK_REMAINING_MIP_LEVELS, but really old Mali drivers have problems with those. + imageBarrier.subresourceRange.baseArrayLayer = 0; + imageBarrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + imageBarrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + + *imageLayout = newImageLayout; +} + +void VulkanBarrierBatch::TransitionDepthStencilImageAuto( + VkImage image, VkImageLayout *imageLayout, VkImageLayout newImageLayout, int baseMip, int numMipLevels, int numLayers) { + _dbg_assert_(image != VK_NULL_HANDLE); + + VkAccessFlags srcAccessMask = 0; + VkAccessFlags dstAccessMask = 0; + switch (*imageLayout) { + case VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL: + // Assert aspect here? + srcAccessMask = VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT | VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT; + srcStageMask_ |= VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT | VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT; + break; + case VK_IMAGE_LAYOUT_UNDEFINED: + srcAccessMask = 0; + srcStageMask_ |= VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT; + break; + case VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL: + srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT; + srcStageMask_ |= VK_PIPELINE_STAGE_TRANSFER_BIT; + break; + case VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL: + srcAccessMask = VK_ACCESS_TRANSFER_READ_BIT; + srcStageMask_ |= VK_PIPELINE_STAGE_TRANSFER_BIT; + break; + default: + _assert_msg_(false, "Unexpected oldLayout: %s", VulkanImageLayoutToString(*imageLayout)); + break; + } + + switch (newImageLayout) { + case VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL: + dstAccessMask = VK_ACCESS_SHADER_READ_BIT; + dstStageMask_ |= VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT; + break; + default: + _assert_msg_(false, "Unexpected newLayout: %s", VulkanImageLayoutToString(newImageLayout)); + break; + } + + VkImageMemoryBarrier &imageBarrier = imageBarriers_.push_uninitialized(); + imageBarrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER; + imageBarrier.pNext = nullptr; + imageBarrier.srcAccessMask = srcAccessMask; + imageBarrier.dstAccessMask = dstAccessMask; + imageBarrier.oldLayout = *imageLayout; + imageBarrier.newLayout = newImageLayout; + imageBarrier.image = image; + imageBarrier.subresourceRange.aspectMask = VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT; imageBarrier.subresourceRange.baseMipLevel = baseMip; imageBarrier.subresourceRange.levelCount = numMipLevels; imageBarrier.subresourceRange.layerCount = numLayers; // NOTE: We could usually use VK_REMAINING_ARRAY_LAYERS/VK_REMAINING_MIP_LEVELS, but really old Mali drivers have problems with those. diff --git a/Common/GPU/Vulkan/VulkanBarrier.h b/Common/GPU/Vulkan/VulkanBarrier.h index 677f99b2ee..831c2fca63 100644 --- a/Common/GPU/Vulkan/VulkanBarrier.h +++ b/Common/GPU/Vulkan/VulkanBarrier.h @@ -44,8 +44,8 @@ public: // Automatically determines access and stage masks from layouts. // Not universally usable, but works for PPSSPP's use. - void TransitionImageAuto(VkImage image, int baseMip, int numMipLevels, int numLayers, VkImageAspectFlags aspectMask, - VkImageLayout *imageLayout, VkImageLayout newImageLayout); + void TransitionColorImageAuto(VkImage image, VkImageLayout *imageLayout, VkImageLayout newImageLayout, int baseMip, int numMipLevels, int numLayers); + void TransitionDepthStencilImageAuto(VkImage image, VkImageLayout *imageLayout, VkImageLayout newImageLayout, int baseMip, int numMipLevels, int numLayers); void Flush(VkCommandBuffer cmd); diff --git a/Common/GPU/Vulkan/VulkanQueueRunner.cpp b/Common/GPU/Vulkan/VulkanQueueRunner.cpp index 3d7a10c7d8..4c949a8fd9 100644 --- a/Common/GPU/Vulkan/VulkanQueueRunner.cpp +++ b/Common/GPU/Vulkan/VulkanQueueRunner.cpp @@ -1084,24 +1084,22 @@ void VulkanQueueRunner::PerformRenderPass(const VKRStep &step, VkCommandBuffer c for (size_t i = 0; i < step.preTransitions.size(); i++) { const TransitionRequest &iter = step.preTransitions[i]; if (iter.aspect == VK_IMAGE_ASPECT_COLOR_BIT && iter.fb->color.layout != iter.targetLayout) { - recordBarrier_.TransitionImageAuto( + recordBarrier_.TransitionColorImageAuto( iter.fb->color.image, + &iter.fb->color.layout, + iter.targetLayout, 0, 1, - iter.fb->numLayers, - VK_IMAGE_ASPECT_COLOR_BIT, - &iter.fb->color.layout, - iter.targetLayout + iter.fb->numLayers ); } else if (iter.fb->depth.image != VK_NULL_HANDLE && (iter.aspect & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT)) && iter.fb->depth.layout != iter.targetLayout) { - recordBarrier_.TransitionImageAuto( + recordBarrier_.TransitionDepthStencilImageAuto( iter.fb->depth.image, + &iter.fb->depth.layout, + iter.targetLayout, 0, 1, - iter.fb->numLayers, - VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT, - &iter.fb->depth.layout, - iter.targetLayout + iter.fb->numLayers ); } } From ada76e30ca3689119c9cc8dc4e16d5fc35ddf75d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 7 Apr 2024 15:36:02 +0200 Subject: [PATCH 030/719] Add new capabilities to the auto image layout transition functions --- Common/GPU/Vulkan/VulkanBarrier.cpp | 57 ++++++++++++++++++++++++----- 1 file changed, 47 insertions(+), 10 deletions(-) diff --git a/Common/GPU/Vulkan/VulkanBarrier.cpp b/Common/GPU/Vulkan/VulkanBarrier.cpp index d467e3b948..f0fac28484 100644 --- a/Common/GPU/Vulkan/VulkanBarrier.cpp +++ b/Common/GPU/Vulkan/VulkanBarrier.cpp @@ -56,15 +56,24 @@ void VulkanBarrierBatch::TransitionColorImageAuto( VkAccessFlags srcAccessMask = 0; VkAccessFlags dstAccessMask = 0; switch (*imageLayout) { - case VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL: - // Assert aspect here? - srcAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT | VK_ACCESS_COLOR_ATTACHMENT_READ_BIT; - srcStageMask_ |= VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT; - break; case VK_IMAGE_LAYOUT_UNDEFINED: srcAccessMask = 0; srcStageMask_ |= VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT; break; + case VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL: + srcAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT | VK_ACCESS_COLOR_ATTACHMENT_READ_BIT; + srcStageMask_ |= VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT; + break; + case VK_IMAGE_LAYOUT_GENERAL: + // We came from the Mali workaround, and are transitioning back to COLOR_ATTACHMENT_OPTIMAL. + srcAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT; + srcStageMask_ |= VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT; + break; + case VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL: + // We only texture from images in the fragment shader, so can do this simply. + srcAccessMask = VK_ACCESS_SHADER_READ_BIT; + srcStageMask_ |= VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT; + break; case VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL: srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT; srcStageMask_ |= VK_PIPELINE_STAGE_TRANSFER_BIT; @@ -83,6 +92,18 @@ void VulkanBarrierBatch::TransitionColorImageAuto( dstAccessMask = VK_ACCESS_SHADER_READ_BIT; dstStageMask_ |= VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT; break; + case VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL: + dstAccessMask = VK_ACCESS_TRANSFER_READ_BIT; + dstStageMask_ |= VK_PIPELINE_STAGE_TRANSFER_BIT; + break; + case VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL: + dstAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT; + dstStageMask_ |= VK_PIPELINE_STAGE_TRANSFER_BIT; + break; + case VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL: + dstAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT | VK_ACCESS_COLOR_ATTACHMENT_READ_BIT; + dstStageMask_ |= VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT; + break; default: _assert_msg_(false, "Unexpected newLayout: %s", VulkanImageLayoutToString(newImageLayout)); break; @@ -114,15 +135,19 @@ void VulkanBarrierBatch::TransitionDepthStencilImageAuto( VkAccessFlags srcAccessMask = 0; VkAccessFlags dstAccessMask = 0; switch (*imageLayout) { - case VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL: - // Assert aspect here? - srcAccessMask = VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT | VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT; - srcStageMask_ |= VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT | VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT; - break; case VK_IMAGE_LAYOUT_UNDEFINED: srcAccessMask = 0; srcStageMask_ |= VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT; break; + case VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL: + srcAccessMask = VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT | VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT; + srcStageMask_ |= VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT | VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT; + break; + case VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL: + // We only texture from images in the fragment shader, so can do this simply. + srcAccessMask = VK_ACCESS_SHADER_READ_BIT; + srcStageMask_ |= VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT; + break; case VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL: srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT; srcStageMask_ |= VK_PIPELINE_STAGE_TRANSFER_BIT; @@ -141,6 +166,18 @@ void VulkanBarrierBatch::TransitionDepthStencilImageAuto( dstAccessMask = VK_ACCESS_SHADER_READ_BIT; dstStageMask_ |= VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT; break; + case VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL: + dstAccessMask = VK_ACCESS_TRANSFER_READ_BIT; + dstStageMask_ |= VK_PIPELINE_STAGE_TRANSFER_BIT; + break; + case VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL: + dstAccessMask = VK_ACCESS_TRANSFER_READ_BIT; + dstStageMask_ |= VK_PIPELINE_STAGE_TRANSFER_BIT; + break; + case VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL: + dstAccessMask = VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT | VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT; + dstStageMask_ |= VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT | VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT; + break; default: _assert_msg_(false, "Unexpected newLayout: %s", VulkanImageLayoutToString(newImageLayout)); break; From 9c4dd32db037d2323124dfa08279515db3028b95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 7 Apr 2024 20:04:56 +0200 Subject: [PATCH 031/719] Replace the "ToOptimal" layout transitions with the auto ones --- Common/GPU/Vulkan/VulkanQueueRunner.cpp | 81 +------------------------ 1 file changed, 2 insertions(+), 79 deletions(-) diff --git a/Common/GPU/Vulkan/VulkanQueueRunner.cpp b/Common/GPU/Vulkan/VulkanQueueRunner.cpp index 4c949a8fd9..d6ce4b0dd2 100644 --- a/Common/GPU/Vulkan/VulkanQueueRunner.cpp +++ b/Common/GPU/Vulkan/VulkanQueueRunner.cpp @@ -931,83 +931,6 @@ void VulkanQueueRunner::LogReadbackImage(const VKRStep &step) { INFO_LOG(G3D, "%s", StepToString(vulkan_, step).c_str()); } -static void TransitionColorToOptimal(VkCommandBuffer cmd, VkImage colorImage, VkImageLayout colorLayout, int numLayers, VulkanBarrierBatch *recordBarrier) { - VkPipelineStageFlags srcStageMask = 0; - VkAccessFlags srcAccessMask = 0; - switch (colorLayout) { - case VK_IMAGE_LAYOUT_UNDEFINED: - // No need to specify stage or access. - break; - case VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL: - // Already the right color layout. Unclear that we need to do a lot here.. - return; - case VK_IMAGE_LAYOUT_GENERAL: - // We came from the Mali workaround, and are transitioning back to COLOR_ATTACHMENT_OPTIMAL. - srcAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT; - srcStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT; - break; - case VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL: - srcAccessMask = VK_ACCESS_SHADER_READ_BIT; - srcStageMask = VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT; - break; - case VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL: - srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT; - srcStageMask = VK_PIPELINE_STAGE_TRANSFER_BIT; - break; - case VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL: - srcAccessMask = VK_ACCESS_TRANSFER_READ_BIT; - srcStageMask = VK_PIPELINE_STAGE_TRANSFER_BIT; - break; - default: - _dbg_assert_msg_(false, "TransitionColorToOptimal: Unexpected layout %d", (int)colorLayout); - break; - } - recordBarrier->TransitionImage( - colorImage, 0, 1, numLayers, VK_IMAGE_ASPECT_COLOR_BIT, - colorLayout, - VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL, - srcAccessMask, - VK_ACCESS_COLOR_ATTACHMENT_READ_BIT | VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT, - srcStageMask, - VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT); -} - -static void TransitionDepthToOptimal(VkCommandBuffer cmd, VkImage depthStencilImage, VkImageLayout depthStencilLayout, int numLayers, VulkanBarrierBatch *recordBarrier) { - VkPipelineStageFlags srcStageMask = 0; - VkAccessFlags srcAccessMask = 0; - switch (depthStencilLayout) { - case VK_IMAGE_LAYOUT_UNDEFINED: - // No need to specify stage or access. - break; - case VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL: - // Already the right depth layout. Unclear that we need to do a lot here.. - return; - case VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL: - srcAccessMask = VK_ACCESS_SHADER_READ_BIT; - srcStageMask = VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT; - break; - case VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL: - srcAccessMask = VK_ACCESS_TRANSFER_READ_BIT; - srcStageMask = VK_PIPELINE_STAGE_TRANSFER_BIT; - break; - case VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL: - srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT; - srcStageMask = VK_PIPELINE_STAGE_TRANSFER_BIT; - break; - default: - _dbg_assert_msg_(false, "TransitionDepthToOptimal: Unexpected layout %d", (int)depthStencilLayout); - break; - } - recordBarrier->TransitionImage( - depthStencilImage, 0, 1, numLayers, VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT, - depthStencilLayout, - VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL, - srcAccessMask, - VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT | VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT, - srcStageMask, - VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT | VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT); -} - static void TransitionColorFromOptimal(VkCommandBuffer cmd, VkImage colorImage, VkImageLayout colorLayout, int numLayers, VulkanBarrierBatch *recordBarrier) { VkPipelineStageFlags dstStageMask = 0; VkAccessFlags dstAccessMask = 0; @@ -1438,9 +1361,9 @@ VKRRenderPass *VulkanQueueRunner::PerformBindFramebufferAsRenderTarget(const VKR fb->color.layout = VK_IMAGE_LAYOUT_GENERAL; } - TransitionColorToOptimal(cmd, fb->color.image, fb->color.layout, fb->numLayers, &recordBarrier_); + recordBarrier_.TransitionColorImageAuto(fb->color.image, &fb->color.layout, VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL, 0, 1, fb->numLayers); if (fb->depth.image) { // } && RenderPassTypeHasDepth(step.render.renderPassType)) { - TransitionDepthToOptimal(cmd, fb->depth.image, fb->depth.layout, fb->numLayers, &recordBarrier_); + recordBarrier_.TransitionDepthStencilImageAuto(fb->depth.image, &fb->depth.layout, VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL, 0, 1, fb->numLayers); } // The transition from the optimal format happens after EndRenderPass, now that we don't From 3e91095313596ad3aa90e4564214c3414398b3dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 7 Apr 2024 20:06:04 +0200 Subject: [PATCH 032/719] Replace the "FromOptimal" layout transitions with auto. This fixes some rendering errors on NV. --- Common/GPU/Vulkan/VulkanQueueRunner.cpp | 76 +------------------------ 1 file changed, 2 insertions(+), 74 deletions(-) diff --git a/Common/GPU/Vulkan/VulkanQueueRunner.cpp b/Common/GPU/Vulkan/VulkanQueueRunner.cpp index d6ce4b0dd2..b1a22c416f 100644 --- a/Common/GPU/Vulkan/VulkanQueueRunner.cpp +++ b/Common/GPU/Vulkan/VulkanQueueRunner.cpp @@ -931,78 +931,6 @@ void VulkanQueueRunner::LogReadbackImage(const VKRStep &step) { INFO_LOG(G3D, "%s", StepToString(vulkan_, step).c_str()); } -static void TransitionColorFromOptimal(VkCommandBuffer cmd, VkImage colorImage, VkImageLayout colorLayout, int numLayers, VulkanBarrierBatch *recordBarrier) { - VkPipelineStageFlags dstStageMask = 0; - VkAccessFlags dstAccessMask = 0; - // And the final transition. - // Don't need to transition it if VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL. - switch (colorLayout) { - case VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL: - dstAccessMask = VK_ACCESS_SHADER_READ_BIT; - dstStageMask = VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT; - break; - case VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL: - dstAccessMask = VK_ACCESS_TRANSFER_READ_BIT; - dstStageMask = VK_PIPELINE_STAGE_TRANSFER_BIT; - break; - case VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL: - dstAccessMask = VK_ACCESS_TRANSFER_READ_BIT; - dstStageMask = VK_PIPELINE_STAGE_TRANSFER_BIT; - break; - case VK_IMAGE_LAYOUT_UNDEFINED: - case VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL: - // Nothing to do. - return; - default: - _dbg_assert_msg_(false, "TransitionFromOptimal: Unexpected final color layout %d", (int)colorLayout); - break; - } - recordBarrier->TransitionImage( - colorImage, 0, 1, numLayers, VK_IMAGE_ASPECT_COLOR_BIT, - VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL, - colorLayout, - VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT, // srcAccessMask - dstAccessMask, - VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT, - dstStageMask - ); -} - -static void TransitionDepthFromOptimal(VkCommandBuffer cmd, VkImage depthStencilImage, VkImageLayout depthStencilLayout, int numLayers, VulkanBarrierBatch *recordBarrier) { - VkPipelineStageFlags dstStageMask = 0; - VkAccessFlags dstAccessMask = 0; - switch (depthStencilLayout) { - case VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL: - dstAccessMask = VK_ACCESS_SHADER_READ_BIT; - dstStageMask = VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT; - break; - case VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL: - dstAccessMask = VK_ACCESS_TRANSFER_READ_BIT; - dstStageMask = VK_PIPELINE_STAGE_TRANSFER_BIT; - break; - case VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL: - dstAccessMask = VK_ACCESS_TRANSFER_READ_BIT; - dstStageMask = VK_PIPELINE_STAGE_TRANSFER_BIT; - break; - case VK_IMAGE_LAYOUT_UNDEFINED: - case VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL: - // Nothing to do. - return; - default: - _dbg_assert_msg_(false, "TransitionFromOptimal: Unexpected final depth layout %d", (int)depthStencilLayout); - break; - } - recordBarrier->TransitionImage( - depthStencilImage, 0, 1, numLayers, VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT, - VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL, - depthStencilLayout, - VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT, // srcAccessMask - dstAccessMask, - VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT | VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT, - dstStageMask - ); -} - void VulkanQueueRunner::PerformRenderPass(const VKRStep &step, VkCommandBuffer cmd, int curFrame, QueueProfileContext &profile) { for (size_t i = 0; i < step.preTransitions.size(); i++) { const TransitionRequest &iter = step.preTransitions[i]; @@ -1303,9 +1231,9 @@ void VulkanQueueRunner::PerformRenderPass(const VKRStep &step, VkCommandBuffer c if (fb) { // If the desired final layout aren't the optimal layout needed next, transition. - TransitionColorFromOptimal(cmd, fb->color.image, step.render.finalColorLayout, fb->numLayers, &recordBarrier_); + recordBarrier_.TransitionColorImageAuto(fb->color.image, &fb->color.layout, step.render.finalColorLayout, 0, 1, fb->numLayers); if (fb->depth.image) { - TransitionDepthFromOptimal(cmd, fb->depth.image, step.render.finalDepthStencilLayout, fb->numLayers, &recordBarrier_); + recordBarrier_.TransitionDepthStencilImageAuto(fb->depth.image, &fb->depth.layout, step.render.finalDepthStencilLayout, 0, 1, fb->numLayers); } recordBarrier_.Flush(cmd); From 7769bf06f13b37ee81c4b42f7baf945050a8242f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 7 Apr 2024 21:13:55 +0200 Subject: [PATCH 033/719] Add a simplified wrapper for Transition*ImageAuto that takes a VKRImage --- Common/GPU/Vulkan/VulkanBarrier.cpp | 9 +++++++++ Common/GPU/Vulkan/VulkanBarrier.h | 4 ++++ Common/GPU/Vulkan/VulkanQueueRunner.cpp | 24 ++++++++---------------- 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/Common/GPU/Vulkan/VulkanBarrier.cpp b/Common/GPU/Vulkan/VulkanBarrier.cpp index f0fac28484..fa0a98bd16 100644 --- a/Common/GPU/Vulkan/VulkanBarrier.cpp +++ b/Common/GPU/Vulkan/VulkanBarrier.cpp @@ -1,6 +1,7 @@ #include "VulkanLoader.h" #include "VulkanContext.h" #include "VulkanBarrier.h" +#include "VulkanFramebuffer.h" #include "Common/Log.h" @@ -201,3 +202,11 @@ void VulkanBarrierBatch::TransitionDepthStencilImageAuto( *imageLayout = newImageLayout; } + +void VulkanBarrierBatch::TransitionColorImageAuto(VKRImage *image, VkImageLayout newImageLayout) { + TransitionColorImageAuto(image->image, &image->layout, newImageLayout, 0, 1, image->numLayers); +} + +void VulkanBarrierBatch::TransitionDepthStencilImageAuto(VKRImage *image, VkImageLayout newImageLayout) { + TransitionDepthStencilImageAuto(image->image, &image->layout, newImageLayout, 0, 1, image->numLayers); +} diff --git a/Common/GPU/Vulkan/VulkanBarrier.h b/Common/GPU/Vulkan/VulkanBarrier.h index 831c2fca63..74a25459e5 100644 --- a/Common/GPU/Vulkan/VulkanBarrier.h +++ b/Common/GPU/Vulkan/VulkanBarrier.h @@ -8,6 +8,7 @@ #include "Common/Data/Collections/TinySet.h" class VulkanContext; +struct VKRImage; class VulkanBarrierBatch { public: @@ -47,6 +48,9 @@ public: void TransitionColorImageAuto(VkImage image, VkImageLayout *imageLayout, VkImageLayout newImageLayout, int baseMip, int numMipLevels, int numLayers); void TransitionDepthStencilImageAuto(VkImage image, VkImageLayout *imageLayout, VkImageLayout newImageLayout, int baseMip, int numMipLevels, int numLayers); + void TransitionColorImageAuto(VKRImage *image, VkImageLayout newImageLayout); + void TransitionDepthStencilImageAuto(VKRImage *image, VkImageLayout newImageLayout); + void Flush(VkCommandBuffer cmd); private: diff --git a/Common/GPU/Vulkan/VulkanQueueRunner.cpp b/Common/GPU/Vulkan/VulkanQueueRunner.cpp index b1a22c416f..e45f141afe 100644 --- a/Common/GPU/Vulkan/VulkanQueueRunner.cpp +++ b/Common/GPU/Vulkan/VulkanQueueRunner.cpp @@ -936,21 +936,13 @@ void VulkanQueueRunner::PerformRenderPass(const VKRStep &step, VkCommandBuffer c const TransitionRequest &iter = step.preTransitions[i]; if (iter.aspect == VK_IMAGE_ASPECT_COLOR_BIT && iter.fb->color.layout != iter.targetLayout) { recordBarrier_.TransitionColorImageAuto( - iter.fb->color.image, - &iter.fb->color.layout, - iter.targetLayout, - 0, - 1, - iter.fb->numLayers + &iter.fb->color, + iter.targetLayout ); } else if (iter.fb->depth.image != VK_NULL_HANDLE && (iter.aspect & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT)) && iter.fb->depth.layout != iter.targetLayout) { recordBarrier_.TransitionDepthStencilImageAuto( - iter.fb->depth.image, - &iter.fb->depth.layout, - iter.targetLayout, - 0, - 1, - iter.fb->numLayers + &iter.fb->depth, + iter.targetLayout ); } } @@ -1231,9 +1223,9 @@ void VulkanQueueRunner::PerformRenderPass(const VKRStep &step, VkCommandBuffer c if (fb) { // If the desired final layout aren't the optimal layout needed next, transition. - recordBarrier_.TransitionColorImageAuto(fb->color.image, &fb->color.layout, step.render.finalColorLayout, 0, 1, fb->numLayers); + recordBarrier_.TransitionColorImageAuto(&fb->color, step.render.finalColorLayout); if (fb->depth.image) { - recordBarrier_.TransitionDepthStencilImageAuto(fb->depth.image, &fb->depth.layout, step.render.finalDepthStencilLayout, 0, 1, fb->numLayers); + recordBarrier_.TransitionDepthStencilImageAuto(&fb->depth, step.render.finalDepthStencilLayout); } recordBarrier_.Flush(cmd); @@ -1289,9 +1281,9 @@ VKRRenderPass *VulkanQueueRunner::PerformBindFramebufferAsRenderTarget(const VKR fb->color.layout = VK_IMAGE_LAYOUT_GENERAL; } - recordBarrier_.TransitionColorImageAuto(fb->color.image, &fb->color.layout, VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL, 0, 1, fb->numLayers); + recordBarrier_.TransitionColorImageAuto(&fb->color, VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL); if (fb->depth.image) { // } && RenderPassTypeHasDepth(step.render.renderPassType)) { - recordBarrier_.TransitionDepthStencilImageAuto(fb->depth.image, &fb->depth.layout, VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL, 0, 1, fb->numLayers); + recordBarrier_.TransitionDepthStencilImageAuto(&fb->depth, VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL); } // The transition from the optimal format happens after EndRenderPass, now that we don't From d949331f67583cb889d45be41b5a5823177e5b1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 7 Apr 2024 21:24:15 +0200 Subject: [PATCH 034/719] More use of the auto image layout transition functions --- Common/GPU/Vulkan/VulkanQueueRunner.cpp | 38 ++++++++++--------------- 1 file changed, 15 insertions(+), 23 deletions(-) diff --git a/Common/GPU/Vulkan/VulkanQueueRunner.cpp b/Common/GPU/Vulkan/VulkanQueueRunner.cpp index e45f141afe..b9ac70246a 100644 --- a/Common/GPU/Vulkan/VulkanQueueRunner.cpp +++ b/Common/GPU/Vulkan/VulkanQueueRunner.cpp @@ -1370,18 +1370,16 @@ void VulkanQueueRunner::PerformCopy(const VKRStep &step, VkCommandBuffer cmd) { // First source barriers. if (step.copy.aspectMask & VK_IMAGE_ASPECT_COLOR_BIT) { - SetupTransitionToTransferSrc(src->color, VK_IMAGE_ASPECT_COLOR_BIT, &recordBarrier_); - SetupTransitionToTransferDst(dst->color, VK_IMAGE_ASPECT_COLOR_BIT, &recordBarrier_); + recordBarrier_.TransitionColorImageAuto(&src->color, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL); } // We can't copy only depth or only stencil unfortunately - or can we?. if (step.copy.aspectMask & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT)) { _dbg_assert_(src->depth.image != VK_NULL_HANDLE); - SetupTransitionToTransferSrc(src->depth, VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT, &recordBarrier_); + recordBarrier_.TransitionDepthStencilImageAuto(&src->depth, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL); if (dst->depth.layout != VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL) { - SetupTransitionToTransferDst(dst->depth, VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT, &recordBarrier_); - _dbg_assert_(dst->depth.layout == VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL); + recordBarrier_.TransitionDepthStencilImageAuto(&dst->depth, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL); } else { // Kingdom Hearts: Subsequent copies twice to the same depth buffer without any other use. // Not super sure how that happens, but we need a barrier to pass sync validation. @@ -1395,17 +1393,17 @@ void VulkanQueueRunner::PerformCopy(const VKRStep &step, VkCommandBuffer cmd) { // If both the targets are multisampled, copy the msaa targets too. // For that, we need to transition them from their normally permanent VK_*_ATTACHMENT_OPTIMAL layouts, and then back. if (step.copy.aspectMask & VK_IMAGE_ASPECT_COLOR_BIT) { - SetupTransitionToTransferSrc(src->msaaColor, VK_IMAGE_ASPECT_COLOR_BIT, &recordBarrier_); + recordBarrier_.TransitionColorImageAuto(&src->msaaColor, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL); recordBarrier_.Flush(cmd); - SetupTransitionToTransferDst(dst->msaaColor, VK_IMAGE_ASPECT_COLOR_BIT, &recordBarrier_); + recordBarrier_.TransitionColorImageAuto(&dst->msaaColor, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL); recordBarrier_.Flush(cmd); } if (step.copy.aspectMask & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT)) { // Kingdom Hearts: Subsequent copies to the same depth buffer without any other use. // Not super sure how that happens, but we need a barrier to pass sync validation. - SetupTransitionToTransferSrc(src->msaaDepth, VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT, &recordBarrier_); + recordBarrier_.TransitionDepthStencilImageAuto(&src->msaaDepth, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL); recordBarrier_.Flush(cmd); - SetupTransitionToTransferDst(dst->msaaDepth, VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT, &recordBarrier_); + recordBarrier_.TransitionDepthStencilImageAuto(&dst->msaaDepth, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL); recordBarrier_.Flush(cmd); } } @@ -1526,16 +1524,16 @@ void VulkanQueueRunner::PerformBlit(const VKRStep &step, VkCommandBuffer cmd) { // First source barriers. if (step.blit.aspectMask & VK_IMAGE_ASPECT_COLOR_BIT) { - SetupTransitionToTransferSrc(src->color, VK_IMAGE_ASPECT_COLOR_BIT, &recordBarrier_); - SetupTransitionToTransferDst(dst->color, VK_IMAGE_ASPECT_COLOR_BIT, &recordBarrier_); + recordBarrier_.TransitionColorImageAuto(&src->color, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL); + recordBarrier_.TransitionColorImageAuto(&dst->color, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL); } // We can't copy only depth or only stencil unfortunately. if (step.blit.aspectMask & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT)) { _assert_(src->depth.image != VK_NULL_HANDLE); _assert_(dst->depth.image != VK_NULL_HANDLE); - SetupTransitionToTransferSrc(src->depth, VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT, &recordBarrier_); - SetupTransitionToTransferDst(dst->depth, VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT, &recordBarrier_); + recordBarrier_.TransitionDepthStencilImageAuto(&src->depth, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL); + recordBarrier_.TransitionDepthStencilImageAuto(&dst->depth, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL); } recordBarrier_.Flush(cmd); @@ -1762,17 +1760,15 @@ void VulkanQueueRunner::PerformReadback(const VKRStep &step, VkCommandBuffer cmd VKRImage *srcImage; if (step.readback.aspectMask & VK_IMAGE_ASPECT_COLOR_BIT) { srcImage = &step.readback.src->color; + recordBarrier_.TransitionColorImageAuto(srcImage, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL); } else if (step.readback.aspectMask & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT)) { srcImage = &step.readback.src->depth; + recordBarrier_.TransitionDepthStencilImageAuto(srcImage, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL); _dbg_assert_(srcImage->image != VK_NULL_HANDLE); } else { _dbg_assert_msg_(false, "No image aspect to readback?"); return; } - - if (srcImage->layout != VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL) { - SetupTransitionToTransferSrc(*srcImage, step.readback.aspectMask, &recordBarrier_); - } image = srcImage->image; copyLayout = srcImage->layout; } @@ -1831,12 +1827,8 @@ void VulkanQueueRunner::PerformReadback(const VKRStep &step, VkCommandBuffer cmd void VulkanQueueRunner::PerformReadbackImage(const VKRStep &step, VkCommandBuffer cmd) { // TODO: Clean this up - just reusing `SetupTransitionToTransferSrc`. - VKRImage srcImage{}; - srcImage.image = step.readback_image.image; - srcImage.layout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; - srcImage.numLayers = 1; - - SetupTransitionToTransferSrc(srcImage, VK_IMAGE_ASPECT_COLOR_BIT, &recordBarrier_); + VkImageLayout layout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; + recordBarrier_.TransitionColorImageAuto(step.readback_image.image, &layout, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, 0, 1, 1); recordBarrier_.Flush(cmd); ResizeReadbackBuffer(&syncReadback_, sizeof(uint32_t) * step.readback_image.srcRect.extent.width * step.readback_image.srcRect.extent.height); From 78c0be3d8a3e2de1b739025a66bb19893773e0e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 7 Apr 2024 21:25:04 +0200 Subject: [PATCH 035/719] Delete now-unused code --- Common/GPU/Vulkan/VulkanQueueRunner.cpp | 105 ------------------------ Common/GPU/Vulkan/VulkanQueueRunner.h | 2 - 2 files changed, 107 deletions(-) diff --git a/Common/GPU/Vulkan/VulkanQueueRunner.cpp b/Common/GPU/Vulkan/VulkanQueueRunner.cpp index b9ac70246a..875e4dbbdf 100644 --- a/Common/GPU/Vulkan/VulkanQueueRunner.cpp +++ b/Common/GPU/Vulkan/VulkanQueueRunner.cpp @@ -1581,111 +1581,6 @@ void VulkanQueueRunner::PerformBlit(const VKRStep &step, VkCommandBuffer cmd) { } } -void VulkanQueueRunner::SetupTransitionToTransferSrc(VKRImage &img, VkImageAspectFlags aspect, VulkanBarrierBatch *recordBarrier) { - if (img.layout == VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL) { - return; - } - VkImageAspectFlags imageAspect = aspect; - VkAccessFlags srcAccessMask = 0; - VkPipelineStageFlags srcStageMask = 0; - switch (img.layout) { - case VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL: - srcAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT | VK_ACCESS_COLOR_ATTACHMENT_READ_BIT; - srcStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT; - break; - case VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL: - srcAccessMask = VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT; - srcStageMask = VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT | VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT; - break; - case VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL: - srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT; - srcStageMask = VK_PIPELINE_STAGE_TRANSFER_BIT; - break; - case VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL: - srcAccessMask = VK_ACCESS_SHADER_READ_BIT; - srcStageMask = VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT; - break; - default: - _dbg_assert_msg_(false, "Transition from this layout to transfer src not supported (%d)", (int)img.layout); - break; - } - - if (img.format == VK_FORMAT_D16_UNORM_S8_UINT || img.format == VK_FORMAT_D24_UNORM_S8_UINT || img.format == VK_FORMAT_D32_SFLOAT_S8_UINT) { - // Barrier must specify both for combined depth/stencil buffers. - imageAspect = VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT; - } else { - imageAspect = aspect; - } - - recordBarrier->TransitionImage( - img.image, - 0, - 1, - img.numLayers, - imageAspect, - img.layout, - VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, - srcAccessMask, - VK_ACCESS_TRANSFER_READ_BIT, - srcStageMask, - VK_PIPELINE_STAGE_TRANSFER_BIT - ); - img.layout = VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL; -} - -void VulkanQueueRunner::SetupTransitionToTransferDst(VKRImage &img, VkImageAspectFlags aspect, VulkanBarrierBatch *recordBarrier) { - if (img.layout == VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL) { - return; - } - VkImageAspectFlags imageAspect = aspect; - VkAccessFlags srcAccessMask = 0; - VkPipelineStageFlags srcStageMask = 0; - if (img.format == VK_FORMAT_D16_UNORM_S8_UINT || img.format == VK_FORMAT_D24_UNORM_S8_UINT || img.format == VK_FORMAT_D32_SFLOAT_S8_UINT) { - // Barrier must specify both for combined depth/stencil buffers. - imageAspect = VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT; - } else { - imageAspect = aspect; - } - - switch (img.layout) { - case VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL: - srcAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT; - srcStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT; - break; - case VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL: - srcAccessMask = VK_ACCESS_TRANSFER_READ_BIT; - srcStageMask = VK_PIPELINE_STAGE_TRANSFER_BIT; - break; - case VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL: - srcAccessMask = VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT; - srcStageMask = VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT | VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT; - break; - case VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL: - srcAccessMask = VK_ACCESS_SHADER_READ_BIT; - srcStageMask = VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT; - break; - default: - _dbg_assert_msg_(false, "Transition from this layout to transfer dst not supported (%d)", (int)img.layout); - break; - } - - recordBarrier->TransitionImage( - img.image, - 0, - 1, - img.numLayers, - aspect, - img.layout, - VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, - srcAccessMask, - VK_ACCESS_TRANSFER_WRITE_BIT, - srcStageMask, - VK_PIPELINE_STAGE_TRANSFER_BIT - ); - - img.layout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL; -} - void VulkanQueueRunner::SetupTransferDstWriteAfterWrite(VKRImage &img, VkImageAspectFlags aspect, VulkanBarrierBatch *recordBarrier) { VkImageAspectFlags imageAspect = aspect; VkAccessFlags srcAccessMask = 0; diff --git a/Common/GPU/Vulkan/VulkanQueueRunner.h b/Common/GPU/Vulkan/VulkanQueueRunner.h index ab39c7b06f..b489c111a5 100644 --- a/Common/GPU/Vulkan/VulkanQueueRunner.h +++ b/Common/GPU/Vulkan/VulkanQueueRunner.h @@ -289,8 +289,6 @@ private: void ApplySonicHack(std::vector &steps); void ApplyRenderPassMerge(std::vector &steps); - static void SetupTransitionToTransferSrc(VKRImage &img, VkImageAspectFlags aspect, VulkanBarrierBatch *recordBarrier); - static void SetupTransitionToTransferDst(VKRImage &img, VkImageAspectFlags aspect, VulkanBarrierBatch *recordBarrier); static void SetupTransferDstWriteAfterWrite(VKRImage &img, VkImageAspectFlags aspect, VulkanBarrierBatch *recordBarrier); VulkanContext *vulkan_; From 60f350056c55ea988bcdc459eb2f00d152e33efb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 7 Apr 2024 21:43:06 +0200 Subject: [PATCH 036/719] Vulkan: Optimize away a barrier in case of no depth buffer --- Common/GPU/Vulkan/VulkanBarrier.h | 1 + Common/GPU/Vulkan/VulkanQueueRunner.cpp | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Common/GPU/Vulkan/VulkanBarrier.h b/Common/GPU/Vulkan/VulkanBarrier.h index 74a25459e5..884e0919c7 100644 --- a/Common/GPU/Vulkan/VulkanBarrier.h +++ b/Common/GPU/Vulkan/VulkanBarrier.h @@ -17,6 +17,7 @@ public: bool empty() const { return imageBarriers_.empty(); } + // TODO: Replace this with TransitionImage. VkImageMemoryBarrier *Add(VkImage image, VkPipelineStageFlags srcStageMask, VkPipelineStageFlags dstStageMask, VkDependencyFlags dependencyFlags) { srcStageMask_ |= srcStageMask; dstStageMask_ |= dstStageMask; diff --git a/Common/GPU/Vulkan/VulkanQueueRunner.cpp b/Common/GPU/Vulkan/VulkanQueueRunner.cpp index 875e4dbbdf..f30979ee84 100644 --- a/Common/GPU/Vulkan/VulkanQueueRunner.cpp +++ b/Common/GPU/Vulkan/VulkanQueueRunner.cpp @@ -958,7 +958,6 @@ void VulkanQueueRunner::PerformRenderPass(const VKRStep &step, VkCommandBuffer c } // Write-after-write hazards. Fixed flicker in God of War on ARM (before we added another fix that removed these). - // These aren't so common so not bothering to combine the barrier with the pretransition one. if (step.render.framebuffer) { int n = 0; int stage = 0; @@ -976,7 +975,7 @@ void VulkanQueueRunner::PerformRenderPass(const VKRStep &step, VkCommandBuffer c VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT | VK_ACCESS_COLOR_ATTACHMENT_READ_BIT, VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT, VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT - ); + ); } if (step.render.framebuffer->depth.image != VK_NULL_HANDLE && step.render.framebuffer->depth.layout == VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL) { recordBarrier_.TransitionImage( @@ -995,8 +994,8 @@ void VulkanQueueRunner::PerformRenderPass(const VKRStep &step, VkCommandBuffer c } } - // This reads the layout of the color and depth images, and chooses a render pass using them that - // will transition to the desired final layout. + // This chooses a render pass according to the load/store attachment state. We no longer transition + // image layouts as part of the passes. // // NOTE: Unconditionally flushes recordBarrier_. VKRRenderPass *renderPass = PerformBindFramebufferAsRenderTarget(step, cmd); @@ -1282,7 +1281,9 @@ VKRRenderPass *VulkanQueueRunner::PerformBindFramebufferAsRenderTarget(const VKR } recordBarrier_.TransitionColorImageAuto(&fb->color, VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL); - if (fb->depth.image) { // } && RenderPassTypeHasDepth(step.render.renderPassType)) { + + // If the render pass doesn't touch depth, we can avoid a layout transition of the depth buffer. + if (fb->depth.image && RenderPassTypeHasDepth(step.render.renderPassType)) { recordBarrier_.TransitionDepthStencilImageAuto(&fb->depth, VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL); } From 036c386b359f36da22f6958374325c161b136b32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 7 Apr 2024 22:20:37 +0200 Subject: [PATCH 037/719] More barrier optimizations --- Common/GPU/Vulkan/VulkanQueueRunner.cpp | 30 +++++++++++++------------ 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/Common/GPU/Vulkan/VulkanQueueRunner.cpp b/Common/GPU/Vulkan/VulkanQueueRunner.cpp index f30979ee84..2da4894fa7 100644 --- a/Common/GPU/Vulkan/VulkanQueueRunner.cpp +++ b/Common/GPU/Vulkan/VulkanQueueRunner.cpp @@ -248,7 +248,6 @@ void VulkanQueueRunner::DestroyBackBuffers() { INFO_LOG(G3D, "Backbuffers destroyed"); } - // Self-dependency: https://github.com/gpuweb/gpuweb/issues/442#issuecomment-547604827 // Also see https://www.khronos.org/registry/vulkan/specs/1.3-extensions/html/vkspec.html#synchronization-pipeline-barriers-subpass-self-dependencies VKRRenderPass *VulkanQueueRunner::GetRenderPass(const RPKey &key) { @@ -958,6 +957,9 @@ void VulkanQueueRunner::PerformRenderPass(const VKRStep &step, VkCommandBuffer c } // Write-after-write hazards. Fixed flicker in God of War on ARM (before we added another fix that removed these). + // NOTE: These are commented out because the normal barriers no longer check for equality, effectively generating these + // barriers automatically. This is safe, but sometimes I think can be improved on. + /* if (step.render.framebuffer) { int n = 0; int stage = 0; @@ -988,11 +990,11 @@ void VulkanQueueRunner::PerformRenderPass(const VKRStep &step, VkCommandBuffer c VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL, VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT, VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT | VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT, - VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT | VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT, - VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT | VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT + VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT, + VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT, ); } - } + }*/ // This chooses a render pass according to the load/store attachment state. We no longer transition // image layouts as part of the passes. @@ -1221,15 +1223,13 @@ void VulkanQueueRunner::PerformRenderPass(const VKRStep &step, VkCommandBuffer c _dbg_assert_(recordBarrier_.empty()); if (fb) { - // If the desired final layout aren't the optimal layout needed next, transition. - recordBarrier_.TransitionColorImageAuto(&fb->color, step.render.finalColorLayout); - if (fb->depth.image) { + // If the desired final layout aren't the optimal layout needed next, early-transition the image. + if (step.render.finalColorLayout != fb->color.layout) { + recordBarrier_.TransitionColorImageAuto(&fb->color, step.render.finalColorLayout); + } + if (fb->depth.image && step.render.finalDepthStencilLayout != fb->depth.layout) { recordBarrier_.TransitionDepthStencilImageAuto(&fb->depth, step.render.finalDepthStencilLayout); } - recordBarrier_.Flush(cmd); - - fb->color.layout = step.render.finalColorLayout; - fb->depth.layout = step.render.finalDepthStencilLayout; } } @@ -1245,7 +1245,8 @@ VKRRenderPass *VulkanQueueRunner::PerformBindFramebufferAsRenderTarget(const VKR VkSampleCountFlagBits sampleCount; - recordBarrier_.Flush(cmd); + // Can be used to separate the final*Layout barrier from the rest for debugging in renderdoc. + // recordBarrier_.Flush(cmd); if (step.render.framebuffer) { _dbg_assert_(step.render.finalColorLayout != VK_IMAGE_LAYOUT_UNDEFINED); @@ -1272,6 +1273,7 @@ VKRRenderPass *VulkanQueueRunner::PerformBindFramebufferAsRenderTarget(const VKR step.render.colorLoad == VKRRenderPassLoadAction::CLEAR && vulkan_->GetPhysicalDeviceProperties().properties.driverVersion == 0xaa9c4b29; if (maliBugWorkaround) { + // A little suboptimal but let's go for maximum safety here. recordBarrier_.TransitionImage(fb->color.image, 0, 1, fb->numLayers, VK_IMAGE_ASPECT_COLOR_BIT, fb->color.layout, VK_IMAGE_LAYOUT_GENERAL, VK_ACCESS_COLOR_ATTACHMENT_READ_BIT | VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT, @@ -1463,6 +1465,7 @@ void VulkanQueueRunner::PerformCopy(const VKRStep &step, VkCommandBuffer cmd) { VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT ); + src->msaaColor.layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; recordBarrier_.TransitionImage( dst->msaaColor.image, 0, @@ -1476,7 +1479,6 @@ void VulkanQueueRunner::PerformCopy(const VKRStep &step, VkCommandBuffer cmd) { VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT ); - src->msaaColor.layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; dst->msaaColor.layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; } if (step.copy.aspectMask & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT)) { @@ -1493,6 +1495,7 @@ void VulkanQueueRunner::PerformCopy(const VKRStep &step, VkCommandBuffer cmd) { VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT | VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT ); + src->msaaDepth.layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; recordBarrier_.TransitionImage( dst->msaaDepth.image, 0, @@ -1506,7 +1509,6 @@ void VulkanQueueRunner::PerformCopy(const VKRStep &step, VkCommandBuffer cmd) { VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT | VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT ); - src->msaaDepth.layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; dst->msaaDepth.layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; } recordBarrier_.Flush(cmd); From b59247341660d8dc874420686865b177ec5a7491 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Mon, 8 Apr 2024 09:00:33 +0200 Subject: [PATCH 038/719] Vulkan: Add a missing barrier that got lost in the refactor --- Common/GPU/Vulkan/VulkanQueueRunner.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Common/GPU/Vulkan/VulkanQueueRunner.cpp b/Common/GPU/Vulkan/VulkanQueueRunner.cpp index 2da4894fa7..d97800ef76 100644 --- a/Common/GPU/Vulkan/VulkanQueueRunner.cpp +++ b/Common/GPU/Vulkan/VulkanQueueRunner.cpp @@ -1371,9 +1371,9 @@ void VulkanQueueRunner::PerformCopy(const VKRStep &step, VkCommandBuffer cmd) { // TODO: If dst covers exactly the whole destination, we can set up a UNDEFINED->TRANSFER_DST_OPTIMAL transition, // which can potentially be more efficient. - // First source barriers. if (step.copy.aspectMask & VK_IMAGE_ASPECT_COLOR_BIT) { recordBarrier_.TransitionColorImageAuto(&src->color, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL); + recordBarrier_.TransitionColorImageAuto(&dst->color, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL); } // We can't copy only depth or only stencil unfortunately - or can we?. @@ -1389,7 +1389,6 @@ void VulkanQueueRunner::PerformCopy(const VKRStep &step, VkCommandBuffer cmd) { SetupTransferDstWriteAfterWrite(dst->depth, VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT, &recordBarrier_); } } - recordBarrier_.Flush(cmd); bool multisampled = src->sampleCount != VK_SAMPLE_COUNT_1_BIT && dst->sampleCount != VK_SAMPLE_COUNT_1_BIT; if (multisampled) { @@ -1397,17 +1396,13 @@ void VulkanQueueRunner::PerformCopy(const VKRStep &step, VkCommandBuffer cmd) { // For that, we need to transition them from their normally permanent VK_*_ATTACHMENT_OPTIMAL layouts, and then back. if (step.copy.aspectMask & VK_IMAGE_ASPECT_COLOR_BIT) { recordBarrier_.TransitionColorImageAuto(&src->msaaColor, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL); - recordBarrier_.Flush(cmd); recordBarrier_.TransitionColorImageAuto(&dst->msaaColor, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL); - recordBarrier_.Flush(cmd); } if (step.copy.aspectMask & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT)) { // Kingdom Hearts: Subsequent copies to the same depth buffer without any other use. // Not super sure how that happens, but we need a barrier to pass sync validation. recordBarrier_.TransitionDepthStencilImageAuto(&src->msaaDepth, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL); - recordBarrier_.Flush(cmd); recordBarrier_.TransitionDepthStencilImageAuto(&dst->msaaDepth, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL); - recordBarrier_.Flush(cmd); } } @@ -1511,6 +1506,7 @@ void VulkanQueueRunner::PerformCopy(const VKRStep &step, VkCommandBuffer cmd) { ); dst->msaaDepth.layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; } + // Probably not necessary. recordBarrier_.Flush(cmd); } } From 22fa5f787bb84bfc598b9ac973ca1591ba59e45b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Mon, 8 Apr 2024 09:03:04 +0200 Subject: [PATCH 039/719] Optimize some barrier flags down to what's actually necessary. --- Common/GPU/Vulkan/VulkanBarrier.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Common/GPU/Vulkan/VulkanBarrier.cpp b/Common/GPU/Vulkan/VulkanBarrier.cpp index fa0a98bd16..25e487dd6a 100644 --- a/Common/GPU/Vulkan/VulkanBarrier.cpp +++ b/Common/GPU/Vulkan/VulkanBarrier.cpp @@ -62,7 +62,7 @@ void VulkanBarrierBatch::TransitionColorImageAuto( srcStageMask_ |= VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT; break; case VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL: - srcAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT | VK_ACCESS_COLOR_ATTACHMENT_READ_BIT; + srcAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT; srcStageMask_ |= VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT; break; case VK_IMAGE_LAYOUT_GENERAL: @@ -141,8 +141,8 @@ void VulkanBarrierBatch::TransitionDepthStencilImageAuto( srcStageMask_ |= VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT; break; case VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL: - srcAccessMask = VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT | VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT; - srcStageMask_ |= VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT | VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT; + srcAccessMask = VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT; + srcStageMask_ |= VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT; break; case VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL: // We only texture from images in the fragment shader, so can do this simply. @@ -177,7 +177,7 @@ void VulkanBarrierBatch::TransitionDepthStencilImageAuto( break; case VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL: dstAccessMask = VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT | VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT; - dstStageMask_ |= VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT | VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT; + dstStageMask_ |= VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT; break; default: _assert_msg_(false, "Unexpected newLayout: %s", VulkanImageLayoutToString(newImageLayout)); From e903287f4cc4a3c81215080fce25597e0ca12dff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Tue, 9 Apr 2024 11:58:35 +0200 Subject: [PATCH 040/719] Game info screen: Show list of any plugins that will be loaded on start of the game --- Common/Data/Format/IniFile.h | 7 +++-- Core/HLE/Plugins.cpp | 52 ++++++++++++++++-------------------- Core/HLE/Plugins.h | 16 +++++++++++ UI/GameScreen.cpp | 11 ++++++++ assets/lang/pt_BR.ini | 1 + 5 files changed, 54 insertions(+), 33 deletions(-) diff --git a/Common/Data/Format/IniFile.h b/Common/Data/Format/IniFile.h index 1103721ca9..8fa1e5c750 100644 --- a/Common/Data/Format/IniFile.h +++ b/Common/Data/Format/IniFile.h @@ -180,13 +180,12 @@ public: std::vector> &Sections() { return sections; } - bool HasSection(const char *section) { return GetSection(section) != 0; } + bool HasSection(const char *section) { return GetSection(section) != nullptr; } + const Section* GetSection(const char* section) const; + Section* GetSection(const char* section); Section* GetOrCreateSection(const char* section); private: std::vector> sections; - - const Section* GetSection(const char* section) const; - Section* GetSection(const char* section); }; diff --git a/Core/HLE/Plugins.cpp b/Core/HLE/Plugins.cpp index 91e29fba04..44b1249a74 100644 --- a/Core/HLE/Plugins.cpp +++ b/Core/HLE/Plugins.cpp @@ -41,18 +41,6 @@ std::map PluginDataKeys; static bool anyEnabled = false; static std::vector prxPlugins; -enum class PluginType { - INVALID = 0, - PRX, -}; - -struct PluginInfo { - PluginType type; - std::string filename; - int version; - uint32_t memory; -}; - static PluginInfo ReadPluginIni(const std::string &subdir, IniFile &ini) { PluginInfo info; @@ -66,11 +54,16 @@ static PluginInfo ReadPluginIni(const std::string &subdir, IniFile &ini) { } if (options->Get("filename", &value, "")) { + info.name = value; info.filename = "ms0:/PSP/PLUGINS/" + subdir + "/" + value; } else { info.type = PluginType::INVALID; } + if (options->Get("name", &value, "")) { + info.name = value; + } + options->Get("version", &info.version, 0); options->Get("memory", &info.memory, 0); if (info.memory > 93) { @@ -89,7 +82,7 @@ static PluginInfo ReadPluginIni(const std::string &subdir, IniFile &ini) { return info; } -static std::vector FindPlugins(const std::string &gameID, const std::string &lang) { +std::vector FindPlugins(const std::string &gameID, const std::string &lang) { std::vector pluginDirs; GetFilesInDir(GetSysDirectory(DIRECTORY_PLUGINS), &pluginDirs); @@ -110,23 +103,24 @@ static std::vector FindPlugins(const std::string &gameID, const std: std::string gameIni; // TODO: Should just use getsection and fail the ini if not found, I guess. - Section *games = ini.GetOrCreateSection("games"); - - if (games->Get(gameID.c_str(), &gameIni, "")) { - if (!strcasecmp(gameIni.c_str(), "true")) { - matches.insert("plugin.ini"); - } else if (!strcasecmp(gameIni.c_str(), "false")){ - continue; - } else if (!gameIni.empty()) { - matches.insert(gameIni); + const Section *games = ini.GetSection("games"); + if (games) { + if (games->Get(gameID.c_str(), &gameIni, "")) { + if (!strcasecmp(gameIni.c_str(), "true")) { + matches.insert("plugin.ini"); + } else if (!strcasecmp(gameIni.c_str(), "false")) { + continue; + } else if (!gameIni.empty()) { + matches.insert(gameIni); + } } - } - if (games->Get("ALL", &gameIni, "")) { - if (!strcasecmp(gameIni.c_str(), "true")) { - matches.insert("plugin.ini"); - } else if (!gameIni.empty()) { - matches.insert(gameIni); + if (games->Get("ALL", &gameIni, "")) { + if (!strcasecmp(gameIni.c_str(), "true")) { + matches.insert("plugin.ini"); + } else if (!gameIni.empty()) { + matches.insert(gameIni); + } } } @@ -196,7 +190,7 @@ bool Load() { ERROR_LOG(SYSTEM, "Unable to start plugin %s: %08x", filename.c_str(), ret); } else { std::string shortName = Path(filename).GetFilename(); - g_OSD.Show(OSDType::MESSAGE_SUCCESS, ApplySafeSubstitutions(sy->T("Loaded plugin: %1"), shortName)); + g_OSD.Show(OSDType::MESSAGE_SUCCESS, ApplySafeSubstitutions(sy->T("Loaded plugin: %1"), shortName), 6.0f); started = true; } diff --git a/Core/HLE/Plugins.h b/Core/HLE/Plugins.h index 3b5a2bd029..4c179fcf56 100644 --- a/Core/HLE/Plugins.h +++ b/Core/HLE/Plugins.h @@ -18,6 +18,7 @@ #pragma once #include +#include #include "Input/KeyCodes.h" class PointerWrap; @@ -34,6 +35,21 @@ void DoState(PointerWrap &p); bool HasEnabled(); +enum class PluginType { + INVALID = 0, + PRX, +}; + +struct PluginInfo { + PluginType type; + std::string name; + std::string filename; // PSP-space path. So we can't use a Path object. + int version; + uint32_t memory; +}; + +std::vector FindPlugins(const std::string &gameID, const std::string &lang); + void SetKey(int key, uint8_t value); uint8_t GetKey(int key); diff --git a/UI/GameScreen.cpp b/UI/GameScreen.cpp index dacd879545..88b4667f02 100644 --- a/UI/GameScreen.cpp +++ b/UI/GameScreen.cpp @@ -37,6 +37,7 @@ #include "Core/System.h" #include "Core/Loaders.h" #include "Core/Util/GameDB.h" +#include "Core/HLE/Plugins.h" #include "UI/OnScreenDisplay.h" #include "UI/CwCheatScreen.h" #include "UI/EmuScreen.h" @@ -150,6 +151,16 @@ void GameScreen::CreateViews() { tvVerified_ = infoLayout->Add(new NoticeView(NoticeLevel::INFO, ga->T("Click \"Calculate CRC\" to verify ISO"), "", new LinearLayoutParams(FILL_PARENT, WRAP_CONTENT))); tvVerified_->SetVisibility(UI::V_GONE); tvVerified_->SetSquishy(true); + + // Show plugin info, if any. Later might add checkboxes. + auto plugins = HLEPlugins::FindPlugins(info->id, g_Config.sLanguageIni); + if (!plugins.empty()) { + auto sy = GetI18NCategory(I18NCat::SYSTEM); + infoLayout->Add(new TextView(sy->T("Plugins"), ALIGN_LEFT, true)); + for (const auto &plugin : plugins) { + infoLayout->Add(new TextView(ApplySafeSubstitutions("* %1", plugin.name), ALIGN_LEFT, true)); + } + } } else { tvTitle_ = nullptr; tvID_ = nullptr; diff --git a/assets/lang/pt_BR.ini b/assets/lang/pt_BR.ini index a5e2328105..e6936e4e68 100644 --- a/assets/lang/pt_BR.ini +++ b/assets/lang/pt_BR.ini @@ -1274,6 +1274,7 @@ Change CPU Clock = Mudar o clock da CPU do PSP emulado (instável) CPU Core = Núcleo da CPU Dynarec/JIT (recommended) = Dynarec/JIT (recomendado) JIT using IR = JIT using IR +Plugins = Plugins Loaded plugin: %1 = Plugin carregado: %1 Memory Stick folder = Pasta do cartão de memória Memory Stick size = Tamanho do cartão de memória From 4b34e4cfb4fee7556ff925314b5b8658e48ba07b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Tue, 9 Apr 2024 13:13:02 +0200 Subject: [PATCH 041/719] Add option to disable plugins completely --- Core/Config.cpp | 1 + Core/Config.h | 1 + Core/HLE/Plugins.cpp | 5 +++++ UI/GameSettingsScreen.cpp | 1 + 4 files changed, 8 insertions(+) diff --git a/Core/Config.cpp b/Core/Config.cpp index 16931b749c..50f12cc59b 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -213,6 +213,7 @@ static const ConfigSetting generalSettings[] = { ConfigSetting("DisableHTTPS", &g_Config.bDisableHTTPS, false, CfgFlag::DONT_SAVE), ConfigSetting("AutoLoadSaveState", &g_Config.iAutoLoadSaveState, 0, CfgFlag::PER_GAME), ConfigSetting("EnableCheats", &g_Config.bEnableCheats, false, CfgFlag::PER_GAME | CfgFlag::REPORT), + ConfigSetting("EnablePlugins", &g_Config.bEnablePlugins, true, CfgFlag::PER_GAME | CfgFlag::REPORT), ConfigSetting("CwCheatRefreshRate", &g_Config.iCwCheatRefreshIntervalMs, 77, CfgFlag::PER_GAME), ConfigSetting("CwCheatScrollPosition", &g_Config.fCwCheatScrollPosition, 0.0f, CfgFlag::PER_GAME), ConfigSetting("GameListScrollPosition", &g_Config.fGameListScrollPosition, 0.0f, CfgFlag::DEFAULT), diff --git a/Core/Config.h b/Core/Config.h index 4596423313..2008572f1b 100644 --- a/Core/Config.h +++ b/Core/Config.h @@ -237,6 +237,7 @@ public: int iAutoLoadSaveState; // 0 = off, 1 = oldest, 2 = newest, >2 = slot number + 3 bool bEnableCheats; bool bReloadCheats; + bool bEnablePlugins; int iCwCheatRefreshIntervalMs; float fCwCheatScrollPosition; float fGameListScrollPosition; diff --git a/Core/HLE/Plugins.cpp b/Core/HLE/Plugins.cpp index 44b1249a74..8a65e9abda 100644 --- a/Core/HLE/Plugins.cpp +++ b/Core/HLE/Plugins.cpp @@ -178,6 +178,11 @@ bool Load() { auto sy = GetI18NCategory(I18NCat::SYSTEM); for (const std::string &filename : prxPlugins) { + if (!g_Config.bEnablePlugins) { + WARN_LOG(SYSTEM, "Plugins are disabled, ignoring enabled plugin %s", filename.c_str()); + continue; + } + std::string error_string = ""; SceUID module = KernelLoadModule(filename, &error_string); if (!error_string.empty() || module < 0) { diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp index 5d2ba62883..0f0d7a86dd 100644 --- a/UI/GameSettingsScreen.cpp +++ b/UI/GameSettingsScreen.cpp @@ -1208,6 +1208,7 @@ void GameSettingsScreen::CreateSystemSettings(UI::ViewGroup *systemSettings) { enableReportsCheckbox_->SetEnabled(Reporting::IsSupported()); return UI::EVENT_CONTINUE; }); + systemSettings->Add(new CheckBox(&g_Config.bEnablePlugins, sy->T("Enable plugins"))); systemSettings->Add(new ItemHeader(sy->T("PSP Settings"))); From 6df1c5c8f81c71a9c40008942f4dab8201fba634 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Tue, 9 Apr 2024 12:56:35 +0200 Subject: [PATCH 042/719] Add new strings --- assets/lang/ar_AE.ini | 2 ++ assets/lang/az_AZ.ini | 2 ++ assets/lang/bg_BG.ini | 2 ++ assets/lang/ca_ES.ini | 2 ++ assets/lang/cz_CZ.ini | 2 ++ assets/lang/da_DK.ini | 2 ++ assets/lang/de_DE.ini | 2 ++ assets/lang/dr_ID.ini | 2 ++ assets/lang/en_US.ini | 2 ++ assets/lang/es_ES.ini | 2 ++ assets/lang/es_LA.ini | 2 ++ assets/lang/fa_IR.ini | 2 ++ assets/lang/fi_FI.ini | 2 ++ assets/lang/fr_FR.ini | 2 ++ assets/lang/gl_ES.ini | 2 ++ assets/lang/gr_EL.ini | 2 ++ assets/lang/he_IL.ini | 2 ++ assets/lang/he_IL_invert.ini | 2 ++ assets/lang/hr_HR.ini | 2 ++ assets/lang/hu_HU.ini | 2 ++ assets/lang/id_ID.ini | 2 ++ assets/lang/it_IT.ini | 2 ++ assets/lang/ja_JP.ini | 2 ++ assets/lang/jv_ID.ini | 2 ++ assets/lang/ko_KR.ini | 2 ++ assets/lang/lo_LA.ini | 2 ++ assets/lang/lt-LT.ini | 2 ++ assets/lang/ms_MY.ini | 2 ++ assets/lang/nl_NL.ini | 2 ++ assets/lang/no_NO.ini | 2 ++ assets/lang/pl_PL.ini | 2 ++ assets/lang/pt_BR.ini | 3 ++- assets/lang/pt_PT.ini | 2 ++ assets/lang/ro_RO.ini | 2 ++ assets/lang/ru_RU.ini | 2 ++ assets/lang/sv_SE.ini | 2 ++ assets/lang/tg_PH.ini | 2 ++ assets/lang/th_TH.ini | 2 ++ assets/lang/tr_TR.ini | 2 ++ assets/lang/uk_UA.ini | 2 ++ assets/lang/vi_VN.ini | 2 ++ assets/lang/zh_CN.ini | 2 ++ assets/lang/zh_TW.ini | 2 ++ 43 files changed, 86 insertions(+), 1 deletion(-) diff --git a/assets/lang/ar_AE.ini b/assets/lang/ar_AE.ini index 2d7ed44700..8fe3928216 100644 --- a/assets/lang/ar_AE.ini +++ b/assets/lang/ar_AE.ini @@ -1265,6 +1265,7 @@ Color Saturation = Color Saturation Color Tint = Color Tint CPU Core = ‎أنوية المعالج Dynarec/JIT (recommended) = Dynarec/JIT (مُستَحسَن) +Enable plugins = Enable plugins Error: load undo state is from a different game = Error: load undo state is from a different game Failed to load state for load undo. Error in the file system. = Failed to load state for load undo. Error in the file system. Floating symbols = Floating symbols @@ -1321,6 +1322,7 @@ Off = ‎مغلق Oldest Save = Oldest save Only JPG and PNG images are supported = Only JPG and PNG images are supported Path does not exist! = Path does not exist! +Plugins = Plugins PSP Memory Stick = PSP Memory Stick PSP Model = ‎PSP موديل PSP Settings = ‎PSP إعدادات diff --git a/assets/lang/az_AZ.ini b/assets/lang/az_AZ.ini index e4ecf6f161..7f1a53c289 100644 --- a/assets/lang/az_AZ.ini +++ b/assets/lang/az_AZ.ini @@ -1257,6 +1257,7 @@ Color Saturation = Color Saturation Color Tint = Color Tint CPU Core = CPU core Dynarec/JIT (recommended) = Dynarec/JIT (tövsiyə) +Enable plugins = Enable plugins Error: load undo state is from a different game = Error: load undo state is from a different game Failed to load state for load undo. Error in the file system. = Failed to load state for load undo. Error in the file system. Floating symbols = Floating symbols @@ -1313,6 +1314,7 @@ Off = Off Oldest Save = Oldest save Only JPG and PNG images are supported = Only JPG and PNG images are supported Path does not exist! = Path does not exist! +Plugins = Plugins PSP Memory Stick = PSP Memory Stick PSP Model = PSP model PSP Settings = PSP settings diff --git a/assets/lang/bg_BG.ini b/assets/lang/bg_BG.ini index 914df34303..244e18e703 100644 --- a/assets/lang/bg_BG.ini +++ b/assets/lang/bg_BG.ini @@ -1257,6 +1257,7 @@ Color Saturation = Color Saturation Color Tint = Color Tint CPU Core = CPU core Dynarec/JIT (recommended) = Dynarec/JIT (препоръчително) +Enable plugins = Enable plugins Error: load undo state is from a different game = Error: load undo state is from a different game Failed to load state for load undo. Error in the file system. = Failed to load state for load undo. Error in the file system. Floating symbols = Floating symbols @@ -1313,6 +1314,7 @@ Off = Off Oldest Save = Oldest save Only JPG and PNG images are supported = Only JPG and PNG images are supported Path does not exist! = Path does not exist! +Plugins = Plugins PSP Memory Stick = PSP Memory Stick PSP Model = PSP серия PSP Settings = PSP настройки diff --git a/assets/lang/ca_ES.ini b/assets/lang/ca_ES.ini index 1fa83baf27..8c36eb3de0 100644 --- a/assets/lang/ca_ES.ini +++ b/assets/lang/ca_ES.ini @@ -1257,6 +1257,7 @@ Color Saturation = Color Saturation Color Tint = Color Tint CPU Core = Nucli de CPU Dynarec/JIT (recommended) = Dynarec/JIT (recomanat) +Enable plugins = Enable plugins Error: load undo state is from a different game = Error: load undo state is from a different game Failed to load state for load undo. Error in the file system. = Failed to load state for load undo. Error in the file system. Floating symbols = Floating symbols @@ -1313,6 +1314,7 @@ Off = Off Oldest Save = Oldest save Only JPG and PNG images are supported = Only JPG and PNG images are supported Path does not exist! = Path does not exist! +Plugins = Plugins PSP Memory Stick = PSP Memory Stick PSP Model = PSP model PSP Settings = PSP settings diff --git a/assets/lang/cz_CZ.ini b/assets/lang/cz_CZ.ini index 7cd0790da1..53d8b1d954 100644 --- a/assets/lang/cz_CZ.ini +++ b/assets/lang/cz_CZ.ini @@ -1257,6 +1257,7 @@ Color Saturation = Color Saturation Color Tint = Color Tint CPU Core = CPU core Dynarec/JIT (recommended) = Dynarec/JIT (recommended) +Enable plugins = Enable plugins Error: load undo state is from a different game = Error: load undo state is from a different game Failed to load state for load undo. Error in the file system. = Failed to load state for load undo. Error in the file system. Floating symbols = Floating symbols @@ -1313,6 +1314,7 @@ Off = Vypnuto Oldest Save = Oldest save Only JPG and PNG images are supported = Only JPG and PNG images are supported Path does not exist! = Path does not exist! +Plugins = Plugins PSP Memory Stick = PSP Memory Stick PSP Model = Model PSP PSP Settings = Nastavení PSP diff --git a/assets/lang/da_DK.ini b/assets/lang/da_DK.ini index 37d51b8609..1d4d60f871 100644 --- a/assets/lang/da_DK.ini +++ b/assets/lang/da_DK.ini @@ -1257,6 +1257,7 @@ Color Saturation = Color Saturation Color Tint = Color Tint CPU Core = CPU core Dynarec/JIT (recommended) = Dynarec/JIT (anbefalede) +Enable plugins = Enable plugins Error: load undo state is from a different game = Error: load undo state is from a different game Failed to load state for load undo. Error in the file system. = Failed to load state for load undo. Error in the file system. Floating symbols = Floating symbols @@ -1313,6 +1314,7 @@ Off = Off Oldest Save = Oldest save Only JPG and PNG images are supported = Only JPG and PNG images are supported Path does not exist! = Path does not exist! +Plugins = Plugins PSP Memory Stick = PSP Memory Stick PSP Model = PSP model PSP Settings = PSP indstillinger diff --git a/assets/lang/de_DE.ini b/assets/lang/de_DE.ini index b9349fbed5..cbfdeb8b64 100644 --- a/assets/lang/de_DE.ini +++ b/assets/lang/de_DE.ini @@ -1257,6 +1257,7 @@ Color Saturation = Color Saturation Color Tint = Color Tint CPU Core = CPU Kern Dynarec/JIT (recommended) = Dynarec/JIT (recommended) +Enable plugins = Enable plugins Error: load undo state is from a different game = Error: load undo state is from a different game Failed to load state for load undo. Error in the file system. = Failed to load state for load undo. Error in the file system. Floating symbols = Floating symbols @@ -1313,6 +1314,7 @@ Off = Aus Oldest Save = Ältester Spielstand Only JPG and PNG images are supported = Only JPG and PNG images are supported Path does not exist! = Path does not exist! +Plugins = Plugins PSP Memory Stick = PSP Memory Stick PSP Model = PSP Modell PSP Settings = PSP Einstellungen diff --git a/assets/lang/dr_ID.ini b/assets/lang/dr_ID.ini index 10cdbb919a..e72f15b969 100644 --- a/assets/lang/dr_ID.ini +++ b/assets/lang/dr_ID.ini @@ -1257,6 +1257,7 @@ Color Saturation = Color Saturation Color Tint = Color Tint CPU Core = CPU core Dynarec/JIT (recommended) = Dynarec/JIT (recommended) +Enable plugins = Enable plugins Error: load undo state is from a different game = Error: load undo state is from a different game Failed to load state for load undo. Error in the file system. = Failed to load state for load undo. Error in the file system. Floating symbols = Floating symbols @@ -1313,6 +1314,7 @@ Off = Off Oldest Save = Oldest save Only JPG and PNG images are supported = Only JPG and PNG images are supported Path does not exist! = Path does not exist! +Plugins = Plugins PSP Memory Stick = PSP Memory Stick PSP Model = PSP model PSP Settings = Pangngaturan PSP diff --git a/assets/lang/en_US.ini b/assets/lang/en_US.ini index 8d1d501402..ceba605bc2 100644 --- a/assets/lang/en_US.ini +++ b/assets/lang/en_US.ini @@ -1294,6 +1294,7 @@ Display Homebrew on a grid = Display "Homebrew && Demos" on a grid Display Recent on a grid = Display "Recent" on a grid Emulation = Emulation Enable Cheats = Enable cheats +Enable plugins = Enable plugins Enable Compatibility Server Reports = Enable compatibility server reports Error: load undo state is from a different game = Error: load undo state is from a different game Failed to load state. Error in the file system. = Failed to load state. Error in the file system. @@ -1327,6 +1328,7 @@ Off = Off Oldest Save = Oldest save Only JPG and PNG images are supported = Only JPG and PNG images are supported Path does not exist! = Path does not exist! +Plugins = Plugins PSP Memory Stick = PSP Memory Stick PSP Model = PSP model PSP Settings = PSP settings diff --git a/assets/lang/es_ES.ini b/assets/lang/es_ES.ini index 133ed6f33a..aa1499a6da 100644 --- a/assets/lang/es_ES.ini +++ b/assets/lang/es_ES.ini @@ -1258,6 +1258,7 @@ Color Saturation = Saturación de color Color Tint = Matiz de color CPU Core = Núcleo de CPU Dynarec/JIT (recommended) = Dynarec/JIT (recomendada) +Enable plugins = Enable plugins Error: load undo state is from a different game = Error: el estado es de otro juego. Failed to load state for load undo. Error in the file system. = Falló la reversión del estado debido a un error del archivo. Floating symbols = Símbolos flotantes @@ -1314,6 +1315,7 @@ Off = No Oldest Save = Partida guardada más antigua Only JPG and PNG images are supported = Only JPG and PNG images are supported Path does not exist! = ¡La ruta no existe! +Plugins = Plugins PSP Memory Stick = PSP Memory Stick PSP Model = Modelo de PSP PSP Settings = Ajustes de PSP diff --git a/assets/lang/es_LA.ini b/assets/lang/es_LA.ini index 9aea80aa77..86531960db 100644 --- a/assets/lang/es_LA.ini +++ b/assets/lang/es_LA.ini @@ -1259,6 +1259,7 @@ Color Saturation = Color Saturation Color Tint = Color Tint CPU Core = Núcleo de CPU Dynarec/JIT (recommended) = Dynarec/JIT (recomendado) +Enable plugins = Enable plugins Error: load undo state is from a different game = Error: el estado es de otro juego. Failed to load state for load undo. Error in the file system. = Falló la reversión del estado debido a un error del archivo. Floating symbols = Símbolos flotantes @@ -1315,6 +1316,7 @@ Off = No Oldest Save = Antiguos datos de guardado Only JPG and PNG images are supported = Only JPG and PNG images are supported Path does not exist! = La ruta no existe. +Plugins = Plugins PSP Memory Stick = Memory Stick de PSP PSP Model = Modelo de PSP PSP Settings = Ajustes de PSP diff --git a/assets/lang/fa_IR.ini b/assets/lang/fa_IR.ini index 6492fdca1c..b0b4df7938 100644 --- a/assets/lang/fa_IR.ini +++ b/assets/lang/fa_IR.ini @@ -1257,6 +1257,7 @@ Color Saturation = Color Saturation Color Tint = Color Tint CPU Core = ‎CPU هسته Dynarec/JIT (recommended) = Dynarec/JIT (recommended) +Enable plugins = Enable plugins Error: load undo state is from a different game = Error: load undo state is from a different game Failed to load state for load undo. Error in the file system. = Failed to load state for load undo. Error in the file system. Floating symbols = Floating symbols @@ -1313,6 +1314,7 @@ Off = ‎خاموش Oldest Save = قدیمی ترین ذخیره Only JPG and PNG images are supported = Only JPG and PNG images are supported Path does not exist! = مسیر فایل پیدا نشد +Plugins = Plugins PSP Memory Stick = حافظه psp PSP Model = ‎PSP مدل PSP Settings = ‎PSP تنظیمات diff --git a/assets/lang/fi_FI.ini b/assets/lang/fi_FI.ini index 9b6871daf4..647b574c97 100644 --- a/assets/lang/fi_FI.ini +++ b/assets/lang/fi_FI.ini @@ -1259,6 +1259,7 @@ Color Saturation = Värisaturaatio Color Tint = Värin sävy CPU Core = CPU core Dynarec/JIT (recommended) = Dynarec/JIT (recommended) +Enable plugins = Enable plugins Error: load undo state is from a different game = Virhe: "kumoa tilatallennuksen" tila on eri pelistä Failed to load state for load undo. Error in the file system. = Failed to load state for load undo. Error in the file system. Floating symbols = Leijuvat symbolit @@ -1315,6 +1316,7 @@ Off = Pois Oldest Save = Vanhin tallennus Only JPG and PNG images are supported = Only JPG and PNG images are supported Path does not exist! = Polkua ei ole olemassa! +Plugins = Plugins PSP Memory Stick = PSP-muistikortti PSP Model = PSP-malli PSP Settings = PSP-asetukset diff --git a/assets/lang/fr_FR.ini b/assets/lang/fr_FR.ini index ace8ccda22..986f5f8bf2 100644 --- a/assets/lang/fr_FR.ini +++ b/assets/lang/fr_FR.ini @@ -1248,6 +1248,7 @@ Color Saturation = Color Saturation Color Tint = Color Tint CPU Core = Méthode CPU Dynarec/JIT (recommended) = Dynarec/JIT (recommended) +Enable plugins = Enable plugins Error: load undo state is from a different game = Error: load undo state is from a different game Failed to load state for load undo. Error in the file system. = Failed to load state for load undo. Error in the file system. Floating symbols = Floating symbols @@ -1304,6 +1305,7 @@ Off = Désactivé Oldest Save = Le plus ancien état Only JPG and PNG images are supported = Only JPG and PNG images are supported Path does not exist! = Path does not exist! +Plugins = Plugins PSP Memory Stick = PSP Memory Stick PSP Model = Modèle de PSP PSP Settings = Paramètres de la PSP diff --git a/assets/lang/gl_ES.ini b/assets/lang/gl_ES.ini index ffee7a0fec..0f5cb0c8bb 100644 --- a/assets/lang/gl_ES.ini +++ b/assets/lang/gl_ES.ini @@ -1257,6 +1257,7 @@ Color Saturation = Color Saturation Color Tint = Color Tint CPU Core = CPU core Dynarec/JIT (recommended) = Dynarec/JIT (recomendado) +Enable plugins = Enable plugins Error: load undo state is from a different game = Error: load undo state is from a different game Failed to load state for load undo. Error in the file system. = Failed to load state for load undo. Error in the file system. Floating symbols = Floating symbols @@ -1313,6 +1314,7 @@ Off = Off Oldest Save = Oldest save Only JPG and PNG images are supported = Only JPG and PNG images are supported Path does not exist! = Path does not exist! +Plugins = Plugins PSP Memory Stick = PSP Memory Stick PSP Model = Modelo de PSP PSP Settings = Axustes de PSP diff --git a/assets/lang/gr_EL.ini b/assets/lang/gr_EL.ini index e388809975..e4bce29aa4 100644 --- a/assets/lang/gr_EL.ini +++ b/assets/lang/gr_EL.ini @@ -1257,6 +1257,7 @@ Color Saturation = Color Saturation Color Tint = Color Tint CPU Core = Πυρήνες CPU Dynarec/JIT (recommended) = Δυναμικός Αναμεταγλωττιστής/JIT (συνιστάται) +Enable plugins = Enable plugins Error: load undo state is from a different game = Error: load undo state is from a different game Failed to load state for load undo. Error in the file system. = Failed to load state for load undo. Error in the file system. Floating symbols = Floating symbols @@ -1313,6 +1314,7 @@ Off = Off Oldest Save = Παλαιότερο αρχείο αποθήκευσης Only JPG and PNG images are supported = Only JPG and PNG images are supported Path does not exist! = Path does not exist! +Plugins = Plugins PSP Memory Stick = PSP Memory Stick PSP Model = Μοντέλο PSP PSP Settings = Ρυθμίσεις PSP diff --git a/assets/lang/he_IL.ini b/assets/lang/he_IL.ini index 2335b3b7a2..7eb4ee44b5 100644 --- a/assets/lang/he_IL.ini +++ b/assets/lang/he_IL.ini @@ -1257,6 +1257,7 @@ Color Saturation = Color Saturation Color Tint = Color Tint CPU Core = CPU core Dynarec/JIT (recommended) = Dynarec/JIT (recommended) +Enable plugins = Enable plugins Error: load undo state is from a different game = Error: load undo state is from a different game Failed to load state for load undo. Error in the file system. = Failed to load state for load undo. Error in the file system. Floating symbols = Floating symbols @@ -1313,6 +1314,7 @@ Off = Off Oldest Save = Oldest save Only JPG and PNG images are supported = Only JPG and PNG images are supported Path does not exist! = Path does not exist! +Plugins = Plugins PSP Memory Stick = PSP Memory Stick PSP Model = PSP model PSP Settings = הגדרות PSP diff --git a/assets/lang/he_IL_invert.ini b/assets/lang/he_IL_invert.ini index dd15a264f3..ede886899a 100644 --- a/assets/lang/he_IL_invert.ini +++ b/assets/lang/he_IL_invert.ini @@ -1257,6 +1257,7 @@ Color Saturation = Color Saturation Color Tint = Color Tint CPU Core = CPU core Dynarec/JIT (recommended) = Dynarec/JIT (recommended) +Enable plugins = Enable plugins Error: load undo state is from a different game = Error: load undo state is from a different game Failed to load state for load undo. Error in the file system. = Failed to load state for load undo. Error in the file system. Floating symbols = Floating symbols @@ -1313,6 +1314,7 @@ Off = Off Oldest Save = Oldest save Only JPG and PNG images are supported = Only JPG and PNG images are supported Path does not exist! = Path does not exist! +Plugins = Plugins PSP Memory Stick = PSP Memory Stick PSP Model = PSP model PSP Settings = PSP תורדגה diff --git a/assets/lang/hr_HR.ini b/assets/lang/hr_HR.ini index 704196ffb7..9cac713e18 100644 --- a/assets/lang/hr_HR.ini +++ b/assets/lang/hr_HR.ini @@ -1257,6 +1257,7 @@ Color Saturation = Color Saturation Color Tint = Color Tint CPU Core = CPU jezgra Dynarec/JIT (recommended) = Dynarec/JIT (preporučeno) +Enable plugins = Enable plugins Error: load undo state is from a different game = Error: load undo state is from a different game Failed to load state for load undo. Error in the file system. = Failed to load state for load undo. Error in the file system. Floating symbols = Floating symbols @@ -1313,6 +1314,7 @@ Off = Isključeno Oldest Save = Najstariji save Only JPG and PNG images are supported = Only JPG and PNG images are supported Path does not exist! = Path does not exist! +Plugins = Plugins PSP Memory Stick = PSP Memory Stick PSP Model = PSP model PSP Settings = PSP opcije diff --git a/assets/lang/hu_HU.ini b/assets/lang/hu_HU.ini index 3e78a74914..92d9a2a51e 100644 --- a/assets/lang/hu_HU.ini +++ b/assets/lang/hu_HU.ini @@ -1257,6 +1257,7 @@ Color Saturation = Color Saturation Color Tint = Color Tint CPU Core = CPU mag Dynarec/JIT (recommended) = Dynarec/JIT (ajánlott) +Enable plugins = Enable plugins Error: load undo state is from a different game = Error: load undo state is from a different game Failed to load state for load undo. Error in the file system. = Failed to load state for load undo. Error in the file system. Floating symbols = Floating symbols @@ -1313,6 +1314,7 @@ Off = Ki Oldest Save = Legrégebbi mentés Only JPG and PNG images are supported = Only JPG and PNG images are supported Path does not exist! = Path does not exist! +Plugins = Plugins PSP Memory Stick = PSP Memory Stick PSP Model = PSP modell PSP Settings = PSP beállítások diff --git a/assets/lang/id_ID.ini b/assets/lang/id_ID.ini index 4de64678f7..1b75c42aba 100644 --- a/assets/lang/id_ID.ini +++ b/assets/lang/id_ID.ini @@ -1257,6 +1257,7 @@ Color Saturation = Saturasi warna Color Tint = Pewarnaan CPU Core = Inti CPU Dynarec/JIT (recommended) = Dynarec/JIT (direkomendasikan) +Enable plugins = Enable plugins Error: load undo state is from a different game = Kesalahan: memuat status yang berasal dari permainan yang berbeda Failed to load state for load undo. Error in the file system. = Gagal memuat status untuk membatalkan pemuatan. Kesalahan dalam sistem berkas. Floating symbols = Simbol mengambang @@ -1313,6 +1314,7 @@ Off = Mati Oldest Save = Simpanan lawas Only JPG and PNG images are supported = Only JPG and PNG images are supported Path does not exist! = Tidak ada jalur! +Plugins = Plugins PSP Memory Stick = PSP Memory Stick PSP Model = Model PSP PSP Settings = Pengaturan PSP diff --git a/assets/lang/it_IT.ini b/assets/lang/it_IT.ini index 6f49e7b32f..98f37ecb50 100644 --- a/assets/lang/it_IT.ini +++ b/assets/lang/it_IT.ini @@ -1258,6 +1258,7 @@ Color Saturation = Saturazione colore Color Tint = Tonalità colore CPU Core = Core CPU Dynarec/JIT (recommended) = Dynarec/JIT (recommended) +Enable plugins = Enable plugins Error: load undo state is from a different game = Errore: lo stato annullato proviene da un gioco diverso. Failed to load state for load undo. Error in the file system. = Impossibile caricare lo stato da un caricamento annullato. Errore nel file system. Floating symbols = Simboli fluttuanti @@ -1296,6 +1297,7 @@ Moving background = Spostamento dello sfondo No animation = Nessuna animazione Only JPG and PNG images are supported = Only JPG and PNG images are supported Path does not exist! = Il percorso non esiste! +Plugins = Plugins PSP Memory Stick = Memory Stick PSP Recent games = Giochi recenti Recording = Recording diff --git a/assets/lang/ja_JP.ini b/assets/lang/ja_JP.ini index 8841fc1dac..779c89c04a 100644 --- a/assets/lang/ja_JP.ini +++ b/assets/lang/ja_JP.ini @@ -1255,6 +1255,7 @@ Cache ISO in RAM = ISO全体をキャッシュする Change CPU Clock = CPUクロックを変更する (不安定) CPU Core = CPUコア Dynarec/JIT (recommended) = Dynarec/JIT (recommended) +Enable plugins = Enable plugins Error: load undo state is from a different game = Error: load undo state is from a different game Failed to load state for load undo. Error in the file system. = Failed to load state for load undo. Error in the file system. Floating symbols = Floating symbols @@ -1313,6 +1314,7 @@ Off = オフ Oldest Save = 最も古いセーブ Only JPG and PNG images are supported = Only JPG and PNG images are supported Path does not exist! = パスが存在しません +Plugins = Plugins PSP Memory Stick = メモリースティックの設定 PSP Model = PSPのモデル PSP Settings = PSPの設定 diff --git a/assets/lang/jv_ID.ini b/assets/lang/jv_ID.ini index 929c165828..3c01c7aeaf 100644 --- a/assets/lang/jv_ID.ini +++ b/assets/lang/jv_ID.ini @@ -1257,6 +1257,7 @@ Color Saturation = Color Saturation Color Tint = Color Tint CPU Core = CPU core Dynarec/JIT (recommended) = Dynarec/JIT (recommended) +Enable plugins = Enable plugins Error: load undo state is from a different game = Error: load undo state is from a different game Failed to load state for load undo. Error in the file system. = Failed to load state for load undo. Error in the file system. Floating symbols = Floating symbols @@ -1313,6 +1314,7 @@ Off = Mati Oldest Save = Oldest save Only JPG and PNG images are supported = Only JPG and PNG images are supported Path does not exist! = Path does not exist! +Plugins = Plugins PSP Memory Stick = PSP Memory Stick PSP Model = PSP model PSP Settings = Setelan PSP diff --git a/assets/lang/ko_KR.ini b/assets/lang/ko_KR.ini index 62fc4d246c..b983ba41f6 100644 --- a/assets/lang/ko_KR.ini +++ b/assets/lang/ko_KR.ini @@ -1247,6 +1247,7 @@ Cache ISO in RAM = RAM에 전체 ISO 캐시 Change CPU Clock = 에뮬레이트된 PSP의 CPU 클럭 변경 (불안정) CPU Core = CPU 코어 Dynarec/JIT (recommended) = 동적 재컴파일/JIT (추천) +Enable plugins = Enable plugins JIT using IR = IR을 이용한 JIT Loaded plugin: %1 = 로드된 플러그인: %1 Memory Stick folder = 메모리 스틱 폴더 @@ -1303,6 +1304,7 @@ Off = 끔 Oldest Save = 가장 오래된 저장 Only JPG and PNG images are supported = JPG 및 PNG 이미지만 지원됩니다. Path does not exist! = 경로가 존재하지 않습니다! +Plugins = Plugins PSP Memory Stick = PSP 메모리 스틱 PSP Model = PSP 모델 PSP Settings = PSP 설정 diff --git a/assets/lang/lo_LA.ini b/assets/lang/lo_LA.ini index a8213bae12..d95aa70a02 100644 --- a/assets/lang/lo_LA.ini +++ b/assets/lang/lo_LA.ini @@ -1257,6 +1257,7 @@ Color Saturation = Color Saturation Color Tint = Color Tint CPU Core = CPU core Dynarec/JIT (recommended) = Dynarec/JIT (recommended) +Enable plugins = Enable plugins Error: load undo state is from a different game = Error: load undo state is from a different game Failed to load state for load undo. Error in the file system. = Failed to load state for load undo. Error in the file system. Floating symbols = Floating symbols @@ -1313,6 +1314,7 @@ Off = ປິດ Oldest Save = Oldest save Only JPG and PNG images are supported = Only JPG and PNG images are supported Path does not exist! = Path does not exist! +Plugins = Plugins PSP Memory Stick = PSP Memory Stick PSP Model = ໂມເດລ PSP PSP Settings = ຕັ້ງຄ່າ PSP diff --git a/assets/lang/lt-LT.ini b/assets/lang/lt-LT.ini index 0e496ec97d..e4afc07aa3 100644 --- a/assets/lang/lt-LT.ini +++ b/assets/lang/lt-LT.ini @@ -1257,6 +1257,7 @@ Color Saturation = Color Saturation Color Tint = Color Tint CPU Core = CPU core Dynarec/JIT (recommended) = Dynarec/JIT (ieteicams) +Enable plugins = Enable plugins Error: load undo state is from a different game = Error: load undo state is from a different game Failed to load state for load undo. Error in the file system. = Failed to load state for load undo. Error in the file system. Floating symbols = Floating symbols @@ -1313,6 +1314,7 @@ Off = Off Oldest Save = Oldest save Only JPG and PNG images are supported = Only JPG and PNG images are supported Path does not exist! = Path does not exist! +Plugins = Plugins PSP Memory Stick = PSP Memory Stick PSP Model = Emuliuojamo PSP modelis PSP Settings = PSP parametrai diff --git a/assets/lang/ms_MY.ini b/assets/lang/ms_MY.ini index c803e82048..06303f0cf4 100644 --- a/assets/lang/ms_MY.ini +++ b/assets/lang/ms_MY.ini @@ -1257,6 +1257,7 @@ Color Saturation = Color Saturation Color Tint = Color Tint CPU Core = CPU core Dynarec/JIT (recommended) = Dynarec/JIT (recommended) +Enable plugins = Enable plugins Error: load undo state is from a different game = Error: load undo state is from a different game Failed to load state for load undo. Error in the file system. = Failed to load state for load undo. Error in the file system. Floating symbols = Floating symbols @@ -1313,6 +1314,7 @@ Off = Off Oldest Save = Oldest save Only JPG and PNG images are supported = Only JPG and PNG images are supported Path does not exist! = Path does not exist! +Plugins = Plugins PSP Memory Stick = PSP Memory Stick PSP Model = Model PSP PSP Settings = Tetapan PSP diff --git a/assets/lang/nl_NL.ini b/assets/lang/nl_NL.ini index 828ff6cde6..8e5b664b52 100644 --- a/assets/lang/nl_NL.ini +++ b/assets/lang/nl_NL.ini @@ -1257,6 +1257,7 @@ Color Saturation = Color Saturation Color Tint = Color Tint CPU Core = CPU-core Dynarec/JIT (recommended) = Dynarec/JIT (recommended) +Enable plugins = Enable plugins Error: load undo state is from a different game = Error: load undo state is from a different game Failed to load state for load undo. Error in the file system. = Failed to load state for load undo. Error in the file system. Floating symbols = Floating symbols @@ -1313,6 +1314,7 @@ Off = Uit Oldest Save = Oldest save Only JPG and PNG images are supported = Only JPG and PNG images are supported Path does not exist! = Path does not exist! +Plugins = Plugins PSP Memory Stick = PSP Memory Stick PSP Model = PSP-model PSP Settings = PSP-instellingen diff --git a/assets/lang/no_NO.ini b/assets/lang/no_NO.ini index 2d8fb72303..472139aed3 100644 --- a/assets/lang/no_NO.ini +++ b/assets/lang/no_NO.ini @@ -1257,6 +1257,7 @@ Color Saturation = Color Saturation Color Tint = Color Tint CPU Core = CPU core Dynarec/JIT (recommended) = Dynarec/JIT (anbefales) +Enable plugins = Enable plugins Error: load undo state is from a different game = Error: load undo state is from a different game Failed to load state for load undo. Error in the file system. = Failed to load state for load undo. Error in the file system. Floating symbols = Floating symbols @@ -1313,6 +1314,7 @@ Off = Off Oldest Save = Oldest save Only JPG and PNG images are supported = Only JPG and PNG images are supported Path does not exist! = Path does not exist! +Plugins = Plugins PSP Memory Stick = PSP Memory Stick PSP Model = PSP model PSP Settings = PSP settings diff --git a/assets/lang/pl_PL.ini b/assets/lang/pl_PL.ini index a017d995a2..794ef9e0a5 100644 --- a/assets/lang/pl_PL.ini +++ b/assets/lang/pl_PL.ini @@ -1263,6 +1263,7 @@ Color Saturation = Saturacja Color Tint = Odcień CPU Core = Rdzeń procesora Dynarec/JIT (recommended) = Dynarec/JIT (zalecana) +Enable plugins = Enable plugins Error: load undo state is from a different game = Błąd: ładowany stan pochodzi z innej gry Failed to load state for load undo. Error in the file system. = Błąd podczas ładowania stanu dla cofnięcia. Błąd systemu plików. Floating symbols = Przepływ symboli @@ -1319,6 +1320,7 @@ Off = Wył. Oldest Save = Najstarszy zapis Only JPG and PNG images are supported = Only JPG and PNG images are supported Path does not exist! = Ta ścieżka nie istnieje! +Plugins = Plugins PSP Memory Stick = Karta Pamięci PSP PSP Model = Model PSP PSP Settings = Ustawienia PSP diff --git a/assets/lang/pt_BR.ini b/assets/lang/pt_BR.ini index e6936e4e68..5d50b295b1 100644 --- a/assets/lang/pt_BR.ini +++ b/assets/lang/pt_BR.ini @@ -1273,8 +1273,8 @@ Cache ISO in RAM = Pôr a ISO inteira na RAM Change CPU Clock = Mudar o clock da CPU do PSP emulado (instável) CPU Core = Núcleo da CPU Dynarec/JIT (recommended) = Dynarec/JIT (recomendado) +Enable plugins = Enable plugins JIT using IR = JIT using IR -Plugins = Plugins Loaded plugin: %1 = Plugin carregado: %1 Memory Stick folder = Pasta do cartão de memória Memory Stick size = Tamanho do cartão de memória @@ -1330,6 +1330,7 @@ Off = Desligado Oldest Save = Save mais antigo Only JPG and PNG images are supported = Only JPG and PNG images are supported Path does not exist! = O caminho não existe! +Plugins = Plugins PSP Memory Stick = Cartão de Memória do PSP PSP Model = Modelo do PSP PSP Settings = Configurações do PSP diff --git a/assets/lang/pt_PT.ini b/assets/lang/pt_PT.ini index 0d1d7e85b9..51164cf7a8 100644 --- a/assets/lang/pt_PT.ini +++ b/assets/lang/pt_PT.ini @@ -1273,6 +1273,7 @@ Cache ISO in RAM = Colocar a ISO inteira na memória RAM Change CPU Clock = Mudar o clock da CPU da PSP emulado (instável) CPU Core = Núcleo da CPU Dynarec/JIT (recommended) = Dynarec/JIT (recomendado) +Enable plugins = Enable plugins Game crashed = O jogo crashou JIT using IR = JIT using IR Language = Idioma @@ -1329,6 +1330,7 @@ Off = Desativado Oldest Save = Salvamento mais antigo Only JPG and PNG images are supported = Only JPG and PNG images are supported Path does not exist! = O caminho não existe! +Plugins = Plugins PSP Memory Stick = Cartão de memória da PSP PSP Model = Modelo da PSP PSP Settings = Definições da PSP diff --git a/assets/lang/ro_RO.ini b/assets/lang/ro_RO.ini index bdf4b02888..45f02c64c0 100644 --- a/assets/lang/ro_RO.ini +++ b/assets/lang/ro_RO.ini @@ -1258,6 +1258,7 @@ Color Saturation = Color Saturation Color Tint = Color Tint CPU Core = CPU core Dynarec/JIT (recommended) = Dynarec/JIT (recommended) +Enable plugins = Enable plugins Error: load undo state is from a different game = Error: load undo state is from a different game Failed to load state for load undo. Error in the file system. = Failed to load state for load undo. Error in the file system. Floating symbols = Floating symbols @@ -1314,6 +1315,7 @@ Off = Off Oldest Save = Oldest save Only JPG and PNG images are supported = Only JPG and PNG images are supported Path does not exist! = Path does not exist! +Plugins = Plugins PSP Memory Stick = PSP Memory Stick PSP Model = Model PSP PSP Settings = Setări PSP diff --git a/assets/lang/ru_RU.ini b/assets/lang/ru_RU.ini index 934a66b91b..fe368aae39 100644 --- a/assets/lang/ru_RU.ini +++ b/assets/lang/ru_RU.ini @@ -1257,6 +1257,7 @@ Color Saturation = Насыщенность Color Tint = Оттенок цвета CPU Core = Ядро ЦП Dynarec/JIT (recommended) = Динамическая рекомпиляция/JIT (рекомендуемый) +Enable plugins = Enable plugins Game crashed = Игра вылетела JIT using IR = JIT с использованием IR Language = Язык @@ -1313,6 +1314,7 @@ Off = Отключено Oldest Save = Самое старое сохранение Only JPG and PNG images are supported = Поддерживаются только изображения в формате JPG и PNG Path does not exist! = Путь не существует! +Plugins = Plugins PSP Memory Stick = Карта памяти PSP PSP Model = Модель PSP PSP Settings = Настройки PSP diff --git a/assets/lang/sv_SE.ini b/assets/lang/sv_SE.ini index 3adc877fef..161873ae06 100644 --- a/assets/lang/sv_SE.ini +++ b/assets/lang/sv_SE.ini @@ -1258,6 +1258,7 @@ Color Saturation = Färgmättnad Color Tint = Färgförskjutning CPU Core = CPU-kärna Dynarec/JIT (recommended) = Dynarec/JIT (rekommenderas) +Enable plugins = Enable plugins Error: load undo state is from a different game = Error: load undo state is from a different game Failed to load state for load undo. Error in the file system. = Failed to load state for load undo. Error in the file system. Floating symbols = Flytande symboler @@ -1314,6 +1315,7 @@ Off = Off Oldest Save = Äldsta sparfilen Only JPG and PNG images are supported = Only JPG and PNG images are supported Path does not exist! = Path does not exist! +Plugins = Plugins PSP Memory Stick = PSP Memory Stick PSP Model = PSP-modell PSP Settings = PSP-inställningar diff --git a/assets/lang/tg_PH.ini b/assets/lang/tg_PH.ini index 2f0acc8672..a1b1730255 100644 --- a/assets/lang/tg_PH.ini +++ b/assets/lang/tg_PH.ini @@ -1260,6 +1260,7 @@ Color Saturation = Color Saturation Color Tint = Color Tint CPU Core = CPU core Dynarec/JIT (recommended) = Dynarec/JIT (inirerekomenda) +Enable plugins = Enable plugins Error: load undo state is from a different game = Error: ang load undo state ay mula sa ibang laro Failed to load state for load undo. Error in the file system. = Nabigong i-load ang estado para sa pag-undo ng pag-load. Error sa file system. Floating symbols = Lumulutang na mga simbolo @@ -1316,6 +1317,7 @@ Off = Nakapatay Oldest Save = Pinakalumang na i-save Only JPG and PNG images are supported = Tanging ang mga JPG at PNG na mga imahe ang sinusuportahan Path does not exist! = Hindi matagpuan ang sinasabing 'path'! +Plugins = Plugins PSP Memory Stick = PSP Memory Stick PSP Model = Modelo ng PSP PSP Settings = Settings ng PSP diff --git a/assets/lang/th_TH.ini b/assets/lang/th_TH.ini index a4d686d86f..a70761ea37 100644 --- a/assets/lang/th_TH.ini +++ b/assets/lang/th_TH.ini @@ -1304,6 +1304,7 @@ Dynarec/JIT (recommended) = ไดนาเร็ค/JIT (แนะนำ) Emulation = การจำลองเสมือน Enable Cheats = เปิดใช้งานสูตรโกง Enable Compatibility Server Reports = เปิดใช้การส่ง-แนบรายงานข้อมูลเกมไปยังเซิร์ฟเวอร์ +Enable plugins = Enable plugins Error: load undo state is from a different game = ข้อผิดพลาด: โหลดข้อมูลสเตทที่สำรองไว้ มาจากคนละเกมกัน Failed to load state for load undo. Error in the file system. = ล้มเหลวในการโหลดสเตทเกมที่สำรองไว้ เนื่องจากไฟล์ระบบเสียหาย Failed to load state. Error in the file system. = ล้มเหลวในการโหลดสเตทเกม เนื่องจากไฟล์ระบบเสียหาย @@ -1340,6 +1341,7 @@ Off = ปิด Oldest Save = เซฟอันเก่าสุด Only JPG and PNG images are supported = รองรับเฉพาะไฟล์รูปภาพนามสกุล JPG และ PNG Path does not exist! = ไม่มีเส้นทางนี้อยู่! +Plugins = Plugins PSP Memory Stick = แหล่งเก็บข้อมูล PSP PSP Model = โมเดลของ PSP PSP Settings = การตั้งค่า PSP diff --git a/assets/lang/tr_TR.ini b/assets/lang/tr_TR.ini index 346c7f6de4..2044f4f636 100644 --- a/assets/lang/tr_TR.ini +++ b/assets/lang/tr_TR.ini @@ -1258,6 +1258,7 @@ Color Saturation = Renk Doygunluğu Color Tint = Renk Tonu CPU Core = İşlemci Çekirdeği Dynarec/JIT (recommended) = Dynarec/JIT (tavsiye edilen) +Enable plugins = Enable plugins Error: load undo state is from a different game = Hata: yükleme geri alma durumu farklı bir oyundan Failed to load state for load undo. Error in the file system. = Yüklemeyi geri alma durumu yüklenemedi. Dosya sisteminde hata. Floating symbols = Kayan simgeler @@ -1314,6 +1315,7 @@ Off = Kapalı Oldest Save = En eski kayıt Only JPG and PNG images are supported = Only JPG and PNG images are supported Path does not exist! = Yol mevcut değil! +Plugins = Plugins PSP Memory Stick = PSP Hafıza Kartı PSP Model = PSP modeli PSP Settings = PSP ayarları diff --git a/assets/lang/uk_UA.ini b/assets/lang/uk_UA.ini index 2092010c12..12eb2055b1 100644 --- a/assets/lang/uk_UA.ini +++ b/assets/lang/uk_UA.ini @@ -1257,6 +1257,7 @@ Color Saturation = Color Saturation Color Tint = Color Tint CPU Core = Ядро CPU Dynarec/JIT (recommended) = Динамічна рекомпіляція/JIT (рекомендований) +Enable plugins = Enable plugins Error: load undo state is from a different game = Error: load undo state is from a different game Failed to load state for load undo. Error in the file system. = Failed to load state for load undo. Error in the file system. Floating symbols = Floating symbols @@ -1313,6 +1314,7 @@ Off = Вимкнено Oldest Save = Найстаріші збереження Only JPG and PNG images are supported = Only JPG and PNG images are supported Path does not exist! = Path does not exist! +Plugins = Plugins PSP Memory Stick = PSP Memory Stick PSP Model = Модель PSP PSP Settings = Налаштування PSP diff --git a/assets/lang/vi_VN.ini b/assets/lang/vi_VN.ini index 38cb1009a2..633be845ed 100644 --- a/assets/lang/vi_VN.ini +++ b/assets/lang/vi_VN.ini @@ -1257,6 +1257,7 @@ Color Saturation = Color Saturation Color Tint = Color Tint CPU Core = CPU core Dynarec/JIT (recommended) = Dynarec/JIT (khuyến khích) +Enable plugins = Enable plugins Error: load undo state is from a different game = Error: load undo state is from a different game Failed to load state for load undo. Error in the file system. = Failed to load state for load undo. Error in the file system. Floating symbols = Floating symbols @@ -1313,6 +1314,7 @@ Off = Tắt Oldest Save = Save cũ nhất Only JPG and PNG images are supported = Only JPG and PNG images are supported Path does not exist! = Path does not exist! +Plugins = Plugins PSP Memory Stick = PSP Memory Stick PSP Model = PSP model PSP Settings = Thiết lập PSP diff --git a/assets/lang/zh_CN.ini b/assets/lang/zh_CN.ini index 065566b891..37399b2c91 100644 --- a/assets/lang/zh_CN.ini +++ b/assets/lang/zh_CN.ini @@ -1248,9 +1248,11 @@ Cache ISO in RAM = 在内存中缓存完整ISO Change CPU Clock = 修改PSP的CPU频率 (不稳定) CPU Core = CPU核心模式 Dynarec/JIT (recommended) = 动态重编译 (推荐) +Enable plugins = Enable plugins JIT using IR = JIT using IR Loaded plugin: %1 = 已加载插件: %1 Only JPG and PNG images are supported = 只支持JPG和PNG图片 +Plugins = Plugins Recording = 录制中 RetroAchievements = 成就系统 Rewind Snapshot Interval = 倒带快照间隔 diff --git a/assets/lang/zh_TW.ini b/assets/lang/zh_TW.ini index 6796cac9da..aa407aef2f 100644 --- a/assets/lang/zh_TW.ini +++ b/assets/lang/zh_TW.ini @@ -1247,6 +1247,7 @@ Cache ISO in RAM = 將完整 ISO 快取於 RAM Change CPU Clock = 變更模擬 PSP CPU 時脈 (不穩定) CPU Core = CPU 核心 Dynarec/JIT (recommended) = 動態重新編譯/JIT +Enable plugins = Enable plugins Game crashed = 遊戲已當機 JIT using IR = JIT using IR Language = 語言 @@ -1303,6 +1304,7 @@ Off = 關閉 Oldest Save = 最舊存檔 Only JPG and PNG images are supported = Only JPG and PNG images are supported Path does not exist! = 路徑不存在！ +Plugins = Plugins PSP Memory Stick = PSP 記憶棒 PSP Model = PSP 型號 PSP Settings = PSP 設定 From 81057bf5359a9b516c49022cd1d3c27ffd6afab2 Mon Sep 17 00:00:00 2001 From: sum2012 Date: Tue, 9 Apr 2024 21:55:57 +0800 Subject: [PATCH 043/719] Try to fix loop in scePsmfPlayerGetVideoData Fix #19011 --- Core/HLE/scePsmf.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/HLE/scePsmf.cpp b/Core/HLE/scePsmf.cpp index 8f142bb456..d3057e5ed8 100644 --- a/Core/HLE/scePsmf.cpp +++ b/Core/HLE/scePsmf.cpp @@ -1616,7 +1616,7 @@ static int scePsmfPlayerGetVideoData(u32 psmfPlayer, u32 videoDataAddr) doVideoStep = false; } else { // This is an approximation, it should allow a certain amount ahead before skipping frames. - while (deltapts <= -(VIDEO_FRAME_DURATION_TS * 5)) { + while (!psmfplayer->mediaengine->IsVideoEnd() && deltapts <= -(VIDEO_FRAME_DURATION_TS * 5)) { psmfplayer->mediaengine->stepVideo(videoPixelMode, true); deltapts = psmfplayer->mediaengine->getVideoTimeStamp() - psmfplayer->mediaengine->getAudioTimeStamp(); } From 22d353ec8586066da04942f5022dea0e86c74cf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Tue, 9 Apr 2024 17:38:58 +0200 Subject: [PATCH 044/719] D3D11: Filter out useless compiler warning (about pow(-val, x)) --- GPU/D3D11/D3D11Util.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/GPU/D3D11/D3D11Util.cpp b/GPU/D3D11/D3D11Util.cpp index 9fd4c64a48..31a6980c16 100644 --- a/GPU/D3D11/D3D11Util.cpp +++ b/GPU/D3D11/D3D11Util.cpp @@ -28,7 +28,16 @@ std::vector CompileShaderToBytecodeD3D11(const char *code, size_t codeS errors = std::string((const char *)errorMsgs->GetBufferPointer(), errorMsgs->GetBufferSize()); std::string numberedCode = LineNumberString(code); if (SUCCEEDED(result)) { - WARN_LOG(G3D, "%s: %s", "warnings", errors.c_str()); + std::vector lines; + SplitString(errors, '\n', lines); + for (auto &line : lines) { + auto trimmed = StripSpaces(line); + // Ignore the useless warning about taking the power of negative numbers. + if (trimmed.find("pow(f, e) will not work for negative f") != std::string::npos) { + continue; + } + WARN_LOG(G3D, "%.*s", (int)trimmed.length(), trimmed.data()); + } } else { ERROR_LOG(G3D, "%s: %s\n\n%s", "errors", errors.c_str(), numberedCode.c_str()); } From ddd821b6ce81b6ff2a828c0294d0addf5ac9579f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Tue, 9 Apr 2024 17:41:56 +0200 Subject: [PATCH 045/719] Improve logging in pgd_open --- Core/HLE/sceIo.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Core/HLE/sceIo.cpp b/Core/HLE/sceIo.cpp index 875f807a66..d370f81438 100644 --- a/Core/HLE/sceIo.cpp +++ b/Core/HLE/sceIo.cpp @@ -2602,16 +2602,15 @@ int __IoIoctl(u32 id, u32 cmd, u32 indataPtr, u32 inlen, u32 outdataPtr, u32 out pspFileSystem.ReadFile(f->handle, pgd_header, 0x90); f->pgdInfo = pgd_open(pgd_header, 2, key_ptr); if (!f->pgdInfo) { - ERROR_LOG(SCEIO, "Not a valid PGD file. Examining."); f->npdrm = false; pspFileSystem.SeekFile(f->handle, (s32)0, FILEMOVE_BEGIN); if (memcmp(pgd_header, pgd_magic, 4) == 0) { - ERROR_LOG(SCEIO, "File is PGD file, but there's likely a key mismatch. Returning error."); + ERROR_LOG(SCEIO, "%s is PGD file, but there's likely a key mismatch. Returning error.", f->fullpath.c_str()); // File is PGD file, but key mismatch return ERROR_PGD_INVALID_HEADER; } else { - WARN_LOG(SCEIO, "File is not encrypted, proceeding."); - // File is decrypted. + INFO_LOG(SCEIO, "%s is not an encrypted PGD file as was expected. Proceeding.", f->fullpath.c_str()); + // File is not encrypted. return 0; } } else { From fd91611f4ffb67831ff606eaae8a397d9825570c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Tue, 9 Apr 2024 18:37:27 +0200 Subject: [PATCH 046/719] Add lieff/minimp3 library See https://github.com/lieff/minimp3 --- UWP/CommonUWP/CommonUWP.vcxproj | 5 +- UWP/CommonUWP/CommonUWP.vcxproj.filters | 12 + ext/minimp3/CMakeLists.txt | 12 + ext/minimp3/minimp3.cpp | 11 + ext/minimp3/minimp3.h | 1865 +++++++++++++++++++++++ ext/minimp3/minimp3_ex.h | 1397 +++++++++++++++++ 6 files changed, 3301 insertions(+), 1 deletion(-) create mode 100644 ext/minimp3/CMakeLists.txt create mode 100644 ext/minimp3/minimp3.cpp create mode 100644 ext/minimp3/minimp3.h create mode 100644 ext/minimp3/minimp3_ex.h diff --git a/UWP/CommonUWP/CommonUWP.vcxproj b/UWP/CommonUWP/CommonUWP.vcxproj index 8d594111a6..f9b157200e 100644 --- a/UWP/CommonUWP/CommonUWP.vcxproj +++ b/UWP/CommonUWP/CommonUWP.vcxproj @@ -254,6 +254,8 @@ + + @@ -396,6 +398,7 @@ + @@ -423,4 +426,4 @@ - + \ No newline at end of file diff --git a/UWP/CommonUWP/CommonUWP.vcxproj.filters b/UWP/CommonUWP/CommonUWP.vcxproj.filters index 262e1e7af3..0de87ec64c 100644 --- a/UWP/CommonUWP/CommonUWP.vcxproj.filters +++ b/UWP/CommonUWP/CommonUWP.vcxproj.filters @@ -97,6 +97,9 @@ {403c3154-5e8a-4da1-ba82-8f69bef25e14} + + {7b5c3ddc-225d-48d5-a829-9a1e71e304be} + @@ -456,6 +459,9 @@ ext\naett + + ext\minimp3 + @@ -865,6 +871,12 @@ Math + + ext\minimp3 + + + ext\minimp3 + diff --git a/ext/minimp3/CMakeLists.txt b/ext/minimp3/CMakeLists.txt new file mode 100644 index 0000000000..9f1b86afe5 --- /dev/null +++ b/ext/minimp3/CMakeLists.txt @@ -0,0 +1,12 @@ +cmake_minimum_required (VERSION 3.2.0) +project (minimp3) + +set(SRC_DIR .) + +# format +set(ALL_SOURCE_FILES + # rapi + ${SRC_DIR}/minimp3.cpp + ) + +add_library(minimp3 STATIC ${ALL_SOURCE_FILES}) diff --git a/ext/minimp3/minimp3.cpp b/ext/minimp3/minimp3.cpp new file mode 100644 index 0000000000..f4b41e0904 --- /dev/null +++ b/ext/minimp3/minimp3.cpp @@ -0,0 +1,11 @@ +// Gotta define it somewhere. +#define MINIMP3_IMPLEMENTATION +#define MINIMP3_NO_STDIO + +#ifdef _MSC_VER +#pragma warning(disable:4267) +#pragma warning(disable:4244) +#endif + +#include "minimp3.h" +#include "minimp3_ex.h" diff --git a/ext/minimp3/minimp3.h b/ext/minimp3/minimp3.h new file mode 100644 index 0000000000..3220ae1a85 --- /dev/null +++ b/ext/minimp3/minimp3.h @@ -0,0 +1,1865 @@ +#ifndef MINIMP3_H +#define MINIMP3_H +/* + https://github.com/lieff/minimp3 + To the extent possible under law, the author(s) have dedicated all copyright and related and neighboring rights to this software to the public domain worldwide. + This software is distributed without any warranty. + See . +*/ +#include + +#define MINIMP3_MAX_SAMPLES_PER_FRAME (1152*2) + +typedef struct +{ + int frame_bytes, frame_offset, channels, hz, layer, bitrate_kbps; +} mp3dec_frame_info_t; + +typedef struct +{ + float mdct_overlap[2][9*32], qmf_state[15*2*32]; + int reserv, free_format_bytes; + unsigned char header[4], reserv_buf[511]; +} mp3dec_t; + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +void mp3dec_init(mp3dec_t *dec); +#ifndef MINIMP3_FLOAT_OUTPUT +typedef int16_t mp3d_sample_t; +#else /* MINIMP3_FLOAT_OUTPUT */ +typedef float mp3d_sample_t; +void mp3dec_f32_to_s16(const float *in, int16_t *out, int num_samples); +#endif /* MINIMP3_FLOAT_OUTPUT */ +int mp3dec_decode_frame(mp3dec_t *dec, const uint8_t *mp3, int mp3_bytes, mp3d_sample_t *pcm, mp3dec_frame_info_t *info); + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* MINIMP3_H */ +#if defined(MINIMP3_IMPLEMENTATION) && !defined(_MINIMP3_IMPLEMENTATION_GUARD) +#define _MINIMP3_IMPLEMENTATION_GUARD + +#include +#include + +#define MAX_FREE_FORMAT_FRAME_SIZE 2304 /* more than ISO spec's */ +#ifndef MAX_FRAME_SYNC_MATCHES +#define MAX_FRAME_SYNC_MATCHES 10 +#endif /* MAX_FRAME_SYNC_MATCHES */ + +#define MAX_L3_FRAME_PAYLOAD_BYTES MAX_FREE_FORMAT_FRAME_SIZE /* MUST be >= 320000/8/32000*1152 = 1440 */ + +#define MAX_BITRESERVOIR_BYTES 511 +#define SHORT_BLOCK_TYPE 2 +#define STOP_BLOCK_TYPE 3 +#define MODE_MONO 3 +#define MODE_JOINT_STEREO 1 +#define HDR_SIZE 4 +#define HDR_IS_MONO(h) (((h[3]) & 0xC0) == 0xC0) +#define HDR_IS_MS_STEREO(h) (((h[3]) & 0xE0) == 0x60) +#define HDR_IS_FREE_FORMAT(h) (((h[2]) & 0xF0) == 0) +#define HDR_IS_CRC(h) (!((h[1]) & 1)) +#define HDR_TEST_PADDING(h) ((h[2]) & 0x2) +#define HDR_TEST_MPEG1(h) ((h[1]) & 0x8) +#define HDR_TEST_NOT_MPEG25(h) ((h[1]) & 0x10) +#define HDR_TEST_I_STEREO(h) ((h[3]) & 0x10) +#define HDR_TEST_MS_STEREO(h) ((h[3]) & 0x20) +#define HDR_GET_STEREO_MODE(h) (((h[3]) >> 6) & 3) +#define HDR_GET_STEREO_MODE_EXT(h) (((h[3]) >> 4) & 3) +#define HDR_GET_LAYER(h) (((h[1]) >> 1) & 3) +#define HDR_GET_BITRATE(h) ((h[2]) >> 4) +#define HDR_GET_SAMPLE_RATE(h) (((h[2]) >> 2) & 3) +#define HDR_GET_MY_SAMPLE_RATE(h) (HDR_GET_SAMPLE_RATE(h) + (((h[1] >> 3) & 1) + ((h[1] >> 4) & 1))*3) +#define HDR_IS_FRAME_576(h) ((h[1] & 14) == 2) +#define HDR_IS_LAYER_1(h) ((h[1] & 6) == 6) + +#define BITS_DEQUANTIZER_OUT -1 +#define MAX_SCF (255 + BITS_DEQUANTIZER_OUT*4 - 210) +#define MAX_SCFI ((MAX_SCF + 3) & ~3) + +#define MINIMP3_MIN(a, b) ((a) > (b) ? (b) : (a)) +#define MINIMP3_MAX(a, b) ((a) < (b) ? (b) : (a)) + +#if !defined(MINIMP3_NO_SIMD) + +#if !defined(MINIMP3_ONLY_SIMD) && (defined(_M_X64) || defined(__x86_64__) || defined(__aarch64__) || defined(_M_ARM64)) +/* x64 always have SSE2, arm64 always have neon, no need for generic code */ +#define MINIMP3_ONLY_SIMD +#endif /* SIMD checks... */ + +#if (defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_X64))) || ((defined(__i386__) || defined(__x86_64__)) && defined(__SSE2__)) +#if defined(_MSC_VER) +#include +#endif /* defined(_MSC_VER) */ +#include +#define HAVE_SSE 1 +#define HAVE_SIMD 1 +#define VSTORE _mm_storeu_ps +#define VLD _mm_loadu_ps +#define VSET _mm_set1_ps +#define VADD _mm_add_ps +#define VSUB _mm_sub_ps +#define VMUL _mm_mul_ps +#define VMAC(a, x, y) _mm_add_ps(a, _mm_mul_ps(x, y)) +#define VMSB(a, x, y) _mm_sub_ps(a, _mm_mul_ps(x, y)) +#define VMUL_S(x, s) _mm_mul_ps(x, _mm_set1_ps(s)) +#define VREV(x) _mm_shuffle_ps(x, x, _MM_SHUFFLE(0, 1, 2, 3)) +typedef __m128 f4; +#if defined(_MSC_VER) || defined(MINIMP3_ONLY_SIMD) +#define minimp3_cpuid __cpuid +#else /* defined(_MSC_VER) || defined(MINIMP3_ONLY_SIMD) */ +static __inline__ __attribute__((always_inline)) void minimp3_cpuid(int CPUInfo[], const int InfoType) +{ +#if defined(__PIC__) + __asm__ __volatile__( +#if defined(__x86_64__) + "push %%rbx\n" + "cpuid\n" + "xchgl %%ebx, %1\n" + "pop %%rbx\n" +#else /* defined(__x86_64__) */ + "xchgl %%ebx, %1\n" + "cpuid\n" + "xchgl %%ebx, %1\n" +#endif /* defined(__x86_64__) */ + : "=a" (CPUInfo[0]), "=r" (CPUInfo[1]), "=c" (CPUInfo[2]), "=d" (CPUInfo[3]) + : "a" (InfoType)); +#else /* defined(__PIC__) */ + __asm__ __volatile__( + "cpuid" + : "=a" (CPUInfo[0]), "=b" (CPUInfo[1]), "=c" (CPUInfo[2]), "=d" (CPUInfo[3]) + : "a" (InfoType)); +#endif /* defined(__PIC__)*/ +} +#endif /* defined(_MSC_VER) || defined(MINIMP3_ONLY_SIMD) */ +static int have_simd(void) +{ +#ifdef MINIMP3_ONLY_SIMD + return 1; +#else /* MINIMP3_ONLY_SIMD */ + static int g_have_simd; + int CPUInfo[4]; +#ifdef MINIMP3_TEST + static int g_counter; + if (g_counter++ > 100) + return 0; +#endif /* MINIMP3_TEST */ + if (g_have_simd) + goto end; + minimp3_cpuid(CPUInfo, 0); + g_have_simd = 1; + if (CPUInfo[0] > 0) + { + minimp3_cpuid(CPUInfo, 1); + g_have_simd = (CPUInfo[3] & (1 << 26)) + 1; /* SSE2 */ + } +end: + return g_have_simd - 1; +#endif /* MINIMP3_ONLY_SIMD */ +} +#elif defined(__ARM_NEON) || defined(__aarch64__) || defined(_M_ARM64) +#include +#define HAVE_SSE 0 +#define HAVE_SIMD 1 +#define VSTORE vst1q_f32 +#define VLD vld1q_f32 +#define VSET vmovq_n_f32 +#define VADD vaddq_f32 +#define VSUB vsubq_f32 +#define VMUL vmulq_f32 +#define VMAC(a, x, y) vmlaq_f32(a, x, y) +#define VMSB(a, x, y) vmlsq_f32(a, x, y) +#define VMUL_S(x, s) vmulq_f32(x, vmovq_n_f32(s)) +#define VREV(x) vcombine_f32(vget_high_f32(vrev64q_f32(x)), vget_low_f32(vrev64q_f32(x))) +typedef float32x4_t f4; +static int have_simd() +{ /* TODO: detect neon for !MINIMP3_ONLY_SIMD */ + return 1; +} +#else /* SIMD checks... */ +#define HAVE_SSE 0 +#define HAVE_SIMD 0 +#ifdef MINIMP3_ONLY_SIMD +#error MINIMP3_ONLY_SIMD used, but SSE/NEON not enabled +#endif /* MINIMP3_ONLY_SIMD */ +#endif /* SIMD checks... */ +#else /* !defined(MINIMP3_NO_SIMD) */ +#define HAVE_SIMD 0 +#endif /* !defined(MINIMP3_NO_SIMD) */ + +#if defined(__ARM_ARCH) && (__ARM_ARCH >= 6) && !defined(__aarch64__) && !defined(_M_ARM64) +#define HAVE_ARMV6 1 +static __inline__ __attribute__((always_inline)) int32_t minimp3_clip_int16_arm(int32_t a) +{ + int32_t x = 0; + __asm__ ("ssat %0, #16, %1" : "=r"(x) : "r"(a)); + return x; +} +#else +#define HAVE_ARMV6 0 +#endif + +typedef struct +{ + const uint8_t *buf; + int pos, limit; +} bs_t; + +typedef struct +{ + float scf[3*64]; + uint8_t total_bands, stereo_bands, bitalloc[64], scfcod[64]; +} L12_scale_info; + +typedef struct +{ + uint8_t tab_offset, code_tab_width, band_count; +} L12_subband_alloc_t; + +typedef struct +{ + const uint8_t *sfbtab; + uint16_t part_23_length, big_values, scalefac_compress; + uint8_t global_gain, block_type, mixed_block_flag, n_long_sfb, n_short_sfb; + uint8_t table_select[3], region_count[3], subblock_gain[3]; + uint8_t preflag, scalefac_scale, count1_table, scfsi; +} L3_gr_info_t; + +typedef struct +{ + bs_t bs; + uint8_t maindata[MAX_BITRESERVOIR_BYTES + MAX_L3_FRAME_PAYLOAD_BYTES]; + L3_gr_info_t gr_info[4]; + float grbuf[2][576], scf[40], syn[18 + 15][2*32]; + uint8_t ist_pos[2][39]; +} mp3dec_scratch_t; + +static void bs_init(bs_t *bs, const uint8_t *data, int bytes) +{ + bs->buf = data; + bs->pos = 0; + bs->limit = bytes*8; +} + +static uint32_t get_bits(bs_t *bs, int n) +{ + uint32_t next, cache = 0, s = bs->pos & 7; + int shl = n + s; + const uint8_t *p = bs->buf + (bs->pos >> 3); + if ((bs->pos += n) > bs->limit) + return 0; + next = *p++ & (255 >> s); + while ((shl -= 8) > 0) + { + cache |= next << shl; + next = *p++; + } + return cache | (next >> -shl); +} + +static int hdr_valid(const uint8_t *h) +{ + return h[0] == 0xff && + ((h[1] & 0xF0) == 0xf0 || (h[1] & 0xFE) == 0xe2) && + (HDR_GET_LAYER(h) != 0) && + (HDR_GET_BITRATE(h) != 15) && + (HDR_GET_SAMPLE_RATE(h) != 3); +} + +static int hdr_compare(const uint8_t *h1, const uint8_t *h2) +{ + return hdr_valid(h2) && + ((h1[1] ^ h2[1]) & 0xFE) == 0 && + ((h1[2] ^ h2[2]) & 0x0C) == 0 && + !(HDR_IS_FREE_FORMAT(h1) ^ HDR_IS_FREE_FORMAT(h2)); +} + +static unsigned hdr_bitrate_kbps(const uint8_t *h) +{ + static const uint8_t halfrate[2][3][15] = { + { { 0,4,8,12,16,20,24,28,32,40,48,56,64,72,80 }, { 0,4,8,12,16,20,24,28,32,40,48,56,64,72,80 }, { 0,16,24,28,32,40,48,56,64,72,80,88,96,112,128 } }, + { { 0,16,20,24,28,32,40,48,56,64,80,96,112,128,160 }, { 0,16,24,28,32,40,48,56,64,80,96,112,128,160,192 }, { 0,16,32,48,64,80,96,112,128,144,160,176,192,208,224 } }, + }; + return 2*halfrate[!!HDR_TEST_MPEG1(h)][HDR_GET_LAYER(h) - 1][HDR_GET_BITRATE(h)]; +} + +static unsigned hdr_sample_rate_hz(const uint8_t *h) +{ + static const unsigned g_hz[3] = { 44100, 48000, 32000 }; + return g_hz[HDR_GET_SAMPLE_RATE(h)] >> (int)!HDR_TEST_MPEG1(h) >> (int)!HDR_TEST_NOT_MPEG25(h); +} + +static unsigned hdr_frame_samples(const uint8_t *h) +{ + return HDR_IS_LAYER_1(h) ? 384 : (1152 >> (int)HDR_IS_FRAME_576(h)); +} + +static int hdr_frame_bytes(const uint8_t *h, int free_format_size) +{ + int frame_bytes = hdr_frame_samples(h)*hdr_bitrate_kbps(h)*125/hdr_sample_rate_hz(h); + if (HDR_IS_LAYER_1(h)) + { + frame_bytes &= ~3; /* slot align */ + } + return frame_bytes ? frame_bytes : free_format_size; +} + +static int hdr_padding(const uint8_t *h) +{ + return HDR_TEST_PADDING(h) ? (HDR_IS_LAYER_1(h) ? 4 : 1) : 0; +} + +#ifndef MINIMP3_ONLY_MP3 +static const L12_subband_alloc_t *L12_subband_alloc_table(const uint8_t *hdr, L12_scale_info *sci) +{ + const L12_subband_alloc_t *alloc; + int mode = HDR_GET_STEREO_MODE(hdr); + int nbands, stereo_bands = (mode == MODE_MONO) ? 0 : (mode == MODE_JOINT_STEREO) ? (HDR_GET_STEREO_MODE_EXT(hdr) << 2) + 4 : 32; + + if (HDR_IS_LAYER_1(hdr)) + { + static const L12_subband_alloc_t g_alloc_L1[] = { { 76, 4, 32 } }; + alloc = g_alloc_L1; + nbands = 32; + } else if (!HDR_TEST_MPEG1(hdr)) + { + static const L12_subband_alloc_t g_alloc_L2M2[] = { { 60, 4, 4 }, { 44, 3, 7 }, { 44, 2, 19 } }; + alloc = g_alloc_L2M2; + nbands = 30; + } else + { + static const L12_subband_alloc_t g_alloc_L2M1[] = { { 0, 4, 3 }, { 16, 4, 8 }, { 32, 3, 12 }, { 40, 2, 7 } }; + int sample_rate_idx = HDR_GET_SAMPLE_RATE(hdr); + unsigned kbps = hdr_bitrate_kbps(hdr) >> (int)(mode != MODE_MONO); + if (!kbps) /* free-format */ + { + kbps = 192; + } + + alloc = g_alloc_L2M1; + nbands = 27; + if (kbps < 56) + { + static const L12_subband_alloc_t g_alloc_L2M1_lowrate[] = { { 44, 4, 2 }, { 44, 3, 10 } }; + alloc = g_alloc_L2M1_lowrate; + nbands = sample_rate_idx == 2 ? 12 : 8; + } else if (kbps >= 96 && sample_rate_idx != 1) + { + nbands = 30; + } + } + + sci->total_bands = (uint8_t)nbands; + sci->stereo_bands = (uint8_t)MINIMP3_MIN(stereo_bands, nbands); + + return alloc; +} + +static void L12_read_scalefactors(bs_t *bs, uint8_t *pba, uint8_t *scfcod, int bands, float *scf) +{ + static const float g_deq_L12[18*3] = { +#define DQ(x) 9.53674316e-07f/x, 7.56931807e-07f/x, 6.00777173e-07f/x + DQ(3),DQ(7),DQ(15),DQ(31),DQ(63),DQ(127),DQ(255),DQ(511),DQ(1023),DQ(2047),DQ(4095),DQ(8191),DQ(16383),DQ(32767),DQ(65535),DQ(3),DQ(5),DQ(9) + }; + int i, m; + for (i = 0; i < bands; i++) + { + float s = 0; + int ba = *pba++; + int mask = ba ? 4 + ((19 >> scfcod[i]) & 3) : 0; + for (m = 4; m; m >>= 1) + { + if (mask & m) + { + int b = get_bits(bs, 6); + s = g_deq_L12[ba*3 - 6 + b % 3]*(1 << 21 >> b/3); + } + *scf++ = s; + } + } +} + +static void L12_read_scale_info(const uint8_t *hdr, bs_t *bs, L12_scale_info *sci) +{ + static const uint8_t g_bitalloc_code_tab[] = { + 0,17, 3, 4, 5,6,7, 8,9,10,11,12,13,14,15,16, + 0,17,18, 3,19,4,5, 6,7, 8, 9,10,11,12,13,16, + 0,17,18, 3,19,4,5,16, + 0,17,18,16, + 0,17,18,19, 4,5,6, 7,8, 9,10,11,12,13,14,15, + 0,17,18, 3,19,4,5, 6,7, 8, 9,10,11,12,13,14, + 0, 2, 3, 4, 5,6,7, 8,9,10,11,12,13,14,15,16 + }; + const L12_subband_alloc_t *subband_alloc = L12_subband_alloc_table(hdr, sci); + + int i, k = 0, ba_bits = 0; + const uint8_t *ba_code_tab = g_bitalloc_code_tab; + + for (i = 0; i < sci->total_bands; i++) + { + uint8_t ba; + if (i == k) + { + k += subband_alloc->band_count; + ba_bits = subband_alloc->code_tab_width; + ba_code_tab = g_bitalloc_code_tab + subband_alloc->tab_offset; + subband_alloc++; + } + ba = ba_code_tab[get_bits(bs, ba_bits)]; + sci->bitalloc[2*i] = ba; + if (i < sci->stereo_bands) + { + ba = ba_code_tab[get_bits(bs, ba_bits)]; + } + sci->bitalloc[2*i + 1] = sci->stereo_bands ? ba : 0; + } + + for (i = 0; i < 2*sci->total_bands; i++) + { + sci->scfcod[i] = sci->bitalloc[i] ? HDR_IS_LAYER_1(hdr) ? 2 : get_bits(bs, 2) : 6; + } + + L12_read_scalefactors(bs, sci->bitalloc, sci->scfcod, sci->total_bands*2, sci->scf); + + for (i = sci->stereo_bands; i < sci->total_bands; i++) + { + sci->bitalloc[2*i + 1] = 0; + } +} + +static int L12_dequantize_granule(float *grbuf, bs_t *bs, L12_scale_info *sci, int group_size) +{ + int i, j, k, choff = 576; + for (j = 0; j < 4; j++) + { + float *dst = grbuf + group_size*j; + for (i = 0; i < 2*sci->total_bands; i++) + { + int ba = sci->bitalloc[i]; + if (ba != 0) + { + if (ba < 17) + { + int half = (1 << (ba - 1)) - 1; + for (k = 0; k < group_size; k++) + { + dst[k] = (float)((int)get_bits(bs, ba) - half); + } + } else + { + unsigned mod = (2 << (ba - 17)) + 1; /* 3, 5, 9 */ + unsigned code = get_bits(bs, mod + 2 - (mod >> 3)); /* 5, 7, 10 */ + for (k = 0; k < group_size; k++, code /= mod) + { + dst[k] = (float)((int)(code % mod - mod/2)); + } + } + } + dst += choff; + choff = 18 - choff; + } + } + return group_size*4; +} + +static void L12_apply_scf_384(L12_scale_info *sci, const float *scf, float *dst) +{ + int i, k; + memcpy(dst + 576 + sci->stereo_bands*18, dst + sci->stereo_bands*18, (sci->total_bands - sci->stereo_bands)*18*sizeof(float)); + for (i = 0; i < sci->total_bands; i++, dst += 18, scf += 6) + { + for (k = 0; k < 12; k++) + { + dst[k + 0] *= scf[0]; + dst[k + 576] *= scf[3]; + } + } +} +#endif /* MINIMP3_ONLY_MP3 */ + +static int L3_read_side_info(bs_t *bs, L3_gr_info_t *gr, const uint8_t *hdr) +{ + static const uint8_t g_scf_long[8][23] = { + { 6,6,6,6,6,6,8,10,12,14,16,20,24,28,32,38,46,52,60,68,58,54,0 }, + { 12,12,12,12,12,12,16,20,24,28,32,40,48,56,64,76,90,2,2,2,2,2,0 }, + { 6,6,6,6,6,6,8,10,12,14,16,20,24,28,32,38,46,52,60,68,58,54,0 }, + { 6,6,6,6,6,6,8,10,12,14,16,18,22,26,32,38,46,54,62,70,76,36,0 }, + { 6,6,6,6,6,6,8,10,12,14,16,20,24,28,32,38,46,52,60,68,58,54,0 }, + { 4,4,4,4,4,4,6,6,8,8,10,12,16,20,24,28,34,42,50,54,76,158,0 }, + { 4,4,4,4,4,4,6,6,6,8,10,12,16,18,22,28,34,40,46,54,54,192,0 }, + { 4,4,4,4,4,4,6,6,8,10,12,16,20,24,30,38,46,56,68,84,102,26,0 } + }; + static const uint8_t g_scf_short[8][40] = { + { 4,4,4,4,4,4,4,4,4,6,6,6,8,8,8,10,10,10,12,12,12,14,14,14,18,18,18,24,24,24,30,30,30,40,40,40,18,18,18,0 }, + { 8,8,8,8,8,8,8,8,8,12,12,12,16,16,16,20,20,20,24,24,24,28,28,28,36,36,36,2,2,2,2,2,2,2,2,2,26,26,26,0 }, + { 4,4,4,4,4,4,4,4,4,6,6,6,6,6,6,8,8,8,10,10,10,14,14,14,18,18,18,26,26,26,32,32,32,42,42,42,18,18,18,0 }, + { 4,4,4,4,4,4,4,4,4,6,6,6,8,8,8,10,10,10,12,12,12,14,14,14,18,18,18,24,24,24,32,32,32,44,44,44,12,12,12,0 }, + { 4,4,4,4,4,4,4,4,4,6,6,6,8,8,8,10,10,10,12,12,12,14,14,14,18,18,18,24,24,24,30,30,30,40,40,40,18,18,18,0 }, + { 4,4,4,4,4,4,4,4,4,4,4,4,6,6,6,8,8,8,10,10,10,12,12,12,14,14,14,18,18,18,22,22,22,30,30,30,56,56,56,0 }, + { 4,4,4,4,4,4,4,4,4,4,4,4,6,6,6,6,6,6,10,10,10,12,12,12,14,14,14,16,16,16,20,20,20,26,26,26,66,66,66,0 }, + { 4,4,4,4,4,4,4,4,4,4,4,4,6,6,6,8,8,8,12,12,12,16,16,16,20,20,20,26,26,26,34,34,34,42,42,42,12,12,12,0 } + }; + static const uint8_t g_scf_mixed[8][40] = { + { 6,6,6,6,6,6,6,6,6,8,8,8,10,10,10,12,12,12,14,14,14,18,18,18,24,24,24,30,30,30,40,40,40,18,18,18,0 }, + { 12,12,12,4,4,4,8,8,8,12,12,12,16,16,16,20,20,20,24,24,24,28,28,28,36,36,36,2,2,2,2,2,2,2,2,2,26,26,26,0 }, + { 6,6,6,6,6,6,6,6,6,6,6,6,8,8,8,10,10,10,14,14,14,18,18,18,26,26,26,32,32,32,42,42,42,18,18,18,0 }, + { 6,6,6,6,6,6,6,6,6,8,8,8,10,10,10,12,12,12,14,14,14,18,18,18,24,24,24,32,32,32,44,44,44,12,12,12,0 }, + { 6,6,6,6,6,6,6,6,6,8,8,8,10,10,10,12,12,12,14,14,14,18,18,18,24,24,24,30,30,30,40,40,40,18,18,18,0 }, + { 4,4,4,4,4,4,6,6,4,4,4,6,6,6,8,8,8,10,10,10,12,12,12,14,14,14,18,18,18,22,22,22,30,30,30,56,56,56,0 }, + { 4,4,4,4,4,4,6,6,4,4,4,6,6,6,6,6,6,10,10,10,12,12,12,14,14,14,16,16,16,20,20,20,26,26,26,66,66,66,0 }, + { 4,4,4,4,4,4,6,6,4,4,4,6,6,6,8,8,8,12,12,12,16,16,16,20,20,20,26,26,26,34,34,34,42,42,42,12,12,12,0 } + }; + + unsigned tables, scfsi = 0; + int main_data_begin, part_23_sum = 0; + int sr_idx = HDR_GET_MY_SAMPLE_RATE(hdr); sr_idx -= (sr_idx != 0); + int gr_count = HDR_IS_MONO(hdr) ? 1 : 2; + + if (HDR_TEST_MPEG1(hdr)) + { + gr_count *= 2; + main_data_begin = get_bits(bs, 9); + scfsi = get_bits(bs, 7 + gr_count); + } else + { + main_data_begin = get_bits(bs, 8 + gr_count) >> gr_count; + } + + do + { + if (HDR_IS_MONO(hdr)) + { + scfsi <<= 4; + } + gr->part_23_length = (uint16_t)get_bits(bs, 12); + part_23_sum += gr->part_23_length; + gr->big_values = (uint16_t)get_bits(bs, 9); + if (gr->big_values > 288) + { + return -1; + } + gr->global_gain = (uint8_t)get_bits(bs, 8); + gr->scalefac_compress = (uint16_t)get_bits(bs, HDR_TEST_MPEG1(hdr) ? 4 : 9); + gr->sfbtab = g_scf_long[sr_idx]; + gr->n_long_sfb = 22; + gr->n_short_sfb = 0; + if (get_bits(bs, 1)) + { + gr->block_type = (uint8_t)get_bits(bs, 2); + if (!gr->block_type) + { + return -1; + } + gr->mixed_block_flag = (uint8_t)get_bits(bs, 1); + gr->region_count[0] = 7; + gr->region_count[1] = 255; + if (gr->block_type == SHORT_BLOCK_TYPE) + { + scfsi &= 0x0F0F; + if (!gr->mixed_block_flag) + { + gr->region_count[0] = 8; + gr->sfbtab = g_scf_short[sr_idx]; + gr->n_long_sfb = 0; + gr->n_short_sfb = 39; + } else + { + gr->sfbtab = g_scf_mixed[sr_idx]; + gr->n_long_sfb = HDR_TEST_MPEG1(hdr) ? 8 : 6; + gr->n_short_sfb = 30; + } + } + tables = get_bits(bs, 10); + tables <<= 5; + gr->subblock_gain[0] = (uint8_t)get_bits(bs, 3); + gr->subblock_gain[1] = (uint8_t)get_bits(bs, 3); + gr->subblock_gain[2] = (uint8_t)get_bits(bs, 3); + } else + { + gr->block_type = 0; + gr->mixed_block_flag = 0; + tables = get_bits(bs, 15); + gr->region_count[0] = (uint8_t)get_bits(bs, 4); + gr->region_count[1] = (uint8_t)get_bits(bs, 3); + gr->region_count[2] = 255; + } + gr->table_select[0] = (uint8_t)(tables >> 10); + gr->table_select[1] = (uint8_t)((tables >> 5) & 31); + gr->table_select[2] = (uint8_t)((tables) & 31); + gr->preflag = HDR_TEST_MPEG1(hdr) ? get_bits(bs, 1) : (gr->scalefac_compress >= 500); + gr->scalefac_scale = (uint8_t)get_bits(bs, 1); + gr->count1_table = (uint8_t)get_bits(bs, 1); + gr->scfsi = (uint8_t)((scfsi >> 12) & 15); + scfsi <<= 4; + gr++; + } while(--gr_count); + + if (part_23_sum + bs->pos > bs->limit + main_data_begin*8) + { + return -1; + } + + return main_data_begin; +} + +static void L3_read_scalefactors(uint8_t *scf, uint8_t *ist_pos, const uint8_t *scf_size, const uint8_t *scf_count, bs_t *bitbuf, int scfsi) +{ + int i, k; + for (i = 0; i < 4 && scf_count[i]; i++, scfsi *= 2) + { + int cnt = scf_count[i]; + if (scfsi & 8) + { + memcpy(scf, ist_pos, cnt); + } else + { + int bits = scf_size[i]; + if (!bits) + { + memset(scf, 0, cnt); + memset(ist_pos, 0, cnt); + } else + { + int max_scf = (scfsi < 0) ? (1 << bits) - 1 : -1; + for (k = 0; k < cnt; k++) + { + int s = get_bits(bitbuf, bits); + ist_pos[k] = (s == max_scf ? -1 : s); + scf[k] = s; + } + } + } + ist_pos += cnt; + scf += cnt; + } + scf[0] = scf[1] = scf[2] = 0; +} + +static float L3_ldexp_q2(float y, int exp_q2) +{ + static const float g_expfrac[4] = { 9.31322575e-10f,7.83145814e-10f,6.58544508e-10f,5.53767716e-10f }; + int e; + do + { + e = MINIMP3_MIN(30*4, exp_q2); + y *= g_expfrac[e & 3]*(1 << 30 >> (e >> 2)); + } while ((exp_q2 -= e) > 0); + return y; +} + +static void L3_decode_scalefactors(const uint8_t *hdr, uint8_t *ist_pos, bs_t *bs, const L3_gr_info_t *gr, float *scf, int ch) +{ + static const uint8_t g_scf_partitions[3][28] = { + { 6,5,5, 5,6,5,5,5,6,5, 7,3,11,10,0,0, 7, 7, 7,0, 6, 6,6,3, 8, 8,5,0 }, + { 8,9,6,12,6,9,9,9,6,9,12,6,15,18,0,0, 6,15,12,0, 6,12,9,6, 6,18,9,0 }, + { 9,9,6,12,9,9,9,9,9,9,12,6,18,18,0,0,12,12,12,0,12, 9,9,6,15,12,9,0 } + }; + const uint8_t *scf_partition = g_scf_partitions[!!gr->n_short_sfb + !gr->n_long_sfb]; + uint8_t scf_size[4], iscf[40]; + int i, scf_shift = gr->scalefac_scale + 1, gain_exp, scfsi = gr->scfsi; + float gain; + + if (HDR_TEST_MPEG1(hdr)) + { + static const uint8_t g_scfc_decode[16] = { 0,1,2,3, 12,5,6,7, 9,10,11,13, 14,15,18,19 }; + int part = g_scfc_decode[gr->scalefac_compress]; + scf_size[1] = scf_size[0] = (uint8_t)(part >> 2); + scf_size[3] = scf_size[2] = (uint8_t)(part & 3); + } else + { + static const uint8_t g_mod[6*4] = { 5,5,4,4,5,5,4,1,4,3,1,1,5,6,6,1,4,4,4,1,4,3,1,1 }; + int k, modprod, sfc, ist = HDR_TEST_I_STEREO(hdr) && ch; + sfc = gr->scalefac_compress >> ist; + for (k = ist*3*4; sfc >= 0; sfc -= modprod, k += 4) + { + for (modprod = 1, i = 3; i >= 0; i--) + { + scf_size[i] = (uint8_t)(sfc / modprod % g_mod[k + i]); + modprod *= g_mod[k + i]; + } + } + scf_partition += k; + scfsi = -16; + } + L3_read_scalefactors(iscf, ist_pos, scf_size, scf_partition, bs, scfsi); + + if (gr->n_short_sfb) + { + int sh = 3 - scf_shift; + for (i = 0; i < gr->n_short_sfb; i += 3) + { + iscf[gr->n_long_sfb + i + 0] += gr->subblock_gain[0] << sh; + iscf[gr->n_long_sfb + i + 1] += gr->subblock_gain[1] << sh; + iscf[gr->n_long_sfb + i + 2] += gr->subblock_gain[2] << sh; + } + } else if (gr->preflag) + { + static const uint8_t g_preamp[10] = { 1,1,1,1,2,2,3,3,3,2 }; + for (i = 0; i < 10; i++) + { + iscf[11 + i] += g_preamp[i]; + } + } + + gain_exp = gr->global_gain + BITS_DEQUANTIZER_OUT*4 - 210 - (HDR_IS_MS_STEREO(hdr) ? 2 : 0); + gain = L3_ldexp_q2(1 << (MAX_SCFI/4), MAX_SCFI - gain_exp); + for (i = 0; i < (int)(gr->n_long_sfb + gr->n_short_sfb); i++) + { + scf[i] = L3_ldexp_q2(gain, iscf[i] << scf_shift); + } +} + +static const float g_pow43[129 + 16] = { + 0,-1,-2.519842f,-4.326749f,-6.349604f,-8.549880f,-10.902724f,-13.390518f,-16.000000f,-18.720754f,-21.544347f,-24.463781f,-27.473142f,-30.567351f,-33.741992f,-36.993181f, + 0,1,2.519842f,4.326749f,6.349604f,8.549880f,10.902724f,13.390518f,16.000000f,18.720754f,21.544347f,24.463781f,27.473142f,30.567351f,33.741992f,36.993181f,40.317474f,43.711787f,47.173345f,50.699631f,54.288352f,57.937408f,61.644865f,65.408941f,69.227979f,73.100443f,77.024898f,81.000000f,85.024491f,89.097188f,93.216975f,97.382800f,101.593667f,105.848633f,110.146801f,114.487321f,118.869381f,123.292209f,127.755065f,132.257246f,136.798076f,141.376907f,145.993119f,150.646117f,155.335327f,160.060199f,164.820202f,169.614826f,174.443577f,179.305980f,184.201575f,189.129918f,194.090580f,199.083145f,204.107210f,209.162385f,214.248292f,219.364564f,224.510845f,229.686789f,234.892058f,240.126328f,245.389280f,250.680604f,256.000000f,261.347174f,266.721841f,272.123723f,277.552547f,283.008049f,288.489971f,293.998060f,299.532071f,305.091761f,310.676898f,316.287249f,321.922592f,327.582707f,333.267377f,338.976394f,344.709550f,350.466646f,356.247482f,362.051866f,367.879608f,373.730522f,379.604427f,385.501143f,391.420496f,397.362314f,403.326427f,409.312672f,415.320884f,421.350905f,427.402579f,433.475750f,439.570269f,445.685987f,451.822757f,457.980436f,464.158883f,470.357960f,476.577530f,482.817459f,489.077615f,495.357868f,501.658090f,507.978156f,514.317941f,520.677324f,527.056184f,533.454404f,539.871867f,546.308458f,552.764065f,559.238575f,565.731879f,572.243870f,578.774440f,585.323483f,591.890898f,598.476581f,605.080431f,611.702349f,618.342238f,625.000000f,631.675540f,638.368763f,645.079578f +}; + +static float L3_pow_43(int x) +{ + float frac; + int sign, mult = 256; + + if (x < 129) + { + return g_pow43[16 + x]; + } + + if (x < 1024) + { + mult = 16; + x <<= 3; + } + + sign = 2*x & 64; + frac = (float)((x & 63) - sign) / ((x & ~63) + sign); + return g_pow43[16 + ((x + sign) >> 6)]*(1.f + frac*((4.f/3) + frac*(2.f/9)))*mult; +} + +static void L3_huffman(float *dst, bs_t *bs, const L3_gr_info_t *gr_info, const float *scf, int layer3gr_limit) +{ + static const int16_t tabs[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 785,785,785,785,784,784,784,784,513,513,513,513,513,513,513,513,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256, + -255,1313,1298,1282,785,785,785,785,784,784,784,784,769,769,769,769,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,290,288, + -255,1313,1298,1282,769,769,769,769,529,529,529,529,529,529,529,529,528,528,528,528,528,528,528,528,512,512,512,512,512,512,512,512,290,288, + -253,-318,-351,-367,785,785,785,785,784,784,784,784,769,769,769,769,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,819,818,547,547,275,275,275,275,561,560,515,546,289,274,288,258, + -254,-287,1329,1299,1314,1312,1057,1057,1042,1042,1026,1026,784,784,784,784,529,529,529,529,529,529,529,529,769,769,769,769,768,768,768,768,563,560,306,306,291,259, + -252,-413,-477,-542,1298,-575,1041,1041,784,784,784,784,769,769,769,769,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,-383,-399,1107,1092,1106,1061,849,849,789,789,1104,1091,773,773,1076,1075,341,340,325,309,834,804,577,577,532,532,516,516,832,818,803,816,561,561,531,531,515,546,289,289,288,258, + -252,-429,-493,-559,1057,1057,1042,1042,529,529,529,529,529,529,529,529,784,784,784,784,769,769,769,769,512,512,512,512,512,512,512,512,-382,1077,-415,1106,1061,1104,849,849,789,789,1091,1076,1029,1075,834,834,597,581,340,340,339,324,804,833,532,532,832,772,818,803,817,787,816,771,290,290,290,290,288,258, + -253,-349,-414,-447,-463,1329,1299,-479,1314,1312,1057,1057,1042,1042,1026,1026,785,785,785,785,784,784,784,784,769,769,769,769,768,768,768,768,-319,851,821,-335,836,850,805,849,341,340,325,336,533,533,579,579,564,564,773,832,578,548,563,516,321,276,306,291,304,259, + -251,-572,-733,-830,-863,-879,1041,1041,784,784,784,784,769,769,769,769,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,-511,-527,-543,1396,1351,1381,1366,1395,1335,1380,-559,1334,1138,1138,1063,1063,1350,1392,1031,1031,1062,1062,1364,1363,1120,1120,1333,1348,881,881,881,881,375,374,359,373,343,358,341,325,791,791,1123,1122,-703,1105,1045,-719,865,865,790,790,774,774,1104,1029,338,293,323,308,-799,-815,833,788,772,818,803,816,322,292,307,320,561,531,515,546,289,274,288,258, + -251,-525,-605,-685,-765,-831,-846,1298,1057,1057,1312,1282,785,785,785,785,784,784,784,784,769,769,769,769,512,512,512,512,512,512,512,512,1399,1398,1383,1367,1382,1396,1351,-511,1381,1366,1139,1139,1079,1079,1124,1124,1364,1349,1363,1333,882,882,882,882,807,807,807,807,1094,1094,1136,1136,373,341,535,535,881,775,867,822,774,-591,324,338,-671,849,550,550,866,864,609,609,293,336,534,534,789,835,773,-751,834,804,308,307,833,788,832,772,562,562,547,547,305,275,560,515,290,290, + -252,-397,-477,-557,-622,-653,-719,-735,-750,1329,1299,1314,1057,1057,1042,1042,1312,1282,1024,1024,785,785,785,785,784,784,784,784,769,769,769,769,-383,1127,1141,1111,1126,1140,1095,1110,869,869,883,883,1079,1109,882,882,375,374,807,868,838,881,791,-463,867,822,368,263,852,837,836,-543,610,610,550,550,352,336,534,534,865,774,851,821,850,805,593,533,579,564,773,832,578,578,548,548,577,577,307,276,306,291,516,560,259,259, + -250,-2107,-2507,-2764,-2909,-2974,-3007,-3023,1041,1041,1040,1040,769,769,769,769,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,-767,-1052,-1213,-1277,-1358,-1405,-1469,-1535,-1550,-1582,-1614,-1647,-1662,-1694,-1726,-1759,-1774,-1807,-1822,-1854,-1886,1565,-1919,-1935,-1951,-1967,1731,1730,1580,1717,-1983,1729,1564,-1999,1548,-2015,-2031,1715,1595,-2047,1714,-2063,1610,-2079,1609,-2095,1323,1323,1457,1457,1307,1307,1712,1547,1641,1700,1699,1594,1685,1625,1442,1442,1322,1322,-780,-973,-910,1279,1278,1277,1262,1276,1261,1275,1215,1260,1229,-959,974,974,989,989,-943,735,478,478,495,463,506,414,-1039,1003,958,1017,927,942,987,957,431,476,1272,1167,1228,-1183,1256,-1199,895,895,941,941,1242,1227,1212,1135,1014,1014,490,489,503,487,910,1013,985,925,863,894,970,955,1012,847,-1343,831,755,755,984,909,428,366,754,559,-1391,752,486,457,924,997,698,698,983,893,740,740,908,877,739,739,667,667,953,938,497,287,271,271,683,606,590,712,726,574,302,302,738,736,481,286,526,725,605,711,636,724,696,651,589,681,666,710,364,467,573,695,466,466,301,465,379,379,709,604,665,679,316,316,634,633,436,436,464,269,424,394,452,332,438,363,347,408,393,448,331,422,362,407,392,421,346,406,391,376,375,359,1441,1306,-2367,1290,-2383,1337,-2399,-2415,1426,1321,-2431,1411,1336,-2447,-2463,-2479,1169,1169,1049,1049,1424,1289,1412,1352,1319,-2495,1154,1154,1064,1064,1153,1153,416,390,360,404,403,389,344,374,373,343,358,372,327,357,342,311,356,326,1395,1394,1137,1137,1047,1047,1365,1392,1287,1379,1334,1364,1349,1378,1318,1363,792,792,792,792,1152,1152,1032,1032,1121,1121,1046,1046,1120,1120,1030,1030,-2895,1106,1061,1104,849,849,789,789,1091,1076,1029,1090,1060,1075,833,833,309,324,532,532,832,772,818,803,561,561,531,560,515,546,289,274,288,258, + -250,-1179,-1579,-1836,-1996,-2124,-2253,-2333,-2413,-2477,-2542,-2574,-2607,-2622,-2655,1314,1313,1298,1312,1282,785,785,785,785,1040,1040,1025,1025,768,768,768,768,-766,-798,-830,-862,-895,-911,-927,-943,-959,-975,-991,-1007,-1023,-1039,-1055,-1070,1724,1647,-1103,-1119,1631,1767,1662,1738,1708,1723,-1135,1780,1615,1779,1599,1677,1646,1778,1583,-1151,1777,1567,1737,1692,1765,1722,1707,1630,1751,1661,1764,1614,1736,1676,1763,1750,1645,1598,1721,1691,1762,1706,1582,1761,1566,-1167,1749,1629,767,766,751,765,494,494,735,764,719,749,734,763,447,447,748,718,477,506,431,491,446,476,461,505,415,430,475,445,504,399,460,489,414,503,383,474,429,459,502,502,746,752,488,398,501,473,413,472,486,271,480,270,-1439,-1455,1357,-1471,-1487,-1503,1341,1325,-1519,1489,1463,1403,1309,-1535,1372,1448,1418,1476,1356,1462,1387,-1551,1475,1340,1447,1402,1386,-1567,1068,1068,1474,1461,455,380,468,440,395,425,410,454,364,467,466,464,453,269,409,448,268,432,1371,1473,1432,1417,1308,1460,1355,1446,1459,1431,1083,1083,1401,1416,1458,1445,1067,1067,1370,1457,1051,1051,1291,1430,1385,1444,1354,1415,1400,1443,1082,1082,1173,1113,1186,1066,1185,1050,-1967,1158,1128,1172,1097,1171,1081,-1983,1157,1112,416,266,375,400,1170,1142,1127,1065,793,793,1169,1033,1156,1096,1141,1111,1155,1080,1126,1140,898,898,808,808,897,897,792,792,1095,1152,1032,1125,1110,1139,1079,1124,882,807,838,881,853,791,-2319,867,368,263,822,852,837,866,806,865,-2399,851,352,262,534,534,821,836,594,594,549,549,593,593,533,533,848,773,579,579,564,578,548,563,276,276,577,576,306,291,516,560,305,305,275,259, + -251,-892,-2058,-2620,-2828,-2957,-3023,-3039,1041,1041,1040,1040,769,769,769,769,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,-511,-527,-543,-559,1530,-575,-591,1528,1527,1407,1526,1391,1023,1023,1023,1023,1525,1375,1268,1268,1103,1103,1087,1087,1039,1039,1523,-604,815,815,815,815,510,495,509,479,508,463,507,447,431,505,415,399,-734,-782,1262,-815,1259,1244,-831,1258,1228,-847,-863,1196,-879,1253,987,987,748,-767,493,493,462,477,414,414,686,669,478,446,461,445,474,429,487,458,412,471,1266,1264,1009,1009,799,799,-1019,-1276,-1452,-1581,-1677,-1757,-1821,-1886,-1933,-1997,1257,1257,1483,1468,1512,1422,1497,1406,1467,1496,1421,1510,1134,1134,1225,1225,1466,1451,1374,1405,1252,1252,1358,1480,1164,1164,1251,1251,1238,1238,1389,1465,-1407,1054,1101,-1423,1207,-1439,830,830,1248,1038,1237,1117,1223,1148,1236,1208,411,426,395,410,379,269,1193,1222,1132,1235,1221,1116,976,976,1192,1162,1177,1220,1131,1191,963,963,-1647,961,780,-1663,558,558,994,993,437,408,393,407,829,978,813,797,947,-1743,721,721,377,392,844,950,828,890,706,706,812,859,796,960,948,843,934,874,571,571,-1919,690,555,689,421,346,539,539,944,779,918,873,932,842,903,888,570,570,931,917,674,674,-2575,1562,-2591,1609,-2607,1654,1322,1322,1441,1441,1696,1546,1683,1593,1669,1624,1426,1426,1321,1321,1639,1680,1425,1425,1305,1305,1545,1668,1608,1623,1667,1592,1638,1666,1320,1320,1652,1607,1409,1409,1304,1304,1288,1288,1664,1637,1395,1395,1335,1335,1622,1636,1394,1394,1319,1319,1606,1621,1392,1392,1137,1137,1137,1137,345,390,360,375,404,373,1047,-2751,-2767,-2783,1062,1121,1046,-2799,1077,-2815,1106,1061,789,789,1105,1104,263,355,310,340,325,354,352,262,339,324,1091,1076,1029,1090,1060,1075,833,833,788,788,1088,1028,818,818,803,803,561,561,531,531,816,771,546,546,289,274,288,258, + -253,-317,-381,-446,-478,-509,1279,1279,-811,-1179,-1451,-1756,-1900,-2028,-2189,-2253,-2333,-2414,-2445,-2511,-2526,1313,1298,-2559,1041,1041,1040,1040,1025,1025,1024,1024,1022,1007,1021,991,1020,975,1019,959,687,687,1018,1017,671,671,655,655,1016,1015,639,639,758,758,623,623,757,607,756,591,755,575,754,559,543,543,1009,783,-575,-621,-685,-749,496,-590,750,749,734,748,974,989,1003,958,988,973,1002,942,987,957,972,1001,926,986,941,971,956,1000,910,985,925,999,894,970,-1071,-1087,-1102,1390,-1135,1436,1509,1451,1374,-1151,1405,1358,1480,1420,-1167,1507,1494,1389,1342,1465,1435,1450,1326,1505,1310,1493,1373,1479,1404,1492,1464,1419,428,443,472,397,736,526,464,464,486,457,442,471,484,482,1357,1449,1434,1478,1388,1491,1341,1490,1325,1489,1463,1403,1309,1477,1372,1448,1418,1433,1476,1356,1462,1387,-1439,1475,1340,1447,1402,1474,1324,1461,1371,1473,269,448,1432,1417,1308,1460,-1711,1459,-1727,1441,1099,1099,1446,1386,1431,1401,-1743,1289,1083,1083,1160,1160,1458,1445,1067,1067,1370,1457,1307,1430,1129,1129,1098,1098,268,432,267,416,266,400,-1887,1144,1187,1082,1173,1113,1186,1066,1050,1158,1128,1143,1172,1097,1171,1081,420,391,1157,1112,1170,1142,1127,1065,1169,1049,1156,1096,1141,1111,1155,1080,1126,1154,1064,1153,1140,1095,1048,-2159,1125,1110,1137,-2175,823,823,1139,1138,807,807,384,264,368,263,868,838,853,791,867,822,852,837,866,806,865,790,-2319,851,821,836,352,262,850,805,849,-2399,533,533,835,820,336,261,578,548,563,577,532,532,832,772,562,562,547,547,305,275,560,515,290,290,288,258 }; + static const uint8_t tab32[] = { 130,162,193,209,44,28,76,140,9,9,9,9,9,9,9,9,190,254,222,238,126,94,157,157,109,61,173,205 }; + static const uint8_t tab33[] = { 252,236,220,204,188,172,156,140,124,108,92,76,60,44,28,12 }; + static const int16_t tabindex[2*16] = { 0,32,64,98,0,132,180,218,292,364,426,538,648,746,0,1126,1460,1460,1460,1460,1460,1460,1460,1460,1842,1842,1842,1842,1842,1842,1842,1842 }; + static const uint8_t g_linbits[] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,2,3,4,6,8,10,13,4,5,6,7,8,9,11,13 }; + +#define PEEK_BITS(n) (bs_cache >> (32 - n)) +#define FLUSH_BITS(n) { bs_cache <<= (n); bs_sh += (n); } +#define CHECK_BITS while (bs_sh >= 0) { bs_cache |= (uint32_t)*bs_next_ptr++ << bs_sh; bs_sh -= 8; } +#define BSPOS ((bs_next_ptr - bs->buf)*8 - 24 + bs_sh) + + float one = 0.0f; + int ireg = 0, big_val_cnt = gr_info->big_values; + const uint8_t *sfb = gr_info->sfbtab; + const uint8_t *bs_next_ptr = bs->buf + bs->pos/8; + uint32_t bs_cache = (((bs_next_ptr[0]*256u + bs_next_ptr[1])*256u + bs_next_ptr[2])*256u + bs_next_ptr[3]) << (bs->pos & 7); + int pairs_to_decode, np, bs_sh = (bs->pos & 7) - 8; + bs_next_ptr += 4; + + while (big_val_cnt > 0) + { + int tab_num = gr_info->table_select[ireg]; + int sfb_cnt = gr_info->region_count[ireg++]; + const int16_t *codebook = tabs + tabindex[tab_num]; + int linbits = g_linbits[tab_num]; + if (linbits) + { + do + { + np = *sfb++ / 2; + pairs_to_decode = MINIMP3_MIN(big_val_cnt, np); + one = *scf++; + do + { + int j, w = 5; + int leaf = codebook[PEEK_BITS(w)]; + while (leaf < 0) + { + FLUSH_BITS(w); + w = leaf & 7; + leaf = codebook[PEEK_BITS(w) - (leaf >> 3)]; + } + FLUSH_BITS(leaf >> 8); + + for (j = 0; j < 2; j++, dst++, leaf >>= 4) + { + int lsb = leaf & 0x0F; + if (lsb == 15) + { + lsb += PEEK_BITS(linbits); + FLUSH_BITS(linbits); + CHECK_BITS; + *dst = one*L3_pow_43(lsb)*((int32_t)bs_cache < 0 ? -1: 1); + } else + { + *dst = g_pow43[16 + lsb - 16*(bs_cache >> 31)]*one; + } + FLUSH_BITS(lsb ? 1 : 0); + } + CHECK_BITS; + } while (--pairs_to_decode); + } while ((big_val_cnt -= np) > 0 && --sfb_cnt >= 0); + } else + { + do + { + np = *sfb++ / 2; + pairs_to_decode = MINIMP3_MIN(big_val_cnt, np); + one = *scf++; + do + { + int j, w = 5; + int leaf = codebook[PEEK_BITS(w)]; + while (leaf < 0) + { + FLUSH_BITS(w); + w = leaf & 7; + leaf = codebook[PEEK_BITS(w) - (leaf >> 3)]; + } + FLUSH_BITS(leaf >> 8); + + for (j = 0; j < 2; j++, dst++, leaf >>= 4) + { + int lsb = leaf & 0x0F; + *dst = g_pow43[16 + lsb - 16*(bs_cache >> 31)]*one; + FLUSH_BITS(lsb ? 1 : 0); + } + CHECK_BITS; + } while (--pairs_to_decode); + } while ((big_val_cnt -= np) > 0 && --sfb_cnt >= 0); + } + } + + for (np = 1 - big_val_cnt;; dst += 4) + { + const uint8_t *codebook_count1 = (gr_info->count1_table) ? tab33 : tab32; + int leaf = codebook_count1[PEEK_BITS(4)]; + if (!(leaf & 8)) + { + leaf = codebook_count1[(leaf >> 3) + (bs_cache << 4 >> (32 - (leaf & 3)))]; + } + FLUSH_BITS(leaf & 7); + if (BSPOS > layer3gr_limit) + { + break; + } +#define RELOAD_SCALEFACTOR if (!--np) { np = *sfb++/2; if (!np) break; one = *scf++; } +#define DEQ_COUNT1(s) if (leaf & (128 >> s)) { dst[s] = ((int32_t)bs_cache < 0) ? -one : one; FLUSH_BITS(1) } + RELOAD_SCALEFACTOR; + DEQ_COUNT1(0); + DEQ_COUNT1(1); + RELOAD_SCALEFACTOR; + DEQ_COUNT1(2); + DEQ_COUNT1(3); + CHECK_BITS; + } + + bs->pos = layer3gr_limit; +} + +static void L3_midside_stereo(float *left, int n) +{ + int i = 0; + float *right = left + 576; +#if HAVE_SIMD + if (have_simd()) + { + for (; i < n - 3; i += 4) + { + f4 vl = VLD(left + i); + f4 vr = VLD(right + i); + VSTORE(left + i, VADD(vl, vr)); + VSTORE(right + i, VSUB(vl, vr)); + } +#ifdef __GNUC__ + /* Workaround for spurious -Waggressive-loop-optimizations warning from gcc. + * For more info see: https://github.com/lieff/minimp3/issues/88 + */ + if (__builtin_constant_p(n % 4 == 0) && n % 4 == 0) + return; +#endif + } +#endif /* HAVE_SIMD */ + for (; i < n; i++) + { + float a = left[i]; + float b = right[i]; + left[i] = a + b; + right[i] = a - b; + } +} + +static void L3_intensity_stereo_band(float *left, int n, float kl, float kr) +{ + int i; + for (i = 0; i < n; i++) + { + left[i + 576] = left[i]*kr; + left[i] = left[i]*kl; + } +} + +static void L3_stereo_top_band(const float *right, const uint8_t *sfb, int nbands, int max_band[3]) +{ + int i, k; + + max_band[0] = max_band[1] = max_band[2] = -1; + + for (i = 0; i < nbands; i++) + { + for (k = 0; k < sfb[i]; k += 2) + { + if (right[k] != 0 || right[k + 1] != 0) + { + max_band[i % 3] = i; + break; + } + } + right += sfb[i]; + } +} + +static void L3_stereo_process(float *left, const uint8_t *ist_pos, const uint8_t *sfb, const uint8_t *hdr, int max_band[3], int mpeg2_sh) +{ + static const float g_pan[7*2] = { 0,1,0.21132487f,0.78867513f,0.36602540f,0.63397460f,0.5f,0.5f,0.63397460f,0.36602540f,0.78867513f,0.21132487f,1,0 }; + unsigned i, max_pos = HDR_TEST_MPEG1(hdr) ? 7 : 64; + + for (i = 0; sfb[i]; i++) + { + unsigned ipos = ist_pos[i]; + if ((int)i > max_band[i % 3] && ipos < max_pos) + { + float kl, kr, s = HDR_TEST_MS_STEREO(hdr) ? 1.41421356f : 1; + if (HDR_TEST_MPEG1(hdr)) + { + kl = g_pan[2*ipos]; + kr = g_pan[2*ipos + 1]; + } else + { + kl = 1; + kr = L3_ldexp_q2(1, (ipos + 1) >> 1 << mpeg2_sh); + if (ipos & 1) + { + kl = kr; + kr = 1; + } + } + L3_intensity_stereo_band(left, sfb[i], kl*s, kr*s); + } else if (HDR_TEST_MS_STEREO(hdr)) + { + L3_midside_stereo(left, sfb[i]); + } + left += sfb[i]; + } +} + +static void L3_intensity_stereo(float *left, uint8_t *ist_pos, const L3_gr_info_t *gr, const uint8_t *hdr) +{ + int max_band[3], n_sfb = gr->n_long_sfb + gr->n_short_sfb; + int i, max_blocks = gr->n_short_sfb ? 3 : 1; + + L3_stereo_top_band(left + 576, gr->sfbtab, n_sfb, max_band); + if (gr->n_long_sfb) + { + max_band[0] = max_band[1] = max_band[2] = MINIMP3_MAX(MINIMP3_MAX(max_band[0], max_band[1]), max_band[2]); + } + for (i = 0; i < max_blocks; i++) + { + int default_pos = HDR_TEST_MPEG1(hdr) ? 3 : 0; + int itop = n_sfb - max_blocks + i; + int prev = itop - max_blocks; + ist_pos[itop] = max_band[i] >= prev ? default_pos : ist_pos[prev]; + } + L3_stereo_process(left, ist_pos, gr->sfbtab, hdr, max_band, gr[1].scalefac_compress & 1); +} + +static void L3_reorder(float *grbuf, float *scratch, const uint8_t *sfb) +{ + int i, len; + float *src = grbuf, *dst = scratch; + + for (;0 != (len = *sfb); sfb += 3, src += 2*len) + { + for (i = 0; i < len; i++, src++) + { + *dst++ = src[0*len]; + *dst++ = src[1*len]; + *dst++ = src[2*len]; + } + } + memcpy(grbuf, scratch, (dst - scratch)*sizeof(float)); +} + +static void L3_antialias(float *grbuf, int nbands) +{ + static const float g_aa[2][8] = { + {0.85749293f,0.88174200f,0.94962865f,0.98331459f,0.99551782f,0.99916056f,0.99989920f,0.99999316f}, + {0.51449576f,0.47173197f,0.31337745f,0.18191320f,0.09457419f,0.04096558f,0.01419856f,0.00369997f} + }; + + for (; nbands > 0; nbands--, grbuf += 18) + { + int i = 0; +#if HAVE_SIMD + if (have_simd()) for (; i < 8; i += 4) + { + f4 vu = VLD(grbuf + 18 + i); + f4 vd = VLD(grbuf + 14 - i); + f4 vc0 = VLD(g_aa[0] + i); + f4 vc1 = VLD(g_aa[1] + i); + vd = VREV(vd); + VSTORE(grbuf + 18 + i, VSUB(VMUL(vu, vc0), VMUL(vd, vc1))); + vd = VADD(VMUL(vu, vc1), VMUL(vd, vc0)); + VSTORE(grbuf + 14 - i, VREV(vd)); + } +#endif /* HAVE_SIMD */ +#ifndef MINIMP3_ONLY_SIMD + for(; i < 8; i++) + { + float u = grbuf[18 + i]; + float d = grbuf[17 - i]; + grbuf[18 + i] = u*g_aa[0][i] - d*g_aa[1][i]; + grbuf[17 - i] = u*g_aa[1][i] + d*g_aa[0][i]; + } +#endif /* MINIMP3_ONLY_SIMD */ + } +} + +static void L3_dct3_9(float *y) +{ + float s0, s1, s2, s3, s4, s5, s6, s7, s8, t0, t2, t4; + + s0 = y[0]; s2 = y[2]; s4 = y[4]; s6 = y[6]; s8 = y[8]; + t0 = s0 + s6*0.5f; + s0 -= s6; + t4 = (s4 + s2)*0.93969262f; + t2 = (s8 + s2)*0.76604444f; + s6 = (s4 - s8)*0.17364818f; + s4 += s8 - s2; + + s2 = s0 - s4*0.5f; + y[4] = s4 + s0; + s8 = t0 - t2 + s6; + s0 = t0 - t4 + t2; + s4 = t0 + t4 - s6; + + s1 = y[1]; s3 = y[3]; s5 = y[5]; s7 = y[7]; + + s3 *= 0.86602540f; + t0 = (s5 + s1)*0.98480775f; + t4 = (s5 - s7)*0.34202014f; + t2 = (s1 + s7)*0.64278761f; + s1 = (s1 - s5 - s7)*0.86602540f; + + s5 = t0 - s3 - t2; + s7 = t4 - s3 - t0; + s3 = t4 + s3 - t2; + + y[0] = s4 - s7; + y[1] = s2 + s1; + y[2] = s0 - s3; + y[3] = s8 + s5; + y[5] = s8 - s5; + y[6] = s0 + s3; + y[7] = s2 - s1; + y[8] = s4 + s7; +} + +static void L3_imdct36(float *grbuf, float *overlap, const float *window, int nbands) +{ + int i, j; + static const float g_twid9[18] = { + 0.73727734f,0.79335334f,0.84339145f,0.88701083f,0.92387953f,0.95371695f,0.97629601f,0.99144486f,0.99904822f,0.67559021f,0.60876143f,0.53729961f,0.46174861f,0.38268343f,0.30070580f,0.21643961f,0.13052619f,0.04361938f + }; + + for (j = 0; j < nbands; j++, grbuf += 18, overlap += 9) + { + float co[9], si[9]; + co[0] = -grbuf[0]; + si[0] = grbuf[17]; + for (i = 0; i < 4; i++) + { + si[8 - 2*i] = grbuf[4*i + 1] - grbuf[4*i + 2]; + co[1 + 2*i] = grbuf[4*i + 1] + grbuf[4*i + 2]; + si[7 - 2*i] = grbuf[4*i + 4] - grbuf[4*i + 3]; + co[2 + 2*i] = -(grbuf[4*i + 3] + grbuf[4*i + 4]); + } + L3_dct3_9(co); + L3_dct3_9(si); + + si[1] = -si[1]; + si[3] = -si[3]; + si[5] = -si[5]; + si[7] = -si[7]; + + i = 0; + +#if HAVE_SIMD + if (have_simd()) for (; i < 8; i += 4) + { + f4 vovl = VLD(overlap + i); + f4 vc = VLD(co + i); + f4 vs = VLD(si + i); + f4 vr0 = VLD(g_twid9 + i); + f4 vr1 = VLD(g_twid9 + 9 + i); + f4 vw0 = VLD(window + i); + f4 vw1 = VLD(window + 9 + i); + f4 vsum = VADD(VMUL(vc, vr1), VMUL(vs, vr0)); + VSTORE(overlap + i, VSUB(VMUL(vc, vr0), VMUL(vs, vr1))); + VSTORE(grbuf + i, VSUB(VMUL(vovl, vw0), VMUL(vsum, vw1))); + vsum = VADD(VMUL(vovl, vw1), VMUL(vsum, vw0)); + VSTORE(grbuf + 14 - i, VREV(vsum)); + } +#endif /* HAVE_SIMD */ + for (; i < 9; i++) + { + float ovl = overlap[i]; + float sum = co[i]*g_twid9[9 + i] + si[i]*g_twid9[0 + i]; + overlap[i] = co[i]*g_twid9[0 + i] - si[i]*g_twid9[9 + i]; + grbuf[i] = ovl*window[0 + i] - sum*window[9 + i]; + grbuf[17 - i] = ovl*window[9 + i] + sum*window[0 + i]; + } + } +} + +static void L3_idct3(float x0, float x1, float x2, float *dst) +{ + float m1 = x1*0.86602540f; + float a1 = x0 - x2*0.5f; + dst[1] = x0 + x2; + dst[0] = a1 + m1; + dst[2] = a1 - m1; +} + +static void L3_imdct12(float *x, float *dst, float *overlap) +{ + static const float g_twid3[6] = { 0.79335334f,0.92387953f,0.99144486f, 0.60876143f,0.38268343f,0.13052619f }; + float co[3], si[3]; + int i; + + L3_idct3(-x[0], x[6] + x[3], x[12] + x[9], co); + L3_idct3(x[15], x[12] - x[9], x[6] - x[3], si); + si[1] = -si[1]; + + for (i = 0; i < 3; i++) + { + float ovl = overlap[i]; + float sum = co[i]*g_twid3[3 + i] + si[i]*g_twid3[0 + i]; + overlap[i] = co[i]*g_twid3[0 + i] - si[i]*g_twid3[3 + i]; + dst[i] = ovl*g_twid3[2 - i] - sum*g_twid3[5 - i]; + dst[5 - i] = ovl*g_twid3[5 - i] + sum*g_twid3[2 - i]; + } +} + +static void L3_imdct_short(float *grbuf, float *overlap, int nbands) +{ + for (;nbands > 0; nbands--, overlap += 9, grbuf += 18) + { + float tmp[18]; + memcpy(tmp, grbuf, sizeof(tmp)); + memcpy(grbuf, overlap, 6*sizeof(float)); + L3_imdct12(tmp, grbuf + 6, overlap + 6); + L3_imdct12(tmp + 1, grbuf + 12, overlap + 6); + L3_imdct12(tmp + 2, overlap, overlap + 6); + } +} + +static void L3_change_sign(float *grbuf) +{ + int b, i; + for (b = 0, grbuf += 18; b < 32; b += 2, grbuf += 36) + for (i = 1; i < 18; i += 2) + grbuf[i] = -grbuf[i]; +} + +static void L3_imdct_gr(float *grbuf, float *overlap, unsigned block_type, unsigned n_long_bands) +{ + static const float g_mdct_window[2][18] = { + { 0.99904822f,0.99144486f,0.97629601f,0.95371695f,0.92387953f,0.88701083f,0.84339145f,0.79335334f,0.73727734f,0.04361938f,0.13052619f,0.21643961f,0.30070580f,0.38268343f,0.46174861f,0.53729961f,0.60876143f,0.67559021f }, + { 1,1,1,1,1,1,0.99144486f,0.92387953f,0.79335334f,0,0,0,0,0,0,0.13052619f,0.38268343f,0.60876143f } + }; + if (n_long_bands) + { + L3_imdct36(grbuf, overlap, g_mdct_window[0], n_long_bands); + grbuf += 18*n_long_bands; + overlap += 9*n_long_bands; + } + if (block_type == SHORT_BLOCK_TYPE) + L3_imdct_short(grbuf, overlap, 32 - n_long_bands); + else + L3_imdct36(grbuf, overlap, g_mdct_window[block_type == STOP_BLOCK_TYPE], 32 - n_long_bands); +} + +static void L3_save_reservoir(mp3dec_t *h, mp3dec_scratch_t *s) +{ + int pos = (s->bs.pos + 7)/8u; + int remains = s->bs.limit/8u - pos; + if (remains > MAX_BITRESERVOIR_BYTES) + { + pos += remains - MAX_BITRESERVOIR_BYTES; + remains = MAX_BITRESERVOIR_BYTES; + } + if (remains > 0) + { + memmove(h->reserv_buf, s->maindata + pos, remains); + } + h->reserv = remains; +} + +static int L3_restore_reservoir(mp3dec_t *h, bs_t *bs, mp3dec_scratch_t *s, int main_data_begin) +{ + int frame_bytes = (bs->limit - bs->pos)/8; + int bytes_have = MINIMP3_MIN(h->reserv, main_data_begin); + memcpy(s->maindata, h->reserv_buf + MINIMP3_MAX(0, h->reserv - main_data_begin), MINIMP3_MIN(h->reserv, main_data_begin)); + memcpy(s->maindata + bytes_have, bs->buf + bs->pos/8, frame_bytes); + bs_init(&s->bs, s->maindata, bytes_have + frame_bytes); + return h->reserv >= main_data_begin; +} + +static void L3_decode(mp3dec_t *h, mp3dec_scratch_t *s, L3_gr_info_t *gr_info, int nch) +{ + int ch; + + for (ch = 0; ch < nch; ch++) + { + int layer3gr_limit = s->bs.pos + gr_info[ch].part_23_length; + L3_decode_scalefactors(h->header, s->ist_pos[ch], &s->bs, gr_info + ch, s->scf, ch); + L3_huffman(s->grbuf[ch], &s->bs, gr_info + ch, s->scf, layer3gr_limit); + } + + if (HDR_TEST_I_STEREO(h->header)) + { + L3_intensity_stereo(s->grbuf[0], s->ist_pos[1], gr_info, h->header); + } else if (HDR_IS_MS_STEREO(h->header)) + { + L3_midside_stereo(s->grbuf[0], 576); + } + + for (ch = 0; ch < nch; ch++, gr_info++) + { + int aa_bands = 31; + int n_long_bands = (gr_info->mixed_block_flag ? 2 : 0) << (int)(HDR_GET_MY_SAMPLE_RATE(h->header) == 2); + + if (gr_info->n_short_sfb) + { + aa_bands = n_long_bands - 1; + L3_reorder(s->grbuf[ch] + n_long_bands*18, s->syn[0], gr_info->sfbtab + gr_info->n_long_sfb); + } + + L3_antialias(s->grbuf[ch], aa_bands); + L3_imdct_gr(s->grbuf[ch], h->mdct_overlap[ch], gr_info->block_type, n_long_bands); + L3_change_sign(s->grbuf[ch]); + } +} + +static void mp3d_DCT_II(float *grbuf, int n) +{ + static const float g_sec[24] = { + 10.19000816f,0.50060302f,0.50241929f,3.40760851f,0.50547093f,0.52249861f,2.05778098f,0.51544732f,0.56694406f,1.48416460f,0.53104258f,0.64682180f,1.16943991f,0.55310392f,0.78815460f,0.97256821f,0.58293498f,1.06067765f,0.83934963f,0.62250412f,1.72244716f,0.74453628f,0.67480832f,5.10114861f + }; + int i, k = 0; +#if HAVE_SIMD + if (have_simd()) for (; k < n; k += 4) + { + f4 t[4][8], *x; + float *y = grbuf + k; + + for (x = t[0], i = 0; i < 8; i++, x++) + { + f4 x0 = VLD(&y[i*18]); + f4 x1 = VLD(&y[(15 - i)*18]); + f4 x2 = VLD(&y[(16 + i)*18]); + f4 x3 = VLD(&y[(31 - i)*18]); + f4 t0 = VADD(x0, x3); + f4 t1 = VADD(x1, x2); + f4 t2 = VMUL_S(VSUB(x1, x2), g_sec[3*i + 0]); + f4 t3 = VMUL_S(VSUB(x0, x3), g_sec[3*i + 1]); + x[0] = VADD(t0, t1); + x[8] = VMUL_S(VSUB(t0, t1), g_sec[3*i + 2]); + x[16] = VADD(t3, t2); + x[24] = VMUL_S(VSUB(t3, t2), g_sec[3*i + 2]); + } + for (x = t[0], i = 0; i < 4; i++, x += 8) + { + f4 x0 = x[0], x1 = x[1], x2 = x[2], x3 = x[3], x4 = x[4], x5 = x[5], x6 = x[6], x7 = x[7], xt; + xt = VSUB(x0, x7); x0 = VADD(x0, x7); + x7 = VSUB(x1, x6); x1 = VADD(x1, x6); + x6 = VSUB(x2, x5); x2 = VADD(x2, x5); + x5 = VSUB(x3, x4); x3 = VADD(x3, x4); + x4 = VSUB(x0, x3); x0 = VADD(x0, x3); + x3 = VSUB(x1, x2); x1 = VADD(x1, x2); + x[0] = VADD(x0, x1); + x[4] = VMUL_S(VSUB(x0, x1), 0.70710677f); + x5 = VADD(x5, x6); + x6 = VMUL_S(VADD(x6, x7), 0.70710677f); + x7 = VADD(x7, xt); + x3 = VMUL_S(VADD(x3, x4), 0.70710677f); + x5 = VSUB(x5, VMUL_S(x7, 0.198912367f)); /* rotate by PI/8 */ + x7 = VADD(x7, VMUL_S(x5, 0.382683432f)); + x5 = VSUB(x5, VMUL_S(x7, 0.198912367f)); + x0 = VSUB(xt, x6); xt = VADD(xt, x6); + x[1] = VMUL_S(VADD(xt, x7), 0.50979561f); + x[2] = VMUL_S(VADD(x4, x3), 0.54119611f); + x[3] = VMUL_S(VSUB(x0, x5), 0.60134488f); + x[5] = VMUL_S(VADD(x0, x5), 0.89997619f); + x[6] = VMUL_S(VSUB(x4, x3), 1.30656302f); + x[7] = VMUL_S(VSUB(xt, x7), 2.56291556f); + } + + if (k > n - 3) + { +#if HAVE_SSE +#define VSAVE2(i, v) _mm_storel_pi((__m64 *)(void*)&y[i*18], v) +#else /* HAVE_SSE */ +#define VSAVE2(i, v) vst1_f32((float32_t *)&y[i*18], vget_low_f32(v)) +#endif /* HAVE_SSE */ + for (i = 0; i < 7; i++, y += 4*18) + { + f4 s = VADD(t[3][i], t[3][i + 1]); + VSAVE2(0, t[0][i]); + VSAVE2(1, VADD(t[2][i], s)); + VSAVE2(2, VADD(t[1][i], t[1][i + 1])); + VSAVE2(3, VADD(t[2][1 + i], s)); + } + VSAVE2(0, t[0][7]); + VSAVE2(1, VADD(t[2][7], t[3][7])); + VSAVE2(2, t[1][7]); + VSAVE2(3, t[3][7]); + } else + { +#define VSAVE4(i, v) VSTORE(&y[i*18], v) + for (i = 0; i < 7; i++, y += 4*18) + { + f4 s = VADD(t[3][i], t[3][i + 1]); + VSAVE4(0, t[0][i]); + VSAVE4(1, VADD(t[2][i], s)); + VSAVE4(2, VADD(t[1][i], t[1][i + 1])); + VSAVE4(3, VADD(t[2][1 + i], s)); + } + VSAVE4(0, t[0][7]); + VSAVE4(1, VADD(t[2][7], t[3][7])); + VSAVE4(2, t[1][7]); + VSAVE4(3, t[3][7]); + } + } else +#endif /* HAVE_SIMD */ +#ifdef MINIMP3_ONLY_SIMD + {} /* for HAVE_SIMD=1, MINIMP3_ONLY_SIMD=1 case we do not need non-intrinsic "else" branch */ +#else /* MINIMP3_ONLY_SIMD */ + for (; k < n; k++) + { + float t[4][8], *x, *y = grbuf + k; + + for (x = t[0], i = 0; i < 8; i++, x++) + { + float x0 = y[i*18]; + float x1 = y[(15 - i)*18]; + float x2 = y[(16 + i)*18]; + float x3 = y[(31 - i)*18]; + float t0 = x0 + x3; + float t1 = x1 + x2; + float t2 = (x1 - x2)*g_sec[3*i + 0]; + float t3 = (x0 - x3)*g_sec[3*i + 1]; + x[0] = t0 + t1; + x[8] = (t0 - t1)*g_sec[3*i + 2]; + x[16] = t3 + t2; + x[24] = (t3 - t2)*g_sec[3*i + 2]; + } + for (x = t[0], i = 0; i < 4; i++, x += 8) + { + float x0 = x[0], x1 = x[1], x2 = x[2], x3 = x[3], x4 = x[4], x5 = x[5], x6 = x[6], x7 = x[7], xt; + xt = x0 - x7; x0 += x7; + x7 = x1 - x6; x1 += x6; + x6 = x2 - x5; x2 += x5; + x5 = x3 - x4; x3 += x4; + x4 = x0 - x3; x0 += x3; + x3 = x1 - x2; x1 += x2; + x[0] = x0 + x1; + x[4] = (x0 - x1)*0.70710677f; + x5 = x5 + x6; + x6 = (x6 + x7)*0.70710677f; + x7 = x7 + xt; + x3 = (x3 + x4)*0.70710677f; + x5 -= x7*0.198912367f; /* rotate by PI/8 */ + x7 += x5*0.382683432f; + x5 -= x7*0.198912367f; + x0 = xt - x6; xt += x6; + x[1] = (xt + x7)*0.50979561f; + x[2] = (x4 + x3)*0.54119611f; + x[3] = (x0 - x5)*0.60134488f; + x[5] = (x0 + x5)*0.89997619f; + x[6] = (x4 - x3)*1.30656302f; + x[7] = (xt - x7)*2.56291556f; + + } + for (i = 0; i < 7; i++, y += 4*18) + { + y[0*18] = t[0][i]; + y[1*18] = t[2][i] + t[3][i] + t[3][i + 1]; + y[2*18] = t[1][i] + t[1][i + 1]; + y[3*18] = t[2][i + 1] + t[3][i] + t[3][i + 1]; + } + y[0*18] = t[0][7]; + y[1*18] = t[2][7] + t[3][7]; + y[2*18] = t[1][7]; + y[3*18] = t[3][7]; + } +#endif /* MINIMP3_ONLY_SIMD */ +} + +#ifndef MINIMP3_FLOAT_OUTPUT +static int16_t mp3d_scale_pcm(float sample) +{ +#if HAVE_ARMV6 + int32_t s32 = (int32_t)(sample + .5f); + s32 -= (s32 < 0); + int16_t s = (int16_t)minimp3_clip_int16_arm(s32); +#else + if (sample >= 32766.5) return (int16_t) 32767; + if (sample <= -32767.5) return (int16_t)-32768; + int16_t s = (int16_t)(sample + .5f); + s -= (s < 0); /* away from zero, to be compliant */ +#endif + return s; +} +#else /* MINIMP3_FLOAT_OUTPUT */ +static float mp3d_scale_pcm(float sample) +{ + return sample*(1.f/32768.f); +} +#endif /* MINIMP3_FLOAT_OUTPUT */ + +static void mp3d_synth_pair(mp3d_sample_t *pcm, int nch, const float *z) +{ + float a; + a = (z[14*64] - z[ 0]) * 29; + a += (z[ 1*64] + z[13*64]) * 213; + a += (z[12*64] - z[ 2*64]) * 459; + a += (z[ 3*64] + z[11*64]) * 2037; + a += (z[10*64] - z[ 4*64]) * 5153; + a += (z[ 5*64] + z[ 9*64]) * 6574; + a += (z[ 8*64] - z[ 6*64]) * 37489; + a += z[ 7*64] * 75038; + pcm[0] = mp3d_scale_pcm(a); + + z += 2; + a = z[14*64] * 104; + a += z[12*64] * 1567; + a += z[10*64] * 9727; + a += z[ 8*64] * 64019; + a += z[ 6*64] * -9975; + a += z[ 4*64] * -45; + a += z[ 2*64] * 146; + a += z[ 0*64] * -5; + pcm[16*nch] = mp3d_scale_pcm(a); +} + +static void mp3d_synth(float *xl, mp3d_sample_t *dstl, int nch, float *lins) +{ + int i; + float *xr = xl + 576*(nch - 1); + mp3d_sample_t *dstr = dstl + (nch - 1); + + static const float g_win[] = { + -1,26,-31,208,218,401,-519,2063,2000,4788,-5517,7134,5959,35640,-39336,74992, + -1,24,-35,202,222,347,-581,2080,1952,4425,-5879,7640,5288,33791,-41176,74856, + -1,21,-38,196,225,294,-645,2087,1893,4063,-6237,8092,4561,31947,-43006,74630, + -1,19,-41,190,227,244,-711,2085,1822,3705,-6589,8492,3776,30112,-44821,74313, + -1,17,-45,183,228,197,-779,2075,1739,3351,-6935,8840,2935,28289,-46617,73908, + -1,16,-49,176,228,153,-848,2057,1644,3004,-7271,9139,2037,26482,-48390,73415, + -2,14,-53,169,227,111,-919,2032,1535,2663,-7597,9389,1082,24694,-50137,72835, + -2,13,-58,161,224,72,-991,2001,1414,2330,-7910,9592,70,22929,-51853,72169, + -2,11,-63,154,221,36,-1064,1962,1280,2006,-8209,9750,-998,21189,-53534,71420, + -2,10,-68,147,215,2,-1137,1919,1131,1692,-8491,9863,-2122,19478,-55178,70590, + -3,9,-73,139,208,-29,-1210,1870,970,1388,-8755,9935,-3300,17799,-56778,69679, + -3,8,-79,132,200,-57,-1283,1817,794,1095,-8998,9966,-4533,16155,-58333,68692, + -4,7,-85,125,189,-83,-1356,1759,605,814,-9219,9959,-5818,14548,-59838,67629, + -4,7,-91,117,177,-106,-1428,1698,402,545,-9416,9916,-7154,12980,-61289,66494, + -5,6,-97,111,163,-127,-1498,1634,185,288,-9585,9838,-8540,11455,-62684,65290 + }; + float *zlin = lins + 15*64; + const float *w = g_win; + + zlin[4*15] = xl[18*16]; + zlin[4*15 + 1] = xr[18*16]; + zlin[4*15 + 2] = xl[0]; + zlin[4*15 + 3] = xr[0]; + + zlin[4*31] = xl[1 + 18*16]; + zlin[4*31 + 1] = xr[1 + 18*16]; + zlin[4*31 + 2] = xl[1]; + zlin[4*31 + 3] = xr[1]; + + mp3d_synth_pair(dstr, nch, lins + 4*15 + 1); + mp3d_synth_pair(dstr + 32*nch, nch, lins + 4*15 + 64 + 1); + mp3d_synth_pair(dstl, nch, lins + 4*15); + mp3d_synth_pair(dstl + 32*nch, nch, lins + 4*15 + 64); + +#if HAVE_SIMD + if (have_simd()) for (i = 14; i >= 0; i--) + { +#define VLOAD(k) f4 w0 = VSET(*w++); f4 w1 = VSET(*w++); f4 vz = VLD(&zlin[4*i - 64*k]); f4 vy = VLD(&zlin[4*i - 64*(15 - k)]); +#define V0(k) { VLOAD(k) b = VADD(VMUL(vz, w1), VMUL(vy, w0)) ; a = VSUB(VMUL(vz, w0), VMUL(vy, w1)); } +#define V1(k) { VLOAD(k) b = VADD(b, VADD(VMUL(vz, w1), VMUL(vy, w0))); a = VADD(a, VSUB(VMUL(vz, w0), VMUL(vy, w1))); } +#define V2(k) { VLOAD(k) b = VADD(b, VADD(VMUL(vz, w1), VMUL(vy, w0))); a = VADD(a, VSUB(VMUL(vy, w1), VMUL(vz, w0))); } + f4 a, b; + zlin[4*i] = xl[18*(31 - i)]; + zlin[4*i + 1] = xr[18*(31 - i)]; + zlin[4*i + 2] = xl[1 + 18*(31 - i)]; + zlin[4*i + 3] = xr[1 + 18*(31 - i)]; + zlin[4*i + 64] = xl[1 + 18*(1 + i)]; + zlin[4*i + 64 + 1] = xr[1 + 18*(1 + i)]; + zlin[4*i - 64 + 2] = xl[18*(1 + i)]; + zlin[4*i - 64 + 3] = xr[18*(1 + i)]; + + V0(0) V2(1) V1(2) V2(3) V1(4) V2(5) V1(6) V2(7) + + { +#ifndef MINIMP3_FLOAT_OUTPUT +#if HAVE_SSE + static const f4 g_max = { 32767.0f, 32767.0f, 32767.0f, 32767.0f }; + static const f4 g_min = { -32768.0f, -32768.0f, -32768.0f, -32768.0f }; + __m128i pcm8 = _mm_packs_epi32(_mm_cvtps_epi32(_mm_max_ps(_mm_min_ps(a, g_max), g_min)), + _mm_cvtps_epi32(_mm_max_ps(_mm_min_ps(b, g_max), g_min))); + dstr[(15 - i)*nch] = _mm_extract_epi16(pcm8, 1); + dstr[(17 + i)*nch] = _mm_extract_epi16(pcm8, 5); + dstl[(15 - i)*nch] = _mm_extract_epi16(pcm8, 0); + dstl[(17 + i)*nch] = _mm_extract_epi16(pcm8, 4); + dstr[(47 - i)*nch] = _mm_extract_epi16(pcm8, 3); + dstr[(49 + i)*nch] = _mm_extract_epi16(pcm8, 7); + dstl[(47 - i)*nch] = _mm_extract_epi16(pcm8, 2); + dstl[(49 + i)*nch] = _mm_extract_epi16(pcm8, 6); +#else /* HAVE_SSE */ + int16x4_t pcma, pcmb; + a = VADD(a, VSET(0.5f)); + b = VADD(b, VSET(0.5f)); + pcma = vqmovn_s32(vqaddq_s32(vcvtq_s32_f32(a), vreinterpretq_s32_u32(vcltq_f32(a, VSET(0))))); + pcmb = vqmovn_s32(vqaddq_s32(vcvtq_s32_f32(b), vreinterpretq_s32_u32(vcltq_f32(b, VSET(0))))); + vst1_lane_s16(dstr + (15 - i)*nch, pcma, 1); + vst1_lane_s16(dstr + (17 + i)*nch, pcmb, 1); + vst1_lane_s16(dstl + (15 - i)*nch, pcma, 0); + vst1_lane_s16(dstl + (17 + i)*nch, pcmb, 0); + vst1_lane_s16(dstr + (47 - i)*nch, pcma, 3); + vst1_lane_s16(dstr + (49 + i)*nch, pcmb, 3); + vst1_lane_s16(dstl + (47 - i)*nch, pcma, 2); + vst1_lane_s16(dstl + (49 + i)*nch, pcmb, 2); +#endif /* HAVE_SSE */ + +#else /* MINIMP3_FLOAT_OUTPUT */ + + static const f4 g_scale = { 1.0f/32768.0f, 1.0f/32768.0f, 1.0f/32768.0f, 1.0f/32768.0f }; + a = VMUL(a, g_scale); + b = VMUL(b, g_scale); +#if HAVE_SSE + _mm_store_ss(dstr + (15 - i)*nch, _mm_shuffle_ps(a, a, _MM_SHUFFLE(1, 1, 1, 1))); + _mm_store_ss(dstr + (17 + i)*nch, _mm_shuffle_ps(b, b, _MM_SHUFFLE(1, 1, 1, 1))); + _mm_store_ss(dstl + (15 - i)*nch, _mm_shuffle_ps(a, a, _MM_SHUFFLE(0, 0, 0, 0))); + _mm_store_ss(dstl + (17 + i)*nch, _mm_shuffle_ps(b, b, _MM_SHUFFLE(0, 0, 0, 0))); + _mm_store_ss(dstr + (47 - i)*nch, _mm_shuffle_ps(a, a, _MM_SHUFFLE(3, 3, 3, 3))); + _mm_store_ss(dstr + (49 + i)*nch, _mm_shuffle_ps(b, b, _MM_SHUFFLE(3, 3, 3, 3))); + _mm_store_ss(dstl + (47 - i)*nch, _mm_shuffle_ps(a, a, _MM_SHUFFLE(2, 2, 2, 2))); + _mm_store_ss(dstl + (49 + i)*nch, _mm_shuffle_ps(b, b, _MM_SHUFFLE(2, 2, 2, 2))); +#else /* HAVE_SSE */ + vst1q_lane_f32(dstr + (15 - i)*nch, a, 1); + vst1q_lane_f32(dstr + (17 + i)*nch, b, 1); + vst1q_lane_f32(dstl + (15 - i)*nch, a, 0); + vst1q_lane_f32(dstl + (17 + i)*nch, b, 0); + vst1q_lane_f32(dstr + (47 - i)*nch, a, 3); + vst1q_lane_f32(dstr + (49 + i)*nch, b, 3); + vst1q_lane_f32(dstl + (47 - i)*nch, a, 2); + vst1q_lane_f32(dstl + (49 + i)*nch, b, 2); +#endif /* HAVE_SSE */ +#endif /* MINIMP3_FLOAT_OUTPUT */ + } + } else +#endif /* HAVE_SIMD */ +#ifdef MINIMP3_ONLY_SIMD + {} /* for HAVE_SIMD=1, MINIMP3_ONLY_SIMD=1 case we do not need non-intrinsic "else" branch */ +#else /* MINIMP3_ONLY_SIMD */ + for (i = 14; i >= 0; i--) + { +#define LOAD(k) float w0 = *w++; float w1 = *w++; float *vz = &zlin[4*i - k*64]; float *vy = &zlin[4*i - (15 - k)*64]; +#define S0(k) { int j; LOAD(k); for (j = 0; j < 4; j++) b[j] = vz[j]*w1 + vy[j]*w0, a[j] = vz[j]*w0 - vy[j]*w1; } +#define S1(k) { int j; LOAD(k); for (j = 0; j < 4; j++) b[j] += vz[j]*w1 + vy[j]*w0, a[j] += vz[j]*w0 - vy[j]*w1; } +#define S2(k) { int j; LOAD(k); for (j = 0; j < 4; j++) b[j] += vz[j]*w1 + vy[j]*w0, a[j] += vy[j]*w1 - vz[j]*w0; } + float a[4], b[4]; + + zlin[4*i] = xl[18*(31 - i)]; + zlin[4*i + 1] = xr[18*(31 - i)]; + zlin[4*i + 2] = xl[1 + 18*(31 - i)]; + zlin[4*i + 3] = xr[1 + 18*(31 - i)]; + zlin[4*(i + 16)] = xl[1 + 18*(1 + i)]; + zlin[4*(i + 16) + 1] = xr[1 + 18*(1 + i)]; + zlin[4*(i - 16) + 2] = xl[18*(1 + i)]; + zlin[4*(i - 16) + 3] = xr[18*(1 + i)]; + + S0(0) S2(1) S1(2) S2(3) S1(4) S2(5) S1(6) S2(7) + + dstr[(15 - i)*nch] = mp3d_scale_pcm(a[1]); + dstr[(17 + i)*nch] = mp3d_scale_pcm(b[1]); + dstl[(15 - i)*nch] = mp3d_scale_pcm(a[0]); + dstl[(17 + i)*nch] = mp3d_scale_pcm(b[0]); + dstr[(47 - i)*nch] = mp3d_scale_pcm(a[3]); + dstr[(49 + i)*nch] = mp3d_scale_pcm(b[3]); + dstl[(47 - i)*nch] = mp3d_scale_pcm(a[2]); + dstl[(49 + i)*nch] = mp3d_scale_pcm(b[2]); + } +#endif /* MINIMP3_ONLY_SIMD */ +} + +static void mp3d_synth_granule(float *qmf_state, float *grbuf, int nbands, int nch, mp3d_sample_t *pcm, float *lins) +{ + int i; + for (i = 0; i < nch; i++) + { + mp3d_DCT_II(grbuf + 576*i, nbands); + } + + memcpy(lins, qmf_state, sizeof(float)*15*64); + + for (i = 0; i < nbands; i += 2) + { + mp3d_synth(grbuf + i, pcm + 32*nch*i, nch, lins + i*64); + } +#ifndef MINIMP3_NONSTANDARD_BUT_LOGICAL + if (nch == 1) + { + for (i = 0; i < 15*64; i += 2) + { + qmf_state[i] = lins[nbands*64 + i]; + } + } else +#endif /* MINIMP3_NONSTANDARD_BUT_LOGICAL */ + { + memcpy(qmf_state, lins + nbands*64, sizeof(float)*15*64); + } +} + +static int mp3d_match_frame(const uint8_t *hdr, int mp3_bytes, int frame_bytes) +{ + int i, nmatch; + for (i = 0, nmatch = 0; nmatch < MAX_FRAME_SYNC_MATCHES; nmatch++) + { + i += hdr_frame_bytes(hdr + i, frame_bytes) + hdr_padding(hdr + i); + if (i + HDR_SIZE > mp3_bytes) + return nmatch > 0; + if (!hdr_compare(hdr, hdr + i)) + return 0; + } + return 1; +} + +static int mp3d_find_frame(const uint8_t *mp3, int mp3_bytes, int *free_format_bytes, int *ptr_frame_bytes) +{ + int i, k; + for (i = 0; i < mp3_bytes - HDR_SIZE; i++, mp3++) + { + if (hdr_valid(mp3)) + { + int frame_bytes = hdr_frame_bytes(mp3, *free_format_bytes); + int frame_and_padding = frame_bytes + hdr_padding(mp3); + + for (k = HDR_SIZE; !frame_bytes && k < MAX_FREE_FORMAT_FRAME_SIZE && i + 2*k < mp3_bytes - HDR_SIZE; k++) + { + if (hdr_compare(mp3, mp3 + k)) + { + int fb = k - hdr_padding(mp3); + int nextfb = fb + hdr_padding(mp3 + k); + if (i + k + nextfb + HDR_SIZE > mp3_bytes || !hdr_compare(mp3, mp3 + k + nextfb)) + continue; + frame_and_padding = k; + frame_bytes = fb; + *free_format_bytes = fb; + } + } + if ((frame_bytes && i + frame_and_padding <= mp3_bytes && + mp3d_match_frame(mp3, mp3_bytes - i, frame_bytes)) || + (!i && frame_and_padding == mp3_bytes)) + { + *ptr_frame_bytes = frame_and_padding; + return i; + } + *free_format_bytes = 0; + } + } + *ptr_frame_bytes = 0; + return mp3_bytes; +} + +void mp3dec_init(mp3dec_t *dec) +{ + dec->header[0] = 0; +} + +int mp3dec_decode_frame(mp3dec_t *dec, const uint8_t *mp3, int mp3_bytes, mp3d_sample_t *pcm, mp3dec_frame_info_t *info) +{ + int i = 0, igr, frame_size = 0, success = 1; + const uint8_t *hdr; + bs_t bs_frame[1]; + mp3dec_scratch_t scratch; + + if (mp3_bytes > 4 && dec->header[0] == 0xff && hdr_compare(dec->header, mp3)) + { + frame_size = hdr_frame_bytes(mp3, dec->free_format_bytes) + hdr_padding(mp3); + if (frame_size != mp3_bytes && (frame_size + HDR_SIZE > mp3_bytes || !hdr_compare(mp3, mp3 + frame_size))) + { + frame_size = 0; + } + } + if (!frame_size) + { + memset(dec, 0, sizeof(mp3dec_t)); + i = mp3d_find_frame(mp3, mp3_bytes, &dec->free_format_bytes, &frame_size); + if (!frame_size || i + frame_size > mp3_bytes) + { + info->frame_bytes = i; + return 0; + } + } + + hdr = mp3 + i; + memcpy(dec->header, hdr, HDR_SIZE); + info->frame_bytes = i + frame_size; + info->frame_offset = i; + info->channels = HDR_IS_MONO(hdr) ? 1 : 2; + info->hz = hdr_sample_rate_hz(hdr); + info->layer = 4 - HDR_GET_LAYER(hdr); + info->bitrate_kbps = hdr_bitrate_kbps(hdr); + + if (!pcm) + { + return hdr_frame_samples(hdr); + } + + bs_init(bs_frame, hdr + HDR_SIZE, frame_size - HDR_SIZE); + if (HDR_IS_CRC(hdr)) + { + get_bits(bs_frame, 16); + } + + if (info->layer == 3) + { + int main_data_begin = L3_read_side_info(bs_frame, scratch.gr_info, hdr); + if (main_data_begin < 0 || bs_frame->pos > bs_frame->limit) + { + mp3dec_init(dec); + return 0; + } + success = L3_restore_reservoir(dec, bs_frame, &scratch, main_data_begin); + if (success) + { + for (igr = 0; igr < (HDR_TEST_MPEG1(hdr) ? 2 : 1); igr++, pcm += 576*info->channels) + { + memset(scratch.grbuf[0], 0, 576*2*sizeof(float)); + L3_decode(dec, &scratch, scratch.gr_info + igr*info->channels, info->channels); + mp3d_synth_granule(dec->qmf_state, scratch.grbuf[0], 18, info->channels, pcm, scratch.syn[0]); + } + } + L3_save_reservoir(dec, &scratch); + } else + { +#ifdef MINIMP3_ONLY_MP3 + return 0; +#else /* MINIMP3_ONLY_MP3 */ + L12_scale_info sci[1]; + L12_read_scale_info(hdr, bs_frame, sci); + + memset(scratch.grbuf[0], 0, 576*2*sizeof(float)); + for (i = 0, igr = 0; igr < 3; igr++) + { + if (12 == (i += L12_dequantize_granule(scratch.grbuf[0] + i, bs_frame, sci, info->layer | 1))) + { + i = 0; + L12_apply_scf_384(sci, sci->scf + igr, scratch.grbuf[0]); + mp3d_synth_granule(dec->qmf_state, scratch.grbuf[0], 12, info->channels, pcm, scratch.syn[0]); + memset(scratch.grbuf[0], 0, 576*2*sizeof(float)); + pcm += 384*info->channels; + } + if (bs_frame->pos > bs_frame->limit) + { + mp3dec_init(dec); + return 0; + } + } +#endif /* MINIMP3_ONLY_MP3 */ + } + return success*hdr_frame_samples(dec->header); +} + +#ifdef MINIMP3_FLOAT_OUTPUT +void mp3dec_f32_to_s16(const float *in, int16_t *out, int num_samples) +{ + int i = 0; +#if HAVE_SIMD + int aligned_count = num_samples & ~7; + for(; i < aligned_count; i += 8) + { + static const f4 g_scale = { 32768.0f, 32768.0f, 32768.0f, 32768.0f }; + f4 a = VMUL(VLD(&in[i ]), g_scale); + f4 b = VMUL(VLD(&in[i+4]), g_scale); +#if HAVE_SSE + static const f4 g_max = { 32767.0f, 32767.0f, 32767.0f, 32767.0f }; + static const f4 g_min = { -32768.0f, -32768.0f, -32768.0f, -32768.0f }; + __m128i pcm8 = _mm_packs_epi32(_mm_cvtps_epi32(_mm_max_ps(_mm_min_ps(a, g_max), g_min)), + _mm_cvtps_epi32(_mm_max_ps(_mm_min_ps(b, g_max), g_min))); + out[i ] = _mm_extract_epi16(pcm8, 0); + out[i+1] = _mm_extract_epi16(pcm8, 1); + out[i+2] = _mm_extract_epi16(pcm8, 2); + out[i+3] = _mm_extract_epi16(pcm8, 3); + out[i+4] = _mm_extract_epi16(pcm8, 4); + out[i+5] = _mm_extract_epi16(pcm8, 5); + out[i+6] = _mm_extract_epi16(pcm8, 6); + out[i+7] = _mm_extract_epi16(pcm8, 7); +#else /* HAVE_SSE */ + int16x4_t pcma, pcmb; + a = VADD(a, VSET(0.5f)); + b = VADD(b, VSET(0.5f)); + pcma = vqmovn_s32(vqaddq_s32(vcvtq_s32_f32(a), vreinterpretq_s32_u32(vcltq_f32(a, VSET(0))))); + pcmb = vqmovn_s32(vqaddq_s32(vcvtq_s32_f32(b), vreinterpretq_s32_u32(vcltq_f32(b, VSET(0))))); + vst1_lane_s16(out+i , pcma, 0); + vst1_lane_s16(out+i+1, pcma, 1); + vst1_lane_s16(out+i+2, pcma, 2); + vst1_lane_s16(out+i+3, pcma, 3); + vst1_lane_s16(out+i+4, pcmb, 0); + vst1_lane_s16(out+i+5, pcmb, 1); + vst1_lane_s16(out+i+6, pcmb, 2); + vst1_lane_s16(out+i+7, pcmb, 3); +#endif /* HAVE_SSE */ + } +#endif /* HAVE_SIMD */ + for(; i < num_samples; i++) + { + float sample = in[i] * 32768.0f; + if (sample >= 32766.5) + out[i] = (int16_t) 32767; + else if (sample <= -32767.5) + out[i] = (int16_t)-32768; + else + { + int16_t s = (int16_t)(sample + .5f); + s -= (s < 0); /* away from zero, to be compliant */ + out[i] = s; + } + } +} +#endif /* MINIMP3_FLOAT_OUTPUT */ +#endif /* MINIMP3_IMPLEMENTATION && !_MINIMP3_IMPLEMENTATION_GUARD */ diff --git a/ext/minimp3/minimp3_ex.h b/ext/minimp3/minimp3_ex.h new file mode 100644 index 0000000000..2871705df3 --- /dev/null +++ b/ext/minimp3/minimp3_ex.h @@ -0,0 +1,1397 @@ +#ifndef MINIMP3_EXT_H +#define MINIMP3_EXT_H +/* + https://github.com/lieff/minimp3 + To the extent possible under law, the author(s) have dedicated all copyright and related and neighboring rights to this software to the public domain worldwide. + This software is distributed without any warranty. + See . +*/ +#include +#include "minimp3.h" + +/* flags for mp3dec_ex_open_* functions */ +#define MP3D_SEEK_TO_BYTE 0 /* mp3dec_ex_seek seeks to byte in stream */ +#define MP3D_SEEK_TO_SAMPLE 1 /* mp3dec_ex_seek precisely seeks to sample using index (created during duration calculation scan or when mp3dec_ex_seek called) */ +#define MP3D_DO_NOT_SCAN 2 /* do not scan whole stream for duration if vbrtag not found, mp3dec_ex_t::samples will be filled only if mp3dec_ex_t::vbr_tag_found == 1 */ +#ifdef MINIMP3_ALLOW_MONO_STEREO_TRANSITION +#define MP3D_ALLOW_MONO_STEREO_TRANSITION 4 +#define MP3D_FLAGS_MASK 7 +#else +#define MP3D_FLAGS_MASK 3 +#endif + +/* compile-time config */ +#define MINIMP3_PREDECODE_FRAMES 2 /* frames to pre-decode and skip after seek (to fill internal structures) */ +/*#define MINIMP3_SEEK_IDX_LINEAR_SEARCH*/ /* define to use linear index search instead of binary search on seek */ +#define MINIMP3_IO_SIZE (128*1024) /* io buffer size for streaming functions, must be greater than MINIMP3_BUF_SIZE */ +#define MINIMP3_BUF_SIZE (16*1024) /* buffer which can hold minimum 10 consecutive mp3 frames (~16KB) worst case */ +/*#define MINIMP3_SCAN_LIMIT (256*1024)*/ /* how many bytes will be scanned to search first valid mp3 frame, to prevent stall on large non-mp3 files */ +#define MINIMP3_ENABLE_RING 0 /* WIP enable hardware magic ring buffer if available, to make less input buffer memmove(s) in callback IO mode */ + +/* return error codes */ +#define MP3D_E_PARAM -1 +#define MP3D_E_MEMORY -2 +#define MP3D_E_IOERROR -3 +#define MP3D_E_USER -4 /* can be used to stop processing from callbacks without indicating specific error */ +#define MP3D_E_DECODE -5 /* decode error which can't be safely skipped, such as sample rate, layer and channels change */ + +typedef struct +{ + mp3d_sample_t *buffer; + size_t samples; /* channels included, byte size = samples*sizeof(mp3d_sample_t) */ + int channels, hz, layer, avg_bitrate_kbps; +} mp3dec_file_info_t; + +typedef struct +{ + const uint8_t *buffer; + size_t size; +} mp3dec_map_info_t; + +typedef struct +{ + uint64_t sample; + uint64_t offset; +} mp3dec_frame_t; + +typedef struct +{ + mp3dec_frame_t *frames; + size_t num_frames, capacity; +} mp3dec_index_t; + +typedef size_t (*MP3D_READ_CB)(void *buf, size_t size, void *user_data); +typedef int (*MP3D_SEEK_CB)(uint64_t position, void *user_data); + +typedef struct +{ + MP3D_READ_CB read; + void *read_data; + MP3D_SEEK_CB seek; + void *seek_data; +} mp3dec_io_t; + +typedef struct +{ + mp3dec_t mp3d; + mp3dec_map_info_t file; + mp3dec_io_t *io; + mp3dec_index_t index; + uint64_t offset, samples, detected_samples, cur_sample, start_offset, end_offset; + mp3dec_frame_info_t info; + mp3d_sample_t buffer[MINIMP3_MAX_SAMPLES_PER_FRAME]; + size_t input_consumed, input_filled; + int is_file, flags, vbr_tag_found, indexes_built; + int free_format_bytes; + int buffer_samples, buffer_consumed, to_skip, start_delay; + int last_error; +} mp3dec_ex_t; + +typedef int (*MP3D_ITERATE_CB)(void *user_data, const uint8_t *frame, int frame_size, int free_format_bytes, size_t buf_size, uint64_t offset, mp3dec_frame_info_t *info); +typedef int (*MP3D_PROGRESS_CB)(void *user_data, size_t file_size, uint64_t offset, mp3dec_frame_info_t *info); + +#ifdef __cplusplus +extern "C" { +#endif + +/* detect mp3/mpa format */ +int mp3dec_detect_buf(const uint8_t *buf, size_t buf_size); +int mp3dec_detect_cb(mp3dec_io_t *io, uint8_t *buf, size_t buf_size); +/* decode whole buffer block */ +int mp3dec_load_buf(mp3dec_t *dec, const uint8_t *buf, size_t buf_size, mp3dec_file_info_t *info, MP3D_PROGRESS_CB progress_cb, void *user_data); +int mp3dec_load_cb(mp3dec_t *dec, mp3dec_io_t *io, uint8_t *buf, size_t buf_size, mp3dec_file_info_t *info, MP3D_PROGRESS_CB progress_cb, void *user_data); +/* iterate through frames */ +int mp3dec_iterate_buf(const uint8_t *buf, size_t buf_size, MP3D_ITERATE_CB callback, void *user_data); +int mp3dec_iterate_cb(mp3dec_io_t *io, uint8_t *buf, size_t buf_size, MP3D_ITERATE_CB callback, void *user_data); +/* streaming decoder with seeking capability */ +int mp3dec_ex_open_buf(mp3dec_ex_t *dec, const uint8_t *buf, size_t buf_size, int flags); +int mp3dec_ex_open_cb(mp3dec_ex_t *dec, mp3dec_io_t *io, int flags); +void mp3dec_ex_close(mp3dec_ex_t *dec); +int mp3dec_ex_seek(mp3dec_ex_t *dec, uint64_t position); +size_t mp3dec_ex_read_frame(mp3dec_ex_t *dec, mp3d_sample_t **buf, mp3dec_frame_info_t *frame_info, size_t max_samples); +size_t mp3dec_ex_read(mp3dec_ex_t *dec, mp3d_sample_t *buf, size_t samples); +#ifndef MINIMP3_NO_STDIO +/* stdio versions of file detect, load, iterate and stream */ +int mp3dec_detect(const char *file_name); +int mp3dec_load(mp3dec_t *dec, const char *file_name, mp3dec_file_info_t *info, MP3D_PROGRESS_CB progress_cb, void *user_data); +int mp3dec_iterate(const char *file_name, MP3D_ITERATE_CB callback, void *user_data); +int mp3dec_ex_open(mp3dec_ex_t *dec, const char *file_name, int flags); +#ifdef _WIN32 +int mp3dec_detect_w(const wchar_t *file_name); +int mp3dec_load_w(mp3dec_t *dec, const wchar_t *file_name, mp3dec_file_info_t *info, MP3D_PROGRESS_CB progress_cb, void *user_data); +int mp3dec_iterate_w(const wchar_t *file_name, MP3D_ITERATE_CB callback, void *user_data); +int mp3dec_ex_open_w(mp3dec_ex_t *dec, const wchar_t *file_name, int flags); +#endif +#endif + +#ifdef __cplusplus +} +#endif +#endif /*MINIMP3_EXT_H*/ + +#if defined(MINIMP3_IMPLEMENTATION) && !defined(_MINIMP3_EX_IMPLEMENTATION_GUARD) +#define _MINIMP3_EX_IMPLEMENTATION_GUARD +#include +#include "minimp3.h" + +static void mp3dec_skip_id3v1(const uint8_t *buf, size_t *pbuf_size) +{ + size_t buf_size = *pbuf_size; +#ifndef MINIMP3_NOSKIP_ID3V1 + if (buf_size >= 128 && !memcmp(buf + buf_size - 128, "TAG", 3)) + { + buf_size -= 128; + if (buf_size >= 227 && !memcmp(buf + buf_size - 227, "TAG+", 4)) + buf_size -= 227; + } +#endif +#ifndef MINIMP3_NOSKIP_APEV2 + if (buf_size > 32 && !memcmp(buf + buf_size - 32, "APETAGEX", 8)) + { + buf_size -= 32; + const uint8_t *tag = buf + buf_size + 8 + 4; + uint32_t tag_size = (uint32_t)(tag[3] << 24) | (tag[2] << 16) | (tag[1] << 8) | tag[0]; + if (buf_size >= tag_size) + buf_size -= tag_size; + } +#endif + *pbuf_size = buf_size; +} + +static size_t mp3dec_skip_id3v2(const uint8_t *buf, size_t buf_size) +{ +#define MINIMP3_ID3_DETECT_SIZE 10 +#ifndef MINIMP3_NOSKIP_ID3V2 + if (buf_size >= MINIMP3_ID3_DETECT_SIZE && !memcmp(buf, "ID3", 3) && !((buf[5] & 15) || (buf[6] & 0x80) || (buf[7] & 0x80) || (buf[8] & 0x80) || (buf[9] & 0x80))) + { + size_t id3v2size = (((buf[6] & 0x7f) << 21) | ((buf[7] & 0x7f) << 14) | ((buf[8] & 0x7f) << 7) | (buf[9] & 0x7f)) + 10; + if ((buf[5] & 16)) + id3v2size += 10; /* footer */ + return id3v2size; + } +#endif + return 0; +} + +static void mp3dec_skip_id3(const uint8_t **pbuf, size_t *pbuf_size) +{ + uint8_t *buf = (uint8_t *)(*pbuf); + size_t buf_size = *pbuf_size; + size_t id3v2size = mp3dec_skip_id3v2(buf, buf_size); + if (id3v2size) + { + if (id3v2size >= buf_size) + id3v2size = buf_size; + buf += id3v2size; + buf_size -= id3v2size; + } + mp3dec_skip_id3v1(buf, &buf_size); + *pbuf = (const uint8_t *)buf; + *pbuf_size = buf_size; +} + +static int mp3dec_check_vbrtag(const uint8_t *frame, int frame_size, uint32_t *frames, int *delay, int *padding) +{ + static const char g_xing_tag[4] = { 'X', 'i', 'n', 'g' }; + static const char g_info_tag[4] = { 'I', 'n', 'f', 'o' }; +#define FRAMES_FLAG 1 +#define BYTES_FLAG 2 +#define TOC_FLAG 4 +#define VBR_SCALE_FLAG 8 + /* Side info offsets after header: + / Mono Stereo + / MPEG1 17 32 + / MPEG2 & 2.5 9 17*/ + bs_t bs[1]; + L3_gr_info_t gr_info[4]; + bs_init(bs, frame + HDR_SIZE, frame_size - HDR_SIZE); + if (HDR_IS_CRC(frame)) + get_bits(bs, 16); + if (L3_read_side_info(bs, gr_info, frame) < 0) + return 0; /* side info corrupted */ + + const uint8_t *tag = frame + HDR_SIZE + bs->pos/8; + if (memcmp(g_xing_tag, tag, 4) && memcmp(g_info_tag, tag, 4)) + return 0; + int flags = tag[7]; + if (!((flags & FRAMES_FLAG))) + return -1; + tag += 8; + *frames = (uint32_t)(tag[0] << 24) | (tag[1] << 16) | (tag[2] << 8) | tag[3]; + tag += 4; + if (flags & BYTES_FLAG) + tag += 4; + if (flags & TOC_FLAG) + tag += 100; + if (flags & VBR_SCALE_FLAG) + tag += 4; + *delay = *padding = 0; + if (*tag) + { /* extension, LAME, Lavc, etc. Should be the same structure. */ + tag += 21; + if (tag - frame + 14 >= frame_size) + return 0; + *delay = ((tag[0] << 4) | (tag[1] >> 4)) + (528 + 1); + *padding = (((tag[1] & 0xF) << 8) | tag[2]) - (528 + 1); + } + return 1; +} + +int mp3dec_detect_buf(const uint8_t *buf, size_t buf_size) +{ + return mp3dec_detect_cb(0, (uint8_t *)buf, buf_size); +} + +int mp3dec_detect_cb(mp3dec_io_t *io, uint8_t *buf, size_t buf_size) +{ + if (!buf || (size_t)-1 == buf_size || (io && buf_size < MINIMP3_BUF_SIZE)) + return MP3D_E_PARAM; + size_t filled = buf_size; + if (io) + { + if (io->seek(0, io->seek_data)) + return MP3D_E_IOERROR; + filled = io->read(buf, MINIMP3_ID3_DETECT_SIZE, io->read_data); + if (filled > MINIMP3_ID3_DETECT_SIZE) + return MP3D_E_IOERROR; + } + if (filled < MINIMP3_ID3_DETECT_SIZE) + return MP3D_E_USER; /* too small, can't be mp3/mpa */ + if (mp3dec_skip_id3v2(buf, filled)) + return 0; /* id3v2 tag is enough evidence */ + if (io) + { + size_t readed = io->read(buf + MINIMP3_ID3_DETECT_SIZE, buf_size - MINIMP3_ID3_DETECT_SIZE, io->read_data); + if (readed > (buf_size - MINIMP3_ID3_DETECT_SIZE)) + return MP3D_E_IOERROR; + filled += readed; + if (filled < MINIMP3_BUF_SIZE) + mp3dec_skip_id3v1(buf, &filled); + } else + { + mp3dec_skip_id3v1(buf, &filled); + if (filled > MINIMP3_BUF_SIZE) + filled = MINIMP3_BUF_SIZE; + } + int free_format_bytes, frame_size; + mp3d_find_frame(buf, filled, &free_format_bytes, &frame_size); + if (frame_size) + return 0; /* MAX_FRAME_SYNC_MATCHES consecutive frames found */ + return MP3D_E_USER; +} + +int mp3dec_load_buf(mp3dec_t *dec, const uint8_t *buf, size_t buf_size, mp3dec_file_info_t *info, MP3D_PROGRESS_CB progress_cb, void *user_data) +{ + return mp3dec_load_cb(dec, 0, (uint8_t *)buf, buf_size, info, progress_cb, user_data); +} + +int mp3dec_load_cb(mp3dec_t *dec, mp3dec_io_t *io, uint8_t *buf, size_t buf_size, mp3dec_file_info_t *info, MP3D_PROGRESS_CB progress_cb, void *user_data) +{ + if (!dec || !buf || !info || (size_t)-1 == buf_size || (io && buf_size < MINIMP3_BUF_SIZE)) + return MP3D_E_PARAM; + uint64_t detected_samples = 0; + size_t orig_buf_size = buf_size; + int to_skip = 0; + mp3dec_frame_info_t frame_info; + memset(info, 0, sizeof(*info)); + memset(&frame_info, 0, sizeof(frame_info)); + + /* skip id3 */ + size_t filled = 0, consumed = 0; + int eof = 0, ret = 0; + if (io) + { + if (io->seek(0, io->seek_data)) + return MP3D_E_IOERROR; + filled = io->read(buf, MINIMP3_ID3_DETECT_SIZE, io->read_data); + if (filled > MINIMP3_ID3_DETECT_SIZE) + return MP3D_E_IOERROR; + if (MINIMP3_ID3_DETECT_SIZE != filled) + return 0; + size_t id3v2size = mp3dec_skip_id3v2(buf, filled); + if (id3v2size) + { + if (io->seek(id3v2size, io->seek_data)) + return MP3D_E_IOERROR; + filled = io->read(buf, buf_size, io->read_data); + if (filled > buf_size) + return MP3D_E_IOERROR; + } else + { + size_t readed = io->read(buf + MINIMP3_ID3_DETECT_SIZE, buf_size - MINIMP3_ID3_DETECT_SIZE, io->read_data); + if (readed > (buf_size - MINIMP3_ID3_DETECT_SIZE)) + return MP3D_E_IOERROR; + filled += readed; + } + if (filled < MINIMP3_BUF_SIZE) + mp3dec_skip_id3v1(buf, &filled); + } else + { + mp3dec_skip_id3((const uint8_t **)&buf, &buf_size); + if (!buf_size) + return 0; + } + /* try to make allocation size assumption by first frame or vbr tag */ + mp3dec_init(dec); + int samples; + do + { + uint32_t frames; + int i, delay, padding, free_format_bytes = 0, frame_size = 0; + const uint8_t *hdr; + if (io) + { + if (!eof && filled - consumed < MINIMP3_BUF_SIZE) + { /* keep minimum 10 consecutive mp3 frames (~16KB) worst case */ + memmove(buf, buf + consumed, filled - consumed); + filled -= consumed; + consumed = 0; + size_t readed = io->read(buf + filled, buf_size - filled, io->read_data); + if (readed > (buf_size - filled)) + return MP3D_E_IOERROR; + if (readed != (buf_size - filled)) + eof = 1; + filled += readed; + if (eof) + mp3dec_skip_id3v1(buf, &filled); + } + i = mp3d_find_frame(buf + consumed, filled - consumed, &free_format_bytes, &frame_size); + consumed += i; + hdr = buf + consumed; + } else + { + i = mp3d_find_frame(buf, buf_size, &free_format_bytes, &frame_size); + buf += i; + buf_size -= i; + hdr = buf; + } + if (i && !frame_size) + continue; + if (!frame_size) + return 0; + frame_info.channels = HDR_IS_MONO(hdr) ? 1 : 2; + frame_info.hz = hdr_sample_rate_hz(hdr); + frame_info.layer = 4 - HDR_GET_LAYER(hdr); + frame_info.bitrate_kbps = hdr_bitrate_kbps(hdr); + frame_info.frame_bytes = frame_size; + samples = hdr_frame_samples(hdr)*frame_info.channels; + if (3 != frame_info.layer) + break; + int ret = mp3dec_check_vbrtag(hdr, frame_size, &frames, &delay, &padding); + if (ret > 0) + { + padding *= frame_info.channels; + to_skip = delay*frame_info.channels; + detected_samples = samples*(uint64_t)frames; + if (detected_samples >= (uint64_t)to_skip) + detected_samples -= to_skip; + if (padding > 0 && detected_samples >= (uint64_t)padding) + detected_samples -= padding; + if (!detected_samples) + return 0; + } + if (ret) + { + if (io) + { + consumed += frame_size; + } else + { + buf += frame_size; + buf_size -= frame_size; + } + } + break; + } while(1); + size_t allocated = MINIMP3_MAX_SAMPLES_PER_FRAME*sizeof(mp3d_sample_t); + if (detected_samples) + allocated += detected_samples*sizeof(mp3d_sample_t); + else + allocated += (buf_size/frame_info.frame_bytes)*samples*sizeof(mp3d_sample_t); + info->buffer = (mp3d_sample_t*)malloc(allocated); + if (!info->buffer) + return MP3D_E_MEMORY; + /* save info */ + info->channels = frame_info.channels; + info->hz = frame_info.hz; + info->layer = frame_info.layer; + /* decode all frames */ + size_t avg_bitrate_kbps = 0, frames = 0; + do + { + if ((allocated - info->samples*sizeof(mp3d_sample_t)) < MINIMP3_MAX_SAMPLES_PER_FRAME*sizeof(mp3d_sample_t)) + { + allocated *= 2; + mp3d_sample_t *alloc_buf = (mp3d_sample_t*)realloc(info->buffer, allocated); + if (!alloc_buf) + return MP3D_E_MEMORY; + info->buffer = alloc_buf; + } + if (io) + { + if (!eof && filled - consumed < MINIMP3_BUF_SIZE) + { /* keep minimum 10 consecutive mp3 frames (~16KB) worst case */ + memmove(buf, buf + consumed, filled - consumed); + filled -= consumed; + consumed = 0; + size_t readed = io->read(buf + filled, buf_size - filled, io->read_data); + if (readed != (buf_size - filled)) + eof = 1; + filled += readed; + if (eof) + mp3dec_skip_id3v1(buf, &filled); + } + samples = mp3dec_decode_frame(dec, buf + consumed, filled - consumed, info->buffer + info->samples, &frame_info); + consumed += frame_info.frame_bytes; + } else + { + samples = mp3dec_decode_frame(dec, buf, MINIMP3_MIN(buf_size, (size_t)INT_MAX), info->buffer + info->samples, &frame_info); + buf += frame_info.frame_bytes; + buf_size -= frame_info.frame_bytes; + } + if (samples) + { + if (info->hz != frame_info.hz || info->layer != frame_info.layer) + { + ret = MP3D_E_DECODE; + break; + } + if (info->channels && info->channels != frame_info.channels) + { +#ifdef MINIMP3_ALLOW_MONO_STEREO_TRANSITION + info->channels = 0; /* mark file with mono-stereo transition */ +#else + ret = MP3D_E_DECODE; + break; +#endif + } + samples *= frame_info.channels; + if (to_skip) + { + size_t skip = MINIMP3_MIN(samples, to_skip); + to_skip -= skip; + samples -= skip; + memmove(info->buffer, info->buffer + skip, samples*sizeof(mp3d_sample_t)); + } + info->samples += samples; + avg_bitrate_kbps += frame_info.bitrate_kbps; + frames++; + if (progress_cb) + { + ret = progress_cb(user_data, orig_buf_size, orig_buf_size - buf_size, &frame_info); + if (ret) + break; + } + } + } while (frame_info.frame_bytes); + if (detected_samples && info->samples > detected_samples) + info->samples = detected_samples; /* cut padding */ + /* reallocate to normal buffer size */ + if (allocated != info->samples*sizeof(mp3d_sample_t)) + { + mp3d_sample_t *alloc_buf = (mp3d_sample_t*)realloc(info->buffer, info->samples*sizeof(mp3d_sample_t)); + if (!alloc_buf && info->samples) + return MP3D_E_MEMORY; + info->buffer = alloc_buf; + } + if (frames) + info->avg_bitrate_kbps = avg_bitrate_kbps/frames; + return ret; +} + +int mp3dec_iterate_buf(const uint8_t *buf, size_t buf_size, MP3D_ITERATE_CB callback, void *user_data) +{ + const uint8_t *orig_buf = buf; + if (!buf || (size_t)-1 == buf_size || !callback) + return MP3D_E_PARAM; + /* skip id3 */ + mp3dec_skip_id3(&buf, &buf_size); + if (!buf_size) + return 0; + mp3dec_frame_info_t frame_info; + memset(&frame_info, 0, sizeof(frame_info)); + do + { + int free_format_bytes = 0, frame_size = 0, ret; + int i = mp3d_find_frame(buf, buf_size, &free_format_bytes, &frame_size); + buf += i; + buf_size -= i; + if (i && !frame_size) + continue; + if (!frame_size) + break; + const uint8_t *hdr = buf; + frame_info.channels = HDR_IS_MONO(hdr) ? 1 : 2; + frame_info.hz = hdr_sample_rate_hz(hdr); + frame_info.layer = 4 - HDR_GET_LAYER(hdr); + frame_info.bitrate_kbps = hdr_bitrate_kbps(hdr); + frame_info.frame_bytes = frame_size; + + if (callback) + { + if ((ret = callback(user_data, hdr, frame_size, free_format_bytes, buf_size, hdr - orig_buf, &frame_info))) + return ret; + } + buf += frame_size; + buf_size -= frame_size; + } while (1); + return 0; +} + +int mp3dec_iterate_cb(mp3dec_io_t *io, uint8_t *buf, size_t buf_size, MP3D_ITERATE_CB callback, void *user_data) +{ + if (!io || !buf || (size_t)-1 == buf_size || buf_size < MINIMP3_BUF_SIZE || !callback) + return MP3D_E_PARAM; + size_t filled = io->read(buf, MINIMP3_ID3_DETECT_SIZE, io->read_data), consumed = 0; + uint64_t readed = 0; + mp3dec_frame_info_t frame_info; + int eof = 0; + memset(&frame_info, 0, sizeof(frame_info)); + if (filled > MINIMP3_ID3_DETECT_SIZE) + return MP3D_E_IOERROR; + if (MINIMP3_ID3_DETECT_SIZE != filled) + return 0; + size_t id3v2size = mp3dec_skip_id3v2(buf, filled); + if (id3v2size) + { + if (io->seek(id3v2size, io->seek_data)) + return MP3D_E_IOERROR; + filled = io->read(buf, buf_size, io->read_data); + if (filled > buf_size) + return MP3D_E_IOERROR; + readed += id3v2size; + } else + { + size_t readed = io->read(buf + MINIMP3_ID3_DETECT_SIZE, buf_size - MINIMP3_ID3_DETECT_SIZE, io->read_data); + if (readed > (buf_size - MINIMP3_ID3_DETECT_SIZE)) + return MP3D_E_IOERROR; + filled += readed; + } + if (filled < MINIMP3_BUF_SIZE) + mp3dec_skip_id3v1(buf, &filled); + do + { + int free_format_bytes = 0, frame_size = 0, ret; + int i = mp3d_find_frame(buf + consumed, filled - consumed, &free_format_bytes, &frame_size); + if (i && !frame_size) + { + consumed += i; + continue; + } + if (!frame_size) + break; + const uint8_t *hdr = buf + consumed + i; + frame_info.channels = HDR_IS_MONO(hdr) ? 1 : 2; + frame_info.hz = hdr_sample_rate_hz(hdr); + frame_info.layer = 4 - HDR_GET_LAYER(hdr); + frame_info.bitrate_kbps = hdr_bitrate_kbps(hdr); + frame_info.frame_bytes = frame_size; + + readed += i; + if (callback) + { + if ((ret = callback(user_data, hdr, frame_size, free_format_bytes, filled - consumed, readed, &frame_info))) + return ret; + } + readed += frame_size; + consumed += i + frame_size; + if (!eof && filled - consumed < MINIMP3_BUF_SIZE) + { /* keep minimum 10 consecutive mp3 frames (~16KB) worst case */ + memmove(buf, buf + consumed, filled - consumed); + filled -= consumed; + consumed = 0; + size_t readed = io->read(buf + filled, buf_size - filled, io->read_data); + if (readed > (buf_size - filled)) + return MP3D_E_IOERROR; + if (readed != (buf_size - filled)) + eof = 1; + filled += readed; + if (eof) + mp3dec_skip_id3v1(buf, &filled); + } + } while (1); + return 0; +} + +static int mp3dec_load_index(void *user_data, const uint8_t *frame, int frame_size, int free_format_bytes, size_t buf_size, uint64_t offset, mp3dec_frame_info_t *info) +{ + mp3dec_frame_t *idx_frame; + mp3dec_ex_t *dec = (mp3dec_ex_t *)user_data; + if (!dec->index.frames && !dec->start_offset) + { /* detect VBR tag and try to avoid full scan */ + uint32_t frames; + int delay, padding; + dec->info = *info; + dec->start_offset = dec->offset = offset; + dec->end_offset = offset + buf_size; + dec->free_format_bytes = free_format_bytes; /* should not change */ + if (3 == dec->info.layer) + { + int ret = mp3dec_check_vbrtag(frame, frame_size, &frames, &delay, &padding); + if (ret) + dec->start_offset = dec->offset = offset + frame_size; + if (ret > 0) + { + padding *= info->channels; + dec->start_delay = dec->to_skip = delay*info->channels; + dec->samples = hdr_frame_samples(frame)*info->channels*(uint64_t)frames; + if (dec->samples >= (uint64_t)dec->start_delay) + dec->samples -= dec->start_delay; + if (padding > 0 && dec->samples >= (uint64_t)padding) + dec->samples -= padding; + dec->detected_samples = dec->samples; + dec->vbr_tag_found = 1; + return MP3D_E_USER; + } else if (ret < 0) + return 0; + } + } + if (dec->flags & MP3D_DO_NOT_SCAN) + return MP3D_E_USER; + if (dec->index.num_frames + 1 > dec->index.capacity) + { + if (!dec->index.capacity) + dec->index.capacity = 4096; + else + dec->index.capacity *= 2; + mp3dec_frame_t *alloc_buf = (mp3dec_frame_t *)realloc((void*)dec->index.frames, sizeof(mp3dec_frame_t)*dec->index.capacity); + if (!alloc_buf) + return MP3D_E_MEMORY; + dec->index.frames = alloc_buf; + } + idx_frame = &dec->index.frames[dec->index.num_frames++]; + idx_frame->offset = offset; + idx_frame->sample = dec->samples; + if (!dec->buffer_samples && dec->index.num_frames < 256) + { /* for some cutted mp3 frames, bit-reservoir not filled and decoding can't be started from first frames */ + /* try to decode up to 255 first frames till samples starts to decode */ + dec->buffer_samples = mp3dec_decode_frame(&dec->mp3d, frame, MINIMP3_MIN(buf_size, (size_t)INT_MAX), dec->buffer, info); + dec->samples += dec->buffer_samples*info->channels; + } else + dec->samples += hdr_frame_samples(frame)*info->channels; + return 0; +} + +int mp3dec_ex_open_buf(mp3dec_ex_t *dec, const uint8_t *buf, size_t buf_size, int flags) +{ + if (!dec || !buf || (size_t)-1 == buf_size || (flags & (~MP3D_FLAGS_MASK))) + return MP3D_E_PARAM; + memset(dec, 0, sizeof(*dec)); + dec->file.buffer = buf; + dec->file.size = buf_size; + dec->flags = flags; + mp3dec_init(&dec->mp3d); + int ret = mp3dec_iterate_buf(dec->file.buffer, dec->file.size, mp3dec_load_index, dec); + if (ret && MP3D_E_USER != ret) + return ret; + mp3dec_init(&dec->mp3d); + dec->buffer_samples = 0; + dec->indexes_built = !(dec->vbr_tag_found || (flags & MP3D_DO_NOT_SCAN)); + dec->flags &= (~MP3D_DO_NOT_SCAN); + return 0; +} + +#ifndef MINIMP3_SEEK_IDX_LINEAR_SEARCH +static size_t mp3dec_idx_binary_search(mp3dec_index_t *idx, uint64_t position) +{ + size_t end = idx->num_frames, start = 0, index = 0; + while (start <= end) + { + size_t mid = (start + end) / 2; + if (idx->frames[mid].sample >= position) + { /* move left side. */ + if (idx->frames[mid].sample == position) + return mid; + end = mid - 1; + } else + { /* move to right side */ + index = mid; + start = mid + 1; + if (start == idx->num_frames) + break; + } + } + return index; +} +#endif + +int mp3dec_ex_seek(mp3dec_ex_t *dec, uint64_t position) +{ + size_t i; + if (!dec) + return MP3D_E_PARAM; + if (!(dec->flags & MP3D_SEEK_TO_SAMPLE)) + { + if (dec->io) + { + dec->offset = position; + } else + { + dec->offset = MINIMP3_MIN(position, dec->file.size); + } + dec->cur_sample = 0; + goto do_exit; + } + dec->cur_sample = position; + position += dec->start_delay; + if (0 == position) + { /* optimize seek to zero, no index needed */ +seek_zero: + dec->offset = dec->start_offset; + dec->to_skip = 0; + goto do_exit; + } + if (!dec->indexes_built) + { /* no index created yet (vbr tag used to calculate track length or MP3D_DO_NOT_SCAN open flag used) */ + dec->indexes_built = 1; + dec->samples = 0; + dec->buffer_samples = 0; + if (dec->io) + { + if (dec->io->seek(dec->start_offset, dec->io->seek_data)) + return MP3D_E_IOERROR; + int ret = mp3dec_iterate_cb(dec->io, (uint8_t *)dec->file.buffer, dec->file.size, mp3dec_load_index, dec); + if (ret && MP3D_E_USER != ret) + return ret; + } else + { + int ret = mp3dec_iterate_buf(dec->file.buffer + dec->start_offset, dec->file.size - dec->start_offset, mp3dec_load_index, dec); + if (ret && MP3D_E_USER != ret) + return ret; + } + for (i = 0; i < dec->index.num_frames; i++) + dec->index.frames[i].offset += dec->start_offset; + dec->samples = dec->detected_samples; + } + if (!dec->index.frames) + goto seek_zero; /* no frames in file - seek to zero */ +#ifdef MINIMP3_SEEK_IDX_LINEAR_SEARCH + for (i = 0; i < dec->index.num_frames; i++) + { + if (dec->index.frames[i].sample >= position) + break; + } +#else + i = mp3dec_idx_binary_search(&dec->index, position); +#endif + if (i) + { + int to_fill_bytes = 511; + int skip_frames = MINIMP3_PREDECODE_FRAMES +#ifdef MINIMP3_SEEK_IDX_LINEAR_SEARCH + + ((dec->index.frames[i].sample == position) ? 0 : 1) +#endif + ; + i -= MINIMP3_MIN(i, (size_t)skip_frames); + if (3 == dec->info.layer) + { + while (i && to_fill_bytes) + { /* make sure bit-reservoir is filled when we start decoding */ + bs_t bs[1]; + L3_gr_info_t gr_info[4]; + int frame_bytes, frame_size; + const uint8_t *hdr; + if (dec->io) + { + hdr = dec->file.buffer; + if (dec->io->seek(dec->index.frames[i - 1].offset, dec->io->seek_data)) + return MP3D_E_IOERROR; + size_t readed = dec->io->read((uint8_t *)hdr, HDR_SIZE, dec->io->read_data); + if (readed != HDR_SIZE) + return MP3D_E_IOERROR; + frame_size = hdr_frame_bytes(hdr, dec->free_format_bytes) + hdr_padding(hdr); + readed = dec->io->read((uint8_t *)hdr + HDR_SIZE, frame_size - HDR_SIZE, dec->io->read_data); + if (readed != (size_t)(frame_size - HDR_SIZE)) + return MP3D_E_IOERROR; + bs_init(bs, hdr + HDR_SIZE, frame_size - HDR_SIZE); + } else + { + hdr = dec->file.buffer + dec->index.frames[i - 1].offset; + frame_size = hdr_frame_bytes(hdr, dec->free_format_bytes) + hdr_padding(hdr); + bs_init(bs, hdr + HDR_SIZE, frame_size - HDR_SIZE); + } + if (HDR_IS_CRC(hdr)) + get_bits(bs, 16); + i--; + if (L3_read_side_info(bs, gr_info, hdr) < 0) + break; /* frame not decodable, we can start from here */ + frame_bytes = (bs->limit - bs->pos)/8; + to_fill_bytes -= MINIMP3_MIN(to_fill_bytes, frame_bytes); + } + } + } + dec->offset = dec->index.frames[i].offset; + dec->to_skip = position - dec->index.frames[i].sample; + while ((i + 1) < dec->index.num_frames && !dec->index.frames[i].sample && !dec->index.frames[i + 1].sample) + { /* skip not decodable first frames */ + const uint8_t *hdr; + if (dec->io) + { + hdr = dec->file.buffer; + if (dec->io->seek(dec->index.frames[i].offset, dec->io->seek_data)) + return MP3D_E_IOERROR; + size_t readed = dec->io->read((uint8_t *)hdr, HDR_SIZE, dec->io->read_data); + if (readed != HDR_SIZE) + return MP3D_E_IOERROR; + } else + hdr = dec->file.buffer + dec->index.frames[i].offset; + dec->to_skip += hdr_frame_samples(hdr)*dec->info.channels; + i++; + } +do_exit: + if (dec->io) + { + if (dec->io->seek(dec->offset, dec->io->seek_data)) + return MP3D_E_IOERROR; + } + dec->buffer_samples = 0; + dec->buffer_consumed = 0; + dec->input_consumed = 0; + dec->input_filled = 0; + dec->last_error = 0; + mp3dec_init(&dec->mp3d); + return 0; +} + +size_t mp3dec_ex_read_frame(mp3dec_ex_t *dec, mp3d_sample_t **buf, mp3dec_frame_info_t *frame_info, size_t max_samples) +{ + if (!dec || !buf || !frame_info) + { + if (dec) + dec->last_error = MP3D_E_PARAM; + return 0; + } + if (dec->detected_samples && dec->cur_sample >= dec->detected_samples) + return 0; /* at end of stream */ + if (dec->last_error) + return 0; /* error eof state, seek can reset it */ + *buf = NULL; + uint64_t end_offset = dec->end_offset ? dec->end_offset : dec->file.size; + int eof = 0; + while (dec->buffer_consumed == dec->buffer_samples) + { + const uint8_t *dec_buf; + if (dec->io) + { + if (!eof && (dec->input_filled - dec->input_consumed) < MINIMP3_BUF_SIZE) + { /* keep minimum 10 consecutive mp3 frames (~16KB) worst case */ + memmove((uint8_t*)dec->file.buffer, (uint8_t*)dec->file.buffer + dec->input_consumed, dec->input_filled - dec->input_consumed); + dec->input_filled -= dec->input_consumed; + dec->input_consumed = 0; + size_t readed = dec->io->read((uint8_t*)dec->file.buffer + dec->input_filled, dec->file.size - dec->input_filled, dec->io->read_data); + if (readed > (dec->file.size - dec->input_filled)) + { + dec->last_error = MP3D_E_IOERROR; + readed = 0; + } + if (readed != (dec->file.size - dec->input_filled)) + eof = 1; + dec->input_filled += readed; + if (eof) + mp3dec_skip_id3v1((uint8_t*)dec->file.buffer, &dec->input_filled); + } + dec_buf = dec->file.buffer + dec->input_consumed; + if (!(dec->input_filled - dec->input_consumed)) + return 0; + dec->buffer_samples = mp3dec_decode_frame(&dec->mp3d, dec_buf, dec->input_filled - dec->input_consumed, dec->buffer, frame_info); + dec->input_consumed += frame_info->frame_bytes; + } else + { + dec_buf = dec->file.buffer + dec->offset; + uint64_t buf_size = end_offset - dec->offset; + if (!buf_size) + return 0; + dec->buffer_samples = mp3dec_decode_frame(&dec->mp3d, dec_buf, MINIMP3_MIN(buf_size, (uint64_t)INT_MAX), dec->buffer, frame_info); + } + dec->buffer_consumed = 0; + if (dec->info.hz != frame_info->hz || dec->info.layer != frame_info->layer) + { +return_e_decode: + dec->last_error = MP3D_E_DECODE; + return 0; + } + if (dec->buffer_samples) + { + dec->buffer_samples *= frame_info->channels; + if (dec->to_skip) + { + size_t skip = MINIMP3_MIN(dec->buffer_samples, dec->to_skip); + dec->buffer_consumed += skip; + dec->to_skip -= skip; + } + if ( +#ifdef MINIMP3_ALLOW_MONO_STEREO_TRANSITION + !(dec->flags & MP3D_ALLOW_MONO_STEREO_TRANSITION) && +#endif + dec->buffer_consumed != dec->buffer_samples && dec->info.channels != frame_info->channels) + { + goto return_e_decode; + } + } else if (dec->to_skip) + { /* In mp3 decoding not always can start decode from any frame because of bit reservoir, + count skip samples for such frames */ + int frame_samples = hdr_frame_samples(dec_buf)*frame_info->channels; + dec->to_skip -= MINIMP3_MIN(frame_samples, dec->to_skip); + } + dec->offset += frame_info->frame_bytes; + } + size_t out_samples = MINIMP3_MIN((size_t)(dec->buffer_samples - dec->buffer_consumed), max_samples); + if (dec->detected_samples) + { /* count decoded samples to properly cut padding */ + if (dec->cur_sample + out_samples >= dec->detected_samples) + out_samples = dec->detected_samples - dec->cur_sample; + } + dec->cur_sample += out_samples; + *buf = dec->buffer + dec->buffer_consumed; + dec->buffer_consumed += out_samples; + return out_samples; +} + +size_t mp3dec_ex_read(mp3dec_ex_t *dec, mp3d_sample_t *buf, size_t samples) +{ + if (!dec || !buf) + { + if (dec) + dec->last_error = MP3D_E_PARAM; + return 0; + } + mp3dec_frame_info_t frame_info; + memset(&frame_info, 0, sizeof(frame_info)); + size_t samples_requested = samples; + while (samples) + { + mp3d_sample_t *buf_frame = NULL; + size_t read_samples = mp3dec_ex_read_frame(dec, &buf_frame, &frame_info, samples); + if (!read_samples) + { + break; + } + memcpy(buf, buf_frame, read_samples * sizeof(mp3d_sample_t)); + buf += read_samples; + samples -= read_samples; + } + return samples_requested - samples; +} + +int mp3dec_ex_open_cb(mp3dec_ex_t *dec, mp3dec_io_t *io, int flags) +{ + if (!dec || !io || (flags & (~MP3D_FLAGS_MASK))) + return MP3D_E_PARAM; + memset(dec, 0, sizeof(*dec)); +#ifdef MINIMP3_HAVE_RING + int ret; + if (ret = mp3dec_open_ring(&dec->file, MINIMP3_IO_SIZE)) + return ret; +#else + dec->file.size = MINIMP3_IO_SIZE; + dec->file.buffer = (const uint8_t*)malloc(dec->file.size); + if (!dec->file.buffer) + return MP3D_E_MEMORY; +#endif + dec->flags = flags; + dec->io = io; + mp3dec_init(&dec->mp3d); + if (io->seek(0, io->seek_data)) + return MP3D_E_IOERROR; + int ret = mp3dec_iterate_cb(io, (uint8_t *)dec->file.buffer, dec->file.size, mp3dec_load_index, dec); + if (ret && MP3D_E_USER != ret) + return ret; + if (dec->io->seek(dec->start_offset, dec->io->seek_data)) + return MP3D_E_IOERROR; + mp3dec_init(&dec->mp3d); + dec->buffer_samples = 0; + dec->indexes_built = !(dec->vbr_tag_found || (flags & MP3D_DO_NOT_SCAN)); + dec->flags &= (~MP3D_DO_NOT_SCAN); + return 0; +} + + +#ifndef MINIMP3_NO_STDIO + +#if defined(__linux__) || defined(__FreeBSD__) +#include +#include +#include +#include +#include +#include +#if !defined(_GNU_SOURCE) +#include +#include +#endif +#if !defined(MAP_POPULATE) && defined(__linux__) +#define MAP_POPULATE 0x08000 +#elif !defined(MAP_POPULATE) +#define MAP_POPULATE 0 +#endif + +static void mp3dec_close_file(mp3dec_map_info_t *map_info) +{ + if (map_info->buffer && MAP_FAILED != map_info->buffer) + munmap((void *)map_info->buffer, map_info->size); + map_info->buffer = 0; + map_info->size = 0; +} + +static int mp3dec_open_file(const char *file_name, mp3dec_map_info_t *map_info) +{ + if (!file_name) + return MP3D_E_PARAM; + int file; + struct stat st; + memset(map_info, 0, sizeof(*map_info)); +retry_open: + file = open(file_name, O_RDONLY); + if (file < 0 && (errno == EAGAIN || errno == EINTR)) + goto retry_open; + if (file < 0 || fstat(file, &st) < 0) + { + close(file); + return MP3D_E_IOERROR; + } + + map_info->size = st.st_size; +retry_mmap: + map_info->buffer = (const uint8_t *)mmap(NULL, st.st_size, PROT_READ, MAP_PRIVATE | MAP_POPULATE, file, 0); + if (MAP_FAILED == map_info->buffer && (errno == EAGAIN || errno == EINTR)) + goto retry_mmap; + close(file); + if (MAP_FAILED == map_info->buffer) + return MP3D_E_IOERROR; + return 0; +} + +#if MINIMP3_ENABLE_RING && defined(__linux__) && defined(_GNU_SOURCE) +#define MINIMP3_HAVE_RING +static void mp3dec_close_ring(mp3dec_map_info_t *map_info) +{ +#if defined(__linux__) && defined(_GNU_SOURCE) + if (map_info->buffer && MAP_FAILED != map_info->buffer) + munmap((void *)map_info->buffer, map_info->size*2); +#else + if (map_info->buffer) + { + shmdt(map_info->buffer); + shmdt(map_info->buffer + map_info->size); + } +#endif + map_info->buffer = 0; + map_info->size = 0; +} + +static int mp3dec_open_ring(mp3dec_map_info_t *map_info, size_t size) +{ + int memfd, page_size; +#if defined(__linux__) && defined(_GNU_SOURCE) + void *buffer; + int res; +#endif + memset(map_info, 0, sizeof(*map_info)); + +#ifdef _SC_PAGESIZE + page_size = sysconf(_SC_PAGESIZE); +#else + page_size = getpagesize(); +#endif + map_info->size = (size + page_size - 1)/page_size*page_size; + +#if defined(__linux__) && defined(_GNU_SOURCE) + memfd = memfd_create("mp3_ring", 0); + if (memfd < 0) + return MP3D_E_MEMORY; + +retry_ftruncate: + res = ftruncate(memfd, map_info->size); + if (res && (errno == EAGAIN || errno == EINTR)) + goto retry_ftruncate; + if (res) + goto error; + +retry_mmap: + map_info->buffer = (const uint8_t *)mmap(NULL, map_info->size*2, PROT_NONE, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0); + if (MAP_FAILED == map_info->buffer && (errno == EAGAIN || errno == EINTR)) + goto retry_mmap; + if (MAP_FAILED == map_info->buffer || !map_info->buffer) + goto error; +retry_mmap2: + buffer = mmap((void *)map_info->buffer, map_info->size, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_SHARED, memfd, 0); + if (MAP_FAILED == map_info->buffer && (errno == EAGAIN || errno == EINTR)) + goto retry_mmap2; + if (MAP_FAILED == map_info->buffer || buffer != (void *)map_info->buffer) + goto error; +retry_mmap3: + buffer = mmap((void *)map_info->buffer + map_info->size, map_info->size, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_SHARED, memfd, 0); + if (MAP_FAILED == map_info->buffer && (errno == EAGAIN || errno == EINTR)) + goto retry_mmap3; + if (MAP_FAILED == map_info->buffer || buffer != (void *)(map_info->buffer + map_info->size)) + goto error; + + close(memfd); + return 0; +error: + close(memfd); + mp3dec_close_ring(map_info); + return MP3D_E_MEMORY; +#else + memfd = shmget(IPC_PRIVATE, map_info->size, IPC_CREAT | 0700); + if (memfd < 0) + return MP3D_E_MEMORY; +retry_mmap: + map_info->buffer = (const uint8_t *)mmap(NULL, map_info->size*2, PROT_NONE, MAP_PRIVATE, -1, 0); + if (MAP_FAILED == map_info->buffer && (errno == EAGAIN || errno == EINTR)) + goto retry_mmap; + if (MAP_FAILED == map_info->buffer) + goto error; + if (map_info->buffer != shmat(memfd, map_info->buffer, 0)) + goto error; + if ((map_info->buffer + map_info->size) != shmat(memfd, map_info->buffer + map_info->size, 0)) + goto error; + if (shmctl(memfd, IPC_RMID, NULL) < 0) + return MP3D_E_MEMORY; + return 0; +error: + shmctl(memfd, IPC_RMID, NULL); + mp3dec_close_ring(map_info); + return MP3D_E_MEMORY; +#endif +} +#endif /*MINIMP3_ENABLE_RING*/ +#elif defined(_WIN32) +#include + +static void mp3dec_close_file(mp3dec_map_info_t *map_info) +{ + if (map_info->buffer) + UnmapViewOfFile(map_info->buffer); + map_info->buffer = 0; + map_info->size = 0; +} + +static int mp3dec_open_file_h(HANDLE file, mp3dec_map_info_t *map_info) +{ + memset(map_info, 0, sizeof(*map_info)); + + HANDLE mapping = NULL; + LARGE_INTEGER s; + s.LowPart = GetFileSize(file, (DWORD*)&s.HighPart); + if (s.LowPart == INVALID_FILE_SIZE && GetLastError() != NO_ERROR) + goto error; + map_info->size = s.QuadPart; + + mapping = CreateFileMapping(file, NULL, PAGE_READONLY, 0, 0, NULL); + if (!mapping) + goto error; + map_info->buffer = (const uint8_t*)MapViewOfFile(mapping, FILE_MAP_READ, 0, 0, s.QuadPart); + CloseHandle(mapping); + if (!map_info->buffer) + goto error; + + CloseHandle(file); + return 0; +error: + mp3dec_close_file(map_info); + CloseHandle(file); + return MP3D_E_IOERROR; +} + +static int mp3dec_open_file(const char *file_name, mp3dec_map_info_t *map_info) +{ + if (!file_name) + return MP3D_E_PARAM; + HANDLE file = CreateFileA(file_name, GENERIC_READ, FILE_SHARE_READ, 0, OPEN_EXISTING, 0, 0); + if (INVALID_HANDLE_VALUE == file) + return MP3D_E_IOERROR; + return mp3dec_open_file_h(file, map_info); +} + +static int mp3dec_open_file_w(const wchar_t *file_name, mp3dec_map_info_t *map_info) +{ + if (!file_name) + return MP3D_E_PARAM; + HANDLE file = CreateFileW(file_name, GENERIC_READ, FILE_SHARE_READ, 0, OPEN_EXISTING, 0, 0); + if (INVALID_HANDLE_VALUE == file) + return MP3D_E_IOERROR; + return mp3dec_open_file_h(file, map_info); +} +#else +#include + +static void mp3dec_close_file(mp3dec_map_info_t *map_info) +{ + if (map_info->buffer) + free((void *)map_info->buffer); + map_info->buffer = 0; + map_info->size = 0; +} + +static int mp3dec_open_file(const char *file_name, mp3dec_map_info_t *map_info) +{ + if (!file_name) + return MP3D_E_PARAM; + memset(map_info, 0, sizeof(*map_info)); + FILE *file = fopen(file_name, "rb"); + if (!file) + return MP3D_E_IOERROR; + int res = MP3D_E_IOERROR; + long size = -1; + if (fseek(file, 0, SEEK_END)) + goto error; + size = ftell(file); + if (size < 0) + goto error; + map_info->size = (size_t)size; + if (fseek(file, 0, SEEK_SET)) + goto error; + map_info->buffer = (uint8_t *)malloc(map_info->size); + if (!map_info->buffer) + { + res = MP3D_E_MEMORY; + goto error; + } + if (fread((void *)map_info->buffer, 1, map_info->size, file) != map_info->size) + goto error; + fclose(file); + return 0; +error: + mp3dec_close_file(map_info); + fclose(file); + return res; +} +#endif + +static int mp3dec_detect_mapinfo(mp3dec_map_info_t *map_info) +{ + int ret = mp3dec_detect_buf(map_info->buffer, map_info->size); + mp3dec_close_file(map_info); + return ret; +} + +static int mp3dec_load_mapinfo(mp3dec_t *dec, mp3dec_map_info_t *map_info, mp3dec_file_info_t *info, MP3D_PROGRESS_CB progress_cb, void *user_data) +{ + int ret = mp3dec_load_buf(dec, map_info->buffer, map_info->size, info, progress_cb, user_data); + mp3dec_close_file(map_info); + return ret; +} + +static int mp3dec_iterate_mapinfo(mp3dec_map_info_t *map_info, MP3D_ITERATE_CB callback, void *user_data) +{ + int ret = mp3dec_iterate_buf(map_info->buffer, map_info->size, callback, user_data); + mp3dec_close_file(map_info); + return ret; +} + +static int mp3dec_ex_open_mapinfo(mp3dec_ex_t *dec, int flags) +{ + int ret = mp3dec_ex_open_buf(dec, dec->file.buffer, dec->file.size, flags); + dec->is_file = 1; + if (ret) + mp3dec_ex_close(dec); + return ret; +} + +int mp3dec_detect(const char *file_name) +{ + int ret; + mp3dec_map_info_t map_info; + if ((ret = mp3dec_open_file(file_name, &map_info))) + return ret; + return mp3dec_detect_mapinfo(&map_info); +} + +int mp3dec_load(mp3dec_t *dec, const char *file_name, mp3dec_file_info_t *info, MP3D_PROGRESS_CB progress_cb, void *user_data) +{ + int ret; + mp3dec_map_info_t map_info; + if ((ret = mp3dec_open_file(file_name, &map_info))) + return ret; + return mp3dec_load_mapinfo(dec, &map_info, info, progress_cb, user_data); +} + +int mp3dec_iterate(const char *file_name, MP3D_ITERATE_CB callback, void *user_data) +{ + int ret; + mp3dec_map_info_t map_info; + if ((ret = mp3dec_open_file(file_name, &map_info))) + return ret; + return mp3dec_iterate_mapinfo(&map_info, callback, user_data); +} + +int mp3dec_ex_open(mp3dec_ex_t *dec, const char *file_name, int flags) +{ + int ret; + if (!dec) + return MP3D_E_PARAM; + if ((ret = mp3dec_open_file(file_name, &dec->file))) + return ret; + return mp3dec_ex_open_mapinfo(dec, flags); +} + +void mp3dec_ex_close(mp3dec_ex_t *dec) +{ +#ifdef MINIMP3_HAVE_RING + if (dec->io) + mp3dec_close_ring(&dec->file); +#else + if (dec->io && dec->file.buffer) + free((void*)dec->file.buffer); +#endif + if (dec->is_file) + mp3dec_close_file(&dec->file); + if (dec->index.frames) + free(dec->index.frames); + memset(dec, 0, sizeof(*dec)); +} + +#ifdef _WIN32 +int mp3dec_detect_w(const wchar_t *file_name) +{ + int ret; + mp3dec_map_info_t map_info; + if ((ret = mp3dec_open_file_w(file_name, &map_info))) + return ret; + return mp3dec_detect_mapinfo(&map_info); +} + +int mp3dec_load_w(mp3dec_t *dec, const wchar_t *file_name, mp3dec_file_info_t *info, MP3D_PROGRESS_CB progress_cb, void *user_data) +{ + int ret; + mp3dec_map_info_t map_info; + if ((ret = mp3dec_open_file_w(file_name, &map_info))) + return ret; + return mp3dec_load_mapinfo(dec, &map_info, info, progress_cb, user_data); +} + +int mp3dec_iterate_w(const wchar_t *file_name, MP3D_ITERATE_CB callback, void *user_data) +{ + int ret; + mp3dec_map_info_t map_info; + if ((ret = mp3dec_open_file_w(file_name, &map_info))) + return ret; + return mp3dec_iterate_mapinfo(&map_info, callback, user_data); +} + +int mp3dec_ex_open_w(mp3dec_ex_t *dec, const wchar_t *file_name, int flags) +{ + int ret; + if ((ret = mp3dec_open_file_w(file_name, &dec->file))) + return ret; + return mp3dec_ex_open_mapinfo(dec, flags); +} +#endif +#else /* MINIMP3_NO_STDIO */ +void mp3dec_ex_close(mp3dec_ex_t *dec) +{ +#ifdef MINIMP3_HAVE_RING + if (dec->io) + mp3dec_close_ring(&dec->file); +#else + if (dec->io && dec->file.buffer) + free((void*)dec->file.buffer); +#endif + if (dec->index.frames) + free(dec->index.frames); + memset(dec, 0, sizeof(*dec)); +} +#endif + +#endif /* MINIMP3_IMPLEMENTATION && !_MINIMP3_EX_IMPLEMENTATION_GUARD */ From 862fb951f1f18c826c622ed6641ef71a2dff2c8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Tue, 9 Apr 2024 17:29:57 +0200 Subject: [PATCH 047/719] Add support for loading mp3 files as UI sound. Fixes #18136 --- CMakeLists.txt | 2 +- Common/Common.vcxproj | 4 +- Common/Common.vcxproj.filters | 9 ++++ Qt/QtMain.cpp | 2 +- UI/BackgroundAudio.cpp | 91 ++++++++++++++++++++++------------- UI/BackgroundAudio.h | 2 +- UWP/PPSSPP_UWPMain.cpp | 2 +- Windows/main.cpp | 2 +- android/jni/Android.mk | 4 ++ ext/CMakeLists.txt | 1 + 10 files changed, 79 insertions(+), 40 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7decc89c36..509831913a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2363,7 +2363,7 @@ endif() include_directories(ext/libchdr/include) -target_link_libraries(${CoreLibName} Common native chdr kirk cityhash sfmt19937 xbrz xxhash rcheevos ${GlslangLibs} +target_link_libraries(${CoreLibName} Common native chdr kirk cityhash sfmt19937 xbrz xxhash rcheevos minimp3 ${GlslangLibs} ${CoreExtraLibs} ${OPENGL_LIBRARIES} ${X11_LIBRARIES} ${CMAKE_DL_LIBS}) if(NOT HTTPS_NOT_AVAILABLE) diff --git a/Common/Common.vcxproj b/Common/Common.vcxproj index f3a3ab22f7..1bd39b7f62 100644 --- a/Common/Common.vcxproj +++ b/Common/Common.vcxproj @@ -399,6 +399,7 @@ + @@ -832,6 +833,7 @@ + @@ -1039,4 +1041,4 @@ - + \ No newline at end of file diff --git a/Common/Common.vcxproj.filters b/Common/Common.vcxproj.filters index 6d82c03c04..8345e4d18b 100644 --- a/Common/Common.vcxproj.filters +++ b/Common/Common.vcxproj.filters @@ -521,6 +521,9 @@ Math + + ext\minimp3 + @@ -975,6 +978,9 @@ GPU\Vulkan + + ext\minimp3 + @@ -1085,6 +1091,9 @@ {b681797d-7747-487f-b448-5ef5b2d2805b} + + {83cd76d0-d1ac-4ed1-9bdc-11fb5a20e5d3} + diff --git a/Qt/QtMain.cpp b/Qt/QtMain.cpp index 235856423a..c9b3251970 100644 --- a/Qt/QtMain.cpp +++ b/Qt/QtMain.cpp @@ -316,7 +316,7 @@ bool MainUI::HandleCustomEvent(QEvent *e) { filter = "DB files (*.db)"; break; case BrowseFileType::SOUND_EFFECT: - filter = "WAVE files (*.wav)"; + filter = "WAVE files (*.wav *.mp3)"; break; case BrowseFileType::ZIP: filter = "ZIP files (*.zip)"; diff --git a/UI/BackgroundAudio.cpp b/UI/BackgroundAudio.cpp index 742e0c4cc4..32cbefc0a0 100644 --- a/UI/BackgroundAudio.cpp +++ b/UI/BackgroundAudio.cpp @@ -1,6 +1,8 @@ #include #include +#include "ext/minimp3/minimp3_ex.h" + #include "Common/File/VFS/VFS.h" #include "Common/UI/Root.h" @@ -36,7 +38,7 @@ struct WavData { int raw_data_size = 0; u8 at3_extradata[16]; - void Read(RIFFReader &riff); + bool Read(RIFFReader &riff); ~WavData() { free(raw_data); @@ -49,7 +51,7 @@ struct WavData { } }; -void WavData::Read(RIFFReader &file_) { +bool WavData::Read(RIFFReader &file_) { // If we have no loop start info, we'll just loop the entire audio. raw_offset_loop_start = 0; raw_offset_loop_end = 0; @@ -72,7 +74,7 @@ void WavData::Read(RIFFReader &file_) { break; default: ERROR_LOG(SCEAUDIO, "Unexpected wave format %04x", format); - return; + return false; } num_channels = temp >> 16; @@ -97,7 +99,7 @@ void WavData::Read(RIFFReader &file_) { } else { ERROR_LOG(AUDIO, "Error - no format chunk in wav"); file_.Ascend(); - return; + return false; } if (file_.Descend('smpl')) { @@ -157,20 +159,21 @@ void WavData::Read(RIFFReader &file_) { ERROR_LOG(AUDIO, "Error - bad blockalign or channels"); free(raw_data); raw_data = nullptr; - return; + return false; } file_.Ascend(); } else { ERROR_LOG(AUDIO, "Error - no data chunk in wav"); file_.Ascend(); - return; + return false; } file_.Ascend(); } else { ERROR_LOG(AUDIO, "Could not descend into RIFF file."); - return; + return false; } sample_rate = samplesPerSec; + return true; } // Really simple looping in-memory AT3 player that also takes care of reading the file format. @@ -380,40 +383,60 @@ inline int16_t ConvertU8ToI16(uint8_t value) { } Sample *Sample::Load(const std::string &path) { - size_t bytes = 0; - uint8_t *data = g_VFS.ReadFile(path.c_str(), &bytes); - if (!data || bytes > 100000000) { + size_t data_size = 0; + uint8_t *data = g_VFS.ReadFile(path.c_str(), &data_size); + if (!data || data_size > 100000000) { WARN_LOG(AUDIO, "Failed to load sample '%s'", path.c_str()); return nullptr; } - RIFFReader reader(data, (int)bytes); - - WavData wave; - wave.Read(reader); - - delete[] data; - - if (!wave.IsSimpleWAV()) { - ERROR_LOG(AUDIO, "Wave format not supported for mixer playback. Must be 8-bit or 16-bit raw mono or stereo. '%s'", path.c_str()); - return nullptr; - } - - int16_t *samples = new int16_t[wave.num_channels * wave.numFrames]; - if (wave.raw_bytes_per_frame == wave.num_channels * 2) { - // 16-bit - memcpy(samples, wave.raw_data, wave.numFrames * wave.raw_bytes_per_frame); - } else if (wave.raw_bytes_per_frame == wave.num_channels) { - // 8-bit. Convert. - for (int i = 0; i < wave.num_channels * wave.numFrames; i++) { - samples[i] = ConvertU8ToI16(wave.raw_data[i]); + const char *mp3_magic = "ID3\03"; + const char *wav_magic = "RIFF"; + if (!memcmp(data, wav_magic, 4)) { + RIFFReader reader(data, (int)data_size); + WavData wave; + if (!wave.Read(reader)) { + delete[] data; + return nullptr; } + // A wav file. + delete[] data; + + if (!wave.IsSimpleWAV()) { + ERROR_LOG(AUDIO, "Wave format not supported for mixer playback. Must be 8-bit or 16-bit raw mono or stereo. '%s'", path.c_str()); + return nullptr; + } + + int16_t *samples = new int16_t[wave.num_channels * wave.numFrames]; + if (wave.raw_bytes_per_frame == wave.num_channels * 2) { + // 16-bit + memcpy(samples, wave.raw_data, wave.numFrames * wave.raw_bytes_per_frame); + } else if (wave.raw_bytes_per_frame == wave.num_channels) { + // 8-bit. Convert. + for (int i = 0; i < wave.num_channels * wave.numFrames; i++) { + samples[i] = ConvertU8ToI16(wave.raw_data[i]); + } + } + + // Protect against bad metadata. + int actualFrames = std::min(wave.numFrames, wave.raw_data_size / wave.raw_bytes_per_frame); + + return new Sample(samples, wave.num_channels, actualFrames, wave.sample_rate); } - // Protect against bad metadata. - int actualFrames = std::min(wave.numFrames, wave.raw_data_size / wave.raw_bytes_per_frame); - - return new Sample(samples, wave.num_channels, actualFrames, wave.sample_rate); + // Something else. + // Let's see if minimp3 can read it. + mp3dec_t mp3d; + mp3dec_init(&mp3d); + mp3dec_file_info_t mp3_info; + int samples = mp3dec_load_buf(&mp3d, data, data_size, &mp3_info, nullptr, nullptr); + // mp3_info contains the decoded data. + int16_t *sample_data = new int16_t[mp3_info.samples]; + memcpy(sample_data, mp3_info.buffer, mp3_info.samples * sizeof(int16_t)); + Sample *sample = new Sample(sample_data, mp3_info.channels, mp3_info.samples, mp3_info.hz); + free(mp3_info.buffer); + delete[] data; + return sample; } static inline int16_t Clamp16(int32_t sample) { diff --git a/UI/BackgroundAudio.h b/UI/BackgroundAudio.h index 3c869485dc..4f2952fd73 100644 --- a/UI/BackgroundAudio.h +++ b/UI/BackgroundAudio.h @@ -11,7 +11,7 @@ class AT3PlusReader; struct Sample { - // data must be new-ed. + // data must be new[]-ed. Sample(int16_t *data, int channels, int length, int rateInHz) : channels_(channels), data_(data), length_(length), rateInHz_(rateInHz) {} ~Sample() { delete[] data_; diff --git a/UWP/PPSSPP_UWPMain.cpp b/UWP/PPSSPP_UWPMain.cpp index ccd510d4a9..41fa63bf29 100644 --- a/UWP/PPSSPP_UWPMain.cpp +++ b/UWP/PPSSPP_UWPMain.cpp @@ -514,7 +514,7 @@ bool System_MakeRequest(SystemRequestType type, int requestId, const std::string supportedExtensions = { ".db" }; break; case BrowseFileType::SOUND_EFFECT: - supportedExtensions = { ".wav" }; + supportedExtensions = { ".wav", ".mp3" }; break; case BrowseFileType::ANY: // 'ChooseFile' will added '*' by default when there are no extensions assigned diff --git a/Windows/main.cpp b/Windows/main.cpp index 5e273b423e..87b99608d0 100644 --- a/Windows/main.cpp +++ b/Windows/main.cpp @@ -578,7 +578,7 @@ bool System_MakeRequest(SystemRequestType type, int requestId, const std::string filter = MakeFilter(L"Cheat db files (*.db)|*.db|All files (*.*)|*.*||"); break; case BrowseFileType::SOUND_EFFECT: - filter = MakeFilter(L"WAVE files (*.wav)|*.wav|All files (*.*)|*.*||"); + filter = MakeFilter(L"Sound effect files (*.wav *.mp3)|*.wav;*.mp3|All files (*.*)|*.*||"); break; case BrowseFileType::ANY: filter = MakeFilter(L"All files (*.*)|*.*||"); diff --git a/android/jni/Android.mk b/android/jni/Android.mk index 315e51f581..202a40dbcc 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -109,6 +109,9 @@ SPIRV_CROSS_FILES := \ NAETT_FILES := \ ${SRC}/ext/naett/naett.c +MINIMP3_FILES := \ + ${SRC}/ext/minimp3/minimp3.cpp + RCHEEVOS_FILES := \ ${SRC}/ext/rcheevos/src/rapi/rc_api_common.c \ ${SRC}/ext/rcheevos/src/rapi/rc_api_editor.c \ @@ -217,6 +220,7 @@ EXEC_AND_LIB_FILES := \ $(SPIRV_CROSS_FILES) \ $(RCHEEVOS_FILES) \ $(NAETT_FILES) \ + $(MINIMP3_FILES) \ $(EXT_FILES) \ $(NATIVE_FILES) \ $(SRC)/Common/Buffer.cpp \ diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt index fe6b714516..dbd8417791 100644 --- a/ext/CMakeLists.txt +++ b/ext/CMakeLists.txt @@ -28,6 +28,7 @@ set(SKIP_GLSLANG_INSTALL ON CACHE BOOL "" FORCE) set(ENABLE_GLSLANG_INSTALL OFF) add_subdirectory(glslang EXCLUDE_FROM_ALL) add_subdirectory(snappy) +add_subdirectory(minimp3) add_subdirectory(udis86) add_subdirectory(SPIRV-Cross-build) add_subdirectory(rcheevos-build) From a92dd9767c60ad6b2a2fff9b138780138e6c1b8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Tue, 9 Apr 2024 18:44:22 +0200 Subject: [PATCH 048/719] Fix translation strings --- UI/RetroAchievementScreens.cpp | 2 +- assets/lang/ar_AE.ini | 2 +- assets/lang/az_AZ.ini | 2 +- assets/lang/bg_BG.ini | 2 +- assets/lang/ca_ES.ini | 2 +- assets/lang/cz_CZ.ini | 2 +- assets/lang/da_DK.ini | 2 +- assets/lang/de_DE.ini | 2 +- assets/lang/dr_ID.ini | 2 +- assets/lang/en_US.ini | 2 +- assets/lang/es_ES.ini | 2 +- assets/lang/es_LA.ini | 2 +- assets/lang/fa_IR.ini | 2 +- assets/lang/fi_FI.ini | 2 +- assets/lang/fr_FR.ini | 2 +- assets/lang/gl_ES.ini | 2 +- assets/lang/gr_EL.ini | 2 +- assets/lang/he_IL.ini | 2 +- assets/lang/he_IL_invert.ini | 2 +- assets/lang/hr_HR.ini | 2 +- assets/lang/hu_HU.ini | 2 +- assets/lang/id_ID.ini | 2 +- assets/lang/it_IT.ini | 2 +- assets/lang/ja_JP.ini | 2 +- assets/lang/jv_ID.ini | 2 +- assets/lang/ko_KR.ini | 2 +- assets/lang/lo_LA.ini | 2 +- assets/lang/lt-LT.ini | 2 +- assets/lang/ms_MY.ini | 2 +- assets/lang/nl_NL.ini | 2 +- assets/lang/no_NO.ini | 2 +- assets/lang/pl_PL.ini | 2 +- assets/lang/pt_BR.ini | 2 +- assets/lang/pt_PT.ini | 2 +- assets/lang/ro_RO.ini | 2 +- assets/lang/ru_RU.ini | 2 +- assets/lang/sv_SE.ini | 2 +- assets/lang/tg_PH.ini | 6 +++--- assets/lang/th_TH.ini | 2 +- assets/lang/tr_TR.ini | 2 +- assets/lang/uk_UA.ini | 2 +- assets/lang/vi_VN.ini | 2 +- assets/lang/zh_CN.ini | 2 +- assets/lang/zh_TW.ini | 2 +- 44 files changed, 46 insertions(+), 46 deletions(-) diff --git a/UI/RetroAchievementScreens.cpp b/UI/RetroAchievementScreens.cpp index 2f4cabdc14..ac7162409e 100644 --- a/UI/RetroAchievementScreens.cpp +++ b/UI/RetroAchievementScreens.cpp @@ -46,7 +46,7 @@ AudioFileChooser::AudioFileChooser(RequesterToken token, std::string *value, std g_BackgroundAudio.SFX().UpdateSample(sound, sample); } else { auto au = GetI18NCategory(I18NCat::AUDIO); - g_OSD.Show(OSDType::MESSAGE_ERROR, au->T("Audio file format not supported. Must be WAV.")); + g_OSD.Show(OSDType::MESSAGE_ERROR, au->T("Audio file format not supported. Must be WAV or MP3.")); value->clear(); } return UI::EVENT_DONE; diff --git a/assets/lang/ar_AE.ini b/assets/lang/ar_AE.ini index 2d7ed44700..78cf07a1e9 100644 --- a/assets/lang/ar_AE.ini +++ b/assets/lang/ar_AE.ini @@ -69,7 +69,7 @@ Unsupported achievements = الانجازات الغير مدعومة Alternate speed volume = حجم السرعة البديل Audio backend = ‎(إعادة التشغيل مطلوبة) الخلفية الصوتية Audio Error = Audio Error -Audio file format not supported. Must be WAV. = Audio file format not supported. Must be WAV. +Audio file format not supported. Must be WAV or MP3. = Audio file format not supported. Must be WAV or MP3. AudioBufferingForBluetooth = ‎معادلة مصادقة البلوتوث (بطئ) Auto = Auto Device = Device diff --git a/assets/lang/az_AZ.ini b/assets/lang/az_AZ.ini index e4ecf6f161..21aa34ffa2 100644 --- a/assets/lang/az_AZ.ini +++ b/assets/lang/az_AZ.ini @@ -61,7 +61,7 @@ Unsupported achievements = Unsupported achievements Alternate speed volume = Alternate speed volume Audio backend = Audio backend (restart req.) Audio Error = Audio Error -Audio file format not supported. Must be WAV. = Audio file format not supported. Must be WAV. +Audio file format not supported. Must be WAV or MP3. = Audio file format not supported. Must be WAV or MP3. AudioBufferingForBluetooth = Bluetooth-friendly buffer (slower) Auto = Auto Device = Device diff --git a/assets/lang/bg_BG.ini b/assets/lang/bg_BG.ini index 914df34303..f42b31af3e 100644 --- a/assets/lang/bg_BG.ini +++ b/assets/lang/bg_BG.ini @@ -61,7 +61,7 @@ Unsupported achievements = Unsupported achievements Alternate speed volume = Alternate speed volume Audio backend = Audio backend (restart req.) Audio Error = Audio Error -Audio file format not supported. Must be WAV. = Audio file format not supported. Must be WAV. +Audio file format not supported. Must be WAV or MP3. = Audio file format not supported. Must be WAV or MP3. AudioBufferingForBluetooth = Bluetooth-friendly buffer (slower) Auto = Auto Device = Device diff --git a/assets/lang/ca_ES.ini b/assets/lang/ca_ES.ini index 1fa83baf27..b2fd8c7b90 100644 --- a/assets/lang/ca_ES.ini +++ b/assets/lang/ca_ES.ini @@ -61,7 +61,7 @@ Unsupported achievements = Unsupported achievements Alternate speed volume = Alternar velocitat del soroll Audio backend = Motor d'àudio (requereix reiniciar) Audio Error = Error d'àudio -Audio file format not supported. Must be WAV. = Audio file format not supported. Must be WAV. +Audio file format not supported. Must be WAV or MP3. = Audio file format not supported. Must be WAV or MP3. AudioBufferingForBluetooth = Memòria intermèdia en Bluetooth (lent) Auto = Automàtic Device = Dispositiu diff --git a/assets/lang/cz_CZ.ini b/assets/lang/cz_CZ.ini index 7cd0790da1..aef9f74251 100644 --- a/assets/lang/cz_CZ.ini +++ b/assets/lang/cz_CZ.ini @@ -61,7 +61,7 @@ Unsupported achievements = Unsupported achievements Alternate speed volume = Alternate speed volume Audio backend = Zvukové jádro (vyžaduje restart) Audio Error = Audio Error -Audio file format not supported. Must be WAV. = Audio file format not supported. Must be WAV. +Audio file format not supported. Must be WAV or MP3. = Audio file format not supported. Must be WAV or MP3. AudioBufferingForBluetooth = Bluetooth-friendly buffer (slower) Auto = Auto Device = Device diff --git a/assets/lang/da_DK.ini b/assets/lang/da_DK.ini index 37d51b8609..059c42bb4d 100644 --- a/assets/lang/da_DK.ini +++ b/assets/lang/da_DK.ini @@ -61,7 +61,7 @@ Unsupported achievements = Unsupported achievements Alternate speed volume = Alternate speed volume Audio backend = Lyd backend Audio Error = Audio Error -Audio file format not supported. Must be WAV. = Audio file format not supported. Must be WAV. +Audio file format not supported. Must be WAV or MP3. = Audio file format not supported. Must be WAV or MP3. AudioBufferingForBluetooth = Bluetooth-venlig buffer (langsommere) Auto = Automatisk Device = Device diff --git a/assets/lang/de_DE.ini b/assets/lang/de_DE.ini index b9349fbed5..f9401b39d9 100644 --- a/assets/lang/de_DE.ini +++ b/assets/lang/de_DE.ini @@ -61,7 +61,7 @@ Unsupported achievements = Unsupported achievements Alternate speed volume = Lautstärke für wechselnde Geschwindigkeit/Turbo Audio backend = Ton-Backend (Neustart erforderlich) Audio Error = Audio Fehler -Audio file format not supported. Must be WAV. = Audio file format not supported. Must be WAV. +Audio file format not supported. Must be WAV or MP3. = Audio file format not supported. Must be WAV or MP3. AudioBufferingForBluetooth = Bluetooth-freundliche Pufferung (langsamer) Auto = Automatisch Device = Gerät diff --git a/assets/lang/dr_ID.ini b/assets/lang/dr_ID.ini index 10cdbb919a..cdd0ecf352 100644 --- a/assets/lang/dr_ID.ini +++ b/assets/lang/dr_ID.ini @@ -61,7 +61,7 @@ Unsupported achievements = Unsupported achievements Alternate speed volume = Alternate speed volume Audio backend = Audio backend (restart req.) Audio Error = Audio Error -Audio file format not supported. Must be WAV. = Audio file format not supported. Must be WAV. +Audio file format not supported. Must be WAV or MP3. = Audio file format not supported. Must be WAV or MP3. AudioBufferingForBluetooth = Bluetooth-friendly buffer (slower) Auto = Auto Device = Device diff --git a/assets/lang/en_US.ini b/assets/lang/en_US.ini index 8d1d501402..903fbd68af 100644 --- a/assets/lang/en_US.ini +++ b/assets/lang/en_US.ini @@ -84,8 +84,8 @@ Unofficial achievements = Unofficial achievements [Audio] Alternate speed volume = Alternate speed volume Audio backend = Audio backend (restart req.) -Audio file format not supported. Must be WAV. = Audio file format not supported. Must be WAV. Audio Error = Audio Error +Audio file format not supported. Must be WAV or MP3. = Audio file format not supported. Must be WAV or MP3. AudioBufferingForBluetooth = Bluetooth-friendly buffer (slower) Auto = Auto Device = Device diff --git a/assets/lang/es_ES.ini b/assets/lang/es_ES.ini index 133ed6f33a..6f352cf716 100644 --- a/assets/lang/es_ES.ini +++ b/assets/lang/es_ES.ini @@ -61,7 +61,7 @@ Unsupported achievements = Unsupported achievements Alternate speed volume = Alternar velocidad de sonido Audio backend = Motor de audio (requiere reiniciar) Audio Error = Error de audio -Audio file format not supported. Must be WAV. = Audio file format not supported. Must be WAV. +Audio file format not supported. Must be WAV or MP3. = Audio file format not supported. Must be WAV or MP3. AudioBufferingForBluetooth = Búfer compatible con bluetooth (lento) Auto = Automático Device = Dispositivo diff --git a/assets/lang/es_LA.ini b/assets/lang/es_LA.ini index 9aea80aa77..e4d301a4af 100644 --- a/assets/lang/es_LA.ini +++ b/assets/lang/es_LA.ini @@ -61,7 +61,7 @@ Unsupported achievements = Unsupported achievements Alternate speed volume = Alternar velocidad de volumen Audio backend = Motor de audio (req. reiniciar) Audio Error = Audio Error -Audio file format not supported. Must be WAV. = Audio file format not supported. Must be WAV. +Audio file format not supported. Must be WAV or MP3. = Audio file format not supported. Must be WAV or MP3. AudioBufferingForBluetooth = Búfer amigable con Bluetooth (enlentece) Auto = Automático Device = Dispositivo diff --git a/assets/lang/fa_IR.ini b/assets/lang/fa_IR.ini index 6492fdca1c..f327ef5d44 100644 --- a/assets/lang/fa_IR.ini +++ b/assets/lang/fa_IR.ini @@ -61,7 +61,7 @@ Unsupported achievements = Unsupported achievements Alternate speed volume = حجم سرعت متناوب Audio backend = ‎صدا (نیاز به ریستارت) API Audio Error = خطای صدا -Audio file format not supported. Must be WAV. = Audio file format not supported. Must be WAV. +Audio file format not supported. Must be WAV or MP3. = Audio file format not supported. Must be WAV or MP3. AudioBufferingForBluetooth = ‎بافر مناسب هندزفری بلوتوث (کند تر) Auto = ‎اتوماتیک Device = سیستم diff --git a/assets/lang/fi_FI.ini b/assets/lang/fi_FI.ini index 9b6871daf4..8cb8d7d0c1 100644 --- a/assets/lang/fi_FI.ini +++ b/assets/lang/fi_FI.ini @@ -61,7 +61,7 @@ Unsupported achievements = Unsupported achievements Alternate speed volume = Vaihtoehtoisen nopeuden äänenvoimakkuus Audio backend = Äänen taustajärjestelmä (uudelleenkäynnistä) Audio Error = Äänivirhe -Audio file format not supported. Must be WAV. = Audio file format not supported. Must be WAV. +Audio file format not supported. Must be WAV or MP3. = Audio file format not supported. Must be WAV or MP3. AudioBufferingForBluetooth = Bluetooth-ystävällinen puskuri (hitaampi) Auto = Automaattinen Device = Laite diff --git a/assets/lang/fr_FR.ini b/assets/lang/fr_FR.ini index ace8ccda22..7951aaec52 100644 --- a/assets/lang/fr_FR.ini +++ b/assets/lang/fr_FR.ini @@ -61,7 +61,7 @@ Unsupported achievements = Unsupported achievements Alternate speed volume = Volume en vitesse alternative Audio backend = Back-end du son (redémarrage requis) Audio Error = Audio Error -Audio file format not supported. Must be WAV. = Audio file format not supported. Must be WAV. +Audio file format not supported. Must be WAV or MP3. = Audio file format not supported. Must be WAV or MP3. AudioBufferingForBluetooth = Mémoire tampon adaptée au Bluetooth (+ lent) Auto = Automatique Device = Périphérique de sortie diff --git a/assets/lang/gl_ES.ini b/assets/lang/gl_ES.ini index ffee7a0fec..0358c3caac 100644 --- a/assets/lang/gl_ES.ini +++ b/assets/lang/gl_ES.ini @@ -61,7 +61,7 @@ Unsupported achievements = Unsupported achievements Alternate speed volume = Alternate speed volume Audio backend = Motor de audio (require reiniciar) Audio Error = Audio Error -Audio file format not supported. Must be WAV. = Audio file format not supported. Must be WAV. +Audio file format not supported. Must be WAV or MP3. = Audio file format not supported. Must be WAV or MP3. AudioBufferingForBluetooth = Bluetooth-friendly buffer (slower) Auto = Automático Device = Device diff --git a/assets/lang/gr_EL.ini b/assets/lang/gr_EL.ini index e388809975..8c9affd003 100644 --- a/assets/lang/gr_EL.ini +++ b/assets/lang/gr_EL.ini @@ -61,7 +61,7 @@ Unsupported achievements = Unsupported achievements Alternate speed volume = Alternate speed volume Audio backend = Backend ήχου (Απ. Επανεκκίνηση) Audio Error = Audio Error -Audio file format not supported. Must be WAV. = Audio file format not supported. Must be WAV. +Audio file format not supported. Must be WAV or MP3. = Audio file format not supported. Must be WAV or MP3. AudioBufferingForBluetooth = Buffer φιλικό για Bluetooth (αργό) Auto = Αυτόματο Device = Συσκευή diff --git a/assets/lang/he_IL.ini b/assets/lang/he_IL.ini index 2335b3b7a2..3232703149 100644 --- a/assets/lang/he_IL.ini +++ b/assets/lang/he_IL.ini @@ -61,7 +61,7 @@ Unsupported achievements = Unsupported achievements Alternate speed volume = Alternate speed volume Audio backend = Audio backend (restart req.) Audio Error = Audio Error -Audio file format not supported. Must be WAV. = Audio file format not supported. Must be WAV. +Audio file format not supported. Must be WAV or MP3. = Audio file format not supported. Must be WAV or MP3. AudioBufferingForBluetooth = Bluetooth-friendly buffer (slower) Auto = Auto Device = Device diff --git a/assets/lang/he_IL_invert.ini b/assets/lang/he_IL_invert.ini index dd15a264f3..04417c491e 100644 --- a/assets/lang/he_IL_invert.ini +++ b/assets/lang/he_IL_invert.ini @@ -61,7 +61,7 @@ Unsupported achievements = Unsupported achievements Alternate speed volume = Alternate speed volume Audio backend = Audio backend (restart req.) Audio Error = Audio Error -Audio file format not supported. Must be WAV. = Audio file format not supported. Must be WAV. +Audio file format not supported. Must be WAV or MP3. = Audio file format not supported. Must be WAV or MP3. AudioBufferingForBluetooth = Bluetooth-friendly buffer (slower) Auto = Auto Device = Device diff --git a/assets/lang/hr_HR.ini b/assets/lang/hr_HR.ini index 704196ffb7..6111da4771 100644 --- a/assets/lang/hr_HR.ini +++ b/assets/lang/hr_HR.ini @@ -61,7 +61,7 @@ Unsupported achievements = Unsupported achievements Alternate speed volume = Naizmjenična brzina zvuka Audio backend = Poslužitelj zvuka (ponovo pokrenuti) Audio Error = Audio Error -Audio file format not supported. Must be WAV. = Audio file format not supported. Must be WAV. +Audio file format not supported. Must be WAV or MP3. = Audio file format not supported. Must be WAV or MP3. AudioBufferingForBluetooth = Bluetooth-prijateljski poliranje (sporije) Auto = Automatski Device = Uređaj diff --git a/assets/lang/hu_HU.ini b/assets/lang/hu_HU.ini index 3e78a74914..cd0c0ce176 100644 --- a/assets/lang/hu_HU.ini +++ b/assets/lang/hu_HU.ini @@ -61,7 +61,7 @@ Unsupported achievements = Unsupported achievements Alternate speed volume = Alternatív sebesség hangereje Audio backend = Audió backend (újraindítás szükséges) Audio Error = Audio Error -Audio file format not supported. Must be WAV. = Audio file format not supported. Must be WAV. +Audio file format not supported. Must be WAV or MP3. = Audio file format not supported. Must be WAV or MP3. AudioBufferingForBluetooth = Bluetooth-barát buffer (lassabb) Auto = Auto Device = Eszköz diff --git a/assets/lang/id_ID.ini b/assets/lang/id_ID.ini index 4de64678f7..2b361e6e72 100644 --- a/assets/lang/id_ID.ini +++ b/assets/lang/id_ID.ini @@ -61,7 +61,7 @@ Unsupported achievements = Unsupported achievements Alternate speed volume = Kecepatan volume alternatif Audio backend = Penyangga audio (perlu mulai ulang) Audio Error = Kesalahan audio -Audio file format not supported. Must be WAV. = Audio file format not supported. Must be WAV. +Audio file format not supported. Must be WAV or MP3. = Audio file format not supported. Must be WAV or MP3. AudioBufferingForBluetooth = Penyangga bluetooth (lambat) Auto = Otomatis Device = Perangkat diff --git a/assets/lang/it_IT.ini b/assets/lang/it_IT.ini index 6f49e7b32f..5560778449 100644 --- a/assets/lang/it_IT.ini +++ b/assets/lang/it_IT.ini @@ -61,7 +61,7 @@ Unofficial achievements = Obiettivi non ufficiali Alternate speed volume = Volume a velocità alternativa Audio backend = Renderer Audio (riavvio necessario) Audio Error = Errore Audio -Audio file format not supported. Must be WAV. = Formato audio non supportato. Deve essere WAV. +Audio file format not supported. Must be WAV or MP3. = Formato audio non supportato. Deve essere WAV o MP3. AudioBufferingForBluetooth = Buffer compatibile con Bluetooth (più lento) Auto = Automatico Device = Dispositivo diff --git a/assets/lang/ja_JP.ini b/assets/lang/ja_JP.ini index 8841fc1dac..ee2947ec0d 100644 --- a/assets/lang/ja_JP.ini +++ b/assets/lang/ja_JP.ini @@ -61,7 +61,7 @@ Unsupported achievements = サポートしていない実績 Alternate speed volume = カスタム速度時のボリューム Audio backend = オーディオのバックエンド (再起動が必要) Audio Error = オーディオエラー -Audio file format not supported. Must be WAV. = オーディオファイル形式に対応していません。WAVである必要があります。 +Audio file format not supported. Must be WAV or MP3. = オーディオファイル形式に対応していません。WAV/MP3である必要があります。 AudioBufferingForBluetooth = Bluetoothに適したバッファ (低遅延) Auto = 自動 Device = デバイス diff --git a/assets/lang/jv_ID.ini b/assets/lang/jv_ID.ini index 929c165828..adbdbe3b1a 100644 --- a/assets/lang/jv_ID.ini +++ b/assets/lang/jv_ID.ini @@ -61,7 +61,7 @@ Unsupported achievements = Unsupported achievements Alternate speed volume = Alternate speed volume Audio backend = Suoro backend (Wiwiti maneh, req) Audio Error = Audio Error -Audio file format not supported. Must be WAV. = Audio file format not supported. Must be WAV. +Audio file format not supported. Must be WAV or MP3. = Audio file format not supported. Must be WAV or MP3. AudioBufferingForBluetooth = Bluetooth-friendly buffer (slower) Auto = Otomatis Device = Device diff --git a/assets/lang/ko_KR.ini b/assets/lang/ko_KR.ini index 62fc4d246c..c5ee5164f9 100644 --- a/assets/lang/ko_KR.ini +++ b/assets/lang/ko_KR.ini @@ -60,8 +60,8 @@ Unofficial achievements = 비공식 성과 [Audio] Alternate speed volume = 대체 속도 볼륨 Audio backend = 오디오 백엔드 (재시작 요구) -Audio file format not supported. Must be WAV. = 오디오 파일 형식은 지원되지 않습니다. WAV여야 합니다. Audio Error = 오디오 오류 +Audio file format not supported. Must be WAV or MP3. = 오디오 파일 형식은 지원되지 않습니다. WAV/MP3여야 합니다. AudioBufferingForBluetooth = 블루투스 친화적 버퍼 (느림) Auto = 자동 Device = 장치 diff --git a/assets/lang/lo_LA.ini b/assets/lang/lo_LA.ini index a8213bae12..ebd43a907a 100644 --- a/assets/lang/lo_LA.ini +++ b/assets/lang/lo_LA.ini @@ -61,7 +61,7 @@ Unsupported achievements = Unsupported achievements Alternate speed volume = Alternate speed volume Audio backend = ຮູບແບບສຽງທີ່ຮອງຮັບ (ຕ້ອງຣີສຕາຣ໌ດ) Audio Error = Audio Error -Audio file format not supported. Must be WAV. = Audio file format not supported. Must be WAV. +Audio file format not supported. Must be WAV or MP3. = Audio file format not supported. Must be WAV or MP3. AudioBufferingForBluetooth = Bluetooth-friendly buffer (slower) Auto = ອັດຕະໂນມັດ Device = Device diff --git a/assets/lang/lt-LT.ini b/assets/lang/lt-LT.ini index 0e496ec97d..4838de1e8d 100644 --- a/assets/lang/lt-LT.ini +++ b/assets/lang/lt-LT.ini @@ -61,7 +61,7 @@ Unsupported achievements = Unsupported achievements Alternate speed volume = Alternate speed volume Audio backend = Audio backend (restart req.) Audio Error = Audio Error -Audio file format not supported. Must be WAV. = Audio file format not supported. Must be WAV. +Audio file format not supported. Must be WAV or MP3. = Audio file format not supported. Must be WAV or MP3. AudioBufferingForBluetooth = Bluetooth-friendly buffer (slower) Auto = Auto Device = Device diff --git a/assets/lang/ms_MY.ini b/assets/lang/ms_MY.ini index c803e82048..f705493227 100644 --- a/assets/lang/ms_MY.ini +++ b/assets/lang/ms_MY.ini @@ -61,7 +61,7 @@ Unsupported achievements = Unsupported achievements Alternate speed volume = Alternate speed volume Audio backend = Enjin suara (PPSSPP perlu dibuka semula) Audio Error = Audio Error -Audio file format not supported. Must be WAV. = Audio file format not supported. Must be WAV. +Audio file format not supported. Must be WAV or MP3. = Audio file format not supported. Must be WAV or MP3. AudioBufferingForBluetooth = Bluetooth-friendly buffer (slower) Auto = Auto Device = Device diff --git a/assets/lang/nl_NL.ini b/assets/lang/nl_NL.ini index 828ff6cde6..c5f6bb73af 100644 --- a/assets/lang/nl_NL.ini +++ b/assets/lang/nl_NL.ini @@ -61,7 +61,7 @@ Unsupported achievements = Unsupported achievements Alternate speed volume = Alternate speed volume Audio backend = Audiobackend (vereist herstart) Audio Error = Audio Error -Audio file format not supported. Must be WAV. = Audio file format not supported. Must be WAV. +Audio file format not supported. Must be WAV or MP3. = Audio file format not supported. Must be WAV or MP3. AudioBufferingForBluetooth = Bluetooth-vriendelijke buffer (trager) Auto = Automatisch Device = Device diff --git a/assets/lang/no_NO.ini b/assets/lang/no_NO.ini index 2d8fb72303..78aa6109c6 100644 --- a/assets/lang/no_NO.ini +++ b/assets/lang/no_NO.ini @@ -61,7 +61,7 @@ Unsupported achievements = Unsupported achievements Alternate speed volume = Alternate speed volume Audio backend = Audio backend (restart req.) Audio Error = Audio Error -Audio file format not supported. Must be WAV. = Audio file format not supported. Must be WAV. +Audio file format not supported. Must be WAV or MP3. = Audio file format not supported. Must be WAV or MP3. AudioBufferingForBluetooth = Bluetooth-friendly buffer (slower) Auto = Auto Device = Device diff --git a/assets/lang/pl_PL.ini b/assets/lang/pl_PL.ini index a017d995a2..81d91c7505 100644 --- a/assets/lang/pl_PL.ini +++ b/assets/lang/pl_PL.ini @@ -61,7 +61,7 @@ Unsupported achievements = Niewspierane osiągnięcia Alternate speed volume = Alternatywna prędkość emulacji Audio backend = Sterownik dźwięku (wymagany restart) Audio Error = Błąd Audio -Audio file format not supported. Must be WAV. = Audio file format not supported. Must be WAV. +Audio file format not supported. Must be WAV or MP3. = Audio file format not supported. Must be WAV or MP3. AudioBufferingForBluetooth = Bufory dźwięku dost. do Bluetooth (wolniejsze) Auto = Automatyczny Device = Urządzenie diff --git a/assets/lang/pt_BR.ini b/assets/lang/pt_BR.ini index a5e2328105..582398a1c8 100644 --- a/assets/lang/pt_BR.ini +++ b/assets/lang/pt_BR.ini @@ -84,8 +84,8 @@ Unofficial achievements = Conquistas não oficiais [Audio] Alternate speed volume = Velocidade alternativa do volume Audio backend = Backed do áudio (requer reiniciar) -Audio file format not supported. Must be WAV. = Formato do arquivo de áudio não suportado. Deve ser WAV. Audio Error = Erro do Áudio +Audio file format not supported. Must be WAV or MP3. = Formato do arquivo de áudio não suportado. Deve ser WAV ou MP3. AudioBufferingForBluetooth = Buffer amigável do Bluetooth (mais lento) Auto = Automático Device = Dispositivo diff --git a/assets/lang/pt_PT.ini b/assets/lang/pt_PT.ini index 0d1d7e85b9..db10255c38 100644 --- a/assets/lang/pt_PT.ini +++ b/assets/lang/pt_PT.ini @@ -85,7 +85,7 @@ Unsupported achievements = Conquistas incompatíveis Alternate speed volume = Velocidade alternativa do volume Audio backend = API de áudio (requer reiniciar) Audio Error = Erro no áudio -Audio file format not supported. Must be WAV. = Formato de ficheiro áudio não compatível. Use WAV. +Audio file format not supported. Must be WAV or MP3. = Formato de ficheiro áudio não compatível. Deve ser WAV ou MP3. AudioBufferingForBluetooth = Buffer amigável de Bluetooth (mais lento) Auto = Automático Device = Dispositivo diff --git a/assets/lang/ro_RO.ini b/assets/lang/ro_RO.ini index bdf4b02888..5f1c2568ab 100644 --- a/assets/lang/ro_RO.ini +++ b/assets/lang/ro_RO.ini @@ -61,7 +61,7 @@ Unsupported achievements = Unsupported achievements Alternate speed volume = Alternate speed volume Audio backend = Format intern audio (necesită restartare) Audio Error = Audio Error -Audio file format not supported. Must be WAV. = Audio file format not supported. Must be WAV. +Audio file format not supported. Must be WAV or MP3. = Audio file format not supported. Must be WAV or MP3. AudioBufferingForBluetooth = Bluetooth-friendly buffer (mai lent) Auto = Automat Device = Device diff --git a/assets/lang/ru_RU.ini b/assets/lang/ru_RU.ini index 934a66b91b..369fe76bd8 100644 --- a/assets/lang/ru_RU.ini +++ b/assets/lang/ru_RU.ini @@ -61,7 +61,7 @@ Unsupported achievements = Неподдерживаемые достижения Alternate speed volume = Громкость при другой скорости Audio backend = Аудио бэкенд (нужен перезапуск) Audio Error = Ошибка звука -Audio file format not supported. Must be WAV. = Формат аудиофайла не поддерживается. Он должен быть WAV. +Audio file format not supported. Must be WAV or MP3. = Формат аудиофайла не поддерживается. Он должен быть WAV/MP3. AudioBufferingForBluetooth = Буфер, подходящий для Bluetooth (медленнее) Auto = Авто Device = Устройство diff --git a/assets/lang/sv_SE.ini b/assets/lang/sv_SE.ini index 3adc877fef..e2fc392ce4 100644 --- a/assets/lang/sv_SE.ini +++ b/assets/lang/sv_SE.ini @@ -61,7 +61,7 @@ Unsupported achievements = Icke-stödda achievements Alternate speed volume = Volym vid alternativ hastighet Audio backend = Uppspelningsteknik (ändring kräver omstart!) Audio Error = Ljudfel -Audio file format not supported. Must be WAV. = Audio file format not supported. Must be WAV. +Audio file format not supported. Must be WAV or MP3. = Ljudformat stöds inte. Använd WAV eller MP3. AudioBufferingForBluetooth = Bluetooth-friendly buffer (slower) Auto = Auto Device = Enhet diff --git a/assets/lang/tg_PH.ini b/assets/lang/tg_PH.ini index 2f0acc8672..2ce0c383e3 100644 --- a/assets/lang/tg_PH.ini +++ b/assets/lang/tg_PH.ini @@ -61,7 +61,7 @@ Unsupported achievements = Mga hindi sinusuportahang tagumpay Alternate speed volume = Kahaliling bilis ng tunog Audio backend = Tunog ng instrumento (kailangan pang ulitin) Audio Error = Tunog ng pagkakamali -Audio file format not supported. Must be WAV. = Hindi suportado ang format ng file ng audio. Dapat ay WAV. +Audio file format not supported. Must be WAV or MP3. = Hindi suportado ang format ng file ng audio. Dapat ay WAV/MP3. AudioBufferingForBluetooth = Buffering ng Audio Para sa Bluetooth (mabagal) Auto = Awto Device = Kagamitan @@ -741,7 +741,7 @@ How to get homebrew & demos = Paano makakukuha ng Homebrew at Demos Load = Ikarga Loading... = Nagkakarga... PinPath = I-Pin -PPSSPP can't load games or save right now = Ang PPSSPP ay hindi makapag-bukas/karga ng laro o save file +PPSSPP can't load games or save right now = Ang PPSSPP ay hindi makapag-bukas/karga ng laro o save file Recent = Nakaraang nilaro SavesAreTemporary = Ang PPSSPP ay sinesave sa pansamantalang storage SavesAreTemporaryGuidance = I-Extract ang PPSSPP kahit saan para itabi ng permanente @@ -1223,7 +1223,7 @@ OpenGL ES 3.0 Extensions = Mga Ekstensyon ni OpenGL ES 3.0 OpenGL Extensions = Mga Ekstensyon ni OpenGL Optimal frames per buffer = Optimal frames per buffer Optimal sample rate = Optimal sample rate -OS Information = Impormasyon ng iyong OS +OS Information = Impormasyon ng iyong OS Pixel resolution = Pixel resolution PPSSPP build = PPSSPP build Present modes = Kasalukuyan na 'modes' diff --git a/assets/lang/th_TH.ini b/assets/lang/th_TH.ini index a4d686d86f..a93a6a7597 100644 --- a/assets/lang/th_TH.ini +++ b/assets/lang/th_TH.ini @@ -61,7 +61,7 @@ Unsupported achievements = เป้าหมายความสำเร็ Alternate speed volume = ระดับเสียงในโหมดเร่งความเร็ว Audio backend = รูปแบบเสียงที่สนับสนุน (จำเป็นต้องรีสตาร์ท) Audio Error = ระบบเสียงเกิดข้อผิดพลาด -Audio file format not supported. Must be WAV. = ไม่รองรับรูปแบบไฟล์เสียงประเภทนี้ จะใช้ได้แค่เฉพาะรูปแบบ WAV +Audio file format not supported. Must be WAV or MP3. = ไม่รองรับรูปแบบไฟล์เสียงประเภทนี้ จะใช้ได้แค่เฉพาะรูปแบบ WAV/MP3 AudioBufferingForBluetooth = บลูทูธ-เฟรนด์ลี่ บัฟเฟอร์ (ช้ากว่า) Auto = อัตโนมัติ Device = อุปกรณ์ diff --git a/assets/lang/tr_TR.ini b/assets/lang/tr_TR.ini index 346c7f6de4..9036f9201d 100644 --- a/assets/lang/tr_TR.ini +++ b/assets/lang/tr_TR.ini @@ -61,7 +61,7 @@ Unsupported achievements = Unsupported achievements Alternate speed volume = Alternatif hız hacmi Audio backend = Ses alttabanı (Yeniden başlatma gerekir) Audio Error = Ses Hatası -Audio file format not supported. Must be WAV. = Audio file format not supported. Must be WAV. +Audio file format not supported. Must be WAV or MP3. = Audio file format not supported. Must be WAV or MP3. AudioBufferingForBluetooth = Bluetooth uyumlu arabellek (daha yavaş) Auto = Otomatik Device = Cihaz diff --git a/assets/lang/uk_UA.ini b/assets/lang/uk_UA.ini index 2092010c12..48eb312a6a 100644 --- a/assets/lang/uk_UA.ini +++ b/assets/lang/uk_UA.ini @@ -61,7 +61,7 @@ Unsupported achievements = Unsupported achievements Alternate speed volume = Гучність при альтернативній швидкості Audio backend = Бекенд аудіо (потрібне перезавантаження) Audio Error = Audio Error -Audio file format not supported. Must be WAV. = Audio file format not supported. Must be WAV. +Audio file format not supported. Must be WAV or MP3. = Audio file format not supported. Must be WAV or MP3. AudioBufferingForBluetooth = Буфер, який підходить для Bluetooth (повільніше) Auto = Авто Device = Пристрій diff --git a/assets/lang/vi_VN.ini b/assets/lang/vi_VN.ini index 38cb1009a2..e59fb0b48f 100644 --- a/assets/lang/vi_VN.ini +++ b/assets/lang/vi_VN.ini @@ -61,7 +61,7 @@ Unsupported achievements = Unsupported achievements Alternate speed volume = Alternate speed volume Audio backend = Âm thanh backend (hãy khởi động lại.) Audio Error = Audio Error -Audio file format not supported. Must be WAV. = Audio file format not supported. Must be WAV. +Audio file format not supported. Must be WAV or MP3. = Audio file format not supported. Must be WAV or MP3. AudioBufferingForBluetooth = Bluetooth-friendly buffer (chậm) Auto = Tự động Device = Device diff --git a/assets/lang/zh_CN.ini b/assets/lang/zh_CN.ini index 065566b891..107b9ee809 100644 --- a/assets/lang/zh_CN.ini +++ b/assets/lang/zh_CN.ini @@ -61,7 +61,7 @@ Unsupported achievements = 不支持的成绩 Alternate speed volume = 备选速度时的音量 Audio backend = 音频引擎 Audio Error = 音频错误 -Audio file format not supported. Must be WAV. = 音频文件格式不支持，必须是WAV。 +Audio file format not supported. Must be WAV or MP3. = 音频文件格式不支持，必须是WAV或MP3。 AudioBufferingForBluetooth = 适合蓝牙缓冲区 (更慢) Auto = 自动 Device = 设备 diff --git a/assets/lang/zh_TW.ini b/assets/lang/zh_TW.ini index 6796cac9da..cb042ce3ae 100644 --- a/assets/lang/zh_TW.ini +++ b/assets/lang/zh_TW.ini @@ -61,7 +61,7 @@ Unsupported achievements = 不支援的成就 Alternate speed volume = 替代速度音量 Audio backend = 音訊後端 (需要重新啟動) Audio Error = 音訊錯誤 -Audio file format not supported. Must be WAV. = 音訊檔案格式不支援，必須為 WAV。 +Audio file format not supported. Must be WAV or MP3. = 音訊檔案格式不支援，必須是 WAV 或 MP3。 AudioBufferingForBluetooth = 藍牙友好緩衝區 (更慢) Auto = 自動 Device = 裝置 From ea1743a3518349f3b5195d3d7040c893664ab0c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Tue, 9 Apr 2024 19:29:34 +0200 Subject: [PATCH 049/719] Allow picking mp3 files on Android too --- android/src/org/ppsspp/ppsspp/NativeActivity.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/android/src/org/ppsspp/ppsspp/NativeActivity.java b/android/src/org/ppsspp/ppsspp/NativeActivity.java index 9f68f904d1..ecedbf2c3e 100644 --- a/android/src/org/ppsspp/ppsspp/NativeActivity.java +++ b/android/src/org/ppsspp/ppsspp/NativeActivity.java @@ -1422,7 +1422,10 @@ public abstract class NativeActivity extends Activity { Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT); intent.addCategory(Intent.CATEGORY_OPENABLE); if (command.equals("browse_file_audio")) { - intent.setType("audio/x-wav"); + // Trickery for multiple mime types. + String [] mimeTypes = {"audio/x-wav", "audio/x-mpeg3", "audio/mpeg"}; + intent.setType("*/*"); + intent.putExtra(Intent.EXTRA_MIME_TYPES, mimeTypes); } else if (command.equals("browse_file_zip")) { intent.setType("application/zip"); } else { From e19e9b27936f72b8a21483b4b89cce79c12060c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Tue, 9 Apr 2024 23:46:16 +0200 Subject: [PATCH 050/719] Delete pointless accessors, update some comments --- Core/HLE/sceMp3.cpp | 73 ++++++++++++++++++++++++++++++++++------ Core/HLE/sceMp4.cpp | 4 +-- Core/HW/SimpleAudioDec.h | 7 ---- 3 files changed, 64 insertions(+), 20 deletions(-) diff --git a/Core/HLE/sceMp3.cpp b/Core/HLE/sceMp3.cpp index aa070b4ff8..ef5ecbffd9 100644 --- a/Core/HLE/sceMp3.cpp +++ b/Core/HLE/sceMp3.cpp @@ -15,6 +15,57 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. +// Games known to support custom music and almost certainly use sceMp3: +// +// * ATV Offroad Fury: Blazin' Trails +// * Beats (/PSP/MUSIC) +// * Crazy Taxi : Fare Wars (/MUSIC) +// * Dead or Alive Paradise +// * Gran Turismo - You must first clear all driving challenges up to C to unlock this feature, then it will be available through the options menu. +// * Grand Theft Auto : Liberty City Stories +// * Grand Theft Auto : Vice City Stories +// * Heroes' VS (#5866 ?) +// * MLB 08 : The Show +// * MotorStorm : Artic Edge +// * NBA Live 09 +// * Need for Speed Carbon +// * Need for Speed Pro Street +// * Pro Evolution Soccer 2014 +// * SD Gundam G Generation Overworld +// * TOCA Race Driver 2 +// * Untold Legends II +// * Wipeout Pulse (/MUSIC/WIPEOUT) +// +// Games known to use LowLevelDecode: +// +// * Gundam G (custom BGM) +// * Heroes' VS (custom BGM) +// +// Games that use sceMp3 internally +// +// * Kirameki School Life SP +// * Breakquest (mini) +// * Orbit (mini) +// * SWAT Target Liberty ULES00927 +// * Geometry Wars (homebrew) +// * Hanayaka Nari Wa ga Ichizoku +// * Velocity (mini) +// * N+ (mini) (#9379) +// * Mighty Flip Champs DX (mini) +// * EDGE (mini) +// * Stellar Attack (mini) +// * Hungry Giraffe (mini) +// * OMG - Z (mini) +// ...probably lots more minis... +// +// BUGS +// +// Custom music plays but starts stuttering: +// * Beats +// +// Custom music just repeats a small section: +// * Crazy Taxi + #include #include @@ -44,9 +95,9 @@ static const int AU_BUF_MIN_SIZE = 8192; static const int PCM_BUF_MIN_SIZE = 9216; static const size_t MP3_MAX_HANDLES = 2; -struct Mp3Context { +// This one is only used for save state upgrading. +struct Mp3ContextOld { public: - int mp3StreamStart; int mp3StreamEnd; u32 mp3Buf; @@ -121,7 +172,7 @@ void __Mp3DoState(PointerWrap &p) { if (s >= 2) { Do(p, mp3Map); } else { - std::map mp3Map_old; + std::map mp3Map_old; Do(p, mp3Map_old); // read old map for (auto it = mp3Map_old.begin(), end = mp3Map_old.end(); it != end; ++it) { auto mp3 = new AuCtx; @@ -476,7 +527,7 @@ static int sceMp3GetMaxOutputSample(u32 mp3) { return hleLogWarning(ME, 0, "no channel available for low level"); } - return hleLogSuccessI(ME, ctx->AuGetMaxOutputSample()); + return hleLogSuccessI(ME, ctx->MaxOutputSample); } static int sceMp3GetSumDecodedSample(u32 mp3) { @@ -489,7 +540,7 @@ static int sceMp3GetSumDecodedSample(u32 mp3) { return hleLogError(ME, ERROR_MP3_UNRESERVED_HANDLE, "incorrect handle type"); } - return hleLogSuccessI(ME, ctx->AuGetSumDecodedSample()); + return hleLogSuccessI(ME, ctx->SumDecodedSamples); } static int sceMp3SetLoopNum(u32 mp3, int loop) { @@ -520,7 +571,7 @@ static int sceMp3GetMp3ChannelNum(u32 mp3) { return hleLogWarning(ME, 0, "no channel available for low level"); } - return hleLogSuccessI(ME, ctx->AuGetChannelNum()); + return hleLogSuccessI(ME, ctx->Channels); } static int sceMp3GetBitRate(u32 mp3) { @@ -535,7 +586,7 @@ static int sceMp3GetBitRate(u32 mp3) { return hleLogWarning(ME, 0, "no bitrate available for low level"); } - return hleLogSuccessI(ME, ctx->AuGetBitRate()); + return hleLogSuccessI(ME, ctx->BitRate); } static int sceMp3GetSamplingRate(u32 mp3) { @@ -550,7 +601,7 @@ static int sceMp3GetSamplingRate(u32 mp3) { return hleLogWarning(ME, 0, "no sample rate available for low level"); } - return hleLogSuccessI(ME, ctx->AuGetSamplingRate()); + return hleLogSuccessI(ME, ctx->SamplingRate); } static int sceMp3GetInfoToAddStreamData(u32 mp3, u32 dstPtr, u32 towritePtr, u32 srcposPtr) { @@ -613,7 +664,7 @@ static u32 sceMp3GetFrameNum(u32 mp3) { return hleLogError(ME, ERROR_MP3_NOT_YET_INIT_HANDLE, "not yet init"); } - return hleLogSuccessI(ME, ctx->AuGetFrameNum()); + return hleLogSuccessI(ME, ctx->FrameNum); } static u32 sceMp3GetMPEGVersion(u32 mp3) { @@ -630,7 +681,7 @@ static u32 sceMp3GetMPEGVersion(u32 mp3) { } // Tests have not revealed how to expose more than "3" here as a result. - return hleReportDebug(ME, ctx->AuGetVersion()); + return hleReportDebug(ME, ctx->Version); } static u32 sceMp3ResetPlayPositionByFrame(u32 mp3, u32 frame) { @@ -643,7 +694,7 @@ static u32 sceMp3ResetPlayPositionByFrame(u32 mp3, u32 frame) { return hleLogError(ME, ERROR_MP3_NOT_YET_INIT_HANDLE, "not yet init"); } - if (frame >= (u32)ctx->AuGetFrameNum()) { + if (frame >= (u32)ctx->FrameNum) { return hleLogError(ME, ERROR_MP3_BAD_RESET_FRAME, "bad frame position"); } diff --git a/Core/HLE/sceMp4.cpp b/Core/HLE/sceMp4.cpp index 38c288e950..21a70e4999 100644 --- a/Core/HLE/sceMp4.cpp +++ b/Core/HLE/sceMp4.cpp @@ -368,7 +368,7 @@ static u32 sceAacGetMaxOutputSample(u32 id) return -1; } - return ctx->AuGetMaxOutputSample(); + return ctx->MaxOutputSample; } static u32 sceAacGetSumDecodedSample(u32 id) @@ -380,7 +380,7 @@ static u32 sceAacGetSumDecodedSample(u32 id) return -1; } - return ctx->AuGetSumDecodedSample(); + return ctx->SumDecodedSamples; } static u32 sceAacResetPlayPosition(u32 id) diff --git a/Core/HW/SimpleAudioDec.h b/Core/HW/SimpleAudioDec.h index 9bf2427a4a..d70ee262d6 100644 --- a/Core/HW/SimpleAudioDec.h +++ b/Core/HW/SimpleAudioDec.h @@ -118,13 +118,6 @@ public: u32 AuGetLoopNum(); u32 AuGetInfoToAddStreamData(u32 bufPtr, u32 sizePtr, u32 srcPosPtr); - u32 AuGetMaxOutputSample() const { return MaxOutputSample; } - u32 AuGetSumDecodedSample() const { return SumDecodedSamples; } - int AuGetChannelNum() const { return Channels; } - int AuGetBitRate() const { return BitRate; } - int AuGetSamplingRate() const { return SamplingRate; } - int AuGetVersion() const { return Version; } - int AuGetFrameNum() const { return FrameNum; } void SetReadPos(int pos) { readPos = pos; } int ReadPos() { return readPos; } From ddbe0e853be9beef47b41964408def2b737ea402 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Wed, 10 Apr 2024 00:40:16 +0200 Subject: [PATCH 051/719] Remove unused code --- Core/HLE/sceMp3.cpp | 3 --- Core/HW/SimpleAudioDec.cpp | 4 ++-- Core/HW/SimpleAudioDec.h | 5 ++--- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Core/HLE/sceMp3.cpp b/Core/HLE/sceMp3.cpp index ef5ecbffd9..f93f6c0e9c 100644 --- a/Core/HLE/sceMp3.cpp +++ b/Core/HLE/sceMp3.cpp @@ -496,9 +496,6 @@ static int sceMp3Init(u32 mp3) { ctx->Version = versionBits; - // This tells us to resample to the same frequency it decodes to. - ctx->decoder->SetResampleFrequency(ctx->freq); - return hleDelayResult(hleLogSuccessI(ME, 0), "mp3 init", PARSE_DELAY_MS); } diff --git a/Core/HW/SimpleAudioDec.cpp b/Core/HW/SimpleAudioDec.cpp index 80397bf6da..74e92b98dc 100644 --- a/Core/HW/SimpleAudioDec.cpp +++ b/Core/HW/SimpleAudioDec.cpp @@ -58,7 +58,7 @@ int SimpleAudio::GetAudioCodecID(int audioType) { SimpleAudio::SimpleAudio(int audioType, int sample_rate, int channels) : ctxPtr(0xFFFFFFFF), audioType(audioType), sample_rate_(sample_rate), channels_(channels), - outSamples(0), srcPos(0), wanted_resample_freq(44100), frame_(0), codec_(0), codecCtx_(0), swrCtx_(0), + outSamples(0), srcPos(0), frame_(0), codec_(0), codecCtx_(0), swrCtx_(0), codecOpen_(false) { Init(); } @@ -238,7 +238,7 @@ bool SimpleAudio::Decode(const uint8_t *inbuf, int inbytes, uint8_t *outbuf, int swrCtx_, wanted_channel_layout, AV_SAMPLE_FMT_S16, - wanted_resample_freq, + codecCtx_->sample_rate, dec_channel_layout, codecCtx_->sample_fmt, codecCtx_->sample_rate, diff --git a/Core/HW/SimpleAudioDec.h b/Core/HW/SimpleAudioDec.h index d70ee262d6..9f9e93ecfb 100644 --- a/Core/HW/SimpleAudioDec.h +++ b/Core/HW/SimpleAudioDec.h @@ -67,7 +67,6 @@ public: // These two are only here because of save states. int GetAudioType() const { return audioType; } - void SetResampleFrequency(int freq) { wanted_resample_freq = freq; } // Just metadata. void SetCtxPtr(u32 ptr) { ctxPtr = ptr; } @@ -83,7 +82,6 @@ private: int channels_; int outSamples; // output samples per frame int srcPos; // bytes consumed in source during the last decoding - int wanted_resample_freq; // wanted resampling rate/frequency AVFrame *frame_; #if HAVE_LIBAVCODEC_CONST_AVCODEC // USE_FFMPEG is implied @@ -139,7 +137,8 @@ public: u32 AuBufSize = 0; u32 PCMBuf = 0; u32 PCMBufSize = 0; - int freq = -1; + + int freq = -1; // used by AAC only? int BitRate = 0; int SamplingRate = -1; int Channels = 0; From 88eb2c2e0bfe9dc7da54749265cd0c79f6d5f11c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Wed, 10 Apr 2024 00:45:02 +0200 Subject: [PATCH 052/719] Add a virtual base class so we can implement alternative decoders --- Core/HW/SimpleAudioDec.cpp | 10 +--------- Core/HW/SimpleAudioDec.h | 31 ++++++++++++++++++++++++------- 2 files changed, 25 insertions(+), 16 deletions(-) diff --git a/Core/HW/SimpleAudioDec.cpp b/Core/HW/SimpleAudioDec.cpp index 74e92b98dc..c833ed4dd0 100644 --- a/Core/HW/SimpleAudioDec.cpp +++ b/Core/HW/SimpleAudioDec.cpp @@ -279,15 +279,7 @@ bool SimpleAudio::Decode(const uint8_t *inbuf, int inbytes, uint8_t *outbuf, int #endif // USE_FFMPEG } -int SimpleAudio::GetOutSamples() { - return outSamples; -} - -int SimpleAudio::GetSourcePos() { - return srcPos; -} - -void AudioClose(SimpleAudio **ctx) { +void AudioClose(AudioDecoder **ctx) { #ifdef USE_FFMPEG delete *ctx; *ctx = 0; diff --git a/Core/HW/SimpleAudioDec.h b/Core/HW/SimpleAudioDec.h index 9f9e93ecfb..fb25a5fb0d 100644 --- a/Core/HW/SimpleAudioDec.h +++ b/Core/HW/SimpleAudioDec.h @@ -48,16 +48,33 @@ enum { PSP_CODEC_AAC = 0x00001003, }; -class SimpleAudio { +class AudioDecoder { +public: + virtual ~AudioDecoder() {} + + virtual bool Decode(const uint8_t* inbuf, int inbytes, uint8_t *outbuf, int *outbytes) = 0; + virtual bool IsOK() const = 0; + + virtual int GetOutSamples() const = 0; + virtual int GetSourcePos() const = 0; +}; + +// FFMPEG-based decoder +class SimpleAudio : public AudioDecoder { public: SimpleAudio(int audioType, int sample_rate = 44100, int channels = 2); ~SimpleAudio(); - bool Decode(const uint8_t* inbuf, int inbytes, uint8_t *outbuf, int *outbytes); - bool IsOK() const; + bool Decode(const uint8_t* inbuf, int inbytes, uint8_t *outbuf, int *outbytes) override; + bool IsOK() const override; + + int GetOutSamples() const override { + return outSamples; + } + int GetSourcePos() const override { + return srcPos; + } - int GetOutSamples(); - int GetSourcePos(); int GetAudioCodecID(int audioType); // Get audioCodecId from audioType // Not save stated, only used by UI. Used for ATRAC3 (non+) files. @@ -94,7 +111,7 @@ private: bool codecOpen_; }; -void AudioClose(SimpleAudio **ctx); +void AudioClose(AudioDecoder **ctx); const char *GetCodecName(int codec); // audioType bool IsValidCodec(int codec); @@ -151,7 +168,7 @@ public: int FrameNum = 0; // Au decoder - SimpleAudio *decoder = nullptr; + AudioDecoder *decoder = nullptr; // Au type int audioType = 0; From 32ca7ab59a522b0360f826dd22d77a0f678dc672 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Wed, 10 Apr 2024 12:07:03 +0200 Subject: [PATCH 053/719] Minor code cleanups --- Core/HLE/sceKernel.cpp | 1 + Core/HLE/sceMp3.cpp | 13 +++++++------ Core/HLE/sceMp3.h | 3 ++- Core/HLE/sceMp4.cpp | 3 +-- Core/HW/SimpleAudioDec.cpp | 31 +++++++++++++++++++++---------- Core/HW/SimpleAudioDec.h | 8 +++----- 6 files changed, 35 insertions(+), 24 deletions(-) diff --git a/Core/HLE/sceKernel.cpp b/Core/HLE/sceKernel.cpp index 73aea78a7d..28d6a60a0b 100644 --- a/Core/HLE/sceKernel.cpp +++ b/Core/HLE/sceKernel.cpp @@ -124,6 +124,7 @@ void __KernelInit() __IoInit(); __JpegInit(); __AudioInit(); + __Mp3Init(); __SasInit(); __AtracInit(); __CccInit(); diff --git a/Core/HLE/sceMp3.cpp b/Core/HLE/sceMp3.cpp index f93f6c0e9c..2d824bae5b 100644 --- a/Core/HLE/sceMp3.cpp +++ b/Core/HLE/sceMp3.cpp @@ -157,6 +157,10 @@ static AuCtx *getMp3Ctx(u32 mp3) { return mp3Map[mp3]; } +void __Mp3Init() { + resourceInited = false; +} + void __Mp3Shutdown() { for (auto it = mp3Map.begin(), end = mp3Map.end(); it != end; ++it) { delete it->second; @@ -194,8 +198,7 @@ void __Mp3DoState(PointerWrap &p) { mp3->MaxOutputSample = mp3_old->mp3MaxSamples; mp3->SetReadPos(mp3_old->readPosition); - mp3->audioType = PSP_CODEC_MP3; - mp3->decoder = new SimpleAudio(mp3->audioType); + mp3->decoder = new SimpleAudio(PSP_CODEC_MP3); mp3Map[id] = mp3; } } @@ -300,9 +303,8 @@ static u32 sceMp3ReserveMp3Handle(u32 mp3Addr) { Au->PCMBufSize = 0; } - Au->audioType = PSP_CODEC_MP3; Au->SetReadPos(Au->startPos); - Au->decoder = new SimpleAudio(Au->audioType); + Au->decoder = new SimpleAudio(PSP_CODEC_MP3); int handle = (int)mp3Map.size(); mp3Map[handle] = Au; @@ -701,9 +703,8 @@ static u32 sceMp3ResetPlayPositionByFrame(u32 mp3, u32 frame) { static u32 sceMp3LowLevelInit(u32 mp3, u32 unk) { auto ctx = new AuCtx; - ctx->audioType = PSP_CODEC_MP3; // create mp3 decoder - ctx->decoder = new SimpleAudio(ctx->audioType); + ctx->decoder = new SimpleAudio(PSP_CODEC_MP3); // close the audio if mp3 already exists. if (mp3Map.find(mp3) != mp3Map.end()) { diff --git a/Core/HLE/sceMp3.h b/Core/HLE/sceMp3.h index 84ff082dfb..d1aa4fa3b5 100644 --- a/Core/HLE/sceMp3.h +++ b/Core/HLE/sceMp3.h @@ -21,5 +21,6 @@ class PointerWrap; void Register_sceMp3(); +void __Mp3Init(); void __Mp3Shutdown(); -void __Mp3DoState(PointerWrap &p); \ No newline at end of file +void __Mp3DoState(PointerWrap &p); diff --git a/Core/HLE/sceMp4.cpp b/Core/HLE/sceMp4.cpp index 21a70e4999..e1c555e8a3 100644 --- a/Core/HLE/sceMp4.cpp +++ b/Core/HLE/sceMp4.cpp @@ -253,10 +253,9 @@ static u32 sceAacInit(u32 id) aac->Channels = 2; aac->MaxOutputSample = aac->PCMBufSize / 4; aac->SetReadPos((int)aac->startPos); - aac->audioType = PSP_CODEC_AAC; // create aac decoder - aac->decoder = new SimpleAudio(aac->audioType); + aac->decoder = new SimpleAudio(PSP_CODEC_AAC); // close the audio if id already exist. if (aacMap.find(id) != aacMap.end()) { diff --git a/Core/HW/SimpleAudioDec.cpp b/Core/HW/SimpleAudioDec.cpp index c833ed4dd0..4ee43a3d96 100644 --- a/Core/HW/SimpleAudioDec.cpp +++ b/Core/HW/SimpleAudioDec.cpp @@ -37,6 +37,11 @@ extern "C" { #endif // USE_FFMPEG +// TODO: This should also be able to create other types of decoders. +SimpleAudio *CreateAudioDecoder(int audioType) { + return new SimpleAudio(audioType); +} + int SimpleAudio::GetAudioCodecID(int audioType) { #ifdef USE_FFMPEG switch (audioType) { @@ -57,13 +62,11 @@ int SimpleAudio::GetAudioCodecID(int audioType) { } SimpleAudio::SimpleAudio(int audioType, int sample_rate, int channels) -: ctxPtr(0xFFFFFFFF), audioType(audioType), sample_rate_(sample_rate), channels_(channels), - outSamples(0), srcPos(0), frame_(0), codec_(0), codecCtx_(0), swrCtx_(0), - codecOpen_(false) { - Init(); -} + : ctxPtr(0xFFFFFFFF), audioType(audioType), sample_rate_(sample_rate), channels_(channels), + outSamples(0), srcPos(0), + frame_(0), codec_(0), codecCtx_(0), swrCtx_(0), + codecOpen_(false) { -void SimpleAudio::Init() { #ifdef USE_FFMPEG #if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(58, 18, 100) avcodec_register_all(); @@ -179,6 +182,7 @@ bool SimpleAudio::IsOK() const { #endif } +// Decodes a single input frame. bool SimpleAudio::Decode(const uint8_t *inbuf, int inbytes, uint8_t *outbuf, int *outbytes) { #ifdef USE_FFMPEG if (!codecOpen_) { @@ -286,6 +290,12 @@ void AudioClose(AudioDecoder **ctx) { #endif // USE_FFMPEG } +void AudioClose(SimpleAudio **ctx) { +#ifdef USE_FFMPEG + delete *ctx; + *ctx = 0; +#endif // USE_FFMPEG +} static const char *const codecNames[4] = { "AT3+", "AT3", "MP3", "AAC", @@ -320,7 +330,7 @@ AuCtx::~AuCtx() { } size_t AuCtx::FindNextMp3Sync() { - if (audioType != PSP_CODEC_MP3) { + if (decoder->GetAudioType() != PSP_CODEC_MP3) { return 0; } @@ -413,7 +423,7 @@ int AuCtx::AuCheckStreamDataNeeded() { } int AuCtx::AuStreamBytesNeeded() { - if (audioType == PSP_CODEC_MP3) { + if (decoder->GetAudioType() == PSP_CODEC_MP3) { // The endPos and readPos are not considered, except when you've read to the end. if (readPos >= endPos) return 0; @@ -428,7 +438,7 @@ int AuCtx::AuStreamBytesNeeded() { int AuCtx::AuStreamWorkareaSize() { // Note that this is 31 bytes more than the max layer 3 frame size. - if (audioType == PSP_CODEC_MP3) + if (decoder->GetAudioType() == PSP_CODEC_MP3) return 0x05c0; return 0; } @@ -525,6 +535,7 @@ void AuCtx::DoState(PointerWrap &p) { Do(p, Channels); Do(p, MaxOutputSample); Do(p, readPos); + int audioType = decoder->GetAudioType(); Do(p, audioType); Do(p, BitRate); Do(p, SamplingRate); @@ -544,6 +555,6 @@ void AuCtx::DoState(PointerWrap &p) { } if (p.mode == p.MODE_READ) { - decoder = new SimpleAudio(audioType); + decoder = CreateAudioDecoder(audioType); } } diff --git a/Core/HW/SimpleAudioDec.h b/Core/HW/SimpleAudioDec.h index fb25a5fb0d..02ba8db3b8 100644 --- a/Core/HW/SimpleAudioDec.h +++ b/Core/HW/SimpleAudioDec.h @@ -57,6 +57,7 @@ public: virtual int GetOutSamples() const = 0; virtual int GetSourcePos() const = 0; + virtual int GetAudioType() const = 0; }; // FFMPEG-based decoder @@ -90,7 +91,6 @@ public: u32 GetCtxPtr() const { return ctxPtr; } private: - void Init(); bool OpenCodec(int block_align); u32 ctxPtr; @@ -111,6 +111,7 @@ private: bool codecOpen_; }; +void AudioClose(SimpleAudio **ctx); void AudioClose(AudioDecoder **ctx); const char *GetCodecName(int codec); // audioType bool IsValidCodec(int codec); @@ -170,9 +171,6 @@ public: // Au decoder AudioDecoder *decoder = nullptr; - // Au type - int audioType = 0; - private: size_t FindNextMp3Sync(); @@ -180,7 +178,7 @@ private: // buffers informations int AuBufAvailable = 0; // the available buffer of AuBuf to be able to recharge data - int readPos; // read position in audio source file + int readPos = 0; // read position in audio source file int askedReadSize = 0; // the size of data requied to be read from file by the game int nextOutputHalf = 0; }; From 1938d3b876d1bc146f8579ca71f01d11ca19eb3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Wed, 10 Apr 2024 12:14:58 +0200 Subject: [PATCH 054/719] More prep for plugging in alternate audio decoders --- Core/HLE/sceAudiocodec.cpp | 18 ++++++++++-------- Core/HLE/sceMp3.cpp | 8 ++++---- Core/HLE/sceMp4.cpp | 2 +- Core/HW/MediaEngine.cpp | 2 +- Core/HW/SimpleAudioDec.cpp | 14 +++++++------- Core/HW/SimpleAudioDec.h | 13 +++++++------ UI/BackgroundAudio.cpp | 2 +- 7 files changed, 31 insertions(+), 28 deletions(-) diff --git a/Core/HLE/sceAudiocodec.cpp b/Core/HLE/sceAudiocodec.cpp index 296b5bf90e..0b1e32c52e 100644 --- a/Core/HLE/sceAudiocodec.cpp +++ b/Core/HLE/sceAudiocodec.cpp @@ -77,29 +77,31 @@ void __AudioCodecShutdown() { } static int sceAudiocodecInit(u32 ctxPtr, int codec) { - if (IsValidCodec(codec)) { + PSPAudioType audioType = (PSPAudioType)codec; + if (IsValidCodec(audioType)) { // Create audio decoder for given audio codec and push it into AudioList if (removeDecoder(ctxPtr)) { WARN_LOG_REPORT(HLE, "sceAudiocodecInit(%08x, %d): replacing existing context", ctxPtr, codec); } - auto decoder = new SimpleAudio(codec); + auto decoder = CreateAudioDecoder(audioType); decoder->SetCtxPtr(ctxPtr); audioList[ctxPtr] = decoder; - INFO_LOG(ME, "sceAudiocodecInit(%08x, %i (%s))", ctxPtr, codec, GetCodecName(codec)); + INFO_LOG(ME, "sceAudiocodecInit(%08x, %i (%s))", ctxPtr, codec, GetCodecName(audioType)); DEBUG_LOG(ME, "Number of playing sceAudioCodec audios : %d", (int)audioList.size()); return 0; } - ERROR_LOG_REPORT(ME, "sceAudiocodecInit(%08x, %i (%s)): Unknown audio codec %i", ctxPtr, codec, GetCodecName(codec), codec); + ERROR_LOG_REPORT(ME, "sceAudiocodecInit(%08x, %i (%s)): Unknown audio codec %i", ctxPtr, codec, GetCodecName(audioType), codec); return 0; } static int sceAudiocodecDecode(u32 ctxPtr, int codec) { + PSPAudioType audioType = (PSPAudioType)codec; if (!ctxPtr){ - ERROR_LOG_REPORT(ME, "sceAudiocodecDecode(%08x, %i (%s)) got NULL pointer", ctxPtr, codec, GetCodecName(codec)); + ERROR_LOG_REPORT(ME, "sceAudiocodecDecode(%08x, %i (%s)) got NULL pointer", ctxPtr, codec, GetCodecName(audioType)); return -1; } - if (IsValidCodec(codec)){ + if (IsValidCodec(audioType)){ int outbytes = 0; // find a decoder in audioList auto decoder = findDecoder(ctxPtr); @@ -107,7 +109,7 @@ static int sceAudiocodecDecode(u32 ctxPtr, int codec) { if (!decoder && oldStateLoaded) { // We must have loaded an old state that did not have sceAudiocodec information. // Fake it by creating the desired context. - decoder = new SimpleAudio(codec); + decoder = CreateAudioDecoder(audioType); decoder->SetCtxPtr(ctxPtr); audioList[ctxPtr] = decoder; } @@ -194,7 +196,7 @@ void __sceAudiocodecDoState(PointerWrap &p){ DoArray(p, codec_, s >= 2 ? count : (int)ARRAY_SIZE(codec_)); DoArray(p, ctxPtr_, s >= 2 ? count : (int)ARRAY_SIZE(ctxPtr_)); for (int i = 0; i < count; i++) { - auto decoder = new SimpleAudio(codec_[i]); + auto decoder = CreateAudioDecoder((PSPAudioType)codec_[i]); decoder->SetCtxPtr(ctxPtr_[i]); audioList[ctxPtr_[i]] = decoder; } diff --git a/Core/HLE/sceMp3.cpp b/Core/HLE/sceMp3.cpp index 2d824bae5b..6e21291c64 100644 --- a/Core/HLE/sceMp3.cpp +++ b/Core/HLE/sceMp3.cpp @@ -198,7 +198,7 @@ void __Mp3DoState(PointerWrap &p) { mp3->MaxOutputSample = mp3_old->mp3MaxSamples; mp3->SetReadPos(mp3_old->readPosition); - mp3->decoder = new SimpleAudio(PSP_CODEC_MP3); + mp3->decoder = CreateAudioDecoder(PSP_CODEC_MP3); mp3Map[id] = mp3; } } @@ -304,7 +304,7 @@ static u32 sceMp3ReserveMp3Handle(u32 mp3Addr) { } Au->SetReadPos(Au->startPos); - Au->decoder = new SimpleAudio(PSP_CODEC_MP3); + Au->decoder = CreateAudioDecoder(PSP_CODEC_MP3); int handle = (int)mp3Map.size(); mp3Map[handle] = Au; @@ -701,10 +701,10 @@ static u32 sceMp3ResetPlayPositionByFrame(u32 mp3, u32 frame) { } static u32 sceMp3LowLevelInit(u32 mp3, u32 unk) { - auto ctx = new AuCtx; + auto ctx = new AuCtx(); // create mp3 decoder - ctx->decoder = new SimpleAudio(PSP_CODEC_MP3); + ctx->decoder = CreateAudioDecoder(PSP_CODEC_MP3); // close the audio if mp3 already exists. if (mp3Map.find(mp3) != mp3Map.end()) { diff --git a/Core/HLE/sceMp4.cpp b/Core/HLE/sceMp4.cpp index e1c555e8a3..c804013641 100644 --- a/Core/HLE/sceMp4.cpp +++ b/Core/HLE/sceMp4.cpp @@ -255,7 +255,7 @@ static u32 sceAacInit(u32 id) aac->SetReadPos((int)aac->startPos); // create aac decoder - aac->decoder = new SimpleAudio(PSP_CODEC_AAC); + aac->decoder = CreateAudioDecoder(PSP_CODEC_AAC); // close the audio if id already exist. if (aacMap.find(id) != aacMap.end()) { diff --git a/Core/HW/MediaEngine.cpp b/Core/HW/MediaEngine.cpp index 7e8b37d4dc..c1e23612ab 100644 --- a/Core/HW/MediaEngine.cpp +++ b/Core/HW/MediaEngine.cpp @@ -340,7 +340,7 @@ bool MediaEngine::openContext(bool keepReadPos) { return false; setVideoDim(); - m_audioContext = new SimpleAudio(m_audioType, 44100, 2); + m_audioContext = CreateAudioDecoder((PSPAudioType)m_audioType); m_isVideoEnd = false; #endif // USE_FFMPEG return true; diff --git a/Core/HW/SimpleAudioDec.cpp b/Core/HW/SimpleAudioDec.cpp index 4ee43a3d96..d850058ddd 100644 --- a/Core/HW/SimpleAudioDec.cpp +++ b/Core/HW/SimpleAudioDec.cpp @@ -38,8 +38,8 @@ extern "C" { #endif // USE_FFMPEG // TODO: This should also be able to create other types of decoders. -SimpleAudio *CreateAudioDecoder(int audioType) { - return new SimpleAudio(audioType); +SimpleAudio *CreateAudioDecoder(PSPAudioType audioType, int sampleRateHz, int channels) { + return new SimpleAudio(audioType, sampleRateHz, channels); } int SimpleAudio::GetAudioCodecID(int audioType) { @@ -61,8 +61,8 @@ int SimpleAudio::GetAudioCodecID(int audioType) { #endif // USE_FFMPEG } -SimpleAudio::SimpleAudio(int audioType, int sample_rate, int channels) - : ctxPtr(0xFFFFFFFF), audioType(audioType), sample_rate_(sample_rate), channels_(channels), +SimpleAudio::SimpleAudio(PSPAudioType audioType, int sampleRateHz, int channels) + : ctxPtr(0xFFFFFFFF), audioType(audioType), sample_rate_(sampleRateHz), channels_(channels), outSamples(0), srcPos(0), frame_(0), codec_(0), codecCtx_(0), swrCtx_(0), codecOpen_(false) { @@ -309,7 +309,7 @@ const char *GetCodecName(int codec) { } }; -bool IsValidCodec(int codec){ +bool IsValidCodec(PSPAudioType codec){ if (codec >= PSP_CODEC_AT3PLUS && codec <= PSP_CODEC_AAC) { return true; } @@ -535,7 +535,7 @@ void AuCtx::DoState(PointerWrap &p) { Do(p, Channels); Do(p, MaxOutputSample); Do(p, readPos); - int audioType = decoder->GetAudioType(); + int audioType = (int)decoder->GetAudioType(); Do(p, audioType); Do(p, BitRate); Do(p, SamplingRate); @@ -555,6 +555,6 @@ void AuCtx::DoState(PointerWrap &p) { } if (p.mode == p.MODE_READ) { - decoder = CreateAudioDecoder(audioType); + decoder = CreateAudioDecoder((PSPAudioType)audioType); } } diff --git a/Core/HW/SimpleAudioDec.h b/Core/HW/SimpleAudioDec.h index 02ba8db3b8..5433b4166e 100644 --- a/Core/HW/SimpleAudioDec.h +++ b/Core/HW/SimpleAudioDec.h @@ -41,7 +41,7 @@ extern "C" { // Based on http://ffmpeg.org/doxygen/trunk/doc_2examples_2decoding_encoding_8c-example.html#_a13 // audioType -enum { +enum PSPAudioType { PSP_CODEC_AT3PLUS = 0x00001000, PSP_CODEC_AT3 = 0x00001001, PSP_CODEC_MP3 = 0x00001002, @@ -57,13 +57,13 @@ public: virtual int GetOutSamples() const = 0; virtual int GetSourcePos() const = 0; - virtual int GetAudioType() const = 0; + virtual PSPAudioType GetAudioType() const = 0; }; // FFMPEG-based decoder class SimpleAudio : public AudioDecoder { public: - SimpleAudio(int audioType, int sample_rate = 44100, int channels = 2); + SimpleAudio(PSPAudioType audioType, int sampleRateHz = 44100, int channels = 2); ~SimpleAudio(); bool Decode(const uint8_t* inbuf, int inbytes, uint8_t *outbuf, int *outbytes) override; @@ -84,7 +84,7 @@ public: void SetChannels(int channels); // These two are only here because of save states. - int GetAudioType() const { return audioType; } + PSPAudioType GetAudioType() const { return audioType; } // Just metadata. void SetCtxPtr(u32 ptr) { ctxPtr = ptr; } @@ -94,7 +94,7 @@ private: bool OpenCodec(int block_align); u32 ctxPtr; - int audioType; + PSPAudioType audioType; int sample_rate_; int channels_; int outSamples; // output samples per frame @@ -114,7 +114,8 @@ private: void AudioClose(SimpleAudio **ctx); void AudioClose(AudioDecoder **ctx); const char *GetCodecName(int codec); // audioType -bool IsValidCodec(int codec); +bool IsValidCodec(PSPAudioType codec); +SimpleAudio *CreateAudioDecoder(PSPAudioType audioType, int sampleRateHz = 44100, int channels = 2); class AuCtx { public: diff --git a/UI/BackgroundAudio.cpp b/UI/BackgroundAudio.cpp index 32cbefc0a0..d7bacd6814 100644 --- a/UI/BackgroundAudio.cpp +++ b/UI/BackgroundAudio.cpp @@ -189,7 +189,7 @@ public: wave_.Read(file_); - decoder_ = new SimpleAudio(wave_.codec, wave_.sample_rate, wave_.num_channels); + decoder_ = CreateAudioDecoder((PSPAudioType)wave_.codec, wave_.sample_rate, wave_.num_channels); if (wave_.codec == PSP_CODEC_AT3) { decoder_->SetExtraData(&wave_.at3_extradata[2], 14, wave_.raw_bytes_per_frame); } From 1805910fac735a9545dfb00e0e021f9b6157878d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Wed, 10 Apr 2024 12:19:48 +0200 Subject: [PATCH 055/719] More refactoring --- Core/HLE/sceAudiocodec.cpp | 8 ++++---- Core/HW/MediaEngine.h | 7 +++---- Core/HW/SimpleAudioDec.cpp | 8 ++++---- Core/HW/SimpleAudioDec.h | 23 +++++++++++++---------- UI/BackgroundAudio.cpp | 4 ++-- 5 files changed, 26 insertions(+), 24 deletions(-) diff --git a/Core/HLE/sceAudiocodec.cpp b/Core/HLE/sceAudiocodec.cpp index 0b1e32c52e..0da9ede65d 100644 --- a/Core/HLE/sceAudiocodec.cpp +++ b/Core/HLE/sceAudiocodec.cpp @@ -36,12 +36,12 @@ struct AudioCodecContext { }; // audioList is to store current playing audios. -static std::map audioList; +static std::map audioList; static bool oldStateLoaded = false; // find the audio decoder for corresponding ctxPtr in audioList -static SimpleAudio *findDecoder(u32 ctxPtr) { +static AudioDecoder *findDecoder(u32 ctxPtr) { auto it = audioList.find(ctxPtr); if (it != audioList.end()) { return it->second; @@ -83,7 +83,7 @@ static int sceAudiocodecInit(u32 ctxPtr, int codec) { if (removeDecoder(ctxPtr)) { WARN_LOG_REPORT(HLE, "sceAudiocodecInit(%08x, %d): replacing existing context", ctxPtr, codec); } - auto decoder = CreateAudioDecoder(audioType); + AudioDecoder *decoder = CreateAudioDecoder(audioType); decoder->SetCtxPtr(ctxPtr); audioList[ctxPtr] = decoder; INFO_LOG(ME, "sceAudiocodecInit(%08x, %i (%s))", ctxPtr, codec, GetCodecName(audioType)); @@ -216,7 +216,7 @@ void __sceAudiocodecDoState(PointerWrap &p){ auto ctxPtr_ = new u32[count]; int i = 0; for (auto it = audioList.begin(), end = audioList.end(); it != end; it++) { - const SimpleAudio *decoder = it->second; + const AudioDecoder *decoder = it->second; codec_[i] = decoder->GetAudioType(); ctxPtr_[i] = decoder->GetCtxPtr(); i++; diff --git a/Core/HW/MediaEngine.h b/Core/HW/MediaEngine.h index 251916685f..e0a54c1343 100644 --- a/Core/HW/MediaEngine.h +++ b/Core/HW/MediaEngine.h @@ -31,7 +31,7 @@ #include "Core/HW/SimpleAudioDec.h" class PointerWrap; -class SimpleAudio; +class AudioDecoder; #ifdef USE_FFMPEG struct SwsContext; @@ -50,8 +50,7 @@ inline s64 getMpegTimeStamp(const u8 *buf) { bool InitFFmpeg(); #endif -class MediaEngine -{ +class MediaEngine { public: MediaEngine(); ~MediaEngine(); @@ -144,7 +143,7 @@ private: s64 m_lastPts = -1; MpegDemux *m_demux = nullptr; - SimpleAudio *m_audioContext = nullptr; + AudioDecoder *m_audioContext = nullptr; s64 m_audiopts = 0; // used for audio type diff --git a/Core/HW/SimpleAudioDec.cpp b/Core/HW/SimpleAudioDec.cpp index d850058ddd..38f7d5a764 100644 --- a/Core/HW/SimpleAudioDec.cpp +++ b/Core/HW/SimpleAudioDec.cpp @@ -38,11 +38,11 @@ extern "C" { #endif // USE_FFMPEG // TODO: This should also be able to create other types of decoders. -SimpleAudio *CreateAudioDecoder(PSPAudioType audioType, int sampleRateHz, int channels) { +AudioDecoder *CreateAudioDecoder(PSPAudioType audioType, int sampleRateHz, int channels) { return new SimpleAudio(audioType, sampleRateHz, channels); } -int SimpleAudio::GetAudioCodecID(int audioType) { +static int GetAudioCodecID(int audioType) { #ifdef USE_FFMPEG switch (audioType) { case PSP_CODEC_AAC: @@ -62,7 +62,7 @@ int SimpleAudio::GetAudioCodecID(int audioType) { } SimpleAudio::SimpleAudio(PSPAudioType audioType, int sampleRateHz, int channels) - : ctxPtr(0xFFFFFFFF), audioType(audioType), sample_rate_(sampleRateHz), channels_(channels), + : audioType(audioType), sample_rate_(sampleRateHz), channels_(channels), outSamples(0), srcPos(0), frame_(0), codec_(0), codecCtx_(0), swrCtx_(0), codecOpen_(false) { @@ -125,7 +125,7 @@ bool SimpleAudio::OpenCodec(int block_align) { #endif // USE_FFMPEG } -void SimpleAudio::SetExtraData(const u8 *data, int size, int wav_bytes_per_packet) { +void SimpleAudio::SetExtraData(const uint8_t *data, int size, int wav_bytes_per_packet) { #ifdef USE_FFMPEG if (codecCtx_) { codecCtx_->extradata = (uint8_t *)av_mallocz(size); diff --git a/Core/HW/SimpleAudioDec.h b/Core/HW/SimpleAudioDec.h index 5433b4166e..06feb1c6e3 100644 --- a/Core/HW/SimpleAudioDec.h +++ b/Core/HW/SimpleAudioDec.h @@ -58,6 +58,16 @@ public: virtual int GetOutSamples() const = 0; virtual int GetSourcePos() const = 0; virtual PSPAudioType GetAudioType() const = 0; + + virtual void SetChannels(int channels) = 0; + virtual void SetExtraData(const uint8_t *data, int size, int wav_bytes_per_packet) = 0; + + // Just metadata. + void SetCtxPtr(uint32_t ptr) { ctxPtr = ptr; } + uint32_t GetCtxPtr() const { return ctxPtr; } + +private: + uint32_t ctxPtr = 0xFFFFFFFF; }; // FFMPEG-based decoder @@ -76,24 +86,17 @@ public: return srcPos; } - int GetAudioCodecID(int audioType); // Get audioCodecId from audioType - // Not save stated, only used by UI. Used for ATRAC3 (non+) files. - void SetExtraData(const u8 *data, int size, int wav_bytes_per_packet); + void SetExtraData(const uint8_t *data, int size, int wav_bytes_per_packet) override; - void SetChannels(int channels); + void SetChannels(int channels) override; // These two are only here because of save states. PSPAudioType GetAudioType() const { return audioType; } - // Just metadata. - void SetCtxPtr(u32 ptr) { ctxPtr = ptr; } - u32 GetCtxPtr() const { return ctxPtr; } - private: bool OpenCodec(int block_align); - u32 ctxPtr; PSPAudioType audioType; int sample_rate_; int channels_; @@ -115,7 +118,7 @@ void AudioClose(SimpleAudio **ctx); void AudioClose(AudioDecoder **ctx); const char *GetCodecName(int codec); // audioType bool IsValidCodec(PSPAudioType codec); -SimpleAudio *CreateAudioDecoder(PSPAudioType audioType, int sampleRateHz = 44100, int channels = 2); +AudioDecoder *CreateAudioDecoder(PSPAudioType audioType, int sampleRateHz = 44100, int channels = 2); class AuCtx { public: diff --git a/UI/BackgroundAudio.cpp b/UI/BackgroundAudio.cpp index d7bacd6814..471d245476 100644 --- a/UI/BackgroundAudio.cpp +++ b/UI/BackgroundAudio.cpp @@ -256,7 +256,7 @@ private: int skip_next_samples_ = 0; FixedSizeQueue bgQueue; short *buffer_ = nullptr; - SimpleAudio *decoder_ = nullptr; + AudioDecoder *decoder_ = nullptr; }; BackgroundAudio g_BackgroundAudio; @@ -433,7 +433,7 @@ Sample *Sample::Load(const std::string &path) { // mp3_info contains the decoded data. int16_t *sample_data = new int16_t[mp3_info.samples]; memcpy(sample_data, mp3_info.buffer, mp3_info.samples * sizeof(int16_t)); - Sample *sample = new Sample(sample_data, mp3_info.channels, mp3_info.samples, mp3_info.hz); + Sample *sample = new Sample(sample_data, mp3_info.channels, (int)mp3_info.samples, mp3_info.hz); free(mp3_info.buffer); delete[] data; return sample; From 8adca6492c961c2e4fa5baaa4d1fc384e008d5ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Wed, 10 Apr 2024 13:03:19 +0200 Subject: [PATCH 056/719] Move class SimpleAudio into the cpp file --- Core/HW/SimpleAudioDec.cpp | 49 ++++++++++++++++++++++++++++++- Core/HW/SimpleAudioDec.h | 60 -------------------------------------- 2 files changed, 48 insertions(+), 61 deletions(-) diff --git a/Core/HW/SimpleAudioDec.cpp b/Core/HW/SimpleAudioDec.cpp index 38f7d5a764..89ef22fed0 100644 --- a/Core/HW/SimpleAudioDec.cpp +++ b/Core/HW/SimpleAudioDec.cpp @@ -16,6 +16,7 @@ // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. #include +#include #include "Common/Serialize/SerializeFuncs.h" #include "Core/Config.h" @@ -32,11 +33,57 @@ extern "C" { #include "libswresample/swresample.h" #include "libavutil/samplefmt.h" #include "libavcodec/avcodec.h" -} +#include "libavutil/version.h" + #include "Core/FFMPEGCompat.h" +} #endif // USE_FFMPEG +// FFMPEG-based decoder. TODO: Replace with individual codecs. +class SimpleAudio : public AudioDecoder { +public: + SimpleAudio(PSPAudioType audioType, int sampleRateHz = 44100, int channels = 2); + ~SimpleAudio(); + + bool Decode(const uint8_t* inbuf, int inbytes, uint8_t *outbuf, int *outbytes) override; + bool IsOK() const override; + + int GetOutSamples() const override { + return outSamples; + } + int GetSourcePos() const override { + return srcPos; + } + + // Not save stated, only used by UI. Used for ATRAC3 (non+) files. + void SetExtraData(const uint8_t *data, int size, int wav_bytes_per_packet) override; + + void SetChannels(int channels) override; + + // These two are only here because of save states. + PSPAudioType GetAudioType() const { return audioType; } + +private: + bool OpenCodec(int block_align); + + PSPAudioType audioType; + int sample_rate_; + int channels_; + int outSamples; // output samples per frame + int srcPos; // bytes consumed in source during the last decoding + + AVFrame *frame_; +#if HAVE_LIBAVCODEC_CONST_AVCODEC // USE_FFMPEG is implied + const +#endif + AVCodec *codec_; + AVCodecContext *codecCtx_; + SwrContext *swrCtx_; + + bool codecOpen_; +}; + // TODO: This should also be able to create other types of decoders. AudioDecoder *CreateAudioDecoder(PSPAudioType audioType, int sampleRateHz, int channels) { return new SimpleAudio(audioType, sampleRateHz, channels); diff --git a/Core/HW/SimpleAudioDec.h b/Core/HW/SimpleAudioDec.h index 06feb1c6e3..c23a57b97d 100644 --- a/Core/HW/SimpleAudioDec.h +++ b/Core/HW/SimpleAudioDec.h @@ -17,24 +17,9 @@ #pragma once -#include - #include "Core/HW/MediaEngine.h" #include "Core/HLE/sceAudio.h" -struct AVFrame; -struct AVCodec; -struct AVCodecContext; -struct SwrContext; - -#ifdef USE_FFMPEG - -extern "C" { -#include "libavutil/version.h" -}; - -#endif - // Wraps FFMPEG for audio decoding in a nice interface. // Decodes packet by packet - does NOT demux. @@ -70,51 +55,6 @@ private: uint32_t ctxPtr = 0xFFFFFFFF; }; -// FFMPEG-based decoder -class SimpleAudio : public AudioDecoder { -public: - SimpleAudio(PSPAudioType audioType, int sampleRateHz = 44100, int channels = 2); - ~SimpleAudio(); - - bool Decode(const uint8_t* inbuf, int inbytes, uint8_t *outbuf, int *outbytes) override; - bool IsOK() const override; - - int GetOutSamples() const override { - return outSamples; - } - int GetSourcePos() const override { - return srcPos; - } - - // Not save stated, only used by UI. Used for ATRAC3 (non+) files. - void SetExtraData(const uint8_t *data, int size, int wav_bytes_per_packet) override; - - void SetChannels(int channels) override; - - // These two are only here because of save states. - PSPAudioType GetAudioType() const { return audioType; } - -private: - bool OpenCodec(int block_align); - - PSPAudioType audioType; - int sample_rate_; - int channels_; - int outSamples; // output samples per frame - int srcPos; // bytes consumed in source during the last decoding - - AVFrame *frame_; -#if HAVE_LIBAVCODEC_CONST_AVCODEC // USE_FFMPEG is implied - const -#endif - AVCodec *codec_; - AVCodecContext *codecCtx_; - SwrContext *swrCtx_; - - bool codecOpen_; -}; - -void AudioClose(SimpleAudio **ctx); void AudioClose(AudioDecoder **ctx); const char *GetCodecName(int codec); // audioType bool IsValidCodec(PSPAudioType codec); From c6c733a27a2af5c873e73c662e565872ea5c9ee6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Tue, 9 Apr 2024 14:10:02 +0200 Subject: [PATCH 057/719] Add way to pass data into OSD click callbacks (and a way to free it) --- Common/System/OSD.cpp | 44 +++++++++++++++++++++++++++++++++++------- Common/System/OSD.h | 13 ++++++++++++- UI/DevScreens.cpp | 8 +++++++- UI/OnScreenDisplay.cpp | 8 ++++---- 4 files changed, 60 insertions(+), 13 deletions(-) diff --git a/Common/System/OSD.cpp b/Common/System/OSD.cpp index 704b4367e9..997123af86 100644 --- a/Common/System/OSD.cpp +++ b/Common/System/OSD.cpp @@ -12,12 +12,30 @@ OnScreenDisplay g_OSD; // Effectively forever. constexpr double forever_s = 10000000000.0; +OnScreenDisplay::~OnScreenDisplay() { + std::lock_guard guard(mutex_); + + double now = time_now_d(); + for (auto iter = entries_.begin(); iter != entries_.end(); ) { + if (iter->clickCallback) { + // Wasn't clicked, but let it free any data. + iter->clickCallback(false, iter->clickUserData); + iter->clickCallback = nullptr; + } + } +} + void OnScreenDisplay::Update() { std::lock_guard guard(mutex_); double now = time_now_d(); for (auto iter = entries_.begin(); iter != entries_.end(); ) { if (now >= iter->endTime) { + if (iter->clickCallback) { + // Wasn't clicked, but let it free any data. + iter->clickCallback(false, iter->clickUserData); + iter->clickCallback = nullptr; + } iter = entries_.erase(iter); } else { iter++; @@ -41,10 +59,14 @@ float OnScreenDisplay::SidebarAlpha() const { return saturatef(1.0f - ((float)timeSinceNudge - 0.1f) * 4.0f); } -void OnScreenDisplay::DismissEntry(size_t index, double now) { +void OnScreenDisplay::ClickEntry(size_t index, double now) { std::lock_guard guard(mutex_); if (index < entries_.size() && entries_[index].type != OSDType::ACHIEVEMENT_CHALLENGE_INDICATOR) { entries_[index].endTime = std::min(now + FadeoutTime(), entries_[index].endTime); + if (entries_[index].clickCallback) { + entries_[index].clickCallback(true, entries_[index].clickUserData); + entries_[index].clickCallback = nullptr; + } } } @@ -90,7 +112,7 @@ void OnScreenDisplay::Show(OSDType type, std::string_view text, std::string_view } } - Entry msg; + Entry msg{}; msg.text = text; msg.text2 = text2; msg.iconName = icon; @@ -116,7 +138,7 @@ void OnScreenDisplay::ShowAchievementUnlocked(int achievementID) { double duration_s = 5.0; - Entry msg; + Entry msg{}; msg.numericID = achievementID; msg.type = OSDType::ACHIEVEMENT_UNLOCKED; msg.startTime = now; @@ -149,7 +171,7 @@ void OnScreenDisplay::ShowAchievementProgress(int achievementID, bool show) { } // OK, let's make a new side-entry. - Entry entry; + Entry entry{}; entry.numericID = achievementID; entry.type = OSDType::ACHIEVEMENT_PROGRESS; entry.startTime = now; @@ -175,7 +197,7 @@ void OnScreenDisplay::ShowChallengeIndicator(int achievementID, bool show) { } // OK, let's make a new side-entry. - Entry entry; + Entry entry{}; entry.numericID = achievementID; entry.type = OSDType::ACHIEVEMENT_CHALLENGE_INDICATOR; entry.startTime = now; @@ -208,7 +230,7 @@ void OnScreenDisplay::ShowLeaderboardTracker(int leaderboardTrackerID, const cha } // OK, let's make a new side-entry. - Entry entry; + Entry entry{}; entry.numericID = leaderboardTrackerID; entry.type = OSDType::LEADERBOARD_TRACKER; entry.startTime = now; @@ -247,7 +269,7 @@ void OnScreenDisplay::SetProgressBar(std::string_view id, std::string_view messa } } - Entry bar; + Entry bar{}; bar.id = id; bar.type = OSDType::PROGRESS_BAR; bar.text = message; @@ -298,3 +320,11 @@ void OnScreenDisplay::ClearAchievementStuff() { } } } + +void OnScreenDisplay::SetClickCallback(const char *id, void (*callback)(bool, void *)) { + for (auto &ent : entries_) { + if (ent.id == id) { + ent.clickCallback = callback; + } + } +} diff --git a/Common/System/OSD.h b/Common/System/OSD.h index 24cb4b4ab2..8715f41f4b 100644 --- a/Common/System/OSD.h +++ b/Common/System/OSD.h @@ -35,6 +35,8 @@ enum class OSDType { // Data holder for on-screen messages. class OnScreenDisplay { public: + ~OnScreenDisplay(); + // If you specify 0.0f as duration, a duration will be chosen automatically depending on type. void Show(OSDType type, std::string_view text, float duration_s = 0.0f, const char *id = nullptr) { Show(type, text, "", duration_s, id); @@ -72,6 +74,9 @@ public: // Fades out everything related to achievements. Should be used on game shutdown. void ClearAchievementStuff(); + // Can't add an infinite number of "Show" functions, so starting to offer post-modification. + void SetClickCallback(const char *id, void (*callback)(bool, void *)); + struct Entry { OSDType type; std::string text; @@ -79,6 +84,12 @@ public: std::string iconName; int numericID; std::string id; + + // We could use std::function, but prefer to do it the oldschool way. + void (*clickCallback)(bool, void *); + void *clickUserData; + + int instanceID; double startTime; double endTime; @@ -91,7 +102,7 @@ public: std::vector Entries(); // TODO: Use something more stable than the index. - void DismissEntry(size_t index, double now); + void ClickEntry(size_t index, double now); static float FadeinTime() { return 0.1f; } static float FadeoutTime() { return 0.25f; } diff --git a/UI/DevScreens.cpp b/UI/DevScreens.cpp index 983f599214..c37343b041 100644 --- a/UI/DevScreens.cpp +++ b/UI/DevScreens.cpp @@ -870,8 +870,14 @@ void SystemInfoScreen::CreateInternalsTab(UI::ViewGroup *internals) { g_OSD.Show(OSDType::MESSAGE_INFO, "Info"); return UI::EVENT_DONE; }); + // This one is clickable internals->Add(new Choice(si->T("Success")))->OnClick.Add([&](UI::EventParams &) { - g_OSD.Show(OSDType::MESSAGE_SUCCESS, "Success"); + g_OSD.Show(OSDType::MESSAGE_SUCCESS, "Success", 0.0f, "clickable"); + g_OSD.SetClickCallback("clickable", [](bool clicked, void*) { + if (clicked) { + System_LaunchUrl(LaunchUrlType::BROWSER_URL, "https://www.google.com/"); + } + }); return UI::EVENT_DONE; }); internals->Add(new Choice(sy->T("RetroAchievements")))->OnClick.Add([&](UI::EventParams &) { diff --git a/UI/OnScreenDisplay.cpp b/UI/OnScreenDisplay.cpp index 73773584e2..2a968456c6 100644 --- a/UI/OnScreenDisplay.cpp +++ b/UI/OnScreenDisplay.cpp @@ -379,7 +379,7 @@ void OnScreenMessagesView::Draw(UIContext &dc) { edges[(size_t)pos].maxWidth = std::max(edges[(size_t)pos].maxWidth, measuredEntry.w); } - std::vector dismissZones; + std::vector clickZones; // Now, perform layout for all 8 edges. for (size_t i = 0; i < (size_t)ScreenEdgePosition::VALUE_COUNT; i++) { @@ -471,7 +471,7 @@ void OnScreenMessagesView::Draw(UIContext &dc) { case OSDType::MESSAGE_FILE_LINK: case OSDType::ACHIEVEMENT_UNLOCKED: // Save the location of the popup, for easy dismissal. - dismissZones.push_back(ClickZone{ (int)j, b }); + clickZones.push_back(ClickZone{ (int)j, b }); break; default: break; @@ -486,7 +486,7 @@ void OnScreenMessagesView::Draw(UIContext &dc) { } std::lock_guard lock(clickMutex_); - clickZones_ = dismissZones; + clickZones_ = clickZones; } std::string OnScreenMessagesView::DescribeText() const { @@ -508,7 +508,7 @@ bool OnScreenMessagesView::Dismiss(float x, float y) { double now = time_now_d(); for (auto &zone : clickZones_) { if (zone.bounds.Contains(x, y)) { - g_OSD.DismissEntry(zone.index, now); + g_OSD.ClickEntry(zone.index, now); dismissed = true; } } From 6575ba54874e1965f28d72fc85198f5f28724c85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Tue, 9 Apr 2024 14:23:26 +0200 Subject: [PATCH 058/719] Make screenshot notifications clickable (on platforms where it's possible) --- Common/System/OSD.cpp | 15 ++++++++------- Common/System/OSD.h | 2 +- GPU/Common/TextureReplacer.cpp | 2 +- UI/DevScreens.cpp | 4 ++-- UI/NativeApp.cpp | 12 +++++++++++- 5 files changed, 23 insertions(+), 12 deletions(-) diff --git a/Common/System/OSD.cpp b/Common/System/OSD.cpp index 997123af86..b20a8bc572 100644 --- a/Common/System/OSD.cpp +++ b/Common/System/OSD.cpp @@ -16,11 +16,10 @@ OnScreenDisplay::~OnScreenDisplay() { std::lock_guard guard(mutex_); double now = time_now_d(); - for (auto iter = entries_.begin(); iter != entries_.end(); ) { - if (iter->clickCallback) { + for (auto &iter : entries_) { + if (iter.clickCallback) { // Wasn't clicked, but let it free any data. - iter->clickCallback(false, iter->clickUserData); - iter->clickCallback = nullptr; + iter.clickCallback(false, iter.clickUserData); } } } @@ -65,7 +64,6 @@ void OnScreenDisplay::ClickEntry(size_t index, double now) { entries_[index].endTime = std::min(now + FadeoutTime(), entries_[index].endTime); if (entries_[index].clickCallback) { entries_[index].clickCallback(true, entries_[index].clickUserData); - entries_[index].clickCallback = nullptr; } } } @@ -321,10 +319,13 @@ void OnScreenDisplay::ClearAchievementStuff() { } } -void OnScreenDisplay::SetClickCallback(const char *id, void (*callback)(bool, void *)) { +void OnScreenDisplay::SetClickCallback(const char *id, void (*callback)(bool, void *), void *userdata) { + _dbg_assert_(callback != nullptr); for (auto &ent : entries_) { - if (ent.id == id) { + // protect against dupes. + if (ent.id == id && !ent.clickCallback) { ent.clickCallback = callback; + ent.clickUserData = userdata; } } } diff --git a/Common/System/OSD.h b/Common/System/OSD.h index 8715f41f4b..fdd513f02c 100644 --- a/Common/System/OSD.h +++ b/Common/System/OSD.h @@ -75,7 +75,7 @@ public: void ClearAchievementStuff(); // Can't add an infinite number of "Show" functions, so starting to offer post-modification. - void SetClickCallback(const char *id, void (*callback)(bool, void *)); + void SetClickCallback(const char *id, void (*callback)(bool, void *), void *userdata); struct Entry { OSDType type; diff --git a/GPU/Common/TextureReplacer.cpp b/GPU/Common/TextureReplacer.cpp index 53f7e716a8..5d03565f94 100644 --- a/GPU/Common/TextureReplacer.cpp +++ b/GPU/Common/TextureReplacer.cpp @@ -714,7 +714,7 @@ public: bool success = WriteTextureToPNG(&png, saveFilename, 0, rgbaData.data(), pitch, nullptr); png_image_free(&png); if (png.warning_or_error >= 2) { - ERROR_LOG(G3D, "Saving screenshot to PNG produced errors."); + ERROR_LOG(G3D, "Saving texture to PNG produced errors."); } else if (success) { NOTICE_LOG(G3D, "Saving texture for replacement: %08x / %dx%d in '%s'", replacedInfoHash, w, h, saveFilename.ToVisualString().c_str()); } else { diff --git a/UI/DevScreens.cpp b/UI/DevScreens.cpp index c37343b041..3c5aea442b 100644 --- a/UI/DevScreens.cpp +++ b/UI/DevScreens.cpp @@ -873,11 +873,11 @@ void SystemInfoScreen::CreateInternalsTab(UI::ViewGroup *internals) { // This one is clickable internals->Add(new Choice(si->T("Success")))->OnClick.Add([&](UI::EventParams &) { g_OSD.Show(OSDType::MESSAGE_SUCCESS, "Success", 0.0f, "clickable"); - g_OSD.SetClickCallback("clickable", [](bool clicked, void*) { + g_OSD.SetClickCallback("clickable", [](bool clicked, void *) { if (clicked) { System_LaunchUrl(LaunchUrlType::BROWSER_URL, "https://www.google.com/"); } - }); + }, nullptr); return UI::EVENT_DONE; }); internals->Add(new Choice(sy->T("RetroAchievements")))->OnClick.Add([&](UI::EventParams &) { diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp index 692201f107..3f022572c1 100644 --- a/UI/NativeApp.cpp +++ b/UI/NativeApp.cpp @@ -993,7 +993,17 @@ static void TakeScreenshot() { bool success = TakeGameScreenshot(filename, g_Config.bScreenshotsAsPNG ? ScreenshotFormat::PNG : ScreenshotFormat::JPG, SCREENSHOT_OUTPUT); if (success) { - g_OSD.Show(OSDType::MESSAGE_FILE_LINK, filename.ToString()); + g_OSD.Show(OSDType::MESSAGE_FILE_LINK, filename.ToString(), 0.0f, "screenshot_link"); + if (System_GetPropertyBool(SYSPROP_CAN_SHOW_FILE)) { + g_OSD.SetClickCallback("screenshot_link", [](bool clicked, void *data) -> void { + Path *path = reinterpret_cast(data); + if (clicked) { + System_ShowFileInFolder(*path); + } else { + delete path; + } + }, new Path(filename)); + } } else { auto err = GetI18NCategory(I18NCat::ERRORS); g_OSD.Show(OSDType::MESSAGE_ERROR, err->T("Could not save screenshot file")); From c20cb3f4be00491889c39b1b8eec614c5617f139 Mon Sep 17 00:00:00 2001 From: Herman Semenov Date: Wed, 10 Apr 2024 17:57:05 +0300 Subject: [PATCH 059/719] Minor optimize methods std::string using param as char with simpler implementation --- Common/Data/Format/IniFile.cpp | 6 +++--- Common/Data/Text/WrapText.cpp | 2 +- Common/File/AndroidContentURI.cpp | 6 +++--- Core/Debugger/Breakpoints.cpp | 4 ++-- Core/HLE/sceNp2.cpp | 2 +- Core/PSPLoaders.cpp | 2 +- Core/SaveState.cpp | 2 +- Core/Util/GameManager.cpp | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Common/Data/Format/IniFile.cpp b/Common/Data/Format/IniFile.cpp index 3455e6d5b2..43e3ca8822 100644 --- a/Common/Data/Format/IniFile.cpp +++ b/Common/Data/Format/IniFile.cpp @@ -328,20 +328,20 @@ bool Section::Get(const char* key, std::vector& values) const return false; } // ignore starting , if any - size_t subStart = temp.find_first_not_of(","); + size_t subStart = temp.find_first_not_of(','); size_t subEnd; // split by , while (subStart != std::string::npos) { // Find next , - subEnd = temp.find_first_of(",", subStart); + subEnd = temp.find_first_of(',', subStart); if (subStart != subEnd) // take from first char until next , values.push_back(StripSpaces(temp.substr(subStart, subEnd - subStart))); // Find the next non , char - subStart = temp.find_first_not_of(",", subEnd); + subStart = temp.find_first_not_of(',', subEnd); } return true; diff --git a/Common/Data/Text/WrapText.cpp b/Common/Data/Text/WrapText.cpp index 65989e7c0b..3f9474e8ca 100644 --- a/Common/Data/Text/WrapText.cpp +++ b/Common/Data/Text/WrapText.cpp @@ -153,7 +153,7 @@ void WordWrapper::AppendWord(int endIndex, int lastChar, bool addNewline) { x_ = 0.0f; } else { // We may have appended a newline - check. - size_t pos = out_.find_last_of("\n"); + size_t pos = out_.find_last_of('\n'); if (pos != out_.npos) { lastLineStart_ = pos + 1; } diff --git a/Common/File/AndroidContentURI.cpp b/Common/File/AndroidContentURI.cpp index 5c5a722218..e467367d07 100644 --- a/Common/File/AndroidContentURI.cpp +++ b/Common/File/AndroidContentURI.cpp @@ -114,7 +114,7 @@ bool AndroidContentURI::CanNavigateUp() const { // Only goes downwards in hierarchies. No ".." will ever be generated. bool AndroidContentURI::ComputePathTo(const AndroidContentURI &other, std::string &path) const { size_t offset = FilePath().size() + 1; - std::string otherFilePath = other.FilePath(); + const auto &otherFilePath = other.FilePath(); if (offset >= otherFilePath.size()) { ERROR_LOG(SYSTEM, "Bad call to PathTo. '%s' -> '%s'", FilePath().c_str(), other.FilePath().c_str()); return false; @@ -125,11 +125,11 @@ bool AndroidContentURI::ComputePathTo(const AndroidContentURI &other, std::strin } std::string AndroidContentURI::GetFileExtension() const { - size_t pos = file.rfind("."); + size_t pos = file.rfind('.'); if (pos == std::string::npos) { return ""; } - size_t slash_pos = file.rfind("/"); + size_t slash_pos = file.rfind('/'); if (slash_pos != std::string::npos && slash_pos > pos) { // Don't want to detect "df/file" from "/as.df/file" return ""; diff --git a/Core/Debugger/Breakpoints.cpp b/Core/Debugger/Breakpoints.cpp index 1789cb2c94..149adbcc6e 100644 --- a/Core/Debugger/Breakpoints.cpp +++ b/Core/Debugger/Breakpoints.cpp @@ -686,7 +686,7 @@ bool CBreakPoints::EvaluateLogFormat(DebugInterface *cpu, const std::string &fmt size_t pos = 0; while (pos < fmt.size()) { - size_t next = fmt.find_first_of("{", pos); + size_t next = fmt.find_first_of('{', pos); if (next == fmt.npos) { // End of the string. result += fmt.substr(pos); @@ -697,7 +697,7 @@ bool CBreakPoints::EvaluateLogFormat(DebugInterface *cpu, const std::string &fmt pos = next; } - size_t end = fmt.find_first_of("}", next + 1); + size_t end = fmt.find_first_of('}', next + 1); if (end == fmt.npos) { // Invalid: every expression needs a { and a }. return false; diff --git a/Core/HLE/sceNp2.cpp b/Core/HLE/sceNp2.cpp index 70b349145b..0bcd0968c5 100644 --- a/Core/HLE/sceNp2.cpp +++ b/Core/HLE/sceNp2.cpp @@ -219,7 +219,7 @@ static int sceNpMatching2ContextStart(int ctxId) text = entity.substr(ofs, ofs2 - ofs); INFO_LOG(SCENET, "%s - Agent-FQDN#%d Status: %s", __FUNCTION__, i, text.c_str()); - ofs = entity.find(">", ++ofs2); + ofs = entity.find('>', ++ofs2); if (ofs == std::string::npos) return hleLogError(SCENET, SCE_NP_COMMUNITY_SERVER_ERROR_NO_SUCH_TITLE, "agent host not found"); diff --git a/Core/PSPLoaders.cpp b/Core/PSPLoaders.cpp index e126310f2d..623bc6032a 100644 --- a/Core/PSPLoaders.cpp +++ b/Core/PSPLoaders.cpp @@ -436,7 +436,7 @@ bool Load_PSP_ELF_PBP(FileLoader *fileLoader, std::string *error_string) { std::string finalName = ms_path + file; std::string homebrewName = PSP_CoreParameter().fileToStart.ToVisualString(); - std::size_t lslash = homebrewName.find_last_of("/"); + std::size_t lslash = homebrewName.find_last_of('/'); #if PPSSPP_PLATFORM(UWP) if (lslash == homebrewName.npos) { lslash = homebrewName.find_last_of("\\"); diff --git a/Core/SaveState.cpp b/Core/SaveState.cpp index fdb283e577..771785fd98 100644 --- a/Core/SaveState.cpp +++ b/Core/SaveState.cpp @@ -988,7 +988,7 @@ namespace SaveState if (title.empty()) { // Homebrew title title = PSP_CoreParameter().fileToStart.ToVisualString(); - std::size_t lslash = title.find_last_of("/"); + std::size_t lslash = title.find_last_of('/'); title = title.substr(lslash + 1); } result = CChunkFileReader::Save(op.filename, title, PPSSPP_GIT_VERSION, state); diff --git a/Core/Util/GameManager.cpp b/Core/Util/GameManager.cpp index ebbcb74b60..c93c29477b 100644 --- a/Core/Util/GameManager.cpp +++ b/Core/Util/GameManager.cpp @@ -581,7 +581,7 @@ bool GameManager::InstallMemstickGame(struct zip *z, const Path &zipfile, const Path outFilename = dest / zippedName.substr(info.stripChars); bool isDir = zippedName.empty() || zippedName.back() == '/'; - if (!isDir && zippedName.find("/") != std::string::npos) { + if (!isDir && zippedName.find('/') != std::string::npos) { outFilename = dest / zippedName.substr(0, zippedName.rfind('/')); } else if (!isDir) { outFilename = dest; From 5b3be0d720752fb32eb54d4eaebc422b29f1873f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Wed, 10 Apr 2024 18:40:02 +0200 Subject: [PATCH 060/719] Update USE_FFMPEG checks --- Core/HLE/sceMpeg.cpp | 2 ++ Core/HW/SimpleAudioDec.cpp | 11 ++++++++++- Windows/CaptureDevice.cpp | 17 +++++++++++++++++ 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/Core/HLE/sceMpeg.cpp b/Core/HLE/sceMpeg.cpp index 8be78c73e0..b4e252208f 100644 --- a/Core/HLE/sceMpeg.cpp +++ b/Core/HLE/sceMpeg.cpp @@ -97,7 +97,9 @@ static const int MPEG_HEADER_BUFFER_MINIMUM_SIZE = 2048; // For PMP media static u32 pmp_videoSource = 0; //pointer to the video source (SceMpegLLi structure) static int pmp_nBlocks = 0; //number of blocks received in the last sceMpegBasePESpacketCopy call +#ifdef USE_FFMPEG static std::list pmp_queue; //list of pmp video frames have been decoded and will be played +#endif static std::list pmp_ContextList; //list of pmp media contexts static bool pmp_oldStateLoaded = false; // for dostate diff --git a/Core/HW/SimpleAudioDec.cpp b/Core/HW/SimpleAudioDec.cpp index 89ef22fed0..b6da4d59ff 100644 --- a/Core/HW/SimpleAudioDec.cpp +++ b/Core/HW/SimpleAudioDec.cpp @@ -38,6 +38,15 @@ extern "C" { #include "Core/FFMPEGCompat.h" } +#else + +extern "C" { + struct AVCodec; + struct AVCodecContext; + struct SwrContext; + struct AVFrame; +} + #endif // USE_FFMPEG // FFMPEG-based decoder. TODO: Replace with individual codecs. @@ -77,7 +86,7 @@ private: #if HAVE_LIBAVCODEC_CONST_AVCODEC // USE_FFMPEG is implied const #endif - AVCodec *codec_; + AVCodec *codec_; AVCodecContext *codecCtx_; SwrContext *swrCtx_; diff --git a/Windows/CaptureDevice.cpp b/Windows/CaptureDevice.cpp index 7b61fa6fa0..3e36c7eb7f 100644 --- a/Windows/CaptureDevice.cpp +++ b/Windows/CaptureDevice.cpp @@ -114,12 +114,14 @@ HRESULT GetDefaultStride(IMFMediaType *pType, LONG *plStride); ReaderCallback::ReaderCallback(WindowsCaptureDevice *_device) : device(_device) {} ReaderCallback::~ReaderCallback() { +#ifdef USE_FFMPEG if (img_convert_ctx) { sws_freeContext(img_convert_ctx); } if (resample_ctx) { swr_free(&resample_ctx); } +#endif } HRESULT ReaderCallback::QueryInterface(REFIID riid, void** ppv) @@ -179,6 +181,7 @@ HRESULT ReaderCallback::OnReadSample( srcPadding = device->deviceParam.default_stride - lStride; if (SUCCEEDED(hr)) { +#ifdef USE_FFMPEG // Convert image to RGB24 if (lStride > 0) { imgConvert( @@ -203,6 +206,7 @@ HRESULT ReaderCallback::OnReadSample( dstH, 3, device->imageRGB); +#endif } Camera::pushCameraImage(imgJpegSize, device->imageJpeg); } @@ -278,12 +282,14 @@ void ReaderCallback::imgConvert( unsigned char *dst, unsigned int &dstW, unsigned int &dstH, int dstLineSizes[4], unsigned char *src, const unsigned int &srcW, const unsigned int &srcH, const GUID &srcFormat, const int &srcPadding) { +#ifdef USE_FFMPEG int srcLineSizes[4] = { 0, 0, 0, 0 }; unsigned char *pSrc[4]; unsigned char *pDst[4]; AVPixelFormat srcAVFormat = getAVVideoFormatbyMFVideoFormat(srcFormat); + av_image_fill_linesizes(srcLineSizes, srcAVFormat, srcW); // Is this correct? @@ -322,9 +328,11 @@ void ReaderCallback::imgConvert( dstLineSizes ); } +#endif } void ReaderCallback::imgInvert(unsigned char *dst, unsigned char *src, const int &srcW, const int &srcH, const GUID &srcFormat, const int &srcStride) { +#ifdef USE_FFMPEG AVPixelFormat srcAvFormat = getAVVideoFormatbyMFVideoFormat(srcFormat); int dstLineSizes[4] = { 0, 0, 0, 0 }; @@ -338,6 +346,7 @@ void ReaderCallback::imgInvert(unsigned char *dst, unsigned char *src, const int imgInvertYUY2(dst, dstLineSizes[0], src, srcStride, srcH); else if (srcFormat == MFVideoFormat_NV12) imgInvertNV12(dst, dstLineSizes[0], src, srcStride, srcH);; +#endif } void ReaderCallback::imgInvertRGBA(unsigned char *dst, int &dstStride, unsigned char *src, const int &srcStride, const int &h) { @@ -392,6 +401,7 @@ void ReaderCallback::imgInvertNV12(unsigned char *dst, int &dstStride, unsigned } u32 ReaderCallback::doResample(u8 **dst, u32 &dstSampleRate, u32 &dstChannels, u32 *dstSize, u8 *src, const u32 &srcSampleRate, const u32 &srcChannels, const GUID &srcFormat, const u32& srcSize, const u32& srcBitsPerSample) { +#ifdef USE_FFMPEG AVSampleFormat srcAVFormat = getAVAudioFormatbyMFAudioFormat(srcFormat, srcBitsPerSample); int outSamplesCount = 0; if (resample_ctx == nullptr) { @@ -427,6 +437,9 @@ u32 ReaderCallback::doResample(u8 **dst, u32 &dstSampleRate, u32 &dstChannels, u if (outSamplesCount < 0) return 0; return av_samples_get_buffer_size(nullptr, dstChannels, outSamplesCount, AV_SAMPLE_FMT_S16, 0); +#else + return 0; +#endif } WindowsCaptureDevice::WindowsCaptureDevice(CAPTUREDEVIDE_TYPE _type) : @@ -450,6 +463,7 @@ WindowsCaptureDevice::WindowsCaptureDevice(CAPTUREDEVIDE_TYPE _type) : } WindowsCaptureDevice::~WindowsCaptureDevice() { +#ifdef USE_FFMPEG switch (type) { case CAPTUREDEVIDE_TYPE::VIDEO: av_freep(&imageRGB); @@ -459,6 +473,7 @@ WindowsCaptureDevice::~WindowsCaptureDevice() { av_freep(&resampleBuf); break; } +#endif } void WindowsCaptureDevice::CheckDevices() { @@ -555,6 +570,7 @@ bool WindowsCaptureDevice::start(void *startParam) { targetMediaParam.height = resolution->at(1); delete resolution; } +#ifdef USE_FFMPEG av_freep(&imageRGB); av_freep(&imageJpeg); @@ -562,6 +578,7 @@ bool WindowsCaptureDevice::start(void *startParam) { imgJpegSize = av_image_get_buffer_size(AV_PIX_FMT_YUVJ411P, targetMediaParam.width, targetMediaParam.height, 1); imageJpeg = (unsigned char*)av_malloc(imgJpegSize); av_image_fill_linesizes(imgRGBLineSizes, AV_PIX_FMT_RGB24, targetMediaParam.width); +#endif for (DWORD i = 0; ; i++) { hr = m_pReader->GetNativeMediaType( From f680b0bb8654731da0b089884fa3f4d00f4a5ee2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Wed, 10 Apr 2024 18:40:56 +0200 Subject: [PATCH 061/719] Set USE_FFMPEG in the Windows project (for CaptureDevice.cpp) --- Windows/PPSSPP.vcxproj | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Windows/PPSSPP.vcxproj b/Windows/PPSSPP.vcxproj index c9835d7268..7fd1101e82 100644 --- a/Windows/PPSSPP.vcxproj +++ b/Windows/PPSSPP.vcxproj @@ -231,7 +231,7 @@ - RC_CLIENT_SUPPORTS_RAINTEGRATION;_CRTDBG_MAP_ALLOC;USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_ARCH_32=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) + USE_FFMPEG;RC_CLIENT_SUPPORTS_RAINTEGRATION;_CRTDBG_MAP_ALLOC;USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_ARCH_32=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) false Sync Use @@ -271,7 +271,7 @@ false - RC_CLIENT_SUPPORTS_RAINTEGRATION;_CRTDBG_MAP_ALLOC;USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_ARCH_64=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) + USE_FFMPEG;RC_CLIENT_SUPPORTS_RAINTEGRATION;_CRTDBG_MAP_ALLOC;USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_ARCH_64=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) Sync Use Level3 @@ -307,7 +307,7 @@ false - _CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_ARCH_64=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) + USE_FFMPEG;_CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_ARCH_64=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) Sync Use Level3 @@ -343,7 +343,7 @@ false - _CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_ARCH_32=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) + USE_FFMPEG;_CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_ARCH_32=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) Use Level3 ProgramDatabase @@ -378,7 +378,7 @@ AnySuitable true Speed - RC_CLIENT_SUPPORTS_RAINTEGRATION;USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_ARCH_32=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) + USE_FFMPEG;RC_CLIENT_SUPPORTS_RAINTEGRATION;USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_ARCH_32=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) true Sync MultiThreaded @@ -428,7 +428,7 @@ true Speed false - RC_CLIENT_SUPPORTS_RAINTEGRATION;USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_ARCH_64=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) + USE_FFMPEG;RC_CLIENT_SUPPORTS_RAINTEGRATION;USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_ARCH_64=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) true Sync MultiThreaded @@ -471,7 +471,7 @@ true Speed false - USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_ARCH_64=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) + USE_FFMPEG;USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_ARCH_64=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) true Sync MultiThreaded @@ -513,7 +513,7 @@ true Speed false - USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_ARCH_32=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) + USE_FFMPEG;USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_ARCH_32=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) true Sync MultiThreaded From f625f18eba49458a758c7f192d7873cd5d26a49f Mon Sep 17 00:00:00 2001 From: Herman Semenov Date: Thu, 11 Apr 2024 14:52:55 +0300 Subject: [PATCH 062/719] [GPU/HLES] 'fs' its already NULL, removed excess delete and bufferState_ always ATRAC_STATUS_HALFWAY_BUFFER --- Core/HLE/sceAtrac.cpp | 3 +-- GPU/GLES/ShaderManagerGLES.cpp | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp index f83d9ffdf1..7fcfc949d5 100644 --- a/Core/HLE/sceAtrac.cpp +++ b/Core/HLE/sceAtrac.cpp @@ -1795,8 +1795,7 @@ static u32 sceAtracResetPlayPosition(int atracID, int sample, int bytesWrittenFi // Did we transition to a full buffer? if (atrac->first_.size >= atrac->first_.filesize) { atrac->first_.size = atrac->first_.filesize; - if (atrac->bufferState_ == ATRAC_STATUS_HALFWAY_BUFFER) - atrac->bufferState_ = ATRAC_STATUS_ALL_DATA_LOADED; + atrac->bufferState_ = ATRAC_STATUS_ALL_DATA_LOADED; } } else { if (bufferInfo.first.filePos > atrac->first_.filesize) { diff --git a/GPU/GLES/ShaderManagerGLES.cpp b/GPU/GLES/ShaderManagerGLES.cpp index dc36d8e114..431da419f4 100644 --- a/GPU/GLES/ShaderManagerGLES.cpp +++ b/GPU/GLES/ShaderManagerGLES.cpp @@ -1109,7 +1109,6 @@ bool ShaderManagerGLES::LoadCache(File::IOFile &f) { // Give up on using the cache, just bail. We can't safely create the fallback shaders here // without trying to deduce the vertType from the VSID. ERROR_LOG(G3D, "Failed to compile a vertex shader loading from cache. Skipping rest of shader cache."); - delete vs; pending.Clear(); return false; } @@ -1127,7 +1126,6 @@ bool ShaderManagerGLES::LoadCache(File::IOFile &f) { // Give up on using the cache - something went wrong. // We'll still keep the shaders we generated so far around. ERROR_LOG(G3D, "Failed to compile a fragment shader loading from cache. Skipping rest of shader cache."); - delete fs; pending.Clear(); return false; } From 3de85c8d14cae9764a010b3bf673ad47dd98f43e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Wed, 10 Apr 2024 13:26:50 +0200 Subject: [PATCH 063/719] Remove more unnecessary accessors --- Core/HLE/sceMp3.cpp | 5 +++-- Core/HLE/sceMp4.cpp | 5 +++-- Core/HW/SimpleAudioDec.cpp | 11 ----------- Core/HW/SimpleAudioDec.h | 4 ---- 4 files changed, 6 insertions(+), 19 deletions(-) diff --git a/Core/HLE/sceMp3.cpp b/Core/HLE/sceMp3.cpp index 6e21291c64..f73ea438aa 100644 --- a/Core/HLE/sceMp3.cpp +++ b/Core/HLE/sceMp3.cpp @@ -511,7 +511,7 @@ static int sceMp3GetLoopNum(u32 mp3) { return hleLogError(ME, ERROR_MP3_UNRESERVED_HANDLE, "incorrect handle type"); } - return hleLogSuccessI(ME, ctx->AuGetLoopNum()); + return hleLogSuccessI(ME, ctx->LoopNum); } static int sceMp3GetMaxOutputSample(u32 mp3) { @@ -555,7 +555,8 @@ static int sceMp3SetLoopNum(u32 mp3, int loop) { if (loop < 0) loop = -1; - return hleLogSuccessI(ME, ctx->AuSetLoopNum(loop)); + ctx->LoopNum = loop; + return hleLogSuccessI(ME, 0); } static int sceMp3GetMp3ChannelNum(u32 mp3) { diff --git a/Core/HLE/sceMp4.cpp b/Core/HLE/sceMp4.cpp index c804013641..a716e8fa78 100644 --- a/Core/HLE/sceMp4.cpp +++ b/Core/HLE/sceMp4.cpp @@ -301,7 +301,7 @@ static u32 sceAacGetLoopNum(u32 id) ERROR_LOG(ME, "%s: bad aac id %08x", __FUNCTION__, id); return -1; } - return ctx->AuGetLoopNum(); + return ctx->LoopNum; } static u32 sceAacSetLoopNum(u32 id, int loop) @@ -313,7 +313,8 @@ static u32 sceAacSetLoopNum(u32 id, int loop) return -1; } - return ctx->AuSetLoopNum(loop); + ctx->LoopNum = loop; + return 0; } static int sceAacCheckStreamDataNeeded(u32 id) diff --git a/Core/HW/SimpleAudioDec.cpp b/Core/HW/SimpleAudioDec.cpp index b6da4d59ff..f5732af453 100644 --- a/Core/HW/SimpleAudioDec.cpp +++ b/Core/HW/SimpleAudioDec.cpp @@ -458,17 +458,6 @@ u32 AuCtx::AuDecode(u32 pcmAddr) { return outpcmbufsize; } -u32 AuCtx::AuGetLoopNum() -{ - return LoopNum; -} - -u32 AuCtx::AuSetLoopNum(int loop) -{ - LoopNum = loop; - return 0; -} - // return 1 to read more data stream, 0 don't read int AuCtx::AuCheckStreamDataNeeded() { // If we would ask for bytes, then some are needed. diff --git a/Core/HW/SimpleAudioDec.h b/Core/HW/SimpleAudioDec.h index c23a57b97d..dd18ee60c2 100644 --- a/Core/HW/SimpleAudioDec.h +++ b/Core/HW/SimpleAudioDec.h @@ -73,10 +73,6 @@ public: int AuStreamWorkareaSize(); u32 AuResetPlayPosition(); u32 AuResetPlayPositionByFrame(int position); - - u32 AuSetLoopNum(int loop); - u32 AuGetLoopNum(); - u32 AuGetInfoToAddStreamData(u32 bufPtr, u32 sizePtr, u32 srcPosPtr); void SetReadPos(int pos) { readPos = pos; } From db929ea042c72b3fda26f6f78cd7948c3f785f13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Wed, 10 Apr 2024 13:45:45 +0200 Subject: [PATCH 064/719] Use minimp3 for in-game mp3 decoding. Doesn't solve any issues it seems, but works like before. --- Core/HW/SimpleAudioDec.cpp | 66 +++++++++++++++++++++++++++++++------- Core/HW/SimpleAudioDec.h | 6 ++-- libretro/Makefile.common | 3 ++ 3 files changed, 61 insertions(+), 14 deletions(-) diff --git a/Core/HW/SimpleAudioDec.cpp b/Core/HW/SimpleAudioDec.cpp index f5732af453..af5613db61 100644 --- a/Core/HW/SimpleAudioDec.cpp +++ b/Core/HW/SimpleAudioDec.cpp @@ -26,6 +26,8 @@ #include "Core/HW/MediaEngine.h" #include "Core/HW/BufferQueue.h" +#include "ext/minimp3/minimp3.h" + #ifdef USE_FFMPEG extern "C" { @@ -49,6 +51,44 @@ extern "C" { #endif // USE_FFMPEG +// minimp3-based decoder. +class MiniMp3Audio : public AudioDecoder { +public: + MiniMp3Audio() { + mp3dec_init(&mp3_); + } + ~MiniMp3Audio() {} + + bool Decode(const uint8_t* inbuf, int inbytes, uint8_t *outbuf, int *outbytes) override { + mp3dec_frame_info_t info{}; + int samplesWritten = mp3dec_decode_frame(&mp3_, inbuf, inbytes, (mp3d_sample_t *)outbuf, &info); + srcPos_ = info.frame_bytes; + *outbytes = samplesWritten * sizeof(mp3d_sample_t) * info.channels; + outSamples_ = samplesWritten * info.channels; + return true; + } + + bool IsOK() const override { return true; } + int GetOutSamples() const override { + return outSamples_; + } + int GetSourcePos() const override { + return srcPos_; + } + + void SetChannels(int channels) override { + // Hmm. ignore for now. + } + + PSPAudioType GetAudioType() const override { return PSP_CODEC_MP3; } + +private: + // We use the lowest-level API. + mp3dec_t mp3_{}; + int outSamples_ = 0; + int srcPos_ = 0; +}; + // FFMPEG-based decoder. TODO: Replace with individual codecs. class SimpleAudio : public AudioDecoder { public: @@ -56,7 +96,13 @@ public: ~SimpleAudio(); bool Decode(const uint8_t* inbuf, int inbytes, uint8_t *outbuf, int *outbytes) override; - bool IsOK() const override; + bool IsOK() const override { +#ifdef USE_FFMPEG + return codec_ != 0; +#else + return 0; +#endif + } int GetOutSamples() const override { return outSamples; @@ -67,11 +113,10 @@ public: // Not save stated, only used by UI. Used for ATRAC3 (non+) files. void SetExtraData(const uint8_t *data, int size, int wav_bytes_per_packet) override; - void SetChannels(int channels) override; // These two are only here because of save states. - PSPAudioType GetAudioType() const { return audioType; } + PSPAudioType GetAudioType() const override { return audioType; } private: bool OpenCodec(int block_align); @@ -95,7 +140,12 @@ private: // TODO: This should also be able to create other types of decoders. AudioDecoder *CreateAudioDecoder(PSPAudioType audioType, int sampleRateHz, int channels) { - return new SimpleAudio(audioType, sampleRateHz, channels); + switch (audioType) { + case PSP_CODEC_MP3: + return new MiniMp3Audio(); + default: + return new SimpleAudio(audioType, sampleRateHz, channels); + } } static int GetAudioCodecID(int audioType) { @@ -230,14 +280,6 @@ SimpleAudio::~SimpleAudio() { #endif // USE_FFMPEG } -bool SimpleAudio::IsOK() const { -#ifdef USE_FFMPEG - return codec_ != 0; -#else - return 0; -#endif -} - // Decodes a single input frame. bool SimpleAudio::Decode(const uint8_t *inbuf, int inbytes, uint8_t *outbuf, int *outbytes) { #ifdef USE_FFMPEG diff --git a/Core/HW/SimpleAudioDec.h b/Core/HW/SimpleAudioDec.h index dd18ee60c2..e4c2cf0116 100644 --- a/Core/HW/SimpleAudioDec.h +++ b/Core/HW/SimpleAudioDec.h @@ -37,15 +37,17 @@ class AudioDecoder { public: virtual ~AudioDecoder() {} + virtual PSPAudioType GetAudioType() const = 0; + virtual bool Decode(const uint8_t* inbuf, int inbytes, uint8_t *outbuf, int *outbytes) = 0; virtual bool IsOK() const = 0; + // These two are only ever called after Decode, so can initialize on first. virtual int GetOutSamples() const = 0; virtual int GetSourcePos() const = 0; - virtual PSPAudioType GetAudioType() const = 0; virtual void SetChannels(int channels) = 0; - virtual void SetExtraData(const uint8_t *data, int size, int wav_bytes_per_packet) = 0; + virtual void SetExtraData(const uint8_t *data, int size, int wav_bytes_per_packet) {} // Just metadata. void SetCtxPtr(uint32_t ptr) { ctxPtr = ptr; } diff --git a/libretro/Makefile.common b/libretro/Makefile.common index 117846e66e..d698f90632 100644 --- a/libretro/Makefile.common +++ b/libretro/Makefile.common @@ -171,6 +171,9 @@ endif SOURCES_C += $(LIBRETRODIR)/ext/glew/glew.c +SOURCES_C += \ + $(EXTDIR)/minimp3/minimp3.cpp + SOURCES_C += \ $(EXTDIR)/libkirk/AES.c \ $(EXTDIR)/libkirk/amctrl.c \ From 8d4716cab6f638f8380f110a551e8c3f4de06ad5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Wed, 10 Apr 2024 14:47:40 +0200 Subject: [PATCH 065/719] WIP: Add AT3/AT3plus files, get it to compile (though will fail to link if we use it) --- Common/Common.vcxproj | 37 + Common/Common.vcxproj.filters | 114 + Core/HW/SimpleAudioDec.cpp | 5 + ext/at3_standalone/README.txt | 1 + ext/at3_standalone/aac_defines.h | 114 + ext/at3_standalone/atrac.h | 99 + ext/at3_standalone/atrac3.c | 940 +++++ ext/at3_standalone/atrac3data.h | 141 + ext/at3_standalone/atrac3plus.c | 1814 +++++++++ ext/at3_standalone/atrac3plus.h | 240 ++ ext/at3_standalone/atrac3plus_data.h | 1914 +++++++++ ext/at3_standalone/atrac3plusdec.c | 402 ++ ext/at3_standalone/atrac3plusdsp.c | 645 +++ ext/at3_standalone/attributes.h | 0 ext/at3_standalone/avcodec.h | 5406 +++++++++++++++++++++++++ ext/at3_standalone/avfft.c | 178 + ext/at3_standalone/avfft.h | 118 + ext/at3_standalone/avutil.h | 343 ++ ext/at3_standalone/bswap.h | 108 + ext/at3_standalone/buffer.h | 274 ++ ext/at3_standalone/bytestream.h | 374 ++ ext/at3_standalone/channel_layout.h | 223 + ext/at3_standalone/common.h | 529 +++ ext/at3_standalone/compat.h | 23 + ext/at3_standalone/config.h | 3 + ext/at3_standalone/dct.c | 224 + ext/at3_standalone/dct.h | 68 + ext/at3_standalone/dict.h | 198 + ext/at3_standalone/error.h | 126 + ext/at3_standalone/fft.h | 172 + ext/at3_standalone/float_dsp.c | 466 +++ ext/at3_standalone/float_dsp.h | 186 + ext/at3_standalone/frame.h | 723 ++++ ext/at3_standalone/get_bits.h | 714 ++++ ext/at3_standalone/internal.h | 333 ++ ext/at3_standalone/intfloat.h | 77 + ext/at3_standalone/intreadwrite.h | 629 +++ ext/at3_standalone/libm.h | 471 +++ ext/at3_standalone/log.h | 359 ++ ext/at3_standalone/macros.h | 50 + ext/at3_standalone/mathematics.h | 165 + ext/at3_standalone/mathops.c | 26 + ext/at3_standalone/mathops.h | 251 ++ ext/at3_standalone/mem.h | 406 ++ ext/at3_standalone/pixfmt.h | 473 +++ ext/at3_standalone/rational.h | 173 + ext/at3_standalone/rdft.c | 135 + ext/at3_standalone/rdft.h | 74 + ext/at3_standalone/samplefmt.h | 271 ++ ext/at3_standalone/sinewin.c | 21 + ext/at3_standalone/sinewin.h | 65 + ext/at3_standalone/sinewin_tablegen.c | 24 + ext/at3_standalone/sinewin_tablegen.h | 79 + ext/at3_standalone/version.h | 128 + 54 files changed, 21132 insertions(+) create mode 100644 ext/at3_standalone/README.txt create mode 100644 ext/at3_standalone/aac_defines.h create mode 100644 ext/at3_standalone/atrac.h create mode 100644 ext/at3_standalone/atrac3.c create mode 100644 ext/at3_standalone/atrac3data.h create mode 100644 ext/at3_standalone/atrac3plus.c create mode 100644 ext/at3_standalone/atrac3plus.h create mode 100644 ext/at3_standalone/atrac3plus_data.h create mode 100644 ext/at3_standalone/atrac3plusdec.c create mode 100644 ext/at3_standalone/atrac3plusdsp.c create mode 100644 ext/at3_standalone/attributes.h create mode 100644 ext/at3_standalone/avcodec.h create mode 100644 ext/at3_standalone/avfft.c create mode 100644 ext/at3_standalone/avfft.h create mode 100644 ext/at3_standalone/avutil.h create mode 100644 ext/at3_standalone/bswap.h create mode 100644 ext/at3_standalone/buffer.h create mode 100644 ext/at3_standalone/bytestream.h create mode 100644 ext/at3_standalone/channel_layout.h create mode 100644 ext/at3_standalone/common.h create mode 100644 ext/at3_standalone/compat.h create mode 100644 ext/at3_standalone/config.h create mode 100644 ext/at3_standalone/dct.c create mode 100644 ext/at3_standalone/dct.h create mode 100644 ext/at3_standalone/dict.h create mode 100644 ext/at3_standalone/error.h create mode 100644 ext/at3_standalone/fft.h create mode 100644 ext/at3_standalone/float_dsp.c create mode 100644 ext/at3_standalone/float_dsp.h create mode 100644 ext/at3_standalone/frame.h create mode 100644 ext/at3_standalone/get_bits.h create mode 100644 ext/at3_standalone/internal.h create mode 100644 ext/at3_standalone/intfloat.h create mode 100644 ext/at3_standalone/intreadwrite.h create mode 100644 ext/at3_standalone/libm.h create mode 100644 ext/at3_standalone/log.h create mode 100644 ext/at3_standalone/macros.h create mode 100644 ext/at3_standalone/mathematics.h create mode 100644 ext/at3_standalone/mathops.c create mode 100644 ext/at3_standalone/mathops.h create mode 100644 ext/at3_standalone/mem.h create mode 100644 ext/at3_standalone/pixfmt.h create mode 100644 ext/at3_standalone/rational.h create mode 100644 ext/at3_standalone/rdft.c create mode 100644 ext/at3_standalone/rdft.h create mode 100644 ext/at3_standalone/samplefmt.h create mode 100644 ext/at3_standalone/sinewin.c create mode 100644 ext/at3_standalone/sinewin.h create mode 100644 ext/at3_standalone/sinewin_tablegen.c create mode 100644 ext/at3_standalone/sinewin_tablegen.h create mode 100644 ext/at3_standalone/version.h diff --git a/Common/Common.vcxproj b/Common/Common.vcxproj index 1bd39b7f62..b2d946738b 100644 --- a/Common/Common.vcxproj +++ b/Common/Common.vcxproj @@ -385,6 +385,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -584,6 +613,13 @@ + + + + + + + NotUsing @@ -1016,6 +1052,7 @@ + diff --git a/Common/Common.vcxproj.filters b/Common/Common.vcxproj.filters index 8345e4d18b..c7c8bb785d 100644 --- a/Common/Common.vcxproj.filters +++ b/Common/Common.vcxproj.filters @@ -524,6 +524,93 @@ ext\minimp3 + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + @@ -981,6 +1068,27 @@ ext\minimp3 + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + @@ -1094,11 +1202,17 @@ {83cd76d0-d1ac-4ed1-9bdc-11fb5a20e5d3} + + {586da66e-922a-4479-9dac-9d608a1b9183} + ext\libpng17 + + ext\at3_standalone + diff --git a/Core/HW/SimpleAudioDec.cpp b/Core/HW/SimpleAudioDec.cpp index af5613db61..a6bb246ae3 100644 --- a/Core/HW/SimpleAudioDec.cpp +++ b/Core/HW/SimpleAudioDec.cpp @@ -51,6 +51,11 @@ extern "C" { #endif // USE_FFMPEG +// AAC decoder candidates: +// * https://github.com/mstorsjo/fdk-aac/tree/master + + + // minimp3-based decoder. class MiniMp3Audio : public AudioDecoder { public: diff --git a/ext/at3_standalone/README.txt b/ext/at3_standalone/README.txt new file mode 100644 index 0000000000..640a77f8eb --- /dev/null +++ b/ext/at3_standalone/README.txt @@ -0,0 +1 @@ +This is the atrac3/atrac3+ decoders from ffmpeg, extracted to be standalone from ffmpeg. \ No newline at end of file diff --git a/ext/at3_standalone/aac_defines.h b/ext/at3_standalone/aac_defines.h new file mode 100644 index 0000000000..eff63b347c --- /dev/null +++ b/ext/at3_standalone/aac_defines.h @@ -0,0 +1,114 @@ +/* + * AAC defines + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVCODEC_AAC_DEFINES_H +#define AVCODEC_AAC_DEFINES_H + +#ifndef USE_FIXED +#define USE_FIXED 0 +#endif + +#if USE_FIXED + +#include "libavutil/softfloat.h" + +#define FFT_FLOAT 0 +#define FFT_FIXED_32 1 + +#define AAC_RENAME(x) x ## _fixed +#define AAC_RENAME_32(x) x ## _fixed_32 +typedef int INTFLOAT; +typedef int64_t INT64FLOAT; +typedef int16_t SHORTFLOAT; +typedef SoftFloat AAC_FLOAT; +typedef int AAC_SIGNE; +#define FIXR(a) ((int)((a) * 1 + 0.5)) +#define FIXR10(a) ((int)((a) * 1024.0 + 0.5)) +#define Q23(a) (int)((a) * 8388608.0 + 0.5) +#define Q30(x) (int)((x)*1073741824.0 + 0.5) +#define Q31(x) (int)((x)*2147483648.0 + 0.5) +#define RANGE15(x) x +#define GET_GAIN(x, y) (-(y) << (x)) + 1024 +#define AAC_MUL16(x, y) (int)(((int64_t)(x) * (y) + 0x8000) >> 16) +#define AAC_MUL26(x, y) (int)(((int64_t)(x) * (y) + 0x2000000) >> 26) +#define AAC_MUL30(x, y) (int)(((int64_t)(x) * (y) + 0x20000000) >> 30) +#define AAC_MUL31(x, y) (int)(((int64_t)(x) * (y) + 0x40000000) >> 31) +#define AAC_MADD28(x, y, a, b) (int)((((int64_t)(x) * (y)) + \ + ((int64_t)(a) * (b)) + \ + 0x8000000) >> 28) +#define AAC_MADD30(x, y, a, b) (int)((((int64_t)(x) * (y)) + \ + ((int64_t)(a) * (b)) + \ + 0x20000000) >> 30) +#define AAC_MADD30_V8(x, y, a, b, c, d, e, f) (int)((((int64_t)(x) * (y)) + \ + ((int64_t)(a) * (b)) + \ + ((int64_t)(c) * (d)) + \ + ((int64_t)(e) * (f)) + \ + 0x20000000) >> 30) +#define AAC_MSUB30(x, y, a, b) (int)((((int64_t)(x) * (y)) - \ + ((int64_t)(a) * (b)) + \ + 0x20000000) >> 30) +#define AAC_MSUB30_V8(x, y, a, b, c, d, e, f) (int)((((int64_t)(x) * (y)) + \ + ((int64_t)(a) * (b)) - \ + ((int64_t)(c) * (d)) - \ + ((int64_t)(e) * (f)) + \ + 0x20000000) >> 30) +#define AAC_MSUB31_V3(x, y, z) (int)((((int64_t)(x) * (z)) - \ + ((int64_t)(y) * (z)) + \ + 0x40000000) >> 31) +#define AAC_HALF_SUM(x, y) (x) >> 1 + (y) >> 1 +#define AAC_SRA_R(x, y) (int)(((x) + (1 << ((y) - 1))) >> (y)) + +#else + +#define FFT_FLOAT 1 +#define FFT_FIXED_32 0 + +#define AAC_RENAME(x) x +#define AAC_RENAME_32(x) x +typedef float INTFLOAT; +typedef float INT64FLOAT; +typedef float SHORTFLOAT; +typedef float AAC_FLOAT; +typedef unsigned AAC_SIGNE; +#define FIXR(x) ((float)(x)) +#define FIXR10(x) ((float)(x)) +#define Q23(x) x +#define Q30(x) x +#define Q31(x) x +#define RANGE15(x) (32768.0 * (x)) +#define GET_GAIN(x, y) powf((x), -(y)) +#define AAC_MUL16(x, y) ((x) * (y)) +#define AAC_MUL26(x, y) ((x) * (y)) +#define AAC_MUL30(x, y) ((x) * (y)) +#define AAC_MUL31(x, y) ((x) * (y)) +#define AAC_MADD28(x, y, a, b) ((x) * (y) + (a) * (b)) +#define AAC_MADD30(x, y, a, b) ((x) * (y) + (a) * (b)) +#define AAC_MADD30_V8(x, y, a, b, c, d, e, f) ((x) * (y) + (a) * (b) + \ + (c) * (d) + (e) * (f)) +#define AAC_MSUB30(x, y, a, b) ((x) * (y) - (a) * (b)) +#define AAC_MSUB30_V8(x, y, a, b, c, d, e, f) ((x) * (y) + (a) * (b) - \ + (c) * (d) - (e) * (f)) +#define AAC_MSUB31_V3(x, y, z) ((x) - (y)) * (z) +#define AAC_HALF_SUM(x, y) ((x) + (y)) * 0.5f +#define AAC_SRA_R(x, y) (x) + +#endif /* USE_FIXED */ + +#endif /* AVCODEC_AAC_DEFINES_H */ diff --git a/ext/at3_standalone/atrac.h b/ext/at3_standalone/atrac.h new file mode 100644 index 0000000000..960c0e1185 --- /dev/null +++ b/ext/at3_standalone/atrac.h @@ -0,0 +1,99 @@ +/* + * common functions for the ATRAC family of decoders + * + * Copyright (c) 2009-2013 Maxim Poliakovski + * Copyright (c) 2009 Benjamin Larsson + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + * ATRAC common header + */ + +#include "ext/at3_standalone/compat.h" + +#ifndef AVCODEC_ATRAC_H +#define AVCODEC_ATRAC_H + +/** + * Gain control parameters for one subband. + */ +typedef struct AtracGainInfo { + int num_points; ///< number of gain control points + int lev_code[7]; ///< level at corresponding control point + int loc_code[7]; ///< location of gain control points +} AtracGainInfo; + +/** + * Gain compensation context structure. + */ +typedef struct AtracGCContext { + float gain_tab1[16]; ///< gain compensation level table + float gain_tab2[31]; ///< gain compensation interpolation table + int id2exp_offset; ///< offset for converting level index into level exponent + int loc_scale; ///< scale of location code = 2^loc_scale samples + int loc_size; ///< size of location code in samples +} AtracGCContext; + +extern float ff_atrac_sf_table[64]; + +/** + * Generate common tables. + */ +void ff_atrac_generate_tables(void); + +/** + * Initialize gain compensation context. + * + * @param gctx pointer to gain compensation context to initialize + * @param id2exp_offset offset for converting level index into level exponent + * @param loc_scale location size factor + */ +void ff_atrac_init_gain_compensation(AtracGCContext *gctx, int id2exp_offset, + int loc_scale); + +/** + * Apply gain compensation and perform the MDCT overlapping part. + * + * @param gctx pointer to gain compensation context + * @param in input buffer + * @param prev previous buffer to perform overlap against + * @param gc_now gain control information for current frame + * @param gc_next gain control information for next frame + * @param num_samples number of samples to process + * @param out output data goes here + */ +void ff_atrac_gain_compensation(AtracGCContext *gctx, float *in, float *prev, + AtracGainInfo *gc_now, AtracGainInfo *gc_next, + int num_samples, float *out); + +/** + * Quadrature mirror synthesis filter. + * + * @param inlo lower part of spectrum + * @param inhi higher part of spectrum + * @param nIn size of spectrum buffer + * @param pOut out buffer + * @param delayBuf delayBuf buffer + * @param temp temp buffer + */ +void ff_atrac_iqmf(float *inlo, float *inhi, unsigned int nIn, float *pOut, + float *delayBuf, float *temp); + +#endif /* AVCODEC_ATRAC_H */ diff --git a/ext/at3_standalone/atrac3.c b/ext/at3_standalone/atrac3.c new file mode 100644 index 0000000000..55f2f2da0c --- /dev/null +++ b/ext/at3_standalone/atrac3.c @@ -0,0 +1,940 @@ +/* + * ATRAC3 compatible decoder + * Copyright (c) 2006-2008 Maxim Poliakovski + * Copyright (c) 2006-2008 Benjamin Larsson + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + * ATRAC3 compatible decoder. + * This decoder handles Sony's ATRAC3 data. + * + * Container formats used to store ATRAC3 data: + * RealMedia (.rm), RIFF WAV (.wav, .at3), Sony OpenMG (.oma, .aa3). + * + * To use this decoder, a calling application must supply the extradata + * bytes provided in the containers above. + */ +#define _USE_MATH_DEFINES + +#include +#include +#include + +#include "float_dsp.h" +#include "bytestream.h" +#include "fft.h" +#include "get_bits.h" + +#include "avcodec.h" +#include "atrac.h" +#include "atrac3data.h" + +#define JOINT_STEREO 0x12 +#define STEREO 0x2 + +#define SAMPLES_PER_FRAME 1024 +#define MDCT_SIZE 512 + +typedef struct GainBlock { + AtracGainInfo g_block[4]; +} GainBlock; + +typedef struct TonalComponent { + int pos; + int num_coefs; + float coef[8]; +} TonalComponent; + +typedef struct ChannelUnit { + int bands_coded; + int num_components; + float prev_frame[SAMPLES_PER_FRAME]; + int gc_blk_switch; + TonalComponent components[64]; + GainBlock gain_block[2]; + + DECLARE_ALIGNED(32, float, spectrum)[SAMPLES_PER_FRAME]; + DECLARE_ALIGNED(32, float, imdct_buf)[SAMPLES_PER_FRAME]; + + float delay_buf1[46]; ///mdct_ctx.imdct_calc(&q->mdct_ctx, output, input); + + /* Perform windowing on the output. */ + q->fdsp->vector_fmul(output, output, mdct_window, MDCT_SIZE); +} + +/* + * indata descrambling, only used for data coming from the rm container + */ +static int decode_bytes(const uint8_t *input, uint8_t *out, int bytes) +{ + int i, off; + uint32_t c; + const uint32_t *buf; + uint32_t *output = (uint32_t *)out; + + off = (intptr_t)input & 3; + buf = (const uint32_t *)(input - off); + if (off) + c = av_be2ne32((0x537F6103U >> (off * 8)) | (0x537F6103U << (32 - (off * 8)))); + else + c = av_be2ne32(0x537F6103U); + bytes += 3 + off; + for (i = 0; i < bytes / 4; i++) + output[i] = c ^ buf[i]; + + if (off) + avpriv_request_sample(NULL, "Offset of %d", off); + + return off; +} + +static av_cold void init_imdct_window(void) +{ + int i, j; + + /* generate the mdct window, for details see + * http://wiki.multimedia.cx/index.php?title=RealAudio_atrc#Windows */ + for (i = 0, j = 255; i < 128; i++, j--) { + float wi = sin(((i + 0.5) / 256.0 - 0.5) * M_PI) + 1.0; + float wj = sin(((j + 0.5) / 256.0 - 0.5) * M_PI) + 1.0; + float w = 0.5 * (wi * wi + wj * wj); + mdct_window[i] = mdct_window[511 - i] = wi / w; + mdct_window[j] = mdct_window[511 - j] = wj / w; + } +} + +static av_cold int atrac3_decode_close(AVCodecContext *avctx) +{ + ATRAC3Context *q = avctx->priv_data; + + av_freep(&q->units); + av_freep(&q->decoded_bytes_buffer); + av_freep(&q->fdsp); + + ff_mdct_end(&q->mdct_ctx); + + return 0; +} + +/** + * Mantissa decoding + * + * @param selector which table the output values are coded with + * @param coding_flag constant length coding or variable length coding + * @param mantissas mantissa output table + * @param num_codes number of values to get + */ +static void read_quant_spectral_coeffs(GetBitContext *gb, int selector, + int coding_flag, int *mantissas, + int num_codes) +{ + int i, code, huff_symb; + + if (selector == 1) + num_codes /= 2; + + if (coding_flag != 0) { + /* constant length coding (CLC) */ + int num_bits = clc_length_tab[selector]; + + if (selector > 1) { + for (i = 0; i < num_codes; i++) { + if (num_bits) + code = get_sbits(gb, num_bits); + else + code = 0; + mantissas[i] = code; + } + } else { + for (i = 0; i < num_codes; i++) { + if (num_bits) + code = get_bits(gb, num_bits); // num_bits is always 4 in this case + else + code = 0; + mantissas[i * 2 ] = mantissa_clc_tab[code >> 2]; + mantissas[i * 2 + 1] = mantissa_clc_tab[code & 3]; + } + } + } else { + /* variable length coding (VLC) */ + if (selector != 1) { + for (i = 0; i < num_codes; i++) { + huff_symb = get_vlc2(gb, spectral_coeff_tab[selector-1].table, + spectral_coeff_tab[selector-1].bits, 3); + huff_symb += 1; + code = huff_symb >> 1; + if (huff_symb & 1) + code = -code; + mantissas[i] = code; + } + } else { + for (i = 0; i < num_codes; i++) { + huff_symb = get_vlc2(gb, spectral_coeff_tab[selector - 1].table, + spectral_coeff_tab[selector - 1].bits, 3); + mantissas[i * 2 ] = mantissa_vlc_tab[huff_symb * 2 ]; + mantissas[i * 2 + 1] = mantissa_vlc_tab[huff_symb * 2 + 1]; + } + } + } +} + +/** + * Restore the quantized band spectrum coefficients + * + * @return subband count, fix for broken specification/files + */ +static int decode_spectrum(GetBitContext *gb, float *output) +{ + int num_subbands, coding_mode, i, j, first, last, subband_size; + int subband_vlc_index[32], sf_index[32]; + int mantissas[128]; + float scale_factor; + + num_subbands = get_bits(gb, 5); // number of coded subbands + coding_mode = get_bits1(gb); // coding Mode: 0 - VLC/ 1-CLC + + /* get the VLC selector table for the subbands, 0 means not coded */ + for (i = 0; i <= num_subbands; i++) + subband_vlc_index[i] = get_bits(gb, 3); + + /* read the scale factor indexes from the stream */ + for (i = 0; i <= num_subbands; i++) { + if (subband_vlc_index[i] != 0) + sf_index[i] = get_bits(gb, 6); + } + + for (i = 0; i <= num_subbands; i++) { + first = subband_tab[i ]; + last = subband_tab[i + 1]; + + subband_size = last - first; + + if (subband_vlc_index[i] != 0) { + /* decode spectral coefficients for this subband */ + /* TODO: This can be done faster is several blocks share the + * same VLC selector (subband_vlc_index) */ + read_quant_spectral_coeffs(gb, subband_vlc_index[i], coding_mode, + mantissas, subband_size); + + /* decode the scale factor for this subband */ + scale_factor = ff_atrac_sf_table[sf_index[i]] * + inv_max_quant[subband_vlc_index[i]]; + + /* inverse quantize the coefficients */ + for (j = 0; first < last; first++, j++) + output[first] = mantissas[j] * scale_factor; + } else { + /* this subband was not coded, so zero the entire subband */ + memset(output + first, 0, subband_size * sizeof(*output)); + } + } + + /* clear the subbands that were not coded */ + first = subband_tab[i]; + memset(output + first, 0, (SAMPLES_PER_FRAME - first) * sizeof(*output)); + return num_subbands; +} + +/** + * Restore the quantized tonal components + * + * @param components tonal components + * @param num_bands number of coded bands + */ +static int decode_tonal_components(GetBitContext *gb, + TonalComponent *components, int num_bands) +{ + int i, b, c, m; + int nb_components, coding_mode_selector, coding_mode; + int band_flags[4], mantissa[8]; + int component_count = 0; + + nb_components = get_bits(gb, 5); + + /* no tonal components */ + if (nb_components == 0) + return 0; + + coding_mode_selector = get_bits(gb, 2); + if (coding_mode_selector == 2) + return AVERROR_INVALIDDATA; + + coding_mode = coding_mode_selector & 1; + + for (i = 0; i < nb_components; i++) { + int coded_values_per_component, quant_step_index; + + for (b = 0; b <= num_bands; b++) + band_flags[b] = get_bits1(gb); + + coded_values_per_component = get_bits(gb, 3); + + quant_step_index = get_bits(gb, 3); + if (quant_step_index <= 1) + return AVERROR_INVALIDDATA; + + if (coding_mode_selector == 3) + coding_mode = get_bits1(gb); + + for (b = 0; b < (num_bands + 1) * 4; b++) { + int coded_components; + + if (band_flags[b >> 2] == 0) + continue; + + coded_components = get_bits(gb, 3); + + for (c = 0; c < coded_components; c++) { + TonalComponent *cmp = &components[component_count]; + int sf_index, coded_values, max_coded_values; + float scale_factor; + + sf_index = get_bits(gb, 6); + if (component_count >= 64) + return AVERROR_INVALIDDATA; + + cmp->pos = b * 64 + get_bits(gb, 6); + + max_coded_values = SAMPLES_PER_FRAME - cmp->pos; + coded_values = coded_values_per_component + 1; + coded_values = FFMIN(max_coded_values, coded_values); + + scale_factor = ff_atrac_sf_table[sf_index] * + inv_max_quant[quant_step_index]; + + read_quant_spectral_coeffs(gb, quant_step_index, coding_mode, + mantissa, coded_values); + + cmp->num_coefs = coded_values; + + /* inverse quant */ + for (m = 0; m < coded_values; m++) + cmp->coef[m] = mantissa[m] * scale_factor; + + component_count++; + } + } + } + + return component_count; +} + +/** + * Decode gain parameters for the coded bands + * + * @param block the gainblock for the current band + * @param num_bands amount of coded bands + */ +static int decode_gain_control(GetBitContext *gb, GainBlock *block, + int num_bands) +{ + int b, j; + int *level, *loc; + + AtracGainInfo *gain = block->g_block; + + for (b = 0; b <= num_bands; b++) { + gain[b].num_points = get_bits(gb, 3); + level = gain[b].lev_code; + loc = gain[b].loc_code; + + for (j = 0; j < gain[b].num_points; j++) { + level[j] = get_bits(gb, 4); + loc[j] = get_bits(gb, 5); + if (j && loc[j] <= loc[j - 1]) + return AVERROR_INVALIDDATA; + } + } + + /* Clear the unused blocks. */ + for (; b < 4 ; b++) + gain[b].num_points = 0; + + return 0; +} + +/** + * Combine the tonal band spectrum and regular band spectrum + * + * @param spectrum output spectrum buffer + * @param num_components number of tonal components + * @param components tonal components for this band + * @return position of the last tonal coefficient + */ +static int add_tonal_components(float *spectrum, int num_components, + TonalComponent *components) +{ + int i, j, last_pos = -1; + float *input, *output; + + for (i = 0; i < num_components; i++) { + last_pos = FFMAX(components[i].pos + components[i].num_coefs, last_pos); + input = components[i].coef; + output = &spectrum[components[i].pos]; + + for (j = 0; j < components[i].num_coefs; j++) + output[j] += input[j]; + } + + return last_pos; +} + +#define INTERPOLATE(old, new, nsample) \ + ((old) + (nsample) * 0.125 * ((new) - (old))) + +static void reverse_matrixing(float *su1, float *su2, int *prev_code, + int *curr_code) +{ + int i, nsample, band; + float mc1_l, mc1_r, mc2_l, mc2_r; + + for (i = 0, band = 0; band < 4 * 256; band += 256, i++) { + int s1 = prev_code[i]; + int s2 = curr_code[i]; + nsample = band; + + if (s1 != s2) { + /* Selector value changed, interpolation needed. */ + mc1_l = matrix_coeffs[s1 * 2 ]; + mc1_r = matrix_coeffs[s1 * 2 + 1]; + mc2_l = matrix_coeffs[s2 * 2 ]; + mc2_r = matrix_coeffs[s2 * 2 + 1]; + + /* Interpolation is done over the first eight samples. */ + for (; nsample < band + 8; nsample++) { + float c1 = su1[nsample]; + float c2 = su2[nsample]; + c2 = c1 * INTERPOLATE(mc1_l, mc2_l, nsample - band) + + c2 * INTERPOLATE(mc1_r, mc2_r, nsample - band); + su1[nsample] = c2; + su2[nsample] = c1 * 2.0 - c2; + } + } + + /* Apply the matrix without interpolation. */ + switch (s2) { + case 0: /* M/S decoding */ + for (; nsample < band + 256; nsample++) { + float c1 = su1[nsample]; + float c2 = su2[nsample]; + su1[nsample] = c2 * 2.0; + su2[nsample] = (c1 - c2) * 2.0; + } + break; + case 1: + for (; nsample < band + 256; nsample++) { + float c1 = su1[nsample]; + float c2 = su2[nsample]; + su1[nsample] = (c1 + c2) * 2.0; + su2[nsample] = c2 * -2.0; + } + break; + case 2: + case 3: + for (; nsample < band + 256; nsample++) { + float c1 = su1[nsample]; + float c2 = su2[nsample]; + su1[nsample] = c1 + c2; + su2[nsample] = c1 - c2; + } + break; + default: + av_assert1(0); + } + } +} + +static void get_channel_weights(int index, int flag, float ch[2]) +{ + if (index == 7) { + ch[0] = 1.0; + ch[1] = 1.0; + } else { + ch[0] = (index & 7) / 7.0; + ch[1] = sqrt(2 - ch[0] * ch[0]); + if (flag) + FFSWAP(float, ch[0], ch[1]); + } +} + +static void channel_weighting(float *su1, float *su2, int *p3) +{ + int band, nsample; + /* w[x][y] y=0 is left y=1 is right */ + float w[2][2]; + + if (p3[1] != 7 || p3[3] != 7) { + get_channel_weights(p3[1], p3[0], w[0]); + get_channel_weights(p3[3], p3[2], w[1]); + + for (band = 256; band < 4 * 256; band += 256) { + for (nsample = band; nsample < band + 8; nsample++) { + su1[nsample] *= INTERPOLATE(w[0][0], w[0][1], nsample - band); + su2[nsample] *= INTERPOLATE(w[1][0], w[1][1], nsample - band); + } + for(; nsample < band + 256; nsample++) { + su1[nsample] *= w[1][0]; + su2[nsample] *= w[1][1]; + } + } + } +} + +/** + * Decode a Sound Unit + * + * @param snd the channel unit to be used + * @param output the decoded samples before IQMF in float representation + * @param channel_num channel number + * @param coding_mode the coding mode (JOINT_STEREO or regular stereo/mono) + */ +static int decode_channel_sound_unit(ATRAC3Context *q, GetBitContext *gb, + ChannelUnit *snd, float *output, + int channel_num, int coding_mode) +{ + int band, ret, num_subbands, last_tonal, num_bands; + GainBlock *gain1 = &snd->gain_block[ snd->gc_blk_switch]; + GainBlock *gain2 = &snd->gain_block[1 - snd->gc_blk_switch]; + + if (coding_mode == JOINT_STEREO && channel_num == 1) { + if (get_bits(gb, 2) != 3) { + av_log(NULL,AV_LOG_ERROR,"JS mono Sound Unit id != 3.\n"); + return AVERROR_INVALIDDATA; + } + } else { + if (get_bits(gb, 6) != 0x28) { + av_log(NULL,AV_LOG_ERROR,"Sound Unit id != 0x28.\n"); + return AVERROR_INVALIDDATA; + } + } + + /* number of coded QMF bands */ + snd->bands_coded = get_bits(gb, 2); + + ret = decode_gain_control(gb, gain2, snd->bands_coded); + if (ret) + return ret; + + snd->num_components = decode_tonal_components(gb, snd->components, + snd->bands_coded); + if (snd->num_components < 0) + return snd->num_components; + + num_subbands = decode_spectrum(gb, snd->spectrum); + + /* Merge the decoded spectrum and tonal components. */ + last_tonal = add_tonal_components(snd->spectrum, snd->num_components, + snd->components); + + + /* calculate number of used MLT/QMF bands according to the amount of coded + spectral lines */ + num_bands = (subband_tab[num_subbands] - 1) >> 8; + if (last_tonal >= 0) + num_bands = FFMAX((last_tonal + 256) >> 8, num_bands); + + + /* Reconstruct time domain samples. */ + for (band = 0; band < 4; band++) { + /* Perform the IMDCT step without overlapping. */ + if (band <= num_bands) + imlt(q, &snd->spectrum[band * 256], snd->imdct_buf, band & 1); + else + memset(snd->imdct_buf, 0, 512 * sizeof(*snd->imdct_buf)); + + /* gain compensation and overlapping */ + ff_atrac_gain_compensation(&q->gainc_ctx, snd->imdct_buf, + &snd->prev_frame[band * 256], + &gain1->g_block[band], &gain2->g_block[band], + 256, &output[band * 256]); + } + + /* Swap the gain control buffers for the next frame. */ + snd->gc_blk_switch ^= 1; + + return 0; +} + +static int decode_frame(AVCodecContext *avctx, const uint8_t *databuf, + float **out_samples) +{ + ATRAC3Context *q = avctx->priv_data; + int ret, i; + uint8_t *ptr1; + + if (q->coding_mode == JOINT_STEREO) { + /* channel coupling mode */ + /* decode Sound Unit 1 */ + init_get_bits(&q->gb, databuf, avctx->block_align * 8); + + ret = decode_channel_sound_unit(q, &q->gb, q->units, out_samples[0], 0, + JOINT_STEREO); + if (ret != 0) + return ret; + + /* Framedata of the su2 in the joint-stereo mode is encoded in + * reverse byte order so we need to swap it first. */ + if (databuf == q->decoded_bytes_buffer) { + uint8_t *ptr2 = q->decoded_bytes_buffer + avctx->block_align - 1; + ptr1 = q->decoded_bytes_buffer; + for (i = 0; i < avctx->block_align / 2; i++, ptr1++, ptr2--) + FFSWAP(uint8_t, *ptr1, *ptr2); + } else { + const uint8_t *ptr2 = databuf + avctx->block_align - 1; + for (i = 0; i < avctx->block_align; i++) + q->decoded_bytes_buffer[i] = *ptr2--; + } + + /* Skip the sync codes (0xF8). */ + ptr1 = q->decoded_bytes_buffer; + for (i = 4; *ptr1 == 0xF8; i++, ptr1++) { + if (i >= avctx->block_align) + return AVERROR_INVALIDDATA; + } + + + /* set the bitstream reader at the start of the second Sound Unit*/ + init_get_bits8(&q->gb, ptr1, q->decoded_bytes_buffer + avctx->block_align - ptr1); + + /* Fill the Weighting coeffs delay buffer */ + memmove(q->weighting_delay, &q->weighting_delay[2], + 4 * sizeof(*q->weighting_delay)); + q->weighting_delay[4] = get_bits1(&q->gb); + q->weighting_delay[5] = get_bits(&q->gb, 3); + + for (i = 0; i < 4; i++) { + q->matrix_coeff_index_prev[i] = q->matrix_coeff_index_now[i]; + q->matrix_coeff_index_now[i] = q->matrix_coeff_index_next[i]; + q->matrix_coeff_index_next[i] = get_bits(&q->gb, 2); + } + + /* Decode Sound Unit 2. */ + ret = decode_channel_sound_unit(q, &q->gb, &q->units[1], + out_samples[1], 1, JOINT_STEREO); + if (ret != 0) + return ret; + + /* Reconstruct the channel coefficients. */ + reverse_matrixing(out_samples[0], out_samples[1], + q->matrix_coeff_index_prev, + q->matrix_coeff_index_now); + + channel_weighting(out_samples[0], out_samples[1], q->weighting_delay); + } else { + /* normal stereo mode or mono */ + /* Decode the channel sound units. */ + for (i = 0; i < avctx->channels; i++) { + /* Set the bitstream reader at the start of a channel sound unit. */ + init_get_bits(&q->gb, + databuf + i * avctx->block_align / avctx->channels, + avctx->block_align * 8 / avctx->channels); + + ret = decode_channel_sound_unit(q, &q->gb, &q->units[i], + out_samples[i], i, q->coding_mode); + if (ret != 0) + return ret; + } + } + + /* Apply the iQMF synthesis filter. */ + for (i = 0; i < avctx->channels; i++) { + float *p1 = out_samples[i]; + float *p2 = p1 + 256; + float *p3 = p2 + 256; + float *p4 = p3 + 256; + ff_atrac_iqmf(p1, p2, 256, p1, q->units[i].delay_buf1, q->temp_buf); + ff_atrac_iqmf(p4, p3, 256, p3, q->units[i].delay_buf2, q->temp_buf); + ff_atrac_iqmf(p1, p3, 512, p1, q->units[i].delay_buf3, q->temp_buf); + } + + return 0; +} + +static int atrac3_decode_frame(AVCodecContext *avctx, void *data, + int *got_frame_ptr, AVPacket *avpkt) +{ + AVFrame *frame = data; + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; + ATRAC3Context *q = avctx->priv_data; + int ret; + const uint8_t *databuf; + + if (buf_size < avctx->block_align) { + av_log(avctx, AV_LOG_ERROR, + "Frame too small (%d bytes). Truncated file?\n", buf_size); + return AVERROR_INVALIDDATA; + } + + /* get output buffer */ + frame->nb_samples = SAMPLES_PER_FRAME; + if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) + return ret; + + /* Check if we need to descramble and what buffer to pass on. */ + if (q->scrambled_stream) { + decode_bytes(buf, q->decoded_bytes_buffer, avctx->block_align); + databuf = q->decoded_bytes_buffer; + } else { + databuf = buf; + } + + ret = decode_frame(avctx, databuf, (float **)frame->extended_data); + if (ret) { + av_log(NULL, AV_LOG_ERROR, "Frame decoding error!\n"); + return ret; + } + + *got_frame_ptr = 1; + + return avctx->block_align; +} + +static av_cold void atrac3_init_static_data(void) +{ + int i; + + init_imdct_window(); + ff_atrac_generate_tables(); + + /* Initialize the VLC tables. */ + for (i = 0; i < 7; i++) { + spectral_coeff_tab[i].table = &atrac3_vlc_table[atrac3_vlc_offs[i]]; + spectral_coeff_tab[i].table_allocated = atrac3_vlc_offs[i + 1] - + atrac3_vlc_offs[i ]; + init_vlc(&spectral_coeff_tab[i], 9, huff_tab_sizes[i], + huff_bits[i], 1, 1, + huff_codes[i], 1, 1, INIT_VLC_USE_NEW_STATIC); + } +} + +static av_cold int atrac3_decode_init(AVCodecContext *avctx) +{ + static int static_init_done; + int i, ret; + int version, delay, samples_per_frame, frame_factor; + const uint8_t *edata_ptr = avctx->extradata; + ATRAC3Context *q = avctx->priv_data; + + if (avctx->channels <= 0 || avctx->channels > 2) { + av_log(avctx, AV_LOG_ERROR, "Channel configuration error!\n"); + return AVERROR(EINVAL); + } + + if (!static_init_done) + atrac3_init_static_data(); + static_init_done = 1; + + /* Take care of the codec-specific extradata. */ + if (avctx->extradata_size == 14) { + /* Parse the extradata, WAV format */ + av_log(avctx, AV_LOG_DEBUG, "[0-1] %d\n", + bytestream_get_le16(&edata_ptr)); // Unknown value always 1 + edata_ptr += 4; // samples per channel + q->coding_mode = bytestream_get_le16(&edata_ptr); + av_log(avctx, AV_LOG_DEBUG,"[8-9] %d\n", + bytestream_get_le16(&edata_ptr)); //Dupe of coding mode + frame_factor = bytestream_get_le16(&edata_ptr); // Unknown always 1 + av_log(avctx, AV_LOG_DEBUG,"[12-13] %d\n", + bytestream_get_le16(&edata_ptr)); // Unknown always 0 + + /* setup */ + samples_per_frame = SAMPLES_PER_FRAME * avctx->channels; + version = 4; + delay = 0x88E; + q->coding_mode = q->coding_mode ? JOINT_STEREO : STEREO; + q->scrambled_stream = 0; + + if (avctx->block_align != 96 * avctx->channels * frame_factor && + avctx->block_align != 152 * avctx->channels * frame_factor && + avctx->block_align != 192 * avctx->channels * frame_factor) { + av_log(avctx, AV_LOG_ERROR, "Unknown frame/channel/frame_factor " + "configuration %d/%d/%d\n", avctx->block_align, + avctx->channels, frame_factor); + return AVERROR_INVALIDDATA; + } + } else if (avctx->extradata_size == 12 || avctx->extradata_size == 10) { + /* Parse the extradata, RM format. */ + version = bytestream_get_be32(&edata_ptr); + samples_per_frame = bytestream_get_be16(&edata_ptr); + delay = bytestream_get_be16(&edata_ptr); + q->coding_mode = bytestream_get_be16(&edata_ptr); + q->scrambled_stream = 1; + + } else { + av_log(NULL, AV_LOG_ERROR, "Unknown extradata size %d.\n", + avctx->extradata_size); + return AVERROR(EINVAL); + } + + /* Check the extradata */ + + if (version != 4) { + av_log(avctx, AV_LOG_ERROR, "Version %d != 4.\n", version); + return AVERROR_INVALIDDATA; + } + + if (samples_per_frame != SAMPLES_PER_FRAME && + samples_per_frame != SAMPLES_PER_FRAME * 2) { + av_log(avctx, AV_LOG_ERROR, "Unknown amount of samples per frame %d.\n", + samples_per_frame); + return AVERROR_INVALIDDATA; + } + + if (delay != 0x88E) { + av_log(avctx, AV_LOG_ERROR, "Unknown amount of delay %x != 0x88E.\n", + delay); + return AVERROR_INVALIDDATA; + } + + if (q->coding_mode == STEREO) + av_log(avctx, AV_LOG_DEBUG, "Normal stereo detected.\n"); + else if (q->coding_mode == JOINT_STEREO) { + if (avctx->channels != 2) { + av_log(avctx, AV_LOG_ERROR, "Invalid coding mode\n"); + return AVERROR_INVALIDDATA; + } + av_log(avctx, AV_LOG_DEBUG, "Joint stereo detected.\n"); + } else { + av_log(avctx, AV_LOG_ERROR, "Unknown channel coding mode %x!\n", + q->coding_mode); + return AVERROR_INVALIDDATA; + } + + if (avctx->block_align >= UINT_MAX / 2) + return AVERROR(EINVAL); + + q->decoded_bytes_buffer = av_mallocz(FFALIGN(avctx->block_align, 4) + + AV_INPUT_BUFFER_PADDING_SIZE); + if (!q->decoded_bytes_buffer) + return AVERROR(ENOMEM); + + avctx->sample_fmt = AV_SAMPLE_FMT_FLTP; + + /* initialize the MDCT transform */ + if ((ret = ff_mdct_init(&q->mdct_ctx, 9, 1, 1.0 / 32768)) < 0) { + av_log(avctx, AV_LOG_ERROR, "Error initializing MDCT\n"); + av_freep(&q->decoded_bytes_buffer); + return ret; + } + + /* init the joint-stereo decoding data */ + q->weighting_delay[0] = 0; + q->weighting_delay[1] = 7; + q->weighting_delay[2] = 0; + q->weighting_delay[3] = 7; + q->weighting_delay[4] = 0; + q->weighting_delay[5] = 7; + + for (i = 0; i < 4; i++) { + q->matrix_coeff_index_prev[i] = 3; + q->matrix_coeff_index_now[i] = 3; + q->matrix_coeff_index_next[i] = 3; + } + + ff_atrac_init_gain_compensation(&q->gainc_ctx, 4, 3); + q->fdsp = avpriv_float_dsp_alloc(avctx->flags & AV_CODEC_FLAG_BITEXACT); + + q->units = av_mallocz_array(avctx->channels, sizeof(*q->units)); + if (!q->units || !q->fdsp) { + atrac3_decode_close(avctx); + return AVERROR(ENOMEM); + } + + return 0; +} + +/* +AVCodec ff_atrac3_decoder = { + .name = "atrac3", + .long_name = NULL_IF_CONFIG_SMALL("ATRAC3 (Adaptive TRansform Acoustic Coding 3)"), + .type = AVMEDIA_TYPE_AUDIO, + .id = AV_CODEC_ID_ATRAC3, + .priv_data_size = sizeof(ATRAC3Context), + .init = atrac3_decode_init, + .close = atrac3_decode_close, + .decode = atrac3_decode_frame, + .capabilities = AV_CODEC_CAP_SUBFRAMES | AV_CODEC_CAP_DR1, + .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, + AV_SAMPLE_FMT_NONE }, +}; +*/ diff --git a/ext/at3_standalone/atrac3data.h b/ext/at3_standalone/atrac3data.h new file mode 100644 index 0000000000..5d91274f48 --- /dev/null +++ b/ext/at3_standalone/atrac3data.h @@ -0,0 +1,141 @@ +/* + * ATRAC3 compatible decoder data + * Copyright (c) 2006-2007 Maxim Poliakovski + * Copyright (c) 2006-2007 Benjamin Larsson + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + * ATRAC3 AKA RealAudio 8 compatible decoder data + */ + +#ifndef AVCODEC_ATRAC3DATA_H +#define AVCODEC_ATRAC3DATA_H + +#include + +/* VLC tables */ + +static const uint8_t huffcode1[9] = { + 0x0, 0x4, 0x5, 0xC, 0xD, 0x1C, 0x1D, 0x1E, 0x1F +}; + +static const uint8_t huffbits1[9] = { 1, 3, 3, 4, 4, 5, 5, 5, 5 }; + +static const uint8_t huffcode2[5] = { 0x0, 0x4, 0x5, 0x6, 0x7 }; + +static const uint8_t huffbits2[5] = { 1, 3, 3, 3, 3 }; + +static const uint8_t huffcode3[7] = { 0x0, 0x4, 0x5, 0xC, 0xD, 0xE, 0xF }; + +static const uint8_t huffbits3[7] = { 1, 3, 3, 4, 4, 4, 4 }; + +static const uint8_t huffcode4[9] = { + 0x0, 0x4, 0x5, 0xC, 0xD, 0x1C, 0x1D, 0x1E, 0x1F +}; + +static const uint8_t huffbits4[9] = { 1, 3, 3, 4, 4, 5, 5, 5, 5 }; + +static const uint8_t huffcode5[15] = { + 0x00, 0x02, 0x03, 0x08, 0x09, 0x0A, 0x0B, 0x1C, + 0x1D, 0x3C, 0x3D, 0x3E, 0x3F, 0x0C, 0x0D +}; + +static const uint8_t huffbits5[15] = { + 2, 3, 3, 4, 4, 4, 4, 5, 5, 6, 6, 6, 6, 4, 4 +}; + +static const uint8_t huffcode6[31] = { + 0x00, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x14, + 0x15, 0x16, 0x17, 0x18, 0x19, 0x34, 0x35, 0x36, + 0x37, 0x38, 0x39, 0x3A, 0x3B, 0x78, 0x79, 0x7A, + 0x7B, 0x7C, 0x7D, 0x7E, 0x7F, 0x08, 0x09 +}; + +static const uint8_t huffbits6[31] = { + 3, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 6, 6, 6, + 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 4, 4 +}; + +static const uint8_t huffcode7[63] = { + 0x00, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, + 0x0F, 0x10, 0x11, 0x24, 0x25, 0x26, 0x27, 0x28, + 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F, 0x30, + 0x31, 0x32, 0x33, 0x68, 0x69, 0x6A, 0x6B, 0x6C, + 0x6D, 0x6E, 0x6F, 0x70, 0x71, 0x72, 0x73, 0x74, + 0x75, 0xEC, 0xED, 0xEE, 0xEF, 0xF0, 0xF1, 0xF2, + 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9, 0xFA, + 0xFB, 0xFC, 0xFD, 0xFE, 0xFF, 0x02, 0x03 +}; + +static const uint8_t huffbits7[63] = { + 3, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 4, 4 +}; + +static const uint8_t huff_tab_sizes[7] = { + 9, 5, 7, 9, 15, 31, 63, +}; + +static const uint8_t* const huff_codes[7] = { + huffcode1, huffcode2, huffcode3, huffcode4, huffcode5, huffcode6, huffcode7 +}; + +static const uint8_t* const huff_bits[7] = { + huffbits1, huffbits2, huffbits3, huffbits4, huffbits5, huffbits6, huffbits7, +}; + +static const uint16_t atrac3_vlc_offs[9] = { + 0, 512, 1024, 1536, 2048, 2560, 3072, 3584, 4096 +}; + +/* selector tables */ + +static const uint8_t clc_length_tab[8] = { 0, 4, 3, 3, 4, 4, 5, 6 }; + +static const int8_t mantissa_clc_tab[4] = { 0, 1, -2, -1 }; + +static const int8_t mantissa_vlc_tab[18] = { + 0, 0, 0, 1, 0, -1, 1, 0, -1, 0, 1, 1, 1, -1, -1, 1, -1, -1 +}; + + +/* tables for the scalefactor decoding */ + +static const float inv_max_quant[8] = { + 0.0, 1.0 / 1.5, 1.0 / 2.5, 1.0 / 3.5, + 1.0 / 4.5, 1.0 / 7.5, 1.0 / 15.5, 1.0 / 31.5 +}; + +static const uint16_t subband_tab[33] = { + 0, 8, 16, 24, 32, 40, 48, 56, + 64, 80, 96, 112, 128, 144, 160, 176, + 192, 224, 256, 288, 320, 352, 384, 416, + 448, 480, 512, 576, 640, 704, 768, 896, + 1024 +}; + +/* joint stereo related tables */ +static const float matrix_coeffs[8] = { + 0.0, 2.0, 2.0, 2.0, 0.0, 0.0, 1.0, 1.0 +}; + +#endif /* AVCODEC_ATRAC3DATA_H */ diff --git a/ext/at3_standalone/atrac3plus.c b/ext/at3_standalone/atrac3plus.c new file mode 100644 index 0000000000..94002cc2d0 --- /dev/null +++ b/ext/at3_standalone/atrac3plus.c @@ -0,0 +1,1814 @@ +/* + * ATRAC3+ compatible decoder + * + * Copyright (c) 2010-2013 Maxim Poliakovski + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + * Bitstream parser for ATRAC3+ decoder. + */ + +//#include "avcodec.h" +#include "get_bits.h" +#include "atrac3plus.h" +#include "atrac3plus_data.h" + +static VLC_TYPE tables_data[154276][2]; +static VLC wl_vlc_tabs[4]; +static VLC sf_vlc_tabs[8]; +static VLC ct_vlc_tabs[4]; +static VLC spec_vlc_tabs[112]; +static VLC gain_vlc_tabs[11]; +static VLC tone_vlc_tabs[7]; + +/** + * Generate canonical VLC table from given descriptor. + * + * @param[in] cb ptr to codebook descriptor + * @param[in] xlat ptr to translation table or NULL + * @param[in,out] tab_offset starting offset to the generated vlc table + * @param[out] out_vlc ptr to vlc table to be generated + */ +static av_cold void build_canonical_huff(const uint8_t *cb, const uint8_t *xlat, + int *tab_offset, VLC *out_vlc) +{ + int i, b; + uint16_t codes[256]; + uint8_t bits[256]; + unsigned code = 0; + int index = 0; + int min_len = *cb++; // get shortest codeword length + int max_len = *cb++; // get longest codeword length + + for (b = min_len; b <= max_len; b++) { + for (i = *cb++; i > 0; i--) { + av_assert0(index < 256); + bits[index] = b; + codes[index] = code++; + index++; + } + code <<= 1; + } + + out_vlc->table = &tables_data[*tab_offset]; + out_vlc->table_allocated = 1 << max_len; + + ff_init_vlc_sparse(out_vlc, max_len, index, bits, 1, 1, codes, 2, 2, + xlat, 1, 1, INIT_VLC_USE_NEW_STATIC); + + *tab_offset += 1 << max_len; +} + +av_cold void ff_atrac3p_init_vlcs(void) +{ + int i, wl_vlc_offs, ct_vlc_offs, sf_vlc_offs, tab_offset; + + static const int wl_nb_bits[4] = { 2, 3, 5, 5 }; + static const int wl_nb_codes[4] = { 3, 5, 8, 8 }; + static const uint8_t * const wl_bits[4] = { + atrac3p_wl_huff_bits1, atrac3p_wl_huff_bits2, + atrac3p_wl_huff_bits3, atrac3p_wl_huff_bits4 + }; + static const uint8_t * const wl_codes[4] = { + atrac3p_wl_huff_code1, atrac3p_wl_huff_code2, + atrac3p_wl_huff_code3, atrac3p_wl_huff_code4 + }; + static const uint8_t * const wl_xlats[4] = { + atrac3p_wl_huff_xlat1, atrac3p_wl_huff_xlat2, NULL, NULL + }; + + static const int ct_nb_bits[4] = { 3, 4, 4, 4 }; + static const int ct_nb_codes[4] = { 4, 8, 8, 8 }; + static const uint8_t * const ct_bits[4] = { + atrac3p_ct_huff_bits1, atrac3p_ct_huff_bits2, + atrac3p_ct_huff_bits2, atrac3p_ct_huff_bits3 + }; + static const uint8_t * const ct_codes[4] = { + atrac3p_ct_huff_code1, atrac3p_ct_huff_code2, + atrac3p_ct_huff_code2, atrac3p_ct_huff_code3 + }; + static const uint8_t * const ct_xlats[4] = { + NULL, NULL, atrac3p_ct_huff_xlat1, NULL + }; + + static const int sf_nb_bits[8] = { 9, 9, 9, 9, 6, 6, 7, 7 }; + static const int sf_nb_codes[8] = { 64, 64, 64, 64, 16, 16, 16, 16 }; + static const uint8_t * const sf_bits[8] = { + atrac3p_sf_huff_bits1, atrac3p_sf_huff_bits1, atrac3p_sf_huff_bits2, + atrac3p_sf_huff_bits3, atrac3p_sf_huff_bits4, atrac3p_sf_huff_bits4, + atrac3p_sf_huff_bits5, atrac3p_sf_huff_bits6 + }; + static const uint16_t * const sf_codes[8] = { + atrac3p_sf_huff_code1, atrac3p_sf_huff_code1, atrac3p_sf_huff_code2, + atrac3p_sf_huff_code3, atrac3p_sf_huff_code4, atrac3p_sf_huff_code4, + atrac3p_sf_huff_code5, atrac3p_sf_huff_code6 + }; + static const uint8_t * const sf_xlats[8] = { + atrac3p_sf_huff_xlat1, atrac3p_sf_huff_xlat2, NULL, NULL, + atrac3p_sf_huff_xlat4, atrac3p_sf_huff_xlat5, NULL, NULL + }; + + static const uint8_t * const gain_cbs[11] = { + atrac3p_huff_gain_npoints1_cb, atrac3p_huff_gain_npoints1_cb, + atrac3p_huff_gain_lev1_cb, atrac3p_huff_gain_lev2_cb, + atrac3p_huff_gain_lev3_cb, atrac3p_huff_gain_lev4_cb, + atrac3p_huff_gain_loc3_cb, atrac3p_huff_gain_loc1_cb, + atrac3p_huff_gain_loc4_cb, atrac3p_huff_gain_loc2_cb, + atrac3p_huff_gain_loc5_cb + }; + static const uint8_t * const gain_xlats[11] = { + NULL, atrac3p_huff_gain_npoints2_xlat, atrac3p_huff_gain_lev1_xlat, + atrac3p_huff_gain_lev2_xlat, atrac3p_huff_gain_lev3_xlat, + atrac3p_huff_gain_lev4_xlat, atrac3p_huff_gain_loc3_xlat, + atrac3p_huff_gain_loc1_xlat, atrac3p_huff_gain_loc4_xlat, + atrac3p_huff_gain_loc2_xlat, atrac3p_huff_gain_loc5_xlat + }; + + static const uint8_t * const tone_cbs[7] = { + atrac3p_huff_tonebands_cb, atrac3p_huff_numwavs1_cb, + atrac3p_huff_numwavs2_cb, atrac3p_huff_wav_ampsf1_cb, + atrac3p_huff_wav_ampsf2_cb, atrac3p_huff_wav_ampsf3_cb, + atrac3p_huff_freq_cb + }; + static const uint8_t * const tone_xlats[7] = { + NULL, NULL, atrac3p_huff_numwavs2_xlat, atrac3p_huff_wav_ampsf1_xlat, + atrac3p_huff_wav_ampsf2_xlat, atrac3p_huff_wav_ampsf3_xlat, + atrac3p_huff_freq_xlat + }; + + for (i = 0, wl_vlc_offs = 0, ct_vlc_offs = 2508; i < 4; i++) { + wl_vlc_tabs[i].table = &tables_data[wl_vlc_offs]; + wl_vlc_tabs[i].table_allocated = 1 << wl_nb_bits[i]; + ct_vlc_tabs[i].table = &tables_data[ct_vlc_offs]; + ct_vlc_tabs[i].table_allocated = 1 << ct_nb_bits[i]; + + ff_init_vlc_sparse(&wl_vlc_tabs[i], wl_nb_bits[i], wl_nb_codes[i], + wl_bits[i], 1, 1, + wl_codes[i], 1, 1, + wl_xlats[i], 1, 1, + INIT_VLC_USE_NEW_STATIC); + + ff_init_vlc_sparse(&ct_vlc_tabs[i], ct_nb_bits[i], ct_nb_codes[i], + ct_bits[i], 1, 1, + ct_codes[i], 1, 1, + ct_xlats[i], 1, 1, + INIT_VLC_USE_NEW_STATIC); + + wl_vlc_offs += wl_vlc_tabs[i].table_allocated; + ct_vlc_offs += ct_vlc_tabs[i].table_allocated; + } + + for (i = 0, sf_vlc_offs = 76; i < 8; i++) { + sf_vlc_tabs[i].table = &tables_data[sf_vlc_offs]; + sf_vlc_tabs[i].table_allocated = 1 << sf_nb_bits[i]; + + ff_init_vlc_sparse(&sf_vlc_tabs[i], sf_nb_bits[i], sf_nb_codes[i], + sf_bits[i], 1, 1, + sf_codes[i], 2, 2, + sf_xlats[i], 1, 1, + INIT_VLC_USE_NEW_STATIC); + sf_vlc_offs += sf_vlc_tabs[i].table_allocated; + } + + tab_offset = 2564; + + /* build huffman tables for spectrum decoding */ + for (i = 0; i < 112; i++) { + if (atrac3p_spectra_tabs[i].cb) + build_canonical_huff(atrac3p_spectra_tabs[i].cb, + atrac3p_spectra_tabs[i].xlat, + &tab_offset, &spec_vlc_tabs[i]); + else + spec_vlc_tabs[i].table = 0; + } + + /* build huffman tables for gain data decoding */ + for (i = 0; i < 11; i++) + build_canonical_huff(gain_cbs[i], gain_xlats[i], &tab_offset, &gain_vlc_tabs[i]); + + /* build huffman tables for tone decoding */ + for (i = 0; i < 7; i++) + build_canonical_huff(tone_cbs[i], tone_xlats[i], &tab_offset, &tone_vlc_tabs[i]); +} + +/** + * Decode number of coded quantization units. + * + * @param[in] gb the GetBit context + * @param[in,out] chan ptr to the channel parameters + * @param[in,out] ctx ptr to the channel unit context + * @param[in] avctx ptr to the AVCodecContext + * @return result code: 0 = OK, otherwise - error code + */ +static int num_coded_units(GetBitContext *gb, Atrac3pChanParams *chan, + Atrac3pChanUnitCtx *ctx, AVCodecContext *avctx) +{ + chan->fill_mode = get_bits(gb, 2); + if (!chan->fill_mode) { + chan->num_coded_vals = ctx->num_quant_units; + } else { + chan->num_coded_vals = get_bits(gb, 5); + if (chan->num_coded_vals > ctx->num_quant_units) { + av_log(avctx, AV_LOG_ERROR, + "Invalid number of transmitted units!\n"); + return AVERROR_INVALIDDATA; + } + + if (chan->fill_mode == 3) + chan->split_point = get_bits(gb, 2) + (chan->ch_num << 1) + 1; + } + + return 0; +} + +/** + * Add weighting coefficients to the decoded word-length information. + * + * @param[in,out] ctx ptr to the channel unit context + * @param[in,out] chan ptr to the channel parameters + * @param[in] wtab_idx index of the table of weights + * @param[in] avctx ptr to the AVCodecContext + * @return result code: 0 = OK, otherwise - error code + */ +static int add_wordlen_weights(Atrac3pChanUnitCtx *ctx, + Atrac3pChanParams *chan, int wtab_idx, + AVCodecContext *avctx) +{ + int i; + const int8_t *weights_tab = + &atrac3p_wl_weights[chan->ch_num * 3 + wtab_idx - 1][0]; + + for (i = 0; i < ctx->num_quant_units; i++) { + chan->qu_wordlen[i] += weights_tab[i]; + if (chan->qu_wordlen[i] < 0 || chan->qu_wordlen[i] > 7) { + av_log(avctx, AV_LOG_ERROR, + "WL index out of range: pos=%d, val=%d!\n", + i, chan->qu_wordlen[i]); + return AVERROR_INVALIDDATA; + } + } + + return 0; +} + +/** + * Subtract weighting coefficients from decoded scalefactors. + * + * @param[in,out] ctx ptr to the channel unit context + * @param[in,out] chan ptr to the channel parameters + * @param[in] wtab_idx index of table of weights + * @param[in] avctx ptr to the AVCodecContext + * @return result code: 0 = OK, otherwise - error code + */ +static int subtract_sf_weights(Atrac3pChanUnitCtx *ctx, + Atrac3pChanParams *chan, int wtab_idx, + AVCodecContext *avctx) +{ + int i; + const int8_t *weights_tab = &atrac3p_sf_weights[wtab_idx - 1][0]; + + for (i = 0; i < ctx->used_quant_units; i++) { + chan->qu_sf_idx[i] -= weights_tab[i]; + if (chan->qu_sf_idx[i] < 0 || chan->qu_sf_idx[i] > 63) { + av_log(avctx, AV_LOG_ERROR, + "SF index out of range: pos=%d, val=%d!\n", + i, chan->qu_sf_idx[i]); + return AVERROR_INVALIDDATA; + } + } + + return 0; +} + +/** + * Unpack vector quantization tables. + * + * @param[in] start_val start value for the unpacked table + * @param[in] shape_vec ptr to table to unpack + * @param[out] dst ptr to output array + * @param[in] num_values number of values to unpack + */ +static inline void unpack_vq_shape(int start_val, const int8_t *shape_vec, + int *dst, int num_values) +{ + int i; + + if (num_values) { + dst[0] = dst[1] = dst[2] = start_val; + for (i = 3; i < num_values; i++) + dst[i] = start_val - shape_vec[atrac3p_qu_num_to_seg[i] - 1]; + } +} + +#define UNPACK_SF_VQ_SHAPE(gb, dst, num_vals) \ + start_val = get_bits((gb), 6); \ + unpack_vq_shape(start_val, &atrac3p_sf_shapes[get_bits((gb), 6)][0], \ + (dst), (num_vals)) + +/** + * Decode word length for each quantization unit of a channel. + * + * @param[in] gb the GetBit context + * @param[in,out] ctx ptr to the channel unit context + * @param[in] ch_num channel to process + * @param[in] avctx ptr to the AVCodecContext + * @return result code: 0 = OK, otherwise - error code + */ +static int decode_channel_wordlen(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, + int ch_num, AVCodecContext *avctx) +{ + int i, weight_idx = 0, delta, diff, pos, delta_bits, min_val, flag, + ret, start_val; + VLC *vlc_tab; + Atrac3pChanParams *chan = &ctx->channels[ch_num]; + Atrac3pChanParams *ref_chan = &ctx->channels[0]; + + chan->fill_mode = 0; + + switch (get_bits(gb, 2)) { /* switch according to coding mode */ + case 0: /* coded using constant number of bits */ + for (i = 0; i < ctx->num_quant_units; i++) + chan->qu_wordlen[i] = get_bits(gb, 3); + break; + case 1: + if (ch_num) { + if ((ret = num_coded_units(gb, chan, ctx, avctx)) < 0) + return ret; + + if (chan->num_coded_vals) { + vlc_tab = &wl_vlc_tabs[get_bits(gb, 2)]; + + for (i = 0; i < chan->num_coded_vals; i++) { + delta = get_vlc2(gb, vlc_tab->table, vlc_tab->bits, 1); + chan->qu_wordlen[i] = (ref_chan->qu_wordlen[i] + delta) & 7; + } + } + } else { + weight_idx = get_bits(gb, 2); + if ((ret = num_coded_units(gb, chan, ctx, avctx)) < 0) + return ret; + + if (chan->num_coded_vals) { + pos = get_bits(gb, 5); + if (pos > chan->num_coded_vals) { + av_log(avctx, AV_LOG_ERROR, + "WL mode 1: invalid position!\n"); + return AVERROR_INVALIDDATA; + } + + delta_bits = get_bits(gb, 2); + min_val = get_bits(gb, 3); + + for (i = 0; i < pos; i++) + chan->qu_wordlen[i] = get_bits(gb, 3); + + for (i = pos; i < chan->num_coded_vals; i++) + chan->qu_wordlen[i] = (min_val + get_bitsz(gb, delta_bits)) & 7; + } + } + break; + case 2: + if ((ret = num_coded_units(gb, chan, ctx, avctx)) < 0) + return ret; + + if (ch_num && chan->num_coded_vals) { + vlc_tab = &wl_vlc_tabs[get_bits(gb, 2)]; + delta = get_vlc2(gb, vlc_tab->table, vlc_tab->bits, 1); + chan->qu_wordlen[0] = (ref_chan->qu_wordlen[0] + delta) & 7; + + for (i = 1; i < chan->num_coded_vals; i++) { + diff = ref_chan->qu_wordlen[i] - ref_chan->qu_wordlen[i - 1]; + delta = get_vlc2(gb, vlc_tab->table, vlc_tab->bits, 1); + chan->qu_wordlen[i] = (chan->qu_wordlen[i - 1] + diff + delta) & 7; + } + } else if (chan->num_coded_vals) { + flag = get_bits(gb, 1); + vlc_tab = &wl_vlc_tabs[get_bits(gb, 1)]; + + start_val = get_bits(gb, 3); + unpack_vq_shape(start_val, + &atrac3p_wl_shapes[start_val][get_bits(gb, 4)][0], + chan->qu_wordlen, chan->num_coded_vals); + + if (!flag) { + for (i = 0; i < chan->num_coded_vals; i++) { + delta = get_vlc2(gb, vlc_tab->table, vlc_tab->bits, 1); + chan->qu_wordlen[i] = (chan->qu_wordlen[i] + delta) & 7; + } + } else { + for (i = 0; i < (chan->num_coded_vals & - 2); i += 2) + if (!get_bits1(gb)) { + chan->qu_wordlen[i] = (chan->qu_wordlen[i] + + get_vlc2(gb, vlc_tab->table, + vlc_tab->bits, 1)) & 7; + chan->qu_wordlen[i + 1] = (chan->qu_wordlen[i + 1] + + get_vlc2(gb, vlc_tab->table, + vlc_tab->bits, 1)) & 7; + } + + if (chan->num_coded_vals & 1) + chan->qu_wordlen[i] = (chan->qu_wordlen[i] + + get_vlc2(gb, vlc_tab->table, + vlc_tab->bits, 1)) & 7; + } + } + break; + case 3: + weight_idx = get_bits(gb, 2); + if ((ret = num_coded_units(gb, chan, ctx, avctx)) < 0) + return ret; + + if (chan->num_coded_vals) { + vlc_tab = &wl_vlc_tabs[get_bits(gb, 2)]; + + /* first coefficient is coded directly */ + chan->qu_wordlen[0] = get_bits(gb, 3); + + for (i = 1; i < chan->num_coded_vals; i++) { + delta = get_vlc2(gb, vlc_tab->table, vlc_tab->bits, 1); + chan->qu_wordlen[i] = (chan->qu_wordlen[i - 1] + delta) & 7; + } + } + break; + } + + if (chan->fill_mode == 2) { + for (i = chan->num_coded_vals; i < ctx->num_quant_units; i++) + chan->qu_wordlen[i] = ch_num ? get_bits1(gb) : 1; + } else if (chan->fill_mode == 3) { + pos = ch_num ? chan->num_coded_vals + chan->split_point + : ctx->num_quant_units - chan->split_point; + if (pos > FF_ARRAY_ELEMS(chan->qu_wordlen)) { + av_log(avctx, AV_LOG_ERROR, "Split point beyond array\n"); + pos = FF_ARRAY_ELEMS(chan->qu_wordlen); + } + for (i = chan->num_coded_vals; i < pos; i++) + chan->qu_wordlen[i] = 1; + } + + if (weight_idx) + return add_wordlen_weights(ctx, chan, weight_idx, avctx); + + return 0; +} + +/** + * Decode scale factor indexes for each quant unit of a channel. + * + * @param[in] gb the GetBit context + * @param[in,out] ctx ptr to the channel unit context + * @param[in] ch_num channel to process + * @param[in] avctx ptr to the AVCodecContext + * @return result code: 0 = OK, otherwise - error code + */ +static int decode_channel_sf_idx(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, + int ch_num, AVCodecContext *avctx) +{ + int i, weight_idx = 0, delta, diff, num_long_vals, + delta_bits, min_val, vlc_sel, start_val; + VLC *vlc_tab; + Atrac3pChanParams *chan = &ctx->channels[ch_num]; + Atrac3pChanParams *ref_chan = &ctx->channels[0]; + + switch (get_bits(gb, 2)) { /* switch according to coding mode */ + case 0: /* coded using constant number of bits */ + for (i = 0; i < ctx->used_quant_units; i++) + chan->qu_sf_idx[i] = get_bits(gb, 6); + break; + case 1: + if (ch_num) { + vlc_tab = &sf_vlc_tabs[get_bits(gb, 2)]; + + for (i = 0; i < ctx->used_quant_units; i++) { + delta = get_vlc2(gb, vlc_tab->table, vlc_tab->bits, 1); + chan->qu_sf_idx[i] = (ref_chan->qu_sf_idx[i] + delta) & 0x3F; + } + } else { + weight_idx = get_bits(gb, 2); + if (weight_idx == 3) { + UNPACK_SF_VQ_SHAPE(gb, chan->qu_sf_idx, ctx->used_quant_units); + + num_long_vals = get_bits(gb, 5); + delta_bits = get_bits(gb, 2); + min_val = get_bits(gb, 4) - 7; + + for (i = 0; i < num_long_vals; i++) + chan->qu_sf_idx[i] = (chan->qu_sf_idx[i] + + get_bits(gb, 4) - 7) & 0x3F; + + /* all others are: min_val + delta */ + for (i = num_long_vals; i < ctx->used_quant_units; i++) + chan->qu_sf_idx[i] = (chan->qu_sf_idx[i] + min_val + + get_bitsz(gb, delta_bits)) & 0x3F; + } else { + num_long_vals = get_bits(gb, 5); + delta_bits = get_bits(gb, 3); + min_val = get_bits(gb, 6); + if (num_long_vals > ctx->used_quant_units || delta_bits == 7) { + av_log(avctx, AV_LOG_ERROR, + "SF mode 1: invalid parameters!\n"); + return AVERROR_INVALIDDATA; + } + + /* read full-precision SF indexes */ + for (i = 0; i < num_long_vals; i++) + chan->qu_sf_idx[i] = get_bits(gb, 6); + + /* all others are: min_val + delta */ + for (i = num_long_vals; i < ctx->used_quant_units; i++) + chan->qu_sf_idx[i] = (min_val + + get_bitsz(gb, delta_bits)) & 0x3F; + } + } + break; + case 2: + if (ch_num) { + vlc_tab = &sf_vlc_tabs[get_bits(gb, 2)]; + + delta = get_vlc2(gb, vlc_tab->table, vlc_tab->bits, 1); + chan->qu_sf_idx[0] = (ref_chan->qu_sf_idx[0] + delta) & 0x3F; + + for (i = 1; i < ctx->used_quant_units; i++) { + diff = ref_chan->qu_sf_idx[i] - ref_chan->qu_sf_idx[i - 1]; + delta = get_vlc2(gb, vlc_tab->table, vlc_tab->bits, 1); + chan->qu_sf_idx[i] = (chan->qu_sf_idx[i - 1] + diff + delta) & 0x3F; + } + } else { + vlc_tab = &sf_vlc_tabs[get_bits(gb, 2) + 4]; + + UNPACK_SF_VQ_SHAPE(gb, chan->qu_sf_idx, ctx->used_quant_units); + + for (i = 0; i < ctx->used_quant_units; i++) { + delta = get_vlc2(gb, vlc_tab->table, vlc_tab->bits, 1); + chan->qu_sf_idx[i] = (chan->qu_sf_idx[i] + + sign_extend(delta, 4)) & 0x3F; + } + } + break; + case 3: + if (ch_num) { + /* copy coefficients from reference channel */ + for (i = 0; i < ctx->used_quant_units; i++) + chan->qu_sf_idx[i] = ref_chan->qu_sf_idx[i]; + } else { + weight_idx = get_bits(gb, 2); + vlc_sel = get_bits(gb, 2); + vlc_tab = &sf_vlc_tabs[vlc_sel]; + + if (weight_idx == 3) { + vlc_tab = &sf_vlc_tabs[vlc_sel + 4]; + + UNPACK_SF_VQ_SHAPE(gb, chan->qu_sf_idx, ctx->used_quant_units); + + diff = (get_bits(gb, 4) + 56) & 0x3F; + chan->qu_sf_idx[0] = (chan->qu_sf_idx[0] + diff) & 0x3F; + + for (i = 1; i < ctx->used_quant_units; i++) { + delta = get_vlc2(gb, vlc_tab->table, vlc_tab->bits, 1); + diff = (diff + sign_extend(delta, 4)) & 0x3F; + chan->qu_sf_idx[i] = (diff + chan->qu_sf_idx[i]) & 0x3F; + } + } else { + /* 1st coefficient is coded directly */ + chan->qu_sf_idx[0] = get_bits(gb, 6); + + for (i = 1; i < ctx->used_quant_units; i++) { + delta = get_vlc2(gb, vlc_tab->table, vlc_tab->bits, 1); + chan->qu_sf_idx[i] = (chan->qu_sf_idx[i - 1] + delta) & 0x3F; + } + } + } + break; + } + + if (weight_idx && weight_idx < 3) + return subtract_sf_weights(ctx, chan, weight_idx, avctx); + + return 0; +} + +/** + * Decode word length information for each channel. + * + * @param[in] gb the GetBit context + * @param[in,out] ctx ptr to the channel unit context + * @param[in] num_channels number of channels to process + * @param[in] avctx ptr to the AVCodecContext + * @return result code: 0 = OK, otherwise - error code + */ +static int decode_quant_wordlen(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, + int num_channels, AVCodecContext *avctx) +{ + int ch_num, i, ret; + + for (ch_num = 0; ch_num < num_channels; ch_num++) { + memset(ctx->channels[ch_num].qu_wordlen, 0, + sizeof(ctx->channels[ch_num].qu_wordlen)); + + if ((ret = decode_channel_wordlen(gb, ctx, ch_num, avctx)) < 0) + return ret; + } + + /* scan for last non-zero coeff in both channels and + * set number of quant units having coded spectrum */ + for (i = ctx->num_quant_units - 1; i >= 0; i--) + if (ctx->channels[0].qu_wordlen[i] || + (num_channels == 2 && ctx->channels[1].qu_wordlen[i])) + break; + ctx->used_quant_units = i + 1; + + return 0; +} + +/** + * Decode scale factor indexes for each channel. + * + * @param[in] gb the GetBit context + * @param[in,out] ctx ptr to the channel unit context + * @param[in] num_channels number of channels to process + * @param[in] avctx ptr to the AVCodecContext + * @return result code: 0 = OK, otherwise - error code + */ +static int decode_scale_factors(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, + int num_channels, AVCodecContext *avctx) +{ + int ch_num, ret; + + if (!ctx->used_quant_units) + return 0; + + for (ch_num = 0; ch_num < num_channels; ch_num++) { + memset(ctx->channels[ch_num].qu_sf_idx, 0, + sizeof(ctx->channels[ch_num].qu_sf_idx)); + + if ((ret = decode_channel_sf_idx(gb, ctx, ch_num, avctx)) < 0) + return ret; + } + + return 0; +} + +/** + * Decode number of code table values. + * + * @param[in] gb the GetBit context + * @param[in,out] ctx ptr to the channel unit context + * @param[in] avctx ptr to the AVCodecContext + * @return result code: 0 = OK, otherwise - error code + */ +static int get_num_ct_values(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, + AVCodecContext *avctx) +{ + int num_coded_vals; + + if (get_bits1(gb)) { + num_coded_vals = get_bits(gb, 5); + if (num_coded_vals > ctx->used_quant_units) { + av_log(avctx, AV_LOG_ERROR, + "Invalid number of code table indexes: %d!\n", num_coded_vals); + return AVERROR_INVALIDDATA; + } + return num_coded_vals; + } else + return ctx->used_quant_units; +} + +#define DEC_CT_IDX_COMMON(OP) \ + num_vals = get_num_ct_values(gb, ctx, avctx); \ + if (num_vals < 0) \ + return num_vals; \ + \ + for (i = 0; i < num_vals; i++) { \ + if (chan->qu_wordlen[i]) { \ + chan->qu_tab_idx[i] = OP; \ + } else if (ch_num && ref_chan->qu_wordlen[i]) \ + /* get clone master flag */ \ + chan->qu_tab_idx[i] = get_bits1(gb); \ + } + +#define CODING_DIRECT get_bits(gb, num_bits) + +#define CODING_VLC get_vlc2(gb, vlc_tab->table, vlc_tab->bits, 1) + +#define CODING_VLC_DELTA \ + (!i) ? CODING_VLC \ + : (pred + get_vlc2(gb, delta_vlc->table, \ + delta_vlc->bits, 1)) & mask; \ + pred = chan->qu_tab_idx[i] + +#define CODING_VLC_DIFF \ + (ref_chan->qu_tab_idx[i] + \ + get_vlc2(gb, vlc_tab->table, vlc_tab->bits, 1)) & mask + +/** + * Decode code table indexes for each quant unit of a channel. + * + * @param[in] gb the GetBit context + * @param[in,out] ctx ptr to the channel unit context + * @param[in] ch_num channel to process + * @param[in] avctx ptr to the AVCodecContext + * @return result code: 0 = OK, otherwise - error code + */ +static int decode_channel_code_tab(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, + int ch_num, AVCodecContext *avctx) +{ + int i, num_vals, num_bits, pred; + int mask = ctx->use_full_table ? 7 : 3; /* mask for modular arithmetic */ + VLC *vlc_tab, *delta_vlc; + Atrac3pChanParams *chan = &ctx->channels[ch_num]; + Atrac3pChanParams *ref_chan = &ctx->channels[0]; + + chan->table_type = get_bits1(gb); + + switch (get_bits(gb, 2)) { /* switch according to coding mode */ + case 0: /* directly coded */ + num_bits = ctx->use_full_table + 2; + DEC_CT_IDX_COMMON(CODING_DIRECT); + break; + case 1: /* entropy-coded */ + vlc_tab = ctx->use_full_table ? &ct_vlc_tabs[1] + : ct_vlc_tabs; + DEC_CT_IDX_COMMON(CODING_VLC); + break; + case 2: /* entropy-coded delta */ + if (ctx->use_full_table) { + vlc_tab = &ct_vlc_tabs[1]; + delta_vlc = &ct_vlc_tabs[2]; + } else { + vlc_tab = ct_vlc_tabs; + delta_vlc = ct_vlc_tabs; + } + pred = 0; + DEC_CT_IDX_COMMON(CODING_VLC_DELTA); + break; + case 3: /* entropy-coded difference to master */ + if (ch_num) { + vlc_tab = ctx->use_full_table ? &ct_vlc_tabs[3] + : ct_vlc_tabs; + DEC_CT_IDX_COMMON(CODING_VLC_DIFF); + } + break; + } + + return 0; +} + +/** + * Decode code table indexes for each channel. + * + * @param[in] gb the GetBit context + * @param[in,out] ctx ptr to the channel unit context + * @param[in] num_channels number of channels to process + * @param[in] avctx ptr to the AVCodecContext + * @return result code: 0 = OK, otherwise - error code + */ +static int decode_code_table_indexes(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, + int num_channels, AVCodecContext *avctx) +{ + int ch_num, ret; + + if (!ctx->used_quant_units) + return 0; + + ctx->use_full_table = get_bits1(gb); + + for (ch_num = 0; ch_num < num_channels; ch_num++) { + memset(ctx->channels[ch_num].qu_tab_idx, 0, + sizeof(ctx->channels[ch_num].qu_tab_idx)); + + if ((ret = decode_channel_code_tab(gb, ctx, ch_num, avctx)) < 0) + return ret; + } + + return 0; +} + +/** + * Decode huffman-coded spectral lines for a given quant unit. + * + * This is a generalized version for all known coding modes. + * Its speed can be improved by creating separate functions for each mode. + * + * @param[in] gb the GetBit context + * @param[in] tab code table telling how to decode spectral lines + * @param[in] vlc_tab ptr to the huffman table associated with the code table + * @param[out] out pointer to buffer where decoded data should be stored + * @param[in] num_specs number of spectral lines to decode + */ +static void decode_qu_spectra(GetBitContext *gb, const Atrac3pSpecCodeTab *tab, + VLC *vlc_tab, int16_t *out, const int num_specs) +{ + int i, j, pos, cf; + int group_size = tab->group_size; + int num_coeffs = tab->num_coeffs; + int bits = tab->bits; + int is_signed = tab->is_signed; + unsigned val; + + for (pos = 0; pos < num_specs;) { + if (group_size == 1 || get_bits1(gb)) { + for (j = 0; j < group_size; j++) { + val = get_vlc2(gb, vlc_tab->table, vlc_tab->bits, 1); + + for (i = 0; i < num_coeffs; i++) { + cf = av_mod_uintp2(val, bits); + if (is_signed) + cf = sign_extend(cf, bits); + else if (cf && get_bits1(gb)) + cf = -cf; + + out[pos++] = cf; + val >>= bits; + } + } + } else /* group skipped */ + pos += group_size * num_coeffs; + } +} + +/** + * Decode huffman-coded IMDCT spectrum for all channels. + * + * @param[in] gb the GetBit context + * @param[in,out] ctx ptr to the channel unit context + * @param[in] num_channels number of channels to process + * @param[in] avctx ptr to the AVCodecContext + */ +static void decode_spectrum(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, + int num_channels, AVCodecContext *avctx) +{ + int i, ch_num, qu, wordlen, codetab, tab_index, num_specs; + const Atrac3pSpecCodeTab *tab; + Atrac3pChanParams *chan; + + for (ch_num = 0; ch_num < num_channels; ch_num++) { + chan = &ctx->channels[ch_num]; + + memset(chan->spectrum, 0, sizeof(chan->spectrum)); + + /* set power compensation level to disabled */ + memset(chan->power_levs, ATRAC3P_POWER_COMP_OFF, sizeof(chan->power_levs)); + + for (qu = 0; qu < ctx->used_quant_units; qu++) { + num_specs = ff_atrac3p_qu_to_spec_pos[qu + 1] - + ff_atrac3p_qu_to_spec_pos[qu]; + + wordlen = chan->qu_wordlen[qu]; + codetab = chan->qu_tab_idx[qu]; + if (wordlen) { + if (!ctx->use_full_table) + codetab = atrac3p_ct_restricted_to_full[chan->table_type][wordlen - 1][codetab]; + + tab_index = (chan->table_type * 8 + codetab) * 7 + wordlen - 1; + tab = &atrac3p_spectra_tabs[tab_index]; + + /* this allows reusing VLC tables */ + if (tab->redirect >= 0) + tab_index = tab->redirect; + + decode_qu_spectra(gb, tab, &spec_vlc_tabs[tab_index], + &chan->spectrum[ff_atrac3p_qu_to_spec_pos[qu]], + num_specs); + } else if (ch_num && ctx->channels[0].qu_wordlen[qu] && !codetab) { + /* copy coefficients from master */ + memcpy(&chan->spectrum[ff_atrac3p_qu_to_spec_pos[qu]], + &ctx->channels[0].spectrum[ff_atrac3p_qu_to_spec_pos[qu]], + num_specs * + sizeof(chan->spectrum[ff_atrac3p_qu_to_spec_pos[qu]])); + chan->qu_wordlen[qu] = ctx->channels[0].qu_wordlen[qu]; + } + } + + /* Power compensation levels only present in the bitstream + * if there are more than 2 quant units. The lowest two units + * correspond to the frequencies 0...351 Hz, whose shouldn't + * be affected by the power compensation. */ + if (ctx->used_quant_units > 2) { + num_specs = atrac3p_subband_to_num_powgrps[ctx->num_coded_subbands - 1]; + for (i = 0; i < num_specs; i++) + chan->power_levs[i] = get_bits(gb, 4); + } + } +} + +/** + * Retrieve specified amount of flag bits from the input bitstream. + * The data can be shortened in the case of the following two common conditions: + * if all bits are zero then only one signal bit = 0 will be stored, + * if all bits are ones then two signal bits = 1,0 will be stored. + * Otherwise, all necessary bits will be directly stored + * prefixed by two signal bits = 1,1. + * + * @param[in] gb ptr to the GetBitContext + * @param[out] out where to place decoded flags + * @param[in] num_flags number of flags to process + * @return: 0 = all flag bits are zero, 1 = there is at least one non-zero flag bit + */ +static int get_subband_flags(GetBitContext *gb, uint8_t *out, int num_flags) +{ + int i, result; + + memset(out, 0, num_flags); + + result = get_bits1(gb); + if (result) { + if (get_bits1(gb)) + for (i = 0; i < num_flags; i++) + out[i] = get_bits1(gb); + else + memset(out, 1, num_flags); + } + + return result; +} + +/** + * Decode mdct window shape flags for all channels. + * + * @param[in] gb the GetBit context + * @param[in,out] ctx ptr to the channel unit context + * @param[in] num_channels number of channels to process + */ +static void decode_window_shape(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, + int num_channels) +{ + int ch_num; + + for (ch_num = 0; ch_num < num_channels; ch_num++) + get_subband_flags(gb, ctx->channels[ch_num].wnd_shape, + ctx->num_subbands); +} + +/** + * Decode number of gain control points. + * + * @param[in] gb the GetBit context + * @param[in,out] ctx ptr to the channel unit context + * @param[in] ch_num channel to process + * @param[in] coded_subbands number of subbands to process + * @return result code: 0 = OK, otherwise - error code + */ +static int decode_gainc_npoints(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, + int ch_num, int coded_subbands) +{ + int i, delta, delta_bits, min_val; + Atrac3pChanParams *chan = &ctx->channels[ch_num]; + Atrac3pChanParams *ref_chan = &ctx->channels[0]; + + switch (get_bits(gb, 2)) { /* switch according to coding mode */ + case 0: /* fixed-length coding */ + for (i = 0; i < coded_subbands; i++) + chan->gain_data[i].num_points = get_bits(gb, 3); + break; + case 1: /* variable-length coding */ + for (i = 0; i < coded_subbands; i++) + chan->gain_data[i].num_points = + get_vlc2(gb, gain_vlc_tabs[0].table, + gain_vlc_tabs[0].bits, 1); + break; + case 2: + if (ch_num) { /* VLC modulo delta to master channel */ + for (i = 0; i < coded_subbands; i++) { + delta = get_vlc2(gb, gain_vlc_tabs[1].table, + gain_vlc_tabs[1].bits, 1); + chan->gain_data[i].num_points = + (ref_chan->gain_data[i].num_points + delta) & 7; + } + } else { /* VLC modulo delta to previous */ + chan->gain_data[0].num_points = + get_vlc2(gb, gain_vlc_tabs[0].table, + gain_vlc_tabs[0].bits, 1); + + for (i = 1; i < coded_subbands; i++) { + delta = get_vlc2(gb, gain_vlc_tabs[1].table, + gain_vlc_tabs[1].bits, 1); + chan->gain_data[i].num_points = + (chan->gain_data[i - 1].num_points + delta) & 7; + } + } + break; + case 3: + if (ch_num) { /* copy data from master channel */ + for (i = 0; i < coded_subbands; i++) + chan->gain_data[i].num_points = + ref_chan->gain_data[i].num_points; + } else { /* shorter delta to min */ + delta_bits = get_bits(gb, 2); + min_val = get_bits(gb, 3); + + for (i = 0; i < coded_subbands; i++) { + chan->gain_data[i].num_points = min_val + get_bitsz(gb, delta_bits); + if (chan->gain_data[i].num_points > 7) + return AVERROR_INVALIDDATA; + } + } + } + + return 0; +} + +/** + * Implements coding mode 3 (slave) for gain compensation levels. + * + * @param[out] dst ptr to the output array + * @param[in] ref ptr to the reference channel + */ +static inline void gainc_level_mode3s(AtracGainInfo *dst, AtracGainInfo *ref) +{ + int i; + + for (i = 0; i < dst->num_points; i++) + dst->lev_code[i] = (i >= ref->num_points) ? 7 : ref->lev_code[i]; +} + +/** + * Implements coding mode 1 (master) for gain compensation levels. + * + * @param[in] gb the GetBit context + * @param[in] ctx ptr to the channel unit context + * @param[out] dst ptr to the output array + */ +static inline void gainc_level_mode1m(GetBitContext *gb, + Atrac3pChanUnitCtx *ctx, + AtracGainInfo *dst) +{ + int i, delta; + + if (dst->num_points > 0) + dst->lev_code[0] = get_vlc2(gb, gain_vlc_tabs[2].table, + gain_vlc_tabs[2].bits, 1); + + for (i = 1; i < dst->num_points; i++) { + delta = get_vlc2(gb, gain_vlc_tabs[3].table, + gain_vlc_tabs[3].bits, 1); + dst->lev_code[i] = (dst->lev_code[i - 1] + delta) & 0xF; + } +} + +/** + * Decode level code for each gain control point. + * + * @param[in] gb the GetBit context + * @param[in,out] ctx ptr to the channel unit context + * @param[in] ch_num channel to process + * @param[in] coded_subbands number of subbands to process + * @return result code: 0 = OK, otherwise - error code + */ +static int decode_gainc_levels(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, + int ch_num, int coded_subbands) +{ + int sb, i, delta, delta_bits, min_val, pred; + Atrac3pChanParams *chan = &ctx->channels[ch_num]; + Atrac3pChanParams *ref_chan = &ctx->channels[0]; + + switch (get_bits(gb, 2)) { /* switch according to coding mode */ + case 0: /* fixed-length coding */ + for (sb = 0; sb < coded_subbands; sb++) + for (i = 0; i < chan->gain_data[sb].num_points; i++) + chan->gain_data[sb].lev_code[i] = get_bits(gb, 4); + break; + case 1: + if (ch_num) { /* VLC modulo delta to master channel */ + for (sb = 0; sb < coded_subbands; sb++) + for (i = 0; i < chan->gain_data[sb].num_points; i++) { + delta = get_vlc2(gb, gain_vlc_tabs[5].table, + gain_vlc_tabs[5].bits, 1); + pred = (i >= ref_chan->gain_data[sb].num_points) + ? 7 : ref_chan->gain_data[sb].lev_code[i]; + chan->gain_data[sb].lev_code[i] = (pred + delta) & 0xF; + } + } else { /* VLC modulo delta to previous */ + for (sb = 0; sb < coded_subbands; sb++) + gainc_level_mode1m(gb, ctx, &chan->gain_data[sb]); + } + break; + case 2: + if (ch_num) { /* VLC modulo delta to previous or clone master */ + for (sb = 0; sb < coded_subbands; sb++) + if (chan->gain_data[sb].num_points > 0) { + if (get_bits1(gb)) + gainc_level_mode1m(gb, ctx, &chan->gain_data[sb]); + else + gainc_level_mode3s(&chan->gain_data[sb], + &ref_chan->gain_data[sb]); + } + } else { /* VLC modulo delta to lev_codes of previous subband */ + if (chan->gain_data[0].num_points > 0) + gainc_level_mode1m(gb, ctx, &chan->gain_data[0]); + + for (sb = 1; sb < coded_subbands; sb++) + for (i = 0; i < chan->gain_data[sb].num_points; i++) { + delta = get_vlc2(gb, gain_vlc_tabs[4].table, + gain_vlc_tabs[4].bits, 1); + pred = (i >= chan->gain_data[sb - 1].num_points) + ? 7 : chan->gain_data[sb - 1].lev_code[i]; + chan->gain_data[sb].lev_code[i] = (pred + delta) & 0xF; + } + } + break; + case 3: + if (ch_num) { /* clone master */ + for (sb = 0; sb < coded_subbands; sb++) + gainc_level_mode3s(&chan->gain_data[sb], + &ref_chan->gain_data[sb]); + } else { /* shorter delta to min */ + delta_bits = get_bits(gb, 2); + min_val = get_bits(gb, 4); + + for (sb = 0; sb < coded_subbands; sb++) + for (i = 0; i < chan->gain_data[sb].num_points; i++) { + chan->gain_data[sb].lev_code[i] = min_val + get_bitsz(gb, delta_bits); + if (chan->gain_data[sb].lev_code[i] > 15) + return AVERROR_INVALIDDATA; + } + } + break; + } + + return 0; +} + +/** + * Implements coding mode 0 for gain compensation locations. + * + * @param[in] gb the GetBit context + * @param[in] ctx ptr to the channel unit context + * @param[out] dst ptr to the output array + * @param[in] pos position of the value to be processed + */ +static inline void gainc_loc_mode0(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, + AtracGainInfo *dst, int pos) +{ + int delta_bits; + + if (!pos || dst->loc_code[pos - 1] < 15) + dst->loc_code[pos] = get_bits(gb, 5); + else if (dst->loc_code[pos - 1] >= 30) + dst->loc_code[pos] = 31; + else { + delta_bits = av_log2(30 - dst->loc_code[pos - 1]) + 1; + dst->loc_code[pos] = dst->loc_code[pos - 1] + + get_bits(gb, delta_bits) + 1; + } +} + +/** + * Implements coding mode 1 for gain compensation locations. + * + * @param[in] gb the GetBit context + * @param[in] ctx ptr to the channel unit context + * @param[out] dst ptr to the output array + */ +static inline void gainc_loc_mode1(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, + AtracGainInfo *dst) +{ + int i; + VLC *tab; + + if (dst->num_points > 0) { + /* 1st coefficient is stored directly */ + dst->loc_code[0] = get_bits(gb, 5); + + for (i = 1; i < dst->num_points; i++) { + /* switch VLC according to the curve direction + * (ascending/descending) */ + tab = (dst->lev_code[i] <= dst->lev_code[i - 1]) + ? &gain_vlc_tabs[7] + : &gain_vlc_tabs[9]; + dst->loc_code[i] = dst->loc_code[i - 1] + + get_vlc2(gb, tab->table, tab->bits, 1); + } + } +} + +/** + * Decode location code for each gain control point. + * + * @param[in] gb the GetBit context + * @param[in,out] ctx ptr to the channel unit context + * @param[in] ch_num channel to process + * @param[in] coded_subbands number of subbands to process + * @param[in] avctx ptr to the AVCodecContext + * @return result code: 0 = OK, otherwise - error code + */ +static int decode_gainc_loc_codes(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, + int ch_num, int coded_subbands, + AVCodecContext *avctx) +{ + int sb, i, delta, delta_bits, min_val, pred, more_than_ref; + AtracGainInfo *dst, *ref; + VLC *tab; + Atrac3pChanParams *chan = &ctx->channels[ch_num]; + Atrac3pChanParams *ref_chan = &ctx->channels[0]; + + switch (get_bits(gb, 2)) { /* switch according to coding mode */ + case 0: /* sequence of numbers in ascending order */ + for (sb = 0; sb < coded_subbands; sb++) + for (i = 0; i < chan->gain_data[sb].num_points; i++) + gainc_loc_mode0(gb, ctx, &chan->gain_data[sb], i); + break; + case 1: + if (ch_num) { + for (sb = 0; sb < coded_subbands; sb++) { + if (chan->gain_data[sb].num_points <= 0) + continue; + dst = &chan->gain_data[sb]; + ref = &ref_chan->gain_data[sb]; + + /* 1st value is vlc-coded modulo delta to master */ + delta = get_vlc2(gb, gain_vlc_tabs[10].table, + gain_vlc_tabs[10].bits, 1); + pred = ref->num_points > 0 ? ref->loc_code[0] : 0; + dst->loc_code[0] = (pred + delta) & 0x1F; + + for (i = 1; i < dst->num_points; i++) { + more_than_ref = i >= ref->num_points; + if (dst->lev_code[i] > dst->lev_code[i - 1]) { + /* ascending curve */ + if (more_than_ref) { + delta = + get_vlc2(gb, gain_vlc_tabs[9].table, + gain_vlc_tabs[9].bits, 1); + dst->loc_code[i] = dst->loc_code[i - 1] + delta; + } else { + if (get_bits1(gb)) + gainc_loc_mode0(gb, ctx, dst, i); // direct coding + else + dst->loc_code[i] = ref->loc_code[i]; // clone master + } + } else { /* descending curve */ + tab = more_than_ref ? &gain_vlc_tabs[7] + : &gain_vlc_tabs[10]; + delta = get_vlc2(gb, tab->table, tab->bits, 1); + if (more_than_ref) + dst->loc_code[i] = dst->loc_code[i - 1] + delta; + else + dst->loc_code[i] = (ref->loc_code[i] + delta) & 0x1F; + } + } + } + } else /* VLC delta to previous */ + for (sb = 0; sb < coded_subbands; sb++) + gainc_loc_mode1(gb, ctx, &chan->gain_data[sb]); + break; + case 2: + if (ch_num) { + for (sb = 0; sb < coded_subbands; sb++) { + if (chan->gain_data[sb].num_points <= 0) + continue; + dst = &chan->gain_data[sb]; + ref = &ref_chan->gain_data[sb]; + if (dst->num_points > ref->num_points || get_bits1(gb)) + gainc_loc_mode1(gb, ctx, dst); + else /* clone master for the whole subband */ + for (i = 0; i < chan->gain_data[sb].num_points; i++) + dst->loc_code[i] = ref->loc_code[i]; + } + } else { + /* data for the first subband is coded directly */ + for (i = 0; i < chan->gain_data[0].num_points; i++) + gainc_loc_mode0(gb, ctx, &chan->gain_data[0], i); + + for (sb = 1; sb < coded_subbands; sb++) { + if (chan->gain_data[sb].num_points <= 0) + continue; + dst = &chan->gain_data[sb]; + + /* 1st value is vlc-coded modulo delta to the corresponding + * value of the previous subband if any or zero */ + delta = get_vlc2(gb, gain_vlc_tabs[6].table, + gain_vlc_tabs[6].bits, 1); + pred = dst[-1].num_points > 0 + ? dst[-1].loc_code[0] : 0; + dst->loc_code[0] = (pred + delta) & 0x1F; + + for (i = 1; i < dst->num_points; i++) { + more_than_ref = i >= dst[-1].num_points; + /* Select VLC table according to curve direction and + * presence of prediction. */ + tab = &gain_vlc_tabs[(dst->lev_code[i] > dst->lev_code[i - 1]) * + 2 + more_than_ref + 6]; + delta = get_vlc2(gb, tab->table, tab->bits, 1); + if (more_than_ref) + dst->loc_code[i] = dst->loc_code[i - 1] + delta; + else + dst->loc_code[i] = (dst[-1].loc_code[i] + delta) & 0x1F; + } + } + } + break; + case 3: + if (ch_num) { /* clone master or direct or direct coding */ + for (sb = 0; sb < coded_subbands; sb++) + for (i = 0; i < chan->gain_data[sb].num_points; i++) { + if (i >= ref_chan->gain_data[sb].num_points) + gainc_loc_mode0(gb, ctx, &chan->gain_data[sb], i); + else + chan->gain_data[sb].loc_code[i] = + ref_chan->gain_data[sb].loc_code[i]; + } + } else { /* shorter delta to min */ + delta_bits = get_bits(gb, 2) + 1; + min_val = get_bits(gb, 5); + + for (sb = 0; sb < coded_subbands; sb++) + for (i = 0; i < chan->gain_data[sb].num_points; i++) + chan->gain_data[sb].loc_code[i] = min_val + i + + get_bits(gb, delta_bits); + } + break; + } + + /* Validate decoded information */ + for (sb = 0; sb < coded_subbands; sb++) { + dst = &chan->gain_data[sb]; + for (i = 0; i < chan->gain_data[sb].num_points; i++) { + if (dst->loc_code[i] < 0 || dst->loc_code[i] > 31 || + (i && dst->loc_code[i] <= dst->loc_code[i - 1])) { + av_log(avctx, AV_LOG_ERROR, + "Invalid gain location: ch=%d, sb=%d, pos=%d, val=%d\n", + ch_num, sb, i, dst->loc_code[i]); + return AVERROR_INVALIDDATA; + } + } + } + + return 0; +} + +/** + * Decode gain control data for all channels. + * + * @param[in] gb the GetBit context + * @param[in,out] ctx ptr to the channel unit context + * @param[in] num_channels number of channels to process + * @param[in] avctx ptr to the AVCodecContext + * @return result code: 0 = OK, otherwise - error code + */ +static int decode_gainc_data(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, + int num_channels, AVCodecContext *avctx) +{ + int ch_num, coded_subbands, sb, ret; + + for (ch_num = 0; ch_num < num_channels; ch_num++) { + memset(ctx->channels[ch_num].gain_data, 0, + sizeof(*ctx->channels[ch_num].gain_data) * ATRAC3P_SUBBANDS); + + if (get_bits1(gb)) { /* gain control data present? */ + coded_subbands = get_bits(gb, 4) + 1; + if (get_bits1(gb)) /* is high band gain data replication on? */ + ctx->channels[ch_num].num_gain_subbands = get_bits(gb, 4) + 1; + else + ctx->channels[ch_num].num_gain_subbands = coded_subbands; + + if ((ret = decode_gainc_npoints(gb, ctx, ch_num, coded_subbands)) < 0 || + (ret = decode_gainc_levels(gb, ctx, ch_num, coded_subbands)) < 0 || + (ret = decode_gainc_loc_codes(gb, ctx, ch_num, coded_subbands, avctx)) < 0) + return ret; + + if (coded_subbands > 0) { /* propagate gain data if requested */ + for (sb = coded_subbands; sb < ctx->channels[ch_num].num_gain_subbands; sb++) + ctx->channels[ch_num].gain_data[sb] = + ctx->channels[ch_num].gain_data[sb - 1]; + } + } else { + ctx->channels[ch_num].num_gain_subbands = 0; + } + } + + return 0; +} + +/** + * Decode envelope for all tones of a channel. + * + * @param[in] gb the GetBit context + * @param[in,out] ctx ptr to the channel unit context + * @param[in] ch_num channel to process + * @param[in] band_has_tones ptr to an array of per-band-flags: + * 1 - tone data present + */ +static void decode_tones_envelope(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, + int ch_num, int band_has_tones[]) +{ + int sb; + Atrac3pWavesData *dst = ctx->channels[ch_num].tones_info; + Atrac3pWavesData *ref = ctx->channels[0].tones_info; + + if (!ch_num || !get_bits1(gb)) { /* mode 0: fixed-length coding */ + for (sb = 0; sb < ctx->waves_info->num_tone_bands; sb++) { + if (!band_has_tones[sb]) + continue; + dst[sb].pend_env.has_start_point = get_bits1(gb); + dst[sb].pend_env.start_pos = dst[sb].pend_env.has_start_point + ? get_bits(gb, 5) : -1; + dst[sb].pend_env.has_stop_point = get_bits1(gb); + dst[sb].pend_env.stop_pos = dst[sb].pend_env.has_stop_point + ? get_bits(gb, 5) : 32; + } + } else { /* mode 1(slave only): copy master */ + for (sb = 0; sb < ctx->waves_info->num_tone_bands; sb++) { + if (!band_has_tones[sb]) + continue; + dst[sb].pend_env.has_start_point = ref[sb].pend_env.has_start_point; + dst[sb].pend_env.has_stop_point = ref[sb].pend_env.has_stop_point; + dst[sb].pend_env.start_pos = ref[sb].pend_env.start_pos; + dst[sb].pend_env.stop_pos = ref[sb].pend_env.stop_pos; + } + } +} + +/** + * Decode number of tones for each subband of a channel. + * + * @param[in] gb the GetBit context + * @param[in,out] ctx ptr to the channel unit context + * @param[in] ch_num channel to process + * @param[in] band_has_tones ptr to an array of per-band-flags: + * 1 - tone data present + * @param[in] avctx ptr to the AVCodecContext + * @return result code: 0 = OK, otherwise - error code + */ +static int decode_band_numwavs(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, + int ch_num, int band_has_tones[], + AVCodecContext *avctx) +{ + int mode, sb, delta; + Atrac3pWavesData *dst = ctx->channels[ch_num].tones_info; + Atrac3pWavesData *ref = ctx->channels[0].tones_info; + + mode = get_bits(gb, ch_num + 1); + switch (mode) { + case 0: /** fixed-length coding */ + for (sb = 0; sb < ctx->waves_info->num_tone_bands; sb++) + if (band_has_tones[sb]) + dst[sb].num_wavs = get_bits(gb, 4); + break; + case 1: /** variable-length coding */ + for (sb = 0; sb < ctx->waves_info->num_tone_bands; sb++) + if (band_has_tones[sb]) + dst[sb].num_wavs = + get_vlc2(gb, tone_vlc_tabs[1].table, + tone_vlc_tabs[1].bits, 1); + break; + case 2: /** VLC modulo delta to master (slave only) */ + for (sb = 0; sb < ctx->waves_info->num_tone_bands; sb++) + if (band_has_tones[sb]) { + delta = get_vlc2(gb, tone_vlc_tabs[2].table, + tone_vlc_tabs[2].bits, 1); + delta = sign_extend(delta, 3); + dst[sb].num_wavs = (ref[sb].num_wavs + delta) & 0xF; + } + break; + case 3: /** copy master (slave only) */ + for (sb = 0; sb < ctx->waves_info->num_tone_bands; sb++) + if (band_has_tones[sb]) + dst[sb].num_wavs = ref[sb].num_wavs; + break; + } + + /** initialize start tone index for each subband */ + for (sb = 0; sb < ctx->waves_info->num_tone_bands; sb++) + if (band_has_tones[sb]) { + if (ctx->waves_info->tones_index + dst[sb].num_wavs > 48) { + av_log(avctx, AV_LOG_ERROR, + "Too many tones: %d (max. 48), frame: %d!\n", + ctx->waves_info->tones_index + dst[sb].num_wavs, + avctx->frame_number); + return AVERROR_INVALIDDATA; + } + dst[sb].start_index = ctx->waves_info->tones_index; + ctx->waves_info->tones_index += dst[sb].num_wavs; + } + + return 0; +} + +/** + * Decode frequency information for each subband of a channel. + * + * @param[in] gb the GetBit context + * @param[in,out] ctx ptr to the channel unit context + * @param[in] ch_num channel to process + * @param[in] band_has_tones ptr to an array of per-band-flags: + * 1 - tone data present + */ +static void decode_tones_frequency(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, + int ch_num, int band_has_tones[]) +{ + int sb, i, direction, nbits, pred, delta; + Atrac3pWaveParam *iwav, *owav; + Atrac3pWavesData *dst = ctx->channels[ch_num].tones_info; + Atrac3pWavesData *ref = ctx->channels[0].tones_info; + + if (!ch_num || !get_bits1(gb)) { /* mode 0: fixed-length coding */ + for (sb = 0; sb < ctx->waves_info->num_tone_bands; sb++) { + if (!band_has_tones[sb] || !dst[sb].num_wavs) + continue; + iwav = &ctx->waves_info->waves[dst[sb].start_index]; + direction = (dst[sb].num_wavs > 1) ? get_bits1(gb) : 0; + if (direction) { /** packed numbers in descending order */ + if (dst[sb].num_wavs) + iwav[dst[sb].num_wavs - 1].freq_index = get_bits(gb, 10); + for (i = dst[sb].num_wavs - 2; i >= 0 ; i--) { + nbits = av_log2(iwav[i+1].freq_index) + 1; + iwav[i].freq_index = get_bits(gb, nbits); + } + } else { /** packed numbers in ascending order */ + for (i = 0; i < dst[sb].num_wavs; i++) { + if (!i || iwav[i - 1].freq_index < 512) + iwav[i].freq_index = get_bits(gb, 10); + else { + nbits = av_log2(1023 - iwav[i - 1].freq_index) + 1; + iwav[i].freq_index = get_bits(gb, nbits) + + 1024 - (1 << nbits); + } + } + } + } + } else { /* mode 1: VLC modulo delta to master (slave only) */ + for (sb = 0; sb < ctx->waves_info->num_tone_bands; sb++) { + if (!band_has_tones[sb] || !dst[sb].num_wavs) + continue; + iwav = &ctx->waves_info->waves[ref[sb].start_index]; + owav = &ctx->waves_info->waves[dst[sb].start_index]; + for (i = 0; i < dst[sb].num_wavs; i++) { + delta = get_vlc2(gb, tone_vlc_tabs[6].table, + tone_vlc_tabs[6].bits, 1); + delta = sign_extend(delta, 8); + pred = (i < ref[sb].num_wavs) ? iwav[i].freq_index : + (ref[sb].num_wavs ? iwav[ref[sb].num_wavs - 1].freq_index : 0); + owav[i].freq_index = (pred + delta) & 0x3FF; + } + } + } +} + +/** + * Decode amplitude information for each subband of a channel. + * + * @param[in] gb the GetBit context + * @param[in,out] ctx ptr to the channel unit context + * @param[in] ch_num channel to process + * @param[in] band_has_tones ptr to an array of per-band-flags: + * 1 - tone data present + */ +static void decode_tones_amplitude(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, + int ch_num, int band_has_tones[]) +{ + int mode, sb, j, i, diff, maxdiff, fi, delta, pred; + Atrac3pWaveParam *wsrc, *wref; + int refwaves[48] = { 0 }; + Atrac3pWavesData *dst = ctx->channels[ch_num].tones_info; + Atrac3pWavesData *ref = ctx->channels[0].tones_info; + + if (ch_num) { + for (sb = 0; sb < ctx->waves_info->num_tone_bands; sb++) { + if (!band_has_tones[sb] || !dst[sb].num_wavs) + continue; + wsrc = &ctx->waves_info->waves[dst[sb].start_index]; + wref = &ctx->waves_info->waves[ref[sb].start_index]; + for (j = 0; j < dst[sb].num_wavs; j++) { + for (i = 0, fi = 0, maxdiff = 1024; i < ref[sb].num_wavs; i++) { + diff = FFABS(wsrc[j].freq_index - wref[i].freq_index); + if (diff < maxdiff) { + maxdiff = diff; + fi = i; + } + } + + if (maxdiff < 8) + refwaves[dst[sb].start_index + j] = fi + ref[sb].start_index; + else if (j < ref[sb].num_wavs) + refwaves[dst[sb].start_index + j] = j + ref[sb].start_index; + else + refwaves[dst[sb].start_index + j] = -1; + } + } + } + + mode = get_bits(gb, ch_num + 1); + + switch (mode) { + case 0: /** fixed-length coding */ + for (sb = 0; sb < ctx->waves_info->num_tone_bands; sb++) { + if (!band_has_tones[sb] || !dst[sb].num_wavs) + continue; + if (ctx->waves_info->amplitude_mode) + for (i = 0; i < dst[sb].num_wavs; i++) + ctx->waves_info->waves[dst[sb].start_index + i].amp_sf = get_bits(gb, 6); + else + ctx->waves_info->waves[dst[sb].start_index].amp_sf = get_bits(gb, 6); + } + break; + case 1: /** min + VLC delta */ + for (sb = 0; sb < ctx->waves_info->num_tone_bands; sb++) { + if (!band_has_tones[sb] || !dst[sb].num_wavs) + continue; + if (ctx->waves_info->amplitude_mode) + for (i = 0; i < dst[sb].num_wavs; i++) + ctx->waves_info->waves[dst[sb].start_index + i].amp_sf = + get_vlc2(gb, tone_vlc_tabs[3].table, + tone_vlc_tabs[3].bits, 1) + 20; + else + ctx->waves_info->waves[dst[sb].start_index].amp_sf = + get_vlc2(gb, tone_vlc_tabs[4].table, + tone_vlc_tabs[4].bits, 1) + 24; + } + break; + case 2: /** VLC modulo delta to master (slave only) */ + for (sb = 0; sb < ctx->waves_info->num_tone_bands; sb++) { + if (!band_has_tones[sb] || !dst[sb].num_wavs) + continue; + for (i = 0; i < dst[sb].num_wavs; i++) { + delta = get_vlc2(gb, tone_vlc_tabs[5].table, + tone_vlc_tabs[5].bits, 1); + delta = sign_extend(delta, 5); + pred = refwaves[dst[sb].start_index + i] >= 0 ? + ctx->waves_info->waves[refwaves[dst[sb].start_index + i]].amp_sf : 34; + ctx->waves_info->waves[dst[sb].start_index + i].amp_sf = (pred + delta) & 0x3F; + } + } + break; + case 3: /** clone master (slave only) */ + for (sb = 0; sb < ctx->waves_info->num_tone_bands; sb++) { + if (!band_has_tones[sb]) + continue; + for (i = 0; i < dst[sb].num_wavs; i++) + ctx->waves_info->waves[dst[sb].start_index + i].amp_sf = + refwaves[dst[sb].start_index + i] >= 0 + ? ctx->waves_info->waves[refwaves[dst[sb].start_index + i]].amp_sf + : 32; + } + break; + } +} + +/** + * Decode phase information for each subband of a channel. + * + * @param[in] gb the GetBit context + * @param[in,out] ctx ptr to the channel unit context + * @param[in] ch_num channel to process + * @param[in] band_has_tones ptr to an array of per-band-flags: + * 1 - tone data present + */ +static void decode_tones_phase(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, + int ch_num, int band_has_tones[]) +{ + int sb, i; + Atrac3pWaveParam *wparam; + Atrac3pWavesData *dst = ctx->channels[ch_num].tones_info; + + for (sb = 0; sb < ctx->waves_info->num_tone_bands; sb++) { + if (!band_has_tones[sb]) + continue; + wparam = &ctx->waves_info->waves[dst[sb].start_index]; + for (i = 0; i < dst[sb].num_wavs; i++) + wparam[i].phase_index = get_bits(gb, 5); + } +} + +/** + * Decode tones info for all channels. + * + * @param[in] gb the GetBit context + * @param[in,out] ctx ptr to the channel unit context + * @param[in] num_channels number of channels to process + * @param[in] avctx ptr to the AVCodecContext + * @return result code: 0 = OK, otherwise - error code + */ +static int decode_tones_info(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, + int num_channels, AVCodecContext *avctx) +{ + int ch_num, i, ret; + int band_has_tones[16]; + + for (ch_num = 0; ch_num < num_channels; ch_num++) + memset(ctx->channels[ch_num].tones_info, 0, + sizeof(*ctx->channels[ch_num].tones_info) * ATRAC3P_SUBBANDS); + + ctx->waves_info->tones_present = get_bits1(gb); + if (!ctx->waves_info->tones_present) + return 0; + + memset(ctx->waves_info->waves, 0, sizeof(ctx->waves_info->waves)); + + ctx->waves_info->amplitude_mode = get_bits1(gb); + if (!ctx->waves_info->amplitude_mode) { + avpriv_report_missing_feature(avctx, "GHA amplitude mode 0"); + return AVERROR_PATCHWELCOME; + } + + ctx->waves_info->num_tone_bands = + get_vlc2(gb, tone_vlc_tabs[0].table, + tone_vlc_tabs[0].bits, 1) + 1; + + if (num_channels == 2) { + get_subband_flags(gb, ctx->waves_info->tone_sharing, ctx->waves_info->num_tone_bands); + get_subband_flags(gb, ctx->waves_info->tone_master, ctx->waves_info->num_tone_bands); + get_subband_flags(gb, ctx->waves_info->invert_phase, ctx->waves_info->num_tone_bands); + } + + ctx->waves_info->tones_index = 0; + + for (ch_num = 0; ch_num < num_channels; ch_num++) { + for (i = 0; i < ctx->waves_info->num_tone_bands; i++) + band_has_tones[i] = !ch_num ? 1 : !ctx->waves_info->tone_sharing[i]; + + decode_tones_envelope(gb, ctx, ch_num, band_has_tones); + if ((ret = decode_band_numwavs(gb, ctx, ch_num, band_has_tones, + avctx)) < 0) + return ret; + + decode_tones_frequency(gb, ctx, ch_num, band_has_tones); + decode_tones_amplitude(gb, ctx, ch_num, band_has_tones); + decode_tones_phase(gb, ctx, ch_num, band_has_tones); + } + + if (num_channels == 2) { + for (i = 0; i < ctx->waves_info->num_tone_bands; i++) { + if (ctx->waves_info->tone_sharing[i]) + ctx->channels[1].tones_info[i] = ctx->channels[0].tones_info[i]; + + if (ctx->waves_info->tone_master[i]) + FFSWAP(Atrac3pWavesData, ctx->channels[0].tones_info[i], + ctx->channels[1].tones_info[i]); + } + } + + return 0; +} + +int ff_atrac3p_decode_channel_unit(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, + int num_channels, AVCodecContext *avctx) +{ + int ret; + + /* parse sound header */ + ctx->num_quant_units = get_bits(gb, 5) + 1; + if (ctx->num_quant_units > 28 && ctx->num_quant_units < 32) { + av_log(avctx, AV_LOG_ERROR, + "Invalid number of quantization units: %d!\n", + ctx->num_quant_units); + return AVERROR_INVALIDDATA; + } + + ctx->mute_flag = get_bits1(gb); + + /* decode various sound parameters */ + if ((ret = decode_quant_wordlen(gb, ctx, num_channels, avctx)) < 0) + return ret; + + ctx->num_subbands = atrac3p_qu_to_subband[ctx->num_quant_units - 1] + 1; + ctx->num_coded_subbands = ctx->used_quant_units + ? atrac3p_qu_to_subband[ctx->used_quant_units - 1] + 1 + : 0; + + if ((ret = decode_scale_factors(gb, ctx, num_channels, avctx)) < 0) + return ret; + + if ((ret = decode_code_table_indexes(gb, ctx, num_channels, avctx)) < 0) + return ret; + + decode_spectrum(gb, ctx, num_channels, avctx); + + if (num_channels == 2) { + get_subband_flags(gb, ctx->swap_channels, ctx->num_coded_subbands); + get_subband_flags(gb, ctx->negate_coeffs, ctx->num_coded_subbands); + } + + decode_window_shape(gb, ctx, num_channels); + + if ((ret = decode_gainc_data(gb, ctx, num_channels, avctx)) < 0) + return ret; + + if ((ret = decode_tones_info(gb, ctx, num_channels, avctx)) < 0) + return ret; + + /* decode global noise info */ + ctx->noise_present = get_bits1(gb); + if (ctx->noise_present) { + ctx->noise_level_index = get_bits(gb, 4); + ctx->noise_table_index = get_bits(gb, 4); + } + + return 0; +} diff --git a/ext/at3_standalone/atrac3plus.h b/ext/at3_standalone/atrac3plus.h new file mode 100644 index 0000000000..8eae592f3b --- /dev/null +++ b/ext/at3_standalone/atrac3plus.h @@ -0,0 +1,240 @@ +/* + * ATRAC3+ compatible decoder + * + * Copyright (c) 2010-2013 Maxim Poliakovski + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + * Global structures, constants and data for ATRAC3+ decoder. + */ + +#ifndef AVCODEC_ATRAC3PLUS_H +#define AVCODEC_ATRAC3PLUS_H + +#include + +#include "float_dsp.h" +#include "atrac.h" +#include "avcodec.h" +#include "fft.h" +#include "get_bits.h" + +/** Global unit sizes */ +#define ATRAC3P_SUBBANDS 16 ///< number of PQF subbands +#define ATRAC3P_SUBBAND_SAMPLES 128 ///< number of samples per subband +#define ATRAC3P_FRAME_SAMPLES (ATRAC3P_SUBBAND_SAMPLES * ATRAC3P_SUBBANDS) + +#define ATRAC3P_PQF_FIR_LEN 12 ///< length of the prototype FIR of the PQF + +/** Global constants */ +#define ATRAC3P_POWER_COMP_OFF 15 ///< disable power compensation + +/** ATRAC3+ channel unit types */ +enum Atrac3pChannelUnitTypes { + CH_UNIT_MONO = 0, ///< unit containing one coded channel + CH_UNIT_STEREO = 1, ///< unit containing two jointly-coded channels + CH_UNIT_EXTENSION = 2, ///< unit containing extension information + CH_UNIT_TERMINATOR = 3 ///< unit sequence terminator +}; + +/** Per-channel IPQF history */ +typedef struct Atrac3pIPQFChannelCtx { + DECLARE_ALIGNED(32, float, buf1)[ATRAC3P_PQF_FIR_LEN * 2][8]; + DECLARE_ALIGNED(32, float, buf2)[ATRAC3P_PQF_FIR_LEN * 2][8]; + int pos; +} Atrac3pIPQFChannelCtx; + +/** Amplitude envelope of a group of sine waves */ +typedef struct Atrac3pWaveEnvelope { + int has_start_point; ///< indicates start point within the GHA window + int has_stop_point; ///< indicates stop point within the GHA window + int start_pos; ///< start position expressed in n*4 samples + int stop_pos; ///< stop position expressed in n*4 samples +} Atrac3pWaveEnvelope; + +/** Parameters of a group of sine waves */ +typedef struct Atrac3pWavesData { + Atrac3pWaveEnvelope pend_env; ///< pending envelope from the previous frame + Atrac3pWaveEnvelope curr_env; ///< group envelope from the current frame + int num_wavs; ///< number of sine waves in the group + int start_index; ///< start index into global tones table for that subband +} Atrac3pWavesData; + +/** Parameters of a single sine wave */ +typedef struct Atrac3pWaveParam { + int freq_index; ///< wave frequency index + int amp_sf; ///< quantized amplitude scale factor + int amp_index; ///< quantized amplitude index + int phase_index; ///< quantized phase index +} Atrac3pWaveParam; + +/** Sound channel parameters */ +typedef struct Atrac3pChanParams { + int ch_num; + int num_coded_vals; ///< number of transmitted quant unit values + int fill_mode; + int split_point; + int table_type; ///< table type: 0 - tone?, 1- noise? + int qu_wordlen[32]; ///< array of word lengths for each quant unit + int qu_sf_idx[32]; ///< array of scale factor indexes for each quant unit + int qu_tab_idx[32]; ///< array of code table indexes for each quant unit + int16_t spectrum[2048]; ///< decoded IMDCT spectrum + uint8_t power_levs[5]; ///< power compensation levels + + /* imdct window shape history (2 frames) for overlapping. */ + uint8_t wnd_shape_hist[2][ATRAC3P_SUBBANDS]; ///< IMDCT window shape, 0=sine/1=steep + uint8_t *wnd_shape; ///< IMDCT window shape for current frame + uint8_t *wnd_shape_prev; ///< IMDCT window shape for previous frame + + /* gain control data history (2 frames) for overlapping. */ + AtracGainInfo gain_data_hist[2][ATRAC3P_SUBBANDS]; ///< gain control data for all subbands + AtracGainInfo *gain_data; ///< gain control data for next frame + AtracGainInfo *gain_data_prev; ///< gain control data for previous frame + int num_gain_subbands; ///< number of subbands with gain control data + + /* tones data history (2 frames) for overlapping. */ + Atrac3pWavesData tones_info_hist[2][ATRAC3P_SUBBANDS]; + Atrac3pWavesData *tones_info; + Atrac3pWavesData *tones_info_prev; +} Atrac3pChanParams; + +/* Per-unit sine wave parameters */ +typedef struct Atrac3pWaveSynthParams { + int tones_present; ///< 1 - tones info present + int amplitude_mode; ///< 1 - low range, 0 - high range + int num_tone_bands; ///< number of PQF bands with tones + uint8_t tone_sharing[ATRAC3P_SUBBANDS]; ///< 1 - subband-wise tone sharing flags + uint8_t tone_master[ATRAC3P_SUBBANDS]; ///< 1 - subband-wise tone channel swapping + uint8_t invert_phase[ATRAC3P_SUBBANDS]; ///< 1 - subband-wise phase inversion + int tones_index; ///< total sum of tones in this unit + Atrac3pWaveParam waves[48]; +} Atrac3pWaveSynthParams; + +/** Channel unit parameters */ +typedef struct Atrac3pChanUnitCtx { + /* channel unit variables */ + int unit_type; ///< unit type (mono/stereo) + int num_quant_units; + int num_subbands; + int used_quant_units; ///< number of quant units with coded spectrum + int num_coded_subbands; ///< number of subbands with coded spectrum + int mute_flag; ///< mute flag + int use_full_table; ///< 1 - full table list, 0 - restricted one + int noise_present; ///< 1 - global noise info present + int noise_level_index; ///< global noise level index + int noise_table_index; ///< global noise RNG table index + uint8_t swap_channels[ATRAC3P_SUBBANDS]; ///< 1 - perform subband-wise channel swapping + uint8_t negate_coeffs[ATRAC3P_SUBBANDS]; ///< 1 - subband-wise IMDCT coefficients negation + Atrac3pChanParams channels[2]; + + /* Variables related to GHA tones */ + Atrac3pWaveSynthParams wave_synth_hist[2]; ///< waves synth history for two frames + Atrac3pWaveSynthParams *waves_info; + Atrac3pWaveSynthParams *waves_info_prev; + + Atrac3pIPQFChannelCtx ipqf_ctx[2]; + DECLARE_ALIGNED(32, float, prev_buf)[2][ATRAC3P_FRAME_SAMPLES]; ///< overlapping buffer +} Atrac3pChanUnitCtx; + +/** + * Initialize VLC tables for bitstream parsing. + */ +void ff_atrac3p_init_vlcs(void); + +/** + * Decode bitstream data of a channel unit. + * + * @param[in] gb the GetBit context + * @param[in,out] ctx ptr to the channel unit context + * @param[in] num_channels number of channels to process + * @param[in] avctx ptr to the AVCodecContext + * @return result code: 0 = OK, otherwise - error code + */ +int ff_atrac3p_decode_channel_unit(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, + int num_channels, AVCodecContext *avctx); + +/** + * Initialize IMDCT transform. + * + * @param[in] avctx ptr to the AVCodecContext + * @param[in] mdct_ctx pointer to MDCT transform context + */ +void ff_atrac3p_init_imdct(AVCodecContext *avctx, FFTContext *mdct_ctx); + +/** + * Initialize sine waves synthesizer. + */ +void ff_atrac3p_init_wave_synth(void); + +/** + * Synthesize sine waves for a particular subband. + * + * @param[in] ch_unit pointer to the channel unit context + * @param[in] fdsp pointer to float DSP context + * @param[in] ch_num which channel to process + * @param[in] sb which subband to process + * @param[out] out receives processed data + */ +void ff_atrac3p_generate_tones(Atrac3pChanUnitCtx *ch_unit, AVFloatDSPContext *fdsp, + int ch_num, int sb, float *out); + +/** + * Perform power compensation aka noise dithering. + * + * @param[in] ctx ptr to the channel context + * @param[in] ch_index which channel to process + * @param[in,out] sp ptr to channel spectrum to process + * @param[in] rng_index indicates which RNG table to use + * @param[in] sb_num which subband to process + */ +void ff_atrac3p_power_compensation(Atrac3pChanUnitCtx *ctx, int ch_index, + float *sp, int rng_index, int sb_num); + +/** + * Regular IMDCT and windowing without overlapping, + * with spectrum reversal in the odd subbands. + * + * @param[in] fdsp pointer to float DSP context + * @param[in] mdct_ctx pointer to MDCT transform context + * @param[in] pIn float input + * @param[out] pOut float output + * @param[in] wind_id which MDCT window to apply + * @param[in] sb subband number + */ +void ff_atrac3p_imdct(AVFloatDSPContext *fdsp, FFTContext *mdct_ctx, float *pIn, + float *pOut, int wind_id, int sb); + +/** + * Subband synthesis filter based on the polyphase quadrature (pseudo-QMF) + * filter bank. + * + * @param[in] dct_ctx ptr to the pre-initialized IDCT context + * @param[in,out] hist ptr to the filter history + * @param[in] in input data to process + * @param[out] out receives processed data + */ +void ff_atrac3p_ipqf(FFTContext *dct_ctx, Atrac3pIPQFChannelCtx *hist, + const float *in, float *out); + +extern const uint16_t ff_atrac3p_qu_to_spec_pos[33]; +extern const float ff_atrac3p_sf_tab[64]; +extern const float ff_atrac3p_mant_tab[8]; + +#endif /* AVCODEC_ATRAC3PLUS_H */ diff --git a/ext/at3_standalone/atrac3plus_data.h b/ext/at3_standalone/atrac3plus_data.h new file mode 100644 index 0000000000..2a107eef1f --- /dev/null +++ b/ext/at3_standalone/atrac3plus_data.h @@ -0,0 +1,1914 @@ +/* + * ATRAC3+ compatible decoder + * + * Copyright (c) 2010-2013 Maxim Poliakovski + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVCODEC_ATRAC3PLUS_DATA_H +#define AVCODEC_ATRAC3PLUS_DATA_H + +#include +#include + +/** VLC tables for wordlen */ +static const uint8_t atrac3p_wl_huff_code1[3] = { 0, 2, 3 }; + +static const uint8_t atrac3p_wl_huff_bits1[3] = { 1, 2, 2 }; + +static const uint8_t atrac3p_wl_huff_xlat1[3] = { 0, 1, 7 }; + +static const uint8_t atrac3p_wl_huff_code2[5] = { 0, 4, 5, 6, 7 }; + +static const uint8_t atrac3p_wl_huff_bits2[5] = { 1, 3, 3, 3, 3 }; + +static const uint8_t atrac3p_wl_huff_xlat2[5] = { 0, 1, 2, 6, 7 }; + +static const uint8_t atrac3p_wl_huff_code3[8] = { + 0, 4, 0xC, 0x1E, 0x1F, 0xD, 0xE, 5 +}; + +static const uint8_t atrac3p_wl_huff_bits3[8] = { 1, 3, 4, 5, 5, 4, 4, 3 }; + +static const uint8_t atrac3p_wl_huff_code4[8] = { + 0, 4, 0xC, 0xD, 0x1E, 0x1F, 0xE, 5 +}; + +static const uint8_t atrac3p_wl_huff_bits4[8] = { 1, 3, 4, 4, 5, 5, 4, 3 }; + +/** VLC tables for scale factor indexes */ +static const uint16_t atrac3p_sf_huff_code1[64] = { + 0, 2, 3, 4, 5, 0xC, 0xD, 0xE0, + 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0x1CE, 0x1CF, + 0x1D0, 0x1D1, 0x1D2, 0x1D3, 0x1D4, 0x1D5, 0x1D6, 0x1D7, + 0x1D8, 0x1D9, 0x1DA, 0x1DB, 0x1DC, 0x1DD, 0x1DE, 0x1DF, + 0x1E0, 0x1E1, 0x1E2, 0x1E3, 0x1E4, 0x1E5, 0x1E6, 0x1E7, + 0x1E8, 0x1E9, 0x1EA, 0x1EB, 0x1EC, 0x1ED, 0x1EE, 0x1EF, + 0x1F0, 0x1F1, 0x1F2, 0x1F3, 0x1F4, 0x1F5, 0x1F6, 0x1F7, + 0x1F8, 0x1F9, 0x1FA, 0x1FB, 0x1FC, 0x1FD, 0x1FE, 0x1FF +}; + +static const uint8_t atrac3p_sf_huff_bits1[64] = { + 2, 3, 3, 3, 3, 4, 4, 8, 8, 8, 8, 8, 8, 8, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9 +}; + +static const uint8_t atrac3p_sf_huff_xlat1[64] = { + 0, 1, 61, 62, 63, 2, 60, 3, 4, 5, 6, 57, 58, 59, 7, 8, + 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, + 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, + 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56 +}; + +static const uint8_t atrac3p_sf_huff_xlat2[64] = { + 0, 1, 2, 62, 63, 3, 61, 4, 5, 6, 57, 58, 59, 60, 7, 8, + 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, + 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, + 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56 +}; + +static const uint16_t atrac3p_sf_huff_code2[64] = { + 0, 4, 0x18, 0x19, 0x70, 0x1CA, 0x1CB, 0x1CC, + 0x1CD, 0x1CE, 0x1CF, 0x1D0, 0x1D1, 0x1D2, 0x1D3, 0x1D4, + 0x1D5, 0x1D6, 0x1D7, 0x1D8, 0x1D9, 0x1DA, 0x1DB, 0x1DC, + 0x1DD, 0x1DE, 0x1DF, 0x1E0, 0x1E1, 0x1E2, 0x1E3, 0x1E4, + 0x1E5, 0x1E6, 0x1E7, 0x1E8, 0x1E9, 0x1EA, 0x1EB, 0x1EC, + 0x1ED, 0x1EE, 0x1EF, 0x1F0, 0x1F1, 0x1F2, 0x1F3, 0x1F4, + 0x1F5, 0x1F6, 0x1F7, 0x1F8, 0x1F9, 0x1FA, 0x1FB, 0x1FC, + 0x1FD, 0x1FE, 0x1FF, 0xE4, 0x71, 0x1A, 0x1B, 5 +}; + +static const uint8_t atrac3p_sf_huff_bits2[64] = { + 1, 3, 5, 5, 7, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 8, 7, 5, 5, 3 +}; + +static const uint16_t atrac3p_sf_huff_code3[64] = { + 0, 2, 3, 0x18, 0x19, 0x70, 0x1CC, 0x1CD, + 0x1CE, 0x1CF, 0x1D0, 0x1D1, 0x1D2, 0x1D3, 0x1D4, 0x1D5, + 0x1D6, 0x1D7, 0x1D8, 0x1D9, 0x1DA, 0x1DB, 0x1DC, 0x1DD, + 0x1DE, 0x1DF, 0x1E0, 0x1E1, 0x1E2, 0x1E3, 0x1E4, 0x1E5, + 0x1E6, 0x1E7, 0x1E8, 0x1E9, 0x1EA, 0x1EB, 0x1EC, 0x1ED, + 0x1EE, 0x1EF, 0x1F0, 0x1F1, 0x1F2, 0x1F3, 0x1F4, 0x1F5, + 0x1F6, 0x1F7, 0x1F8, 0x1F9, 0x1FA, 0x1FB, 0x1FC, 0x1FD, + 0x1FE, 0x1FF, 0x71, 0x72, 0x1A, 0x1B, 4, 5 +}; + +static const uint8_t atrac3p_sf_huff_bits3[64] = { + 2, 3, 3, 5, 5, 7, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 7, 7, 5, 5, 3, 3 +}; + +static const uint16_t atrac3p_sf_huff_code4[16] = { + 0, 2, 3, 4, 5, 0xC, 0xD, 0x38, 0x39, 0x3A, 0x3B, 0x3C, 0, 0x3D, 0x3E, 0x3F +}; + +static const uint8_t atrac3p_sf_huff_bits4[16] = { + 2, 3, 3, 3, 3, 4, 4, 6, 6, 6, 6, 6, 0, 6, 6, 6 +}; + +static const uint8_t atrac3p_sf_huff_xlat4[16] = { + 0, 1, 13, 14, 15, 2, 12, 3, 4, 5, 6, 7, 8, 9, 10, 11 +}; + +static const uint8_t atrac3p_sf_huff_xlat5[16] = { + 0, 1, 2, 14, 15, 3, 13, 4, 5, 6, 7, 9, 8, 10, 11, 12 +}; + +static const uint16_t atrac3p_sf_huff_code5[16] = { + 0, 4, 0xC, 0x1C, 0x78, 0x79, 0x7A, 0x7B, + 0, 0x7C, 0x7D, 0x7E, 0x7F, 0x1D, 0xD, 5 +}; + +static const uint8_t atrac3p_sf_huff_bits5[16] = { + 1, 3, 4, 5, 7, 7, 7, 7, 0, 7, 7, 7, 7, 5, 4, 3 +}; + +static const uint16_t atrac3p_sf_huff_code6[16] = { + 0, 2, 3, 0xC, 0x1C, 0x3C, 0x7C, 0x7D, 0, 0x7E, 0x7F, 0x3D, 0x1D, 0xD, 4, 5 +}; + +static const uint8_t atrac3p_sf_huff_bits6[16] = { + 2, 3, 3, 4, 5, 6, 7, 7, 0, 7, 7, 6, 5, 4, 3, 3 +}; + +/** VLC tables for code table indexes */ +static const uint8_t atrac3p_ct_huff_code1[4] = { 0, 2, 6, 7 }; + +static const uint8_t atrac3p_ct_huff_bits1[4] = { 1, 2, 3, 3 }; + +static const uint8_t atrac3p_ct_huff_code2[8] = { 0, 2, 3, 4, 5, 6, 0xE, 0xF }; + +static const uint8_t atrac3p_ct_huff_bits2[8] = { 2, 3, 3, 3, 3, 3, 4, 4 }; + +static const uint8_t atrac3p_ct_huff_xlat1[8] = { 0, 1, 2, 3, 6, 7, 4, 5 }; + +static const uint8_t atrac3p_ct_huff_code3[8] = { + 0, 4, 0xA, 0xB, 0xC, 0xD, 0xE, 0xF +}; + +static const uint8_t atrac3p_ct_huff_bits3[8] = { 1, 3, 4, 4, 4, 4, 4, 4 }; + +/* weights for quantized word lengths */ +static const int8_t atrac3p_wl_weights[6][32] = { + { 5, 5, 4, 4, 3, 3, 2, 2, 1, 1, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { 5, 5, 5, 4, 4, 4, 3, 3, 3, 2, 2, 2, 1, 1, 1, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { 6, 5, 5, 5, 4, 4, 4, 4, 3, 3, 3, 3, 2, 2, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 }, + { 5, 5, 4, 4, 3, 3, 2, 2, 1, 1, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { 5, 5, 5, 4, 4, 4, 3, 3, 3, 2, 2, 2, 1, 1, 1, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { 6, 5, 5, 5, 5, 5, 5, 5, 3, 3, 3, 3, 2, 2, 1, 1, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } +}; + +/* weights for quantized scale factors + * sf_weights[i] = i / (tab_idx + 1) + * where tab_idx = [1,2] */ +static const int8_t atrac3p_sf_weights[2][32] = { + { 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, + 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13, 14, 14, 15, 15 }, + { 0, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, + 5, 5, 6, 6, 6, 7, 7, 7, 8, 8, 8, 9, 9, 9, 10, 10 } +}; + +/** Ungroup table for word length segments. + * Numbers in this table tell which coeff belongs to which segment. */ +static const uint8_t atrac3p_qu_num_to_seg[32] = { + 0, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, + 5, 5, 6, 6, 6, 7, 7, 7, 8, 8, 8, 9, 9, 9, 9, 9 +}; + +/** Map quant unit number to subband number */ +static const uint8_t atrac3p_qu_to_subband[32] = { + 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, + 3, 3, 4, 4, 5, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 +}; + +/** Map subband number to number of power compensation groups */ +static const int atrac3p_subband_to_num_powgrps[16] = { + 1, 2, 2, 3, 3, 3, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5 +}; + +/** 3D base shape tables. The values are grouped together as follows: + * [num_start_values = 8][num_shape_tables = 16][num_seg_coeffs = 9] + * For each of the 8 start values there are 16 different shapes each + * 9 coefficients long. */ +static const int8_t atrac3p_wl_shapes[8][16][9] = { + { { 0, 0, 0, 0, 0, 0, 0, -2, -1 }, + { 0, 0, 0, 0, 0, 0, 0, -5, -1 }, + { 0, 0, 0, -7, 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0, 0, -7, 0, 0, 0 }, + { 0, 0, 0, 0, 0, 0, -5, 0, 0 }, + { 0, 0, 0, 0, -5, 0, 0, 0, 0 }, + { -7, -7, 0, 0, 0, 0, 0, 0, 0 }, + { 0, -7, 0, 0, 0, 0, 0, 0, 0 }, + { -2, -2, -5, 0, 0, 0, 0, 0, 0 }, + { 0, 0, 0, -2, -5, 0, 0, 0, 0 }, + { 0, 0, 0, 0, 0, -2, -5, 0, 0 }, + { 0, 0, 0, -5, 0, 0, 0, 0, 0 }, + { 0, -2, -7, -2, 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0, -2, -5, 0, 0, 0 }, + { 0, 0, 0, -5, -5, 0, 0, 0, 0 }, + { 0, 0, 0, -5, -2, 0, 0, 0, 0 } }, + { { -1, -5, -3, -2, -1, -1, 0, 0, 0 }, + { -2, -5, -3, -3, -2, -1, -1, 0, 0 }, + { 0, -1, -1, -1, 0, 0, 0, 0, 0 }, + { -1, -3, 0, 0, 0, 0, 0, 0, 0 }, + { -1, -2, 0, 0, 0, 0, 0, 0, 0 }, + { -1, -3, -1, 0, 0, 0, 0, 1, 1 }, + { -1, -5, -3, -3, -2, -1, 0, 0, 0 }, + { -1, -1, -4, -2, -2, -1, -1, 0, 0 }, + { -1, -1, -3, -2, -3, -1, -1, -1, 0 }, + { -1, -4, -2, -3, -1, 0, 0, 0, 0 }, + { 0, -1, -2, -2, -1, -1, 0, 0, 0 }, + { 0, -2, -1, 0, 0, 0, 0, 0, 0 }, + { -1, -1, 0, 0, 0, 0, 0, 0, 0 }, + { -1, -1, -3, -2, -2, -1, -1, -1, 0 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { 0, -1, -3, -2, -2, -1, -1, -1, 0 }, }, + { { -1, -2, 0, 1, 1, 1, 1, 1, 1 }, + { 0, -1, 1, 1, 1, 1, 1, 1, 1 }, + { 0, -2, 1, 1, 1, 1, 1, 1, 1 }, + { 0, -2, 0, 1, 1, 1, 1, 1, 1 }, + { -1, -1, 0, 1, 1, 1, 1, 1, 1 }, + { 0, 0, -1, 0, 1, 1, 1, 1, 1 }, + { -1, -1, 1, 1, 1, 1, 1, 1, 1 }, + { 0, 0, -1, 1, 1, 1, 1, 1, 1 }, + { 0, -1, 0, 1, 1, 1, 1, 1, 1 }, + { -1, -1, -1, 1, 1, 1, 1, 1, 1 }, + { 0, 0, 0, 0, 1, 1, 1, 1, 1 }, + { 0, 0, 0, 1, 1, 1, 1, 1, 1 }, + { 0, -1, -1, 1, 1, 1, 1, 1, 1 }, + { 0, 1, 0, 1, 1, 1, 1, 1, 1 }, + { 0, -3, -2, 1, 1, 1, 1, 2, 2 }, + { -3, -5, -3, 2, 2, 2, 2, 2, 2 }, }, + { { -1, -2, 0, 2, 2, 2, 2, 2, 2 }, + { -1, -2, 0, 1, 2, 2, 2, 2, 2 }, + { 0, -2, 0, 2, 2, 2, 2, 2, 2 }, + { -1, 0, 1, 2, 2, 2, 2, 2, 2 }, + { 0, 0, 1, 2, 2, 2, 2, 2, 2 }, + { 0, -2, 0, 1, 2, 2, 2, 2, 2 }, + { 0, -1, 1, 2, 2, 2, 2, 2, 2 }, + { -1, -1, 0, 2, 2, 2, 2, 2, 2 }, + { -1, -1, 0, 1, 2, 2, 2, 2, 2 }, + { -1, -2, -1, 2, 2, 2, 2, 2, 2 }, + { 0, -1, 0, 2, 2, 2, 2, 2, 2 }, + { 1, 1, 0, 1, 2, 2, 2, 2, 2 }, + { 0, 1, 2, 2, 2, 2, 2, 2, 2 }, + { 1, 0, 0, 1, 2, 2, 2, 2, 2 }, + { 0, 0, 0, 1, 2, 2, 2, 2, 2 }, + { -1, -1, -1, 1, 2, 2, 2, 2, 2 }, }, + { { 0, 1, 2, 3, 3, 3, 3, 3, 3 }, + { 1, 1, 2, 3, 3, 3, 3, 3, 3 }, + { -1, 0, 1, 2, 3, 3, 3, 3, 3 }, + { 0, 0, 2, 3, 3, 3, 3, 3, 3 }, + { -1, 0, 1, 3, 3, 3, 3, 3, 3 }, + { 0, 0, 1, 3, 3, 3, 3, 3, 3 }, + { 1, 2, 3, 3, 3, 3, 3, 3, 3 }, + { 1, 2, 2, 3, 3, 3, 3, 3, 3 }, + { 0, 1, 1, 3, 3, 3, 3, 3, 3 }, + { 0, 0, 1, 2, 3, 3, 3, 3, 3 }, + { -1, 1, 2, 3, 3, 3, 3, 3, 3 }, + { -1, 0, 2, 3, 3, 3, 3, 3, 3 }, + { 2, 2, 3, 3, 3, 3, 3, 3, 3 }, + { 1, 1, 3, 3, 3, 3, 3, 3, 3 }, + { 0, 2, 3, 3, 3, 3, 3, 3, 3 }, + { 0, 1, 1, 2, 3, 3, 3, 3, 3 }, }, + { { 0, 1, 2, 3, 4, 4, 4, 4, 4 }, + { 1, 2, 3, 4, 4, 4, 4, 4, 4 }, + { 0, 0, 2, 3, 4, 4, 4, 4, 4 }, + { 1, 1, 2, 4, 4, 4, 4, 4, 4 }, + { 0, 1, 2, 4, 4, 4, 4, 4, 4 }, + { -1, 0, 1, 3, 4, 4, 4, 4, 4 }, + { 0, 0, 1, 3, 4, 4, 4, 4, 4 }, + { 1, 1, 2, 3, 4, 4, 4, 4, 4 }, + { 0, 1, 1, 3, 4, 4, 4, 4, 4 }, + { 2, 2, 3, 4, 4, 4, 4, 4, 4 }, + { 1, 1, 3, 4, 4, 4, 4, 4, 4 }, + { 1, 2, 2, 4, 4, 4, 4, 4, 4 }, + { -1, 0, 2, 3, 4, 4, 4, 4, 4 }, + { 0, 1, 3, 4, 4, 4, 4, 4, 4 }, + { 1, 2, 2, 3, 4, 4, 4, 4, 4 }, + { 0, 2, 3, 4, 4, 4, 4, 4, 4 }, }, + { { 1, 2, 3, 4, 5, 5, 5, 5, 5 }, + { 0, 1, 2, 3, 4, 5, 5, 5, 5 }, + { 0, 1, 2, 3, 5, 5, 5, 5, 5 }, + { 1, 1, 3, 4, 5, 5, 5, 5, 5 }, + { 1, 1, 2, 4, 5, 5, 5, 5, 5 }, + { 1, 2, 2, 4, 5, 5, 5, 5, 5 }, + { 1, 1, 2, 3, 5, 5, 5, 5, 5 }, + { 2, 2, 3, 4, 5, 5, 5, 5, 5 }, + { 0, 1, 2, 4, 5, 5, 5, 5, 5 }, + { 2, 2, 3, 5, 5, 5, 5, 5, 5 }, + { 1, 2, 3, 5, 5, 5, 5, 5, 5 }, + { 0, 1, 3, 4, 5, 5, 5, 5, 5 }, + { 1, 2, 2, 3, 5, 5, 5, 5, 5 }, + { 2, 3, 4, 5, 5, 5, 5, 5, 5 }, + { 0, 2, 3, 4, 5, 5, 5, 5, 5 }, + { 1, 1, 1, 3, 4, 5, 5, 5, 5 }, }, + { { 1, 2, 3, 4, 5, 5, 5, 6, 6 }, + { 1, 2, 3, 4, 5, 6, 6, 6, 6 }, + { 2, 3, 4, 5, 6, 6, 6, 6, 6 }, + { 1, 2, 3, 4, 6, 6, 6, 6, 6 }, + { 2, 2, 3, 4, 5, 5, 5, 6, 6 }, + { 1, 2, 3, 4, 5, 5, 6, 6, 6 }, + { 2, 2, 3, 4, 6, 6, 6, 6, 6 }, + { 2, 2, 3, 4, 5, 6, 6, 6, 6 }, + { 2, 2, 4, 5, 6, 6, 6, 6, 6 }, + { 2, 2, 3, 5, 6, 6, 6, 6, 6 }, + { 1, 2, 3, 5, 6, 6, 6, 6, 6 }, + { 2, 3, 3, 5, 6, 6, 6, 6, 6 }, + { 1, 2, 4, 5, 6, 6, 6, 6, 6 }, + { 2, 2, 3, 4, 5, 5, 6, 6, 6 }, + { 2, 3, 3, 4, 6, 6, 6, 6, 6 }, + { 1, 3, 4, 5, 6, 6, 6, 6, 6 } } +}; + +/** 2D base shape tables for scale factor coding. + * The values are grouped together as follows: + * [num_shape_tables = 64][num_seg_coeffs = 9] */ +static const int8_t atrac3p_sf_shapes[64][9] = { + { -3, -2, -1, 0, 3, 5, 6, 8, 40 }, + { -3, -2, 0, 1, 7, 9, 11, 13, 20 }, + { -1, 0, 0, 1, 6, 8, 10, 13, 41 }, + { 0, 0, 0, 2, 5, 5, 6, 8, 14 }, + { 0, 0, 0, 2, 6, 7, 8, 11, 47 }, + { 0, 0, 1, 2, 5, 7, 8, 10, 32 }, + { 0, 0, 1, 3, 8, 10, 12, 14, 47 }, + { 0, 0, 2, 4, 9, 10, 12, 14, 40 }, + { 0, 0, 3, 5, 9, 10, 12, 14, 22 }, + { 0, 1, 3, 5, 10, 14, 18, 22, 31 }, + { 0, 2, 5, 6, 10, 10, 10, 12, 46 }, + { 0, 2, 5, 7, 12, 14, 15, 18, 44 }, + { 1, 1, 4, 5, 7, 7, 8, 9, 15 }, + { 1, 2, 2, 2, 4, 5, 7, 9, 26 }, + { 1, 2, 2, 3, 6, 7, 7, 8, 47 }, + { 1, 2, 2, 3, 6, 8, 10, 13, 22 }, + { 1, 3, 4, 7, 13, 17, 21, 24, 41 }, + { 1, 4, 0, 4, 10, 12, 13, 14, 17 }, + { 2, 3, 3, 3, 6, 8, 10, 13, 48 }, + { 2, 3, 3, 4, 9, 12, 14, 17, 47 }, + { 2, 3, 3, 5, 10, 12, 14, 17, 25 }, + { 2, 3, 5, 7, 8, 9, 9, 9, 13 }, + { 2, 3, 5, 9, 16, 21, 25, 28, 33 }, + { 2, 4, 5, 8, 12, 14, 17, 19, 26 }, + { 2, 4, 6, 8, 12, 13, 13, 15, 20 }, + { 2, 4, 7, 12, 20, 26, 30, 32, 35 }, + { 3, 3, 5, 6, 12, 14, 16, 19, 34 }, + { 3, 4, 4, 5, 7, 9, 10, 11, 48 }, + { 3, 4, 5, 6, 8, 9, 10, 11, 16 }, + { 3, 5, 5, 5, 7, 9, 10, 13, 35 }, + { 3, 5, 5, 7, 10, 12, 13, 15, 49 }, + { 3, 5, 7, 7, 8, 7, 9, 12, 21 }, + { 3, 5, 7, 8, 12, 14, 15, 15, 24 }, + { 3, 5, 7, 10, 16, 21, 24, 27, 44 }, + { 3, 5, 8, 14, 21, 26, 28, 29, 42 }, + { 3, 6, 10, 13, 18, 19, 20, 22, 27 }, + { 3, 6, 11, 16, 24, 27, 28, 29, 31 }, + { 4, 5, 4, 3, 4, 6, 8, 11, 18 }, + { 4, 6, 5, 6, 9, 10, 12, 14, 20 }, + { 4, 6, 7, 6, 6, 6, 7, 8, 46 }, + { 4, 6, 7, 9, 13, 16, 18, 20, 48 }, + { 4, 6, 7, 9, 14, 17, 20, 23, 31 }, + { 4, 6, 9, 11, 14, 15, 15, 17, 21 }, + { 4, 8, 13, 20, 27, 32, 35, 36, 38 }, + { 5, 6, 6, 4, 5, 6, 7, 6, 6 }, + { 5, 7, 7, 8, 9, 9, 10, 12, 49 }, + { 5, 8, 9, 9, 10, 11, 12, 13, 42 }, + { 5, 8, 10, 12, 15, 16, 17, 19, 42 }, + { 5, 8, 12, 17, 26, 31, 32, 33, 44 }, + { 5, 9, 13, 16, 20, 22, 23, 23, 35 }, + { 6, 8, 8, 7, 6, 5, 6, 8, 15 }, + { 6, 8, 8, 8, 9, 10, 12, 16, 24 }, + { 6, 8, 8, 9, 10, 10, 11, 11, 13 }, + { 6, 8, 10, 13, 19, 21, 24, 26, 32 }, + { 6, 9, 10, 11, 13, 13, 14, 16, 49 }, + { 7, 9, 9, 10, 13, 14, 16, 19, 27 }, + { 7, 10, 12, 13, 16, 16, 17, 17, 27 }, + { 7, 10, 12, 14, 17, 19, 20, 22, 48 }, + { 8, 9, 10, 9, 10, 11, 11, 11, 19 }, + { 8, 11, 12, 12, 13, 13, 13, 13, 17 }, + { 8, 11, 13, 14, 16, 17, 19, 20, 27 }, + { 8, 12, 17, 22, 26, 28, 29, 30, 33 }, + { 10, 14, 16, 19, 21, 22, 22, 24, 28 }, + { 10, 15, 17, 18, 21, 22, 23, 25, 43 } +}; + +static const uint8_t atrac3p_ct_restricted_to_full[2][7][4] = { + { { 0, 5, 4, 1 }, + { 0, 1, 2, 3 }, + { 3, 0, 4, 2 }, + { 4, 0, 1, 2 }, + { 1, 0, 4, 3 }, + { 3, 0, 2, 1 }, + { 0, 3, 1, 2 } }, + { { 4, 0, 1, 2 }, + { 0, 3, 2, 1 }, + { 0, 1, 2, 3 }, + { 0, 1, 2, 4 }, + { 0, 1, 2, 3 }, + { 1, 4, 2, 0 }, + { 0, 1, 2, 3 } } +}; + +/** Tables for spectrum coding */ +static const uint8_t huff_a01_cb[14] = { + 1, 12, 1, 0, 0, 1, 7, 0, 19, 5, 13, 21, 6, 8 +}; + +static const uint8_t huff_a01_xlat[81] = { + 0x00, 0x03, 0x40, 0xC0, 0x10, 0x30, 0x04, 0x0C, 0x01, 0x50, 0xD0, 0x70, + 0xF0, 0xC4, 0x14, 0x34, 0x4C, 0x1C, 0x3C, 0x41, 0xC1, 0x31, 0x05, 0x0D, + 0xC3, 0x13, 0x07, 0x0F, 0x44, 0xCC, 0x11, 0x43, 0x33, 0x54, 0x74, 0xDC, + 0xFC, 0x71, 0x15, 0x4D, 0xCD, 0x1D, 0xD3, 0xC7, 0x37, 0x3F, 0xD4, 0xF4, + 0x5C, 0x7C, 0x51, 0xD1, 0xF1, 0x45, 0xC5, 0x35, 0xDD, 0x3D, 0x53, 0x73, + 0xF3, 0x47, 0x17, 0x77, 0x4F, 0xCF, 0x1F, 0x55, 0xF5, 0x7D, 0xD7, 0x5F, + 0xFF, 0xD5, 0x75, 0x5D, 0xFD, 0x57, 0xF7, 0xDF, 0x7F +}; + +static const uint8_t huff_a02_cb[13] = { + 2, 12, 1, 0, 4, 11, 0, 1, 29, 6, 20, 7, 2 +}; + +static const uint8_t huff_a02_xlat[81] = { + 0x00, 0x40, 0x10, 0x04, 0x01, 0x50, 0x44, 0x14, 0x54, 0x41, 0x11, 0x51, + 0x05, 0x45, 0x15, 0x55, 0x90, 0x80, 0x20, 0x60, 0x84, 0x94, 0x24, 0x64, + 0x08, 0x48, 0x18, 0x58, 0x81, 0x91, 0x21, 0x85, 0x95, 0x65, 0x09, 0x49, + 0x19, 0x59, 0x02, 0x42, 0x12, 0x52, 0x06, 0x46, 0x16, 0x56, 0x88, 0x61, + 0x25, 0x29, 0x69, 0x5A, 0xA0, 0xA4, 0x98, 0x28, 0x68, 0xA1, 0xA5, 0x89, + 0x99, 0xA9, 0x82, 0x92, 0x22, 0x62, 0x96, 0x26, 0x66, 0x0A, 0x4A, 0x1A, + 0xA8, 0x86, 0xA6, 0x8A, 0x9A, 0x2A, 0x6A, 0xA2, 0xAA +}; + +static const uint8_t huff_a03_cb[9] = { 3, 9, 1, 8, 0, 13, 18, 7, 2 }; + +static const uint8_t huff_a03_xlat[49] = { + 0x00, 0x08, 0x38, 0x01, 0x09, 0x39, 0x07, 0x0F, 0x3F, 0x10, 0x30, 0x11, + 0x31, 0x02, 0x0A, 0x3A, 0x05, 0x06, 0x0E, 0x3E, 0x17, 0x37, 0x18, 0x28, + 0x19, 0x29, 0x2A, 0x32, 0x03, 0x0B, 0x33, 0x3B, 0x0D, 0x15, 0x3D, 0x16, + 0x1E, 0x36, 0x1F, 0x2F, 0x12, 0x1A, 0x13, 0x2B, 0x1D, 0x35, 0x2E, 0x1B, + 0x2D +}; + +static const uint8_t huff_a04_cb[4] = { 2, 3, 2, 4 }; +static const uint8_t huff_a04_xlat[6] = { 1, 2, 0, 3, 4, 5 }; + +static const uint8_t huff_a05_cb[12] = { + 3, 12, 1, 3, 5, 8, 12, 23, 72, 68, 31, 2 +}; + +static const uint8_t huff_a05_xlat[225] = { + 0x00, 0x10, 0xF0, 0x01, 0x11, 0xF1, 0x0F, 0x1F, 0xFF, 0x20, 0xE0, 0xE1, + 0x02, 0xF2, 0x0E, 0x1E, 0x2F, 0x30, 0xD0, 0x21, 0x12, 0x22, 0xE2, 0x03, + 0x0D, 0x2E, 0xEE, 0xFE, 0xEF, 0x40, 0xC0, 0x31, 0xC1, 0xD1, 0x32, 0xD2, + 0x13, 0x23, 0xE3, 0xF3, 0x04, 0xF4, 0x0C, 0x1C, 0x1D, 0x2D, 0xED, 0xFD, + 0x3E, 0xDE, 0x3F, 0xDF, 0x50, 0x60, 0x70, 0x90, 0xA0, 0xB0, 0x41, 0x51, + 0x61, 0x71, 0x91, 0xA1, 0xB1, 0x42, 0x62, 0x92, 0xA2, 0xC2, 0x33, 0xC3, + 0xD3, 0x14, 0x24, 0x34, 0xD4, 0xE4, 0x05, 0x15, 0xF5, 0x06, 0x16, 0x26, + 0xE6, 0xF6, 0x07, 0x17, 0xE7, 0xF7, 0x09, 0x19, 0x29, 0xF9, 0x0A, 0x1A, + 0x2A, 0xEA, 0xFA, 0x0B, 0x1B, 0xFB, 0x2C, 0x3C, 0xDC, 0xEC, 0xFC, 0x3D, + 0x4D, 0xCD, 0xDD, 0x4E, 0x6E, 0x7E, 0xAE, 0xCE, 0x4F, 0x5F, 0x6F, 0x7F, + 0x9F, 0xAF, 0xBF, 0xCF, 0x52, 0x72, 0xB2, 0x43, 0x53, 0x63, 0x73, 0x93, + 0xA3, 0xB3, 0x44, 0x64, 0x74, 0x94, 0xA4, 0xB4, 0xC4, 0x25, 0x35, 0xA5, + 0xC5, 0xD5, 0xE5, 0x36, 0x46, 0xB6, 0xC6, 0xD6, 0x27, 0x37, 0x47, 0xB7, + 0xC7, 0xD7, 0x39, 0x49, 0x59, 0xC9, 0xD9, 0xE9, 0x3A, 0x4A, 0x5A, 0xCA, + 0xDA, 0x2B, 0x3B, 0x4B, 0x6B, 0x7B, 0xDB, 0xEB, 0x4C, 0x5C, 0x6C, 0x7C, + 0x9C, 0xAC, 0xCC, 0x5D, 0x6D, 0x7D, 0x9D, 0xAD, 0xBD, 0x5E, 0x9E, 0xBE, + 0x54, 0x45, 0x55, 0x65, 0x75, 0x95, 0xB5, 0x56, 0x66, 0x76, 0x96, 0xA6, + 0x57, 0x67, 0x97, 0xA7, 0x69, 0x79, 0xA9, 0xB9, 0x6A, 0x7A, 0x9A, 0xAA, + 0xBA, 0x5B, 0x9B, 0xAB, 0xBB, 0xCB, 0xBC, 0x77, 0x99 +}; + +static const uint8_t huff_a06_cb[7] = { + 2, 6, 1, 3, 2, 6, 4 +}; + +static const uint8_t huff_a06_xlat[16] = { + 1, 0, 2, 3, 4, 5, 6, 7, 8, 9, 13, 14, 10, 11, 12, 15 +}; + +static const uint8_t huff_a07_cb[11] = { + 2, 10, 1, 2, 2, 2, 6, 14, 21, 13, 2 +}; + +static const uint8_t huff_a07_xlat[63] = { + 0, 1, 63, 2, 62, 3, 61, 4, 5, 6, 58, 59, 60, 7, 8, 9, + 10, 26, 27, 28, 36, 37, 38, 54, 55, 56, 57, 11, 12, 13, 14, 15, + 16, 25, 29, 30, 31, 33, 34, 35, 39, 47, 48, 49, 50, 51, 52, 53, + 17, 18, 19, 20, 21, 22, 23, 41, 42, 43, 44, 45, 46, 24, 40 +}; + +static const uint8_t huff_a11_cb[13] = { + 1, 11, 1, 0, 0, 0, 8, 1, 18, 9, 22, 10, 12 +}; + +static const uint8_t huff_a11_xlat[81] = { + 0x00, 0x40, 0xC0, 0x10, 0x30, 0x04, 0x0C, 0x01, 0x03, 0xD0, 0x50, 0x70, + 0xF0, 0xC4, 0x34, 0x4C, 0xCC, 0x1C, 0x41, 0xC1, 0x31, 0x05, 0x0D, 0x43, + 0xC3, 0x13, 0x07, 0x0F, 0x44, 0x14, 0x74, 0xDC, 0x3C, 0x11, 0x1D, 0x33, + 0x37, 0x54, 0xD4, 0xF4, 0x5C, 0x7C, 0xFC, 0xD1, 0x71, 0xF1, 0x15, 0x35, + 0x4D, 0xCD, 0xDD, 0x3D, 0xD3, 0x73, 0x47, 0xC7, 0x17, 0x77, 0x3F, 0x51, + 0x45, 0xC5, 0x55, 0x53, 0xF3, 0x4F, 0xCF, 0x1F, 0xFF, 0xD5, 0x75, 0xF5, + 0x5D, 0x7D, 0xFD, 0x57, 0xD7, 0xF7, 0x5F, 0xDF, 0x7F +}; + +static const uint8_t huff_a12_cb[8] = { 5, 10, 16, 11, 32, 19, 1, 2 }; + +static const uint8_t huff_a12_xlat[81] = { + 0x00, 0x40, 0x10, 0x50, 0x04, 0x44, 0x14, 0x54, 0x01, 0x41, 0x11, 0x51, + 0x05, 0x45, 0x15, 0x55, 0x90, 0x94, 0x58, 0x91, 0x95, 0x19, 0x59, 0x06, + 0x46, 0x16, 0x56, 0x80, 0x60, 0x84, 0x24, 0x64, 0xA4, 0x08, 0x48, 0x18, + 0x68, 0x81, 0x21, 0x61, 0xA1, 0x85, 0x25, 0x65, 0xA5, 0x09, 0x49, 0x99, + 0x69, 0xA9, 0x02, 0x42, 0x12, 0x52, 0x96, 0x26, 0x66, 0x1A, 0x5A, 0x20, + 0xA0, 0x88, 0x98, 0x28, 0xA8, 0x89, 0x29, 0x82, 0x92, 0x22, 0x62, 0x86, + 0xA6, 0x0A, 0x4A, 0x9A, 0x6A, 0xAA, 0xA2, 0x8A, 0x2A +}; + +static const uint8_t huff_a13_cb[12] = { + 1, 10, 1, 0, 0, 4, 2, 2, 9, 15, 12, 4 +}; + +static const uint8_t huff_a13_xlat[49] = { + 0x00, 0x08, 0x38, 0x01, 0x07, 0x39, 0x0F, 0x09, 0x3F, 0x10, 0x30, 0x31, + 0x02, 0x3A, 0x06, 0x0E, 0x3E, 0x17, 0x18, 0x28, 0x11, 0x29, 0x0A, 0x32, + 0x03, 0x0B, 0x3B, 0x05, 0x0D, 0x3D, 0x16, 0x1F, 0x37, 0x19, 0x12, 0x1A, + 0x2A, 0x13, 0x33, 0x15, 0x35, 0x1E, 0x2E, 0x36, 0x2F, 0x1B, 0x2B, 0x1D, + 0x2D +}; + +static const uint8_t huff_a14_cb[12] = { + 2, 11, 1, 0, 4, 3, 5, 16, 28, 34, 26, 4 +}; + +static const uint8_t huff_a14_xlat[121] = { + 0x00, 0x10, 0xF0, 0x01, 0x0F, 0xF1, 0x1F, 0xFF, 0x20, 0xE0, 0x11, 0x02, + 0x0E, 0x30, 0x50, 0xB0, 0xD0, 0x21, 0xE1, 0x12, 0xF2, 0x03, 0x05, 0x0B, + 0x0D, 0x1E, 0xFE, 0x2F, 0xEF, 0x40, 0xC0, 0x31, 0x51, 0xB1, 0xC1, 0xD1, + 0x22, 0x52, 0xE2, 0x13, 0xF3, 0x04, 0x15, 0xF5, 0x1B, 0xEB, 0xFB, 0x0C, + 0x1D, 0xFD, 0x2E, 0x5E, 0xEE, 0x3F, 0x5F, 0xBF, 0xDF, 0x41, 0x32, 0x42, + 0xB2, 0xD2, 0x23, 0x53, 0xB3, 0xE3, 0x14, 0x24, 0xE4, 0xF4, 0x25, 0x35, + 0xD5, 0xE5, 0x2B, 0x3B, 0xDB, 0x1C, 0x2C, 0xBC, 0xEC, 0xFC, 0x2D, 0xBD, + 0xED, 0x3E, 0x4E, 0xBE, 0xDE, 0x4F, 0xCF, 0xC2, 0x33, 0x43, 0xC3, 0xD3, + 0x34, 0x44, 0x54, 0xB4, 0xD4, 0x45, 0x55, 0xC5, 0x4B, 0xCB, 0x3C, 0x4C, + 0x5C, 0xCC, 0xDC, 0x3D, 0x4D, 0x5D, 0xCD, 0xDD, 0xCE, 0xC4, 0xB5, 0x5B, + 0xBB +}; + +static const uint8_t huff_a15_cb[9] = { 5, 11, 9, 12, 16, 44, 98, 42, 4 }; + +static const uint8_t huff_a15_xlat[225] = { + 0x00, 0x10, 0xF0, 0x01, 0x11, 0xF1, 0x0F, 0x1F, 0xFF, 0x20, 0xE0, 0x21, + 0xE1, 0x02, 0x12, 0xF2, 0x0E, 0x1E, 0xFE, 0x2F, 0xEF, 0x30, 0xD0, 0x31, + 0xD1, 0x22, 0xE2, 0x03, 0x13, 0xF3, 0x0D, 0x1D, 0xFD, 0x2E, 0xEE, 0x3F, + 0xDF, 0x40, 0x60, 0x70, 0x90, 0xA0, 0xC0, 0x41, 0xC1, 0x32, 0x42, 0xC2, + 0xD2, 0x23, 0x33, 0xD3, 0xE3, 0x04, 0x14, 0x24, 0xE4, 0xF4, 0x06, 0x16, + 0xF6, 0x07, 0x09, 0x0A, 0x1A, 0xFA, 0x0C, 0x1C, 0x2C, 0xEC, 0xFC, 0x2D, + 0x3D, 0xDD, 0xED, 0x3E, 0x4E, 0xCE, 0xDE, 0x4F, 0xCF, 0x50, 0xB0, 0x51, + 0x61, 0x71, 0x91, 0xA1, 0xB1, 0x52, 0x62, 0x72, 0x92, 0xA2, 0xB2, 0x43, + 0x53, 0x63, 0x73, 0x93, 0xA3, 0xC3, 0x34, 0x44, 0x64, 0xA4, 0xC4, 0xD4, + 0x05, 0x15, 0x25, 0x35, 0xD5, 0xE5, 0xF5, 0x26, 0x36, 0x46, 0xC6, 0xD6, + 0xE6, 0x17, 0x27, 0x37, 0xC7, 0xD7, 0xE7, 0xF7, 0x19, 0x29, 0x39, 0xC9, + 0xD9, 0xE9, 0xF9, 0x2A, 0x3A, 0x4A, 0x5A, 0xCA, 0xDA, 0xEA, 0x0B, 0x1B, + 0x2B, 0x3B, 0xCB, 0xDB, 0xEB, 0xFB, 0x3C, 0x4C, 0x6C, 0x7C, 0x9C, 0xAC, + 0xBC, 0xCC, 0xDC, 0x4D, 0x5D, 0x6D, 0x7D, 0x9D, 0xAD, 0xBD, 0xCD, 0x5E, + 0x6E, 0x7E, 0x9E, 0xAE, 0xBE, 0x5F, 0x6F, 0x7F, 0x9F, 0xAF, 0xBF, 0xB3, + 0x54, 0x74, 0x94, 0xB4, 0x45, 0x55, 0x65, 0x75, 0x95, 0xA5, 0xB5, 0xC5, + 0x56, 0x66, 0x76, 0x96, 0xA6, 0xB6, 0x47, 0x57, 0x67, 0xA7, 0xB7, 0x49, + 0x59, 0x69, 0xA9, 0xB9, 0x6A, 0x7A, 0x9A, 0xAA, 0xBA, 0x4B, 0x5B, 0x6B, + 0x7B, 0x9B, 0xAB, 0xBB, 0x5C, 0x77, 0x97, 0x79, 0x99 +}; + +static const uint8_t huff_a16_cb[13] = { + 2, 12, 1, 1, 2, 2, 5, 7, 21, 54, 85, 62, 16 +}; + +static const uint8_t huff_a16_xlat[256] = { + 0x00, 0x01, 0x10, 0x11, 0x21, 0x12, 0x20, 0x31, 0x02, 0x22, 0x13, 0x30, + 0x41, 0x32, 0x03, 0x23, 0x14, 0x24, 0x40, 0x51, 0x61, 0xD1, 0xE1, 0x42, + 0x52, 0xD2, 0x33, 0x43, 0xD3, 0x04, 0x34, 0x05, 0x15, 0x25, 0x16, 0x1D, + 0x2D, 0x1E, 0x2E, 0x50, 0x60, 0xD0, 0xE0, 0xF0, 0x71, 0x81, 0xF1, 0x62, + 0x72, 0xE2, 0xF2, 0x53, 0x63, 0xE3, 0xF3, 0x44, 0x54, 0xD4, 0xE4, 0xF4, + 0x35, 0x45, 0x55, 0xD5, 0xE5, 0xF5, 0x06, 0x26, 0x36, 0xD6, 0x07, 0x17, + 0x27, 0x37, 0xD7, 0x18, 0x28, 0x1C, 0x0D, 0x3D, 0x4D, 0x5D, 0x6D, 0x8D, + 0x0E, 0x3E, 0x4E, 0x5E, 0x0F, 0x1F, 0x2F, 0x3F, 0x5F, 0x70, 0x80, 0x90, + 0xC0, 0x91, 0xA1, 0xB1, 0xC1, 0x82, 0x92, 0xA2, 0xC2, 0x73, 0x83, 0x93, + 0xA3, 0xC3, 0x64, 0x74, 0x84, 0x94, 0xA4, 0xC4, 0x65, 0x75, 0x85, 0x46, + 0x56, 0x66, 0xC6, 0xE6, 0xF6, 0x47, 0x57, 0xE7, 0xF7, 0x08, 0x38, 0x48, + 0x58, 0x68, 0xD8, 0xE8, 0xF8, 0x09, 0x19, 0x29, 0x39, 0x59, 0xD9, 0xE9, + 0xF9, 0x1A, 0x2A, 0x3A, 0xDA, 0xEA, 0xFA, 0x1B, 0x2B, 0xDB, 0xEB, 0xFB, + 0x0C, 0x2C, 0x3C, 0xDC, 0xEC, 0x7D, 0x9D, 0xAD, 0xBD, 0xCD, 0x6E, 0x7E, + 0x8E, 0x9E, 0xAE, 0xBE, 0xCE, 0x4F, 0x6F, 0x7F, 0x8F, 0xAF, 0xA0, 0xB2, + 0xB3, 0xB4, 0x95, 0xA5, 0xB5, 0xC5, 0x76, 0x86, 0x96, 0xA6, 0xB6, 0x67, + 0x77, 0x87, 0x97, 0xC7, 0x78, 0x88, 0x98, 0xC8, 0x49, 0x69, 0x79, 0x89, + 0x99, 0xC9, 0x0A, 0x4A, 0x5A, 0x6A, 0x7A, 0xCA, 0x0B, 0x3B, 0x4B, 0x5B, + 0x6B, 0xCB, 0x4C, 0x5C, 0x6C, 0x7C, 0x8C, 0x9C, 0xAC, 0xBC, 0xCC, 0xFC, + 0xDD, 0xED, 0xFD, 0xDE, 0xEE, 0xFE, 0x9F, 0xBF, 0xCF, 0xDF, 0xEF, 0xFF, + 0xB0, 0xA7, 0xB7, 0xA8, 0xB8, 0xA9, 0xB9, 0x8A, 0x9A, 0xAA, 0xBA, 0x7B, + 0x8B, 0x9B, 0xAB, 0xBB +}; + +static const uint8_t huff_a17_cb[9] = { 3, 9, 3, 2, 5, 7, 17, 23, 6 }; + +static const uint8_t huff_a17_xlat[63] = { + 0, 1, 63, 2, 62, 3, 4, 59, 60, 61, 5, 6, 7, 8, 56, 57, + 58, 9, 10, 11, 12, 13, 14, 26, 27, 36, 37, 38, 50, 51, 52, 53, + 54, 55, 15, 16, 17, 18, 19, 20, 21, 25, 28, 29, 30, 31, 33, 34, + 35, 39, 43, 44, 45, 46, 47, 48, 49, 22, 23, 24, 40, 41, 42 +}; + +static const uint8_t huff_a21_cb[14] = { + 1, 12, 1, 0, 0, 2, 6, 0, 7, 21, 15, 17, 8, 4 +}; + +static const uint8_t huff_a21_xlat[81] = { + 0x00, 0x40, 0xC0, 0x10, 0x30, 0x04, 0x0C, 0x01, 0x03, 0xD0, 0x70, 0x34, + 0x1C, 0x0D, 0x13, 0x07, 0x50, 0xF0, 0x44, 0xC4, 0x14, 0x74, 0x4C, 0xCC, + 0xDC, 0x3C, 0x41, 0xC1, 0x11, 0x31, 0x05, 0x1D, 0x43, 0xC3, 0x33, 0x37, + 0x0F, 0x54, 0xF4, 0xFC, 0xD1, 0x71, 0x15, 0x4D, 0xCD, 0xDD, 0xD3, 0x73, + 0x47, 0xC7, 0x77, 0x3F, 0xD4, 0x5C, 0x7C, 0x51, 0xF1, 0x45, 0xC5, 0x55, + 0x35, 0x3D, 0x53, 0xF3, 0x17, 0x4F, 0xCF, 0x1F, 0xFF, 0x75, 0xF5, 0x5D, + 0x7D, 0xD7, 0xF7, 0x5F, 0xDF, 0xD5, 0xFD, 0x57, 0x7F +}; + +static const uint8_t huff_a22_cb[10] = { 2, 9, 1, 4, 0, 4, 3, 8, 3, 2 }; + +static const uint8_t huff_a22_xlat[25] = { + 0x00, 0x08, 0x38, 0x01, 0x07, 0x09, 0x39, 0x0F, 0x3F, 0x10, 0x02, 0x06, + 0x30, 0x11, 0x31, 0x0A, 0x3A, 0x0E, 0x17, 0x37, 0x32, 0x16, 0x3E, 0x12, + 0x36 +}; + +static const uint8_t huff_a23_cb[9] = { 3, 9, 5, 0, 4, 6, 10, 16, 8 }; + +static const uint8_t huff_a23_xlat[49] = { + 0x00, 0x08, 0x38, 0x01, 0x07, 0x09, 0x39, 0x0F, 0x3F, 0x10, 0x30, 0x02, + 0x3A, 0x06, 0x0E, 0x18, 0x28, 0x11, 0x31, 0x0A, 0x03, 0x05, 0x3E, 0x17, + 0x37, 0x19, 0x29, 0x12, 0x2A, 0x32, 0x0B, 0x33, 0x3B, 0x0D, 0x15, 0x3D, + 0x16, 0x1E, 0x36, 0x1F, 0x2F, 0x1A, 0x13, 0x1B, 0x2B, 0x1D, 0x2D, 0x35, + 0x2E +}; + +static const uint8_t huff_a24_cb[5] = { 2, 4, 3, 1, 2 }; + +static const uint8_t huff_a25_cb[5] = { 2, 4, 1, 5, 2 }; + +static const uint8_t huff_a25_xlat[8] = { 1, 0, 2, 3, 4, 5, 6, 7 }; + +static const uint8_t huff_a26_cb[10] = { 4, 11, 3, 4, 12, 15, 34, 83, 75, 30 }; + +static const uint8_t huff_a26_xlat[256] = { + 0x00, 0x01, 0x11, 0x10, 0x21, 0x12, 0x22, 0x20, 0x30, 0x31, 0x41, 0x02, + 0x32, 0x03, 0x13, 0x23, 0x33, 0x14, 0x24, 0x40, 0x51, 0x61, 0x42, 0x52, + 0x43, 0x53, 0x04, 0x34, 0x44, 0x15, 0x25, 0x35, 0x16, 0x26, 0x50, 0x60, + 0x71, 0x81, 0xD1, 0x62, 0x72, 0x82, 0xD2, 0x63, 0x73, 0xD3, 0x54, 0x64, + 0x05, 0x45, 0x55, 0x65, 0x06, 0x36, 0x46, 0x56, 0x17, 0x27, 0x37, 0x47, + 0x18, 0x28, 0x38, 0x19, 0x1D, 0x2D, 0x3D, 0x1E, 0x70, 0x80, 0x90, 0xD0, + 0xE0, 0x91, 0xA1, 0xB1, 0xC1, 0xE1, 0xF1, 0x92, 0xA2, 0xC2, 0xE2, 0xF2, + 0x83, 0x93, 0xA3, 0xC3, 0xE3, 0xF3, 0x74, 0x84, 0x94, 0xA4, 0xC4, 0xD4, + 0xE4, 0xF4, 0x75, 0x85, 0x95, 0xD5, 0xE5, 0x66, 0x76, 0x86, 0xD6, 0xE6, + 0x07, 0x57, 0x67, 0x77, 0xD7, 0x08, 0x48, 0x58, 0x68, 0xD8, 0x09, 0x29, + 0x39, 0x49, 0x59, 0x69, 0x1A, 0x2A, 0x3A, 0x4A, 0x1B, 0x2B, 0x1C, 0x2C, + 0x3C, 0x4C, 0x0D, 0x4D, 0x5D, 0x6D, 0x7D, 0x8D, 0x0E, 0x2E, 0x3E, 0x4E, + 0x5E, 0x6E, 0x1F, 0x2F, 0x3F, 0x4F, 0x5F, 0xA0, 0xB0, 0xC0, 0xF0, 0xB2, + 0xB3, 0xB4, 0xA5, 0xB5, 0xC5, 0xF5, 0x96, 0xA6, 0xB6, 0xC6, 0xF6, 0x87, + 0x97, 0xA7, 0xB7, 0xC7, 0xE7, 0xF7, 0x78, 0x88, 0x98, 0xA8, 0xC8, 0xE8, + 0xF8, 0x79, 0x89, 0x99, 0xC9, 0xD9, 0xE9, 0xF9, 0x0A, 0x5A, 0x6A, 0x7A, + 0x8A, 0xDA, 0xEA, 0xFA, 0x0B, 0x3B, 0x4B, 0x5B, 0x6B, 0x7B, 0x8B, 0xDB, + 0x0C, 0x5C, 0x6C, 0x7C, 0x8C, 0x9C, 0xDC, 0x9D, 0xAD, 0xBD, 0xCD, 0x7E, + 0x8E, 0x9E, 0xAE, 0xBE, 0x0F, 0x6F, 0x7F, 0x8F, 0x9F, 0xAF, 0xB8, 0xA9, + 0xB9, 0x9A, 0xAA, 0xBA, 0xCA, 0x9B, 0xAB, 0xBB, 0xCB, 0xEB, 0xFB, 0xAC, + 0xBC, 0xCC, 0xEC, 0xFC, 0xDD, 0xED, 0xFD, 0xCE, 0xDE, 0xEE, 0xFE, 0xBF, + 0xCF, 0xDF, 0xEF, 0xFF +}; + +static const uint8_t huff_a27_cb[7] = { 4, 8, 3, 14, 10, 20, 16 }; + +static const uint8_t huff_a27_xlat[63] = { + 0, 2, 3, 1, 5, 6, 7, 9, 54, 55, 56, 58, 59, 60, 61, 62, + 63, 4, 8, 10, 11, 12, 14, 49, 52, 53, 57, 13, 15, 16, 17, 18, + 19, 22, 23, 25, 26, 30, 39, 43, 44, 45, 46, 47, 48, 50, 51, 20, + 21, 24, 27, 28, 29, 31, 33, 34, 35, 36, 37, 38, 40, 41, 42 +}; + +static const uint8_t huff_a31_cb[8] = { 1, 6, 1, 0, 3, 1, 0, 4 }; + +static const uint8_t huff_a31_xlat[9] = { + 0x00, 0x04, 0x0C, 0x01, 0x03, 0x05, 0x0D, 0x07, 0x0F +}; + +static const uint8_t huff_a32_cb[13] = { + 1, 11, 1, 0, 0, 2, 2, 6, 12, 18, 19, 15, 6 +}; + +static const uint8_t huff_a32_xlat[81] = { + 0x00, 0x40, 0x01, 0x10, 0x04, 0x80, 0x50, 0x20, 0x14, 0x05, 0x02, 0x90, + 0x60, 0x44, 0x54, 0x24, 0x08, 0x18, 0x41, 0x11, 0x15, 0x09, 0x06, 0xA0, + 0x84, 0x94, 0x64, 0xA4, 0x48, 0x58, 0x28, 0x51, 0x21, 0x45, 0x55, 0x25, + 0x19, 0x12, 0x16, 0x0A, 0x1A, 0x68, 0xA8, 0x81, 0x91, 0x61, 0xA1, 0x85, + 0x95, 0x65, 0xA5, 0x49, 0x59, 0x29, 0x69, 0x42, 0x52, 0x46, 0x56, 0x2A, + 0x88, 0x98, 0x89, 0x99, 0xA9, 0x82, 0x92, 0x22, 0x62, 0x86, 0x26, 0x66, + 0x4A, 0x5A, 0x6A, 0xA2, 0x96, 0xA6, 0x8A, 0x9A, 0xAA +}; + +static const uint8_t huff_a33_cb[12] = { + 3, 12, 1, 1, 13, 1, 14, 28, 33, 81, 32, 52 +}; + +static const uint8_t huff_a33_xlat[256] = { + 0x00, 0x10, 0x40, 0x50, 0x04, 0x44, 0x14, 0x54, 0x01, 0x41, 0x11, 0x51, + 0x05, 0x45, 0x15, 0x55, 0x90, 0x20, 0x94, 0x64, 0x18, 0x21, 0x95, 0x19, + 0x69, 0x02, 0x52, 0x06, 0x46, 0x16, 0x80, 0x60, 0x84, 0xD4, 0x24, 0x08, + 0x48, 0x58, 0x68, 0x81, 0x91, 0x61, 0x85, 0x25, 0x65, 0xA5, 0x09, 0x49, + 0x59, 0x29, 0x42, 0x12, 0x56, 0x96, 0xA6, 0x0A, 0x17, 0x1B, 0xD0, 0xC4, + 0x74, 0xF4, 0x88, 0xC8, 0x28, 0xA1, 0x71, 0xC5, 0xD5, 0x75, 0x99, 0xB9, + 0x4D, 0x1D, 0x2D, 0x6D, 0x22, 0x62, 0x66, 0x4A, 0x1A, 0x9A, 0x6A, 0x8E, + 0x5E, 0x43, 0x23, 0x07, 0x47, 0x57, 0x6B, 0xC0, 0xA0, 0xE0, 0x70, 0xB0, + 0xA4, 0xE4, 0x34, 0xB4, 0x98, 0xD8, 0xA8, 0x38, 0x78, 0x0C, 0x4C, 0x1C, + 0x5C, 0x9C, 0x6C, 0x7C, 0xC1, 0xD1, 0xE1, 0x31, 0xE5, 0x35, 0xB5, 0xF5, + 0x89, 0xA9, 0x79, 0xF9, 0x0D, 0xCD, 0x9D, 0xDD, 0xAD, 0x3D, 0x7D, 0x82, + 0xC2, 0x92, 0xD2, 0xE2, 0x72, 0xF2, 0x86, 0xD6, 0xE6, 0x76, 0xB6, 0x8A, + 0x5A, 0xDA, 0xEA, 0xFA, 0x4E, 0x1E, 0x9E, 0xEE, 0x03, 0x13, 0x53, 0x97, + 0xB7, 0x0B, 0x4B, 0x8B, 0x5B, 0x9B, 0xEB, 0x7B, 0x0F, 0x4F, 0x1F, 0x5F, + 0x9F, 0x2F, 0x3F, 0xBF, 0xE8, 0xB8, 0xF8, 0x8C, 0x2C, 0x3C, 0xFC, 0xB1, + 0xC9, 0xD9, 0xE9, 0x39, 0x5D, 0xED, 0xBD, 0xA2, 0x32, 0x26, 0x36, 0x2A, + 0xAA, 0xBA, 0x0E, 0x2E, 0x6E, 0x83, 0xC3, 0x93, 0x63, 0xB3, 0xA7, 0x37, + 0x30, 0xF0, 0xCC, 0xDC, 0xAC, 0xEC, 0xBC, 0xF1, 0x8D, 0xFD, 0xB2, 0xC6, + 0xF6, 0xCA, 0x3A, 0x7A, 0xCE, 0xDE, 0xAE, 0x3E, 0x7E, 0xBE, 0xFE, 0xD3, + 0xA3, 0xE3, 0x33, 0x73, 0xF3, 0x87, 0xC7, 0xD7, 0x27, 0x67, 0xE7, 0x77, + 0xF7, 0xCB, 0xDB, 0x2B, 0xAB, 0x3B, 0xBB, 0xFB, 0x8F, 0xCF, 0xDF, 0x6F, + 0xAF, 0xEF, 0x7F, 0xFF +}; + +static const uint8_t huff_a34_cb[7] = { 1, 5, 1, 1, 1, 1, 2 }; + +static const uint8_t huff_a34_xlat[6] = { 1, 0, 2, 3, 4, 5 }; + +static const uint8_t huff_a35_cb[11] = { 2, 10, 1, 0, 2, 3, 6, 19, 9, 75, 110 }; + +static const uint8_t huff_a35_xlat[225] = { + 0x00, 0xF0, 0x0F, 0x10, 0x01, 0xFF, 0x20, 0xE0, 0x11, 0xF1, 0x0E, 0x1F, + 0x30, 0x40, 0xD0, 0x21, 0xE1, 0x02, 0x12, 0x22, 0xE2, 0xF2, 0x03, 0x13, + 0x1E, 0x2E, 0x3E, 0xEE, 0xFE, 0x2F, 0xEF, 0xD2, 0x43, 0xF3, 0x04, 0x0D, + 0x2D, 0x3D, 0x3F, 0xDF, 0x50, 0x60, 0x70, 0x90, 0xB0, 0x31, 0x41, 0x91, + 0xA1, 0xC1, 0xD1, 0x42, 0xA2, 0xC2, 0x23, 0x33, 0xE3, 0x24, 0x34, 0xB4, + 0xD4, 0xF4, 0x05, 0x15, 0x45, 0xE5, 0x16, 0x36, 0x56, 0xA6, 0xC6, 0xD6, + 0xF6, 0x57, 0xC7, 0xF7, 0x09, 0x29, 0x49, 0x59, 0x69, 0xF9, 0x0A, 0x2A, + 0x3A, 0x4A, 0xDA, 0xEA, 0xFA, 0x0B, 0x2B, 0xAB, 0xEB, 0xFB, 0x0C, 0x1C, + 0x2C, 0x3C, 0x4C, 0x5C, 0xCC, 0xDC, 0xFC, 0x1D, 0x4D, 0x6D, 0xBD, 0xCD, + 0xED, 0xFD, 0x4E, 0x6E, 0xCE, 0xDE, 0x7F, 0xA0, 0xC0, 0x51, 0x61, 0x71, + 0xB1, 0x32, 0x52, 0x62, 0x72, 0x92, 0xB2, 0x53, 0x63, 0x73, 0x93, 0xA3, + 0xB3, 0xC3, 0xD3, 0x14, 0x44, 0x54, 0x64, 0x74, 0x94, 0xA4, 0xC4, 0xE4, + 0x25, 0x35, 0x55, 0x65, 0x75, 0x95, 0xA5, 0xB5, 0xC5, 0xD5, 0xF5, 0x06, + 0x26, 0x46, 0x66, 0x76, 0x96, 0xB6, 0xE6, 0x07, 0x17, 0x27, 0x37, 0x47, + 0x67, 0x77, 0x97, 0xA7, 0xB7, 0xD7, 0xE7, 0x19, 0x39, 0x79, 0x99, 0xA9, + 0xB9, 0xC9, 0xD9, 0xE9, 0x1A, 0x5A, 0x6A, 0x7A, 0x9A, 0xAA, 0xBA, 0xCA, + 0x1B, 0x3B, 0x4B, 0x5B, 0x6B, 0x7B, 0x9B, 0xBB, 0xCB, 0xDB, 0x6C, 0x7C, + 0x9C, 0xAC, 0xBC, 0xEC, 0x5D, 0x7D, 0x9D, 0xAD, 0xDD, 0x5E, 0x7E, 0x9E, + 0xAE, 0xBE, 0x4F, 0x5F, 0x6F, 0x9F, 0xAF, 0xBF, 0xCF +}; + +static const uint8_t huff_a36_cb[12] = { + 3, 12, 1, 3, 5, 5, 13, 27, 69, 96, 35, 2 +}; + +static const uint8_t huff_a36_xlat[256] = { + 0x00, 0x10, 0x01, 0x11, 0x20, 0x21, 0x02, 0x12, 0x22, 0x31, 0x41, 0x32, + 0x13, 0x23, 0x30, 0x40, 0x51, 0x42, 0x03, 0x33, 0x43, 0x04, 0x14, 0x24, + 0x34, 0x15, 0x25, 0x50, 0x61, 0x71, 0xD1, 0x52, 0x62, 0x72, 0xD2, 0x53, + 0x63, 0xD3, 0x44, 0x54, 0x64, 0x05, 0x35, 0x45, 0x55, 0x16, 0x26, 0x36, + 0x46, 0x17, 0x27, 0x1D, 0x2D, 0x3D, 0x60, 0x70, 0xD0, 0x81, 0x91, 0xA1, + 0xC1, 0xE1, 0xF1, 0x82, 0x92, 0xC2, 0xE2, 0xF2, 0x73, 0x83, 0xE3, 0xF3, + 0x74, 0x84, 0xC4, 0xD4, 0xE4, 0xF4, 0x65, 0x75, 0x85, 0xD5, 0xE5, 0x06, + 0x56, 0x66, 0xD6, 0xE6, 0x07, 0x37, 0x47, 0x57, 0x67, 0xD7, 0xE7, 0x18, + 0x28, 0x38, 0x48, 0x58, 0xD8, 0x19, 0x29, 0x2A, 0x1C, 0x2C, 0x0D, 0x4D, + 0x5D, 0x6D, 0x7D, 0x8D, 0x9D, 0x1E, 0x2E, 0x3E, 0x4E, 0x5E, 0x6E, 0x7E, + 0x1F, 0x2F, 0x3F, 0x80, 0x90, 0xA0, 0xC0, 0xE0, 0xF0, 0xB1, 0xA2, 0xB2, + 0x93, 0xA3, 0xB3, 0xC3, 0x94, 0xA4, 0xB4, 0x95, 0xA5, 0xB5, 0xC5, 0xF5, + 0x76, 0x86, 0x96, 0xA6, 0xC6, 0xF6, 0x77, 0x87, 0x97, 0xA7, 0xC7, 0xF7, + 0x08, 0x68, 0x78, 0x88, 0x98, 0xC8, 0xE8, 0xF8, 0x09, 0x39, 0x49, 0x59, + 0x69, 0x79, 0x89, 0xD9, 0xE9, 0xF9, 0x0A, 0x1A, 0x3A, 0x4A, 0x5A, 0x6A, + 0xDA, 0xEA, 0xFA, 0x1B, 0x2B, 0x3B, 0x4B, 0x5B, 0xDB, 0xEB, 0xFB, 0x0C, + 0x3C, 0x4C, 0x5C, 0x6C, 0x7C, 0x8C, 0x9C, 0xDC, 0xEC, 0xAD, 0xBD, 0xCD, + 0xDD, 0xED, 0x0E, 0x8E, 0x9E, 0xAE, 0xBE, 0x0F, 0x4F, 0x5F, 0x6F, 0x7F, + 0x8F, 0x9F, 0xAF, 0xB0, 0xB6, 0xB7, 0xA8, 0xB8, 0x99, 0xA9, 0xB9, 0xC9, + 0x7A, 0x8A, 0x9A, 0xAA, 0xBA, 0xCA, 0x0B, 0x6B, 0x7B, 0x8B, 0x9B, 0xCB, + 0xAC, 0xBC, 0xCC, 0xFC, 0xFD, 0xCE, 0xDE, 0xEE, 0xFE, 0xBF, 0xCF, 0xDF, + 0xEF, 0xFF, 0xAB, 0xBB +}; + +static const uint8_t huff_a37_cb[7] = { 4, 8, 7, 6, 8, 22, 20 }; + +static const uint8_t huff_a37_xlat[63] = { + 0, 1, 2, 3, 61, 62, 63, 4, 5, 6, 58, 59, 60, 7, 8, 9, + 10, 54, 55, 56, 57, 11, 12, 13, 14, 15, 16, 25, 26, 27, 28, 29, + 30, 35, 36, 37, 38, 48, 49, 50, 51, 52, 53, 17, 18, 19, 20, 21, + 22, 23, 24, 31, 33, 34, 39, 40, 41, 42, 43, 44, 45, 46, 47 +}; + +static const uint8_t huff_a41_cb[14] = { + 1, 12, 1, 0, 0, 6, 2, 0, 0, 0, 19, 9, 24, 20 +}; + +static const uint8_t huff_a41_xlat[81] = { + 0x00, 0x40, 0xC0, 0x10, 0x30, 0x04, 0x0C, 0x01, 0x03, 0x50, 0xD0, 0x70, + 0xF0, 0xC4, 0x34, 0x4C, 0xCC, 0x1C, 0x41, 0xC1, 0x31, 0x05, 0x0D, 0x43, + 0xC3, 0x13, 0x07, 0x0F, 0x44, 0x14, 0x74, 0xDC, 0x3C, 0x11, 0x1D, 0x33, + 0x37, 0x54, 0xD4, 0xF4, 0x5C, 0x7C, 0xFC, 0xD1, 0x71, 0xF1, 0xC5, 0x15, + 0x35, 0x4D, 0xCD, 0xDD, 0x3D, 0xD3, 0x73, 0x47, 0xC7, 0x17, 0x77, 0x1F, + 0x3F, 0x51, 0x45, 0x55, 0xD5, 0x75, 0xF5, 0x5D, 0x7D, 0xFD, 0x53, 0xF3, + 0x57, 0xD7, 0xF7, 0x4F, 0xCF, 0x5F, 0xDF, 0x7F, 0xFF +}; + +static const uint8_t huff_a42_cb[10] = { 3, 10, 1, 2, 13, 1, 31, 13, 16, 4 }; + +static const uint8_t huff_a42_xlat[81] = { + 0x00, 0x40, 0x01, 0x10, 0x50, 0x04, 0x44, 0x14, 0x54, 0x41, 0x11, 0x51, + 0x05, 0x45, 0x15, 0x55, 0x59, 0x80, 0x90, 0x20, 0x60, 0x84, 0x94, 0x24, + 0x64, 0x08, 0x48, 0x18, 0x58, 0x81, 0x91, 0x21, 0x61, 0x85, 0x95, 0x25, + 0x65, 0x09, 0x49, 0x19, 0x02, 0x42, 0x12, 0x52, 0x06, 0x46, 0x16, 0x56, + 0xA0, 0xA4, 0x68, 0xA1, 0xA5, 0x99, 0x29, 0x69, 0x96, 0x66, 0x4A, 0x1A, + 0x5A, 0x88, 0x98, 0x28, 0x89, 0xA9, 0x82, 0x92, 0x22, 0x62, 0x86, 0x26, + 0xA6, 0x0A, 0x9A, 0x2A, 0x6A, 0xA8, 0xA2, 0x8A, 0xAA +}; + +static const uint8_t huff_a43_cb[5] = { 2, 4, 2, 3, 2 }; + +static const uint8_t huff_a43_xlat[7] = { 0, 7, 1, 2, 6, 3, 5 }; + +static const uint8_t huff_a44_cb[9] = { 4, 10, 5, 4, 12, 17, 47, 24, 12 }; + +static const uint8_t huff_a44_xlat[121] = { + 0x00, 0x10, 0xF0, 0x01, 0x0F, 0x11, 0xF1, 0x1F, 0xFF, 0x20, 0xE0, 0x21, + 0xE1, 0x02, 0x12, 0xF2, 0x0E, 0x1E, 0xFE, 0x2F, 0xEF, 0x30, 0x50, 0xD0, + 0xD1, 0x22, 0xE2, 0x03, 0x13, 0xF3, 0x0D, 0x1D, 0x2D, 0xFD, 0x2E, 0xEE, + 0x3F, 0xDF, 0x40, 0xB0, 0xC0, 0x31, 0x41, 0x51, 0xB1, 0xC1, 0x32, 0xB2, + 0xC2, 0xD2, 0x23, 0xB3, 0xD3, 0xE3, 0x04, 0x14, 0xE4, 0xF4, 0x05, 0x15, + 0xD5, 0xE5, 0xF5, 0x0B, 0x1B, 0x2B, 0x3B, 0xEB, 0xFB, 0x0C, 0x1C, 0x2C, + 0xFC, 0x3D, 0x5D, 0xED, 0x3E, 0x4E, 0x5E, 0xBE, 0xDE, 0x4F, 0x5F, 0xBF, + 0xCF, 0x42, 0x52, 0x33, 0x53, 0xC3, 0x24, 0xB4, 0xD4, 0x25, 0x35, 0xC5, + 0x4B, 0xCB, 0xDB, 0x3C, 0x4C, 0x5C, 0xDC, 0xEC, 0x4D, 0xBD, 0xCD, 0xDD, + 0xCE, 0x43, 0x34, 0x44, 0x54, 0xC4, 0x45, 0x55, 0xB5, 0x5B, 0xBB, 0xBC, + 0xCC +}; + +static const uint8_t huff_a45_cb[5] = { 2, 4, 2, 2, 4 }; + +static const uint8_t huff_a45_xlat[8] = { 1, 2, 0, 3, 4, 5, 6, 7 }; + +static const uint8_t huff_a46_cb[7] = { 5, 9, 1, 16, 31, 36, 172 }; + +static const uint8_t huff_a46_xlat[256] = { + 0x02, 0x00, 0x30, 0x21, 0x31, 0x41, 0x61, 0x12, 0x22, 0x42, 0x62, 0x43, + 0x53, 0x24, 0x45, 0x26, 0x27, 0x10, 0x40, 0xB0, 0x01, 0x11, 0x81, 0x32, + 0x52, 0x72, 0x92, 0x03, 0x13, 0x33, 0x63, 0x14, 0x34, 0x54, 0x64, 0x74, + 0x05, 0x15, 0x25, 0x35, 0x55, 0x65, 0x06, 0x46, 0x56, 0x57, 0x67, 0x88, + 0x20, 0x51, 0x91, 0xD1, 0xF2, 0x23, 0x83, 0x93, 0x04, 0x44, 0x84, 0x94, + 0x75, 0x85, 0xC5, 0x36, 0x66, 0x96, 0xB6, 0x07, 0x37, 0x97, 0x08, 0x28, + 0x38, 0x48, 0x68, 0x09, 0x69, 0x79, 0x0A, 0x2A, 0x1B, 0x9B, 0x2C, 0x4D, + 0x50, 0x60, 0x70, 0x80, 0x90, 0xA0, 0xC0, 0xD0, 0xE0, 0xF0, 0x71, 0xA1, + 0xB1, 0xC1, 0xE1, 0xF1, 0x82, 0xA2, 0xB2, 0xC2, 0xD2, 0xE2, 0x73, 0xA3, + 0xB3, 0xC3, 0xD3, 0xE3, 0xF3, 0xA4, 0xB4, 0xC4, 0xD4, 0xE4, 0xF4, 0x95, + 0xA5, 0xB5, 0xD5, 0xE5, 0xF5, 0x16, 0x76, 0x86, 0xA6, 0xC6, 0xD6, 0xE6, + 0xF6, 0x17, 0x47, 0x77, 0x87, 0xA7, 0xB7, 0xC7, 0xD7, 0xE7, 0xF7, 0x18, + 0x58, 0x78, 0x98, 0xA8, 0xB8, 0xC8, 0xD8, 0xE8, 0xF8, 0x19, 0x29, 0x39, + 0x49, 0x59, 0x89, 0x99, 0xA9, 0xB9, 0xC9, 0xD9, 0xE9, 0xF9, 0x1A, 0x3A, + 0x4A, 0x5A, 0x6A, 0x7A, 0x8A, 0x9A, 0xAA, 0xBA, 0xCA, 0xDA, 0xEA, 0xFA, + 0x0B, 0x2B, 0x3B, 0x4B, 0x5B, 0x6B, 0x7B, 0x8B, 0xAB, 0xBB, 0xCB, 0xDB, + 0xEB, 0xFB, 0x0C, 0x1C, 0x3C, 0x4C, 0x5C, 0x6C, 0x7C, 0x8C, 0x9C, 0xAC, + 0xBC, 0xCC, 0xDC, 0xEC, 0xFC, 0x0D, 0x1D, 0x2D, 0x3D, 0x5D, 0x6D, 0x7D, + 0x8D, 0x9D, 0xAD, 0xBD, 0xCD, 0xDD, 0xED, 0xFD, 0x0E, 0x1E, 0x2E, 0x3E, + 0x4E, 0x5E, 0x6E, 0x7E, 0x8E, 0x9E, 0xAE, 0xBE, 0xCE, 0xDE, 0xEE, 0xFE, + 0x0F, 0x1F, 0x2F, 0x3F, 0x4F, 0x5F, 0x6F, 0x7F, 0x8F, 0x9F, 0xAF, 0xBF, + 0xCF, 0xDF, 0xEF, 0xFF +}; + +static const uint8_t huff_a47_cb[8] = { 4, 9, 5, 12, 9, 12, 15, 10 }; + +static const uint8_t huff_a47_xlat[63] = { + 0, 1, 2, 62, 63, 3, 4, 5, 6, 8, 54, 56, 57, 58, 59, 60, + 61, 7, 9, 10, 11, 12, 13, 14, 53, 55, 15, 16, 17, 18, 19, 20, + 21, 36, 37, 39, 42, 52, 22, 25, 28, 35, 38, 40, 41, 43, 45, 46, + 47, 48, 49, 50, 51, 23, 24, 26, 27, 29, 30, 31, 33, 34, 44 +}; + +static const uint8_t huff_a51_cb[12] = { + 2, 11, 1, 0, 6, 2, 6, 18, 4, 26, 6, 12 +}; + +static const uint8_t huff_a51_xlat[81] = { + 0x00, 0x40, 0xC0, 0x30, 0x04, 0x01, 0x03, 0x10, 0x0C, 0xD0, 0x70, 0x34, + 0x1C, 0x0D, 0x07, 0x50, 0xF0, 0x44, 0xC4, 0x14, 0x4C, 0xCC, 0x3C, 0x41, + 0xC1, 0x11, 0x31, 0x05, 0x43, 0xC3, 0x13, 0x33, 0x0F, 0x74, 0xDC, 0x1D, + 0x37, 0x54, 0xD4, 0xF4, 0x5C, 0x7C, 0xFC, 0xD1, 0x71, 0xF1, 0xC5, 0x15, + 0x35, 0x4D, 0xCD, 0xDD, 0x3D, 0x53, 0xD3, 0x73, 0x47, 0xC7, 0x17, 0x77, + 0x4F, 0x1F, 0x3F, 0x51, 0x45, 0x55, 0xF3, 0xCF, 0xFF, 0xD5, 0x75, 0xF5, + 0x5D, 0x7D, 0xFD, 0x57, 0xD7, 0xF7, 0x5F, 0xDF, 0x7F +}; + +static const uint8_t huff_a52_cb[12] = { 1, 10, 1, 0, 2, 2, 0, 4, 3, 8, 3, 2 }; + +static const uint8_t huff_a52_xlat[25] = { + 0x00, 0x08, 0x38, 0x01, 0x07, 0x09, 0x39, 0x0F, 0x3F, 0x10, 0x02, 0x06, + 0x30, 0x11, 0x31, 0x0A, 0x3A, 0x0E, 0x17, 0x37, 0x32, 0x16, 0x3E, 0x12, + 0x36 +}; + +static const uint8_t huff_a53_xlat[7] = { 0, 1, 2, 6, 7, 3, 5 }; + +static const uint8_t huff_a54_cb[8] = { 4, 9, 4, 7, 12, 19, 21, 58 }; + +static const uint8_t huff_a54_xlat[121] = { + 0x00, 0x01, 0x0F, 0x1F, 0x10, 0xE0, 0xF0, 0x11, 0xF1, 0x2F, 0xFF, 0x20, + 0x21, 0xE1, 0x02, 0x12, 0xF2, 0x03, 0xF3, 0x0E, 0x2E, 0xFE, 0x3F, 0x30, + 0x40, 0xD0, 0xC1, 0xD1, 0x22, 0xC2, 0x33, 0xE3, 0x0C, 0xCC, 0x0D, 0x1D, + 0x2D, 0xFD, 0x1E, 0x3E, 0x5E, 0xEF, 0xC0, 0x52, 0xB2, 0xD2, 0x43, 0xC3, + 0xD3, 0x24, 0x45, 0xF5, 0x4B, 0x5B, 0xFB, 0x1C, 0x3D, 0xBD, 0xDD, 0xEE, + 0xBF, 0xCF, 0xDF, 0x50, 0xB0, 0x31, 0x41, 0x51, 0xB1, 0x32, 0x42, 0xE2, + 0x13, 0x23, 0x53, 0xB3, 0x04, 0x14, 0x34, 0x44, 0x54, 0xB4, 0xC4, 0xD4, + 0xE4, 0xF4, 0x05, 0x15, 0x25, 0x35, 0x55, 0xB5, 0xC5, 0xD5, 0xE5, 0x0B, + 0x1B, 0x2B, 0x3B, 0xBB, 0xCB, 0xDB, 0xEB, 0x2C, 0x3C, 0x4C, 0x5C, 0xBC, + 0xDC, 0xEC, 0xFC, 0x4D, 0x5D, 0xCD, 0xED, 0x4E, 0xBE, 0xCE, 0xDE, 0x4F, + 0x5F +}; + +static const uint8_t huff_a55_cb[8] = { 1, 6, 1, 1, 1, 0, 3, 2 }; + +static const uint8_t huff_a55_xlat[8] = { 0, 1, 2, 3, 6, 7, 4, 5 }; + +static const uint8_t huff_a56_cb[7] = { 3, 7, 1, 8, 6, 8, 8 }; + +static const uint8_t huff_a56_xlat[31] = { + 4, 0, 1, 2, 3, 28, 29, 30, 31, 5, 6, 7, 24, 25, 27, 8, + 9, 14, 19, 21, 22, 23, 26, 10, 11, 12, 13, 15, 17, 18, 20 +}; + +static const uint8_t huff_a57_cb[9] = { 3, 9, 1, 5, 7, 8, 16, 22, 4 }; + +static const uint8_t huff_a57_xlat[63] = { + 0, 1, 2, 61, 62, 63, 3, 4, 5, 6, 58, 59, + 60, 7, 8, 9, 10, 54, 55, 56, 57, 11, 12, 13, + 14, 15, 26, 27, 28, 36, 37, 38, 49, 50, 51, 52, + 53, 16, 17, 18, 19, 20, 21, 23, 24, 25, 29, 30, + 31, 33, 34, 35, 39, 43, 44, 45, 46, 47, 48, 22, + 40, 41, 42 +}; + +static const uint8_t huff_a61_cb[12] = { + 2, 11, 1, 0, 8, 0, 1, 16, 10, 29, 12, 4 +}; + +static const uint8_t huff_a61_xlat[81] = { + 0x00, 0x40, 0xC0, 0x10, 0x30, 0x04, 0x0C, 0x01, 0x03, 0x70, 0x50, 0xD0, + 0xF0, 0x44, 0xC4, 0x14, 0x34, 0x4C, 0x1C, 0x3C, 0x31, 0x05, 0x0D, 0x13, + 0x07, 0x0F, 0x74, 0xCC, 0xDC, 0xFC, 0x41, 0xC1, 0x11, 0x43, 0xC3, 0x33, + 0x54, 0xD4, 0xF4, 0x5C, 0x7C, 0x51, 0xD1, 0x71, 0xF1, 0x45, 0xC5, 0x15, + 0x35, 0x4D, 0xCD, 0x1D, 0x3D, 0x53, 0xD3, 0x73, 0xF3, 0x47, 0xC7, 0x17, + 0x37, 0x4F, 0xCF, 0x1F, 0x3F, 0x55, 0xD5, 0x75, 0xF5, 0x5D, 0xDD, 0xFD, + 0x57, 0xD7, 0x77, 0xF7, 0xFF, 0x7D, 0x5F, 0xDF, 0x7F +}; + +static const uint8_t huff_a62_cb[8] = { 3, 8, 5, 2, 2, 9, 5, 2 }; + +static const uint8_t huff_a62_xlat[25] = { + 0x00, 0x08, 0x38, 0x01, 0x07, 0x39, 0x0F, 0x09, 0x3F, 0x10, 0x30, 0x31, + 0x02, 0x3A, 0x06, 0x0E, 0x17, 0x37, 0x11, 0x0A, 0x32, 0x16, 0x3E, 0x12, + 0x36 +}; + +static const uint8_t huff_a63_cb[11] = { + 3, 11, 1, 1, 10, 4, 16, 29, 46, 75, 74 +}; + +static const uint8_t huff_a63_xlat[256] = { + 0x00, 0x40, 0x10, 0x50, 0x04, 0x44, 0x14, 0x01, 0x41, 0x05, 0x45, 0x55, + 0x54, 0x11, 0x51, 0x15, 0x80, 0x90, 0x60, 0x24, 0x64, 0xA4, 0x48, 0x61, + 0x95, 0x25, 0xA5, 0x02, 0x42, 0x52, 0x16, 0x56, 0x20, 0x84, 0x94, 0x18, + 0x58, 0x81, 0x91, 0x85, 0x65, 0x09, 0x49, 0x19, 0x59, 0x99, 0x29, 0x69, + 0x79, 0x5D, 0x12, 0x62, 0x06, 0x46, 0x86, 0x66, 0x1A, 0x5A, 0x6A, 0x47, + 0x17, 0xC0, 0xA0, 0xE0, 0xC4, 0xD4, 0x74, 0x08, 0x78, 0x0C, 0x4C, 0x1C, + 0x5C, 0xD1, 0x21, 0xE1, 0x71, 0xC5, 0xE5, 0x75, 0xB5, 0x89, 0xBD, 0x92, + 0x22, 0x96, 0xA6, 0x36, 0x0A, 0x4A, 0x8A, 0x9A, 0x2A, 0x7A, 0xDE, 0x6E, + 0x43, 0x13, 0x53, 0x23, 0x07, 0x77, 0x4B, 0x1B, 0x9B, 0x6B, 0x2F, 0xD0, + 0x30, 0x70, 0xE4, 0x34, 0xF4, 0xC8, 0x98, 0x28, 0x68, 0xA8, 0xE8, 0x38, + 0xB8, 0xF8, 0x9C, 0x2C, 0x6C, 0x7C, 0xA1, 0xB1, 0xD5, 0x35, 0xC9, 0xD9, + 0xA9, 0xE9, 0x39, 0xB9, 0xF9, 0xCD, 0x1D, 0x2D, 0xAD, 0x7D, 0xC2, 0xD2, + 0xA2, 0xB2, 0xF2, 0xC6, 0x26, 0x76, 0xB6, 0xDA, 0xAA, 0xEA, 0x3A, 0xFA, + 0x0E, 0x4E, 0x2E, 0x7E, 0xBE, 0xFE, 0x03, 0x83, 0x63, 0xA3, 0xB3, 0x87, + 0x57, 0x97, 0xD7, 0x27, 0x0B, 0x8B, 0x5B, 0x2B, 0xAB, 0xCF, 0x1F, 0x9F, + 0x7F, 0xBF, 0xB0, 0xF0, 0xB4, 0x88, 0xD8, 0x8C, 0xCC, 0xDC, 0xAC, 0xEC, + 0x3C, 0xBC, 0xFC, 0xC1, 0x31, 0xF1, 0xF5, 0x0D, 0x4D, 0x8D, 0x9D, 0xDD, + 0x6D, 0xED, 0x3D, 0xFD, 0x82, 0xE2, 0x32, 0x72, 0xD6, 0xE6, 0xF6, 0xCA, + 0xBA, 0x8E, 0xCE, 0x1E, 0x5E, 0x9E, 0xAE, 0xEE, 0x3E, 0xC3, 0x93, 0xD3, + 0xE3, 0x33, 0x73, 0xF3, 0xC7, 0x67, 0xA7, 0xE7, 0x37, 0xB7, 0xF7, 0xCB, + 0xDB, 0xEB, 0x3B, 0x7B, 0xBB, 0xFB, 0x0F, 0x4F, 0x8F, 0x5F, 0xDF, 0x6F, + 0xAF, 0xEF, 0x3F, 0xFF +}; + +static const uint8_t huff_a64_cb[8] = { 4, 9, 1, 7, 12, 36, 63, 2 }; + +static const uint8_t huff_a64_xlat[121] = { + 0x00, 0x10, 0x20, 0xE0, 0xF0, 0x02, 0x0E, 0xEF, 0x30, 0x01, 0x11, 0x21, + 0x31, 0xF1, 0x12, 0xF2, 0x1E, 0xEE, 0xDF, 0xFF, 0x40, 0xC0, 0xD0, 0xD1, + 0xE1, 0x22, 0x32, 0x42, 0xD2, 0xE2, 0x03, 0x13, 0x23, 0xB3, 0xC3, 0xE3, + 0xF3, 0xE4, 0x05, 0xF5, 0x2B, 0x0C, 0xFC, 0x1D, 0x2D, 0xBD, 0xDD, 0xFD, + 0x2E, 0x4E, 0xDE, 0xFE, 0x0F, 0x1F, 0x2F, 0x3F, 0x50, 0xB0, 0x41, 0x51, + 0xB1, 0xC1, 0x52, 0xB2, 0xC2, 0x33, 0x43, 0x53, 0xD3, 0x04, 0x14, 0x24, + 0x34, 0x44, 0x54, 0xB4, 0xC4, 0xD4, 0xF4, 0x15, 0x25, 0x35, 0x45, 0x55, + 0xB5, 0xC5, 0xD5, 0xE5, 0x0B, 0x1B, 0x3B, 0x4B, 0x5B, 0xBB, 0xCB, 0xDB, + 0xEB, 0xFB, 0x1C, 0x2C, 0x3C, 0x4C, 0x5C, 0xBC, 0xCC, 0xDC, 0xEC, 0x0D, + 0x3D, 0x4D, 0x5D, 0xCD, 0xED, 0x3E, 0x5E, 0xBE, 0xCE, 0x4F, 0xCF, 0x5F, + 0xBF +}; + +static const uint8_t huff_a65_cb[8] = { 2, 7, 3, 0, 1, 3, 4, 4 }; + +static const uint8_t huff_a65_xlat[15] = { + 0, 1, 15, 14, 2, 3, 13, 4, 6, 10, 12, 5, 7, 9, 11 +}; + +static const uint8_t huff_a66_cb[11] = { 2, 10, 1, 2, 2, 6, 8, 6, 3, 1, 2 }; + +static const uint8_t huff_a66_xlat[31] = { + 0, 1, 31, 2, 30, 3, 4, 15, 17, 28, 29, 5, 6, 7, 8, 24, + 25, 26, 27, 9, 10, 11, 21, 22, 23, 12, 19, 20, 13, 14, 18 +}; + +static const uint8_t huff_a67_cb[10] = { 2, 9, 1, 1, 3, 4, 6, 13, 25, 10 }; + +static const uint8_t huff_a67_xlat[63] = { + 0, 1, 2, 62, 63, 3, 4, 60, 61, 5, 6, 7, 57, 58, 59, 8, + 9, 10, 11, 12, 13, 26, 38, 52, 53, 54, 55, 56, 14, 15, 16, 17, + 18, 19, 25, 27, 28, 29, 30, 31, 33, 34, 35, 36, 37, 39, 45, 46, + 47, 48, 49, 50, 51, 20, 21, 22, 23, 24, 40, 41, 42, 43, 44 +}; + +static const uint8_t huff_a71_cb[5] = { 1, 3, 1, 1, 2 }; + +static const uint8_t huff_a72_cb[12] = { + 2, 11, 1, 0, 4, 8, 3, 8, 24, 17, 12, 4 +}; + +static const uint8_t huff_a72_xlat[81] = { + 0x00, 0x40, 0x10, 0x04, 0x01, 0x50, 0x44, 0x14, 0x54, 0x41, 0x11, 0x05, + 0x15, 0x51, 0x45, 0x55, 0x80, 0x90, 0x20, 0x64, 0x08, 0x19, 0x02, 0x06, + 0x60, 0x84, 0x94, 0x24, 0x48, 0x18, 0x58, 0x81, 0x91, 0x21, 0x61, 0x85, + 0x95, 0x25, 0x65, 0x09, 0x49, 0x59, 0x42, 0x12, 0x52, 0x46, 0x16, 0x56, + 0xA0, 0xA4, 0x98, 0x28, 0x68, 0xA1, 0xA5, 0x99, 0x29, 0x69, 0x96, 0x26, + 0x66, 0x0A, 0x4A, 0x1A, 0x5A, 0x88, 0xA8, 0x89, 0xA9, 0x82, 0x92, 0x22, + 0x62, 0x86, 0xA6, 0x2A, 0x6A, 0xA2, 0x8A, 0x9A, 0xAA +}; + +static const uint8_t huff_a73_cb[11] = { 2, 10, 1, 1, 5, 2, 8, 7, 13, 8, 4 }; + +static const uint8_t huff_a73_xlat[49] = { + 0x00, 0x08, 0x38, 0x01, 0x39, 0x07, 0x0F, 0x09, 0x3F, 0x10, 0x30, 0x31, + 0x02, 0x3A, 0x06, 0x0E, 0x17, 0x11, 0x0A, 0x32, 0x0D, 0x16, 0x3E, 0x37, + 0x18, 0x28, 0x19, 0x29, 0x12, 0x2A, 0x03, 0x3B, 0x05, 0x15, 0x1E, 0x1F, + 0x2F, 0x1A, 0x0B, 0x2B, 0x33, 0x35, 0x3D, 0x2E, 0x36, 0x13, 0x1B, 0x1D, + 0x2D +}; + +static const uint8_t huff_a74_cb[14] = { + 1, 12, 1, 0, 0, 4, 0, 4, 5, 9, 30, 45, 21, 2 +}; + +static const uint8_t huff_a74_xlat[121] = { + 0x00, 0x10, 0xF0, 0x01, 0x0F, 0x11, 0xF1, 0x1F, 0xFF, 0x20, 0xE0, 0x02, + 0xF2, 0x0E, 0x21, 0xE1, 0x12, 0xE2, 0x1E, 0x2E, 0xFE, 0x2F, 0xEF, 0x30, + 0x50, 0xB0, 0xC0, 0xD0, 0x31, 0xB1, 0xD1, 0x22, 0xD2, 0x03, 0x13, 0xE3, + 0xF3, 0xF4, 0x05, 0xE5, 0xF5, 0x0B, 0x1B, 0x0C, 0x0D, 0x1D, 0x2D, 0xFD, + 0x3E, 0xEE, 0x3F, 0x5F, 0xDF, 0x40, 0x41, 0x51, 0xC1, 0x32, 0x42, 0x52, + 0xB2, 0xC2, 0x23, 0x33, 0xB3, 0xC3, 0xD3, 0x04, 0x14, 0x24, 0xD4, 0xE4, + 0x15, 0x25, 0xC5, 0xD5, 0x2B, 0x3B, 0xEB, 0xFB, 0x1C, 0x2C, 0x3C, 0x5C, + 0xEC, 0xFC, 0x3D, 0x5D, 0xDD, 0xED, 0x4E, 0x5E, 0xBE, 0xCE, 0xDE, 0x4F, + 0xBF, 0xCF, 0x43, 0x53, 0x34, 0x54, 0xB4, 0xC4, 0x35, 0x45, 0x55, 0xB5, + 0x4B, 0x5B, 0xCB, 0xDB, 0x4C, 0xBC, 0xCC, 0xDC, 0x4D, 0xBD, 0xCD, 0x44, + 0xBB +}; + +static const uint8_t huff_a75_cb[7] = { 2, 6, 1, 3, 3, 4, 4 }; + +static const uint8_t huff_a75_xlat[15] = { + 0, 1, 14, 15, 2, 3, 13, 4, 6, 10, 12, 5, 7, 9, 11 +}; + +static const uint8_t huff_a76_cb[12] = { + 3, 12, 1, 3, 4, 8, 10, 36, 60, 78, 48, 8 +}; + +static const uint8_t huff_a76_xlat[256] = { + 0x00, 0x10, 0x01, 0x11, 0x20, 0x21, 0x02, 0x12, 0x30, 0x31, 0x41, 0x22, + 0x03, 0x13, 0x23, 0x14, 0x40, 0x51, 0x61, 0x32, 0x42, 0x33, 0x04, 0x24, + 0x15, 0x16, 0x50, 0x60, 0xD0, 0x71, 0x81, 0xD1, 0xE1, 0xF1, 0x52, 0x62, + 0x72, 0xD2, 0x43, 0x53, 0x63, 0xD3, 0x34, 0x44, 0x54, 0x05, 0x25, 0x35, + 0x45, 0x06, 0x26, 0x36, 0x17, 0x27, 0x18, 0x0D, 0x1D, 0x2D, 0x3D, 0x1E, + 0x2E, 0x1F, 0x70, 0x80, 0xE0, 0xF0, 0x91, 0xA1, 0xC1, 0x82, 0x92, 0xC2, + 0xE2, 0xF2, 0x73, 0x83, 0x93, 0xE3, 0xF3, 0x64, 0x74, 0x84, 0xD4, 0xE4, + 0xF4, 0x55, 0x65, 0xD5, 0xE5, 0xF5, 0x46, 0x56, 0x66, 0xD6, 0x07, 0x37, + 0x47, 0x57, 0x08, 0x28, 0x38, 0x48, 0x19, 0x29, 0x39, 0x1A, 0x2A, 0x1B, + 0x1C, 0x2C, 0x3C, 0x4D, 0x5D, 0x6D, 0x0E, 0x3E, 0x4E, 0x5E, 0x0F, 0x2F, + 0x3F, 0x4F, 0x90, 0xA0, 0xB0, 0xC0, 0xB1, 0xA2, 0xB2, 0xA3, 0xB3, 0xC3, + 0x94, 0xA4, 0xB4, 0xC4, 0x75, 0x85, 0x95, 0xA5, 0xC5, 0x76, 0x86, 0x96, + 0xE6, 0xF6, 0x67, 0x77, 0x87, 0xD7, 0xE7, 0xF7, 0x58, 0x68, 0x78, 0x88, + 0xD8, 0xE8, 0xF8, 0x09, 0x49, 0x59, 0x69, 0xD9, 0xE9, 0xF9, 0x0A, 0x3A, + 0x4A, 0x5A, 0xDA, 0xEA, 0x0B, 0x2B, 0x3B, 0x4B, 0xDB, 0x0C, 0x4C, 0x5C, + 0x6C, 0xDC, 0x7D, 0x8D, 0x9D, 0xAD, 0xBD, 0xCD, 0x6E, 0x7E, 0x8E, 0x9E, + 0xAE, 0xBE, 0x5F, 0x6F, 0x7F, 0x8F, 0x9F, 0xAF, 0xB5, 0xA6, 0xB6, 0xC6, + 0x97, 0xA7, 0xC7, 0x98, 0xA8, 0xB8, 0xC8, 0x79, 0x89, 0x99, 0xA9, 0xB9, + 0xC9, 0x6A, 0x7A, 0x8A, 0x9A, 0xAA, 0xCA, 0xFA, 0x5B, 0x6B, 0x7B, 0x8B, + 0xCB, 0xEB, 0xFB, 0x7C, 0x8C, 0x9C, 0xAC, 0xBC, 0xEC, 0xFC, 0xDD, 0xED, + 0xFD, 0xCE, 0xDE, 0xEE, 0xFE, 0xBF, 0xCF, 0xDF, 0xB7, 0xBA, 0x9B, 0xAB, + 0xBB, 0xCC, 0xEF, 0xFF +}; + +static const uint8_t huff_b01_cb[14] = { + 1, 12, 1, 0, 0, 2, 6, 0, 11, 13, 12, 24, 4, 8 +}; + +static const uint8_t huff_b01_xlat[81] = { + 0x00, 0x01, 0x03, 0x40, 0xC0, 0x10, 0x30, 0x04, 0x0C, 0x50, 0xD0, 0x70, + 0xF0, 0x34, 0x1C, 0x05, 0x0D, 0x13, 0x07, 0x0F, 0x44, 0xC4, 0x14, 0x4C, + 0xCC, 0x3C, 0x41, 0xC1, 0x11, 0x31, 0x43, 0xC3, 0x33, 0x54, 0x74, 0xDC, + 0xFC, 0x71, 0x15, 0x4D, 0x1D, 0xD3, 0xC7, 0x37, 0x3F, 0xD4, 0xF4, 0x5C, + 0x7C, 0x51, 0xD1, 0xF1, 0x45, 0xC5, 0x55, 0x35, 0xCD, 0xDD, 0x3D, 0x53, + 0x73, 0xF3, 0x47, 0x17, 0x77, 0x4F, 0xCF, 0x1F, 0xFF, 0xF5, 0x7D, 0xD7, + 0x5F, 0xD5, 0x75, 0x5D, 0xFD, 0x57, 0xF7, 0xDF, 0x7F +}; + +static const uint8_t huff_b02_cb[14] = { + 1, 12, 1, 0, 0, 4, 0, 8, 4, 9, 19, 13, 13, 10 +}; + +static const uint8_t huff_b02_xlat[81] = { + 0x00, 0x40, 0x10, 0x04, 0x01, 0x50, 0x44, 0x14, 0x54, 0x41, 0x11, 0x05, + 0x15, 0x80, 0x51, 0x45, 0x55, 0x90, 0x20, 0x60, 0x24, 0x08, 0x18, 0x09, + 0x02, 0x06, 0x84, 0x94, 0x64, 0x48, 0x58, 0x81, 0x91, 0x21, 0x61, 0x95, + 0x25, 0x65, 0x19, 0x59, 0x42, 0x12, 0x46, 0x16, 0x56, 0xA0, 0xA4, 0x28, + 0x68, 0x85, 0xA5, 0x49, 0x29, 0x69, 0x52, 0x0A, 0x1A, 0x5A, 0x88, 0x98, + 0xA1, 0x89, 0x99, 0xA9, 0x22, 0x62, 0x96, 0x26, 0x66, 0x4A, 0x6A, 0xA8, + 0x82, 0x92, 0xA2, 0x86, 0xA6, 0x8A, 0x9A, 0x2A, 0xAA +}; + +static const uint8_t huff_b03_cb[11] = { 1, 9, 1, 0, 0, 4, 0, 5, 12, 13, 14 }; + +static const uint8_t huff_b03_xlat[49] = { + 0x00, 0x08, 0x38, 0x01, 0x07, 0x30, 0x09, 0x39, 0x0F, 0x3F, 0x10, 0x18, + 0x28, 0x31, 0x02, 0x3A, 0x03, 0x05, 0x06, 0x0E, 0x17, 0x37, 0x11, 0x19, + 0x29, 0x0A, 0x32, 0x0B, 0x3B, 0x0D, 0x15, 0x3D, 0x3E, 0x1F, 0x2F, 0x12, + 0x1A, 0x2A, 0x13, 0x1B, 0x2B, 0x33, 0x1D, 0x2D, 0x35, 0x16, 0x1E, 0x2E, + 0x36 +}; + +static const uint8_t huff_b04_cb[12] = { + 2, 11, 1, 0, 4, 4, 5, 9, 30, 45, 21, 2 +}; + +static const uint8_t huff_b04_xlat[121] = { + 0x00, 0x10, 0xF0, 0x01, 0x0F, 0x11, 0xF1, 0x1F, 0xFF, 0x20, 0xE0, 0x02, + 0xF2, 0x0E, 0x21, 0xE1, 0x12, 0xE2, 0x1E, 0x2E, 0xFE, 0x2F, 0xEF, 0x30, + 0x50, 0xB0, 0xC0, 0xD0, 0x31, 0xB1, 0xD1, 0x22, 0xD2, 0x03, 0x13, 0xE3, + 0xF3, 0xF4, 0x05, 0xE5, 0xF5, 0x0B, 0x1B, 0x0C, 0x0D, 0x1D, 0x2D, 0xFD, + 0x3E, 0xEE, 0x3F, 0x5F, 0xDF, 0x40, 0x41, 0x51, 0xC1, 0x32, 0x42, 0x52, + 0xB2, 0xC2, 0x23, 0x33, 0xB3, 0xC3, 0xD3, 0x04, 0x14, 0x24, 0xD4, 0xE4, + 0x15, 0x25, 0xC5, 0xD5, 0x2B, 0x3B, 0xEB, 0xFB, 0x1C, 0x2C, 0x3C, 0x5C, + 0xEC, 0xFC, 0x3D, 0x5D, 0xDD, 0xED, 0x4E, 0x5E, 0xBE, 0xCE, 0xDE, 0x4F, + 0xBF, 0xCF, 0x43, 0x53, 0x34, 0x54, 0xB4, 0xC4, 0x35, 0x45, 0x55, 0xB5, + 0x4B, 0x5B, 0xCB, 0xDB, 0x4C, 0xBC, 0xCC, 0xDC, 0x4D, 0xBD, 0xCD, 0x44, + 0xBB +}; + +static const uint8_t huff_b05_cb[11] = { + 3, 11, 1, 4, 4, 4, 12, 30, 73, 75, 22 +}; + +static const uint8_t huff_b05_xlat[225] = { + 0x00, 0x10, 0xF0, 0x01, 0x0F, 0x11, 0xF1, 0x1F, 0xFF, 0x20, 0xE0, 0x02, + 0x0E, 0x30, 0xD0, 0x21, 0xE1, 0x12, 0xF2, 0x03, 0x0D, 0x1E, 0xFE, 0x2F, + 0xEF, 0x40, 0x60, 0x70, 0x90, 0xA0, 0xC0, 0x31, 0xD1, 0x22, 0x32, 0xD2, + 0xE2, 0x13, 0x23, 0xE3, 0xF3, 0x04, 0x06, 0x07, 0x09, 0x0A, 0x0C, 0x1D, + 0x2D, 0xFD, 0x2E, 0x3E, 0xEE, 0x3F, 0xDF, 0x50, 0xB0, 0x41, 0x51, 0x61, + 0x71, 0x91, 0xA1, 0xB1, 0xC1, 0x42, 0x62, 0x72, 0x92, 0xA2, 0xC2, 0x33, + 0x93, 0xA3, 0xD3, 0x14, 0x24, 0xE4, 0xF4, 0x05, 0x15, 0xF5, 0x16, 0x26, + 0xD6, 0xE6, 0xF6, 0x17, 0x27, 0xD7, 0xE7, 0xF7, 0x19, 0x29, 0x39, 0xE9, + 0xF9, 0x1A, 0x2A, 0xEA, 0xFA, 0x0B, 0x1B, 0xFB, 0x1C, 0x2C, 0xEC, 0xFC, + 0x3D, 0x7D, 0x9D, 0xDD, 0xED, 0x4E, 0x6E, 0x7E, 0x9E, 0xAE, 0xCE, 0xDE, + 0x4F, 0x5F, 0x6F, 0x7F, 0x9F, 0xAF, 0xBF, 0xCF, 0x52, 0xB2, 0x43, 0x53, + 0x63, 0x73, 0xB3, 0xC3, 0x34, 0x44, 0x64, 0x74, 0x94, 0xA4, 0xB4, 0xC4, + 0xD4, 0x25, 0x35, 0x65, 0x75, 0x95, 0xA5, 0xD5, 0xE5, 0x36, 0x46, 0x56, + 0x66, 0xA6, 0xB6, 0xC6, 0x37, 0x47, 0x57, 0xB7, 0xC7, 0x49, 0x59, 0x69, + 0xB9, 0xC9, 0xD9, 0x3A, 0x4A, 0x5A, 0x6A, 0xAA, 0xBA, 0xCA, 0xDA, 0x2B, + 0x3B, 0x6B, 0x7B, 0x9B, 0xAB, 0xDB, 0xEB, 0x3C, 0x4C, 0x6C, 0x7C, 0x9C, + 0xAC, 0xCC, 0xDC, 0x4D, 0x5D, 0x6D, 0xAD, 0xBD, 0xCD, 0x5E, 0xBE, 0x54, + 0x45, 0x55, 0xB5, 0xC5, 0x76, 0x96, 0x67, 0x77, 0x97, 0xA7, 0x79, 0x99, + 0xA9, 0x7A, 0x9A, 0x4B, 0x5B, 0xBB, 0xCB, 0x5C, 0xBC +}; + +static const uint8_t huff_b07_cb[9] = { 3, 9, 3, 2, 4, 8, 23, 13, 10 }; + +static const uint8_t huff_b07_xlat[63] = { + 0, 1, 63, 2, 62, 3, 4, 60, 61, 5, 6, 7, 8, 56, 57, 58, + 59, 9, 10, 11, 12, 25, 26, 27, 28, 29, 30, 31, 33, 34, 35, 36, + 37, 38, 39, 51, 52, 53, 54, 55, 13, 14, 15, 16, 17, 18, 19, 45, + 46, 47, 48, 49, 50, 20, 21, 22, 23, 24, 40, 41, 42, 43, 44 +}; + +static const uint8_t huff_b12_cb[10] = { 3, 10, 1, 3, 12, 0, 30, 9, 18, 8 }; + +static const uint8_t huff_b12_xlat[81] = { + 0x00, 0x40, 0x04, 0x01, 0x10, 0x50, 0x44, 0x14, 0x54, 0x41, 0x11, 0x51, + 0x05, 0x45, 0x15, 0x55, 0x80, 0x90, 0x20, 0x60, 0x84, 0x94, 0x24, 0x64, + 0x08, 0x48, 0x18, 0x81, 0x91, 0x61, 0x85, 0x95, 0x25, 0x65, 0x09, 0x49, + 0x19, 0x59, 0x02, 0x42, 0x12, 0x52, 0x06, 0x46, 0x16, 0x56, 0xA4, 0x58, + 0x68, 0x21, 0xA5, 0x29, 0x69, 0x1A, 0x5A, 0xA0, 0x88, 0x98, 0x28, 0xA1, + 0x89, 0x99, 0xA9, 0x92, 0x22, 0x62, 0x86, 0x96, 0x26, 0x66, 0x0A, 0x4A, + 0x6A, 0xA8, 0x82, 0xA2, 0xA6, 0x8A, 0x9A, 0x2A, 0xAA +}; + +static const uint8_t huff_b14_cb[14] = { + 1, 12, 1, 0, 0, 4, 0, 3, 5, 16, 28, 34, 26, 4 +}; + +static const uint8_t huff_b14_xlat[121] = { + 0x00, 0x10, 0xF0, 0x01, 0x0F, 0xF1, 0x1F, 0xFF, 0x20, 0xE0, 0x11, 0x02, + 0x0E, 0x30, 0x50, 0xB0, 0xD0, 0x21, 0xE1, 0x12, 0xF2, 0x03, 0x05, 0x0B, + 0x0D, 0x1E, 0xFE, 0x2F, 0xEF, 0x40, 0xC0, 0x31, 0x51, 0xB1, 0xC1, 0xD1, + 0x22, 0x52, 0xE2, 0x13, 0xF3, 0x04, 0x15, 0xF5, 0x1B, 0xEB, 0xFB, 0x0C, + 0x1D, 0xFD, 0x2E, 0x5E, 0xEE, 0x3F, 0x5F, 0xBF, 0xDF, 0x41, 0x32, 0x42, + 0xB2, 0xD2, 0x23, 0x53, 0xB3, 0xE3, 0x14, 0x24, 0xE4, 0xF4, 0x25, 0x35, + 0xD5, 0xE5, 0x2B, 0x3B, 0xDB, 0x1C, 0x2C, 0xBC, 0xEC, 0xFC, 0x2D, 0xBD, + 0xED, 0x3E, 0x4E, 0xBE, 0xDE, 0x4F, 0xCF, 0xC2, 0x33, 0x43, 0xC3, 0xD3, + 0x34, 0x44, 0x54, 0xB4, 0xD4, 0x45, 0x55, 0xC5, 0x4B, 0xCB, 0x3C, 0x4C, + 0x5C, 0xCC, 0xDC, 0x3D, 0x4D, 0x5D, 0xCD, 0xDD, 0xCE, 0xC4, 0xB5, 0x5B, + 0xBB +}; + +static const uint8_t huff_b16_cb[11] = { + 4, 12, 4, 4, 9, 13, 37, 76, 72, 39, 2 +}; + +static const uint8_t huff_b16_xlat[256] = { + 0x00, 0x10, 0x01, 0x11, 0x20, 0x21, 0x02, 0x12, 0x30, 0x31, 0x41, 0x22, + 0x32, 0x03, 0x13, 0x23, 0x14, 0x40, 0x51, 0x61, 0x42, 0x52, 0x33, 0x43, + 0x04, 0x24, 0x34, 0x15, 0x25, 0x16, 0x50, 0x60, 0x70, 0x71, 0x81, 0xD1, + 0xE1, 0x62, 0x72, 0x82, 0xD2, 0x53, 0x63, 0x73, 0xD3, 0x44, 0x54, 0x05, + 0x35, 0x45, 0x55, 0x06, 0x26, 0x36, 0x07, 0x17, 0x27, 0x37, 0x18, 0x28, + 0x19, 0x1D, 0x2D, 0x3D, 0x1E, 0x2E, 0x1F, 0x80, 0x90, 0xD0, 0xE0, 0xF0, + 0x91, 0xA1, 0xB1, 0xC1, 0xF1, 0x92, 0xA2, 0xB2, 0xC2, 0xE2, 0xF2, 0x83, + 0x93, 0xA3, 0xC3, 0xE3, 0xF3, 0x64, 0x74, 0x84, 0x94, 0xD4, 0xE4, 0xF4, + 0x65, 0x75, 0x85, 0xD5, 0xE5, 0x46, 0x56, 0x66, 0x76, 0xD6, 0xE6, 0x47, + 0x57, 0x67, 0xD7, 0x08, 0x38, 0x48, 0x58, 0x09, 0x29, 0x39, 0x49, 0x0A, + 0x1A, 0x2A, 0x3A, 0x1B, 0x2B, 0x0C, 0x1C, 0x2C, 0x3C, 0x0D, 0x4D, 0x5D, + 0x6D, 0x7D, 0x0E, 0x3E, 0x4E, 0x5E, 0x6E, 0x0F, 0x2F, 0x3F, 0x4F, 0xA0, + 0xB0, 0xC0, 0xB3, 0xA4, 0xB4, 0xC4, 0x95, 0xA5, 0xB5, 0xC5, 0xF5, 0x86, + 0x96, 0xA6, 0xB6, 0xC6, 0xF6, 0x77, 0x87, 0x97, 0xA7, 0xC7, 0xE7, 0xF7, + 0x68, 0x78, 0x88, 0x98, 0xD8, 0xE8, 0xF8, 0x59, 0x69, 0x79, 0x89, 0xD9, + 0xE9, 0xF9, 0x4A, 0x5A, 0x6A, 0x7A, 0xDA, 0xEA, 0x0B, 0x3B, 0x4B, 0x5B, + 0xDB, 0xEB, 0x4C, 0x5C, 0x6C, 0x7C, 0x8C, 0xDC, 0x8D, 0x9D, 0xAD, 0xBD, + 0xCD, 0x7E, 0x8E, 0x9E, 0xAE, 0xBE, 0x5F, 0x6F, 0x7F, 0x8F, 0x9F, 0xB7, + 0xA8, 0xB8, 0xC8, 0x99, 0xA9, 0xB9, 0xC9, 0x8A, 0x9A, 0xAA, 0xBA, 0xCA, + 0xFA, 0x6B, 0x7B, 0x8B, 0x9B, 0xAB, 0xBB, 0xCB, 0xFB, 0x9C, 0xAC, 0xBC, + 0xCC, 0xEC, 0xFC, 0xDD, 0xED, 0xFD, 0xCE, 0xDE, 0xEE, 0xFE, 0xAF, 0xBF, + 0xCF, 0xDF, 0xEF, 0xFF +}; + +static const uint8_t huff_b26_cb[12] = { + 3, 12, 2, 2, 4, 5, 11, 26, 67, 78, 51, 10 +}; + +static const uint8_t huff_b26_xlat[256] = { + 0x00, 0x01, 0x10, 0x11, 0x20, 0x21, 0x02, 0x12, 0x30, 0x31, 0x22, 0x03, + 0x13, 0x40, 0x41, 0x51, 0x32, 0x42, 0x23, 0x33, 0x04, 0x14, 0x24, 0x15, + 0x50, 0x61, 0x71, 0xD1, 0xE1, 0x52, 0x62, 0xD2, 0x43, 0x53, 0xD3, 0x34, + 0x44, 0x05, 0x25, 0x35, 0x06, 0x16, 0x26, 0x17, 0x18, 0x1D, 0x2D, 0x3D, + 0x1E, 0x2E, 0x60, 0x70, 0x80, 0xD0, 0xE0, 0xF0, 0x81, 0x91, 0xA1, 0xC1, + 0xF1, 0x72, 0x82, 0x92, 0xC2, 0xE2, 0xF2, 0x63, 0x73, 0xE3, 0xF3, 0x54, + 0x64, 0x74, 0xD4, 0xE4, 0xF4, 0x45, 0x55, 0x65, 0xD5, 0xE5, 0xF5, 0x36, + 0x46, 0x56, 0xD6, 0xE6, 0x07, 0x27, 0x37, 0x47, 0xD7, 0x08, 0x28, 0x38, + 0x19, 0x29, 0x1A, 0x1B, 0x1C, 0x2C, 0x0D, 0x4D, 0x5D, 0x6D, 0x7D, 0x0E, + 0x3E, 0x4E, 0x5E, 0x6E, 0x0F, 0x1F, 0x2F, 0x3F, 0x4F, 0x90, 0xA0, 0xC0, + 0xB1, 0xA2, 0xB2, 0x83, 0x93, 0xA3, 0xB3, 0xC3, 0x84, 0x94, 0xA4, 0xC4, + 0x75, 0x85, 0x95, 0xC5, 0x66, 0x76, 0x86, 0x96, 0xC6, 0xF6, 0x57, 0x67, + 0x77, 0xE7, 0xF7, 0x48, 0x58, 0x68, 0x78, 0xD8, 0xE8, 0xF8, 0x09, 0x39, + 0x49, 0x59, 0xD9, 0xE9, 0xF9, 0x0A, 0x2A, 0x3A, 0x4A, 0xDA, 0xEA, 0x0B, + 0x2B, 0x3B, 0xDB, 0xEB, 0x0C, 0x3C, 0x4C, 0x5C, 0x6C, 0xDC, 0x8D, 0x9D, + 0xAD, 0xBD, 0xCD, 0x7E, 0x8E, 0x9E, 0xAE, 0xBE, 0xCE, 0x5F, 0x6F, 0x7F, + 0x8F, 0x9F, 0xAF, 0xB0, 0xB4, 0xA5, 0xB5, 0xA6, 0xB6, 0x87, 0x97, 0xA7, + 0xB7, 0xC7, 0x88, 0x98, 0xA8, 0xC8, 0x69, 0x79, 0x89, 0x99, 0xA9, 0xC9, + 0x5A, 0x6A, 0x7A, 0x9A, 0xCA, 0xFA, 0x4B, 0x5B, 0x6B, 0x7B, 0xCB, 0xFB, + 0x7C, 0x8C, 0x9C, 0xAC, 0xBC, 0xCC, 0xEC, 0xFC, 0xDD, 0xED, 0xFD, 0xDE, + 0xEE, 0xFE, 0xBF, 0xCF, 0xDF, 0xEF, 0xB8, 0xB9, 0x8A, 0xAA, 0xBA, 0x8B, + 0x9B, 0xAB, 0xBB, 0xFF +}; + +static const uint8_t huff_b32_cb[12] = { + 2, 11, 1, 0, 4, 6, 7, 10, 22, 11, 16, 4 +}; + +static const uint8_t huff_b32_xlat[81] = { + 0x00, 0x40, 0x10, 0x04, 0x01, 0x50, 0x44, 0x14, 0x41, 0x11, 0x05, 0x80, + 0x54, 0x51, 0x45, 0x15, 0x55, 0x02, 0x90, 0x20, 0x60, 0x84, 0x24, 0x08, + 0x18, 0x09, 0x12, 0x06, 0xA0, 0x94, 0x64, 0x48, 0x58, 0x81, 0x91, 0x21, + 0x61, 0x85, 0x95, 0x25, 0x65, 0x49, 0x19, 0x59, 0x42, 0x52, 0x46, 0x16, + 0x56, 0x0A, 0xA4, 0x28, 0x68, 0xA1, 0xA5, 0x29, 0x69, 0x26, 0x4A, 0x1A, + 0x5A, 0x88, 0x98, 0xA8, 0x89, 0x99, 0xA9, 0x82, 0x92, 0x22, 0x62, 0x86, + 0x96, 0x66, 0x9A, 0x2A, 0x6A, 0xA2, 0xA6, 0x8A, 0xAA +}; + +static const uint8_t huff_b33_cb[13] = { + 2, 12, 1, 0, 0, 4, 11, 8, 28, 92, 97, 13, 2 +}; + +static const uint8_t huff_b33_xlat[256] = { + 0x00, 0x40, 0x10, 0x04, 0x01, 0x50, 0x44, 0x14, 0x54, 0x41, 0x11, 0x51, + 0x05, 0x45, 0x15, 0x55, 0x20, 0x95, 0x65, 0x49, 0x59, 0x52, 0x46, 0x16, + 0x80, 0x90, 0x60, 0x84, 0x94, 0x24, 0x64, 0xA4, 0x08, 0x48, 0x18, 0x58, + 0x81, 0x91, 0x21, 0x61, 0x85, 0x25, 0x09, 0x19, 0x69, 0x02, 0x42, 0x12, + 0x06, 0x56, 0x5A, 0x57, 0xD0, 0x74, 0x68, 0x5C, 0xC1, 0xD5, 0xA5, 0xE5, + 0x75, 0xB5, 0xF5, 0x99, 0xD9, 0xA9, 0xE9, 0x79, 0xB9, 0xF9, 0x1D, 0x5D, + 0x9D, 0xDD, 0x6D, 0xAD, 0xED, 0x7D, 0xBD, 0xFD, 0x82, 0x92, 0xD2, 0x62, + 0x96, 0xD6, 0x26, 0x66, 0xA6, 0xE6, 0x76, 0xB6, 0xF6, 0x0A, 0x4A, 0x1A, + 0x9A, 0xDA, 0x2A, 0x6A, 0xAA, 0xEA, 0x7A, 0xBA, 0xFA, 0x5E, 0x9E, 0xDE, + 0x6E, 0xAE, 0xEE, 0x7E, 0xBE, 0xFE, 0x03, 0x13, 0x53, 0x17, 0x97, 0xD7, + 0x67, 0xA7, 0xE7, 0x77, 0xB7, 0xF7, 0x5B, 0x9B, 0xDB, 0x6B, 0xAB, 0xEB, + 0x7B, 0xBB, 0xFB, 0x5F, 0x9F, 0xDF, 0x6F, 0xAF, 0xEF, 0x7F, 0xBF, 0xFF, + 0xC0, 0xA0, 0xE0, 0x30, 0xC4, 0xD4, 0xE4, 0x34, 0xB4, 0xF4, 0x88, 0xC8, + 0x98, 0xD8, 0x28, 0xA8, 0xE8, 0x38, 0x78, 0xB8, 0xF8, 0x0C, 0x4C, 0x1C, + 0x9C, 0xDC, 0x6C, 0xAC, 0xEC, 0x7C, 0xBC, 0xFC, 0xD1, 0xA1, 0xE1, 0x31, + 0x71, 0xB1, 0xF1, 0xC5, 0x35, 0x89, 0xC9, 0x29, 0x39, 0x0D, 0x4D, 0x8D, + 0xCD, 0x2D, 0x3D, 0x22, 0xA2, 0xE2, 0x72, 0xB2, 0xF2, 0x86, 0xC6, 0x36, + 0x8A, 0xCA, 0x3A, 0x0E, 0x4E, 0x8E, 0xCE, 0x1E, 0x2E, 0x3E, 0x43, 0x83, + 0x93, 0xD3, 0x23, 0x63, 0xA3, 0xE3, 0x73, 0xB3, 0xF3, 0x07, 0x47, 0x87, + 0xC7, 0x27, 0x37, 0x4B, 0x8B, 0xCB, 0x1B, 0x2B, 0x3B, 0x4F, 0x8F, 0xCF, + 0x1F, 0x70, 0xB0, 0xF0, 0x8C, 0xCC, 0x2C, 0x3C, 0xC2, 0x32, 0xC3, 0x0F, + 0x2F, 0x3F, 0x33, 0x0B +}; + +static const uint8_t huff_b35_cb[14] = { + 1, 12, 1, 0, 0, 0, 4, 6, 6, 14, 42, 63, 59, 30 +}; + +static const uint8_t huff_b35_xlat[225] = { + 0x00, 0x10, 0xF0, 0x01, 0x0F, 0x11, 0xF1, 0x02, 0x0E, 0x1F, 0xFF, 0x20, + 0xE0, 0x21, 0xF2, 0xFE, 0xEF, 0x30, 0xD0, 0xE1, 0x12, 0x22, 0xE2, 0x03, + 0x0D, 0x1D, 0x1E, 0x2E, 0xEE, 0x2F, 0xDF, 0x40, 0x60, 0x70, 0x90, 0xA0, + 0xB0, 0xC0, 0x31, 0x71, 0x91, 0xC1, 0xD1, 0x32, 0xD2, 0x13, 0xE3, 0xF3, + 0x04, 0x05, 0x06, 0x07, 0x17, 0xF7, 0x09, 0x19, 0x0A, 0x1A, 0xFA, 0x0C, + 0x1C, 0x2D, 0xED, 0xFD, 0x3E, 0x7E, 0xDE, 0x3F, 0x6F, 0x7F, 0x9F, 0xAF, + 0xCF, 0x50, 0x41, 0x51, 0x61, 0xA1, 0xB1, 0x62, 0x72, 0x92, 0xA2, 0xC2, + 0x23, 0x33, 0x63, 0x73, 0x93, 0xA3, 0xD3, 0x14, 0x24, 0x34, 0xD4, 0xE4, + 0xF4, 0x15, 0xF5, 0x16, 0x26, 0xD6, 0xE6, 0xF6, 0x27, 0x37, 0x47, 0xE7, + 0x29, 0x39, 0xC9, 0xD9, 0xE9, 0xF9, 0x2A, 0xEA, 0x0B, 0x1B, 0xFB, 0x2C, + 0x7C, 0xEC, 0xFC, 0x3D, 0x4D, 0x6D, 0x7D, 0xDD, 0x4E, 0x5E, 0x6E, 0x9E, + 0xAE, 0xCE, 0x4F, 0x5F, 0x42, 0x52, 0xB2, 0x43, 0xB3, 0xC3, 0x44, 0x64, + 0x74, 0x94, 0xA4, 0x25, 0x35, 0x65, 0x75, 0x95, 0xA5, 0xE5, 0x36, 0x46, + 0x66, 0x76, 0x96, 0xA6, 0xB6, 0xC6, 0x57, 0xA7, 0xB7, 0xC7, 0xD7, 0x59, + 0xA9, 0xB9, 0x3A, 0x4A, 0x6A, 0xCA, 0xDA, 0x2B, 0x3B, 0x6B, 0x9B, 0xAB, + 0xDB, 0xEB, 0x3C, 0x6C, 0x9C, 0xAC, 0xCC, 0xDC, 0x5D, 0x9D, 0xAD, 0xBD, + 0xCD, 0xBE, 0xBF, 0x53, 0x54, 0xB4, 0xC4, 0x45, 0x55, 0xB5, 0xC5, 0xD5, + 0x56, 0x67, 0x77, 0x97, 0x49, 0x69, 0x79, 0x99, 0x5A, 0x7A, 0x9A, 0xAA, + 0xBA, 0x4B, 0x5B, 0x7B, 0xBB, 0xCB, 0x4C, 0x5C, 0xBC +}; + +static const uint8_t huff_b37_cb[13] = { + 1, 11, 1, 0, 2, 0, 2, 2, 6, 17, 14, 13, 6 +}; + +static const uint8_t huff_b37_xlat[63] = { + 0, 1, 63, 2, 62, 3, 61, 4, 5, 6, 58, 59, 60, 7, 8, 9, + 10, 25, 26, 27, 28, 29, 34, 35, 37, 38, 39, 55, 56, 57, 11, 13, + 14, 15, 30, 31, 33, 36, 49, 50, 51, 52, 53, 54, 12, 16, 17, 18, + 19, 21, 41, 43, 44, 45, 46, 47, 48, 20, 22, 23, 24, 40, 42 +}; + +static const uint8_t huff_b41_cb[14] = { + 1, 12, 1, 0, 0, 1, 7, 0, 20, 4, 10, 24, 2, 12 +}; + +static const uint8_t huff_b41_xlat[81] = { + 0x00, 0x01, 0x40, 0xC0, 0x10, 0x30, 0x04, 0x0C, 0x03, 0x50, 0xD0, 0x70, + 0xF0, 0xC4, 0x14, 0x34, 0x4C, 0x1C, 0x3C, 0xC1, 0x11, 0x31, 0x05, 0x0D, + 0xC3, 0x13, 0x33, 0x07, 0x0F, 0x44, 0xCC, 0x41, 0x43, 0x54, 0x74, 0xDC, + 0xFC, 0x71, 0x15, 0x4D, 0x1D, 0x37, 0x3F, 0xD4, 0xF4, 0x5C, 0x7C, 0x51, + 0xD1, 0xF1, 0x45, 0xC5, 0x35, 0xCD, 0xDD, 0x3D, 0x53, 0xD3, 0x73, 0xF3, + 0x47, 0xC7, 0x17, 0x77, 0x4F, 0xCF, 0x1F, 0x55, 0xFF, 0xD5, 0x75, 0xF5, + 0x5D, 0x7D, 0xFD, 0x57, 0xD7, 0xF7, 0x5F, 0xDF, 0x7F +}; + +static const uint8_t huff_b42_cb[11] = { 1, 9, 1, 0, 1, 3, 2, 3, 7, 4, 4 }; + +static const uint8_t huff_b42_xlat[25] = { + 0x00, 0x07, 0x08, 0x38, 0x01, 0x39, 0x0F, 0x10, 0x09, 0x3F, 0x30, 0x31, + 0x02, 0x3A, 0x06, 0x0E, 0x17, 0x11, 0x0A, 0x3E, 0x37, 0x12, 0x32, 0x16, + 0x36 +}; + +static const uint8_t huff_b43_cb[10] = { 2, 9, 1, 1, 3, 4, 9, 15, 12, 4 }; + +static const uint8_t huff_b43_xlat[49] = { + 0x00, 0x07, 0x08, 0x38, 0x01, 0x09, 0x39, 0x0F, 0x3F, 0x10, 0x30, 0x31, + 0x02, 0x3A, 0x06, 0x0E, 0x17, 0x37, 0x18, 0x28, 0x11, 0x19, 0x29, 0x0A, + 0x03, 0x0B, 0x3B, 0x05, 0x0D, 0x3D, 0x3E, 0x1F, 0x2F, 0x12, 0x1A, 0x2A, + 0x32, 0x13, 0x33, 0x15, 0x35, 0x16, 0x1E, 0x2E, 0x36, 0x1B, 0x2B, 0x1D, + 0x2D +}; + +static const uint8_t huff_b47_cb[10] = { 2, 9, 1, 1, 3, 4, 6, 14, 22, 12 }; + +static const uint8_t huff_b47_xlat[63] = { + 0, 1, 2, 62, 63, 3, 4, 60, 61, 5, 6, 7, 57, 58, 59, 8, + 9, 10, 11, 12, 26, 27, 37, 38, 52, 53, 54, 55, 56, 13, 14, 15, + 16, 17, 18, 25, 28, 29, 30, 31, 33, 34, 35, 36, 39, 46, 47, 48, + 49, 50, 51, 19, 20, 21, 22, 23, 24, 40, 41, 42, 43, 44, 45 +}; + +static const uint8_t huff_b52_cb[11] = { 1, 9, 1, 0, 1, 3, 2, 3, 7, 4, 4 }; + +static const uint8_t huff_b52_xlat[25] = { + 0x00, 0x01, 0x08, 0x38, 0x07, 0x39, 0x0F, 0x30, 0x09, 0x3F, 0x10, 0x31, + 0x02, 0x3A, 0x06, 0x0E, 0x17, 0x11, 0x0A, 0x3E, 0x37, 0x12, 0x32, 0x16, + 0x36 +}; + +static const uint8_t huff_b53_cb[7] = { 1, 5, 1, 1, 1, 0, 4 }; // same as b63!!! + +static const uint8_t huff_b53_xlat[7] = { 0, 7, 1, 2, 3, 5, 6 }; + +static const uint8_t huff_b56_cb[11] = { 1, 9, 1, 0, 2, 0, 2, 4, 11, 9, 2 }; + +static const uint8_t huff_b56_xlat[31] = { + 0, 1, 31, 2, 30, 3, 4, 13, 29, 5, 6, 7, 14, 15, 17, 18, + 19, 26, 27, 28, 8, 9, 12, 20, 21, 22, 23, 24, 25, 10, 11 +}; + +static const uint8_t huff_b62_cb[14] = { + 1, 12, 1, 0, 0, 2, 3, 5, 12, 14, 18, 15, 9, 2 +}; + +static const uint8_t huff_b62_xlat[81] = { + 0x00, 0x40, 0x01, 0x10, 0x04, 0x02, 0x80, 0x50, 0x90, 0x05, 0x06, 0x20, + 0x60, 0x44, 0x14, 0x54, 0x24, 0x08, 0x18, 0x41, 0x11, 0x15, 0x09, 0xA0, + 0x84, 0x94, 0x64, 0xA4, 0x28, 0x51, 0x45, 0x55, 0x19, 0x12, 0x16, 0x0A, + 0x1A, 0x48, 0x58, 0x68, 0x81, 0x91, 0x21, 0x61, 0x85, 0x95, 0x25, 0x65, + 0x49, 0x59, 0x29, 0x69, 0x42, 0x46, 0x56, 0x88, 0x98, 0xA8, 0xA1, 0xA5, + 0x99, 0xA9, 0x52, 0x22, 0x26, 0x66, 0x4A, 0x5A, 0x2A, 0x6A, 0x89, 0x82, + 0x92, 0x62, 0x86, 0x96, 0xA6, 0x8A, 0xAA, 0xA2, 0x9A +}; + +static const uint8_t huff_b63_cb[7] = { 1, 5, 1, 1, 1, 0, 4 }; + +static const uint8_t huff_b63_xlat[7] = { 0, 1, 7, 2, 3, 5, 6 }; + +static const uint8_t huff_b64_cb[7] = { 1, 5, 1, 1, 1, 1, 2 }; + +static const uint8_t huff_b64_xlat[6] = { 1, 0, 2, 5, 3, 4 }; + +static const uint8_t huff_b65_cb[14] = { + 1, 12, 1, 0, 0, 2, 2, 2, 6, 12, 34, 92, 54, 20 +}; + +static const uint8_t huff_b65_xlat[225] = { + 0x00, 0xF0, 0x01, 0x10, 0x0F, 0x11, 0xF1, 0x20, 0xE0, 0x02, 0x0E, 0x1F, + 0xFF, 0xD0, 0x21, 0xE1, 0x12, 0xF2, 0x07, 0x0A, 0x0D, 0x1E, 0xFE, 0x2F, + 0xEF, 0x30, 0x70, 0x90, 0xA0, 0xC0, 0x71, 0x91, 0xC1, 0xD1, 0x32, 0x92, + 0xE2, 0x03, 0x13, 0x63, 0x04, 0x06, 0xE6, 0xE7, 0xF7, 0x09, 0x19, 0x39, + 0xFA, 0x0C, 0x1C, 0xDD, 0xED, 0xFD, 0x2E, 0x7E, 0x9E, 0x3F, 0x9F, 0x40, + 0x50, 0x60, 0xB0, 0x31, 0x41, 0x61, 0xA1, 0xB1, 0x22, 0x42, 0x72, 0xA2, + 0xB2, 0xC2, 0xD2, 0x23, 0x33, 0x73, 0xA3, 0xC3, 0xD3, 0xE3, 0xF3, 0x14, + 0x24, 0x34, 0x44, 0x74, 0xD4, 0xE4, 0x05, 0x25, 0x45, 0x65, 0x95, 0xA5, + 0x16, 0x26, 0x46, 0x76, 0xA6, 0xB6, 0xC6, 0xD6, 0xF6, 0x17, 0x27, 0x37, + 0x47, 0x67, 0xA7, 0xD7, 0x29, 0x69, 0xB9, 0xD9, 0xE9, 0xF9, 0x1A, 0x2A, + 0x3A, 0x9A, 0xCA, 0xDA, 0xEA, 0x0B, 0x1B, 0x3B, 0x6B, 0xEB, 0xFB, 0x2C, + 0x6C, 0xEC, 0xFC, 0x1D, 0x2D, 0x4D, 0x6D, 0x9D, 0xAD, 0x3E, 0x4E, 0x6E, + 0xAE, 0xCE, 0xEE, 0x4F, 0x5F, 0x6F, 0xDF, 0x51, 0x52, 0x62, 0x43, 0x93, + 0xB3, 0x54, 0x94, 0xA4, 0xF4, 0x15, 0x75, 0xB5, 0xE5, 0xF5, 0x36, 0x56, + 0x66, 0x96, 0x57, 0x77, 0x49, 0x59, 0xA9, 0xC9, 0x4A, 0x5A, 0x6A, 0x7A, + 0xAA, 0xBA, 0x2B, 0x4B, 0x7B, 0x9B, 0xAB, 0xDB, 0x3C, 0x4C, 0x7C, 0x9C, + 0xAC, 0xBC, 0xCC, 0x3D, 0x5D, 0x7D, 0xBD, 0xCD, 0x5E, 0xBE, 0xDE, 0xBF, + 0xCF, 0x53, 0x64, 0xB4, 0xC4, 0x35, 0x55, 0xC5, 0xD5, 0x97, 0xB7, 0xC7, + 0x79, 0x99, 0x5B, 0xBB, 0xCB, 0x5C, 0xDC, 0x7F, 0xAF +}; + +static const uint8_t huff_b66_cb[14] = { + 1, 12, 1, 0, 0, 3, 0, 3, 3, 10, 40, 85, 61, 50 +}; + +static const uint8_t huff_b66_xlat[256] = { + 0x00, 0x10, 0x01, 0x11, 0x21, 0x02, 0x12, 0x20, 0x22, 0x13, 0x30, 0x31, + 0x41, 0xD1, 0xE1, 0x32, 0x52, 0x03, 0x23, 0x2D, 0x40, 0x50, 0x60, 0x80, + 0xD0, 0xE0, 0x51, 0x61, 0xF1, 0x42, 0x62, 0xD2, 0xE2, 0xF2, 0x33, 0x43, + 0xC3, 0xD3, 0xE3, 0x04, 0x14, 0xD4, 0xF4, 0x25, 0x35, 0x16, 0x17, 0xF7, + 0xD8, 0x1C, 0x3C, 0x0D, 0x1D, 0x3D, 0x5D, 0x0E, 0x1E, 0x2E, 0x7E, 0x2F, + 0xC0, 0xF0, 0x71, 0x81, 0x91, 0xC1, 0x72, 0x82, 0x92, 0xB2, 0xC2, 0x53, + 0x63, 0x73, 0x93, 0xA3, 0xF3, 0x24, 0x44, 0x64, 0x84, 0xA4, 0xB4, 0x05, + 0x15, 0x95, 0xD5, 0x06, 0x26, 0x36, 0x46, 0x96, 0xD6, 0xE6, 0xF6, 0x07, + 0x27, 0x37, 0xD7, 0xE7, 0x08, 0x18, 0x28, 0x38, 0xE8, 0xF8, 0x09, 0x19, + 0x29, 0xE9, 0xF9, 0x0A, 0x1A, 0xCA, 0xDA, 0xEA, 0x0B, 0x1B, 0xDB, 0xEB, + 0xFB, 0x2C, 0x4C, 0x5C, 0x7C, 0x8C, 0x4D, 0x6D, 0x8D, 0x9D, 0xFD, 0x3E, + 0x5E, 0x6E, 0x8E, 0x9E, 0xEE, 0x0F, 0x1F, 0x3F, 0x4F, 0x5F, 0x6F, 0x7F, + 0xCF, 0x70, 0xA1, 0xA2, 0x83, 0xB3, 0x34, 0x74, 0xC4, 0xE4, 0x55, 0x65, + 0x85, 0xA5, 0xC5, 0xE5, 0xF5, 0x56, 0x66, 0x76, 0x86, 0xA6, 0xC6, 0x57, + 0x67, 0x77, 0x97, 0xA7, 0x48, 0x88, 0x98, 0x49, 0x59, 0x79, 0x99, 0x3A, + 0x4A, 0x8A, 0xBA, 0xFA, 0x2B, 0x7B, 0x0C, 0xAC, 0xBC, 0xCC, 0xEC, 0x7D, + 0xAD, 0xBD, 0xDD, 0x4E, 0xBE, 0xCE, 0xFE, 0x8F, 0x9F, 0xAF, 0xBF, 0xDF, + 0xEF, 0xFF, 0x90, 0xA0, 0xB0, 0xB1, 0x54, 0x94, 0x45, 0x75, 0xB5, 0xB6, + 0x47, 0x87, 0xB7, 0xC7, 0x58, 0x68, 0x78, 0xA8, 0xB8, 0xC8, 0x39, 0x69, + 0x89, 0xA9, 0xB9, 0xC9, 0xD9, 0x2A, 0x5A, 0x6A, 0x7A, 0x9A, 0xAA, 0x3B, + 0x4B, 0x5B, 0x6B, 0x8B, 0x9B, 0xAB, 0xBB, 0xCB, 0x6C, 0x9C, 0xDC, 0xFC, + 0xCD, 0xED, 0xAE, 0xDE +}; + +static const uint8_t huff_b67_cb[10] = { 2, 9, 1, 2, 1, 4, 7, 10, 26, 12 }; + +static const uint8_t huff_b67_xlat[63] = { + 0, 1, 63, 62, 2, 3, 60, 61, 4, 5, 6, 7, 57, 58, 59, 8, + 9, 10, 11, 12, 52, 53, 54, 55, 56, 13, 14, 15, 16, 17, 18, 25, + 26, 27, 28, 29, 30, 31, 33, 34, 35, 36, 37, 38, 39, 46, 47, 48, + 49, 50, 51, 19, 20, 21, 22, 23, 24, 40, 41, 42, 43, 44, 45 +}; + +static const uint8_t huff_b71_cb[14] = { + 1, 12, 1, 0, 0, 1, 7, 0, 19, 5, 13, 23, 0, 12 +}; + +static const uint8_t huff_b71_xlat[81] = { + 0x00, 0x03, 0x40, 0xC0, 0x10, 0x30, 0x04, 0x0C, 0x01, 0x50, 0xD0, 0x70, + 0xF0, 0xC4, 0x14, 0x34, 0x4C, 0x1C, 0x3C, 0xC1, 0x11, 0x31, 0x05, 0x0D, + 0x13, 0x33, 0x07, 0x0F, 0x44, 0xCC, 0x41, 0x43, 0xC3, 0x54, 0x74, 0xDC, + 0xFC, 0xF1, 0xC5, 0x15, 0x1D, 0x53, 0xC7, 0x37, 0x4F, 0x3F, 0xD4, 0xF4, + 0x5C, 0x7C, 0x51, 0xD1, 0x71, 0x45, 0x55, 0x35, 0x4D, 0xCD, 0xDD, 0x3D, + 0xD3, 0x73, 0xF3, 0x47, 0x17, 0x77, 0xCF, 0x1F, 0xFF, 0xD5, 0x75, 0xF5, + 0x5D, 0x7D, 0xFD, 0x57, 0xD7, 0xF7, 0x5F, 0xDF, 0x7F +}; + +static const uint8_t huff_b73_cb[13] = { + 1, 11, 1, 0, 0, 0, 1, 4, 9, 4, 103, 110, 24 +}; + +static const uint8_t huff_b73_xlat[256] = { + 0x00, 0x40, 0x10, 0x04, 0x01, 0x05, 0x50, 0x14, 0x54, 0x41, 0x11, 0x51, + 0x45, 0x15, 0x55, 0x44, 0x95, 0x6A, 0x03, 0x80, 0xC0, 0x90, 0xD0, 0x94, + 0xD4, 0x24, 0x64, 0x58, 0x91, 0xA1, 0x85, 0xD5, 0x25, 0x65, 0xA5, 0xE5, + 0x75, 0xB5, 0xF5, 0x19, 0x59, 0x99, 0xD9, 0x69, 0xA9, 0xE9, 0x79, 0xB9, + 0xF9, 0x4D, 0x5D, 0x9D, 0xDD, 0x6D, 0xAD, 0xED, 0x7D, 0xBD, 0xFD, 0x02, + 0x42, 0x52, 0x06, 0x46, 0x16, 0x56, 0x96, 0xD6, 0x26, 0x66, 0xA6, 0xE6, + 0x76, 0xB6, 0xF6, 0x1A, 0x5A, 0x9A, 0xDA, 0xAA, 0xEA, 0x7A, 0xBA, 0xFA, + 0x5E, 0x9E, 0xDE, 0x6E, 0xAE, 0xEE, 0x7E, 0xBE, 0xFE, 0x07, 0x47, 0x57, + 0x97, 0xD7, 0x67, 0xA7, 0xE7, 0x77, 0xB7, 0xF7, 0x5B, 0x9B, 0xDB, 0x6B, + 0xAB, 0xEB, 0x7B, 0xBB, 0xFB, 0x5F, 0x9F, 0xDF, 0x6F, 0xAF, 0xEF, 0x7F, + 0xBF, 0xFF, 0x20, 0x60, 0x70, 0xB0, 0xF0, 0x84, 0xC4, 0xA4, 0xE4, 0x74, + 0xB4, 0xF4, 0x08, 0x88, 0x18, 0x98, 0xD8, 0x68, 0xA8, 0xE8, 0x78, 0xB8, + 0xF8, 0x1C, 0x5C, 0x9C, 0xDC, 0x6C, 0xAC, 0xEC, 0x3C, 0x7C, 0xBC, 0xFC, + 0x81, 0xD1, 0x21, 0x61, 0xE1, 0x71, 0xB1, 0xF1, 0xC5, 0x35, 0x09, 0x49, + 0x89, 0xC9, 0x29, 0x39, 0x0D, 0x8D, 0xCD, 0x1D, 0x2D, 0x3D, 0x92, 0xD2, + 0x22, 0x62, 0xA2, 0xE2, 0x72, 0xB2, 0xF2, 0x86, 0xC6, 0x36, 0x0A, 0x4A, + 0x8A, 0xCA, 0x2A, 0x3A, 0x0E, 0x4E, 0x8E, 0xCE, 0x1E, 0x2E, 0x3E, 0x13, + 0x53, 0x93, 0xD3, 0x63, 0xA3, 0xE3, 0x73, 0xB3, 0xF3, 0x87, 0xC7, 0x17, + 0x27, 0x37, 0x0B, 0x4B, 0x8B, 0xCB, 0x1B, 0x2B, 0x3B, 0x0F, 0x4F, 0x8F, + 0xCF, 0x1F, 0x2F, 0x3F, 0xA0, 0xE0, 0x30, 0x34, 0x48, 0xC8, 0x28, 0x38, + 0x0C, 0x4C, 0x8C, 0xCC, 0x2C, 0xC1, 0x31, 0x82, 0xC2, 0x12, 0x32, 0x43, + 0x83, 0xC3, 0x23, 0x33 +}; + +static const uint8_t huff_b74_cb[8] = { 1, 6, 1, 0, 2, 2, 2, 4 }; + +static const uint8_t huff_b74_xlat[11] = { + 0, 1, 15, 2, 14, 5, 13, 3, 4, 11, 12 +}; + +static const uint8_t huff_b75_cb[13] = { + 2, 12, 1, 4, 0, 0, 0, 8, 11, 24, 53, 64, 60 +}; + +static const uint8_t huff_b75_xlat[225] = { + 0x00, 0x10, 0xF0, 0x01, 0x0F, 0x20, 0xE0, 0x11, 0xF1, 0x02, 0x0E, 0x1F, + 0xFF, 0xD0, 0x21, 0xE1, 0x12, 0xF2, 0x03, 0x0D, 0x1E, 0xFE, 0x2F, 0xEF, + 0x30, 0x40, 0x60, 0x70, 0x90, 0xA0, 0xC0, 0x31, 0xD1, 0x22, 0xE2, 0x13, + 0xF3, 0x04, 0x06, 0x07, 0x09, 0x0C, 0x1D, 0xFD, 0x2E, 0xEE, 0x3F, 0xDF, + 0x50, 0xB0, 0x41, 0x61, 0x71, 0x91, 0xA1, 0xC1, 0x32, 0x62, 0x72, 0x92, + 0xA2, 0xD2, 0x23, 0xD3, 0xE3, 0x14, 0xF4, 0x05, 0x16, 0x26, 0xE6, 0xF6, + 0x17, 0x27, 0xE7, 0xF7, 0x19, 0x29, 0xF9, 0x0A, 0x1A, 0x2A, 0xFA, 0x0B, + 0x1C, 0x2C, 0xFC, 0x2D, 0x3D, 0xED, 0x3E, 0x4E, 0x7E, 0x9E, 0xDE, 0x4F, + 0x6F, 0x7F, 0x9F, 0xAF, 0xCF, 0x51, 0xB1, 0x42, 0x52, 0xB2, 0xC2, 0x33, + 0x63, 0x73, 0x93, 0xA3, 0xB3, 0xC3, 0x24, 0x34, 0x74, 0xA4, 0xD4, 0xE4, + 0x15, 0x25, 0x65, 0x95, 0xE5, 0xF5, 0x36, 0xD6, 0x37, 0x47, 0xC7, 0xD7, + 0x39, 0x59, 0xB9, 0xC9, 0xD9, 0xE9, 0x3A, 0x6A, 0xDA, 0xEA, 0x1B, 0x2B, + 0x9B, 0xAB, 0xEB, 0xFB, 0x6C, 0x7C, 0x9C, 0xAC, 0xEC, 0x4D, 0x6D, 0x7D, + 0x9D, 0xAD, 0xBD, 0xDD, 0x5E, 0x6E, 0xAE, 0xCE, 0x5F, 0x43, 0x53, 0x44, + 0x54, 0x64, 0x94, 0xB4, 0xC4, 0x35, 0x45, 0x55, 0x75, 0xA5, 0xB5, 0xC5, + 0xD5, 0x46, 0x56, 0x66, 0x76, 0x96, 0xA6, 0xB6, 0xC6, 0x57, 0x67, 0x77, + 0x97, 0xA7, 0xB7, 0x49, 0x69, 0x79, 0x99, 0xA9, 0x4A, 0x5A, 0x7A, 0x9A, + 0xAA, 0xBA, 0xCA, 0x3B, 0x4B, 0x5B, 0x6B, 0x7B, 0xBB, 0xCB, 0xDB, 0x3C, + 0x4C, 0x5C, 0xBC, 0xCC, 0xDC, 0x5D, 0xCD, 0xBE, 0xBF +}; + +static const uint8_t huff_b77_cb[12] = { + 2, 11, 1, 0, 4, 6, 10, 12, 7, 15, 4, 4 +}; + +static const uint8_t huff_b77_xlat[63] = { + 0, 1, 2, 62, 63, 3, 4, 5, 59, 60, 61, 6, 7, 8, 9, 10, + 54, 55, 56, 57, 58, 11, 12, 13, 14, 15, 16, 47, 49, 50, 51, 52, + 53, 17, 18, 19, 20, 45, 46, 48, 21, 22, 23, 24, 25, 26, 27, 37, + 38, 39, 40, 41, 42, 43, 44, 28, 29, 30, 35, 31, 33, 34, 36 +}; + +/** Tables for spectrum coding. */ +typedef struct Atrac3pSpecCodeTab { + uint8_t group_size; ///< number of coefficients grouped together + uint8_t num_coeffs; ///< 1 - map index to a single value, > 1 - map index to a vector of values + uint8_t bits; ///< number of bits a single coefficient occupy + uint8_t is_signed; ///< 1 - values in that table are signed ones, otherwise - absolute ones + + int redirect; ///< if >= 0: tells which huffman table must be reused + const uint8_t *cb; ///< pointer to the codebook descriptor + const uint8_t *xlat; ///< pointer to the translation table or NULL if none +} Atrac3pSpecCodeTab; + +static const Atrac3pSpecCodeTab atrac3p_spectra_tabs[112] = { + /* table set = A */ + /* code table = 0 */ + { 1, 4, 2, 1, -1, huff_a01_cb, huff_a01_xlat }, // wordlen = 1 + { 1, 4, 2, 0, -1, huff_a02_cb, huff_a02_xlat }, // wordlen = 2 + { 1, 2, 3, 1, -1, huff_a03_cb, huff_a03_xlat }, // wordlen = 3 + { 1, 1, 3, 0, -1, huff_a04_cb, huff_a04_xlat }, // wordlen = 4 + { 1, 2, 4, 1, -1, huff_a05_cb, huff_a05_xlat }, // wordlen = 5 + { 1, 1, 4, 0, -1, huff_a06_cb, huff_a06_xlat }, // wordlen = 6 + { 1, 1, 6, 1, -1, huff_a07_cb, huff_a07_xlat }, // wordlen = 7 + + /* code table = 1 */ + { 4, 4, 2, 1, -1, huff_a11_cb, huff_a11_xlat }, // wordlen = 1 + { 1, 4, 2, 0, -1, huff_a12_cb, huff_a12_xlat }, // wordlen = 2 + { 1, 2, 3, 1, -1, huff_a13_cb, huff_a13_xlat }, // wordlen = 3 + { 1, 2, 4, 1, -1, huff_a14_cb, huff_a14_xlat }, // wordlen = 4 + { 1, 2, 4, 1, -1, huff_a15_cb, huff_a15_xlat }, // wordlen = 5 + { 1, 2, 4, 0, -1, huff_a16_cb, huff_a16_xlat }, // wordlen = 6 + { 1, 1, 6, 1, -1, huff_a17_cb, huff_a17_xlat }, // wordlen = 7 + + /* code table = 2 */ + { 1, 4, 2, 1, -1, huff_a21_cb, huff_a21_xlat }, // wordlen = 1 + { 1, 2, 3, 1, -1, huff_a22_cb, huff_a22_xlat }, // wordlen = 2 + { 1, 2, 3, 1, -1, huff_a23_cb, huff_a23_xlat }, // wordlen = 3 + { 1, 1, 3, 0, -1, huff_a24_cb, NULL }, // wordlen = 4 + { 1, 1, 3, 0, -1, huff_a25_cb, huff_a25_xlat }, // wordlen = 5 + { 1, 2, 4, 0, -1, huff_a26_cb, huff_a26_xlat }, // wordlen = 6 + { 1, 1, 6, 1, -1, huff_a27_cb, huff_a27_xlat }, // wordlen = 7 + + /* code table = 3 */ + { 1, 2, 2, 1, -1, huff_a31_cb, huff_a31_xlat }, // wordlen = 1 + { 1, 4, 2, 0, -1, huff_a32_cb, huff_a32_xlat }, // wordlen = 2 + { 1, 4, 2, 0, -1, huff_a33_cb, huff_a33_xlat }, // wordlen = 3 + { 1, 1, 3, 0, -1, huff_a34_cb, huff_a34_xlat }, // wordlen = 4 + { 1, 2, 4, 1, -1, huff_a35_cb, huff_a35_xlat }, // wordlen = 5 + { 1, 2, 4, 0, -1, huff_a36_cb, huff_a36_xlat }, // wordlen = 6 + { 1, 1, 6, 1, -1, huff_a37_cb, huff_a37_xlat }, // wordlen = 7 + + /* code table = 4 */ + { 1, 4, 2, 1, -1, huff_a41_cb, huff_a41_xlat }, // wordlen = 1 + { 1, 4, 2, 0, -1, huff_a42_cb, huff_a42_xlat }, // wordlen = 2 + { 1, 1, 3, 1, -1, huff_a43_cb, huff_a43_xlat }, // wordlen = 3 + { 1, 2, 4, 1, -1, huff_a44_cb, huff_a44_xlat }, // wordlen = 4 + { 1, 1, 3, 0, -1, huff_a45_cb, huff_a45_xlat }, // wordlen = 5 + { 1, 2, 4, 0, -1, huff_a46_cb, huff_a46_xlat }, // wordlen = 6 + { 1, 1, 6, 1, -1, huff_a47_cb, huff_a47_xlat }, // wordlen = 7 + + /* code table = 5 */ + { 1, 4, 2, 1, -1, huff_a51_cb, huff_a51_xlat }, // wordlen = 1 + { 1, 2, 3, 1, -1, huff_a52_cb, huff_a52_xlat }, // wordlen = 2 + { 1, 1, 3, 1, -1, huff_a43_cb, huff_a53_xlat }, // wordlen = 3 + { 1, 2, 4, 1, -1, huff_a54_cb, huff_a54_xlat }, // wordlen = 4 + { 1, 1, 3, 0, -1, huff_a55_cb, huff_a55_xlat }, // wordlen = 5 + { 1, 1, 5, 1, -1, huff_a56_cb, huff_a56_xlat }, // wordlen = 6 + { 1, 1, 6, 1, -1, huff_a57_cb, huff_a57_xlat }, // wordlen = 7 + + /* code table = 6 */ + { 2, 4, 2, 1, -1, huff_a61_cb, huff_a61_xlat }, // wordlen = 1 + { 1, 2, 3, 1, -1, huff_a62_cb, huff_a62_xlat }, // wordlen = 2 + { 1, 4, 2, 0, -1, huff_a63_cb, huff_a63_xlat }, // wordlen = 3 + { 1, 2, 4, 1, -1, huff_a64_cb, huff_a64_xlat }, // wordlen = 4 + { 1, 1, 4, 1, -1, huff_a65_cb, huff_a65_xlat }, // wordlen = 5 + { 1, 1, 5, 1, -1, huff_a66_cb, huff_a66_xlat }, // wordlen = 6 + { 1, 1, 6, 1, -1, huff_a67_cb, huff_a67_xlat }, // wordlen = 7 + + /* code table = 7 */ + { 1, 2, 1, 0, -1, huff_a71_cb, NULL }, // wordlen = 1 + { 2, 4, 2, 0, -1, huff_a72_cb, huff_a72_xlat }, // wordlen = 2 + { 1, 2, 3, 1, -1, huff_a73_cb, huff_a73_xlat }, // wordlen = 3 + { 1, 2, 4, 1, -1, huff_a74_cb, huff_a74_xlat }, // wordlen = 4 + { 1, 1, 4, 1, -1, huff_a75_cb, huff_a75_xlat }, // wordlen = 5 + { 2, 2, 4, 0, -1, huff_a76_cb, huff_a76_xlat }, // wordlen = 6 + { 4, 1, 6, 1, 6, NULL, NULL }, // wordlen = 7 + + /* table set = B */ + /* code table = 0 */ + { 4, 4, 2, 1, -1, huff_b01_cb, huff_b01_xlat }, // wordlen = 1 + { 1, 4, 2, 0, -1, huff_b02_cb, huff_b02_xlat }, // wordlen = 2 + { 4, 2, 3, 1, -1, huff_b03_cb, huff_b03_xlat }, // wordlen = 3 + { 1, 2, 4, 1, -1, huff_b04_cb, huff_b04_xlat }, // wordlen = 4 + { 1, 2, 4, 1, -1, huff_b05_cb, huff_b05_xlat }, // wordlen = 5 + { 1, 1, 4, 0, 5, NULL, NULL }, // wordlen = 6 + { 1, 1, 6, 1, -1, huff_b07_cb, huff_b07_xlat }, // wordlen = 7 + + /* code table = 1 */ + { 1, 4, 2, 1, 14, NULL, NULL }, // wordlen = 1 + { 1, 4, 2, 0, -1, huff_b12_cb, huff_b12_xlat }, // wordlen = 2 + { 1, 2, 3, 1, 9, NULL, NULL }, // wordlen = 3 + { 1, 2, 4, 1, -1, huff_b14_cb, huff_b14_xlat }, // wordlen = 4 + { 1, 2, 4, 1, 11, NULL, NULL }, // wordlen = 5 + { 1, 2, 4, 0, -1, huff_b16_cb, huff_b16_xlat }, // wordlen = 6 + { 1, 1, 6, 1, 6, NULL, NULL }, // wordlen = 7 + + /* code table = 2 */ + { 4, 4, 2, 1, 28, NULL, NULL }, // wordlen = 1 + { 4, 4, 2, 0, 22, NULL, NULL }, // wordlen = 2 + { 1, 2, 3, 1, 2, NULL, NULL }, // wordlen = 3 + { 1, 2, 4, 1, 31, NULL, NULL }, // wordlen = 4 + { 2, 2, 4, 1, 60, NULL, NULL }, // wordlen = 5 + { 2, 2, 4, 0, -1, huff_b26_cb, huff_b26_xlat }, // wordlen = 6 + { 4, 1, 6, 1, 6, NULL, NULL }, // wordlen = 7 + + /* code table = 3 */ + { 1, 4, 2, 1, 35, NULL, NULL }, // wordlen = 1 + { 1, 4, 2, 0, -1, huff_b32_cb, huff_b32_xlat }, // wordlen = 2 + { 1, 4, 2, 0, -1, huff_b33_cb, huff_b33_xlat }, // wordlen = 3 + { 2, 2, 4, 1, 59, NULL, NULL }, // wordlen = 4 + { 1, 2, 4, 1, -1, huff_b35_cb, huff_b35_xlat }, // wordlen = 5 + { 1, 2, 4, 0, 75, NULL, NULL }, // wordlen = 6 + { 1, 1, 6, 1, -1, huff_b37_cb, huff_b37_xlat }, // wordlen = 7 + + /* code table = 4 */ + { 1, 4, 2, 1, -1, huff_b41_cb, huff_b41_xlat }, // wordlen = 1 + { 4, 2, 3, 1, -1, huff_b42_cb, huff_b42_xlat }, // wordlen = 2 + { 1, 2, 3, 1, -1, huff_b43_cb, huff_b43_xlat }, // wordlen = 3 + { 4, 2, 4, 1, 66, NULL, NULL }, // wordlen = 4 + { 1, 1, 3, 0, 32, NULL, NULL }, // wordlen = 5 + { 1, 2, 4, 0, 12, NULL, NULL }, // wordlen = 6 + { 1, 1, 6, 1, -1, huff_b47_cb, huff_b47_xlat }, // wordlen = 7 + + /* code table = 5 */ + { 2, 4, 2, 1, 42, NULL, NULL }, // wordlen = 1 + { 1, 2, 3, 1, -1, huff_b52_cb, huff_b52_xlat }, // wordlen = 2 + { 4, 1, 3, 1, -1, huff_b53_cb, huff_b53_xlat }, // wordlen = 3 + { 1, 1, 3, 0, 17, NULL, NULL }, // wordlen = 4 + { 1, 1, 3, 0, 39, NULL, NULL }, // wordlen = 5 + { 1, 1, 5, 1, -1, huff_b56_cb, huff_b56_xlat }, // wordlen = 6 + { 2, 1, 6, 1, 62, NULL, NULL }, // wordlen = 7 + + /* code table = 6 */ + { 1, 4, 2, 1, 28, NULL, NULL }, // wordlen = 1 + { 1, 4, 2, 0, -1, huff_b62_cb, huff_b62_xlat }, // wordlen = 2 + { 1, 1, 3, 1, -1, huff_b63_cb, huff_b63_xlat }, // wordlen = 3 + { 1, 1, 3, 0, -1, huff_b64_cb, huff_b64_xlat }, // wordlen = 4 + { 4, 2, 4, 1, -1, huff_b65_cb, huff_b65_xlat }, // wordlen = 5 + { 1, 2, 4, 0, -1, huff_b66_cb, huff_b66_xlat }, // wordlen = 6 + { 1, 1, 6, 1, -1, huff_b67_cb, huff_b67_xlat }, // wordlen = 7 + + /* code table = 7 */ + { 1, 4, 2, 1, -1, huff_b71_cb, huff_b71_xlat }, // wordlen = 1 + { 4, 4, 2, 0, 78, NULL, NULL }, // wordlen = 2 + { 4, 4, 2, 0, -1, huff_b73_cb, huff_b73_xlat }, // wordlen = 3 + { 1, 1, 4, 1, -1, huff_b74_cb, huff_b74_xlat }, // wordlen = 4 + { 1, 2, 4, 1, -1, huff_b75_cb, huff_b75_xlat }, // wordlen = 5 + { 1, 1, 5, 1, 47, NULL, NULL }, // wordlen = 6 + { 1, 1, 6, 1, -1, huff_b77_cb, huff_b77_xlat }, // wordlen = 7 +}; + +/* Huffman tables for gain control data. */ +static const uint8_t atrac3p_huff_gain_npoints1_cb[9] = { + 1, 7, 1, 1, 1, 1, 1, 1, 2 +}; + +static const uint8_t atrac3p_huff_gain_npoints2_xlat[8] = { + 0, 1, 7, 2, 6, 3, 4, 5 +}; + +static const uint8_t atrac3p_huff_gain_lev1_cb[9] = { 1, 7, 1, 0, 2, 2, 1, 2, 8 }; +static const uint8_t atrac3p_huff_gain_lev1_xlat[16] = { + 7, 5, 8, 6, 9, 4, 10, 11, 0, 1, 2, 3, 12, 13, 14, 15 +}; + +static const uint8_t atrac3p_huff_gain_lev2_cb[11] = { + 1, 9, 1, 1, 1, 1, 1, 0, 2, 0, 8 +}; + +static const uint8_t atrac3p_huff_gain_lev2_xlat[15] = { + 15, 14, 1, 13, 2, 3, 12, 4, 5, 6, 7, 8, 9, 10, 11 +}; + +static const uint8_t atrac3p_huff_gain_lev3_cb[11] = { + 1, 9, 1, 0, 3, 1, 1, 0, 2, 0, 8 +}; + +static const uint8_t atrac3p_huff_gain_lev3_xlat[16] = { + 0, 1, 14, 15, 2, 13, 3, 12, 4, 5, 6, 7, 8, 9, 10, 11 +}; + +static const uint8_t atrac3p_huff_gain_lev4_cb[11] = { + 1, 9, 1, 1, 1, 1, 1, 0, 1, 2, 8 +}; + +static const uint8_t atrac3p_huff_gain_lev4_xlat[16] = { + 0, 1, 15, 14, 2, 13, 3, 12, 4, 5, 6, 7, 8, 9, 10, 11 +}; + +static const uint8_t atrac3p_huff_gain_loc1_cb[9] = { 2, 8, 1, 2, 4, 4, 4, 0, 16 }; +static const uint8_t atrac3p_huff_gain_loc1_xlat[31] = { + 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, + 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31 +}; + +static const uint8_t atrac3p_huff_gain_loc2_cb[8] = { 3, 8, 5, 3, 2, 3, 2, 16 }; +static const uint8_t atrac3p_huff_gain_loc2_xlat[31] = { + 2, 3, 4, 5, 6, 1, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, + 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31 +}; + +static const uint8_t atrac3p_huff_gain_loc3_cb[7] = { 2, 6, 1, 0, 2, 11, 18 }; +static const uint8_t atrac3p_huff_gain_loc3_xlat[32] = { + 0, 1, 31, 2, 3, 4, 5, 6, 7, 26, 27, 28, 29, 30, 8, 9, + 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25 +}; + +static const uint8_t atrac3p_huff_gain_loc4_cb[5] = { 4, 6, 3, 23, 6 }; +static const uint8_t atrac3p_huff_gain_loc4_xlat[32] = { + 0, 28, 29, 1, 2, 3, 4, 11, 12, 13, 14, 15, 16, 17, 18, 19, + 20, 21, 22, 23, 24, 25, 26, 27, 30, 31, 5, 6, 7, 8, 9, 10 +}; + +static const uint8_t atrac3p_huff_gain_loc5_cb[9] = { 1, 7, 1, 0, 0, 3, 2, 6, 20 }; +static const uint8_t atrac3p_huff_gain_loc5_xlat[32] = { + 0, 1, 2, 31, 3, 4, 5, 6, 7, 8, 29, 30, 9, 10, 11, 12, + 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28 +}; + +/* Huffman tables for GHA waves data. */ +static const uint8_t atrac3p_huff_tonebands_cb[8] = { 1, 6, 1, 0, 1, 2, 4, 8 }; +static const uint8_t atrac3p_huff_numwavs1_cb[9] = { 1, 7, 1, 1, 1, 1, 1, 1, 2 }; +static const uint8_t atrac3p_huff_numwavs2_cb[8] = { 1, 6, 1, 1, 1, 1, 0, 4 }; +static const uint8_t atrac3p_huff_numwavs2_xlat[8] = { 0, 1, 7, 2, 3, 4, 5, 6 }; +static const uint8_t atrac3p_huff_wav_ampsf1_cb[7] = { 4, 8, 10, 8, 6, 0, 8 }; +static const uint8_t atrac3p_huff_wav_ampsf1_xlat[32] = { + 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 5, 6, 7, 18, 19, 20, + 21, 22, 4, 23, 24, 25, 26, 27, 0, 1, 2, 3, 28, 29, 30, 31 +}; + +static const uint8_t atrac3p_huff_wav_ampsf2_cb[7] = { 4, 8, 11, 5, 6, 6, 4 }; +static const uint8_t atrac3p_huff_wav_ampsf2_xlat[32] = { + 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 14, 15, 16, 17, 29, + 9, 10, 11, 12, 13, 30, 4, 5, 6, 7, 8, 31, 0, 1, 2, 3 +}; + +static const uint8_t atrac3p_huff_wav_ampsf3_cb[9] = { 2, 8, 1, 3, 3, 1, 4, 4, 16 }; +static const uint8_t atrac3p_huff_wav_ampsf3_xlat[32] = { + 0, 1, 2, 31, 3, 29, 30, 4, 5, 6, 27, 28, 7, 24, 25, 26, + 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23 +}; + +static const uint8_t atrac3p_huff_freq_cb[13] = { + 1, 11, 1, 0, 0, 2, 2, 0, 9, 9, 29, 104, 100 +}; + +static const uint8_t atrac3p_huff_freq_xlat[256] = { + 0, 1, 255, 2, 254, 3, 4, 5, 6, 7, 8, 251, 252, 253, 9, 10, + 11, 12, 246, 247, 248, 249, 250, 13, 14, 15, 16, 17, 18, 19, 20, 21, + 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, + 38, 243, 244, 245, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, + 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, + 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, + 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 194, 195, 196, 197, 198, + 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, + 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, + 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 94, 95, 96, 97, + 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, + 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, + 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, + 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, + 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, + 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193 +}; + +#endif /* AVCODEC_ATRAC3PLUS_DATA_H */ diff --git a/ext/at3_standalone/atrac3plusdec.c b/ext/at3_standalone/atrac3plusdec.c new file mode 100644 index 0000000000..6f2854b8b7 --- /dev/null +++ b/ext/at3_standalone/atrac3plusdec.c @@ -0,0 +1,402 @@ +/* + * ATRAC3+ compatible decoder + * + * Copyright (c) 2010-2013 Maxim Poliakovski + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + * Sony ATRAC3+ compatible decoder. + * + * Container formats used to store its data: + * RIFF WAV (.at3) and Sony OpenMG (.oma, .aa3). + * + * Technical description of this codec can be found here: + * http://wiki.multimedia.cx/index.php?title=ATRAC3plus + * + * Kudos to Benjamin Larsson and Michael Karcher + * for their precious technical help! + */ + +#include +#include + +#include "channel_layout.h" +#include "float_dsp.h" +#include "avcodec.h" +#include "get_bits.h" +#include "internal.h" +#include "atrac.h" +#include "atrac3plus.h" + +typedef struct ATRAC3PContext { + GetBitContext gb; + AVFloatDSPContext *fdsp; + + DECLARE_ALIGNED(32, float, samples)[2][ATRAC3P_FRAME_SAMPLES]; ///< quantized MDCT spectrum + DECLARE_ALIGNED(32, float, mdct_buf)[2][ATRAC3P_FRAME_SAMPLES]; ///< output of the IMDCT + DECLARE_ALIGNED(32, float, time_buf)[2][ATRAC3P_FRAME_SAMPLES]; ///< output of the gain compensation + DECLARE_ALIGNED(32, float, outp_buf)[2][ATRAC3P_FRAME_SAMPLES]; + + AtracGCContext gainc_ctx; ///< gain compensation context + FFTContext mdct_ctx; + FFTContext ipqf_dct_ctx; ///< IDCT context used by IPQF + + Atrac3pChanUnitCtx *ch_units; ///< global channel units + + int num_channel_blocks; ///< number of channel blocks + uint8_t channel_blocks[5]; ///< channel configuration descriptor + uint64_t my_channel_layout; ///< current channel layout +} ATRAC3PContext; + +static av_cold int atrac3p_decode_close(AVCodecContext *avctx) +{ + ATRAC3PContext *ctx = avctx->priv_data; + + av_freep(&ctx->ch_units); + av_freep(&ctx->fdsp); + + ff_mdct_end(&ctx->mdct_ctx); + ff_mdct_end(&ctx->ipqf_dct_ctx); + + return 0; +} + +static av_cold int set_channel_params(ATRAC3PContext *ctx, + AVCodecContext *avctx) +{ + memset(ctx->channel_blocks, 0, sizeof(ctx->channel_blocks)); + + switch (avctx->channels) { + case 1: + if (avctx->channel_layout != AV_CH_FRONT_LEFT) + avctx->channel_layout = AV_CH_LAYOUT_MONO; + + ctx->num_channel_blocks = 1; + ctx->channel_blocks[0] = CH_UNIT_MONO; + break; + case 2: + avctx->channel_layout = AV_CH_LAYOUT_STEREO; + ctx->num_channel_blocks = 1; + ctx->channel_blocks[0] = CH_UNIT_STEREO; + break; + case 3: + avctx->channel_layout = AV_CH_LAYOUT_SURROUND; + ctx->num_channel_blocks = 2; + ctx->channel_blocks[0] = CH_UNIT_STEREO; + ctx->channel_blocks[1] = CH_UNIT_MONO; + break; + case 4: + avctx->channel_layout = AV_CH_LAYOUT_4POINT0; + ctx->num_channel_blocks = 3; + ctx->channel_blocks[0] = CH_UNIT_STEREO; + ctx->channel_blocks[1] = CH_UNIT_MONO; + ctx->channel_blocks[2] = CH_UNIT_MONO; + break; + case 6: + avctx->channel_layout = AV_CH_LAYOUT_5POINT1_BACK; + ctx->num_channel_blocks = 4; + ctx->channel_blocks[0] = CH_UNIT_STEREO; + ctx->channel_blocks[1] = CH_UNIT_MONO; + ctx->channel_blocks[2] = CH_UNIT_STEREO; + ctx->channel_blocks[3] = CH_UNIT_MONO; + break; + case 7: + avctx->channel_layout = AV_CH_LAYOUT_6POINT1_BACK; + ctx->num_channel_blocks = 5; + ctx->channel_blocks[0] = CH_UNIT_STEREO; + ctx->channel_blocks[1] = CH_UNIT_MONO; + ctx->channel_blocks[2] = CH_UNIT_STEREO; + ctx->channel_blocks[3] = CH_UNIT_MONO; + ctx->channel_blocks[4] = CH_UNIT_MONO; + break; + case 8: + avctx->channel_layout = AV_CH_LAYOUT_7POINT1; + ctx->num_channel_blocks = 5; + ctx->channel_blocks[0] = CH_UNIT_STEREO; + ctx->channel_blocks[1] = CH_UNIT_MONO; + ctx->channel_blocks[2] = CH_UNIT_STEREO; + ctx->channel_blocks[3] = CH_UNIT_STEREO; + ctx->channel_blocks[4] = CH_UNIT_MONO; + break; + default: + av_log(avctx, AV_LOG_ERROR, + "Unsupported channel count: %d!\n", avctx->channels); + return AVERROR_INVALIDDATA; + } + + return 0; +} + +static av_cold int atrac3p_decode_init(AVCodecContext *avctx) +{ + ATRAC3PContext *ctx = avctx->priv_data; + int i, ch, ret; + + if (!avctx->block_align) { + av_log(avctx, AV_LOG_ERROR, "block_align is not set\n"); + return AVERROR(EINVAL); + } + + ff_atrac3p_init_vlcs(); + + /* initialize IPQF */ + ff_mdct_init(&ctx->ipqf_dct_ctx, 5, 1, 32.0 / 32768.0); + + ff_atrac3p_init_imdct(avctx, &ctx->mdct_ctx); + + ff_atrac_init_gain_compensation(&ctx->gainc_ctx, 6, 2); + + ff_atrac3p_init_wave_synth(); + + if ((ret = set_channel_params(ctx, avctx)) < 0) + return ret; + + ctx->my_channel_layout = avctx->channel_layout; + + ctx->ch_units = av_mallocz_array(ctx->num_channel_blocks, sizeof(*ctx->ch_units)); + ctx->fdsp = avpriv_float_dsp_alloc(avctx->flags & AV_CODEC_FLAG_BITEXACT); + + if (!ctx->ch_units || !ctx->fdsp) { + atrac3p_decode_close(avctx); + return AVERROR(ENOMEM); + } + + for (i = 0; i < ctx->num_channel_blocks; i++) { + for (ch = 0; ch < 2; ch++) { + ctx->ch_units[i].channels[ch].ch_num = ch; + ctx->ch_units[i].channels[ch].wnd_shape = &ctx->ch_units[i].channels[ch].wnd_shape_hist[0][0]; + ctx->ch_units[i].channels[ch].wnd_shape_prev = &ctx->ch_units[i].channels[ch].wnd_shape_hist[1][0]; + ctx->ch_units[i].channels[ch].gain_data = &ctx->ch_units[i].channels[ch].gain_data_hist[0][0]; + ctx->ch_units[i].channels[ch].gain_data_prev = &ctx->ch_units[i].channels[ch].gain_data_hist[1][0]; + ctx->ch_units[i].channels[ch].tones_info = &ctx->ch_units[i].channels[ch].tones_info_hist[0][0]; + ctx->ch_units[i].channels[ch].tones_info_prev = &ctx->ch_units[i].channels[ch].tones_info_hist[1][0]; + } + + ctx->ch_units[i].waves_info = &ctx->ch_units[i].wave_synth_hist[0]; + ctx->ch_units[i].waves_info_prev = &ctx->ch_units[i].wave_synth_hist[1]; + } + + avctx->sample_fmt = AV_SAMPLE_FMT_FLTP; + + return 0; +} + +static void decode_residual_spectrum(Atrac3pChanUnitCtx *ctx, + float out[2][ATRAC3P_FRAME_SAMPLES], + int num_channels, + AVCodecContext *avctx) +{ + int i, sb, ch, qu, nspeclines, RNG_index; + float *dst, q; + int16_t *src; + /* calculate RNG table index for each subband */ + int sb_RNG_index[ATRAC3P_SUBBANDS] = { 0 }; + + if (ctx->mute_flag) { + for (ch = 0; ch < num_channels; ch++) + memset(out[ch], 0, ATRAC3P_FRAME_SAMPLES * sizeof(*out[ch])); + return; + } + + for (qu = 0, RNG_index = 0; qu < ctx->used_quant_units; qu++) + RNG_index += ctx->channels[0].qu_sf_idx[qu] + + ctx->channels[1].qu_sf_idx[qu]; + + for (sb = 0; sb < ctx->num_coded_subbands; sb++, RNG_index += 128) + sb_RNG_index[sb] = RNG_index & 0x3FC; + + /* inverse quant and power compensation */ + for (ch = 0; ch < num_channels; ch++) { + /* clear channel's residual spectrum */ + memset(out[ch], 0, ATRAC3P_FRAME_SAMPLES * sizeof(*out[ch])); + + for (qu = 0; qu < ctx->used_quant_units; qu++) { + src = &ctx->channels[ch].spectrum[ff_atrac3p_qu_to_spec_pos[qu]]; + dst = &out[ch][ff_atrac3p_qu_to_spec_pos[qu]]; + nspeclines = ff_atrac3p_qu_to_spec_pos[qu + 1] - + ff_atrac3p_qu_to_spec_pos[qu]; + + if (ctx->channels[ch].qu_wordlen[qu] > 0) { + q = ff_atrac3p_sf_tab[ctx->channels[ch].qu_sf_idx[qu]] * + ff_atrac3p_mant_tab[ctx->channels[ch].qu_wordlen[qu]]; + for (i = 0; i < nspeclines; i++) + dst[i] = src[i] * q; + } + } + + for (sb = 0; sb < ctx->num_coded_subbands; sb++) + ff_atrac3p_power_compensation(ctx, ch, &out[ch][0], + sb_RNG_index[sb], sb); + } + + if (ctx->unit_type == CH_UNIT_STEREO) { + for (sb = 0; sb < ctx->num_coded_subbands; sb++) { + if (ctx->swap_channels[sb]) { + for (i = 0; i < ATRAC3P_SUBBAND_SAMPLES; i++) + FFSWAP(float, out[0][sb * ATRAC3P_SUBBAND_SAMPLES + i], + out[1][sb * ATRAC3P_SUBBAND_SAMPLES + i]); + } + + /* flip coefficients' sign if requested */ + if (ctx->negate_coeffs[sb]) + for (i = 0; i < ATRAC3P_SUBBAND_SAMPLES; i++) + out[1][sb * ATRAC3P_SUBBAND_SAMPLES + i] = -(out[1][sb * ATRAC3P_SUBBAND_SAMPLES + i]); + } + } +} + +static void reconstruct_frame(ATRAC3PContext *ctx, Atrac3pChanUnitCtx *ch_unit, + int num_channels, AVCodecContext *avctx) +{ + int ch, sb; + + for (ch = 0; ch < num_channels; ch++) { + for (sb = 0; sb < ch_unit->num_subbands; sb++) { + /* inverse transform and windowing */ + ff_atrac3p_imdct(ctx->fdsp, &ctx->mdct_ctx, + &ctx->samples[ch][sb * ATRAC3P_SUBBAND_SAMPLES], + &ctx->mdct_buf[ch][sb * ATRAC3P_SUBBAND_SAMPLES], + (ch_unit->channels[ch].wnd_shape_prev[sb] << 1) + + ch_unit->channels[ch].wnd_shape[sb], sb); + + /* gain compensation and overlapping */ + ff_atrac_gain_compensation(&ctx->gainc_ctx, + &ctx->mdct_buf[ch][sb * ATRAC3P_SUBBAND_SAMPLES], + &ch_unit->prev_buf[ch][sb * ATRAC3P_SUBBAND_SAMPLES], + &ch_unit->channels[ch].gain_data_prev[sb], + &ch_unit->channels[ch].gain_data[sb], + ATRAC3P_SUBBAND_SAMPLES, + &ctx->time_buf[ch][sb * ATRAC3P_SUBBAND_SAMPLES]); + } + + /* zero unused subbands in both output and overlapping buffers */ + memset(&ch_unit->prev_buf[ch][ch_unit->num_subbands * ATRAC3P_SUBBAND_SAMPLES], + 0, + (ATRAC3P_SUBBANDS - ch_unit->num_subbands) * + ATRAC3P_SUBBAND_SAMPLES * + sizeof(ch_unit->prev_buf[ch][ch_unit->num_subbands * ATRAC3P_SUBBAND_SAMPLES])); + memset(&ctx->time_buf[ch][ch_unit->num_subbands * ATRAC3P_SUBBAND_SAMPLES], + 0, + (ATRAC3P_SUBBANDS - ch_unit->num_subbands) * + ATRAC3P_SUBBAND_SAMPLES * + sizeof(ctx->time_buf[ch][ch_unit->num_subbands * ATRAC3P_SUBBAND_SAMPLES])); + + /* resynthesize and add tonal signal */ + if (ch_unit->waves_info->tones_present || + ch_unit->waves_info_prev->tones_present) { + for (sb = 0; sb < ch_unit->num_subbands; sb++) + if (ch_unit->channels[ch].tones_info[sb].num_wavs || + ch_unit->channels[ch].tones_info_prev[sb].num_wavs) { + ff_atrac3p_generate_tones(ch_unit, ctx->fdsp, ch, sb, + &ctx->time_buf[ch][sb * 128]); + } + } + + /* subband synthesis and acoustic signal output */ + ff_atrac3p_ipqf(&ctx->ipqf_dct_ctx, &ch_unit->ipqf_ctx[ch], + &ctx->time_buf[ch][0], &ctx->outp_buf[ch][0]); + } + + /* swap window shape and gain control buffers. */ + for (ch = 0; ch < num_channels; ch++) { + FFSWAP(uint8_t *, ch_unit->channels[ch].wnd_shape, + ch_unit->channels[ch].wnd_shape_prev); + FFSWAP(AtracGainInfo *, ch_unit->channels[ch].gain_data, + ch_unit->channels[ch].gain_data_prev); + FFSWAP(Atrac3pWavesData *, ch_unit->channels[ch].tones_info, + ch_unit->channels[ch].tones_info_prev); + } + + FFSWAP(Atrac3pWaveSynthParams *, ch_unit->waves_info, ch_unit->waves_info_prev); +} + +static int atrac3p_decode_frame(AVCodecContext *avctx, void *data, + int *got_frame_ptr, AVPacket *avpkt) +{ + ATRAC3PContext *ctx = avctx->priv_data; + AVFrame *frame = data; + int i, ret, ch_unit_id, ch_block = 0, out_ch_index = 0, channels_to_process; + float **samples_p = (float **)frame->extended_data; + + frame->nb_samples = ATRAC3P_FRAME_SAMPLES; + if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) + return ret; + + if ((ret = init_get_bits8(&ctx->gb, avpkt->data, avpkt->size)) < 0) + return ret; + + if (get_bits1(&ctx->gb)) { + av_log(avctx, AV_LOG_ERROR, "Invalid start bit!\n"); + return AVERROR_INVALIDDATA; + } + + while (get_bits_left(&ctx->gb) >= 2 && + (ch_unit_id = get_bits(&ctx->gb, 2)) != CH_UNIT_TERMINATOR) { + if (ch_unit_id == CH_UNIT_EXTENSION) { + avpriv_report_missing_feature(avctx, "Channel unit extension"); + return AVERROR_PATCHWELCOME; + } + if (ch_block >= ctx->num_channel_blocks || + ctx->channel_blocks[ch_block] != ch_unit_id) { + av_log(avctx, AV_LOG_ERROR, + "Frame data doesn't match channel configuration!\n"); + return AVERROR_INVALIDDATA; + } + + ctx->ch_units[ch_block].unit_type = ch_unit_id; + channels_to_process = ch_unit_id + 1; + + if ((ret = ff_atrac3p_decode_channel_unit(&ctx->gb, + &ctx->ch_units[ch_block], + channels_to_process, + avctx)) < 0) + return ret; + + decode_residual_spectrum(&ctx->ch_units[ch_block], ctx->samples, + channels_to_process, avctx); + reconstruct_frame(ctx, &ctx->ch_units[ch_block], + channels_to_process, avctx); + + for (i = 0; i < channels_to_process; i++) + memcpy(samples_p[out_ch_index + i], ctx->outp_buf[i], + ATRAC3P_FRAME_SAMPLES * sizeof(**samples_p)); + + ch_block++; + out_ch_index += channels_to_process; + } + + *got_frame_ptr = 1; + + return FFMIN(avctx->block_align, avpkt->size); +} + +/* +AVCodec ff_atrac3p_decoder = { + .name = "atrac3plus", + .long_name = NULL_IF_CONFIG_SMALL("ATRAC3+ (Adaptive TRansform Acoustic Coding 3+)"), + .type = AVMEDIA_TYPE_AUDIO, + .id = AV_CODEC_ID_ATRAC3P, + .capabilities = AV_CODEC_CAP_DR1, + .priv_data_size = sizeof(ATRAC3PContext), + .init = atrac3p_decode_init, + .close = atrac3p_decode_close, + .decode = atrac3p_decode_frame, +}; +*/ diff --git a/ext/at3_standalone/atrac3plusdsp.c b/ext/at3_standalone/atrac3plusdsp.c new file mode 100644 index 0000000000..19945ba573 --- /dev/null +++ b/ext/at3_standalone/atrac3plusdsp.c @@ -0,0 +1,645 @@ +/* + * ATRAC3+ compatible decoder + * + * Copyright (c) 2010-2013 Maxim Poliakovski + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + * DSP functions for ATRAC3+ decoder. + */ + +#include + +#include "float_dsp.h" +#include "libm.h" +#include "avcodec.h" +#include "sinewin.h" +#include "fft.h" +#include "atrac3plus.h" + +/** + * Map quant unit number to its position in the spectrum. + * To get the number of spectral lines in each quant unit do the following: + * num_specs = qu_to_spec_pos[i+1] - qu_to_spec_pos[i] + */ +const uint16_t ff_atrac3p_qu_to_spec_pos[33] = { + 0, 16, 32, 48, 64, 80, 96, 112, + 128, 160, 192, 224, 256, 288, 320, 352, + 384, 448, 512, 576, 640, 704, 768, 896, + 1024, 1152, 1280, 1408, 1536, 1664, 1792, 1920, + 2048 +}; + +/* Scalefactors table. */ +/* Approx. Equ: pow(2.0, (i - 16.0 + 0.501783948) / 3.0) */ +const float ff_atrac3p_sf_tab[64] = { + 0.027852058, 0.0350914, 0.044212341, 0.055704117, 0.0701828, + 0.088424683, 0.11140823, 0.1403656, 0.17684937, 0.22281647, 0.2807312, 0.35369873, + 0.44563293, 0.5614624, 0.70739746, 0.89126587, 1.1229248, 1.4147949, 1.7825317, + 2.2458496, 2.8295898, 3.5650635, 4.4916992, 5.6591797, 7.130127, 8.9833984, + 11.318359, 14.260254, 17.966797, 22.636719, 28.520508, 35.933594, 45.273438, + 57.041016, 71.867188, 90.546875, 114.08203, 143.73438, 181.09375, 228.16406, + 287.46875, 362.1875, 456.32812, 574.9375, 724.375, 912.65625, 1149.875, + 1448.75, 1825.3125, 2299.75, 2897.5, 3650.625, 4599.5, 5795.0, + 7301.25, 9199.0, 11590.0, 14602.5, 18398.0, 23180.0, 29205.0, + 36796.0, 46360.0, 58410.0 +}; + +/* Mantissa table. */ +/* pow(10, x * log10(2) + 0.05) / 2 / ([1,2,3,5,7,15,31] + 0.5) */ +const float ff_atrac3p_mant_tab[8] = { + 0.0, + 0.74801636, + 0.44882202, + 0.32058716, + 0.20400238, + 0.1496048, + 0.07239151, + 0.035619736 +}; + +#define ATRAC3P_MDCT_SIZE (ATRAC3P_SUBBAND_SAMPLES * 2) + +av_cold void ff_atrac3p_init_imdct(AVCodecContext *avctx, FFTContext *mdct_ctx) +{ + ff_init_ff_sine_windows(7); + ff_init_ff_sine_windows(6); + + /* Initialize the MDCT transform. */ + ff_mdct_init(mdct_ctx, 8, 1, -1.0); +} + +#define TWOPI (2 * M_PI) + +#define DEQUANT_PHASE(ph) (((ph) & 0x1F) << 6) + +static DECLARE_ALIGNED(32, float, sine_table)[2048]; ///< wave table +static DECLARE_ALIGNED(32, float, hann_window)[256]; ///< Hann windowing function +static float amp_sf_tab[64]; ///< scalefactors for quantized amplitudes + +av_cold void ff_atrac3p_init_wave_synth(void) +{ + int i; + + /* generate sine wave table */ + for (i = 0; i < 2048; i++) + sine_table[i] = sin(TWOPI * i / 2048); + + /* generate Hann window */ + for (i = 0; i < 256; i++) + hann_window[i] = (1.0f - cos(TWOPI * i / 256.0f)) * 0.5f; + + /* generate amplitude scalefactors table */ + for (i = 0; i < 64; i++) + amp_sf_tab[i] = exp2f((i - 3) / 4.0f); +} + +/** + * Synthesize sine waves according to given parameters. + * + * @param[in] synth_param ptr to common synthesis parameters + * @param[in] waves_info parameters for each sine wave + * @param[in] envelope envelope data for all waves in a group + * @param[in] fdsp ptr to floating-point DSP context + * @param[in] invert_phase flag indicating 180° phase shift + * @param[in] reg_offset region offset for trimming envelope data + * @param[out] out receives sythesized data + */ +static void waves_synth(Atrac3pWaveSynthParams *synth_param, + Atrac3pWavesData *waves_info, + Atrac3pWaveEnvelope *envelope, + AVFloatDSPContext *fdsp, + int invert_phase, int reg_offset, float *out) +{ + int i, wn, inc, pos; + double amp; + Atrac3pWaveParam *wave_param = &synth_param->waves[waves_info->start_index]; + + for (wn = 0; wn < waves_info->num_wavs; wn++, wave_param++) { + /* amplitude dequantization */ + amp = amp_sf_tab[wave_param->amp_sf] * + (!synth_param->amplitude_mode + ? (wave_param->amp_index + 1) / 15.13f + : 1.0f); + + inc = wave_param->freq_index; + pos = DEQUANT_PHASE(wave_param->phase_index) - (reg_offset ^ 128) * inc & 2047; + + /* waveform generation */ + for (i = 0; i < 128; i++) { + out[i] += sine_table[pos] * amp; + pos = (pos + inc) & 2047; + } + } + + /* invert phase if requested */ + if (invert_phase) + fdsp->vector_fmul_scalar(out, out, -1.0f, 128); + + /* fade in with steep Hann window if requested */ + if (envelope->has_start_point) { + pos = (envelope->start_pos << 2) - reg_offset; + if (pos > 0 && pos <= 128) { + memset(out, 0, pos * sizeof(*out)); + if (!envelope->has_stop_point || + envelope->start_pos != envelope->stop_pos) { + out[pos + 0] *= hann_window[0]; + out[pos + 1] *= hann_window[32]; + out[pos + 2] *= hann_window[64]; + out[pos + 3] *= hann_window[96]; + } + } + } + + /* fade out with steep Hann window if requested */ + if (envelope->has_stop_point) { + pos = (envelope->stop_pos + 1 << 2) - reg_offset; + if (pos > 0 && pos <= 128) { + out[pos - 4] *= hann_window[96]; + out[pos - 3] *= hann_window[64]; + out[pos - 2] *= hann_window[32]; + out[pos - 1] *= hann_window[0]; + memset(&out[pos], 0, (128 - pos) * sizeof(out[pos])); + } + } +} + +void ff_atrac3p_generate_tones(Atrac3pChanUnitCtx *ch_unit, AVFloatDSPContext *fdsp, + int ch_num, int sb, float *out) +{ + DECLARE_ALIGNED(32, float, wavreg1)[128] = { 0 }; + DECLARE_ALIGNED(32, float, wavreg2)[128] = { 0 }; + int i, reg1_env_nonzero, reg2_env_nonzero; + Atrac3pWavesData *tones_now = &ch_unit->channels[ch_num].tones_info_prev[sb]; + Atrac3pWavesData *tones_next = &ch_unit->channels[ch_num].tones_info[sb]; + + /* reconstruct full envelopes for both overlapping regions + * from truncated bitstream data */ + if (tones_next->pend_env.has_start_point && + tones_next->pend_env.start_pos < tones_next->pend_env.stop_pos) { + tones_next->curr_env.has_start_point = 1; + tones_next->curr_env.start_pos = tones_next->pend_env.start_pos + 32; + } else if (tones_now->pend_env.has_start_point) { + tones_next->curr_env.has_start_point = 1; + tones_next->curr_env.start_pos = tones_now->pend_env.start_pos; + } else { + tones_next->curr_env.has_start_point = 0; + tones_next->curr_env.start_pos = 0; + } + + if (tones_now->pend_env.has_stop_point && + tones_now->pend_env.stop_pos >= tones_next->curr_env.start_pos) { + tones_next->curr_env.has_stop_point = 1; + tones_next->curr_env.stop_pos = tones_now->pend_env.stop_pos; + } else if (tones_next->pend_env.has_stop_point) { + tones_next->curr_env.has_stop_point = 1; + tones_next->curr_env.stop_pos = tones_next->pend_env.stop_pos + 32; + } else { + tones_next->curr_env.has_stop_point = 0; + tones_next->curr_env.stop_pos = 64; + } + + /* is the visible part of the envelope non-zero? */ + reg1_env_nonzero = (tones_now->curr_env.stop_pos < 32) ? 0 : 1; + reg2_env_nonzero = (tones_next->curr_env.start_pos >= 32) ? 0 : 1; + + /* synthesize waves for both overlapping regions */ + if (tones_now->num_wavs && reg1_env_nonzero) + waves_synth(ch_unit->waves_info_prev, tones_now, &tones_now->curr_env, + fdsp, ch_unit->waves_info_prev->invert_phase[sb] & ch_num, + 128, wavreg1); + + if (tones_next->num_wavs && reg2_env_nonzero) + waves_synth(ch_unit->waves_info, tones_next, &tones_next->curr_env, fdsp, + ch_unit->waves_info->invert_phase[sb] & ch_num, 0, wavreg2); + + /* Hann windowing for non-faded wave signals */ + if (tones_now->num_wavs && tones_next->num_wavs && + reg1_env_nonzero && reg2_env_nonzero) { + fdsp->vector_fmul(wavreg1, wavreg1, &hann_window[128], 128); + fdsp->vector_fmul(wavreg2, wavreg2, hann_window, 128); + } else { + if (tones_now->num_wavs && !tones_now->curr_env.has_stop_point) + fdsp->vector_fmul(wavreg1, wavreg1, &hann_window[128], 128); + + if (tones_next->num_wavs && !tones_next->curr_env.has_start_point) + fdsp->vector_fmul(wavreg2, wavreg2, hann_window, 128); + } + + /* Overlap and add to residual */ + for (i = 0; i < 128; i++) + out[i] += wavreg1[i] + wavreg2[i]; +} + +static const int subband_to_powgrp[ATRAC3P_SUBBANDS] = { + 0, 1, 1, 2, 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4 +}; + +/* noise table for power compensation */ +static const float noise_tab[1024] = { + -0.01358032, -0.05593872, 0.01696777, -0.14871216, -0.26412964, -0.09893799, 0.25723267, + 0.02008057, -0.72235107, -0.44351196, -0.22985840, 0.16833496, 0.46902466, 0.05917358, + -0.15179443, 0.41299438, -0.01287842, 0.13360596, 0.43557739, -0.09530640, -0.58422852, + 0.39266968, -0.08343506, -0.25604248, 0.22848511, 0.26013184, -0.65588379, 0.17288208, + -0.08673096, -0.05203247, 0.07299805, -0.28665161, -0.35806274, 0.06552124, -0.09387207, + 0.21099854, -0.28347778, -0.72402954, 0.05050659, -0.10635376, -0.18853760, 0.29724121, + 0.20703125, -0.29791260, -0.37634277, 0.47970581, -0.09976196, 0.32641602, -0.29248047, + -0.28237915, 0.26028442, -0.36157227, 0.22042847, -0.03222656, -0.37268066, -0.03759766, + 0.09909058, 0.23284912, 0.19320679, 0.14453125, -0.02139282, -0.19702148, 0.31533813, + -0.16741943, 0.35031128, -0.35656738, -0.66128540, -0.00701904, 0.20898438, 0.26837158, + -0.33706665, -0.04568481, 0.12600708, 0.10284424, 0.07321167, -0.18280029, 0.38101196, + 0.21301270, 0.04541016, 0.01156616, -0.26391602, -0.02346802, -0.22125244, 0.29760742, + -0.36233521, -0.31314087, -0.13967896, -0.11276245, -0.19433594, 0.34490967, 0.02343750, + 0.21963501, -0.02777100, -0.67678833, -0.08999634, 0.14233398, -0.27697754, 0.51422119, + -0.05047607, 0.48327637, 0.37167358, -0.60806274, 0.18728638, -0.15191650, 0.00637817, + 0.02832031, -0.15618896, 0.60644531, 0.21826172, 0.06384277, -0.31863403, 0.08816528, + 0.15447998, -0.07015991, -0.08154297, -0.40966797, -0.39785767, -0.11709595, 0.22052002, + 0.18466187, -0.17257690, 0.03759766, -0.06195068, 0.00433350, 0.12176514, 0.34011841, + 0.25610352, -0.05294800, 0.41033936, 0.16854858, -0.76187134, 0.13845825, -0.19418335, + -0.21524048, -0.44412231, -0.08160400, -0.28195190, -0.01873779, 0.15524292, -0.37438965, + -0.44860840, 0.43096924, -0.24746704, 0.49856567, 0.14859009, 0.38159180, 0.20541382, + -0.39175415, -0.65850830, -0.43716431, 0.13037109, -0.05111694, 0.39956665, 0.21447754, + -0.04861450, 0.33654785, 0.10589600, -0.88085938, -0.30822754, 0.38577271, 0.30047607, + 0.38836670, 0.09118652, -0.36477661, -0.01641846, -0.23031616, 0.26058960, 0.18859863, + -0.21868896, -0.17861938, -0.29754639, 0.09777832, 0.10806274, -0.51605225, 0.00076294, + 0.13259888, 0.11090088, -0.24084473, 0.24957275, 0.01379395, -0.04141235, -0.04937744, + 0.57394409, 0.27410889, 0.27587891, 0.45013428, -0.32592773, 0.11160278, -0.00970459, + 0.29092407, 0.03356934, -0.70925903, 0.04882812, 0.43499756, 0.07720947, -0.27554321, + -0.01742554, -0.08413696, -0.04028320, -0.52850342, -0.07330322, 0.05181885, 0.21362305, + -0.18765259, 0.07058716, -0.03009033, 0.32662964, 0.27023315, -0.28002930, 0.17568970, + 0.03338623, 0.30242920, -0.03921509, 0.32174683, -0.23733521, 0.08575439, -0.38269043, + 0.09194946, -0.07238770, 0.17941284, -0.51278687, -0.25146484, 0.19790649, -0.19195557, + 0.16549683, 0.42456055, 0.39129639, -0.02868652, 0.17980957, 0.24902344, -0.76583862, + -0.20959473, 0.61013794, 0.37011719, 0.36859131, -0.04486084, 0.10678101, -0.15994263, + -0.05328369, 0.28463745, -0.06420898, -0.36987305, -0.28009033, -0.11764526, 0.04312134, + -0.08038330, 0.04885864, -0.03067017, -0.00042725, 0.34289551, -0.00988770, 0.34838867, + 0.32516479, -0.16271973, 0.38269043, 0.03240967, 0.12417603, -0.14331055, -0.34902954, + -0.18325806, 0.29421997, 0.44284058, 0.75170898, -0.67245483, -0.12176514, 0.27914429, + -0.29806519, 0.19863892, 0.30087280, 0.22680664, -0.36633301, -0.32534790, -0.57553101, + -0.16641235, 0.43811035, 0.08331299, 0.15942383, 0.26516724, -0.24240112, -0.11761475, + -0.16827393, -0.14260864, 0.46343994, 0.11804199, -0.55514526, -0.02520752, -0.14309692, + 0.00448608, 0.02749634, -0.30545044, 0.70965576, 0.45108032, 0.66439819, -0.68255615, + -0.12496948, 0.09146118, -0.21109009, -0.23791504, 0.79943848, -0.35205078, -0.24963379, + 0.18719482, -0.19079590, 0.07458496, 0.07623291, -0.28781128, -0.37121582, -0.19580078, + -0.01773071, -0.16717529, 0.13040161, 0.14672852, 0.42379761, 0.03582764, 0.11431885, + 0.05145264, 0.44702148, 0.08963013, 0.01367188, -0.54519653, -0.12692261, 0.21176147, + 0.04925537, 0.30670166, -0.11029053, 0.19555664, -0.27740479, 0.23043823, 0.15554810, + -0.19299316, -0.25729370, 0.17800903, -0.03579712, -0.05065918, -0.06933594, -0.09500122, + -0.07821655, 0.23889160, -0.31900024, 0.03073120, -0.00415039, 0.61315918, 0.37176514, + -0.13442993, -0.15536499, -0.19216919, -0.37899780, 0.19992065, 0.02630615, -0.12573242, + 0.25927734, -0.02447510, 0.29629517, -0.40731812, -0.17333984, 0.24310303, -0.10607910, + 0.14828491, 0.08792114, -0.18743896, -0.05572510, -0.04833984, 0.10473633, -0.29028320, + -0.67687988, -0.28170776, -0.41687012, 0.05413818, -0.23284912, 0.09555054, -0.08969116, + -0.15112305, 0.12738037, 0.35986328, 0.28948975, 0.30691528, 0.23956299, 0.06973267, + -0.31198120, -0.18450928, 0.22280884, -0.21600342, 0.23522949, -0.61840820, -0.13012695, + 0.26412964, 0.47320557, -0.26440430, 0.38757324, 0.17352295, -0.26104736, -0.25866699, + -0.12274170, -0.29733276, 0.07687378, 0.18588257, -0.08880615, 0.31185913, 0.05313110, + -0.10885620, -0.14901733, -0.22323608, -0.08538818, 0.19812012, 0.19732666, -0.18927002, + 0.29058838, 0.25555420, -0.48599243, 0.18768311, 0.01345825, 0.34887695, 0.21530151, + 0.19857788, 0.18661499, -0.01394653, -0.09063721, -0.38781738, 0.27160645, -0.20379639, + -0.32119751, -0.23889160, 0.27096558, 0.24951172, 0.07922363, 0.07479858, -0.50946045, + 0.10220337, 0.58364868, -0.19503784, -0.18560791, -0.01165771, 0.47195435, 0.22430420, + -0.38635254, -0.03732300, -0.09179688, 0.06991577, 0.15106201, 0.20605469, -0.05969238, + -0.41821289, 0.12231445, -0.04672241, -0.05117798, -0.11523438, -0.51849365, -0.04077148, + 0.44284058, -0.64086914, 0.17019653, 0.02236938, 0.22848511, -0.23214722, -0.32354736, + -0.14068604, -0.29690552, -0.19891357, 0.02774048, -0.20965576, -0.52191162, -0.19299316, + -0.07290649, 0.49053955, -0.22302246, 0.05642700, 0.13122559, -0.20819092, -0.83590698, + -0.08181763, 0.26797485, -0.00091553, -0.09457397, 0.17089844, -0.27020264, 0.30270386, + 0.05496216, 0.09564209, -0.08590698, 0.02130127, 0.35931396, 0.21728516, -0.15396118, + -0.05053711, 0.02719116, 0.16302490, 0.43212891, 0.10229492, -0.40820312, 0.21646118, + 0.08435059, -0.11145020, -0.39962769, -0.05618286, -0.10223389, -0.60839844, 0.33724976, + -0.06341553, -0.47369385, -0.32852173, 0.05242920, 0.19635010, -0.19137573, -0.67901611, + 0.16180420, 0.05133057, -0.22283936, 0.09646606, 0.24288940, -0.45007324, 0.08804321, + 0.14053345, 0.22619629, -0.01000977, 0.36355591, -0.19863892, -0.30364990, -0.24118042, + -0.57461548, 0.26498413, 0.04345703, -0.09796143, -0.47714233, -0.23739624, 0.18737793, + 0.08926392, -0.02795410, 0.00305176, -0.08700562, -0.38711548, 0.03222656, 0.10940552, + -0.41906738, -0.01620483, -0.47061157, 0.37985229, -0.21624756, 0.47976685, -0.20046997, + -0.62533569, -0.26907349, -0.02877808, 0.00671387, -0.29071045, -0.24685669, -0.15722656, + -0.26055908, 0.29968262, 0.28225708, -0.08990479, -0.16748047, -0.46759033, -0.25067139, + -0.25183105, -0.45932007, 0.05828857, 0.29006958, 0.23840332, -0.17974854, 0.26931763, + 0.10696411, -0.06848145, -0.17126465, -0.10522461, -0.55386353, -0.42306519, -0.07608032, + 0.24380493, 0.38586426, 0.16882324, 0.26751709, 0.17303467, 0.35809326, -0.22094727, + -0.30703735, -0.28497314, -0.04321289, 0.15219116, -0.17071533, -0.39334106, 0.03439331, + -0.10809326, -0.30590820, 0.26449585, -0.07412720, 0.13638306, -0.01062012, 0.27996826, + 0.04397583, -0.05557251, -0.56933594, 0.03363037, -0.00949097, 0.52642822, -0.44329834, + 0.28308105, -0.05499268, -0.23312378, -0.29870605, -0.05123901, 0.26831055, -0.35238647, + -0.30993652, 0.34646606, -0.19775391, 0.44595337, 0.13769531, 0.45358276, 0.19961548, + 0.42681885, 0.15722656, 0.00128174, 0.23757935, 0.40988159, 0.25164795, -0.00732422, + -0.12405396, -0.43420410, -0.00402832, 0.34243774, 0.36264038, 0.18807983, -0.09301758, + -0.10296631, 0.05532837, -0.31652832, 0.14337158, 0.35040283, 0.32540894, 0.05728149, + -0.12030029, -0.25942993, -0.20312500, -0.16491699, -0.46051025, -0.08004761, 0.50772095, + 0.16168213, 0.28439331, 0.08105469, -0.19104004, 0.38589478, -0.16400146, -0.25454712, + 0.20281982, -0.20730591, -0.06311035, 0.32937622, 0.15032959, -0.05340576, 0.30487061, + -0.11648560, 0.38009644, -0.20062256, 0.43466187, 0.01150513, 0.35754395, -0.13146973, + 0.67489624, 0.05212402, 0.27914429, -0.39431763, 0.75308228, -0.13366699, 0.24453735, + 0.42248535, -0.65905762, -0.00546265, -0.03491211, -0.13659668, -0.08294678, -0.45666504, + 0.27188110, 0.12731934, 0.61148071, 0.10449219, -0.28836060, 0.00091553, 0.24618530, + 0.13119507, 0.05685425, 0.17355347, 0.42034912, 0.08514404, 0.24536133, 0.18951416, + -0.19107056, -0.15036011, 0.02334595, 0.54986572, 0.32321167, -0.16104126, -0.03054810, + 0.43594360, 0.17309570, 0.61053467, 0.24731445, 0.33334351, 0.15240479, 0.15588379, + 0.36425781, -0.30407715, -0.13302612, 0.00427246, 0.04171753, -0.33178711, 0.34216309, + -0.12463379, -0.02764893, 0.05905151, -0.31436157, 0.16531372, 0.34542847, -0.03292847, + 0.12527466, -0.12313843, -0.13171387, 0.04757690, -0.45095825, -0.19085693, 0.35342407, + -0.23239136, -0.34387207, 0.11264038, -0.15740967, 0.05273438, 0.74942017, 0.21505737, + 0.08514404, -0.42391968, -0.19531250, 0.35293579, 0.25305176, 0.15731812, -0.70324707, + -0.21591187, 0.35604858, 0.14132690, 0.11724854, 0.15853882, -0.24597168, 0.07019043, + 0.02127075, 0.12658691, 0.06390381, -0.12292480, 0.15441895, -0.47640991, 0.06195068, + 0.58981323, -0.15151978, -0.03604126, -0.45059204, -0.01672363, -0.46997070, 0.25750732, + 0.18084717, 0.06661987, 0.13253784, 0.67828369, 0.11370850, 0.11325073, -0.04611206, + -0.07791138, -0.36544800, -0.06747437, -0.31594849, 0.16131592, 0.41983032, 0.11071777, + -0.36889648, 0.30963135, -0.37875366, 0.58508301, 0.00393677, 0.12338257, 0.03424072, + -0.21728516, -0.12838745, -0.46981812, 0.05868530, -0.25015259, 0.27407837, 0.65240479, + -0.34429932, -0.15179443, 0.14056396, 0.33505249, 0.28826904, 0.09921265, 0.34390259, + 0.13656616, -0.23608398, 0.00863647, 0.02627563, -0.19119263, 0.19775391, -0.07214355, + 0.07809448, 0.03454590, -0.03417969, 0.00033569, -0.23095703, 0.18673706, 0.05798340, + 0.03814697, -0.04318237, 0.05487061, 0.08633423, 0.55950928, -0.06347656, 0.10333252, + 0.25305176, 0.05853271, 0.12246704, -0.25543213, -0.34262085, -0.36437988, -0.21304321, + -0.05093384, 0.02777100, 0.07620239, -0.21215820, -0.09326172, 0.19021606, -0.40579224, + -0.01193237, 0.19845581, -0.35336304, -0.07397461, 0.20104980, 0.08615112, -0.44375610, + 0.11419678, 0.24453735, -0.16555786, -0.05081177, -0.01406860, 0.27893066, -0.18692017, + 0.07473755, 0.03451538, -0.39733887, 0.21548462, -0.22534180, -0.39651489, -0.04989624, + -0.57662964, 0.06390381, 0.62020874, -0.13470459, 0.04345703, -0.21862793, -0.02789307, + 0.51696777, -0.27587891, 0.39004517, 0.09857178, -0.00738525, 0.31317139, 0.00048828, + -0.46572876, 0.29531860, -0.10009766, -0.27856445, 0.03594971, 0.25048828, -0.74584961, + -0.25350952, -0.03302002, 0.31188965, 0.01571655, 0.46710205, 0.21591187, 0.07260132, + -0.42132568, -0.53900146, -0.13674927, -0.16571045, -0.34454346, 0.12359619, -0.11184692, + 0.00967407, 0.34576416, -0.05761719, 0.34848022, 0.17645264, -0.39395142, 0.10339355, + 0.18215942, 0.20697021, 0.59109497, -0.11560059, -0.07385254, 0.10397339, 0.35437012, + -0.22863770, 0.01794434, 0.17559814, -0.17495728, 0.12142944, 0.10928345, -1.00000000, + -0.01379395, 0.21237183, -0.27035522, 0.27319336, -0.37066650, 0.41354370, -0.40054321, + 0.00689697, 0.26321411, 0.39266968, 0.65298462, 0.41625977, -0.13909912, 0.78375244, + -0.30941772, 0.20169067, -0.39367676, 0.94021606, -0.24066162, 0.05557251, -0.24533081, + -0.05444336, -0.76754761, -0.19375610, -0.11041260, -0.17532349, 0.16006470, 0.02188110, + 0.17465210, -0.04342651, -0.56777954, -0.40988159, 0.26687622, 0.11700439, -0.00344849, + -0.05395508, 0.37426758, -0.40719604, -0.15032959, -0.01660156, 0.04196167, -0.04559326, + -0.12969971, 0.12011719, 0.08419800, -0.11199951, 0.35174561, 0.10275269, -0.25686646, + 0.48446655, 0.03225708, 0.28408813, -0.18701172, 0.36282349, -0.03280640, 0.32302856, + 0.17233276, 0.48269653, 0.31112671, -0.04946899, 0.12774658, 0.52685547, 0.10211182, + 0.05953979, 0.05999756, 0.20144653, 0.00744629, 0.27316284, 0.24377441, 0.39672852, + 0.01702881, -0.35513306, 0.11364746, -0.13555908, 0.48880005, -0.15417480, -0.09149170, + -0.02615356, 0.46246338, -0.72250366, 0.22332764, 0.23849487, -0.25686646, -0.08514404, + -0.02062988, -0.34494019, -0.02297974, -0.80386353, -0.08074951, -0.12689209, -0.06896973, + 0.24099731, -0.35650635, -0.09558105, 0.29254150, 0.23132324, -0.16726685, 0.00000000, + -0.24237061, 0.30899048, 0.29504395, -0.20898438, 0.17059326, -0.07672119, -0.14395142, + 0.05572510, 0.20602417, -0.51550293, -0.03167725, -0.48840332, -0.20425415, 0.14144897, + 0.07275391, -0.76669312, -0.22488403, 0.20651245, 0.03259277, 0.00085449, 0.03039551, + 0.47555542, 0.38351440 +}; + +/** Noise level table for power compensation. + * Equ: pow(2.0f, (double)(6 - i) / 3.0f) where i = 0...15 */ +static const float pwc_levs[16] = { + 3.96875, 3.15625, 2.5, 2.0, 1.59375, 1.25, 1.0, 0.78125, + 0.625, 0.5, 0.40625, 0.3125, 0.25, 0.1875, 0.15625, 0.0 +}; + +/** Map subband number to quant unit number. */ +static const int subband_to_qu[17] = { + 0, 8, 12, 16, 18, 20, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32 +}; + +void ff_atrac3p_power_compensation(Atrac3pChanUnitCtx *ctx, int ch_index, + float *sp, int rng_index, int sb) +{ + AtracGainInfo *g1, *g2; + float pwcsp[ATRAC3P_SUBBAND_SAMPLES], *dst, grp_lev, qu_lev; + int i, gain_lev, gcv = 0, qu, nsp; + int swap_ch = (ctx->unit_type == CH_UNIT_STEREO && ctx->swap_channels[sb]) ? 1 : 0; + + if (ctx->channels[ch_index ^ swap_ch].power_levs[subband_to_powgrp[sb]] == ATRAC3P_POWER_COMP_OFF) + return; + + /* generate initial noise spectrum */ + for (i = 0; i < ATRAC3P_SUBBAND_SAMPLES; i++, rng_index++) + pwcsp[i] = noise_tab[rng_index & 0x3FF]; + + /* check gain control information */ + g1 = &ctx->channels[ch_index ^ swap_ch].gain_data[sb]; + g2 = &ctx->channels[ch_index ^ swap_ch].gain_data_prev[sb]; + + gain_lev = (g1->num_points > 0) ? (6 - g1->lev_code[0]) : 0; + + for (i = 0; i < g2->num_points; i++) + gcv = FFMAX(gcv, gain_lev - (g2->lev_code[i] - 6)); + + for (i = 0; i < g1->num_points; i++) + gcv = FFMAX(gcv, 6 - g1->lev_code[i]); + + grp_lev = pwc_levs[ctx->channels[ch_index ^ swap_ch].power_levs[subband_to_powgrp[sb]]] / (1 << gcv); + + /* skip the lowest two quant units (frequencies 0...351 Hz) for subband 0 */ + for (qu = subband_to_qu[sb] + (!sb ? 2 : 0); qu < subband_to_qu[sb + 1]; qu++) { + if (ctx->channels[ch_index].qu_wordlen[qu] <= 0) + continue; + + qu_lev = ff_atrac3p_sf_tab[ctx->channels[ch_index].qu_sf_idx[qu]] * + ff_atrac3p_mant_tab[ctx->channels[ch_index].qu_wordlen[qu]] / + (1 << ctx->channels[ch_index].qu_wordlen[qu]) * grp_lev; + + dst = &sp[ff_atrac3p_qu_to_spec_pos[qu]]; + nsp = ff_atrac3p_qu_to_spec_pos[qu + 1] - ff_atrac3p_qu_to_spec_pos[qu]; + + for (i = 0; i < nsp; i++) + dst[i] += pwcsp[i] * qu_lev; + } +} + +void ff_atrac3p_imdct(AVFloatDSPContext *fdsp, FFTContext *mdct_ctx, float *pIn, + float *pOut, int wind_id, int sb) +{ + int i; + + if (sb & 1) + for (i = 0; i < ATRAC3P_SUBBAND_SAMPLES / 2; i++) + FFSWAP(float, pIn[i], pIn[ATRAC3P_SUBBAND_SAMPLES - 1 - i]); + + mdct_ctx->imdct_calc(mdct_ctx, pOut, pIn); + + /* Perform windowing on the output. + * ATRAC3+ uses two different MDCT windows: + * - The first one is just the plain sine window of size 256 + * - The 2nd one is the plain sine window of size 128 + * wrapped into zero (at the start) and one (at the end) regions. + * Both regions are 32 samples long. */ + if (wind_id & 2) { /* 1st half: steep window */ + memset(pOut, 0, sizeof(float) * 32); + fdsp->vector_fmul(&pOut[32], &pOut[32], ff_sine_64, 64); + } else /* 1st half: simple sine window */ + fdsp->vector_fmul(pOut, pOut, ff_sine_128, ATRAC3P_MDCT_SIZE / 2); + + if (wind_id & 1) { /* 2nd half: steep window */ + fdsp->vector_fmul_reverse(&pOut[160], &pOut[160], ff_sine_64, 64); + memset(&pOut[224], 0, sizeof(float) * 32); + } else /* 2nd half: simple sine window */ + fdsp->vector_fmul_reverse(&pOut[128], &pOut[128], ff_sine_128, + ATRAC3P_MDCT_SIZE / 2); +} + +/* lookup table for fast modulo 23 op required for cyclic buffers of the IPQF */ +static const int mod23_lut[26] = { + 23, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, + 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 0 +}; + +/* First half of the 384-tap IPQF filtering coefficients. */ +static const float ipqf_coeffs1[ATRAC3P_PQF_FIR_LEN][16] = { + { -5.8336207e-7, -8.0604229e-7, -4.2005411e-7, -4.4400572e-8, + 3.226247e-8, 3.530856e-8, 1.2660377e-8, 0.000010516783, + -0.000011838618, 6.005389e-7, 0.0000014333754, 0.0000023108685, + 0.0000032569742, 0.0000046192422, 0.0000063894258, 0.0000070302972 }, + { -0.0000091622824, -0.000010502935, -0.0000079212787, -0.0000041712024, + -0.0000026336629, -0.0000015432918, -5.7168614e-7, 0.0000018111954, + 0.000023530851, 0.00002780562, 0.000032302323, 0.000036968919, + 0.000041575615, 0.000045337845, 0.000046043948, 0.000048585582 }, + { -0.000064464548, -0.000068306952, -0.000073081472, -0.00007612785, + -0.000074850752, -0.000070208509, -0.000062285151, -0.000058270442, + -0.000056296329, -0.000049888811, -0.000035615325, -0.000018532943, + 0.0000016657353, 0.00002610587, 0.000053397067, 0.00008079566 }, + { -0.00054488552, -0.00052537228, -0.00049731287, -0.00045778, + -0.00040612387, -0.00034301577, -0.00026866337, -0.00018248901, + -0.000084307925, 0.000025081157, 0.00014135583, 0.00026649953, + 0.00039945057, 0.00053928449, 0.00068422867, 0.00083093712 }, + { -0.0014771431, -0.001283227, -0.0010566821, -0.00079780724, + -0.00050782406, -0.00018855913, 0.00015771533, 0.00052769453, + 0.00091862219, 0.001326357, 0.0017469483, 0.0021754825, + 0.0026067684, 0.0030352892, 0.0034549395, 0.0038591374 }, + { -0.0022995141, -0.001443546, -0.00049266568, 0.00055068987, + 0.001682895, 0.0028992873, 0.0041943151, 0.0055614738, + 0.0069935122, 0.0084823566, 0.010018963, 0.011593862, + 0.013196872, 0.014817309, 0.016444042, 0.018065533 }, + { -0.034426283, -0.034281436, -0.033992987, -0.033563249, + -0.032995768, -0.032295227, -0.031467363, -0.030518902, + -0.02945766, -0.028291954, -0.027031265, -0.025685543, + -0.024265358, -0.022781773, -0.021246184, -0.019670162 }, + { -0.0030586775, -0.0037203205, -0.0042847847, -0.0047529764, + -0.0051268316, -0.0054091476, -0.0056034233, -0.005714261, + -0.0057445862, -0.0057025906, -0.0055920109, -0.0054194843, + -0.0051914565, -0.0049146507, -0.0045959447, -0.0042418269 }, + { -0.0016376863, -0.0017651899, -0.0018608454, -0.0019252141, + -0.0019593791, -0.0019653172, -0.0019450618, -0.0018990048, + -0.00183808, -0.0017501717, -0.0016481078, -0.0015320742, + -0.0014046903, -0.0012685474, -0.001125814, -0.00097943726 }, + { -0.00055432378, -0.00055472925, -0.00054783461, -0.00053276919, + -0.00051135791, -0.00048466062, -0.00045358928, -0.00042499689, + -0.00036942671, -0.0003392619, -0.00030001783, -0.00025986304, + -0.0002197204, -0.00018116167, -0.00014691355, -0.00011279432 }, + { -0.000064147389, -0.00006174868, -0.000054267788, -0.000047133824, + -0.000042927582, -0.000039477309, -0.000036340745, -0.000029687517, + -0.000049787737, -0.000041577889, -0.000033864744, -0.000026534748, + -0.000019841305, -0.000014789486, -0.000013131184, -0.0000099198869 }, + { -0.0000062990207, -0.0000072701259, -0.000011984052, -0.000017348082, + -0.000019907106, -0.000021348773, -0.000021961965, -0.000012203576, + -0.000010840992, 4.6299544e-7, 5.2588763e-7, 2.7792686e-7, + -2.3649704e-7, -0.0000010897784, -9.171448e-7, -5.22682e-7 } +}; + +/* Second half of the 384-tap IPQF filtering coefficients. */ +static const float ipqf_coeffs2[ATRAC3P_PQF_FIR_LEN][16] = { + { 5.22682e-7, 9.171448e-7, 0.0000010897784, 2.3649704e-7, + -2.7792686e-7, -5.2588763e-7, -4.6299544e-7, 0.000010840992, + -0.000012203576, -0.000021961965, -0.000021348773, -0.000019907106, + -0.000017348082, -0.000011984052, -0.0000072701259, -0.0000062990207 }, + { 0.0000099198869, 0.000013131184, 0.000014789486, 0.000019841305, + 0.000026534748, 0.000033864744, 0.000041577889, 0.000049787737, + -0.000029687517, -0.000036340745, -0.000039477309, -0.000042927582, + -0.000047133824, -0.000054267788, -0.00006174868, -0.000064147389 }, + { 0.00011279432, 0.00014691355, 0.00018116167, 0.0002197204, + 0.00025986304, 0.00030001783, 0.0003392619, 0.00036942671, + -0.00042499689, -0.00045358928, -0.00048466062, -0.00051135791, + -0.00053276919, -0.00054783461, -0.00055472925, -0.00055432378 }, + { 0.00097943726, 0.001125814, 0.0012685474, 0.0014046903, + 0.0015320742, 0.0016481078, 0.0017501717, 0.00183808, + -0.0018990048, -0.0019450618, -0.0019653172, -0.0019593791, + -0.0019252141, -0.0018608454, -0.0017651899, -0.0016376863 }, + { 0.0042418269, 0.0045959447, 0.0049146507, 0.0051914565, + 0.0054194843, 0.0055920109, 0.0057025906, 0.0057445862, + -0.005714261, -0.0056034233, -0.0054091476, -0.0051268316, + -0.0047529764, -0.0042847847, -0.0037203205, -0.0030586775 }, + { 0.019670162, 0.021246184, 0.022781773, 0.024265358, + 0.025685543, 0.027031265, 0.028291954, 0.02945766, + -0.030518902, -0.031467363, -0.032295227, -0.032995768, + -0.033563249, -0.033992987, -0.034281436, -0.034426283 }, + { -0.018065533, -0.016444042, -0.014817309, -0.013196872, + -0.011593862, -0.010018963, -0.0084823566, -0.0069935122, + 0.0055614738, 0.0041943151, 0.0028992873, 0.001682895, + 0.00055068987, -0.00049266568, -0.001443546, -0.0022995141 }, + { -0.0038591374, -0.0034549395, -0.0030352892, -0.0026067684, + -0.0021754825, -0.0017469483, -0.001326357, -0.00091862219, + 0.00052769453, 0.00015771533, -0.00018855913, -0.00050782406, + -0.00079780724, -0.0010566821, -0.001283227, -0.0014771431 }, + { -0.00083093712, -0.00068422867, -0.00053928449, -0.00039945057, + -0.00026649953, -0.00014135583, -0.000025081157, 0.000084307925, + -0.00018248901, -0.00026866337, -0.00034301577, -0.00040612387, + -0.00045778, -0.00049731287, -0.00052537228, -0.00054488552 }, + { -0.00008079566, -0.000053397067, -0.00002610587, -0.0000016657353, + 0.000018532943, 0.000035615325, 0.000049888811, 0.000056296329, + -0.000058270442, -0.000062285151, -0.000070208509, -0.000074850752, + -0.00007612785, -0.000073081472, -0.000068306952, -0.000064464548 }, + { -0.000048585582, -0.000046043948, -0.000045337845, -0.000041575615, + -0.000036968919, -0.000032302323, -0.00002780562, -0.000023530851, + 0.0000018111954, -5.7168614e-7, -0.0000015432918, -0.0000026336629, + -0.0000041712024, -0.0000079212787, -0.000010502935, -0.0000091622824 }, + { -0.0000070302972, -0.0000063894258, -0.0000046192422, -0.0000032569742, + -0.0000023108685, -0.0000014333754, -6.005389e-7, 0.000011838618, + 0.000010516783, 1.2660377e-8, 3.530856e-8, 3.226247e-8, + -4.4400572e-8, -4.2005411e-7, -8.0604229e-7, -5.8336207e-7 } +}; + +void ff_atrac3p_ipqf(FFTContext *dct_ctx, Atrac3pIPQFChannelCtx *hist, + const float *in, float *out) +{ + int i, s, sb, t, pos_now, pos_next; + LOCAL_ALIGNED(32, float, idct_in, [ATRAC3P_SUBBANDS]); + LOCAL_ALIGNED(32, float, idct_out, [ATRAC3P_SUBBANDS]); + + memset(out, 0, ATRAC3P_FRAME_SAMPLES * sizeof(*out)); + + for (s = 0; s < ATRAC3P_SUBBAND_SAMPLES; s++) { + /* pick up one sample from each subband */ + for (sb = 0; sb < ATRAC3P_SUBBANDS; sb++) + idct_in[sb] = in[sb * ATRAC3P_SUBBAND_SAMPLES + s]; + + /* Calculate the sine and cosine part of the PQF using IDCT-IV */ + dct_ctx->imdct_half(dct_ctx, idct_out, idct_in); + + /* append the result to the history */ + for (i = 0; i < 8; i++) { + hist->buf1[hist->pos][i] = idct_out[i + 8]; + hist->buf2[hist->pos][i] = idct_out[7 - i]; + } + + pos_now = hist->pos; + pos_next = mod23_lut[pos_now + 2]; // pos_next = (pos_now + 1) % 23; + + for (t = 0; t < ATRAC3P_PQF_FIR_LEN; t++) { + for (i = 0; i < 8; i++) { + out[s * 16 + i + 0] += hist->buf1[pos_now][i] * ipqf_coeffs1[t][i] + + hist->buf2[pos_next][i] * ipqf_coeffs2[t][i]; + out[s * 16 + i + 8] += hist->buf1[pos_now][7 - i] * ipqf_coeffs1[t][i + 8] + + hist->buf2[pos_next][7 - i] * ipqf_coeffs2[t][i + 8]; + } + + pos_now = mod23_lut[pos_next + 2]; // pos_now = (pos_now + 2) % 23; + pos_next = mod23_lut[pos_now + 2]; // pos_next = (pos_next + 2) % 23; + } + + hist->pos = mod23_lut[hist->pos]; // hist->pos = (hist->pos - 1) % 23; + } +} diff --git a/ext/at3_standalone/attributes.h b/ext/at3_standalone/attributes.h new file mode 100644 index 0000000000..e69de29bb2 diff --git a/ext/at3_standalone/avcodec.h b/ext/at3_standalone/avcodec.h new file mode 100644 index 0000000000..ee37317a71 --- /dev/null +++ b/ext/at3_standalone/avcodec.h @@ -0,0 +1,5406 @@ +/* + * copyright (c) 2001 Fabrice Bellard + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVCODEC_AVCODEC_H +#define AVCODEC_AVCODEC_H + +/** + * @file + * @ingroup libavc + * Libavcodec external API header + */ + +#include +/* +#include "libavutil/samplefmt.h" +#include "libavutil/attributes.h" +#include "libavutil/avutil.h" +#include "libavutil/buffer.h" +#include "libavutil/cpu.h" +#include "libavutil/channel_layout.h" +#include "libavutil/dict.h" +#include "libavutil/log.h" +#include "libavutil/pixfmt.h" +*/ +#include "frame.h" +#include "rational.h" +#include "version.h" + +/** + * @defgroup libavc Encoding/Decoding Library + * @{ + * + * @defgroup lavc_decoding Decoding + * @{ + * @} + * + * @defgroup lavc_encoding Encoding + * @{ + * @} + * + * @defgroup lavc_codec Codecs + * @{ + * @defgroup lavc_codec_native Native Codecs + * @{ + * @} + * @defgroup lavc_codec_wrappers External library wrappers + * @{ + * @} + * @defgroup lavc_codec_hwaccel Hardware Accelerators bridge + * @{ + * @} + * @} + * @defgroup lavc_internal Internal + * @{ + * @} + * @} + * + */ + +/** + * @defgroup lavc_core Core functions/structures. + * @ingroup libavc + * + * Basic definitions, functions for querying libavcodec capabilities, + * allocating core structures, etc. + * @{ + */ + + +/** + * Identify the syntax and semantics of the bitstream. + * The principle is roughly: + * Two decoders with the same ID can decode the same streams. + * Two encoders with the same ID can encode compatible streams. + * There may be slight deviations from the principle due to implementation + * details. + * + * If you add a codec ID to this list, add it so that + * 1. no value of a existing codec ID changes (that would break ABI), + * 2. it is as close as possible to similar codecs + * + * After adding new codec IDs, do not forget to add an entry to the codec + * descriptor list and bump libavcodec minor version. + */ +enum AVCodecID { + AV_CODEC_ID_NONE, + + /* video codecs */ + AV_CODEC_ID_MPEG1VIDEO, + AV_CODEC_ID_MPEG2VIDEO, ///< preferred ID for MPEG-1/2 video decoding +#if FF_API_XVMC + AV_CODEC_ID_MPEG2VIDEO_XVMC, +#endif /* FF_API_XVMC */ + AV_CODEC_ID_H261, + AV_CODEC_ID_H263, + AV_CODEC_ID_RV10, + AV_CODEC_ID_RV20, + AV_CODEC_ID_MJPEG, + AV_CODEC_ID_MJPEGB, + AV_CODEC_ID_LJPEG, + AV_CODEC_ID_SP5X, + AV_CODEC_ID_JPEGLS, + AV_CODEC_ID_MPEG4, + AV_CODEC_ID_RAWVIDEO, + AV_CODEC_ID_MSMPEG4V1, + AV_CODEC_ID_MSMPEG4V2, + AV_CODEC_ID_MSMPEG4V3, + AV_CODEC_ID_WMV1, + AV_CODEC_ID_WMV2, + AV_CODEC_ID_H263P, + AV_CODEC_ID_H263I, + AV_CODEC_ID_FLV1, + AV_CODEC_ID_SVQ1, + AV_CODEC_ID_SVQ3, + AV_CODEC_ID_DVVIDEO, + AV_CODEC_ID_HUFFYUV, + AV_CODEC_ID_CYUV, + AV_CODEC_ID_H264, + AV_CODEC_ID_INDEO3, + AV_CODEC_ID_VP3, + AV_CODEC_ID_THEORA, + AV_CODEC_ID_ASV1, + AV_CODEC_ID_ASV2, + AV_CODEC_ID_FFV1, + AV_CODEC_ID_4XM, + AV_CODEC_ID_VCR1, + AV_CODEC_ID_CLJR, + AV_CODEC_ID_MDEC, + AV_CODEC_ID_ROQ, + AV_CODEC_ID_INTERPLAY_VIDEO, + AV_CODEC_ID_XAN_WC3, + AV_CODEC_ID_XAN_WC4, + AV_CODEC_ID_RPZA, + AV_CODEC_ID_CINEPAK, + AV_CODEC_ID_WS_VQA, + AV_CODEC_ID_MSRLE, + AV_CODEC_ID_MSVIDEO1, + AV_CODEC_ID_IDCIN, + AV_CODEC_ID_8BPS, + AV_CODEC_ID_SMC, + AV_CODEC_ID_FLIC, + AV_CODEC_ID_TRUEMOTION1, + AV_CODEC_ID_VMDVIDEO, + AV_CODEC_ID_MSZH, + AV_CODEC_ID_ZLIB, + AV_CODEC_ID_QTRLE, + AV_CODEC_ID_TSCC, + AV_CODEC_ID_ULTI, + AV_CODEC_ID_QDRAW, + AV_CODEC_ID_VIXL, + AV_CODEC_ID_QPEG, + AV_CODEC_ID_PNG, + AV_CODEC_ID_PPM, + AV_CODEC_ID_PBM, + AV_CODEC_ID_PGM, + AV_CODEC_ID_PGMYUV, + AV_CODEC_ID_PAM, + AV_CODEC_ID_FFVHUFF, + AV_CODEC_ID_RV30, + AV_CODEC_ID_RV40, + AV_CODEC_ID_VC1, + AV_CODEC_ID_WMV3, + AV_CODEC_ID_LOCO, + AV_CODEC_ID_WNV1, + AV_CODEC_ID_AASC, + AV_CODEC_ID_INDEO2, + AV_CODEC_ID_FRAPS, + AV_CODEC_ID_TRUEMOTION2, + AV_CODEC_ID_BMP, + AV_CODEC_ID_CSCD, + AV_CODEC_ID_MMVIDEO, + AV_CODEC_ID_ZMBV, + AV_CODEC_ID_AVS, + AV_CODEC_ID_SMACKVIDEO, + AV_CODEC_ID_NUV, + AV_CODEC_ID_KMVC, + AV_CODEC_ID_FLASHSV, + AV_CODEC_ID_CAVS, + AV_CODEC_ID_JPEG2000, + AV_CODEC_ID_VMNC, + AV_CODEC_ID_VP5, + AV_CODEC_ID_VP6, + AV_CODEC_ID_VP6F, + AV_CODEC_ID_TARGA, + AV_CODEC_ID_DSICINVIDEO, + AV_CODEC_ID_TIERTEXSEQVIDEO, + AV_CODEC_ID_TIFF, + AV_CODEC_ID_GIF, + AV_CODEC_ID_DXA, + AV_CODEC_ID_DNXHD, + AV_CODEC_ID_THP, + AV_CODEC_ID_SGI, + AV_CODEC_ID_C93, + AV_CODEC_ID_BETHSOFTVID, + AV_CODEC_ID_PTX, + AV_CODEC_ID_TXD, + AV_CODEC_ID_VP6A, + AV_CODEC_ID_AMV, + AV_CODEC_ID_VB, + AV_CODEC_ID_PCX, + AV_CODEC_ID_SUNRAST, + AV_CODEC_ID_INDEO4, + AV_CODEC_ID_INDEO5, + AV_CODEC_ID_MIMIC, + AV_CODEC_ID_RL2, + AV_CODEC_ID_ESCAPE124, + AV_CODEC_ID_DIRAC, + AV_CODEC_ID_BFI, + AV_CODEC_ID_CMV, + AV_CODEC_ID_MOTIONPIXELS, + AV_CODEC_ID_TGV, + AV_CODEC_ID_TGQ, + AV_CODEC_ID_TQI, + AV_CODEC_ID_AURA, + AV_CODEC_ID_AURA2, + AV_CODEC_ID_V210X, + AV_CODEC_ID_TMV, + AV_CODEC_ID_V210, + AV_CODEC_ID_DPX, + AV_CODEC_ID_MAD, + AV_CODEC_ID_FRWU, + AV_CODEC_ID_FLASHSV2, + AV_CODEC_ID_CDGRAPHICS, + AV_CODEC_ID_R210, + AV_CODEC_ID_ANM, + AV_CODEC_ID_BINKVIDEO, + AV_CODEC_ID_IFF_ILBM, +#define AV_CODEC_ID_IFF_BYTERUN1 AV_CODEC_ID_IFF_ILBM + AV_CODEC_ID_KGV1, + AV_CODEC_ID_YOP, + AV_CODEC_ID_VP8, + AV_CODEC_ID_PICTOR, + AV_CODEC_ID_ANSI, + AV_CODEC_ID_A64_MULTI, + AV_CODEC_ID_A64_MULTI5, + AV_CODEC_ID_R10K, + AV_CODEC_ID_MXPEG, + AV_CODEC_ID_LAGARITH, + AV_CODEC_ID_PRORES, + AV_CODEC_ID_JV, + AV_CODEC_ID_DFA, + AV_CODEC_ID_WMV3IMAGE, + AV_CODEC_ID_VC1IMAGE, + AV_CODEC_ID_UTVIDEO, + AV_CODEC_ID_BMV_VIDEO, + AV_CODEC_ID_VBLE, + AV_CODEC_ID_DXTORY, + AV_CODEC_ID_V410, + AV_CODEC_ID_XWD, + AV_CODEC_ID_CDXL, + AV_CODEC_ID_XBM, + AV_CODEC_ID_ZEROCODEC, + AV_CODEC_ID_MSS1, + AV_CODEC_ID_MSA1, + AV_CODEC_ID_TSCC2, + AV_CODEC_ID_MTS2, + AV_CODEC_ID_CLLC, + AV_CODEC_ID_MSS2, + AV_CODEC_ID_VP9, + AV_CODEC_ID_AIC, + AV_CODEC_ID_ESCAPE130, + AV_CODEC_ID_G2M, + AV_CODEC_ID_WEBP, + AV_CODEC_ID_HNM4_VIDEO, + AV_CODEC_ID_HEVC, +#define AV_CODEC_ID_H265 AV_CODEC_ID_HEVC + AV_CODEC_ID_FIC, + AV_CODEC_ID_ALIAS_PIX, + AV_CODEC_ID_BRENDER_PIX, + AV_CODEC_ID_PAF_VIDEO, + AV_CODEC_ID_EXR, + AV_CODEC_ID_VP7, + AV_CODEC_ID_SANM, + AV_CODEC_ID_SGIRLE, + AV_CODEC_ID_MVC1, + AV_CODEC_ID_MVC2, + AV_CODEC_ID_HQX, + AV_CODEC_ID_TDSC, + AV_CODEC_ID_HQ_HQA, + AV_CODEC_ID_HAP, + AV_CODEC_ID_DDS, + AV_CODEC_ID_DXV, + AV_CODEC_ID_SCREENPRESSO, + AV_CODEC_ID_RSCC, + + AV_CODEC_ID_Y41P = 0x8000, + AV_CODEC_ID_AVRP, + AV_CODEC_ID_012V, + AV_CODEC_ID_AVUI, + AV_CODEC_ID_AYUV, + AV_CODEC_ID_TARGA_Y216, + AV_CODEC_ID_V308, + AV_CODEC_ID_V408, + AV_CODEC_ID_YUV4, + AV_CODEC_ID_AVRN, + AV_CODEC_ID_CPIA, + AV_CODEC_ID_XFACE, + AV_CODEC_ID_SNOW, + AV_CODEC_ID_SMVJPEG, + AV_CODEC_ID_APNG, + AV_CODEC_ID_DAALA, + AV_CODEC_ID_CFHD, + + /* various PCM "codecs" */ + AV_CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs + AV_CODEC_ID_PCM_S16LE = 0x10000, + AV_CODEC_ID_PCM_S16BE, + AV_CODEC_ID_PCM_U16LE, + AV_CODEC_ID_PCM_U16BE, + AV_CODEC_ID_PCM_S8, + AV_CODEC_ID_PCM_U8, + AV_CODEC_ID_PCM_MULAW, + AV_CODEC_ID_PCM_ALAW, + AV_CODEC_ID_PCM_S32LE, + AV_CODEC_ID_PCM_S32BE, + AV_CODEC_ID_PCM_U32LE, + AV_CODEC_ID_PCM_U32BE, + AV_CODEC_ID_PCM_S24LE, + AV_CODEC_ID_PCM_S24BE, + AV_CODEC_ID_PCM_U24LE, + AV_CODEC_ID_PCM_U24BE, + AV_CODEC_ID_PCM_S24DAUD, + AV_CODEC_ID_PCM_ZORK, + AV_CODEC_ID_PCM_S16LE_PLANAR, + AV_CODEC_ID_PCM_DVD, + AV_CODEC_ID_PCM_F32BE, + AV_CODEC_ID_PCM_F32LE, + AV_CODEC_ID_PCM_F64BE, + AV_CODEC_ID_PCM_F64LE, + AV_CODEC_ID_PCM_BLURAY, + AV_CODEC_ID_PCM_LXF, + AV_CODEC_ID_S302M, + AV_CODEC_ID_PCM_S8_PLANAR, + AV_CODEC_ID_PCM_S24LE_PLANAR, + AV_CODEC_ID_PCM_S32LE_PLANAR, + AV_CODEC_ID_PCM_S16BE_PLANAR, + /* new PCM "codecs" should be added right below this line starting with + * an explicit value of for example 0x10800 + */ + + /* various ADPCM codecs */ + AV_CODEC_ID_ADPCM_IMA_QT = 0x11000, + AV_CODEC_ID_ADPCM_IMA_WAV, + AV_CODEC_ID_ADPCM_IMA_DK3, + AV_CODEC_ID_ADPCM_IMA_DK4, + AV_CODEC_ID_ADPCM_IMA_WS, + AV_CODEC_ID_ADPCM_IMA_SMJPEG, + AV_CODEC_ID_ADPCM_MS, + AV_CODEC_ID_ADPCM_4XM, + AV_CODEC_ID_ADPCM_XA, + AV_CODEC_ID_ADPCM_ADX, + AV_CODEC_ID_ADPCM_EA, + AV_CODEC_ID_ADPCM_G726, + AV_CODEC_ID_ADPCM_CT, + AV_CODEC_ID_ADPCM_SWF, + AV_CODEC_ID_ADPCM_YAMAHA, + AV_CODEC_ID_ADPCM_SBPRO_4, + AV_CODEC_ID_ADPCM_SBPRO_3, + AV_CODEC_ID_ADPCM_SBPRO_2, + AV_CODEC_ID_ADPCM_THP, + AV_CODEC_ID_ADPCM_IMA_AMV, + AV_CODEC_ID_ADPCM_EA_R1, + AV_CODEC_ID_ADPCM_EA_R3, + AV_CODEC_ID_ADPCM_EA_R2, + AV_CODEC_ID_ADPCM_IMA_EA_SEAD, + AV_CODEC_ID_ADPCM_IMA_EA_EACS, + AV_CODEC_ID_ADPCM_EA_XAS, + AV_CODEC_ID_ADPCM_EA_MAXIS_XA, + AV_CODEC_ID_ADPCM_IMA_ISS, + AV_CODEC_ID_ADPCM_G722, + AV_CODEC_ID_ADPCM_IMA_APC, + AV_CODEC_ID_ADPCM_VIMA, +#if FF_API_VIMA_DECODER + AV_CODEC_ID_VIMA = AV_CODEC_ID_ADPCM_VIMA, +#endif + + AV_CODEC_ID_ADPCM_AFC = 0x11800, + AV_CODEC_ID_ADPCM_IMA_OKI, + AV_CODEC_ID_ADPCM_DTK, + AV_CODEC_ID_ADPCM_IMA_RAD, + AV_CODEC_ID_ADPCM_G726LE, + AV_CODEC_ID_ADPCM_THP_LE, + AV_CODEC_ID_ADPCM_PSX, + AV_CODEC_ID_ADPCM_AICA, + + /* AMR */ + AV_CODEC_ID_AMR_NB = 0x12000, + AV_CODEC_ID_AMR_WB, + + /* RealAudio codecs*/ + AV_CODEC_ID_RA_144 = 0x13000, + AV_CODEC_ID_RA_288, + + /* various DPCM codecs */ + AV_CODEC_ID_ROQ_DPCM = 0x14000, + AV_CODEC_ID_INTERPLAY_DPCM, + AV_CODEC_ID_XAN_DPCM, + AV_CODEC_ID_SOL_DPCM, + + AV_CODEC_ID_SDX2_DPCM = 0x14800, + + /* audio codecs */ + AV_CODEC_ID_MP2 = 0x15000, + AV_CODEC_ID_MP3, ///< preferred ID for decoding MPEG audio layer 1, 2 or 3 + AV_CODEC_ID_AAC, + AV_CODEC_ID_AC3, + AV_CODEC_ID_DTS, + AV_CODEC_ID_VORBIS, + AV_CODEC_ID_DVAUDIO, + AV_CODEC_ID_WMAV1, + AV_CODEC_ID_WMAV2, + AV_CODEC_ID_MACE3, + AV_CODEC_ID_MACE6, + AV_CODEC_ID_VMDAUDIO, + AV_CODEC_ID_FLAC, + AV_CODEC_ID_MP3ADU, + AV_CODEC_ID_MP3ON4, + AV_CODEC_ID_SHORTEN, + AV_CODEC_ID_ALAC, + AV_CODEC_ID_WESTWOOD_SND1, + AV_CODEC_ID_GSM, ///< as in Berlin toast format + AV_CODEC_ID_QDM2, + AV_CODEC_ID_COOK, + AV_CODEC_ID_TRUESPEECH, + AV_CODEC_ID_TTA, + AV_CODEC_ID_SMACKAUDIO, + AV_CODEC_ID_QCELP, + AV_CODEC_ID_WAVPACK, + AV_CODEC_ID_DSICINAUDIO, + AV_CODEC_ID_IMC, + AV_CODEC_ID_MUSEPACK7, + AV_CODEC_ID_MLP, + AV_CODEC_ID_GSM_MS, /* as found in WAV */ + AV_CODEC_ID_ATRAC3, +#if FF_API_VOXWARE + AV_CODEC_ID_VOXWARE, +#endif + AV_CODEC_ID_APE, + AV_CODEC_ID_NELLYMOSER, + AV_CODEC_ID_MUSEPACK8, + AV_CODEC_ID_SPEEX, + AV_CODEC_ID_WMAVOICE, + AV_CODEC_ID_WMAPRO, + AV_CODEC_ID_WMALOSSLESS, + AV_CODEC_ID_ATRAC3P, + AV_CODEC_ID_EAC3, + AV_CODEC_ID_SIPR, + AV_CODEC_ID_MP1, + AV_CODEC_ID_TWINVQ, + AV_CODEC_ID_TRUEHD, + AV_CODEC_ID_MP4ALS, + AV_CODEC_ID_ATRAC1, + AV_CODEC_ID_BINKAUDIO_RDFT, + AV_CODEC_ID_BINKAUDIO_DCT, + AV_CODEC_ID_AAC_LATM, + AV_CODEC_ID_QDMC, + AV_CODEC_ID_CELT, + AV_CODEC_ID_G723_1, + AV_CODEC_ID_G729, + AV_CODEC_ID_8SVX_EXP, + AV_CODEC_ID_8SVX_FIB, + AV_CODEC_ID_BMV_AUDIO, + AV_CODEC_ID_RALF, + AV_CODEC_ID_IAC, + AV_CODEC_ID_ILBC, + AV_CODEC_ID_OPUS, + AV_CODEC_ID_COMFORT_NOISE, + AV_CODEC_ID_TAK, + AV_CODEC_ID_METASOUND, + AV_CODEC_ID_PAF_AUDIO, + AV_CODEC_ID_ON2AVC, + AV_CODEC_ID_DSS_SP, + + AV_CODEC_ID_FFWAVESYNTH = 0x15800, + AV_CODEC_ID_SONIC, + AV_CODEC_ID_SONIC_LS, + AV_CODEC_ID_EVRC, + AV_CODEC_ID_SMV, + AV_CODEC_ID_DSD_LSBF, + AV_CODEC_ID_DSD_MSBF, + AV_CODEC_ID_DSD_LSBF_PLANAR, + AV_CODEC_ID_DSD_MSBF_PLANAR, + AV_CODEC_ID_4GV, + AV_CODEC_ID_INTERPLAY_ACM, + AV_CODEC_ID_XMA1, + AV_CODEC_ID_XMA2, + + /* subtitle codecs */ + AV_CODEC_ID_FIRST_SUBTITLE = 0x17000, ///< A dummy ID pointing at the start of subtitle codecs. + AV_CODEC_ID_DVD_SUBTITLE = 0x17000, + AV_CODEC_ID_DVB_SUBTITLE, + AV_CODEC_ID_TEXT, ///< raw UTF-8 text + AV_CODEC_ID_XSUB, + AV_CODEC_ID_SSA, + AV_CODEC_ID_MOV_TEXT, + AV_CODEC_ID_HDMV_PGS_SUBTITLE, + AV_CODEC_ID_DVB_TELETEXT, + AV_CODEC_ID_SRT, + + AV_CODEC_ID_MICRODVD = 0x17800, + AV_CODEC_ID_EIA_608, + AV_CODEC_ID_JACOSUB, + AV_CODEC_ID_SAMI, + AV_CODEC_ID_REALTEXT, + AV_CODEC_ID_STL, + AV_CODEC_ID_SUBVIEWER1, + AV_CODEC_ID_SUBVIEWER, + AV_CODEC_ID_SUBRIP, + AV_CODEC_ID_WEBVTT, + AV_CODEC_ID_MPL2, + AV_CODEC_ID_VPLAYER, + AV_CODEC_ID_PJS, + AV_CODEC_ID_ASS, + AV_CODEC_ID_HDMV_TEXT_SUBTITLE, + + /* other specific kind of codecs (generally used for attachments) */ + AV_CODEC_ID_FIRST_UNKNOWN = 0x18000, ///< A dummy ID pointing at the start of various fake codecs. + AV_CODEC_ID_TTF = 0x18000, + + AV_CODEC_ID_BINTEXT = 0x18800, + AV_CODEC_ID_XBIN, + AV_CODEC_ID_IDF, + AV_CODEC_ID_OTF, + AV_CODEC_ID_SMPTE_KLV, + AV_CODEC_ID_DVD_NAV, + AV_CODEC_ID_TIMED_ID3, + AV_CODEC_ID_BIN_DATA, + + + AV_CODEC_ID_PROBE = 0x19000, ///< codec_id is not known (like AV_CODEC_ID_NONE) but lavf should attempt to identify it + + AV_CODEC_ID_MPEG2TS = 0x20000, /**< _FAKE_ codec to indicate a raw MPEG-2 TS + * stream (only used by libavformat) */ + AV_CODEC_ID_MPEG4SYSTEMS = 0x20001, /**< _FAKE_ codec to indicate a MPEG-4 Systems + * stream (only used by libavformat) */ + AV_CODEC_ID_FFMETADATA = 0x21000, ///< Dummy codec for streams containing only metadata information. + AV_CODEC_ID_WRAPPED_AVFRAME = 0x21001, ///< Passthrough codec, AVFrames wrapped in AVPacket +}; + +/** + * This struct describes the properties of a single codec described by an + * AVCodecID. + * @see avcodec_descriptor_get() + */ +typedef struct AVCodecDescriptor { + enum AVCodecID id; + enum AVMediaType type; + /** + * Name of the codec described by this descriptor. It is non-empty and + * unique for each codec descriptor. It should contain alphanumeric + * characters and '_' only. + */ + const char *name; + /** + * A more descriptive name for this codec. May be NULL. + */ + const char *long_name; + /** + * Codec properties, a combination of AV_CODEC_PROP_* flags. + */ + int props; + /** + * MIME type(s) associated with the codec. + * May be NULL; if not, a NULL-terminated array of MIME types. + * The first item is always non-NULL and is the preferred MIME type. + */ + const char *const *mime_types; + /** + * If non-NULL, an array of profiles recognized for this codec. + * Terminated with FF_PROFILE_UNKNOWN. + */ + const struct AVProfile *profiles; +} AVCodecDescriptor; + +/** + * Codec uses only intra compression. + * Video codecs only. + */ +#define AV_CODEC_PROP_INTRA_ONLY (1 << 0) +/** + * Codec supports lossy compression. Audio and video codecs only. + * @note a codec may support both lossy and lossless + * compression modes + */ +#define AV_CODEC_PROP_LOSSY (1 << 1) +/** + * Codec supports lossless compression. Audio and video codecs only. + */ +#define AV_CODEC_PROP_LOSSLESS (1 << 2) +/** + * Codec supports frame reordering. That is, the coded order (the order in which + * the encoded packets are output by the encoders / stored / input to the + * decoders) may be different from the presentation order of the corresponding + * frames. + * + * For codecs that do not have this property set, PTS and DTS should always be + * equal. + */ +#define AV_CODEC_PROP_REORDER (1 << 3) +/** + * Subtitle codec is bitmap based + * Decoded AVSubtitle data can be read from the AVSubtitleRect->pict field. + */ +#define AV_CODEC_PROP_BITMAP_SUB (1 << 16) +/** + * Subtitle codec is text based. + * Decoded AVSubtitle data can be read from the AVSubtitleRect->ass field. + */ +#define AV_CODEC_PROP_TEXT_SUB (1 << 17) + +/** + * @ingroup lavc_decoding + * Required number of additionally allocated bytes at the end of the input bitstream for decoding. + * This is mainly needed because some optimized bitstream readers read + * 32 or 64 bit at once and could read over the end.
+ * Note: If the first 23 bits of the additional bytes are not 0, then damaged + * MPEG bitstreams could cause overread and segfault. + */ +#define AV_INPUT_BUFFER_PADDING_SIZE 32 + +/** + * @ingroup lavc_encoding + * minimum encoding buffer size + * Used to avoid some checks during header writing. + */ +#define AV_INPUT_BUFFER_MIN_SIZE 16384 + +#if FF_API_WITHOUT_PREFIX +/** + * @deprecated use AV_INPUT_BUFFER_PADDING_SIZE instead + */ +#define FF_INPUT_BUFFER_PADDING_SIZE 32 + +/** + * @deprecated use AV_INPUT_BUFFER_MIN_SIZE instead + */ +#define FF_MIN_BUFFER_SIZE 16384 +#endif /* FF_API_WITHOUT_PREFIX */ + +/** + * @ingroup lavc_encoding + * motion estimation type. + * @deprecated use codec private option instead + */ +#if FF_API_MOTION_EST +enum Motion_Est_ID { + ME_ZERO = 1, ///< no search, that is use 0,0 vector whenever one is needed + ME_FULL, + ME_LOG, + ME_PHODS, + ME_EPZS, ///< enhanced predictive zonal search + ME_X1, ///< reserved for experiments + ME_HEX, ///< hexagon based search + ME_UMH, ///< uneven multi-hexagon search + ME_TESA, ///< transformed exhaustive search algorithm + ME_ITER=50, ///< iterative search +}; +#endif + +/** + * @ingroup lavc_decoding + */ +enum AVDiscard{ + /* We leave some space between them for extensions (drop some + * keyframes for intra-only or drop just some bidir frames). */ + AVDISCARD_NONE =-16, ///< discard nothing + AVDISCARD_DEFAULT = 0, ///< discard useless packets like 0 size packets in avi + AVDISCARD_NONREF = 8, ///< discard all non reference + AVDISCARD_BIDIR = 16, ///< discard all bidirectional frames + AVDISCARD_NONINTRA= 24, ///< discard all non intra frames + AVDISCARD_NONKEY = 32, ///< discard all frames except keyframes + AVDISCARD_ALL = 48, ///< discard all +}; + +enum AVAudioServiceType { + AV_AUDIO_SERVICE_TYPE_MAIN = 0, + AV_AUDIO_SERVICE_TYPE_EFFECTS = 1, + AV_AUDIO_SERVICE_TYPE_VISUALLY_IMPAIRED = 2, + AV_AUDIO_SERVICE_TYPE_HEARING_IMPAIRED = 3, + AV_AUDIO_SERVICE_TYPE_DIALOGUE = 4, + AV_AUDIO_SERVICE_TYPE_COMMENTARY = 5, + AV_AUDIO_SERVICE_TYPE_EMERGENCY = 6, + AV_AUDIO_SERVICE_TYPE_VOICE_OVER = 7, + AV_AUDIO_SERVICE_TYPE_KARAOKE = 8, + AV_AUDIO_SERVICE_TYPE_NB , ///< Not part of ABI +}; + +/** + * @ingroup lavc_encoding + */ +typedef struct RcOverride{ + int start_frame; + int end_frame; + int qscale; // If this is 0 then quality_factor will be used instead. + float quality_factor; +} RcOverride; + +#if FF_API_MAX_BFRAMES +/** + * @deprecated there is no libavcodec-wide limit on the number of B-frames + */ +#define FF_MAX_B_FRAMES 16 +#endif + +/* encoding support + These flags can be passed in AVCodecContext.flags before initialization. + Note: Not everything is supported yet. +*/ + +/** + * Allow decoders to produce frames with data planes that are not aligned + * to CPU requirements (e.g. due to cropping). + */ +#define AV_CODEC_FLAG_UNALIGNED (1 << 0) +/** + * Use fixed qscale. + */ +#define AV_CODEC_FLAG_QSCALE (1 << 1) +/** + * 4 MV per MB allowed / advanced prediction for H.263. + */ +#define AV_CODEC_FLAG_4MV (1 << 2) +/** + * Output even those frames that might be corrupted. + */ +#define AV_CODEC_FLAG_OUTPUT_CORRUPT (1 << 3) +/** + * Use qpel MC. + */ +#define AV_CODEC_FLAG_QPEL (1 << 4) +/** + * Use internal 2pass ratecontrol in first pass mode. + */ +#define AV_CODEC_FLAG_PASS1 (1 << 9) +/** + * Use internal 2pass ratecontrol in second pass mode. + */ +#define AV_CODEC_FLAG_PASS2 (1 << 10) +/** + * loop filter. + */ +#define AV_CODEC_FLAG_LOOP_FILTER (1 << 11) +/** + * Only decode/encode grayscale. + */ +#define AV_CODEC_FLAG_GRAY (1 << 13) +/** + * error[?] variables will be set during encoding. + */ +#define AV_CODEC_FLAG_PSNR (1 << 15) +/** + * Input bitstream might be truncated at a random location + * instead of only at frame boundaries. + */ +#define AV_CODEC_FLAG_TRUNCATED (1 << 16) +/** + * Use interlaced DCT. + */ +#define AV_CODEC_FLAG_INTERLACED_DCT (1 << 18) +/** + * Force low delay. + */ +#define AV_CODEC_FLAG_LOW_DELAY (1 << 19) +/** + * Place global headers in extradata instead of every keyframe. + */ +#define AV_CODEC_FLAG_GLOBAL_HEADER (1 << 22) +/** + * Use only bitexact stuff (except (I)DCT). + */ +#define AV_CODEC_FLAG_BITEXACT (1 << 23) +/* Fx : Flag for h263+ extra options */ +/** + * H.263 advanced intra coding / MPEG-4 AC prediction + */ +#define AV_CODEC_FLAG_AC_PRED (1 << 24) +/** + * interlaced motion estimation + */ +#define AV_CODEC_FLAG_INTERLACED_ME (1 << 29) +#define AV_CODEC_FLAG_CLOSED_GOP (1U << 31) + +/** + * Allow non spec compliant speedup tricks. + */ +#define AV_CODEC_FLAG2_FAST (1 << 0) +/** + * Skip bitstream encoding. + */ +#define AV_CODEC_FLAG2_NO_OUTPUT (1 << 2) +/** + * Place global headers at every keyframe instead of in extradata. + */ +#define AV_CODEC_FLAG2_LOCAL_HEADER (1 << 3) + +/** + * timecode is in drop frame format. DEPRECATED!!!! + */ +#define AV_CODEC_FLAG2_DROP_FRAME_TIMECODE (1 << 13) + +/** + * Input bitstream might be truncated at a packet boundaries + * instead of only at frame boundaries. + */ +#define AV_CODEC_FLAG2_CHUNKS (1 << 15) +/** + * Discard cropping information from SPS. + */ +#define AV_CODEC_FLAG2_IGNORE_CROP (1 << 16) + +/** + * Show all frames before the first keyframe + */ +#define AV_CODEC_FLAG2_SHOW_ALL (1 << 22) +/** + * Export motion vectors through frame side data + */ +#define AV_CODEC_FLAG2_EXPORT_MVS (1 << 28) +/** + * Do not skip samples and export skip information as frame side data + */ +#define AV_CODEC_FLAG2_SKIP_MANUAL (1 << 29) + +/* Unsupported options : + * Syntax Arithmetic coding (SAC) + * Reference Picture Selection + * Independent Segment Decoding */ +/* /Fx */ +/* codec capabilities */ + +/** + * Decoder can use draw_horiz_band callback. + */ +#define AV_CODEC_CAP_DRAW_HORIZ_BAND (1 << 0) +/** + * Codec uses get_buffer() for allocating buffers and supports custom allocators. + * If not set, it might not use get_buffer() at all or use operations that + * assume the buffer was allocated by avcodec_default_get_buffer. + */ +#define AV_CODEC_CAP_DR1 (1 << 1) +#define AV_CODEC_CAP_TRUNCATED (1 << 3) +/** + * Encoder or decoder requires flushing with NULL input at the end in order to + * give the complete and correct output. + * + * NOTE: If this flag is not set, the codec is guaranteed to never be fed with + * with NULL data. The user can still send NULL data to the public encode + * or decode function, but libavcodec will not pass it along to the codec + * unless this flag is set. + * + * Decoders: + * The decoder has a non-zero delay and needs to be fed with avpkt->data=NULL, + * avpkt->size=0 at the end to get the delayed data until the decoder no longer + * returns frames. + * + * Encoders: + * The encoder needs to be fed with NULL data at the end of encoding until the + * encoder no longer returns data. + * + * NOTE: For encoders implementing the AVCodec.encode2() function, setting this + * flag also means that the encoder must set the pts and duration for + * each output packet. If this flag is not set, the pts and duration will + * be determined by libavcodec from the input frame. + */ +#define AV_CODEC_CAP_DELAY (1 << 5) +/** + * Codec can be fed a final frame with a smaller size. + * This can be used to prevent truncation of the last audio samples. + */ +#define AV_CODEC_CAP_SMALL_LAST_FRAME (1 << 6) + +#if FF_API_CAP_VDPAU +/** + * Codec can export data for HW decoding (VDPAU). + */ +#define AV_CODEC_CAP_HWACCEL_VDPAU (1 << 7) +#endif + +/** + * Codec can output multiple frames per AVPacket + * Normally demuxers return one frame at a time, demuxers which do not do + * are connected to a parser to split what they return into proper frames. + * This flag is reserved to the very rare category of codecs which have a + * bitstream that cannot be split into frames without timeconsuming + * operations like full decoding. Demuxers carring such bitstreams thus + * may return multiple frames in a packet. This has many disadvantages like + * prohibiting stream copy in many cases thus it should only be considered + * as a last resort. + */ +#define AV_CODEC_CAP_SUBFRAMES (1 << 8) +/** + * Codec is experimental and is thus avoided in favor of non experimental + * encoders + */ +#define AV_CODEC_CAP_EXPERIMENTAL (1 << 9) +/** + * Codec should fill in channel configuration and samplerate instead of container + */ +#define AV_CODEC_CAP_CHANNEL_CONF (1 << 10) +/** + * Codec supports frame-level multithreading. + */ +#define AV_CODEC_CAP_FRAME_THREADS (1 << 12) +/** + * Codec supports slice-based (or partition-based) multithreading. + */ +#define AV_CODEC_CAP_SLICE_THREADS (1 << 13) +/** + * Codec supports changed parameters at any point. + */ +#define AV_CODEC_CAP_PARAM_CHANGE (1 << 14) +/** + * Codec supports avctx->thread_count == 0 (auto). + */ +#define AV_CODEC_CAP_AUTO_THREADS (1 << 15) +/** + * Audio encoder supports receiving a different number of samples in each call. + */ +#define AV_CODEC_CAP_VARIABLE_FRAME_SIZE (1 << 16) +/** + * Codec is intra only. + */ +#define AV_CODEC_CAP_INTRA_ONLY 0x40000000 +/** + * Codec is lossless. + */ +#define AV_CODEC_CAP_LOSSLESS 0x80000000 + + +#if FF_API_WITHOUT_PREFIX +/** + * Allow decoders to produce frames with data planes that are not aligned + * to CPU requirements (e.g. due to cropping). + */ +#define CODEC_FLAG_UNALIGNED AV_CODEC_FLAG_UNALIGNED +#define CODEC_FLAG_QSCALE AV_CODEC_FLAG_QSCALE +#define CODEC_FLAG_4MV AV_CODEC_FLAG_4MV +#define CODEC_FLAG_OUTPUT_CORRUPT AV_CODEC_FLAG_OUTPUT_CORRUPT +#define CODEC_FLAG_QPEL AV_CODEC_FLAG_QPEL +#if FF_API_GMC +/** + * @deprecated use the "gmc" private option of the libxvid encoder + */ +#define CODEC_FLAG_GMC 0x0020 ///< Use GMC. +#endif +#if FF_API_MV0 +/** + * @deprecated use the flag "mv0" in the "mpv_flags" private option of the + * mpegvideo encoders + */ +#define CODEC_FLAG_MV0 0x0040 +#endif +#if FF_API_INPUT_PRESERVED +/** + * @deprecated passing reference-counted frames to the encoders replaces this + * flag + */ +#define CODEC_FLAG_INPUT_PRESERVED 0x0100 +#endif +#define CODEC_FLAG_PASS1 AV_CODEC_FLAG_PASS1 +#define CODEC_FLAG_PASS2 AV_CODEC_FLAG_PASS2 +#define CODEC_FLAG_GRAY AV_CODEC_FLAG_GRAY +#if FF_API_EMU_EDGE +/** + * @deprecated edges are not used/required anymore. I.e. this flag is now always + * set. + */ +#define CODEC_FLAG_EMU_EDGE 0x4000 +#endif +#define CODEC_FLAG_PSNR AV_CODEC_FLAG_PSNR +#define CODEC_FLAG_TRUNCATED AV_CODEC_FLAG_TRUNCATED + +#if FF_API_NORMALIZE_AQP +/** + * @deprecated use the flag "naq" in the "mpv_flags" private option of the + * mpegvideo encoders + */ +#define CODEC_FLAG_NORMALIZE_AQP 0x00020000 +#endif +#define CODEC_FLAG_INTERLACED_DCT AV_CODEC_FLAG_INTERLACED_DCT +#define CODEC_FLAG_LOW_DELAY AV_CODEC_FLAG_LOW_DELAY +#define CODEC_FLAG_GLOBAL_HEADER AV_CODEC_FLAG_GLOBAL_HEADER +#define CODEC_FLAG_BITEXACT AV_CODEC_FLAG_BITEXACT +#define CODEC_FLAG_AC_PRED AV_CODEC_FLAG_AC_PRED +#define CODEC_FLAG_LOOP_FILTER AV_CODEC_FLAG_LOOP_FILTER +#define CODEC_FLAG_INTERLACED_ME AV_CODEC_FLAG_INTERLACED_ME +#define CODEC_FLAG_CLOSED_GOP AV_CODEC_FLAG_CLOSED_GOP +#define CODEC_FLAG2_FAST AV_CODEC_FLAG2_FAST +#define CODEC_FLAG2_NO_OUTPUT AV_CODEC_FLAG2_NO_OUTPUT +#define CODEC_FLAG2_LOCAL_HEADER AV_CODEC_FLAG2_LOCAL_HEADER +#define CODEC_FLAG2_DROP_FRAME_TIMECODE AV_CODEC_FLAG2_DROP_FRAME_TIMECODE +#define CODEC_FLAG2_IGNORE_CROP AV_CODEC_FLAG2_IGNORE_CROP + +#define CODEC_FLAG2_CHUNKS AV_CODEC_FLAG2_CHUNKS +#define CODEC_FLAG2_SHOW_ALL AV_CODEC_FLAG2_SHOW_ALL +#define CODEC_FLAG2_EXPORT_MVS AV_CODEC_FLAG2_EXPORT_MVS +#define CODEC_FLAG2_SKIP_MANUAL AV_CODEC_FLAG2_SKIP_MANUAL + +/* Unsupported options : + * Syntax Arithmetic coding (SAC) + * Reference Picture Selection + * Independent Segment Decoding */ +/* /Fx */ +/* codec capabilities */ + +#define CODEC_CAP_DRAW_HORIZ_BAND AV_CODEC_CAP_DRAW_HORIZ_BAND ///< Decoder can use draw_horiz_band callback. +/** + * Codec uses get_buffer() for allocating buffers and supports custom allocators. + * If not set, it might not use get_buffer() at all or use operations that + * assume the buffer was allocated by avcodec_default_get_buffer. + */ +#define CODEC_CAP_DR1 AV_CODEC_CAP_DR1 +#define CODEC_CAP_TRUNCATED AV_CODEC_CAP_TRUNCATED +#if FF_API_XVMC +/* Codec can export data for HW decoding. This flag indicates that + * the codec would call get_format() with list that might contain HW accelerated + * pixel formats (XvMC, VDPAU, VAAPI, etc). The application can pick any of them + * including raw image format. + * The application can use the passed context to determine bitstream version, + * chroma format, resolution etc. + */ +#define CODEC_CAP_HWACCEL 0x0010 +#endif /* FF_API_XVMC */ +/** + * Encoder or decoder requires flushing with NULL input at the end in order to + * give the complete and correct output. + * + * NOTE: If this flag is not set, the codec is guaranteed to never be fed with + * with NULL data. The user can still send NULL data to the public encode + * or decode function, but libavcodec will not pass it along to the codec + * unless this flag is set. + * + * Decoders: + * The decoder has a non-zero delay and needs to be fed with avpkt->data=NULL, + * avpkt->size=0 at the end to get the delayed data until the decoder no longer + * returns frames. + * + * Encoders: + * The encoder needs to be fed with NULL data at the end of encoding until the + * encoder no longer returns data. + * + * NOTE: For encoders implementing the AVCodec.encode2() function, setting this + * flag also means that the encoder must set the pts and duration for + * each output packet. If this flag is not set, the pts and duration will + * be determined by libavcodec from the input frame. + */ +#define CODEC_CAP_DELAY AV_CODEC_CAP_DELAY +/** + * Codec can be fed a final frame with a smaller size. + * This can be used to prevent truncation of the last audio samples. + */ +#define CODEC_CAP_SMALL_LAST_FRAME AV_CODEC_CAP_SMALL_LAST_FRAME +#if FF_API_CAP_VDPAU +/** + * Codec can export data for HW decoding (VDPAU). + */ +#define CODEC_CAP_HWACCEL_VDPAU AV_CODEC_CAP_HWACCEL_VDPAU +#endif +/** + * Codec can output multiple frames per AVPacket + * Normally demuxers return one frame at a time, demuxers which do not do + * are connected to a parser to split what they return into proper frames. + * This flag is reserved to the very rare category of codecs which have a + * bitstream that cannot be split into frames without timeconsuming + * operations like full decoding. Demuxers carring such bitstreams thus + * may return multiple frames in a packet. This has many disadvantages like + * prohibiting stream copy in many cases thus it should only be considered + * as a last resort. + */ +#define CODEC_CAP_SUBFRAMES AV_CODEC_CAP_SUBFRAMES +/** + * Codec is experimental and is thus avoided in favor of non experimental + * encoders + */ +#define CODEC_CAP_EXPERIMENTAL AV_CODEC_CAP_EXPERIMENTAL +/** + * Codec should fill in channel configuration and samplerate instead of container + */ +#define CODEC_CAP_CHANNEL_CONF AV_CODEC_CAP_CHANNEL_CONF +#if FF_API_NEG_LINESIZES +/** + * @deprecated no codecs use this capability + */ +#define CODEC_CAP_NEG_LINESIZES 0x0800 +#endif +/** + * Codec supports frame-level multithreading. + */ +#define CODEC_CAP_FRAME_THREADS AV_CODEC_CAP_FRAME_THREADS +/** + * Codec supports slice-based (or partition-based) multithreading. + */ +#define CODEC_CAP_SLICE_THREADS AV_CODEC_CAP_SLICE_THREADS +/** + * Codec supports changed parameters at any point. + */ +#define CODEC_CAP_PARAM_CHANGE AV_CODEC_CAP_PARAM_CHANGE +/** + * Codec supports avctx->thread_count == 0 (auto). + */ +#define CODEC_CAP_AUTO_THREADS AV_CODEC_CAP_AUTO_THREADS +/** + * Audio encoder supports receiving a different number of samples in each call. + */ +#define CODEC_CAP_VARIABLE_FRAME_SIZE AV_CODEC_CAP_VARIABLE_FRAME_SIZE +/** + * Codec is intra only. + */ +#define CODEC_CAP_INTRA_ONLY AV_CODEC_CAP_INTRA_ONLY +/** + * Codec is lossless. + */ +#define CODEC_CAP_LOSSLESS AV_CODEC_CAP_LOSSLESS + +/** + * HWAccel is experimental and is thus avoided in favor of non experimental + * codecs + */ +#define HWACCEL_CODEC_CAP_EXPERIMENTAL 0x0200 +#endif /* FF_API_WITHOUT_PREFIX */ + +#if FF_API_MB_TYPE +//The following defines may change, don't expect compatibility if you use them. +#define MB_TYPE_INTRA4x4 0x0001 +#define MB_TYPE_INTRA16x16 0x0002 //FIXME H.264-specific +#define MB_TYPE_INTRA_PCM 0x0004 //FIXME H.264-specific +#define MB_TYPE_16x16 0x0008 +#define MB_TYPE_16x8 0x0010 +#define MB_TYPE_8x16 0x0020 +#define MB_TYPE_8x8 0x0040 +#define MB_TYPE_INTERLACED 0x0080 +#define MB_TYPE_DIRECT2 0x0100 //FIXME +#define MB_TYPE_ACPRED 0x0200 +#define MB_TYPE_GMC 0x0400 +#define MB_TYPE_SKIP 0x0800 +#define MB_TYPE_P0L0 0x1000 +#define MB_TYPE_P1L0 0x2000 +#define MB_TYPE_P0L1 0x4000 +#define MB_TYPE_P1L1 0x8000 +#define MB_TYPE_L0 (MB_TYPE_P0L0 | MB_TYPE_P1L0) +#define MB_TYPE_L1 (MB_TYPE_P0L1 | MB_TYPE_P1L1) +#define MB_TYPE_L0L1 (MB_TYPE_L0 | MB_TYPE_L1) +#define MB_TYPE_QUANT 0x00010000 +#define MB_TYPE_CBP 0x00020000 +//Note bits 24-31 are reserved for codec specific use (h264 ref0, mpeg1 0mv, ...) +#endif + +/** + * Pan Scan area. + * This specifies the area which should be displayed. + * Note there may be multiple such areas for one frame. + */ +typedef struct AVPanScan{ + /** + * id + * - encoding: Set by user. + * - decoding: Set by libavcodec. + */ + int id; + + /** + * width and height in 1/16 pel + * - encoding: Set by user. + * - decoding: Set by libavcodec. + */ + int width; + int height; + + /** + * position of the top left corner in 1/16 pel for up to 3 fields/frames + * - encoding: Set by user. + * - decoding: Set by libavcodec. + */ + int16_t position[3][2]; +}AVPanScan; + +/** + * This structure describes the bitrate properties of an encoded bitstream. It + * roughly corresponds to a subset the VBV parameters for MPEG-2 or HRD + * parameters for H.264/HEVC. + */ +typedef struct AVCPBProperties { + /** + * Maximum bitrate of the stream, in bits per second. + * Zero if unknown or unspecified. + */ + int max_bitrate; + /** + * Minimum bitrate of the stream, in bits per second. + * Zero if unknown or unspecified. + */ + int min_bitrate; + /** + * Average bitrate of the stream, in bits per second. + * Zero if unknown or unspecified. + */ + int avg_bitrate; + + /** + * The size of the buffer to which the ratecontrol is applied, in bits. + * Zero if unknown or unspecified. + */ + int buffer_size; + + /** + * The delay between the time the packet this structure is associated with + * is received and the time when it should be decoded, in periods of a 27MHz + * clock. + * + * UINT64_MAX when unknown or unspecified. + */ + uint64_t vbv_delay; +} AVCPBProperties; + +#if FF_API_QSCALE_TYPE +#define FF_QSCALE_TYPE_MPEG1 0 +#define FF_QSCALE_TYPE_MPEG2 1 +#define FF_QSCALE_TYPE_H264 2 +#define FF_QSCALE_TYPE_VP56 3 +#endif + +/** + * The decoder will keep a reference to the frame and may reuse it later. + */ +#define AV_GET_BUFFER_FLAG_REF (1 << 0) + +/** + * @defgroup lavc_packet AVPacket + * + * Types and functions for working with AVPacket. + * @{ + */ +enum AVPacketSideDataType { + AV_PKT_DATA_PALETTE, + AV_PKT_DATA_NEW_EXTRADATA, + + /** + * An AV_PKT_DATA_PARAM_CHANGE side data packet is laid out as follows: + * @code + * u32le param_flags + * if (param_flags & AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT) + * s32le channel_count + * if (param_flags & AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_LAYOUT) + * u64le channel_layout + * if (param_flags & AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE) + * s32le sample_rate + * if (param_flags & AV_SIDE_DATA_PARAM_CHANGE_DIMENSIONS) + * s32le width + * s32le height + * @endcode + */ + AV_PKT_DATA_PARAM_CHANGE, + + /** + * An AV_PKT_DATA_H263_MB_INFO side data packet contains a number of + * structures with info about macroblocks relevant to splitting the + * packet into smaller packets on macroblock edges (e.g. as for RFC 2190). + * That is, it does not necessarily contain info about all macroblocks, + * as long as the distance between macroblocks in the info is smaller + * than the target payload size. + * Each MB info structure is 12 bytes, and is laid out as follows: + * @code + * u32le bit offset from the start of the packet + * u8 current quantizer at the start of the macroblock + * u8 GOB number + * u16le macroblock address within the GOB + * u8 horizontal MV predictor + * u8 vertical MV predictor + * u8 horizontal MV predictor for block number 3 + * u8 vertical MV predictor for block number 3 + * @endcode + */ + AV_PKT_DATA_H263_MB_INFO, + + /** + * This side data should be associated with an audio stream and contains + * ReplayGain information in form of the AVReplayGain struct. + */ + AV_PKT_DATA_REPLAYGAIN, + + /** + * This side data contains a 3x3 transformation matrix describing an affine + * transformation that needs to be applied to the decoded video frames for + * correct presentation. + * + * See libavutil/display.h for a detailed description of the data. + */ + AV_PKT_DATA_DISPLAYMATRIX, + + /** + * This side data should be associated with a video stream and contains + * Stereoscopic 3D information in form of the AVStereo3D struct. + */ + AV_PKT_DATA_STEREO3D, + + /** + * This side data should be associated with an audio stream and corresponds + * to enum AVAudioServiceType. + */ + AV_PKT_DATA_AUDIO_SERVICE_TYPE, + + /** + * This side data contains quality related information from the encoder. + * @code + * u32le quality factor of the compressed frame. Allowed range is between 1 (good) and FF_LAMBDA_MAX (bad). + * u8 picture type + * u8 error count + * u16 reserved + * u64le[error count] sum of squared differences between encoder in and output + * @endcode + */ + AV_PKT_DATA_QUALITY_STATS, + + /** + * This side data contains an integer value representing the stream index + * of a "fallback" track. A fallback track indicates an alternate + * track to use when the current track can not be decoded for some reason. + * e.g. no decoder available for codec. + */ + AV_PKT_DATA_FALLBACK_TRACK, + + /** + * This side data corresponds to the AVCPBProperties struct. + */ + AV_PKT_DATA_CPB_PROPERTIES, + + /** + * Recommmends skipping the specified number of samples + * @code + * u32le number of samples to skip from start of this packet + * u32le number of samples to skip from end of this packet + * u8 reason for start skip + * u8 reason for end skip (0=padding silence, 1=convergence) + * @endcode + */ + AV_PKT_DATA_SKIP_SAMPLES=70, + + /** + * An AV_PKT_DATA_JP_DUALMONO side data packet indicates that + * the packet may contain "dual mono" audio specific to Japanese DTV + * and if it is true, recommends only the selected channel to be used. + * @code + * u8 selected channels (0=mail/left, 1=sub/right, 2=both) + * @endcode + */ + AV_PKT_DATA_JP_DUALMONO, + + /** + * A list of zero terminated key/value strings. There is no end marker for + * the list, so it is required to rely on the side data size to stop. + */ + AV_PKT_DATA_STRINGS_METADATA, + + /** + * Subtitle event position + * @code + * u32le x1 + * u32le y1 + * u32le x2 + * u32le y2 + * @endcode + */ + AV_PKT_DATA_SUBTITLE_POSITION, + + /** + * Data found in BlockAdditional element of matroska container. There is + * no end marker for the data, so it is required to rely on the side data + * size to recognize the end. 8 byte id (as found in BlockAddId) followed + * by data. + */ + AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL, + + /** + * The optional first identifier line of a WebVTT cue. + */ + AV_PKT_DATA_WEBVTT_IDENTIFIER, + + /** + * The optional settings (rendering instructions) that immediately + * follow the timestamp specifier of a WebVTT cue. + */ + AV_PKT_DATA_WEBVTT_SETTINGS, + + /** + * A list of zero terminated key/value strings. There is no end marker for + * the list, so it is required to rely on the side data size to stop. This + * side data includes updated metadata which appeared in the stream. + */ + AV_PKT_DATA_METADATA_UPDATE, +}; + +#define AV_PKT_DATA_QUALITY_FACTOR AV_PKT_DATA_QUALITY_STATS //DEPRECATED + +typedef struct AVPacketSideData { + uint8_t *data; + int size; + enum AVPacketSideDataType type; +} AVPacketSideData; + +/** + * This structure stores compressed data. It is typically exported by demuxers + * and then passed as input to decoders, or received as output from encoders and + * then passed to muxers. + * + * For video, it should typically contain one compressed frame. For audio it may + * contain several compressed frames. Encoders are allowed to output empty + * packets, with no compressed data, containing only side data + * (e.g. to update some stream parameters at the end of encoding). + * + * AVPacket is one of the few structs in FFmpeg, whose size is a part of public + * ABI. Thus it may be allocated on stack and no new fields can be added to it + * without libavcodec and libavformat major bump. + * + * The semantics of data ownership depends on the buf field. + * If it is set, the packet data is dynamically allocated and is + * valid indefinitely until a call to av_packet_unref() reduces the + * reference count to 0. + * + * If the buf field is not set av_packet_ref() would make a copy instead + * of increasing the reference count. + * + * The side data is always allocated with av_malloc(), copied by + * av_packet_ref() and freed by av_packet_unref(). + * + * @see av_packet_ref + * @see av_packet_unref + */ + +struct AVBufferRef; + +typedef struct AVPacket { + /** + * A reference to the reference-counted buffer where the packet data is + * stored. + * May be NULL, then the packet data is not reference-counted. + */ + // AVBufferRef *buf; + /** + * Presentation timestamp in AVStream->time_base units; the time at which + * the decompressed packet will be presented to the user. + * Can be AV_NOPTS_VALUE if it is not stored in the file. + * pts MUST be larger or equal to dts as presentation cannot happen before + * decompression, unless one wants to view hex dumps. Some formats misuse + * the terms dts and pts/cts to mean something different. Such timestamps + * must be converted to true pts/dts before they are stored in AVPacket. + */ + int64_t pts; + /** + * Decompression timestamp in AVStream->time_base units; the time at which + * the packet is decompressed. + * Can be AV_NOPTS_VALUE if it is not stored in the file. + */ + int64_t dts; + uint8_t *data; + int size; + int stream_index; + /** + * A combination of AV_PKT_FLAG values + */ + int flags; + /** + * Additional packet data that can be provided by the container. + * Packet can contain several types of side information. + */ + AVPacketSideData *side_data; + int side_data_elems; + + /** + * Duration of this packet in AVStream->time_base units, 0 if unknown. + * Equals next_pts - this_pts in presentation order. + */ + int64_t duration; + + int64_t pos; ///< byte position in stream, -1 if unknown + +#if FF_API_CONVERGENCE_DURATION + /** + * @deprecated Same as the duration field, but as int64_t. This was required + * for Matroska subtitles, whose duration values could overflow when the + * duration field was still an int. + */ + attribute_deprecated + int64_t convergence_duration; +#endif +} AVPacket; +#define AV_PKT_FLAG_KEY 0x0001 ///< The packet contains a keyframe +#define AV_PKT_FLAG_CORRUPT 0x0002 ///< The packet content is corrupted + +enum AVSideDataParamChangeFlags { + AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT = 0x0001, + AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_LAYOUT = 0x0002, + AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE = 0x0004, + AV_SIDE_DATA_PARAM_CHANGE_DIMENSIONS = 0x0008, +}; +/** + * @} + */ + +struct AVCodecInternal; + +enum AVFieldOrder { + AV_FIELD_UNKNOWN, + AV_FIELD_PROGRESSIVE, + AV_FIELD_TT, //< Top coded_first, top displayed first + AV_FIELD_BB, //< Bottom coded first, bottom displayed first + AV_FIELD_TB, //< Top coded first, bottom displayed first + AV_FIELD_BT, //< Bottom coded first, top displayed first +}; + +/** + * main external API structure. + * New fields can be added to the end with minor version bumps. + * Removal, reordering and changes to existing fields require a major + * version bump. + * Please use AVOptions (av_opt* / av_set/get*()) to access these fields from user + * applications. + * sizeof(AVCodecContext) must not be used outside libav*. + */ +typedef struct AVCodecContext { + /** + * information on struct for av_log + * - set by avcodec_alloc_context3 + */ + // const AVClass *av_class; + int log_level_offset; + + enum AVMediaType codec_type; /* see AVMEDIA_TYPE_xxx */ + const struct AVCodec *codec; +#if FF_API_CODEC_NAME + /** + * @deprecated this field is not used for anything in libavcodec + */ + attribute_deprecated + char codec_name[32]; +#endif + enum AVCodecID codec_id; /* see AV_CODEC_ID_xxx */ + + /** + * fourcc (LSB first, so "ABCD" -> ('D'<<24) + ('C'<<16) + ('B'<<8) + 'A'). + * This is used to work around some encoder bugs. + * A demuxer should set this to what is stored in the field used to identify the codec. + * If there are multiple such fields in a container then the demuxer should choose the one + * which maximizes the information about the used codec. + * If the codec tag field in a container is larger than 32 bits then the demuxer should + * remap the longer ID to 32 bits with a table or other structure. Alternatively a new + * extra_codec_tag + size could be added but for this a clear advantage must be demonstrated + * first. + * - encoding: Set by user, if not then the default based on codec_id will be used. + * - decoding: Set by user, will be converted to uppercase by libavcodec during init. + */ + unsigned int codec_tag; + +#if FF_API_STREAM_CODEC_TAG + /** + * @deprecated this field is unused + */ + attribute_deprecated + unsigned int stream_codec_tag; +#endif + + void *priv_data; + + /** + * Private context used for internal data. + * + * Unlike priv_data, this is not codec-specific. It is used in general + * libavcodec functions. + */ + struct AVCodecInternal *internal; + + /** + * Private data of the user, can be used to carry app specific stuff. + * - encoding: Set by user. + * - decoding: Set by user. + */ + void *opaque; + + /** + * the average bitrate + * - encoding: Set by user; unused for constant quantizer encoding. + * - decoding: Set by user, may be overwritten by libavcodec + * if this info is available in the stream + */ + int64_t bit_rate; + + /** + * number of bits the bitstream is allowed to diverge from the reference. + * the reference can be CBR (for CBR pass1) or VBR (for pass2) + * - encoding: Set by user; unused for constant quantizer encoding. + * - decoding: unused + */ + int bit_rate_tolerance; + + /** + * Global quality for codecs which cannot change it per frame. + * This should be proportional to MPEG-1/2/4 qscale. + * - encoding: Set by user. + * - decoding: unused + */ + int global_quality; + + /** + * - encoding: Set by user. + * - decoding: unused + */ + int compression_level; +#define FF_COMPRESSION_DEFAULT -1 + + /** + * AV_CODEC_FLAG_*. + * - encoding: Set by user. + * - decoding: Set by user. + */ + int flags; + + /** + * AV_CODEC_FLAG2_* + * - encoding: Set by user. + * - decoding: Set by user. + */ + int flags2; + + /** + * some codecs need / can use extradata like Huffman tables. + * mjpeg: Huffman tables + * rv10: additional flags + * mpeg4: global headers (they can be in the bitstream or here) + * The allocated memory should be AV_INPUT_BUFFER_PADDING_SIZE bytes larger + * than extradata_size to avoid problems if it is read with the bitstream reader. + * The bytewise contents of extradata must not depend on the architecture or CPU endianness. + * - encoding: Set/allocated/freed by libavcodec. + * - decoding: Set/allocated/freed by user. + */ + uint8_t *extradata; + int extradata_size; + + /** + * This is the fundamental unit of time (in seconds) in terms + * of which frame timestamps are represented. For fixed-fps content, + * timebase should be 1/framerate and timestamp increments should be + * identically 1. + * This often, but not always is the inverse of the frame rate or field rate + * for video. + * - encoding: MUST be set by user. + * - decoding: the use of this field for decoding is deprecated. + * Use framerate instead. + */ + AVRational time_base; + + /** + * For some codecs, the time base is closer to the field rate than the frame rate. + * Most notably, H.264 and MPEG-2 specify time_base as half of frame duration + * if no telecine is used ... + * + * Set to time_base ticks per frame. Default 1, e.g., H.264/MPEG-2 set it to 2. + */ + int ticks_per_frame; + + /** + * Codec delay. + * + * Encoding: Number of frames delay there will be from the encoder input to + * the decoder output. (we assume the decoder matches the spec) + * Decoding: Number of frames delay in addition to what a standard decoder + * as specified in the spec would produce. + * + * Video: + * Number of frames the decoded output will be delayed relative to the + * encoded input. + * + * Audio: + * For encoding, this field is unused (see initial_padding). + * + * For decoding, this is the number of samples the decoder needs to + * output before the decoder's output is valid. When seeking, you should + * start decoding this many samples prior to your desired seek point. + * + * - encoding: Set by libavcodec. + * - decoding: Set by libavcodec. + */ + int delay; + + + /* video only */ + /** + * picture width / height. + * + * @note Those fields may not match the values of the last + * AVFrame outputted by avcodec_decode_video2 due frame + * reordering. + * + * - encoding: MUST be set by user. + * - decoding: May be set by the user before opening the decoder if known e.g. + * from the container. Some decoders will require the dimensions + * to be set by the caller. During decoding, the decoder may + * overwrite those values as required while parsing the data. + */ + int width, height; + + /** + * Bitstream width / height, may be different from width/height e.g. when + * the decoded frame is cropped before being output or lowres is enabled. + * + * @note Those field may not match the value of the last + * AVFrame outputted by avcodec_decode_video2 due frame + * reordering. + * + * - encoding: unused + * - decoding: May be set by the user before opening the decoder if known + * e.g. from the container. During decoding, the decoder may + * overwrite those values as required while parsing the data. + */ + int coded_width, coded_height; + +#if FF_API_ASPECT_EXTENDED +#define FF_ASPECT_EXTENDED 15 +#endif + + /** + * the number of pictures in a group of pictures, or 0 for intra_only + * - encoding: Set by user. + * - decoding: unused + */ + int gop_size; + + /** + * Pixel format, see AV_PIX_FMT_xxx. + * May be set by the demuxer if known from headers. + * May be overridden by the decoder if it knows better. + * + * @note This field may not match the value of the last + * AVFrame outputted by avcodec_decode_video2 due frame + * reordering. + * + * - encoding: Set by user. + * - decoding: Set by user if known, overridden by libavcodec while + * parsing the data. + */ + enum AVPixelFormat pix_fmt; + +#if FF_API_MOTION_EST + /** + * This option does nothing + * @deprecated use codec private options instead + */ + attribute_deprecated int me_method; +#endif + + /** + * If non NULL, 'draw_horiz_band' is called by the libavcodec + * decoder to draw a horizontal band. It improves cache usage. Not + * all codecs can do that. You must check the codec capabilities + * beforehand. + * When multithreading is used, it may be called from multiple threads + * at the same time; threads might draw different parts of the same AVFrame, + * or multiple AVFrames, and there is no guarantee that slices will be drawn + * in order. + * The function is also used by hardware acceleration APIs. + * It is called at least once during frame decoding to pass + * the data needed for hardware render. + * In that mode instead of pixel data, AVFrame points to + * a structure specific to the acceleration API. The application + * reads the structure and can change some fields to indicate progress + * or mark state. + * - encoding: unused + * - decoding: Set by user. + * @param height the height of the slice + * @param y the y position of the slice + * @param type 1->top field, 2->bottom field, 3->frame + * @param offset offset into the AVFrame.data from which the slice should be read + */ + void (*draw_horiz_band)(struct AVCodecContext *s, + const AVFrame *src, int offset[AV_NUM_DATA_POINTERS], + int y, int type, int height); + + /** + * callback to negotiate the pixelFormat + * @param fmt is the list of formats which are supported by the codec, + * it is terminated by -1 as 0 is a valid format, the formats are ordered by quality. + * The first is always the native one. + * @note The callback may be called again immediately if initialization for + * the selected (hardware-accelerated) pixel format failed. + * @warning Behavior is undefined if the callback returns a value not + * in the fmt list of formats. + * @return the chosen format + * - encoding: unused + * - decoding: Set by user, if not set the native format will be chosen. + */ + enum AVPixelFormat (*get_format)(struct AVCodecContext *s, const enum AVPixelFormat * fmt); + + /** + * maximum number of B-frames between non-B-frames + * Note: The output will be delayed by max_b_frames+1 relative to the input. + * - encoding: Set by user. + * - decoding: unused + */ + int max_b_frames; + + /** + * qscale factor between IP and B-frames + * If > 0 then the last P-frame quantizer will be used (q= lastp_q*factor+offset). + * If < 0 then normal ratecontrol will be done (q= -normal_q*factor+offset). + * - encoding: Set by user. + * - decoding: unused + */ + float b_quant_factor; + +#if FF_API_RC_STRATEGY + /** @deprecated use codec private option instead */ + attribute_deprecated int rc_strategy; +#define FF_RC_STRATEGY_XVID 1 +#endif + +#if FF_API_PRIVATE_OPT + /** @deprecated use encoder private options instead */ + attribute_deprecated + int b_frame_strategy; +#endif + + /** + * qscale offset between IP and B-frames + * - encoding: Set by user. + * - decoding: unused + */ + float b_quant_offset; + + /** + * Size of the frame reordering buffer in the decoder. + * For MPEG-2 it is 1 IPB or 0 low delay IP. + * - encoding: Set by libavcodec. + * - decoding: Set by libavcodec. + */ + int has_b_frames; + +#if FF_API_PRIVATE_OPT + /** @deprecated use encoder private options instead */ + attribute_deprecated + int mpeg_quant; +#endif + + /** + * qscale factor between P and I-frames + * If > 0 then the last p frame quantizer will be used (q= lastp_q*factor+offset). + * If < 0 then normal ratecontrol will be done (q= -normal_q*factor+offset). + * - encoding: Set by user. + * - decoding: unused + */ + float i_quant_factor; + + /** + * qscale offset between P and I-frames + * - encoding: Set by user. + * - decoding: unused + */ + float i_quant_offset; + + /** + * luminance masking (0-> disabled) + * - encoding: Set by user. + * - decoding: unused + */ + float lumi_masking; + + /** + * temporary complexity masking (0-> disabled) + * - encoding: Set by user. + * - decoding: unused + */ + float temporal_cplx_masking; + + /** + * spatial complexity masking (0-> disabled) + * - encoding: Set by user. + * - decoding: unused + */ + float spatial_cplx_masking; + + /** + * p block masking (0-> disabled) + * - encoding: Set by user. + * - decoding: unused + */ + float p_masking; + + /** + * darkness masking (0-> disabled) + * - encoding: Set by user. + * - decoding: unused + */ + float dark_masking; + + /** + * slice count + * - encoding: Set by libavcodec. + * - decoding: Set by user (or 0). + */ + int slice_count; + +#if FF_API_PRIVATE_OPT + /** @deprecated use encoder private options instead */ + attribute_deprecated + int prediction_method; +#define FF_PRED_LEFT 0 +#define FF_PRED_PLANE 1 +#define FF_PRED_MEDIAN 2 +#endif + + /** + * slice offsets in the frame in bytes + * - encoding: Set/allocated by libavcodec. + * - decoding: Set/allocated by user (or NULL). + */ + int *slice_offset; + + /** + * sample aspect ratio (0 if unknown) + * That is the width of a pixel divided by the height of the pixel. + * Numerator and denominator must be relatively prime and smaller than 256 for some video standards. + * - encoding: Set by user. + * - decoding: Set by libavcodec. + */ + AVRational sample_aspect_ratio; + + /** + * motion estimation comparison function + * - encoding: Set by user. + * - decoding: unused + */ + int me_cmp; + /** + * subpixel motion estimation comparison function + * - encoding: Set by user. + * - decoding: unused + */ + int me_sub_cmp; + /** + * macroblock comparison function (not supported yet) + * - encoding: Set by user. + * - decoding: unused + */ + int mb_cmp; + /** + * interlaced DCT comparison function + * - encoding: Set by user. + * - decoding: unused + */ + int ildct_cmp; +#define FF_CMP_SAD 0 +#define FF_CMP_SSE 1 +#define FF_CMP_SATD 2 +#define FF_CMP_DCT 3 +#define FF_CMP_PSNR 4 +#define FF_CMP_BIT 5 +#define FF_CMP_RD 6 +#define FF_CMP_ZERO 7 +#define FF_CMP_VSAD 8 +#define FF_CMP_VSSE 9 +#define FF_CMP_NSSE 10 +#define FF_CMP_W53 11 +#define FF_CMP_W97 12 +#define FF_CMP_DCTMAX 13 +#define FF_CMP_DCT264 14 +#define FF_CMP_CHROMA 256 + + /** + * ME diamond size & shape + * - encoding: Set by user. + * - decoding: unused + */ + int dia_size; + + /** + * amount of previous MV predictors (2a+1 x 2a+1 square) + * - encoding: Set by user. + * - decoding: unused + */ + int last_predictor_count; + +#if FF_API_PRIVATE_OPT + /** @deprecated use encoder private options instead */ + attribute_deprecated + int pre_me; +#endif + + /** + * motion estimation prepass comparison function + * - encoding: Set by user. + * - decoding: unused + */ + int me_pre_cmp; + + /** + * ME prepass diamond size & shape + * - encoding: Set by user. + * - decoding: unused + */ + int pre_dia_size; + + /** + * subpel ME quality + * - encoding: Set by user. + * - decoding: unused + */ + int me_subpel_quality; + +#if FF_API_AFD + /** + * DTG active format information (additional aspect ratio + * information only used in DVB MPEG-2 transport streams) + * 0 if not set. + * + * - encoding: unused + * - decoding: Set by decoder. + * @deprecated Deprecated in favor of AVSideData + */ + attribute_deprecated int dtg_active_format; +#define FF_DTG_AFD_SAME 8 +#define FF_DTG_AFD_4_3 9 +#define FF_DTG_AFD_16_9 10 +#define FF_DTG_AFD_14_9 11 +#define FF_DTG_AFD_4_3_SP_14_9 13 +#define FF_DTG_AFD_16_9_SP_14_9 14 +#define FF_DTG_AFD_SP_4_3 15 +#endif /* FF_API_AFD */ + + /** + * maximum motion estimation search range in subpel units + * If 0 then no limit. + * + * - encoding: Set by user. + * - decoding: unused + */ + int me_range; + +#if FF_API_QUANT_BIAS + /** + * @deprecated use encoder private option instead + */ + attribute_deprecated int intra_quant_bias; +#define FF_DEFAULT_QUANT_BIAS 999999 + + /** + * @deprecated use encoder private option instead + */ + attribute_deprecated int inter_quant_bias; +#endif + + /** + * slice flags + * - encoding: unused + * - decoding: Set by user. + */ + int slice_flags; +#define SLICE_FLAG_CODED_ORDER 0x0001 ///< draw_horiz_band() is called in coded order instead of display +#define SLICE_FLAG_ALLOW_FIELD 0x0002 ///< allow draw_horiz_band() with field slices (MPEG2 field pics) +#define SLICE_FLAG_ALLOW_PLANE 0x0004 ///< allow draw_horiz_band() with 1 component at a time (SVQ1) + +#if FF_API_XVMC + /** + * XVideo Motion Acceleration + * - encoding: forbidden + * - decoding: set by decoder + * @deprecated XvMC doesn't need it anymore. + */ + attribute_deprecated int xvmc_acceleration; +#endif /* FF_API_XVMC */ + + /** + * macroblock decision mode + * - encoding: Set by user. + * - decoding: unused + */ + int mb_decision; +#define FF_MB_DECISION_SIMPLE 0 ///< uses mb_cmp +#define FF_MB_DECISION_BITS 1 ///< chooses the one which needs the fewest bits +#define FF_MB_DECISION_RD 2 ///< rate distortion + + /** + * custom intra quantization matrix + * - encoding: Set by user, can be NULL. + * - decoding: Set by libavcodec. + */ + uint16_t *intra_matrix; + + /** + * custom inter quantization matrix + * - encoding: Set by user, can be NULL. + * - decoding: Set by libavcodec. + */ + uint16_t *inter_matrix; + +#if FF_API_PRIVATE_OPT + /** @deprecated use encoder private options instead */ + attribute_deprecated + int scenechange_threshold; + + /** @deprecated use encoder private options instead */ + attribute_deprecated + int noise_reduction; +#endif + +#if FF_API_MPV_OPT + /** + * @deprecated this field is unused + */ + attribute_deprecated + int me_threshold; + + /** + * @deprecated this field is unused + */ + attribute_deprecated + int mb_threshold; +#endif + + /** + * precision of the intra DC coefficient - 8 + * - encoding: Set by user. + * - decoding: Set by libavcodec + */ + int intra_dc_precision; + + /** + * Number of macroblock rows at the top which are skipped. + * - encoding: unused + * - decoding: Set by user. + */ + int skip_top; + + /** + * Number of macroblock rows at the bottom which are skipped. + * - encoding: unused + * - decoding: Set by user. + */ + int skip_bottom; + +#if FF_API_MPV_OPT + /** + * @deprecated use encoder private options instead + */ + attribute_deprecated + float border_masking; +#endif + + /** + * minimum MB lagrange multipler + * - encoding: Set by user. + * - decoding: unused + */ + int mb_lmin; + + /** + * maximum MB lagrange multipler + * - encoding: Set by user. + * - decoding: unused + */ + int mb_lmax; + +#if FF_API_PRIVATE_OPT + /** + * @deprecated use encoder private options instead + */ + attribute_deprecated + int me_penalty_compensation; +#endif + + /** + * + * - encoding: Set by user. + * - decoding: unused + */ + int bidir_refine; + +#if FF_API_PRIVATE_OPT + /** @deprecated use encoder private options instead */ + attribute_deprecated + int brd_scale; +#endif + + /** + * minimum GOP size + * - encoding: Set by user. + * - decoding: unused + */ + int keyint_min; + + /** + * number of reference frames + * - encoding: Set by user. + * - decoding: Set by lavc. + */ + int refs; + +#if FF_API_PRIVATE_OPT + /** @deprecated use encoder private options instead */ + attribute_deprecated + int chromaoffset; +#endif + +#if FF_API_UNUSED_MEMBERS + /** + * Multiplied by qscale for each frame and added to scene_change_score. + * - encoding: Set by user. + * - decoding: unused + */ + attribute_deprecated int scenechange_factor; +#endif + + /** + * + * Note: Value depends upon the compare function used for fullpel ME. + * - encoding: Set by user. + * - decoding: unused + */ + int mv0_threshold; + +#if FF_API_PRIVATE_OPT + /** @deprecated use encoder private options instead */ + attribute_deprecated + int b_sensitivity; +#endif + + /** + * Chromaticity coordinates of the source primaries. + * - encoding: Set by user + * - decoding: Set by libavcodec + */ + enum AVColorPrimaries color_primaries; + + /** + * Color Transfer Characteristic. + * - encoding: Set by user + * - decoding: Set by libavcodec + */ + enum AVColorTransferCharacteristic color_trc; + + /** + * YUV colorspace type. + * - encoding: Set by user + * - decoding: Set by libavcodec + */ + enum AVColorSpace colorspace; + + /** + * MPEG vs JPEG YUV range. + * - encoding: Set by user + * - decoding: Set by libavcodec + */ + enum AVColorRange color_range; + + /** + * This defines the location of chroma samples. + * - encoding: Set by user + * - decoding: Set by libavcodec + */ + enum AVChromaLocation chroma_sample_location; + + /** + * Number of slices. + * Indicates number of picture subdivisions. Used for parallelized + * decoding. + * - encoding: Set by user + * - decoding: unused + */ + int slices; + + /** Field order + * - encoding: set by libavcodec + * - decoding: Set by user. + */ + enum AVFieldOrder field_order; + + /* audio only */ + int sample_rate; ///< samples per second + int channels; ///< number of audio channels + + /** + * audio sample format + * - encoding: Set by user. + * - decoding: Set by libavcodec. + */ + enum AVSampleFormat sample_fmt; ///< sample format + + /* The following data should not be initialized. */ + /** + * Number of samples per channel in an audio frame. + * + * - encoding: set by libavcodec in avcodec_open2(). Each submitted frame + * except the last must contain exactly frame_size samples per channel. + * May be 0 when the codec has AV_CODEC_CAP_VARIABLE_FRAME_SIZE set, then the + * frame size is not restricted. + * - decoding: may be set by some decoders to indicate constant frame size + */ + int frame_size; + + /** + * Frame counter, set by libavcodec. + * + * - decoding: total number of frames returned from the decoder so far. + * - encoding: total number of frames passed to the encoder so far. + * + * @note the counter is not incremented if encoding/decoding resulted in + * an error. + */ + int frame_number; + + /** + * number of bytes per packet if constant and known or 0 + * Used by some WAV based audio codecs. + */ + int block_align; + + /** + * Audio cutoff bandwidth (0 means "automatic") + * - encoding: Set by user. + * - decoding: unused + */ + int cutoff; + + /** + * Audio channel layout. + * - encoding: set by user. + * - decoding: set by user, may be overwritten by libavcodec. + */ + uint64_t channel_layout; + + /** + * Request decoder to use this channel layout if it can (0 for default) + * - encoding: unused + * - decoding: Set by user. + */ + uint64_t request_channel_layout; + + /** + * Type of service that the audio stream conveys. + * - encoding: Set by user. + * - decoding: Set by libavcodec. + */ + enum AVAudioServiceType audio_service_type; + + /** + * desired sample format + * - encoding: Not used. + * - decoding: Set by user. + * Decoder will decode to this format if it can. + */ + enum AVSampleFormat request_sample_fmt; + + /** + * This callback is called at the beginning of each frame to get data + * buffer(s) for it. There may be one contiguous buffer for all the data or + * there may be a buffer per each data plane or anything in between. What + * this means is, you may set however many entries in buf[] you feel necessary. + * Each buffer must be reference-counted using the AVBuffer API (see description + * of buf[] below). + * + * The following fields will be set in the frame before this callback is + * called: + * - format + * - width, height (video only) + * - sample_rate, channel_layout, nb_samples (audio only) + * Their values may differ from the corresponding values in + * AVCodecContext. This callback must use the frame values, not the codec + * context values, to calculate the required buffer size. + * + * This callback must fill the following fields in the frame: + * - data[] + * - linesize[] + * - extended_data: + * * if the data is planar audio with more than 8 channels, then this + * callback must allocate and fill extended_data to contain all pointers + * to all data planes. data[] must hold as many pointers as it can. + * extended_data must be allocated with av_malloc() and will be freed in + * av_frame_unref(). + * * otherwise exended_data must point to data + * - buf[] must contain one or more pointers to AVBufferRef structures. Each of + * the frame's data and extended_data pointers must be contained in these. That + * is, one AVBufferRef for each allocated chunk of memory, not necessarily one + * AVBufferRef per data[] entry. See: av_buffer_create(), av_buffer_alloc(), + * and av_buffer_ref(). + * - extended_buf and nb_extended_buf must be allocated with av_malloc() by + * this callback and filled with the extra buffers if there are more + * buffers than buf[] can hold. extended_buf will be freed in + * av_frame_unref(). + * + * If AV_CODEC_CAP_DR1 is not set then get_buffer2() must call + * avcodec_default_get_buffer2() instead of providing buffers allocated by + * some other means. + * + * Each data plane must be aligned to the maximum required by the target + * CPU. + * + * @see avcodec_default_get_buffer2() + * + * Video: + * + * If AV_GET_BUFFER_FLAG_REF is set in flags then the frame may be reused + * (read and/or written to if it is writable) later by libavcodec. + * + * avcodec_align_dimensions2() should be used to find the required width and + * height, as they normally need to be rounded up to the next multiple of 16. + * + * Some decoders do not support linesizes changing between frames. + * + * If frame multithreading is used and thread_safe_callbacks is set, + * this callback may be called from a different thread, but not from more + * than one at once. Does not need to be reentrant. + * + * @see avcodec_align_dimensions2() + * + * Audio: + * + * Decoders request a buffer of a particular size by setting + * AVFrame.nb_samples prior to calling get_buffer2(). The decoder may, + * however, utilize only part of the buffer by setting AVFrame.nb_samples + * to a smaller value in the output frame. + * + * As a convenience, av_samples_get_buffer_size() and + * av_samples_fill_arrays() in libavutil may be used by custom get_buffer2() + * functions to find the required data size and to fill data pointers and + * linesize. In AVFrame.linesize, only linesize[0] may be set for audio + * since all planes must be the same size. + * + * @see av_samples_get_buffer_size(), av_samples_fill_arrays() + * + * - encoding: unused + * - decoding: Set by libavcodec, user can override. + */ + int (*get_buffer2)(struct AVCodecContext *s, AVFrame *frame, int flags); + + /** + * If non-zero, the decoded audio and video frames returned from + * avcodec_decode_video2() and avcodec_decode_audio4() are reference-counted + * and are valid indefinitely. The caller must free them with + * av_frame_unref() when they are not needed anymore. + * Otherwise, the decoded frames must not be freed by the caller and are + * only valid until the next decode call. + * + * - encoding: unused + * - decoding: set by the caller before avcodec_open2(). + */ + int refcounted_frames; + + /* - encoding parameters */ + float qcompress; ///< amount of qscale change between easy & hard scenes (0.0-1.0) + float qblur; ///< amount of qscale smoothing over time (0.0-1.0) + + /** + * minimum quantizer + * - encoding: Set by user. + * - decoding: unused + */ + int qmin; + + /** + * maximum quantizer + * - encoding: Set by user. + * - decoding: unused + */ + int qmax; + + /** + * maximum quantizer difference between frames + * - encoding: Set by user. + * - decoding: unused + */ + int max_qdiff; + +#if FF_API_MPV_OPT + /** + * @deprecated use encoder private options instead + */ + attribute_deprecated + float rc_qsquish; + + attribute_deprecated + float rc_qmod_amp; + attribute_deprecated + int rc_qmod_freq; +#endif + + /** + * decoder bitstream buffer size + * - encoding: Set by user. + * - decoding: unused + */ + int rc_buffer_size; + + /** + * ratecontrol override, see RcOverride + * - encoding: Allocated/set/freed by user. + * - decoding: unused + */ + int rc_override_count; + RcOverride *rc_override; + +#if FF_API_MPV_OPT + /** + * @deprecated use encoder private options instead + */ + attribute_deprecated + const char *rc_eq; +#endif + + /** + * maximum bitrate + * - encoding: Set by user. + * - decoding: Set by user, may be overwritten by libavcodec. + */ + int64_t rc_max_rate; + + /** + * minimum bitrate + * - encoding: Set by user. + * - decoding: unused + */ + int64_t rc_min_rate; + +#if FF_API_MPV_OPT + /** + * @deprecated use encoder private options instead + */ + attribute_deprecated + float rc_buffer_aggressivity; + + attribute_deprecated + float rc_initial_cplx; +#endif + + /** + * Ratecontrol attempt to use, at maximum, of what can be used without an underflow. + * - encoding: Set by user. + * - decoding: unused. + */ + float rc_max_available_vbv_use; + + /** + * Ratecontrol attempt to use, at least, times the amount needed to prevent a vbv overflow. + * - encoding: Set by user. + * - decoding: unused. + */ + float rc_min_vbv_overflow_use; + + /** + * Number of bits which should be loaded into the rc buffer before decoding starts. + * - encoding: Set by user. + * - decoding: unused + */ + int rc_initial_buffer_occupancy; + +#if FF_API_CODER_TYPE +#define FF_CODER_TYPE_VLC 0 +#define FF_CODER_TYPE_AC 1 +#define FF_CODER_TYPE_RAW 2 +#define FF_CODER_TYPE_RLE 3 +#if FF_API_UNUSED_MEMBERS +#define FF_CODER_TYPE_DEFLATE 4 +#endif /* FF_API_UNUSED_MEMBERS */ + /** + * @deprecated use encoder private options instead + */ + attribute_deprecated + int coder_type; +#endif /* FF_API_CODER_TYPE */ + +#if FF_API_PRIVATE_OPT + /** @deprecated use encoder private options instead */ + attribute_deprecated + int context_model; +#endif + +#if FF_API_MPV_OPT + /** + * @deprecated use encoder private options instead + */ + attribute_deprecated + int lmin; + + /** + * @deprecated use encoder private options instead + */ + attribute_deprecated + int lmax; +#endif + +#if FF_API_PRIVATE_OPT + /** @deprecated use encoder private options instead */ + attribute_deprecated + int frame_skip_threshold; + + /** @deprecated use encoder private options instead */ + attribute_deprecated + int frame_skip_factor; + + /** @deprecated use encoder private options instead */ + attribute_deprecated + int frame_skip_exp; + + /** @deprecated use encoder private options instead */ + attribute_deprecated + int frame_skip_cmp; +#endif /* FF_API_PRIVATE_OPT */ + + /** + * trellis RD quantization + * - encoding: Set by user. + * - decoding: unused + */ + int trellis; + +#if FF_API_PRIVATE_OPT + /** @deprecated use encoder private options instead */ + attribute_deprecated + int min_prediction_order; + + /** @deprecated use encoder private options instead */ + attribute_deprecated + int max_prediction_order; + + /** @deprecated use encoder private options instead */ + attribute_deprecated + int64_t timecode_frame_start; +#endif + +#if FF_API_RTP_CALLBACK + /** + * @deprecated unused + */ + /* The RTP callback: This function is called */ + /* every time the encoder has a packet to send. */ + /* It depends on the encoder if the data starts */ + /* with a Start Code (it should). H.263 does. */ + /* mb_nb contains the number of macroblocks */ + /* encoded in the RTP payload. */ + attribute_deprecated + void (*rtp_callback)(struct AVCodecContext *avctx, void *data, int size, int mb_nb); +#endif + +#if FF_API_PRIVATE_OPT + /** @deprecated use encoder private options instead */ + attribute_deprecated + int rtp_payload_size; /* The size of the RTP payload: the coder will */ + /* do its best to deliver a chunk with size */ + /* below rtp_payload_size, the chunk will start */ + /* with a start code on some codecs like H.263. */ + /* This doesn't take account of any particular */ + /* headers inside the transmitted RTP payload. */ +#endif + +#if FF_API_STAT_BITS + /* statistics, used for 2-pass encoding */ + attribute_deprecated + int mv_bits; + attribute_deprecated + int header_bits; + attribute_deprecated + int i_tex_bits; + attribute_deprecated + int p_tex_bits; + attribute_deprecated + int i_count; + attribute_deprecated + int p_count; + attribute_deprecated + int skip_count; + attribute_deprecated + int misc_bits; + + /** @deprecated this field is unused */ + attribute_deprecated + int frame_bits; +#endif + + /** + * pass1 encoding statistics output buffer + * - encoding: Set by libavcodec. + * - decoding: unused + */ + char *stats_out; + + /** + * pass2 encoding statistics input buffer + * Concatenated stuff from stats_out of pass1 should be placed here. + * - encoding: Allocated/set/freed by user. + * - decoding: unused + */ + char *stats_in; + + /** + * Work around bugs in encoders which sometimes cannot be detected automatically. + * - encoding: Set by user + * - decoding: Set by user + */ + int workaround_bugs; +#define FF_BUG_AUTODETECT 1 ///< autodetection +#if FF_API_OLD_MSMPEG4 +#define FF_BUG_OLD_MSMPEG4 2 +#endif +#define FF_BUG_XVID_ILACE 4 +#define FF_BUG_UMP4 8 +#define FF_BUG_NO_PADDING 16 +#define FF_BUG_AMV 32 +#if FF_API_AC_VLC +#define FF_BUG_AC_VLC 0 ///< Will be removed, libavcodec can now handle these non-compliant files by default. +#endif +#define FF_BUG_QPEL_CHROMA 64 +#define FF_BUG_STD_QPEL 128 +#define FF_BUG_QPEL_CHROMA2 256 +#define FF_BUG_DIRECT_BLOCKSIZE 512 +#define FF_BUG_EDGE 1024 +#define FF_BUG_HPEL_CHROMA 2048 +#define FF_BUG_DC_CLIP 4096 +#define FF_BUG_MS 8192 ///< Work around various bugs in Microsoft's broken decoders. +#define FF_BUG_TRUNCATED 16384 + + /** + * strictly follow the standard (MPEG4, ...). + * - encoding: Set by user. + * - decoding: Set by user. + * Setting this to STRICT or higher means the encoder and decoder will + * generally do stupid things, whereas setting it to unofficial or lower + * will mean the encoder might produce output that is not supported by all + * spec-compliant decoders. Decoders don't differentiate between normal, + * unofficial and experimental (that is, they always try to decode things + * when they can) unless they are explicitly asked to behave stupidly + * (=strictly conform to the specs) + */ + int strict_std_compliance; +#define FF_COMPLIANCE_VERY_STRICT 2 ///< Strictly conform to an older more strict version of the spec or reference software. +#define FF_COMPLIANCE_STRICT 1 ///< Strictly conform to all the things in the spec no matter what consequences. +#define FF_COMPLIANCE_NORMAL 0 +#define FF_COMPLIANCE_UNOFFICIAL -1 ///< Allow unofficial extensions +#define FF_COMPLIANCE_EXPERIMENTAL -2 ///< Allow nonstandardized experimental things. + + /** + * error concealment flags + * - encoding: unused + * - decoding: Set by user. + */ + int error_concealment; +#define FF_EC_GUESS_MVS 1 +#define FF_EC_DEBLOCK 2 +#define FF_EC_FAVOR_INTER 256 + + /** + * debug + * - encoding: Set by user. + * - decoding: Set by user. + */ + int debug; +#define FF_DEBUG_PICT_INFO 1 +#define FF_DEBUG_RC 2 +#define FF_DEBUG_BITSTREAM 4 +#define FF_DEBUG_MB_TYPE 8 +#define FF_DEBUG_QP 16 +#if FF_API_DEBUG_MV +/** + * @deprecated this option does nothing + */ +#define FF_DEBUG_MV 32 +#endif +#define FF_DEBUG_DCT_COEFF 0x00000040 +#define FF_DEBUG_SKIP 0x00000080 +#define FF_DEBUG_STARTCODE 0x00000100 +#if FF_API_UNUSED_MEMBERS +#define FF_DEBUG_PTS 0x00000200 +#endif /* FF_API_UNUSED_MEMBERS */ +#define FF_DEBUG_ER 0x00000400 +#define FF_DEBUG_MMCO 0x00000800 +#define FF_DEBUG_BUGS 0x00001000 +#if FF_API_DEBUG_MV +#define FF_DEBUG_VIS_QP 0x00002000 ///< only access through AVOptions from outside libavcodec +#define FF_DEBUG_VIS_MB_TYPE 0x00004000 ///< only access through AVOptions from outside libavcodec +#endif +#define FF_DEBUG_BUFFERS 0x00008000 +#define FF_DEBUG_THREADS 0x00010000 +#define FF_DEBUG_GREEN_MD 0x00800000 +#define FF_DEBUG_NOMC 0x01000000 + +#if FF_API_DEBUG_MV + /** + * debug + * Code outside libavcodec should access this field using AVOptions + * - encoding: Set by user. + * - decoding: Set by user. + */ + int debug_mv; +#define FF_DEBUG_VIS_MV_P_FOR 0x00000001 //visualize forward predicted MVs of P frames +#define FF_DEBUG_VIS_MV_B_FOR 0x00000002 //visualize forward predicted MVs of B frames +#define FF_DEBUG_VIS_MV_B_BACK 0x00000004 //visualize backward predicted MVs of B frames +#endif + + /** + * Error recognition; may misdetect some more or less valid parts as errors. + * - encoding: unused + * - decoding: Set by user. + */ + int err_recognition; + +/** + * Verify checksums embedded in the bitstream (could be of either encoded or + * decoded data, depending on the codec) and print an error message on mismatch. + * If AV_EF_EXPLODE is also set, a mismatching checksum will result in the + * decoder returning an error. + */ +#define AV_EF_CRCCHECK (1<<0) +#define AV_EF_BITSTREAM (1<<1) ///< detect bitstream specification deviations +#define AV_EF_BUFFER (1<<2) ///< detect improper bitstream length +#define AV_EF_EXPLODE (1<<3) ///< abort decoding on minor error detection + +#define AV_EF_IGNORE_ERR (1<<15) ///< ignore errors and continue +#define AV_EF_CAREFUL (1<<16) ///< consider things that violate the spec, are fast to calculate and have not been seen in the wild as errors +#define AV_EF_COMPLIANT (1<<17) ///< consider all spec non compliances as errors +#define AV_EF_AGGRESSIVE (1<<18) ///< consider things that a sane encoder should not do as an error + + + /** + * opaque 64bit number (generally a PTS) that will be reordered and + * output in AVFrame.reordered_opaque + * - encoding: unused + * - decoding: Set by user. + */ + int64_t reordered_opaque; + + /** + * Hardware accelerator in use + * - encoding: unused. + * - decoding: Set by libavcodec + */ + struct AVHWAccel *hwaccel; + + /** + * Hardware accelerator context. + * For some hardware accelerators, a global context needs to be + * provided by the user. In that case, this holds display-dependent + * data FFmpeg cannot instantiate itself. Please refer to the + * FFmpeg HW accelerator documentation to know how to fill this + * is. e.g. for VA API, this is a struct vaapi_context. + * - encoding: unused + * - decoding: Set by user + */ + void *hwaccel_context; + + /** + * error + * - encoding: Set by libavcodec if flags & AV_CODEC_FLAG_PSNR. + * - decoding: unused + */ + uint64_t error[AV_NUM_DATA_POINTERS]; + + /** + * DCT algorithm, see FF_DCT_* below + * - encoding: Set by user. + * - decoding: unused + */ + int dct_algo; +#define FF_DCT_AUTO 0 +#define FF_DCT_FASTINT 1 +#define FF_DCT_INT 2 +#define FF_DCT_MMX 3 +#define FF_DCT_ALTIVEC 5 +#define FF_DCT_FAAN 6 + + /** + * IDCT algorithm, see FF_IDCT_* below. + * - encoding: Set by user. + * - decoding: Set by user. + */ + int idct_algo; +#define FF_IDCT_AUTO 0 +#define FF_IDCT_INT 1 +#define FF_IDCT_SIMPLE 2 +#define FF_IDCT_SIMPLEMMX 3 +#define FF_IDCT_ARM 7 +#define FF_IDCT_ALTIVEC 8 +#if FF_API_ARCH_SH4 +#define FF_IDCT_SH4 9 +#endif +#define FF_IDCT_SIMPLEARM 10 +#if FF_API_UNUSED_MEMBERS +#define FF_IDCT_IPP 13 +#endif /* FF_API_UNUSED_MEMBERS */ +#define FF_IDCT_XVID 14 +#if FF_API_IDCT_XVIDMMX +#define FF_IDCT_XVIDMMX 14 +#endif /* FF_API_IDCT_XVIDMMX */ +#define FF_IDCT_SIMPLEARMV5TE 16 +#define FF_IDCT_SIMPLEARMV6 17 +#if FF_API_ARCH_SPARC +#define FF_IDCT_SIMPLEVIS 18 +#endif +#define FF_IDCT_FAAN 20 +#define FF_IDCT_SIMPLENEON 22 +#if FF_API_ARCH_ALPHA +#define FF_IDCT_SIMPLEALPHA 23 +#endif +#define FF_IDCT_SIMPLEAUTO 128 + + /** + * bits per sample/pixel from the demuxer (needed for huffyuv). + * - encoding: Set by libavcodec. + * - decoding: Set by user. + */ + int bits_per_coded_sample; + + /** + * Bits per sample/pixel of internal libavcodec pixel/sample format. + * - encoding: set by user. + * - decoding: set by libavcodec. + */ + int bits_per_raw_sample; + +#if FF_API_LOWRES + /** + * low resolution decoding, 1-> 1/2 size, 2->1/4 size + * - encoding: unused + * - decoding: Set by user. + * Code outside libavcodec should access this field using: + * av_codec_{get,set}_lowres(avctx) + */ + int lowres; +#endif + +#if FF_API_CODED_FRAME + /** + * the picture in the bitstream + * - encoding: Set by libavcodec. + * - decoding: unused + * + * @deprecated use the quality factor packet side data instead + */ + attribute_deprecated AVFrame *coded_frame; +#endif + + /** + * thread count + * is used to decide how many independent tasks should be passed to execute() + * - encoding: Set by user. + * - decoding: Set by user. + */ + int thread_count; + + /** + * Which multithreading methods to use. + * Use of FF_THREAD_FRAME will increase decoding delay by one frame per thread, + * so clients which cannot provide future frames should not use it. + * + * - encoding: Set by user, otherwise the default is used. + * - decoding: Set by user, otherwise the default is used. + */ + int thread_type; +#define FF_THREAD_FRAME 1 ///< Decode more than one frame at once +#define FF_THREAD_SLICE 2 ///< Decode more than one part of a single frame at once + + /** + * Which multithreading methods are in use by the codec. + * - encoding: Set by libavcodec. + * - decoding: Set by libavcodec. + */ + int active_thread_type; + + /** + * Set by the client if its custom get_buffer() callback can be called + * synchronously from another thread, which allows faster multithreaded decoding. + * draw_horiz_band() will be called from other threads regardless of this setting. + * Ignored if the default get_buffer() is used. + * - encoding: Set by user. + * - decoding: Set by user. + */ + int thread_safe_callbacks; + + /** + * The codec may call this to execute several independent things. + * It will return only after finishing all tasks. + * The user may replace this with some multithreaded implementation, + * the default implementation will execute the parts serially. + * @param count the number of things to execute + * - encoding: Set by libavcodec, user can override. + * - decoding: Set by libavcodec, user can override. + */ + int (*execute)(struct AVCodecContext *c, int (*func)(struct AVCodecContext *c2, void *arg), void *arg2, int *ret, int count, int size); + + /** + * The codec may call this to execute several independent things. + * It will return only after finishing all tasks. + * The user may replace this with some multithreaded implementation, + * the default implementation will execute the parts serially. + * Also see avcodec_thread_init and e.g. the --enable-pthread configure option. + * @param c context passed also to func + * @param count the number of things to execute + * @param arg2 argument passed unchanged to func + * @param ret return values of executed functions, must have space for "count" values. May be NULL. + * @param func function that will be called count times, with jobnr from 0 to count-1. + * threadnr will be in the range 0 to c->thread_count-1 < MAX_THREADS and so that no + * two instances of func executing at the same time will have the same threadnr. + * @return always 0 currently, but code should handle a future improvement where when any call to func + * returns < 0 no further calls to func may be done and < 0 is returned. + * - encoding: Set by libavcodec, user can override. + * - decoding: Set by libavcodec, user can override. + */ + int (*execute2)(struct AVCodecContext *c, int (*func)(struct AVCodecContext *c2, void *arg, int jobnr, int threadnr), void *arg2, int *ret, int count); + + /** + * noise vs. sse weight for the nsse comparison function + * - encoding: Set by user. + * - decoding: unused + */ + int nsse_weight; + + /** + * profile + * - encoding: Set by user. + * - decoding: Set by libavcodec. + */ + int profile; +#define FF_PROFILE_UNKNOWN -99 +#define FF_PROFILE_RESERVED -100 + +#define FF_PROFILE_AAC_MAIN 0 +#define FF_PROFILE_AAC_LOW 1 +#define FF_PROFILE_AAC_SSR 2 +#define FF_PROFILE_AAC_LTP 3 +#define FF_PROFILE_AAC_HE 4 +#define FF_PROFILE_AAC_HE_V2 28 +#define FF_PROFILE_AAC_LD 22 +#define FF_PROFILE_AAC_ELD 38 +#define FF_PROFILE_MPEG2_AAC_LOW 128 +#define FF_PROFILE_MPEG2_AAC_HE 131 + +#define FF_PROFILE_DTS 20 +#define FF_PROFILE_DTS_ES 30 +#define FF_PROFILE_DTS_96_24 40 +#define FF_PROFILE_DTS_HD_HRA 50 +#define FF_PROFILE_DTS_HD_MA 60 +#define FF_PROFILE_DTS_EXPRESS 70 + +#define FF_PROFILE_MPEG2_422 0 +#define FF_PROFILE_MPEG2_HIGH 1 +#define FF_PROFILE_MPEG2_SS 2 +#define FF_PROFILE_MPEG2_SNR_SCALABLE 3 +#define FF_PROFILE_MPEG2_MAIN 4 +#define FF_PROFILE_MPEG2_SIMPLE 5 + +#define FF_PROFILE_H264_CONSTRAINED (1<<9) // 8+1; constraint_set1_flag +#define FF_PROFILE_H264_INTRA (1<<11) // 8+3; constraint_set3_flag + +#define FF_PROFILE_H264_BASELINE 66 +#define FF_PROFILE_H264_CONSTRAINED_BASELINE (66|FF_PROFILE_H264_CONSTRAINED) +#define FF_PROFILE_H264_MAIN 77 +#define FF_PROFILE_H264_EXTENDED 88 +#define FF_PROFILE_H264_HIGH 100 +#define FF_PROFILE_H264_HIGH_10 110 +#define FF_PROFILE_H264_HIGH_10_INTRA (110|FF_PROFILE_H264_INTRA) +#define FF_PROFILE_H264_HIGH_422 122 +#define FF_PROFILE_H264_HIGH_422_INTRA (122|FF_PROFILE_H264_INTRA) +#define FF_PROFILE_H264_HIGH_444 144 +#define FF_PROFILE_H264_HIGH_444_PREDICTIVE 244 +#define FF_PROFILE_H264_HIGH_444_INTRA (244|FF_PROFILE_H264_INTRA) +#define FF_PROFILE_H264_CAVLC_444 44 + +#define FF_PROFILE_VC1_SIMPLE 0 +#define FF_PROFILE_VC1_MAIN 1 +#define FF_PROFILE_VC1_COMPLEX 2 +#define FF_PROFILE_VC1_ADVANCED 3 + +#define FF_PROFILE_MPEG4_SIMPLE 0 +#define FF_PROFILE_MPEG4_SIMPLE_SCALABLE 1 +#define FF_PROFILE_MPEG4_CORE 2 +#define FF_PROFILE_MPEG4_MAIN 3 +#define FF_PROFILE_MPEG4_N_BIT 4 +#define FF_PROFILE_MPEG4_SCALABLE_TEXTURE 5 +#define FF_PROFILE_MPEG4_SIMPLE_FACE_ANIMATION 6 +#define FF_PROFILE_MPEG4_BASIC_ANIMATED_TEXTURE 7 +#define FF_PROFILE_MPEG4_HYBRID 8 +#define FF_PROFILE_MPEG4_ADVANCED_REAL_TIME 9 +#define FF_PROFILE_MPEG4_CORE_SCALABLE 10 +#define FF_PROFILE_MPEG4_ADVANCED_CODING 11 +#define FF_PROFILE_MPEG4_ADVANCED_CORE 12 +#define FF_PROFILE_MPEG4_ADVANCED_SCALABLE_TEXTURE 13 +#define FF_PROFILE_MPEG4_SIMPLE_STUDIO 14 +#define FF_PROFILE_MPEG4_ADVANCED_SIMPLE 15 + +#define FF_PROFILE_JPEG2000_CSTREAM_RESTRICTION_0 0 +#define FF_PROFILE_JPEG2000_CSTREAM_RESTRICTION_1 1 +#define FF_PROFILE_JPEG2000_CSTREAM_NO_RESTRICTION 2 +#define FF_PROFILE_JPEG2000_DCINEMA_2K 3 +#define FF_PROFILE_JPEG2000_DCINEMA_4K 4 + +#define FF_PROFILE_VP9_0 0 +#define FF_PROFILE_VP9_1 1 +#define FF_PROFILE_VP9_2 2 +#define FF_PROFILE_VP9_3 3 + +#define FF_PROFILE_HEVC_MAIN 1 +#define FF_PROFILE_HEVC_MAIN_10 2 +#define FF_PROFILE_HEVC_MAIN_STILL_PICTURE 3 +#define FF_PROFILE_HEVC_REXT 4 + + /** + * level + * - encoding: Set by user. + * - decoding: Set by libavcodec. + */ + int level; +#define FF_LEVEL_UNKNOWN -99 + + /** + * Skip loop filtering for selected frames. + * - encoding: unused + * - decoding: Set by user. + */ + enum AVDiscard skip_loop_filter; + + /** + * Skip IDCT/dequantization for selected frames. + * - encoding: unused + * - decoding: Set by user. + */ + enum AVDiscard skip_idct; + + /** + * Skip decoding for selected frames. + * - encoding: unused + * - decoding: Set by user. + */ + enum AVDiscard skip_frame; + + /** + * Header containing style information for text subtitles. + * For SUBTITLE_ASS subtitle type, it should contain the whole ASS + * [Script Info] and [V4+ Styles] section, plus the [Events] line and + * the Format line following. It shouldn't include any Dialogue line. + * - encoding: Set/allocated/freed by user (before avcodec_open2()) + * - decoding: Set/allocated/freed by libavcodec (by avcodec_open2()) + */ + uint8_t *subtitle_header; + int subtitle_header_size; + +#if FF_API_ERROR_RATE + /** + * @deprecated use the 'error_rate' private AVOption of the mpegvideo + * encoders + */ + attribute_deprecated + int error_rate; +#endif + +#if FF_API_VBV_DELAY + /** + * VBV delay coded in the last frame (in periods of a 27 MHz clock). + * Used for compliant TS muxing. + * - encoding: Set by libavcodec. + * - decoding: unused. + * @deprecated this value is now exported as a part of + * AV_PKT_DATA_CPB_PROPERTIES packet side data + */ + attribute_deprecated + uint64_t vbv_delay; +#endif + +#if FF_API_SIDEDATA_ONLY_PKT + /** + * Encoding only and set by default. Allow encoders to output packets + * that do not contain any encoded data, only side data. + * + * Some encoders need to output such packets, e.g. to update some stream + * parameters at the end of encoding. + * + * @deprecated this field disables the default behaviour and + * it is kept only for compatibility. + */ + attribute_deprecated + int side_data_only_packets; +#endif + + /** + * Audio only. The number of "priming" samples (padding) inserted by the + * encoder at the beginning of the audio. I.e. this number of leading + * decoded samples must be discarded by the caller to get the original audio + * without leading padding. + * + * - decoding: unused + * - encoding: Set by libavcodec. The timestamps on the output packets are + * adjusted by the encoder so that they always refer to the + * first sample of the data actually contained in the packet, + * including any added padding. E.g. if the timebase is + * 1/samplerate and the timestamp of the first input sample is + * 0, the timestamp of the first output packet will be + * -initial_padding. + */ + int initial_padding; + + /** + * - decoding: For codecs that store a framerate value in the compressed + * bitstream, the decoder may export it here. { 0, 1} when + * unknown. + * - encoding: unused + */ + AVRational framerate; + + /** + * Nominal unaccelerated pixel format, see AV_PIX_FMT_xxx. + * - encoding: unused. + * - decoding: Set by libavcodec before calling get_format() + */ + enum AVPixelFormat sw_pix_fmt; + + /** + * Timebase in which pkt_dts/pts and AVPacket.dts/pts are. + * Code outside libavcodec should access this field using: + * av_codec_{get,set}_pkt_timebase(avctx) + * - encoding unused. + * - decoding set by user. + */ + AVRational pkt_timebase; + + /** + * AVCodecDescriptor + * Code outside libavcodec should access this field using: + * av_codec_{get,set}_codec_descriptor(avctx) + * - encoding: unused. + * - decoding: set by libavcodec. + */ + const AVCodecDescriptor *codec_descriptor; + +#if !FF_API_LOWRES + /** + * low resolution decoding, 1-> 1/2 size, 2->1/4 size + * - encoding: unused + * - decoding: Set by user. + * Code outside libavcodec should access this field using: + * av_codec_{get,set}_lowres(avctx) + */ + int lowres; +#endif + + /** + * Current statistics for PTS correction. + * - decoding: maintained and used by libavcodec, not intended to be used by user apps + * - encoding: unused + */ + int64_t pts_correction_num_faulty_pts; /// Number of incorrect PTS values so far + int64_t pts_correction_num_faulty_dts; /// Number of incorrect DTS values so far + int64_t pts_correction_last_pts; /// PTS of the last frame + int64_t pts_correction_last_dts; /// DTS of the last frame + + /** + * Character encoding of the input subtitles file. + * - decoding: set by user + * - encoding: unused + */ + char *sub_charenc; + + /** + * Subtitles character encoding mode. Formats or codecs might be adjusting + * this setting (if they are doing the conversion themselves for instance). + * - decoding: set by libavcodec + * - encoding: unused + */ + int sub_charenc_mode; +#define FF_SUB_CHARENC_MODE_DO_NOTHING -1 ///< do nothing (demuxer outputs a stream supposed to be already in UTF-8, or the codec is bitmap for instance) +#define FF_SUB_CHARENC_MODE_AUTOMATIC 0 ///< libavcodec will select the mode itself +#define FF_SUB_CHARENC_MODE_PRE_DECODER 1 ///< the AVPacket data needs to be recoded to UTF-8 before being fed to the decoder, requires iconv + + /** + * Skip processing alpha if supported by codec. + * Note that if the format uses pre-multiplied alpha (common with VP6, + * and recommended due to better video quality/compression) + * the image will look as if alpha-blended onto a black background. + * However for formats that do not use pre-multiplied alpha + * there might be serious artefacts (though e.g. libswscale currently + * assumes pre-multiplied alpha anyway). + * Code outside libavcodec should access this field using AVOptions + * + * - decoding: set by user + * - encoding: unused + */ + int skip_alpha; + + /** + * Number of samples to skip after a discontinuity + * - decoding: unused + * - encoding: set by libavcodec + */ + int seek_preroll; + +#if !FF_API_DEBUG_MV + /** + * debug motion vectors + * Code outside libavcodec should access this field using AVOptions + * - encoding: Set by user. + * - decoding: Set by user. + */ + int debug_mv; +#define FF_DEBUG_VIS_MV_P_FOR 0x00000001 //visualize forward predicted MVs of P frames +#define FF_DEBUG_VIS_MV_B_FOR 0x00000002 //visualize forward predicted MVs of B frames +#define FF_DEBUG_VIS_MV_B_BACK 0x00000004 //visualize backward predicted MVs of B frames +#endif + + /** + * custom intra quantization matrix + * Code outside libavcodec should access this field using av_codec_g/set_chroma_intra_matrix() + * - encoding: Set by user, can be NULL. + * - decoding: unused. + */ + uint16_t *chroma_intra_matrix; + + /** + * dump format separator. + * can be ", " or "\n " or anything else + * Code outside libavcodec should access this field using AVOptions + * (NO direct access). + * - encoding: Set by user. + * - decoding: Set by user. + */ + uint8_t *dump_separator; + + /** + * ',' separated list of allowed decoders. + * If NULL then all are allowed + * - encoding: unused + * - decoding: set by user through AVOPtions (NO direct access) + */ + char *codec_whitelist; + + /* + * Properties of the stream that gets decoded + * To be accessed through av_codec_get_properties() (NO direct access) + * - encoding: unused + * - decoding: set by libavcodec + */ + unsigned properties; +#define FF_CODEC_PROPERTY_LOSSLESS 0x00000001 +#define FF_CODEC_PROPERTY_CLOSED_CAPTIONS 0x00000002 + + /** + * Additional data associated with the entire coded stream. + * + * - decoding: unused + * - encoding: may be set by libavcodec after avcodec_open2(). + */ + AVPacketSideData *coded_side_data; + int nb_coded_side_data; + +} AVCodecContext; + +AVRational av_codec_get_pkt_timebase (const AVCodecContext *avctx); +void av_codec_set_pkt_timebase (AVCodecContext *avctx, AVRational val); + +const AVCodecDescriptor *av_codec_get_codec_descriptor(const AVCodecContext *avctx); +void av_codec_set_codec_descriptor(AVCodecContext *avctx, const AVCodecDescriptor *desc); + +unsigned av_codec_get_codec_properties(const AVCodecContext *avctx); + +int av_codec_get_lowres(const AVCodecContext *avctx); +void av_codec_set_lowres(AVCodecContext *avctx, int val); + +int av_codec_get_seek_preroll(const AVCodecContext *avctx); +void av_codec_set_seek_preroll(AVCodecContext *avctx, int val); + +uint16_t *av_codec_get_chroma_intra_matrix(const AVCodecContext *avctx); +void av_codec_set_chroma_intra_matrix(AVCodecContext *avctx, uint16_t *val); + +/** + * AVProfile. + */ +typedef struct AVProfile { + int profile; + const char *name; ///< short name for the profile +} AVProfile; + +typedef struct AVCodecDefault AVCodecDefault; + +struct AVSubtitle; + +/** + * AVCodec. + */ +typedef struct AVCodec { + /** + * Name of the codec implementation. + * The name is globally unique among encoders and among decoders (but an + * encoder and a decoder can share the same name). + * This is the primary way to find a codec from the user perspective. + */ + const char *name; + /** + * Descriptive name for the codec, meant to be more human readable than name. + * You should use the NULL_IF_CONFIG_SMALL() macro to define it. + */ + const char *long_name; + enum AVMediaType type; + enum AVCodecID id; + /** + * Codec capabilities. + * see AV_CODEC_CAP_* + */ + int capabilities; + const AVRational *supported_framerates; ///< array of supported framerates, or NULL if any, array is terminated by {0,0} + const enum AVPixelFormat *pix_fmts; ///< array of supported pixel formats, or NULL if unknown, array is terminated by -1 + const int *supported_samplerates; ///< array of supported audio samplerates, or NULL if unknown, array is terminated by 0 + const enum AVSampleFormat *sample_fmts; ///< array of supported sample formats, or NULL if unknown, array is terminated by -1 + const uint64_t *channel_layouts; ///< array of support channel layouts, or NULL if unknown. array is terminated by 0 + uint8_t max_lowres; ///< maximum value for lowres supported by the decoder, no direct access, use av_codec_get_max_lowres() + const AVClass *priv_class; ///< AVClass for the private context + const AVProfile *profiles; ///< array of recognized profiles, or NULL if unknown, array is terminated by {FF_PROFILE_UNKNOWN} + + /***************************************************************** + * No fields below this line are part of the public API. They + * may not be used outside of libavcodec and can be changed and + * removed at will. + * New public fields should be added right above. + ***************************************************************** + */ + int priv_data_size; + struct AVCodec *next; + /** + * @name Frame-level threading support functions + * @{ + */ + /** + * If defined, called on thread contexts when they are created. + * If the codec allocates writable tables in init(), re-allocate them here. + * priv_data will be set to a copy of the original. + */ + int (*init_thread_copy)(AVCodecContext *); + /** + * Copy necessary context variables from a previous thread context to the current one. + * If not defined, the next thread will start automatically; otherwise, the codec + * must call ff_thread_finish_setup(). + * + * dst and src will (rarely) point to the same context, in which case memcpy should be skipped. + */ + int (*update_thread_context)(AVCodecContext *dst, const AVCodecContext *src); + /** @} */ + + /** + * Private codec-specific defaults. + */ + const AVCodecDefault *defaults; + + /** + * Initialize codec static data, called from avcodec_register(). + */ + void (*init_static_data)(struct AVCodec *codec); + + int (*init)(AVCodecContext *); + int (*encode_sub)(AVCodecContext *, uint8_t *buf, int buf_size, + const struct AVSubtitle *sub); + /** + * Encode data to an AVPacket. + * + * @param avctx codec context + * @param avpkt output AVPacket (may contain a user-provided buffer) + * @param[in] frame AVFrame containing the raw data to be encoded + * @param[out] got_packet_ptr encoder sets to 0 or 1 to indicate that a + * non-empty packet was returned in avpkt. + * @return 0 on success, negative error code on failure + */ + int (*encode2)(AVCodecContext *avctx, AVPacket *avpkt, const AVFrame *frame, + int *got_packet_ptr); + int (*decode)(AVCodecContext *, void *outdata, int *outdata_size, AVPacket *avpkt); + int (*close)(AVCodecContext *); + /** + * Flush buffers. + * Will be called when seeking + */ + void (*flush)(AVCodecContext *); + /** + * Internal codec capabilities. + * See FF_CODEC_CAP_* in internal.h + */ + int caps_internal; +} AVCodec; + +int av_codec_get_max_lowres(const AVCodec *codec); + +struct MpegEncContext; + +/** + * @defgroup lavc_hwaccel AVHWAccel + * @{ + */ +typedef struct AVHWAccel { + /** + * Name of the hardware accelerated codec. + * The name is globally unique among encoders and among decoders (but an + * encoder and a decoder can share the same name). + */ + const char *name; + + /** + * Type of codec implemented by the hardware accelerator. + * + * See AVMEDIA_TYPE_xxx + */ + enum AVMediaType type; + + /** + * Codec implemented by the hardware accelerator. + * + * See AV_CODEC_ID_xxx + */ + enum AVCodecID id; + + /** + * Supported pixel format. + * + * Only hardware accelerated formats are supported here. + */ + enum AVPixelFormat pix_fmt; + + /** + * Hardware accelerated codec capabilities. + * see HWACCEL_CODEC_CAP_* + */ + int capabilities; + + /***************************************************************** + * No fields below this line are part of the public API. They + * may not be used outside of libavcodec and can be changed and + * removed at will. + * New public fields should be added right above. + ***************************************************************** + */ + struct AVHWAccel *next; + + /** + * Allocate a custom buffer + */ + int (*alloc_frame)(AVCodecContext *avctx, AVFrame *frame); + + /** + * Called at the beginning of each frame or field picture. + * + * Meaningful frame information (codec specific) is guaranteed to + * be parsed at this point. This function is mandatory. + * + * Note that buf can be NULL along with buf_size set to 0. + * Otherwise, this means the whole frame is available at this point. + * + * @param avctx the codec context + * @param buf the frame data buffer base + * @param buf_size the size of the frame in bytes + * @return zero if successful, a negative value otherwise + */ + int (*start_frame)(AVCodecContext *avctx, const uint8_t *buf, uint32_t buf_size); + + /** + * Callback for each slice. + * + * Meaningful slice information (codec specific) is guaranteed to + * be parsed at this point. This function is mandatory. + * The only exception is XvMC, that works on MB level. + * + * @param avctx the codec context + * @param buf the slice data buffer base + * @param buf_size the size of the slice in bytes + * @return zero if successful, a negative value otherwise + */ + int (*decode_slice)(AVCodecContext *avctx, const uint8_t *buf, uint32_t buf_size); + + /** + * Called at the end of each frame or field picture. + * + * The whole picture is parsed at this point and can now be sent + * to the hardware accelerator. This function is mandatory. + * + * @param avctx the codec context + * @return zero if successful, a negative value otherwise + */ + int (*end_frame)(AVCodecContext *avctx); + + /** + * Size of per-frame hardware accelerator private data. + * + * Private data is allocated with av_mallocz() before + * AVCodecContext.get_buffer() and deallocated after + * AVCodecContext.release_buffer(). + */ + int frame_priv_data_size; + + /** + * Called for every Macroblock in a slice. + * + * XvMC uses it to replace the ff_mpv_decode_mb(). + * Instead of decoding to raw picture, MB parameters are + * stored in an array provided by the video driver. + * + * @param s the mpeg context + */ + void (*decode_mb)(struct MpegEncContext *s); + + /** + * Initialize the hwaccel private data. + * + * This will be called from ff_get_format(), after hwaccel and + * hwaccel_context are set and the hwaccel private data in AVCodecInternal + * is allocated. + */ + int (*init)(AVCodecContext *avctx); + + /** + * Uninitialize the hwaccel private data. + * + * This will be called from get_format() or avcodec_close(), after hwaccel + * and hwaccel_context are already uninitialized. + */ + int (*uninit)(AVCodecContext *avctx); + + /** + * Size of the private data to allocate in + * AVCodecInternal.hwaccel_priv_data. + */ + int priv_data_size; +} AVHWAccel; + +/** + * Hardware acceleration should be used for decoding even if the codec level + * used is unknown or higher than the maximum supported level reported by the + * hardware driver. + * + * It's generally a good idea to pass this flag unless you have a specific + * reason not to, as hardware tends to under-report supported levels. + */ +#define AV_HWACCEL_FLAG_IGNORE_LEVEL (1 << 0) + +/** + * Hardware acceleration can output YUV pixel formats with a different chroma + * sampling than 4:2:0 and/or other than 8 bits per component. + */ +#define AV_HWACCEL_FLAG_ALLOW_HIGH_DEPTH (1 << 1) + +/** + * @} + */ + +#if FF_API_AVPICTURE +/** + * @defgroup lavc_picture AVPicture + * + * Functions for working with AVPicture + * @{ + */ + +/** + * Picture data structure. + * + * Up to four components can be stored into it, the last component is + * alpha. + * @deprecated use AVFrame or imgutils functions instead + */ +typedef struct AVPicture { + attribute_deprecated + uint8_t *data[AV_NUM_DATA_POINTERS]; ///< pointers to the image data planes + attribute_deprecated + int linesize[AV_NUM_DATA_POINTERS]; ///< number of bytes per line +} AVPicture; + +/** + * @} + */ +#endif + +enum AVSubtitleType { + SUBTITLE_NONE, + + SUBTITLE_BITMAP, ///< A bitmap, pict will be set + + /** + * Plain text, the text field must be set by the decoder and is + * authoritative. ass and pict fields may contain approximations. + */ + SUBTITLE_TEXT, + + /** + * Formatted text, the ass field must be set by the decoder and is + * authoritative. pict and text fields may contain approximations. + */ + SUBTITLE_ASS, +}; + +#define AV_SUBTITLE_FLAG_FORCED 0x00000001 + +typedef struct AVSubtitleRect { + int x; ///< top left corner of pict, undefined when pict is not set + int y; ///< top left corner of pict, undefined when pict is not set + int w; ///< width of pict, undefined when pict is not set + int h; ///< height of pict, undefined when pict is not set + int nb_colors; ///< number of colors in pict, undefined when pict is not set + +#if FF_API_AVPICTURE + /** + * @deprecated unused + */ + attribute_deprecated + AVPicture pict; +#endif + /** + * data+linesize for the bitmap of this subtitle. + * Can be set for text/ass as well once they are rendered. + */ + uint8_t *data[4]; + int linesize[4]; + + enum AVSubtitleType type; + + char *text; ///< 0 terminated plain UTF-8 text + + /** + * 0 terminated ASS/SSA compatible event line. + * The presentation of this is unaffected by the other values in this + * struct. + */ + char *ass; + + int flags; +} AVSubtitleRect; + +typedef struct AVSubtitle { + uint16_t format; /* 0 = graphics */ + uint32_t start_display_time; /* relative to packet pts, in ms */ + uint32_t end_display_time; /* relative to packet pts, in ms */ + unsigned num_rects; + AVSubtitleRect **rects; + int64_t pts; ///< Same as packet pts, in AV_TIME_BASE +} AVSubtitle; + +/** + * If c is NULL, returns the first registered codec, + * if c is non-NULL, returns the next registered codec after c, + * or NULL if c is the last one. + */ +AVCodec *av_codec_next(const AVCodec *c); + +/** + * Return the LIBAVCODEC_VERSION_INT constant. + */ +unsigned avcodec_version(void); + +/** + * Return the libavcodec build-time configuration. + */ +const char *avcodec_configuration(void); + +/** + * Return the libavcodec license. + */ +const char *avcodec_license(void); + +/** + * Register the codec codec and initialize libavcodec. + * + * @warning either this function or avcodec_register_all() must be called + * before any other libavcodec functions. + * + * @see avcodec_register_all() + */ +void avcodec_register(AVCodec *codec); + +/** + * Register all the codecs, parsers and bitstream filters which were enabled at + * configuration time. If you do not call this function you can select exactly + * which formats you want to support, by using the individual registration + * functions. + * + * @see avcodec_register + * @see av_register_codec_parser + * @see av_register_bitstream_filter + */ +void avcodec_register_all(void); + +/** + * Allocate an AVCodecContext and set its fields to default values. The + * resulting struct should be freed with avcodec_free_context(). + * + * @param codec if non-NULL, allocate private data and initialize defaults + * for the given codec. It is illegal to then call avcodec_open2() + * with a different codec. + * If NULL, then the codec-specific defaults won't be initialized, + * which may result in suboptimal default settings (this is + * important mainly for encoders, e.g. libx264). + * + * @return An AVCodecContext filled with default values or NULL on failure. + * @see avcodec_get_context_defaults + */ +AVCodecContext *avcodec_alloc_context3(const AVCodec *codec); + +/** + * Free the codec context and everything associated with it and write NULL to + * the provided pointer. + */ +void avcodec_free_context(AVCodecContext **avctx); + +/** + * Set the fields of the given AVCodecContext to default values corresponding + * to the given codec (defaults may be codec-dependent). + * + * Do not call this function if a non-NULL codec has been passed + * to avcodec_alloc_context3() that allocated this AVCodecContext. + * If codec is non-NULL, it is illegal to call avcodec_open2() with a + * different codec on this AVCodecContext. + */ +int avcodec_get_context_defaults3(AVCodecContext *s, const AVCodec *codec); + +/** + * Get the AVClass for AVCodecContext. It can be used in combination with + * AV_OPT_SEARCH_FAKE_OBJ for examining options. + * + * @see av_opt_find(). + */ +const AVClass *avcodec_get_class(void); + +/** + * Get the AVClass for AVFrame. It can be used in combination with + * AV_OPT_SEARCH_FAKE_OBJ for examining options. + * + * @see av_opt_find(). + */ +const AVClass *avcodec_get_frame_class(void); + +/** + * Get the AVClass for AVSubtitleRect. It can be used in combination with + * AV_OPT_SEARCH_FAKE_OBJ for examining options. + * + * @see av_opt_find(). + */ +const AVClass *avcodec_get_subtitle_rect_class(void); + +/** + * Copy the settings of the source AVCodecContext into the destination + * AVCodecContext. The resulting destination codec context will be + * unopened, i.e. you are required to call avcodec_open2() before you + * can use this AVCodecContext to decode/encode video/audio data. + * + * @param dest target codec context, should be initialized with + * avcodec_alloc_context3(NULL), but otherwise uninitialized + * @param src source codec context + * @return AVERROR() on error (e.g. memory allocation error), 0 on success + */ +int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src); + +/** + * Initialize the AVCodecContext to use the given AVCodec. Prior to using this + * function the context has to be allocated with avcodec_alloc_context3(). + * + * The functions avcodec_find_decoder_by_name(), avcodec_find_encoder_by_name(), + * avcodec_find_decoder() and avcodec_find_encoder() provide an easy way for + * retrieving a codec. + * + * @warning This function is not thread safe! + * + * @note Always call this function before using decoding routines (such as + * @ref avcodec_decode_video2()). + * + * @code + * avcodec_register_all(); + * av_dict_set(&opts, "b", "2.5M", 0); + * codec = avcodec_find_decoder(AV_CODEC_ID_H264); + * if (!codec) + * exit(1); + * + * context = avcodec_alloc_context3(codec); + * + * if (avcodec_open2(context, codec, opts) < 0) + * exit(1); + * @endcode + * + * @param avctx The context to initialize. + * @param codec The codec to open this context for. If a non-NULL codec has been + * previously passed to avcodec_alloc_context3() or + * avcodec_get_context_defaults3() for this context, then this + * parameter MUST be either NULL or equal to the previously passed + * codec. + * @param options A dictionary filled with AVCodecContext and codec-private options. + * On return this object will be filled with options that were not found. + * + * @return zero on success, a negative value on error + * @see avcodec_alloc_context3(), avcodec_find_decoder(), avcodec_find_encoder(), + * av_dict_set(), av_opt_find(). + */ +int avcodec_open2(AVCodecContext *avctx, const AVCodec *codec, AVDictionary **options); + +/** + * Close a given AVCodecContext and free all the data associated with it + * (but not the AVCodecContext itself). + * + * Calling this function on an AVCodecContext that hasn't been opened will free + * the codec-specific data allocated in avcodec_alloc_context3() / + * avcodec_get_context_defaults3() with a non-NULL codec. Subsequent calls will + * do nothing. + */ +int avcodec_close(AVCodecContext *avctx); + +/** + * Free all allocated data in the given subtitle struct. + * + * @param sub AVSubtitle to free. + */ +void avsubtitle_free(AVSubtitle *sub); + +/** + * @} + */ + +/** + * @addtogroup lavc_packet + * @{ + */ + +/** + * Allocate an AVPacket and set its fields to default values. The resulting + * struct must be freed using av_packet_free(). + * + * @return An AVPacket filled with default values or NULL on failure. + * + * @note this only allocates the AVPacket itself, not the data buffers. Those + * must be allocated through other means such as av_new_packet. + * + * @see av_new_packet + */ +AVPacket *av_packet_alloc(void); + +/** + * Create a new packet that references the same data as src. + * + * This is a shortcut for av_packet_alloc()+av_packet_ref(). + * + * @return newly created AVPacket on success, NULL on error. + * + * @see av_packet_alloc + * @see av_packet_ref + */ +AVPacket *av_packet_clone(AVPacket *src); + +/** + * Free the packet, if the packet is reference counted, it will be + * unreferenced first. + * + * @param packet packet to be freed. The pointer will be set to NULL. + * @note passing NULL is a no-op. + */ +void av_packet_free(AVPacket **pkt); + +/** + * Initialize optional fields of a packet with default values. + * + * Note, this does not touch the data and size members, which have to be + * initialized separately. + * + * @param pkt packet + */ +void av_init_packet(AVPacket *pkt); + +/** + * Allocate the payload of a packet and initialize its fields with + * default values. + * + * @param pkt packet + * @param size wanted payload size + * @return 0 if OK, AVERROR_xxx otherwise + */ +int av_new_packet(AVPacket *pkt, int size); + +/** + * Reduce packet size, correctly zeroing padding + * + * @param pkt packet + * @param size new size + */ +void av_shrink_packet(AVPacket *pkt, int size); + +/** + * Increase packet size, correctly zeroing padding + * + * @param pkt packet + * @param grow_by number of bytes by which to increase the size of the packet + */ +int av_grow_packet(AVPacket *pkt, int grow_by); + +/** + * Initialize a reference-counted packet from av_malloc()ed data. + * + * @param pkt packet to be initialized. This function will set the data, size, + * buf and destruct fields, all others are left untouched. + * @param data Data allocated by av_malloc() to be used as packet data. If this + * function returns successfully, the data is owned by the underlying AVBuffer. + * The caller may not access the data through other means. + * @param size size of data in bytes, without the padding. I.e. the full buffer + * size is assumed to be size + AV_INPUT_BUFFER_PADDING_SIZE. + * + * @return 0 on success, a negative AVERROR on error + */ +int av_packet_from_data(AVPacket *pkt, uint8_t *data, int size); + +#if FF_API_AVPACKET_OLD_API +/** + * @warning This is a hack - the packet memory allocation stuff is broken. The + * packet is allocated if it was not really allocated. + * + * @deprecated Use av_packet_ref + */ +attribute_deprecated +int av_dup_packet(AVPacket *pkt); +/** + * Copy packet, including contents + * + * @return 0 on success, negative AVERROR on fail + */ +int av_copy_packet(AVPacket *dst, const AVPacket *src); + +/** + * Copy packet side data + * + * @return 0 on success, negative AVERROR on fail + */ +int av_copy_packet_side_data(AVPacket *dst, const AVPacket *src); + +/** + * Free a packet. + * + * @deprecated Use av_packet_unref + * + * @param pkt packet to free + */ +attribute_deprecated +void av_free_packet(AVPacket *pkt); +#endif +/** + * Allocate new information of a packet. + * + * @param pkt packet + * @param type side information type + * @param size side information size + * @return pointer to fresh allocated data or NULL otherwise + */ +uint8_t* av_packet_new_side_data(AVPacket *pkt, enum AVPacketSideDataType type, + int size); + +/** + * Wrap an existing array as a packet side data. + * + * @param pkt packet + * @param type side information type + * @param data the side data array. It must be allocated with the av_malloc() + * family of functions. The ownership of the data is transferred to + * pkt. + * @param size side information size + * @return a non-negative number on success, a negative AVERROR code on + * failure. On failure, the packet is unchanged and the data remains + * owned by the caller. + */ +int av_packet_add_side_data(AVPacket *pkt, enum AVPacketSideDataType type, + uint8_t *data, size_t size); + +/** + * Shrink the already allocated side data buffer + * + * @param pkt packet + * @param type side information type + * @param size new side information size + * @return 0 on success, < 0 on failure + */ +int av_packet_shrink_side_data(AVPacket *pkt, enum AVPacketSideDataType type, + int size); + +/** + * Get side information from packet. + * + * @param pkt packet + * @param type desired side information type + * @param size pointer for side information size to store (optional) + * @return pointer to data if present or NULL otherwise + */ +uint8_t* av_packet_get_side_data(AVPacket *pkt, enum AVPacketSideDataType type, + int *size); + +int av_packet_merge_side_data(AVPacket *pkt); + +int av_packet_split_side_data(AVPacket *pkt); + +const char *av_packet_side_data_name(enum AVPacketSideDataType type); + +/** + * Pack a dictionary for use in side_data. + * + * @param dict The dictionary to pack. + * @param size pointer to store the size of the returned data + * @return pointer to data if successful, NULL otherwise + */ +uint8_t *av_packet_pack_dictionary(AVDictionary *dict, int *size); +/** + * Unpack a dictionary from side_data. + * + * @param data data from side_data + * @param size size of the data + * @param dict the metadata storage dictionary + * @return 0 on success, < 0 on failure + */ +int av_packet_unpack_dictionary(const uint8_t *data, int size, AVDictionary **dict); + + +/** + * Convenience function to free all the side data stored. + * All the other fields stay untouched. + * + * @param pkt packet + */ +void av_packet_free_side_data(AVPacket *pkt); + +/** + * Setup a new reference to the data described by a given packet + * + * If src is reference-counted, setup dst as a new reference to the + * buffer in src. Otherwise allocate a new buffer in dst and copy the + * data from src into it. + * + * All the other fields are copied from src. + * + * @see av_packet_unref + * + * @param dst Destination packet + * @param src Source packet + * + * @return 0 on success, a negative AVERROR on error. + */ +int av_packet_ref(AVPacket *dst, const AVPacket *src); + +/** + * Wipe the packet. + * + * Unreference the buffer referenced by the packet and reset the + * remaining packet fields to their default values. + * + * @param pkt The packet to be unreferenced. + */ +void av_packet_unref(AVPacket *pkt); + +/** + * Move every field in src to dst and reset src. + * + * @see av_packet_unref + * + * @param src Source packet, will be reset + * @param dst Destination packet + */ +void av_packet_move_ref(AVPacket *dst, AVPacket *src); + +/** + * Copy only "properties" fields from src to dst. + * + * Properties for the purpose of this function are all the fields + * beside those related to the packet data (buf, data, size) + * + * @param dst Destination packet + * @param src Source packet + * + * @return 0 on success AVERROR on failure. + * + */ +int av_packet_copy_props(AVPacket *dst, const AVPacket *src); + +/** + * Convert valid timing fields (timestamps / durations) in a packet from one + * timebase to another. Timestamps with unknown values (AV_NOPTS_VALUE) will be + * ignored. + * + * @param pkt packet on which the conversion will be performed + * @param tb_src source timebase, in which the timing fields in pkt are + * expressed + * @param tb_dst destination timebase, to which the timing fields will be + * converted + */ +void av_packet_rescale_ts(AVPacket *pkt, AVRational tb_src, AVRational tb_dst); + +/** + * @} + */ + +/** + * @addtogroup lavc_decoding + * @{ + */ + +/** + * Find a registered decoder with a matching codec ID. + * + * @param id AVCodecID of the requested decoder + * @return A decoder if one was found, NULL otherwise. + */ +AVCodec *avcodec_find_decoder(enum AVCodecID id); + +/** + * Find a registered decoder with the specified name. + * + * @param name name of the requested decoder + * @return A decoder if one was found, NULL otherwise. + */ +AVCodec *avcodec_find_decoder_by_name(const char *name); + +/** + * The default callback for AVCodecContext.get_buffer2(). It is made public so + * it can be called by custom get_buffer2() implementations for decoders without + * AV_CODEC_CAP_DR1 set. + */ +int avcodec_default_get_buffer2(AVCodecContext *s, AVFrame *frame, int flags); + +#if FF_API_EMU_EDGE +/** + * Return the amount of padding in pixels which the get_buffer callback must + * provide around the edge of the image for codecs which do not have the + * CODEC_FLAG_EMU_EDGE flag. + * + * @return Required padding in pixels. + * + * @deprecated CODEC_FLAG_EMU_EDGE is deprecated, so this function is no longer + * needed + */ +attribute_deprecated +unsigned avcodec_get_edge_width(void); +#endif + +/** + * Modify width and height values so that they will result in a memory + * buffer that is acceptable for the codec if you do not use any horizontal + * padding. + * + * May only be used if a codec with AV_CODEC_CAP_DR1 has been opened. + */ +void avcodec_align_dimensions(AVCodecContext *s, int *width, int *height); + +/** + * Modify width and height values so that they will result in a memory + * buffer that is acceptable for the codec if you also ensure that all + * line sizes are a multiple of the respective linesize_align[i]. + * + * May only be used if a codec with AV_CODEC_CAP_DR1 has been opened. + */ +void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height, + int linesize_align[AV_NUM_DATA_POINTERS]); + +/** + * Converts AVChromaLocation to swscale x/y chroma position. + * + * The positions represent the chroma (0,0) position in a coordinates system + * with luma (0,0) representing the origin and luma(1,1) representing 256,256 + * + * @param xpos horizontal chroma sample position + * @param ypos vertical chroma sample position + */ +int avcodec_enum_to_chroma_pos(int *xpos, int *ypos, enum AVChromaLocation pos); + +/** + * Converts swscale x/y chroma position to AVChromaLocation. + * + * The positions represent the chroma (0,0) position in a coordinates system + * with luma (0,0) representing the origin and luma(1,1) representing 256,256 + * + * @param xpos horizontal chroma sample position + * @param ypos vertical chroma sample position + */ +enum AVChromaLocation avcodec_chroma_pos_to_enum(int xpos, int ypos); + +/** + * Decode the audio frame of size avpkt->size from avpkt->data into frame. + * + * Some decoders may support multiple frames in a single AVPacket. Such + * decoders would then just decode the first frame and the return value would be + * less than the packet size. In this case, avcodec_decode_audio4 has to be + * called again with an AVPacket containing the remaining data in order to + * decode the second frame, etc... Even if no frames are returned, the packet + * needs to be fed to the decoder with remaining data until it is completely + * consumed or an error occurs. + * + * Some decoders (those marked with AV_CODEC_CAP_DELAY) have a delay between input + * and output. This means that for some packets they will not immediately + * produce decoded output and need to be flushed at the end of decoding to get + * all the decoded data. Flushing is done by calling this function with packets + * with avpkt->data set to NULL and avpkt->size set to 0 until it stops + * returning samples. It is safe to flush even those decoders that are not + * marked with AV_CODEC_CAP_DELAY, then no samples will be returned. + * + * @warning The input buffer, avpkt->data must be AV_INPUT_BUFFER_PADDING_SIZE + * larger than the actual read bytes because some optimized bitstream + * readers read 32 or 64 bits at once and could read over the end. + * + * @note The AVCodecContext MUST have been opened with @ref avcodec_open2() + * before packets may be fed to the decoder. + * + * @param avctx the codec context + * @param[out] frame The AVFrame in which to store decoded audio samples. + * The decoder will allocate a buffer for the decoded frame by + * calling the AVCodecContext.get_buffer2() callback. + * When AVCodecContext.refcounted_frames is set to 1, the frame is + * reference counted and the returned reference belongs to the + * caller. The caller must release the frame using av_frame_unref() + * when the frame is no longer needed. The caller may safely write + * to the frame if av_frame_is_writable() returns 1. + * When AVCodecContext.refcounted_frames is set to 0, the returned + * reference belongs to the decoder and is valid only until the + * next call to this function or until closing or flushing the + * decoder. The caller may not write to it. + * @param[out] got_frame_ptr Zero if no frame could be decoded, otherwise it is + * non-zero. Note that this field being set to zero + * does not mean that an error has occurred. For + * decoders with AV_CODEC_CAP_DELAY set, no given decode + * call is guaranteed to produce a frame. + * @param[in] avpkt The input AVPacket containing the input buffer. + * At least avpkt->data and avpkt->size should be set. Some + * decoders might also require additional fields to be set. + * @return A negative error code is returned if an error occurred during + * decoding, otherwise the number of bytes consumed from the input + * AVPacket is returned. + */ +int avcodec_decode_audio4(AVCodecContext *avctx, AVFrame *frame, + int *got_frame_ptr, const AVPacket *avpkt); + +/** + * Decode the video frame of size avpkt->size from avpkt->data into picture. + * Some decoders may support multiple frames in a single AVPacket, such + * decoders would then just decode the first frame. + * + * @warning The input buffer must be AV_INPUT_BUFFER_PADDING_SIZE larger than + * the actual read bytes because some optimized bitstream readers read 32 or 64 + * bits at once and could read over the end. + * + * @warning The end of the input buffer buf should be set to 0 to ensure that + * no overreading happens for damaged MPEG streams. + * + * @note Codecs which have the AV_CODEC_CAP_DELAY capability set have a delay + * between input and output, these need to be fed with avpkt->data=NULL, + * avpkt->size=0 at the end to return the remaining frames. + * + * @note The AVCodecContext MUST have been opened with @ref avcodec_open2() + * before packets may be fed to the decoder. + * + * @param avctx the codec context + * @param[out] picture The AVFrame in which the decoded video frame will be stored. + * Use av_frame_alloc() to get an AVFrame. The codec will + * allocate memory for the actual bitmap by calling the + * AVCodecContext.get_buffer2() callback. + * When AVCodecContext.refcounted_frames is set to 1, the frame is + * reference counted and the returned reference belongs to the + * caller. The caller must release the frame using av_frame_unref() + * when the frame is no longer needed. The caller may safely write + * to the frame if av_frame_is_writable() returns 1. + * When AVCodecContext.refcounted_frames is set to 0, the returned + * reference belongs to the decoder and is valid only until the + * next call to this function or until closing or flushing the + * decoder. The caller may not write to it. + * + * @param[in] avpkt The input AVPacket containing the input buffer. + * You can create such packet with av_init_packet() and by then setting + * data and size, some decoders might in addition need other fields like + * flags&AV_PKT_FLAG_KEY. All decoders are designed to use the least + * fields possible. + * @param[in,out] got_picture_ptr Zero if no frame could be decompressed, otherwise, it is nonzero. + * @return On error a negative value is returned, otherwise the number of bytes + * used or zero if no frame could be decompressed. + */ +int avcodec_decode_video2(AVCodecContext *avctx, AVFrame *picture, + int *got_picture_ptr, + const AVPacket *avpkt); + +/** + * Decode a subtitle message. + * Return a negative value on error, otherwise return the number of bytes used. + * If no subtitle could be decompressed, got_sub_ptr is zero. + * Otherwise, the subtitle is stored in *sub. + * Note that AV_CODEC_CAP_DR1 is not available for subtitle codecs. This is for + * simplicity, because the performance difference is expect to be negligible + * and reusing a get_buffer written for video codecs would probably perform badly + * due to a potentially very different allocation pattern. + * + * Some decoders (those marked with CODEC_CAP_DELAY) have a delay between input + * and output. This means that for some packets they will not immediately + * produce decoded output and need to be flushed at the end of decoding to get + * all the decoded data. Flushing is done by calling this function with packets + * with avpkt->data set to NULL and avpkt->size set to 0 until it stops + * returning subtitles. It is safe to flush even those decoders that are not + * marked with CODEC_CAP_DELAY, then no subtitles will be returned. + * + * @note The AVCodecContext MUST have been opened with @ref avcodec_open2() + * before packets may be fed to the decoder. + * + * @param avctx the codec context + * @param[out] sub The Preallocated AVSubtitle in which the decoded subtitle will be stored, + * must be freed with avsubtitle_free if *got_sub_ptr is set. + * @param[in,out] got_sub_ptr Zero if no subtitle could be decompressed, otherwise, it is nonzero. + * @param[in] avpkt The input AVPacket containing the input buffer. + */ +int avcodec_decode_subtitle2(AVCodecContext *avctx, AVSubtitle *sub, + int *got_sub_ptr, + AVPacket *avpkt); + +/** + * @defgroup lavc_parsing Frame parsing + * @{ + */ + +enum AVPictureStructure { + AV_PICTURE_STRUCTURE_UNKNOWN, //< unknown + AV_PICTURE_STRUCTURE_TOP_FIELD, //< coded as top field + AV_PICTURE_STRUCTURE_BOTTOM_FIELD, //< coded as bottom field + AV_PICTURE_STRUCTURE_FRAME, //< coded as frame +}; + +typedef struct AVCodecParserContext { + void *priv_data; + struct AVCodecParser *parser; + int64_t frame_offset; /* offset of the current frame */ + int64_t cur_offset; /* current offset + (incremented by each av_parser_parse()) */ + int64_t next_frame_offset; /* offset of the next frame */ + /* video info */ + int pict_type; /* XXX: Put it back in AVCodecContext. */ + /** + * This field is used for proper frame duration computation in lavf. + * It signals, how much longer the frame duration of the current frame + * is compared to normal frame duration. + * + * frame_duration = (1 + repeat_pict) * time_base + * + * It is used by codecs like H.264 to display telecined material. + */ + int repeat_pict; /* XXX: Put it back in AVCodecContext. */ + int64_t pts; /* pts of the current frame */ + int64_t dts; /* dts of the current frame */ + + /* private data */ + int64_t last_pts; + int64_t last_dts; + int fetch_timestamp; + +#define AV_PARSER_PTS_NB 4 + int cur_frame_start_index; + int64_t cur_frame_offset[AV_PARSER_PTS_NB]; + int64_t cur_frame_pts[AV_PARSER_PTS_NB]; + int64_t cur_frame_dts[AV_PARSER_PTS_NB]; + + int flags; +#define PARSER_FLAG_COMPLETE_FRAMES 0x0001 +#define PARSER_FLAG_ONCE 0x0002 +/// Set if the parser has a valid file offset +#define PARSER_FLAG_FETCHED_OFFSET 0x0004 +#define PARSER_FLAG_USE_CODEC_TS 0x1000 + + int64_t offset; ///< byte offset from starting packet start + int64_t cur_frame_end[AV_PARSER_PTS_NB]; + + /** + * Set by parser to 1 for key frames and 0 for non-key frames. + * It is initialized to -1, so if the parser doesn't set this flag, + * old-style fallback using AV_PICTURE_TYPE_I picture type as key frames + * will be used. + */ + int key_frame; + +#if FF_API_CONVERGENCE_DURATION + /** + * @deprecated unused + */ + attribute_deprecated + int64_t convergence_duration; +#endif + + // Timestamp generation support: + /** + * Synchronization point for start of timestamp generation. + * + * Set to >0 for sync point, 0 for no sync point and <0 for undefined + * (default). + * + * For example, this corresponds to presence of H.264 buffering period + * SEI message. + */ + int dts_sync_point; + + /** + * Offset of the current timestamp against last timestamp sync point in + * units of AVCodecContext.time_base. + * + * Set to INT_MIN when dts_sync_point unused. Otherwise, it must + * contain a valid timestamp offset. + * + * Note that the timestamp of sync point has usually a nonzero + * dts_ref_dts_delta, which refers to the previous sync point. Offset of + * the next frame after timestamp sync point will be usually 1. + * + * For example, this corresponds to H.264 cpb_removal_delay. + */ + int dts_ref_dts_delta; + + /** + * Presentation delay of current frame in units of AVCodecContext.time_base. + * + * Set to INT_MIN when dts_sync_point unused. Otherwise, it must + * contain valid non-negative timestamp delta (presentation time of a frame + * must not lie in the past). + * + * This delay represents the difference between decoding and presentation + * time of the frame. + * + * For example, this corresponds to H.264 dpb_output_delay. + */ + int pts_dts_delta; + + /** + * Position of the packet in file. + * + * Analogous to cur_frame_pts/dts + */ + int64_t cur_frame_pos[AV_PARSER_PTS_NB]; + + /** + * Byte position of currently parsed frame in stream. + */ + int64_t pos; + + /** + * Previous frame byte position. + */ + int64_t last_pos; + + /** + * Duration of the current frame. + * For audio, this is in units of 1 / AVCodecContext.sample_rate. + * For all other types, this is in units of AVCodecContext.time_base. + */ + int duration; + + enum AVFieldOrder field_order; + + /** + * Indicate whether a picture is coded as a frame, top field or bottom field. + * + * For example, H.264 field_pic_flag equal to 0 corresponds to + * AV_PICTURE_STRUCTURE_FRAME. An H.264 picture with field_pic_flag + * equal to 1 and bottom_field_flag equal to 0 corresponds to + * AV_PICTURE_STRUCTURE_TOP_FIELD. + */ + enum AVPictureStructure picture_structure; + + /** + * Picture number incremented in presentation or output order. + * This field may be reinitialized at the first picture of a new sequence. + * + * For example, this corresponds to H.264 PicOrderCnt. + */ + int output_picture_number; + + /** + * Dimensions of the decoded video intended for presentation. + */ + int width; + int height; + + /** + * Dimensions of the coded video. + */ + int coded_width; + int coded_height; + + /** + * The format of the coded data, corresponds to enum AVPixelFormat for video + * and for enum AVSampleFormat for audio. + * + * Note that a decoder can have considerable freedom in how exactly it + * decodes the data, so the format reported here might be different from the + * one returned by a decoder. + */ + int format; +} AVCodecParserContext; + +typedef struct AVCodecParser { + int codec_ids[5]; /* several codec IDs are permitted */ + int priv_data_size; + int (*parser_init)(AVCodecParserContext *s); + /* This callback never returns an error, a negative value means that + * the frame start was in a previous packet. */ + int (*parser_parse)(AVCodecParserContext *s, + AVCodecContext *avctx, + const uint8_t **poutbuf, int *poutbuf_size, + const uint8_t *buf, int buf_size); + void (*parser_close)(AVCodecParserContext *s); + int (*split)(AVCodecContext *avctx, const uint8_t *buf, int buf_size); + struct AVCodecParser *next; +} AVCodecParser; + +AVCodecParser *av_parser_next(const AVCodecParser *c); + +void av_register_codec_parser(AVCodecParser *parser); +AVCodecParserContext *av_parser_init(int codec_id); + +/** + * Parse a packet. + * + * @param s parser context. + * @param avctx codec context. + * @param poutbuf set to pointer to parsed buffer or NULL if not yet finished. + * @param poutbuf_size set to size of parsed buffer or zero if not yet finished. + * @param buf input buffer. + * @param buf_size input length, to signal EOF, this should be 0 (so that the last frame can be output). + * @param pts input presentation timestamp. + * @param dts input decoding timestamp. + * @param pos input byte position in stream. + * @return the number of bytes of the input bitstream used. + * + * Example: + * @code + * while(in_len){ + * len = av_parser_parse2(myparser, AVCodecContext, &data, &size, + * in_data, in_len, + * pts, dts, pos); + * in_data += len; + * in_len -= len; + * + * if(size) + * decode_frame(data, size); + * } + * @endcode + */ +int av_parser_parse2(AVCodecParserContext *s, + AVCodecContext *avctx, + uint8_t **poutbuf, int *poutbuf_size, + const uint8_t *buf, int buf_size, + int64_t pts, int64_t dts, + int64_t pos); + +/** + * @return 0 if the output buffer is a subset of the input, 1 if it is allocated and must be freed + * @deprecated use AVBitStreamFilter + */ +int av_parser_change(AVCodecParserContext *s, + AVCodecContext *avctx, + uint8_t **poutbuf, int *poutbuf_size, + const uint8_t *buf, int buf_size, int keyframe); +void av_parser_close(AVCodecParserContext *s); + +/** + * @} + * @} + */ + +/** + * @addtogroup lavc_encoding + * @{ + */ + +/** + * Find a registered encoder with a matching codec ID. + * + * @param id AVCodecID of the requested encoder + * @return An encoder if one was found, NULL otherwise. + */ +AVCodec *avcodec_find_encoder(enum AVCodecID id); + +/** + * Find a registered encoder with the specified name. + * + * @param name name of the requested encoder + * @return An encoder if one was found, NULL otherwise. + */ +AVCodec *avcodec_find_encoder_by_name(const char *name); + +/** + * Encode a frame of audio. + * + * Takes input samples from frame and writes the next output packet, if + * available, to avpkt. The output packet does not necessarily contain data for + * the most recent frame, as encoders can delay, split, and combine input frames + * internally as needed. + * + * @param avctx codec context + * @param avpkt output AVPacket. + * The user can supply an output buffer by setting + * avpkt->data and avpkt->size prior to calling the + * function, but if the size of the user-provided data is not + * large enough, encoding will fail. If avpkt->data and + * avpkt->size are set, avpkt->destruct must also be set. All + * other AVPacket fields will be reset by the encoder using + * av_init_packet(). If avpkt->data is NULL, the encoder will + * allocate it. The encoder will set avpkt->size to the size + * of the output packet. + * + * If this function fails or produces no output, avpkt will be + * freed using av_packet_unref(). + * @param[in] frame AVFrame containing the raw audio data to be encoded. + * May be NULL when flushing an encoder that has the + * AV_CODEC_CAP_DELAY capability set. + * If AV_CODEC_CAP_VARIABLE_FRAME_SIZE is set, then each frame + * can have any number of samples. + * If it is not set, frame->nb_samples must be equal to + * avctx->frame_size for all frames except the last. + * The final frame may be smaller than avctx->frame_size. + * @param[out] got_packet_ptr This field is set to 1 by libavcodec if the + * output packet is non-empty, and to 0 if it is + * empty. If the function returns an error, the + * packet can be assumed to be invalid, and the + * value of got_packet_ptr is undefined and should + * not be used. + * @return 0 on success, negative error code on failure + */ +int avcodec_encode_audio2(AVCodecContext *avctx, AVPacket *avpkt, + const AVFrame *frame, int *got_packet_ptr); + +/** + * Encode a frame of video. + * + * Takes input raw video data from frame and writes the next output packet, if + * available, to avpkt. The output packet does not necessarily contain data for + * the most recent frame, as encoders can delay and reorder input frames + * internally as needed. + * + * @param avctx codec context + * @param avpkt output AVPacket. + * The user can supply an output buffer by setting + * avpkt->data and avpkt->size prior to calling the + * function, but if the size of the user-provided data is not + * large enough, encoding will fail. All other AVPacket fields + * will be reset by the encoder using av_init_packet(). If + * avpkt->data is NULL, the encoder will allocate it. + * The encoder will set avpkt->size to the size of the + * output packet. The returned data (if any) belongs to the + * caller, he is responsible for freeing it. + * + * If this function fails or produces no output, avpkt will be + * freed using av_packet_unref(). + * @param[in] frame AVFrame containing the raw video data to be encoded. + * May be NULL when flushing an encoder that has the + * AV_CODEC_CAP_DELAY capability set. + * @param[out] got_packet_ptr This field is set to 1 by libavcodec if the + * output packet is non-empty, and to 0 if it is + * empty. If the function returns an error, the + * packet can be assumed to be invalid, and the + * value of got_packet_ptr is undefined and should + * not be used. + * @return 0 on success, negative error code on failure + */ +int avcodec_encode_video2(AVCodecContext *avctx, AVPacket *avpkt, + const AVFrame *frame, int *got_packet_ptr); + +int avcodec_encode_subtitle(AVCodecContext *avctx, uint8_t *buf, int buf_size, + const AVSubtitle *sub); + + +/** + * @} + */ + +#if FF_API_AVCODEC_RESAMPLE +/** + * @defgroup lavc_resample Audio resampling + * @ingroup libavc + * @deprecated use libswresample instead + * + * @{ + */ +struct ReSampleContext; +struct AVResampleContext; + +typedef struct ReSampleContext ReSampleContext; + +/** + * Initialize audio resampling context. + * + * @param output_channels number of output channels + * @param input_channels number of input channels + * @param output_rate output sample rate + * @param input_rate input sample rate + * @param sample_fmt_out requested output sample format + * @param sample_fmt_in input sample format + * @param filter_length length of each FIR filter in the filterbank relative to the cutoff frequency + * @param log2_phase_count log2 of the number of entries in the polyphase filterbank + * @param linear if 1 then the used FIR filter will be linearly interpolated + between the 2 closest, if 0 the closest will be used + * @param cutoff cutoff frequency, 1.0 corresponds to half the output sampling rate + * @return allocated ReSampleContext, NULL if error occurred + */ +attribute_deprecated +ReSampleContext *av_audio_resample_init(int output_channels, int input_channels, + int output_rate, int input_rate, + enum AVSampleFormat sample_fmt_out, + enum AVSampleFormat sample_fmt_in, + int filter_length, int log2_phase_count, + int linear, double cutoff); + +attribute_deprecated +int audio_resample(ReSampleContext *s, short *output, short *input, int nb_samples); + +/** + * Free resample context. + * + * @param s a non-NULL pointer to a resample context previously + * created with av_audio_resample_init() + */ +attribute_deprecated +void audio_resample_close(ReSampleContext *s); + + +/** + * Initialize an audio resampler. + * Note, if either rate is not an integer then simply scale both rates up so they are. + * @param filter_length length of each FIR filter in the filterbank relative to the cutoff freq + * @param log2_phase_count log2 of the number of entries in the polyphase filterbank + * @param linear If 1 then the used FIR filter will be linearly interpolated + between the 2 closest, if 0 the closest will be used + * @param cutoff cutoff frequency, 1.0 corresponds to half the output sampling rate + */ +attribute_deprecated +struct AVResampleContext *av_resample_init(int out_rate, int in_rate, int filter_length, int log2_phase_count, int linear, double cutoff); + +/** + * Resample an array of samples using a previously configured context. + * @param src an array of unconsumed samples + * @param consumed the number of samples of src which have been consumed are returned here + * @param src_size the number of unconsumed samples available + * @param dst_size the amount of space in samples available in dst + * @param update_ctx If this is 0 then the context will not be modified, that way several channels can be resampled with the same context. + * @return the number of samples written in dst or -1 if an error occurred + */ +attribute_deprecated +int av_resample(struct AVResampleContext *c, short *dst, short *src, int *consumed, int src_size, int dst_size, int update_ctx); + + +/** + * Compensate samplerate/timestamp drift. The compensation is done by changing + * the resampler parameters, so no audible clicks or similar distortions occur + * @param compensation_distance distance in output samples over which the compensation should be performed + * @param sample_delta number of output samples which should be output less + * + * example: av_resample_compensate(c, 10, 500) + * here instead of 510 samples only 500 samples would be output + * + * note, due to rounding the actual compensation might be slightly different, + * especially if the compensation_distance is large and the in_rate used during init is small + */ +attribute_deprecated +void av_resample_compensate(struct AVResampleContext *c, int sample_delta, int compensation_distance); +attribute_deprecated +void av_resample_close(struct AVResampleContext *c); + +/** + * @} + */ +#endif + +#if FF_API_AVPICTURE +/** + * @addtogroup lavc_picture + * @{ + */ + +/** + * @deprecated unused + */ +attribute_deprecated +int avpicture_alloc(AVPicture *picture, enum AVPixelFormat pix_fmt, int width, int height); + +/** + * @deprecated unused + */ +attribute_deprecated +void avpicture_free(AVPicture *picture); + +/** + * @deprecated use av_image_fill_arrays() instead. + */ +attribute_deprecated +int avpicture_fill(AVPicture *picture, const uint8_t *ptr, + enum AVPixelFormat pix_fmt, int width, int height); + +/** + * @deprecated use av_image_copy_to_buffer() instead. + */ +attribute_deprecated +int avpicture_layout(const AVPicture *src, enum AVPixelFormat pix_fmt, + int width, int height, + unsigned char *dest, int dest_size); + +/** + * @deprecated use av_image_get_buffer_size() instead. + */ +attribute_deprecated +int avpicture_get_size(enum AVPixelFormat pix_fmt, int width, int height); + +/** + * @deprecated av_image_copy() instead. + */ +attribute_deprecated +void av_picture_copy(AVPicture *dst, const AVPicture *src, + enum AVPixelFormat pix_fmt, int width, int height); + +/** + * @deprecated unused + */ +attribute_deprecated +int av_picture_crop(AVPicture *dst, const AVPicture *src, + enum AVPixelFormat pix_fmt, int top_band, int left_band); + +/** + * @deprecated unused + */ +attribute_deprecated +int av_picture_pad(AVPicture *dst, const AVPicture *src, int height, int width, enum AVPixelFormat pix_fmt, + int padtop, int padbottom, int padleft, int padright, int *color); + +/** + * @} + */ +#endif + +/** + * @defgroup lavc_misc Utility functions + * @ingroup libavc + * + * Miscellaneous utility functions related to both encoding and decoding + * (or neither). + * @{ + */ + +/** + * @defgroup lavc_misc_pixfmt Pixel formats + * + * Functions for working with pixel formats. + * @{ + */ + +/** + * Utility function to access log2_chroma_w log2_chroma_h from + * the pixel format AVPixFmtDescriptor. + * + * This function asserts that pix_fmt is valid. See av_pix_fmt_get_chroma_sub_sample + * for one that returns a failure code and continues in case of invalid + * pix_fmts. + * + * @param[in] pix_fmt the pixel format + * @param[out] h_shift store log2_chroma_w + * @param[out] v_shift store log2_chroma_h + * + * @see av_pix_fmt_get_chroma_sub_sample + */ + +void avcodec_get_chroma_sub_sample(enum AVPixelFormat pix_fmt, int *h_shift, int *v_shift); + +/** + * Return a value representing the fourCC code associated to the + * pixel format pix_fmt, or 0 if no associated fourCC code can be + * found. + */ +unsigned int avcodec_pix_fmt_to_codec_tag(enum AVPixelFormat pix_fmt); + +/** + * @deprecated see av_get_pix_fmt_loss() + */ +int avcodec_get_pix_fmt_loss(enum AVPixelFormat dst_pix_fmt, enum AVPixelFormat src_pix_fmt, + int has_alpha); + +/** + * Find the best pixel format to convert to given a certain source pixel + * format. When converting from one pixel format to another, information loss + * may occur. For example, when converting from RGB24 to GRAY, the color + * information will be lost. Similarly, other losses occur when converting from + * some formats to other formats. avcodec_find_best_pix_fmt_of_2() searches which of + * the given pixel formats should be used to suffer the least amount of loss. + * The pixel formats from which it chooses one, are determined by the + * pix_fmt_list parameter. + * + * + * @param[in] pix_fmt_list AV_PIX_FMT_NONE terminated array of pixel formats to choose from + * @param[in] src_pix_fmt source pixel format + * @param[in] has_alpha Whether the source pixel format alpha channel is used. + * @param[out] loss_ptr Combination of flags informing you what kind of losses will occur. + * @return The best pixel format to convert to or -1 if none was found. + */ +enum AVPixelFormat avcodec_find_best_pix_fmt_of_list(const enum AVPixelFormat *pix_fmt_list, + enum AVPixelFormat src_pix_fmt, + int has_alpha, int *loss_ptr); + +/** + * @deprecated see av_find_best_pix_fmt_of_2() + */ +enum AVPixelFormat avcodec_find_best_pix_fmt_of_2(enum AVPixelFormat dst_pix_fmt1, enum AVPixelFormat dst_pix_fmt2, + enum AVPixelFormat src_pix_fmt, int has_alpha, int *loss_ptr); + +attribute_deprecated +#if AV_HAVE_INCOMPATIBLE_LIBAV_ABI +enum AVPixelFormat avcodec_find_best_pix_fmt2(const enum AVPixelFormat *pix_fmt_list, + enum AVPixelFormat src_pix_fmt, + int has_alpha, int *loss_ptr); +#else +enum AVPixelFormat avcodec_find_best_pix_fmt2(enum AVPixelFormat dst_pix_fmt1, enum AVPixelFormat dst_pix_fmt2, + enum AVPixelFormat src_pix_fmt, int has_alpha, int *loss_ptr); +#endif + + +enum AVPixelFormat avcodec_default_get_format(struct AVCodecContext *s, const enum AVPixelFormat * fmt); + +/** + * @} + */ + +#if FF_API_SET_DIMENSIONS +/** + * @deprecated this function is not supposed to be used from outside of lavc + */ +attribute_deprecated +void avcodec_set_dimensions(AVCodecContext *s, int width, int height); +#endif + +/** + * Put a string representing the codec tag codec_tag in buf. + * + * @param buf buffer to place codec tag in + * @param buf_size size in bytes of buf + * @param codec_tag codec tag to assign + * @return the length of the string that would have been generated if + * enough space had been available, excluding the trailing null + */ +size_t av_get_codec_tag_string(char *buf, size_t buf_size, unsigned int codec_tag); + +void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode); + +/** + * Return a name for the specified profile, if available. + * + * @param codec the codec that is searched for the given profile + * @param profile the profile value for which a name is requested + * @return A name for the profile if found, NULL otherwise. + */ +const char *av_get_profile_name(const AVCodec *codec, int profile); + +/** + * Return a name for the specified profile, if available. + * + * @param codec_id the ID of the codec to which the requested profile belongs + * @param profile the profile value for which a name is requested + * @return A name for the profile if found, NULL otherwise. + * + * @note unlike av_get_profile_name(), which searches a list of profiles + * supported by a specific decoder or encoder implementation, this + * function searches the list of profiles from the AVCodecDescriptor + */ +const char *avcodec_profile_name(enum AVCodecID codec_id, int profile); + +int avcodec_default_execute(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2),void *arg, int *ret, int count, int size); +int avcodec_default_execute2(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2, int, int),void *arg, int *ret, int count); +//FIXME func typedef + +/** + * Fill AVFrame audio data and linesize pointers. + * + * The buffer buf must be a preallocated buffer with a size big enough + * to contain the specified samples amount. The filled AVFrame data + * pointers will point to this buffer. + * + * AVFrame extended_data channel pointers are allocated if necessary for + * planar audio. + * + * @param frame the AVFrame + * frame->nb_samples must be set prior to calling the + * function. This function fills in frame->data, + * frame->extended_data, frame->linesize[0]. + * @param nb_channels channel count + * @param sample_fmt sample format + * @param buf buffer to use for frame data + * @param buf_size size of buffer + * @param align plane size sample alignment (0 = default) + * @return >=0 on success, negative error code on failure + * @todo return the size in bytes required to store the samples in + * case of success, at the next libavutil bump + */ +int avcodec_fill_audio_frame(AVFrame *frame, int nb_channels, + enum AVSampleFormat sample_fmt, const uint8_t *buf, + int buf_size, int align); + +/** + * Reset the internal decoder state / flush internal buffers. Should be called + * e.g. when seeking or when switching to a different stream. + * + * @note when refcounted frames are not used (i.e. avctx->refcounted_frames is 0), + * this invalidates the frames previously returned from the decoder. When + * refcounted frames are used, the decoder just releases any references it might + * keep internally, but the caller's reference remains valid. + */ +void avcodec_flush_buffers(AVCodecContext *avctx); + +/** + * Return codec bits per sample. + * + * @param[in] codec_id the codec + * @return Number of bits per sample or zero if unknown for the given codec. + */ +int av_get_bits_per_sample(enum AVCodecID codec_id); + +/** + * Return the PCM codec associated with a sample format. + * @param be endianness, 0 for little, 1 for big, + * -1 (or anything else) for native + * @return AV_CODEC_ID_PCM_* or AV_CODEC_ID_NONE + */ +enum AVCodecID av_get_pcm_codec(enum AVSampleFormat fmt, int be); + +/** + * Return codec bits per sample. + * Only return non-zero if the bits per sample is exactly correct, not an + * approximation. + * + * @param[in] codec_id the codec + * @return Number of bits per sample or zero if unknown for the given codec. + */ +int av_get_exact_bits_per_sample(enum AVCodecID codec_id); + +/** + * Return audio frame duration. + * + * @param avctx codec context + * @param frame_bytes size of the frame, or 0 if unknown + * @return frame duration, in samples, if known. 0 if not able to + * determine. + */ +int av_get_audio_frame_duration(AVCodecContext *avctx, int frame_bytes); + + +typedef struct AVBitStreamFilterContext { + void *priv_data; + struct AVBitStreamFilter *filter; + AVCodecParserContext *parser; + struct AVBitStreamFilterContext *next; + /** + * Internal default arguments, used if NULL is passed to av_bitstream_filter_filter(). + * Not for access by library users. + */ + char *args; +} AVBitStreamFilterContext; + + +typedef struct AVBitStreamFilter { + const char *name; + int priv_data_size; + int (*filter)(AVBitStreamFilterContext *bsfc, + AVCodecContext *avctx, const char *args, + uint8_t **poutbuf, int *poutbuf_size, + const uint8_t *buf, int buf_size, int keyframe); + void (*close)(AVBitStreamFilterContext *bsfc); + struct AVBitStreamFilter *next; +} AVBitStreamFilter; + +/** + * Register a bitstream filter. + * + * The filter will be accessible to the application code through + * av_bitstream_filter_next() or can be directly initialized with + * av_bitstream_filter_init(). + * + * @see avcodec_register_all() + */ +void av_register_bitstream_filter(AVBitStreamFilter *bsf); + +/** + * Create and initialize a bitstream filter context given a bitstream + * filter name. + * + * The returned context must be freed with av_bitstream_filter_close(). + * + * @param name the name of the bitstream filter + * @return a bitstream filter context if a matching filter was found + * and successfully initialized, NULL otherwise + */ +AVBitStreamFilterContext *av_bitstream_filter_init(const char *name); + +/** + * Filter bitstream. + * + * This function filters the buffer buf with size buf_size, and places the + * filtered buffer in the buffer pointed to by poutbuf. + * + * The output buffer must be freed by the caller. + * + * @param bsfc bitstream filter context created by av_bitstream_filter_init() + * @param avctx AVCodecContext accessed by the filter, may be NULL. + * If specified, this must point to the encoder context of the + * output stream the packet is sent to. + * @param args arguments which specify the filter configuration, may be NULL + * @param poutbuf pointer which is updated to point to the filtered buffer + * @param poutbuf_size pointer which is updated to the filtered buffer size in bytes + * @param buf buffer containing the data to filter + * @param buf_size size in bytes of buf + * @param keyframe set to non-zero if the buffer to filter corresponds to a key-frame packet data + * @return >= 0 in case of success, or a negative error code in case of failure + * + * If the return value is positive, an output buffer is allocated and + * is available in *poutbuf, and is distinct from the input buffer. + * + * If the return value is 0, the output buffer is not allocated and + * should be considered identical to the input buffer, or in case + * *poutbuf was set it points to the input buffer (not necessarily to + * its starting address). + */ +int av_bitstream_filter_filter(AVBitStreamFilterContext *bsfc, + AVCodecContext *avctx, const char *args, + uint8_t **poutbuf, int *poutbuf_size, + const uint8_t *buf, int buf_size, int keyframe); + +/** + * Release bitstream filter context. + * + * @param bsf the bitstream filter context created with + * av_bitstream_filter_init(), can be NULL + */ +void av_bitstream_filter_close(AVBitStreamFilterContext *bsf); + +/** + * If f is NULL, return the first registered bitstream filter, + * if f is non-NULL, return the next registered bitstream filter + * after f, or NULL if f is the last one. + * + * This function can be used to iterate over all registered bitstream + * filters. + */ +AVBitStreamFilter *av_bitstream_filter_next(const AVBitStreamFilter *f); + +/* memory */ + +/** + * Same behaviour av_fast_malloc but the buffer has additional + * AV_INPUT_BUFFER_PADDING_SIZE at the end which will always be 0. + * + * In addition the whole buffer will initially and after resizes + * be 0-initialized so that no uninitialized data will ever appear. + */ +void av_fast_padded_malloc(void *ptr, unsigned int *size, size_t min_size); + +/** + * Same behaviour av_fast_padded_malloc except that buffer will always + * be 0-initialized after call. + */ +void av_fast_padded_mallocz(void *ptr, unsigned int *size, size_t min_size); + +/** + * Encode extradata length to a buffer. Used by xiph codecs. + * + * @param s buffer to write to; must be at least (v/255+1) bytes long + * @param v size of extradata in bytes + * @return number of bytes written to the buffer. + */ +unsigned int av_xiphlacing(unsigned char *s, unsigned int v); + +#if FF_API_MISSING_SAMPLE +/** + * Log a generic warning message about a missing feature. This function is + * intended to be used internally by FFmpeg (libavcodec, libavformat, etc.) + * only, and would normally not be used by applications. + * @param[in] avc a pointer to an arbitrary struct of which the first field is + * a pointer to an AVClass struct + * @param[in] feature string containing the name of the missing feature + * @param[in] want_sample indicates if samples are wanted which exhibit this feature. + * If want_sample is non-zero, additional verbage will be added to the log + * message which tells the user how to report samples to the development + * mailing list. + * @deprecated Use avpriv_report_missing_feature() instead. + */ +attribute_deprecated +void av_log_missing_feature(void *avc, const char *feature, int want_sample); + +/** + * Log a generic warning message asking for a sample. This function is + * intended to be used internally by FFmpeg (libavcodec, libavformat, etc.) + * only, and would normally not be used by applications. + * @param[in] avc a pointer to an arbitrary struct of which the first field is + * a pointer to an AVClass struct + * @param[in] msg string containing an optional message, or NULL if no message + * @deprecated Use avpriv_request_sample() instead. + */ +attribute_deprecated +void av_log_ask_for_sample(void *avc, const char *msg, ...) av_printf_format(2, 3); +#endif /* FF_API_MISSING_SAMPLE */ + +/** + * Register the hardware accelerator hwaccel. + */ +void av_register_hwaccel(AVHWAccel *hwaccel); + +/** + * If hwaccel is NULL, returns the first registered hardware accelerator, + * if hwaccel is non-NULL, returns the next registered hardware accelerator + * after hwaccel, or NULL if hwaccel is the last one. + */ +AVHWAccel *av_hwaccel_next(const AVHWAccel *hwaccel); + + +/** + * Lock operation used by lockmgr + */ +enum AVLockOp { + AV_LOCK_CREATE, ///< Create a mutex + AV_LOCK_OBTAIN, ///< Lock the mutex + AV_LOCK_RELEASE, ///< Unlock the mutex + AV_LOCK_DESTROY, ///< Free mutex resources +}; + +/** + * Register a user provided lock manager supporting the operations + * specified by AVLockOp. The "mutex" argument to the function points + * to a (void *) where the lockmgr should store/get a pointer to a user + * allocated mutex. It is NULL upon AV_LOCK_CREATE and equal to the + * value left by the last call for all other ops. If the lock manager is + * unable to perform the op then it should leave the mutex in the same + * state as when it was called and return a non-zero value. However, + * when called with AV_LOCK_DESTROY the mutex will always be assumed to + * have been successfully destroyed. If av_lockmgr_register succeeds + * it will return a non-negative value, if it fails it will return a + * negative value and destroy all mutex and unregister all callbacks. + * av_lockmgr_register is not thread-safe, it must be called from a + * single thread before any calls which make use of locking are used. + * + * @param cb User defined callback. av_lockmgr_register invokes calls + * to this callback and the previously registered callback. + * The callback will be used to create more than one mutex + * each of which must be backed by its own underlying locking + * mechanism (i.e. do not use a single static object to + * implement your lock manager). If cb is set to NULL the + * lockmgr will be unregistered. + */ +int av_lockmgr_register(int (*cb)(void **mutex, enum AVLockOp op)); + +/** + * Get the type of the given codec. + */ +enum AVMediaType avcodec_get_type(enum AVCodecID codec_id); + +/** + * Get the name of a codec. + * @return a static string identifying the codec; never NULL + */ +const char *avcodec_get_name(enum AVCodecID id); + +/** + * @return a positive value if s is open (i.e. avcodec_open2() was called on it + * with no corresponding avcodec_close()), 0 otherwise. + */ +int avcodec_is_open(AVCodecContext *s); + +/** + * @return a non-zero number if codec is an encoder, zero otherwise + */ +int av_codec_is_encoder(const AVCodec *codec); + +/** + * @return a non-zero number if codec is a decoder, zero otherwise + */ +int av_codec_is_decoder(const AVCodec *codec); + +/** + * @return descriptor for given codec ID or NULL if no descriptor exists. + */ +const AVCodecDescriptor *avcodec_descriptor_get(enum AVCodecID id); + +/** + * Iterate over all codec descriptors known to libavcodec. + * + * @param prev previous descriptor. NULL to get the first descriptor. + * + * @return next descriptor or NULL after the last descriptor + */ +const AVCodecDescriptor *avcodec_descriptor_next(const AVCodecDescriptor *prev); + +/** + * @return codec descriptor with the given name or NULL if no such descriptor + * exists. + */ +const AVCodecDescriptor *avcodec_descriptor_get_by_name(const char *name); + +/** + * Allocate a CPB properties structure and initialize its fields to default + * values. + * + * @param size if non-NULL, the size of the allocated struct will be written + * here. This is useful for embedding it in side data. + * + * @return the newly allocated struct or NULL on failure + */ +AVCPBProperties *av_cpb_properties_alloc(size_t *size); + +/** + * @} + */ + +#endif /* AVCODEC_AVCODEC_H */ diff --git a/ext/at3_standalone/avfft.c b/ext/at3_standalone/avfft.c new file mode 100644 index 0000000000..53fc672209 --- /dev/null +++ b/ext/at3_standalone/avfft.c @@ -0,0 +1,178 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "attributes.h" +#include "avfft.h" +#include "fft.h" +#include "rdft.h" +#include "dct.h" + +/* FFT */ + +FFTContext *av_fft_init(int nbits, int inverse) +{ + FFTContext *s = av_mallocz(sizeof(*s)); + + if (s && ff_fft_init(s, nbits, inverse)) + av_freep(&s); + + return s; +} + +void av_fft_permute(FFTContext *s, FFTComplex *z) +{ + s->fft_permute(s, z); +} + +void av_fft_calc(FFTContext *s, FFTComplex *z) +{ + s->fft_calc(s, z); +} + +av_cold void av_fft_end(FFTContext *s) +{ + if (s) { + ff_fft_end(s); + av_free(s); + } +} + +#if CONFIG_MDCT + +FFTContext *av_mdct_init(int nbits, int inverse, double scale) +{ + FFTContext *s = av_malloc(sizeof(*s)); + + if (s && ff_mdct_init(s, nbits, inverse, scale)) + av_freep(&s); + + return s; +} + +void av_imdct_calc(FFTContext *s, FFTSample *output, const FFTSample *input) +{ + s->imdct_calc(s, output, input); +} + +void av_imdct_half(FFTContext *s, FFTSample *output, const FFTSample *input) +{ + s->imdct_half(s, output, input); +} + +void av_mdct_calc(FFTContext *s, FFTSample *output, const FFTSample *input) +{ + s->mdct_calc(s, output, input); +} + +av_cold void av_mdct_end(FFTContext *s) +{ + if (s) { + ff_mdct_end(s); + av_free(s); + } +} + +#endif /* CONFIG_MDCT */ + +#if CONFIG_RDFT + +RDFTContext *av_rdft_init(int nbits, enum RDFTransformType trans) +{ + RDFTContext *s = av_malloc(sizeof(*s)); + + if (s && ff_rdft_init(s, nbits, trans)) + av_freep(&s); + + return s; +} + +void av_rdft_calc(RDFTContext *s, FFTSample *data) +{ + s->rdft_calc(s, data); +} + +av_cold void av_rdft_end(RDFTContext *s) +{ + if (s) { + ff_rdft_end(s); + av_free(s); + } +} + +#endif /* CONFIG_RDFT */ + +#if CONFIG_DCT + +DCTContext *av_dct_init(int nbits, enum DCTTransformType inverse) +{ + DCTContext *s = av_malloc(sizeof(*s)); + + if (s && ff_dct_init(s, nbits, inverse)) + av_freep(&s); + + return s; +} + +void av_dct_calc(DCTContext *s, FFTSample *data) +{ + s->dct_calc(s, data); +} + +av_cold void av_dct_end(DCTContext *s) +{ + if (s) { + ff_dct_end(s); + av_free(s); + } +} + +#ifdef TEST +int main(int argc, char **argv) +{ + int i; +#define LEN 1024 + FFTSample *ref = av_malloc_array(LEN, sizeof(*ref)); + FFTSample *data = av_malloc_array(LEN, sizeof(*data)); + RDFTContext *rdft_context = av_rdft_init(10, DFT_R2C); + RDFTContext *irdft_context = av_rdft_init(10, IDFT_C2R); + + if (!ref || !data || !rdft_context || !irdft_context) + return 2; + for (i=0; i 1) { + fprintf(stderr, "Failed at %d (%f %f)\n", i, ref[i], data[i]/LEN*2); + return 1; + } + } + + av_rdft_end(rdft_context); + av_rdft_end(irdft_context); + av_free(data); + av_free(ref); + + return 0; +} +#endif + +#endif /* CONFIG_DCT */ diff --git a/ext/at3_standalone/avfft.h b/ext/at3_standalone/avfft.h new file mode 100644 index 0000000000..0c0f9b8d8d --- /dev/null +++ b/ext/at3_standalone/avfft.h @@ -0,0 +1,118 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVCODEC_AVFFT_H +#define AVCODEC_AVFFT_H + +/** + * @file + * @ingroup lavc_fft + * FFT functions + */ + +/** + * @defgroup lavc_fft FFT functions + * @ingroup lavc_misc + * + * @{ + */ + +typedef float FFTSample; + +typedef struct FFTComplex { + FFTSample re, im; +} FFTComplex; + +typedef struct FFTContext FFTContext; + +/** + * Set up a complex FFT. + * @param nbits log2 of the length of the input array + * @param inverse if 0 perform the forward transform, if 1 perform the inverse + */ +FFTContext *av_fft_init(int nbits, int inverse); + +/** + * Do the permutation needed BEFORE calling ff_fft_calc(). + */ +void av_fft_permute(FFTContext *s, FFTComplex *z); + +/** + * Do a complex FFT with the parameters defined in av_fft_init(). The + * input data must be permuted before. No 1.0/sqrt(n) normalization is done. + */ +void av_fft_calc(FFTContext *s, FFTComplex *z); + +void av_fft_end(FFTContext *s); + +FFTContext *av_mdct_init(int nbits, int inverse, double scale); +void av_imdct_calc(FFTContext *s, FFTSample *output, const FFTSample *input); +void av_imdct_half(FFTContext *s, FFTSample *output, const FFTSample *input); +void av_mdct_calc(FFTContext *s, FFTSample *output, const FFTSample *input); +void av_mdct_end(FFTContext *s); + +/* Real Discrete Fourier Transform */ + +enum RDFTransformType { + DFT_R2C, + IDFT_C2R, + IDFT_R2C, + DFT_C2R, +}; + +typedef struct RDFTContext RDFTContext; + +/** + * Set up a real FFT. + * @param nbits log2 of the length of the input array + * @param trans the type of transform + */ +RDFTContext *av_rdft_init(int nbits, enum RDFTransformType trans); +void av_rdft_calc(RDFTContext *s, FFTSample *data); +void av_rdft_end(RDFTContext *s); + +/* Discrete Cosine Transform */ + +typedef struct DCTContext DCTContext; + +enum DCTTransformType { + DCT_II = 0, + DCT_III, + DCT_I, + DST_I, +}; + +/** + * Set up DCT. + * + * @param nbits size of the input array: + * (1 << nbits) for DCT-II, DCT-III and DST-I + * (1 << nbits) + 1 for DCT-I + * @param type the type of transform + * + * @note the first element of the input of DST-I is ignored + */ +DCTContext *av_dct_init(int nbits, enum DCTTransformType type); +void av_dct_calc(DCTContext *s, FFTSample *data); +void av_dct_end (DCTContext *s); + +/** + * @} + */ + +#endif /* AVCODEC_AVFFT_H */ diff --git a/ext/at3_standalone/avutil.h b/ext/at3_standalone/avutil.h new file mode 100644 index 0000000000..9bcf674126 --- /dev/null +++ b/ext/at3_standalone/avutil.h @@ -0,0 +1,343 @@ +/* + * copyright (c) 2006 Michael Niedermayer + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVUTIL_AVUTIL_H +#define AVUTIL_AVUTIL_H + +/** + * @file + * external API header + */ + +/** + * @mainpage + * + * @section ffmpeg_intro Introduction + * + * This document describes the usage of the different libraries + * provided by FFmpeg. + * + * @li @ref libavc "libavcodec" encoding/decoding library + * @li @ref lavfi "libavfilter" graph-based frame editing library + * @li @ref libavf "libavformat" I/O and muxing/demuxing library + * @li @ref lavd "libavdevice" special devices muxing/demuxing library + * @li @ref lavu "libavutil" common utility library + * @li @ref lswr "libswresample" audio resampling, format conversion and mixing + * @li @ref lpp "libpostproc" post processing library + * @li @ref libsws "libswscale" color conversion and scaling library + * + * @section ffmpeg_versioning Versioning and compatibility + * + * Each of the FFmpeg libraries contains a version.h header, which defines a + * major, minor and micro version number with the + * LIBRARYNAME_VERSION_{MAJOR,MINOR,MICRO} macros. The major version + * number is incremented with backward incompatible changes - e.g. removing + * parts of the public API, reordering public struct members, etc. The minor + * version number is incremented for backward compatible API changes or major + * new features - e.g. adding a new public function or a new decoder. The micro + * version number is incremented for smaller changes that a calling program + * might still want to check for - e.g. changing behavior in a previously + * unspecified situation. + * + * FFmpeg guarantees backward API and ABI compatibility for each library as long + * as its major version number is unchanged. This means that no public symbols + * will be removed or renamed. Types and names of the public struct members and + * values of public macros and enums will remain the same (unless they were + * explicitly declared as not part of the public API). Documented behavior will + * not change. + * + * In other words, any correct program that works with a given FFmpeg snapshot + * should work just as well without any changes with any later snapshot with the + * same major versions. This applies to both rebuilding the program against new + * FFmpeg versions or to replacing the dynamic FFmpeg libraries that a program + * links against. + * + * However, new public symbols may be added and new members may be appended to + * public structs whose size is not part of public ABI (most public structs in + * FFmpeg). New macros and enum values may be added. Behavior in undocumented + * situations may change slightly (and be documented). All those are accompanied + * by an entry in doc/APIchanges and incrementing either the minor or micro + * version number. + */ + +/** + * @defgroup lavu Common utility functions + * + * @brief + * libavutil contains the code shared across all the other FFmpeg + * libraries + * + * @note In order to use the functions provided by avutil you must include + * the specific header. + * + * @{ + * + * @defgroup lavu_crypto Crypto and Hashing + * + * @{ + * @} + * + * @defgroup lavu_math Maths + * @{ + * + * @} + * + * @defgroup lavu_string String Manipulation + * + * @{ + * + * @} + * + * @defgroup lavu_mem Memory Management + * + * @{ + * + * @} + * + * @defgroup lavu_data Data Structures + * @{ + * + * @} + * + * @defgroup lavu_audio Audio related + * + * @{ + * + * @} + * + * @defgroup lavu_error Error Codes + * + * @{ + * + * @} + * + * @defgroup lavu_log Logging Facility + * + * @{ + * + * @} + * + * @defgroup lavu_misc Other + * + * @{ + * + * @defgroup preproc_misc Preprocessor String Macros + * + * @{ + * + * @} + * + * @defgroup version_utils Library Version Macros + * + * @{ + * + * @} + */ + + +/** + * @addtogroup lavu_ver + * @{ + */ + +/** + * Return the LIBAVUTIL_VERSION_INT constant. + */ +unsigned avutil_version(void); + +/** + * Return an informative version string. This usually is the actual release + * version number or a git commit description. This string has no fixed format + * and can change any time. It should never be parsed by code. + */ +const char *av_version_info(void); + +/** + * Return the libavutil build-time configuration. + */ +const char *avutil_configuration(void); + +/** + * Return the libavutil license. + */ +const char *avutil_license(void); + +/** + * @} + */ + +/** + * @addtogroup lavu_media Media Type + * @brief Media Type + */ + +enum AVMediaType { + AVMEDIA_TYPE_UNKNOWN = -1, ///< Usually treated as AVMEDIA_TYPE_DATA + AVMEDIA_TYPE_VIDEO, + AVMEDIA_TYPE_AUDIO, + AVMEDIA_TYPE_DATA, ///< Opaque data information usually continuous + AVMEDIA_TYPE_SUBTITLE, + AVMEDIA_TYPE_ATTACHMENT, ///< Opaque data information usually sparse + AVMEDIA_TYPE_NB +}; + +/** + * Return a string describing the media_type enum, NULL if media_type + * is unknown. + */ +const char *av_get_media_type_string(enum AVMediaType media_type); + +/** + * @defgroup lavu_const Constants + * @{ + * + * @defgroup lavu_enc Encoding specific + * + * @note those definition should move to avcodec + * @{ + */ + +#define FF_LAMBDA_SHIFT 7 +#define FF_LAMBDA_SCALE (1< + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + * byte swapping routines + */ + +#ifndef AVUTIL_BSWAP_H +#define AVUTIL_BSWAP_H + +#include +#include "compat.h" + +#ifdef HAVE_AV_CONFIG_H + +#include "config.h" + +#if ARCH_AARCH64 +# include "aarch64/bswap.h" +#elif ARCH_ARM +# include "arm/bswap.h" +#elif ARCH_AVR32 +# include "avr32/bswap.h" +#elif ARCH_SH4 +# include "sh4/bswap.h" +#elif ARCH_X86 +# include "x86/bswap.h" +#endif + +#endif /* HAVE_AV_CONFIG_H */ + +#define AV_BSWAP16C(x) (((x) << 8 & 0xff00) | ((x) >> 8 & 0x00ff)) +#define AV_BSWAP32C(x) (AV_BSWAP16C(x) << 16 | AV_BSWAP16C((x) >> 16)) +#define AV_BSWAP64C(x) (AV_BSWAP32C(x) << 32 | AV_BSWAP32C((x) >> 32)) + +#define AV_BSWAPC(s, x) AV_BSWAP##s##C(x) + +#ifndef av_bswap16 +static av_always_inline av_const uint16_t av_bswap16(uint16_t x) +{ + x= (x>>8) | (x<<8); + return x; +} +#endif + +#ifndef av_bswap32 +static av_always_inline av_const uint32_t av_bswap32(uint32_t x) +{ + return AV_BSWAP32C(x); +} +#endif + +#ifndef av_bswap64 +static inline uint64_t av_const av_bswap64(uint64_t x) +{ + return (uint64_t)av_bswap32((uint32_t)x) << 32 | av_bswap32(x >> 32); +} +#endif + +// be2ne ... big-endian to native-endian +// le2ne ... little-endian to native-endian + +#if AV_HAVE_BIGENDIAN +#define av_be2ne16(x) (x) +#define av_be2ne32(x) (x) +#define av_be2ne64(x) (x) +#define av_le2ne16(x) av_bswap16(x) +#define av_le2ne32(x) av_bswap32(x) +#define av_le2ne64(x) av_bswap64(x) +#define AV_BE2NEC(s, x) (x) +#define AV_LE2NEC(s, x) AV_BSWAPC(s, x) +#else +#define av_be2ne16(x) av_bswap16(x) +#define av_be2ne32(x) av_bswap32(x) +#define av_be2ne64(x) av_bswap64(x) +#define av_le2ne16(x) (x) +#define av_le2ne32(x) (x) +#define av_le2ne64(x) (x) +#define AV_BE2NEC(s, x) AV_BSWAPC(s, x) +#define AV_LE2NEC(s, x) (x) +#endif + +#define AV_BE2NE16C(x) AV_BE2NEC(16, x) +#define AV_BE2NE32C(x) AV_BE2NEC(32, x) +#define AV_BE2NE64C(x) AV_BE2NEC(64, x) +#define AV_LE2NE16C(x) AV_LE2NEC(16, x) +#define AV_LE2NE32C(x) AV_LE2NEC(32, x) +#define AV_LE2NE64C(x) AV_LE2NEC(64, x) + +#endif /* AVUTIL_BSWAP_H */ diff --git a/ext/at3_standalone/buffer.h b/ext/at3_standalone/buffer.h new file mode 100644 index 0000000000..b4399fd39f --- /dev/null +++ b/ext/at3_standalone/buffer.h @@ -0,0 +1,274 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + * @ingroup lavu_buffer + * refcounted data buffer API + */ + +#ifndef AVUTIL_BUFFER_H +#define AVUTIL_BUFFER_H + +#include + +/** + * @defgroup lavu_buffer AVBuffer + * @ingroup lavu_data + * + * @{ + * AVBuffer is an API for reference-counted data buffers. + * + * There are two core objects in this API -- AVBuffer and AVBufferRef. AVBuffer + * represents the data buffer itself; it is opaque and not meant to be accessed + * by the caller directly, but only through AVBufferRef. However, the caller may + * e.g. compare two AVBuffer pointers to check whether two different references + * are describing the same data buffer. AVBufferRef represents a single + * reference to an AVBuffer and it is the object that may be manipulated by the + * caller directly. + * + * There are two functions provided for creating a new AVBuffer with a single + * reference -- av_buffer_alloc() to just allocate a new buffer, and + * av_buffer_create() to wrap an existing array in an AVBuffer. From an existing + * reference, additional references may be created with av_buffer_ref(). + * Use av_buffer_unref() to free a reference (this will automatically free the + * data once all the references are freed). + * + * The convention throughout this API and the rest of FFmpeg is such that the + * buffer is considered writable if there exists only one reference to it (and + * it has not been marked as read-only). The av_buffer_is_writable() function is + * provided to check whether this is true and av_buffer_make_writable() will + * automatically create a new writable buffer when necessary. + * Of course nothing prevents the calling code from violating this convention, + * however that is safe only when all the existing references are under its + * control. + * + * @note Referencing and unreferencing the buffers is thread-safe and thus + * may be done from multiple threads simultaneously without any need for + * additional locking. + * + * @note Two different references to the same buffer can point to different + * parts of the buffer (i.e. their AVBufferRef.data will not be equal). + */ + +/** + * A reference counted buffer type. It is opaque and is meant to be used through + * references (AVBufferRef). + */ +typedef struct AVBuffer AVBuffer; + +/** + * A reference to a data buffer. + * + * The size of this struct is not a part of the public ABI and it is not meant + * to be allocated directly. + */ +typedef struct AVBufferRef { + AVBuffer *buffer; + + /** + * The data buffer. It is considered writable if and only if + * this is the only reference to the buffer, in which case + * av_buffer_is_writable() returns 1. + */ + uint8_t *data; + /** + * Size of data in bytes. + */ + int size; +} AVBufferRef; + +/** + * Allocate an AVBuffer of the given size using av_malloc(). + * + * @return an AVBufferRef of given size or NULL when out of memory + */ +AVBufferRef *av_buffer_alloc(int size); + +/** + * Same as av_buffer_alloc(), except the returned buffer will be initialized + * to zero. + */ +AVBufferRef *av_buffer_allocz(int size); + +/** + * Always treat the buffer as read-only, even when it has only one + * reference. + */ +#define AV_BUFFER_FLAG_READONLY (1 << 0) + +/** + * Create an AVBuffer from an existing array. + * + * If this function is successful, data is owned by the AVBuffer. The caller may + * only access data through the returned AVBufferRef and references derived from + * it. + * If this function fails, data is left untouched. + * @param data data array + * @param size size of data in bytes + * @param free a callback for freeing this buffer's data + * @param opaque parameter to be got for processing or passed to free + * @param flags a combination of AV_BUFFER_FLAG_* + * + * @return an AVBufferRef referring to data on success, NULL on failure. + */ +AVBufferRef *av_buffer_create(uint8_t *data, int size, + void (*free)(void *opaque, uint8_t *data), + void *opaque, int flags); + +/** + * Default free callback, which calls av_free() on the buffer data. + * This function is meant to be passed to av_buffer_create(), not called + * directly. + */ +void av_buffer_default_free(void *opaque, uint8_t *data); + +/** + * Create a new reference to an AVBuffer. + * + * @return a new AVBufferRef referring to the same AVBuffer as buf or NULL on + * failure. + */ +AVBufferRef *av_buffer_ref(AVBufferRef *buf); + +/** + * Free a given reference and automatically free the buffer if there are no more + * references to it. + * + * @param buf the reference to be freed. The pointer is set to NULL on return. + */ +void av_buffer_unref(AVBufferRef **buf); + +/** + * @return 1 if the caller may write to the data referred to by buf (which is + * true if and only if buf is the only reference to the underlying AVBuffer). + * Return 0 otherwise. + * A positive answer is valid until av_buffer_ref() is called on buf. + */ +int av_buffer_is_writable(const AVBufferRef *buf); + +/** + * @return the opaque parameter set by av_buffer_create. + */ +void *av_buffer_get_opaque(const AVBufferRef *buf); + +int av_buffer_get_ref_count(const AVBufferRef *buf); + +/** + * Create a writable reference from a given buffer reference, avoiding data copy + * if possible. + * + * @param buf buffer reference to make writable. On success, buf is either left + * untouched, or it is unreferenced and a new writable AVBufferRef is + * written in its place. On failure, buf is left untouched. + * @return 0 on success, a negative AVERROR on failure. + */ +int av_buffer_make_writable(AVBufferRef **buf); + +/** + * Reallocate a given buffer. + * + * @param buf a buffer reference to reallocate. On success, buf will be + * unreferenced and a new reference with the required size will be + * written in its place. On failure buf will be left untouched. *buf + * may be NULL, then a new buffer is allocated. + * @param size required new buffer size. + * @return 0 on success, a negative AVERROR on failure. + * + * @note the buffer is actually reallocated with av_realloc() only if it was + * initially allocated through av_buffer_realloc(NULL) and there is only one + * reference to it (i.e. the one passed to this function). In all other cases + * a new buffer is allocated and the data is copied. + */ +int av_buffer_realloc(AVBufferRef **buf, int size); + +/** + * @} + */ + +/** + * @defgroup lavu_bufferpool AVBufferPool + * @ingroup lavu_data + * + * @{ + * AVBufferPool is an API for a lock-free thread-safe pool of AVBuffers. + * + * Frequently allocating and freeing large buffers may be slow. AVBufferPool is + * meant to solve this in cases when the caller needs a set of buffers of the + * same size (the most obvious use case being buffers for raw video or audio + * frames). + * + * At the beginning, the user must call av_buffer_pool_init() to create the + * buffer pool. Then whenever a buffer is needed, call av_buffer_pool_get() to + * get a reference to a new buffer, similar to av_buffer_alloc(). This new + * reference works in all aspects the same way as the one created by + * av_buffer_alloc(). However, when the last reference to this buffer is + * unreferenced, it is returned to the pool instead of being freed and will be + * reused for subsequent av_buffer_pool_get() calls. + * + * When the caller is done with the pool and no longer needs to allocate any new + * buffers, av_buffer_pool_uninit() must be called to mark the pool as freeable. + * Once all the buffers are released, it will automatically be freed. + * + * Allocating and releasing buffers with this API is thread-safe as long as + * either the default alloc callback is used, or the user-supplied one is + * thread-safe. + */ + +/** + * The buffer pool. This structure is opaque and not meant to be accessed + * directly. It is allocated with av_buffer_pool_init() and freed with + * av_buffer_pool_uninit(). + */ +typedef struct AVBufferPool AVBufferPool; + +/** + * Allocate and initialize a buffer pool. + * + * @param size size of each buffer in this pool + * @param alloc a function that will be used to allocate new buffers when the + * pool is empty. May be NULL, then the default allocator will be used + * (av_buffer_alloc()). + * @return newly created buffer pool on success, NULL on error. + */ +AVBufferPool *av_buffer_pool_init(int size, AVBufferRef* (*alloc)(int size)); + +/** + * Mark the pool as being available for freeing. It will actually be freed only + * once all the allocated buffers associated with the pool are released. Thus it + * is safe to call this function while some of the allocated buffers are still + * in use. + * + * @param pool pointer to the pool to be freed. It will be set to NULL. + * @see av_buffer_pool_can_uninit() + */ +void av_buffer_pool_uninit(AVBufferPool **pool); + +/** + * Allocate a new AVBuffer, reusing an old buffer from the pool when available. + * This function may be called simultaneously from multiple threads. + * + * @return a reference to the new buffer on success, NULL on error. + */ +AVBufferRef *av_buffer_pool_get(AVBufferPool *pool); + +/** + * @} + */ + +#endif /* AVUTIL_BUFFER_H */ diff --git a/ext/at3_standalone/bytestream.h b/ext/at3_standalone/bytestream.h new file mode 100644 index 0000000000..f26004fca3 --- /dev/null +++ b/ext/at3_standalone/bytestream.h @@ -0,0 +1,374 @@ +/* + * Bytestream functions + * copyright (c) 2006 Baptiste Coudurier + * Copyright (c) 2012 Aneesh Dogra (lionaneesh) + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVCODEC_BYTESTREAM_H +#define AVCODEC_BYTESTREAM_H + +#include +#include + +#include "intreadwrite.h" + +typedef struct GetByteContext { + const uint8_t *buffer, *buffer_end, *buffer_start; +} GetByteContext; + +typedef struct PutByteContext { + uint8_t *buffer, *buffer_end, *buffer_start; + int eof; +} PutByteContext; + +#define DEF(type, name, bytes, read, write) \ +static av_always_inline type bytestream_get_ ## name(const uint8_t **b) \ +{ \ + (*b) += bytes; \ + return read(*b - bytes); \ +} \ +static av_always_inline void bytestream_put_ ## name(uint8_t **b, \ + const type value) \ +{ \ + write(*b, value); \ + (*b) += bytes; \ +} \ +static av_always_inline void bytestream2_put_ ## name ## u(PutByteContext *p, \ + const type value) \ +{ \ + bytestream_put_ ## name(&p->buffer, value); \ +} \ +static av_always_inline void bytestream2_put_ ## name(PutByteContext *p, \ + const type value) \ +{ \ + if (!p->eof && (p->buffer_end - p->buffer >= bytes)) { \ + write(p->buffer, value); \ + p->buffer += bytes; \ + } else \ + p->eof = 1; \ +} \ +static av_always_inline type bytestream2_get_ ## name ## u(GetByteContext *g) \ +{ \ + return bytestream_get_ ## name(&g->buffer); \ +} \ +static av_always_inline type bytestream2_get_ ## name(GetByteContext *g) \ +{ \ + if (g->buffer_end - g->buffer < bytes) { \ + g->buffer = g->buffer_end; \ + return 0; \ + } \ + return bytestream2_get_ ## name ## u(g); \ +} \ +static av_always_inline type bytestream2_peek_ ## name(GetByteContext *g) \ +{ \ + if (g->buffer_end - g->buffer < bytes) \ + return 0; \ + return read(g->buffer); \ +} + +DEF(uint64_t, le64, 8, AV_RL64, AV_WL64) +DEF(unsigned int, le32, 4, AV_RL32, AV_WL32) +DEF(unsigned int, le24, 3, AV_RL24, AV_WL24) +DEF(unsigned int, le16, 2, AV_RL16, AV_WL16) +DEF(uint64_t, be64, 8, AV_RB64, AV_WB64) +DEF(unsigned int, be32, 4, AV_RB32, AV_WB32) +DEF(unsigned int, be24, 3, AV_RB24, AV_WB24) +DEF(unsigned int, be16, 2, AV_RB16, AV_WB16) +DEF(unsigned int, byte, 1, AV_RB8 , AV_WB8) + +#if HAVE_BIGENDIAN +# define bytestream2_get_ne16 bytestream2_get_be16 +# define bytestream2_get_ne24 bytestream2_get_be24 +# define bytestream2_get_ne32 bytestream2_get_be32 +# define bytestream2_get_ne64 bytestream2_get_be64 +# define bytestream2_get_ne16u bytestream2_get_be16u +# define bytestream2_get_ne24u bytestream2_get_be24u +# define bytestream2_get_ne32u bytestream2_get_be32u +# define bytestream2_get_ne64u bytestream2_get_be64u +# define bytestream2_put_ne16 bytestream2_put_be16 +# define bytestream2_put_ne24 bytestream2_put_be24 +# define bytestream2_put_ne32 bytestream2_put_be32 +# define bytestream2_put_ne64 bytestream2_put_be64 +# define bytestream2_peek_ne16 bytestream2_peek_be16 +# define bytestream2_peek_ne24 bytestream2_peek_be24 +# define bytestream2_peek_ne32 bytestream2_peek_be32 +# define bytestream2_peek_ne64 bytestream2_peek_be64 +#else +# define bytestream2_get_ne16 bytestream2_get_le16 +# define bytestream2_get_ne24 bytestream2_get_le24 +# define bytestream2_get_ne32 bytestream2_get_le32 +# define bytestream2_get_ne64 bytestream2_get_le64 +# define bytestream2_get_ne16u bytestream2_get_le16u +# define bytestream2_get_ne24u bytestream2_get_le24u +# define bytestream2_get_ne32u bytestream2_get_le32u +# define bytestream2_get_ne64u bytestream2_get_le64u +# define bytestream2_put_ne16 bytestream2_put_le16 +# define bytestream2_put_ne24 bytestream2_put_le24 +# define bytestream2_put_ne32 bytestream2_put_le32 +# define bytestream2_put_ne64 bytestream2_put_le64 +# define bytestream2_peek_ne16 bytestream2_peek_le16 +# define bytestream2_peek_ne24 bytestream2_peek_le24 +# define bytestream2_peek_ne32 bytestream2_peek_le32 +# define bytestream2_peek_ne64 bytestream2_peek_le64 +#endif + +static av_always_inline void bytestream2_init(GetByteContext *g, + const uint8_t *buf, + int buf_size) +{ + av_assert0(buf_size >= 0); + g->buffer = buf; + g->buffer_start = buf; + g->buffer_end = buf + buf_size; +} + +static av_always_inline void bytestream2_init_writer(PutByteContext *p, + uint8_t *buf, + int buf_size) +{ + av_assert0(buf_size >= 0); + p->buffer = buf; + p->buffer_start = buf; + p->buffer_end = buf + buf_size; + p->eof = 0; +} + +static av_always_inline unsigned int bytestream2_get_bytes_left(GetByteContext *g) +{ + return g->buffer_end - g->buffer; +} + +static av_always_inline unsigned int bytestream2_get_bytes_left_p(PutByteContext *p) +{ + return p->buffer_end - p->buffer; +} + +static av_always_inline void bytestream2_skip(GetByteContext *g, + unsigned int size) +{ + g->buffer += FFMIN(g->buffer_end - g->buffer, size); +} + +static av_always_inline void bytestream2_skipu(GetByteContext *g, + unsigned int size) +{ + g->buffer += size; +} + +static av_always_inline void bytestream2_skip_p(PutByteContext *p, + unsigned int size) +{ + int size2; + if (p->eof) + return; + size2 = FFMIN(p->buffer_end - p->buffer, size); + if (size2 != size) + p->eof = 1; + p->buffer += size2; +} + +static av_always_inline int bytestream2_tell(GetByteContext *g) +{ + return (int)(g->buffer - g->buffer_start); +} + +static av_always_inline int bytestream2_tell_p(PutByteContext *p) +{ + return (int)(p->buffer - p->buffer_start); +} + +static av_always_inline int bytestream2_size(GetByteContext *g) +{ + return (int)(g->buffer_end - g->buffer_start); +} + +static av_always_inline int bytestream2_size_p(PutByteContext *p) +{ + return (int)(p->buffer_end - p->buffer_start); +} + +static av_always_inline int bytestream2_seek(GetByteContext *g, + int offset, + int whence) +{ + switch (whence) { + case SEEK_CUR: + offset = av_clip(offset, -(g->buffer - g->buffer_start), + g->buffer_end - g->buffer); + g->buffer += offset; + break; + case SEEK_END: + offset = av_clip(offset, -(g->buffer_end - g->buffer_start), 0); + g->buffer = g->buffer_end + offset; + break; + case SEEK_SET: + offset = av_clip(offset, 0, g->buffer_end - g->buffer_start); + g->buffer = g->buffer_start + offset; + break; + default: + return AVERROR(EINVAL); + } + return bytestream2_tell(g); +} + +static av_always_inline int bytestream2_seek_p(PutByteContext *p, + int offset, + int whence) +{ + p->eof = 0; + switch (whence) { + case SEEK_CUR: + if (p->buffer_end - p->buffer < offset) + p->eof = 1; + offset = av_clip(offset, -(p->buffer - p->buffer_start), + p->buffer_end - p->buffer); + p->buffer += offset; + break; + case SEEK_END: + if (offset > 0) + p->eof = 1; + offset = av_clip(offset, -(p->buffer_end - p->buffer_start), 0); + p->buffer = p->buffer_end + offset; + break; + case SEEK_SET: + if (p->buffer_end - p->buffer_start < offset) + p->eof = 1; + offset = av_clip(offset, 0, p->buffer_end - p->buffer_start); + p->buffer = p->buffer_start + offset; + break; + default: + return AVERROR(EINVAL); + } + return bytestream2_tell_p(p); +} + +static av_always_inline unsigned int bytestream2_get_buffer(GetByteContext *g, + uint8_t *dst, + unsigned int size) +{ + int size2 = FFMIN(g->buffer_end - g->buffer, size); + memcpy(dst, g->buffer, size2); + g->buffer += size2; + return size2; +} + +static av_always_inline unsigned int bytestream2_get_bufferu(GetByteContext *g, + uint8_t *dst, + unsigned int size) +{ + memcpy(dst, g->buffer, size); + g->buffer += size; + return size; +} + +static av_always_inline unsigned int bytestream2_put_buffer(PutByteContext *p, + const uint8_t *src, + unsigned int size) +{ + int size2; + if (p->eof) + return 0; + size2 = FFMIN(p->buffer_end - p->buffer, size); + if (size2 != size) + p->eof = 1; + memcpy(p->buffer, src, size2); + p->buffer += size2; + return size2; +} + +static av_always_inline unsigned int bytestream2_put_bufferu(PutByteContext *p, + const uint8_t *src, + unsigned int size) +{ + memcpy(p->buffer, src, size); + p->buffer += size; + return size; +} + +static av_always_inline void bytestream2_set_buffer(PutByteContext *p, + const uint8_t c, + unsigned int size) +{ + int size2; + if (p->eof) + return; + size2 = FFMIN(p->buffer_end - p->buffer, size); + if (size2 != size) + p->eof = 1; + memset(p->buffer, c, size2); + p->buffer += size2; +} + +static av_always_inline void bytestream2_set_bufferu(PutByteContext *p, + const uint8_t c, + unsigned int size) +{ + memset(p->buffer, c, size); + p->buffer += size; +} + +static av_always_inline unsigned int bytestream2_get_eof(PutByteContext *p) +{ + return p->eof; +} + +static av_always_inline unsigned int bytestream2_copy_bufferu(PutByteContext *p, + GetByteContext *g, + unsigned int size) +{ + memcpy(p->buffer, g->buffer, size); + p->buffer += size; + g->buffer += size; + return size; +} + +static av_always_inline unsigned int bytestream2_copy_buffer(PutByteContext *p, + GetByteContext *g, + unsigned int size) +{ + int size2; + + if (p->eof) + return 0; + size = FFMIN(g->buffer_end - g->buffer, size); + size2 = FFMIN(p->buffer_end - p->buffer, size); + if (size2 != size) + p->eof = 1; + + return bytestream2_copy_bufferu(p, g, size2); +} + +static av_always_inline unsigned int bytestream_get_buffer(const uint8_t **b, + uint8_t *dst, + unsigned int size) +{ + memcpy(dst, *b, size); + (*b) += size; + return size; +} + +static av_always_inline void bytestream_put_buffer(uint8_t **b, + const uint8_t *src, + unsigned int size) +{ + memcpy(*b, src, size); + (*b) += size; +} + +#endif /* AVCODEC_BYTESTREAM_H */ diff --git a/ext/at3_standalone/channel_layout.h b/ext/at3_standalone/channel_layout.h new file mode 100644 index 0000000000..ec7effead1 --- /dev/null +++ b/ext/at3_standalone/channel_layout.h @@ -0,0 +1,223 @@ +/* + * Copyright (c) 2006 Michael Niedermayer + * Copyright (c) 2008 Peter Ross + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVUTIL_CHANNEL_LAYOUT_H +#define AVUTIL_CHANNEL_LAYOUT_H + +#include + +/** + * @file + * audio channel layout utility functions + */ + +/** + * @addtogroup lavu_audio + * @{ + */ + +/** + * @defgroup channel_masks Audio channel masks + * + * A channel layout is a 64-bits integer with a bit set for every channel. + * The number of bits set must be equal to the number of channels. + * The value 0 means that the channel layout is not known. + * @note this data structure is not powerful enough to handle channels + * combinations that have the same channel multiple times, such as + * dual-mono. + * + * @{ + */ +#define AV_CH_FRONT_LEFT 0x00000001 +#define AV_CH_FRONT_RIGHT 0x00000002 +#define AV_CH_FRONT_CENTER 0x00000004 +#define AV_CH_LOW_FREQUENCY 0x00000008 +#define AV_CH_BACK_LEFT 0x00000010 +#define AV_CH_BACK_RIGHT 0x00000020 +#define AV_CH_FRONT_LEFT_OF_CENTER 0x00000040 +#define AV_CH_FRONT_RIGHT_OF_CENTER 0x00000080 +#define AV_CH_BACK_CENTER 0x00000100 +#define AV_CH_SIDE_LEFT 0x00000200 +#define AV_CH_SIDE_RIGHT 0x00000400 +#define AV_CH_TOP_CENTER 0x00000800 +#define AV_CH_TOP_FRONT_LEFT 0x00001000 +#define AV_CH_TOP_FRONT_CENTER 0x00002000 +#define AV_CH_TOP_FRONT_RIGHT 0x00004000 +#define AV_CH_TOP_BACK_LEFT 0x00008000 +#define AV_CH_TOP_BACK_CENTER 0x00010000 +#define AV_CH_TOP_BACK_RIGHT 0x00020000 +#define AV_CH_STEREO_LEFT 0x20000000 ///< Stereo downmix. +#define AV_CH_STEREO_RIGHT 0x40000000 ///< See AV_CH_STEREO_LEFT. +#define AV_CH_WIDE_LEFT 0x0000000080000000ULL +#define AV_CH_WIDE_RIGHT 0x0000000100000000ULL +#define AV_CH_SURROUND_DIRECT_LEFT 0x0000000200000000ULL +#define AV_CH_SURROUND_DIRECT_RIGHT 0x0000000400000000ULL +#define AV_CH_LOW_FREQUENCY_2 0x0000000800000000ULL + +/** Channel mask value used for AVCodecContext.request_channel_layout + to indicate that the user requests the channel order of the decoder output + to be the native codec channel order. */ +#define AV_CH_LAYOUT_NATIVE 0x8000000000000000ULL + +/** + * @} + * @defgroup channel_mask_c Audio channel layouts + * @{ + * */ +#define AV_CH_LAYOUT_MONO (AV_CH_FRONT_CENTER) +#define AV_CH_LAYOUT_STEREO (AV_CH_FRONT_LEFT|AV_CH_FRONT_RIGHT) +#define AV_CH_LAYOUT_2POINT1 (AV_CH_LAYOUT_STEREO|AV_CH_LOW_FREQUENCY) +#define AV_CH_LAYOUT_2_1 (AV_CH_LAYOUT_STEREO|AV_CH_BACK_CENTER) +#define AV_CH_LAYOUT_SURROUND (AV_CH_LAYOUT_STEREO|AV_CH_FRONT_CENTER) +#define AV_CH_LAYOUT_3POINT1 (AV_CH_LAYOUT_SURROUND|AV_CH_LOW_FREQUENCY) +#define AV_CH_LAYOUT_4POINT0 (AV_CH_LAYOUT_SURROUND|AV_CH_BACK_CENTER) +#define AV_CH_LAYOUT_4POINT1 (AV_CH_LAYOUT_4POINT0|AV_CH_LOW_FREQUENCY) +#define AV_CH_LAYOUT_2_2 (AV_CH_LAYOUT_STEREO|AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT) +#define AV_CH_LAYOUT_QUAD (AV_CH_LAYOUT_STEREO|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT) +#define AV_CH_LAYOUT_5POINT0 (AV_CH_LAYOUT_SURROUND|AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT) +#define AV_CH_LAYOUT_5POINT1 (AV_CH_LAYOUT_5POINT0|AV_CH_LOW_FREQUENCY) +#define AV_CH_LAYOUT_5POINT0_BACK (AV_CH_LAYOUT_SURROUND|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT) +#define AV_CH_LAYOUT_5POINT1_BACK (AV_CH_LAYOUT_5POINT0_BACK|AV_CH_LOW_FREQUENCY) +#define AV_CH_LAYOUT_6POINT0 (AV_CH_LAYOUT_5POINT0|AV_CH_BACK_CENTER) +#define AV_CH_LAYOUT_6POINT0_FRONT (AV_CH_LAYOUT_2_2|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER) +#define AV_CH_LAYOUT_HEXAGONAL (AV_CH_LAYOUT_5POINT0_BACK|AV_CH_BACK_CENTER) +#define AV_CH_LAYOUT_6POINT1 (AV_CH_LAYOUT_5POINT1|AV_CH_BACK_CENTER) +#define AV_CH_LAYOUT_6POINT1_BACK (AV_CH_LAYOUT_5POINT1_BACK|AV_CH_BACK_CENTER) +#define AV_CH_LAYOUT_6POINT1_FRONT (AV_CH_LAYOUT_6POINT0_FRONT|AV_CH_LOW_FREQUENCY) +#define AV_CH_LAYOUT_7POINT0 (AV_CH_LAYOUT_5POINT0|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT) +#define AV_CH_LAYOUT_7POINT0_FRONT (AV_CH_LAYOUT_5POINT0|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER) +#define AV_CH_LAYOUT_7POINT1 (AV_CH_LAYOUT_5POINT1|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT) +#define AV_CH_LAYOUT_7POINT1_WIDE (AV_CH_LAYOUT_5POINT1|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER) +#define AV_CH_LAYOUT_7POINT1_WIDE_BACK (AV_CH_LAYOUT_5POINT1_BACK|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER) +#define AV_CH_LAYOUT_OCTAGONAL (AV_CH_LAYOUT_5POINT0|AV_CH_BACK_LEFT|AV_CH_BACK_CENTER|AV_CH_BACK_RIGHT) +#define AV_CH_LAYOUT_HEXADECAGONAL (AV_CH_LAYOUT_OCTAGONAL|AV_CH_WIDE_LEFT|AV_CH_WIDE_RIGHT|AV_CH_TOP_BACK_LEFT|AV_CH_TOP_BACK_RIGHT|AV_CH_TOP_BACK_CENTER|AV_CH_TOP_FRONT_CENTER|AV_CH_TOP_FRONT_LEFT|AV_CH_TOP_FRONT_RIGHT) +#define AV_CH_LAYOUT_STEREO_DOWNMIX (AV_CH_STEREO_LEFT|AV_CH_STEREO_RIGHT) + +enum AVMatrixEncoding { + AV_MATRIX_ENCODING_NONE, + AV_MATRIX_ENCODING_DOLBY, + AV_MATRIX_ENCODING_DPLII, + AV_MATRIX_ENCODING_DPLIIX, + AV_MATRIX_ENCODING_DPLIIZ, + AV_MATRIX_ENCODING_DOLBYEX, + AV_MATRIX_ENCODING_DOLBYHEADPHONE, + AV_MATRIX_ENCODING_NB +}; + +/** + * Return a channel layout id that matches name, or 0 if no match is found. + * + * name can be one or several of the following notations, + * separated by '+' or '|': + * - the name of an usual channel layout (mono, stereo, 4.0, quad, 5.0, + * 5.0(side), 5.1, 5.1(side), 7.1, 7.1(wide), downmix); + * - the name of a single channel (FL, FR, FC, LFE, BL, BR, FLC, FRC, BC, + * SL, SR, TC, TFL, TFC, TFR, TBL, TBC, TBR, DL, DR); + * - a number of channels, in decimal, optionally followed by 'c', yielding + * the default channel layout for that number of channels (@see + * av_get_default_channel_layout); + * - a channel layout mask, in hexadecimal starting with "0x" (see the + * AV_CH_* macros). + * + * @warning Starting from the next major bump the trailing character + * 'c' to specify a number of channels will be required, while a + * channel layout mask could also be specified as a decimal number + * (if and only if not followed by "c"). + * + * Example: "stereo+FC" = "2c+FC" = "2c+1c" = "0x7" + */ +uint64_t av_get_channel_layout(const char *name); + +/** + * Return a description of a channel layout. + * If nb_channels is <= 0, it is guessed from the channel_layout. + * + * @param buf put here the string containing the channel layout + * @param buf_size size in bytes of the buffer + */ +void av_get_channel_layout_string(char *buf, int buf_size, int nb_channels, uint64_t channel_layout); + +struct AVBPrint; +/** + * Append a description of a channel layout to a bprint buffer. + */ +void av_bprint_channel_layout(struct AVBPrint *bp, int nb_channels, uint64_t channel_layout); + +/** + * Return the number of channels in the channel layout. + */ +int av_get_channel_layout_nb_channels(uint64_t channel_layout); + +/** + * Return default channel layout for a given number of channels. + */ +int64_t av_get_default_channel_layout(int nb_channels); + +/** + * Get the index of a channel in channel_layout. + * + * @param channel a channel layout describing exactly one channel which must be + * present in channel_layout. + * + * @return index of channel in channel_layout on success, a negative AVERROR + * on error. + */ +int av_get_channel_layout_channel_index(uint64_t channel_layout, + uint64_t channel); + +/** + * Get the channel with the given index in channel_layout. + */ +uint64_t av_channel_layout_extract_channel(uint64_t channel_layout, int index); + +/** + * Get the name of a given channel. + * + * @return channel name on success, NULL on error. + */ +const char *av_get_channel_name(uint64_t channel); + +/** + * Get the description of a given channel. + * + * @param channel a channel layout with a single channel + * @return channel description on success, NULL on error + */ +const char *av_get_channel_description(uint64_t channel); + +/** + * Get the value and name of a standard channel layout. + * + * @param[in] index index in an internal list, starting at 0 + * @param[out] layout channel layout mask + * @param[out] name name of the layout + * @return 0 if the layout exists, + * <0 if index is beyond the limits + */ +int av_get_standard_channel_layout(unsigned index, uint64_t *layout, + const char **name); + +/** + * @} + * @} + */ + +#endif /* AVUTIL_CHANNEL_LAYOUT_H */ diff --git a/ext/at3_standalone/common.h b/ext/at3_standalone/common.h new file mode 100644 index 0000000000..774fc43748 --- /dev/null +++ b/ext/at3_standalone/common.h @@ -0,0 +1,529 @@ +/* + * copyright (c) 2006 Michael Niedermayer + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + * common internal and external API header + */ + +#ifndef AVUTIL_COMMON_H +#define AVUTIL_COMMON_H + +#if defined(__cplusplus) && !defined(__STDC_CONSTANT_MACROS) && !defined(UINT64_C) +#error missing -D__STDC_CONSTANT_MACROS / #define __STDC_CONSTANT_MACROS +#endif + +#include +#include +#include +#include +#include +#include +#include +#include + +#include "compat.h" +#include "macros.h" +#include "version.h" + +#if AV_HAVE_BIGENDIAN +# define AV_NE(be, le) (be) +#else +# define AV_NE(be, le) (le) +#endif + +//rounded division & shift +#define RSHIFT(a,b) ((a) > 0 ? ((a) + ((1<<(b))>>1))>>(b) : ((a) + ((1<<(b))>>1)-1)>>(b)) +/* assume b>0 */ +#define ROUNDED_DIV(a,b) (((a)>0 ? (a) + ((b)>>1) : (a) - ((b)>>1))/(b)) +/* Fast a/(1<=0 and b>=0 */ +#define AV_CEIL_RSHIFT(a,b) (!av_builtin_constant_p(b) ? -((-(a)) >> (b)) \ + : ((a) + (1<<(b)) - 1) >> (b)) +/* Backwards compat. */ +#define FF_CEIL_RSHIFT AV_CEIL_RSHIFT + +#define FFUDIV(a,b) (((a)>0 ?(a):(a)-(b)+1) / (b)) +#define FFUMOD(a,b) ((a)-(b)*FFUDIV(a,b)) + +/** + * Absolute value, Note, INT_MIN / INT64_MIN result in undefined behavior as they + * are not representable as absolute values of their type. This is the same + * as with *abs() + * @see FFNABS() + */ +#define FFABS(a) ((a) >= 0 ? (a) : (-(a))) +#define FFSIGN(a) ((a) > 0 ? 1 : -1) + +/** + * Negative Absolute value. + * this works for all integers of all types. + * As with many macros, this evaluates its argument twice, it thus must not have + * a sideeffect, that is FFNABS(x++) has undefined behavior. + */ +#define FFNABS(a) ((a) <= 0 ? (a) : (-(a))) + +/** + * Comparator. + * For two numerical expressions x and y, gives 1 if x > y, -1 if x < y, and 0 + * if x == y. This is useful for instance in a qsort comparator callback. + * Furthermore, compilers are able to optimize this to branchless code, and + * there is no risk of overflow with signed types. + * As with many macros, this evaluates its argument multiple times, it thus + * must not have a side-effect. + */ +#define FFDIFFSIGN(x,y) (((x)>(y)) - ((x)<(y))) + +#define FFMAX(a,b) ((a) > (b) ? (a) : (b)) +#define FFMAX3(a,b,c) FFMAX(FFMAX(a,b),c) +#define FFMIN(a,b) ((a) > (b) ? (b) : (a)) +#define FFMIN3(a,b,c) FFMIN(FFMIN(a,b),c) + +#define FFSWAP(type,a,b) do{type SWAP_tmp= b; b= a; a= SWAP_tmp;}while(0) +#define FF_ARRAY_ELEMS(a) (sizeof(a) / sizeof((a)[0])) + +/* misc math functions */ + +#ifdef HAVE_AV_CONFIG_H +# include "config.h" +# include "intmath.h" +#endif + +/* Pull in unguarded fallback defines at the end of this file. */ +#include "common.h" + +#ifndef av_log2 +av_const int av_log2(unsigned v); +#endif + +#ifndef av_log2_16bit +av_const int av_log2_16bit(unsigned v); +#endif + +/** + * Clip a signed integer value into the amin-amax range. + * @param a value to clip + * @param amin minimum value of the clip range + * @param amax maximum value of the clip range + * @return clipped value + */ +static av_always_inline av_const int av_clip_c(int a, int amin, int amax) +{ +#if defined(HAVE_AV_CONFIG_H) && defined(ASSERT_LEVEL) && ASSERT_LEVEL >= 2 + if (amin > amax) abort(); +#endif + if (a < amin) return amin; + else if (a > amax) return amax; + else return a; +} + +/** + * Clip a signed 64bit integer value into the amin-amax range. + * @param a value to clip + * @param amin minimum value of the clip range + * @param amax maximum value of the clip range + * @return clipped value + */ +static av_always_inline av_const int64_t av_clip64_c(int64_t a, int64_t amin, int64_t amax) +{ +#if defined(HAVE_AV_CONFIG_H) && defined(ASSERT_LEVEL) && ASSERT_LEVEL >= 2 + if (amin > amax) abort(); +#endif + if (a < amin) return amin; + else if (a > amax) return amax; + else return a; +} + +/** + * Clip a signed integer value into the 0-255 range. + * @param a value to clip + * @return clipped value + */ +static av_always_inline av_const uint8_t av_clip_uint8_c(int a) +{ + if (a&(~0xFF)) return (-a)>>31; + else return a; +} + +/** + * Clip a signed integer value into the -128,127 range. + * @param a value to clip + * @return clipped value + */ +static av_always_inline av_const int8_t av_clip_int8_c(int a) +{ + if ((a+0x80U) & ~0xFF) return (a>>31) ^ 0x7F; + else return a; +} + +/** + * Clip a signed integer value into the 0-65535 range. + * @param a value to clip + * @return clipped value + */ +static av_always_inline av_const uint16_t av_clip_uint16_c(int a) +{ + if (a&(~0xFFFF)) return (-a)>>31; + else return a; +} + +/** + * Clip a signed integer value into the -32768,32767 range. + * @param a value to clip + * @return clipped value + */ +static av_always_inline av_const int16_t av_clip_int16_c(int a) +{ + if ((a+0x8000U) & ~0xFFFF) return (a>>31) ^ 0x7FFF; + else return a; +} + +/** + * Clip a signed 64-bit integer value into the -2147483648,2147483647 range. + * @param a value to clip + * @return clipped value + */ +static av_always_inline av_const int32_t av_clipl_int32_c(int64_t a) +{ + if ((a+0x80000000u) & ~UINT64_C(0xFFFFFFFF)) return (int32_t)((a>>63) ^ 0x7FFFFFFF); + else return (int32_t)a; +} + +/** + * Clip a signed integer into the -(2^p),(2^p-1) range. + * @param a value to clip + * @param p bit position to clip at + * @return clipped value + */ +static av_always_inline av_const int av_clip_intp2_c(int a, int p) +{ + if (((unsigned)a + (1 << p)) & ~((2 << p) - 1)) + return (a >> 31) ^ ((1 << p) - 1); + else + return a; +} + +/** + * Clip a signed integer to an unsigned power of two range. + * @param a value to clip + * @param p bit position to clip at + * @return clipped value + */ +static av_always_inline av_const unsigned av_clip_uintp2_c(int a, int p) +{ + if (a & ~((1<> 31 & ((1<= 2 + if (amin > amax) abort(); +#endif + if (a < amin) return amin; + else if (a > amax) return amax; + else return a; +} + +/** + * Clip a double value into the amin-amax range. + * @param a value to clip + * @param amin minimum value of the clip range + * @param amax maximum value of the clip range + * @return clipped value + */ +static av_always_inline av_const double av_clipd_c(double a, double amin, double amax) +{ +#if defined(HAVE_AV_CONFIG_H) && defined(ASSERT_LEVEL) && ASSERT_LEVEL >= 2 + if (amin > amax) abort(); +#endif + if (a < amin) return amin; + else if (a > amax) return amax; + else return a; +} + +/** Compute ceil(log2(x)). + * @param x value used to compute ceil(log2(x)) + * @return computed ceiling of log2(x) + */ +static av_always_inline av_const int av_ceil_log2_c(int x) +{ + return av_log2((x - 1) << 1); +} + +/** + * Count number of bits set to one in x + * @param x value to count bits of + * @return the number of bits set to one in x + */ +static av_always_inline av_const int av_popcount_c(uint32_t x) +{ + x -= (x >> 1) & 0x55555555; + x = (x & 0x33333333) + ((x >> 2) & 0x33333333); + x = (x + (x >> 4)) & 0x0F0F0F0F; + x += x >> 8; + return (x + (x >> 16)) & 0x3F; +} + +/** + * Count number of bits set to one in x + * @param x value to count bits of + * @return the number of bits set to one in x + */ +static av_always_inline av_const int av_popcount64_c(uint64_t x) +{ + return av_popcount((uint32_t)x) + av_popcount((uint32_t)(x >> 32)); +} + +static av_always_inline av_const int av_parity_c(uint32_t v) +{ + return av_popcount(v) & 1; +} + +#define MKTAG(a,b,c,d) ((a) | ((b) << 8) | ((c) << 16) | ((unsigned)(d) << 24)) +#define MKBETAG(a,b,c,d) ((d) | ((c) << 8) | ((b) << 16) | ((unsigned)(a) << 24)) + +/** + * Convert a UTF-8 character (up to 4 bytes) to its 32-bit UCS-4 encoded form. + * + * @param val Output value, must be an lvalue of type uint32_t. + * @param GET_BYTE Expression reading one byte from the input. + * Evaluated up to 7 times (4 for the currently + * assigned Unicode range). With a memory buffer + * input, this could be *ptr++. + * @param ERROR Expression to be evaluated on invalid input, + * typically a goto statement. + * + * @warning ERROR should not contain a loop control statement which + * could interact with the internal while loop, and should force an + * exit from the macro code (e.g. through a goto or a return) in order + * to prevent undefined results. + */ +#define GET_UTF8(val, GET_BYTE, ERROR)\ + val= (GET_BYTE);\ + {\ + uint32_t top = (val & 128) >> 1;\ + if ((val & 0xc0) == 0x80 || val >= 0xFE)\ + ERROR\ + while (val & top) {\ + int tmp= (GET_BYTE) - 128;\ + if(tmp>>6)\ + ERROR\ + val= (val<<6) + tmp;\ + top <<= 5;\ + }\ + val &= (top << 1) - 1;\ + } + +/** + * Convert a UTF-16 character (2 or 4 bytes) to its 32-bit UCS-4 encoded form. + * + * @param val Output value, must be an lvalue of type uint32_t. + * @param GET_16BIT Expression returning two bytes of UTF-16 data converted + * to native byte order. Evaluated one or two times. + * @param ERROR Expression to be evaluated on invalid input, + * typically a goto statement. + */ +#define GET_UTF16(val, GET_16BIT, ERROR)\ + val = GET_16BIT;\ + {\ + unsigned int hi = val - 0xD800;\ + if (hi < 0x800) {\ + val = GET_16BIT - 0xDC00;\ + if (val > 0x3FFU || hi > 0x3FFU)\ + ERROR\ + val += (hi<<10) + 0x10000;\ + }\ + }\ + +/** + * @def PUT_UTF8(val, tmp, PUT_BYTE) + * Convert a 32-bit Unicode character to its UTF-8 encoded form (up to 4 bytes long). + * @param val is an input-only argument and should be of type uint32_t. It holds + * a UCS-4 encoded Unicode character that is to be converted to UTF-8. If + * val is given as a function it is executed only once. + * @param tmp is a temporary variable and should be of type uint8_t. It + * represents an intermediate value during conversion that is to be + * output by PUT_BYTE. + * @param PUT_BYTE writes the converted UTF-8 bytes to any proper destination. + * It could be a function or a statement, and uses tmp as the input byte. + * For example, PUT_BYTE could be "*output++ = tmp;" PUT_BYTE will be + * executed up to 4 times for values in the valid UTF-8 range and up to + * 7 times in the general case, depending on the length of the converted + * Unicode character. + */ +#define PUT_UTF8(val, tmp, PUT_BYTE)\ + {\ + int bytes, shift;\ + uint32_t in = val;\ + if (in < 0x80) {\ + tmp = in;\ + PUT_BYTE\ + } else {\ + bytes = (av_log2(in) + 4) / 5;\ + shift = (bytes - 1) * 6;\ + tmp = (256 - (256 >> bytes)) | (in >> shift);\ + PUT_BYTE\ + while (shift >= 6) {\ + shift -= 6;\ + tmp = 0x80 | ((in >> shift) & 0x3f);\ + PUT_BYTE\ + }\ + }\ + } + +/** + * @def PUT_UTF16(val, tmp, PUT_16BIT) + * Convert a 32-bit Unicode character to its UTF-16 encoded form (2 or 4 bytes). + * @param val is an input-only argument and should be of type uint32_t. It holds + * a UCS-4 encoded Unicode character that is to be converted to UTF-16. If + * val is given as a function it is executed only once. + * @param tmp is a temporary variable and should be of type uint16_t. It + * represents an intermediate value during conversion that is to be + * output by PUT_16BIT. + * @param PUT_16BIT writes the converted UTF-16 data to any proper destination + * in desired endianness. It could be a function or a statement, and uses tmp + * as the input byte. For example, PUT_BYTE could be "*output++ = tmp;" + * PUT_BYTE will be executed 1 or 2 times depending on input character. + */ +#define PUT_UTF16(val, tmp, PUT_16BIT)\ + {\ + uint32_t in = val;\ + if (in < 0x10000) {\ + tmp = in;\ + PUT_16BIT\ + } else {\ + tmp = 0xD800 | ((in - 0x10000) >> 10);\ + PUT_16BIT\ + tmp = 0xDC00 | ((in - 0x10000) & 0x3FF);\ + PUT_16BIT\ + }\ + }\ + + + +#include "mem.h" + +#ifdef HAVE_AV_CONFIG_H +# include "internal.h" +#endif /* HAVE_AV_CONFIG_H */ + +#endif /* AVUTIL_COMMON_H */ + +/* + * The following definitions are outside the multiple inclusion guard + * to ensure they are immediately available in intmath.h. + */ + +#ifndef av_ceil_log2 +# define av_ceil_log2 av_ceil_log2_c +#endif +#ifndef av_clip +# define av_clip av_clip_c +#endif +#ifndef av_clip64 +# define av_clip64 av_clip64_c +#endif +#ifndef av_clip_uint8 +# define av_clip_uint8 av_clip_uint8_c +#endif +#ifndef av_clip_int8 +# define av_clip_int8 av_clip_int8_c +#endif +#ifndef av_clip_uint16 +# define av_clip_uint16 av_clip_uint16_c +#endif +#ifndef av_clip_int16 +# define av_clip_int16 av_clip_int16_c +#endif +#ifndef av_clipl_int32 +# define av_clipl_int32 av_clipl_int32_c +#endif +#ifndef av_clip_intp2 +# define av_clip_intp2 av_clip_intp2_c +#endif +#ifndef av_clip_uintp2 +# define av_clip_uintp2 av_clip_uintp2_c +#endif +#ifndef av_mod_uintp2 +# define av_mod_uintp2 av_mod_uintp2_c +#endif +#ifndef av_sat_add32 +# define av_sat_add32 av_sat_add32_c +#endif +#ifndef av_sat_dadd32 +# define av_sat_dadd32 av_sat_dadd32_c +#endif +#ifndef av_clipf +# define av_clipf av_clipf_c +#endif +#ifndef av_clipd +# define av_clipd av_clipd_c +#endif +#ifndef av_popcount +# define av_popcount av_popcount_c +#endif +#ifndef av_popcount64 +# define av_popcount64 av_popcount64_c +#endif +#ifndef av_parity +# define av_parity av_parity_c +#endif diff --git a/ext/at3_standalone/compat.h b/ext/at3_standalone/compat.h new file mode 100644 index 0000000000..5d2e6f1e6d --- /dev/null +++ b/ext/at3_standalone/compat.h @@ -0,0 +1,23 @@ +#pragma once + +// Compat hacks + +#define av_cold +#define DECLARE_ALIGNED(bits, type, name) type name +#define LOCAL_ALIGNED(bits, type, name, subscript) type name subscript +#define av_restrict +#define av_always_inline __forceinline +#define av_const +#define av_alias +#define av_unused +#define av_pure +#define av_warn_unused_result +#define av_assert0(cond) +#define av_assert1(cond) +#define av_assert2(cond) +#define av_log(...) +#define attribute_deprecated +#define av_printf_format(a,b) +#define avpriv_report_missing_feature(...) + +#include "error.h" diff --git a/ext/at3_standalone/config.h b/ext/at3_standalone/config.h new file mode 100644 index 0000000000..3a35817363 --- /dev/null +++ b/ext/at3_standalone/config.h @@ -0,0 +1,3 @@ +#pragma once + +#include "compat.h" diff --git a/ext/at3_standalone/dct.c b/ext/at3_standalone/dct.c new file mode 100644 index 0000000000..cca51eeaf8 --- /dev/null +++ b/ext/at3_standalone/dct.c @@ -0,0 +1,224 @@ +/* + * (I)DCT Transforms + * Copyright (c) 2009 Peter Ross + * Copyright (c) 2010 Alex Converse + * Copyright (c) 2010 Vitor Sessak + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + * (Inverse) Discrete Cosine Transforms. These are also known as the + * type II and type III DCTs respectively. + */ + +#include +#include + +#include "libavutil/mathematics.h" +#include "dct.h" +#include "dct32.h" + +/* sin((M_PI * x / (2 * n)) */ +#define SIN(s, n, x) (s->costab[(n) - (x)]) + +/* cos((M_PI * x / (2 * n)) */ +#define COS(s, n, x) (s->costab[x]) + +static void dst_calc_I_c(DCTContext *ctx, FFTSample *data) +{ + int n = 1 << ctx->nbits; + int i; + + data[0] = 0; + for (i = 1; i < n / 2; i++) { + float tmp1 = data[i ]; + float tmp2 = data[n - i]; + float s = SIN(ctx, n, 2 * i); + + s *= tmp1 + tmp2; + tmp1 = (tmp1 - tmp2) * 0.5f; + data[i] = s + tmp1; + data[n - i] = s - tmp1; + } + + data[n / 2] *= 2; + ctx->rdft.rdft_calc(&ctx->rdft, data); + + data[0] *= 0.5f; + + for (i = 1; i < n - 2; i += 2) { + data[i + 1] += data[i - 1]; + data[i] = -data[i + 2]; + } + + data[n - 1] = 0; +} + +static void dct_calc_I_c(DCTContext *ctx, FFTSample *data) +{ + int n = 1 << ctx->nbits; + int i; + float next = -0.5f * (data[0] - data[n]); + + for (i = 0; i < n / 2; i++) { + float tmp1 = data[i]; + float tmp2 = data[n - i]; + float s = SIN(ctx, n, 2 * i); + float c = COS(ctx, n, 2 * i); + + c *= tmp1 - tmp2; + s *= tmp1 - tmp2; + + next += c; + + tmp1 = (tmp1 + tmp2) * 0.5f; + data[i] = tmp1 - s; + data[n - i] = tmp1 + s; + } + + ctx->rdft.rdft_calc(&ctx->rdft, data); + data[n] = data[1]; + data[1] = next; + + for (i = 3; i <= n; i += 2) + data[i] = data[i - 2] - data[i]; +} + +static void dct_calc_III_c(DCTContext *ctx, FFTSample *data) +{ + int n = 1 << ctx->nbits; + int i; + + float next = data[n - 1]; + float inv_n = 1.0f / n; + + for (i = n - 2; i >= 2; i -= 2) { + float val1 = data[i]; + float val2 = data[i - 1] - data[i + 1]; + float c = COS(ctx, n, i); + float s = SIN(ctx, n, i); + + data[i] = c * val1 + s * val2; + data[i + 1] = s * val1 - c * val2; + } + + data[1] = 2 * next; + + ctx->rdft.rdft_calc(&ctx->rdft, data); + + for (i = 0; i < n / 2; i++) { + float tmp1 = data[i] * inv_n; + float tmp2 = data[n - i - 1] * inv_n; + float csc = ctx->csc2[i] * (tmp1 - tmp2); + + tmp1 += tmp2; + data[i] = tmp1 + csc; + data[n - i - 1] = tmp1 - csc; + } +} + +static void dct_calc_II_c(DCTContext *ctx, FFTSample *data) +{ + int n = 1 << ctx->nbits; + int i; + float next; + + for (i = 0; i < n / 2; i++) { + float tmp1 = data[i]; + float tmp2 = data[n - i - 1]; + float s = SIN(ctx, n, 2 * i + 1); + + s *= tmp1 - tmp2; + tmp1 = (tmp1 + tmp2) * 0.5f; + + data[i] = tmp1 + s; + data[n-i-1] = tmp1 - s; + } + + ctx->rdft.rdft_calc(&ctx->rdft, data); + + next = data[1] * 0.5; + data[1] *= -1; + + for (i = n - 2; i >= 0; i -= 2) { + float inr = data[i ]; + float ini = data[i + 1]; + float c = COS(ctx, n, i); + float s = SIN(ctx, n, i); + + data[i] = c * inr + s * ini; + data[i + 1] = next; + + next += s * inr - c * ini; + } +} + +static void dct32_func(DCTContext *ctx, FFTSample *data) +{ + ctx->dct32(data, data); +} + +av_cold int ff_dct_init(DCTContext *s, int nbits, enum DCTTransformType inverse) +{ + int n = 1 << nbits; + int i; + + memset(s, 0, sizeof(*s)); + + s->nbits = nbits; + s->inverse = inverse; + + if (inverse == DCT_II && nbits == 5) { + s->dct_calc = dct32_func; + } else { + ff_init_ff_cos_tabs(nbits + 2); + + s->costab = ff_cos_tabs[nbits + 2]; + s->csc2 = av_malloc_array(n / 2, sizeof(FFTSample)); + if (!s->csc2) + return AVERROR(ENOMEM); + + if (ff_rdft_init(&s->rdft, nbits, inverse == DCT_III) < 0) { + av_freep(&s->csc2); + return -1; + } + + for (i = 0; i < n / 2; i++) + s->csc2[i] = 0.5 / sin((M_PI / (2 * n) * (2 * i + 1))); + + switch (inverse) { + case DCT_I : s->dct_calc = dct_calc_I_c; break; + case DCT_II : s->dct_calc = dct_calc_II_c; break; + case DCT_III: s->dct_calc = dct_calc_III_c; break; + case DST_I : s->dct_calc = dst_calc_I_c; break; + } + } + + s->dct32 = ff_dct32_float; + if (ARCH_X86) + ff_dct_init_x86(s); + + return 0; +} + +av_cold void ff_dct_end(DCTContext *s) +{ + ff_rdft_end(&s->rdft); + av_freep(&s->csc2); +} diff --git a/ext/at3_standalone/dct.h b/ext/at3_standalone/dct.h new file mode 100644 index 0000000000..05297ba9db --- /dev/null +++ b/ext/at3_standalone/dct.h @@ -0,0 +1,68 @@ +/* + * (I)DCT Transforms + * Copyright (c) 2009 Peter Ross + * Copyright (c) 2010 Alex Converse + * Copyright (c) 2010 Vitor Sessak + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#if !defined(AVCODEC_DCT_H) && (!defined(FFT_FLOAT) || FFT_FLOAT) +#define AVCODEC_DCT_H + +#include + +#include "rdft.h" + +struct DCTContext { + int nbits; + int inverse; + RDFTContext rdft; + const float *costab; + FFTSample *csc2; + void (*dct_calc)(struct DCTContext *s, FFTSample *data); + void (*dct32)(FFTSample *out, const FFTSample *in); +}; + +/** + * Set up DCT. + * @param nbits size of the input array: + * (1 << nbits) for DCT-II, DCT-III and DST-I + * (1 << nbits) + 1 for DCT-I + * + * @note the first element of the input of DST-I is ignored + */ +int ff_dct_init(DCTContext *s, int nbits, enum DCTTransformType type); +void ff_dct_end (DCTContext *s); + +void ff_dct_init_x86(DCTContext *s); + +void ff_fdct_ifast(int16_t *data); +void ff_fdct_ifast248(int16_t *data); +void ff_jpeg_fdct_islow_8(int16_t *data); +void ff_jpeg_fdct_islow_10(int16_t *data); +void ff_fdct248_islow_8(int16_t *data); +void ff_fdct248_islow_10(int16_t *data); + +void ff_j_rev_dct(int16_t *data); +void ff_j_rev_dct4(int16_t *data); +void ff_j_rev_dct2(int16_t *data); +void ff_j_rev_dct1(int16_t *data); +void ff_jref_idct_put(uint8_t *dest, int line_size, int16_t *block); +void ff_jref_idct_add(uint8_t *dest, int line_size, int16_t *block); + +#endif /* AVCODEC_DCT_H */ diff --git a/ext/at3_standalone/dict.h b/ext/at3_standalone/dict.h new file mode 100644 index 0000000000..5b8d003396 --- /dev/null +++ b/ext/at3_standalone/dict.h @@ -0,0 +1,198 @@ +/* + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + * Public dictionary API. + * @deprecated + * AVDictionary is provided for compatibility with libav. It is both in + * implementation as well as API inefficient. It does not scale and is + * extremely slow with large dictionaries. + * It is recommended that new code uses our tree container from tree.c/h + * where applicable, which uses AVL trees to achieve O(log n) performance. + */ + +#ifndef AVUTIL_DICT_H +#define AVUTIL_DICT_H + +#include + +#include "version.h" + +/** + * @addtogroup lavu_dict AVDictionary + * @ingroup lavu_data + * + * @brief Simple key:value store + * + * @{ + * Dictionaries are used for storing key:value pairs. To create + * an AVDictionary, simply pass an address of a NULL pointer to + * av_dict_set(). NULL can be used as an empty dictionary wherever + * a pointer to an AVDictionary is required. + * Use av_dict_get() to retrieve an entry or iterate over all + * entries and finally av_dict_free() to free the dictionary + * and all its contents. + * + @code + AVDictionary *d = NULL; // "create" an empty dictionary + AVDictionaryEntry *t = NULL; + + av_dict_set(&d, "foo", "bar", 0); // add an entry + + char *k = av_strdup("key"); // if your strings are already allocated, + char *v = av_strdup("value"); // you can avoid copying them like this + av_dict_set(&d, k, v, AV_DICT_DONT_STRDUP_KEY | AV_DICT_DONT_STRDUP_VAL); + + while (t = av_dict_get(d, "", t, AV_DICT_IGNORE_SUFFIX)) { + <....> // iterate over all entries in d + } + av_dict_free(&d); + @endcode + * + */ + +#define AV_DICT_MATCH_CASE 1 /**< Only get an entry with exact-case key match. Only relevant in av_dict_get(). */ +#define AV_DICT_IGNORE_SUFFIX 2 /**< Return first entry in a dictionary whose first part corresponds to the search key, + ignoring the suffix of the found key string. Only relevant in av_dict_get(). */ +#define AV_DICT_DONT_STRDUP_KEY 4 /**< Take ownership of a key that's been + allocated with av_malloc() or another memory allocation function. */ +#define AV_DICT_DONT_STRDUP_VAL 8 /**< Take ownership of a value that's been + allocated with av_malloc() or another memory allocation function. */ +#define AV_DICT_DONT_OVERWRITE 16 ///< Don't overwrite existing entries. +#define AV_DICT_APPEND 32 /**< If the entry already exists, append to it. Note that no + delimiter is added, the strings are simply concatenated. */ + +typedef struct AVDictionaryEntry { + char *key; + char *value; +} AVDictionaryEntry; + +typedef struct AVDictionary AVDictionary; + +/** + * Get a dictionary entry with matching key. + * + * The returned entry key or value must not be changed, or it will + * cause undefined behavior. + * + * To iterate through all the dictionary entries, you can set the matching key + * to the null string "" and set the AV_DICT_IGNORE_SUFFIX flag. + * + * @param prev Set to the previous matching element to find the next. + * If set to NULL the first matching element is returned. + * @param key matching key + * @param flags a collection of AV_DICT_* flags controlling how the entry is retrieved + * @return found entry or NULL in case no matching entry was found in the dictionary + */ +AVDictionaryEntry *av_dict_get(const AVDictionary *m, const char *key, + const AVDictionaryEntry *prev, int flags); + +/** + * Get number of entries in dictionary. + * + * @param m dictionary + * @return number of entries in dictionary + */ +int av_dict_count(const AVDictionary *m); + +/** + * Set the given entry in *pm, overwriting an existing entry. + * + * Note: If AV_DICT_DONT_STRDUP_KEY or AV_DICT_DONT_STRDUP_VAL is set, + * these arguments will be freed on error. + * + * @param pm pointer to a pointer to a dictionary struct. If *pm is NULL + * a dictionary struct is allocated and put in *pm. + * @param key entry key to add to *pm (will be av_strduped depending on flags) + * @param value entry value to add to *pm (will be av_strduped depending on flags). + * Passing a NULL value will cause an existing entry to be deleted. + * @return >= 0 on success otherwise an error code <0 + */ +int av_dict_set(AVDictionary **pm, const char *key, const char *value, int flags); + +/** + * Convenience wrapper for av_dict_set that converts the value to a string + * and stores it. + * + * Note: If AV_DICT_DONT_STRDUP_KEY is set, key will be freed on error. + */ +int av_dict_set_int(AVDictionary **pm, const char *key, int64_t value, int flags); + +/** + * Parse the key/value pairs list and add the parsed entries to a dictionary. + * + * In case of failure, all the successfully set entries are stored in + * *pm. You may need to manually free the created dictionary. + * + * @param key_val_sep a 0-terminated list of characters used to separate + * key from value + * @param pairs_sep a 0-terminated list of characters used to separate + * two pairs from each other + * @param flags flags to use when adding to dictionary. + * AV_DICT_DONT_STRDUP_KEY and AV_DICT_DONT_STRDUP_VAL + * are ignored since the key/value tokens will always + * be duplicated. + * @return 0 on success, negative AVERROR code on failure + */ +int av_dict_parse_string(AVDictionary **pm, const char *str, + const char *key_val_sep, const char *pairs_sep, + int flags); + +/** + * Copy entries from one AVDictionary struct into another. + * @param dst pointer to a pointer to a AVDictionary struct. If *dst is NULL, + * this function will allocate a struct for you and put it in *dst + * @param src pointer to source AVDictionary struct + * @param flags flags to use when setting entries in *dst + * @note metadata is read using the AV_DICT_IGNORE_SUFFIX flag + * @return 0 on success, negative AVERROR code on failure. If dst was allocated + * by this function, callers should free the associated memory. + */ +int av_dict_copy(AVDictionary **dst, const AVDictionary *src, int flags); + +/** + * Free all the memory allocated for an AVDictionary struct + * and all keys and values. + */ +void av_dict_free(AVDictionary **m); + +/** + * Get dictionary entries as a string. + * + * Create a string containing dictionary's entries. + * Such string may be passed back to av_dict_parse_string(). + * @note String is escaped with backslashes ('\'). + * + * @param[in] m dictionary + * @param[out] buffer Pointer to buffer that will be allocated with string containg entries. + * Buffer must be freed by the caller when is no longer needed. + * @param[in] key_val_sep character used to separate key from value + * @param[in] pairs_sep character used to separate two pairs from each other + * @return >= 0 on success, negative on error + * @warning Separators cannot be neither '\\' nor '\0'. They also cannot be the same. + */ +int av_dict_get_string(const AVDictionary *m, char **buffer, + const char key_val_sep, const char pairs_sep); + +/** + * @} + */ + +#endif /* AVUTIL_DICT_H */ diff --git a/ext/at3_standalone/error.h b/ext/at3_standalone/error.h new file mode 100644 index 0000000000..71df4da353 --- /dev/null +++ b/ext/at3_standalone/error.h @@ -0,0 +1,126 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + * error code definitions + */ + +#ifndef AVUTIL_ERROR_H +#define AVUTIL_ERROR_H + +#include +#include + +/** + * @addtogroup lavu_error + * + * @{ + */ + + +/* error handling */ +#if EDOM > 0 +#define AVERROR(e) (-(e)) ///< Returns a negative error code from a POSIX error code, to return from library functions. +#define AVUNERROR(e) (-(e)) ///< Returns a POSIX error code from a library function error return value. +#else +/* Some platforms have E* and errno already negated. */ +#define AVERROR(e) (e) +#define AVUNERROR(e) (e) +#endif + +#define FFERRTAG(a, b, c, d) (-(int)MKTAG(a, b, c, d)) + +#define AVERROR_BSF_NOT_FOUND FFERRTAG(0xF8,'B','S','F') ///< Bitstream filter not found +#define AVERROR_BUG FFERRTAG( 'B','U','G','!') ///< Internal bug, also see AVERROR_BUG2 +#define AVERROR_BUFFER_TOO_SMALL FFERRTAG( 'B','U','F','S') ///< Buffer too small +#define AVERROR_DECODER_NOT_FOUND FFERRTAG(0xF8,'D','E','C') ///< Decoder not found +#define AVERROR_DEMUXER_NOT_FOUND FFERRTAG(0xF8,'D','E','M') ///< Demuxer not found +#define AVERROR_ENCODER_NOT_FOUND FFERRTAG(0xF8,'E','N','C') ///< Encoder not found +#define AVERROR_EOF FFERRTAG( 'E','O','F',' ') ///< End of file +#define AVERROR_EXIT FFERRTAG( 'E','X','I','T') ///< Immediate exit was requested; the called function should not be restarted +#define AVERROR_EXTERNAL FFERRTAG( 'E','X','T',' ') ///< Generic error in an external library +#define AVERROR_FILTER_NOT_FOUND FFERRTAG(0xF8,'F','I','L') ///< Filter not found +#define AVERROR_INVALIDDATA FFERRTAG( 'I','N','D','A') ///< Invalid data found when processing input +#define AVERROR_MUXER_NOT_FOUND FFERRTAG(0xF8,'M','U','X') ///< Muxer not found +#define AVERROR_OPTION_NOT_FOUND FFERRTAG(0xF8,'O','P','T') ///< Option not found +#define AVERROR_PATCHWELCOME FFERRTAG( 'P','A','W','E') ///< Not yet implemented in FFmpeg, patches welcome +#define AVERROR_PROTOCOL_NOT_FOUND FFERRTAG(0xF8,'P','R','O') ///< Protocol not found + +#define AVERROR_STREAM_NOT_FOUND FFERRTAG(0xF8,'S','T','R') ///< Stream not found +/** + * This is semantically identical to AVERROR_BUG + * it has been introduced in Libav after our AVERROR_BUG and with a modified value. + */ +#define AVERROR_BUG2 FFERRTAG( 'B','U','G',' ') +#define AVERROR_UNKNOWN FFERRTAG( 'U','N','K','N') ///< Unknown error, typically from an external library +#define AVERROR_EXPERIMENTAL (-0x2bb2afa8) ///< Requested feature is flagged experimental. Set strict_std_compliance if you really want to use it. +#define AVERROR_INPUT_CHANGED (-0x636e6701) ///< Input changed between calls. Reconfiguration is required. (can be OR-ed with AVERROR_OUTPUT_CHANGED) +#define AVERROR_OUTPUT_CHANGED (-0x636e6702) ///< Output changed between calls. Reconfiguration is required. (can be OR-ed with AVERROR_INPUT_CHANGED) +/* HTTP & RTSP errors */ +#define AVERROR_HTTP_BAD_REQUEST FFERRTAG(0xF8,'4','0','0') +#define AVERROR_HTTP_UNAUTHORIZED FFERRTAG(0xF8,'4','0','1') +#define AVERROR_HTTP_FORBIDDEN FFERRTAG(0xF8,'4','0','3') +#define AVERROR_HTTP_NOT_FOUND FFERRTAG(0xF8,'4','0','4') +#define AVERROR_HTTP_OTHER_4XX FFERRTAG(0xF8,'4','X','X') +#define AVERROR_HTTP_SERVER_ERROR FFERRTAG(0xF8,'5','X','X') + +#define AV_ERROR_MAX_STRING_SIZE 64 + +/** + * Put a description of the AVERROR code errnum in errbuf. + * In case of failure the global variable errno is set to indicate the + * error. Even in case of failure av_strerror() will print a generic + * error message indicating the errnum provided to errbuf. + * + * @param errnum error code to describe + * @param errbuf buffer to which description is written + * @param errbuf_size the size in bytes of errbuf + * @return 0 on success, a negative value if a description for errnum + * cannot be found + */ +int av_strerror(int errnum, char *errbuf, size_t errbuf_size); + +/** + * Fill the provided buffer with a string containing an error string + * corresponding to the AVERROR code errnum. + * + * @param errbuf a buffer + * @param errbuf_size size in bytes of errbuf + * @param errnum error code to describe + * @return the buffer in input, filled with the error description + * @see av_strerror() + */ +static inline char *av_make_error_string(char *errbuf, size_t errbuf_size, int errnum) +{ + av_strerror(errnum, errbuf, errbuf_size); + return errbuf; +} + +/** + * Convenience macro, the return value should be used only directly in + * function arguments but never stand-alone. + */ +#define av_err2str(errnum) \ + av_make_error_string((char[AV_ERROR_MAX_STRING_SIZE]){0}, AV_ERROR_MAX_STRING_SIZE, errnum) + +/** + * @} + */ + +#endif /* AVUTIL_ERROR_H */ diff --git a/ext/at3_standalone/fft.h b/ext/at3_standalone/fft.h new file mode 100644 index 0000000000..a0d94bde82 --- /dev/null +++ b/ext/at3_standalone/fft.h @@ -0,0 +1,172 @@ +/* + * Copyright (c) 2000, 2001, 2002 Fabrice Bellard + * Copyright (c) 2002-2004 Michael Niedermayer + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVCODEC_FFT_H +#define AVCODEC_FFT_H + +#ifndef FFT_FLOAT +#define FFT_FLOAT 1 +#endif + +#ifndef FFT_FIXED_32 +#define FFT_FIXED_32 0 +#endif + +#include +#include "config.h" + +#if FFT_FLOAT + +#include "avfft.h" + +#define FFT_NAME(x) x + +typedef float FFTDouble; + +#else + +#if FFT_FIXED_32 + +#define Q31(x) (int)((x)*2147483648.0 + 0.5) +#define FFT_NAME(x) x ## _fixed_32 + +typedef int32_t FFTSample; + +#else /* FFT_FIXED_32 */ + +#define FFT_NAME(x) x ## _fixed + +typedef int16_t FFTSample; + +#endif /* FFT_FIXED_32 */ + +typedef struct FFTComplex { + FFTSample re, im; +} FFTComplex; + +typedef int FFTDouble; +typedef struct FFTContext FFTContext; + +#endif /* FFT_FLOAT */ + +typedef struct FFTDComplex { + FFTDouble re, im; +} FFTDComplex; + +/* FFT computation */ + +enum fft_permutation_type { + FF_FFT_PERM_DEFAULT, + FF_FFT_PERM_SWAP_LSBS, + FF_FFT_PERM_AVX, +}; + +enum mdct_permutation_type { + FF_MDCT_PERM_NONE, + FF_MDCT_PERM_INTERLEAVE, +}; + +struct FFTContext { + int nbits; + int inverse; + uint16_t *revtab; + FFTComplex *tmp_buf; + int mdct_size; /* size of MDCT (i.e. number of input data * 2) */ + int mdct_bits; /* n = 2^nbits */ + /* pre/post rotation tables */ + FFTSample *tcos; + FFTSample *tsin; + /** + * Do the permutation needed BEFORE calling fft_calc(). + */ + void (*fft_permute)(struct FFTContext *s, FFTComplex *z); + /** + * Do a complex FFT with the parameters defined in ff_fft_init(). The + * input data must be permuted before. No 1.0/sqrt(n) normalization is done. + */ + void (*fft_calc)(struct FFTContext *s, FFTComplex *z); + void (*imdct_calc)(struct FFTContext *s, FFTSample *output, const FFTSample *input); + void (*imdct_half)(struct FFTContext *s, FFTSample *output, const FFTSample *input); + void (*mdct_calc)(struct FFTContext *s, FFTSample *output, const FFTSample *input); + void (*mdct_calcw)(struct FFTContext *s, FFTDouble *output, const FFTSample *input); + enum fft_permutation_type fft_permutation; + enum mdct_permutation_type mdct_permutation; +}; + +#if CONFIG_HARDCODED_TABLES +#define COSTABLE_CONST const +#else +#define COSTABLE_CONST +#endif + +#define COSTABLE(size) \ + COSTABLE_CONST DECLARE_ALIGNED(32, FFTSample, FFT_NAME(ff_cos_##size))[size/2] + +extern COSTABLE(16); +extern COSTABLE(32); +extern COSTABLE(64); +extern COSTABLE(128); +extern COSTABLE(256); +extern COSTABLE(512); +extern COSTABLE(1024); +extern COSTABLE(2048); +extern COSTABLE(4096); +extern COSTABLE(8192); +extern COSTABLE(16384); +extern COSTABLE(32768); +extern COSTABLE(65536); +extern COSTABLE_CONST FFTSample* const FFT_NAME(ff_cos_tabs)[17]; + +#define ff_init_ff_cos_tabs FFT_NAME(ff_init_ff_cos_tabs) + +/** + * Initialize the cosine table in ff_cos_tabs[index] + * @param index index in ff_cos_tabs array of the table to initialize + */ +void ff_init_ff_cos_tabs(int index); + +#define ff_fft_init FFT_NAME(ff_fft_init) +#define ff_fft_end FFT_NAME(ff_fft_end) + +/** + * Set up a complex FFT. + * @param nbits log2 of the length of the input array + * @param inverse if 0 perform the forward transform, if 1 perform the inverse + */ +int ff_fft_init(FFTContext *s, int nbits, int inverse); + +void ff_fft_init_aarch64(FFTContext *s); +void ff_fft_init_x86(FFTContext *s); +void ff_fft_init_arm(FFTContext *s); +void ff_fft_init_mips(FFTContext *s); +void ff_fft_init_ppc(FFTContext *s); + +void ff_fft_fixed_init_arm(FFTContext *s); + +void ff_fft_end(FFTContext *s); + +#define ff_mdct_init FFT_NAME(ff_mdct_init) +#define ff_mdct_end FFT_NAME(ff_mdct_end) + +int ff_mdct_init(FFTContext *s, int nbits, int inverse, double scale); +void ff_mdct_end(FFTContext *s); + +#endif /* AVCODEC_FFT_H */ diff --git a/ext/at3_standalone/float_dsp.c b/ext/at3_standalone/float_dsp.c new file mode 100644 index 0000000000..2a2d36d6c3 --- /dev/null +++ b/ext/at3_standalone/float_dsp.c @@ -0,0 +1,466 @@ +/* + * Copyright 2005 Balatoni Denes + * Copyright 2006 Loren Merritt + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "config.h" +#include "attributes.h" +#include "float_dsp.h" +#include "mem.h" + +static void vector_fmul_c(float *dst, const float *src0, const float *src1, + int len) +{ + int i; + for (i = 0; i < len; i++) + dst[i] = src0[i] * src1[i]; +} + +static void vector_fmac_scalar_c(float *dst, const float *src, float mul, + int len) +{ + int i; + for (i = 0; i < len; i++) + dst[i] += src[i] * mul; +} + +static void vector_fmul_scalar_c(float *dst, const float *src, float mul, + int len) +{ + int i; + for (i = 0; i < len; i++) + dst[i] = src[i] * mul; +} + +static void vector_dmul_scalar_c(double *dst, const double *src, double mul, + int len) +{ + int i; + for (i = 0; i < len; i++) + dst[i] = src[i] * mul; +} + +static void vector_fmul_window_c(float *dst, const float *src0, + const float *src1, const float *win, int len) +{ + int i, j; + + dst += len; + win += len; + src0 += len; + + for (i = -len, j = len - 1; i < 0; i++, j--) { + float s0 = src0[i]; + float s1 = src1[j]; + float wi = win[i]; + float wj = win[j]; + dst[i] = s0 * wj - s1 * wi; + dst[j] = s0 * wi + s1 * wj; + } +} + +static void vector_fmul_add_c(float *dst, const float *src0, const float *src1, + const float *src2, int len){ + int i; + + for (i = 0; i < len; i++) + dst[i] = src0[i] * src1[i] + src2[i]; +} + +static void vector_fmul_reverse_c(float *dst, const float *src0, + const float *src1, int len) +{ + int i; + + src1 += len-1; + for (i = 0; i < len; i++) + dst[i] = src0[i] * src1[-i]; +} + +static void butterflies_float_c(float *av_restrict v1, float *av_restrict v2, + int len) +{ + int i; + + for (i = 0; i < len; i++) { + float t = v1[i] - v2[i]; + v1[i] += v2[i]; + v2[i] = t; + } +} + +float avpriv_scalarproduct_float_c(const float *v1, const float *v2, int len) +{ + float p = 0.0; + int i; + + for (i = 0; i < len; i++) + p += v1[i] * v2[i]; + + return p; +} + +av_cold AVFloatDSPContext *avpriv_float_dsp_alloc(int bit_exact) +{ + AVFloatDSPContext *fdsp = av_mallocz(sizeof(AVFloatDSPContext)); + if (!fdsp) + return NULL; + + fdsp->vector_fmul = vector_fmul_c; + fdsp->vector_fmac_scalar = vector_fmac_scalar_c; + fdsp->vector_fmul_scalar = vector_fmul_scalar_c; + fdsp->vector_dmul_scalar = vector_dmul_scalar_c; + fdsp->vector_fmul_window = vector_fmul_window_c; + fdsp->vector_fmul_add = vector_fmul_add_c; + fdsp->vector_fmul_reverse = vector_fmul_reverse_c; + fdsp->butterflies_float = butterflies_float_c; + fdsp->scalarproduct_float = avpriv_scalarproduct_float_c; + + /* + if (ARCH_AARCH64) + ff_float_dsp_init_aarch64(fdsp); + if (ARCH_ARM) + ff_float_dsp_init_arm(fdsp); + if (ARCH_PPC) + ff_float_dsp_init_ppc(fdsp, bit_exact); + if (ARCH_X86) + ff_float_dsp_init_x86(fdsp); + if (ARCH_MIPS) + ff_float_dsp_init_mips(fdsp); + */ + return fdsp; +} + + +#ifdef TEST + +#include +#include +#include +#include +#include +#if HAVE_UNISTD_H +#include /* for getopt */ +#endif +#if !HAVE_GETOPT +#include "compat/getopt.c" +#endif + +#include "common.h" +#include "cpu.h" +#include "internal.h" +#include "lfg.h" +#include "log.h" +#include "random_seed.h" + +#define LEN 240 + +static void fill_float_array(AVLFG *lfg, float *a, int len) +{ + int i; + double bmg[2], stddev = 10.0, mean = 0.0; + + for (i = 0; i < len; i += 2) { + av_bmg_get(lfg, bmg); + a[i] = bmg[0] * stddev + mean; + a[i + 1] = bmg[1] * stddev + mean; + } +} +static int compare_floats(const float *a, const float *b, int len, + float max_diff) +{ + int i; + for (i = 0; i < len; i++) { + if (fabsf(a[i] - b[i]) > max_diff) { + av_log(NULL, AV_LOG_ERROR, "%d: %- .12f - %- .12f = % .12g\n", + i, a[i], b[i], a[i] - b[i]); + return -1; + } + } + return 0; +} + +static void fill_double_array(AVLFG *lfg, double *a, int len) +{ + int i; + double bmg[2], stddev = 10.0, mean = 0.0; + + for (i = 0; i < len; i += 2) { + av_bmg_get(lfg, bmg); + a[i] = bmg[0] * stddev + mean; + a[i + 1] = bmg[1] * stddev + mean; + } +} + +static int compare_doubles(const double *a, const double *b, int len, + double max_diff) +{ + int i; + + for (i = 0; i < len; i++) { + if (fabs(a[i] - b[i]) > max_diff) { + av_log(NULL, AV_LOG_ERROR, "%d: %- .12f - %- .12f = % .12g\n", + i, a[i], b[i], a[i] - b[i]); + return -1; + } + } + return 0; +} + +static int test_vector_fmul(AVFloatDSPContext *fdsp, AVFloatDSPContext *cdsp, + const float *v1, const float *v2) +{ + LOCAL_ALIGNED(32, float, cdst, [LEN]); + LOCAL_ALIGNED(32, float, odst, [LEN]); + int ret; + + cdsp->vector_fmul(cdst, v1, v2, LEN); + fdsp->vector_fmul(odst, v1, v2, LEN); + + if (ret = compare_floats(cdst, odst, LEN, FLT_EPSILON)) + av_log(NULL, AV_LOG_ERROR, "vector_fmul failed\n"); + + return ret; +} + +#define ARBITRARY_FMAC_SCALAR_CONST 0.005 +static int test_vector_fmac_scalar(AVFloatDSPContext *fdsp, AVFloatDSPContext *cdsp, + const float *v1, const float *src0, float scale) +{ + LOCAL_ALIGNED(32, float, cdst, [LEN]); + LOCAL_ALIGNED(32, float, odst, [LEN]); + int ret; + + memcpy(cdst, v1, LEN * sizeof(*v1)); + memcpy(odst, v1, LEN * sizeof(*v1)); + + cdsp->vector_fmac_scalar(cdst, src0, scale, LEN); + fdsp->vector_fmac_scalar(odst, src0, scale, LEN); + + if (ret = compare_floats(cdst, odst, LEN, ARBITRARY_FMAC_SCALAR_CONST)) + av_log(NULL, AV_LOG_ERROR, "vector_fmac_scalar failed\n"); + + return ret; +} + +static int test_vector_fmul_scalar(AVFloatDSPContext *fdsp, AVFloatDSPContext *cdsp, + const float *v1, float scale) +{ + LOCAL_ALIGNED(32, float, cdst, [LEN]); + LOCAL_ALIGNED(32, float, odst, [LEN]); + int ret; + + cdsp->vector_fmul_scalar(cdst, v1, scale, LEN); + fdsp->vector_fmul_scalar(odst, v1, scale, LEN); + + if (ret = compare_floats(cdst, odst, LEN, FLT_EPSILON)) + av_log(NULL, AV_LOG_ERROR, "vector_fmul_scalar failed\n"); + + return ret; +} + +static int test_vector_dmul_scalar(AVFloatDSPContext *fdsp, AVFloatDSPContext *cdsp, + const double *v1, double scale) +{ + LOCAL_ALIGNED(32, double, cdst, [LEN]); + LOCAL_ALIGNED(32, double, odst, [LEN]); + int ret; + + cdsp->vector_dmul_scalar(cdst, v1, scale, LEN); + fdsp->vector_dmul_scalar(odst, v1, scale, LEN); + + if (ret = compare_doubles(cdst, odst, LEN, DBL_EPSILON)) + av_log(NULL, AV_LOG_ERROR, "vector_dmul_scalar failed\n"); + + return ret; +} + +#define ARBITRARY_FMUL_WINDOW_CONST 0.008 +static int test_vector_fmul_window(AVFloatDSPContext *fdsp, AVFloatDSPContext *cdsp, + const float *v1, const float *v2, const float *v3) +{ + LOCAL_ALIGNED(32, float, cdst, [LEN]); + LOCAL_ALIGNED(32, float, odst, [LEN]); + int ret; + + cdsp->vector_fmul_window(cdst, v1, v2, v3, LEN / 2); + fdsp->vector_fmul_window(odst, v1, v2, v3, LEN / 2); + + if (ret = compare_floats(cdst, odst, LEN, ARBITRARY_FMUL_WINDOW_CONST)) + av_log(NULL, AV_LOG_ERROR, "vector_fmul_window failed\n"); + + return ret; +} + +#define ARBITRARY_FMUL_ADD_CONST 0.005 +static int test_vector_fmul_add(AVFloatDSPContext *fdsp, AVFloatDSPContext *cdsp, + const float *v1, const float *v2, const float *v3) +{ + LOCAL_ALIGNED(32, float, cdst, [LEN]); + LOCAL_ALIGNED(32, float, odst, [LEN]); + int ret; + + cdsp->vector_fmul_add(cdst, v1, v2, v3, LEN); + fdsp->vector_fmul_add(odst, v1, v2, v3, LEN); + + if (ret = compare_floats(cdst, odst, LEN, ARBITRARY_FMUL_ADD_CONST)) + av_log(NULL, AV_LOG_ERROR, "vector_fmul_add failed\n"); + + return ret; +} + +static int test_vector_fmul_reverse(AVFloatDSPContext *fdsp, AVFloatDSPContext *cdsp, + const float *v1, const float *v2) +{ + LOCAL_ALIGNED(32, float, cdst, [LEN]); + LOCAL_ALIGNED(32, float, odst, [LEN]); + int ret; + + cdsp->vector_fmul_reverse(cdst, v1, v2, LEN); + fdsp->vector_fmul_reverse(odst, v1, v2, LEN); + + if (ret = compare_floats(cdst, odst, LEN, FLT_EPSILON)) + av_log(NULL, AV_LOG_ERROR, "vector_fmul_reverse failed\n"); + + return ret; +} + +static int test_butterflies_float(AVFloatDSPContext *fdsp, AVFloatDSPContext *cdsp, + const float *v1, const float *v2) +{ + LOCAL_ALIGNED(32, float, cv1, [LEN]); + LOCAL_ALIGNED(32, float, cv2, [LEN]); + LOCAL_ALIGNED(32, float, ov1, [LEN]); + LOCAL_ALIGNED(32, float, ov2, [LEN]); + int ret; + + memcpy(cv1, v1, LEN * sizeof(*v1)); + memcpy(cv2, v2, LEN * sizeof(*v2)); + memcpy(ov1, v1, LEN * sizeof(*v1)); + memcpy(ov2, v2, LEN * sizeof(*v2)); + + cdsp->butterflies_float(cv1, cv2, LEN); + fdsp->butterflies_float(ov1, ov2, LEN); + + if ((ret = compare_floats(cv1, ov1, LEN, FLT_EPSILON)) || + (ret = compare_floats(cv2, ov2, LEN, FLT_EPSILON))) + av_log(NULL, AV_LOG_ERROR, "butterflies_float failed\n"); + + return ret; +} + +#define ARBITRARY_SCALARPRODUCT_CONST 0.2 +static int test_scalarproduct_float(AVFloatDSPContext *fdsp, AVFloatDSPContext *cdsp, + const float *v1, const float *v2) +{ + float cprod, oprod; + int ret; + + cprod = cdsp->scalarproduct_float(v1, v2, LEN); + oprod = fdsp->scalarproduct_float(v1, v2, LEN); + + if (ret = compare_floats(&cprod, &oprod, 1, ARBITRARY_SCALARPRODUCT_CONST)) + av_log(NULL, AV_LOG_ERROR, "scalarproduct_float failed\n"); + + return ret; +} + +int main(int argc, char **argv) +{ + int ret = 0, seeded = 0; + uint32_t seed; + AVFloatDSPContext *fdsp, *cdsp; + AVLFG lfg; + + LOCAL_ALIGNED(32, float, src0, [LEN]); + LOCAL_ALIGNED(32, float, src1, [LEN]); + LOCAL_ALIGNED(32, float, src2, [LEN]); + LOCAL_ALIGNED(32, double, dbl_src0, [LEN]); + LOCAL_ALIGNED(32, double, dbl_src1, [LEN]); + + for (;;) { + int arg = getopt(argc, argv, "s:c:"); + if (arg == -1) + break; + switch (arg) { + case 's': + seed = strtoul(optarg, NULL, 10); + seeded = 1; + break; + case 'c': + { + int cpuflags = av_get_cpu_flags(); + + if (av_parse_cpu_caps(&cpuflags, optarg) < 0) + return 1; + + av_force_cpu_flags(cpuflags); + break; + } + } + } + if (!seeded) + seed = av_get_random_seed(); + + av_log(NULL, AV_LOG_INFO, "float_dsp-test: %s %u\n", seeded ? "seed" : "random seed", seed); + + fdsp = avpriv_float_dsp_alloc(1); + av_force_cpu_flags(0); + cdsp = avpriv_float_dsp_alloc(1); + + if (!fdsp || !cdsp) { + ret = 1; + goto end; + } + + av_lfg_init(&lfg, seed); + + fill_float_array(&lfg, src0, LEN); + fill_float_array(&lfg, src1, LEN); + fill_float_array(&lfg, src2, LEN); + + fill_double_array(&lfg, dbl_src0, LEN); + fill_double_array(&lfg, dbl_src1, LEN); + + if (test_vector_fmul(fdsp, cdsp, src0, src1)) + ret -= 1 << 0; + if (test_vector_fmac_scalar(fdsp, cdsp, src2, src0, src1[0])) + ret -= 1 << 1; + if (test_vector_fmul_scalar(fdsp, cdsp, src0, src1[0])) + ret -= 1 << 2; + if (test_vector_fmul_window(fdsp, cdsp, src0, src1, src2)) + ret -= 1 << 3; + if (test_vector_fmul_add(fdsp, cdsp, src0, src1, src2)) + ret -= 1 << 4; + if (test_vector_fmul_reverse(fdsp, cdsp, src0, src1)) + ret -= 1 << 5; + if (test_butterflies_float(fdsp, cdsp, src0, src1)) + ret -= 1 << 6; + if (test_scalarproduct_float(fdsp, cdsp, src0, src1)) + ret -= 1 << 7; + if (test_vector_dmul_scalar(fdsp, cdsp, dbl_src0, dbl_src1[0])) + ret -= 1 << 8; + +end: + av_freep(&fdsp); + av_freep(&cdsp); + return ret; +} + +#endif /* TEST */ diff --git a/ext/at3_standalone/float_dsp.h b/ext/at3_standalone/float_dsp.h new file mode 100644 index 0000000000..d1be38f947 --- /dev/null +++ b/ext/at3_standalone/float_dsp.h @@ -0,0 +1,186 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVUTIL_FLOAT_DSP_H +#define AVUTIL_FLOAT_DSP_H + +#include "config.h" + +typedef struct AVFloatDSPContext { + /** + * Calculate the entry wise product of two vectors of floats and store the result in + * a vector of floats. + * + * @param dst output vector + * constraints: 32-byte aligned + * @param src0 first input vector + * constraints: 32-byte aligned + * @param src1 second input vector + * constraints: 32-byte aligned + * @param len number of elements in the input + * constraints: multiple of 16 + */ + void (*vector_fmul)(float *dst, const float *src0, const float *src1, + int len); + + /** + * Multiply a vector of floats by a scalar float and add to + * destination vector. Source and destination vectors must + * overlap exactly or not at all. + * + * @param dst result vector + * constraints: 32-byte aligned + * @param src input vector + * constraints: 32-byte aligned + * @param mul scalar value + * @param len length of vector + * constraints: multiple of 16 + */ + void (*vector_fmac_scalar)(float *dst, const float *src, float mul, + int len); + + /** + * Multiply a vector of floats by a scalar float. Source and + * destination vectors must overlap exactly or not at all. + * + * @param dst result vector + * constraints: 16-byte aligned + * @param src input vector + * constraints: 16-byte aligned + * @param mul scalar value + * @param len length of vector + * constraints: multiple of 4 + */ + void (*vector_fmul_scalar)(float *dst, const float *src, float mul, + int len); + + /** + * Multiply a vector of double by a scalar double. Source and + * destination vectors must overlap exactly or not at all. + * + * @param dst result vector + * constraints: 32-byte aligned + * @param src input vector + * constraints: 32-byte aligned + * @param mul scalar value + * @param len length of vector + * constraints: multiple of 8 + */ + void (*vector_dmul_scalar)(double *dst, const double *src, double mul, + int len); + + /** + * Overlap/add with window function. + * Used primarily by MDCT-based audio codecs. + * Source and destination vectors must overlap exactly or not at all. + * + * @param dst result vector + * constraints: 16-byte aligned + * @param src0 first source vector + * constraints: 16-byte aligned + * @param src1 second source vector + * constraints: 16-byte aligned + * @param win half-window vector + * constraints: 16-byte aligned + * @param len length of vector + * constraints: multiple of 4 + */ + void (*vector_fmul_window)(float *dst, const float *src0, + const float *src1, const float *win, int len); + + /** + * Calculate the entry wise product of two vectors of floats, add a third vector of + * floats and store the result in a vector of floats. + * + * @param dst output vector + * constraints: 32-byte aligned + * @param src0 first input vector + * constraints: 32-byte aligned + * @param src1 second input vector + * constraints: 32-byte aligned + * @param src2 third input vector + * constraints: 32-byte aligned + * @param len number of elements in the input + * constraints: multiple of 16 + */ + void (*vector_fmul_add)(float *dst, const float *src0, const float *src1, + const float *src2, int len); + + /** + * Calculate the entry wise product of two vectors of floats, and store the result + * in a vector of floats. The second vector of floats is iterated over + * in reverse order. + * + * @param dst output vector + * constraints: 32-byte aligned + * @param src0 first input vector + * constraints: 32-byte aligned + * @param src1 second input vector + * constraints: 32-byte aligned + * @param len number of elements in the input + * constraints: multiple of 16 + */ + void (*vector_fmul_reverse)(float *dst, const float *src0, + const float *src1, int len); + + /** + * Calculate the sum and difference of two vectors of floats. + * + * @param v1 first input vector, sum output, 16-byte aligned + * @param v2 second input vector, difference output, 16-byte aligned + * @param len length of vectors, multiple of 4 + */ + void (*butterflies_float)(float *av_restrict v1, float *av_restrict v2, int len); + + /** + * Calculate the scalar product of two vectors of floats. + * + * @param v1 first vector, 16-byte aligned + * @param v2 second vector, 16-byte aligned + * @param len length of vectors, multiple of 4 + * + * @return sum of elementwise products + */ + float (*scalarproduct_float)(const float *v1, const float *v2, int len); +} AVFloatDSPContext; + +/** + * Return the scalar product of two vectors. + * + * @param v1 first input vector + * @param v2 first input vector + * @param len number of elements + * + * @return sum of elementwise products + */ +float avpriv_scalarproduct_float_c(const float *v1, const float *v2, int len); + +void ff_float_dsp_init_aarch64(AVFloatDSPContext *fdsp); +void ff_float_dsp_init_arm(AVFloatDSPContext *fdsp); +void ff_float_dsp_init_ppc(AVFloatDSPContext *fdsp, int strict); +void ff_float_dsp_init_x86(AVFloatDSPContext *fdsp); +void ff_float_dsp_init_mips(AVFloatDSPContext *fdsp); + +/** + * Allocate a float DSP context. + * + * @param strict setting to non-zero avoids using functions which may not be IEEE-754 compliant + */ +AVFloatDSPContext *avpriv_float_dsp_alloc(int strict); + +#endif /* AVUTIL_FLOAT_DSP_H */ diff --git a/ext/at3_standalone/frame.h b/ext/at3_standalone/frame.h new file mode 100644 index 0000000000..8dc4049072 --- /dev/null +++ b/ext/at3_standalone/frame.h @@ -0,0 +1,723 @@ +/* + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + * @ingroup lavu_frame + * reference-counted frame API + */ + +#ifndef AVUTIL_FRAME_H +#define AVUTIL_FRAME_H + +#include + +#include "avutil.h" +#include "buffer.h" +#include "dict.h" +#include "rational.h" +#include "samplefmt.h" +#include "pixfmt.h" +#include "version.h" + + +/** + * @defgroup lavu_frame AVFrame + * @ingroup lavu_data + * + * @{ + * AVFrame is an abstraction for reference-counted raw multimedia data. + */ + +enum AVFrameSideDataType { + /** + * The data is the AVPanScan struct defined in libavcodec. + */ + AV_FRAME_DATA_PANSCAN, + /** + * ATSC A53 Part 4 Closed Captions. + * A53 CC bitstream is stored as uint8_t in AVFrameSideData.data. + * The number of bytes of CC data is AVFrameSideData.size. + */ + AV_FRAME_DATA_A53_CC, + /** + * Stereoscopic 3d metadata. + * The data is the AVStereo3D struct defined in libavutil/stereo3d.h. + */ + AV_FRAME_DATA_STEREO3D, + /** + * The data is the AVMatrixEncoding enum defined in libavutil/channel_layout.h. + */ + AV_FRAME_DATA_MATRIXENCODING, + /** + * Metadata relevant to a downmix procedure. + * The data is the AVDownmixInfo struct defined in libavutil/downmix_info.h. + */ + AV_FRAME_DATA_DOWNMIX_INFO, + /** + * ReplayGain information in the form of the AVReplayGain struct. + */ + AV_FRAME_DATA_REPLAYGAIN, + /** + * This side data contains a 3x3 transformation matrix describing an affine + * transformation that needs to be applied to the frame for correct + * presentation. + * + * See libavutil/display.h for a detailed description of the data. + */ + AV_FRAME_DATA_DISPLAYMATRIX, + /** + * Active Format Description data consisting of a single byte as specified + * in ETSI TS 101 154 using AVActiveFormatDescription enum. + */ + AV_FRAME_DATA_AFD, + /** + * Motion vectors exported by some codecs (on demand through the export_mvs + * flag set in the libavcodec AVCodecContext flags2 option). + * The data is the AVMotionVector struct defined in + * libavutil/motion_vector.h. + */ + AV_FRAME_DATA_MOTION_VECTORS, + /** + * Recommmends skipping the specified number of samples. This is exported + * only if the "skip_manual" AVOption is set in libavcodec. + * This has the same format as AV_PKT_DATA_SKIP_SAMPLES. + * @code + * u32le number of samples to skip from start of this packet + * u32le number of samples to skip from end of this packet + * u8 reason for start skip + * u8 reason for end skip (0=padding silence, 1=convergence) + * @endcode + */ + AV_FRAME_DATA_SKIP_SAMPLES, + /** + * This side data must be associated with an audio frame and corresponds to + * enum AVAudioServiceType defined in avcodec.h. + */ + AV_FRAME_DATA_AUDIO_SERVICE_TYPE, + /** + * Mastering display metadata associated with a video frame. The payload is + * an AVMasteringDisplayMetadata type and contains information about the + * mastering display color volume. + */ + AV_FRAME_DATA_MASTERING_DISPLAY_METADATA, + /** + * The GOP timecode in 25 bit timecode format. Data format is 64-bit integer. + * This is set on the first frame of a GOP that has a temporal reference of 0. + */ + AV_FRAME_DATA_GOP_TIMECODE +}; + +enum AVActiveFormatDescription { + AV_AFD_SAME = 8, + AV_AFD_4_3 = 9, + AV_AFD_16_9 = 10, + AV_AFD_14_9 = 11, + AV_AFD_4_3_SP_14_9 = 13, + AV_AFD_16_9_SP_14_9 = 14, + AV_AFD_SP_4_3 = 15, +}; + + +/** + * Structure to hold side data for an AVFrame. + * + * sizeof(AVFrameSideData) is not a part of the public ABI, so new fields may be added + * to the end with a minor bump. + */ +typedef struct AVFrameSideData { + enum AVFrameSideDataType type; + uint8_t *data; + int size; + AVDictionary *metadata; + AVBufferRef *buf; +} AVFrameSideData; + +/** + * This structure describes decoded (raw) audio or video data. + * + * AVFrame must be allocated using av_frame_alloc(). Note that this only + * allocates the AVFrame itself, the buffers for the data must be managed + * through other means (see below). + * AVFrame must be freed with av_frame_free(). + * + * AVFrame is typically allocated once and then reused multiple times to hold + * different data (e.g. a single AVFrame to hold frames received from a + * decoder). In such a case, av_frame_unref() will free any references held by + * the frame and reset it to its original clean state before it + * is reused again. + * + * The data described by an AVFrame is usually reference counted through the + * AVBuffer API. The underlying buffer references are stored in AVFrame.buf / + * AVFrame.extended_buf. An AVFrame is considered to be reference counted if at + * least one reference is set, i.e. if AVFrame.buf[0] != NULL. In such a case, + * every single data plane must be contained in one of the buffers in + * AVFrame.buf or AVFrame.extended_buf. + * There may be a single buffer for all the data, or one separate buffer for + * each plane, or anything in between. + * + * sizeof(AVFrame) is not a part of the public ABI, so new fields may be added + * to the end with a minor bump. + * Similarly fields that are marked as to be only accessed by + * av_opt_ptr() can be reordered. This allows 2 forks to add fields + * without breaking compatibility with each other. + */ +typedef struct AVFrame { +#define AV_NUM_DATA_POINTERS 8 + /** + * pointer to the picture/channel planes. + * This might be different from the first allocated byte + * + * Some decoders access areas outside 0,0 - width,height, please + * see avcodec_align_dimensions2(). Some filters and swscale can read + * up to 16 bytes beyond the planes, if these filters are to be used, + * then 16 extra bytes must be allocated. + */ + uint8_t *data[AV_NUM_DATA_POINTERS]; + + /** + * For video, size in bytes of each picture line. + * For audio, size in bytes of each plane. + * + * For audio, only linesize[0] may be set. For planar audio, each channel + * plane must be the same size. + * + * For video the linesizes should be multiples of the CPUs alignment + * preference, this is 16 or 32 for modern desktop CPUs. + * Some code requires such alignment other code can be slower without + * correct alignment, for yet other it makes no difference. + * + * @note The linesize may be larger than the size of usable data -- there + * may be extra padding present for performance reasons. + */ + int linesize[AV_NUM_DATA_POINTERS]; + + /** + * pointers to the data planes/channels. + * + * For video, this should simply point to data[]. + * + * For planar audio, each channel has a separate data pointer, and + * linesize[0] contains the size of each channel buffer. + * For packed audio, there is just one data pointer, and linesize[0] + * contains the total size of the buffer for all channels. + * + * Note: Both data and extended_data should always be set in a valid frame, + * but for planar audio with more channels that can fit in data, + * extended_data must be used in order to access all channels. + */ + uint8_t **extended_data; + + /** + * width and height of the video frame + */ + int width, height; + + /** + * number of audio samples (per channel) described by this frame + */ + int nb_samples; + + /** + * format of the frame, -1 if unknown or unset + * Values correspond to enum AVPixelFormat for video frames, + * enum AVSampleFormat for audio) + */ + int format; + + /** + * 1 -> keyframe, 0-> not + */ + int key_frame; + + /** + * Picture type of the frame. + */ + enum AVPictureType pict_type; + + /** + * Sample aspect ratio for the video frame, 0/1 if unknown/unspecified. + */ + AVRational sample_aspect_ratio; + + /** + * Presentation timestamp in time_base units (time when frame should be shown to user). + */ + int64_t pts; + + /** + * PTS copied from the AVPacket that was decoded to produce this frame. + */ + int64_t pkt_pts; + + /** + * DTS copied from the AVPacket that triggered returning this frame. (if frame threading isn't used) + * This is also the Presentation time of this AVFrame calculated from + * only AVPacket.dts values without pts values. + */ + int64_t pkt_dts; + + /** + * picture number in bitstream order + */ + int coded_picture_number; + /** + * picture number in display order + */ + int display_picture_number; + + /** + * quality (between 1 (good) and FF_LAMBDA_MAX (bad)) + */ + int quality; + + /** + * for some private data of the user + */ + void *opaque; + +#if FF_API_ERROR_FRAME + /** + * @deprecated unused + */ + attribute_deprecated + uint64_t error[AV_NUM_DATA_POINTERS]; +#endif + + /** + * When decoding, this signals how much the picture must be delayed. + * extra_delay = repeat_pict / (2*fps) + */ + int repeat_pict; + + /** + * The content of the picture is interlaced. + */ + int interlaced_frame; + + /** + * If the content is interlaced, is top field displayed first. + */ + int top_field_first; + + /** + * Tell user application that palette has changed from previous frame. + */ + int palette_has_changed; + + /** + * reordered opaque 64bit (generally an integer or a double precision float + * PTS but can be anything). + * The user sets AVCodecContext.reordered_opaque to represent the input at + * that time, + * the decoder reorders values as needed and sets AVFrame.reordered_opaque + * to exactly one of the values provided by the user through AVCodecContext.reordered_opaque + * @deprecated in favor of pkt_pts + */ + int64_t reordered_opaque; + + /** + * Sample rate of the audio data. + */ + int sample_rate; + + /** + * Channel layout of the audio data. + */ + uint64_t channel_layout; + + /** + * AVBuffer references backing the data for this frame. If all elements of + * this array are NULL, then this frame is not reference counted. This array + * must be filled contiguously -- if buf[i] is non-NULL then buf[j] must + * also be non-NULL for all j < i. + * + * There may be at most one AVBuffer per data plane, so for video this array + * always contains all the references. For planar audio with more than + * AV_NUM_DATA_POINTERS channels, there may be more buffers than can fit in + * this array. Then the extra AVBufferRef pointers are stored in the + * extended_buf array. + */ + AVBufferRef *buf[AV_NUM_DATA_POINTERS]; + + /** + * For planar audio which requires more than AV_NUM_DATA_POINTERS + * AVBufferRef pointers, this array will hold all the references which + * cannot fit into AVFrame.buf. + * + * Note that this is different from AVFrame.extended_data, which always + * contains all the pointers. This array only contains the extra pointers, + * which cannot fit into AVFrame.buf. + * + * This array is always allocated using av_malloc() by whoever constructs + * the frame. It is freed in av_frame_unref(). + */ + AVBufferRef **extended_buf; + /** + * Number of elements in extended_buf. + */ + int nb_extended_buf; + + AVFrameSideData **side_data; + int nb_side_data; + +/** + * @defgroup lavu_frame_flags AV_FRAME_FLAGS + * Flags describing additional frame properties. + * + * @{ + */ + +/** + * The frame data may be corrupted, e.g. due to decoding errors. + */ +#define AV_FRAME_FLAG_CORRUPT (1 << 0) +/** + * @} + */ + + /** + * Frame flags, a combination of @ref lavu_frame_flags + */ + int flags; + + /** + * MPEG vs JPEG YUV range. + * It must be accessed using av_frame_get_color_range() and + * av_frame_set_color_range(). + * - encoding: Set by user + * - decoding: Set by libavcodec + */ + enum AVColorRange color_range; + + enum AVColorPrimaries color_primaries; + + enum AVColorTransferCharacteristic color_trc; + + /** + * YUV colorspace type. + * It must be accessed using av_frame_get_colorspace() and + * av_frame_set_colorspace(). + * - encoding: Set by user + * - decoding: Set by libavcodec + */ + enum AVColorSpace colorspace; + + enum AVChromaLocation chroma_location; + + /** + * frame timestamp estimated using various heuristics, in stream time base + * Code outside libavutil should access this field using: + * av_frame_get_best_effort_timestamp(frame) + * - encoding: unused + * - decoding: set by libavcodec, read by user. + */ + int64_t best_effort_timestamp; + + /** + * reordered pos from the last AVPacket that has been input into the decoder + * Code outside libavutil should access this field using: + * av_frame_get_pkt_pos(frame) + * - encoding: unused + * - decoding: Read by user. + */ + int64_t pkt_pos; + + /** + * duration of the corresponding packet, expressed in + * AVStream->time_base units, 0 if unknown. + * Code outside libavutil should access this field using: + * av_frame_get_pkt_duration(frame) + * - encoding: unused + * - decoding: Read by user. + */ + int64_t pkt_duration; + + /** + * metadata. + * Code outside libavutil should access this field using: + * av_frame_get_metadata(frame) + * - encoding: Set by user. + * - decoding: Set by libavcodec. + */ + AVDictionary *metadata; + + /** + * decode error flags of the frame, set to a combination of + * FF_DECODE_ERROR_xxx flags if the decoder produced a frame, but there + * were errors during the decoding. + * Code outside libavutil should access this field using: + * av_frame_get_decode_error_flags(frame) + * - encoding: unused + * - decoding: set by libavcodec, read by user. + */ + int decode_error_flags; +#define FF_DECODE_ERROR_INVALID_BITSTREAM 1 +#define FF_DECODE_ERROR_MISSING_REFERENCE 2 + + /** + * number of audio channels, only used for audio. + * Code outside libavutil should access this field using: + * av_frame_get_channels(frame) + * - encoding: unused + * - decoding: Read by user. + */ + int channels; + + /** + * size of the corresponding packet containing the compressed + * frame. It must be accessed using av_frame_get_pkt_size() and + * av_frame_set_pkt_size(). + * It is set to a negative value if unknown. + * - encoding: unused + * - decoding: set by libavcodec, read by user. + */ + int pkt_size; + +#if FF_API_FRAME_QP + /** + * QP table + * Not to be accessed directly from outside libavutil + */ + attribute_deprecated + int8_t *qscale_table; + /** + * QP store stride + * Not to be accessed directly from outside libavutil + */ + attribute_deprecated + int qstride; + + attribute_deprecated + int qscale_type; + + /** + * Not to be accessed directly from outside libavutil + */ + AVBufferRef *qp_table_buf; +#endif +} AVFrame; + +/** + * Accessors for some AVFrame fields. + * The position of these field in the structure is not part of the ABI, + * they should not be accessed directly outside libavutil. + */ +int64_t av_frame_get_best_effort_timestamp(const AVFrame *frame); +void av_frame_set_best_effort_timestamp(AVFrame *frame, int64_t val); +int64_t av_frame_get_pkt_duration (const AVFrame *frame); +void av_frame_set_pkt_duration (AVFrame *frame, int64_t val); +int64_t av_frame_get_pkt_pos (const AVFrame *frame); +void av_frame_set_pkt_pos (AVFrame *frame, int64_t val); +int64_t av_frame_get_channel_layout (const AVFrame *frame); +void av_frame_set_channel_layout (AVFrame *frame, int64_t val); +int av_frame_get_channels (const AVFrame *frame); +void av_frame_set_channels (AVFrame *frame, int val); +int av_frame_get_sample_rate (const AVFrame *frame); +void av_frame_set_sample_rate (AVFrame *frame, int val); +AVDictionary *av_frame_get_metadata (const AVFrame *frame); +void av_frame_set_metadata (AVFrame *frame, AVDictionary *val); +int av_frame_get_decode_error_flags (const AVFrame *frame); +void av_frame_set_decode_error_flags (AVFrame *frame, int val); +int av_frame_get_pkt_size(const AVFrame *frame); +void av_frame_set_pkt_size(AVFrame *frame, int val); +AVDictionary **avpriv_frame_get_metadatap(AVFrame *frame); +#if FF_API_FRAME_QP +int8_t *av_frame_get_qp_table(AVFrame *f, int *stride, int *type); +int av_frame_set_qp_table(AVFrame *f, AVBufferRef *buf, int stride, int type); +#endif +enum AVColorSpace av_frame_get_colorspace(const AVFrame *frame); +void av_frame_set_colorspace(AVFrame *frame, enum AVColorSpace val); +enum AVColorRange av_frame_get_color_range(const AVFrame *frame); +void av_frame_set_color_range(AVFrame *frame, enum AVColorRange val); + +/** + * Get the name of a colorspace. + * @return a static string identifying the colorspace; can be NULL. + */ +const char *av_get_colorspace_name(enum AVColorSpace val); + +/** + * Allocate an AVFrame and set its fields to default values. The resulting + * struct must be freed using av_frame_free(). + * + * @return An AVFrame filled with default values or NULL on failure. + * + * @note this only allocates the AVFrame itself, not the data buffers. Those + * must be allocated through other means, e.g. with av_frame_get_buffer() or + * manually. + */ +AVFrame *av_frame_alloc(void); + +/** + * Free the frame and any dynamically allocated objects in it, + * e.g. extended_data. If the frame is reference counted, it will be + * unreferenced first. + * + * @param frame frame to be freed. The pointer will be set to NULL. + */ +void av_frame_free(AVFrame **frame); + +/** + * Set up a new reference to the data described by the source frame. + * + * Copy frame properties from src to dst and create a new reference for each + * AVBufferRef from src. + * + * If src is not reference counted, new buffers are allocated and the data is + * copied. + * + * @return 0 on success, a negative AVERROR on error + */ +int av_frame_ref(AVFrame *dst, const AVFrame *src); + +/** + * Create a new frame that references the same data as src. + * + * This is a shortcut for av_frame_alloc()+av_frame_ref(). + * + * @return newly created AVFrame on success, NULL on error. + */ +AVFrame *av_frame_clone(const AVFrame *src); + +/** + * Unreference all the buffers referenced by frame and reset the frame fields. + */ +void av_frame_unref(AVFrame *frame); + +/** + * Move everything contained in src to dst and reset src. + */ +void av_frame_move_ref(AVFrame *dst, AVFrame *src); + +/** + * Allocate new buffer(s) for audio or video data. + * + * The following fields must be set on frame before calling this function: + * - format (pixel format for video, sample format for audio) + * - width and height for video + * - nb_samples and channel_layout for audio + * + * This function will fill AVFrame.data and AVFrame.buf arrays and, if + * necessary, allocate and fill AVFrame.extended_data and AVFrame.extended_buf. + * For planar formats, one buffer will be allocated for each plane. + * + * @param frame frame in which to store the new buffers. + * @param align required buffer size alignment + * + * @return 0 on success, a negative AVERROR on error. + */ +int av_frame_get_buffer(AVFrame *frame, int align); + +/** + * Check if the frame data is writable. + * + * @return A positive value if the frame data is writable (which is true if and + * only if each of the underlying buffers has only one reference, namely the one + * stored in this frame). Return 0 otherwise. + * + * If 1 is returned the answer is valid until av_buffer_ref() is called on any + * of the underlying AVBufferRefs (e.g. through av_frame_ref() or directly). + * + * @see av_frame_make_writable(), av_buffer_is_writable() + */ +int av_frame_is_writable(AVFrame *frame); + +/** + * Ensure that the frame data is writable, avoiding data copy if possible. + * + * Do nothing if the frame is writable, allocate new buffers and copy the data + * if it is not. + * + * @return 0 on success, a negative AVERROR on error. + * + * @see av_frame_is_writable(), av_buffer_is_writable(), + * av_buffer_make_writable() + */ +int av_frame_make_writable(AVFrame *frame); + +/** + * Copy the frame data from src to dst. + * + * This function does not allocate anything, dst must be already initialized and + * allocated with the same parameters as src. + * + * This function only copies the frame data (i.e. the contents of the data / + * extended data arrays), not any other properties. + * + * @return >= 0 on success, a negative AVERROR on error. + */ +int av_frame_copy(AVFrame *dst, const AVFrame *src); + +/** + * Copy only "metadata" fields from src to dst. + * + * Metadata for the purpose of this function are those fields that do not affect + * the data layout in the buffers. E.g. pts, sample rate (for audio) or sample + * aspect ratio (for video), but not width/height or channel layout. + * Side data is also copied. + */ +int av_frame_copy_props(AVFrame *dst, const AVFrame *src); + +/** + * Get the buffer reference a given data plane is stored in. + * + * @param plane index of the data plane of interest in frame->extended_data. + * + * @return the buffer reference that contains the plane or NULL if the input + * frame is not valid. + */ +AVBufferRef *av_frame_get_plane_buffer(AVFrame *frame, int plane); + +/** + * Add a new side data to a frame. + * + * @param frame a frame to which the side data should be added + * @param type type of the added side data + * @param size size of the side data + * + * @return newly added side data on success, NULL on error + */ +AVFrameSideData *av_frame_new_side_data(AVFrame *frame, + enum AVFrameSideDataType type, + int size); + +/** + * @return a pointer to the side data of a given type on success, NULL if there + * is no side data with such type in this frame. + */ +AVFrameSideData *av_frame_get_side_data(const AVFrame *frame, + enum AVFrameSideDataType type); + +/** + * If side data of the supplied type exists in the frame, free it and remove it + * from the frame. + */ +void av_frame_remove_side_data(AVFrame *frame, enum AVFrameSideDataType type); + +/** + * @return a string identifying the side data type + */ +const char *av_frame_side_data_name(enum AVFrameSideDataType type); + +/** + * @} + */ + +#endif /* AVUTIL_FRAME_H */ diff --git a/ext/at3_standalone/get_bits.h b/ext/at3_standalone/get_bits.h new file mode 100644 index 0000000000..5bc786f3b8 --- /dev/null +++ b/ext/at3_standalone/get_bits.h @@ -0,0 +1,714 @@ +/* + * copyright (c) 2004 Michael Niedermayer + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + * bitstream reader API header. + */ + +#ifndef AVCODEC_GET_BITS_H +#define AVCODEC_GET_BITS_H + +#include + +#include "common.h" +#include "common.h" +#include "intreadwrite.h" +#include "mathops.h" + /* +#include "libavutil/log.h" +#include "libavutil/avassert.h" +*/ + +/* + * Safe bitstream reading: + * optionally, the get_bits API can check to ensure that we + * don't read past input buffer boundaries. This is protected + * with CONFIG_SAFE_BITSTREAM_READER at the global level, and + * then below that with UNCHECKED_BITSTREAM_READER at the per- + * decoder level. This means that decoders that check internally + * can "#define UNCHECKED_BITSTREAM_READER 1" to disable + * overread checks. + * Boundary checking causes a minor performance penalty so for + * applications that won't want/need this, it can be disabled + * globally using "#define CONFIG_SAFE_BITSTREAM_READER 0". + */ +#ifndef UNCHECKED_BITSTREAM_READER +#define UNCHECKED_BITSTREAM_READER !CONFIG_SAFE_BITSTREAM_READER +#endif + +typedef struct GetBitContext { + const uint8_t *buffer, *buffer_end; + int index; + int size_in_bits; + int size_in_bits_plus8; +} GetBitContext; + +#define VLC_TYPE int16_t + +typedef struct VLC { + int bits; + VLC_TYPE (*table)[2]; ///< code, bits + int table_size, table_allocated; +} VLC; + +typedef struct RL_VLC_ELEM { + int16_t level; + int8_t len; + uint8_t run; +} RL_VLC_ELEM; + +/* Bitstream reader API docs: + * name + * arbitrary name which is used as prefix for the internal variables + * + * gb + * getbitcontext + * + * OPEN_READER(name, gb) + * load gb into local variables + * + * CLOSE_READER(name, gb) + * store local vars in gb + * + * UPDATE_CACHE(name, gb) + * Refill the internal cache from the bitstream. + * After this call at least MIN_CACHE_BITS will be available. + * + * GET_CACHE(name, gb) + * Will output the contents of the internal cache, + * next bit is MSB of 32 or 64 bit (FIXME 64bit). + * + * SHOW_UBITS(name, gb, num) + * Will return the next num bits. + * + * SHOW_SBITS(name, gb, num) + * Will return the next num bits and do sign extension. + * + * SKIP_BITS(name, gb, num) + * Will skip over the next num bits. + * Note, this is equivalent to SKIP_CACHE; SKIP_COUNTER. + * + * SKIP_CACHE(name, gb, num) + * Will remove the next num bits from the cache (note SKIP_COUNTER + * MUST be called before UPDATE_CACHE / CLOSE_READER). + * + * SKIP_COUNTER(name, gb, num) + * Will increment the internal bit counter (see SKIP_CACHE & SKIP_BITS). + * + * LAST_SKIP_BITS(name, gb, num) + * Like SKIP_BITS, to be used if next call is UPDATE_CACHE or CLOSE_READER. + * + * BITS_LEFT(name, gb) + * Return the number of bits left + * + * For examples see get_bits, show_bits, skip_bits, get_vlc. + */ + +#ifdef LONG_BITSTREAM_READER +# define MIN_CACHE_BITS 32 +#else +# define MIN_CACHE_BITS 25 +#endif + +#define OPEN_READER_NOSIZE(name, gb) \ + unsigned int name ## _index = (gb)->index; \ + unsigned int av_unused name ## _cache + +#if UNCHECKED_BITSTREAM_READER +#define OPEN_READER(name, gb) OPEN_READER_NOSIZE(name, gb) + +#define BITS_AVAILABLE(name, gb) 1 +#else +#define OPEN_READER(name, gb) \ + OPEN_READER_NOSIZE(name, gb); \ + unsigned int name ## _size_plus8 = (gb)->size_in_bits_plus8 + +#define BITS_AVAILABLE(name, gb) name ## _index < name ## _size_plus8 +#endif + +#define CLOSE_READER(name, gb) (gb)->index = name ## _index + +# ifdef LONG_BITSTREAM_READER + +# define UPDATE_CACHE_LE(name, gb) name ## _cache = \ + AV_RL64((gb)->buffer + (name ## _index >> 3)) >> (name ## _index & 7) + +# define UPDATE_CACHE_BE(name, gb) name ## _cache = \ + AV_RB64((gb)->buffer + (name ## _index >> 3)) >> (32 - (name ## _index & 7)) + +#else + +# define UPDATE_CACHE_LE(name, gb) name ## _cache = \ + AV_RL32((gb)->buffer + (name ## _index >> 3)) >> (name ## _index & 7) + +# define UPDATE_CACHE_BE(name, gb) name ## _cache = \ + AV_RB32((gb)->buffer + (name ## _index >> 3)) << (name ## _index & 7) + +#endif + + +#ifdef BITSTREAM_READER_LE + +# define UPDATE_CACHE(name, gb) UPDATE_CACHE_LE(name, gb) + +# define SKIP_CACHE(name, gb, num) name ## _cache >>= (num) + +#else + +# define UPDATE_CACHE(name, gb) UPDATE_CACHE_BE(name, gb) + +# define SKIP_CACHE(name, gb, num) name ## _cache <<= (num) + +#endif + +#if UNCHECKED_BITSTREAM_READER +# define SKIP_COUNTER(name, gb, num) name ## _index += (num) +#else +# define SKIP_COUNTER(name, gb, num) \ + name ## _index = FFMIN(name ## _size_plus8, name ## _index + (num)) +#endif + +#define BITS_LEFT(name, gb) ((int)((gb)->size_in_bits - name ## _index)) + +#define SKIP_BITS(name, gb, num) \ + do { \ + SKIP_CACHE(name, gb, num); \ + SKIP_COUNTER(name, gb, num); \ + } while (0) + +#define LAST_SKIP_BITS(name, gb, num) SKIP_COUNTER(name, gb, num) + +#define SHOW_UBITS_LE(name, gb, num) zero_extend(name ## _cache, num) +#define SHOW_SBITS_LE(name, gb, num) sign_extend(name ## _cache, num) + +#define SHOW_UBITS_BE(name, gb, num) NEG_USR32(name ## _cache, num) +#define SHOW_SBITS_BE(name, gb, num) NEG_SSR32(name ## _cache, num) + +#ifdef BITSTREAM_READER_LE +# define SHOW_UBITS(name, gb, num) SHOW_UBITS_LE(name, gb, num) +# define SHOW_SBITS(name, gb, num) SHOW_SBITS_LE(name, gb, num) +#else +# define SHOW_UBITS(name, gb, num) SHOW_UBITS_BE(name, gb, num) +# define SHOW_SBITS(name, gb, num) SHOW_SBITS_BE(name, gb, num) +#endif + +#define GET_CACHE(name, gb) ((uint32_t) name ## _cache) + +static inline int get_bits_count(const GetBitContext *s) +{ + return s->index; +} + +static inline void skip_bits_long(GetBitContext *s, int n) +{ +#if UNCHECKED_BITSTREAM_READER + s->index += n; +#else + s->index += av_clip(n, -s->index, s->size_in_bits_plus8 - s->index); +#endif +} + +/** + * read mpeg1 dc style vlc (sign bit + mantissa with no MSB). + * if MSB not set it is negative + * @param n length in bits + */ +static inline int get_xbits(GetBitContext *s, int n) +{ + register int sign; + register int32_t cache; + OPEN_READER(re, s); + av_assert2(n>0 && n<=25); + UPDATE_CACHE(re, s); + cache = GET_CACHE(re, s); + sign = ~cache >> 31; + LAST_SKIP_BITS(re, s, n); + CLOSE_READER(re, s); + return (NEG_USR32(sign ^ cache, n) ^ sign) - sign; +} + +static inline int get_sbits(GetBitContext *s, int n) +{ + register int tmp; + OPEN_READER(re, s); + av_assert2(n>0 && n<=25); + UPDATE_CACHE(re, s); + tmp = SHOW_SBITS(re, s, n); + LAST_SKIP_BITS(re, s, n); + CLOSE_READER(re, s); + return tmp; +} + +/** + * Read 1-25 bits. + */ +static inline unsigned int get_bits(GetBitContext *s, int n) +{ + register int tmp; + OPEN_READER(re, s); + av_assert2(n>0 && n<=25); + UPDATE_CACHE(re, s); + tmp = SHOW_UBITS(re, s, n); + LAST_SKIP_BITS(re, s, n); + CLOSE_READER(re, s); + return tmp; +} + +/** + * Read 0-25 bits. + */ +static av_always_inline int get_bitsz(GetBitContext *s, int n) +{ + return n ? get_bits(s, n) : 0; +} + +static inline unsigned int get_bits_le(GetBitContext *s, int n) +{ + register int tmp; + OPEN_READER(re, s); + av_assert2(n>0 && n<=25); + UPDATE_CACHE_LE(re, s); + tmp = SHOW_UBITS_LE(re, s, n); + LAST_SKIP_BITS(re, s, n); + CLOSE_READER(re, s); + return tmp; +} + +/** + * Show 1-25 bits. + */ +static inline unsigned int show_bits(GetBitContext *s, int n) +{ + register int tmp; + OPEN_READER_NOSIZE(re, s); + av_assert2(n>0 && n<=25); + UPDATE_CACHE(re, s); + tmp = SHOW_UBITS(re, s, n); + return tmp; +} + +static inline void skip_bits(GetBitContext *s, int n) +{ + OPEN_READER(re, s); + LAST_SKIP_BITS(re, s, n); + CLOSE_READER(re, s); +} + +static inline unsigned int get_bits1(GetBitContext *s) +{ + unsigned int index = s->index; + uint8_t result = s->buffer[index >> 3]; +#ifdef BITSTREAM_READER_LE + result >>= index & 7; + result &= 1; +#else + result <<= index & 7; + result >>= 8 - 1; +#endif +#if !UNCHECKED_BITSTREAM_READER + if (s->index < s->size_in_bits_plus8) +#endif + index++; + s->index = index; + + return result; +} + +static inline unsigned int show_bits1(GetBitContext *s) +{ + return show_bits(s, 1); +} + +static inline void skip_bits1(GetBitContext *s) +{ + skip_bits(s, 1); +} + +/** + * Read 0-32 bits. + */ +static inline unsigned int get_bits_long(GetBitContext *s, int n) +{ + if (!n) { + return 0; + } else if (n <= MIN_CACHE_BITS) { + return get_bits(s, n); + } else { +#ifdef BITSTREAM_READER_LE + unsigned ret = get_bits(s, 16); + return ret | (get_bits(s, n - 16) << 16); +#else + unsigned ret = get_bits(s, 16) << (n - 16); + return ret | get_bits(s, n - 16); +#endif + } +} + +/** + * Read 0-64 bits. + */ +static inline uint64_t get_bits64(GetBitContext *s, int n) +{ + if (n <= 32) { + return get_bits_long(s, n); + } else { +#ifdef BITSTREAM_READER_LE + uint64_t ret = get_bits_long(s, 32); + return ret | (uint64_t) get_bits_long(s, n - 32) << 32; +#else + uint64_t ret = (uint64_t) get_bits_long(s, n - 32) << 32; + return ret | get_bits_long(s, 32); +#endif + } +} + +/** + * Read 0-32 bits as a signed integer. + */ +static inline int get_sbits_long(GetBitContext *s, int n) +{ + return sign_extend(get_bits_long(s, n), n); +} + +/** + * Show 0-32 bits. + */ +static inline unsigned int show_bits_long(GetBitContext *s, int n) +{ + if (n <= MIN_CACHE_BITS) { + return show_bits(s, n); + } else { + GetBitContext gb = *s; + return get_bits_long(&gb, n); + } +} + +static inline int check_marker(GetBitContext *s, const char *msg) +{ + int bit = get_bits1(s); + if (!bit) + av_log(NULL, AV_LOG_INFO, "Marker bit missing at %d of %d %s\n", get_bits_count(s) - 1, s->size_in_bits, msg); + + return bit; +} + +/** + * Initialize GetBitContext. + * @param buffer bitstream buffer, must be AV_INPUT_BUFFER_PADDING_SIZE bytes + * larger than the actual read bits because some optimized bitstream + * readers read 32 or 64 bit at once and could read over the end + * @param bit_size the size of the buffer in bits + * @return 0 on success, AVERROR_INVALIDDATA if the buffer_size would overflow. + */ +static inline int init_get_bits(GetBitContext *s, const uint8_t *buffer, + int bit_size) +{ + int buffer_size; + int ret = 0; + + if (bit_size >= INT_MAX - 7 || bit_size < 0 || !buffer) { + bit_size = 0; + buffer = NULL; + ret = AVERROR_INVALIDDATA; + } + + buffer_size = (bit_size + 7) >> 3; + + s->buffer = buffer; + s->size_in_bits = bit_size; + s->size_in_bits_plus8 = bit_size + 8; + s->buffer_end = buffer + buffer_size; + s->index = 0; + + return ret; +} + +/** + * Initialize GetBitContext. + * @param buffer bitstream buffer, must be AV_INPUT_BUFFER_PADDING_SIZE bytes + * larger than the actual read bits because some optimized bitstream + * readers read 32 or 64 bit at once and could read over the end + * @param byte_size the size of the buffer in bytes + * @return 0 on success, AVERROR_INVALIDDATA if the buffer_size would overflow. + */ +static inline int init_get_bits8(GetBitContext *s, const uint8_t *buffer, + int byte_size) +{ + if (byte_size > INT_MAX / 8 || byte_size < 0) + byte_size = -1; + return init_get_bits(s, buffer, byte_size * 8); +} + +static inline const uint8_t *align_get_bits(GetBitContext *s) +{ + int n = -get_bits_count(s) & 7; + if (n) + skip_bits(s, n); + return s->buffer + (s->index >> 3); +} + +#define init_vlc(vlc, nb_bits, nb_codes, \ + bits, bits_wrap, bits_size, \ + codes, codes_wrap, codes_size, \ + flags) \ + ff_init_vlc_sparse(vlc, nb_bits, nb_codes, \ + bits, bits_wrap, bits_size, \ + codes, codes_wrap, codes_size, \ + NULL, 0, 0, flags) + +int ff_init_vlc_sparse(VLC *vlc, int nb_bits, int nb_codes, + const void *bits, int bits_wrap, int bits_size, + const void *codes, int codes_wrap, int codes_size, + const void *symbols, int symbols_wrap, int symbols_size, + int flags); +void ff_free_vlc(VLC *vlc); + +#define INIT_VLC_LE 2 +#define INIT_VLC_USE_NEW_STATIC 4 + +#define INIT_VLC_STATIC(vlc, bits, a, b, c, d, e, f, g, static_size) \ + do { \ + static VLC_TYPE table[static_size][2]; \ + (vlc)->table = table; \ + (vlc)->table_allocated = static_size; \ + init_vlc(vlc, bits, a, b, c, d, e, f, g, INIT_VLC_USE_NEW_STATIC); \ + } while (0) + +/** + * If the vlc code is invalid and max_depth=1, then no bits will be removed. + * If the vlc code is invalid and max_depth>1, then the number of bits removed + * is undefined. + */ +#define GET_VLC(code, name, gb, table, bits, max_depth) \ + do { \ + int n, nb_bits; \ + unsigned int index; \ + \ + index = SHOW_UBITS(name, gb, bits); \ + code = table[index][0]; \ + n = table[index][1]; \ + \ + if (max_depth > 1 && n < 0) { \ + LAST_SKIP_BITS(name, gb, bits); \ + UPDATE_CACHE(name, gb); \ + \ + nb_bits = -n; \ + \ + index = SHOW_UBITS(name, gb, nb_bits) + code; \ + code = table[index][0]; \ + n = table[index][1]; \ + if (max_depth > 2 && n < 0) { \ + LAST_SKIP_BITS(name, gb, nb_bits); \ + UPDATE_CACHE(name, gb); \ + \ + nb_bits = -n; \ + \ + index = SHOW_UBITS(name, gb, nb_bits) + code; \ + code = table[index][0]; \ + n = table[index][1]; \ + } \ + } \ + SKIP_BITS(name, gb, n); \ + } while (0) + +#define GET_RL_VLC_INTERNAL(level, run, name, gb, table, bits, \ + max_depth, need_update) \ + do { \ + int n, nb_bits; \ + unsigned int index; \ + \ + index = SHOW_UBITS(name, gb, bits); \ + level = table[index].level; \ + n = table[index].len; \ + \ + if (max_depth > 1 && n < 0) { \ + SKIP_BITS(name, gb, bits); \ + if (need_update) { \ + UPDATE_CACHE(name, gb); \ + } \ + \ + nb_bits = -n; \ + \ + index = SHOW_UBITS(name, gb, nb_bits) + level; \ + level = table[index].level; \ + n = table[index].len; \ + if (max_depth > 2 && n < 0) { \ + LAST_SKIP_BITS(name, gb, nb_bits); \ + if (need_update) { \ + UPDATE_CACHE(name, gb); \ + } \ + nb_bits = -n; \ + \ + index = SHOW_UBITS(name, gb, nb_bits) + level; \ + level = table[index].level; \ + n = table[index].len; \ + } \ + } \ + run = table[index].run; \ + SKIP_BITS(name, gb, n); \ + } while (0) + +/** + * Parse a vlc code. + * @param bits is the number of bits which will be read at once, must be + * identical to nb_bits in init_vlc() + * @param max_depth is the number of times bits bits must be read to completely + * read the longest vlc code + * = (max_vlc_length + bits - 1) / bits + */ +static av_always_inline int get_vlc2(GetBitContext *s, VLC_TYPE (*table)[2], + int bits, int max_depth) +{ + int code; + + OPEN_READER(re, s); + UPDATE_CACHE(re, s); + + GET_VLC(code, re, s, table, bits, max_depth); + + CLOSE_READER(re, s); + + return code; +} + +static inline int decode012(GetBitContext *gb) +{ + int n; + n = get_bits1(gb); + if (n == 0) + return 0; + else + return get_bits1(gb) + 1; +} + +static inline int decode210(GetBitContext *gb) +{ + if (get_bits1(gb)) + return 0; + else + return 2 - get_bits1(gb); +} + +static inline int get_bits_left(GetBitContext *gb) +{ + return gb->size_in_bits - get_bits_count(gb); +} + +static inline int skip_1stop_8data_bits(GetBitContext *gb) +{ + if (get_bits_left(gb) <= 0) + return AVERROR_INVALIDDATA; + + while (get_bits1(gb)) { + skip_bits(gb, 8); + if (get_bits_left(gb) <= 0) + return AVERROR_INVALIDDATA; + } + + return 0; +} + +//#define TRACE + +#ifdef TRACE +static inline void print_bin(int bits, int n) +{ + int i; + + for (i = n - 1; i >= 0; i--) + av_log(NULL, AV_LOG_DEBUG, "%d", (bits >> i) & 1); + for (i = n; i < 24; i++) + av_log(NULL, AV_LOG_DEBUG, " "); +} + +static inline int get_bits_trace(GetBitContext *s, int n, const char *file, + const char *func, int line) +{ + int r = get_bits(s, n); + + print_bin(r, n); + av_log(NULL, AV_LOG_DEBUG, "%5d %2d %3d bit @%5d in %s %s:%d\n", + r, n, r, get_bits_count(s) - n, file, func, line); + + return r; +} + +static inline int get_vlc_trace(GetBitContext *s, VLC_TYPE (*table)[2], + int bits, int max_depth, const char *file, + const char *func, int line) +{ + int show = show_bits(s, 24); + int pos = get_bits_count(s); + int r = get_vlc2(s, table, bits, max_depth); + int len = get_bits_count(s) - pos; + int bits2 = show >> (24 - len); + + print_bin(bits2, len); + + av_log(NULL, AV_LOG_DEBUG, "%5d %2d %3d vlc @%5d in %s %s:%d\n", + bits2, len, r, pos, file, func, line); + + return r; +} + +#define GET_RL_VLC(level, run, name, gb, table, bits, \ + max_depth, need_update) \ + do { \ + int show = SHOW_UBITS(name, gb, 24); \ + int len; \ + int pos = name ## _index; \ + \ + GET_RL_VLC_INTERNAL(level, run, name, gb, table, bits,max_depth, need_update); \ + \ + len = name ## _index - pos + 1; \ + show = show >> (24 - len); \ + \ + print_bin(show, len); \ + \ + av_log(NULL, AV_LOG_DEBUG, "%5d %2d %3d/%-3d rlv @%5d in %s %s:%d\n",\ + show, len, run-1, level, pos, __FILE__, __PRETTY_FUNCTION__, __LINE__);\ + } while (0) \ + + +static inline int get_xbits_trace(GetBitContext *s, int n, const char *file, + const char *func, int line) +{ + int show = show_bits(s, n); + int r = get_xbits(s, n); + + print_bin(show, n); + av_log(NULL, AV_LOG_DEBUG, "%5d %2d %3d xbt @%5d in %s %s:%d\n", + show, n, r, get_bits_count(s) - n, file, func, line); + + return r; +} + +#define get_bits(s, n) get_bits_trace(s , n, __FILE__, __PRETTY_FUNCTION__, __LINE__) +#define get_bits1(s) get_bits_trace(s, 1, __FILE__, __PRETTY_FUNCTION__, __LINE__) +#define get_xbits(s, n) get_xbits_trace(s, n, __FILE__, __PRETTY_FUNCTION__, __LINE__) + +#define get_vlc(s, vlc) get_vlc_trace(s, (vlc)->table, (vlc)->bits, 3, __FILE__, __PRETTY_FUNCTION__, __LINE__) +#define get_vlc2(s, tab, bits, max) get_vlc_trace(s, tab, bits, max, __FILE__, __PRETTY_FUNCTION__, __LINE__) +#else //TRACE +#define GET_RL_VLC GET_RL_VLC_INTERNAL +#endif + +#endif /* AVCODEC_GET_BITS_H */ diff --git a/ext/at3_standalone/internal.h b/ext/at3_standalone/internal.h new file mode 100644 index 0000000000..326abe73ed --- /dev/null +++ b/ext/at3_standalone/internal.h @@ -0,0 +1,333 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + * common internal api header. + */ + +#ifndef AVCODEC_INTERNAL_H +#define AVCODEC_INTERNAL_H + +#include + +#include "buffer.h" +#include "channel_layout.h" +#include "mathematics.h" +#include "pixfmt.h" +#include "avcodec.h" +#include "config.h" + +/** + * The codec does not modify any global variables in the init function, + * allowing to call the init function without locking any global mutexes. + */ +#define FF_CODEC_CAP_INIT_THREADSAFE (1 << 0) +/** + * The codec allows calling the close function for deallocation even if + * the init function returned a failure. Without this capability flag, a + * codec does such cleanup internally when returning failures from the + * init function and does not expect the close function to be called at + * all. + */ +#define FF_CODEC_CAP_INIT_CLEANUP (1 << 1) +/** + * Decoders marked with FF_CODEC_CAP_SETS_PKT_DTS want to set + * AVFrame.pkt_dts manually. If the flag is set, utils.c won't overwrite + * this field. If it's unset, utils.c tries to guess the pkt_dts field + * from the input AVPacket. + */ +#define FF_CODEC_CAP_SETS_PKT_DTS (1 << 2) +/** + * The decoder extracts and fills its parameters even if the frame is + * skipped due to the skip_frame setting. + */ +#define FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM (1 << 3) + +#ifdef TRACE +# define ff_tlog(ctx, ...) av_log(ctx, AV_LOG_TRACE, __VA_ARGS__) +#else +# define ff_tlog(ctx, ...) do { } while(0) +#endif + + +#if !FF_API_QUANT_BIAS +#define FF_DEFAULT_QUANT_BIAS 999999 +#endif + +#define FF_SANE_NB_CHANNELS 64U + +#define FF_SIGNBIT(x) ((x) >> CHAR_BIT * sizeof(x) - 1) + +#if HAVE_AVX +# define STRIDE_ALIGN 32 +#elif HAVE_SIMD_ALIGN_16 +# define STRIDE_ALIGN 16 +#else +# define STRIDE_ALIGN 8 +#endif + +typedef struct FramePool { + /** + * Pools for each data plane. For audio all the planes have the same size, + * so only pools[0] is used. + */ + AVBufferPool *pools[4]; + + /* + * Pool parameters + */ + int format; + int width, height; + int stride_align[AV_NUM_DATA_POINTERS]; + int linesize[4]; + int planes; + int channels; + int samples; +} FramePool; + +typedef struct AVCodecInternal { + /** + * Whether the parent AVCodecContext is a copy of the context which had + * init() called on it. + * This is used by multithreading - shared tables and picture pointers + * should be freed from the original context only. + */ + int is_copy; + + /** + * Whether to allocate progress for frame threading. + * + * The codec must set it to 1 if it uses ff_thread_await/report_progress(), + * then progress will be allocated in ff_thread_get_buffer(). The frames + * then MUST be freed with ff_thread_release_buffer(). + * + * If the codec does not need to call the progress functions (there are no + * dependencies between the frames), it should leave this at 0. Then it can + * decode straight to the user-provided frames (which the user will then + * free with av_frame_unref()), there is no need to call + * ff_thread_release_buffer(). + */ + int allocate_progress; + + /** + * An audio frame with less than required samples has been submitted and + * padded with silence. Reject all subsequent frames. + */ + int last_audio_frame; + + AVFrame *to_free; + + FramePool *pool; + + void *thread_ctx; + + /** + * Current packet as passed into the decoder, to avoid having to pass the + * packet into every function. + */ + AVPacket *pkt; + + /** + * temporary buffer used for encoders to store their bitstream + */ + uint8_t *byte_buffer; + unsigned int byte_buffer_size; + + void *frame_thread_encoder; + + /** + * Number of audio samples to skip at the start of the next decoded frame + */ + int skip_samples; + + /** + * hwaccel-specific private data + */ + void *hwaccel_priv_data; +} AVCodecInternal; + +struct AVCodecDefault { + const uint8_t *key; + const uint8_t *value; +}; + +extern const uint8_t ff_log2_run[41]; + +/** + * Return the index into tab at which {a,b} match elements {[0],[1]} of tab. + * If there is no such matching pair then size is returned. + */ +int ff_match_2uint16(const uint16_t (*tab)[2], int size, int a, int b); + +unsigned int avpriv_toupper4(unsigned int x); + +/** + * does needed setup of pkt_pts/pos and such for (re)get_buffer(); + */ +int ff_init_buffer_info(AVCodecContext *s, AVFrame *frame); + + +void ff_color_frame(AVFrame *frame, const int color[4]); + +extern volatile int ff_avcodec_locked; +int ff_lock_avcodec(AVCodecContext *log_ctx, const AVCodec *codec); +int ff_unlock_avcodec(const AVCodec *codec); + +int avpriv_lock_avformat(void); +int avpriv_unlock_avformat(void); + +/** + * Maximum size in bytes of extradata. + * This value was chosen such that every bit of the buffer is + * addressable by a 32-bit signed integer as used by get_bits. + */ +#define FF_MAX_EXTRADATA_SIZE ((1 << 28) - AV_INPUT_BUFFER_PADDING_SIZE) + +/** + * Check AVPacket size and/or allocate data. + * + * Encoders supporting AVCodec.encode2() can use this as a convenience to + * ensure the output packet data is large enough, whether provided by the user + * or allocated in this function. + * + * @param avctx the AVCodecContext of the encoder + * @param avpkt the AVPacket + * If avpkt->data is already set, avpkt->size is checked + * to ensure it is large enough. + * If avpkt->data is NULL, a new buffer is allocated. + * avpkt->size is set to the specified size. + * All other AVPacket fields will be reset with av_init_packet(). + * @param size the minimum required packet size + * @param min_size This is a hint to the allocation algorithm, which indicates + * to what minimal size the caller might later shrink the packet + * to. Encoders often allocate packets which are larger than the + * amount of data that is written into them as the exact amount is + * not known at the time of allocation. min_size represents the + * size a packet might be shrunk to by the caller. Can be set to + * 0. setting this roughly correctly allows the allocation code + * to choose between several allocation strategies to improve + * speed slightly. + * @return non negative on success, negative error code on failure + */ +int ff_alloc_packet2(AVCodecContext *avctx, AVPacket *avpkt, int64_t size, int64_t min_size); + +attribute_deprecated int ff_alloc_packet(AVPacket *avpkt, int size); + +/** + * Rescale from sample rate to AVCodecContext.time_base. + */ +static av_always_inline int64_t ff_samples_to_time_base(AVCodecContext *avctx, + int64_t samples) +{ + if(samples == AV_NOPTS_VALUE) + return AV_NOPTS_VALUE; + return av_rescale_q(samples, (AVRational){ 1, avctx->sample_rate }, + avctx->time_base); +} + +/** + * 2^(x) for integer x + * @return correctly rounded float + */ +static av_always_inline float ff_exp2fi(int x) { + /* Normal range */ + if (-126 <= x && x <= 128) + return av_int2float((x+127) << 23); + /* Too large */ + else if (x > 128) + return INFINITY; + /* Subnormal numbers */ + else if (x > -150) + return av_int2float(1 << (x+149)); + /* Negligibly small */ + else + return 0; +} + +/** + * Get a buffer for a frame. This is a wrapper around + * AVCodecContext.get_buffer() and should be used instead calling get_buffer() + * directly. + */ +int ff_get_buffer(AVCodecContext *avctx, AVFrame *frame, int flags); + +/** + * Identical in function to av_frame_make_writable(), except it uses + * ff_get_buffer() to allocate the buffer when needed. + */ +int ff_reget_buffer(AVCodecContext *avctx, AVFrame *frame); + +int ff_thread_can_start_frame(AVCodecContext *avctx); + +int avpriv_h264_has_num_reorder_frames(AVCodecContext *avctx); + +/** + * Call avcodec_open2 recursively by decrementing counter, unlocking mutex, + * calling the function and then restoring again. Assumes the mutex is + * already locked + */ +int ff_codec_open2_recursive(AVCodecContext *avctx, const AVCodec *codec, AVDictionary **options); + +/** + * Finalize buf into extradata and set its size appropriately. + */ +int avpriv_bprint_to_extradata(AVCodecContext *avctx, struct AVBPrint *buf); + +const uint8_t *avpriv_find_start_code(const uint8_t *p, + const uint8_t *end, + uint32_t *state); + +/** + * Check that the provided frame dimensions are valid and set them on the codec + * context. + */ +int ff_set_dimensions(AVCodecContext *s, int width, int height); + +/** + * Check that the provided sample aspect ratio is valid and set it on the codec + * context. + */ +int ff_set_sar(AVCodecContext *avctx, AVRational sar); + +/** + * Add or update AV_FRAME_DATA_MATRIXENCODING side data. + */ +int ff_side_data_update_matrix_encoding(AVFrame *frame, + enum AVMatrixEncoding matrix_encoding); + +/** + * Select the (possibly hardware accelerated) pixel format. + * This is a wrapper around AVCodecContext.get_format() and should be used + * instead of calling get_format() directly. + */ +int ff_get_format(AVCodecContext *avctx, const enum AVPixelFormat *fmt); + +/** + * Set various frame properties from the codec context / packet data. + */ +int ff_decode_frame_props(AVCodecContext *avctx, AVFrame *frame); + +/** + * Add a CPB properties side data to an encoding context. + */ +AVCPBProperties *ff_add_cpb_side_data(AVCodecContext *avctx); + +int ff_side_data_set_encoder_stats(AVPacket *pkt, int quality, int64_t *error, int error_count, int pict_type); + +#endif /* AVCODEC_INTERNAL_H */ diff --git a/ext/at3_standalone/intfloat.h b/ext/at3_standalone/intfloat.h new file mode 100644 index 0000000000..744abec421 --- /dev/null +++ b/ext/at3_standalone/intfloat.h @@ -0,0 +1,77 @@ +/* + * Copyright (c) 2011 Mans Rullgard + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVUTIL_INTFLOAT_H +#define AVUTIL_INTFLOAT_H + +#include +#include "compat.h" + +union av_intfloat32 { + uint32_t i; + float f; +}; + +union av_intfloat64 { + uint64_t i; + double f; +}; + +/** + * Reinterpret a 32-bit integer as a float. + */ +static av_always_inline float av_int2float(uint32_t i) +{ + union av_intfloat32 v; + v.i = i; + return v.f; +} + +/** + * Reinterpret a float as a 32-bit integer. + */ +static av_always_inline uint32_t av_float2int(float f) +{ + union av_intfloat32 v; + v.f = f; + return v.i; +} + +/** + * Reinterpret a 64-bit integer as a double. + */ +static av_always_inline double av_int2double(uint64_t i) +{ + union av_intfloat64 v; + v.i = i; + return v.f; +} + +/** + * Reinterpret a double as a 64-bit integer. + */ +static av_always_inline uint64_t av_double2int(double f) +{ + union av_intfloat64 v; + v.f = f; + return v.i; +} + +#endif /* AVUTIL_INTFLOAT_H */ diff --git a/ext/at3_standalone/intreadwrite.h b/ext/at3_standalone/intreadwrite.h new file mode 100644 index 0000000000..5139d15b2d --- /dev/null +++ b/ext/at3_standalone/intreadwrite.h @@ -0,0 +1,629 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVUTIL_INTREADWRITE_H +#define AVUTIL_INTREADWRITE_H + +#include + +#include "compat.h" +#include "bswap.h" + +typedef union { + uint64_t u64; + uint32_t u32[2]; + uint16_t u16[4]; + uint8_t u8 [8]; + double f64; + float f32[2]; +} av_alias av_alias64; + +typedef union { + uint32_t u32; + uint16_t u16[2]; + uint8_t u8 [4]; + float f32; +} av_alias av_alias32; + +typedef union { + uint16_t u16; + uint8_t u8 [2]; +} av_alias av_alias16; + +/* + * Arch-specific headers can provide any combination of + * AV_[RW][BLN](16|24|32|48|64) and AV_(COPY|SWAP|ZERO)(64|128) macros. + * Preprocessor symbols must be defined, even if these are implemented + * as inline functions. + * + * R/W means read/write, B/L/N means big/little/native endianness. + * The following macros require aligned access, compared to their + * unaligned variants: AV_(COPY|SWAP|ZERO)(64|128), AV_[RW]N[8-64]A. + * Incorrect usage may range from abysmal performance to crash + * depending on the platform. + * + * The unaligned variants are AV_[RW][BLN][8-64] and AV_COPY*U. + */ + +#ifdef HAVE_AV_CONFIG_H + +#include "config.h" + +#if ARCH_ARM +# include "arm/intreadwrite.h" +#elif ARCH_AVR32 +# include "avr32/intreadwrite.h" +#elif ARCH_MIPS +# include "mips/intreadwrite.h" +#elif ARCH_PPC +# include "ppc/intreadwrite.h" +#elif ARCH_TOMI +# include "tomi/intreadwrite.h" +#elif ARCH_X86 +# include "x86/intreadwrite.h" +#endif + +#endif /* HAVE_AV_CONFIG_H */ + +/* + * Map AV_RNXX <-> AV_R[BL]XX for all variants provided by per-arch headers. + */ + +#if AV_HAVE_BIGENDIAN + +# if defined(AV_RN16) && !defined(AV_RB16) +# define AV_RB16(p) AV_RN16(p) +# elif !defined(AV_RN16) && defined(AV_RB16) +# define AV_RN16(p) AV_RB16(p) +# endif + +# if defined(AV_WN16) && !defined(AV_WB16) +# define AV_WB16(p, v) AV_WN16(p, v) +# elif !defined(AV_WN16) && defined(AV_WB16) +# define AV_WN16(p, v) AV_WB16(p, v) +# endif + +# if defined(AV_RN24) && !defined(AV_RB24) +# define AV_RB24(p) AV_RN24(p) +# elif !defined(AV_RN24) && defined(AV_RB24) +# define AV_RN24(p) AV_RB24(p) +# endif + +# if defined(AV_WN24) && !defined(AV_WB24) +# define AV_WB24(p, v) AV_WN24(p, v) +# elif !defined(AV_WN24) && defined(AV_WB24) +# define AV_WN24(p, v) AV_WB24(p, v) +# endif + +# if defined(AV_RN32) && !defined(AV_RB32) +# define AV_RB32(p) AV_RN32(p) +# elif !defined(AV_RN32) && defined(AV_RB32) +# define AV_RN32(p) AV_RB32(p) +# endif + +# if defined(AV_WN32) && !defined(AV_WB32) +# define AV_WB32(p, v) AV_WN32(p, v) +# elif !defined(AV_WN32) && defined(AV_WB32) +# define AV_WN32(p, v) AV_WB32(p, v) +# endif + +# if defined(AV_RN48) && !defined(AV_RB48) +# define AV_RB48(p) AV_RN48(p) +# elif !defined(AV_RN48) && defined(AV_RB48) +# define AV_RN48(p) AV_RB48(p) +# endif + +# if defined(AV_WN48) && !defined(AV_WB48) +# define AV_WB48(p, v) AV_WN48(p, v) +# elif !defined(AV_WN48) && defined(AV_WB48) +# define AV_WN48(p, v) AV_WB48(p, v) +# endif + +# if defined(AV_RN64) && !defined(AV_RB64) +# define AV_RB64(p) AV_RN64(p) +# elif !defined(AV_RN64) && defined(AV_RB64) +# define AV_RN64(p) AV_RB64(p) +# endif + +# if defined(AV_WN64) && !defined(AV_WB64) +# define AV_WB64(p, v) AV_WN64(p, v) +# elif !defined(AV_WN64) && defined(AV_WB64) +# define AV_WN64(p, v) AV_WB64(p, v) +# endif + +#else /* AV_HAVE_BIGENDIAN */ + +# if defined(AV_RN16) && !defined(AV_RL16) +# define AV_RL16(p) AV_RN16(p) +# elif !defined(AV_RN16) && defined(AV_RL16) +# define AV_RN16(p) AV_RL16(p) +# endif + +# if defined(AV_WN16) && !defined(AV_WL16) +# define AV_WL16(p, v) AV_WN16(p, v) +# elif !defined(AV_WN16) && defined(AV_WL16) +# define AV_WN16(p, v) AV_WL16(p, v) +# endif + +# if defined(AV_RN24) && !defined(AV_RL24) +# define AV_RL24(p) AV_RN24(p) +# elif !defined(AV_RN24) && defined(AV_RL24) +# define AV_RN24(p) AV_RL24(p) +# endif + +# if defined(AV_WN24) && !defined(AV_WL24) +# define AV_WL24(p, v) AV_WN24(p, v) +# elif !defined(AV_WN24) && defined(AV_WL24) +# define AV_WN24(p, v) AV_WL24(p, v) +# endif + +# if defined(AV_RN32) && !defined(AV_RL32) +# define AV_RL32(p) AV_RN32(p) +# elif !defined(AV_RN32) && defined(AV_RL32) +# define AV_RN32(p) AV_RL32(p) +# endif + +# if defined(AV_WN32) && !defined(AV_WL32) +# define AV_WL32(p, v) AV_WN32(p, v) +# elif !defined(AV_WN32) && defined(AV_WL32) +# define AV_WN32(p, v) AV_WL32(p, v) +# endif + +# if defined(AV_RN48) && !defined(AV_RL48) +# define AV_RL48(p) AV_RN48(p) +# elif !defined(AV_RN48) && defined(AV_RL48) +# define AV_RN48(p) AV_RL48(p) +# endif + +# if defined(AV_WN48) && !defined(AV_WL48) +# define AV_WL48(p, v) AV_WN48(p, v) +# elif !defined(AV_WN48) && defined(AV_WL48) +# define AV_WN48(p, v) AV_WL48(p, v) +# endif + +# if defined(AV_RN64) && !defined(AV_RL64) +# define AV_RL64(p) AV_RN64(p) +# elif !defined(AV_RN64) && defined(AV_RL64) +# define AV_RN64(p) AV_RL64(p) +# endif + +# if defined(AV_WN64) && !defined(AV_WL64) +# define AV_WL64(p, v) AV_WN64(p, v) +# elif !defined(AV_WN64) && defined(AV_WL64) +# define AV_WN64(p, v) AV_WL64(p, v) +# endif + +#endif /* !AV_HAVE_BIGENDIAN */ + +/* + * Define AV_[RW]N helper macros to simplify definitions not provided + * by per-arch headers. + */ + +#if defined(__GNUC__) && !defined(__TI_COMPILER_VERSION__) + +union unaligned_64 { uint64_t l; } __attribute__((packed)) av_alias; +union unaligned_32 { uint32_t l; } __attribute__((packed)) av_alias; +union unaligned_16 { uint16_t l; } __attribute__((packed)) av_alias; + +# define AV_RN(s, p) (((const union unaligned_##s *) (p))->l) +# define AV_WN(s, p, v) ((((union unaligned_##s *) (p))->l) = (v)) + +#elif defined(__DECC) + +# define AV_RN(s, p) (*((const __unaligned uint##s##_t*)(p))) +# define AV_WN(s, p, v) (*((__unaligned uint##s##_t*)(p)) = (v)) + +#elif AV_HAVE_FAST_UNALIGNED + +# define AV_RN(s, p) (((const av_alias##s*)(p))->u##s) +# define AV_WN(s, p, v) (((av_alias##s*)(p))->u##s = (v)) + +#else + +#ifndef AV_RB16 +# define AV_RB16(x) \ + ((((const uint8_t*)(x))[0] << 8) | \ + ((const uint8_t*)(x))[1]) +#endif +#ifndef AV_WB16 +# define AV_WB16(p, darg) do { \ + unsigned d = (darg); \ + ((uint8_t*)(p))[1] = (d); \ + ((uint8_t*)(p))[0] = (d)>>8; \ + } while(0) +#endif + +#ifndef AV_RL16 +# define AV_RL16(x) \ + ((((const uint8_t*)(x))[1] << 8) | \ + ((const uint8_t*)(x))[0]) +#endif +#ifndef AV_WL16 +# define AV_WL16(p, darg) do { \ + unsigned d = (darg); \ + ((uint8_t*)(p))[0] = (d); \ + ((uint8_t*)(p))[1] = (d)>>8; \ + } while(0) +#endif + +#ifndef AV_RB32 +# define AV_RB32(x) \ + (((uint32_t)((const uint8_t*)(x))[0] << 24) | \ + (((const uint8_t*)(x))[1] << 16) | \ + (((const uint8_t*)(x))[2] << 8) | \ + ((const uint8_t*)(x))[3]) +#endif +#ifndef AV_WB32 +# define AV_WB32(p, darg) do { \ + unsigned d = (darg); \ + ((uint8_t*)(p))[3] = (d); \ + ((uint8_t*)(p))[2] = (d)>>8; \ + ((uint8_t*)(p))[1] = (d)>>16; \ + ((uint8_t*)(p))[0] = (d)>>24; \ + } while(0) +#endif + +#ifndef AV_RL32 +# define AV_RL32(x) \ + (((uint32_t)((const uint8_t*)(x))[3] << 24) | \ + (((const uint8_t*)(x))[2] << 16) | \ + (((const uint8_t*)(x))[1] << 8) | \ + ((const uint8_t*)(x))[0]) +#endif +#ifndef AV_WL32 +# define AV_WL32(p, darg) do { \ + unsigned d = (darg); \ + ((uint8_t*)(p))[0] = (d); \ + ((uint8_t*)(p))[1] = (d)>>8; \ + ((uint8_t*)(p))[2] = (d)>>16; \ + ((uint8_t*)(p))[3] = (d)>>24; \ + } while(0) +#endif + +#ifndef AV_RB64 +# define AV_RB64(x) \ + (((uint64_t)((const uint8_t*)(x))[0] << 56) | \ + ((uint64_t)((const uint8_t*)(x))[1] << 48) | \ + ((uint64_t)((const uint8_t*)(x))[2] << 40) | \ + ((uint64_t)((const uint8_t*)(x))[3] << 32) | \ + ((uint64_t)((const uint8_t*)(x))[4] << 24) | \ + ((uint64_t)((const uint8_t*)(x))[5] << 16) | \ + ((uint64_t)((const uint8_t*)(x))[6] << 8) | \ + (uint64_t)((const uint8_t*)(x))[7]) +#endif +#ifndef AV_WB64 +# define AV_WB64(p, darg) do { \ + uint64_t d = (darg); \ + ((uint8_t*)(p))[7] = (d); \ + ((uint8_t*)(p))[6] = (d)>>8; \ + ((uint8_t*)(p))[5] = (d)>>16; \ + ((uint8_t*)(p))[4] = (d)>>24; \ + ((uint8_t*)(p))[3] = (d)>>32; \ + ((uint8_t*)(p))[2] = (d)>>40; \ + ((uint8_t*)(p))[1] = (d)>>48; \ + ((uint8_t*)(p))[0] = (d)>>56; \ + } while(0) +#endif + +#ifndef AV_RL64 +# define AV_RL64(x) \ + (((uint64_t)((const uint8_t*)(x))[7] << 56) | \ + ((uint64_t)((const uint8_t*)(x))[6] << 48) | \ + ((uint64_t)((const uint8_t*)(x))[5] << 40) | \ + ((uint64_t)((const uint8_t*)(x))[4] << 32) | \ + ((uint64_t)((const uint8_t*)(x))[3] << 24) | \ + ((uint64_t)((const uint8_t*)(x))[2] << 16) | \ + ((uint64_t)((const uint8_t*)(x))[1] << 8) | \ + (uint64_t)((const uint8_t*)(x))[0]) +#endif +#ifndef AV_WL64 +# define AV_WL64(p, darg) do { \ + uint64_t d = (darg); \ + ((uint8_t*)(p))[0] = (d); \ + ((uint8_t*)(p))[1] = (d)>>8; \ + ((uint8_t*)(p))[2] = (d)>>16; \ + ((uint8_t*)(p))[3] = (d)>>24; \ + ((uint8_t*)(p))[4] = (d)>>32; \ + ((uint8_t*)(p))[5] = (d)>>40; \ + ((uint8_t*)(p))[6] = (d)>>48; \ + ((uint8_t*)(p))[7] = (d)>>56; \ + } while(0) +#endif + +#if AV_HAVE_BIGENDIAN +# define AV_RN(s, p) AV_RB##s(p) +# define AV_WN(s, p, v) AV_WB##s(p, v) +#else +# define AV_RN(s, p) AV_RL##s(p) +# define AV_WN(s, p, v) AV_WL##s(p, v) +#endif + +#endif /* HAVE_FAST_UNALIGNED */ + +#ifndef AV_RN16 +# define AV_RN16(p) AV_RN(16, p) +#endif + +#ifndef AV_RN32 +# define AV_RN32(p) AV_RN(32, p) +#endif + +#ifndef AV_RN64 +# define AV_RN64(p) AV_RN(64, p) +#endif + +#ifndef AV_WN16 +# define AV_WN16(p, v) AV_WN(16, p, v) +#endif + +#ifndef AV_WN32 +# define AV_WN32(p, v) AV_WN(32, p, v) +#endif + +#ifndef AV_WN64 +# define AV_WN64(p, v) AV_WN(64, p, v) +#endif + +#if AV_HAVE_BIGENDIAN +# define AV_RB(s, p) AV_RN##s(p) +# define AV_WB(s, p, v) AV_WN##s(p, v) +# define AV_RL(s, p) av_bswap##s(AV_RN##s(p)) +# define AV_WL(s, p, v) AV_WN##s(p, av_bswap##s(v)) +#else +# define AV_RB(s, p) av_bswap##s(AV_RN##s(p)) +# define AV_WB(s, p, v) AV_WN##s(p, av_bswap##s(v)) +# define AV_RL(s, p) AV_RN##s(p) +# define AV_WL(s, p, v) AV_WN##s(p, v) +#endif + +#define AV_RB8(x) (((const uint8_t*)(x))[0]) +#define AV_WB8(p, d) do { ((uint8_t*)(p))[0] = (d); } while(0) + +#define AV_RL8(x) AV_RB8(x) +#define AV_WL8(p, d) AV_WB8(p, d) + +#ifndef AV_RB16 +# define AV_RB16(p) AV_RB(16, p) +#endif +#ifndef AV_WB16 +# define AV_WB16(p, v) AV_WB(16, p, v) +#endif + +#ifndef AV_RL16 +# define AV_RL16(p) AV_RL(16, p) +#endif +#ifndef AV_WL16 +# define AV_WL16(p, v) AV_WL(16, p, v) +#endif + +#ifndef AV_RB32 +# define AV_RB32(p) AV_RB(32, p) +#endif +#ifndef AV_WB32 +# define AV_WB32(p, v) AV_WB(32, p, v) +#endif + +#ifndef AV_RL32 +# define AV_RL32(p) AV_RL(32, p) +#endif +#ifndef AV_WL32 +# define AV_WL32(p, v) AV_WL(32, p, v) +#endif + +#ifndef AV_RB64 +# define AV_RB64(p) AV_RB(64, p) +#endif +#ifndef AV_WB64 +# define AV_WB64(p, v) AV_WB(64, p, v) +#endif + +#ifndef AV_RL64 +# define AV_RL64(p) AV_RL(64, p) +#endif +#ifndef AV_WL64 +# define AV_WL64(p, v) AV_WL(64, p, v) +#endif + +#ifndef AV_RB24 +# define AV_RB24(x) \ + ((((const uint8_t*)(x))[0] << 16) | \ + (((const uint8_t*)(x))[1] << 8) | \ + ((const uint8_t*)(x))[2]) +#endif +#ifndef AV_WB24 +# define AV_WB24(p, d) do { \ + ((uint8_t*)(p))[2] = (d); \ + ((uint8_t*)(p))[1] = (d)>>8; \ + ((uint8_t*)(p))[0] = (d)>>16; \ + } while(0) +#endif + +#ifndef AV_RL24 +# define AV_RL24(x) \ + ((((const uint8_t*)(x))[2] << 16) | \ + (((const uint8_t*)(x))[1] << 8) | \ + ((const uint8_t*)(x))[0]) +#endif +#ifndef AV_WL24 +# define AV_WL24(p, d) do { \ + ((uint8_t*)(p))[0] = (d); \ + ((uint8_t*)(p))[1] = (d)>>8; \ + ((uint8_t*)(p))[2] = (d)>>16; \ + } while(0) +#endif + +#ifndef AV_RB48 +# define AV_RB48(x) \ + (((uint64_t)((const uint8_t*)(x))[0] << 40) | \ + ((uint64_t)((const uint8_t*)(x))[1] << 32) | \ + ((uint64_t)((const uint8_t*)(x))[2] << 24) | \ + ((uint64_t)((const uint8_t*)(x))[3] << 16) | \ + ((uint64_t)((const uint8_t*)(x))[4] << 8) | \ + (uint64_t)((const uint8_t*)(x))[5]) +#endif +#ifndef AV_WB48 +# define AV_WB48(p, darg) do { \ + uint64_t d = (darg); \ + ((uint8_t*)(p))[5] = (d); \ + ((uint8_t*)(p))[4] = (d)>>8; \ + ((uint8_t*)(p))[3] = (d)>>16; \ + ((uint8_t*)(p))[2] = (d)>>24; \ + ((uint8_t*)(p))[1] = (d)>>32; \ + ((uint8_t*)(p))[0] = (d)>>40; \ + } while(0) +#endif + +#ifndef AV_RL48 +# define AV_RL48(x) \ + (((uint64_t)((const uint8_t*)(x))[5] << 40) | \ + ((uint64_t)((const uint8_t*)(x))[4] << 32) | \ + ((uint64_t)((const uint8_t*)(x))[3] << 24) | \ + ((uint64_t)((const uint8_t*)(x))[2] << 16) | \ + ((uint64_t)((const uint8_t*)(x))[1] << 8) | \ + (uint64_t)((const uint8_t*)(x))[0]) +#endif +#ifndef AV_WL48 +# define AV_WL48(p, darg) do { \ + uint64_t d = (darg); \ + ((uint8_t*)(p))[0] = (d); \ + ((uint8_t*)(p))[1] = (d)>>8; \ + ((uint8_t*)(p))[2] = (d)>>16; \ + ((uint8_t*)(p))[3] = (d)>>24; \ + ((uint8_t*)(p))[4] = (d)>>32; \ + ((uint8_t*)(p))[5] = (d)>>40; \ + } while(0) +#endif + +/* + * The AV_[RW]NA macros access naturally aligned data + * in a type-safe way. + */ + +#define AV_RNA(s, p) (((const av_alias##s*)(p))->u##s) +#define AV_WNA(s, p, v) (((av_alias##s*)(p))->u##s = (v)) + +#ifndef AV_RN16A +# define AV_RN16A(p) AV_RNA(16, p) +#endif + +#ifndef AV_RN32A +# define AV_RN32A(p) AV_RNA(32, p) +#endif + +#ifndef AV_RN64A +# define AV_RN64A(p) AV_RNA(64, p) +#endif + +#ifndef AV_WN16A +# define AV_WN16A(p, v) AV_WNA(16, p, v) +#endif + +#ifndef AV_WN32A +# define AV_WN32A(p, v) AV_WNA(32, p, v) +#endif + +#ifndef AV_WN64A +# define AV_WN64A(p, v) AV_WNA(64, p, v) +#endif + +/* + * The AV_COPYxxU macros are suitable for copying data to/from unaligned + * memory locations. + */ + +#define AV_COPYU(n, d, s) AV_WN##n(d, AV_RN##n(s)); + +#ifndef AV_COPY16U +# define AV_COPY16U(d, s) AV_COPYU(16, d, s) +#endif + +#ifndef AV_COPY32U +# define AV_COPY32U(d, s) AV_COPYU(32, d, s) +#endif + +#ifndef AV_COPY64U +# define AV_COPY64U(d, s) AV_COPYU(64, d, s) +#endif + +#ifndef AV_COPY128U +# define AV_COPY128U(d, s) \ + do { \ + AV_COPY64U(d, s); \ + AV_COPY64U((char *)(d) + 8, (const char *)(s) + 8); \ + } while(0) +#endif + +/* Parameters for AV_COPY*, AV_SWAP*, AV_ZERO* must be + * naturally aligned. They may be implemented using MMX, + * so emms_c() must be called before using any float code + * afterwards. + */ + +#define AV_COPY(n, d, s) \ + (((av_alias##n*)(d))->u##n = ((const av_alias##n*)(s))->u##n) + +#ifndef AV_COPY16 +# define AV_COPY16(d, s) AV_COPY(16, d, s) +#endif + +#ifndef AV_COPY32 +# define AV_COPY32(d, s) AV_COPY(32, d, s) +#endif + +#ifndef AV_COPY64 +# define AV_COPY64(d, s) AV_COPY(64, d, s) +#endif + +#ifndef AV_COPY128 +# define AV_COPY128(d, s) \ + do { \ + AV_COPY64(d, s); \ + AV_COPY64((char*)(d)+8, (char*)(s)+8); \ + } while(0) +#endif + +#define AV_SWAP(n, a, b) FFSWAP(av_alias##n, *(av_alias##n*)(a), *(av_alias##n*)(b)) + +#ifndef AV_SWAP64 +# define AV_SWAP64(a, b) AV_SWAP(64, a, b) +#endif + +#define AV_ZERO(n, d) (((av_alias##n*)(d))->u##n = 0) + +#ifndef AV_ZERO16 +# define AV_ZERO16(d) AV_ZERO(16, d) +#endif + +#ifndef AV_ZERO32 +# define AV_ZERO32(d) AV_ZERO(32, d) +#endif + +#ifndef AV_ZERO64 +# define AV_ZERO64(d) AV_ZERO(64, d) +#endif + +#ifndef AV_ZERO128 +# define AV_ZERO128(d) \ + do { \ + AV_ZERO64(d); \ + AV_ZERO64((char*)(d)+8); \ + } while(0) +#endif + +#endif /* AVUTIL_INTREADWRITE_H */ diff --git a/ext/at3_standalone/libm.h b/ext/at3_standalone/libm.h new file mode 100644 index 0000000000..a819962391 --- /dev/null +++ b/ext/at3_standalone/libm.h @@ -0,0 +1,471 @@ +/* + * erf function: Copyright (c) 2006 John Maddock + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + * Replacements for frequently missing libm functions + */ + +#ifndef AVUTIL_LIBM_H +#define AVUTIL_LIBM_H + +#include +#include "config.h" +#include "attributes.h" +#include "intfloat.h" +#include "mathematics.h" + +#if HAVE_MIPSFPU && HAVE_INLINE_ASM +#include "libavutil/mips/libm_mips.h" +#endif /* HAVE_MIPSFPU && HAVE_INLINE_ASM*/ + +#if !HAVE_ATANF +#undef atanf +#define atanf(x) ((float)atan(x)) +#endif /* HAVE_ATANF */ + +#if !HAVE_ATAN2F +#undef atan2f +#define atan2f(y, x) ((float)atan2(y, x)) +#endif /* HAVE_ATAN2F */ + +#if !HAVE_POWF +#undef powf +#define powf(x, y) ((float)pow(x, y)) +#endif /* HAVE_POWF */ + +#if !HAVE_CBRT +static av_always_inline double cbrt(double x) +{ + return x < 0 ? -pow(-x, 1.0 / 3.0) : pow(x, 1.0 / 3.0); +} +#endif /* HAVE_CBRT */ + +#if !HAVE_CBRTF +static av_always_inline float cbrtf(float x) +{ + return x < 0 ? -powf(-x, 1.0 / 3.0) : powf(x, 1.0 / 3.0); +} +#endif /* HAVE_CBRTF */ + +#if !HAVE_COPYSIGN +static av_always_inline double copysign(double x, double y) +{ + uint64_t vx = av_double2int(x); + uint64_t vy = av_double2int(y); + return av_int2double((vx & UINT64_C(0x7fffffffffffffff)) | (vy & UINT64_C(0x8000000000000000))); +} +#endif /* HAVE_COPYSIGN */ + +#if !HAVE_COSF +#undef cosf +#define cosf(x) ((float)cos(x)) +#endif /* HAVE_COSF */ + +#if !HAVE_ERF +static inline double ff_eval_poly(const double *coeff, int size, double x) { + double sum = coeff[size-1]; + int i; + for (i = size-2; i >= 0; --i) { + sum *= x; + sum += coeff[i]; + } + return sum; +} + +/** + * erf function + * Algorithm taken from the Boost project, source: + * http://www.boost.org/doc/libs/1_46_1/boost/math/special_functions/erf.hpp + * Use, modification and distribution are subject to the + * Boost Software License, Version 1.0 (see notice below). + * Boost Software License - Version 1.0 - August 17th, 2003 +Permission is hereby granted, free of charge, to any person or organization +obtaining a copy of the software and accompanying documentation covered by +this license (the "Software") to use, reproduce, display, distribute, +execute, and transmit the Software, and to prepare derivative works of the +Software, and to permit third-parties to whom the Software is furnished to +do so, all subject to the following: + +The copyright notices in the Software and this entire statement, including +the above license grant, this restriction and the following disclaimer, +must be included in all copies of the Software, in whole or in part, and +all derivative works of the Software, unless such copies or derivative +works are solely in the form of machine-executable object code generated by +a source language processor. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. + */ +static inline double erf(double z) +{ +#ifndef FF_ARRAY_ELEMS +#define FF_ARRAY_ELEMS(a) (sizeof(a) / sizeof((a)[0])) +#endif + double result; + + /* handle the symmetry: erf(-x) = -erf(x) */ + if (z < 0) + return -erf(-z); + + /* branch based on range of z, and pick appropriate approximation */ + if (z == 0) + return 0; + else if (z < 1e-10) + return z * 1.125 + z * 0.003379167095512573896158903121545171688; + else if (z < 0.5) { + // Maximum Deviation Found: 1.561e-17 + // Expected Error Term: 1.561e-17 + // Maximum Relative Change in Control Points: 1.155e-04 + // Max Error found at double precision = 2.961182e-17 + + static const double y = 1.044948577880859375; + static const double p[] = { + 0.0834305892146531832907, + -0.338165134459360935041, + -0.0509990735146777432841, + -0.00772758345802133288487, + -0.000322780120964605683831, + }; + static const double q[] = { + 1, + 0.455004033050794024546, + 0.0875222600142252549554, + 0.00858571925074406212772, + 0.000370900071787748000569, + }; + double zz = z * z; + return z * (y + ff_eval_poly(p, FF_ARRAY_ELEMS(p), zz) / ff_eval_poly(q, FF_ARRAY_ELEMS(q), zz)); + } + /* here onwards compute erfc */ + else if (z < 1.5) { + // Maximum Deviation Found: 3.702e-17 + // Expected Error Term: 3.702e-17 + // Maximum Relative Change in Control Points: 2.845e-04 + // Max Error found at double precision = 4.841816e-17 + static const double y = 0.405935764312744140625; + static const double p[] = { + -0.098090592216281240205, + 0.178114665841120341155, + 0.191003695796775433986, + 0.0888900368967884466578, + 0.0195049001251218801359, + 0.00180424538297014223957, + }; + static const double q[] = { + 1, + 1.84759070983002217845, + 1.42628004845511324508, + 0.578052804889902404909, + 0.12385097467900864233, + 0.0113385233577001411017, + 0.337511472483094676155e-5, + }; + result = y + ff_eval_poly(p, FF_ARRAY_ELEMS(p), z - 0.5) / ff_eval_poly(q, FF_ARRAY_ELEMS(q), z - 0.5); + result *= exp(-z * z) / z; + return 1 - result; + } + else if (z < 2.5) { + // Max Error found at double precision = 6.599585e-18 + // Maximum Deviation Found: 3.909e-18 + // Expected Error Term: 3.909e-18 + // Maximum Relative Change in Control Points: 9.886e-05 + static const double y = 0.50672817230224609375; + static const double p[] = { + -0.0243500476207698441272, + 0.0386540375035707201728, + 0.04394818964209516296, + 0.0175679436311802092299, + 0.00323962406290842133584, + 0.000235839115596880717416, + }; + static const double q[] = { + 1, + 1.53991494948552447182, + 0.982403709157920235114, + 0.325732924782444448493, + 0.0563921837420478160373, + 0.00410369723978904575884, + }; + result = y + ff_eval_poly(p, FF_ARRAY_ELEMS(p), z - 1.5) / ff_eval_poly(q, FF_ARRAY_ELEMS(q), z - 1.5); + result *= exp(-z * z) / z; + return 1 - result; + } + else if (z < 4.5) { + // Maximum Deviation Found: 1.512e-17 + // Expected Error Term: 1.512e-17 + // Maximum Relative Change in Control Points: 2.222e-04 + // Max Error found at double precision = 2.062515e-17 + static const double y = 0.5405750274658203125; + static const double p[] = { + 0.00295276716530971662634, + 0.0137384425896355332126, + 0.00840807615555585383007, + 0.00212825620914618649141, + 0.000250269961544794627958, + 0.113212406648847561139e-4, + }; + static const double q[] = { + 1, + 1.04217814166938418171, + 0.442597659481563127003, + 0.0958492726301061423444, + 0.0105982906484876531489, + 0.000479411269521714493907, + }; + result = y + ff_eval_poly(p, FF_ARRAY_ELEMS(p), z - 3.5) / ff_eval_poly(q, FF_ARRAY_ELEMS(q), z - 3.5); + result *= exp(-z * z) / z; + return 1 - result; + } + /* differ from Boost here, the claim of underflow of erfc(x) past 5.8 is + * slightly incorrect, change to 5.92 + * (really somewhere between 5.9125 and 5.925 is when it saturates) */ + else if (z < 5.92) { + // Max Error found at double precision = 2.997958e-17 + // Maximum Deviation Found: 2.860e-17 + // Expected Error Term: 2.859e-17 + // Maximum Relative Change in Control Points: 1.357e-05 + static const double y = 0.5579090118408203125; + static const double p[] = { + 0.00628057170626964891937, + 0.0175389834052493308818, + -0.212652252872804219852, + -0.687717681153649930619, + -2.5518551727311523996, + -3.22729451764143718517, + -2.8175401114513378771, + }; + static const double q[] = { + 1, + 2.79257750980575282228, + 11.0567237927800161565, + 15.930646027911794143, + 22.9367376522880577224, + 13.5064170191802889145, + 5.48409182238641741584, + }; + result = y + ff_eval_poly(p, FF_ARRAY_ELEMS(p), 1 / z) / ff_eval_poly(q, FF_ARRAY_ELEMS(q), 1 / z); + result *= exp(-z * z) / z; + return 1 - result; + } + /* handle the nan case, but don't use isnan for max portability */ + else if (z != z) + return z; + /* finally return saturated result */ + else + return 1; +} +#endif /* HAVE_ERF */ + +#if !HAVE_EXPF +#undef expf +#define expf(x) ((float)exp(x)) +#endif /* HAVE_EXPF */ + +#if !HAVE_EXP2 +#undef exp2 +#define exp2(x) exp((x) * M_LN2) +#endif /* HAVE_EXP2 */ + +#if !HAVE_EXP2F +#undef exp2f +#define exp2f(x) ((float)exp2(x)) +#endif /* HAVE_EXP2F */ + +#if !HAVE_ISINF +#undef isinf +/* Note: these do not follow the BSD/Apple/GNU convention of returning -1 for +-Inf, +1 for Inf, 0 otherwise, but merely follow the POSIX/ISO mandated spec of +returning a non-zero value for +/-Inf, 0 otherwise. */ +static av_always_inline av_const int avpriv_isinff(float x) +{ + uint32_t v = av_float2int(x); + if ((v & 0x7f800000) != 0x7f800000) + return 0; + return !(v & 0x007fffff); +} + +static av_always_inline av_const int avpriv_isinf(double x) +{ + uint64_t v = av_double2int(x); + if ((v & 0x7ff0000000000000) != 0x7ff0000000000000) + return 0; + return !(v & 0x000fffffffffffff); +} + +#define isinf(x) \ + (sizeof(x) == sizeof(float) \ + ? avpriv_isinff(x) \ + : avpriv_isinf(x)) +#endif /* HAVE_ISINF */ + +#if !HAVE_ISNAN +static av_always_inline av_const int avpriv_isnanf(float x) +{ + uint32_t v = av_float2int(x); + if ((v & 0x7f800000) != 0x7f800000) + return 0; + return v & 0x007fffff; +} + +static av_always_inline av_const int avpriv_isnan(double x) +{ + uint64_t v = av_double2int(x); + if ((v & 0x7ff0000000000000) != 0x7ff0000000000000) + return 0; + return (v & 0x000fffffffffffff) && 1; +} + +#define isnan(x) \ + (sizeof(x) == sizeof(float) \ + ? avpriv_isnanf(x) \ + : avpriv_isnan(x)) +#endif /* HAVE_ISNAN */ + +#if !HAVE_ISFINITE +static av_always_inline av_const int avpriv_isfinitef(float x) +{ + uint32_t v = av_float2int(x); + return (v & 0x7f800000) != 0x7f800000; +} + +static av_always_inline av_const int avpriv_isfinite(double x) +{ + uint64_t v = av_double2int(x); + return (v & 0x7ff0000000000000) != 0x7ff0000000000000; +} + +#define isfinite(x) \ + (sizeof(x) == sizeof(float) \ + ? avpriv_isfinitef(x) \ + : avpriv_isfinite(x)) +#endif /* HAVE_ISFINITE */ + +#if !HAVE_HYPOT +static inline av_const double hypot(double x, double y) +{ + double ret, temp; + x = fabs(x); + y = fabs(y); + + if (isinf(x) || isinf(y)) + return av_int2double(0x7ff0000000000000); + if (x == 0 || y == 0) + return x + y; + if (x < y) { + temp = x; + x = y; + y = temp; + } + + y = y/x; + return x*sqrt(1 + y*y); +} +#endif /* HAVE_HYPOT */ + +#if !HAVE_LDEXPF +#undef ldexpf +#define ldexpf(x, exp) ((float)ldexp(x, exp)) +#endif /* HAVE_LDEXPF */ + +#if !HAVE_LLRINT +#undef llrint +#define llrint(x) ((long long)rint(x)) +#endif /* HAVE_LLRINT */ + +#if !HAVE_LLRINTF +#undef llrintf +#define llrintf(x) ((long long)rint(x)) +#endif /* HAVE_LLRINT */ + +#if !HAVE_LOG2 +#undef log2 +#define log2(x) (log(x) * 1.44269504088896340736) +#endif /* HAVE_LOG2 */ + +#if !HAVE_LOG2F +#undef log2f +#define log2f(x) ((float)log2(x)) +#endif /* HAVE_LOG2F */ + +#if !HAVE_LOG10F +#undef log10f +#define log10f(x) ((float)log10(x)) +#endif /* HAVE_LOG10F */ + +#if !HAVE_SINF +#undef sinf +#define sinf(x) ((float)sin(x)) +#endif /* HAVE_SINF */ + +#if !HAVE_RINT +static inline double rint(double x) +{ + return x >= 0 ? floor(x + 0.5) : ceil(x - 0.5); +} +#endif /* HAVE_RINT */ + +#if !HAVE_LRINT +static av_always_inline av_const long int lrint(double x) +{ + return rint(x); +} +#endif /* HAVE_LRINT */ + +#if !HAVE_LRINTF +static av_always_inline av_const long int lrintf(float x) +{ + return (int)(rint(x)); +} +#endif /* HAVE_LRINTF */ + +#if !HAVE_ROUND +static av_always_inline av_const double round(double x) +{ + return (x > 0) ? floor(x + 0.5) : ceil(x - 0.5); +} +#endif /* HAVE_ROUND */ + +#if !HAVE_ROUNDF +static av_always_inline av_const float roundf(float x) +{ + return (x > 0) ? floor(x + 0.5) : ceil(x - 0.5); +} +#endif /* HAVE_ROUNDF */ + +#if !HAVE_TRUNC +static av_always_inline av_const double trunc(double x) +{ + return (x > 0) ? floor(x) : ceil(x); +} +#endif /* HAVE_TRUNC */ + +#if !HAVE_TRUNCF +static av_always_inline av_const float truncf(float x) +{ + return (x > 0) ? floor(x) : ceil(x); +} +#endif /* HAVE_TRUNCF */ + +#endif /* AVUTIL_LIBM_H */ diff --git a/ext/at3_standalone/log.h b/ext/at3_standalone/log.h new file mode 100644 index 0000000000..321748cd80 --- /dev/null +++ b/ext/at3_standalone/log.h @@ -0,0 +1,359 @@ +/* + * copyright (c) 2006 Michael Niedermayer + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVUTIL_LOG_H +#define AVUTIL_LOG_H + +#include +#include "avutil.h" +#include "attributes.h" +#include "version.h" + +typedef enum { + AV_CLASS_CATEGORY_NA = 0, + AV_CLASS_CATEGORY_INPUT, + AV_CLASS_CATEGORY_OUTPUT, + AV_CLASS_CATEGORY_MUXER, + AV_CLASS_CATEGORY_DEMUXER, + AV_CLASS_CATEGORY_ENCODER, + AV_CLASS_CATEGORY_DECODER, + AV_CLASS_CATEGORY_FILTER, + AV_CLASS_CATEGORY_BITSTREAM_FILTER, + AV_CLASS_CATEGORY_SWSCALER, + AV_CLASS_CATEGORY_SWRESAMPLER, + AV_CLASS_CATEGORY_DEVICE_VIDEO_OUTPUT = 40, + AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT, + AV_CLASS_CATEGORY_DEVICE_AUDIO_OUTPUT, + AV_CLASS_CATEGORY_DEVICE_AUDIO_INPUT, + AV_CLASS_CATEGORY_DEVICE_OUTPUT, + AV_CLASS_CATEGORY_DEVICE_INPUT, + AV_CLASS_CATEGORY_NB, ///< not part of ABI/API +}AVClassCategory; + +#define AV_IS_INPUT_DEVICE(category) \ + (((category) == AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT) || \ + ((category) == AV_CLASS_CATEGORY_DEVICE_AUDIO_INPUT) || \ + ((category) == AV_CLASS_CATEGORY_DEVICE_INPUT)) + +#define AV_IS_OUTPUT_DEVICE(category) \ + (((category) == AV_CLASS_CATEGORY_DEVICE_VIDEO_OUTPUT) || \ + ((category) == AV_CLASS_CATEGORY_DEVICE_AUDIO_OUTPUT) || \ + ((category) == AV_CLASS_CATEGORY_DEVICE_OUTPUT)) + +struct AVOptionRanges; + +/** + * Describe the class of an AVClass context structure. That is an + * arbitrary struct of which the first field is a pointer to an + * AVClass struct (e.g. AVCodecContext, AVFormatContext etc.). + */ +typedef struct AVClass { + /** + * The name of the class; usually it is the same name as the + * context structure type to which the AVClass is associated. + */ + const char* class_name; + + /** + * A pointer to a function which returns the name of a context + * instance ctx associated with the class. + */ + const char* (*item_name)(void* ctx); + + /** + * a pointer to the first option specified in the class if any or NULL + * + * @see av_set_default_options() + */ + const struct AVOption *option; + + /** + * LIBAVUTIL_VERSION with which this structure was created. + * This is used to allow fields to be added without requiring major + * version bumps everywhere. + */ + + int version; + + /** + * Offset in the structure where log_level_offset is stored. + * 0 means there is no such variable + */ + int log_level_offset_offset; + + /** + * Offset in the structure where a pointer to the parent context for + * logging is stored. For example a decoder could pass its AVCodecContext + * to eval as such a parent context, which an av_log() implementation + * could then leverage to display the parent context. + * The offset can be NULL. + */ + int parent_log_context_offset; + + /** + * Return next AVOptions-enabled child or NULL + */ + void* (*child_next)(void *obj, void *prev); + + /** + * Return an AVClass corresponding to the next potential + * AVOptions-enabled child. + * + * The difference between child_next and this is that + * child_next iterates over _already existing_ objects, while + * child_class_next iterates over _all possible_ children. + */ + const struct AVClass* (*child_class_next)(const struct AVClass *prev); + + /** + * Category used for visualization (like color) + * This is only set if the category is equal for all objects using this class. + * available since version (51 << 16 | 56 << 8 | 100) + */ + AVClassCategory category; + + /** + * Callback to return the category. + * available since version (51 << 16 | 59 << 8 | 100) + */ + AVClassCategory (*get_category)(void* ctx); + + /** + * Callback to return the supported/allowed ranges. + * available since version (52.12) + */ + int (*query_ranges)(struct AVOptionRanges **, void *obj, const char *key, int flags); +} AVClass; + +/** + * @addtogroup lavu_log + * + * @{ + * + * @defgroup lavu_log_constants Logging Constants + * + * @{ + */ + +/** + * Print no output. + */ +#define AV_LOG_QUIET -8 + +/** + * Something went really wrong and we will crash now. + */ +#define AV_LOG_PANIC 0 + +/** + * Something went wrong and recovery is not possible. + * For example, no header was found for a format which depends + * on headers or an illegal combination of parameters is used. + */ +#define AV_LOG_FATAL 8 + +/** + * Something went wrong and cannot losslessly be recovered. + * However, not all future data is affected. + */ +#define AV_LOG_ERROR 16 + +/** + * Something somehow does not look correct. This may or may not + * lead to problems. An example would be the use of '-vstrict -2'. + */ +#define AV_LOG_WARNING 24 + +/** + * Standard information. + */ +#define AV_LOG_INFO 32 + +/** + * Detailed information. + */ +#define AV_LOG_VERBOSE 40 + +/** + * Stuff which is only useful for libav* developers. + */ +#define AV_LOG_DEBUG 48 + +/** + * Extremely verbose debugging, useful for libav* development. + */ +#define AV_LOG_TRACE 56 + +#define AV_LOG_MAX_OFFSET (AV_LOG_TRACE - AV_LOG_QUIET) + +/** + * @} + */ + +/** + * Sets additional colors for extended debugging sessions. + * @code + av_log(ctx, AV_LOG_DEBUG|AV_LOG_C(134), "Message in purple\n"); + @endcode + * Requires 256color terminal support. Uses outside debugging is not + * recommended. + */ +#define AV_LOG_C(x) ((x) << 8) + +/** + * Send the specified message to the log if the level is less than or equal + * to the current av_log_level. By default, all logging messages are sent to + * stderr. This behavior can be altered by setting a different logging callback + * function. + * @see av_log_set_callback + * + * @param avcl A pointer to an arbitrary struct of which the first field is a + * pointer to an AVClass struct or NULL if general log. + * @param level The importance level of the message expressed using a @ref + * lavu_log_constants "Logging Constant". + * @param fmt The format string (printf-compatible) that specifies how + * subsequent arguments are converted to output. + */ +void av_log(void *avcl, int level, const char *fmt, ...) av_printf_format(3, 4); + + +/** + * Send the specified message to the log if the level is less than or equal + * to the current av_log_level. By default, all logging messages are sent to + * stderr. This behavior can be altered by setting a different logging callback + * function. + * @see av_log_set_callback + * + * @param avcl A pointer to an arbitrary struct of which the first field is a + * pointer to an AVClass struct. + * @param level The importance level of the message expressed using a @ref + * lavu_log_constants "Logging Constant". + * @param fmt The format string (printf-compatible) that specifies how + * subsequent arguments are converted to output. + * @param vl The arguments referenced by the format string. + */ +void av_vlog(void *avcl, int level, const char *fmt, va_list vl); + +/** + * Get the current log level + * + * @see lavu_log_constants + * + * @return Current log level + */ +int av_log_get_level(void); + +/** + * Set the log level + * + * @see lavu_log_constants + * + * @param level Logging level + */ +void av_log_set_level(int level); + +/** + * Set the logging callback + * + * @note The callback must be thread safe, even if the application does not use + * threads itself as some codecs are multithreaded. + * + * @see av_log_default_callback + * + * @param callback A logging function with a compatible signature. + */ +void av_log_set_callback(void (*callback)(void*, int, const char*, va_list)); + +/** + * Default logging callback + * + * It prints the message to stderr, optionally colorizing it. + * + * @param avcl A pointer to an arbitrary struct of which the first field is a + * pointer to an AVClass struct. + * @param level The importance level of the message expressed using a @ref + * lavu_log_constants "Logging Constant". + * @param fmt The format string (printf-compatible) that specifies how + * subsequent arguments are converted to output. + * @param vl The arguments referenced by the format string. + */ +void av_log_default_callback(void *avcl, int level, const char *fmt, + va_list vl); + +/** + * Return the context name + * + * @param ctx The AVClass context + * + * @return The AVClass class_name + */ +const char* av_default_item_name(void* ctx); +AVClassCategory av_default_get_category(void *ptr); + +/** + * Format a line of log the same way as the default callback. + * @param line buffer to receive the formatted line + * @param line_size size of the buffer + * @param print_prefix used to store whether the prefix must be printed; + * must point to a persistent integer initially set to 1 + */ +void av_log_format_line(void *ptr, int level, const char *fmt, va_list vl, + char *line, int line_size, int *print_prefix); + +#if FF_API_DLOG +/** + * av_dlog macros + * @deprecated unused + * Useful to print debug messages that shouldn't get compiled in normally. + */ + +#ifdef DEBUG +# define av_dlog(pctx, ...) av_log(pctx, AV_LOG_DEBUG, __VA_ARGS__) +#else +# define av_dlog(pctx, ...) do { if (0) av_log(pctx, AV_LOG_DEBUG, __VA_ARGS__); } while (0) +#endif +#endif /* FF_API_DLOG */ + +/** + * Skip repeated messages, this requires the user app to use av_log() instead of + * (f)printf as the 2 would otherwise interfere and lead to + * "Last message repeated x times" messages below (f)printf messages with some + * bad luck. + * Also to receive the last, "last repeated" line if any, the user app must + * call av_log(NULL, AV_LOG_QUIET, "%s", ""); at the end + */ +#define AV_LOG_SKIP_REPEATED 1 + +/** + * Include the log severity in messages originating from codecs. + * + * Results in messages such as: + * [rawvideo @ 0xDEADBEEF] [error] encode did not produce valid pts + */ +#define AV_LOG_PRINT_LEVEL 2 + +void av_log_set_flags(int arg); +int av_log_get_flags(void); + +/** + * @} + */ + +#endif /* AVUTIL_LOG_H */ diff --git a/ext/at3_standalone/macros.h b/ext/at3_standalone/macros.h new file mode 100644 index 0000000000..2007ee5619 --- /dev/null +++ b/ext/at3_standalone/macros.h @@ -0,0 +1,50 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + * @ingroup lavu + * Utility Preprocessor macros + */ + +#ifndef AVUTIL_MACROS_H +#define AVUTIL_MACROS_H + +/** + * @addtogroup preproc_misc Preprocessor String Macros + * + * String manipulation macros + * + * @{ + */ + +#define AV_STRINGIFY(s) AV_TOSTRING(s) +#define AV_TOSTRING(s) #s + +#define AV_GLUE(a, b) a ## b +#define AV_JOIN(a, b) AV_GLUE(a, b) + +/** + * @} + */ + +#define AV_PRAGMA(s) _Pragma(#s) + +#define FFALIGN(x, a) (((x)+(a)-1)&~((a)-1)) + +#endif /* AVUTIL_MACROS_H */ diff --git a/ext/at3_standalone/mathematics.h b/ext/at3_standalone/mathematics.h new file mode 100644 index 0000000000..57c44f845d --- /dev/null +++ b/ext/at3_standalone/mathematics.h @@ -0,0 +1,165 @@ +/* + * copyright (c) 2005-2012 Michael Niedermayer + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVUTIL_MATHEMATICS_H +#define AVUTIL_MATHEMATICS_H + +#include +#include +#include "attributes.h" +#include "rational.h" +#include "intfloat.h" + +#ifndef M_E +#define M_E 2.7182818284590452354 /* e */ +#endif +#ifndef M_LN2 +#define M_LN2 0.69314718055994530942 /* log_e 2 */ +#endif +#ifndef M_LN10 +#define M_LN10 2.30258509299404568402 /* log_e 10 */ +#endif +#ifndef M_LOG2_10 +#define M_LOG2_10 3.32192809488736234787 /* log_2 10 */ +#endif +#ifndef M_PHI +#define M_PHI 1.61803398874989484820 /* phi / golden ratio */ +#endif +#ifndef M_PI +#define M_PI 3.14159265358979323846 /* pi */ +#endif +#ifndef M_PI_2 +#define M_PI_2 1.57079632679489661923 /* pi/2 */ +#endif +#ifndef M_SQRT1_2 +#define M_SQRT1_2 0.70710678118654752440 /* 1/sqrt(2) */ +#endif +#ifndef M_SQRT2 +#define M_SQRT2 1.41421356237309504880 /* sqrt(2) */ +#endif +#ifndef NAN +#define NAN av_int2float(0x7fc00000) +#endif +#ifndef INFINITY +#define INFINITY av_int2float(0x7f800000) +#endif + +/** + * @addtogroup lavu_math + * @{ + */ + + +enum AVRounding { + AV_ROUND_ZERO = 0, ///< Round toward zero. + AV_ROUND_INF = 1, ///< Round away from zero. + AV_ROUND_DOWN = 2, ///< Round toward -infinity. + AV_ROUND_UP = 3, ///< Round toward +infinity. + AV_ROUND_NEAR_INF = 5, ///< Round to nearest and halfway cases away from zero. + AV_ROUND_PASS_MINMAX = 8192, ///< Flag to pass INT64_MIN/MAX through instead of rescaling, this avoids special cases for AV_NOPTS_VALUE +}; + +/** + * Compute the greatest common divisor of a and b. + * + * @return gcd of a and b up to sign; if a >= 0 and b >= 0, return value is >= 0; + * if a == 0 and b == 0, returns 0. + */ +int64_t av_const av_gcd(int64_t a, int64_t b); + +/** + * Rescale a 64-bit integer with rounding to nearest. + * A simple a*b/c isn't possible as it can overflow. + */ +int64_t av_rescale(int64_t a, int64_t b, int64_t c) av_const; + +/** + * Rescale a 64-bit integer with specified rounding. + * A simple a*b/c isn't possible as it can overflow. + * + * @return rescaled value a, or if AV_ROUND_PASS_MINMAX is set and a is + * INT64_MIN or INT64_MAX then a is passed through unchanged. + */ +int64_t av_rescale_rnd(int64_t a, int64_t b, int64_t c, enum AVRounding) av_const; + +/** + * Rescale a 64-bit integer by 2 rational numbers. + */ +int64_t av_rescale_q(int64_t a, AVRational bq, AVRational cq) av_const; + +/** + * Rescale a 64-bit integer by 2 rational numbers with specified rounding. + * + * @return rescaled value a, or if AV_ROUND_PASS_MINMAX is set and a is + * INT64_MIN or INT64_MAX then a is passed through unchanged. + */ +int64_t av_rescale_q_rnd(int64_t a, AVRational bq, AVRational cq, + enum AVRounding) av_const; + +/** + * Compare 2 timestamps each in its own timebases. + * The result of the function is undefined if one of the timestamps + * is outside the int64_t range when represented in the others timebase. + * @return -1 if ts_a is before ts_b, 1 if ts_a is after ts_b or 0 if they represent the same position + */ +int av_compare_ts(int64_t ts_a, AVRational tb_a, int64_t ts_b, AVRational tb_b); + +/** + * Compare 2 integers modulo mod. + * That is we compare integers a and b for which only the least + * significant log2(mod) bits are known. + * + * @param mod must be a power of 2 + * @return a negative value if a is smaller than b + * a positive value if a is greater than b + * 0 if a equals b + */ +int64_t av_compare_mod(uint64_t a, uint64_t b, uint64_t mod); + +/** + * Rescale a timestamp while preserving known durations. + * + * @param in_ts Input timestamp + * @param in_tb Input timebase + * @param fs_tb Duration and *last timebase + * @param duration duration till the next call + * @param out_tb Output timebase + */ +int64_t av_rescale_delta(AVRational in_tb, int64_t in_ts, AVRational fs_tb, int duration, int64_t *last, AVRational out_tb); + +/** + * Add a value to a timestamp. + * + * This function guarantees that when the same value is repeatly added that + * no accumulation of rounding errors occurs. + * + * @param ts Input timestamp + * @param ts_tb Input timestamp timebase + * @param inc value to add to ts + * @param inc_tb inc timebase + */ +int64_t av_add_stable(AVRational ts_tb, int64_t ts, AVRational inc_tb, int64_t inc); + + + /** + * @} + */ + +#endif /* AVUTIL_MATHEMATICS_H */ diff --git a/ext/at3_standalone/mathops.c b/ext/at3_standalone/mathops.c new file mode 100644 index 0000000000..31c8e69e61 --- /dev/null +++ b/ext/at3_standalone/mathops.c @@ -0,0 +1,26 @@ +#include "mathops.h" + +#ifdef TEST + +#include + +int main(void) +{ + unsigned u; + + for(u=0; u<65536; u++) { + unsigned s = u*u; + unsigned root = ff_sqrt(s); + unsigned root_m1 = ff_sqrt(s-1); + if (s && root != u) { + fprintf(stderr, "ff_sqrt failed at %u with %u\n", s, root); + return 1; + } + if (u && root_m1 != u - 1) { + fprintf(stderr, "ff_sqrt failed at %u with %u\n", s, root); + return 1; + } + } + return 0; +} +#endif /* TEST */ diff --git a/ext/at3_standalone/mathops.h b/ext/at3_standalone/mathops.h new file mode 100644 index 0000000000..4efefdd671 --- /dev/null +++ b/ext/at3_standalone/mathops.h @@ -0,0 +1,251 @@ +/* + * simple math operations + * Copyright (c) 2001, 2002 Fabrice Bellard + * Copyright (c) 2006 Michael Niedermayer et al + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ +#ifndef AVCODEC_MATHOPS_H +#define AVCODEC_MATHOPS_H + +#include + +#include "common.h" +#include "config.h" + +#define MAX_NEG_CROP 1024 + +extern const uint32_t ff_inverse[257]; +extern const uint8_t ff_sqrt_tab[256]; +extern const uint8_t ff_crop_tab[256 + 2 * MAX_NEG_CROP]; +extern const uint8_t ff_zigzag_direct[64]; + +#if ARCH_ARM +# include "arm/mathops.h" +#elif ARCH_AVR32 +# include "avr32/mathops.h" +#elif ARCH_MIPS +# include "mips/mathops.h" +#elif ARCH_PPC +# include "ppc/mathops.h" +#elif ARCH_X86 +# include "x86/mathops.h" +#endif + +/* generic implementation */ + +#ifndef MUL64 +# define MUL64(a,b) ((int64_t)(a) * (int64_t)(b)) +#endif + +#ifndef MULL +# define MULL(a,b,s) (MUL64(a, b) >> (s)) +#endif + +#ifndef MULH +static av_always_inline int MULH(int a, int b){ + return MUL64(a, b) >> 32; +} +#endif + +#ifndef UMULH +static av_always_inline unsigned UMULH(unsigned a, unsigned b){ + return ((uint64_t)(a) * (uint64_t)(b))>>32; +} +#endif + +#ifndef MAC64 +# define MAC64(d, a, b) ((d) += MUL64(a, b)) +#endif + +#ifndef MLS64 +# define MLS64(d, a, b) ((d) -= MUL64(a, b)) +#endif + +/* signed 16x16 -> 32 multiply add accumulate */ +#ifndef MAC16 +# define MAC16(rt, ra, rb) rt += (ra) * (rb) +#endif + +/* signed 16x16 -> 32 multiply */ +#ifndef MUL16 +# define MUL16(ra, rb) ((ra) * (rb)) +#endif + +#ifndef MLS16 +# define MLS16(rt, ra, rb) ((rt) -= (ra) * (rb)) +#endif + +/* median of 3 */ +#ifndef mid_pred +#define mid_pred mid_pred +static inline av_const int mid_pred(int a, int b, int c) +{ +#if 0 + int t= (a-b)&((a-b)>>31); + a-=t; + b+=t; + b-= (b-c)&((b-c)>>31); + b+= (a-b)&((a-b)>>31); + + return b; +#else + if(a>b){ + if(c>b){ + if(c>a) b=a; + else b=c; + } + }else{ + if(b>c){ + if(c>a) b=c; + else b=a; + } + } + return b; +#endif +} +#endif + +#ifndef median4 +#define median4 median4 +static inline av_const int median4(int a, int b, int c, int d) +{ + if (a < b) { + if (c < d) return (FFMIN(b, d) + FFMAX(a, c)) / 2; + else return (FFMIN(b, c) + FFMAX(a, d)) / 2; + } else { + if (c < d) return (FFMIN(a, d) + FFMAX(b, c)) / 2; + else return (FFMIN(a, c) + FFMAX(b, d)) / 2; + } +} +#endif + +#ifndef sign_extend +static inline av_const int sign_extend(int val, unsigned bits) +{ + unsigned shift = 8 * sizeof(int) - bits; + union { unsigned u; int s; } v = { (unsigned) val << shift }; + return v.s >> shift; +} +#endif + +#ifndef zero_extend +static inline av_const unsigned zero_extend(unsigned val, unsigned bits) +{ + return (val << ((8 * sizeof(int)) - bits)) >> ((8 * sizeof(int)) - bits); +} +#endif + +#ifndef COPY3_IF_LT +#define COPY3_IF_LT(x, y, a, b, c, d)\ +if ((y) < (x)) {\ + (x) = (y);\ + (a) = (b);\ + (c) = (d);\ +} +#endif + +#ifndef MASK_ABS +#define MASK_ABS(mask, level) do { \ + mask = level >> 31; \ + level = (level ^ mask) - mask; \ + } while (0) +#endif + +#ifndef NEG_SSR32 +# define NEG_SSR32(a,s) ((( int32_t)(a))>>(32-(s))) +#endif + +#ifndef NEG_USR32 +# define NEG_USR32(a,s) (((uint32_t)(a))>>(32-(s))) +#endif + +#if HAVE_BIGENDIAN +# ifndef PACK_2U8 +# define PACK_2U8(a,b) (((a) << 8) | (b)) +# endif +# ifndef PACK_4U8 +# define PACK_4U8(a,b,c,d) (((a) << 24) | ((b) << 16) | ((c) << 8) | (d)) +# endif +# ifndef PACK_2U16 +# define PACK_2U16(a,b) (((a) << 16) | (b)) +# endif +#else +# ifndef PACK_2U8 +# define PACK_2U8(a,b) (((b) << 8) | (a)) +# endif +# ifndef PACK_4U2 +# define PACK_4U8(a,b,c,d) (((d) << 24) | ((c) << 16) | ((b) << 8) | (a)) +# endif +# ifndef PACK_2U16 +# define PACK_2U16(a,b) (((b) << 16) | (a)) +# endif +#endif + +#ifndef PACK_2S8 +# define PACK_2S8(a,b) PACK_2U8((a)&255, (b)&255) +#endif +#ifndef PACK_4S8 +# define PACK_4S8(a,b,c,d) PACK_4U8((a)&255, (b)&255, (c)&255, (d)&255) +#endif +#ifndef PACK_2S16 +# define PACK_2S16(a,b) PACK_2U16((a)&0xffff, (b)&0xffff) +#endif + +#ifndef FASTDIV +# define FASTDIV(a,b) ((uint32_t)((((uint64_t)a) * ff_inverse[b]) >> 32)) +#endif /* FASTDIV */ + +#ifndef ff_sqrt +#define ff_sqrt ff_sqrt +static inline av_const unsigned int ff_sqrt(unsigned int a) +{ + unsigned int b; + + if (a < 255) return (ff_sqrt_tab[a + 1] - 1) >> 4; + else if (a < (1 << 12)) b = ff_sqrt_tab[a >> 4] >> 2; +#if !CONFIG_SMALL + else if (a < (1 << 14)) b = ff_sqrt_tab[a >> 6] >> 1; + else if (a < (1 << 16)) b = ff_sqrt_tab[a >> 8] ; +#endif + else { + int s = av_log2_16bit(a >> 16) >> 1; + unsigned int c = a >> (s + 2); + b = ff_sqrt_tab[c >> (s + 8)]; + b = FASTDIV(c,b) + (b << s); + } + + return b - (a < b * b); +} +#endif + +static inline av_const float ff_sqrf(float a) +{ + return a*a; +} + +static inline int8_t ff_u8_to_s8(uint8_t a) +{ + union { + uint8_t u8; + int8_t s8; + } b; + b.u8 = a; + return b.s8; +} + +#endif /* AVCODEC_MATHOPS_H */ diff --git a/ext/at3_standalone/mem.h b/ext/at3_standalone/mem.h new file mode 100644 index 0000000000..376fd2e07c --- /dev/null +++ b/ext/at3_standalone/mem.h @@ -0,0 +1,406 @@ +/* + * copyright (c) 2006 Michael Niedermayer + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + * memory handling functions + */ + +#ifndef AVUTIL_MEM_H +#define AVUTIL_MEM_H + +#include +#include + +#include "attributes.h" +#include "error.h" +#include "avutil.h" + +/** + * @addtogroup lavu_mem + * @{ + */ + + +#if defined(__INTEL_COMPILER) && __INTEL_COMPILER < 1110 || defined(__SUNPRO_C) + #define DECLARE_ALIGNED(n,t,v) t __attribute__ ((aligned (n))) v + #define DECLARE_ASM_CONST(n,t,v) const t __attribute__ ((aligned (n))) v +#elif defined(__TI_COMPILER_VERSION__) + #define DECLARE_ALIGNED(n,t,v) \ + AV_PRAGMA(DATA_ALIGN(v,n)) \ + t __attribute__((aligned(n))) v + #define DECLARE_ASM_CONST(n,t,v) \ + AV_PRAGMA(DATA_ALIGN(v,n)) \ + static const t __attribute__((aligned(n))) v +#elif defined(__GNUC__) + #define DECLARE_ALIGNED(n,t,v) t __attribute__ ((aligned (n))) v + #define DECLARE_ASM_CONST(n,t,v) static const t av_used __attribute__ ((aligned (n))) v +#elif defined(_MSC_VER) + #define DECLARE_ALIGNED(n,t,v) __declspec(align(n)) t v + #define DECLARE_ASM_CONST(n,t,v) __declspec(align(n)) static const t v +#else + #define DECLARE_ALIGNED(n,t,v) t v + #define DECLARE_ASM_CONST(n,t,v) static const t v +#endif + +#if AV_GCC_VERSION_AT_LEAST(3,1) + #define av_malloc_attrib __attribute__((__malloc__)) +#else + #define av_malloc_attrib +#endif + +#if AV_GCC_VERSION_AT_LEAST(4,3) + #define av_alloc_size(...) __attribute__((alloc_size(__VA_ARGS__))) +#else + #define av_alloc_size(...) +#endif + +/** + * Allocate a block of size bytes with alignment suitable for all + * memory accesses (including vectors if available on the CPU). + * @param size Size in bytes for the memory block to be allocated. + * @return Pointer to the allocated block, NULL if the block cannot + * be allocated. + * @see av_mallocz() + */ +void *av_malloc(size_t size) av_malloc_attrib av_alloc_size(1); + +/** + * Allocate a block of size * nmemb bytes with av_malloc(). + * @param nmemb Number of elements + * @param size Size of the single element + * @return Pointer to the allocated block, NULL if the block cannot + * be allocated. + * @see av_malloc() + */ +av_alloc_size(1, 2) static inline void *av_malloc_array(size_t nmemb, size_t size) +{ + if (!size || nmemb >= INT_MAX / size) + return NULL; + return av_malloc(nmemb * size); +} + +/** + * Allocate or reallocate a block of memory. + * If ptr is NULL and size > 0, allocate a new block. If + * size is zero, free the memory block pointed to by ptr. + * @param ptr Pointer to a memory block already allocated with + * av_realloc() or NULL. + * @param size Size in bytes of the memory block to be allocated or + * reallocated. + * @return Pointer to a newly-reallocated block or NULL if the block + * cannot be reallocated or the function is used to free the memory block. + * @warning Pointers originating from the av_malloc() family of functions must + * not be passed to av_realloc(). The former can be implemented using + * memalign() (or other functions), and there is no guarantee that + * pointers from such functions can be passed to realloc() at all. + * The situation is undefined according to POSIX and may crash with + * some libc implementations. + * @see av_fast_realloc() + */ +void *av_realloc(void *ptr, size_t size) av_alloc_size(2); + +/** + * Allocate or reallocate a block of memory. + * This function does the same thing as av_realloc, except: + * - It takes two arguments and checks the result of the multiplication for + * integer overflow. + * - It frees the input block in case of failure, thus avoiding the memory + * leak with the classic "buf = realloc(buf); if (!buf) return -1;". + */ +void *av_realloc_f(void *ptr, size_t nelem, size_t elsize); + +/** + * Allocate or reallocate a block of memory. + * If *ptr is NULL and size > 0, allocate a new block. If + * size is zero, free the memory block pointed to by ptr. + * @param ptr Pointer to a pointer to a memory block already allocated + * with av_realloc(), or pointer to a pointer to NULL. + * The pointer is updated on success, or freed on failure. + * @param size Size in bytes for the memory block to be allocated or + * reallocated + * @return Zero on success, an AVERROR error code on failure. + * @warning Pointers originating from the av_malloc() family of functions must + * not be passed to av_reallocp(). The former can be implemented using + * memalign() (or other functions), and there is no guarantee that + * pointers from such functions can be passed to realloc() at all. + * The situation is undefined according to POSIX and may crash with + * some libc implementations. + */ +av_warn_unused_result +int av_reallocp(void *ptr, size_t size); + +/** + * Allocate or reallocate an array. + * If ptr is NULL and nmemb > 0, allocate a new block. If + * nmemb is zero, free the memory block pointed to by ptr. + * @param ptr Pointer to a memory block already allocated with + * av_realloc() or NULL. + * @param nmemb Number of elements + * @param size Size of the single element + * @return Pointer to a newly-reallocated block or NULL if the block + * cannot be reallocated or the function is used to free the memory block. + * @warning Pointers originating from the av_malloc() family of functions must + * not be passed to av_realloc(). The former can be implemented using + * memalign() (or other functions), and there is no guarantee that + * pointers from such functions can be passed to realloc() at all. + * The situation is undefined according to POSIX and may crash with + * some libc implementations. + */ +av_alloc_size(2, 3) void *av_realloc_array(void *ptr, size_t nmemb, size_t size); + +/** + * Allocate or reallocate an array through a pointer to a pointer. + * If *ptr is NULL and nmemb > 0, allocate a new block. If + * nmemb is zero, free the memory block pointed to by ptr. + * @param ptr Pointer to a pointer to a memory block already allocated + * with av_realloc(), or pointer to a pointer to NULL. + * The pointer is updated on success, or freed on failure. + * @param nmemb Number of elements + * @param size Size of the single element + * @return Zero on success, an AVERROR error code on failure. + * @warning Pointers originating from the av_malloc() family of functions must + * not be passed to av_realloc(). The former can be implemented using + * memalign() (or other functions), and there is no guarantee that + * pointers from such functions can be passed to realloc() at all. + * The situation is undefined according to POSIX and may crash with + * some libc implementations. + */ +int av_reallocp_array(void *ptr, size_t nmemb, size_t size); + +/** + * Free a memory block which has been allocated with av_malloc(z)() or + * av_realloc(). + * @param ptr Pointer to the memory block which should be freed. + * @note ptr = NULL is explicitly allowed. + * @note It is recommended that you use av_freep() instead. + * @see av_freep() + */ +void av_free(void *ptr); + +/** + * Allocate a block of size bytes with alignment suitable for all + * memory accesses (including vectors if available on the CPU) and + * zero all the bytes of the block. + * @param size Size in bytes for the memory block to be allocated. + * @return Pointer to the allocated block, NULL if it cannot be allocated. + * @see av_malloc() + */ +void *av_mallocz(size_t size) av_malloc_attrib av_alloc_size(1); + +/** + * Allocate a block of nmemb * size bytes with alignment suitable for all + * memory accesses (including vectors if available on the CPU) and + * zero all the bytes of the block. + * The allocation will fail if nmemb * size is greater than or equal + * to INT_MAX. + * @param nmemb + * @param size + * @return Pointer to the allocated block, NULL if it cannot be allocated. + */ +void *av_calloc(size_t nmemb, size_t size) av_malloc_attrib; + +/** + * Allocate a block of size * nmemb bytes with av_mallocz(). + * @param nmemb Number of elements + * @param size Size of the single element + * @return Pointer to the allocated block, NULL if the block cannot + * be allocated. + * @see av_mallocz() + * @see av_malloc_array() + */ +av_alloc_size(1, 2) static inline void *av_mallocz_array(size_t nmemb, size_t size) +{ + if (!size || nmemb >= INT_MAX / size) + return NULL; + return av_mallocz(nmemb * size); +} + +/** + * Duplicate the string s. + * @param s string to be duplicated + * @return Pointer to a newly-allocated string containing a + * copy of s or NULL if the string cannot be allocated. + */ +char *av_strdup(const char *s) av_malloc_attrib; + +/** + * Duplicate a substring of the string s. + * @param s string to be duplicated + * @param len the maximum length of the resulting string (not counting the + * terminating byte). + * @return Pointer to a newly-allocated string containing a + * copy of s or NULL if the string cannot be allocated. + */ +char *av_strndup(const char *s, size_t len) av_malloc_attrib; + +/** + * Duplicate the buffer p. + * @param p buffer to be duplicated + * @return Pointer to a newly allocated buffer containing a + * copy of p or NULL if the buffer cannot be allocated. + */ +void *av_memdup(const void *p, size_t size); + +/** + * Free a memory block which has been allocated with av_malloc(z)() or + * av_realloc() and set the pointer pointing to it to NULL. + * @param ptr Pointer to the pointer to the memory block which should + * be freed. + * @note passing a pointer to a NULL pointer is safe and leads to no action. + * @see av_free() + */ +void av_freep(void *ptr); + +/** + * Add an element to a dynamic array. + * + * The array to grow is supposed to be an array of pointers to + * structures, and the element to add must be a pointer to an already + * allocated structure. + * + * The array is reallocated when its size reaches powers of 2. + * Therefore, the amortized cost of adding an element is constant. + * + * In case of success, the pointer to the array is updated in order to + * point to the new grown array, and the number pointed to by nb_ptr + * is incremented. + * In case of failure, the array is freed, *tab_ptr is set to NULL and + * *nb_ptr is set to 0. + * + * @param tab_ptr pointer to the array to grow + * @param nb_ptr pointer to the number of elements in the array + * @param elem element to add + * @see av_dynarray_add_nofree(), av_dynarray2_add() + */ +void av_dynarray_add(void *tab_ptr, int *nb_ptr, void *elem); + +/** + * Add an element to a dynamic array. + * + * Function has the same functionality as av_dynarray_add(), + * but it doesn't free memory on fails. It returns error code + * instead and leave current buffer untouched. + * + * @param tab_ptr pointer to the array to grow + * @param nb_ptr pointer to the number of elements in the array + * @param elem element to add + * @return >=0 on success, negative otherwise. + * @see av_dynarray_add(), av_dynarray2_add() + */ +av_warn_unused_result +int av_dynarray_add_nofree(void *tab_ptr, int *nb_ptr, void *elem); + +/** + * Add an element of size elem_size to a dynamic array. + * + * The array is reallocated when its number of elements reaches powers of 2. + * Therefore, the amortized cost of adding an element is constant. + * + * In case of success, the pointer to the array is updated in order to + * point to the new grown array, and the number pointed to by nb_ptr + * is incremented. + * In case of failure, the array is freed, *tab_ptr is set to NULL and + * *nb_ptr is set to 0. + * + * @param tab_ptr pointer to the array to grow + * @param nb_ptr pointer to the number of elements in the array + * @param elem_size size in bytes of the elements in the array + * @param elem_data pointer to the data of the element to add. If NULL, the space of + * the new added element is not filled. + * @return pointer to the data of the element to copy in the new allocated space. + * If NULL, the new allocated space is left uninitialized." + * @see av_dynarray_add(), av_dynarray_add_nofree() + */ +void *av_dynarray2_add(void **tab_ptr, int *nb_ptr, size_t elem_size, + const uint8_t *elem_data); + +/** + * Multiply two size_t values checking for overflow. + * @return 0 if success, AVERROR(EINVAL) if overflow. + */ +static inline int av_size_mult(size_t a, size_t b, size_t *r) +{ + size_t t = a * b; + /* Hack inspired from glibc: only try the division if nelem and elsize + * are both greater than sqrt(SIZE_MAX). */ + if ((a | b) >= ((size_t)1 << (sizeof(size_t) * 4)) && a && t / a != b) + return AVERROR(EINVAL); + *r = t; + return 0; +} + +/** + * Set the maximum size that may me allocated in one block. + */ +void av_max_alloc(size_t max); + +/** + * deliberately overlapping memcpy implementation + * @param dst destination buffer + * @param back how many bytes back we start (the initial size of the overlapping window), must be > 0 + * @param cnt number of bytes to copy, must be >= 0 + * + * cnt > back is valid, this will copy the bytes we just copied, + * thus creating a repeating pattern with a period length of back. + */ +void av_memcpy_backptr(uint8_t *dst, int back, int cnt); + +/** + * Reallocate the given block if it is not large enough, otherwise do nothing. + * + * @see av_realloc + */ +void *av_fast_realloc(void *ptr, unsigned int *size, size_t min_size); + +/** + * Allocate a buffer, reusing the given one if large enough. + * + * Contrary to av_fast_realloc the current buffer contents might not be + * preserved and on error the old buffer is freed, thus no special + * handling to avoid memleaks is necessary. + * + * @param ptr pointer to pointer to already allocated buffer, overwritten with pointer to new buffer + * @param size size of the buffer *ptr points to + * @param min_size minimum size of *ptr buffer after returning, *ptr will be NULL and + * *size 0 if an error occurred. + */ +void av_fast_malloc(void *ptr, unsigned int *size, size_t min_size); + +/** + * Allocate a buffer, reusing the given one if large enough. + * + * All newly allocated space is initially cleared + * Contrary to av_fast_realloc the current buffer contents might not be + * preserved and on error the old buffer is freed, thus no special + * handling to avoid memleaks is necessary. + * + * @param ptr pointer to pointer to already allocated buffer, overwritten with pointer to new buffer + * @param size size of the buffer *ptr points to + * @param min_size minimum size of *ptr buffer after returning, *ptr will be NULL and + * *size 0 if an error occurred. + */ +void av_fast_mallocz(void *ptr, unsigned int *size, size_t min_size); + +/** + * @} + */ + +#endif /* AVUTIL_MEM_H */ diff --git a/ext/at3_standalone/pixfmt.h b/ext/at3_standalone/pixfmt.h new file mode 100644 index 0000000000..0a4fa6681f --- /dev/null +++ b/ext/at3_standalone/pixfmt.h @@ -0,0 +1,473 @@ +/* + * copyright (c) 2006 Michael Niedermayer + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVUTIL_PIXFMT_H +#define AVUTIL_PIXFMT_H + +/** + * @file + * pixel format definitions + * + */ + +// #include "libavutil/avconfig.h" +#include "version.h" + +#define AVPALETTE_SIZE 1024 +#define AVPALETTE_COUNT 256 + +/** + * Pixel format. + * + * @note + * AV_PIX_FMT_RGB32 is handled in an endian-specific manner. An RGBA + * color is put together as: + * (A << 24) | (R << 16) | (G << 8) | B + * This is stored as BGRA on little-endian CPU architectures and ARGB on + * big-endian CPUs. + * + * @par + * When the pixel format is palettized RGB32 (AV_PIX_FMT_PAL8), the palettized + * image data is stored in AVFrame.data[0]. The palette is transported in + * AVFrame.data[1], is 1024 bytes long (256 4-byte entries) and is + * formatted the same as in AV_PIX_FMT_RGB32 described above (i.e., it is + * also endian-specific). Note also that the individual RGB32 palette + * components stored in AVFrame.data[1] should be in the range 0..255. + * This is important as many custom PAL8 video codecs that were designed + * to run on the IBM VGA graphics adapter use 6-bit palette components. + * + * @par + * For all the 8bit per pixel formats, an RGB32 palette is in data[1] like + * for pal8. This palette is filled in automatically by the function + * allocating the picture. + */ +enum AVPixelFormat { + AV_PIX_FMT_NONE = -1, + AV_PIX_FMT_YUV420P, ///< planar YUV 4:2:0, 12bpp, (1 Cr & Cb sample per 2x2 Y samples) + AV_PIX_FMT_YUYV422, ///< packed YUV 4:2:2, 16bpp, Y0 Cb Y1 Cr + AV_PIX_FMT_RGB24, ///< packed RGB 8:8:8, 24bpp, RGBRGB... + AV_PIX_FMT_BGR24, ///< packed RGB 8:8:8, 24bpp, BGRBGR... + AV_PIX_FMT_YUV422P, ///< planar YUV 4:2:2, 16bpp, (1 Cr & Cb sample per 2x1 Y samples) + AV_PIX_FMT_YUV444P, ///< planar YUV 4:4:4, 24bpp, (1 Cr & Cb sample per 1x1 Y samples) + AV_PIX_FMT_YUV410P, ///< planar YUV 4:1:0, 9bpp, (1 Cr & Cb sample per 4x4 Y samples) + AV_PIX_FMT_YUV411P, ///< planar YUV 4:1:1, 12bpp, (1 Cr & Cb sample per 4x1 Y samples) + AV_PIX_FMT_GRAY8, ///< Y , 8bpp + AV_PIX_FMT_MONOWHITE, ///< Y , 1bpp, 0 is white, 1 is black, in each byte pixels are ordered from the msb to the lsb + AV_PIX_FMT_MONOBLACK, ///< Y , 1bpp, 0 is black, 1 is white, in each byte pixels are ordered from the msb to the lsb + AV_PIX_FMT_PAL8, ///< 8 bit with AV_PIX_FMT_RGB32 palette + AV_PIX_FMT_YUVJ420P, ///< planar YUV 4:2:0, 12bpp, full scale (JPEG), deprecated in favor of AV_PIX_FMT_YUV420P and setting color_range + AV_PIX_FMT_YUVJ422P, ///< planar YUV 4:2:2, 16bpp, full scale (JPEG), deprecated in favor of AV_PIX_FMT_YUV422P and setting color_range + AV_PIX_FMT_YUVJ444P, ///< planar YUV 4:4:4, 24bpp, full scale (JPEG), deprecated in favor of AV_PIX_FMT_YUV444P and setting color_range +#if FF_API_XVMC + AV_PIX_FMT_XVMC_MPEG2_MC,///< XVideo Motion Acceleration via common packet passing + AV_PIX_FMT_XVMC_MPEG2_IDCT, +#define AV_PIX_FMT_XVMC AV_PIX_FMT_XVMC_MPEG2_IDCT +#endif /* FF_API_XVMC */ + AV_PIX_FMT_UYVY422, ///< packed YUV 4:2:2, 16bpp, Cb Y0 Cr Y1 + AV_PIX_FMT_UYYVYY411, ///< packed YUV 4:1:1, 12bpp, Cb Y0 Y1 Cr Y2 Y3 + AV_PIX_FMT_BGR8, ///< packed RGB 3:3:2, 8bpp, (msb)2B 3G 3R(lsb) + AV_PIX_FMT_BGR4, ///< packed RGB 1:2:1 bitstream, 4bpp, (msb)1B 2G 1R(lsb), a byte contains two pixels, the first pixel in the byte is the one composed by the 4 msb bits + AV_PIX_FMT_BGR4_BYTE, ///< packed RGB 1:2:1, 8bpp, (msb)1B 2G 1R(lsb) + AV_PIX_FMT_RGB8, ///< packed RGB 3:3:2, 8bpp, (msb)2R 3G 3B(lsb) + AV_PIX_FMT_RGB4, ///< packed RGB 1:2:1 bitstream, 4bpp, (msb)1R 2G 1B(lsb), a byte contains two pixels, the first pixel in the byte is the one composed by the 4 msb bits + AV_PIX_FMT_RGB4_BYTE, ///< packed RGB 1:2:1, 8bpp, (msb)1R 2G 1B(lsb) + AV_PIX_FMT_NV12, ///< planar YUV 4:2:0, 12bpp, 1 plane for Y and 1 plane for the UV components, which are interleaved (first byte U and the following byte V) + AV_PIX_FMT_NV21, ///< as above, but U and V bytes are swapped + + AV_PIX_FMT_ARGB, ///< packed ARGB 8:8:8:8, 32bpp, ARGBARGB... + AV_PIX_FMT_RGBA, ///< packed RGBA 8:8:8:8, 32bpp, RGBARGBA... + AV_PIX_FMT_ABGR, ///< packed ABGR 8:8:8:8, 32bpp, ABGRABGR... + AV_PIX_FMT_BGRA, ///< packed BGRA 8:8:8:8, 32bpp, BGRABGRA... + + AV_PIX_FMT_GRAY16BE, ///< Y , 16bpp, big-endian + AV_PIX_FMT_GRAY16LE, ///< Y , 16bpp, little-endian + AV_PIX_FMT_YUV440P, ///< planar YUV 4:4:0 (1 Cr & Cb sample per 1x2 Y samples) + AV_PIX_FMT_YUVJ440P, ///< planar YUV 4:4:0 full scale (JPEG), deprecated in favor of AV_PIX_FMT_YUV440P and setting color_range + AV_PIX_FMT_YUVA420P, ///< planar YUV 4:2:0, 20bpp, (1 Cr & Cb sample per 2x2 Y & A samples) +#if FF_API_VDPAU + AV_PIX_FMT_VDPAU_H264,///< H.264 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers + AV_PIX_FMT_VDPAU_MPEG1,///< MPEG-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers + AV_PIX_FMT_VDPAU_MPEG2,///< MPEG-2 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers + AV_PIX_FMT_VDPAU_WMV3,///< WMV3 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers + AV_PIX_FMT_VDPAU_VC1, ///< VC-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers +#endif + AV_PIX_FMT_RGB48BE, ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as big-endian + AV_PIX_FMT_RGB48LE, ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as little-endian + + AV_PIX_FMT_RGB565BE, ///< packed RGB 5:6:5, 16bpp, (msb) 5R 6G 5B(lsb), big-endian + AV_PIX_FMT_RGB565LE, ///< packed RGB 5:6:5, 16bpp, (msb) 5R 6G 5B(lsb), little-endian + AV_PIX_FMT_RGB555BE, ///< packed RGB 5:5:5, 16bpp, (msb)1X 5R 5G 5B(lsb), big-endian , X=unused/undefined + AV_PIX_FMT_RGB555LE, ///< packed RGB 5:5:5, 16bpp, (msb)1X 5R 5G 5B(lsb), little-endian, X=unused/undefined + + AV_PIX_FMT_BGR565BE, ///< packed BGR 5:6:5, 16bpp, (msb) 5B 6G 5R(lsb), big-endian + AV_PIX_FMT_BGR565LE, ///< packed BGR 5:6:5, 16bpp, (msb) 5B 6G 5R(lsb), little-endian + AV_PIX_FMT_BGR555BE, ///< packed BGR 5:5:5, 16bpp, (msb)1X 5B 5G 5R(lsb), big-endian , X=unused/undefined + AV_PIX_FMT_BGR555LE, ///< packed BGR 5:5:5, 16bpp, (msb)1X 5B 5G 5R(lsb), little-endian, X=unused/undefined + +#if FF_API_VAAPI + /** @name Deprecated pixel formats */ + /**@{*/ + AV_PIX_FMT_VAAPI_MOCO, ///< HW acceleration through VA API at motion compensation entry-point, Picture.data[3] contains a vaapi_render_state struct which contains macroblocks as well as various fields extracted from headers + AV_PIX_FMT_VAAPI_IDCT, ///< HW acceleration through VA API at IDCT entry-point, Picture.data[3] contains a vaapi_render_state struct which contains fields extracted from headers + AV_PIX_FMT_VAAPI_VLD, ///< HW decoding through VA API, Picture.data[3] contains a vaapi_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers + /**@}*/ + AV_PIX_FMT_VAAPI = AV_PIX_FMT_VAAPI_VLD, +#else + /** + * Hardware acceleration through VA-API, data[3] contains a + * VASurfaceID. + */ + AV_PIX_FMT_VAAPI, +#endif + + AV_PIX_FMT_YUV420P16LE, ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian + AV_PIX_FMT_YUV420P16BE, ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian + AV_PIX_FMT_YUV422P16LE, ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian + AV_PIX_FMT_YUV422P16BE, ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian + AV_PIX_FMT_YUV444P16LE, ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian + AV_PIX_FMT_YUV444P16BE, ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian +#if FF_API_VDPAU + AV_PIX_FMT_VDPAU_MPEG4, ///< MPEG4 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers +#endif + AV_PIX_FMT_DXVA2_VLD, ///< HW decoding through DXVA2, Picture.data[3] contains a LPDIRECT3DSURFACE9 pointer + + AV_PIX_FMT_RGB444LE, ///< packed RGB 4:4:4, 16bpp, (msb)4X 4R 4G 4B(lsb), little-endian, X=unused/undefined + AV_PIX_FMT_RGB444BE, ///< packed RGB 4:4:4, 16bpp, (msb)4X 4R 4G 4B(lsb), big-endian, X=unused/undefined + AV_PIX_FMT_BGR444LE, ///< packed BGR 4:4:4, 16bpp, (msb)4X 4B 4G 4R(lsb), little-endian, X=unused/undefined + AV_PIX_FMT_BGR444BE, ///< packed BGR 4:4:4, 16bpp, (msb)4X 4B 4G 4R(lsb), big-endian, X=unused/undefined + AV_PIX_FMT_YA8, ///< 8bit gray, 8bit alpha + + AV_PIX_FMT_Y400A = AV_PIX_FMT_YA8, ///< alias for AV_PIX_FMT_YA8 + AV_PIX_FMT_GRAY8A= AV_PIX_FMT_YA8, ///< alias for AV_PIX_FMT_YA8 + + AV_PIX_FMT_BGR48BE, ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as big-endian + AV_PIX_FMT_BGR48LE, ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as little-endian + + /** + * The following 12 formats have the disadvantage of needing 1 format for each bit depth. + * Notice that each 9/10 bits sample is stored in 16 bits with extra padding. + * If you want to support multiple bit depths, then using AV_PIX_FMT_YUV420P16* with the bpp stored separately is better. + */ + AV_PIX_FMT_YUV420P9BE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian + AV_PIX_FMT_YUV420P9LE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian + AV_PIX_FMT_YUV420P10BE,///< planar YUV 4:2:0, 15bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian + AV_PIX_FMT_YUV420P10LE,///< planar YUV 4:2:0, 15bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian + AV_PIX_FMT_YUV422P10BE,///< planar YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian + AV_PIX_FMT_YUV422P10LE,///< planar YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian + AV_PIX_FMT_YUV444P9BE, ///< planar YUV 4:4:4, 27bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian + AV_PIX_FMT_YUV444P9LE, ///< planar YUV 4:4:4, 27bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian + AV_PIX_FMT_YUV444P10BE,///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian + AV_PIX_FMT_YUV444P10LE,///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian + AV_PIX_FMT_YUV422P9BE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian + AV_PIX_FMT_YUV422P9LE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian + AV_PIX_FMT_VDA_VLD, ///< hardware decoding through VDA + AV_PIX_FMT_GBRP, ///< planar GBR 4:4:4 24bpp + AV_PIX_FMT_GBRP9BE, ///< planar GBR 4:4:4 27bpp, big-endian + AV_PIX_FMT_GBRP9LE, ///< planar GBR 4:4:4 27bpp, little-endian + AV_PIX_FMT_GBRP10BE, ///< planar GBR 4:4:4 30bpp, big-endian + AV_PIX_FMT_GBRP10LE, ///< planar GBR 4:4:4 30bpp, little-endian + AV_PIX_FMT_GBRP16BE, ///< planar GBR 4:4:4 48bpp, big-endian + AV_PIX_FMT_GBRP16LE, ///< planar GBR 4:4:4 48bpp, little-endian + AV_PIX_FMT_YUVA422P, ///< planar YUV 4:2:2 24bpp, (1 Cr & Cb sample per 2x1 Y & A samples) + AV_PIX_FMT_YUVA444P, ///< planar YUV 4:4:4 32bpp, (1 Cr & Cb sample per 1x1 Y & A samples) + AV_PIX_FMT_YUVA420P9BE, ///< planar YUV 4:2:0 22.5bpp, (1 Cr & Cb sample per 2x2 Y & A samples), big-endian + AV_PIX_FMT_YUVA420P9LE, ///< planar YUV 4:2:0 22.5bpp, (1 Cr & Cb sample per 2x2 Y & A samples), little-endian + AV_PIX_FMT_YUVA422P9BE, ///< planar YUV 4:2:2 27bpp, (1 Cr & Cb sample per 2x1 Y & A samples), big-endian + AV_PIX_FMT_YUVA422P9LE, ///< planar YUV 4:2:2 27bpp, (1 Cr & Cb sample per 2x1 Y & A samples), little-endian + AV_PIX_FMT_YUVA444P9BE, ///< planar YUV 4:4:4 36bpp, (1 Cr & Cb sample per 1x1 Y & A samples), big-endian + AV_PIX_FMT_YUVA444P9LE, ///< planar YUV 4:4:4 36bpp, (1 Cr & Cb sample per 1x1 Y & A samples), little-endian + AV_PIX_FMT_YUVA420P10BE, ///< planar YUV 4:2:0 25bpp, (1 Cr & Cb sample per 2x2 Y & A samples, big-endian) + AV_PIX_FMT_YUVA420P10LE, ///< planar YUV 4:2:0 25bpp, (1 Cr & Cb sample per 2x2 Y & A samples, little-endian) + AV_PIX_FMT_YUVA422P10BE, ///< planar YUV 4:2:2 30bpp, (1 Cr & Cb sample per 2x1 Y & A samples, big-endian) + AV_PIX_FMT_YUVA422P10LE, ///< planar YUV 4:2:2 30bpp, (1 Cr & Cb sample per 2x1 Y & A samples, little-endian) + AV_PIX_FMT_YUVA444P10BE, ///< planar YUV 4:4:4 40bpp, (1 Cr & Cb sample per 1x1 Y & A samples, big-endian) + AV_PIX_FMT_YUVA444P10LE, ///< planar YUV 4:4:4 40bpp, (1 Cr & Cb sample per 1x1 Y & A samples, little-endian) + AV_PIX_FMT_YUVA420P16BE, ///< planar YUV 4:2:0 40bpp, (1 Cr & Cb sample per 2x2 Y & A samples, big-endian) + AV_PIX_FMT_YUVA420P16LE, ///< planar YUV 4:2:0 40bpp, (1 Cr & Cb sample per 2x2 Y & A samples, little-endian) + AV_PIX_FMT_YUVA422P16BE, ///< planar YUV 4:2:2 48bpp, (1 Cr & Cb sample per 2x1 Y & A samples, big-endian) + AV_PIX_FMT_YUVA422P16LE, ///< planar YUV 4:2:2 48bpp, (1 Cr & Cb sample per 2x1 Y & A samples, little-endian) + AV_PIX_FMT_YUVA444P16BE, ///< planar YUV 4:4:4 64bpp, (1 Cr & Cb sample per 1x1 Y & A samples, big-endian) + AV_PIX_FMT_YUVA444P16LE, ///< planar YUV 4:4:4 64bpp, (1 Cr & Cb sample per 1x1 Y & A samples, little-endian) + + AV_PIX_FMT_VDPAU, ///< HW acceleration through VDPAU, Picture.data[3] contains a VdpVideoSurface + + AV_PIX_FMT_XYZ12LE, ///< packed XYZ 4:4:4, 36 bpp, (msb) 12X, 12Y, 12Z (lsb), the 2-byte value for each X/Y/Z is stored as little-endian, the 4 lower bits are set to 0 + AV_PIX_FMT_XYZ12BE, ///< packed XYZ 4:4:4, 36 bpp, (msb) 12X, 12Y, 12Z (lsb), the 2-byte value for each X/Y/Z is stored as big-endian, the 4 lower bits are set to 0 + AV_PIX_FMT_NV16, ///< interleaved chroma YUV 4:2:2, 16bpp, (1 Cr & Cb sample per 2x1 Y samples) + AV_PIX_FMT_NV20LE, ///< interleaved chroma YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian + AV_PIX_FMT_NV20BE, ///< interleaved chroma YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian + + AV_PIX_FMT_RGBA64BE, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian + AV_PIX_FMT_RGBA64LE, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian + AV_PIX_FMT_BGRA64BE, ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian + AV_PIX_FMT_BGRA64LE, ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian + + AV_PIX_FMT_YVYU422, ///< packed YUV 4:2:2, 16bpp, Y0 Cr Y1 Cb + + AV_PIX_FMT_VDA, ///< HW acceleration through VDA, data[3] contains a CVPixelBufferRef + + AV_PIX_FMT_YA16BE, ///< 16bit gray, 16bit alpha (big-endian) + AV_PIX_FMT_YA16LE, ///< 16bit gray, 16bit alpha (little-endian) + + AV_PIX_FMT_GBRAP, ///< planar GBRA 4:4:4:4 32bpp + AV_PIX_FMT_GBRAP16BE, ///< planar GBRA 4:4:4:4 64bpp, big-endian + AV_PIX_FMT_GBRAP16LE, ///< planar GBRA 4:4:4:4 64bpp, little-endian + /** + * HW acceleration through QSV, data[3] contains a pointer to the + * mfxFrameSurface1 structure. + */ + AV_PIX_FMT_QSV, + /** + * HW acceleration though MMAL, data[3] contains a pointer to the + * MMAL_BUFFER_HEADER_T structure. + */ + AV_PIX_FMT_MMAL, + + AV_PIX_FMT_D3D11VA_VLD, ///< HW decoding through Direct3D11, Picture.data[3] contains a ID3D11VideoDecoderOutputView pointer + + AV_PIX_FMT_0RGB=0x123+4,///< packed RGB 8:8:8, 32bpp, XRGBXRGB... X=unused/undefined + AV_PIX_FMT_RGB0, ///< packed RGB 8:8:8, 32bpp, RGBXRGBX... X=unused/undefined + AV_PIX_FMT_0BGR, ///< packed BGR 8:8:8, 32bpp, XBGRXBGR... X=unused/undefined + AV_PIX_FMT_BGR0, ///< packed BGR 8:8:8, 32bpp, BGRXBGRX... X=unused/undefined + + AV_PIX_FMT_YUV420P12BE, ///< planar YUV 4:2:0,18bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian + AV_PIX_FMT_YUV420P12LE, ///< planar YUV 4:2:0,18bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian + AV_PIX_FMT_YUV420P14BE, ///< planar YUV 4:2:0,21bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian + AV_PIX_FMT_YUV420P14LE, ///< planar YUV 4:2:0,21bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian + AV_PIX_FMT_YUV422P12BE, ///< planar YUV 4:2:2,24bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian + AV_PIX_FMT_YUV422P12LE, ///< planar YUV 4:2:2,24bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian + AV_PIX_FMT_YUV422P14BE, ///< planar YUV 4:2:2,28bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian + AV_PIX_FMT_YUV422P14LE, ///< planar YUV 4:2:2,28bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian + AV_PIX_FMT_YUV444P12BE, ///< planar YUV 4:4:4,36bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian + AV_PIX_FMT_YUV444P12LE, ///< planar YUV 4:4:4,36bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian + AV_PIX_FMT_YUV444P14BE, ///< planar YUV 4:4:4,42bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian + AV_PIX_FMT_YUV444P14LE, ///< planar YUV 4:4:4,42bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian + AV_PIX_FMT_GBRP12BE, ///< planar GBR 4:4:4 36bpp, big-endian + AV_PIX_FMT_GBRP12LE, ///< planar GBR 4:4:4 36bpp, little-endian + AV_PIX_FMT_GBRP14BE, ///< planar GBR 4:4:4 42bpp, big-endian + AV_PIX_FMT_GBRP14LE, ///< planar GBR 4:4:4 42bpp, little-endian + AV_PIX_FMT_YUVJ411P, ///< planar YUV 4:1:1, 12bpp, (1 Cr & Cb sample per 4x1 Y samples) full scale (JPEG), deprecated in favor of AV_PIX_FMT_YUV411P and setting color_range + + AV_PIX_FMT_BAYER_BGGR8, ///< bayer, BGBG..(odd line), GRGR..(even line), 8-bit samples */ + AV_PIX_FMT_BAYER_RGGB8, ///< bayer, RGRG..(odd line), GBGB..(even line), 8-bit samples */ + AV_PIX_FMT_BAYER_GBRG8, ///< bayer, GBGB..(odd line), RGRG..(even line), 8-bit samples */ + AV_PIX_FMT_BAYER_GRBG8, ///< bayer, GRGR..(odd line), BGBG..(even line), 8-bit samples */ + AV_PIX_FMT_BAYER_BGGR16LE, ///< bayer, BGBG..(odd line), GRGR..(even line), 16-bit samples, little-endian */ + AV_PIX_FMT_BAYER_BGGR16BE, ///< bayer, BGBG..(odd line), GRGR..(even line), 16-bit samples, big-endian */ + AV_PIX_FMT_BAYER_RGGB16LE, ///< bayer, RGRG..(odd line), GBGB..(even line), 16-bit samples, little-endian */ + AV_PIX_FMT_BAYER_RGGB16BE, ///< bayer, RGRG..(odd line), GBGB..(even line), 16-bit samples, big-endian */ + AV_PIX_FMT_BAYER_GBRG16LE, ///< bayer, GBGB..(odd line), RGRG..(even line), 16-bit samples, little-endian */ + AV_PIX_FMT_BAYER_GBRG16BE, ///< bayer, GBGB..(odd line), RGRG..(even line), 16-bit samples, big-endian */ + AV_PIX_FMT_BAYER_GRBG16LE, ///< bayer, GRGR..(odd line), BGBG..(even line), 16-bit samples, little-endian */ + AV_PIX_FMT_BAYER_GRBG16BE, ///< bayer, GRGR..(odd line), BGBG..(even line), 16-bit samples, big-endian */ +#if !FF_API_XVMC + AV_PIX_FMT_XVMC,///< XVideo Motion Acceleration via common packet passing +#endif /* !FF_API_XVMC */ + AV_PIX_FMT_YUV440P10LE, ///< planar YUV 4:4:0,20bpp, (1 Cr & Cb sample per 1x2 Y samples), little-endian + AV_PIX_FMT_YUV440P10BE, ///< planar YUV 4:4:0,20bpp, (1 Cr & Cb sample per 1x2 Y samples), big-endian + AV_PIX_FMT_YUV440P12LE, ///< planar YUV 4:4:0,24bpp, (1 Cr & Cb sample per 1x2 Y samples), little-endian + AV_PIX_FMT_YUV440P12BE, ///< planar YUV 4:4:0,24bpp, (1 Cr & Cb sample per 1x2 Y samples), big-endian + AV_PIX_FMT_AYUV64LE, ///< packed AYUV 4:4:4,64bpp (1 Cr & Cb sample per 1x1 Y & A samples), little-endian + AV_PIX_FMT_AYUV64BE, ///< packed AYUV 4:4:4,64bpp (1 Cr & Cb sample per 1x1 Y & A samples), big-endian + + AV_PIX_FMT_VIDEOTOOLBOX, ///< hardware decoding through Videotoolbox + + AV_PIX_FMT_P010LE, ///< like NV12, with 10bpp per component, data in the high bits, zeros in the low bits, little-endian + AV_PIX_FMT_P010BE, ///< like NV12, with 10bpp per component, data in the high bits, zeros in the low bits, big-endian + + AV_PIX_FMT_NB, ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions +}; + +#define AV_PIX_FMT_Y400A AV_PIX_FMT_GRAY8A +#define AV_PIX_FMT_GBR24P AV_PIX_FMT_GBRP + +#if AV_HAVE_BIGENDIAN +# define AV_PIX_FMT_NE(be, le) AV_PIX_FMT_##be +#else +# define AV_PIX_FMT_NE(be, le) AV_PIX_FMT_##le +#endif + +#define AV_PIX_FMT_RGB32 AV_PIX_FMT_NE(ARGB, BGRA) +#define AV_PIX_FMT_RGB32_1 AV_PIX_FMT_NE(RGBA, ABGR) +#define AV_PIX_FMT_BGR32 AV_PIX_FMT_NE(ABGR, RGBA) +#define AV_PIX_FMT_BGR32_1 AV_PIX_FMT_NE(BGRA, ARGB) +#define AV_PIX_FMT_0RGB32 AV_PIX_FMT_NE(0RGB, BGR0) +#define AV_PIX_FMT_0BGR32 AV_PIX_FMT_NE(0BGR, RGB0) + +#define AV_PIX_FMT_GRAY16 AV_PIX_FMT_NE(GRAY16BE, GRAY16LE) +#define AV_PIX_FMT_YA16 AV_PIX_FMT_NE(YA16BE, YA16LE) +#define AV_PIX_FMT_RGB48 AV_PIX_FMT_NE(RGB48BE, RGB48LE) +#define AV_PIX_FMT_RGB565 AV_PIX_FMT_NE(RGB565BE, RGB565LE) +#define AV_PIX_FMT_RGB555 AV_PIX_FMT_NE(RGB555BE, RGB555LE) +#define AV_PIX_FMT_RGB444 AV_PIX_FMT_NE(RGB444BE, RGB444LE) +#define AV_PIX_FMT_RGBA64 AV_PIX_FMT_NE(RGBA64BE, RGBA64LE) +#define AV_PIX_FMT_BGR48 AV_PIX_FMT_NE(BGR48BE, BGR48LE) +#define AV_PIX_FMT_BGR565 AV_PIX_FMT_NE(BGR565BE, BGR565LE) +#define AV_PIX_FMT_BGR555 AV_PIX_FMT_NE(BGR555BE, BGR555LE) +#define AV_PIX_FMT_BGR444 AV_PIX_FMT_NE(BGR444BE, BGR444LE) +#define AV_PIX_FMT_BGRA64 AV_PIX_FMT_NE(BGRA64BE, BGRA64LE) + +#define AV_PIX_FMT_YUV420P9 AV_PIX_FMT_NE(YUV420P9BE , YUV420P9LE) +#define AV_PIX_FMT_YUV422P9 AV_PIX_FMT_NE(YUV422P9BE , YUV422P9LE) +#define AV_PIX_FMT_YUV444P9 AV_PIX_FMT_NE(YUV444P9BE , YUV444P9LE) +#define AV_PIX_FMT_YUV420P10 AV_PIX_FMT_NE(YUV420P10BE, YUV420P10LE) +#define AV_PIX_FMT_YUV422P10 AV_PIX_FMT_NE(YUV422P10BE, YUV422P10LE) +#define AV_PIX_FMT_YUV440P10 AV_PIX_FMT_NE(YUV440P10BE, YUV440P10LE) +#define AV_PIX_FMT_YUV444P10 AV_PIX_FMT_NE(YUV444P10BE, YUV444P10LE) +#define AV_PIX_FMT_YUV420P12 AV_PIX_FMT_NE(YUV420P12BE, YUV420P12LE) +#define AV_PIX_FMT_YUV422P12 AV_PIX_FMT_NE(YUV422P12BE, YUV422P12LE) +#define AV_PIX_FMT_YUV440P12 AV_PIX_FMT_NE(YUV440P12BE, YUV440P12LE) +#define AV_PIX_FMT_YUV444P12 AV_PIX_FMT_NE(YUV444P12BE, YUV444P12LE) +#define AV_PIX_FMT_YUV420P14 AV_PIX_FMT_NE(YUV420P14BE, YUV420P14LE) +#define AV_PIX_FMT_YUV422P14 AV_PIX_FMT_NE(YUV422P14BE, YUV422P14LE) +#define AV_PIX_FMT_YUV444P14 AV_PIX_FMT_NE(YUV444P14BE, YUV444P14LE) +#define AV_PIX_FMT_YUV420P16 AV_PIX_FMT_NE(YUV420P16BE, YUV420P16LE) +#define AV_PIX_FMT_YUV422P16 AV_PIX_FMT_NE(YUV422P16BE, YUV422P16LE) +#define AV_PIX_FMT_YUV444P16 AV_PIX_FMT_NE(YUV444P16BE, YUV444P16LE) + +#define AV_PIX_FMT_GBRP9 AV_PIX_FMT_NE(GBRP9BE , GBRP9LE) +#define AV_PIX_FMT_GBRP10 AV_PIX_FMT_NE(GBRP10BE, GBRP10LE) +#define AV_PIX_FMT_GBRP12 AV_PIX_FMT_NE(GBRP12BE, GBRP12LE) +#define AV_PIX_FMT_GBRP14 AV_PIX_FMT_NE(GBRP14BE, GBRP14LE) +#define AV_PIX_FMT_GBRP16 AV_PIX_FMT_NE(GBRP16BE, GBRP16LE) +#define AV_PIX_FMT_GBRAP16 AV_PIX_FMT_NE(GBRAP16BE, GBRAP16LE) + +#define AV_PIX_FMT_BAYER_BGGR16 AV_PIX_FMT_NE(BAYER_BGGR16BE, BAYER_BGGR16LE) +#define AV_PIX_FMT_BAYER_RGGB16 AV_PIX_FMT_NE(BAYER_RGGB16BE, BAYER_RGGB16LE) +#define AV_PIX_FMT_BAYER_GBRG16 AV_PIX_FMT_NE(BAYER_GBRG16BE, BAYER_GBRG16LE) +#define AV_PIX_FMT_BAYER_GRBG16 AV_PIX_FMT_NE(BAYER_GRBG16BE, BAYER_GRBG16LE) + + +#define AV_PIX_FMT_YUVA420P9 AV_PIX_FMT_NE(YUVA420P9BE , YUVA420P9LE) +#define AV_PIX_FMT_YUVA422P9 AV_PIX_FMT_NE(YUVA422P9BE , YUVA422P9LE) +#define AV_PIX_FMT_YUVA444P9 AV_PIX_FMT_NE(YUVA444P9BE , YUVA444P9LE) +#define AV_PIX_FMT_YUVA420P10 AV_PIX_FMT_NE(YUVA420P10BE, YUVA420P10LE) +#define AV_PIX_FMT_YUVA422P10 AV_PIX_FMT_NE(YUVA422P10BE, YUVA422P10LE) +#define AV_PIX_FMT_YUVA444P10 AV_PIX_FMT_NE(YUVA444P10BE, YUVA444P10LE) +#define AV_PIX_FMT_YUVA420P16 AV_PIX_FMT_NE(YUVA420P16BE, YUVA420P16LE) +#define AV_PIX_FMT_YUVA422P16 AV_PIX_FMT_NE(YUVA422P16BE, YUVA422P16LE) +#define AV_PIX_FMT_YUVA444P16 AV_PIX_FMT_NE(YUVA444P16BE, YUVA444P16LE) + +#define AV_PIX_FMT_XYZ12 AV_PIX_FMT_NE(XYZ12BE, XYZ12LE) +#define AV_PIX_FMT_NV20 AV_PIX_FMT_NE(NV20BE, NV20LE) +#define AV_PIX_FMT_AYUV64 AV_PIX_FMT_NE(AYUV64BE, AYUV64LE) +#define AV_PIX_FMT_P010 AV_PIX_FMT_NE(P010BE, P010LE) + +/** + * Chromaticity coordinates of the source primaries. + */ +enum AVColorPrimaries { + AVCOL_PRI_RESERVED0 = 0, + AVCOL_PRI_BT709 = 1, ///< also ITU-R BT1361 / IEC 61966-2-4 / SMPTE RP177 Annex B + AVCOL_PRI_UNSPECIFIED = 2, + AVCOL_PRI_RESERVED = 3, + AVCOL_PRI_BT470M = 4, ///< also FCC Title 47 Code of Federal Regulations 73.682 (a)(20) + + AVCOL_PRI_BT470BG = 5, ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R BT1700 625 PAL & SECAM + AVCOL_PRI_SMPTE170M = 6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC + AVCOL_PRI_SMPTE240M = 7, ///< functionally identical to above + AVCOL_PRI_FILM = 8, ///< colour filters using Illuminant C + AVCOL_PRI_BT2020 = 9, ///< ITU-R BT2020 + AVCOL_PRI_SMPTEST428_1= 10, ///< SMPTE ST 428-1 (CIE 1931 XYZ) + AVCOL_PRI_NB, ///< Not part of ABI +}; + +/** + * Color Transfer Characteristic. + */ +enum AVColorTransferCharacteristic { + AVCOL_TRC_RESERVED0 = 0, + AVCOL_TRC_BT709 = 1, ///< also ITU-R BT1361 + AVCOL_TRC_UNSPECIFIED = 2, + AVCOL_TRC_RESERVED = 3, + AVCOL_TRC_GAMMA22 = 4, ///< also ITU-R BT470M / ITU-R BT1700 625 PAL & SECAM + AVCOL_TRC_GAMMA28 = 5, ///< also ITU-R BT470BG + AVCOL_TRC_SMPTE170M = 6, ///< also ITU-R BT601-6 525 or 625 / ITU-R BT1358 525 or 625 / ITU-R BT1700 NTSC + AVCOL_TRC_SMPTE240M = 7, + AVCOL_TRC_LINEAR = 8, ///< "Linear transfer characteristics" + AVCOL_TRC_LOG = 9, ///< "Logarithmic transfer characteristic (100:1 range)" + AVCOL_TRC_LOG_SQRT = 10, ///< "Logarithmic transfer characteristic (100 * Sqrt(10) : 1 range)" + AVCOL_TRC_IEC61966_2_4 = 11, ///< IEC 61966-2-4 + AVCOL_TRC_BT1361_ECG = 12, ///< ITU-R BT1361 Extended Colour Gamut + AVCOL_TRC_IEC61966_2_1 = 13, ///< IEC 61966-2-1 (sRGB or sYCC) + AVCOL_TRC_BT2020_10 = 14, ///< ITU-R BT2020 for 10 bit system + AVCOL_TRC_BT2020_12 = 15, ///< ITU-R BT2020 for 12 bit system + AVCOL_TRC_SMPTEST2084 = 16, ///< SMPTE ST 2084 for 10, 12, 14 and 16 bit systems + AVCOL_TRC_SMPTEST428_1 = 17, ///< SMPTE ST 428-1 + AVCOL_TRC_NB, ///< Not part of ABI +}; + +/** + * YUV colorspace type. + */ +enum AVColorSpace { + AVCOL_SPC_RGB = 0, ///< order of coefficients is actually GBR, also IEC 61966-2-1 (sRGB) + AVCOL_SPC_BT709 = 1, ///< also ITU-R BT1361 / IEC 61966-2-4 xvYCC709 / SMPTE RP177 Annex B + AVCOL_SPC_UNSPECIFIED = 2, + AVCOL_SPC_RESERVED = 3, + AVCOL_SPC_FCC = 4, ///< FCC Title 47 Code of Federal Regulations 73.682 (a)(20) + AVCOL_SPC_BT470BG = 5, ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R BT1700 625 PAL & SECAM / IEC 61966-2-4 xvYCC601 + AVCOL_SPC_SMPTE170M = 6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC / functionally identical to above + AVCOL_SPC_SMPTE240M = 7, + AVCOL_SPC_YCOCG = 8, ///< Used by Dirac / VC-2 and H.264 FRext, see ITU-T SG16 + AVCOL_SPC_BT2020_NCL = 9, ///< ITU-R BT2020 non-constant luminance system + AVCOL_SPC_BT2020_CL = 10, ///< ITU-R BT2020 constant luminance system + AVCOL_SPC_NB, ///< Not part of ABI +}; +#define AVCOL_SPC_YCGCO AVCOL_SPC_YCOCG + + +/** + * MPEG vs JPEG YUV range. + */ +enum AVColorRange { + AVCOL_RANGE_UNSPECIFIED = 0, + AVCOL_RANGE_MPEG = 1, ///< the normal 219*2^(n-8) "MPEG" YUV ranges + AVCOL_RANGE_JPEG = 2, ///< the normal 2^n-1 "JPEG" YUV ranges + AVCOL_RANGE_NB, ///< Not part of ABI +}; + +/** + * Location of chroma samples. + * + * Illustration showing the location of the first (top left) chroma sample of the + * image, the left shows only luma, the right + * shows the location of the chroma sample, the 2 could be imagined to overlay + * each other but are drawn separately due to limitations of ASCII + * + * 1st 2nd 1st 2nd horizontal luma sample positions + * v v v v + * ______ ______ + *1st luma line > |X X ... |3 4 X ... X are luma samples, + * | |1 2 1-6 are possible chroma positions + *2nd luma line > |X X ... |5 6 X ... 0 is undefined/unknown position + */ +enum AVChromaLocation { + AVCHROMA_LOC_UNSPECIFIED = 0, + AVCHROMA_LOC_LEFT = 1, ///< mpeg2/4 4:2:0, h264 default for 4:2:0 + AVCHROMA_LOC_CENTER = 2, ///< mpeg1 4:2:0, jpeg 4:2:0, h263 4:2:0 + AVCHROMA_LOC_TOPLEFT = 3, ///< ITU-R 601, SMPTE 274M 296M S314M(DV 4:1:1), mpeg2 4:2:2 + AVCHROMA_LOC_TOP = 4, + AVCHROMA_LOC_BOTTOMLEFT = 5, + AVCHROMA_LOC_BOTTOM = 6, + AVCHROMA_LOC_NB, ///< Not part of ABI +}; + +#endif /* AVUTIL_PIXFMT_H */ diff --git a/ext/at3_standalone/rational.h b/ext/at3_standalone/rational.h new file mode 100644 index 0000000000..2897469680 --- /dev/null +++ b/ext/at3_standalone/rational.h @@ -0,0 +1,173 @@ +/* + * rational numbers + * Copyright (c) 2003 Michael Niedermayer + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + * rational numbers + * @author Michael Niedermayer + */ + +#ifndef AVUTIL_RATIONAL_H +#define AVUTIL_RATIONAL_H + +#include +#include +#include "attributes.h" + +/** + * @addtogroup lavu_math + * @{ + */ + +/** + * rational number numerator/denominator + */ +typedef struct AVRational{ + int num; ///< numerator + int den; ///< denominator +} AVRational; + +/** + * Create a rational. + * Useful for compilers that do not support compound literals. + * @note The return value is not reduced. + */ +static inline AVRational av_make_q(int num, int den) +{ + AVRational r = { num, den }; + return r; +} + +/** + * Compare two rationals. + * @param a first rational + * @param b second rational + * @return 0 if a==b, 1 if a>b, -1 if a>63)|1; + else if(b.den && a.den) return 0; + else if(a.num && b.num) return (a.num>>31) - (b.num>>31); + else return INT_MIN; +} + +/** + * Convert rational to double. + * @param a rational to convert + * @return (double) a + */ +static inline double av_q2d(AVRational a){ + return a.num / (double) a.den; +} + +/** + * Reduce a fraction. + * This is useful for framerate calculations. + * @param dst_num destination numerator + * @param dst_den destination denominator + * @param num source numerator + * @param den source denominator + * @param max the maximum allowed for dst_num & dst_den + * @return 1 if exact, 0 otherwise + */ +int av_reduce(int *dst_num, int *dst_den, int64_t num, int64_t den, int64_t max); + +/** + * Multiply two rationals. + * @param b first rational + * @param c second rational + * @return b*c + */ +AVRational av_mul_q(AVRational b, AVRational c) av_const; + +/** + * Divide one rational by another. + * @param b first rational + * @param c second rational + * @return b/c + */ +AVRational av_div_q(AVRational b, AVRational c) av_const; + +/** + * Add two rationals. + * @param b first rational + * @param c second rational + * @return b+c + */ +AVRational av_add_q(AVRational b, AVRational c) av_const; + +/** + * Subtract one rational from another. + * @param b first rational + * @param c second rational + * @return b-c + */ +AVRational av_sub_q(AVRational b, AVRational c) av_const; + +/** + * Invert a rational. + * @param q value + * @return 1 / q + */ +static av_always_inline AVRational av_inv_q(AVRational q) +{ + AVRational r = { q.den, q.num }; + return r; +} + +/** + * Convert a double precision floating point number to a rational. + * inf is expressed as {1,0} or {-1,0} depending on the sign. + * + * @param d double to convert + * @param max the maximum allowed numerator and denominator + * @return (AVRational) d + */ +AVRational av_d2q(double d, int max) av_const; + +/** + * @return 1 if q1 is nearer to q than q2, -1 if q2 is nearer + * than q1, 0 if they have the same distance. + */ +int av_nearer_q(AVRational q, AVRational q1, AVRational q2); + +/** + * Find the nearest value in q_list to q. + * @param q_list an array of rationals terminated by {0, 0} + * @return the index of the nearest value found in the array + */ +int av_find_nearest_q_idx(AVRational q, const AVRational* q_list); + +/** + * Converts a AVRational to a IEEE 32bit float. + * + * The float is returned in a uint32_t and its value is platform indepenant. + */ +uint32_t av_q2intfloat(AVRational q); + +/** + * @} + */ + +#endif /* AVUTIL_RATIONAL_H */ diff --git a/ext/at3_standalone/rdft.c b/ext/at3_standalone/rdft.c new file mode 100644 index 0000000000..c318aa8394 --- /dev/null +++ b/ext/at3_standalone/rdft.c @@ -0,0 +1,135 @@ +/* + * (I)RDFT transforms + * Copyright (c) 2009 Alex Converse + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ +#include +#include +#include "libavutil/mathematics.h" +#include "rdft.h" + +/** + * @file + * (Inverse) Real Discrete Fourier Transforms. + */ + +/* sin(2*pi*x/n) for 0<=xnbits; + const float k1 = 0.5; + const float k2 = 0.5 - s->inverse; + const FFTSample *tcos = s->tcos; + const FFTSample *tsin = s->tsin; + + if (!s->inverse) { + s->fft.fft_permute(&s->fft, (FFTComplex*)data); + s->fft.fft_calc(&s->fft, (FFTComplex*)data); + } + /* i=0 is a special case because of packing, the DC term is real, so we + are going to throw the N/2 term (also real) in with it. */ + ev.re = data[0]; + data[0] = ev.re+data[1]; + data[1] = ev.re-data[1]; + for (i = 1; i < (n>>2); i++) { + i1 = 2*i; + i2 = n-i1; + /* Separate even and odd FFTs */ + ev.re = k1*(data[i1 ]+data[i2 ]); + od.im = -k2*(data[i1 ]-data[i2 ]); + ev.im = k1*(data[i1+1]-data[i2+1]); + od.re = k2*(data[i1+1]+data[i2+1]); + /* Apply twiddle factors to the odd FFT and add to the even FFT */ + data[i1 ] = ev.re + od.re*tcos[i] - od.im*tsin[i]; + data[i1+1] = ev.im + od.im*tcos[i] + od.re*tsin[i]; + data[i2 ] = ev.re - od.re*tcos[i] + od.im*tsin[i]; + data[i2+1] = -ev.im + od.im*tcos[i] + od.re*tsin[i]; + } + data[2*i+1]=s->sign_convention*data[2*i+1]; + if (s->inverse) { + data[0] *= k1; + data[1] *= k1; + s->fft.fft_permute(&s->fft, (FFTComplex*)data); + s->fft.fft_calc(&s->fft, (FFTComplex*)data); + } +} + +av_cold int ff_rdft_init(RDFTContext *s, int nbits, enum RDFTransformType trans) +{ + int n = 1 << nbits; + int ret; + + s->nbits = nbits; + s->inverse = trans == IDFT_C2R || trans == DFT_C2R; + s->sign_convention = trans == IDFT_R2C || trans == DFT_C2R ? 1 : -1; + + if (nbits < 4 || nbits > 16) + return AVERROR(EINVAL); + + if ((ret = ff_fft_init(&s->fft, nbits-1, trans == IDFT_C2R || trans == IDFT_R2C)) < 0) + return ret; + + ff_init_ff_cos_tabs(nbits); + s->tcos = ff_cos_tabs[nbits]; + s->tsin = ff_sin_tabs[nbits]+(trans == DFT_R2C || trans == DFT_C2R)*(n>>2); +#if !CONFIG_HARDCODED_TABLES + { + int i; + const double theta = (trans == DFT_R2C || trans == DFT_C2R ? -1 : 1) * 2 * M_PI / n; + for (i = 0; i < (n >> 2); i++) + s->tsin[i] = sin(i * theta); + } +#endif + s->rdft_calc = rdft_calc_c; + + if (ARCH_ARM) ff_rdft_init_arm(s); + + return 0; +} + +av_cold void ff_rdft_end(RDFTContext *s) +{ + ff_fft_end(&s->fft); +} diff --git a/ext/at3_standalone/rdft.h b/ext/at3_standalone/rdft.h new file mode 100644 index 0000000000..37c40e7c80 --- /dev/null +++ b/ext/at3_standalone/rdft.h @@ -0,0 +1,74 @@ +/* + * (I)RDFT transforms + * Copyright (c) 2009 Alex Converse + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#if !defined(AVCODEC_RDFT_H) && (!defined(FFT_FLOAT) || FFT_FLOAT) +#define AVCODEC_RDFT_H + +#include "config.h" +#include "fft.h" + +#if CONFIG_HARDCODED_TABLES +# define SINTABLE_CONST const +#else +# define SINTABLE_CONST +#endif + +#define SINTABLE(size) \ + SINTABLE_CONST DECLARE_ALIGNED(16, FFTSample, ff_sin_##size)[size/2] + +extern SINTABLE(16); +extern SINTABLE(32); +extern SINTABLE(64); +extern SINTABLE(128); +extern SINTABLE(256); +extern SINTABLE(512); +extern SINTABLE(1024); +extern SINTABLE(2048); +extern SINTABLE(4096); +extern SINTABLE(8192); +extern SINTABLE(16384); +extern SINTABLE(32768); +extern SINTABLE(65536); + +struct RDFTContext { + int nbits; + int inverse; + int sign_convention; + + /* pre/post rotation tables */ + const FFTSample *tcos; + SINTABLE_CONST FFTSample *tsin; + FFTContext fft; + void (*rdft_calc)(struct RDFTContext *s, FFTSample *z); +}; + +/** + * Set up a real FFT. + * @param nbits log2 of the length of the input array + * @param trans the type of transform + */ +int ff_rdft_init(RDFTContext *s, int nbits, enum RDFTransformType trans); +void ff_rdft_end(RDFTContext *s); + +void ff_rdft_init_arm(RDFTContext *s); + + +#endif /* AVCODEC_RDFT_H */ diff --git a/ext/at3_standalone/samplefmt.h b/ext/at3_standalone/samplefmt.h new file mode 100644 index 0000000000..6a8a031c02 --- /dev/null +++ b/ext/at3_standalone/samplefmt.h @@ -0,0 +1,271 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVUTIL_SAMPLEFMT_H +#define AVUTIL_SAMPLEFMT_H + +#include + +#include "avutil.h" +#include "attributes.h" + +/** + * @addtogroup lavu_audio + * @{ + * + * @defgroup lavu_sampfmts Audio sample formats + * + * Audio sample format enumeration and related convenience functions. + * @{ + * + */ + +/** + * Audio sample formats + * + * - The data described by the sample format is always in native-endian order. + * Sample values can be expressed by native C types, hence the lack of a signed + * 24-bit sample format even though it is a common raw audio data format. + * + * - The floating-point formats are based on full volume being in the range + * [-1.0, 1.0]. Any values outside this range are beyond full volume level. + * + * - The data layout as used in av_samples_fill_arrays() and elsewhere in FFmpeg + * (such as AVFrame in libavcodec) is as follows: + * + * @par + * For planar sample formats, each audio channel is in a separate data plane, + * and linesize is the buffer size, in bytes, for a single plane. All data + * planes must be the same size. For packed sample formats, only the first data + * plane is used, and samples for each channel are interleaved. In this case, + * linesize is the buffer size, in bytes, for the 1 plane. + * + */ +enum AVSampleFormat { + AV_SAMPLE_FMT_NONE = -1, + AV_SAMPLE_FMT_U8, ///< unsigned 8 bits + AV_SAMPLE_FMT_S16, ///< signed 16 bits + AV_SAMPLE_FMT_S32, ///< signed 32 bits + AV_SAMPLE_FMT_FLT, ///< float + AV_SAMPLE_FMT_DBL, ///< double + + AV_SAMPLE_FMT_U8P, ///< unsigned 8 bits, planar + AV_SAMPLE_FMT_S16P, ///< signed 16 bits, planar + AV_SAMPLE_FMT_S32P, ///< signed 32 bits, planar + AV_SAMPLE_FMT_FLTP, ///< float, planar + AV_SAMPLE_FMT_DBLP, ///< double, planar + + AV_SAMPLE_FMT_NB ///< Number of sample formats. DO NOT USE if linking dynamically +}; + +/** + * Return the name of sample_fmt, or NULL if sample_fmt is not + * recognized. + */ +const char *av_get_sample_fmt_name(enum AVSampleFormat sample_fmt); + +/** + * Return a sample format corresponding to name, or AV_SAMPLE_FMT_NONE + * on error. + */ +enum AVSampleFormat av_get_sample_fmt(const char *name); + +/** + * Return the planar<->packed alternative form of the given sample format, or + * AV_SAMPLE_FMT_NONE on error. If the passed sample_fmt is already in the + * requested planar/packed format, the format returned is the same as the + * input. + */ +enum AVSampleFormat av_get_alt_sample_fmt(enum AVSampleFormat sample_fmt, int planar); + +/** + * Get the packed alternative form of the given sample format. + * + * If the passed sample_fmt is already in packed format, the format returned is + * the same as the input. + * + * @return the packed alternative form of the given sample format or + AV_SAMPLE_FMT_NONE on error. + */ +enum AVSampleFormat av_get_packed_sample_fmt(enum AVSampleFormat sample_fmt); + +/** + * Get the planar alternative form of the given sample format. + * + * If the passed sample_fmt is already in planar format, the format returned is + * the same as the input. + * + * @return the planar alternative form of the given sample format or + AV_SAMPLE_FMT_NONE on error. + */ +enum AVSampleFormat av_get_planar_sample_fmt(enum AVSampleFormat sample_fmt); + +/** + * Generate a string corresponding to the sample format with + * sample_fmt, or a header if sample_fmt is negative. + * + * @param buf the buffer where to write the string + * @param buf_size the size of buf + * @param sample_fmt the number of the sample format to print the + * corresponding info string, or a negative value to print the + * corresponding header. + * @return the pointer to the filled buffer or NULL if sample_fmt is + * unknown or in case of other errors + */ +char *av_get_sample_fmt_string(char *buf, int buf_size, enum AVSampleFormat sample_fmt); + +/** + * Return number of bytes per sample. + * + * @param sample_fmt the sample format + * @return number of bytes per sample or zero if unknown for the given + * sample format + */ +int av_get_bytes_per_sample(enum AVSampleFormat sample_fmt); + +/** + * Check if the sample format is planar. + * + * @param sample_fmt the sample format to inspect + * @return 1 if the sample format is planar, 0 if it is interleaved + */ +int av_sample_fmt_is_planar(enum AVSampleFormat sample_fmt); + +/** + * Get the required buffer size for the given audio parameters. + * + * @param[out] linesize calculated linesize, may be NULL + * @param nb_channels the number of channels + * @param nb_samples the number of samples in a single channel + * @param sample_fmt the sample format + * @param align buffer size alignment (0 = default, 1 = no alignment) + * @return required buffer size, or negative error code on failure + */ +int av_samples_get_buffer_size(int *linesize, int nb_channels, int nb_samples, + enum AVSampleFormat sample_fmt, int align); + +/** + * @} + * + * @defgroup lavu_sampmanip Samples manipulation + * + * Functions that manipulate audio samples + * @{ + */ + +/** + * Fill plane data pointers and linesize for samples with sample + * format sample_fmt. + * + * The audio_data array is filled with the pointers to the samples data planes: + * for planar, set the start point of each channel's data within the buffer, + * for packed, set the start point of the entire buffer only. + * + * The value pointed to by linesize is set to the aligned size of each + * channel's data buffer for planar layout, or to the aligned size of the + * buffer for all channels for packed layout. + * + * The buffer in buf must be big enough to contain all the samples + * (use av_samples_get_buffer_size() to compute its minimum size), + * otherwise the audio_data pointers will point to invalid data. + * + * @see enum AVSampleFormat + * The documentation for AVSampleFormat describes the data layout. + * + * @param[out] audio_data array to be filled with the pointer for each channel + * @param[out] linesize calculated linesize, may be NULL + * @param buf the pointer to a buffer containing the samples + * @param nb_channels the number of channels + * @param nb_samples the number of samples in a single channel + * @param sample_fmt the sample format + * @param align buffer size alignment (0 = default, 1 = no alignment) + * @return >=0 on success or a negative error code on failure + * @todo return minimum size in bytes required for the buffer in case + * of success at the next bump + */ +int av_samples_fill_arrays(uint8_t **audio_data, int *linesize, + const uint8_t *buf, + int nb_channels, int nb_samples, + enum AVSampleFormat sample_fmt, int align); + +/** + * Allocate a samples buffer for nb_samples samples, and fill data pointers and + * linesize accordingly. + * The allocated samples buffer can be freed by using av_freep(&audio_data[0]) + * Allocated data will be initialized to silence. + * + * @see enum AVSampleFormat + * The documentation for AVSampleFormat describes the data layout. + * + * @param[out] audio_data array to be filled with the pointer for each channel + * @param[out] linesize aligned size for audio buffer(s), may be NULL + * @param nb_channels number of audio channels + * @param nb_samples number of samples per channel + * @param align buffer size alignment (0 = default, 1 = no alignment) + * @return >=0 on success or a negative error code on failure + * @todo return the size of the allocated buffer in case of success at the next bump + * @see av_samples_fill_arrays() + * @see av_samples_alloc_array_and_samples() + */ +int av_samples_alloc(uint8_t **audio_data, int *linesize, int nb_channels, + int nb_samples, enum AVSampleFormat sample_fmt, int align); + +/** + * Allocate a data pointers array, samples buffer for nb_samples + * samples, and fill data pointers and linesize accordingly. + * + * This is the same as av_samples_alloc(), but also allocates the data + * pointers array. + * + * @see av_samples_alloc() + */ +int av_samples_alloc_array_and_samples(uint8_t ***audio_data, int *linesize, int nb_channels, + int nb_samples, enum AVSampleFormat sample_fmt, int align); + +/** + * Copy samples from src to dst. + * + * @param dst destination array of pointers to data planes + * @param src source array of pointers to data planes + * @param dst_offset offset in samples at which the data will be written to dst + * @param src_offset offset in samples at which the data will be read from src + * @param nb_samples number of samples to be copied + * @param nb_channels number of audio channels + * @param sample_fmt audio sample format + */ +int av_samples_copy(uint8_t **dst, uint8_t * const *src, int dst_offset, + int src_offset, int nb_samples, int nb_channels, + enum AVSampleFormat sample_fmt); + +/** + * Fill an audio buffer with silence. + * + * @param audio_data array of pointers to data planes + * @param offset offset in samples at which to start filling + * @param nb_samples number of samples to fill + * @param nb_channels number of audio channels + * @param sample_fmt audio sample format + */ +int av_samples_set_silence(uint8_t **audio_data, int offset, int nb_samples, + int nb_channels, enum AVSampleFormat sample_fmt); + +/** + * @} + * @} + */ +#endif /* AVUTIL_SAMPLEFMT_H */ diff --git a/ext/at3_standalone/sinewin.c b/ext/at3_standalone/sinewin.c new file mode 100644 index 0000000000..4532dc7354 --- /dev/null +++ b/ext/at3_standalone/sinewin.c @@ -0,0 +1,21 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#define USE_FIXED 0 +#include "sinewin.h" +#include "sinewin_tablegen.h" diff --git a/ext/at3_standalone/sinewin.h b/ext/at3_standalone/sinewin.h new file mode 100644 index 0000000000..6154fbbaa1 --- /dev/null +++ b/ext/at3_standalone/sinewin.h @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2008 Robert Swain + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVCODEC_SINEWIN_H +#define AVCODEC_SINEWIN_H + +#include "config.h" +#include "mem.h" +#include "aac_defines.h" + +#if CONFIG_HARDCODED_TABLES +# define SINETABLE_CONST const +#else +# define SINETABLE_CONST +#endif + +#ifndef USE_FIXED +#define USE_FIXED 0 +#endif + +#define SINETABLE(size) \ + SINETABLE_CONST DECLARE_ALIGNED(32, INTFLOAT, AAC_RENAME(ff_sine_##size))[size] + +/** + * Generate a sine window. + * @param window pointer to half window + * @param n size of half window + */ +void AAC_RENAME(ff_sine_window_init)(INTFLOAT *window, int n); + +/** + * initialize the specified entry of ff_sine_windows + */ +void AAC_RENAME(ff_init_ff_sine_windows)(int index); + +extern SINETABLE( 32); +extern SINETABLE( 64); +extern SINETABLE( 128); +extern SINETABLE( 256); +extern SINETABLE( 512); +extern SINETABLE(1024); +extern SINETABLE(2048); +extern SINETABLE(4096); +extern SINETABLE(8192); + +extern SINETABLE_CONST INTFLOAT * const AAC_RENAME(ff_sine_windows)[14]; + +#endif /* AVCODEC_SINEWIN_H */ diff --git a/ext/at3_standalone/sinewin_tablegen.c b/ext/at3_standalone/sinewin_tablegen.c new file mode 100644 index 0000000000..dd602668ee --- /dev/null +++ b/ext/at3_standalone/sinewin_tablegen.c @@ -0,0 +1,24 @@ +/* + * Generate a header file for hardcoded sine windows + * + * Copyright (c) 2009 Reimar Döffinger + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#define USE_FIXED 0 +#include "sinewin_tablegen_template.c" diff --git a/ext/at3_standalone/sinewin_tablegen.h b/ext/at3_standalone/sinewin_tablegen.h new file mode 100644 index 0000000000..4432135f19 --- /dev/null +++ b/ext/at3_standalone/sinewin_tablegen.h @@ -0,0 +1,79 @@ +/* + * Header file for hardcoded sine windows + * + * Copyright (c) 2009 Reimar Döffinger + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVCODEC_SINEWIN_TABLEGEN_H +#define AVCODEC_SINEWIN_TABLEGEN_H + +#include +// do not use libavutil/libm.h since this is compiled both +// for the host and the target and config.h is only valid for the target +#include +#include "libavcodec/aac_defines.h" +#include "libavutil/attributes.h" +#include "libavutil/common.h" + +#if !CONFIG_HARDCODED_TABLES +SINETABLE( 32); +SINETABLE( 64); +SINETABLE( 128); +SINETABLE( 256); +SINETABLE( 512); +SINETABLE(1024); +SINETABLE(2048); +SINETABLE(4096); +SINETABLE(8192); +#else +#if USE_FIXED +#include "libavcodec/sinewin_fixed_tables.h" +#else +#include "libavcodec/sinewin_tables.h" +#endif +#endif + +#if USE_FIXED +#define SIN_FIX(a) (int)floor((a) * 0x80000000 + 0.5) +#else +#define SIN_FIX(a) a +#endif + +SINETABLE_CONST INTFLOAT * const AAC_RENAME(ff_sine_windows)[] = { + NULL, NULL, NULL, NULL, NULL, // unused + AAC_RENAME(ff_sine_32) , AAC_RENAME(ff_sine_64), AAC_RENAME(ff_sine_128), + AAC_RENAME(ff_sine_256), AAC_RENAME(ff_sine_512), AAC_RENAME(ff_sine_1024), + AAC_RENAME(ff_sine_2048), AAC_RENAME(ff_sine_4096), AAC_RENAME(ff_sine_8192) +}; + +// Generate a sine window. +av_cold void AAC_RENAME(ff_sine_window_init)(INTFLOAT *window, int n) { + int i; + for(i = 0; i < n; i++) + window[i] = SIN_FIX(sinf((i + 0.5) * (M_PI / (2.0 * n)))); +} + +av_cold void AAC_RENAME(ff_init_ff_sine_windows)(int index) { + assert(index >= 0 && index < FF_ARRAY_ELEMS(AAC_RENAME(ff_sine_windows))); +#if !CONFIG_HARDCODED_TABLES + AAC_RENAME(ff_sine_window_init)(AAC_RENAME(ff_sine_windows)[index], 1 << index); +#endif +} + +#endif /* AVCODEC_SINEWIN_TABLEGEN_H */ diff --git a/ext/at3_standalone/version.h b/ext/at3_standalone/version.h new file mode 100644 index 0000000000..0ea8c79467 --- /dev/null +++ b/ext/at3_standalone/version.h @@ -0,0 +1,128 @@ +/* + * copyright (c) 2003 Fabrice Bellard + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVUTIL_VERSION_H +#define AVUTIL_VERSION_H + +#include "macros.h" + +/** + * @addtogroup version_utils + * + * Useful to check and match library version in order to maintain + * backward compatibility. + * + * @{ + */ + +#define AV_VERSION_INT(a, b, c) ((a)<<16 | (b)<<8 | (c)) +#define AV_VERSION_DOT(a, b, c) a ##.## b ##.## c +#define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c) + +/** + * Extract version components from the full ::AV_VERSION_INT int as returned + * by functions like ::avformat_version() and ::avcodec_version() + */ +#define AV_VERSION_MAJOR(a) ((a) >> 16) +#define AV_VERSION_MINOR(a) (((a) & 0x00FF00) >> 8) +#define AV_VERSION_MICRO(a) ((a) & 0xFF) + +/** + * @} + */ + +/** + * @file + * @ingroup lavu + * Libavutil version macros + */ + +/** + * @defgroup lavu_ver Version and Build diagnostics + * + * Macros and function useful to check at compiletime and at runtime + * which version of libavutil is in use. + * + * @{ + */ + +#define LIBAVUTIL_VERSION_MAJOR 55 +#define LIBAVUTIL_VERSION_MINOR 17 +#define LIBAVUTIL_VERSION_MICRO 103 + +#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ + LIBAVUTIL_VERSION_MINOR, \ + LIBAVUTIL_VERSION_MICRO) +#define LIBAVUTIL_VERSION AV_VERSION(LIBAVUTIL_VERSION_MAJOR, \ + LIBAVUTIL_VERSION_MINOR, \ + LIBAVUTIL_VERSION_MICRO) +#define LIBAVUTIL_BUILD LIBAVUTIL_VERSION_INT + +#define LIBAVUTIL_IDENT "Lavu" AV_STRINGIFY(LIBAVUTIL_VERSION) + +/** + * @} + * + * @defgroup depr_guards Deprecation guards + * FF_API_* defines may be placed below to indicate public API that will be + * dropped at a future version bump. The defines themselves are not part of + * the public API and may change, break or disappear at any time. + * + * @note, when bumping the major version it is recommended to manually + * disable each FF_API_* in its own commit instead of disabling them all + * at once through the bump. This improves the git bisect-ability of the change. + * + * @{ + */ + +#ifndef FF_API_VDPAU +#define FF_API_VDPAU (LIBAVUTIL_VERSION_MAJOR < 56) +#endif +#ifndef FF_API_XVMC +#define FF_API_XVMC (LIBAVUTIL_VERSION_MAJOR < 56) +#endif +#ifndef FF_API_OPT_TYPE_METADATA +#define FF_API_OPT_TYPE_METADATA (LIBAVUTIL_VERSION_MAJOR < 56) +#endif +#ifndef FF_API_DLOG +#define FF_API_DLOG (LIBAVUTIL_VERSION_MAJOR < 56) +#endif +#ifndef FF_API_VAAPI +#define FF_API_VAAPI (LIBAVUTIL_VERSION_MAJOR < 56) +#endif +#ifndef FF_API_FRAME_QP +#define FF_API_FRAME_QP (LIBAVUTIL_VERSION_MAJOR < 56) +#endif +#ifndef FF_API_PLUS1_MINUS1 +#define FF_API_PLUS1_MINUS1 (LIBAVUTIL_VERSION_MAJOR < 56) +#endif +#ifndef FF_API_ERROR_FRAME +#define FF_API_ERROR_FRAME (LIBAVUTIL_VERSION_MAJOR < 56) +#endif +#ifndef FF_API_CRC_BIG_TABLE +#define FF_API_CRC_BIG_TABLE (LIBAVUTIL_VERSION_MAJOR < 56) +#endif + + +/** + * @} + */ + +#endif /* AVUTIL_VERSION_H */ From c9029736886fef7463c4e2c1c7f0ec9ad1334876 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Wed, 10 Apr 2024 18:26:09 +0200 Subject: [PATCH 066/719] Setup more of the setup --- Common/Common.vcxproj | 6 + Common/Common.vcxproj.filters | 18 + Common/compat.c | 19 + Core/Core.vcxproj | 2 + Core/Core.vcxproj.filters | 6 + Core/HW/Atrac3Standalone.cpp | 55 +++ Core/HW/Atrac3Standalone.h | 5 + Core/HW/SimpleAudioDec.cpp | 3 + ext/at3_standalone/at3_decoders.h | 16 + ext/at3_standalone/atrac3plusdec.c | 16 +- ext/at3_standalone/frame.c | 742 +++++++++++++++++++++++++++++ ext/at3_standalone/mem.c | 507 ++++++++++++++++++++ ext/at3_standalone/pixdesc.h | 394 +++++++++++++++ ext/at3_standalone/util_internal.h | 355 ++++++++++++++ 14 files changed, 2134 insertions(+), 10 deletions(-) create mode 100644 Common/compat.c create mode 100644 Core/HW/Atrac3Standalone.cpp create mode 100644 Core/HW/Atrac3Standalone.h create mode 100644 ext/at3_standalone/at3_decoders.h create mode 100644 ext/at3_standalone/frame.c create mode 100644 ext/at3_standalone/mem.c create mode 100644 ext/at3_standalone/pixdesc.h create mode 100644 ext/at3_standalone/util_internal.h diff --git a/Common/Common.vcxproj b/Common/Common.vcxproj index b2d946738b..8b180c6461 100644 --- a/Common/Common.vcxproj +++ b/Common/Common.vcxproj @@ -385,6 +385,7 @@ + @@ -405,14 +406,17 @@ + + + @@ -619,6 +623,7 @@ + @@ -886,6 +891,7 @@ + diff --git a/Common/Common.vcxproj.filters b/Common/Common.vcxproj.filters index c7c8bb785d..182a250275 100644 --- a/Common/Common.vcxproj.filters +++ b/Common/Common.vcxproj.filters @@ -611,6 +611,18 @@ ext\at3_standalone + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + @@ -1089,6 +1101,12 @@ ext\at3_standalone + + ext\at3_standalone + + + ext\at3_standalone + diff --git a/Common/compat.c b/Common/compat.c new file mode 100644 index 0000000000..e8761981af --- /dev/null +++ b/Common/compat.c @@ -0,0 +1,19 @@ +#include + +void *av_malloc(size_t size) { + return malloc(size); +} + +void *av_mallocz(size_t size) { + return calloc(size, 1); +} + +void av_free(void *p) { + free(p); +} + +void av_freep(void **p) { + void *pp = *p; + free(pp); + *p = 0; +} diff --git a/Core/Core.vcxproj b/Core/Core.vcxproj index 7c24591a85..e88cd217ae 100644 --- a/Core/Core.vcxproj +++ b/Core/Core.vcxproj @@ -573,6 +573,7 @@ + @@ -1181,6 +1182,7 @@ + diff --git a/Core/Core.vcxproj.filters b/Core/Core.vcxproj.filters index 0918b045f4..cb3f716cc9 100644 --- a/Core/Core.vcxproj.filters +++ b/Core/Core.vcxproj.filters @@ -1306,6 +1306,9 @@ Util + + HW + @@ -2088,6 +2091,9 @@ Util + + HW + diff --git a/Core/HW/Atrac3Standalone.cpp b/Core/HW/Atrac3Standalone.cpp new file mode 100644 index 0000000000..3156f91e17 --- /dev/null +++ b/Core/HW/Atrac3Standalone.cpp @@ -0,0 +1,55 @@ +#pragma once + +#include "SimpleAudioDec.h" + +#include "ext/at3_standalone/at3_decoders.h" +extern "C" { +#include "ext/at3_standalone/avcodec.h" +} + +// Uses our standalone AT3/AT3+ decoder derived from FFMPEG +class Atrac3Audio : public AudioDecoder { +public: + Atrac3Audio(PSPAudioType audioType) { + ctx_ = avcodec_alloc_context3(&ff_atrac3p_decoder); + atrac3p_decode_init(ctx_); + frame_ = av_frame_alloc(); + } + ~Atrac3Audio() { + atrac3p_decode_close(ctx_); + av_frame_free(&frame_); + } + + bool Decode(const uint8_t *inbuf, int inbytes, uint8_t *outbuf, int *outbytes) override { + int got_frame = 0; + int samples = atrac3p_decode_frame(ctx_, frame_, &got_frame, inbuf, inbytes); + return true; + } + + bool IsOK() const override { return true; } + int GetOutSamples() const override { + return outSamples_; + } + int GetSourcePos() const override { + return srcPos_; + } + + void SetChannels(int channels) override { + // Hmm. ignore for now. + } + + PSPAudioType GetAudioType() const override { return audioType_; } + +private: + AVCodecContext* ctx_ = nullptr; + AVFrame *frame_ = nullptr; + + int outSamples_ = 0; + int srcPos_ = 0; + + PSPAudioType audioType_; +}; + +AudioDecoder *CreateAtrac3Audio(PSPAudioType audioType) { + return new Atrac3Audio(audioType); +} diff --git a/Core/HW/Atrac3Standalone.h b/Core/HW/Atrac3Standalone.h new file mode 100644 index 0000000000..713b1a21a2 --- /dev/null +++ b/Core/HW/Atrac3Standalone.h @@ -0,0 +1,5 @@ +#pragma once + +#include "SimpleAudioDec.h" + +AudioDecoder *CreateAtrac3Audio(PSPAudioType audioType); diff --git a/Core/HW/SimpleAudioDec.cpp b/Core/HW/SimpleAudioDec.cpp index a6bb246ae3..411a76fe47 100644 --- a/Core/HW/SimpleAudioDec.cpp +++ b/Core/HW/SimpleAudioDec.cpp @@ -25,6 +25,7 @@ #include "Core/HW/SimpleAudioDec.h" #include "Core/HW/MediaEngine.h" #include "Core/HW/BufferQueue.h" +#include "Core/HW/Atrac3Standalone.h" #include "ext/minimp3/minimp3.h" @@ -148,6 +149,8 @@ AudioDecoder *CreateAudioDecoder(PSPAudioType audioType, int sampleRateHz, int c switch (audioType) { case PSP_CODEC_MP3: return new MiniMp3Audio(); + case PSP_CODEC_AT3PLUS: + return CreateAtrac3Audio(audioType); default: return new SimpleAudio(audioType, sampleRateHz, channels); } diff --git a/ext/at3_standalone/at3_decoders.h b/ext/at3_standalone/at3_decoders.h new file mode 100644 index 0000000000..37d28bbd3c --- /dev/null +++ b/ext/at3_standalone/at3_decoders.h @@ -0,0 +1,16 @@ +#pragma once + +#include + +struct AVCodecContext; +struct AVFrame; + +extern "C" { + +#include "avcodec.h" + + int atrac3p_decode_init(AVCodecContext *avctx); + int atrac3p_decode_frame(AVCodecContext *avctx, AVFrame *frame, int *got_frame_ptr, const uint8_t *avpkt_data, int avpkt_size); + int atrac3p_decode_close(AVCodecContext *avctx); + extern AVCodec ff_atrac3p_decoder; +} diff --git a/ext/at3_standalone/atrac3plusdec.c b/ext/at3_standalone/atrac3plusdec.c index 6f2854b8b7..2adb458e0a 100644 --- a/ext/at3_standalone/atrac3plusdec.c +++ b/ext/at3_standalone/atrac3plusdec.c @@ -65,7 +65,7 @@ typedef struct ATRAC3PContext { uint64_t my_channel_layout; ///< current channel layout } ATRAC3PContext; -static av_cold int atrac3p_decode_close(AVCodecContext *avctx) +int atrac3p_decode_close(AVCodecContext *avctx) { ATRAC3PContext *ctx = avctx->priv_data; @@ -144,7 +144,7 @@ static av_cold int set_channel_params(ATRAC3PContext *ctx, return 0; } -static av_cold int atrac3p_decode_init(AVCodecContext *avctx) +int atrac3p_decode_init(AVCodecContext *avctx) { ATRAC3PContext *ctx = avctx->priv_data; int i, ch, ret; @@ -327,11 +327,9 @@ static void reconstruct_frame(ATRAC3PContext *ctx, Atrac3pChanUnitCtx *ch_unit, FFSWAP(Atrac3pWaveSynthParams *, ch_unit->waves_info, ch_unit->waves_info_prev); } -static int atrac3p_decode_frame(AVCodecContext *avctx, void *data, - int *got_frame_ptr, AVPacket *avpkt) +int atrac3p_decode_frame(AVCodecContext *avctx, AVFrame *frame, int *got_frame_ptr, const uint8_t *avpkt_data, int avpkt_size) { ATRAC3PContext *ctx = avctx->priv_data; - AVFrame *frame = data; int i, ret, ch_unit_id, ch_block = 0, out_ch_index = 0, channels_to_process; float **samples_p = (float **)frame->extended_data; @@ -339,7 +337,7 @@ static int atrac3p_decode_frame(AVCodecContext *avctx, void *data, if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) return ret; - if ((ret = init_get_bits8(&ctx->gb, avpkt->data, avpkt->size)) < 0) + if ((ret = init_get_bits8(&ctx->gb, avpkt_data, avpkt_size)) < 0) return ret; if (get_bits1(&ctx->gb)) { @@ -384,13 +382,12 @@ static int atrac3p_decode_frame(AVCodecContext *avctx, void *data, *got_frame_ptr = 1; - return FFMIN(avctx->block_align, avpkt->size); + return FFMIN(avctx->block_align, avpkt_size); } -/* AVCodec ff_atrac3p_decoder = { .name = "atrac3plus", - .long_name = NULL_IF_CONFIG_SMALL("ATRAC3+ (Adaptive TRansform Acoustic Coding 3+)"), + .long_name = "ATRAC3+ (Adaptive TRansform Acoustic Coding 3+)", .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_ATRAC3P, .capabilities = AV_CODEC_CAP_DR1, @@ -399,4 +396,3 @@ AVCodec ff_atrac3p_decoder = { .close = atrac3p_decode_close, .decode = atrac3p_decode_frame, }; -*/ diff --git a/ext/at3_standalone/frame.c b/ext/at3_standalone/frame.c new file mode 100644 index 0000000000..2966105032 --- /dev/null +++ b/ext/at3_standalone/frame.c @@ -0,0 +1,742 @@ +/* + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "channel_layout.h" +// #include "avassert.h" +#include "buffer.h" +#include "common.h" +#include "dict.h" +#include "frame.h" +//#include "imgutils.h" +#include "pixdesc.h" +#include "util_internal.h" +#include "mem.h" +#include "samplefmt.h" + +MAKE_ACCESSORS(AVFrame, frame, int64_t, best_effort_timestamp) +MAKE_ACCESSORS(AVFrame, frame, int64_t, pkt_duration) +MAKE_ACCESSORS(AVFrame, frame, int64_t, pkt_pos) +MAKE_ACCESSORS(AVFrame, frame, int64_t, channel_layout) +MAKE_ACCESSORS(AVFrame, frame, int, channels) +MAKE_ACCESSORS(AVFrame, frame, int, sample_rate) +MAKE_ACCESSORS(AVFrame, frame, AVDictionary *, metadata) +MAKE_ACCESSORS(AVFrame, frame, int, decode_error_flags) +MAKE_ACCESSORS(AVFrame, frame, int, pkt_size) +MAKE_ACCESSORS(AVFrame, frame, enum AVColorSpace, colorspace) +MAKE_ACCESSORS(AVFrame, frame, enum AVColorRange, color_range) + +#define CHECK_CHANNELS_CONSISTENCY(frame) \ + av_assert2(!(frame)->channel_layout || \ + (frame)->channels == \ + av_get_channel_layout_nb_channels((frame)->channel_layout)) + +AVDictionary **avpriv_frame_get_metadatap(AVFrame *frame) {return &frame->metadata;}; + +#if FF_API_FRAME_QP +int av_frame_set_qp_table(AVFrame *f, AVBufferRef *buf, int stride, int qp_type) +{ + av_buffer_unref(&f->qp_table_buf); + + f->qp_table_buf = buf; + +FF_DISABLE_DEPRECATION_WARNINGS + f->qscale_table = buf->data; + f->qstride = stride; + f->qscale_type = qp_type; +FF_ENABLE_DEPRECATION_WARNINGS + + return 0; +} + +int8_t *av_frame_get_qp_table(AVFrame *f, int *stride, int *type) +{ +FF_DISABLE_DEPRECATION_WARNINGS + *stride = f->qstride; + *type = f->qscale_type; +FF_ENABLE_DEPRECATION_WARNINGS + + if (!f->qp_table_buf) + return NULL; + + return f->qp_table_buf->data; +} +#endif + +const char *av_get_colorspace_name(enum AVColorSpace val) +{ + static const char * const name[] = { + [AVCOL_SPC_RGB] = "GBR", + [AVCOL_SPC_BT709] = "bt709", + [AVCOL_SPC_FCC] = "fcc", + [AVCOL_SPC_BT470BG] = "bt470bg", + [AVCOL_SPC_SMPTE170M] = "smpte170m", + [AVCOL_SPC_SMPTE240M] = "smpte240m", + [AVCOL_SPC_YCOCG] = "YCgCo", + }; + if ((unsigned)val >= FF_ARRAY_ELEMS(name)) + return NULL; + return name[val]; +} + +static void get_frame_defaults(AVFrame *frame) +{ + if (frame->extended_data != frame->data) + av_freep(&frame->extended_data); + + memset(frame, 0, sizeof(*frame)); + + frame->pts = + frame->pkt_dts = + frame->pkt_pts = AV_NOPTS_VALUE; + av_frame_set_best_effort_timestamp(frame, AV_NOPTS_VALUE); + av_frame_set_pkt_duration (frame, 0); + av_frame_set_pkt_pos (frame, -1); + av_frame_set_pkt_size (frame, -1); + frame->key_frame = 1; + frame->sample_aspect_ratio = (AVRational){ 0, 1 }; + frame->format = -1; /* unknown */ + frame->extended_data = frame->data; + frame->color_primaries = AVCOL_PRI_UNSPECIFIED; + frame->color_trc = AVCOL_TRC_UNSPECIFIED; + frame->colorspace = AVCOL_SPC_UNSPECIFIED; + frame->color_range = AVCOL_RANGE_UNSPECIFIED; + frame->chroma_location = AVCHROMA_LOC_UNSPECIFIED; +} + +static void free_side_data(AVFrameSideData **ptr_sd) +{ + AVFrameSideData *sd = *ptr_sd; + + av_buffer_unref(&sd->buf); + av_dict_free(&sd->metadata); + av_freep(ptr_sd); +} + +static void wipe_side_data(AVFrame *frame) +{ + int i; + + for (i = 0; i < frame->nb_side_data; i++) { + free_side_data(&frame->side_data[i]); + } + frame->nb_side_data = 0; + + av_freep(&frame->side_data); +} + +AVFrame *av_frame_alloc(void) +{ + AVFrame *frame = av_mallocz(sizeof(*frame)); + + if (!frame) + return NULL; + + frame->extended_data = NULL; + get_frame_defaults(frame); + + return frame; +} + +void av_frame_free(AVFrame **frame) +{ + if (!frame || !*frame) + return; + + av_frame_unref(*frame); + av_freep(frame); +} + +static int get_video_buffer(AVFrame *frame, int align) +{ + const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(frame->format); + int ret, i; + + if (!desc) + return AVERROR(EINVAL); + + if ((ret = av_image_check_size(frame->width, frame->height, 0, NULL)) < 0) + return ret; + + if (!frame->linesize[0]) { + for(i=1; i<=align; i+=i) { + ret = av_image_fill_linesizes(frame->linesize, frame->format, + FFALIGN(frame->width, i)); + if (ret < 0) + return ret; + if (!(frame->linesize[0] & (align-1))) + break; + } + + for (i = 0; i < 4 && frame->linesize[i]; i++) + frame->linesize[i] = FFALIGN(frame->linesize[i], align); + } + + for (i = 0; i < 4 && frame->linesize[i]; i++) { + int h = FFALIGN(frame->height, 32); + if (i == 1 || i == 2) + h = AV_CEIL_RSHIFT(h, desc->log2_chroma_h); + + frame->buf[i] = av_buffer_alloc(frame->linesize[i] * h + 16 + 16/*STRIDE_ALIGN*/ - 1); + if (!frame->buf[i]) + goto fail; + + frame->data[i] = frame->buf[i]->data; + } + if (desc->flags & AV_PIX_FMT_FLAG_PAL || desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL) { + av_buffer_unref(&frame->buf[1]); + frame->buf[1] = av_buffer_alloc(AVPALETTE_SIZE); + if (!frame->buf[1]) + goto fail; + frame->data[1] = frame->buf[1]->data; + } + + frame->extended_data = frame->data; + + return 0; +fail: + av_frame_unref(frame); + return AVERROR(ENOMEM); +} + +static int get_audio_buffer(AVFrame *frame, int align) +{ + int channels; + int planar = av_sample_fmt_is_planar(frame->format); + int planes; + int ret, i; + + if (!frame->channels) + frame->channels = av_get_channel_layout_nb_channels(frame->channel_layout); + + channels = frame->channels; + planes = planar ? channels : 1; + + CHECK_CHANNELS_CONSISTENCY(frame); + if (!frame->linesize[0]) { + ret = av_samples_get_buffer_size(&frame->linesize[0], channels, + frame->nb_samples, frame->format, + align); + if (ret < 0) + return ret; + } + + if (planes > AV_NUM_DATA_POINTERS) { + frame->extended_data = av_mallocz_array(planes, + sizeof(*frame->extended_data)); + frame->extended_buf = av_mallocz_array((planes - AV_NUM_DATA_POINTERS), + sizeof(*frame->extended_buf)); + if (!frame->extended_data || !frame->extended_buf) { + av_freep(&frame->extended_data); + av_freep(&frame->extended_buf); + return AVERROR(ENOMEM); + } + frame->nb_extended_buf = planes - AV_NUM_DATA_POINTERS; + } else + frame->extended_data = frame->data; + + for (i = 0; i < FFMIN(planes, AV_NUM_DATA_POINTERS); i++) { + frame->buf[i] = av_buffer_alloc(frame->linesize[0]); + if (!frame->buf[i]) { + av_frame_unref(frame); + return AVERROR(ENOMEM); + } + frame->extended_data[i] = frame->data[i] = frame->buf[i]->data; + } + for (i = 0; i < planes - AV_NUM_DATA_POINTERS; i++) { + frame->extended_buf[i] = av_buffer_alloc(frame->linesize[0]); + if (!frame->extended_buf[i]) { + av_frame_unref(frame); + return AVERROR(ENOMEM); + } + frame->extended_data[i + AV_NUM_DATA_POINTERS] = frame->extended_buf[i]->data; + } + return 0; + +} + +int av_frame_get_buffer(AVFrame *frame, int align) +{ + if (frame->format < 0) + return AVERROR(EINVAL); + + if (frame->width > 0 && frame->height > 0) + return get_video_buffer(frame, align); + else if (frame->nb_samples > 0 && (frame->channel_layout || frame->channels > 0)) + return get_audio_buffer(frame, align); + + return AVERROR(EINVAL); +} + +static int frame_copy_props(AVFrame *dst, const AVFrame *src, int force_copy) +{ + int i; + + dst->key_frame = src->key_frame; + dst->pict_type = src->pict_type; + dst->sample_aspect_ratio = src->sample_aspect_ratio; + dst->pts = src->pts; + dst->repeat_pict = src->repeat_pict; + dst->interlaced_frame = src->interlaced_frame; + dst->top_field_first = src->top_field_first; + dst->palette_has_changed = src->palette_has_changed; + dst->sample_rate = src->sample_rate; + dst->opaque = src->opaque; + dst->pkt_pts = src->pkt_pts; + dst->pkt_dts = src->pkt_dts; + dst->pkt_pos = src->pkt_pos; + dst->pkt_size = src->pkt_size; + dst->pkt_duration = src->pkt_duration; + dst->reordered_opaque = src->reordered_opaque; + dst->quality = src->quality; + dst->best_effort_timestamp = src->best_effort_timestamp; + dst->coded_picture_number = src->coded_picture_number; + dst->display_picture_number = src->display_picture_number; + dst->flags = src->flags; + dst->decode_error_flags = src->decode_error_flags; + dst->color_primaries = src->color_primaries; + dst->color_trc = src->color_trc; + dst->colorspace = src->colorspace; + dst->color_range = src->color_range; + dst->chroma_location = src->chroma_location; + + av_dict_copy(&dst->metadata, src->metadata, 0); + +#if FF_API_ERROR_FRAME +FF_DISABLE_DEPRECATION_WARNINGS + memcpy(dst->error, src->error, sizeof(dst->error)); +FF_ENABLE_DEPRECATION_WARNINGS +#endif + + for (i = 0; i < src->nb_side_data; i++) { + const AVFrameSideData *sd_src = src->side_data[i]; + AVFrameSideData *sd_dst; + if ( sd_src->type == AV_FRAME_DATA_PANSCAN + && (src->width != dst->width || src->height != dst->height)) + continue; + if (force_copy) { + sd_dst = av_frame_new_side_data(dst, sd_src->type, + sd_src->size); + if (!sd_dst) { + wipe_side_data(dst); + return AVERROR(ENOMEM); + } + memcpy(sd_dst->data, sd_src->data, sd_src->size); + } else { + sd_dst = av_frame_new_side_data(dst, sd_src->type, 0); + if (!sd_dst) { + wipe_side_data(dst); + return AVERROR(ENOMEM); + } + sd_dst->buf = av_buffer_ref(sd_src->buf); + if (!sd_dst->buf) { + wipe_side_data(dst); + return AVERROR(ENOMEM); + } + sd_dst->data = sd_dst->buf->data; + sd_dst->size = sd_dst->buf->size; + } + av_dict_copy(&sd_dst->metadata, sd_src->metadata, 0); + } + +#if FF_API_FRAME_QP +FF_DISABLE_DEPRECATION_WARNINGS + dst->qscale_table = NULL; + dst->qstride = 0; + dst->qscale_type = 0; + av_buffer_unref(&dst->qp_table_buf); + if (src->qp_table_buf) { + dst->qp_table_buf = av_buffer_ref(src->qp_table_buf); + if (dst->qp_table_buf) { + dst->qscale_table = dst->qp_table_buf->data; + dst->qstride = src->qstride; + dst->qscale_type = src->qscale_type; + } + } +FF_ENABLE_DEPRECATION_WARNINGS +#endif + + return 0; +} + +int av_frame_ref(AVFrame *dst, const AVFrame *src) +{ + int i, ret = 0; + + dst->format = src->format; + dst->width = src->width; + dst->height = src->height; + dst->channels = src->channels; + dst->channel_layout = src->channel_layout; + dst->nb_samples = src->nb_samples; + + ret = frame_copy_props(dst, src, 0); + if (ret < 0) + return ret; + + /* duplicate the frame data if it's not refcounted */ + if (!src->buf[0]) { + ret = av_frame_get_buffer(dst, 32); + if (ret < 0) + return ret; + + ret = av_frame_copy(dst, src); + if (ret < 0) + av_frame_unref(dst); + + return ret; + } + + /* ref the buffers */ + for (i = 0; i < FF_ARRAY_ELEMS(src->buf); i++) { + if (!src->buf[i]) + continue; + dst->buf[i] = av_buffer_ref(src->buf[i]); + if (!dst->buf[i]) { + ret = AVERROR(ENOMEM); + goto fail; + } + } + + if (src->extended_buf) { + dst->extended_buf = av_mallocz_array(sizeof(*dst->extended_buf), + src->nb_extended_buf); + if (!dst->extended_buf) { + ret = AVERROR(ENOMEM); + goto fail; + } + dst->nb_extended_buf = src->nb_extended_buf; + + for (i = 0; i < src->nb_extended_buf; i++) { + dst->extended_buf[i] = av_buffer_ref(src->extended_buf[i]); + if (!dst->extended_buf[i]) { + ret = AVERROR(ENOMEM); + goto fail; + } + } + } + + /* duplicate extended data */ + if (src->extended_data != src->data) { + int ch = src->channels; + + if (!ch) { + ret = AVERROR(EINVAL); + goto fail; + } + CHECK_CHANNELS_CONSISTENCY(src); + + dst->extended_data = av_malloc_array(sizeof(*dst->extended_data), ch); + if (!dst->extended_data) { + ret = AVERROR(ENOMEM); + goto fail; + } + memcpy(dst->extended_data, src->extended_data, sizeof(*src->extended_data) * ch); + } else + dst->extended_data = dst->data; + + memcpy(dst->data, src->data, sizeof(src->data)); + memcpy(dst->linesize, src->linesize, sizeof(src->linesize)); + + return 0; + +fail: + av_frame_unref(dst); + return ret; +} + +AVFrame *av_frame_clone(const AVFrame *src) +{ + AVFrame *ret = av_frame_alloc(); + + if (!ret) + return NULL; + + if (av_frame_ref(ret, src) < 0) + av_frame_free(&ret); + + return ret; +} + +void av_frame_unref(AVFrame *frame) +{ + int i; + + if (!frame) + return; + + wipe_side_data(frame); + + for (i = 0; i < FF_ARRAY_ELEMS(frame->buf); i++) + av_buffer_unref(&frame->buf[i]); + for (i = 0; i < frame->nb_extended_buf; i++) + av_buffer_unref(&frame->extended_buf[i]); + av_freep(&frame->extended_buf); + av_dict_free(&frame->metadata); +#if FF_API_FRAME_QP + av_buffer_unref(&frame->qp_table_buf); +#endif + + get_frame_defaults(frame); +} + +void av_frame_move_ref(AVFrame *dst, AVFrame *src) +{ + *dst = *src; + if (src->extended_data == src->data) + dst->extended_data = dst->data; + memset(src, 0, sizeof(*src)); + get_frame_defaults(src); +} + +int av_frame_is_writable(AVFrame *frame) +{ + int i, ret = 1; + + /* assume non-refcounted frames are not writable */ + if (!frame->buf[0]) + return 0; + + for (i = 0; i < FF_ARRAY_ELEMS(frame->buf); i++) + if (frame->buf[i]) + ret &= !!av_buffer_is_writable(frame->buf[i]); + for (i = 0; i < frame->nb_extended_buf; i++) + ret &= !!av_buffer_is_writable(frame->extended_buf[i]); + + return ret; +} + +int av_frame_make_writable(AVFrame *frame) +{ + AVFrame tmp; + int ret; + + if (!frame->buf[0]) + return AVERROR(EINVAL); + + if (av_frame_is_writable(frame)) + return 0; + + memset(&tmp, 0, sizeof(tmp)); + tmp.format = frame->format; + tmp.width = frame->width; + tmp.height = frame->height; + tmp.channels = frame->channels; + tmp.channel_layout = frame->channel_layout; + tmp.nb_samples = frame->nb_samples; + ret = av_frame_get_buffer(&tmp, 32); + if (ret < 0) + return ret; + + ret = av_frame_copy(&tmp, frame); + if (ret < 0) { + av_frame_unref(&tmp); + return ret; + } + + ret = av_frame_copy_props(&tmp, frame); + if (ret < 0) { + av_frame_unref(&tmp); + return ret; + } + + av_frame_unref(frame); + + *frame = tmp; + if (tmp.data == tmp.extended_data) + frame->extended_data = frame->data; + + return 0; +} + +int av_frame_copy_props(AVFrame *dst, const AVFrame *src) +{ + return frame_copy_props(dst, src, 1); +} + +AVBufferRef *av_frame_get_plane_buffer(AVFrame *frame, int plane) +{ + uint8_t *data; + int planes, i; + + if (frame->nb_samples) { + int channels = frame->channels; + if (!channels) + return NULL; + CHECK_CHANNELS_CONSISTENCY(frame); + planes = av_sample_fmt_is_planar(frame->format) ? channels : 1; + } else + planes = 4; + + if (plane < 0 || plane >= planes || !frame->extended_data[plane]) + return NULL; + data = frame->extended_data[plane]; + + for (i = 0; i < FF_ARRAY_ELEMS(frame->buf) && frame->buf[i]; i++) { + AVBufferRef *buf = frame->buf[i]; + if (data >= buf->data && data < buf->data + buf->size) + return buf; + } + for (i = 0; i < frame->nb_extended_buf; i++) { + AVBufferRef *buf = frame->extended_buf[i]; + if (data >= buf->data && data < buf->data + buf->size) + return buf; + } + return NULL; +} + +AVFrameSideData *av_frame_new_side_data(AVFrame *frame, + enum AVFrameSideDataType type, + int size) +{ + AVFrameSideData *ret, **tmp; + + if (frame->nb_side_data > INT_MAX / sizeof(*frame->side_data) - 1) + return NULL; + + tmp = av_realloc(frame->side_data, + (frame->nb_side_data + 1) * sizeof(*frame->side_data)); + if (!tmp) + return NULL; + frame->side_data = tmp; + + ret = av_mallocz(sizeof(*ret)); + if (!ret) + return NULL; + + if (size > 0) { + ret->buf = av_buffer_alloc(size); + if (!ret->buf) { + av_freep(&ret); + return NULL; + } + + ret->data = ret->buf->data; + ret->size = size; + } + ret->type = type; + + frame->side_data[frame->nb_side_data++] = ret; + + return ret; +} + +AVFrameSideData *av_frame_get_side_data(const AVFrame *frame, + enum AVFrameSideDataType type) +{ + int i; + + for (i = 0; i < frame->nb_side_data; i++) { + if (frame->side_data[i]->type == type) + return frame->side_data[i]; + } + return NULL; +} + +static int frame_copy_video(AVFrame *dst, const AVFrame *src) +{ + const uint8_t *src_data[4]; + int i, planes; + + if (dst->width < src->width || + dst->height < src->height) + return AVERROR(EINVAL); + + planes = av_pix_fmt_count_planes(dst->format); + for (i = 0; i < planes; i++) + if (!dst->data[i] || !src->data[i]) + return AVERROR(EINVAL); + + memcpy(src_data, src->data, sizeof(src_data)); + av_image_copy(dst->data, dst->linesize, + src_data, src->linesize, + dst->format, src->width, src->height); + + return 0; +} + +static int frame_copy_audio(AVFrame *dst, const AVFrame *src) +{ + int planar = av_sample_fmt_is_planar(dst->format); + int channels = dst->channels; + int planes = planar ? channels : 1; + int i; + + if (dst->nb_samples != src->nb_samples || + dst->channels != src->channels || + dst->channel_layout != src->channel_layout) + return AVERROR(EINVAL); + + CHECK_CHANNELS_CONSISTENCY(src); + + for (i = 0; i < planes; i++) + if (!dst->extended_data[i] || !src->extended_data[i]) + return AVERROR(EINVAL); + + av_samples_copy(dst->extended_data, src->extended_data, 0, 0, + dst->nb_samples, channels, dst->format); + + return 0; +} + +int av_frame_copy(AVFrame *dst, const AVFrame *src) +{ + if (dst->format != src->format || dst->format < 0) + return AVERROR(EINVAL); + + if (dst->width > 0 && dst->height > 0) + return frame_copy_video(dst, src); + else if (dst->nb_samples > 0 && dst->channel_layout) + return frame_copy_audio(dst, src); + + return AVERROR(EINVAL); +} + +void av_frame_remove_side_data(AVFrame *frame, enum AVFrameSideDataType type) +{ + int i; + + for (i = 0; i < frame->nb_side_data; i++) { + AVFrameSideData *sd = frame->side_data[i]; + if (sd->type == type) { + free_side_data(&frame->side_data[i]); + frame->side_data[i] = frame->side_data[frame->nb_side_data - 1]; + frame->nb_side_data--; + } + } +} + +const char *av_frame_side_data_name(enum AVFrameSideDataType type) +{ + switch(type) { + case AV_FRAME_DATA_PANSCAN: return "AVPanScan"; + case AV_FRAME_DATA_A53_CC: return "ATSC A53 Part 4 Closed Captions"; + case AV_FRAME_DATA_STEREO3D: return "Stereoscopic 3d metadata"; + case AV_FRAME_DATA_MATRIXENCODING: return "AVMatrixEncoding"; + case AV_FRAME_DATA_DOWNMIX_INFO: return "Metadata relevant to a downmix procedure"; + case AV_FRAME_DATA_REPLAYGAIN: return "AVReplayGain"; + case AV_FRAME_DATA_DISPLAYMATRIX: return "3x3 displaymatrix"; + case AV_FRAME_DATA_AFD: return "Active format description"; + case AV_FRAME_DATA_MOTION_VECTORS: return "Motion vectors"; + case AV_FRAME_DATA_SKIP_SAMPLES: return "Skip samples"; + case AV_FRAME_DATA_AUDIO_SERVICE_TYPE: return "Audio service type"; + case AV_FRAME_DATA_MASTERING_DISPLAY_METADATA: return "Mastering display metadata"; + case AV_FRAME_DATA_GOP_TIMECODE: return "GOP timecode"; + } + return NULL; +} diff --git a/ext/at3_standalone/mem.c b/ext/at3_standalone/mem.c new file mode 100644 index 0000000000..8dfaad8271 --- /dev/null +++ b/ext/at3_standalone/mem.c @@ -0,0 +1,507 @@ +/* + * default memory allocator for libavutil + * Copyright (c) 2002 Fabrice Bellard + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + * default memory allocator for libavutil + */ + +#define _XOPEN_SOURCE 600 + +#include "config.h" + +#include +#include +#include +#include +#if HAVE_MALLOC_H +#include +#endif + +#include "avassert.h" +#include "avutil.h" +#include "common.h" +#include "dynarray.h" +#include "intreadwrite.h" +#include "mem.h" + +#ifdef MALLOC_PREFIX + +#define malloc AV_JOIN(MALLOC_PREFIX, malloc) +#define memalign AV_JOIN(MALLOC_PREFIX, memalign) +#define posix_memalign AV_JOIN(MALLOC_PREFIX, posix_memalign) +#define realloc AV_JOIN(MALLOC_PREFIX, realloc) +#define free AV_JOIN(MALLOC_PREFIX, free) + +void *malloc(size_t size); +void *memalign(size_t align, size_t size); +int posix_memalign(void **ptr, size_t align, size_t size); +void *realloc(void *ptr, size_t size); +void free(void *ptr); + +#endif /* MALLOC_PREFIX */ + +#include "mem_internal.h" + +#define ALIGN (HAVE_AVX ? 32 : 16) + +/* NOTE: if you want to override these functions with your own + * implementations (not recommended) you have to link libav* as + * dynamic libraries and remove -Wl,-Bsymbolic from the linker flags. + * Note that this will cost performance. */ + +static size_t max_alloc_size= INT_MAX; + +void av_max_alloc(size_t max){ + max_alloc_size = max; +} + +void *av_malloc(size_t size) +{ + void *ptr = NULL; +#if CONFIG_MEMALIGN_HACK + long diff; +#endif + + /* let's disallow possibly ambiguous cases */ + if (size > (max_alloc_size - 32)) + return NULL; + +#if CONFIG_MEMALIGN_HACK + ptr = malloc(size + ALIGN); + if (!ptr) + return ptr; + diff = ((~(long)ptr)&(ALIGN - 1)) + 1; + ptr = (char *)ptr + diff; + ((char *)ptr)[-1] = diff; +#elif HAVE_POSIX_MEMALIGN + if (size) //OS X on SDK 10.6 has a broken posix_memalign implementation + if (posix_memalign(&ptr, ALIGN, size)) + ptr = NULL; +#elif HAVE_ALIGNED_MALLOC + ptr = _aligned_malloc(size, ALIGN); +#elif HAVE_MEMALIGN +#ifndef __DJGPP__ + ptr = memalign(ALIGN, size); +#else + ptr = memalign(size, ALIGN); +#endif + /* Why 64? + * Indeed, we should align it: + * on 4 for 386 + * on 16 for 486 + * on 32 for 586, PPro - K6-III + * on 64 for K7 (maybe for P3 too). + * Because L1 and L2 caches are aligned on those values. + * But I don't want to code such logic here! + */ + /* Why 32? + * For AVX ASM. SSE / NEON needs only 16. + * Why not larger? Because I did not see a difference in benchmarks ... + */ + /* benchmarks with P3 + * memalign(64) + 1 3071, 3051, 3032 + * memalign(64) + 2 3051, 3032, 3041 + * memalign(64) + 4 2911, 2896, 2915 + * memalign(64) + 8 2545, 2554, 2550 + * memalign(64) + 16 2543, 2572, 2563 + * memalign(64) + 32 2546, 2545, 2571 + * memalign(64) + 64 2570, 2533, 2558 + * + * BTW, malloc seems to do 8-byte alignment by default here. + */ +#else + ptr = malloc(size); +#endif + if(!ptr && !size) { + size = 1; + ptr= av_malloc(1); + } +#if CONFIG_MEMORY_POISONING + if (ptr) + memset(ptr, FF_MEMORY_POISON, size); +#endif + return ptr; +} + +void *av_realloc(void *ptr, size_t size) +{ +#if CONFIG_MEMALIGN_HACK + int diff; +#endif + + /* let's disallow possibly ambiguous cases */ + if (size > (max_alloc_size - 32)) + return NULL; + +#if CONFIG_MEMALIGN_HACK + //FIXME this isn't aligned correctly, though it probably isn't needed + if (!ptr) + return av_malloc(size); + diff = ((char *)ptr)[-1]; + av_assert0(diff>0 && diff<=ALIGN); + ptr = realloc((char *)ptr - diff, size + diff); + if (ptr) + ptr = (char *)ptr + diff; + return ptr; +#elif HAVE_ALIGNED_MALLOC + return _aligned_realloc(ptr, size + !size, ALIGN); +#else + return realloc(ptr, size + !size); +#endif +} + +void *av_realloc_f(void *ptr, size_t nelem, size_t elsize) +{ + size_t size; + void *r; + + if (av_size_mult(elsize, nelem, &size)) { + av_free(ptr); + return NULL; + } + r = av_realloc(ptr, size); + if (!r && size) + av_free(ptr); + return r; +} + +int av_reallocp(void *ptr, size_t size) +{ + void *val; + + if (!size) { + av_freep(ptr); + return 0; + } + + memcpy(&val, ptr, sizeof(val)); + val = av_realloc(val, size); + + if (!val) { + av_freep(ptr); + return AVERROR(ENOMEM); + } + + memcpy(ptr, &val, sizeof(val)); + return 0; +} + +void *av_realloc_array(void *ptr, size_t nmemb, size_t size) +{ + if (!size || nmemb >= INT_MAX / size) + return NULL; + return av_realloc(ptr, nmemb * size); +} + +int av_reallocp_array(void *ptr, size_t nmemb, size_t size) +{ + void *val; + + memcpy(&val, ptr, sizeof(val)); + val = av_realloc_f(val, nmemb, size); + memcpy(ptr, &val, sizeof(val)); + if (!val && nmemb && size) + return AVERROR(ENOMEM); + + return 0; +} + +void av_free(void *ptr) +{ +#if CONFIG_MEMALIGN_HACK + if (ptr) { + int v= ((char *)ptr)[-1]; + av_assert0(v>0 && v<=ALIGN); + free((char *)ptr - v); + } +#elif HAVE_ALIGNED_MALLOC + _aligned_free(ptr); +#else + free(ptr); +#endif +} + +void av_freep(void *arg) +{ + void *val; + + memcpy(&val, arg, sizeof(val)); + memcpy(arg, &(void *){ NULL }, sizeof(val)); + av_free(val); +} + +void *av_mallocz(size_t size) +{ + void *ptr = av_malloc(size); + if (ptr) + memset(ptr, 0, size); + return ptr; +} + +void *av_calloc(size_t nmemb, size_t size) +{ + if (size <= 0 || nmemb >= INT_MAX / size) + return NULL; + return av_mallocz(nmemb * size); +} + +char *av_strdup(const char *s) +{ + char *ptr = NULL; + if (s) { + size_t len = strlen(s) + 1; + ptr = av_realloc(NULL, len); + if (ptr) + memcpy(ptr, s, len); + } + return ptr; +} + +char *av_strndup(const char *s, size_t len) +{ + char *ret = NULL, *end; + + if (!s) + return NULL; + + end = memchr(s, 0, len); + if (end) + len = end - s; + + ret = av_realloc(NULL, len + 1); + if (!ret) + return NULL; + + memcpy(ret, s, len); + ret[len] = 0; + return ret; +} + +void *av_memdup(const void *p, size_t size) +{ + void *ptr = NULL; + if (p) { + ptr = av_malloc(size); + if (ptr) + memcpy(ptr, p, size); + } + return ptr; +} + +int av_dynarray_add_nofree(void *tab_ptr, int *nb_ptr, void *elem) +{ + void **tab; + memcpy(&tab, tab_ptr, sizeof(tab)); + + AV_DYNARRAY_ADD(INT_MAX, sizeof(*tab), tab, *nb_ptr, { + tab[*nb_ptr] = elem; + memcpy(tab_ptr, &tab, sizeof(tab)); + }, { + return AVERROR(ENOMEM); + }); + return 0; +} + +void av_dynarray_add(void *tab_ptr, int *nb_ptr, void *elem) +{ + void **tab; + memcpy(&tab, tab_ptr, sizeof(tab)); + + AV_DYNARRAY_ADD(INT_MAX, sizeof(*tab), tab, *nb_ptr, { + tab[*nb_ptr] = elem; + memcpy(tab_ptr, &tab, sizeof(tab)); + }, { + *nb_ptr = 0; + av_freep(tab_ptr); + }); +} + +void *av_dynarray2_add(void **tab_ptr, int *nb_ptr, size_t elem_size, + const uint8_t *elem_data) +{ + uint8_t *tab_elem_data = NULL; + + AV_DYNARRAY_ADD(INT_MAX, elem_size, *tab_ptr, *nb_ptr, { + tab_elem_data = (uint8_t *)*tab_ptr + (*nb_ptr) * elem_size; + if (elem_data) + memcpy(tab_elem_data, elem_data, elem_size); + else if (CONFIG_MEMORY_POISONING) + memset(tab_elem_data, FF_MEMORY_POISON, elem_size); + }, { + av_freep(tab_ptr); + *nb_ptr = 0; + }); + return tab_elem_data; +} + +static void fill16(uint8_t *dst, int len) +{ + uint32_t v = AV_RN16(dst - 2); + + v |= v << 16; + + while (len >= 4) { + AV_WN32(dst, v); + dst += 4; + len -= 4; + } + + while (len--) { + *dst = dst[-2]; + dst++; + } +} + +static void fill24(uint8_t *dst, int len) +{ +#if HAVE_BIGENDIAN + uint32_t v = AV_RB24(dst - 3); + uint32_t a = v << 8 | v >> 16; + uint32_t b = v << 16 | v >> 8; + uint32_t c = v << 24 | v; +#else + uint32_t v = AV_RL24(dst - 3); + uint32_t a = v | v << 24; + uint32_t b = v >> 8 | v << 16; + uint32_t c = v >> 16 | v << 8; +#endif + + while (len >= 12) { + AV_WN32(dst, a); + AV_WN32(dst + 4, b); + AV_WN32(dst + 8, c); + dst += 12; + len -= 12; + } + + if (len >= 4) { + AV_WN32(dst, a); + dst += 4; + len -= 4; + } + + if (len >= 4) { + AV_WN32(dst, b); + dst += 4; + len -= 4; + } + + while (len--) { + *dst = dst[-3]; + dst++; + } +} + +static void fill32(uint8_t *dst, int len) +{ + uint32_t v = AV_RN32(dst - 4); + + while (len >= 4) { + AV_WN32(dst, v); + dst += 4; + len -= 4; + } + + while (len--) { + *dst = dst[-4]; + dst++; + } +} + +void av_memcpy_backptr(uint8_t *dst, int back, int cnt) +{ + const uint8_t *src = &dst[-back]; + if (!back) + return; + + if (back == 1) { + memset(dst, *src, cnt); + } else if (back == 2) { + fill16(dst, cnt); + } else if (back == 3) { + fill24(dst, cnt); + } else if (back == 4) { + fill32(dst, cnt); + } else { + if (cnt >= 16) { + int blocklen = back; + while (cnt > blocklen) { + memcpy(dst, src, blocklen); + dst += blocklen; + cnt -= blocklen; + blocklen <<= 1; + } + memcpy(dst, src, cnt); + return; + } + if (cnt >= 8) { + AV_COPY32U(dst, src); + AV_COPY32U(dst + 4, src + 4); + src += 8; + dst += 8; + cnt -= 8; + } + if (cnt >= 4) { + AV_COPY32U(dst, src); + src += 4; + dst += 4; + cnt -= 4; + } + if (cnt >= 2) { + AV_COPY16U(dst, src); + src += 2; + dst += 2; + cnt -= 2; + } + if (cnt) + *dst = *src; + } +} + +void *av_fast_realloc(void *ptr, unsigned int *size, size_t min_size) +{ + if (min_size < *size) + return ptr; + + min_size = FFMAX(min_size + min_size / 16 + 32, min_size); + + ptr = av_realloc(ptr, min_size); + /* we could set this to the unmodified min_size but this is safer + * if the user lost the ptr and uses NULL now + */ + if (!ptr) + min_size = 0; + + *size = min_size; + + return ptr; +} + +void av_fast_malloc(void *ptr, unsigned int *size, size_t min_size) +{ + ff_fast_malloc(ptr, size, min_size, 0); +} + +void av_fast_mallocz(void *ptr, unsigned int *size, size_t min_size) +{ + ff_fast_malloc(ptr, size, min_size, 1); +} diff --git a/ext/at3_standalone/pixdesc.h b/ext/at3_standalone/pixdesc.h new file mode 100644 index 0000000000..b1d218db48 --- /dev/null +++ b/ext/at3_standalone/pixdesc.h @@ -0,0 +1,394 @@ +/* + * pixel format descriptor + * Copyright (c) 2009 Michael Niedermayer + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVUTIL_PIXDESC_H +#define AVUTIL_PIXDESC_H + +#include + +#include "attributes.h" +#include "pixfmt.h" +#include "version.h" + +typedef struct AVComponentDescriptor { + /** + * Which of the 4 planes contains the component. + */ + int plane; + + /** + * Number of elements between 2 horizontally consecutive pixels. + * Elements are bits for bitstream formats, bytes otherwise. + */ + int step; + + /** + * Number of elements before the component of the first pixel. + * Elements are bits for bitstream formats, bytes otherwise. + */ + int offset; + + /** + * Number of least significant bits that must be shifted away + * to get the value. + */ + int shift; + + /** + * Number of bits in the component. + */ + int depth; + +#if FF_API_PLUS1_MINUS1 + /** deprecated, use step instead */ + attribute_deprecated int step_minus1; + + /** deprecated, use depth instead */ + attribute_deprecated int depth_minus1; + + /** deprecated, use offset instead */ + attribute_deprecated int offset_plus1; +#endif +} AVComponentDescriptor; + +/** + * Descriptor that unambiguously describes how the bits of a pixel are + * stored in the up to 4 data planes of an image. It also stores the + * subsampling factors and number of components. + * + * @note This is separate of the colorspace (RGB, YCbCr, YPbPr, JPEG-style YUV + * and all the YUV variants) AVPixFmtDescriptor just stores how values + * are stored not what these values represent. + */ +typedef struct AVPixFmtDescriptor { + const char *name; + uint8_t nb_components; ///< The number of components each pixel has, (1-4) + + /** + * Amount to shift the luma width right to find the chroma width. + * For YV12 this is 1 for example. + * chroma_width = -((-luma_width) >> log2_chroma_w) + * The note above is needed to ensure rounding up. + * This value only refers to the chroma components. + */ + uint8_t log2_chroma_w; ///< chroma_width = -((-luma_width )>>log2_chroma_w) + + /** + * Amount to shift the luma height right to find the chroma height. + * For YV12 this is 1 for example. + * chroma_height= -((-luma_height) >> log2_chroma_h) + * The note above is needed to ensure rounding up. + * This value only refers to the chroma components. + */ + uint8_t log2_chroma_h; + + /** + * Combination of AV_PIX_FMT_FLAG_... flags. + */ + uint64_t flags; + + /** + * Parameters that describe how pixels are packed. + * If the format has 1 or 2 components, then luma is 0. + * If the format has 3 or 4 components: + * if the RGB flag is set then 0 is red, 1 is green and 2 is blue; + * otherwise 0 is luma, 1 is chroma-U and 2 is chroma-V. + * + * If present, the Alpha channel is always the last component. + */ + AVComponentDescriptor comp[4]; + + /** + * Alternative comma-separated names. + */ + const char *alias; +} AVPixFmtDescriptor; + +/** + * Pixel format is big-endian. + */ +#define AV_PIX_FMT_FLAG_BE (1 << 0) +/** + * Pixel format has a palette in data[1], values are indexes in this palette. + */ +#define AV_PIX_FMT_FLAG_PAL (1 << 1) +/** + * All values of a component are bit-wise packed end to end. + */ +#define AV_PIX_FMT_FLAG_BITSTREAM (1 << 2) +/** + * Pixel format is an HW accelerated format. + */ +#define AV_PIX_FMT_FLAG_HWACCEL (1 << 3) +/** + * At least one pixel component is not in the first data plane. + */ +#define AV_PIX_FMT_FLAG_PLANAR (1 << 4) +/** + * The pixel format contains RGB-like data (as opposed to YUV/grayscale). + */ +#define AV_PIX_FMT_FLAG_RGB (1 << 5) + +/** + * The pixel format is "pseudo-paletted". This means that it contains a + * fixed palette in the 2nd plane but the palette is fixed/constant for each + * PIX_FMT. This allows interpreting the data as if it was PAL8, which can + * in some cases be simpler. Or the data can be interpreted purely based on + * the pixel format without using the palette. + * An example of a pseudo-paletted format is AV_PIX_FMT_GRAY8 + */ +#define AV_PIX_FMT_FLAG_PSEUDOPAL (1 << 6) + +/** + * The pixel format has an alpha channel. This is set on all formats that + * support alpha in some way. The exception is AV_PIX_FMT_PAL8, which can + * carry alpha as part of the palette. Details are explained in the + * AVPixelFormat enum, and are also encoded in the corresponding + * AVPixFmtDescriptor. + * + * The alpha is always straight, never pre-multiplied. + * + * If a codec or a filter does not support alpha, it should set all alpha to + * opaque, or use the equivalent pixel formats without alpha component, e.g. + * AV_PIX_FMT_RGB0 (or AV_PIX_FMT_RGB24 etc.) instead of AV_PIX_FMT_RGBA. + */ +#define AV_PIX_FMT_FLAG_ALPHA (1 << 7) + +/** + * Read a line from an image, and write the values of the + * pixel format component c to dst. + * + * @param data the array containing the pointers to the planes of the image + * @param linesize the array containing the linesizes of the image + * @param desc the pixel format descriptor for the image + * @param x the horizontal coordinate of the first pixel to read + * @param y the vertical coordinate of the first pixel to read + * @param w the width of the line to read, that is the number of + * values to write to dst + * @param read_pal_component if not zero and the format is a paletted + * format writes the values corresponding to the palette + * component c in data[1] to dst, rather than the palette indexes in + * data[0]. The behavior is undefined if the format is not paletted. + */ +void av_read_image_line(uint16_t *dst, const uint8_t *data[4], + const int linesize[4], const AVPixFmtDescriptor *desc, + int x, int y, int c, int w, int read_pal_component); + +/** + * Write the values from src to the pixel format component c of an + * image line. + * + * @param src array containing the values to write + * @param data the array containing the pointers to the planes of the + * image to write into. It is supposed to be zeroed. + * @param linesize the array containing the linesizes of the image + * @param desc the pixel format descriptor for the image + * @param x the horizontal coordinate of the first pixel to write + * @param y the vertical coordinate of the first pixel to write + * @param w the width of the line to write, that is the number of + * values to write to the image line + */ +void av_write_image_line(const uint16_t *src, uint8_t *data[4], + const int linesize[4], const AVPixFmtDescriptor *desc, + int x, int y, int c, int w); + +/** + * Return the pixel format corresponding to name. + * + * If there is no pixel format with name name, then looks for a + * pixel format with the name corresponding to the native endian + * format of name. + * For example in a little-endian system, first looks for "gray16", + * then for "gray16le". + * + * Finally if no pixel format has been found, returns AV_PIX_FMT_NONE. + */ +enum AVPixelFormat av_get_pix_fmt(const char *name); + +/** + * Return the short name for a pixel format, NULL in case pix_fmt is + * unknown. + * + * @see av_get_pix_fmt(), av_get_pix_fmt_string() + */ +const char *av_get_pix_fmt_name(enum AVPixelFormat pix_fmt); + +/** + * Print in buf the string corresponding to the pixel format with + * number pix_fmt, or a header if pix_fmt is negative. + * + * @param buf the buffer where to write the string + * @param buf_size the size of buf + * @param pix_fmt the number of the pixel format to print the + * corresponding info string, or a negative value to print the + * corresponding header. + */ +char *av_get_pix_fmt_string(char *buf, int buf_size, + enum AVPixelFormat pix_fmt); + +/** + * Return the number of bits per pixel used by the pixel format + * described by pixdesc. Note that this is not the same as the number + * of bits per sample. + * + * The returned number of bits refers to the number of bits actually + * used for storing the pixel information, that is padding bits are + * not counted. + */ +int av_get_bits_per_pixel(const AVPixFmtDescriptor *pixdesc); + +/** + * Return the number of bits per pixel for the pixel format + * described by pixdesc, including any padding or unused bits. + */ +int av_get_padded_bits_per_pixel(const AVPixFmtDescriptor *pixdesc); + +/** + * @return a pixel format descriptor for provided pixel format or NULL if + * this pixel format is unknown. + */ +const AVPixFmtDescriptor *av_pix_fmt_desc_get(enum AVPixelFormat pix_fmt); + +/** + * Iterate over all pixel format descriptors known to libavutil. + * + * @param prev previous descriptor. NULL to get the first descriptor. + * + * @return next descriptor or NULL after the last descriptor + */ +const AVPixFmtDescriptor *av_pix_fmt_desc_next(const AVPixFmtDescriptor *prev); + +/** + * @return an AVPixelFormat id described by desc, or AV_PIX_FMT_NONE if desc + * is not a valid pointer to a pixel format descriptor. + */ +enum AVPixelFormat av_pix_fmt_desc_get_id(const AVPixFmtDescriptor *desc); + +/** + * Utility function to access log2_chroma_w log2_chroma_h from + * the pixel format AVPixFmtDescriptor. + * + * See av_get_chroma_sub_sample() for a function that asserts a + * valid pixel format instead of returning an error code. + * Its recommended that you use avcodec_get_chroma_sub_sample unless + * you do check the return code! + * + * @param[in] pix_fmt the pixel format + * @param[out] h_shift store log2_chroma_w (horizontal/width shift) + * @param[out] v_shift store log2_chroma_h (vertical/height shift) + * + * @return 0 on success, AVERROR(ENOSYS) on invalid or unknown pixel format + */ +int av_pix_fmt_get_chroma_sub_sample(enum AVPixelFormat pix_fmt, + int *h_shift, int *v_shift); + +/** + * @return number of planes in pix_fmt, a negative AVERROR if pix_fmt is not a + * valid pixel format. + */ +int av_pix_fmt_count_planes(enum AVPixelFormat pix_fmt); + +/** + * Utility function to swap the endianness of a pixel format. + * + * @param[in] pix_fmt the pixel format + * + * @return pixel format with swapped endianness if it exists, + * otherwise AV_PIX_FMT_NONE + */ +enum AVPixelFormat av_pix_fmt_swap_endianness(enum AVPixelFormat pix_fmt); + +#define FF_LOSS_RESOLUTION 0x0001 /**< loss due to resolution change */ +#define FF_LOSS_DEPTH 0x0002 /**< loss due to color depth change */ +#define FF_LOSS_COLORSPACE 0x0004 /**< loss due to color space conversion */ +#define FF_LOSS_ALPHA 0x0008 /**< loss of alpha bits */ +#define FF_LOSS_COLORQUANT 0x0010 /**< loss due to color quantization */ +#define FF_LOSS_CHROMA 0x0020 /**< loss of chroma (e.g. RGB to gray conversion) */ + +/** + * Compute what kind of losses will occur when converting from one specific + * pixel format to another. + * When converting from one pixel format to another, information loss may occur. + * For example, when converting from RGB24 to GRAY, the color information will + * be lost. Similarly, other losses occur when converting from some formats to + * other formats. These losses can involve loss of chroma, but also loss of + * resolution, loss of color depth, loss due to the color space conversion, loss + * of the alpha bits or loss due to color quantization. + * av_get_fix_fmt_loss() informs you about the various types of losses + * which will occur when converting from one pixel format to another. + * + * @param[in] dst_pix_fmt destination pixel format + * @param[in] src_pix_fmt source pixel format + * @param[in] has_alpha Whether the source pixel format alpha channel is used. + * @return Combination of flags informing you what kind of losses will occur + * (maximum loss for an invalid dst_pix_fmt). + */ +int av_get_pix_fmt_loss(enum AVPixelFormat dst_pix_fmt, + enum AVPixelFormat src_pix_fmt, + int has_alpha); + +/** + * Compute what kind of losses will occur when converting from one specific + * pixel format to another. + * When converting from one pixel format to another, information loss may occur. + * For example, when converting from RGB24 to GRAY, the color information will + * be lost. Similarly, other losses occur when converting from some formats to + * other formats. These losses can involve loss of chroma, but also loss of + * resolution, loss of color depth, loss due to the color space conversion, loss + * of the alpha bits or loss due to color quantization. + * av_get_fix_fmt_loss() informs you about the various types of losses + * which will occur when converting from one pixel format to another. + * + * @param[in] dst_pix_fmt destination pixel format + * @param[in] src_pix_fmt source pixel format + * @param[in] has_alpha Whether the source pixel format alpha channel is used. + * @return Combination of flags informing you what kind of losses will occur + * (maximum loss for an invalid dst_pix_fmt). + */ +enum AVPixelFormat av_find_best_pix_fmt_of_2(enum AVPixelFormat dst_pix_fmt1, enum AVPixelFormat dst_pix_fmt2, + enum AVPixelFormat src_pix_fmt, int has_alpha, int *loss_ptr); + +/** + * @return the name for provided color range or NULL if unknown. + */ +const char *av_color_range_name(enum AVColorRange range); + +/** + * @return the name for provided color primaries or NULL if unknown. + */ +const char *av_color_primaries_name(enum AVColorPrimaries primaries); + +/** + * @return the name for provided color transfer or NULL if unknown. + */ +const char *av_color_transfer_name(enum AVColorTransferCharacteristic transfer); + +/** + * @return the name for provided color space or NULL if unknown. + */ +const char *av_color_space_name(enum AVColorSpace space); + +/** + * @return the name for provided chroma location or NULL if unknown. + */ +const char *av_chroma_location_name(enum AVChromaLocation location); + +#endif /* AVUTIL_PIXDESC_H */ diff --git a/ext/at3_standalone/util_internal.h b/ext/at3_standalone/util_internal.h new file mode 100644 index 0000000000..3a69614c65 --- /dev/null +++ b/ext/at3_standalone/util_internal.h @@ -0,0 +1,355 @@ +/* + * copyright (c) 2006 Michael Niedermayer + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + * common internal API header + */ + +#ifndef AVUTIL_INTERNAL_H +#define AVUTIL_INTERNAL_H + +#if !defined(DEBUG) && !defined(NDEBUG) +# define NDEBUG +#endif + +#include +#include +#include +#include +#include "config.h" +#include "attributes.h" +#include "dict.h" +#include "macros.h" +#include "pixfmt.h" +#include "version.h" + +#if ARCH_X86 +# include "x86/emms.h" +#endif + +#ifndef emms_c +# define emms_c() while(0) +#endif + +#ifndef attribute_align_arg +#if ARCH_X86_32 && AV_GCC_VERSION_AT_LEAST(4,2) +# define attribute_align_arg __attribute__((force_align_arg_pointer)) +#else +# define attribute_align_arg +#endif +#endif + +#if defined(_MSC_VER) && CONFIG_SHARED +# define av_export __declspec(dllimport) +#else +# define av_export +#endif + +#if HAVE_PRAGMA_DEPRECATED +# if defined(__ICL) || defined (__INTEL_COMPILER) +# define FF_DISABLE_DEPRECATION_WARNINGS __pragma(warning(push)) __pragma(warning(disable:1478)) +# define FF_ENABLE_DEPRECATION_WARNINGS __pragma(warning(pop)) +# elif defined(_MSC_VER) +# define FF_DISABLE_DEPRECATION_WARNINGS __pragma(warning(push)) __pragma(warning(disable:4996)) +# define FF_ENABLE_DEPRECATION_WARNINGS __pragma(warning(pop)) +# else +# define FF_DISABLE_DEPRECATION_WARNINGS _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"") +# define FF_ENABLE_DEPRECATION_WARNINGS _Pragma("GCC diagnostic warning \"-Wdeprecated-declarations\"") +# endif +#else +# define FF_DISABLE_DEPRECATION_WARNINGS +# define FF_ENABLE_DEPRECATION_WARNINGS +#endif + + +#define FF_MEMORY_POISON 0x2a + +#define MAKE_ACCESSORS(str, name, type, field) \ + type av_##name##_get_##field(const str *s) { return s->field; } \ + void av_##name##_set_##field(str *s, type v) { s->field = v; } + +// Some broken preprocessors need a second expansion +// to be forced to tokenize __VA_ARGS__ +#define E1(x) x + +/* Check if the hard coded offset of a struct member still matches reality. + * Induce a compilation failure if not. + */ +#define AV_CHECK_OFFSET(s, m, o) struct check_##o { \ + int x_##o[offsetof(s, m) == o? 1: -1]; \ + } + +#define LOCAL_ALIGNED_A(a, t, v, s, o, ...) \ + uint8_t la_##v[sizeof(t s o) + (a)]; \ + t (*v) o = (void *)FFALIGN((uintptr_t)la_##v, a) + +#define LOCAL_ALIGNED_D(a, t, v, s, o, ...) \ + DECLARE_ALIGNED(a, t, la_##v) s o; \ + t (*v) o = la_##v + +#define LOCAL_ALIGNED(a, t, v, ...) E1(LOCAL_ALIGNED_A(a, t, v, __VA_ARGS__,,)) + +#if HAVE_LOCAL_ALIGNED_8 +# define LOCAL_ALIGNED_8(t, v, ...) E1(LOCAL_ALIGNED_D(8, t, v, __VA_ARGS__,,)) +#else +# define LOCAL_ALIGNED_8(t, v, ...) LOCAL_ALIGNED(8, t, v, __VA_ARGS__) +#endif + +#if HAVE_LOCAL_ALIGNED_16 +# define LOCAL_ALIGNED_16(t, v, ...) E1(LOCAL_ALIGNED_D(16, t, v, __VA_ARGS__,,)) +#else +# define LOCAL_ALIGNED_16(t, v, ...) LOCAL_ALIGNED(16, t, v, __VA_ARGS__) +#endif + +#if HAVE_LOCAL_ALIGNED_32 +# define LOCAL_ALIGNED_32(t, v, ...) E1(LOCAL_ALIGNED_D(32, t, v, __VA_ARGS__,,)) +#else +# define LOCAL_ALIGNED_32(t, v, ...) LOCAL_ALIGNED(32, t, v, __VA_ARGS__) +#endif + +#define FF_ALLOC_OR_GOTO(ctx, p, size, label)\ +{\ + p = av_malloc(size);\ + if (!(p) && (size) != 0) {\ + av_log(ctx, AV_LOG_ERROR, "Cannot allocate memory.\n");\ + goto label;\ + }\ +} + +#define FF_ALLOCZ_OR_GOTO(ctx, p, size, label)\ +{\ + p = av_mallocz(size);\ + if (!(p) && (size) != 0) {\ + av_log(ctx, AV_LOG_ERROR, "Cannot allocate memory.\n");\ + goto label;\ + }\ +} + +#define FF_ALLOC_ARRAY_OR_GOTO(ctx, p, nelem, elsize, label)\ +{\ + p = av_malloc_array(nelem, elsize);\ + if (!p) {\ + av_log(ctx, AV_LOG_ERROR, "Cannot allocate memory.\n");\ + goto label;\ + }\ +} + +#define FF_ALLOCZ_ARRAY_OR_GOTO(ctx, p, nelem, elsize, label)\ +{\ + p = av_mallocz_array(nelem, elsize);\ + if (!p) {\ + av_log(ctx, AV_LOG_ERROR, "Cannot allocate memory.\n");\ + goto label;\ + }\ +} + +#include "libm.h" + +/** + * Return NULL if CONFIG_SMALL is true, otherwise the argument + * without modification. Used to disable the definition of strings + * (for example AVCodec long_names). + */ +#if CONFIG_SMALL +# define NULL_IF_CONFIG_SMALL(x) NULL +#else +# define NULL_IF_CONFIG_SMALL(x) x +#endif + +/** + * Define a function with only the non-default version specified. + * + * On systems with ELF shared libraries, all symbols exported from + * FFmpeg libraries are tagged with the name and major version of the + * library to which they belong. If a function is moved from one + * library to another, a wrapper must be retained in the original + * location to preserve binary compatibility. + * + * Functions defined with this macro will never be used to resolve + * symbols by the build-time linker. + * + * @param type return type of function + * @param name name of function + * @param args argument list of function + * @param ver version tag to assign function + */ +#if HAVE_SYMVER_ASM_LABEL +# define FF_SYMVER(type, name, args, ver) \ + type ff_##name args __asm__ (EXTERN_PREFIX #name "@" ver); \ + type ff_##name args +#elif HAVE_SYMVER_GNU_ASM +# define FF_SYMVER(type, name, args, ver) \ + __asm__ (".symver ff_" #name "," EXTERN_PREFIX #name "@" ver); \ + type ff_##name args; \ + type ff_##name args +#endif + +/** + * Return NULL if a threading library has not been enabled. + * Used to disable threading functions in AVCodec definitions + * when not needed. + */ +#if HAVE_THREADS +# define ONLY_IF_THREADS_ENABLED(x) x +#else +# define ONLY_IF_THREADS_ENABLED(x) NULL +#endif + +/** + * Log a generic warning message about a missing feature. + * + * @param[in] avc a pointer to an arbitrary struct of which the first + * field is a pointer to an AVClass struct + * @param[in] msg string containing the name of the missing feature + */ +void avpriv_report_missing_feature(void *avc, + const char *msg, ...) av_printf_format(2, 3); + +/** + * Log a generic warning message about a missing feature. + * Additionally request that a sample showcasing the feature be uploaded. + * + * @param[in] avc a pointer to an arbitrary struct of which the first field is + * a pointer to an AVClass struct + * @param[in] msg string containing the name of the missing feature + */ +void avpriv_request_sample(void *avc, + const char *msg, ...) av_printf_format(2, 3); + +#if HAVE_LIBC_MSVCRT +#include +#if defined(_VC_CRT_MAJOR_VERSION) && _VC_CRT_MAJOR_VERSION < 14 +#pragma comment(linker, "/include:" EXTERN_PREFIX "avpriv_strtod") +#pragma comment(linker, "/include:" EXTERN_PREFIX "avpriv_snprintf") +#endif + +#define avpriv_open ff_open +#define PTRDIFF_SPECIFIER "Id" +#define SIZE_SPECIFIER "Iu" +#else +#define PTRDIFF_SPECIFIER "td" +#define SIZE_SPECIFIER "zu" +#endif + +#ifdef DEBUG +# define ff_dlog(ctx, ...) av_log(ctx, AV_LOG_DEBUG, __VA_ARGS__) +#else +# define ff_dlog(ctx, ...) do { if (0) av_log(ctx, AV_LOG_DEBUG, __VA_ARGS__); } while (0) +#endif + +/** + * Clip and convert a double value into the long long amin-amax range. + * This function is needed because conversion of floating point to integers when + * it does not fit in the integer's representation does not necessarily saturate + * correctly (usually converted to a cvttsd2si on x86) which saturates numbers + * > INT64_MAX to INT64_MIN. The standard marks such conversions as undefined + * behavior, allowing this sort of mathematically bogus conversions. This provides + * a safe alternative that is slower obviously but assures safety and better + * mathematical behavior. + * @param a value to clip + * @param amin minimum value of the clip range + * @param amax maximum value of the clip range + * @return clipped value + */ +static av_always_inline av_const int64_t ff_rint64_clip(double a, int64_t amin, int64_t amax) +{ + int64_t res; +#if defined(HAVE_AV_CONFIG_H) && defined(ASSERT_LEVEL) && ASSERT_LEVEL >= 2 + if (amin > amax) abort(); +#endif + // INT64_MAX+1,INT64_MIN are exactly representable as IEEE doubles + // do range checks first + if (a >= 9223372036854775808.0) + return amax; + if (a <= -9223372036854775808.0) + return amin; + + // safe to call llrint and clip accordingly + res = llrint(a); + if (res > amax) + return amax; + if (res < amin) + return amin; + return res; +} + +/** + * Compute 10^x for floating point values. Note: this function is by no means + * "correctly rounded", and is meant as a fast, reasonably accurate approximation. + * For instance, maximum relative error for the double precision variant is + * ~ 1e-13 for very small and very large values. + * This is ~2x faster than GNU libm's approach, which is still off by 2ulp on + * some inputs. + * @param x exponent + * @return 10^x + */ +static av_always_inline double ff_exp10(double x) +{ + return exp2(M_LOG2_10 * x); +} + +static av_always_inline float ff_exp10f(float x) +{ + return exp2f(M_LOG2_10 * x); +} + +/** + * Compute x^y for floating point x, y. Note: this function is faster than the + * libm variant due to mainly 2 reasons: + * 1. It does not handle any edge cases. In particular, this is only guaranteed + * to work correctly for x > 0. + * 2. It is not as accurate as a standard nearly "correctly rounded" libm variant. + * @param x base + * @param y exponent + * @return x^y + */ +static av_always_inline float ff_fast_powf(float x, float y) +{ + return expf(logf(x) * y); +} + + +/** + * A wrapper for open() setting O_CLOEXEC. + */ +av_warn_unused_result +int avpriv_open(const char *filename, int flags, ...); + +int avpriv_set_systematic_pal2(uint32_t pal[256], enum AVPixelFormat pix_fmt); + +static av_always_inline av_const int avpriv_mirror(int x, int w) +{ + if (!w) + return 0; + + while ((unsigned)x > (unsigned)w) { + x = -x; + if (x < 0) + x += 2 * w; + } + return x; +} + +void ff_check_pixfmt_descriptors(void); + +extern const uint8_t ff_reverse[256]; + +#endif /* AVUTIL_INTERNAL_H */ From fb906481cc9ed9e25793fdd69c5929686f71b1ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Wed, 10 Apr 2024 19:04:54 +0200 Subject: [PATCH 067/719] Disable FFMPEG temporarily to avoid symbol clashes --- Core/Core.vcxproj | 18 +++++++++--------- Windows/PPSSPP.vcxproj | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Core/Core.vcxproj b/Core/Core.vcxproj index e88cd217ae..0888f9cba1 100644 --- a/Core/Core.vcxproj +++ b/Core/Core.vcxproj @@ -139,7 +139,7 @@ Level3 ..\ffmpeg\WindowsInclude;..\ext\libchdr\include;..\ffmpeg\Windows\x86\include;../common;..;../ext/glew;../ext/snappy;../ext/libpng17;../ext/zlib;../ext;../ext/zstd/lib - RC_CLIENT_SUPPORTS_RAINTEGRATION;_CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;USE_FFMPEG;WITH_UPNP;WIN32;_ARCH_32=1;_M_IX86=1;_DEBUG;_LIB;_UNICODE;UNICODE;MINIUPNP_STATICLIB;ARMIPS_USE_STD_FILESYSTEM;%(PreprocessorDefinitions) + RC_CLIENT_SUPPORTS_RAINTEGRATION;_CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;WITH_UPNP;WIN32;_ARCH_32=1;_M_IX86=1;_DEBUG;_LIB;_UNICODE;UNICODE;MINIUPNP_STATICLIB;ARMIPS_USE_STD_FILESYSTEM;%(PreprocessorDefinitions) StreamingSIMDExtensions2 Precise true @@ -166,7 +166,7 @@ Level3 ..\ffmpeg\WindowsInclude;..\ext\libchdr\include;..\ffmpeg\Windows\x86_64\include;../common;..;../ext/glew;../ext/snappy;../ext/libpng17;../ext/zlib;../ext;../ext/zstd/lib;../ext/zstd/lib - RC_CLIENT_SUPPORTS_RAINTEGRATION;_CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;USE_FFMPEG;WITH_UPNP;WIN32;_ARCH_64=1;_M_X64=1;_DEBUG;_LIB;_UNICODE;UNICODE;MINIUPNP_STATICLIB;ARMIPS_USE_STD_FILESYSTEM;%(PreprocessorDefinitions) + RC_CLIENT_SUPPORTS_RAINTEGRATION;_CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;WITH_UPNP;WIN32;_ARCH_64=1;_M_X64=1;_DEBUG;_LIB;_UNICODE;UNICODE;MINIUPNP_STATICLIB;ARMIPS_USE_STD_FILESYSTEM;%(PreprocessorDefinitions) NotSet Precise false @@ -194,7 +194,7 @@ Level3 ..\ffmpeg\WindowsInclude;..\ext\libchdr\include;..\ffmpeg\Windows\aarch64\include;../common;..;../ext/glew;../ext/snappy;../ext/libpng17;../ext/zlib;../ext;../ext/zstd/lib - _CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;USE_FFMPEG;WITH_UPNP;WIN32;_ARCH_64=1;_DEBUG;_LIB;_UNICODE;UNICODE;ARMIPS_USE_STD_FILESYSTEM;%(PreprocessorDefinitions) + _CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;WITH_UPNP;WIN32;_ARCH_64=1;_DEBUG;_LIB;_UNICODE;UNICODE;ARMIPS_USE_STD_FILESYSTEM;%(PreprocessorDefinitions) NotSet Precise false @@ -222,7 +222,7 @@ Level3 ..\ffmpeg\WindowsInclude;..\ext\libchdr\include;..\ffmpeg\Windows\arm\include;../common;..;../ext/glew;../ext/snappy;../ext/libpng17;../ext/zlib;../ext;../ext/zstd/lib - _CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;USE_FFMPEG;WITH_UPNP;WIN32;_ARCH_32=1;_DEBUG;_LIB;_UNICODE;UNICODE;ARMIPS_USE_STD_FILESYSTEM;%(PreprocessorDefinitions) + _CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;WITH_UPNP;WIN32;_ARCH_32=1;_DEBUG;_LIB;_UNICODE;UNICODE;ARMIPS_USE_STD_FILESYSTEM;%(PreprocessorDefinitions) NotSet Precise false @@ -257,7 +257,7 @@ false StreamingSIMDExtensions2 Precise - RC_CLIENT_SUPPORTS_RAINTEGRATION;USING_WIN_UI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;USE_FFMPEG;WITH_UPNP;WIN32;_ARCH_32=1;_M_IX86=1;_LIB;NDEBUG;_UNICODE;UNICODE;MINIUPNP_STATICLIB;ARMIPS_USE_STD_FILESYSTEM;%(PreprocessorDefinitions) + RC_CLIENT_SUPPORTS_RAINTEGRATION;USING_WIN_UI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;WITH_UPNP;WIN32;_ARCH_32=1;_M_IX86=1;_LIB;NDEBUG;_UNICODE;UNICODE;MINIUPNP_STATICLIB;ARMIPS_USE_STD_FILESYSTEM;%(PreprocessorDefinitions) Speed MultiThreaded true @@ -294,7 +294,7 @@ Speed false true - RC_CLIENT_SUPPORTS_RAINTEGRATION;USING_WIN_UI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;USE_FFMPEG;WITH_UPNP;WIN32;_ARCH_64=1;_M_X64=1;_LIB;NDEBUG;_UNICODE;UNICODE;MINIUPNP_STATICLIB;ARMIPS_USE_STD_FILESYSTEM;%(PreprocessorDefinitions) + RC_CLIENT_SUPPORTS_RAINTEGRATION;USING_WIN_UI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;WITH_UPNP;WIN32;_ARCH_64=1;_M_X64=1;_LIB;NDEBUG;_UNICODE;UNICODE;MINIUPNP_STATICLIB;ARMIPS_USE_STD_FILESYSTEM;%(PreprocessorDefinitions) false MultiThreaded true @@ -329,7 +329,7 @@ Speed false true - USING_WIN_UI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;USE_FFMPEG;WITH_UPNP;WIN32;_ARCH_64=1;_LIB;NDEBUG;_UNICODE;UNICODE;ARMIPS_USE_STD_FILESYSTEM;%(PreprocessorDefinitions) + USING_WIN_UI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;WITH_UPNP;WIN32;_ARCH_64=1;_LIB;NDEBUG;_UNICODE;UNICODE;ARMIPS_USE_STD_FILESYSTEM;%(PreprocessorDefinitions) false MultiThreaded true @@ -364,7 +364,7 @@ Speed false true - USING_WIN_UI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;USE_FFMPEG;WITH_UPNP;WIN32;_ARCH_32=1;_LIB;NDEBUG;_UNICODE;UNICODE;ARMIPS_USE_STD_FILESYSTEM;%(PreprocessorDefinitions) + USING_WIN_UI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;WITH_UPNP;WIN32;_ARCH_32=1;_LIB;NDEBUG;_UNICODE;UNICODE;ARMIPS_USE_STD_FILESYSTEM;%(PreprocessorDefinitions) false MultiThreaded true @@ -1495,4 +1495,4 @@ - \ No newline at end of file + diff --git a/Windows/PPSSPP.vcxproj b/Windows/PPSSPP.vcxproj index 7fd1101e82..31c44116e0 100644 --- a/Windows/PPSSPP.vcxproj +++ b/Windows/PPSSPP.vcxproj @@ -249,7 +249,7 @@ stdcpp17 - winhttp.lib;uxtheme.lib;mf.lib;mfplat.lib;mfreadwrite.lib;mfuuid.lib;shlwapi.lib;Winmm.lib;Ws2_32.lib;dsound.lib;comctl32.lib;d3d9.lib;dxguid.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) + winhttp.lib;uxtheme.lib;mf.lib;mfplat.lib;mfreadwrite.lib;mfuuid.lib;shlwapi.lib;Winmm.lib;Ws2_32.lib;dsound.lib;comctl32.lib;d3d9.lib;dxguid.lib;swresample.lib;swscale.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) ../ffmpeg/Windows/x86/lib true Windows @@ -289,7 +289,7 @@ stdcpp17 - winhttp.lib;uxtheme.lib;mf.lib;mfplat.lib;mfreadwrite.lib;mfuuid.lib;shlwapi.lib;Winmm.lib;Ws2_32.lib;dsound.lib;comctl32.lib;d3d9.lib;dxguid.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) + winhttp.lib;uxtheme.lib;mf.lib;mfplat.lib;mfreadwrite.lib;mfuuid.lib;shlwapi.lib;Winmm.lib;Ws2_32.lib;dsound.lib;comctl32.lib;d3d9.lib;dxguid.lib;swresample.lib;swscale.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) ../ffmpeg/Windows/x86_64/lib true $(OutDir)$(ProjectName).pdb @@ -325,7 +325,7 @@ stdcpp17 - winhttp.lib;uxtheme.lib;mf.lib;mfplat.lib;mfreadwrite.lib;mfuuid.lib;shlwapi.lib;Winmm.lib;Ws2_32.lib;dsound.lib;comctl32.lib;d3d9.lib;dxguid.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;oleaut32.lib;comdlg32.lib;shell32.lib;user32.lib;gdi32.lib;advapi32.lib;ole32.lib;%(AdditionalDependencies) + winhttp.lib;uxtheme.lib;mf.lib;mfplat.lib;mfreadwrite.lib;mfuuid.lib;shlwapi.lib;Winmm.lib;Ws2_32.lib;dsound.lib;comctl32.lib;d3d9.lib;dxguid.lib;swresample.lib;swscale.lib;oleaut32.lib;comdlg32.lib;shell32.lib;user32.lib;gdi32.lib;advapi32.lib;ole32.lib;%(AdditionalDependencies) ../ffmpeg/Windows/aarch64/lib true $(OutDir)$(ProjectName).pdb @@ -359,7 +359,7 @@ stdcpp17 - winhttp.lib;uxtheme.lib;mf.lib;mfplat.lib;mfreadwrite.lib;mfuuid.lib;shlwapi.lib;Winmm.lib;Ws2_32.lib;dsound.lib;comctl32.lib;d3d9.lib;dxguid.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;oleaut32.lib;comdlg32.lib;shell32.lib;user32.lib;gdi32.lib;advapi32.lib;ole32.lib;%(AdditionalDependencies) + winhttp.lib;uxtheme.lib;mf.lib;mfplat.lib;mfreadwrite.lib;mfuuid.lib;shlwapi.lib;Winmm.lib;Ws2_32.lib;dsound.lib;comctl32.lib;d3d9.lib;dxguid.lib;swresample.lib;swscale.lib;oleaut32.lib;comdlg32.lib;shell32.lib;user32.lib;gdi32.lib;advapi32.lib;ole32.lib;%(AdditionalDependencies) ../ffmpeg/Windows/arm/lib true $(OutDir)$(ProjectName).pdb From 8fbc4a33798f93d52142a8b31250753d0e3b8299 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Wed, 10 Apr 2024 21:37:57 +0200 Subject: [PATCH 068/719] Ultra-gross hackery, but works! Now, need to pare it down, heavily... --- Common/Common.vcxproj | 36 + Common/Common.vcxproj.filters | 108 + Common/compat.c | 73 + Core/HW/Atrac3Standalone.cpp | 66 +- Windows/PPSSPP.vcxproj | 16 +- ext/at3_standalone/atomic.c | 127 ++ ext/at3_standalone/atomic.h | 79 + ext/at3_standalone/atrac.c | 165 ++ ext/at3_standalone/attributes.h | 18 + ext/at3_standalone/av_buffer.c | 392 ++++ ext/at3_standalone/avcodec.h | 14 +- ext/at3_standalone/avpacket.c | 642 ++++++ ext/at3_standalone/avstring.c | 500 +++++ ext/at3_standalone/avstring.h | 402 ++++ ext/at3_standalone/bitstream.c | 321 +++ ext/at3_standalone/bprint.c | 379 ++++ ext/at3_standalone/bprint.h | 219 ++ ext/at3_standalone/buffer_internal.h | 94 + ext/at3_standalone/channel_layout.c | 220 ++ ext/at3_standalone/codec_desc.c | 2933 +++++++++++++++++++++++++ ext/at3_standalone/compat.h | 39 +- ext/at3_standalone/dict.c | 337 +++ ext/at3_standalone/fft-internal.h | 94 + ext/at3_standalone/fft_template.c | 531 +++++ ext/at3_standalone/frame.c | 80 +- ext/at3_standalone/intmath.c | 34 + ext/at3_standalone/intmath.h | 165 ++ ext/at3_standalone/log2_tab.c | 32 + ext/at3_standalone/mathematics.c | 210 ++ ext/at3_standalone/mdct_template.c | 213 ++ ext/at3_standalone/mem.c | 67 +- ext/at3_standalone/opt.c | 1593 ++++++++++++++ ext/at3_standalone/opt.h | 865 ++++++++ ext/at3_standalone/options.c | 487 ++++ ext/at3_standalone/options_table.h | 550 +++++ ext/at3_standalone/qsort.h | 122 + ext/at3_standalone/rational.c | 298 +++ ext/at3_standalone/rational.h | 1 + ext/at3_standalone/rdft.c | 3 +- ext/at3_standalone/samplefmt.c | 252 +++ ext/at3_standalone/sinewin_tablegen.h | 7 +- ext/at3_standalone/utils.c | 1590 ++++++++++++++ headless/Headless.vcxproj | 2 +- unittest/UnitTests.vcxproj | 2 +- 44 files changed, 14212 insertions(+), 166 deletions(-) create mode 100644 ext/at3_standalone/atomic.c create mode 100644 ext/at3_standalone/atomic.h create mode 100644 ext/at3_standalone/atrac.c create mode 100644 ext/at3_standalone/av_buffer.c create mode 100644 ext/at3_standalone/avpacket.c create mode 100644 ext/at3_standalone/avstring.c create mode 100644 ext/at3_standalone/avstring.h create mode 100644 ext/at3_standalone/bitstream.c create mode 100644 ext/at3_standalone/bprint.c create mode 100644 ext/at3_standalone/bprint.h create mode 100644 ext/at3_standalone/buffer_internal.h create mode 100644 ext/at3_standalone/channel_layout.c create mode 100644 ext/at3_standalone/codec_desc.c create mode 100644 ext/at3_standalone/dict.c create mode 100644 ext/at3_standalone/fft-internal.h create mode 100644 ext/at3_standalone/fft_template.c create mode 100644 ext/at3_standalone/intmath.c create mode 100644 ext/at3_standalone/intmath.h create mode 100644 ext/at3_standalone/log2_tab.c create mode 100644 ext/at3_standalone/mathematics.c create mode 100644 ext/at3_standalone/mdct_template.c create mode 100644 ext/at3_standalone/opt.c create mode 100644 ext/at3_standalone/opt.h create mode 100644 ext/at3_standalone/options.c create mode 100644 ext/at3_standalone/options_table.h create mode 100644 ext/at3_standalone/qsort.h create mode 100644 ext/at3_standalone/rational.c create mode 100644 ext/at3_standalone/samplefmt.c create mode 100644 ext/at3_standalone/utils.c diff --git a/Common/Common.vcxproj b/Common/Common.vcxproj index 8b180c6461..4d30455354 100644 --- a/Common/Common.vcxproj +++ b/Common/Common.vcxproj @@ -386,15 +386,20 @@ + + + + + @@ -402,20 +407,29 @@ + + + + + + + + + @@ -617,14 +631,36 @@ + + + + + + + + + + + + + + + + + + + + + + NotUsing diff --git a/Common/Common.vcxproj.filters b/Common/Common.vcxproj.filters index 182a250275..5a5d97000f 100644 --- a/Common/Common.vcxproj.filters +++ b/Common/Common.vcxproj.filters @@ -623,6 +623,48 @@ ext\at3_standalone + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + @@ -1107,6 +1149,72 @@ ext\at3_standalone + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + diff --git a/Common/compat.c b/Common/compat.c index e8761981af..2e9410662f 100644 --- a/Common/compat.c +++ b/Common/compat.c @@ -1,5 +1,10 @@ #include +#include +#include "ext/at3_standalone/compat.h" +#include "ext/at3_standalone/common.h" + +/* void *av_malloc(size_t size) { return malloc(size); } @@ -17,3 +22,71 @@ void av_freep(void **p) { free(pp); *p = 0; } + +int ff_fast_malloc(void *ptr, unsigned int *size, size_t min_size, int zero_realloc) +{ + void *val; + + memcpy(&val, ptr, sizeof(val)); + if (min_size <= *size) { + av_assert0(val || !min_size); + return 0; + } + min_size = FFMAX(min_size + min_size / 16 + 32, min_size); + av_freep(ptr); + val = zero_realloc ? av_mallocz(min_size) : av_malloc(min_size); + memcpy(ptr, &val, sizeof(val)); + if (!val) + min_size = 0; + *size = min_size; + return 1; +} + +int av_fast_malloc(void *ptr, unsigned int *size, size_t min_size) { + return ff_fast_malloc(ptr, size, min_size, 0); +} +*/ + +void av_log(void *avcl, int level, const char *fmt, ...) { + +} + +int av_get_cpu_flags(void) { + return 0; +} + +void ff_fft_init_aarch64(void) {} +void ff_fft_init_x86(void) {} +void ff_fft_init_arm(void) {} +void ff_fft_init_mips(void) {} +void ff_fft_init_ppc(void) {} + +const uint8_t ff_reverse[256] = { +0x00,0x80,0x40,0xC0,0x20,0xA0,0x60,0xE0,0x10,0x90,0x50,0xD0,0x30,0xB0,0x70,0xF0, +0x08,0x88,0x48,0xC8,0x28,0xA8,0x68,0xE8,0x18,0x98,0x58,0xD8,0x38,0xB8,0x78,0xF8, +0x04,0x84,0x44,0xC4,0x24,0xA4,0x64,0xE4,0x14,0x94,0x54,0xD4,0x34,0xB4,0x74,0xF4, +0x0C,0x8C,0x4C,0xCC,0x2C,0xAC,0x6C,0xEC,0x1C,0x9C,0x5C,0xDC,0x3C,0xBC,0x7C,0xFC, +0x02,0x82,0x42,0xC2,0x22,0xA2,0x62,0xE2,0x12,0x92,0x52,0xD2,0x32,0xB2,0x72,0xF2, +0x0A,0x8A,0x4A,0xCA,0x2A,0xAA,0x6A,0xEA,0x1A,0x9A,0x5A,0xDA,0x3A,0xBA,0x7A,0xFA, +0x06,0x86,0x46,0xC6,0x26,0xA6,0x66,0xE6,0x16,0x96,0x56,0xD6,0x36,0xB6,0x76,0xF6, +0x0E,0x8E,0x4E,0xCE,0x2E,0xAE,0x6E,0xEE,0x1E,0x9E,0x5E,0xDE,0x3E,0xBE,0x7E,0xFE, +0x01,0x81,0x41,0xC1,0x21,0xA1,0x61,0xE1,0x11,0x91,0x51,0xD1,0x31,0xB1,0x71,0xF1, +0x09,0x89,0x49,0xC9,0x29,0xA9,0x69,0xE9,0x19,0x99,0x59,0xD9,0x39,0xB9,0x79,0xF9, +0x05,0x85,0x45,0xC5,0x25,0xA5,0x65,0xE5,0x15,0x95,0x55,0xD5,0x35,0xB5,0x75,0xF5, +0x0D,0x8D,0x4D,0xCD,0x2D,0xAD,0x6D,0xED,0x1D,0x9D,0x5D,0xDD,0x3D,0xBD,0x7D,0xFD, +0x03,0x83,0x43,0xC3,0x23,0xA3,0x63,0xE3,0x13,0x93,0x53,0xD3,0x33,0xB3,0x73,0xF3, +0x0B,0x8B,0x4B,0xCB,0x2B,0xAB,0x6B,0xEB,0x1B,0x9B,0x5B,0xDB,0x3B,0xBB,0x7B,0xFB, +0x07,0x87,0x47,0xC7,0x27,0xA7,0x67,0xE7,0x17,0x97,0x57,0xD7,0x37,0xB7,0x77,0xF7, +0x0F,0x8F,0x4F,0xCF,0x2F,0xAF,0x6F,0xEF,0x1F,0x9F,0x5F,0xDF,0x3F,0xBF,0x7F,0xFF, +}; + +const uint8_t ff_log2_tab[256] = { + 0,0,1,1,2,2,2,2,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4, + 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5, + 6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6, + 6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6, + 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, + 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, + 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, + 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7 +}; diff --git a/Core/HW/Atrac3Standalone.cpp b/Core/HW/Atrac3Standalone.cpp index 3156f91e17..c285ba0977 100644 --- a/Core/HW/Atrac3Standalone.cpp +++ b/Core/HW/Atrac3Standalone.cpp @@ -7,22 +7,68 @@ extern "C" { #include "ext/at3_standalone/avcodec.h" } +inline int16_t clamp16(float f) { + if (f >= 1.0f) + return 32767; + else if (f <= -1.0f) + return -32767; + else + return (int)(f * 32767); +} + // Uses our standalone AT3/AT3+ decoder derived from FFMPEG class Atrac3Audio : public AudioDecoder { public: Atrac3Audio(PSPAudioType audioType) { ctx_ = avcodec_alloc_context3(&ff_atrac3p_decoder); - atrac3p_decode_init(ctx_); + // int retval = atrac3p_decode_init(ctx_); frame_ = av_frame_alloc(); } ~Atrac3Audio() { - atrac3p_decode_close(ctx_); + avcodec_close(ctx_); av_frame_free(&frame_); + av_freep(&ctx_->extradata); + av_freep(&ctx_->subtitle_header); + av_freep(&ctx_); } bool Decode(const uint8_t *inbuf, int inbytes, uint8_t *outbuf, int *outbytes) override { + if (!codecOpen_) { + ctx_->block_align = inbytes; + ctx_->channels = 2; + ctx_->channel_layout = ctx_->channels == 2 ? AV_CH_LAYOUT_STEREO : AV_CH_LAYOUT_MONO; + ctx_->sample_rate = 44100; + int retval = avcodec_open2(ctx_, &ff_atrac3p_decoder, nullptr); + _dbg_assert_(retval >= 0); + if (retval < 0) { + return false; + } + codecOpen_ = true; + } + int got_frame = 0; - int samples = atrac3p_decode_frame(ctx_, frame_, &got_frame, inbuf, inbytes); + int result = atrac3p_decode_frame(ctx_, frame_, &got_frame, inbuf, inbytes); + if (result < 0) { + *outbytes = 0; + return false; + } + srcPos_ = result; + outSamples_ = frame_->nb_samples; + if (frame_->nb_samples > 0) { + *outbytes = frame_->nb_samples * 2 * 2; + + // Convert frame to outbuf. + for (int channel = 0; channel < 2; channel++) { + float **pointers = (float **)frame_->data; + int16_t *output = (int16_t *)outbuf; + for (int i = 0; i < frame_->nb_samples; i++) { + output[i * 2] = clamp16(pointers[0][i]); + output[i * 2 + 1] = clamp16(pointers[1][i]); + } + } + } else { + *outbytes = 0; + } return true; } @@ -38,6 +84,18 @@ public: // Hmm. ignore for now. } + void SetExtraData(const uint8_t *data, int size, int wav_bytes_per_packet) { + _dbg_assert_(ctx_); + _dbg_assert_(!codecOpen_); + ctx_->extradata = (uint8_t *)av_mallocz(size); + ctx_->extradata_size = size; + ctx_->block_align = wav_bytes_per_packet; + codecOpen_ = false; + if (data != nullptr) { + memcpy(ctx_->extradata, data, size); + } + } + PSPAudioType GetAudioType() const override { return audioType_; } private: @@ -47,6 +105,8 @@ private: int outSamples_ = 0; int srcPos_ = 0; + bool codecOpen_ = false; + PSPAudioType audioType_; }; diff --git a/Windows/PPSSPP.vcxproj b/Windows/PPSSPP.vcxproj index 31c44116e0..0ab91e049c 100644 --- a/Windows/PPSSPP.vcxproj +++ b/Windows/PPSSPP.vcxproj @@ -231,7 +231,7 @@ - USE_FFMPEG;RC_CLIENT_SUPPORTS_RAINTEGRATION;_CRTDBG_MAP_ALLOC;USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_ARCH_32=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) + RC_CLIENT_SUPPORTS_RAINTEGRATION;_CRTDBG_MAP_ALLOC;USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_ARCH_32=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) false Sync Use @@ -271,7 +271,7 @@ false - USE_FFMPEG;RC_CLIENT_SUPPORTS_RAINTEGRATION;_CRTDBG_MAP_ALLOC;USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_ARCH_64=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) + RC_CLIENT_SUPPORTS_RAINTEGRATION;_CRTDBG_MAP_ALLOC;USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_ARCH_64=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) Sync Use Level3 @@ -307,7 +307,7 @@ false - USE_FFMPEG;_CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_ARCH_64=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) + _CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_ARCH_64=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) Sync Use Level3 @@ -343,7 +343,7 @@ false - USE_FFMPEG;_CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_ARCH_32=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) + _CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_ARCH_32=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) Use Level3 ProgramDatabase @@ -378,7 +378,7 @@ AnySuitable true Speed - USE_FFMPEG;RC_CLIENT_SUPPORTS_RAINTEGRATION;USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_ARCH_32=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) + RC_CLIENT_SUPPORTS_RAINTEGRATION;USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_ARCH_32=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) true Sync MultiThreaded @@ -428,7 +428,7 @@ true Speed false - USE_FFMPEG;RC_CLIENT_SUPPORTS_RAINTEGRATION;USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_ARCH_64=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) + RC_CLIENT_SUPPORTS_RAINTEGRATION;USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_ARCH_64=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) true Sync MultiThreaded @@ -471,7 +471,7 @@ true Speed false - USE_FFMPEG;USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_ARCH_64=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) + USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_ARCH_64=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) true Sync MultiThreaded @@ -513,7 +513,7 @@ true Speed false - USE_FFMPEG;USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_ARCH_32=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) + USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_ARCH_32=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) true Sync MultiThreaded diff --git a/ext/at3_standalone/atomic.c b/ext/at3_standalone/atomic.c new file mode 100644 index 0000000000..b13725d14f --- /dev/null +++ b/ext/at3_standalone/atomic.c @@ -0,0 +1,127 @@ +/* + * Copyright (c) 2012 Ronald S. Bultje + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "config.h" +#include "atomic.h" + +#if !HAVE_ATOMICS_NATIVE + +#if HAVE_PTHREADS + +#include + +static pthread_mutex_t atomic_lock = PTHREAD_MUTEX_INITIALIZER; + +int avpriv_atomic_int_get(volatile int *ptr) +{ + int res; + + pthread_mutex_lock(&atomic_lock); + res = *ptr; + pthread_mutex_unlock(&atomic_lock); + + return res; +} + +void avpriv_atomic_int_set(volatile int *ptr, int val) +{ + pthread_mutex_lock(&atomic_lock); + *ptr = val; + pthread_mutex_unlock(&atomic_lock); +} + +int avpriv_atomic_int_add_and_fetch(volatile int *ptr, int inc) +{ + int res; + + pthread_mutex_lock(&atomic_lock); + *ptr += inc; + res = *ptr; + pthread_mutex_unlock(&atomic_lock); + + return res; +} + +void *avpriv_atomic_ptr_cas(void * volatile *ptr, void *oldval, void *newval) +{ + void *ret; + pthread_mutex_lock(&atomic_lock); + ret = *ptr; + if (ret == oldval) + *ptr = newval; + pthread_mutex_unlock(&atomic_lock); + return ret; +} + +#elif !HAVE_THREADS + +int avpriv_atomic_int_get(volatile int *ptr) +{ + return *ptr; +} + +void avpriv_atomic_int_set(volatile int *ptr, int val) +{ + *ptr = val; +} + +int avpriv_atomic_int_add_and_fetch(volatile int *ptr, int inc) +{ + *ptr += inc; + return *ptr; +} + +void *avpriv_atomic_ptr_cas(void * volatile *ptr, void *oldval, void *newval) +{ + if (*ptr == oldval) { + *ptr = newval; + return oldval; + } + return *ptr; +} + +#else /* HAVE_THREADS */ + +/* This should never trigger, unless a new threading implementation + * without correct atomics dependencies in configure or a corresponding + * atomics implementation is added. */ +#error "Threading is enabled, but there is no implementation of atomic operations available" + +#endif /* HAVE_PTHREADS */ + +#endif /* !HAVE_ATOMICS_NATIVE */ + +#ifdef TEST +#include "avassert.h" + +int main(void) +{ + volatile int val = 1; + int res; + + res = avpriv_atomic_int_add_and_fetch(&val, 1); + av_assert0(res == 2); + avpriv_atomic_int_set(&val, 3); + res = avpriv_atomic_int_get(&val); + av_assert0(res == 3); + + return 0; +} +#endif diff --git a/ext/at3_standalone/atomic.h b/ext/at3_standalone/atomic.h new file mode 100644 index 0000000000..15906d24c9 --- /dev/null +++ b/ext/at3_standalone/atomic.h @@ -0,0 +1,79 @@ +/* + * Copyright (c) 2012 Ronald S. Bultje + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVUTIL_ATOMIC_H +#define AVUTIL_ATOMIC_H + +#include "config.h" + +#if HAVE_ATOMICS_NATIVE + +#if HAVE_ATOMICS_GCC +#include "atomic_gcc.h" +#elif HAVE_ATOMICS_WIN32 +#include "atomic_win32.h" +#elif HAVE_ATOMICS_SUNCC +#include "atomic_suncc.h" +#endif + +#else + +/** + * Load the current value stored in an atomic integer. + * + * @param ptr atomic integer + * @return the current value of the atomic integer + * @note This acts as a memory barrier. + */ +int avpriv_atomic_int_get(volatile int *ptr); + +/** + * Store a new value in an atomic integer. + * + * @param ptr atomic integer + * @param val the value to store in the atomic integer + * @note This acts as a memory barrier. + */ +void avpriv_atomic_int_set(volatile int *ptr, int val); + +/** + * Add a value to an atomic integer. + * + * @param ptr atomic integer + * @param inc the value to add to the atomic integer (may be negative) + * @return the new value of the atomic integer. + * @note This does NOT act as a memory barrier. This is primarily + * intended for reference counting. + */ +int avpriv_atomic_int_add_and_fetch(volatile int *ptr, int inc); + +/** + * Atomic pointer compare and swap. + * + * @param ptr pointer to the pointer to operate on + * @param oldval do the swap if the current value of *ptr equals to oldval + * @param newval value to replace *ptr with + * @return the value of *ptr before comparison + */ +void *avpriv_atomic_ptr_cas(void * volatile *ptr, void *oldval, void *newval); + +#endif /* HAVE_ATOMICS_NATIVE */ + +#endif /* AVUTIL_ATOMIC_H */ diff --git a/ext/at3_standalone/atrac.c b/ext/at3_standalone/atrac.c new file mode 100644 index 0000000000..12e8997dbc --- /dev/null +++ b/ext/at3_standalone/atrac.c @@ -0,0 +1,165 @@ +/* + * common functions for the ATRAC family of decoders + * + * Copyright (c) 2006-2013 Maxim Poliakovski + * Copyright (c) 2006-2008 Benjamin Larsson + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + */ + +#include +#include +#include +#include + +#include "avcodec.h" +#include "atrac.h" + +float ff_atrac_sf_table[64]; +static float qmf_window[48]; + +static const float qmf_48tap_half[24] = { + -0.00001461907, -0.00009205479,-0.000056157569,0.00030117269, + 0.0002422519, -0.00085293897,-0.0005205574, 0.0020340169, + 0.00078333891, -0.0042153862, -0.00075614988, 0.0078402944, + -0.000061169922,-0.01344162, 0.0024626821, 0.021736089, + -0.007801671, -0.034090221, 0.01880949, 0.054326009, + -0.043596379, -0.099384367, 0.13207909, 0.46424159 +}; + +av_cold void ff_atrac_generate_tables(void) +{ + int i; + float s; + + /* Generate scale factors */ + if (!ff_atrac_sf_table[63]) + for (i=0 ; i<64 ; i++) + ff_atrac_sf_table[i] = pow(2.0, (i - 15) / 3.0); + + /* Generate the QMF window. */ + if (!qmf_window[47]) + for (i=0 ; i<24; i++) { + s = qmf_48tap_half[i] * 2.0; + qmf_window[i] = qmf_window[47 - i] = s; + } +} + +av_cold void ff_atrac_init_gain_compensation(AtracGCContext *gctx, int id2exp_offset, + int loc_scale) +{ + int i; + + gctx->loc_scale = loc_scale; + gctx->loc_size = 1 << loc_scale; + gctx->id2exp_offset = id2exp_offset; + + /* Generate gain level table. */ + for (i = 0; i < 16; i++) + gctx->gain_tab1[i] = powf(2.0, id2exp_offset - i); + + /* Generate gain interpolation table. */ + for (i = -15; i < 16; i++) + gctx->gain_tab2[i + 15] = powf(2.0, -1.0f / gctx->loc_size * i); +} + +void ff_atrac_gain_compensation(AtracGCContext *gctx, float *in, float *prev, + AtracGainInfo *gc_now, AtracGainInfo *gc_next, + int num_samples, float *out) +{ + float lev, gc_scale, gain_inc; + int i, pos, lastpos; + + gc_scale = gc_next->num_points ? gctx->gain_tab1[gc_next->lev_code[0]] + : 1.0f; + + if (!gc_now->num_points) { + for (pos = 0; pos < num_samples; pos++) + out[pos] = in[pos] * gc_scale + prev[pos]; + } else { + pos = 0; + + for (i = 0; i < gc_now->num_points; i++) { + lastpos = gc_now->loc_code[i] << gctx->loc_scale; + + lev = gctx->gain_tab1[gc_now->lev_code[i]]; + gain_inc = gctx->gain_tab2[(i + 1 < gc_now->num_points ? gc_now->lev_code[i + 1] + : gctx->id2exp_offset) - + gc_now->lev_code[i] + 15]; + + /* apply constant gain level and overlap */ + for (; pos < lastpos; pos++) + out[pos] = (in[pos] * gc_scale + prev[pos]) * lev; + + /* interpolate between two different gain levels */ + for (; pos < lastpos + gctx->loc_size; pos++) { + out[pos] = (in[pos] * gc_scale + prev[pos]) * lev; + lev *= gain_inc; + } + } + + for (; pos < num_samples; pos++) + out[pos] = in[pos] * gc_scale + prev[pos]; + } + + /* copy the overlapping part into the delay buffer */ + memcpy(prev, &in[num_samples], num_samples * sizeof(float)); +} + +void ff_atrac_iqmf(float *inlo, float *inhi, unsigned int nIn, float *pOut, + float *delayBuf, float *temp) +{ + int i, j; + float *p1, *p3; + + memcpy(temp, delayBuf, 46*sizeof(float)); + + p3 = temp + 46; + + /* loop1 */ + for(i=0; i +#include + +#include "buffer_internal.h" +#include "common.h" +#include "mem.h" + +AVBufferRef *av_buffer_create(uint8_t *data, int size, + void (*free)(void *opaque, uint8_t *data), + void *opaque, int flags) +{ + AVBufferRef *ref = NULL; + AVBuffer *buf = NULL; + + buf = av_mallocz(sizeof(*buf)); + if (!buf) + return NULL; + + buf->data = data; + buf->size = size; + buf->free = free ? free : av_buffer_default_free; + buf->opaque = opaque; + buf->refcount = 1; + + if (flags & AV_BUFFER_FLAG_READONLY) + buf->flags |= BUFFER_FLAG_READONLY; + + ref = av_mallocz(sizeof(*ref)); + if (!ref) { + av_freep(&buf); + return NULL; + } + + ref->buffer = buf; + ref->data = data; + ref->size = size; + + return ref; +} + +void av_buffer_default_free(void *opaque, uint8_t *data) +{ + av_free(data); +} + +AVBufferRef *av_buffer_alloc(int size) +{ + AVBufferRef *ret = NULL; + uint8_t *data = NULL; + + data = av_malloc(size); + if (!data) + return NULL; + + ret = av_buffer_create(data, size, av_buffer_default_free, NULL, 0); + if (!ret) + av_freep(&data); + + return ret; +} + +AVBufferRef *av_buffer_allocz(int size) +{ + AVBufferRef *ret = av_buffer_alloc(size); + if (!ret) + return NULL; + + memset(ret->data, 0, size); + return ret; +} + +AVBufferRef *av_buffer_ref(AVBufferRef *buf) +{ + AVBufferRef *ret = av_mallocz(sizeof(*ret)); + + if (!ret) + return NULL; + + *ret = *buf; + + avpriv_atomic_int_add_and_fetch(&buf->buffer->refcount, 1); + + return ret; +} + +static void buffer_replace(AVBufferRef **dst, AVBufferRef **src) +{ + AVBuffer *b; + + b = (*dst)->buffer; + + if (src) { + **dst = **src; + av_freep(src); + } else + av_freep(dst); + + if (!avpriv_atomic_int_add_and_fetch(&b->refcount, -1)) { + b->free(b->opaque, b->data); + av_freep(&b); + } +} + +void av_buffer_unref(AVBufferRef **buf) +{ + if (!buf || !*buf) + return; + + buffer_replace(buf, NULL); +} + +int av_buffer_is_writable(const AVBufferRef *buf) +{ + if (buf->buffer->flags & AV_BUFFER_FLAG_READONLY) + return 0; + + return avpriv_atomic_int_get(&buf->buffer->refcount) == 1; +} + +void *av_buffer_get_opaque(const AVBufferRef *buf) +{ + return buf->buffer->opaque; +} + +int av_buffer_get_ref_count(const AVBufferRef *buf) +{ + return buf->buffer->refcount; +} + +int av_buffer_make_writable(AVBufferRef **pbuf) +{ + AVBufferRef *newbuf, *buf = *pbuf; + + if (av_buffer_is_writable(buf)) + return 0; + + newbuf = av_buffer_alloc(buf->size); + if (!newbuf) + return AVERROR(ENOMEM); + + memcpy(newbuf->data, buf->data, buf->size); + + buffer_replace(pbuf, &newbuf); + + return 0; +} + +int av_buffer_realloc(AVBufferRef **pbuf, int size) +{ + AVBufferRef *buf = *pbuf; + uint8_t *tmp; + + if (!buf) { + /* allocate a new buffer with av_realloc(), so it will be reallocatable + * later */ + uint8_t *data = av_realloc(NULL, size); + if (!data) + return AVERROR(ENOMEM); + + buf = av_buffer_create(data, size, av_buffer_default_free, NULL, 0); + if (!buf) { + av_freep(&data); + return AVERROR(ENOMEM); + } + + buf->buffer->flags |= BUFFER_FLAG_REALLOCATABLE; + *pbuf = buf; + + return 0; + } else if (buf->size == size) + return 0; + + if (!(buf->buffer->flags & BUFFER_FLAG_REALLOCATABLE) || + !av_buffer_is_writable(buf)) { + /* cannot realloc, allocate a new reallocable buffer and copy data */ + AVBufferRef *newb = NULL; + + av_buffer_realloc(&newb, size); + if (!newb) + return AVERROR(ENOMEM); + + memcpy(newb->data, buf->data, FFMIN(size, buf->size)); + + buffer_replace(pbuf, &newb); + return 0; + } + + tmp = av_realloc(buf->buffer->data, size); + if (!tmp) + return AVERROR(ENOMEM); + + buf->buffer->data = buf->data = tmp; + buf->buffer->size = buf->size = size; + return 0; +} + +AVBufferPool *av_buffer_pool_init(int size, AVBufferRef* (*alloc)(int size)) +{ + AVBufferPool *pool = av_mallocz(sizeof(*pool)); + if (!pool) + return NULL; + + pool->size = size; + pool->alloc = alloc ? alloc : av_buffer_alloc; + + avpriv_atomic_int_set(&pool->refcount, 1); + + return pool; +} + +/* + * This function gets called when the pool has been uninited and + * all the buffers returned to it. + */ +static void buffer_pool_free(AVBufferPool *pool) +{ + while (pool->pool) { + BufferPoolEntry *buf = pool->pool; + pool->pool = buf->next; + + buf->free(buf->opaque, buf->data); + av_freep(&buf); + } + av_freep(&pool); +} + +void av_buffer_pool_uninit(AVBufferPool **ppool) +{ + AVBufferPool *pool; + + if (!ppool || !*ppool) + return; + pool = *ppool; + *ppool = NULL; + + if (!avpriv_atomic_int_add_and_fetch(&pool->refcount, -1)) + buffer_pool_free(pool); +} + +#if USE_ATOMICS +/* remove the whole buffer list from the pool and return it */ +static BufferPoolEntry *get_pool(AVBufferPool *pool) +{ + BufferPoolEntry *cur = *(void * volatile *)&pool->pool, *last = NULL; + + while (cur != last) { + last = cur; + cur = avpriv_atomic_ptr_cas((void * volatile *)&pool->pool, last, NULL); + if (!cur) + return NULL; + } + + return cur; +} + +static void add_to_pool(BufferPoolEntry *buf) +{ + AVBufferPool *pool; + BufferPoolEntry *cur, *end = buf; + + if (!buf) + return; + pool = buf->pool; + + while (end->next) + end = end->next; + + while (avpriv_atomic_ptr_cas((void * volatile *)&pool->pool, NULL, buf)) { + /* pool is not empty, retrieve it and append it to our list */ + cur = get_pool(pool); + end->next = cur; + while (end->next) + end = end->next; + } +} +#endif + +static void pool_release_buffer(void *opaque, uint8_t *data) +{ + BufferPoolEntry *buf = opaque; + AVBufferPool *pool = buf->pool; + +#if USE_ATOMICS + add_to_pool(buf); +#else + buf->next = pool->pool; + pool->pool = buf; +#endif + + if (!avpriv_atomic_int_add_and_fetch(&pool->refcount, -1)) + buffer_pool_free(pool); +} + +/* allocate a new buffer and override its free() callback so that + * it is returned to the pool on free */ +static AVBufferRef *pool_alloc_buffer(AVBufferPool *pool) +{ + BufferPoolEntry *buf; + AVBufferRef *ret; + + ret = pool->alloc(pool->size); + if (!ret) + return NULL; + + buf = av_mallocz(sizeof(*buf)); + if (!buf) { + av_buffer_unref(&ret); + return NULL; + } + + buf->data = ret->buffer->data; + buf->opaque = ret->buffer->opaque; + buf->free = ret->buffer->free; + buf->pool = pool; + + ret->buffer->opaque = buf; + ret->buffer->free = pool_release_buffer; + +#if USE_ATOMICS + avpriv_atomic_int_add_and_fetch(&pool->refcount, 1); + avpriv_atomic_int_add_and_fetch(&pool->nb_allocated, 1); +#endif + + return ret; +} + +AVBufferRef *av_buffer_pool_get(AVBufferPool *pool) +{ + AVBufferRef *ret; + BufferPoolEntry *buf; + +#if USE_ATOMICS + /* check whether the pool is empty */ + buf = get_pool(pool); + if (!buf && pool->refcount <= pool->nb_allocated) { + av_log(NULL, AV_LOG_DEBUG, "Pool race dectected, spining to avoid overallocation and eventual OOM\n"); + while (!buf && avpriv_atomic_int_get(&pool->refcount) <= avpriv_atomic_int_get(&pool->nb_allocated)) + buf = get_pool(pool); + } + + if (!buf) + return pool_alloc_buffer(pool); + + /* keep the first entry, return the rest of the list to the pool */ + add_to_pool(buf->next); + buf->next = NULL; + + ret = av_buffer_create(buf->data, pool->size, pool_release_buffer, + buf, 0); + if (!ret) { + add_to_pool(buf); + return NULL; + } +#else + buf = pool->pool; + if (buf) { + ret = av_buffer_create(buf->data, pool->size, pool_release_buffer, + buf, 0); + if (ret) { + pool->pool = buf->next; + buf->next = NULL; + } + } else { + ret = pool_alloc_buffer(pool); + } +#endif + + if (ret) + avpriv_atomic_int_add_and_fetch(&pool->refcount, 1); + + return ret; +} diff --git a/ext/at3_standalone/avcodec.h b/ext/at3_standalone/avcodec.h index ee37317a71..65c8b39d7e 100644 --- a/ext/at3_standalone/avcodec.h +++ b/ext/at3_standalone/avcodec.h @@ -28,15 +28,15 @@ */ #include -/* +#include "attributes.h" +#include "buffer.h" +#include "channel_layout.h" +#include "log.h" + /* #include "libavutil/samplefmt.h" -#include "libavutil/attributes.h" #include "libavutil/avutil.h" -#include "libavutil/buffer.h" #include "libavutil/cpu.h" -#include "libavutil/channel_layout.h" #include "libavutil/dict.h" -#include "libavutil/log.h" #include "libavutil/pixfmt.h" */ #include "frame.h" @@ -1451,7 +1451,7 @@ typedef struct AVPacket { * stored. * May be NULL, then the packet data is not reference-counted. */ - // AVBufferRef *buf; + AVBufferRef *buf; /** * Presentation timestamp in AVStream->time_base units; the time at which * the decompressed packet will be presented to the user. @@ -1538,7 +1538,7 @@ typedef struct AVCodecContext { * information on struct for av_log * - set by avcodec_alloc_context3 */ - // const AVClass *av_class; + const AVClass *av_class; int log_level_offset; enum AVMediaType codec_type; /* see AVMEDIA_TYPE_xxx */ diff --git a/ext/at3_standalone/avpacket.c b/ext/at3_standalone/avpacket.c new file mode 100644 index 0000000000..5d2e3ebf64 --- /dev/null +++ b/ext/at3_standalone/avpacket.c @@ -0,0 +1,642 @@ +/* + * AVPacket functions for libavcodec + * Copyright (c) 2000, 2001, 2002 Fabrice Bellard + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include + +#include "common.h" +#include "internal.h" +#include "mathematics.h" +#include "mem.h" +#include "avcodec.h" +#include "bytestream.h" +#include "internal.h" + +void av_init_packet(AVPacket *pkt) +{ + pkt->pts = AV_NOPTS_VALUE; + pkt->dts = AV_NOPTS_VALUE; + pkt->pos = -1; + pkt->duration = 0; +#if FF_API_CONVERGENCE_DURATION +FF_DISABLE_DEPRECATION_WARNINGS + pkt->convergence_duration = 0; +FF_ENABLE_DEPRECATION_WARNINGS +#endif + pkt->flags = 0; + pkt->stream_index = 0; + pkt->buf = NULL; + pkt->side_data = NULL; + pkt->side_data_elems = 0; +} + +AVPacket *av_packet_alloc(void) +{ + AVPacket *pkt = av_mallocz(sizeof(AVPacket)); + if (!pkt) + return pkt; + + av_packet_unref(pkt); + + return pkt; +} + +void av_packet_free(AVPacket **pkt) +{ + if (!pkt || !*pkt) + return; + + av_packet_unref(*pkt); + av_freep(pkt); +} + +static int packet_alloc(AVBufferRef **buf, int size) +{ + int ret; + if (size < 0 || size >= INT_MAX - AV_INPUT_BUFFER_PADDING_SIZE) + return AVERROR(EINVAL); + + ret = av_buffer_realloc(buf, size + AV_INPUT_BUFFER_PADDING_SIZE); + if (ret < 0) + return ret; + + memset((*buf)->data + size, 0, AV_INPUT_BUFFER_PADDING_SIZE); + + return 0; +} + +int av_new_packet(AVPacket *pkt, int size) +{ + AVBufferRef *buf = NULL; + int ret = packet_alloc(&buf, size); + if (ret < 0) + return ret; + + av_init_packet(pkt); + pkt->buf = buf; + pkt->data = buf->data; + pkt->size = size; + + return 0; +} + +void av_shrink_packet(AVPacket *pkt, int size) +{ + if (pkt->size <= size) + return; + pkt->size = size; + memset(pkt->data + size, 0, AV_INPUT_BUFFER_PADDING_SIZE); +} + +int av_grow_packet(AVPacket *pkt, int grow_by) +{ + int new_size; + av_assert0((unsigned)pkt->size <= INT_MAX - AV_INPUT_BUFFER_PADDING_SIZE); + if (!pkt->size) + return av_new_packet(pkt, grow_by); + if ((unsigned)grow_by > + INT_MAX - (pkt->size + AV_INPUT_BUFFER_PADDING_SIZE)) + return -1; + + new_size = pkt->size + grow_by + AV_INPUT_BUFFER_PADDING_SIZE; + if (pkt->buf) { + int ret = av_buffer_realloc(&pkt->buf, new_size); + if (ret < 0) + return ret; + } else { + pkt->buf = av_buffer_alloc(new_size); + if (!pkt->buf) + return AVERROR(ENOMEM); + memcpy(pkt->buf->data, pkt->data, FFMIN(pkt->size, pkt->size + grow_by)); + } + pkt->data = pkt->buf->data; + pkt->size += grow_by; + memset(pkt->data + pkt->size, 0, AV_INPUT_BUFFER_PADDING_SIZE); + + return 0; +} + +int av_packet_from_data(AVPacket *pkt, uint8_t *data, int size) +{ + if (size >= INT_MAX - AV_INPUT_BUFFER_PADDING_SIZE) + return AVERROR(EINVAL); + + pkt->buf = av_buffer_create(data, size + AV_INPUT_BUFFER_PADDING_SIZE, + av_buffer_default_free, NULL, 0); + if (!pkt->buf) + return AVERROR(ENOMEM); + + pkt->data = data; + pkt->size = size; + + return 0; +} + +#if FF_API_AVPACKET_OLD_API +FF_DISABLE_DEPRECATION_WARNINGS +#define ALLOC_MALLOC(data, size) data = av_malloc(size) +#define ALLOC_BUF(data, size) \ +do { \ + av_buffer_realloc(&pkt->buf, size); \ + data = pkt->buf ? pkt->buf->data : NULL; \ +} while (0) + +#define DUP_DATA(dst, src, size, padding, ALLOC) \ + do { \ + void *data; \ + if (padding) { \ + if ((unsigned)(size) > \ + (unsigned)(size) + AV_INPUT_BUFFER_PADDING_SIZE) \ + goto failed_alloc; \ + ALLOC(data, size + AV_INPUT_BUFFER_PADDING_SIZE); \ + } else { \ + ALLOC(data, size); \ + } \ + if (!data) \ + goto failed_alloc; \ + memcpy(data, src, size); \ + if (padding) \ + memset((uint8_t *)data + size, 0, \ + AV_INPUT_BUFFER_PADDING_SIZE); \ + dst = data; \ + } while (0) + +/* Makes duplicates of data, side_data, but does not copy any other fields */ +static int copy_packet_data(AVPacket *pkt, const AVPacket *src, int dup) +{ + pkt->data = NULL; + pkt->side_data = NULL; + if (pkt->buf) { + AVBufferRef *ref = av_buffer_ref(src->buf); + if (!ref) + return AVERROR(ENOMEM); + pkt->buf = ref; + pkt->data = ref->data; + } else { + DUP_DATA(pkt->data, src->data, pkt->size, 1, ALLOC_BUF); + } + if (pkt->side_data_elems && dup) + pkt->side_data = src->side_data; + if (pkt->side_data_elems && !dup) { + return av_copy_packet_side_data(pkt, src); + } + return 0; + +failed_alloc: + av_packet_unref(pkt); + return AVERROR(ENOMEM); +} + +int av_copy_packet_side_data(AVPacket *pkt, const AVPacket *src) +{ + if (src->side_data_elems) { + int i; + DUP_DATA(pkt->side_data, src->side_data, + src->side_data_elems * sizeof(*src->side_data), 0, ALLOC_MALLOC); + if (src != pkt) { + memset(pkt->side_data, 0, + src->side_data_elems * sizeof(*src->side_data)); + } + for (i = 0; i < src->side_data_elems; i++) { + DUP_DATA(pkt->side_data[i].data, src->side_data[i].data, + src->side_data[i].size, 1, ALLOC_MALLOC); + pkt->side_data[i].size = src->side_data[i].size; + pkt->side_data[i].type = src->side_data[i].type; + } + } + pkt->side_data_elems = src->side_data_elems; + return 0; + +failed_alloc: + av_packet_unref(pkt); + return AVERROR(ENOMEM); +} +FF_ENABLE_DEPRECATION_WARNINGS +#endif + +int av_dup_packet(AVPacket *pkt) +{ + AVPacket tmp_pkt; + + if (!pkt->buf && pkt->data) { + tmp_pkt = *pkt; + return copy_packet_data(pkt, &tmp_pkt, 1); + } + return 0; +} + +int av_copy_packet(AVPacket *dst, const AVPacket *src) +{ + *dst = *src; + return copy_packet_data(dst, src, 0); +} + +void av_packet_free_side_data(AVPacket *pkt) +{ + int i; + for (i = 0; i < pkt->side_data_elems; i++) + av_freep(&pkt->side_data[i].data); + av_freep(&pkt->side_data); + pkt->side_data_elems = 0; +} + +#if FF_API_AVPACKET_OLD_API +FF_DISABLE_DEPRECATION_WARNINGS +void av_free_packet(AVPacket *pkt) +{ + if (pkt) { + if (pkt->buf) + av_buffer_unref(&pkt->buf); + pkt->data = NULL; + pkt->size = 0; + + av_packet_free_side_data(pkt); + } +} +FF_ENABLE_DEPRECATION_WARNINGS +#endif + +int av_packet_add_side_data(AVPacket *pkt, enum AVPacketSideDataType type, + uint8_t *data, size_t size) +{ + int elems = pkt->side_data_elems; + + if ((unsigned)elems + 1 > INT_MAX / sizeof(*pkt->side_data)) + return AVERROR(ERANGE); + + pkt->side_data = av_realloc(pkt->side_data, + (elems + 1) * sizeof(*pkt->side_data)); + if (!pkt->side_data) + return AVERROR(ENOMEM); + + pkt->side_data[elems].data = data; + pkt->side_data[elems].size = size; + pkt->side_data[elems].type = type; + pkt->side_data_elems++; + + return 0; +} + + +uint8_t *av_packet_new_side_data(AVPacket *pkt, enum AVPacketSideDataType type, + int size) +{ + int ret; + uint8_t *data; + + if ((unsigned)size > INT_MAX - AV_INPUT_BUFFER_PADDING_SIZE) + return NULL; + data = av_mallocz(size + AV_INPUT_BUFFER_PADDING_SIZE); + if (!data) + return NULL; + + ret = av_packet_add_side_data(pkt, type, data, size); + if (ret < 0) { + av_freep(&data); + return NULL; + } + + return data; +} + +uint8_t *av_packet_get_side_data(AVPacket *pkt, enum AVPacketSideDataType type, + int *size) +{ + int i; + + for (i = 0; i < pkt->side_data_elems; i++) { + if (pkt->side_data[i].type == type) { + if (size) + *size = pkt->side_data[i].size; + return pkt->side_data[i].data; + } + } + return NULL; +} + +const char *av_packet_side_data_name(enum AVPacketSideDataType type) +{ + switch(type) { + case AV_PKT_DATA_PALETTE: return "Palette"; + case AV_PKT_DATA_NEW_EXTRADATA: return "New Extradata"; + case AV_PKT_DATA_PARAM_CHANGE: return "Param Change"; + case AV_PKT_DATA_H263_MB_INFO: return "H263 MB Info"; + case AV_PKT_DATA_REPLAYGAIN: return "Replay Gain"; + case AV_PKT_DATA_DISPLAYMATRIX: return "Display Matrix"; + case AV_PKT_DATA_STEREO3D: return "Stereo 3D"; + case AV_PKT_DATA_AUDIO_SERVICE_TYPE: return "Audio Service Type"; + case AV_PKT_DATA_SKIP_SAMPLES: return "Skip Samples"; + case AV_PKT_DATA_JP_DUALMONO: return "JP Dual Mono"; + case AV_PKT_DATA_STRINGS_METADATA: return "Strings Metadata"; + case AV_PKT_DATA_SUBTITLE_POSITION: return "Subtitle Position"; + case AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL: return "Matroska BlockAdditional"; + case AV_PKT_DATA_WEBVTT_IDENTIFIER: return "WebVTT ID"; + case AV_PKT_DATA_WEBVTT_SETTINGS: return "WebVTT Settings"; + case AV_PKT_DATA_METADATA_UPDATE: return "Metadata Update"; + } + return NULL; +} + +#define FF_MERGE_MARKER 0x8c4d9d108e25e9feULL + +int av_packet_merge_side_data(AVPacket *pkt){ + if(pkt->side_data_elems){ + AVBufferRef *buf; + int i; + uint8_t *p; + uint64_t size= pkt->size + 8LL + AV_INPUT_BUFFER_PADDING_SIZE; + AVPacket old= *pkt; + for (i=0; i INT_MAX) + return AVERROR(EINVAL); + buf = av_buffer_alloc(size); + if (!buf) + return AVERROR(ENOMEM); + pkt->buf = buf; + pkt->data = p = buf->data; + pkt->size = size - AV_INPUT_BUFFER_PADDING_SIZE; + bytestream_put_buffer(&p, old.data, old.size); + for (i=old.side_data_elems-1; i>=0; i--) { + bytestream_put_buffer(&p, old.side_data[i].data, old.side_data[i].size); + bytestream_put_be32(&p, old.side_data[i].size); + *p++ = old.side_data[i].type | ((i==old.side_data_elems-1)*128); + } + bytestream_put_be64(&p, FF_MERGE_MARKER); + av_assert0(p-pkt->data == pkt->size); + memset(p, 0, AV_INPUT_BUFFER_PADDING_SIZE); + av_packet_unref(&old); + pkt->side_data_elems = 0; + pkt->side_data = NULL; + return 1; + } + return 0; +} + +int av_packet_split_side_data(AVPacket *pkt){ + if (!pkt->side_data_elems && pkt->size >12 && AV_RB64(pkt->data + pkt->size - 8) == FF_MERGE_MARKER){ + int i; + unsigned int size; + uint8_t *p; + + p = pkt->data + pkt->size - 8 - 5; + for (i=1; ; i++){ + size = AV_RB32(p); + if (size>INT_MAX - 5 || p - pkt->data < size) + return 0; + if (p[4]&128) + break; + if (p - pkt->data < size + 5) + return 0; + p-= size+5; + } + + pkt->side_data = av_malloc_array(i, sizeof(*pkt->side_data)); + if (!pkt->side_data) + return AVERROR(ENOMEM); + + p= pkt->data + pkt->size - 8 - 5; + for (i=0; ; i++){ + size= AV_RB32(p); + av_assert0(size<=INT_MAX - 5 && p - pkt->data >= size); + pkt->side_data[i].data = av_mallocz(size + AV_INPUT_BUFFER_PADDING_SIZE); + pkt->side_data[i].size = size; + pkt->side_data[i].type = p[4]&127; + if (!pkt->side_data[i].data) + return AVERROR(ENOMEM); + memcpy(pkt->side_data[i].data, p-size, size); + pkt->size -= size + 5; + if(p[4]&128) + break; + p-= size+5; + } + pkt->size -= 8; + pkt->side_data_elems = i+1; + return 1; + } + return 0; +} + +uint8_t *av_packet_pack_dictionary(AVDictionary *dict, int *size) +{ + AVDictionaryEntry *t = NULL; + uint8_t *data = NULL; + *size = 0; + + if (!dict) + return NULL; + + while ((t = av_dict_get(dict, "", t, AV_DICT_IGNORE_SUFFIX))) { + const size_t keylen = strlen(t->key); + const size_t valuelen = strlen(t->value); + const size_t new_size = *size + keylen + 1 + valuelen + 1; + uint8_t *const new_data = av_realloc(data, new_size); + + if (!new_data) + goto fail; + data = new_data; + if (new_size > INT_MAX) + goto fail; + + memcpy(data + *size, t->key, keylen + 1); + memcpy(data + *size + keylen + 1, t->value, valuelen + 1); + + *size = new_size; + } + + return data; + +fail: + av_freep(&data); + *size = 0; + return NULL; +} + +int av_packet_unpack_dictionary(const uint8_t *data, int size, AVDictionary **dict) +{ + const uint8_t *end = data + size; + int ret = 0; + + if (!dict || !data || !size) + return ret; + if (size && end[-1]) + return AVERROR_INVALIDDATA; + while (data < end) { + const uint8_t *key = data; + const uint8_t *val = data + strlen(key) + 1; + + if (val >= end) + return AVERROR_INVALIDDATA; + + ret = av_dict_set(dict, key, val, 0); + if (ret < 0) + break; + data = val + strlen(val) + 1; + } + + return ret; +} + +int av_packet_shrink_side_data(AVPacket *pkt, enum AVPacketSideDataType type, + int size) +{ + int i; + + for (i = 0; i < pkt->side_data_elems; i++) { + if (pkt->side_data[i].type == type) { + if (size > pkt->side_data[i].size) + return AVERROR(ENOMEM); + pkt->side_data[i].size = size; + return 0; + } + } + return AVERROR(ENOENT); +} + +int av_packet_copy_props(AVPacket *dst, const AVPacket *src) +{ + int i; + + dst->pts = src->pts; + dst->dts = src->dts; + dst->pos = src->pos; + dst->duration = src->duration; +#if FF_API_CONVERGENCE_DURATION +FF_DISABLE_DEPRECATION_WARNINGS + dst->convergence_duration = src->convergence_duration; +FF_ENABLE_DEPRECATION_WARNINGS +#endif + dst->flags = src->flags; + dst->stream_index = src->stream_index; + + for (i = 0; i < src->side_data_elems; i++) { + enum AVPacketSideDataType type = src->side_data[i].type; + int size = src->side_data[i].size; + uint8_t *src_data = src->side_data[i].data; + uint8_t *dst_data = av_packet_new_side_data(dst, type, size); + + if (!dst_data) { + av_packet_free_side_data(dst); + return AVERROR(ENOMEM); + } + memcpy(dst_data, src_data, size); + } + + return 0; +} + +void av_packet_unref(AVPacket *pkt) +{ + av_packet_free_side_data(pkt); + av_buffer_unref(&pkt->buf); + av_init_packet(pkt); + pkt->data = NULL; + pkt->size = 0; +} + +int av_packet_ref(AVPacket *dst, const AVPacket *src) +{ + int ret; + + ret = av_packet_copy_props(dst, src); + if (ret < 0) + return ret; + + if (!src->buf) { + ret = packet_alloc(&dst->buf, src->size); + if (ret < 0) + goto fail; + memcpy(dst->buf->data, src->data, src->size); + } else { + dst->buf = av_buffer_ref(src->buf); + if (!dst->buf) { + ret = AVERROR(ENOMEM); + goto fail; + } + } + + dst->size = src->size; + dst->data = dst->buf->data; + return 0; +fail: + av_packet_free_side_data(dst); + return ret; +} + +AVPacket *av_packet_clone(AVPacket *src) +{ + AVPacket *ret = av_packet_alloc(); + + if (!ret) + return ret; + + if (av_packet_ref(ret, src)) + av_packet_free(&ret); + + return ret; +} + +void av_packet_move_ref(AVPacket *dst, AVPacket *src) +{ + *dst = *src; + av_init_packet(src); +} + +void av_packet_rescale_ts(AVPacket *pkt, AVRational src_tb, AVRational dst_tb) +{ + if (pkt->pts != AV_NOPTS_VALUE) + pkt->pts = av_rescale_q(pkt->pts, src_tb, dst_tb); + if (pkt->dts != AV_NOPTS_VALUE) + pkt->dts = av_rescale_q(pkt->dts, src_tb, dst_tb); + if (pkt->duration > 0) + pkt->duration = av_rescale_q(pkt->duration, src_tb, dst_tb); +#if FF_API_CONVERGENCE_DURATION +FF_DISABLE_DEPRECATION_WARNINGS + if (pkt->convergence_duration > 0) + pkt->convergence_duration = av_rescale_q(pkt->convergence_duration, src_tb, dst_tb); +FF_ENABLE_DEPRECATION_WARNINGS +#endif +} + +int ff_side_data_set_encoder_stats(AVPacket *pkt, int quality, int64_t *error, int error_count, int pict_type) +{ + uint8_t *side_data; + int side_data_size; + int i; + + side_data = av_packet_get_side_data(pkt, AV_PKT_DATA_QUALITY_STATS, &side_data_size); + if (!side_data) { + side_data_size = 4+4+8*error_count; + side_data = av_packet_new_side_data(pkt, AV_PKT_DATA_QUALITY_STATS, + side_data_size); + } + + if (!side_data || side_data_size < 4+4+8*error_count) + return AVERROR(ENOMEM); + + AV_WL32(side_data , quality ); + side_data[4] = pict_type; + side_data[5] = error_count; + for (i = 0; i +#include +#include +#include + +#include "config.h" +#include "common.h" +#include "mem.h" +#include "avstring.h" +#include "bprint.h" + +int av_strstart(const char *str, const char *pfx, const char **ptr) +{ + while (*pfx && *pfx == *str) { + pfx++; + str++; + } + if (!*pfx && ptr) + *ptr = str; + return !*pfx; +} + +int av_stristart(const char *str, const char *pfx, const char **ptr) +{ + while (*pfx && av_toupper((unsigned)*pfx) == av_toupper((unsigned)*str)) { + pfx++; + str++; + } + if (!*pfx && ptr) + *ptr = str; + return !*pfx; +} + +char *av_stristr(const char *s1, const char *s2) +{ + if (!*s2) + return (char*)(intptr_t)s1; + + do + if (av_stristart(s1, s2, NULL)) + return (char*)(intptr_t)s1; + while (*s1++); + + return NULL; +} + +char *av_strnstr(const char *haystack, const char *needle, size_t hay_length) +{ + size_t needle_len = strlen(needle); + if (!needle_len) + return (char*)haystack; + while (hay_length >= needle_len) { + hay_length--; + if (!memcmp(haystack, needle, needle_len)) + return (char*)haystack; + haystack++; + } + return NULL; +} + +size_t av_strlcpy(char *dst, const char *src, size_t size) +{ + size_t len = 0; + while (++len < size && *src) + *dst++ = *src++; + if (len <= size) + *dst = 0; + return len + strlen(src) - 1; +} + +size_t av_strlcat(char *dst, const char *src, size_t size) +{ + size_t len = strlen(dst); + if (size <= len + 1) + return len + strlen(src); + return len + av_strlcpy(dst + len, src, size - len); +} + +size_t av_strlcatf(char *dst, size_t size, const char *fmt, ...) +{ + size_t len = strlen(dst); + va_list vl; + + va_start(vl, fmt); + len += vsnprintf(dst + len, size > len ? size - len : 0, fmt, vl); + va_end(vl); + + return len; +} + +char *av_asprintf(const char *fmt, ...) +{ + char *p = NULL; + va_list va; + int len; + + va_start(va, fmt); + len = vsnprintf(NULL, 0, fmt, va); + va_end(va); + if (len < 0) + goto end; + + p = av_malloc(len + 1); + if (!p) + goto end; + + va_start(va, fmt); + len = vsnprintf(p, len + 1, fmt, va); + va_end(va); + if (len < 0) + av_freep(&p); + +end: + return p; +} + +char *av_d2str(double d) +{ + char *str = av_malloc(16); + if (str) + snprintf(str, 16, "%f", d); + return str; +} + +#define WHITESPACES " \n\t" + +char *av_get_token(const char **buf, const char *term) +{ + char *out = av_malloc(strlen(*buf) + 1); + char *ret = out, *end = out; + const char *p = *buf; + if (!out) + return NULL; + p += strspn(p, WHITESPACES); + + while (*p && !strspn(p, term)) { + char c = *p++; + if (c == '\\' && *p) { + *out++ = *p++; + end = out; + } else if (c == '\'') { + while (*p && *p != '\'') + *out++ = *p++; + if (*p) { + p++; + end = out; + } + } else { + *out++ = c; + } + } + + do + *out-- = 0; + while (out >= end && strspn(out, WHITESPACES)); + + *buf = p; + + return ret; +} + +char *av_strtok(char *s, const char *delim, char **saveptr) +{ + char *tok; + + if (!s && !(s = *saveptr)) + return NULL; + + /* skip leading delimiters */ + s += strspn(s, delim); + + /* s now points to the first non delimiter char, or to the end of the string */ + if (!*s) { + *saveptr = NULL; + return NULL; + } + tok = s++; + + /* skip non delimiters */ + s += strcspn(s, delim); + if (*s) { + *s = 0; + *saveptr = s+1; + } else { + *saveptr = NULL; + } + + return tok; +} + +int av_strcasecmp(const char *a, const char *b) +{ + uint8_t c1, c2; + do { + c1 = av_tolower(*a++); + c2 = av_tolower(*b++); + } while (c1 && c1 == c2); + return c1 - c2; +} + +int av_strncasecmp(const char *a, const char *b, size_t n) +{ + const char *end = a + n; + uint8_t c1, c2; + do { + c1 = av_tolower(*a++); + c2 = av_tolower(*b++); + } while (a < end && c1 && c1 == c2); + return c1 - c2; +} + +const char *av_basename(const char *path) +{ + char *p = strrchr(path, '/'); + +#if HAVE_DOS_PATHS + char *q = strrchr(path, '\\'); + char *d = strchr(path, ':'); + + p = FFMAX3(p, q, d); +#endif + + if (!p) + return path; + + return p + 1; +} + +const char *av_dirname(char *path) +{ + char *p = strrchr(path, '/'); + +#if HAVE_DOS_PATHS + char *q = strrchr(path, '\\'); + char *d = strchr(path, ':'); + + d = d ? d + 1 : d; + + p = FFMAX3(p, q, d); +#endif + + if (!p) + return "."; + + *p = '\0'; + + return path; +} + +char *av_append_path_component(const char *path, const char *component) +{ + size_t p_len, c_len; + char *fullpath; + + if (!path) + return av_strdup(component); + if (!component) + return av_strdup(path); + + p_len = strlen(path); + c_len = strlen(component); + if (p_len > SIZE_MAX - c_len || p_len + c_len > SIZE_MAX - 2) + return NULL; + fullpath = av_malloc(p_len + c_len + 2); + if (fullpath) { + if (p_len) { + av_strlcpy(fullpath, path, p_len + 1); + if (c_len) { + if (fullpath[p_len - 1] != '/' && component[0] != '/') + fullpath[p_len++] = '/'; + else if (fullpath[p_len - 1] == '/' && component[0] == '/') + p_len--; + } + } + av_strlcpy(&fullpath[p_len], component, c_len + 1); + fullpath[p_len + c_len] = 0; + } + return fullpath; +} + +int av_escape(char **dst, const char *src, const char *special_chars, + enum AVEscapeMode mode, int flags) +{ + AVBPrint dstbuf; + + av_bprint_init(&dstbuf, 1, AV_BPRINT_SIZE_UNLIMITED); + av_bprint_escape(&dstbuf, src, special_chars, mode, flags); + + if (!av_bprint_is_complete(&dstbuf)) { + av_bprint_finalize(&dstbuf, NULL); + return AVERROR(ENOMEM); + } else { + av_bprint_finalize(&dstbuf, dst); + return dstbuf.len; + } +} + +int av_match_name(const char *name, const char *names) +{ + const char *p; + int len, namelen; + + if (!name || !names) + return 0; + + namelen = strlen(name); + while (*names) { + int negate = '-' == *names; + p = strchr(names, ','); + if (!p) + p = names + strlen(names); + names += negate; + len = FFMAX(p - names, namelen); + if (!av_strncasecmp(name, names, len) || !strncmp("ALL", names, FFMAX(3, p - names))) + return !negate; + names = p + (*p == ','); + } + return 0; +} + +int av_utf8_decode(int32_t *codep, const uint8_t **bufp, const uint8_t *buf_end, + unsigned int flags) +{ + const uint8_t *p = *bufp; + uint32_t top; + uint64_t code; + int ret = 0, tail_len; + uint32_t overlong_encoding_mins[6] = { + 0x00000000, 0x00000080, 0x00000800, 0x00010000, 0x00200000, 0x04000000, + }; + + if (p >= buf_end) + return 0; + + code = *p++; + + /* first sequence byte starts with 10, or is 1111-1110 or 1111-1111, + which is not admitted */ + if ((code & 0xc0) == 0x80 || code >= 0xFE) { + ret = AVERROR(EILSEQ); + goto end; + } + top = (code & 128) >> 1; + + tail_len = 0; + while (code & top) { + int tmp; + tail_len++; + if (p >= buf_end) { + (*bufp) ++; + return AVERROR(EILSEQ); /* incomplete sequence */ + } + + /* we assume the byte to be in the form 10xx-xxxx */ + tmp = *p++ - 128; /* strip leading 1 */ + if (tmp>>6) { + (*bufp) ++; + return AVERROR(EILSEQ); + } + code = (code<<6) + tmp; + top <<= 5; + } + code &= (top << 1) - 1; + + /* check for overlong encodings */ + av_assert0(tail_len <= 5); + if (code < overlong_encoding_mins[tail_len]) { + ret = AVERROR(EILSEQ); + goto end; + } + + if (code >= 1U<<31) { + ret = AVERROR(EILSEQ); /* out-of-range value */ + goto end; + } + + *codep = code; + + if (code > 0x10FFFF && + !(flags & AV_UTF8_FLAG_ACCEPT_INVALID_BIG_CODES)) + ret = AVERROR(EILSEQ); + if (code < 0x20 && code != 0x9 && code != 0xA && code != 0xD && + flags & AV_UTF8_FLAG_EXCLUDE_XML_INVALID_CONTROL_CODES) + ret = AVERROR(EILSEQ); + if (code >= 0xD800 && code <= 0xDFFF && + !(flags & AV_UTF8_FLAG_ACCEPT_SURROGATES)) + ret = AVERROR(EILSEQ); + if ((code == 0xFFFE || code == 0xFFFF) && + !(flags & AV_UTF8_FLAG_ACCEPT_NON_CHARACTERS)) + ret = AVERROR(EILSEQ); + +end: + *bufp = p; + return ret; +} + +int av_match_list(const char *name, const char *list, char separator) +{ + const char *p, *q; + + for (p = name; p && *p; ) { + for (q = list; q && *q; ) { + int k; + for (k = 0; p[k] == q[k] || (p[k]*q[k] == 0 && p[k]+q[k] == separator); k++) + if (k && (!p[k] || p[k] == separator)) + return 1; + q = strchr(q, separator); + q += !!q; + } + p = strchr(p, separator); + p += !!p; + } + + return 0; +} + +#ifdef TEST + +int main(void) +{ + int i; + char *fullpath; + static const char * const strings[] = { + "''", + "", + ":", + "\\", + "'", + " '' :", + " '' '' :", + "foo '' :", + "'foo'", + "foo ", + " ' foo ' ", + "foo\\", + "foo': blah:blah", + "foo\\: blah:blah", + "foo\'", + "'foo : ' :blahblah", + "\\ :blah", + " foo", + " foo ", + " foo \\ ", + "foo ':blah", + " foo bar : blahblah", + "\\f\\o\\o", + "'foo : \\ \\ ' : blahblah", + "'\\fo\\o:': blahblah", + "\\'fo\\o\\:': foo ' :blahblah" + }; + + printf("Testing av_get_token()\n"); + for (i = 0; i < FF_ARRAY_ELEMS(strings); i++) { + const char *p = strings[i]; + char *q; + printf("|%s|", p); + q = av_get_token(&p, ":"); + printf(" -> |%s|", q); + printf(" + |%s|\n", p); + av_free(q); + } + + printf("Testing av_append_path_component()\n"); + #define TEST_APPEND_PATH_COMPONENT(path, component, expected) \ + fullpath = av_append_path_component((path), (component)); \ + printf("%s = %s\n", fullpath ? fullpath : "(null)", expected); \ + av_free(fullpath); + TEST_APPEND_PATH_COMPONENT(NULL, NULL, "(null)") + TEST_APPEND_PATH_COMPONENT("path", NULL, "path"); + TEST_APPEND_PATH_COMPONENT(NULL, "comp", "comp"); + TEST_APPEND_PATH_COMPONENT("path", "comp", "path/comp"); + TEST_APPEND_PATH_COMPONENT("path/", "comp", "path/comp"); + TEST_APPEND_PATH_COMPONENT("path", "/comp", "path/comp"); + TEST_APPEND_PATH_COMPONENT("path/", "/comp", "path/comp"); + TEST_APPEND_PATH_COMPONENT("path/path2/", "/comp/comp2", "path/path2/comp/comp2"); + return 0; +} + +#endif /* TEST */ diff --git a/ext/at3_standalone/avstring.h b/ext/at3_standalone/avstring.h new file mode 100644 index 0000000000..15b04babef --- /dev/null +++ b/ext/at3_standalone/avstring.h @@ -0,0 +1,402 @@ +/* + * Copyright (c) 2007 Mans Rullgard + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVUTIL_AVSTRING_H +#define AVUTIL_AVSTRING_H + +#include +#include +#include "attributes.h" + +/** + * @addtogroup lavu_string + * @{ + */ + +/** + * Return non-zero if pfx is a prefix of str. If it is, *ptr is set to + * the address of the first character in str after the prefix. + * + * @param str input string + * @param pfx prefix to test + * @param ptr updated if the prefix is matched inside str + * @return non-zero if the prefix matches, zero otherwise + */ +int av_strstart(const char *str, const char *pfx, const char **ptr); + +/** + * Return non-zero if pfx is a prefix of str independent of case. If + * it is, *ptr is set to the address of the first character in str + * after the prefix. + * + * @param str input string + * @param pfx prefix to test + * @param ptr updated if the prefix is matched inside str + * @return non-zero if the prefix matches, zero otherwise + */ +int av_stristart(const char *str, const char *pfx, const char **ptr); + +/** + * Locate the first case-independent occurrence in the string haystack + * of the string needle. A zero-length string needle is considered to + * match at the start of haystack. + * + * This function is a case-insensitive version of the standard strstr(). + * + * @param haystack string to search in + * @param needle string to search for + * @return pointer to the located match within haystack + * or a null pointer if no match + */ +char *av_stristr(const char *haystack, const char *needle); + +/** + * Locate the first occurrence of the string needle in the string haystack + * where not more than hay_length characters are searched. A zero-length + * string needle is considered to match at the start of haystack. + * + * This function is a length-limited version of the standard strstr(). + * + * @param haystack string to search in + * @param needle string to search for + * @param hay_length length of string to search in + * @return pointer to the located match within haystack + * or a null pointer if no match + */ +char *av_strnstr(const char *haystack, const char *needle, size_t hay_length); + +/** + * Copy the string src to dst, but no more than size - 1 bytes, and + * null-terminate dst. + * + * This function is the same as BSD strlcpy(). + * + * @param dst destination buffer + * @param src source string + * @param size size of destination buffer + * @return the length of src + * + * @warning since the return value is the length of src, src absolutely + * _must_ be a properly 0-terminated string, otherwise this will read beyond + * the end of the buffer and possibly crash. + */ +size_t av_strlcpy(char *dst, const char *src, size_t size); + +/** + * Append the string src to the string dst, but to a total length of + * no more than size - 1 bytes, and null-terminate dst. + * + * This function is similar to BSD strlcat(), but differs when + * size <= strlen(dst). + * + * @param dst destination buffer + * @param src source string + * @param size size of destination buffer + * @return the total length of src and dst + * + * @warning since the return value use the length of src and dst, these + * absolutely _must_ be a properly 0-terminated strings, otherwise this + * will read beyond the end of the buffer and possibly crash. + */ +size_t av_strlcat(char *dst, const char *src, size_t size); + +/** + * Append output to a string, according to a format. Never write out of + * the destination buffer, and always put a terminating 0 within + * the buffer. + * @param dst destination buffer (string to which the output is + * appended) + * @param size total size of the destination buffer + * @param fmt printf-compatible format string, specifying how the + * following parameters are used + * @return the length of the string that would have been generated + * if enough space had been available + */ +size_t av_strlcatf(char *dst, size_t size, const char *fmt, ...) av_printf_format(3, 4); + +/** + * Get the count of continuous non zero chars starting from the beginning. + * + * @param len maximum number of characters to check in the string, that + * is the maximum value which is returned by the function + */ +static inline size_t av_strnlen(const char *s, size_t len) +{ + size_t i; + for (i = 0; i < len && s[i]; i++) + ; + return i; +} + +/** + * Print arguments following specified format into a large enough auto + * allocated buffer. It is similar to GNU asprintf(). + * @param fmt printf-compatible format string, specifying how the + * following parameters are used. + * @return the allocated string + * @note You have to free the string yourself with av_free(). + */ +char *av_asprintf(const char *fmt, ...) av_printf_format(1, 2); + +/** + * Convert a number to a av_malloced string. + */ +char *av_d2str(double d); + +/** + * Unescape the given string until a non escaped terminating char, + * and return the token corresponding to the unescaped string. + * + * The normal \ and ' escaping is supported. Leading and trailing + * whitespaces are removed, unless they are escaped with '\' or are + * enclosed between ''. + * + * @param buf the buffer to parse, buf will be updated to point to the + * terminating char + * @param term a 0-terminated list of terminating chars + * @return the malloced unescaped string, which must be av_freed by + * the user, NULL in case of allocation failure + */ +char *av_get_token(const char **buf, const char *term); + +/** + * Split the string into several tokens which can be accessed by + * successive calls to av_strtok(). + * + * A token is defined as a sequence of characters not belonging to the + * set specified in delim. + * + * On the first call to av_strtok(), s should point to the string to + * parse, and the value of saveptr is ignored. In subsequent calls, s + * should be NULL, and saveptr should be unchanged since the previous + * call. + * + * This function is similar to strtok_r() defined in POSIX.1. + * + * @param s the string to parse, may be NULL + * @param delim 0-terminated list of token delimiters, must be non-NULL + * @param saveptr user-provided pointer which points to stored + * information necessary for av_strtok() to continue scanning the same + * string. saveptr is updated to point to the next character after the + * first delimiter found, or to NULL if the string was terminated + * @return the found token, or NULL when no token is found + */ +char *av_strtok(char *s, const char *delim, char **saveptr); + +/** + * Locale-independent conversion of ASCII isdigit. + */ +static inline av_const int av_isdigit(int c) +{ + return c >= '0' && c <= '9'; +} + +/** + * Locale-independent conversion of ASCII isgraph. + */ +static inline av_const int av_isgraph(int c) +{ + return c > 32 && c < 127; +} + +/** + * Locale-independent conversion of ASCII isspace. + */ +static inline av_const int av_isspace(int c) +{ + return c == ' ' || c == '\f' || c == '\n' || c == '\r' || c == '\t' || + c == '\v'; +} + +/** + * Locale-independent conversion of ASCII characters to uppercase. + */ +static inline av_const int av_toupper(int c) +{ + if (c >= 'a' && c <= 'z') + c ^= 0x20; + return c; +} + +/** + * Locale-independent conversion of ASCII characters to lowercase. + */ +static inline av_const int av_tolower(int c) +{ + if (c >= 'A' && c <= 'Z') + c ^= 0x20; + return c; +} + +/** + * Locale-independent conversion of ASCII isxdigit. + */ +static inline av_const int av_isxdigit(int c) +{ + c = av_tolower(c); + return av_isdigit(c) || (c >= 'a' && c <= 'f'); +} + +/** + * Locale-independent case-insensitive compare. + * @note This means only ASCII-range characters are case-insensitive + */ +int av_strcasecmp(const char *a, const char *b); + +/** + * Locale-independent case-insensitive compare. + * @note This means only ASCII-range characters are case-insensitive + */ +int av_strncasecmp(const char *a, const char *b, size_t n); + + +/** + * Thread safe basename. + * @param path the path, on DOS both \ and / are considered separators. + * @return pointer to the basename substring. + */ +const char *av_basename(const char *path); + +/** + * Thread safe dirname. + * @param path the path, on DOS both \ and / are considered separators. + * @return the path with the separator replaced by the string terminator or ".". + * @note the function may change the input string. + */ +const char *av_dirname(char *path); + +/** + * Match instances of a name in a comma-separated list of names. + * List entries are checked from the start to the end of the names list, + * the first match ends further processing. If an entry prefixed with '-' + * matches, then 0 is returned. The "ALL" list entry is considered to + * match all names. + * + * @param name Name to look for. + * @param names List of names. + * @return 1 on match, 0 otherwise. + */ +int av_match_name(const char *name, const char *names); + +/** + * Append path component to the existing path. + * Path separator '/' is placed between when needed. + * Resulting string have to be freed with av_free(). + * @param path base path + * @param component component to be appended + * @return new path or NULL on error. + */ +char *av_append_path_component(const char *path, const char *component); + +enum AVEscapeMode { + AV_ESCAPE_MODE_AUTO, ///< Use auto-selected escaping mode. + AV_ESCAPE_MODE_BACKSLASH, ///< Use backslash escaping. + AV_ESCAPE_MODE_QUOTE, ///< Use single-quote escaping. +}; + +/** + * Consider spaces special and escape them even in the middle of the + * string. + * + * This is equivalent to adding the whitespace characters to the special + * characters lists, except it is guaranteed to use the exact same list + * of whitespace characters as the rest of libavutil. + */ +#define AV_ESCAPE_FLAG_WHITESPACE (1 << 0) + +/** + * Escape only specified special characters. + * Without this flag, escape also any characters that may be considered + * special by av_get_token(), such as the single quote. + */ +#define AV_ESCAPE_FLAG_STRICT (1 << 1) + +/** + * Escape string in src, and put the escaped string in an allocated + * string in *dst, which must be freed with av_free(). + * + * @param dst pointer where an allocated string is put + * @param src string to escape, must be non-NULL + * @param special_chars string containing the special characters which + * need to be escaped, can be NULL + * @param mode escape mode to employ, see AV_ESCAPE_MODE_* macros. + * Any unknown value for mode will be considered equivalent to + * AV_ESCAPE_MODE_BACKSLASH, but this behaviour can change without + * notice. + * @param flags flags which control how to escape, see AV_ESCAPE_FLAG_ macros + * @return the length of the allocated string, or a negative error code in case of error + * @see av_bprint_escape() + */ +av_warn_unused_result +int av_escape(char **dst, const char *src, const char *special_chars, + enum AVEscapeMode mode, int flags); + +#define AV_UTF8_FLAG_ACCEPT_INVALID_BIG_CODES 1 ///< accept codepoints over 0x10FFFF +#define AV_UTF8_FLAG_ACCEPT_NON_CHARACTERS 2 ///< accept non-characters - 0xFFFE and 0xFFFF +#define AV_UTF8_FLAG_ACCEPT_SURROGATES 4 ///< accept UTF-16 surrogates codes +#define AV_UTF8_FLAG_EXCLUDE_XML_INVALID_CONTROL_CODES 8 ///< exclude control codes not accepted by XML + +#define AV_UTF8_FLAG_ACCEPT_ALL \ + AV_UTF8_FLAG_ACCEPT_INVALID_BIG_CODES|AV_UTF8_FLAG_ACCEPT_NON_CHARACTERS|AV_UTF8_FLAG_ACCEPT_SURROGATES + +/** + * Read and decode a single UTF-8 code point (character) from the + * buffer in *buf, and update *buf to point to the next byte to + * decode. + * + * In case of an invalid byte sequence, the pointer will be updated to + * the next byte after the invalid sequence and the function will + * return an error code. + * + * Depending on the specified flags, the function will also fail in + * case the decoded code point does not belong to a valid range. + * + * @note For speed-relevant code a carefully implemented use of + * GET_UTF8() may be preferred. + * + * @param codep pointer used to return the parsed code in case of success. + * The value in *codep is set even in case the range check fails. + * @param bufp pointer to the address the first byte of the sequence + * to decode, updated by the function to point to the + * byte next after the decoded sequence + * @param buf_end pointer to the end of the buffer, points to the next + * byte past the last in the buffer. This is used to + * avoid buffer overreads (in case of an unfinished + * UTF-8 sequence towards the end of the buffer). + * @param flags a collection of AV_UTF8_FLAG_* flags + * @return >= 0 in case a sequence was successfully read, a negative + * value in case of invalid sequence + */ +av_warn_unused_result +int av_utf8_decode(int32_t *codep, const uint8_t **bufp, const uint8_t *buf_end, + unsigned int flags); + +/** + * Check if a name is in a list. + * @returns 0 if not found, or the 1 based index where it has been found in the + * list. + */ +int av_match_list(const char *name, const char *list, char separator); + +/** + * @} + */ + +#endif /* AVUTIL_AVSTRING_H */ diff --git a/ext/at3_standalone/bitstream.c b/ext/at3_standalone/bitstream.c new file mode 100644 index 0000000000..8f661af1fb --- /dev/null +++ b/ext/at3_standalone/bitstream.c @@ -0,0 +1,321 @@ +/* + * Common bit i/o utils + * Copyright (c) 2000, 2001 Fabrice Bellard + * Copyright (c) 2002-2004 Michael Niedermayer + * Copyright (c) 2010 Loren Merritt + * + * alternative bitstream reader & writer by Michael Niedermayer + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + * bitstream api. + */ + +#include "atomic.h" +#include "qsort.h" +#include "avcodec.h" +#include "internal.h" +#include "util_internal.h" +#include "mathops.h" +#include "get_bits.h" + +const uint8_t ff_log2_run[41]={ + 0, 0, 0, 0, 1, 1, 1, 1, + 2, 2, 2, 2, 3, 3, 3, 3, + 4, 4, 5, 5, 6, 6, 7, 7, + 8, 9,10,11,12,13,14,15, +16,17,18,19,20,21,22,23, +24, +}; + +/* VLC decoding */ + +#define GET_DATA(v, table, i, wrap, size) \ +{ \ + const uint8_t *ptr = (const uint8_t *)table + i * wrap; \ + switch(size) { \ + case 1: \ + v = *(const uint8_t *)ptr; \ + break; \ + case 2: \ + v = *(const uint16_t *)ptr; \ + break; \ + default: \ + v = *(const uint32_t *)ptr; \ + break; \ + } \ +} + + +static int alloc_table(VLC *vlc, int size, int use_static) +{ + int index = vlc->table_size; + + vlc->table_size += size; + if (vlc->table_size > vlc->table_allocated) { + if (use_static) + abort(); // cannot do anything, init_vlc() is used with too little memory + vlc->table_allocated += (1 << vlc->bits); + vlc->table = av_realloc_f(vlc->table, vlc->table_allocated, sizeof(VLC_TYPE) * 2); + if (!vlc->table) { + vlc->table_allocated = 0; + vlc->table_size = 0; + return AVERROR(ENOMEM); + } + memset(vlc->table + vlc->table_allocated - (1 << vlc->bits), 0, sizeof(VLC_TYPE) * 2 << vlc->bits); + } + return index; +} + +static av_always_inline uint32_t bitswap_32(uint32_t x) +{ + return (uint32_t)ff_reverse[ x & 0xFF] << 24 | + (uint32_t)ff_reverse[(x >> 8) & 0xFF] << 16 | + (uint32_t)ff_reverse[(x >> 16) & 0xFF] << 8 | + (uint32_t)ff_reverse[ x >> 24]; +} + +typedef struct VLCcode { + uint8_t bits; + uint16_t symbol; + /** codeword, with the first bit-to-be-read in the msb + * (even if intended for a little-endian bitstream reader) */ + uint32_t code; +} VLCcode; + +static int compare_vlcspec(const void *a, const void *b) +{ + const VLCcode *sa = a, *sb = b; + return (sa->code >> 1) - (sb->code >> 1); +} +/** + * Build VLC decoding tables suitable for use with get_vlc(). + * + * @param vlc the context to be initted + * + * @param table_nb_bits max length of vlc codes to store directly in this table + * (Longer codes are delegated to subtables.) + * + * @param nb_codes number of elements in codes[] + * + * @param codes descriptions of the vlc codes + * These must be ordered such that codes going into the same subtable are contiguous. + * Sorting by VLCcode.code is sufficient, though not necessary. + */ +static int build_table(VLC *vlc, int table_nb_bits, int nb_codes, + VLCcode *codes, int flags) +{ + int table_size, table_index, index, code_prefix, symbol, subtable_bits; + int i, j, k, n, nb, inc; + uint32_t code; + volatile VLC_TYPE (* volatile table)[2]; // the double volatile is needed to prevent a internal compiler error in gcc 4.2 + + table_size = 1 << table_nb_bits; + if (table_nb_bits > 30) + return -1; + table_index = alloc_table(vlc, table_size, flags & INIT_VLC_USE_NEW_STATIC); + ff_dlog(NULL, "new table index=%d size=%d\n", table_index, table_size); + if (table_index < 0) + return table_index; + table = (volatile VLC_TYPE (*)[2])&vlc->table[table_index]; + + /* first pass: map codes and compute auxiliary table sizes */ + for (i = 0; i < nb_codes; i++) { + n = codes[i].bits; + code = codes[i].code; + symbol = codes[i].symbol; + ff_dlog(NULL, "i=%d n=%d code=0x%x\n", i, n, code); + if (n <= table_nb_bits) { + /* no need to add another table */ + j = code >> (32 - table_nb_bits); + nb = 1 << (table_nb_bits - n); + inc = 1; + if (flags & INIT_VLC_LE) { + j = bitswap_32(code); + inc = 1 << n; + } + for (k = 0; k < nb; k++) { + int bits = table[j][1]; + ff_dlog(NULL, "%4x: code=%d n=%d\n", j, i, n); + if (bits != 0 && bits != n) { + av_log(NULL, AV_LOG_ERROR, "incorrect codes\n"); + return AVERROR_INVALIDDATA; + } + table[j][1] = n; //bits + table[j][0] = symbol; + j += inc; + } + } else { + /* fill auxiliary table recursively */ + n -= table_nb_bits; + code_prefix = code >> (32 - table_nb_bits); + subtable_bits = n; + codes[i].bits = n; + codes[i].code = code << table_nb_bits; + for (k = i+1; k < nb_codes; k++) { + n = codes[k].bits - table_nb_bits; + if (n <= 0) + break; + code = codes[k].code; + if (code >> (32 - table_nb_bits) != code_prefix) + break; + codes[k].bits = n; + codes[k].code = code << table_nb_bits; + subtable_bits = FFMAX(subtable_bits, n); + } + subtable_bits = FFMIN(subtable_bits, table_nb_bits); + j = (flags & INIT_VLC_LE) ? bitswap_32(code_prefix) >> (32 - table_nb_bits) : code_prefix; + table[j][1] = -subtable_bits; + ff_dlog(NULL, "%4x: n=%d (subtable)\n", + j, codes[i].bits + table_nb_bits); + index = build_table(vlc, subtable_bits, k-i, codes+i, flags); + if (index < 0) + return index; + /* note: realloc has been done, so reload tables */ + table = (volatile VLC_TYPE (*)[2])&vlc->table[table_index]; + table[j][0] = index; //code + i = k-1; + } + } + + for (i = 0; i < table_size; i++) { + if (table[i][1] == 0) //bits + table[i][0] = -1; //codes + } + + return table_index; +} + + +/* Build VLC decoding tables suitable for use with get_vlc(). + + 'nb_bits' set the decoding table size (2^nb_bits) entries. The + bigger it is, the faster is the decoding. But it should not be too + big to save memory and L1 cache. '9' is a good compromise. + + 'nb_codes' : number of vlcs codes + + 'bits' : table which gives the size (in bits) of each vlc code. + + 'codes' : table which gives the bit pattern of of each vlc code. + + 'symbols' : table which gives the values to be returned from get_vlc(). + + 'xxx_wrap' : give the number of bytes between each entry of the + 'bits' or 'codes' tables. + + 'xxx_size' : gives the number of bytes of each entry of the 'bits' + or 'codes' tables. + + 'wrap' and 'size' make it possible to use any memory configuration and types + (byte/word/long) to store the 'bits', 'codes', and 'symbols' tables. + + 'use_static' should be set to 1 for tables, which should be freed + with av_free_static(), 0 if ff_free_vlc() will be used. +*/ +int ff_init_vlc_sparse(VLC *vlc_arg, int nb_bits, int nb_codes, + const void *bits, int bits_wrap, int bits_size, + const void *codes, int codes_wrap, int codes_size, + const void *symbols, int symbols_wrap, int symbols_size, + int flags) +{ + VLCcode *buf; + int i, j, ret; + VLCcode localbuf[1500]; // the maximum currently needed is 1296 by rv34 + VLC localvlc, *vlc; + + vlc = vlc_arg; + vlc->bits = nb_bits; + if (flags & INIT_VLC_USE_NEW_STATIC) { + av_assert0(nb_codes + 1 <= FF_ARRAY_ELEMS(localbuf)); + buf = localbuf; + localvlc = *vlc_arg; + vlc = &localvlc; + vlc->table_size = 0; + } else { + vlc->table = NULL; + vlc->table_allocated = 0; + vlc->table_size = 0; + + buf = av_malloc_array((nb_codes + 1), sizeof(VLCcode)); + if (!buf) + return AVERROR(ENOMEM); + } + + + av_assert0(symbols_size <= 2 || !symbols); + j = 0; +#define COPY(condition)\ + for (i = 0; i < nb_codes; i++) { \ + GET_DATA(buf[j].bits, bits, i, bits_wrap, bits_size); \ + if (!(condition)) \ + continue; \ + if (buf[j].bits > 3*nb_bits || buf[j].bits>32) { \ + av_log(NULL, AV_LOG_ERROR, "Too long VLC (%d) in init_vlc\n", buf[j].bits);\ + if (!(flags & INIT_VLC_USE_NEW_STATIC)) \ + av_free(buf); \ + return -1; \ + } \ + GET_DATA(buf[j].code, codes, i, codes_wrap, codes_size); \ + if (buf[j].code >= (1LL< nb_bits); + // qsort is the slowest part of init_vlc, and could probably be improved or avoided + AV_QSORT(buf, j, struct VLCcode, compare_vlcspec); + COPY(buf[j].bits && buf[j].bits <= nb_bits); + nb_codes = j; + + ret = build_table(vlc, nb_bits, nb_codes, buf, flags); + + if (flags & INIT_VLC_USE_NEW_STATIC) { + if(vlc->table_size != vlc->table_allocated) + av_log(NULL, AV_LOG_ERROR, "needed %d had %d\n", vlc->table_size, vlc->table_allocated); + + av_assert0(ret >= 0); + *vlc_arg = *vlc; + } else { + av_free(buf); + if (ret < 0) { + av_freep(&vlc->table); + return ret; + } + } + return 0; +} + + +void ff_free_vlc(VLC *vlc) +{ + av_freep(&vlc->table); +} diff --git a/ext/at3_standalone/bprint.c b/ext/at3_standalone/bprint.c new file mode 100644 index 0000000000..1c62d214c1 --- /dev/null +++ b/ext/at3_standalone/bprint.c @@ -0,0 +1,379 @@ +/* + * Copyright (c) 2012 Nicolas George + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include +#include +#include +#include +#include "avstring.h" +#include "bprint.h" +#include "common.h" +#include "error.h" +#include "mem.h" + +#define av_bprint_room(buf) ((buf)->size - FFMIN((buf)->len, (buf)->size)) +#define av_bprint_is_allocated(buf) ((buf)->str != (buf)->reserved_internal_buffer) + +static int av_bprint_alloc(AVBPrint *buf, unsigned room) +{ + char *old_str, *new_str; + unsigned min_size, new_size; + + if (buf->size == buf->size_max) + return AVERROR(EIO); + if (!av_bprint_is_complete(buf)) + return AVERROR_INVALIDDATA; /* it is already truncated anyway */ + min_size = buf->len + 1 + FFMIN(UINT_MAX - buf->len - 1, room); + new_size = buf->size > buf->size_max / 2 ? buf->size_max : buf->size * 2; + if (new_size < min_size) + new_size = FFMIN(buf->size_max, min_size); + old_str = av_bprint_is_allocated(buf) ? buf->str : NULL; + new_str = av_realloc(old_str, new_size); + if (!new_str) + return AVERROR(ENOMEM); + if (!old_str) + memcpy(new_str, buf->str, buf->len + 1); + buf->str = new_str; + buf->size = new_size; + return 0; +} + +static void av_bprint_grow(AVBPrint *buf, unsigned extra_len) +{ + /* arbitrary margin to avoid small overflows */ + extra_len = FFMIN(extra_len, UINT_MAX - 5 - buf->len); + buf->len += extra_len; + if (buf->size) + buf->str[FFMIN(buf->len, buf->size - 1)] = 0; +} + +void av_bprint_init(AVBPrint *buf, unsigned size_init, unsigned size_max) +{ + unsigned size_auto = (char *)buf + sizeof(*buf) - + buf->reserved_internal_buffer; + + if (size_max == 1) + size_max = size_auto; + buf->str = buf->reserved_internal_buffer; + buf->len = 0; + buf->size = FFMIN(size_auto, size_max); + buf->size_max = size_max; + *buf->str = 0; + if (size_init > buf->size) + av_bprint_alloc(buf, size_init - 1); +} + +void av_bprint_init_for_buffer(AVBPrint *buf, char *buffer, unsigned size) +{ + buf->str = buffer; + buf->len = 0; + buf->size = size; + buf->size_max = size; + *buf->str = 0; +} + +void av_bprintf(AVBPrint *buf, const char *fmt, ...) +{ + unsigned room; + char *dst; + va_list vl; + int extra_len; + + while (1) { + room = av_bprint_room(buf); + dst = room ? buf->str + buf->len : NULL; + va_start(vl, fmt); + extra_len = vsnprintf(dst, room, fmt, vl); + va_end(vl); + if (extra_len <= 0) + return; + if (extra_len < room) + break; + if (av_bprint_alloc(buf, extra_len)) + break; + } + av_bprint_grow(buf, extra_len); +} + +void av_vbprintf(AVBPrint *buf, const char *fmt, va_list vl_arg) +{ + unsigned room; + char *dst; + int extra_len; + va_list vl; + + while (1) { + room = av_bprint_room(buf); + dst = room ? buf->str + buf->len : NULL; + va_copy(vl, vl_arg); + extra_len = vsnprintf(dst, room, fmt, vl); + va_end(vl); + if (extra_len <= 0) + return; + if (extra_len < room) + break; + if (av_bprint_alloc(buf, extra_len)) + break; + } + av_bprint_grow(buf, extra_len); +} + +void av_bprint_chars(AVBPrint *buf, char c, unsigned n) +{ + unsigned room, real_n; + + while (1) { + room = av_bprint_room(buf); + if (n < room) + break; + if (av_bprint_alloc(buf, n)) + break; + } + if (room) { + real_n = FFMIN(n, room - 1); + memset(buf->str + buf->len, c, real_n); + } + av_bprint_grow(buf, n); +} + +void av_bprint_append_data(AVBPrint *buf, const char *data, unsigned size) +{ + unsigned room, real_n; + + while (1) { + room = av_bprint_room(buf); + if (size < room) + break; + if (av_bprint_alloc(buf, size)) + break; + } + if (room) { + real_n = FFMIN(size, room - 1); + memcpy(buf->str + buf->len, data, real_n); + } + av_bprint_grow(buf, size); +} + +void av_bprint_strftime(AVBPrint *buf, const char *fmt, const struct tm *tm) +{ + unsigned room; + size_t l; + + if (!*fmt) + return; + while (1) { + room = av_bprint_room(buf); + if (room && (l = strftime(buf->str + buf->len, room, fmt, tm))) + break; + /* strftime does not tell us how much room it would need: let us + retry with twice as much until the buffer is large enough */ + room = !room ? strlen(fmt) + 1 : + room <= INT_MAX / 2 ? room * 2 : INT_MAX; + if (av_bprint_alloc(buf, room)) { + /* impossible to grow, try to manage something useful anyway */ + room = av_bprint_room(buf); + if (room < 1024) { + /* if strftime fails because the buffer has (almost) reached + its maximum size, let us try in a local buffer; 1k should + be enough to format any real date+time string */ + char buf2[1024]; + if ((l = strftime(buf2, sizeof(buf2), fmt, tm))) { + av_bprintf(buf, "%s", buf2); + return; + } + } + if (room) { + /* if anything else failed and the buffer is not already + truncated, let us add a stock string and force truncation */ + static const char txt[] = "[truncated strftime output]"; + memset(buf->str + buf->len, '!', room); + memcpy(buf->str + buf->len, txt, FFMIN(sizeof(txt) - 1, room)); + av_bprint_grow(buf, room); /* force truncation */ + } + return; + } + } + av_bprint_grow(buf, l); +} + +void av_bprint_get_buffer(AVBPrint *buf, unsigned size, + unsigned char **mem, unsigned *actual_size) +{ + if (size > av_bprint_room(buf)) + av_bprint_alloc(buf, size); + *actual_size = av_bprint_room(buf); + *mem = *actual_size ? buf->str + buf->len : NULL; +} + +void av_bprint_clear(AVBPrint *buf) +{ + if (buf->len) { + *buf->str = 0; + buf->len = 0; + } +} + +int av_bprint_finalize(AVBPrint *buf, char **ret_str) +{ + unsigned real_size = FFMIN(buf->len + 1, buf->size); + char *str; + int ret = 0; + + if (ret_str) { + if (av_bprint_is_allocated(buf)) { + str = av_realloc(buf->str, real_size); + if (!str) + str = buf->str; + buf->str = NULL; + } else { + str = av_malloc(real_size); + if (str) + memcpy(str, buf->str, real_size); + else + ret = AVERROR(ENOMEM); + } + *ret_str = str; + } else { + if (av_bprint_is_allocated(buf)) + av_freep(&buf->str); + } + buf->size = real_size; + return ret; +} + +#define WHITESPACES " \n\t" + +void av_bprint_escape(AVBPrint *dstbuf, const char *src, const char *special_chars, + enum AVEscapeMode mode, int flags) +{ + const char *src0 = src; + + if (mode == AV_ESCAPE_MODE_AUTO) + mode = AV_ESCAPE_MODE_BACKSLASH; /* TODO: implement a heuristic */ + + switch (mode) { + case AV_ESCAPE_MODE_QUOTE: + /* enclose the string between '' */ + av_bprint_chars(dstbuf, '\'', 1); + for (; *src; src++) { + if (*src == '\'') + av_bprintf(dstbuf, "'\\''"); + else + av_bprint_chars(dstbuf, *src, 1); + } + av_bprint_chars(dstbuf, '\'', 1); + break; + + /* case AV_ESCAPE_MODE_BACKSLASH or unknown mode */ + default: + /* \-escape characters */ + for (; *src; src++) { + int is_first_last = src == src0 || !*(src+1); + int is_ws = !!strchr(WHITESPACES, *src); + int is_strictly_special = special_chars && strchr(special_chars, *src); + int is_special = + is_strictly_special || strchr("'\\", *src) || + (is_ws && (flags & AV_ESCAPE_FLAG_WHITESPACE)); + + if (is_strictly_special || + (!(flags & AV_ESCAPE_FLAG_STRICT) && + (is_special || (is_ws && is_first_last)))) + av_bprint_chars(dstbuf, '\\', 1); + av_bprint_chars(dstbuf, *src, 1); + } + break; + } +} + +#ifdef TEST + +#undef printf + +static void bprint_pascal(AVBPrint *b, unsigned size) +{ + unsigned i, j; + unsigned p[42]; + + av_assert0(size < FF_ARRAY_ELEMS(p)); + + p[0] = 1; + av_bprintf(b, "%8d\n", 1); + for (i = 1; i <= size; i++) { + p[i] = 1; + for (j = i - 1; j > 0; j--) + p[j] = p[j] + p[j - 1]; + for (j = 0; j <= i; j++) + av_bprintf(b, "%8d", p[j]); + av_bprintf(b, "\n"); + } +} + +int main(void) +{ + AVBPrint b; + char buf[256]; + struct tm testtime = { .tm_year = 100, .tm_mon = 11, .tm_mday = 20 }; + + av_bprint_init(&b, 0, -1); + bprint_pascal(&b, 5); + printf("Short text in unlimited buffer: %u/%u\n", (unsigned)strlen(b.str), b.len); + printf("%s\n", b.str); + av_bprint_finalize(&b, NULL); + + av_bprint_init(&b, 0, -1); + bprint_pascal(&b, 25); + printf("Long text in unlimited buffer: %u/%u\n", (unsigned)strlen(b.str), b.len); + av_bprint_finalize(&b, NULL); + + av_bprint_init(&b, 0, 2048); + bprint_pascal(&b, 25); + printf("Long text in limited buffer: %u/%u\n", (unsigned)strlen(b.str), b.len); + av_bprint_finalize(&b, NULL); + + av_bprint_init(&b, 0, 1); + bprint_pascal(&b, 5); + printf("Short text in automatic buffer: %u/%u\n", (unsigned)strlen(b.str), b.len); + + av_bprint_init(&b, 0, 1); + bprint_pascal(&b, 25); + printf("Long text in automatic buffer: %u/%u\n", (unsigned)strlen(b.str)/8*8, b.len); + /* Note that the size of the automatic buffer is arch-dependent. */ + + av_bprint_init(&b, 0, 0); + bprint_pascal(&b, 25); + printf("Long text count only buffer: %u/%u\n", (unsigned)strlen(b.str), b.len); + + av_bprint_init_for_buffer(&b, buf, sizeof(buf)); + bprint_pascal(&b, 25); + printf("Long text count only buffer: %u/%u\n", (unsigned)strlen(buf), b.len); + + av_bprint_init(&b, 0, -1); + av_bprint_strftime(&b, "%Y-%m-%d", &testtime); + printf("strftime full: %u/%u \"%s\"\n", (unsigned)strlen(buf), b.len, b.str); + av_bprint_finalize(&b, NULL); + + av_bprint_init(&b, 0, 8); + av_bprint_strftime(&b, "%Y-%m-%d", &testtime); + printf("strftime truncated: %u/%u \"%s\"\n", (unsigned)strlen(buf), b.len, b.str); + + return 0; +} + +#endif diff --git a/ext/at3_standalone/bprint.h b/ext/at3_standalone/bprint.h new file mode 100644 index 0000000000..c09b1ac1e1 --- /dev/null +++ b/ext/at3_standalone/bprint.h @@ -0,0 +1,219 @@ +/* + * Copyright (c) 2012 Nicolas George + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVUTIL_BPRINT_H +#define AVUTIL_BPRINT_H + +#include + +#include "attributes.h" +#include "avstring.h" + +/** + * Define a structure with extra padding to a fixed size + * This helps ensuring binary compatibility with future versions. + */ + +#define FF_PAD_STRUCTURE(name, size, ...) \ +struct ff_pad_helper_##name { __VA_ARGS__ }; \ +typedef struct name { \ + __VA_ARGS__ \ + char reserved_padding[size - sizeof(struct ff_pad_helper_##name)]; \ +} name; + +/** + * Buffer to print data progressively + * + * The string buffer grows as necessary and is always 0-terminated. + * The content of the string is never accessed, and thus is + * encoding-agnostic and can even hold binary data. + * + * Small buffers are kept in the structure itself, and thus require no + * memory allocation at all (unless the contents of the buffer is needed + * after the structure goes out of scope). This is almost as lightweight as + * declaring a local "char buf[512]". + * + * The length of the string can go beyond the allocated size: the buffer is + * then truncated, but the functions still keep account of the actual total + * length. + * + * In other words, buf->len can be greater than buf->size and records the + * total length of what would have been to the buffer if there had been + * enough memory. + * + * Append operations do not need to be tested for failure: if a memory + * allocation fails, data stop being appended to the buffer, but the length + * is still updated. This situation can be tested with + * av_bprint_is_complete(). + * + * The size_max field determines several possible behaviours: + * + * size_max = -1 (= UINT_MAX) or any large value will let the buffer be + * reallocated as necessary, with an amortized linear cost. + * + * size_max = 0 prevents writing anything to the buffer: only the total + * length is computed. The write operations can then possibly be repeated in + * a buffer with exactly the necessary size + * (using size_init = size_max = len + 1). + * + * size_max = 1 is automatically replaced by the exact size available in the + * structure itself, thus ensuring no dynamic memory allocation. The + * internal buffer is large enough to hold a reasonable paragraph of text, + * such as the current paragraph. + */ + +FF_PAD_STRUCTURE(AVBPrint, 1024, + char *str; /**< string so far */ + unsigned len; /**< length so far */ + unsigned size; /**< allocated memory */ + unsigned size_max; /**< maximum allocated memory */ + char reserved_internal_buffer[1]; +) + +/** + * Convenience macros for special values for av_bprint_init() size_max + * parameter. + */ +#define AV_BPRINT_SIZE_UNLIMITED ((unsigned)-1) +#define AV_BPRINT_SIZE_AUTOMATIC 1 +#define AV_BPRINT_SIZE_COUNT_ONLY 0 + +/** + * Init a print buffer. + * + * @param buf buffer to init + * @param size_init initial size (including the final 0) + * @param size_max maximum size; + * 0 means do not write anything, just count the length; + * 1 is replaced by the maximum value for automatic storage; + * any large value means that the internal buffer will be + * reallocated as needed up to that limit; -1 is converted to + * UINT_MAX, the largest limit possible. + * Check also AV_BPRINT_SIZE_* macros. + */ +void av_bprint_init(AVBPrint *buf, unsigned size_init, unsigned size_max); + +/** + * Init a print buffer using a pre-existing buffer. + * + * The buffer will not be reallocated. + * + * @param buf buffer structure to init + * @param buffer byte buffer to use for the string data + * @param size size of buffer + */ +void av_bprint_init_for_buffer(AVBPrint *buf, char *buffer, unsigned size); + +/** + * Append a formatted string to a print buffer. + */ +void av_bprintf(AVBPrint *buf, const char *fmt, ...) av_printf_format(2, 3); + +/** + * Append a formatted string to a print buffer. + */ +void av_vbprintf(AVBPrint *buf, const char *fmt, va_list vl_arg); + +/** + * Append char c n times to a print buffer. + */ +void av_bprint_chars(AVBPrint *buf, char c, unsigned n); + +/** + * Append data to a print buffer. + * + * param buf bprint buffer to use + * param data pointer to data + * param size size of data + */ +void av_bprint_append_data(AVBPrint *buf, const char *data, unsigned size); + +struct tm; +/** + * Append a formatted date and time to a print buffer. + * + * param buf bprint buffer to use + * param fmt date and time format string, see strftime() + * param tm broken-down time structure to translate + * + * @note due to poor design of the standard strftime function, it may + * produce poor results if the format string expands to a very long text and + * the bprint buffer is near the limit stated by the size_max option. + */ +void av_bprint_strftime(AVBPrint *buf, const char *fmt, const struct tm *tm); + +/** + * Allocate bytes in the buffer for external use. + * + * @param[in] buf buffer structure + * @param[in] size required size + * @param[out] mem pointer to the memory area + * @param[out] actual_size size of the memory area after allocation; + * can be larger or smaller than size + */ +void av_bprint_get_buffer(AVBPrint *buf, unsigned size, + unsigned char **mem, unsigned *actual_size); + +/** + * Reset the string to "" but keep internal allocated data. + */ +void av_bprint_clear(AVBPrint *buf); + +/** + * Test if the print buffer is complete (not truncated). + * + * It may have been truncated due to a memory allocation failure + * or the size_max limit (compare size and size_max if necessary). + */ +static inline int av_bprint_is_complete(const AVBPrint *buf) +{ + return buf->len < buf->size; +} + +/** + * Finalize a print buffer. + * + * The print buffer can no longer be used afterwards, + * but the len and size fields are still valid. + * + * @arg[out] ret_str if not NULL, used to return a permanent copy of the + * buffer contents, or NULL if memory allocation fails; + * if NULL, the buffer is discarded and freed + * @return 0 for success or error code (probably AVERROR(ENOMEM)) + */ +int av_bprint_finalize(AVBPrint *buf, char **ret_str); + +/** + * Escape the content in src and append it to dstbuf. + * + * @param dstbuf already inited destination bprint buffer + * @param src string containing the text to escape + * @param special_chars string containing the special characters which + * need to be escaped, can be NULL + * @param mode escape mode to employ, see AV_ESCAPE_MODE_* macros. + * Any unknown value for mode will be considered equivalent to + * AV_ESCAPE_MODE_BACKSLASH, but this behaviour can change without + * notice. + * @param flags flags which control how to escape, see AV_ESCAPE_FLAG_* macros + */ +void av_bprint_escape(AVBPrint *dstbuf, const char *src, const char *special_chars, + enum AVEscapeMode mode, int flags); + +#endif /* AVUTIL_BPRINT_H */ diff --git a/ext/at3_standalone/buffer_internal.h b/ext/at3_standalone/buffer_internal.h new file mode 100644 index 0000000000..01a40864d4 --- /dev/null +++ b/ext/at3_standalone/buffer_internal.h @@ -0,0 +1,94 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVUTIL_BUFFER_INTERNAL_H +#define AVUTIL_BUFFER_INTERNAL_H + +#include + +#include "buffer.h" + +/** + * The buffer is always treated as read-only. + */ +#define BUFFER_FLAG_READONLY (1 << 0) +/** + * The buffer was av_realloc()ed, so it is reallocatable. + */ +#define BUFFER_FLAG_REALLOCATABLE (1 << 1) + +struct AVBuffer { + uint8_t *data; /**< data described by this buffer */ + int size; /**< size of data in bytes */ + + /** + * number of existing AVBufferRef instances referring to this buffer + */ + volatile int refcount; + + /** + * a callback for freeing the data + */ + void (*free)(void *opaque, uint8_t *data); + + /** + * an opaque pointer, to be used by the freeing callback + */ + void *opaque; + + /** + * A combination of BUFFER_FLAG_* + */ + int flags; +}; + +typedef struct BufferPoolEntry { + uint8_t *data; + + /* + * Backups of the original opaque/free of the AVBuffer corresponding to + * data. They will be used to free the buffer when the pool is freed. + */ + void *opaque; + void (*free)(void *opaque, uint8_t *data); + + AVBufferPool *pool; + struct BufferPoolEntry *next; +} BufferPoolEntry; + +struct AVBufferPool { + BufferPoolEntry *pool; + + /* + * This is used to track when the pool is to be freed. + * The pointer to the pool itself held by the caller is considered to + * be one reference. Each buffer requested by the caller increases refcount + * by one, returning the buffer to the pool decreases it by one. + * refcount reaches zero when the buffer has been uninited AND all the + * buffers have been released, then it's safe to free the pool and all + * the buffers in it. + */ + volatile int refcount; + + volatile int nb_allocated; + + int size; + AVBufferRef* (*alloc)(int size); +}; + +#endif /* AVUTIL_BUFFER_INTERNAL_H */ diff --git a/ext/at3_standalone/channel_layout.c b/ext/at3_standalone/channel_layout.c new file mode 100644 index 0000000000..d6ee5372d7 --- /dev/null +++ b/ext/at3_standalone/channel_layout.c @@ -0,0 +1,220 @@ +/* + * Copyright (c) 2006 Michael Niedermayer + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + * audio channel layout utility functions + */ + +#include + +#include "avutil.h" +#include "channel_layout.h" +#include "common.h" + +struct channel_name { + const char *name; + const char *description; +}; + +static const struct channel_name channel_names[] = { + [0] = { "FL", "front left" }, + [1] = { "FR", "front right" }, + [2] = { "FC", "front center" }, + [3] = { "LFE", "low frequency" }, + [4] = { "BL", "back left" }, + [5] = { "BR", "back right" }, + [6] = { "FLC", "front left-of-center" }, + [7] = { "FRC", "front right-of-center" }, + [8] = { "BC", "back center" }, + [9] = { "SL", "side left" }, + [10] = { "SR", "side right" }, + [11] = { "TC", "top center" }, + [12] = { "TFL", "top front left" }, + [13] = { "TFC", "top front center" }, + [14] = { "TFR", "top front right" }, + [15] = { "TBL", "top back left" }, + [16] = { "TBC", "top back center" }, + [17] = { "TBR", "top back right" }, + [29] = { "DL", "downmix left" }, + [30] = { "DR", "downmix right" }, + [31] = { "WL", "wide left" }, + [32] = { "WR", "wide right" }, + [33] = { "SDL", "surround direct left" }, + [34] = { "SDR", "surround direct right" }, + [35] = { "LFE2", "low frequency 2" }, +}; + +static const char *get_channel_name(int channel_id) +{ + if (channel_id < 0 || channel_id >= FF_ARRAY_ELEMS(channel_names)) + return NULL; + return channel_names[channel_id].name; +} + +static const struct { + const char *name; + int nb_channels; + uint64_t layout; +} channel_layout_map[] = { + { "mono", 1, AV_CH_LAYOUT_MONO }, + { "stereo", 2, AV_CH_LAYOUT_STEREO }, + { "2.1", 3, AV_CH_LAYOUT_2POINT1 }, + { "3.0", 3, AV_CH_LAYOUT_SURROUND }, + { "3.0(back)", 3, AV_CH_LAYOUT_2_1 }, + { "4.0", 4, AV_CH_LAYOUT_4POINT0 }, + { "quad", 4, AV_CH_LAYOUT_QUAD }, + { "quad(side)", 4, AV_CH_LAYOUT_2_2 }, + { "3.1", 4, AV_CH_LAYOUT_3POINT1 }, + { "5.0", 5, AV_CH_LAYOUT_5POINT0_BACK }, + { "5.0(side)", 5, AV_CH_LAYOUT_5POINT0 }, + { "4.1", 5, AV_CH_LAYOUT_4POINT1 }, + { "5.1", 6, AV_CH_LAYOUT_5POINT1_BACK }, + { "5.1(side)", 6, AV_CH_LAYOUT_5POINT1 }, + { "6.0", 6, AV_CH_LAYOUT_6POINT0 }, + { "6.0(front)", 6, AV_CH_LAYOUT_6POINT0_FRONT }, + { "hexagonal", 6, AV_CH_LAYOUT_HEXAGONAL }, + { "6.1", 7, AV_CH_LAYOUT_6POINT1 }, + { "6.1(back)", 7, AV_CH_LAYOUT_6POINT1_BACK }, + { "6.1(front)", 7, AV_CH_LAYOUT_6POINT1_FRONT }, + { "7.0", 7, AV_CH_LAYOUT_7POINT0 }, + { "7.0(front)", 7, AV_CH_LAYOUT_7POINT0_FRONT }, + { "7.1", 8, AV_CH_LAYOUT_7POINT1 }, + { "7.1(wide)", 8, AV_CH_LAYOUT_7POINT1_WIDE_BACK }, + { "7.1(wide-side)", 8, AV_CH_LAYOUT_7POINT1_WIDE }, + { "octagonal", 8, AV_CH_LAYOUT_OCTAGONAL }, + { "hexadecagonal", 16, AV_CH_LAYOUT_HEXADECAGONAL }, + { "downmix", 2, AV_CH_LAYOUT_STEREO_DOWNMIX, }, +}; + +static uint64_t get_channel_layout_single(const char *name, int name_len) +{ + int i; + char *end; + int64_t layout; + + for (i = 0; i < FF_ARRAY_ELEMS(channel_layout_map); i++) { + if (strlen(channel_layout_map[i].name) == name_len && + !memcmp(channel_layout_map[i].name, name, name_len)) + return channel_layout_map[i].layout; + } + for (i = 0; i < FF_ARRAY_ELEMS(channel_names); i++) + if (channel_names[i].name && + strlen(channel_names[i].name) == name_len && + !memcmp(channel_names[i].name, name, name_len)) + return (int64_t)1 << i; + + errno = 0; + i = strtol(name, &end, 10); + + if (!errno && (end + 1 - name == name_len && *end == 'c')) + return av_get_default_channel_layout(i); + + errno = 0; + layout = strtoll(name, &end, 0); + if (!errno && end - name == name_len) + return FFMAX(layout, 0); + return 0; +} + +uint64_t av_get_channel_layout(const char *name) +{ + const char *n, *e; + const char *name_end = name + strlen(name); + int64_t layout = 0, layout_single; + + for (n = name; n < name_end; n = e + 1) { + for (e = n; e < name_end && *e != '+' && *e != '|'; e++); + layout_single = get_channel_layout_single(n, e - n); + if (!layout_single) + return 0; + layout |= layout_single; + } + return layout; +} + +int av_get_channel_layout_nb_channels(uint64_t channel_layout) +{ + return av_popcount64(channel_layout); +} + +int64_t av_get_default_channel_layout(int nb_channels) { + int i; + for (i = 0; i < FF_ARRAY_ELEMS(channel_layout_map); i++) + if (nb_channels == channel_layout_map[i].nb_channels) + return channel_layout_map[i].layout; + return 0; +} + +int av_get_channel_layout_channel_index(uint64_t channel_layout, + uint64_t channel) +{ + if (!(channel_layout & channel) || + av_get_channel_layout_nb_channels(channel) != 1) + return AVERROR(EINVAL); + channel_layout &= channel - 1; + return av_get_channel_layout_nb_channels(channel_layout); +} + +const char *av_get_channel_name(uint64_t channel) +{ + int i; + if (av_get_channel_layout_nb_channels(channel) != 1) + return NULL; + for (i = 0; i < 64; i++) + if ((1ULL<= FF_ARRAY_ELEMS(channel_layout_map)) + return AVERROR_EOF; + if (layout) *layout = channel_layout_map[index].layout; + if (name) *name = channel_layout_map[index].name; + return 0; +} diff --git a/ext/at3_standalone/codec_desc.c b/ext/at3_standalone/codec_desc.c new file mode 100644 index 0000000000..6336770016 --- /dev/null +++ b/ext/at3_standalone/codec_desc.c @@ -0,0 +1,2933 @@ +/* + * This file is part of FFmpeg. + * + * This table was generated from the long and short names of AVCodecs + * please see the respective codec sources for authorship + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include + +#include "common.h" +#include "internal.h" +#include "avcodec.h" +// #include "profiles.h" +#include "version.h" + +#define MT(...) (const char *const[]){ __VA_ARGS__, NULL } + +static const AVCodecDescriptor codec_descriptors[] = { + /* video codecs */ + { + .id = AV_CODEC_ID_MPEG1VIDEO, + .type = AVMEDIA_TYPE_VIDEO, + .name = "mpeg1video", + .long_name = NULL_IF_CONFIG_SMALL("MPEG-1 video"), + .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_REORDER, + }, + { + .id = AV_CODEC_ID_MPEG2VIDEO, + .type = AVMEDIA_TYPE_VIDEO, + .name = "mpeg2video", + .long_name = NULL_IF_CONFIG_SMALL("MPEG-2 video"), + .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_REORDER, + .profiles = NULL_IF_CONFIG_SMALL(ff_mpeg2_video_profiles), + }, +#if FF_API_XVMC + { + .id = AV_CODEC_ID_MPEG2VIDEO_XVMC, + .type = AVMEDIA_TYPE_VIDEO, + .name = "mpegvideo_xvmc", + .long_name = NULL_IF_CONFIG_SMALL("MPEG-1/2 video XvMC (X-Video Motion Compensation)"), + .props = AV_CODEC_PROP_LOSSY, + }, +#endif /* FF_API_XVMC */ + { + .id = AV_CODEC_ID_H261, + .type = AVMEDIA_TYPE_VIDEO, + .name = "h261", + .long_name = NULL_IF_CONFIG_SMALL("H.261"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_H263, + .type = AVMEDIA_TYPE_VIDEO, + .name = "h263", + .long_name = NULL_IF_CONFIG_SMALL("H.263 / H.263-1996, H.263+ / H.263-1998 / H.263 version 2"), + .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_REORDER, + }, + { + .id = AV_CODEC_ID_RV10, + .type = AVMEDIA_TYPE_VIDEO, + .name = "rv10", + .long_name = NULL_IF_CONFIG_SMALL("RealVideo 1.0"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_RV20, + .type = AVMEDIA_TYPE_VIDEO, + .name = "rv20", + .long_name = NULL_IF_CONFIG_SMALL("RealVideo 2.0"), + .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_REORDER, + }, + { + .id = AV_CODEC_ID_MJPEG, + .type = AVMEDIA_TYPE_VIDEO, + .name = "mjpeg", + .long_name = NULL_IF_CONFIG_SMALL("Motion JPEG"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, + .mime_types= MT("image/jpeg"), + }, + { + .id = AV_CODEC_ID_MJPEGB, + .type = AVMEDIA_TYPE_VIDEO, + .name = "mjpegb", + .long_name = NULL_IF_CONFIG_SMALL("Apple MJPEG-B"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_MPEG4, + .type = AVMEDIA_TYPE_VIDEO, + .name = "mpeg4", + .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2"), + .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_REORDER, + .profiles = NULL_IF_CONFIG_SMALL(ff_mpeg4_video_profiles), + }, + { + .id = AV_CODEC_ID_RAWVIDEO, + .type = AVMEDIA_TYPE_VIDEO, + .name = "rawvideo", + .long_name = NULL_IF_CONFIG_SMALL("raw video"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_MSMPEG4V1, + .type = AVMEDIA_TYPE_VIDEO, + .name = "msmpeg4v1", + .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 1"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_MSMPEG4V2, + .type = AVMEDIA_TYPE_VIDEO, + .name = "msmpeg4v2", + .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 2"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_MSMPEG4V3, + .type = AVMEDIA_TYPE_VIDEO, + .name = "msmpeg4v3", + .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 3"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_WMV1, + .type = AVMEDIA_TYPE_VIDEO, + .name = "wmv1", + .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 7"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_WMV2, + .type = AVMEDIA_TYPE_VIDEO, + .name = "wmv2", + .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 8"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_H263P, + .type = AVMEDIA_TYPE_VIDEO, + .name = "h263p", + .long_name = NULL_IF_CONFIG_SMALL("H.263+ / H.263-1998 / H.263 version 2"), + .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_REORDER, + }, + { + .id = AV_CODEC_ID_H263I, + .type = AVMEDIA_TYPE_VIDEO, + .name = "h263i", + .long_name = NULL_IF_CONFIG_SMALL("Intel H.263"), + .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_REORDER, + }, + { + .id = AV_CODEC_ID_FLV1, + .type = AVMEDIA_TYPE_VIDEO, + .name = "flv1", + .long_name = NULL_IF_CONFIG_SMALL("FLV / Sorenson Spark / Sorenson H.263 (Flash Video)"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_SVQ1, + .type = AVMEDIA_TYPE_VIDEO, + .name = "svq1", + .long_name = NULL_IF_CONFIG_SMALL("Sorenson Vector Quantizer 1 / Sorenson Video 1 / SVQ1"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_SVQ3, + .type = AVMEDIA_TYPE_VIDEO, + .name = "svq3", + .long_name = NULL_IF_CONFIG_SMALL("Sorenson Vector Quantizer 3 / Sorenson Video 3 / SVQ3"), + .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_REORDER, + }, + { + .id = AV_CODEC_ID_DVVIDEO, + .type = AVMEDIA_TYPE_VIDEO, + .name = "dvvideo", + .long_name = NULL_IF_CONFIG_SMALL("DV (Digital Video)"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_HUFFYUV, + .type = AVMEDIA_TYPE_VIDEO, + .name = "huffyuv", + .long_name = NULL_IF_CONFIG_SMALL("HuffYUV"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_CYUV, + .type = AVMEDIA_TYPE_VIDEO, + .name = "cyuv", + .long_name = NULL_IF_CONFIG_SMALL("Creative YUV (CYUV)"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_H264, + .type = AVMEDIA_TYPE_VIDEO, + .name = "h264", + .long_name = NULL_IF_CONFIG_SMALL("H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"), + .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_LOSSLESS | AV_CODEC_PROP_REORDER, + .profiles = NULL_IF_CONFIG_SMALL(ff_h264_profiles), + }, + { + .id = AV_CODEC_ID_INDEO3, + .type = AVMEDIA_TYPE_VIDEO, + .name = "indeo3", + .long_name = NULL_IF_CONFIG_SMALL("Intel Indeo 3"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_VP3, + .type = AVMEDIA_TYPE_VIDEO, + .name = "vp3", + .long_name = NULL_IF_CONFIG_SMALL("On2 VP3"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_THEORA, + .type = AVMEDIA_TYPE_VIDEO, + .name = "theora", + .long_name = NULL_IF_CONFIG_SMALL("Theora"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_ASV1, + .type = AVMEDIA_TYPE_VIDEO, + .name = "asv1", + .long_name = NULL_IF_CONFIG_SMALL("ASUS V1"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_ASV2, + .type = AVMEDIA_TYPE_VIDEO, + .name = "asv2", + .long_name = NULL_IF_CONFIG_SMALL("ASUS V2"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_FFV1, + .type = AVMEDIA_TYPE_VIDEO, + .name = "ffv1", + .long_name = NULL_IF_CONFIG_SMALL("FFmpeg video codec #1"), + .props = AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_4XM, + .type = AVMEDIA_TYPE_VIDEO, + .name = "4xm", + .long_name = NULL_IF_CONFIG_SMALL("4X Movie"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_VCR1, + .type = AVMEDIA_TYPE_VIDEO, + .name = "vcr1", + .long_name = NULL_IF_CONFIG_SMALL("ATI VCR1"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_CLJR, + .type = AVMEDIA_TYPE_VIDEO, + .name = "cljr", + .long_name = NULL_IF_CONFIG_SMALL("Cirrus Logic AccuPak"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_MDEC, + .type = AVMEDIA_TYPE_VIDEO, + .name = "mdec", + .long_name = NULL_IF_CONFIG_SMALL("Sony PlayStation MDEC (Motion DECoder)"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_ROQ, + .type = AVMEDIA_TYPE_VIDEO, + .name = "roq", + .long_name = NULL_IF_CONFIG_SMALL("id RoQ video"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_INTERPLAY_VIDEO, + .type = AVMEDIA_TYPE_VIDEO, + .name = "interplayvideo", + .long_name = NULL_IF_CONFIG_SMALL("Interplay MVE video"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_XAN_WC3, + .type = AVMEDIA_TYPE_VIDEO, + .name = "xan_wc3", + .long_name = NULL_IF_CONFIG_SMALL("Wing Commander III / Xan"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_XAN_WC4, + .type = AVMEDIA_TYPE_VIDEO, + .name = "xan_wc4", + .long_name = NULL_IF_CONFIG_SMALL("Wing Commander IV / Xxan"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_RPZA, + .type = AVMEDIA_TYPE_VIDEO, + .name = "rpza", + .long_name = NULL_IF_CONFIG_SMALL("QuickTime video (RPZA)"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_CINEPAK, + .type = AVMEDIA_TYPE_VIDEO, + .name = "cinepak", + .long_name = NULL_IF_CONFIG_SMALL("Cinepak"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_WS_VQA, + .type = AVMEDIA_TYPE_VIDEO, + .name = "ws_vqa", + .long_name = NULL_IF_CONFIG_SMALL("Westwood Studios VQA (Vector Quantized Animation) video"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_MSRLE, + .type = AVMEDIA_TYPE_VIDEO, + .name = "msrle", + .long_name = NULL_IF_CONFIG_SMALL("Microsoft RLE"), + .props = AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_MSVIDEO1, + .type = AVMEDIA_TYPE_VIDEO, + .name = "msvideo1", + .long_name = NULL_IF_CONFIG_SMALL("Microsoft Video 1"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_IDCIN, + .type = AVMEDIA_TYPE_VIDEO, + .name = "idcin", + .long_name = NULL_IF_CONFIG_SMALL("id Quake II CIN video"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_8BPS, + .type = AVMEDIA_TYPE_VIDEO, + .name = "8bps", + .long_name = NULL_IF_CONFIG_SMALL("QuickTime 8BPS video"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_SMC, + .type = AVMEDIA_TYPE_VIDEO, + .name = "smc", + .long_name = NULL_IF_CONFIG_SMALL("QuickTime Graphics (SMC)"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_FLIC, + .type = AVMEDIA_TYPE_VIDEO, + .name = "flic", + .long_name = NULL_IF_CONFIG_SMALL("Autodesk Animator Flic video"), + .props = AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_TRUEMOTION1, + .type = AVMEDIA_TYPE_VIDEO, + .name = "truemotion1", + .long_name = NULL_IF_CONFIG_SMALL("Duck TrueMotion 1.0"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_VMDVIDEO, + .type = AVMEDIA_TYPE_VIDEO, + .name = "vmdvideo", + .long_name = NULL_IF_CONFIG_SMALL("Sierra VMD video"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_MSZH, + .type = AVMEDIA_TYPE_VIDEO, + .name = "mszh", + .long_name = NULL_IF_CONFIG_SMALL("LCL (LossLess Codec Library) MSZH"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_ZLIB, + .type = AVMEDIA_TYPE_VIDEO, + .name = "zlib", + .long_name = NULL_IF_CONFIG_SMALL("LCL (LossLess Codec Library) ZLIB"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_QTRLE, + .type = AVMEDIA_TYPE_VIDEO, + .name = "qtrle", + .long_name = NULL_IF_CONFIG_SMALL("QuickTime Animation (RLE) video"), + .props = AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_SNOW, + .type = AVMEDIA_TYPE_VIDEO, + .name = "snow", + .long_name = NULL_IF_CONFIG_SMALL("Snow"), + .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_TSCC, + .type = AVMEDIA_TYPE_VIDEO, + .name = "tscc", + .long_name = NULL_IF_CONFIG_SMALL("TechSmith Screen Capture Codec"), + .props = AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_ULTI, + .type = AVMEDIA_TYPE_VIDEO, + .name = "ulti", + .long_name = NULL_IF_CONFIG_SMALL("IBM UltiMotion"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_QDRAW, + .type = AVMEDIA_TYPE_VIDEO, + .name = "qdraw", + .long_name = NULL_IF_CONFIG_SMALL("Apple QuickDraw"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_VIXL, + .type = AVMEDIA_TYPE_VIDEO, + .name = "vixl", + .long_name = NULL_IF_CONFIG_SMALL("Miro VideoXL"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_QPEG, + .type = AVMEDIA_TYPE_VIDEO, + .name = "qpeg", + .long_name = NULL_IF_CONFIG_SMALL("Q-team QPEG"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_FFVHUFF, + .type = AVMEDIA_TYPE_VIDEO, + .name = "ffvhuff", + .long_name = NULL_IF_CONFIG_SMALL("Huffyuv FFmpeg variant"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_RV30, + .type = AVMEDIA_TYPE_VIDEO, + .name = "rv30", + .long_name = NULL_IF_CONFIG_SMALL("RealVideo 3.0"), + .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_REORDER, + }, + { + .id = AV_CODEC_ID_RV40, + .type = AVMEDIA_TYPE_VIDEO, + .name = "rv40", + .long_name = NULL_IF_CONFIG_SMALL("RealVideo 4.0"), + .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_REORDER, + }, + { + .id = AV_CODEC_ID_VC1, + .type = AVMEDIA_TYPE_VIDEO, + .name = "vc1", + .long_name = NULL_IF_CONFIG_SMALL("SMPTE VC-1"), + .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_REORDER, + .profiles = NULL_IF_CONFIG_SMALL(ff_vc1_profiles), + }, + { + .id = AV_CODEC_ID_WMV3, + .type = AVMEDIA_TYPE_VIDEO, + .name = "wmv3", + .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 9"), + .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_REORDER, + .profiles = NULL_IF_CONFIG_SMALL(ff_vc1_profiles), + }, + { + .id = AV_CODEC_ID_LOCO, + .type = AVMEDIA_TYPE_VIDEO, + .name = "loco", + .long_name = NULL_IF_CONFIG_SMALL("LOCO"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_WNV1, + .type = AVMEDIA_TYPE_VIDEO, + .name = "wnv1", + .long_name = NULL_IF_CONFIG_SMALL("Winnov WNV1"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_AASC, + .type = AVMEDIA_TYPE_VIDEO, + .name = "aasc", + .long_name = NULL_IF_CONFIG_SMALL("Autodesk RLE"), + .props = AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_INDEO2, + .type = AVMEDIA_TYPE_VIDEO, + .name = "indeo2", + .long_name = NULL_IF_CONFIG_SMALL("Intel Indeo 2"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_FRAPS, + .type = AVMEDIA_TYPE_VIDEO, + .name = "fraps", + .long_name = NULL_IF_CONFIG_SMALL("Fraps"), + .props = AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_TRUEMOTION2, + .type = AVMEDIA_TYPE_VIDEO, + .name = "truemotion2", + .long_name = NULL_IF_CONFIG_SMALL("Duck TrueMotion 2.0"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_BMP, + .type = AVMEDIA_TYPE_VIDEO, + .name = "bmp", + .long_name = NULL_IF_CONFIG_SMALL("BMP (Windows and OS/2 bitmap)"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, + .mime_types= MT("image/x-ms-bmp"), + }, + { + .id = AV_CODEC_ID_CSCD, + .type = AVMEDIA_TYPE_VIDEO, + .name = "cscd", + .long_name = NULL_IF_CONFIG_SMALL("CamStudio"), + .props = AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_MMVIDEO, + .type = AVMEDIA_TYPE_VIDEO, + .name = "mmvideo", + .long_name = NULL_IF_CONFIG_SMALL("American Laser Games MM Video"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_ZMBV, + .type = AVMEDIA_TYPE_VIDEO, + .name = "zmbv", + .long_name = NULL_IF_CONFIG_SMALL("Zip Motion Blocks Video"), + .props = AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_AVS, + .type = AVMEDIA_TYPE_VIDEO, + .name = "avs", + .long_name = NULL_IF_CONFIG_SMALL("AVS (Audio Video Standard) video"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_SMACKVIDEO, + .type = AVMEDIA_TYPE_VIDEO, + .name = "smackvideo", + .long_name = NULL_IF_CONFIG_SMALL("Smacker video"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_NUV, + .type = AVMEDIA_TYPE_VIDEO, + .name = "nuv", + .long_name = NULL_IF_CONFIG_SMALL("NuppelVideo/RTJPEG"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_KMVC, + .type = AVMEDIA_TYPE_VIDEO, + .name = "kmvc", + .long_name = NULL_IF_CONFIG_SMALL("Karl Morton's video codec"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_FLASHSV, + .type = AVMEDIA_TYPE_VIDEO, + .name = "flashsv", + .long_name = NULL_IF_CONFIG_SMALL("Flash Screen Video v1"), + .props = AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_CAVS, + .type = AVMEDIA_TYPE_VIDEO, + .name = "cavs", + .long_name = NULL_IF_CONFIG_SMALL("Chinese AVS (Audio Video Standard) (AVS1-P2, JiZhun profile)"), + .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_REORDER, + }, + { + .id = AV_CODEC_ID_JPEG2000, + .type = AVMEDIA_TYPE_VIDEO, + .name = "jpeg2000", + .long_name = NULL_IF_CONFIG_SMALL("JPEG 2000"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY | + AV_CODEC_PROP_LOSSLESS, + .mime_types= MT("image/jp2"), + .profiles = NULL_IF_CONFIG_SMALL(ff_jpeg2000_profiles), + }, + { + .id = AV_CODEC_ID_VMNC, + .type = AVMEDIA_TYPE_VIDEO, + .name = "vmnc", + .long_name = NULL_IF_CONFIG_SMALL("VMware Screen Codec / VMware Video"), + .props = AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_VP5, + .type = AVMEDIA_TYPE_VIDEO, + .name = "vp5", + .long_name = NULL_IF_CONFIG_SMALL("On2 VP5"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_VP6, + .type = AVMEDIA_TYPE_VIDEO, + .name = "vp6", + .long_name = NULL_IF_CONFIG_SMALL("On2 VP6"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_VP6F, + .type = AVMEDIA_TYPE_VIDEO, + .name = "vp6f", + .long_name = NULL_IF_CONFIG_SMALL("On2 VP6 (Flash version)"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_DSICINVIDEO, + .type = AVMEDIA_TYPE_VIDEO, + .name = "dsicinvideo", + .long_name = NULL_IF_CONFIG_SMALL("Delphine Software International CIN video"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_TIERTEXSEQVIDEO, + .type = AVMEDIA_TYPE_VIDEO, + .name = "tiertexseqvideo", + .long_name = NULL_IF_CONFIG_SMALL("Tiertex Limited SEQ video"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_DXA, + .type = AVMEDIA_TYPE_VIDEO, + .name = "dxa", + .long_name = NULL_IF_CONFIG_SMALL("Feeble Files/ScummVM DXA"), + .props = AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_DNXHD, + .type = AVMEDIA_TYPE_VIDEO, + .name = "dnxhd", + .long_name = NULL_IF_CONFIG_SMALL("VC3/DNxHD"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_THP, + .type = AVMEDIA_TYPE_VIDEO, + .name = "thp", + .long_name = NULL_IF_CONFIG_SMALL("Nintendo Gamecube THP video"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_C93, + .type = AVMEDIA_TYPE_VIDEO, + .name = "c93", + .long_name = NULL_IF_CONFIG_SMALL("Interplay C93"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_BETHSOFTVID, + .type = AVMEDIA_TYPE_VIDEO, + .name = "bethsoftvid", + .long_name = NULL_IF_CONFIG_SMALL("Bethesda VID video"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_VP6A, + .type = AVMEDIA_TYPE_VIDEO, + .name = "vp6a", + .long_name = NULL_IF_CONFIG_SMALL("On2 VP6 (Flash version, with alpha channel)"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_AMV, + .type = AVMEDIA_TYPE_VIDEO, + .name = "amv", + .long_name = NULL_IF_CONFIG_SMALL("AMV Video"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_VB, + .type = AVMEDIA_TYPE_VIDEO, + .name = "vb", + .long_name = NULL_IF_CONFIG_SMALL("Beam Software VB"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_INDEO4, + .type = AVMEDIA_TYPE_VIDEO, + .name = "indeo4", + .long_name = NULL_IF_CONFIG_SMALL("Intel Indeo Video Interactive 4"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_INDEO5, + .type = AVMEDIA_TYPE_VIDEO, + .name = "indeo5", + .long_name = NULL_IF_CONFIG_SMALL("Intel Indeo Video Interactive 5"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_MIMIC, + .type = AVMEDIA_TYPE_VIDEO, + .name = "mimic", + .long_name = NULL_IF_CONFIG_SMALL("Mimic"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_RL2, + .type = AVMEDIA_TYPE_VIDEO, + .name = "rl2", + .long_name = NULL_IF_CONFIG_SMALL("RL2 video"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_ESCAPE124, + .type = AVMEDIA_TYPE_VIDEO, + .name = "escape124", + .long_name = NULL_IF_CONFIG_SMALL("Escape 124"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_DAALA, + .type = AVMEDIA_TYPE_VIDEO, + .name = "daala", + .long_name = NULL_IF_CONFIG_SMALL("Daala"), + .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_DIRAC, + .type = AVMEDIA_TYPE_VIDEO, + .name = "dirac", + .long_name = NULL_IF_CONFIG_SMALL("Dirac"), + .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_LOSSLESS | AV_CODEC_PROP_REORDER, + }, + { + .id = AV_CODEC_ID_BFI, + .type = AVMEDIA_TYPE_VIDEO, + .name = "bfi", + .long_name = NULL_IF_CONFIG_SMALL("Brute Force & Ignorance"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_CMV, + .type = AVMEDIA_TYPE_VIDEO, + .name = "cmv", + .long_name = NULL_IF_CONFIG_SMALL("Electronic Arts CMV video"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_MOTIONPIXELS, + .type = AVMEDIA_TYPE_VIDEO, + .name = "motionpixels", + .long_name = NULL_IF_CONFIG_SMALL("Motion Pixels video"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_TGV, + .type = AVMEDIA_TYPE_VIDEO, + .name = "tgv", + .long_name = NULL_IF_CONFIG_SMALL("Electronic Arts TGV video"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_TGQ, + .type = AVMEDIA_TYPE_VIDEO, + .name = "tgq", + .long_name = NULL_IF_CONFIG_SMALL("Electronic Arts TGQ video"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_TQI, + .type = AVMEDIA_TYPE_VIDEO, + .name = "tqi", + .long_name = NULL_IF_CONFIG_SMALL("Electronic Arts TQI video"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_AURA, + .type = AVMEDIA_TYPE_VIDEO, + .name = "aura", + .long_name = NULL_IF_CONFIG_SMALL("Auravision AURA"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_AURA2, + .type = AVMEDIA_TYPE_VIDEO, + .name = "aura2", + .long_name = NULL_IF_CONFIG_SMALL("Auravision Aura 2"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_V210X, + .type = AVMEDIA_TYPE_VIDEO, + .name = "v210x", + .long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:2:2 10-bit"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_TMV, + .type = AVMEDIA_TYPE_VIDEO, + .name = "tmv", + .long_name = NULL_IF_CONFIG_SMALL("8088flex TMV"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_V210, + .type = AVMEDIA_TYPE_VIDEO, + .name = "v210", + .long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:2:2 10-bit"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_MAD, + .type = AVMEDIA_TYPE_VIDEO, + .name = "mad", + .long_name = NULL_IF_CONFIG_SMALL("Electronic Arts Madcow Video"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_FRWU, + .type = AVMEDIA_TYPE_VIDEO, + .name = "frwu", + .long_name = NULL_IF_CONFIG_SMALL("Forward Uncompressed"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_FLASHSV2, + .type = AVMEDIA_TYPE_VIDEO, + .name = "flashsv2", + .long_name = NULL_IF_CONFIG_SMALL("Flash Screen Video v2"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_CDGRAPHICS, + .type = AVMEDIA_TYPE_VIDEO, + .name = "cdgraphics", + .long_name = NULL_IF_CONFIG_SMALL("CD Graphics video"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_R210, + .type = AVMEDIA_TYPE_VIDEO, + .name = "r210", + .long_name = NULL_IF_CONFIG_SMALL("Uncompressed RGB 10-bit"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_ANM, + .type = AVMEDIA_TYPE_VIDEO, + .name = "anm", + .long_name = NULL_IF_CONFIG_SMALL("Deluxe Paint Animation"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_BINKVIDEO, + .type = AVMEDIA_TYPE_VIDEO, + .name = "binkvideo", + .long_name = NULL_IF_CONFIG_SMALL("Bink video"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_IFF_ILBM, + .type = AVMEDIA_TYPE_VIDEO, + .name = "iff_ilbm", + .long_name = NULL_IF_CONFIG_SMALL("IFF ILBM"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_KGV1, + .type = AVMEDIA_TYPE_VIDEO, + .name = "kgv1", + .long_name = NULL_IF_CONFIG_SMALL("Kega Game Video"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_YOP, + .type = AVMEDIA_TYPE_VIDEO, + .name = "yop", + .long_name = NULL_IF_CONFIG_SMALL("Psygnosis YOP Video"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_VP8, + .type = AVMEDIA_TYPE_VIDEO, + .name = "vp8", + .long_name = NULL_IF_CONFIG_SMALL("On2 VP8"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_VP9, + .type = AVMEDIA_TYPE_VIDEO, + .name = "vp9", + .long_name = NULL_IF_CONFIG_SMALL("Google VP9"), + .props = AV_CODEC_PROP_LOSSY, + .profiles = NULL_IF_CONFIG_SMALL(ff_vp9_profiles), + }, + { + .id = AV_CODEC_ID_PICTOR, + .type = AVMEDIA_TYPE_VIDEO, + .name = "pictor", + .long_name = NULL_IF_CONFIG_SMALL("Pictor/PC Paint"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_A64_MULTI, + .type = AVMEDIA_TYPE_VIDEO, + .name = "a64_multi", + .long_name = NULL_IF_CONFIG_SMALL("Multicolor charset for Commodore 64"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_A64_MULTI5, + .type = AVMEDIA_TYPE_VIDEO, + .name = "a64_multi5", + .long_name = NULL_IF_CONFIG_SMALL("Multicolor charset for Commodore 64, extended with 5th color (colram)"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_R10K, + .type = AVMEDIA_TYPE_VIDEO, + .name = "r10k", + .long_name = NULL_IF_CONFIG_SMALL("AJA Kona 10-bit RGB Codec"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_MVC1, + .type = AVMEDIA_TYPE_VIDEO, + .name = "mvc1", + .long_name = NULL_IF_CONFIG_SMALL("Silicon Graphics Motion Video Compressor 1"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_MVC2, + .type = AVMEDIA_TYPE_VIDEO, + .name = "mvc2", + .long_name = NULL_IF_CONFIG_SMALL("Silicon Graphics Motion Video Compressor 2"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_MXPEG, + .type = AVMEDIA_TYPE_VIDEO, + .name = "mxpeg", + .long_name = NULL_IF_CONFIG_SMALL("Mobotix MxPEG video"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_LAGARITH, + .type = AVMEDIA_TYPE_VIDEO, + .name = "lagarith", + .long_name = NULL_IF_CONFIG_SMALL("Lagarith lossless"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_PRORES, + .type = AVMEDIA_TYPE_VIDEO, + .name = "prores", + .long_name = NULL_IF_CONFIG_SMALL("Apple ProRes (iCodec Pro)"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_JV, + .type = AVMEDIA_TYPE_VIDEO, + .name = "jv", + .long_name = NULL_IF_CONFIG_SMALL("Bitmap Brothers JV video"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_DFA, + .type = AVMEDIA_TYPE_VIDEO, + .name = "dfa", + .long_name = NULL_IF_CONFIG_SMALL("Chronomaster DFA"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_UTVIDEO, + .type = AVMEDIA_TYPE_VIDEO, + .name = "utvideo", + .long_name = NULL_IF_CONFIG_SMALL("Ut Video"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_BMV_VIDEO, + .type = AVMEDIA_TYPE_VIDEO, + .name = "bmv_video", + .long_name = NULL_IF_CONFIG_SMALL("Discworld II BMV video"), + .props = AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_VBLE, + .type = AVMEDIA_TYPE_VIDEO, + .name = "vble", + .long_name = NULL_IF_CONFIG_SMALL("VBLE Lossless Codec"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_DXTORY, + .type = AVMEDIA_TYPE_VIDEO, + .name = "dxtory", + .long_name = NULL_IF_CONFIG_SMALL("Dxtory"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_V410, + .type = AVMEDIA_TYPE_VIDEO, + .name = "v410", + .long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:4:4 10-bit"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_CDXL, + .type = AVMEDIA_TYPE_VIDEO, + .name = "cdxl", + .long_name = NULL_IF_CONFIG_SMALL("Commodore CDXL video"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_ZEROCODEC, + .type = AVMEDIA_TYPE_VIDEO, + .name = "zerocodec", + .long_name = NULL_IF_CONFIG_SMALL("ZeroCodec Lossless Video"), + .props = AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_MSS1, + .type = AVMEDIA_TYPE_VIDEO, + .name = "mss1", + .long_name = NULL_IF_CONFIG_SMALL("MS Screen 1"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_MSA1, + .type = AVMEDIA_TYPE_VIDEO, + .name = "msa1", + .long_name = NULL_IF_CONFIG_SMALL("MS ATC Screen"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_TSCC2, + .type = AVMEDIA_TYPE_VIDEO, + .name = "tscc2", + .long_name = NULL_IF_CONFIG_SMALL("TechSmith Screen Codec 2"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_MTS2, + .type = AVMEDIA_TYPE_VIDEO, + .name = "mts2", + .long_name = NULL_IF_CONFIG_SMALL("MS Expression Encoder Screen"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_CLLC, + .type = AVMEDIA_TYPE_VIDEO, + .name = "cllc", + .long_name = NULL_IF_CONFIG_SMALL("Canopus Lossless Codec"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_MSS2, + .type = AVMEDIA_TYPE_VIDEO, + .name = "mss2", + .long_name = NULL_IF_CONFIG_SMALL("MS Windows Media Video V9 Screen"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_AIC, + .type = AVMEDIA_TYPE_VIDEO, + .name = "aic", + .long_name = NULL_IF_CONFIG_SMALL("Apple Intermediate Codec"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_Y41P, + .type = AVMEDIA_TYPE_VIDEO, + .name = "y41p", + .long_name = NULL_IF_CONFIG_SMALL("Uncompressed YUV 4:1:1 12-bit"), + .props = AV_CODEC_PROP_INTRA_ONLY, + }, + { + .id = AV_CODEC_ID_ESCAPE130, + .type = AVMEDIA_TYPE_VIDEO, + .name = "escape130", + .long_name = NULL_IF_CONFIG_SMALL("Escape 130"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_AVRP, + .type = AVMEDIA_TYPE_VIDEO, + .name = "avrp", + .long_name = NULL_IF_CONFIG_SMALL("Avid 1:1 10-bit RGB Packer"), + .props = AV_CODEC_PROP_INTRA_ONLY, + }, + { + .id = AV_CODEC_ID_012V, + .type = AVMEDIA_TYPE_VIDEO, + .name = "012v", + .long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:2:2 10-bit"), + .props = AV_CODEC_PROP_INTRA_ONLY, + }, + { + .id = AV_CODEC_ID_AVUI, + .type = AVMEDIA_TYPE_VIDEO, + .name = "avui", + .long_name = NULL_IF_CONFIG_SMALL("Avid Meridien Uncompressed"), + .props = AV_CODEC_PROP_INTRA_ONLY, + }, + { + .id = AV_CODEC_ID_AYUV, + .type = AVMEDIA_TYPE_VIDEO, + .name = "ayuv", + .long_name = NULL_IF_CONFIG_SMALL("Uncompressed packed MS 4:4:4:4"), + .props = AV_CODEC_PROP_INTRA_ONLY, + }, + { + .id = AV_CODEC_ID_TARGA_Y216, + .type = AVMEDIA_TYPE_VIDEO, + .name = "targa_y216", + .long_name = NULL_IF_CONFIG_SMALL("Pinnacle TARGA CineWave YUV16"), + .props = AV_CODEC_PROP_INTRA_ONLY, + }, + { + .id = AV_CODEC_ID_V308, + .type = AVMEDIA_TYPE_VIDEO, + .name = "v308", + .long_name = NULL_IF_CONFIG_SMALL("Uncompressed packed 4:4:4"), + .props = AV_CODEC_PROP_INTRA_ONLY, + }, + { + .id = AV_CODEC_ID_V408, + .type = AVMEDIA_TYPE_VIDEO, + .name = "v408", + .long_name = NULL_IF_CONFIG_SMALL("Uncompressed packed QT 4:4:4:4"), + .props = AV_CODEC_PROP_INTRA_ONLY, + }, + { + .id = AV_CODEC_ID_YUV4, + .type = AVMEDIA_TYPE_VIDEO, + .name = "yuv4", + .long_name = NULL_IF_CONFIG_SMALL("Uncompressed packed 4:2:0"), + .props = AV_CODEC_PROP_INTRA_ONLY, + }, + { + .id = AV_CODEC_ID_AVRN, + .type = AVMEDIA_TYPE_VIDEO, + .name = "avrn", + .long_name = NULL_IF_CONFIG_SMALL("Avid AVI Codec"), + }, + { + .id = AV_CODEC_ID_CPIA, + .type = AVMEDIA_TYPE_VIDEO, + .name = "cpia", + .long_name = NULL_IF_CONFIG_SMALL("CPiA video format"), + }, + { + .id = AV_CODEC_ID_XFACE, + .type = AVMEDIA_TYPE_VIDEO, + .name = "xface", + .long_name = NULL_IF_CONFIG_SMALL("X-face image"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_SMVJPEG, + .type = AVMEDIA_TYPE_VIDEO, + .name = "smvjpeg", + .long_name = NULL_IF_CONFIG_SMALL("Sigmatel Motion Video"), + }, + + { + .id = AV_CODEC_ID_G2M, + .type = AVMEDIA_TYPE_VIDEO, + .name = "g2m", + .long_name = NULL_IF_CONFIG_SMALL("Go2Meeting"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_HNM4_VIDEO, + .type = AVMEDIA_TYPE_VIDEO, + .name = "hnm4video", + .long_name = NULL_IF_CONFIG_SMALL("HNM 4 video"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_HEVC, + .type = AVMEDIA_TYPE_VIDEO, + .name = "hevc", + .long_name = NULL_IF_CONFIG_SMALL("H.265 / HEVC (High Efficiency Video Coding)"), + .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_REORDER, + .profiles = NULL_IF_CONFIG_SMALL(ff_hevc_profiles), + }, + { + .id = AV_CODEC_ID_FIC, + .type = AVMEDIA_TYPE_VIDEO, + .name = "fic", + .long_name = NULL_IF_CONFIG_SMALL("Mirillis FIC"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_PAF_VIDEO, + .type = AVMEDIA_TYPE_VIDEO, + .name = "paf_video", + .long_name = NULL_IF_CONFIG_SMALL("Amazing Studio Packed Animation File Video"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_VP7, + .type = AVMEDIA_TYPE_VIDEO, + .name = "vp7", + .long_name = NULL_IF_CONFIG_SMALL("On2 VP7"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_SANM, + .type = AVMEDIA_TYPE_VIDEO, + .name = "sanm", + .long_name = NULL_IF_CONFIG_SMALL("LucasArts SANM/SMUSH video"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_SGIRLE, + .type = AVMEDIA_TYPE_VIDEO, + .name = "sgirle", + .long_name = NULL_IF_CONFIG_SMALL("SGI RLE 8-bit"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_HQX, + .type = AVMEDIA_TYPE_VIDEO, + .name = "hqx", + .long_name = NULL_IF_CONFIG_SMALL("Canopus HQX"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_HQ_HQA, + .type = AVMEDIA_TYPE_VIDEO, + .name = "hq_hqa", + .long_name = NULL_IF_CONFIG_SMALL("Canopus HQ/HQA"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_HAP, + .type = AVMEDIA_TYPE_VIDEO, + .name = "hap", + .long_name = NULL_IF_CONFIG_SMALL("Vidvox Hap decoder"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_DXV, + .type = AVMEDIA_TYPE_VIDEO, + .name = "dxv", + .long_name = NULL_IF_CONFIG_SMALL("Resolume DXV"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_SCREENPRESSO, + .type = AVMEDIA_TYPE_VIDEO, + .name = "screenpresso", + .long_name = NULL_IF_CONFIG_SMALL("Screenpresso"), + .props = AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_WRAPPED_AVFRAME, + .type = AVMEDIA_TYPE_VIDEO, + .name = "wrapped_avframe", + .long_name = NULL_IF_CONFIG_SMALL("AVFrame to AVPacket passthrough"), + .props = AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_RSCC, + .type = AVMEDIA_TYPE_VIDEO, + .name = "rscc", + .long_name = NULL_IF_CONFIG_SMALL("innoHeim/Rsupport Screen Capture Codec"), + .props = AV_CODEC_PROP_LOSSLESS, + }, + + /* image codecs */ + { + .id = AV_CODEC_ID_ALIAS_PIX, + .type = AVMEDIA_TYPE_VIDEO, + .name = "alias_pix", + .long_name = NULL_IF_CONFIG_SMALL("Alias/Wavefront PIX image"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_ANSI, + .type = AVMEDIA_TYPE_VIDEO, + .name = "ansi", + .long_name = NULL_IF_CONFIG_SMALL("ASCII/ANSI art"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_BRENDER_PIX, + .type = AVMEDIA_TYPE_VIDEO, + .name = "brender_pix", + .long_name = NULL_IF_CONFIG_SMALL("BRender PIX image"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_DDS, + .type = AVMEDIA_TYPE_VIDEO, + .name = "dds", + .long_name = NULL_IF_CONFIG_SMALL("DirectDraw Surface image decoder"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY | + AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_DPX, + .type = AVMEDIA_TYPE_VIDEO, + .name = "dpx", + .long_name = NULL_IF_CONFIG_SMALL("DPX (Digital Picture Exchange) image"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_EXR, + .type = AVMEDIA_TYPE_VIDEO, + .name = "exr", + .long_name = NULL_IF_CONFIG_SMALL("OpenEXR image"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY | + AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_GIF, + .type = AVMEDIA_TYPE_VIDEO, + .name = "gif", + .long_name = NULL_IF_CONFIG_SMALL("GIF (Graphics Interchange Format)"), + .props = AV_CODEC_PROP_LOSSLESS, + .mime_types= MT("image/gif"), + }, + { + .id = AV_CODEC_ID_JPEGLS, + .type = AVMEDIA_TYPE_VIDEO, + .name = "jpegls", + .long_name = NULL_IF_CONFIG_SMALL("JPEG-LS"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY | + AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_LJPEG, + .type = AVMEDIA_TYPE_VIDEO, + .name = "ljpeg", + .long_name = NULL_IF_CONFIG_SMALL("Lossless JPEG"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_PAM, + .type = AVMEDIA_TYPE_VIDEO, + .name = "pam", + .long_name = NULL_IF_CONFIG_SMALL("PAM (Portable AnyMap) image"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, + .mime_types= MT("image/x-portable-pixmap"), + }, + { + .id = AV_CODEC_ID_PBM, + .type = AVMEDIA_TYPE_VIDEO, + .name = "pbm", + .long_name = NULL_IF_CONFIG_SMALL("PBM (Portable BitMap) image"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_PCX, + .type = AVMEDIA_TYPE_VIDEO, + .name = "pcx", + .long_name = NULL_IF_CONFIG_SMALL("PC Paintbrush PCX image"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, + .mime_types= MT("image/x-pcx"), + }, + { + .id = AV_CODEC_ID_PGM, + .type = AVMEDIA_TYPE_VIDEO, + .name = "pgm", + .long_name = NULL_IF_CONFIG_SMALL("PGM (Portable GrayMap) image"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_PGMYUV, + .type = AVMEDIA_TYPE_VIDEO, + .name = "pgmyuv", + .long_name = NULL_IF_CONFIG_SMALL("PGMYUV (Portable GrayMap YUV) image"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_PNG, + .type = AVMEDIA_TYPE_VIDEO, + .name = "png", + .long_name = NULL_IF_CONFIG_SMALL("PNG (Portable Network Graphics) image"), + .props = AV_CODEC_PROP_LOSSLESS, + .mime_types= MT("image/png"), + }, + { + .id = AV_CODEC_ID_PPM, + .type = AVMEDIA_TYPE_VIDEO, + .name = "ppm", + .long_name = NULL_IF_CONFIG_SMALL("PPM (Portable PixelMap) image"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_PTX, + .type = AVMEDIA_TYPE_VIDEO, + .name = "ptx", + .long_name = NULL_IF_CONFIG_SMALL("V.Flash PTX image"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_SGI, + .type = AVMEDIA_TYPE_VIDEO, + .name = "sgi", + .long_name = NULL_IF_CONFIG_SMALL("SGI image"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_SP5X, + .type = AVMEDIA_TYPE_VIDEO, + .name = "sp5x", + .long_name = NULL_IF_CONFIG_SMALL("Sunplus JPEG (SP5X)"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_SUNRAST, + .type = AVMEDIA_TYPE_VIDEO, + .name = "sunrast", + .long_name = NULL_IF_CONFIG_SMALL("Sun Rasterfile image"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_TARGA, + .type = AVMEDIA_TYPE_VIDEO, + .name = "targa", + .long_name = NULL_IF_CONFIG_SMALL("Truevision Targa image"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, + .mime_types= MT("image/x-targa", "image/x-tga"), + }, + { + .id = AV_CODEC_ID_TDSC, + .type = AVMEDIA_TYPE_VIDEO, + .name = "tdsc", + .long_name = NULL_IF_CONFIG_SMALL("TDSC"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_TIFF, + .type = AVMEDIA_TYPE_VIDEO, + .name = "tiff", + .long_name = NULL_IF_CONFIG_SMALL("TIFF image"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, + .mime_types= MT("image/tiff"), + }, + { + .id = AV_CODEC_ID_TXD, + .type = AVMEDIA_TYPE_VIDEO, + .name = "txd", + .long_name = NULL_IF_CONFIG_SMALL("Renderware TXD (TeXture Dictionary) image"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_VC1IMAGE, + .type = AVMEDIA_TYPE_VIDEO, + .name = "vc1image", + .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 9 Image v2"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_WEBP, + .type = AVMEDIA_TYPE_VIDEO, + .name = "webp", + .long_name = NULL_IF_CONFIG_SMALL("WebP"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY | + AV_CODEC_PROP_LOSSLESS, + .mime_types= MT("image/webp"), + }, + { + .id = AV_CODEC_ID_WMV3IMAGE, + .type = AVMEDIA_TYPE_VIDEO, + .name = "wmv3image", + .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 9 Image"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_XBM, + .type = AVMEDIA_TYPE_VIDEO, + .name = "xbm", + .long_name = NULL_IF_CONFIG_SMALL("XBM (X BitMap) image"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_XWD, + .type = AVMEDIA_TYPE_VIDEO, + .name = "xwd", + .long_name = NULL_IF_CONFIG_SMALL("XWD (X Window Dump) image"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, + .mime_types= MT("image/x-xwindowdump"), + }, + { + .id = AV_CODEC_ID_APNG, + .type = AVMEDIA_TYPE_VIDEO, + .name = "apng", + .long_name = NULL_IF_CONFIG_SMALL("APNG (Animated Portable Network Graphics) image"), + .props = AV_CODEC_PROP_LOSSLESS, + .mime_types= MT("image/png"), + }, + { + .id = AV_CODEC_ID_CFHD, + .type = AVMEDIA_TYPE_VIDEO, + .name = "cfhd", + .long_name = NULL_IF_CONFIG_SMALL("Cineform HD"), + .props = AV_CODEC_PROP_LOSSY, + }, + + /* various PCM "codecs" */ + { + .id = AV_CODEC_ID_PCM_S16LE, + .type = AVMEDIA_TYPE_AUDIO, + .name = "pcm_s16le", + .long_name = NULL_IF_CONFIG_SMALL("PCM signed 16-bit little-endian"), + .props = AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_PCM_S16BE, + .type = AVMEDIA_TYPE_AUDIO, + .name = "pcm_s16be", + .long_name = NULL_IF_CONFIG_SMALL("PCM signed 16-bit big-endian"), + .props = AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_PCM_U16LE, + .type = AVMEDIA_TYPE_AUDIO, + .name = "pcm_u16le", + .long_name = NULL_IF_CONFIG_SMALL("PCM unsigned 16-bit little-endian"), + .props = AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_PCM_U16BE, + .type = AVMEDIA_TYPE_AUDIO, + .name = "pcm_u16be", + .long_name = NULL_IF_CONFIG_SMALL("PCM unsigned 16-bit big-endian"), + .props = AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_PCM_S8, + .type = AVMEDIA_TYPE_AUDIO, + .name = "pcm_s8", + .long_name = NULL_IF_CONFIG_SMALL("PCM signed 8-bit"), + .props = AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_PCM_U8, + .type = AVMEDIA_TYPE_AUDIO, + .name = "pcm_u8", + .long_name = NULL_IF_CONFIG_SMALL("PCM unsigned 8-bit"), + .props = AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_PCM_MULAW, + .type = AVMEDIA_TYPE_AUDIO, + .name = "pcm_mulaw", + .long_name = NULL_IF_CONFIG_SMALL("PCM mu-law / G.711 mu-law"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_PCM_ALAW, + .type = AVMEDIA_TYPE_AUDIO, + .name = "pcm_alaw", + .long_name = NULL_IF_CONFIG_SMALL("PCM A-law / G.711 A-law"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_PCM_S32LE, + .type = AVMEDIA_TYPE_AUDIO, + .name = "pcm_s32le", + .long_name = NULL_IF_CONFIG_SMALL("PCM signed 32-bit little-endian"), + .props = AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_PCM_S32BE, + .type = AVMEDIA_TYPE_AUDIO, + .name = "pcm_s32be", + .long_name = NULL_IF_CONFIG_SMALL("PCM signed 32-bit big-endian"), + .props = AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_PCM_U32LE, + .type = AVMEDIA_TYPE_AUDIO, + .name = "pcm_u32le", + .long_name = NULL_IF_CONFIG_SMALL("PCM unsigned 32-bit little-endian"), + .props = AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_PCM_U32BE, + .type = AVMEDIA_TYPE_AUDIO, + .name = "pcm_u32be", + .long_name = NULL_IF_CONFIG_SMALL("PCM unsigned 32-bit big-endian"), + .props = AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_PCM_S24LE, + .type = AVMEDIA_TYPE_AUDIO, + .name = "pcm_s24le", + .long_name = NULL_IF_CONFIG_SMALL("PCM signed 24-bit little-endian"), + .props = AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_PCM_S24BE, + .type = AVMEDIA_TYPE_AUDIO, + .name = "pcm_s24be", + .long_name = NULL_IF_CONFIG_SMALL("PCM signed 24-bit big-endian"), + .props = AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_PCM_U24LE, + .type = AVMEDIA_TYPE_AUDIO, + .name = "pcm_u24le", + .long_name = NULL_IF_CONFIG_SMALL("PCM unsigned 24-bit little-endian"), + .props = AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_PCM_U24BE, + .type = AVMEDIA_TYPE_AUDIO, + .name = "pcm_u24be", + .long_name = NULL_IF_CONFIG_SMALL("PCM unsigned 24-bit big-endian"), + .props = AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_PCM_S24DAUD, + .type = AVMEDIA_TYPE_AUDIO, + .name = "pcm_s24daud", + .long_name = NULL_IF_CONFIG_SMALL("PCM D-Cinema audio signed 24-bit"), + .props = AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_PCM_ZORK, + .type = AVMEDIA_TYPE_AUDIO, + .name = "pcm_zork", + .long_name = NULL_IF_CONFIG_SMALL("PCM Zork"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_PCM_S16BE_PLANAR, + .type = AVMEDIA_TYPE_AUDIO, + .name = "pcm_s16be_planar", + .long_name = NULL_IF_CONFIG_SMALL("PCM signed 16-bit big-endian planar"), + .props = AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_PCM_S16LE_PLANAR, + .type = AVMEDIA_TYPE_AUDIO, + .name = "pcm_s16le_planar", + .long_name = NULL_IF_CONFIG_SMALL("PCM signed 16-bit little-endian planar"), + .props = AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_PCM_S24LE_PLANAR, + .type = AVMEDIA_TYPE_AUDIO, + .name = "pcm_s24le_planar", + .long_name = NULL_IF_CONFIG_SMALL("PCM signed 24-bit little-endian planar"), + .props = AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_PCM_S32LE_PLANAR, + .type = AVMEDIA_TYPE_AUDIO, + .name = "pcm_s32le_planar", + .long_name = NULL_IF_CONFIG_SMALL("PCM signed 32-bit little-endian planar"), + .props = AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_PCM_DVD, + .type = AVMEDIA_TYPE_AUDIO, + .name = "pcm_dvd", + .long_name = NULL_IF_CONFIG_SMALL("PCM signed 20|24-bit big-endian"), + .props = AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_PCM_F32BE, + .type = AVMEDIA_TYPE_AUDIO, + .name = "pcm_f32be", + .long_name = NULL_IF_CONFIG_SMALL("PCM 32-bit floating point big-endian"), + .props = AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_PCM_F32LE, + .type = AVMEDIA_TYPE_AUDIO, + .name = "pcm_f32le", + .long_name = NULL_IF_CONFIG_SMALL("PCM 32-bit floating point little-endian"), + .props = AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_PCM_F64BE, + .type = AVMEDIA_TYPE_AUDIO, + .name = "pcm_f64be", + .long_name = NULL_IF_CONFIG_SMALL("PCM 64-bit floating point big-endian"), + .props = AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_PCM_F64LE, + .type = AVMEDIA_TYPE_AUDIO, + .name = "pcm_f64le", + .long_name = NULL_IF_CONFIG_SMALL("PCM 64-bit floating point little-endian"), + .props = AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_PCM_BLURAY, + .type = AVMEDIA_TYPE_AUDIO, + .name = "pcm_bluray", + .long_name = NULL_IF_CONFIG_SMALL("PCM signed 16|20|24-bit big-endian for Blu-ray media"), + .props = AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_PCM_LXF, + .type = AVMEDIA_TYPE_AUDIO, + .name = "pcm_lxf", + .long_name = NULL_IF_CONFIG_SMALL("PCM signed 20-bit little-endian planar"), + .props = AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_S302M, + .type = AVMEDIA_TYPE_AUDIO, + .name = "s302m", + .long_name = NULL_IF_CONFIG_SMALL("SMPTE 302M"), + .props = AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_PCM_S8_PLANAR, + .type = AVMEDIA_TYPE_AUDIO, + .name = "pcm_s8_planar", + .long_name = NULL_IF_CONFIG_SMALL("PCM signed 8-bit planar"), + .props = AV_CODEC_PROP_LOSSLESS, + }, + + /* various ADPCM codecs */ + { + .id = AV_CODEC_ID_ADPCM_IMA_QT, + .type = AVMEDIA_TYPE_AUDIO, + .name = "adpcm_ima_qt", + .long_name = NULL_IF_CONFIG_SMALL("ADPCM IMA QuickTime"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_ADPCM_IMA_WAV, + .type = AVMEDIA_TYPE_AUDIO, + .name = "adpcm_ima_wav", + .long_name = NULL_IF_CONFIG_SMALL("ADPCM IMA WAV"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_ADPCM_IMA_DK3, + .type = AVMEDIA_TYPE_AUDIO, + .name = "adpcm_ima_dk3", + .long_name = NULL_IF_CONFIG_SMALL("ADPCM IMA Duck DK3"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_ADPCM_IMA_DK4, + .type = AVMEDIA_TYPE_AUDIO, + .name = "adpcm_ima_dk4", + .long_name = NULL_IF_CONFIG_SMALL("ADPCM IMA Duck DK4"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_ADPCM_IMA_WS, + .type = AVMEDIA_TYPE_AUDIO, + .name = "adpcm_ima_ws", + .long_name = NULL_IF_CONFIG_SMALL("ADPCM IMA Westwood"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_ADPCM_IMA_SMJPEG, + .type = AVMEDIA_TYPE_AUDIO, + .name = "adpcm_ima_smjpeg", + .long_name = NULL_IF_CONFIG_SMALL("ADPCM IMA Loki SDL MJPEG"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_ADPCM_MS, + .type = AVMEDIA_TYPE_AUDIO, + .name = "adpcm_ms", + .long_name = NULL_IF_CONFIG_SMALL("ADPCM Microsoft"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_ADPCM_4XM, + .type = AVMEDIA_TYPE_AUDIO, + .name = "adpcm_4xm", + .long_name = NULL_IF_CONFIG_SMALL("ADPCM 4X Movie"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_ADPCM_XA, + .type = AVMEDIA_TYPE_AUDIO, + .name = "adpcm_xa", + .long_name = NULL_IF_CONFIG_SMALL("ADPCM CDROM XA"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_ADPCM_ADX, + .type = AVMEDIA_TYPE_AUDIO, + .name = "adpcm_adx", + .long_name = NULL_IF_CONFIG_SMALL("SEGA CRI ADX ADPCM"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_ADPCM_EA, + .type = AVMEDIA_TYPE_AUDIO, + .name = "adpcm_ea", + .long_name = NULL_IF_CONFIG_SMALL("ADPCM Electronic Arts"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_ADPCM_G726, + .type = AVMEDIA_TYPE_AUDIO, + .name = "adpcm_g726", + .long_name = NULL_IF_CONFIG_SMALL("G.726 ADPCM"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_ADPCM_CT, + .type = AVMEDIA_TYPE_AUDIO, + .name = "adpcm_ct", + .long_name = NULL_IF_CONFIG_SMALL("ADPCM Creative Technology"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_ADPCM_SWF, + .type = AVMEDIA_TYPE_AUDIO, + .name = "adpcm_swf", + .long_name = NULL_IF_CONFIG_SMALL("ADPCM Shockwave Flash"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_ADPCM_YAMAHA, + .type = AVMEDIA_TYPE_AUDIO, + .name = "adpcm_yamaha", + .long_name = NULL_IF_CONFIG_SMALL("ADPCM Yamaha"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_ADPCM_SBPRO_4, + .type = AVMEDIA_TYPE_AUDIO, + .name = "adpcm_sbpro_4", + .long_name = NULL_IF_CONFIG_SMALL("ADPCM Sound Blaster Pro 4-bit"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_ADPCM_SBPRO_3, + .type = AVMEDIA_TYPE_AUDIO, + .name = "adpcm_sbpro_3", + .long_name = NULL_IF_CONFIG_SMALL("ADPCM Sound Blaster Pro 2.6-bit"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_ADPCM_SBPRO_2, + .type = AVMEDIA_TYPE_AUDIO, + .name = "adpcm_sbpro_2", + .long_name = NULL_IF_CONFIG_SMALL("ADPCM Sound Blaster Pro 2-bit"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_ADPCM_THP, + .type = AVMEDIA_TYPE_AUDIO, + .name = "adpcm_thp", + .long_name = NULL_IF_CONFIG_SMALL("ADPCM Nintendo THP"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_ADPCM_THP_LE, + .type = AVMEDIA_TYPE_AUDIO, + .name = "adpcm_thp_le", + .long_name = NULL_IF_CONFIG_SMALL("ADPCM Nintendo THP (Little-Endian)"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_ADPCM_IMA_AMV, + .type = AVMEDIA_TYPE_AUDIO, + .name = "adpcm_ima_amv", + .long_name = NULL_IF_CONFIG_SMALL("ADPCM IMA AMV"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_ADPCM_EA_R1, + .type = AVMEDIA_TYPE_AUDIO, + .name = "adpcm_ea_r1", + .long_name = NULL_IF_CONFIG_SMALL("ADPCM Electronic Arts R1"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_ADPCM_EA_R3, + .type = AVMEDIA_TYPE_AUDIO, + .name = "adpcm_ea_r3", + .long_name = NULL_IF_CONFIG_SMALL("ADPCM Electronic Arts R3"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_ADPCM_EA_R2, + .type = AVMEDIA_TYPE_AUDIO, + .name = "adpcm_ea_r2", + .long_name = NULL_IF_CONFIG_SMALL("ADPCM Electronic Arts R2"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_ADPCM_IMA_EA_SEAD, + .type = AVMEDIA_TYPE_AUDIO, + .name = "adpcm_ima_ea_sead", + .long_name = NULL_IF_CONFIG_SMALL("ADPCM IMA Electronic Arts SEAD"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_ADPCM_IMA_EA_EACS, + .type = AVMEDIA_TYPE_AUDIO, + .name = "adpcm_ima_ea_eacs", + .long_name = NULL_IF_CONFIG_SMALL("ADPCM IMA Electronic Arts EACS"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_ADPCM_EA_XAS, + .type = AVMEDIA_TYPE_AUDIO, + .name = "adpcm_ea_xas", + .long_name = NULL_IF_CONFIG_SMALL("ADPCM Electronic Arts XAS"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_ADPCM_EA_MAXIS_XA, + .type = AVMEDIA_TYPE_AUDIO, + .name = "adpcm_ea_maxis_xa", + .long_name = NULL_IF_CONFIG_SMALL("ADPCM Electronic Arts Maxis CDROM XA"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_ADPCM_IMA_ISS, + .type = AVMEDIA_TYPE_AUDIO, + .name = "adpcm_ima_iss", + .long_name = NULL_IF_CONFIG_SMALL("ADPCM IMA Funcom ISS"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_ADPCM_G722, + .type = AVMEDIA_TYPE_AUDIO, + .name = "adpcm_g722", + .long_name = NULL_IF_CONFIG_SMALL("G.722 ADPCM"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_ADPCM_IMA_APC, + .type = AVMEDIA_TYPE_AUDIO, + .name = "adpcm_ima_apc", + .long_name = NULL_IF_CONFIG_SMALL("ADPCM IMA CRYO APC"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_ADPCM_AFC, + .type = AVMEDIA_TYPE_AUDIO, + .name = "adpcm_afc", + .long_name = NULL_IF_CONFIG_SMALL("ADPCM Nintendo Gamecube AFC"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_ADPCM_IMA_OKI, + .type = AVMEDIA_TYPE_AUDIO, + .name = "adpcm_ima_oki", + .long_name = NULL_IF_CONFIG_SMALL("ADPCM IMA Dialogic OKI"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_ADPCM_DTK, + .type = AVMEDIA_TYPE_AUDIO, + .name = "adpcm_dtk", + .long_name = NULL_IF_CONFIG_SMALL("ADPCM Nintendo Gamecube DTK"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_ADPCM_IMA_RAD, + .type = AVMEDIA_TYPE_AUDIO, + .name = "adpcm_ima_rad", + .long_name = NULL_IF_CONFIG_SMALL("ADPCM IMA Radical"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_ADPCM_G726LE, + .type = AVMEDIA_TYPE_AUDIO, + .name = "adpcm_g726le", + .long_name = NULL_IF_CONFIG_SMALL("G.726 ADPCM little-endian"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_ADPCM_VIMA, + .type = AVMEDIA_TYPE_AUDIO, + .name = "adpcm_vima", + .long_name = NULL_IF_CONFIG_SMALL("LucasArts VIMA audio"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_ADPCM_PSX, + .type = AVMEDIA_TYPE_AUDIO, + .name = "adpcm_psx", + .long_name = NULL_IF_CONFIG_SMALL("ADPCM Playstation"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_ADPCM_AICA, + .type = AVMEDIA_TYPE_AUDIO, + .name = "adpcm_aica", + .long_name = NULL_IF_CONFIG_SMALL("ADPCM Yamaha AICA"), + .props = AV_CODEC_PROP_LOSSY, + }, + + /* AMR */ + { + .id = AV_CODEC_ID_AMR_NB, + .type = AVMEDIA_TYPE_AUDIO, + .name = "amr_nb", + .long_name = NULL_IF_CONFIG_SMALL("AMR-NB (Adaptive Multi-Rate NarrowBand)"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_AMR_WB, + .type = AVMEDIA_TYPE_AUDIO, + .name = "amr_wb", + .long_name = NULL_IF_CONFIG_SMALL("AMR-WB (Adaptive Multi-Rate WideBand)"), + .props = AV_CODEC_PROP_LOSSY, + }, + + /* RealAudio codecs*/ + { + .id = AV_CODEC_ID_RA_144, + .type = AVMEDIA_TYPE_AUDIO, + .name = "ra_144", + .long_name = NULL_IF_CONFIG_SMALL("RealAudio 1.0 (14.4K)"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_RA_288, + .type = AVMEDIA_TYPE_AUDIO, + .name = "ra_288", + .long_name = NULL_IF_CONFIG_SMALL("RealAudio 2.0 (28.8K)"), + .props = AV_CODEC_PROP_LOSSY, + }, + + /* various DPCM codecs */ + { + .id = AV_CODEC_ID_ROQ_DPCM, + .type = AVMEDIA_TYPE_AUDIO, + .name = "roq_dpcm", + .long_name = NULL_IF_CONFIG_SMALL("DPCM id RoQ"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_INTERPLAY_DPCM, + .type = AVMEDIA_TYPE_AUDIO, + .name = "interplay_dpcm", + .long_name = NULL_IF_CONFIG_SMALL("DPCM Interplay"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_XAN_DPCM, + .type = AVMEDIA_TYPE_AUDIO, + .name = "xan_dpcm", + .long_name = NULL_IF_CONFIG_SMALL("DPCM Xan"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_SOL_DPCM, + .type = AVMEDIA_TYPE_AUDIO, + .name = "sol_dpcm", + .long_name = NULL_IF_CONFIG_SMALL("DPCM Sol"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_SDX2_DPCM, + .type = AVMEDIA_TYPE_AUDIO, + .name = "sdx2_dpcm", + .long_name = NULL_IF_CONFIG_SMALL("DPCM Squareroot-Delta-Exact"), + .props = AV_CODEC_PROP_LOSSY, + }, + + /* audio codecs */ + { + .id = AV_CODEC_ID_MP2, + .type = AVMEDIA_TYPE_AUDIO, + .name = "mp2", + .long_name = NULL_IF_CONFIG_SMALL("MP2 (MPEG audio layer 2)"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_MP3, + .type = AVMEDIA_TYPE_AUDIO, + .name = "mp3", + .long_name = NULL_IF_CONFIG_SMALL("MP3 (MPEG audio layer 3)"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_AAC, + .type = AVMEDIA_TYPE_AUDIO, + .name = "aac", + .long_name = NULL_IF_CONFIG_SMALL("AAC (Advanced Audio Coding)"), + .props = AV_CODEC_PROP_LOSSY, + .profiles = NULL_IF_CONFIG_SMALL(ff_aac_profiles), + }, + { + .id = AV_CODEC_ID_AC3, + .type = AVMEDIA_TYPE_AUDIO, + .name = "ac3", + .long_name = NULL_IF_CONFIG_SMALL("ATSC A/52A (AC-3)"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_DTS, + .type = AVMEDIA_TYPE_AUDIO, + .name = "dts", + .long_name = NULL_IF_CONFIG_SMALL("DCA (DTS Coherent Acoustics)"), + .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_LOSSLESS, + .profiles = NULL_IF_CONFIG_SMALL(ff_dca_profiles), + }, + { + .id = AV_CODEC_ID_VORBIS, + .type = AVMEDIA_TYPE_AUDIO, + .name = "vorbis", + .long_name = NULL_IF_CONFIG_SMALL("Vorbis"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_DVAUDIO, + .type = AVMEDIA_TYPE_AUDIO, + .name = "dvaudio", + .long_name = NULL_IF_CONFIG_SMALL("DV audio"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_WMAV1, + .type = AVMEDIA_TYPE_AUDIO, + .name = "wmav1", + .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio 1"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_WMAV2, + .type = AVMEDIA_TYPE_AUDIO, + .name = "wmav2", + .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio 2"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_MACE3, + .type = AVMEDIA_TYPE_AUDIO, + .name = "mace3", + .long_name = NULL_IF_CONFIG_SMALL("MACE (Macintosh Audio Compression/Expansion) 3:1"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_MACE6, + .type = AVMEDIA_TYPE_AUDIO, + .name = "mace6", + .long_name = NULL_IF_CONFIG_SMALL("MACE (Macintosh Audio Compression/Expansion) 6:1"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_VMDAUDIO, + .type = AVMEDIA_TYPE_AUDIO, + .name = "vmdaudio", + .long_name = NULL_IF_CONFIG_SMALL("Sierra VMD audio"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_FLAC, + .type = AVMEDIA_TYPE_AUDIO, + .name = "flac", + .long_name = NULL_IF_CONFIG_SMALL("FLAC (Free Lossless Audio Codec)"), + .props = AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_MP3ADU, + .type = AVMEDIA_TYPE_AUDIO, + .name = "mp3adu", + .long_name = NULL_IF_CONFIG_SMALL("ADU (Application Data Unit) MP3 (MPEG audio layer 3)"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_MP3ON4, + .type = AVMEDIA_TYPE_AUDIO, + .name = "mp3on4", + .long_name = NULL_IF_CONFIG_SMALL("MP3onMP4"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_SHORTEN, + .type = AVMEDIA_TYPE_AUDIO, + .name = "shorten", + .long_name = NULL_IF_CONFIG_SMALL("Shorten"), + .props = AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_ALAC, + .type = AVMEDIA_TYPE_AUDIO, + .name = "alac", + .long_name = NULL_IF_CONFIG_SMALL("ALAC (Apple Lossless Audio Codec)"), + .props = AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_WESTWOOD_SND1, + .type = AVMEDIA_TYPE_AUDIO, + .name = "westwood_snd1", + .long_name = NULL_IF_CONFIG_SMALL("Westwood Audio (SND1)"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_GSM, + .type = AVMEDIA_TYPE_AUDIO, + .name = "gsm", + .long_name = NULL_IF_CONFIG_SMALL("GSM"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_QDM2, + .type = AVMEDIA_TYPE_AUDIO, + .name = "qdm2", + .long_name = NULL_IF_CONFIG_SMALL("QDesign Music Codec 2"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_COOK, + .type = AVMEDIA_TYPE_AUDIO, + .name = "cook", + .long_name = NULL_IF_CONFIG_SMALL("Cook / Cooker / Gecko (RealAudio G2)"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_TRUESPEECH, + .type = AVMEDIA_TYPE_AUDIO, + .name = "truespeech", + .long_name = NULL_IF_CONFIG_SMALL("DSP Group TrueSpeech"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_TTA, + .type = AVMEDIA_TYPE_AUDIO, + .name = "tta", + .long_name = NULL_IF_CONFIG_SMALL("TTA (True Audio)"), + .props = AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_SMACKAUDIO, + .type = AVMEDIA_TYPE_AUDIO, + .name = "smackaudio", + .long_name = NULL_IF_CONFIG_SMALL("Smacker audio"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_QCELP, + .type = AVMEDIA_TYPE_AUDIO, + .name = "qcelp", + .long_name = NULL_IF_CONFIG_SMALL("QCELP / PureVoice"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_WAVPACK, + .type = AVMEDIA_TYPE_AUDIO, + .name = "wavpack", + .long_name = NULL_IF_CONFIG_SMALL("WavPack"), + .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_DSICINAUDIO, + .type = AVMEDIA_TYPE_AUDIO, + .name = "dsicinaudio", + .long_name = NULL_IF_CONFIG_SMALL("Delphine Software International CIN audio"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_IMC, + .type = AVMEDIA_TYPE_AUDIO, + .name = "imc", + .long_name = NULL_IF_CONFIG_SMALL("IMC (Intel Music Coder)"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_MUSEPACK7, + .type = AVMEDIA_TYPE_AUDIO, + .name = "musepack7", + .long_name = NULL_IF_CONFIG_SMALL("Musepack SV7"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_MLP, + .type = AVMEDIA_TYPE_AUDIO, + .name = "mlp", + .long_name = NULL_IF_CONFIG_SMALL("MLP (Meridian Lossless Packing)"), + .props = AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_GSM_MS, + .type = AVMEDIA_TYPE_AUDIO, + .name = "gsm_ms", + .long_name = NULL_IF_CONFIG_SMALL("GSM Microsoft variant"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_ATRAC3, + .type = AVMEDIA_TYPE_AUDIO, + .name = "atrac3", + .long_name = NULL_IF_CONFIG_SMALL("ATRAC3 (Adaptive TRansform Acoustic Coding 3)"), + .props = AV_CODEC_PROP_LOSSY, + }, +#if FF_API_VOXWARE + { + .id = AV_CODEC_ID_VOXWARE, + .type = AVMEDIA_TYPE_AUDIO, + .name = "voxware", + .long_name = NULL_IF_CONFIG_SMALL("Voxware RT29 Metasound"), + .props = AV_CODEC_PROP_LOSSY, + }, +#endif + { + .id = AV_CODEC_ID_APE, + .type = AVMEDIA_TYPE_AUDIO, + .name = "ape", + .long_name = NULL_IF_CONFIG_SMALL("Monkey's Audio"), + .props = AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_NELLYMOSER, + .type = AVMEDIA_TYPE_AUDIO, + .name = "nellymoser", + .long_name = NULL_IF_CONFIG_SMALL("Nellymoser Asao"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_MUSEPACK8, + .type = AVMEDIA_TYPE_AUDIO, + .name = "musepack8", + .long_name = NULL_IF_CONFIG_SMALL("Musepack SV8"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_SPEEX, + .type = AVMEDIA_TYPE_AUDIO, + .name = "speex", + .long_name = NULL_IF_CONFIG_SMALL("Speex"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_WMAVOICE, + .type = AVMEDIA_TYPE_AUDIO, + .name = "wmavoice", + .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio Voice"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_WMAPRO, + .type = AVMEDIA_TYPE_AUDIO, + .name = "wmapro", + .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio 9 Professional"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_WMALOSSLESS, + .type = AVMEDIA_TYPE_AUDIO, + .name = "wmalossless", + .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio Lossless"), + .props = AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_ATRAC3P, + .type = AVMEDIA_TYPE_AUDIO, + .name = "atrac3p", + .long_name = NULL_IF_CONFIG_SMALL("ATRAC3+ (Adaptive TRansform Acoustic Coding 3+)"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_EAC3, + .type = AVMEDIA_TYPE_AUDIO, + .name = "eac3", + .long_name = NULL_IF_CONFIG_SMALL("ATSC A/52B (AC-3, E-AC-3)"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_SIPR, + .type = AVMEDIA_TYPE_AUDIO, + .name = "sipr", + .long_name = NULL_IF_CONFIG_SMALL("RealAudio SIPR / ACELP.NET"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_MP1, + .type = AVMEDIA_TYPE_AUDIO, + .name = "mp1", + .long_name = NULL_IF_CONFIG_SMALL("MP1 (MPEG audio layer 1)"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_TWINVQ, + .type = AVMEDIA_TYPE_AUDIO, + .name = "twinvq", + .long_name = NULL_IF_CONFIG_SMALL("VQF TwinVQ"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_TRUEHD, + .type = AVMEDIA_TYPE_AUDIO, + .name = "truehd", + .long_name = NULL_IF_CONFIG_SMALL("TrueHD"), + .props = AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_MP4ALS, + .type = AVMEDIA_TYPE_AUDIO, + .name = "mp4als", + .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 Audio Lossless Coding (ALS)"), + .props = AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_ATRAC1, + .type = AVMEDIA_TYPE_AUDIO, + .name = "atrac1", + .long_name = NULL_IF_CONFIG_SMALL("ATRAC1 (Adaptive TRansform Acoustic Coding)"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_BINKAUDIO_RDFT, + .type = AVMEDIA_TYPE_AUDIO, + .name = "binkaudio_rdft", + .long_name = NULL_IF_CONFIG_SMALL("Bink Audio (RDFT)"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_BINKAUDIO_DCT, + .type = AVMEDIA_TYPE_AUDIO, + .name = "binkaudio_dct", + .long_name = NULL_IF_CONFIG_SMALL("Bink Audio (DCT)"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_AAC_LATM, + .type = AVMEDIA_TYPE_AUDIO, + .name = "aac_latm", + .long_name = NULL_IF_CONFIG_SMALL("AAC LATM (Advanced Audio Coding LATM syntax)"), + .props = AV_CODEC_PROP_LOSSY, + .profiles = NULL_IF_CONFIG_SMALL(ff_aac_profiles), + }, + { + .id = AV_CODEC_ID_QDMC, + .type = AVMEDIA_TYPE_AUDIO, + .name = "qdmc", + .long_name = NULL_IF_CONFIG_SMALL("QDesign Music"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_CELT, + .type = AVMEDIA_TYPE_AUDIO, + .name = "celt", + .long_name = NULL_IF_CONFIG_SMALL("Constrained Energy Lapped Transform (CELT)"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_G723_1, + .type = AVMEDIA_TYPE_AUDIO, + .name = "g723_1", + .long_name = NULL_IF_CONFIG_SMALL("G.723.1"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_DSS_SP, + .type = AVMEDIA_TYPE_AUDIO, + .name = "dss_sp", + .long_name = NULL_IF_CONFIG_SMALL("Digital Speech Standard - Standard Play mode (DSS SP)"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_G729, + .type = AVMEDIA_TYPE_AUDIO, + .name = "g729", + .long_name = NULL_IF_CONFIG_SMALL("G.729"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_8SVX_EXP, + .type = AVMEDIA_TYPE_AUDIO, + .name = "8svx_exp", + .long_name = NULL_IF_CONFIG_SMALL("8SVX exponential"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_8SVX_FIB, + .type = AVMEDIA_TYPE_AUDIO, + .name = "8svx_fib", + .long_name = NULL_IF_CONFIG_SMALL("8SVX fibonacci"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_BMV_AUDIO, + .type = AVMEDIA_TYPE_AUDIO, + .name = "bmv_audio", + .long_name = NULL_IF_CONFIG_SMALL("Discworld II BMV audio"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_RALF, + .type = AVMEDIA_TYPE_AUDIO, + .name = "ralf", + .long_name = NULL_IF_CONFIG_SMALL("RealAudio Lossless"), + .props = AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_IAC, + .type = AVMEDIA_TYPE_AUDIO, + .name = "iac", + .long_name = NULL_IF_CONFIG_SMALL("IAC (Indeo Audio Coder)"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_ILBC, + .type = AVMEDIA_TYPE_AUDIO, + .name = "ilbc", + .long_name = NULL_IF_CONFIG_SMALL("iLBC (Internet Low Bitrate Codec)"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_FFWAVESYNTH, + .type = AVMEDIA_TYPE_AUDIO, + .name = "wavesynth", + .long_name = NULL_IF_CONFIG_SMALL("Wave synthesis pseudo-codec"), + }, + { + .id = AV_CODEC_ID_SONIC, + .type = AVMEDIA_TYPE_AUDIO, + .name = "sonic", + .long_name = NULL_IF_CONFIG_SMALL("Sonic"), + }, + { + .id = AV_CODEC_ID_SONIC_LS, + .type = AVMEDIA_TYPE_AUDIO, + .name = "sonicls", + .long_name = NULL_IF_CONFIG_SMALL("Sonic lossless"), + }, + { + .id = AV_CODEC_ID_OPUS, + .type = AVMEDIA_TYPE_AUDIO, + .name = "opus", + .long_name = NULL_IF_CONFIG_SMALL("Opus (Opus Interactive Audio Codec)"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_COMFORT_NOISE, + .type = AVMEDIA_TYPE_AUDIO, + .name = "comfortnoise", + .long_name = NULL_IF_CONFIG_SMALL("RFC 3389 Comfort Noise"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_TAK, + .type = AVMEDIA_TYPE_AUDIO, + .name = "tak", + .long_name = NULL_IF_CONFIG_SMALL("TAK (Tom's lossless Audio Kompressor)"), + .props = AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_METASOUND, + .type = AVMEDIA_TYPE_AUDIO, + .name = "metasound", + .long_name = NULL_IF_CONFIG_SMALL("Voxware MetaSound"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_PAF_AUDIO, + .type = AVMEDIA_TYPE_AUDIO, + .name = "paf_audio", + .long_name = NULL_IF_CONFIG_SMALL("Amazing Studio Packed Animation File Audio"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_ON2AVC, + .type = AVMEDIA_TYPE_AUDIO, + .name = "avc", + .long_name = NULL_IF_CONFIG_SMALL("On2 Audio for Video Codec"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_EVRC, + .type = AVMEDIA_TYPE_AUDIO, + .name = "evrc", + .long_name = NULL_IF_CONFIG_SMALL("EVRC (Enhanced Variable Rate Codec)"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_SMV, + .type = AVMEDIA_TYPE_AUDIO, + .name = "smv", + .long_name = NULL_IF_CONFIG_SMALL("SMV (Selectable Mode Vocoder)"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_4GV, + .type = AVMEDIA_TYPE_AUDIO, + .name = "4gv", + .long_name = NULL_IF_CONFIG_SMALL("4GV (Fourth Generation Vocoder)"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_DSD_LSBF, + .type = AVMEDIA_TYPE_AUDIO, + .name = "dsd_lsbf", + .long_name = NULL_IF_CONFIG_SMALL("DSD (Direct Stream Digital), least significant bit first"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_DSD_MSBF, + .type = AVMEDIA_TYPE_AUDIO, + .name = "dsd_msbf", + .long_name = NULL_IF_CONFIG_SMALL("DSD (Direct Stream Digital), most significant bit first"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_DSD_LSBF_PLANAR, + .type = AVMEDIA_TYPE_AUDIO, + .name = "dsd_lsbf_planar", + .long_name = NULL_IF_CONFIG_SMALL("DSD (Direct Stream Digital), least significant bit first, planar"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_DSD_MSBF_PLANAR, + .type = AVMEDIA_TYPE_AUDIO, + .name = "dsd_msbf_planar", + .long_name = NULL_IF_CONFIG_SMALL("DSD (Direct Stream Digital), most significant bit first, planar"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_INTERPLAY_ACM, + .type = AVMEDIA_TYPE_AUDIO, + .name = "interplayacm", + .long_name = NULL_IF_CONFIG_SMALL("Interplay ACM"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_XMA1, + .type = AVMEDIA_TYPE_AUDIO, + .name = "xma1", + .long_name = NULL_IF_CONFIG_SMALL("Xbox Media Audio 1"), + .props = AV_CODEC_PROP_LOSSY, + }, + { + .id = AV_CODEC_ID_XMA2, + .type = AVMEDIA_TYPE_AUDIO, + .name = "xma2", + .long_name = NULL_IF_CONFIG_SMALL("Xbox Media Audio 2"), + .props = AV_CODEC_PROP_LOSSY, + }, + + /* subtitle codecs */ + { + .id = AV_CODEC_ID_DVD_SUBTITLE, + .type = AVMEDIA_TYPE_SUBTITLE, + .name = "dvd_subtitle", + .long_name = NULL_IF_CONFIG_SMALL("DVD subtitles"), + .props = AV_CODEC_PROP_BITMAP_SUB, + }, + { + .id = AV_CODEC_ID_DVB_SUBTITLE, + .type = AVMEDIA_TYPE_SUBTITLE, + .name = "dvb_subtitle", + .long_name = NULL_IF_CONFIG_SMALL("DVB subtitles"), + .props = AV_CODEC_PROP_BITMAP_SUB, + }, + { + .id = AV_CODEC_ID_TEXT, + .type = AVMEDIA_TYPE_SUBTITLE, + .name = "text", + .long_name = NULL_IF_CONFIG_SMALL("raw UTF-8 text"), + .props = AV_CODEC_PROP_TEXT_SUB, + }, + { + .id = AV_CODEC_ID_XSUB, + .type = AVMEDIA_TYPE_SUBTITLE, + .name = "xsub", + .long_name = NULL_IF_CONFIG_SMALL("XSUB"), + .props = AV_CODEC_PROP_BITMAP_SUB, + }, + { + .id = AV_CODEC_ID_ASS, + .type = AVMEDIA_TYPE_SUBTITLE, + .name = "ass", + .long_name = NULL_IF_CONFIG_SMALL("ASS (Advanced SSA) subtitle"), + .props = AV_CODEC_PROP_TEXT_SUB, + }, + { + .id = AV_CODEC_ID_SSA, + .type = AVMEDIA_TYPE_SUBTITLE, + .name = "ssa", + .long_name = NULL_IF_CONFIG_SMALL("SSA (SubStation Alpha) subtitle"), + .props = AV_CODEC_PROP_TEXT_SUB, + }, + { + .id = AV_CODEC_ID_MOV_TEXT, + .type = AVMEDIA_TYPE_SUBTITLE, + .name = "mov_text", + .long_name = NULL_IF_CONFIG_SMALL("MOV text"), + .props = AV_CODEC_PROP_TEXT_SUB, + }, + { + .id = AV_CODEC_ID_HDMV_PGS_SUBTITLE, + .type = AVMEDIA_TYPE_SUBTITLE, + .name = "hdmv_pgs_subtitle", + .long_name = NULL_IF_CONFIG_SMALL("HDMV Presentation Graphic Stream subtitles"), + .props = AV_CODEC_PROP_BITMAP_SUB, + }, + { + .id = AV_CODEC_ID_DVB_TELETEXT, + .type = AVMEDIA_TYPE_SUBTITLE, + .name = "dvb_teletext", + .long_name = NULL_IF_CONFIG_SMALL("DVB teletext"), + }, + { + .id = AV_CODEC_ID_SRT, + .type = AVMEDIA_TYPE_SUBTITLE, + .name = "srt", + .long_name = NULL_IF_CONFIG_SMALL("SubRip subtitle with embedded timing"), + .props = AV_CODEC_PROP_TEXT_SUB, + }, + { + .id = AV_CODEC_ID_SUBRIP, + .type = AVMEDIA_TYPE_SUBTITLE, + .name = "subrip", + .long_name = NULL_IF_CONFIG_SMALL("SubRip subtitle"), + .props = AV_CODEC_PROP_TEXT_SUB, + }, + { + .id = AV_CODEC_ID_MICRODVD, + .type = AVMEDIA_TYPE_SUBTITLE, + .name = "microdvd", + .long_name = NULL_IF_CONFIG_SMALL("MicroDVD subtitle"), + .props = AV_CODEC_PROP_TEXT_SUB, + }, + { + .id = AV_CODEC_ID_MPL2, + .type = AVMEDIA_TYPE_SUBTITLE, + .name = "mpl2", + .long_name = NULL_IF_CONFIG_SMALL("MPL2 subtitle"), + .props = AV_CODEC_PROP_TEXT_SUB, + }, + { + .id = AV_CODEC_ID_EIA_608, + .type = AVMEDIA_TYPE_SUBTITLE, + .name = "eia_608", + .long_name = NULL_IF_CONFIG_SMALL("EIA-608 closed captions"), + .props = AV_CODEC_PROP_TEXT_SUB, + }, + { + .id = AV_CODEC_ID_JACOSUB, + .type = AVMEDIA_TYPE_SUBTITLE, + .name = "jacosub", + .long_name = NULL_IF_CONFIG_SMALL("JACOsub subtitle"), + .props = AV_CODEC_PROP_TEXT_SUB, + }, + { + .id = AV_CODEC_ID_PJS, + .type = AVMEDIA_TYPE_SUBTITLE, + .name = "pjs", + .long_name = NULL_IF_CONFIG_SMALL("PJS (Phoenix Japanimation Society) subtitle"), + .props = AV_CODEC_PROP_TEXT_SUB, + }, + { + .id = AV_CODEC_ID_SAMI, + .type = AVMEDIA_TYPE_SUBTITLE, + .name = "sami", + .long_name = NULL_IF_CONFIG_SMALL("SAMI subtitle"), + .props = AV_CODEC_PROP_TEXT_SUB, + }, + { + .id = AV_CODEC_ID_REALTEXT, + .type = AVMEDIA_TYPE_SUBTITLE, + .name = "realtext", + .long_name = NULL_IF_CONFIG_SMALL("RealText subtitle"), + .props = AV_CODEC_PROP_TEXT_SUB, + }, + { + .id = AV_CODEC_ID_STL, + .type = AVMEDIA_TYPE_SUBTITLE, + .name = "stl", + .long_name = NULL_IF_CONFIG_SMALL("Spruce subtitle format"), + .props = AV_CODEC_PROP_TEXT_SUB, + }, + { + .id = AV_CODEC_ID_SUBVIEWER1, + .type = AVMEDIA_TYPE_SUBTITLE, + .name = "subviewer1", + .long_name = NULL_IF_CONFIG_SMALL("SubViewer v1 subtitle"), + .props = AV_CODEC_PROP_TEXT_SUB, + }, + { + .id = AV_CODEC_ID_SUBVIEWER, + .type = AVMEDIA_TYPE_SUBTITLE, + .name = "subviewer", + .long_name = NULL_IF_CONFIG_SMALL("SubViewer subtitle"), + .props = AV_CODEC_PROP_TEXT_SUB, + }, + { + .id = AV_CODEC_ID_VPLAYER, + .type = AVMEDIA_TYPE_SUBTITLE, + .name = "vplayer", + .long_name = NULL_IF_CONFIG_SMALL("VPlayer subtitle"), + .props = AV_CODEC_PROP_TEXT_SUB, + }, + { + .id = AV_CODEC_ID_WEBVTT, + .type = AVMEDIA_TYPE_SUBTITLE, + .name = "webvtt", + .long_name = NULL_IF_CONFIG_SMALL("WebVTT subtitle"), + .props = AV_CODEC_PROP_TEXT_SUB, + }, + { + .id = AV_CODEC_ID_HDMV_TEXT_SUBTITLE, + .type = AVMEDIA_TYPE_SUBTITLE, + .name = "hdmv_text_subtitle", + .long_name = NULL_IF_CONFIG_SMALL("HDMV Text subtitle"), + .props = AV_CODEC_PROP_TEXT_SUB, + }, + + /* other kind of codecs and pseudo-codecs */ + { + .id = AV_CODEC_ID_TTF, + .type = AVMEDIA_TYPE_DATA, + .name = "ttf", + .long_name = NULL_IF_CONFIG_SMALL("TrueType font"), + .mime_types= MT("application/x-truetype-font", "application/x-font"), + }, + { + .id = AV_CODEC_ID_BINTEXT, + .type = AVMEDIA_TYPE_VIDEO, + .name = "bintext", + .long_name = NULL_IF_CONFIG_SMALL("Binary text"), + .props = AV_CODEC_PROP_INTRA_ONLY, + }, + { + .id = AV_CODEC_ID_XBIN, + .type = AVMEDIA_TYPE_VIDEO, + .name = "xbin", + .long_name = NULL_IF_CONFIG_SMALL("eXtended BINary text"), + .props = AV_CODEC_PROP_INTRA_ONLY, + }, + { + .id = AV_CODEC_ID_IDF, + .type = AVMEDIA_TYPE_VIDEO, + .name = "idf", + .long_name = NULL_IF_CONFIG_SMALL("iCEDraw text"), + .props = AV_CODEC_PROP_INTRA_ONLY, + }, + { + .id = AV_CODEC_ID_OTF, + .type = AVMEDIA_TYPE_DATA, + .name = "otf", + .long_name = NULL_IF_CONFIG_SMALL("OpenType font"), + .mime_types= MT("application/vnd.ms-opentype"), + }, + { + .id = AV_CODEC_ID_SMPTE_KLV, + .type = AVMEDIA_TYPE_DATA, + .name = "klv", + .long_name = NULL_IF_CONFIG_SMALL("SMPTE 336M Key-Length-Value (KLV) metadata"), + }, + { + .id = AV_CODEC_ID_DVD_NAV, + .type = AVMEDIA_TYPE_DATA, + .name = "dvd_nav_packet", + .long_name = NULL_IF_CONFIG_SMALL("DVD Nav packet"), + }, + { + .id = AV_CODEC_ID_TIMED_ID3, + .type = AVMEDIA_TYPE_DATA, + .name = "timed_id3", + .long_name = NULL_IF_CONFIG_SMALL("timed ID3 metadata"), + }, + { + .id = AV_CODEC_ID_BIN_DATA, + .type = AVMEDIA_TYPE_DATA, + .name = "bin_data", + .long_name = NULL_IF_CONFIG_SMALL("binary data"), + .mime_types= MT("application/octet-stream"), + }, + + /* deprecated codec ids */ +}; + +const AVCodecDescriptor *avcodec_descriptor_get(enum AVCodecID id) +{ + int i; + + for (i = 0; i < FF_ARRAY_ELEMS(codec_descriptors); i++) + if (codec_descriptors[i].id == id) + return &codec_descriptors[i]; + return NULL; +} + +const AVCodecDescriptor *avcodec_descriptor_next(const AVCodecDescriptor *prev) +{ + if (!prev) + return &codec_descriptors[0]; + if (prev - codec_descriptors < FF_ARRAY_ELEMS(codec_descriptors) - 1) + return prev + 1; + return NULL; +} + +const AVCodecDescriptor *avcodec_descriptor_get_by_name(const char *name) +{ + const AVCodecDescriptor *desc = NULL; + + while ((desc = avcodec_descriptor_next(desc))) + if (!strcmp(desc->name, name)) + return desc; + return NULL; +} + +enum AVMediaType avcodec_get_type(enum AVCodecID codec_id) +{ + const AVCodecDescriptor *desc = avcodec_descriptor_get(codec_id); + return desc ? desc->type : AVMEDIA_TYPE_UNKNOWN; +} diff --git a/ext/at3_standalone/compat.h b/ext/at3_standalone/compat.h index 5d2e6f1e6d..e60185e9a3 100644 --- a/ext/at3_standalone/compat.h +++ b/ext/at3_standalone/compat.h @@ -2,22 +2,27 @@ // Compat hacks -#define av_cold -#define DECLARE_ALIGNED(bits, type, name) type name -#define LOCAL_ALIGNED(bits, type, name, subscript) type name subscript -#define av_restrict -#define av_always_inline __forceinline -#define av_const -#define av_alias -#define av_unused -#define av_pure -#define av_warn_unused_result -#define av_assert0(cond) -#define av_assert1(cond) -#define av_assert2(cond) -#define av_log(...) -#define attribute_deprecated -#define av_printf_format(a,b) -#define avpriv_report_missing_feature(...) +#include "attributes.h" #include "error.h" + +#define CONFIG_MEMORY_POISONING 0 +#define CONFIG_HARDCODED_TABLES 0 +#define CONFIG_ME_CMP 0 +#define HWACCEL_CODEC_CAP_EXPERIMENTAL 0 +#define HAVE_THREADS 0 +#define CONFIG_FRAME_THREAD_ENCODER 0 +#define CONFIG_GRAY 0 +#define NULL_IF_CONFIG_SMALL(x) NULL +#define ARCH_AARCH64 0 +#define ARCH_ARM 0 +#define ARCH_PPC 0 +#define ARCH_X86 0 +#define HAVE_MIPSFPU 0 +#define FF_API_AVPACKET_OLD_API 1 +#define FF_DISABLE_DEPRECATION_WARNINGS +#define FF_ENABLE_DEPRECATION_WARNINGS +#define CONFIG_MDCT 1 +#define CONFIG_FFT 1 + +int ff_fast_malloc(void *ptr, unsigned int *size, size_t min_size, int zero_realloc); diff --git a/ext/at3_standalone/dict.c b/ext/at3_standalone/dict.c new file mode 100644 index 0000000000..d3133dabe3 --- /dev/null +++ b/ext/at3_standalone/dict.c @@ -0,0 +1,337 @@ +/* + * copyright (c) 2009 Michael Niedermayer + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include + +#include "avstring.h" +#include "dict.h" +#include "internal.h" +#include "mem.h" + +struct AVDictionary { + int count; + AVDictionaryEntry *elems; +}; + +int av_dict_count(const AVDictionary *m) +{ + return m ? m->count : 0; +} + +AVDictionaryEntry *av_dict_get(const AVDictionary *m, const char *key, + const AVDictionaryEntry *prev, int flags) +{ + unsigned int i, j; + + if (!m) + return NULL; + + if (prev) + i = prev - m->elems + 1; + else + i = 0; + + for (; i < m->count; i++) { + const char *s = m->elems[i].key; + if (flags & AV_DICT_MATCH_CASE) + for (j = 0; s[j] == key[j] && key[j]; j++) + ; + else + for (j = 0; av_toupper(s[j]) == av_toupper(key[j]) && key[j]; j++) + ; + if (key[j]) + continue; + if (s[j] && !(flags & AV_DICT_IGNORE_SUFFIX)) + continue; + return &m->elems[i]; + } + return NULL; +} + +int av_dict_set(AVDictionary **pm, const char *key, const char *value, + int flags) +{ + AVDictionary *m = *pm; + AVDictionaryEntry *tag = av_dict_get(m, key, NULL, flags); + char *oldval = NULL, *copy_key = NULL, *copy_value = NULL; + + if (flags & AV_DICT_DONT_STRDUP_KEY) + copy_key = (void *)key; + else + copy_key = av_strdup(key); + if (flags & AV_DICT_DONT_STRDUP_VAL) + copy_value = (void *)value; + else if (copy_key) + copy_value = av_strdup(value); + if (!m) + m = *pm = av_mallocz(sizeof(*m)); + if (!m || (key && !copy_key) || (value && !copy_value)) + goto err_out; + + if (tag) { + if (flags & AV_DICT_DONT_OVERWRITE) { + av_free(copy_key); + av_free(copy_value); + return 0; + } + if (flags & AV_DICT_APPEND) + oldval = tag->value; + else + av_free(tag->value); + av_free(tag->key); + *tag = m->elems[--m->count]; + } else { + AVDictionaryEntry *tmp = av_realloc(m->elems, + (m->count + 1) * sizeof(*m->elems)); + if (!tmp) + goto err_out; + m->elems = tmp; + } + if (copy_value) { + m->elems[m->count].key = copy_key; + m->elems[m->count].value = copy_value; + if (oldval && flags & AV_DICT_APPEND) { + size_t len = strlen(oldval) + strlen(copy_value) + 1; + char *newval = av_mallocz(len); + if (!newval) + goto err_out; + av_strlcat(newval, oldval, len); + av_freep(&oldval); + av_strlcat(newval, copy_value, len); + m->elems[m->count].value = newval; + av_freep(©_value); + } + m->count++; + } else { + av_freep(©_key); + } + if (!m->count) { + av_freep(&m->elems); + av_freep(pm); + } + + return 0; + +err_out: + if (m && !m->count) { + av_freep(&m->elems); + av_freep(pm); + } + av_free(copy_key); + av_free(copy_value); + return AVERROR(ENOMEM); +} + +int av_dict_set_int(AVDictionary **pm, const char *key, int64_t value, + int flags) +{ + char valuestr[22]; + snprintf(valuestr, sizeof(valuestr), "%"PRId64, value); + flags &= ~AV_DICT_DONT_STRDUP_VAL; + return av_dict_set(pm, key, valuestr, flags); +} + +static int parse_key_value_pair(AVDictionary **pm, const char **buf, + const char *key_val_sep, const char *pairs_sep, + int flags) +{ + char *key = av_get_token(buf, key_val_sep); + char *val = NULL; + int ret; + + if (key && *key && strspn(*buf, key_val_sep)) { + (*buf)++; + val = av_get_token(buf, pairs_sep); + } + + if (key && *key && val && *val) + ret = av_dict_set(pm, key, val, flags); + else + ret = AVERROR(EINVAL); + + av_freep(&key); + av_freep(&val); + + return ret; +} + +int av_dict_parse_string(AVDictionary **pm, const char *str, + const char *key_val_sep, const char *pairs_sep, + int flags) +{ + int ret; + + if (!str) + return 0; + + /* ignore STRDUP flags */ + flags &= ~(AV_DICT_DONT_STRDUP_KEY | AV_DICT_DONT_STRDUP_VAL); + + while (*str) { + if ((ret = parse_key_value_pair(pm, &str, key_val_sep, pairs_sep, flags)) < 0) + return ret; + + if (*str) + str++; + } + + return 0; +} + +void av_dict_free(AVDictionary **pm) +{ + AVDictionary *m = *pm; + + if (m) { + while (m->count--) { + av_freep(&m->elems[m->count].key); + av_freep(&m->elems[m->count].value); + } + av_freep(&m->elems); + } + av_freep(pm); +} + +int av_dict_copy(AVDictionary **dst, const AVDictionary *src, int flags) +{ + AVDictionaryEntry *t = NULL; + + while ((t = av_dict_get(src, "", t, AV_DICT_IGNORE_SUFFIX))) { + int ret = av_dict_set(dst, t->key, t->value, flags); + if (ret < 0) + return ret; + } + + return 0; +} + +#ifdef TEST +static void print_dict(const AVDictionary *m) +{ + AVDictionaryEntry *t = NULL; + while ((t = av_dict_get(m, "", t, AV_DICT_IGNORE_SUFFIX))) + printf("%s %s ", t->key, t->value); + printf("\n"); +} + +static void test_separators(const AVDictionary *m, const char pair, const char val) +{ + AVDictionary *dict = NULL; + char pairs[] = {pair , '\0'}; + char vals[] = {val, '\0'}; + + char *buffer = NULL; + av_dict_copy(&dict, m, 0); + print_dict(dict); + av_dict_get_string(dict, &buffer, val, pair); + printf("%s\n", buffer); + av_dict_free(&dict); + av_dict_parse_string(&dict, buffer, vals, pairs, 0); + av_freep(&buffer); + print_dict(dict); + av_dict_free(&dict); +} + +int main(void) +{ + AVDictionary *dict = NULL; + AVDictionaryEntry *e; + char *buffer = NULL; + + printf("Testing av_dict_get_string() and av_dict_parse_string()\n"); + av_dict_get_string(dict, &buffer, '=', ','); + printf("%s\n", buffer); + av_freep(&buffer); + av_dict_set(&dict, "aaa", "aaa", 0); + av_dict_set(&dict, "b,b", "bbb", 0); + av_dict_set(&dict, "c=c", "ccc", 0); + av_dict_set(&dict, "ddd", "d,d", 0); + av_dict_set(&dict, "eee", "e=e", 0); + av_dict_set(&dict, "f,f", "f=f", 0); + av_dict_set(&dict, "g=g", "g,g", 0); + test_separators(dict, ',', '='); + av_dict_free(&dict); + av_dict_set(&dict, "aaa", "aaa", 0); + av_dict_set(&dict, "bbb", "bbb", 0); + av_dict_set(&dict, "ccc", "ccc", 0); + av_dict_set(&dict, "\\,=\'\"", "\\,=\'\"", 0); + test_separators(dict, '"', '='); + test_separators(dict, '\'', '='); + test_separators(dict, ',', '"'); + test_separators(dict, ',', '\''); + test_separators(dict, '\'', '"'); + test_separators(dict, '"', '\''); + av_dict_free(&dict); + + printf("\nTesting av_dict_set()\n"); + av_dict_set(&dict, "a", "a", 0); + av_dict_set(&dict, "b", av_strdup("b"), AV_DICT_DONT_STRDUP_VAL); + av_dict_set(&dict, av_strdup("c"), "c", AV_DICT_DONT_STRDUP_KEY); + av_dict_set(&dict, av_strdup("d"), av_strdup("d"), AV_DICT_DONT_STRDUP_KEY | AV_DICT_DONT_STRDUP_VAL); + av_dict_set(&dict, "e", "e", AV_DICT_DONT_OVERWRITE); + av_dict_set(&dict, "e", "f", AV_DICT_DONT_OVERWRITE); + av_dict_set(&dict, "f", "f", 0); + av_dict_set(&dict, "f", NULL, 0); + av_dict_set(&dict, "ff", "f", 0); + av_dict_set(&dict, "ff", "f", AV_DICT_APPEND); + e = NULL; + while ((e = av_dict_get(dict, "", e, AV_DICT_IGNORE_SUFFIX))) + printf("%s %s\n", e->key, e->value); + av_dict_free(&dict); + + av_dict_set(&dict, NULL, "a", 0); + av_dict_set(&dict, NULL, "b", 0); + av_dict_get(dict, NULL, NULL, 0); + e = NULL; + while ((e = av_dict_get(dict, "", e, AV_DICT_IGNORE_SUFFIX))) + printf("'%s' '%s'\n", e->key, e->value); + av_dict_free(&dict); + + + //valgrind sensible test + printf("\nTesting av_dict_set_int()\n"); + av_dict_set_int(&dict, "1", 1, AV_DICT_DONT_STRDUP_VAL); + av_dict_set_int(&dict, av_strdup("2"), 2, AV_DICT_DONT_STRDUP_KEY); + av_dict_set_int(&dict, av_strdup("3"), 3, AV_DICT_DONT_STRDUP_KEY | AV_DICT_DONT_STRDUP_VAL); + av_dict_set_int(&dict, "4", 4, 0); + av_dict_set_int(&dict, "5", 5, AV_DICT_DONT_OVERWRITE); + av_dict_set_int(&dict, "5", 6, AV_DICT_DONT_OVERWRITE); + av_dict_set_int(&dict, "12", 1, 0); + av_dict_set_int(&dict, "12", 2, AV_DICT_APPEND); + e = NULL; + while ((e = av_dict_get(dict, "", e, AV_DICT_IGNORE_SUFFIX))) + printf("%s %s\n", e->key, e->value); + av_dict_free(&dict); + + //valgrind sensible test + printf("\nTesting av_dict_set() with existing AVDictionaryEntry.key as key\n"); + av_dict_set(&dict, "key", "old", 0); + e = av_dict_get(dict, "key", NULL, 0); + av_dict_set(&dict, e->key, "new val OK", 0); + e = av_dict_get(dict, "key", NULL, 0); + printf("%s\n", e->value); + av_dict_set(&dict, e->key, e->value, 0); + e = av_dict_get(dict, "key", NULL, 0); + printf("%s\n", e->value); + av_dict_free(&dict); + + return 0; +} +#endif diff --git a/ext/at3_standalone/fft-internal.h b/ext/at3_standalone/fft-internal.h new file mode 100644 index 0000000000..0a8f7d05cf --- /dev/null +++ b/ext/at3_standalone/fft-internal.h @@ -0,0 +1,94 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVCODEC_FFT_INTERNAL_H +#define AVCODEC_FFT_INTERNAL_H + +#if FFT_FLOAT + +#define FIX15(v) (v) +#define sqrthalf (float)M_SQRT1_2 + +#define BF(x, y, a, b) do { \ + x = a - b; \ + y = a + b; \ + } while (0) + +#define CMUL(dre, dim, are, aim, bre, bim) do { \ + (dre) = (are) * (bre) - (aim) * (bim); \ + (dim) = (are) * (bim) + (aim) * (bre); \ + } while (0) + +#else + +#define SCALE_FLOAT(a, bits) lrint((a) * (double)(1 << (bits))) + +#if FFT_FIXED_32 + +#define CMUL(dre, dim, are, aim, bre, bim) do { \ + int64_t accu; \ + (accu) = (int64_t)(bre) * (are); \ + (accu) -= (int64_t)(bim) * (aim); \ + (dre) = (int)(((accu) + 0x40000000) >> 31); \ + (accu) = (int64_t)(bre) * (aim); \ + (accu) += (int64_t)(bim) * (are); \ + (dim) = (int)(((accu) + 0x40000000) >> 31); \ + } while (0) + +#define FIX15(a) av_clip(SCALE_FLOAT(a, 31), -2147483647, 2147483647) + +#else /* FFT_FIXED_32 */ + +#include "fft.h" +#include "mathops.h" + +void ff_mdct_calcw_c(FFTContext *s, FFTDouble *output, const FFTSample *input); + +#define FIX15(a) av_clip(SCALE_FLOAT(a, 15), -32767, 32767) + +#define sqrthalf ((int16_t)((1<<15)*M_SQRT1_2)) + +#define BF(x, y, a, b) do { \ + x = (a - b) >> 1; \ + y = (a + b) >> 1; \ + } while (0) + +#define CMULS(dre, dim, are, aim, bre, bim, sh) do { \ + (dre) = (MUL16(are, bre) - MUL16(aim, bim)) >> sh; \ + (dim) = (MUL16(are, bim) + MUL16(aim, bre)) >> sh; \ + } while (0) + +#define CMUL(dre, dim, are, aim, bre, bim) \ + CMULS(dre, dim, are, aim, bre, bim, 15) + +#define CMULL(dre, dim, are, aim, bre, bim) \ + CMULS(dre, dim, are, aim, bre, bim, 0) + +#endif /* FFT_FIXED_32 */ + +#endif /* FFT_FLOAT */ + +#define ff_imdct_calc_c FFT_NAME(ff_imdct_calc_c) +#define ff_imdct_half_c FFT_NAME(ff_imdct_half_c) +#define ff_mdct_calc_c FFT_NAME(ff_mdct_calc_c) + +void ff_imdct_calc_c(FFTContext *s, FFTSample *output, const FFTSample *input); +void ff_imdct_half_c(FFTContext *s, FFTSample *output, const FFTSample *input); +void ff_mdct_calc_c(FFTContext *s, FFTSample *output, const FFTSample *input); + +#endif /* AVCODEC_FFT_INTERNAL_H */ diff --git a/ext/at3_standalone/fft_template.c b/ext/at3_standalone/fft_template.c new file mode 100644 index 0000000000..e4b8149ce7 --- /dev/null +++ b/ext/at3_standalone/fft_template.c @@ -0,0 +1,531 @@ +/* + * FFT/IFFT transforms + * Copyright (c) 2008 Loren Merritt + * Copyright (c) 2002 Fabrice Bellard + * Partly based on libdjbfft by D. J. Bernstein + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + * FFT/IFFT transforms. + */ + +#include +#include + +#include "mem.h" +#include "mathematics.h" +#include "fft.h" +#include "fft-internal.h" + +#if FFT_FIXED_32 +#include "fft_table.h" +#else /* FFT_FIXED_32 */ + +/* cos(2*pi*x/n) for 0<=x<=n/4, followed by its reverse */ +#if !CONFIG_HARDCODED_TABLES +COSTABLE(16); +COSTABLE(32); +COSTABLE(64); +COSTABLE(128); +COSTABLE(256); +COSTABLE(512); +COSTABLE(1024); +COSTABLE(2048); +COSTABLE(4096); +COSTABLE(8192); +COSTABLE(16384); +COSTABLE(32768); +COSTABLE(65536); +#endif +COSTABLE_CONST FFTSample * const FFT_NAME(ff_cos_tabs)[] = { + NULL, NULL, NULL, NULL, + FFT_NAME(ff_cos_16), + FFT_NAME(ff_cos_32), + FFT_NAME(ff_cos_64), + FFT_NAME(ff_cos_128), + FFT_NAME(ff_cos_256), + FFT_NAME(ff_cos_512), + FFT_NAME(ff_cos_1024), + FFT_NAME(ff_cos_2048), + FFT_NAME(ff_cos_4096), + FFT_NAME(ff_cos_8192), + FFT_NAME(ff_cos_16384), + FFT_NAME(ff_cos_32768), + FFT_NAME(ff_cos_65536), +}; + +#endif /* FFT_FIXED_32 */ + +static void fft_permute_c(FFTContext *s, FFTComplex *z); +static void fft_calc_c(FFTContext *s, FFTComplex *z); + +static int split_radix_permutation(int i, int n, int inverse) +{ + int m; + if(n <= 2) return i&1; + m = n >> 1; + if(!(i&m)) return split_radix_permutation(i, m, inverse)*2; + m >>= 1; + if(inverse == !(i&m)) return split_radix_permutation(i, m, inverse)*4 + 1; + else return split_radix_permutation(i, m, inverse)*4 - 1; +} + +av_cold void ff_init_ff_cos_tabs(int index) +{ +#if (!CONFIG_HARDCODED_TABLES) && (!FFT_FIXED_32) + int i; + int m = 1<= 16; + else if (i < n/2) + return is_second_half_of_fft32(i, n/2); + else if (i < 3*n/4) + return is_second_half_of_fft32(i - n/2, n/4); + else + return is_second_half_of_fft32(i - 3*n/4, n/4); +} + +static av_cold void fft_perm_avx(FFTContext *s) +{ + int i; + int n = 1 << s->nbits; + + for (i = 0; i < n; i += 16) { + int k; + if (is_second_half_of_fft32(i, n)) { + for (k = 0; k < 16; k++) + s->revtab[-split_radix_permutation(i + k, n, s->inverse) & (n - 1)] = + i + avx_tab[k]; + + } else { + for (k = 0; k < 16; k++) { + int j = i + k; + j = (j & ~7) | ((j >> 1) & 3) | ((j << 2) & 4); + s->revtab[-split_radix_permutation(i + k, n, s->inverse) & (n - 1)] = j; + } + } + } +} + +av_cold int ff_fft_init(FFTContext *s, int nbits, int inverse) +{ + int i, j, n; + + if (nbits < 2 || nbits > 16) + goto fail; + s->nbits = nbits; + n = 1 << nbits; + + s->revtab = av_malloc(n * sizeof(uint16_t)); + if (!s->revtab) + goto fail; + s->tmp_buf = av_malloc(n * sizeof(FFTComplex)); + if (!s->tmp_buf) + goto fail; + s->inverse = inverse; + s->fft_permutation = FF_FFT_PERM_DEFAULT; + + s->fft_permute = fft_permute_c; + s->fft_calc = fft_calc_c; +#if CONFIG_MDCT + s->imdct_calc = ff_imdct_calc_c; + s->imdct_half = ff_imdct_half_c; + s->mdct_calc = ff_mdct_calc_c; +#endif + +#if FFT_FIXED_32 + { + int n=0; + ff_fft_lut_init(ff_fft_offsets_lut, 0, 1 << 16, &n); + } +#else /* FFT_FIXED_32 */ +#if FFT_FLOAT + if (ARCH_AARCH64) ff_fft_init_aarch64(s); + if (ARCH_ARM) ff_fft_init_arm(s); + if (ARCH_PPC) ff_fft_init_ppc(s); + if (ARCH_X86) ff_fft_init_x86(s); + if (CONFIG_MDCT) s->mdct_calcw = s->mdct_calc; + if (HAVE_MIPSFPU) ff_fft_init_mips(s); +#else + if (CONFIG_MDCT) s->mdct_calcw = ff_mdct_calcw_c; + if (ARCH_ARM) ff_fft_fixed_init_arm(s); +#endif + for(j=4; j<=nbits; j++) { + ff_init_ff_cos_tabs(j); + } +#endif /* FFT_FIXED_32 */ + + + if (s->fft_permutation == FF_FFT_PERM_AVX) { + fft_perm_avx(s); + } else { + for(i=0; ifft_permutation == FF_FFT_PERM_SWAP_LSBS) + j = (j&~3) | ((j>>1)&1) | ((j<<1)&2); + int index = -split_radix_permutation(i, n, s->inverse) & (n - 1); + s->revtab[index] = j; + } + } + + return 0; + fail: + av_freep(&s->revtab); + av_freep(&s->tmp_buf); + return -1; +} + +static void fft_permute_c(FFTContext *s, FFTComplex *z) +{ + int j, np; + const uint16_t *revtab = s->revtab; + np = 1 << s->nbits; + /* TODO: handle split-radix permute in a more optimal way, probably in-place */ + for(j=0;jtmp_buf[revtab[j]] = z[j]; + memcpy(z, s->tmp_buf, np * sizeof(FFTComplex)); +} + +av_cold void ff_fft_end(FFTContext *s) +{ + av_freep(&s->revtab); + av_freep(&s->tmp_buf); +} + +#if FFT_FIXED_32 + +static void fft_calc_c(FFTContext *s, FFTComplex *z) { + + int nbits, i, n, num_transforms, offset, step; + int n4, n2, n34; + FFTSample tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7, tmp8; + FFTComplex *tmpz; + const int fft_size = (1 << s->nbits); + int64_t accu; + + num_transforms = (0x2aab >> (16 - s->nbits)) | 1; + + for (n=0; n> 1) | 1; + + for (n=0; n> 31); + accu = (int64_t)Q31(M_SQRT1_2)*(tmp3 - tmp4); + tmp7 = (int32_t)((accu + 0x40000000) >> 31); + accu = (int64_t)Q31(M_SQRT1_2)*(tmp2 - tmp1); + tmp6 = (int32_t)((accu + 0x40000000) >> 31); + accu = (int64_t)Q31(M_SQRT1_2)*(tmp3 + tmp4); + tmp8 = (int32_t)((accu + 0x40000000) >> 31); + tmp1 = tmp5 + tmp7; + tmp3 = tmp5 - tmp7; + tmp2 = tmp6 + tmp8; + tmp4 = tmp6 - tmp8; + + tmpz[5].re = tmpz[1].re - tmp1; + tmpz[1].re = tmpz[1].re + tmp1; + tmpz[5].im = tmpz[1].im - tmp2; + tmpz[1].im = tmpz[1].im + tmp2; + tmpz[7].re = tmpz[3].re - tmp4; + tmpz[3].re = tmpz[3].re + tmp4; + tmpz[7].im = tmpz[3].im + tmp3; + tmpz[3].im = tmpz[3].im - tmp3; + } + + step = 1 << ((MAX_LOG2_NFFT-4) - 4); + n4 = 4; + + for (nbits=4; nbits<=s->nbits; nbits++){ + n2 = 2*n4; + n34 = 3*n4; + num_transforms = (num_transforms >> 1) | 1; + + for (n=0; n> 31); + accu = (int64_t)w_re*tmpz[ n2+i].im; + accu -= (int64_t)w_im*tmpz[ n2+i].re; + tmp2 = (int32_t)((accu + 0x40000000) >> 31); + accu = (int64_t)w_re*tmpz[n34+i].re; + accu -= (int64_t)w_im*tmpz[n34+i].im; + tmp3 = (int32_t)((accu + 0x40000000) >> 31); + accu = (int64_t)w_re*tmpz[n34+i].im; + accu += (int64_t)w_im*tmpz[n34+i].re; + tmp4 = (int32_t)((accu + 0x40000000) >> 31); + + tmp5 = tmp1 + tmp3; + tmp1 = tmp1 - tmp3; + tmp6 = tmp2 + tmp4; + tmp2 = tmp2 - tmp4; + + tmpz[ n2+i].re = tmpz[ i].re - tmp5; + tmpz[ i].re = tmpz[ i].re + tmp5; + tmpz[ n2+i].im = tmpz[ i].im - tmp6; + tmpz[ i].im = tmpz[ i].im + tmp6; + tmpz[n34+i].re = tmpz[n4+i].re - tmp2; + tmpz[ n4+i].re = tmpz[n4+i].re + tmp2; + tmpz[n34+i].im = tmpz[n4+i].im + tmp1; + tmpz[ n4+i].im = tmpz[n4+i].im - tmp1; + + w_re_ptr += step; + w_im_ptr -= step; + } + } + step >>= 1; + n4 <<= 1; + } +} + +#else /* FFT_FIXED_32 */ + +#define BUTTERFLIES(a0,a1,a2,a3) {\ + BF(t3, t5, t5, t1);\ + BF(a2.re, a0.re, a0.re, t5);\ + BF(a3.im, a1.im, a1.im, t3);\ + BF(t4, t6, t2, t6);\ + BF(a3.re, a1.re, a1.re, t4);\ + BF(a2.im, a0.im, a0.im, t6);\ +} + +// force loading all the inputs before storing any. +// this is slightly slower for small data, but avoids store->load aliasing +// for addresses separated by large powers of 2. +#define BUTTERFLIES_BIG(a0,a1,a2,a3) {\ + FFTSample r0=a0.re, i0=a0.im, r1=a1.re, i1=a1.im;\ + BF(t3, t5, t5, t1);\ + BF(a2.re, a0.re, r0, t5);\ + BF(a3.im, a1.im, i1, t3);\ + BF(t4, t6, t2, t6);\ + BF(a3.re, a1.re, r1, t4);\ + BF(a2.im, a0.im, i0, t6);\ +} + +#define TRANSFORM(a0,a1,a2,a3,wre,wim) {\ + CMUL(t1, t2, a2.re, a2.im, wre, -wim);\ + CMUL(t5, t6, a3.re, a3.im, wre, wim);\ + BUTTERFLIES(a0,a1,a2,a3)\ +} + +#define TRANSFORM_ZERO(a0,a1,a2,a3) {\ + t1 = a2.re;\ + t2 = a2.im;\ + t5 = a3.re;\ + t6 = a3.im;\ + BUTTERFLIES(a0,a1,a2,a3)\ +} + +/* z[0...8n-1], w[1...2n-1] */ +#define PASS(name)\ +static void name(FFTComplex *z, const FFTSample *wre, unsigned int n)\ +{\ + FFTDouble t1, t2, t3, t4, t5, t6;\ + int o1 = 2*n;\ + int o2 = 4*n;\ + int o3 = 6*n;\ + const FFTSample *wim = wre+o1;\ + n--;\ +\ + TRANSFORM_ZERO(z[0],z[o1],z[o2],z[o3]);\ + TRANSFORM(z[1],z[o1+1],z[o2+1],z[o3+1],wre[1],wim[-1]);\ + do {\ + z += 2;\ + wre += 2;\ + wim -= 2;\ + TRANSFORM(z[0],z[o1],z[o2],z[o3],wre[0],wim[0]);\ + TRANSFORM(z[1],z[o1+1],z[o2+1],z[o3+1],wre[1],wim[-1]);\ + } while(--n);\ +} + +PASS(pass) +#undef BUTTERFLIES +#define BUTTERFLIES BUTTERFLIES_BIG +PASS(pass_big) + +#define DECL_FFT(n,n2,n4)\ +static void fft##n(FFTComplex *z)\ +{\ + fft##n2(z);\ + fft##n4(z+n4*2);\ + fft##n4(z+n4*3);\ + pass(z,FFT_NAME(ff_cos_##n),n4/2);\ +} + +static void fft4(FFTComplex *z) +{ + FFTDouble t1, t2, t3, t4, t5, t6, t7, t8; + + BF(t3, t1, z[0].re, z[1].re); + BF(t8, t6, z[3].re, z[2].re); + BF(z[2].re, z[0].re, t1, t6); + BF(t4, t2, z[0].im, z[1].im); + BF(t7, t5, z[2].im, z[3].im); + BF(z[3].im, z[1].im, t4, t8); + BF(z[3].re, z[1].re, t3, t7); + BF(z[2].im, z[0].im, t2, t5); +} + +static void fft8(FFTComplex *z) +{ + FFTDouble t1, t2, t3, t4, t5, t6; + + fft4(z); + + BF(t1, z[5].re, z[4].re, -z[5].re); + BF(t2, z[5].im, z[4].im, -z[5].im); + BF(t5, z[7].re, z[6].re, -z[7].re); + BF(t6, z[7].im, z[6].im, -z[7].im); + + BUTTERFLIES(z[0],z[2],z[4],z[6]); + TRANSFORM(z[1],z[3],z[5],z[7],sqrthalf,sqrthalf); +} + +#if !CONFIG_SMALL +static void fft16(FFTComplex *z) +{ + FFTDouble t1, t2, t3, t4, t5, t6; + FFTSample cos_16_1 = FFT_NAME(ff_cos_16)[1]; + FFTSample cos_16_3 = FFT_NAME(ff_cos_16)[3]; + + fft8(z); + fft4(z+8); + fft4(z+12); + + TRANSFORM_ZERO(z[0],z[4],z[8],z[12]); + TRANSFORM(z[2],z[6],z[10],z[14],sqrthalf,sqrthalf); + TRANSFORM(z[1],z[5],z[9],z[13],cos_16_1,cos_16_3); + TRANSFORM(z[3],z[7],z[11],z[15],cos_16_3,cos_16_1); +} +#else +DECL_FFT(16,8,4) +#endif +DECL_FFT(32,16,8) +DECL_FFT(64,32,16) +DECL_FFT(128,64,32) +DECL_FFT(256,128,64) +DECL_FFT(512,256,128) +#if !CONFIG_SMALL +#define pass pass_big +#endif +DECL_FFT(1024,512,256) +DECL_FFT(2048,1024,512) +DECL_FFT(4096,2048,1024) +DECL_FFT(8192,4096,2048) +DECL_FFT(16384,8192,4096) +DECL_FFT(32768,16384,8192) +DECL_FFT(65536,32768,16384) + +static void (* const fft_dispatch[])(FFTComplex*) = { + fft4, fft8, fft16, fft32, fft64, fft128, fft256, fft512, fft1024, + fft2048, fft4096, fft8192, fft16384, fft32768, fft65536, +}; + +static void fft_calc_c(FFTContext *s, FFTComplex *z) +{ + fft_dispatch[s->nbits-2](z); +} +#endif /* FFT_FIXED_32 */ diff --git a/ext/at3_standalone/frame.c b/ext/at3_standalone/frame.c index 2966105032..3b51a7da92 100644 --- a/ext/at3_standalone/frame.c +++ b/ext/at3_standalone/frame.c @@ -162,58 +162,6 @@ void av_frame_free(AVFrame **frame) av_freep(frame); } -static int get_video_buffer(AVFrame *frame, int align) -{ - const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(frame->format); - int ret, i; - - if (!desc) - return AVERROR(EINVAL); - - if ((ret = av_image_check_size(frame->width, frame->height, 0, NULL)) < 0) - return ret; - - if (!frame->linesize[0]) { - for(i=1; i<=align; i+=i) { - ret = av_image_fill_linesizes(frame->linesize, frame->format, - FFALIGN(frame->width, i)); - if (ret < 0) - return ret; - if (!(frame->linesize[0] & (align-1))) - break; - } - - for (i = 0; i < 4 && frame->linesize[i]; i++) - frame->linesize[i] = FFALIGN(frame->linesize[i], align); - } - - for (i = 0; i < 4 && frame->linesize[i]; i++) { - int h = FFALIGN(frame->height, 32); - if (i == 1 || i == 2) - h = AV_CEIL_RSHIFT(h, desc->log2_chroma_h); - - frame->buf[i] = av_buffer_alloc(frame->linesize[i] * h + 16 + 16/*STRIDE_ALIGN*/ - 1); - if (!frame->buf[i]) - goto fail; - - frame->data[i] = frame->buf[i]->data; - } - if (desc->flags & AV_PIX_FMT_FLAG_PAL || desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL) { - av_buffer_unref(&frame->buf[1]); - frame->buf[1] = av_buffer_alloc(AVPALETTE_SIZE); - if (!frame->buf[1]) - goto fail; - frame->data[1] = frame->buf[1]->data; - } - - frame->extended_data = frame->data; - - return 0; -fail: - av_frame_unref(frame); - return AVERROR(ENOMEM); -} - static int get_audio_buffer(AVFrame *frame, int align) { int channels; @@ -275,8 +223,8 @@ int av_frame_get_buffer(AVFrame *frame, int align) if (frame->format < 0) return AVERROR(EINVAL); - if (frame->width > 0 && frame->height > 0) - return get_video_buffer(frame, align); + if (frame->width > 0 && frame->height > 0) + return AVERROR(EINVAL); else if (frame->nb_samples > 0 && (frame->channel_layout || frame->channels > 0)) return get_audio_buffer(frame, align); @@ -648,28 +596,6 @@ AVFrameSideData *av_frame_get_side_data(const AVFrame *frame, return NULL; } -static int frame_copy_video(AVFrame *dst, const AVFrame *src) -{ - const uint8_t *src_data[4]; - int i, planes; - - if (dst->width < src->width || - dst->height < src->height) - return AVERROR(EINVAL); - - planes = av_pix_fmt_count_planes(dst->format); - for (i = 0; i < planes; i++) - if (!dst->data[i] || !src->data[i]) - return AVERROR(EINVAL); - - memcpy(src_data, src->data, sizeof(src_data)); - av_image_copy(dst->data, dst->linesize, - src_data, src->linesize, - dst->format, src->width, src->height); - - return 0; -} - static int frame_copy_audio(AVFrame *dst, const AVFrame *src) { int planar = av_sample_fmt_is_planar(dst->format); @@ -700,7 +626,7 @@ int av_frame_copy(AVFrame *dst, const AVFrame *src) return AVERROR(EINVAL); if (dst->width > 0 && dst->height > 0) - return frame_copy_video(dst, src); + return AVERROR(EINVAL); else if (dst->nb_samples > 0 && dst->channel_layout) return frame_copy_audio(dst, src); diff --git a/ext/at3_standalone/intmath.c b/ext/at3_standalone/intmath.c new file mode 100644 index 0000000000..b0c00e1cad --- /dev/null +++ b/ext/at3_standalone/intmath.c @@ -0,0 +1,34 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "intmath.h" + +/* undef these to get the function prototypes from common.h */ +#undef av_log2 +#undef av_log2_16bit +#include "common.h" + +int av_log2(unsigned v) +{ + return ff_log2(v); +} + +int av_log2_16bit(unsigned v) +{ + return ff_log2_16bit(v); +} diff --git a/ext/at3_standalone/intmath.h b/ext/at3_standalone/intmath.h new file mode 100644 index 0000000000..9573109e9d --- /dev/null +++ b/ext/at3_standalone/intmath.h @@ -0,0 +1,165 @@ +/* + * Copyright (c) 2010 Mans Rullgard + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVUTIL_INTMATH_H +#define AVUTIL_INTMATH_H + +#include + +#include "config.h" +#include "attributes.h" + +#if ARCH_ARM +# include "arm/intmath.h" +#endif +#if ARCH_X86 +# include "x86/intmath.h" +#endif + +#if HAVE_FAST_CLZ +#if AV_GCC_VERSION_AT_LEAST(3,4) +#ifndef ff_log2 +# define ff_log2(x) (31 - __builtin_clz((x)|1)) +# ifndef ff_log2_16bit +# define ff_log2_16bit av_log2 +# endif +#endif /* ff_log2 */ +#endif /* AV_GCC_VERSION_AT_LEAST(3,4) */ +#endif + +extern const uint8_t ff_log2_tab[256]; + +#ifndef ff_log2 +#define ff_log2 ff_log2_c +static av_always_inline av_const int ff_log2_c(unsigned int v) +{ + int n = 0; + if (v & 0xffff0000) { + v >>= 16; + n += 16; + } + if (v & 0xff00) { + v >>= 8; + n += 8; + } + n += ff_log2_tab[v]; + + return n; +} +#endif + +#ifndef ff_log2_16bit +#define ff_log2_16bit ff_log2_16bit_c +static av_always_inline av_const int ff_log2_16bit_c(unsigned int v) +{ + int n = 0; + if (v & 0xff00) { + v >>= 8; + n += 8; + } + n += ff_log2_tab[v]; + + return n; +} +#endif + +#define av_log2 ff_log2 +#define av_log2_16bit ff_log2_16bit + +/** + * @addtogroup lavu_math + * @{ + */ + +#if HAVE_FAST_CLZ +#if AV_GCC_VERSION_AT_LEAST(3,4) +#ifndef ff_ctz +#define ff_ctz(v) __builtin_ctz(v) +#endif +#ifndef ff_ctzll +#define ff_ctzll(v) __builtin_ctzll(v) +#endif +#ifndef ff_clz +#define ff_clz(v) __builtin_clz(v) +#endif +#endif +#endif + +#ifndef ff_ctz +#define ff_ctz ff_ctz_c +/** + * Trailing zero bit count. + * + * @param v input value. If v is 0, the result is undefined. + * @return the number of trailing 0-bits + */ +/* We use the De-Bruijn method outlined in: + * http://supertech.csail.mit.edu/papers/debruijn.pdf. */ +static av_always_inline av_const int ff_ctz_c(int v) +{ + static const uint8_t debruijn_ctz32[32] = { + 0, 1, 28, 2, 29, 14, 24, 3, 30, 22, 20, 15, 25, 17, 4, 8, + 31, 27, 13, 23, 21, 19, 16, 7, 26, 12, 18, 6, 11, 5, 10, 9 + }; + return debruijn_ctz32[(uint32_t)((v & -v) * 0x077CB531U) >> 27]; +} +#endif + +#ifndef ff_ctzll +#define ff_ctzll ff_ctzll_c +/* We use the De-Bruijn method outlined in: + * http://supertech.csail.mit.edu/papers/debruijn.pdf. */ +static av_always_inline av_const int ff_ctzll_c(long long v) +{ + static const uint8_t debruijn_ctz64[64] = { + 0, 1, 2, 53, 3, 7, 54, 27, 4, 38, 41, 8, 34, 55, 48, 28, + 62, 5, 39, 46, 44, 42, 22, 9, 24, 35, 59, 56, 49, 18, 29, 11, + 63, 52, 6, 26, 37, 40, 33, 47, 61, 45, 43, 21, 23, 58, 17, 10, + 51, 25, 36, 32, 60, 20, 57, 16, 50, 31, 19, 15, 30, 14, 13, 12 + }; + return debruijn_ctz64[(uint64_t)((v & -v) * 0x022FDD63CC95386DU) >> 58]; +} +#endif + +#ifndef ff_clz +#define ff_clz ff_clz_c +static av_always_inline av_const unsigned ff_clz_c(unsigned x) +{ + unsigned i = sizeof(x) * 8; + + while (x) { + x >>= 1; + i--; + } + + return i; +} +#endif + +#if AV_GCC_VERSION_AT_LEAST(3,4) +#ifndef av_parity +#define av_parity __builtin_parity +#endif +#endif + +/** + * @} + */ +#endif /* AVUTIL_INTMATH_H */ diff --git a/ext/at3_standalone/log2_tab.c b/ext/at3_standalone/log2_tab.c new file mode 100644 index 0000000000..0dbf07d74c --- /dev/null +++ b/ext/at3_standalone/log2_tab.c @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2003-2012 Michael Niedermayer + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include + +const uint8_t ff_log2_tab[256]={ + 0,0,1,1,2,2,2,2,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4, + 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5, + 6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6, + 6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6, + 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, + 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, + 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, + 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7 +}; diff --git a/ext/at3_standalone/mathematics.c b/ext/at3_standalone/mathematics.c new file mode 100644 index 0000000000..bb2f2b4fcc --- /dev/null +++ b/ext/at3_standalone/mathematics.c @@ -0,0 +1,210 @@ +/* + * Copyright (c) 2005-2012 Michael Niedermayer + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + * miscellaneous math routines and tables + */ + +#include +#include + +#include "mathematics.h" +#include "intmath.h" +#include "common.h" +#include "version.h" + +/* Stein's binary GCD algorithm: + * https://en.wikipedia.org/wiki/Binary_GCD_algorithm */ +int64_t av_gcd(int64_t a, int64_t b) { + int za, zb, k; + int64_t u, v; + if (a == 0) + return b; + if (b == 0) + return a; + za = ff_ctzll(a); + zb = ff_ctzll(b); + k = FFMIN(za, zb); + u = llabs(a >> za); + v = llabs(b >> zb); + while (u != v) { + if (u > v) + FFSWAP(int64_t, v, u); + v -= u; + v >>= ff_ctzll(v); + } + return (uint64_t)u << k; +} + +int64_t av_rescale_rnd(int64_t a, int64_t b, int64_t c, enum AVRounding rnd) +{ + int64_t r = 0; + av_assert2(c > 0); + av_assert2(b >=0); + av_assert2((unsigned)(rnd&~AV_ROUND_PASS_MINMAX)<=5 && (rnd&~AV_ROUND_PASS_MINMAX)!=4); + + if (c <= 0 || b < 0 || !((unsigned)(rnd&~AV_ROUND_PASS_MINMAX)<=5 && (rnd&~AV_ROUND_PASS_MINMAX)!=4)) + return INT64_MIN; + + if (rnd & AV_ROUND_PASS_MINMAX) { + if (a == INT64_MIN || a == INT64_MAX) + return a; + rnd -= AV_ROUND_PASS_MINMAX; + } + + if (a < 0) + return -(uint64_t)av_rescale_rnd(-FFMAX(a, -INT64_MAX), b, c, rnd ^ ((rnd >> 1) & 1)); + + if (rnd == AV_ROUND_NEAR_INF) + r = c / 2; + else if (rnd & 1) + r = c - 1; + + if (b <= INT_MAX && c <= INT_MAX) { + if (a <= INT_MAX) + return (a * b + r) / c; + else { + int64_t ad = a / c; + int64_t a2 = (a % c * b + r) / c; + if (ad >= INT32_MAX && b && ad > (INT64_MAX - a2) / b) + return INT64_MIN; + return ad * b + a2; + } + } else { +#if 1 + uint64_t a0 = a & 0xFFFFFFFF; + uint64_t a1 = a >> 32; + uint64_t b0 = b & 0xFFFFFFFF; + uint64_t b1 = b >> 32; + uint64_t t1 = a0 * b1 + a1 * b0; + uint64_t t1a = t1 << 32; + int i; + + a0 = a0 * b0 + t1a; + a1 = a1 * b1 + (t1 >> 32) + (a0 < t1a); + a0 += r; + a1 += a0 < r; + + for (i = 63; i >= 0; i--) { + a1 += a1 + ((a0 >> i) & 1); + t1 += t1; + if (c <= a1) { + a1 -= c; + t1++; + } + } + if (t1 > INT64_MAX) + return INT64_MIN; + return t1; + } +#else + AVInteger ai; + ai = av_mul_i(av_int2i(a), av_int2i(b)); + ai = av_add_i(ai, av_int2i(r)); + + return av_i2int(av_div_i(ai, av_int2i(c))); + } +#endif +} + +int64_t av_rescale(int64_t a, int64_t b, int64_t c) +{ + return av_rescale_rnd(a, b, c, AV_ROUND_NEAR_INF); +} + +int64_t av_rescale_q_rnd(int64_t a, AVRational bq, AVRational cq, + enum AVRounding rnd) +{ + int64_t b = bq.num * (int64_t)cq.den; + int64_t c = cq.num * (int64_t)bq.den; + return av_rescale_rnd(a, b, c, rnd); +} + +int64_t av_rescale_q(int64_t a, AVRational bq, AVRational cq) +{ + return av_rescale_q_rnd(a, bq, cq, AV_ROUND_NEAR_INF); +} + +int av_compare_ts(int64_t ts_a, AVRational tb_a, int64_t ts_b, AVRational tb_b) +{ + int64_t a = tb_a.num * (int64_t)tb_b.den; + int64_t b = tb_b.num * (int64_t)tb_a.den; + if ((FFABS(ts_a)|a|FFABS(ts_b)|b) <= INT_MAX) + return (ts_a*a > ts_b*b) - (ts_a*a < ts_b*b); + if (av_rescale_rnd(ts_a, a, b, AV_ROUND_DOWN) < ts_b) + return -1; + if (av_rescale_rnd(ts_b, b, a, AV_ROUND_DOWN) < ts_a) + return 1; + return 0; +} + +int64_t av_compare_mod(uint64_t a, uint64_t b, uint64_t mod) +{ + int64_t c = (a - b) & (mod - 1); + if (c > (mod >> 1)) + c -= mod; + return c; +} + +int64_t av_rescale_delta(AVRational in_tb, int64_t in_ts, AVRational fs_tb, int duration, int64_t *last, AVRational out_tb){ + int64_t a, b, this; + + av_assert0(in_ts != AV_NOPTS_VALUE); + av_assert0(duration >= 0); + + if (*last == AV_NOPTS_VALUE || !duration || in_tb.num*(int64_t)out_tb.den <= out_tb.num*(int64_t)in_tb.den) { +simple_round: + *last = av_rescale_q(in_ts, in_tb, fs_tb) + duration; + return av_rescale_q(in_ts, in_tb, out_tb); + } + + a = av_rescale_q_rnd(2*in_ts-1, in_tb, fs_tb, AV_ROUND_DOWN) >>1; + b = (av_rescale_q_rnd(2*in_ts+1, in_tb, fs_tb, AV_ROUND_UP )+1)>>1; + if (*last < 2*a - b || *last > 2*b - a) + goto simple_round; + + this = av_clip64(*last, a, b); + *last = this + duration; + + return av_rescale_q(this, fs_tb, out_tb); +} + +int64_t av_add_stable(AVRational ts_tb, int64_t ts, AVRational inc_tb, int64_t inc) +{ + int64_t m, d; + + if (inc != 1) + inc_tb = av_mul_q(inc_tb, (AVRational) {inc, 1}); + + m = inc_tb.num * (int64_t)ts_tb.den; + d = inc_tb.den * (int64_t)ts_tb.num; + + if (m % d == 0) + return ts + m / d; + if (m < d) + return ts; + + { + int64_t old = av_rescale_q(ts, ts_tb, inc_tb); + int64_t old_ts = av_rescale_q(old, inc_tb, ts_tb); + return av_rescale_q(old + 1, inc_tb, ts_tb) + (ts - old_ts); + } +} diff --git a/ext/at3_standalone/mdct_template.c b/ext/at3_standalone/mdct_template.c new file mode 100644 index 0000000000..6176cd3de8 --- /dev/null +++ b/ext/at3_standalone/mdct_template.c @@ -0,0 +1,213 @@ +/* + * MDCT/IMDCT transforms + * Copyright (c) 2002 Fabrice Bellard + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include +#include +#include "common.h" +#include "libm.h" +#include "mathematics.h" +#include "fft.h" +#include "fft-internal.h" + +/** + * @file + * MDCT/IMDCT transforms. + */ + +#if FFT_FLOAT +# define RSCALE(x) (x) +#else +#if FFT_FIXED_32 +# define RSCALE(x) (((x) + 32) >> 6) +#else /* FFT_FIXED_32 */ +# define RSCALE(x) ((x) >> 1) +#endif /* FFT_FIXED_32 */ +#endif + +/** + * init MDCT or IMDCT computation. + */ +av_cold int ff_mdct_init(FFTContext *s, int nbits, int inverse, double scale) +{ + int n, n4, i; + double alpha, theta; + int tstep; + + memset(s, 0, sizeof(*s)); + n = 1 << nbits; + s->mdct_bits = nbits; + s->mdct_size = n; + n4 = n >> 2; + s->mdct_permutation = FF_MDCT_PERM_NONE; + + if (ff_fft_init(s, s->mdct_bits - 2, inverse) < 0) + goto fail; + + s->tcos = av_malloc_array(n/2, sizeof(FFTSample)); + if (!s->tcos) + goto fail; + + switch (s->mdct_permutation) { + case FF_MDCT_PERM_NONE: + s->tsin = s->tcos + n4; + tstep = 1; + break; + case FF_MDCT_PERM_INTERLEAVE: + s->tsin = s->tcos + 1; + tstep = 2; + break; + default: + goto fail; + } + + theta = 1.0 / 8.0 + (scale < 0 ? n4 : 0); + scale = sqrt(fabs(scale)); + for(i=0;itcos[i*tstep] = lrint(-cos(alpha) * 2147483648.0); + s->tsin[i*tstep] = lrint(-sin(alpha) * 2147483648.0); +#else + s->tcos[i*tstep] = FIX15(-cos(alpha) * scale); + s->tsin[i*tstep] = FIX15(-sin(alpha) * scale); +#endif + } + return 0; + fail: + ff_mdct_end(s); + return -1; +} + +/** + * Compute the middle half of the inverse MDCT of size N = 2^nbits, + * thus excluding the parts that can be derived by symmetry + * @param output N/2 samples + * @param input N/2 samples + */ +void ff_imdct_half_c(FFTContext *s, FFTSample *output, const FFTSample *input) +{ + int k, n8, n4, n2, n, j; + const uint16_t *revtab = s->revtab; + const FFTSample *tcos = s->tcos; + const FFTSample *tsin = s->tsin; + const FFTSample *in1, *in2; + FFTComplex *z = (FFTComplex *)output; + + n = 1 << s->mdct_bits; + n2 = n >> 1; + n4 = n >> 2; + n8 = n >> 3; + + /* pre rotation */ + in1 = input; + in2 = input + n2 - 1; + for(k = 0; k < n4; k++) { + j=revtab[k]; + CMUL(z[j].re, z[j].im, *in2, *in1, tcos[k], tsin[k]); + in1 += 2; + in2 -= 2; + } + s->fft_calc(s, z); + + /* post rotation + reordering */ + for(k = 0; k < n8; k++) { + FFTSample r0, i0, r1, i1; + CMUL(r0, i1, z[n8-k-1].im, z[n8-k-1].re, tsin[n8-k-1], tcos[n8-k-1]); + CMUL(r1, i0, z[n8+k ].im, z[n8+k ].re, tsin[n8+k ], tcos[n8+k ]); + z[n8-k-1].re = r0; + z[n8-k-1].im = i0; + z[n8+k ].re = r1; + z[n8+k ].im = i1; + } +} + +/** + * Compute inverse MDCT of size N = 2^nbits + * @param output N samples + * @param input N/2 samples + */ +void ff_imdct_calc_c(FFTContext *s, FFTSample *output, const FFTSample *input) +{ + int k; + int n = 1 << s->mdct_bits; + int n2 = n >> 1; + int n4 = n >> 2; + + ff_imdct_half_c(s, output+n4, input); + + for(k = 0; k < n4; k++) { + output[k] = -output[n2-k-1]; + output[n-k-1] = output[n2+k]; + } +} + +/** + * Compute MDCT of size N = 2^nbits + * @param input N samples + * @param out N/2 samples + */ +void ff_mdct_calc_c(FFTContext *s, FFTSample *out, const FFTSample *input) +{ + int i, j, n, n8, n4, n2, n3; + FFTDouble re, im; + const uint16_t *revtab = s->revtab; + const FFTSample *tcos = s->tcos; + const FFTSample *tsin = s->tsin; + FFTComplex *x = (FFTComplex *)out; + + n = 1 << s->mdct_bits; + n2 = n >> 1; + n4 = n >> 2; + n8 = n >> 3; + n3 = 3 * n4; + + /* pre rotation */ + for(i=0;ifft_calc(s, x); + + /* post rotation */ + for(i=0;itcos); + ff_fft_end(s); +} diff --git a/ext/at3_standalone/mem.c b/ext/at3_standalone/mem.c index 8dfaad8271..87bdb91b5a 100644 --- a/ext/at3_standalone/mem.c +++ b/ext/at3_standalone/mem.c @@ -36,10 +36,9 @@ #include #endif -#include "avassert.h" +#include "compat.h" #include "avutil.h" #include "common.h" -#include "dynarray.h" #include "intreadwrite.h" #include "mem.h" @@ -59,7 +58,24 @@ void free(void *ptr); #endif /* MALLOC_PREFIX */ -#include "mem_internal.h" +int ff_fast_malloc(void *ptr, unsigned int *size, size_t min_size, int zero_realloc) +{ + void *val; + + memcpy(&val, ptr, sizeof(val)); + if (min_size <= *size) { + av_assert0(val || !min_size); + return 0; + } + min_size = FFMAX(min_size + min_size / 16 + 32, min_size); + av_freep(ptr); + val = zero_realloc ? av_mallocz(min_size) : av_malloc(min_size); + memcpy(ptr, &val, sizeof(val)); + if (!val) + min_size = 0; + *size = min_size; + return 1; +} #define ALIGN (HAVE_AVX ? 32 : 16) @@ -307,51 +323,6 @@ void *av_memdup(const void *p, size_t size) return ptr; } -int av_dynarray_add_nofree(void *tab_ptr, int *nb_ptr, void *elem) -{ - void **tab; - memcpy(&tab, tab_ptr, sizeof(tab)); - - AV_DYNARRAY_ADD(INT_MAX, sizeof(*tab), tab, *nb_ptr, { - tab[*nb_ptr] = elem; - memcpy(tab_ptr, &tab, sizeof(tab)); - }, { - return AVERROR(ENOMEM); - }); - return 0; -} - -void av_dynarray_add(void *tab_ptr, int *nb_ptr, void *elem) -{ - void **tab; - memcpy(&tab, tab_ptr, sizeof(tab)); - - AV_DYNARRAY_ADD(INT_MAX, sizeof(*tab), tab, *nb_ptr, { - tab[*nb_ptr] = elem; - memcpy(tab_ptr, &tab, sizeof(tab)); - }, { - *nb_ptr = 0; - av_freep(tab_ptr); - }); -} - -void *av_dynarray2_add(void **tab_ptr, int *nb_ptr, size_t elem_size, - const uint8_t *elem_data) -{ - uint8_t *tab_elem_data = NULL; - - AV_DYNARRAY_ADD(INT_MAX, elem_size, *tab_ptr, *nb_ptr, { - tab_elem_data = (uint8_t *)*tab_ptr + (*nb_ptr) * elem_size; - if (elem_data) - memcpy(tab_elem_data, elem_data, elem_size); - else if (CONFIG_MEMORY_POISONING) - memset(tab_elem_data, FF_MEMORY_POISON, elem_size); - }, { - av_freep(tab_ptr); - *nb_ptr = 0; - }); - return tab_elem_data; -} static void fill16(uint8_t *dst, int len) { diff --git a/ext/at3_standalone/opt.c b/ext/at3_standalone/opt.c new file mode 100644 index 0000000000..6411239e61 --- /dev/null +++ b/ext/at3_standalone/opt.c @@ -0,0 +1,1593 @@ +/* + * AVOptions + * Copyright (c) 2005 Michael Niedermayer + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + * AVOptions + * @author Michael Niedermayer + */ + +#include "avutil.h" +#include "channel_layout.h" +#include "common.h" +#include "opt.h" +#include "dict.h" +#include "avstring.h" +#include "log.h" +#include "pixdesc.h" +#include "mathematics.h" +#include "samplefmt.h" + +#include + +const AVOption *av_opt_next(const void *obj, const AVOption *last) +{ + const AVClass *class; + if (!obj) + return NULL; + class = *(const AVClass**)obj; + if (!last && class && class->option && class->option[0].name) + return class->option; + if (last && last[1].name) + return ++last; + return NULL; +} + +static int read_number(const AVOption *o, const void *dst, double *num, int *den, int64_t *intnum) +{ + switch (o->type) { + case AV_OPT_TYPE_FLAGS: *intnum = *(unsigned int*)dst;return 0; + case AV_OPT_TYPE_PIXEL_FMT: *intnum = *(enum AVPixelFormat *)dst;return 0; + case AV_OPT_TYPE_SAMPLE_FMT:*intnum = *(enum AVSampleFormat*)dst;return 0; + case AV_OPT_TYPE_BOOL: + case AV_OPT_TYPE_INT: *intnum = *(int *)dst;return 0; + case AV_OPT_TYPE_CHANNEL_LAYOUT: + case AV_OPT_TYPE_DURATION: + case AV_OPT_TYPE_INT64: *intnum = *(int64_t *)dst;return 0; + case AV_OPT_TYPE_FLOAT: *num = *(float *)dst;return 0; + case AV_OPT_TYPE_DOUBLE: *num = *(double *)dst;return 0; + case AV_OPT_TYPE_RATIONAL: *intnum = ((AVRational*)dst)->num; + *den = ((AVRational*)dst)->den; + return 0; + case AV_OPT_TYPE_CONST: *num = o->default_val.dbl; return 0; + } + return AVERROR(EINVAL); +} + +static int write_number(void *obj, const AVOption *o, void *dst, double num, int den, int64_t intnum) +{ + if (o->type != AV_OPT_TYPE_FLAGS && + (o->max * den < num * intnum || o->min * den > num * intnum)) { + num = den ? num*intnum/den : (num*intnum ? INFINITY : NAN); + av_log(obj, AV_LOG_ERROR, "Value %f for parameter '%s' out of range [%g - %g]\n", + num, o->name, o->min, o->max); + return AVERROR(ERANGE); + } + if (o->type == AV_OPT_TYPE_FLAGS) { + double d = num*intnum/den; + if (d < -1.5 || d > 0xFFFFFFFF+0.5 || (llrint(d*256) & 255)) { + av_log(obj, AV_LOG_ERROR, + "Value %f for parameter '%s' is not a valid set of 32bit integer flags\n", + num*intnum/den, o->name); + return AVERROR(ERANGE); + } + } + + switch (o->type) { + case AV_OPT_TYPE_PIXEL_FMT: *(enum AVPixelFormat *)dst = llrint(num/den) * intnum; break; + case AV_OPT_TYPE_SAMPLE_FMT:*(enum AVSampleFormat*)dst = llrint(num/den) * intnum; break; + case AV_OPT_TYPE_BOOL: + case AV_OPT_TYPE_FLAGS: + case AV_OPT_TYPE_INT: *(int *)dst= llrint(num/den)*intnum; break; + case AV_OPT_TYPE_DURATION: + case AV_OPT_TYPE_CHANNEL_LAYOUT: + case AV_OPT_TYPE_INT64: *(int64_t *)dst= llrint(num/den)*intnum; break; + case AV_OPT_TYPE_FLOAT: *(float *)dst= num*intnum/den; break; + case AV_OPT_TYPE_DOUBLE:*(double *)dst= num*intnum/den; break; + case AV_OPT_TYPE_RATIONAL: + if ((int)num == num) *(AVRational*)dst= (AVRational){num*intnum, den}; + else *(AVRational*)dst= av_d2q(num*intnum/den, 1<<24); + break; + default: + return AVERROR(EINVAL); + } + return 0; +} + +static int hexchar2int(char c) { + if (c >= '0' && c <= '9') return c - '0'; + if (c >= 'a' && c <= 'f') return c - 'a' + 10; + if (c >= 'A' && c <= 'F') return c - 'A' + 10; + return -1; +} + +static int set_string_binary(void *obj, const AVOption *o, const char *val, uint8_t **dst) +{ + int *lendst = (int *)(dst + 1); + uint8_t *bin, *ptr; + int len; + + av_freep(dst); + *lendst = 0; + + if (!val || !(len = strlen(val))) + return 0; + + if (len & 1) + return AVERROR(EINVAL); + len /= 2; + + ptr = bin = av_malloc(len); + if (!ptr) + return AVERROR(ENOMEM); + while (*val) { + int a = hexchar2int(*val++); + int b = hexchar2int(*val++); + if (a < 0 || b < 0) { + av_free(bin); + return AVERROR(EINVAL); + } + *ptr++ = (a << 4) | b; + } + *dst = bin; + *lendst = len; + + return 0; +} + +static int set_string(void *obj, const AVOption *o, const char *val, uint8_t **dst) +{ + av_freep(dst); + *dst = av_strdup(val); + return *dst ? 0 : AVERROR(ENOMEM); +} + +#define DEFAULT_NUMVAL(opt) ((opt->type == AV_OPT_TYPE_INT64 || \ + opt->type == AV_OPT_TYPE_CONST || \ + opt->type == AV_OPT_TYPE_FLAGS || \ + opt->type == AV_OPT_TYPE_INT) ? \ + opt->default_val.i64 : opt->default_val.dbl) + +static const char *get_bool_name(int val) +{ + if (val < 0) + return "auto"; + return val ? "true" : "false"; +} + +static int set_string_bool(void *obj, const AVOption *o, const char *val, int *dst) +{ + int n; + + if (!val) + return 0; + + if (!strcmp(val, "auto")) { + n = -1; + } else if (av_match_name(val, "true,y,yes,enable,enabled,on")) { + n = 1; + } else if (av_match_name(val, "false,n,no,disable,disabled,off")) { + n = 0; + } else { + char *end = NULL; + n = strtol(val, &end, 10); + if (val + strlen(val) != end) + goto fail; + } + + if (n < o->min || n > o->max) + goto fail; + + *dst = n; + return 0; + +fail: + av_log(obj, AV_LOG_ERROR, "Unable to parse option value \"%s\" as boolean\n", val); + return AVERROR(EINVAL); +} + +static int set_string_fmt(void *obj, const AVOption *o, const char *val, uint8_t *dst, + int fmt_nb, int ((*get_fmt)(const char *)), const char *desc) +{ + int fmt, min, max; + + if (!val || !strcmp(val, "none")) { + fmt = -1; + } else { + fmt = get_fmt(val); + if (fmt == -1) { + char *tail; + fmt = strtol(val, &tail, 0); + if (*tail || (unsigned)fmt >= fmt_nb) { + av_log(obj, AV_LOG_ERROR, + "Unable to parse option value \"%s\" as %s\n", val, desc); + return AVERROR(EINVAL); + } + } + } + + min = FFMAX(o->min, -1); + max = FFMIN(o->max, fmt_nb-1); + + // hack for compatibility with old ffmpeg + if(min == 0 && max == 0) { + min = -1; + max = fmt_nb-1; + } + + if (fmt < min || fmt > max) { + av_log(obj, AV_LOG_ERROR, + "Value %d for parameter '%s' out of %s format range [%d - %d]\n", + fmt, o->name, desc, min, max); + return AVERROR(ERANGE); + } + + *(int *)dst = fmt; + return 0; +} + +int av_opt_set_dict_val(void *obj, const char *name, const AVDictionary *val, int search_flags) +{ + void *target_obj; + AVDictionary **dst; + const AVOption *o = av_opt_find2(obj, name, NULL, 0, search_flags, &target_obj); + + if (!o || !target_obj) + return AVERROR_OPTION_NOT_FOUND; + if (o->flags & AV_OPT_FLAG_READONLY) + return AVERROR(EINVAL); + + dst = (AVDictionary **)(((uint8_t *)target_obj) + o->offset); + av_dict_free(dst); + av_dict_copy(dst, val, 0); + + return 0; +} + +static void format_duration(char *buf, size_t size, int64_t d) +{ + char *e; + + av_assert0(size >= 25); + if (d < 0 && d != INT64_MIN) { + *(buf++) = '-'; + size--; + d = -d; + } + if (d == INT64_MAX) + snprintf(buf, size, "INT64_MAX"); + else if (d == INT64_MIN) + snprintf(buf, size, "INT64_MIN"); + else if (d > (int64_t)3600*1000000) + snprintf(buf, size, "%"PRId64":%02d:%02d.%06d", d / 3600000000, + (int)((d / 60000000) % 60), + (int)((d / 1000000) % 60), + (int)(d % 1000000)); + else if (d > 60*1000000) + snprintf(buf, size, "%d:%02d.%06d", + (int)(d / 60000000), + (int)((d / 1000000) % 60), + (int)(d % 1000000)); + else + snprintf(buf, size, "%d.%06d", + (int)(d / 1000000), + (int)(d % 1000000)); + e = buf + strlen(buf); + while (e > buf && e[-1] == '0') + *(--e) = 0; + if (e > buf && e[-1] == '.') + *(--e) = 0; +} + +int av_opt_get(void *obj, const char *name, int search_flags, uint8_t **out_val) +{ + void *dst, *target_obj; + const AVOption *o = av_opt_find2(obj, name, NULL, 0, search_flags, &target_obj); + uint8_t *bin, buf[128]; + int len, i, ret; + int64_t i64; + + if (!o || !target_obj || (o->offset<=0 && o->type != AV_OPT_TYPE_CONST)) + return AVERROR_OPTION_NOT_FOUND; + + dst = (uint8_t*)target_obj + o->offset; + + buf[0] = 0; + switch (o->type) { + case AV_OPT_TYPE_BOOL: + ret = snprintf(buf, sizeof(buf), "%s", (char *)av_x_if_null(get_bool_name(*(int *)dst), "invalid")); + break; + case AV_OPT_TYPE_FLAGS: ret = snprintf(buf, sizeof(buf), "0x%08X", *(int *)dst);break; + case AV_OPT_TYPE_INT: ret = snprintf(buf, sizeof(buf), "%d" , *(int *)dst);break; + case AV_OPT_TYPE_INT64: ret = snprintf(buf, sizeof(buf), "%"PRId64, *(int64_t*)dst);break; + case AV_OPT_TYPE_FLOAT: ret = snprintf(buf, sizeof(buf), "%f" , *(float *)dst);break; + case AV_OPT_TYPE_DOUBLE: ret = snprintf(buf, sizeof(buf), "%f" , *(double *)dst);break; + case AV_OPT_TYPE_VIDEO_RATE: + case AV_OPT_TYPE_RATIONAL: ret = snprintf(buf, sizeof(buf), "%d/%d", ((AVRational*)dst)->num, ((AVRational*)dst)->den);break; + case AV_OPT_TYPE_CONST: ret = snprintf(buf, sizeof(buf), "%f" , o->default_val.dbl);break; + case AV_OPT_TYPE_STRING: + if (*(uint8_t**)dst) { + *out_val = av_strdup(*(uint8_t**)dst); + } else if (search_flags & AV_OPT_ALLOW_NULL) { + *out_val = NULL; + return 0; + } else { + *out_val = av_strdup(""); + } + return *out_val ? 0 : AVERROR(ENOMEM); + case AV_OPT_TYPE_BINARY: + if (!*(uint8_t**)dst && (search_flags & AV_OPT_ALLOW_NULL)) { + *out_val = NULL; + return 0; + } + len = *(int*)(((uint8_t *)dst) + sizeof(uint8_t *)); + if ((uint64_t)len*2 + 1 > INT_MAX) + return AVERROR(EINVAL); + if (!(*out_val = av_malloc(len*2 + 1))) + return AVERROR(ENOMEM); + if (!len) { + *out_val[0] = '\0'; + return 0; + } + bin = *(uint8_t**)dst; + for (i = 0; i < len; i++) + snprintf(*out_val + i*2, 3, "%02X", bin[i]); + return 0; + case AV_OPT_TYPE_SAMPLE_FMT: + ret = snprintf(buf, sizeof(buf), "%s", (char *)av_x_if_null(av_get_sample_fmt_name(*(enum AVSampleFormat *)dst), "none")); + break; + case AV_OPT_TYPE_DURATION: + i64 = *(int64_t *)dst; + format_duration(buf, sizeof(buf), i64); + ret = strlen(buf); // no overflow possible, checked by an assert + break; + case AV_OPT_TYPE_CHANNEL_LAYOUT: + i64 = *(int64_t *)dst; + ret = snprintf(buf, sizeof(buf), "0x%"PRIx64, i64); + break; + default: + return AVERROR(EINVAL); + } + + if (ret >= sizeof(buf)) + return AVERROR(EINVAL); + *out_val = av_strdup(buf); + return *out_val ? 0 : AVERROR(ENOMEM); +} + +static int get_number(void *obj, const char *name, const AVOption **o_out, double *num, int *den, int64_t *intnum, + int search_flags) +{ + void *dst, *target_obj; + const AVOption *o = av_opt_find2(obj, name, NULL, 0, search_flags, &target_obj); + if (!o || !target_obj) + goto error; + + dst = ((uint8_t*)target_obj) + o->offset; + + if (o_out) *o_out= o; + + return read_number(o, dst, num, den, intnum); + +error: + *den=*intnum=0; + return -1; +} + +int av_opt_get_int(void *obj, const char *name, int search_flags, int64_t *out_val) +{ + int64_t intnum = 1; + double num = 1; + int ret, den = 1; + + if ((ret = get_number(obj, name, NULL, &num, &den, &intnum, search_flags)) < 0) + return ret; + *out_val = num*intnum/den; + return 0; +} + +int av_opt_get_double(void *obj, const char *name, int search_flags, double *out_val) +{ + int64_t intnum = 1; + double num = 1; + int ret, den = 1; + + if ((ret = get_number(obj, name, NULL, &num, &den, &intnum, search_flags)) < 0) + return ret; + *out_val = num*intnum/den; + return 0; +} + +int av_opt_get_q(void *obj, const char *name, int search_flags, AVRational *out_val) +{ + int64_t intnum = 1; + double num = 1; + int ret, den = 1; + + if ((ret = get_number(obj, name, NULL, &num, &den, &intnum, search_flags)) < 0) + return ret; + + if (num == 1.0 && (int)intnum == intnum) + *out_val = (AVRational){intnum, den}; + else + *out_val = av_d2q(num*intnum/den, 1<<24); + return 0; +} + +static int get_format(void *obj, const char *name, int search_flags, int *out_fmt, + enum AVOptionType type, const char *desc) +{ + void *dst, *target_obj; + const AVOption *o = av_opt_find2(obj, name, NULL, 0, search_flags, &target_obj); + if (!o || !target_obj) + return AVERROR_OPTION_NOT_FOUND; + if (o->type != type) { + av_log(obj, AV_LOG_ERROR, + "The value for option '%s' is not a %s format.\n", desc, name); + return AVERROR(EINVAL); + } + + dst = ((uint8_t*)target_obj) + o->offset; + *out_fmt = *(int *)dst; + return 0; +} + +int av_opt_get_pixel_fmt(void *obj, const char *name, int search_flags, enum AVPixelFormat *out_fmt) +{ + return get_format(obj, name, search_flags, out_fmt, AV_OPT_TYPE_PIXEL_FMT, "pixel"); +} + +int av_opt_get_sample_fmt(void *obj, const char *name, int search_flags, enum AVSampleFormat *out_fmt) +{ + return get_format(obj, name, search_flags, out_fmt, AV_OPT_TYPE_SAMPLE_FMT, "sample"); +} + +int av_opt_get_channel_layout(void *obj, const char *name, int search_flags, int64_t *cl) +{ + void *dst, *target_obj; + const AVOption *o = av_opt_find2(obj, name, NULL, 0, search_flags, &target_obj); + if (!o || !target_obj) + return AVERROR_OPTION_NOT_FOUND; + if (o->type != AV_OPT_TYPE_CHANNEL_LAYOUT) { + av_log(obj, AV_LOG_ERROR, + "The value for option '%s' is not a channel layout.\n", name); + return AVERROR(EINVAL); + } + + dst = ((uint8_t*)target_obj) + o->offset; + *cl = *(int64_t *)dst; + return 0; +} + +int av_opt_get_dict_val(void *obj, const char *name, int search_flags, AVDictionary **out_val) +{ + void *target_obj; + AVDictionary *src; + const AVOption *o = av_opt_find2(obj, name, NULL, 0, search_flags, &target_obj); + + if (!o || !target_obj) + return AVERROR_OPTION_NOT_FOUND; + if (o->type != AV_OPT_TYPE_DICT) + return AVERROR(EINVAL); + + src = *(AVDictionary **)(((uint8_t *)target_obj) + o->offset); + av_dict_copy(out_val, src, 0); + + return 0; +} + +int av_opt_flag_is_set(void *obj, const char *field_name, const char *flag_name) +{ + const AVOption *field = av_opt_find(obj, field_name, NULL, 0, 0); + const AVOption *flag = av_opt_find(obj, flag_name, + field ? field->unit : NULL, 0, 0); + int64_t res; + + if (!field || !flag || flag->type != AV_OPT_TYPE_CONST || + av_opt_get_int(obj, field_name, 0, &res) < 0) + return 0; + return res & flag->default_val.i64; +} + +static void log_value(void *av_log_obj, int level, double d) +{ + if (d == INT_MAX) { + av_log(av_log_obj, level, "INT_MAX"); + } else if (d == INT_MIN) { + av_log(av_log_obj, level, "INT_MIN"); + } else if (d == UINT32_MAX) { + av_log(av_log_obj, level, "UINT32_MAX"); + } else if (d == (double)INT64_MAX) { + av_log(av_log_obj, level, "I64_MAX"); + } else if (d == INT64_MIN) { + av_log(av_log_obj, level, "I64_MIN"); + } else if (d == FLT_MAX) { + av_log(av_log_obj, level, "FLT_MAX"); + } else if (d == FLT_MIN) { + av_log(av_log_obj, level, "FLT_MIN"); + } else if (d == -FLT_MAX) { + av_log(av_log_obj, level, "-FLT_MAX"); + } else if (d == -FLT_MIN) { + av_log(av_log_obj, level, "-FLT_MIN"); + } else if (d == DBL_MAX) { + av_log(av_log_obj, level, "DBL_MAX"); + } else if (d == DBL_MIN) { + av_log(av_log_obj, level, "DBL_MIN"); + } else if (d == -DBL_MAX) { + av_log(av_log_obj, level, "-DBL_MAX"); + } else if (d == -DBL_MIN) { + av_log(av_log_obj, level, "-DBL_MIN"); + } else { + av_log(av_log_obj, level, "%g", d); + } +} + +static const char *get_opt_const_name(void *obj, const char *unit, int64_t value) +{ + const AVOption *opt = NULL; + + if (!unit) + return NULL; + while ((opt = av_opt_next(obj, opt))) + if (opt->type == AV_OPT_TYPE_CONST && !strcmp(opt->unit, unit) && + opt->default_val.i64 == value) + return opt->name; + return NULL; +} + +static char *get_opt_flags_string(void *obj, const char *unit, int64_t value) +{ + const AVOption *opt = NULL; + char flags[512]; + + flags[0] = 0; + if (!unit) + return NULL; + while ((opt = av_opt_next(obj, opt))) { + if (opt->type == AV_OPT_TYPE_CONST && !strcmp(opt->unit, unit) && + opt->default_val.i64 & value) { + if (flags[0]) + av_strlcatf(flags, sizeof(flags), "+"); + av_strlcatf(flags, sizeof(flags), "%s", opt->name); + } + } + if (flags[0]) + return av_strdup(flags); + return NULL; +} + +static void opt_list(void *obj, void *av_log_obj, const char *unit, + int req_flags, int rej_flags) +{ + const AVOption *opt=NULL; + AVOptionRanges *r; + int i; + + while ((opt = av_opt_next(obj, opt))) { + if (!(opt->flags & req_flags) || (opt->flags & rej_flags)) + continue; + + /* Don't print CONST's on level one. + * Don't print anything but CONST's on level two. + * Only print items from the requested unit. + */ + if (!unit && opt->type==AV_OPT_TYPE_CONST) + continue; + else if (unit && opt->type!=AV_OPT_TYPE_CONST) + continue; + else if (unit && opt->type==AV_OPT_TYPE_CONST && strcmp(unit, opt->unit)) + continue; + else if (unit && opt->type == AV_OPT_TYPE_CONST) + av_log(av_log_obj, AV_LOG_INFO, " %-15s ", opt->name); + else + av_log(av_log_obj, AV_LOG_INFO, " %s%-17s ", + (opt->flags & AV_OPT_FLAG_FILTERING_PARAM) ? "" : "-", + opt->name); + + switch (opt->type) { + case AV_OPT_TYPE_FLAGS: + av_log(av_log_obj, AV_LOG_INFO, "%-12s ", ""); + break; + case AV_OPT_TYPE_INT: + av_log(av_log_obj, AV_LOG_INFO, "%-12s ", ""); + break; + case AV_OPT_TYPE_INT64: + av_log(av_log_obj, AV_LOG_INFO, "%-12s ", ""); + break; + case AV_OPT_TYPE_DOUBLE: + av_log(av_log_obj, AV_LOG_INFO, "%-12s ", ""); + break; + case AV_OPT_TYPE_FLOAT: + av_log(av_log_obj, AV_LOG_INFO, "%-12s ", ""); + break; + case AV_OPT_TYPE_STRING: + av_log(av_log_obj, AV_LOG_INFO, "%-12s ", ""); + break; + case AV_OPT_TYPE_RATIONAL: + av_log(av_log_obj, AV_LOG_INFO, "%-12s ", ""); + break; + case AV_OPT_TYPE_BINARY: + av_log(av_log_obj, AV_LOG_INFO, "%-12s ", ""); + break; + case AV_OPT_TYPE_IMAGE_SIZE: + av_log(av_log_obj, AV_LOG_INFO, "%-12s ", ""); + break; + case AV_OPT_TYPE_VIDEO_RATE: + av_log(av_log_obj, AV_LOG_INFO, "%-12s ", ""); + break; + case AV_OPT_TYPE_PIXEL_FMT: + av_log(av_log_obj, AV_LOG_INFO, "%-12s ", ""); + break; + case AV_OPT_TYPE_SAMPLE_FMT: + av_log(av_log_obj, AV_LOG_INFO, "%-12s ", ""); + break; + case AV_OPT_TYPE_DURATION: + av_log(av_log_obj, AV_LOG_INFO, "%-12s ", ""); + break; + case AV_OPT_TYPE_COLOR: + av_log(av_log_obj, AV_LOG_INFO, "%-12s ", ""); + break; + case AV_OPT_TYPE_CHANNEL_LAYOUT: + av_log(av_log_obj, AV_LOG_INFO, "%-12s ", ""); + break; + case AV_OPT_TYPE_BOOL: + av_log(av_log_obj, AV_LOG_INFO, "%-12s ", ""); + break; + case AV_OPT_TYPE_CONST: + default: + av_log(av_log_obj, AV_LOG_INFO, "%-12s ", ""); + break; + } + av_log(av_log_obj, AV_LOG_INFO, "%c", (opt->flags & AV_OPT_FLAG_ENCODING_PARAM) ? 'E' : '.'); + av_log(av_log_obj, AV_LOG_INFO, "%c", (opt->flags & AV_OPT_FLAG_DECODING_PARAM) ? 'D' : '.'); + av_log(av_log_obj, AV_LOG_INFO, "%c", (opt->flags & AV_OPT_FLAG_FILTERING_PARAM)? 'F' : '.'); + av_log(av_log_obj, AV_LOG_INFO, "%c", (opt->flags & AV_OPT_FLAG_VIDEO_PARAM ) ? 'V' : '.'); + av_log(av_log_obj, AV_LOG_INFO, "%c", (opt->flags & AV_OPT_FLAG_AUDIO_PARAM ) ? 'A' : '.'); + av_log(av_log_obj, AV_LOG_INFO, "%c", (opt->flags & AV_OPT_FLAG_SUBTITLE_PARAM) ? 'S' : '.'); + av_log(av_log_obj, AV_LOG_INFO, "%c", (opt->flags & AV_OPT_FLAG_EXPORT) ? 'X' : '.'); + av_log(av_log_obj, AV_LOG_INFO, "%c", (opt->flags & AV_OPT_FLAG_READONLY) ? 'R' : '.'); + + if (opt->help) + av_log(av_log_obj, AV_LOG_INFO, " %s", opt->help); + + if (av_opt_query_ranges(&r, obj, opt->name, AV_OPT_SEARCH_FAKE_OBJ) >= 0) { + switch (opt->type) { + case AV_OPT_TYPE_INT: + case AV_OPT_TYPE_INT64: + case AV_OPT_TYPE_DOUBLE: + case AV_OPT_TYPE_FLOAT: + case AV_OPT_TYPE_RATIONAL: + for (i = 0; i < r->nb_ranges; i++) { + av_log(av_log_obj, AV_LOG_INFO, " (from "); + log_value(av_log_obj, AV_LOG_INFO, r->range[i]->value_min); + av_log(av_log_obj, AV_LOG_INFO, " to "); + log_value(av_log_obj, AV_LOG_INFO, r->range[i]->value_max); + av_log(av_log_obj, AV_LOG_INFO, ")"); + } + break; + } + av_opt_freep_ranges(&r); + } + + if (opt->type != AV_OPT_TYPE_CONST && + opt->type != AV_OPT_TYPE_BINARY && + !((opt->type == AV_OPT_TYPE_COLOR || + opt->type == AV_OPT_TYPE_IMAGE_SIZE || + opt->type == AV_OPT_TYPE_STRING || + opt->type == AV_OPT_TYPE_VIDEO_RATE) && + !opt->default_val.str)) { + av_log(av_log_obj, AV_LOG_INFO, " (default "); + switch (opt->type) { + case AV_OPT_TYPE_BOOL: + av_log(av_log_obj, AV_LOG_INFO, "%s", (char *)av_x_if_null(get_bool_name(opt->default_val.i64), "invalid")); + break; + case AV_OPT_TYPE_FLAGS: { + char *def_flags = get_opt_flags_string(obj, opt->unit, opt->default_val.i64); + if (def_flags) { + av_log(av_log_obj, AV_LOG_INFO, "%s", def_flags); + av_freep(&def_flags); + } else { + av_log(av_log_obj, AV_LOG_INFO, "%"PRIX64, opt->default_val.i64); + } + break; + } + case AV_OPT_TYPE_DURATION: { + char buf[25]; + format_duration(buf, sizeof(buf), opt->default_val.i64); + av_log(av_log_obj, AV_LOG_INFO, "%s", buf); + break; + } + case AV_OPT_TYPE_INT: + case AV_OPT_TYPE_INT64: { + const char *def_const = get_opt_const_name(obj, opt->unit, opt->default_val.i64); + if (def_const) + av_log(av_log_obj, AV_LOG_INFO, "%s", def_const); + else + log_value(av_log_obj, AV_LOG_INFO, opt->default_val.i64); + break; + } + case AV_OPT_TYPE_DOUBLE: + case AV_OPT_TYPE_FLOAT: + log_value(av_log_obj, AV_LOG_INFO, opt->default_val.dbl); + break; + case AV_OPT_TYPE_RATIONAL: { + AVRational q = av_d2q(opt->default_val.dbl, INT_MAX); + av_log(av_log_obj, AV_LOG_INFO, "%d/%d", q.num, q.den); } + break; + case AV_OPT_TYPE_SAMPLE_FMT: + av_log(av_log_obj, AV_LOG_INFO, "%s", (char *)av_x_if_null(av_get_sample_fmt_name(opt->default_val.i64), "none")); + break; + case AV_OPT_TYPE_COLOR: + case AV_OPT_TYPE_IMAGE_SIZE: + case AV_OPT_TYPE_STRING: + case AV_OPT_TYPE_VIDEO_RATE: + av_log(av_log_obj, AV_LOG_INFO, "\"%s\"", opt->default_val.str); + break; + case AV_OPT_TYPE_CHANNEL_LAYOUT: + av_log(av_log_obj, AV_LOG_INFO, "0x%"PRIx64, opt->default_val.i64); + break; + } + av_log(av_log_obj, AV_LOG_INFO, ")"); + } + + av_log(av_log_obj, AV_LOG_INFO, "\n"); + if (opt->unit && opt->type != AV_OPT_TYPE_CONST) { + opt_list(obj, av_log_obj, opt->unit, req_flags, rej_flags); + } + } +} + +int av_opt_show2(void *obj, void *av_log_obj, int req_flags, int rej_flags) +{ + if (!obj) + return -1; + + av_log(av_log_obj, AV_LOG_INFO, "%s AVOptions:\n", (*(AVClass**)obj)->class_name); + + opt_list(obj, av_log_obj, NULL, req_flags, rej_flags); + + return 0; +} + +void av_opt_set_defaults(void *s) +{ + av_opt_set_defaults2(s, 0, 0); +} + +void av_opt_set_defaults2(void *s, int mask, int flags) +{ + const AVOption *opt = NULL; + while ((opt = av_opt_next(s, opt))) { + void *dst = ((uint8_t*)s) + opt->offset; + + if ((opt->flags & mask) != flags) + continue; + + if (opt->flags & AV_OPT_FLAG_READONLY) + continue; + + switch (opt->type) { + case AV_OPT_TYPE_CONST: + /* Nothing to be done here */ + break; + case AV_OPT_TYPE_BOOL: + case AV_OPT_TYPE_FLAGS: + case AV_OPT_TYPE_INT: + case AV_OPT_TYPE_INT64: + case AV_OPT_TYPE_DURATION: + case AV_OPT_TYPE_CHANNEL_LAYOUT: + case AV_OPT_TYPE_PIXEL_FMT: + case AV_OPT_TYPE_SAMPLE_FMT: + write_number(s, opt, dst, 1, 1, opt->default_val.i64); + break; + case AV_OPT_TYPE_DOUBLE: + case AV_OPT_TYPE_FLOAT: { + double val; + val = opt->default_val.dbl; + write_number(s, opt, dst, val, 1, 1); + } + break; + case AV_OPT_TYPE_RATIONAL: { + AVRational val; + val = av_d2q(opt->default_val.dbl, INT_MAX); + write_number(s, opt, dst, 1, val.den, val.num); + } + break; + case AV_OPT_TYPE_STRING: + set_string(s, opt, opt->default_val.str, dst); + break; + case AV_OPT_TYPE_BINARY: + set_string_binary(s, opt, opt->default_val.str, dst); + break; + case AV_OPT_TYPE_DICT: + /* Cannot set defaults for these types */ + break; + default: + av_log(s, AV_LOG_DEBUG, "AVOption type %d of option %s not implemented yet\n", opt->type, opt->name); + } + } +} + +/** + * Store the value in the field in ctx that is named like key. + * ctx must be an AVClass context, storing is done using AVOptions. + * + * @param buf the string to parse, buf will be updated to point at the + * separator just after the parsed key/value pair + * @param key_val_sep a 0-terminated list of characters used to + * separate key from value + * @param pairs_sep a 0-terminated list of characters used to separate + * two pairs from each other + * @return 0 if the key/value pair has been successfully parsed and + * set, or a negative value corresponding to an AVERROR code in case + * of error: + * AVERROR(EINVAL) if the key/value pair cannot be parsed, + * the error code issued by av_opt_set() if the key/value pair + * cannot be set + */ +static int parse_key_value_pair(void *ctx, const char **buf, + const char *key_val_sep, const char *pairs_sep) +{ + char *key = av_get_token(buf, key_val_sep); + char *val; + int ret; + + if (!key) + return AVERROR(ENOMEM); + + if (*key && strspn(*buf, key_val_sep)) { + (*buf)++; + val = av_get_token(buf, pairs_sep); + if (!val) { + av_freep(&key); + return AVERROR(ENOMEM); + } + } else { + av_log(ctx, AV_LOG_ERROR, "Missing key or no key/value separator found after key '%s'\n", key); + av_free(key); + return AVERROR(EINVAL); + } + + av_log(ctx, AV_LOG_DEBUG, "Setting entry with key '%s' to value '%s'\n", key, val); + + ret = av_opt_set(ctx, key, val, AV_OPT_SEARCH_CHILDREN); + if (ret == AVERROR_OPTION_NOT_FOUND) + av_log(ctx, AV_LOG_ERROR, "Key '%s' not found.\n", key); + + av_free(key); + av_free(val); + return ret; +} + +#define WHITESPACES " \n\t" + +static int is_key_char(char c) +{ + return (unsigned)((c | 32) - 'a') < 26 || + (unsigned)(c - '0') < 10 || + c == '-' || c == '_' || c == '/' || c == '.'; +} + +/** + * Read a key from a string. + * + * The key consists of is_key_char characters and must be terminated by a + * character from the delim string; spaces are ignored. + * + * @return 0 for success (even with ellipsis), <0 for failure + */ +static int get_key(const char **ropts, const char *delim, char **rkey) +{ + const char *opts = *ropts; + const char *key_start, *key_end; + + key_start = opts += strspn(opts, WHITESPACES); + while (is_key_char(*opts)) + opts++; + key_end = opts; + opts += strspn(opts, WHITESPACES); + if (!*opts || !strchr(delim, *opts)) + return AVERROR(EINVAL); + opts++; + if (!(*rkey = av_malloc(key_end - key_start + 1))) + return AVERROR(ENOMEM); + memcpy(*rkey, key_start, key_end - key_start); + (*rkey)[key_end - key_start] = 0; + *ropts = opts; + return 0; +} + +int av_opt_get_key_value(const char **ropts, + const char *key_val_sep, const char *pairs_sep, + unsigned flags, + char **rkey, char **rval) +{ + int ret; + char *key = NULL, *val; + const char *opts = *ropts; + + if ((ret = get_key(&opts, key_val_sep, &key)) < 0 && + !(flags & AV_OPT_FLAG_IMPLICIT_KEY)) + return AVERROR(EINVAL); + if (!(val = av_get_token(&opts, pairs_sep))) { + av_free(key); + return AVERROR(ENOMEM); + } + *ropts = opts; + *rkey = key; + *rval = val; + return 0; +} + +void av_opt_free(void *obj) +{ + const AVOption *o = NULL; + while ((o = av_opt_next(obj, o))) { + switch (o->type) { + case AV_OPT_TYPE_STRING: + case AV_OPT_TYPE_BINARY: + av_freep((uint8_t *)obj + o->offset); + break; + + case AV_OPT_TYPE_DICT: + av_dict_free((AVDictionary **)(((uint8_t *)obj) + o->offset)); + break; + + default: + break; + } + } +} + +const AVOption *av_opt_find(void *obj, const char *name, const char *unit, + int opt_flags, int search_flags) +{ + return av_opt_find2(obj, name, unit, opt_flags, search_flags, NULL); +} + +const AVOption *av_opt_find2(void *obj, const char *name, const char *unit, + int opt_flags, int search_flags, void **target_obj) +{ + const AVClass *c; + const AVOption *o = NULL; + + if(!obj) + return NULL; + + c= *(AVClass**)obj; + + if (!c) + return NULL; + + if (search_flags & AV_OPT_SEARCH_CHILDREN) { + if (search_flags & AV_OPT_SEARCH_FAKE_OBJ) { + const AVClass *child = NULL; + while (child = av_opt_child_class_next(c, child)) + if (o = av_opt_find2(&child, name, unit, opt_flags, search_flags, NULL)) + return o; + } else { + void *child = NULL; + while (child = av_opt_child_next(obj, child)) + if (o = av_opt_find2(child, name, unit, opt_flags, search_flags, target_obj)) + return o; + } + } + + while (o = av_opt_next(obj, o)) { + if (!strcmp(o->name, name) && (o->flags & opt_flags) == opt_flags && + ((!unit && o->type != AV_OPT_TYPE_CONST) || + (unit && o->type == AV_OPT_TYPE_CONST && o->unit && !strcmp(o->unit, unit)))) { + if (target_obj) { + if (!(search_flags & AV_OPT_SEARCH_FAKE_OBJ)) + *target_obj = obj; + else + *target_obj = NULL; + } + return o; + } + } + return NULL; +} + +void *av_opt_child_next(void *obj, void *prev) +{ + const AVClass *c = *(AVClass**)obj; + if (c->child_next) + return c->child_next(obj, prev); + return NULL; +} + +const AVClass *av_opt_child_class_next(const AVClass *parent, const AVClass *prev) +{ + if (parent->child_class_next) + return parent->child_class_next(prev); + return NULL; +} + +void *av_opt_ptr(const AVClass *class, void *obj, const char *name) +{ + const AVOption *opt= av_opt_find2(&class, name, NULL, 0, AV_OPT_SEARCH_FAKE_OBJ, NULL); + if(!opt) + return NULL; + return (uint8_t*)obj + opt->offset; +} + +static int opt_size(enum AVOptionType type) +{ + switch(type) { + case AV_OPT_TYPE_BOOL: + case AV_OPT_TYPE_INT: + case AV_OPT_TYPE_FLAGS: return sizeof(int); + case AV_OPT_TYPE_DURATION: + case AV_OPT_TYPE_CHANNEL_LAYOUT: + case AV_OPT_TYPE_INT64: return sizeof(int64_t); + case AV_OPT_TYPE_DOUBLE: return sizeof(double); + case AV_OPT_TYPE_FLOAT: return sizeof(float); + case AV_OPT_TYPE_STRING: return sizeof(uint8_t*); + case AV_OPT_TYPE_VIDEO_RATE: + case AV_OPT_TYPE_RATIONAL: return sizeof(AVRational); + case AV_OPT_TYPE_BINARY: return sizeof(uint8_t*) + sizeof(int); + case AV_OPT_TYPE_IMAGE_SIZE:return sizeof(int[2]); + case AV_OPT_TYPE_PIXEL_FMT: return sizeof(enum AVPixelFormat); + case AV_OPT_TYPE_SAMPLE_FMT:return sizeof(enum AVSampleFormat); + case AV_OPT_TYPE_COLOR: return 4; + } + return 0; +} + +int av_opt_copy(void *dst, const void *src) +{ + const AVOption *o = NULL; + const AVClass *c; + int ret = 0; + + if (!src) + return 0; + + c = *(AVClass**)src; + if (*(AVClass**)dst && c != *(AVClass**)dst) + return AVERROR(EINVAL); + + while ((o = av_opt_next(src, o))) { + void *field_dst = ((uint8_t*)dst) + o->offset; + void *field_src = ((uint8_t*)src) + o->offset; + uint8_t **field_dst8 = (uint8_t**)field_dst; + uint8_t **field_src8 = (uint8_t**)field_src; + + if (o->type == AV_OPT_TYPE_STRING) { + if (*field_dst8 != *field_src8) + av_freep(field_dst8); + *field_dst8 = av_strdup(*field_src8); + if (*field_src8 && !*field_dst8) + ret = AVERROR(ENOMEM); + } else if (o->type == AV_OPT_TYPE_BINARY) { + int len = *(int*)(field_src8 + 1); + if (*field_dst8 != *field_src8) + av_freep(field_dst8); + *field_dst8 = av_memdup(*field_src8, len); + if (len && !*field_dst8) { + ret = AVERROR(ENOMEM); + len = 0; + } + *(int*)(field_dst8 + 1) = len; + } else if (o->type == AV_OPT_TYPE_CONST) { + // do nothing + } else if (o->type == AV_OPT_TYPE_DICT) { + AVDictionary **sdict = (AVDictionary **) field_src; + AVDictionary **ddict = (AVDictionary **) field_dst; + if (*sdict != *ddict) + av_dict_free(ddict); + *ddict = NULL; + av_dict_copy(ddict, *sdict, 0); + if (av_dict_count(*sdict) != av_dict_count(*ddict)) + ret = AVERROR(ENOMEM); + } else { + memcpy(field_dst, field_src, opt_size(o->type)); + } + } + return ret; +} + +int av_opt_query_ranges(AVOptionRanges **ranges_arg, void *obj, const char *key, int flags) +{ + int ret; + const AVClass *c = *(AVClass**)obj; + int (*callback)(AVOptionRanges **, void *obj, const char *key, int flags) = NULL; + + if (c->version > (52 << 16 | 11 << 8)) + callback = c->query_ranges; + + if (!callback) + callback = av_opt_query_ranges_default; + + ret = callback(ranges_arg, obj, key, flags); + if (ret >= 0) { + if (!(flags & AV_OPT_MULTI_COMPONENT_RANGE)) + ret = 1; + (*ranges_arg)->nb_components = ret; + } + return ret; +} + +int av_opt_query_ranges_default(AVOptionRanges **ranges_arg, void *obj, const char *key, int flags) +{ + AVOptionRanges *ranges = av_mallocz(sizeof(*ranges)); + AVOptionRange **range_array = av_mallocz(sizeof(void*)); + AVOptionRange *range = av_mallocz(sizeof(*range)); + const AVOption *field = av_opt_find(obj, key, NULL, 0, flags); + int ret; + + *ranges_arg = NULL; + + if (!ranges || !range || !range_array || !field) { + ret = AVERROR(ENOMEM); + goto fail; + } + + ranges->range = range_array; + ranges->range[0] = range; + ranges->nb_ranges = 1; + ranges->nb_components = 1; + range->is_range = 1; + range->value_min = field->min; + range->value_max = field->max; + + switch (field->type) { + case AV_OPT_TYPE_BOOL: + case AV_OPT_TYPE_INT: + case AV_OPT_TYPE_INT64: + case AV_OPT_TYPE_PIXEL_FMT: + case AV_OPT_TYPE_SAMPLE_FMT: + case AV_OPT_TYPE_FLOAT: + case AV_OPT_TYPE_DOUBLE: + case AV_OPT_TYPE_DURATION: + case AV_OPT_TYPE_COLOR: + case AV_OPT_TYPE_CHANNEL_LAYOUT: + break; + case AV_OPT_TYPE_STRING: + range->component_min = 0; + range->component_max = 0x10FFFF; // max unicode value + range->value_min = -1; + range->value_max = INT_MAX; + break; + case AV_OPT_TYPE_RATIONAL: + range->component_min = INT_MIN; + range->component_max = INT_MAX; + break; + case AV_OPT_TYPE_IMAGE_SIZE: + range->component_min = 0; + range->component_max = INT_MAX/128/8; + range->value_min = 0; + range->value_max = INT_MAX/8; + break; + case AV_OPT_TYPE_VIDEO_RATE: + range->component_min = 1; + range->component_max = INT_MAX; + range->value_min = 1; + range->value_max = INT_MAX; + break; + default: + ret = AVERROR(ENOSYS); + goto fail; + } + + *ranges_arg = ranges; + return 1; +fail: + av_free(ranges); + av_free(range); + av_free(range_array); + return ret; +} + +void av_opt_freep_ranges(AVOptionRanges **rangesp) +{ + int i; + AVOptionRanges *ranges = *rangesp; + + if (!ranges) + return; + + for (i = 0; i < ranges->nb_ranges * ranges->nb_components; i++) { + AVOptionRange *range = ranges->range[i]; + if (range) { + av_freep(&range->str); + av_freep(&ranges->range[i]); + } + } + av_freep(&ranges->range); + av_freep(rangesp); +} + +int av_opt_is_set_to_default(void *obj, const AVOption *o) +{ + int64_t i64; + double d, d2; + float f; + AVRational q; + int ret, w, h; + char *str; + void *dst; + + if (!o || !obj) + return AVERROR(EINVAL); + + dst = ((uint8_t*)obj) + o->offset; + + switch (o->type) { + case AV_OPT_TYPE_CONST: + return 1; + case AV_OPT_TYPE_BOOL: + case AV_OPT_TYPE_FLAGS: + case AV_OPT_TYPE_SAMPLE_FMT: + case AV_OPT_TYPE_INT: + case AV_OPT_TYPE_CHANNEL_LAYOUT: + case AV_OPT_TYPE_DURATION: + case AV_OPT_TYPE_INT64: + read_number(o, dst, NULL, NULL, &i64); + return o->default_val.i64 == i64; + case AV_OPT_TYPE_STRING: + str = *(char **)dst; + if (str == o->default_val.str) //2 NULLs + return 1; + if (!str || !o->default_val.str) //1 NULL + return 0; + return !strcmp(str, o->default_val.str); + case AV_OPT_TYPE_DOUBLE: + read_number(o, dst, &d, NULL, NULL); + return o->default_val.dbl == d; + case AV_OPT_TYPE_FLOAT: + read_number(o, dst, &d, NULL, NULL); + f = o->default_val.dbl; + d2 = f; + return d2 == d; + case AV_OPT_TYPE_RATIONAL: + q = av_d2q(o->default_val.dbl, INT_MAX); + return !av_cmp_q(*(AVRational*)dst, q); + case AV_OPT_TYPE_BINARY: { + struct { + uint8_t *data; + int size; + } tmp = {0}; + int opt_size = *(int *)((void **)dst + 1); + void *opt_ptr = *(void **)dst; + if (!opt_size && (!o->default_val.str || !strlen(o->default_val.str))) + return 1; + if (!opt_size || !o->default_val.str || !strlen(o->default_val.str )) + return 0; + if (opt_size != strlen(o->default_val.str) / 2) + return 0; + ret = set_string_binary(NULL, NULL, o->default_val.str, &tmp.data); + if (!ret) + ret = !memcmp(opt_ptr, tmp.data, tmp.size); + av_free(tmp.data); + return ret; + } + case AV_OPT_TYPE_DICT: + /* Binary and dict have not default support yet. Any pointer is not default. */ + return !!(*(void **)dst); + + default: + av_log(obj, AV_LOG_WARNING, "Not supported option type: %d, option name: %s\n", o->type, o->name); + break; + } + return AVERROR_PATCHWELCOME; +} + +int av_opt_is_set_to_default_by_name(void *obj, const char *name, int search_flags) +{ + const AVOption *o; + void *target; + if (!obj) + return AVERROR(EINVAL); + o = av_opt_find2(obj, name, NULL, 0, search_flags, &target); + if (!o) + return AVERROR_OPTION_NOT_FOUND; + return av_opt_is_set_to_default(target, o); +} + +#ifdef TEST + +typedef struct TestContext +{ + const AVClass *class; + int num; + int toggle; + char *string; + int flags; + AVRational rational; + AVRational video_rate; + int w, h; + enum AVPixelFormat pix_fmt; + enum AVSampleFormat sample_fmt; + int64_t duration; + uint8_t color[4]; + int64_t channel_layout; + void *binary; + int binary_size; + void *binary1; + int binary_size1; + void *binary2; + int binary_size2; + int64_t num64; + float flt; + double dbl; + char *escape; + int bool1; + int bool2; + int bool3; +} TestContext; + +#define OFFSET(x) offsetof(TestContext, x) + +#define TEST_FLAG_COOL 01 +#define TEST_FLAG_LAME 02 +#define TEST_FLAG_MU 04 + +static const AVOption test_options[]= { +{"num", "set num", OFFSET(num), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 100, 1 }, +{"toggle", "set toggle", OFFSET(toggle), AV_OPT_TYPE_INT, {.i64 = 1}, 0, 1, 1 }, +{"rational", "set rational", OFFSET(rational), AV_OPT_TYPE_RATIONAL, {.dbl = 1}, 0, 10, 1 }, +{"string", "set string", OFFSET(string), AV_OPT_TYPE_STRING, {.str = "default"}, CHAR_MIN, CHAR_MAX, 1 }, +{"escape", "set escape str", OFFSET(escape), AV_OPT_TYPE_STRING, {.str = "\\=,"}, CHAR_MIN, CHAR_MAX, 1 }, +{"flags", "set flags", OFFSET(flags), AV_OPT_TYPE_FLAGS, {.i64 = 1}, 0, INT_MAX, 1, "flags" }, +{"cool", "set cool flag", 0, AV_OPT_TYPE_CONST, {.i64 = TEST_FLAG_COOL}, INT_MIN, INT_MAX, 1, "flags" }, +{"lame", "set lame flag", 0, AV_OPT_TYPE_CONST, {.i64 = TEST_FLAG_LAME}, INT_MIN, INT_MAX, 1, "flags" }, +{"mu", "set mu flag", 0, AV_OPT_TYPE_CONST, {.i64 = TEST_FLAG_MU}, INT_MIN, INT_MAX, 1, "flags" }, +{"size", "set size", OFFSET(w), AV_OPT_TYPE_IMAGE_SIZE,{.str="200x300"}, 0, 0, 1}, +{"pix_fmt", "set pixfmt", OFFSET(pix_fmt), AV_OPT_TYPE_PIXEL_FMT, {.i64 = AV_PIX_FMT_0BGR}, -1, INT_MAX, 1}, +{"sample_fmt", "set samplefmt", OFFSET(sample_fmt), AV_OPT_TYPE_SAMPLE_FMT, {.i64 = AV_SAMPLE_FMT_S16}, -1, INT_MAX, 1}, +{"video_rate", "set videorate", OFFSET(video_rate), AV_OPT_TYPE_VIDEO_RATE, {.str = "25"}, 0, 0 , 1}, +{"duration", "set duration", OFFSET(duration), AV_OPT_TYPE_DURATION, {.i64 = 1000}, 0, INT64_MAX, 1}, +{"color", "set color", OFFSET(color), AV_OPT_TYPE_COLOR, {.str = "pink"}, 0, 0, 1}, +{"cl", "set channel layout", OFFSET(channel_layout), AV_OPT_TYPE_CHANNEL_LAYOUT, {.i64 = AV_CH_LAYOUT_HEXAGONAL}, 0, INT64_MAX, 1}, +{"bin", "set binary value", OFFSET(binary), AV_OPT_TYPE_BINARY, {.str="62696e00"}, 0, 0, 1 }, +{"bin1", "set binary value", OFFSET(binary1), AV_OPT_TYPE_BINARY, {.str=NULL}, 0, 0, 1 }, +{"bin2", "set binary value", OFFSET(binary2), AV_OPT_TYPE_BINARY, {.str=""}, 0, 0, 1 }, +{"num64", "set num 64bit", OFFSET(num64), AV_OPT_TYPE_INT64, {.i64 = 1}, 0, 100, 1 }, +{"flt", "set float", OFFSET(flt), AV_OPT_TYPE_FLOAT, {.dbl = 1.0/3}, 0, 100, 1}, +{"dbl", "set double", OFFSET(dbl), AV_OPT_TYPE_DOUBLE, {.dbl = 1.0/3}, 0, 100, 1 }, +{"bool1", "set boolean value", OFFSET(bool1), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, 1 }, +{"bool2", "set boolean value", OFFSET(bool2), AV_OPT_TYPE_BOOL, {.i64 = 1}, -1, 1, 1 }, +{"bool3", "set boolean value", OFFSET(bool3), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, 1 }, +{NULL}, +}; + +static const char *test_get_name(void *ctx) +{ + return "test"; +} + +static const AVClass test_class = { + "TestContext", + test_get_name, + test_options +}; + +static void log_callback_help(void *ptr, int level, const char *fmt, va_list vl) +{ + vfprintf(stdout, fmt, vl); +} + +int main(void) +{ + int i; + + av_log_set_level(AV_LOG_DEBUG); + av_log_set_callback(log_callback_help); + + printf("Testing default values\n"); + { + TestContext test_ctx = { 0 }; + test_ctx.class = &test_class; + av_opt_set_defaults(&test_ctx); + + printf("num=%d\n", test_ctx.num); + printf("toggle=%d\n", test_ctx.toggle); + printf("string=%s\n", test_ctx.string); + printf("escape=%s\n", test_ctx.escape); + printf("flags=%d\n", test_ctx.flags); + printf("rational=%d/%d\n", test_ctx.rational.num, test_ctx.rational.den); + printf("video_rate=%d/%d\n", test_ctx.video_rate.num, test_ctx.video_rate.den); + printf("width=%d height=%d\n", test_ctx.w, test_ctx.h); + printf("pix_fmt=%s\n", av_get_pix_fmt_name(test_ctx.pix_fmt)); + printf("sample_fmt=%s\n", av_get_sample_fmt_name(test_ctx.sample_fmt)); + printf("duration=%"PRId64"\n", test_ctx.duration); + printf("color=%d %d %d %d\n", test_ctx.color[0], test_ctx.color[1], test_ctx.color[2], test_ctx.color[3]); + printf("channel_layout=%"PRId64"=%"PRId64"\n", test_ctx.channel_layout, (int64_t)AV_CH_LAYOUT_HEXAGONAL); + if (test_ctx.binary) + printf("binary=%x %x %x %x\n", ((uint8_t*)test_ctx.binary)[0], ((uint8_t*)test_ctx.binary)[1], ((uint8_t*)test_ctx.binary)[2], ((uint8_t*)test_ctx.binary)[3]); + printf("binary_size=%d\n", test_ctx.binary_size); + printf("num64=%"PRId64"\n", test_ctx.num64); + printf("flt=%.6f\n", test_ctx.flt); + printf("dbl=%.6f\n", test_ctx.dbl); + + av_opt_show2(&test_ctx, NULL, -1, 0); + + av_opt_free(&test_ctx); + } + + printf("\nTesting av_opt_is_set_to_default()\n"); + { + int ret; + TestContext test_ctx = { 0 }; + const AVOption *o = NULL; + test_ctx.class = &test_class; + + av_log_set_level(AV_LOG_QUIET); + + while (o = av_opt_next(&test_ctx, o)) { + ret = av_opt_is_set_to_default_by_name(&test_ctx, o->name, 0); + printf("name:%10s default:%d error:%s\n", o->name, !!ret, ret < 0 ? av_err2str(ret) : ""); + } + av_opt_set_defaults(&test_ctx); + while (o = av_opt_next(&test_ctx, o)) { + ret = av_opt_is_set_to_default_by_name(&test_ctx, o->name, 0); + printf("name:%10s default:%d error:%s\n", o->name, !!ret, ret < 0 ? av_err2str(ret) : ""); + } + av_opt_free(&test_ctx); + } + + printf("\nTest av_opt_serialize()\n"); + { + TestContext test_ctx = { 0 }; + char *buf; + test_ctx.class = &test_class; + + av_log_set_level(AV_LOG_QUIET); + + av_opt_set_defaults(&test_ctx); + if (av_opt_serialize(&test_ctx, 0, 0, &buf, '=', ',') >= 0) { + printf("%s\n", buf); + av_opt_free(&test_ctx); + memset(&test_ctx, 0, sizeof(test_ctx)); + test_ctx.class = &test_class; + av_set_options_string(&test_ctx, buf, "=", ","); + av_free(buf); + if (av_opt_serialize(&test_ctx, 0, 0, &buf, '=', ',') >= 0) { + printf("%s\n", buf); + av_free(buf); + } + } + av_opt_free(&test_ctx); + } + + printf("\nTesting av_set_options_string()\n"); + { + TestContext test_ctx = { 0 }; + static const char * const options[] = { + "", + ":", + "=", + "foo=:", + ":=foo", + "=foo", + "foo=", + "foo", + "foo=val", + "foo==val", + "toggle=:", + "string=:", + "toggle=1 : foo", + "toggle=100", + "toggle==1", + "flags=+mu-lame : num=42: toggle=0", + "num=42 : string=blahblah", + "rational=0 : rational=1/2 : rational=1/-1", + "rational=-1/0", + "size=1024x768", + "size=pal", + "size=bogus", + "pix_fmt=yuv420p", + "pix_fmt=2", + "pix_fmt=bogus", + "sample_fmt=s16", + "sample_fmt=2", + "sample_fmt=bogus", + "video_rate=pal", + "video_rate=25", + "video_rate=30000/1001", + "video_rate=30/1.001", + "video_rate=bogus", + "duration=bogus", + "duration=123.45", + "duration=1\\:23\\:45.67", + "color=blue", + "color=0x223300", + "color=0x42FF07AA", + "cl=stereo+downmix", + "cl=foo", + "bin=boguss", + "bin=111", + "bin=ffff", + "num64=bogus", + "num64=44", + "num64=44.4", + "num64=-1", + "num64=101", + "flt=bogus", + "flt=2", + "flt=2.2", + "flt=-1", + "flt=101", + "dbl=bogus", + "dbl=2", + "dbl=2.2", + "dbl=-1", + "dbl=101", + "bool1=true", + "bool2=auto", + }; + + test_ctx.class = &test_class; + av_opt_set_defaults(&test_ctx); + + av_log_set_level(AV_LOG_QUIET); + + for (i=0; i < FF_ARRAY_ELEMS(options); i++) { + int silence_log = !strcmp(options[i], "rational=-1/0"); // inf formating differs between platforms + av_log(&test_ctx, AV_LOG_DEBUG, "Setting options string '%s'\n", options[i]); + if (silence_log) + av_log_set_callback(NULL); + if (av_set_options_string(&test_ctx, options[i], "=", ":") < 0) + printf("Error '%s'\n", options[i]); + else + printf("OK '%s'\n", options[i]); + av_log_set_callback(log_callback_help); + } + av_opt_free(&test_ctx); + } + + printf("\nTesting av_opt_set_from_string()\n"); + { + TestContext test_ctx = { 0 }; + static const char * const options[] = { + "", + "5", + "5:hello", + "5:hello:size=pal", + "5:size=pal:hello", + ":", + "=", + " 5 : hello : size = pal ", + "a_very_long_option_name_that_will_need_to_be_ellipsized_around_here=42" + }; + static const char * const shorthand[] = { "num", "string", NULL }; + + test_ctx.class = &test_class; + av_opt_set_defaults(&test_ctx); + + av_log_set_level(AV_LOG_QUIET); + + for (i=0; i < FF_ARRAY_ELEMS(options); i++) { + av_log(&test_ctx, AV_LOG_DEBUG, "Setting options string '%s'\n", options[i]); + if (av_opt_set_from_string(&test_ctx, options[i], shorthand, "=", ":") < 0) + printf("Error '%s'\n", options[i]); + else + printf("OK '%s'\n", options[i]); + } + av_opt_free(&test_ctx); + } + + return 0; +} + +#endif diff --git a/ext/at3_standalone/opt.h b/ext/at3_standalone/opt.h new file mode 100644 index 0000000000..753434d628 --- /dev/null +++ b/ext/at3_standalone/opt.h @@ -0,0 +1,865 @@ +/* + * AVOptions + * copyright (c) 2005 Michael Niedermayer + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVUTIL_OPT_H +#define AVUTIL_OPT_H + +/** + * @file + * AVOptions + */ + +#include "rational.h" +#include "avutil.h" +#include "dict.h" +#include "log.h" +#include "pixfmt.h" +#include "samplefmt.h" +#include "version.h" + +/** + * @defgroup avoptions AVOptions + * @ingroup lavu_data + * @{ + * AVOptions provide a generic system to declare options on arbitrary structs + * ("objects"). An option can have a help text, a type and a range of possible + * values. Options may then be enumerated, read and written to. + * + * @section avoptions_implement Implementing AVOptions + * This section describes how to add AVOptions capabilities to a struct. + * + * All AVOptions-related information is stored in an AVClass. Therefore + * the first member of the struct should be a pointer to an AVClass describing it. + * The option field of the AVClass must be set to a NULL-terminated static array + * of AVOptions. Each AVOption must have a non-empty name, a type, a default + * value and for number-type AVOptions also a range of allowed values. It must + * also declare an offset in bytes from the start of the struct, where the field + * associated with this AVOption is located. Other fields in the AVOption struct + * should also be set when applicable, but are not required. + * + * The following example illustrates an AVOptions-enabled struct: + * @code + * typedef struct test_struct { + * AVClass *class; + * int int_opt; + * char *str_opt; + * uint8_t *bin_opt; + * int bin_len; + * } test_struct; + * + * static const AVOption test_options[] = { + * { "test_int", "This is a test option of int type.", offsetof(test_struct, int_opt), + * AV_OPT_TYPE_INT, { .i64 = -1 }, INT_MIN, INT_MAX }, + * { "test_str", "This is a test option of string type.", offsetof(test_struct, str_opt), + * AV_OPT_TYPE_STRING }, + * { "test_bin", "This is a test option of binary type.", offsetof(test_struct, bin_opt), + * AV_OPT_TYPE_BINARY }, + * { NULL }, + * }; + * + * static const AVClass test_class = { + * .class_name = "test class", + * .item_name = av_default_item_name, + * .option = test_options, + * .version = LIBAVUTIL_VERSION_INT, + * }; + * @endcode + * + * Next, when allocating your struct, you must ensure that the AVClass pointer + * is set to the correct value. Then, av_opt_set_defaults() can be called to + * initialize defaults. After that the struct is ready to be used with the + * AVOptions API. + * + * When cleaning up, you may use the av_opt_free() function to automatically + * free all the allocated string and binary options. + * + * Continuing with the above example: + * + * @code + * test_struct *alloc_test_struct(void) + * { + * test_struct *ret = av_malloc(sizeof(*ret)); + * ret->class = &test_class; + * av_opt_set_defaults(ret); + * return ret; + * } + * void free_test_struct(test_struct **foo) + * { + * av_opt_free(*foo); + * av_freep(foo); + * } + * @endcode + * + * @subsection avoptions_implement_nesting Nesting + * It may happen that an AVOptions-enabled struct contains another + * AVOptions-enabled struct as a member (e.g. AVCodecContext in + * libavcodec exports generic options, while its priv_data field exports + * codec-specific options). In such a case, it is possible to set up the + * parent struct to export a child's options. To do that, simply + * implement AVClass.child_next() and AVClass.child_class_next() in the + * parent struct's AVClass. + * Assuming that the test_struct from above now also contains a + * child_struct field: + * + * @code + * typedef struct child_struct { + * AVClass *class; + * int flags_opt; + * } child_struct; + * static const AVOption child_opts[] = { + * { "test_flags", "This is a test option of flags type.", + * offsetof(child_struct, flags_opt), AV_OPT_TYPE_FLAGS, { .i64 = 0 }, INT_MIN, INT_MAX }, + * { NULL }, + * }; + * static const AVClass child_class = { + * .class_name = "child class", + * .item_name = av_default_item_name, + * .option = child_opts, + * .version = LIBAVUTIL_VERSION_INT, + * }; + * + * void *child_next(void *obj, void *prev) + * { + * test_struct *t = obj; + * if (!prev && t->child_struct) + * return t->child_struct; + * return NULL + * } + * const AVClass child_class_next(const AVClass *prev) + * { + * return prev ? NULL : &child_class; + * } + * @endcode + * Putting child_next() and child_class_next() as defined above into + * test_class will now make child_struct's options accessible through + * test_struct (again, proper setup as described above needs to be done on + * child_struct right after it is created). + * + * From the above example it might not be clear why both child_next() + * and child_class_next() are needed. The distinction is that child_next() + * iterates over actually existing objects, while child_class_next() + * iterates over all possible child classes. E.g. if an AVCodecContext + * was initialized to use a codec which has private options, then its + * child_next() will return AVCodecContext.priv_data and finish + * iterating. OTOH child_class_next() on AVCodecContext.av_class will + * iterate over all available codecs with private options. + * + * @subsection avoptions_implement_named_constants Named constants + * It is possible to create named constants for options. Simply set the unit + * field of the option the constants should apply to a string and + * create the constants themselves as options of type AV_OPT_TYPE_CONST + * with their unit field set to the same string. + * Their default_val field should contain the value of the named + * constant. + * For example, to add some named constants for the test_flags option + * above, put the following into the child_opts array: + * @code + * { "test_flags", "This is a test option of flags type.", + * offsetof(child_struct, flags_opt), AV_OPT_TYPE_FLAGS, { .i64 = 0 }, INT_MIN, INT_MAX, "test_unit" }, + * { "flag1", "This is a flag with value 16", 0, AV_OPT_TYPE_CONST, { .i64 = 16 }, 0, 0, "test_unit" }, + * @endcode + * + * @section avoptions_use Using AVOptions + * This section deals with accessing options in an AVOptions-enabled struct. + * Such structs in FFmpeg are e.g. AVCodecContext in libavcodec or + * AVFormatContext in libavformat. + * + * @subsection avoptions_use_examine Examining AVOptions + * The basic functions for examining options are av_opt_next(), which iterates + * over all options defined for one object, and av_opt_find(), which searches + * for an option with the given name. + * + * The situation is more complicated with nesting. An AVOptions-enabled struct + * may have AVOptions-enabled children. Passing the AV_OPT_SEARCH_CHILDREN flag + * to av_opt_find() will make the function search children recursively. + * + * For enumerating there are basically two cases. The first is when you want to + * get all options that may potentially exist on the struct and its children + * (e.g. when constructing documentation). In that case you should call + * av_opt_child_class_next() recursively on the parent struct's AVClass. The + * second case is when you have an already initialized struct with all its + * children and you want to get all options that can be actually written or read + * from it. In that case you should call av_opt_child_next() recursively (and + * av_opt_next() on each result). + * + * @subsection avoptions_use_get_set Reading and writing AVOptions + * When setting options, you often have a string read directly from the + * user. In such a case, simply passing it to av_opt_set() is enough. For + * non-string type options, av_opt_set() will parse the string according to the + * option type. + * + * Similarly av_opt_get() will read any option type and convert it to a string + * which will be returned. Do not forget that the string is allocated, so you + * have to free it with av_free(). + * + * In some cases it may be more convenient to put all options into an + * AVDictionary and call av_opt_set_dict() on it. A specific case of this + * are the format/codec open functions in lavf/lavc which take a dictionary + * filled with option as a parameter. This makes it possible to set some options + * that cannot be set otherwise, since e.g. the input file format is not known + * before the file is actually opened. + */ + +enum AVOptionType{ + AV_OPT_TYPE_FLAGS, + AV_OPT_TYPE_INT, + AV_OPT_TYPE_INT64, + AV_OPT_TYPE_DOUBLE, + AV_OPT_TYPE_FLOAT, + AV_OPT_TYPE_STRING, + AV_OPT_TYPE_RATIONAL, + AV_OPT_TYPE_BINARY, ///< offset must point to a pointer immediately followed by an int for the length + AV_OPT_TYPE_DICT, + AV_OPT_TYPE_CONST = 128, + AV_OPT_TYPE_IMAGE_SIZE = MKBETAG('S','I','Z','E'), ///< offset must point to two consecutive integers + AV_OPT_TYPE_PIXEL_FMT = MKBETAG('P','F','M','T'), + AV_OPT_TYPE_SAMPLE_FMT = MKBETAG('S','F','M','T'), + AV_OPT_TYPE_VIDEO_RATE = MKBETAG('V','R','A','T'), ///< offset must point to AVRational + AV_OPT_TYPE_DURATION = MKBETAG('D','U','R',' '), + AV_OPT_TYPE_COLOR = MKBETAG('C','O','L','R'), + AV_OPT_TYPE_CHANNEL_LAYOUT = MKBETAG('C','H','L','A'), + AV_OPT_TYPE_BOOL = MKBETAG('B','O','O','L'), +}; + +/** + * AVOption + */ +typedef struct AVOption { + const char *name; + + /** + * short English help text + * @todo What about other languages? + */ + const char *help; + + /** + * The offset relative to the context structure where the option + * value is stored. It should be 0 for named constants. + */ + int offset; + enum AVOptionType type; + + /** + * the default value for scalar options + */ + union { + int64_t i64; + double dbl; + const char *str; + /* TODO those are unused now */ + AVRational q; + } default_val; + double min; ///< minimum valid value for the option + double max; ///< maximum valid value for the option + + int flags; +#define AV_OPT_FLAG_ENCODING_PARAM 1 ///< a generic parameter which can be set by the user for muxing or encoding +#define AV_OPT_FLAG_DECODING_PARAM 2 ///< a generic parameter which can be set by the user for demuxing or decoding +#if FF_API_OPT_TYPE_METADATA +#define AV_OPT_FLAG_METADATA 4 ///< some data extracted or inserted into the file like title, comment, ... +#endif +#define AV_OPT_FLAG_AUDIO_PARAM 8 +#define AV_OPT_FLAG_VIDEO_PARAM 16 +#define AV_OPT_FLAG_SUBTITLE_PARAM 32 +/** + * The option is inteded for exporting values to the caller. + */ +#define AV_OPT_FLAG_EXPORT 64 +/** + * The option may not be set through the AVOptions API, only read. + * This flag only makes sense when AV_OPT_FLAG_EXPORT is also set. + */ +#define AV_OPT_FLAG_READONLY 128 +#define AV_OPT_FLAG_FILTERING_PARAM (1<<16) ///< a generic parameter which can be set by the user for filtering +//FIXME think about enc-audio, ... style flags + + /** + * The logical unit to which the option belongs. Non-constant + * options and corresponding named constants share the same + * unit. May be NULL. + */ + const char *unit; +} AVOption; + +/** + * A single allowed range of values, or a single allowed value. + */ +typedef struct AVOptionRange { + const char *str; + /** + * Value range. + * For string ranges this represents the min/max length. + * For dimensions this represents the min/max pixel count or width/height in multi-component case. + */ + double value_min, value_max; + /** + * Value's component range. + * For string this represents the unicode range for chars, 0-127 limits to ASCII. + */ + double component_min, component_max; + /** + * Range flag. + * If set to 1 the struct encodes a range, if set to 0 a single value. + */ + int is_range; +} AVOptionRange; + +/** + * List of AVOptionRange structs. + */ +typedef struct AVOptionRanges { + /** + * Array of option ranges. + * + * Most of option types use just one component. + * Following describes multi-component option types: + * + * AV_OPT_TYPE_IMAGE_SIZE: + * component index 0: range of pixel count (width * height). + * component index 1: range of width. + * component index 2: range of height. + * + * @note To obtain multi-component version of this structure, user must + * provide AV_OPT_MULTI_COMPONENT_RANGE to av_opt_query_ranges or + * av_opt_query_ranges_default function. + * + * Multi-component range can be read as in following example: + * + * @code + * int range_index, component_index; + * AVOptionRanges *ranges; + * AVOptionRange *range[3]; //may require more than 3 in the future. + * av_opt_query_ranges(&ranges, obj, key, AV_OPT_MULTI_COMPONENT_RANGE); + * for (range_index = 0; range_index < ranges->nb_ranges; range_index++) { + * for (component_index = 0; component_index < ranges->nb_components; component_index++) + * range[component_index] = ranges->range[ranges->nb_ranges * component_index + range_index]; + * //do something with range here. + * } + * av_opt_freep_ranges(&ranges); + * @endcode + */ + AVOptionRange **range; + /** + * Number of ranges per component. + */ + int nb_ranges; + /** + * Number of componentes. + */ + int nb_components; +} AVOptionRanges; + +/** + * Show the obj options. + * + * @param req_flags requested flags for the options to show. Show only the + * options for which it is opt->flags & req_flags. + * @param rej_flags rejected flags for the options to show. Show only the + * options for which it is !(opt->flags & req_flags). + * @param av_log_obj log context to use for showing the options + */ +int av_opt_show2(void *obj, void *av_log_obj, int req_flags, int rej_flags); + +/** + * Set the values of all AVOption fields to their default values. + * + * @param s an AVOption-enabled struct (its first member must be a pointer to AVClass) + */ +void av_opt_set_defaults(void *s); + +/** + * Set the values of all AVOption fields to their default values. Only these + * AVOption fields for which (opt->flags & mask) == flags will have their + * default applied to s. + * + * @param s an AVOption-enabled struct (its first member must be a pointer to AVClass) + * @param mask combination of AV_OPT_FLAG_* + * @param flags combination of AV_OPT_FLAG_* + */ +void av_opt_set_defaults2(void *s, int mask, int flags); + +/** + * Parse the key/value pairs list in opts. For each key/value pair + * found, stores the value in the field in ctx that is named like the + * key. ctx must be an AVClass context, storing is done using + * AVOptions. + * + * @param opts options string to parse, may be NULL + * @param key_val_sep a 0-terminated list of characters used to + * separate key from value + * @param pairs_sep a 0-terminated list of characters used to separate + * two pairs from each other + * @return the number of successfully set key/value pairs, or a negative + * value corresponding to an AVERROR code in case of error: + * AVERROR(EINVAL) if opts cannot be parsed, + * the error code issued by av_opt_set() if a key/value pair + * cannot be set + */ +int av_set_options_string(void *ctx, const char *opts, + const char *key_val_sep, const char *pairs_sep); + +/** + * Parse the key-value pairs list in opts. For each key=value pair found, + * set the value of the corresponding option in ctx. + * + * @param ctx the AVClass object to set options on + * @param opts the options string, key-value pairs separated by a + * delimiter + * @param shorthand a NULL-terminated array of options names for shorthand + * notation: if the first field in opts has no key part, + * the key is taken from the first element of shorthand; + * then again for the second, etc., until either opts is + * finished, shorthand is finished or a named option is + * found; after that, all options must be named + * @param key_val_sep a 0-terminated list of characters used to separate + * key from value, for example '=' + * @param pairs_sep a 0-terminated list of characters used to separate + * two pairs from each other, for example ':' or ',' + * @return the number of successfully set key=value pairs, or a negative + * value corresponding to an AVERROR code in case of error: + * AVERROR(EINVAL) if opts cannot be parsed, + * the error code issued by av_set_string3() if a key/value pair + * cannot be set + * + * Options names must use only the following characters: a-z A-Z 0-9 - . / _ + * Separators must use characters distinct from option names and from each + * other. + */ +int av_opt_set_from_string(void *ctx, const char *opts, + const char *const *shorthand, + const char *key_val_sep, const char *pairs_sep); +/** + * Free all allocated objects in obj. + */ +void av_opt_free(void *obj); + +/** + * Check whether a particular flag is set in a flags field. + * + * @param field_name the name of the flag field option + * @param flag_name the name of the flag to check + * @return non-zero if the flag is set, zero if the flag isn't set, + * isn't of the right type, or the flags field doesn't exist. + */ +int av_opt_flag_is_set(void *obj, const char *field_name, const char *flag_name); + +/** + * Set all the options from a given dictionary on an object. + * + * @param obj a struct whose first element is a pointer to AVClass + * @param options options to process. This dictionary will be freed and replaced + * by a new one containing all options not found in obj. + * Of course this new dictionary needs to be freed by caller + * with av_dict_free(). + * + * @return 0 on success, a negative AVERROR if some option was found in obj, + * but could not be set. + * + * @see av_dict_copy() + */ +int av_opt_set_dict(void *obj, struct AVDictionary **options); + + +/** + * Set all the options from a given dictionary on an object. + * + * @param obj a struct whose first element is a pointer to AVClass + * @param options options to process. This dictionary will be freed and replaced + * by a new one containing all options not found in obj. + * Of course this new dictionary needs to be freed by caller + * with av_dict_free(). + * @param search_flags A combination of AV_OPT_SEARCH_*. + * + * @return 0 on success, a negative AVERROR if some option was found in obj, + * but could not be set. + * + * @see av_dict_copy() + */ +int av_opt_set_dict2(void *obj, struct AVDictionary **options, int search_flags); + +/** + * Extract a key-value pair from the beginning of a string. + * + * @param ropts pointer to the options string, will be updated to + * point to the rest of the string (one of the pairs_sep + * or the final NUL) + * @param key_val_sep a 0-terminated list of characters used to separate + * key from value, for example '=' + * @param pairs_sep a 0-terminated list of characters used to separate + * two pairs from each other, for example ':' or ',' + * @param flags flags; see the AV_OPT_FLAG_* values below + * @param rkey parsed key; must be freed using av_free() + * @param rval parsed value; must be freed using av_free() + * + * @return >=0 for success, or a negative value corresponding to an + * AVERROR code in case of error; in particular: + * AVERROR(EINVAL) if no key is present + * + */ +int av_opt_get_key_value(const char **ropts, + const char *key_val_sep, const char *pairs_sep, + unsigned flags, + char **rkey, char **rval); + +enum { + + /** + * Accept to parse a value without a key; the key will then be returned + * as NULL. + */ + AV_OPT_FLAG_IMPLICIT_KEY = 1, +}; + +/** + * @defgroup opt_eval_funcs Evaluating option strings + * @{ + * This group of functions can be used to evaluate option strings + * and get numbers out of them. They do the same thing as av_opt_set(), + * except the result is written into the caller-supplied pointer. + * + * @param obj a struct whose first element is a pointer to AVClass. + * @param o an option for which the string is to be evaluated. + * @param val string to be evaluated. + * @param *_out value of the string will be written here. + * + * @return 0 on success, a negative number on failure. + */ +int av_opt_eval_flags (void *obj, const AVOption *o, const char *val, int *flags_out); +int av_opt_eval_int (void *obj, const AVOption *o, const char *val, int *int_out); +int av_opt_eval_int64 (void *obj, const AVOption *o, const char *val, int64_t *int64_out); +int av_opt_eval_float (void *obj, const AVOption *o, const char *val, float *float_out); +int av_opt_eval_double(void *obj, const AVOption *o, const char *val, double *double_out); +int av_opt_eval_q (void *obj, const AVOption *o, const char *val, AVRational *q_out); +/** + * @} + */ + +#define AV_OPT_SEARCH_CHILDREN (1 << 0) /**< Search in possible children of the + given object first. */ +/** + * The obj passed to av_opt_find() is fake -- only a double pointer to AVClass + * instead of a required pointer to a struct containing AVClass. This is + * useful for searching for options without needing to allocate the corresponding + * object. + */ +#define AV_OPT_SEARCH_FAKE_OBJ (1 << 1) + +/** + * In av_opt_get, return NULL if the option has a pointer type and is set to NULL, + * rather than returning an empty string. + */ +#define AV_OPT_ALLOW_NULL (1 << 2) + +/** + * Allows av_opt_query_ranges and av_opt_query_ranges_default to return more than + * one component for certain option types. + * @see AVOptionRanges for details. + */ +#define AV_OPT_MULTI_COMPONENT_RANGE (1 << 12) + +/** + * Look for an option in an object. Consider only options which + * have all the specified flags set. + * + * @param[in] obj A pointer to a struct whose first element is a + * pointer to an AVClass. + * Alternatively a double pointer to an AVClass, if + * AV_OPT_SEARCH_FAKE_OBJ search flag is set. + * @param[in] name The name of the option to look for. + * @param[in] unit When searching for named constants, name of the unit + * it belongs to. + * @param opt_flags Find only options with all the specified flags set (AV_OPT_FLAG). + * @param search_flags A combination of AV_OPT_SEARCH_*. + * + * @return A pointer to the option found, or NULL if no option + * was found. + * + * @note Options found with AV_OPT_SEARCH_CHILDREN flag may not be settable + * directly with av_opt_set(). Use special calls which take an options + * AVDictionary (e.g. avformat_open_input()) to set options found with this + * flag. + */ +const AVOption *av_opt_find(void *obj, const char *name, const char *unit, + int opt_flags, int search_flags); + +/** + * Look for an option in an object. Consider only options which + * have all the specified flags set. + * + * @param[in] obj A pointer to a struct whose first element is a + * pointer to an AVClass. + * Alternatively a double pointer to an AVClass, if + * AV_OPT_SEARCH_FAKE_OBJ search flag is set. + * @param[in] name The name of the option to look for. + * @param[in] unit When searching for named constants, name of the unit + * it belongs to. + * @param opt_flags Find only options with all the specified flags set (AV_OPT_FLAG). + * @param search_flags A combination of AV_OPT_SEARCH_*. + * @param[out] target_obj if non-NULL, an object to which the option belongs will be + * written here. It may be different from obj if AV_OPT_SEARCH_CHILDREN is present + * in search_flags. This parameter is ignored if search_flags contain + * AV_OPT_SEARCH_FAKE_OBJ. + * + * @return A pointer to the option found, or NULL if no option + * was found. + */ +const AVOption *av_opt_find2(void *obj, const char *name, const char *unit, + int opt_flags, int search_flags, void **target_obj); + +/** + * Iterate over all AVOptions belonging to obj. + * + * @param obj an AVOptions-enabled struct or a double pointer to an + * AVClass describing it. + * @param prev result of the previous call to av_opt_next() on this object + * or NULL + * @return next AVOption or NULL + */ +const AVOption *av_opt_next(const void *obj, const AVOption *prev); + +/** + * Iterate over AVOptions-enabled children of obj. + * + * @param prev result of a previous call to this function or NULL + * @return next AVOptions-enabled child or NULL + */ +void *av_opt_child_next(void *obj, void *prev); + +/** + * Iterate over potential AVOptions-enabled children of parent. + * + * @param prev result of a previous call to this function or NULL + * @return AVClass corresponding to next potential child or NULL + */ +const AVClass *av_opt_child_class_next(const AVClass *parent, const AVClass *prev); + +/** + * @defgroup opt_set_funcs Option setting functions + * @{ + * Those functions set the field of obj with the given name to value. + * + * @param[in] obj A struct whose first element is a pointer to an AVClass. + * @param[in] name the name of the field to set + * @param[in] val The value to set. In case of av_opt_set() if the field is not + * of a string type, then the given string is parsed. + * SI postfixes and some named scalars are supported. + * If the field is of a numeric type, it has to be a numeric or named + * scalar. Behavior with more than one scalar and +- infix operators + * is undefined. + * If the field is of a flags type, it has to be a sequence of numeric + * scalars or named flags separated by '+' or '-'. Prefixing a flag + * with '+' causes it to be set without affecting the other flags; + * similarly, '-' unsets a flag. + * @param search_flags flags passed to av_opt_find2. I.e. if AV_OPT_SEARCH_CHILDREN + * is passed here, then the option may be set on a child of obj. + * + * @return 0 if the value has been set, or an AVERROR code in case of + * error: + * AVERROR_OPTION_NOT_FOUND if no matching option exists + * AVERROR(ERANGE) if the value is out of range + * AVERROR(EINVAL) if the value is not valid + */ +int av_opt_set (void *obj, const char *name, const char *val, int search_flags); +int av_opt_set_int (void *obj, const char *name, int64_t val, int search_flags); +int av_opt_set_double (void *obj, const char *name, double val, int search_flags); +int av_opt_set_q (void *obj, const char *name, AVRational val, int search_flags); +int av_opt_set_bin (void *obj, const char *name, const uint8_t *val, int size, int search_flags); +int av_opt_set_image_size(void *obj, const char *name, int w, int h, int search_flags); +int av_opt_set_pixel_fmt (void *obj, const char *name, enum AVPixelFormat fmt, int search_flags); +int av_opt_set_sample_fmt(void *obj, const char *name, enum AVSampleFormat fmt, int search_flags); +int av_opt_set_video_rate(void *obj, const char *name, AVRational val, int search_flags); +int av_opt_set_channel_layout(void *obj, const char *name, int64_t ch_layout, int search_flags); +/** + * @note Any old dictionary present is discarded and replaced with a copy of the new one. The + * caller still owns val is and responsible for freeing it. + */ +int av_opt_set_dict_val(void *obj, const char *name, const AVDictionary *val, int search_flags); + +/** + * Set a binary option to an integer list. + * + * @param obj AVClass object to set options on + * @param name name of the binary option + * @param val pointer to an integer list (must have the correct type with + * regard to the contents of the list) + * @param term list terminator (usually 0 or -1) + * @param flags search flags + */ +#define av_opt_set_int_list(obj, name, val, term, flags) \ + (av_int_list_length(val, term) > INT_MAX / sizeof(*(val)) ? \ + AVERROR(EINVAL) : \ + av_opt_set_bin(obj, name, (const uint8_t *)(val), \ + av_int_list_length(val, term) * sizeof(*(val)), flags)) + +/** + * @} + */ + +/** + * @defgroup opt_get_funcs Option getting functions + * @{ + * Those functions get a value of the option with the given name from an object. + * + * @param[in] obj a struct whose first element is a pointer to an AVClass. + * @param[in] name name of the option to get. + * @param[in] search_flags flags passed to av_opt_find2. I.e. if AV_OPT_SEARCH_CHILDREN + * is passed here, then the option may be found in a child of obj. + * @param[out] out_val value of the option will be written here + * @return >=0 on success, a negative error code otherwise + */ +/** + * @note the returned string will be av_malloc()ed and must be av_free()ed by the caller + * + * @note if AV_OPT_ALLOW_NULL is set in search_flags in av_opt_get, and the option has + * AV_OPT_TYPE_STRING or AV_OPT_TYPE_BINARY and is set to NULL, *out_val will be set + * to NULL instead of an allocated empty string. + */ +int av_opt_get (void *obj, const char *name, int search_flags, uint8_t **out_val); +int av_opt_get_int (void *obj, const char *name, int search_flags, int64_t *out_val); +int av_opt_get_double (void *obj, const char *name, int search_flags, double *out_val); +int av_opt_get_q (void *obj, const char *name, int search_flags, AVRational *out_val); +int av_opt_get_image_size(void *obj, const char *name, int search_flags, int *w_out, int *h_out); +int av_opt_get_pixel_fmt (void *obj, const char *name, int search_flags, enum AVPixelFormat *out_fmt); +int av_opt_get_sample_fmt(void *obj, const char *name, int search_flags, enum AVSampleFormat *out_fmt); +int av_opt_get_video_rate(void *obj, const char *name, int search_flags, AVRational *out_val); +int av_opt_get_channel_layout(void *obj, const char *name, int search_flags, int64_t *ch_layout); +/** + * @param[out] out_val The returned dictionary is a copy of the actual value and must + * be freed with av_dict_free() by the caller + */ +int av_opt_get_dict_val(void *obj, const char *name, int search_flags, AVDictionary **out_val); +/** + * @} + */ +/** + * Gets a pointer to the requested field in a struct. + * This function allows accessing a struct even when its fields are moved or + * renamed since the application making the access has been compiled, + * + * @returns a pointer to the field, it can be cast to the correct type and read + * or written to. + */ +void *av_opt_ptr(const AVClass *avclass, void *obj, const char *name); + +/** + * Free an AVOptionRanges struct and set it to NULL. + */ +void av_opt_freep_ranges(AVOptionRanges **ranges); + +/** + * Get a list of allowed ranges for the given option. + * + * The returned list may depend on other fields in obj like for example profile. + * + * @param flags is a bitmask of flags, undefined flags should not be set and should be ignored + * AV_OPT_SEARCH_FAKE_OBJ indicates that the obj is a double pointer to a AVClass instead of a full instance + * AV_OPT_MULTI_COMPONENT_RANGE indicates that function may return more than one component, @see AVOptionRanges + * + * The result must be freed with av_opt_freep_ranges. + * + * @return number of compontents returned on success, a negative errro code otherwise + */ +int av_opt_query_ranges(AVOptionRanges **, void *obj, const char *key, int flags); + +/** + * Copy options from src object into dest object. + * + * Options that require memory allocation (e.g. string or binary) are malloc'ed in dest object. + * Original memory allocated for such options is freed unless both src and dest options points to the same memory. + * + * @param dest Object to copy from + * @param src Object to copy into + * @return 0 on success, negative on error + */ +int av_opt_copy(void *dest, const void *src); + +/** + * Get a default list of allowed ranges for the given option. + * + * This list is constructed without using the AVClass.query_ranges() callback + * and can be used as fallback from within the callback. + * + * @param flags is a bitmask of flags, undefined flags should not be set and should be ignored + * AV_OPT_SEARCH_FAKE_OBJ indicates that the obj is a double pointer to a AVClass instead of a full instance + * AV_OPT_MULTI_COMPONENT_RANGE indicates that function may return more than one component, @see AVOptionRanges + * + * The result must be freed with av_opt_free_ranges. + * + * @return number of compontents returned on success, a negative errro code otherwise + */ +int av_opt_query_ranges_default(AVOptionRanges **, void *obj, const char *key, int flags); + +/** + * Check if given option is set to its default value. + * + * Options o must belong to the obj. This function must not be called to check child's options state. + * @see av_opt_is_set_to_default_by_name(). + * + * @param obj AVClass object to check option on + * @param o option to be checked + * @return >0 when option is set to its default, + * 0 when option is not set its default, + * <0 on error + */ +int av_opt_is_set_to_default(void *obj, const AVOption *o); + +/** + * Check if given option is set to its default value. + * + * @param obj AVClass object to check option on + * @param name option name + * @param search_flags combination of AV_OPT_SEARCH_* + * @return >0 when option is set to its default, + * 0 when option is not set its default, + * <0 on error + */ +int av_opt_is_set_to_default_by_name(void *obj, const char *name, int search_flags); + + +#define AV_OPT_SERIALIZE_SKIP_DEFAULTS 0x00000001 ///< Serialize options that are not set to default values only. +#define AV_OPT_SERIALIZE_OPT_FLAGS_EXACT 0x00000002 ///< Serialize options that exactly match opt_flags only. + +/** + * Serialize object's options. + * + * Create a string containing object's serialized options. + * Such string may be passed back to av_opt_set_from_string() in order to restore option values. + * A key/value or pairs separator occurring in the serialized value or + * name string are escaped through the av_escape() function. + * + * @param[in] obj AVClass object to serialize + * @param[in] opt_flags serialize options with all the specified flags set (AV_OPT_FLAG) + * @param[in] flags combination of AV_OPT_SERIALIZE_* flags + * @param[out] buffer Pointer to buffer that will be allocated with string containg serialized options. + * Buffer must be freed by the caller when is no longer needed. + * @param[in] key_val_sep character used to separate key from value + * @param[in] pairs_sep character used to separate two pairs from each other + * @return >= 0 on success, negative on error + * @warning Separators cannot be neither '\\' nor '\0'. They also cannot be the same. + */ +int av_opt_serialize(void *obj, int opt_flags, int flags, char **buffer, + const char key_val_sep, const char pairs_sep); +/** + * @} + */ + +#endif /* AVUTIL_OPT_H */ diff --git a/ext/at3_standalone/options.c b/ext/at3_standalone/options.c new file mode 100644 index 0000000000..4419193544 --- /dev/null +++ b/ext/at3_standalone/options.c @@ -0,0 +1,487 @@ +/* + * Copyright (c) 2001 Fabrice Bellard + * Copyright (c) 2002-2004 Michael Niedermayer + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + * Options definition for AVCodecContext. + */ + +#include "avcodec.h" +#include "internal.h" +#include "util_internal.h" +#include "mem.h" +#include "opt.h" +#include /* FLT_MIN, FLT_MAX */ +#include + +FF_DISABLE_DEPRECATION_WARNINGS +#include "options_table.h" +FF_ENABLE_DEPRECATION_WARNINGS + +static const char* context_to_name(void* ptr) { + AVCodecContext *avc= ptr; + + if(avc && avc->codec && avc->codec->name) + return avc->codec->name; + else + return "NULL"; +} + +static void *codec_child_next(void *obj, void *prev) +{ + AVCodecContext *s = obj; + if (!prev && s->codec && s->codec->priv_class && s->priv_data) + return s->priv_data; + return NULL; +} + +static const AVClass *codec_child_class_next(const AVClass *prev) +{ + AVCodec *c = NULL; + + /* find the codec that corresponds to prev */ + while (prev && (c = av_codec_next(c))) + if (c->priv_class == prev) + break; + + /* find next codec with priv options */ + while (c = av_codec_next(c)) + if (c->priv_class) + return c->priv_class; + return NULL; +} + +static AVClassCategory get_category(void *ptr) +{ + AVCodecContext* avctx = ptr; + if(avctx->codec && avctx->codec->decode) return AV_CLASS_CATEGORY_DECODER; + else return AV_CLASS_CATEGORY_ENCODER; +} + +static const AVClass av_codec_context_class = { + .class_name = "AVCodecContext", + .item_name = context_to_name, + .option = avcodec_options, + .version = LIBAVUTIL_VERSION_INT, + .log_level_offset_offset = offsetof(AVCodecContext, log_level_offset), + .child_next = codec_child_next, + .child_class_next = codec_child_class_next, + .category = AV_CLASS_CATEGORY_ENCODER, + .get_category = get_category, +}; + +int avcodec_get_context_defaults3(AVCodecContext *s, const AVCodec *codec) +{ + int flags=0; + memset(s, 0, sizeof(AVCodecContext)); + + s->av_class = &av_codec_context_class; + + s->codec_type = codec ? codec->type : AVMEDIA_TYPE_UNKNOWN; + if (codec) { + s->codec = codec; + s->codec_id = codec->id; + } + + if(s->codec_type == AVMEDIA_TYPE_AUDIO) + flags= AV_OPT_FLAG_AUDIO_PARAM; + else if(s->codec_type == AVMEDIA_TYPE_VIDEO) + flags= AV_OPT_FLAG_VIDEO_PARAM; + else if(s->codec_type == AVMEDIA_TYPE_SUBTITLE) + flags= AV_OPT_FLAG_SUBTITLE_PARAM; + av_opt_set_defaults2(s, flags, flags); + + s->time_base = (AVRational){0,1}; + s->framerate = (AVRational){ 0, 1 }; + s->pkt_timebase = (AVRational){ 0, 1 }; + s->get_buffer2 = avcodec_default_get_buffer2; + s->get_format = avcodec_default_get_format; + s->execute = avcodec_default_execute; + s->execute2 = avcodec_default_execute2; + s->sample_aspect_ratio = (AVRational){0,1}; + s->pix_fmt = AV_PIX_FMT_NONE; + s->sample_fmt = AV_SAMPLE_FMT_NONE; + + s->reordered_opaque = AV_NOPTS_VALUE; + if(codec && codec->priv_data_size){ + if(!s->priv_data){ + s->priv_data= av_mallocz(codec->priv_data_size); + if (!s->priv_data) { + return AVERROR(ENOMEM); + } + } + if(codec->priv_class){ + *(const AVClass**)s->priv_data = codec->priv_class; + av_opt_set_defaults(s->priv_data); + } + } + if (codec && codec->defaults) { + int ret; + const AVCodecDefault *d = codec->defaults; + /* + while (d->key) { + ret = av_opt_set(s, d->key, d->value, 0); + av_assert0(ret >= 0); + d++; + } + */ + } + return 0; +} + +AVCodecContext *avcodec_alloc_context3(const AVCodec *codec) +{ + AVCodecContext *avctx= av_malloc(sizeof(AVCodecContext)); + + if (!avctx) + return NULL; + + if(avcodec_get_context_defaults3(avctx, codec) < 0){ + av_free(avctx); + return NULL; + } + + return avctx; +} + +void avcodec_free_context(AVCodecContext **pavctx) +{ + AVCodecContext *avctx = *pavctx; + + if (!avctx) + return; + + avcodec_close(avctx); + + av_freep(&avctx->extradata); + av_freep(&avctx->subtitle_header); + av_freep(&avctx->intra_matrix); + av_freep(&avctx->inter_matrix); + av_freep(&avctx->rc_override); + + av_freep(pavctx); +} + +int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src) +{ + const AVCodec *orig_codec = dest->codec; + uint8_t *orig_priv_data = dest->priv_data; + + if (avcodec_is_open(dest)) { // check that the dest context is uninitialized + av_log(dest, AV_LOG_ERROR, + "Tried to copy AVCodecContext %p into already-initialized %p\n", + src, dest); + return AVERROR(EINVAL); + } + + av_opt_free(dest); + av_freep(&dest->rc_override); + av_freep(&dest->intra_matrix); + av_freep(&dest->inter_matrix); + av_freep(&dest->extradata); + av_freep(&dest->subtitle_header); + + memcpy(dest, src, sizeof(*dest)); + av_opt_copy(dest, src); + + dest->priv_data = orig_priv_data; + dest->codec = orig_codec; + + if (orig_priv_data && src->codec && src->codec->priv_class && + dest->codec && dest->codec->priv_class) + av_opt_copy(orig_priv_data, src->priv_data); + + + /* set values specific to opened codecs back to their default state */ + dest->slice_offset = NULL; + dest->hwaccel = NULL; + dest->internal = NULL; +#if FF_API_CODED_FRAME +FF_DISABLE_DEPRECATION_WARNINGS + dest->coded_frame = NULL; +FF_ENABLE_DEPRECATION_WARNINGS +#endif + + /* reallocate values that should be allocated separately */ + dest->extradata = NULL; + dest->intra_matrix = NULL; + dest->inter_matrix = NULL; + dest->rc_override = NULL; + dest->subtitle_header = NULL; + +#define alloc_and_copy_or_fail(obj, size, pad) \ + if (src->obj && size > 0) { \ + dest->obj = av_malloc(size + pad); \ + if (!dest->obj) \ + goto fail; \ + memcpy(dest->obj, src->obj, size); \ + if (pad) \ + memset(((uint8_t *) dest->obj) + size, 0, pad); \ + } + alloc_and_copy_or_fail(extradata, src->extradata_size, + AV_INPUT_BUFFER_PADDING_SIZE); + dest->extradata_size = src->extradata_size; + alloc_and_copy_or_fail(intra_matrix, 64 * sizeof(int16_t), 0); + alloc_and_copy_or_fail(inter_matrix, 64 * sizeof(int16_t), 0); + alloc_and_copy_or_fail(rc_override, src->rc_override_count * sizeof(*src->rc_override), 0); + alloc_and_copy_or_fail(subtitle_header, src->subtitle_header_size, 1); + av_assert0(dest->subtitle_header_size == src->subtitle_header_size); +#undef alloc_and_copy_or_fail + + return 0; + +fail: + av_freep(&dest->rc_override); + av_freep(&dest->intra_matrix); + av_freep(&dest->inter_matrix); + av_freep(&dest->extradata); + av_freep(&dest->subtitle_header); + dest->subtitle_header_size = 0; + dest->extradata_size = 0; + av_opt_free(dest); + return AVERROR(ENOMEM); +} + +const AVClass *avcodec_get_class(void) +{ + return &av_codec_context_class; +} + +#define FOFFSET(x) offsetof(AVFrame,x) + +static const AVOption frame_options[]={ +{"best_effort_timestamp", "", FOFFSET(best_effort_timestamp), AV_OPT_TYPE_INT64, {.i64 = AV_NOPTS_VALUE }, INT64_MIN, INT64_MAX, 0}, +{"pkt_pos", "", FOFFSET(pkt_pos), AV_OPT_TYPE_INT64, {.i64 = -1 }, INT64_MIN, INT64_MAX, 0}, +{"pkt_size", "", FOFFSET(pkt_size), AV_OPT_TYPE_INT64, {.i64 = -1 }, INT64_MIN, INT64_MAX, 0}, +{"sample_aspect_ratio", "", FOFFSET(sample_aspect_ratio), AV_OPT_TYPE_RATIONAL, {.dbl = 0 }, 0, INT_MAX, 0}, +{"width", "", FOFFSET(width), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, 0}, +{"height", "", FOFFSET(height), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, 0}, +{"format", "", FOFFSET(format), AV_OPT_TYPE_INT, {.i64 = -1 }, 0, INT_MAX, 0}, +{"channel_layout", "", FOFFSET(channel_layout), AV_OPT_TYPE_INT64, {.i64 = 0 }, 0, INT64_MAX, 0}, +{"sample_rate", "", FOFFSET(sample_rate), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, 0}, +{NULL}, +}; + +static const AVClass av_frame_class = { + .class_name = "AVFrame", + .item_name = NULL, + .option = frame_options, + .version = LIBAVUTIL_VERSION_INT, +}; + +const AVClass *avcodec_get_frame_class(void) +{ + return &av_frame_class; +} + +#define SROFFSET(x) offsetof(AVSubtitleRect,x) + +static const AVOption subtitle_rect_options[]={ +{"x", "", SROFFSET(x), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, 0}, +{"y", "", SROFFSET(y), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, 0}, +{"w", "", SROFFSET(w), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, 0}, +{"h", "", SROFFSET(h), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, 0}, +{"type", "", SROFFSET(type), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, 0}, +{"flags", "", SROFFSET(flags), AV_OPT_TYPE_FLAGS, {.i64 = 0}, 0, 1, 0, "flags"}, +{"forced", "", SROFFSET(flags), AV_OPT_TYPE_FLAGS, {.i64 = 0}, 0, 1, 0}, +{NULL}, +}; + +static const AVClass av_subtitle_rect_class = { + .class_name = "AVSubtitleRect", + .item_name = NULL, + .option = subtitle_rect_options, + .version = LIBAVUTIL_VERSION_INT, +}; + +const AVClass *avcodec_get_subtitle_rect_class(void) +{ + return &av_subtitle_rect_class; +} + +#ifdef TEST +static int dummy_init(AVCodecContext *ctx) +{ + //TODO: this code should set every possible pointer that could be set by codec and is not an option; + ctx->extradata_size = 8; + ctx->extradata = av_malloc(ctx->extradata_size); + return 0; +} + +static int dummy_close(AVCodecContext *ctx) +{ + av_freep(&ctx->extradata); + ctx->extradata_size = 0; + return 0; +} + +static int dummy_encode(AVCodecContext *ctx, AVPacket *pkt, const AVFrame *frame, int *got_packet) +{ + return AVERROR(ENOSYS); +} + +typedef struct Dummy12Context { + AVClass *av_class; + int num; + char* str; +} Dummy12Context; + +typedef struct Dummy3Context { + void *fake_av_class; + int num; + char* str; +} Dummy3Context; + +#define OFFSET(x) offsetof(Dummy12Context, x) +#define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM +static const AVOption dummy_options[] = { + { "str", "set str", OFFSET(str), AV_OPT_TYPE_STRING, { .str = "i'm src default value" }, 0, 0, VE}, + { "num", "set num", OFFSET(num), AV_OPT_TYPE_INT, { .i64 = 1500100900 }, 0, INT_MAX, VE}, + { NULL }, +}; + +static const AVClass dummy_v1_class = { + .class_name = "dummy_v1_class", + .item_name = av_default_item_name, + .option = dummy_options, + .version = LIBAVUTIL_VERSION_INT, +}; + +static const AVClass dummy_v2_class = { + .class_name = "dummy_v2_class", + .item_name = av_default_item_name, + .option = dummy_options, + .version = LIBAVUTIL_VERSION_INT, +}; + +/* codec with options */ +static AVCodec dummy_v1_encoder = { + .name = "dummy_v1_codec", + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_NONE - 1, + .encode2 = dummy_encode, + .init = dummy_init, + .close = dummy_close, + .priv_class = &dummy_v1_class, + .priv_data_size = sizeof(Dummy12Context), +}; + +/* codec with options, different class */ +static AVCodec dummy_v2_encoder = { + .name = "dummy_v2_codec", + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_NONE - 2, + .encode2 = dummy_encode, + .init = dummy_init, + .close = dummy_close, + .priv_class = &dummy_v2_class, + .priv_data_size = sizeof(Dummy12Context), +}; + +/* codec with priv data, but no class */ +static AVCodec dummy_v3_encoder = { + .name = "dummy_v3_codec", + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_NONE - 3, + .encode2 = dummy_encode, + .init = dummy_init, + .close = dummy_close, + .priv_data_size = sizeof(Dummy3Context), +}; + +/* codec without priv data */ +static AVCodec dummy_v4_encoder = { + .name = "dummy_v4_codec", + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_NONE - 4, + .encode2 = dummy_encode, + .init = dummy_init, + .close = dummy_close, +}; + +static void test_copy_print_codec(const AVCodecContext *ctx) +{ + printf("%-14s: %dx%d prv: %s", + ctx->codec ? ctx->codec->name : "NULL", + ctx->width, ctx->height, + ctx->priv_data ? "set" : "null"); + if (ctx->codec && ctx->codec->priv_class && ctx->codec->priv_data_size) { + int64_t i64; + char *str = NULL; + av_opt_get_int(ctx->priv_data, "num", 0, &i64); + av_opt_get(ctx->priv_data, "str", 0, (uint8_t**)&str); + printf(" opts: %"PRId64" %s", i64, str); + av_free(str); + } + printf("\n"); +} + +static void test_copy(const AVCodec *c1, const AVCodec *c2) +{ + AVCodecContext *ctx1, *ctx2; + printf("%s -> %s\nclosed:\n", c1 ? c1->name : "NULL", c2 ? c2->name : "NULL"); + ctx1 = avcodec_alloc_context3(c1); + ctx2 = avcodec_alloc_context3(c2); + ctx1->width = ctx1->height = 128; + if (ctx2->codec && ctx2->codec->priv_class && ctx2->codec->priv_data_size) { + av_opt_set(ctx2->priv_data, "num", "667", 0); + av_opt_set(ctx2->priv_data, "str", "i'm dest value before copy", 0); + } + avcodec_copy_context(ctx2, ctx1); + test_copy_print_codec(ctx1); + test_copy_print_codec(ctx2); + if (ctx1->codec) { + printf("opened:\n"); + avcodec_open2(ctx1, ctx1->codec, NULL); + if (ctx2->codec && ctx2->codec->priv_class && ctx2->codec->priv_data_size) { + av_opt_set(ctx2->priv_data, "num", "667", 0); + av_opt_set(ctx2->priv_data, "str", "i'm dest value before copy", 0); + } + avcodec_copy_context(ctx2, ctx1); + test_copy_print_codec(ctx1); + test_copy_print_codec(ctx2); + avcodec_close(ctx1); + } + avcodec_free_context(&ctx1); + avcodec_free_context(&ctx2); +} + +int main(void) +{ + AVCodec *dummy_codec[] = { + &dummy_v1_encoder, + &dummy_v2_encoder, + &dummy_v3_encoder, + &dummy_v4_encoder, + NULL, + }; + int i, j; + + for (i = 0; dummy_codec[i]; i++) + avcodec_register(dummy_codec[i]); + + printf("testing avcodec_copy_context()\n"); + for (i = 0; i < FF_ARRAY_ELEMS(dummy_codec); i++) + for (j = 0; j < FF_ARRAY_ELEMS(dummy_codec); j++) + test_copy(dummy_codec[i], dummy_codec[j]); + return 0; +} +#endif diff --git a/ext/at3_standalone/options_table.h b/ext/at3_standalone/options_table.h new file mode 100644 index 0000000000..4188081ed5 --- /dev/null +++ b/ext/at3_standalone/options_table.h @@ -0,0 +1,550 @@ +/* + * Copyright (c) 2001 Fabrice Bellard + * Copyright (c) 2002-2004 Michael Niedermayer + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVCODEC_OPTIONS_TABLE_H +#define AVCODEC_OPTIONS_TABLE_H + +#include +#include +#include + +#include "opt.h" +#include "avcodec.h" +#include "version.h" + +#define OFFSET(x) offsetof(AVCodecContext,x) +#define DEFAULT 0 //should be NAN but it does not work as it is not a constant in glibc as required by ANSI/ISO C +//these names are too long to be readable +#define V AV_OPT_FLAG_VIDEO_PARAM +#define A AV_OPT_FLAG_AUDIO_PARAM +#define S AV_OPT_FLAG_SUBTITLE_PARAM +#define E AV_OPT_FLAG_ENCODING_PARAM +#define D AV_OPT_FLAG_DECODING_PARAM + +#define AV_CODEC_DEFAULT_BITRATE 200*1000 + +static const AVOption avcodec_options[] = { +{"b", "set bitrate (in bits/s)", OFFSET(bit_rate), AV_OPT_TYPE_INT64, {.i64 = AV_CODEC_DEFAULT_BITRATE }, 0, INT64_MAX, A|V|E}, +{"ab", "set bitrate (in bits/s)", OFFSET(bit_rate), AV_OPT_TYPE_INT64, {.i64 = 128*1000 }, 0, INT_MAX, A|E}, +{"bt", "Set video bitrate tolerance (in bits/s). In 1-pass mode, bitrate tolerance specifies how far " + "ratecontrol is willing to deviate from the target average bitrate value. This is not related " + "to minimum/maximum bitrate. Lowering tolerance too much has an adverse effect on quality.", + OFFSET(bit_rate_tolerance), AV_OPT_TYPE_INT, {.i64 = AV_CODEC_DEFAULT_BITRATE*20 }, 1, INT_MAX, V|E}, +{"flags", NULL, OFFSET(flags), AV_OPT_TYPE_FLAGS, {.i64 = DEFAULT }, 0, UINT_MAX, V|A|S|E|D, "flags"}, +{"unaligned", "allow decoders to produce unaligned output", 0, AV_OPT_TYPE_CONST, { .i64 = AV_CODEC_FLAG_UNALIGNED }, INT_MIN, INT_MAX, V | D, "flags" }, +{"mv4", "use four motion vectors per macroblock (MPEG-4)", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_4MV }, INT_MIN, INT_MAX, V|E, "flags"}, +{"qpel", "use 1/4-pel motion compensation", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_QPEL }, INT_MIN, INT_MAX, V|E, "flags"}, +{"loop", "use loop filter", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_LOOP_FILTER }, INT_MIN, INT_MAX, V|E, "flags"}, +{"qscale", "use fixed qscale", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_QSCALE }, INT_MIN, INT_MAX, 0, "flags"}, +#if FF_API_GMC +{"gmc", "use gmc", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG_GMC }, INT_MIN, INT_MAX, V|E, "flags"}, +#endif +#if FF_API_MV0 +{"mv0", "always try a mb with mv=<0,0>", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG_MV0 }, INT_MIN, INT_MAX, V|E, "flags"}, +#endif +#if FF_API_INPUT_PRESERVED +{"input_preserved", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG_INPUT_PRESERVED }, INT_MIN, INT_MAX, 0, "flags"}, +#endif +{"pass1", "use internal 2-pass ratecontrol in first pass mode", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_PASS1 }, INT_MIN, INT_MAX, 0, "flags"}, +{"pass2", "use internal 2-pass ratecontrol in second pass mode", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_PASS2 }, INT_MIN, INT_MAX, 0, "flags"}, +{"gray", "only decode/encode grayscale", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_GRAY }, INT_MIN, INT_MAX, V|E|D, "flags"}, +#if FF_API_EMU_EDGE +{"emu_edge", "do not draw edges", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG_EMU_EDGE }, INT_MIN, INT_MAX, 0, "flags"}, +#endif +{"psnr", "error[?] variables will be set during encoding", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_PSNR }, INT_MIN, INT_MAX, V|E, "flags"}, +{"truncated", "Input bitstream might be randomly truncated", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_TRUNCATED }, INT_MIN, INT_MAX, V|D, "flags"}, +#if FF_API_NORMALIZE_AQP +{"naq", "normalize adaptive quantization", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG_NORMALIZE_AQP }, INT_MIN, INT_MAX, V|E, "flags"}, +#endif +{"ildct", "use interlaced DCT", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_INTERLACED_DCT }, INT_MIN, INT_MAX, V|E, "flags"}, +{"low_delay", "force low delay", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_LOW_DELAY }, INT_MIN, INT_MAX, V|D|E, "flags"}, +{"global_header", "place global headers in extradata instead of every keyframe", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_GLOBAL_HEADER }, INT_MIN, INT_MAX, V|A|E, "flags"}, +{"bitexact", "use only bitexact functions (except (I)DCT)", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_BITEXACT }, INT_MIN, INT_MAX, A|V|S|D|E, "flags"}, +{"aic", "H.263 advanced intra coding / MPEG-4 AC prediction", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_AC_PRED }, INT_MIN, INT_MAX, V|E, "flags"}, +{"ilme", "interlaced motion estimation", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_INTERLACED_ME }, INT_MIN, INT_MAX, V|E, "flags"}, +{"cgop", "closed GOP", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_CLOSED_GOP }, INT_MIN, INT_MAX, V|E, "flags"}, +{"output_corrupt", "Output even potentially corrupted frames", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_OUTPUT_CORRUPT }, INT_MIN, INT_MAX, V|D, "flags"}, +{"fast", "allow non-spec-compliant speedup tricks", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG2_FAST }, INT_MIN, INT_MAX, V|E, "flags2"}, +{"noout", "skip bitstream encoding", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG2_NO_OUTPUT }, INT_MIN, INT_MAX, V|E, "flags2"}, +{"ignorecrop", "ignore cropping information from sps", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG2_IGNORE_CROP }, INT_MIN, INT_MAX, V|D, "flags2"}, +{"local_header", "place global headers at every keyframe instead of in extradata", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG2_LOCAL_HEADER }, INT_MIN, INT_MAX, V|E, "flags2"}, +{"chunks", "Frame data might be split into multiple chunks", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG2_CHUNKS }, INT_MIN, INT_MAX, V|D, "flags2"}, +{"showall", "Show all frames before the first keyframe", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG2_SHOW_ALL }, INT_MIN, INT_MAX, V|D, "flags2"}, +{"export_mvs", "export motion vectors through frame side data", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG2_EXPORT_MVS}, INT_MIN, INT_MAX, V|D, "flags2"}, +{"skip_manual", "do not skip samples and export skip information as frame side data", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG2_SKIP_MANUAL}, INT_MIN, INT_MAX, V|D, "flags2"}, +#if FF_API_MOTION_EST +{"me_method", "set motion estimation method", OFFSET(me_method), AV_OPT_TYPE_INT, {.i64 = ME_EPZS }, INT_MIN, INT_MAX, V|E, "me_method"}, +{"zero", "zero motion estimation (fastest)", 0, AV_OPT_TYPE_CONST, {.i64 = ME_ZERO }, INT_MIN, INT_MAX, V|E, "me_method" }, +{"full", "full motion estimation (slowest)", 0, AV_OPT_TYPE_CONST, {.i64 = ME_FULL }, INT_MIN, INT_MAX, V|E, "me_method" }, +{"epzs", "EPZS motion estimation", 0, AV_OPT_TYPE_CONST, {.i64 = ME_EPZS }, INT_MIN, INT_MAX, V|E, "me_method" }, +{"esa", "esa motion estimation (alias for full)", 0, AV_OPT_TYPE_CONST, {.i64 = ME_FULL }, INT_MIN, INT_MAX, V|E, "me_method" }, +{"tesa", "tesa motion estimation", 0, AV_OPT_TYPE_CONST, {.i64 = ME_TESA }, INT_MIN, INT_MAX, V|E, "me_method" }, +{"dia", "diamond motion estimation (alias for EPZS)", 0, AV_OPT_TYPE_CONST, {.i64 = ME_EPZS }, INT_MIN, INT_MAX, V|E, "me_method" }, +{"log", "log motion estimation", 0, AV_OPT_TYPE_CONST, {.i64 = ME_LOG }, INT_MIN, INT_MAX, V|E, "me_method" }, +{"phods", "phods motion estimation", 0, AV_OPT_TYPE_CONST, {.i64 = ME_PHODS }, INT_MIN, INT_MAX, V|E, "me_method" }, +{"x1", "X1 motion estimation", 0, AV_OPT_TYPE_CONST, {.i64 = ME_X1 }, INT_MIN, INT_MAX, V|E, "me_method" }, +{"hex", "hex motion estimation", 0, AV_OPT_TYPE_CONST, {.i64 = ME_HEX }, INT_MIN, INT_MAX, V|E, "me_method" }, +{"umh", "umh motion estimation", 0, AV_OPT_TYPE_CONST, {.i64 = ME_UMH }, INT_MIN, INT_MAX, V|E, "me_method" }, +{"iter", "iter motion estimation", 0, AV_OPT_TYPE_CONST, {.i64 = ME_ITER }, INT_MIN, INT_MAX, V|E, "me_method" }, +#endif +{"time_base", NULL, OFFSET(time_base), AV_OPT_TYPE_RATIONAL, {.dbl = 0}, INT_MIN, INT_MAX}, +{"g", "set the group of picture (GOP) size", OFFSET(gop_size), AV_OPT_TYPE_INT, {.i64 = 12 }, INT_MIN, INT_MAX, V|E}, +{"ar", "set audio sampling rate (in Hz)", OFFSET(sample_rate), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, 0, INT_MAX, A|D|E}, +{"ac", "set number of audio channels", OFFSET(channels), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, 0, INT_MAX, A|D|E}, +{"cutoff", "set cutoff bandwidth", OFFSET(cutoff), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, A|E}, +{"frame_size", NULL, OFFSET(frame_size), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, A|E}, +{"frame_number", NULL, OFFSET(frame_number), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, +{"delay", NULL, OFFSET(delay), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, +{"qcomp", "video quantizer scale compression (VBR). Constant of ratecontrol equation. " + "Recommended range for default rc_eq: 0.0-1.0", + OFFSET(qcompress), AV_OPT_TYPE_FLOAT, {.dbl = 0.5 }, -FLT_MAX, FLT_MAX, V|E}, +{"qblur", "video quantizer scale blur (VBR)", OFFSET(qblur), AV_OPT_TYPE_FLOAT, {.dbl = 0.5 }, -1, FLT_MAX, V|E}, +{"qmin", "minimum video quantizer scale (VBR)", OFFSET(qmin), AV_OPT_TYPE_INT, {.i64 = 2 }, -1, 69, V|E}, +{"qmax", "maximum video quantizer scale (VBR)", OFFSET(qmax), AV_OPT_TYPE_INT, {.i64 = 31 }, -1, 1024, V|E}, +{"qdiff", "maximum difference between the quantizer scales (VBR)", OFFSET(max_qdiff), AV_OPT_TYPE_INT, {.i64 = 3 }, INT_MIN, INT_MAX, V|E}, +{"bf", "set maximum number of B frames between non-B-frames", OFFSET(max_b_frames), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, -1, INT_MAX, V|E}, +{"b_qfactor", "QP factor between P- and B-frames", OFFSET(b_quant_factor), AV_OPT_TYPE_FLOAT, {.dbl = 1.25 }, -FLT_MAX, FLT_MAX, V|E}, +#if FF_API_RC_STRATEGY +{"rc_strategy", "ratecontrol method", OFFSET(rc_strategy), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, +#endif +#if FF_API_PRIVATE_OPT +{"b_strategy", "strategy to choose between I/P/B-frames", OFFSET(b_frame_strategy), AV_OPT_TYPE_INT, {.i64 = 0 }, INT_MIN, INT_MAX, V|E}, +{"ps", "RTP payload size in bytes", OFFSET(rtp_payload_size), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, +#endif +#if FF_API_STAT_BITS +{"mv_bits", NULL, OFFSET(mv_bits), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, +{"header_bits", NULL, OFFSET(header_bits), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, +{"i_tex_bits", NULL, OFFSET(i_tex_bits), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, +{"p_tex_bits", NULL, OFFSET(p_tex_bits), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, +{"i_count", NULL, OFFSET(i_count), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, +{"p_count", NULL, OFFSET(p_count), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, +{"skip_count", NULL, OFFSET(skip_count), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, +{"misc_bits", NULL, OFFSET(misc_bits), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, +{"frame_bits", NULL, OFFSET(frame_bits), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, +#endif +{"codec_tag", NULL, OFFSET(codec_tag), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, +{"bug", "work around not autodetected encoder bugs", OFFSET(workaround_bugs), AV_OPT_TYPE_FLAGS, {.i64 = FF_BUG_AUTODETECT }, INT_MIN, INT_MAX, V|D, "bug"}, +{"autodetect", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_AUTODETECT }, INT_MIN, INT_MAX, V|D, "bug"}, +#if FF_API_OLD_MSMPEG4 +{"old_msmpeg4", "some old lavc-generated MSMPEG4v3 files (no autodetection)", 0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_OLD_MSMPEG4 }, INT_MIN, INT_MAX, V|D, "bug"}, +#endif +{"xvid_ilace", "Xvid interlacing bug (autodetected if FOURCC == XVIX)", 0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_XVID_ILACE }, INT_MIN, INT_MAX, V|D, "bug"}, +{"ump4", "(autodetected if FOURCC == UMP4)", 0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_UMP4 }, INT_MIN, INT_MAX, V|D, "bug"}, +{"no_padding", "padding bug (autodetected)", 0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_NO_PADDING }, INT_MIN, INT_MAX, V|D, "bug"}, +{"amv", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_AMV }, INT_MIN, INT_MAX, V|D, "bug"}, +#if FF_API_AC_VLC +{"ac_vlc", "illegal VLC bug (autodetected per FOURCC)", 0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_AC_VLC }, INT_MIN, INT_MAX, V|D, "bug"}, +#endif +{"qpel_chroma", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_QPEL_CHROMA }, INT_MIN, INT_MAX, V|D, "bug"}, +{"std_qpel", "old standard qpel (autodetected per FOURCC/version)", 0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_STD_QPEL }, INT_MIN, INT_MAX, V|D, "bug"}, +{"qpel_chroma2", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_QPEL_CHROMA2 }, INT_MIN, INT_MAX, V|D, "bug"}, +{"direct_blocksize", "direct-qpel-blocksize bug (autodetected per FOURCC/version)", 0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_DIRECT_BLOCKSIZE }, INT_MIN, INT_MAX, V|D, "bug"}, +{"edge", "edge padding bug (autodetected per FOURCC/version)", 0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_EDGE }, INT_MIN, INT_MAX, V|D, "bug"}, +{"hpel_chroma", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_HPEL_CHROMA }, INT_MIN, INT_MAX, V|D, "bug"}, +{"dc_clip", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_DC_CLIP }, INT_MIN, INT_MAX, V|D, "bug"}, +{"ms", "work around various bugs in Microsoft's broken decoders", 0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_MS }, INT_MIN, INT_MAX, V|D, "bug"}, +{"trunc", "truncated frames", 0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_TRUNCATED}, INT_MIN, INT_MAX, V|D, "bug"}, +{"strict", "how strictly to follow the standards", OFFSET(strict_std_compliance), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, A|V|D|E, "strict"}, +{"very", "strictly conform to a older more strict version of the spec or reference software", 0, AV_OPT_TYPE_CONST, {.i64 = FF_COMPLIANCE_VERY_STRICT }, INT_MIN, INT_MAX, V|D|E, "strict"}, +{"strict", "strictly conform to all the things in the spec no matter what the consequences", 0, AV_OPT_TYPE_CONST, {.i64 = FF_COMPLIANCE_STRICT }, INT_MIN, INT_MAX, V|D|E, "strict"}, +{"normal", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_COMPLIANCE_NORMAL }, INT_MIN, INT_MAX, V|D|E, "strict"}, +{"unofficial", "allow unofficial extensions", 0, AV_OPT_TYPE_CONST, {.i64 = FF_COMPLIANCE_UNOFFICIAL }, INT_MIN, INT_MAX, V|D|E, "strict"}, +{"experimental", "allow non-standardized experimental things", 0, AV_OPT_TYPE_CONST, {.i64 = FF_COMPLIANCE_EXPERIMENTAL }, INT_MIN, INT_MAX, V|D|E, "strict"}, +{"b_qoffset", "QP offset between P- and B-frames", OFFSET(b_quant_offset), AV_OPT_TYPE_FLOAT, {.dbl = 1.25 }, -FLT_MAX, FLT_MAX, V|E}, +{"err_detect", "set error detection flags", OFFSET(err_recognition), AV_OPT_TYPE_FLAGS, {.i64 = 0 }, INT_MIN, INT_MAX, A|V|D, "err_detect"}, +{"crccheck", "verify embedded CRCs", 0, AV_OPT_TYPE_CONST, {.i64 = AV_EF_CRCCHECK }, INT_MIN, INT_MAX, A|V|D, "err_detect"}, +{"bitstream", "detect bitstream specification deviations", 0, AV_OPT_TYPE_CONST, {.i64 = AV_EF_BITSTREAM }, INT_MIN, INT_MAX, A|V|D, "err_detect"}, +{"buffer", "detect improper bitstream length", 0, AV_OPT_TYPE_CONST, {.i64 = AV_EF_BUFFER }, INT_MIN, INT_MAX, A|V|D, "err_detect"}, +{"explode", "abort decoding on minor error detection", 0, AV_OPT_TYPE_CONST, {.i64 = AV_EF_EXPLODE }, INT_MIN, INT_MAX, A|V|D, "err_detect"}, +{"ignore_err", "ignore errors", 0, AV_OPT_TYPE_CONST, {.i64 = AV_EF_IGNORE_ERR }, INT_MIN, INT_MAX, A|V|D, "err_detect"}, +{"careful", "consider things that violate the spec, are fast to check and have not been seen in the wild as errors", 0, AV_OPT_TYPE_CONST, {.i64 = AV_EF_CAREFUL }, INT_MIN, INT_MAX, A|V|D, "err_detect"}, +{"compliant", "consider all spec non compliancies as errors", 0, AV_OPT_TYPE_CONST, {.i64 = AV_EF_COMPLIANT }, INT_MIN, INT_MAX, A|V|D, "err_detect"}, +{"aggressive", "consider things that a sane encoder should not do as an error", 0, AV_OPT_TYPE_CONST, {.i64 = AV_EF_AGGRESSIVE }, INT_MIN, INT_MAX, A|V|D, "err_detect"}, +{"has_b_frames", NULL, OFFSET(has_b_frames), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, +{"block_align", NULL, OFFSET(block_align), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, +#if FF_API_PRIVATE_OPT +{"mpeg_quant", "use MPEG quantizers instead of H.263", OFFSET(mpeg_quant), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, +#endif +#if FF_API_MPV_OPT +{"qsquish", "deprecated, use encoder private options instead", OFFSET(rc_qsquish), AV_OPT_TYPE_FLOAT, {.dbl = DEFAULT }, 0, 99, V|E}, +{"rc_qmod_amp", "deprecated, use encoder private options instead", OFFSET(rc_qmod_amp), AV_OPT_TYPE_FLOAT, {.dbl = DEFAULT }, -FLT_MAX, FLT_MAX, V|E}, +{"rc_qmod_freq", "deprecated, use encoder private options instead", OFFSET(rc_qmod_freq), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, +#endif +{"rc_override_count", NULL, OFFSET(rc_override_count), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, +#if FF_API_MPV_OPT +{"rc_eq", "deprecated, use encoder private options instead", OFFSET(rc_eq), AV_OPT_TYPE_STRING, {.str = NULL}, CHAR_MIN, CHAR_MAX, V|E}, +#endif +{"maxrate", "maximum bitrate (in bits/s). Used for VBV together with bufsize.", OFFSET(rc_max_rate), AV_OPT_TYPE_INT64, {.i64 = DEFAULT }, 0, INT_MAX, V|A|E}, +{"minrate", "minimum bitrate (in bits/s). Most useful in setting up a CBR encode. It is of little use otherwise.", + OFFSET(rc_min_rate), AV_OPT_TYPE_INT64, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|A|E}, +{"bufsize", "set ratecontrol buffer size (in bits)", OFFSET(rc_buffer_size), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, A|V|E}, +#if FF_API_MPV_OPT +{"rc_buf_aggressivity", "deprecated, use encoder private options instead", OFFSET(rc_buffer_aggressivity), AV_OPT_TYPE_FLOAT, {.dbl = 1.0 }, -FLT_MAX, FLT_MAX, V|E}, +#endif +{"i_qfactor", "QP factor between P- and I-frames", OFFSET(i_quant_factor), AV_OPT_TYPE_FLOAT, {.dbl = -0.8 }, -FLT_MAX, FLT_MAX, V|E}, +{"i_qoffset", "QP offset between P- and I-frames", OFFSET(i_quant_offset), AV_OPT_TYPE_FLOAT, {.dbl = 0.0 }, -FLT_MAX, FLT_MAX, V|E}, +#if FF_API_MPV_OPT +{"rc_init_cplx", "deprecated, use encoder private options instead", OFFSET(rc_initial_cplx), AV_OPT_TYPE_FLOAT, {.dbl = DEFAULT }, -FLT_MAX, FLT_MAX, V|E}, +#endif +{"dct", "DCT algorithm", OFFSET(dct_algo), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, 0, INT_MAX, V|E, "dct"}, +{"auto", "autoselect a good one", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DCT_AUTO }, INT_MIN, INT_MAX, V|E, "dct"}, +{"fastint", "fast integer", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DCT_FASTINT }, INT_MIN, INT_MAX, V|E, "dct"}, +{"int", "accurate integer", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DCT_INT }, INT_MIN, INT_MAX, V|E, "dct"}, +{"mmx", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DCT_MMX }, INT_MIN, INT_MAX, V|E, "dct"}, +{"altivec", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DCT_ALTIVEC }, INT_MIN, INT_MAX, V|E, "dct"}, +{"faan", "floating point AAN DCT", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DCT_FAAN }, INT_MIN, INT_MAX, V|E, "dct"}, +{"lumi_mask", "compresses bright areas stronger than medium ones", OFFSET(lumi_masking), AV_OPT_TYPE_FLOAT, {.dbl = 0 }, -FLT_MAX, FLT_MAX, V|E}, +{"tcplx_mask", "temporal complexity masking", OFFSET(temporal_cplx_masking), AV_OPT_TYPE_FLOAT, {.dbl = 0 }, -FLT_MAX, FLT_MAX, V|E}, +{"scplx_mask", "spatial complexity masking", OFFSET(spatial_cplx_masking), AV_OPT_TYPE_FLOAT, {.dbl = 0 }, -FLT_MAX, FLT_MAX, V|E}, +{"p_mask", "inter masking", OFFSET(p_masking), AV_OPT_TYPE_FLOAT, {.dbl = 0 }, -FLT_MAX, FLT_MAX, V|E}, +{"dark_mask", "compresses dark areas stronger than medium ones", OFFSET(dark_masking), AV_OPT_TYPE_FLOAT, {.dbl = 0 }, -FLT_MAX, FLT_MAX, V|E}, +{"idct", "select IDCT implementation", OFFSET(idct_algo), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, 0, INT_MAX, V|E|D, "idct"}, +{"auto", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_AUTO }, INT_MIN, INT_MAX, V|E|D, "idct"}, +{"int", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_INT }, INT_MIN, INT_MAX, V|E|D, "idct"}, +{"simple", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SIMPLE }, INT_MIN, INT_MAX, V|E|D, "idct"}, +{"simplemmx", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SIMPLEMMX }, INT_MIN, INT_MAX, V|E|D, "idct"}, +{"arm", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_ARM }, INT_MIN, INT_MAX, V|E|D, "idct"}, +{"altivec", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_ALTIVEC }, INT_MIN, INT_MAX, V|E|D, "idct"}, +#if FF_API_ARCH_SH4 +{"sh4", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SH4 }, INT_MIN, INT_MAX, V|E|D, "idct"}, +#endif +{"simplearm", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SIMPLEARM }, INT_MIN, INT_MAX, V|E|D, "idct"}, +{"simplearmv5te", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SIMPLEARMV5TE }, INT_MIN, INT_MAX, V|E|D, "idct"}, +{"simplearmv6", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SIMPLEARMV6 }, INT_MIN, INT_MAX, V|E|D, "idct"}, +{"simpleneon", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SIMPLENEON }, INT_MIN, INT_MAX, V|E|D, "idct"}, +#if FF_API_ARCH_ALPHA +{"simplealpha", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SIMPLEALPHA }, INT_MIN, INT_MAX, V|E|D, "idct"}, +#endif +#if FF_API_UNUSED_MEMBERS +{"ipp", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_IPP }, INT_MIN, INT_MAX, V|E|D, "idct"}, +#endif /* FF_API_UNUSED_MEMBERS */ +{"xvid", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_XVID }, INT_MIN, INT_MAX, V|E|D, "idct"}, +{"xvidmmx", "deprecated, for compatibility only", 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_XVID }, INT_MIN, INT_MAX, V|E|D, "idct"}, +{"faani", "floating point AAN IDCT", 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_FAAN }, INT_MIN, INT_MAX, V|D|E, "idct"}, +{"simpleauto", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SIMPLEAUTO }, INT_MIN, INT_MAX, V|E|D, "idct"}, +{"slice_count", NULL, OFFSET(slice_count), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, +{"ec", "set error concealment strategy", OFFSET(error_concealment), AV_OPT_TYPE_FLAGS, {.i64 = 3 }, INT_MIN, INT_MAX, V|D, "ec"}, +{"guess_mvs", "iterative motion vector (MV) search (slow)", 0, AV_OPT_TYPE_CONST, {.i64 = FF_EC_GUESS_MVS }, INT_MIN, INT_MAX, V|D, "ec"}, +{"deblock", "use strong deblock filter for damaged MBs", 0, AV_OPT_TYPE_CONST, {.i64 = FF_EC_DEBLOCK }, INT_MIN, INT_MAX, V|D, "ec"}, +{"favor_inter", "favor predicting from the previous frame", 0, AV_OPT_TYPE_CONST, {.i64 = FF_EC_FAVOR_INTER }, INT_MIN, INT_MAX, V|D, "ec"}, +{"bits_per_coded_sample", NULL, OFFSET(bits_per_coded_sample), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, +#if FF_API_PRIVATE_OPT +{"pred", "prediction method", OFFSET(prediction_method), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E, "pred"}, +{"left", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PRED_LEFT }, INT_MIN, INT_MAX, V|E, "pred"}, +{"plane", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PRED_PLANE }, INT_MIN, INT_MAX, V|E, "pred"}, +{"median", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PRED_MEDIAN }, INT_MIN, INT_MAX, V|E, "pred"}, +#endif +{"aspect", "sample aspect ratio", OFFSET(sample_aspect_ratio), AV_OPT_TYPE_RATIONAL, {.dbl = 0}, 0, 10, V|E}, +{"debug", "print specific debug info", OFFSET(debug), AV_OPT_TYPE_FLAGS, {.i64 = DEFAULT }, 0, INT_MAX, V|A|S|E|D, "debug"}, +{"pict", "picture info", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_PICT_INFO }, INT_MIN, INT_MAX, V|D, "debug"}, +{"rc", "rate control", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_RC }, INT_MIN, INT_MAX, V|E, "debug"}, +{"bitstream", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_BITSTREAM }, INT_MIN, INT_MAX, V|D, "debug"}, +{"mb_type", "macroblock (MB) type", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_MB_TYPE }, INT_MIN, INT_MAX, V|D, "debug"}, +{"qp", "per-block quantization parameter (QP)", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_QP }, INT_MIN, INT_MAX, V|D, "debug"}, +#if FF_API_DEBUG_MV +{"mv", "motion vector", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_MV }, INT_MIN, INT_MAX, V|D, "debug"}, +#endif +{"dct_coeff", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_DCT_COEFF }, INT_MIN, INT_MAX, V|D, "debug"}, +{"green_metadata", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_GREEN_MD }, INT_MIN, INT_MAX, V|D, "debug"}, +{"skip", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_SKIP }, INT_MIN, INT_MAX, V|D, "debug"}, +{"startcode", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_STARTCODE }, INT_MIN, INT_MAX, V|D, "debug"}, +#if FF_API_UNUSED_MEMBERS +{"pts", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_PTS }, INT_MIN, INT_MAX, V|D, "debug"}, +#endif /* FF_API_UNUSED_MEMBERS */ +{"er", "error recognition", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_ER }, INT_MIN, INT_MAX, V|D, "debug"}, +{"mmco", "memory management control operations (H.264)", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_MMCO }, INT_MIN, INT_MAX, V|D, "debug"}, +{"bugs", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_BUGS }, INT_MIN, INT_MAX, V|D, "debug"}, +#if FF_API_DEBUG_MV +{"vis_qp", "visualize quantization parameter (QP), lower QP are tinted greener", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_VIS_QP }, INT_MIN, INT_MAX, V|D, "debug"}, +{"vis_mb_type", "visualize block types", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_VIS_MB_TYPE }, INT_MIN, INT_MAX, V|D, "debug"}, +#endif +{"buffers", "picture buffer allocations", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_BUFFERS }, INT_MIN, INT_MAX, V|D, "debug"}, +{"thread_ops", "threading operations", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_THREADS }, INT_MIN, INT_MAX, V|A|D, "debug"}, +{"nomc", "skip motion compensation", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_NOMC }, INT_MIN, INT_MAX, V|A|D, "debug"}, +#if FF_API_VISMV +{"vismv", "visualize motion vectors (MVs) (deprecated)", OFFSET(debug_mv), AV_OPT_TYPE_FLAGS, {.i64 = DEFAULT }, 0, INT_MAX, V|D, "debug_mv"}, +{"pf", "forward predicted MVs of P-frames", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_VIS_MV_P_FOR }, INT_MIN, INT_MAX, V|D, "debug_mv"}, +{"bf", "forward predicted MVs of B-frames", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_VIS_MV_B_FOR }, INT_MIN, INT_MAX, V|D, "debug_mv"}, +{"bb", "backward predicted MVs of B-frames", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_VIS_MV_B_BACK }, INT_MIN, INT_MAX, V|D, "debug_mv"}, +#endif +{"cmp", "full-pel ME compare function", OFFSET(me_cmp), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E, "cmp_func"}, +{"subcmp", "sub-pel ME compare function", OFFSET(me_sub_cmp), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E, "cmp_func"}, +{"mbcmp", "macroblock compare function", OFFSET(mb_cmp), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E, "cmp_func"}, +{"ildctcmp", "interlaced DCT compare function", OFFSET(ildct_cmp), AV_OPT_TYPE_INT, {.i64 = FF_CMP_VSAD }, INT_MIN, INT_MAX, V|E, "cmp_func"}, +{"dia_size", "diamond type & size for motion estimation", OFFSET(dia_size), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, +{"last_pred", "amount of motion predictors from the previous frame", OFFSET(last_predictor_count), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, +#if FF_API_PRIVATE_OPT +{"preme", "pre motion estimation", OFFSET(pre_me), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, +#endif +{"precmp", "pre motion estimation compare function", OFFSET(me_pre_cmp), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E, "cmp_func"}, +{"sad", "sum of absolute differences, fast", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_SAD }, INT_MIN, INT_MAX, V|E, "cmp_func"}, +{"sse", "sum of squared errors", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_SSE }, INT_MIN, INT_MAX, V|E, "cmp_func"}, +{"satd", "sum of absolute Hadamard transformed differences", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_SATD }, INT_MIN, INT_MAX, V|E, "cmp_func"}, +{"dct", "sum of absolute DCT transformed differences", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_DCT }, INT_MIN, INT_MAX, V|E, "cmp_func"}, +{"psnr", "sum of squared quantization errors (avoid, low quality)", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_PSNR }, INT_MIN, INT_MAX, V|E, "cmp_func"}, +{"bit", "number of bits needed for the block", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_BIT }, INT_MIN, INT_MAX, V|E, "cmp_func"}, +{"rd", "rate distortion optimal, slow", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_RD }, INT_MIN, INT_MAX, V|E, "cmp_func"}, +{"zero", "0", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_ZERO }, INT_MIN, INT_MAX, V|E, "cmp_func"}, +{"vsad", "sum of absolute vertical differences", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_VSAD }, INT_MIN, INT_MAX, V|E, "cmp_func"}, +{"vsse", "sum of squared vertical differences", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_VSSE }, INT_MIN, INT_MAX, V|E, "cmp_func"}, +{"nsse", "noise preserving sum of squared differences", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_NSSE }, INT_MIN, INT_MAX, V|E, "cmp_func"}, +#if CONFIG_SNOW_ENCODER +{"w53", "5/3 wavelet, only used in snow", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_W53 }, INT_MIN, INT_MAX, V|E, "cmp_func"}, +{"w97", "9/7 wavelet, only used in snow", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_W97 }, INT_MIN, INT_MAX, V|E, "cmp_func"}, +#endif +{"dctmax", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_DCTMAX }, INT_MIN, INT_MAX, V|E, "cmp_func"}, +{"chroma", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_CHROMA }, INT_MIN, INT_MAX, V|E, "cmp_func"}, +{"pre_dia_size", "diamond type & size for motion estimation pre-pass", OFFSET(pre_dia_size), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, +{"subq", "sub-pel motion estimation quality", OFFSET(me_subpel_quality), AV_OPT_TYPE_INT, {.i64 = 8 }, INT_MIN, INT_MAX, V|E}, +#if FF_API_AFD +{"dtg_active_format", NULL, OFFSET(dtg_active_format), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, +#endif +{"me_range", "limit motion vectors range (1023 for DivX player)", OFFSET(me_range), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, +#if FF_API_QUANT_BIAS +{"ibias", "intra quant bias", OFFSET(intra_quant_bias), AV_OPT_TYPE_INT, {.i64 = FF_DEFAULT_QUANT_BIAS }, INT_MIN, INT_MAX, V|E}, +{"pbias", "inter quant bias", OFFSET(inter_quant_bias), AV_OPT_TYPE_INT, {.i64 = FF_DEFAULT_QUANT_BIAS }, INT_MIN, INT_MAX, V|E}, +#endif +{"global_quality", NULL, OFFSET(global_quality), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|A|E}, +#if FF_API_CODER_TYPE +{"coder", NULL, OFFSET(coder_type), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E, "coder"}, +{"vlc", "variable length coder / Huffman coder", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CODER_TYPE_VLC }, INT_MIN, INT_MAX, V|E, "coder"}, +{"ac", "arithmetic coder", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CODER_TYPE_AC }, INT_MIN, INT_MAX, V|E, "coder"}, +{"raw", "raw (no encoding)", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CODER_TYPE_RAW }, INT_MIN, INT_MAX, V|E, "coder"}, +{"rle", "run-length coder", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CODER_TYPE_RLE }, INT_MIN, INT_MAX, V|E, "coder"}, +#if FF_API_UNUSED_MEMBERS +{"deflate", "deflate-based coder", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CODER_TYPE_DEFLATE }, INT_MIN, INT_MAX, V|E, "coder"}, +#endif /* FF_API_UNUSED_MEMBERS */ +#endif /* FF_API_CODER_TYPE */ +#if FF_API_PRIVATE_OPT +{"context", "context model", OFFSET(context_model), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, +#endif +{"slice_flags", NULL, OFFSET(slice_flags), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, +#if FF_API_XVMC +{"xvmc_acceleration", NULL, OFFSET(xvmc_acceleration), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, +#endif /* FF_API_XVMC */ +{"mbd", "macroblock decision algorithm (high quality mode)", OFFSET(mb_decision), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, 0, 2, V|E, "mbd"}, +{"simple", "use mbcmp", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MB_DECISION_SIMPLE }, INT_MIN, INT_MAX, V|E, "mbd"}, +{"bits", "use fewest bits", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MB_DECISION_BITS }, INT_MIN, INT_MAX, V|E, "mbd"}, +{"rd", "use best rate distortion", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MB_DECISION_RD }, INT_MIN, INT_MAX, V|E, "mbd"}, +#if FF_API_STREAM_CODEC_TAG +{"stream_codec_tag", NULL, OFFSET(stream_codec_tag), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, +#endif +#if FF_API_PRIVATE_OPT +{"sc_threshold", "scene change threshold", OFFSET(scenechange_threshold), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, +#endif +#if FF_API_MPV_OPT +{"lmin", "deprecated, use encoder private options instead", OFFSET(lmin), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, V|E}, +{"lmax", "deprecated, use encoder private options instead", OFFSET(lmax), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, V|E}, +#endif +#if FF_API_PRIVATE_OPT +{"nr", "noise reduction", OFFSET(noise_reduction), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, +#endif +{"rc_init_occupancy", "number of bits which should be loaded into the rc buffer before decoding starts", OFFSET(rc_initial_buffer_occupancy), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, +{"flags2", NULL, OFFSET(flags2), AV_OPT_TYPE_FLAGS, {.i64 = DEFAULT}, 0, UINT_MAX, V|A|E|D, "flags2"}, +#if FF_API_ERROR_RATE +{"error", NULL, OFFSET(error_rate), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, +#endif +{"threads", "set the number of threads", OFFSET(thread_count), AV_OPT_TYPE_INT, {.i64 = 1 }, 0, INT_MAX, V|A|E|D, "threads"}, +{"auto", "autodetect a suitable number of threads to use", 0, AV_OPT_TYPE_CONST, {.i64 = 0 }, INT_MIN, INT_MAX, V|E|D, "threads"}, +#if FF_API_MPV_OPT +{"me_threshold", "motion estimation threshold", OFFSET(me_threshold), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, +{"mb_threshold", "macroblock threshold", OFFSET(mb_threshold), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, +#endif +{"dc", "intra_dc_precision", OFFSET(intra_dc_precision), AV_OPT_TYPE_INT, {.i64 = 0 }, -8, 16, V|E}, +{"nssew", "nsse weight", OFFSET(nsse_weight), AV_OPT_TYPE_INT, {.i64 = 8 }, INT_MIN, INT_MAX, V|E}, +{"skip_top", "number of macroblock rows at the top which are skipped", OFFSET(skip_top), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|D}, +{"skip_bottom", "number of macroblock rows at the bottom which are skipped", OFFSET(skip_bottom), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|D}, +{"profile", NULL, OFFSET(profile), AV_OPT_TYPE_INT, {.i64 = FF_PROFILE_UNKNOWN }, INT_MIN, INT_MAX, V|A|E, "profile"}, +{"unknown", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_UNKNOWN }, INT_MIN, INT_MAX, V|A|E, "profile"}, +{"aac_main", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_AAC_MAIN }, INT_MIN, INT_MAX, A|E, "profile"}, +{"aac_low", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_AAC_LOW }, INT_MIN, INT_MAX, A|E, "profile"}, +{"aac_ssr", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_AAC_SSR }, INT_MIN, INT_MAX, A|E, "profile"}, +{"aac_ltp", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_AAC_LTP }, INT_MIN, INT_MAX, A|E, "profile"}, +{"aac_he", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_AAC_HE }, INT_MIN, INT_MAX, A|E, "profile"}, +{"aac_he_v2", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_AAC_HE_V2 }, INT_MIN, INT_MAX, A|E, "profile"}, +{"aac_ld", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_AAC_LD }, INT_MIN, INT_MAX, A|E, "profile"}, +{"aac_eld", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_AAC_ELD }, INT_MIN, INT_MAX, A|E, "profile"}, +{"mpeg2_aac_low", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_MPEG2_AAC_LOW }, INT_MIN, INT_MAX, A|E, "profile"}, +{"mpeg2_aac_he", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_MPEG2_AAC_HE }, INT_MIN, INT_MAX, A|E, "profile"}, +{"dts", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_DTS }, INT_MIN, INT_MAX, A|E, "profile"}, +{"dts_es", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_DTS_ES }, INT_MIN, INT_MAX, A|E, "profile"}, +{"dts_96_24", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_DTS_96_24 }, INT_MIN, INT_MAX, A|E, "profile"}, +{"dts_hd_hra", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_DTS_HD_HRA }, INT_MIN, INT_MAX, A|E, "profile"}, +{"dts_hd_ma", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_DTS_HD_MA }, INT_MIN, INT_MAX, A|E, "profile"}, +{"mpeg4_sp", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_MPEG4_SIMPLE }, INT_MIN, INT_MAX, V|E, "profile"}, +{"mpeg4_core", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_MPEG4_CORE }, INT_MIN, INT_MAX, V|E, "profile"}, +{"mpeg4_main", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_MPEG4_MAIN }, INT_MIN, INT_MAX, V|E, "profile"}, +{"mpeg4_asp", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_MPEG4_ADVANCED_SIMPLE }, INT_MIN, INT_MAX, V|E, "profile"}, +{"level", NULL, OFFSET(level), AV_OPT_TYPE_INT, {.i64 = FF_LEVEL_UNKNOWN }, INT_MIN, INT_MAX, V|A|E, "level"}, +{"unknown", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_LEVEL_UNKNOWN }, INT_MIN, INT_MAX, V|A|E, "level"}, +{"lowres", "decode at 1= 1/2, 2=1/4, 3=1/8 resolutions", OFFSET(lowres), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, V|A|D}, +#if FF_API_PRIVATE_OPT +{"skip_threshold", "frame skip threshold", OFFSET(frame_skip_threshold), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, +{"skip_factor", "frame skip factor", OFFSET(frame_skip_factor), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, +{"skip_exp", "frame skip exponent", OFFSET(frame_skip_exp), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, +{"skipcmp", "frame skip compare function", OFFSET(frame_skip_cmp), AV_OPT_TYPE_INT, {.i64 = FF_CMP_DCTMAX }, INT_MIN, INT_MAX, V|E, "cmp_func"}, +#endif +#if FF_API_MPV_OPT +{"border_mask", "deprecated, use encoder private options instead", OFFSET(border_masking), AV_OPT_TYPE_FLOAT, {.dbl = DEFAULT }, -FLT_MAX, FLT_MAX, V|E}, +#endif +{"mblmin", "minimum macroblock Lagrange factor (VBR)", OFFSET(mb_lmin), AV_OPT_TYPE_INT, {.i64 = FF_QP2LAMBDA * 2 }, 1, FF_LAMBDA_MAX, V|E}, +{"mblmax", "maximum macroblock Lagrange factor (VBR)", OFFSET(mb_lmax), AV_OPT_TYPE_INT, {.i64 = FF_QP2LAMBDA * 31 }, 1, FF_LAMBDA_MAX, V|E}, +#if FF_API_PRIVATE_OPT +{"mepc", "motion estimation bitrate penalty compensation (1.0 = 256)", OFFSET(me_penalty_compensation), AV_OPT_TYPE_INT, {.i64 = 256 }, INT_MIN, INT_MAX, V|E}, +#endif +{"skip_loop_filter", "skip loop filtering process for the selected frames", OFFSET(skip_loop_filter), AV_OPT_TYPE_INT, {.i64 = AVDISCARD_DEFAULT }, INT_MIN, INT_MAX, V|D, "avdiscard"}, +{"skip_idct" , "skip IDCT/dequantization for the selected frames", OFFSET(skip_idct), AV_OPT_TYPE_INT, {.i64 = AVDISCARD_DEFAULT }, INT_MIN, INT_MAX, V|D, "avdiscard"}, +{"skip_frame" , "skip decoding for the selected frames", OFFSET(skip_frame), AV_OPT_TYPE_INT, {.i64 = AVDISCARD_DEFAULT }, INT_MIN, INT_MAX, V|D, "avdiscard"}, +{"none" , "discard no frame", 0, AV_OPT_TYPE_CONST, {.i64 = AVDISCARD_NONE }, INT_MIN, INT_MAX, V|D, "avdiscard"}, +{"default" , "discard useless frames", 0, AV_OPT_TYPE_CONST, {.i64 = AVDISCARD_DEFAULT }, INT_MIN, INT_MAX, V|D, "avdiscard"}, +{"noref" , "discard all non-reference frames", 0, AV_OPT_TYPE_CONST, {.i64 = AVDISCARD_NONREF }, INT_MIN, INT_MAX, V|D, "avdiscard"}, +{"bidir" , "discard all bidirectional frames", 0, AV_OPT_TYPE_CONST, {.i64 = AVDISCARD_BIDIR }, INT_MIN, INT_MAX, V|D, "avdiscard"}, +{"nokey" , "discard all frames except keyframes", 0, AV_OPT_TYPE_CONST, {.i64 = AVDISCARD_NONKEY }, INT_MIN, INT_MAX, V|D, "avdiscard"}, +{"nointra" , "discard all frames except I frames", 0, AV_OPT_TYPE_CONST, {.i64 = AVDISCARD_NONINTRA}, INT_MIN, INT_MAX, V|D, "avdiscard"}, +{"all" , "discard all frames", 0, AV_OPT_TYPE_CONST, {.i64 = AVDISCARD_ALL }, INT_MIN, INT_MAX, V|D, "avdiscard"}, +{"bidir_refine", "refine the two motion vectors used in bidirectional macroblocks", OFFSET(bidir_refine), AV_OPT_TYPE_INT, {.i64 = 1 }, 0, 4, V|E}, +#if FF_API_PRIVATE_OPT +{"brd_scale", "downscale frames for dynamic B-frame decision", OFFSET(brd_scale), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, 0, 10, V|E}, +#endif +{"keyint_min", "minimum interval between IDR-frames", OFFSET(keyint_min), AV_OPT_TYPE_INT, {.i64 = 25 }, INT_MIN, INT_MAX, V|E}, +{"refs", "reference frames to consider for motion compensation", OFFSET(refs), AV_OPT_TYPE_INT, {.i64 = 1 }, INT_MIN, INT_MAX, V|E}, +#if FF_API_PRIVATE_OPT +{"chromaoffset", "chroma QP offset from luma", OFFSET(chromaoffset), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, +#endif +{"trellis", "rate-distortion optimal quantization", OFFSET(trellis), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|A|E}, +#if FF_API_UNUSED_MEMBERS +{"sc_factor", "multiplied by qscale for each frame and added to scene_change_score", OFFSET(scenechange_factor), AV_OPT_TYPE_INT, {.i64 = 6 }, 0, INT_MAX, V|E}, +#endif /* FF_API_UNUSED_MEMBERS */ +{"mv0_threshold", NULL, OFFSET(mv0_threshold), AV_OPT_TYPE_INT, {.i64 = 256 }, 0, INT_MAX, V|E}, +#if FF_API_PRIVATE_OPT +{"b_sensitivity", "adjust sensitivity of b_frame_strategy 1", OFFSET(b_sensitivity), AV_OPT_TYPE_INT, {.i64 = 40 }, 1, INT_MAX, V|E}, +#endif +{"compression_level", NULL, OFFSET(compression_level), AV_OPT_TYPE_INT, {.i64 = FF_COMPRESSION_DEFAULT }, INT_MIN, INT_MAX, V|A|E}, +#if FF_API_PRIVATE_OPT +{"min_prediction_order", NULL, OFFSET(min_prediction_order), AV_OPT_TYPE_INT, {.i64 = -1 }, INT_MIN, INT_MAX, A|E}, +{"max_prediction_order", NULL, OFFSET(max_prediction_order), AV_OPT_TYPE_INT, {.i64 = -1 }, INT_MIN, INT_MAX, A|E}, +{"timecode_frame_start", "GOP timecode frame start number, in non-drop-frame format", OFFSET(timecode_frame_start), AV_OPT_TYPE_INT64, {.i64 = -1 }, -1, INT64_MAX, V|E}, +#endif +{"bits_per_raw_sample", NULL, OFFSET(bits_per_raw_sample), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, +{"channel_layout", NULL, OFFSET(channel_layout), AV_OPT_TYPE_INT64, {.i64 = DEFAULT }, 0, INT64_MAX, A|E|D, "channel_layout"}, +{"request_channel_layout", NULL, OFFSET(request_channel_layout), AV_OPT_TYPE_INT64, {.i64 = DEFAULT }, 0, INT64_MAX, A|D, "request_channel_layout"}, +{"rc_max_vbv_use", NULL, OFFSET(rc_max_available_vbv_use), AV_OPT_TYPE_FLOAT, {.dbl = 0 }, 0.0, FLT_MAX, V|E}, +{"rc_min_vbv_use", NULL, OFFSET(rc_min_vbv_overflow_use), AV_OPT_TYPE_FLOAT, {.dbl = 3 }, 0.0, FLT_MAX, V|E}, +{"ticks_per_frame", NULL, OFFSET(ticks_per_frame), AV_OPT_TYPE_INT, {.i64 = 1 }, 1, INT_MAX, A|V|E|D}, +{"color_primaries", "color primaries", OFFSET(color_primaries), AV_OPT_TYPE_INT, {.i64 = AVCOL_PRI_UNSPECIFIED }, 1, AVCOL_PRI_NB-1, V|E|D, "color_primaries_type"}, +{"bt709", "BT.709", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_PRI_BT709 }, INT_MIN, INT_MAX, V|E|D, "color_primaries_type"}, +{"unspecified", "Unspecified", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_PRI_UNSPECIFIED }, INT_MIN, INT_MAX, V|E|D, "color_primaries_type"}, +{"bt470m", "BT.470 M", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_PRI_BT470M }, INT_MIN, INT_MAX, V|E|D, "color_primaries_type"}, +{"bt470bg", "BT.470 BG", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_PRI_BT470BG }, INT_MIN, INT_MAX, V|E|D, "color_primaries_type"}, +{"smpte170m", "SMPTE 170 M", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_PRI_SMPTE170M }, INT_MIN, INT_MAX, V|E|D, "color_primaries_type"}, +{"smpte240m", "SMPTE 240 M", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_PRI_SMPTE240M }, INT_MIN, INT_MAX, V|E|D, "color_primaries_type"}, +{"film", "Film", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_PRI_FILM }, INT_MIN, INT_MAX, V|E|D, "color_primaries_type"}, +{"bt2020", "BT.2020", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_PRI_BT2020 }, INT_MIN, INT_MAX, V|E|D, "color_primaries_type"}, +{"smpte428_1", "SMPTE ST 428-1", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_PRI_SMPTEST428_1 }, INT_MIN, INT_MAX, V|E|D, "color_primaries_type"}, +{"color_trc", "color transfer characteristics", OFFSET(color_trc), AV_OPT_TYPE_INT, {.i64 = AVCOL_TRC_UNSPECIFIED }, 1, AVCOL_TRC_NB-1, V|E|D, "color_trc_type"}, +{"bt709", "BT.709", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_TRC_BT709 }, INT_MIN, INT_MAX, V|E|D, "color_trc_type"}, +{"unspecified", "Unspecified", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_TRC_UNSPECIFIED }, INT_MIN, INT_MAX, V|E|D, "color_trc_type"}, +{"gamma22", "BT.470 M", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_TRC_GAMMA22 }, INT_MIN, INT_MAX, V|E|D, "color_trc_type"}, +{"gamma28", "BT.470 BG", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_TRC_GAMMA28 }, INT_MIN, INT_MAX, V|E|D, "color_trc_type"}, +{"smpte170m", "SMPTE 170 M", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_TRC_SMPTE170M }, INT_MIN, INT_MAX, V|E|D, "color_trc_type"}, +{"smpte240m", "SMPTE 240 M", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_TRC_SMPTE240M }, INT_MIN, INT_MAX, V|E|D, "color_trc_type"}, +{"linear", "Linear", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_TRC_LINEAR }, INT_MIN, INT_MAX, V|E|D, "color_trc_type"}, +{"log", "Log", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_TRC_LOG }, INT_MIN, INT_MAX, V|E|D, "color_trc_type"}, +{"log_sqrt", "Log square root", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_TRC_LOG_SQRT }, INT_MIN, INT_MAX, V|E|D, "color_trc_type"}, +{"iec61966_2_4", "IEC 61966-2-4", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_TRC_IEC61966_2_4 }, INT_MIN, INT_MAX, V|E|D, "color_trc_type"}, +{"bt1361", "BT.1361", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_TRC_BT1361_ECG }, INT_MIN, INT_MAX, V|E|D, "color_trc_type"}, +{"iec61966_2_1", "IEC 61966-2-1", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_TRC_IEC61966_2_1 }, INT_MIN, INT_MAX, V|E|D, "color_trc_type"}, +{"bt2020_10bit", "BT.2020 - 10 bit", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_TRC_BT2020_10 }, INT_MIN, INT_MAX, V|E|D, "color_trc_type"}, +{"bt2020_12bit", "BT.2020 - 12 bit", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_TRC_BT2020_12 }, INT_MIN, INT_MAX, V|E|D, "color_trc_type"}, +{"smpte2084", "SMPTE ST 2084", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_TRC_SMPTEST2084 }, INT_MIN, INT_MAX, V|E|D, "color_trc_type"}, +{"smpte428_1", "SMPTE ST 428-1", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_TRC_SMPTEST428_1 }, INT_MIN, INT_MAX, V|E|D, "color_trc_type"}, +{"colorspace", "color space", OFFSET(colorspace), AV_OPT_TYPE_INT, {.i64 = AVCOL_SPC_UNSPECIFIED }, 0, AVCOL_SPC_NB-1, V|E|D, "colorspace_type"}, +{"rgb", "RGB", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_SPC_RGB }, INT_MIN, INT_MAX, V|E|D, "colorspace_type"}, +{"bt709", "BT.709", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_SPC_BT709 }, INT_MIN, INT_MAX, V|E|D, "colorspace_type"}, +{"unspecified", "Unspecified", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_SPC_UNSPECIFIED }, INT_MIN, INT_MAX, V|E|D, "colorspace_type"}, +{"fcc", "FCC", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_SPC_FCC }, INT_MIN, INT_MAX, V|E|D, "colorspace_type"}, +{"bt470bg", "BT.470 BG", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_SPC_BT470BG }, INT_MIN, INT_MAX, V|E|D, "colorspace_type"}, +{"smpte170m", "SMPTE 170 M", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_SPC_SMPTE170M }, INT_MIN, INT_MAX, V|E|D, "colorspace_type"}, +{"smpte240m", "SMPTE 240 M", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_SPC_SMPTE240M }, INT_MIN, INT_MAX, V|E|D, "colorspace_type"}, +{"ycocg", "YCOCG", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_SPC_YCOCG }, INT_MIN, INT_MAX, V|E|D, "colorspace_type"}, +{"bt2020_ncl", "BT.2020 NCL", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_SPC_BT2020_NCL }, INT_MIN, INT_MAX, V|E|D, "colorspace_type"}, +{"bt2020_cl", "BT.2020 CL", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_SPC_BT2020_CL }, INT_MIN, INT_MAX, V|E|D, "colorspace_type"}, +{"color_range", "color range", OFFSET(color_range), AV_OPT_TYPE_INT, {.i64 = AVCOL_RANGE_UNSPECIFIED }, 0, AVCOL_RANGE_NB-1, V|E|D, "color_range_type"}, +{"unspecified", "Unspecified", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_RANGE_UNSPECIFIED }, INT_MIN, INT_MAX, V|E|D, "color_range_type"}, +{"mpeg", "MPEG (219*2^(n-8))", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_RANGE_MPEG }, INT_MIN, INT_MAX, V|E|D, "color_range_type"}, +{"jpeg", "JPEG (2^n-1)", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_RANGE_JPEG }, INT_MIN, INT_MAX, V|E|D, "color_range_type"}, +{"chroma_sample_location", "chroma sample location", OFFSET(chroma_sample_location), AV_OPT_TYPE_INT, {.i64 = AVCHROMA_LOC_UNSPECIFIED }, 0, AVCHROMA_LOC_NB-1, V|E|D, "chroma_sample_location_type"}, +{"unspecified", "Unspecified", 0, AV_OPT_TYPE_CONST, {.i64 = AVCHROMA_LOC_UNSPECIFIED }, INT_MIN, INT_MAX, V|E|D, "chroma_sample_location_type"}, +{"left", "Left", 0, AV_OPT_TYPE_CONST, {.i64 = AVCHROMA_LOC_LEFT }, INT_MIN, INT_MAX, V|E|D, "chroma_sample_location_type"}, +{"center", "Center", 0, AV_OPT_TYPE_CONST, {.i64 = AVCHROMA_LOC_CENTER }, INT_MIN, INT_MAX, V|E|D, "chroma_sample_location_type"}, +{"topleft", "Top-left", 0, AV_OPT_TYPE_CONST, {.i64 = AVCHROMA_LOC_TOPLEFT }, INT_MIN, INT_MAX, V|E|D, "chroma_sample_location_type"}, +{"top", "Top", 0, AV_OPT_TYPE_CONST, {.i64 = AVCHROMA_LOC_TOP }, INT_MIN, INT_MAX, V|E|D, "chroma_sample_location_type"}, +{"bottomleft", "Bottom-left", 0, AV_OPT_TYPE_CONST, {.i64 = AVCHROMA_LOC_BOTTOMLEFT }, INT_MIN, INT_MAX, V|E|D, "chroma_sample_location_type"}, +{"bottom", "Bottom", 0, AV_OPT_TYPE_CONST, {.i64 = AVCHROMA_LOC_BOTTOM }, INT_MIN, INT_MAX, V|E|D, "chroma_sample_location_type"}, +{"log_level_offset", "set the log level offset", OFFSET(log_level_offset), AV_OPT_TYPE_INT, {.i64 = 0 }, INT_MIN, INT_MAX }, +{"slices", "set the number of slices, used in parallelized encoding", OFFSET(slices), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, V|E}, +{"thread_type", "select multithreading type", OFFSET(thread_type), AV_OPT_TYPE_FLAGS, {.i64 = FF_THREAD_SLICE|FF_THREAD_FRAME }, 0, INT_MAX, V|A|E|D, "thread_type"}, +{"slice", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_THREAD_SLICE }, INT_MIN, INT_MAX, V|E|D, "thread_type"}, +{"frame", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_THREAD_FRAME }, INT_MIN, INT_MAX, V|E|D, "thread_type"}, +{"audio_service_type", "audio service type", OFFSET(audio_service_type), AV_OPT_TYPE_INT, {.i64 = AV_AUDIO_SERVICE_TYPE_MAIN }, 0, AV_AUDIO_SERVICE_TYPE_NB-1, A|E, "audio_service_type"}, +{"ma", "Main Audio Service", 0, AV_OPT_TYPE_CONST, {.i64 = AV_AUDIO_SERVICE_TYPE_MAIN }, INT_MIN, INT_MAX, A|E, "audio_service_type"}, +{"ef", "Effects", 0, AV_OPT_TYPE_CONST, {.i64 = AV_AUDIO_SERVICE_TYPE_EFFECTS }, INT_MIN, INT_MAX, A|E, "audio_service_type"}, +{"vi", "Visually Impaired", 0, AV_OPT_TYPE_CONST, {.i64 = AV_AUDIO_SERVICE_TYPE_VISUALLY_IMPAIRED }, INT_MIN, INT_MAX, A|E, "audio_service_type"}, +{"hi", "Hearing Impaired", 0, AV_OPT_TYPE_CONST, {.i64 = AV_AUDIO_SERVICE_TYPE_HEARING_IMPAIRED }, INT_MIN, INT_MAX, A|E, "audio_service_type"}, +{"di", "Dialogue", 0, AV_OPT_TYPE_CONST, {.i64 = AV_AUDIO_SERVICE_TYPE_DIALOGUE }, INT_MIN, INT_MAX, A|E, "audio_service_type"}, +{"co", "Commentary", 0, AV_OPT_TYPE_CONST, {.i64 = AV_AUDIO_SERVICE_TYPE_COMMENTARY }, INT_MIN, INT_MAX, A|E, "audio_service_type"}, +{"em", "Emergency", 0, AV_OPT_TYPE_CONST, {.i64 = AV_AUDIO_SERVICE_TYPE_EMERGENCY }, INT_MIN, INT_MAX, A|E, "audio_service_type"}, +{"vo", "Voice Over", 0, AV_OPT_TYPE_CONST, {.i64 = AV_AUDIO_SERVICE_TYPE_VOICE_OVER }, INT_MIN, INT_MAX, A|E, "audio_service_type"}, +{"ka", "Karaoke", 0, AV_OPT_TYPE_CONST, {.i64 = AV_AUDIO_SERVICE_TYPE_KARAOKE }, INT_MIN, INT_MAX, A|E, "audio_service_type"}, +{"request_sample_fmt", "sample format audio decoders should prefer", OFFSET(request_sample_fmt), AV_OPT_TYPE_SAMPLE_FMT, {.i64=AV_SAMPLE_FMT_NONE}, -1, INT_MAX, A|D, "request_sample_fmt"}, +{"pkt_timebase", NULL, OFFSET(pkt_timebase), AV_OPT_TYPE_RATIONAL, {.dbl = 0 }, 0, INT_MAX, 0}, +{"sub_charenc", "set input text subtitles character encoding", OFFSET(sub_charenc), AV_OPT_TYPE_STRING, {.str = NULL}, CHAR_MIN, CHAR_MAX, S|D}, +{"sub_charenc_mode", "set input text subtitles character encoding mode", OFFSET(sub_charenc_mode), AV_OPT_TYPE_FLAGS, {.i64 = FF_SUB_CHARENC_MODE_AUTOMATIC}, -1, INT_MAX, S|D, "sub_charenc_mode"}, +{"do_nothing", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_SUB_CHARENC_MODE_DO_NOTHING}, INT_MIN, INT_MAX, S|D, "sub_charenc_mode"}, +{"auto", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_SUB_CHARENC_MODE_AUTOMATIC}, INT_MIN, INT_MAX, S|D, "sub_charenc_mode"}, +{"pre_decoder", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_SUB_CHARENC_MODE_PRE_DECODER}, INT_MIN, INT_MAX, S|D, "sub_charenc_mode"}, +{"refcounted_frames", NULL, OFFSET(refcounted_frames), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, A|V|D }, +#if FF_API_SIDEDATA_ONLY_PKT +{"side_data_only_packets", NULL, OFFSET(side_data_only_packets), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, A|V|E }, +#endif +{"skip_alpha", "Skip processing alpha", OFFSET(skip_alpha), AV_OPT_TYPE_BOOL, {.i64 = 0 }, 0, 1, V|D }, +{"field_order", "Field order", OFFSET(field_order), AV_OPT_TYPE_INT, {.i64 = AV_FIELD_UNKNOWN }, 0, 5, V|D|E, "field_order" }, +{"progressive", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = AV_FIELD_PROGRESSIVE }, 0, 0, V|D|E, "field_order" }, +{"tt", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = AV_FIELD_TT }, 0, 0, V|D|E, "field_order" }, +{"bb", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = AV_FIELD_BB }, 0, 0, V|D|E, "field_order" }, +{"tb", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = AV_FIELD_TB }, 0, 0, V|D|E, "field_order" }, +{"bt", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = AV_FIELD_BT }, 0, 0, V|D|E, "field_order" }, +{"dump_separator", "set information dump field separator", OFFSET(dump_separator), AV_OPT_TYPE_STRING, {.str = NULL}, CHAR_MIN, CHAR_MAX, A|V|S|D|E}, +{"codec_whitelist", "List of decoders that are allowed to be used", OFFSET(codec_whitelist), AV_OPT_TYPE_STRING, { .str = NULL }, CHAR_MIN, CHAR_MAX, A|V|S|D }, +{"pixel_format", "set pixel format", OFFSET(pix_fmt), AV_OPT_TYPE_PIXEL_FMT, {.i64=AV_PIX_FMT_NONE}, -1, INT_MAX, 0 }, +{"video_size", "set video size", OFFSET(width), AV_OPT_TYPE_IMAGE_SIZE, {.str=NULL}, 0, INT_MAX, 0 }, +{NULL}, +}; + +#undef A +#undef V +#undef S +#undef E +#undef D +#undef DEFAULT +#undef OFFSET + +#endif /* AVCODEC_OPTIONS_TABLE_H */ diff --git a/ext/at3_standalone/qsort.h b/ext/at3_standalone/qsort.h new file mode 100644 index 0000000000..39b7a08852 --- /dev/null +++ b/ext/at3_standalone/qsort.h @@ -0,0 +1,122 @@ +/* + * copyright (c) 2012 Michael Niedermayer + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVUTIL_QSORT_H +#define AVUTIL_QSORT_H + +#include "common.h" + + +/** + * Quicksort + * This sort is fast, and fully inplace but not stable and it is possible + * to construct input that requires O(n^2) time but this is very unlikely to + * happen with non constructed input. + */ +#define AV_QSORT(p, num, type, cmp) do {\ + void *stack[64][2];\ + int sp= 1;\ + stack[0][0] = p;\ + stack[0][1] = (p)+(num)-1;\ + while(sp){\ + type *start= stack[--sp][0];\ + type *end = stack[ sp][1];\ + while(start < end){\ + if(start < end-1) {\ + int checksort=0;\ + type *right = end-2;\ + type *left = start+1;\ + type *mid = start + ((end-start)>>1);\ + if(cmp(start, end) > 0) {\ + if(cmp( end, mid) > 0) FFSWAP(type, *start, *mid);\ + else FFSWAP(type, *start, *end);\ + }else{\ + if(cmp(start, mid) > 0) FFSWAP(type, *start, *mid);\ + else checksort= 1;\ + }\ + if(cmp(mid, end) > 0){ \ + FFSWAP(type, *mid, *end);\ + checksort=0;\ + }\ + if(start == end-2) break;\ + FFSWAP(type, end[-1], *mid);\ + while(left <= right){\ + while(left<=right && cmp(left, end-1) < 0)\ + left++;\ + while(left<=right && cmp(right, end-1) > 0)\ + right--;\ + if(left <= right){\ + FFSWAP(type, *left, *right);\ + left++;\ + right--;\ + }\ + }\ + FFSWAP(type, end[-1], *left);\ + if(checksort && (mid == left-1 || mid == left)){\ + mid= start;\ + while(mid 0)\ + FFSWAP(type, *start, *end);\ + break;\ + }\ + }\ + }\ +} while (0) + +/** + * Merge sort, this sort requires a temporary buffer and is stable, its worst + * case time is O(n log n) + * @param p must be a lvalue pointer, this function may exchange it with tmp + * @param tmp must be a lvalue pointer, this function may exchange it with p + */ +#define AV_MSORT(p, tmp, num, type, cmp) do {\ + unsigned i, j, step;\ + for(step=1; step<(num); step+=step){\ + for(i=0; i<(num); i+=2*step){\ + unsigned a[2] = {i, i+step};\ + unsigned end = FFMIN(i+2*step, (num));\ + for(j=i; a[0] 0;\ + tmp[j] = p[ a[idx]++ ];\ + }\ + if(a[0]>=i+step) a[0] = a[1];\ + for(; j + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + * rational numbers + * @author Michael Niedermayer + */ + +#include + +#include "common.h" +#include "mathematics.h" +#include "rational.h" + +int av_reduce(int *dst_num, int *dst_den, + int64_t num, int64_t den, int64_t max) +{ + AVRational a0 = { 0, 1 }, a1 = { 1, 0 }; + int sign = (num < 0) ^ (den < 0); + int64_t gcd = av_gcd(FFABS(num), FFABS(den)); + + if (gcd) { + num = FFABS(num) / gcd; + den = FFABS(den) / gcd; + } + if (num <= max && den <= max) { + a1 = (AVRational) { num, den }; + den = 0; + } + + while (den) { + uint64_t x = num / den; + int64_t next_den = num - den * x; + int64_t a2n = x * a1.num + a0.num; + int64_t a2d = x * a1.den + a0.den; + + if (a2n > max || a2d > max) { + if (a1.num) x = (max - a0.num) / a1.num; + if (a1.den) x = FFMIN(x, (max - a0.den) / a1.den); + + if (den * (2 * x * a1.den + a0.den) > num * a1.den) + a1 = (AVRational) { x * a1.num + a0.num, x * a1.den + a0.den }; + break; + } + + a0 = a1; + a1 = (AVRational) { a2n, a2d }; + num = den; + den = next_den; + } + av_assert2(av_gcd(a1.num, a1.den) <= 1U); + av_assert2(a1.num <= max && a1.den <= max); + + *dst_num = sign ? -a1.num : a1.num; + *dst_den = a1.den; + + return den == 0; +} + +AVRational av_mul_q(AVRational b, AVRational c) +{ + av_reduce(&b.num, &b.den, + b.num * (int64_t) c.num, + b.den * (int64_t) c.den, INT_MAX); + return b; +} + +AVRational av_div_q(AVRational b, AVRational c) +{ + return av_mul_q(b, (AVRational) { c.den, c.num }); +} + +AVRational av_add_q(AVRational b, AVRational c) { + av_reduce(&b.num, &b.den, + b.num * (int64_t) c.den + + c.num * (int64_t) b.den, + b.den * (int64_t) c.den, INT_MAX); + return b; +} + +AVRational av_sub_q(AVRational b, AVRational c) +{ + return av_add_q(b, (AVRational) { -c.num, c.den }); +} + +AVRational av_d2q(double d, int max) +{ + AVRational a; + int exponent; + int64_t den; + if (isnan(d)) + return (AVRational) { 0,0 }; + if (fabs(d) > INT_MAX + 3LL) + return (AVRational) { d < 0 ? -1 : 1, 0 }; + frexp(d, &exponent); + exponent = FFMAX(exponent-1, 0); + den = 1LL << (61 - exponent); + // (int64_t)rint() and llrint() do not work with gcc on ia64 and sparc64 + av_reduce(&a.num, &a.den, floor(d * den + 0.5), den, max); + if ((!a.num || !a.den) && d && max>0 && max n => a*d/b > n */ + int64_t x_up = av_rescale_rnd(a, q.den, b, AV_ROUND_UP); + + /* rnd_down(a*d/b) < n => a*d/b < n */ + int64_t x_down = av_rescale_rnd(a, q.den, b, AV_ROUND_DOWN); + + return ((x_up > q.num) - (x_down < q.num)) * av_cmp_q(q2, q1); +} + +int av_find_nearest_q_idx(AVRational q, const AVRational* q_list) +{ + int i, nearest_q_idx = 0; + for (i = 0; q_list[i].den; i++) + if (av_nearer_q(q, q_list[i], q_list[nearest_q_idx]) > 0) + nearest_q_idx = i; + + return nearest_q_idx; +} + +uint32_t av_q2intfloat(AVRational q) { + int64_t n; + int shift; + int sign = 0; + + if (q.den < 0) { + q.den *= -1; + q.num *= -1; + } + if (q.num < 0) { + q.num *= -1; + sign = 1; + } + + if (!q.num && !q.den) return 0xFFC00000; + if (!q.num) return 0; + if (!q.den) return 0x7F800000 | (q.num & 0x80000000); + + shift = 23 + av_log2(q.den) - av_log2(q.num); + if (shift >= 0) n = av_rescale(q.num, 1LL<= (1<<24); + shift += n < (1<<23); + + if (shift >= 0) n = av_rescale(q.num, 1LL<= (1<<23)); + + return sign<<31 | (150-shift)<<23 | (n - (1<<23)); +} + +#ifdef TEST + +#include "integer.h" + +int main(void) +{ + AVRational a,b,r; + int i,j,k; + static const int64_t numlist[] = { + INT64_MIN, INT64_MIN+1, INT64_MAX, INT32_MIN, INT32_MAX, 1,0,-1, + 123456789, INT32_MAX-1, INT32_MAX+1LL, UINT32_MAX-1, UINT32_MAX, UINT32_MAX+1LL + }; + + for (a.num = -2; a.num <= 2; a.num++) { + for (a.den = -2; a.den <= 2; a.den++) { + for (b.num = -2; b.num <= 2; b.num++) { + for (b.den = -2; b.den <= 2; b.den++) { + int c = av_cmp_q(a,b); + double d = av_q2d(a) == av_q2d(b) ? + 0 : (av_q2d(a) - av_q2d(b)); + if (d > 0) d = 1; + else if (d < 0) d = -1; + else if (d != d) d = INT_MIN; + if (c != d) + av_log(NULL, AV_LOG_ERROR, "%d/%d %d/%d, %d %f\n", a.num, + a.den, b.num, b.den, c,d); + r = av_sub_q(av_add_q(b,a), b); + if(b.den && (r.num*a.den != a.num*r.den || !r.num != !a.num || !r.den != !a.den)) + av_log(NULL, AV_LOG_ERROR, "%d/%d ", r.num, r.den); + } + } + } + } + + for (i = 0; i < FF_ARRAY_ELEMS(numlist); i++) { + int64_t a = numlist[i]; + + for (j = 0; j < FF_ARRAY_ELEMS(numlist); j++) { + int64_t b = numlist[j]; + if (b<=0) + continue; + for (k = 0; k < FF_ARRAY_ELEMS(numlist); k++) { + int64_t c = numlist[k]; + int64_t res; + AVInteger ai; + + if (c<=0) + continue; + res = av_rescale_rnd(a,b,c, AV_ROUND_ZERO); + + ai = av_mul_i(av_int2i(a), av_int2i(b)); + ai = av_div_i(ai, av_int2i(c)); + + if (av_cmp_i(ai, av_int2i(INT64_MAX)) > 0 && res == INT64_MIN) + continue; + if (av_cmp_i(ai, av_int2i(INT64_MIN)) < 0 && res == INT64_MIN) + continue; + if (av_cmp_i(ai, av_int2i(res)) == 0) + continue; + + // Special exception for INT64_MIN, remove this in case INT64_MIN is handled without off by 1 error + if (av_cmp_i(ai, av_int2i(res-1)) == 0 && a == INT64_MIN) + continue; + + av_log(NULL, AV_LOG_ERROR, "%"PRId64" * %"PRId64" / %"PRId64" = %"PRId64" or %"PRId64"\n", a,b,c, res, av_i2int(ai)); + } + } + } + + for (a.num = 1; a.num <= 10; a.num++) { + for (a.den = 1; a.den <= 10; a.den++) { + if (av_gcd(a.num, a.den) > 1) + continue; + for (b.num = 1; b.num <= 10; b.num++) { + for (b.den = 1; b.den <= 10; b.den++) { + int start; + if (av_gcd(b.num, b.den) > 1) + continue; + if (av_cmp_q(b, a) < 0) + continue; + for (start = 0; start < 10 ; start++) { + int acc= start; + int i; + + for (i = 0; i<100; i++) { + int exact = start + av_rescale_q(i+1, b, a); + acc = av_add_stable(a, acc, b, 1); + if (FFABS(acc - exact) > 2) { + av_log(NULL, AV_LOG_ERROR, "%d/%d %d/%d, %d %d\n", a.num, + a.den, b.num, b.den, acc, exact); + return 1; + } + } + } + } + } + } + } + + for (a.den = 1; a.den < 0x100000000U/3; a.den*=3) { + for (a.num = -1; a.num < (1<<27); a.num += 1 + a.num/100) { + float f = av_int2float(av_q2intfloat(a)); + float f2 = av_q2d(a); + if (fabs(f - f2) > fabs(f)/5000000) { + av_log(NULL, AV_LOG_ERROR, "%d/%d %f %f\n", a.num, + a.den, f, f2); + return 1; + } + + } + } + + return 0; +} +#endif diff --git a/ext/at3_standalone/rational.h b/ext/at3_standalone/rational.h index 2897469680..35e799007c 100644 --- a/ext/at3_standalone/rational.h +++ b/ext/at3_standalone/rational.h @@ -30,6 +30,7 @@ #include #include + #include "attributes.h" /** diff --git a/ext/at3_standalone/rdft.c b/ext/at3_standalone/rdft.c index c318aa8394..1e1fe96bef 100644 --- a/ext/at3_standalone/rdft.c +++ b/ext/at3_standalone/rdft.c @@ -20,7 +20,8 @@ */ #include #include -#include "libavutil/mathematics.h" + +#include "mathematics.h" #include "rdft.h" /** diff --git a/ext/at3_standalone/samplefmt.c b/ext/at3_standalone/samplefmt.c new file mode 100644 index 0000000000..c605b5ebdf --- /dev/null +++ b/ext/at3_standalone/samplefmt.c @@ -0,0 +1,252 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "common.h" +#include "samplefmt.h" + +#include +#include +#include + +typedef struct SampleFmtInfo { + char name[8]; + int bits; + int planar; + enum AVSampleFormat altform; ///< planar<->packed alternative form +} SampleFmtInfo; + +/** this table gives more information about formats */ +static const SampleFmtInfo sample_fmt_info[AV_SAMPLE_FMT_NB] = { + [AV_SAMPLE_FMT_U8] = { .name = "u8", .bits = 8, .planar = 0, .altform = AV_SAMPLE_FMT_U8P }, + [AV_SAMPLE_FMT_S16] = { .name = "s16", .bits = 16, .planar = 0, .altform = AV_SAMPLE_FMT_S16P }, + [AV_SAMPLE_FMT_S32] = { .name = "s32", .bits = 32, .planar = 0, .altform = AV_SAMPLE_FMT_S32P }, + [AV_SAMPLE_FMT_FLT] = { .name = "flt", .bits = 32, .planar = 0, .altform = AV_SAMPLE_FMT_FLTP }, + [AV_SAMPLE_FMT_DBL] = { .name = "dbl", .bits = 64, .planar = 0, .altform = AV_SAMPLE_FMT_DBLP }, + [AV_SAMPLE_FMT_U8P] = { .name = "u8p", .bits = 8, .planar = 1, .altform = AV_SAMPLE_FMT_U8 }, + [AV_SAMPLE_FMT_S16P] = { .name = "s16p", .bits = 16, .planar = 1, .altform = AV_SAMPLE_FMT_S16 }, + [AV_SAMPLE_FMT_S32P] = { .name = "s32p", .bits = 32, .planar = 1, .altform = AV_SAMPLE_FMT_S32 }, + [AV_SAMPLE_FMT_FLTP] = { .name = "fltp", .bits = 32, .planar = 1, .altform = AV_SAMPLE_FMT_FLT }, + [AV_SAMPLE_FMT_DBLP] = { .name = "dblp", .bits = 64, .planar = 1, .altform = AV_SAMPLE_FMT_DBL }, +}; + +const char *av_get_sample_fmt_name(enum AVSampleFormat sample_fmt) +{ + if (sample_fmt < 0 || sample_fmt >= AV_SAMPLE_FMT_NB) + return NULL; + return sample_fmt_info[sample_fmt].name; +} + +enum AVSampleFormat av_get_sample_fmt(const char *name) +{ + int i; + + for (i = 0; i < AV_SAMPLE_FMT_NB; i++) + if (!strcmp(sample_fmt_info[i].name, name)) + return i; + return AV_SAMPLE_FMT_NONE; +} + +enum AVSampleFormat av_get_alt_sample_fmt(enum AVSampleFormat sample_fmt, int planar) +{ + if (sample_fmt < 0 || sample_fmt >= AV_SAMPLE_FMT_NB) + return AV_SAMPLE_FMT_NONE; + if (sample_fmt_info[sample_fmt].planar == planar) + return sample_fmt; + return sample_fmt_info[sample_fmt].altform; +} + +enum AVSampleFormat av_get_packed_sample_fmt(enum AVSampleFormat sample_fmt) +{ + if (sample_fmt < 0 || sample_fmt >= AV_SAMPLE_FMT_NB) + return AV_SAMPLE_FMT_NONE; + if (sample_fmt_info[sample_fmt].planar) + return sample_fmt_info[sample_fmt].altform; + return sample_fmt; +} + +enum AVSampleFormat av_get_planar_sample_fmt(enum AVSampleFormat sample_fmt) +{ + if (sample_fmt < 0 || sample_fmt >= AV_SAMPLE_FMT_NB) + return AV_SAMPLE_FMT_NONE; + if (sample_fmt_info[sample_fmt].planar) + return sample_fmt; + return sample_fmt_info[sample_fmt].altform; +} + +char *av_get_sample_fmt_string (char *buf, int buf_size, enum AVSampleFormat sample_fmt) +{ + /* print header */ + if (sample_fmt < 0) + snprintf(buf, buf_size, "name " " depth"); + else if (sample_fmt < AV_SAMPLE_FMT_NB) { + SampleFmtInfo info = sample_fmt_info[sample_fmt]; + snprintf (buf, buf_size, "%-6s" " %2d ", info.name, info.bits); + } + + return buf; +} + +int av_get_bytes_per_sample(enum AVSampleFormat sample_fmt) +{ + return sample_fmt < 0 || sample_fmt >= AV_SAMPLE_FMT_NB ? + 0 : sample_fmt_info[sample_fmt].bits >> 3; +} + +int av_sample_fmt_is_planar(enum AVSampleFormat sample_fmt) +{ + if (sample_fmt < 0 || sample_fmt >= AV_SAMPLE_FMT_NB) + return 0; + return sample_fmt_info[sample_fmt].planar; +} + +int av_samples_get_buffer_size(int *linesize, int nb_channels, int nb_samples, + enum AVSampleFormat sample_fmt, int align) +{ + int line_size; + int sample_size = av_get_bytes_per_sample(sample_fmt); + int planar = av_sample_fmt_is_planar(sample_fmt); + + /* validate parameter ranges */ + if (!sample_size || nb_samples <= 0 || nb_channels <= 0) + return AVERROR(EINVAL); + + /* auto-select alignment if not specified */ + if (!align) { + if (nb_samples > INT_MAX - 31) + return AVERROR(EINVAL); + align = 1; + nb_samples = FFALIGN(nb_samples, 32); + } + + /* check for integer overflow */ + if (nb_channels > INT_MAX / align || + (int64_t)nb_channels * nb_samples > (INT_MAX - (align * nb_channels)) / sample_size) + return AVERROR(EINVAL); + + line_size = planar ? FFALIGN(nb_samples * sample_size, align) : + FFALIGN(nb_samples * sample_size * nb_channels, align); + if (linesize) + *linesize = line_size; + + return planar ? line_size * nb_channels : line_size; +} + +int av_samples_fill_arrays(uint8_t **audio_data, int *linesize, + const uint8_t *buf, int nb_channels, int nb_samples, + enum AVSampleFormat sample_fmt, int align) +{ + int ch, planar, buf_size, line_size; + + planar = av_sample_fmt_is_planar(sample_fmt); + buf_size = av_samples_get_buffer_size(&line_size, nb_channels, nb_samples, + sample_fmt, align); + if (buf_size < 0) + return buf_size; + + audio_data[0] = (uint8_t *)buf; + for (ch = 1; planar && ch < nb_channels; ch++) + audio_data[ch] = audio_data[ch-1] + line_size; + + if (linesize) + *linesize = line_size; + + return buf_size; +} + +int av_samples_alloc(uint8_t **audio_data, int *linesize, int nb_channels, + int nb_samples, enum AVSampleFormat sample_fmt, int align) +{ + uint8_t *buf; + int size = av_samples_get_buffer_size(NULL, nb_channels, nb_samples, + sample_fmt, align); + if (size < 0) + return size; + + buf = av_malloc(size); + if (!buf) + return AVERROR(ENOMEM); + + size = av_samples_fill_arrays(audio_data, linesize, buf, nb_channels, + nb_samples, sample_fmt, align); + if (size < 0) { + av_free(buf); + return size; + } + + av_samples_set_silence(audio_data, 0, nb_samples, nb_channels, sample_fmt); + + return size; +} + +int av_samples_alloc_array_and_samples(uint8_t ***audio_data, int *linesize, int nb_channels, + int nb_samples, enum AVSampleFormat sample_fmt, int align) +{ + int ret, nb_planes = av_sample_fmt_is_planar(sample_fmt) ? nb_channels : 1; + + *audio_data = av_calloc(nb_planes, sizeof(**audio_data)); + if (!*audio_data) + return AVERROR(ENOMEM); + ret = av_samples_alloc(*audio_data, linesize, nb_channels, + nb_samples, sample_fmt, align); + if (ret < 0) + av_freep(audio_data); + return ret; +} + +int av_samples_copy(uint8_t **dst, uint8_t * const *src, int dst_offset, + int src_offset, int nb_samples, int nb_channels, + enum AVSampleFormat sample_fmt) +{ + int planar = av_sample_fmt_is_planar(sample_fmt); + int planes = planar ? nb_channels : 1; + int block_align = av_get_bytes_per_sample(sample_fmt) * (planar ? 1 : nb_channels); + int data_size = nb_samples * block_align; + int i; + + dst_offset *= block_align; + src_offset *= block_align; + + if((dst[0] < src[0] ? src[0] - dst[0] : dst[0] - src[0]) >= data_size) { + for (i = 0; i < planes; i++) + memcpy(dst[i] + dst_offset, src[i] + src_offset, data_size); + } else { + for (i = 0; i < planes; i++) + memmove(dst[i] + dst_offset, src[i] + src_offset, data_size); + } + + return 0; +} + +int av_samples_set_silence(uint8_t **audio_data, int offset, int nb_samples, + int nb_channels, enum AVSampleFormat sample_fmt) +{ + int planar = av_sample_fmt_is_planar(sample_fmt); + int planes = planar ? nb_channels : 1; + int block_align = av_get_bytes_per_sample(sample_fmt) * (planar ? 1 : nb_channels); + int data_size = nb_samples * block_align; + int fill_char = (sample_fmt == AV_SAMPLE_FMT_U8 || + sample_fmt == AV_SAMPLE_FMT_U8P) ? 0x80 : 0x00; + int i; + + offset *= block_align; + + for (i = 0; i < planes; i++) + memset(audio_data[i] + offset, fill_char, data_size); + + return 0; +} diff --git a/ext/at3_standalone/sinewin_tablegen.h b/ext/at3_standalone/sinewin_tablegen.h index 4432135f19..df024b821e 100644 --- a/ext/at3_standalone/sinewin_tablegen.h +++ b/ext/at3_standalone/sinewin_tablegen.h @@ -27,9 +27,10 @@ // do not use libavutil/libm.h since this is compiled both // for the host and the target and config.h is only valid for the target #include -#include "libavcodec/aac_defines.h" -#include "libavutil/attributes.h" -#include "libavutil/common.h" + +#include "aac_defines.h" +#include "attributes.h" +#include "common.h" #if !CONFIG_HARDCODED_TABLES SINETABLE( 32); diff --git a/ext/at3_standalone/utils.c b/ext/at3_standalone/utils.c new file mode 100644 index 0000000000..6ed989c988 --- /dev/null +++ b/ext/at3_standalone/utils.c @@ -0,0 +1,1590 @@ +/* + * utils for libavcodec + * Copyright (c) 2001 Fabrice Bellard + * Copyright (c) 2002-2004 Michael Niedermayer + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + * utils. + */ + +#include "util_internal.h" +#include "config.h" +#include "atomic.h" +#include "avcodec.h" +#include "attributes.h" +#include "channel_layout.h" +#include "frame.h" +#include "internal.h" +#include "mathematics.h" +#include "pixdesc.h" +#include "avstring.h" +#include "samplefmt.h" +#include "dict.h" +#include "avcodec.h" +#include "opt.h" +#include "internal.h" +#include "bytestream.h" +#include "version.h" +#include +#include +#include +#include +#if CONFIG_ICONV +# include +#endif + +#if HAVE_PTHREADS || HAVE_W32THREADS || HAVE_OS2THREADS +static int default_lockmgr_cb(void **arg, enum AVLockOp op) +{ + void * volatile * mutex = arg; + int err; + + switch (op) { + case AV_LOCK_CREATE: + return 0; + case AV_LOCK_OBTAIN: + if (!*mutex) { + pthread_mutex_t *tmp = av_malloc(sizeof(pthread_mutex_t)); + if (!tmp) + return AVERROR(ENOMEM); + if ((err = pthread_mutex_init(tmp, NULL))) { + av_free(tmp); + return AVERROR(err); + } + if (avpriv_atomic_ptr_cas(mutex, NULL, tmp)) { + pthread_mutex_destroy(tmp); + av_free(tmp); + } + } + + if ((err = pthread_mutex_lock(*mutex))) + return AVERROR(err); + + return 0; + case AV_LOCK_RELEASE: + if ((err = pthread_mutex_unlock(*mutex))) + return AVERROR(err); + + return 0; + case AV_LOCK_DESTROY: + if (*mutex) + pthread_mutex_destroy(*mutex); + av_free(*mutex); + avpriv_atomic_ptr_cas(mutex, *mutex, NULL); + return 0; + } + return 1; +} +static int (*lockmgr_cb)(void **mutex, enum AVLockOp op) = default_lockmgr_cb; +#else +static int (*lockmgr_cb)(void **mutex, enum AVLockOp op) = NULL; +#endif + + +volatile int ff_avcodec_locked; +static int volatile entangled_thread_counter = 0; +static void *codec_mutex; +static void *avformat_mutex; + +void av_fast_padded_malloc(void *ptr, unsigned int *size, size_t min_size) +{ + uint8_t **p = ptr; + if (min_size > SIZE_MAX - AV_INPUT_BUFFER_PADDING_SIZE) { + av_freep(p); + *size = 0; + return; + } + if (!ff_fast_malloc(p, size, min_size + AV_INPUT_BUFFER_PADDING_SIZE, 1)) + memset(*p + min_size, 0, AV_INPUT_BUFFER_PADDING_SIZE); +} + +void av_fast_padded_mallocz(void *ptr, unsigned int *size, size_t min_size) +{ + uint8_t **p = ptr; + if (min_size > SIZE_MAX - AV_INPUT_BUFFER_PADDING_SIZE) { + av_freep(p); + *size = 0; + return; + } + if (!ff_fast_malloc(p, size, min_size + AV_INPUT_BUFFER_PADDING_SIZE, 1)) + memset(*p, 0, min_size + AV_INPUT_BUFFER_PADDING_SIZE); +} + +/* encoder management */ +static AVCodec *first_avcodec = NULL; +static AVCodec **last_avcodec = &first_avcodec; + +AVCodec *av_codec_next(const AVCodec *c) +{ + if (c) + return c->next; + else + return first_avcodec; +} + +static av_cold void avcodec_init(void) +{ + static int initialized = 0; + + if (initialized != 0) + return; + initialized = 1; +} + +int av_codec_is_encoder(const AVCodec *codec) +{ + return codec && (codec->encode_sub || codec->encode2); +} + +int av_codec_is_decoder(const AVCodec *codec) +{ + return codec && codec->decode; +} + +av_cold void avcodec_register(AVCodec *codec) +{ + AVCodec **p; + avcodec_init(); + p = last_avcodec; + codec->next = NULL; + + while(*p || avpriv_atomic_ptr_cas((void * volatile *)p, NULL, codec)) + p = &(*p)->next; + last_avcodec = &codec->next; + + if (codec->init_static_data) + codec->init_static_data(codec); +} + +#if FF_API_EMU_EDGE +unsigned avcodec_get_edge_width(void) +{ + return EDGE_WIDTH; +} +#endif + +int ff_side_data_update_matrix_encoding(AVFrame *frame, + enum AVMatrixEncoding matrix_encoding) +{ + AVFrameSideData *side_data; + enum AVMatrixEncoding *data; + + side_data = av_frame_get_side_data(frame, AV_FRAME_DATA_MATRIXENCODING); + if (!side_data) + side_data = av_frame_new_side_data(frame, AV_FRAME_DATA_MATRIXENCODING, + sizeof(enum AVMatrixEncoding)); + + if (!side_data) + return AVERROR(ENOMEM); + + data = (enum AVMatrixEncoding*)side_data->data; + *data = matrix_encoding; + + return 0; +} + +int avcodec_fill_audio_frame(AVFrame *frame, int nb_channels, + enum AVSampleFormat sample_fmt, const uint8_t *buf, + int buf_size, int align) +{ + int ch, planar, needed_size, ret = 0; + + needed_size = av_samples_get_buffer_size(NULL, nb_channels, + frame->nb_samples, sample_fmt, + align); + if (buf_size < needed_size) + return AVERROR(EINVAL); + + planar = av_sample_fmt_is_planar(sample_fmt); + if (planar && nb_channels > AV_NUM_DATA_POINTERS) { + if (!(frame->extended_data = av_mallocz_array(nb_channels, + sizeof(*frame->extended_data)))) + return AVERROR(ENOMEM); + } else { + frame->extended_data = frame->data; + } + + if ((ret = av_samples_fill_arrays(frame->extended_data, &frame->linesize[0], + (uint8_t *)(intptr_t)buf, nb_channels, frame->nb_samples, + sample_fmt, align)) < 0) { + if (frame->extended_data != frame->data) + av_freep(&frame->extended_data); + return ret; + } + if (frame->extended_data != frame->data) { + for (ch = 0; ch < AV_NUM_DATA_POINTERS; ch++) + frame->data[ch] = frame->extended_data[ch]; + } + + return ret; +} + +static int update_frame_pool(AVCodecContext *avctx, AVFrame *frame) +{ + FramePool *pool = avctx->internal->pool; + int i, ret; + + switch (avctx->codec_type) { + case AVMEDIA_TYPE_AUDIO: { + int ch = av_frame_get_channels(frame); //av_get_channel_layout_nb_channels(frame->channel_layout); + int planar = av_sample_fmt_is_planar(frame->format); + int planes = planar ? ch : 1; + + if (pool->format == frame->format && pool->planes == planes && + pool->channels == ch && frame->nb_samples == pool->samples) + return 0; + + av_buffer_pool_uninit(&pool->pools[0]); + ret = av_samples_get_buffer_size(&pool->linesize[0], ch, + frame->nb_samples, frame->format, 0); + if (ret < 0) + goto fail; + + pool->pools[0] = av_buffer_pool_init(pool->linesize[0], NULL); + if (!pool->pools[0]) { + ret = AVERROR(ENOMEM); + goto fail; + } + + pool->format = frame->format; + pool->planes = planes; + pool->channels = ch; + pool->samples = frame->nb_samples; + break; + } + default: av_assert0(0); + } + return 0; +fail: + for (i = 0; i < 4; i++) + av_buffer_pool_uninit(&pool->pools[i]); + pool->format = -1; + pool->planes = pool->channels = pool->samples = 0; + pool->width = pool->height = 0; + return ret; +} + +static int audio_get_buffer(AVCodecContext *avctx, AVFrame *frame) +{ + FramePool *pool = avctx->internal->pool; + int planes = pool->planes; + int i; + + frame->linesize[0] = pool->linesize[0]; + + if (planes > AV_NUM_DATA_POINTERS) { + frame->extended_data = av_mallocz_array(planes, sizeof(*frame->extended_data)); + frame->nb_extended_buf = planes - AV_NUM_DATA_POINTERS; + frame->extended_buf = av_mallocz_array(frame->nb_extended_buf, + sizeof(*frame->extended_buf)); + if (!frame->extended_data || !frame->extended_buf) { + av_freep(&frame->extended_data); + av_freep(&frame->extended_buf); + return AVERROR(ENOMEM); + } + } else { + frame->extended_data = frame->data; + av_assert0(frame->nb_extended_buf == 0); + } + + for (i = 0; i < FFMIN(planes, AV_NUM_DATA_POINTERS); i++) { + frame->buf[i] = av_buffer_pool_get(pool->pools[0]); + if (!frame->buf[i]) + goto fail; + frame->extended_data[i] = frame->data[i] = frame->buf[i]->data; + } + for (i = 0; i < frame->nb_extended_buf; i++) { + frame->extended_buf[i] = av_buffer_pool_get(pool->pools[0]); + if (!frame->extended_buf[i]) + goto fail; + frame->extended_data[i + AV_NUM_DATA_POINTERS] = frame->extended_buf[i]->data; + } + + if (avctx->debug & FF_DEBUG_BUFFERS) + av_log(avctx, AV_LOG_DEBUG, "default_get_buffer called on frame %p", frame); + + return 0; +fail: + av_frame_unref(frame); + return AVERROR(ENOMEM); +} + +int avcodec_default_get_buffer2(AVCodecContext *avctx, AVFrame *frame, int flags) +{ + int ret; + + if ((ret = update_frame_pool(avctx, frame)) < 0) + return ret; + + switch (avctx->codec_type) { + case AVMEDIA_TYPE_VIDEO: + return -1; + case AVMEDIA_TYPE_AUDIO: + return audio_get_buffer(avctx, frame); + default: + return -1; + } +} + +static int add_metadata_from_side_data(AVPacket *avpkt, AVFrame *frame) +{ + int size; + const uint8_t *side_metadata; + + AVDictionary **frame_md = avpriv_frame_get_metadatap(frame); + + side_metadata = av_packet_get_side_data(avpkt, + AV_PKT_DATA_STRINGS_METADATA, &size); + return av_packet_unpack_dictionary(side_metadata, size, frame_md); +} + +int ff_init_buffer_info(AVCodecContext *avctx, AVFrame *frame) +{ + AVPacket *pkt = avctx->internal->pkt; + int i; + static const struct { + enum AVPacketSideDataType packet; + enum AVFrameSideDataType frame; + } sd[] = { + { AV_PKT_DATA_REPLAYGAIN , AV_FRAME_DATA_REPLAYGAIN }, + { AV_PKT_DATA_DISPLAYMATRIX, AV_FRAME_DATA_DISPLAYMATRIX }, + { AV_PKT_DATA_STEREO3D, AV_FRAME_DATA_STEREO3D }, + { AV_PKT_DATA_AUDIO_SERVICE_TYPE, AV_FRAME_DATA_AUDIO_SERVICE_TYPE }, + }; + + if (pkt) { + frame->pkt_pts = pkt->pts; + av_frame_set_pkt_pos (frame, pkt->pos); + av_frame_set_pkt_duration(frame, pkt->duration); + av_frame_set_pkt_size (frame, pkt->size); + + for (i = 0; i < FF_ARRAY_ELEMS(sd); i++) { + int size; + uint8_t *packet_sd = av_packet_get_side_data(pkt, sd[i].packet, &size); + if (packet_sd) { + AVFrameSideData *frame_sd = av_frame_new_side_data(frame, + sd[i].frame, + size); + if (!frame_sd) + return AVERROR(ENOMEM); + + memcpy(frame_sd->data, packet_sd, size); + } + } + add_metadata_from_side_data(pkt, frame); + } else { + frame->pkt_pts = AV_NOPTS_VALUE; + av_frame_set_pkt_pos (frame, -1); + av_frame_set_pkt_duration(frame, 0); + av_frame_set_pkt_size (frame, -1); + } + frame->reordered_opaque = avctx->reordered_opaque; + + if (frame->color_primaries == AVCOL_PRI_UNSPECIFIED) + frame->color_primaries = avctx->color_primaries; + if (frame->color_trc == AVCOL_TRC_UNSPECIFIED) + frame->color_trc = avctx->color_trc; + if (av_frame_get_colorspace(frame) == AVCOL_SPC_UNSPECIFIED) + av_frame_set_colorspace(frame, avctx->colorspace); + if (av_frame_get_color_range(frame) == AVCOL_RANGE_UNSPECIFIED) + av_frame_set_color_range(frame, avctx->color_range); + if (frame->chroma_location == AVCHROMA_LOC_UNSPECIFIED) + frame->chroma_location = avctx->chroma_sample_location; + + switch (avctx->codec->type) { + case AVMEDIA_TYPE_VIDEO: + break; + case AVMEDIA_TYPE_AUDIO: + if (!frame->sample_rate) + frame->sample_rate = avctx->sample_rate; + if (frame->format < 0) + frame->format = avctx->sample_fmt; + if (!frame->channel_layout) { + if (avctx->channel_layout) { + if (av_get_channel_layout_nb_channels(avctx->channel_layout) != + avctx->channels) { + av_log(avctx, AV_LOG_ERROR, "Inconsistent channel " + "configuration.\n"); + return AVERROR(EINVAL); + } + + frame->channel_layout = avctx->channel_layout; + } else { + if (avctx->channels > FF_SANE_NB_CHANNELS) { + av_log(avctx, AV_LOG_ERROR, "Too many channels: %d.\n", + avctx->channels); + return AVERROR(ENOSYS); + } + } + } + av_frame_set_channels(frame, avctx->channels); + break; + } + return 0; +} + +int ff_decode_frame_props(AVCodecContext *avctx, AVFrame *frame) +{ + return ff_init_buffer_info(avctx, frame); +} + +static int get_buffer_internal(AVCodecContext *avctx, AVFrame *frame, int flags) +{ + const AVHWAccel *hwaccel = avctx->hwaccel; + int override_dimensions = 1; + int ret; + + ret = ff_decode_frame_props(avctx, frame); + if (ret < 0) + return ret; + + if (hwaccel) { + if (hwaccel->alloc_frame) { + ret = hwaccel->alloc_frame(avctx, frame); + goto end; + } + } else + avctx->sw_pix_fmt = avctx->pix_fmt; + + ret = avctx->get_buffer2(avctx, frame, flags); + +end: + return ret; +} + +int ff_get_buffer(AVCodecContext *avctx, AVFrame *frame, int flags) +{ + int ret = get_buffer_internal(avctx, frame, flags); + if (ret < 0) { + av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); + frame->width = frame->height = 0; + } + return ret; +} + +int avcodec_default_execute(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2), void *arg, int *ret, int count, int size) +{ + int i; + + for (i = 0; i < count; i++) { + int r = func(c, (char *)arg + i * size); + if (ret) + ret[i] = r; + } + return 0; +} + +int avcodec_default_execute2(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2, int jobnr, int threadnr), void *arg, int *ret, int count) +{ + int i; + + for (i = 0; i < count; i++) { + int r = func(c, arg, i, 0); + if (ret) + ret[i] = r; + } + return 0; +} + +enum AVPixelFormat avcodec_default_get_format(struct AVCodecContext *s, const enum AVPixelFormat *fmt) +{ + while (*fmt != AV_PIX_FMT_NONE) + ++fmt; + return fmt[0]; +} + +static AVHWAccel *find_hwaccel(enum AVCodecID codec_id, + enum AVPixelFormat pix_fmt) +{ + AVHWAccel *hwaccel = NULL; + + while ((hwaccel = av_hwaccel_next(hwaccel))) + if (hwaccel->id == codec_id + && hwaccel->pix_fmt == pix_fmt) + return hwaccel; + return NULL; +} + +static int setup_hwaccel(AVCodecContext *avctx, + const enum AVPixelFormat fmt, + const char *name) +{ + AVHWAccel *hwa = find_hwaccel(avctx->codec_id, fmt); + int ret = 0; + + if (avctx->active_thread_type & FF_THREAD_FRAME) { + av_log(avctx, AV_LOG_WARNING, + "Hardware accelerated decoding with frame threading is known to be unstable and its use is discouraged.\n"); + } + + if (!hwa) { + av_log(avctx, AV_LOG_ERROR, + "Could not find an AVHWAccel for the pixel format: %s", + name); + return AVERROR(ENOENT); + } + + if (hwa->capabilities & HWACCEL_CODEC_CAP_EXPERIMENTAL && + avctx->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) { + av_log(avctx, AV_LOG_WARNING, "Ignoring experimental hwaccel: %s\n", + hwa->name); + return AVERROR_PATCHWELCOME; + } + + if (hwa->priv_data_size) { + avctx->internal->hwaccel_priv_data = av_mallocz(hwa->priv_data_size); + if (!avctx->internal->hwaccel_priv_data) + return AVERROR(ENOMEM); + } + + if (hwa->init) { + ret = hwa->init(avctx); + if (ret < 0) { + av_freep(&avctx->internal->hwaccel_priv_data); + return ret; + } + } + + avctx->hwaccel = hwa; + + return 0; +} + +MAKE_ACCESSORS(AVCodecContext, codec, AVRational, pkt_timebase) +MAKE_ACCESSORS(AVCodecContext, codec, const AVCodecDescriptor *, codec_descriptor) +MAKE_ACCESSORS(AVCodecContext, codec, int, lowres) +MAKE_ACCESSORS(AVCodecContext, codec, int, seek_preroll) +MAKE_ACCESSORS(AVCodecContext, codec, uint16_t*, chroma_intra_matrix) + +unsigned av_codec_get_codec_properties(const AVCodecContext *codec) +{ + return codec->properties; +} + +int av_codec_get_max_lowres(const AVCodec *codec) +{ + return codec->max_lowres; +} + +static void get_subtitle_defaults(AVSubtitle *sub) +{ + memset(sub, 0, sizeof(*sub)); + sub->pts = AV_NOPTS_VALUE; +} + +static int64_t get_bit_rate(AVCodecContext *ctx) +{ + int64_t bit_rate; + int bits_per_sample; + + switch (ctx->codec_type) { + case AVMEDIA_TYPE_VIDEO: + case AVMEDIA_TYPE_DATA: + case AVMEDIA_TYPE_SUBTITLE: + case AVMEDIA_TYPE_ATTACHMENT: + bit_rate = ctx->bit_rate; + break; + case AVMEDIA_TYPE_AUDIO: + bits_per_sample = av_get_bits_per_sample(ctx->codec_id); + bit_rate = bits_per_sample ? ctx->sample_rate * (int64_t)ctx->channels * bits_per_sample : ctx->bit_rate; + break; + default: + bit_rate = 0; + break; + } + return bit_rate; +} + +int attribute_align_arg ff_codec_open2_recursive(AVCodecContext *avctx, const AVCodec *codec, AVDictionary **options) +{ + int ret = 0; + + ff_unlock_avcodec(codec); + + ret = avcodec_open2(avctx, codec, options); + + ff_lock_avcodec(avctx, codec); + return ret; +} + +int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *codec, AVDictionary **options) +{ + int ret = 0; + const AVPixFmtDescriptor *pixdesc; + + if (avcodec_is_open(avctx)) + return 0; + + if ((!codec && !avctx->codec)) { + av_log(avctx, AV_LOG_ERROR, "No codec provided to avcodec_open2()\n"); + return AVERROR(EINVAL); + } + if ((codec && avctx->codec && codec != avctx->codec)) { + av_log(avctx, AV_LOG_ERROR, "This AVCodecContext was allocated for %s, " + "but %s passed to avcodec_open2()\n", avctx->codec->name, codec->name); + return AVERROR(EINVAL); + } + if (!codec) + codec = avctx->codec; + + if (avctx->extradata_size < 0 || avctx->extradata_size >= FF_MAX_EXTRADATA_SIZE) + return AVERROR(EINVAL); + + ret = ff_lock_avcodec(avctx, codec); + if (ret < 0) + return ret; + + avctx->internal = av_mallocz(sizeof(AVCodecInternal)); + if (!avctx->internal) { + ret = AVERROR(ENOMEM); + goto end; + } + + avctx->internal->pool = av_mallocz(sizeof(*avctx->internal->pool)); + if (!avctx->internal->pool) { + ret = AVERROR(ENOMEM); + goto free_and_end; + } + + avctx->internal->to_free = av_frame_alloc(); + if (!avctx->internal->to_free) { + ret = AVERROR(ENOMEM); + goto free_and_end; + } + + if (codec->priv_data_size > 0) { + if (!avctx->priv_data) { + avctx->priv_data = av_mallocz(codec->priv_data_size); + if (!avctx->priv_data) { + ret = AVERROR(ENOMEM); + goto end; + } + if (codec->priv_class) { + *(const AVClass **)avctx->priv_data = codec->priv_class; + av_opt_set_defaults(avctx->priv_data); + } + } + } else { + avctx->priv_data = NULL; + } + + /* if the decoder init function was already called previously, + * free the already allocated subtitle_header before overwriting it */ + if (av_codec_is_decoder(codec)) + av_freep(&avctx->subtitle_header); + + if (avctx->channels > FF_SANE_NB_CHANNELS) { + ret = AVERROR(EINVAL); + goto free_and_end; + } + + avctx->codec = codec; + if ((avctx->codec_type == AVMEDIA_TYPE_UNKNOWN || avctx->codec_type == codec->type) && + avctx->codec_id == AV_CODEC_ID_NONE) { + avctx->codec_type = codec->type; + avctx->codec_id = codec->id; + } + if (avctx->codec_id != codec->id || (avctx->codec_type != codec->type + && avctx->codec_type != AVMEDIA_TYPE_ATTACHMENT)) { + av_log(avctx, AV_LOG_ERROR, "Codec type or id mismatches\n"); + ret = AVERROR(EINVAL); + goto free_and_end; + } + avctx->frame_number = 0; + avctx->codec_descriptor = avcodec_descriptor_get(avctx->codec_id); + + if ((avctx->codec->capabilities & AV_CODEC_CAP_EXPERIMENTAL) && + avctx->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) { + const char *codec_string = av_codec_is_encoder(codec) ? "encoder" : "decoder"; + AVCodec *codec2; + av_log(avctx, AV_LOG_ERROR, + "The %s '%s' is experimental but experimental codecs are not enabled, " + "add '-strict %d' if you want to use it.\n", + codec_string, codec->name, FF_COMPLIANCE_EXPERIMENTAL); + codec2 = av_codec_is_encoder(codec) ? avcodec_find_encoder(codec->id) : avcodec_find_decoder(codec->id); + if (!(codec2->capabilities & AV_CODEC_CAP_EXPERIMENTAL)) + av_log(avctx, AV_LOG_ERROR, "Alternatively use the non experimental %s '%s'.\n", + codec_string, codec2->name); + ret = AVERROR_EXPERIMENTAL; + goto free_and_end; + } + + if (avctx->codec_type == AVMEDIA_TYPE_AUDIO && + (!avctx->time_base.num || !avctx->time_base.den)) { + avctx->time_base.num = 1; + avctx->time_base.den = avctx->sample_rate; + } + + if (!HAVE_THREADS) + av_log(avctx, AV_LOG_WARNING, "Warning: not compiled with thread support, using thread emulation\n"); + + if (!HAVE_THREADS && !(codec->capabilities & AV_CODEC_CAP_AUTO_THREADS)) + avctx->thread_count = 1; + + if (avctx->codec->max_lowres < avctx->lowres || avctx->lowres < 0) { + av_log(avctx, AV_LOG_ERROR, "The maximum value for lowres supported by the decoder is %d\n", + avctx->codec->max_lowres); + ret = AVERROR(EINVAL); + goto free_and_end; + } + +#if FF_API_VISMV + if (avctx->debug_mv) + av_log(avctx, AV_LOG_WARNING, "The 'vismv' option is deprecated, " + "see the codecview filter instead.\n"); +#endif + + + avctx->pts_correction_num_faulty_pts = + avctx->pts_correction_num_faulty_dts = 0; + avctx->pts_correction_last_pts = + avctx->pts_correction_last_dts = INT64_MIN; + + if ( !CONFIG_GRAY && avctx->flags & AV_CODEC_FLAG_GRAY + && avctx->codec_descriptor->type == AVMEDIA_TYPE_VIDEO) + av_log(avctx, AV_LOG_WARNING, + "gray decoding requested but not enabled at configuration time\n"); + + if ( avctx->codec->init && (!(avctx->active_thread_type&FF_THREAD_FRAME) + || avctx->internal->frame_thread_encoder)) { + ret = avctx->codec->init(avctx); + if (ret < 0) { + goto free_and_end; + } + } + + ret=0; + +#if FF_API_AUDIOENC_DELAY + if (av_codec_is_encoder(avctx->codec)) + avctx->delay = avctx->initial_padding; +#endif + + if (av_codec_is_decoder(avctx->codec)) { + if (!avctx->bit_rate) + avctx->bit_rate = get_bit_rate(avctx); + /* validate channel layout from the decoder */ + if (avctx->channel_layout) { + int channels = av_get_channel_layout_nb_channels(avctx->channel_layout); + if (!avctx->channels) + avctx->channels = channels; + else if (channels != avctx->channels) { + char buf[512] = ""; + av_log(avctx, AV_LOG_WARNING, + "Channel layout '%s' with %d channels does not match specified number of channels %d: " + "ignoring specified channel layout\n", + buf, channels, avctx->channels); + avctx->channel_layout = 0; + } + } + if (avctx->channels && avctx->channels < 0 || + avctx->channels > FF_SANE_NB_CHANNELS) { + ret = AVERROR(EINVAL); + goto free_and_end; + } + +#if FF_API_AVCTX_TIMEBASE + if (avctx->framerate.num > 0 && avctx->framerate.den > 0) + avctx->time_base = av_inv_q(av_mul_q(avctx->framerate, (AVRational){avctx->ticks_per_frame, 1})); +#endif + } + if (codec->priv_data_size > 0 && avctx->priv_data && codec->priv_class) { + av_assert0(*(const AVClass **)avctx->priv_data == codec->priv_class); + } + +end: + ff_unlock_avcodec(codec); + + return ret; +free_and_end: + if (avctx->codec && + (avctx->codec->caps_internal & FF_CODEC_CAP_INIT_CLEANUP)) + avctx->codec->close(avctx); + + if (codec->priv_class && codec->priv_data_size) + av_opt_free(avctx->priv_data); + av_opt_free(avctx); + +#if FF_API_CODED_FRAME +FF_DISABLE_DEPRECATION_WARNINGS + av_frame_free(&avctx->coded_frame); +FF_ENABLE_DEPRECATION_WARNINGS +#endif + + av_freep(&avctx->priv_data); + if (avctx->internal) { + av_frame_free(&avctx->internal->to_free); + av_freep(&avctx->internal->pool); + } + av_freep(&avctx->internal); + avctx->codec = NULL; + goto end; +} + +int ff_alloc_packet2(AVCodecContext *avctx, AVPacket *avpkt, int64_t size, int64_t min_size) +{ + if (avpkt->size < 0) { + av_log(avctx, AV_LOG_ERROR, "Invalid negative user packet size %d\n", avpkt->size); + return AVERROR(EINVAL); + } + if (size < 0 || size > INT_MAX - AV_INPUT_BUFFER_PADDING_SIZE) { + av_log(avctx, AV_LOG_ERROR, "Invalid minimum required packet size %"PRId64" (max allowed is %d)\n", + size, INT_MAX - AV_INPUT_BUFFER_PADDING_SIZE); + return AVERROR(EINVAL); + } + + if (avctx && 2*min_size < size) { // FIXME The factor needs to be finetuned + av_assert0(!avpkt->data || avpkt->data != avctx->internal->byte_buffer); + if (!avpkt->data || avpkt->size < size) { + av_fast_padded_malloc(&avctx->internal->byte_buffer, &avctx->internal->byte_buffer_size, size); + avpkt->data = avctx->internal->byte_buffer; + avpkt->size = avctx->internal->byte_buffer_size; + } + } + + if (avpkt->data) { + AVBufferRef *buf = avpkt->buf; + + if (avpkt->size < size) { + av_log(avctx, AV_LOG_ERROR, "User packet is too small (%d < %"PRId64")\n", avpkt->size, size); + return AVERROR(EINVAL); + } + + av_init_packet(avpkt); + avpkt->buf = buf; + avpkt->size = size; + return 0; + } else { + int ret = av_new_packet(avpkt, size); + if (ret < 0) + av_log(avctx, AV_LOG_ERROR, "Failed to allocate packet of size %"PRId64"\n", size); + return ret; + } +} + +int ff_alloc_packet(AVPacket *avpkt, int size) +{ + return ff_alloc_packet2(NULL, avpkt, size, 0); +} + +av_cold int avcodec_close(AVCodecContext *avctx) +{ + int i; + + if (!avctx) + return 0; + + if (avcodec_is_open(avctx)) { + FramePool *pool = avctx->internal->pool; + if (avctx->codec && avctx->codec->close) + avctx->codec->close(avctx); + avctx->internal->byte_buffer_size = 0; + av_freep(&avctx->internal->byte_buffer); + av_frame_free(&avctx->internal->to_free); + for (i = 0; i < FF_ARRAY_ELEMS(pool->pools); i++) + av_buffer_pool_uninit(&pool->pools[i]); + av_freep(&avctx->internal->pool); + + if (avctx->hwaccel && avctx->hwaccel->uninit) + avctx->hwaccel->uninit(avctx); + av_freep(&avctx->internal->hwaccel_priv_data); + + av_freep(&avctx->internal); + } + + for (i = 0; i < avctx->nb_coded_side_data; i++) + av_freep(&avctx->coded_side_data[i].data); + av_freep(&avctx->coded_side_data); + avctx->nb_coded_side_data = 0; + + if (avctx->priv_data && avctx->codec && avctx->codec->priv_class) + av_opt_free(avctx->priv_data); + av_opt_free(avctx); + av_freep(&avctx->priv_data); + if (av_codec_is_encoder(avctx->codec)) { + av_freep(&avctx->extradata); +#if FF_API_CODED_FRAME +FF_DISABLE_DEPRECATION_WARNINGS + av_frame_free(&avctx->coded_frame); +FF_ENABLE_DEPRECATION_WARNINGS +#endif + } + avctx->codec = NULL; + avctx->active_thread_type = 0; + + return 0; +} + +static enum AVCodecID remap_deprecated_codec_id(enum AVCodecID id) +{ + switch(id){ + //This is for future deprecatec codec ids, its empty since + //last major bump but will fill up again over time, please don't remove it + default : return id; + } +} + +static AVCodec *find_encdec(enum AVCodecID id, int encoder) +{ + AVCodec *p, *experimental = NULL; + p = first_avcodec; + id= remap_deprecated_codec_id(id); + while (p) { + if ((encoder ? av_codec_is_encoder(p) : av_codec_is_decoder(p)) && + p->id == id) { + if (p->capabilities & AV_CODEC_CAP_EXPERIMENTAL && !experimental) { + experimental = p; + } else + return p; + } + p = p->next; + } + return experimental; +} + +AVCodec *avcodec_find_encoder(enum AVCodecID id) +{ + return find_encdec(id, 1); +} + +AVCodec *avcodec_find_encoder_by_name(const char *name) +{ + AVCodec *p; + if (!name) + return NULL; + p = first_avcodec; + while (p) { + if (av_codec_is_encoder(p) && strcmp(name, p->name) == 0) + return p; + p = p->next; + } + return NULL; +} + +AVCodec *avcodec_find_decoder(enum AVCodecID id) +{ + return find_encdec(id, 0); +} + +AVCodec *avcodec_find_decoder_by_name(const char *name) +{ + AVCodec *p; + if (!name) + return NULL; + p = first_avcodec; + while (p) { + if (av_codec_is_decoder(p) && strcmp(name, p->name) == 0) + return p; + p = p->next; + } + return NULL; +} + +const char *avcodec_get_name(enum AVCodecID id) +{ + const AVCodecDescriptor *cd; + AVCodec *codec; + + if (id == AV_CODEC_ID_NONE) + return "none"; + cd = avcodec_descriptor_get(id); + if (cd) + return cd->name; + av_log(NULL, AV_LOG_WARNING, "Codec 0x%x is not in the full list.\n", id); + codec = avcodec_find_decoder(id); + if (codec) + return codec->name; + codec = avcodec_find_encoder(id); + if (codec) + return codec->name; + return "unknown_codec"; +} + +const char *av_get_profile_name(const AVCodec *codec, int profile) +{ + const AVProfile *p; + if (profile == FF_PROFILE_UNKNOWN || !codec->profiles) + return NULL; + + for (p = codec->profiles; p->profile != FF_PROFILE_UNKNOWN; p++) + if (p->profile == profile) + return p->name; + + return NULL; +} + +const char *avcodec_profile_name(enum AVCodecID codec_id, int profile) +{ + const AVCodecDescriptor *desc = avcodec_descriptor_get(codec_id); + const AVProfile *p; + + if (profile == FF_PROFILE_UNKNOWN || !desc || !desc->profiles) + return NULL; + + for (p = desc->profiles; p->profile != FF_PROFILE_UNKNOWN; p++) + if (p->profile == profile) + return p->name; + + return NULL; +} + +void avcodec_flush_buffers(AVCodecContext *avctx) +{ + if (avctx->codec->flush) + avctx->codec->flush(avctx); + + avctx->pts_correction_last_pts = + avctx->pts_correction_last_dts = INT64_MIN; + + if (!avctx->refcounted_frames) + av_frame_unref(avctx->internal->to_free); +} + +int av_get_exact_bits_per_sample(enum AVCodecID codec_id) +{ + switch (codec_id) { + case AV_CODEC_ID_8SVX_EXP: + case AV_CODEC_ID_8SVX_FIB: + case AV_CODEC_ID_ADPCM_CT: + case AV_CODEC_ID_ADPCM_IMA_APC: + case AV_CODEC_ID_ADPCM_IMA_EA_SEAD: + case AV_CODEC_ID_ADPCM_IMA_OKI: + case AV_CODEC_ID_ADPCM_IMA_WS: + case AV_CODEC_ID_ADPCM_G722: + case AV_CODEC_ID_ADPCM_YAMAHA: + case AV_CODEC_ID_ADPCM_AICA: + return 4; + case AV_CODEC_ID_DSD_LSBF: + case AV_CODEC_ID_DSD_MSBF: + case AV_CODEC_ID_DSD_LSBF_PLANAR: + case AV_CODEC_ID_DSD_MSBF_PLANAR: + case AV_CODEC_ID_PCM_ALAW: + case AV_CODEC_ID_PCM_MULAW: + case AV_CODEC_ID_PCM_S8: + case AV_CODEC_ID_PCM_S8_PLANAR: + case AV_CODEC_ID_PCM_U8: + case AV_CODEC_ID_PCM_ZORK: + case AV_CODEC_ID_SDX2_DPCM: + return 8; + case AV_CODEC_ID_PCM_S16BE: + case AV_CODEC_ID_PCM_S16BE_PLANAR: + case AV_CODEC_ID_PCM_S16LE: + case AV_CODEC_ID_PCM_S16LE_PLANAR: + case AV_CODEC_ID_PCM_U16BE: + case AV_CODEC_ID_PCM_U16LE: + return 16; + case AV_CODEC_ID_PCM_S24DAUD: + case AV_CODEC_ID_PCM_S24BE: + case AV_CODEC_ID_PCM_S24LE: + case AV_CODEC_ID_PCM_S24LE_PLANAR: + case AV_CODEC_ID_PCM_U24BE: + case AV_CODEC_ID_PCM_U24LE: + return 24; + case AV_CODEC_ID_PCM_S32BE: + case AV_CODEC_ID_PCM_S32LE: + case AV_CODEC_ID_PCM_S32LE_PLANAR: + case AV_CODEC_ID_PCM_U32BE: + case AV_CODEC_ID_PCM_U32LE: + case AV_CODEC_ID_PCM_F32BE: + case AV_CODEC_ID_PCM_F32LE: + return 32; + case AV_CODEC_ID_PCM_F64BE: + case AV_CODEC_ID_PCM_F64LE: + return 64; + default: + return 0; + } +} + +enum AVCodecID av_get_pcm_codec(enum AVSampleFormat fmt, int be) +{ + static const enum AVCodecID map[AV_SAMPLE_FMT_NB][2] = { + [AV_SAMPLE_FMT_U8 ] = { AV_CODEC_ID_PCM_U8, AV_CODEC_ID_PCM_U8 }, + [AV_SAMPLE_FMT_S16 ] = { AV_CODEC_ID_PCM_S16LE, AV_CODEC_ID_PCM_S16BE }, + [AV_SAMPLE_FMT_S32 ] = { AV_CODEC_ID_PCM_S32LE, AV_CODEC_ID_PCM_S32BE }, + [AV_SAMPLE_FMT_FLT ] = { AV_CODEC_ID_PCM_F32LE, AV_CODEC_ID_PCM_F32BE }, + [AV_SAMPLE_FMT_DBL ] = { AV_CODEC_ID_PCM_F64LE, AV_CODEC_ID_PCM_F64BE }, + [AV_SAMPLE_FMT_U8P ] = { AV_CODEC_ID_PCM_U8, AV_CODEC_ID_PCM_U8 }, + [AV_SAMPLE_FMT_S16P] = { AV_CODEC_ID_PCM_S16LE, AV_CODEC_ID_PCM_S16BE }, + [AV_SAMPLE_FMT_S32P] = { AV_CODEC_ID_PCM_S32LE, AV_CODEC_ID_PCM_S32BE }, + [AV_SAMPLE_FMT_FLTP] = { AV_CODEC_ID_PCM_F32LE, AV_CODEC_ID_PCM_F32BE }, + [AV_SAMPLE_FMT_DBLP] = { AV_CODEC_ID_PCM_F64LE, AV_CODEC_ID_PCM_F64BE }, + }; + if (fmt < 0 || fmt >= AV_SAMPLE_FMT_NB) + return AV_CODEC_ID_NONE; + if (be < 0 || be > 1) + be = AV_NE(1, 0); + return map[fmt][be]; +} + +int av_get_bits_per_sample(enum AVCodecID codec_id) +{ + switch (codec_id) { + case AV_CODEC_ID_ADPCM_SBPRO_2: + return 2; + case AV_CODEC_ID_ADPCM_SBPRO_3: + return 3; + case AV_CODEC_ID_ADPCM_SBPRO_4: + case AV_CODEC_ID_ADPCM_IMA_WAV: + case AV_CODEC_ID_ADPCM_IMA_QT: + case AV_CODEC_ID_ADPCM_SWF: + case AV_CODEC_ID_ADPCM_MS: + return 4; + default: + return av_get_exact_bits_per_sample(codec_id); + } +} + +int av_get_audio_frame_duration(AVCodecContext *avctx, int frame_bytes) +{ + int id, sr, ch, ba, tag, bps; + + id = avctx->codec_id; + sr = avctx->sample_rate; + ch = avctx->channels; + ba = avctx->block_align; + tag = avctx->codec_tag; + bps = av_get_exact_bits_per_sample(avctx->codec_id); + + /* codecs with an exact constant bits per sample */ + if (bps > 0 && ch > 0 && frame_bytes > 0 && ch < 32768 && bps < 32768) + return (frame_bytes * 8LL) / (bps * ch); + bps = avctx->bits_per_coded_sample; + + /* codecs with a fixed packet duration */ + switch (id) { + case AV_CODEC_ID_ADPCM_ADX: return 32; + case AV_CODEC_ID_ADPCM_IMA_QT: return 64; + case AV_CODEC_ID_ADPCM_EA_XAS: return 128; + case AV_CODEC_ID_AMR_NB: + case AV_CODEC_ID_EVRC: + case AV_CODEC_ID_GSM: + case AV_CODEC_ID_QCELP: + case AV_CODEC_ID_RA_288: return 160; + case AV_CODEC_ID_AMR_WB: + case AV_CODEC_ID_GSM_MS: return 320; + case AV_CODEC_ID_MP1: return 384; + case AV_CODEC_ID_ATRAC1: return 512; + case AV_CODEC_ID_ATRAC3: return 1024; + case AV_CODEC_ID_ATRAC3P: return 2048; + case AV_CODEC_ID_MP2: + case AV_CODEC_ID_MUSEPACK7: return 1152; + case AV_CODEC_ID_AC3: return 1536; + } + + if (sr > 0) { + /* calc from sample rate */ + if (id == AV_CODEC_ID_TTA) + return 256 * sr / 245; + + if (ch > 0) { + /* calc from sample rate and channels */ + if (id == AV_CODEC_ID_BINKAUDIO_DCT) + return (480 << (sr / 22050)) / ch; + } + } + + if (ba > 0) { + /* calc from block_align */ + if (id == AV_CODEC_ID_SIPR) { + switch (ba) { + case 20: return 160; + case 19: return 144; + case 29: return 288; + case 37: return 480; + } + } else if (id == AV_CODEC_ID_ILBC) { + switch (ba) { + case 38: return 160; + case 50: return 240; + } + } + } + + if (frame_bytes > 0) { + /* calc from frame_bytes only */ + if (id == AV_CODEC_ID_TRUESPEECH) + return 240 * (frame_bytes / 32); + if (id == AV_CODEC_ID_NELLYMOSER) + return 256 * (frame_bytes / 64); + if (id == AV_CODEC_ID_RA_144) + return 160 * (frame_bytes / 20); + if (id == AV_CODEC_ID_G723_1) + return 240 * (frame_bytes / 24); + + if (bps > 0) { + /* calc from frame_bytes and bits_per_coded_sample */ + if (id == AV_CODEC_ID_ADPCM_G726) + return frame_bytes * 8 / bps; + } + + if (ch > 0 && ch < INT_MAX/16) { + /* calc from frame_bytes and channels */ + switch (id) { + case AV_CODEC_ID_ADPCM_AFC: + return frame_bytes / (9 * ch) * 16; + case AV_CODEC_ID_ADPCM_PSX: + case AV_CODEC_ID_ADPCM_DTK: + return frame_bytes / (16 * ch) * 28; + case AV_CODEC_ID_ADPCM_4XM: + case AV_CODEC_ID_ADPCM_IMA_ISS: + return (frame_bytes - 4 * ch) * 2 / ch; + case AV_CODEC_ID_ADPCM_IMA_SMJPEG: + return (frame_bytes - 4) * 2 / ch; + case AV_CODEC_ID_ADPCM_IMA_AMV: + return (frame_bytes - 8) * 2 / ch; + case AV_CODEC_ID_ADPCM_THP: + case AV_CODEC_ID_ADPCM_THP_LE: + if (avctx->extradata) + return frame_bytes * 14 / (8 * ch); + break; + case AV_CODEC_ID_ADPCM_XA: + return (frame_bytes / 128) * 224 / ch; + case AV_CODEC_ID_INTERPLAY_DPCM: + return (frame_bytes - 6 - ch) / ch; + case AV_CODEC_ID_ROQ_DPCM: + return (frame_bytes - 8) / ch; + case AV_CODEC_ID_XAN_DPCM: + return (frame_bytes - 2 * ch) / ch; + case AV_CODEC_ID_MACE3: + return 3 * frame_bytes / ch; + case AV_CODEC_ID_MACE6: + return 6 * frame_bytes / ch; + case AV_CODEC_ID_PCM_LXF: + return 2 * (frame_bytes / (5 * ch)); + case AV_CODEC_ID_IAC: + case AV_CODEC_ID_IMC: + return 4 * frame_bytes / ch; + } + + if (tag) { + /* calc from frame_bytes, channels, and codec_tag */ + if (id == AV_CODEC_ID_SOL_DPCM) { + if (tag == 3) + return frame_bytes / ch; + else + return frame_bytes * 2 / ch; + } + } + + if (ba > 0) { + /* calc from frame_bytes, channels, and block_align */ + int blocks = frame_bytes / ba; + switch (avctx->codec_id) { + case AV_CODEC_ID_ADPCM_IMA_WAV: + if (bps < 2 || bps > 5) + return 0; + return blocks * (1 + (ba - 4 * ch) / (bps * ch) * 8); + case AV_CODEC_ID_ADPCM_IMA_DK3: + return blocks * (((ba - 16) * 2 / 3 * 4) / ch); + case AV_CODEC_ID_ADPCM_IMA_DK4: + return blocks * (1 + (ba - 4 * ch) * 2 / ch); + case AV_CODEC_ID_ADPCM_IMA_RAD: + return blocks * ((ba - 4 * ch) * 2 / ch); + case AV_CODEC_ID_ADPCM_MS: + return blocks * (2 + (ba - 7 * ch) * 2 / ch); + } + } + + if (bps > 0) { + /* calc from frame_bytes, channels, and bits_per_coded_sample */ + switch (avctx->codec_id) { + case AV_CODEC_ID_PCM_DVD: + if(bps<4) + return 0; + return 2 * (frame_bytes / ((bps * 2 / 8) * ch)); + case AV_CODEC_ID_PCM_BLURAY: + if(bps<4) + return 0; + return frame_bytes / ((FFALIGN(ch, 2) * bps) / 8); + case AV_CODEC_ID_S302M: + return 2 * (frame_bytes / ((bps + 4) / 4)) / ch; + } + } + } + } + + /* Fall back on using frame_size */ + if (avctx->frame_size > 1 && frame_bytes) + return avctx->frame_size; + + //For WMA we currently have no other means to calculate duration thus we + //do it here by assuming CBR, which is true for all known cases. + if (avctx->bit_rate>0 && frame_bytes>0 && avctx->sample_rate>0 && avctx->block_align>1) { + if (avctx->codec_id == AV_CODEC_ID_WMAV1 || avctx->codec_id == AV_CODEC_ID_WMAV2) + return (frame_bytes * 8LL * avctx->sample_rate) / avctx->bit_rate; + } + + return 0; +} + +#if !HAVE_THREADS +int ff_thread_init(AVCodecContext *s) +{ + return -1; +} + +#endif + +unsigned int av_xiphlacing(unsigned char *s, unsigned int v) +{ + unsigned int n = 0; + + while (v >= 0xff) { + *s++ = 0xff; + v -= 0xff; + n++; + } + *s = v; + n++; + return n; +} + +int ff_match_2uint16(const uint16_t(*tab)[2], int size, int a, int b) +{ + int i; + for (i = 0; i < size && !(tab[i][0] == a && tab[i][1] == b); i++) ; + return i; +} + +#if FF_API_MISSING_SAMPLE +FF_DISABLE_DEPRECATION_WARNINGS +void av_log_missing_feature(void *avc, const char *feature, int want_sample) +{ + av_log(avc, AV_LOG_WARNING, "%s is not implemented. Update your FFmpeg " + "version to the newest one from Git. If the problem still " + "occurs, it means that your file has a feature which has not " + "been implemented.\n", feature); + if(want_sample) + av_log_ask_for_sample(avc, NULL); +} + +void av_log_ask_for_sample(void *avc, const char *msg, ...) +{ + va_list argument_list; + + va_start(argument_list, msg); + + if (msg) + av_vlog(avc, AV_LOG_WARNING, msg, argument_list); + av_log(avc, AV_LOG_WARNING, "If you want to help, upload a sample " + "of this file to ftp://upload.ffmpeg.org/incoming/ " + "and contact the ffmpeg-devel mailing list. (ffmpeg-devel@ffmpeg.org)\n"); + + va_end(argument_list); +} +FF_ENABLE_DEPRECATION_WARNINGS +#endif /* FF_API_MISSING_SAMPLE */ + +static AVHWAccel *first_hwaccel = NULL; +static AVHWAccel **last_hwaccel = &first_hwaccel; + +void av_register_hwaccel(AVHWAccel *hwaccel) +{ + AVHWAccel **p = last_hwaccel; + hwaccel->next = NULL; + while(*p || avpriv_atomic_ptr_cas((void * volatile *)p, NULL, hwaccel)) + p = &(*p)->next; + last_hwaccel = &hwaccel->next; +} + +AVHWAccel *av_hwaccel_next(const AVHWAccel *hwaccel) +{ + return hwaccel ? hwaccel->next : first_hwaccel; +} + +int av_lockmgr_register(int (*cb)(void **mutex, enum AVLockOp op)) +{ + if (lockmgr_cb) { + // There is no good way to rollback a failure to destroy the + // mutex, so we ignore failures. + lockmgr_cb(&codec_mutex, AV_LOCK_DESTROY); + lockmgr_cb(&avformat_mutex, AV_LOCK_DESTROY); + lockmgr_cb = NULL; + codec_mutex = NULL; + avformat_mutex = NULL; + } + + if (cb) { + void *new_codec_mutex = NULL; + void *new_avformat_mutex = NULL; + int err; + if (err = cb(&new_codec_mutex, AV_LOCK_CREATE)) { + return err > 0 ? AVERROR_UNKNOWN : err; + } + if (err = cb(&new_avformat_mutex, AV_LOCK_CREATE)) { + // Ignore failures to destroy the newly created mutex. + cb(&new_codec_mutex, AV_LOCK_DESTROY); + return err > 0 ? AVERROR_UNKNOWN : err; + } + lockmgr_cb = cb; + codec_mutex = new_codec_mutex; + avformat_mutex = new_avformat_mutex; + } + + return 0; +} + +int ff_lock_avcodec(AVCodecContext *log_ctx, const AVCodec *codec) +{ + if (codec->caps_internal & FF_CODEC_CAP_INIT_THREADSAFE || !codec->init) + return 0; + + if (lockmgr_cb) { + if ((*lockmgr_cb)(&codec_mutex, AV_LOCK_OBTAIN)) + return -1; + } + + if (avpriv_atomic_int_add_and_fetch(&entangled_thread_counter, 1) != 1) { + av_log(log_ctx, AV_LOG_ERROR, + "Insufficient thread locking. At least %d threads are " + "calling avcodec_open2() at the same time right now.\n", + entangled_thread_counter); + if (!lockmgr_cb) + av_log(log_ctx, AV_LOG_ERROR, "No lock manager is set, please see av_lockmgr_register()\n"); + ff_avcodec_locked = 1; + ff_unlock_avcodec(codec); + return AVERROR(EINVAL); + } + av_assert0(!ff_avcodec_locked); + ff_avcodec_locked = 1; + return 0; +} + +int ff_unlock_avcodec(const AVCodec *codec) +{ + if (codec->caps_internal & FF_CODEC_CAP_INIT_THREADSAFE || !codec->init) + return 0; + + av_assert0(ff_avcodec_locked); + ff_avcodec_locked = 0; + avpriv_atomic_int_add_and_fetch(&entangled_thread_counter, -1); + if (lockmgr_cb) { + if ((*lockmgr_cb)(&codec_mutex, AV_LOCK_RELEASE)) + return -1; + } + + return 0; +} + +int avpriv_lock_avformat(void) +{ + if (lockmgr_cb) { + if ((*lockmgr_cb)(&avformat_mutex, AV_LOCK_OBTAIN)) + return -1; + } + return 0; +} + +int avpriv_unlock_avformat(void) +{ + if (lockmgr_cb) { + if ((*lockmgr_cb)(&avformat_mutex, AV_LOCK_RELEASE)) + return -1; + } + return 0; +} + +unsigned int avpriv_toupper4(unsigned int x) +{ + return av_toupper(x & 0xFF) + + (av_toupper((x >> 8) & 0xFF) << 8) + + (av_toupper((x >> 16) & 0xFF) << 16) + +((unsigned)av_toupper((x >> 24) & 0xFF) << 24); +} + +int avcodec_is_open(AVCodecContext *s) +{ + return !!s->internal; +} + +const uint8_t *avpriv_find_start_code(const uint8_t *av_restrict p, + const uint8_t *end, + uint32_t *av_restrict state) +{ + int i; + + av_assert0(p <= end); + if (p >= end) + return end; + + for (i = 0; i < 3; i++) { + uint32_t tmp = *state << 8; + *state = tmp + *(p++); + if (tmp == 0x100 || p == end) + return p; + } + + while (p < end) { + if (p[-1] > 1 ) p += 3; + else if (p[-2] ) p += 2; + else if (p[-3]|(p[-1]-1)) p++; + else { + p++; + break; + } + } + + p = FFMIN(p, end) - 4; + *state = AV_RB32(p); + + return p + 4; +} + +AVCPBProperties *av_cpb_properties_alloc(size_t *size) +{ + AVCPBProperties *props = av_mallocz(sizeof(AVCPBProperties)); + if (!props) + return NULL; + + if (size) + *size = sizeof(*props); + + props->vbv_delay = UINT64_MAX; + + return props; +} + +AVCPBProperties *ff_add_cpb_side_data(AVCodecContext *avctx) +{ + AVPacketSideData *tmp; + AVCPBProperties *props; + size_t size; + + props = av_cpb_properties_alloc(&size); + if (!props) + return NULL; + + tmp = av_realloc_array(avctx->coded_side_data, avctx->nb_coded_side_data + 1, sizeof(*tmp)); + if (!tmp) { + av_freep(&props); + return NULL; + } + + avctx->coded_side_data = tmp; + avctx->nb_coded_side_data++; + + avctx->coded_side_data[avctx->nb_coded_side_data - 1].type = AV_PKT_DATA_CPB_PROPERTIES; + avctx->coded_side_data[avctx->nb_coded_side_data - 1].data = (uint8_t*)props; + avctx->coded_side_data[avctx->nb_coded_side_data - 1].size = size; + + return props; +} diff --git a/headless/Headless.vcxproj b/headless/Headless.vcxproj index b500d26de4..cd5b985ce9 100644 --- a/headless/Headless.vcxproj +++ b/headless/Headless.vcxproj @@ -225,7 +225,7 @@ Console true - winhttp.lib;mf.lib;mfplat.lib;mfreadwrite.lib;mfuuid.lib;shlwapi.lib;Winmm.lib;Ws2_32.lib;dsound.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;comctl32.lib;d3d9.lib;d3dx9d.lib;dxguid.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) + winhttp.lib;mf.lib;mfplat.lib;mfreadwrite.lib;mfuuid.lib;shlwapi.lib;Winmm.lib;Ws2_32.lib;dsound.lib;swresample.lib;swscale.lib;comctl32.lib;d3d9.lib;d3dx9d.lib;dxguid.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) 0x00400000 false true diff --git a/unittest/UnitTests.vcxproj b/unittest/UnitTests.vcxproj index 76ce396780..95b0b214d4 100644 --- a/unittest/UnitTests.vcxproj +++ b/unittest/UnitTests.vcxproj @@ -205,7 +205,7 @@ Console true - winhttp.lib;mf.lib;mfplat.lib;mfreadwrite.lib;mfuuid.lib;shlwapi.lib;Ws2_32.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;dsound.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;comctl32.lib;d3d9.lib;dxguid.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) + winhttp.lib;mf.lib;mfplat.lib;mfreadwrite.lib;mfuuid.lib;shlwapi.lib;Ws2_32.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;dsound.lib;swresample.lib;swscale.lib;comctl32.lib;d3d9.lib;dxguid.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) /ignore:4049 /ignore:4217 %(AdditionalOptions) ../ffmpeg/Windows/x86_64/lib From c6c67695b18c781fdba7d3d7968e9b9af67f5613 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Wed, 10 Apr 2024 21:50:38 +0200 Subject: [PATCH 069/719] Hook up ATRAC3 too --- Core/HW/Atrac3Standalone.cpp | 45 +++++++++++++++++++++---------- Core/HW/SimpleAudioDec.cpp | 3 ++- ext/at3_standalone/at3_decoders.h | 6 ++--- ext/at3_standalone/atrac3.c | 18 +++++-------- ext/at3_standalone/bytestream.h | 1 + 5 files changed, 44 insertions(+), 29 deletions(-) diff --git a/Core/HW/Atrac3Standalone.cpp b/Core/HW/Atrac3Standalone.cpp index c285ba0977..a5b583a59e 100644 --- a/Core/HW/Atrac3Standalone.cpp +++ b/Core/HW/Atrac3Standalone.cpp @@ -17,11 +17,15 @@ inline int16_t clamp16(float f) { } // Uses our standalone AT3/AT3+ decoder derived from FFMPEG +// Test case for ATRAC3: Mega Man Maverick Hunter X, PSP menu sound class Atrac3Audio : public AudioDecoder { public: - Atrac3Audio(PSPAudioType audioType) { - ctx_ = avcodec_alloc_context3(&ff_atrac3p_decoder); - // int retval = atrac3p_decode_init(ctx_); + Atrac3Audio(PSPAudioType audioType) : audioType_(audioType) { + if (audioType == PSP_CODEC_AT3PLUS) { + ctx_ = avcodec_alloc_context3(&ff_atrac3p_decoder); + } else { + ctx_ = avcodec_alloc_context3(&ff_atrac3_decoder); + } frame_ = av_frame_alloc(); } ~Atrac3Audio() { @@ -38,7 +42,12 @@ public: ctx_->channels = 2; ctx_->channel_layout = ctx_->channels == 2 ? AV_CH_LAYOUT_STEREO : AV_CH_LAYOUT_MONO; ctx_->sample_rate = 44100; - int retval = avcodec_open2(ctx_, &ff_atrac3p_decoder, nullptr); + int retval; + if (audioType_ == PSP_CODEC_AT3PLUS) { + retval = avcodec_open2(ctx_, &ff_atrac3p_decoder, nullptr); + } else { + retval = avcodec_open2(ctx_, &ff_atrac3_decoder, nullptr); + } _dbg_assert_(retval >= 0); if (retval < 0) { return false; @@ -46,8 +55,14 @@ public: codecOpen_ = true; } + // We just call the decode function directly without going through the whole packet machinery. int got_frame = 0; - int result = atrac3p_decode_frame(ctx_, frame_, &got_frame, inbuf, inbytes); + int result; + if (audioType_ == PSP_CODEC_AT3PLUS) { + result = atrac3p_decode_frame(ctx_, frame_, &got_frame, inbuf, inbytes); + } else { + result = atrac3_decode_frame(ctx_, frame_, &got_frame, inbuf, inbytes); + } if (result < 0) { *outbytes = 0; return false; @@ -85,15 +100,17 @@ public: } void SetExtraData(const uint8_t *data, int size, int wav_bytes_per_packet) { - _dbg_assert_(ctx_); - _dbg_assert_(!codecOpen_); - ctx_->extradata = (uint8_t *)av_mallocz(size); - ctx_->extradata_size = size; - ctx_->block_align = wav_bytes_per_packet; - codecOpen_ = false; - if (data != nullptr) { - memcpy(ctx_->extradata, data, size); - } + // if (audioType_ == PSP_CODEC_AT3PLUS) { + _dbg_assert_(ctx_); + _dbg_assert_(!codecOpen_); + ctx_->extradata = (uint8_t *)av_mallocz(size); + ctx_->extradata_size = size; + ctx_->block_align = wav_bytes_per_packet; + codecOpen_ = false; + if (data != nullptr) { + memcpy(ctx_->extradata, data, size); + } + //} } PSPAudioType GetAudioType() const override { return audioType_; } diff --git a/Core/HW/SimpleAudioDec.cpp b/Core/HW/SimpleAudioDec.cpp index 411a76fe47..0f72ae0469 100644 --- a/Core/HW/SimpleAudioDec.cpp +++ b/Core/HW/SimpleAudioDec.cpp @@ -144,14 +144,15 @@ private: bool codecOpen_; }; -// TODO: This should also be able to create other types of decoders. AudioDecoder *CreateAudioDecoder(PSPAudioType audioType, int sampleRateHz, int channels) { switch (audioType) { case PSP_CODEC_MP3: return new MiniMp3Audio(); + case PSP_CODEC_AT3: case PSP_CODEC_AT3PLUS: return CreateAtrac3Audio(audioType); default: + // Only AAC falls back to FFMPEG now. return new SimpleAudio(audioType, sampleRateHz, channels); } } diff --git a/ext/at3_standalone/at3_decoders.h b/ext/at3_standalone/at3_decoders.h index 37d28bbd3c..ae48c4c331 100644 --- a/ext/at3_standalone/at3_decoders.h +++ b/ext/at3_standalone/at3_decoders.h @@ -9,8 +9,8 @@ extern "C" { #include "avcodec.h" - int atrac3p_decode_init(AVCodecContext *avctx); - int atrac3p_decode_frame(AVCodecContext *avctx, AVFrame *frame, int *got_frame_ptr, const uint8_t *avpkt_data, int avpkt_size); - int atrac3p_decode_close(AVCodecContext *avctx); + int atrac3_decode_frame(AVCodecContext *avctx, AVFrame *frame, int *got_frame_ptr, const uint8_t *buf, int buf_size); + int atrac3p_decode_frame(AVCodecContext *avctx, AVFrame *frame, int *got_frame_ptr, const uint8_t *buf, int buf_size); extern AVCodec ff_atrac3p_decoder; + extern AVCodec ff_atrac3_decoder; } diff --git a/ext/at3_standalone/atrac3.c b/ext/at3_standalone/atrac3.c index 55f2f2da0c..4cb06e4ae4 100644 --- a/ext/at3_standalone/atrac3.c +++ b/ext/at3_standalone/atrac3.c @@ -40,6 +40,7 @@ #include "float_dsp.h" #include "bytestream.h" #include "fft.h" +#include "internal.h" #include "get_bits.h" #include "avcodec.h" @@ -161,8 +162,8 @@ static int decode_bytes(const uint8_t *input, uint8_t *out, int bytes) for (i = 0; i < bytes / 4; i++) output[i] = c ^ buf[i]; - if (off) - avpriv_request_sample(NULL, "Offset of %d", off); + //if (off) + // avpriv_request_sample(NULL, "Offset of %d", off); return off; } @@ -729,12 +730,8 @@ static int decode_frame(AVCodecContext *avctx, const uint8_t *databuf, return 0; } -static int atrac3_decode_frame(AVCodecContext *avctx, void *data, - int *got_frame_ptr, AVPacket *avpkt) +int atrac3_decode_frame(AVCodecContext *avctx, AVFrame *frame, int *got_frame_ptr, const uint8_t *buf, int buf_size) { - AVFrame *frame = data; - const uint8_t *buf = avpkt->data; - int buf_size = avpkt->size; ATRAC3Context *q = avctx->priv_data; int ret; const uint8_t *databuf; @@ -787,9 +784,10 @@ static av_cold void atrac3_init_static_data(void) } } +static int static_init_done; + static av_cold int atrac3_decode_init(AVCodecContext *avctx) { - static int static_init_done; int i, ret; int version, delay, samples_per_frame, frame_factor; const uint8_t *edata_ptr = avctx->extradata; @@ -923,10 +921,9 @@ static av_cold int atrac3_decode_init(AVCodecContext *avctx) return 0; } -/* AVCodec ff_atrac3_decoder = { .name = "atrac3", - .long_name = NULL_IF_CONFIG_SMALL("ATRAC3 (Adaptive TRansform Acoustic Coding 3)"), + .long_name = "ATRAC3 (Adaptive TRansform Acoustic Coding 3)", .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_ATRAC3, .priv_data_size = sizeof(ATRAC3Context), @@ -937,4 +934,3 @@ AVCodec ff_atrac3_decoder = { .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, }; -*/ diff --git a/ext/at3_standalone/bytestream.h b/ext/at3_standalone/bytestream.h index f26004fca3..c180fb33e4 100644 --- a/ext/at3_standalone/bytestream.h +++ b/ext/at3_standalone/bytestream.h @@ -26,6 +26,7 @@ #include #include +#include "common.h" #include "intreadwrite.h" typedef struct GetByteContext { From e94faa4591d3207aeac1bb4aeca01daa4782abb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Wed, 10 Apr 2024 22:02:39 +0200 Subject: [PATCH 070/719] Start paring things down --- Common/Common.vcxproj | 2 - Common/Common.vcxproj.filters | 6 --- ext/at3_standalone/avfft.c | 91 +---------------------------------- 3 files changed, 1 insertion(+), 98 deletions(-) diff --git a/Common/Common.vcxproj b/Common/Common.vcxproj index 4d30455354..181f4cac39 100644 --- a/Common/Common.vcxproj +++ b/Common/Common.vcxproj @@ -427,7 +427,6 @@ - @@ -657,7 +656,6 @@ - diff --git a/Common/Common.vcxproj.filters b/Common/Common.vcxproj.filters index 5a5d97000f..b6f0c42cc5 100644 --- a/Common/Common.vcxproj.filters +++ b/Common/Common.vcxproj.filters @@ -662,9 +662,6 @@ ext\at3_standalone - - ext\at3_standalone - @@ -1206,9 +1203,6 @@ ext\at3_standalone - - ext\at3_standalone - ext\at3_standalone diff --git a/ext/at3_standalone/avfft.c b/ext/at3_standalone/avfft.c index 53fc672209..247b063ae8 100644 --- a/ext/at3_standalone/avfft.c +++ b/ext/at3_standalone/avfft.c @@ -19,8 +19,7 @@ #include "attributes.h" #include "avfft.h" #include "fft.h" -#include "rdft.h" -#include "dct.h" +#include "mem.h" /* FFT */ @@ -88,91 +87,3 @@ av_cold void av_mdct_end(FFTContext *s) } #endif /* CONFIG_MDCT */ - -#if CONFIG_RDFT - -RDFTContext *av_rdft_init(int nbits, enum RDFTransformType trans) -{ - RDFTContext *s = av_malloc(sizeof(*s)); - - if (s && ff_rdft_init(s, nbits, trans)) - av_freep(&s); - - return s; -} - -void av_rdft_calc(RDFTContext *s, FFTSample *data) -{ - s->rdft_calc(s, data); -} - -av_cold void av_rdft_end(RDFTContext *s) -{ - if (s) { - ff_rdft_end(s); - av_free(s); - } -} - -#endif /* CONFIG_RDFT */ - -#if CONFIG_DCT - -DCTContext *av_dct_init(int nbits, enum DCTTransformType inverse) -{ - DCTContext *s = av_malloc(sizeof(*s)); - - if (s && ff_dct_init(s, nbits, inverse)) - av_freep(&s); - - return s; -} - -void av_dct_calc(DCTContext *s, FFTSample *data) -{ - s->dct_calc(s, data); -} - -av_cold void av_dct_end(DCTContext *s) -{ - if (s) { - ff_dct_end(s); - av_free(s); - } -} - -#ifdef TEST -int main(int argc, char **argv) -{ - int i; -#define LEN 1024 - FFTSample *ref = av_malloc_array(LEN, sizeof(*ref)); - FFTSample *data = av_malloc_array(LEN, sizeof(*data)); - RDFTContext *rdft_context = av_rdft_init(10, DFT_R2C); - RDFTContext *irdft_context = av_rdft_init(10, IDFT_C2R); - - if (!ref || !data || !rdft_context || !irdft_context) - return 2; - for (i=0; i 1) { - fprintf(stderr, "Failed at %d (%f %f)\n", i, ref[i], data[i]/LEN*2); - return 1; - } - } - - av_rdft_end(rdft_context); - av_rdft_end(irdft_context); - av_free(data); - av_free(ref); - - return 0; -} -#endif - -#endif /* CONFIG_DCT */ From ae736692ef8317a784ece5d0dcfdc7db109a1e5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Wed, 10 Apr 2024 22:10:59 +0200 Subject: [PATCH 071/719] Remove atomics stuff, a lot more --- Common/Common.vcxproj | 8 - Common/Common.vcxproj.filters | 24 - ext/at3_standalone/atomic.c | 127 -- ext/at3_standalone/atomic.h | 79 - ext/at3_standalone/av_buffer.c | 94 +- ext/at3_standalone/avcodec.h | 946 --------- ext/at3_standalone/avfft.c | 30 - ext/at3_standalone/avpacket.c | 295 --- ext/at3_standalone/avstring.c | 82 - ext/at3_standalone/avutil.h | 31 - ext/at3_standalone/bitstream.c | 1 - ext/at3_standalone/bprint.c | 379 ---- ext/at3_standalone/bprint.h | 219 --- ext/at3_standalone/codec_desc.c | 2933 ---------------------------- ext/at3_standalone/compat.h | 3 + ext/at3_standalone/dict.c | 114 -- ext/at3_standalone/float_dsp.c | 318 --- ext/at3_standalone/frame.c | 295 --- ext/at3_standalone/frame.h | 222 --- ext/at3_standalone/internal.h | 6 - ext/at3_standalone/intmath.h | 21 - ext/at3_standalone/intreadwrite.h | 65 - ext/at3_standalone/libm.h | 22 - ext/at3_standalone/mathops.c | 26 - ext/at3_standalone/mem.h | 30 +- ext/at3_standalone/opt.c | 4 +- ext/at3_standalone/opt.h | 1 - ext/at3_standalone/options.c | 214 +- ext/at3_standalone/options_table.h | 103 - ext/at3_standalone/pixdesc.h | 394 ---- ext/at3_standalone/pixfmt.h | 473 ----- ext/at3_standalone/rdft.c | 136 -- ext/at3_standalone/rdft.h | 74 - ext/at3_standalone/util_internal.h | 13 +- ext/at3_standalone/utils.c | 364 +--- 35 files changed, 29 insertions(+), 8117 deletions(-) delete mode 100644 ext/at3_standalone/atomic.c delete mode 100644 ext/at3_standalone/atomic.h delete mode 100644 ext/at3_standalone/bprint.c delete mode 100644 ext/at3_standalone/bprint.h delete mode 100644 ext/at3_standalone/codec_desc.c delete mode 100644 ext/at3_standalone/mathops.c delete mode 100644 ext/at3_standalone/pixdesc.h delete mode 100644 ext/at3_standalone/pixfmt.h delete mode 100644 ext/at3_standalone/rdft.c delete mode 100644 ext/at3_standalone/rdft.h diff --git a/Common/Common.vcxproj b/Common/Common.vcxproj index 181f4cac39..639a26ce82 100644 --- a/Common/Common.vcxproj +++ b/Common/Common.vcxproj @@ -386,7 +386,6 @@ - @@ -396,7 +395,6 @@ - @@ -424,8 +422,6 @@ - - @@ -630,7 +626,6 @@ - @@ -641,16 +636,13 @@ - - - diff --git a/Common/Common.vcxproj.filters b/Common/Common.vcxproj.filters index b6f0c42cc5..0717b7b213 100644 --- a/Common/Common.vcxproj.filters +++ b/Common/Common.vcxproj.filters @@ -590,9 +590,6 @@ ext\at3_standalone - - ext\at3_standalone - ext\at3_standalone @@ -620,9 +617,6 @@ ext\at3_standalone - - ext\at3_standalone - ext\at3_standalone @@ -644,15 +638,9 @@ ext\at3_standalone - - ext\at3_standalone - ext\at3_standalone - - ext\at3_standalone - ext\at3_standalone @@ -1137,9 +1125,6 @@ ext\at3_standalone - - ext\at3_standalone - ext\at3_standalone @@ -1167,9 +1152,6 @@ ext\at3_standalone - - ext\at3_standalone - ext\at3_standalone @@ -1191,12 +1173,6 @@ ext\at3_standalone - - ext\at3_standalone - - - ext\at3_standalone - ext\at3_standalone diff --git a/ext/at3_standalone/atomic.c b/ext/at3_standalone/atomic.c deleted file mode 100644 index b13725d14f..0000000000 --- a/ext/at3_standalone/atomic.c +++ /dev/null @@ -1,127 +0,0 @@ -/* - * Copyright (c) 2012 Ronald S. Bultje - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "config.h" -#include "atomic.h" - -#if !HAVE_ATOMICS_NATIVE - -#if HAVE_PTHREADS - -#include - -static pthread_mutex_t atomic_lock = PTHREAD_MUTEX_INITIALIZER; - -int avpriv_atomic_int_get(volatile int *ptr) -{ - int res; - - pthread_mutex_lock(&atomic_lock); - res = *ptr; - pthread_mutex_unlock(&atomic_lock); - - return res; -} - -void avpriv_atomic_int_set(volatile int *ptr, int val) -{ - pthread_mutex_lock(&atomic_lock); - *ptr = val; - pthread_mutex_unlock(&atomic_lock); -} - -int avpriv_atomic_int_add_and_fetch(volatile int *ptr, int inc) -{ - int res; - - pthread_mutex_lock(&atomic_lock); - *ptr += inc; - res = *ptr; - pthread_mutex_unlock(&atomic_lock); - - return res; -} - -void *avpriv_atomic_ptr_cas(void * volatile *ptr, void *oldval, void *newval) -{ - void *ret; - pthread_mutex_lock(&atomic_lock); - ret = *ptr; - if (ret == oldval) - *ptr = newval; - pthread_mutex_unlock(&atomic_lock); - return ret; -} - -#elif !HAVE_THREADS - -int avpriv_atomic_int_get(volatile int *ptr) -{ - return *ptr; -} - -void avpriv_atomic_int_set(volatile int *ptr, int val) -{ - *ptr = val; -} - -int avpriv_atomic_int_add_and_fetch(volatile int *ptr, int inc) -{ - *ptr += inc; - return *ptr; -} - -void *avpriv_atomic_ptr_cas(void * volatile *ptr, void *oldval, void *newval) -{ - if (*ptr == oldval) { - *ptr = newval; - return oldval; - } - return *ptr; -} - -#else /* HAVE_THREADS */ - -/* This should never trigger, unless a new threading implementation - * without correct atomics dependencies in configure or a corresponding - * atomics implementation is added. */ -#error "Threading is enabled, but there is no implementation of atomic operations available" - -#endif /* HAVE_PTHREADS */ - -#endif /* !HAVE_ATOMICS_NATIVE */ - -#ifdef TEST -#include "avassert.h" - -int main(void) -{ - volatile int val = 1; - int res; - - res = avpriv_atomic_int_add_and_fetch(&val, 1); - av_assert0(res == 2); - avpriv_atomic_int_set(&val, 3); - res = avpriv_atomic_int_get(&val); - av_assert0(res == 3); - - return 0; -} -#endif diff --git a/ext/at3_standalone/atomic.h b/ext/at3_standalone/atomic.h deleted file mode 100644 index 15906d24c9..0000000000 --- a/ext/at3_standalone/atomic.h +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Copyright (c) 2012 Ronald S. Bultje - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef AVUTIL_ATOMIC_H -#define AVUTIL_ATOMIC_H - -#include "config.h" - -#if HAVE_ATOMICS_NATIVE - -#if HAVE_ATOMICS_GCC -#include "atomic_gcc.h" -#elif HAVE_ATOMICS_WIN32 -#include "atomic_win32.h" -#elif HAVE_ATOMICS_SUNCC -#include "atomic_suncc.h" -#endif - -#else - -/** - * Load the current value stored in an atomic integer. - * - * @param ptr atomic integer - * @return the current value of the atomic integer - * @note This acts as a memory barrier. - */ -int avpriv_atomic_int_get(volatile int *ptr); - -/** - * Store a new value in an atomic integer. - * - * @param ptr atomic integer - * @param val the value to store in the atomic integer - * @note This acts as a memory barrier. - */ -void avpriv_atomic_int_set(volatile int *ptr, int val); - -/** - * Add a value to an atomic integer. - * - * @param ptr atomic integer - * @param inc the value to add to the atomic integer (may be negative) - * @return the new value of the atomic integer. - * @note This does NOT act as a memory barrier. This is primarily - * intended for reference counting. - */ -int avpriv_atomic_int_add_and_fetch(volatile int *ptr, int inc); - -/** - * Atomic pointer compare and swap. - * - * @param ptr pointer to the pointer to operate on - * @param oldval do the swap if the current value of *ptr equals to oldval - * @param newval value to replace *ptr with - * @return the value of *ptr before comparison - */ -void *avpriv_atomic_ptr_cas(void * volatile *ptr, void *oldval, void *newval); - -#endif /* HAVE_ATOMICS_NATIVE */ - -#endif /* AVUTIL_ATOMIC_H */ diff --git a/ext/at3_standalone/av_buffer.c b/ext/at3_standalone/av_buffer.c index c311db5ba3..f261aa444d 100644 --- a/ext/at3_standalone/av_buffer.c +++ b/ext/at3_standalone/av_buffer.c @@ -98,7 +98,7 @@ AVBufferRef *av_buffer_ref(AVBufferRef *buf) *ret = *buf; - avpriv_atomic_int_add_and_fetch(&buf->buffer->refcount, 1); + buf->buffer->refcount++; return ret; } @@ -115,10 +115,9 @@ static void buffer_replace(AVBufferRef **dst, AVBufferRef **src) } else av_freep(dst); - if (!avpriv_atomic_int_add_and_fetch(&b->refcount, -1)) { - b->free(b->opaque, b->data); - av_freep(&b); - } + b->refcount--; + b->free(b->opaque, b->data); + av_freep(&b); } void av_buffer_unref(AVBufferRef **buf) @@ -134,7 +133,7 @@ int av_buffer_is_writable(const AVBufferRef *buf) if (buf->buffer->flags & AV_BUFFER_FLAG_READONLY) return 0; - return avpriv_atomic_int_get(&buf->buffer->refcount) == 1; + return buf->buffer->refcount == 1; } void *av_buffer_get_opaque(const AVBufferRef *buf) @@ -223,7 +222,7 @@ AVBufferPool *av_buffer_pool_init(int size, AVBufferRef* (*alloc)(int size)) pool->size = size; pool->alloc = alloc ? alloc : av_buffer_alloc; - avpriv_atomic_int_set(&pool->refcount, 1); + pool->refcount = 1; return pool; } @@ -253,61 +252,21 @@ void av_buffer_pool_uninit(AVBufferPool **ppool) pool = *ppool; *ppool = NULL; - if (!avpriv_atomic_int_add_and_fetch(&pool->refcount, -1)) + pool->refcount--; + if (!pool->refcount) buffer_pool_free(pool); } -#if USE_ATOMICS -/* remove the whole buffer list from the pool and return it */ -static BufferPoolEntry *get_pool(AVBufferPool *pool) -{ - BufferPoolEntry *cur = *(void * volatile *)&pool->pool, *last = NULL; - - while (cur != last) { - last = cur; - cur = avpriv_atomic_ptr_cas((void * volatile *)&pool->pool, last, NULL); - if (!cur) - return NULL; - } - - return cur; -} - -static void add_to_pool(BufferPoolEntry *buf) -{ - AVBufferPool *pool; - BufferPoolEntry *cur, *end = buf; - - if (!buf) - return; - pool = buf->pool; - - while (end->next) - end = end->next; - - while (avpriv_atomic_ptr_cas((void * volatile *)&pool->pool, NULL, buf)) { - /* pool is not empty, retrieve it and append it to our list */ - cur = get_pool(pool); - end->next = cur; - while (end->next) - end = end->next; - } -} -#endif - static void pool_release_buffer(void *opaque, uint8_t *data) { BufferPoolEntry *buf = opaque; AVBufferPool *pool = buf->pool; -#if USE_ATOMICS - add_to_pool(buf); -#else buf->next = pool->pool; pool->pool = buf; -#endif - if (!avpriv_atomic_int_add_and_fetch(&pool->refcount, -1)) + pool->refcount--; + if (!pool->refcount) buffer_pool_free(pool); } @@ -336,11 +295,6 @@ static AVBufferRef *pool_alloc_buffer(AVBufferPool *pool) ret->buffer->opaque = buf; ret->buffer->free = pool_release_buffer; -#if USE_ATOMICS - avpriv_atomic_int_add_and_fetch(&pool->refcount, 1); - avpriv_atomic_int_add_and_fetch(&pool->nb_allocated, 1); -#endif - return ret; } @@ -349,29 +303,6 @@ AVBufferRef *av_buffer_pool_get(AVBufferPool *pool) AVBufferRef *ret; BufferPoolEntry *buf; -#if USE_ATOMICS - /* check whether the pool is empty */ - buf = get_pool(pool); - if (!buf && pool->refcount <= pool->nb_allocated) { - av_log(NULL, AV_LOG_DEBUG, "Pool race dectected, spining to avoid overallocation and eventual OOM\n"); - while (!buf && avpriv_atomic_int_get(&pool->refcount) <= avpriv_atomic_int_get(&pool->nb_allocated)) - buf = get_pool(pool); - } - - if (!buf) - return pool_alloc_buffer(pool); - - /* keep the first entry, return the rest of the list to the pool */ - add_to_pool(buf->next); - buf->next = NULL; - - ret = av_buffer_create(buf->data, pool->size, pool_release_buffer, - buf, 0); - if (!ret) { - add_to_pool(buf); - return NULL; - } -#else buf = pool->pool; if (buf) { ret = av_buffer_create(buf->data, pool->size, pool_release_buffer, @@ -383,10 +314,9 @@ AVBufferRef *av_buffer_pool_get(AVBufferPool *pool) } else { ret = pool_alloc_buffer(pool); } -#endif - if (ret) - avpriv_atomic_int_add_and_fetch(&pool->refcount, 1); + if (ret) + pool->refcount++; return ret; } diff --git a/ext/at3_standalone/avcodec.h b/ext/at3_standalone/avcodec.h index 65c8b39d7e..2ce18c3bd5 100644 --- a/ext/at3_standalone/avcodec.h +++ b/ext/at3_standalone/avcodec.h @@ -943,254 +943,6 @@ typedef struct RcOverride{ */ #define AV_CODEC_CAP_LOSSLESS 0x80000000 - -#if FF_API_WITHOUT_PREFIX -/** - * Allow decoders to produce frames with data planes that are not aligned - * to CPU requirements (e.g. due to cropping). - */ -#define CODEC_FLAG_UNALIGNED AV_CODEC_FLAG_UNALIGNED -#define CODEC_FLAG_QSCALE AV_CODEC_FLAG_QSCALE -#define CODEC_FLAG_4MV AV_CODEC_FLAG_4MV -#define CODEC_FLAG_OUTPUT_CORRUPT AV_CODEC_FLAG_OUTPUT_CORRUPT -#define CODEC_FLAG_QPEL AV_CODEC_FLAG_QPEL -#if FF_API_GMC -/** - * @deprecated use the "gmc" private option of the libxvid encoder - */ -#define CODEC_FLAG_GMC 0x0020 ///< Use GMC. -#endif -#if FF_API_MV0 -/** - * @deprecated use the flag "mv0" in the "mpv_flags" private option of the - * mpegvideo encoders - */ -#define CODEC_FLAG_MV0 0x0040 -#endif -#if FF_API_INPUT_PRESERVED -/** - * @deprecated passing reference-counted frames to the encoders replaces this - * flag - */ -#define CODEC_FLAG_INPUT_PRESERVED 0x0100 -#endif -#define CODEC_FLAG_PASS1 AV_CODEC_FLAG_PASS1 -#define CODEC_FLAG_PASS2 AV_CODEC_FLAG_PASS2 -#define CODEC_FLAG_GRAY AV_CODEC_FLAG_GRAY -#if FF_API_EMU_EDGE -/** - * @deprecated edges are not used/required anymore. I.e. this flag is now always - * set. - */ -#define CODEC_FLAG_EMU_EDGE 0x4000 -#endif -#define CODEC_FLAG_PSNR AV_CODEC_FLAG_PSNR -#define CODEC_FLAG_TRUNCATED AV_CODEC_FLAG_TRUNCATED - -#if FF_API_NORMALIZE_AQP -/** - * @deprecated use the flag "naq" in the "mpv_flags" private option of the - * mpegvideo encoders - */ -#define CODEC_FLAG_NORMALIZE_AQP 0x00020000 -#endif -#define CODEC_FLAG_INTERLACED_DCT AV_CODEC_FLAG_INTERLACED_DCT -#define CODEC_FLAG_LOW_DELAY AV_CODEC_FLAG_LOW_DELAY -#define CODEC_FLAG_GLOBAL_HEADER AV_CODEC_FLAG_GLOBAL_HEADER -#define CODEC_FLAG_BITEXACT AV_CODEC_FLAG_BITEXACT -#define CODEC_FLAG_AC_PRED AV_CODEC_FLAG_AC_PRED -#define CODEC_FLAG_LOOP_FILTER AV_CODEC_FLAG_LOOP_FILTER -#define CODEC_FLAG_INTERLACED_ME AV_CODEC_FLAG_INTERLACED_ME -#define CODEC_FLAG_CLOSED_GOP AV_CODEC_FLAG_CLOSED_GOP -#define CODEC_FLAG2_FAST AV_CODEC_FLAG2_FAST -#define CODEC_FLAG2_NO_OUTPUT AV_CODEC_FLAG2_NO_OUTPUT -#define CODEC_FLAG2_LOCAL_HEADER AV_CODEC_FLAG2_LOCAL_HEADER -#define CODEC_FLAG2_DROP_FRAME_TIMECODE AV_CODEC_FLAG2_DROP_FRAME_TIMECODE -#define CODEC_FLAG2_IGNORE_CROP AV_CODEC_FLAG2_IGNORE_CROP - -#define CODEC_FLAG2_CHUNKS AV_CODEC_FLAG2_CHUNKS -#define CODEC_FLAG2_SHOW_ALL AV_CODEC_FLAG2_SHOW_ALL -#define CODEC_FLAG2_EXPORT_MVS AV_CODEC_FLAG2_EXPORT_MVS -#define CODEC_FLAG2_SKIP_MANUAL AV_CODEC_FLAG2_SKIP_MANUAL - -/* Unsupported options : - * Syntax Arithmetic coding (SAC) - * Reference Picture Selection - * Independent Segment Decoding */ -/* /Fx */ -/* codec capabilities */ - -#define CODEC_CAP_DRAW_HORIZ_BAND AV_CODEC_CAP_DRAW_HORIZ_BAND ///< Decoder can use draw_horiz_band callback. -/** - * Codec uses get_buffer() for allocating buffers and supports custom allocators. - * If not set, it might not use get_buffer() at all or use operations that - * assume the buffer was allocated by avcodec_default_get_buffer. - */ -#define CODEC_CAP_DR1 AV_CODEC_CAP_DR1 -#define CODEC_CAP_TRUNCATED AV_CODEC_CAP_TRUNCATED -#if FF_API_XVMC -/* Codec can export data for HW decoding. This flag indicates that - * the codec would call get_format() with list that might contain HW accelerated - * pixel formats (XvMC, VDPAU, VAAPI, etc). The application can pick any of them - * including raw image format. - * The application can use the passed context to determine bitstream version, - * chroma format, resolution etc. - */ -#define CODEC_CAP_HWACCEL 0x0010 -#endif /* FF_API_XVMC */ -/** - * Encoder or decoder requires flushing with NULL input at the end in order to - * give the complete and correct output. - * - * NOTE: If this flag is not set, the codec is guaranteed to never be fed with - * with NULL data. The user can still send NULL data to the public encode - * or decode function, but libavcodec will not pass it along to the codec - * unless this flag is set. - * - * Decoders: - * The decoder has a non-zero delay and needs to be fed with avpkt->data=NULL, - * avpkt->size=0 at the end to get the delayed data until the decoder no longer - * returns frames. - * - * Encoders: - * The encoder needs to be fed with NULL data at the end of encoding until the - * encoder no longer returns data. - * - * NOTE: For encoders implementing the AVCodec.encode2() function, setting this - * flag also means that the encoder must set the pts and duration for - * each output packet. If this flag is not set, the pts and duration will - * be determined by libavcodec from the input frame. - */ -#define CODEC_CAP_DELAY AV_CODEC_CAP_DELAY -/** - * Codec can be fed a final frame with a smaller size. - * This can be used to prevent truncation of the last audio samples. - */ -#define CODEC_CAP_SMALL_LAST_FRAME AV_CODEC_CAP_SMALL_LAST_FRAME -#if FF_API_CAP_VDPAU -/** - * Codec can export data for HW decoding (VDPAU). - */ -#define CODEC_CAP_HWACCEL_VDPAU AV_CODEC_CAP_HWACCEL_VDPAU -#endif -/** - * Codec can output multiple frames per AVPacket - * Normally demuxers return one frame at a time, demuxers which do not do - * are connected to a parser to split what they return into proper frames. - * This flag is reserved to the very rare category of codecs which have a - * bitstream that cannot be split into frames without timeconsuming - * operations like full decoding. Demuxers carring such bitstreams thus - * may return multiple frames in a packet. This has many disadvantages like - * prohibiting stream copy in many cases thus it should only be considered - * as a last resort. - */ -#define CODEC_CAP_SUBFRAMES AV_CODEC_CAP_SUBFRAMES -/** - * Codec is experimental and is thus avoided in favor of non experimental - * encoders - */ -#define CODEC_CAP_EXPERIMENTAL AV_CODEC_CAP_EXPERIMENTAL -/** - * Codec should fill in channel configuration and samplerate instead of container - */ -#define CODEC_CAP_CHANNEL_CONF AV_CODEC_CAP_CHANNEL_CONF -#if FF_API_NEG_LINESIZES -/** - * @deprecated no codecs use this capability - */ -#define CODEC_CAP_NEG_LINESIZES 0x0800 -#endif -/** - * Codec supports frame-level multithreading. - */ -#define CODEC_CAP_FRAME_THREADS AV_CODEC_CAP_FRAME_THREADS -/** - * Codec supports slice-based (or partition-based) multithreading. - */ -#define CODEC_CAP_SLICE_THREADS AV_CODEC_CAP_SLICE_THREADS -/** - * Codec supports changed parameters at any point. - */ -#define CODEC_CAP_PARAM_CHANGE AV_CODEC_CAP_PARAM_CHANGE -/** - * Codec supports avctx->thread_count == 0 (auto). - */ -#define CODEC_CAP_AUTO_THREADS AV_CODEC_CAP_AUTO_THREADS -/** - * Audio encoder supports receiving a different number of samples in each call. - */ -#define CODEC_CAP_VARIABLE_FRAME_SIZE AV_CODEC_CAP_VARIABLE_FRAME_SIZE -/** - * Codec is intra only. - */ -#define CODEC_CAP_INTRA_ONLY AV_CODEC_CAP_INTRA_ONLY -/** - * Codec is lossless. - */ -#define CODEC_CAP_LOSSLESS AV_CODEC_CAP_LOSSLESS - -/** - * HWAccel is experimental and is thus avoided in favor of non experimental - * codecs - */ -#define HWACCEL_CODEC_CAP_EXPERIMENTAL 0x0200 -#endif /* FF_API_WITHOUT_PREFIX */ - -#if FF_API_MB_TYPE -//The following defines may change, don't expect compatibility if you use them. -#define MB_TYPE_INTRA4x4 0x0001 -#define MB_TYPE_INTRA16x16 0x0002 //FIXME H.264-specific -#define MB_TYPE_INTRA_PCM 0x0004 //FIXME H.264-specific -#define MB_TYPE_16x16 0x0008 -#define MB_TYPE_16x8 0x0010 -#define MB_TYPE_8x16 0x0020 -#define MB_TYPE_8x8 0x0040 -#define MB_TYPE_INTERLACED 0x0080 -#define MB_TYPE_DIRECT2 0x0100 //FIXME -#define MB_TYPE_ACPRED 0x0200 -#define MB_TYPE_GMC 0x0400 -#define MB_TYPE_SKIP 0x0800 -#define MB_TYPE_P0L0 0x1000 -#define MB_TYPE_P1L0 0x2000 -#define MB_TYPE_P0L1 0x4000 -#define MB_TYPE_P1L1 0x8000 -#define MB_TYPE_L0 (MB_TYPE_P0L0 | MB_TYPE_P1L0) -#define MB_TYPE_L1 (MB_TYPE_P0L1 | MB_TYPE_P1L1) -#define MB_TYPE_L0L1 (MB_TYPE_L0 | MB_TYPE_L1) -#define MB_TYPE_QUANT 0x00010000 -#define MB_TYPE_CBP 0x00020000 -//Note bits 24-31 are reserved for codec specific use (h264 ref0, mpeg1 0mv, ...) -#endif - -/** - * Pan Scan area. - * This specifies the area which should be displayed. - * Note there may be multiple such areas for one frame. - */ -typedef struct AVPanScan{ - /** - * id - * - encoding: Set by user. - * - decoding: Set by libavcodec. - */ - int id; - - /** - * width and height in 1/16 pel - * - encoding: Set by user. - * - decoding: Set by libavcodec. - */ - int width; - int height; - - /** - * position of the top left corner in 1/16 pel for up to 3 fields/frames - * - encoding: Set by user. - * - decoding: Set by libavcodec. - */ - int16_t position[3][2]; -}AVPanScan; - /** * This structure describes the bitrate properties of an encoded bitstream. It * roughly corresponds to a subset the VBV parameters for MPEG-2 or HRD @@ -1241,179 +993,6 @@ typedef struct AVCPBProperties { */ #define AV_GET_BUFFER_FLAG_REF (1 << 0) -/** - * @defgroup lavc_packet AVPacket - * - * Types and functions for working with AVPacket. - * @{ - */ -enum AVPacketSideDataType { - AV_PKT_DATA_PALETTE, - AV_PKT_DATA_NEW_EXTRADATA, - - /** - * An AV_PKT_DATA_PARAM_CHANGE side data packet is laid out as follows: - * @code - * u32le param_flags - * if (param_flags & AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT) - * s32le channel_count - * if (param_flags & AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_LAYOUT) - * u64le channel_layout - * if (param_flags & AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE) - * s32le sample_rate - * if (param_flags & AV_SIDE_DATA_PARAM_CHANGE_DIMENSIONS) - * s32le width - * s32le height - * @endcode - */ - AV_PKT_DATA_PARAM_CHANGE, - - /** - * An AV_PKT_DATA_H263_MB_INFO side data packet contains a number of - * structures with info about macroblocks relevant to splitting the - * packet into smaller packets on macroblock edges (e.g. as for RFC 2190). - * That is, it does not necessarily contain info about all macroblocks, - * as long as the distance between macroblocks in the info is smaller - * than the target payload size. - * Each MB info structure is 12 bytes, and is laid out as follows: - * @code - * u32le bit offset from the start of the packet - * u8 current quantizer at the start of the macroblock - * u8 GOB number - * u16le macroblock address within the GOB - * u8 horizontal MV predictor - * u8 vertical MV predictor - * u8 horizontal MV predictor for block number 3 - * u8 vertical MV predictor for block number 3 - * @endcode - */ - AV_PKT_DATA_H263_MB_INFO, - - /** - * This side data should be associated with an audio stream and contains - * ReplayGain information in form of the AVReplayGain struct. - */ - AV_PKT_DATA_REPLAYGAIN, - - /** - * This side data contains a 3x3 transformation matrix describing an affine - * transformation that needs to be applied to the decoded video frames for - * correct presentation. - * - * See libavutil/display.h for a detailed description of the data. - */ - AV_PKT_DATA_DISPLAYMATRIX, - - /** - * This side data should be associated with a video stream and contains - * Stereoscopic 3D information in form of the AVStereo3D struct. - */ - AV_PKT_DATA_STEREO3D, - - /** - * This side data should be associated with an audio stream and corresponds - * to enum AVAudioServiceType. - */ - AV_PKT_DATA_AUDIO_SERVICE_TYPE, - - /** - * This side data contains quality related information from the encoder. - * @code - * u32le quality factor of the compressed frame. Allowed range is between 1 (good) and FF_LAMBDA_MAX (bad). - * u8 picture type - * u8 error count - * u16 reserved - * u64le[error count] sum of squared differences between encoder in and output - * @endcode - */ - AV_PKT_DATA_QUALITY_STATS, - - /** - * This side data contains an integer value representing the stream index - * of a "fallback" track. A fallback track indicates an alternate - * track to use when the current track can not be decoded for some reason. - * e.g. no decoder available for codec. - */ - AV_PKT_DATA_FALLBACK_TRACK, - - /** - * This side data corresponds to the AVCPBProperties struct. - */ - AV_PKT_DATA_CPB_PROPERTIES, - - /** - * Recommmends skipping the specified number of samples - * @code - * u32le number of samples to skip from start of this packet - * u32le number of samples to skip from end of this packet - * u8 reason for start skip - * u8 reason for end skip (0=padding silence, 1=convergence) - * @endcode - */ - AV_PKT_DATA_SKIP_SAMPLES=70, - - /** - * An AV_PKT_DATA_JP_DUALMONO side data packet indicates that - * the packet may contain "dual mono" audio specific to Japanese DTV - * and if it is true, recommends only the selected channel to be used. - * @code - * u8 selected channels (0=mail/left, 1=sub/right, 2=both) - * @endcode - */ - AV_PKT_DATA_JP_DUALMONO, - - /** - * A list of zero terminated key/value strings. There is no end marker for - * the list, so it is required to rely on the side data size to stop. - */ - AV_PKT_DATA_STRINGS_METADATA, - - /** - * Subtitle event position - * @code - * u32le x1 - * u32le y1 - * u32le x2 - * u32le y2 - * @endcode - */ - AV_PKT_DATA_SUBTITLE_POSITION, - - /** - * Data found in BlockAdditional element of matroska container. There is - * no end marker for the data, so it is required to rely on the side data - * size to recognize the end. 8 byte id (as found in BlockAddId) followed - * by data. - */ - AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL, - - /** - * The optional first identifier line of a WebVTT cue. - */ - AV_PKT_DATA_WEBVTT_IDENTIFIER, - - /** - * The optional settings (rendering instructions) that immediately - * follow the timestamp specifier of a WebVTT cue. - */ - AV_PKT_DATA_WEBVTT_SETTINGS, - - /** - * A list of zero terminated key/value strings. There is no end marker for - * the list, so it is required to rely on the side data size to stop. This - * side data includes updated metadata which appeared in the stream. - */ - AV_PKT_DATA_METADATA_UPDATE, -}; - -#define AV_PKT_DATA_QUALITY_FACTOR AV_PKT_DATA_QUALITY_STATS //DEPRECATED - -typedef struct AVPacketSideData { - uint8_t *data; - int size; - enum AVPacketSideDataType type; -} AVPacketSideData; - /** * This structure stores compressed data. It is typically exported by demuxers * and then passed as input to decoders, or received as output from encoders and @@ -1475,12 +1054,6 @@ typedef struct AVPacket { * A combination of AV_PKT_FLAG values */ int flags; - /** - * Additional packet data that can be provided by the container. - * Packet can contain several types of side information. - */ - AVPacketSideData *side_data; - int side_data_elems; /** * Duration of this packet in AVStream->time_base units, 0 if unknown. @@ -1503,27 +1076,12 @@ typedef struct AVPacket { #define AV_PKT_FLAG_KEY 0x0001 ///< The packet contains a keyframe #define AV_PKT_FLAG_CORRUPT 0x0002 ///< The packet content is corrupted -enum AVSideDataParamChangeFlags { - AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT = 0x0001, - AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_LAYOUT = 0x0002, - AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE = 0x0004, - AV_SIDE_DATA_PARAM_CHANGE_DIMENSIONS = 0x0008, -}; /** * @} */ struct AVCodecInternal; -enum AVFieldOrder { - AV_FIELD_UNKNOWN, - AV_FIELD_PROGRESSIVE, - AV_FIELD_TT, //< Top coded_first, top displayed first - AV_FIELD_BB, //< Bottom coded first, bottom displayed first - AV_FIELD_TB, //< Top coded first, bottom displayed first - AV_FIELD_BT, //< Bottom coded first, top displayed first -}; - /** * main external API structure. * New fields can be added to the end with minor version bumps. @@ -1697,143 +1255,10 @@ typedef struct AVCodecContext { */ int delay; - - /* video only */ - /** - * picture width / height. - * - * @note Those fields may not match the values of the last - * AVFrame outputted by avcodec_decode_video2 due frame - * reordering. - * - * - encoding: MUST be set by user. - * - decoding: May be set by the user before opening the decoder if known e.g. - * from the container. Some decoders will require the dimensions - * to be set by the caller. During decoding, the decoder may - * overwrite those values as required while parsing the data. - */ - int width, height; - - /** - * Bitstream width / height, may be different from width/height e.g. when - * the decoded frame is cropped before being output or lowres is enabled. - * - * @note Those field may not match the value of the last - * AVFrame outputted by avcodec_decode_video2 due frame - * reordering. - * - * - encoding: unused - * - decoding: May be set by the user before opening the decoder if known - * e.g. from the container. During decoding, the decoder may - * overwrite those values as required while parsing the data. - */ - int coded_width, coded_height; - #if FF_API_ASPECT_EXTENDED #define FF_ASPECT_EXTENDED 15 #endif - /** - * the number of pictures in a group of pictures, or 0 for intra_only - * - encoding: Set by user. - * - decoding: unused - */ - int gop_size; - - /** - * Pixel format, see AV_PIX_FMT_xxx. - * May be set by the demuxer if known from headers. - * May be overridden by the decoder if it knows better. - * - * @note This field may not match the value of the last - * AVFrame outputted by avcodec_decode_video2 due frame - * reordering. - * - * - encoding: Set by user. - * - decoding: Set by user if known, overridden by libavcodec while - * parsing the data. - */ - enum AVPixelFormat pix_fmt; - -#if FF_API_MOTION_EST - /** - * This option does nothing - * @deprecated use codec private options instead - */ - attribute_deprecated int me_method; -#endif - - /** - * If non NULL, 'draw_horiz_band' is called by the libavcodec - * decoder to draw a horizontal band. It improves cache usage. Not - * all codecs can do that. You must check the codec capabilities - * beforehand. - * When multithreading is used, it may be called from multiple threads - * at the same time; threads might draw different parts of the same AVFrame, - * or multiple AVFrames, and there is no guarantee that slices will be drawn - * in order. - * The function is also used by hardware acceleration APIs. - * It is called at least once during frame decoding to pass - * the data needed for hardware render. - * In that mode instead of pixel data, AVFrame points to - * a structure specific to the acceleration API. The application - * reads the structure and can change some fields to indicate progress - * or mark state. - * - encoding: unused - * - decoding: Set by user. - * @param height the height of the slice - * @param y the y position of the slice - * @param type 1->top field, 2->bottom field, 3->frame - * @param offset offset into the AVFrame.data from which the slice should be read - */ - void (*draw_horiz_band)(struct AVCodecContext *s, - const AVFrame *src, int offset[AV_NUM_DATA_POINTERS], - int y, int type, int height); - - /** - * callback to negotiate the pixelFormat - * @param fmt is the list of formats which are supported by the codec, - * it is terminated by -1 as 0 is a valid format, the formats are ordered by quality. - * The first is always the native one. - * @note The callback may be called again immediately if initialization for - * the selected (hardware-accelerated) pixel format failed. - * @warning Behavior is undefined if the callback returns a value not - * in the fmt list of formats. - * @return the chosen format - * - encoding: unused - * - decoding: Set by user, if not set the native format will be chosen. - */ - enum AVPixelFormat (*get_format)(struct AVCodecContext *s, const enum AVPixelFormat * fmt); - - /** - * maximum number of B-frames between non-B-frames - * Note: The output will be delayed by max_b_frames+1 relative to the input. - * - encoding: Set by user. - * - decoding: unused - */ - int max_b_frames; - - /** - * qscale factor between IP and B-frames - * If > 0 then the last P-frame quantizer will be used (q= lastp_q*factor+offset). - * If < 0 then normal ratecontrol will be done (q= -normal_q*factor+offset). - * - encoding: Set by user. - * - decoding: unused - */ - float b_quant_factor; - -#if FF_API_RC_STRATEGY - /** @deprecated use codec private option instead */ - attribute_deprecated int rc_strategy; -#define FF_RC_STRATEGY_XVID 1 -#endif - -#if FF_API_PRIVATE_OPT - /** @deprecated use encoder private options instead */ - attribute_deprecated - int b_frame_strategy; -#endif - /** * qscale offset between IP and B-frames * - encoding: Set by user. @@ -1855,57 +1280,6 @@ typedef struct AVCodecContext { int mpeg_quant; #endif - /** - * qscale factor between P and I-frames - * If > 0 then the last p frame quantizer will be used (q= lastp_q*factor+offset). - * If < 0 then normal ratecontrol will be done (q= -normal_q*factor+offset). - * - encoding: Set by user. - * - decoding: unused - */ - float i_quant_factor; - - /** - * qscale offset between P and I-frames - * - encoding: Set by user. - * - decoding: unused - */ - float i_quant_offset; - - /** - * luminance masking (0-> disabled) - * - encoding: Set by user. - * - decoding: unused - */ - float lumi_masking; - - /** - * temporary complexity masking (0-> disabled) - * - encoding: Set by user. - * - decoding: unused - */ - float temporal_cplx_masking; - - /** - * spatial complexity masking (0-> disabled) - * - encoding: Set by user. - * - decoding: unused - */ - float spatial_cplx_masking; - - /** - * p block masking (0-> disabled) - * - encoding: Set by user. - * - decoding: unused - */ - float p_masking; - - /** - * darkness masking (0-> disabled) - * - encoding: Set by user. - * - decoding: unused - */ - float dark_masking; - /** * slice count * - encoding: Set by libavcodec. @@ -1929,15 +1303,6 @@ typedef struct AVCodecContext { */ int *slice_offset; - /** - * sample aspect ratio (0 if unknown) - * That is the width of a pixel divided by the height of the pixel. - * Numerator and denominator must be relatively prime and smaller than 256 for some video standards. - * - encoding: Set by user. - * - decoding: Set by libavcodec. - */ - AVRational sample_aspect_ratio; - /** * motion estimation comparison function * - encoding: Set by user. @@ -2830,34 +2195,6 @@ typedef struct AVCodecContext { #define AV_EF_COMPLIANT (1<<17) ///< consider all spec non compliances as errors #define AV_EF_AGGRESSIVE (1<<18) ///< consider things that a sane encoder should not do as an error - - /** - * opaque 64bit number (generally a PTS) that will be reordered and - * output in AVFrame.reordered_opaque - * - encoding: unused - * - decoding: Set by user. - */ - int64_t reordered_opaque; - - /** - * Hardware accelerator in use - * - encoding: unused. - * - decoding: Set by libavcodec - */ - struct AVHWAccel *hwaccel; - - /** - * Hardware accelerator context. - * For some hardware accelerators, a global context needs to be - * provided by the user. In that case, this holds display-dependent - * data FFmpeg cannot instantiate itself. Please refer to the - * FFmpeg HW accelerator documentation to know how to fill this - * is. e.g. for VA API, this is a struct vaapi_context. - * - encoding: unused - * - decoding: Set by user - */ - void *hwaccel_context; - /** * error * - encoding: Set by libavcodec if flags & AV_CODEC_FLAG_PSNR. @@ -3097,22 +2434,6 @@ typedef struct AVCodecContext { #define FF_PROFILE_MPEG4_SIMPLE_STUDIO 14 #define FF_PROFILE_MPEG4_ADVANCED_SIMPLE 15 -#define FF_PROFILE_JPEG2000_CSTREAM_RESTRICTION_0 0 -#define FF_PROFILE_JPEG2000_CSTREAM_RESTRICTION_1 1 -#define FF_PROFILE_JPEG2000_CSTREAM_NO_RESTRICTION 2 -#define FF_PROFILE_JPEG2000_DCINEMA_2K 3 -#define FF_PROFILE_JPEG2000_DCINEMA_4K 4 - -#define FF_PROFILE_VP9_0 0 -#define FF_PROFILE_VP9_1 1 -#define FF_PROFILE_VP9_2 2 -#define FF_PROFILE_VP9_3 3 - -#define FF_PROFILE_HEVC_MAIN 1 -#define FF_PROFILE_HEVC_MAIN_10 2 -#define FF_PROFILE_HEVC_MAIN_STILL_PICTURE 3 -#define FF_PROFILE_HEVC_REXT 4 - /** * level * - encoding: Set by user. @@ -3121,13 +2442,6 @@ typedef struct AVCodecContext { int level; #define FF_LEVEL_UNKNOWN -99 - /** - * Skip loop filtering for selected frames. - * - encoding: unused - * - decoding: Set by user. - */ - enum AVDiscard skip_loop_filter; - /** * Skip IDCT/dequantization for selected frames. * - encoding: unused @@ -3153,43 +2467,6 @@ typedef struct AVCodecContext { uint8_t *subtitle_header; int subtitle_header_size; -#if FF_API_ERROR_RATE - /** - * @deprecated use the 'error_rate' private AVOption of the mpegvideo - * encoders - */ - attribute_deprecated - int error_rate; -#endif - -#if FF_API_VBV_DELAY - /** - * VBV delay coded in the last frame (in periods of a 27 MHz clock). - * Used for compliant TS muxing. - * - encoding: Set by libavcodec. - * - decoding: unused. - * @deprecated this value is now exported as a part of - * AV_PKT_DATA_CPB_PROPERTIES packet side data - */ - attribute_deprecated - uint64_t vbv_delay; -#endif - -#if FF_API_SIDEDATA_ONLY_PKT - /** - * Encoding only and set by default. Allow encoders to output packets - * that do not contain any encoded data, only side data. - * - * Some encoders need to output such packets, e.g. to update some stream - * parameters at the end of encoding. - * - * @deprecated this field disables the default behaviour and - * it is kept only for compatibility. - */ - attribute_deprecated - int side_data_only_packets; -#endif - /** * Audio only. The number of "priming" samples (padding) inserted by the * encoder at the beginning of the audio. I.e. this number of leading @@ -3207,21 +2484,6 @@ typedef struct AVCodecContext { */ int initial_padding; - /** - * - decoding: For codecs that store a framerate value in the compressed - * bitstream, the decoder may export it here. { 0, 1} when - * unknown. - * - encoding: unused - */ - AVRational framerate; - - /** - * Nominal unaccelerated pixel format, see AV_PIX_FMT_xxx. - * - encoding: unused. - * - decoding: Set by libavcodec before calling get_format() - */ - enum AVPixelFormat sw_pix_fmt; - /** * Timebase in which pkt_dts/pts and AVPacket.dts/pts are. * Code outside libavcodec should access this field using: @@ -3231,26 +2493,6 @@ typedef struct AVCodecContext { */ AVRational pkt_timebase; - /** - * AVCodecDescriptor - * Code outside libavcodec should access this field using: - * av_codec_{get,set}_codec_descriptor(avctx) - * - encoding: unused. - * - decoding: set by libavcodec. - */ - const AVCodecDescriptor *codec_descriptor; - -#if !FF_API_LOWRES - /** - * low resolution decoding, 1-> 1/2 size, 2->1/4 size - * - encoding: unused - * - decoding: Set by user. - * Code outside libavcodec should access this field using: - * av_codec_{get,set}_lowres(avctx) - */ - int lowres; -#endif - /** * Current statistics for PTS correction. * - decoding: maintained and used by libavcodec, not intended to be used by user apps @@ -3261,24 +2503,6 @@ typedef struct AVCodecContext { int64_t pts_correction_last_pts; /// PTS of the last frame int64_t pts_correction_last_dts; /// DTS of the last frame - /** - * Character encoding of the input subtitles file. - * - decoding: set by user - * - encoding: unused - */ - char *sub_charenc; - - /** - * Subtitles character encoding mode. Formats or codecs might be adjusting - * this setting (if they are doing the conversion themselves for instance). - * - decoding: set by libavcodec - * - encoding: unused - */ - int sub_charenc_mode; -#define FF_SUB_CHARENC_MODE_DO_NOTHING -1 ///< do nothing (demuxer outputs a stream supposed to be already in UTF-8, or the codec is bitmap for instance) -#define FF_SUB_CHARENC_MODE_AUTOMATIC 0 ///< libavcodec will select the mode itself -#define FF_SUB_CHARENC_MODE_PRE_DECODER 1 ///< the AVPacket data needs to be recoded to UTF-8 before being fed to the decoder, requires iconv - /** * Skip processing alpha if supported by codec. * Note that if the format uses pre-multiplied alpha (common with VP6, @@ -3301,45 +2525,6 @@ typedef struct AVCodecContext { */ int seek_preroll; -#if !FF_API_DEBUG_MV - /** - * debug motion vectors - * Code outside libavcodec should access this field using AVOptions - * - encoding: Set by user. - * - decoding: Set by user. - */ - int debug_mv; -#define FF_DEBUG_VIS_MV_P_FOR 0x00000001 //visualize forward predicted MVs of P frames -#define FF_DEBUG_VIS_MV_B_FOR 0x00000002 //visualize forward predicted MVs of B frames -#define FF_DEBUG_VIS_MV_B_BACK 0x00000004 //visualize backward predicted MVs of B frames -#endif - - /** - * custom intra quantization matrix - * Code outside libavcodec should access this field using av_codec_g/set_chroma_intra_matrix() - * - encoding: Set by user, can be NULL. - * - decoding: unused. - */ - uint16_t *chroma_intra_matrix; - - /** - * dump format separator. - * can be ", " or "\n " or anything else - * Code outside libavcodec should access this field using AVOptions - * (NO direct access). - * - encoding: Set by user. - * - decoding: Set by user. - */ - uint8_t *dump_separator; - - /** - * ',' separated list of allowed decoders. - * If NULL then all are allowed - * - encoding: unused - * - decoding: set by user through AVOPtions (NO direct access) - */ - char *codec_whitelist; - /* * Properties of the stream that gets decoded * To be accessed through av_codec_get_properties() (NO direct access) @@ -3350,34 +2535,16 @@ typedef struct AVCodecContext { #define FF_CODEC_PROPERTY_LOSSLESS 0x00000001 #define FF_CODEC_PROPERTY_CLOSED_CAPTIONS 0x00000002 - /** - * Additional data associated with the entire coded stream. - * - * - decoding: unused - * - encoding: may be set by libavcodec after avcodec_open2(). - */ - AVPacketSideData *coded_side_data; - int nb_coded_side_data; - } AVCodecContext; AVRational av_codec_get_pkt_timebase (const AVCodecContext *avctx); void av_codec_set_pkt_timebase (AVCodecContext *avctx, AVRational val); -const AVCodecDescriptor *av_codec_get_codec_descriptor(const AVCodecContext *avctx); -void av_codec_set_codec_descriptor(AVCodecContext *avctx, const AVCodecDescriptor *desc); - unsigned av_codec_get_codec_properties(const AVCodecContext *avctx); -int av_codec_get_lowres(const AVCodecContext *avctx); -void av_codec_set_lowres(AVCodecContext *avctx, int val); - int av_codec_get_seek_preroll(const AVCodecContext *avctx); void av_codec_set_seek_preroll(AVCodecContext *avctx, int val); -uint16_t *av_codec_get_chroma_intra_matrix(const AVCodecContext *avctx); -void av_codec_set_chroma_intra_matrix(AVCodecContext *avctx, uint16_t *val); - /** * AVProfile. */ @@ -3979,22 +3146,6 @@ void av_init_packet(AVPacket *pkt); */ int av_new_packet(AVPacket *pkt, int size); -/** - * Reduce packet size, correctly zeroing padding - * - * @param pkt packet - * @param size new size - */ -void av_shrink_packet(AVPacket *pkt, int size); - -/** - * Increase packet size, correctly zeroing padding - * - * @param pkt packet - * @param grow_by number of bytes by which to increase the size of the packet - */ -int av_grow_packet(AVPacket *pkt, int grow_by); - /** * Initialize a reference-counted packet from av_malloc()ed data. * @@ -4043,60 +3194,6 @@ int av_copy_packet_side_data(AVPacket *dst, const AVPacket *src); attribute_deprecated void av_free_packet(AVPacket *pkt); #endif -/** - * Allocate new information of a packet. - * - * @param pkt packet - * @param type side information type - * @param size side information size - * @return pointer to fresh allocated data or NULL otherwise - */ -uint8_t* av_packet_new_side_data(AVPacket *pkt, enum AVPacketSideDataType type, - int size); - -/** - * Wrap an existing array as a packet side data. - * - * @param pkt packet - * @param type side information type - * @param data the side data array. It must be allocated with the av_malloc() - * family of functions. The ownership of the data is transferred to - * pkt. - * @param size side information size - * @return a non-negative number on success, a negative AVERROR code on - * failure. On failure, the packet is unchanged and the data remains - * owned by the caller. - */ -int av_packet_add_side_data(AVPacket *pkt, enum AVPacketSideDataType type, - uint8_t *data, size_t size); - -/** - * Shrink the already allocated side data buffer - * - * @param pkt packet - * @param type side information type - * @param size new side information size - * @return 0 on success, < 0 on failure - */ -int av_packet_shrink_side_data(AVPacket *pkt, enum AVPacketSideDataType type, - int size); - -/** - * Get side information from packet. - * - * @param pkt packet - * @param type desired side information type - * @param size pointer for side information size to store (optional) - * @return pointer to data if present or NULL otherwise - */ -uint8_t* av_packet_get_side_data(AVPacket *pkt, enum AVPacketSideDataType type, - int *size); - -int av_packet_merge_side_data(AVPacket *pkt); - -int av_packet_split_side_data(AVPacket *pkt); - -const char *av_packet_side_data_name(enum AVPacketSideDataType type); /** * Pack a dictionary for use in side_data. @@ -4116,15 +3213,6 @@ uint8_t *av_packet_pack_dictionary(AVDictionary *dict, int *size); */ int av_packet_unpack_dictionary(const uint8_t *data, int size, AVDictionary **dict); - -/** - * Convenience function to free all the side data stored. - * All the other fields stay untouched. - * - * @param pkt packet - */ -void av_packet_free_side_data(AVPacket *pkt); - /** * Setup a new reference to the data described by a given packet * @@ -5038,28 +4126,6 @@ size_t av_get_codec_tag_string(char *buf, size_t buf_size, unsigned int codec_ta void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode); -/** - * Return a name for the specified profile, if available. - * - * @param codec the codec that is searched for the given profile - * @param profile the profile value for which a name is requested - * @return A name for the profile if found, NULL otherwise. - */ -const char *av_get_profile_name(const AVCodec *codec, int profile); - -/** - * Return a name for the specified profile, if available. - * - * @param codec_id the ID of the codec to which the requested profile belongs - * @param profile the profile value for which a name is requested - * @return A name for the profile if found, NULL otherwise. - * - * @note unlike av_get_profile_name(), which searches a list of profiles - * supported by a specific decoder or encoder implementation, this - * function searches the list of profiles from the AVCodecDescriptor - */ -const char *avcodec_profile_name(enum AVCodecID codec_id, int profile); - int avcodec_default_execute(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2),void *arg, int *ret, int count, int size); int avcodec_default_execute2(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2, int, int),void *arg, int *ret, int count); //FIXME func typedef @@ -5293,18 +4359,6 @@ attribute_deprecated void av_log_ask_for_sample(void *avc, const char *msg, ...) av_printf_format(2, 3); #endif /* FF_API_MISSING_SAMPLE */ -/** - * Register the hardware accelerator hwaccel. - */ -void av_register_hwaccel(AVHWAccel *hwaccel); - -/** - * If hwaccel is NULL, returns the first registered hardware accelerator, - * if hwaccel is non-NULL, returns the next registered hardware accelerator - * after hwaccel, or NULL if hwaccel is the last one. - */ -AVHWAccel *av_hwaccel_next(const AVHWAccel *hwaccel); - /** * Lock operation used by lockmgr diff --git a/ext/at3_standalone/avfft.c b/ext/at3_standalone/avfft.c index 247b063ae8..5ae0b4fd71 100644 --- a/ext/at3_standalone/avfft.c +++ b/ext/at3_standalone/avfft.c @@ -21,36 +21,6 @@ #include "fft.h" #include "mem.h" -/* FFT */ - -FFTContext *av_fft_init(int nbits, int inverse) -{ - FFTContext *s = av_mallocz(sizeof(*s)); - - if (s && ff_fft_init(s, nbits, inverse)) - av_freep(&s); - - return s; -} - -void av_fft_permute(FFTContext *s, FFTComplex *z) -{ - s->fft_permute(s, z); -} - -void av_fft_calc(FFTContext *s, FFTComplex *z) -{ - s->fft_calc(s, z); -} - -av_cold void av_fft_end(FFTContext *s) -{ - if (s) { - ff_fft_end(s); - av_free(s); - } -} - #if CONFIG_MDCT FFTContext *av_mdct_init(int nbits, int inverse, double scale) diff --git a/ext/at3_standalone/avpacket.c b/ext/at3_standalone/avpacket.c index 5d2e3ebf64..c254150f29 100644 --- a/ext/at3_standalone/avpacket.c +++ b/ext/at3_standalone/avpacket.c @@ -43,8 +43,6 @@ FF_ENABLE_DEPRECATION_WARNINGS pkt->flags = 0; pkt->stream_index = 0; pkt->buf = NULL; - pkt->side_data = NULL; - pkt->side_data_elems = 0; } AVPacket *av_packet_alloc(void) @@ -97,42 +95,6 @@ int av_new_packet(AVPacket *pkt, int size) return 0; } -void av_shrink_packet(AVPacket *pkt, int size) -{ - if (pkt->size <= size) - return; - pkt->size = size; - memset(pkt->data + size, 0, AV_INPUT_BUFFER_PADDING_SIZE); -} - -int av_grow_packet(AVPacket *pkt, int grow_by) -{ - int new_size; - av_assert0((unsigned)pkt->size <= INT_MAX - AV_INPUT_BUFFER_PADDING_SIZE); - if (!pkt->size) - return av_new_packet(pkt, grow_by); - if ((unsigned)grow_by > - INT_MAX - (pkt->size + AV_INPUT_BUFFER_PADDING_SIZE)) - return -1; - - new_size = pkt->size + grow_by + AV_INPUT_BUFFER_PADDING_SIZE; - if (pkt->buf) { - int ret = av_buffer_realloc(&pkt->buf, new_size); - if (ret < 0) - return ret; - } else { - pkt->buf = av_buffer_alloc(new_size); - if (!pkt->buf) - return AVERROR(ENOMEM); - memcpy(pkt->buf->data, pkt->data, FFMIN(pkt->size, pkt->size + grow_by)); - } - pkt->data = pkt->buf->data; - pkt->size += grow_by; - memset(pkt->data + pkt->size, 0, AV_INPUT_BUFFER_PADDING_SIZE); - - return 0; -} - int av_packet_from_data(AVPacket *pkt, uint8_t *data, int size) { if (size >= INT_MAX - AV_INPUT_BUFFER_PADDING_SIZE) @@ -182,7 +144,6 @@ do { \ static int copy_packet_data(AVPacket *pkt, const AVPacket *src, int dup) { pkt->data = NULL; - pkt->side_data = NULL; if (pkt->buf) { AVBufferRef *ref = av_buffer_ref(src->buf); if (!ref) @@ -192,11 +153,6 @@ static int copy_packet_data(AVPacket *pkt, const AVPacket *src, int dup) } else { DUP_DATA(pkt->data, src->data, pkt->size, 1, ALLOC_BUF); } - if (pkt->side_data_elems && dup) - pkt->side_data = src->side_data; - if (pkt->side_data_elems && !dup) { - return av_copy_packet_side_data(pkt, src); - } return 0; failed_alloc: @@ -204,30 +160,6 @@ failed_alloc: return AVERROR(ENOMEM); } -int av_copy_packet_side_data(AVPacket *pkt, const AVPacket *src) -{ - if (src->side_data_elems) { - int i; - DUP_DATA(pkt->side_data, src->side_data, - src->side_data_elems * sizeof(*src->side_data), 0, ALLOC_MALLOC); - if (src != pkt) { - memset(pkt->side_data, 0, - src->side_data_elems * sizeof(*src->side_data)); - } - for (i = 0; i < src->side_data_elems; i++) { - DUP_DATA(pkt->side_data[i].data, src->side_data[i].data, - src->side_data[i].size, 1, ALLOC_MALLOC); - pkt->side_data[i].size = src->side_data[i].size; - pkt->side_data[i].type = src->side_data[i].type; - } - } - pkt->side_data_elems = src->side_data_elems; - return 0; - -failed_alloc: - av_packet_unref(pkt); - return AVERROR(ENOMEM); -} FF_ENABLE_DEPRECATION_WARNINGS #endif @@ -248,15 +180,6 @@ int av_copy_packet(AVPacket *dst, const AVPacket *src) return copy_packet_data(dst, src, 0); } -void av_packet_free_side_data(AVPacket *pkt) -{ - int i; - for (i = 0; i < pkt->side_data_elems; i++) - av_freep(&pkt->side_data[i].data); - av_freep(&pkt->side_data); - pkt->side_data_elems = 0; -} - #if FF_API_AVPACKET_OLD_API FF_DISABLE_DEPRECATION_WARNINGS void av_free_packet(AVPacket *pkt) @@ -266,175 +189,13 @@ void av_free_packet(AVPacket *pkt) av_buffer_unref(&pkt->buf); pkt->data = NULL; pkt->size = 0; - - av_packet_free_side_data(pkt); } } FF_ENABLE_DEPRECATION_WARNINGS #endif -int av_packet_add_side_data(AVPacket *pkt, enum AVPacketSideDataType type, - uint8_t *data, size_t size) -{ - int elems = pkt->side_data_elems; - - if ((unsigned)elems + 1 > INT_MAX / sizeof(*pkt->side_data)) - return AVERROR(ERANGE); - - pkt->side_data = av_realloc(pkt->side_data, - (elems + 1) * sizeof(*pkt->side_data)); - if (!pkt->side_data) - return AVERROR(ENOMEM); - - pkt->side_data[elems].data = data; - pkt->side_data[elems].size = size; - pkt->side_data[elems].type = type; - pkt->side_data_elems++; - - return 0; -} - - -uint8_t *av_packet_new_side_data(AVPacket *pkt, enum AVPacketSideDataType type, - int size) -{ - int ret; - uint8_t *data; - - if ((unsigned)size > INT_MAX - AV_INPUT_BUFFER_PADDING_SIZE) - return NULL; - data = av_mallocz(size + AV_INPUT_BUFFER_PADDING_SIZE); - if (!data) - return NULL; - - ret = av_packet_add_side_data(pkt, type, data, size); - if (ret < 0) { - av_freep(&data); - return NULL; - } - - return data; -} - -uint8_t *av_packet_get_side_data(AVPacket *pkt, enum AVPacketSideDataType type, - int *size) -{ - int i; - - for (i = 0; i < pkt->side_data_elems; i++) { - if (pkt->side_data[i].type == type) { - if (size) - *size = pkt->side_data[i].size; - return pkt->side_data[i].data; - } - } - return NULL; -} - -const char *av_packet_side_data_name(enum AVPacketSideDataType type) -{ - switch(type) { - case AV_PKT_DATA_PALETTE: return "Palette"; - case AV_PKT_DATA_NEW_EXTRADATA: return "New Extradata"; - case AV_PKT_DATA_PARAM_CHANGE: return "Param Change"; - case AV_PKT_DATA_H263_MB_INFO: return "H263 MB Info"; - case AV_PKT_DATA_REPLAYGAIN: return "Replay Gain"; - case AV_PKT_DATA_DISPLAYMATRIX: return "Display Matrix"; - case AV_PKT_DATA_STEREO3D: return "Stereo 3D"; - case AV_PKT_DATA_AUDIO_SERVICE_TYPE: return "Audio Service Type"; - case AV_PKT_DATA_SKIP_SAMPLES: return "Skip Samples"; - case AV_PKT_DATA_JP_DUALMONO: return "JP Dual Mono"; - case AV_PKT_DATA_STRINGS_METADATA: return "Strings Metadata"; - case AV_PKT_DATA_SUBTITLE_POSITION: return "Subtitle Position"; - case AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL: return "Matroska BlockAdditional"; - case AV_PKT_DATA_WEBVTT_IDENTIFIER: return "WebVTT ID"; - case AV_PKT_DATA_WEBVTT_SETTINGS: return "WebVTT Settings"; - case AV_PKT_DATA_METADATA_UPDATE: return "Metadata Update"; - } - return NULL; -} - #define FF_MERGE_MARKER 0x8c4d9d108e25e9feULL -int av_packet_merge_side_data(AVPacket *pkt){ - if(pkt->side_data_elems){ - AVBufferRef *buf; - int i; - uint8_t *p; - uint64_t size= pkt->size + 8LL + AV_INPUT_BUFFER_PADDING_SIZE; - AVPacket old= *pkt; - for (i=0; i INT_MAX) - return AVERROR(EINVAL); - buf = av_buffer_alloc(size); - if (!buf) - return AVERROR(ENOMEM); - pkt->buf = buf; - pkt->data = p = buf->data; - pkt->size = size - AV_INPUT_BUFFER_PADDING_SIZE; - bytestream_put_buffer(&p, old.data, old.size); - for (i=old.side_data_elems-1; i>=0; i--) { - bytestream_put_buffer(&p, old.side_data[i].data, old.side_data[i].size); - bytestream_put_be32(&p, old.side_data[i].size); - *p++ = old.side_data[i].type | ((i==old.side_data_elems-1)*128); - } - bytestream_put_be64(&p, FF_MERGE_MARKER); - av_assert0(p-pkt->data == pkt->size); - memset(p, 0, AV_INPUT_BUFFER_PADDING_SIZE); - av_packet_unref(&old); - pkt->side_data_elems = 0; - pkt->side_data = NULL; - return 1; - } - return 0; -} - -int av_packet_split_side_data(AVPacket *pkt){ - if (!pkt->side_data_elems && pkt->size >12 && AV_RB64(pkt->data + pkt->size - 8) == FF_MERGE_MARKER){ - int i; - unsigned int size; - uint8_t *p; - - p = pkt->data + pkt->size - 8 - 5; - for (i=1; ; i++){ - size = AV_RB32(p); - if (size>INT_MAX - 5 || p - pkt->data < size) - return 0; - if (p[4]&128) - break; - if (p - pkt->data < size + 5) - return 0; - p-= size+5; - } - - pkt->side_data = av_malloc_array(i, sizeof(*pkt->side_data)); - if (!pkt->side_data) - return AVERROR(ENOMEM); - - p= pkt->data + pkt->size - 8 - 5; - for (i=0; ; i++){ - size= AV_RB32(p); - av_assert0(size<=INT_MAX - 5 && p - pkt->data >= size); - pkt->side_data[i].data = av_mallocz(size + AV_INPUT_BUFFER_PADDING_SIZE); - pkt->side_data[i].size = size; - pkt->side_data[i].type = p[4]&127; - if (!pkt->side_data[i].data) - return AVERROR(ENOMEM); - memcpy(pkt->side_data[i].data, p-size, size); - pkt->size -= size + 5; - if(p[4]&128) - break; - p-= size+5; - } - pkt->size -= 8; - pkt->side_data_elems = i+1; - return 1; - } - return 0; -} - uint8_t *av_packet_pack_dictionary(AVDictionary *dict, int *size) { AVDictionaryEntry *t = NULL; @@ -495,22 +256,6 @@ int av_packet_unpack_dictionary(const uint8_t *data, int size, AVDictionary **di return ret; } -int av_packet_shrink_side_data(AVPacket *pkt, enum AVPacketSideDataType type, - int size) -{ - int i; - - for (i = 0; i < pkt->side_data_elems; i++) { - if (pkt->side_data[i].type == type) { - if (size > pkt->side_data[i].size) - return AVERROR(ENOMEM); - pkt->side_data[i].size = size; - return 0; - } - } - return AVERROR(ENOENT); -} - int av_packet_copy_props(AVPacket *dst, const AVPacket *src) { int i; @@ -527,25 +272,11 @@ FF_ENABLE_DEPRECATION_WARNINGS dst->flags = src->flags; dst->stream_index = src->stream_index; - for (i = 0; i < src->side_data_elems; i++) { - enum AVPacketSideDataType type = src->side_data[i].type; - int size = src->side_data[i].size; - uint8_t *src_data = src->side_data[i].data; - uint8_t *dst_data = av_packet_new_side_data(dst, type, size); - - if (!dst_data) { - av_packet_free_side_data(dst); - return AVERROR(ENOMEM); - } - memcpy(dst_data, src_data, size); - } - return 0; } void av_packet_unref(AVPacket *pkt) { - av_packet_free_side_data(pkt); av_buffer_unref(&pkt->buf); av_init_packet(pkt); pkt->data = NULL; @@ -577,7 +308,6 @@ int av_packet_ref(AVPacket *dst, const AVPacket *src) dst->data = dst->buf->data; return 0; fail: - av_packet_free_side_data(dst); return ret; } @@ -615,28 +345,3 @@ FF_DISABLE_DEPRECATION_WARNINGS FF_ENABLE_DEPRECATION_WARNINGS #endif } - -int ff_side_data_set_encoder_stats(AVPacket *pkt, int quality, int64_t *error, int error_count, int pict_type) -{ - uint8_t *side_data; - int side_data_size; - int i; - - side_data = av_packet_get_side_data(pkt, AV_PKT_DATA_QUALITY_STATS, &side_data_size); - if (!side_data) { - side_data_size = 4+4+8*error_count; - side_data = av_packet_new_side_data(pkt, AV_PKT_DATA_QUALITY_STATS, - side_data_size); - } - - if (!side_data || side_data_size < 4+4+8*error_count) - return AVERROR(ENOMEM); - - AV_WL32(side_data , quality ); - side_data[4] = pict_type; - side_data[5] = error_count; - for (i = 0; i |%s|", q); - printf(" + |%s|\n", p); - av_free(q); - } - - printf("Testing av_append_path_component()\n"); - #define TEST_APPEND_PATH_COMPONENT(path, component, expected) \ - fullpath = av_append_path_component((path), (component)); \ - printf("%s = %s\n", fullpath ? fullpath : "(null)", expected); \ - av_free(fullpath); - TEST_APPEND_PATH_COMPONENT(NULL, NULL, "(null)") - TEST_APPEND_PATH_COMPONENT("path", NULL, "path"); - TEST_APPEND_PATH_COMPONENT(NULL, "comp", "comp"); - TEST_APPEND_PATH_COMPONENT("path", "comp", "path/comp"); - TEST_APPEND_PATH_COMPONENT("path/", "comp", "path/comp"); - TEST_APPEND_PATH_COMPONENT("path", "/comp", "path/comp"); - TEST_APPEND_PATH_COMPONENT("path/", "/comp", "path/comp"); - TEST_APPEND_PATH_COMPONENT("path/path2/", "/comp/comp2", "path/path2/comp/comp2"); - return 0; -} - -#endif /* TEST */ diff --git a/ext/at3_standalone/avutil.h b/ext/at3_standalone/avutil.h index 9bcf674126..29f73d3f77 100644 --- a/ext/at3_standalone/avutil.h +++ b/ext/at3_standalone/avutil.h @@ -251,36 +251,6 @@ const char *av_get_media_type_string(enum AVMediaType media_type); #define AV_TIME_BASE_Q (AVRational){1, AV_TIME_BASE} -/** - * @} - * @} - * @defgroup lavu_picture Image related - * - * AVPicture types, pixel formats and basic image planes manipulation. - * - * @{ - */ - -enum AVPictureType { - AV_PICTURE_TYPE_NONE = 0, ///< Undefined - AV_PICTURE_TYPE_I, ///< Intra - AV_PICTURE_TYPE_P, ///< Predicted - AV_PICTURE_TYPE_B, ///< Bi-dir predicted - AV_PICTURE_TYPE_S, ///< S(GMC)-VOP MPEG4 - AV_PICTURE_TYPE_SI, ///< Switching Intra - AV_PICTURE_TYPE_SP, ///< Switching Predicted - AV_PICTURE_TYPE_BI, ///< BI type -}; - -/** - * Return a single letter to describe the given picture type - * pict_type. - * - * @param[in] pict_type the picture type @return a single character - * representing the picture type, '?' if pict_type is unknown - */ -char av_get_picture_type_char(enum AVPictureType pict_type); - /** * @} */ @@ -292,7 +262,6 @@ char av_get_picture_type_char(enum AVPictureType pict_type); #include "macros.h" #include "mathematics.h" #include "log.h" -#include "pixfmt.h" /** * Return x default pointer in case p is NULL. diff --git a/ext/at3_standalone/bitstream.c b/ext/at3_standalone/bitstream.c index 8f661af1fb..3040c5a63f 100644 --- a/ext/at3_standalone/bitstream.c +++ b/ext/at3_standalone/bitstream.c @@ -28,7 +28,6 @@ * bitstream api. */ -#include "atomic.h" #include "qsort.h" #include "avcodec.h" #include "internal.h" diff --git a/ext/at3_standalone/bprint.c b/ext/at3_standalone/bprint.c deleted file mode 100644 index 1c62d214c1..0000000000 --- a/ext/at3_standalone/bprint.c +++ /dev/null @@ -1,379 +0,0 @@ -/* - * Copyright (c) 2012 Nicolas George - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include -#include -#include -#include -#include "avstring.h" -#include "bprint.h" -#include "common.h" -#include "error.h" -#include "mem.h" - -#define av_bprint_room(buf) ((buf)->size - FFMIN((buf)->len, (buf)->size)) -#define av_bprint_is_allocated(buf) ((buf)->str != (buf)->reserved_internal_buffer) - -static int av_bprint_alloc(AVBPrint *buf, unsigned room) -{ - char *old_str, *new_str; - unsigned min_size, new_size; - - if (buf->size == buf->size_max) - return AVERROR(EIO); - if (!av_bprint_is_complete(buf)) - return AVERROR_INVALIDDATA; /* it is already truncated anyway */ - min_size = buf->len + 1 + FFMIN(UINT_MAX - buf->len - 1, room); - new_size = buf->size > buf->size_max / 2 ? buf->size_max : buf->size * 2; - if (new_size < min_size) - new_size = FFMIN(buf->size_max, min_size); - old_str = av_bprint_is_allocated(buf) ? buf->str : NULL; - new_str = av_realloc(old_str, new_size); - if (!new_str) - return AVERROR(ENOMEM); - if (!old_str) - memcpy(new_str, buf->str, buf->len + 1); - buf->str = new_str; - buf->size = new_size; - return 0; -} - -static void av_bprint_grow(AVBPrint *buf, unsigned extra_len) -{ - /* arbitrary margin to avoid small overflows */ - extra_len = FFMIN(extra_len, UINT_MAX - 5 - buf->len); - buf->len += extra_len; - if (buf->size) - buf->str[FFMIN(buf->len, buf->size - 1)] = 0; -} - -void av_bprint_init(AVBPrint *buf, unsigned size_init, unsigned size_max) -{ - unsigned size_auto = (char *)buf + sizeof(*buf) - - buf->reserved_internal_buffer; - - if (size_max == 1) - size_max = size_auto; - buf->str = buf->reserved_internal_buffer; - buf->len = 0; - buf->size = FFMIN(size_auto, size_max); - buf->size_max = size_max; - *buf->str = 0; - if (size_init > buf->size) - av_bprint_alloc(buf, size_init - 1); -} - -void av_bprint_init_for_buffer(AVBPrint *buf, char *buffer, unsigned size) -{ - buf->str = buffer; - buf->len = 0; - buf->size = size; - buf->size_max = size; - *buf->str = 0; -} - -void av_bprintf(AVBPrint *buf, const char *fmt, ...) -{ - unsigned room; - char *dst; - va_list vl; - int extra_len; - - while (1) { - room = av_bprint_room(buf); - dst = room ? buf->str + buf->len : NULL; - va_start(vl, fmt); - extra_len = vsnprintf(dst, room, fmt, vl); - va_end(vl); - if (extra_len <= 0) - return; - if (extra_len < room) - break; - if (av_bprint_alloc(buf, extra_len)) - break; - } - av_bprint_grow(buf, extra_len); -} - -void av_vbprintf(AVBPrint *buf, const char *fmt, va_list vl_arg) -{ - unsigned room; - char *dst; - int extra_len; - va_list vl; - - while (1) { - room = av_bprint_room(buf); - dst = room ? buf->str + buf->len : NULL; - va_copy(vl, vl_arg); - extra_len = vsnprintf(dst, room, fmt, vl); - va_end(vl); - if (extra_len <= 0) - return; - if (extra_len < room) - break; - if (av_bprint_alloc(buf, extra_len)) - break; - } - av_bprint_grow(buf, extra_len); -} - -void av_bprint_chars(AVBPrint *buf, char c, unsigned n) -{ - unsigned room, real_n; - - while (1) { - room = av_bprint_room(buf); - if (n < room) - break; - if (av_bprint_alloc(buf, n)) - break; - } - if (room) { - real_n = FFMIN(n, room - 1); - memset(buf->str + buf->len, c, real_n); - } - av_bprint_grow(buf, n); -} - -void av_bprint_append_data(AVBPrint *buf, const char *data, unsigned size) -{ - unsigned room, real_n; - - while (1) { - room = av_bprint_room(buf); - if (size < room) - break; - if (av_bprint_alloc(buf, size)) - break; - } - if (room) { - real_n = FFMIN(size, room - 1); - memcpy(buf->str + buf->len, data, real_n); - } - av_bprint_grow(buf, size); -} - -void av_bprint_strftime(AVBPrint *buf, const char *fmt, const struct tm *tm) -{ - unsigned room; - size_t l; - - if (!*fmt) - return; - while (1) { - room = av_bprint_room(buf); - if (room && (l = strftime(buf->str + buf->len, room, fmt, tm))) - break; - /* strftime does not tell us how much room it would need: let us - retry with twice as much until the buffer is large enough */ - room = !room ? strlen(fmt) + 1 : - room <= INT_MAX / 2 ? room * 2 : INT_MAX; - if (av_bprint_alloc(buf, room)) { - /* impossible to grow, try to manage something useful anyway */ - room = av_bprint_room(buf); - if (room < 1024) { - /* if strftime fails because the buffer has (almost) reached - its maximum size, let us try in a local buffer; 1k should - be enough to format any real date+time string */ - char buf2[1024]; - if ((l = strftime(buf2, sizeof(buf2), fmt, tm))) { - av_bprintf(buf, "%s", buf2); - return; - } - } - if (room) { - /* if anything else failed and the buffer is not already - truncated, let us add a stock string and force truncation */ - static const char txt[] = "[truncated strftime output]"; - memset(buf->str + buf->len, '!', room); - memcpy(buf->str + buf->len, txt, FFMIN(sizeof(txt) - 1, room)); - av_bprint_grow(buf, room); /* force truncation */ - } - return; - } - } - av_bprint_grow(buf, l); -} - -void av_bprint_get_buffer(AVBPrint *buf, unsigned size, - unsigned char **mem, unsigned *actual_size) -{ - if (size > av_bprint_room(buf)) - av_bprint_alloc(buf, size); - *actual_size = av_bprint_room(buf); - *mem = *actual_size ? buf->str + buf->len : NULL; -} - -void av_bprint_clear(AVBPrint *buf) -{ - if (buf->len) { - *buf->str = 0; - buf->len = 0; - } -} - -int av_bprint_finalize(AVBPrint *buf, char **ret_str) -{ - unsigned real_size = FFMIN(buf->len + 1, buf->size); - char *str; - int ret = 0; - - if (ret_str) { - if (av_bprint_is_allocated(buf)) { - str = av_realloc(buf->str, real_size); - if (!str) - str = buf->str; - buf->str = NULL; - } else { - str = av_malloc(real_size); - if (str) - memcpy(str, buf->str, real_size); - else - ret = AVERROR(ENOMEM); - } - *ret_str = str; - } else { - if (av_bprint_is_allocated(buf)) - av_freep(&buf->str); - } - buf->size = real_size; - return ret; -} - -#define WHITESPACES " \n\t" - -void av_bprint_escape(AVBPrint *dstbuf, const char *src, const char *special_chars, - enum AVEscapeMode mode, int flags) -{ - const char *src0 = src; - - if (mode == AV_ESCAPE_MODE_AUTO) - mode = AV_ESCAPE_MODE_BACKSLASH; /* TODO: implement a heuristic */ - - switch (mode) { - case AV_ESCAPE_MODE_QUOTE: - /* enclose the string between '' */ - av_bprint_chars(dstbuf, '\'', 1); - for (; *src; src++) { - if (*src == '\'') - av_bprintf(dstbuf, "'\\''"); - else - av_bprint_chars(dstbuf, *src, 1); - } - av_bprint_chars(dstbuf, '\'', 1); - break; - - /* case AV_ESCAPE_MODE_BACKSLASH or unknown mode */ - default: - /* \-escape characters */ - for (; *src; src++) { - int is_first_last = src == src0 || !*(src+1); - int is_ws = !!strchr(WHITESPACES, *src); - int is_strictly_special = special_chars && strchr(special_chars, *src); - int is_special = - is_strictly_special || strchr("'\\", *src) || - (is_ws && (flags & AV_ESCAPE_FLAG_WHITESPACE)); - - if (is_strictly_special || - (!(flags & AV_ESCAPE_FLAG_STRICT) && - (is_special || (is_ws && is_first_last)))) - av_bprint_chars(dstbuf, '\\', 1); - av_bprint_chars(dstbuf, *src, 1); - } - break; - } -} - -#ifdef TEST - -#undef printf - -static void bprint_pascal(AVBPrint *b, unsigned size) -{ - unsigned i, j; - unsigned p[42]; - - av_assert0(size < FF_ARRAY_ELEMS(p)); - - p[0] = 1; - av_bprintf(b, "%8d\n", 1); - for (i = 1; i <= size; i++) { - p[i] = 1; - for (j = i - 1; j > 0; j--) - p[j] = p[j] + p[j - 1]; - for (j = 0; j <= i; j++) - av_bprintf(b, "%8d", p[j]); - av_bprintf(b, "\n"); - } -} - -int main(void) -{ - AVBPrint b; - char buf[256]; - struct tm testtime = { .tm_year = 100, .tm_mon = 11, .tm_mday = 20 }; - - av_bprint_init(&b, 0, -1); - bprint_pascal(&b, 5); - printf("Short text in unlimited buffer: %u/%u\n", (unsigned)strlen(b.str), b.len); - printf("%s\n", b.str); - av_bprint_finalize(&b, NULL); - - av_bprint_init(&b, 0, -1); - bprint_pascal(&b, 25); - printf("Long text in unlimited buffer: %u/%u\n", (unsigned)strlen(b.str), b.len); - av_bprint_finalize(&b, NULL); - - av_bprint_init(&b, 0, 2048); - bprint_pascal(&b, 25); - printf("Long text in limited buffer: %u/%u\n", (unsigned)strlen(b.str), b.len); - av_bprint_finalize(&b, NULL); - - av_bprint_init(&b, 0, 1); - bprint_pascal(&b, 5); - printf("Short text in automatic buffer: %u/%u\n", (unsigned)strlen(b.str), b.len); - - av_bprint_init(&b, 0, 1); - bprint_pascal(&b, 25); - printf("Long text in automatic buffer: %u/%u\n", (unsigned)strlen(b.str)/8*8, b.len); - /* Note that the size of the automatic buffer is arch-dependent. */ - - av_bprint_init(&b, 0, 0); - bprint_pascal(&b, 25); - printf("Long text count only buffer: %u/%u\n", (unsigned)strlen(b.str), b.len); - - av_bprint_init_for_buffer(&b, buf, sizeof(buf)); - bprint_pascal(&b, 25); - printf("Long text count only buffer: %u/%u\n", (unsigned)strlen(buf), b.len); - - av_bprint_init(&b, 0, -1); - av_bprint_strftime(&b, "%Y-%m-%d", &testtime); - printf("strftime full: %u/%u \"%s\"\n", (unsigned)strlen(buf), b.len, b.str); - av_bprint_finalize(&b, NULL); - - av_bprint_init(&b, 0, 8); - av_bprint_strftime(&b, "%Y-%m-%d", &testtime); - printf("strftime truncated: %u/%u \"%s\"\n", (unsigned)strlen(buf), b.len, b.str); - - return 0; -} - -#endif diff --git a/ext/at3_standalone/bprint.h b/ext/at3_standalone/bprint.h deleted file mode 100644 index c09b1ac1e1..0000000000 --- a/ext/at3_standalone/bprint.h +++ /dev/null @@ -1,219 +0,0 @@ -/* - * Copyright (c) 2012 Nicolas George - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef AVUTIL_BPRINT_H -#define AVUTIL_BPRINT_H - -#include - -#include "attributes.h" -#include "avstring.h" - -/** - * Define a structure with extra padding to a fixed size - * This helps ensuring binary compatibility with future versions. - */ - -#define FF_PAD_STRUCTURE(name, size, ...) \ -struct ff_pad_helper_##name { __VA_ARGS__ }; \ -typedef struct name { \ - __VA_ARGS__ \ - char reserved_padding[size - sizeof(struct ff_pad_helper_##name)]; \ -} name; - -/** - * Buffer to print data progressively - * - * The string buffer grows as necessary and is always 0-terminated. - * The content of the string is never accessed, and thus is - * encoding-agnostic and can even hold binary data. - * - * Small buffers are kept in the structure itself, and thus require no - * memory allocation at all (unless the contents of the buffer is needed - * after the structure goes out of scope). This is almost as lightweight as - * declaring a local "char buf[512]". - * - * The length of the string can go beyond the allocated size: the buffer is - * then truncated, but the functions still keep account of the actual total - * length. - * - * In other words, buf->len can be greater than buf->size and records the - * total length of what would have been to the buffer if there had been - * enough memory. - * - * Append operations do not need to be tested for failure: if a memory - * allocation fails, data stop being appended to the buffer, but the length - * is still updated. This situation can be tested with - * av_bprint_is_complete(). - * - * The size_max field determines several possible behaviours: - * - * size_max = -1 (= UINT_MAX) or any large value will let the buffer be - * reallocated as necessary, with an amortized linear cost. - * - * size_max = 0 prevents writing anything to the buffer: only the total - * length is computed. The write operations can then possibly be repeated in - * a buffer with exactly the necessary size - * (using size_init = size_max = len + 1). - * - * size_max = 1 is automatically replaced by the exact size available in the - * structure itself, thus ensuring no dynamic memory allocation. The - * internal buffer is large enough to hold a reasonable paragraph of text, - * such as the current paragraph. - */ - -FF_PAD_STRUCTURE(AVBPrint, 1024, - char *str; /**< string so far */ - unsigned len; /**< length so far */ - unsigned size; /**< allocated memory */ - unsigned size_max; /**< maximum allocated memory */ - char reserved_internal_buffer[1]; -) - -/** - * Convenience macros for special values for av_bprint_init() size_max - * parameter. - */ -#define AV_BPRINT_SIZE_UNLIMITED ((unsigned)-1) -#define AV_BPRINT_SIZE_AUTOMATIC 1 -#define AV_BPRINT_SIZE_COUNT_ONLY 0 - -/** - * Init a print buffer. - * - * @param buf buffer to init - * @param size_init initial size (including the final 0) - * @param size_max maximum size; - * 0 means do not write anything, just count the length; - * 1 is replaced by the maximum value for automatic storage; - * any large value means that the internal buffer will be - * reallocated as needed up to that limit; -1 is converted to - * UINT_MAX, the largest limit possible. - * Check also AV_BPRINT_SIZE_* macros. - */ -void av_bprint_init(AVBPrint *buf, unsigned size_init, unsigned size_max); - -/** - * Init a print buffer using a pre-existing buffer. - * - * The buffer will not be reallocated. - * - * @param buf buffer structure to init - * @param buffer byte buffer to use for the string data - * @param size size of buffer - */ -void av_bprint_init_for_buffer(AVBPrint *buf, char *buffer, unsigned size); - -/** - * Append a formatted string to a print buffer. - */ -void av_bprintf(AVBPrint *buf, const char *fmt, ...) av_printf_format(2, 3); - -/** - * Append a formatted string to a print buffer. - */ -void av_vbprintf(AVBPrint *buf, const char *fmt, va_list vl_arg); - -/** - * Append char c n times to a print buffer. - */ -void av_bprint_chars(AVBPrint *buf, char c, unsigned n); - -/** - * Append data to a print buffer. - * - * param buf bprint buffer to use - * param data pointer to data - * param size size of data - */ -void av_bprint_append_data(AVBPrint *buf, const char *data, unsigned size); - -struct tm; -/** - * Append a formatted date and time to a print buffer. - * - * param buf bprint buffer to use - * param fmt date and time format string, see strftime() - * param tm broken-down time structure to translate - * - * @note due to poor design of the standard strftime function, it may - * produce poor results if the format string expands to a very long text and - * the bprint buffer is near the limit stated by the size_max option. - */ -void av_bprint_strftime(AVBPrint *buf, const char *fmt, const struct tm *tm); - -/** - * Allocate bytes in the buffer for external use. - * - * @param[in] buf buffer structure - * @param[in] size required size - * @param[out] mem pointer to the memory area - * @param[out] actual_size size of the memory area after allocation; - * can be larger or smaller than size - */ -void av_bprint_get_buffer(AVBPrint *buf, unsigned size, - unsigned char **mem, unsigned *actual_size); - -/** - * Reset the string to "" but keep internal allocated data. - */ -void av_bprint_clear(AVBPrint *buf); - -/** - * Test if the print buffer is complete (not truncated). - * - * It may have been truncated due to a memory allocation failure - * or the size_max limit (compare size and size_max if necessary). - */ -static inline int av_bprint_is_complete(const AVBPrint *buf) -{ - return buf->len < buf->size; -} - -/** - * Finalize a print buffer. - * - * The print buffer can no longer be used afterwards, - * but the len and size fields are still valid. - * - * @arg[out] ret_str if not NULL, used to return a permanent copy of the - * buffer contents, or NULL if memory allocation fails; - * if NULL, the buffer is discarded and freed - * @return 0 for success or error code (probably AVERROR(ENOMEM)) - */ -int av_bprint_finalize(AVBPrint *buf, char **ret_str); - -/** - * Escape the content in src and append it to dstbuf. - * - * @param dstbuf already inited destination bprint buffer - * @param src string containing the text to escape - * @param special_chars string containing the special characters which - * need to be escaped, can be NULL - * @param mode escape mode to employ, see AV_ESCAPE_MODE_* macros. - * Any unknown value for mode will be considered equivalent to - * AV_ESCAPE_MODE_BACKSLASH, but this behaviour can change without - * notice. - * @param flags flags which control how to escape, see AV_ESCAPE_FLAG_* macros - */ -void av_bprint_escape(AVBPrint *dstbuf, const char *src, const char *special_chars, - enum AVEscapeMode mode, int flags); - -#endif /* AVUTIL_BPRINT_H */ diff --git a/ext/at3_standalone/codec_desc.c b/ext/at3_standalone/codec_desc.c deleted file mode 100644 index 6336770016..0000000000 --- a/ext/at3_standalone/codec_desc.c +++ /dev/null @@ -1,2933 +0,0 @@ -/* - * This file is part of FFmpeg. - * - * This table was generated from the long and short names of AVCodecs - * please see the respective codec sources for authorship - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include - -#include "common.h" -#include "internal.h" -#include "avcodec.h" -// #include "profiles.h" -#include "version.h" - -#define MT(...) (const char *const[]){ __VA_ARGS__, NULL } - -static const AVCodecDescriptor codec_descriptors[] = { - /* video codecs */ - { - .id = AV_CODEC_ID_MPEG1VIDEO, - .type = AVMEDIA_TYPE_VIDEO, - .name = "mpeg1video", - .long_name = NULL_IF_CONFIG_SMALL("MPEG-1 video"), - .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_REORDER, - }, - { - .id = AV_CODEC_ID_MPEG2VIDEO, - .type = AVMEDIA_TYPE_VIDEO, - .name = "mpeg2video", - .long_name = NULL_IF_CONFIG_SMALL("MPEG-2 video"), - .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_REORDER, - .profiles = NULL_IF_CONFIG_SMALL(ff_mpeg2_video_profiles), - }, -#if FF_API_XVMC - { - .id = AV_CODEC_ID_MPEG2VIDEO_XVMC, - .type = AVMEDIA_TYPE_VIDEO, - .name = "mpegvideo_xvmc", - .long_name = NULL_IF_CONFIG_SMALL("MPEG-1/2 video XvMC (X-Video Motion Compensation)"), - .props = AV_CODEC_PROP_LOSSY, - }, -#endif /* FF_API_XVMC */ - { - .id = AV_CODEC_ID_H261, - .type = AVMEDIA_TYPE_VIDEO, - .name = "h261", - .long_name = NULL_IF_CONFIG_SMALL("H.261"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_H263, - .type = AVMEDIA_TYPE_VIDEO, - .name = "h263", - .long_name = NULL_IF_CONFIG_SMALL("H.263 / H.263-1996, H.263+ / H.263-1998 / H.263 version 2"), - .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_REORDER, - }, - { - .id = AV_CODEC_ID_RV10, - .type = AVMEDIA_TYPE_VIDEO, - .name = "rv10", - .long_name = NULL_IF_CONFIG_SMALL("RealVideo 1.0"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_RV20, - .type = AVMEDIA_TYPE_VIDEO, - .name = "rv20", - .long_name = NULL_IF_CONFIG_SMALL("RealVideo 2.0"), - .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_REORDER, - }, - { - .id = AV_CODEC_ID_MJPEG, - .type = AVMEDIA_TYPE_VIDEO, - .name = "mjpeg", - .long_name = NULL_IF_CONFIG_SMALL("Motion JPEG"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, - .mime_types= MT("image/jpeg"), - }, - { - .id = AV_CODEC_ID_MJPEGB, - .type = AVMEDIA_TYPE_VIDEO, - .name = "mjpegb", - .long_name = NULL_IF_CONFIG_SMALL("Apple MJPEG-B"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_MPEG4, - .type = AVMEDIA_TYPE_VIDEO, - .name = "mpeg4", - .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2"), - .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_REORDER, - .profiles = NULL_IF_CONFIG_SMALL(ff_mpeg4_video_profiles), - }, - { - .id = AV_CODEC_ID_RAWVIDEO, - .type = AVMEDIA_TYPE_VIDEO, - .name = "rawvideo", - .long_name = NULL_IF_CONFIG_SMALL("raw video"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_MSMPEG4V1, - .type = AVMEDIA_TYPE_VIDEO, - .name = "msmpeg4v1", - .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 1"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_MSMPEG4V2, - .type = AVMEDIA_TYPE_VIDEO, - .name = "msmpeg4v2", - .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 2"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_MSMPEG4V3, - .type = AVMEDIA_TYPE_VIDEO, - .name = "msmpeg4v3", - .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 3"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_WMV1, - .type = AVMEDIA_TYPE_VIDEO, - .name = "wmv1", - .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 7"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_WMV2, - .type = AVMEDIA_TYPE_VIDEO, - .name = "wmv2", - .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 8"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_H263P, - .type = AVMEDIA_TYPE_VIDEO, - .name = "h263p", - .long_name = NULL_IF_CONFIG_SMALL("H.263+ / H.263-1998 / H.263 version 2"), - .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_REORDER, - }, - { - .id = AV_CODEC_ID_H263I, - .type = AVMEDIA_TYPE_VIDEO, - .name = "h263i", - .long_name = NULL_IF_CONFIG_SMALL("Intel H.263"), - .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_REORDER, - }, - { - .id = AV_CODEC_ID_FLV1, - .type = AVMEDIA_TYPE_VIDEO, - .name = "flv1", - .long_name = NULL_IF_CONFIG_SMALL("FLV / Sorenson Spark / Sorenson H.263 (Flash Video)"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_SVQ1, - .type = AVMEDIA_TYPE_VIDEO, - .name = "svq1", - .long_name = NULL_IF_CONFIG_SMALL("Sorenson Vector Quantizer 1 / Sorenson Video 1 / SVQ1"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_SVQ3, - .type = AVMEDIA_TYPE_VIDEO, - .name = "svq3", - .long_name = NULL_IF_CONFIG_SMALL("Sorenson Vector Quantizer 3 / Sorenson Video 3 / SVQ3"), - .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_REORDER, - }, - { - .id = AV_CODEC_ID_DVVIDEO, - .type = AVMEDIA_TYPE_VIDEO, - .name = "dvvideo", - .long_name = NULL_IF_CONFIG_SMALL("DV (Digital Video)"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_HUFFYUV, - .type = AVMEDIA_TYPE_VIDEO, - .name = "huffyuv", - .long_name = NULL_IF_CONFIG_SMALL("HuffYUV"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_CYUV, - .type = AVMEDIA_TYPE_VIDEO, - .name = "cyuv", - .long_name = NULL_IF_CONFIG_SMALL("Creative YUV (CYUV)"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_H264, - .type = AVMEDIA_TYPE_VIDEO, - .name = "h264", - .long_name = NULL_IF_CONFIG_SMALL("H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"), - .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_LOSSLESS | AV_CODEC_PROP_REORDER, - .profiles = NULL_IF_CONFIG_SMALL(ff_h264_profiles), - }, - { - .id = AV_CODEC_ID_INDEO3, - .type = AVMEDIA_TYPE_VIDEO, - .name = "indeo3", - .long_name = NULL_IF_CONFIG_SMALL("Intel Indeo 3"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_VP3, - .type = AVMEDIA_TYPE_VIDEO, - .name = "vp3", - .long_name = NULL_IF_CONFIG_SMALL("On2 VP3"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_THEORA, - .type = AVMEDIA_TYPE_VIDEO, - .name = "theora", - .long_name = NULL_IF_CONFIG_SMALL("Theora"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_ASV1, - .type = AVMEDIA_TYPE_VIDEO, - .name = "asv1", - .long_name = NULL_IF_CONFIG_SMALL("ASUS V1"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_ASV2, - .type = AVMEDIA_TYPE_VIDEO, - .name = "asv2", - .long_name = NULL_IF_CONFIG_SMALL("ASUS V2"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_FFV1, - .type = AVMEDIA_TYPE_VIDEO, - .name = "ffv1", - .long_name = NULL_IF_CONFIG_SMALL("FFmpeg video codec #1"), - .props = AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_4XM, - .type = AVMEDIA_TYPE_VIDEO, - .name = "4xm", - .long_name = NULL_IF_CONFIG_SMALL("4X Movie"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_VCR1, - .type = AVMEDIA_TYPE_VIDEO, - .name = "vcr1", - .long_name = NULL_IF_CONFIG_SMALL("ATI VCR1"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_CLJR, - .type = AVMEDIA_TYPE_VIDEO, - .name = "cljr", - .long_name = NULL_IF_CONFIG_SMALL("Cirrus Logic AccuPak"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_MDEC, - .type = AVMEDIA_TYPE_VIDEO, - .name = "mdec", - .long_name = NULL_IF_CONFIG_SMALL("Sony PlayStation MDEC (Motion DECoder)"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_ROQ, - .type = AVMEDIA_TYPE_VIDEO, - .name = "roq", - .long_name = NULL_IF_CONFIG_SMALL("id RoQ video"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_INTERPLAY_VIDEO, - .type = AVMEDIA_TYPE_VIDEO, - .name = "interplayvideo", - .long_name = NULL_IF_CONFIG_SMALL("Interplay MVE video"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_XAN_WC3, - .type = AVMEDIA_TYPE_VIDEO, - .name = "xan_wc3", - .long_name = NULL_IF_CONFIG_SMALL("Wing Commander III / Xan"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_XAN_WC4, - .type = AVMEDIA_TYPE_VIDEO, - .name = "xan_wc4", - .long_name = NULL_IF_CONFIG_SMALL("Wing Commander IV / Xxan"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_RPZA, - .type = AVMEDIA_TYPE_VIDEO, - .name = "rpza", - .long_name = NULL_IF_CONFIG_SMALL("QuickTime video (RPZA)"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_CINEPAK, - .type = AVMEDIA_TYPE_VIDEO, - .name = "cinepak", - .long_name = NULL_IF_CONFIG_SMALL("Cinepak"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_WS_VQA, - .type = AVMEDIA_TYPE_VIDEO, - .name = "ws_vqa", - .long_name = NULL_IF_CONFIG_SMALL("Westwood Studios VQA (Vector Quantized Animation) video"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_MSRLE, - .type = AVMEDIA_TYPE_VIDEO, - .name = "msrle", - .long_name = NULL_IF_CONFIG_SMALL("Microsoft RLE"), - .props = AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_MSVIDEO1, - .type = AVMEDIA_TYPE_VIDEO, - .name = "msvideo1", - .long_name = NULL_IF_CONFIG_SMALL("Microsoft Video 1"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_IDCIN, - .type = AVMEDIA_TYPE_VIDEO, - .name = "idcin", - .long_name = NULL_IF_CONFIG_SMALL("id Quake II CIN video"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_8BPS, - .type = AVMEDIA_TYPE_VIDEO, - .name = "8bps", - .long_name = NULL_IF_CONFIG_SMALL("QuickTime 8BPS video"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_SMC, - .type = AVMEDIA_TYPE_VIDEO, - .name = "smc", - .long_name = NULL_IF_CONFIG_SMALL("QuickTime Graphics (SMC)"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_FLIC, - .type = AVMEDIA_TYPE_VIDEO, - .name = "flic", - .long_name = NULL_IF_CONFIG_SMALL("Autodesk Animator Flic video"), - .props = AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_TRUEMOTION1, - .type = AVMEDIA_TYPE_VIDEO, - .name = "truemotion1", - .long_name = NULL_IF_CONFIG_SMALL("Duck TrueMotion 1.0"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_VMDVIDEO, - .type = AVMEDIA_TYPE_VIDEO, - .name = "vmdvideo", - .long_name = NULL_IF_CONFIG_SMALL("Sierra VMD video"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_MSZH, - .type = AVMEDIA_TYPE_VIDEO, - .name = "mszh", - .long_name = NULL_IF_CONFIG_SMALL("LCL (LossLess Codec Library) MSZH"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_ZLIB, - .type = AVMEDIA_TYPE_VIDEO, - .name = "zlib", - .long_name = NULL_IF_CONFIG_SMALL("LCL (LossLess Codec Library) ZLIB"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_QTRLE, - .type = AVMEDIA_TYPE_VIDEO, - .name = "qtrle", - .long_name = NULL_IF_CONFIG_SMALL("QuickTime Animation (RLE) video"), - .props = AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_SNOW, - .type = AVMEDIA_TYPE_VIDEO, - .name = "snow", - .long_name = NULL_IF_CONFIG_SMALL("Snow"), - .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_TSCC, - .type = AVMEDIA_TYPE_VIDEO, - .name = "tscc", - .long_name = NULL_IF_CONFIG_SMALL("TechSmith Screen Capture Codec"), - .props = AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_ULTI, - .type = AVMEDIA_TYPE_VIDEO, - .name = "ulti", - .long_name = NULL_IF_CONFIG_SMALL("IBM UltiMotion"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_QDRAW, - .type = AVMEDIA_TYPE_VIDEO, - .name = "qdraw", - .long_name = NULL_IF_CONFIG_SMALL("Apple QuickDraw"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_VIXL, - .type = AVMEDIA_TYPE_VIDEO, - .name = "vixl", - .long_name = NULL_IF_CONFIG_SMALL("Miro VideoXL"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_QPEG, - .type = AVMEDIA_TYPE_VIDEO, - .name = "qpeg", - .long_name = NULL_IF_CONFIG_SMALL("Q-team QPEG"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_FFVHUFF, - .type = AVMEDIA_TYPE_VIDEO, - .name = "ffvhuff", - .long_name = NULL_IF_CONFIG_SMALL("Huffyuv FFmpeg variant"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_RV30, - .type = AVMEDIA_TYPE_VIDEO, - .name = "rv30", - .long_name = NULL_IF_CONFIG_SMALL("RealVideo 3.0"), - .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_REORDER, - }, - { - .id = AV_CODEC_ID_RV40, - .type = AVMEDIA_TYPE_VIDEO, - .name = "rv40", - .long_name = NULL_IF_CONFIG_SMALL("RealVideo 4.0"), - .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_REORDER, - }, - { - .id = AV_CODEC_ID_VC1, - .type = AVMEDIA_TYPE_VIDEO, - .name = "vc1", - .long_name = NULL_IF_CONFIG_SMALL("SMPTE VC-1"), - .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_REORDER, - .profiles = NULL_IF_CONFIG_SMALL(ff_vc1_profiles), - }, - { - .id = AV_CODEC_ID_WMV3, - .type = AVMEDIA_TYPE_VIDEO, - .name = "wmv3", - .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 9"), - .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_REORDER, - .profiles = NULL_IF_CONFIG_SMALL(ff_vc1_profiles), - }, - { - .id = AV_CODEC_ID_LOCO, - .type = AVMEDIA_TYPE_VIDEO, - .name = "loco", - .long_name = NULL_IF_CONFIG_SMALL("LOCO"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_WNV1, - .type = AVMEDIA_TYPE_VIDEO, - .name = "wnv1", - .long_name = NULL_IF_CONFIG_SMALL("Winnov WNV1"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_AASC, - .type = AVMEDIA_TYPE_VIDEO, - .name = "aasc", - .long_name = NULL_IF_CONFIG_SMALL("Autodesk RLE"), - .props = AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_INDEO2, - .type = AVMEDIA_TYPE_VIDEO, - .name = "indeo2", - .long_name = NULL_IF_CONFIG_SMALL("Intel Indeo 2"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_FRAPS, - .type = AVMEDIA_TYPE_VIDEO, - .name = "fraps", - .long_name = NULL_IF_CONFIG_SMALL("Fraps"), - .props = AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_TRUEMOTION2, - .type = AVMEDIA_TYPE_VIDEO, - .name = "truemotion2", - .long_name = NULL_IF_CONFIG_SMALL("Duck TrueMotion 2.0"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_BMP, - .type = AVMEDIA_TYPE_VIDEO, - .name = "bmp", - .long_name = NULL_IF_CONFIG_SMALL("BMP (Windows and OS/2 bitmap)"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, - .mime_types= MT("image/x-ms-bmp"), - }, - { - .id = AV_CODEC_ID_CSCD, - .type = AVMEDIA_TYPE_VIDEO, - .name = "cscd", - .long_name = NULL_IF_CONFIG_SMALL("CamStudio"), - .props = AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_MMVIDEO, - .type = AVMEDIA_TYPE_VIDEO, - .name = "mmvideo", - .long_name = NULL_IF_CONFIG_SMALL("American Laser Games MM Video"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_ZMBV, - .type = AVMEDIA_TYPE_VIDEO, - .name = "zmbv", - .long_name = NULL_IF_CONFIG_SMALL("Zip Motion Blocks Video"), - .props = AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_AVS, - .type = AVMEDIA_TYPE_VIDEO, - .name = "avs", - .long_name = NULL_IF_CONFIG_SMALL("AVS (Audio Video Standard) video"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_SMACKVIDEO, - .type = AVMEDIA_TYPE_VIDEO, - .name = "smackvideo", - .long_name = NULL_IF_CONFIG_SMALL("Smacker video"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_NUV, - .type = AVMEDIA_TYPE_VIDEO, - .name = "nuv", - .long_name = NULL_IF_CONFIG_SMALL("NuppelVideo/RTJPEG"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_KMVC, - .type = AVMEDIA_TYPE_VIDEO, - .name = "kmvc", - .long_name = NULL_IF_CONFIG_SMALL("Karl Morton's video codec"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_FLASHSV, - .type = AVMEDIA_TYPE_VIDEO, - .name = "flashsv", - .long_name = NULL_IF_CONFIG_SMALL("Flash Screen Video v1"), - .props = AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_CAVS, - .type = AVMEDIA_TYPE_VIDEO, - .name = "cavs", - .long_name = NULL_IF_CONFIG_SMALL("Chinese AVS (Audio Video Standard) (AVS1-P2, JiZhun profile)"), - .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_REORDER, - }, - { - .id = AV_CODEC_ID_JPEG2000, - .type = AVMEDIA_TYPE_VIDEO, - .name = "jpeg2000", - .long_name = NULL_IF_CONFIG_SMALL("JPEG 2000"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY | - AV_CODEC_PROP_LOSSLESS, - .mime_types= MT("image/jp2"), - .profiles = NULL_IF_CONFIG_SMALL(ff_jpeg2000_profiles), - }, - { - .id = AV_CODEC_ID_VMNC, - .type = AVMEDIA_TYPE_VIDEO, - .name = "vmnc", - .long_name = NULL_IF_CONFIG_SMALL("VMware Screen Codec / VMware Video"), - .props = AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_VP5, - .type = AVMEDIA_TYPE_VIDEO, - .name = "vp5", - .long_name = NULL_IF_CONFIG_SMALL("On2 VP5"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_VP6, - .type = AVMEDIA_TYPE_VIDEO, - .name = "vp6", - .long_name = NULL_IF_CONFIG_SMALL("On2 VP6"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_VP6F, - .type = AVMEDIA_TYPE_VIDEO, - .name = "vp6f", - .long_name = NULL_IF_CONFIG_SMALL("On2 VP6 (Flash version)"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_DSICINVIDEO, - .type = AVMEDIA_TYPE_VIDEO, - .name = "dsicinvideo", - .long_name = NULL_IF_CONFIG_SMALL("Delphine Software International CIN video"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_TIERTEXSEQVIDEO, - .type = AVMEDIA_TYPE_VIDEO, - .name = "tiertexseqvideo", - .long_name = NULL_IF_CONFIG_SMALL("Tiertex Limited SEQ video"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_DXA, - .type = AVMEDIA_TYPE_VIDEO, - .name = "dxa", - .long_name = NULL_IF_CONFIG_SMALL("Feeble Files/ScummVM DXA"), - .props = AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_DNXHD, - .type = AVMEDIA_TYPE_VIDEO, - .name = "dnxhd", - .long_name = NULL_IF_CONFIG_SMALL("VC3/DNxHD"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_THP, - .type = AVMEDIA_TYPE_VIDEO, - .name = "thp", - .long_name = NULL_IF_CONFIG_SMALL("Nintendo Gamecube THP video"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_C93, - .type = AVMEDIA_TYPE_VIDEO, - .name = "c93", - .long_name = NULL_IF_CONFIG_SMALL("Interplay C93"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_BETHSOFTVID, - .type = AVMEDIA_TYPE_VIDEO, - .name = "bethsoftvid", - .long_name = NULL_IF_CONFIG_SMALL("Bethesda VID video"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_VP6A, - .type = AVMEDIA_TYPE_VIDEO, - .name = "vp6a", - .long_name = NULL_IF_CONFIG_SMALL("On2 VP6 (Flash version, with alpha channel)"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_AMV, - .type = AVMEDIA_TYPE_VIDEO, - .name = "amv", - .long_name = NULL_IF_CONFIG_SMALL("AMV Video"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_VB, - .type = AVMEDIA_TYPE_VIDEO, - .name = "vb", - .long_name = NULL_IF_CONFIG_SMALL("Beam Software VB"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_INDEO4, - .type = AVMEDIA_TYPE_VIDEO, - .name = "indeo4", - .long_name = NULL_IF_CONFIG_SMALL("Intel Indeo Video Interactive 4"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_INDEO5, - .type = AVMEDIA_TYPE_VIDEO, - .name = "indeo5", - .long_name = NULL_IF_CONFIG_SMALL("Intel Indeo Video Interactive 5"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_MIMIC, - .type = AVMEDIA_TYPE_VIDEO, - .name = "mimic", - .long_name = NULL_IF_CONFIG_SMALL("Mimic"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_RL2, - .type = AVMEDIA_TYPE_VIDEO, - .name = "rl2", - .long_name = NULL_IF_CONFIG_SMALL("RL2 video"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_ESCAPE124, - .type = AVMEDIA_TYPE_VIDEO, - .name = "escape124", - .long_name = NULL_IF_CONFIG_SMALL("Escape 124"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_DAALA, - .type = AVMEDIA_TYPE_VIDEO, - .name = "daala", - .long_name = NULL_IF_CONFIG_SMALL("Daala"), - .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_DIRAC, - .type = AVMEDIA_TYPE_VIDEO, - .name = "dirac", - .long_name = NULL_IF_CONFIG_SMALL("Dirac"), - .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_LOSSLESS | AV_CODEC_PROP_REORDER, - }, - { - .id = AV_CODEC_ID_BFI, - .type = AVMEDIA_TYPE_VIDEO, - .name = "bfi", - .long_name = NULL_IF_CONFIG_SMALL("Brute Force & Ignorance"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_CMV, - .type = AVMEDIA_TYPE_VIDEO, - .name = "cmv", - .long_name = NULL_IF_CONFIG_SMALL("Electronic Arts CMV video"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_MOTIONPIXELS, - .type = AVMEDIA_TYPE_VIDEO, - .name = "motionpixels", - .long_name = NULL_IF_CONFIG_SMALL("Motion Pixels video"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_TGV, - .type = AVMEDIA_TYPE_VIDEO, - .name = "tgv", - .long_name = NULL_IF_CONFIG_SMALL("Electronic Arts TGV video"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_TGQ, - .type = AVMEDIA_TYPE_VIDEO, - .name = "tgq", - .long_name = NULL_IF_CONFIG_SMALL("Electronic Arts TGQ video"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_TQI, - .type = AVMEDIA_TYPE_VIDEO, - .name = "tqi", - .long_name = NULL_IF_CONFIG_SMALL("Electronic Arts TQI video"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_AURA, - .type = AVMEDIA_TYPE_VIDEO, - .name = "aura", - .long_name = NULL_IF_CONFIG_SMALL("Auravision AURA"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_AURA2, - .type = AVMEDIA_TYPE_VIDEO, - .name = "aura2", - .long_name = NULL_IF_CONFIG_SMALL("Auravision Aura 2"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_V210X, - .type = AVMEDIA_TYPE_VIDEO, - .name = "v210x", - .long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:2:2 10-bit"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_TMV, - .type = AVMEDIA_TYPE_VIDEO, - .name = "tmv", - .long_name = NULL_IF_CONFIG_SMALL("8088flex TMV"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_V210, - .type = AVMEDIA_TYPE_VIDEO, - .name = "v210", - .long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:2:2 10-bit"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_MAD, - .type = AVMEDIA_TYPE_VIDEO, - .name = "mad", - .long_name = NULL_IF_CONFIG_SMALL("Electronic Arts Madcow Video"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_FRWU, - .type = AVMEDIA_TYPE_VIDEO, - .name = "frwu", - .long_name = NULL_IF_CONFIG_SMALL("Forward Uncompressed"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_FLASHSV2, - .type = AVMEDIA_TYPE_VIDEO, - .name = "flashsv2", - .long_name = NULL_IF_CONFIG_SMALL("Flash Screen Video v2"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_CDGRAPHICS, - .type = AVMEDIA_TYPE_VIDEO, - .name = "cdgraphics", - .long_name = NULL_IF_CONFIG_SMALL("CD Graphics video"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_R210, - .type = AVMEDIA_TYPE_VIDEO, - .name = "r210", - .long_name = NULL_IF_CONFIG_SMALL("Uncompressed RGB 10-bit"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_ANM, - .type = AVMEDIA_TYPE_VIDEO, - .name = "anm", - .long_name = NULL_IF_CONFIG_SMALL("Deluxe Paint Animation"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_BINKVIDEO, - .type = AVMEDIA_TYPE_VIDEO, - .name = "binkvideo", - .long_name = NULL_IF_CONFIG_SMALL("Bink video"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_IFF_ILBM, - .type = AVMEDIA_TYPE_VIDEO, - .name = "iff_ilbm", - .long_name = NULL_IF_CONFIG_SMALL("IFF ILBM"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_KGV1, - .type = AVMEDIA_TYPE_VIDEO, - .name = "kgv1", - .long_name = NULL_IF_CONFIG_SMALL("Kega Game Video"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_YOP, - .type = AVMEDIA_TYPE_VIDEO, - .name = "yop", - .long_name = NULL_IF_CONFIG_SMALL("Psygnosis YOP Video"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_VP8, - .type = AVMEDIA_TYPE_VIDEO, - .name = "vp8", - .long_name = NULL_IF_CONFIG_SMALL("On2 VP8"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_VP9, - .type = AVMEDIA_TYPE_VIDEO, - .name = "vp9", - .long_name = NULL_IF_CONFIG_SMALL("Google VP9"), - .props = AV_CODEC_PROP_LOSSY, - .profiles = NULL_IF_CONFIG_SMALL(ff_vp9_profiles), - }, - { - .id = AV_CODEC_ID_PICTOR, - .type = AVMEDIA_TYPE_VIDEO, - .name = "pictor", - .long_name = NULL_IF_CONFIG_SMALL("Pictor/PC Paint"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_A64_MULTI, - .type = AVMEDIA_TYPE_VIDEO, - .name = "a64_multi", - .long_name = NULL_IF_CONFIG_SMALL("Multicolor charset for Commodore 64"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_A64_MULTI5, - .type = AVMEDIA_TYPE_VIDEO, - .name = "a64_multi5", - .long_name = NULL_IF_CONFIG_SMALL("Multicolor charset for Commodore 64, extended with 5th color (colram)"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_R10K, - .type = AVMEDIA_TYPE_VIDEO, - .name = "r10k", - .long_name = NULL_IF_CONFIG_SMALL("AJA Kona 10-bit RGB Codec"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_MVC1, - .type = AVMEDIA_TYPE_VIDEO, - .name = "mvc1", - .long_name = NULL_IF_CONFIG_SMALL("Silicon Graphics Motion Video Compressor 1"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_MVC2, - .type = AVMEDIA_TYPE_VIDEO, - .name = "mvc2", - .long_name = NULL_IF_CONFIG_SMALL("Silicon Graphics Motion Video Compressor 2"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_MXPEG, - .type = AVMEDIA_TYPE_VIDEO, - .name = "mxpeg", - .long_name = NULL_IF_CONFIG_SMALL("Mobotix MxPEG video"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_LAGARITH, - .type = AVMEDIA_TYPE_VIDEO, - .name = "lagarith", - .long_name = NULL_IF_CONFIG_SMALL("Lagarith lossless"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_PRORES, - .type = AVMEDIA_TYPE_VIDEO, - .name = "prores", - .long_name = NULL_IF_CONFIG_SMALL("Apple ProRes (iCodec Pro)"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_JV, - .type = AVMEDIA_TYPE_VIDEO, - .name = "jv", - .long_name = NULL_IF_CONFIG_SMALL("Bitmap Brothers JV video"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_DFA, - .type = AVMEDIA_TYPE_VIDEO, - .name = "dfa", - .long_name = NULL_IF_CONFIG_SMALL("Chronomaster DFA"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_UTVIDEO, - .type = AVMEDIA_TYPE_VIDEO, - .name = "utvideo", - .long_name = NULL_IF_CONFIG_SMALL("Ut Video"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_BMV_VIDEO, - .type = AVMEDIA_TYPE_VIDEO, - .name = "bmv_video", - .long_name = NULL_IF_CONFIG_SMALL("Discworld II BMV video"), - .props = AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_VBLE, - .type = AVMEDIA_TYPE_VIDEO, - .name = "vble", - .long_name = NULL_IF_CONFIG_SMALL("VBLE Lossless Codec"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_DXTORY, - .type = AVMEDIA_TYPE_VIDEO, - .name = "dxtory", - .long_name = NULL_IF_CONFIG_SMALL("Dxtory"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_V410, - .type = AVMEDIA_TYPE_VIDEO, - .name = "v410", - .long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:4:4 10-bit"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_CDXL, - .type = AVMEDIA_TYPE_VIDEO, - .name = "cdxl", - .long_name = NULL_IF_CONFIG_SMALL("Commodore CDXL video"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_ZEROCODEC, - .type = AVMEDIA_TYPE_VIDEO, - .name = "zerocodec", - .long_name = NULL_IF_CONFIG_SMALL("ZeroCodec Lossless Video"), - .props = AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_MSS1, - .type = AVMEDIA_TYPE_VIDEO, - .name = "mss1", - .long_name = NULL_IF_CONFIG_SMALL("MS Screen 1"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_MSA1, - .type = AVMEDIA_TYPE_VIDEO, - .name = "msa1", - .long_name = NULL_IF_CONFIG_SMALL("MS ATC Screen"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_TSCC2, - .type = AVMEDIA_TYPE_VIDEO, - .name = "tscc2", - .long_name = NULL_IF_CONFIG_SMALL("TechSmith Screen Codec 2"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_MTS2, - .type = AVMEDIA_TYPE_VIDEO, - .name = "mts2", - .long_name = NULL_IF_CONFIG_SMALL("MS Expression Encoder Screen"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_CLLC, - .type = AVMEDIA_TYPE_VIDEO, - .name = "cllc", - .long_name = NULL_IF_CONFIG_SMALL("Canopus Lossless Codec"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_MSS2, - .type = AVMEDIA_TYPE_VIDEO, - .name = "mss2", - .long_name = NULL_IF_CONFIG_SMALL("MS Windows Media Video V9 Screen"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_AIC, - .type = AVMEDIA_TYPE_VIDEO, - .name = "aic", - .long_name = NULL_IF_CONFIG_SMALL("Apple Intermediate Codec"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_Y41P, - .type = AVMEDIA_TYPE_VIDEO, - .name = "y41p", - .long_name = NULL_IF_CONFIG_SMALL("Uncompressed YUV 4:1:1 12-bit"), - .props = AV_CODEC_PROP_INTRA_ONLY, - }, - { - .id = AV_CODEC_ID_ESCAPE130, - .type = AVMEDIA_TYPE_VIDEO, - .name = "escape130", - .long_name = NULL_IF_CONFIG_SMALL("Escape 130"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_AVRP, - .type = AVMEDIA_TYPE_VIDEO, - .name = "avrp", - .long_name = NULL_IF_CONFIG_SMALL("Avid 1:1 10-bit RGB Packer"), - .props = AV_CODEC_PROP_INTRA_ONLY, - }, - { - .id = AV_CODEC_ID_012V, - .type = AVMEDIA_TYPE_VIDEO, - .name = "012v", - .long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:2:2 10-bit"), - .props = AV_CODEC_PROP_INTRA_ONLY, - }, - { - .id = AV_CODEC_ID_AVUI, - .type = AVMEDIA_TYPE_VIDEO, - .name = "avui", - .long_name = NULL_IF_CONFIG_SMALL("Avid Meridien Uncompressed"), - .props = AV_CODEC_PROP_INTRA_ONLY, - }, - { - .id = AV_CODEC_ID_AYUV, - .type = AVMEDIA_TYPE_VIDEO, - .name = "ayuv", - .long_name = NULL_IF_CONFIG_SMALL("Uncompressed packed MS 4:4:4:4"), - .props = AV_CODEC_PROP_INTRA_ONLY, - }, - { - .id = AV_CODEC_ID_TARGA_Y216, - .type = AVMEDIA_TYPE_VIDEO, - .name = "targa_y216", - .long_name = NULL_IF_CONFIG_SMALL("Pinnacle TARGA CineWave YUV16"), - .props = AV_CODEC_PROP_INTRA_ONLY, - }, - { - .id = AV_CODEC_ID_V308, - .type = AVMEDIA_TYPE_VIDEO, - .name = "v308", - .long_name = NULL_IF_CONFIG_SMALL("Uncompressed packed 4:4:4"), - .props = AV_CODEC_PROP_INTRA_ONLY, - }, - { - .id = AV_CODEC_ID_V408, - .type = AVMEDIA_TYPE_VIDEO, - .name = "v408", - .long_name = NULL_IF_CONFIG_SMALL("Uncompressed packed QT 4:4:4:4"), - .props = AV_CODEC_PROP_INTRA_ONLY, - }, - { - .id = AV_CODEC_ID_YUV4, - .type = AVMEDIA_TYPE_VIDEO, - .name = "yuv4", - .long_name = NULL_IF_CONFIG_SMALL("Uncompressed packed 4:2:0"), - .props = AV_CODEC_PROP_INTRA_ONLY, - }, - { - .id = AV_CODEC_ID_AVRN, - .type = AVMEDIA_TYPE_VIDEO, - .name = "avrn", - .long_name = NULL_IF_CONFIG_SMALL("Avid AVI Codec"), - }, - { - .id = AV_CODEC_ID_CPIA, - .type = AVMEDIA_TYPE_VIDEO, - .name = "cpia", - .long_name = NULL_IF_CONFIG_SMALL("CPiA video format"), - }, - { - .id = AV_CODEC_ID_XFACE, - .type = AVMEDIA_TYPE_VIDEO, - .name = "xface", - .long_name = NULL_IF_CONFIG_SMALL("X-face image"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_SMVJPEG, - .type = AVMEDIA_TYPE_VIDEO, - .name = "smvjpeg", - .long_name = NULL_IF_CONFIG_SMALL("Sigmatel Motion Video"), - }, - - { - .id = AV_CODEC_ID_G2M, - .type = AVMEDIA_TYPE_VIDEO, - .name = "g2m", - .long_name = NULL_IF_CONFIG_SMALL("Go2Meeting"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_HNM4_VIDEO, - .type = AVMEDIA_TYPE_VIDEO, - .name = "hnm4video", - .long_name = NULL_IF_CONFIG_SMALL("HNM 4 video"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_HEVC, - .type = AVMEDIA_TYPE_VIDEO, - .name = "hevc", - .long_name = NULL_IF_CONFIG_SMALL("H.265 / HEVC (High Efficiency Video Coding)"), - .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_REORDER, - .profiles = NULL_IF_CONFIG_SMALL(ff_hevc_profiles), - }, - { - .id = AV_CODEC_ID_FIC, - .type = AVMEDIA_TYPE_VIDEO, - .name = "fic", - .long_name = NULL_IF_CONFIG_SMALL("Mirillis FIC"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_PAF_VIDEO, - .type = AVMEDIA_TYPE_VIDEO, - .name = "paf_video", - .long_name = NULL_IF_CONFIG_SMALL("Amazing Studio Packed Animation File Video"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_VP7, - .type = AVMEDIA_TYPE_VIDEO, - .name = "vp7", - .long_name = NULL_IF_CONFIG_SMALL("On2 VP7"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_SANM, - .type = AVMEDIA_TYPE_VIDEO, - .name = "sanm", - .long_name = NULL_IF_CONFIG_SMALL("LucasArts SANM/SMUSH video"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_SGIRLE, - .type = AVMEDIA_TYPE_VIDEO, - .name = "sgirle", - .long_name = NULL_IF_CONFIG_SMALL("SGI RLE 8-bit"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_HQX, - .type = AVMEDIA_TYPE_VIDEO, - .name = "hqx", - .long_name = NULL_IF_CONFIG_SMALL("Canopus HQX"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_HQ_HQA, - .type = AVMEDIA_TYPE_VIDEO, - .name = "hq_hqa", - .long_name = NULL_IF_CONFIG_SMALL("Canopus HQ/HQA"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_HAP, - .type = AVMEDIA_TYPE_VIDEO, - .name = "hap", - .long_name = NULL_IF_CONFIG_SMALL("Vidvox Hap decoder"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_DXV, - .type = AVMEDIA_TYPE_VIDEO, - .name = "dxv", - .long_name = NULL_IF_CONFIG_SMALL("Resolume DXV"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_SCREENPRESSO, - .type = AVMEDIA_TYPE_VIDEO, - .name = "screenpresso", - .long_name = NULL_IF_CONFIG_SMALL("Screenpresso"), - .props = AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_WRAPPED_AVFRAME, - .type = AVMEDIA_TYPE_VIDEO, - .name = "wrapped_avframe", - .long_name = NULL_IF_CONFIG_SMALL("AVFrame to AVPacket passthrough"), - .props = AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_RSCC, - .type = AVMEDIA_TYPE_VIDEO, - .name = "rscc", - .long_name = NULL_IF_CONFIG_SMALL("innoHeim/Rsupport Screen Capture Codec"), - .props = AV_CODEC_PROP_LOSSLESS, - }, - - /* image codecs */ - { - .id = AV_CODEC_ID_ALIAS_PIX, - .type = AVMEDIA_TYPE_VIDEO, - .name = "alias_pix", - .long_name = NULL_IF_CONFIG_SMALL("Alias/Wavefront PIX image"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_ANSI, - .type = AVMEDIA_TYPE_VIDEO, - .name = "ansi", - .long_name = NULL_IF_CONFIG_SMALL("ASCII/ANSI art"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_BRENDER_PIX, - .type = AVMEDIA_TYPE_VIDEO, - .name = "brender_pix", - .long_name = NULL_IF_CONFIG_SMALL("BRender PIX image"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_DDS, - .type = AVMEDIA_TYPE_VIDEO, - .name = "dds", - .long_name = NULL_IF_CONFIG_SMALL("DirectDraw Surface image decoder"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY | - AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_DPX, - .type = AVMEDIA_TYPE_VIDEO, - .name = "dpx", - .long_name = NULL_IF_CONFIG_SMALL("DPX (Digital Picture Exchange) image"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_EXR, - .type = AVMEDIA_TYPE_VIDEO, - .name = "exr", - .long_name = NULL_IF_CONFIG_SMALL("OpenEXR image"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY | - AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_GIF, - .type = AVMEDIA_TYPE_VIDEO, - .name = "gif", - .long_name = NULL_IF_CONFIG_SMALL("GIF (Graphics Interchange Format)"), - .props = AV_CODEC_PROP_LOSSLESS, - .mime_types= MT("image/gif"), - }, - { - .id = AV_CODEC_ID_JPEGLS, - .type = AVMEDIA_TYPE_VIDEO, - .name = "jpegls", - .long_name = NULL_IF_CONFIG_SMALL("JPEG-LS"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY | - AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_LJPEG, - .type = AVMEDIA_TYPE_VIDEO, - .name = "ljpeg", - .long_name = NULL_IF_CONFIG_SMALL("Lossless JPEG"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_PAM, - .type = AVMEDIA_TYPE_VIDEO, - .name = "pam", - .long_name = NULL_IF_CONFIG_SMALL("PAM (Portable AnyMap) image"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, - .mime_types= MT("image/x-portable-pixmap"), - }, - { - .id = AV_CODEC_ID_PBM, - .type = AVMEDIA_TYPE_VIDEO, - .name = "pbm", - .long_name = NULL_IF_CONFIG_SMALL("PBM (Portable BitMap) image"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_PCX, - .type = AVMEDIA_TYPE_VIDEO, - .name = "pcx", - .long_name = NULL_IF_CONFIG_SMALL("PC Paintbrush PCX image"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, - .mime_types= MT("image/x-pcx"), - }, - { - .id = AV_CODEC_ID_PGM, - .type = AVMEDIA_TYPE_VIDEO, - .name = "pgm", - .long_name = NULL_IF_CONFIG_SMALL("PGM (Portable GrayMap) image"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_PGMYUV, - .type = AVMEDIA_TYPE_VIDEO, - .name = "pgmyuv", - .long_name = NULL_IF_CONFIG_SMALL("PGMYUV (Portable GrayMap YUV) image"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_PNG, - .type = AVMEDIA_TYPE_VIDEO, - .name = "png", - .long_name = NULL_IF_CONFIG_SMALL("PNG (Portable Network Graphics) image"), - .props = AV_CODEC_PROP_LOSSLESS, - .mime_types= MT("image/png"), - }, - { - .id = AV_CODEC_ID_PPM, - .type = AVMEDIA_TYPE_VIDEO, - .name = "ppm", - .long_name = NULL_IF_CONFIG_SMALL("PPM (Portable PixelMap) image"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_PTX, - .type = AVMEDIA_TYPE_VIDEO, - .name = "ptx", - .long_name = NULL_IF_CONFIG_SMALL("V.Flash PTX image"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_SGI, - .type = AVMEDIA_TYPE_VIDEO, - .name = "sgi", - .long_name = NULL_IF_CONFIG_SMALL("SGI image"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_SP5X, - .type = AVMEDIA_TYPE_VIDEO, - .name = "sp5x", - .long_name = NULL_IF_CONFIG_SMALL("Sunplus JPEG (SP5X)"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_SUNRAST, - .type = AVMEDIA_TYPE_VIDEO, - .name = "sunrast", - .long_name = NULL_IF_CONFIG_SMALL("Sun Rasterfile image"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_TARGA, - .type = AVMEDIA_TYPE_VIDEO, - .name = "targa", - .long_name = NULL_IF_CONFIG_SMALL("Truevision Targa image"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, - .mime_types= MT("image/x-targa", "image/x-tga"), - }, - { - .id = AV_CODEC_ID_TDSC, - .type = AVMEDIA_TYPE_VIDEO, - .name = "tdsc", - .long_name = NULL_IF_CONFIG_SMALL("TDSC"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_TIFF, - .type = AVMEDIA_TYPE_VIDEO, - .name = "tiff", - .long_name = NULL_IF_CONFIG_SMALL("TIFF image"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, - .mime_types= MT("image/tiff"), - }, - { - .id = AV_CODEC_ID_TXD, - .type = AVMEDIA_TYPE_VIDEO, - .name = "txd", - .long_name = NULL_IF_CONFIG_SMALL("Renderware TXD (TeXture Dictionary) image"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_VC1IMAGE, - .type = AVMEDIA_TYPE_VIDEO, - .name = "vc1image", - .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 9 Image v2"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_WEBP, - .type = AVMEDIA_TYPE_VIDEO, - .name = "webp", - .long_name = NULL_IF_CONFIG_SMALL("WebP"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY | - AV_CODEC_PROP_LOSSLESS, - .mime_types= MT("image/webp"), - }, - { - .id = AV_CODEC_ID_WMV3IMAGE, - .type = AVMEDIA_TYPE_VIDEO, - .name = "wmv3image", - .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 9 Image"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_XBM, - .type = AVMEDIA_TYPE_VIDEO, - .name = "xbm", - .long_name = NULL_IF_CONFIG_SMALL("XBM (X BitMap) image"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_XWD, - .type = AVMEDIA_TYPE_VIDEO, - .name = "xwd", - .long_name = NULL_IF_CONFIG_SMALL("XWD (X Window Dump) image"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, - .mime_types= MT("image/x-xwindowdump"), - }, - { - .id = AV_CODEC_ID_APNG, - .type = AVMEDIA_TYPE_VIDEO, - .name = "apng", - .long_name = NULL_IF_CONFIG_SMALL("APNG (Animated Portable Network Graphics) image"), - .props = AV_CODEC_PROP_LOSSLESS, - .mime_types= MT("image/png"), - }, - { - .id = AV_CODEC_ID_CFHD, - .type = AVMEDIA_TYPE_VIDEO, - .name = "cfhd", - .long_name = NULL_IF_CONFIG_SMALL("Cineform HD"), - .props = AV_CODEC_PROP_LOSSY, - }, - - /* various PCM "codecs" */ - { - .id = AV_CODEC_ID_PCM_S16LE, - .type = AVMEDIA_TYPE_AUDIO, - .name = "pcm_s16le", - .long_name = NULL_IF_CONFIG_SMALL("PCM signed 16-bit little-endian"), - .props = AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_PCM_S16BE, - .type = AVMEDIA_TYPE_AUDIO, - .name = "pcm_s16be", - .long_name = NULL_IF_CONFIG_SMALL("PCM signed 16-bit big-endian"), - .props = AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_PCM_U16LE, - .type = AVMEDIA_TYPE_AUDIO, - .name = "pcm_u16le", - .long_name = NULL_IF_CONFIG_SMALL("PCM unsigned 16-bit little-endian"), - .props = AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_PCM_U16BE, - .type = AVMEDIA_TYPE_AUDIO, - .name = "pcm_u16be", - .long_name = NULL_IF_CONFIG_SMALL("PCM unsigned 16-bit big-endian"), - .props = AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_PCM_S8, - .type = AVMEDIA_TYPE_AUDIO, - .name = "pcm_s8", - .long_name = NULL_IF_CONFIG_SMALL("PCM signed 8-bit"), - .props = AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_PCM_U8, - .type = AVMEDIA_TYPE_AUDIO, - .name = "pcm_u8", - .long_name = NULL_IF_CONFIG_SMALL("PCM unsigned 8-bit"), - .props = AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_PCM_MULAW, - .type = AVMEDIA_TYPE_AUDIO, - .name = "pcm_mulaw", - .long_name = NULL_IF_CONFIG_SMALL("PCM mu-law / G.711 mu-law"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_PCM_ALAW, - .type = AVMEDIA_TYPE_AUDIO, - .name = "pcm_alaw", - .long_name = NULL_IF_CONFIG_SMALL("PCM A-law / G.711 A-law"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_PCM_S32LE, - .type = AVMEDIA_TYPE_AUDIO, - .name = "pcm_s32le", - .long_name = NULL_IF_CONFIG_SMALL("PCM signed 32-bit little-endian"), - .props = AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_PCM_S32BE, - .type = AVMEDIA_TYPE_AUDIO, - .name = "pcm_s32be", - .long_name = NULL_IF_CONFIG_SMALL("PCM signed 32-bit big-endian"), - .props = AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_PCM_U32LE, - .type = AVMEDIA_TYPE_AUDIO, - .name = "pcm_u32le", - .long_name = NULL_IF_CONFIG_SMALL("PCM unsigned 32-bit little-endian"), - .props = AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_PCM_U32BE, - .type = AVMEDIA_TYPE_AUDIO, - .name = "pcm_u32be", - .long_name = NULL_IF_CONFIG_SMALL("PCM unsigned 32-bit big-endian"), - .props = AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_PCM_S24LE, - .type = AVMEDIA_TYPE_AUDIO, - .name = "pcm_s24le", - .long_name = NULL_IF_CONFIG_SMALL("PCM signed 24-bit little-endian"), - .props = AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_PCM_S24BE, - .type = AVMEDIA_TYPE_AUDIO, - .name = "pcm_s24be", - .long_name = NULL_IF_CONFIG_SMALL("PCM signed 24-bit big-endian"), - .props = AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_PCM_U24LE, - .type = AVMEDIA_TYPE_AUDIO, - .name = "pcm_u24le", - .long_name = NULL_IF_CONFIG_SMALL("PCM unsigned 24-bit little-endian"), - .props = AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_PCM_U24BE, - .type = AVMEDIA_TYPE_AUDIO, - .name = "pcm_u24be", - .long_name = NULL_IF_CONFIG_SMALL("PCM unsigned 24-bit big-endian"), - .props = AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_PCM_S24DAUD, - .type = AVMEDIA_TYPE_AUDIO, - .name = "pcm_s24daud", - .long_name = NULL_IF_CONFIG_SMALL("PCM D-Cinema audio signed 24-bit"), - .props = AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_PCM_ZORK, - .type = AVMEDIA_TYPE_AUDIO, - .name = "pcm_zork", - .long_name = NULL_IF_CONFIG_SMALL("PCM Zork"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_PCM_S16BE_PLANAR, - .type = AVMEDIA_TYPE_AUDIO, - .name = "pcm_s16be_planar", - .long_name = NULL_IF_CONFIG_SMALL("PCM signed 16-bit big-endian planar"), - .props = AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_PCM_S16LE_PLANAR, - .type = AVMEDIA_TYPE_AUDIO, - .name = "pcm_s16le_planar", - .long_name = NULL_IF_CONFIG_SMALL("PCM signed 16-bit little-endian planar"), - .props = AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_PCM_S24LE_PLANAR, - .type = AVMEDIA_TYPE_AUDIO, - .name = "pcm_s24le_planar", - .long_name = NULL_IF_CONFIG_SMALL("PCM signed 24-bit little-endian planar"), - .props = AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_PCM_S32LE_PLANAR, - .type = AVMEDIA_TYPE_AUDIO, - .name = "pcm_s32le_planar", - .long_name = NULL_IF_CONFIG_SMALL("PCM signed 32-bit little-endian planar"), - .props = AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_PCM_DVD, - .type = AVMEDIA_TYPE_AUDIO, - .name = "pcm_dvd", - .long_name = NULL_IF_CONFIG_SMALL("PCM signed 20|24-bit big-endian"), - .props = AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_PCM_F32BE, - .type = AVMEDIA_TYPE_AUDIO, - .name = "pcm_f32be", - .long_name = NULL_IF_CONFIG_SMALL("PCM 32-bit floating point big-endian"), - .props = AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_PCM_F32LE, - .type = AVMEDIA_TYPE_AUDIO, - .name = "pcm_f32le", - .long_name = NULL_IF_CONFIG_SMALL("PCM 32-bit floating point little-endian"), - .props = AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_PCM_F64BE, - .type = AVMEDIA_TYPE_AUDIO, - .name = "pcm_f64be", - .long_name = NULL_IF_CONFIG_SMALL("PCM 64-bit floating point big-endian"), - .props = AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_PCM_F64LE, - .type = AVMEDIA_TYPE_AUDIO, - .name = "pcm_f64le", - .long_name = NULL_IF_CONFIG_SMALL("PCM 64-bit floating point little-endian"), - .props = AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_PCM_BLURAY, - .type = AVMEDIA_TYPE_AUDIO, - .name = "pcm_bluray", - .long_name = NULL_IF_CONFIG_SMALL("PCM signed 16|20|24-bit big-endian for Blu-ray media"), - .props = AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_PCM_LXF, - .type = AVMEDIA_TYPE_AUDIO, - .name = "pcm_lxf", - .long_name = NULL_IF_CONFIG_SMALL("PCM signed 20-bit little-endian planar"), - .props = AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_S302M, - .type = AVMEDIA_TYPE_AUDIO, - .name = "s302m", - .long_name = NULL_IF_CONFIG_SMALL("SMPTE 302M"), - .props = AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_PCM_S8_PLANAR, - .type = AVMEDIA_TYPE_AUDIO, - .name = "pcm_s8_planar", - .long_name = NULL_IF_CONFIG_SMALL("PCM signed 8-bit planar"), - .props = AV_CODEC_PROP_LOSSLESS, - }, - - /* various ADPCM codecs */ - { - .id = AV_CODEC_ID_ADPCM_IMA_QT, - .type = AVMEDIA_TYPE_AUDIO, - .name = "adpcm_ima_qt", - .long_name = NULL_IF_CONFIG_SMALL("ADPCM IMA QuickTime"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_ADPCM_IMA_WAV, - .type = AVMEDIA_TYPE_AUDIO, - .name = "adpcm_ima_wav", - .long_name = NULL_IF_CONFIG_SMALL("ADPCM IMA WAV"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_ADPCM_IMA_DK3, - .type = AVMEDIA_TYPE_AUDIO, - .name = "adpcm_ima_dk3", - .long_name = NULL_IF_CONFIG_SMALL("ADPCM IMA Duck DK3"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_ADPCM_IMA_DK4, - .type = AVMEDIA_TYPE_AUDIO, - .name = "adpcm_ima_dk4", - .long_name = NULL_IF_CONFIG_SMALL("ADPCM IMA Duck DK4"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_ADPCM_IMA_WS, - .type = AVMEDIA_TYPE_AUDIO, - .name = "adpcm_ima_ws", - .long_name = NULL_IF_CONFIG_SMALL("ADPCM IMA Westwood"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_ADPCM_IMA_SMJPEG, - .type = AVMEDIA_TYPE_AUDIO, - .name = "adpcm_ima_smjpeg", - .long_name = NULL_IF_CONFIG_SMALL("ADPCM IMA Loki SDL MJPEG"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_ADPCM_MS, - .type = AVMEDIA_TYPE_AUDIO, - .name = "adpcm_ms", - .long_name = NULL_IF_CONFIG_SMALL("ADPCM Microsoft"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_ADPCM_4XM, - .type = AVMEDIA_TYPE_AUDIO, - .name = "adpcm_4xm", - .long_name = NULL_IF_CONFIG_SMALL("ADPCM 4X Movie"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_ADPCM_XA, - .type = AVMEDIA_TYPE_AUDIO, - .name = "adpcm_xa", - .long_name = NULL_IF_CONFIG_SMALL("ADPCM CDROM XA"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_ADPCM_ADX, - .type = AVMEDIA_TYPE_AUDIO, - .name = "adpcm_adx", - .long_name = NULL_IF_CONFIG_SMALL("SEGA CRI ADX ADPCM"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_ADPCM_EA, - .type = AVMEDIA_TYPE_AUDIO, - .name = "adpcm_ea", - .long_name = NULL_IF_CONFIG_SMALL("ADPCM Electronic Arts"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_ADPCM_G726, - .type = AVMEDIA_TYPE_AUDIO, - .name = "adpcm_g726", - .long_name = NULL_IF_CONFIG_SMALL("G.726 ADPCM"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_ADPCM_CT, - .type = AVMEDIA_TYPE_AUDIO, - .name = "adpcm_ct", - .long_name = NULL_IF_CONFIG_SMALL("ADPCM Creative Technology"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_ADPCM_SWF, - .type = AVMEDIA_TYPE_AUDIO, - .name = "adpcm_swf", - .long_name = NULL_IF_CONFIG_SMALL("ADPCM Shockwave Flash"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_ADPCM_YAMAHA, - .type = AVMEDIA_TYPE_AUDIO, - .name = "adpcm_yamaha", - .long_name = NULL_IF_CONFIG_SMALL("ADPCM Yamaha"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_ADPCM_SBPRO_4, - .type = AVMEDIA_TYPE_AUDIO, - .name = "adpcm_sbpro_4", - .long_name = NULL_IF_CONFIG_SMALL("ADPCM Sound Blaster Pro 4-bit"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_ADPCM_SBPRO_3, - .type = AVMEDIA_TYPE_AUDIO, - .name = "adpcm_sbpro_3", - .long_name = NULL_IF_CONFIG_SMALL("ADPCM Sound Blaster Pro 2.6-bit"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_ADPCM_SBPRO_2, - .type = AVMEDIA_TYPE_AUDIO, - .name = "adpcm_sbpro_2", - .long_name = NULL_IF_CONFIG_SMALL("ADPCM Sound Blaster Pro 2-bit"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_ADPCM_THP, - .type = AVMEDIA_TYPE_AUDIO, - .name = "adpcm_thp", - .long_name = NULL_IF_CONFIG_SMALL("ADPCM Nintendo THP"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_ADPCM_THP_LE, - .type = AVMEDIA_TYPE_AUDIO, - .name = "adpcm_thp_le", - .long_name = NULL_IF_CONFIG_SMALL("ADPCM Nintendo THP (Little-Endian)"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_ADPCM_IMA_AMV, - .type = AVMEDIA_TYPE_AUDIO, - .name = "adpcm_ima_amv", - .long_name = NULL_IF_CONFIG_SMALL("ADPCM IMA AMV"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_ADPCM_EA_R1, - .type = AVMEDIA_TYPE_AUDIO, - .name = "adpcm_ea_r1", - .long_name = NULL_IF_CONFIG_SMALL("ADPCM Electronic Arts R1"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_ADPCM_EA_R3, - .type = AVMEDIA_TYPE_AUDIO, - .name = "adpcm_ea_r3", - .long_name = NULL_IF_CONFIG_SMALL("ADPCM Electronic Arts R3"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_ADPCM_EA_R2, - .type = AVMEDIA_TYPE_AUDIO, - .name = "adpcm_ea_r2", - .long_name = NULL_IF_CONFIG_SMALL("ADPCM Electronic Arts R2"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_ADPCM_IMA_EA_SEAD, - .type = AVMEDIA_TYPE_AUDIO, - .name = "adpcm_ima_ea_sead", - .long_name = NULL_IF_CONFIG_SMALL("ADPCM IMA Electronic Arts SEAD"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_ADPCM_IMA_EA_EACS, - .type = AVMEDIA_TYPE_AUDIO, - .name = "adpcm_ima_ea_eacs", - .long_name = NULL_IF_CONFIG_SMALL("ADPCM IMA Electronic Arts EACS"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_ADPCM_EA_XAS, - .type = AVMEDIA_TYPE_AUDIO, - .name = "adpcm_ea_xas", - .long_name = NULL_IF_CONFIG_SMALL("ADPCM Electronic Arts XAS"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_ADPCM_EA_MAXIS_XA, - .type = AVMEDIA_TYPE_AUDIO, - .name = "adpcm_ea_maxis_xa", - .long_name = NULL_IF_CONFIG_SMALL("ADPCM Electronic Arts Maxis CDROM XA"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_ADPCM_IMA_ISS, - .type = AVMEDIA_TYPE_AUDIO, - .name = "adpcm_ima_iss", - .long_name = NULL_IF_CONFIG_SMALL("ADPCM IMA Funcom ISS"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_ADPCM_G722, - .type = AVMEDIA_TYPE_AUDIO, - .name = "adpcm_g722", - .long_name = NULL_IF_CONFIG_SMALL("G.722 ADPCM"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_ADPCM_IMA_APC, - .type = AVMEDIA_TYPE_AUDIO, - .name = "adpcm_ima_apc", - .long_name = NULL_IF_CONFIG_SMALL("ADPCM IMA CRYO APC"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_ADPCM_AFC, - .type = AVMEDIA_TYPE_AUDIO, - .name = "adpcm_afc", - .long_name = NULL_IF_CONFIG_SMALL("ADPCM Nintendo Gamecube AFC"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_ADPCM_IMA_OKI, - .type = AVMEDIA_TYPE_AUDIO, - .name = "adpcm_ima_oki", - .long_name = NULL_IF_CONFIG_SMALL("ADPCM IMA Dialogic OKI"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_ADPCM_DTK, - .type = AVMEDIA_TYPE_AUDIO, - .name = "adpcm_dtk", - .long_name = NULL_IF_CONFIG_SMALL("ADPCM Nintendo Gamecube DTK"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_ADPCM_IMA_RAD, - .type = AVMEDIA_TYPE_AUDIO, - .name = "adpcm_ima_rad", - .long_name = NULL_IF_CONFIG_SMALL("ADPCM IMA Radical"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_ADPCM_G726LE, - .type = AVMEDIA_TYPE_AUDIO, - .name = "adpcm_g726le", - .long_name = NULL_IF_CONFIG_SMALL("G.726 ADPCM little-endian"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_ADPCM_VIMA, - .type = AVMEDIA_TYPE_AUDIO, - .name = "adpcm_vima", - .long_name = NULL_IF_CONFIG_SMALL("LucasArts VIMA audio"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_ADPCM_PSX, - .type = AVMEDIA_TYPE_AUDIO, - .name = "adpcm_psx", - .long_name = NULL_IF_CONFIG_SMALL("ADPCM Playstation"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_ADPCM_AICA, - .type = AVMEDIA_TYPE_AUDIO, - .name = "adpcm_aica", - .long_name = NULL_IF_CONFIG_SMALL("ADPCM Yamaha AICA"), - .props = AV_CODEC_PROP_LOSSY, - }, - - /* AMR */ - { - .id = AV_CODEC_ID_AMR_NB, - .type = AVMEDIA_TYPE_AUDIO, - .name = "amr_nb", - .long_name = NULL_IF_CONFIG_SMALL("AMR-NB (Adaptive Multi-Rate NarrowBand)"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_AMR_WB, - .type = AVMEDIA_TYPE_AUDIO, - .name = "amr_wb", - .long_name = NULL_IF_CONFIG_SMALL("AMR-WB (Adaptive Multi-Rate WideBand)"), - .props = AV_CODEC_PROP_LOSSY, - }, - - /* RealAudio codecs*/ - { - .id = AV_CODEC_ID_RA_144, - .type = AVMEDIA_TYPE_AUDIO, - .name = "ra_144", - .long_name = NULL_IF_CONFIG_SMALL("RealAudio 1.0 (14.4K)"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_RA_288, - .type = AVMEDIA_TYPE_AUDIO, - .name = "ra_288", - .long_name = NULL_IF_CONFIG_SMALL("RealAudio 2.0 (28.8K)"), - .props = AV_CODEC_PROP_LOSSY, - }, - - /* various DPCM codecs */ - { - .id = AV_CODEC_ID_ROQ_DPCM, - .type = AVMEDIA_TYPE_AUDIO, - .name = "roq_dpcm", - .long_name = NULL_IF_CONFIG_SMALL("DPCM id RoQ"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_INTERPLAY_DPCM, - .type = AVMEDIA_TYPE_AUDIO, - .name = "interplay_dpcm", - .long_name = NULL_IF_CONFIG_SMALL("DPCM Interplay"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_XAN_DPCM, - .type = AVMEDIA_TYPE_AUDIO, - .name = "xan_dpcm", - .long_name = NULL_IF_CONFIG_SMALL("DPCM Xan"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_SOL_DPCM, - .type = AVMEDIA_TYPE_AUDIO, - .name = "sol_dpcm", - .long_name = NULL_IF_CONFIG_SMALL("DPCM Sol"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_SDX2_DPCM, - .type = AVMEDIA_TYPE_AUDIO, - .name = "sdx2_dpcm", - .long_name = NULL_IF_CONFIG_SMALL("DPCM Squareroot-Delta-Exact"), - .props = AV_CODEC_PROP_LOSSY, - }, - - /* audio codecs */ - { - .id = AV_CODEC_ID_MP2, - .type = AVMEDIA_TYPE_AUDIO, - .name = "mp2", - .long_name = NULL_IF_CONFIG_SMALL("MP2 (MPEG audio layer 2)"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_MP3, - .type = AVMEDIA_TYPE_AUDIO, - .name = "mp3", - .long_name = NULL_IF_CONFIG_SMALL("MP3 (MPEG audio layer 3)"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_AAC, - .type = AVMEDIA_TYPE_AUDIO, - .name = "aac", - .long_name = NULL_IF_CONFIG_SMALL("AAC (Advanced Audio Coding)"), - .props = AV_CODEC_PROP_LOSSY, - .profiles = NULL_IF_CONFIG_SMALL(ff_aac_profiles), - }, - { - .id = AV_CODEC_ID_AC3, - .type = AVMEDIA_TYPE_AUDIO, - .name = "ac3", - .long_name = NULL_IF_CONFIG_SMALL("ATSC A/52A (AC-3)"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_DTS, - .type = AVMEDIA_TYPE_AUDIO, - .name = "dts", - .long_name = NULL_IF_CONFIG_SMALL("DCA (DTS Coherent Acoustics)"), - .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_LOSSLESS, - .profiles = NULL_IF_CONFIG_SMALL(ff_dca_profiles), - }, - { - .id = AV_CODEC_ID_VORBIS, - .type = AVMEDIA_TYPE_AUDIO, - .name = "vorbis", - .long_name = NULL_IF_CONFIG_SMALL("Vorbis"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_DVAUDIO, - .type = AVMEDIA_TYPE_AUDIO, - .name = "dvaudio", - .long_name = NULL_IF_CONFIG_SMALL("DV audio"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_WMAV1, - .type = AVMEDIA_TYPE_AUDIO, - .name = "wmav1", - .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio 1"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_WMAV2, - .type = AVMEDIA_TYPE_AUDIO, - .name = "wmav2", - .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio 2"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_MACE3, - .type = AVMEDIA_TYPE_AUDIO, - .name = "mace3", - .long_name = NULL_IF_CONFIG_SMALL("MACE (Macintosh Audio Compression/Expansion) 3:1"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_MACE6, - .type = AVMEDIA_TYPE_AUDIO, - .name = "mace6", - .long_name = NULL_IF_CONFIG_SMALL("MACE (Macintosh Audio Compression/Expansion) 6:1"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_VMDAUDIO, - .type = AVMEDIA_TYPE_AUDIO, - .name = "vmdaudio", - .long_name = NULL_IF_CONFIG_SMALL("Sierra VMD audio"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_FLAC, - .type = AVMEDIA_TYPE_AUDIO, - .name = "flac", - .long_name = NULL_IF_CONFIG_SMALL("FLAC (Free Lossless Audio Codec)"), - .props = AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_MP3ADU, - .type = AVMEDIA_TYPE_AUDIO, - .name = "mp3adu", - .long_name = NULL_IF_CONFIG_SMALL("ADU (Application Data Unit) MP3 (MPEG audio layer 3)"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_MP3ON4, - .type = AVMEDIA_TYPE_AUDIO, - .name = "mp3on4", - .long_name = NULL_IF_CONFIG_SMALL("MP3onMP4"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_SHORTEN, - .type = AVMEDIA_TYPE_AUDIO, - .name = "shorten", - .long_name = NULL_IF_CONFIG_SMALL("Shorten"), - .props = AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_ALAC, - .type = AVMEDIA_TYPE_AUDIO, - .name = "alac", - .long_name = NULL_IF_CONFIG_SMALL("ALAC (Apple Lossless Audio Codec)"), - .props = AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_WESTWOOD_SND1, - .type = AVMEDIA_TYPE_AUDIO, - .name = "westwood_snd1", - .long_name = NULL_IF_CONFIG_SMALL("Westwood Audio (SND1)"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_GSM, - .type = AVMEDIA_TYPE_AUDIO, - .name = "gsm", - .long_name = NULL_IF_CONFIG_SMALL("GSM"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_QDM2, - .type = AVMEDIA_TYPE_AUDIO, - .name = "qdm2", - .long_name = NULL_IF_CONFIG_SMALL("QDesign Music Codec 2"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_COOK, - .type = AVMEDIA_TYPE_AUDIO, - .name = "cook", - .long_name = NULL_IF_CONFIG_SMALL("Cook / Cooker / Gecko (RealAudio G2)"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_TRUESPEECH, - .type = AVMEDIA_TYPE_AUDIO, - .name = "truespeech", - .long_name = NULL_IF_CONFIG_SMALL("DSP Group TrueSpeech"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_TTA, - .type = AVMEDIA_TYPE_AUDIO, - .name = "tta", - .long_name = NULL_IF_CONFIG_SMALL("TTA (True Audio)"), - .props = AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_SMACKAUDIO, - .type = AVMEDIA_TYPE_AUDIO, - .name = "smackaudio", - .long_name = NULL_IF_CONFIG_SMALL("Smacker audio"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_QCELP, - .type = AVMEDIA_TYPE_AUDIO, - .name = "qcelp", - .long_name = NULL_IF_CONFIG_SMALL("QCELP / PureVoice"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_WAVPACK, - .type = AVMEDIA_TYPE_AUDIO, - .name = "wavpack", - .long_name = NULL_IF_CONFIG_SMALL("WavPack"), - .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_DSICINAUDIO, - .type = AVMEDIA_TYPE_AUDIO, - .name = "dsicinaudio", - .long_name = NULL_IF_CONFIG_SMALL("Delphine Software International CIN audio"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_IMC, - .type = AVMEDIA_TYPE_AUDIO, - .name = "imc", - .long_name = NULL_IF_CONFIG_SMALL("IMC (Intel Music Coder)"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_MUSEPACK7, - .type = AVMEDIA_TYPE_AUDIO, - .name = "musepack7", - .long_name = NULL_IF_CONFIG_SMALL("Musepack SV7"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_MLP, - .type = AVMEDIA_TYPE_AUDIO, - .name = "mlp", - .long_name = NULL_IF_CONFIG_SMALL("MLP (Meridian Lossless Packing)"), - .props = AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_GSM_MS, - .type = AVMEDIA_TYPE_AUDIO, - .name = "gsm_ms", - .long_name = NULL_IF_CONFIG_SMALL("GSM Microsoft variant"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_ATRAC3, - .type = AVMEDIA_TYPE_AUDIO, - .name = "atrac3", - .long_name = NULL_IF_CONFIG_SMALL("ATRAC3 (Adaptive TRansform Acoustic Coding 3)"), - .props = AV_CODEC_PROP_LOSSY, - }, -#if FF_API_VOXWARE - { - .id = AV_CODEC_ID_VOXWARE, - .type = AVMEDIA_TYPE_AUDIO, - .name = "voxware", - .long_name = NULL_IF_CONFIG_SMALL("Voxware RT29 Metasound"), - .props = AV_CODEC_PROP_LOSSY, - }, -#endif - { - .id = AV_CODEC_ID_APE, - .type = AVMEDIA_TYPE_AUDIO, - .name = "ape", - .long_name = NULL_IF_CONFIG_SMALL("Monkey's Audio"), - .props = AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_NELLYMOSER, - .type = AVMEDIA_TYPE_AUDIO, - .name = "nellymoser", - .long_name = NULL_IF_CONFIG_SMALL("Nellymoser Asao"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_MUSEPACK8, - .type = AVMEDIA_TYPE_AUDIO, - .name = "musepack8", - .long_name = NULL_IF_CONFIG_SMALL("Musepack SV8"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_SPEEX, - .type = AVMEDIA_TYPE_AUDIO, - .name = "speex", - .long_name = NULL_IF_CONFIG_SMALL("Speex"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_WMAVOICE, - .type = AVMEDIA_TYPE_AUDIO, - .name = "wmavoice", - .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio Voice"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_WMAPRO, - .type = AVMEDIA_TYPE_AUDIO, - .name = "wmapro", - .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio 9 Professional"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_WMALOSSLESS, - .type = AVMEDIA_TYPE_AUDIO, - .name = "wmalossless", - .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio Lossless"), - .props = AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_ATRAC3P, - .type = AVMEDIA_TYPE_AUDIO, - .name = "atrac3p", - .long_name = NULL_IF_CONFIG_SMALL("ATRAC3+ (Adaptive TRansform Acoustic Coding 3+)"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_EAC3, - .type = AVMEDIA_TYPE_AUDIO, - .name = "eac3", - .long_name = NULL_IF_CONFIG_SMALL("ATSC A/52B (AC-3, E-AC-3)"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_SIPR, - .type = AVMEDIA_TYPE_AUDIO, - .name = "sipr", - .long_name = NULL_IF_CONFIG_SMALL("RealAudio SIPR / ACELP.NET"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_MP1, - .type = AVMEDIA_TYPE_AUDIO, - .name = "mp1", - .long_name = NULL_IF_CONFIG_SMALL("MP1 (MPEG audio layer 1)"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_TWINVQ, - .type = AVMEDIA_TYPE_AUDIO, - .name = "twinvq", - .long_name = NULL_IF_CONFIG_SMALL("VQF TwinVQ"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_TRUEHD, - .type = AVMEDIA_TYPE_AUDIO, - .name = "truehd", - .long_name = NULL_IF_CONFIG_SMALL("TrueHD"), - .props = AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_MP4ALS, - .type = AVMEDIA_TYPE_AUDIO, - .name = "mp4als", - .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 Audio Lossless Coding (ALS)"), - .props = AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_ATRAC1, - .type = AVMEDIA_TYPE_AUDIO, - .name = "atrac1", - .long_name = NULL_IF_CONFIG_SMALL("ATRAC1 (Adaptive TRansform Acoustic Coding)"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_BINKAUDIO_RDFT, - .type = AVMEDIA_TYPE_AUDIO, - .name = "binkaudio_rdft", - .long_name = NULL_IF_CONFIG_SMALL("Bink Audio (RDFT)"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_BINKAUDIO_DCT, - .type = AVMEDIA_TYPE_AUDIO, - .name = "binkaudio_dct", - .long_name = NULL_IF_CONFIG_SMALL("Bink Audio (DCT)"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_AAC_LATM, - .type = AVMEDIA_TYPE_AUDIO, - .name = "aac_latm", - .long_name = NULL_IF_CONFIG_SMALL("AAC LATM (Advanced Audio Coding LATM syntax)"), - .props = AV_CODEC_PROP_LOSSY, - .profiles = NULL_IF_CONFIG_SMALL(ff_aac_profiles), - }, - { - .id = AV_CODEC_ID_QDMC, - .type = AVMEDIA_TYPE_AUDIO, - .name = "qdmc", - .long_name = NULL_IF_CONFIG_SMALL("QDesign Music"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_CELT, - .type = AVMEDIA_TYPE_AUDIO, - .name = "celt", - .long_name = NULL_IF_CONFIG_SMALL("Constrained Energy Lapped Transform (CELT)"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_G723_1, - .type = AVMEDIA_TYPE_AUDIO, - .name = "g723_1", - .long_name = NULL_IF_CONFIG_SMALL("G.723.1"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_DSS_SP, - .type = AVMEDIA_TYPE_AUDIO, - .name = "dss_sp", - .long_name = NULL_IF_CONFIG_SMALL("Digital Speech Standard - Standard Play mode (DSS SP)"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_G729, - .type = AVMEDIA_TYPE_AUDIO, - .name = "g729", - .long_name = NULL_IF_CONFIG_SMALL("G.729"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_8SVX_EXP, - .type = AVMEDIA_TYPE_AUDIO, - .name = "8svx_exp", - .long_name = NULL_IF_CONFIG_SMALL("8SVX exponential"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_8SVX_FIB, - .type = AVMEDIA_TYPE_AUDIO, - .name = "8svx_fib", - .long_name = NULL_IF_CONFIG_SMALL("8SVX fibonacci"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_BMV_AUDIO, - .type = AVMEDIA_TYPE_AUDIO, - .name = "bmv_audio", - .long_name = NULL_IF_CONFIG_SMALL("Discworld II BMV audio"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_RALF, - .type = AVMEDIA_TYPE_AUDIO, - .name = "ralf", - .long_name = NULL_IF_CONFIG_SMALL("RealAudio Lossless"), - .props = AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_IAC, - .type = AVMEDIA_TYPE_AUDIO, - .name = "iac", - .long_name = NULL_IF_CONFIG_SMALL("IAC (Indeo Audio Coder)"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_ILBC, - .type = AVMEDIA_TYPE_AUDIO, - .name = "ilbc", - .long_name = NULL_IF_CONFIG_SMALL("iLBC (Internet Low Bitrate Codec)"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_FFWAVESYNTH, - .type = AVMEDIA_TYPE_AUDIO, - .name = "wavesynth", - .long_name = NULL_IF_CONFIG_SMALL("Wave synthesis pseudo-codec"), - }, - { - .id = AV_CODEC_ID_SONIC, - .type = AVMEDIA_TYPE_AUDIO, - .name = "sonic", - .long_name = NULL_IF_CONFIG_SMALL("Sonic"), - }, - { - .id = AV_CODEC_ID_SONIC_LS, - .type = AVMEDIA_TYPE_AUDIO, - .name = "sonicls", - .long_name = NULL_IF_CONFIG_SMALL("Sonic lossless"), - }, - { - .id = AV_CODEC_ID_OPUS, - .type = AVMEDIA_TYPE_AUDIO, - .name = "opus", - .long_name = NULL_IF_CONFIG_SMALL("Opus (Opus Interactive Audio Codec)"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_COMFORT_NOISE, - .type = AVMEDIA_TYPE_AUDIO, - .name = "comfortnoise", - .long_name = NULL_IF_CONFIG_SMALL("RFC 3389 Comfort Noise"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_TAK, - .type = AVMEDIA_TYPE_AUDIO, - .name = "tak", - .long_name = NULL_IF_CONFIG_SMALL("TAK (Tom's lossless Audio Kompressor)"), - .props = AV_CODEC_PROP_LOSSLESS, - }, - { - .id = AV_CODEC_ID_METASOUND, - .type = AVMEDIA_TYPE_AUDIO, - .name = "metasound", - .long_name = NULL_IF_CONFIG_SMALL("Voxware MetaSound"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_PAF_AUDIO, - .type = AVMEDIA_TYPE_AUDIO, - .name = "paf_audio", - .long_name = NULL_IF_CONFIG_SMALL("Amazing Studio Packed Animation File Audio"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_ON2AVC, - .type = AVMEDIA_TYPE_AUDIO, - .name = "avc", - .long_name = NULL_IF_CONFIG_SMALL("On2 Audio for Video Codec"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_EVRC, - .type = AVMEDIA_TYPE_AUDIO, - .name = "evrc", - .long_name = NULL_IF_CONFIG_SMALL("EVRC (Enhanced Variable Rate Codec)"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_SMV, - .type = AVMEDIA_TYPE_AUDIO, - .name = "smv", - .long_name = NULL_IF_CONFIG_SMALL("SMV (Selectable Mode Vocoder)"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_4GV, - .type = AVMEDIA_TYPE_AUDIO, - .name = "4gv", - .long_name = NULL_IF_CONFIG_SMALL("4GV (Fourth Generation Vocoder)"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_DSD_LSBF, - .type = AVMEDIA_TYPE_AUDIO, - .name = "dsd_lsbf", - .long_name = NULL_IF_CONFIG_SMALL("DSD (Direct Stream Digital), least significant bit first"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_DSD_MSBF, - .type = AVMEDIA_TYPE_AUDIO, - .name = "dsd_msbf", - .long_name = NULL_IF_CONFIG_SMALL("DSD (Direct Stream Digital), most significant bit first"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_DSD_LSBF_PLANAR, - .type = AVMEDIA_TYPE_AUDIO, - .name = "dsd_lsbf_planar", - .long_name = NULL_IF_CONFIG_SMALL("DSD (Direct Stream Digital), least significant bit first, planar"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_DSD_MSBF_PLANAR, - .type = AVMEDIA_TYPE_AUDIO, - .name = "dsd_msbf_planar", - .long_name = NULL_IF_CONFIG_SMALL("DSD (Direct Stream Digital), most significant bit first, planar"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_INTERPLAY_ACM, - .type = AVMEDIA_TYPE_AUDIO, - .name = "interplayacm", - .long_name = NULL_IF_CONFIG_SMALL("Interplay ACM"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_XMA1, - .type = AVMEDIA_TYPE_AUDIO, - .name = "xma1", - .long_name = NULL_IF_CONFIG_SMALL("Xbox Media Audio 1"), - .props = AV_CODEC_PROP_LOSSY, - }, - { - .id = AV_CODEC_ID_XMA2, - .type = AVMEDIA_TYPE_AUDIO, - .name = "xma2", - .long_name = NULL_IF_CONFIG_SMALL("Xbox Media Audio 2"), - .props = AV_CODEC_PROP_LOSSY, - }, - - /* subtitle codecs */ - { - .id = AV_CODEC_ID_DVD_SUBTITLE, - .type = AVMEDIA_TYPE_SUBTITLE, - .name = "dvd_subtitle", - .long_name = NULL_IF_CONFIG_SMALL("DVD subtitles"), - .props = AV_CODEC_PROP_BITMAP_SUB, - }, - { - .id = AV_CODEC_ID_DVB_SUBTITLE, - .type = AVMEDIA_TYPE_SUBTITLE, - .name = "dvb_subtitle", - .long_name = NULL_IF_CONFIG_SMALL("DVB subtitles"), - .props = AV_CODEC_PROP_BITMAP_SUB, - }, - { - .id = AV_CODEC_ID_TEXT, - .type = AVMEDIA_TYPE_SUBTITLE, - .name = "text", - .long_name = NULL_IF_CONFIG_SMALL("raw UTF-8 text"), - .props = AV_CODEC_PROP_TEXT_SUB, - }, - { - .id = AV_CODEC_ID_XSUB, - .type = AVMEDIA_TYPE_SUBTITLE, - .name = "xsub", - .long_name = NULL_IF_CONFIG_SMALL("XSUB"), - .props = AV_CODEC_PROP_BITMAP_SUB, - }, - { - .id = AV_CODEC_ID_ASS, - .type = AVMEDIA_TYPE_SUBTITLE, - .name = "ass", - .long_name = NULL_IF_CONFIG_SMALL("ASS (Advanced SSA) subtitle"), - .props = AV_CODEC_PROP_TEXT_SUB, - }, - { - .id = AV_CODEC_ID_SSA, - .type = AVMEDIA_TYPE_SUBTITLE, - .name = "ssa", - .long_name = NULL_IF_CONFIG_SMALL("SSA (SubStation Alpha) subtitle"), - .props = AV_CODEC_PROP_TEXT_SUB, - }, - { - .id = AV_CODEC_ID_MOV_TEXT, - .type = AVMEDIA_TYPE_SUBTITLE, - .name = "mov_text", - .long_name = NULL_IF_CONFIG_SMALL("MOV text"), - .props = AV_CODEC_PROP_TEXT_SUB, - }, - { - .id = AV_CODEC_ID_HDMV_PGS_SUBTITLE, - .type = AVMEDIA_TYPE_SUBTITLE, - .name = "hdmv_pgs_subtitle", - .long_name = NULL_IF_CONFIG_SMALL("HDMV Presentation Graphic Stream subtitles"), - .props = AV_CODEC_PROP_BITMAP_SUB, - }, - { - .id = AV_CODEC_ID_DVB_TELETEXT, - .type = AVMEDIA_TYPE_SUBTITLE, - .name = "dvb_teletext", - .long_name = NULL_IF_CONFIG_SMALL("DVB teletext"), - }, - { - .id = AV_CODEC_ID_SRT, - .type = AVMEDIA_TYPE_SUBTITLE, - .name = "srt", - .long_name = NULL_IF_CONFIG_SMALL("SubRip subtitle with embedded timing"), - .props = AV_CODEC_PROP_TEXT_SUB, - }, - { - .id = AV_CODEC_ID_SUBRIP, - .type = AVMEDIA_TYPE_SUBTITLE, - .name = "subrip", - .long_name = NULL_IF_CONFIG_SMALL("SubRip subtitle"), - .props = AV_CODEC_PROP_TEXT_SUB, - }, - { - .id = AV_CODEC_ID_MICRODVD, - .type = AVMEDIA_TYPE_SUBTITLE, - .name = "microdvd", - .long_name = NULL_IF_CONFIG_SMALL("MicroDVD subtitle"), - .props = AV_CODEC_PROP_TEXT_SUB, - }, - { - .id = AV_CODEC_ID_MPL2, - .type = AVMEDIA_TYPE_SUBTITLE, - .name = "mpl2", - .long_name = NULL_IF_CONFIG_SMALL("MPL2 subtitle"), - .props = AV_CODEC_PROP_TEXT_SUB, - }, - { - .id = AV_CODEC_ID_EIA_608, - .type = AVMEDIA_TYPE_SUBTITLE, - .name = "eia_608", - .long_name = NULL_IF_CONFIG_SMALL("EIA-608 closed captions"), - .props = AV_CODEC_PROP_TEXT_SUB, - }, - { - .id = AV_CODEC_ID_JACOSUB, - .type = AVMEDIA_TYPE_SUBTITLE, - .name = "jacosub", - .long_name = NULL_IF_CONFIG_SMALL("JACOsub subtitle"), - .props = AV_CODEC_PROP_TEXT_SUB, - }, - { - .id = AV_CODEC_ID_PJS, - .type = AVMEDIA_TYPE_SUBTITLE, - .name = "pjs", - .long_name = NULL_IF_CONFIG_SMALL("PJS (Phoenix Japanimation Society) subtitle"), - .props = AV_CODEC_PROP_TEXT_SUB, - }, - { - .id = AV_CODEC_ID_SAMI, - .type = AVMEDIA_TYPE_SUBTITLE, - .name = "sami", - .long_name = NULL_IF_CONFIG_SMALL("SAMI subtitle"), - .props = AV_CODEC_PROP_TEXT_SUB, - }, - { - .id = AV_CODEC_ID_REALTEXT, - .type = AVMEDIA_TYPE_SUBTITLE, - .name = "realtext", - .long_name = NULL_IF_CONFIG_SMALL("RealText subtitle"), - .props = AV_CODEC_PROP_TEXT_SUB, - }, - { - .id = AV_CODEC_ID_STL, - .type = AVMEDIA_TYPE_SUBTITLE, - .name = "stl", - .long_name = NULL_IF_CONFIG_SMALL("Spruce subtitle format"), - .props = AV_CODEC_PROP_TEXT_SUB, - }, - { - .id = AV_CODEC_ID_SUBVIEWER1, - .type = AVMEDIA_TYPE_SUBTITLE, - .name = "subviewer1", - .long_name = NULL_IF_CONFIG_SMALL("SubViewer v1 subtitle"), - .props = AV_CODEC_PROP_TEXT_SUB, - }, - { - .id = AV_CODEC_ID_SUBVIEWER, - .type = AVMEDIA_TYPE_SUBTITLE, - .name = "subviewer", - .long_name = NULL_IF_CONFIG_SMALL("SubViewer subtitle"), - .props = AV_CODEC_PROP_TEXT_SUB, - }, - { - .id = AV_CODEC_ID_VPLAYER, - .type = AVMEDIA_TYPE_SUBTITLE, - .name = "vplayer", - .long_name = NULL_IF_CONFIG_SMALL("VPlayer subtitle"), - .props = AV_CODEC_PROP_TEXT_SUB, - }, - { - .id = AV_CODEC_ID_WEBVTT, - .type = AVMEDIA_TYPE_SUBTITLE, - .name = "webvtt", - .long_name = NULL_IF_CONFIG_SMALL("WebVTT subtitle"), - .props = AV_CODEC_PROP_TEXT_SUB, - }, - { - .id = AV_CODEC_ID_HDMV_TEXT_SUBTITLE, - .type = AVMEDIA_TYPE_SUBTITLE, - .name = "hdmv_text_subtitle", - .long_name = NULL_IF_CONFIG_SMALL("HDMV Text subtitle"), - .props = AV_CODEC_PROP_TEXT_SUB, - }, - - /* other kind of codecs and pseudo-codecs */ - { - .id = AV_CODEC_ID_TTF, - .type = AVMEDIA_TYPE_DATA, - .name = "ttf", - .long_name = NULL_IF_CONFIG_SMALL("TrueType font"), - .mime_types= MT("application/x-truetype-font", "application/x-font"), - }, - { - .id = AV_CODEC_ID_BINTEXT, - .type = AVMEDIA_TYPE_VIDEO, - .name = "bintext", - .long_name = NULL_IF_CONFIG_SMALL("Binary text"), - .props = AV_CODEC_PROP_INTRA_ONLY, - }, - { - .id = AV_CODEC_ID_XBIN, - .type = AVMEDIA_TYPE_VIDEO, - .name = "xbin", - .long_name = NULL_IF_CONFIG_SMALL("eXtended BINary text"), - .props = AV_CODEC_PROP_INTRA_ONLY, - }, - { - .id = AV_CODEC_ID_IDF, - .type = AVMEDIA_TYPE_VIDEO, - .name = "idf", - .long_name = NULL_IF_CONFIG_SMALL("iCEDraw text"), - .props = AV_CODEC_PROP_INTRA_ONLY, - }, - { - .id = AV_CODEC_ID_OTF, - .type = AVMEDIA_TYPE_DATA, - .name = "otf", - .long_name = NULL_IF_CONFIG_SMALL("OpenType font"), - .mime_types= MT("application/vnd.ms-opentype"), - }, - { - .id = AV_CODEC_ID_SMPTE_KLV, - .type = AVMEDIA_TYPE_DATA, - .name = "klv", - .long_name = NULL_IF_CONFIG_SMALL("SMPTE 336M Key-Length-Value (KLV) metadata"), - }, - { - .id = AV_CODEC_ID_DVD_NAV, - .type = AVMEDIA_TYPE_DATA, - .name = "dvd_nav_packet", - .long_name = NULL_IF_CONFIG_SMALL("DVD Nav packet"), - }, - { - .id = AV_CODEC_ID_TIMED_ID3, - .type = AVMEDIA_TYPE_DATA, - .name = "timed_id3", - .long_name = NULL_IF_CONFIG_SMALL("timed ID3 metadata"), - }, - { - .id = AV_CODEC_ID_BIN_DATA, - .type = AVMEDIA_TYPE_DATA, - .name = "bin_data", - .long_name = NULL_IF_CONFIG_SMALL("binary data"), - .mime_types= MT("application/octet-stream"), - }, - - /* deprecated codec ids */ -}; - -const AVCodecDescriptor *avcodec_descriptor_get(enum AVCodecID id) -{ - int i; - - for (i = 0; i < FF_ARRAY_ELEMS(codec_descriptors); i++) - if (codec_descriptors[i].id == id) - return &codec_descriptors[i]; - return NULL; -} - -const AVCodecDescriptor *avcodec_descriptor_next(const AVCodecDescriptor *prev) -{ - if (!prev) - return &codec_descriptors[0]; - if (prev - codec_descriptors < FF_ARRAY_ELEMS(codec_descriptors) - 1) - return prev + 1; - return NULL; -} - -const AVCodecDescriptor *avcodec_descriptor_get_by_name(const char *name) -{ - const AVCodecDescriptor *desc = NULL; - - while ((desc = avcodec_descriptor_next(desc))) - if (!strcmp(desc->name, name)) - return desc; - return NULL; -} - -enum AVMediaType avcodec_get_type(enum AVCodecID codec_id) -{ - const AVCodecDescriptor *desc = avcodec_descriptor_get(codec_id); - return desc ? desc->type : AVMEDIA_TYPE_UNKNOWN; -} diff --git a/ext/at3_standalone/compat.h b/ext/at3_standalone/compat.h index e60185e9a3..8140d5ae16 100644 --- a/ext/at3_standalone/compat.h +++ b/ext/at3_standalone/compat.h @@ -25,4 +25,7 @@ #define CONFIG_MDCT 1 #define CONFIG_FFT 1 +#pragma warning(disable:4305) +#pragma warning(disable:4244) + int ff_fast_malloc(void *ptr, unsigned int *size, size_t min_size, int zero_realloc); diff --git a/ext/at3_standalone/dict.c b/ext/at3_standalone/dict.c index d3133dabe3..e71af2a7cc 100644 --- a/ext/at3_standalone/dict.c +++ b/ext/at3_standalone/dict.c @@ -221,117 +221,3 @@ int av_dict_copy(AVDictionary **dst, const AVDictionary *src, int flags) return 0; } - -#ifdef TEST -static void print_dict(const AVDictionary *m) -{ - AVDictionaryEntry *t = NULL; - while ((t = av_dict_get(m, "", t, AV_DICT_IGNORE_SUFFIX))) - printf("%s %s ", t->key, t->value); - printf("\n"); -} - -static void test_separators(const AVDictionary *m, const char pair, const char val) -{ - AVDictionary *dict = NULL; - char pairs[] = {pair , '\0'}; - char vals[] = {val, '\0'}; - - char *buffer = NULL; - av_dict_copy(&dict, m, 0); - print_dict(dict); - av_dict_get_string(dict, &buffer, val, pair); - printf("%s\n", buffer); - av_dict_free(&dict); - av_dict_parse_string(&dict, buffer, vals, pairs, 0); - av_freep(&buffer); - print_dict(dict); - av_dict_free(&dict); -} - -int main(void) -{ - AVDictionary *dict = NULL; - AVDictionaryEntry *e; - char *buffer = NULL; - - printf("Testing av_dict_get_string() and av_dict_parse_string()\n"); - av_dict_get_string(dict, &buffer, '=', ','); - printf("%s\n", buffer); - av_freep(&buffer); - av_dict_set(&dict, "aaa", "aaa", 0); - av_dict_set(&dict, "b,b", "bbb", 0); - av_dict_set(&dict, "c=c", "ccc", 0); - av_dict_set(&dict, "ddd", "d,d", 0); - av_dict_set(&dict, "eee", "e=e", 0); - av_dict_set(&dict, "f,f", "f=f", 0); - av_dict_set(&dict, "g=g", "g,g", 0); - test_separators(dict, ',', '='); - av_dict_free(&dict); - av_dict_set(&dict, "aaa", "aaa", 0); - av_dict_set(&dict, "bbb", "bbb", 0); - av_dict_set(&dict, "ccc", "ccc", 0); - av_dict_set(&dict, "\\,=\'\"", "\\,=\'\"", 0); - test_separators(dict, '"', '='); - test_separators(dict, '\'', '='); - test_separators(dict, ',', '"'); - test_separators(dict, ',', '\''); - test_separators(dict, '\'', '"'); - test_separators(dict, '"', '\''); - av_dict_free(&dict); - - printf("\nTesting av_dict_set()\n"); - av_dict_set(&dict, "a", "a", 0); - av_dict_set(&dict, "b", av_strdup("b"), AV_DICT_DONT_STRDUP_VAL); - av_dict_set(&dict, av_strdup("c"), "c", AV_DICT_DONT_STRDUP_KEY); - av_dict_set(&dict, av_strdup("d"), av_strdup("d"), AV_DICT_DONT_STRDUP_KEY | AV_DICT_DONT_STRDUP_VAL); - av_dict_set(&dict, "e", "e", AV_DICT_DONT_OVERWRITE); - av_dict_set(&dict, "e", "f", AV_DICT_DONT_OVERWRITE); - av_dict_set(&dict, "f", "f", 0); - av_dict_set(&dict, "f", NULL, 0); - av_dict_set(&dict, "ff", "f", 0); - av_dict_set(&dict, "ff", "f", AV_DICT_APPEND); - e = NULL; - while ((e = av_dict_get(dict, "", e, AV_DICT_IGNORE_SUFFIX))) - printf("%s %s\n", e->key, e->value); - av_dict_free(&dict); - - av_dict_set(&dict, NULL, "a", 0); - av_dict_set(&dict, NULL, "b", 0); - av_dict_get(dict, NULL, NULL, 0); - e = NULL; - while ((e = av_dict_get(dict, "", e, AV_DICT_IGNORE_SUFFIX))) - printf("'%s' '%s'\n", e->key, e->value); - av_dict_free(&dict); - - - //valgrind sensible test - printf("\nTesting av_dict_set_int()\n"); - av_dict_set_int(&dict, "1", 1, AV_DICT_DONT_STRDUP_VAL); - av_dict_set_int(&dict, av_strdup("2"), 2, AV_DICT_DONT_STRDUP_KEY); - av_dict_set_int(&dict, av_strdup("3"), 3, AV_DICT_DONT_STRDUP_KEY | AV_DICT_DONT_STRDUP_VAL); - av_dict_set_int(&dict, "4", 4, 0); - av_dict_set_int(&dict, "5", 5, AV_DICT_DONT_OVERWRITE); - av_dict_set_int(&dict, "5", 6, AV_DICT_DONT_OVERWRITE); - av_dict_set_int(&dict, "12", 1, 0); - av_dict_set_int(&dict, "12", 2, AV_DICT_APPEND); - e = NULL; - while ((e = av_dict_get(dict, "", e, AV_DICT_IGNORE_SUFFIX))) - printf("%s %s\n", e->key, e->value); - av_dict_free(&dict); - - //valgrind sensible test - printf("\nTesting av_dict_set() with existing AVDictionaryEntry.key as key\n"); - av_dict_set(&dict, "key", "old", 0); - e = av_dict_get(dict, "key", NULL, 0); - av_dict_set(&dict, e->key, "new val OK", 0); - e = av_dict_get(dict, "key", NULL, 0); - printf("%s\n", e->value); - av_dict_set(&dict, e->key, e->value, 0); - e = av_dict_get(dict, "key", NULL, 0); - printf("%s\n", e->value); - av_dict_free(&dict); - - return 0; -} -#endif diff --git a/ext/at3_standalone/float_dsp.c b/ext/at3_standalone/float_dsp.c index 2a2d36d6c3..e169762405 100644 --- a/ext/at3_standalone/float_dsp.c +++ b/ext/at3_standalone/float_dsp.c @@ -146,321 +146,3 @@ av_cold AVFloatDSPContext *avpriv_float_dsp_alloc(int bit_exact) */ return fdsp; } - - -#ifdef TEST - -#include -#include -#include -#include -#include -#if HAVE_UNISTD_H -#include /* for getopt */ -#endif -#if !HAVE_GETOPT -#include "compat/getopt.c" -#endif - -#include "common.h" -#include "cpu.h" -#include "internal.h" -#include "lfg.h" -#include "log.h" -#include "random_seed.h" - -#define LEN 240 - -static void fill_float_array(AVLFG *lfg, float *a, int len) -{ - int i; - double bmg[2], stddev = 10.0, mean = 0.0; - - for (i = 0; i < len; i += 2) { - av_bmg_get(lfg, bmg); - a[i] = bmg[0] * stddev + mean; - a[i + 1] = bmg[1] * stddev + mean; - } -} -static int compare_floats(const float *a, const float *b, int len, - float max_diff) -{ - int i; - for (i = 0; i < len; i++) { - if (fabsf(a[i] - b[i]) > max_diff) { - av_log(NULL, AV_LOG_ERROR, "%d: %- .12f - %- .12f = % .12g\n", - i, a[i], b[i], a[i] - b[i]); - return -1; - } - } - return 0; -} - -static void fill_double_array(AVLFG *lfg, double *a, int len) -{ - int i; - double bmg[2], stddev = 10.0, mean = 0.0; - - for (i = 0; i < len; i += 2) { - av_bmg_get(lfg, bmg); - a[i] = bmg[0] * stddev + mean; - a[i + 1] = bmg[1] * stddev + mean; - } -} - -static int compare_doubles(const double *a, const double *b, int len, - double max_diff) -{ - int i; - - for (i = 0; i < len; i++) { - if (fabs(a[i] - b[i]) > max_diff) { - av_log(NULL, AV_LOG_ERROR, "%d: %- .12f - %- .12f = % .12g\n", - i, a[i], b[i], a[i] - b[i]); - return -1; - } - } - return 0; -} - -static int test_vector_fmul(AVFloatDSPContext *fdsp, AVFloatDSPContext *cdsp, - const float *v1, const float *v2) -{ - LOCAL_ALIGNED(32, float, cdst, [LEN]); - LOCAL_ALIGNED(32, float, odst, [LEN]); - int ret; - - cdsp->vector_fmul(cdst, v1, v2, LEN); - fdsp->vector_fmul(odst, v1, v2, LEN); - - if (ret = compare_floats(cdst, odst, LEN, FLT_EPSILON)) - av_log(NULL, AV_LOG_ERROR, "vector_fmul failed\n"); - - return ret; -} - -#define ARBITRARY_FMAC_SCALAR_CONST 0.005 -static int test_vector_fmac_scalar(AVFloatDSPContext *fdsp, AVFloatDSPContext *cdsp, - const float *v1, const float *src0, float scale) -{ - LOCAL_ALIGNED(32, float, cdst, [LEN]); - LOCAL_ALIGNED(32, float, odst, [LEN]); - int ret; - - memcpy(cdst, v1, LEN * sizeof(*v1)); - memcpy(odst, v1, LEN * sizeof(*v1)); - - cdsp->vector_fmac_scalar(cdst, src0, scale, LEN); - fdsp->vector_fmac_scalar(odst, src0, scale, LEN); - - if (ret = compare_floats(cdst, odst, LEN, ARBITRARY_FMAC_SCALAR_CONST)) - av_log(NULL, AV_LOG_ERROR, "vector_fmac_scalar failed\n"); - - return ret; -} - -static int test_vector_fmul_scalar(AVFloatDSPContext *fdsp, AVFloatDSPContext *cdsp, - const float *v1, float scale) -{ - LOCAL_ALIGNED(32, float, cdst, [LEN]); - LOCAL_ALIGNED(32, float, odst, [LEN]); - int ret; - - cdsp->vector_fmul_scalar(cdst, v1, scale, LEN); - fdsp->vector_fmul_scalar(odst, v1, scale, LEN); - - if (ret = compare_floats(cdst, odst, LEN, FLT_EPSILON)) - av_log(NULL, AV_LOG_ERROR, "vector_fmul_scalar failed\n"); - - return ret; -} - -static int test_vector_dmul_scalar(AVFloatDSPContext *fdsp, AVFloatDSPContext *cdsp, - const double *v1, double scale) -{ - LOCAL_ALIGNED(32, double, cdst, [LEN]); - LOCAL_ALIGNED(32, double, odst, [LEN]); - int ret; - - cdsp->vector_dmul_scalar(cdst, v1, scale, LEN); - fdsp->vector_dmul_scalar(odst, v1, scale, LEN); - - if (ret = compare_doubles(cdst, odst, LEN, DBL_EPSILON)) - av_log(NULL, AV_LOG_ERROR, "vector_dmul_scalar failed\n"); - - return ret; -} - -#define ARBITRARY_FMUL_WINDOW_CONST 0.008 -static int test_vector_fmul_window(AVFloatDSPContext *fdsp, AVFloatDSPContext *cdsp, - const float *v1, const float *v2, const float *v3) -{ - LOCAL_ALIGNED(32, float, cdst, [LEN]); - LOCAL_ALIGNED(32, float, odst, [LEN]); - int ret; - - cdsp->vector_fmul_window(cdst, v1, v2, v3, LEN / 2); - fdsp->vector_fmul_window(odst, v1, v2, v3, LEN / 2); - - if (ret = compare_floats(cdst, odst, LEN, ARBITRARY_FMUL_WINDOW_CONST)) - av_log(NULL, AV_LOG_ERROR, "vector_fmul_window failed\n"); - - return ret; -} - -#define ARBITRARY_FMUL_ADD_CONST 0.005 -static int test_vector_fmul_add(AVFloatDSPContext *fdsp, AVFloatDSPContext *cdsp, - const float *v1, const float *v2, const float *v3) -{ - LOCAL_ALIGNED(32, float, cdst, [LEN]); - LOCAL_ALIGNED(32, float, odst, [LEN]); - int ret; - - cdsp->vector_fmul_add(cdst, v1, v2, v3, LEN); - fdsp->vector_fmul_add(odst, v1, v2, v3, LEN); - - if (ret = compare_floats(cdst, odst, LEN, ARBITRARY_FMUL_ADD_CONST)) - av_log(NULL, AV_LOG_ERROR, "vector_fmul_add failed\n"); - - return ret; -} - -static int test_vector_fmul_reverse(AVFloatDSPContext *fdsp, AVFloatDSPContext *cdsp, - const float *v1, const float *v2) -{ - LOCAL_ALIGNED(32, float, cdst, [LEN]); - LOCAL_ALIGNED(32, float, odst, [LEN]); - int ret; - - cdsp->vector_fmul_reverse(cdst, v1, v2, LEN); - fdsp->vector_fmul_reverse(odst, v1, v2, LEN); - - if (ret = compare_floats(cdst, odst, LEN, FLT_EPSILON)) - av_log(NULL, AV_LOG_ERROR, "vector_fmul_reverse failed\n"); - - return ret; -} - -static int test_butterflies_float(AVFloatDSPContext *fdsp, AVFloatDSPContext *cdsp, - const float *v1, const float *v2) -{ - LOCAL_ALIGNED(32, float, cv1, [LEN]); - LOCAL_ALIGNED(32, float, cv2, [LEN]); - LOCAL_ALIGNED(32, float, ov1, [LEN]); - LOCAL_ALIGNED(32, float, ov2, [LEN]); - int ret; - - memcpy(cv1, v1, LEN * sizeof(*v1)); - memcpy(cv2, v2, LEN * sizeof(*v2)); - memcpy(ov1, v1, LEN * sizeof(*v1)); - memcpy(ov2, v2, LEN * sizeof(*v2)); - - cdsp->butterflies_float(cv1, cv2, LEN); - fdsp->butterflies_float(ov1, ov2, LEN); - - if ((ret = compare_floats(cv1, ov1, LEN, FLT_EPSILON)) || - (ret = compare_floats(cv2, ov2, LEN, FLT_EPSILON))) - av_log(NULL, AV_LOG_ERROR, "butterflies_float failed\n"); - - return ret; -} - -#define ARBITRARY_SCALARPRODUCT_CONST 0.2 -static int test_scalarproduct_float(AVFloatDSPContext *fdsp, AVFloatDSPContext *cdsp, - const float *v1, const float *v2) -{ - float cprod, oprod; - int ret; - - cprod = cdsp->scalarproduct_float(v1, v2, LEN); - oprod = fdsp->scalarproduct_float(v1, v2, LEN); - - if (ret = compare_floats(&cprod, &oprod, 1, ARBITRARY_SCALARPRODUCT_CONST)) - av_log(NULL, AV_LOG_ERROR, "scalarproduct_float failed\n"); - - return ret; -} - -int main(int argc, char **argv) -{ - int ret = 0, seeded = 0; - uint32_t seed; - AVFloatDSPContext *fdsp, *cdsp; - AVLFG lfg; - - LOCAL_ALIGNED(32, float, src0, [LEN]); - LOCAL_ALIGNED(32, float, src1, [LEN]); - LOCAL_ALIGNED(32, float, src2, [LEN]); - LOCAL_ALIGNED(32, double, dbl_src0, [LEN]); - LOCAL_ALIGNED(32, double, dbl_src1, [LEN]); - - for (;;) { - int arg = getopt(argc, argv, "s:c:"); - if (arg == -1) - break; - switch (arg) { - case 's': - seed = strtoul(optarg, NULL, 10); - seeded = 1; - break; - case 'c': - { - int cpuflags = av_get_cpu_flags(); - - if (av_parse_cpu_caps(&cpuflags, optarg) < 0) - return 1; - - av_force_cpu_flags(cpuflags); - break; - } - } - } - if (!seeded) - seed = av_get_random_seed(); - - av_log(NULL, AV_LOG_INFO, "float_dsp-test: %s %u\n", seeded ? "seed" : "random seed", seed); - - fdsp = avpriv_float_dsp_alloc(1); - av_force_cpu_flags(0); - cdsp = avpriv_float_dsp_alloc(1); - - if (!fdsp || !cdsp) { - ret = 1; - goto end; - } - - av_lfg_init(&lfg, seed); - - fill_float_array(&lfg, src0, LEN); - fill_float_array(&lfg, src1, LEN); - fill_float_array(&lfg, src2, LEN); - - fill_double_array(&lfg, dbl_src0, LEN); - fill_double_array(&lfg, dbl_src1, LEN); - - if (test_vector_fmul(fdsp, cdsp, src0, src1)) - ret -= 1 << 0; - if (test_vector_fmac_scalar(fdsp, cdsp, src2, src0, src1[0])) - ret -= 1 << 1; - if (test_vector_fmul_scalar(fdsp, cdsp, src0, src1[0])) - ret -= 1 << 2; - if (test_vector_fmul_window(fdsp, cdsp, src0, src1, src2)) - ret -= 1 << 3; - if (test_vector_fmul_add(fdsp, cdsp, src0, src1, src2)) - ret -= 1 << 4; - if (test_vector_fmul_reverse(fdsp, cdsp, src0, src1)) - ret -= 1 << 5; - if (test_butterflies_float(fdsp, cdsp, src0, src1)) - ret -= 1 << 6; - if (test_scalarproduct_float(fdsp, cdsp, src0, src1)) - ret -= 1 << 7; - if (test_vector_dmul_scalar(fdsp, cdsp, dbl_src0, dbl_src1[0])) - ret -= 1 << 8; - -end: - av_freep(&fdsp); - av_freep(&cdsp); - return ret; -} - -#endif /* TEST */ diff --git a/ext/at3_standalone/frame.c b/ext/at3_standalone/frame.c index 3b51a7da92..61ecfef609 100644 --- a/ext/at3_standalone/frame.c +++ b/ext/at3_standalone/frame.c @@ -18,13 +18,10 @@ */ #include "channel_layout.h" -// #include "avassert.h" #include "buffer.h" #include "common.h" #include "dict.h" #include "frame.h" -//#include "imgutils.h" -#include "pixdesc.h" #include "util_internal.h" #include "mem.h" #include "samplefmt.h" @@ -35,65 +32,14 @@ MAKE_ACCESSORS(AVFrame, frame, int64_t, pkt_pos) MAKE_ACCESSORS(AVFrame, frame, int64_t, channel_layout) MAKE_ACCESSORS(AVFrame, frame, int, channels) MAKE_ACCESSORS(AVFrame, frame, int, sample_rate) -MAKE_ACCESSORS(AVFrame, frame, AVDictionary *, metadata) MAKE_ACCESSORS(AVFrame, frame, int, decode_error_flags) MAKE_ACCESSORS(AVFrame, frame, int, pkt_size) -MAKE_ACCESSORS(AVFrame, frame, enum AVColorSpace, colorspace) -MAKE_ACCESSORS(AVFrame, frame, enum AVColorRange, color_range) #define CHECK_CHANNELS_CONSISTENCY(frame) \ av_assert2(!(frame)->channel_layout || \ (frame)->channels == \ av_get_channel_layout_nb_channels((frame)->channel_layout)) -AVDictionary **avpriv_frame_get_metadatap(AVFrame *frame) {return &frame->metadata;}; - -#if FF_API_FRAME_QP -int av_frame_set_qp_table(AVFrame *f, AVBufferRef *buf, int stride, int qp_type) -{ - av_buffer_unref(&f->qp_table_buf); - - f->qp_table_buf = buf; - -FF_DISABLE_DEPRECATION_WARNINGS - f->qscale_table = buf->data; - f->qstride = stride; - f->qscale_type = qp_type; -FF_ENABLE_DEPRECATION_WARNINGS - - return 0; -} - -int8_t *av_frame_get_qp_table(AVFrame *f, int *stride, int *type) -{ -FF_DISABLE_DEPRECATION_WARNINGS - *stride = f->qstride; - *type = f->qscale_type; -FF_ENABLE_DEPRECATION_WARNINGS - - if (!f->qp_table_buf) - return NULL; - - return f->qp_table_buf->data; -} -#endif - -const char *av_get_colorspace_name(enum AVColorSpace val) -{ - static const char * const name[] = { - [AVCOL_SPC_RGB] = "GBR", - [AVCOL_SPC_BT709] = "bt709", - [AVCOL_SPC_FCC] = "fcc", - [AVCOL_SPC_BT470BG] = "bt470bg", - [AVCOL_SPC_SMPTE170M] = "smpte170m", - [AVCOL_SPC_SMPTE240M] = "smpte240m", - [AVCOL_SPC_YCOCG] = "YCgCo", - }; - if ((unsigned)val >= FF_ARRAY_ELEMS(name)) - return NULL; - return name[val]; -} - static void get_frame_defaults(AVFrame *frame) { if (frame->extended_data != frame->data) @@ -101,43 +47,12 @@ static void get_frame_defaults(AVFrame *frame) memset(frame, 0, sizeof(*frame)); - frame->pts = - frame->pkt_dts = - frame->pkt_pts = AV_NOPTS_VALUE; av_frame_set_best_effort_timestamp(frame, AV_NOPTS_VALUE); av_frame_set_pkt_duration (frame, 0); av_frame_set_pkt_pos (frame, -1); av_frame_set_pkt_size (frame, -1); - frame->key_frame = 1; - frame->sample_aspect_ratio = (AVRational){ 0, 1 }; frame->format = -1; /* unknown */ frame->extended_data = frame->data; - frame->color_primaries = AVCOL_PRI_UNSPECIFIED; - frame->color_trc = AVCOL_TRC_UNSPECIFIED; - frame->colorspace = AVCOL_SPC_UNSPECIFIED; - frame->color_range = AVCOL_RANGE_UNSPECIFIED; - frame->chroma_location = AVCHROMA_LOC_UNSPECIFIED; -} - -static void free_side_data(AVFrameSideData **ptr_sd) -{ - AVFrameSideData *sd = *ptr_sd; - - av_buffer_unref(&sd->buf); - av_dict_free(&sd->metadata); - av_freep(ptr_sd); -} - -static void wipe_side_data(AVFrame *frame) -{ - int i; - - for (i = 0; i < frame->nb_side_data; i++) { - free_side_data(&frame->side_data[i]); - } - frame->nb_side_data = 0; - - av_freep(&frame->side_data); } AVFrame *av_frame_alloc(void) @@ -223,8 +138,6 @@ int av_frame_get_buffer(AVFrame *frame, int align) if (frame->format < 0) return AVERROR(EINVAL); - if (frame->width > 0 && frame->height > 0) - return AVERROR(EINVAL); else if (frame->nb_samples > 0 && (frame->channel_layout || frame->channels > 0)) return get_audio_buffer(frame, align); @@ -233,90 +146,19 @@ int av_frame_get_buffer(AVFrame *frame, int align) static int frame_copy_props(AVFrame *dst, const AVFrame *src, int force_copy) { - int i; - - dst->key_frame = src->key_frame; - dst->pict_type = src->pict_type; - dst->sample_aspect_ratio = src->sample_aspect_ratio; - dst->pts = src->pts; - dst->repeat_pict = src->repeat_pict; - dst->interlaced_frame = src->interlaced_frame; - dst->top_field_first = src->top_field_first; - dst->palette_has_changed = src->palette_has_changed; dst->sample_rate = src->sample_rate; - dst->opaque = src->opaque; - dst->pkt_pts = src->pkt_pts; - dst->pkt_dts = src->pkt_dts; dst->pkt_pos = src->pkt_pos; dst->pkt_size = src->pkt_size; dst->pkt_duration = src->pkt_duration; - dst->reordered_opaque = src->reordered_opaque; dst->quality = src->quality; dst->best_effort_timestamp = src->best_effort_timestamp; - dst->coded_picture_number = src->coded_picture_number; - dst->display_picture_number = src->display_picture_number; dst->flags = src->flags; dst->decode_error_flags = src->decode_error_flags; - dst->color_primaries = src->color_primaries; - dst->color_trc = src->color_trc; - dst->colorspace = src->colorspace; - dst->color_range = src->color_range; - dst->chroma_location = src->chroma_location; - - av_dict_copy(&dst->metadata, src->metadata, 0); #if FF_API_ERROR_FRAME FF_DISABLE_DEPRECATION_WARNINGS memcpy(dst->error, src->error, sizeof(dst->error)); FF_ENABLE_DEPRECATION_WARNINGS -#endif - - for (i = 0; i < src->nb_side_data; i++) { - const AVFrameSideData *sd_src = src->side_data[i]; - AVFrameSideData *sd_dst; - if ( sd_src->type == AV_FRAME_DATA_PANSCAN - && (src->width != dst->width || src->height != dst->height)) - continue; - if (force_copy) { - sd_dst = av_frame_new_side_data(dst, sd_src->type, - sd_src->size); - if (!sd_dst) { - wipe_side_data(dst); - return AVERROR(ENOMEM); - } - memcpy(sd_dst->data, sd_src->data, sd_src->size); - } else { - sd_dst = av_frame_new_side_data(dst, sd_src->type, 0); - if (!sd_dst) { - wipe_side_data(dst); - return AVERROR(ENOMEM); - } - sd_dst->buf = av_buffer_ref(sd_src->buf); - if (!sd_dst->buf) { - wipe_side_data(dst); - return AVERROR(ENOMEM); - } - sd_dst->data = sd_dst->buf->data; - sd_dst->size = sd_dst->buf->size; - } - av_dict_copy(&sd_dst->metadata, sd_src->metadata, 0); - } - -#if FF_API_FRAME_QP -FF_DISABLE_DEPRECATION_WARNINGS - dst->qscale_table = NULL; - dst->qstride = 0; - dst->qscale_type = 0; - av_buffer_unref(&dst->qp_table_buf); - if (src->qp_table_buf) { - dst->qp_table_buf = av_buffer_ref(src->qp_table_buf); - if (dst->qp_table_buf) { - dst->qscale_table = dst->qp_table_buf->data; - dst->qstride = src->qstride; - dst->qscale_type = src->qscale_type; - } - } -FF_ENABLE_DEPRECATION_WARNINGS #endif return 0; @@ -327,8 +169,6 @@ int av_frame_ref(AVFrame *dst, const AVFrame *src) int i, ret = 0; dst->format = src->format; - dst->width = src->width; - dst->height = src->height; dst->channels = src->channels; dst->channel_layout = src->channel_layout; dst->nb_samples = src->nb_samples; @@ -428,17 +268,11 @@ void av_frame_unref(AVFrame *frame) if (!frame) return; - wipe_side_data(frame); - for (i = 0; i < FF_ARRAY_ELEMS(frame->buf); i++) av_buffer_unref(&frame->buf[i]); for (i = 0; i < frame->nb_extended_buf; i++) av_buffer_unref(&frame->extended_buf[i]); av_freep(&frame->extended_buf); - av_dict_free(&frame->metadata); -#if FF_API_FRAME_QP - av_buffer_unref(&frame->qp_table_buf); -#endif get_frame_defaults(frame); } @@ -469,49 +303,6 @@ int av_frame_is_writable(AVFrame *frame) return ret; } -int av_frame_make_writable(AVFrame *frame) -{ - AVFrame tmp; - int ret; - - if (!frame->buf[0]) - return AVERROR(EINVAL); - - if (av_frame_is_writable(frame)) - return 0; - - memset(&tmp, 0, sizeof(tmp)); - tmp.format = frame->format; - tmp.width = frame->width; - tmp.height = frame->height; - tmp.channels = frame->channels; - tmp.channel_layout = frame->channel_layout; - tmp.nb_samples = frame->nb_samples; - ret = av_frame_get_buffer(&tmp, 32); - if (ret < 0) - return ret; - - ret = av_frame_copy(&tmp, frame); - if (ret < 0) { - av_frame_unref(&tmp); - return ret; - } - - ret = av_frame_copy_props(&tmp, frame); - if (ret < 0) { - av_frame_unref(&tmp); - return ret; - } - - av_frame_unref(frame); - - *frame = tmp; - if (tmp.data == tmp.extended_data) - frame->extended_data = frame->data; - - return 0; -} - int av_frame_copy_props(AVFrame *dst, const AVFrame *src) { return frame_copy_props(dst, src, 1); @@ -548,54 +339,6 @@ AVBufferRef *av_frame_get_plane_buffer(AVFrame *frame, int plane) return NULL; } -AVFrameSideData *av_frame_new_side_data(AVFrame *frame, - enum AVFrameSideDataType type, - int size) -{ - AVFrameSideData *ret, **tmp; - - if (frame->nb_side_data > INT_MAX / sizeof(*frame->side_data) - 1) - return NULL; - - tmp = av_realloc(frame->side_data, - (frame->nb_side_data + 1) * sizeof(*frame->side_data)); - if (!tmp) - return NULL; - frame->side_data = tmp; - - ret = av_mallocz(sizeof(*ret)); - if (!ret) - return NULL; - - if (size > 0) { - ret->buf = av_buffer_alloc(size); - if (!ret->buf) { - av_freep(&ret); - return NULL; - } - - ret->data = ret->buf->data; - ret->size = size; - } - ret->type = type; - - frame->side_data[frame->nb_side_data++] = ret; - - return ret; -} - -AVFrameSideData *av_frame_get_side_data(const AVFrame *frame, - enum AVFrameSideDataType type) -{ - int i; - - for (i = 0; i < frame->nb_side_data; i++) { - if (frame->side_data[i]->type == type) - return frame->side_data[i]; - } - return NULL; -} - static int frame_copy_audio(AVFrame *dst, const AVFrame *src) { int planar = av_sample_fmt_is_planar(dst->format); @@ -624,45 +367,7 @@ int av_frame_copy(AVFrame *dst, const AVFrame *src) { if (dst->format != src->format || dst->format < 0) return AVERROR(EINVAL); - - if (dst->width > 0 && dst->height > 0) - return AVERROR(EINVAL); else if (dst->nb_samples > 0 && dst->channel_layout) return frame_copy_audio(dst, src); - return AVERROR(EINVAL); } - -void av_frame_remove_side_data(AVFrame *frame, enum AVFrameSideDataType type) -{ - int i; - - for (i = 0; i < frame->nb_side_data; i++) { - AVFrameSideData *sd = frame->side_data[i]; - if (sd->type == type) { - free_side_data(&frame->side_data[i]); - frame->side_data[i] = frame->side_data[frame->nb_side_data - 1]; - frame->nb_side_data--; - } - } -} - -const char *av_frame_side_data_name(enum AVFrameSideDataType type) -{ - switch(type) { - case AV_FRAME_DATA_PANSCAN: return "AVPanScan"; - case AV_FRAME_DATA_A53_CC: return "ATSC A53 Part 4 Closed Captions"; - case AV_FRAME_DATA_STEREO3D: return "Stereoscopic 3d metadata"; - case AV_FRAME_DATA_MATRIXENCODING: return "AVMatrixEncoding"; - case AV_FRAME_DATA_DOWNMIX_INFO: return "Metadata relevant to a downmix procedure"; - case AV_FRAME_DATA_REPLAYGAIN: return "AVReplayGain"; - case AV_FRAME_DATA_DISPLAYMATRIX: return "3x3 displaymatrix"; - case AV_FRAME_DATA_AFD: return "Active format description"; - case AV_FRAME_DATA_MOTION_VECTORS: return "Motion vectors"; - case AV_FRAME_DATA_SKIP_SAMPLES: return "Skip samples"; - case AV_FRAME_DATA_AUDIO_SERVICE_TYPE: return "Audio service type"; - case AV_FRAME_DATA_MASTERING_DISPLAY_METADATA: return "Mastering display metadata"; - case AV_FRAME_DATA_GOP_TIMECODE: return "GOP timecode"; - } - return NULL; -} diff --git a/ext/at3_standalone/frame.h b/ext/at3_standalone/frame.h index 8dc4049072..bced2e9404 100644 --- a/ext/at3_standalone/frame.h +++ b/ext/at3_standalone/frame.h @@ -33,7 +33,6 @@ #include "dict.h" #include "rational.h" #include "samplefmt.h" -#include "pixfmt.h" #include "version.h" @@ -124,31 +123,6 @@ enum AVFrameSideDataType { AV_FRAME_DATA_GOP_TIMECODE }; -enum AVActiveFormatDescription { - AV_AFD_SAME = 8, - AV_AFD_4_3 = 9, - AV_AFD_16_9 = 10, - AV_AFD_14_9 = 11, - AV_AFD_4_3_SP_14_9 = 13, - AV_AFD_16_9_SP_14_9 = 14, - AV_AFD_SP_4_3 = 15, -}; - - -/** - * Structure to hold side data for an AVFrame. - * - * sizeof(AVFrameSideData) is not a part of the public ABI, so new fields may be added - * to the end with a minor bump. - */ -typedef struct AVFrameSideData { - enum AVFrameSideDataType type; - uint8_t *data; - int size; - AVDictionary *metadata; - AVBufferRef *buf; -} AVFrameSideData; - /** * This structure describes decoded (raw) audio or video data. * @@ -224,11 +198,6 @@ typedef struct AVFrame { */ uint8_t **extended_data; - /** - * width and height of the video frame - */ - int width, height; - /** * number of audio samples (per channel) described by this frame */ @@ -241,57 +210,11 @@ typedef struct AVFrame { */ int format; - /** - * 1 -> keyframe, 0-> not - */ - int key_frame; - - /** - * Picture type of the frame. - */ - enum AVPictureType pict_type; - - /** - * Sample aspect ratio for the video frame, 0/1 if unknown/unspecified. - */ - AVRational sample_aspect_ratio; - - /** - * Presentation timestamp in time_base units (time when frame should be shown to user). - */ - int64_t pts; - - /** - * PTS copied from the AVPacket that was decoded to produce this frame. - */ - int64_t pkt_pts; - - /** - * DTS copied from the AVPacket that triggered returning this frame. (if frame threading isn't used) - * This is also the Presentation time of this AVFrame calculated from - * only AVPacket.dts values without pts values. - */ - int64_t pkt_dts; - - /** - * picture number in bitstream order - */ - int coded_picture_number; - /** - * picture number in display order - */ - int display_picture_number; - /** * quality (between 1 (good) and FF_LAMBDA_MAX (bad)) */ int quality; - /** - * for some private data of the user - */ - void *opaque; - #if FF_API_ERROR_FRAME /** * @deprecated unused @@ -300,38 +223,6 @@ typedef struct AVFrame { uint64_t error[AV_NUM_DATA_POINTERS]; #endif - /** - * When decoding, this signals how much the picture must be delayed. - * extra_delay = repeat_pict / (2*fps) - */ - int repeat_pict; - - /** - * The content of the picture is interlaced. - */ - int interlaced_frame; - - /** - * If the content is interlaced, is top field displayed first. - */ - int top_field_first; - - /** - * Tell user application that palette has changed from previous frame. - */ - int palette_has_changed; - - /** - * reordered opaque 64bit (generally an integer or a double precision float - * PTS but can be anything). - * The user sets AVCodecContext.reordered_opaque to represent the input at - * that time, - * the decoder reorders values as needed and sets AVFrame.reordered_opaque - * to exactly one of the values provided by the user through AVCodecContext.reordered_opaque - * @deprecated in favor of pkt_pts - */ - int64_t reordered_opaque; - /** * Sample rate of the audio data. */ @@ -374,9 +265,6 @@ typedef struct AVFrame { */ int nb_extended_buf; - AVFrameSideData **side_data; - int nb_side_data; - /** * @defgroup lavu_frame_flags AV_FRAME_FLAGS * Flags describing additional frame properties. @@ -397,30 +285,6 @@ typedef struct AVFrame { */ int flags; - /** - * MPEG vs JPEG YUV range. - * It must be accessed using av_frame_get_color_range() and - * av_frame_set_color_range(). - * - encoding: Set by user - * - decoding: Set by libavcodec - */ - enum AVColorRange color_range; - - enum AVColorPrimaries color_primaries; - - enum AVColorTransferCharacteristic color_trc; - - /** - * YUV colorspace type. - * It must be accessed using av_frame_get_colorspace() and - * av_frame_set_colorspace(). - * - encoding: Set by user - * - decoding: Set by libavcodec - */ - enum AVColorSpace colorspace; - - enum AVChromaLocation chroma_location; - /** * frame timestamp estimated using various heuristics, in stream time base * Code outside libavutil should access this field using: @@ -449,15 +313,6 @@ typedef struct AVFrame { */ int64_t pkt_duration; - /** - * metadata. - * Code outside libavutil should access this field using: - * av_frame_get_metadata(frame) - * - encoding: Set by user. - * - decoding: Set by libavcodec. - */ - AVDictionary *metadata; - /** * decode error flags of the frame, set to a combination of * FF_DECODE_ERROR_xxx flags if the decoder produced a frame, but there @@ -489,29 +344,6 @@ typedef struct AVFrame { * - decoding: set by libavcodec, read by user. */ int pkt_size; - -#if FF_API_FRAME_QP - /** - * QP table - * Not to be accessed directly from outside libavutil - */ - attribute_deprecated - int8_t *qscale_table; - /** - * QP store stride - * Not to be accessed directly from outside libavutil - */ - attribute_deprecated - int qstride; - - attribute_deprecated - int qscale_type; - - /** - * Not to be accessed directly from outside libavutil - */ - AVBufferRef *qp_table_buf; -#endif } AVFrame; /** @@ -531,21 +363,11 @@ int av_frame_get_channels (const AVFrame *frame); void av_frame_set_channels (AVFrame *frame, int val); int av_frame_get_sample_rate (const AVFrame *frame); void av_frame_set_sample_rate (AVFrame *frame, int val); -AVDictionary *av_frame_get_metadata (const AVFrame *frame); -void av_frame_set_metadata (AVFrame *frame, AVDictionary *val); int av_frame_get_decode_error_flags (const AVFrame *frame); void av_frame_set_decode_error_flags (AVFrame *frame, int val); int av_frame_get_pkt_size(const AVFrame *frame); void av_frame_set_pkt_size(AVFrame *frame, int val); AVDictionary **avpriv_frame_get_metadatap(AVFrame *frame); -#if FF_API_FRAME_QP -int8_t *av_frame_get_qp_table(AVFrame *f, int *stride, int *type); -int av_frame_set_qp_table(AVFrame *f, AVBufferRef *buf, int stride, int type); -#endif -enum AVColorSpace av_frame_get_colorspace(const AVFrame *frame); -void av_frame_set_colorspace(AVFrame *frame, enum AVColorSpace val); -enum AVColorRange av_frame_get_color_range(const AVFrame *frame); -void av_frame_set_color_range(AVFrame *frame, enum AVColorRange val); /** * Get the name of a colorspace. @@ -639,19 +461,6 @@ int av_frame_get_buffer(AVFrame *frame, int align); */ int av_frame_is_writable(AVFrame *frame); -/** - * Ensure that the frame data is writable, avoiding data copy if possible. - * - * Do nothing if the frame is writable, allocate new buffers and copy the data - * if it is not. - * - * @return 0 on success, a negative AVERROR on error. - * - * @see av_frame_is_writable(), av_buffer_is_writable(), - * av_buffer_make_writable() - */ -int av_frame_make_writable(AVFrame *frame); - /** * Copy the frame data from src to dst. * @@ -685,37 +494,6 @@ int av_frame_copy_props(AVFrame *dst, const AVFrame *src); */ AVBufferRef *av_frame_get_plane_buffer(AVFrame *frame, int plane); -/** - * Add a new side data to a frame. - * - * @param frame a frame to which the side data should be added - * @param type type of the added side data - * @param size size of the side data - * - * @return newly added side data on success, NULL on error - */ -AVFrameSideData *av_frame_new_side_data(AVFrame *frame, - enum AVFrameSideDataType type, - int size); - -/** - * @return a pointer to the side data of a given type on success, NULL if there - * is no side data with such type in this frame. - */ -AVFrameSideData *av_frame_get_side_data(const AVFrame *frame, - enum AVFrameSideDataType type); - -/** - * If side data of the supplied type exists in the frame, free it and remove it - * from the frame. - */ -void av_frame_remove_side_data(AVFrame *frame, enum AVFrameSideDataType type); - -/** - * @return a string identifying the side data type - */ -const char *av_frame_side_data_name(enum AVFrameSideDataType type); - /** * @} */ diff --git a/ext/at3_standalone/internal.h b/ext/at3_standalone/internal.h index 326abe73ed..e3e2c1017e 100644 --- a/ext/at3_standalone/internal.h +++ b/ext/at3_standalone/internal.h @@ -29,7 +29,6 @@ #include "buffer.h" #include "channel_layout.h" #include "mathematics.h" -#include "pixfmt.h" #include "avcodec.h" #include "config.h" @@ -155,11 +154,6 @@ typedef struct AVCodecInternal { * Number of audio samples to skip at the start of the next decoded frame */ int skip_samples; - - /** - * hwaccel-specific private data - */ - void *hwaccel_priv_data; } AVCodecInternal; struct AVCodecDefault { diff --git a/ext/at3_standalone/intmath.h b/ext/at3_standalone/intmath.h index 9573109e9d..e42581000f 100644 --- a/ext/at3_standalone/intmath.h +++ b/ext/at3_standalone/intmath.h @@ -138,27 +138,6 @@ static av_always_inline av_const int ff_ctzll_c(long long v) } #endif -#ifndef ff_clz -#define ff_clz ff_clz_c -static av_always_inline av_const unsigned ff_clz_c(unsigned x) -{ - unsigned i = sizeof(x) * 8; - - while (x) { - x >>= 1; - i--; - } - - return i; -} -#endif - -#if AV_GCC_VERSION_AT_LEAST(3,4) -#ifndef av_parity -#define av_parity __builtin_parity -#endif -#endif - /** * @} */ diff --git a/ext/at3_standalone/intreadwrite.h b/ext/at3_standalone/intreadwrite.h index 5139d15b2d..8c9ec106ac 100644 --- a/ext/at3_standalone/intreadwrite.h +++ b/ext/at3_standalone/intreadwrite.h @@ -84,69 +84,6 @@ typedef union { * Map AV_RNXX <-> AV_R[BL]XX for all variants provided by per-arch headers. */ -#if AV_HAVE_BIGENDIAN - -# if defined(AV_RN16) && !defined(AV_RB16) -# define AV_RB16(p) AV_RN16(p) -# elif !defined(AV_RN16) && defined(AV_RB16) -# define AV_RN16(p) AV_RB16(p) -# endif - -# if defined(AV_WN16) && !defined(AV_WB16) -# define AV_WB16(p, v) AV_WN16(p, v) -# elif !defined(AV_WN16) && defined(AV_WB16) -# define AV_WN16(p, v) AV_WB16(p, v) -# endif - -# if defined(AV_RN24) && !defined(AV_RB24) -# define AV_RB24(p) AV_RN24(p) -# elif !defined(AV_RN24) && defined(AV_RB24) -# define AV_RN24(p) AV_RB24(p) -# endif - -# if defined(AV_WN24) && !defined(AV_WB24) -# define AV_WB24(p, v) AV_WN24(p, v) -# elif !defined(AV_WN24) && defined(AV_WB24) -# define AV_WN24(p, v) AV_WB24(p, v) -# endif - -# if defined(AV_RN32) && !defined(AV_RB32) -# define AV_RB32(p) AV_RN32(p) -# elif !defined(AV_RN32) && defined(AV_RB32) -# define AV_RN32(p) AV_RB32(p) -# endif - -# if defined(AV_WN32) && !defined(AV_WB32) -# define AV_WB32(p, v) AV_WN32(p, v) -# elif !defined(AV_WN32) && defined(AV_WB32) -# define AV_WN32(p, v) AV_WB32(p, v) -# endif - -# if defined(AV_RN48) && !defined(AV_RB48) -# define AV_RB48(p) AV_RN48(p) -# elif !defined(AV_RN48) && defined(AV_RB48) -# define AV_RN48(p) AV_RB48(p) -# endif - -# if defined(AV_WN48) && !defined(AV_WB48) -# define AV_WB48(p, v) AV_WN48(p, v) -# elif !defined(AV_WN48) && defined(AV_WB48) -# define AV_WN48(p, v) AV_WB48(p, v) -# endif - -# if defined(AV_RN64) && !defined(AV_RB64) -# define AV_RB64(p) AV_RN64(p) -# elif !defined(AV_RN64) && defined(AV_RB64) -# define AV_RN64(p) AV_RB64(p) -# endif - -# if defined(AV_WN64) && !defined(AV_WB64) -# define AV_WB64(p, v) AV_WN64(p, v) -# elif !defined(AV_WN64) && defined(AV_WB64) -# define AV_WN64(p, v) AV_WB64(p, v) -# endif - -#else /* AV_HAVE_BIGENDIAN */ # if defined(AV_RN16) && !defined(AV_RL16) # define AV_RL16(p) AV_RN16(p) @@ -208,8 +145,6 @@ typedef union { # define AV_WN64(p, v) AV_WL64(p, v) # endif -#endif /* !AV_HAVE_BIGENDIAN */ - /* * Define AV_[RW]N helper macros to simplify definitions not provided * by per-arch headers. diff --git a/ext/at3_standalone/libm.h b/ext/at3_standalone/libm.h index a819962391..71d3672eb8 100644 --- a/ext/at3_standalone/libm.h +++ b/ext/at3_standalone/libm.h @@ -362,28 +362,6 @@ static av_always_inline av_const int avpriv_isfinite(double x) : avpriv_isfinite(x)) #endif /* HAVE_ISFINITE */ -#if !HAVE_HYPOT -static inline av_const double hypot(double x, double y) -{ - double ret, temp; - x = fabs(x); - y = fabs(y); - - if (isinf(x) || isinf(y)) - return av_int2double(0x7ff0000000000000); - if (x == 0 || y == 0) - return x + y; - if (x < y) { - temp = x; - x = y; - y = temp; - } - - y = y/x; - return x*sqrt(1 + y*y); -} -#endif /* HAVE_HYPOT */ - #if !HAVE_LDEXPF #undef ldexpf #define ldexpf(x, exp) ((float)ldexp(x, exp)) diff --git a/ext/at3_standalone/mathops.c b/ext/at3_standalone/mathops.c deleted file mode 100644 index 31c8e69e61..0000000000 --- a/ext/at3_standalone/mathops.c +++ /dev/null @@ -1,26 +0,0 @@ -#include "mathops.h" - -#ifdef TEST - -#include - -int main(void) -{ - unsigned u; - - for(u=0; u<65536; u++) { - unsigned s = u*u; - unsigned root = ff_sqrt(s); - unsigned root_m1 = ff_sqrt(s-1); - if (s && root != u) { - fprintf(stderr, "ff_sqrt failed at %u with %u\n", s, root); - return 1; - } - if (u && root_m1 != u - 1) { - fprintf(stderr, "ff_sqrt failed at %u with %u\n", s, root); - return 1; - } - } - return 0; -} -#endif /* TEST */ diff --git a/ext/at3_standalone/mem.h b/ext/at3_standalone/mem.h index 376fd2e07c..1558fe8f0b 100644 --- a/ext/at3_standalone/mem.h +++ b/ext/at3_standalone/mem.h @@ -60,18 +60,6 @@ #define DECLARE_ASM_CONST(n,t,v) static const t v #endif -#if AV_GCC_VERSION_AT_LEAST(3,1) - #define av_malloc_attrib __attribute__((__malloc__)) -#else - #define av_malloc_attrib -#endif - -#if AV_GCC_VERSION_AT_LEAST(4,3) - #define av_alloc_size(...) __attribute__((alloc_size(__VA_ARGS__))) -#else - #define av_alloc_size(...) -#endif - /** * Allocate a block of size bytes with alignment suitable for all * memory accesses (including vectors if available on the CPU). @@ -80,7 +68,7 @@ * be allocated. * @see av_mallocz() */ -void *av_malloc(size_t size) av_malloc_attrib av_alloc_size(1); +void *av_malloc(size_t size); /** * Allocate a block of size * nmemb bytes with av_malloc(). @@ -90,7 +78,7 @@ void *av_malloc(size_t size) av_malloc_attrib av_alloc_size(1); * be allocated. * @see av_malloc() */ -av_alloc_size(1, 2) static inline void *av_malloc_array(size_t nmemb, size_t size) +static inline void *av_malloc_array(size_t nmemb, size_t size) { if (!size || nmemb >= INT_MAX / size) return NULL; @@ -115,7 +103,7 @@ av_alloc_size(1, 2) static inline void *av_malloc_array(size_t nmemb, size_t siz * some libc implementations. * @see av_fast_realloc() */ -void *av_realloc(void *ptr, size_t size) av_alloc_size(2); +void *av_realloc(void *ptr, size_t size); /** * Allocate or reallocate a block of memory. @@ -164,7 +152,7 @@ int av_reallocp(void *ptr, size_t size); * The situation is undefined according to POSIX and may crash with * some libc implementations. */ -av_alloc_size(2, 3) void *av_realloc_array(void *ptr, size_t nmemb, size_t size); +void *av_realloc_array(void *ptr, size_t nmemb, size_t size); /** * Allocate or reallocate an array through a pointer to a pointer. @@ -203,7 +191,7 @@ void av_free(void *ptr); * @return Pointer to the allocated block, NULL if it cannot be allocated. * @see av_malloc() */ -void *av_mallocz(size_t size) av_malloc_attrib av_alloc_size(1); +void *av_mallocz(size_t size); /** * Allocate a block of nmemb * size bytes with alignment suitable for all @@ -215,7 +203,7 @@ void *av_mallocz(size_t size) av_malloc_attrib av_alloc_size(1); * @param size * @return Pointer to the allocated block, NULL if it cannot be allocated. */ -void *av_calloc(size_t nmemb, size_t size) av_malloc_attrib; +void *av_calloc(size_t nmemb, size_t size); /** * Allocate a block of size * nmemb bytes with av_mallocz(). @@ -226,7 +214,7 @@ void *av_calloc(size_t nmemb, size_t size) av_malloc_attrib; * @see av_mallocz() * @see av_malloc_array() */ -av_alloc_size(1, 2) static inline void *av_mallocz_array(size_t nmemb, size_t size) +static inline void *av_mallocz_array(size_t nmemb, size_t size) { if (!size || nmemb >= INT_MAX / size) return NULL; @@ -239,7 +227,7 @@ av_alloc_size(1, 2) static inline void *av_mallocz_array(size_t nmemb, size_t si * @return Pointer to a newly-allocated string containing a * copy of s or NULL if the string cannot be allocated. */ -char *av_strdup(const char *s) av_malloc_attrib; +char *av_strdup(const char *s); /** * Duplicate a substring of the string s. @@ -249,7 +237,7 @@ char *av_strdup(const char *s) av_malloc_attrib; * @return Pointer to a newly-allocated string containing a * copy of s or NULL if the string cannot be allocated. */ -char *av_strndup(const char *s, size_t len) av_malloc_attrib; +char *av_strndup(const char *s, size_t len); /** * Duplicate the buffer p. diff --git a/ext/at3_standalone/opt.c b/ext/at3_standalone/opt.c index 6411239e61..173310df38 100644 --- a/ext/at3_standalone/opt.c +++ b/ext/at3_standalone/opt.c @@ -32,7 +32,6 @@ #include "dict.h" #include "avstring.h" #include "log.h" -#include "pixdesc.h" #include "mathematics.h" #include "samplefmt.h" @@ -1223,7 +1222,7 @@ int av_opt_is_set_to_default(void *obj, const AVOption *o) double d, d2; float f; AVRational q; - int ret, w, h; + int ret; char *str; void *dst; @@ -1408,7 +1407,6 @@ int main(void) printf("rational=%d/%d\n", test_ctx.rational.num, test_ctx.rational.den); printf("video_rate=%d/%d\n", test_ctx.video_rate.num, test_ctx.video_rate.den); printf("width=%d height=%d\n", test_ctx.w, test_ctx.h); - printf("pix_fmt=%s\n", av_get_pix_fmt_name(test_ctx.pix_fmt)); printf("sample_fmt=%s\n", av_get_sample_fmt_name(test_ctx.sample_fmt)); printf("duration=%"PRId64"\n", test_ctx.duration); printf("color=%d %d %d %d\n", test_ctx.color[0], test_ctx.color[1], test_ctx.color[2], test_ctx.color[3]); diff --git a/ext/at3_standalone/opt.h b/ext/at3_standalone/opt.h index 753434d628..9e15aaa131 100644 --- a/ext/at3_standalone/opt.h +++ b/ext/at3_standalone/opt.h @@ -31,7 +31,6 @@ #include "avutil.h" #include "dict.h" #include "log.h" -#include "pixfmt.h" #include "samplefmt.h" #include "version.h" diff --git a/ext/at3_standalone/options.c b/ext/at3_standalone/options.c index 4419193544..6fc3894f07 100644 --- a/ext/at3_standalone/options.c +++ b/ext/at3_standalone/options.c @@ -79,7 +79,7 @@ static AVClassCategory get_category(void *ptr) static const AVClass av_codec_context_class = { .class_name = "AVCodecContext", .item_name = context_to_name, - .option = avcodec_options, + .option = NULL, .version = LIBAVUTIL_VERSION_INT, .log_level_offset_offset = offsetof(AVCodecContext, log_level_offset), .child_next = codec_child_next, @@ -110,17 +110,12 @@ int avcodec_get_context_defaults3(AVCodecContext *s, const AVCodec *codec) av_opt_set_defaults2(s, flags, flags); s->time_base = (AVRational){0,1}; - s->framerate = (AVRational){ 0, 1 }; s->pkt_timebase = (AVRational){ 0, 1 }; s->get_buffer2 = avcodec_default_get_buffer2; - s->get_format = avcodec_default_get_format; s->execute = avcodec_default_execute; s->execute2 = avcodec_default_execute2; - s->sample_aspect_ratio = (AVRational){0,1}; - s->pix_fmt = AV_PIX_FMT_NONE; s->sample_fmt = AV_SAMPLE_FMT_NONE; - s->reordered_opaque = AV_NOPTS_VALUE; if(codec && codec->priv_data_size){ if(!s->priv_data){ s->priv_data= av_mallocz(codec->priv_data_size); @@ -133,17 +128,6 @@ int avcodec_get_context_defaults3(AVCodecContext *s, const AVCodec *codec) av_opt_set_defaults(s->priv_data); } } - if (codec && codec->defaults) { - int ret; - const AVCodecDefault *d = codec->defaults; - /* - while (d->key) { - ret = av_opt_set(s, d->key, d->value, 0); - av_assert0(ret >= 0); - d++; - } - */ - } return 0; } @@ -212,7 +196,6 @@ int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src) /* set values specific to opened codecs back to their default state */ dest->slice_offset = NULL; - dest->hwaccel = NULL; dest->internal = NULL; #if FF_API_CODED_FRAME FF_DISABLE_DEPRECATION_WARNINGS @@ -271,9 +254,6 @@ static const AVOption frame_options[]={ {"best_effort_timestamp", "", FOFFSET(best_effort_timestamp), AV_OPT_TYPE_INT64, {.i64 = AV_NOPTS_VALUE }, INT64_MIN, INT64_MAX, 0}, {"pkt_pos", "", FOFFSET(pkt_pos), AV_OPT_TYPE_INT64, {.i64 = -1 }, INT64_MIN, INT64_MAX, 0}, {"pkt_size", "", FOFFSET(pkt_size), AV_OPT_TYPE_INT64, {.i64 = -1 }, INT64_MIN, INT64_MAX, 0}, -{"sample_aspect_ratio", "", FOFFSET(sample_aspect_ratio), AV_OPT_TYPE_RATIONAL, {.dbl = 0 }, 0, INT_MAX, 0}, -{"width", "", FOFFSET(width), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, 0}, -{"height", "", FOFFSET(height), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, 0}, {"format", "", FOFFSET(format), AV_OPT_TYPE_INT, {.i64 = -1 }, 0, INT_MAX, 0}, {"channel_layout", "", FOFFSET(channel_layout), AV_OPT_TYPE_INT64, {.i64 = 0 }, 0, INT64_MAX, 0}, {"sample_rate", "", FOFFSET(sample_rate), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, 0}, @@ -293,195 +273,3 @@ const AVClass *avcodec_get_frame_class(void) } #define SROFFSET(x) offsetof(AVSubtitleRect,x) - -static const AVOption subtitle_rect_options[]={ -{"x", "", SROFFSET(x), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, 0}, -{"y", "", SROFFSET(y), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, 0}, -{"w", "", SROFFSET(w), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, 0}, -{"h", "", SROFFSET(h), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, 0}, -{"type", "", SROFFSET(type), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, 0}, -{"flags", "", SROFFSET(flags), AV_OPT_TYPE_FLAGS, {.i64 = 0}, 0, 1, 0, "flags"}, -{"forced", "", SROFFSET(flags), AV_OPT_TYPE_FLAGS, {.i64 = 0}, 0, 1, 0}, -{NULL}, -}; - -static const AVClass av_subtitle_rect_class = { - .class_name = "AVSubtitleRect", - .item_name = NULL, - .option = subtitle_rect_options, - .version = LIBAVUTIL_VERSION_INT, -}; - -const AVClass *avcodec_get_subtitle_rect_class(void) -{ - return &av_subtitle_rect_class; -} - -#ifdef TEST -static int dummy_init(AVCodecContext *ctx) -{ - //TODO: this code should set every possible pointer that could be set by codec and is not an option; - ctx->extradata_size = 8; - ctx->extradata = av_malloc(ctx->extradata_size); - return 0; -} - -static int dummy_close(AVCodecContext *ctx) -{ - av_freep(&ctx->extradata); - ctx->extradata_size = 0; - return 0; -} - -static int dummy_encode(AVCodecContext *ctx, AVPacket *pkt, const AVFrame *frame, int *got_packet) -{ - return AVERROR(ENOSYS); -} - -typedef struct Dummy12Context { - AVClass *av_class; - int num; - char* str; -} Dummy12Context; - -typedef struct Dummy3Context { - void *fake_av_class; - int num; - char* str; -} Dummy3Context; - -#define OFFSET(x) offsetof(Dummy12Context, x) -#define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM -static const AVOption dummy_options[] = { - { "str", "set str", OFFSET(str), AV_OPT_TYPE_STRING, { .str = "i'm src default value" }, 0, 0, VE}, - { "num", "set num", OFFSET(num), AV_OPT_TYPE_INT, { .i64 = 1500100900 }, 0, INT_MAX, VE}, - { NULL }, -}; - -static const AVClass dummy_v1_class = { - .class_name = "dummy_v1_class", - .item_name = av_default_item_name, - .option = dummy_options, - .version = LIBAVUTIL_VERSION_INT, -}; - -static const AVClass dummy_v2_class = { - .class_name = "dummy_v2_class", - .item_name = av_default_item_name, - .option = dummy_options, - .version = LIBAVUTIL_VERSION_INT, -}; - -/* codec with options */ -static AVCodec dummy_v1_encoder = { - .name = "dummy_v1_codec", - .type = AVMEDIA_TYPE_VIDEO, - .id = AV_CODEC_ID_NONE - 1, - .encode2 = dummy_encode, - .init = dummy_init, - .close = dummy_close, - .priv_class = &dummy_v1_class, - .priv_data_size = sizeof(Dummy12Context), -}; - -/* codec with options, different class */ -static AVCodec dummy_v2_encoder = { - .name = "dummy_v2_codec", - .type = AVMEDIA_TYPE_VIDEO, - .id = AV_CODEC_ID_NONE - 2, - .encode2 = dummy_encode, - .init = dummy_init, - .close = dummy_close, - .priv_class = &dummy_v2_class, - .priv_data_size = sizeof(Dummy12Context), -}; - -/* codec with priv data, but no class */ -static AVCodec dummy_v3_encoder = { - .name = "dummy_v3_codec", - .type = AVMEDIA_TYPE_VIDEO, - .id = AV_CODEC_ID_NONE - 3, - .encode2 = dummy_encode, - .init = dummy_init, - .close = dummy_close, - .priv_data_size = sizeof(Dummy3Context), -}; - -/* codec without priv data */ -static AVCodec dummy_v4_encoder = { - .name = "dummy_v4_codec", - .type = AVMEDIA_TYPE_VIDEO, - .id = AV_CODEC_ID_NONE - 4, - .encode2 = dummy_encode, - .init = dummy_init, - .close = dummy_close, -}; - -static void test_copy_print_codec(const AVCodecContext *ctx) -{ - printf("%-14s: %dx%d prv: %s", - ctx->codec ? ctx->codec->name : "NULL", - ctx->width, ctx->height, - ctx->priv_data ? "set" : "null"); - if (ctx->codec && ctx->codec->priv_class && ctx->codec->priv_data_size) { - int64_t i64; - char *str = NULL; - av_opt_get_int(ctx->priv_data, "num", 0, &i64); - av_opt_get(ctx->priv_data, "str", 0, (uint8_t**)&str); - printf(" opts: %"PRId64" %s", i64, str); - av_free(str); - } - printf("\n"); -} - -static void test_copy(const AVCodec *c1, const AVCodec *c2) -{ - AVCodecContext *ctx1, *ctx2; - printf("%s -> %s\nclosed:\n", c1 ? c1->name : "NULL", c2 ? c2->name : "NULL"); - ctx1 = avcodec_alloc_context3(c1); - ctx2 = avcodec_alloc_context3(c2); - ctx1->width = ctx1->height = 128; - if (ctx2->codec && ctx2->codec->priv_class && ctx2->codec->priv_data_size) { - av_opt_set(ctx2->priv_data, "num", "667", 0); - av_opt_set(ctx2->priv_data, "str", "i'm dest value before copy", 0); - } - avcodec_copy_context(ctx2, ctx1); - test_copy_print_codec(ctx1); - test_copy_print_codec(ctx2); - if (ctx1->codec) { - printf("opened:\n"); - avcodec_open2(ctx1, ctx1->codec, NULL); - if (ctx2->codec && ctx2->codec->priv_class && ctx2->codec->priv_data_size) { - av_opt_set(ctx2->priv_data, "num", "667", 0); - av_opt_set(ctx2->priv_data, "str", "i'm dest value before copy", 0); - } - avcodec_copy_context(ctx2, ctx1); - test_copy_print_codec(ctx1); - test_copy_print_codec(ctx2); - avcodec_close(ctx1); - } - avcodec_free_context(&ctx1); - avcodec_free_context(&ctx2); -} - -int main(void) -{ - AVCodec *dummy_codec[] = { - &dummy_v1_encoder, - &dummy_v2_encoder, - &dummy_v3_encoder, - &dummy_v4_encoder, - NULL, - }; - int i, j; - - for (i = 0; dummy_codec[i]; i++) - avcodec_register(dummy_codec[i]); - - printf("testing avcodec_copy_context()\n"); - for (i = 0; i < FF_ARRAY_ELEMS(dummy_codec); i++) - for (j = 0; j < FF_ARRAY_ELEMS(dummy_codec); j++) - test_copy(dummy_codec[i], dummy_codec[j]); - return 0; -} -#endif diff --git a/ext/at3_standalone/options_table.h b/ext/at3_standalone/options_table.h index 4188081ed5..13b4219136 100644 --- a/ext/at3_standalone/options_table.h +++ b/ext/at3_standalone/options_table.h @@ -106,7 +106,6 @@ static const AVOption avcodec_options[] = { {"iter", "iter motion estimation", 0, AV_OPT_TYPE_CONST, {.i64 = ME_ITER }, INT_MIN, INT_MAX, V|E, "me_method" }, #endif {"time_base", NULL, OFFSET(time_base), AV_OPT_TYPE_RATIONAL, {.dbl = 0}, INT_MIN, INT_MAX}, -{"g", "set the group of picture (GOP) size", OFFSET(gop_size), AV_OPT_TYPE_INT, {.i64 = 12 }, INT_MIN, INT_MAX, V|E}, {"ar", "set audio sampling rate (in Hz)", OFFSET(sample_rate), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, 0, INT_MAX, A|D|E}, {"ac", "set number of audio channels", OFFSET(channels), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, 0, INT_MAX, A|D|E}, {"cutoff", "set cutoff bandwidth", OFFSET(cutoff), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, A|E}, @@ -120,8 +119,6 @@ static const AVOption avcodec_options[] = { {"qmin", "minimum video quantizer scale (VBR)", OFFSET(qmin), AV_OPT_TYPE_INT, {.i64 = 2 }, -1, 69, V|E}, {"qmax", "maximum video quantizer scale (VBR)", OFFSET(qmax), AV_OPT_TYPE_INT, {.i64 = 31 }, -1, 1024, V|E}, {"qdiff", "maximum difference between the quantizer scales (VBR)", OFFSET(max_qdiff), AV_OPT_TYPE_INT, {.i64 = 3 }, INT_MIN, INT_MAX, V|E}, -{"bf", "set maximum number of B frames between non-B-frames", OFFSET(max_b_frames), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, -1, INT_MAX, V|E}, -{"b_qfactor", "QP factor between P- and B-frames", OFFSET(b_quant_factor), AV_OPT_TYPE_FLOAT, {.dbl = 1.25 }, -FLT_MAX, FLT_MAX, V|E}, #if FF_API_RC_STRATEGY {"rc_strategy", "ratecontrol method", OFFSET(rc_strategy), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, #endif @@ -199,11 +196,6 @@ static const AVOption avcodec_options[] = { #if FF_API_MPV_OPT {"rc_buf_aggressivity", "deprecated, use encoder private options instead", OFFSET(rc_buffer_aggressivity), AV_OPT_TYPE_FLOAT, {.dbl = 1.0 }, -FLT_MAX, FLT_MAX, V|E}, #endif -{"i_qfactor", "QP factor between P- and I-frames", OFFSET(i_quant_factor), AV_OPT_TYPE_FLOAT, {.dbl = -0.8 }, -FLT_MAX, FLT_MAX, V|E}, -{"i_qoffset", "QP offset between P- and I-frames", OFFSET(i_quant_offset), AV_OPT_TYPE_FLOAT, {.dbl = 0.0 }, -FLT_MAX, FLT_MAX, V|E}, -#if FF_API_MPV_OPT -{"rc_init_cplx", "deprecated, use encoder private options instead", OFFSET(rc_initial_cplx), AV_OPT_TYPE_FLOAT, {.dbl = DEFAULT }, -FLT_MAX, FLT_MAX, V|E}, -#endif {"dct", "DCT algorithm", OFFSET(dct_algo), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, 0, INT_MAX, V|E, "dct"}, {"auto", "autoselect a good one", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DCT_AUTO }, INT_MIN, INT_MAX, V|E, "dct"}, {"fastint", "fast integer", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DCT_FASTINT }, INT_MIN, INT_MAX, V|E, "dct"}, @@ -211,11 +203,6 @@ static const AVOption avcodec_options[] = { {"mmx", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DCT_MMX }, INT_MIN, INT_MAX, V|E, "dct"}, {"altivec", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DCT_ALTIVEC }, INT_MIN, INT_MAX, V|E, "dct"}, {"faan", "floating point AAN DCT", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DCT_FAAN }, INT_MIN, INT_MAX, V|E, "dct"}, -{"lumi_mask", "compresses bright areas stronger than medium ones", OFFSET(lumi_masking), AV_OPT_TYPE_FLOAT, {.dbl = 0 }, -FLT_MAX, FLT_MAX, V|E}, -{"tcplx_mask", "temporal complexity masking", OFFSET(temporal_cplx_masking), AV_OPT_TYPE_FLOAT, {.dbl = 0 }, -FLT_MAX, FLT_MAX, V|E}, -{"scplx_mask", "spatial complexity masking", OFFSET(spatial_cplx_masking), AV_OPT_TYPE_FLOAT, {.dbl = 0 }, -FLT_MAX, FLT_MAX, V|E}, -{"p_mask", "inter masking", OFFSET(p_masking), AV_OPT_TYPE_FLOAT, {.dbl = 0 }, -FLT_MAX, FLT_MAX, V|E}, -{"dark_mask", "compresses dark areas stronger than medium ones", OFFSET(dark_masking), AV_OPT_TYPE_FLOAT, {.dbl = 0 }, -FLT_MAX, FLT_MAX, V|E}, {"idct", "select IDCT implementation", OFFSET(idct_algo), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, 0, INT_MAX, V|E|D, "idct"}, {"auto", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_AUTO }, INT_MIN, INT_MAX, V|E|D, "idct"}, {"int", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_INT }, INT_MIN, INT_MAX, V|E|D, "idct"}, @@ -252,7 +239,6 @@ static const AVOption avcodec_options[] = { {"plane", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PRED_PLANE }, INT_MIN, INT_MAX, V|E, "pred"}, {"median", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PRED_MEDIAN }, INT_MIN, INT_MAX, V|E, "pred"}, #endif -{"aspect", "sample aspect ratio", OFFSET(sample_aspect_ratio), AV_OPT_TYPE_RATIONAL, {.dbl = 0}, 0, 10, V|E}, {"debug", "print specific debug info", OFFSET(debug), AV_OPT_TYPE_FLAGS, {.i64 = DEFAULT }, 0, INT_MAX, V|A|S|E|D, "debug"}, {"pict", "picture info", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_PICT_INFO }, INT_MIN, INT_MAX, V|D, "debug"}, {"rc", "rate control", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_RC }, INT_MIN, INT_MAX, V|E, "debug"}, @@ -395,22 +381,8 @@ static const AVOption avcodec_options[] = { {"mpeg4_asp", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_MPEG4_ADVANCED_SIMPLE }, INT_MIN, INT_MAX, V|E, "profile"}, {"level", NULL, OFFSET(level), AV_OPT_TYPE_INT, {.i64 = FF_LEVEL_UNKNOWN }, INT_MIN, INT_MAX, V|A|E, "level"}, {"unknown", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_LEVEL_UNKNOWN }, INT_MIN, INT_MAX, V|A|E, "level"}, -{"lowres", "decode at 1= 1/2, 2=1/4, 3=1/8 resolutions", OFFSET(lowres), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, V|A|D}, -#if FF_API_PRIVATE_OPT -{"skip_threshold", "frame skip threshold", OFFSET(frame_skip_threshold), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, -{"skip_factor", "frame skip factor", OFFSET(frame_skip_factor), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, -{"skip_exp", "frame skip exponent", OFFSET(frame_skip_exp), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, -{"skipcmp", "frame skip compare function", OFFSET(frame_skip_cmp), AV_OPT_TYPE_INT, {.i64 = FF_CMP_DCTMAX }, INT_MIN, INT_MAX, V|E, "cmp_func"}, -#endif -#if FF_API_MPV_OPT -{"border_mask", "deprecated, use encoder private options instead", OFFSET(border_masking), AV_OPT_TYPE_FLOAT, {.dbl = DEFAULT }, -FLT_MAX, FLT_MAX, V|E}, -#endif {"mblmin", "minimum macroblock Lagrange factor (VBR)", OFFSET(mb_lmin), AV_OPT_TYPE_INT, {.i64 = FF_QP2LAMBDA * 2 }, 1, FF_LAMBDA_MAX, V|E}, {"mblmax", "maximum macroblock Lagrange factor (VBR)", OFFSET(mb_lmax), AV_OPT_TYPE_INT, {.i64 = FF_QP2LAMBDA * 31 }, 1, FF_LAMBDA_MAX, V|E}, -#if FF_API_PRIVATE_OPT -{"mepc", "motion estimation bitrate penalty compensation (1.0 = 256)", OFFSET(me_penalty_compensation), AV_OPT_TYPE_INT, {.i64 = 256 }, INT_MIN, INT_MAX, V|E}, -#endif -{"skip_loop_filter", "skip loop filtering process for the selected frames", OFFSET(skip_loop_filter), AV_OPT_TYPE_INT, {.i64 = AVDISCARD_DEFAULT }, INT_MIN, INT_MAX, V|D, "avdiscard"}, {"skip_idct" , "skip IDCT/dequantization for the selected frames", OFFSET(skip_idct), AV_OPT_TYPE_INT, {.i64 = AVDISCARD_DEFAULT }, INT_MIN, INT_MAX, V|D, "avdiscard"}, {"skip_frame" , "skip decoding for the selected frames", OFFSET(skip_frame), AV_OPT_TYPE_INT, {.i64 = AVDISCARD_DEFAULT }, INT_MIN, INT_MAX, V|D, "avdiscard"}, {"none" , "discard no frame", 0, AV_OPT_TYPE_CONST, {.i64 = AVDISCARD_NONE }, INT_MIN, INT_MAX, V|D, "avdiscard"}, @@ -421,18 +393,9 @@ static const AVOption avcodec_options[] = { {"nointra" , "discard all frames except I frames", 0, AV_OPT_TYPE_CONST, {.i64 = AVDISCARD_NONINTRA}, INT_MIN, INT_MAX, V|D, "avdiscard"}, {"all" , "discard all frames", 0, AV_OPT_TYPE_CONST, {.i64 = AVDISCARD_ALL }, INT_MIN, INT_MAX, V|D, "avdiscard"}, {"bidir_refine", "refine the two motion vectors used in bidirectional macroblocks", OFFSET(bidir_refine), AV_OPT_TYPE_INT, {.i64 = 1 }, 0, 4, V|E}, -#if FF_API_PRIVATE_OPT -{"brd_scale", "downscale frames for dynamic B-frame decision", OFFSET(brd_scale), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, 0, 10, V|E}, -#endif {"keyint_min", "minimum interval between IDR-frames", OFFSET(keyint_min), AV_OPT_TYPE_INT, {.i64 = 25 }, INT_MIN, INT_MAX, V|E}, {"refs", "reference frames to consider for motion compensation", OFFSET(refs), AV_OPT_TYPE_INT, {.i64 = 1 }, INT_MIN, INT_MAX, V|E}, -#if FF_API_PRIVATE_OPT -{"chromaoffset", "chroma QP offset from luma", OFFSET(chromaoffset), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, -#endif {"trellis", "rate-distortion optimal quantization", OFFSET(trellis), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|A|E}, -#if FF_API_UNUSED_MEMBERS -{"sc_factor", "multiplied by qscale for each frame and added to scene_change_score", OFFSET(scenechange_factor), AV_OPT_TYPE_INT, {.i64 = 6 }, 0, INT_MAX, V|E}, -#endif /* FF_API_UNUSED_MEMBERS */ {"mv0_threshold", NULL, OFFSET(mv0_threshold), AV_OPT_TYPE_INT, {.i64 = 256 }, 0, INT_MAX, V|E}, #if FF_API_PRIVATE_OPT {"b_sensitivity", "adjust sensitivity of b_frame_strategy 1", OFFSET(b_sensitivity), AV_OPT_TYPE_INT, {.i64 = 40 }, 1, INT_MAX, V|E}, @@ -449,56 +412,6 @@ static const AVOption avcodec_options[] = { {"rc_max_vbv_use", NULL, OFFSET(rc_max_available_vbv_use), AV_OPT_TYPE_FLOAT, {.dbl = 0 }, 0.0, FLT_MAX, V|E}, {"rc_min_vbv_use", NULL, OFFSET(rc_min_vbv_overflow_use), AV_OPT_TYPE_FLOAT, {.dbl = 3 }, 0.0, FLT_MAX, V|E}, {"ticks_per_frame", NULL, OFFSET(ticks_per_frame), AV_OPT_TYPE_INT, {.i64 = 1 }, 1, INT_MAX, A|V|E|D}, -{"color_primaries", "color primaries", OFFSET(color_primaries), AV_OPT_TYPE_INT, {.i64 = AVCOL_PRI_UNSPECIFIED }, 1, AVCOL_PRI_NB-1, V|E|D, "color_primaries_type"}, -{"bt709", "BT.709", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_PRI_BT709 }, INT_MIN, INT_MAX, V|E|D, "color_primaries_type"}, -{"unspecified", "Unspecified", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_PRI_UNSPECIFIED }, INT_MIN, INT_MAX, V|E|D, "color_primaries_type"}, -{"bt470m", "BT.470 M", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_PRI_BT470M }, INT_MIN, INT_MAX, V|E|D, "color_primaries_type"}, -{"bt470bg", "BT.470 BG", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_PRI_BT470BG }, INT_MIN, INT_MAX, V|E|D, "color_primaries_type"}, -{"smpte170m", "SMPTE 170 M", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_PRI_SMPTE170M }, INT_MIN, INT_MAX, V|E|D, "color_primaries_type"}, -{"smpte240m", "SMPTE 240 M", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_PRI_SMPTE240M }, INT_MIN, INT_MAX, V|E|D, "color_primaries_type"}, -{"film", "Film", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_PRI_FILM }, INT_MIN, INT_MAX, V|E|D, "color_primaries_type"}, -{"bt2020", "BT.2020", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_PRI_BT2020 }, INT_MIN, INT_MAX, V|E|D, "color_primaries_type"}, -{"smpte428_1", "SMPTE ST 428-1", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_PRI_SMPTEST428_1 }, INT_MIN, INT_MAX, V|E|D, "color_primaries_type"}, -{"color_trc", "color transfer characteristics", OFFSET(color_trc), AV_OPT_TYPE_INT, {.i64 = AVCOL_TRC_UNSPECIFIED }, 1, AVCOL_TRC_NB-1, V|E|D, "color_trc_type"}, -{"bt709", "BT.709", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_TRC_BT709 }, INT_MIN, INT_MAX, V|E|D, "color_trc_type"}, -{"unspecified", "Unspecified", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_TRC_UNSPECIFIED }, INT_MIN, INT_MAX, V|E|D, "color_trc_type"}, -{"gamma22", "BT.470 M", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_TRC_GAMMA22 }, INT_MIN, INT_MAX, V|E|D, "color_trc_type"}, -{"gamma28", "BT.470 BG", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_TRC_GAMMA28 }, INT_MIN, INT_MAX, V|E|D, "color_trc_type"}, -{"smpte170m", "SMPTE 170 M", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_TRC_SMPTE170M }, INT_MIN, INT_MAX, V|E|D, "color_trc_type"}, -{"smpte240m", "SMPTE 240 M", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_TRC_SMPTE240M }, INT_MIN, INT_MAX, V|E|D, "color_trc_type"}, -{"linear", "Linear", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_TRC_LINEAR }, INT_MIN, INT_MAX, V|E|D, "color_trc_type"}, -{"log", "Log", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_TRC_LOG }, INT_MIN, INT_MAX, V|E|D, "color_trc_type"}, -{"log_sqrt", "Log square root", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_TRC_LOG_SQRT }, INT_MIN, INT_MAX, V|E|D, "color_trc_type"}, -{"iec61966_2_4", "IEC 61966-2-4", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_TRC_IEC61966_2_4 }, INT_MIN, INT_MAX, V|E|D, "color_trc_type"}, -{"bt1361", "BT.1361", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_TRC_BT1361_ECG }, INT_MIN, INT_MAX, V|E|D, "color_trc_type"}, -{"iec61966_2_1", "IEC 61966-2-1", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_TRC_IEC61966_2_1 }, INT_MIN, INT_MAX, V|E|D, "color_trc_type"}, -{"bt2020_10bit", "BT.2020 - 10 bit", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_TRC_BT2020_10 }, INT_MIN, INT_MAX, V|E|D, "color_trc_type"}, -{"bt2020_12bit", "BT.2020 - 12 bit", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_TRC_BT2020_12 }, INT_MIN, INT_MAX, V|E|D, "color_trc_type"}, -{"smpte2084", "SMPTE ST 2084", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_TRC_SMPTEST2084 }, INT_MIN, INT_MAX, V|E|D, "color_trc_type"}, -{"smpte428_1", "SMPTE ST 428-1", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_TRC_SMPTEST428_1 }, INT_MIN, INT_MAX, V|E|D, "color_trc_type"}, -{"colorspace", "color space", OFFSET(colorspace), AV_OPT_TYPE_INT, {.i64 = AVCOL_SPC_UNSPECIFIED }, 0, AVCOL_SPC_NB-1, V|E|D, "colorspace_type"}, -{"rgb", "RGB", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_SPC_RGB }, INT_MIN, INT_MAX, V|E|D, "colorspace_type"}, -{"bt709", "BT.709", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_SPC_BT709 }, INT_MIN, INT_MAX, V|E|D, "colorspace_type"}, -{"unspecified", "Unspecified", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_SPC_UNSPECIFIED }, INT_MIN, INT_MAX, V|E|D, "colorspace_type"}, -{"fcc", "FCC", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_SPC_FCC }, INT_MIN, INT_MAX, V|E|D, "colorspace_type"}, -{"bt470bg", "BT.470 BG", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_SPC_BT470BG }, INT_MIN, INT_MAX, V|E|D, "colorspace_type"}, -{"smpte170m", "SMPTE 170 M", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_SPC_SMPTE170M }, INT_MIN, INT_MAX, V|E|D, "colorspace_type"}, -{"smpte240m", "SMPTE 240 M", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_SPC_SMPTE240M }, INT_MIN, INT_MAX, V|E|D, "colorspace_type"}, -{"ycocg", "YCOCG", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_SPC_YCOCG }, INT_MIN, INT_MAX, V|E|D, "colorspace_type"}, -{"bt2020_ncl", "BT.2020 NCL", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_SPC_BT2020_NCL }, INT_MIN, INT_MAX, V|E|D, "colorspace_type"}, -{"bt2020_cl", "BT.2020 CL", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_SPC_BT2020_CL }, INT_MIN, INT_MAX, V|E|D, "colorspace_type"}, -{"color_range", "color range", OFFSET(color_range), AV_OPT_TYPE_INT, {.i64 = AVCOL_RANGE_UNSPECIFIED }, 0, AVCOL_RANGE_NB-1, V|E|D, "color_range_type"}, -{"unspecified", "Unspecified", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_RANGE_UNSPECIFIED }, INT_MIN, INT_MAX, V|E|D, "color_range_type"}, -{"mpeg", "MPEG (219*2^(n-8))", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_RANGE_MPEG }, INT_MIN, INT_MAX, V|E|D, "color_range_type"}, -{"jpeg", "JPEG (2^n-1)", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_RANGE_JPEG }, INT_MIN, INT_MAX, V|E|D, "color_range_type"}, -{"chroma_sample_location", "chroma sample location", OFFSET(chroma_sample_location), AV_OPT_TYPE_INT, {.i64 = AVCHROMA_LOC_UNSPECIFIED }, 0, AVCHROMA_LOC_NB-1, V|E|D, "chroma_sample_location_type"}, -{"unspecified", "Unspecified", 0, AV_OPT_TYPE_CONST, {.i64 = AVCHROMA_LOC_UNSPECIFIED }, INT_MIN, INT_MAX, V|E|D, "chroma_sample_location_type"}, -{"left", "Left", 0, AV_OPT_TYPE_CONST, {.i64 = AVCHROMA_LOC_LEFT }, INT_MIN, INT_MAX, V|E|D, "chroma_sample_location_type"}, -{"center", "Center", 0, AV_OPT_TYPE_CONST, {.i64 = AVCHROMA_LOC_CENTER }, INT_MIN, INT_MAX, V|E|D, "chroma_sample_location_type"}, -{"topleft", "Top-left", 0, AV_OPT_TYPE_CONST, {.i64 = AVCHROMA_LOC_TOPLEFT }, INT_MIN, INT_MAX, V|E|D, "chroma_sample_location_type"}, -{"top", "Top", 0, AV_OPT_TYPE_CONST, {.i64 = AVCHROMA_LOC_TOP }, INT_MIN, INT_MAX, V|E|D, "chroma_sample_location_type"}, -{"bottomleft", "Bottom-left", 0, AV_OPT_TYPE_CONST, {.i64 = AVCHROMA_LOC_BOTTOMLEFT }, INT_MIN, INT_MAX, V|E|D, "chroma_sample_location_type"}, -{"bottom", "Bottom", 0, AV_OPT_TYPE_CONST, {.i64 = AVCHROMA_LOC_BOTTOM }, INT_MIN, INT_MAX, V|E|D, "chroma_sample_location_type"}, {"log_level_offset", "set the log level offset", OFFSET(log_level_offset), AV_OPT_TYPE_INT, {.i64 = 0 }, INT_MIN, INT_MAX }, {"slices", "set the number of slices, used in parallelized encoding", OFFSET(slices), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, V|E}, {"thread_type", "select multithreading type", OFFSET(thread_type), AV_OPT_TYPE_FLAGS, {.i64 = FF_THREAD_SLICE|FF_THREAD_FRAME }, 0, INT_MAX, V|A|E|D, "thread_type"}, @@ -516,26 +429,10 @@ static const AVOption avcodec_options[] = { {"ka", "Karaoke", 0, AV_OPT_TYPE_CONST, {.i64 = AV_AUDIO_SERVICE_TYPE_KARAOKE }, INT_MIN, INT_MAX, A|E, "audio_service_type"}, {"request_sample_fmt", "sample format audio decoders should prefer", OFFSET(request_sample_fmt), AV_OPT_TYPE_SAMPLE_FMT, {.i64=AV_SAMPLE_FMT_NONE}, -1, INT_MAX, A|D, "request_sample_fmt"}, {"pkt_timebase", NULL, OFFSET(pkt_timebase), AV_OPT_TYPE_RATIONAL, {.dbl = 0 }, 0, INT_MAX, 0}, -{"sub_charenc", "set input text subtitles character encoding", OFFSET(sub_charenc), AV_OPT_TYPE_STRING, {.str = NULL}, CHAR_MIN, CHAR_MAX, S|D}, -{"sub_charenc_mode", "set input text subtitles character encoding mode", OFFSET(sub_charenc_mode), AV_OPT_TYPE_FLAGS, {.i64 = FF_SUB_CHARENC_MODE_AUTOMATIC}, -1, INT_MAX, S|D, "sub_charenc_mode"}, -{"do_nothing", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_SUB_CHARENC_MODE_DO_NOTHING}, INT_MIN, INT_MAX, S|D, "sub_charenc_mode"}, -{"auto", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_SUB_CHARENC_MODE_AUTOMATIC}, INT_MIN, INT_MAX, S|D, "sub_charenc_mode"}, -{"pre_decoder", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_SUB_CHARENC_MODE_PRE_DECODER}, INT_MIN, INT_MAX, S|D, "sub_charenc_mode"}, {"refcounted_frames", NULL, OFFSET(refcounted_frames), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, A|V|D }, #if FF_API_SIDEDATA_ONLY_PKT {"side_data_only_packets", NULL, OFFSET(side_data_only_packets), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, A|V|E }, #endif -{"skip_alpha", "Skip processing alpha", OFFSET(skip_alpha), AV_OPT_TYPE_BOOL, {.i64 = 0 }, 0, 1, V|D }, -{"field_order", "Field order", OFFSET(field_order), AV_OPT_TYPE_INT, {.i64 = AV_FIELD_UNKNOWN }, 0, 5, V|D|E, "field_order" }, -{"progressive", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = AV_FIELD_PROGRESSIVE }, 0, 0, V|D|E, "field_order" }, -{"tt", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = AV_FIELD_TT }, 0, 0, V|D|E, "field_order" }, -{"bb", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = AV_FIELD_BB }, 0, 0, V|D|E, "field_order" }, -{"tb", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = AV_FIELD_TB }, 0, 0, V|D|E, "field_order" }, -{"bt", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = AV_FIELD_BT }, 0, 0, V|D|E, "field_order" }, -{"dump_separator", "set information dump field separator", OFFSET(dump_separator), AV_OPT_TYPE_STRING, {.str = NULL}, CHAR_MIN, CHAR_MAX, A|V|S|D|E}, -{"codec_whitelist", "List of decoders that are allowed to be used", OFFSET(codec_whitelist), AV_OPT_TYPE_STRING, { .str = NULL }, CHAR_MIN, CHAR_MAX, A|V|S|D }, -{"pixel_format", "set pixel format", OFFSET(pix_fmt), AV_OPT_TYPE_PIXEL_FMT, {.i64=AV_PIX_FMT_NONE}, -1, INT_MAX, 0 }, -{"video_size", "set video size", OFFSET(width), AV_OPT_TYPE_IMAGE_SIZE, {.str=NULL}, 0, INT_MAX, 0 }, {NULL}, }; diff --git a/ext/at3_standalone/pixdesc.h b/ext/at3_standalone/pixdesc.h deleted file mode 100644 index b1d218db48..0000000000 --- a/ext/at3_standalone/pixdesc.h +++ /dev/null @@ -1,394 +0,0 @@ -/* - * pixel format descriptor - * Copyright (c) 2009 Michael Niedermayer - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef AVUTIL_PIXDESC_H -#define AVUTIL_PIXDESC_H - -#include - -#include "attributes.h" -#include "pixfmt.h" -#include "version.h" - -typedef struct AVComponentDescriptor { - /** - * Which of the 4 planes contains the component. - */ - int plane; - - /** - * Number of elements between 2 horizontally consecutive pixels. - * Elements are bits for bitstream formats, bytes otherwise. - */ - int step; - - /** - * Number of elements before the component of the first pixel. - * Elements are bits for bitstream formats, bytes otherwise. - */ - int offset; - - /** - * Number of least significant bits that must be shifted away - * to get the value. - */ - int shift; - - /** - * Number of bits in the component. - */ - int depth; - -#if FF_API_PLUS1_MINUS1 - /** deprecated, use step instead */ - attribute_deprecated int step_minus1; - - /** deprecated, use depth instead */ - attribute_deprecated int depth_minus1; - - /** deprecated, use offset instead */ - attribute_deprecated int offset_plus1; -#endif -} AVComponentDescriptor; - -/** - * Descriptor that unambiguously describes how the bits of a pixel are - * stored in the up to 4 data planes of an image. It also stores the - * subsampling factors and number of components. - * - * @note This is separate of the colorspace (RGB, YCbCr, YPbPr, JPEG-style YUV - * and all the YUV variants) AVPixFmtDescriptor just stores how values - * are stored not what these values represent. - */ -typedef struct AVPixFmtDescriptor { - const char *name; - uint8_t nb_components; ///< The number of components each pixel has, (1-4) - - /** - * Amount to shift the luma width right to find the chroma width. - * For YV12 this is 1 for example. - * chroma_width = -((-luma_width) >> log2_chroma_w) - * The note above is needed to ensure rounding up. - * This value only refers to the chroma components. - */ - uint8_t log2_chroma_w; ///< chroma_width = -((-luma_width )>>log2_chroma_w) - - /** - * Amount to shift the luma height right to find the chroma height. - * For YV12 this is 1 for example. - * chroma_height= -((-luma_height) >> log2_chroma_h) - * The note above is needed to ensure rounding up. - * This value only refers to the chroma components. - */ - uint8_t log2_chroma_h; - - /** - * Combination of AV_PIX_FMT_FLAG_... flags. - */ - uint64_t flags; - - /** - * Parameters that describe how pixels are packed. - * If the format has 1 or 2 components, then luma is 0. - * If the format has 3 or 4 components: - * if the RGB flag is set then 0 is red, 1 is green and 2 is blue; - * otherwise 0 is luma, 1 is chroma-U and 2 is chroma-V. - * - * If present, the Alpha channel is always the last component. - */ - AVComponentDescriptor comp[4]; - - /** - * Alternative comma-separated names. - */ - const char *alias; -} AVPixFmtDescriptor; - -/** - * Pixel format is big-endian. - */ -#define AV_PIX_FMT_FLAG_BE (1 << 0) -/** - * Pixel format has a palette in data[1], values are indexes in this palette. - */ -#define AV_PIX_FMT_FLAG_PAL (1 << 1) -/** - * All values of a component are bit-wise packed end to end. - */ -#define AV_PIX_FMT_FLAG_BITSTREAM (1 << 2) -/** - * Pixel format is an HW accelerated format. - */ -#define AV_PIX_FMT_FLAG_HWACCEL (1 << 3) -/** - * At least one pixel component is not in the first data plane. - */ -#define AV_PIX_FMT_FLAG_PLANAR (1 << 4) -/** - * The pixel format contains RGB-like data (as opposed to YUV/grayscale). - */ -#define AV_PIX_FMT_FLAG_RGB (1 << 5) - -/** - * The pixel format is "pseudo-paletted". This means that it contains a - * fixed palette in the 2nd plane but the palette is fixed/constant for each - * PIX_FMT. This allows interpreting the data as if it was PAL8, which can - * in some cases be simpler. Or the data can be interpreted purely based on - * the pixel format without using the palette. - * An example of a pseudo-paletted format is AV_PIX_FMT_GRAY8 - */ -#define AV_PIX_FMT_FLAG_PSEUDOPAL (1 << 6) - -/** - * The pixel format has an alpha channel. This is set on all formats that - * support alpha in some way. The exception is AV_PIX_FMT_PAL8, which can - * carry alpha as part of the palette. Details are explained in the - * AVPixelFormat enum, and are also encoded in the corresponding - * AVPixFmtDescriptor. - * - * The alpha is always straight, never pre-multiplied. - * - * If a codec or a filter does not support alpha, it should set all alpha to - * opaque, or use the equivalent pixel formats without alpha component, e.g. - * AV_PIX_FMT_RGB0 (or AV_PIX_FMT_RGB24 etc.) instead of AV_PIX_FMT_RGBA. - */ -#define AV_PIX_FMT_FLAG_ALPHA (1 << 7) - -/** - * Read a line from an image, and write the values of the - * pixel format component c to dst. - * - * @param data the array containing the pointers to the planes of the image - * @param linesize the array containing the linesizes of the image - * @param desc the pixel format descriptor for the image - * @param x the horizontal coordinate of the first pixel to read - * @param y the vertical coordinate of the first pixel to read - * @param w the width of the line to read, that is the number of - * values to write to dst - * @param read_pal_component if not zero and the format is a paletted - * format writes the values corresponding to the palette - * component c in data[1] to dst, rather than the palette indexes in - * data[0]. The behavior is undefined if the format is not paletted. - */ -void av_read_image_line(uint16_t *dst, const uint8_t *data[4], - const int linesize[4], const AVPixFmtDescriptor *desc, - int x, int y, int c, int w, int read_pal_component); - -/** - * Write the values from src to the pixel format component c of an - * image line. - * - * @param src array containing the values to write - * @param data the array containing the pointers to the planes of the - * image to write into. It is supposed to be zeroed. - * @param linesize the array containing the linesizes of the image - * @param desc the pixel format descriptor for the image - * @param x the horizontal coordinate of the first pixel to write - * @param y the vertical coordinate of the first pixel to write - * @param w the width of the line to write, that is the number of - * values to write to the image line - */ -void av_write_image_line(const uint16_t *src, uint8_t *data[4], - const int linesize[4], const AVPixFmtDescriptor *desc, - int x, int y, int c, int w); - -/** - * Return the pixel format corresponding to name. - * - * If there is no pixel format with name name, then looks for a - * pixel format with the name corresponding to the native endian - * format of name. - * For example in a little-endian system, first looks for "gray16", - * then for "gray16le". - * - * Finally if no pixel format has been found, returns AV_PIX_FMT_NONE. - */ -enum AVPixelFormat av_get_pix_fmt(const char *name); - -/** - * Return the short name for a pixel format, NULL in case pix_fmt is - * unknown. - * - * @see av_get_pix_fmt(), av_get_pix_fmt_string() - */ -const char *av_get_pix_fmt_name(enum AVPixelFormat pix_fmt); - -/** - * Print in buf the string corresponding to the pixel format with - * number pix_fmt, or a header if pix_fmt is negative. - * - * @param buf the buffer where to write the string - * @param buf_size the size of buf - * @param pix_fmt the number of the pixel format to print the - * corresponding info string, or a negative value to print the - * corresponding header. - */ -char *av_get_pix_fmt_string(char *buf, int buf_size, - enum AVPixelFormat pix_fmt); - -/** - * Return the number of bits per pixel used by the pixel format - * described by pixdesc. Note that this is not the same as the number - * of bits per sample. - * - * The returned number of bits refers to the number of bits actually - * used for storing the pixel information, that is padding bits are - * not counted. - */ -int av_get_bits_per_pixel(const AVPixFmtDescriptor *pixdesc); - -/** - * Return the number of bits per pixel for the pixel format - * described by pixdesc, including any padding or unused bits. - */ -int av_get_padded_bits_per_pixel(const AVPixFmtDescriptor *pixdesc); - -/** - * @return a pixel format descriptor for provided pixel format or NULL if - * this pixel format is unknown. - */ -const AVPixFmtDescriptor *av_pix_fmt_desc_get(enum AVPixelFormat pix_fmt); - -/** - * Iterate over all pixel format descriptors known to libavutil. - * - * @param prev previous descriptor. NULL to get the first descriptor. - * - * @return next descriptor or NULL after the last descriptor - */ -const AVPixFmtDescriptor *av_pix_fmt_desc_next(const AVPixFmtDescriptor *prev); - -/** - * @return an AVPixelFormat id described by desc, or AV_PIX_FMT_NONE if desc - * is not a valid pointer to a pixel format descriptor. - */ -enum AVPixelFormat av_pix_fmt_desc_get_id(const AVPixFmtDescriptor *desc); - -/** - * Utility function to access log2_chroma_w log2_chroma_h from - * the pixel format AVPixFmtDescriptor. - * - * See av_get_chroma_sub_sample() for a function that asserts a - * valid pixel format instead of returning an error code. - * Its recommended that you use avcodec_get_chroma_sub_sample unless - * you do check the return code! - * - * @param[in] pix_fmt the pixel format - * @param[out] h_shift store log2_chroma_w (horizontal/width shift) - * @param[out] v_shift store log2_chroma_h (vertical/height shift) - * - * @return 0 on success, AVERROR(ENOSYS) on invalid or unknown pixel format - */ -int av_pix_fmt_get_chroma_sub_sample(enum AVPixelFormat pix_fmt, - int *h_shift, int *v_shift); - -/** - * @return number of planes in pix_fmt, a negative AVERROR if pix_fmt is not a - * valid pixel format. - */ -int av_pix_fmt_count_planes(enum AVPixelFormat pix_fmt); - -/** - * Utility function to swap the endianness of a pixel format. - * - * @param[in] pix_fmt the pixel format - * - * @return pixel format with swapped endianness if it exists, - * otherwise AV_PIX_FMT_NONE - */ -enum AVPixelFormat av_pix_fmt_swap_endianness(enum AVPixelFormat pix_fmt); - -#define FF_LOSS_RESOLUTION 0x0001 /**< loss due to resolution change */ -#define FF_LOSS_DEPTH 0x0002 /**< loss due to color depth change */ -#define FF_LOSS_COLORSPACE 0x0004 /**< loss due to color space conversion */ -#define FF_LOSS_ALPHA 0x0008 /**< loss of alpha bits */ -#define FF_LOSS_COLORQUANT 0x0010 /**< loss due to color quantization */ -#define FF_LOSS_CHROMA 0x0020 /**< loss of chroma (e.g. RGB to gray conversion) */ - -/** - * Compute what kind of losses will occur when converting from one specific - * pixel format to another. - * When converting from one pixel format to another, information loss may occur. - * For example, when converting from RGB24 to GRAY, the color information will - * be lost. Similarly, other losses occur when converting from some formats to - * other formats. These losses can involve loss of chroma, but also loss of - * resolution, loss of color depth, loss due to the color space conversion, loss - * of the alpha bits or loss due to color quantization. - * av_get_fix_fmt_loss() informs you about the various types of losses - * which will occur when converting from one pixel format to another. - * - * @param[in] dst_pix_fmt destination pixel format - * @param[in] src_pix_fmt source pixel format - * @param[in] has_alpha Whether the source pixel format alpha channel is used. - * @return Combination of flags informing you what kind of losses will occur - * (maximum loss for an invalid dst_pix_fmt). - */ -int av_get_pix_fmt_loss(enum AVPixelFormat dst_pix_fmt, - enum AVPixelFormat src_pix_fmt, - int has_alpha); - -/** - * Compute what kind of losses will occur when converting from one specific - * pixel format to another. - * When converting from one pixel format to another, information loss may occur. - * For example, when converting from RGB24 to GRAY, the color information will - * be lost. Similarly, other losses occur when converting from some formats to - * other formats. These losses can involve loss of chroma, but also loss of - * resolution, loss of color depth, loss due to the color space conversion, loss - * of the alpha bits or loss due to color quantization. - * av_get_fix_fmt_loss() informs you about the various types of losses - * which will occur when converting from one pixel format to another. - * - * @param[in] dst_pix_fmt destination pixel format - * @param[in] src_pix_fmt source pixel format - * @param[in] has_alpha Whether the source pixel format alpha channel is used. - * @return Combination of flags informing you what kind of losses will occur - * (maximum loss for an invalid dst_pix_fmt). - */ -enum AVPixelFormat av_find_best_pix_fmt_of_2(enum AVPixelFormat dst_pix_fmt1, enum AVPixelFormat dst_pix_fmt2, - enum AVPixelFormat src_pix_fmt, int has_alpha, int *loss_ptr); - -/** - * @return the name for provided color range or NULL if unknown. - */ -const char *av_color_range_name(enum AVColorRange range); - -/** - * @return the name for provided color primaries or NULL if unknown. - */ -const char *av_color_primaries_name(enum AVColorPrimaries primaries); - -/** - * @return the name for provided color transfer or NULL if unknown. - */ -const char *av_color_transfer_name(enum AVColorTransferCharacteristic transfer); - -/** - * @return the name for provided color space or NULL if unknown. - */ -const char *av_color_space_name(enum AVColorSpace space); - -/** - * @return the name for provided chroma location or NULL if unknown. - */ -const char *av_chroma_location_name(enum AVChromaLocation location); - -#endif /* AVUTIL_PIXDESC_H */ diff --git a/ext/at3_standalone/pixfmt.h b/ext/at3_standalone/pixfmt.h deleted file mode 100644 index 0a4fa6681f..0000000000 --- a/ext/at3_standalone/pixfmt.h +++ /dev/null @@ -1,473 +0,0 @@ -/* - * copyright (c) 2006 Michael Niedermayer - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef AVUTIL_PIXFMT_H -#define AVUTIL_PIXFMT_H - -/** - * @file - * pixel format definitions - * - */ - -// #include "libavutil/avconfig.h" -#include "version.h" - -#define AVPALETTE_SIZE 1024 -#define AVPALETTE_COUNT 256 - -/** - * Pixel format. - * - * @note - * AV_PIX_FMT_RGB32 is handled in an endian-specific manner. An RGBA - * color is put together as: - * (A << 24) | (R << 16) | (G << 8) | B - * This is stored as BGRA on little-endian CPU architectures and ARGB on - * big-endian CPUs. - * - * @par - * When the pixel format is palettized RGB32 (AV_PIX_FMT_PAL8), the palettized - * image data is stored in AVFrame.data[0]. The palette is transported in - * AVFrame.data[1], is 1024 bytes long (256 4-byte entries) and is - * formatted the same as in AV_PIX_FMT_RGB32 described above (i.e., it is - * also endian-specific). Note also that the individual RGB32 palette - * components stored in AVFrame.data[1] should be in the range 0..255. - * This is important as many custom PAL8 video codecs that were designed - * to run on the IBM VGA graphics adapter use 6-bit palette components. - * - * @par - * For all the 8bit per pixel formats, an RGB32 palette is in data[1] like - * for pal8. This palette is filled in automatically by the function - * allocating the picture. - */ -enum AVPixelFormat { - AV_PIX_FMT_NONE = -1, - AV_PIX_FMT_YUV420P, ///< planar YUV 4:2:0, 12bpp, (1 Cr & Cb sample per 2x2 Y samples) - AV_PIX_FMT_YUYV422, ///< packed YUV 4:2:2, 16bpp, Y0 Cb Y1 Cr - AV_PIX_FMT_RGB24, ///< packed RGB 8:8:8, 24bpp, RGBRGB... - AV_PIX_FMT_BGR24, ///< packed RGB 8:8:8, 24bpp, BGRBGR... - AV_PIX_FMT_YUV422P, ///< planar YUV 4:2:2, 16bpp, (1 Cr & Cb sample per 2x1 Y samples) - AV_PIX_FMT_YUV444P, ///< planar YUV 4:4:4, 24bpp, (1 Cr & Cb sample per 1x1 Y samples) - AV_PIX_FMT_YUV410P, ///< planar YUV 4:1:0, 9bpp, (1 Cr & Cb sample per 4x4 Y samples) - AV_PIX_FMT_YUV411P, ///< planar YUV 4:1:1, 12bpp, (1 Cr & Cb sample per 4x1 Y samples) - AV_PIX_FMT_GRAY8, ///< Y , 8bpp - AV_PIX_FMT_MONOWHITE, ///< Y , 1bpp, 0 is white, 1 is black, in each byte pixels are ordered from the msb to the lsb - AV_PIX_FMT_MONOBLACK, ///< Y , 1bpp, 0 is black, 1 is white, in each byte pixels are ordered from the msb to the lsb - AV_PIX_FMT_PAL8, ///< 8 bit with AV_PIX_FMT_RGB32 palette - AV_PIX_FMT_YUVJ420P, ///< planar YUV 4:2:0, 12bpp, full scale (JPEG), deprecated in favor of AV_PIX_FMT_YUV420P and setting color_range - AV_PIX_FMT_YUVJ422P, ///< planar YUV 4:2:2, 16bpp, full scale (JPEG), deprecated in favor of AV_PIX_FMT_YUV422P and setting color_range - AV_PIX_FMT_YUVJ444P, ///< planar YUV 4:4:4, 24bpp, full scale (JPEG), deprecated in favor of AV_PIX_FMT_YUV444P and setting color_range -#if FF_API_XVMC - AV_PIX_FMT_XVMC_MPEG2_MC,///< XVideo Motion Acceleration via common packet passing - AV_PIX_FMT_XVMC_MPEG2_IDCT, -#define AV_PIX_FMT_XVMC AV_PIX_FMT_XVMC_MPEG2_IDCT -#endif /* FF_API_XVMC */ - AV_PIX_FMT_UYVY422, ///< packed YUV 4:2:2, 16bpp, Cb Y0 Cr Y1 - AV_PIX_FMT_UYYVYY411, ///< packed YUV 4:1:1, 12bpp, Cb Y0 Y1 Cr Y2 Y3 - AV_PIX_FMT_BGR8, ///< packed RGB 3:3:2, 8bpp, (msb)2B 3G 3R(lsb) - AV_PIX_FMT_BGR4, ///< packed RGB 1:2:1 bitstream, 4bpp, (msb)1B 2G 1R(lsb), a byte contains two pixels, the first pixel in the byte is the one composed by the 4 msb bits - AV_PIX_FMT_BGR4_BYTE, ///< packed RGB 1:2:1, 8bpp, (msb)1B 2G 1R(lsb) - AV_PIX_FMT_RGB8, ///< packed RGB 3:3:2, 8bpp, (msb)2R 3G 3B(lsb) - AV_PIX_FMT_RGB4, ///< packed RGB 1:2:1 bitstream, 4bpp, (msb)1R 2G 1B(lsb), a byte contains two pixels, the first pixel in the byte is the one composed by the 4 msb bits - AV_PIX_FMT_RGB4_BYTE, ///< packed RGB 1:2:1, 8bpp, (msb)1R 2G 1B(lsb) - AV_PIX_FMT_NV12, ///< planar YUV 4:2:0, 12bpp, 1 plane for Y and 1 plane for the UV components, which are interleaved (first byte U and the following byte V) - AV_PIX_FMT_NV21, ///< as above, but U and V bytes are swapped - - AV_PIX_FMT_ARGB, ///< packed ARGB 8:8:8:8, 32bpp, ARGBARGB... - AV_PIX_FMT_RGBA, ///< packed RGBA 8:8:8:8, 32bpp, RGBARGBA... - AV_PIX_FMT_ABGR, ///< packed ABGR 8:8:8:8, 32bpp, ABGRABGR... - AV_PIX_FMT_BGRA, ///< packed BGRA 8:8:8:8, 32bpp, BGRABGRA... - - AV_PIX_FMT_GRAY16BE, ///< Y , 16bpp, big-endian - AV_PIX_FMT_GRAY16LE, ///< Y , 16bpp, little-endian - AV_PIX_FMT_YUV440P, ///< planar YUV 4:4:0 (1 Cr & Cb sample per 1x2 Y samples) - AV_PIX_FMT_YUVJ440P, ///< planar YUV 4:4:0 full scale (JPEG), deprecated in favor of AV_PIX_FMT_YUV440P and setting color_range - AV_PIX_FMT_YUVA420P, ///< planar YUV 4:2:0, 20bpp, (1 Cr & Cb sample per 2x2 Y & A samples) -#if FF_API_VDPAU - AV_PIX_FMT_VDPAU_H264,///< H.264 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers - AV_PIX_FMT_VDPAU_MPEG1,///< MPEG-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers - AV_PIX_FMT_VDPAU_MPEG2,///< MPEG-2 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers - AV_PIX_FMT_VDPAU_WMV3,///< WMV3 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers - AV_PIX_FMT_VDPAU_VC1, ///< VC-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers -#endif - AV_PIX_FMT_RGB48BE, ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as big-endian - AV_PIX_FMT_RGB48LE, ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as little-endian - - AV_PIX_FMT_RGB565BE, ///< packed RGB 5:6:5, 16bpp, (msb) 5R 6G 5B(lsb), big-endian - AV_PIX_FMT_RGB565LE, ///< packed RGB 5:6:5, 16bpp, (msb) 5R 6G 5B(lsb), little-endian - AV_PIX_FMT_RGB555BE, ///< packed RGB 5:5:5, 16bpp, (msb)1X 5R 5G 5B(lsb), big-endian , X=unused/undefined - AV_PIX_FMT_RGB555LE, ///< packed RGB 5:5:5, 16bpp, (msb)1X 5R 5G 5B(lsb), little-endian, X=unused/undefined - - AV_PIX_FMT_BGR565BE, ///< packed BGR 5:6:5, 16bpp, (msb) 5B 6G 5R(lsb), big-endian - AV_PIX_FMT_BGR565LE, ///< packed BGR 5:6:5, 16bpp, (msb) 5B 6G 5R(lsb), little-endian - AV_PIX_FMT_BGR555BE, ///< packed BGR 5:5:5, 16bpp, (msb)1X 5B 5G 5R(lsb), big-endian , X=unused/undefined - AV_PIX_FMT_BGR555LE, ///< packed BGR 5:5:5, 16bpp, (msb)1X 5B 5G 5R(lsb), little-endian, X=unused/undefined - -#if FF_API_VAAPI - /** @name Deprecated pixel formats */ - /**@{*/ - AV_PIX_FMT_VAAPI_MOCO, ///< HW acceleration through VA API at motion compensation entry-point, Picture.data[3] contains a vaapi_render_state struct which contains macroblocks as well as various fields extracted from headers - AV_PIX_FMT_VAAPI_IDCT, ///< HW acceleration through VA API at IDCT entry-point, Picture.data[3] contains a vaapi_render_state struct which contains fields extracted from headers - AV_PIX_FMT_VAAPI_VLD, ///< HW decoding through VA API, Picture.data[3] contains a vaapi_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers - /**@}*/ - AV_PIX_FMT_VAAPI = AV_PIX_FMT_VAAPI_VLD, -#else - /** - * Hardware acceleration through VA-API, data[3] contains a - * VASurfaceID. - */ - AV_PIX_FMT_VAAPI, -#endif - - AV_PIX_FMT_YUV420P16LE, ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian - AV_PIX_FMT_YUV420P16BE, ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian - AV_PIX_FMT_YUV422P16LE, ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian - AV_PIX_FMT_YUV422P16BE, ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian - AV_PIX_FMT_YUV444P16LE, ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian - AV_PIX_FMT_YUV444P16BE, ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian -#if FF_API_VDPAU - AV_PIX_FMT_VDPAU_MPEG4, ///< MPEG4 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers -#endif - AV_PIX_FMT_DXVA2_VLD, ///< HW decoding through DXVA2, Picture.data[3] contains a LPDIRECT3DSURFACE9 pointer - - AV_PIX_FMT_RGB444LE, ///< packed RGB 4:4:4, 16bpp, (msb)4X 4R 4G 4B(lsb), little-endian, X=unused/undefined - AV_PIX_FMT_RGB444BE, ///< packed RGB 4:4:4, 16bpp, (msb)4X 4R 4G 4B(lsb), big-endian, X=unused/undefined - AV_PIX_FMT_BGR444LE, ///< packed BGR 4:4:4, 16bpp, (msb)4X 4B 4G 4R(lsb), little-endian, X=unused/undefined - AV_PIX_FMT_BGR444BE, ///< packed BGR 4:4:4, 16bpp, (msb)4X 4B 4G 4R(lsb), big-endian, X=unused/undefined - AV_PIX_FMT_YA8, ///< 8bit gray, 8bit alpha - - AV_PIX_FMT_Y400A = AV_PIX_FMT_YA8, ///< alias for AV_PIX_FMT_YA8 - AV_PIX_FMT_GRAY8A= AV_PIX_FMT_YA8, ///< alias for AV_PIX_FMT_YA8 - - AV_PIX_FMT_BGR48BE, ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as big-endian - AV_PIX_FMT_BGR48LE, ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as little-endian - - /** - * The following 12 formats have the disadvantage of needing 1 format for each bit depth. - * Notice that each 9/10 bits sample is stored in 16 bits with extra padding. - * If you want to support multiple bit depths, then using AV_PIX_FMT_YUV420P16* with the bpp stored separately is better. - */ - AV_PIX_FMT_YUV420P9BE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian - AV_PIX_FMT_YUV420P9LE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian - AV_PIX_FMT_YUV420P10BE,///< planar YUV 4:2:0, 15bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian - AV_PIX_FMT_YUV420P10LE,///< planar YUV 4:2:0, 15bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian - AV_PIX_FMT_YUV422P10BE,///< planar YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian - AV_PIX_FMT_YUV422P10LE,///< planar YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian - AV_PIX_FMT_YUV444P9BE, ///< planar YUV 4:4:4, 27bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian - AV_PIX_FMT_YUV444P9LE, ///< planar YUV 4:4:4, 27bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian - AV_PIX_FMT_YUV444P10BE,///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian - AV_PIX_FMT_YUV444P10LE,///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian - AV_PIX_FMT_YUV422P9BE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian - AV_PIX_FMT_YUV422P9LE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian - AV_PIX_FMT_VDA_VLD, ///< hardware decoding through VDA - AV_PIX_FMT_GBRP, ///< planar GBR 4:4:4 24bpp - AV_PIX_FMT_GBRP9BE, ///< planar GBR 4:4:4 27bpp, big-endian - AV_PIX_FMT_GBRP9LE, ///< planar GBR 4:4:4 27bpp, little-endian - AV_PIX_FMT_GBRP10BE, ///< planar GBR 4:4:4 30bpp, big-endian - AV_PIX_FMT_GBRP10LE, ///< planar GBR 4:4:4 30bpp, little-endian - AV_PIX_FMT_GBRP16BE, ///< planar GBR 4:4:4 48bpp, big-endian - AV_PIX_FMT_GBRP16LE, ///< planar GBR 4:4:4 48bpp, little-endian - AV_PIX_FMT_YUVA422P, ///< planar YUV 4:2:2 24bpp, (1 Cr & Cb sample per 2x1 Y & A samples) - AV_PIX_FMT_YUVA444P, ///< planar YUV 4:4:4 32bpp, (1 Cr & Cb sample per 1x1 Y & A samples) - AV_PIX_FMT_YUVA420P9BE, ///< planar YUV 4:2:0 22.5bpp, (1 Cr & Cb sample per 2x2 Y & A samples), big-endian - AV_PIX_FMT_YUVA420P9LE, ///< planar YUV 4:2:0 22.5bpp, (1 Cr & Cb sample per 2x2 Y & A samples), little-endian - AV_PIX_FMT_YUVA422P9BE, ///< planar YUV 4:2:2 27bpp, (1 Cr & Cb sample per 2x1 Y & A samples), big-endian - AV_PIX_FMT_YUVA422P9LE, ///< planar YUV 4:2:2 27bpp, (1 Cr & Cb sample per 2x1 Y & A samples), little-endian - AV_PIX_FMT_YUVA444P9BE, ///< planar YUV 4:4:4 36bpp, (1 Cr & Cb sample per 1x1 Y & A samples), big-endian - AV_PIX_FMT_YUVA444P9LE, ///< planar YUV 4:4:4 36bpp, (1 Cr & Cb sample per 1x1 Y & A samples), little-endian - AV_PIX_FMT_YUVA420P10BE, ///< planar YUV 4:2:0 25bpp, (1 Cr & Cb sample per 2x2 Y & A samples, big-endian) - AV_PIX_FMT_YUVA420P10LE, ///< planar YUV 4:2:0 25bpp, (1 Cr & Cb sample per 2x2 Y & A samples, little-endian) - AV_PIX_FMT_YUVA422P10BE, ///< planar YUV 4:2:2 30bpp, (1 Cr & Cb sample per 2x1 Y & A samples, big-endian) - AV_PIX_FMT_YUVA422P10LE, ///< planar YUV 4:2:2 30bpp, (1 Cr & Cb sample per 2x1 Y & A samples, little-endian) - AV_PIX_FMT_YUVA444P10BE, ///< planar YUV 4:4:4 40bpp, (1 Cr & Cb sample per 1x1 Y & A samples, big-endian) - AV_PIX_FMT_YUVA444P10LE, ///< planar YUV 4:4:4 40bpp, (1 Cr & Cb sample per 1x1 Y & A samples, little-endian) - AV_PIX_FMT_YUVA420P16BE, ///< planar YUV 4:2:0 40bpp, (1 Cr & Cb sample per 2x2 Y & A samples, big-endian) - AV_PIX_FMT_YUVA420P16LE, ///< planar YUV 4:2:0 40bpp, (1 Cr & Cb sample per 2x2 Y & A samples, little-endian) - AV_PIX_FMT_YUVA422P16BE, ///< planar YUV 4:2:2 48bpp, (1 Cr & Cb sample per 2x1 Y & A samples, big-endian) - AV_PIX_FMT_YUVA422P16LE, ///< planar YUV 4:2:2 48bpp, (1 Cr & Cb sample per 2x1 Y & A samples, little-endian) - AV_PIX_FMT_YUVA444P16BE, ///< planar YUV 4:4:4 64bpp, (1 Cr & Cb sample per 1x1 Y & A samples, big-endian) - AV_PIX_FMT_YUVA444P16LE, ///< planar YUV 4:4:4 64bpp, (1 Cr & Cb sample per 1x1 Y & A samples, little-endian) - - AV_PIX_FMT_VDPAU, ///< HW acceleration through VDPAU, Picture.data[3] contains a VdpVideoSurface - - AV_PIX_FMT_XYZ12LE, ///< packed XYZ 4:4:4, 36 bpp, (msb) 12X, 12Y, 12Z (lsb), the 2-byte value for each X/Y/Z is stored as little-endian, the 4 lower bits are set to 0 - AV_PIX_FMT_XYZ12BE, ///< packed XYZ 4:4:4, 36 bpp, (msb) 12X, 12Y, 12Z (lsb), the 2-byte value for each X/Y/Z is stored as big-endian, the 4 lower bits are set to 0 - AV_PIX_FMT_NV16, ///< interleaved chroma YUV 4:2:2, 16bpp, (1 Cr & Cb sample per 2x1 Y samples) - AV_PIX_FMT_NV20LE, ///< interleaved chroma YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian - AV_PIX_FMT_NV20BE, ///< interleaved chroma YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian - - AV_PIX_FMT_RGBA64BE, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian - AV_PIX_FMT_RGBA64LE, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian - AV_PIX_FMT_BGRA64BE, ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian - AV_PIX_FMT_BGRA64LE, ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian - - AV_PIX_FMT_YVYU422, ///< packed YUV 4:2:2, 16bpp, Y0 Cr Y1 Cb - - AV_PIX_FMT_VDA, ///< HW acceleration through VDA, data[3] contains a CVPixelBufferRef - - AV_PIX_FMT_YA16BE, ///< 16bit gray, 16bit alpha (big-endian) - AV_PIX_FMT_YA16LE, ///< 16bit gray, 16bit alpha (little-endian) - - AV_PIX_FMT_GBRAP, ///< planar GBRA 4:4:4:4 32bpp - AV_PIX_FMT_GBRAP16BE, ///< planar GBRA 4:4:4:4 64bpp, big-endian - AV_PIX_FMT_GBRAP16LE, ///< planar GBRA 4:4:4:4 64bpp, little-endian - /** - * HW acceleration through QSV, data[3] contains a pointer to the - * mfxFrameSurface1 structure. - */ - AV_PIX_FMT_QSV, - /** - * HW acceleration though MMAL, data[3] contains a pointer to the - * MMAL_BUFFER_HEADER_T structure. - */ - AV_PIX_FMT_MMAL, - - AV_PIX_FMT_D3D11VA_VLD, ///< HW decoding through Direct3D11, Picture.data[3] contains a ID3D11VideoDecoderOutputView pointer - - AV_PIX_FMT_0RGB=0x123+4,///< packed RGB 8:8:8, 32bpp, XRGBXRGB... X=unused/undefined - AV_PIX_FMT_RGB0, ///< packed RGB 8:8:8, 32bpp, RGBXRGBX... X=unused/undefined - AV_PIX_FMT_0BGR, ///< packed BGR 8:8:8, 32bpp, XBGRXBGR... X=unused/undefined - AV_PIX_FMT_BGR0, ///< packed BGR 8:8:8, 32bpp, BGRXBGRX... X=unused/undefined - - AV_PIX_FMT_YUV420P12BE, ///< planar YUV 4:2:0,18bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian - AV_PIX_FMT_YUV420P12LE, ///< planar YUV 4:2:0,18bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian - AV_PIX_FMT_YUV420P14BE, ///< planar YUV 4:2:0,21bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian - AV_PIX_FMT_YUV420P14LE, ///< planar YUV 4:2:0,21bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian - AV_PIX_FMT_YUV422P12BE, ///< planar YUV 4:2:2,24bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian - AV_PIX_FMT_YUV422P12LE, ///< planar YUV 4:2:2,24bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian - AV_PIX_FMT_YUV422P14BE, ///< planar YUV 4:2:2,28bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian - AV_PIX_FMT_YUV422P14LE, ///< planar YUV 4:2:2,28bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian - AV_PIX_FMT_YUV444P12BE, ///< planar YUV 4:4:4,36bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian - AV_PIX_FMT_YUV444P12LE, ///< planar YUV 4:4:4,36bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian - AV_PIX_FMT_YUV444P14BE, ///< planar YUV 4:4:4,42bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian - AV_PIX_FMT_YUV444P14LE, ///< planar YUV 4:4:4,42bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian - AV_PIX_FMT_GBRP12BE, ///< planar GBR 4:4:4 36bpp, big-endian - AV_PIX_FMT_GBRP12LE, ///< planar GBR 4:4:4 36bpp, little-endian - AV_PIX_FMT_GBRP14BE, ///< planar GBR 4:4:4 42bpp, big-endian - AV_PIX_FMT_GBRP14LE, ///< planar GBR 4:4:4 42bpp, little-endian - AV_PIX_FMT_YUVJ411P, ///< planar YUV 4:1:1, 12bpp, (1 Cr & Cb sample per 4x1 Y samples) full scale (JPEG), deprecated in favor of AV_PIX_FMT_YUV411P and setting color_range - - AV_PIX_FMT_BAYER_BGGR8, ///< bayer, BGBG..(odd line), GRGR..(even line), 8-bit samples */ - AV_PIX_FMT_BAYER_RGGB8, ///< bayer, RGRG..(odd line), GBGB..(even line), 8-bit samples */ - AV_PIX_FMT_BAYER_GBRG8, ///< bayer, GBGB..(odd line), RGRG..(even line), 8-bit samples */ - AV_PIX_FMT_BAYER_GRBG8, ///< bayer, GRGR..(odd line), BGBG..(even line), 8-bit samples */ - AV_PIX_FMT_BAYER_BGGR16LE, ///< bayer, BGBG..(odd line), GRGR..(even line), 16-bit samples, little-endian */ - AV_PIX_FMT_BAYER_BGGR16BE, ///< bayer, BGBG..(odd line), GRGR..(even line), 16-bit samples, big-endian */ - AV_PIX_FMT_BAYER_RGGB16LE, ///< bayer, RGRG..(odd line), GBGB..(even line), 16-bit samples, little-endian */ - AV_PIX_FMT_BAYER_RGGB16BE, ///< bayer, RGRG..(odd line), GBGB..(even line), 16-bit samples, big-endian */ - AV_PIX_FMT_BAYER_GBRG16LE, ///< bayer, GBGB..(odd line), RGRG..(even line), 16-bit samples, little-endian */ - AV_PIX_FMT_BAYER_GBRG16BE, ///< bayer, GBGB..(odd line), RGRG..(even line), 16-bit samples, big-endian */ - AV_PIX_FMT_BAYER_GRBG16LE, ///< bayer, GRGR..(odd line), BGBG..(even line), 16-bit samples, little-endian */ - AV_PIX_FMT_BAYER_GRBG16BE, ///< bayer, GRGR..(odd line), BGBG..(even line), 16-bit samples, big-endian */ -#if !FF_API_XVMC - AV_PIX_FMT_XVMC,///< XVideo Motion Acceleration via common packet passing -#endif /* !FF_API_XVMC */ - AV_PIX_FMT_YUV440P10LE, ///< planar YUV 4:4:0,20bpp, (1 Cr & Cb sample per 1x2 Y samples), little-endian - AV_PIX_FMT_YUV440P10BE, ///< planar YUV 4:4:0,20bpp, (1 Cr & Cb sample per 1x2 Y samples), big-endian - AV_PIX_FMT_YUV440P12LE, ///< planar YUV 4:4:0,24bpp, (1 Cr & Cb sample per 1x2 Y samples), little-endian - AV_PIX_FMT_YUV440P12BE, ///< planar YUV 4:4:0,24bpp, (1 Cr & Cb sample per 1x2 Y samples), big-endian - AV_PIX_FMT_AYUV64LE, ///< packed AYUV 4:4:4,64bpp (1 Cr & Cb sample per 1x1 Y & A samples), little-endian - AV_PIX_FMT_AYUV64BE, ///< packed AYUV 4:4:4,64bpp (1 Cr & Cb sample per 1x1 Y & A samples), big-endian - - AV_PIX_FMT_VIDEOTOOLBOX, ///< hardware decoding through Videotoolbox - - AV_PIX_FMT_P010LE, ///< like NV12, with 10bpp per component, data in the high bits, zeros in the low bits, little-endian - AV_PIX_FMT_P010BE, ///< like NV12, with 10bpp per component, data in the high bits, zeros in the low bits, big-endian - - AV_PIX_FMT_NB, ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions -}; - -#define AV_PIX_FMT_Y400A AV_PIX_FMT_GRAY8A -#define AV_PIX_FMT_GBR24P AV_PIX_FMT_GBRP - -#if AV_HAVE_BIGENDIAN -# define AV_PIX_FMT_NE(be, le) AV_PIX_FMT_##be -#else -# define AV_PIX_FMT_NE(be, le) AV_PIX_FMT_##le -#endif - -#define AV_PIX_FMT_RGB32 AV_PIX_FMT_NE(ARGB, BGRA) -#define AV_PIX_FMT_RGB32_1 AV_PIX_FMT_NE(RGBA, ABGR) -#define AV_PIX_FMT_BGR32 AV_PIX_FMT_NE(ABGR, RGBA) -#define AV_PIX_FMT_BGR32_1 AV_PIX_FMT_NE(BGRA, ARGB) -#define AV_PIX_FMT_0RGB32 AV_PIX_FMT_NE(0RGB, BGR0) -#define AV_PIX_FMT_0BGR32 AV_PIX_FMT_NE(0BGR, RGB0) - -#define AV_PIX_FMT_GRAY16 AV_PIX_FMT_NE(GRAY16BE, GRAY16LE) -#define AV_PIX_FMT_YA16 AV_PIX_FMT_NE(YA16BE, YA16LE) -#define AV_PIX_FMT_RGB48 AV_PIX_FMT_NE(RGB48BE, RGB48LE) -#define AV_PIX_FMT_RGB565 AV_PIX_FMT_NE(RGB565BE, RGB565LE) -#define AV_PIX_FMT_RGB555 AV_PIX_FMT_NE(RGB555BE, RGB555LE) -#define AV_PIX_FMT_RGB444 AV_PIX_FMT_NE(RGB444BE, RGB444LE) -#define AV_PIX_FMT_RGBA64 AV_PIX_FMT_NE(RGBA64BE, RGBA64LE) -#define AV_PIX_FMT_BGR48 AV_PIX_FMT_NE(BGR48BE, BGR48LE) -#define AV_PIX_FMT_BGR565 AV_PIX_FMT_NE(BGR565BE, BGR565LE) -#define AV_PIX_FMT_BGR555 AV_PIX_FMT_NE(BGR555BE, BGR555LE) -#define AV_PIX_FMT_BGR444 AV_PIX_FMT_NE(BGR444BE, BGR444LE) -#define AV_PIX_FMT_BGRA64 AV_PIX_FMT_NE(BGRA64BE, BGRA64LE) - -#define AV_PIX_FMT_YUV420P9 AV_PIX_FMT_NE(YUV420P9BE , YUV420P9LE) -#define AV_PIX_FMT_YUV422P9 AV_PIX_FMT_NE(YUV422P9BE , YUV422P9LE) -#define AV_PIX_FMT_YUV444P9 AV_PIX_FMT_NE(YUV444P9BE , YUV444P9LE) -#define AV_PIX_FMT_YUV420P10 AV_PIX_FMT_NE(YUV420P10BE, YUV420P10LE) -#define AV_PIX_FMT_YUV422P10 AV_PIX_FMT_NE(YUV422P10BE, YUV422P10LE) -#define AV_PIX_FMT_YUV440P10 AV_PIX_FMT_NE(YUV440P10BE, YUV440P10LE) -#define AV_PIX_FMT_YUV444P10 AV_PIX_FMT_NE(YUV444P10BE, YUV444P10LE) -#define AV_PIX_FMT_YUV420P12 AV_PIX_FMT_NE(YUV420P12BE, YUV420P12LE) -#define AV_PIX_FMT_YUV422P12 AV_PIX_FMT_NE(YUV422P12BE, YUV422P12LE) -#define AV_PIX_FMT_YUV440P12 AV_PIX_FMT_NE(YUV440P12BE, YUV440P12LE) -#define AV_PIX_FMT_YUV444P12 AV_PIX_FMT_NE(YUV444P12BE, YUV444P12LE) -#define AV_PIX_FMT_YUV420P14 AV_PIX_FMT_NE(YUV420P14BE, YUV420P14LE) -#define AV_PIX_FMT_YUV422P14 AV_PIX_FMT_NE(YUV422P14BE, YUV422P14LE) -#define AV_PIX_FMT_YUV444P14 AV_PIX_FMT_NE(YUV444P14BE, YUV444P14LE) -#define AV_PIX_FMT_YUV420P16 AV_PIX_FMT_NE(YUV420P16BE, YUV420P16LE) -#define AV_PIX_FMT_YUV422P16 AV_PIX_FMT_NE(YUV422P16BE, YUV422P16LE) -#define AV_PIX_FMT_YUV444P16 AV_PIX_FMT_NE(YUV444P16BE, YUV444P16LE) - -#define AV_PIX_FMT_GBRP9 AV_PIX_FMT_NE(GBRP9BE , GBRP9LE) -#define AV_PIX_FMT_GBRP10 AV_PIX_FMT_NE(GBRP10BE, GBRP10LE) -#define AV_PIX_FMT_GBRP12 AV_PIX_FMT_NE(GBRP12BE, GBRP12LE) -#define AV_PIX_FMT_GBRP14 AV_PIX_FMT_NE(GBRP14BE, GBRP14LE) -#define AV_PIX_FMT_GBRP16 AV_PIX_FMT_NE(GBRP16BE, GBRP16LE) -#define AV_PIX_FMT_GBRAP16 AV_PIX_FMT_NE(GBRAP16BE, GBRAP16LE) - -#define AV_PIX_FMT_BAYER_BGGR16 AV_PIX_FMT_NE(BAYER_BGGR16BE, BAYER_BGGR16LE) -#define AV_PIX_FMT_BAYER_RGGB16 AV_PIX_FMT_NE(BAYER_RGGB16BE, BAYER_RGGB16LE) -#define AV_PIX_FMT_BAYER_GBRG16 AV_PIX_FMT_NE(BAYER_GBRG16BE, BAYER_GBRG16LE) -#define AV_PIX_FMT_BAYER_GRBG16 AV_PIX_FMT_NE(BAYER_GRBG16BE, BAYER_GRBG16LE) - - -#define AV_PIX_FMT_YUVA420P9 AV_PIX_FMT_NE(YUVA420P9BE , YUVA420P9LE) -#define AV_PIX_FMT_YUVA422P9 AV_PIX_FMT_NE(YUVA422P9BE , YUVA422P9LE) -#define AV_PIX_FMT_YUVA444P9 AV_PIX_FMT_NE(YUVA444P9BE , YUVA444P9LE) -#define AV_PIX_FMT_YUVA420P10 AV_PIX_FMT_NE(YUVA420P10BE, YUVA420P10LE) -#define AV_PIX_FMT_YUVA422P10 AV_PIX_FMT_NE(YUVA422P10BE, YUVA422P10LE) -#define AV_PIX_FMT_YUVA444P10 AV_PIX_FMT_NE(YUVA444P10BE, YUVA444P10LE) -#define AV_PIX_FMT_YUVA420P16 AV_PIX_FMT_NE(YUVA420P16BE, YUVA420P16LE) -#define AV_PIX_FMT_YUVA422P16 AV_PIX_FMT_NE(YUVA422P16BE, YUVA422P16LE) -#define AV_PIX_FMT_YUVA444P16 AV_PIX_FMT_NE(YUVA444P16BE, YUVA444P16LE) - -#define AV_PIX_FMT_XYZ12 AV_PIX_FMT_NE(XYZ12BE, XYZ12LE) -#define AV_PIX_FMT_NV20 AV_PIX_FMT_NE(NV20BE, NV20LE) -#define AV_PIX_FMT_AYUV64 AV_PIX_FMT_NE(AYUV64BE, AYUV64LE) -#define AV_PIX_FMT_P010 AV_PIX_FMT_NE(P010BE, P010LE) - -/** - * Chromaticity coordinates of the source primaries. - */ -enum AVColorPrimaries { - AVCOL_PRI_RESERVED0 = 0, - AVCOL_PRI_BT709 = 1, ///< also ITU-R BT1361 / IEC 61966-2-4 / SMPTE RP177 Annex B - AVCOL_PRI_UNSPECIFIED = 2, - AVCOL_PRI_RESERVED = 3, - AVCOL_PRI_BT470M = 4, ///< also FCC Title 47 Code of Federal Regulations 73.682 (a)(20) - - AVCOL_PRI_BT470BG = 5, ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R BT1700 625 PAL & SECAM - AVCOL_PRI_SMPTE170M = 6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC - AVCOL_PRI_SMPTE240M = 7, ///< functionally identical to above - AVCOL_PRI_FILM = 8, ///< colour filters using Illuminant C - AVCOL_PRI_BT2020 = 9, ///< ITU-R BT2020 - AVCOL_PRI_SMPTEST428_1= 10, ///< SMPTE ST 428-1 (CIE 1931 XYZ) - AVCOL_PRI_NB, ///< Not part of ABI -}; - -/** - * Color Transfer Characteristic. - */ -enum AVColorTransferCharacteristic { - AVCOL_TRC_RESERVED0 = 0, - AVCOL_TRC_BT709 = 1, ///< also ITU-R BT1361 - AVCOL_TRC_UNSPECIFIED = 2, - AVCOL_TRC_RESERVED = 3, - AVCOL_TRC_GAMMA22 = 4, ///< also ITU-R BT470M / ITU-R BT1700 625 PAL & SECAM - AVCOL_TRC_GAMMA28 = 5, ///< also ITU-R BT470BG - AVCOL_TRC_SMPTE170M = 6, ///< also ITU-R BT601-6 525 or 625 / ITU-R BT1358 525 or 625 / ITU-R BT1700 NTSC - AVCOL_TRC_SMPTE240M = 7, - AVCOL_TRC_LINEAR = 8, ///< "Linear transfer characteristics" - AVCOL_TRC_LOG = 9, ///< "Logarithmic transfer characteristic (100:1 range)" - AVCOL_TRC_LOG_SQRT = 10, ///< "Logarithmic transfer characteristic (100 * Sqrt(10) : 1 range)" - AVCOL_TRC_IEC61966_2_4 = 11, ///< IEC 61966-2-4 - AVCOL_TRC_BT1361_ECG = 12, ///< ITU-R BT1361 Extended Colour Gamut - AVCOL_TRC_IEC61966_2_1 = 13, ///< IEC 61966-2-1 (sRGB or sYCC) - AVCOL_TRC_BT2020_10 = 14, ///< ITU-R BT2020 for 10 bit system - AVCOL_TRC_BT2020_12 = 15, ///< ITU-R BT2020 for 12 bit system - AVCOL_TRC_SMPTEST2084 = 16, ///< SMPTE ST 2084 for 10, 12, 14 and 16 bit systems - AVCOL_TRC_SMPTEST428_1 = 17, ///< SMPTE ST 428-1 - AVCOL_TRC_NB, ///< Not part of ABI -}; - -/** - * YUV colorspace type. - */ -enum AVColorSpace { - AVCOL_SPC_RGB = 0, ///< order of coefficients is actually GBR, also IEC 61966-2-1 (sRGB) - AVCOL_SPC_BT709 = 1, ///< also ITU-R BT1361 / IEC 61966-2-4 xvYCC709 / SMPTE RP177 Annex B - AVCOL_SPC_UNSPECIFIED = 2, - AVCOL_SPC_RESERVED = 3, - AVCOL_SPC_FCC = 4, ///< FCC Title 47 Code of Federal Regulations 73.682 (a)(20) - AVCOL_SPC_BT470BG = 5, ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R BT1700 625 PAL & SECAM / IEC 61966-2-4 xvYCC601 - AVCOL_SPC_SMPTE170M = 6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC / functionally identical to above - AVCOL_SPC_SMPTE240M = 7, - AVCOL_SPC_YCOCG = 8, ///< Used by Dirac / VC-2 and H.264 FRext, see ITU-T SG16 - AVCOL_SPC_BT2020_NCL = 9, ///< ITU-R BT2020 non-constant luminance system - AVCOL_SPC_BT2020_CL = 10, ///< ITU-R BT2020 constant luminance system - AVCOL_SPC_NB, ///< Not part of ABI -}; -#define AVCOL_SPC_YCGCO AVCOL_SPC_YCOCG - - -/** - * MPEG vs JPEG YUV range. - */ -enum AVColorRange { - AVCOL_RANGE_UNSPECIFIED = 0, - AVCOL_RANGE_MPEG = 1, ///< the normal 219*2^(n-8) "MPEG" YUV ranges - AVCOL_RANGE_JPEG = 2, ///< the normal 2^n-1 "JPEG" YUV ranges - AVCOL_RANGE_NB, ///< Not part of ABI -}; - -/** - * Location of chroma samples. - * - * Illustration showing the location of the first (top left) chroma sample of the - * image, the left shows only luma, the right - * shows the location of the chroma sample, the 2 could be imagined to overlay - * each other but are drawn separately due to limitations of ASCII - * - * 1st 2nd 1st 2nd horizontal luma sample positions - * v v v v - * ______ ______ - *1st luma line > |X X ... |3 4 X ... X are luma samples, - * | |1 2 1-6 are possible chroma positions - *2nd luma line > |X X ... |5 6 X ... 0 is undefined/unknown position - */ -enum AVChromaLocation { - AVCHROMA_LOC_UNSPECIFIED = 0, - AVCHROMA_LOC_LEFT = 1, ///< mpeg2/4 4:2:0, h264 default for 4:2:0 - AVCHROMA_LOC_CENTER = 2, ///< mpeg1 4:2:0, jpeg 4:2:0, h263 4:2:0 - AVCHROMA_LOC_TOPLEFT = 3, ///< ITU-R 601, SMPTE 274M 296M S314M(DV 4:1:1), mpeg2 4:2:2 - AVCHROMA_LOC_TOP = 4, - AVCHROMA_LOC_BOTTOMLEFT = 5, - AVCHROMA_LOC_BOTTOM = 6, - AVCHROMA_LOC_NB, ///< Not part of ABI -}; - -#endif /* AVUTIL_PIXFMT_H */ diff --git a/ext/at3_standalone/rdft.c b/ext/at3_standalone/rdft.c deleted file mode 100644 index 1e1fe96bef..0000000000 --- a/ext/at3_standalone/rdft.c +++ /dev/null @@ -1,136 +0,0 @@ -/* - * (I)RDFT transforms - * Copyright (c) 2009 Alex Converse - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ -#include -#include - -#include "mathematics.h" -#include "rdft.h" - -/** - * @file - * (Inverse) Real Discrete Fourier Transforms. - */ - -/* sin(2*pi*x/n) for 0<=xnbits; - const float k1 = 0.5; - const float k2 = 0.5 - s->inverse; - const FFTSample *tcos = s->tcos; - const FFTSample *tsin = s->tsin; - - if (!s->inverse) { - s->fft.fft_permute(&s->fft, (FFTComplex*)data); - s->fft.fft_calc(&s->fft, (FFTComplex*)data); - } - /* i=0 is a special case because of packing, the DC term is real, so we - are going to throw the N/2 term (also real) in with it. */ - ev.re = data[0]; - data[0] = ev.re+data[1]; - data[1] = ev.re-data[1]; - for (i = 1; i < (n>>2); i++) { - i1 = 2*i; - i2 = n-i1; - /* Separate even and odd FFTs */ - ev.re = k1*(data[i1 ]+data[i2 ]); - od.im = -k2*(data[i1 ]-data[i2 ]); - ev.im = k1*(data[i1+1]-data[i2+1]); - od.re = k2*(data[i1+1]+data[i2+1]); - /* Apply twiddle factors to the odd FFT and add to the even FFT */ - data[i1 ] = ev.re + od.re*tcos[i] - od.im*tsin[i]; - data[i1+1] = ev.im + od.im*tcos[i] + od.re*tsin[i]; - data[i2 ] = ev.re - od.re*tcos[i] + od.im*tsin[i]; - data[i2+1] = -ev.im + od.im*tcos[i] + od.re*tsin[i]; - } - data[2*i+1]=s->sign_convention*data[2*i+1]; - if (s->inverse) { - data[0] *= k1; - data[1] *= k1; - s->fft.fft_permute(&s->fft, (FFTComplex*)data); - s->fft.fft_calc(&s->fft, (FFTComplex*)data); - } -} - -av_cold int ff_rdft_init(RDFTContext *s, int nbits, enum RDFTransformType trans) -{ - int n = 1 << nbits; - int ret; - - s->nbits = nbits; - s->inverse = trans == IDFT_C2R || trans == DFT_C2R; - s->sign_convention = trans == IDFT_R2C || trans == DFT_C2R ? 1 : -1; - - if (nbits < 4 || nbits > 16) - return AVERROR(EINVAL); - - if ((ret = ff_fft_init(&s->fft, nbits-1, trans == IDFT_C2R || trans == IDFT_R2C)) < 0) - return ret; - - ff_init_ff_cos_tabs(nbits); - s->tcos = ff_cos_tabs[nbits]; - s->tsin = ff_sin_tabs[nbits]+(trans == DFT_R2C || trans == DFT_C2R)*(n>>2); -#if !CONFIG_HARDCODED_TABLES - { - int i; - const double theta = (trans == DFT_R2C || trans == DFT_C2R ? -1 : 1) * 2 * M_PI / n; - for (i = 0; i < (n >> 2); i++) - s->tsin[i] = sin(i * theta); - } -#endif - s->rdft_calc = rdft_calc_c; - - if (ARCH_ARM) ff_rdft_init_arm(s); - - return 0; -} - -av_cold void ff_rdft_end(RDFTContext *s) -{ - ff_fft_end(&s->fft); -} diff --git a/ext/at3_standalone/rdft.h b/ext/at3_standalone/rdft.h deleted file mode 100644 index 37c40e7c80..0000000000 --- a/ext/at3_standalone/rdft.h +++ /dev/null @@ -1,74 +0,0 @@ -/* - * (I)RDFT transforms - * Copyright (c) 2009 Alex Converse - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#if !defined(AVCODEC_RDFT_H) && (!defined(FFT_FLOAT) || FFT_FLOAT) -#define AVCODEC_RDFT_H - -#include "config.h" -#include "fft.h" - -#if CONFIG_HARDCODED_TABLES -# define SINTABLE_CONST const -#else -# define SINTABLE_CONST -#endif - -#define SINTABLE(size) \ - SINTABLE_CONST DECLARE_ALIGNED(16, FFTSample, ff_sin_##size)[size/2] - -extern SINTABLE(16); -extern SINTABLE(32); -extern SINTABLE(64); -extern SINTABLE(128); -extern SINTABLE(256); -extern SINTABLE(512); -extern SINTABLE(1024); -extern SINTABLE(2048); -extern SINTABLE(4096); -extern SINTABLE(8192); -extern SINTABLE(16384); -extern SINTABLE(32768); -extern SINTABLE(65536); - -struct RDFTContext { - int nbits; - int inverse; - int sign_convention; - - /* pre/post rotation tables */ - const FFTSample *tcos; - SINTABLE_CONST FFTSample *tsin; - FFTContext fft; - void (*rdft_calc)(struct RDFTContext *s, FFTSample *z); -}; - -/** - * Set up a real FFT. - * @param nbits log2 of the length of the input array - * @param trans the type of transform - */ -int ff_rdft_init(RDFTContext *s, int nbits, enum RDFTransformType trans); -void ff_rdft_end(RDFTContext *s); - -void ff_rdft_init_arm(RDFTContext *s); - - -#endif /* AVCODEC_RDFT_H */ diff --git a/ext/at3_standalone/util_internal.h b/ext/at3_standalone/util_internal.h index 3a69614c65..5fe851381e 100644 --- a/ext/at3_standalone/util_internal.h +++ b/ext/at3_standalone/util_internal.h @@ -38,7 +38,6 @@ #include "attributes.h" #include "dict.h" #include "macros.h" -#include "pixfmt.h" #include "version.h" #if ARCH_X86 @@ -213,16 +212,6 @@ # define ONLY_IF_THREADS_ENABLED(x) NULL #endif -/** - * Log a generic warning message about a missing feature. - * - * @param[in] avc a pointer to an arbitrary struct of which the first - * field is a pointer to an AVClass struct - * @param[in] msg string containing the name of the missing feature - */ -void avpriv_report_missing_feature(void *avc, - const char *msg, ...) av_printf_format(2, 3); - /** * Log a generic warning message about a missing feature. * Additionally request that a sample showcasing the feature be uploaded. @@ -232,7 +221,7 @@ void avpriv_report_missing_feature(void *avc, * @param[in] msg string containing the name of the missing feature */ void avpriv_request_sample(void *avc, - const char *msg, ...) av_printf_format(2, 3); + const char *msg, ...); #if HAVE_LIBC_MSVCRT #include diff --git a/ext/at3_standalone/utils.c b/ext/at3_standalone/utils.c index 6ed989c988..8189d35a64 100644 --- a/ext/at3_standalone/utils.c +++ b/ext/at3_standalone/utils.c @@ -27,14 +27,12 @@ #include "util_internal.h" #include "config.h" -#include "atomic.h" #include "avcodec.h" #include "attributes.h" #include "channel_layout.h" #include "frame.h" #include "internal.h" #include "mathematics.h" -#include "pixdesc.h" #include "avstring.h" #include "samplefmt.h" #include "dict.h" @@ -47,56 +45,8 @@ #include #include #include -#if CONFIG_ICONV -# include -#endif -#if HAVE_PTHREADS || HAVE_W32THREADS || HAVE_OS2THREADS -static int default_lockmgr_cb(void **arg, enum AVLockOp op) -{ - void * volatile * mutex = arg; - int err; - - switch (op) { - case AV_LOCK_CREATE: - return 0; - case AV_LOCK_OBTAIN: - if (!*mutex) { - pthread_mutex_t *tmp = av_malloc(sizeof(pthread_mutex_t)); - if (!tmp) - return AVERROR(ENOMEM); - if ((err = pthread_mutex_init(tmp, NULL))) { - av_free(tmp); - return AVERROR(err); - } - if (avpriv_atomic_ptr_cas(mutex, NULL, tmp)) { - pthread_mutex_destroy(tmp); - av_free(tmp); - } - } - - if ((err = pthread_mutex_lock(*mutex))) - return AVERROR(err); - - return 0; - case AV_LOCK_RELEASE: - if ((err = pthread_mutex_unlock(*mutex))) - return AVERROR(err); - - return 0; - case AV_LOCK_DESTROY: - if (*mutex) - pthread_mutex_destroy(*mutex); - av_free(*mutex); - avpriv_atomic_ptr_cas(mutex, *mutex, NULL); - return 0; - } - return 1; -} -static int (*lockmgr_cb)(void **mutex, enum AVLockOp op) = default_lockmgr_cb; -#else static int (*lockmgr_cb)(void **mutex, enum AVLockOp op) = NULL; -#endif volatile int ff_avcodec_locked; @@ -159,21 +109,6 @@ int av_codec_is_decoder(const AVCodec *codec) return codec && codec->decode; } -av_cold void avcodec_register(AVCodec *codec) -{ - AVCodec **p; - avcodec_init(); - p = last_avcodec; - codec->next = NULL; - - while(*p || avpriv_atomic_ptr_cas((void * volatile *)p, NULL, codec)) - p = &(*p)->next; - last_avcodec = &codec->next; - - if (codec->init_static_data) - codec->init_static_data(codec); -} - #if FF_API_EMU_EDGE unsigned avcodec_get_edge_width(void) { @@ -181,26 +116,6 @@ unsigned avcodec_get_edge_width(void) } #endif -int ff_side_data_update_matrix_encoding(AVFrame *frame, - enum AVMatrixEncoding matrix_encoding) -{ - AVFrameSideData *side_data; - enum AVMatrixEncoding *data; - - side_data = av_frame_get_side_data(frame, AV_FRAME_DATA_MATRIXENCODING); - if (!side_data) - side_data = av_frame_new_side_data(frame, AV_FRAME_DATA_MATRIXENCODING, - sizeof(enum AVMatrixEncoding)); - - if (!side_data) - return AVERROR(ENOMEM); - - data = (enum AVMatrixEncoding*)side_data->data; - *data = matrix_encoding; - - return 0; -} - int avcodec_fill_audio_frame(AVFrame *frame, int nb_channels, enum AVSampleFormat sample_fmt, const uint8_t *buf, int buf_size, int align) @@ -344,70 +259,20 @@ int avcodec_default_get_buffer2(AVCodecContext *avctx, AVFrame *frame, int flags } } -static int add_metadata_from_side_data(AVPacket *avpkt, AVFrame *frame) -{ - int size; - const uint8_t *side_metadata; - - AVDictionary **frame_md = avpriv_frame_get_metadatap(frame); - - side_metadata = av_packet_get_side_data(avpkt, - AV_PKT_DATA_STRINGS_METADATA, &size); - return av_packet_unpack_dictionary(side_metadata, size, frame_md); -} - int ff_init_buffer_info(AVCodecContext *avctx, AVFrame *frame) { AVPacket *pkt = avctx->internal->pkt; int i; - static const struct { - enum AVPacketSideDataType packet; - enum AVFrameSideDataType frame; - } sd[] = { - { AV_PKT_DATA_REPLAYGAIN , AV_FRAME_DATA_REPLAYGAIN }, - { AV_PKT_DATA_DISPLAYMATRIX, AV_FRAME_DATA_DISPLAYMATRIX }, - { AV_PKT_DATA_STEREO3D, AV_FRAME_DATA_STEREO3D }, - { AV_PKT_DATA_AUDIO_SERVICE_TYPE, AV_FRAME_DATA_AUDIO_SERVICE_TYPE }, - }; - + if (pkt) { - frame->pkt_pts = pkt->pts; av_frame_set_pkt_pos (frame, pkt->pos); av_frame_set_pkt_duration(frame, pkt->duration); av_frame_set_pkt_size (frame, pkt->size); - - for (i = 0; i < FF_ARRAY_ELEMS(sd); i++) { - int size; - uint8_t *packet_sd = av_packet_get_side_data(pkt, sd[i].packet, &size); - if (packet_sd) { - AVFrameSideData *frame_sd = av_frame_new_side_data(frame, - sd[i].frame, - size); - if (!frame_sd) - return AVERROR(ENOMEM); - - memcpy(frame_sd->data, packet_sd, size); - } - } - add_metadata_from_side_data(pkt, frame); } else { - frame->pkt_pts = AV_NOPTS_VALUE; av_frame_set_pkt_pos (frame, -1); av_frame_set_pkt_duration(frame, 0); av_frame_set_pkt_size (frame, -1); } - frame->reordered_opaque = avctx->reordered_opaque; - - if (frame->color_primaries == AVCOL_PRI_UNSPECIFIED) - frame->color_primaries = avctx->color_primaries; - if (frame->color_trc == AVCOL_TRC_UNSPECIFIED) - frame->color_trc = avctx->color_trc; - if (av_frame_get_colorspace(frame) == AVCOL_SPC_UNSPECIFIED) - av_frame_set_colorspace(frame, avctx->colorspace); - if (av_frame_get_color_range(frame) == AVCOL_RANGE_UNSPECIFIED) - av_frame_set_color_range(frame, avctx->color_range); - if (frame->chroma_location == AVCHROMA_LOC_UNSPECIFIED) - frame->chroma_location = avctx->chroma_sample_location; switch (avctx->codec->type) { case AVMEDIA_TYPE_VIDEO: @@ -448,7 +313,6 @@ int ff_decode_frame_props(AVCodecContext *avctx, AVFrame *frame) static int get_buffer_internal(AVCodecContext *avctx, AVFrame *frame, int flags) { - const AVHWAccel *hwaccel = avctx->hwaccel; int override_dimensions = 1; int ret; @@ -456,14 +320,6 @@ static int get_buffer_internal(AVCodecContext *avctx, AVFrame *frame, int flags) if (ret < 0) return ret; - if (hwaccel) { - if (hwaccel->alloc_frame) { - ret = hwaccel->alloc_frame(avctx, frame); - goto end; - } - } else - avctx->sw_pix_fmt = avctx->pix_fmt; - ret = avctx->get_buffer2(avctx, frame, flags); end: @@ -472,12 +328,7 @@ end: int ff_get_buffer(AVCodecContext *avctx, AVFrame *frame, int flags) { - int ret = get_buffer_internal(avctx, frame, flags); - if (ret < 0) { - av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); - frame->width = frame->height = 0; - } - return ret; + return get_buffer_internal(avctx, frame, flags); } int avcodec_default_execute(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2), void *arg, int *ret, int count, int size) @@ -504,92 +355,14 @@ int avcodec_default_execute2(AVCodecContext *c, int (*func)(AVCodecContext *c2, return 0; } -enum AVPixelFormat avcodec_default_get_format(struct AVCodecContext *s, const enum AVPixelFormat *fmt) -{ - while (*fmt != AV_PIX_FMT_NONE) - ++fmt; - return fmt[0]; -} - -static AVHWAccel *find_hwaccel(enum AVCodecID codec_id, - enum AVPixelFormat pix_fmt) -{ - AVHWAccel *hwaccel = NULL; - - while ((hwaccel = av_hwaccel_next(hwaccel))) - if (hwaccel->id == codec_id - && hwaccel->pix_fmt == pix_fmt) - return hwaccel; - return NULL; -} - -static int setup_hwaccel(AVCodecContext *avctx, - const enum AVPixelFormat fmt, - const char *name) -{ - AVHWAccel *hwa = find_hwaccel(avctx->codec_id, fmt); - int ret = 0; - - if (avctx->active_thread_type & FF_THREAD_FRAME) { - av_log(avctx, AV_LOG_WARNING, - "Hardware accelerated decoding with frame threading is known to be unstable and its use is discouraged.\n"); - } - - if (!hwa) { - av_log(avctx, AV_LOG_ERROR, - "Could not find an AVHWAccel for the pixel format: %s", - name); - return AVERROR(ENOENT); - } - - if (hwa->capabilities & HWACCEL_CODEC_CAP_EXPERIMENTAL && - avctx->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) { - av_log(avctx, AV_LOG_WARNING, "Ignoring experimental hwaccel: %s\n", - hwa->name); - return AVERROR_PATCHWELCOME; - } - - if (hwa->priv_data_size) { - avctx->internal->hwaccel_priv_data = av_mallocz(hwa->priv_data_size); - if (!avctx->internal->hwaccel_priv_data) - return AVERROR(ENOMEM); - } - - if (hwa->init) { - ret = hwa->init(avctx); - if (ret < 0) { - av_freep(&avctx->internal->hwaccel_priv_data); - return ret; - } - } - - avctx->hwaccel = hwa; - - return 0; -} - MAKE_ACCESSORS(AVCodecContext, codec, AVRational, pkt_timebase) -MAKE_ACCESSORS(AVCodecContext, codec, const AVCodecDescriptor *, codec_descriptor) -MAKE_ACCESSORS(AVCodecContext, codec, int, lowres) MAKE_ACCESSORS(AVCodecContext, codec, int, seek_preroll) -MAKE_ACCESSORS(AVCodecContext, codec, uint16_t*, chroma_intra_matrix) unsigned av_codec_get_codec_properties(const AVCodecContext *codec) { return codec->properties; } -int av_codec_get_max_lowres(const AVCodec *codec) -{ - return codec->max_lowres; -} - -static void get_subtitle_defaults(AVSubtitle *sub) -{ - memset(sub, 0, sizeof(*sub)); - sub->pts = AV_NOPTS_VALUE; -} - static int64_t get_bit_rate(AVCodecContext *ctx) { int64_t bit_rate; @@ -628,15 +401,10 @@ int attribute_align_arg ff_codec_open2_recursive(AVCodecContext *avctx, const AV int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *codec, AVDictionary **options) { int ret = 0; - const AVPixFmtDescriptor *pixdesc; if (avcodec_is_open(avctx)) return 0; - if ((!codec && !avctx->codec)) { - av_log(avctx, AV_LOG_ERROR, "No codec provided to avcodec_open2()\n"); - return AVERROR(EINVAL); - } if ((codec && avctx->codec && codec != avctx->codec)) { av_log(avctx, AV_LOG_ERROR, "This AVCodecContext was allocated for %s, " "but %s passed to avcodec_open2()\n", avctx->codec->name, codec->name); @@ -709,7 +477,6 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code goto free_and_end; } avctx->frame_number = 0; - avctx->codec_descriptor = avcodec_descriptor_get(avctx->codec_id); if ((avctx->codec->capabilities & AV_CODEC_CAP_EXPERIMENTAL) && avctx->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) { @@ -733,19 +500,9 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code avctx->time_base.den = avctx->sample_rate; } - if (!HAVE_THREADS) - av_log(avctx, AV_LOG_WARNING, "Warning: not compiled with thread support, using thread emulation\n"); - if (!HAVE_THREADS && !(codec->capabilities & AV_CODEC_CAP_AUTO_THREADS)) avctx->thread_count = 1; - if (avctx->codec->max_lowres < avctx->lowres || avctx->lowres < 0) { - av_log(avctx, AV_LOG_ERROR, "The maximum value for lowres supported by the decoder is %d\n", - avctx->codec->max_lowres); - ret = AVERROR(EINVAL); - goto free_and_end; - } - #if FF_API_VISMV if (avctx->debug_mv) av_log(avctx, AV_LOG_WARNING, "The 'vismv' option is deprecated, " @@ -758,11 +515,6 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code avctx->pts_correction_last_pts = avctx->pts_correction_last_dts = INT64_MIN; - if ( !CONFIG_GRAY && avctx->flags & AV_CODEC_FLAG_GRAY - && avctx->codec_descriptor->type == AVMEDIA_TYPE_VIDEO) - av_log(avctx, AV_LOG_WARNING, - "gray decoding requested but not enabled at configuration time\n"); - if ( avctx->codec->init && (!(avctx->active_thread_type&FF_THREAD_FRAME) || avctx->internal->frame_thread_encoder)) { ret = avctx->codec->init(avctx); @@ -902,19 +654,9 @@ av_cold int avcodec_close(AVCodecContext *avctx) for (i = 0; i < FF_ARRAY_ELEMS(pool->pools); i++) av_buffer_pool_uninit(&pool->pools[i]); av_freep(&avctx->internal->pool); - - if (avctx->hwaccel && avctx->hwaccel->uninit) - avctx->hwaccel->uninit(avctx); - av_freep(&avctx->internal->hwaccel_priv_data); - av_freep(&avctx->internal); } - for (i = 0; i < avctx->nb_coded_side_data; i++) - av_freep(&avctx->coded_side_data[i].data); - av_freep(&avctx->coded_side_data); - avctx->nb_coded_side_data = 0; - if (avctx->priv_data && avctx->codec && avctx->codec->priv_class) av_opt_free(avctx->priv_data); av_opt_free(avctx); @@ -998,54 +740,6 @@ AVCodec *avcodec_find_decoder_by_name(const char *name) return NULL; } -const char *avcodec_get_name(enum AVCodecID id) -{ - const AVCodecDescriptor *cd; - AVCodec *codec; - - if (id == AV_CODEC_ID_NONE) - return "none"; - cd = avcodec_descriptor_get(id); - if (cd) - return cd->name; - av_log(NULL, AV_LOG_WARNING, "Codec 0x%x is not in the full list.\n", id); - codec = avcodec_find_decoder(id); - if (codec) - return codec->name; - codec = avcodec_find_encoder(id); - if (codec) - return codec->name; - return "unknown_codec"; -} - -const char *av_get_profile_name(const AVCodec *codec, int profile) -{ - const AVProfile *p; - if (profile == FF_PROFILE_UNKNOWN || !codec->profiles) - return NULL; - - for (p = codec->profiles; p->profile != FF_PROFILE_UNKNOWN; p++) - if (p->profile == profile) - return p->name; - - return NULL; -} - -const char *avcodec_profile_name(enum AVCodecID codec_id, int profile) -{ - const AVCodecDescriptor *desc = avcodec_descriptor_get(codec_id); - const AVProfile *p; - - if (profile == FF_PROFILE_UNKNOWN || !desc || !desc->profiles) - return NULL; - - for (p = desc->profiles; p->profile != FF_PROFILE_UNKNOWN; p++) - if (p->profile == profile) - return p->name; - - return NULL; -} - void avcodec_flush_buffers(AVCodecContext *avctx) { if (avctx->codec->flush) @@ -1394,22 +1088,6 @@ void av_log_ask_for_sample(void *avc, const char *msg, ...) FF_ENABLE_DEPRECATION_WARNINGS #endif /* FF_API_MISSING_SAMPLE */ -static AVHWAccel *first_hwaccel = NULL; -static AVHWAccel **last_hwaccel = &first_hwaccel; - -void av_register_hwaccel(AVHWAccel *hwaccel) -{ - AVHWAccel **p = last_hwaccel; - hwaccel->next = NULL; - while(*p || avpriv_atomic_ptr_cas((void * volatile *)p, NULL, hwaccel)) - p = &(*p)->next; - last_hwaccel = &hwaccel->next; -} - -AVHWAccel *av_hwaccel_next(const AVHWAccel *hwaccel) -{ - return hwaccel ? hwaccel->next : first_hwaccel; -} int av_lockmgr_register(int (*cb)(void **mutex, enum AVLockOp op)) { @@ -1453,17 +1131,6 @@ int ff_lock_avcodec(AVCodecContext *log_ctx, const AVCodec *codec) return -1; } - if (avpriv_atomic_int_add_and_fetch(&entangled_thread_counter, 1) != 1) { - av_log(log_ctx, AV_LOG_ERROR, - "Insufficient thread locking. At least %d threads are " - "calling avcodec_open2() at the same time right now.\n", - entangled_thread_counter); - if (!lockmgr_cb) - av_log(log_ctx, AV_LOG_ERROR, "No lock manager is set, please see av_lockmgr_register()\n"); - ff_avcodec_locked = 1; - ff_unlock_avcodec(codec); - return AVERROR(EINVAL); - } av_assert0(!ff_avcodec_locked); ff_avcodec_locked = 1; return 0; @@ -1476,7 +1143,6 @@ int ff_unlock_avcodec(const AVCodec *codec) av_assert0(ff_avcodec_locked); ff_avcodec_locked = 0; - avpriv_atomic_int_add_and_fetch(&entangled_thread_counter, -1); if (lockmgr_cb) { if ((*lockmgr_cb)(&codec_mutex, AV_LOCK_RELEASE)) return -1; @@ -1562,29 +1228,3 @@ AVCPBProperties *av_cpb_properties_alloc(size_t *size) return props; } - -AVCPBProperties *ff_add_cpb_side_data(AVCodecContext *avctx) -{ - AVPacketSideData *tmp; - AVCPBProperties *props; - size_t size; - - props = av_cpb_properties_alloc(&size); - if (!props) - return NULL; - - tmp = av_realloc_array(avctx->coded_side_data, avctx->nb_coded_side_data + 1, sizeof(*tmp)); - if (!tmp) { - av_freep(&props); - return NULL; - } - - avctx->coded_side_data = tmp; - avctx->nb_coded_side_data++; - - avctx->coded_side_data[avctx->nb_coded_side_data - 1].type = AV_PKT_DATA_CPB_PROPERTIES; - avctx->coded_side_data[avctx->nb_coded_side_data - 1].data = (uint8_t*)props; - avctx->coded_side_data[avctx->nb_coded_side_data - 1].size = size; - - return props; -} From 68037759411539d9a4cf47e7748ddfec9983a580 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Wed, 10 Apr 2024 22:50:40 +0200 Subject: [PATCH 072/719] Remove option table --- Common/Common.vcxproj | 1 - Common/Common.vcxproj.filters | 3 - ext/at3_standalone/options.c | 15 +- ext/at3_standalone/options_table.h | 447 ----------------------------- 4 files changed, 1 insertion(+), 465 deletions(-) delete mode 100644 ext/at3_standalone/options_table.h diff --git a/Common/Common.vcxproj b/Common/Common.vcxproj index 639a26ce82..dc7ceb9339 100644 --- a/Common/Common.vcxproj +++ b/Common/Common.vcxproj @@ -421,7 +421,6 @@ - diff --git a/Common/Common.vcxproj.filters b/Common/Common.vcxproj.filters index 0717b7b213..cc36777e60 100644 --- a/Common/Common.vcxproj.filters +++ b/Common/Common.vcxproj.filters @@ -629,9 +629,6 @@ ext\at3_standalone - - ext\at3_standalone - ext\at3_standalone diff --git a/ext/at3_standalone/options.c b/ext/at3_standalone/options.c index 6fc3894f07..24786fa29e 100644 --- a/ext/at3_standalone/options.c +++ b/ext/at3_standalone/options.c @@ -32,19 +32,6 @@ #include /* FLT_MIN, FLT_MAX */ #include -FF_DISABLE_DEPRECATION_WARNINGS -#include "options_table.h" -FF_ENABLE_DEPRECATION_WARNINGS - -static const char* context_to_name(void* ptr) { - AVCodecContext *avc= ptr; - - if(avc && avc->codec && avc->codec->name) - return avc->codec->name; - else - return "NULL"; -} - static void *codec_child_next(void *obj, void *prev) { AVCodecContext *s = obj; @@ -78,7 +65,7 @@ static AVClassCategory get_category(void *ptr) static const AVClass av_codec_context_class = { .class_name = "AVCodecContext", - .item_name = context_to_name, + .item_name = NULL, .option = NULL, .version = LIBAVUTIL_VERSION_INT, .log_level_offset_offset = offsetof(AVCodecContext, log_level_offset), diff --git a/ext/at3_standalone/options_table.h b/ext/at3_standalone/options_table.h deleted file mode 100644 index 13b4219136..0000000000 --- a/ext/at3_standalone/options_table.h +++ /dev/null @@ -1,447 +0,0 @@ -/* - * Copyright (c) 2001 Fabrice Bellard - * Copyright (c) 2002-2004 Michael Niedermayer - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef AVCODEC_OPTIONS_TABLE_H -#define AVCODEC_OPTIONS_TABLE_H - -#include -#include -#include - -#include "opt.h" -#include "avcodec.h" -#include "version.h" - -#define OFFSET(x) offsetof(AVCodecContext,x) -#define DEFAULT 0 //should be NAN but it does not work as it is not a constant in glibc as required by ANSI/ISO C -//these names are too long to be readable -#define V AV_OPT_FLAG_VIDEO_PARAM -#define A AV_OPT_FLAG_AUDIO_PARAM -#define S AV_OPT_FLAG_SUBTITLE_PARAM -#define E AV_OPT_FLAG_ENCODING_PARAM -#define D AV_OPT_FLAG_DECODING_PARAM - -#define AV_CODEC_DEFAULT_BITRATE 200*1000 - -static const AVOption avcodec_options[] = { -{"b", "set bitrate (in bits/s)", OFFSET(bit_rate), AV_OPT_TYPE_INT64, {.i64 = AV_CODEC_DEFAULT_BITRATE }, 0, INT64_MAX, A|V|E}, -{"ab", "set bitrate (in bits/s)", OFFSET(bit_rate), AV_OPT_TYPE_INT64, {.i64 = 128*1000 }, 0, INT_MAX, A|E}, -{"bt", "Set video bitrate tolerance (in bits/s). In 1-pass mode, bitrate tolerance specifies how far " - "ratecontrol is willing to deviate from the target average bitrate value. This is not related " - "to minimum/maximum bitrate. Lowering tolerance too much has an adverse effect on quality.", - OFFSET(bit_rate_tolerance), AV_OPT_TYPE_INT, {.i64 = AV_CODEC_DEFAULT_BITRATE*20 }, 1, INT_MAX, V|E}, -{"flags", NULL, OFFSET(flags), AV_OPT_TYPE_FLAGS, {.i64 = DEFAULT }, 0, UINT_MAX, V|A|S|E|D, "flags"}, -{"unaligned", "allow decoders to produce unaligned output", 0, AV_OPT_TYPE_CONST, { .i64 = AV_CODEC_FLAG_UNALIGNED }, INT_MIN, INT_MAX, V | D, "flags" }, -{"mv4", "use four motion vectors per macroblock (MPEG-4)", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_4MV }, INT_MIN, INT_MAX, V|E, "flags"}, -{"qpel", "use 1/4-pel motion compensation", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_QPEL }, INT_MIN, INT_MAX, V|E, "flags"}, -{"loop", "use loop filter", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_LOOP_FILTER }, INT_MIN, INT_MAX, V|E, "flags"}, -{"qscale", "use fixed qscale", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_QSCALE }, INT_MIN, INT_MAX, 0, "flags"}, -#if FF_API_GMC -{"gmc", "use gmc", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG_GMC }, INT_MIN, INT_MAX, V|E, "flags"}, -#endif -#if FF_API_MV0 -{"mv0", "always try a mb with mv=<0,0>", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG_MV0 }, INT_MIN, INT_MAX, V|E, "flags"}, -#endif -#if FF_API_INPUT_PRESERVED -{"input_preserved", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG_INPUT_PRESERVED }, INT_MIN, INT_MAX, 0, "flags"}, -#endif -{"pass1", "use internal 2-pass ratecontrol in first pass mode", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_PASS1 }, INT_MIN, INT_MAX, 0, "flags"}, -{"pass2", "use internal 2-pass ratecontrol in second pass mode", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_PASS2 }, INT_MIN, INT_MAX, 0, "flags"}, -{"gray", "only decode/encode grayscale", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_GRAY }, INT_MIN, INT_MAX, V|E|D, "flags"}, -#if FF_API_EMU_EDGE -{"emu_edge", "do not draw edges", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG_EMU_EDGE }, INT_MIN, INT_MAX, 0, "flags"}, -#endif -{"psnr", "error[?] variables will be set during encoding", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_PSNR }, INT_MIN, INT_MAX, V|E, "flags"}, -{"truncated", "Input bitstream might be randomly truncated", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_TRUNCATED }, INT_MIN, INT_MAX, V|D, "flags"}, -#if FF_API_NORMALIZE_AQP -{"naq", "normalize adaptive quantization", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG_NORMALIZE_AQP }, INT_MIN, INT_MAX, V|E, "flags"}, -#endif -{"ildct", "use interlaced DCT", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_INTERLACED_DCT }, INT_MIN, INT_MAX, V|E, "flags"}, -{"low_delay", "force low delay", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_LOW_DELAY }, INT_MIN, INT_MAX, V|D|E, "flags"}, -{"global_header", "place global headers in extradata instead of every keyframe", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_GLOBAL_HEADER }, INT_MIN, INT_MAX, V|A|E, "flags"}, -{"bitexact", "use only bitexact functions (except (I)DCT)", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_BITEXACT }, INT_MIN, INT_MAX, A|V|S|D|E, "flags"}, -{"aic", "H.263 advanced intra coding / MPEG-4 AC prediction", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_AC_PRED }, INT_MIN, INT_MAX, V|E, "flags"}, -{"ilme", "interlaced motion estimation", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_INTERLACED_ME }, INT_MIN, INT_MAX, V|E, "flags"}, -{"cgop", "closed GOP", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_CLOSED_GOP }, INT_MIN, INT_MAX, V|E, "flags"}, -{"output_corrupt", "Output even potentially corrupted frames", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_OUTPUT_CORRUPT }, INT_MIN, INT_MAX, V|D, "flags"}, -{"fast", "allow non-spec-compliant speedup tricks", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG2_FAST }, INT_MIN, INT_MAX, V|E, "flags2"}, -{"noout", "skip bitstream encoding", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG2_NO_OUTPUT }, INT_MIN, INT_MAX, V|E, "flags2"}, -{"ignorecrop", "ignore cropping information from sps", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG2_IGNORE_CROP }, INT_MIN, INT_MAX, V|D, "flags2"}, -{"local_header", "place global headers at every keyframe instead of in extradata", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG2_LOCAL_HEADER }, INT_MIN, INT_MAX, V|E, "flags2"}, -{"chunks", "Frame data might be split into multiple chunks", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG2_CHUNKS }, INT_MIN, INT_MAX, V|D, "flags2"}, -{"showall", "Show all frames before the first keyframe", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG2_SHOW_ALL }, INT_MIN, INT_MAX, V|D, "flags2"}, -{"export_mvs", "export motion vectors through frame side data", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG2_EXPORT_MVS}, INT_MIN, INT_MAX, V|D, "flags2"}, -{"skip_manual", "do not skip samples and export skip information as frame side data", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG2_SKIP_MANUAL}, INT_MIN, INT_MAX, V|D, "flags2"}, -#if FF_API_MOTION_EST -{"me_method", "set motion estimation method", OFFSET(me_method), AV_OPT_TYPE_INT, {.i64 = ME_EPZS }, INT_MIN, INT_MAX, V|E, "me_method"}, -{"zero", "zero motion estimation (fastest)", 0, AV_OPT_TYPE_CONST, {.i64 = ME_ZERO }, INT_MIN, INT_MAX, V|E, "me_method" }, -{"full", "full motion estimation (slowest)", 0, AV_OPT_TYPE_CONST, {.i64 = ME_FULL }, INT_MIN, INT_MAX, V|E, "me_method" }, -{"epzs", "EPZS motion estimation", 0, AV_OPT_TYPE_CONST, {.i64 = ME_EPZS }, INT_MIN, INT_MAX, V|E, "me_method" }, -{"esa", "esa motion estimation (alias for full)", 0, AV_OPT_TYPE_CONST, {.i64 = ME_FULL }, INT_MIN, INT_MAX, V|E, "me_method" }, -{"tesa", "tesa motion estimation", 0, AV_OPT_TYPE_CONST, {.i64 = ME_TESA }, INT_MIN, INT_MAX, V|E, "me_method" }, -{"dia", "diamond motion estimation (alias for EPZS)", 0, AV_OPT_TYPE_CONST, {.i64 = ME_EPZS }, INT_MIN, INT_MAX, V|E, "me_method" }, -{"log", "log motion estimation", 0, AV_OPT_TYPE_CONST, {.i64 = ME_LOG }, INT_MIN, INT_MAX, V|E, "me_method" }, -{"phods", "phods motion estimation", 0, AV_OPT_TYPE_CONST, {.i64 = ME_PHODS }, INT_MIN, INT_MAX, V|E, "me_method" }, -{"x1", "X1 motion estimation", 0, AV_OPT_TYPE_CONST, {.i64 = ME_X1 }, INT_MIN, INT_MAX, V|E, "me_method" }, -{"hex", "hex motion estimation", 0, AV_OPT_TYPE_CONST, {.i64 = ME_HEX }, INT_MIN, INT_MAX, V|E, "me_method" }, -{"umh", "umh motion estimation", 0, AV_OPT_TYPE_CONST, {.i64 = ME_UMH }, INT_MIN, INT_MAX, V|E, "me_method" }, -{"iter", "iter motion estimation", 0, AV_OPT_TYPE_CONST, {.i64 = ME_ITER }, INT_MIN, INT_MAX, V|E, "me_method" }, -#endif -{"time_base", NULL, OFFSET(time_base), AV_OPT_TYPE_RATIONAL, {.dbl = 0}, INT_MIN, INT_MAX}, -{"ar", "set audio sampling rate (in Hz)", OFFSET(sample_rate), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, 0, INT_MAX, A|D|E}, -{"ac", "set number of audio channels", OFFSET(channels), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, 0, INT_MAX, A|D|E}, -{"cutoff", "set cutoff bandwidth", OFFSET(cutoff), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, A|E}, -{"frame_size", NULL, OFFSET(frame_size), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, A|E}, -{"frame_number", NULL, OFFSET(frame_number), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, -{"delay", NULL, OFFSET(delay), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, -{"qcomp", "video quantizer scale compression (VBR). Constant of ratecontrol equation. " - "Recommended range for default rc_eq: 0.0-1.0", - OFFSET(qcompress), AV_OPT_TYPE_FLOAT, {.dbl = 0.5 }, -FLT_MAX, FLT_MAX, V|E}, -{"qblur", "video quantizer scale blur (VBR)", OFFSET(qblur), AV_OPT_TYPE_FLOAT, {.dbl = 0.5 }, -1, FLT_MAX, V|E}, -{"qmin", "minimum video quantizer scale (VBR)", OFFSET(qmin), AV_OPT_TYPE_INT, {.i64 = 2 }, -1, 69, V|E}, -{"qmax", "maximum video quantizer scale (VBR)", OFFSET(qmax), AV_OPT_TYPE_INT, {.i64 = 31 }, -1, 1024, V|E}, -{"qdiff", "maximum difference between the quantizer scales (VBR)", OFFSET(max_qdiff), AV_OPT_TYPE_INT, {.i64 = 3 }, INT_MIN, INT_MAX, V|E}, -#if FF_API_RC_STRATEGY -{"rc_strategy", "ratecontrol method", OFFSET(rc_strategy), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, -#endif -#if FF_API_PRIVATE_OPT -{"b_strategy", "strategy to choose between I/P/B-frames", OFFSET(b_frame_strategy), AV_OPT_TYPE_INT, {.i64 = 0 }, INT_MIN, INT_MAX, V|E}, -{"ps", "RTP payload size in bytes", OFFSET(rtp_payload_size), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, -#endif -#if FF_API_STAT_BITS -{"mv_bits", NULL, OFFSET(mv_bits), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, -{"header_bits", NULL, OFFSET(header_bits), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, -{"i_tex_bits", NULL, OFFSET(i_tex_bits), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, -{"p_tex_bits", NULL, OFFSET(p_tex_bits), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, -{"i_count", NULL, OFFSET(i_count), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, -{"p_count", NULL, OFFSET(p_count), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, -{"skip_count", NULL, OFFSET(skip_count), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, -{"misc_bits", NULL, OFFSET(misc_bits), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, -{"frame_bits", NULL, OFFSET(frame_bits), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, -#endif -{"codec_tag", NULL, OFFSET(codec_tag), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, -{"bug", "work around not autodetected encoder bugs", OFFSET(workaround_bugs), AV_OPT_TYPE_FLAGS, {.i64 = FF_BUG_AUTODETECT }, INT_MIN, INT_MAX, V|D, "bug"}, -{"autodetect", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_AUTODETECT }, INT_MIN, INT_MAX, V|D, "bug"}, -#if FF_API_OLD_MSMPEG4 -{"old_msmpeg4", "some old lavc-generated MSMPEG4v3 files (no autodetection)", 0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_OLD_MSMPEG4 }, INT_MIN, INT_MAX, V|D, "bug"}, -#endif -{"xvid_ilace", "Xvid interlacing bug (autodetected if FOURCC == XVIX)", 0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_XVID_ILACE }, INT_MIN, INT_MAX, V|D, "bug"}, -{"ump4", "(autodetected if FOURCC == UMP4)", 0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_UMP4 }, INT_MIN, INT_MAX, V|D, "bug"}, -{"no_padding", "padding bug (autodetected)", 0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_NO_PADDING }, INT_MIN, INT_MAX, V|D, "bug"}, -{"amv", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_AMV }, INT_MIN, INT_MAX, V|D, "bug"}, -#if FF_API_AC_VLC -{"ac_vlc", "illegal VLC bug (autodetected per FOURCC)", 0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_AC_VLC }, INT_MIN, INT_MAX, V|D, "bug"}, -#endif -{"qpel_chroma", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_QPEL_CHROMA }, INT_MIN, INT_MAX, V|D, "bug"}, -{"std_qpel", "old standard qpel (autodetected per FOURCC/version)", 0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_STD_QPEL }, INT_MIN, INT_MAX, V|D, "bug"}, -{"qpel_chroma2", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_QPEL_CHROMA2 }, INT_MIN, INT_MAX, V|D, "bug"}, -{"direct_blocksize", "direct-qpel-blocksize bug (autodetected per FOURCC/version)", 0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_DIRECT_BLOCKSIZE }, INT_MIN, INT_MAX, V|D, "bug"}, -{"edge", "edge padding bug (autodetected per FOURCC/version)", 0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_EDGE }, INT_MIN, INT_MAX, V|D, "bug"}, -{"hpel_chroma", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_HPEL_CHROMA }, INT_MIN, INT_MAX, V|D, "bug"}, -{"dc_clip", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_DC_CLIP }, INT_MIN, INT_MAX, V|D, "bug"}, -{"ms", "work around various bugs in Microsoft's broken decoders", 0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_MS }, INT_MIN, INT_MAX, V|D, "bug"}, -{"trunc", "truncated frames", 0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_TRUNCATED}, INT_MIN, INT_MAX, V|D, "bug"}, -{"strict", "how strictly to follow the standards", OFFSET(strict_std_compliance), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, A|V|D|E, "strict"}, -{"very", "strictly conform to a older more strict version of the spec or reference software", 0, AV_OPT_TYPE_CONST, {.i64 = FF_COMPLIANCE_VERY_STRICT }, INT_MIN, INT_MAX, V|D|E, "strict"}, -{"strict", "strictly conform to all the things in the spec no matter what the consequences", 0, AV_OPT_TYPE_CONST, {.i64 = FF_COMPLIANCE_STRICT }, INT_MIN, INT_MAX, V|D|E, "strict"}, -{"normal", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_COMPLIANCE_NORMAL }, INT_MIN, INT_MAX, V|D|E, "strict"}, -{"unofficial", "allow unofficial extensions", 0, AV_OPT_TYPE_CONST, {.i64 = FF_COMPLIANCE_UNOFFICIAL }, INT_MIN, INT_MAX, V|D|E, "strict"}, -{"experimental", "allow non-standardized experimental things", 0, AV_OPT_TYPE_CONST, {.i64 = FF_COMPLIANCE_EXPERIMENTAL }, INT_MIN, INT_MAX, V|D|E, "strict"}, -{"b_qoffset", "QP offset between P- and B-frames", OFFSET(b_quant_offset), AV_OPT_TYPE_FLOAT, {.dbl = 1.25 }, -FLT_MAX, FLT_MAX, V|E}, -{"err_detect", "set error detection flags", OFFSET(err_recognition), AV_OPT_TYPE_FLAGS, {.i64 = 0 }, INT_MIN, INT_MAX, A|V|D, "err_detect"}, -{"crccheck", "verify embedded CRCs", 0, AV_OPT_TYPE_CONST, {.i64 = AV_EF_CRCCHECK }, INT_MIN, INT_MAX, A|V|D, "err_detect"}, -{"bitstream", "detect bitstream specification deviations", 0, AV_OPT_TYPE_CONST, {.i64 = AV_EF_BITSTREAM }, INT_MIN, INT_MAX, A|V|D, "err_detect"}, -{"buffer", "detect improper bitstream length", 0, AV_OPT_TYPE_CONST, {.i64 = AV_EF_BUFFER }, INT_MIN, INT_MAX, A|V|D, "err_detect"}, -{"explode", "abort decoding on minor error detection", 0, AV_OPT_TYPE_CONST, {.i64 = AV_EF_EXPLODE }, INT_MIN, INT_MAX, A|V|D, "err_detect"}, -{"ignore_err", "ignore errors", 0, AV_OPT_TYPE_CONST, {.i64 = AV_EF_IGNORE_ERR }, INT_MIN, INT_MAX, A|V|D, "err_detect"}, -{"careful", "consider things that violate the spec, are fast to check and have not been seen in the wild as errors", 0, AV_OPT_TYPE_CONST, {.i64 = AV_EF_CAREFUL }, INT_MIN, INT_MAX, A|V|D, "err_detect"}, -{"compliant", "consider all spec non compliancies as errors", 0, AV_OPT_TYPE_CONST, {.i64 = AV_EF_COMPLIANT }, INT_MIN, INT_MAX, A|V|D, "err_detect"}, -{"aggressive", "consider things that a sane encoder should not do as an error", 0, AV_OPT_TYPE_CONST, {.i64 = AV_EF_AGGRESSIVE }, INT_MIN, INT_MAX, A|V|D, "err_detect"}, -{"has_b_frames", NULL, OFFSET(has_b_frames), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, -{"block_align", NULL, OFFSET(block_align), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, -#if FF_API_PRIVATE_OPT -{"mpeg_quant", "use MPEG quantizers instead of H.263", OFFSET(mpeg_quant), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, -#endif -#if FF_API_MPV_OPT -{"qsquish", "deprecated, use encoder private options instead", OFFSET(rc_qsquish), AV_OPT_TYPE_FLOAT, {.dbl = DEFAULT }, 0, 99, V|E}, -{"rc_qmod_amp", "deprecated, use encoder private options instead", OFFSET(rc_qmod_amp), AV_OPT_TYPE_FLOAT, {.dbl = DEFAULT }, -FLT_MAX, FLT_MAX, V|E}, -{"rc_qmod_freq", "deprecated, use encoder private options instead", OFFSET(rc_qmod_freq), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, -#endif -{"rc_override_count", NULL, OFFSET(rc_override_count), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, -#if FF_API_MPV_OPT -{"rc_eq", "deprecated, use encoder private options instead", OFFSET(rc_eq), AV_OPT_TYPE_STRING, {.str = NULL}, CHAR_MIN, CHAR_MAX, V|E}, -#endif -{"maxrate", "maximum bitrate (in bits/s). Used for VBV together with bufsize.", OFFSET(rc_max_rate), AV_OPT_TYPE_INT64, {.i64 = DEFAULT }, 0, INT_MAX, V|A|E}, -{"minrate", "minimum bitrate (in bits/s). Most useful in setting up a CBR encode. It is of little use otherwise.", - OFFSET(rc_min_rate), AV_OPT_TYPE_INT64, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|A|E}, -{"bufsize", "set ratecontrol buffer size (in bits)", OFFSET(rc_buffer_size), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, A|V|E}, -#if FF_API_MPV_OPT -{"rc_buf_aggressivity", "deprecated, use encoder private options instead", OFFSET(rc_buffer_aggressivity), AV_OPT_TYPE_FLOAT, {.dbl = 1.0 }, -FLT_MAX, FLT_MAX, V|E}, -#endif -{"dct", "DCT algorithm", OFFSET(dct_algo), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, 0, INT_MAX, V|E, "dct"}, -{"auto", "autoselect a good one", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DCT_AUTO }, INT_MIN, INT_MAX, V|E, "dct"}, -{"fastint", "fast integer", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DCT_FASTINT }, INT_MIN, INT_MAX, V|E, "dct"}, -{"int", "accurate integer", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DCT_INT }, INT_MIN, INT_MAX, V|E, "dct"}, -{"mmx", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DCT_MMX }, INT_MIN, INT_MAX, V|E, "dct"}, -{"altivec", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DCT_ALTIVEC }, INT_MIN, INT_MAX, V|E, "dct"}, -{"faan", "floating point AAN DCT", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DCT_FAAN }, INT_MIN, INT_MAX, V|E, "dct"}, -{"idct", "select IDCT implementation", OFFSET(idct_algo), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, 0, INT_MAX, V|E|D, "idct"}, -{"auto", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_AUTO }, INT_MIN, INT_MAX, V|E|D, "idct"}, -{"int", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_INT }, INT_MIN, INT_MAX, V|E|D, "idct"}, -{"simple", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SIMPLE }, INT_MIN, INT_MAX, V|E|D, "idct"}, -{"simplemmx", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SIMPLEMMX }, INT_MIN, INT_MAX, V|E|D, "idct"}, -{"arm", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_ARM }, INT_MIN, INT_MAX, V|E|D, "idct"}, -{"altivec", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_ALTIVEC }, INT_MIN, INT_MAX, V|E|D, "idct"}, -#if FF_API_ARCH_SH4 -{"sh4", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SH4 }, INT_MIN, INT_MAX, V|E|D, "idct"}, -#endif -{"simplearm", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SIMPLEARM }, INT_MIN, INT_MAX, V|E|D, "idct"}, -{"simplearmv5te", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SIMPLEARMV5TE }, INT_MIN, INT_MAX, V|E|D, "idct"}, -{"simplearmv6", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SIMPLEARMV6 }, INT_MIN, INT_MAX, V|E|D, "idct"}, -{"simpleneon", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SIMPLENEON }, INT_MIN, INT_MAX, V|E|D, "idct"}, -#if FF_API_ARCH_ALPHA -{"simplealpha", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SIMPLEALPHA }, INT_MIN, INT_MAX, V|E|D, "idct"}, -#endif -#if FF_API_UNUSED_MEMBERS -{"ipp", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_IPP }, INT_MIN, INT_MAX, V|E|D, "idct"}, -#endif /* FF_API_UNUSED_MEMBERS */ -{"xvid", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_XVID }, INT_MIN, INT_MAX, V|E|D, "idct"}, -{"xvidmmx", "deprecated, for compatibility only", 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_XVID }, INT_MIN, INT_MAX, V|E|D, "idct"}, -{"faani", "floating point AAN IDCT", 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_FAAN }, INT_MIN, INT_MAX, V|D|E, "idct"}, -{"simpleauto", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SIMPLEAUTO }, INT_MIN, INT_MAX, V|E|D, "idct"}, -{"slice_count", NULL, OFFSET(slice_count), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, -{"ec", "set error concealment strategy", OFFSET(error_concealment), AV_OPT_TYPE_FLAGS, {.i64 = 3 }, INT_MIN, INT_MAX, V|D, "ec"}, -{"guess_mvs", "iterative motion vector (MV) search (slow)", 0, AV_OPT_TYPE_CONST, {.i64 = FF_EC_GUESS_MVS }, INT_MIN, INT_MAX, V|D, "ec"}, -{"deblock", "use strong deblock filter for damaged MBs", 0, AV_OPT_TYPE_CONST, {.i64 = FF_EC_DEBLOCK }, INT_MIN, INT_MAX, V|D, "ec"}, -{"favor_inter", "favor predicting from the previous frame", 0, AV_OPT_TYPE_CONST, {.i64 = FF_EC_FAVOR_INTER }, INT_MIN, INT_MAX, V|D, "ec"}, -{"bits_per_coded_sample", NULL, OFFSET(bits_per_coded_sample), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, -#if FF_API_PRIVATE_OPT -{"pred", "prediction method", OFFSET(prediction_method), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E, "pred"}, -{"left", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PRED_LEFT }, INT_MIN, INT_MAX, V|E, "pred"}, -{"plane", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PRED_PLANE }, INT_MIN, INT_MAX, V|E, "pred"}, -{"median", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PRED_MEDIAN }, INT_MIN, INT_MAX, V|E, "pred"}, -#endif -{"debug", "print specific debug info", OFFSET(debug), AV_OPT_TYPE_FLAGS, {.i64 = DEFAULT }, 0, INT_MAX, V|A|S|E|D, "debug"}, -{"pict", "picture info", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_PICT_INFO }, INT_MIN, INT_MAX, V|D, "debug"}, -{"rc", "rate control", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_RC }, INT_MIN, INT_MAX, V|E, "debug"}, -{"bitstream", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_BITSTREAM }, INT_MIN, INT_MAX, V|D, "debug"}, -{"mb_type", "macroblock (MB) type", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_MB_TYPE }, INT_MIN, INT_MAX, V|D, "debug"}, -{"qp", "per-block quantization parameter (QP)", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_QP }, INT_MIN, INT_MAX, V|D, "debug"}, -#if FF_API_DEBUG_MV -{"mv", "motion vector", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_MV }, INT_MIN, INT_MAX, V|D, "debug"}, -#endif -{"dct_coeff", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_DCT_COEFF }, INT_MIN, INT_MAX, V|D, "debug"}, -{"green_metadata", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_GREEN_MD }, INT_MIN, INT_MAX, V|D, "debug"}, -{"skip", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_SKIP }, INT_MIN, INT_MAX, V|D, "debug"}, -{"startcode", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_STARTCODE }, INT_MIN, INT_MAX, V|D, "debug"}, -#if FF_API_UNUSED_MEMBERS -{"pts", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_PTS }, INT_MIN, INT_MAX, V|D, "debug"}, -#endif /* FF_API_UNUSED_MEMBERS */ -{"er", "error recognition", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_ER }, INT_MIN, INT_MAX, V|D, "debug"}, -{"mmco", "memory management control operations (H.264)", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_MMCO }, INT_MIN, INT_MAX, V|D, "debug"}, -{"bugs", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_BUGS }, INT_MIN, INT_MAX, V|D, "debug"}, -#if FF_API_DEBUG_MV -{"vis_qp", "visualize quantization parameter (QP), lower QP are tinted greener", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_VIS_QP }, INT_MIN, INT_MAX, V|D, "debug"}, -{"vis_mb_type", "visualize block types", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_VIS_MB_TYPE }, INT_MIN, INT_MAX, V|D, "debug"}, -#endif -{"buffers", "picture buffer allocations", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_BUFFERS }, INT_MIN, INT_MAX, V|D, "debug"}, -{"thread_ops", "threading operations", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_THREADS }, INT_MIN, INT_MAX, V|A|D, "debug"}, -{"nomc", "skip motion compensation", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_NOMC }, INT_MIN, INT_MAX, V|A|D, "debug"}, -#if FF_API_VISMV -{"vismv", "visualize motion vectors (MVs) (deprecated)", OFFSET(debug_mv), AV_OPT_TYPE_FLAGS, {.i64 = DEFAULT }, 0, INT_MAX, V|D, "debug_mv"}, -{"pf", "forward predicted MVs of P-frames", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_VIS_MV_P_FOR }, INT_MIN, INT_MAX, V|D, "debug_mv"}, -{"bf", "forward predicted MVs of B-frames", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_VIS_MV_B_FOR }, INT_MIN, INT_MAX, V|D, "debug_mv"}, -{"bb", "backward predicted MVs of B-frames", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_VIS_MV_B_BACK }, INT_MIN, INT_MAX, V|D, "debug_mv"}, -#endif -{"cmp", "full-pel ME compare function", OFFSET(me_cmp), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E, "cmp_func"}, -{"subcmp", "sub-pel ME compare function", OFFSET(me_sub_cmp), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E, "cmp_func"}, -{"mbcmp", "macroblock compare function", OFFSET(mb_cmp), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E, "cmp_func"}, -{"ildctcmp", "interlaced DCT compare function", OFFSET(ildct_cmp), AV_OPT_TYPE_INT, {.i64 = FF_CMP_VSAD }, INT_MIN, INT_MAX, V|E, "cmp_func"}, -{"dia_size", "diamond type & size for motion estimation", OFFSET(dia_size), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, -{"last_pred", "amount of motion predictors from the previous frame", OFFSET(last_predictor_count), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, -#if FF_API_PRIVATE_OPT -{"preme", "pre motion estimation", OFFSET(pre_me), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, -#endif -{"precmp", "pre motion estimation compare function", OFFSET(me_pre_cmp), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E, "cmp_func"}, -{"sad", "sum of absolute differences, fast", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_SAD }, INT_MIN, INT_MAX, V|E, "cmp_func"}, -{"sse", "sum of squared errors", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_SSE }, INT_MIN, INT_MAX, V|E, "cmp_func"}, -{"satd", "sum of absolute Hadamard transformed differences", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_SATD }, INT_MIN, INT_MAX, V|E, "cmp_func"}, -{"dct", "sum of absolute DCT transformed differences", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_DCT }, INT_MIN, INT_MAX, V|E, "cmp_func"}, -{"psnr", "sum of squared quantization errors (avoid, low quality)", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_PSNR }, INT_MIN, INT_MAX, V|E, "cmp_func"}, -{"bit", "number of bits needed for the block", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_BIT }, INT_MIN, INT_MAX, V|E, "cmp_func"}, -{"rd", "rate distortion optimal, slow", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_RD }, INT_MIN, INT_MAX, V|E, "cmp_func"}, -{"zero", "0", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_ZERO }, INT_MIN, INT_MAX, V|E, "cmp_func"}, -{"vsad", "sum of absolute vertical differences", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_VSAD }, INT_MIN, INT_MAX, V|E, "cmp_func"}, -{"vsse", "sum of squared vertical differences", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_VSSE }, INT_MIN, INT_MAX, V|E, "cmp_func"}, -{"nsse", "noise preserving sum of squared differences", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_NSSE }, INT_MIN, INT_MAX, V|E, "cmp_func"}, -#if CONFIG_SNOW_ENCODER -{"w53", "5/3 wavelet, only used in snow", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_W53 }, INT_MIN, INT_MAX, V|E, "cmp_func"}, -{"w97", "9/7 wavelet, only used in snow", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_W97 }, INT_MIN, INT_MAX, V|E, "cmp_func"}, -#endif -{"dctmax", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_DCTMAX }, INT_MIN, INT_MAX, V|E, "cmp_func"}, -{"chroma", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_CHROMA }, INT_MIN, INT_MAX, V|E, "cmp_func"}, -{"pre_dia_size", "diamond type & size for motion estimation pre-pass", OFFSET(pre_dia_size), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, -{"subq", "sub-pel motion estimation quality", OFFSET(me_subpel_quality), AV_OPT_TYPE_INT, {.i64 = 8 }, INT_MIN, INT_MAX, V|E}, -#if FF_API_AFD -{"dtg_active_format", NULL, OFFSET(dtg_active_format), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, -#endif -{"me_range", "limit motion vectors range (1023 for DivX player)", OFFSET(me_range), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, -#if FF_API_QUANT_BIAS -{"ibias", "intra quant bias", OFFSET(intra_quant_bias), AV_OPT_TYPE_INT, {.i64 = FF_DEFAULT_QUANT_BIAS }, INT_MIN, INT_MAX, V|E}, -{"pbias", "inter quant bias", OFFSET(inter_quant_bias), AV_OPT_TYPE_INT, {.i64 = FF_DEFAULT_QUANT_BIAS }, INT_MIN, INT_MAX, V|E}, -#endif -{"global_quality", NULL, OFFSET(global_quality), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|A|E}, -#if FF_API_CODER_TYPE -{"coder", NULL, OFFSET(coder_type), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E, "coder"}, -{"vlc", "variable length coder / Huffman coder", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CODER_TYPE_VLC }, INT_MIN, INT_MAX, V|E, "coder"}, -{"ac", "arithmetic coder", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CODER_TYPE_AC }, INT_MIN, INT_MAX, V|E, "coder"}, -{"raw", "raw (no encoding)", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CODER_TYPE_RAW }, INT_MIN, INT_MAX, V|E, "coder"}, -{"rle", "run-length coder", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CODER_TYPE_RLE }, INT_MIN, INT_MAX, V|E, "coder"}, -#if FF_API_UNUSED_MEMBERS -{"deflate", "deflate-based coder", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CODER_TYPE_DEFLATE }, INT_MIN, INT_MAX, V|E, "coder"}, -#endif /* FF_API_UNUSED_MEMBERS */ -#endif /* FF_API_CODER_TYPE */ -#if FF_API_PRIVATE_OPT -{"context", "context model", OFFSET(context_model), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, -#endif -{"slice_flags", NULL, OFFSET(slice_flags), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, -#if FF_API_XVMC -{"xvmc_acceleration", NULL, OFFSET(xvmc_acceleration), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, -#endif /* FF_API_XVMC */ -{"mbd", "macroblock decision algorithm (high quality mode)", OFFSET(mb_decision), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, 0, 2, V|E, "mbd"}, -{"simple", "use mbcmp", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MB_DECISION_SIMPLE }, INT_MIN, INT_MAX, V|E, "mbd"}, -{"bits", "use fewest bits", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MB_DECISION_BITS }, INT_MIN, INT_MAX, V|E, "mbd"}, -{"rd", "use best rate distortion", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MB_DECISION_RD }, INT_MIN, INT_MAX, V|E, "mbd"}, -#if FF_API_STREAM_CODEC_TAG -{"stream_codec_tag", NULL, OFFSET(stream_codec_tag), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, -#endif -#if FF_API_PRIVATE_OPT -{"sc_threshold", "scene change threshold", OFFSET(scenechange_threshold), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, -#endif -#if FF_API_MPV_OPT -{"lmin", "deprecated, use encoder private options instead", OFFSET(lmin), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, V|E}, -{"lmax", "deprecated, use encoder private options instead", OFFSET(lmax), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, V|E}, -#endif -#if FF_API_PRIVATE_OPT -{"nr", "noise reduction", OFFSET(noise_reduction), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, -#endif -{"rc_init_occupancy", "number of bits which should be loaded into the rc buffer before decoding starts", OFFSET(rc_initial_buffer_occupancy), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, -{"flags2", NULL, OFFSET(flags2), AV_OPT_TYPE_FLAGS, {.i64 = DEFAULT}, 0, UINT_MAX, V|A|E|D, "flags2"}, -#if FF_API_ERROR_RATE -{"error", NULL, OFFSET(error_rate), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, -#endif -{"threads", "set the number of threads", OFFSET(thread_count), AV_OPT_TYPE_INT, {.i64 = 1 }, 0, INT_MAX, V|A|E|D, "threads"}, -{"auto", "autodetect a suitable number of threads to use", 0, AV_OPT_TYPE_CONST, {.i64 = 0 }, INT_MIN, INT_MAX, V|E|D, "threads"}, -#if FF_API_MPV_OPT -{"me_threshold", "motion estimation threshold", OFFSET(me_threshold), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, -{"mb_threshold", "macroblock threshold", OFFSET(mb_threshold), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, -#endif -{"dc", "intra_dc_precision", OFFSET(intra_dc_precision), AV_OPT_TYPE_INT, {.i64 = 0 }, -8, 16, V|E}, -{"nssew", "nsse weight", OFFSET(nsse_weight), AV_OPT_TYPE_INT, {.i64 = 8 }, INT_MIN, INT_MAX, V|E}, -{"skip_top", "number of macroblock rows at the top which are skipped", OFFSET(skip_top), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|D}, -{"skip_bottom", "number of macroblock rows at the bottom which are skipped", OFFSET(skip_bottom), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|D}, -{"profile", NULL, OFFSET(profile), AV_OPT_TYPE_INT, {.i64 = FF_PROFILE_UNKNOWN }, INT_MIN, INT_MAX, V|A|E, "profile"}, -{"unknown", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_UNKNOWN }, INT_MIN, INT_MAX, V|A|E, "profile"}, -{"aac_main", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_AAC_MAIN }, INT_MIN, INT_MAX, A|E, "profile"}, -{"aac_low", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_AAC_LOW }, INT_MIN, INT_MAX, A|E, "profile"}, -{"aac_ssr", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_AAC_SSR }, INT_MIN, INT_MAX, A|E, "profile"}, -{"aac_ltp", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_AAC_LTP }, INT_MIN, INT_MAX, A|E, "profile"}, -{"aac_he", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_AAC_HE }, INT_MIN, INT_MAX, A|E, "profile"}, -{"aac_he_v2", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_AAC_HE_V2 }, INT_MIN, INT_MAX, A|E, "profile"}, -{"aac_ld", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_AAC_LD }, INT_MIN, INT_MAX, A|E, "profile"}, -{"aac_eld", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_AAC_ELD }, INT_MIN, INT_MAX, A|E, "profile"}, -{"mpeg2_aac_low", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_MPEG2_AAC_LOW }, INT_MIN, INT_MAX, A|E, "profile"}, -{"mpeg2_aac_he", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_MPEG2_AAC_HE }, INT_MIN, INT_MAX, A|E, "profile"}, -{"dts", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_DTS }, INT_MIN, INT_MAX, A|E, "profile"}, -{"dts_es", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_DTS_ES }, INT_MIN, INT_MAX, A|E, "profile"}, -{"dts_96_24", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_DTS_96_24 }, INT_MIN, INT_MAX, A|E, "profile"}, -{"dts_hd_hra", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_DTS_HD_HRA }, INT_MIN, INT_MAX, A|E, "profile"}, -{"dts_hd_ma", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_DTS_HD_MA }, INT_MIN, INT_MAX, A|E, "profile"}, -{"mpeg4_sp", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_MPEG4_SIMPLE }, INT_MIN, INT_MAX, V|E, "profile"}, -{"mpeg4_core", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_MPEG4_CORE }, INT_MIN, INT_MAX, V|E, "profile"}, -{"mpeg4_main", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_MPEG4_MAIN }, INT_MIN, INT_MAX, V|E, "profile"}, -{"mpeg4_asp", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_MPEG4_ADVANCED_SIMPLE }, INT_MIN, INT_MAX, V|E, "profile"}, -{"level", NULL, OFFSET(level), AV_OPT_TYPE_INT, {.i64 = FF_LEVEL_UNKNOWN }, INT_MIN, INT_MAX, V|A|E, "level"}, -{"unknown", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_LEVEL_UNKNOWN }, INT_MIN, INT_MAX, V|A|E, "level"}, -{"mblmin", "minimum macroblock Lagrange factor (VBR)", OFFSET(mb_lmin), AV_OPT_TYPE_INT, {.i64 = FF_QP2LAMBDA * 2 }, 1, FF_LAMBDA_MAX, V|E}, -{"mblmax", "maximum macroblock Lagrange factor (VBR)", OFFSET(mb_lmax), AV_OPT_TYPE_INT, {.i64 = FF_QP2LAMBDA * 31 }, 1, FF_LAMBDA_MAX, V|E}, -{"skip_idct" , "skip IDCT/dequantization for the selected frames", OFFSET(skip_idct), AV_OPT_TYPE_INT, {.i64 = AVDISCARD_DEFAULT }, INT_MIN, INT_MAX, V|D, "avdiscard"}, -{"skip_frame" , "skip decoding for the selected frames", OFFSET(skip_frame), AV_OPT_TYPE_INT, {.i64 = AVDISCARD_DEFAULT }, INT_MIN, INT_MAX, V|D, "avdiscard"}, -{"none" , "discard no frame", 0, AV_OPT_TYPE_CONST, {.i64 = AVDISCARD_NONE }, INT_MIN, INT_MAX, V|D, "avdiscard"}, -{"default" , "discard useless frames", 0, AV_OPT_TYPE_CONST, {.i64 = AVDISCARD_DEFAULT }, INT_MIN, INT_MAX, V|D, "avdiscard"}, -{"noref" , "discard all non-reference frames", 0, AV_OPT_TYPE_CONST, {.i64 = AVDISCARD_NONREF }, INT_MIN, INT_MAX, V|D, "avdiscard"}, -{"bidir" , "discard all bidirectional frames", 0, AV_OPT_TYPE_CONST, {.i64 = AVDISCARD_BIDIR }, INT_MIN, INT_MAX, V|D, "avdiscard"}, -{"nokey" , "discard all frames except keyframes", 0, AV_OPT_TYPE_CONST, {.i64 = AVDISCARD_NONKEY }, INT_MIN, INT_MAX, V|D, "avdiscard"}, -{"nointra" , "discard all frames except I frames", 0, AV_OPT_TYPE_CONST, {.i64 = AVDISCARD_NONINTRA}, INT_MIN, INT_MAX, V|D, "avdiscard"}, -{"all" , "discard all frames", 0, AV_OPT_TYPE_CONST, {.i64 = AVDISCARD_ALL }, INT_MIN, INT_MAX, V|D, "avdiscard"}, -{"bidir_refine", "refine the two motion vectors used in bidirectional macroblocks", OFFSET(bidir_refine), AV_OPT_TYPE_INT, {.i64 = 1 }, 0, 4, V|E}, -{"keyint_min", "minimum interval between IDR-frames", OFFSET(keyint_min), AV_OPT_TYPE_INT, {.i64 = 25 }, INT_MIN, INT_MAX, V|E}, -{"refs", "reference frames to consider for motion compensation", OFFSET(refs), AV_OPT_TYPE_INT, {.i64 = 1 }, INT_MIN, INT_MAX, V|E}, -{"trellis", "rate-distortion optimal quantization", OFFSET(trellis), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|A|E}, -{"mv0_threshold", NULL, OFFSET(mv0_threshold), AV_OPT_TYPE_INT, {.i64 = 256 }, 0, INT_MAX, V|E}, -#if FF_API_PRIVATE_OPT -{"b_sensitivity", "adjust sensitivity of b_frame_strategy 1", OFFSET(b_sensitivity), AV_OPT_TYPE_INT, {.i64 = 40 }, 1, INT_MAX, V|E}, -#endif -{"compression_level", NULL, OFFSET(compression_level), AV_OPT_TYPE_INT, {.i64 = FF_COMPRESSION_DEFAULT }, INT_MIN, INT_MAX, V|A|E}, -#if FF_API_PRIVATE_OPT -{"min_prediction_order", NULL, OFFSET(min_prediction_order), AV_OPT_TYPE_INT, {.i64 = -1 }, INT_MIN, INT_MAX, A|E}, -{"max_prediction_order", NULL, OFFSET(max_prediction_order), AV_OPT_TYPE_INT, {.i64 = -1 }, INT_MIN, INT_MAX, A|E}, -{"timecode_frame_start", "GOP timecode frame start number, in non-drop-frame format", OFFSET(timecode_frame_start), AV_OPT_TYPE_INT64, {.i64 = -1 }, -1, INT64_MAX, V|E}, -#endif -{"bits_per_raw_sample", NULL, OFFSET(bits_per_raw_sample), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, -{"channel_layout", NULL, OFFSET(channel_layout), AV_OPT_TYPE_INT64, {.i64 = DEFAULT }, 0, INT64_MAX, A|E|D, "channel_layout"}, -{"request_channel_layout", NULL, OFFSET(request_channel_layout), AV_OPT_TYPE_INT64, {.i64 = DEFAULT }, 0, INT64_MAX, A|D, "request_channel_layout"}, -{"rc_max_vbv_use", NULL, OFFSET(rc_max_available_vbv_use), AV_OPT_TYPE_FLOAT, {.dbl = 0 }, 0.0, FLT_MAX, V|E}, -{"rc_min_vbv_use", NULL, OFFSET(rc_min_vbv_overflow_use), AV_OPT_TYPE_FLOAT, {.dbl = 3 }, 0.0, FLT_MAX, V|E}, -{"ticks_per_frame", NULL, OFFSET(ticks_per_frame), AV_OPT_TYPE_INT, {.i64 = 1 }, 1, INT_MAX, A|V|E|D}, -{"log_level_offset", "set the log level offset", OFFSET(log_level_offset), AV_OPT_TYPE_INT, {.i64 = 0 }, INT_MIN, INT_MAX }, -{"slices", "set the number of slices, used in parallelized encoding", OFFSET(slices), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, V|E}, -{"thread_type", "select multithreading type", OFFSET(thread_type), AV_OPT_TYPE_FLAGS, {.i64 = FF_THREAD_SLICE|FF_THREAD_FRAME }, 0, INT_MAX, V|A|E|D, "thread_type"}, -{"slice", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_THREAD_SLICE }, INT_MIN, INT_MAX, V|E|D, "thread_type"}, -{"frame", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_THREAD_FRAME }, INT_MIN, INT_MAX, V|E|D, "thread_type"}, -{"audio_service_type", "audio service type", OFFSET(audio_service_type), AV_OPT_TYPE_INT, {.i64 = AV_AUDIO_SERVICE_TYPE_MAIN }, 0, AV_AUDIO_SERVICE_TYPE_NB-1, A|E, "audio_service_type"}, -{"ma", "Main Audio Service", 0, AV_OPT_TYPE_CONST, {.i64 = AV_AUDIO_SERVICE_TYPE_MAIN }, INT_MIN, INT_MAX, A|E, "audio_service_type"}, -{"ef", "Effects", 0, AV_OPT_TYPE_CONST, {.i64 = AV_AUDIO_SERVICE_TYPE_EFFECTS }, INT_MIN, INT_MAX, A|E, "audio_service_type"}, -{"vi", "Visually Impaired", 0, AV_OPT_TYPE_CONST, {.i64 = AV_AUDIO_SERVICE_TYPE_VISUALLY_IMPAIRED }, INT_MIN, INT_MAX, A|E, "audio_service_type"}, -{"hi", "Hearing Impaired", 0, AV_OPT_TYPE_CONST, {.i64 = AV_AUDIO_SERVICE_TYPE_HEARING_IMPAIRED }, INT_MIN, INT_MAX, A|E, "audio_service_type"}, -{"di", "Dialogue", 0, AV_OPT_TYPE_CONST, {.i64 = AV_AUDIO_SERVICE_TYPE_DIALOGUE }, INT_MIN, INT_MAX, A|E, "audio_service_type"}, -{"co", "Commentary", 0, AV_OPT_TYPE_CONST, {.i64 = AV_AUDIO_SERVICE_TYPE_COMMENTARY }, INT_MIN, INT_MAX, A|E, "audio_service_type"}, -{"em", "Emergency", 0, AV_OPT_TYPE_CONST, {.i64 = AV_AUDIO_SERVICE_TYPE_EMERGENCY }, INT_MIN, INT_MAX, A|E, "audio_service_type"}, -{"vo", "Voice Over", 0, AV_OPT_TYPE_CONST, {.i64 = AV_AUDIO_SERVICE_TYPE_VOICE_OVER }, INT_MIN, INT_MAX, A|E, "audio_service_type"}, -{"ka", "Karaoke", 0, AV_OPT_TYPE_CONST, {.i64 = AV_AUDIO_SERVICE_TYPE_KARAOKE }, INT_MIN, INT_MAX, A|E, "audio_service_type"}, -{"request_sample_fmt", "sample format audio decoders should prefer", OFFSET(request_sample_fmt), AV_OPT_TYPE_SAMPLE_FMT, {.i64=AV_SAMPLE_FMT_NONE}, -1, INT_MAX, A|D, "request_sample_fmt"}, -{"pkt_timebase", NULL, OFFSET(pkt_timebase), AV_OPT_TYPE_RATIONAL, {.dbl = 0 }, 0, INT_MAX, 0}, -{"refcounted_frames", NULL, OFFSET(refcounted_frames), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, A|V|D }, -#if FF_API_SIDEDATA_ONLY_PKT -{"side_data_only_packets", NULL, OFFSET(side_data_only_packets), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, A|V|E }, -#endif -{NULL}, -}; - -#undef A -#undef V -#undef S -#undef E -#undef D -#undef DEFAULT -#undef OFFSET - -#endif /* AVCODEC_OPTIONS_TABLE_H */ From 34afd585c72239e32f3f9a90571ea9cfbf38404f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Wed, 10 Apr 2024 22:57:12 +0200 Subject: [PATCH 073/719] Delete all kinds of stuff --- Common/compat.c | 43 -- ext/at3_standalone/avcodec.h | 832 +---------------------------- ext/at3_standalone/avpacket.c | 60 --- ext/at3_standalone/avutil.h | 1 - ext/at3_standalone/frame.c | 1 - ext/at3_standalone/frame.h | 2 - ext/at3_standalone/get_bits.h | 236 -------- ext/at3_standalone/internal.h | 63 --- ext/at3_standalone/opt.c | 503 ----------------- ext/at3_standalone/opt.h | 46 -- ext/at3_standalone/options.c | 85 --- ext/at3_standalone/util_internal.h | 181 ------- ext/at3_standalone/utils.c | 65 +-- 13 files changed, 11 insertions(+), 2107 deletions(-) diff --git a/Common/compat.c b/Common/compat.c index 2e9410662f..8679906697 100644 --- a/Common/compat.c +++ b/Common/compat.c @@ -4,49 +4,6 @@ #include "ext/at3_standalone/compat.h" #include "ext/at3_standalone/common.h" -/* -void *av_malloc(size_t size) { - return malloc(size); -} - -void *av_mallocz(size_t size) { - return calloc(size, 1); -} - -void av_free(void *p) { - free(p); -} - -void av_freep(void **p) { - void *pp = *p; - free(pp); - *p = 0; -} - -int ff_fast_malloc(void *ptr, unsigned int *size, size_t min_size, int zero_realloc) -{ - void *val; - - memcpy(&val, ptr, sizeof(val)); - if (min_size <= *size) { - av_assert0(val || !min_size); - return 0; - } - min_size = FFMAX(min_size + min_size / 16 + 32, min_size); - av_freep(ptr); - val = zero_realloc ? av_mallocz(min_size) : av_malloc(min_size); - memcpy(ptr, &val, sizeof(val)); - if (!val) - min_size = 0; - *size = min_size; - return 1; -} - -int av_fast_malloc(void *ptr, unsigned int *size, size_t min_size) { - return ff_fast_malloc(ptr, size, min_size, 0); -} -*/ - void av_log(void *avcl, int level, const char *fmt, ...) { } diff --git a/ext/at3_standalone/avcodec.h b/ext/at3_standalone/avcodec.h index 2ce18c3bd5..3b024cbae9 100644 --- a/ext/at3_standalone/avcodec.h +++ b/ext/at3_standalone/avcodec.h @@ -1062,16 +1062,6 @@ typedef struct AVPacket { int64_t duration; int64_t pos; ///< byte position in stream, -1 if unknown - -#if FF_API_CONVERGENCE_DURATION - /** - * @deprecated Same as the duration field, but as int64_t. This was required - * for Matroska subtitles, whose duration values could overflow when the - * duration field was still an int. - */ - attribute_deprecated - int64_t convergence_duration; -#endif } AVPacket; #define AV_PKT_FLAG_KEY 0x0001 ///< The packet contains a keyframe #define AV_PKT_FLAG_CORRUPT 0x0002 ///< The packet content is corrupted @@ -1266,13 +1256,6 @@ typedef struct AVCodecContext { */ float b_quant_offset; - /** - * Size of the frame reordering buffer in the decoder. - * For MPEG-2 it is 1 IPB or 0 low delay IP. - * - encoding: Set by libavcodec. - * - decoding: Set by libavcodec. - */ - int has_b_frames; #if FF_API_PRIVATE_OPT /** @deprecated use encoder private options instead */ @@ -1303,159 +1286,6 @@ typedef struct AVCodecContext { */ int *slice_offset; - /** - * motion estimation comparison function - * - encoding: Set by user. - * - decoding: unused - */ - int me_cmp; - /** - * subpixel motion estimation comparison function - * - encoding: Set by user. - * - decoding: unused - */ - int me_sub_cmp; - /** - * macroblock comparison function (not supported yet) - * - encoding: Set by user. - * - decoding: unused - */ - int mb_cmp; - /** - * interlaced DCT comparison function - * - encoding: Set by user. - * - decoding: unused - */ - int ildct_cmp; -#define FF_CMP_SAD 0 -#define FF_CMP_SSE 1 -#define FF_CMP_SATD 2 -#define FF_CMP_DCT 3 -#define FF_CMP_PSNR 4 -#define FF_CMP_BIT 5 -#define FF_CMP_RD 6 -#define FF_CMP_ZERO 7 -#define FF_CMP_VSAD 8 -#define FF_CMP_VSSE 9 -#define FF_CMP_NSSE 10 -#define FF_CMP_W53 11 -#define FF_CMP_W97 12 -#define FF_CMP_DCTMAX 13 -#define FF_CMP_DCT264 14 -#define FF_CMP_CHROMA 256 - - /** - * ME diamond size & shape - * - encoding: Set by user. - * - decoding: unused - */ - int dia_size; - - /** - * amount of previous MV predictors (2a+1 x 2a+1 square) - * - encoding: Set by user. - * - decoding: unused - */ - int last_predictor_count; - -#if FF_API_PRIVATE_OPT - /** @deprecated use encoder private options instead */ - attribute_deprecated - int pre_me; -#endif - - /** - * motion estimation prepass comparison function - * - encoding: Set by user. - * - decoding: unused - */ - int me_pre_cmp; - - /** - * ME prepass diamond size & shape - * - encoding: Set by user. - * - decoding: unused - */ - int pre_dia_size; - - /** - * subpel ME quality - * - encoding: Set by user. - * - decoding: unused - */ - int me_subpel_quality; - -#if FF_API_AFD - /** - * DTG active format information (additional aspect ratio - * information only used in DVB MPEG-2 transport streams) - * 0 if not set. - * - * - encoding: unused - * - decoding: Set by decoder. - * @deprecated Deprecated in favor of AVSideData - */ - attribute_deprecated int dtg_active_format; -#define FF_DTG_AFD_SAME 8 -#define FF_DTG_AFD_4_3 9 -#define FF_DTG_AFD_16_9 10 -#define FF_DTG_AFD_14_9 11 -#define FF_DTG_AFD_4_3_SP_14_9 13 -#define FF_DTG_AFD_16_9_SP_14_9 14 -#define FF_DTG_AFD_SP_4_3 15 -#endif /* FF_API_AFD */ - - /** - * maximum motion estimation search range in subpel units - * If 0 then no limit. - * - * - encoding: Set by user. - * - decoding: unused - */ - int me_range; - -#if FF_API_QUANT_BIAS - /** - * @deprecated use encoder private option instead - */ - attribute_deprecated int intra_quant_bias; -#define FF_DEFAULT_QUANT_BIAS 999999 - - /** - * @deprecated use encoder private option instead - */ - attribute_deprecated int inter_quant_bias; -#endif - - /** - * slice flags - * - encoding: unused - * - decoding: Set by user. - */ - int slice_flags; -#define SLICE_FLAG_CODED_ORDER 0x0001 ///< draw_horiz_band() is called in coded order instead of display -#define SLICE_FLAG_ALLOW_FIELD 0x0002 ///< allow draw_horiz_band() with field slices (MPEG2 field pics) -#define SLICE_FLAG_ALLOW_PLANE 0x0004 ///< allow draw_horiz_band() with 1 component at a time (SVQ1) - -#if FF_API_XVMC - /** - * XVideo Motion Acceleration - * - encoding: forbidden - * - decoding: set by decoder - * @deprecated XvMC doesn't need it anymore. - */ - attribute_deprecated int xvmc_acceleration; -#endif /* FF_API_XVMC */ - - /** - * macroblock decision mode - * - encoding: Set by user. - * - decoding: unused - */ - int mb_decision; -#define FF_MB_DECISION_SIMPLE 0 ///< uses mb_cmp -#define FF_MB_DECISION_BITS 1 ///< chooses the one which needs the fewest bits -#define FF_MB_DECISION_RD 2 ///< rate distortion /** * custom intra quantization matrix @@ -1471,81 +1301,6 @@ typedef struct AVCodecContext { */ uint16_t *inter_matrix; -#if FF_API_PRIVATE_OPT - /** @deprecated use encoder private options instead */ - attribute_deprecated - int scenechange_threshold; - - /** @deprecated use encoder private options instead */ - attribute_deprecated - int noise_reduction; -#endif - -#if FF_API_MPV_OPT - /** - * @deprecated this field is unused - */ - attribute_deprecated - int me_threshold; - - /** - * @deprecated this field is unused - */ - attribute_deprecated - int mb_threshold; -#endif - - /** - * precision of the intra DC coefficient - 8 - * - encoding: Set by user. - * - decoding: Set by libavcodec - */ - int intra_dc_precision; - - /** - * Number of macroblock rows at the top which are skipped. - * - encoding: unused - * - decoding: Set by user. - */ - int skip_top; - - /** - * Number of macroblock rows at the bottom which are skipped. - * - encoding: unused - * - decoding: Set by user. - */ - int skip_bottom; - -#if FF_API_MPV_OPT - /** - * @deprecated use encoder private options instead - */ - attribute_deprecated - float border_masking; -#endif - - /** - * minimum MB lagrange multipler - * - encoding: Set by user. - * - decoding: unused - */ - int mb_lmin; - - /** - * maximum MB lagrange multipler - * - encoding: Set by user. - * - decoding: unused - */ - int mb_lmax; - -#if FF_API_PRIVATE_OPT - /** - * @deprecated use encoder private options instead - */ - attribute_deprecated - int me_penalty_compensation; -#endif - /** * * - encoding: Set by user. @@ -1573,70 +1328,6 @@ typedef struct AVCodecContext { */ int refs; -#if FF_API_PRIVATE_OPT - /** @deprecated use encoder private options instead */ - attribute_deprecated - int chromaoffset; -#endif - -#if FF_API_UNUSED_MEMBERS - /** - * Multiplied by qscale for each frame and added to scene_change_score. - * - encoding: Set by user. - * - decoding: unused - */ - attribute_deprecated int scenechange_factor; -#endif - - /** - * - * Note: Value depends upon the compare function used for fullpel ME. - * - encoding: Set by user. - * - decoding: unused - */ - int mv0_threshold; - -#if FF_API_PRIVATE_OPT - /** @deprecated use encoder private options instead */ - attribute_deprecated - int b_sensitivity; -#endif - - /** - * Chromaticity coordinates of the source primaries. - * - encoding: Set by user - * - decoding: Set by libavcodec - */ - enum AVColorPrimaries color_primaries; - - /** - * Color Transfer Characteristic. - * - encoding: Set by user - * - decoding: Set by libavcodec - */ - enum AVColorTransferCharacteristic color_trc; - - /** - * YUV colorspace type. - * - encoding: Set by user - * - decoding: Set by libavcodec - */ - enum AVColorSpace colorspace; - - /** - * MPEG vs JPEG YUV range. - * - encoding: Set by user - * - decoding: Set by libavcodec - */ - enum AVColorRange color_range; - - /** - * This defines the location of chroma samples. - * - encoding: Set by user - * - decoding: Set by libavcodec - */ - enum AVChromaLocation chroma_sample_location; - /** * Number of slices. * Indicates number of picture subdivisions. Used for parallelized @@ -1823,44 +1514,6 @@ typedef struct AVCodecContext { */ int refcounted_frames; - /* - encoding parameters */ - float qcompress; ///< amount of qscale change between easy & hard scenes (0.0-1.0) - float qblur; ///< amount of qscale smoothing over time (0.0-1.0) - - /** - * minimum quantizer - * - encoding: Set by user. - * - decoding: unused - */ - int qmin; - - /** - * maximum quantizer - * - encoding: Set by user. - * - decoding: unused - */ - int qmax; - - /** - * maximum quantizer difference between frames - * - encoding: Set by user. - * - decoding: unused - */ - int max_qdiff; - -#if FF_API_MPV_OPT - /** - * @deprecated use encoder private options instead - */ - attribute_deprecated - float rc_qsquish; - - attribute_deprecated - float rc_qmod_amp; - attribute_deprecated - int rc_qmod_freq; -#endif - /** * decoder bitstream buffer size * - encoding: Set by user. @@ -1876,244 +1529,6 @@ typedef struct AVCodecContext { int rc_override_count; RcOverride *rc_override; -#if FF_API_MPV_OPT - /** - * @deprecated use encoder private options instead - */ - attribute_deprecated - const char *rc_eq; -#endif - - /** - * maximum bitrate - * - encoding: Set by user. - * - decoding: Set by user, may be overwritten by libavcodec. - */ - int64_t rc_max_rate; - - /** - * minimum bitrate - * - encoding: Set by user. - * - decoding: unused - */ - int64_t rc_min_rate; - -#if FF_API_MPV_OPT - /** - * @deprecated use encoder private options instead - */ - attribute_deprecated - float rc_buffer_aggressivity; - - attribute_deprecated - float rc_initial_cplx; -#endif - - /** - * Ratecontrol attempt to use, at maximum, of what can be used without an underflow. - * - encoding: Set by user. - * - decoding: unused. - */ - float rc_max_available_vbv_use; - - /** - * Ratecontrol attempt to use, at least, times the amount needed to prevent a vbv overflow. - * - encoding: Set by user. - * - decoding: unused. - */ - float rc_min_vbv_overflow_use; - - /** - * Number of bits which should be loaded into the rc buffer before decoding starts. - * - encoding: Set by user. - * - decoding: unused - */ - int rc_initial_buffer_occupancy; - -#if FF_API_CODER_TYPE -#define FF_CODER_TYPE_VLC 0 -#define FF_CODER_TYPE_AC 1 -#define FF_CODER_TYPE_RAW 2 -#define FF_CODER_TYPE_RLE 3 -#if FF_API_UNUSED_MEMBERS -#define FF_CODER_TYPE_DEFLATE 4 -#endif /* FF_API_UNUSED_MEMBERS */ - /** - * @deprecated use encoder private options instead - */ - attribute_deprecated - int coder_type; -#endif /* FF_API_CODER_TYPE */ - -#if FF_API_PRIVATE_OPT - /** @deprecated use encoder private options instead */ - attribute_deprecated - int context_model; -#endif - -#if FF_API_MPV_OPT - /** - * @deprecated use encoder private options instead - */ - attribute_deprecated - int lmin; - - /** - * @deprecated use encoder private options instead - */ - attribute_deprecated - int lmax; -#endif - -#if FF_API_PRIVATE_OPT - /** @deprecated use encoder private options instead */ - attribute_deprecated - int frame_skip_threshold; - - /** @deprecated use encoder private options instead */ - attribute_deprecated - int frame_skip_factor; - - /** @deprecated use encoder private options instead */ - attribute_deprecated - int frame_skip_exp; - - /** @deprecated use encoder private options instead */ - attribute_deprecated - int frame_skip_cmp; -#endif /* FF_API_PRIVATE_OPT */ - - /** - * trellis RD quantization - * - encoding: Set by user. - * - decoding: unused - */ - int trellis; - -#if FF_API_PRIVATE_OPT - /** @deprecated use encoder private options instead */ - attribute_deprecated - int min_prediction_order; - - /** @deprecated use encoder private options instead */ - attribute_deprecated - int max_prediction_order; - - /** @deprecated use encoder private options instead */ - attribute_deprecated - int64_t timecode_frame_start; -#endif - -#if FF_API_RTP_CALLBACK - /** - * @deprecated unused - */ - /* The RTP callback: This function is called */ - /* every time the encoder has a packet to send. */ - /* It depends on the encoder if the data starts */ - /* with a Start Code (it should). H.263 does. */ - /* mb_nb contains the number of macroblocks */ - /* encoded in the RTP payload. */ - attribute_deprecated - void (*rtp_callback)(struct AVCodecContext *avctx, void *data, int size, int mb_nb); -#endif - -#if FF_API_PRIVATE_OPT - /** @deprecated use encoder private options instead */ - attribute_deprecated - int rtp_payload_size; /* The size of the RTP payload: the coder will */ - /* do its best to deliver a chunk with size */ - /* below rtp_payload_size, the chunk will start */ - /* with a start code on some codecs like H.263. */ - /* This doesn't take account of any particular */ - /* headers inside the transmitted RTP payload. */ -#endif - -#if FF_API_STAT_BITS - /* statistics, used for 2-pass encoding */ - attribute_deprecated - int mv_bits; - attribute_deprecated - int header_bits; - attribute_deprecated - int i_tex_bits; - attribute_deprecated - int p_tex_bits; - attribute_deprecated - int i_count; - attribute_deprecated - int p_count; - attribute_deprecated - int skip_count; - attribute_deprecated - int misc_bits; - - /** @deprecated this field is unused */ - attribute_deprecated - int frame_bits; -#endif - - /** - * pass1 encoding statistics output buffer - * - encoding: Set by libavcodec. - * - decoding: unused - */ - char *stats_out; - - /** - * pass2 encoding statistics input buffer - * Concatenated stuff from stats_out of pass1 should be placed here. - * - encoding: Allocated/set/freed by user. - * - decoding: unused - */ - char *stats_in; - - /** - * Work around bugs in encoders which sometimes cannot be detected automatically. - * - encoding: Set by user - * - decoding: Set by user - */ - int workaround_bugs; -#define FF_BUG_AUTODETECT 1 ///< autodetection -#if FF_API_OLD_MSMPEG4 -#define FF_BUG_OLD_MSMPEG4 2 -#endif -#define FF_BUG_XVID_ILACE 4 -#define FF_BUG_UMP4 8 -#define FF_BUG_NO_PADDING 16 -#define FF_BUG_AMV 32 -#if FF_API_AC_VLC -#define FF_BUG_AC_VLC 0 ///< Will be removed, libavcodec can now handle these non-compliant files by default. -#endif -#define FF_BUG_QPEL_CHROMA 64 -#define FF_BUG_STD_QPEL 128 -#define FF_BUG_QPEL_CHROMA2 256 -#define FF_BUG_DIRECT_BLOCKSIZE 512 -#define FF_BUG_EDGE 1024 -#define FF_BUG_HPEL_CHROMA 2048 -#define FF_BUG_DC_CLIP 4096 -#define FF_BUG_MS 8192 ///< Work around various bugs in Microsoft's broken decoders. -#define FF_BUG_TRUNCATED 16384 - - /** - * strictly follow the standard (MPEG4, ...). - * - encoding: Set by user. - * - decoding: Set by user. - * Setting this to STRICT or higher means the encoder and decoder will - * generally do stupid things, whereas setting it to unofficial or lower - * will mean the encoder might produce output that is not supported by all - * spec-compliant decoders. Decoders don't differentiate between normal, - * unofficial and experimental (that is, they always try to decode things - * when they can) unless they are explicitly asked to behave stupidly - * (=strictly conform to the specs) - */ - int strict_std_compliance; -#define FF_COMPLIANCE_VERY_STRICT 2 ///< Strictly conform to an older more strict version of the spec or reference software. -#define FF_COMPLIANCE_STRICT 1 ///< Strictly conform to all the things in the spec no matter what consequences. -#define FF_COMPLIANCE_NORMAL 0 -#define FF_COMPLIANCE_UNOFFICIAL -1 ///< Allow unofficial extensions -#define FF_COMPLIANCE_EXPERIMENTAL -2 ///< Allow nonstandardized experimental things. - /** * error concealment flags * - encoding: unused @@ -2124,54 +1539,6 @@ typedef struct AVCodecContext { #define FF_EC_DEBLOCK 2 #define FF_EC_FAVOR_INTER 256 - /** - * debug - * - encoding: Set by user. - * - decoding: Set by user. - */ - int debug; -#define FF_DEBUG_PICT_INFO 1 -#define FF_DEBUG_RC 2 -#define FF_DEBUG_BITSTREAM 4 -#define FF_DEBUG_MB_TYPE 8 -#define FF_DEBUG_QP 16 -#if FF_API_DEBUG_MV -/** - * @deprecated this option does nothing - */ -#define FF_DEBUG_MV 32 -#endif -#define FF_DEBUG_DCT_COEFF 0x00000040 -#define FF_DEBUG_SKIP 0x00000080 -#define FF_DEBUG_STARTCODE 0x00000100 -#if FF_API_UNUSED_MEMBERS -#define FF_DEBUG_PTS 0x00000200 -#endif /* FF_API_UNUSED_MEMBERS */ -#define FF_DEBUG_ER 0x00000400 -#define FF_DEBUG_MMCO 0x00000800 -#define FF_DEBUG_BUGS 0x00001000 -#if FF_API_DEBUG_MV -#define FF_DEBUG_VIS_QP 0x00002000 ///< only access through AVOptions from outside libavcodec -#define FF_DEBUG_VIS_MB_TYPE 0x00004000 ///< only access through AVOptions from outside libavcodec -#endif -#define FF_DEBUG_BUFFERS 0x00008000 -#define FF_DEBUG_THREADS 0x00010000 -#define FF_DEBUG_GREEN_MD 0x00800000 -#define FF_DEBUG_NOMC 0x01000000 - -#if FF_API_DEBUG_MV - /** - * debug - * Code outside libavcodec should access this field using AVOptions - * - encoding: Set by user. - * - decoding: Set by user. - */ - int debug_mv; -#define FF_DEBUG_VIS_MV_P_FOR 0x00000001 //visualize forward predicted MVs of P frames -#define FF_DEBUG_VIS_MV_B_FOR 0x00000002 //visualize forward predicted MVs of B frames -#define FF_DEBUG_VIS_MV_B_BACK 0x00000004 //visualize backward predicted MVs of B frames -#endif - /** * Error recognition; may misdetect some more or less valid parts as errors. * - encoding: unused @@ -2202,19 +1569,6 @@ typedef struct AVCodecContext { */ uint64_t error[AV_NUM_DATA_POINTERS]; - /** - * DCT algorithm, see FF_DCT_* below - * - encoding: Set by user. - * - decoding: unused - */ - int dct_algo; -#define FF_DCT_AUTO 0 -#define FF_DCT_FASTINT 1 -#define FF_DCT_INT 2 -#define FF_DCT_MMX 3 -#define FF_DCT_ALTIVEC 5 -#define FF_DCT_FAAN 6 - /** * IDCT algorithm, see FF_IDCT_* below. * - encoding: Set by user. @@ -2285,75 +1639,6 @@ typedef struct AVCodecContext { */ attribute_deprecated AVFrame *coded_frame; #endif - - /** - * thread count - * is used to decide how many independent tasks should be passed to execute() - * - encoding: Set by user. - * - decoding: Set by user. - */ - int thread_count; - - /** - * Which multithreading methods to use. - * Use of FF_THREAD_FRAME will increase decoding delay by one frame per thread, - * so clients which cannot provide future frames should not use it. - * - * - encoding: Set by user, otherwise the default is used. - * - decoding: Set by user, otherwise the default is used. - */ - int thread_type; -#define FF_THREAD_FRAME 1 ///< Decode more than one frame at once -#define FF_THREAD_SLICE 2 ///< Decode more than one part of a single frame at once - - /** - * Which multithreading methods are in use by the codec. - * - encoding: Set by libavcodec. - * - decoding: Set by libavcodec. - */ - int active_thread_type; - - /** - * Set by the client if its custom get_buffer() callback can be called - * synchronously from another thread, which allows faster multithreaded decoding. - * draw_horiz_band() will be called from other threads regardless of this setting. - * Ignored if the default get_buffer() is used. - * - encoding: Set by user. - * - decoding: Set by user. - */ - int thread_safe_callbacks; - - /** - * The codec may call this to execute several independent things. - * It will return only after finishing all tasks. - * The user may replace this with some multithreaded implementation, - * the default implementation will execute the parts serially. - * @param count the number of things to execute - * - encoding: Set by libavcodec, user can override. - * - decoding: Set by libavcodec, user can override. - */ - int (*execute)(struct AVCodecContext *c, int (*func)(struct AVCodecContext *c2, void *arg), void *arg2, int *ret, int count, int size); - - /** - * The codec may call this to execute several independent things. - * It will return only after finishing all tasks. - * The user may replace this with some multithreaded implementation, - * the default implementation will execute the parts serially. - * Also see avcodec_thread_init and e.g. the --enable-pthread configure option. - * @param c context passed also to func - * @param count the number of things to execute - * @param arg2 argument passed unchanged to func - * @param ret return values of executed functions, must have space for "count" values. May be NULL. - * @param func function that will be called count times, with jobnr from 0 to count-1. - * threadnr will be in the range 0 to c->thread_count-1 < MAX_THREADS and so that no - * two instances of func executing at the same time will have the same threadnr. - * @return always 0 currently, but code should handle a future improvement where when any call to func - * returns < 0 no further calls to func may be done and < 0 is returned. - * - encoding: Set by libavcodec, user can override. - * - decoding: Set by libavcodec, user can override. - */ - int (*execute2)(struct AVCodecContext *c, int (*func)(struct AVCodecContext *c2, void *arg, int jobnr, int threadnr), void *arg2, int *ret, int count); - /** * noise vs. sse weight for the nsse comparison function * - encoding: Set by user. @@ -2361,87 +1646,6 @@ typedef struct AVCodecContext { */ int nsse_weight; - /** - * profile - * - encoding: Set by user. - * - decoding: Set by libavcodec. - */ - int profile; -#define FF_PROFILE_UNKNOWN -99 -#define FF_PROFILE_RESERVED -100 - -#define FF_PROFILE_AAC_MAIN 0 -#define FF_PROFILE_AAC_LOW 1 -#define FF_PROFILE_AAC_SSR 2 -#define FF_PROFILE_AAC_LTP 3 -#define FF_PROFILE_AAC_HE 4 -#define FF_PROFILE_AAC_HE_V2 28 -#define FF_PROFILE_AAC_LD 22 -#define FF_PROFILE_AAC_ELD 38 -#define FF_PROFILE_MPEG2_AAC_LOW 128 -#define FF_PROFILE_MPEG2_AAC_HE 131 - -#define FF_PROFILE_DTS 20 -#define FF_PROFILE_DTS_ES 30 -#define FF_PROFILE_DTS_96_24 40 -#define FF_PROFILE_DTS_HD_HRA 50 -#define FF_PROFILE_DTS_HD_MA 60 -#define FF_PROFILE_DTS_EXPRESS 70 - -#define FF_PROFILE_MPEG2_422 0 -#define FF_PROFILE_MPEG2_HIGH 1 -#define FF_PROFILE_MPEG2_SS 2 -#define FF_PROFILE_MPEG2_SNR_SCALABLE 3 -#define FF_PROFILE_MPEG2_MAIN 4 -#define FF_PROFILE_MPEG2_SIMPLE 5 - -#define FF_PROFILE_H264_CONSTRAINED (1<<9) // 8+1; constraint_set1_flag -#define FF_PROFILE_H264_INTRA (1<<11) // 8+3; constraint_set3_flag - -#define FF_PROFILE_H264_BASELINE 66 -#define FF_PROFILE_H264_CONSTRAINED_BASELINE (66|FF_PROFILE_H264_CONSTRAINED) -#define FF_PROFILE_H264_MAIN 77 -#define FF_PROFILE_H264_EXTENDED 88 -#define FF_PROFILE_H264_HIGH 100 -#define FF_PROFILE_H264_HIGH_10 110 -#define FF_PROFILE_H264_HIGH_10_INTRA (110|FF_PROFILE_H264_INTRA) -#define FF_PROFILE_H264_HIGH_422 122 -#define FF_PROFILE_H264_HIGH_422_INTRA (122|FF_PROFILE_H264_INTRA) -#define FF_PROFILE_H264_HIGH_444 144 -#define FF_PROFILE_H264_HIGH_444_PREDICTIVE 244 -#define FF_PROFILE_H264_HIGH_444_INTRA (244|FF_PROFILE_H264_INTRA) -#define FF_PROFILE_H264_CAVLC_444 44 - -#define FF_PROFILE_VC1_SIMPLE 0 -#define FF_PROFILE_VC1_MAIN 1 -#define FF_PROFILE_VC1_COMPLEX 2 -#define FF_PROFILE_VC1_ADVANCED 3 - -#define FF_PROFILE_MPEG4_SIMPLE 0 -#define FF_PROFILE_MPEG4_SIMPLE_SCALABLE 1 -#define FF_PROFILE_MPEG4_CORE 2 -#define FF_PROFILE_MPEG4_MAIN 3 -#define FF_PROFILE_MPEG4_N_BIT 4 -#define FF_PROFILE_MPEG4_SCALABLE_TEXTURE 5 -#define FF_PROFILE_MPEG4_SIMPLE_FACE_ANIMATION 6 -#define FF_PROFILE_MPEG4_BASIC_ANIMATED_TEXTURE 7 -#define FF_PROFILE_MPEG4_HYBRID 8 -#define FF_PROFILE_MPEG4_ADVANCED_REAL_TIME 9 -#define FF_PROFILE_MPEG4_CORE_SCALABLE 10 -#define FF_PROFILE_MPEG4_ADVANCED_CODING 11 -#define FF_PROFILE_MPEG4_ADVANCED_CORE 12 -#define FF_PROFILE_MPEG4_ADVANCED_SCALABLE_TEXTURE 13 -#define FF_PROFILE_MPEG4_SIMPLE_STUDIO 14 -#define FF_PROFILE_MPEG4_ADVANCED_SIMPLE 15 - - /** - * level - * - encoding: Set by user. - * - decoding: Set by libavcodec. - */ - int level; -#define FF_LEVEL_UNKNOWN -99 - /** * Skip IDCT/dequantization for selected frames. * - encoding: unused @@ -3063,7 +2267,7 @@ int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src); * @see avcodec_alloc_context3(), avcodec_find_decoder(), avcodec_find_encoder(), * av_dict_set(), av_opt_find(). */ -int avcodec_open2(AVCodecContext *avctx, const AVCodec *codec, AVDictionary **options); +int avcodec_open2(AVCodecContext *avctx, const AVCodec *codec, void *options); /** * Close a given AVCodecContext and free all the data associated with it @@ -3076,13 +2280,6 @@ int avcodec_open2(AVCodecContext *avctx, const AVCodec *codec, AVDictionary **op */ int avcodec_close(AVCodecContext *avctx); -/** - * Free all allocated data in the given subtitle struct. - * - * @param sub AVSubtitle to free. - */ -void avsubtitle_free(AVSubtitle *sub); - /** * @} */ @@ -3177,13 +2374,6 @@ int av_dup_packet(AVPacket *pkt); */ int av_copy_packet(AVPacket *dst, const AVPacket *src); -/** - * Copy packet side data - * - * @return 0 on success, negative AVERROR on fail - */ -int av_copy_packet_side_data(AVPacket *dst, const AVPacket *src); - /** * Free a packet. * @@ -3195,24 +2385,6 @@ attribute_deprecated void av_free_packet(AVPacket *pkt); #endif -/** - * Pack a dictionary for use in side_data. - * - * @param dict The dictionary to pack. - * @param size pointer to store the size of the returned data - * @return pointer to data if successful, NULL otherwise - */ -uint8_t *av_packet_pack_dictionary(AVDictionary *dict, int *size); -/** - * Unpack a dictionary from side_data. - * - * @param data data from side_data - * @param size size of the data - * @param dict the metadata storage dictionary - * @return 0 on success, < 0 on failure - */ -int av_packet_unpack_dictionary(const uint8_t *data, int size, AVDictionary **dict); - /** * Setup a new reference to the data described by a given packet * @@ -4126,8 +3298,6 @@ size_t av_get_codec_tag_string(char *buf, size_t buf_size, unsigned int codec_ta void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode); -int avcodec_default_execute(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2),void *arg, int *ret, int count, int size); -int avcodec_default_execute2(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2, int, int),void *arg, int *ret, int count); //FIXME func typedef /** diff --git a/ext/at3_standalone/avpacket.c b/ext/at3_standalone/avpacket.c index c254150f29..a067ef3f7b 100644 --- a/ext/at3_standalone/avpacket.c +++ b/ext/at3_standalone/avpacket.c @@ -196,66 +196,6 @@ FF_ENABLE_DEPRECATION_WARNINGS #define FF_MERGE_MARKER 0x8c4d9d108e25e9feULL -uint8_t *av_packet_pack_dictionary(AVDictionary *dict, int *size) -{ - AVDictionaryEntry *t = NULL; - uint8_t *data = NULL; - *size = 0; - - if (!dict) - return NULL; - - while ((t = av_dict_get(dict, "", t, AV_DICT_IGNORE_SUFFIX))) { - const size_t keylen = strlen(t->key); - const size_t valuelen = strlen(t->value); - const size_t new_size = *size + keylen + 1 + valuelen + 1; - uint8_t *const new_data = av_realloc(data, new_size); - - if (!new_data) - goto fail; - data = new_data; - if (new_size > INT_MAX) - goto fail; - - memcpy(data + *size, t->key, keylen + 1); - memcpy(data + *size + keylen + 1, t->value, valuelen + 1); - - *size = new_size; - } - - return data; - -fail: - av_freep(&data); - *size = 0; - return NULL; -} - -int av_packet_unpack_dictionary(const uint8_t *data, int size, AVDictionary **dict) -{ - const uint8_t *end = data + size; - int ret = 0; - - if (!dict || !data || !size) - return ret; - if (size && end[-1]) - return AVERROR_INVALIDDATA; - while (data < end) { - const uint8_t *key = data; - const uint8_t *val = data + strlen(key) + 1; - - if (val >= end) - return AVERROR_INVALIDDATA; - - ret = av_dict_set(dict, key, val, 0); - if (ret < 0) - break; - data = val + strlen(val) + 1; - } - - return ret; -} - int av_packet_copy_props(AVPacket *dst, const AVPacket *src) { int i; diff --git a/ext/at3_standalone/avutil.h b/ext/at3_standalone/avutil.h index 29f73d3f77..072c827371 100644 --- a/ext/at3_standalone/avutil.h +++ b/ext/at3_standalone/avutil.h @@ -190,7 +190,6 @@ const char *avutil_license(void); enum AVMediaType { AVMEDIA_TYPE_UNKNOWN = -1, ///< Usually treated as AVMEDIA_TYPE_DATA - AVMEDIA_TYPE_VIDEO, AVMEDIA_TYPE_AUDIO, AVMEDIA_TYPE_DATA, ///< Opaque data information usually continuous AVMEDIA_TYPE_SUBTITLE, diff --git a/ext/at3_standalone/frame.c b/ext/at3_standalone/frame.c index 61ecfef609..3cb10cb6c7 100644 --- a/ext/at3_standalone/frame.c +++ b/ext/at3_standalone/frame.c @@ -20,7 +20,6 @@ #include "channel_layout.h" #include "buffer.h" #include "common.h" -#include "dict.h" #include "frame.h" #include "util_internal.h" #include "mem.h" diff --git a/ext/at3_standalone/frame.h b/ext/at3_standalone/frame.h index bced2e9404..e812441e52 100644 --- a/ext/at3_standalone/frame.h +++ b/ext/at3_standalone/frame.h @@ -30,7 +30,6 @@ #include "avutil.h" #include "buffer.h" -#include "dict.h" #include "rational.h" #include "samplefmt.h" #include "version.h" @@ -367,7 +366,6 @@ int av_frame_get_decode_error_flags (const AVFrame *frame); void av_frame_set_decode_error_flags (AVFrame *frame, int val); int av_frame_get_pkt_size(const AVFrame *frame); void av_frame_set_pkt_size(AVFrame *frame, int val); -AVDictionary **avpriv_frame_get_metadatap(AVFrame *frame); /** * Get the name of a colorspace. diff --git a/ext/at3_standalone/get_bits.h b/ext/at3_standalone/get_bits.h index 5bc786f3b8..a4905f41f5 100644 --- a/ext/at3_standalone/get_bits.h +++ b/ext/at3_standalone/get_bits.h @@ -217,34 +217,6 @@ static inline int get_bits_count(const GetBitContext *s) return s->index; } -static inline void skip_bits_long(GetBitContext *s, int n) -{ -#if UNCHECKED_BITSTREAM_READER - s->index += n; -#else - s->index += av_clip(n, -s->index, s->size_in_bits_plus8 - s->index); -#endif -} - -/** - * read mpeg1 dc style vlc (sign bit + mantissa with no MSB). - * if MSB not set it is negative - * @param n length in bits - */ -static inline int get_xbits(GetBitContext *s, int n) -{ - register int sign; - register int32_t cache; - OPEN_READER(re, s); - av_assert2(n>0 && n<=25); - UPDATE_CACHE(re, s); - cache = GET_CACHE(re, s); - sign = ~cache >> 31; - LAST_SKIP_BITS(re, s, n); - CLOSE_READER(re, s); - return (NEG_USR32(sign ^ cache, n) ^ sign) - sign; -} - static inline int get_sbits(GetBitContext *s, int n) { register int tmp; @@ -292,19 +264,6 @@ static inline unsigned int get_bits_le(GetBitContext *s, int n) return tmp; } -/** - * Show 1-25 bits. - */ -static inline unsigned int show_bits(GetBitContext *s, int n) -{ - register int tmp; - OPEN_READER_NOSIZE(re, s); - av_assert2(n>0 && n<=25); - UPDATE_CACHE(re, s); - tmp = SHOW_UBITS(re, s, n); - return tmp; -} - static inline void skip_bits(GetBitContext *s, int n) { OPEN_READER(re, s); @@ -332,84 +291,6 @@ static inline unsigned int get_bits1(GetBitContext *s) return result; } -static inline unsigned int show_bits1(GetBitContext *s) -{ - return show_bits(s, 1); -} - -static inline void skip_bits1(GetBitContext *s) -{ - skip_bits(s, 1); -} - -/** - * Read 0-32 bits. - */ -static inline unsigned int get_bits_long(GetBitContext *s, int n) -{ - if (!n) { - return 0; - } else if (n <= MIN_CACHE_BITS) { - return get_bits(s, n); - } else { -#ifdef BITSTREAM_READER_LE - unsigned ret = get_bits(s, 16); - return ret | (get_bits(s, n - 16) << 16); -#else - unsigned ret = get_bits(s, 16) << (n - 16); - return ret | get_bits(s, n - 16); -#endif - } -} - -/** - * Read 0-64 bits. - */ -static inline uint64_t get_bits64(GetBitContext *s, int n) -{ - if (n <= 32) { - return get_bits_long(s, n); - } else { -#ifdef BITSTREAM_READER_LE - uint64_t ret = get_bits_long(s, 32); - return ret | (uint64_t) get_bits_long(s, n - 32) << 32; -#else - uint64_t ret = (uint64_t) get_bits_long(s, n - 32) << 32; - return ret | get_bits_long(s, 32); -#endif - } -} - -/** - * Read 0-32 bits as a signed integer. - */ -static inline int get_sbits_long(GetBitContext *s, int n) -{ - return sign_extend(get_bits_long(s, n), n); -} - -/** - * Show 0-32 bits. - */ -static inline unsigned int show_bits_long(GetBitContext *s, int n) -{ - if (n <= MIN_CACHE_BITS) { - return show_bits(s, n); - } else { - GetBitContext gb = *s; - return get_bits_long(&gb, n); - } -} - -static inline int check_marker(GetBitContext *s, const char *msg) -{ - int bit = get_bits1(s); - if (!bit) - av_log(NULL, AV_LOG_INFO, "Marker bit missing at %d of %d %s\n", get_bits_count(s) - 1, s->size_in_bits, msg); - - return bit; -} - /** * Initialize GetBitContext. * @param buffer bitstream buffer, must be AV_INPUT_BUFFER_PADDING_SIZE bytes @@ -589,126 +470,9 @@ static av_always_inline int get_vlc2(GetBitContext *s, VLC_TYPE (*table)[2], return code; } -static inline int decode012(GetBitContext *gb) -{ - int n; - n = get_bits1(gb); - if (n == 0) - return 0; - else - return get_bits1(gb) + 1; -} - -static inline int decode210(GetBitContext *gb) -{ - if (get_bits1(gb)) - return 0; - else - return 2 - get_bits1(gb); -} - static inline int get_bits_left(GetBitContext *gb) { return gb->size_in_bits - get_bits_count(gb); } -static inline int skip_1stop_8data_bits(GetBitContext *gb) -{ - if (get_bits_left(gb) <= 0) - return AVERROR_INVALIDDATA; - - while (get_bits1(gb)) { - skip_bits(gb, 8); - if (get_bits_left(gb) <= 0) - return AVERROR_INVALIDDATA; - } - - return 0; -} - -//#define TRACE - -#ifdef TRACE -static inline void print_bin(int bits, int n) -{ - int i; - - for (i = n - 1; i >= 0; i--) - av_log(NULL, AV_LOG_DEBUG, "%d", (bits >> i) & 1); - for (i = n; i < 24; i++) - av_log(NULL, AV_LOG_DEBUG, " "); -} - -static inline int get_bits_trace(GetBitContext *s, int n, const char *file, - const char *func, int line) -{ - int r = get_bits(s, n); - - print_bin(r, n); - av_log(NULL, AV_LOG_DEBUG, "%5d %2d %3d bit @%5d in %s %s:%d\n", - r, n, r, get_bits_count(s) - n, file, func, line); - - return r; -} - -static inline int get_vlc_trace(GetBitContext *s, VLC_TYPE (*table)[2], - int bits, int max_depth, const char *file, - const char *func, int line) -{ - int show = show_bits(s, 24); - int pos = get_bits_count(s); - int r = get_vlc2(s, table, bits, max_depth); - int len = get_bits_count(s) - pos; - int bits2 = show >> (24 - len); - - print_bin(bits2, len); - - av_log(NULL, AV_LOG_DEBUG, "%5d %2d %3d vlc @%5d in %s %s:%d\n", - bits2, len, r, pos, file, func, line); - - return r; -} - -#define GET_RL_VLC(level, run, name, gb, table, bits, \ - max_depth, need_update) \ - do { \ - int show = SHOW_UBITS(name, gb, 24); \ - int len; \ - int pos = name ## _index; \ - \ - GET_RL_VLC_INTERNAL(level, run, name, gb, table, bits,max_depth, need_update); \ - \ - len = name ## _index - pos + 1; \ - show = show >> (24 - len); \ - \ - print_bin(show, len); \ - \ - av_log(NULL, AV_LOG_DEBUG, "%5d %2d %3d/%-3d rlv @%5d in %s %s:%d\n",\ - show, len, run-1, level, pos, __FILE__, __PRETTY_FUNCTION__, __LINE__);\ - } while (0) \ - - -static inline int get_xbits_trace(GetBitContext *s, int n, const char *file, - const char *func, int line) -{ - int show = show_bits(s, n); - int r = get_xbits(s, n); - - print_bin(show, n); - av_log(NULL, AV_LOG_DEBUG, "%5d %2d %3d xbt @%5d in %s %s:%d\n", - show, n, r, get_bits_count(s) - n, file, func, line); - - return r; -} - -#define get_bits(s, n) get_bits_trace(s , n, __FILE__, __PRETTY_FUNCTION__, __LINE__) -#define get_bits1(s) get_bits_trace(s, 1, __FILE__, __PRETTY_FUNCTION__, __LINE__) -#define get_xbits(s, n) get_xbits_trace(s, n, __FILE__, __PRETTY_FUNCTION__, __LINE__) - -#define get_vlc(s, vlc) get_vlc_trace(s, (vlc)->table, (vlc)->bits, 3, __FILE__, __PRETTY_FUNCTION__, __LINE__) -#define get_vlc2(s, tab, bits, max) get_vlc_trace(s, tab, bits, max, __FILE__, __PRETTY_FUNCTION__, __LINE__) -#else //TRACE -#define GET_RL_VLC GET_RL_VLC_INTERNAL -#endif - #endif /* AVCODEC_GET_BITS_H */ diff --git a/ext/at3_standalone/internal.h b/ext/at3_standalone/internal.h index e3e2c1017e..7b0c7a1447 100644 --- a/ext/at3_standalone/internal.h +++ b/ext/at3_standalone/internal.h @@ -261,67 +261,4 @@ static av_always_inline float ff_exp2fi(int x) { */ int ff_get_buffer(AVCodecContext *avctx, AVFrame *frame, int flags); -/** - * Identical in function to av_frame_make_writable(), except it uses - * ff_get_buffer() to allocate the buffer when needed. - */ -int ff_reget_buffer(AVCodecContext *avctx, AVFrame *frame); - -int ff_thread_can_start_frame(AVCodecContext *avctx); - -int avpriv_h264_has_num_reorder_frames(AVCodecContext *avctx); - -/** - * Call avcodec_open2 recursively by decrementing counter, unlocking mutex, - * calling the function and then restoring again. Assumes the mutex is - * already locked - */ -int ff_codec_open2_recursive(AVCodecContext *avctx, const AVCodec *codec, AVDictionary **options); - -/** - * Finalize buf into extradata and set its size appropriately. - */ -int avpriv_bprint_to_extradata(AVCodecContext *avctx, struct AVBPrint *buf); - -const uint8_t *avpriv_find_start_code(const uint8_t *p, - const uint8_t *end, - uint32_t *state); - -/** - * Check that the provided frame dimensions are valid and set them on the codec - * context. - */ -int ff_set_dimensions(AVCodecContext *s, int width, int height); - -/** - * Check that the provided sample aspect ratio is valid and set it on the codec - * context. - */ -int ff_set_sar(AVCodecContext *avctx, AVRational sar); - -/** - * Add or update AV_FRAME_DATA_MATRIXENCODING side data. - */ -int ff_side_data_update_matrix_encoding(AVFrame *frame, - enum AVMatrixEncoding matrix_encoding); - -/** - * Select the (possibly hardware accelerated) pixel format. - * This is a wrapper around AVCodecContext.get_format() and should be used - * instead of calling get_format() directly. - */ -int ff_get_format(AVCodecContext *avctx, const enum AVPixelFormat *fmt); - -/** - * Set various frame properties from the codec context / packet data. - */ -int ff_decode_frame_props(AVCodecContext *avctx, AVFrame *frame); - -/** - * Add a CPB properties side data to an encoding context. - */ -AVCPBProperties *ff_add_cpb_side_data(AVCodecContext *avctx); - -int ff_side_data_set_encoder_stats(AVPacket *pkt, int quality, int64_t *error, int error_count, int pict_type); - #endif /* AVCODEC_INTERNAL_H */ diff --git a/ext/at3_standalone/opt.c b/ext/at3_standalone/opt.c index 173310df38..f5ceafe391 100644 --- a/ext/at3_standalone/opt.c +++ b/ext/at3_standalone/opt.c @@ -243,24 +243,6 @@ static int set_string_fmt(void *obj, const AVOption *o, const char *val, uint8_t return 0; } -int av_opt_set_dict_val(void *obj, const char *name, const AVDictionary *val, int search_flags) -{ - void *target_obj; - AVDictionary **dst; - const AVOption *o = av_opt_find2(obj, name, NULL, 0, search_flags, &target_obj); - - if (!o || !target_obj) - return AVERROR_OPTION_NOT_FOUND; - if (o->flags & AV_OPT_FLAG_READONLY) - return AVERROR(EINVAL); - - dst = (AVDictionary **)(((uint8_t *)target_obj) + o->offset); - av_dict_free(dst); - av_dict_copy(dst, val, 0); - - return 0; -} - static void format_duration(char *buf, size_t size, int64_t d) { char *e; @@ -449,11 +431,6 @@ static int get_format(void *obj, const char *name, int search_flags, int *out_fm return 0; } -int av_opt_get_pixel_fmt(void *obj, const char *name, int search_flags, enum AVPixelFormat *out_fmt) -{ - return get_format(obj, name, search_flags, out_fmt, AV_OPT_TYPE_PIXEL_FMT, "pixel"); -} - int av_opt_get_sample_fmt(void *obj, const char *name, int search_flags, enum AVSampleFormat *out_fmt) { return get_format(obj, name, search_flags, out_fmt, AV_OPT_TYPE_SAMPLE_FMT, "sample"); @@ -573,199 +550,6 @@ static char *get_opt_flags_string(void *obj, const char *unit, int64_t value) return NULL; } -static void opt_list(void *obj, void *av_log_obj, const char *unit, - int req_flags, int rej_flags) -{ - const AVOption *opt=NULL; - AVOptionRanges *r; - int i; - - while ((opt = av_opt_next(obj, opt))) { - if (!(opt->flags & req_flags) || (opt->flags & rej_flags)) - continue; - - /* Don't print CONST's on level one. - * Don't print anything but CONST's on level two. - * Only print items from the requested unit. - */ - if (!unit && opt->type==AV_OPT_TYPE_CONST) - continue; - else if (unit && opt->type!=AV_OPT_TYPE_CONST) - continue; - else if (unit && opt->type==AV_OPT_TYPE_CONST && strcmp(unit, opt->unit)) - continue; - else if (unit && opt->type == AV_OPT_TYPE_CONST) - av_log(av_log_obj, AV_LOG_INFO, " %-15s ", opt->name); - else - av_log(av_log_obj, AV_LOG_INFO, " %s%-17s ", - (opt->flags & AV_OPT_FLAG_FILTERING_PARAM) ? "" : "-", - opt->name); - - switch (opt->type) { - case AV_OPT_TYPE_FLAGS: - av_log(av_log_obj, AV_LOG_INFO, "%-12s ", ""); - break; - case AV_OPT_TYPE_INT: - av_log(av_log_obj, AV_LOG_INFO, "%-12s ", ""); - break; - case AV_OPT_TYPE_INT64: - av_log(av_log_obj, AV_LOG_INFO, "%-12s ", ""); - break; - case AV_OPT_TYPE_DOUBLE: - av_log(av_log_obj, AV_LOG_INFO, "%-12s ", ""); - break; - case AV_OPT_TYPE_FLOAT: - av_log(av_log_obj, AV_LOG_INFO, "%-12s ", ""); - break; - case AV_OPT_TYPE_STRING: - av_log(av_log_obj, AV_LOG_INFO, "%-12s ", ""); - break; - case AV_OPT_TYPE_RATIONAL: - av_log(av_log_obj, AV_LOG_INFO, "%-12s ", ""); - break; - case AV_OPT_TYPE_BINARY: - av_log(av_log_obj, AV_LOG_INFO, "%-12s ", ""); - break; - case AV_OPT_TYPE_IMAGE_SIZE: - av_log(av_log_obj, AV_LOG_INFO, "%-12s ", ""); - break; - case AV_OPT_TYPE_VIDEO_RATE: - av_log(av_log_obj, AV_LOG_INFO, "%-12s ", ""); - break; - case AV_OPT_TYPE_PIXEL_FMT: - av_log(av_log_obj, AV_LOG_INFO, "%-12s ", ""); - break; - case AV_OPT_TYPE_SAMPLE_FMT: - av_log(av_log_obj, AV_LOG_INFO, "%-12s ", ""); - break; - case AV_OPT_TYPE_DURATION: - av_log(av_log_obj, AV_LOG_INFO, "%-12s ", ""); - break; - case AV_OPT_TYPE_COLOR: - av_log(av_log_obj, AV_LOG_INFO, "%-12s ", ""); - break; - case AV_OPT_TYPE_CHANNEL_LAYOUT: - av_log(av_log_obj, AV_LOG_INFO, "%-12s ", ""); - break; - case AV_OPT_TYPE_BOOL: - av_log(av_log_obj, AV_LOG_INFO, "%-12s ", ""); - break; - case AV_OPT_TYPE_CONST: - default: - av_log(av_log_obj, AV_LOG_INFO, "%-12s ", ""); - break; - } - av_log(av_log_obj, AV_LOG_INFO, "%c", (opt->flags & AV_OPT_FLAG_ENCODING_PARAM) ? 'E' : '.'); - av_log(av_log_obj, AV_LOG_INFO, "%c", (opt->flags & AV_OPT_FLAG_DECODING_PARAM) ? 'D' : '.'); - av_log(av_log_obj, AV_LOG_INFO, "%c", (opt->flags & AV_OPT_FLAG_FILTERING_PARAM)? 'F' : '.'); - av_log(av_log_obj, AV_LOG_INFO, "%c", (opt->flags & AV_OPT_FLAG_VIDEO_PARAM ) ? 'V' : '.'); - av_log(av_log_obj, AV_LOG_INFO, "%c", (opt->flags & AV_OPT_FLAG_AUDIO_PARAM ) ? 'A' : '.'); - av_log(av_log_obj, AV_LOG_INFO, "%c", (opt->flags & AV_OPT_FLAG_SUBTITLE_PARAM) ? 'S' : '.'); - av_log(av_log_obj, AV_LOG_INFO, "%c", (opt->flags & AV_OPT_FLAG_EXPORT) ? 'X' : '.'); - av_log(av_log_obj, AV_LOG_INFO, "%c", (opt->flags & AV_OPT_FLAG_READONLY) ? 'R' : '.'); - - if (opt->help) - av_log(av_log_obj, AV_LOG_INFO, " %s", opt->help); - - if (av_opt_query_ranges(&r, obj, opt->name, AV_OPT_SEARCH_FAKE_OBJ) >= 0) { - switch (opt->type) { - case AV_OPT_TYPE_INT: - case AV_OPT_TYPE_INT64: - case AV_OPT_TYPE_DOUBLE: - case AV_OPT_TYPE_FLOAT: - case AV_OPT_TYPE_RATIONAL: - for (i = 0; i < r->nb_ranges; i++) { - av_log(av_log_obj, AV_LOG_INFO, " (from "); - log_value(av_log_obj, AV_LOG_INFO, r->range[i]->value_min); - av_log(av_log_obj, AV_LOG_INFO, " to "); - log_value(av_log_obj, AV_LOG_INFO, r->range[i]->value_max); - av_log(av_log_obj, AV_LOG_INFO, ")"); - } - break; - } - av_opt_freep_ranges(&r); - } - - if (opt->type != AV_OPT_TYPE_CONST && - opt->type != AV_OPT_TYPE_BINARY && - !((opt->type == AV_OPT_TYPE_COLOR || - opt->type == AV_OPT_TYPE_IMAGE_SIZE || - opt->type == AV_OPT_TYPE_STRING || - opt->type == AV_OPT_TYPE_VIDEO_RATE) && - !opt->default_val.str)) { - av_log(av_log_obj, AV_LOG_INFO, " (default "); - switch (opt->type) { - case AV_OPT_TYPE_BOOL: - av_log(av_log_obj, AV_LOG_INFO, "%s", (char *)av_x_if_null(get_bool_name(opt->default_val.i64), "invalid")); - break; - case AV_OPT_TYPE_FLAGS: { - char *def_flags = get_opt_flags_string(obj, opt->unit, opt->default_val.i64); - if (def_flags) { - av_log(av_log_obj, AV_LOG_INFO, "%s", def_flags); - av_freep(&def_flags); - } else { - av_log(av_log_obj, AV_LOG_INFO, "%"PRIX64, opt->default_val.i64); - } - break; - } - case AV_OPT_TYPE_DURATION: { - char buf[25]; - format_duration(buf, sizeof(buf), opt->default_val.i64); - av_log(av_log_obj, AV_LOG_INFO, "%s", buf); - break; - } - case AV_OPT_TYPE_INT: - case AV_OPT_TYPE_INT64: { - const char *def_const = get_opt_const_name(obj, opt->unit, opt->default_val.i64); - if (def_const) - av_log(av_log_obj, AV_LOG_INFO, "%s", def_const); - else - log_value(av_log_obj, AV_LOG_INFO, opt->default_val.i64); - break; - } - case AV_OPT_TYPE_DOUBLE: - case AV_OPT_TYPE_FLOAT: - log_value(av_log_obj, AV_LOG_INFO, opt->default_val.dbl); - break; - case AV_OPT_TYPE_RATIONAL: { - AVRational q = av_d2q(opt->default_val.dbl, INT_MAX); - av_log(av_log_obj, AV_LOG_INFO, "%d/%d", q.num, q.den); } - break; - case AV_OPT_TYPE_SAMPLE_FMT: - av_log(av_log_obj, AV_LOG_INFO, "%s", (char *)av_x_if_null(av_get_sample_fmt_name(opt->default_val.i64), "none")); - break; - case AV_OPT_TYPE_COLOR: - case AV_OPT_TYPE_IMAGE_SIZE: - case AV_OPT_TYPE_STRING: - case AV_OPT_TYPE_VIDEO_RATE: - av_log(av_log_obj, AV_LOG_INFO, "\"%s\"", opt->default_val.str); - break; - case AV_OPT_TYPE_CHANNEL_LAYOUT: - av_log(av_log_obj, AV_LOG_INFO, "0x%"PRIx64, opt->default_val.i64); - break; - } - av_log(av_log_obj, AV_LOG_INFO, ")"); - } - - av_log(av_log_obj, AV_LOG_INFO, "\n"); - if (opt->unit && opt->type != AV_OPT_TYPE_CONST) { - opt_list(obj, av_log_obj, opt->unit, req_flags, rej_flags); - } - } -} - -int av_opt_show2(void *obj, void *av_log_obj, int req_flags, int rej_flags) -{ - if (!obj) - return -1; - - av_log(av_log_obj, AV_LOG_INFO, "%s AVOptions:\n", (*(AVClass**)obj)->class_name); - - opt_list(obj, av_log_obj, NULL, req_flags, rej_flags); - - return 0; -} - void av_opt_set_defaults(void *s) { av_opt_set_defaults2(s, 0, 0); @@ -1302,290 +1086,3 @@ int av_opt_is_set_to_default_by_name(void *obj, const char *name, int search_fla return AVERROR_OPTION_NOT_FOUND; return av_opt_is_set_to_default(target, o); } - -#ifdef TEST - -typedef struct TestContext -{ - const AVClass *class; - int num; - int toggle; - char *string; - int flags; - AVRational rational; - AVRational video_rate; - int w, h; - enum AVPixelFormat pix_fmt; - enum AVSampleFormat sample_fmt; - int64_t duration; - uint8_t color[4]; - int64_t channel_layout; - void *binary; - int binary_size; - void *binary1; - int binary_size1; - void *binary2; - int binary_size2; - int64_t num64; - float flt; - double dbl; - char *escape; - int bool1; - int bool2; - int bool3; -} TestContext; - -#define OFFSET(x) offsetof(TestContext, x) - -#define TEST_FLAG_COOL 01 -#define TEST_FLAG_LAME 02 -#define TEST_FLAG_MU 04 - -static const AVOption test_options[]= { -{"num", "set num", OFFSET(num), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 100, 1 }, -{"toggle", "set toggle", OFFSET(toggle), AV_OPT_TYPE_INT, {.i64 = 1}, 0, 1, 1 }, -{"rational", "set rational", OFFSET(rational), AV_OPT_TYPE_RATIONAL, {.dbl = 1}, 0, 10, 1 }, -{"string", "set string", OFFSET(string), AV_OPT_TYPE_STRING, {.str = "default"}, CHAR_MIN, CHAR_MAX, 1 }, -{"escape", "set escape str", OFFSET(escape), AV_OPT_TYPE_STRING, {.str = "\\=,"}, CHAR_MIN, CHAR_MAX, 1 }, -{"flags", "set flags", OFFSET(flags), AV_OPT_TYPE_FLAGS, {.i64 = 1}, 0, INT_MAX, 1, "flags" }, -{"cool", "set cool flag", 0, AV_OPT_TYPE_CONST, {.i64 = TEST_FLAG_COOL}, INT_MIN, INT_MAX, 1, "flags" }, -{"lame", "set lame flag", 0, AV_OPT_TYPE_CONST, {.i64 = TEST_FLAG_LAME}, INT_MIN, INT_MAX, 1, "flags" }, -{"mu", "set mu flag", 0, AV_OPT_TYPE_CONST, {.i64 = TEST_FLAG_MU}, INT_MIN, INT_MAX, 1, "flags" }, -{"size", "set size", OFFSET(w), AV_OPT_TYPE_IMAGE_SIZE,{.str="200x300"}, 0, 0, 1}, -{"pix_fmt", "set pixfmt", OFFSET(pix_fmt), AV_OPT_TYPE_PIXEL_FMT, {.i64 = AV_PIX_FMT_0BGR}, -1, INT_MAX, 1}, -{"sample_fmt", "set samplefmt", OFFSET(sample_fmt), AV_OPT_TYPE_SAMPLE_FMT, {.i64 = AV_SAMPLE_FMT_S16}, -1, INT_MAX, 1}, -{"video_rate", "set videorate", OFFSET(video_rate), AV_OPT_TYPE_VIDEO_RATE, {.str = "25"}, 0, 0 , 1}, -{"duration", "set duration", OFFSET(duration), AV_OPT_TYPE_DURATION, {.i64 = 1000}, 0, INT64_MAX, 1}, -{"color", "set color", OFFSET(color), AV_OPT_TYPE_COLOR, {.str = "pink"}, 0, 0, 1}, -{"cl", "set channel layout", OFFSET(channel_layout), AV_OPT_TYPE_CHANNEL_LAYOUT, {.i64 = AV_CH_LAYOUT_HEXAGONAL}, 0, INT64_MAX, 1}, -{"bin", "set binary value", OFFSET(binary), AV_OPT_TYPE_BINARY, {.str="62696e00"}, 0, 0, 1 }, -{"bin1", "set binary value", OFFSET(binary1), AV_OPT_TYPE_BINARY, {.str=NULL}, 0, 0, 1 }, -{"bin2", "set binary value", OFFSET(binary2), AV_OPT_TYPE_BINARY, {.str=""}, 0, 0, 1 }, -{"num64", "set num 64bit", OFFSET(num64), AV_OPT_TYPE_INT64, {.i64 = 1}, 0, 100, 1 }, -{"flt", "set float", OFFSET(flt), AV_OPT_TYPE_FLOAT, {.dbl = 1.0/3}, 0, 100, 1}, -{"dbl", "set double", OFFSET(dbl), AV_OPT_TYPE_DOUBLE, {.dbl = 1.0/3}, 0, 100, 1 }, -{"bool1", "set boolean value", OFFSET(bool1), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, 1 }, -{"bool2", "set boolean value", OFFSET(bool2), AV_OPT_TYPE_BOOL, {.i64 = 1}, -1, 1, 1 }, -{"bool3", "set boolean value", OFFSET(bool3), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, 1 }, -{NULL}, -}; - -static const char *test_get_name(void *ctx) -{ - return "test"; -} - -static const AVClass test_class = { - "TestContext", - test_get_name, - test_options -}; - -static void log_callback_help(void *ptr, int level, const char *fmt, va_list vl) -{ - vfprintf(stdout, fmt, vl); -} - -int main(void) -{ - int i; - - av_log_set_level(AV_LOG_DEBUG); - av_log_set_callback(log_callback_help); - - printf("Testing default values\n"); - { - TestContext test_ctx = { 0 }; - test_ctx.class = &test_class; - av_opt_set_defaults(&test_ctx); - - printf("num=%d\n", test_ctx.num); - printf("toggle=%d\n", test_ctx.toggle); - printf("string=%s\n", test_ctx.string); - printf("escape=%s\n", test_ctx.escape); - printf("flags=%d\n", test_ctx.flags); - printf("rational=%d/%d\n", test_ctx.rational.num, test_ctx.rational.den); - printf("video_rate=%d/%d\n", test_ctx.video_rate.num, test_ctx.video_rate.den); - printf("width=%d height=%d\n", test_ctx.w, test_ctx.h); - printf("sample_fmt=%s\n", av_get_sample_fmt_name(test_ctx.sample_fmt)); - printf("duration=%"PRId64"\n", test_ctx.duration); - printf("color=%d %d %d %d\n", test_ctx.color[0], test_ctx.color[1], test_ctx.color[2], test_ctx.color[3]); - printf("channel_layout=%"PRId64"=%"PRId64"\n", test_ctx.channel_layout, (int64_t)AV_CH_LAYOUT_HEXAGONAL); - if (test_ctx.binary) - printf("binary=%x %x %x %x\n", ((uint8_t*)test_ctx.binary)[0], ((uint8_t*)test_ctx.binary)[1], ((uint8_t*)test_ctx.binary)[2], ((uint8_t*)test_ctx.binary)[3]); - printf("binary_size=%d\n", test_ctx.binary_size); - printf("num64=%"PRId64"\n", test_ctx.num64); - printf("flt=%.6f\n", test_ctx.flt); - printf("dbl=%.6f\n", test_ctx.dbl); - - av_opt_show2(&test_ctx, NULL, -1, 0); - - av_opt_free(&test_ctx); - } - - printf("\nTesting av_opt_is_set_to_default()\n"); - { - int ret; - TestContext test_ctx = { 0 }; - const AVOption *o = NULL; - test_ctx.class = &test_class; - - av_log_set_level(AV_LOG_QUIET); - - while (o = av_opt_next(&test_ctx, o)) { - ret = av_opt_is_set_to_default_by_name(&test_ctx, o->name, 0); - printf("name:%10s default:%d error:%s\n", o->name, !!ret, ret < 0 ? av_err2str(ret) : ""); - } - av_opt_set_defaults(&test_ctx); - while (o = av_opt_next(&test_ctx, o)) { - ret = av_opt_is_set_to_default_by_name(&test_ctx, o->name, 0); - printf("name:%10s default:%d error:%s\n", o->name, !!ret, ret < 0 ? av_err2str(ret) : ""); - } - av_opt_free(&test_ctx); - } - - printf("\nTest av_opt_serialize()\n"); - { - TestContext test_ctx = { 0 }; - char *buf; - test_ctx.class = &test_class; - - av_log_set_level(AV_LOG_QUIET); - - av_opt_set_defaults(&test_ctx); - if (av_opt_serialize(&test_ctx, 0, 0, &buf, '=', ',') >= 0) { - printf("%s\n", buf); - av_opt_free(&test_ctx); - memset(&test_ctx, 0, sizeof(test_ctx)); - test_ctx.class = &test_class; - av_set_options_string(&test_ctx, buf, "=", ","); - av_free(buf); - if (av_opt_serialize(&test_ctx, 0, 0, &buf, '=', ',') >= 0) { - printf("%s\n", buf); - av_free(buf); - } - } - av_opt_free(&test_ctx); - } - - printf("\nTesting av_set_options_string()\n"); - { - TestContext test_ctx = { 0 }; - static const char * const options[] = { - "", - ":", - "=", - "foo=:", - ":=foo", - "=foo", - "foo=", - "foo", - "foo=val", - "foo==val", - "toggle=:", - "string=:", - "toggle=1 : foo", - "toggle=100", - "toggle==1", - "flags=+mu-lame : num=42: toggle=0", - "num=42 : string=blahblah", - "rational=0 : rational=1/2 : rational=1/-1", - "rational=-1/0", - "size=1024x768", - "size=pal", - "size=bogus", - "pix_fmt=yuv420p", - "pix_fmt=2", - "pix_fmt=bogus", - "sample_fmt=s16", - "sample_fmt=2", - "sample_fmt=bogus", - "video_rate=pal", - "video_rate=25", - "video_rate=30000/1001", - "video_rate=30/1.001", - "video_rate=bogus", - "duration=bogus", - "duration=123.45", - "duration=1\\:23\\:45.67", - "color=blue", - "color=0x223300", - "color=0x42FF07AA", - "cl=stereo+downmix", - "cl=foo", - "bin=boguss", - "bin=111", - "bin=ffff", - "num64=bogus", - "num64=44", - "num64=44.4", - "num64=-1", - "num64=101", - "flt=bogus", - "flt=2", - "flt=2.2", - "flt=-1", - "flt=101", - "dbl=bogus", - "dbl=2", - "dbl=2.2", - "dbl=-1", - "dbl=101", - "bool1=true", - "bool2=auto", - }; - - test_ctx.class = &test_class; - av_opt_set_defaults(&test_ctx); - - av_log_set_level(AV_LOG_QUIET); - - for (i=0; i < FF_ARRAY_ELEMS(options); i++) { - int silence_log = !strcmp(options[i], "rational=-1/0"); // inf formating differs between platforms - av_log(&test_ctx, AV_LOG_DEBUG, "Setting options string '%s'\n", options[i]); - if (silence_log) - av_log_set_callback(NULL); - if (av_set_options_string(&test_ctx, options[i], "=", ":") < 0) - printf("Error '%s'\n", options[i]); - else - printf("OK '%s'\n", options[i]); - av_log_set_callback(log_callback_help); - } - av_opt_free(&test_ctx); - } - - printf("\nTesting av_opt_set_from_string()\n"); - { - TestContext test_ctx = { 0 }; - static const char * const options[] = { - "", - "5", - "5:hello", - "5:hello:size=pal", - "5:size=pal:hello", - ":", - "=", - " 5 : hello : size = pal ", - "a_very_long_option_name_that_will_need_to_be_ellipsized_around_here=42" - }; - static const char * const shorthand[] = { "num", "string", NULL }; - - test_ctx.class = &test_class; - av_opt_set_defaults(&test_ctx); - - av_log_set_level(AV_LOG_QUIET); - - for (i=0; i < FF_ARRAY_ELEMS(options); i++) { - av_log(&test_ctx, AV_LOG_DEBUG, "Setting options string '%s'\n", options[i]); - if (av_opt_set_from_string(&test_ctx, options[i], shorthand, "=", ":") < 0) - printf("Error '%s'\n", options[i]); - else - printf("OK '%s'\n", options[i]); - } - av_opt_free(&test_ctx); - } - - return 0; -} - -#endif diff --git a/ext/at3_standalone/opt.h b/ext/at3_standalone/opt.h index 9e15aaa131..bba9b0ec35 100644 --- a/ext/at3_standalone/opt.h +++ b/ext/at3_standalone/opt.h @@ -277,8 +277,6 @@ typedef struct AVOption { #define AV_OPT_FLAG_METADATA 4 ///< some data extracted or inserted into the file like title, comment, ... #endif #define AV_OPT_FLAG_AUDIO_PARAM 8 -#define AV_OPT_FLAG_VIDEO_PARAM 16 -#define AV_OPT_FLAG_SUBTITLE_PARAM 32 /** * The option is inteded for exporting values to the caller. */ @@ -651,48 +649,6 @@ void *av_opt_child_next(void *obj, void *prev); */ const AVClass *av_opt_child_class_next(const AVClass *parent, const AVClass *prev); -/** - * @defgroup opt_set_funcs Option setting functions - * @{ - * Those functions set the field of obj with the given name to value. - * - * @param[in] obj A struct whose first element is a pointer to an AVClass. - * @param[in] name the name of the field to set - * @param[in] val The value to set. In case of av_opt_set() if the field is not - * of a string type, then the given string is parsed. - * SI postfixes and some named scalars are supported. - * If the field is of a numeric type, it has to be a numeric or named - * scalar. Behavior with more than one scalar and +- infix operators - * is undefined. - * If the field is of a flags type, it has to be a sequence of numeric - * scalars or named flags separated by '+' or '-'. Prefixing a flag - * with '+' causes it to be set without affecting the other flags; - * similarly, '-' unsets a flag. - * @param search_flags flags passed to av_opt_find2. I.e. if AV_OPT_SEARCH_CHILDREN - * is passed here, then the option may be set on a child of obj. - * - * @return 0 if the value has been set, or an AVERROR code in case of - * error: - * AVERROR_OPTION_NOT_FOUND if no matching option exists - * AVERROR(ERANGE) if the value is out of range - * AVERROR(EINVAL) if the value is not valid - */ -int av_opt_set (void *obj, const char *name, const char *val, int search_flags); -int av_opt_set_int (void *obj, const char *name, int64_t val, int search_flags); -int av_opt_set_double (void *obj, const char *name, double val, int search_flags); -int av_opt_set_q (void *obj, const char *name, AVRational val, int search_flags); -int av_opt_set_bin (void *obj, const char *name, const uint8_t *val, int size, int search_flags); -int av_opt_set_image_size(void *obj, const char *name, int w, int h, int search_flags); -int av_opt_set_pixel_fmt (void *obj, const char *name, enum AVPixelFormat fmt, int search_flags); -int av_opt_set_sample_fmt(void *obj, const char *name, enum AVSampleFormat fmt, int search_flags); -int av_opt_set_video_rate(void *obj, const char *name, AVRational val, int search_flags); -int av_opt_set_channel_layout(void *obj, const char *name, int64_t ch_layout, int search_flags); -/** - * @note Any old dictionary present is discarded and replaced with a copy of the new one. The - * caller still owns val is and responsible for freeing it. - */ -int av_opt_set_dict_val(void *obj, const char *name, const AVDictionary *val, int search_flags); - /** * Set a binary option to an integer list. * @@ -736,10 +692,8 @@ int av_opt_get (void *obj, const char *name, int search_flags, uint8_t int av_opt_get_int (void *obj, const char *name, int search_flags, int64_t *out_val); int av_opt_get_double (void *obj, const char *name, int search_flags, double *out_val); int av_opt_get_q (void *obj, const char *name, int search_flags, AVRational *out_val); -int av_opt_get_image_size(void *obj, const char *name, int search_flags, int *w_out, int *h_out); int av_opt_get_pixel_fmt (void *obj, const char *name, int search_flags, enum AVPixelFormat *out_fmt); int av_opt_get_sample_fmt(void *obj, const char *name, int search_flags, enum AVSampleFormat *out_fmt); -int av_opt_get_video_rate(void *obj, const char *name, int search_flags, AVRational *out_val); int av_opt_get_channel_layout(void *obj, const char *name, int search_flags, int64_t *ch_layout); /** * @param[out] out_val The returned dictionary is a copy of the actual value and must diff --git a/ext/at3_standalone/options.c b/ext/at3_standalone/options.c index 24786fa29e..8781555826 100644 --- a/ext/at3_standalone/options.c +++ b/ext/at3_standalone/options.c @@ -90,17 +90,11 @@ int avcodec_get_context_defaults3(AVCodecContext *s, const AVCodec *codec) if(s->codec_type == AVMEDIA_TYPE_AUDIO) flags= AV_OPT_FLAG_AUDIO_PARAM; - else if(s->codec_type == AVMEDIA_TYPE_VIDEO) - flags= AV_OPT_FLAG_VIDEO_PARAM; - else if(s->codec_type == AVMEDIA_TYPE_SUBTITLE) - flags= AV_OPT_FLAG_SUBTITLE_PARAM; av_opt_set_defaults2(s, flags, flags); s->time_base = (AVRational){0,1}; s->pkt_timebase = (AVRational){ 0, 1 }; s->get_buffer2 = avcodec_default_get_buffer2; - s->execute = avcodec_default_execute; - s->execute2 = avcodec_default_execute2; s->sample_fmt = AV_SAMPLE_FMT_NONE; if(codec && codec->priv_data_size){ @@ -151,85 +145,6 @@ void avcodec_free_context(AVCodecContext **pavctx) av_freep(pavctx); } -int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src) -{ - const AVCodec *orig_codec = dest->codec; - uint8_t *orig_priv_data = dest->priv_data; - - if (avcodec_is_open(dest)) { // check that the dest context is uninitialized - av_log(dest, AV_LOG_ERROR, - "Tried to copy AVCodecContext %p into already-initialized %p\n", - src, dest); - return AVERROR(EINVAL); - } - - av_opt_free(dest); - av_freep(&dest->rc_override); - av_freep(&dest->intra_matrix); - av_freep(&dest->inter_matrix); - av_freep(&dest->extradata); - av_freep(&dest->subtitle_header); - - memcpy(dest, src, sizeof(*dest)); - av_opt_copy(dest, src); - - dest->priv_data = orig_priv_data; - dest->codec = orig_codec; - - if (orig_priv_data && src->codec && src->codec->priv_class && - dest->codec && dest->codec->priv_class) - av_opt_copy(orig_priv_data, src->priv_data); - - - /* set values specific to opened codecs back to their default state */ - dest->slice_offset = NULL; - dest->internal = NULL; -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - dest->coded_frame = NULL; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - - /* reallocate values that should be allocated separately */ - dest->extradata = NULL; - dest->intra_matrix = NULL; - dest->inter_matrix = NULL; - dest->rc_override = NULL; - dest->subtitle_header = NULL; - -#define alloc_and_copy_or_fail(obj, size, pad) \ - if (src->obj && size > 0) { \ - dest->obj = av_malloc(size + pad); \ - if (!dest->obj) \ - goto fail; \ - memcpy(dest->obj, src->obj, size); \ - if (pad) \ - memset(((uint8_t *) dest->obj) + size, 0, pad); \ - } - alloc_and_copy_or_fail(extradata, src->extradata_size, - AV_INPUT_BUFFER_PADDING_SIZE); - dest->extradata_size = src->extradata_size; - alloc_and_copy_or_fail(intra_matrix, 64 * sizeof(int16_t), 0); - alloc_and_copy_or_fail(inter_matrix, 64 * sizeof(int16_t), 0); - alloc_and_copy_or_fail(rc_override, src->rc_override_count * sizeof(*src->rc_override), 0); - alloc_and_copy_or_fail(subtitle_header, src->subtitle_header_size, 1); - av_assert0(dest->subtitle_header_size == src->subtitle_header_size); -#undef alloc_and_copy_or_fail - - return 0; - -fail: - av_freep(&dest->rc_override); - av_freep(&dest->intra_matrix); - av_freep(&dest->inter_matrix); - av_freep(&dest->extradata); - av_freep(&dest->subtitle_header); - dest->subtitle_header_size = 0; - dest->extradata_size = 0; - av_opt_free(dest); - return AVERROR(ENOMEM); -} - const AVClass *avcodec_get_class(void) { return &av_codec_context_class; diff --git a/ext/at3_standalone/util_internal.h b/ext/at3_standalone/util_internal.h index 5fe851381e..6c9cba0870 100644 --- a/ext/at3_standalone/util_internal.h +++ b/ext/at3_standalone/util_internal.h @@ -36,25 +36,10 @@ #include #include "config.h" #include "attributes.h" -#include "dict.h" #include "macros.h" #include "version.h" -#if ARCH_X86 -# include "x86/emms.h" -#endif - -#ifndef emms_c -# define emms_c() while(0) -#endif - -#ifndef attribute_align_arg -#if ARCH_X86_32 && AV_GCC_VERSION_AT_LEAST(4,2) -# define attribute_align_arg __attribute__((force_align_arg_pointer)) -#else # define attribute_align_arg -#endif -#endif #if defined(_MSC_VER) && CONFIG_SHARED # define av_export __declspec(dllimport) @@ -62,23 +47,6 @@ # define av_export #endif -#if HAVE_PRAGMA_DEPRECATED -# if defined(__ICL) || defined (__INTEL_COMPILER) -# define FF_DISABLE_DEPRECATION_WARNINGS __pragma(warning(push)) __pragma(warning(disable:1478)) -# define FF_ENABLE_DEPRECATION_WARNINGS __pragma(warning(pop)) -# elif defined(_MSC_VER) -# define FF_DISABLE_DEPRECATION_WARNINGS __pragma(warning(push)) __pragma(warning(disable:4996)) -# define FF_ENABLE_DEPRECATION_WARNINGS __pragma(warning(pop)) -# else -# define FF_DISABLE_DEPRECATION_WARNINGS _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"") -# define FF_ENABLE_DEPRECATION_WARNINGS _Pragma("GCC diagnostic warning \"-Wdeprecated-declarations\"") -# endif -#else -# define FF_DISABLE_DEPRECATION_WARNINGS -# define FF_ENABLE_DEPRECATION_WARNINGS -#endif - - #define FF_MEMORY_POISON 0x2a #define MAKE_ACCESSORS(str, name, type, field) \ @@ -89,13 +57,6 @@ // to be forced to tokenize __VA_ARGS__ #define E1(x) x -/* Check if the hard coded offset of a struct member still matches reality. - * Induce a compilation failure if not. - */ -#define AV_CHECK_OFFSET(s, m, o) struct check_##o { \ - int x_##o[offsetof(s, m) == o? 1: -1]; \ - } - #define LOCAL_ALIGNED_A(a, t, v, s, o, ...) \ uint8_t la_##v[sizeof(t s o) + (a)]; \ t (*v) o = (void *)FFALIGN((uintptr_t)la_##v, a) @@ -124,42 +85,6 @@ # define LOCAL_ALIGNED_32(t, v, ...) LOCAL_ALIGNED(32, t, v, __VA_ARGS__) #endif -#define FF_ALLOC_OR_GOTO(ctx, p, size, label)\ -{\ - p = av_malloc(size);\ - if (!(p) && (size) != 0) {\ - av_log(ctx, AV_LOG_ERROR, "Cannot allocate memory.\n");\ - goto label;\ - }\ -} - -#define FF_ALLOCZ_OR_GOTO(ctx, p, size, label)\ -{\ - p = av_mallocz(size);\ - if (!(p) && (size) != 0) {\ - av_log(ctx, AV_LOG_ERROR, "Cannot allocate memory.\n");\ - goto label;\ - }\ -} - -#define FF_ALLOC_ARRAY_OR_GOTO(ctx, p, nelem, elsize, label)\ -{\ - p = av_malloc_array(nelem, elsize);\ - if (!p) {\ - av_log(ctx, AV_LOG_ERROR, "Cannot allocate memory.\n");\ - goto label;\ - }\ -} - -#define FF_ALLOCZ_ARRAY_OR_GOTO(ctx, p, nelem, elsize, label)\ -{\ - p = av_mallocz_array(nelem, elsize);\ - if (!p) {\ - av_log(ctx, AV_LOG_ERROR, "Cannot allocate memory.\n");\ - goto label;\ - }\ -} - #include "libm.h" /** @@ -212,17 +137,6 @@ # define ONLY_IF_THREADS_ENABLED(x) NULL #endif -/** - * Log a generic warning message about a missing feature. - * Additionally request that a sample showcasing the feature be uploaded. - * - * @param[in] avc a pointer to an arbitrary struct of which the first field is - * a pointer to an AVClass struct - * @param[in] msg string containing the name of the missing feature - */ -void avpriv_request_sample(void *avc, - const char *msg, ...); - #if HAVE_LIBC_MSVCRT #include #if defined(_VC_CRT_MAJOR_VERSION) && _VC_CRT_MAJOR_VERSION < 14 @@ -244,101 +158,6 @@ void avpriv_request_sample(void *avc, # define ff_dlog(ctx, ...) do { if (0) av_log(ctx, AV_LOG_DEBUG, __VA_ARGS__); } while (0) #endif -/** - * Clip and convert a double value into the long long amin-amax range. - * This function is needed because conversion of floating point to integers when - * it does not fit in the integer's representation does not necessarily saturate - * correctly (usually converted to a cvttsd2si on x86) which saturates numbers - * > INT64_MAX to INT64_MIN. The standard marks such conversions as undefined - * behavior, allowing this sort of mathematically bogus conversions. This provides - * a safe alternative that is slower obviously but assures safety and better - * mathematical behavior. - * @param a value to clip - * @param amin minimum value of the clip range - * @param amax maximum value of the clip range - * @return clipped value - */ -static av_always_inline av_const int64_t ff_rint64_clip(double a, int64_t amin, int64_t amax) -{ - int64_t res; -#if defined(HAVE_AV_CONFIG_H) && defined(ASSERT_LEVEL) && ASSERT_LEVEL >= 2 - if (amin > amax) abort(); -#endif - // INT64_MAX+1,INT64_MIN are exactly representable as IEEE doubles - // do range checks first - if (a >= 9223372036854775808.0) - return amax; - if (a <= -9223372036854775808.0) - return amin; - - // safe to call llrint and clip accordingly - res = llrint(a); - if (res > amax) - return amax; - if (res < amin) - return amin; - return res; -} - -/** - * Compute 10^x for floating point values. Note: this function is by no means - * "correctly rounded", and is meant as a fast, reasonably accurate approximation. - * For instance, maximum relative error for the double precision variant is - * ~ 1e-13 for very small and very large values. - * This is ~2x faster than GNU libm's approach, which is still off by 2ulp on - * some inputs. - * @param x exponent - * @return 10^x - */ -static av_always_inline double ff_exp10(double x) -{ - return exp2(M_LOG2_10 * x); -} - -static av_always_inline float ff_exp10f(float x) -{ - return exp2f(M_LOG2_10 * x); -} - -/** - * Compute x^y for floating point x, y. Note: this function is faster than the - * libm variant due to mainly 2 reasons: - * 1. It does not handle any edge cases. In particular, this is only guaranteed - * to work correctly for x > 0. - * 2. It is not as accurate as a standard nearly "correctly rounded" libm variant. - * @param x base - * @param y exponent - * @return x^y - */ -static av_always_inline float ff_fast_powf(float x, float y) -{ - return expf(logf(x) * y); -} - - -/** - * A wrapper for open() setting O_CLOEXEC. - */ -av_warn_unused_result -int avpriv_open(const char *filename, int flags, ...); - -int avpriv_set_systematic_pal2(uint32_t pal[256], enum AVPixelFormat pix_fmt); - -static av_always_inline av_const int avpriv_mirror(int x, int w) -{ - if (!w) - return 0; - - while ((unsigned)x > (unsigned)w) { - x = -x; - if (x < 0) - x += 2 * w; - } - return x; -} - -void ff_check_pixfmt_descriptors(void); - extern const uint8_t ff_reverse[256]; #endif /* AVUTIL_INTERNAL_H */ diff --git a/ext/at3_standalone/utils.c b/ext/at3_standalone/utils.c index 8189d35a64..0190b7916c 100644 --- a/ext/at3_standalone/utils.c +++ b/ext/at3_standalone/utils.c @@ -35,7 +35,6 @@ #include "mathematics.h" #include "avstring.h" #include "samplefmt.h" -#include "dict.h" #include "avcodec.h" #include "opt.h" #include "internal.h" @@ -233,9 +232,6 @@ static int audio_get_buffer(AVCodecContext *avctx, AVFrame *frame) frame->extended_data[i + AV_NUM_DATA_POINTERS] = frame->extended_buf[i]->data; } - if (avctx->debug & FF_DEBUG_BUFFERS) - av_log(avctx, AV_LOG_DEBUG, "default_get_buffer called on frame %p", frame); - return 0; fail: av_frame_unref(frame); @@ -250,8 +246,6 @@ int avcodec_default_get_buffer2(AVCodecContext *avctx, AVFrame *frame, int flags return ret; switch (avctx->codec_type) { - case AVMEDIA_TYPE_VIDEO: - return -1; case AVMEDIA_TYPE_AUDIO: return audio_get_buffer(avctx, frame); default: @@ -262,8 +256,6 @@ int avcodec_default_get_buffer2(AVCodecContext *avctx, AVFrame *frame, int flags int ff_init_buffer_info(AVCodecContext *avctx, AVFrame *frame) { AVPacket *pkt = avctx->internal->pkt; - int i; - if (pkt) { av_frame_set_pkt_pos (frame, pkt->pos); av_frame_set_pkt_duration(frame, pkt->duration); @@ -275,8 +267,6 @@ int ff_init_buffer_info(AVCodecContext *avctx, AVFrame *frame) } switch (avctx->codec->type) { - case AVMEDIA_TYPE_VIDEO: - break; case AVMEDIA_TYPE_AUDIO: if (!frame->sample_rate) frame->sample_rate = avctx->sample_rate; @@ -306,29 +296,17 @@ int ff_init_buffer_info(AVCodecContext *avctx, AVFrame *frame) return 0; } -int ff_decode_frame_props(AVCodecContext *avctx, AVFrame *frame) -{ - return ff_init_buffer_info(avctx, frame); -} - -static int get_buffer_internal(AVCodecContext *avctx, AVFrame *frame, int flags) -{ - int override_dimensions = 1; - int ret; - - ret = ff_decode_frame_props(avctx, frame); - if (ret < 0) - return ret; - - ret = avctx->get_buffer2(avctx, frame, flags); - -end: - return ret; -} - int ff_get_buffer(AVCodecContext *avctx, AVFrame *frame, int flags) { - return get_buffer_internal(avctx, frame, flags); + int override_dimensions = 1; + int ret; + + ret = ff_init_buffer_info(avctx, frame); + if (ret < 0) + return ret; + + ret = avctx->get_buffer2(avctx, frame, flags); + return ret; } int avcodec_default_execute(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2), void *arg, int *ret, int count, int size) @@ -369,7 +347,6 @@ static int64_t get_bit_rate(AVCodecContext *ctx) int bits_per_sample; switch (ctx->codec_type) { - case AVMEDIA_TYPE_VIDEO: case AVMEDIA_TYPE_DATA: case AVMEDIA_TYPE_SUBTITLE: case AVMEDIA_TYPE_ATTACHMENT: @@ -478,31 +455,12 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code } avctx->frame_number = 0; - if ((avctx->codec->capabilities & AV_CODEC_CAP_EXPERIMENTAL) && - avctx->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) { - const char *codec_string = av_codec_is_encoder(codec) ? "encoder" : "decoder"; - AVCodec *codec2; - av_log(avctx, AV_LOG_ERROR, - "The %s '%s' is experimental but experimental codecs are not enabled, " - "add '-strict %d' if you want to use it.\n", - codec_string, codec->name, FF_COMPLIANCE_EXPERIMENTAL); - codec2 = av_codec_is_encoder(codec) ? avcodec_find_encoder(codec->id) : avcodec_find_decoder(codec->id); - if (!(codec2->capabilities & AV_CODEC_CAP_EXPERIMENTAL)) - av_log(avctx, AV_LOG_ERROR, "Alternatively use the non experimental %s '%s'.\n", - codec_string, codec2->name); - ret = AVERROR_EXPERIMENTAL; - goto free_and_end; - } - if (avctx->codec_type == AVMEDIA_TYPE_AUDIO && (!avctx->time_base.num || !avctx->time_base.den)) { avctx->time_base.num = 1; avctx->time_base.den = avctx->sample_rate; } - if (!HAVE_THREADS && !(codec->capabilities & AV_CODEC_CAP_AUTO_THREADS)) - avctx->thread_count = 1; - #if FF_API_VISMV if (avctx->debug_mv) av_log(avctx, AV_LOG_WARNING, "The 'vismv' option is deprecated, " @@ -515,8 +473,7 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code avctx->pts_correction_last_pts = avctx->pts_correction_last_dts = INT64_MIN; - if ( avctx->codec->init && (!(avctx->active_thread_type&FF_THREAD_FRAME) - || avctx->internal->frame_thread_encoder)) { + if (avctx->codec->init) { ret = avctx->codec->init(avctx); if (ret < 0) { goto free_and_end; @@ -670,8 +627,6 @@ FF_ENABLE_DEPRECATION_WARNINGS #endif } avctx->codec = NULL; - avctx->active_thread_type = 0; - return 0; } From 08d5de9f4cb0d94640eadb28310f4031498693e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Wed, 10 Apr 2024 23:18:45 +0200 Subject: [PATCH 074/719] Remove opt, dict, more --- Common/Common.vcxproj | 9 +- Common/Common.vcxproj.filters | 27 +- Core/HW/Atrac3Standalone.cpp | 1 - ext/at3_standalone/atrac3.c | 1 - ext/at3_standalone/av_buffer.c | 33 - ext/at3_standalone/avcodec.h | 1682 ----------------------- ext/at3_standalone/avstring.c | 418 ------ ext/at3_standalone/avstring.h | 402 ------ ext/at3_standalone/avutil.h | 29 - ext/at3_standalone/buffer.h | 22 - ext/at3_standalone/bytestream.h | 259 ---- ext/at3_standalone/channel_layout.c | 46 - ext/at3_standalone/channel_layout.h | 94 -- {Common => ext/at3_standalone}/compat.c | 12 + ext/at3_standalone/compat.h | 27 + ext/at3_standalone/dict.c | 223 --- ext/at3_standalone/dict.h | 198 --- ext/at3_standalone/error.h | 41 - ext/at3_standalone/float_dsp.c | 25 - ext/at3_standalone/float_dsp.h | 20 - ext/at3_standalone/frame.c | 192 --- ext/at3_standalone/frame.h | 200 +-- ext/at3_standalone/internal.h | 39 - ext/at3_standalone/mathematics.c | 66 - ext/at3_standalone/mathematics.h | 44 - ext/at3_standalone/mem.c | 154 --- ext/at3_standalone/mem.h | 151 -- ext/at3_standalone/opt.c | 1088 --------------- ext/at3_standalone/opt.h | 818 ----------- ext/at3_standalone/options.c | 19 +- ext/at3_standalone/rational.c | 180 --- ext/at3_standalone/rational.h | 28 - ext/at3_standalone/samplefmt.c | 15 - ext/at3_standalone/samplefmt.h | 12 - ext/at3_standalone/util_internal.h | 11 - ext/at3_standalone/utils.c | 649 +-------- 36 files changed, 62 insertions(+), 7173 deletions(-) delete mode 100644 ext/at3_standalone/avstring.c delete mode 100644 ext/at3_standalone/avstring.h rename {Common => ext/at3_standalone}/compat.c (92%) delete mode 100644 ext/at3_standalone/dict.c delete mode 100644 ext/at3_standalone/dict.h delete mode 100644 ext/at3_standalone/opt.c delete mode 100644 ext/at3_standalone/opt.h diff --git a/Common/Common.vcxproj b/Common/Common.vcxproj index dc7ceb9339..b638a87ff4 100644 --- a/Common/Common.vcxproj +++ b/Common/Common.vcxproj @@ -393,8 +393,6 @@ - - @@ -403,7 +401,6 @@ - @@ -420,7 +417,6 @@ - @@ -632,11 +628,10 @@ - - + @@ -644,7 +639,6 @@ - @@ -916,7 +910,6 @@ - diff --git a/Common/Common.vcxproj.filters b/Common/Common.vcxproj.filters index cc36777e60..f9d95c879c 100644 --- a/Common/Common.vcxproj.filters +++ b/Common/Common.vcxproj.filters @@ -584,18 +584,12 @@ ext\at3_standalone - - ext\at3_standalone - ext\at3_standalone ext\at3_standalone - - ext\at3_standalone - ext\at3_standalone @@ -626,9 +620,6 @@ ext\at3_standalone - - ext\at3_standalone - ext\at3_standalone @@ -638,9 +629,6 @@ ext\at3_standalone - - ext\at3_standalone - ext\at3_standalone @@ -1122,9 +1110,6 @@ ext\at3_standalone - - ext\at3_standalone - ext\at3_standalone @@ -1146,9 +1131,6 @@ ext\at3_standalone - - ext\at3_standalone - ext\at3_standalone @@ -1161,15 +1143,9 @@ ext\at3_standalone - - ext\at3_standalone - ext\at3_standalone - - ext\at3_standalone - ext\at3_standalone @@ -1182,6 +1158,9 @@ ext\at3_standalone + + ext\at3_standalone + diff --git a/Core/HW/Atrac3Standalone.cpp b/Core/HW/Atrac3Standalone.cpp index a5b583a59e..ee4596ed1c 100644 --- a/Core/HW/Atrac3Standalone.cpp +++ b/Core/HW/Atrac3Standalone.cpp @@ -32,7 +32,6 @@ public: avcodec_close(ctx_); av_frame_free(&frame_); av_freep(&ctx_->extradata); - av_freep(&ctx_->subtitle_header); av_freep(&ctx_); } diff --git a/ext/at3_standalone/atrac3.c b/ext/at3_standalone/atrac3.c index 4cb06e4ae4..eaf5a8f15a 100644 --- a/ext/at3_standalone/atrac3.c +++ b/ext/at3_standalone/atrac3.c @@ -930,7 +930,6 @@ AVCodec ff_atrac3_decoder = { .init = atrac3_decode_init, .close = atrac3_decode_close, .decode = atrac3_decode_frame, - .capabilities = AV_CODEC_CAP_SUBFRAMES | AV_CODEC_CAP_DR1, .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, }; diff --git a/ext/at3_standalone/av_buffer.c b/ext/at3_standalone/av_buffer.c index f261aa444d..54857d4398 100644 --- a/ext/at3_standalone/av_buffer.c +++ b/ext/at3_standalone/av_buffer.c @@ -79,16 +79,6 @@ AVBufferRef *av_buffer_alloc(int size) return ret; } -AVBufferRef *av_buffer_allocz(int size) -{ - AVBufferRef *ret = av_buffer_alloc(size); - if (!ret) - return NULL; - - memset(ret->data, 0, size); - return ret; -} - AVBufferRef *av_buffer_ref(AVBufferRef *buf) { AVBufferRef *ret = av_mallocz(sizeof(*ret)); @@ -136,34 +126,11 @@ int av_buffer_is_writable(const AVBufferRef *buf) return buf->buffer->refcount == 1; } -void *av_buffer_get_opaque(const AVBufferRef *buf) -{ - return buf->buffer->opaque; -} - int av_buffer_get_ref_count(const AVBufferRef *buf) { return buf->buffer->refcount; } -int av_buffer_make_writable(AVBufferRef **pbuf) -{ - AVBufferRef *newbuf, *buf = *pbuf; - - if (av_buffer_is_writable(buf)) - return 0; - - newbuf = av_buffer_alloc(buf->size); - if (!newbuf) - return AVERROR(ENOMEM); - - memcpy(newbuf->data, buf->data, buf->size); - - buffer_replace(pbuf, &newbuf); - - return 0; -} - int av_buffer_realloc(AVBufferRef **pbuf, int size) { AVBufferRef *buf = *pbuf; diff --git a/ext/at3_standalone/avcodec.h b/ext/at3_standalone/avcodec.h index 3b024cbae9..9d192d145e 100644 --- a/ext/at3_standalone/avcodec.h +++ b/ext/at3_standalone/avcodec.h @@ -32,13 +32,6 @@ #include "buffer.h" #include "channel_layout.h" #include "log.h" - /* -#include "libavutil/samplefmt.h" -#include "libavutil/avutil.h" -#include "libavutil/cpu.h" -#include "libavutil/dict.h" -#include "libavutil/pixfmt.h" -*/ #include "frame.h" #include "rational.h" #include "version.h" @@ -102,456 +95,9 @@ enum AVCodecID { AV_CODEC_ID_NONE, - /* video codecs */ - AV_CODEC_ID_MPEG1VIDEO, - AV_CODEC_ID_MPEG2VIDEO, ///< preferred ID for MPEG-1/2 video decoding -#if FF_API_XVMC - AV_CODEC_ID_MPEG2VIDEO_XVMC, -#endif /* FF_API_XVMC */ - AV_CODEC_ID_H261, - AV_CODEC_ID_H263, - AV_CODEC_ID_RV10, - AV_CODEC_ID_RV20, - AV_CODEC_ID_MJPEG, - AV_CODEC_ID_MJPEGB, - AV_CODEC_ID_LJPEG, - AV_CODEC_ID_SP5X, - AV_CODEC_ID_JPEGLS, - AV_CODEC_ID_MPEG4, - AV_CODEC_ID_RAWVIDEO, - AV_CODEC_ID_MSMPEG4V1, - AV_CODEC_ID_MSMPEG4V2, - AV_CODEC_ID_MSMPEG4V3, - AV_CODEC_ID_WMV1, - AV_CODEC_ID_WMV2, - AV_CODEC_ID_H263P, - AV_CODEC_ID_H263I, - AV_CODEC_ID_FLV1, - AV_CODEC_ID_SVQ1, - AV_CODEC_ID_SVQ3, - AV_CODEC_ID_DVVIDEO, - AV_CODEC_ID_HUFFYUV, - AV_CODEC_ID_CYUV, - AV_CODEC_ID_H264, - AV_CODEC_ID_INDEO3, - AV_CODEC_ID_VP3, - AV_CODEC_ID_THEORA, - AV_CODEC_ID_ASV1, - AV_CODEC_ID_ASV2, - AV_CODEC_ID_FFV1, - AV_CODEC_ID_4XM, - AV_CODEC_ID_VCR1, - AV_CODEC_ID_CLJR, - AV_CODEC_ID_MDEC, - AV_CODEC_ID_ROQ, - AV_CODEC_ID_INTERPLAY_VIDEO, - AV_CODEC_ID_XAN_WC3, - AV_CODEC_ID_XAN_WC4, - AV_CODEC_ID_RPZA, - AV_CODEC_ID_CINEPAK, - AV_CODEC_ID_WS_VQA, - AV_CODEC_ID_MSRLE, - AV_CODEC_ID_MSVIDEO1, - AV_CODEC_ID_IDCIN, - AV_CODEC_ID_8BPS, - AV_CODEC_ID_SMC, - AV_CODEC_ID_FLIC, - AV_CODEC_ID_TRUEMOTION1, - AV_CODEC_ID_VMDVIDEO, - AV_CODEC_ID_MSZH, - AV_CODEC_ID_ZLIB, - AV_CODEC_ID_QTRLE, - AV_CODEC_ID_TSCC, - AV_CODEC_ID_ULTI, - AV_CODEC_ID_QDRAW, - AV_CODEC_ID_VIXL, - AV_CODEC_ID_QPEG, - AV_CODEC_ID_PNG, - AV_CODEC_ID_PPM, - AV_CODEC_ID_PBM, - AV_CODEC_ID_PGM, - AV_CODEC_ID_PGMYUV, - AV_CODEC_ID_PAM, - AV_CODEC_ID_FFVHUFF, - AV_CODEC_ID_RV30, - AV_CODEC_ID_RV40, - AV_CODEC_ID_VC1, - AV_CODEC_ID_WMV3, - AV_CODEC_ID_LOCO, - AV_CODEC_ID_WNV1, - AV_CODEC_ID_AASC, - AV_CODEC_ID_INDEO2, - AV_CODEC_ID_FRAPS, - AV_CODEC_ID_TRUEMOTION2, - AV_CODEC_ID_BMP, - AV_CODEC_ID_CSCD, - AV_CODEC_ID_MMVIDEO, - AV_CODEC_ID_ZMBV, - AV_CODEC_ID_AVS, - AV_CODEC_ID_SMACKVIDEO, - AV_CODEC_ID_NUV, - AV_CODEC_ID_KMVC, - AV_CODEC_ID_FLASHSV, - AV_CODEC_ID_CAVS, - AV_CODEC_ID_JPEG2000, - AV_CODEC_ID_VMNC, - AV_CODEC_ID_VP5, - AV_CODEC_ID_VP6, - AV_CODEC_ID_VP6F, - AV_CODEC_ID_TARGA, - AV_CODEC_ID_DSICINVIDEO, - AV_CODEC_ID_TIERTEXSEQVIDEO, - AV_CODEC_ID_TIFF, - AV_CODEC_ID_GIF, - AV_CODEC_ID_DXA, - AV_CODEC_ID_DNXHD, - AV_CODEC_ID_THP, - AV_CODEC_ID_SGI, - AV_CODEC_ID_C93, - AV_CODEC_ID_BETHSOFTVID, - AV_CODEC_ID_PTX, - AV_CODEC_ID_TXD, - AV_CODEC_ID_VP6A, - AV_CODEC_ID_AMV, - AV_CODEC_ID_VB, - AV_CODEC_ID_PCX, - AV_CODEC_ID_SUNRAST, - AV_CODEC_ID_INDEO4, - AV_CODEC_ID_INDEO5, - AV_CODEC_ID_MIMIC, - AV_CODEC_ID_RL2, - AV_CODEC_ID_ESCAPE124, - AV_CODEC_ID_DIRAC, - AV_CODEC_ID_BFI, - AV_CODEC_ID_CMV, - AV_CODEC_ID_MOTIONPIXELS, - AV_CODEC_ID_TGV, - AV_CODEC_ID_TGQ, - AV_CODEC_ID_TQI, - AV_CODEC_ID_AURA, - AV_CODEC_ID_AURA2, - AV_CODEC_ID_V210X, - AV_CODEC_ID_TMV, - AV_CODEC_ID_V210, - AV_CODEC_ID_DPX, - AV_CODEC_ID_MAD, - AV_CODEC_ID_FRWU, - AV_CODEC_ID_FLASHSV2, - AV_CODEC_ID_CDGRAPHICS, - AV_CODEC_ID_R210, - AV_CODEC_ID_ANM, - AV_CODEC_ID_BINKVIDEO, - AV_CODEC_ID_IFF_ILBM, -#define AV_CODEC_ID_IFF_BYTERUN1 AV_CODEC_ID_IFF_ILBM - AV_CODEC_ID_KGV1, - AV_CODEC_ID_YOP, - AV_CODEC_ID_VP8, - AV_CODEC_ID_PICTOR, - AV_CODEC_ID_ANSI, - AV_CODEC_ID_A64_MULTI, - AV_CODEC_ID_A64_MULTI5, - AV_CODEC_ID_R10K, - AV_CODEC_ID_MXPEG, - AV_CODEC_ID_LAGARITH, - AV_CODEC_ID_PRORES, - AV_CODEC_ID_JV, - AV_CODEC_ID_DFA, - AV_CODEC_ID_WMV3IMAGE, - AV_CODEC_ID_VC1IMAGE, - AV_CODEC_ID_UTVIDEO, - AV_CODEC_ID_BMV_VIDEO, - AV_CODEC_ID_VBLE, - AV_CODEC_ID_DXTORY, - AV_CODEC_ID_V410, - AV_CODEC_ID_XWD, - AV_CODEC_ID_CDXL, - AV_CODEC_ID_XBM, - AV_CODEC_ID_ZEROCODEC, - AV_CODEC_ID_MSS1, - AV_CODEC_ID_MSA1, - AV_CODEC_ID_TSCC2, - AV_CODEC_ID_MTS2, - AV_CODEC_ID_CLLC, - AV_CODEC_ID_MSS2, - AV_CODEC_ID_VP9, - AV_CODEC_ID_AIC, - AV_CODEC_ID_ESCAPE130, - AV_CODEC_ID_G2M, - AV_CODEC_ID_WEBP, - AV_CODEC_ID_HNM4_VIDEO, - AV_CODEC_ID_HEVC, -#define AV_CODEC_ID_H265 AV_CODEC_ID_HEVC - AV_CODEC_ID_FIC, - AV_CODEC_ID_ALIAS_PIX, - AV_CODEC_ID_BRENDER_PIX, - AV_CODEC_ID_PAF_VIDEO, - AV_CODEC_ID_EXR, - AV_CODEC_ID_VP7, - AV_CODEC_ID_SANM, - AV_CODEC_ID_SGIRLE, - AV_CODEC_ID_MVC1, - AV_CODEC_ID_MVC2, - AV_CODEC_ID_HQX, - AV_CODEC_ID_TDSC, - AV_CODEC_ID_HQ_HQA, - AV_CODEC_ID_HAP, - AV_CODEC_ID_DDS, - AV_CODEC_ID_DXV, - AV_CODEC_ID_SCREENPRESSO, - AV_CODEC_ID_RSCC, - - AV_CODEC_ID_Y41P = 0x8000, - AV_CODEC_ID_AVRP, - AV_CODEC_ID_012V, - AV_CODEC_ID_AVUI, - AV_CODEC_ID_AYUV, - AV_CODEC_ID_TARGA_Y216, - AV_CODEC_ID_V308, - AV_CODEC_ID_V408, - AV_CODEC_ID_YUV4, - AV_CODEC_ID_AVRN, - AV_CODEC_ID_CPIA, - AV_CODEC_ID_XFACE, - AV_CODEC_ID_SNOW, - AV_CODEC_ID_SMVJPEG, - AV_CODEC_ID_APNG, - AV_CODEC_ID_DAALA, - AV_CODEC_ID_CFHD, - - /* various PCM "codecs" */ - AV_CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs - AV_CODEC_ID_PCM_S16LE = 0x10000, - AV_CODEC_ID_PCM_S16BE, - AV_CODEC_ID_PCM_U16LE, - AV_CODEC_ID_PCM_U16BE, - AV_CODEC_ID_PCM_S8, - AV_CODEC_ID_PCM_U8, - AV_CODEC_ID_PCM_MULAW, - AV_CODEC_ID_PCM_ALAW, - AV_CODEC_ID_PCM_S32LE, - AV_CODEC_ID_PCM_S32BE, - AV_CODEC_ID_PCM_U32LE, - AV_CODEC_ID_PCM_U32BE, - AV_CODEC_ID_PCM_S24LE, - AV_CODEC_ID_PCM_S24BE, - AV_CODEC_ID_PCM_U24LE, - AV_CODEC_ID_PCM_U24BE, - AV_CODEC_ID_PCM_S24DAUD, - AV_CODEC_ID_PCM_ZORK, - AV_CODEC_ID_PCM_S16LE_PLANAR, - AV_CODEC_ID_PCM_DVD, - AV_CODEC_ID_PCM_F32BE, - AV_CODEC_ID_PCM_F32LE, - AV_CODEC_ID_PCM_F64BE, - AV_CODEC_ID_PCM_F64LE, - AV_CODEC_ID_PCM_BLURAY, - AV_CODEC_ID_PCM_LXF, - AV_CODEC_ID_S302M, - AV_CODEC_ID_PCM_S8_PLANAR, - AV_CODEC_ID_PCM_S24LE_PLANAR, - AV_CODEC_ID_PCM_S32LE_PLANAR, - AV_CODEC_ID_PCM_S16BE_PLANAR, - /* new PCM "codecs" should be added right below this line starting with - * an explicit value of for example 0x10800 - */ - - /* various ADPCM codecs */ - AV_CODEC_ID_ADPCM_IMA_QT = 0x11000, - AV_CODEC_ID_ADPCM_IMA_WAV, - AV_CODEC_ID_ADPCM_IMA_DK3, - AV_CODEC_ID_ADPCM_IMA_DK4, - AV_CODEC_ID_ADPCM_IMA_WS, - AV_CODEC_ID_ADPCM_IMA_SMJPEG, - AV_CODEC_ID_ADPCM_MS, - AV_CODEC_ID_ADPCM_4XM, - AV_CODEC_ID_ADPCM_XA, - AV_CODEC_ID_ADPCM_ADX, - AV_CODEC_ID_ADPCM_EA, - AV_CODEC_ID_ADPCM_G726, - AV_CODEC_ID_ADPCM_CT, - AV_CODEC_ID_ADPCM_SWF, - AV_CODEC_ID_ADPCM_YAMAHA, - AV_CODEC_ID_ADPCM_SBPRO_4, - AV_CODEC_ID_ADPCM_SBPRO_3, - AV_CODEC_ID_ADPCM_SBPRO_2, - AV_CODEC_ID_ADPCM_THP, - AV_CODEC_ID_ADPCM_IMA_AMV, - AV_CODEC_ID_ADPCM_EA_R1, - AV_CODEC_ID_ADPCM_EA_R3, - AV_CODEC_ID_ADPCM_EA_R2, - AV_CODEC_ID_ADPCM_IMA_EA_SEAD, - AV_CODEC_ID_ADPCM_IMA_EA_EACS, - AV_CODEC_ID_ADPCM_EA_XAS, - AV_CODEC_ID_ADPCM_EA_MAXIS_XA, - AV_CODEC_ID_ADPCM_IMA_ISS, - AV_CODEC_ID_ADPCM_G722, - AV_CODEC_ID_ADPCM_IMA_APC, - AV_CODEC_ID_ADPCM_VIMA, -#if FF_API_VIMA_DECODER - AV_CODEC_ID_VIMA = AV_CODEC_ID_ADPCM_VIMA, -#endif - - AV_CODEC_ID_ADPCM_AFC = 0x11800, - AV_CODEC_ID_ADPCM_IMA_OKI, - AV_CODEC_ID_ADPCM_DTK, - AV_CODEC_ID_ADPCM_IMA_RAD, - AV_CODEC_ID_ADPCM_G726LE, - AV_CODEC_ID_ADPCM_THP_LE, - AV_CODEC_ID_ADPCM_PSX, - AV_CODEC_ID_ADPCM_AICA, - - /* AMR */ - AV_CODEC_ID_AMR_NB = 0x12000, - AV_CODEC_ID_AMR_WB, - - /* RealAudio codecs*/ - AV_CODEC_ID_RA_144 = 0x13000, - AV_CODEC_ID_RA_288, - - /* various DPCM codecs */ - AV_CODEC_ID_ROQ_DPCM = 0x14000, - AV_CODEC_ID_INTERPLAY_DPCM, - AV_CODEC_ID_XAN_DPCM, - AV_CODEC_ID_SOL_DPCM, - - AV_CODEC_ID_SDX2_DPCM = 0x14800, - - /* audio codecs */ - AV_CODEC_ID_MP2 = 0x15000, - AV_CODEC_ID_MP3, ///< preferred ID for decoding MPEG audio layer 1, 2 or 3 - AV_CODEC_ID_AAC, - AV_CODEC_ID_AC3, - AV_CODEC_ID_DTS, - AV_CODEC_ID_VORBIS, - AV_CODEC_ID_DVAUDIO, - AV_CODEC_ID_WMAV1, - AV_CODEC_ID_WMAV2, - AV_CODEC_ID_MACE3, - AV_CODEC_ID_MACE6, - AV_CODEC_ID_VMDAUDIO, - AV_CODEC_ID_FLAC, - AV_CODEC_ID_MP3ADU, - AV_CODEC_ID_MP3ON4, - AV_CODEC_ID_SHORTEN, - AV_CODEC_ID_ALAC, - AV_CODEC_ID_WESTWOOD_SND1, - AV_CODEC_ID_GSM, ///< as in Berlin toast format - AV_CODEC_ID_QDM2, - AV_CODEC_ID_COOK, - AV_CODEC_ID_TRUESPEECH, - AV_CODEC_ID_TTA, - AV_CODEC_ID_SMACKAUDIO, - AV_CODEC_ID_QCELP, - AV_CODEC_ID_WAVPACK, - AV_CODEC_ID_DSICINAUDIO, - AV_CODEC_ID_IMC, - AV_CODEC_ID_MUSEPACK7, - AV_CODEC_ID_MLP, - AV_CODEC_ID_GSM_MS, /* as found in WAV */ AV_CODEC_ID_ATRAC3, -#if FF_API_VOXWARE - AV_CODEC_ID_VOXWARE, -#endif - AV_CODEC_ID_APE, - AV_CODEC_ID_NELLYMOSER, - AV_CODEC_ID_MUSEPACK8, - AV_CODEC_ID_SPEEX, - AV_CODEC_ID_WMAVOICE, - AV_CODEC_ID_WMAPRO, - AV_CODEC_ID_WMALOSSLESS, AV_CODEC_ID_ATRAC3P, - AV_CODEC_ID_EAC3, - AV_CODEC_ID_SIPR, - AV_CODEC_ID_MP1, - AV_CODEC_ID_TWINVQ, - AV_CODEC_ID_TRUEHD, - AV_CODEC_ID_MP4ALS, AV_CODEC_ID_ATRAC1, - AV_CODEC_ID_BINKAUDIO_RDFT, - AV_CODEC_ID_BINKAUDIO_DCT, - AV_CODEC_ID_AAC_LATM, - AV_CODEC_ID_QDMC, - AV_CODEC_ID_CELT, - AV_CODEC_ID_G723_1, - AV_CODEC_ID_G729, - AV_CODEC_ID_8SVX_EXP, - AV_CODEC_ID_8SVX_FIB, - AV_CODEC_ID_BMV_AUDIO, - AV_CODEC_ID_RALF, - AV_CODEC_ID_IAC, - AV_CODEC_ID_ILBC, - AV_CODEC_ID_OPUS, - AV_CODEC_ID_COMFORT_NOISE, - AV_CODEC_ID_TAK, - AV_CODEC_ID_METASOUND, - AV_CODEC_ID_PAF_AUDIO, - AV_CODEC_ID_ON2AVC, - AV_CODEC_ID_DSS_SP, - - AV_CODEC_ID_FFWAVESYNTH = 0x15800, - AV_CODEC_ID_SONIC, - AV_CODEC_ID_SONIC_LS, - AV_CODEC_ID_EVRC, - AV_CODEC_ID_SMV, - AV_CODEC_ID_DSD_LSBF, - AV_CODEC_ID_DSD_MSBF, - AV_CODEC_ID_DSD_LSBF_PLANAR, - AV_CODEC_ID_DSD_MSBF_PLANAR, - AV_CODEC_ID_4GV, - AV_CODEC_ID_INTERPLAY_ACM, - AV_CODEC_ID_XMA1, - AV_CODEC_ID_XMA2, - - /* subtitle codecs */ - AV_CODEC_ID_FIRST_SUBTITLE = 0x17000, ///< A dummy ID pointing at the start of subtitle codecs. - AV_CODEC_ID_DVD_SUBTITLE = 0x17000, - AV_CODEC_ID_DVB_SUBTITLE, - AV_CODEC_ID_TEXT, ///< raw UTF-8 text - AV_CODEC_ID_XSUB, - AV_CODEC_ID_SSA, - AV_CODEC_ID_MOV_TEXT, - AV_CODEC_ID_HDMV_PGS_SUBTITLE, - AV_CODEC_ID_DVB_TELETEXT, - AV_CODEC_ID_SRT, - - AV_CODEC_ID_MICRODVD = 0x17800, - AV_CODEC_ID_EIA_608, - AV_CODEC_ID_JACOSUB, - AV_CODEC_ID_SAMI, - AV_CODEC_ID_REALTEXT, - AV_CODEC_ID_STL, - AV_CODEC_ID_SUBVIEWER1, - AV_CODEC_ID_SUBVIEWER, - AV_CODEC_ID_SUBRIP, - AV_CODEC_ID_WEBVTT, - AV_CODEC_ID_MPL2, - AV_CODEC_ID_VPLAYER, - AV_CODEC_ID_PJS, - AV_CODEC_ID_ASS, - AV_CODEC_ID_HDMV_TEXT_SUBTITLE, - - /* other specific kind of codecs (generally used for attachments) */ - AV_CODEC_ID_FIRST_UNKNOWN = 0x18000, ///< A dummy ID pointing at the start of various fake codecs. - AV_CODEC_ID_TTF = 0x18000, - - AV_CODEC_ID_BINTEXT = 0x18800, - AV_CODEC_ID_XBIN, - AV_CODEC_ID_IDF, - AV_CODEC_ID_OTF, - AV_CODEC_ID_SMPTE_KLV, - AV_CODEC_ID_DVD_NAV, - AV_CODEC_ID_TIMED_ID3, - AV_CODEC_ID_BIN_DATA, - - - AV_CODEC_ID_PROBE = 0x19000, ///< codec_id is not known (like AV_CODEC_ID_NONE) but lavf should attempt to identify it - - AV_CODEC_ID_MPEG2TS = 0x20000, /**< _FAKE_ codec to indicate a raw MPEG-2 TS - * stream (only used by libavformat) */ - AV_CODEC_ID_MPEG4SYSTEMS = 0x20001, /**< _FAKE_ codec to indicate a MPEG-4 Systems - * stream (only used by libavformat) */ - AV_CODEC_ID_FFMETADATA = 0x21000, ///< Dummy codec for streams containing only metadata information. - AV_CODEC_ID_WRAPPED_AVFRAME = 0x21001, ///< Passthrough codec, AVFrames wrapped in AVPacket }; /** @@ -572,59 +118,8 @@ typedef struct AVCodecDescriptor { * A more descriptive name for this codec. May be NULL. */ const char *long_name; - /** - * Codec properties, a combination of AV_CODEC_PROP_* flags. - */ - int props; - /** - * MIME type(s) associated with the codec. - * May be NULL; if not, a NULL-terminated array of MIME types. - * The first item is always non-NULL and is the preferred MIME type. - */ - const char *const *mime_types; - /** - * If non-NULL, an array of profiles recognized for this codec. - * Terminated with FF_PROFILE_UNKNOWN. - */ - const struct AVProfile *profiles; } AVCodecDescriptor; -/** - * Codec uses only intra compression. - * Video codecs only. - */ -#define AV_CODEC_PROP_INTRA_ONLY (1 << 0) -/** - * Codec supports lossy compression. Audio and video codecs only. - * @note a codec may support both lossy and lossless - * compression modes - */ -#define AV_CODEC_PROP_LOSSY (1 << 1) -/** - * Codec supports lossless compression. Audio and video codecs only. - */ -#define AV_CODEC_PROP_LOSSLESS (1 << 2) -/** - * Codec supports frame reordering. That is, the coded order (the order in which - * the encoded packets are output by the encoders / stored / input to the - * decoders) may be different from the presentation order of the corresponding - * frames. - * - * For codecs that do not have this property set, PTS and DTS should always be - * equal. - */ -#define AV_CODEC_PROP_REORDER (1 << 3) -/** - * Subtitle codec is bitmap based - * Decoded AVSubtitle data can be read from the AVSubtitleRect->pict field. - */ -#define AV_CODEC_PROP_BITMAP_SUB (1 << 16) -/** - * Subtitle codec is text based. - * Decoded AVSubtitle data can be read from the AVSubtitleRect->ass field. - */ -#define AV_CODEC_PROP_TEXT_SUB (1 << 17) - /** * @ingroup lavc_decoding * Required number of additionally allocated bytes at the end of the input bitstream for decoding. @@ -642,66 +137,6 @@ typedef struct AVCodecDescriptor { */ #define AV_INPUT_BUFFER_MIN_SIZE 16384 -#if FF_API_WITHOUT_PREFIX -/** - * @deprecated use AV_INPUT_BUFFER_PADDING_SIZE instead - */ -#define FF_INPUT_BUFFER_PADDING_SIZE 32 - -/** - * @deprecated use AV_INPUT_BUFFER_MIN_SIZE instead - */ -#define FF_MIN_BUFFER_SIZE 16384 -#endif /* FF_API_WITHOUT_PREFIX */ - -/** - * @ingroup lavc_encoding - * motion estimation type. - * @deprecated use codec private option instead - */ -#if FF_API_MOTION_EST -enum Motion_Est_ID { - ME_ZERO = 1, ///< no search, that is use 0,0 vector whenever one is needed - ME_FULL, - ME_LOG, - ME_PHODS, - ME_EPZS, ///< enhanced predictive zonal search - ME_X1, ///< reserved for experiments - ME_HEX, ///< hexagon based search - ME_UMH, ///< uneven multi-hexagon search - ME_TESA, ///< transformed exhaustive search algorithm - ME_ITER=50, ///< iterative search -}; -#endif - -/** - * @ingroup lavc_decoding - */ -enum AVDiscard{ - /* We leave some space between them for extensions (drop some - * keyframes for intra-only or drop just some bidir frames). */ - AVDISCARD_NONE =-16, ///< discard nothing - AVDISCARD_DEFAULT = 0, ///< discard useless packets like 0 size packets in avi - AVDISCARD_NONREF = 8, ///< discard all non reference - AVDISCARD_BIDIR = 16, ///< discard all bidirectional frames - AVDISCARD_NONINTRA= 24, ///< discard all non intra frames - AVDISCARD_NONKEY = 32, ///< discard all frames except keyframes - AVDISCARD_ALL = 48, ///< discard all -}; - -enum AVAudioServiceType { - AV_AUDIO_SERVICE_TYPE_MAIN = 0, - AV_AUDIO_SERVICE_TYPE_EFFECTS = 1, - AV_AUDIO_SERVICE_TYPE_VISUALLY_IMPAIRED = 2, - AV_AUDIO_SERVICE_TYPE_HEARING_IMPAIRED = 3, - AV_AUDIO_SERVICE_TYPE_DIALOGUE = 4, - AV_AUDIO_SERVICE_TYPE_COMMENTARY = 5, - AV_AUDIO_SERVICE_TYPE_EMERGENCY = 6, - AV_AUDIO_SERVICE_TYPE_VOICE_OVER = 7, - AV_AUDIO_SERVICE_TYPE_KARAOKE = 8, - AV_AUDIO_SERVICE_TYPE_NB , ///< Not part of ABI -}; - /** * @ingroup lavc_encoding */ @@ -770,10 +205,6 @@ typedef struct RcOverride{ * instead of only at frame boundaries. */ #define AV_CODEC_FLAG_TRUNCATED (1 << 16) -/** - * Use interlaced DCT. - */ -#define AV_CODEC_FLAG_INTERLACED_DCT (1 << 18) /** * Force low delay. */ @@ -893,101 +324,6 @@ typedef struct RcOverride{ #define AV_CODEC_CAP_HWACCEL_VDPAU (1 << 7) #endif -/** - * Codec can output multiple frames per AVPacket - * Normally demuxers return one frame at a time, demuxers which do not do - * are connected to a parser to split what they return into proper frames. - * This flag is reserved to the very rare category of codecs which have a - * bitstream that cannot be split into frames without timeconsuming - * operations like full decoding. Demuxers carring such bitstreams thus - * may return multiple frames in a packet. This has many disadvantages like - * prohibiting stream copy in many cases thus it should only be considered - * as a last resort. - */ -#define AV_CODEC_CAP_SUBFRAMES (1 << 8) -/** - * Codec is experimental and is thus avoided in favor of non experimental - * encoders - */ -#define AV_CODEC_CAP_EXPERIMENTAL (1 << 9) -/** - * Codec should fill in channel configuration and samplerate instead of container - */ -#define AV_CODEC_CAP_CHANNEL_CONF (1 << 10) -/** - * Codec supports frame-level multithreading. - */ -#define AV_CODEC_CAP_FRAME_THREADS (1 << 12) -/** - * Codec supports slice-based (or partition-based) multithreading. - */ -#define AV_CODEC_CAP_SLICE_THREADS (1 << 13) -/** - * Codec supports changed parameters at any point. - */ -#define AV_CODEC_CAP_PARAM_CHANGE (1 << 14) -/** - * Codec supports avctx->thread_count == 0 (auto). - */ -#define AV_CODEC_CAP_AUTO_THREADS (1 << 15) -/** - * Audio encoder supports receiving a different number of samples in each call. - */ -#define AV_CODEC_CAP_VARIABLE_FRAME_SIZE (1 << 16) -/** - * Codec is intra only. - */ -#define AV_CODEC_CAP_INTRA_ONLY 0x40000000 -/** - * Codec is lossless. - */ -#define AV_CODEC_CAP_LOSSLESS 0x80000000 - -/** - * This structure describes the bitrate properties of an encoded bitstream. It - * roughly corresponds to a subset the VBV parameters for MPEG-2 or HRD - * parameters for H.264/HEVC. - */ -typedef struct AVCPBProperties { - /** - * Maximum bitrate of the stream, in bits per second. - * Zero if unknown or unspecified. - */ - int max_bitrate; - /** - * Minimum bitrate of the stream, in bits per second. - * Zero if unknown or unspecified. - */ - int min_bitrate; - /** - * Average bitrate of the stream, in bits per second. - * Zero if unknown or unspecified. - */ - int avg_bitrate; - - /** - * The size of the buffer to which the ratecontrol is applied, in bits. - * Zero if unknown or unspecified. - */ - int buffer_size; - - /** - * The delay between the time the packet this structure is associated with - * is received and the time when it should be decoded, in periods of a 27MHz - * clock. - * - * UINT64_MAX when unknown or unspecified. - */ - uint64_t vbv_delay; -} AVCPBProperties; - -#if FF_API_QSCALE_TYPE -#define FF_QSCALE_TYPE_MPEG1 0 -#define FF_QSCALE_TYPE_MPEG2 1 -#define FF_QSCALE_TYPE_H264 2 -#define FF_QSCALE_TYPE_VP56 3 -#endif - /** * The decoder will keep a reference to the frame and may reuse it later. */ @@ -1133,37 +469,6 @@ typedef struct AVCodecContext { */ struct AVCodecInternal *internal; - /** - * Private data of the user, can be used to carry app specific stuff. - * - encoding: Set by user. - * - decoding: Set by user. - */ - void *opaque; - - /** - * the average bitrate - * - encoding: Set by user; unused for constant quantizer encoding. - * - decoding: Set by user, may be overwritten by libavcodec - * if this info is available in the stream - */ - int64_t bit_rate; - - /** - * number of bits the bitstream is allowed to diverge from the reference. - * the reference can be CBR (for CBR pass1) or VBR (for pass2) - * - encoding: Set by user; unused for constant quantizer encoding. - * - decoding: unused - */ - int bit_rate_tolerance; - - /** - * Global quality for codecs which cannot change it per frame. - * This should be proportional to MPEG-1/2/4 qscale. - * - encoding: Set by user. - * - decoding: unused - */ - int global_quality; - /** * - encoding: Set by user. * - decoding: unused @@ -1618,27 +923,6 @@ typedef struct AVCodecContext { */ int bits_per_raw_sample; -#if FF_API_LOWRES - /** - * low resolution decoding, 1-> 1/2 size, 2->1/4 size - * - encoding: unused - * - decoding: Set by user. - * Code outside libavcodec should access this field using: - * av_codec_{get,set}_lowres(avctx) - */ - int lowres; -#endif - -#if FF_API_CODED_FRAME - /** - * the picture in the bitstream - * - encoding: Set by libavcodec. - * - decoding: unused - * - * @deprecated use the quality factor packet side data instead - */ - attribute_deprecated AVFrame *coded_frame; -#endif /** * noise vs. sse weight for the nsse comparison function * - encoding: Set by user. @@ -1660,16 +944,6 @@ typedef struct AVCodecContext { */ enum AVDiscard skip_frame; - /** - * Header containing style information for text subtitles. - * For SUBTITLE_ASS subtitle type, it should contain the whole ASS - * [Script Info] and [V4+ Styles] section, plus the [Events] line and - * the Format line following. It shouldn't include any Dialogue line. - * - encoding: Set/allocated/freed by user (before avcodec_open2()) - * - decoding: Set/allocated/freed by libavcodec (by avcodec_open2()) - */ - uint8_t *subtitle_header; - int subtitle_header_size; /** * Audio only. The number of "priming" samples (padding) inserted by the @@ -1697,31 +971,6 @@ typedef struct AVCodecContext { */ AVRational pkt_timebase; - /** - * Current statistics for PTS correction. - * - decoding: maintained and used by libavcodec, not intended to be used by user apps - * - encoding: unused - */ - int64_t pts_correction_num_faulty_pts; /// Number of incorrect PTS values so far - int64_t pts_correction_num_faulty_dts; /// Number of incorrect DTS values so far - int64_t pts_correction_last_pts; /// PTS of the last frame - int64_t pts_correction_last_dts; /// DTS of the last frame - - /** - * Skip processing alpha if supported by codec. - * Note that if the format uses pre-multiplied alpha (common with VP6, - * and recommended due to better video quality/compression) - * the image will look as if alpha-blended onto a black background. - * However for formats that do not use pre-multiplied alpha - * there might be serious artefacts (though e.g. libswscale currently - * assumes pre-multiplied alpha anyway). - * Code outside libavcodec should access this field using AVOptions - * - * - decoding: set by user - * - encoding: unused - */ - int skip_alpha; - /** * Number of samples to skip after a discontinuity * - decoding: unused @@ -1741,14 +990,6 @@ typedef struct AVCodecContext { } AVCodecContext; -AVRational av_codec_get_pkt_timebase (const AVCodecContext *avctx); -void av_codec_set_pkt_timebase (AVCodecContext *avctx, AVRational val); - -unsigned av_codec_get_codec_properties(const AVCodecContext *avctx); - -int av_codec_get_seek_preroll(const AVCodecContext *avctx); -void av_codec_set_seek_preroll(AVCodecContext *avctx, int val); - /** * AVProfile. */ @@ -2459,22 +1700,6 @@ void av_packet_rescale_ts(AVPacket *pkt, AVRational tb_src, AVRational tb_dst); * @{ */ -/** - * Find a registered decoder with a matching codec ID. - * - * @param id AVCodecID of the requested decoder - * @return A decoder if one was found, NULL otherwise. - */ -AVCodec *avcodec_find_decoder(enum AVCodecID id); - -/** - * Find a registered decoder with the specified name. - * - * @param name name of the requested decoder - * @return A decoder if one was found, NULL otherwise. - */ -AVCodec *avcodec_find_decoder_by_name(const char *name); - /** * The default callback for AVCodecContext.get_buffer2(). It is made public so * it can be called by custom get_buffer2() implementations for decoders without @@ -2482,206 +1707,6 @@ AVCodec *avcodec_find_decoder_by_name(const char *name); */ int avcodec_default_get_buffer2(AVCodecContext *s, AVFrame *frame, int flags); -#if FF_API_EMU_EDGE -/** - * Return the amount of padding in pixels which the get_buffer callback must - * provide around the edge of the image for codecs which do not have the - * CODEC_FLAG_EMU_EDGE flag. - * - * @return Required padding in pixels. - * - * @deprecated CODEC_FLAG_EMU_EDGE is deprecated, so this function is no longer - * needed - */ -attribute_deprecated -unsigned avcodec_get_edge_width(void); -#endif - -/** - * Modify width and height values so that they will result in a memory - * buffer that is acceptable for the codec if you do not use any horizontal - * padding. - * - * May only be used if a codec with AV_CODEC_CAP_DR1 has been opened. - */ -void avcodec_align_dimensions(AVCodecContext *s, int *width, int *height); - -/** - * Modify width and height values so that they will result in a memory - * buffer that is acceptable for the codec if you also ensure that all - * line sizes are a multiple of the respective linesize_align[i]. - * - * May only be used if a codec with AV_CODEC_CAP_DR1 has been opened. - */ -void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height, - int linesize_align[AV_NUM_DATA_POINTERS]); - -/** - * Converts AVChromaLocation to swscale x/y chroma position. - * - * The positions represent the chroma (0,0) position in a coordinates system - * with luma (0,0) representing the origin and luma(1,1) representing 256,256 - * - * @param xpos horizontal chroma sample position - * @param ypos vertical chroma sample position - */ -int avcodec_enum_to_chroma_pos(int *xpos, int *ypos, enum AVChromaLocation pos); - -/** - * Converts swscale x/y chroma position to AVChromaLocation. - * - * The positions represent the chroma (0,0) position in a coordinates system - * with luma (0,0) representing the origin and luma(1,1) representing 256,256 - * - * @param xpos horizontal chroma sample position - * @param ypos vertical chroma sample position - */ -enum AVChromaLocation avcodec_chroma_pos_to_enum(int xpos, int ypos); - -/** - * Decode the audio frame of size avpkt->size from avpkt->data into frame. - * - * Some decoders may support multiple frames in a single AVPacket. Such - * decoders would then just decode the first frame and the return value would be - * less than the packet size. In this case, avcodec_decode_audio4 has to be - * called again with an AVPacket containing the remaining data in order to - * decode the second frame, etc... Even if no frames are returned, the packet - * needs to be fed to the decoder with remaining data until it is completely - * consumed or an error occurs. - * - * Some decoders (those marked with AV_CODEC_CAP_DELAY) have a delay between input - * and output. This means that for some packets they will not immediately - * produce decoded output and need to be flushed at the end of decoding to get - * all the decoded data. Flushing is done by calling this function with packets - * with avpkt->data set to NULL and avpkt->size set to 0 until it stops - * returning samples. It is safe to flush even those decoders that are not - * marked with AV_CODEC_CAP_DELAY, then no samples will be returned. - * - * @warning The input buffer, avpkt->data must be AV_INPUT_BUFFER_PADDING_SIZE - * larger than the actual read bytes because some optimized bitstream - * readers read 32 or 64 bits at once and could read over the end. - * - * @note The AVCodecContext MUST have been opened with @ref avcodec_open2() - * before packets may be fed to the decoder. - * - * @param avctx the codec context - * @param[out] frame The AVFrame in which to store decoded audio samples. - * The decoder will allocate a buffer for the decoded frame by - * calling the AVCodecContext.get_buffer2() callback. - * When AVCodecContext.refcounted_frames is set to 1, the frame is - * reference counted and the returned reference belongs to the - * caller. The caller must release the frame using av_frame_unref() - * when the frame is no longer needed. The caller may safely write - * to the frame if av_frame_is_writable() returns 1. - * When AVCodecContext.refcounted_frames is set to 0, the returned - * reference belongs to the decoder and is valid only until the - * next call to this function or until closing or flushing the - * decoder. The caller may not write to it. - * @param[out] got_frame_ptr Zero if no frame could be decoded, otherwise it is - * non-zero. Note that this field being set to zero - * does not mean that an error has occurred. For - * decoders with AV_CODEC_CAP_DELAY set, no given decode - * call is guaranteed to produce a frame. - * @param[in] avpkt The input AVPacket containing the input buffer. - * At least avpkt->data and avpkt->size should be set. Some - * decoders might also require additional fields to be set. - * @return A negative error code is returned if an error occurred during - * decoding, otherwise the number of bytes consumed from the input - * AVPacket is returned. - */ -int avcodec_decode_audio4(AVCodecContext *avctx, AVFrame *frame, - int *got_frame_ptr, const AVPacket *avpkt); - -/** - * Decode the video frame of size avpkt->size from avpkt->data into picture. - * Some decoders may support multiple frames in a single AVPacket, such - * decoders would then just decode the first frame. - * - * @warning The input buffer must be AV_INPUT_BUFFER_PADDING_SIZE larger than - * the actual read bytes because some optimized bitstream readers read 32 or 64 - * bits at once and could read over the end. - * - * @warning The end of the input buffer buf should be set to 0 to ensure that - * no overreading happens for damaged MPEG streams. - * - * @note Codecs which have the AV_CODEC_CAP_DELAY capability set have a delay - * between input and output, these need to be fed with avpkt->data=NULL, - * avpkt->size=0 at the end to return the remaining frames. - * - * @note The AVCodecContext MUST have been opened with @ref avcodec_open2() - * before packets may be fed to the decoder. - * - * @param avctx the codec context - * @param[out] picture The AVFrame in which the decoded video frame will be stored. - * Use av_frame_alloc() to get an AVFrame. The codec will - * allocate memory for the actual bitmap by calling the - * AVCodecContext.get_buffer2() callback. - * When AVCodecContext.refcounted_frames is set to 1, the frame is - * reference counted and the returned reference belongs to the - * caller. The caller must release the frame using av_frame_unref() - * when the frame is no longer needed. The caller may safely write - * to the frame if av_frame_is_writable() returns 1. - * When AVCodecContext.refcounted_frames is set to 0, the returned - * reference belongs to the decoder and is valid only until the - * next call to this function or until closing or flushing the - * decoder. The caller may not write to it. - * - * @param[in] avpkt The input AVPacket containing the input buffer. - * You can create such packet with av_init_packet() and by then setting - * data and size, some decoders might in addition need other fields like - * flags&AV_PKT_FLAG_KEY. All decoders are designed to use the least - * fields possible. - * @param[in,out] got_picture_ptr Zero if no frame could be decompressed, otherwise, it is nonzero. - * @return On error a negative value is returned, otherwise the number of bytes - * used or zero if no frame could be decompressed. - */ -int avcodec_decode_video2(AVCodecContext *avctx, AVFrame *picture, - int *got_picture_ptr, - const AVPacket *avpkt); - -/** - * Decode a subtitle message. - * Return a negative value on error, otherwise return the number of bytes used. - * If no subtitle could be decompressed, got_sub_ptr is zero. - * Otherwise, the subtitle is stored in *sub. - * Note that AV_CODEC_CAP_DR1 is not available for subtitle codecs. This is for - * simplicity, because the performance difference is expect to be negligible - * and reusing a get_buffer written for video codecs would probably perform badly - * due to a potentially very different allocation pattern. - * - * Some decoders (those marked with CODEC_CAP_DELAY) have a delay between input - * and output. This means that for some packets they will not immediately - * produce decoded output and need to be flushed at the end of decoding to get - * all the decoded data. Flushing is done by calling this function with packets - * with avpkt->data set to NULL and avpkt->size set to 0 until it stops - * returning subtitles. It is safe to flush even those decoders that are not - * marked with CODEC_CAP_DELAY, then no subtitles will be returned. - * - * @note The AVCodecContext MUST have been opened with @ref avcodec_open2() - * before packets may be fed to the decoder. - * - * @param avctx the codec context - * @param[out] sub The Preallocated AVSubtitle in which the decoded subtitle will be stored, - * must be freed with avsubtitle_free if *got_sub_ptr is set. - * @param[in,out] got_sub_ptr Zero if no subtitle could be decompressed, otherwise, it is nonzero. - * @param[in] avpkt The input AVPacket containing the input buffer. - */ -int avcodec_decode_subtitle2(AVCodecContext *avctx, AVSubtitle *sub, - int *got_sub_ptr, - AVPacket *avpkt); - -/** - * @defgroup lavc_parsing Frame parsing - * @{ - */ - -enum AVPictureStructure { - AV_PICTURE_STRUCTURE_UNKNOWN, //< unknown - AV_PICTURE_STRUCTURE_TOP_FIELD, //< coded as top field - AV_PICTURE_STRUCTURE_BOTTOM_FIELD, //< coded as bottom field - AV_PICTURE_STRUCTURE_FRAME, //< coded as frame -}; - typedef struct AVCodecParserContext { void *priv_data; struct AVCodecParser *parser; @@ -2689,8 +1714,6 @@ typedef struct AVCodecParserContext { int64_t cur_offset; /* current offset (incremented by each av_parser_parse()) */ int64_t next_frame_offset; /* offset of the next frame */ - /* video info */ - int pict_type; /* XXX: Put it back in AVCodecContext. */ /** * This field is used for proper frame duration computation in lavf. * It signals, how much longer the frame duration of the current frame @@ -2700,7 +1723,6 @@ typedef struct AVCodecParserContext { * * It is used by codecs like H.264 to display telecined material. */ - int repeat_pict; /* XXX: Put it back in AVCodecContext. */ int64_t pts; /* pts of the current frame */ int64_t dts; /* dts of the current frame */ @@ -2849,344 +1871,6 @@ typedef struct AVCodecParserContext { int format; } AVCodecParserContext; -typedef struct AVCodecParser { - int codec_ids[5]; /* several codec IDs are permitted */ - int priv_data_size; - int (*parser_init)(AVCodecParserContext *s); - /* This callback never returns an error, a negative value means that - * the frame start was in a previous packet. */ - int (*parser_parse)(AVCodecParserContext *s, - AVCodecContext *avctx, - const uint8_t **poutbuf, int *poutbuf_size, - const uint8_t *buf, int buf_size); - void (*parser_close)(AVCodecParserContext *s); - int (*split)(AVCodecContext *avctx, const uint8_t *buf, int buf_size); - struct AVCodecParser *next; -} AVCodecParser; - -AVCodecParser *av_parser_next(const AVCodecParser *c); - -void av_register_codec_parser(AVCodecParser *parser); -AVCodecParserContext *av_parser_init(int codec_id); - -/** - * Parse a packet. - * - * @param s parser context. - * @param avctx codec context. - * @param poutbuf set to pointer to parsed buffer or NULL if not yet finished. - * @param poutbuf_size set to size of parsed buffer or zero if not yet finished. - * @param buf input buffer. - * @param buf_size input length, to signal EOF, this should be 0 (so that the last frame can be output). - * @param pts input presentation timestamp. - * @param dts input decoding timestamp. - * @param pos input byte position in stream. - * @return the number of bytes of the input bitstream used. - * - * Example: - * @code - * while(in_len){ - * len = av_parser_parse2(myparser, AVCodecContext, &data, &size, - * in_data, in_len, - * pts, dts, pos); - * in_data += len; - * in_len -= len; - * - * if(size) - * decode_frame(data, size); - * } - * @endcode - */ -int av_parser_parse2(AVCodecParserContext *s, - AVCodecContext *avctx, - uint8_t **poutbuf, int *poutbuf_size, - const uint8_t *buf, int buf_size, - int64_t pts, int64_t dts, - int64_t pos); - -/** - * @return 0 if the output buffer is a subset of the input, 1 if it is allocated and must be freed - * @deprecated use AVBitStreamFilter - */ -int av_parser_change(AVCodecParserContext *s, - AVCodecContext *avctx, - uint8_t **poutbuf, int *poutbuf_size, - const uint8_t *buf, int buf_size, int keyframe); -void av_parser_close(AVCodecParserContext *s); - -/** - * @} - * @} - */ - -/** - * @addtogroup lavc_encoding - * @{ - */ - -/** - * Find a registered encoder with a matching codec ID. - * - * @param id AVCodecID of the requested encoder - * @return An encoder if one was found, NULL otherwise. - */ -AVCodec *avcodec_find_encoder(enum AVCodecID id); - -/** - * Find a registered encoder with the specified name. - * - * @param name name of the requested encoder - * @return An encoder if one was found, NULL otherwise. - */ -AVCodec *avcodec_find_encoder_by_name(const char *name); - -/** - * Encode a frame of audio. - * - * Takes input samples from frame and writes the next output packet, if - * available, to avpkt. The output packet does not necessarily contain data for - * the most recent frame, as encoders can delay, split, and combine input frames - * internally as needed. - * - * @param avctx codec context - * @param avpkt output AVPacket. - * The user can supply an output buffer by setting - * avpkt->data and avpkt->size prior to calling the - * function, but if the size of the user-provided data is not - * large enough, encoding will fail. If avpkt->data and - * avpkt->size are set, avpkt->destruct must also be set. All - * other AVPacket fields will be reset by the encoder using - * av_init_packet(). If avpkt->data is NULL, the encoder will - * allocate it. The encoder will set avpkt->size to the size - * of the output packet. - * - * If this function fails or produces no output, avpkt will be - * freed using av_packet_unref(). - * @param[in] frame AVFrame containing the raw audio data to be encoded. - * May be NULL when flushing an encoder that has the - * AV_CODEC_CAP_DELAY capability set. - * If AV_CODEC_CAP_VARIABLE_FRAME_SIZE is set, then each frame - * can have any number of samples. - * If it is not set, frame->nb_samples must be equal to - * avctx->frame_size for all frames except the last. - * The final frame may be smaller than avctx->frame_size. - * @param[out] got_packet_ptr This field is set to 1 by libavcodec if the - * output packet is non-empty, and to 0 if it is - * empty. If the function returns an error, the - * packet can be assumed to be invalid, and the - * value of got_packet_ptr is undefined and should - * not be used. - * @return 0 on success, negative error code on failure - */ -int avcodec_encode_audio2(AVCodecContext *avctx, AVPacket *avpkt, - const AVFrame *frame, int *got_packet_ptr); - -/** - * Encode a frame of video. - * - * Takes input raw video data from frame and writes the next output packet, if - * available, to avpkt. The output packet does not necessarily contain data for - * the most recent frame, as encoders can delay and reorder input frames - * internally as needed. - * - * @param avctx codec context - * @param avpkt output AVPacket. - * The user can supply an output buffer by setting - * avpkt->data and avpkt->size prior to calling the - * function, but if the size of the user-provided data is not - * large enough, encoding will fail. All other AVPacket fields - * will be reset by the encoder using av_init_packet(). If - * avpkt->data is NULL, the encoder will allocate it. - * The encoder will set avpkt->size to the size of the - * output packet. The returned data (if any) belongs to the - * caller, he is responsible for freeing it. - * - * If this function fails or produces no output, avpkt will be - * freed using av_packet_unref(). - * @param[in] frame AVFrame containing the raw video data to be encoded. - * May be NULL when flushing an encoder that has the - * AV_CODEC_CAP_DELAY capability set. - * @param[out] got_packet_ptr This field is set to 1 by libavcodec if the - * output packet is non-empty, and to 0 if it is - * empty. If the function returns an error, the - * packet can be assumed to be invalid, and the - * value of got_packet_ptr is undefined and should - * not be used. - * @return 0 on success, negative error code on failure - */ -int avcodec_encode_video2(AVCodecContext *avctx, AVPacket *avpkt, - const AVFrame *frame, int *got_packet_ptr); - -int avcodec_encode_subtitle(AVCodecContext *avctx, uint8_t *buf, int buf_size, - const AVSubtitle *sub); - - -/** - * @} - */ - -#if FF_API_AVCODEC_RESAMPLE -/** - * @defgroup lavc_resample Audio resampling - * @ingroup libavc - * @deprecated use libswresample instead - * - * @{ - */ -struct ReSampleContext; -struct AVResampleContext; - -typedef struct ReSampleContext ReSampleContext; - -/** - * Initialize audio resampling context. - * - * @param output_channels number of output channels - * @param input_channels number of input channels - * @param output_rate output sample rate - * @param input_rate input sample rate - * @param sample_fmt_out requested output sample format - * @param sample_fmt_in input sample format - * @param filter_length length of each FIR filter in the filterbank relative to the cutoff frequency - * @param log2_phase_count log2 of the number of entries in the polyphase filterbank - * @param linear if 1 then the used FIR filter will be linearly interpolated - between the 2 closest, if 0 the closest will be used - * @param cutoff cutoff frequency, 1.0 corresponds to half the output sampling rate - * @return allocated ReSampleContext, NULL if error occurred - */ -attribute_deprecated -ReSampleContext *av_audio_resample_init(int output_channels, int input_channels, - int output_rate, int input_rate, - enum AVSampleFormat sample_fmt_out, - enum AVSampleFormat sample_fmt_in, - int filter_length, int log2_phase_count, - int linear, double cutoff); - -attribute_deprecated -int audio_resample(ReSampleContext *s, short *output, short *input, int nb_samples); - -/** - * Free resample context. - * - * @param s a non-NULL pointer to a resample context previously - * created with av_audio_resample_init() - */ -attribute_deprecated -void audio_resample_close(ReSampleContext *s); - - -/** - * Initialize an audio resampler. - * Note, if either rate is not an integer then simply scale both rates up so they are. - * @param filter_length length of each FIR filter in the filterbank relative to the cutoff freq - * @param log2_phase_count log2 of the number of entries in the polyphase filterbank - * @param linear If 1 then the used FIR filter will be linearly interpolated - between the 2 closest, if 0 the closest will be used - * @param cutoff cutoff frequency, 1.0 corresponds to half the output sampling rate - */ -attribute_deprecated -struct AVResampleContext *av_resample_init(int out_rate, int in_rate, int filter_length, int log2_phase_count, int linear, double cutoff); - -/** - * Resample an array of samples using a previously configured context. - * @param src an array of unconsumed samples - * @param consumed the number of samples of src which have been consumed are returned here - * @param src_size the number of unconsumed samples available - * @param dst_size the amount of space in samples available in dst - * @param update_ctx If this is 0 then the context will not be modified, that way several channels can be resampled with the same context. - * @return the number of samples written in dst or -1 if an error occurred - */ -attribute_deprecated -int av_resample(struct AVResampleContext *c, short *dst, short *src, int *consumed, int src_size, int dst_size, int update_ctx); - - -/** - * Compensate samplerate/timestamp drift. The compensation is done by changing - * the resampler parameters, so no audible clicks or similar distortions occur - * @param compensation_distance distance in output samples over which the compensation should be performed - * @param sample_delta number of output samples which should be output less - * - * example: av_resample_compensate(c, 10, 500) - * here instead of 510 samples only 500 samples would be output - * - * note, due to rounding the actual compensation might be slightly different, - * especially if the compensation_distance is large and the in_rate used during init is small - */ -attribute_deprecated -void av_resample_compensate(struct AVResampleContext *c, int sample_delta, int compensation_distance); -attribute_deprecated -void av_resample_close(struct AVResampleContext *c); - -/** - * @} - */ -#endif - -#if FF_API_AVPICTURE -/** - * @addtogroup lavc_picture - * @{ - */ - -/** - * @deprecated unused - */ -attribute_deprecated -int avpicture_alloc(AVPicture *picture, enum AVPixelFormat pix_fmt, int width, int height); - -/** - * @deprecated unused - */ -attribute_deprecated -void avpicture_free(AVPicture *picture); - -/** - * @deprecated use av_image_fill_arrays() instead. - */ -attribute_deprecated -int avpicture_fill(AVPicture *picture, const uint8_t *ptr, - enum AVPixelFormat pix_fmt, int width, int height); - -/** - * @deprecated use av_image_copy_to_buffer() instead. - */ -attribute_deprecated -int avpicture_layout(const AVPicture *src, enum AVPixelFormat pix_fmt, - int width, int height, - unsigned char *dest, int dest_size); - -/** - * @deprecated use av_image_get_buffer_size() instead. - */ -attribute_deprecated -int avpicture_get_size(enum AVPixelFormat pix_fmt, int width, int height); - -/** - * @deprecated av_image_copy() instead. - */ -attribute_deprecated -void av_picture_copy(AVPicture *dst, const AVPicture *src, - enum AVPixelFormat pix_fmt, int width, int height); - -/** - * @deprecated unused - */ -attribute_deprecated -int av_picture_crop(AVPicture *dst, const AVPicture *src, - enum AVPixelFormat pix_fmt, int top_band, int left_band); - -/** - * @deprecated unused - */ -attribute_deprecated -int av_picture_pad(AVPicture *dst, const AVPicture *src, int height, int width, enum AVPixelFormat pix_fmt, - int padtop, int padbottom, int padleft, int padright, int *color); - -/** - * @} - */ -#endif - /** * @defgroup lavc_misc Utility functions * @ingroup libavc @@ -3203,130 +1887,6 @@ int av_picture_pad(AVPicture *dst, const AVPicture *src, int height, int width, * @{ */ -/** - * Utility function to access log2_chroma_w log2_chroma_h from - * the pixel format AVPixFmtDescriptor. - * - * This function asserts that pix_fmt is valid. See av_pix_fmt_get_chroma_sub_sample - * for one that returns a failure code and continues in case of invalid - * pix_fmts. - * - * @param[in] pix_fmt the pixel format - * @param[out] h_shift store log2_chroma_w - * @param[out] v_shift store log2_chroma_h - * - * @see av_pix_fmt_get_chroma_sub_sample - */ - -void avcodec_get_chroma_sub_sample(enum AVPixelFormat pix_fmt, int *h_shift, int *v_shift); - -/** - * Return a value representing the fourCC code associated to the - * pixel format pix_fmt, or 0 if no associated fourCC code can be - * found. - */ -unsigned int avcodec_pix_fmt_to_codec_tag(enum AVPixelFormat pix_fmt); - -/** - * @deprecated see av_get_pix_fmt_loss() - */ -int avcodec_get_pix_fmt_loss(enum AVPixelFormat dst_pix_fmt, enum AVPixelFormat src_pix_fmt, - int has_alpha); - -/** - * Find the best pixel format to convert to given a certain source pixel - * format. When converting from one pixel format to another, information loss - * may occur. For example, when converting from RGB24 to GRAY, the color - * information will be lost. Similarly, other losses occur when converting from - * some formats to other formats. avcodec_find_best_pix_fmt_of_2() searches which of - * the given pixel formats should be used to suffer the least amount of loss. - * The pixel formats from which it chooses one, are determined by the - * pix_fmt_list parameter. - * - * - * @param[in] pix_fmt_list AV_PIX_FMT_NONE terminated array of pixel formats to choose from - * @param[in] src_pix_fmt source pixel format - * @param[in] has_alpha Whether the source pixel format alpha channel is used. - * @param[out] loss_ptr Combination of flags informing you what kind of losses will occur. - * @return The best pixel format to convert to or -1 if none was found. - */ -enum AVPixelFormat avcodec_find_best_pix_fmt_of_list(const enum AVPixelFormat *pix_fmt_list, - enum AVPixelFormat src_pix_fmt, - int has_alpha, int *loss_ptr); - -/** - * @deprecated see av_find_best_pix_fmt_of_2() - */ -enum AVPixelFormat avcodec_find_best_pix_fmt_of_2(enum AVPixelFormat dst_pix_fmt1, enum AVPixelFormat dst_pix_fmt2, - enum AVPixelFormat src_pix_fmt, int has_alpha, int *loss_ptr); - -attribute_deprecated -#if AV_HAVE_INCOMPATIBLE_LIBAV_ABI -enum AVPixelFormat avcodec_find_best_pix_fmt2(const enum AVPixelFormat *pix_fmt_list, - enum AVPixelFormat src_pix_fmt, - int has_alpha, int *loss_ptr); -#else -enum AVPixelFormat avcodec_find_best_pix_fmt2(enum AVPixelFormat dst_pix_fmt1, enum AVPixelFormat dst_pix_fmt2, - enum AVPixelFormat src_pix_fmt, int has_alpha, int *loss_ptr); -#endif - - -enum AVPixelFormat avcodec_default_get_format(struct AVCodecContext *s, const enum AVPixelFormat * fmt); - -/** - * @} - */ - -#if FF_API_SET_DIMENSIONS -/** - * @deprecated this function is not supposed to be used from outside of lavc - */ -attribute_deprecated -void avcodec_set_dimensions(AVCodecContext *s, int width, int height); -#endif - -/** - * Put a string representing the codec tag codec_tag in buf. - * - * @param buf buffer to place codec tag in - * @param buf_size size in bytes of buf - * @param codec_tag codec tag to assign - * @return the length of the string that would have been generated if - * enough space had been available, excluding the trailing null - */ -size_t av_get_codec_tag_string(char *buf, size_t buf_size, unsigned int codec_tag); - -void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode); - -//FIXME func typedef - -/** - * Fill AVFrame audio data and linesize pointers. - * - * The buffer buf must be a preallocated buffer with a size big enough - * to contain the specified samples amount. The filled AVFrame data - * pointers will point to this buffer. - * - * AVFrame extended_data channel pointers are allocated if necessary for - * planar audio. - * - * @param frame the AVFrame - * frame->nb_samples must be set prior to calling the - * function. This function fills in frame->data, - * frame->extended_data, frame->linesize[0]. - * @param nb_channels channel count - * @param sample_fmt sample format - * @param buf buffer to use for frame data - * @param buf_size size of buffer - * @param align plane size sample alignment (0 = default) - * @return >=0 on success, negative error code on failure - * @todo return the size in bytes required to store the samples in - * case of success, at the next libavutil bump - */ -int avcodec_fill_audio_frame(AVFrame *frame, int nb_channels, - enum AVSampleFormat sample_fmt, const uint8_t *buf, - int buf_size, int align); - /** * Reset the internal decoder state / flush internal buffers. Should be called * e.g. when seeking or when switching to a different stream. @@ -3338,141 +1898,6 @@ int avcodec_fill_audio_frame(AVFrame *frame, int nb_channels, */ void avcodec_flush_buffers(AVCodecContext *avctx); -/** - * Return codec bits per sample. - * - * @param[in] codec_id the codec - * @return Number of bits per sample or zero if unknown for the given codec. - */ -int av_get_bits_per_sample(enum AVCodecID codec_id); - -/** - * Return the PCM codec associated with a sample format. - * @param be endianness, 0 for little, 1 for big, - * -1 (or anything else) for native - * @return AV_CODEC_ID_PCM_* or AV_CODEC_ID_NONE - */ -enum AVCodecID av_get_pcm_codec(enum AVSampleFormat fmt, int be); - -/** - * Return codec bits per sample. - * Only return non-zero if the bits per sample is exactly correct, not an - * approximation. - * - * @param[in] codec_id the codec - * @return Number of bits per sample or zero if unknown for the given codec. - */ -int av_get_exact_bits_per_sample(enum AVCodecID codec_id); - -/** - * Return audio frame duration. - * - * @param avctx codec context - * @param frame_bytes size of the frame, or 0 if unknown - * @return frame duration, in samples, if known. 0 if not able to - * determine. - */ -int av_get_audio_frame_duration(AVCodecContext *avctx, int frame_bytes); - - -typedef struct AVBitStreamFilterContext { - void *priv_data; - struct AVBitStreamFilter *filter; - AVCodecParserContext *parser; - struct AVBitStreamFilterContext *next; - /** - * Internal default arguments, used if NULL is passed to av_bitstream_filter_filter(). - * Not for access by library users. - */ - char *args; -} AVBitStreamFilterContext; - - -typedef struct AVBitStreamFilter { - const char *name; - int priv_data_size; - int (*filter)(AVBitStreamFilterContext *bsfc, - AVCodecContext *avctx, const char *args, - uint8_t **poutbuf, int *poutbuf_size, - const uint8_t *buf, int buf_size, int keyframe); - void (*close)(AVBitStreamFilterContext *bsfc); - struct AVBitStreamFilter *next; -} AVBitStreamFilter; - -/** - * Register a bitstream filter. - * - * The filter will be accessible to the application code through - * av_bitstream_filter_next() or can be directly initialized with - * av_bitstream_filter_init(). - * - * @see avcodec_register_all() - */ -void av_register_bitstream_filter(AVBitStreamFilter *bsf); - -/** - * Create and initialize a bitstream filter context given a bitstream - * filter name. - * - * The returned context must be freed with av_bitstream_filter_close(). - * - * @param name the name of the bitstream filter - * @return a bitstream filter context if a matching filter was found - * and successfully initialized, NULL otherwise - */ -AVBitStreamFilterContext *av_bitstream_filter_init(const char *name); - -/** - * Filter bitstream. - * - * This function filters the buffer buf with size buf_size, and places the - * filtered buffer in the buffer pointed to by poutbuf. - * - * The output buffer must be freed by the caller. - * - * @param bsfc bitstream filter context created by av_bitstream_filter_init() - * @param avctx AVCodecContext accessed by the filter, may be NULL. - * If specified, this must point to the encoder context of the - * output stream the packet is sent to. - * @param args arguments which specify the filter configuration, may be NULL - * @param poutbuf pointer which is updated to point to the filtered buffer - * @param poutbuf_size pointer which is updated to the filtered buffer size in bytes - * @param buf buffer containing the data to filter - * @param buf_size size in bytes of buf - * @param keyframe set to non-zero if the buffer to filter corresponds to a key-frame packet data - * @return >= 0 in case of success, or a negative error code in case of failure - * - * If the return value is positive, an output buffer is allocated and - * is available in *poutbuf, and is distinct from the input buffer. - * - * If the return value is 0, the output buffer is not allocated and - * should be considered identical to the input buffer, or in case - * *poutbuf was set it points to the input buffer (not necessarily to - * its starting address). - */ -int av_bitstream_filter_filter(AVBitStreamFilterContext *bsfc, - AVCodecContext *avctx, const char *args, - uint8_t **poutbuf, int *poutbuf_size, - const uint8_t *buf, int buf_size, int keyframe); - -/** - * Release bitstream filter context. - * - * @param bsf the bitstream filter context created with - * av_bitstream_filter_init(), can be NULL - */ -void av_bitstream_filter_close(AVBitStreamFilterContext *bsf); - -/** - * If f is NULL, return the first registered bitstream filter, - * if f is non-NULL, return the next registered bitstream filter - * after f, or NULL if f is the last one. - * - * This function can be used to iterate over all registered bitstream - * filters. - */ -AVBitStreamFilter *av_bitstream_filter_next(const AVBitStreamFilter *f); - /* memory */ /** @@ -3484,52 +1909,6 @@ AVBitStreamFilter *av_bitstream_filter_next(const AVBitStreamFilter *f); */ void av_fast_padded_malloc(void *ptr, unsigned int *size, size_t min_size); -/** - * Same behaviour av_fast_padded_malloc except that buffer will always - * be 0-initialized after call. - */ -void av_fast_padded_mallocz(void *ptr, unsigned int *size, size_t min_size); - -/** - * Encode extradata length to a buffer. Used by xiph codecs. - * - * @param s buffer to write to; must be at least (v/255+1) bytes long - * @param v size of extradata in bytes - * @return number of bytes written to the buffer. - */ -unsigned int av_xiphlacing(unsigned char *s, unsigned int v); - -#if FF_API_MISSING_SAMPLE -/** - * Log a generic warning message about a missing feature. This function is - * intended to be used internally by FFmpeg (libavcodec, libavformat, etc.) - * only, and would normally not be used by applications. - * @param[in] avc a pointer to an arbitrary struct of which the first field is - * a pointer to an AVClass struct - * @param[in] feature string containing the name of the missing feature - * @param[in] want_sample indicates if samples are wanted which exhibit this feature. - * If want_sample is non-zero, additional verbage will be added to the log - * message which tells the user how to report samples to the development - * mailing list. - * @deprecated Use avpriv_report_missing_feature() instead. - */ -attribute_deprecated -void av_log_missing_feature(void *avc, const char *feature, int want_sample); - -/** - * Log a generic warning message asking for a sample. This function is - * intended to be used internally by FFmpeg (libavcodec, libavformat, etc.) - * only, and would normally not be used by applications. - * @param[in] avc a pointer to an arbitrary struct of which the first field is - * a pointer to an AVClass struct - * @param[in] msg string containing an optional message, or NULL if no message - * @deprecated Use avpriv_request_sample() instead. - */ -attribute_deprecated -void av_log_ask_for_sample(void *avc, const char *msg, ...) av_printf_format(2, 3); -#endif /* FF_API_MISSING_SAMPLE */ - - /** * Lock operation used by lockmgr */ @@ -3540,31 +1919,6 @@ enum AVLockOp { AV_LOCK_DESTROY, ///< Free mutex resources }; -/** - * Register a user provided lock manager supporting the operations - * specified by AVLockOp. The "mutex" argument to the function points - * to a (void *) where the lockmgr should store/get a pointer to a user - * allocated mutex. It is NULL upon AV_LOCK_CREATE and equal to the - * value left by the last call for all other ops. If the lock manager is - * unable to perform the op then it should leave the mutex in the same - * state as when it was called and return a non-zero value. However, - * when called with AV_LOCK_DESTROY the mutex will always be assumed to - * have been successfully destroyed. If av_lockmgr_register succeeds - * it will return a non-negative value, if it fails it will return a - * negative value and destroy all mutex and unregister all callbacks. - * av_lockmgr_register is not thread-safe, it must be called from a - * single thread before any calls which make use of locking are used. - * - * @param cb User defined callback. av_lockmgr_register invokes calls - * to this callback and the previously registered callback. - * The callback will be used to create more than one mutex - * each of which must be backed by its own underlying locking - * mechanism (i.e. do not use a single static object to - * implement your lock manager). If cb is set to NULL the - * lockmgr will be unregistered. - */ -int av_lockmgr_register(int (*cb)(void **mutex, enum AVLockOp op)); - /** * Get the type of the given codec. */ @@ -3582,47 +1936,11 @@ const char *avcodec_get_name(enum AVCodecID id); */ int avcodec_is_open(AVCodecContext *s); -/** - * @return a non-zero number if codec is an encoder, zero otherwise - */ -int av_codec_is_encoder(const AVCodec *codec); - /** * @return a non-zero number if codec is a decoder, zero otherwise */ int av_codec_is_decoder(const AVCodec *codec); -/** - * @return descriptor for given codec ID or NULL if no descriptor exists. - */ -const AVCodecDescriptor *avcodec_descriptor_get(enum AVCodecID id); - -/** - * Iterate over all codec descriptors known to libavcodec. - * - * @param prev previous descriptor. NULL to get the first descriptor. - * - * @return next descriptor or NULL after the last descriptor - */ -const AVCodecDescriptor *avcodec_descriptor_next(const AVCodecDescriptor *prev); - -/** - * @return codec descriptor with the given name or NULL if no such descriptor - * exists. - */ -const AVCodecDescriptor *avcodec_descriptor_get_by_name(const char *name); - -/** - * Allocate a CPB properties structure and initialize its fields to default - * values. - * - * @param size if non-NULL, the size of the allocated struct will be written - * here. This is useful for embedding it in side data. - * - * @return the newly allocated struct or NULL on failure - */ -AVCPBProperties *av_cpb_properties_alloc(size_t *size); - /** * @} */ diff --git a/ext/at3_standalone/avstring.c b/ext/at3_standalone/avstring.c deleted file mode 100644 index 6be8442950..0000000000 --- a/ext/at3_standalone/avstring.c +++ /dev/null @@ -1,418 +0,0 @@ -/* - * Copyright (c) 2000, 2001, 2002 Fabrice Bellard - * Copyright (c) 2007 Mans Rullgard - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include -#include -#include -#include - -#include "config.h" -#include "common.h" -#include "mem.h" -#include "avstring.h" - -int av_strstart(const char *str, const char *pfx, const char **ptr) -{ - while (*pfx && *pfx == *str) { - pfx++; - str++; - } - if (!*pfx && ptr) - *ptr = str; - return !*pfx; -} - -int av_stristart(const char *str, const char *pfx, const char **ptr) -{ - while (*pfx && av_toupper((unsigned)*pfx) == av_toupper((unsigned)*str)) { - pfx++; - str++; - } - if (!*pfx && ptr) - *ptr = str; - return !*pfx; -} - -char *av_stristr(const char *s1, const char *s2) -{ - if (!*s2) - return (char*)(intptr_t)s1; - - do - if (av_stristart(s1, s2, NULL)) - return (char*)(intptr_t)s1; - while (*s1++); - - return NULL; -} - -char *av_strnstr(const char *haystack, const char *needle, size_t hay_length) -{ - size_t needle_len = strlen(needle); - if (!needle_len) - return (char*)haystack; - while (hay_length >= needle_len) { - hay_length--; - if (!memcmp(haystack, needle, needle_len)) - return (char*)haystack; - haystack++; - } - return NULL; -} - -size_t av_strlcpy(char *dst, const char *src, size_t size) -{ - size_t len = 0; - while (++len < size && *src) - *dst++ = *src++; - if (len <= size) - *dst = 0; - return len + strlen(src) - 1; -} - -size_t av_strlcat(char *dst, const char *src, size_t size) -{ - size_t len = strlen(dst); - if (size <= len + 1) - return len + strlen(src); - return len + av_strlcpy(dst + len, src, size - len); -} - -size_t av_strlcatf(char *dst, size_t size, const char *fmt, ...) -{ - size_t len = strlen(dst); - va_list vl; - - va_start(vl, fmt); - len += vsnprintf(dst + len, size > len ? size - len : 0, fmt, vl); - va_end(vl); - - return len; -} - -char *av_asprintf(const char *fmt, ...) -{ - char *p = NULL; - va_list va; - int len; - - va_start(va, fmt); - len = vsnprintf(NULL, 0, fmt, va); - va_end(va); - if (len < 0) - goto end; - - p = av_malloc(len + 1); - if (!p) - goto end; - - va_start(va, fmt); - len = vsnprintf(p, len + 1, fmt, va); - va_end(va); - if (len < 0) - av_freep(&p); - -end: - return p; -} - -char *av_d2str(double d) -{ - char *str = av_malloc(16); - if (str) - snprintf(str, 16, "%f", d); - return str; -} - -#define WHITESPACES " \n\t" - -char *av_get_token(const char **buf, const char *term) -{ - char *out = av_malloc(strlen(*buf) + 1); - char *ret = out, *end = out; - const char *p = *buf; - if (!out) - return NULL; - p += strspn(p, WHITESPACES); - - while (*p && !strspn(p, term)) { - char c = *p++; - if (c == '\\' && *p) { - *out++ = *p++; - end = out; - } else if (c == '\'') { - while (*p && *p != '\'') - *out++ = *p++; - if (*p) { - p++; - end = out; - } - } else { - *out++ = c; - } - } - - do - *out-- = 0; - while (out >= end && strspn(out, WHITESPACES)); - - *buf = p; - - return ret; -} - -char *av_strtok(char *s, const char *delim, char **saveptr) -{ - char *tok; - - if (!s && !(s = *saveptr)) - return NULL; - - /* skip leading delimiters */ - s += strspn(s, delim); - - /* s now points to the first non delimiter char, or to the end of the string */ - if (!*s) { - *saveptr = NULL; - return NULL; - } - tok = s++; - - /* skip non delimiters */ - s += strcspn(s, delim); - if (*s) { - *s = 0; - *saveptr = s+1; - } else { - *saveptr = NULL; - } - - return tok; -} - -int av_strcasecmp(const char *a, const char *b) -{ - uint8_t c1, c2; - do { - c1 = av_tolower(*a++); - c2 = av_tolower(*b++); - } while (c1 && c1 == c2); - return c1 - c2; -} - -int av_strncasecmp(const char *a, const char *b, size_t n) -{ - const char *end = a + n; - uint8_t c1, c2; - do { - c1 = av_tolower(*a++); - c2 = av_tolower(*b++); - } while (a < end && c1 && c1 == c2); - return c1 - c2; -} - -const char *av_basename(const char *path) -{ - char *p = strrchr(path, '/'); - -#if HAVE_DOS_PATHS - char *q = strrchr(path, '\\'); - char *d = strchr(path, ':'); - - p = FFMAX3(p, q, d); -#endif - - if (!p) - return path; - - return p + 1; -} - -const char *av_dirname(char *path) -{ - char *p = strrchr(path, '/'); - -#if HAVE_DOS_PATHS - char *q = strrchr(path, '\\'); - char *d = strchr(path, ':'); - - d = d ? d + 1 : d; - - p = FFMAX3(p, q, d); -#endif - - if (!p) - return "."; - - *p = '\0'; - - return path; -} - -char *av_append_path_component(const char *path, const char *component) -{ - size_t p_len, c_len; - char *fullpath; - - if (!path) - return av_strdup(component); - if (!component) - return av_strdup(path); - - p_len = strlen(path); - c_len = strlen(component); - if (p_len > SIZE_MAX - c_len || p_len + c_len > SIZE_MAX - 2) - return NULL; - fullpath = av_malloc(p_len + c_len + 2); - if (fullpath) { - if (p_len) { - av_strlcpy(fullpath, path, p_len + 1); - if (c_len) { - if (fullpath[p_len - 1] != '/' && component[0] != '/') - fullpath[p_len++] = '/'; - else if (fullpath[p_len - 1] == '/' && component[0] == '/') - p_len--; - } - } - av_strlcpy(&fullpath[p_len], component, c_len + 1); - fullpath[p_len + c_len] = 0; - } - return fullpath; -} - -int av_match_name(const char *name, const char *names) -{ - const char *p; - int len, namelen; - - if (!name || !names) - return 0; - - namelen = strlen(name); - while (*names) { - int negate = '-' == *names; - p = strchr(names, ','); - if (!p) - p = names + strlen(names); - names += negate; - len = FFMAX(p - names, namelen); - if (!av_strncasecmp(name, names, len) || !strncmp("ALL", names, FFMAX(3, p - names))) - return !negate; - names = p + (*p == ','); - } - return 0; -} - -int av_utf8_decode(int32_t *codep, const uint8_t **bufp, const uint8_t *buf_end, - unsigned int flags) -{ - const uint8_t *p = *bufp; - uint32_t top; - uint64_t code; - int ret = 0, tail_len; - uint32_t overlong_encoding_mins[6] = { - 0x00000000, 0x00000080, 0x00000800, 0x00010000, 0x00200000, 0x04000000, - }; - - if (p >= buf_end) - return 0; - - code = *p++; - - /* first sequence byte starts with 10, or is 1111-1110 or 1111-1111, - which is not admitted */ - if ((code & 0xc0) == 0x80 || code >= 0xFE) { - ret = AVERROR(EILSEQ); - goto end; - } - top = (code & 128) >> 1; - - tail_len = 0; - while (code & top) { - int tmp; - tail_len++; - if (p >= buf_end) { - (*bufp) ++; - return AVERROR(EILSEQ); /* incomplete sequence */ - } - - /* we assume the byte to be in the form 10xx-xxxx */ - tmp = *p++ - 128; /* strip leading 1 */ - if (tmp>>6) { - (*bufp) ++; - return AVERROR(EILSEQ); - } - code = (code<<6) + tmp; - top <<= 5; - } - code &= (top << 1) - 1; - - /* check for overlong encodings */ - av_assert0(tail_len <= 5); - if (code < overlong_encoding_mins[tail_len]) { - ret = AVERROR(EILSEQ); - goto end; - } - - if (code >= 1U<<31) { - ret = AVERROR(EILSEQ); /* out-of-range value */ - goto end; - } - - *codep = code; - - if (code > 0x10FFFF && - !(flags & AV_UTF8_FLAG_ACCEPT_INVALID_BIG_CODES)) - ret = AVERROR(EILSEQ); - if (code < 0x20 && code != 0x9 && code != 0xA && code != 0xD && - flags & AV_UTF8_FLAG_EXCLUDE_XML_INVALID_CONTROL_CODES) - ret = AVERROR(EILSEQ); - if (code >= 0xD800 && code <= 0xDFFF && - !(flags & AV_UTF8_FLAG_ACCEPT_SURROGATES)) - ret = AVERROR(EILSEQ); - if ((code == 0xFFFE || code == 0xFFFF) && - !(flags & AV_UTF8_FLAG_ACCEPT_NON_CHARACTERS)) - ret = AVERROR(EILSEQ); - -end: - *bufp = p; - return ret; -} - -int av_match_list(const char *name, const char *list, char separator) -{ - const char *p, *q; - - for (p = name; p && *p; ) { - for (q = list; q && *q; ) { - int k; - for (k = 0; p[k] == q[k] || (p[k]*q[k] == 0 && p[k]+q[k] == separator); k++) - if (k && (!p[k] || p[k] == separator)) - return 1; - q = strchr(q, separator); - q += !!q; - } - p = strchr(p, separator); - p += !!p; - } - - return 0; -} diff --git a/ext/at3_standalone/avstring.h b/ext/at3_standalone/avstring.h deleted file mode 100644 index 15b04babef..0000000000 --- a/ext/at3_standalone/avstring.h +++ /dev/null @@ -1,402 +0,0 @@ -/* - * Copyright (c) 2007 Mans Rullgard - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef AVUTIL_AVSTRING_H -#define AVUTIL_AVSTRING_H - -#include -#include -#include "attributes.h" - -/** - * @addtogroup lavu_string - * @{ - */ - -/** - * Return non-zero if pfx is a prefix of str. If it is, *ptr is set to - * the address of the first character in str after the prefix. - * - * @param str input string - * @param pfx prefix to test - * @param ptr updated if the prefix is matched inside str - * @return non-zero if the prefix matches, zero otherwise - */ -int av_strstart(const char *str, const char *pfx, const char **ptr); - -/** - * Return non-zero if pfx is a prefix of str independent of case. If - * it is, *ptr is set to the address of the first character in str - * after the prefix. - * - * @param str input string - * @param pfx prefix to test - * @param ptr updated if the prefix is matched inside str - * @return non-zero if the prefix matches, zero otherwise - */ -int av_stristart(const char *str, const char *pfx, const char **ptr); - -/** - * Locate the first case-independent occurrence in the string haystack - * of the string needle. A zero-length string needle is considered to - * match at the start of haystack. - * - * This function is a case-insensitive version of the standard strstr(). - * - * @param haystack string to search in - * @param needle string to search for - * @return pointer to the located match within haystack - * or a null pointer if no match - */ -char *av_stristr(const char *haystack, const char *needle); - -/** - * Locate the first occurrence of the string needle in the string haystack - * where not more than hay_length characters are searched. A zero-length - * string needle is considered to match at the start of haystack. - * - * This function is a length-limited version of the standard strstr(). - * - * @param haystack string to search in - * @param needle string to search for - * @param hay_length length of string to search in - * @return pointer to the located match within haystack - * or a null pointer if no match - */ -char *av_strnstr(const char *haystack, const char *needle, size_t hay_length); - -/** - * Copy the string src to dst, but no more than size - 1 bytes, and - * null-terminate dst. - * - * This function is the same as BSD strlcpy(). - * - * @param dst destination buffer - * @param src source string - * @param size size of destination buffer - * @return the length of src - * - * @warning since the return value is the length of src, src absolutely - * _must_ be a properly 0-terminated string, otherwise this will read beyond - * the end of the buffer and possibly crash. - */ -size_t av_strlcpy(char *dst, const char *src, size_t size); - -/** - * Append the string src to the string dst, but to a total length of - * no more than size - 1 bytes, and null-terminate dst. - * - * This function is similar to BSD strlcat(), but differs when - * size <= strlen(dst). - * - * @param dst destination buffer - * @param src source string - * @param size size of destination buffer - * @return the total length of src and dst - * - * @warning since the return value use the length of src and dst, these - * absolutely _must_ be a properly 0-terminated strings, otherwise this - * will read beyond the end of the buffer and possibly crash. - */ -size_t av_strlcat(char *dst, const char *src, size_t size); - -/** - * Append output to a string, according to a format. Never write out of - * the destination buffer, and always put a terminating 0 within - * the buffer. - * @param dst destination buffer (string to which the output is - * appended) - * @param size total size of the destination buffer - * @param fmt printf-compatible format string, specifying how the - * following parameters are used - * @return the length of the string that would have been generated - * if enough space had been available - */ -size_t av_strlcatf(char *dst, size_t size, const char *fmt, ...) av_printf_format(3, 4); - -/** - * Get the count of continuous non zero chars starting from the beginning. - * - * @param len maximum number of characters to check in the string, that - * is the maximum value which is returned by the function - */ -static inline size_t av_strnlen(const char *s, size_t len) -{ - size_t i; - for (i = 0; i < len && s[i]; i++) - ; - return i; -} - -/** - * Print arguments following specified format into a large enough auto - * allocated buffer. It is similar to GNU asprintf(). - * @param fmt printf-compatible format string, specifying how the - * following parameters are used. - * @return the allocated string - * @note You have to free the string yourself with av_free(). - */ -char *av_asprintf(const char *fmt, ...) av_printf_format(1, 2); - -/** - * Convert a number to a av_malloced string. - */ -char *av_d2str(double d); - -/** - * Unescape the given string until a non escaped terminating char, - * and return the token corresponding to the unescaped string. - * - * The normal \ and ' escaping is supported. Leading and trailing - * whitespaces are removed, unless they are escaped with '\' or are - * enclosed between ''. - * - * @param buf the buffer to parse, buf will be updated to point to the - * terminating char - * @param term a 0-terminated list of terminating chars - * @return the malloced unescaped string, which must be av_freed by - * the user, NULL in case of allocation failure - */ -char *av_get_token(const char **buf, const char *term); - -/** - * Split the string into several tokens which can be accessed by - * successive calls to av_strtok(). - * - * A token is defined as a sequence of characters not belonging to the - * set specified in delim. - * - * On the first call to av_strtok(), s should point to the string to - * parse, and the value of saveptr is ignored. In subsequent calls, s - * should be NULL, and saveptr should be unchanged since the previous - * call. - * - * This function is similar to strtok_r() defined in POSIX.1. - * - * @param s the string to parse, may be NULL - * @param delim 0-terminated list of token delimiters, must be non-NULL - * @param saveptr user-provided pointer which points to stored - * information necessary for av_strtok() to continue scanning the same - * string. saveptr is updated to point to the next character after the - * first delimiter found, or to NULL if the string was terminated - * @return the found token, or NULL when no token is found - */ -char *av_strtok(char *s, const char *delim, char **saveptr); - -/** - * Locale-independent conversion of ASCII isdigit. - */ -static inline av_const int av_isdigit(int c) -{ - return c >= '0' && c <= '9'; -} - -/** - * Locale-independent conversion of ASCII isgraph. - */ -static inline av_const int av_isgraph(int c) -{ - return c > 32 && c < 127; -} - -/** - * Locale-independent conversion of ASCII isspace. - */ -static inline av_const int av_isspace(int c) -{ - return c == ' ' || c == '\f' || c == '\n' || c == '\r' || c == '\t' || - c == '\v'; -} - -/** - * Locale-independent conversion of ASCII characters to uppercase. - */ -static inline av_const int av_toupper(int c) -{ - if (c >= 'a' && c <= 'z') - c ^= 0x20; - return c; -} - -/** - * Locale-independent conversion of ASCII characters to lowercase. - */ -static inline av_const int av_tolower(int c) -{ - if (c >= 'A' && c <= 'Z') - c ^= 0x20; - return c; -} - -/** - * Locale-independent conversion of ASCII isxdigit. - */ -static inline av_const int av_isxdigit(int c) -{ - c = av_tolower(c); - return av_isdigit(c) || (c >= 'a' && c <= 'f'); -} - -/** - * Locale-independent case-insensitive compare. - * @note This means only ASCII-range characters are case-insensitive - */ -int av_strcasecmp(const char *a, const char *b); - -/** - * Locale-independent case-insensitive compare. - * @note This means only ASCII-range characters are case-insensitive - */ -int av_strncasecmp(const char *a, const char *b, size_t n); - - -/** - * Thread safe basename. - * @param path the path, on DOS both \ and / are considered separators. - * @return pointer to the basename substring. - */ -const char *av_basename(const char *path); - -/** - * Thread safe dirname. - * @param path the path, on DOS both \ and / are considered separators. - * @return the path with the separator replaced by the string terminator or ".". - * @note the function may change the input string. - */ -const char *av_dirname(char *path); - -/** - * Match instances of a name in a comma-separated list of names. - * List entries are checked from the start to the end of the names list, - * the first match ends further processing. If an entry prefixed with '-' - * matches, then 0 is returned. The "ALL" list entry is considered to - * match all names. - * - * @param name Name to look for. - * @param names List of names. - * @return 1 on match, 0 otherwise. - */ -int av_match_name(const char *name, const char *names); - -/** - * Append path component to the existing path. - * Path separator '/' is placed between when needed. - * Resulting string have to be freed with av_free(). - * @param path base path - * @param component component to be appended - * @return new path or NULL on error. - */ -char *av_append_path_component(const char *path, const char *component); - -enum AVEscapeMode { - AV_ESCAPE_MODE_AUTO, ///< Use auto-selected escaping mode. - AV_ESCAPE_MODE_BACKSLASH, ///< Use backslash escaping. - AV_ESCAPE_MODE_QUOTE, ///< Use single-quote escaping. -}; - -/** - * Consider spaces special and escape them even in the middle of the - * string. - * - * This is equivalent to adding the whitespace characters to the special - * characters lists, except it is guaranteed to use the exact same list - * of whitespace characters as the rest of libavutil. - */ -#define AV_ESCAPE_FLAG_WHITESPACE (1 << 0) - -/** - * Escape only specified special characters. - * Without this flag, escape also any characters that may be considered - * special by av_get_token(), such as the single quote. - */ -#define AV_ESCAPE_FLAG_STRICT (1 << 1) - -/** - * Escape string in src, and put the escaped string in an allocated - * string in *dst, which must be freed with av_free(). - * - * @param dst pointer where an allocated string is put - * @param src string to escape, must be non-NULL - * @param special_chars string containing the special characters which - * need to be escaped, can be NULL - * @param mode escape mode to employ, see AV_ESCAPE_MODE_* macros. - * Any unknown value for mode will be considered equivalent to - * AV_ESCAPE_MODE_BACKSLASH, but this behaviour can change without - * notice. - * @param flags flags which control how to escape, see AV_ESCAPE_FLAG_ macros - * @return the length of the allocated string, or a negative error code in case of error - * @see av_bprint_escape() - */ -av_warn_unused_result -int av_escape(char **dst, const char *src, const char *special_chars, - enum AVEscapeMode mode, int flags); - -#define AV_UTF8_FLAG_ACCEPT_INVALID_BIG_CODES 1 ///< accept codepoints over 0x10FFFF -#define AV_UTF8_FLAG_ACCEPT_NON_CHARACTERS 2 ///< accept non-characters - 0xFFFE and 0xFFFF -#define AV_UTF8_FLAG_ACCEPT_SURROGATES 4 ///< accept UTF-16 surrogates codes -#define AV_UTF8_FLAG_EXCLUDE_XML_INVALID_CONTROL_CODES 8 ///< exclude control codes not accepted by XML - -#define AV_UTF8_FLAG_ACCEPT_ALL \ - AV_UTF8_FLAG_ACCEPT_INVALID_BIG_CODES|AV_UTF8_FLAG_ACCEPT_NON_CHARACTERS|AV_UTF8_FLAG_ACCEPT_SURROGATES - -/** - * Read and decode a single UTF-8 code point (character) from the - * buffer in *buf, and update *buf to point to the next byte to - * decode. - * - * In case of an invalid byte sequence, the pointer will be updated to - * the next byte after the invalid sequence and the function will - * return an error code. - * - * Depending on the specified flags, the function will also fail in - * case the decoded code point does not belong to a valid range. - * - * @note For speed-relevant code a carefully implemented use of - * GET_UTF8() may be preferred. - * - * @param codep pointer used to return the parsed code in case of success. - * The value in *codep is set even in case the range check fails. - * @param bufp pointer to the address the first byte of the sequence - * to decode, updated by the function to point to the - * byte next after the decoded sequence - * @param buf_end pointer to the end of the buffer, points to the next - * byte past the last in the buffer. This is used to - * avoid buffer overreads (in case of an unfinished - * UTF-8 sequence towards the end of the buffer). - * @param flags a collection of AV_UTF8_FLAG_* flags - * @return >= 0 in case a sequence was successfully read, a negative - * value in case of invalid sequence - */ -av_warn_unused_result -int av_utf8_decode(int32_t *codep, const uint8_t **bufp, const uint8_t *buf_end, - unsigned int flags); - -/** - * Check if a name is in a list. - * @returns 0 if not found, or the 1 based index where it has been found in the - * list. - */ -int av_match_list(const char *name, const char *list, char separator); - -/** - * @} - */ - -#endif /* AVUTIL_AVSTRING_H */ diff --git a/ext/at3_standalone/avutil.h b/ext/at3_standalone/avutil.h index 072c827371..3ccfcdf7c0 100644 --- a/ext/at3_standalone/avutil.h +++ b/ext/at3_standalone/avutil.h @@ -156,29 +156,6 @@ * @addtogroup lavu_ver * @{ */ - -/** - * Return the LIBAVUTIL_VERSION_INT constant. - */ -unsigned avutil_version(void); - -/** - * Return an informative version string. This usually is the actual release - * version number or a git commit description. This string has no fixed format - * and can change any time. It should never be parsed by code. - */ -const char *av_version_info(void); - -/** - * Return the libavutil build-time configuration. - */ -const char *avutil_configuration(void); - -/** - * Return the libavutil license. - */ -const char *avutil_license(void); - /** * @} */ @@ -197,12 +174,6 @@ enum AVMediaType { AVMEDIA_TYPE_NB }; -/** - * Return a string describing the media_type enum, NULL if media_type - * is unknown. - */ -const char *av_get_media_type_string(enum AVMediaType media_type); - /** * @defgroup lavu_const Constants * @{ diff --git a/ext/at3_standalone/buffer.h b/ext/at3_standalone/buffer.h index b4399fd39f..d716c3d729 100644 --- a/ext/at3_standalone/buffer.h +++ b/ext/at3_standalone/buffer.h @@ -100,12 +100,6 @@ typedef struct AVBufferRef { */ AVBufferRef *av_buffer_alloc(int size); -/** - * Same as av_buffer_alloc(), except the returned buffer will be initialized - * to zero. - */ -AVBufferRef *av_buffer_allocz(int size); - /** * Always treat the buffer as read-only, even when it has only one * reference. @@ -162,24 +156,8 @@ void av_buffer_unref(AVBufferRef **buf); */ int av_buffer_is_writable(const AVBufferRef *buf); -/** - * @return the opaque parameter set by av_buffer_create. - */ -void *av_buffer_get_opaque(const AVBufferRef *buf); - int av_buffer_get_ref_count(const AVBufferRef *buf); -/** - * Create a writable reference from a given buffer reference, avoiding data copy - * if possible. - * - * @param buf buffer reference to make writable. On success, buf is either left - * untouched, or it is unreferenced and a new writable AVBufferRef is - * written in its place. On failure, buf is left untouched. - * @return 0 on success, a negative AVERROR on failure. - */ -int av_buffer_make_writable(AVBufferRef **buf); - /** * Reallocate a given buffer. * diff --git a/ext/at3_standalone/bytestream.h b/ext/at3_standalone/bytestream.h index c180fb33e4..c44ba389b4 100644 --- a/ext/at3_standalone/bytestream.h +++ b/ext/at3_standalone/bytestream.h @@ -33,37 +33,12 @@ typedef struct GetByteContext { const uint8_t *buffer, *buffer_end, *buffer_start; } GetByteContext; -typedef struct PutByteContext { - uint8_t *buffer, *buffer_end, *buffer_start; - int eof; -} PutByteContext; - #define DEF(type, name, bytes, read, write) \ static av_always_inline type bytestream_get_ ## name(const uint8_t **b) \ { \ (*b) += bytes; \ return read(*b - bytes); \ } \ -static av_always_inline void bytestream_put_ ## name(uint8_t **b, \ - const type value) \ -{ \ - write(*b, value); \ - (*b) += bytes; \ -} \ -static av_always_inline void bytestream2_put_ ## name ## u(PutByteContext *p, \ - const type value) \ -{ \ - bytestream_put_ ## name(&p->buffer, value); \ -} \ -static av_always_inline void bytestream2_put_ ## name(PutByteContext *p, \ - const type value) \ -{ \ - if (!p->eof && (p->buffer_end - p->buffer >= bytes)) { \ - write(p->buffer, value); \ - p->buffer += bytes; \ - } else \ - p->eof = 1; \ -} \ static av_always_inline type bytestream2_get_ ## name ## u(GetByteContext *g) \ { \ return bytestream_get_ ## name(&g->buffer); \ @@ -129,232 +104,6 @@ DEF(unsigned int, byte, 1, AV_RB8 , AV_WB8) # define bytestream2_peek_ne64 bytestream2_peek_le64 #endif -static av_always_inline void bytestream2_init(GetByteContext *g, - const uint8_t *buf, - int buf_size) -{ - av_assert0(buf_size >= 0); - g->buffer = buf; - g->buffer_start = buf; - g->buffer_end = buf + buf_size; -} - -static av_always_inline void bytestream2_init_writer(PutByteContext *p, - uint8_t *buf, - int buf_size) -{ - av_assert0(buf_size >= 0); - p->buffer = buf; - p->buffer_start = buf; - p->buffer_end = buf + buf_size; - p->eof = 0; -} - -static av_always_inline unsigned int bytestream2_get_bytes_left(GetByteContext *g) -{ - return g->buffer_end - g->buffer; -} - -static av_always_inline unsigned int bytestream2_get_bytes_left_p(PutByteContext *p) -{ - return p->buffer_end - p->buffer; -} - -static av_always_inline void bytestream2_skip(GetByteContext *g, - unsigned int size) -{ - g->buffer += FFMIN(g->buffer_end - g->buffer, size); -} - -static av_always_inline void bytestream2_skipu(GetByteContext *g, - unsigned int size) -{ - g->buffer += size; -} - -static av_always_inline void bytestream2_skip_p(PutByteContext *p, - unsigned int size) -{ - int size2; - if (p->eof) - return; - size2 = FFMIN(p->buffer_end - p->buffer, size); - if (size2 != size) - p->eof = 1; - p->buffer += size2; -} - -static av_always_inline int bytestream2_tell(GetByteContext *g) -{ - return (int)(g->buffer - g->buffer_start); -} - -static av_always_inline int bytestream2_tell_p(PutByteContext *p) -{ - return (int)(p->buffer - p->buffer_start); -} - -static av_always_inline int bytestream2_size(GetByteContext *g) -{ - return (int)(g->buffer_end - g->buffer_start); -} - -static av_always_inline int bytestream2_size_p(PutByteContext *p) -{ - return (int)(p->buffer_end - p->buffer_start); -} - -static av_always_inline int bytestream2_seek(GetByteContext *g, - int offset, - int whence) -{ - switch (whence) { - case SEEK_CUR: - offset = av_clip(offset, -(g->buffer - g->buffer_start), - g->buffer_end - g->buffer); - g->buffer += offset; - break; - case SEEK_END: - offset = av_clip(offset, -(g->buffer_end - g->buffer_start), 0); - g->buffer = g->buffer_end + offset; - break; - case SEEK_SET: - offset = av_clip(offset, 0, g->buffer_end - g->buffer_start); - g->buffer = g->buffer_start + offset; - break; - default: - return AVERROR(EINVAL); - } - return bytestream2_tell(g); -} - -static av_always_inline int bytestream2_seek_p(PutByteContext *p, - int offset, - int whence) -{ - p->eof = 0; - switch (whence) { - case SEEK_CUR: - if (p->buffer_end - p->buffer < offset) - p->eof = 1; - offset = av_clip(offset, -(p->buffer - p->buffer_start), - p->buffer_end - p->buffer); - p->buffer += offset; - break; - case SEEK_END: - if (offset > 0) - p->eof = 1; - offset = av_clip(offset, -(p->buffer_end - p->buffer_start), 0); - p->buffer = p->buffer_end + offset; - break; - case SEEK_SET: - if (p->buffer_end - p->buffer_start < offset) - p->eof = 1; - offset = av_clip(offset, 0, p->buffer_end - p->buffer_start); - p->buffer = p->buffer_start + offset; - break; - default: - return AVERROR(EINVAL); - } - return bytestream2_tell_p(p); -} - -static av_always_inline unsigned int bytestream2_get_buffer(GetByteContext *g, - uint8_t *dst, - unsigned int size) -{ - int size2 = FFMIN(g->buffer_end - g->buffer, size); - memcpy(dst, g->buffer, size2); - g->buffer += size2; - return size2; -} - -static av_always_inline unsigned int bytestream2_get_bufferu(GetByteContext *g, - uint8_t *dst, - unsigned int size) -{ - memcpy(dst, g->buffer, size); - g->buffer += size; - return size; -} - -static av_always_inline unsigned int bytestream2_put_buffer(PutByteContext *p, - const uint8_t *src, - unsigned int size) -{ - int size2; - if (p->eof) - return 0; - size2 = FFMIN(p->buffer_end - p->buffer, size); - if (size2 != size) - p->eof = 1; - memcpy(p->buffer, src, size2); - p->buffer += size2; - return size2; -} - -static av_always_inline unsigned int bytestream2_put_bufferu(PutByteContext *p, - const uint8_t *src, - unsigned int size) -{ - memcpy(p->buffer, src, size); - p->buffer += size; - return size; -} - -static av_always_inline void bytestream2_set_buffer(PutByteContext *p, - const uint8_t c, - unsigned int size) -{ - int size2; - if (p->eof) - return; - size2 = FFMIN(p->buffer_end - p->buffer, size); - if (size2 != size) - p->eof = 1; - memset(p->buffer, c, size2); - p->buffer += size2; -} - -static av_always_inline void bytestream2_set_bufferu(PutByteContext *p, - const uint8_t c, - unsigned int size) -{ - memset(p->buffer, c, size); - p->buffer += size; -} - -static av_always_inline unsigned int bytestream2_get_eof(PutByteContext *p) -{ - return p->eof; -} - -static av_always_inline unsigned int bytestream2_copy_bufferu(PutByteContext *p, - GetByteContext *g, - unsigned int size) -{ - memcpy(p->buffer, g->buffer, size); - p->buffer += size; - g->buffer += size; - return size; -} - -static av_always_inline unsigned int bytestream2_copy_buffer(PutByteContext *p, - GetByteContext *g, - unsigned int size) -{ - int size2; - - if (p->eof) - return 0; - size = FFMIN(g->buffer_end - g->buffer, size); - size2 = FFMIN(p->buffer_end - p->buffer, size); - if (size2 != size) - p->eof = 1; - - return bytestream2_copy_bufferu(p, g, size2); -} - static av_always_inline unsigned int bytestream_get_buffer(const uint8_t **b, uint8_t *dst, unsigned int size) @@ -364,12 +113,4 @@ static av_always_inline unsigned int bytestream_get_buffer(const uint8_t **b, return size; } -static av_always_inline void bytestream_put_buffer(uint8_t **b, - const uint8_t *src, - unsigned int size) -{ - memcpy(*b, src, size); - (*b) += size; -} - #endif /* AVCODEC_BYTESTREAM_H */ diff --git a/ext/at3_standalone/channel_layout.c b/ext/at3_standalone/channel_layout.c index d6ee5372d7..329c32a532 100644 --- a/ext/at3_standalone/channel_layout.c +++ b/ext/at3_standalone/channel_layout.c @@ -172,49 +172,3 @@ int av_get_channel_layout_channel_index(uint64_t channel_layout, channel_layout &= channel - 1; return av_get_channel_layout_nb_channels(channel_layout); } - -const char *av_get_channel_name(uint64_t channel) -{ - int i; - if (av_get_channel_layout_nb_channels(channel) != 1) - return NULL; - for (i = 0; i < 64; i++) - if ((1ULL<= FF_ARRAY_ELEMS(channel_layout_map)) - return AVERROR_EOF; - if (layout) *layout = channel_layout_map[index].layout; - if (name) *name = channel_layout_map[index].name; - return 0; -} diff --git a/ext/at3_standalone/channel_layout.h b/ext/at3_standalone/channel_layout.h index ec7effead1..98a249044d 100644 --- a/ext/at3_standalone/channel_layout.h +++ b/ext/at3_standalone/channel_layout.h @@ -111,56 +111,6 @@ #define AV_CH_LAYOUT_HEXADECAGONAL (AV_CH_LAYOUT_OCTAGONAL|AV_CH_WIDE_LEFT|AV_CH_WIDE_RIGHT|AV_CH_TOP_BACK_LEFT|AV_CH_TOP_BACK_RIGHT|AV_CH_TOP_BACK_CENTER|AV_CH_TOP_FRONT_CENTER|AV_CH_TOP_FRONT_LEFT|AV_CH_TOP_FRONT_RIGHT) #define AV_CH_LAYOUT_STEREO_DOWNMIX (AV_CH_STEREO_LEFT|AV_CH_STEREO_RIGHT) -enum AVMatrixEncoding { - AV_MATRIX_ENCODING_NONE, - AV_MATRIX_ENCODING_DOLBY, - AV_MATRIX_ENCODING_DPLII, - AV_MATRIX_ENCODING_DPLIIX, - AV_MATRIX_ENCODING_DPLIIZ, - AV_MATRIX_ENCODING_DOLBYEX, - AV_MATRIX_ENCODING_DOLBYHEADPHONE, - AV_MATRIX_ENCODING_NB -}; - -/** - * Return a channel layout id that matches name, or 0 if no match is found. - * - * name can be one or several of the following notations, - * separated by '+' or '|': - * - the name of an usual channel layout (mono, stereo, 4.0, quad, 5.0, - * 5.0(side), 5.1, 5.1(side), 7.1, 7.1(wide), downmix); - * - the name of a single channel (FL, FR, FC, LFE, BL, BR, FLC, FRC, BC, - * SL, SR, TC, TFL, TFC, TFR, TBL, TBC, TBR, DL, DR); - * - a number of channels, in decimal, optionally followed by 'c', yielding - * the default channel layout for that number of channels (@see - * av_get_default_channel_layout); - * - a channel layout mask, in hexadecimal starting with "0x" (see the - * AV_CH_* macros). - * - * @warning Starting from the next major bump the trailing character - * 'c' to specify a number of channels will be required, while a - * channel layout mask could also be specified as a decimal number - * (if and only if not followed by "c"). - * - * Example: "stereo+FC" = "2c+FC" = "2c+1c" = "0x7" - */ -uint64_t av_get_channel_layout(const char *name); - -/** - * Return a description of a channel layout. - * If nb_channels is <= 0, it is guessed from the channel_layout. - * - * @param buf put here the string containing the channel layout - * @param buf_size size in bytes of the buffer - */ -void av_get_channel_layout_string(char *buf, int buf_size, int nb_channels, uint64_t channel_layout); - -struct AVBPrint; -/** - * Append a description of a channel layout to a bprint buffer. - */ -void av_bprint_channel_layout(struct AVBPrint *bp, int nb_channels, uint64_t channel_layout); - /** * Return the number of channels in the channel layout. */ @@ -171,50 +121,6 @@ int av_get_channel_layout_nb_channels(uint64_t channel_layout); */ int64_t av_get_default_channel_layout(int nb_channels); -/** - * Get the index of a channel in channel_layout. - * - * @param channel a channel layout describing exactly one channel which must be - * present in channel_layout. - * - * @return index of channel in channel_layout on success, a negative AVERROR - * on error. - */ -int av_get_channel_layout_channel_index(uint64_t channel_layout, - uint64_t channel); - -/** - * Get the channel with the given index in channel_layout. - */ -uint64_t av_channel_layout_extract_channel(uint64_t channel_layout, int index); - -/** - * Get the name of a given channel. - * - * @return channel name on success, NULL on error. - */ -const char *av_get_channel_name(uint64_t channel); - -/** - * Get the description of a given channel. - * - * @param channel a channel layout with a single channel - * @return channel description on success, NULL on error - */ -const char *av_get_channel_description(uint64_t channel); - -/** - * Get the value and name of a standard channel layout. - * - * @param[in] index index in an internal list, starting at 0 - * @param[out] layout channel layout mask - * @param[out] name name of the layout - * @return 0 if the layout exists, - * <0 if index is beyond the limits - */ -int av_get_standard_channel_layout(unsigned index, uint64_t *layout, - const char **name); - /** * @} * @} diff --git a/Common/compat.c b/ext/at3_standalone/compat.c similarity index 92% rename from Common/compat.c rename to ext/at3_standalone/compat.c index 8679906697..fc285e6b2c 100644 --- a/Common/compat.c +++ b/ext/at3_standalone/compat.c @@ -18,6 +18,18 @@ void ff_fft_init_arm(void) {} void ff_fft_init_mips(void) {} void ff_fft_init_ppc(void) {} + +size_t av_strlcpy(char *dst, const char *src, size_t size) +{ + size_t len = 0; + while (++len < size && *src) + *dst++ = *src++; + if (len <= size) + *dst = 0; + return len + strlen(src) - 1; +} + + const uint8_t ff_reverse[256] = { 0x00,0x80,0x40,0xC0,0x20,0xA0,0x60,0xE0,0x10,0x90,0x50,0xD0,0x30,0xB0,0x70,0xF0, 0x08,0x88,0x48,0xC8,0x28,0xA8,0x68,0xE8,0x18,0x98,0x58,0xD8,0x38,0xB8,0x78,0xF8, diff --git a/ext/at3_standalone/compat.h b/ext/at3_standalone/compat.h index 8140d5ae16..74933d447e 100644 --- a/ext/at3_standalone/compat.h +++ b/ext/at3_standalone/compat.h @@ -29,3 +29,30 @@ #pragma warning(disable:4244) int ff_fast_malloc(void *ptr, unsigned int *size, size_t min_size, int zero_realloc); + +/** + * Copy the string src to dst, but no more than size - 1 bytes, and + * null-terminate dst. + * + * This function is the same as BSD strlcpy(). + * + * @param dst destination buffer + * @param src source string + * @param size size of destination buffer + * @return the length of src + * + * @warning since the return value is the length of src, src absolutely + * _must_ be a properly 0-terminated string, otherwise this will read beyond + * the end of the buffer and possibly crash. + */ +size_t av_strlcpy(char *dst, const char *src, size_t size); + +/** + * Locale-independent conversion of ASCII characters to uppercase. + */ +static inline av_const int av_toupper(int c) +{ + if (c >= 'a' && c <= 'z') + c ^= 0x20; + return c; +} diff --git a/ext/at3_standalone/dict.c b/ext/at3_standalone/dict.c deleted file mode 100644 index e71af2a7cc..0000000000 --- a/ext/at3_standalone/dict.c +++ /dev/null @@ -1,223 +0,0 @@ -/* - * copyright (c) 2009 Michael Niedermayer - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include - -#include "avstring.h" -#include "dict.h" -#include "internal.h" -#include "mem.h" - -struct AVDictionary { - int count; - AVDictionaryEntry *elems; -}; - -int av_dict_count(const AVDictionary *m) -{ - return m ? m->count : 0; -} - -AVDictionaryEntry *av_dict_get(const AVDictionary *m, const char *key, - const AVDictionaryEntry *prev, int flags) -{ - unsigned int i, j; - - if (!m) - return NULL; - - if (prev) - i = prev - m->elems + 1; - else - i = 0; - - for (; i < m->count; i++) { - const char *s = m->elems[i].key; - if (flags & AV_DICT_MATCH_CASE) - for (j = 0; s[j] == key[j] && key[j]; j++) - ; - else - for (j = 0; av_toupper(s[j]) == av_toupper(key[j]) && key[j]; j++) - ; - if (key[j]) - continue; - if (s[j] && !(flags & AV_DICT_IGNORE_SUFFIX)) - continue; - return &m->elems[i]; - } - return NULL; -} - -int av_dict_set(AVDictionary **pm, const char *key, const char *value, - int flags) -{ - AVDictionary *m = *pm; - AVDictionaryEntry *tag = av_dict_get(m, key, NULL, flags); - char *oldval = NULL, *copy_key = NULL, *copy_value = NULL; - - if (flags & AV_DICT_DONT_STRDUP_KEY) - copy_key = (void *)key; - else - copy_key = av_strdup(key); - if (flags & AV_DICT_DONT_STRDUP_VAL) - copy_value = (void *)value; - else if (copy_key) - copy_value = av_strdup(value); - if (!m) - m = *pm = av_mallocz(sizeof(*m)); - if (!m || (key && !copy_key) || (value && !copy_value)) - goto err_out; - - if (tag) { - if (flags & AV_DICT_DONT_OVERWRITE) { - av_free(copy_key); - av_free(copy_value); - return 0; - } - if (flags & AV_DICT_APPEND) - oldval = tag->value; - else - av_free(tag->value); - av_free(tag->key); - *tag = m->elems[--m->count]; - } else { - AVDictionaryEntry *tmp = av_realloc(m->elems, - (m->count + 1) * sizeof(*m->elems)); - if (!tmp) - goto err_out; - m->elems = tmp; - } - if (copy_value) { - m->elems[m->count].key = copy_key; - m->elems[m->count].value = copy_value; - if (oldval && flags & AV_DICT_APPEND) { - size_t len = strlen(oldval) + strlen(copy_value) + 1; - char *newval = av_mallocz(len); - if (!newval) - goto err_out; - av_strlcat(newval, oldval, len); - av_freep(&oldval); - av_strlcat(newval, copy_value, len); - m->elems[m->count].value = newval; - av_freep(©_value); - } - m->count++; - } else { - av_freep(©_key); - } - if (!m->count) { - av_freep(&m->elems); - av_freep(pm); - } - - return 0; - -err_out: - if (m && !m->count) { - av_freep(&m->elems); - av_freep(pm); - } - av_free(copy_key); - av_free(copy_value); - return AVERROR(ENOMEM); -} - -int av_dict_set_int(AVDictionary **pm, const char *key, int64_t value, - int flags) -{ - char valuestr[22]; - snprintf(valuestr, sizeof(valuestr), "%"PRId64, value); - flags &= ~AV_DICT_DONT_STRDUP_VAL; - return av_dict_set(pm, key, valuestr, flags); -} - -static int parse_key_value_pair(AVDictionary **pm, const char **buf, - const char *key_val_sep, const char *pairs_sep, - int flags) -{ - char *key = av_get_token(buf, key_val_sep); - char *val = NULL; - int ret; - - if (key && *key && strspn(*buf, key_val_sep)) { - (*buf)++; - val = av_get_token(buf, pairs_sep); - } - - if (key && *key && val && *val) - ret = av_dict_set(pm, key, val, flags); - else - ret = AVERROR(EINVAL); - - av_freep(&key); - av_freep(&val); - - return ret; -} - -int av_dict_parse_string(AVDictionary **pm, const char *str, - const char *key_val_sep, const char *pairs_sep, - int flags) -{ - int ret; - - if (!str) - return 0; - - /* ignore STRDUP flags */ - flags &= ~(AV_DICT_DONT_STRDUP_KEY | AV_DICT_DONT_STRDUP_VAL); - - while (*str) { - if ((ret = parse_key_value_pair(pm, &str, key_val_sep, pairs_sep, flags)) < 0) - return ret; - - if (*str) - str++; - } - - return 0; -} - -void av_dict_free(AVDictionary **pm) -{ - AVDictionary *m = *pm; - - if (m) { - while (m->count--) { - av_freep(&m->elems[m->count].key); - av_freep(&m->elems[m->count].value); - } - av_freep(&m->elems); - } - av_freep(pm); -} - -int av_dict_copy(AVDictionary **dst, const AVDictionary *src, int flags) -{ - AVDictionaryEntry *t = NULL; - - while ((t = av_dict_get(src, "", t, AV_DICT_IGNORE_SUFFIX))) { - int ret = av_dict_set(dst, t->key, t->value, flags); - if (ret < 0) - return ret; - } - - return 0; -} diff --git a/ext/at3_standalone/dict.h b/ext/at3_standalone/dict.h deleted file mode 100644 index 5b8d003396..0000000000 --- a/ext/at3_standalone/dict.h +++ /dev/null @@ -1,198 +0,0 @@ -/* - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/** - * @file - * Public dictionary API. - * @deprecated - * AVDictionary is provided for compatibility with libav. It is both in - * implementation as well as API inefficient. It does not scale and is - * extremely slow with large dictionaries. - * It is recommended that new code uses our tree container from tree.c/h - * where applicable, which uses AVL trees to achieve O(log n) performance. - */ - -#ifndef AVUTIL_DICT_H -#define AVUTIL_DICT_H - -#include - -#include "version.h" - -/** - * @addtogroup lavu_dict AVDictionary - * @ingroup lavu_data - * - * @brief Simple key:value store - * - * @{ - * Dictionaries are used for storing key:value pairs. To create - * an AVDictionary, simply pass an address of a NULL pointer to - * av_dict_set(). NULL can be used as an empty dictionary wherever - * a pointer to an AVDictionary is required. - * Use av_dict_get() to retrieve an entry or iterate over all - * entries and finally av_dict_free() to free the dictionary - * and all its contents. - * - @code - AVDictionary *d = NULL; // "create" an empty dictionary - AVDictionaryEntry *t = NULL; - - av_dict_set(&d, "foo", "bar", 0); // add an entry - - char *k = av_strdup("key"); // if your strings are already allocated, - char *v = av_strdup("value"); // you can avoid copying them like this - av_dict_set(&d, k, v, AV_DICT_DONT_STRDUP_KEY | AV_DICT_DONT_STRDUP_VAL); - - while (t = av_dict_get(d, "", t, AV_DICT_IGNORE_SUFFIX)) { - <....> // iterate over all entries in d - } - av_dict_free(&d); - @endcode - * - */ - -#define AV_DICT_MATCH_CASE 1 /**< Only get an entry with exact-case key match. Only relevant in av_dict_get(). */ -#define AV_DICT_IGNORE_SUFFIX 2 /**< Return first entry in a dictionary whose first part corresponds to the search key, - ignoring the suffix of the found key string. Only relevant in av_dict_get(). */ -#define AV_DICT_DONT_STRDUP_KEY 4 /**< Take ownership of a key that's been - allocated with av_malloc() or another memory allocation function. */ -#define AV_DICT_DONT_STRDUP_VAL 8 /**< Take ownership of a value that's been - allocated with av_malloc() or another memory allocation function. */ -#define AV_DICT_DONT_OVERWRITE 16 ///< Don't overwrite existing entries. -#define AV_DICT_APPEND 32 /**< If the entry already exists, append to it. Note that no - delimiter is added, the strings are simply concatenated. */ - -typedef struct AVDictionaryEntry { - char *key; - char *value; -} AVDictionaryEntry; - -typedef struct AVDictionary AVDictionary; - -/** - * Get a dictionary entry with matching key. - * - * The returned entry key or value must not be changed, or it will - * cause undefined behavior. - * - * To iterate through all the dictionary entries, you can set the matching key - * to the null string "" and set the AV_DICT_IGNORE_SUFFIX flag. - * - * @param prev Set to the previous matching element to find the next. - * If set to NULL the first matching element is returned. - * @param key matching key - * @param flags a collection of AV_DICT_* flags controlling how the entry is retrieved - * @return found entry or NULL in case no matching entry was found in the dictionary - */ -AVDictionaryEntry *av_dict_get(const AVDictionary *m, const char *key, - const AVDictionaryEntry *prev, int flags); - -/** - * Get number of entries in dictionary. - * - * @param m dictionary - * @return number of entries in dictionary - */ -int av_dict_count(const AVDictionary *m); - -/** - * Set the given entry in *pm, overwriting an existing entry. - * - * Note: If AV_DICT_DONT_STRDUP_KEY or AV_DICT_DONT_STRDUP_VAL is set, - * these arguments will be freed on error. - * - * @param pm pointer to a pointer to a dictionary struct. If *pm is NULL - * a dictionary struct is allocated and put in *pm. - * @param key entry key to add to *pm (will be av_strduped depending on flags) - * @param value entry value to add to *pm (will be av_strduped depending on flags). - * Passing a NULL value will cause an existing entry to be deleted. - * @return >= 0 on success otherwise an error code <0 - */ -int av_dict_set(AVDictionary **pm, const char *key, const char *value, int flags); - -/** - * Convenience wrapper for av_dict_set that converts the value to a string - * and stores it. - * - * Note: If AV_DICT_DONT_STRDUP_KEY is set, key will be freed on error. - */ -int av_dict_set_int(AVDictionary **pm, const char *key, int64_t value, int flags); - -/** - * Parse the key/value pairs list and add the parsed entries to a dictionary. - * - * In case of failure, all the successfully set entries are stored in - * *pm. You may need to manually free the created dictionary. - * - * @param key_val_sep a 0-terminated list of characters used to separate - * key from value - * @param pairs_sep a 0-terminated list of characters used to separate - * two pairs from each other - * @param flags flags to use when adding to dictionary. - * AV_DICT_DONT_STRDUP_KEY and AV_DICT_DONT_STRDUP_VAL - * are ignored since the key/value tokens will always - * be duplicated. - * @return 0 on success, negative AVERROR code on failure - */ -int av_dict_parse_string(AVDictionary **pm, const char *str, - const char *key_val_sep, const char *pairs_sep, - int flags); - -/** - * Copy entries from one AVDictionary struct into another. - * @param dst pointer to a pointer to a AVDictionary struct. If *dst is NULL, - * this function will allocate a struct for you and put it in *dst - * @param src pointer to source AVDictionary struct - * @param flags flags to use when setting entries in *dst - * @note metadata is read using the AV_DICT_IGNORE_SUFFIX flag - * @return 0 on success, negative AVERROR code on failure. If dst was allocated - * by this function, callers should free the associated memory. - */ -int av_dict_copy(AVDictionary **dst, const AVDictionary *src, int flags); - -/** - * Free all the memory allocated for an AVDictionary struct - * and all keys and values. - */ -void av_dict_free(AVDictionary **m); - -/** - * Get dictionary entries as a string. - * - * Create a string containing dictionary's entries. - * Such string may be passed back to av_dict_parse_string(). - * @note String is escaped with backslashes ('\'). - * - * @param[in] m dictionary - * @param[out] buffer Pointer to buffer that will be allocated with string containg entries. - * Buffer must be freed by the caller when is no longer needed. - * @param[in] key_val_sep character used to separate key from value - * @param[in] pairs_sep character used to separate two pairs from each other - * @return >= 0 on success, negative on error - * @warning Separators cannot be neither '\\' nor '\0'. They also cannot be the same. - */ -int av_dict_get_string(const AVDictionary *m, char **buffer, - const char key_val_sep, const char pairs_sep); - -/** - * @} - */ - -#endif /* AVUTIL_DICT_H */ diff --git a/ext/at3_standalone/error.h b/ext/at3_standalone/error.h index 71df4da353..6f89675021 100644 --- a/ext/at3_standalone/error.h +++ b/ext/at3_standalone/error.h @@ -82,45 +82,4 @@ #define AV_ERROR_MAX_STRING_SIZE 64 -/** - * Put a description of the AVERROR code errnum in errbuf. - * In case of failure the global variable errno is set to indicate the - * error. Even in case of failure av_strerror() will print a generic - * error message indicating the errnum provided to errbuf. - * - * @param errnum error code to describe - * @param errbuf buffer to which description is written - * @param errbuf_size the size in bytes of errbuf - * @return 0 on success, a negative value if a description for errnum - * cannot be found - */ -int av_strerror(int errnum, char *errbuf, size_t errbuf_size); - -/** - * Fill the provided buffer with a string containing an error string - * corresponding to the AVERROR code errnum. - * - * @param errbuf a buffer - * @param errbuf_size size in bytes of errbuf - * @param errnum error code to describe - * @return the buffer in input, filled with the error description - * @see av_strerror() - */ -static inline char *av_make_error_string(char *errbuf, size_t errbuf_size, int errnum) -{ - av_strerror(errnum, errbuf, errbuf_size); - return errbuf; -} - -/** - * Convenience macro, the return value should be used only directly in - * function arguments but never stand-alone. - */ -#define av_err2str(errnum) \ - av_make_error_string((char[AV_ERROR_MAX_STRING_SIZE]){0}, AV_ERROR_MAX_STRING_SIZE, errnum) - -/** - * @} - */ - #endif /* AVUTIL_ERROR_H */ diff --git a/ext/at3_standalone/float_dsp.c b/ext/at3_standalone/float_dsp.c index e169762405..24a06c047c 100644 --- a/ext/at3_standalone/float_dsp.c +++ b/ext/at3_standalone/float_dsp.c @@ -93,29 +93,6 @@ static void vector_fmul_reverse_c(float *dst, const float *src0, dst[i] = src0[i] * src1[-i]; } -static void butterflies_float_c(float *av_restrict v1, float *av_restrict v2, - int len) -{ - int i; - - for (i = 0; i < len; i++) { - float t = v1[i] - v2[i]; - v1[i] += v2[i]; - v2[i] = t; - } -} - -float avpriv_scalarproduct_float_c(const float *v1, const float *v2, int len) -{ - float p = 0.0; - int i; - - for (i = 0; i < len; i++) - p += v1[i] * v2[i]; - - return p; -} - av_cold AVFloatDSPContext *avpriv_float_dsp_alloc(int bit_exact) { AVFloatDSPContext *fdsp = av_mallocz(sizeof(AVFloatDSPContext)); @@ -129,8 +106,6 @@ av_cold AVFloatDSPContext *avpriv_float_dsp_alloc(int bit_exact) fdsp->vector_fmul_window = vector_fmul_window_c; fdsp->vector_fmul_add = vector_fmul_add_c; fdsp->vector_fmul_reverse = vector_fmul_reverse_c; - fdsp->butterflies_float = butterflies_float_c; - fdsp->scalarproduct_float = avpriv_scalarproduct_float_c; /* if (ARCH_AARCH64) diff --git a/ext/at3_standalone/float_dsp.h b/ext/at3_standalone/float_dsp.h index d1be38f947..0ab56aebed 100644 --- a/ext/at3_standalone/float_dsp.h +++ b/ext/at3_standalone/float_dsp.h @@ -137,26 +137,6 @@ typedef struct AVFloatDSPContext { */ void (*vector_fmul_reverse)(float *dst, const float *src0, const float *src1, int len); - - /** - * Calculate the sum and difference of two vectors of floats. - * - * @param v1 first input vector, sum output, 16-byte aligned - * @param v2 second input vector, difference output, 16-byte aligned - * @param len length of vectors, multiple of 4 - */ - void (*butterflies_float)(float *av_restrict v1, float *av_restrict v2, int len); - - /** - * Calculate the scalar product of two vectors of floats. - * - * @param v1 first vector, 16-byte aligned - * @param v2 second vector, 16-byte aligned - * @param len length of vectors, multiple of 4 - * - * @return sum of elementwise products - */ - float (*scalarproduct_float)(const float *v1, const float *v2, int len); } AVFloatDSPContext; /** diff --git a/ext/at3_standalone/frame.c b/ext/at3_standalone/frame.c index 3cb10cb6c7..979af30c8d 100644 --- a/ext/at3_standalone/frame.c +++ b/ext/at3_standalone/frame.c @@ -163,103 +163,6 @@ FF_ENABLE_DEPRECATION_WARNINGS return 0; } -int av_frame_ref(AVFrame *dst, const AVFrame *src) -{ - int i, ret = 0; - - dst->format = src->format; - dst->channels = src->channels; - dst->channel_layout = src->channel_layout; - dst->nb_samples = src->nb_samples; - - ret = frame_copy_props(dst, src, 0); - if (ret < 0) - return ret; - - /* duplicate the frame data if it's not refcounted */ - if (!src->buf[0]) { - ret = av_frame_get_buffer(dst, 32); - if (ret < 0) - return ret; - - ret = av_frame_copy(dst, src); - if (ret < 0) - av_frame_unref(dst); - - return ret; - } - - /* ref the buffers */ - for (i = 0; i < FF_ARRAY_ELEMS(src->buf); i++) { - if (!src->buf[i]) - continue; - dst->buf[i] = av_buffer_ref(src->buf[i]); - if (!dst->buf[i]) { - ret = AVERROR(ENOMEM); - goto fail; - } - } - - if (src->extended_buf) { - dst->extended_buf = av_mallocz_array(sizeof(*dst->extended_buf), - src->nb_extended_buf); - if (!dst->extended_buf) { - ret = AVERROR(ENOMEM); - goto fail; - } - dst->nb_extended_buf = src->nb_extended_buf; - - for (i = 0; i < src->nb_extended_buf; i++) { - dst->extended_buf[i] = av_buffer_ref(src->extended_buf[i]); - if (!dst->extended_buf[i]) { - ret = AVERROR(ENOMEM); - goto fail; - } - } - } - - /* duplicate extended data */ - if (src->extended_data != src->data) { - int ch = src->channels; - - if (!ch) { - ret = AVERROR(EINVAL); - goto fail; - } - CHECK_CHANNELS_CONSISTENCY(src); - - dst->extended_data = av_malloc_array(sizeof(*dst->extended_data), ch); - if (!dst->extended_data) { - ret = AVERROR(ENOMEM); - goto fail; - } - memcpy(dst->extended_data, src->extended_data, sizeof(*src->extended_data) * ch); - } else - dst->extended_data = dst->data; - - memcpy(dst->data, src->data, sizeof(src->data)); - memcpy(dst->linesize, src->linesize, sizeof(src->linesize)); - - return 0; - -fail: - av_frame_unref(dst); - return ret; -} - -AVFrame *av_frame_clone(const AVFrame *src) -{ - AVFrame *ret = av_frame_alloc(); - - if (!ret) - return NULL; - - if (av_frame_ref(ret, src) < 0) - av_frame_free(&ret); - - return ret; -} - void av_frame_unref(AVFrame *frame) { int i; @@ -275,98 +178,3 @@ void av_frame_unref(AVFrame *frame) get_frame_defaults(frame); } - -void av_frame_move_ref(AVFrame *dst, AVFrame *src) -{ - *dst = *src; - if (src->extended_data == src->data) - dst->extended_data = dst->data; - memset(src, 0, sizeof(*src)); - get_frame_defaults(src); -} - -int av_frame_is_writable(AVFrame *frame) -{ - int i, ret = 1; - - /* assume non-refcounted frames are not writable */ - if (!frame->buf[0]) - return 0; - - for (i = 0; i < FF_ARRAY_ELEMS(frame->buf); i++) - if (frame->buf[i]) - ret &= !!av_buffer_is_writable(frame->buf[i]); - for (i = 0; i < frame->nb_extended_buf; i++) - ret &= !!av_buffer_is_writable(frame->extended_buf[i]); - - return ret; -} - -int av_frame_copy_props(AVFrame *dst, const AVFrame *src) -{ - return frame_copy_props(dst, src, 1); -} - -AVBufferRef *av_frame_get_plane_buffer(AVFrame *frame, int plane) -{ - uint8_t *data; - int planes, i; - - if (frame->nb_samples) { - int channels = frame->channels; - if (!channels) - return NULL; - CHECK_CHANNELS_CONSISTENCY(frame); - planes = av_sample_fmt_is_planar(frame->format) ? channels : 1; - } else - planes = 4; - - if (plane < 0 || plane >= planes || !frame->extended_data[plane]) - return NULL; - data = frame->extended_data[plane]; - - for (i = 0; i < FF_ARRAY_ELEMS(frame->buf) && frame->buf[i]; i++) { - AVBufferRef *buf = frame->buf[i]; - if (data >= buf->data && data < buf->data + buf->size) - return buf; - } - for (i = 0; i < frame->nb_extended_buf; i++) { - AVBufferRef *buf = frame->extended_buf[i]; - if (data >= buf->data && data < buf->data + buf->size) - return buf; - } - return NULL; -} - -static int frame_copy_audio(AVFrame *dst, const AVFrame *src) -{ - int planar = av_sample_fmt_is_planar(dst->format); - int channels = dst->channels; - int planes = planar ? channels : 1; - int i; - - if (dst->nb_samples != src->nb_samples || - dst->channels != src->channels || - dst->channel_layout != src->channel_layout) - return AVERROR(EINVAL); - - CHECK_CHANNELS_CONSISTENCY(src); - - for (i = 0; i < planes; i++) - if (!dst->extended_data[i] || !src->extended_data[i]) - return AVERROR(EINVAL); - - av_samples_copy(dst->extended_data, src->extended_data, 0, 0, - dst->nb_samples, channels, dst->format); - - return 0; -} - -int av_frame_copy(AVFrame *dst, const AVFrame *src) -{ - if (dst->format != src->format || dst->format < 0) - return AVERROR(EINVAL); - else if (dst->nb_samples > 0 && dst->channel_layout) - return frame_copy_audio(dst, src); - return AVERROR(EINVAL); -} diff --git a/ext/at3_standalone/frame.h b/ext/at3_standalone/frame.h index e812441e52..62e4086c74 100644 --- a/ext/at3_standalone/frame.h +++ b/ext/at3_standalone/frame.h @@ -34,94 +34,6 @@ #include "samplefmt.h" #include "version.h" - -/** - * @defgroup lavu_frame AVFrame - * @ingroup lavu_data - * - * @{ - * AVFrame is an abstraction for reference-counted raw multimedia data. - */ - -enum AVFrameSideDataType { - /** - * The data is the AVPanScan struct defined in libavcodec. - */ - AV_FRAME_DATA_PANSCAN, - /** - * ATSC A53 Part 4 Closed Captions. - * A53 CC bitstream is stored as uint8_t in AVFrameSideData.data. - * The number of bytes of CC data is AVFrameSideData.size. - */ - AV_FRAME_DATA_A53_CC, - /** - * Stereoscopic 3d metadata. - * The data is the AVStereo3D struct defined in libavutil/stereo3d.h. - */ - AV_FRAME_DATA_STEREO3D, - /** - * The data is the AVMatrixEncoding enum defined in libavutil/channel_layout.h. - */ - AV_FRAME_DATA_MATRIXENCODING, - /** - * Metadata relevant to a downmix procedure. - * The data is the AVDownmixInfo struct defined in libavutil/downmix_info.h. - */ - AV_FRAME_DATA_DOWNMIX_INFO, - /** - * ReplayGain information in the form of the AVReplayGain struct. - */ - AV_FRAME_DATA_REPLAYGAIN, - /** - * This side data contains a 3x3 transformation matrix describing an affine - * transformation that needs to be applied to the frame for correct - * presentation. - * - * See libavutil/display.h for a detailed description of the data. - */ - AV_FRAME_DATA_DISPLAYMATRIX, - /** - * Active Format Description data consisting of a single byte as specified - * in ETSI TS 101 154 using AVActiveFormatDescription enum. - */ - AV_FRAME_DATA_AFD, - /** - * Motion vectors exported by some codecs (on demand through the export_mvs - * flag set in the libavcodec AVCodecContext flags2 option). - * The data is the AVMotionVector struct defined in - * libavutil/motion_vector.h. - */ - AV_FRAME_DATA_MOTION_VECTORS, - /** - * Recommmends skipping the specified number of samples. This is exported - * only if the "skip_manual" AVOption is set in libavcodec. - * This has the same format as AV_PKT_DATA_SKIP_SAMPLES. - * @code - * u32le number of samples to skip from start of this packet - * u32le number of samples to skip from end of this packet - * u8 reason for start skip - * u8 reason for end skip (0=padding silence, 1=convergence) - * @endcode - */ - AV_FRAME_DATA_SKIP_SAMPLES, - /** - * This side data must be associated with an audio frame and corresponds to - * enum AVAudioServiceType defined in avcodec.h. - */ - AV_FRAME_DATA_AUDIO_SERVICE_TYPE, - /** - * Mastering display metadata associated with a video frame. The payload is - * an AVMasteringDisplayMetadata type and contains information about the - * mastering display color volume. - */ - AV_FRAME_DATA_MASTERING_DISPLAY_METADATA, - /** - * The GOP timecode in 25 bit timecode format. Data format is 64-bit integer. - * This is set on the first frame of a GOP that has a temporal reference of 0. - */ - AV_FRAME_DATA_GOP_TIMECODE -}; - /** * This structure describes decoded (raw) audio or video data. * @@ -350,28 +262,22 @@ typedef struct AVFrame { * The position of these field in the structure is not part of the ABI, * they should not be accessed directly outside libavutil. */ -int64_t av_frame_get_best_effort_timestamp(const AVFrame *frame); -void av_frame_set_best_effort_timestamp(AVFrame *frame, int64_t val); -int64_t av_frame_get_pkt_duration (const AVFrame *frame); -void av_frame_set_pkt_duration (AVFrame *frame, int64_t val); -int64_t av_frame_get_pkt_pos (const AVFrame *frame); -void av_frame_set_pkt_pos (AVFrame *frame, int64_t val); -int64_t av_frame_get_channel_layout (const AVFrame *frame); -void av_frame_set_channel_layout (AVFrame *frame, int64_t val); -int av_frame_get_channels (const AVFrame *frame); -void av_frame_set_channels (AVFrame *frame, int val); -int av_frame_get_sample_rate (const AVFrame *frame); -void av_frame_set_sample_rate (AVFrame *frame, int val); -int av_frame_get_decode_error_flags (const AVFrame *frame); -void av_frame_set_decode_error_flags (AVFrame *frame, int val); -int av_frame_get_pkt_size(const AVFrame *frame); -void av_frame_set_pkt_size(AVFrame *frame, int val); - -/** - * Get the name of a colorspace. - * @return a static string identifying the colorspace; can be NULL. - */ -const char *av_get_colorspace_name(enum AVColorSpace val); +int64_t av_frame_get_best_effort_timestamp(const AVFrame * frame); +void av_frame_set_best_effort_timestamp(AVFrame * frame, int64_t val); +int64_t av_frame_get_pkt_duration(const AVFrame * frame); +void av_frame_set_pkt_duration(AVFrame * frame, int64_t val); +int64_t av_frame_get_pkt_pos(const AVFrame * frame); +void av_frame_set_pkt_pos(AVFrame * frame, int64_t val); +int64_t av_frame_get_channel_layout(const AVFrame * frame); +void av_frame_set_channel_layout(AVFrame * frame, int64_t val); +int av_frame_get_channels(const AVFrame * frame); +void av_frame_set_channels(AVFrame * frame, int val); +int av_frame_get_sample_rate(const AVFrame * frame); +void av_frame_set_sample_rate(AVFrame * frame, int val); +int av_frame_get_decode_error_flags(const AVFrame * frame); +void av_frame_set_decode_error_flags(AVFrame * frame, int val); +int av_frame_get_pkt_size(const AVFrame * frame); +void av_frame_set_pkt_size(AVFrame * frame, int val); /** * Allocate an AVFrame and set its fields to default values. The resulting @@ -394,38 +300,11 @@ AVFrame *av_frame_alloc(void); */ void av_frame_free(AVFrame **frame); -/** - * Set up a new reference to the data described by the source frame. - * - * Copy frame properties from src to dst and create a new reference for each - * AVBufferRef from src. - * - * If src is not reference counted, new buffers are allocated and the data is - * copied. - * - * @return 0 on success, a negative AVERROR on error - */ -int av_frame_ref(AVFrame *dst, const AVFrame *src); - -/** - * Create a new frame that references the same data as src. - * - * This is a shortcut for av_frame_alloc()+av_frame_ref(). - * - * @return newly created AVFrame on success, NULL on error. - */ -AVFrame *av_frame_clone(const AVFrame *src); - /** * Unreference all the buffers referenced by frame and reset the frame fields. */ void av_frame_unref(AVFrame *frame); -/** - * Move everything contained in src to dst and reset src. - */ -void av_frame_move_ref(AVFrame *dst, AVFrame *src); - /** * Allocate new buffer(s) for audio or video data. * @@ -445,53 +324,6 @@ void av_frame_move_ref(AVFrame *dst, AVFrame *src); */ int av_frame_get_buffer(AVFrame *frame, int align); -/** - * Check if the frame data is writable. - * - * @return A positive value if the frame data is writable (which is true if and - * only if each of the underlying buffers has only one reference, namely the one - * stored in this frame). Return 0 otherwise. - * - * If 1 is returned the answer is valid until av_buffer_ref() is called on any - * of the underlying AVBufferRefs (e.g. through av_frame_ref() or directly). - * - * @see av_frame_make_writable(), av_buffer_is_writable() - */ -int av_frame_is_writable(AVFrame *frame); - -/** - * Copy the frame data from src to dst. - * - * This function does not allocate anything, dst must be already initialized and - * allocated with the same parameters as src. - * - * This function only copies the frame data (i.e. the contents of the data / - * extended data arrays), not any other properties. - * - * @return >= 0 on success, a negative AVERROR on error. - */ -int av_frame_copy(AVFrame *dst, const AVFrame *src); - -/** - * Copy only "metadata" fields from src to dst. - * - * Metadata for the purpose of this function are those fields that do not affect - * the data layout in the buffers. E.g. pts, sample rate (for audio) or sample - * aspect ratio (for video), but not width/height or channel layout. - * Side data is also copied. - */ -int av_frame_copy_props(AVFrame *dst, const AVFrame *src); - -/** - * Get the buffer reference a given data plane is stored in. - * - * @param plane index of the data plane of interest in frame->extended_data. - * - * @return the buffer reference that contains the plane or NULL if the input - * frame is not valid. - */ -AVBufferRef *av_frame_get_plane_buffer(AVFrame *frame, int plane); - /** * @} */ diff --git a/ext/at3_standalone/internal.h b/ext/at3_standalone/internal.h index 7b0c7a1447..45ba2fa1d7 100644 --- a/ext/at3_standalone/internal.h +++ b/ext/at3_standalone/internal.h @@ -169,23 +169,15 @@ extern const uint8_t ff_log2_run[41]; */ int ff_match_2uint16(const uint16_t (*tab)[2], int size, int a, int b); -unsigned int avpriv_toupper4(unsigned int x); - /** * does needed setup of pkt_pts/pos and such for (re)get_buffer(); */ int ff_init_buffer_info(AVCodecContext *s, AVFrame *frame); - -void ff_color_frame(AVFrame *frame, const int color[4]); - extern volatile int ff_avcodec_locked; int ff_lock_avcodec(AVCodecContext *log_ctx, const AVCodec *codec); int ff_unlock_avcodec(const AVCodec *codec); -int avpriv_lock_avformat(void); -int avpriv_unlock_avformat(void); - /** * Maximum size in bytes of extradata. * This value was chosen such that every bit of the buffer is @@ -223,37 +215,6 @@ int ff_alloc_packet2(AVCodecContext *avctx, AVPacket *avpkt, int64_t size, int64 attribute_deprecated int ff_alloc_packet(AVPacket *avpkt, int size); -/** - * Rescale from sample rate to AVCodecContext.time_base. - */ -static av_always_inline int64_t ff_samples_to_time_base(AVCodecContext *avctx, - int64_t samples) -{ - if(samples == AV_NOPTS_VALUE) - return AV_NOPTS_VALUE; - return av_rescale_q(samples, (AVRational){ 1, avctx->sample_rate }, - avctx->time_base); -} - -/** - * 2^(x) for integer x - * @return correctly rounded float - */ -static av_always_inline float ff_exp2fi(int x) { - /* Normal range */ - if (-126 <= x && x <= 128) - return av_int2float((x+127) << 23); - /* Too large */ - else if (x > 128) - return INFINITY; - /* Subnormal numbers */ - else if (x > -150) - return av_int2float(1 << (x+149)); - /* Negligibly small */ - else - return 0; -} - /** * Get a buffer for a frame. This is a wrapper around * AVCodecContext.get_buffer() and should be used instead calling get_buffer() diff --git a/ext/at3_standalone/mathematics.c b/ext/at3_standalone/mathematics.c index bb2f2b4fcc..2887228c80 100644 --- a/ext/at3_standalone/mathematics.c +++ b/ext/at3_standalone/mathematics.c @@ -142,69 +142,3 @@ int64_t av_rescale_q(int64_t a, AVRational bq, AVRational cq) { return av_rescale_q_rnd(a, bq, cq, AV_ROUND_NEAR_INF); } - -int av_compare_ts(int64_t ts_a, AVRational tb_a, int64_t ts_b, AVRational tb_b) -{ - int64_t a = tb_a.num * (int64_t)tb_b.den; - int64_t b = tb_b.num * (int64_t)tb_a.den; - if ((FFABS(ts_a)|a|FFABS(ts_b)|b) <= INT_MAX) - return (ts_a*a > ts_b*b) - (ts_a*a < ts_b*b); - if (av_rescale_rnd(ts_a, a, b, AV_ROUND_DOWN) < ts_b) - return -1; - if (av_rescale_rnd(ts_b, b, a, AV_ROUND_DOWN) < ts_a) - return 1; - return 0; -} - -int64_t av_compare_mod(uint64_t a, uint64_t b, uint64_t mod) -{ - int64_t c = (a - b) & (mod - 1); - if (c > (mod >> 1)) - c -= mod; - return c; -} - -int64_t av_rescale_delta(AVRational in_tb, int64_t in_ts, AVRational fs_tb, int duration, int64_t *last, AVRational out_tb){ - int64_t a, b, this; - - av_assert0(in_ts != AV_NOPTS_VALUE); - av_assert0(duration >= 0); - - if (*last == AV_NOPTS_VALUE || !duration || in_tb.num*(int64_t)out_tb.den <= out_tb.num*(int64_t)in_tb.den) { -simple_round: - *last = av_rescale_q(in_ts, in_tb, fs_tb) + duration; - return av_rescale_q(in_ts, in_tb, out_tb); - } - - a = av_rescale_q_rnd(2*in_ts-1, in_tb, fs_tb, AV_ROUND_DOWN) >>1; - b = (av_rescale_q_rnd(2*in_ts+1, in_tb, fs_tb, AV_ROUND_UP )+1)>>1; - if (*last < 2*a - b || *last > 2*b - a) - goto simple_round; - - this = av_clip64(*last, a, b); - *last = this + duration; - - return av_rescale_q(this, fs_tb, out_tb); -} - -int64_t av_add_stable(AVRational ts_tb, int64_t ts, AVRational inc_tb, int64_t inc) -{ - int64_t m, d; - - if (inc != 1) - inc_tb = av_mul_q(inc_tb, (AVRational) {inc, 1}); - - m = inc_tb.num * (int64_t)ts_tb.den; - d = inc_tb.den * (int64_t)ts_tb.num; - - if (m % d == 0) - return ts + m / d; - if (m < d) - return ts; - - { - int64_t old = av_rescale_q(ts, ts_tb, inc_tb); - int64_t old_ts = av_rescale_q(old, inc_tb, ts_tb); - return av_rescale_q(old + 1, inc_tb, ts_tb) + (ts - old_ts); - } -} diff --git a/ext/at3_standalone/mathematics.h b/ext/at3_standalone/mathematics.h index 57c44f845d..491a3edc60 100644 --- a/ext/at3_standalone/mathematics.h +++ b/ext/at3_standalone/mathematics.h @@ -113,50 +113,6 @@ int64_t av_rescale_q(int64_t a, AVRational bq, AVRational cq) av_const; int64_t av_rescale_q_rnd(int64_t a, AVRational bq, AVRational cq, enum AVRounding) av_const; -/** - * Compare 2 timestamps each in its own timebases. - * The result of the function is undefined if one of the timestamps - * is outside the int64_t range when represented in the others timebase. - * @return -1 if ts_a is before ts_b, 1 if ts_a is after ts_b or 0 if they represent the same position - */ -int av_compare_ts(int64_t ts_a, AVRational tb_a, int64_t ts_b, AVRational tb_b); - -/** - * Compare 2 integers modulo mod. - * That is we compare integers a and b for which only the least - * significant log2(mod) bits are known. - * - * @param mod must be a power of 2 - * @return a negative value if a is smaller than b - * a positive value if a is greater than b - * 0 if a equals b - */ -int64_t av_compare_mod(uint64_t a, uint64_t b, uint64_t mod); - -/** - * Rescale a timestamp while preserving known durations. - * - * @param in_ts Input timestamp - * @param in_tb Input timebase - * @param fs_tb Duration and *last timebase - * @param duration duration till the next call - * @param out_tb Output timebase - */ -int64_t av_rescale_delta(AVRational in_tb, int64_t in_ts, AVRational fs_tb, int duration, int64_t *last, AVRational out_tb); - -/** - * Add a value to a timestamp. - * - * This function guarantees that when the same value is repeatly added that - * no accumulation of rounding errors occurs. - * - * @param ts Input timestamp - * @param ts_tb Input timestamp timebase - * @param inc value to add to ts - * @param inc_tb inc timebase - */ -int64_t av_add_stable(AVRational ts_tb, int64_t ts, AVRational inc_tb, int64_t inc); - /** * @} diff --git a/ext/at3_standalone/mem.c b/ext/at3_standalone/mem.c index 87bdb91b5a..a92ad3f8d9 100644 --- a/ext/at3_standalone/mem.c +++ b/ext/at3_standalone/mem.c @@ -32,9 +32,6 @@ #include #include #include -#if HAVE_MALLOC_H -#include -#endif #include "compat.h" #include "avutil.h" @@ -42,22 +39,6 @@ #include "intreadwrite.h" #include "mem.h" -#ifdef MALLOC_PREFIX - -#define malloc AV_JOIN(MALLOC_PREFIX, malloc) -#define memalign AV_JOIN(MALLOC_PREFIX, memalign) -#define posix_memalign AV_JOIN(MALLOC_PREFIX, posix_memalign) -#define realloc AV_JOIN(MALLOC_PREFIX, realloc) -#define free AV_JOIN(MALLOC_PREFIX, free) - -void *malloc(size_t size); -void *memalign(size_t align, size_t size); -int posix_memalign(void **ptr, size_t align, size_t size); -void *realloc(void *ptr, size_t size); -void free(void *ptr); - -#endif /* MALLOC_PREFIX */ - int ff_fast_malloc(void *ptr, unsigned int *size, size_t min_size, int zero_realloc) { void *val; @@ -200,27 +181,6 @@ void *av_realloc_f(void *ptr, size_t nelem, size_t elsize) return r; } -int av_reallocp(void *ptr, size_t size) -{ - void *val; - - if (!size) { - av_freep(ptr); - return 0; - } - - memcpy(&val, ptr, sizeof(val)); - val = av_realloc(val, size); - - if (!val) { - av_freep(ptr); - return AVERROR(ENOMEM); - } - - memcpy(ptr, &val, sizeof(val)); - return 0; -} - void *av_realloc_array(void *ptr, size_t nmemb, size_t size) { if (!size || nmemb >= INT_MAX / size) @@ -228,19 +188,6 @@ void *av_realloc_array(void *ptr, size_t nmemb, size_t size) return av_realloc(ptr, nmemb * size); } -int av_reallocp_array(void *ptr, size_t nmemb, size_t size) -{ - void *val; - - memcpy(&val, ptr, sizeof(val)); - val = av_realloc_f(val, nmemb, size); - memcpy(ptr, &val, sizeof(val)); - if (!val && nmemb && size) - return AVERROR(ENOMEM); - - return 0; -} - void av_free(void *ptr) { #if CONFIG_MEMALIGN_HACK @@ -273,57 +220,6 @@ void *av_mallocz(size_t size) return ptr; } -void *av_calloc(size_t nmemb, size_t size) -{ - if (size <= 0 || nmemb >= INT_MAX / size) - return NULL; - return av_mallocz(nmemb * size); -} - -char *av_strdup(const char *s) -{ - char *ptr = NULL; - if (s) { - size_t len = strlen(s) + 1; - ptr = av_realloc(NULL, len); - if (ptr) - memcpy(ptr, s, len); - } - return ptr; -} - -char *av_strndup(const char *s, size_t len) -{ - char *ret = NULL, *end; - - if (!s) - return NULL; - - end = memchr(s, 0, len); - if (end) - len = end - s; - - ret = av_realloc(NULL, len + 1); - if (!ret) - return NULL; - - memcpy(ret, s, len); - ret[len] = 0; - return ret; -} - -void *av_memdup(const void *p, size_t size) -{ - void *ptr = NULL; - if (p) { - ptr = av_malloc(size); - if (ptr) - memcpy(ptr, p, size); - } - return ptr; -} - - static void fill16(uint8_t *dst, int len) { uint32_t v = AV_RN16(dst - 2); @@ -398,56 +294,6 @@ static void fill32(uint8_t *dst, int len) } } -void av_memcpy_backptr(uint8_t *dst, int back, int cnt) -{ - const uint8_t *src = &dst[-back]; - if (!back) - return; - - if (back == 1) { - memset(dst, *src, cnt); - } else if (back == 2) { - fill16(dst, cnt); - } else if (back == 3) { - fill24(dst, cnt); - } else if (back == 4) { - fill32(dst, cnt); - } else { - if (cnt >= 16) { - int blocklen = back; - while (cnt > blocklen) { - memcpy(dst, src, blocklen); - dst += blocklen; - cnt -= blocklen; - blocklen <<= 1; - } - memcpy(dst, src, cnt); - return; - } - if (cnt >= 8) { - AV_COPY32U(dst, src); - AV_COPY32U(dst + 4, src + 4); - src += 8; - dst += 8; - cnt -= 8; - } - if (cnt >= 4) { - AV_COPY32U(dst, src); - src += 4; - dst += 4; - cnt -= 4; - } - if (cnt >= 2) { - AV_COPY16U(dst, src); - src += 2; - dst += 2; - cnt -= 2; - } - if (cnt) - *dst = *src; - } -} - void *av_fast_realloc(void *ptr, unsigned int *size, size_t min_size) { if (min_size < *size) diff --git a/ext/at3_standalone/mem.h b/ext/at3_standalone/mem.h index 1558fe8f0b..eac646335e 100644 --- a/ext/at3_standalone/mem.h +++ b/ext/at3_standalone/mem.h @@ -115,26 +115,6 @@ void *av_realloc(void *ptr, size_t size); */ void *av_realloc_f(void *ptr, size_t nelem, size_t elsize); -/** - * Allocate or reallocate a block of memory. - * If *ptr is NULL and size > 0, allocate a new block. If - * size is zero, free the memory block pointed to by ptr. - * @param ptr Pointer to a pointer to a memory block already allocated - * with av_realloc(), or pointer to a pointer to NULL. - * The pointer is updated on success, or freed on failure. - * @param size Size in bytes for the memory block to be allocated or - * reallocated - * @return Zero on success, an AVERROR error code on failure. - * @warning Pointers originating from the av_malloc() family of functions must - * not be passed to av_reallocp(). The former can be implemented using - * memalign() (or other functions), and there is no guarantee that - * pointers from such functions can be passed to realloc() at all. - * The situation is undefined according to POSIX and may crash with - * some libc implementations. - */ -av_warn_unused_result -int av_reallocp(void *ptr, size_t size); - /** * Allocate or reallocate an array. * If ptr is NULL and nmemb > 0, allocate a new block. If @@ -154,25 +134,6 @@ int av_reallocp(void *ptr, size_t size); */ void *av_realloc_array(void *ptr, size_t nmemb, size_t size); -/** - * Allocate or reallocate an array through a pointer to a pointer. - * If *ptr is NULL and nmemb > 0, allocate a new block. If - * nmemb is zero, free the memory block pointed to by ptr. - * @param ptr Pointer to a pointer to a memory block already allocated - * with av_realloc(), or pointer to a pointer to NULL. - * The pointer is updated on success, or freed on failure. - * @param nmemb Number of elements - * @param size Size of the single element - * @return Zero on success, an AVERROR error code on failure. - * @warning Pointers originating from the av_malloc() family of functions must - * not be passed to av_realloc(). The former can be implemented using - * memalign() (or other functions), and there is no guarantee that - * pointers from such functions can be passed to realloc() at all. - * The situation is undefined according to POSIX and may crash with - * some libc implementations. - */ -int av_reallocp_array(void *ptr, size_t nmemb, size_t size); - /** * Free a memory block which has been allocated with av_malloc(z)() or * av_realloc(). @@ -193,18 +154,6 @@ void av_free(void *ptr); */ void *av_mallocz(size_t size); -/** - * Allocate a block of nmemb * size bytes with alignment suitable for all - * memory accesses (including vectors if available on the CPU) and - * zero all the bytes of the block. - * The allocation will fail if nmemb * size is greater than or equal - * to INT_MAX. - * @param nmemb - * @param size - * @return Pointer to the allocated block, NULL if it cannot be allocated. - */ -void *av_calloc(size_t nmemb, size_t size); - /** * Allocate a block of size * nmemb bytes with av_mallocz(). * @param nmemb Number of elements @@ -221,32 +170,6 @@ static inline void *av_mallocz_array(size_t nmemb, size_t size) return av_mallocz(nmemb * size); } -/** - * Duplicate the string s. - * @param s string to be duplicated - * @return Pointer to a newly-allocated string containing a - * copy of s or NULL if the string cannot be allocated. - */ -char *av_strdup(const char *s); - -/** - * Duplicate a substring of the string s. - * @param s string to be duplicated - * @param len the maximum length of the resulting string (not counting the - * terminating byte). - * @return Pointer to a newly-allocated string containing a - * copy of s or NULL if the string cannot be allocated. - */ -char *av_strndup(const char *s, size_t len); - -/** - * Duplicate the buffer p. - * @param p buffer to be duplicated - * @return Pointer to a newly allocated buffer containing a - * copy of p or NULL if the buffer cannot be allocated. - */ -void *av_memdup(const void *p, size_t size); - /** * Free a memory block which has been allocated with av_malloc(z)() or * av_realloc() and set the pointer pointing to it to NULL. @@ -257,69 +180,6 @@ void *av_memdup(const void *p, size_t size); */ void av_freep(void *ptr); -/** - * Add an element to a dynamic array. - * - * The array to grow is supposed to be an array of pointers to - * structures, and the element to add must be a pointer to an already - * allocated structure. - * - * The array is reallocated when its size reaches powers of 2. - * Therefore, the amortized cost of adding an element is constant. - * - * In case of success, the pointer to the array is updated in order to - * point to the new grown array, and the number pointed to by nb_ptr - * is incremented. - * In case of failure, the array is freed, *tab_ptr is set to NULL and - * *nb_ptr is set to 0. - * - * @param tab_ptr pointer to the array to grow - * @param nb_ptr pointer to the number of elements in the array - * @param elem element to add - * @see av_dynarray_add_nofree(), av_dynarray2_add() - */ -void av_dynarray_add(void *tab_ptr, int *nb_ptr, void *elem); - -/** - * Add an element to a dynamic array. - * - * Function has the same functionality as av_dynarray_add(), - * but it doesn't free memory on fails. It returns error code - * instead and leave current buffer untouched. - * - * @param tab_ptr pointer to the array to grow - * @param nb_ptr pointer to the number of elements in the array - * @param elem element to add - * @return >=0 on success, negative otherwise. - * @see av_dynarray_add(), av_dynarray2_add() - */ -av_warn_unused_result -int av_dynarray_add_nofree(void *tab_ptr, int *nb_ptr, void *elem); - -/** - * Add an element of size elem_size to a dynamic array. - * - * The array is reallocated when its number of elements reaches powers of 2. - * Therefore, the amortized cost of adding an element is constant. - * - * In case of success, the pointer to the array is updated in order to - * point to the new grown array, and the number pointed to by nb_ptr - * is incremented. - * In case of failure, the array is freed, *tab_ptr is set to NULL and - * *nb_ptr is set to 0. - * - * @param tab_ptr pointer to the array to grow - * @param nb_ptr pointer to the number of elements in the array - * @param elem_size size in bytes of the elements in the array - * @param elem_data pointer to the data of the element to add. If NULL, the space of - * the new added element is not filled. - * @return pointer to the data of the element to copy in the new allocated space. - * If NULL, the new allocated space is left uninitialized." - * @see av_dynarray_add(), av_dynarray_add_nofree() - */ -void *av_dynarray2_add(void **tab_ptr, int *nb_ptr, size_t elem_size, - const uint8_t *elem_data); - /** * Multiply two size_t values checking for overflow. * @return 0 if success, AVERROR(EINVAL) if overflow. @@ -340,17 +200,6 @@ static inline int av_size_mult(size_t a, size_t b, size_t *r) */ void av_max_alloc(size_t max); -/** - * deliberately overlapping memcpy implementation - * @param dst destination buffer - * @param back how many bytes back we start (the initial size of the overlapping window), must be > 0 - * @param cnt number of bytes to copy, must be >= 0 - * - * cnt > back is valid, this will copy the bytes we just copied, - * thus creating a repeating pattern with a period length of back. - */ -void av_memcpy_backptr(uint8_t *dst, int back, int cnt); - /** * Reallocate the given block if it is not large enough, otherwise do nothing. * diff --git a/ext/at3_standalone/opt.c b/ext/at3_standalone/opt.c deleted file mode 100644 index f5ceafe391..0000000000 --- a/ext/at3_standalone/opt.c +++ /dev/null @@ -1,1088 +0,0 @@ -/* - * AVOptions - * Copyright (c) 2005 Michael Niedermayer - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/** - * @file - * AVOptions - * @author Michael Niedermayer - */ - -#include "avutil.h" -#include "channel_layout.h" -#include "common.h" -#include "opt.h" -#include "dict.h" -#include "avstring.h" -#include "log.h" -#include "mathematics.h" -#include "samplefmt.h" - -#include - -const AVOption *av_opt_next(const void *obj, const AVOption *last) -{ - const AVClass *class; - if (!obj) - return NULL; - class = *(const AVClass**)obj; - if (!last && class && class->option && class->option[0].name) - return class->option; - if (last && last[1].name) - return ++last; - return NULL; -} - -static int read_number(const AVOption *o, const void *dst, double *num, int *den, int64_t *intnum) -{ - switch (o->type) { - case AV_OPT_TYPE_FLAGS: *intnum = *(unsigned int*)dst;return 0; - case AV_OPT_TYPE_PIXEL_FMT: *intnum = *(enum AVPixelFormat *)dst;return 0; - case AV_OPT_TYPE_SAMPLE_FMT:*intnum = *(enum AVSampleFormat*)dst;return 0; - case AV_OPT_TYPE_BOOL: - case AV_OPT_TYPE_INT: *intnum = *(int *)dst;return 0; - case AV_OPT_TYPE_CHANNEL_LAYOUT: - case AV_OPT_TYPE_DURATION: - case AV_OPT_TYPE_INT64: *intnum = *(int64_t *)dst;return 0; - case AV_OPT_TYPE_FLOAT: *num = *(float *)dst;return 0; - case AV_OPT_TYPE_DOUBLE: *num = *(double *)dst;return 0; - case AV_OPT_TYPE_RATIONAL: *intnum = ((AVRational*)dst)->num; - *den = ((AVRational*)dst)->den; - return 0; - case AV_OPT_TYPE_CONST: *num = o->default_val.dbl; return 0; - } - return AVERROR(EINVAL); -} - -static int write_number(void *obj, const AVOption *o, void *dst, double num, int den, int64_t intnum) -{ - if (o->type != AV_OPT_TYPE_FLAGS && - (o->max * den < num * intnum || o->min * den > num * intnum)) { - num = den ? num*intnum/den : (num*intnum ? INFINITY : NAN); - av_log(obj, AV_LOG_ERROR, "Value %f for parameter '%s' out of range [%g - %g]\n", - num, o->name, o->min, o->max); - return AVERROR(ERANGE); - } - if (o->type == AV_OPT_TYPE_FLAGS) { - double d = num*intnum/den; - if (d < -1.5 || d > 0xFFFFFFFF+0.5 || (llrint(d*256) & 255)) { - av_log(obj, AV_LOG_ERROR, - "Value %f for parameter '%s' is not a valid set of 32bit integer flags\n", - num*intnum/den, o->name); - return AVERROR(ERANGE); - } - } - - switch (o->type) { - case AV_OPT_TYPE_PIXEL_FMT: *(enum AVPixelFormat *)dst = llrint(num/den) * intnum; break; - case AV_OPT_TYPE_SAMPLE_FMT:*(enum AVSampleFormat*)dst = llrint(num/den) * intnum; break; - case AV_OPT_TYPE_BOOL: - case AV_OPT_TYPE_FLAGS: - case AV_OPT_TYPE_INT: *(int *)dst= llrint(num/den)*intnum; break; - case AV_OPT_TYPE_DURATION: - case AV_OPT_TYPE_CHANNEL_LAYOUT: - case AV_OPT_TYPE_INT64: *(int64_t *)dst= llrint(num/den)*intnum; break; - case AV_OPT_TYPE_FLOAT: *(float *)dst= num*intnum/den; break; - case AV_OPT_TYPE_DOUBLE:*(double *)dst= num*intnum/den; break; - case AV_OPT_TYPE_RATIONAL: - if ((int)num == num) *(AVRational*)dst= (AVRational){num*intnum, den}; - else *(AVRational*)dst= av_d2q(num*intnum/den, 1<<24); - break; - default: - return AVERROR(EINVAL); - } - return 0; -} - -static int hexchar2int(char c) { - if (c >= '0' && c <= '9') return c - '0'; - if (c >= 'a' && c <= 'f') return c - 'a' + 10; - if (c >= 'A' && c <= 'F') return c - 'A' + 10; - return -1; -} - -static int set_string_binary(void *obj, const AVOption *o, const char *val, uint8_t **dst) -{ - int *lendst = (int *)(dst + 1); - uint8_t *bin, *ptr; - int len; - - av_freep(dst); - *lendst = 0; - - if (!val || !(len = strlen(val))) - return 0; - - if (len & 1) - return AVERROR(EINVAL); - len /= 2; - - ptr = bin = av_malloc(len); - if (!ptr) - return AVERROR(ENOMEM); - while (*val) { - int a = hexchar2int(*val++); - int b = hexchar2int(*val++); - if (a < 0 || b < 0) { - av_free(bin); - return AVERROR(EINVAL); - } - *ptr++ = (a << 4) | b; - } - *dst = bin; - *lendst = len; - - return 0; -} - -static int set_string(void *obj, const AVOption *o, const char *val, uint8_t **dst) -{ - av_freep(dst); - *dst = av_strdup(val); - return *dst ? 0 : AVERROR(ENOMEM); -} - -#define DEFAULT_NUMVAL(opt) ((opt->type == AV_OPT_TYPE_INT64 || \ - opt->type == AV_OPT_TYPE_CONST || \ - opt->type == AV_OPT_TYPE_FLAGS || \ - opt->type == AV_OPT_TYPE_INT) ? \ - opt->default_val.i64 : opt->default_val.dbl) - -static const char *get_bool_name(int val) -{ - if (val < 0) - return "auto"; - return val ? "true" : "false"; -} - -static int set_string_bool(void *obj, const AVOption *o, const char *val, int *dst) -{ - int n; - - if (!val) - return 0; - - if (!strcmp(val, "auto")) { - n = -1; - } else if (av_match_name(val, "true,y,yes,enable,enabled,on")) { - n = 1; - } else if (av_match_name(val, "false,n,no,disable,disabled,off")) { - n = 0; - } else { - char *end = NULL; - n = strtol(val, &end, 10); - if (val + strlen(val) != end) - goto fail; - } - - if (n < o->min || n > o->max) - goto fail; - - *dst = n; - return 0; - -fail: - av_log(obj, AV_LOG_ERROR, "Unable to parse option value \"%s\" as boolean\n", val); - return AVERROR(EINVAL); -} - -static int set_string_fmt(void *obj, const AVOption *o, const char *val, uint8_t *dst, - int fmt_nb, int ((*get_fmt)(const char *)), const char *desc) -{ - int fmt, min, max; - - if (!val || !strcmp(val, "none")) { - fmt = -1; - } else { - fmt = get_fmt(val); - if (fmt == -1) { - char *tail; - fmt = strtol(val, &tail, 0); - if (*tail || (unsigned)fmt >= fmt_nb) { - av_log(obj, AV_LOG_ERROR, - "Unable to parse option value \"%s\" as %s\n", val, desc); - return AVERROR(EINVAL); - } - } - } - - min = FFMAX(o->min, -1); - max = FFMIN(o->max, fmt_nb-1); - - // hack for compatibility with old ffmpeg - if(min == 0 && max == 0) { - min = -1; - max = fmt_nb-1; - } - - if (fmt < min || fmt > max) { - av_log(obj, AV_LOG_ERROR, - "Value %d for parameter '%s' out of %s format range [%d - %d]\n", - fmt, o->name, desc, min, max); - return AVERROR(ERANGE); - } - - *(int *)dst = fmt; - return 0; -} - -static void format_duration(char *buf, size_t size, int64_t d) -{ - char *e; - - av_assert0(size >= 25); - if (d < 0 && d != INT64_MIN) { - *(buf++) = '-'; - size--; - d = -d; - } - if (d == INT64_MAX) - snprintf(buf, size, "INT64_MAX"); - else if (d == INT64_MIN) - snprintf(buf, size, "INT64_MIN"); - else if (d > (int64_t)3600*1000000) - snprintf(buf, size, "%"PRId64":%02d:%02d.%06d", d / 3600000000, - (int)((d / 60000000) % 60), - (int)((d / 1000000) % 60), - (int)(d % 1000000)); - else if (d > 60*1000000) - snprintf(buf, size, "%d:%02d.%06d", - (int)(d / 60000000), - (int)((d / 1000000) % 60), - (int)(d % 1000000)); - else - snprintf(buf, size, "%d.%06d", - (int)(d / 1000000), - (int)(d % 1000000)); - e = buf + strlen(buf); - while (e > buf && e[-1] == '0') - *(--e) = 0; - if (e > buf && e[-1] == '.') - *(--e) = 0; -} - -int av_opt_get(void *obj, const char *name, int search_flags, uint8_t **out_val) -{ - void *dst, *target_obj; - const AVOption *o = av_opt_find2(obj, name, NULL, 0, search_flags, &target_obj); - uint8_t *bin, buf[128]; - int len, i, ret; - int64_t i64; - - if (!o || !target_obj || (o->offset<=0 && o->type != AV_OPT_TYPE_CONST)) - return AVERROR_OPTION_NOT_FOUND; - - dst = (uint8_t*)target_obj + o->offset; - - buf[0] = 0; - switch (o->type) { - case AV_OPT_TYPE_BOOL: - ret = snprintf(buf, sizeof(buf), "%s", (char *)av_x_if_null(get_bool_name(*(int *)dst), "invalid")); - break; - case AV_OPT_TYPE_FLAGS: ret = snprintf(buf, sizeof(buf), "0x%08X", *(int *)dst);break; - case AV_OPT_TYPE_INT: ret = snprintf(buf, sizeof(buf), "%d" , *(int *)dst);break; - case AV_OPT_TYPE_INT64: ret = snprintf(buf, sizeof(buf), "%"PRId64, *(int64_t*)dst);break; - case AV_OPT_TYPE_FLOAT: ret = snprintf(buf, sizeof(buf), "%f" , *(float *)dst);break; - case AV_OPT_TYPE_DOUBLE: ret = snprintf(buf, sizeof(buf), "%f" , *(double *)dst);break; - case AV_OPT_TYPE_VIDEO_RATE: - case AV_OPT_TYPE_RATIONAL: ret = snprintf(buf, sizeof(buf), "%d/%d", ((AVRational*)dst)->num, ((AVRational*)dst)->den);break; - case AV_OPT_TYPE_CONST: ret = snprintf(buf, sizeof(buf), "%f" , o->default_val.dbl);break; - case AV_OPT_TYPE_STRING: - if (*(uint8_t**)dst) { - *out_val = av_strdup(*(uint8_t**)dst); - } else if (search_flags & AV_OPT_ALLOW_NULL) { - *out_val = NULL; - return 0; - } else { - *out_val = av_strdup(""); - } - return *out_val ? 0 : AVERROR(ENOMEM); - case AV_OPT_TYPE_BINARY: - if (!*(uint8_t**)dst && (search_flags & AV_OPT_ALLOW_NULL)) { - *out_val = NULL; - return 0; - } - len = *(int*)(((uint8_t *)dst) + sizeof(uint8_t *)); - if ((uint64_t)len*2 + 1 > INT_MAX) - return AVERROR(EINVAL); - if (!(*out_val = av_malloc(len*2 + 1))) - return AVERROR(ENOMEM); - if (!len) { - *out_val[0] = '\0'; - return 0; - } - bin = *(uint8_t**)dst; - for (i = 0; i < len; i++) - snprintf(*out_val + i*2, 3, "%02X", bin[i]); - return 0; - case AV_OPT_TYPE_SAMPLE_FMT: - ret = snprintf(buf, sizeof(buf), "%s", (char *)av_x_if_null(av_get_sample_fmt_name(*(enum AVSampleFormat *)dst), "none")); - break; - case AV_OPT_TYPE_DURATION: - i64 = *(int64_t *)dst; - format_duration(buf, sizeof(buf), i64); - ret = strlen(buf); // no overflow possible, checked by an assert - break; - case AV_OPT_TYPE_CHANNEL_LAYOUT: - i64 = *(int64_t *)dst; - ret = snprintf(buf, sizeof(buf), "0x%"PRIx64, i64); - break; - default: - return AVERROR(EINVAL); - } - - if (ret >= sizeof(buf)) - return AVERROR(EINVAL); - *out_val = av_strdup(buf); - return *out_val ? 0 : AVERROR(ENOMEM); -} - -static int get_number(void *obj, const char *name, const AVOption **o_out, double *num, int *den, int64_t *intnum, - int search_flags) -{ - void *dst, *target_obj; - const AVOption *o = av_opt_find2(obj, name, NULL, 0, search_flags, &target_obj); - if (!o || !target_obj) - goto error; - - dst = ((uint8_t*)target_obj) + o->offset; - - if (o_out) *o_out= o; - - return read_number(o, dst, num, den, intnum); - -error: - *den=*intnum=0; - return -1; -} - -int av_opt_get_int(void *obj, const char *name, int search_flags, int64_t *out_val) -{ - int64_t intnum = 1; - double num = 1; - int ret, den = 1; - - if ((ret = get_number(obj, name, NULL, &num, &den, &intnum, search_flags)) < 0) - return ret; - *out_val = num*intnum/den; - return 0; -} - -int av_opt_get_double(void *obj, const char *name, int search_flags, double *out_val) -{ - int64_t intnum = 1; - double num = 1; - int ret, den = 1; - - if ((ret = get_number(obj, name, NULL, &num, &den, &intnum, search_flags)) < 0) - return ret; - *out_val = num*intnum/den; - return 0; -} - -int av_opt_get_q(void *obj, const char *name, int search_flags, AVRational *out_val) -{ - int64_t intnum = 1; - double num = 1; - int ret, den = 1; - - if ((ret = get_number(obj, name, NULL, &num, &den, &intnum, search_flags)) < 0) - return ret; - - if (num == 1.0 && (int)intnum == intnum) - *out_val = (AVRational){intnum, den}; - else - *out_val = av_d2q(num*intnum/den, 1<<24); - return 0; -} - -static int get_format(void *obj, const char *name, int search_flags, int *out_fmt, - enum AVOptionType type, const char *desc) -{ - void *dst, *target_obj; - const AVOption *o = av_opt_find2(obj, name, NULL, 0, search_flags, &target_obj); - if (!o || !target_obj) - return AVERROR_OPTION_NOT_FOUND; - if (o->type != type) { - av_log(obj, AV_LOG_ERROR, - "The value for option '%s' is not a %s format.\n", desc, name); - return AVERROR(EINVAL); - } - - dst = ((uint8_t*)target_obj) + o->offset; - *out_fmt = *(int *)dst; - return 0; -} - -int av_opt_get_sample_fmt(void *obj, const char *name, int search_flags, enum AVSampleFormat *out_fmt) -{ - return get_format(obj, name, search_flags, out_fmt, AV_OPT_TYPE_SAMPLE_FMT, "sample"); -} - -int av_opt_get_channel_layout(void *obj, const char *name, int search_flags, int64_t *cl) -{ - void *dst, *target_obj; - const AVOption *o = av_opt_find2(obj, name, NULL, 0, search_flags, &target_obj); - if (!o || !target_obj) - return AVERROR_OPTION_NOT_FOUND; - if (o->type != AV_OPT_TYPE_CHANNEL_LAYOUT) { - av_log(obj, AV_LOG_ERROR, - "The value for option '%s' is not a channel layout.\n", name); - return AVERROR(EINVAL); - } - - dst = ((uint8_t*)target_obj) + o->offset; - *cl = *(int64_t *)dst; - return 0; -} - -int av_opt_get_dict_val(void *obj, const char *name, int search_flags, AVDictionary **out_val) -{ - void *target_obj; - AVDictionary *src; - const AVOption *o = av_opt_find2(obj, name, NULL, 0, search_flags, &target_obj); - - if (!o || !target_obj) - return AVERROR_OPTION_NOT_FOUND; - if (o->type != AV_OPT_TYPE_DICT) - return AVERROR(EINVAL); - - src = *(AVDictionary **)(((uint8_t *)target_obj) + o->offset); - av_dict_copy(out_val, src, 0); - - return 0; -} - -int av_opt_flag_is_set(void *obj, const char *field_name, const char *flag_name) -{ - const AVOption *field = av_opt_find(obj, field_name, NULL, 0, 0); - const AVOption *flag = av_opt_find(obj, flag_name, - field ? field->unit : NULL, 0, 0); - int64_t res; - - if (!field || !flag || flag->type != AV_OPT_TYPE_CONST || - av_opt_get_int(obj, field_name, 0, &res) < 0) - return 0; - return res & flag->default_val.i64; -} - -static void log_value(void *av_log_obj, int level, double d) -{ - if (d == INT_MAX) { - av_log(av_log_obj, level, "INT_MAX"); - } else if (d == INT_MIN) { - av_log(av_log_obj, level, "INT_MIN"); - } else if (d == UINT32_MAX) { - av_log(av_log_obj, level, "UINT32_MAX"); - } else if (d == (double)INT64_MAX) { - av_log(av_log_obj, level, "I64_MAX"); - } else if (d == INT64_MIN) { - av_log(av_log_obj, level, "I64_MIN"); - } else if (d == FLT_MAX) { - av_log(av_log_obj, level, "FLT_MAX"); - } else if (d == FLT_MIN) { - av_log(av_log_obj, level, "FLT_MIN"); - } else if (d == -FLT_MAX) { - av_log(av_log_obj, level, "-FLT_MAX"); - } else if (d == -FLT_MIN) { - av_log(av_log_obj, level, "-FLT_MIN"); - } else if (d == DBL_MAX) { - av_log(av_log_obj, level, "DBL_MAX"); - } else if (d == DBL_MIN) { - av_log(av_log_obj, level, "DBL_MIN"); - } else if (d == -DBL_MAX) { - av_log(av_log_obj, level, "-DBL_MAX"); - } else if (d == -DBL_MIN) { - av_log(av_log_obj, level, "-DBL_MIN"); - } else { - av_log(av_log_obj, level, "%g", d); - } -} - -static const char *get_opt_const_name(void *obj, const char *unit, int64_t value) -{ - const AVOption *opt = NULL; - - if (!unit) - return NULL; - while ((opt = av_opt_next(obj, opt))) - if (opt->type == AV_OPT_TYPE_CONST && !strcmp(opt->unit, unit) && - opt->default_val.i64 == value) - return opt->name; - return NULL; -} - -static char *get_opt_flags_string(void *obj, const char *unit, int64_t value) -{ - const AVOption *opt = NULL; - char flags[512]; - - flags[0] = 0; - if (!unit) - return NULL; - while ((opt = av_opt_next(obj, opt))) { - if (opt->type == AV_OPT_TYPE_CONST && !strcmp(opt->unit, unit) && - opt->default_val.i64 & value) { - if (flags[0]) - av_strlcatf(flags, sizeof(flags), "+"); - av_strlcatf(flags, sizeof(flags), "%s", opt->name); - } - } - if (flags[0]) - return av_strdup(flags); - return NULL; -} - -void av_opt_set_defaults(void *s) -{ - av_opt_set_defaults2(s, 0, 0); -} - -void av_opt_set_defaults2(void *s, int mask, int flags) -{ - const AVOption *opt = NULL; - while ((opt = av_opt_next(s, opt))) { - void *dst = ((uint8_t*)s) + opt->offset; - - if ((opt->flags & mask) != flags) - continue; - - if (opt->flags & AV_OPT_FLAG_READONLY) - continue; - - switch (opt->type) { - case AV_OPT_TYPE_CONST: - /* Nothing to be done here */ - break; - case AV_OPT_TYPE_BOOL: - case AV_OPT_TYPE_FLAGS: - case AV_OPT_TYPE_INT: - case AV_OPT_TYPE_INT64: - case AV_OPT_TYPE_DURATION: - case AV_OPT_TYPE_CHANNEL_LAYOUT: - case AV_OPT_TYPE_PIXEL_FMT: - case AV_OPT_TYPE_SAMPLE_FMT: - write_number(s, opt, dst, 1, 1, opt->default_val.i64); - break; - case AV_OPT_TYPE_DOUBLE: - case AV_OPT_TYPE_FLOAT: { - double val; - val = opt->default_val.dbl; - write_number(s, opt, dst, val, 1, 1); - } - break; - case AV_OPT_TYPE_RATIONAL: { - AVRational val; - val = av_d2q(opt->default_val.dbl, INT_MAX); - write_number(s, opt, dst, 1, val.den, val.num); - } - break; - case AV_OPT_TYPE_STRING: - set_string(s, opt, opt->default_val.str, dst); - break; - case AV_OPT_TYPE_BINARY: - set_string_binary(s, opt, opt->default_val.str, dst); - break; - case AV_OPT_TYPE_DICT: - /* Cannot set defaults for these types */ - break; - default: - av_log(s, AV_LOG_DEBUG, "AVOption type %d of option %s not implemented yet\n", opt->type, opt->name); - } - } -} - -/** - * Store the value in the field in ctx that is named like key. - * ctx must be an AVClass context, storing is done using AVOptions. - * - * @param buf the string to parse, buf will be updated to point at the - * separator just after the parsed key/value pair - * @param key_val_sep a 0-terminated list of characters used to - * separate key from value - * @param pairs_sep a 0-terminated list of characters used to separate - * two pairs from each other - * @return 0 if the key/value pair has been successfully parsed and - * set, or a negative value corresponding to an AVERROR code in case - * of error: - * AVERROR(EINVAL) if the key/value pair cannot be parsed, - * the error code issued by av_opt_set() if the key/value pair - * cannot be set - */ -static int parse_key_value_pair(void *ctx, const char **buf, - const char *key_val_sep, const char *pairs_sep) -{ - char *key = av_get_token(buf, key_val_sep); - char *val; - int ret; - - if (!key) - return AVERROR(ENOMEM); - - if (*key && strspn(*buf, key_val_sep)) { - (*buf)++; - val = av_get_token(buf, pairs_sep); - if (!val) { - av_freep(&key); - return AVERROR(ENOMEM); - } - } else { - av_log(ctx, AV_LOG_ERROR, "Missing key or no key/value separator found after key '%s'\n", key); - av_free(key); - return AVERROR(EINVAL); - } - - av_log(ctx, AV_LOG_DEBUG, "Setting entry with key '%s' to value '%s'\n", key, val); - - ret = av_opt_set(ctx, key, val, AV_OPT_SEARCH_CHILDREN); - if (ret == AVERROR_OPTION_NOT_FOUND) - av_log(ctx, AV_LOG_ERROR, "Key '%s' not found.\n", key); - - av_free(key); - av_free(val); - return ret; -} - -#define WHITESPACES " \n\t" - -static int is_key_char(char c) -{ - return (unsigned)((c | 32) - 'a') < 26 || - (unsigned)(c - '0') < 10 || - c == '-' || c == '_' || c == '/' || c == '.'; -} - -/** - * Read a key from a string. - * - * The key consists of is_key_char characters and must be terminated by a - * character from the delim string; spaces are ignored. - * - * @return 0 for success (even with ellipsis), <0 for failure - */ -static int get_key(const char **ropts, const char *delim, char **rkey) -{ - const char *opts = *ropts; - const char *key_start, *key_end; - - key_start = opts += strspn(opts, WHITESPACES); - while (is_key_char(*opts)) - opts++; - key_end = opts; - opts += strspn(opts, WHITESPACES); - if (!*opts || !strchr(delim, *opts)) - return AVERROR(EINVAL); - opts++; - if (!(*rkey = av_malloc(key_end - key_start + 1))) - return AVERROR(ENOMEM); - memcpy(*rkey, key_start, key_end - key_start); - (*rkey)[key_end - key_start] = 0; - *ropts = opts; - return 0; -} - -int av_opt_get_key_value(const char **ropts, - const char *key_val_sep, const char *pairs_sep, - unsigned flags, - char **rkey, char **rval) -{ - int ret; - char *key = NULL, *val; - const char *opts = *ropts; - - if ((ret = get_key(&opts, key_val_sep, &key)) < 0 && - !(flags & AV_OPT_FLAG_IMPLICIT_KEY)) - return AVERROR(EINVAL); - if (!(val = av_get_token(&opts, pairs_sep))) { - av_free(key); - return AVERROR(ENOMEM); - } - *ropts = opts; - *rkey = key; - *rval = val; - return 0; -} - -void av_opt_free(void *obj) -{ - const AVOption *o = NULL; - while ((o = av_opt_next(obj, o))) { - switch (o->type) { - case AV_OPT_TYPE_STRING: - case AV_OPT_TYPE_BINARY: - av_freep((uint8_t *)obj + o->offset); - break; - - case AV_OPT_TYPE_DICT: - av_dict_free((AVDictionary **)(((uint8_t *)obj) + o->offset)); - break; - - default: - break; - } - } -} - -const AVOption *av_opt_find(void *obj, const char *name, const char *unit, - int opt_flags, int search_flags) -{ - return av_opt_find2(obj, name, unit, opt_flags, search_flags, NULL); -} - -const AVOption *av_opt_find2(void *obj, const char *name, const char *unit, - int opt_flags, int search_flags, void **target_obj) -{ - const AVClass *c; - const AVOption *o = NULL; - - if(!obj) - return NULL; - - c= *(AVClass**)obj; - - if (!c) - return NULL; - - if (search_flags & AV_OPT_SEARCH_CHILDREN) { - if (search_flags & AV_OPT_SEARCH_FAKE_OBJ) { - const AVClass *child = NULL; - while (child = av_opt_child_class_next(c, child)) - if (o = av_opt_find2(&child, name, unit, opt_flags, search_flags, NULL)) - return o; - } else { - void *child = NULL; - while (child = av_opt_child_next(obj, child)) - if (o = av_opt_find2(child, name, unit, opt_flags, search_flags, target_obj)) - return o; - } - } - - while (o = av_opt_next(obj, o)) { - if (!strcmp(o->name, name) && (o->flags & opt_flags) == opt_flags && - ((!unit && o->type != AV_OPT_TYPE_CONST) || - (unit && o->type == AV_OPT_TYPE_CONST && o->unit && !strcmp(o->unit, unit)))) { - if (target_obj) { - if (!(search_flags & AV_OPT_SEARCH_FAKE_OBJ)) - *target_obj = obj; - else - *target_obj = NULL; - } - return o; - } - } - return NULL; -} - -void *av_opt_child_next(void *obj, void *prev) -{ - const AVClass *c = *(AVClass**)obj; - if (c->child_next) - return c->child_next(obj, prev); - return NULL; -} - -const AVClass *av_opt_child_class_next(const AVClass *parent, const AVClass *prev) -{ - if (parent->child_class_next) - return parent->child_class_next(prev); - return NULL; -} - -void *av_opt_ptr(const AVClass *class, void *obj, const char *name) -{ - const AVOption *opt= av_opt_find2(&class, name, NULL, 0, AV_OPT_SEARCH_FAKE_OBJ, NULL); - if(!opt) - return NULL; - return (uint8_t*)obj + opt->offset; -} - -static int opt_size(enum AVOptionType type) -{ - switch(type) { - case AV_OPT_TYPE_BOOL: - case AV_OPT_TYPE_INT: - case AV_OPT_TYPE_FLAGS: return sizeof(int); - case AV_OPT_TYPE_DURATION: - case AV_OPT_TYPE_CHANNEL_LAYOUT: - case AV_OPT_TYPE_INT64: return sizeof(int64_t); - case AV_OPT_TYPE_DOUBLE: return sizeof(double); - case AV_OPT_TYPE_FLOAT: return sizeof(float); - case AV_OPT_TYPE_STRING: return sizeof(uint8_t*); - case AV_OPT_TYPE_VIDEO_RATE: - case AV_OPT_TYPE_RATIONAL: return sizeof(AVRational); - case AV_OPT_TYPE_BINARY: return sizeof(uint8_t*) + sizeof(int); - case AV_OPT_TYPE_IMAGE_SIZE:return sizeof(int[2]); - case AV_OPT_TYPE_PIXEL_FMT: return sizeof(enum AVPixelFormat); - case AV_OPT_TYPE_SAMPLE_FMT:return sizeof(enum AVSampleFormat); - case AV_OPT_TYPE_COLOR: return 4; - } - return 0; -} - -int av_opt_copy(void *dst, const void *src) -{ - const AVOption *o = NULL; - const AVClass *c; - int ret = 0; - - if (!src) - return 0; - - c = *(AVClass**)src; - if (*(AVClass**)dst && c != *(AVClass**)dst) - return AVERROR(EINVAL); - - while ((o = av_opt_next(src, o))) { - void *field_dst = ((uint8_t*)dst) + o->offset; - void *field_src = ((uint8_t*)src) + o->offset; - uint8_t **field_dst8 = (uint8_t**)field_dst; - uint8_t **field_src8 = (uint8_t**)field_src; - - if (o->type == AV_OPT_TYPE_STRING) { - if (*field_dst8 != *field_src8) - av_freep(field_dst8); - *field_dst8 = av_strdup(*field_src8); - if (*field_src8 && !*field_dst8) - ret = AVERROR(ENOMEM); - } else if (o->type == AV_OPT_TYPE_BINARY) { - int len = *(int*)(field_src8 + 1); - if (*field_dst8 != *field_src8) - av_freep(field_dst8); - *field_dst8 = av_memdup(*field_src8, len); - if (len && !*field_dst8) { - ret = AVERROR(ENOMEM); - len = 0; - } - *(int*)(field_dst8 + 1) = len; - } else if (o->type == AV_OPT_TYPE_CONST) { - // do nothing - } else if (o->type == AV_OPT_TYPE_DICT) { - AVDictionary **sdict = (AVDictionary **) field_src; - AVDictionary **ddict = (AVDictionary **) field_dst; - if (*sdict != *ddict) - av_dict_free(ddict); - *ddict = NULL; - av_dict_copy(ddict, *sdict, 0); - if (av_dict_count(*sdict) != av_dict_count(*ddict)) - ret = AVERROR(ENOMEM); - } else { - memcpy(field_dst, field_src, opt_size(o->type)); - } - } - return ret; -} - -int av_opt_query_ranges(AVOptionRanges **ranges_arg, void *obj, const char *key, int flags) -{ - int ret; - const AVClass *c = *(AVClass**)obj; - int (*callback)(AVOptionRanges **, void *obj, const char *key, int flags) = NULL; - - if (c->version > (52 << 16 | 11 << 8)) - callback = c->query_ranges; - - if (!callback) - callback = av_opt_query_ranges_default; - - ret = callback(ranges_arg, obj, key, flags); - if (ret >= 0) { - if (!(flags & AV_OPT_MULTI_COMPONENT_RANGE)) - ret = 1; - (*ranges_arg)->nb_components = ret; - } - return ret; -} - -int av_opt_query_ranges_default(AVOptionRanges **ranges_arg, void *obj, const char *key, int flags) -{ - AVOptionRanges *ranges = av_mallocz(sizeof(*ranges)); - AVOptionRange **range_array = av_mallocz(sizeof(void*)); - AVOptionRange *range = av_mallocz(sizeof(*range)); - const AVOption *field = av_opt_find(obj, key, NULL, 0, flags); - int ret; - - *ranges_arg = NULL; - - if (!ranges || !range || !range_array || !field) { - ret = AVERROR(ENOMEM); - goto fail; - } - - ranges->range = range_array; - ranges->range[0] = range; - ranges->nb_ranges = 1; - ranges->nb_components = 1; - range->is_range = 1; - range->value_min = field->min; - range->value_max = field->max; - - switch (field->type) { - case AV_OPT_TYPE_BOOL: - case AV_OPT_TYPE_INT: - case AV_OPT_TYPE_INT64: - case AV_OPT_TYPE_PIXEL_FMT: - case AV_OPT_TYPE_SAMPLE_FMT: - case AV_OPT_TYPE_FLOAT: - case AV_OPT_TYPE_DOUBLE: - case AV_OPT_TYPE_DURATION: - case AV_OPT_TYPE_COLOR: - case AV_OPT_TYPE_CHANNEL_LAYOUT: - break; - case AV_OPT_TYPE_STRING: - range->component_min = 0; - range->component_max = 0x10FFFF; // max unicode value - range->value_min = -1; - range->value_max = INT_MAX; - break; - case AV_OPT_TYPE_RATIONAL: - range->component_min = INT_MIN; - range->component_max = INT_MAX; - break; - case AV_OPT_TYPE_IMAGE_SIZE: - range->component_min = 0; - range->component_max = INT_MAX/128/8; - range->value_min = 0; - range->value_max = INT_MAX/8; - break; - case AV_OPT_TYPE_VIDEO_RATE: - range->component_min = 1; - range->component_max = INT_MAX; - range->value_min = 1; - range->value_max = INT_MAX; - break; - default: - ret = AVERROR(ENOSYS); - goto fail; - } - - *ranges_arg = ranges; - return 1; -fail: - av_free(ranges); - av_free(range); - av_free(range_array); - return ret; -} - -void av_opt_freep_ranges(AVOptionRanges **rangesp) -{ - int i; - AVOptionRanges *ranges = *rangesp; - - if (!ranges) - return; - - for (i = 0; i < ranges->nb_ranges * ranges->nb_components; i++) { - AVOptionRange *range = ranges->range[i]; - if (range) { - av_freep(&range->str); - av_freep(&ranges->range[i]); - } - } - av_freep(&ranges->range); - av_freep(rangesp); -} - -int av_opt_is_set_to_default(void *obj, const AVOption *o) -{ - int64_t i64; - double d, d2; - float f; - AVRational q; - int ret; - char *str; - void *dst; - - if (!o || !obj) - return AVERROR(EINVAL); - - dst = ((uint8_t*)obj) + o->offset; - - switch (o->type) { - case AV_OPT_TYPE_CONST: - return 1; - case AV_OPT_TYPE_BOOL: - case AV_OPT_TYPE_FLAGS: - case AV_OPT_TYPE_SAMPLE_FMT: - case AV_OPT_TYPE_INT: - case AV_OPT_TYPE_CHANNEL_LAYOUT: - case AV_OPT_TYPE_DURATION: - case AV_OPT_TYPE_INT64: - read_number(o, dst, NULL, NULL, &i64); - return o->default_val.i64 == i64; - case AV_OPT_TYPE_STRING: - str = *(char **)dst; - if (str == o->default_val.str) //2 NULLs - return 1; - if (!str || !o->default_val.str) //1 NULL - return 0; - return !strcmp(str, o->default_val.str); - case AV_OPT_TYPE_DOUBLE: - read_number(o, dst, &d, NULL, NULL); - return o->default_val.dbl == d; - case AV_OPT_TYPE_FLOAT: - read_number(o, dst, &d, NULL, NULL); - f = o->default_val.dbl; - d2 = f; - return d2 == d; - case AV_OPT_TYPE_RATIONAL: - q = av_d2q(o->default_val.dbl, INT_MAX); - return !av_cmp_q(*(AVRational*)dst, q); - case AV_OPT_TYPE_BINARY: { - struct { - uint8_t *data; - int size; - } tmp = {0}; - int opt_size = *(int *)((void **)dst + 1); - void *opt_ptr = *(void **)dst; - if (!opt_size && (!o->default_val.str || !strlen(o->default_val.str))) - return 1; - if (!opt_size || !o->default_val.str || !strlen(o->default_val.str )) - return 0; - if (opt_size != strlen(o->default_val.str) / 2) - return 0; - ret = set_string_binary(NULL, NULL, o->default_val.str, &tmp.data); - if (!ret) - ret = !memcmp(opt_ptr, tmp.data, tmp.size); - av_free(tmp.data); - return ret; - } - case AV_OPT_TYPE_DICT: - /* Binary and dict have not default support yet. Any pointer is not default. */ - return !!(*(void **)dst); - - default: - av_log(obj, AV_LOG_WARNING, "Not supported option type: %d, option name: %s\n", o->type, o->name); - break; - } - return AVERROR_PATCHWELCOME; -} - -int av_opt_is_set_to_default_by_name(void *obj, const char *name, int search_flags) -{ - const AVOption *o; - void *target; - if (!obj) - return AVERROR(EINVAL); - o = av_opt_find2(obj, name, NULL, 0, search_flags, &target); - if (!o) - return AVERROR_OPTION_NOT_FOUND; - return av_opt_is_set_to_default(target, o); -} diff --git a/ext/at3_standalone/opt.h b/ext/at3_standalone/opt.h deleted file mode 100644 index bba9b0ec35..0000000000 --- a/ext/at3_standalone/opt.h +++ /dev/null @@ -1,818 +0,0 @@ -/* - * AVOptions - * copyright (c) 2005 Michael Niedermayer - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef AVUTIL_OPT_H -#define AVUTIL_OPT_H - -/** - * @file - * AVOptions - */ - -#include "rational.h" -#include "avutil.h" -#include "dict.h" -#include "log.h" -#include "samplefmt.h" -#include "version.h" - -/** - * @defgroup avoptions AVOptions - * @ingroup lavu_data - * @{ - * AVOptions provide a generic system to declare options on arbitrary structs - * ("objects"). An option can have a help text, a type and a range of possible - * values. Options may then be enumerated, read and written to. - * - * @section avoptions_implement Implementing AVOptions - * This section describes how to add AVOptions capabilities to a struct. - * - * All AVOptions-related information is stored in an AVClass. Therefore - * the first member of the struct should be a pointer to an AVClass describing it. - * The option field of the AVClass must be set to a NULL-terminated static array - * of AVOptions. Each AVOption must have a non-empty name, a type, a default - * value and for number-type AVOptions also a range of allowed values. It must - * also declare an offset in bytes from the start of the struct, where the field - * associated with this AVOption is located. Other fields in the AVOption struct - * should also be set when applicable, but are not required. - * - * The following example illustrates an AVOptions-enabled struct: - * @code - * typedef struct test_struct { - * AVClass *class; - * int int_opt; - * char *str_opt; - * uint8_t *bin_opt; - * int bin_len; - * } test_struct; - * - * static const AVOption test_options[] = { - * { "test_int", "This is a test option of int type.", offsetof(test_struct, int_opt), - * AV_OPT_TYPE_INT, { .i64 = -1 }, INT_MIN, INT_MAX }, - * { "test_str", "This is a test option of string type.", offsetof(test_struct, str_opt), - * AV_OPT_TYPE_STRING }, - * { "test_bin", "This is a test option of binary type.", offsetof(test_struct, bin_opt), - * AV_OPT_TYPE_BINARY }, - * { NULL }, - * }; - * - * static const AVClass test_class = { - * .class_name = "test class", - * .item_name = av_default_item_name, - * .option = test_options, - * .version = LIBAVUTIL_VERSION_INT, - * }; - * @endcode - * - * Next, when allocating your struct, you must ensure that the AVClass pointer - * is set to the correct value. Then, av_opt_set_defaults() can be called to - * initialize defaults. After that the struct is ready to be used with the - * AVOptions API. - * - * When cleaning up, you may use the av_opt_free() function to automatically - * free all the allocated string and binary options. - * - * Continuing with the above example: - * - * @code - * test_struct *alloc_test_struct(void) - * { - * test_struct *ret = av_malloc(sizeof(*ret)); - * ret->class = &test_class; - * av_opt_set_defaults(ret); - * return ret; - * } - * void free_test_struct(test_struct **foo) - * { - * av_opt_free(*foo); - * av_freep(foo); - * } - * @endcode - * - * @subsection avoptions_implement_nesting Nesting - * It may happen that an AVOptions-enabled struct contains another - * AVOptions-enabled struct as a member (e.g. AVCodecContext in - * libavcodec exports generic options, while its priv_data field exports - * codec-specific options). In such a case, it is possible to set up the - * parent struct to export a child's options. To do that, simply - * implement AVClass.child_next() and AVClass.child_class_next() in the - * parent struct's AVClass. - * Assuming that the test_struct from above now also contains a - * child_struct field: - * - * @code - * typedef struct child_struct { - * AVClass *class; - * int flags_opt; - * } child_struct; - * static const AVOption child_opts[] = { - * { "test_flags", "This is a test option of flags type.", - * offsetof(child_struct, flags_opt), AV_OPT_TYPE_FLAGS, { .i64 = 0 }, INT_MIN, INT_MAX }, - * { NULL }, - * }; - * static const AVClass child_class = { - * .class_name = "child class", - * .item_name = av_default_item_name, - * .option = child_opts, - * .version = LIBAVUTIL_VERSION_INT, - * }; - * - * void *child_next(void *obj, void *prev) - * { - * test_struct *t = obj; - * if (!prev && t->child_struct) - * return t->child_struct; - * return NULL - * } - * const AVClass child_class_next(const AVClass *prev) - * { - * return prev ? NULL : &child_class; - * } - * @endcode - * Putting child_next() and child_class_next() as defined above into - * test_class will now make child_struct's options accessible through - * test_struct (again, proper setup as described above needs to be done on - * child_struct right after it is created). - * - * From the above example it might not be clear why both child_next() - * and child_class_next() are needed. The distinction is that child_next() - * iterates over actually existing objects, while child_class_next() - * iterates over all possible child classes. E.g. if an AVCodecContext - * was initialized to use a codec which has private options, then its - * child_next() will return AVCodecContext.priv_data and finish - * iterating. OTOH child_class_next() on AVCodecContext.av_class will - * iterate over all available codecs with private options. - * - * @subsection avoptions_implement_named_constants Named constants - * It is possible to create named constants for options. Simply set the unit - * field of the option the constants should apply to a string and - * create the constants themselves as options of type AV_OPT_TYPE_CONST - * with their unit field set to the same string. - * Their default_val field should contain the value of the named - * constant. - * For example, to add some named constants for the test_flags option - * above, put the following into the child_opts array: - * @code - * { "test_flags", "This is a test option of flags type.", - * offsetof(child_struct, flags_opt), AV_OPT_TYPE_FLAGS, { .i64 = 0 }, INT_MIN, INT_MAX, "test_unit" }, - * { "flag1", "This is a flag with value 16", 0, AV_OPT_TYPE_CONST, { .i64 = 16 }, 0, 0, "test_unit" }, - * @endcode - * - * @section avoptions_use Using AVOptions - * This section deals with accessing options in an AVOptions-enabled struct. - * Such structs in FFmpeg are e.g. AVCodecContext in libavcodec or - * AVFormatContext in libavformat. - * - * @subsection avoptions_use_examine Examining AVOptions - * The basic functions for examining options are av_opt_next(), which iterates - * over all options defined for one object, and av_opt_find(), which searches - * for an option with the given name. - * - * The situation is more complicated with nesting. An AVOptions-enabled struct - * may have AVOptions-enabled children. Passing the AV_OPT_SEARCH_CHILDREN flag - * to av_opt_find() will make the function search children recursively. - * - * For enumerating there are basically two cases. The first is when you want to - * get all options that may potentially exist on the struct and its children - * (e.g. when constructing documentation). In that case you should call - * av_opt_child_class_next() recursively on the parent struct's AVClass. The - * second case is when you have an already initialized struct with all its - * children and you want to get all options that can be actually written or read - * from it. In that case you should call av_opt_child_next() recursively (and - * av_opt_next() on each result). - * - * @subsection avoptions_use_get_set Reading and writing AVOptions - * When setting options, you often have a string read directly from the - * user. In such a case, simply passing it to av_opt_set() is enough. For - * non-string type options, av_opt_set() will parse the string according to the - * option type. - * - * Similarly av_opt_get() will read any option type and convert it to a string - * which will be returned. Do not forget that the string is allocated, so you - * have to free it with av_free(). - * - * In some cases it may be more convenient to put all options into an - * AVDictionary and call av_opt_set_dict() on it. A specific case of this - * are the format/codec open functions in lavf/lavc which take a dictionary - * filled with option as a parameter. This makes it possible to set some options - * that cannot be set otherwise, since e.g. the input file format is not known - * before the file is actually opened. - */ - -enum AVOptionType{ - AV_OPT_TYPE_FLAGS, - AV_OPT_TYPE_INT, - AV_OPT_TYPE_INT64, - AV_OPT_TYPE_DOUBLE, - AV_OPT_TYPE_FLOAT, - AV_OPT_TYPE_STRING, - AV_OPT_TYPE_RATIONAL, - AV_OPT_TYPE_BINARY, ///< offset must point to a pointer immediately followed by an int for the length - AV_OPT_TYPE_DICT, - AV_OPT_TYPE_CONST = 128, - AV_OPT_TYPE_IMAGE_SIZE = MKBETAG('S','I','Z','E'), ///< offset must point to two consecutive integers - AV_OPT_TYPE_PIXEL_FMT = MKBETAG('P','F','M','T'), - AV_OPT_TYPE_SAMPLE_FMT = MKBETAG('S','F','M','T'), - AV_OPT_TYPE_VIDEO_RATE = MKBETAG('V','R','A','T'), ///< offset must point to AVRational - AV_OPT_TYPE_DURATION = MKBETAG('D','U','R',' '), - AV_OPT_TYPE_COLOR = MKBETAG('C','O','L','R'), - AV_OPT_TYPE_CHANNEL_LAYOUT = MKBETAG('C','H','L','A'), - AV_OPT_TYPE_BOOL = MKBETAG('B','O','O','L'), -}; - -/** - * AVOption - */ -typedef struct AVOption { - const char *name; - - /** - * short English help text - * @todo What about other languages? - */ - const char *help; - - /** - * The offset relative to the context structure where the option - * value is stored. It should be 0 for named constants. - */ - int offset; - enum AVOptionType type; - - /** - * the default value for scalar options - */ - union { - int64_t i64; - double dbl; - const char *str; - /* TODO those are unused now */ - AVRational q; - } default_val; - double min; ///< minimum valid value for the option - double max; ///< maximum valid value for the option - - int flags; -#define AV_OPT_FLAG_ENCODING_PARAM 1 ///< a generic parameter which can be set by the user for muxing or encoding -#define AV_OPT_FLAG_DECODING_PARAM 2 ///< a generic parameter which can be set by the user for demuxing or decoding -#if FF_API_OPT_TYPE_METADATA -#define AV_OPT_FLAG_METADATA 4 ///< some data extracted or inserted into the file like title, comment, ... -#endif -#define AV_OPT_FLAG_AUDIO_PARAM 8 -/** - * The option is inteded for exporting values to the caller. - */ -#define AV_OPT_FLAG_EXPORT 64 -/** - * The option may not be set through the AVOptions API, only read. - * This flag only makes sense when AV_OPT_FLAG_EXPORT is also set. - */ -#define AV_OPT_FLAG_READONLY 128 -#define AV_OPT_FLAG_FILTERING_PARAM (1<<16) ///< a generic parameter which can be set by the user for filtering -//FIXME think about enc-audio, ... style flags - - /** - * The logical unit to which the option belongs. Non-constant - * options and corresponding named constants share the same - * unit. May be NULL. - */ - const char *unit; -} AVOption; - -/** - * A single allowed range of values, or a single allowed value. - */ -typedef struct AVOptionRange { - const char *str; - /** - * Value range. - * For string ranges this represents the min/max length. - * For dimensions this represents the min/max pixel count or width/height in multi-component case. - */ - double value_min, value_max; - /** - * Value's component range. - * For string this represents the unicode range for chars, 0-127 limits to ASCII. - */ - double component_min, component_max; - /** - * Range flag. - * If set to 1 the struct encodes a range, if set to 0 a single value. - */ - int is_range; -} AVOptionRange; - -/** - * List of AVOptionRange structs. - */ -typedef struct AVOptionRanges { - /** - * Array of option ranges. - * - * Most of option types use just one component. - * Following describes multi-component option types: - * - * AV_OPT_TYPE_IMAGE_SIZE: - * component index 0: range of pixel count (width * height). - * component index 1: range of width. - * component index 2: range of height. - * - * @note To obtain multi-component version of this structure, user must - * provide AV_OPT_MULTI_COMPONENT_RANGE to av_opt_query_ranges or - * av_opt_query_ranges_default function. - * - * Multi-component range can be read as in following example: - * - * @code - * int range_index, component_index; - * AVOptionRanges *ranges; - * AVOptionRange *range[3]; //may require more than 3 in the future. - * av_opt_query_ranges(&ranges, obj, key, AV_OPT_MULTI_COMPONENT_RANGE); - * for (range_index = 0; range_index < ranges->nb_ranges; range_index++) { - * for (component_index = 0; component_index < ranges->nb_components; component_index++) - * range[component_index] = ranges->range[ranges->nb_ranges * component_index + range_index]; - * //do something with range here. - * } - * av_opt_freep_ranges(&ranges); - * @endcode - */ - AVOptionRange **range; - /** - * Number of ranges per component. - */ - int nb_ranges; - /** - * Number of componentes. - */ - int nb_components; -} AVOptionRanges; - -/** - * Show the obj options. - * - * @param req_flags requested flags for the options to show. Show only the - * options for which it is opt->flags & req_flags. - * @param rej_flags rejected flags for the options to show. Show only the - * options for which it is !(opt->flags & req_flags). - * @param av_log_obj log context to use for showing the options - */ -int av_opt_show2(void *obj, void *av_log_obj, int req_flags, int rej_flags); - -/** - * Set the values of all AVOption fields to their default values. - * - * @param s an AVOption-enabled struct (its first member must be a pointer to AVClass) - */ -void av_opt_set_defaults(void *s); - -/** - * Set the values of all AVOption fields to their default values. Only these - * AVOption fields for which (opt->flags & mask) == flags will have their - * default applied to s. - * - * @param s an AVOption-enabled struct (its first member must be a pointer to AVClass) - * @param mask combination of AV_OPT_FLAG_* - * @param flags combination of AV_OPT_FLAG_* - */ -void av_opt_set_defaults2(void *s, int mask, int flags); - -/** - * Parse the key/value pairs list in opts. For each key/value pair - * found, stores the value in the field in ctx that is named like the - * key. ctx must be an AVClass context, storing is done using - * AVOptions. - * - * @param opts options string to parse, may be NULL - * @param key_val_sep a 0-terminated list of characters used to - * separate key from value - * @param pairs_sep a 0-terminated list of characters used to separate - * two pairs from each other - * @return the number of successfully set key/value pairs, or a negative - * value corresponding to an AVERROR code in case of error: - * AVERROR(EINVAL) if opts cannot be parsed, - * the error code issued by av_opt_set() if a key/value pair - * cannot be set - */ -int av_set_options_string(void *ctx, const char *opts, - const char *key_val_sep, const char *pairs_sep); - -/** - * Parse the key-value pairs list in opts. For each key=value pair found, - * set the value of the corresponding option in ctx. - * - * @param ctx the AVClass object to set options on - * @param opts the options string, key-value pairs separated by a - * delimiter - * @param shorthand a NULL-terminated array of options names for shorthand - * notation: if the first field in opts has no key part, - * the key is taken from the first element of shorthand; - * then again for the second, etc., until either opts is - * finished, shorthand is finished or a named option is - * found; after that, all options must be named - * @param key_val_sep a 0-terminated list of characters used to separate - * key from value, for example '=' - * @param pairs_sep a 0-terminated list of characters used to separate - * two pairs from each other, for example ':' or ',' - * @return the number of successfully set key=value pairs, or a negative - * value corresponding to an AVERROR code in case of error: - * AVERROR(EINVAL) if opts cannot be parsed, - * the error code issued by av_set_string3() if a key/value pair - * cannot be set - * - * Options names must use only the following characters: a-z A-Z 0-9 - . / _ - * Separators must use characters distinct from option names and from each - * other. - */ -int av_opt_set_from_string(void *ctx, const char *opts, - const char *const *shorthand, - const char *key_val_sep, const char *pairs_sep); -/** - * Free all allocated objects in obj. - */ -void av_opt_free(void *obj); - -/** - * Check whether a particular flag is set in a flags field. - * - * @param field_name the name of the flag field option - * @param flag_name the name of the flag to check - * @return non-zero if the flag is set, zero if the flag isn't set, - * isn't of the right type, or the flags field doesn't exist. - */ -int av_opt_flag_is_set(void *obj, const char *field_name, const char *flag_name); - -/** - * Set all the options from a given dictionary on an object. - * - * @param obj a struct whose first element is a pointer to AVClass - * @param options options to process. This dictionary will be freed and replaced - * by a new one containing all options not found in obj. - * Of course this new dictionary needs to be freed by caller - * with av_dict_free(). - * - * @return 0 on success, a negative AVERROR if some option was found in obj, - * but could not be set. - * - * @see av_dict_copy() - */ -int av_opt_set_dict(void *obj, struct AVDictionary **options); - - -/** - * Set all the options from a given dictionary on an object. - * - * @param obj a struct whose first element is a pointer to AVClass - * @param options options to process. This dictionary will be freed and replaced - * by a new one containing all options not found in obj. - * Of course this new dictionary needs to be freed by caller - * with av_dict_free(). - * @param search_flags A combination of AV_OPT_SEARCH_*. - * - * @return 0 on success, a negative AVERROR if some option was found in obj, - * but could not be set. - * - * @see av_dict_copy() - */ -int av_opt_set_dict2(void *obj, struct AVDictionary **options, int search_flags); - -/** - * Extract a key-value pair from the beginning of a string. - * - * @param ropts pointer to the options string, will be updated to - * point to the rest of the string (one of the pairs_sep - * or the final NUL) - * @param key_val_sep a 0-terminated list of characters used to separate - * key from value, for example '=' - * @param pairs_sep a 0-terminated list of characters used to separate - * two pairs from each other, for example ':' or ',' - * @param flags flags; see the AV_OPT_FLAG_* values below - * @param rkey parsed key; must be freed using av_free() - * @param rval parsed value; must be freed using av_free() - * - * @return >=0 for success, or a negative value corresponding to an - * AVERROR code in case of error; in particular: - * AVERROR(EINVAL) if no key is present - * - */ -int av_opt_get_key_value(const char **ropts, - const char *key_val_sep, const char *pairs_sep, - unsigned flags, - char **rkey, char **rval); - -enum { - - /** - * Accept to parse a value without a key; the key will then be returned - * as NULL. - */ - AV_OPT_FLAG_IMPLICIT_KEY = 1, -}; - -/** - * @defgroup opt_eval_funcs Evaluating option strings - * @{ - * This group of functions can be used to evaluate option strings - * and get numbers out of them. They do the same thing as av_opt_set(), - * except the result is written into the caller-supplied pointer. - * - * @param obj a struct whose first element is a pointer to AVClass. - * @param o an option for which the string is to be evaluated. - * @param val string to be evaluated. - * @param *_out value of the string will be written here. - * - * @return 0 on success, a negative number on failure. - */ -int av_opt_eval_flags (void *obj, const AVOption *o, const char *val, int *flags_out); -int av_opt_eval_int (void *obj, const AVOption *o, const char *val, int *int_out); -int av_opt_eval_int64 (void *obj, const AVOption *o, const char *val, int64_t *int64_out); -int av_opt_eval_float (void *obj, const AVOption *o, const char *val, float *float_out); -int av_opt_eval_double(void *obj, const AVOption *o, const char *val, double *double_out); -int av_opt_eval_q (void *obj, const AVOption *o, const char *val, AVRational *q_out); -/** - * @} - */ - -#define AV_OPT_SEARCH_CHILDREN (1 << 0) /**< Search in possible children of the - given object first. */ -/** - * The obj passed to av_opt_find() is fake -- only a double pointer to AVClass - * instead of a required pointer to a struct containing AVClass. This is - * useful for searching for options without needing to allocate the corresponding - * object. - */ -#define AV_OPT_SEARCH_FAKE_OBJ (1 << 1) - -/** - * In av_opt_get, return NULL if the option has a pointer type and is set to NULL, - * rather than returning an empty string. - */ -#define AV_OPT_ALLOW_NULL (1 << 2) - -/** - * Allows av_opt_query_ranges and av_opt_query_ranges_default to return more than - * one component for certain option types. - * @see AVOptionRanges for details. - */ -#define AV_OPT_MULTI_COMPONENT_RANGE (1 << 12) - -/** - * Look for an option in an object. Consider only options which - * have all the specified flags set. - * - * @param[in] obj A pointer to a struct whose first element is a - * pointer to an AVClass. - * Alternatively a double pointer to an AVClass, if - * AV_OPT_SEARCH_FAKE_OBJ search flag is set. - * @param[in] name The name of the option to look for. - * @param[in] unit When searching for named constants, name of the unit - * it belongs to. - * @param opt_flags Find only options with all the specified flags set (AV_OPT_FLAG). - * @param search_flags A combination of AV_OPT_SEARCH_*. - * - * @return A pointer to the option found, or NULL if no option - * was found. - * - * @note Options found with AV_OPT_SEARCH_CHILDREN flag may not be settable - * directly with av_opt_set(). Use special calls which take an options - * AVDictionary (e.g. avformat_open_input()) to set options found with this - * flag. - */ -const AVOption *av_opt_find(void *obj, const char *name, const char *unit, - int opt_flags, int search_flags); - -/** - * Look for an option in an object. Consider only options which - * have all the specified flags set. - * - * @param[in] obj A pointer to a struct whose first element is a - * pointer to an AVClass. - * Alternatively a double pointer to an AVClass, if - * AV_OPT_SEARCH_FAKE_OBJ search flag is set. - * @param[in] name The name of the option to look for. - * @param[in] unit When searching for named constants, name of the unit - * it belongs to. - * @param opt_flags Find only options with all the specified flags set (AV_OPT_FLAG). - * @param search_flags A combination of AV_OPT_SEARCH_*. - * @param[out] target_obj if non-NULL, an object to which the option belongs will be - * written here. It may be different from obj if AV_OPT_SEARCH_CHILDREN is present - * in search_flags. This parameter is ignored if search_flags contain - * AV_OPT_SEARCH_FAKE_OBJ. - * - * @return A pointer to the option found, or NULL if no option - * was found. - */ -const AVOption *av_opt_find2(void *obj, const char *name, const char *unit, - int opt_flags, int search_flags, void **target_obj); - -/** - * Iterate over all AVOptions belonging to obj. - * - * @param obj an AVOptions-enabled struct or a double pointer to an - * AVClass describing it. - * @param prev result of the previous call to av_opt_next() on this object - * or NULL - * @return next AVOption or NULL - */ -const AVOption *av_opt_next(const void *obj, const AVOption *prev); - -/** - * Iterate over AVOptions-enabled children of obj. - * - * @param prev result of a previous call to this function or NULL - * @return next AVOptions-enabled child or NULL - */ -void *av_opt_child_next(void *obj, void *prev); - -/** - * Iterate over potential AVOptions-enabled children of parent. - * - * @param prev result of a previous call to this function or NULL - * @return AVClass corresponding to next potential child or NULL - */ -const AVClass *av_opt_child_class_next(const AVClass *parent, const AVClass *prev); - -/** - * Set a binary option to an integer list. - * - * @param obj AVClass object to set options on - * @param name name of the binary option - * @param val pointer to an integer list (must have the correct type with - * regard to the contents of the list) - * @param term list terminator (usually 0 or -1) - * @param flags search flags - */ -#define av_opt_set_int_list(obj, name, val, term, flags) \ - (av_int_list_length(val, term) > INT_MAX / sizeof(*(val)) ? \ - AVERROR(EINVAL) : \ - av_opt_set_bin(obj, name, (const uint8_t *)(val), \ - av_int_list_length(val, term) * sizeof(*(val)), flags)) - -/** - * @} - */ - -/** - * @defgroup opt_get_funcs Option getting functions - * @{ - * Those functions get a value of the option with the given name from an object. - * - * @param[in] obj a struct whose first element is a pointer to an AVClass. - * @param[in] name name of the option to get. - * @param[in] search_flags flags passed to av_opt_find2. I.e. if AV_OPT_SEARCH_CHILDREN - * is passed here, then the option may be found in a child of obj. - * @param[out] out_val value of the option will be written here - * @return >=0 on success, a negative error code otherwise - */ -/** - * @note the returned string will be av_malloc()ed and must be av_free()ed by the caller - * - * @note if AV_OPT_ALLOW_NULL is set in search_flags in av_opt_get, and the option has - * AV_OPT_TYPE_STRING or AV_OPT_TYPE_BINARY and is set to NULL, *out_val will be set - * to NULL instead of an allocated empty string. - */ -int av_opt_get (void *obj, const char *name, int search_flags, uint8_t **out_val); -int av_opt_get_int (void *obj, const char *name, int search_flags, int64_t *out_val); -int av_opt_get_double (void *obj, const char *name, int search_flags, double *out_val); -int av_opt_get_q (void *obj, const char *name, int search_flags, AVRational *out_val); -int av_opt_get_pixel_fmt (void *obj, const char *name, int search_flags, enum AVPixelFormat *out_fmt); -int av_opt_get_sample_fmt(void *obj, const char *name, int search_flags, enum AVSampleFormat *out_fmt); -int av_opt_get_channel_layout(void *obj, const char *name, int search_flags, int64_t *ch_layout); -/** - * @param[out] out_val The returned dictionary is a copy of the actual value and must - * be freed with av_dict_free() by the caller - */ -int av_opt_get_dict_val(void *obj, const char *name, int search_flags, AVDictionary **out_val); -/** - * @} - */ -/** - * Gets a pointer to the requested field in a struct. - * This function allows accessing a struct even when its fields are moved or - * renamed since the application making the access has been compiled, - * - * @returns a pointer to the field, it can be cast to the correct type and read - * or written to. - */ -void *av_opt_ptr(const AVClass *avclass, void *obj, const char *name); - -/** - * Free an AVOptionRanges struct and set it to NULL. - */ -void av_opt_freep_ranges(AVOptionRanges **ranges); - -/** - * Get a list of allowed ranges for the given option. - * - * The returned list may depend on other fields in obj like for example profile. - * - * @param flags is a bitmask of flags, undefined flags should not be set and should be ignored - * AV_OPT_SEARCH_FAKE_OBJ indicates that the obj is a double pointer to a AVClass instead of a full instance - * AV_OPT_MULTI_COMPONENT_RANGE indicates that function may return more than one component, @see AVOptionRanges - * - * The result must be freed with av_opt_freep_ranges. - * - * @return number of compontents returned on success, a negative errro code otherwise - */ -int av_opt_query_ranges(AVOptionRanges **, void *obj, const char *key, int flags); - -/** - * Copy options from src object into dest object. - * - * Options that require memory allocation (e.g. string or binary) are malloc'ed in dest object. - * Original memory allocated for such options is freed unless both src and dest options points to the same memory. - * - * @param dest Object to copy from - * @param src Object to copy into - * @return 0 on success, negative on error - */ -int av_opt_copy(void *dest, const void *src); - -/** - * Get a default list of allowed ranges for the given option. - * - * This list is constructed without using the AVClass.query_ranges() callback - * and can be used as fallback from within the callback. - * - * @param flags is a bitmask of flags, undefined flags should not be set and should be ignored - * AV_OPT_SEARCH_FAKE_OBJ indicates that the obj is a double pointer to a AVClass instead of a full instance - * AV_OPT_MULTI_COMPONENT_RANGE indicates that function may return more than one component, @see AVOptionRanges - * - * The result must be freed with av_opt_free_ranges. - * - * @return number of compontents returned on success, a negative errro code otherwise - */ -int av_opt_query_ranges_default(AVOptionRanges **, void *obj, const char *key, int flags); - -/** - * Check if given option is set to its default value. - * - * Options o must belong to the obj. This function must not be called to check child's options state. - * @see av_opt_is_set_to_default_by_name(). - * - * @param obj AVClass object to check option on - * @param o option to be checked - * @return >0 when option is set to its default, - * 0 when option is not set its default, - * <0 on error - */ -int av_opt_is_set_to_default(void *obj, const AVOption *o); - -/** - * Check if given option is set to its default value. - * - * @param obj AVClass object to check option on - * @param name option name - * @param search_flags combination of AV_OPT_SEARCH_* - * @return >0 when option is set to its default, - * 0 when option is not set its default, - * <0 on error - */ -int av_opt_is_set_to_default_by_name(void *obj, const char *name, int search_flags); - - -#define AV_OPT_SERIALIZE_SKIP_DEFAULTS 0x00000001 ///< Serialize options that are not set to default values only. -#define AV_OPT_SERIALIZE_OPT_FLAGS_EXACT 0x00000002 ///< Serialize options that exactly match opt_flags only. - -/** - * Serialize object's options. - * - * Create a string containing object's serialized options. - * Such string may be passed back to av_opt_set_from_string() in order to restore option values. - * A key/value or pairs separator occurring in the serialized value or - * name string are escaped through the av_escape() function. - * - * @param[in] obj AVClass object to serialize - * @param[in] opt_flags serialize options with all the specified flags set (AV_OPT_FLAG) - * @param[in] flags combination of AV_OPT_SERIALIZE_* flags - * @param[out] buffer Pointer to buffer that will be allocated with string containg serialized options. - * Buffer must be freed by the caller when is no longer needed. - * @param[in] key_val_sep character used to separate key from value - * @param[in] pairs_sep character used to separate two pairs from each other - * @return >= 0 on success, negative on error - * @warning Separators cannot be neither '\\' nor '\0'. They also cannot be the same. - */ -int av_opt_serialize(void *obj, int opt_flags, int flags, char **buffer, - const char key_val_sep, const char pairs_sep); -/** - * @} - */ - -#endif /* AVUTIL_OPT_H */ diff --git a/ext/at3_standalone/options.c b/ext/at3_standalone/options.c index 8781555826..dfbb484df3 100644 --- a/ext/at3_standalone/options.c +++ b/ext/at3_standalone/options.c @@ -28,7 +28,6 @@ #include "internal.h" #include "util_internal.h" #include "mem.h" -#include "opt.h" #include /* FLT_MIN, FLT_MAX */ #include @@ -88,10 +87,6 @@ int avcodec_get_context_defaults3(AVCodecContext *s, const AVCodec *codec) s->codec_id = codec->id; } - if(s->codec_type == AVMEDIA_TYPE_AUDIO) - flags= AV_OPT_FLAG_AUDIO_PARAM; - av_opt_set_defaults2(s, flags, flags); - s->time_base = (AVRational){0,1}; s->pkt_timebase = (AVRational){ 0, 1 }; s->get_buffer2 = avcodec_default_get_buffer2; @@ -106,7 +101,6 @@ int avcodec_get_context_defaults3(AVCodecContext *s, const AVCodec *codec) } if(codec->priv_class){ *(const AVClass**)s->priv_data = codec->priv_class; - av_opt_set_defaults(s->priv_data); } } return 0; @@ -137,7 +131,6 @@ void avcodec_free_context(AVCodecContext **pavctx) avcodec_close(avctx); av_freep(&avctx->extradata); - av_freep(&avctx->subtitle_header); av_freep(&avctx->intra_matrix); av_freep(&avctx->inter_matrix); av_freep(&avctx->rc_override); @@ -152,20 +145,10 @@ const AVClass *avcodec_get_class(void) #define FOFFSET(x) offsetof(AVFrame,x) -static const AVOption frame_options[]={ -{"best_effort_timestamp", "", FOFFSET(best_effort_timestamp), AV_OPT_TYPE_INT64, {.i64 = AV_NOPTS_VALUE }, INT64_MIN, INT64_MAX, 0}, -{"pkt_pos", "", FOFFSET(pkt_pos), AV_OPT_TYPE_INT64, {.i64 = -1 }, INT64_MIN, INT64_MAX, 0}, -{"pkt_size", "", FOFFSET(pkt_size), AV_OPT_TYPE_INT64, {.i64 = -1 }, INT64_MIN, INT64_MAX, 0}, -{"format", "", FOFFSET(format), AV_OPT_TYPE_INT, {.i64 = -1 }, 0, INT_MAX, 0}, -{"channel_layout", "", FOFFSET(channel_layout), AV_OPT_TYPE_INT64, {.i64 = 0 }, 0, INT64_MAX, 0}, -{"sample_rate", "", FOFFSET(sample_rate), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, 0}, -{NULL}, -}; - static const AVClass av_frame_class = { .class_name = "AVFrame", .item_name = NULL, - .option = frame_options, + .option = NULL, .version = LIBAVUTIL_VERSION_INT, }; diff --git a/ext/at3_standalone/rational.c b/ext/at3_standalone/rational.c index 39d852aff7..a8aa7c23b3 100644 --- a/ext/at3_standalone/rational.c +++ b/ext/at3_standalone/rational.c @@ -97,11 +97,6 @@ AVRational av_add_q(AVRational b, AVRational c) { return b; } -AVRational av_sub_q(AVRational b, AVRational c) -{ - return av_add_q(b, (AVRational) { -c.num, c.den }); -} - AVRational av_d2q(double d, int max) { AVRational a; @@ -121,178 +116,3 @@ AVRational av_d2q(double d, int max) return a; } - -int av_nearer_q(AVRational q, AVRational q1, AVRational q2) -{ - /* n/d is q, a/b is the median between q1 and q2 */ - int64_t a = q1.num * (int64_t)q2.den + q2.num * (int64_t)q1.den; - int64_t b = 2 * (int64_t)q1.den * q2.den; - - /* rnd_up(a*d/b) > n => a*d/b > n */ - int64_t x_up = av_rescale_rnd(a, q.den, b, AV_ROUND_UP); - - /* rnd_down(a*d/b) < n => a*d/b < n */ - int64_t x_down = av_rescale_rnd(a, q.den, b, AV_ROUND_DOWN); - - return ((x_up > q.num) - (x_down < q.num)) * av_cmp_q(q2, q1); -} - -int av_find_nearest_q_idx(AVRational q, const AVRational* q_list) -{ - int i, nearest_q_idx = 0; - for (i = 0; q_list[i].den; i++) - if (av_nearer_q(q, q_list[i], q_list[nearest_q_idx]) > 0) - nearest_q_idx = i; - - return nearest_q_idx; -} - -uint32_t av_q2intfloat(AVRational q) { - int64_t n; - int shift; - int sign = 0; - - if (q.den < 0) { - q.den *= -1; - q.num *= -1; - } - if (q.num < 0) { - q.num *= -1; - sign = 1; - } - - if (!q.num && !q.den) return 0xFFC00000; - if (!q.num) return 0; - if (!q.den) return 0x7F800000 | (q.num & 0x80000000); - - shift = 23 + av_log2(q.den) - av_log2(q.num); - if (shift >= 0) n = av_rescale(q.num, 1LL<= (1<<24); - shift += n < (1<<23); - - if (shift >= 0) n = av_rescale(q.num, 1LL<= (1<<23)); - - return sign<<31 | (150-shift)<<23 | (n - (1<<23)); -} - -#ifdef TEST - -#include "integer.h" - -int main(void) -{ - AVRational a,b,r; - int i,j,k; - static const int64_t numlist[] = { - INT64_MIN, INT64_MIN+1, INT64_MAX, INT32_MIN, INT32_MAX, 1,0,-1, - 123456789, INT32_MAX-1, INT32_MAX+1LL, UINT32_MAX-1, UINT32_MAX, UINT32_MAX+1LL - }; - - for (a.num = -2; a.num <= 2; a.num++) { - for (a.den = -2; a.den <= 2; a.den++) { - for (b.num = -2; b.num <= 2; b.num++) { - for (b.den = -2; b.den <= 2; b.den++) { - int c = av_cmp_q(a,b); - double d = av_q2d(a) == av_q2d(b) ? - 0 : (av_q2d(a) - av_q2d(b)); - if (d > 0) d = 1; - else if (d < 0) d = -1; - else if (d != d) d = INT_MIN; - if (c != d) - av_log(NULL, AV_LOG_ERROR, "%d/%d %d/%d, %d %f\n", a.num, - a.den, b.num, b.den, c,d); - r = av_sub_q(av_add_q(b,a), b); - if(b.den && (r.num*a.den != a.num*r.den || !r.num != !a.num || !r.den != !a.den)) - av_log(NULL, AV_LOG_ERROR, "%d/%d ", r.num, r.den); - } - } - } - } - - for (i = 0; i < FF_ARRAY_ELEMS(numlist); i++) { - int64_t a = numlist[i]; - - for (j = 0; j < FF_ARRAY_ELEMS(numlist); j++) { - int64_t b = numlist[j]; - if (b<=0) - continue; - for (k = 0; k < FF_ARRAY_ELEMS(numlist); k++) { - int64_t c = numlist[k]; - int64_t res; - AVInteger ai; - - if (c<=0) - continue; - res = av_rescale_rnd(a,b,c, AV_ROUND_ZERO); - - ai = av_mul_i(av_int2i(a), av_int2i(b)); - ai = av_div_i(ai, av_int2i(c)); - - if (av_cmp_i(ai, av_int2i(INT64_MAX)) > 0 && res == INT64_MIN) - continue; - if (av_cmp_i(ai, av_int2i(INT64_MIN)) < 0 && res == INT64_MIN) - continue; - if (av_cmp_i(ai, av_int2i(res)) == 0) - continue; - - // Special exception for INT64_MIN, remove this in case INT64_MIN is handled without off by 1 error - if (av_cmp_i(ai, av_int2i(res-1)) == 0 && a == INT64_MIN) - continue; - - av_log(NULL, AV_LOG_ERROR, "%"PRId64" * %"PRId64" / %"PRId64" = %"PRId64" or %"PRId64"\n", a,b,c, res, av_i2int(ai)); - } - } - } - - for (a.num = 1; a.num <= 10; a.num++) { - for (a.den = 1; a.den <= 10; a.den++) { - if (av_gcd(a.num, a.den) > 1) - continue; - for (b.num = 1; b.num <= 10; b.num++) { - for (b.den = 1; b.den <= 10; b.den++) { - int start; - if (av_gcd(b.num, b.den) > 1) - continue; - if (av_cmp_q(b, a) < 0) - continue; - for (start = 0; start < 10 ; start++) { - int acc= start; - int i; - - for (i = 0; i<100; i++) { - int exact = start + av_rescale_q(i+1, b, a); - acc = av_add_stable(a, acc, b, 1); - if (FFABS(acc - exact) > 2) { - av_log(NULL, AV_LOG_ERROR, "%d/%d %d/%d, %d %d\n", a.num, - a.den, b.num, b.den, acc, exact); - return 1; - } - } - } - } - } - } - } - - for (a.den = 1; a.den < 0x100000000U/3; a.den*=3) { - for (a.num = -1; a.num < (1<<27); a.num += 1 + a.num/100) { - float f = av_int2float(av_q2intfloat(a)); - float f2 = av_q2d(a); - if (fabs(f - f2) > fabs(f)/5000000) { - av_log(NULL, AV_LOG_ERROR, "%d/%d %f %f\n", a.num, - a.den, f, f2); - return 1; - } - - } - } - - return 0; -} -#endif diff --git a/ext/at3_standalone/rational.h b/ext/at3_standalone/rational.h index 35e799007c..16ea90d121 100644 --- a/ext/at3_standalone/rational.h +++ b/ext/at3_standalone/rational.h @@ -118,14 +118,6 @@ AVRational av_div_q(AVRational b, AVRational c) av_const; */ AVRational av_add_q(AVRational b, AVRational c) av_const; -/** - * Subtract one rational from another. - * @param b first rational - * @param c second rational - * @return b-c - */ -AVRational av_sub_q(AVRational b, AVRational c) av_const; - /** * Invert a rational. * @param q value @@ -147,26 +139,6 @@ static av_always_inline AVRational av_inv_q(AVRational q) */ AVRational av_d2q(double d, int max) av_const; -/** - * @return 1 if q1 is nearer to q than q2, -1 if q2 is nearer - * than q1, 0 if they have the same distance. - */ -int av_nearer_q(AVRational q, AVRational q1, AVRational q2); - -/** - * Find the nearest value in q_list to q. - * @param q_list an array of rationals terminated by {0, 0} - * @return the index of the nearest value found in the array - */ -int av_find_nearest_q_idx(AVRational q, const AVRational* q_list); - -/** - * Converts a AVRational to a IEEE 32bit float. - * - * The float is returned in a uint32_t and its value is platform indepenant. - */ -uint32_t av_q2intfloat(AVRational q); - /** * @} */ diff --git a/ext/at3_standalone/samplefmt.c b/ext/at3_standalone/samplefmt.c index c605b5ebdf..fb26e611aa 100644 --- a/ext/at3_standalone/samplefmt.c +++ b/ext/at3_standalone/samplefmt.c @@ -193,21 +193,6 @@ int av_samples_alloc(uint8_t **audio_data, int *linesize, int nb_channels, return size; } -int av_samples_alloc_array_and_samples(uint8_t ***audio_data, int *linesize, int nb_channels, - int nb_samples, enum AVSampleFormat sample_fmt, int align) -{ - int ret, nb_planes = av_sample_fmt_is_planar(sample_fmt) ? nb_channels : 1; - - *audio_data = av_calloc(nb_planes, sizeof(**audio_data)); - if (!*audio_data) - return AVERROR(ENOMEM); - ret = av_samples_alloc(*audio_data, linesize, nb_channels, - nb_samples, sample_fmt, align); - if (ret < 0) - av_freep(audio_data); - return ret; -} - int av_samples_copy(uint8_t **dst, uint8_t * const *src, int dst_offset, int src_offset, int nb_samples, int nb_channels, enum AVSampleFormat sample_fmt) diff --git a/ext/at3_standalone/samplefmt.h b/ext/at3_standalone/samplefmt.h index 6a8a031c02..8739e1411f 100644 --- a/ext/at3_standalone/samplefmt.h +++ b/ext/at3_standalone/samplefmt.h @@ -225,18 +225,6 @@ int av_samples_fill_arrays(uint8_t **audio_data, int *linesize, int av_samples_alloc(uint8_t **audio_data, int *linesize, int nb_channels, int nb_samples, enum AVSampleFormat sample_fmt, int align); -/** - * Allocate a data pointers array, samples buffer for nb_samples - * samples, and fill data pointers and linesize accordingly. - * - * This is the same as av_samples_alloc(), but also allocates the data - * pointers array. - * - * @see av_samples_alloc() - */ -int av_samples_alloc_array_and_samples(uint8_t ***audio_data, int *linesize, int nb_channels, - int nb_samples, enum AVSampleFormat sample_fmt, int align); - /** * Copy samples from src to dst. * diff --git a/ext/at3_standalone/util_internal.h b/ext/at3_standalone/util_internal.h index 6c9cba0870..eb181efca9 100644 --- a/ext/at3_standalone/util_internal.h +++ b/ext/at3_standalone/util_internal.h @@ -87,17 +87,6 @@ #include "libm.h" -/** - * Return NULL if CONFIG_SMALL is true, otherwise the argument - * without modification. Used to disable the definition of strings - * (for example AVCodec long_names). - */ -#if CONFIG_SMALL -# define NULL_IF_CONFIG_SMALL(x) NULL -#else -# define NULL_IF_CONFIG_SMALL(x) x -#endif - /** * Define a function with only the non-default version specified. * diff --git a/ext/at3_standalone/utils.c b/ext/at3_standalone/utils.c index 0190b7916c..5ac333dce5 100644 --- a/ext/at3_standalone/utils.c +++ b/ext/at3_standalone/utils.c @@ -33,10 +33,8 @@ #include "frame.h" #include "internal.h" #include "mathematics.h" -#include "avstring.h" #include "samplefmt.h" #include "avcodec.h" -#include "opt.h" #include "internal.h" #include "bytestream.h" #include "version.h" @@ -65,18 +63,6 @@ void av_fast_padded_malloc(void *ptr, unsigned int *size, size_t min_size) memset(*p + min_size, 0, AV_INPUT_BUFFER_PADDING_SIZE); } -void av_fast_padded_mallocz(void *ptr, unsigned int *size, size_t min_size) -{ - uint8_t **p = ptr; - if (min_size > SIZE_MAX - AV_INPUT_BUFFER_PADDING_SIZE) { - av_freep(p); - *size = 0; - return; - } - if (!ff_fast_malloc(p, size, min_size + AV_INPUT_BUFFER_PADDING_SIZE, 1)) - memset(*p, 0, min_size + AV_INPUT_BUFFER_PADDING_SIZE); -} - /* encoder management */ static AVCodec *first_avcodec = NULL; static AVCodec **last_avcodec = &first_avcodec; @@ -98,11 +84,6 @@ static av_cold void avcodec_init(void) initialized = 1; } -int av_codec_is_encoder(const AVCodec *codec) -{ - return codec && (codec->encode_sub || codec->encode2); -} - int av_codec_is_decoder(const AVCodec *codec) { return codec && codec->decode; @@ -115,42 +96,6 @@ unsigned avcodec_get_edge_width(void) } #endif -int avcodec_fill_audio_frame(AVFrame *frame, int nb_channels, - enum AVSampleFormat sample_fmt, const uint8_t *buf, - int buf_size, int align) -{ - int ch, planar, needed_size, ret = 0; - - needed_size = av_samples_get_buffer_size(NULL, nb_channels, - frame->nb_samples, sample_fmt, - align); - if (buf_size < needed_size) - return AVERROR(EINVAL); - - planar = av_sample_fmt_is_planar(sample_fmt); - if (planar && nb_channels > AV_NUM_DATA_POINTERS) { - if (!(frame->extended_data = av_mallocz_array(nb_channels, - sizeof(*frame->extended_data)))) - return AVERROR(ENOMEM); - } else { - frame->extended_data = frame->data; - } - - if ((ret = av_samples_fill_arrays(frame->extended_data, &frame->linesize[0], - (uint8_t *)(intptr_t)buf, nb_channels, frame->nb_samples, - sample_fmt, align)) < 0) { - if (frame->extended_data != frame->data) - av_freep(&frame->extended_data); - return ret; - } - if (frame->extended_data != frame->data) { - for (ch = 0; ch < AV_NUM_DATA_POINTERS; ch++) - frame->data[ch] = frame->extended_data[ch]; - } - - return ret; -} - static int update_frame_pool(AVCodecContext *avctx, AVFrame *frame) { FramePool *pool = avctx->internal->pool; @@ -309,61 +254,10 @@ int ff_get_buffer(AVCodecContext *avctx, AVFrame *frame, int flags) return ret; } -int avcodec_default_execute(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2), void *arg, int *ret, int count, int size) -{ - int i; - - for (i = 0; i < count; i++) { - int r = func(c, (char *)arg + i * size); - if (ret) - ret[i] = r; - } - return 0; -} - -int avcodec_default_execute2(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2, int jobnr, int threadnr), void *arg, int *ret, int count) -{ - int i; - - for (i = 0; i < count; i++) { - int r = func(c, arg, i, 0); - if (ret) - ret[i] = r; - } - return 0; -} - MAKE_ACCESSORS(AVCodecContext, codec, AVRational, pkt_timebase) MAKE_ACCESSORS(AVCodecContext, codec, int, seek_preroll) -unsigned av_codec_get_codec_properties(const AVCodecContext *codec) -{ - return codec->properties; -} - -static int64_t get_bit_rate(AVCodecContext *ctx) -{ - int64_t bit_rate; - int bits_per_sample; - - switch (ctx->codec_type) { - case AVMEDIA_TYPE_DATA: - case AVMEDIA_TYPE_SUBTITLE: - case AVMEDIA_TYPE_ATTACHMENT: - bit_rate = ctx->bit_rate; - break; - case AVMEDIA_TYPE_AUDIO: - bits_per_sample = av_get_bits_per_sample(ctx->codec_id); - bit_rate = bits_per_sample ? ctx->sample_rate * (int64_t)ctx->channels * bits_per_sample : ctx->bit_rate; - break; - default: - bit_rate = 0; - break; - } - return bit_rate; -} - -int attribute_align_arg ff_codec_open2_recursive(AVCodecContext *avctx, const AVCodec *codec, AVDictionary **options) +int attribute_align_arg ff_codec_open2_recursive(AVCodecContext *avctx, const AVCodec *codec, void **options) { int ret = 0; @@ -375,7 +269,7 @@ int attribute_align_arg ff_codec_open2_recursive(AVCodecContext *avctx, const AV return ret; } -int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *codec, AVDictionary **options) +int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *codec, void **options) { int ret = 0; @@ -424,18 +318,12 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code } if (codec->priv_class) { *(const AVClass **)avctx->priv_data = codec->priv_class; - av_opt_set_defaults(avctx->priv_data); } } } else { avctx->priv_data = NULL; } - /* if the decoder init function was already called previously, - * free the already allocated subtitle_header before overwriting it */ - if (av_codec_is_decoder(codec)) - av_freep(&avctx->subtitle_header); - if (avctx->channels > FF_SANE_NB_CHANNELS) { ret = AVERROR(EINVAL); goto free_and_end; @@ -468,11 +356,6 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code #endif - avctx->pts_correction_num_faulty_pts = - avctx->pts_correction_num_faulty_dts = 0; - avctx->pts_correction_last_pts = - avctx->pts_correction_last_dts = INT64_MIN; - if (avctx->codec->init) { ret = avctx->codec->init(avctx); if (ret < 0) { @@ -488,8 +371,6 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code #endif if (av_codec_is_decoder(avctx->codec)) { - if (!avctx->bit_rate) - avctx->bit_rate = get_bit_rate(avctx); /* validate channel layout from the decoder */ if (avctx->channel_layout) { int channels = av_get_channel_layout_nb_channels(avctx->channel_layout); @@ -528,10 +409,6 @@ free_and_end: (avctx->codec->caps_internal & FF_CODEC_CAP_INIT_CLEANUP)) avctx->codec->close(avctx); - if (codec->priv_class && codec->priv_data_size) - av_opt_free(avctx->priv_data); - av_opt_free(avctx); - #if FF_API_CODED_FRAME FF_DISABLE_DEPRECATION_WARNINGS av_frame_free(&avctx->coded_frame); @@ -613,469 +490,20 @@ av_cold int avcodec_close(AVCodecContext *avctx) av_freep(&avctx->internal->pool); av_freep(&avctx->internal); } - - if (avctx->priv_data && avctx->codec && avctx->codec->priv_class) - av_opt_free(avctx->priv_data); - av_opt_free(avctx); av_freep(&avctx->priv_data); - if (av_codec_is_encoder(avctx->codec)) { - av_freep(&avctx->extradata); -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - av_frame_free(&avctx->coded_frame); -FF_ENABLE_DEPRECATION_WARNINGS -#endif - } avctx->codec = NULL; return 0; } -static enum AVCodecID remap_deprecated_codec_id(enum AVCodecID id) -{ - switch(id){ - //This is for future deprecatec codec ids, its empty since - //last major bump but will fill up again over time, please don't remove it - default : return id; - } -} - -static AVCodec *find_encdec(enum AVCodecID id, int encoder) -{ - AVCodec *p, *experimental = NULL; - p = first_avcodec; - id= remap_deprecated_codec_id(id); - while (p) { - if ((encoder ? av_codec_is_encoder(p) : av_codec_is_decoder(p)) && - p->id == id) { - if (p->capabilities & AV_CODEC_CAP_EXPERIMENTAL && !experimental) { - experimental = p; - } else - return p; - } - p = p->next; - } - return experimental; -} - -AVCodec *avcodec_find_encoder(enum AVCodecID id) -{ - return find_encdec(id, 1); -} - -AVCodec *avcodec_find_encoder_by_name(const char *name) -{ - AVCodec *p; - if (!name) - return NULL; - p = first_avcodec; - while (p) { - if (av_codec_is_encoder(p) && strcmp(name, p->name) == 0) - return p; - p = p->next; - } - return NULL; -} - -AVCodec *avcodec_find_decoder(enum AVCodecID id) -{ - return find_encdec(id, 0); -} - -AVCodec *avcodec_find_decoder_by_name(const char *name) -{ - AVCodec *p; - if (!name) - return NULL; - p = first_avcodec; - while (p) { - if (av_codec_is_decoder(p) && strcmp(name, p->name) == 0) - return p; - p = p->next; - } - return NULL; -} - void avcodec_flush_buffers(AVCodecContext *avctx) { if (avctx->codec->flush) avctx->codec->flush(avctx); - avctx->pts_correction_last_pts = - avctx->pts_correction_last_dts = INT64_MIN; - if (!avctx->refcounted_frames) av_frame_unref(avctx->internal->to_free); } -int av_get_exact_bits_per_sample(enum AVCodecID codec_id) -{ - switch (codec_id) { - case AV_CODEC_ID_8SVX_EXP: - case AV_CODEC_ID_8SVX_FIB: - case AV_CODEC_ID_ADPCM_CT: - case AV_CODEC_ID_ADPCM_IMA_APC: - case AV_CODEC_ID_ADPCM_IMA_EA_SEAD: - case AV_CODEC_ID_ADPCM_IMA_OKI: - case AV_CODEC_ID_ADPCM_IMA_WS: - case AV_CODEC_ID_ADPCM_G722: - case AV_CODEC_ID_ADPCM_YAMAHA: - case AV_CODEC_ID_ADPCM_AICA: - return 4; - case AV_CODEC_ID_DSD_LSBF: - case AV_CODEC_ID_DSD_MSBF: - case AV_CODEC_ID_DSD_LSBF_PLANAR: - case AV_CODEC_ID_DSD_MSBF_PLANAR: - case AV_CODEC_ID_PCM_ALAW: - case AV_CODEC_ID_PCM_MULAW: - case AV_CODEC_ID_PCM_S8: - case AV_CODEC_ID_PCM_S8_PLANAR: - case AV_CODEC_ID_PCM_U8: - case AV_CODEC_ID_PCM_ZORK: - case AV_CODEC_ID_SDX2_DPCM: - return 8; - case AV_CODEC_ID_PCM_S16BE: - case AV_CODEC_ID_PCM_S16BE_PLANAR: - case AV_CODEC_ID_PCM_S16LE: - case AV_CODEC_ID_PCM_S16LE_PLANAR: - case AV_CODEC_ID_PCM_U16BE: - case AV_CODEC_ID_PCM_U16LE: - return 16; - case AV_CODEC_ID_PCM_S24DAUD: - case AV_CODEC_ID_PCM_S24BE: - case AV_CODEC_ID_PCM_S24LE: - case AV_CODEC_ID_PCM_S24LE_PLANAR: - case AV_CODEC_ID_PCM_U24BE: - case AV_CODEC_ID_PCM_U24LE: - return 24; - case AV_CODEC_ID_PCM_S32BE: - case AV_CODEC_ID_PCM_S32LE: - case AV_CODEC_ID_PCM_S32LE_PLANAR: - case AV_CODEC_ID_PCM_U32BE: - case AV_CODEC_ID_PCM_U32LE: - case AV_CODEC_ID_PCM_F32BE: - case AV_CODEC_ID_PCM_F32LE: - return 32; - case AV_CODEC_ID_PCM_F64BE: - case AV_CODEC_ID_PCM_F64LE: - return 64; - default: - return 0; - } -} - -enum AVCodecID av_get_pcm_codec(enum AVSampleFormat fmt, int be) -{ - static const enum AVCodecID map[AV_SAMPLE_FMT_NB][2] = { - [AV_SAMPLE_FMT_U8 ] = { AV_CODEC_ID_PCM_U8, AV_CODEC_ID_PCM_U8 }, - [AV_SAMPLE_FMT_S16 ] = { AV_CODEC_ID_PCM_S16LE, AV_CODEC_ID_PCM_S16BE }, - [AV_SAMPLE_FMT_S32 ] = { AV_CODEC_ID_PCM_S32LE, AV_CODEC_ID_PCM_S32BE }, - [AV_SAMPLE_FMT_FLT ] = { AV_CODEC_ID_PCM_F32LE, AV_CODEC_ID_PCM_F32BE }, - [AV_SAMPLE_FMT_DBL ] = { AV_CODEC_ID_PCM_F64LE, AV_CODEC_ID_PCM_F64BE }, - [AV_SAMPLE_FMT_U8P ] = { AV_CODEC_ID_PCM_U8, AV_CODEC_ID_PCM_U8 }, - [AV_SAMPLE_FMT_S16P] = { AV_CODEC_ID_PCM_S16LE, AV_CODEC_ID_PCM_S16BE }, - [AV_SAMPLE_FMT_S32P] = { AV_CODEC_ID_PCM_S32LE, AV_CODEC_ID_PCM_S32BE }, - [AV_SAMPLE_FMT_FLTP] = { AV_CODEC_ID_PCM_F32LE, AV_CODEC_ID_PCM_F32BE }, - [AV_SAMPLE_FMT_DBLP] = { AV_CODEC_ID_PCM_F64LE, AV_CODEC_ID_PCM_F64BE }, - }; - if (fmt < 0 || fmt >= AV_SAMPLE_FMT_NB) - return AV_CODEC_ID_NONE; - if (be < 0 || be > 1) - be = AV_NE(1, 0); - return map[fmt][be]; -} - -int av_get_bits_per_sample(enum AVCodecID codec_id) -{ - switch (codec_id) { - case AV_CODEC_ID_ADPCM_SBPRO_2: - return 2; - case AV_CODEC_ID_ADPCM_SBPRO_3: - return 3; - case AV_CODEC_ID_ADPCM_SBPRO_4: - case AV_CODEC_ID_ADPCM_IMA_WAV: - case AV_CODEC_ID_ADPCM_IMA_QT: - case AV_CODEC_ID_ADPCM_SWF: - case AV_CODEC_ID_ADPCM_MS: - return 4; - default: - return av_get_exact_bits_per_sample(codec_id); - } -} - -int av_get_audio_frame_duration(AVCodecContext *avctx, int frame_bytes) -{ - int id, sr, ch, ba, tag, bps; - - id = avctx->codec_id; - sr = avctx->sample_rate; - ch = avctx->channels; - ba = avctx->block_align; - tag = avctx->codec_tag; - bps = av_get_exact_bits_per_sample(avctx->codec_id); - - /* codecs with an exact constant bits per sample */ - if (bps > 0 && ch > 0 && frame_bytes > 0 && ch < 32768 && bps < 32768) - return (frame_bytes * 8LL) / (bps * ch); - bps = avctx->bits_per_coded_sample; - - /* codecs with a fixed packet duration */ - switch (id) { - case AV_CODEC_ID_ADPCM_ADX: return 32; - case AV_CODEC_ID_ADPCM_IMA_QT: return 64; - case AV_CODEC_ID_ADPCM_EA_XAS: return 128; - case AV_CODEC_ID_AMR_NB: - case AV_CODEC_ID_EVRC: - case AV_CODEC_ID_GSM: - case AV_CODEC_ID_QCELP: - case AV_CODEC_ID_RA_288: return 160; - case AV_CODEC_ID_AMR_WB: - case AV_CODEC_ID_GSM_MS: return 320; - case AV_CODEC_ID_MP1: return 384; - case AV_CODEC_ID_ATRAC1: return 512; - case AV_CODEC_ID_ATRAC3: return 1024; - case AV_CODEC_ID_ATRAC3P: return 2048; - case AV_CODEC_ID_MP2: - case AV_CODEC_ID_MUSEPACK7: return 1152; - case AV_CODEC_ID_AC3: return 1536; - } - - if (sr > 0) { - /* calc from sample rate */ - if (id == AV_CODEC_ID_TTA) - return 256 * sr / 245; - - if (ch > 0) { - /* calc from sample rate and channels */ - if (id == AV_CODEC_ID_BINKAUDIO_DCT) - return (480 << (sr / 22050)) / ch; - } - } - - if (ba > 0) { - /* calc from block_align */ - if (id == AV_CODEC_ID_SIPR) { - switch (ba) { - case 20: return 160; - case 19: return 144; - case 29: return 288; - case 37: return 480; - } - } else if (id == AV_CODEC_ID_ILBC) { - switch (ba) { - case 38: return 160; - case 50: return 240; - } - } - } - - if (frame_bytes > 0) { - /* calc from frame_bytes only */ - if (id == AV_CODEC_ID_TRUESPEECH) - return 240 * (frame_bytes / 32); - if (id == AV_CODEC_ID_NELLYMOSER) - return 256 * (frame_bytes / 64); - if (id == AV_CODEC_ID_RA_144) - return 160 * (frame_bytes / 20); - if (id == AV_CODEC_ID_G723_1) - return 240 * (frame_bytes / 24); - - if (bps > 0) { - /* calc from frame_bytes and bits_per_coded_sample */ - if (id == AV_CODEC_ID_ADPCM_G726) - return frame_bytes * 8 / bps; - } - - if (ch > 0 && ch < INT_MAX/16) { - /* calc from frame_bytes and channels */ - switch (id) { - case AV_CODEC_ID_ADPCM_AFC: - return frame_bytes / (9 * ch) * 16; - case AV_CODEC_ID_ADPCM_PSX: - case AV_CODEC_ID_ADPCM_DTK: - return frame_bytes / (16 * ch) * 28; - case AV_CODEC_ID_ADPCM_4XM: - case AV_CODEC_ID_ADPCM_IMA_ISS: - return (frame_bytes - 4 * ch) * 2 / ch; - case AV_CODEC_ID_ADPCM_IMA_SMJPEG: - return (frame_bytes - 4) * 2 / ch; - case AV_CODEC_ID_ADPCM_IMA_AMV: - return (frame_bytes - 8) * 2 / ch; - case AV_CODEC_ID_ADPCM_THP: - case AV_CODEC_ID_ADPCM_THP_LE: - if (avctx->extradata) - return frame_bytes * 14 / (8 * ch); - break; - case AV_CODEC_ID_ADPCM_XA: - return (frame_bytes / 128) * 224 / ch; - case AV_CODEC_ID_INTERPLAY_DPCM: - return (frame_bytes - 6 - ch) / ch; - case AV_CODEC_ID_ROQ_DPCM: - return (frame_bytes - 8) / ch; - case AV_CODEC_ID_XAN_DPCM: - return (frame_bytes - 2 * ch) / ch; - case AV_CODEC_ID_MACE3: - return 3 * frame_bytes / ch; - case AV_CODEC_ID_MACE6: - return 6 * frame_bytes / ch; - case AV_CODEC_ID_PCM_LXF: - return 2 * (frame_bytes / (5 * ch)); - case AV_CODEC_ID_IAC: - case AV_CODEC_ID_IMC: - return 4 * frame_bytes / ch; - } - - if (tag) { - /* calc from frame_bytes, channels, and codec_tag */ - if (id == AV_CODEC_ID_SOL_DPCM) { - if (tag == 3) - return frame_bytes / ch; - else - return frame_bytes * 2 / ch; - } - } - - if (ba > 0) { - /* calc from frame_bytes, channels, and block_align */ - int blocks = frame_bytes / ba; - switch (avctx->codec_id) { - case AV_CODEC_ID_ADPCM_IMA_WAV: - if (bps < 2 || bps > 5) - return 0; - return blocks * (1 + (ba - 4 * ch) / (bps * ch) * 8); - case AV_CODEC_ID_ADPCM_IMA_DK3: - return blocks * (((ba - 16) * 2 / 3 * 4) / ch); - case AV_CODEC_ID_ADPCM_IMA_DK4: - return blocks * (1 + (ba - 4 * ch) * 2 / ch); - case AV_CODEC_ID_ADPCM_IMA_RAD: - return blocks * ((ba - 4 * ch) * 2 / ch); - case AV_CODEC_ID_ADPCM_MS: - return blocks * (2 + (ba - 7 * ch) * 2 / ch); - } - } - - if (bps > 0) { - /* calc from frame_bytes, channels, and bits_per_coded_sample */ - switch (avctx->codec_id) { - case AV_CODEC_ID_PCM_DVD: - if(bps<4) - return 0; - return 2 * (frame_bytes / ((bps * 2 / 8) * ch)); - case AV_CODEC_ID_PCM_BLURAY: - if(bps<4) - return 0; - return frame_bytes / ((FFALIGN(ch, 2) * bps) / 8); - case AV_CODEC_ID_S302M: - return 2 * (frame_bytes / ((bps + 4) / 4)) / ch; - } - } - } - } - - /* Fall back on using frame_size */ - if (avctx->frame_size > 1 && frame_bytes) - return avctx->frame_size; - - //For WMA we currently have no other means to calculate duration thus we - //do it here by assuming CBR, which is true for all known cases. - if (avctx->bit_rate>0 && frame_bytes>0 && avctx->sample_rate>0 && avctx->block_align>1) { - if (avctx->codec_id == AV_CODEC_ID_WMAV1 || avctx->codec_id == AV_CODEC_ID_WMAV2) - return (frame_bytes * 8LL * avctx->sample_rate) / avctx->bit_rate; - } - - return 0; -} - -#if !HAVE_THREADS -int ff_thread_init(AVCodecContext *s) -{ - return -1; -} - -#endif - -unsigned int av_xiphlacing(unsigned char *s, unsigned int v) -{ - unsigned int n = 0; - - while (v >= 0xff) { - *s++ = 0xff; - v -= 0xff; - n++; - } - *s = v; - n++; - return n; -} - -int ff_match_2uint16(const uint16_t(*tab)[2], int size, int a, int b) -{ - int i; - for (i = 0; i < size && !(tab[i][0] == a && tab[i][1] == b); i++) ; - return i; -} - -#if FF_API_MISSING_SAMPLE -FF_DISABLE_DEPRECATION_WARNINGS -void av_log_missing_feature(void *avc, const char *feature, int want_sample) -{ - av_log(avc, AV_LOG_WARNING, "%s is not implemented. Update your FFmpeg " - "version to the newest one from Git. If the problem still " - "occurs, it means that your file has a feature which has not " - "been implemented.\n", feature); - if(want_sample) - av_log_ask_for_sample(avc, NULL); -} - -void av_log_ask_for_sample(void *avc, const char *msg, ...) -{ - va_list argument_list; - - va_start(argument_list, msg); - - if (msg) - av_vlog(avc, AV_LOG_WARNING, msg, argument_list); - av_log(avc, AV_LOG_WARNING, "If you want to help, upload a sample " - "of this file to ftp://upload.ffmpeg.org/incoming/ " - "and contact the ffmpeg-devel mailing list. (ffmpeg-devel@ffmpeg.org)\n"); - - va_end(argument_list); -} -FF_ENABLE_DEPRECATION_WARNINGS -#endif /* FF_API_MISSING_SAMPLE */ - - -int av_lockmgr_register(int (*cb)(void **mutex, enum AVLockOp op)) -{ - if (lockmgr_cb) { - // There is no good way to rollback a failure to destroy the - // mutex, so we ignore failures. - lockmgr_cb(&codec_mutex, AV_LOCK_DESTROY); - lockmgr_cb(&avformat_mutex, AV_LOCK_DESTROY); - lockmgr_cb = NULL; - codec_mutex = NULL; - avformat_mutex = NULL; - } - - if (cb) { - void *new_codec_mutex = NULL; - void *new_avformat_mutex = NULL; - int err; - if (err = cb(&new_codec_mutex, AV_LOCK_CREATE)) { - return err > 0 ? AVERROR_UNKNOWN : err; - } - if (err = cb(&new_avformat_mutex, AV_LOCK_CREATE)) { - // Ignore failures to destroy the newly created mutex. - cb(&new_codec_mutex, AV_LOCK_DESTROY); - return err > 0 ? AVERROR_UNKNOWN : err; - } - lockmgr_cb = cb; - codec_mutex = new_codec_mutex; - avformat_mutex = new_avformat_mutex; - } - - return 0; -} - int ff_lock_avcodec(AVCodecContext *log_ctx, const AVCodec *codec) { if (codec->caps_internal & FF_CODEC_CAP_INIT_THREADSAFE || !codec->init) @@ -1106,80 +534,7 @@ int ff_unlock_avcodec(const AVCodec *codec) return 0; } -int avpriv_lock_avformat(void) -{ - if (lockmgr_cb) { - if ((*lockmgr_cb)(&avformat_mutex, AV_LOCK_OBTAIN)) - return -1; - } - return 0; -} - -int avpriv_unlock_avformat(void) -{ - if (lockmgr_cb) { - if ((*lockmgr_cb)(&avformat_mutex, AV_LOCK_RELEASE)) - return -1; - } - return 0; -} - -unsigned int avpriv_toupper4(unsigned int x) -{ - return av_toupper(x & 0xFF) + - (av_toupper((x >> 8) & 0xFF) << 8) + - (av_toupper((x >> 16) & 0xFF) << 16) + -((unsigned)av_toupper((x >> 24) & 0xFF) << 24); -} - int avcodec_is_open(AVCodecContext *s) { return !!s->internal; } - -const uint8_t *avpriv_find_start_code(const uint8_t *av_restrict p, - const uint8_t *end, - uint32_t *av_restrict state) -{ - int i; - - av_assert0(p <= end); - if (p >= end) - return end; - - for (i = 0; i < 3; i++) { - uint32_t tmp = *state << 8; - *state = tmp + *(p++); - if (tmp == 0x100 || p == end) - return p; - } - - while (p < end) { - if (p[-1] > 1 ) p += 3; - else if (p[-2] ) p += 2; - else if (p[-3]|(p[-1]-1)) p++; - else { - p++; - break; - } - } - - p = FFMIN(p, end) - 4; - *state = AV_RB32(p); - - return p + 4; -} - -AVCPBProperties *av_cpb_properties_alloc(size_t *size) -{ - AVCPBProperties *props = av_mallocz(sizeof(AVCPBProperties)); - if (!props) - return NULL; - - if (size) - *size = sizeof(*props); - - props->vbv_delay = UINT64_MAX; - - return props; -} From 7d680c98835f613fafb77e746094dd6e444ec154 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Thu, 11 Apr 2024 00:29:53 +0200 Subject: [PATCH 075/719] Remove AVPacket, more --- Common/Common.vcxproj | 1 - Common/Common.vcxproj.filters | 3 - ext/at3_standalone/atrac3.c | 5 - ext/at3_standalone/atrac3plusdec.c | 3 - ext/at3_standalone/avcodec.h | 829 ----------------------------- ext/at3_standalone/avpacket.c | 287 ---------- ext/at3_standalone/avutil.h | 39 -- ext/at3_standalone/internal.h | 59 -- ext/at3_standalone/options.c | 54 +- ext/at3_standalone/utils.c | 238 ++------- 10 files changed, 46 insertions(+), 1472 deletions(-) delete mode 100644 ext/at3_standalone/avpacket.c diff --git a/Common/Common.vcxproj b/Common/Common.vcxproj index b638a87ff4..0bbe283bfb 100644 --- a/Common/Common.vcxproj +++ b/Common/Common.vcxproj @@ -627,7 +627,6 @@ - diff --git a/Common/Common.vcxproj.filters b/Common/Common.vcxproj.filters index f9d95c879c..8905c36ed2 100644 --- a/Common/Common.vcxproj.filters +++ b/Common/Common.vcxproj.filters @@ -1137,9 +1137,6 @@ ext\at3_standalone - - ext\at3_standalone - ext\at3_standalone diff --git a/ext/at3_standalone/atrac3.c b/ext/at3_standalone/atrac3.c index eaf5a8f15a..8eaefed212 100644 --- a/ext/at3_standalone/atrac3.c +++ b/ext/at3_standalone/atrac3.c @@ -923,13 +923,8 @@ static av_cold int atrac3_decode_init(AVCodecContext *avctx) AVCodec ff_atrac3_decoder = { .name = "atrac3", - .long_name = "ATRAC3 (Adaptive TRansform Acoustic Coding 3)", - .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_ATRAC3, .priv_data_size = sizeof(ATRAC3Context), .init = atrac3_decode_init, .close = atrac3_decode_close, - .decode = atrac3_decode_frame, - .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, - AV_SAMPLE_FMT_NONE }, }; diff --git a/ext/at3_standalone/atrac3plusdec.c b/ext/at3_standalone/atrac3plusdec.c index 2adb458e0a..1673bd3eed 100644 --- a/ext/at3_standalone/atrac3plusdec.c +++ b/ext/at3_standalone/atrac3plusdec.c @@ -387,12 +387,9 @@ int atrac3p_decode_frame(AVCodecContext *avctx, AVFrame *frame, int *got_frame_p AVCodec ff_atrac3p_decoder = { .name = "atrac3plus", - .long_name = "ATRAC3+ (Adaptive TRansform Acoustic Coding 3+)", - .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_ATRAC3P, .capabilities = AV_CODEC_CAP_DR1, .priv_data_size = sizeof(ATRAC3PContext), .init = atrac3p_decode_init, .close = atrac3p_decode_close, - .decode = atrac3p_decode_frame, }; diff --git a/ext/at3_standalone/avcodec.h b/ext/at3_standalone/avcodec.h index 9d192d145e..ff63f759f7 100644 --- a/ext/at3_standalone/avcodec.h +++ b/ext/at3_standalone/avcodec.h @@ -360,48 +360,6 @@ typedef struct RcOverride{ struct AVBufferRef; -typedef struct AVPacket { - /** - * A reference to the reference-counted buffer where the packet data is - * stored. - * May be NULL, then the packet data is not reference-counted. - */ - AVBufferRef *buf; - /** - * Presentation timestamp in AVStream->time_base units; the time at which - * the decompressed packet will be presented to the user. - * Can be AV_NOPTS_VALUE if it is not stored in the file. - * pts MUST be larger or equal to dts as presentation cannot happen before - * decompression, unless one wants to view hex dumps. Some formats misuse - * the terms dts and pts/cts to mean something different. Such timestamps - * must be converted to true pts/dts before they are stored in AVPacket. - */ - int64_t pts; - /** - * Decompression timestamp in AVStream->time_base units; the time at which - * the packet is decompressed. - * Can be AV_NOPTS_VALUE if it is not stored in the file. - */ - int64_t dts; - uint8_t *data; - int size; - int stream_index; - /** - * A combination of AV_PKT_FLAG values - */ - int flags; - - /** - * Duration of this packet in AVStream->time_base units, 0 if unknown. - * Equals next_pts - this_pts in presentation order. - */ - int64_t duration; - - int64_t pos; ///< byte position in stream, -1 if unknown -} AVPacket; -#define AV_PKT_FLAG_KEY 0x0001 ///< The packet contains a keyframe -#define AV_PKT_FLAG_CORRUPT 0x0002 ///< The packet content is corrupted - /** * @} */ @@ -425,7 +383,6 @@ typedef struct AVCodecContext { const AVClass *av_class; int log_level_offset; - enum AVMediaType codec_type; /* see AVMEDIA_TYPE_xxx */ const struct AVCodec *codec; #if FF_API_CODEC_NAME /** @@ -504,28 +461,6 @@ typedef struct AVCodecContext { uint8_t *extradata; int extradata_size; - /** - * This is the fundamental unit of time (in seconds) in terms - * of which frame timestamps are represented. For fixed-fps content, - * timebase should be 1/framerate and timestamp increments should be - * identically 1. - * This often, but not always is the inverse of the frame rate or field rate - * for video. - * - encoding: MUST be set by user. - * - decoding: the use of this field for decoding is deprecated. - * Use framerate instead. - */ - AVRational time_base; - - /** - * For some codecs, the time base is closer to the field rate than the frame rate. - * Most notably, H.264 and MPEG-2 specify time_base as half of frame duration - * if no telecine is used ... - * - * Set to time_base ticks per frame. Default 1, e.g., H.264/MPEG-2 set it to 2. - */ - int ticks_per_frame; - /** * Codec delay. * @@ -550,104 +485,6 @@ typedef struct AVCodecContext { */ int delay; -#if FF_API_ASPECT_EXTENDED -#define FF_ASPECT_EXTENDED 15 -#endif - - /** - * qscale offset between IP and B-frames - * - encoding: Set by user. - * - decoding: unused - */ - float b_quant_offset; - - -#if FF_API_PRIVATE_OPT - /** @deprecated use encoder private options instead */ - attribute_deprecated - int mpeg_quant; -#endif - - /** - * slice count - * - encoding: Set by libavcodec. - * - decoding: Set by user (or 0). - */ - int slice_count; - -#if FF_API_PRIVATE_OPT - /** @deprecated use encoder private options instead */ - attribute_deprecated - int prediction_method; -#define FF_PRED_LEFT 0 -#define FF_PRED_PLANE 1 -#define FF_PRED_MEDIAN 2 -#endif - - /** - * slice offsets in the frame in bytes - * - encoding: Set/allocated by libavcodec. - * - decoding: Set/allocated by user (or NULL). - */ - int *slice_offset; - - - /** - * custom intra quantization matrix - * - encoding: Set by user, can be NULL. - * - decoding: Set by libavcodec. - */ - uint16_t *intra_matrix; - - /** - * custom inter quantization matrix - * - encoding: Set by user, can be NULL. - * - decoding: Set by libavcodec. - */ - uint16_t *inter_matrix; - - /** - * - * - encoding: Set by user. - * - decoding: unused - */ - int bidir_refine; - -#if FF_API_PRIVATE_OPT - /** @deprecated use encoder private options instead */ - attribute_deprecated - int brd_scale; -#endif - - /** - * minimum GOP size - * - encoding: Set by user. - * - decoding: unused - */ - int keyint_min; - - /** - * number of reference frames - * - encoding: Set by user. - * - decoding: Set by lavc. - */ - int refs; - - /** - * Number of slices. - * Indicates number of picture subdivisions. Used for parallelized - * decoding. - * - encoding: Set by user - * - decoding: unused - */ - int slices; - - /** Field order - * - encoding: set by libavcodec - * - decoding: Set by user. - */ - enum AVFieldOrder field_order; - /* audio only */ int sample_rate; ///< samples per second int channels; ///< number of audio channels @@ -702,28 +539,6 @@ typedef struct AVCodecContext { */ uint64_t channel_layout; - /** - * Request decoder to use this channel layout if it can (0 for default) - * - encoding: unused - * - decoding: Set by user. - */ - uint64_t request_channel_layout; - - /** - * Type of service that the audio stream conveys. - * - encoding: Set by user. - * - decoding: Set by libavcodec. - */ - enum AVAudioServiceType audio_service_type; - - /** - * desired sample format - * - encoding: Not used. - * - decoding: Set by user. - * Decoder will decode to this format if it can. - */ - enum AVSampleFormat request_sample_fmt; - /** * This callback is called at the beginning of each frame to get data * buffer(s) for it. There may be one contiguous buffer for all the data or @@ -819,37 +634,6 @@ typedef struct AVCodecContext { */ int refcounted_frames; - /** - * decoder bitstream buffer size - * - encoding: Set by user. - * - decoding: unused - */ - int rc_buffer_size; - - /** - * ratecontrol override, see RcOverride - * - encoding: Allocated/set/freed by user. - * - decoding: unused - */ - int rc_override_count; - RcOverride *rc_override; - - /** - * error concealment flags - * - encoding: unused - * - decoding: Set by user. - */ - int error_concealment; -#define FF_EC_GUESS_MVS 1 -#define FF_EC_DEBLOCK 2 -#define FF_EC_FAVOR_INTER 256 - - /** - * Error recognition; may misdetect some more or less valid parts as errors. - * - encoding: unused - * - decoding: Set by user. - */ - int err_recognition; /** * Verify checksums embedded in the bitstream (could be of either encoded or @@ -909,41 +693,6 @@ typedef struct AVCodecContext { #endif #define FF_IDCT_SIMPLEAUTO 128 - /** - * bits per sample/pixel from the demuxer (needed for huffyuv). - * - encoding: Set by libavcodec. - * - decoding: Set by user. - */ - int bits_per_coded_sample; - - /** - * Bits per sample/pixel of internal libavcodec pixel/sample format. - * - encoding: set by user. - * - decoding: set by libavcodec. - */ - int bits_per_raw_sample; - - /** - * noise vs. sse weight for the nsse comparison function - * - encoding: Set by user. - * - decoding: unused - */ - int nsse_weight; - - /** - * Skip IDCT/dequantization for selected frames. - * - encoding: unused - * - decoding: Set by user. - */ - enum AVDiscard skip_idct; - - /** - * Skip decoding for selected frames. - * - encoding: unused - * - decoding: Set by user. - */ - enum AVDiscard skip_frame; - /** * Audio only. The number of "priming" samples (padding) inserted by the @@ -961,47 +710,8 @@ typedef struct AVCodecContext { * -initial_padding. */ int initial_padding; - - /** - * Timebase in which pkt_dts/pts and AVPacket.dts/pts are. - * Code outside libavcodec should access this field using: - * av_codec_{get,set}_pkt_timebase(avctx) - * - encoding unused. - * - decoding set by user. - */ - AVRational pkt_timebase; - - /** - * Number of samples to skip after a discontinuity - * - decoding: unused - * - encoding: set by libavcodec - */ - int seek_preroll; - - /* - * Properties of the stream that gets decoded - * To be accessed through av_codec_get_properties() (NO direct access) - * - encoding: unused - * - decoding: set by libavcodec - */ - unsigned properties; -#define FF_CODEC_PROPERTY_LOSSLESS 0x00000001 -#define FF_CODEC_PROPERTY_CLOSED_CAPTIONS 0x00000002 - } AVCodecContext; -/** - * AVProfile. - */ -typedef struct AVProfile { - int profile; - const char *name; ///< short name for the profile -} AVProfile; - -typedef struct AVCodecDefault AVCodecDefault; - -struct AVSubtitle; - /** * AVCodec. */ @@ -1013,26 +723,14 @@ typedef struct AVCodec { * This is the primary way to find a codec from the user perspective. */ const char *name; - /** - * Descriptive name for the codec, meant to be more human readable than name. - * You should use the NULL_IF_CONFIG_SMALL() macro to define it. - */ - const char *long_name; - enum AVMediaType type; enum AVCodecID id; /** * Codec capabilities. * see AV_CODEC_CAP_* */ int capabilities; - const AVRational *supported_framerates; ///< array of supported framerates, or NULL if any, array is terminated by {0,0} - const enum AVPixelFormat *pix_fmts; ///< array of supported pixel formats, or NULL if unknown, array is terminated by -1 - const int *supported_samplerates; ///< array of supported audio samplerates, or NULL if unknown, array is terminated by 0 - const enum AVSampleFormat *sample_fmts; ///< array of supported sample formats, or NULL if unknown, array is terminated by -1 const uint64_t *channel_layouts; ///< array of support channel layouts, or NULL if unknown. array is terminated by 0 - uint8_t max_lowres; ///< maximum value for lowres supported by the decoder, no direct access, use av_codec_get_max_lowres() const AVClass *priv_class; ///< AVClass for the private context - const AVProfile *profiles; ///< array of recognized profiles, or NULL if unknown, array is terminated by {FF_PROFILE_UNKNOWN} /***************************************************************** * No fields below this line are part of the public API. They @@ -1042,31 +740,6 @@ typedef struct AVCodec { ***************************************************************** */ int priv_data_size; - struct AVCodec *next; - /** - * @name Frame-level threading support functions - * @{ - */ - /** - * If defined, called on thread contexts when they are created. - * If the codec allocates writable tables in init(), re-allocate them here. - * priv_data will be set to a copy of the original. - */ - int (*init_thread_copy)(AVCodecContext *); - /** - * Copy necessary context variables from a previous thread context to the current one. - * If not defined, the next thread will start automatically; otherwise, the codec - * must call ff_thread_finish_setup(). - * - * dst and src will (rarely) point to the same context, in which case memcpy should be skipped. - */ - int (*update_thread_context)(AVCodecContext *dst, const AVCodecContext *src); - /** @} */ - - /** - * Private codec-specific defaults. - */ - const AVCodecDefault *defaults; /** * Initialize codec static data, called from avcodec_register(). @@ -1074,8 +747,6 @@ typedef struct AVCodec { void (*init_static_data)(struct AVCodec *codec); int (*init)(AVCodecContext *); - int (*encode_sub)(AVCodecContext *, uint8_t *buf, int buf_size, - const struct AVSubtitle *sub); /** * Encode data to an AVPacket. * @@ -1086,9 +757,6 @@ typedef struct AVCodec { * non-empty packet was returned in avpkt. * @return 0 on success, negative error code on failure */ - int (*encode2)(AVCodecContext *avctx, AVPacket *avpkt, const AVFrame *frame, - int *got_packet_ptr); - int (*decode)(AVCodecContext *, void *outdata, int *outdata_size, AVPacket *avpkt); int (*close)(AVCodecContext *); /** * Flush buffers. @@ -1102,259 +770,6 @@ typedef struct AVCodec { int caps_internal; } AVCodec; -int av_codec_get_max_lowres(const AVCodec *codec); - -struct MpegEncContext; - -/** - * @defgroup lavc_hwaccel AVHWAccel - * @{ - */ -typedef struct AVHWAccel { - /** - * Name of the hardware accelerated codec. - * The name is globally unique among encoders and among decoders (but an - * encoder and a decoder can share the same name). - */ - const char *name; - - /** - * Type of codec implemented by the hardware accelerator. - * - * See AVMEDIA_TYPE_xxx - */ - enum AVMediaType type; - - /** - * Codec implemented by the hardware accelerator. - * - * See AV_CODEC_ID_xxx - */ - enum AVCodecID id; - - /** - * Supported pixel format. - * - * Only hardware accelerated formats are supported here. - */ - enum AVPixelFormat pix_fmt; - - /** - * Hardware accelerated codec capabilities. - * see HWACCEL_CODEC_CAP_* - */ - int capabilities; - - /***************************************************************** - * No fields below this line are part of the public API. They - * may not be used outside of libavcodec and can be changed and - * removed at will. - * New public fields should be added right above. - ***************************************************************** - */ - struct AVHWAccel *next; - - /** - * Allocate a custom buffer - */ - int (*alloc_frame)(AVCodecContext *avctx, AVFrame *frame); - - /** - * Called at the beginning of each frame or field picture. - * - * Meaningful frame information (codec specific) is guaranteed to - * be parsed at this point. This function is mandatory. - * - * Note that buf can be NULL along with buf_size set to 0. - * Otherwise, this means the whole frame is available at this point. - * - * @param avctx the codec context - * @param buf the frame data buffer base - * @param buf_size the size of the frame in bytes - * @return zero if successful, a negative value otherwise - */ - int (*start_frame)(AVCodecContext *avctx, const uint8_t *buf, uint32_t buf_size); - - /** - * Callback for each slice. - * - * Meaningful slice information (codec specific) is guaranteed to - * be parsed at this point. This function is mandatory. - * The only exception is XvMC, that works on MB level. - * - * @param avctx the codec context - * @param buf the slice data buffer base - * @param buf_size the size of the slice in bytes - * @return zero if successful, a negative value otherwise - */ - int (*decode_slice)(AVCodecContext *avctx, const uint8_t *buf, uint32_t buf_size); - - /** - * Called at the end of each frame or field picture. - * - * The whole picture is parsed at this point and can now be sent - * to the hardware accelerator. This function is mandatory. - * - * @param avctx the codec context - * @return zero if successful, a negative value otherwise - */ - int (*end_frame)(AVCodecContext *avctx); - - /** - * Size of per-frame hardware accelerator private data. - * - * Private data is allocated with av_mallocz() before - * AVCodecContext.get_buffer() and deallocated after - * AVCodecContext.release_buffer(). - */ - int frame_priv_data_size; - - /** - * Called for every Macroblock in a slice. - * - * XvMC uses it to replace the ff_mpv_decode_mb(). - * Instead of decoding to raw picture, MB parameters are - * stored in an array provided by the video driver. - * - * @param s the mpeg context - */ - void (*decode_mb)(struct MpegEncContext *s); - - /** - * Initialize the hwaccel private data. - * - * This will be called from ff_get_format(), after hwaccel and - * hwaccel_context are set and the hwaccel private data in AVCodecInternal - * is allocated. - */ - int (*init)(AVCodecContext *avctx); - - /** - * Uninitialize the hwaccel private data. - * - * This will be called from get_format() or avcodec_close(), after hwaccel - * and hwaccel_context are already uninitialized. - */ - int (*uninit)(AVCodecContext *avctx); - - /** - * Size of the private data to allocate in - * AVCodecInternal.hwaccel_priv_data. - */ - int priv_data_size; -} AVHWAccel; - -/** - * Hardware acceleration should be used for decoding even if the codec level - * used is unknown or higher than the maximum supported level reported by the - * hardware driver. - * - * It's generally a good idea to pass this flag unless you have a specific - * reason not to, as hardware tends to under-report supported levels. - */ -#define AV_HWACCEL_FLAG_IGNORE_LEVEL (1 << 0) - -/** - * Hardware acceleration can output YUV pixel formats with a different chroma - * sampling than 4:2:0 and/or other than 8 bits per component. - */ -#define AV_HWACCEL_FLAG_ALLOW_HIGH_DEPTH (1 << 1) - -/** - * @} - */ - -#if FF_API_AVPICTURE -/** - * @defgroup lavc_picture AVPicture - * - * Functions for working with AVPicture - * @{ - */ - -/** - * Picture data structure. - * - * Up to four components can be stored into it, the last component is - * alpha. - * @deprecated use AVFrame or imgutils functions instead - */ -typedef struct AVPicture { - attribute_deprecated - uint8_t *data[AV_NUM_DATA_POINTERS]; ///< pointers to the image data planes - attribute_deprecated - int linesize[AV_NUM_DATA_POINTERS]; ///< number of bytes per line -} AVPicture; - -/** - * @} - */ -#endif - -enum AVSubtitleType { - SUBTITLE_NONE, - - SUBTITLE_BITMAP, ///< A bitmap, pict will be set - - /** - * Plain text, the text field must be set by the decoder and is - * authoritative. ass and pict fields may contain approximations. - */ - SUBTITLE_TEXT, - - /** - * Formatted text, the ass field must be set by the decoder and is - * authoritative. pict and text fields may contain approximations. - */ - SUBTITLE_ASS, -}; - -#define AV_SUBTITLE_FLAG_FORCED 0x00000001 - -typedef struct AVSubtitleRect { - int x; ///< top left corner of pict, undefined when pict is not set - int y; ///< top left corner of pict, undefined when pict is not set - int w; ///< width of pict, undefined when pict is not set - int h; ///< height of pict, undefined when pict is not set - int nb_colors; ///< number of colors in pict, undefined when pict is not set - -#if FF_API_AVPICTURE - /** - * @deprecated unused - */ - attribute_deprecated - AVPicture pict; -#endif - /** - * data+linesize for the bitmap of this subtitle. - * Can be set for text/ass as well once they are rendered. - */ - uint8_t *data[4]; - int linesize[4]; - - enum AVSubtitleType type; - - char *text; ///< 0 terminated plain UTF-8 text - - /** - * 0 terminated ASS/SSA compatible event line. - * The presentation of this is unaffected by the other values in this - * struct. - */ - char *ass; - - int flags; -} AVSubtitleRect; - -typedef struct AVSubtitle { - uint16_t format; /* 0 = graphics */ - uint32_t start_display_time; /* relative to packet pts, in ms */ - uint32_t end_display_time; /* relative to packet pts, in ms */ - unsigned num_rects; - AVSubtitleRect **rects; - int64_t pts; ///< Same as packet pts, in AV_TIME_BASE -} AVSubtitle; - /** * If c is NULL, returns the first registered codec, * if c is non-NULL, returns the next registered codec after c, @@ -1362,43 +777,6 @@ typedef struct AVSubtitle { */ AVCodec *av_codec_next(const AVCodec *c); -/** - * Return the LIBAVCODEC_VERSION_INT constant. - */ -unsigned avcodec_version(void); - -/** - * Return the libavcodec build-time configuration. - */ -const char *avcodec_configuration(void); - -/** - * Return the libavcodec license. - */ -const char *avcodec_license(void); - -/** - * Register the codec codec and initialize libavcodec. - * - * @warning either this function or avcodec_register_all() must be called - * before any other libavcodec functions. - * - * @see avcodec_register_all() - */ -void avcodec_register(AVCodec *codec); - -/** - * Register all the codecs, parsers and bitstream filters which were enabled at - * configuration time. If you do not call this function you can select exactly - * which formats you want to support, by using the individual registration - * functions. - * - * @see avcodec_register - * @see av_register_codec_parser - * @see av_register_bitstream_filter - */ -void avcodec_register_all(void); - /** * Allocate an AVCodecContext and set its fields to default values. The * resulting struct should be freed with avcodec_free_context(). @@ -1432,43 +810,6 @@ void avcodec_free_context(AVCodecContext **avctx); */ int avcodec_get_context_defaults3(AVCodecContext *s, const AVCodec *codec); -/** - * Get the AVClass for AVCodecContext. It can be used in combination with - * AV_OPT_SEARCH_FAKE_OBJ for examining options. - * - * @see av_opt_find(). - */ -const AVClass *avcodec_get_class(void); - -/** - * Get the AVClass for AVFrame. It can be used in combination with - * AV_OPT_SEARCH_FAKE_OBJ for examining options. - * - * @see av_opt_find(). - */ -const AVClass *avcodec_get_frame_class(void); - -/** - * Get the AVClass for AVSubtitleRect. It can be used in combination with - * AV_OPT_SEARCH_FAKE_OBJ for examining options. - * - * @see av_opt_find(). - */ -const AVClass *avcodec_get_subtitle_rect_class(void); - -/** - * Copy the settings of the source AVCodecContext into the destination - * AVCodecContext. The resulting destination codec context will be - * unopened, i.e. you are required to call avcodec_open2() before you - * can use this AVCodecContext to decode/encode video/audio data. - * - * @param dest target codec context, should be initialized with - * avcodec_alloc_context3(NULL), but otherwise uninitialized - * @param src source codec context - * @return AVERROR() on error (e.g. memory allocation error), 0 on success - */ -int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src); - /** * Initialize the AVCodecContext to use the given AVCodec. Prior to using this * function the context has to be allocated with avcodec_alloc_context3(). @@ -1521,176 +862,6 @@ int avcodec_open2(AVCodecContext *avctx, const AVCodec *codec, void *options); */ int avcodec_close(AVCodecContext *avctx); -/** - * @} - */ - -/** - * @addtogroup lavc_packet - * @{ - */ - -/** - * Allocate an AVPacket and set its fields to default values. The resulting - * struct must be freed using av_packet_free(). - * - * @return An AVPacket filled with default values or NULL on failure. - * - * @note this only allocates the AVPacket itself, not the data buffers. Those - * must be allocated through other means such as av_new_packet. - * - * @see av_new_packet - */ -AVPacket *av_packet_alloc(void); - -/** - * Create a new packet that references the same data as src. - * - * This is a shortcut for av_packet_alloc()+av_packet_ref(). - * - * @return newly created AVPacket on success, NULL on error. - * - * @see av_packet_alloc - * @see av_packet_ref - */ -AVPacket *av_packet_clone(AVPacket *src); - -/** - * Free the packet, if the packet is reference counted, it will be - * unreferenced first. - * - * @param packet packet to be freed. The pointer will be set to NULL. - * @note passing NULL is a no-op. - */ -void av_packet_free(AVPacket **pkt); - -/** - * Initialize optional fields of a packet with default values. - * - * Note, this does not touch the data and size members, which have to be - * initialized separately. - * - * @param pkt packet - */ -void av_init_packet(AVPacket *pkt); - -/** - * Allocate the payload of a packet and initialize its fields with - * default values. - * - * @param pkt packet - * @param size wanted payload size - * @return 0 if OK, AVERROR_xxx otherwise - */ -int av_new_packet(AVPacket *pkt, int size); - -/** - * Initialize a reference-counted packet from av_malloc()ed data. - * - * @param pkt packet to be initialized. This function will set the data, size, - * buf and destruct fields, all others are left untouched. - * @param data Data allocated by av_malloc() to be used as packet data. If this - * function returns successfully, the data is owned by the underlying AVBuffer. - * The caller may not access the data through other means. - * @param size size of data in bytes, without the padding. I.e. the full buffer - * size is assumed to be size + AV_INPUT_BUFFER_PADDING_SIZE. - * - * @return 0 on success, a negative AVERROR on error - */ -int av_packet_from_data(AVPacket *pkt, uint8_t *data, int size); - -#if FF_API_AVPACKET_OLD_API -/** - * @warning This is a hack - the packet memory allocation stuff is broken. The - * packet is allocated if it was not really allocated. - * - * @deprecated Use av_packet_ref - */ -attribute_deprecated -int av_dup_packet(AVPacket *pkt); -/** - * Copy packet, including contents - * - * @return 0 on success, negative AVERROR on fail - */ -int av_copy_packet(AVPacket *dst, const AVPacket *src); - -/** - * Free a packet. - * - * @deprecated Use av_packet_unref - * - * @param pkt packet to free - */ -attribute_deprecated -void av_free_packet(AVPacket *pkt); -#endif - -/** - * Setup a new reference to the data described by a given packet - * - * If src is reference-counted, setup dst as a new reference to the - * buffer in src. Otherwise allocate a new buffer in dst and copy the - * data from src into it. - * - * All the other fields are copied from src. - * - * @see av_packet_unref - * - * @param dst Destination packet - * @param src Source packet - * - * @return 0 on success, a negative AVERROR on error. - */ -int av_packet_ref(AVPacket *dst, const AVPacket *src); - -/** - * Wipe the packet. - * - * Unreference the buffer referenced by the packet and reset the - * remaining packet fields to their default values. - * - * @param pkt The packet to be unreferenced. - */ -void av_packet_unref(AVPacket *pkt); - -/** - * Move every field in src to dst and reset src. - * - * @see av_packet_unref - * - * @param src Source packet, will be reset - * @param dst Destination packet - */ -void av_packet_move_ref(AVPacket *dst, AVPacket *src); - -/** - * Copy only "properties" fields from src to dst. - * - * Properties for the purpose of this function are all the fields - * beside those related to the packet data (buf, data, size) - * - * @param dst Destination packet - * @param src Source packet - * - * @return 0 on success AVERROR on failure. - * - */ -int av_packet_copy_props(AVPacket *dst, const AVPacket *src); - -/** - * Convert valid timing fields (timestamps / durations) in a packet from one - * timebase to another. Timestamps with unknown values (AV_NOPTS_VALUE) will be - * ignored. - * - * @param pkt packet on which the conversion will be performed - * @param tb_src source timebase, in which the timing fields in pkt are - * expressed - * @param tb_dst destination timebase, to which the timing fields will be - * converted - */ -void av_packet_rescale_ts(AVPacket *pkt, AVRational tb_src, AVRational tb_dst); - /** * @} */ diff --git a/ext/at3_standalone/avpacket.c b/ext/at3_standalone/avpacket.c deleted file mode 100644 index a067ef3f7b..0000000000 --- a/ext/at3_standalone/avpacket.c +++ /dev/null @@ -1,287 +0,0 @@ -/* - * AVPacket functions for libavcodec - * Copyright (c) 2000, 2001, 2002 Fabrice Bellard - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include - -#include "common.h" -#include "internal.h" -#include "mathematics.h" -#include "mem.h" -#include "avcodec.h" -#include "bytestream.h" -#include "internal.h" - -void av_init_packet(AVPacket *pkt) -{ - pkt->pts = AV_NOPTS_VALUE; - pkt->dts = AV_NOPTS_VALUE; - pkt->pos = -1; - pkt->duration = 0; -#if FF_API_CONVERGENCE_DURATION -FF_DISABLE_DEPRECATION_WARNINGS - pkt->convergence_duration = 0; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - pkt->flags = 0; - pkt->stream_index = 0; - pkt->buf = NULL; -} - -AVPacket *av_packet_alloc(void) -{ - AVPacket *pkt = av_mallocz(sizeof(AVPacket)); - if (!pkt) - return pkt; - - av_packet_unref(pkt); - - return pkt; -} - -void av_packet_free(AVPacket **pkt) -{ - if (!pkt || !*pkt) - return; - - av_packet_unref(*pkt); - av_freep(pkt); -} - -static int packet_alloc(AVBufferRef **buf, int size) -{ - int ret; - if (size < 0 || size >= INT_MAX - AV_INPUT_BUFFER_PADDING_SIZE) - return AVERROR(EINVAL); - - ret = av_buffer_realloc(buf, size + AV_INPUT_BUFFER_PADDING_SIZE); - if (ret < 0) - return ret; - - memset((*buf)->data + size, 0, AV_INPUT_BUFFER_PADDING_SIZE); - - return 0; -} - -int av_new_packet(AVPacket *pkt, int size) -{ - AVBufferRef *buf = NULL; - int ret = packet_alloc(&buf, size); - if (ret < 0) - return ret; - - av_init_packet(pkt); - pkt->buf = buf; - pkt->data = buf->data; - pkt->size = size; - - return 0; -} - -int av_packet_from_data(AVPacket *pkt, uint8_t *data, int size) -{ - if (size >= INT_MAX - AV_INPUT_BUFFER_PADDING_SIZE) - return AVERROR(EINVAL); - - pkt->buf = av_buffer_create(data, size + AV_INPUT_BUFFER_PADDING_SIZE, - av_buffer_default_free, NULL, 0); - if (!pkt->buf) - return AVERROR(ENOMEM); - - pkt->data = data; - pkt->size = size; - - return 0; -} - -#if FF_API_AVPACKET_OLD_API -FF_DISABLE_DEPRECATION_WARNINGS -#define ALLOC_MALLOC(data, size) data = av_malloc(size) -#define ALLOC_BUF(data, size) \ -do { \ - av_buffer_realloc(&pkt->buf, size); \ - data = pkt->buf ? pkt->buf->data : NULL; \ -} while (0) - -#define DUP_DATA(dst, src, size, padding, ALLOC) \ - do { \ - void *data; \ - if (padding) { \ - if ((unsigned)(size) > \ - (unsigned)(size) + AV_INPUT_BUFFER_PADDING_SIZE) \ - goto failed_alloc; \ - ALLOC(data, size + AV_INPUT_BUFFER_PADDING_SIZE); \ - } else { \ - ALLOC(data, size); \ - } \ - if (!data) \ - goto failed_alloc; \ - memcpy(data, src, size); \ - if (padding) \ - memset((uint8_t *)data + size, 0, \ - AV_INPUT_BUFFER_PADDING_SIZE); \ - dst = data; \ - } while (0) - -/* Makes duplicates of data, side_data, but does not copy any other fields */ -static int copy_packet_data(AVPacket *pkt, const AVPacket *src, int dup) -{ - pkt->data = NULL; - if (pkt->buf) { - AVBufferRef *ref = av_buffer_ref(src->buf); - if (!ref) - return AVERROR(ENOMEM); - pkt->buf = ref; - pkt->data = ref->data; - } else { - DUP_DATA(pkt->data, src->data, pkt->size, 1, ALLOC_BUF); - } - return 0; - -failed_alloc: - av_packet_unref(pkt); - return AVERROR(ENOMEM); -} - -FF_ENABLE_DEPRECATION_WARNINGS -#endif - -int av_dup_packet(AVPacket *pkt) -{ - AVPacket tmp_pkt; - - if (!pkt->buf && pkt->data) { - tmp_pkt = *pkt; - return copy_packet_data(pkt, &tmp_pkt, 1); - } - return 0; -} - -int av_copy_packet(AVPacket *dst, const AVPacket *src) -{ - *dst = *src; - return copy_packet_data(dst, src, 0); -} - -#if FF_API_AVPACKET_OLD_API -FF_DISABLE_DEPRECATION_WARNINGS -void av_free_packet(AVPacket *pkt) -{ - if (pkt) { - if (pkt->buf) - av_buffer_unref(&pkt->buf); - pkt->data = NULL; - pkt->size = 0; - } -} -FF_ENABLE_DEPRECATION_WARNINGS -#endif - -#define FF_MERGE_MARKER 0x8c4d9d108e25e9feULL - -int av_packet_copy_props(AVPacket *dst, const AVPacket *src) -{ - int i; - - dst->pts = src->pts; - dst->dts = src->dts; - dst->pos = src->pos; - dst->duration = src->duration; -#if FF_API_CONVERGENCE_DURATION -FF_DISABLE_DEPRECATION_WARNINGS - dst->convergence_duration = src->convergence_duration; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - dst->flags = src->flags; - dst->stream_index = src->stream_index; - - return 0; -} - -void av_packet_unref(AVPacket *pkt) -{ - av_buffer_unref(&pkt->buf); - av_init_packet(pkt); - pkt->data = NULL; - pkt->size = 0; -} - -int av_packet_ref(AVPacket *dst, const AVPacket *src) -{ - int ret; - - ret = av_packet_copy_props(dst, src); - if (ret < 0) - return ret; - - if (!src->buf) { - ret = packet_alloc(&dst->buf, src->size); - if (ret < 0) - goto fail; - memcpy(dst->buf->data, src->data, src->size); - } else { - dst->buf = av_buffer_ref(src->buf); - if (!dst->buf) { - ret = AVERROR(ENOMEM); - goto fail; - } - } - - dst->size = src->size; - dst->data = dst->buf->data; - return 0; -fail: - return ret; -} - -AVPacket *av_packet_clone(AVPacket *src) -{ - AVPacket *ret = av_packet_alloc(); - - if (!ret) - return ret; - - if (av_packet_ref(ret, src)) - av_packet_free(&ret); - - return ret; -} - -void av_packet_move_ref(AVPacket *dst, AVPacket *src) -{ - *dst = *src; - av_init_packet(src); -} - -void av_packet_rescale_ts(AVPacket *pkt, AVRational src_tb, AVRational dst_tb) -{ - if (pkt->pts != AV_NOPTS_VALUE) - pkt->pts = av_rescale_q(pkt->pts, src_tb, dst_tb); - if (pkt->dts != AV_NOPTS_VALUE) - pkt->dts = av_rescale_q(pkt->dts, src_tb, dst_tb); - if (pkt->duration > 0) - pkt->duration = av_rescale_q(pkt->duration, src_tb, dst_tb); -#if FF_API_CONVERGENCE_DURATION -FF_DISABLE_DEPRECATION_WARNINGS - if (pkt->convergence_duration > 0) - pkt->convergence_duration = av_rescale_q(pkt->convergence_duration, src_tb, dst_tb); -FF_ENABLE_DEPRECATION_WARNINGS -#endif -} diff --git a/ext/at3_standalone/avutil.h b/ext/at3_standalone/avutil.h index 3ccfcdf7c0..2d569e8e0d 100644 --- a/ext/at3_standalone/avutil.h +++ b/ext/at3_standalone/avutil.h @@ -160,45 +160,6 @@ * @} */ -/** - * @addtogroup lavu_media Media Type - * @brief Media Type - */ - -enum AVMediaType { - AVMEDIA_TYPE_UNKNOWN = -1, ///< Usually treated as AVMEDIA_TYPE_DATA - AVMEDIA_TYPE_AUDIO, - AVMEDIA_TYPE_DATA, ///< Opaque data information usually continuous - AVMEDIA_TYPE_SUBTITLE, - AVMEDIA_TYPE_ATTACHMENT, ///< Opaque data information usually sparse - AVMEDIA_TYPE_NB -}; - -/** - * @defgroup lavu_const Constants - * @{ - * - * @defgroup lavu_enc Encoding specific - * - * @note those definition should move to avcodec - * @{ - */ - -#define FF_LAMBDA_SHIFT 7 -#define FF_LAMBDA_SCALE (1<data is already set, avpkt->size is checked - * to ensure it is large enough. - * If avpkt->data is NULL, a new buffer is allocated. - * avpkt->size is set to the specified size. - * All other AVPacket fields will be reset with av_init_packet(). - * @param size the minimum required packet size - * @param min_size This is a hint to the allocation algorithm, which indicates - * to what minimal size the caller might later shrink the packet - * to. Encoders often allocate packets which are larger than the - * amount of data that is written into them as the exact amount is - * not known at the time of allocation. min_size represents the - * size a packet might be shrunk to by the caller. Can be set to - * 0. setting this roughly correctly allows the allocation code - * to choose between several allocation strategies to improve - * speed slightly. - * @return non negative on success, negative error code on failure - */ -int ff_alloc_packet2(AVCodecContext *avctx, AVPacket *avpkt, int64_t size, int64_t min_size); - -attribute_deprecated int ff_alloc_packet(AVPacket *avpkt, int size); - /** * Get a buffer for a frame. This is a wrapper around * AVCodecContext.get_buffer() and should be used instead calling get_buffer() diff --git a/ext/at3_standalone/options.c b/ext/at3_standalone/options.c index dfbb484df3..a7e3b0cb6c 100644 --- a/ext/at3_standalone/options.c +++ b/ext/at3_standalone/options.c @@ -31,47 +31,15 @@ #include /* FLT_MIN, FLT_MAX */ #include -static void *codec_child_next(void *obj, void *prev) -{ - AVCodecContext *s = obj; - if (!prev && s->codec && s->codec->priv_class && s->priv_data) - return s->priv_data; - return NULL; -} - -static const AVClass *codec_child_class_next(const AVClass *prev) -{ - AVCodec *c = NULL; - - /* find the codec that corresponds to prev */ - while (prev && (c = av_codec_next(c))) - if (c->priv_class == prev) - break; - - /* find next codec with priv options */ - while (c = av_codec_next(c)) - if (c->priv_class) - return c->priv_class; - return NULL; -} - -static AVClassCategory get_category(void *ptr) -{ - AVCodecContext* avctx = ptr; - if(avctx->codec && avctx->codec->decode) return AV_CLASS_CATEGORY_DECODER; - else return AV_CLASS_CATEGORY_ENCODER; -} - static const AVClass av_codec_context_class = { .class_name = "AVCodecContext", .item_name = NULL, .option = NULL, .version = LIBAVUTIL_VERSION_INT, .log_level_offset_offset = offsetof(AVCodecContext, log_level_offset), - .child_next = codec_child_next, - .child_class_next = codec_child_class_next, - .category = AV_CLASS_CATEGORY_ENCODER, - .get_category = get_category, + .child_next = NULL, + .child_class_next = NULL, + .category = AV_CLASS_CATEGORY_DECODER, }; int avcodec_get_context_defaults3(AVCodecContext *s, const AVCodec *codec) @@ -81,14 +49,11 @@ int avcodec_get_context_defaults3(AVCodecContext *s, const AVCodec *codec) s->av_class = &av_codec_context_class; - s->codec_type = codec ? codec->type : AVMEDIA_TYPE_UNKNOWN; if (codec) { s->codec = codec; s->codec_id = codec->id; } - s->time_base = (AVRational){0,1}; - s->pkt_timebase = (AVRational){ 0, 1 }; s->get_buffer2 = avcodec_default_get_buffer2; s->sample_fmt = AV_SAMPLE_FMT_NONE; @@ -131,18 +96,10 @@ void avcodec_free_context(AVCodecContext **pavctx) avcodec_close(avctx); av_freep(&avctx->extradata); - av_freep(&avctx->intra_matrix); - av_freep(&avctx->inter_matrix); - av_freep(&avctx->rc_override); av_freep(pavctx); } -const AVClass *avcodec_get_class(void) -{ - return &av_codec_context_class; -} - #define FOFFSET(x) offsetof(AVFrame,x) static const AVClass av_frame_class = { @@ -152,9 +109,4 @@ static const AVClass av_frame_class = { .version = LIBAVUTIL_VERSION_INT, }; -const AVClass *avcodec_get_frame_class(void) -{ - return &av_frame_class; -} - #define SROFFSET(x) offsetof(AVSubtitleRect,x) diff --git a/ext/at3_standalone/utils.c b/ext/at3_standalone/utils.c index 5ac333dce5..2f3522e542 100644 --- a/ext/at3_standalone/utils.c +++ b/ext/at3_standalone/utils.c @@ -63,18 +63,6 @@ void av_fast_padded_malloc(void *ptr, unsigned int *size, size_t min_size) memset(*p + min_size, 0, AV_INPUT_BUFFER_PADDING_SIZE); } -/* encoder management */ -static AVCodec *first_avcodec = NULL; -static AVCodec **last_avcodec = &first_avcodec; - -AVCodec *av_codec_next(const AVCodec *c) -{ - if (c) - return c->next; - else - return first_avcodec; -} - static av_cold void avcodec_init(void) { static int initialized = 0; @@ -86,7 +74,7 @@ static av_cold void avcodec_init(void) int av_codec_is_decoder(const AVCodec *codec) { - return codec && codec->decode; + return 1; } #if FF_API_EMU_EDGE @@ -101,43 +89,36 @@ static int update_frame_pool(AVCodecContext *avctx, AVFrame *frame) FramePool *pool = avctx->internal->pool; int i, ret; - switch (avctx->codec_type) { - case AVMEDIA_TYPE_AUDIO: { - int ch = av_frame_get_channels(frame); //av_get_channel_layout_nb_channels(frame->channel_layout); - int planar = av_sample_fmt_is_planar(frame->format); - int planes = planar ? ch : 1; + int ch = av_frame_get_channels(frame); //av_get_channel_layout_nb_channels(frame->channel_layout); + int planar = av_sample_fmt_is_planar(frame->format); + int planes = planar ? ch : 1; - if (pool->format == frame->format && pool->planes == planes && - pool->channels == ch && frame->nb_samples == pool->samples) - return 0; + if (pool->format == frame->format && pool->planes == planes && + pool->channels == ch && frame->nb_samples == pool->samples) + return 0; - av_buffer_pool_uninit(&pool->pools[0]); - ret = av_samples_get_buffer_size(&pool->linesize[0], ch, - frame->nb_samples, frame->format, 0); - if (ret < 0) - goto fail; + av_buffer_pool_uninit(&pool->pools[0]); + ret = av_samples_get_buffer_size(&pool->linesize[0], ch, + frame->nb_samples, frame->format, 0); + if (ret < 0) + goto fail; - pool->pools[0] = av_buffer_pool_init(pool->linesize[0], NULL); - if (!pool->pools[0]) { - ret = AVERROR(ENOMEM); - goto fail; - } - - pool->format = frame->format; - pool->planes = planes; - pool->channels = ch; - pool->samples = frame->nb_samples; - break; - } - default: av_assert0(0); + pool->pools[0] = av_buffer_pool_init(pool->linesize[0], NULL); + if (!pool->pools[0]) { + ret = AVERROR(ENOMEM); + goto fail; } + + pool->format = frame->format; + pool->planes = planes; + pool->channels = ch; + pool->samples = frame->nb_samples; return 0; fail: for (i = 0; i < 4; i++) av_buffer_pool_uninit(&pool->pools[i]); pool->format = -1; pool->planes = pool->channels = pool->samples = 0; - pool->width = pool->height = 0; return ret; } @@ -190,54 +171,34 @@ int avcodec_default_get_buffer2(AVCodecContext *avctx, AVFrame *frame, int flags if ((ret = update_frame_pool(avctx, frame)) < 0) return ret; - switch (avctx->codec_type) { - case AVMEDIA_TYPE_AUDIO: - return audio_get_buffer(avctx, frame); - default: - return -1; - } + return audio_get_buffer(avctx, frame); } int ff_init_buffer_info(AVCodecContext *avctx, AVFrame *frame) { - AVPacket *pkt = avctx->internal->pkt; - if (pkt) { - av_frame_set_pkt_pos (frame, pkt->pos); - av_frame_set_pkt_duration(frame, pkt->duration); - av_frame_set_pkt_size (frame, pkt->size); - } else { - av_frame_set_pkt_pos (frame, -1); - av_frame_set_pkt_duration(frame, 0); - av_frame_set_pkt_size (frame, -1); - } - - switch (avctx->codec->type) { - case AVMEDIA_TYPE_AUDIO: - if (!frame->sample_rate) - frame->sample_rate = avctx->sample_rate; - if (frame->format < 0) - frame->format = avctx->sample_fmt; - if (!frame->channel_layout) { - if (avctx->channel_layout) { - if (av_get_channel_layout_nb_channels(avctx->channel_layout) != - avctx->channels) { - av_log(avctx, AV_LOG_ERROR, "Inconsistent channel " - "configuration.\n"); - return AVERROR(EINVAL); - } - - frame->channel_layout = avctx->channel_layout; - } else { - if (avctx->channels > FF_SANE_NB_CHANNELS) { - av_log(avctx, AV_LOG_ERROR, "Too many channels: %d.\n", - avctx->channels); - return AVERROR(ENOSYS); + if (!frame->sample_rate) + frame->sample_rate = avctx->sample_rate; + if (frame->format < 0) + frame->format = avctx->sample_fmt; + if (!frame->channel_layout) { + if (avctx->channel_layout) { + if (av_get_channel_layout_nb_channels(avctx->channel_layout) != + avctx->channels) { + av_log(avctx, AV_LOG_ERROR, "Inconsistent channel " + "configuration.\n"); + return AVERROR(EINVAL); } + + frame->channel_layout = avctx->channel_layout; + } else { + if (avctx->channels > FF_SANE_NB_CHANNELS) { + av_log(avctx, AV_LOG_ERROR, "Too many channels: %d.\n", + avctx->channels); + return AVERROR(ENOSYS); } } - av_frame_set_channels(frame, avctx->channels); - break; } + av_frame_set_channels(frame, avctx->channels); return 0; } @@ -254,18 +215,12 @@ int ff_get_buffer(AVCodecContext *avctx, AVFrame *frame, int flags) return ret; } -MAKE_ACCESSORS(AVCodecContext, codec, AVRational, pkt_timebase) -MAKE_ACCESSORS(AVCodecContext, codec, int, seek_preroll) - int attribute_align_arg ff_codec_open2_recursive(AVCodecContext *avctx, const AVCodec *codec, void **options) { int ret = 0; - ff_unlock_avcodec(codec); - ret = avcodec_open2(avctx, codec, options); - ff_lock_avcodec(avctx, codec); return ret; } @@ -287,10 +242,6 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code if (avctx->extradata_size < 0 || avctx->extradata_size >= FF_MAX_EXTRADATA_SIZE) return AVERROR(EINVAL); - ret = ff_lock_avcodec(avctx, codec); - if (ret < 0) - return ret; - avctx->internal = av_mallocz(sizeof(AVCodecInternal)); if (!avctx->internal) { ret = AVERROR(ENOMEM); @@ -303,12 +254,6 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code goto free_and_end; } - avctx->internal->to_free = av_frame_alloc(); - if (!avctx->internal->to_free) { - ret = AVERROR(ENOMEM); - goto free_and_end; - } - if (codec->priv_data_size > 0) { if (!avctx->priv_data) { avctx->priv_data = av_mallocz(codec->priv_data_size); @@ -330,25 +275,10 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code } avctx->codec = codec; - if ((avctx->codec_type == AVMEDIA_TYPE_UNKNOWN || avctx->codec_type == codec->type) && - avctx->codec_id == AV_CODEC_ID_NONE) { - avctx->codec_type = codec->type; - avctx->codec_id = codec->id; - } - if (avctx->codec_id != codec->id || (avctx->codec_type != codec->type - && avctx->codec_type != AVMEDIA_TYPE_ATTACHMENT)) { - av_log(avctx, AV_LOG_ERROR, "Codec type or id mismatches\n"); - ret = AVERROR(EINVAL); - goto free_and_end; - } + avctx->codec_id = codec->id; + avctx->frame_number = 0; - if (avctx->codec_type == AVMEDIA_TYPE_AUDIO && - (!avctx->time_base.num || !avctx->time_base.den)) { - avctx->time_base.num = 1; - avctx->time_base.den = avctx->sample_rate; - } - #if FF_API_VISMV if (avctx->debug_mv) av_log(avctx, AV_LOG_WARNING, "The 'vismv' option is deprecated, " @@ -401,7 +331,6 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code } end: - ff_unlock_avcodec(codec); return ret; free_and_end: @@ -417,7 +346,6 @@ FF_ENABLE_DEPRECATION_WARNINGS av_freep(&avctx->priv_data); if (avctx->internal) { - av_frame_free(&avctx->internal->to_free); av_freep(&avctx->internal->pool); } av_freep(&avctx->internal); @@ -425,52 +353,6 @@ FF_ENABLE_DEPRECATION_WARNINGS goto end; } -int ff_alloc_packet2(AVCodecContext *avctx, AVPacket *avpkt, int64_t size, int64_t min_size) -{ - if (avpkt->size < 0) { - av_log(avctx, AV_LOG_ERROR, "Invalid negative user packet size %d\n", avpkt->size); - return AVERROR(EINVAL); - } - if (size < 0 || size > INT_MAX - AV_INPUT_BUFFER_PADDING_SIZE) { - av_log(avctx, AV_LOG_ERROR, "Invalid minimum required packet size %"PRId64" (max allowed is %d)\n", - size, INT_MAX - AV_INPUT_BUFFER_PADDING_SIZE); - return AVERROR(EINVAL); - } - - if (avctx && 2*min_size < size) { // FIXME The factor needs to be finetuned - av_assert0(!avpkt->data || avpkt->data != avctx->internal->byte_buffer); - if (!avpkt->data || avpkt->size < size) { - av_fast_padded_malloc(&avctx->internal->byte_buffer, &avctx->internal->byte_buffer_size, size); - avpkt->data = avctx->internal->byte_buffer; - avpkt->size = avctx->internal->byte_buffer_size; - } - } - - if (avpkt->data) { - AVBufferRef *buf = avpkt->buf; - - if (avpkt->size < size) { - av_log(avctx, AV_LOG_ERROR, "User packet is too small (%d < %"PRId64")\n", avpkt->size, size); - return AVERROR(EINVAL); - } - - av_init_packet(avpkt); - avpkt->buf = buf; - avpkt->size = size; - return 0; - } else { - int ret = av_new_packet(avpkt, size); - if (ret < 0) - av_log(avctx, AV_LOG_ERROR, "Failed to allocate packet of size %"PRId64"\n", size); - return ret; - } -} - -int ff_alloc_packet(AVPacket *avpkt, int size) -{ - return ff_alloc_packet2(NULL, avpkt, size, 0); -} - av_cold int avcodec_close(AVCodecContext *avctx) { int i; @@ -484,7 +366,6 @@ av_cold int avcodec_close(AVCodecContext *avctx) avctx->codec->close(avctx); avctx->internal->byte_buffer_size = 0; av_freep(&avctx->internal->byte_buffer); - av_frame_free(&avctx->internal->to_free); for (i = 0; i < FF_ARRAY_ELEMS(pool->pools); i++) av_buffer_pool_uninit(&pool->pools[i]); av_freep(&avctx->internal->pool); @@ -499,39 +380,6 @@ void avcodec_flush_buffers(AVCodecContext *avctx) { if (avctx->codec->flush) avctx->codec->flush(avctx); - - if (!avctx->refcounted_frames) - av_frame_unref(avctx->internal->to_free); -} - -int ff_lock_avcodec(AVCodecContext *log_ctx, const AVCodec *codec) -{ - if (codec->caps_internal & FF_CODEC_CAP_INIT_THREADSAFE || !codec->init) - return 0; - - if (lockmgr_cb) { - if ((*lockmgr_cb)(&codec_mutex, AV_LOCK_OBTAIN)) - return -1; - } - - av_assert0(!ff_avcodec_locked); - ff_avcodec_locked = 1; - return 0; -} - -int ff_unlock_avcodec(const AVCodec *codec) -{ - if (codec->caps_internal & FF_CODEC_CAP_INIT_THREADSAFE || !codec->init) - return 0; - - av_assert0(ff_avcodec_locked); - ff_avcodec_locked = 0; - if (lockmgr_cb) { - if ((*lockmgr_cb)(&codec_mutex, AV_LOCK_RELEASE)) - return -1; - } - - return 0; } int avcodec_is_open(AVCodecContext *s) From d617aec8c8487b40829f095be1a033c48d94cd48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Thu, 11 Apr 2024 00:50:43 +0200 Subject: [PATCH 076/719] Simplify away AVFrame from decoding functions, remove buffer pools --- Common/Common.vcxproj | 5 - Common/Common.vcxproj.filters | 15 -- Core/HW/Atrac3Standalone.cpp | 28 ++- ext/at3_standalone/at3_decoders.h | 4 +- ext/at3_standalone/atrac3.c | 10 +- ext/at3_standalone/atrac3plusdec.c | 12 +- ext/at3_standalone/av_buffer.c | 289 ----------------------- ext/at3_standalone/avcodec.h | 204 ----------------- ext/at3_standalone/buffer.h | 252 -------------------- ext/at3_standalone/buffer_internal.h | 94 -------- ext/at3_standalone/frame.c | 180 --------------- ext/at3_standalone/frame.h | 331 --------------------------- ext/at3_standalone/internal.h | 121 ---------- ext/at3_standalone/options.c | 3 - ext/at3_standalone/utils.c | 172 +------------- 15 files changed, 27 insertions(+), 1693 deletions(-) delete mode 100644 ext/at3_standalone/av_buffer.c delete mode 100644 ext/at3_standalone/buffer.h delete mode 100644 ext/at3_standalone/buffer_internal.h delete mode 100644 ext/at3_standalone/frame.c delete mode 100644 ext/at3_standalone/frame.h diff --git a/Common/Common.vcxproj b/Common/Common.vcxproj index 0bbe283bfb..7f006fb156 100644 --- a/Common/Common.vcxproj +++ b/Common/Common.vcxproj @@ -394,8 +394,6 @@ - - @@ -405,7 +403,6 @@ - @@ -627,13 +624,11 @@ - - diff --git a/Common/Common.vcxproj.filters b/Common/Common.vcxproj.filters index 8905c36ed2..ceb388fa78 100644 --- a/Common/Common.vcxproj.filters +++ b/Common/Common.vcxproj.filters @@ -581,15 +581,9 @@ ext\at3_standalone - - ext\at3_standalone - ext\at3_standalone - - ext\at3_standalone - ext\at3_standalone @@ -623,9 +617,6 @@ ext\at3_standalone - - ext\at3_standalone - ext\at3_standalone @@ -1110,9 +1101,6 @@ ext\at3_standalone - - ext\at3_standalone - ext\at3_standalone @@ -1128,9 +1116,6 @@ ext\at3_standalone - - ext\at3_standalone - ext\at3_standalone diff --git a/Core/HW/Atrac3Standalone.cpp b/Core/HW/Atrac3Standalone.cpp index ee4596ed1c..11be9105f4 100644 --- a/Core/HW/Atrac3Standalone.cpp +++ b/Core/HW/Atrac3Standalone.cpp @@ -26,13 +26,17 @@ public: } else { ctx_ = avcodec_alloc_context3(&ff_atrac3_decoder); } - frame_ = av_frame_alloc(); + for (int i = 0; i < 2; i++) { + buffers_[i] = new float[4096]; + } } ~Atrac3Audio() { avcodec_close(ctx_); - av_frame_free(&frame_); av_freep(&ctx_->extradata); av_freep(&ctx_); + for (int i = 0; i < 2; i++) { + delete[] buffers_[i]; + } } bool Decode(const uint8_t *inbuf, int inbytes, uint8_t *outbuf, int *outbytes) override { @@ -57,27 +61,27 @@ public: // We just call the decode function directly without going through the whole packet machinery. int got_frame = 0; int result; + int nb_samples = 0; if (audioType_ == PSP_CODEC_AT3PLUS) { - result = atrac3p_decode_frame(ctx_, frame_, &got_frame, inbuf, inbytes); + result = atrac3p_decode_frame(ctx_, buffers_, &nb_samples, &got_frame, inbuf, inbytes); } else { - result = atrac3_decode_frame(ctx_, frame_, &got_frame, inbuf, inbytes); + result = atrac3_decode_frame(ctx_, buffers_, &nb_samples, &got_frame, inbuf, inbytes); } if (result < 0) { *outbytes = 0; return false; } srcPos_ = result; - outSamples_ = frame_->nb_samples; - if (frame_->nb_samples > 0) { - *outbytes = frame_->nb_samples * 2 * 2; + outSamples_ = nb_samples; + if (nb_samples > 0) { + *outbytes = nb_samples * 2 * 2; // Convert frame to outbuf. for (int channel = 0; channel < 2; channel++) { - float **pointers = (float **)frame_->data; int16_t *output = (int16_t *)outbuf; - for (int i = 0; i < frame_->nb_samples; i++) { - output[i * 2] = clamp16(pointers[0][i]); - output[i * 2 + 1] = clamp16(pointers[1][i]); + for (int i = 0; i < nb_samples; i++) { + output[i * 2] = clamp16(buffers_[0][i]); + output[i * 2 + 1] = clamp16(buffers_[1][i]); } } } else { @@ -116,10 +120,10 @@ public: private: AVCodecContext* ctx_ = nullptr; - AVFrame *frame_ = nullptr; int outSamples_ = 0; int srcPos_ = 0; + float *buffers_[2]{}; bool codecOpen_ = false; diff --git a/ext/at3_standalone/at3_decoders.h b/ext/at3_standalone/at3_decoders.h index ae48c4c331..4dc6d98329 100644 --- a/ext/at3_standalone/at3_decoders.h +++ b/ext/at3_standalone/at3_decoders.h @@ -9,8 +9,8 @@ extern "C" { #include "avcodec.h" - int atrac3_decode_frame(AVCodecContext *avctx, AVFrame *frame, int *got_frame_ptr, const uint8_t *buf, int buf_size); - int atrac3p_decode_frame(AVCodecContext *avctx, AVFrame *frame, int *got_frame_ptr, const uint8_t *buf, int buf_size); + int atrac3_decode_frame(AVCodecContext *avctx, float *out_data[2], int *nb_samples, int *got_frame_ptr, const uint8_t *buf, int buf_size); + int atrac3p_decode_frame(AVCodecContext *avctx, float *out_data[2], int *nb_samples, int *got_frame_ptr, const uint8_t *buf, int buf_size); extern AVCodec ff_atrac3p_decoder; extern AVCodec ff_atrac3_decoder; } diff --git a/ext/at3_standalone/atrac3.c b/ext/at3_standalone/atrac3.c index 8eaefed212..e40e2f47cc 100644 --- a/ext/at3_standalone/atrac3.c +++ b/ext/at3_standalone/atrac3.c @@ -730,7 +730,7 @@ static int decode_frame(AVCodecContext *avctx, const uint8_t *databuf, return 0; } -int atrac3_decode_frame(AVCodecContext *avctx, AVFrame *frame, int *got_frame_ptr, const uint8_t *buf, int buf_size) +int atrac3_decode_frame(AVCodecContext *avctx, float *out_data[2], int *nb_samples, int *got_frame_ptr, const uint8_t *buf, int buf_size) { ATRAC3Context *q = avctx->priv_data; int ret; @@ -743,9 +743,7 @@ int atrac3_decode_frame(AVCodecContext *avctx, AVFrame *frame, int *got_frame_pt } /* get output buffer */ - frame->nb_samples = SAMPLES_PER_FRAME; - if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) - return ret; + *nb_samples = SAMPLES_PER_FRAME; /* Check if we need to descramble and what buffer to pass on. */ if (q->scrambled_stream) { @@ -755,7 +753,7 @@ int atrac3_decode_frame(AVCodecContext *avctx, AVFrame *frame, int *got_frame_pt databuf = buf; } - ret = decode_frame(avctx, databuf, (float **)frame->extended_data); + ret = decode_frame(avctx, databuf, out_data); if (ret) { av_log(NULL, AV_LOG_ERROR, "Frame decoding error!\n"); return ret; @@ -886,8 +884,6 @@ static av_cold int atrac3_decode_init(AVCodecContext *avctx) if (!q->decoded_bytes_buffer) return AVERROR(ENOMEM); - avctx->sample_fmt = AV_SAMPLE_FMT_FLTP; - /* initialize the MDCT transform */ if ((ret = ff_mdct_init(&q->mdct_ctx, 9, 1, 1.0 / 32768)) < 0) { av_log(avctx, AV_LOG_ERROR, "Error initializing MDCT\n"); diff --git a/ext/at3_standalone/atrac3plusdec.c b/ext/at3_standalone/atrac3plusdec.c index 1673bd3eed..f6ec7b9ece 100644 --- a/ext/at3_standalone/atrac3plusdec.c +++ b/ext/at3_standalone/atrac3plusdec.c @@ -193,8 +193,6 @@ int atrac3p_decode_init(AVCodecContext *avctx) ctx->ch_units[i].waves_info_prev = &ctx->ch_units[i].wave_synth_hist[1]; } - avctx->sample_fmt = AV_SAMPLE_FMT_FLTP; - return 0; } @@ -327,16 +325,13 @@ static void reconstruct_frame(ATRAC3PContext *ctx, Atrac3pChanUnitCtx *ch_unit, FFSWAP(Atrac3pWaveSynthParams *, ch_unit->waves_info, ch_unit->waves_info_prev); } -int atrac3p_decode_frame(AVCodecContext *avctx, AVFrame *frame, int *got_frame_ptr, const uint8_t *avpkt_data, int avpkt_size) +int atrac3p_decode_frame(AVCodecContext *avctx, float *out_data[2], int *nb_samples, int *got_frame_ptr, const uint8_t *avpkt_data, int avpkt_size) { ATRAC3PContext *ctx = avctx->priv_data; int i, ret, ch_unit_id, ch_block = 0, out_ch_index = 0, channels_to_process; - float **samples_p = (float **)frame->extended_data; - - frame->nb_samples = ATRAC3P_FRAME_SAMPLES; - if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) - return ret; + float **samples_p = out_data; + *nb_samples = ATRAC3P_FRAME_SAMPLES; if ((ret = init_get_bits8(&ctx->gb, avpkt_data, avpkt_size)) < 0) return ret; @@ -388,7 +383,6 @@ int atrac3p_decode_frame(AVCodecContext *avctx, AVFrame *frame, int *got_frame_p AVCodec ff_atrac3p_decoder = { .name = "atrac3plus", .id = AV_CODEC_ID_ATRAC3P, - .capabilities = AV_CODEC_CAP_DR1, .priv_data_size = sizeof(ATRAC3PContext), .init = atrac3p_decode_init, .close = atrac3p_decode_close, diff --git a/ext/at3_standalone/av_buffer.c b/ext/at3_standalone/av_buffer.c deleted file mode 100644 index 54857d4398..0000000000 --- a/ext/at3_standalone/av_buffer.c +++ /dev/null @@ -1,289 +0,0 @@ -/* - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#undef free - -#include -#include - -#include "buffer_internal.h" -#include "common.h" -#include "mem.h" - -AVBufferRef *av_buffer_create(uint8_t *data, int size, - void (*free)(void *opaque, uint8_t *data), - void *opaque, int flags) -{ - AVBufferRef *ref = NULL; - AVBuffer *buf = NULL; - - buf = av_mallocz(sizeof(*buf)); - if (!buf) - return NULL; - - buf->data = data; - buf->size = size; - buf->free = free ? free : av_buffer_default_free; - buf->opaque = opaque; - buf->refcount = 1; - - if (flags & AV_BUFFER_FLAG_READONLY) - buf->flags |= BUFFER_FLAG_READONLY; - - ref = av_mallocz(sizeof(*ref)); - if (!ref) { - av_freep(&buf); - return NULL; - } - - ref->buffer = buf; - ref->data = data; - ref->size = size; - - return ref; -} - -void av_buffer_default_free(void *opaque, uint8_t *data) -{ - av_free(data); -} - -AVBufferRef *av_buffer_alloc(int size) -{ - AVBufferRef *ret = NULL; - uint8_t *data = NULL; - - data = av_malloc(size); - if (!data) - return NULL; - - ret = av_buffer_create(data, size, av_buffer_default_free, NULL, 0); - if (!ret) - av_freep(&data); - - return ret; -} - -AVBufferRef *av_buffer_ref(AVBufferRef *buf) -{ - AVBufferRef *ret = av_mallocz(sizeof(*ret)); - - if (!ret) - return NULL; - - *ret = *buf; - - buf->buffer->refcount++; - - return ret; -} - -static void buffer_replace(AVBufferRef **dst, AVBufferRef **src) -{ - AVBuffer *b; - - b = (*dst)->buffer; - - if (src) { - **dst = **src; - av_freep(src); - } else - av_freep(dst); - - b->refcount--; - b->free(b->opaque, b->data); - av_freep(&b); -} - -void av_buffer_unref(AVBufferRef **buf) -{ - if (!buf || !*buf) - return; - - buffer_replace(buf, NULL); -} - -int av_buffer_is_writable(const AVBufferRef *buf) -{ - if (buf->buffer->flags & AV_BUFFER_FLAG_READONLY) - return 0; - - return buf->buffer->refcount == 1; -} - -int av_buffer_get_ref_count(const AVBufferRef *buf) -{ - return buf->buffer->refcount; -} - -int av_buffer_realloc(AVBufferRef **pbuf, int size) -{ - AVBufferRef *buf = *pbuf; - uint8_t *tmp; - - if (!buf) { - /* allocate a new buffer with av_realloc(), so it will be reallocatable - * later */ - uint8_t *data = av_realloc(NULL, size); - if (!data) - return AVERROR(ENOMEM); - - buf = av_buffer_create(data, size, av_buffer_default_free, NULL, 0); - if (!buf) { - av_freep(&data); - return AVERROR(ENOMEM); - } - - buf->buffer->flags |= BUFFER_FLAG_REALLOCATABLE; - *pbuf = buf; - - return 0; - } else if (buf->size == size) - return 0; - - if (!(buf->buffer->flags & BUFFER_FLAG_REALLOCATABLE) || - !av_buffer_is_writable(buf)) { - /* cannot realloc, allocate a new reallocable buffer and copy data */ - AVBufferRef *newb = NULL; - - av_buffer_realloc(&newb, size); - if (!newb) - return AVERROR(ENOMEM); - - memcpy(newb->data, buf->data, FFMIN(size, buf->size)); - - buffer_replace(pbuf, &newb); - return 0; - } - - tmp = av_realloc(buf->buffer->data, size); - if (!tmp) - return AVERROR(ENOMEM); - - buf->buffer->data = buf->data = tmp; - buf->buffer->size = buf->size = size; - return 0; -} - -AVBufferPool *av_buffer_pool_init(int size, AVBufferRef* (*alloc)(int size)) -{ - AVBufferPool *pool = av_mallocz(sizeof(*pool)); - if (!pool) - return NULL; - - pool->size = size; - pool->alloc = alloc ? alloc : av_buffer_alloc; - - pool->refcount = 1; - - return pool; -} - -/* - * This function gets called when the pool has been uninited and - * all the buffers returned to it. - */ -static void buffer_pool_free(AVBufferPool *pool) -{ - while (pool->pool) { - BufferPoolEntry *buf = pool->pool; - pool->pool = buf->next; - - buf->free(buf->opaque, buf->data); - av_freep(&buf); - } - av_freep(&pool); -} - -void av_buffer_pool_uninit(AVBufferPool **ppool) -{ - AVBufferPool *pool; - - if (!ppool || !*ppool) - return; - pool = *ppool; - *ppool = NULL; - - pool->refcount--; - if (!pool->refcount) - buffer_pool_free(pool); -} - -static void pool_release_buffer(void *opaque, uint8_t *data) -{ - BufferPoolEntry *buf = opaque; - AVBufferPool *pool = buf->pool; - - buf->next = pool->pool; - pool->pool = buf; - - pool->refcount--; - if (!pool->refcount) - buffer_pool_free(pool); -} - -/* allocate a new buffer and override its free() callback so that - * it is returned to the pool on free */ -static AVBufferRef *pool_alloc_buffer(AVBufferPool *pool) -{ - BufferPoolEntry *buf; - AVBufferRef *ret; - - ret = pool->alloc(pool->size); - if (!ret) - return NULL; - - buf = av_mallocz(sizeof(*buf)); - if (!buf) { - av_buffer_unref(&ret); - return NULL; - } - - buf->data = ret->buffer->data; - buf->opaque = ret->buffer->opaque; - buf->free = ret->buffer->free; - buf->pool = pool; - - ret->buffer->opaque = buf; - ret->buffer->free = pool_release_buffer; - - return ret; -} - -AVBufferRef *av_buffer_pool_get(AVBufferPool *pool) -{ - AVBufferRef *ret; - BufferPoolEntry *buf; - - buf = pool->pool; - if (buf) { - ret = av_buffer_create(buf->data, pool->size, pool_release_buffer, - buf, 0); - if (ret) { - pool->pool = buf->next; - buf->next = NULL; - } - } else { - ret = pool_alloc_buffer(pool); - } - - if (ret) - pool->refcount++; - - return ret; -} diff --git a/ext/at3_standalone/avcodec.h b/ext/at3_standalone/avcodec.h index ff63f759f7..e35b5e3df0 100644 --- a/ext/at3_standalone/avcodec.h +++ b/ext/at3_standalone/avcodec.h @@ -29,10 +29,8 @@ #include #include "attributes.h" -#include "buffer.h" #include "channel_layout.h" #include "log.h" -#include "frame.h" #include "rational.h" #include "version.h" @@ -137,16 +135,6 @@ typedef struct AVCodecDescriptor { */ #define AV_INPUT_BUFFER_MIN_SIZE 16384 -/** - * @ingroup lavc_encoding - */ -typedef struct RcOverride{ - int start_frame; - int end_frame; - int qscale; // If this is 0 then quality_factor will be used instead. - float quality_factor; -} RcOverride; - #if FF_API_MAX_BFRAMES /** * @deprecated there is no libavcodec-wide limit on the number of B-frames @@ -329,37 +317,6 @@ typedef struct RcOverride{ */ #define AV_GET_BUFFER_FLAG_REF (1 << 0) -/** - * This structure stores compressed data. It is typically exported by demuxers - * and then passed as input to decoders, or received as output from encoders and - * then passed to muxers. - * - * For video, it should typically contain one compressed frame. For audio it may - * contain several compressed frames. Encoders are allowed to output empty - * packets, with no compressed data, containing only side data - * (e.g. to update some stream parameters at the end of encoding). - * - * AVPacket is one of the few structs in FFmpeg, whose size is a part of public - * ABI. Thus it may be allocated on stack and no new fields can be added to it - * without libavcodec and libavformat major bump. - * - * The semantics of data ownership depends on the buf field. - * If it is set, the packet data is dynamically allocated and is - * valid indefinitely until a call to av_packet_unref() reduces the - * reference count to 0. - * - * If the buf field is not set av_packet_ref() would make a copy instead - * of increasing the reference count. - * - * The side data is always allocated with av_malloc(), copied by - * av_packet_ref() and freed by av_packet_unref(). - * - * @see av_packet_ref - * @see av_packet_unref - */ - -struct AVBufferRef; - /** * @} */ @@ -418,21 +375,6 @@ typedef struct AVCodecContext { void *priv_data; - /** - * Private context used for internal data. - * - * Unlike priv_data, this is not codec-specific. It is used in general - * libavcodec functions. - */ - struct AVCodecInternal *internal; - - /** - * - encoding: Set by user. - * - decoding: unused - */ - int compression_level; -#define FF_COMPRESSION_DEFAULT -1 - /** * AV_CODEC_FLAG_*. * - encoding: Set by user. @@ -440,13 +382,6 @@ typedef struct AVCodecContext { */ int flags; - /** - * AV_CODEC_FLAG2_* - * - encoding: Set by user. - * - decoding: Set by user. - */ - int flags2; - /** * some codecs need / can use extradata like Huffman tables. * mjpeg: Huffman tables @@ -489,13 +424,6 @@ typedef struct AVCodecContext { int sample_rate; ///< samples per second int channels; ///< number of audio channels - /** - * audio sample format - * - encoding: Set by user. - * - decoding: Set by libavcodec. - */ - enum AVSampleFormat sample_fmt; ///< sample format - /* The following data should not be initialized. */ /** * Number of samples per channel in an audio frame. @@ -539,125 +467,6 @@ typedef struct AVCodecContext { */ uint64_t channel_layout; - /** - * This callback is called at the beginning of each frame to get data - * buffer(s) for it. There may be one contiguous buffer for all the data or - * there may be a buffer per each data plane or anything in between. What - * this means is, you may set however many entries in buf[] you feel necessary. - * Each buffer must be reference-counted using the AVBuffer API (see description - * of buf[] below). - * - * The following fields will be set in the frame before this callback is - * called: - * - format - * - width, height (video only) - * - sample_rate, channel_layout, nb_samples (audio only) - * Their values may differ from the corresponding values in - * AVCodecContext. This callback must use the frame values, not the codec - * context values, to calculate the required buffer size. - * - * This callback must fill the following fields in the frame: - * - data[] - * - linesize[] - * - extended_data: - * * if the data is planar audio with more than 8 channels, then this - * callback must allocate and fill extended_data to contain all pointers - * to all data planes. data[] must hold as many pointers as it can. - * extended_data must be allocated with av_malloc() and will be freed in - * av_frame_unref(). - * * otherwise exended_data must point to data - * - buf[] must contain one or more pointers to AVBufferRef structures. Each of - * the frame's data and extended_data pointers must be contained in these. That - * is, one AVBufferRef for each allocated chunk of memory, not necessarily one - * AVBufferRef per data[] entry. See: av_buffer_create(), av_buffer_alloc(), - * and av_buffer_ref(). - * - extended_buf and nb_extended_buf must be allocated with av_malloc() by - * this callback and filled with the extra buffers if there are more - * buffers than buf[] can hold. extended_buf will be freed in - * av_frame_unref(). - * - * If AV_CODEC_CAP_DR1 is not set then get_buffer2() must call - * avcodec_default_get_buffer2() instead of providing buffers allocated by - * some other means. - * - * Each data plane must be aligned to the maximum required by the target - * CPU. - * - * @see avcodec_default_get_buffer2() - * - * Video: - * - * If AV_GET_BUFFER_FLAG_REF is set in flags then the frame may be reused - * (read and/or written to if it is writable) later by libavcodec. - * - * avcodec_align_dimensions2() should be used to find the required width and - * height, as they normally need to be rounded up to the next multiple of 16. - * - * Some decoders do not support linesizes changing between frames. - * - * If frame multithreading is used and thread_safe_callbacks is set, - * this callback may be called from a different thread, but not from more - * than one at once. Does not need to be reentrant. - * - * @see avcodec_align_dimensions2() - * - * Audio: - * - * Decoders request a buffer of a particular size by setting - * AVFrame.nb_samples prior to calling get_buffer2(). The decoder may, - * however, utilize only part of the buffer by setting AVFrame.nb_samples - * to a smaller value in the output frame. - * - * As a convenience, av_samples_get_buffer_size() and - * av_samples_fill_arrays() in libavutil may be used by custom get_buffer2() - * functions to find the required data size and to fill data pointers and - * linesize. In AVFrame.linesize, only linesize[0] may be set for audio - * since all planes must be the same size. - * - * @see av_samples_get_buffer_size(), av_samples_fill_arrays() - * - * - encoding: unused - * - decoding: Set by libavcodec, user can override. - */ - int (*get_buffer2)(struct AVCodecContext *s, AVFrame *frame, int flags); - - /** - * If non-zero, the decoded audio and video frames returned from - * avcodec_decode_video2() and avcodec_decode_audio4() are reference-counted - * and are valid indefinitely. The caller must free them with - * av_frame_unref() when they are not needed anymore. - * Otherwise, the decoded frames must not be freed by the caller and are - * only valid until the next decode call. - * - * - encoding: unused - * - decoding: set by the caller before avcodec_open2(). - */ - int refcounted_frames; - - -/** - * Verify checksums embedded in the bitstream (could be of either encoded or - * decoded data, depending on the codec) and print an error message on mismatch. - * If AV_EF_EXPLODE is also set, a mismatching checksum will result in the - * decoder returning an error. - */ -#define AV_EF_CRCCHECK (1<<0) -#define AV_EF_BITSTREAM (1<<1) ///< detect bitstream specification deviations -#define AV_EF_BUFFER (1<<2) ///< detect improper bitstream length -#define AV_EF_EXPLODE (1<<3) ///< abort decoding on minor error detection - -#define AV_EF_IGNORE_ERR (1<<15) ///< ignore errors and continue -#define AV_EF_CAREFUL (1<<16) ///< consider things that violate the spec, are fast to calculate and have not been seen in the wild as errors -#define AV_EF_COMPLIANT (1<<17) ///< consider all spec non compliances as errors -#define AV_EF_AGGRESSIVE (1<<18) ///< consider things that a sane encoder should not do as an error - - /** - * error - * - encoding: Set by libavcodec if flags & AV_CODEC_FLAG_PSNR. - * - decoding: unused - */ - uint64_t error[AV_NUM_DATA_POINTERS]; - /** * IDCT algorithm, see FF_IDCT_* below. * - encoding: Set by user. @@ -724,12 +533,6 @@ typedef struct AVCodec { */ const char *name; enum AVCodecID id; - /** - * Codec capabilities. - * see AV_CODEC_CAP_* - */ - int capabilities; - const uint64_t *channel_layouts; ///< array of support channel layouts, or NULL if unknown. array is terminated by 0 const AVClass *priv_class; ///< AVClass for the private context /***************************************************************** @@ -871,13 +674,6 @@ int avcodec_close(AVCodecContext *avctx); * @{ */ -/** - * The default callback for AVCodecContext.get_buffer2(). It is made public so - * it can be called by custom get_buffer2() implementations for decoders without - * AV_CODEC_CAP_DR1 set. - */ -int avcodec_default_get_buffer2(AVCodecContext *s, AVFrame *frame, int flags); - typedef struct AVCodecParserContext { void *priv_data; struct AVCodecParser *parser; diff --git a/ext/at3_standalone/buffer.h b/ext/at3_standalone/buffer.h deleted file mode 100644 index d716c3d729..0000000000 --- a/ext/at3_standalone/buffer.h +++ /dev/null @@ -1,252 +0,0 @@ -/* - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/** - * @file - * @ingroup lavu_buffer - * refcounted data buffer API - */ - -#ifndef AVUTIL_BUFFER_H -#define AVUTIL_BUFFER_H - -#include - -/** - * @defgroup lavu_buffer AVBuffer - * @ingroup lavu_data - * - * @{ - * AVBuffer is an API for reference-counted data buffers. - * - * There are two core objects in this API -- AVBuffer and AVBufferRef. AVBuffer - * represents the data buffer itself; it is opaque and not meant to be accessed - * by the caller directly, but only through AVBufferRef. However, the caller may - * e.g. compare two AVBuffer pointers to check whether two different references - * are describing the same data buffer. AVBufferRef represents a single - * reference to an AVBuffer and it is the object that may be manipulated by the - * caller directly. - * - * There are two functions provided for creating a new AVBuffer with a single - * reference -- av_buffer_alloc() to just allocate a new buffer, and - * av_buffer_create() to wrap an existing array in an AVBuffer. From an existing - * reference, additional references may be created with av_buffer_ref(). - * Use av_buffer_unref() to free a reference (this will automatically free the - * data once all the references are freed). - * - * The convention throughout this API and the rest of FFmpeg is such that the - * buffer is considered writable if there exists only one reference to it (and - * it has not been marked as read-only). The av_buffer_is_writable() function is - * provided to check whether this is true and av_buffer_make_writable() will - * automatically create a new writable buffer when necessary. - * Of course nothing prevents the calling code from violating this convention, - * however that is safe only when all the existing references are under its - * control. - * - * @note Referencing and unreferencing the buffers is thread-safe and thus - * may be done from multiple threads simultaneously without any need for - * additional locking. - * - * @note Two different references to the same buffer can point to different - * parts of the buffer (i.e. their AVBufferRef.data will not be equal). - */ - -/** - * A reference counted buffer type. It is opaque and is meant to be used through - * references (AVBufferRef). - */ -typedef struct AVBuffer AVBuffer; - -/** - * A reference to a data buffer. - * - * The size of this struct is not a part of the public ABI and it is not meant - * to be allocated directly. - */ -typedef struct AVBufferRef { - AVBuffer *buffer; - - /** - * The data buffer. It is considered writable if and only if - * this is the only reference to the buffer, in which case - * av_buffer_is_writable() returns 1. - */ - uint8_t *data; - /** - * Size of data in bytes. - */ - int size; -} AVBufferRef; - -/** - * Allocate an AVBuffer of the given size using av_malloc(). - * - * @return an AVBufferRef of given size or NULL when out of memory - */ -AVBufferRef *av_buffer_alloc(int size); - -/** - * Always treat the buffer as read-only, even when it has only one - * reference. - */ -#define AV_BUFFER_FLAG_READONLY (1 << 0) - -/** - * Create an AVBuffer from an existing array. - * - * If this function is successful, data is owned by the AVBuffer. The caller may - * only access data through the returned AVBufferRef and references derived from - * it. - * If this function fails, data is left untouched. - * @param data data array - * @param size size of data in bytes - * @param free a callback for freeing this buffer's data - * @param opaque parameter to be got for processing or passed to free - * @param flags a combination of AV_BUFFER_FLAG_* - * - * @return an AVBufferRef referring to data on success, NULL on failure. - */ -AVBufferRef *av_buffer_create(uint8_t *data, int size, - void (*free)(void *opaque, uint8_t *data), - void *opaque, int flags); - -/** - * Default free callback, which calls av_free() on the buffer data. - * This function is meant to be passed to av_buffer_create(), not called - * directly. - */ -void av_buffer_default_free(void *opaque, uint8_t *data); - -/** - * Create a new reference to an AVBuffer. - * - * @return a new AVBufferRef referring to the same AVBuffer as buf or NULL on - * failure. - */ -AVBufferRef *av_buffer_ref(AVBufferRef *buf); - -/** - * Free a given reference and automatically free the buffer if there are no more - * references to it. - * - * @param buf the reference to be freed. The pointer is set to NULL on return. - */ -void av_buffer_unref(AVBufferRef **buf); - -/** - * @return 1 if the caller may write to the data referred to by buf (which is - * true if and only if buf is the only reference to the underlying AVBuffer). - * Return 0 otherwise. - * A positive answer is valid until av_buffer_ref() is called on buf. - */ -int av_buffer_is_writable(const AVBufferRef *buf); - -int av_buffer_get_ref_count(const AVBufferRef *buf); - -/** - * Reallocate a given buffer. - * - * @param buf a buffer reference to reallocate. On success, buf will be - * unreferenced and a new reference with the required size will be - * written in its place. On failure buf will be left untouched. *buf - * may be NULL, then a new buffer is allocated. - * @param size required new buffer size. - * @return 0 on success, a negative AVERROR on failure. - * - * @note the buffer is actually reallocated with av_realloc() only if it was - * initially allocated through av_buffer_realloc(NULL) and there is only one - * reference to it (i.e. the one passed to this function). In all other cases - * a new buffer is allocated and the data is copied. - */ -int av_buffer_realloc(AVBufferRef **buf, int size); - -/** - * @} - */ - -/** - * @defgroup lavu_bufferpool AVBufferPool - * @ingroup lavu_data - * - * @{ - * AVBufferPool is an API for a lock-free thread-safe pool of AVBuffers. - * - * Frequently allocating and freeing large buffers may be slow. AVBufferPool is - * meant to solve this in cases when the caller needs a set of buffers of the - * same size (the most obvious use case being buffers for raw video or audio - * frames). - * - * At the beginning, the user must call av_buffer_pool_init() to create the - * buffer pool. Then whenever a buffer is needed, call av_buffer_pool_get() to - * get a reference to a new buffer, similar to av_buffer_alloc(). This new - * reference works in all aspects the same way as the one created by - * av_buffer_alloc(). However, when the last reference to this buffer is - * unreferenced, it is returned to the pool instead of being freed and will be - * reused for subsequent av_buffer_pool_get() calls. - * - * When the caller is done with the pool and no longer needs to allocate any new - * buffers, av_buffer_pool_uninit() must be called to mark the pool as freeable. - * Once all the buffers are released, it will automatically be freed. - * - * Allocating and releasing buffers with this API is thread-safe as long as - * either the default alloc callback is used, or the user-supplied one is - * thread-safe. - */ - -/** - * The buffer pool. This structure is opaque and not meant to be accessed - * directly. It is allocated with av_buffer_pool_init() and freed with - * av_buffer_pool_uninit(). - */ -typedef struct AVBufferPool AVBufferPool; - -/** - * Allocate and initialize a buffer pool. - * - * @param size size of each buffer in this pool - * @param alloc a function that will be used to allocate new buffers when the - * pool is empty. May be NULL, then the default allocator will be used - * (av_buffer_alloc()). - * @return newly created buffer pool on success, NULL on error. - */ -AVBufferPool *av_buffer_pool_init(int size, AVBufferRef* (*alloc)(int size)); - -/** - * Mark the pool as being available for freeing. It will actually be freed only - * once all the allocated buffers associated with the pool are released. Thus it - * is safe to call this function while some of the allocated buffers are still - * in use. - * - * @param pool pointer to the pool to be freed. It will be set to NULL. - * @see av_buffer_pool_can_uninit() - */ -void av_buffer_pool_uninit(AVBufferPool **pool); - -/** - * Allocate a new AVBuffer, reusing an old buffer from the pool when available. - * This function may be called simultaneously from multiple threads. - * - * @return a reference to the new buffer on success, NULL on error. - */ -AVBufferRef *av_buffer_pool_get(AVBufferPool *pool); - -/** - * @} - */ - -#endif /* AVUTIL_BUFFER_H */ diff --git a/ext/at3_standalone/buffer_internal.h b/ext/at3_standalone/buffer_internal.h deleted file mode 100644 index 01a40864d4..0000000000 --- a/ext/at3_standalone/buffer_internal.h +++ /dev/null @@ -1,94 +0,0 @@ -/* - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef AVUTIL_BUFFER_INTERNAL_H -#define AVUTIL_BUFFER_INTERNAL_H - -#include - -#include "buffer.h" - -/** - * The buffer is always treated as read-only. - */ -#define BUFFER_FLAG_READONLY (1 << 0) -/** - * The buffer was av_realloc()ed, so it is reallocatable. - */ -#define BUFFER_FLAG_REALLOCATABLE (1 << 1) - -struct AVBuffer { - uint8_t *data; /**< data described by this buffer */ - int size; /**< size of data in bytes */ - - /** - * number of existing AVBufferRef instances referring to this buffer - */ - volatile int refcount; - - /** - * a callback for freeing the data - */ - void (*free)(void *opaque, uint8_t *data); - - /** - * an opaque pointer, to be used by the freeing callback - */ - void *opaque; - - /** - * A combination of BUFFER_FLAG_* - */ - int flags; -}; - -typedef struct BufferPoolEntry { - uint8_t *data; - - /* - * Backups of the original opaque/free of the AVBuffer corresponding to - * data. They will be used to free the buffer when the pool is freed. - */ - void *opaque; - void (*free)(void *opaque, uint8_t *data); - - AVBufferPool *pool; - struct BufferPoolEntry *next; -} BufferPoolEntry; - -struct AVBufferPool { - BufferPoolEntry *pool; - - /* - * This is used to track when the pool is to be freed. - * The pointer to the pool itself held by the caller is considered to - * be one reference. Each buffer requested by the caller increases refcount - * by one, returning the buffer to the pool decreases it by one. - * refcount reaches zero when the buffer has been uninited AND all the - * buffers have been released, then it's safe to free the pool and all - * the buffers in it. - */ - volatile int refcount; - - volatile int nb_allocated; - - int size; - AVBufferRef* (*alloc)(int size); -}; - -#endif /* AVUTIL_BUFFER_INTERNAL_H */ diff --git a/ext/at3_standalone/frame.c b/ext/at3_standalone/frame.c deleted file mode 100644 index 979af30c8d..0000000000 --- a/ext/at3_standalone/frame.c +++ /dev/null @@ -1,180 +0,0 @@ -/* - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "channel_layout.h" -#include "buffer.h" -#include "common.h" -#include "frame.h" -#include "util_internal.h" -#include "mem.h" -#include "samplefmt.h" - -MAKE_ACCESSORS(AVFrame, frame, int64_t, best_effort_timestamp) -MAKE_ACCESSORS(AVFrame, frame, int64_t, pkt_duration) -MAKE_ACCESSORS(AVFrame, frame, int64_t, pkt_pos) -MAKE_ACCESSORS(AVFrame, frame, int64_t, channel_layout) -MAKE_ACCESSORS(AVFrame, frame, int, channels) -MAKE_ACCESSORS(AVFrame, frame, int, sample_rate) -MAKE_ACCESSORS(AVFrame, frame, int, decode_error_flags) -MAKE_ACCESSORS(AVFrame, frame, int, pkt_size) - -#define CHECK_CHANNELS_CONSISTENCY(frame) \ - av_assert2(!(frame)->channel_layout || \ - (frame)->channels == \ - av_get_channel_layout_nb_channels((frame)->channel_layout)) - -static void get_frame_defaults(AVFrame *frame) -{ - if (frame->extended_data != frame->data) - av_freep(&frame->extended_data); - - memset(frame, 0, sizeof(*frame)); - - av_frame_set_best_effort_timestamp(frame, AV_NOPTS_VALUE); - av_frame_set_pkt_duration (frame, 0); - av_frame_set_pkt_pos (frame, -1); - av_frame_set_pkt_size (frame, -1); - frame->format = -1; /* unknown */ - frame->extended_data = frame->data; -} - -AVFrame *av_frame_alloc(void) -{ - AVFrame *frame = av_mallocz(sizeof(*frame)); - - if (!frame) - return NULL; - - frame->extended_data = NULL; - get_frame_defaults(frame); - - return frame; -} - -void av_frame_free(AVFrame **frame) -{ - if (!frame || !*frame) - return; - - av_frame_unref(*frame); - av_freep(frame); -} - -static int get_audio_buffer(AVFrame *frame, int align) -{ - int channels; - int planar = av_sample_fmt_is_planar(frame->format); - int planes; - int ret, i; - - if (!frame->channels) - frame->channels = av_get_channel_layout_nb_channels(frame->channel_layout); - - channels = frame->channels; - planes = planar ? channels : 1; - - CHECK_CHANNELS_CONSISTENCY(frame); - if (!frame->linesize[0]) { - ret = av_samples_get_buffer_size(&frame->linesize[0], channels, - frame->nb_samples, frame->format, - align); - if (ret < 0) - return ret; - } - - if (planes > AV_NUM_DATA_POINTERS) { - frame->extended_data = av_mallocz_array(planes, - sizeof(*frame->extended_data)); - frame->extended_buf = av_mallocz_array((planes - AV_NUM_DATA_POINTERS), - sizeof(*frame->extended_buf)); - if (!frame->extended_data || !frame->extended_buf) { - av_freep(&frame->extended_data); - av_freep(&frame->extended_buf); - return AVERROR(ENOMEM); - } - frame->nb_extended_buf = planes - AV_NUM_DATA_POINTERS; - } else - frame->extended_data = frame->data; - - for (i = 0; i < FFMIN(planes, AV_NUM_DATA_POINTERS); i++) { - frame->buf[i] = av_buffer_alloc(frame->linesize[0]); - if (!frame->buf[i]) { - av_frame_unref(frame); - return AVERROR(ENOMEM); - } - frame->extended_data[i] = frame->data[i] = frame->buf[i]->data; - } - for (i = 0; i < planes - AV_NUM_DATA_POINTERS; i++) { - frame->extended_buf[i] = av_buffer_alloc(frame->linesize[0]); - if (!frame->extended_buf[i]) { - av_frame_unref(frame); - return AVERROR(ENOMEM); - } - frame->extended_data[i + AV_NUM_DATA_POINTERS] = frame->extended_buf[i]->data; - } - return 0; - -} - -int av_frame_get_buffer(AVFrame *frame, int align) -{ - if (frame->format < 0) - return AVERROR(EINVAL); - - else if (frame->nb_samples > 0 && (frame->channel_layout || frame->channels > 0)) - return get_audio_buffer(frame, align); - - return AVERROR(EINVAL); -} - -static int frame_copy_props(AVFrame *dst, const AVFrame *src, int force_copy) -{ - dst->sample_rate = src->sample_rate; - dst->pkt_pos = src->pkt_pos; - dst->pkt_size = src->pkt_size; - dst->pkt_duration = src->pkt_duration; - dst->quality = src->quality; - dst->best_effort_timestamp = src->best_effort_timestamp; - dst->flags = src->flags; - dst->decode_error_flags = src->decode_error_flags; - -#if FF_API_ERROR_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - memcpy(dst->error, src->error, sizeof(dst->error)); -FF_ENABLE_DEPRECATION_WARNINGS -#endif - - return 0; -} - -void av_frame_unref(AVFrame *frame) -{ - int i; - - if (!frame) - return; - - for (i = 0; i < FF_ARRAY_ELEMS(frame->buf); i++) - av_buffer_unref(&frame->buf[i]); - for (i = 0; i < frame->nb_extended_buf; i++) - av_buffer_unref(&frame->extended_buf[i]); - av_freep(&frame->extended_buf); - - get_frame_defaults(frame); -} diff --git a/ext/at3_standalone/frame.h b/ext/at3_standalone/frame.h deleted file mode 100644 index 62e4086c74..0000000000 --- a/ext/at3_standalone/frame.h +++ /dev/null @@ -1,331 +0,0 @@ -/* - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/** - * @file - * @ingroup lavu_frame - * reference-counted frame API - */ - -#ifndef AVUTIL_FRAME_H -#define AVUTIL_FRAME_H - -#include - -#include "avutil.h" -#include "buffer.h" -#include "rational.h" -#include "samplefmt.h" -#include "version.h" - -/** - * This structure describes decoded (raw) audio or video data. - * - * AVFrame must be allocated using av_frame_alloc(). Note that this only - * allocates the AVFrame itself, the buffers for the data must be managed - * through other means (see below). - * AVFrame must be freed with av_frame_free(). - * - * AVFrame is typically allocated once and then reused multiple times to hold - * different data (e.g. a single AVFrame to hold frames received from a - * decoder). In such a case, av_frame_unref() will free any references held by - * the frame and reset it to its original clean state before it - * is reused again. - * - * The data described by an AVFrame is usually reference counted through the - * AVBuffer API. The underlying buffer references are stored in AVFrame.buf / - * AVFrame.extended_buf. An AVFrame is considered to be reference counted if at - * least one reference is set, i.e. if AVFrame.buf[0] != NULL. In such a case, - * every single data plane must be contained in one of the buffers in - * AVFrame.buf or AVFrame.extended_buf. - * There may be a single buffer for all the data, or one separate buffer for - * each plane, or anything in between. - * - * sizeof(AVFrame) is not a part of the public ABI, so new fields may be added - * to the end with a minor bump. - * Similarly fields that are marked as to be only accessed by - * av_opt_ptr() can be reordered. This allows 2 forks to add fields - * without breaking compatibility with each other. - */ -typedef struct AVFrame { -#define AV_NUM_DATA_POINTERS 8 - /** - * pointer to the picture/channel planes. - * This might be different from the first allocated byte - * - * Some decoders access areas outside 0,0 - width,height, please - * see avcodec_align_dimensions2(). Some filters and swscale can read - * up to 16 bytes beyond the planes, if these filters are to be used, - * then 16 extra bytes must be allocated. - */ - uint8_t *data[AV_NUM_DATA_POINTERS]; - - /** - * For video, size in bytes of each picture line. - * For audio, size in bytes of each plane. - * - * For audio, only linesize[0] may be set. For planar audio, each channel - * plane must be the same size. - * - * For video the linesizes should be multiples of the CPUs alignment - * preference, this is 16 or 32 for modern desktop CPUs. - * Some code requires such alignment other code can be slower without - * correct alignment, for yet other it makes no difference. - * - * @note The linesize may be larger than the size of usable data -- there - * may be extra padding present for performance reasons. - */ - int linesize[AV_NUM_DATA_POINTERS]; - - /** - * pointers to the data planes/channels. - * - * For video, this should simply point to data[]. - * - * For planar audio, each channel has a separate data pointer, and - * linesize[0] contains the size of each channel buffer. - * For packed audio, there is just one data pointer, and linesize[0] - * contains the total size of the buffer for all channels. - * - * Note: Both data and extended_data should always be set in a valid frame, - * but for planar audio with more channels that can fit in data, - * extended_data must be used in order to access all channels. - */ - uint8_t **extended_data; - - /** - * number of audio samples (per channel) described by this frame - */ - int nb_samples; - - /** - * format of the frame, -1 if unknown or unset - * Values correspond to enum AVPixelFormat for video frames, - * enum AVSampleFormat for audio) - */ - int format; - - /** - * quality (between 1 (good) and FF_LAMBDA_MAX (bad)) - */ - int quality; - -#if FF_API_ERROR_FRAME - /** - * @deprecated unused - */ - attribute_deprecated - uint64_t error[AV_NUM_DATA_POINTERS]; -#endif - - /** - * Sample rate of the audio data. - */ - int sample_rate; - - /** - * Channel layout of the audio data. - */ - uint64_t channel_layout; - - /** - * AVBuffer references backing the data for this frame. If all elements of - * this array are NULL, then this frame is not reference counted. This array - * must be filled contiguously -- if buf[i] is non-NULL then buf[j] must - * also be non-NULL for all j < i. - * - * There may be at most one AVBuffer per data plane, so for video this array - * always contains all the references. For planar audio with more than - * AV_NUM_DATA_POINTERS channels, there may be more buffers than can fit in - * this array. Then the extra AVBufferRef pointers are stored in the - * extended_buf array. - */ - AVBufferRef *buf[AV_NUM_DATA_POINTERS]; - - /** - * For planar audio which requires more than AV_NUM_DATA_POINTERS - * AVBufferRef pointers, this array will hold all the references which - * cannot fit into AVFrame.buf. - * - * Note that this is different from AVFrame.extended_data, which always - * contains all the pointers. This array only contains the extra pointers, - * which cannot fit into AVFrame.buf. - * - * This array is always allocated using av_malloc() by whoever constructs - * the frame. It is freed in av_frame_unref(). - */ - AVBufferRef **extended_buf; - /** - * Number of elements in extended_buf. - */ - int nb_extended_buf; - -/** - * @defgroup lavu_frame_flags AV_FRAME_FLAGS - * Flags describing additional frame properties. - * - * @{ - */ - -/** - * The frame data may be corrupted, e.g. due to decoding errors. - */ -#define AV_FRAME_FLAG_CORRUPT (1 << 0) -/** - * @} - */ - - /** - * Frame flags, a combination of @ref lavu_frame_flags - */ - int flags; - - /** - * frame timestamp estimated using various heuristics, in stream time base - * Code outside libavutil should access this field using: - * av_frame_get_best_effort_timestamp(frame) - * - encoding: unused - * - decoding: set by libavcodec, read by user. - */ - int64_t best_effort_timestamp; - - /** - * reordered pos from the last AVPacket that has been input into the decoder - * Code outside libavutil should access this field using: - * av_frame_get_pkt_pos(frame) - * - encoding: unused - * - decoding: Read by user. - */ - int64_t pkt_pos; - - /** - * duration of the corresponding packet, expressed in - * AVStream->time_base units, 0 if unknown. - * Code outside libavutil should access this field using: - * av_frame_get_pkt_duration(frame) - * - encoding: unused - * - decoding: Read by user. - */ - int64_t pkt_duration; - - /** - * decode error flags of the frame, set to a combination of - * FF_DECODE_ERROR_xxx flags if the decoder produced a frame, but there - * were errors during the decoding. - * Code outside libavutil should access this field using: - * av_frame_get_decode_error_flags(frame) - * - encoding: unused - * - decoding: set by libavcodec, read by user. - */ - int decode_error_flags; -#define FF_DECODE_ERROR_INVALID_BITSTREAM 1 -#define FF_DECODE_ERROR_MISSING_REFERENCE 2 - - /** - * number of audio channels, only used for audio. - * Code outside libavutil should access this field using: - * av_frame_get_channels(frame) - * - encoding: unused - * - decoding: Read by user. - */ - int channels; - - /** - * size of the corresponding packet containing the compressed - * frame. It must be accessed using av_frame_get_pkt_size() and - * av_frame_set_pkt_size(). - * It is set to a negative value if unknown. - * - encoding: unused - * - decoding: set by libavcodec, read by user. - */ - int pkt_size; -} AVFrame; - -/** - * Accessors for some AVFrame fields. - * The position of these field in the structure is not part of the ABI, - * they should not be accessed directly outside libavutil. - */ -int64_t av_frame_get_best_effort_timestamp(const AVFrame * frame); -void av_frame_set_best_effort_timestamp(AVFrame * frame, int64_t val); -int64_t av_frame_get_pkt_duration(const AVFrame * frame); -void av_frame_set_pkt_duration(AVFrame * frame, int64_t val); -int64_t av_frame_get_pkt_pos(const AVFrame * frame); -void av_frame_set_pkt_pos(AVFrame * frame, int64_t val); -int64_t av_frame_get_channel_layout(const AVFrame * frame); -void av_frame_set_channel_layout(AVFrame * frame, int64_t val); -int av_frame_get_channels(const AVFrame * frame); -void av_frame_set_channels(AVFrame * frame, int val); -int av_frame_get_sample_rate(const AVFrame * frame); -void av_frame_set_sample_rate(AVFrame * frame, int val); -int av_frame_get_decode_error_flags(const AVFrame * frame); -void av_frame_set_decode_error_flags(AVFrame * frame, int val); -int av_frame_get_pkt_size(const AVFrame * frame); -void av_frame_set_pkt_size(AVFrame * frame, int val); - -/** - * Allocate an AVFrame and set its fields to default values. The resulting - * struct must be freed using av_frame_free(). - * - * @return An AVFrame filled with default values or NULL on failure. - * - * @note this only allocates the AVFrame itself, not the data buffers. Those - * must be allocated through other means, e.g. with av_frame_get_buffer() or - * manually. - */ -AVFrame *av_frame_alloc(void); - -/** - * Free the frame and any dynamically allocated objects in it, - * e.g. extended_data. If the frame is reference counted, it will be - * unreferenced first. - * - * @param frame frame to be freed. The pointer will be set to NULL. - */ -void av_frame_free(AVFrame **frame); - -/** - * Unreference all the buffers referenced by frame and reset the frame fields. - */ -void av_frame_unref(AVFrame *frame); - -/** - * Allocate new buffer(s) for audio or video data. - * - * The following fields must be set on frame before calling this function: - * - format (pixel format for video, sample format for audio) - * - width and height for video - * - nb_samples and channel_layout for audio - * - * This function will fill AVFrame.data and AVFrame.buf arrays and, if - * necessary, allocate and fill AVFrame.extended_data and AVFrame.extended_buf. - * For planar formats, one buffer will be allocated for each plane. - * - * @param frame frame in which to store the new buffers. - * @param align required buffer size alignment - * - * @return 0 on success, a negative AVERROR on error. - */ -int av_frame_get_buffer(AVFrame *frame, int align); - -/** - * @} - */ - -#endif /* AVUTIL_FRAME_H */ diff --git a/ext/at3_standalone/internal.h b/ext/at3_standalone/internal.h index 426bbed41a..028235896f 100644 --- a/ext/at3_standalone/internal.h +++ b/ext/at3_standalone/internal.h @@ -26,129 +26,15 @@ #include -#include "buffer.h" #include "channel_layout.h" #include "mathematics.h" #include "avcodec.h" #include "config.h" -/** - * The codec allows calling the close function for deallocation even if - * the init function returned a failure. Without this capability flag, a - * codec does such cleanup internally when returning failures from the - * init function and does not expect the close function to be called at - * all. - */ -#define FF_CODEC_CAP_INIT_CLEANUP (1 << 1) -/** - * Decoders marked with FF_CODEC_CAP_SETS_PKT_DTS want to set - * AVFrame.pkt_dts manually. If the flag is set, utils.c won't overwrite - * this field. If it's unset, utils.c tries to guess the pkt_dts field - * from the input AVPacket. - */ -#define FF_CODEC_CAP_SETS_PKT_DTS (1 << 2) -/** - * The decoder extracts and fills its parameters even if the frame is - * skipped due to the skip_frame setting. - */ -#define FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM (1 << 3) - -#ifdef TRACE -# define ff_tlog(ctx, ...) av_log(ctx, AV_LOG_TRACE, __VA_ARGS__) -#else -# define ff_tlog(ctx, ...) do { } while(0) -#endif - - -#if !FF_API_QUANT_BIAS -#define FF_DEFAULT_QUANT_BIAS 999999 -#endif - #define FF_SANE_NB_CHANNELS 64U -#define FF_SIGNBIT(x) ((x) >> CHAR_BIT * sizeof(x) - 1) - -#if HAVE_AVX -# define STRIDE_ALIGN 32 -#elif HAVE_SIMD_ALIGN_16 -# define STRIDE_ALIGN 16 -#else -# define STRIDE_ALIGN 8 -#endif - -typedef struct FramePool { - /** - * Pools for each data plane. For audio all the planes have the same size, - * so only pools[0] is used. - */ - AVBufferPool *pools[4]; - - /* - * Pool parameters - */ - int format; - int stride_align[AV_NUM_DATA_POINTERS]; - int linesize[4]; - int planes; - int channels; - int samples; -} FramePool; - -typedef struct AVCodecInternal { - /** - * Whether the parent AVCodecContext is a copy of the context which had - * init() called on it. - * This is used by multithreading - shared tables and picture pointers - * should be freed from the original context only. - */ - int is_copy; - - /** - * Whether to allocate progress for frame threading. - * - * The codec must set it to 1 if it uses ff_thread_await/report_progress(), - * then progress will be allocated in ff_thread_get_buffer(). The frames - * then MUST be freed with ff_thread_release_buffer(). - * - * If the codec does not need to call the progress functions (there are no - * dependencies between the frames), it should leave this at 0. Then it can - * decode straight to the user-provided frames (which the user will then - * free with av_frame_unref()), there is no need to call - * ff_thread_release_buffer(). - */ - int allocate_progress; - - /** - * An audio frame with less than required samples has been submitted and - * padded with silence. Reject all subsequent frames. - */ - int last_audio_frame; - - FramePool *pool; - - void *thread_ctx; - - /** - * temporary buffer used for encoders to store their bitstream - */ - uint8_t *byte_buffer; - unsigned int byte_buffer_size; - - void *frame_thread_encoder; - - /** - * Number of audio samples to skip at the start of the next decoded frame - */ - int skip_samples; -} AVCodecInternal; - extern const uint8_t ff_log2_run[41]; -/** - * does needed setup of pkt_pts/pos and such for (re)get_buffer(); - */ -int ff_init_buffer_info(AVCodecContext *s, AVFrame *frame); - /** * Maximum size in bytes of extradata. * This value was chosen such that every bit of the buffer is @@ -156,11 +42,4 @@ int ff_init_buffer_info(AVCodecContext *s, AVFrame *frame); */ #define FF_MAX_EXTRADATA_SIZE ((1 << 28) - AV_INPUT_BUFFER_PADDING_SIZE) -/** - * Get a buffer for a frame. This is a wrapper around - * AVCodecContext.get_buffer() and should be used instead calling get_buffer() - * directly. - */ -int ff_get_buffer(AVCodecContext *avctx, AVFrame *frame, int flags); - #endif /* AVCODEC_INTERNAL_H */ diff --git a/ext/at3_standalone/options.c b/ext/at3_standalone/options.c index a7e3b0cb6c..67ee1c1816 100644 --- a/ext/at3_standalone/options.c +++ b/ext/at3_standalone/options.c @@ -54,9 +54,6 @@ int avcodec_get_context_defaults3(AVCodecContext *s, const AVCodec *codec) s->codec_id = codec->id; } - s->get_buffer2 = avcodec_default_get_buffer2; - s->sample_fmt = AV_SAMPLE_FMT_NONE; - if(codec && codec->priv_data_size){ if(!s->priv_data){ s->priv_data= av_mallocz(codec->priv_data_size); diff --git a/ext/at3_standalone/utils.c b/ext/at3_standalone/utils.c index 2f3522e542..ab55822d50 100644 --- a/ext/at3_standalone/utils.c +++ b/ext/at3_standalone/utils.c @@ -30,7 +30,6 @@ #include "avcodec.h" #include "attributes.h" #include "channel_layout.h" -#include "frame.h" #include "internal.h" #include "mathematics.h" #include "samplefmt.h" @@ -84,137 +83,6 @@ unsigned avcodec_get_edge_width(void) } #endif -static int update_frame_pool(AVCodecContext *avctx, AVFrame *frame) -{ - FramePool *pool = avctx->internal->pool; - int i, ret; - - int ch = av_frame_get_channels(frame); //av_get_channel_layout_nb_channels(frame->channel_layout); - int planar = av_sample_fmt_is_planar(frame->format); - int planes = planar ? ch : 1; - - if (pool->format == frame->format && pool->planes == planes && - pool->channels == ch && frame->nb_samples == pool->samples) - return 0; - - av_buffer_pool_uninit(&pool->pools[0]); - ret = av_samples_get_buffer_size(&pool->linesize[0], ch, - frame->nb_samples, frame->format, 0); - if (ret < 0) - goto fail; - - pool->pools[0] = av_buffer_pool_init(pool->linesize[0], NULL); - if (!pool->pools[0]) { - ret = AVERROR(ENOMEM); - goto fail; - } - - pool->format = frame->format; - pool->planes = planes; - pool->channels = ch; - pool->samples = frame->nb_samples; - return 0; -fail: - for (i = 0; i < 4; i++) - av_buffer_pool_uninit(&pool->pools[i]); - pool->format = -1; - pool->planes = pool->channels = pool->samples = 0; - return ret; -} - -static int audio_get_buffer(AVCodecContext *avctx, AVFrame *frame) -{ - FramePool *pool = avctx->internal->pool; - int planes = pool->planes; - int i; - - frame->linesize[0] = pool->linesize[0]; - - if (planes > AV_NUM_DATA_POINTERS) { - frame->extended_data = av_mallocz_array(planes, sizeof(*frame->extended_data)); - frame->nb_extended_buf = planes - AV_NUM_DATA_POINTERS; - frame->extended_buf = av_mallocz_array(frame->nb_extended_buf, - sizeof(*frame->extended_buf)); - if (!frame->extended_data || !frame->extended_buf) { - av_freep(&frame->extended_data); - av_freep(&frame->extended_buf); - return AVERROR(ENOMEM); - } - } else { - frame->extended_data = frame->data; - av_assert0(frame->nb_extended_buf == 0); - } - - for (i = 0; i < FFMIN(planes, AV_NUM_DATA_POINTERS); i++) { - frame->buf[i] = av_buffer_pool_get(pool->pools[0]); - if (!frame->buf[i]) - goto fail; - frame->extended_data[i] = frame->data[i] = frame->buf[i]->data; - } - for (i = 0; i < frame->nb_extended_buf; i++) { - frame->extended_buf[i] = av_buffer_pool_get(pool->pools[0]); - if (!frame->extended_buf[i]) - goto fail; - frame->extended_data[i + AV_NUM_DATA_POINTERS] = frame->extended_buf[i]->data; - } - - return 0; -fail: - av_frame_unref(frame); - return AVERROR(ENOMEM); -} - -int avcodec_default_get_buffer2(AVCodecContext *avctx, AVFrame *frame, int flags) -{ - int ret; - - if ((ret = update_frame_pool(avctx, frame)) < 0) - return ret; - - return audio_get_buffer(avctx, frame); -} - -int ff_init_buffer_info(AVCodecContext *avctx, AVFrame *frame) -{ - if (!frame->sample_rate) - frame->sample_rate = avctx->sample_rate; - if (frame->format < 0) - frame->format = avctx->sample_fmt; - if (!frame->channel_layout) { - if (avctx->channel_layout) { - if (av_get_channel_layout_nb_channels(avctx->channel_layout) != - avctx->channels) { - av_log(avctx, AV_LOG_ERROR, "Inconsistent channel " - "configuration.\n"); - return AVERROR(EINVAL); - } - - frame->channel_layout = avctx->channel_layout; - } else { - if (avctx->channels > FF_SANE_NB_CHANNELS) { - av_log(avctx, AV_LOG_ERROR, "Too many channels: %d.\n", - avctx->channels); - return AVERROR(ENOSYS); - } - } - } - av_frame_set_channels(frame, avctx->channels); - return 0; -} - -int ff_get_buffer(AVCodecContext *avctx, AVFrame *frame, int flags) -{ - int override_dimensions = 1; - int ret; - - ret = ff_init_buffer_info(avctx, frame); - if (ret < 0) - return ret; - - ret = avctx->get_buffer2(avctx, frame, flags); - return ret; -} - int attribute_align_arg ff_codec_open2_recursive(AVCodecContext *avctx, const AVCodec *codec, void **options) { int ret = 0; @@ -228,9 +96,6 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code { int ret = 0; - if (avcodec_is_open(avctx)) - return 0; - if ((codec && avctx->codec && codec != avctx->codec)) { av_log(avctx, AV_LOG_ERROR, "This AVCodecContext was allocated for %s, " "but %s passed to avcodec_open2()\n", avctx->codec->name, codec->name); @@ -242,18 +107,6 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code if (avctx->extradata_size < 0 || avctx->extradata_size >= FF_MAX_EXTRADATA_SIZE) return AVERROR(EINVAL); - avctx->internal = av_mallocz(sizeof(AVCodecInternal)); - if (!avctx->internal) { - ret = AVERROR(ENOMEM); - goto end; - } - - avctx->internal->pool = av_mallocz(sizeof(*avctx->internal->pool)); - if (!avctx->internal->pool) { - ret = AVERROR(ENOMEM); - goto free_and_end; - } - if (codec->priv_data_size > 0) { if (!avctx->priv_data) { avctx->priv_data = av_mallocz(codec->priv_data_size); @@ -334,8 +187,7 @@ end: return ret; free_and_end: - if (avctx->codec && - (avctx->codec->caps_internal & FF_CODEC_CAP_INIT_CLEANUP)) + if (avctx->codec) avctx->codec->close(avctx); #if FF_API_CODED_FRAME @@ -345,10 +197,6 @@ FF_ENABLE_DEPRECATION_WARNINGS #endif av_freep(&avctx->priv_data); - if (avctx->internal) { - av_freep(&avctx->internal->pool); - } - av_freep(&avctx->internal); avctx->codec = NULL; goto end; } @@ -360,17 +208,8 @@ av_cold int avcodec_close(AVCodecContext *avctx) if (!avctx) return 0; - if (avcodec_is_open(avctx)) { - FramePool *pool = avctx->internal->pool; - if (avctx->codec && avctx->codec->close) - avctx->codec->close(avctx); - avctx->internal->byte_buffer_size = 0; - av_freep(&avctx->internal->byte_buffer); - for (i = 0; i < FF_ARRAY_ELEMS(pool->pools); i++) - av_buffer_pool_uninit(&pool->pools[i]); - av_freep(&avctx->internal->pool); - av_freep(&avctx->internal); - } + if (avctx->codec && avctx->codec->close) + avctx->codec->close(avctx); av_freep(&avctx->priv_data); avctx->codec = NULL; return 0; @@ -381,8 +220,3 @@ void avcodec_flush_buffers(AVCodecContext *avctx) if (avctx->codec->flush) avctx->codec->flush(avctx); } - -int avcodec_is_open(AVCodecContext *s) -{ - return !!s->internal; -} From 202886f75087281c64d0f09a3ea30feac031e68b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Thu, 11 Apr 2024 01:21:11 +0200 Subject: [PATCH 077/719] Delete attributes.h/compat.h, more --- Common/Common.vcxproj | 13 +- Common/Common.vcxproj.filters | 31 +- ext/at3_standalone/atrac3.c | 2 +- ext/at3_standalone/atrac3plus.c | 3 + ext/at3_standalone/atrac3plusdec.c | 2 +- ext/at3_standalone/atrac3plusdsp.c | 5 +- ext/at3_standalone/attributes.h | 18 - ext/at3_standalone/avcodec.c | 77 +++++ ext/at3_standalone/avcodec.h | 301 +---------------- ext/at3_standalone/avfft.c | 59 ---- ext/at3_standalone/avfft.h | 84 ----- ext/at3_standalone/avutil.h | 13 - ext/at3_standalone/bitstream.c | 17 +- ext/at3_standalone/bswap.h | 108 ------ ext/at3_standalone/bytestream.h | 32 -- ext/at3_standalone/channel_layout.c | 26 -- ext/at3_standalone/common.h | 464 ++------------------------ ext/at3_standalone/compat.h | 25 +- ext/at3_standalone/config.h | 3 - ext/at3_standalone/error.h | 40 --- ext/at3_standalone/fft-internal.h | 51 --- ext/at3_standalone/fft.h | 1 - ext/at3_standalone/fft_template.c | 174 ---------- ext/at3_standalone/float_dsp.c | 3 +- ext/at3_standalone/float_dsp.h | 2 - ext/at3_standalone/get_bits.h | 2 +- ext/at3_standalone/internal.h | 45 --- ext/at3_standalone/intmath.h | 3 +- ext/at3_standalone/intreadwrite.h | 1 - ext/at3_standalone/libm.h | 3 +- ext/at3_standalone/log.h | 8 +- ext/at3_standalone/log2_tab.c | 32 -- ext/at3_standalone/macros.h | 50 --- ext/at3_standalone/mathematics.c | 87 +++++ ext/at3_standalone/mathematics.h | 142 +++++++- ext/at3_standalone/mathops.h | 251 -------------- ext/at3_standalone/mem.c | 100 ------ ext/at3_standalone/mem.h | 9 +- ext/at3_standalone/options.c | 109 ------ ext/at3_standalone/rational.c | 118 ------- ext/at3_standalone/rational.h | 146 -------- ext/at3_standalone/samplefmt.h | 2 +- ext/at3_standalone/sinewin.h | 1 - ext/at3_standalone/sinewin_tablegen.h | 2 +- ext/at3_standalone/util_internal.h | 112 ------- ext/at3_standalone/utils.c | 119 ++----- ext/at3_standalone/version.h | 68 +--- 47 files changed, 415 insertions(+), 2549 deletions(-) delete mode 100644 ext/at3_standalone/attributes.h create mode 100644 ext/at3_standalone/avcodec.c delete mode 100644 ext/at3_standalone/avfft.c delete mode 100644 ext/at3_standalone/bswap.h delete mode 100644 ext/at3_standalone/config.h delete mode 100644 ext/at3_standalone/internal.h delete mode 100644 ext/at3_standalone/log2_tab.c delete mode 100644 ext/at3_standalone/macros.h delete mode 100644 ext/at3_standalone/mathops.h delete mode 100644 ext/at3_standalone/options.c delete mode 100644 ext/at3_standalone/rational.c delete mode 100644 ext/at3_standalone/rational.h diff --git a/Common/Common.vcxproj b/Common/Common.vcxproj index 7f006fb156..1051eab494 100644 --- a/Common/Common.vcxproj +++ b/Common/Common.vcxproj @@ -390,33 +390,28 @@ - - - - - - - + + @@ -623,7 +618,6 @@ - @@ -633,8 +627,7 @@ - - + diff --git a/Common/Common.vcxproj.filters b/Common/Common.vcxproj.filters index ceb388fa78..0afb65955f 100644 --- a/Common/Common.vcxproj.filters +++ b/Common/Common.vcxproj.filters @@ -542,12 +542,6 @@ ext\at3_standalone - - ext\at3_standalone - - - ext\at3_standalone - ext\at3_standalone @@ -569,12 +563,6 @@ ext\at3_standalone - - ext\at3_standalone - - - ext\at3_standalone - ext\at3_standalone @@ -599,9 +587,6 @@ ext\at3_standalone - - ext\at3_standalone - ext\at3_standalone @@ -611,9 +596,6 @@ ext\at3_standalone - - ext\at3_standalone - ext\at3_standalone @@ -623,7 +605,10 @@ ext\at3_standalone - + + ext\at3_standalone + + ext\at3_standalone @@ -1098,9 +1083,6 @@ ext\at3_standalone - - ext\at3_standalone - ext\at3_standalone @@ -1110,7 +1092,7 @@ ext\at3_standalone - + ext\at3_standalone @@ -1131,9 +1113,6 @@ ext\at3_standalone - - ext\at3_standalone - ext\at3_standalone diff --git a/ext/at3_standalone/atrac3.c b/ext/at3_standalone/atrac3.c index e40e2f47cc..0c251aa1b7 100644 --- a/ext/at3_standalone/atrac3.c +++ b/ext/at3_standalone/atrac3.c @@ -40,7 +40,7 @@ #include "float_dsp.h" #include "bytestream.h" #include "fft.h" -#include "internal.h" +#include "common.h" #include "get_bits.h" #include "avcodec.h" diff --git a/ext/at3_standalone/atrac3plus.c b/ext/at3_standalone/atrac3plus.c index 94002cc2d0..e37f200c13 100644 --- a/ext/at3_standalone/atrac3plus.c +++ b/ext/at3_standalone/atrac3plus.c @@ -25,6 +25,9 @@ * Bitstream parser for ATRAC3+ decoder. */ +#include +#include + //#include "avcodec.h" #include "get_bits.h" #include "atrac3plus.h" diff --git a/ext/at3_standalone/atrac3plusdec.c b/ext/at3_standalone/atrac3plusdec.c index f6ec7b9ece..7f942c80fa 100644 --- a/ext/at3_standalone/atrac3plusdec.c +++ b/ext/at3_standalone/atrac3plusdec.c @@ -41,7 +41,7 @@ #include "float_dsp.h" #include "avcodec.h" #include "get_bits.h" -#include "internal.h" +#include "common.h" #include "atrac.h" #include "atrac3plus.h" diff --git a/ext/at3_standalone/atrac3plusdsp.c b/ext/at3_standalone/atrac3plusdsp.c index 19945ba573..9c30a64415 100644 --- a/ext/at3_standalone/atrac3plusdsp.c +++ b/ext/at3_standalone/atrac3plusdsp.c @@ -26,6 +26,7 @@ */ #include +#include #include "float_dsp.h" #include "libm.h" @@ -606,8 +607,8 @@ void ff_atrac3p_ipqf(FFTContext *dct_ctx, Atrac3pIPQFChannelCtx *hist, const float *in, float *out) { int i, s, sb, t, pos_now, pos_next; - LOCAL_ALIGNED(32, float, idct_in, [ATRAC3P_SUBBANDS]); - LOCAL_ALIGNED(32, float, idct_out, [ATRAC3P_SUBBANDS]); + float idct_in [ATRAC3P_SUBBANDS]; + float idct_out[ATRAC3P_SUBBANDS]; memset(out, 0, ATRAC3P_FRAME_SAMPLES * sizeof(*out)); diff --git a/ext/at3_standalone/attributes.h b/ext/at3_standalone/attributes.h deleted file mode 100644 index 97988cff60..0000000000 --- a/ext/at3_standalone/attributes.h +++ /dev/null @@ -1,18 +0,0 @@ -#pragma once - -#define av_cold -#define DECLARE_ALIGNED(bits, type, name) type name -#define LOCAL_ALIGNED(bits, type, name, subscript) type name subscript -#define av_restrict -#define av_always_inline __forceinline -#define av_const -#define av_alias -#define av_unused -#define av_pure -#define av_warn_unused_result -#define av_assert0(cond) -#define av_assert1(cond) -#define av_assert2(cond) -#define attribute_deprecated -#define av_printf_format(a,b) -#define avpriv_report_missing_feature(...) diff --git a/ext/at3_standalone/avcodec.c b/ext/at3_standalone/avcodec.c new file mode 100644 index 0000000000..9f8f353db3 --- /dev/null +++ b/ext/at3_standalone/avcodec.c @@ -0,0 +1,77 @@ +/* + * Copyright (c) 2001 Fabrice Bellard + * Copyright (c) 2002-2004 Michael Niedermayer + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + * Options definition for AVCodecContext. + */ + +#include "avcodec.h" +#include "common.h" +#include "util_internal.h" +#include "mem.h" +#include + +static const AVClass av_codec_context_class = { + .class_name = "AVCodecContext", + .category = AV_CLASS_CATEGORY_DECODER, +}; + +AVCodecContext *avcodec_alloc_context3(const AVCodec *codec) +{ + AVCodecContext *avctx = av_mallocz(sizeof(AVCodecContext)); + if (!avctx) + return NULL; + int flags = 0; + memset(avctx, 0, sizeof(AVCodecContext)); + + avctx->av_class = &av_codec_context_class; + + if (codec) { + avctx->codec = codec; + avctx->codec_id = codec->id; + } + + if (codec && codec->priv_data_size) { + if (!avctx->priv_data) { + avctx->priv_data = av_mallocz(codec->priv_data_size); + if (!avctx->priv_data) { + return NULL; + } + } + if (codec->priv_class) { + *(const AVClass**)avctx->priv_data = codec->priv_class; + } + } + return avctx; +} + +void avcodec_free_context(AVCodecContext **pavctx) +{ + AVCodecContext *avctx = *pavctx; + + if (!avctx) + return; + + avcodec_close(avctx); + av_freep(&avctx->extradata); + av_freep(pavctx); +} diff --git a/ext/at3_standalone/avcodec.h b/ext/at3_standalone/avcodec.h index e35b5e3df0..2d51d134d6 100644 --- a/ext/at3_standalone/avcodec.h +++ b/ext/at3_standalone/avcodec.h @@ -28,10 +28,9 @@ */ #include -#include "attributes.h" +#include "compat.h" #include "channel_layout.h" #include "log.h" -#include "rational.h" #include "version.h" /** @@ -98,26 +97,6 @@ enum AVCodecID { AV_CODEC_ID_ATRAC1, }; -/** - * This struct describes the properties of a single codec described by an - * AVCodecID. - * @see avcodec_descriptor_get() - */ -typedef struct AVCodecDescriptor { - enum AVCodecID id; - enum AVMediaType type; - /** - * Name of the codec described by this descriptor. It is non-empty and - * unique for each codec descriptor. It should contain alphanumeric - * characters and '_' only. - */ - const char *name; - /** - * A more descriptive name for this codec. May be NULL. - */ - const char *long_name; -} AVCodecDescriptor; - /** * @ingroup lavc_decoding * Required number of additionally allocated bytes at the end of the input bitstream for decoding. @@ -205,17 +184,6 @@ typedef struct AVCodecDescriptor { * Use only bitexact stuff (except (I)DCT). */ #define AV_CODEC_FLAG_BITEXACT (1 << 23) -/* Fx : Flag for h263+ extra options */ -/** - * H.263 advanced intra coding / MPEG-4 AC prediction - */ -#define AV_CODEC_FLAG_AC_PRED (1 << 24) -/** - * interlaced motion estimation - */ -#define AV_CODEC_FLAG_INTERLACED_ME (1 << 29) -#define AV_CODEC_FLAG_CLOSED_GOP (1U << 31) - /** * Allow non spec compliant speedup tricks. */ @@ -264,17 +232,6 @@ typedef struct AVCodecDescriptor { /* /Fx */ /* codec capabilities */ -/** - * Decoder can use draw_horiz_band callback. - */ -#define AV_CODEC_CAP_DRAW_HORIZ_BAND (1 << 0) -/** - * Codec uses get_buffer() for allocating buffers and supports custom allocators. - * If not set, it might not use get_buffer() at all or use operations that - * assume the buffer was allocated by avcodec_default_get_buffer. - */ -#define AV_CODEC_CAP_DR1 (1 << 1) -#define AV_CODEC_CAP_TRUNCATED (1 << 3) /** * Encoder or decoder requires flushing with NULL input at the end in order to * give the complete and correct output. @@ -338,8 +295,6 @@ typedef struct AVCodecContext { * - set by avcodec_alloc_context3 */ const AVClass *av_class; - int log_level_offset; - const struct AVCodec *codec; #if FF_API_CODEC_NAME /** @@ -573,13 +528,6 @@ typedef struct AVCodec { int caps_internal; } AVCodec; -/** - * If c is NULL, returns the first registered codec, - * if c is non-NULL, returns the next registered codec after c, - * or NULL if c is the last one. - */ -AVCodec *av_codec_next(const AVCodec *c); - /** * Allocate an AVCodecContext and set its fields to default values. The * resulting struct should be freed with avcodec_free_context(). @@ -602,17 +550,6 @@ AVCodecContext *avcodec_alloc_context3(const AVCodec *codec); */ void avcodec_free_context(AVCodecContext **avctx); -/** - * Set the fields of the given AVCodecContext to default values corresponding - * to the given codec (defaults may be codec-dependent). - * - * Do not call this function if a non-NULL codec has been passed - * to avcodec_alloc_context3() that allocated this AVCodecContext. - * If codec is non-NULL, it is illegal to call avcodec_open2() with a - * different codec on this AVCodecContext. - */ -int avcodec_get_context_defaults3(AVCodecContext *s, const AVCodec *codec); - /** * Initialize the AVCodecContext to use the given AVCodec. Prior to using this * function the context has to be allocated with avcodec_alloc_context3(). @@ -665,195 +602,6 @@ int avcodec_open2(AVCodecContext *avctx, const AVCodec *codec, void *options); */ int avcodec_close(AVCodecContext *avctx); -/** - * @} - */ - -/** - * @addtogroup lavc_decoding - * @{ - */ - -typedef struct AVCodecParserContext { - void *priv_data; - struct AVCodecParser *parser; - int64_t frame_offset; /* offset of the current frame */ - int64_t cur_offset; /* current offset - (incremented by each av_parser_parse()) */ - int64_t next_frame_offset; /* offset of the next frame */ - /** - * This field is used for proper frame duration computation in lavf. - * It signals, how much longer the frame duration of the current frame - * is compared to normal frame duration. - * - * frame_duration = (1 + repeat_pict) * time_base - * - * It is used by codecs like H.264 to display telecined material. - */ - int64_t pts; /* pts of the current frame */ - int64_t dts; /* dts of the current frame */ - - /* private data */ - int64_t last_pts; - int64_t last_dts; - int fetch_timestamp; - -#define AV_PARSER_PTS_NB 4 - int cur_frame_start_index; - int64_t cur_frame_offset[AV_PARSER_PTS_NB]; - int64_t cur_frame_pts[AV_PARSER_PTS_NB]; - int64_t cur_frame_dts[AV_PARSER_PTS_NB]; - - int flags; -#define PARSER_FLAG_COMPLETE_FRAMES 0x0001 -#define PARSER_FLAG_ONCE 0x0002 -/// Set if the parser has a valid file offset -#define PARSER_FLAG_FETCHED_OFFSET 0x0004 -#define PARSER_FLAG_USE_CODEC_TS 0x1000 - - int64_t offset; ///< byte offset from starting packet start - int64_t cur_frame_end[AV_PARSER_PTS_NB]; - - /** - * Set by parser to 1 for key frames and 0 for non-key frames. - * It is initialized to -1, so if the parser doesn't set this flag, - * old-style fallback using AV_PICTURE_TYPE_I picture type as key frames - * will be used. - */ - int key_frame; - -#if FF_API_CONVERGENCE_DURATION - /** - * @deprecated unused - */ - attribute_deprecated - int64_t convergence_duration; -#endif - - // Timestamp generation support: - /** - * Synchronization point for start of timestamp generation. - * - * Set to >0 for sync point, 0 for no sync point and <0 for undefined - * (default). - * - * For example, this corresponds to presence of H.264 buffering period - * SEI message. - */ - int dts_sync_point; - - /** - * Offset of the current timestamp against last timestamp sync point in - * units of AVCodecContext.time_base. - * - * Set to INT_MIN when dts_sync_point unused. Otherwise, it must - * contain a valid timestamp offset. - * - * Note that the timestamp of sync point has usually a nonzero - * dts_ref_dts_delta, which refers to the previous sync point. Offset of - * the next frame after timestamp sync point will be usually 1. - * - * For example, this corresponds to H.264 cpb_removal_delay. - */ - int dts_ref_dts_delta; - - /** - * Presentation delay of current frame in units of AVCodecContext.time_base. - * - * Set to INT_MIN when dts_sync_point unused. Otherwise, it must - * contain valid non-negative timestamp delta (presentation time of a frame - * must not lie in the past). - * - * This delay represents the difference between decoding and presentation - * time of the frame. - * - * For example, this corresponds to H.264 dpb_output_delay. - */ - int pts_dts_delta; - - /** - * Position of the packet in file. - * - * Analogous to cur_frame_pts/dts - */ - int64_t cur_frame_pos[AV_PARSER_PTS_NB]; - - /** - * Byte position of currently parsed frame in stream. - */ - int64_t pos; - - /** - * Previous frame byte position. - */ - int64_t last_pos; - - /** - * Duration of the current frame. - * For audio, this is in units of 1 / AVCodecContext.sample_rate. - * For all other types, this is in units of AVCodecContext.time_base. - */ - int duration; - - enum AVFieldOrder field_order; - - /** - * Indicate whether a picture is coded as a frame, top field or bottom field. - * - * For example, H.264 field_pic_flag equal to 0 corresponds to - * AV_PICTURE_STRUCTURE_FRAME. An H.264 picture with field_pic_flag - * equal to 1 and bottom_field_flag equal to 0 corresponds to - * AV_PICTURE_STRUCTURE_TOP_FIELD. - */ - enum AVPictureStructure picture_structure; - - /** - * Picture number incremented in presentation or output order. - * This field may be reinitialized at the first picture of a new sequence. - * - * For example, this corresponds to H.264 PicOrderCnt. - */ - int output_picture_number; - - /** - * Dimensions of the decoded video intended for presentation. - */ - int width; - int height; - - /** - * Dimensions of the coded video. - */ - int coded_width; - int coded_height; - - /** - * The format of the coded data, corresponds to enum AVPixelFormat for video - * and for enum AVSampleFormat for audio. - * - * Note that a decoder can have considerable freedom in how exactly it - * decodes the data, so the format reported here might be different from the - * one returned by a decoder. - */ - int format; -} AVCodecParserContext; - -/** - * @defgroup lavc_misc Utility functions - * @ingroup libavc - * - * Miscellaneous utility functions related to both encoding and decoding - * (or neither). - * @{ - */ - -/** - * @defgroup lavc_misc_pixfmt Pixel formats - * - * Functions for working with pixel formats. - * @{ - */ - /** * Reset the internal decoder state / flush internal buffers. Should be called * e.g. when seeking or when switching to a different stream. @@ -865,51 +613,4 @@ typedef struct AVCodecParserContext { */ void avcodec_flush_buffers(AVCodecContext *avctx); -/* memory */ - -/** - * Same behaviour av_fast_malloc but the buffer has additional - * AV_INPUT_BUFFER_PADDING_SIZE at the end which will always be 0. - * - * In addition the whole buffer will initially and after resizes - * be 0-initialized so that no uninitialized data will ever appear. - */ -void av_fast_padded_malloc(void *ptr, unsigned int *size, size_t min_size); - -/** - * Lock operation used by lockmgr - */ -enum AVLockOp { - AV_LOCK_CREATE, ///< Create a mutex - AV_LOCK_OBTAIN, ///< Lock the mutex - AV_LOCK_RELEASE, ///< Unlock the mutex - AV_LOCK_DESTROY, ///< Free mutex resources -}; - -/** - * Get the type of the given codec. - */ -enum AVMediaType avcodec_get_type(enum AVCodecID codec_id); - -/** - * Get the name of a codec. - * @return a static string identifying the codec; never NULL - */ -const char *avcodec_get_name(enum AVCodecID id); - -/** - * @return a positive value if s is open (i.e. avcodec_open2() was called on it - * with no corresponding avcodec_close()), 0 otherwise. - */ -int avcodec_is_open(AVCodecContext *s); - -/** - * @return a non-zero number if codec is a decoder, zero otherwise - */ -int av_codec_is_decoder(const AVCodec *codec); - -/** - * @} - */ - #endif /* AVCODEC_AVCODEC_H */ diff --git a/ext/at3_standalone/avfft.c b/ext/at3_standalone/avfft.c deleted file mode 100644 index 5ae0b4fd71..0000000000 --- a/ext/at3_standalone/avfft.c +++ /dev/null @@ -1,59 +0,0 @@ -/* - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "attributes.h" -#include "avfft.h" -#include "fft.h" -#include "mem.h" - -#if CONFIG_MDCT - -FFTContext *av_mdct_init(int nbits, int inverse, double scale) -{ - FFTContext *s = av_malloc(sizeof(*s)); - - if (s && ff_mdct_init(s, nbits, inverse, scale)) - av_freep(&s); - - return s; -} - -void av_imdct_calc(FFTContext *s, FFTSample *output, const FFTSample *input) -{ - s->imdct_calc(s, output, input); -} - -void av_imdct_half(FFTContext *s, FFTSample *output, const FFTSample *input) -{ - s->imdct_half(s, output, input); -} - -void av_mdct_calc(FFTContext *s, FFTSample *output, const FFTSample *input) -{ - s->mdct_calc(s, output, input); -} - -av_cold void av_mdct_end(FFTContext *s) -{ - if (s) { - ff_mdct_end(s); - av_free(s); - } -} - -#endif /* CONFIG_MDCT */ diff --git a/ext/at3_standalone/avfft.h b/ext/at3_standalone/avfft.h index 0c0f9b8d8d..684af4d18b 100644 --- a/ext/at3_standalone/avfft.h +++ b/ext/at3_standalone/avfft.h @@ -19,19 +19,6 @@ #ifndef AVCODEC_AVFFT_H #define AVCODEC_AVFFT_H -/** - * @file - * @ingroup lavc_fft - * FFT functions - */ - -/** - * @defgroup lavc_fft FFT functions - * @ingroup lavc_misc - * - * @{ - */ - typedef float FFTSample; typedef struct FFTComplex { @@ -40,77 +27,6 @@ typedef struct FFTComplex { typedef struct FFTContext FFTContext; -/** - * Set up a complex FFT. - * @param nbits log2 of the length of the input array - * @param inverse if 0 perform the forward transform, if 1 perform the inverse - */ -FFTContext *av_fft_init(int nbits, int inverse); - -/** - * Do the permutation needed BEFORE calling ff_fft_calc(). - */ -void av_fft_permute(FFTContext *s, FFTComplex *z); - -/** - * Do a complex FFT with the parameters defined in av_fft_init(). The - * input data must be permuted before. No 1.0/sqrt(n) normalization is done. - */ -void av_fft_calc(FFTContext *s, FFTComplex *z); - -void av_fft_end(FFTContext *s); - -FFTContext *av_mdct_init(int nbits, int inverse, double scale); -void av_imdct_calc(FFTContext *s, FFTSample *output, const FFTSample *input); -void av_imdct_half(FFTContext *s, FFTSample *output, const FFTSample *input); -void av_mdct_calc(FFTContext *s, FFTSample *output, const FFTSample *input); -void av_mdct_end(FFTContext *s); - -/* Real Discrete Fourier Transform */ - -enum RDFTransformType { - DFT_R2C, - IDFT_C2R, - IDFT_R2C, - DFT_C2R, -}; - -typedef struct RDFTContext RDFTContext; - -/** - * Set up a real FFT. - * @param nbits log2 of the length of the input array - * @param trans the type of transform - */ -RDFTContext *av_rdft_init(int nbits, enum RDFTransformType trans); -void av_rdft_calc(RDFTContext *s, FFTSample *data); -void av_rdft_end(RDFTContext *s); - -/* Discrete Cosine Transform */ - -typedef struct DCTContext DCTContext; - -enum DCTTransformType { - DCT_II = 0, - DCT_III, - DCT_I, - DST_I, -}; - -/** - * Set up DCT. - * - * @param nbits size of the input array: - * (1 << nbits) for DCT-II, DCT-III and DST-I - * (1 << nbits) + 1 for DCT-I - * @param type the type of transform - * - * @note the first element of the input of DST-I is ignored - */ -DCTContext *av_dct_init(int nbits, enum DCTTransformType type); -void av_dct_calc(DCTContext *s, FFTSample *data); -void av_dct_end (DCTContext *s); - /** * @} */ diff --git a/ext/at3_standalone/avutil.h b/ext/at3_standalone/avutil.h index 2d569e8e0d..23f9673c14 100644 --- a/ext/at3_standalone/avutil.h +++ b/ext/at3_standalone/avutil.h @@ -188,9 +188,7 @@ #include "common.h" #include "error.h" -#include "rational.h" #include "version.h" -#include "macros.h" #include "mathematics.h" #include "log.h" @@ -223,17 +221,6 @@ unsigned av_int_list_length_for_size(unsigned elsize, #define av_int_list_length(list, term) \ av_int_list_length_for_size(sizeof(*(list)), list, term) -/** - * Open a file using a UTF-8 filename. - * The API of this function matches POSIX fopen(), errors are returned through - * errno. - */ -FILE *av_fopen_utf8(const char *path, const char *mode); - -/** - * Return the fractional representation of the internal time base. - */ -AVRational av_get_time_base_q(void); /** * @} diff --git a/ext/at3_standalone/bitstream.c b/ext/at3_standalone/bitstream.c index 3040c5a63f..bdb56916ba 100644 --- a/ext/at3_standalone/bitstream.c +++ b/ext/at3_standalone/bitstream.c @@ -28,22 +28,16 @@ * bitstream api. */ +#include +#include + #include "qsort.h" #include "avcodec.h" -#include "internal.h" +#include "common.h" #include "util_internal.h" -#include "mathops.h" +#include "mathematics.h" #include "get_bits.h" -const uint8_t ff_log2_run[41]={ - 0, 0, 0, 0, 1, 1, 1, 1, - 2, 2, 2, 2, 3, 3, 3, 3, - 4, 4, 5, 5, 6, 6, 7, 7, - 8, 9,10,11,12,13,14,15, -16,17,18,19,20,21,22,23, -24, -}; - /* VLC decoding */ #define GET_DATA(v, table, i, wrap, size) \ @@ -62,7 +56,6 @@ const uint8_t ff_log2_run[41]={ } \ } - static int alloc_table(VLC *vlc, int size, int use_static) { int index = vlc->table_size; diff --git a/ext/at3_standalone/bswap.h b/ext/at3_standalone/bswap.h deleted file mode 100644 index 563027452f..0000000000 --- a/ext/at3_standalone/bswap.h +++ /dev/null @@ -1,108 +0,0 @@ -/* - * copyright (c) 2006 Michael Niedermayer - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/** - * @file - * byte swapping routines - */ - -#ifndef AVUTIL_BSWAP_H -#define AVUTIL_BSWAP_H - -#include -#include "compat.h" - -#ifdef HAVE_AV_CONFIG_H - -#include "config.h" - -#if ARCH_AARCH64 -# include "aarch64/bswap.h" -#elif ARCH_ARM -# include "arm/bswap.h" -#elif ARCH_AVR32 -# include "avr32/bswap.h" -#elif ARCH_SH4 -# include "sh4/bswap.h" -#elif ARCH_X86 -# include "x86/bswap.h" -#endif - -#endif /* HAVE_AV_CONFIG_H */ - -#define AV_BSWAP16C(x) (((x) << 8 & 0xff00) | ((x) >> 8 & 0x00ff)) -#define AV_BSWAP32C(x) (AV_BSWAP16C(x) << 16 | AV_BSWAP16C((x) >> 16)) -#define AV_BSWAP64C(x) (AV_BSWAP32C(x) << 32 | AV_BSWAP32C((x) >> 32)) - -#define AV_BSWAPC(s, x) AV_BSWAP##s##C(x) - -#ifndef av_bswap16 -static av_always_inline av_const uint16_t av_bswap16(uint16_t x) -{ - x= (x>>8) | (x<<8); - return x; -} -#endif - -#ifndef av_bswap32 -static av_always_inline av_const uint32_t av_bswap32(uint32_t x) -{ - return AV_BSWAP32C(x); -} -#endif - -#ifndef av_bswap64 -static inline uint64_t av_const av_bswap64(uint64_t x) -{ - return (uint64_t)av_bswap32((uint32_t)x) << 32 | av_bswap32(x >> 32); -} -#endif - -// be2ne ... big-endian to native-endian -// le2ne ... little-endian to native-endian - -#if AV_HAVE_BIGENDIAN -#define av_be2ne16(x) (x) -#define av_be2ne32(x) (x) -#define av_be2ne64(x) (x) -#define av_le2ne16(x) av_bswap16(x) -#define av_le2ne32(x) av_bswap32(x) -#define av_le2ne64(x) av_bswap64(x) -#define AV_BE2NEC(s, x) (x) -#define AV_LE2NEC(s, x) AV_BSWAPC(s, x) -#else -#define av_be2ne16(x) av_bswap16(x) -#define av_be2ne32(x) av_bswap32(x) -#define av_be2ne64(x) av_bswap64(x) -#define av_le2ne16(x) (x) -#define av_le2ne32(x) (x) -#define av_le2ne64(x) (x) -#define AV_BE2NEC(s, x) AV_BSWAPC(s, x) -#define AV_LE2NEC(s, x) (x) -#endif - -#define AV_BE2NE16C(x) AV_BE2NEC(16, x) -#define AV_BE2NE32C(x) AV_BE2NEC(32, x) -#define AV_BE2NE64C(x) AV_BE2NEC(64, x) -#define AV_LE2NE16C(x) AV_LE2NEC(16, x) -#define AV_LE2NE32C(x) AV_LE2NEC(32, x) -#define AV_LE2NE64C(x) AV_LE2NEC(64, x) - -#endif /* AVUTIL_BSWAP_H */ diff --git a/ext/at3_standalone/bytestream.h b/ext/at3_standalone/bytestream.h index c44ba389b4..bf55307c74 100644 --- a/ext/at3_standalone/bytestream.h +++ b/ext/at3_standalone/bytestream.h @@ -68,24 +68,6 @@ DEF(unsigned int, be24, 3, AV_RB24, AV_WB24) DEF(unsigned int, be16, 2, AV_RB16, AV_WB16) DEF(unsigned int, byte, 1, AV_RB8 , AV_WB8) -#if HAVE_BIGENDIAN -# define bytestream2_get_ne16 bytestream2_get_be16 -# define bytestream2_get_ne24 bytestream2_get_be24 -# define bytestream2_get_ne32 bytestream2_get_be32 -# define bytestream2_get_ne64 bytestream2_get_be64 -# define bytestream2_get_ne16u bytestream2_get_be16u -# define bytestream2_get_ne24u bytestream2_get_be24u -# define bytestream2_get_ne32u bytestream2_get_be32u -# define bytestream2_get_ne64u bytestream2_get_be64u -# define bytestream2_put_ne16 bytestream2_put_be16 -# define bytestream2_put_ne24 bytestream2_put_be24 -# define bytestream2_put_ne32 bytestream2_put_be32 -# define bytestream2_put_ne64 bytestream2_put_be64 -# define bytestream2_peek_ne16 bytestream2_peek_be16 -# define bytestream2_peek_ne24 bytestream2_peek_be24 -# define bytestream2_peek_ne32 bytestream2_peek_be32 -# define bytestream2_peek_ne64 bytestream2_peek_be64 -#else # define bytestream2_get_ne16 bytestream2_get_le16 # define bytestream2_get_ne24 bytestream2_get_le24 # define bytestream2_get_ne32 bytestream2_get_le32 @@ -94,23 +76,9 @@ DEF(unsigned int, byte, 1, AV_RB8 , AV_WB8) # define bytestream2_get_ne24u bytestream2_get_le24u # define bytestream2_get_ne32u bytestream2_get_le32u # define bytestream2_get_ne64u bytestream2_get_le64u -# define bytestream2_put_ne16 bytestream2_put_le16 -# define bytestream2_put_ne24 bytestream2_put_le24 -# define bytestream2_put_ne32 bytestream2_put_le32 -# define bytestream2_put_ne64 bytestream2_put_le64 # define bytestream2_peek_ne16 bytestream2_peek_le16 # define bytestream2_peek_ne24 bytestream2_peek_le24 # define bytestream2_peek_ne32 bytestream2_peek_le32 # define bytestream2_peek_ne64 bytestream2_peek_le64 -#endif - -static av_always_inline unsigned int bytestream_get_buffer(const uint8_t **b, - uint8_t *dst, - unsigned int size) -{ - memcpy(dst, *b, size); - (*b) += size; - return size; -} #endif /* AVCODEC_BYTESTREAM_H */ diff --git a/ext/at3_standalone/channel_layout.c b/ext/at3_standalone/channel_layout.c index 329c32a532..9bcd52e377 100644 --- a/ext/at3_standalone/channel_layout.c +++ b/ext/at3_standalone/channel_layout.c @@ -76,32 +76,6 @@ static const struct { } channel_layout_map[] = { { "mono", 1, AV_CH_LAYOUT_MONO }, { "stereo", 2, AV_CH_LAYOUT_STEREO }, - { "2.1", 3, AV_CH_LAYOUT_2POINT1 }, - { "3.0", 3, AV_CH_LAYOUT_SURROUND }, - { "3.0(back)", 3, AV_CH_LAYOUT_2_1 }, - { "4.0", 4, AV_CH_LAYOUT_4POINT0 }, - { "quad", 4, AV_CH_LAYOUT_QUAD }, - { "quad(side)", 4, AV_CH_LAYOUT_2_2 }, - { "3.1", 4, AV_CH_LAYOUT_3POINT1 }, - { "5.0", 5, AV_CH_LAYOUT_5POINT0_BACK }, - { "5.0(side)", 5, AV_CH_LAYOUT_5POINT0 }, - { "4.1", 5, AV_CH_LAYOUT_4POINT1 }, - { "5.1", 6, AV_CH_LAYOUT_5POINT1_BACK }, - { "5.1(side)", 6, AV_CH_LAYOUT_5POINT1 }, - { "6.0", 6, AV_CH_LAYOUT_6POINT0 }, - { "6.0(front)", 6, AV_CH_LAYOUT_6POINT0_FRONT }, - { "hexagonal", 6, AV_CH_LAYOUT_HEXAGONAL }, - { "6.1", 7, AV_CH_LAYOUT_6POINT1 }, - { "6.1(back)", 7, AV_CH_LAYOUT_6POINT1_BACK }, - { "6.1(front)", 7, AV_CH_LAYOUT_6POINT1_FRONT }, - { "7.0", 7, AV_CH_LAYOUT_7POINT0 }, - { "7.0(front)", 7, AV_CH_LAYOUT_7POINT0_FRONT }, - { "7.1", 8, AV_CH_LAYOUT_7POINT1 }, - { "7.1(wide)", 8, AV_CH_LAYOUT_7POINT1_WIDE_BACK }, - { "7.1(wide-side)", 8, AV_CH_LAYOUT_7POINT1_WIDE }, - { "octagonal", 8, AV_CH_LAYOUT_OCTAGONAL }, - { "hexadecagonal", 16, AV_CH_LAYOUT_HEXADECAGONAL }, - { "downmix", 2, AV_CH_LAYOUT_STEREO_DOWNMIX, }, }; static uint64_t get_channel_layout_single(const char *name, int name_len) diff --git a/ext/at3_standalone/common.h b/ext/at3_standalone/common.h index 774fc43748..891659ba0c 100644 --- a/ext/at3_standalone/common.h +++ b/ext/at3_standalone/common.h @@ -30,38 +30,51 @@ #error missing -D__STDC_CONSTANT_MACROS / #define __STDC_CONSTANT_MACROS #endif -#include -#include +#include #include #include -#include -#include -#include -#include #include "compat.h" -#include "macros.h" #include "version.h" - -#if AV_HAVE_BIGENDIAN -# define AV_NE(be, le) (be) -#else -# define AV_NE(be, le) (le) -#endif +#include "mem.h" //rounded division & shift #define RSHIFT(a,b) ((a) > 0 ? ((a) + ((1<<(b))>>1))>>(b) : ((a) + ((1<<(b))>>1)-1)>>(b)) -/* assume b>0 */ -#define ROUNDED_DIV(a,b) (((a)>0 ? (a) + ((b)>>1) : (a) - ((b)>>1))/(b)) -/* Fast a/(1<=0 and b>=0 */ -#define AV_CEIL_RSHIFT(a,b) (!av_builtin_constant_p(b) ? -((-(a)) >> (b)) \ - : ((a) + (1<<(b)) - 1) >> (b)) -/* Backwards compat. */ -#define FF_CEIL_RSHIFT AV_CEIL_RSHIFT #define FFUDIV(a,b) (((a)>0 ?(a):(a)-(b)+1) / (b)) #define FFUMOD(a,b) ((a)-(b)*FFUDIV(a,b)) +#define FF_SANE_NB_CHANNELS 64U + +/** + * @addtogroup preproc_misc Preprocessor String Macros + * + * String manipulation macros + * + * @{ + */ + +#define AV_STRINGIFY(s) AV_TOSTRING(s) +#define AV_TOSTRING(s) #s + +#define AV_GLUE(a, b) a ## b +#define AV_JOIN(a, b) AV_GLUE(a, b) + + /** + * @} + */ + +#define AV_PRAGMA(s) _Pragma(#s) + +#define FFALIGN(x, a) (((x)+(a)-1)&~((a)-1)) + +/** + * Maximum size in bytes of extradata. + * This value was chosen such that every bit of the buffer is + * addressable by a 32-bit signed integer as used by get_bits. + */ +#define FF_MAX_EXTRADATA_SIZE ((1 << 28) - AV_INPUT_BUFFER_PADDING_SIZE) + /** * Absolute value, Note, INT_MIN / INT64_MIN result in undefined behavior as they * are not representable as absolute values of their type. This is the same @@ -69,45 +82,13 @@ * @see FFNABS() */ #define FFABS(a) ((a) >= 0 ? (a) : (-(a))) -#define FFSIGN(a) ((a) > 0 ? 1 : -1) - -/** - * Negative Absolute value. - * this works for all integers of all types. - * As with many macros, this evaluates its argument twice, it thus must not have - * a sideeffect, that is FFNABS(x++) has undefined behavior. - */ -#define FFNABS(a) ((a) <= 0 ? (a) : (-(a))) - -/** - * Comparator. - * For two numerical expressions x and y, gives 1 if x > y, -1 if x < y, and 0 - * if x == y. This is useful for instance in a qsort comparator callback. - * Furthermore, compilers are able to optimize this to branchless code, and - * there is no risk of overflow with signed types. - * As with many macros, this evaluates its argument multiple times, it thus - * must not have a side-effect. - */ -#define FFDIFFSIGN(x,y) (((x)>(y)) - ((x)<(y))) #define FFMAX(a,b) ((a) > (b) ? (a) : (b)) -#define FFMAX3(a,b,c) FFMAX(FFMAX(a,b),c) #define FFMIN(a,b) ((a) > (b) ? (b) : (a)) -#define FFMIN3(a,b,c) FFMIN(FFMIN(a,b),c) #define FFSWAP(type,a,b) do{type SWAP_tmp= b; b= a; a= SWAP_tmp;}while(0) #define FF_ARRAY_ELEMS(a) (sizeof(a) / sizeof((a)[0])) -/* misc math functions */ - -#ifdef HAVE_AV_CONFIG_H -# include "config.h" -# include "intmath.h" -#endif - -/* Pull in unguarded fallback defines at the end of this file. */ -#include "common.h" - #ifndef av_log2 av_const int av_log2(unsigned v); #endif @@ -116,205 +97,23 @@ av_const int av_log2(unsigned v); av_const int av_log2_16bit(unsigned v); #endif -/** - * Clip a signed integer value into the amin-amax range. - * @param a value to clip - * @param amin minimum value of the clip range - * @param amax maximum value of the clip range - * @return clipped value - */ -static av_always_inline av_const int av_clip_c(int a, int amin, int amax) -{ -#if defined(HAVE_AV_CONFIG_H) && defined(ASSERT_LEVEL) && ASSERT_LEVEL >= 2 - if (amin > amax) abort(); -#endif - if (a < amin) return amin; - else if (a > amax) return amax; - else return a; -} - -/** - * Clip a signed 64bit integer value into the amin-amax range. - * @param a value to clip - * @param amin minimum value of the clip range - * @param amax maximum value of the clip range - * @return clipped value - */ -static av_always_inline av_const int64_t av_clip64_c(int64_t a, int64_t amin, int64_t amax) -{ -#if defined(HAVE_AV_CONFIG_H) && defined(ASSERT_LEVEL) && ASSERT_LEVEL >= 2 - if (amin > amax) abort(); -#endif - if (a < amin) return amin; - else if (a > amax) return amax; - else return a; -} - -/** - * Clip a signed integer value into the 0-255 range. - * @param a value to clip - * @return clipped value - */ -static av_always_inline av_const uint8_t av_clip_uint8_c(int a) -{ - if (a&(~0xFF)) return (-a)>>31; - else return a; -} - -/** - * Clip a signed integer value into the -128,127 range. - * @param a value to clip - * @return clipped value - */ -static av_always_inline av_const int8_t av_clip_int8_c(int a) -{ - if ((a+0x80U) & ~0xFF) return (a>>31) ^ 0x7F; - else return a; -} - -/** - * Clip a signed integer value into the 0-65535 range. - * @param a value to clip - * @return clipped value - */ -static av_always_inline av_const uint16_t av_clip_uint16_c(int a) -{ - if (a&(~0xFFFF)) return (-a)>>31; - else return a; -} - -/** - * Clip a signed integer value into the -32768,32767 range. - * @param a value to clip - * @return clipped value - */ -static av_always_inline av_const int16_t av_clip_int16_c(int a) -{ - if ((a+0x8000U) & ~0xFFFF) return (a>>31) ^ 0x7FFF; - else return a; -} - -/** - * Clip a signed 64-bit integer value into the -2147483648,2147483647 range. - * @param a value to clip - * @return clipped value - */ -static av_always_inline av_const int32_t av_clipl_int32_c(int64_t a) -{ - if ((a+0x80000000u) & ~UINT64_C(0xFFFFFFFF)) return (int32_t)((a>>63) ^ 0x7FFFFFFF); - else return (int32_t)a; -} - -/** - * Clip a signed integer into the -(2^p),(2^p-1) range. - * @param a value to clip - * @param p bit position to clip at - * @return clipped value - */ -static av_always_inline av_const int av_clip_intp2_c(int a, int p) -{ - if (((unsigned)a + (1 << p)) & ~((2 << p) - 1)) - return (a >> 31) ^ ((1 << p) - 1); - else - return a; -} - -/** - * Clip a signed integer to an unsigned power of two range. - * @param a value to clip - * @param p bit position to clip at - * @return clipped value - */ -static av_always_inline av_const unsigned av_clip_uintp2_c(int a, int p) -{ - if (a & ~((1<> 31 & ((1<= 2 - if (amin > amax) abort(); -#endif - if (a < amin) return amin; - else if (a > amax) return amax; - else return a; -} - -/** - * Clip a double value into the amin-amax range. - * @param a value to clip - * @param amin minimum value of the clip range - * @param amax maximum value of the clip range - * @return clipped value - */ -static av_always_inline av_const double av_clipd_c(double a, double amin, double amax) -{ -#if defined(HAVE_AV_CONFIG_H) && defined(ASSERT_LEVEL) && ASSERT_LEVEL >= 2 - if (amin > amax) abort(); -#endif - if (a < amin) return amin; - else if (a > amax) return amax; - else return a; -} - -/** Compute ceil(log2(x)). - * @param x value used to compute ceil(log2(x)) - * @return computed ceiling of log2(x) - */ -static av_always_inline av_const int av_ceil_log2_c(int x) -{ - return av_log2((x - 1) << 1); -} - /** * Count number of bits set to one in x * @param x value to count bits of * @return the number of bits set to one in x */ -static av_always_inline av_const int av_popcount_c(uint32_t x) +static av_always_inline av_const int av_popcount(uint32_t x) { x -= (x >> 1) & 0x55555555; x = (x & 0x33333333) + ((x >> 2) & 0x33333333); @@ -328,202 +127,11 @@ static av_always_inline av_const int av_popcount_c(uint32_t x) * @param x value to count bits of * @return the number of bits set to one in x */ -static av_always_inline av_const int av_popcount64_c(uint64_t x) +static av_always_inline av_const int av_popcount64(uint64_t x) { return av_popcount((uint32_t)x) + av_popcount((uint32_t)(x >> 32)); } -static av_always_inline av_const int av_parity_c(uint32_t v) -{ - return av_popcount(v) & 1; -} - #define MKTAG(a,b,c,d) ((a) | ((b) << 8) | ((c) << 16) | ((unsigned)(d) << 24)) -#define MKBETAG(a,b,c,d) ((d) | ((c) << 8) | ((b) << 16) | ((unsigned)(a) << 24)) - -/** - * Convert a UTF-8 character (up to 4 bytes) to its 32-bit UCS-4 encoded form. - * - * @param val Output value, must be an lvalue of type uint32_t. - * @param GET_BYTE Expression reading one byte from the input. - * Evaluated up to 7 times (4 for the currently - * assigned Unicode range). With a memory buffer - * input, this could be *ptr++. - * @param ERROR Expression to be evaluated on invalid input, - * typically a goto statement. - * - * @warning ERROR should not contain a loop control statement which - * could interact with the internal while loop, and should force an - * exit from the macro code (e.g. through a goto or a return) in order - * to prevent undefined results. - */ -#define GET_UTF8(val, GET_BYTE, ERROR)\ - val= (GET_BYTE);\ - {\ - uint32_t top = (val & 128) >> 1;\ - if ((val & 0xc0) == 0x80 || val >= 0xFE)\ - ERROR\ - while (val & top) {\ - int tmp= (GET_BYTE) - 128;\ - if(tmp>>6)\ - ERROR\ - val= (val<<6) + tmp;\ - top <<= 5;\ - }\ - val &= (top << 1) - 1;\ - } - -/** - * Convert a UTF-16 character (2 or 4 bytes) to its 32-bit UCS-4 encoded form. - * - * @param val Output value, must be an lvalue of type uint32_t. - * @param GET_16BIT Expression returning two bytes of UTF-16 data converted - * to native byte order. Evaluated one or two times. - * @param ERROR Expression to be evaluated on invalid input, - * typically a goto statement. - */ -#define GET_UTF16(val, GET_16BIT, ERROR)\ - val = GET_16BIT;\ - {\ - unsigned int hi = val - 0xD800;\ - if (hi < 0x800) {\ - val = GET_16BIT - 0xDC00;\ - if (val > 0x3FFU || hi > 0x3FFU)\ - ERROR\ - val += (hi<<10) + 0x10000;\ - }\ - }\ - -/** - * @def PUT_UTF8(val, tmp, PUT_BYTE) - * Convert a 32-bit Unicode character to its UTF-8 encoded form (up to 4 bytes long). - * @param val is an input-only argument and should be of type uint32_t. It holds - * a UCS-4 encoded Unicode character that is to be converted to UTF-8. If - * val is given as a function it is executed only once. - * @param tmp is a temporary variable and should be of type uint8_t. It - * represents an intermediate value during conversion that is to be - * output by PUT_BYTE. - * @param PUT_BYTE writes the converted UTF-8 bytes to any proper destination. - * It could be a function or a statement, and uses tmp as the input byte. - * For example, PUT_BYTE could be "*output++ = tmp;" PUT_BYTE will be - * executed up to 4 times for values in the valid UTF-8 range and up to - * 7 times in the general case, depending on the length of the converted - * Unicode character. - */ -#define PUT_UTF8(val, tmp, PUT_BYTE)\ - {\ - int bytes, shift;\ - uint32_t in = val;\ - if (in < 0x80) {\ - tmp = in;\ - PUT_BYTE\ - } else {\ - bytes = (av_log2(in) + 4) / 5;\ - shift = (bytes - 1) * 6;\ - tmp = (256 - (256 >> bytes)) | (in >> shift);\ - PUT_BYTE\ - while (shift >= 6) {\ - shift -= 6;\ - tmp = 0x80 | ((in >> shift) & 0x3f);\ - PUT_BYTE\ - }\ - }\ - } - -/** - * @def PUT_UTF16(val, tmp, PUT_16BIT) - * Convert a 32-bit Unicode character to its UTF-16 encoded form (2 or 4 bytes). - * @param val is an input-only argument and should be of type uint32_t. It holds - * a UCS-4 encoded Unicode character that is to be converted to UTF-16. If - * val is given as a function it is executed only once. - * @param tmp is a temporary variable and should be of type uint16_t. It - * represents an intermediate value during conversion that is to be - * output by PUT_16BIT. - * @param PUT_16BIT writes the converted UTF-16 data to any proper destination - * in desired endianness. It could be a function or a statement, and uses tmp - * as the input byte. For example, PUT_BYTE could be "*output++ = tmp;" - * PUT_BYTE will be executed 1 or 2 times depending on input character. - */ -#define PUT_UTF16(val, tmp, PUT_16BIT)\ - {\ - uint32_t in = val;\ - if (in < 0x10000) {\ - tmp = in;\ - PUT_16BIT\ - } else {\ - tmp = 0xD800 | ((in - 0x10000) >> 10);\ - PUT_16BIT\ - tmp = 0xDC00 | ((in - 0x10000) & 0x3FF);\ - PUT_16BIT\ - }\ - }\ - - - -#include "mem.h" - -#ifdef HAVE_AV_CONFIG_H -# include "internal.h" -#endif /* HAVE_AV_CONFIG_H */ #endif /* AVUTIL_COMMON_H */ - -/* - * The following definitions are outside the multiple inclusion guard - * to ensure they are immediately available in intmath.h. - */ - -#ifndef av_ceil_log2 -# define av_ceil_log2 av_ceil_log2_c -#endif -#ifndef av_clip -# define av_clip av_clip_c -#endif -#ifndef av_clip64 -# define av_clip64 av_clip64_c -#endif -#ifndef av_clip_uint8 -# define av_clip_uint8 av_clip_uint8_c -#endif -#ifndef av_clip_int8 -# define av_clip_int8 av_clip_int8_c -#endif -#ifndef av_clip_uint16 -# define av_clip_uint16 av_clip_uint16_c -#endif -#ifndef av_clip_int16 -# define av_clip_int16 av_clip_int16_c -#endif -#ifndef av_clipl_int32 -# define av_clipl_int32 av_clipl_int32_c -#endif -#ifndef av_clip_intp2 -# define av_clip_intp2 av_clip_intp2_c -#endif -#ifndef av_clip_uintp2 -# define av_clip_uintp2 av_clip_uintp2_c -#endif -#ifndef av_mod_uintp2 -# define av_mod_uintp2 av_mod_uintp2_c -#endif -#ifndef av_sat_add32 -# define av_sat_add32 av_sat_add32_c -#endif -#ifndef av_sat_dadd32 -# define av_sat_dadd32 av_sat_dadd32_c -#endif -#ifndef av_clipf -# define av_clipf av_clipf_c -#endif -#ifndef av_clipd -# define av_clipd av_clipd_c -#endif -#ifndef av_popcount -# define av_popcount av_popcount_c -#endif -#ifndef av_popcount64 -# define av_popcount64 av_popcount64_c -#endif -#ifndef av_parity -# define av_parity av_parity_c -#endif diff --git a/ext/at3_standalone/compat.h b/ext/at3_standalone/compat.h index 74933d447e..c2150fab1a 100644 --- a/ext/at3_standalone/compat.h +++ b/ext/at3_standalone/compat.h @@ -2,8 +2,6 @@ // Compat hacks -#include "attributes.h" - #include "error.h" #define CONFIG_MEMORY_POISONING 0 @@ -25,6 +23,24 @@ #define CONFIG_MDCT 1 #define CONFIG_FFT 1 +#define av_cold +#define DECLARE_ALIGNED(bits, type, name) type name +#define LOCAL_ALIGNED(bits, type, name, subscript) type name subscript +#define av_restrict +#define av_always_inline __forceinline +#define av_const +#define av_alias +#define av_unused +#define av_pure +#define av_warn_unused_result +#define av_assert0(cond) +#define av_assert1(cond) +#define av_assert2(cond) +#define attribute_deprecated +#define attribute_align_arg +#define av_printf_format(a,b) +#define avpriv_report_missing_feature(...) + #pragma warning(disable:4305) #pragma warning(disable:4244) @@ -56,3 +72,8 @@ static inline av_const int av_toupper(int c) c ^= 0x20; return c; } + + +#define AV_BSWAP16C(x) (((x) << 8 & 0xff00) | ((x) >> 8 & 0x00ff)) +#define AV_BSWAP32C(x) (AV_BSWAP16C(x) << 16 | AV_BSWAP16C((x) >> 16)) +#define av_be2ne32(x) AV_BSWAP32C((x)) diff --git a/ext/at3_standalone/config.h b/ext/at3_standalone/config.h deleted file mode 100644 index 3a35817363..0000000000 --- a/ext/at3_standalone/config.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#include "compat.h" diff --git a/ext/at3_standalone/error.h b/ext/at3_standalone/error.h index 6f89675021..eedd7a9023 100644 --- a/ext/at3_standalone/error.h +++ b/ext/at3_standalone/error.h @@ -27,13 +27,6 @@ #include #include -/** - * @addtogroup lavu_error - * - * @{ - */ - - /* error handling */ #if EDOM > 0 #define AVERROR(e) (-(e)) ///< Returns a negative error code from a POSIX error code, to return from library functions. @@ -46,40 +39,7 @@ #define FFERRTAG(a, b, c, d) (-(int)MKTAG(a, b, c, d)) -#define AVERROR_BSF_NOT_FOUND FFERRTAG(0xF8,'B','S','F') ///< Bitstream filter not found -#define AVERROR_BUG FFERRTAG( 'B','U','G','!') ///< Internal bug, also see AVERROR_BUG2 -#define AVERROR_BUFFER_TOO_SMALL FFERRTAG( 'B','U','F','S') ///< Buffer too small -#define AVERROR_DECODER_NOT_FOUND FFERRTAG(0xF8,'D','E','C') ///< Decoder not found -#define AVERROR_DEMUXER_NOT_FOUND FFERRTAG(0xF8,'D','E','M') ///< Demuxer not found -#define AVERROR_ENCODER_NOT_FOUND FFERRTAG(0xF8,'E','N','C') ///< Encoder not found -#define AVERROR_EOF FFERRTAG( 'E','O','F',' ') ///< End of file -#define AVERROR_EXIT FFERRTAG( 'E','X','I','T') ///< Immediate exit was requested; the called function should not be restarted -#define AVERROR_EXTERNAL FFERRTAG( 'E','X','T',' ') ///< Generic error in an external library -#define AVERROR_FILTER_NOT_FOUND FFERRTAG(0xF8,'F','I','L') ///< Filter not found #define AVERROR_INVALIDDATA FFERRTAG( 'I','N','D','A') ///< Invalid data found when processing input -#define AVERROR_MUXER_NOT_FOUND FFERRTAG(0xF8,'M','U','X') ///< Muxer not found -#define AVERROR_OPTION_NOT_FOUND FFERRTAG(0xF8,'O','P','T') ///< Option not found #define AVERROR_PATCHWELCOME FFERRTAG( 'P','A','W','E') ///< Not yet implemented in FFmpeg, patches welcome -#define AVERROR_PROTOCOL_NOT_FOUND FFERRTAG(0xF8,'P','R','O') ///< Protocol not found - -#define AVERROR_STREAM_NOT_FOUND FFERRTAG(0xF8,'S','T','R') ///< Stream not found -/** - * This is semantically identical to AVERROR_BUG - * it has been introduced in Libav after our AVERROR_BUG and with a modified value. - */ -#define AVERROR_BUG2 FFERRTAG( 'B','U','G',' ') -#define AVERROR_UNKNOWN FFERRTAG( 'U','N','K','N') ///< Unknown error, typically from an external library -#define AVERROR_EXPERIMENTAL (-0x2bb2afa8) ///< Requested feature is flagged experimental. Set strict_std_compliance if you really want to use it. -#define AVERROR_INPUT_CHANGED (-0x636e6701) ///< Input changed between calls. Reconfiguration is required. (can be OR-ed with AVERROR_OUTPUT_CHANGED) -#define AVERROR_OUTPUT_CHANGED (-0x636e6702) ///< Output changed between calls. Reconfiguration is required. (can be OR-ed with AVERROR_INPUT_CHANGED) -/* HTTP & RTSP errors */ -#define AVERROR_HTTP_BAD_REQUEST FFERRTAG(0xF8,'4','0','0') -#define AVERROR_HTTP_UNAUTHORIZED FFERRTAG(0xF8,'4','0','1') -#define AVERROR_HTTP_FORBIDDEN FFERRTAG(0xF8,'4','0','3') -#define AVERROR_HTTP_NOT_FOUND FFERRTAG(0xF8,'4','0','4') -#define AVERROR_HTTP_OTHER_4XX FFERRTAG(0xF8,'4','X','X') -#define AVERROR_HTTP_SERVER_ERROR FFERRTAG(0xF8,'5','X','X') - -#define AV_ERROR_MAX_STRING_SIZE 64 #endif /* AVUTIL_ERROR_H */ diff --git a/ext/at3_standalone/fft-internal.h b/ext/at3_standalone/fft-internal.h index 0a8f7d05cf..55f083640b 100644 --- a/ext/at3_standalone/fft-internal.h +++ b/ext/at3_standalone/fft-internal.h @@ -19,8 +19,6 @@ #ifndef AVCODEC_FFT_INTERNAL_H #define AVCODEC_FFT_INTERNAL_H -#if FFT_FLOAT - #define FIX15(v) (v) #define sqrthalf (float)M_SQRT1_2 @@ -34,55 +32,6 @@ (dim) = (are) * (bim) + (aim) * (bre); \ } while (0) -#else - -#define SCALE_FLOAT(a, bits) lrint((a) * (double)(1 << (bits))) - -#if FFT_FIXED_32 - -#define CMUL(dre, dim, are, aim, bre, bim) do { \ - int64_t accu; \ - (accu) = (int64_t)(bre) * (are); \ - (accu) -= (int64_t)(bim) * (aim); \ - (dre) = (int)(((accu) + 0x40000000) >> 31); \ - (accu) = (int64_t)(bre) * (aim); \ - (accu) += (int64_t)(bim) * (are); \ - (dim) = (int)(((accu) + 0x40000000) >> 31); \ - } while (0) - -#define FIX15(a) av_clip(SCALE_FLOAT(a, 31), -2147483647, 2147483647) - -#else /* FFT_FIXED_32 */ - -#include "fft.h" -#include "mathops.h" - -void ff_mdct_calcw_c(FFTContext *s, FFTDouble *output, const FFTSample *input); - -#define FIX15(a) av_clip(SCALE_FLOAT(a, 15), -32767, 32767) - -#define sqrthalf ((int16_t)((1<<15)*M_SQRT1_2)) - -#define BF(x, y, a, b) do { \ - x = (a - b) >> 1; \ - y = (a + b) >> 1; \ - } while (0) - -#define CMULS(dre, dim, are, aim, bre, bim, sh) do { \ - (dre) = (MUL16(are, bre) - MUL16(aim, bim)) >> sh; \ - (dim) = (MUL16(are, bim) + MUL16(aim, bre)) >> sh; \ - } while (0) - -#define CMUL(dre, dim, are, aim, bre, bim) \ - CMULS(dre, dim, are, aim, bre, bim, 15) - -#define CMULL(dre, dim, are, aim, bre, bim) \ - CMULS(dre, dim, are, aim, bre, bim, 0) - -#endif /* FFT_FIXED_32 */ - -#endif /* FFT_FLOAT */ - #define ff_imdct_calc_c FFT_NAME(ff_imdct_calc_c) #define ff_imdct_half_c FFT_NAME(ff_imdct_half_c) #define ff_mdct_calc_c FFT_NAME(ff_mdct_calc_c) diff --git a/ext/at3_standalone/fft.h b/ext/at3_standalone/fft.h index a0d94bde82..4d5dae9e53 100644 --- a/ext/at3_standalone/fft.h +++ b/ext/at3_standalone/fft.h @@ -31,7 +31,6 @@ #endif #include -#include "config.h" #if FFT_FLOAT diff --git a/ext/at3_standalone/fft_template.c b/ext/at3_standalone/fft_template.c index e4b8149ce7..1cfd90b0a2 100644 --- a/ext/at3_standalone/fft_template.c +++ b/ext/at3_standalone/fft_template.c @@ -34,10 +34,6 @@ #include "fft.h" #include "fft-internal.h" -#if FFT_FIXED_32 -#include "fft_table.h" -#else /* FFT_FIXED_32 */ - /* cos(2*pi*x/n) for 0<=x<=n/4, followed by its reverse */ #if !CONFIG_HARDCODED_TABLES COSTABLE(16); @@ -71,8 +67,6 @@ COSTABLE_CONST FFTSample * const FFT_NAME(ff_cos_tabs)[] = { FFT_NAME(ff_cos_65536), }; -#endif /* FFT_FIXED_32 */ - static void fft_permute_c(FFTContext *s, FFTComplex *z); static void fft_calc_c(FFTContext *s, FFTComplex *z); @@ -165,12 +159,6 @@ av_cold int ff_fft_init(FFTContext *s, int nbits, int inverse) s->mdct_calc = ff_mdct_calc_c; #endif -#if FFT_FIXED_32 - { - int n=0; - ff_fft_lut_init(ff_fft_offsets_lut, 0, 1 << 16, &n); - } -#else /* FFT_FIXED_32 */ #if FFT_FLOAT if (ARCH_AARCH64) ff_fft_init_aarch64(s); if (ARCH_ARM) ff_fft_init_arm(s); @@ -185,8 +173,6 @@ av_cold int ff_fft_init(FFTContext *s, int nbits, int inverse) for(j=4; j<=nbits; j++) { ff_init_ff_cos_tabs(j); } -#endif /* FFT_FIXED_32 */ - if (s->fft_permutation == FF_FFT_PERM_AVX) { fft_perm_avx(s); @@ -223,165 +209,6 @@ av_cold void ff_fft_end(FFTContext *s) av_freep(&s->tmp_buf); } -#if FFT_FIXED_32 - -static void fft_calc_c(FFTContext *s, FFTComplex *z) { - - int nbits, i, n, num_transforms, offset, step; - int n4, n2, n34; - FFTSample tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7, tmp8; - FFTComplex *tmpz; - const int fft_size = (1 << s->nbits); - int64_t accu; - - num_transforms = (0x2aab >> (16 - s->nbits)) | 1; - - for (n=0; n> 1) | 1; - - for (n=0; n> 31); - accu = (int64_t)Q31(M_SQRT1_2)*(tmp3 - tmp4); - tmp7 = (int32_t)((accu + 0x40000000) >> 31); - accu = (int64_t)Q31(M_SQRT1_2)*(tmp2 - tmp1); - tmp6 = (int32_t)((accu + 0x40000000) >> 31); - accu = (int64_t)Q31(M_SQRT1_2)*(tmp3 + tmp4); - tmp8 = (int32_t)((accu + 0x40000000) >> 31); - tmp1 = tmp5 + tmp7; - tmp3 = tmp5 - tmp7; - tmp2 = tmp6 + tmp8; - tmp4 = tmp6 - tmp8; - - tmpz[5].re = tmpz[1].re - tmp1; - tmpz[1].re = tmpz[1].re + tmp1; - tmpz[5].im = tmpz[1].im - tmp2; - tmpz[1].im = tmpz[1].im + tmp2; - tmpz[7].re = tmpz[3].re - tmp4; - tmpz[3].re = tmpz[3].re + tmp4; - tmpz[7].im = tmpz[3].im + tmp3; - tmpz[3].im = tmpz[3].im - tmp3; - } - - step = 1 << ((MAX_LOG2_NFFT-4) - 4); - n4 = 4; - - for (nbits=4; nbits<=s->nbits; nbits++){ - n2 = 2*n4; - n34 = 3*n4; - num_transforms = (num_transforms >> 1) | 1; - - for (n=0; n> 31); - accu = (int64_t)w_re*tmpz[ n2+i].im; - accu -= (int64_t)w_im*tmpz[ n2+i].re; - tmp2 = (int32_t)((accu + 0x40000000) >> 31); - accu = (int64_t)w_re*tmpz[n34+i].re; - accu -= (int64_t)w_im*tmpz[n34+i].im; - tmp3 = (int32_t)((accu + 0x40000000) >> 31); - accu = (int64_t)w_re*tmpz[n34+i].im; - accu += (int64_t)w_im*tmpz[n34+i].re; - tmp4 = (int32_t)((accu + 0x40000000) >> 31); - - tmp5 = tmp1 + tmp3; - tmp1 = tmp1 - tmp3; - tmp6 = tmp2 + tmp4; - tmp2 = tmp2 - tmp4; - - tmpz[ n2+i].re = tmpz[ i].re - tmp5; - tmpz[ i].re = tmpz[ i].re + tmp5; - tmpz[ n2+i].im = tmpz[ i].im - tmp6; - tmpz[ i].im = tmpz[ i].im + tmp6; - tmpz[n34+i].re = tmpz[n4+i].re - tmp2; - tmpz[ n4+i].re = tmpz[n4+i].re + tmp2; - tmpz[n34+i].im = tmpz[n4+i].im + tmp1; - tmpz[ n4+i].im = tmpz[n4+i].im - tmp1; - - w_re_ptr += step; - w_im_ptr -= step; - } - } - step >>= 1; - n4 <<= 1; - } -} - -#else /* FFT_FIXED_32 */ #define BUTTERFLIES(a0,a1,a2,a3) {\ BF(t3, t5, t5, t1);\ @@ -528,4 +355,3 @@ static void fft_calc_c(FFTContext *s, FFTComplex *z) { fft_dispatch[s->nbits-2](z); } -#endif /* FFT_FIXED_32 */ diff --git a/ext/at3_standalone/float_dsp.c b/ext/at3_standalone/float_dsp.c index 24a06c047c..351ee9a6c9 100644 --- a/ext/at3_standalone/float_dsp.c +++ b/ext/at3_standalone/float_dsp.c @@ -19,8 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "config.h" -#include "attributes.h" +#include "compat.h" #include "float_dsp.h" #include "mem.h" diff --git a/ext/at3_standalone/float_dsp.h b/ext/at3_standalone/float_dsp.h index 0ab56aebed..b2b433a6f7 100644 --- a/ext/at3_standalone/float_dsp.h +++ b/ext/at3_standalone/float_dsp.h @@ -19,8 +19,6 @@ #ifndef AVUTIL_FLOAT_DSP_H #define AVUTIL_FLOAT_DSP_H -#include "config.h" - typedef struct AVFloatDSPContext { /** * Calculate the entry wise product of two vectors of floats and store the result in diff --git a/ext/at3_standalone/get_bits.h b/ext/at3_standalone/get_bits.h index a4905f41f5..fed83fbb68 100644 --- a/ext/at3_standalone/get_bits.h +++ b/ext/at3_standalone/get_bits.h @@ -31,7 +31,7 @@ #include "common.h" #include "common.h" #include "intreadwrite.h" -#include "mathops.h" +#include "mathematics.h" /* #include "libavutil/log.h" #include "libavutil/avassert.h" diff --git a/ext/at3_standalone/internal.h b/ext/at3_standalone/internal.h deleted file mode 100644 index 028235896f..0000000000 --- a/ext/at3_standalone/internal.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/** - * @file - * common internal api header. - */ - -#ifndef AVCODEC_INTERNAL_H -#define AVCODEC_INTERNAL_H - -#include - -#include "channel_layout.h" -#include "mathematics.h" -#include "avcodec.h" -#include "config.h" - -#define FF_SANE_NB_CHANNELS 64U - -extern const uint8_t ff_log2_run[41]; - -/** - * Maximum size in bytes of extradata. - * This value was chosen such that every bit of the buffer is - * addressable by a 32-bit signed integer as used by get_bits. - */ -#define FF_MAX_EXTRADATA_SIZE ((1 << 28) - AV_INPUT_BUFFER_PADDING_SIZE) - -#endif /* AVCODEC_INTERNAL_H */ diff --git a/ext/at3_standalone/intmath.h b/ext/at3_standalone/intmath.h index e42581000f..9adfe5a41d 100644 --- a/ext/at3_standalone/intmath.h +++ b/ext/at3_standalone/intmath.h @@ -23,8 +23,7 @@ #include -#include "config.h" -#include "attributes.h" +#include "compat.h" #if ARCH_ARM # include "arm/intmath.h" diff --git a/ext/at3_standalone/intreadwrite.h b/ext/at3_standalone/intreadwrite.h index 8c9ec106ac..f7683aaa7c 100644 --- a/ext/at3_standalone/intreadwrite.h +++ b/ext/at3_standalone/intreadwrite.h @@ -22,7 +22,6 @@ #include #include "compat.h" -#include "bswap.h" typedef union { uint64_t u64; diff --git a/ext/at3_standalone/libm.h b/ext/at3_standalone/libm.h index 71d3672eb8..f64851cb06 100644 --- a/ext/at3_standalone/libm.h +++ b/ext/at3_standalone/libm.h @@ -26,8 +26,7 @@ #define AVUTIL_LIBM_H #include -#include "config.h" -#include "attributes.h" +#include "compat.h" #include "intfloat.h" #include "mathematics.h" diff --git a/ext/at3_standalone/log.h b/ext/at3_standalone/log.h index 321748cd80..2bf9af03aa 100644 --- a/ext/at3_standalone/log.h +++ b/ext/at3_standalone/log.h @@ -23,7 +23,7 @@ #include #include "avutil.h" -#include "attributes.h" +#include "compat.h" #include "version.h" typedef enum { @@ -352,6 +352,12 @@ void av_log_format_line(void *ptr, int level, const char *fmt, va_list vl, void av_log_set_flags(int arg); int av_log_get_flags(void); +#ifdef DEBUG +# define ff_dlog(ctx, ...) av_log(ctx, AV_LOG_DEBUG, __VA_ARGS__) +#else +# define ff_dlog(ctx, ...) do { if (0) av_log(ctx, AV_LOG_DEBUG, __VA_ARGS__); } while (0) +#endif + /** * @} */ diff --git a/ext/at3_standalone/log2_tab.c b/ext/at3_standalone/log2_tab.c deleted file mode 100644 index 0dbf07d74c..0000000000 --- a/ext/at3_standalone/log2_tab.c +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (c) 2003-2012 Michael Niedermayer - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include - -const uint8_t ff_log2_tab[256]={ - 0,0,1,1,2,2,2,2,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4, - 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5, - 6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6, - 6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6, - 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, - 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, - 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, - 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7 -}; diff --git a/ext/at3_standalone/macros.h b/ext/at3_standalone/macros.h deleted file mode 100644 index 2007ee5619..0000000000 --- a/ext/at3_standalone/macros.h +++ /dev/null @@ -1,50 +0,0 @@ -/* - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/** - * @file - * @ingroup lavu - * Utility Preprocessor macros - */ - -#ifndef AVUTIL_MACROS_H -#define AVUTIL_MACROS_H - -/** - * @addtogroup preproc_misc Preprocessor String Macros - * - * String manipulation macros - * - * @{ - */ - -#define AV_STRINGIFY(s) AV_TOSTRING(s) -#define AV_TOSTRING(s) #s - -#define AV_GLUE(a, b) a ## b -#define AV_JOIN(a, b) AV_GLUE(a, b) - -/** - * @} - */ - -#define AV_PRAGMA(s) _Pragma(#s) - -#define FFALIGN(x, a) (((x)+(a)-1)&~((a)-1)) - -#endif /* AVUTIL_MACROS_H */ diff --git a/ext/at3_standalone/mathematics.c b/ext/at3_standalone/mathematics.c index 2887228c80..3db29ad300 100644 --- a/ext/at3_standalone/mathematics.c +++ b/ext/at3_standalone/mathematics.c @@ -142,3 +142,90 @@ int64_t av_rescale_q(int64_t a, AVRational bq, AVRational cq) { return av_rescale_q_rnd(a, bq, cq, AV_ROUND_NEAR_INF); } + + +int av_reduce(int *dst_num, int *dst_den, + int64_t num, int64_t den, int64_t max) +{ + AVRational a0 = { 0, 1 }, a1 = { 1, 0 }; + int sign = (num < 0) ^ (den < 0); + int64_t gcd = av_gcd(FFABS(num), FFABS(den)); + + if (gcd) { + num = FFABS(num) / gcd; + den = FFABS(den) / gcd; + } + if (num <= max && den <= max) { + a1 = (AVRational){ num, den }; + den = 0; + } + + while (den) { + uint64_t x = num / den; + int64_t next_den = num - den * x; + int64_t a2n = x * a1.num + a0.num; + int64_t a2d = x * a1.den + a0.den; + + if (a2n > max || a2d > max) { + if (a1.num) x = (max - a0.num) / a1.num; + if (a1.den) x = FFMIN(x, (max - a0.den) / a1.den); + + if (den * (2 * x * a1.den + a0.den) > num * a1.den) + a1 = (AVRational){ x * a1.num + a0.num, x * a1.den + a0.den }; + break; + } + + a0 = a1; + a1 = (AVRational){ a2n, a2d }; + num = den; + den = next_den; + } + av_assert2(av_gcd(a1.num, a1.den) <= 1U); + av_assert2(a1.num <= max && a1.den <= max); + + *dst_num = sign ? -a1.num : a1.num; + *dst_den = a1.den; + + return den == 0; +} + +AVRational av_mul_q(AVRational b, AVRational c) +{ + av_reduce(&b.num, &b.den, + b.num * (int64_t)c.num, + b.den * (int64_t)c.den, INT_MAX); + return b; +} + +AVRational av_div_q(AVRational b, AVRational c) +{ + return av_mul_q(b, (AVRational) { c.den, c.num }); +} + +AVRational av_add_q(AVRational b, AVRational c) { + av_reduce(&b.num, &b.den, + b.num * (int64_t)c.den + + c.num * (int64_t)b.den, + b.den * (int64_t)c.den, INT_MAX); + return b; +} + +AVRational av_d2q(double d, int max) +{ + AVRational a; + int exponent; + int64_t den; + if (isnan(d)) + return (AVRational) { 0, 0 }; + if (fabs(d) > INT_MAX + 3LL) + return (AVRational) { d < 0 ? -1 : 1, 0 }; + frexp(d, &exponent); + exponent = FFMAX(exponent - 1, 0); + den = 1LL << (61 - exponent); + // (int64_t)rint() and llrint() do not work with gcc on ia64 and sparc64 + av_reduce(&a.num, &a.den, floor(d * den + 0.5), den, max); + if ((!a.num || !a.den) && d && max > 0 && max < INT_MAX) + av_reduce(&a.num, &a.den, floor(d * den + 0.5), den, INT_MAX); + + return a; +} diff --git a/ext/at3_standalone/mathematics.h b/ext/at3_standalone/mathematics.h index 491a3edc60..19c9ac2cbc 100644 --- a/ext/at3_standalone/mathematics.h +++ b/ext/at3_standalone/mathematics.h @@ -23,10 +23,37 @@ #include #include -#include "attributes.h" -#include "rational.h" +#include "compat.h" +#include "common.h" #include "intfloat.h" +extern const uint32_t ff_inverse[257]; +extern const uint8_t ff_sqrt_tab[256]; + +#ifndef sign_extend +static inline av_const int sign_extend(int val, unsigned bits) +{ + unsigned shift = 8 * sizeof(int) - bits; + union { unsigned u; int s; } v = { (unsigned)val << shift }; + return v.s >> shift; +} +#endif + +#ifndef zero_extend +static inline av_const unsigned zero_extend(unsigned val, unsigned bits) +{ + return (val << ((8 * sizeof(int)) - bits)) >> ((8 * sizeof(int)) - bits); +} +#endif + +#ifndef NEG_SSR32 +# define NEG_SSR32(a,s) ((( int32_t)(a))>>(32-(s))) +#endif + +#ifndef NEG_USR32 +# define NEG_USR32(a,s) (((uint32_t)(a))>>(32-(s))) +#endif + #ifndef M_E #define M_E 2.7182818284590452354 /* e */ #endif @@ -76,19 +103,27 @@ enum AVRounding { AV_ROUND_PASS_MINMAX = 8192, ///< Flag to pass INT64_MIN/MAX through instead of rescaling, this avoids special cases for AV_NOPTS_VALUE }; +/** + * rational number numerator/denominator + */ +typedef struct AVRational { + int num; ///< numerator + int den; ///< denominator +} AVRational; + /** * Compute the greatest common divisor of a and b. * * @return gcd of a and b up to sign; if a >= 0 and b >= 0, return value is >= 0; * if a == 0 and b == 0, returns 0. */ -int64_t av_const av_gcd(int64_t a, int64_t b); +int64_t av_gcd(int64_t a, int64_t b); /** * Rescale a 64-bit integer with rounding to nearest. * A simple a*b/c isn't possible as it can overflow. */ -int64_t av_rescale(int64_t a, int64_t b, int64_t c) av_const; +int64_t av_rescale(int64_t a, int64_t b, int64_t c); /** * Rescale a 64-bit integer with specified rounding. @@ -97,12 +132,12 @@ int64_t av_rescale(int64_t a, int64_t b, int64_t c) av_const; * @return rescaled value a, or if AV_ROUND_PASS_MINMAX is set and a is * INT64_MIN or INT64_MAX then a is passed through unchanged. */ -int64_t av_rescale_rnd(int64_t a, int64_t b, int64_t c, enum AVRounding) av_const; +int64_t av_rescale_rnd(int64_t a, int64_t b, int64_t c, enum AVRounding); /** * Rescale a 64-bit integer by 2 rational numbers. */ -int64_t av_rescale_q(int64_t a, AVRational bq, AVRational cq) av_const; +int64_t av_rescale_q(int64_t a, AVRational bq, AVRational cq); /** * Rescale a 64-bit integer by 2 rational numbers with specified rounding. @@ -111,11 +146,100 @@ int64_t av_rescale_q(int64_t a, AVRational bq, AVRational cq) av_const; * INT64_MIN or INT64_MAX then a is passed through unchanged. */ int64_t av_rescale_q_rnd(int64_t a, AVRational bq, AVRational cq, - enum AVRounding) av_const; + enum AVRounding); - /** - * @} +/** + * Create a rational. + * Useful for compilers that do not support compound literals. + * @note The return value is not reduced. */ +static inline AVRational av_make_q(int num, int den) +{ + AVRational r = { num, den }; + return r; +} + +/** + * Compare two rationals. + * @param a first rational + * @param b second rational + * @return 0 if a==b, 1 if a>b, -1 if a> 63) | 1; + else if (b.den && a.den) return 0; + else if (a.num && b.num) return (a.num >> 31) - (b.num >> 31); + else return INT_MIN; +} + +/** + * Convert rational to double. + * @param a rational to convert + * @return (double) a + */ +static inline double av_q2d(AVRational a) { + return a.num / (double)a.den; +} + +/** + * Reduce a fraction. + * This is useful for framerate calculations. + * @param dst_num destination numerator + * @param dst_den destination denominator + * @param num source numerator + * @param den source denominator + * @param max the maximum allowed for dst_num & dst_den + * @return 1 if exact, 0 otherwise + */ +int av_reduce(int *dst_num, int *dst_den, int64_t num, int64_t den, int64_t max); + +/** + * Multiply two rationals. + * @param b first rational + * @param c second rational + * @return b*c + */ +AVRational av_mul_q(AVRational b, AVRational c) av_const; + +/** + * Divide one rational by another. + * @param b first rational + * @param c second rational + * @return b/c + */ +AVRational av_div_q(AVRational b, AVRational c) av_const; + +/** + * Add two rationals. + * @param b first rational + * @param c second rational + * @return b+c + */ +AVRational av_add_q(AVRational b, AVRational c) av_const; + +/** + * Invert a rational. + * @param q value + * @return 1 / q + */ +static av_always_inline AVRational av_inv_q(AVRational q) +{ + AVRational r = { q.den, q.num }; + return r; +} + +/** + * Convert a double precision floating point number to a rational. + * inf is expressed as {1,0} or {-1,0} depending on the sign. + * + * @param d double to convert + * @param max the maximum allowed numerator and denominator + * @return (AVRational) d + */ +AVRational av_d2q(double d, int max) av_const; #endif /* AVUTIL_MATHEMATICS_H */ diff --git a/ext/at3_standalone/mathops.h b/ext/at3_standalone/mathops.h deleted file mode 100644 index 4efefdd671..0000000000 --- a/ext/at3_standalone/mathops.h +++ /dev/null @@ -1,251 +0,0 @@ -/* - * simple math operations - * Copyright (c) 2001, 2002 Fabrice Bellard - * Copyright (c) 2006 Michael Niedermayer et al - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ -#ifndef AVCODEC_MATHOPS_H -#define AVCODEC_MATHOPS_H - -#include - -#include "common.h" -#include "config.h" - -#define MAX_NEG_CROP 1024 - -extern const uint32_t ff_inverse[257]; -extern const uint8_t ff_sqrt_tab[256]; -extern const uint8_t ff_crop_tab[256 + 2 * MAX_NEG_CROP]; -extern const uint8_t ff_zigzag_direct[64]; - -#if ARCH_ARM -# include "arm/mathops.h" -#elif ARCH_AVR32 -# include "avr32/mathops.h" -#elif ARCH_MIPS -# include "mips/mathops.h" -#elif ARCH_PPC -# include "ppc/mathops.h" -#elif ARCH_X86 -# include "x86/mathops.h" -#endif - -/* generic implementation */ - -#ifndef MUL64 -# define MUL64(a,b) ((int64_t)(a) * (int64_t)(b)) -#endif - -#ifndef MULL -# define MULL(a,b,s) (MUL64(a, b) >> (s)) -#endif - -#ifndef MULH -static av_always_inline int MULH(int a, int b){ - return MUL64(a, b) >> 32; -} -#endif - -#ifndef UMULH -static av_always_inline unsigned UMULH(unsigned a, unsigned b){ - return ((uint64_t)(a) * (uint64_t)(b))>>32; -} -#endif - -#ifndef MAC64 -# define MAC64(d, a, b) ((d) += MUL64(a, b)) -#endif - -#ifndef MLS64 -# define MLS64(d, a, b) ((d) -= MUL64(a, b)) -#endif - -/* signed 16x16 -> 32 multiply add accumulate */ -#ifndef MAC16 -# define MAC16(rt, ra, rb) rt += (ra) * (rb) -#endif - -/* signed 16x16 -> 32 multiply */ -#ifndef MUL16 -# define MUL16(ra, rb) ((ra) * (rb)) -#endif - -#ifndef MLS16 -# define MLS16(rt, ra, rb) ((rt) -= (ra) * (rb)) -#endif - -/* median of 3 */ -#ifndef mid_pred -#define mid_pred mid_pred -static inline av_const int mid_pred(int a, int b, int c) -{ -#if 0 - int t= (a-b)&((a-b)>>31); - a-=t; - b+=t; - b-= (b-c)&((b-c)>>31); - b+= (a-b)&((a-b)>>31); - - return b; -#else - if(a>b){ - if(c>b){ - if(c>a) b=a; - else b=c; - } - }else{ - if(b>c){ - if(c>a) b=c; - else b=a; - } - } - return b; -#endif -} -#endif - -#ifndef median4 -#define median4 median4 -static inline av_const int median4(int a, int b, int c, int d) -{ - if (a < b) { - if (c < d) return (FFMIN(b, d) + FFMAX(a, c)) / 2; - else return (FFMIN(b, c) + FFMAX(a, d)) / 2; - } else { - if (c < d) return (FFMIN(a, d) + FFMAX(b, c)) / 2; - else return (FFMIN(a, c) + FFMAX(b, d)) / 2; - } -} -#endif - -#ifndef sign_extend -static inline av_const int sign_extend(int val, unsigned bits) -{ - unsigned shift = 8 * sizeof(int) - bits; - union { unsigned u; int s; } v = { (unsigned) val << shift }; - return v.s >> shift; -} -#endif - -#ifndef zero_extend -static inline av_const unsigned zero_extend(unsigned val, unsigned bits) -{ - return (val << ((8 * sizeof(int)) - bits)) >> ((8 * sizeof(int)) - bits); -} -#endif - -#ifndef COPY3_IF_LT -#define COPY3_IF_LT(x, y, a, b, c, d)\ -if ((y) < (x)) {\ - (x) = (y);\ - (a) = (b);\ - (c) = (d);\ -} -#endif - -#ifndef MASK_ABS -#define MASK_ABS(mask, level) do { \ - mask = level >> 31; \ - level = (level ^ mask) - mask; \ - } while (0) -#endif - -#ifndef NEG_SSR32 -# define NEG_SSR32(a,s) ((( int32_t)(a))>>(32-(s))) -#endif - -#ifndef NEG_USR32 -# define NEG_USR32(a,s) (((uint32_t)(a))>>(32-(s))) -#endif - -#if HAVE_BIGENDIAN -# ifndef PACK_2U8 -# define PACK_2U8(a,b) (((a) << 8) | (b)) -# endif -# ifndef PACK_4U8 -# define PACK_4U8(a,b,c,d) (((a) << 24) | ((b) << 16) | ((c) << 8) | (d)) -# endif -# ifndef PACK_2U16 -# define PACK_2U16(a,b) (((a) << 16) | (b)) -# endif -#else -# ifndef PACK_2U8 -# define PACK_2U8(a,b) (((b) << 8) | (a)) -# endif -# ifndef PACK_4U2 -# define PACK_4U8(a,b,c,d) (((d) << 24) | ((c) << 16) | ((b) << 8) | (a)) -# endif -# ifndef PACK_2U16 -# define PACK_2U16(a,b) (((b) << 16) | (a)) -# endif -#endif - -#ifndef PACK_2S8 -# define PACK_2S8(a,b) PACK_2U8((a)&255, (b)&255) -#endif -#ifndef PACK_4S8 -# define PACK_4S8(a,b,c,d) PACK_4U8((a)&255, (b)&255, (c)&255, (d)&255) -#endif -#ifndef PACK_2S16 -# define PACK_2S16(a,b) PACK_2U16((a)&0xffff, (b)&0xffff) -#endif - -#ifndef FASTDIV -# define FASTDIV(a,b) ((uint32_t)((((uint64_t)a) * ff_inverse[b]) >> 32)) -#endif /* FASTDIV */ - -#ifndef ff_sqrt -#define ff_sqrt ff_sqrt -static inline av_const unsigned int ff_sqrt(unsigned int a) -{ - unsigned int b; - - if (a < 255) return (ff_sqrt_tab[a + 1] - 1) >> 4; - else if (a < (1 << 12)) b = ff_sqrt_tab[a >> 4] >> 2; -#if !CONFIG_SMALL - else if (a < (1 << 14)) b = ff_sqrt_tab[a >> 6] >> 1; - else if (a < (1 << 16)) b = ff_sqrt_tab[a >> 8] ; -#endif - else { - int s = av_log2_16bit(a >> 16) >> 1; - unsigned int c = a >> (s + 2); - b = ff_sqrt_tab[c >> (s + 8)]; - b = FASTDIV(c,b) + (b << s); - } - - return b - (a < b * b); -} -#endif - -static inline av_const float ff_sqrf(float a) -{ - return a*a; -} - -static inline int8_t ff_u8_to_s8(uint8_t a) -{ - union { - uint8_t u8; - int8_t s8; - } b; - b.u8 = a; - return b.s8; -} - -#endif /* AVCODEC_MATHOPS_H */ diff --git a/ext/at3_standalone/mem.c b/ext/at3_standalone/mem.c index a92ad3f8d9..6519a1df70 100644 --- a/ext/at3_standalone/mem.c +++ b/ext/at3_standalone/mem.c @@ -60,110 +60,20 @@ int ff_fast_malloc(void *ptr, unsigned int *size, size_t min_size, int zero_real #define ALIGN (HAVE_AVX ? 32 : 16) -/* NOTE: if you want to override these functions with your own - * implementations (not recommended) you have to link libav* as - * dynamic libraries and remove -Wl,-Bsymbolic from the linker flags. - * Note that this will cost performance. */ - -static size_t max_alloc_size= INT_MAX; - -void av_max_alloc(size_t max){ - max_alloc_size = max; -} - void *av_malloc(size_t size) { void *ptr = NULL; -#if CONFIG_MEMALIGN_HACK - long diff; -#endif - - /* let's disallow possibly ambiguous cases */ - if (size > (max_alloc_size - 32)) - return NULL; - -#if CONFIG_MEMALIGN_HACK - ptr = malloc(size + ALIGN); - if (!ptr) - return ptr; - diff = ((~(long)ptr)&(ALIGN - 1)) + 1; - ptr = (char *)ptr + diff; - ((char *)ptr)[-1] = diff; -#elif HAVE_POSIX_MEMALIGN - if (size) //OS X on SDK 10.6 has a broken posix_memalign implementation - if (posix_memalign(&ptr, ALIGN, size)) - ptr = NULL; -#elif HAVE_ALIGNED_MALLOC - ptr = _aligned_malloc(size, ALIGN); -#elif HAVE_MEMALIGN -#ifndef __DJGPP__ - ptr = memalign(ALIGN, size); -#else - ptr = memalign(size, ALIGN); -#endif - /* Why 64? - * Indeed, we should align it: - * on 4 for 386 - * on 16 for 486 - * on 32 for 586, PPro - K6-III - * on 64 for K7 (maybe for P3 too). - * Because L1 and L2 caches are aligned on those values. - * But I don't want to code such logic here! - */ - /* Why 32? - * For AVX ASM. SSE / NEON needs only 16. - * Why not larger? Because I did not see a difference in benchmarks ... - */ - /* benchmarks with P3 - * memalign(64) + 1 3071, 3051, 3032 - * memalign(64) + 2 3051, 3032, 3041 - * memalign(64) + 4 2911, 2896, 2915 - * memalign(64) + 8 2545, 2554, 2550 - * memalign(64) + 16 2543, 2572, 2563 - * memalign(64) + 32 2546, 2545, 2571 - * memalign(64) + 64 2570, 2533, 2558 - * - * BTW, malloc seems to do 8-byte alignment by default here. - */ -#else ptr = malloc(size); -#endif if(!ptr && !size) { size = 1; ptr= av_malloc(1); } -#if CONFIG_MEMORY_POISONING - if (ptr) - memset(ptr, FF_MEMORY_POISON, size); -#endif return ptr; } void *av_realloc(void *ptr, size_t size) { -#if CONFIG_MEMALIGN_HACK - int diff; -#endif - - /* let's disallow possibly ambiguous cases */ - if (size > (max_alloc_size - 32)) - return NULL; - -#if CONFIG_MEMALIGN_HACK - //FIXME this isn't aligned correctly, though it probably isn't needed - if (!ptr) - return av_malloc(size); - diff = ((char *)ptr)[-1]; - av_assert0(diff>0 && diff<=ALIGN); - ptr = realloc((char *)ptr - diff, size + diff); - if (ptr) - ptr = (char *)ptr + diff; - return ptr; -#elif HAVE_ALIGNED_MALLOC - return _aligned_realloc(ptr, size + !size, ALIGN); -#else return realloc(ptr, size + !size); -#endif } void *av_realloc_f(void *ptr, size_t nelem, size_t elsize) @@ -190,17 +100,7 @@ void *av_realloc_array(void *ptr, size_t nmemb, size_t size) void av_free(void *ptr) { -#if CONFIG_MEMALIGN_HACK - if (ptr) { - int v= ((char *)ptr)[-1]; - av_assert0(v>0 && v<=ALIGN); - free((char *)ptr - v); - } -#elif HAVE_ALIGNED_MALLOC - _aligned_free(ptr); -#else free(ptr); -#endif } void av_freep(void *arg) diff --git a/ext/at3_standalone/mem.h b/ext/at3_standalone/mem.h index eac646335e..5568110edb 100644 --- a/ext/at3_standalone/mem.h +++ b/ext/at3_standalone/mem.h @@ -29,7 +29,7 @@ #include #include -#include "attributes.h" +#include "compat.h" #include "error.h" #include "avutil.h" @@ -37,7 +37,7 @@ * @addtogroup lavu_mem * @{ */ - +#define FF_MEMORY_POISON 0x2a #if defined(__INTEL_COMPILER) && __INTEL_COMPILER < 1110 || defined(__SUNPRO_C) #define DECLARE_ALIGNED(n,t,v) t __attribute__ ((aligned (n))) v @@ -195,11 +195,6 @@ static inline int av_size_mult(size_t a, size_t b, size_t *r) return 0; } -/** - * Set the maximum size that may me allocated in one block. - */ -void av_max_alloc(size_t max); - /** * Reallocate the given block if it is not large enough, otherwise do nothing. * diff --git a/ext/at3_standalone/options.c b/ext/at3_standalone/options.c deleted file mode 100644 index 67ee1c1816..0000000000 --- a/ext/at3_standalone/options.c +++ /dev/null @@ -1,109 +0,0 @@ -/* - * Copyright (c) 2001 Fabrice Bellard - * Copyright (c) 2002-2004 Michael Niedermayer - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/** - * @file - * Options definition for AVCodecContext. - */ - -#include "avcodec.h" -#include "internal.h" -#include "util_internal.h" -#include "mem.h" -#include /* FLT_MIN, FLT_MAX */ -#include - -static const AVClass av_codec_context_class = { - .class_name = "AVCodecContext", - .item_name = NULL, - .option = NULL, - .version = LIBAVUTIL_VERSION_INT, - .log_level_offset_offset = offsetof(AVCodecContext, log_level_offset), - .child_next = NULL, - .child_class_next = NULL, - .category = AV_CLASS_CATEGORY_DECODER, -}; - -int avcodec_get_context_defaults3(AVCodecContext *s, const AVCodec *codec) -{ - int flags=0; - memset(s, 0, sizeof(AVCodecContext)); - - s->av_class = &av_codec_context_class; - - if (codec) { - s->codec = codec; - s->codec_id = codec->id; - } - - if(codec && codec->priv_data_size){ - if(!s->priv_data){ - s->priv_data= av_mallocz(codec->priv_data_size); - if (!s->priv_data) { - return AVERROR(ENOMEM); - } - } - if(codec->priv_class){ - *(const AVClass**)s->priv_data = codec->priv_class; - } - } - return 0; -} - -AVCodecContext *avcodec_alloc_context3(const AVCodec *codec) -{ - AVCodecContext *avctx= av_malloc(sizeof(AVCodecContext)); - - if (!avctx) - return NULL; - - if(avcodec_get_context_defaults3(avctx, codec) < 0){ - av_free(avctx); - return NULL; - } - - return avctx; -} - -void avcodec_free_context(AVCodecContext **pavctx) -{ - AVCodecContext *avctx = *pavctx; - - if (!avctx) - return; - - avcodec_close(avctx); - - av_freep(&avctx->extradata); - - av_freep(pavctx); -} - -#define FOFFSET(x) offsetof(AVFrame,x) - -static const AVClass av_frame_class = { - .class_name = "AVFrame", - .item_name = NULL, - .option = NULL, - .version = LIBAVUTIL_VERSION_INT, -}; - -#define SROFFSET(x) offsetof(AVSubtitleRect,x) diff --git a/ext/at3_standalone/rational.c b/ext/at3_standalone/rational.c deleted file mode 100644 index a8aa7c23b3..0000000000 --- a/ext/at3_standalone/rational.c +++ /dev/null @@ -1,118 +0,0 @@ -/* - * rational numbers - * Copyright (c) 2003 Michael Niedermayer - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/** - * @file - * rational numbers - * @author Michael Niedermayer - */ - -#include - -#include "common.h" -#include "mathematics.h" -#include "rational.h" - -int av_reduce(int *dst_num, int *dst_den, - int64_t num, int64_t den, int64_t max) -{ - AVRational a0 = { 0, 1 }, a1 = { 1, 0 }; - int sign = (num < 0) ^ (den < 0); - int64_t gcd = av_gcd(FFABS(num), FFABS(den)); - - if (gcd) { - num = FFABS(num) / gcd; - den = FFABS(den) / gcd; - } - if (num <= max && den <= max) { - a1 = (AVRational) { num, den }; - den = 0; - } - - while (den) { - uint64_t x = num / den; - int64_t next_den = num - den * x; - int64_t a2n = x * a1.num + a0.num; - int64_t a2d = x * a1.den + a0.den; - - if (a2n > max || a2d > max) { - if (a1.num) x = (max - a0.num) / a1.num; - if (a1.den) x = FFMIN(x, (max - a0.den) / a1.den); - - if (den * (2 * x * a1.den + a0.den) > num * a1.den) - a1 = (AVRational) { x * a1.num + a0.num, x * a1.den + a0.den }; - break; - } - - a0 = a1; - a1 = (AVRational) { a2n, a2d }; - num = den; - den = next_den; - } - av_assert2(av_gcd(a1.num, a1.den) <= 1U); - av_assert2(a1.num <= max && a1.den <= max); - - *dst_num = sign ? -a1.num : a1.num; - *dst_den = a1.den; - - return den == 0; -} - -AVRational av_mul_q(AVRational b, AVRational c) -{ - av_reduce(&b.num, &b.den, - b.num * (int64_t) c.num, - b.den * (int64_t) c.den, INT_MAX); - return b; -} - -AVRational av_div_q(AVRational b, AVRational c) -{ - return av_mul_q(b, (AVRational) { c.den, c.num }); -} - -AVRational av_add_q(AVRational b, AVRational c) { - av_reduce(&b.num, &b.den, - b.num * (int64_t) c.den + - c.num * (int64_t) b.den, - b.den * (int64_t) c.den, INT_MAX); - return b; -} - -AVRational av_d2q(double d, int max) -{ - AVRational a; - int exponent; - int64_t den; - if (isnan(d)) - return (AVRational) { 0,0 }; - if (fabs(d) > INT_MAX + 3LL) - return (AVRational) { d < 0 ? -1 : 1, 0 }; - frexp(d, &exponent); - exponent = FFMAX(exponent-1, 0); - den = 1LL << (61 - exponent); - // (int64_t)rint() and llrint() do not work with gcc on ia64 and sparc64 - av_reduce(&a.num, &a.den, floor(d * den + 0.5), den, max); - if ((!a.num || !a.den) && d && max>0 && max - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/** - * @file - * rational numbers - * @author Michael Niedermayer - */ - -#ifndef AVUTIL_RATIONAL_H -#define AVUTIL_RATIONAL_H - -#include -#include - -#include "attributes.h" - -/** - * @addtogroup lavu_math - * @{ - */ - -/** - * rational number numerator/denominator - */ -typedef struct AVRational{ - int num; ///< numerator - int den; ///< denominator -} AVRational; - -/** - * Create a rational. - * Useful for compilers that do not support compound literals. - * @note The return value is not reduced. - */ -static inline AVRational av_make_q(int num, int den) -{ - AVRational r = { num, den }; - return r; -} - -/** - * Compare two rationals. - * @param a first rational - * @param b second rational - * @return 0 if a==b, 1 if a>b, -1 if a>63)|1; - else if(b.den && a.den) return 0; - else if(a.num && b.num) return (a.num>>31) - (b.num>>31); - else return INT_MIN; -} - -/** - * Convert rational to double. - * @param a rational to convert - * @return (double) a - */ -static inline double av_q2d(AVRational a){ - return a.num / (double) a.den; -} - -/** - * Reduce a fraction. - * This is useful for framerate calculations. - * @param dst_num destination numerator - * @param dst_den destination denominator - * @param num source numerator - * @param den source denominator - * @param max the maximum allowed for dst_num & dst_den - * @return 1 if exact, 0 otherwise - */ -int av_reduce(int *dst_num, int *dst_den, int64_t num, int64_t den, int64_t max); - -/** - * Multiply two rationals. - * @param b first rational - * @param c second rational - * @return b*c - */ -AVRational av_mul_q(AVRational b, AVRational c) av_const; - -/** - * Divide one rational by another. - * @param b first rational - * @param c second rational - * @return b/c - */ -AVRational av_div_q(AVRational b, AVRational c) av_const; - -/** - * Add two rationals. - * @param b first rational - * @param c second rational - * @return b+c - */ -AVRational av_add_q(AVRational b, AVRational c) av_const; - -/** - * Invert a rational. - * @param q value - * @return 1 / q - */ -static av_always_inline AVRational av_inv_q(AVRational q) -{ - AVRational r = { q.den, q.num }; - return r; -} - -/** - * Convert a double precision floating point number to a rational. - * inf is expressed as {1,0} or {-1,0} depending on the sign. - * - * @param d double to convert - * @param max the maximum allowed numerator and denominator - * @return (AVRational) d - */ -AVRational av_d2q(double d, int max) av_const; - -/** - * @} - */ - -#endif /* AVUTIL_RATIONAL_H */ diff --git a/ext/at3_standalone/samplefmt.h b/ext/at3_standalone/samplefmt.h index 8739e1411f..632bb4e852 100644 --- a/ext/at3_standalone/samplefmt.h +++ b/ext/at3_standalone/samplefmt.h @@ -22,7 +22,7 @@ #include #include "avutil.h" -#include "attributes.h" +#include "compat.h" /** * @addtogroup lavu_audio diff --git a/ext/at3_standalone/sinewin.h b/ext/at3_standalone/sinewin.h index 6154fbbaa1..811b6bd243 100644 --- a/ext/at3_standalone/sinewin.h +++ b/ext/at3_standalone/sinewin.h @@ -21,7 +21,6 @@ #ifndef AVCODEC_SINEWIN_H #define AVCODEC_SINEWIN_H -#include "config.h" #include "mem.h" #include "aac_defines.h" diff --git a/ext/at3_standalone/sinewin_tablegen.h b/ext/at3_standalone/sinewin_tablegen.h index df024b821e..36271fb39c 100644 --- a/ext/at3_standalone/sinewin_tablegen.h +++ b/ext/at3_standalone/sinewin_tablegen.h @@ -29,7 +29,7 @@ #include #include "aac_defines.h" -#include "attributes.h" +#include "compat.h" #include "common.h" #if !CONFIG_HARDCODED_TABLES diff --git a/ext/at3_standalone/util_internal.h b/ext/at3_standalone/util_internal.h index eb181efca9..a796d15223 100644 --- a/ext/at3_standalone/util_internal.h +++ b/ext/at3_standalone/util_internal.h @@ -32,121 +32,9 @@ #include #include -#include -#include -#include "config.h" -#include "attributes.h" -#include "macros.h" -#include "version.h" - -# define attribute_align_arg - -#if defined(_MSC_VER) && CONFIG_SHARED -# define av_export __declspec(dllimport) -#else -# define av_export -#endif - -#define FF_MEMORY_POISON 0x2a - -#define MAKE_ACCESSORS(str, name, type, field) \ - type av_##name##_get_##field(const str *s) { return s->field; } \ - void av_##name##_set_##field(str *s, type v) { s->field = v; } - -// Some broken preprocessors need a second expansion -// to be forced to tokenize __VA_ARGS__ -#define E1(x) x - -#define LOCAL_ALIGNED_A(a, t, v, s, o, ...) \ - uint8_t la_##v[sizeof(t s o) + (a)]; \ - t (*v) o = (void *)FFALIGN((uintptr_t)la_##v, a) - -#define LOCAL_ALIGNED_D(a, t, v, s, o, ...) \ - DECLARE_ALIGNED(a, t, la_##v) s o; \ - t (*v) o = la_##v - -#define LOCAL_ALIGNED(a, t, v, ...) E1(LOCAL_ALIGNED_A(a, t, v, __VA_ARGS__,,)) - -#if HAVE_LOCAL_ALIGNED_8 -# define LOCAL_ALIGNED_8(t, v, ...) E1(LOCAL_ALIGNED_D(8, t, v, __VA_ARGS__,,)) -#else -# define LOCAL_ALIGNED_8(t, v, ...) LOCAL_ALIGNED(8, t, v, __VA_ARGS__) -#endif - -#if HAVE_LOCAL_ALIGNED_16 -# define LOCAL_ALIGNED_16(t, v, ...) E1(LOCAL_ALIGNED_D(16, t, v, __VA_ARGS__,,)) -#else -# define LOCAL_ALIGNED_16(t, v, ...) LOCAL_ALIGNED(16, t, v, __VA_ARGS__) -#endif - -#if HAVE_LOCAL_ALIGNED_32 -# define LOCAL_ALIGNED_32(t, v, ...) E1(LOCAL_ALIGNED_D(32, t, v, __VA_ARGS__,,)) -#else -# define LOCAL_ALIGNED_32(t, v, ...) LOCAL_ALIGNED(32, t, v, __VA_ARGS__) -#endif #include "libm.h" -/** - * Define a function with only the non-default version specified. - * - * On systems with ELF shared libraries, all symbols exported from - * FFmpeg libraries are tagged with the name and major version of the - * library to which they belong. If a function is moved from one - * library to another, a wrapper must be retained in the original - * location to preserve binary compatibility. - * - * Functions defined with this macro will never be used to resolve - * symbols by the build-time linker. - * - * @param type return type of function - * @param name name of function - * @param args argument list of function - * @param ver version tag to assign function - */ -#if HAVE_SYMVER_ASM_LABEL -# define FF_SYMVER(type, name, args, ver) \ - type ff_##name args __asm__ (EXTERN_PREFIX #name "@" ver); \ - type ff_##name args -#elif HAVE_SYMVER_GNU_ASM -# define FF_SYMVER(type, name, args, ver) \ - __asm__ (".symver ff_" #name "," EXTERN_PREFIX #name "@" ver); \ - type ff_##name args; \ - type ff_##name args -#endif - -/** - * Return NULL if a threading library has not been enabled. - * Used to disable threading functions in AVCodec definitions - * when not needed. - */ -#if HAVE_THREADS -# define ONLY_IF_THREADS_ENABLED(x) x -#else -# define ONLY_IF_THREADS_ENABLED(x) NULL -#endif - -#if HAVE_LIBC_MSVCRT -#include -#if defined(_VC_CRT_MAJOR_VERSION) && _VC_CRT_MAJOR_VERSION < 14 -#pragma comment(linker, "/include:" EXTERN_PREFIX "avpriv_strtod") -#pragma comment(linker, "/include:" EXTERN_PREFIX "avpriv_snprintf") -#endif - -#define avpriv_open ff_open -#define PTRDIFF_SPECIFIER "Id" -#define SIZE_SPECIFIER "Iu" -#else -#define PTRDIFF_SPECIFIER "td" -#define SIZE_SPECIFIER "zu" -#endif - -#ifdef DEBUG -# define ff_dlog(ctx, ...) av_log(ctx, AV_LOG_DEBUG, __VA_ARGS__) -#else -# define ff_dlog(ctx, ...) do { if (0) av_log(ctx, AV_LOG_DEBUG, __VA_ARGS__); } while (0) -#endif - extern const uint8_t ff_reverse[256]; #endif /* AVUTIL_INTERNAL_H */ diff --git a/ext/at3_standalone/utils.c b/ext/at3_standalone/utils.c index ab55822d50..3b77ffb4e7 100644 --- a/ext/at3_standalone/utils.c +++ b/ext/at3_standalone/utils.c @@ -26,15 +26,13 @@ */ #include "util_internal.h" -#include "config.h" #include "avcodec.h" -#include "attributes.h" +#include "compat.h" #include "channel_layout.h" -#include "internal.h" +#include "common.h" #include "mathematics.h" #include "samplefmt.h" #include "avcodec.h" -#include "internal.h" #include "bytestream.h" #include "version.h" #include @@ -42,60 +40,8 @@ #include #include -static int (*lockmgr_cb)(void **mutex, enum AVLockOp op) = NULL; - - -volatile int ff_avcodec_locked; -static int volatile entangled_thread_counter = 0; -static void *codec_mutex; -static void *avformat_mutex; - -void av_fast_padded_malloc(void *ptr, unsigned int *size, size_t min_size) -{ - uint8_t **p = ptr; - if (min_size > SIZE_MAX - AV_INPUT_BUFFER_PADDING_SIZE) { - av_freep(p); - *size = 0; - return; - } - if (!ff_fast_malloc(p, size, min_size + AV_INPUT_BUFFER_PADDING_SIZE, 1)) - memset(*p + min_size, 0, AV_INPUT_BUFFER_PADDING_SIZE); -} - -static av_cold void avcodec_init(void) -{ - static int initialized = 0; - - if (initialized != 0) - return; - initialized = 1; -} - -int av_codec_is_decoder(const AVCodec *codec) -{ - return 1; -} - -#if FF_API_EMU_EDGE -unsigned avcodec_get_edge_width(void) -{ - return EDGE_WIDTH; -} -#endif - -int attribute_align_arg ff_codec_open2_recursive(AVCodecContext *avctx, const AVCodec *codec, void **options) -{ - int ret = 0; - - ret = avcodec_open2(avctx, codec, options); - - return ret; -} - int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *codec, void **options) { - int ret = 0; - if ((codec && avctx->codec && codec != avctx->codec)) { av_log(avctx, AV_LOG_ERROR, "This AVCodecContext was allocated for %s, " "but %s passed to avcodec_open2()\n", avctx->codec->name, codec->name); @@ -107,6 +53,8 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code if (avctx->extradata_size < 0 || avctx->extradata_size >= FF_MAX_EXTRADATA_SIZE) return AVERROR(EINVAL); + int ret = 0; + if (codec->priv_data_size > 0) { if (!avctx->priv_data) { avctx->priv_data = av_mallocz(codec->priv_data_size); @@ -132,13 +80,6 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code avctx->frame_number = 0; -#if FF_API_VISMV - if (avctx->debug_mv) - av_log(avctx, AV_LOG_WARNING, "The 'vismv' option is deprecated, " - "see the codecview filter instead.\n"); -#endif - - if (avctx->codec->init) { ret = avctx->codec->init(avctx); if (ret < 0) { @@ -148,36 +89,24 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code ret=0; -#if FF_API_AUDIOENC_DELAY - if (av_codec_is_encoder(avctx->codec)) - avctx->delay = avctx->initial_padding; -#endif - - if (av_codec_is_decoder(avctx->codec)) { - /* validate channel layout from the decoder */ - if (avctx->channel_layout) { - int channels = av_get_channel_layout_nb_channels(avctx->channel_layout); - if (!avctx->channels) - avctx->channels = channels; - else if (channels != avctx->channels) { - char buf[512] = ""; - av_log(avctx, AV_LOG_WARNING, - "Channel layout '%s' with %d channels does not match specified number of channels %d: " - "ignoring specified channel layout\n", - buf, channels, avctx->channels); - avctx->channel_layout = 0; - } + /* validate channel layout from the decoder */ + if (avctx->channel_layout) { + int channels = av_get_channel_layout_nb_channels(avctx->channel_layout); + if (!avctx->channels) + avctx->channels = channels; + else if (channels != avctx->channels) { + char buf[512] = ""; + av_log(avctx, AV_LOG_WARNING, + "Channel layout '%s' with %d channels does not match specified number of channels %d: " + "ignoring specified channel layout\n", + buf, channels, avctx->channels); + avctx->channel_layout = 0; } - if (avctx->channels && avctx->channels < 0 || - avctx->channels > FF_SANE_NB_CHANNELS) { - ret = AVERROR(EINVAL); - goto free_and_end; - } - -#if FF_API_AVCTX_TIMEBASE - if (avctx->framerate.num > 0 && avctx->framerate.den > 0) - avctx->time_base = av_inv_q(av_mul_q(avctx->framerate, (AVRational){avctx->ticks_per_frame, 1})); -#endif + } + if (avctx->channels && avctx->channels < 0 || + avctx->channels > FF_SANE_NB_CHANNELS) { + ret = AVERROR(EINVAL); + goto free_and_end; } if (codec->priv_data_size > 0 && avctx->priv_data && codec->priv_class) { av_assert0(*(const AVClass **)avctx->priv_data == codec->priv_class); @@ -190,12 +119,6 @@ free_and_end: if (avctx->codec) avctx->codec->close(avctx); -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - av_frame_free(&avctx->coded_frame); -FF_ENABLE_DEPRECATION_WARNINGS -#endif - av_freep(&avctx->priv_data); avctx->codec = NULL; goto end; diff --git a/ext/at3_standalone/version.h b/ext/at3_standalone/version.h index 0ea8c79467..62a77de4d4 100644 --- a/ext/at3_standalone/version.h +++ b/ext/at3_standalone/version.h @@ -21,7 +21,7 @@ #ifndef AVUTIL_VERSION_H #define AVUTIL_VERSION_H -#include "macros.h" +#include "common.h" /** * @addtogroup version_utils @@ -54,72 +54,6 @@ * Libavutil version macros */ -/** - * @defgroup lavu_ver Version and Build diagnostics - * - * Macros and function useful to check at compiletime and at runtime - * which version of libavutil is in use. - * - * @{ - */ - -#define LIBAVUTIL_VERSION_MAJOR 55 -#define LIBAVUTIL_VERSION_MINOR 17 -#define LIBAVUTIL_VERSION_MICRO 103 - -#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ - LIBAVUTIL_VERSION_MINOR, \ - LIBAVUTIL_VERSION_MICRO) -#define LIBAVUTIL_VERSION AV_VERSION(LIBAVUTIL_VERSION_MAJOR, \ - LIBAVUTIL_VERSION_MINOR, \ - LIBAVUTIL_VERSION_MICRO) -#define LIBAVUTIL_BUILD LIBAVUTIL_VERSION_INT - -#define LIBAVUTIL_IDENT "Lavu" AV_STRINGIFY(LIBAVUTIL_VERSION) - -/** - * @} - * - * @defgroup depr_guards Deprecation guards - * FF_API_* defines may be placed below to indicate public API that will be - * dropped at a future version bump. The defines themselves are not part of - * the public API and may change, break or disappear at any time. - * - * @note, when bumping the major version it is recommended to manually - * disable each FF_API_* in its own commit instead of disabling them all - * at once through the bump. This improves the git bisect-ability of the change. - * - * @{ - */ - -#ifndef FF_API_VDPAU -#define FF_API_VDPAU (LIBAVUTIL_VERSION_MAJOR < 56) -#endif -#ifndef FF_API_XVMC -#define FF_API_XVMC (LIBAVUTIL_VERSION_MAJOR < 56) -#endif -#ifndef FF_API_OPT_TYPE_METADATA -#define FF_API_OPT_TYPE_METADATA (LIBAVUTIL_VERSION_MAJOR < 56) -#endif -#ifndef FF_API_DLOG -#define FF_API_DLOG (LIBAVUTIL_VERSION_MAJOR < 56) -#endif -#ifndef FF_API_VAAPI -#define FF_API_VAAPI (LIBAVUTIL_VERSION_MAJOR < 56) -#endif -#ifndef FF_API_FRAME_QP -#define FF_API_FRAME_QP (LIBAVUTIL_VERSION_MAJOR < 56) -#endif -#ifndef FF_API_PLUS1_MINUS1 -#define FF_API_PLUS1_MINUS1 (LIBAVUTIL_VERSION_MAJOR < 56) -#endif -#ifndef FF_API_ERROR_FRAME -#define FF_API_ERROR_FRAME (LIBAVUTIL_VERSION_MAJOR < 56) -#endif -#ifndef FF_API_CRC_BIG_TABLE -#define FF_API_CRC_BIG_TABLE (LIBAVUTIL_VERSION_MAJOR < 56) -#endif - /** * @} From 27e28a59524e899010ea36a2936b0f7a31572bdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Thu, 11 Apr 2024 02:12:16 +0200 Subject: [PATCH 078/719] Remove samplefmt --- Common/Common.vcxproj | 14 +- Common/Common.vcxproj.filters | 32 +- ext/at3_standalone/aac_defines.h | 2 - ext/at3_standalone/atrac.c | 4 +- ext/at3_standalone/atrac3.c | 8 +- ext/at3_standalone/atrac3plus.c | 4 +- ext/at3_standalone/atrac3plusdec.c | 2 +- ext/at3_standalone/atrac3plusdsp.c | 5 +- ext/at3_standalone/avcodec.c | 116 ++++++- ext/at3_standalone/avcodec.h | 2 +- ext/at3_standalone/avfft.h | 34 -- ext/at3_standalone/avutil.h | 91 +----- ext/at3_standalone/bitstream.c | 23 +- ext/at3_standalone/channel_layout.c | 2 + ext/at3_standalone/common.h | 1 - ext/at3_standalone/compat.c | 43 +-- ext/at3_standalone/compat.h | 13 +- ext/at3_standalone/dct.c | 224 ------------- ext/at3_standalone/dct.h | 68 ---- ext/at3_standalone/error.h | 45 --- ext/at3_standalone/fft-internal.h | 43 --- ext/at3_standalone/fft.h | 56 +--- ext/at3_standalone/fft_template.c | 78 ++--- ext/at3_standalone/float_dsp.c | 2 +- ext/at3_standalone/libm.h | 448 -------------------------- ext/at3_standalone/log.h | 1 - ext/at3_standalone/mathematics.c | 1 - ext/at3_standalone/mdct_template.c | 11 +- ext/at3_standalone/mem.c | 2 - ext/at3_standalone/mem.h | 3 +- ext/at3_standalone/qsort.h | 122 ------- ext/at3_standalone/samplefmt.c | 237 -------------- ext/at3_standalone/samplefmt.h | 259 --------------- ext/at3_standalone/sinewin.c | 42 ++- ext/at3_standalone/sinewin.h | 46 +-- ext/at3_standalone/sinewin_tablegen.c | 24 -- ext/at3_standalone/sinewin_tablegen.h | 80 ----- ext/at3_standalone/util_internal.h | 40 --- ext/at3_standalone/utils.c | 145 --------- ext/at3_standalone/version.h | 62 ---- 40 files changed, 268 insertions(+), 2167 deletions(-) delete mode 100644 ext/at3_standalone/avfft.h delete mode 100644 ext/at3_standalone/dct.c delete mode 100644 ext/at3_standalone/dct.h delete mode 100644 ext/at3_standalone/error.h delete mode 100644 ext/at3_standalone/fft-internal.h delete mode 100644 ext/at3_standalone/libm.h delete mode 100644 ext/at3_standalone/qsort.h delete mode 100644 ext/at3_standalone/samplefmt.c delete mode 100644 ext/at3_standalone/samplefmt.h delete mode 100644 ext/at3_standalone/sinewin_tablegen.c delete mode 100644 ext/at3_standalone/sinewin_tablegen.h delete mode 100644 ext/at3_standalone/util_internal.h delete mode 100644 ext/at3_standalone/utils.c delete mode 100644 ext/at3_standalone/version.h diff --git a/Common/Common.vcxproj b/Common/Common.vcxproj index 1051eab494..9335079a50 100644 --- a/Common/Common.vcxproj +++ b/Common/Common.vcxproj @@ -1,4 +1,4 @@ - + @@ -391,29 +391,21 @@ - + - - - - - - - - @@ -628,9 +620,7 @@ - - NotUsing diff --git a/Common/Common.vcxproj.filters b/Common/Common.vcxproj.filters index 0afb65955f..d775f3f937 100644 --- a/Common/Common.vcxproj.filters +++ b/Common/Common.vcxproj.filters @@ -554,24 +554,12 @@ ext\at3_standalone - - ext\at3_standalone - - - ext\at3_standalone - ext\at3_standalone - - ext\at3_standalone - ext\at3_standalone - - ext\at3_standalone - ext\at3_standalone @@ -581,15 +569,9 @@ ext\at3_standalone - - ext\at3_standalone - ext\at3_standalone - - ext\at3_standalone - ext\at3_standalone @@ -602,13 +584,7 @@ ext\at3_standalone - - ext\at3_standalone - - - ext\at3_standalone - - + ext\at3_standalone @@ -1083,9 +1059,6 @@ ext\at3_standalone - - ext\at3_standalone - ext\at3_standalone @@ -1098,9 +1071,6 @@ ext\at3_standalone - - ext\at3_standalone - ext\at3_standalone diff --git a/ext/at3_standalone/aac_defines.h b/ext/at3_standalone/aac_defines.h index eff63b347c..d9aa087fc3 100644 --- a/ext/at3_standalone/aac_defines.h +++ b/ext/at3_standalone/aac_defines.h @@ -80,8 +80,6 @@ typedef int AAC_SIGNE; #define FFT_FLOAT 1 #define FFT_FIXED_32 0 -#define AAC_RENAME(x) x -#define AAC_RENAME_32(x) x typedef float INTFLOAT; typedef float INT64FLOAT; typedef float SHORTFLOAT; diff --git a/ext/at3_standalone/atrac.c b/ext/at3_standalone/atrac.c index 12e8997dbc..8c6a3f0f89 100644 --- a/ext/at3_standalone/atrac.c +++ b/ext/at3_standalone/atrac.c @@ -45,7 +45,7 @@ static const float qmf_48tap_half[24] = { -0.043596379, -0.099384367, 0.13207909, 0.46424159 }; -av_cold void ff_atrac_generate_tables(void) +void ff_atrac_generate_tables(void) { int i; float s; @@ -63,7 +63,7 @@ av_cold void ff_atrac_generate_tables(void) } } -av_cold void ff_atrac_init_gain_compensation(AtracGCContext *gctx, int id2exp_offset, +void ff_atrac_init_gain_compensation(AtracGCContext *gctx, int id2exp_offset, int loc_scale) { int i; diff --git a/ext/at3_standalone/atrac3.c b/ext/at3_standalone/atrac3.c index 0c251aa1b7..630bc59dd3 100644 --- a/ext/at3_standalone/atrac3.c +++ b/ext/at3_standalone/atrac3.c @@ -168,7 +168,7 @@ static int decode_bytes(const uint8_t *input, uint8_t *out, int bytes) return off; } -static av_cold void init_imdct_window(void) +static void init_imdct_window(void) { int i, j; @@ -183,7 +183,7 @@ static av_cold void init_imdct_window(void) } } -static av_cold int atrac3_decode_close(AVCodecContext *avctx) +static int atrac3_decode_close(AVCodecContext *avctx) { ATRAC3Context *q = avctx->priv_data; @@ -764,7 +764,7 @@ int atrac3_decode_frame(AVCodecContext *avctx, float *out_data[2], int *nb_sampl return avctx->block_align; } -static av_cold void atrac3_init_static_data(void) +static void atrac3_init_static_data(void) { int i; @@ -784,7 +784,7 @@ static av_cold void atrac3_init_static_data(void) static int static_init_done; -static av_cold int atrac3_decode_init(AVCodecContext *avctx) +static int atrac3_decode_init(AVCodecContext *avctx) { int i, ret; int version, delay, samples_per_frame, frame_factor; diff --git a/ext/at3_standalone/atrac3plus.c b/ext/at3_standalone/atrac3plus.c index e37f200c13..ec4ac42be1 100644 --- a/ext/at3_standalone/atrac3plus.c +++ b/ext/at3_standalone/atrac3plus.c @@ -49,7 +49,7 @@ static VLC tone_vlc_tabs[7]; * @param[in,out] tab_offset starting offset to the generated vlc table * @param[out] out_vlc ptr to vlc table to be generated */ -static av_cold void build_canonical_huff(const uint8_t *cb, const uint8_t *xlat, +static void build_canonical_huff(const uint8_t *cb, const uint8_t *xlat, int *tab_offset, VLC *out_vlc) { int i, b; @@ -79,7 +79,7 @@ static av_cold void build_canonical_huff(const uint8_t *cb, const uint8_t *xlat, *tab_offset += 1 << max_len; } -av_cold void ff_atrac3p_init_vlcs(void) +void ff_atrac3p_init_vlcs(void) { int i, wl_vlc_offs, ct_vlc_offs, sf_vlc_offs, tab_offset; diff --git a/ext/at3_standalone/atrac3plusdec.c b/ext/at3_standalone/atrac3plusdec.c index 7f942c80fa..e82bcab8ba 100644 --- a/ext/at3_standalone/atrac3plusdec.c +++ b/ext/at3_standalone/atrac3plusdec.c @@ -78,7 +78,7 @@ int atrac3p_decode_close(AVCodecContext *avctx) return 0; } -static av_cold int set_channel_params(ATRAC3PContext *ctx, +static int set_channel_params(ATRAC3PContext *ctx, AVCodecContext *avctx) { memset(ctx->channel_blocks, 0, sizeof(ctx->channel_blocks)); diff --git a/ext/at3_standalone/atrac3plusdsp.c b/ext/at3_standalone/atrac3plusdsp.c index 9c30a64415..399bbdc17e 100644 --- a/ext/at3_standalone/atrac3plusdsp.c +++ b/ext/at3_standalone/atrac3plusdsp.c @@ -29,7 +29,6 @@ #include #include "float_dsp.h" -#include "libm.h" #include "avcodec.h" #include "sinewin.h" #include "fft.h" @@ -78,7 +77,7 @@ const float ff_atrac3p_mant_tab[8] = { #define ATRAC3P_MDCT_SIZE (ATRAC3P_SUBBAND_SAMPLES * 2) -av_cold void ff_atrac3p_init_imdct(AVCodecContext *avctx, FFTContext *mdct_ctx) +void ff_atrac3p_init_imdct(AVCodecContext *avctx, FFTContext *mdct_ctx) { ff_init_ff_sine_windows(7); ff_init_ff_sine_windows(6); @@ -95,7 +94,7 @@ static DECLARE_ALIGNED(32, float, sine_table)[2048]; ///< wave table static DECLARE_ALIGNED(32, float, hann_window)[256]; ///< Hann windowing function static float amp_sf_tab[64]; ///< scalefactors for quantized amplitudes -av_cold void ff_atrac3p_init_wave_synth(void) +void ff_atrac3p_init_wave_synth(void) { int i; diff --git a/ext/at3_standalone/avcodec.c b/ext/at3_standalone/avcodec.c index 9f8f353db3..1956a1f360 100644 --- a/ext/at3_standalone/avcodec.c +++ b/ext/at3_standalone/avcodec.c @@ -25,10 +25,19 @@ */ #include "avcodec.h" +#include "compat.h" +#include "channel_layout.h" #include "common.h" -#include "util_internal.h" +#include "mathematics.h" +#include "avcodec.h" +#include "bytestream.h" #include "mem.h" + +#include +#include #include +#include +#include static const AVClass av_codec_context_class = { .class_name = "AVCodecContext", @@ -75,3 +84,108 @@ void avcodec_free_context(AVCodecContext **pavctx) av_freep(&avctx->extradata); av_freep(pavctx); } + + +int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *codec, void **options) +{ + if ((codec && avctx->codec && codec != avctx->codec)) { + av_log(avctx, AV_LOG_ERROR, "This AVCodecContext was allocated for %s, " + "but %s passed to avcodec_open2()\n", avctx->codec->name, codec->name); + return AVERROR(EINVAL); + } + if (!codec) + codec = avctx->codec; + + if (avctx->extradata_size < 0 || avctx->extradata_size >= FF_MAX_EXTRADATA_SIZE) + return AVERROR(EINVAL); + + int ret = 0; + + if (codec->priv_data_size > 0) { + if (!avctx->priv_data) { + avctx->priv_data = av_mallocz(codec->priv_data_size); + if (!avctx->priv_data) { + ret = AVERROR(ENOMEM); + goto end; + } + if (codec->priv_class) { + *(const AVClass **)avctx->priv_data = codec->priv_class; + } + } + } else { + avctx->priv_data = NULL; + } + + if (avctx->channels > FF_SANE_NB_CHANNELS) { + ret = AVERROR(EINVAL); + goto free_and_end; + } + + avctx->codec = codec; + avctx->codec_id = codec->id; + + avctx->frame_number = 0; + + if (avctx->codec->init) { + ret = avctx->codec->init(avctx); + if (ret < 0) { + goto free_and_end; + } + } + + ret = 0; + + /* validate channel layout from the decoder */ + if (avctx->channel_layout) { + int channels = av_get_channel_layout_nb_channels(avctx->channel_layout); + if (!avctx->channels) + avctx->channels = channels; + else if (channels != avctx->channels) { + char buf[512] = ""; + av_log(avctx, AV_LOG_WARNING, + "Channel layout '%s' with %d channels does not match specified number of channels %d: " + "ignoring specified channel layout\n", + buf, channels, avctx->channels); + avctx->channel_layout = 0; + } + } + if (avctx->channels && avctx->channels < 0 || + avctx->channels > FF_SANE_NB_CHANNELS) { + ret = AVERROR(EINVAL); + goto free_and_end; + } + if (codec->priv_data_size > 0 && avctx->priv_data && codec->priv_class) { + av_assert0(*(const AVClass **)avctx->priv_data == codec->priv_class); + } + +end: + + return ret; +free_and_end: + if (avctx->codec) + avctx->codec->close(avctx); + + av_freep(&avctx->priv_data); + avctx->codec = NULL; + goto end; +} + +int avcodec_close(AVCodecContext *avctx) +{ + int i; + + if (!avctx) + return 0; + + if (avctx->codec && avctx->codec->close) + avctx->codec->close(avctx); + av_freep(&avctx->priv_data); + avctx->codec = NULL; + return 0; +} + +void avcodec_flush_buffers(AVCodecContext *avctx) +{ + if (avctx->codec->flush) + avctx->codec->flush(avctx); +} diff --git a/ext/at3_standalone/avcodec.h b/ext/at3_standalone/avcodec.h index 2d51d134d6..a2caa92db7 100644 --- a/ext/at3_standalone/avcodec.h +++ b/ext/at3_standalone/avcodec.h @@ -30,8 +30,8 @@ #include #include "compat.h" #include "channel_layout.h" +#include "mem.h" #include "log.h" -#include "version.h" /** * @defgroup libavc Encoding/Decoding Library diff --git a/ext/at3_standalone/avfft.h b/ext/at3_standalone/avfft.h deleted file mode 100644 index 684af4d18b..0000000000 --- a/ext/at3_standalone/avfft.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef AVCODEC_AVFFT_H -#define AVCODEC_AVFFT_H - -typedef float FFTSample; - -typedef struct FFTComplex { - FFTSample re, im; -} FFTComplex; - -typedef struct FFTContext FFTContext; - -/** - * @} - */ - -#endif /* AVCODEC_AVFFT_H */ diff --git a/ext/at3_standalone/avutil.h b/ext/at3_standalone/avutil.h index 23f9673c14..92a281532e 100644 --- a/ext/at3_standalone/avutil.h +++ b/ext/at3_standalone/avutil.h @@ -77,89 +77,6 @@ * version number. */ -/** - * @defgroup lavu Common utility functions - * - * @brief - * libavutil contains the code shared across all the other FFmpeg - * libraries - * - * @note In order to use the functions provided by avutil you must include - * the specific header. - * - * @{ - * - * @defgroup lavu_crypto Crypto and Hashing - * - * @{ - * @} - * - * @defgroup lavu_math Maths - * @{ - * - * @} - * - * @defgroup lavu_string String Manipulation - * - * @{ - * - * @} - * - * @defgroup lavu_mem Memory Management - * - * @{ - * - * @} - * - * @defgroup lavu_data Data Structures - * @{ - * - * @} - * - * @defgroup lavu_audio Audio related - * - * @{ - * - * @} - * - * @defgroup lavu_error Error Codes - * - * @{ - * - * @} - * - * @defgroup lavu_log Logging Facility - * - * @{ - * - * @} - * - * @defgroup lavu_misc Other - * - * @{ - * - * @defgroup preproc_misc Preprocessor String Macros - * - * @{ - * - * @} - * - * @defgroup version_utils Library Version Macros - * - * @{ - * - * @} - */ - - -/** - * @addtogroup lavu_ver - * @{ - */ -/** - * @} - */ - /** * @brief Undefined timestamp value @@ -186,12 +103,6 @@ * @} */ -#include "common.h" -#include "error.h" -#include "version.h" -#include "mathematics.h" -#include "log.h" - /** * Return x default pointer in case p is NULL. */ @@ -209,7 +120,7 @@ static inline void *av_x_if_null(const void *p, const void *x) * @return length of the list, in elements, not counting the terminator */ unsigned av_int_list_length_for_size(unsigned elsize, - const void *list, uint64_t term) av_pure; + const void *list, uint64_t term); /** * Compute the length of an integer list. diff --git a/ext/at3_standalone/bitstream.c b/ext/at3_standalone/bitstream.c index bdb56916ba..2bd610ce0d 100644 --- a/ext/at3_standalone/bitstream.c +++ b/ext/at3_standalone/bitstream.c @@ -31,13 +31,30 @@ #include #include -#include "qsort.h" #include "avcodec.h" #include "common.h" -#include "util_internal.h" #include "mathematics.h" #include "get_bits.h" +static const uint8_t ff_reverse[256] = { +0x00,0x80,0x40,0xC0,0x20,0xA0,0x60,0xE0,0x10,0x90,0x50,0xD0,0x30,0xB0,0x70,0xF0, +0x08,0x88,0x48,0xC8,0x28,0xA8,0x68,0xE8,0x18,0x98,0x58,0xD8,0x38,0xB8,0x78,0xF8, +0x04,0x84,0x44,0xC4,0x24,0xA4,0x64,0xE4,0x14,0x94,0x54,0xD4,0x34,0xB4,0x74,0xF4, +0x0C,0x8C,0x4C,0xCC,0x2C,0xAC,0x6C,0xEC,0x1C,0x9C,0x5C,0xDC,0x3C,0xBC,0x7C,0xFC, +0x02,0x82,0x42,0xC2,0x22,0xA2,0x62,0xE2,0x12,0x92,0x52,0xD2,0x32,0xB2,0x72,0xF2, +0x0A,0x8A,0x4A,0xCA,0x2A,0xAA,0x6A,0xEA,0x1A,0x9A,0x5A,0xDA,0x3A,0xBA,0x7A,0xFA, +0x06,0x86,0x46,0xC6,0x26,0xA6,0x66,0xE6,0x16,0x96,0x56,0xD6,0x36,0xB6,0x76,0xF6, +0x0E,0x8E,0x4E,0xCE,0x2E,0xAE,0x6E,0xEE,0x1E,0x9E,0x5E,0xDE,0x3E,0xBE,0x7E,0xFE, +0x01,0x81,0x41,0xC1,0x21,0xA1,0x61,0xE1,0x11,0x91,0x51,0xD1,0x31,0xB1,0x71,0xF1, +0x09,0x89,0x49,0xC9,0x29,0xA9,0x69,0xE9,0x19,0x99,0x59,0xD9,0x39,0xB9,0x79,0xF9, +0x05,0x85,0x45,0xC5,0x25,0xA5,0x65,0xE5,0x15,0x95,0x55,0xD5,0x35,0xB5,0x75,0xF5, +0x0D,0x8D,0x4D,0xCD,0x2D,0xAD,0x6D,0xED,0x1D,0x9D,0x5D,0xDD,0x3D,0xBD,0x7D,0xFD, +0x03,0x83,0x43,0xC3,0x23,0xA3,0x63,0xE3,0x13,0x93,0x53,0xD3,0x33,0xB3,0x73,0xF3, +0x0B,0x8B,0x4B,0xCB,0x2B,0xAB,0x6B,0xEB,0x1B,0x9B,0x5B,0xDB,0x3B,0xBB,0x7B,0xFB, +0x07,0x87,0x47,0xC7,0x27,0xA7,0x67,0xE7,0x17,0x97,0x57,0xD7,0x37,0xB7,0x77,0xF7, +0x0F,0x8F,0x4F,0xCF,0x2F,0xAF,0x6F,0xEF,0x1F,0x9F,0x5F,0xDF,0x3F,0xBF,0x7F,0xFF, +}; + /* VLC decoding */ #define GET_DATA(v, table, i, wrap, size) \ @@ -284,7 +301,7 @@ int ff_init_vlc_sparse(VLC *vlc_arg, int nb_bits, int nb_codes, } COPY(buf[j].bits > nb_bits); // qsort is the slowest part of init_vlc, and could probably be improved or avoided - AV_QSORT(buf, j, struct VLCcode, compare_vlcspec); + qsort(buf, j, sizeof(struct VLCcode), compare_vlcspec); COPY(buf[j].bits && buf[j].bits <= nb_bits); nb_codes = j; diff --git a/ext/at3_standalone/channel_layout.c b/ext/at3_standalone/channel_layout.c index 9bcd52e377..47fee23733 100644 --- a/ext/at3_standalone/channel_layout.c +++ b/ext/at3_standalone/channel_layout.c @@ -24,6 +24,8 @@ */ #include +#include +#include #include "avutil.h" #include "channel_layout.h" diff --git a/ext/at3_standalone/common.h b/ext/at3_standalone/common.h index 891659ba0c..f1a4bd9d52 100644 --- a/ext/at3_standalone/common.h +++ b/ext/at3_standalone/common.h @@ -35,7 +35,6 @@ #include #include "compat.h" -#include "version.h" #include "mem.h" //rounded division & shift diff --git a/ext/at3_standalone/compat.c b/ext/at3_standalone/compat.c index fc285e6b2c..80dfc9a566 100644 --- a/ext/at3_standalone/compat.c +++ b/ext/at3_standalone/compat.c @@ -12,13 +12,6 @@ int av_get_cpu_flags(void) { return 0; } -void ff_fft_init_aarch64(void) {} -void ff_fft_init_x86(void) {} -void ff_fft_init_arm(void) {} -void ff_fft_init_mips(void) {} -void ff_fft_init_ppc(void) {} - - size_t av_strlcpy(char *dst, const char *src, size_t size) { size_t len = 0; @@ -29,33 +22,13 @@ size_t av_strlcpy(char *dst, const char *src, size_t size) return len + strlen(src) - 1; } - -const uint8_t ff_reverse[256] = { -0x00,0x80,0x40,0xC0,0x20,0xA0,0x60,0xE0,0x10,0x90,0x50,0xD0,0x30,0xB0,0x70,0xF0, -0x08,0x88,0x48,0xC8,0x28,0xA8,0x68,0xE8,0x18,0x98,0x58,0xD8,0x38,0xB8,0x78,0xF8, -0x04,0x84,0x44,0xC4,0x24,0xA4,0x64,0xE4,0x14,0x94,0x54,0xD4,0x34,0xB4,0x74,0xF4, -0x0C,0x8C,0x4C,0xCC,0x2C,0xAC,0x6C,0xEC,0x1C,0x9C,0x5C,0xDC,0x3C,0xBC,0x7C,0xFC, -0x02,0x82,0x42,0xC2,0x22,0xA2,0x62,0xE2,0x12,0x92,0x52,0xD2,0x32,0xB2,0x72,0xF2, -0x0A,0x8A,0x4A,0xCA,0x2A,0xAA,0x6A,0xEA,0x1A,0x9A,0x5A,0xDA,0x3A,0xBA,0x7A,0xFA, -0x06,0x86,0x46,0xC6,0x26,0xA6,0x66,0xE6,0x16,0x96,0x56,0xD6,0x36,0xB6,0x76,0xF6, -0x0E,0x8E,0x4E,0xCE,0x2E,0xAE,0x6E,0xEE,0x1E,0x9E,0x5E,0xDE,0x3E,0xBE,0x7E,0xFE, -0x01,0x81,0x41,0xC1,0x21,0xA1,0x61,0xE1,0x11,0x91,0x51,0xD1,0x31,0xB1,0x71,0xF1, -0x09,0x89,0x49,0xC9,0x29,0xA9,0x69,0xE9,0x19,0x99,0x59,0xD9,0x39,0xB9,0x79,0xF9, -0x05,0x85,0x45,0xC5,0x25,0xA5,0x65,0xE5,0x15,0x95,0x55,0xD5,0x35,0xB5,0x75,0xF5, -0x0D,0x8D,0x4D,0xCD,0x2D,0xAD,0x6D,0xED,0x1D,0x9D,0x5D,0xDD,0x3D,0xBD,0x7D,0xFD, -0x03,0x83,0x43,0xC3,0x23,0xA3,0x63,0xE3,0x13,0x93,0x53,0xD3,0x33,0xB3,0x73,0xF3, -0x0B,0x8B,0x4B,0xCB,0x2B,0xAB,0x6B,0xEB,0x1B,0x9B,0x5B,0xDB,0x3B,0xBB,0x7B,0xFB, -0x07,0x87,0x47,0xC7,0x27,0xA7,0x67,0xE7,0x17,0x97,0x57,0xD7,0x37,0xB7,0x77,0xF7, -0x0F,0x8F,0x4F,0xCF,0x2F,0xAF,0x6F,0xEF,0x1F,0x9F,0x5F,0xDF,0x3F,0xBF,0x7F,0xFF, -}; - const uint8_t ff_log2_tab[256] = { - 0,0,1,1,2,2,2,2,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4, - 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5, - 6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6, - 6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6, - 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, - 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, - 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, - 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7 + 0,0,1,1,2,2,2,2,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4, + 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5, + 6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6, + 6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6, + 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, + 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, + 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, + 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7 }; diff --git a/ext/at3_standalone/compat.h b/ext/at3_standalone/compat.h index c2150fab1a..4bc4ac9b06 100644 --- a/ext/at3_standalone/compat.h +++ b/ext/at3_standalone/compat.h @@ -2,8 +2,6 @@ // Compat hacks -#include "error.h" - #define CONFIG_MEMORY_POISONING 0 #define CONFIG_HARDCODED_TABLES 0 #define CONFIG_ME_CMP 0 @@ -20,10 +18,8 @@ #define FF_API_AVPACKET_OLD_API 1 #define FF_DISABLE_DEPRECATION_WARNINGS #define FF_ENABLE_DEPRECATION_WARNINGS -#define CONFIG_MDCT 1 #define CONFIG_FFT 1 -#define av_cold #define DECLARE_ALIGNED(bits, type, name) type name #define LOCAL_ALIGNED(bits, type, name, subscript) type name subscript #define av_restrict @@ -41,6 +37,15 @@ #define av_printf_format(a,b) #define avpriv_report_missing_feature(...) + +#define AVERROR(e) (-(e)) ///< Returns a negative error code from a POSIX error code, to return from library functions. +#define AVUNERROR(e) (-(e)) ///< Returns a POSIX error code from a library function error return value. + +#define FFERRTAG(a, b, c, d) (-(int)MKTAG(a, b, c, d)) + +#define AVERROR_INVALIDDATA FFERRTAG( 'I','N','D','A') ///< Invalid data found when processing input +#define AVERROR_PATCHWELCOME FFERRTAG( 'P','A','W','E') ///< Not yet implemented in FFmpeg, patches welcome + #pragma warning(disable:4305) #pragma warning(disable:4244) diff --git a/ext/at3_standalone/dct.c b/ext/at3_standalone/dct.c deleted file mode 100644 index cca51eeaf8..0000000000 --- a/ext/at3_standalone/dct.c +++ /dev/null @@ -1,224 +0,0 @@ -/* - * (I)DCT Transforms - * Copyright (c) 2009 Peter Ross - * Copyright (c) 2010 Alex Converse - * Copyright (c) 2010 Vitor Sessak - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/** - * @file - * (Inverse) Discrete Cosine Transforms. These are also known as the - * type II and type III DCTs respectively. - */ - -#include -#include - -#include "libavutil/mathematics.h" -#include "dct.h" -#include "dct32.h" - -/* sin((M_PI * x / (2 * n)) */ -#define SIN(s, n, x) (s->costab[(n) - (x)]) - -/* cos((M_PI * x / (2 * n)) */ -#define COS(s, n, x) (s->costab[x]) - -static void dst_calc_I_c(DCTContext *ctx, FFTSample *data) -{ - int n = 1 << ctx->nbits; - int i; - - data[0] = 0; - for (i = 1; i < n / 2; i++) { - float tmp1 = data[i ]; - float tmp2 = data[n - i]; - float s = SIN(ctx, n, 2 * i); - - s *= tmp1 + tmp2; - tmp1 = (tmp1 - tmp2) * 0.5f; - data[i] = s + tmp1; - data[n - i] = s - tmp1; - } - - data[n / 2] *= 2; - ctx->rdft.rdft_calc(&ctx->rdft, data); - - data[0] *= 0.5f; - - for (i = 1; i < n - 2; i += 2) { - data[i + 1] += data[i - 1]; - data[i] = -data[i + 2]; - } - - data[n - 1] = 0; -} - -static void dct_calc_I_c(DCTContext *ctx, FFTSample *data) -{ - int n = 1 << ctx->nbits; - int i; - float next = -0.5f * (data[0] - data[n]); - - for (i = 0; i < n / 2; i++) { - float tmp1 = data[i]; - float tmp2 = data[n - i]; - float s = SIN(ctx, n, 2 * i); - float c = COS(ctx, n, 2 * i); - - c *= tmp1 - tmp2; - s *= tmp1 - tmp2; - - next += c; - - tmp1 = (tmp1 + tmp2) * 0.5f; - data[i] = tmp1 - s; - data[n - i] = tmp1 + s; - } - - ctx->rdft.rdft_calc(&ctx->rdft, data); - data[n] = data[1]; - data[1] = next; - - for (i = 3; i <= n; i += 2) - data[i] = data[i - 2] - data[i]; -} - -static void dct_calc_III_c(DCTContext *ctx, FFTSample *data) -{ - int n = 1 << ctx->nbits; - int i; - - float next = data[n - 1]; - float inv_n = 1.0f / n; - - for (i = n - 2; i >= 2; i -= 2) { - float val1 = data[i]; - float val2 = data[i - 1] - data[i + 1]; - float c = COS(ctx, n, i); - float s = SIN(ctx, n, i); - - data[i] = c * val1 + s * val2; - data[i + 1] = s * val1 - c * val2; - } - - data[1] = 2 * next; - - ctx->rdft.rdft_calc(&ctx->rdft, data); - - for (i = 0; i < n / 2; i++) { - float tmp1 = data[i] * inv_n; - float tmp2 = data[n - i - 1] * inv_n; - float csc = ctx->csc2[i] * (tmp1 - tmp2); - - tmp1 += tmp2; - data[i] = tmp1 + csc; - data[n - i - 1] = tmp1 - csc; - } -} - -static void dct_calc_II_c(DCTContext *ctx, FFTSample *data) -{ - int n = 1 << ctx->nbits; - int i; - float next; - - for (i = 0; i < n / 2; i++) { - float tmp1 = data[i]; - float tmp2 = data[n - i - 1]; - float s = SIN(ctx, n, 2 * i + 1); - - s *= tmp1 - tmp2; - tmp1 = (tmp1 + tmp2) * 0.5f; - - data[i] = tmp1 + s; - data[n-i-1] = tmp1 - s; - } - - ctx->rdft.rdft_calc(&ctx->rdft, data); - - next = data[1] * 0.5; - data[1] *= -1; - - for (i = n - 2; i >= 0; i -= 2) { - float inr = data[i ]; - float ini = data[i + 1]; - float c = COS(ctx, n, i); - float s = SIN(ctx, n, i); - - data[i] = c * inr + s * ini; - data[i + 1] = next; - - next += s * inr - c * ini; - } -} - -static void dct32_func(DCTContext *ctx, FFTSample *data) -{ - ctx->dct32(data, data); -} - -av_cold int ff_dct_init(DCTContext *s, int nbits, enum DCTTransformType inverse) -{ - int n = 1 << nbits; - int i; - - memset(s, 0, sizeof(*s)); - - s->nbits = nbits; - s->inverse = inverse; - - if (inverse == DCT_II && nbits == 5) { - s->dct_calc = dct32_func; - } else { - ff_init_ff_cos_tabs(nbits + 2); - - s->costab = ff_cos_tabs[nbits + 2]; - s->csc2 = av_malloc_array(n / 2, sizeof(FFTSample)); - if (!s->csc2) - return AVERROR(ENOMEM); - - if (ff_rdft_init(&s->rdft, nbits, inverse == DCT_III) < 0) { - av_freep(&s->csc2); - return -1; - } - - for (i = 0; i < n / 2; i++) - s->csc2[i] = 0.5 / sin((M_PI / (2 * n) * (2 * i + 1))); - - switch (inverse) { - case DCT_I : s->dct_calc = dct_calc_I_c; break; - case DCT_II : s->dct_calc = dct_calc_II_c; break; - case DCT_III: s->dct_calc = dct_calc_III_c; break; - case DST_I : s->dct_calc = dst_calc_I_c; break; - } - } - - s->dct32 = ff_dct32_float; - if (ARCH_X86) - ff_dct_init_x86(s); - - return 0; -} - -av_cold void ff_dct_end(DCTContext *s) -{ - ff_rdft_end(&s->rdft); - av_freep(&s->csc2); -} diff --git a/ext/at3_standalone/dct.h b/ext/at3_standalone/dct.h deleted file mode 100644 index 05297ba9db..0000000000 --- a/ext/at3_standalone/dct.h +++ /dev/null @@ -1,68 +0,0 @@ -/* - * (I)DCT Transforms - * Copyright (c) 2009 Peter Ross - * Copyright (c) 2010 Alex Converse - * Copyright (c) 2010 Vitor Sessak - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#if !defined(AVCODEC_DCT_H) && (!defined(FFT_FLOAT) || FFT_FLOAT) -#define AVCODEC_DCT_H - -#include - -#include "rdft.h" - -struct DCTContext { - int nbits; - int inverse; - RDFTContext rdft; - const float *costab; - FFTSample *csc2; - void (*dct_calc)(struct DCTContext *s, FFTSample *data); - void (*dct32)(FFTSample *out, const FFTSample *in); -}; - -/** - * Set up DCT. - * @param nbits size of the input array: - * (1 << nbits) for DCT-II, DCT-III and DST-I - * (1 << nbits) + 1 for DCT-I - * - * @note the first element of the input of DST-I is ignored - */ -int ff_dct_init(DCTContext *s, int nbits, enum DCTTransformType type); -void ff_dct_end (DCTContext *s); - -void ff_dct_init_x86(DCTContext *s); - -void ff_fdct_ifast(int16_t *data); -void ff_fdct_ifast248(int16_t *data); -void ff_jpeg_fdct_islow_8(int16_t *data); -void ff_jpeg_fdct_islow_10(int16_t *data); -void ff_fdct248_islow_8(int16_t *data); -void ff_fdct248_islow_10(int16_t *data); - -void ff_j_rev_dct(int16_t *data); -void ff_j_rev_dct4(int16_t *data); -void ff_j_rev_dct2(int16_t *data); -void ff_j_rev_dct1(int16_t *data); -void ff_jref_idct_put(uint8_t *dest, int line_size, int16_t *block); -void ff_jref_idct_add(uint8_t *dest, int line_size, int16_t *block); - -#endif /* AVCODEC_DCT_H */ diff --git a/ext/at3_standalone/error.h b/ext/at3_standalone/error.h deleted file mode 100644 index eedd7a9023..0000000000 --- a/ext/at3_standalone/error.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/** - * @file - * error code definitions - */ - -#ifndef AVUTIL_ERROR_H -#define AVUTIL_ERROR_H - -#include -#include - -/* error handling */ -#if EDOM > 0 -#define AVERROR(e) (-(e)) ///< Returns a negative error code from a POSIX error code, to return from library functions. -#define AVUNERROR(e) (-(e)) ///< Returns a POSIX error code from a library function error return value. -#else -/* Some platforms have E* and errno already negated. */ -#define AVERROR(e) (e) -#define AVUNERROR(e) (e) -#endif - -#define FFERRTAG(a, b, c, d) (-(int)MKTAG(a, b, c, d)) - -#define AVERROR_INVALIDDATA FFERRTAG( 'I','N','D','A') ///< Invalid data found when processing input -#define AVERROR_PATCHWELCOME FFERRTAG( 'P','A','W','E') ///< Not yet implemented in FFmpeg, patches welcome - -#endif /* AVUTIL_ERROR_H */ diff --git a/ext/at3_standalone/fft-internal.h b/ext/at3_standalone/fft-internal.h deleted file mode 100644 index 55f083640b..0000000000 --- a/ext/at3_standalone/fft-internal.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef AVCODEC_FFT_INTERNAL_H -#define AVCODEC_FFT_INTERNAL_H - -#define FIX15(v) (v) -#define sqrthalf (float)M_SQRT1_2 - -#define BF(x, y, a, b) do { \ - x = a - b; \ - y = a + b; \ - } while (0) - -#define CMUL(dre, dim, are, aim, bre, bim) do { \ - (dre) = (are) * (bre) - (aim) * (bim); \ - (dim) = (are) * (bim) + (aim) * (bre); \ - } while (0) - -#define ff_imdct_calc_c FFT_NAME(ff_imdct_calc_c) -#define ff_imdct_half_c FFT_NAME(ff_imdct_half_c) -#define ff_mdct_calc_c FFT_NAME(ff_mdct_calc_c) - -void ff_imdct_calc_c(FFTContext *s, FFTSample *output, const FFTSample *input); -void ff_imdct_half_c(FFTContext *s, FFTSample *output, const FFTSample *input); -void ff_mdct_calc_c(FFTContext *s, FFTSample *output, const FFTSample *input); - -#endif /* AVCODEC_FFT_INTERNAL_H */ diff --git a/ext/at3_standalone/fft.h b/ext/at3_standalone/fft.h index 4d5dae9e53..d0b8f579d1 100644 --- a/ext/at3_standalone/fft.h +++ b/ext/at3_standalone/fft.h @@ -30,54 +30,33 @@ #define FFT_FIXED_32 0 #endif +#define FIX15(v) (v) + +#define CMUL(dre, dim, are, aim, bre, bim) do { \ + (dre) = (are) * (bre) - (aim) * (bim); \ + (dim) = (are) * (bim) + (aim) * (bre); \ + } while (0) + #include -#if FFT_FLOAT +typedef float FFTSample; -#include "avfft.h" +typedef struct FFTComplex { + FFTSample re, im; +} FFTComplex; + +typedef struct FFTContext FFTContext; #define FFT_NAME(x) x typedef float FFTDouble; -#else - -#if FFT_FIXED_32 - -#define Q31(x) (int)((x)*2147483648.0 + 0.5) -#define FFT_NAME(x) x ## _fixed_32 - -typedef int32_t FFTSample; - -#else /* FFT_FIXED_32 */ - -#define FFT_NAME(x) x ## _fixed - -typedef int16_t FFTSample; - -#endif /* FFT_FIXED_32 */ - -typedef struct FFTComplex { - FFTSample re, im; -} FFTComplex; - -typedef int FFTDouble; -typedef struct FFTContext FFTContext; - -#endif /* FFT_FLOAT */ - typedef struct FFTDComplex { FFTDouble re, im; } FFTDComplex; /* FFT computation */ -enum fft_permutation_type { - FF_FFT_PERM_DEFAULT, - FF_FFT_PERM_SWAP_LSBS, - FF_FFT_PERM_AVX, -}; - enum mdct_permutation_type { FF_MDCT_PERM_NONE, FF_MDCT_PERM_INTERLEAVE, @@ -106,7 +85,6 @@ struct FFTContext { void (*imdct_half)(struct FFTContext *s, FFTSample *output, const FFTSample *input); void (*mdct_calc)(struct FFTContext *s, FFTSample *output, const FFTSample *input); void (*mdct_calcw)(struct FFTContext *s, FFTDouble *output, const FFTSample *input); - enum fft_permutation_type fft_permutation; enum mdct_permutation_type mdct_permutation; }; @@ -152,14 +130,6 @@ void ff_init_ff_cos_tabs(int index); */ int ff_fft_init(FFTContext *s, int nbits, int inverse); -void ff_fft_init_aarch64(FFTContext *s); -void ff_fft_init_x86(FFTContext *s); -void ff_fft_init_arm(FFTContext *s); -void ff_fft_init_mips(FFTContext *s); -void ff_fft_init_ppc(FFTContext *s); - -void ff_fft_fixed_init_arm(FFTContext *s); - void ff_fft_end(FFTContext *s); #define ff_mdct_init FFT_NAME(ff_mdct_init) diff --git a/ext/at3_standalone/fft_template.c b/ext/at3_standalone/fft_template.c index 1cfd90b0a2..94118d4880 100644 --- a/ext/at3_standalone/fft_template.c +++ b/ext/at3_standalone/fft_template.c @@ -32,7 +32,21 @@ #include "mem.h" #include "mathematics.h" #include "fft.h" -#include "fft-internal.h" + +#define sqrthalf (float)M_SQRT1_2 + +#define BF(x, y, a, b) do { \ + x = a - b; \ + y = a + b; \ + } while (0) + +#define ff_imdct_calc_c FFT_NAME(ff_imdct_calc_c) +#define ff_imdct_half_c FFT_NAME(ff_imdct_half_c) +#define ff_mdct_calc_c FFT_NAME(ff_mdct_calc_c) + +void ff_imdct_calc_c(FFTContext *s, FFTSample *output, const FFTSample *input); +void ff_imdct_half_c(FFTContext *s, FFTSample *output, const FFTSample *input); +void ff_mdct_calc_c(FFTContext *s, FFTSample *output, const FFTSample *input); /* cos(2*pi*x/n) for 0<=x<=n/4, followed by its reverse */ #if !CONFIG_HARDCODED_TABLES @@ -81,7 +95,7 @@ static int split_radix_permutation(int i, int n, int inverse) else return split_radix_permutation(i, m, inverse)*4 - 1; } -av_cold void ff_init_ff_cos_tabs(int index) +void ff_init_ff_cos_tabs(int index) { #if (!CONFIG_HARDCODED_TABLES) && (!FFT_FIXED_32) int i; @@ -111,29 +125,7 @@ static int is_second_half_of_fft32(int i, int n) return is_second_half_of_fft32(i - 3*n/4, n/4); } -static av_cold void fft_perm_avx(FFTContext *s) -{ - int i; - int n = 1 << s->nbits; - - for (i = 0; i < n; i += 16) { - int k; - if (is_second_half_of_fft32(i, n)) { - for (k = 0; k < 16; k++) - s->revtab[-split_radix_permutation(i + k, n, s->inverse) & (n - 1)] = - i + avx_tab[k]; - - } else { - for (k = 0; k < 16; k++) { - int j = i + k; - j = (j & ~7) | ((j >> 1) & 3) | ((j << 2) & 4); - s->revtab[-split_radix_permutation(i + k, n, s->inverse) & (n - 1)] = j; - } - } - } -} - -av_cold int ff_fft_init(FFTContext *s, int nbits, int inverse) +int ff_fft_init(FFTContext *s, int nbits, int inverse) { int i, j, n; @@ -149,41 +141,21 @@ av_cold int ff_fft_init(FFTContext *s, int nbits, int inverse) if (!s->tmp_buf) goto fail; s->inverse = inverse; - s->fft_permutation = FF_FFT_PERM_DEFAULT; s->fft_permute = fft_permute_c; s->fft_calc = fft_calc_c; -#if CONFIG_MDCT s->imdct_calc = ff_imdct_calc_c; s->imdct_half = ff_imdct_half_c; s->mdct_calc = ff_mdct_calc_c; -#endif - -#if FFT_FLOAT - if (ARCH_AARCH64) ff_fft_init_aarch64(s); - if (ARCH_ARM) ff_fft_init_arm(s); - if (ARCH_PPC) ff_fft_init_ppc(s); - if (ARCH_X86) ff_fft_init_x86(s); - if (CONFIG_MDCT) s->mdct_calcw = s->mdct_calc; - if (HAVE_MIPSFPU) ff_fft_init_mips(s); -#else - if (CONFIG_MDCT) s->mdct_calcw = ff_mdct_calcw_c; - if (ARCH_ARM) ff_fft_fixed_init_arm(s); -#endif + s->mdct_calcw = s->mdct_calc; for(j=4; j<=nbits; j++) { ff_init_ff_cos_tabs(j); } - if (s->fft_permutation == FF_FFT_PERM_AVX) { - fft_perm_avx(s); - } else { - for(i=0; ifft_permutation == FF_FFT_PERM_SWAP_LSBS) - j = (j&~3) | ((j>>1)&1) | ((j<<1)&2); - int index = -split_radix_permutation(i, n, s->inverse) & (n - 1); - s->revtab[index] = j; - } + for(i=0; iinverse) & (n - 1); + s->revtab[index] = j; } return 0; @@ -199,17 +171,17 @@ static void fft_permute_c(FFTContext *s, FFTComplex *z) const uint16_t *revtab = s->revtab; np = 1 << s->nbits; /* TODO: handle split-radix permute in a more optimal way, probably in-place */ - for(j=0;jtmp_buf[revtab[j]] = z[j]; + for(j=0;jtmp_buf[revtab[j]] = z[j]; memcpy(z, s->tmp_buf, np * sizeof(FFTComplex)); } -av_cold void ff_fft_end(FFTContext *s) +void ff_fft_end(FFTContext *s) { av_freep(&s->revtab); av_freep(&s->tmp_buf); } - #define BUTTERFLIES(a0,a1,a2,a3) {\ BF(t3, t5, t5, t1);\ BF(a2.re, a0.re, a0.re, t5);\ diff --git a/ext/at3_standalone/float_dsp.c b/ext/at3_standalone/float_dsp.c index 351ee9a6c9..b1e59ec837 100644 --- a/ext/at3_standalone/float_dsp.c +++ b/ext/at3_standalone/float_dsp.c @@ -92,7 +92,7 @@ static void vector_fmul_reverse_c(float *dst, const float *src0, dst[i] = src0[i] * src1[-i]; } -av_cold AVFloatDSPContext *avpriv_float_dsp_alloc(int bit_exact) +AVFloatDSPContext *avpriv_float_dsp_alloc(int bit_exact) { AVFloatDSPContext *fdsp = av_mallocz(sizeof(AVFloatDSPContext)); if (!fdsp) diff --git a/ext/at3_standalone/libm.h b/ext/at3_standalone/libm.h deleted file mode 100644 index f64851cb06..0000000000 --- a/ext/at3_standalone/libm.h +++ /dev/null @@ -1,448 +0,0 @@ -/* - * erf function: Copyright (c) 2006 John Maddock - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/** - * @file - * Replacements for frequently missing libm functions - */ - -#ifndef AVUTIL_LIBM_H -#define AVUTIL_LIBM_H - -#include -#include "compat.h" -#include "intfloat.h" -#include "mathematics.h" - -#if HAVE_MIPSFPU && HAVE_INLINE_ASM -#include "libavutil/mips/libm_mips.h" -#endif /* HAVE_MIPSFPU && HAVE_INLINE_ASM*/ - -#if !HAVE_ATANF -#undef atanf -#define atanf(x) ((float)atan(x)) -#endif /* HAVE_ATANF */ - -#if !HAVE_ATAN2F -#undef atan2f -#define atan2f(y, x) ((float)atan2(y, x)) -#endif /* HAVE_ATAN2F */ - -#if !HAVE_POWF -#undef powf -#define powf(x, y) ((float)pow(x, y)) -#endif /* HAVE_POWF */ - -#if !HAVE_CBRT -static av_always_inline double cbrt(double x) -{ - return x < 0 ? -pow(-x, 1.0 / 3.0) : pow(x, 1.0 / 3.0); -} -#endif /* HAVE_CBRT */ - -#if !HAVE_CBRTF -static av_always_inline float cbrtf(float x) -{ - return x < 0 ? -powf(-x, 1.0 / 3.0) : powf(x, 1.0 / 3.0); -} -#endif /* HAVE_CBRTF */ - -#if !HAVE_COPYSIGN -static av_always_inline double copysign(double x, double y) -{ - uint64_t vx = av_double2int(x); - uint64_t vy = av_double2int(y); - return av_int2double((vx & UINT64_C(0x7fffffffffffffff)) | (vy & UINT64_C(0x8000000000000000))); -} -#endif /* HAVE_COPYSIGN */ - -#if !HAVE_COSF -#undef cosf -#define cosf(x) ((float)cos(x)) -#endif /* HAVE_COSF */ - -#if !HAVE_ERF -static inline double ff_eval_poly(const double *coeff, int size, double x) { - double sum = coeff[size-1]; - int i; - for (i = size-2; i >= 0; --i) { - sum *= x; - sum += coeff[i]; - } - return sum; -} - -/** - * erf function - * Algorithm taken from the Boost project, source: - * http://www.boost.org/doc/libs/1_46_1/boost/math/special_functions/erf.hpp - * Use, modification and distribution are subject to the - * Boost Software License, Version 1.0 (see notice below). - * Boost Software License - Version 1.0 - August 17th, 2003 -Permission is hereby granted, free of charge, to any person or organization -obtaining a copy of the software and accompanying documentation covered by -this license (the "Software") to use, reproduce, display, distribute, -execute, and transmit the Software, and to prepare derivative works of the -Software, and to permit third-parties to whom the Software is furnished to -do so, all subject to the following: - -The copyright notices in the Software and this entire statement, including -the above license grant, this restriction and the following disclaimer, -must be included in all copies of the Software, in whole or in part, and -all derivative works of the Software, unless such copies or derivative -works are solely in the form of machine-executable object code generated by -a source language processor. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -DEALINGS IN THE SOFTWARE. - */ -static inline double erf(double z) -{ -#ifndef FF_ARRAY_ELEMS -#define FF_ARRAY_ELEMS(a) (sizeof(a) / sizeof((a)[0])) -#endif - double result; - - /* handle the symmetry: erf(-x) = -erf(x) */ - if (z < 0) - return -erf(-z); - - /* branch based on range of z, and pick appropriate approximation */ - if (z == 0) - return 0; - else if (z < 1e-10) - return z * 1.125 + z * 0.003379167095512573896158903121545171688; - else if (z < 0.5) { - // Maximum Deviation Found: 1.561e-17 - // Expected Error Term: 1.561e-17 - // Maximum Relative Change in Control Points: 1.155e-04 - // Max Error found at double precision = 2.961182e-17 - - static const double y = 1.044948577880859375; - static const double p[] = { - 0.0834305892146531832907, - -0.338165134459360935041, - -0.0509990735146777432841, - -0.00772758345802133288487, - -0.000322780120964605683831, - }; - static const double q[] = { - 1, - 0.455004033050794024546, - 0.0875222600142252549554, - 0.00858571925074406212772, - 0.000370900071787748000569, - }; - double zz = z * z; - return z * (y + ff_eval_poly(p, FF_ARRAY_ELEMS(p), zz) / ff_eval_poly(q, FF_ARRAY_ELEMS(q), zz)); - } - /* here onwards compute erfc */ - else if (z < 1.5) { - // Maximum Deviation Found: 3.702e-17 - // Expected Error Term: 3.702e-17 - // Maximum Relative Change in Control Points: 2.845e-04 - // Max Error found at double precision = 4.841816e-17 - static const double y = 0.405935764312744140625; - static const double p[] = { - -0.098090592216281240205, - 0.178114665841120341155, - 0.191003695796775433986, - 0.0888900368967884466578, - 0.0195049001251218801359, - 0.00180424538297014223957, - }; - static const double q[] = { - 1, - 1.84759070983002217845, - 1.42628004845511324508, - 0.578052804889902404909, - 0.12385097467900864233, - 0.0113385233577001411017, - 0.337511472483094676155e-5, - }; - result = y + ff_eval_poly(p, FF_ARRAY_ELEMS(p), z - 0.5) / ff_eval_poly(q, FF_ARRAY_ELEMS(q), z - 0.5); - result *= exp(-z * z) / z; - return 1 - result; - } - else if (z < 2.5) { - // Max Error found at double precision = 6.599585e-18 - // Maximum Deviation Found: 3.909e-18 - // Expected Error Term: 3.909e-18 - // Maximum Relative Change in Control Points: 9.886e-05 - static const double y = 0.50672817230224609375; - static const double p[] = { - -0.0243500476207698441272, - 0.0386540375035707201728, - 0.04394818964209516296, - 0.0175679436311802092299, - 0.00323962406290842133584, - 0.000235839115596880717416, - }; - static const double q[] = { - 1, - 1.53991494948552447182, - 0.982403709157920235114, - 0.325732924782444448493, - 0.0563921837420478160373, - 0.00410369723978904575884, - }; - result = y + ff_eval_poly(p, FF_ARRAY_ELEMS(p), z - 1.5) / ff_eval_poly(q, FF_ARRAY_ELEMS(q), z - 1.5); - result *= exp(-z * z) / z; - return 1 - result; - } - else if (z < 4.5) { - // Maximum Deviation Found: 1.512e-17 - // Expected Error Term: 1.512e-17 - // Maximum Relative Change in Control Points: 2.222e-04 - // Max Error found at double precision = 2.062515e-17 - static const double y = 0.5405750274658203125; - static const double p[] = { - 0.00295276716530971662634, - 0.0137384425896355332126, - 0.00840807615555585383007, - 0.00212825620914618649141, - 0.000250269961544794627958, - 0.113212406648847561139e-4, - }; - static const double q[] = { - 1, - 1.04217814166938418171, - 0.442597659481563127003, - 0.0958492726301061423444, - 0.0105982906484876531489, - 0.000479411269521714493907, - }; - result = y + ff_eval_poly(p, FF_ARRAY_ELEMS(p), z - 3.5) / ff_eval_poly(q, FF_ARRAY_ELEMS(q), z - 3.5); - result *= exp(-z * z) / z; - return 1 - result; - } - /* differ from Boost here, the claim of underflow of erfc(x) past 5.8 is - * slightly incorrect, change to 5.92 - * (really somewhere between 5.9125 and 5.925 is when it saturates) */ - else if (z < 5.92) { - // Max Error found at double precision = 2.997958e-17 - // Maximum Deviation Found: 2.860e-17 - // Expected Error Term: 2.859e-17 - // Maximum Relative Change in Control Points: 1.357e-05 - static const double y = 0.5579090118408203125; - static const double p[] = { - 0.00628057170626964891937, - 0.0175389834052493308818, - -0.212652252872804219852, - -0.687717681153649930619, - -2.5518551727311523996, - -3.22729451764143718517, - -2.8175401114513378771, - }; - static const double q[] = { - 1, - 2.79257750980575282228, - 11.0567237927800161565, - 15.930646027911794143, - 22.9367376522880577224, - 13.5064170191802889145, - 5.48409182238641741584, - }; - result = y + ff_eval_poly(p, FF_ARRAY_ELEMS(p), 1 / z) / ff_eval_poly(q, FF_ARRAY_ELEMS(q), 1 / z); - result *= exp(-z * z) / z; - return 1 - result; - } - /* handle the nan case, but don't use isnan for max portability */ - else if (z != z) - return z; - /* finally return saturated result */ - else - return 1; -} -#endif /* HAVE_ERF */ - -#if !HAVE_EXPF -#undef expf -#define expf(x) ((float)exp(x)) -#endif /* HAVE_EXPF */ - -#if !HAVE_EXP2 -#undef exp2 -#define exp2(x) exp((x) * M_LN2) -#endif /* HAVE_EXP2 */ - -#if !HAVE_EXP2F -#undef exp2f -#define exp2f(x) ((float)exp2(x)) -#endif /* HAVE_EXP2F */ - -#if !HAVE_ISINF -#undef isinf -/* Note: these do not follow the BSD/Apple/GNU convention of returning -1 for --Inf, +1 for Inf, 0 otherwise, but merely follow the POSIX/ISO mandated spec of -returning a non-zero value for +/-Inf, 0 otherwise. */ -static av_always_inline av_const int avpriv_isinff(float x) -{ - uint32_t v = av_float2int(x); - if ((v & 0x7f800000) != 0x7f800000) - return 0; - return !(v & 0x007fffff); -} - -static av_always_inline av_const int avpriv_isinf(double x) -{ - uint64_t v = av_double2int(x); - if ((v & 0x7ff0000000000000) != 0x7ff0000000000000) - return 0; - return !(v & 0x000fffffffffffff); -} - -#define isinf(x) \ - (sizeof(x) == sizeof(float) \ - ? avpriv_isinff(x) \ - : avpriv_isinf(x)) -#endif /* HAVE_ISINF */ - -#if !HAVE_ISNAN -static av_always_inline av_const int avpriv_isnanf(float x) -{ - uint32_t v = av_float2int(x); - if ((v & 0x7f800000) != 0x7f800000) - return 0; - return v & 0x007fffff; -} - -static av_always_inline av_const int avpriv_isnan(double x) -{ - uint64_t v = av_double2int(x); - if ((v & 0x7ff0000000000000) != 0x7ff0000000000000) - return 0; - return (v & 0x000fffffffffffff) && 1; -} - -#define isnan(x) \ - (sizeof(x) == sizeof(float) \ - ? avpriv_isnanf(x) \ - : avpriv_isnan(x)) -#endif /* HAVE_ISNAN */ - -#if !HAVE_ISFINITE -static av_always_inline av_const int avpriv_isfinitef(float x) -{ - uint32_t v = av_float2int(x); - return (v & 0x7f800000) != 0x7f800000; -} - -static av_always_inline av_const int avpriv_isfinite(double x) -{ - uint64_t v = av_double2int(x); - return (v & 0x7ff0000000000000) != 0x7ff0000000000000; -} - -#define isfinite(x) \ - (sizeof(x) == sizeof(float) \ - ? avpriv_isfinitef(x) \ - : avpriv_isfinite(x)) -#endif /* HAVE_ISFINITE */ - -#if !HAVE_LDEXPF -#undef ldexpf -#define ldexpf(x, exp) ((float)ldexp(x, exp)) -#endif /* HAVE_LDEXPF */ - -#if !HAVE_LLRINT -#undef llrint -#define llrint(x) ((long long)rint(x)) -#endif /* HAVE_LLRINT */ - -#if !HAVE_LLRINTF -#undef llrintf -#define llrintf(x) ((long long)rint(x)) -#endif /* HAVE_LLRINT */ - -#if !HAVE_LOG2 -#undef log2 -#define log2(x) (log(x) * 1.44269504088896340736) -#endif /* HAVE_LOG2 */ - -#if !HAVE_LOG2F -#undef log2f -#define log2f(x) ((float)log2(x)) -#endif /* HAVE_LOG2F */ - -#if !HAVE_LOG10F -#undef log10f -#define log10f(x) ((float)log10(x)) -#endif /* HAVE_LOG10F */ - -#if !HAVE_SINF -#undef sinf -#define sinf(x) ((float)sin(x)) -#endif /* HAVE_SINF */ - -#if !HAVE_RINT -static inline double rint(double x) -{ - return x >= 0 ? floor(x + 0.5) : ceil(x - 0.5); -} -#endif /* HAVE_RINT */ - -#if !HAVE_LRINT -static av_always_inline av_const long int lrint(double x) -{ - return rint(x); -} -#endif /* HAVE_LRINT */ - -#if !HAVE_LRINTF -static av_always_inline av_const long int lrintf(float x) -{ - return (int)(rint(x)); -} -#endif /* HAVE_LRINTF */ - -#if !HAVE_ROUND -static av_always_inline av_const double round(double x) -{ - return (x > 0) ? floor(x + 0.5) : ceil(x - 0.5); -} -#endif /* HAVE_ROUND */ - -#if !HAVE_ROUNDF -static av_always_inline av_const float roundf(float x) -{ - return (x > 0) ? floor(x + 0.5) : ceil(x - 0.5); -} -#endif /* HAVE_ROUNDF */ - -#if !HAVE_TRUNC -static av_always_inline av_const double trunc(double x) -{ - return (x > 0) ? floor(x) : ceil(x); -} -#endif /* HAVE_TRUNC */ - -#if !HAVE_TRUNCF -static av_always_inline av_const float truncf(float x) -{ - return (x > 0) ? floor(x) : ceil(x); -} -#endif /* HAVE_TRUNCF */ - -#endif /* AVUTIL_LIBM_H */ diff --git a/ext/at3_standalone/log.h b/ext/at3_standalone/log.h index 2bf9af03aa..c85a078fb1 100644 --- a/ext/at3_standalone/log.h +++ b/ext/at3_standalone/log.h @@ -24,7 +24,6 @@ #include #include "avutil.h" #include "compat.h" -#include "version.h" typedef enum { AV_CLASS_CATEGORY_NA = 0, diff --git a/ext/at3_standalone/mathematics.c b/ext/at3_standalone/mathematics.c index 3db29ad300..0e5a0af793 100644 --- a/ext/at3_standalone/mathematics.c +++ b/ext/at3_standalone/mathematics.c @@ -29,7 +29,6 @@ #include "mathematics.h" #include "intmath.h" #include "common.h" -#include "version.h" /* Stein's binary GCD algorithm: * https://en.wikipedia.org/wiki/Binary_GCD_algorithm */ diff --git a/ext/at3_standalone/mdct_template.c b/ext/at3_standalone/mdct_template.c index 6176cd3de8..02d4677655 100644 --- a/ext/at3_standalone/mdct_template.c +++ b/ext/at3_standalone/mdct_template.c @@ -22,10 +22,8 @@ #include #include #include "common.h" -#include "libm.h" #include "mathematics.h" #include "fft.h" -#include "fft-internal.h" /** * @file @@ -45,7 +43,7 @@ /** * init MDCT or IMDCT computation. */ -av_cold int ff_mdct_init(FFTContext *s, int nbits, int inverse, double scale) +int ff_mdct_init(FFTContext *s, int nbits, int inverse, double scale) { int n, n4, i; double alpha, theta; @@ -82,13 +80,8 @@ av_cold int ff_mdct_init(FFTContext *s, int nbits, int inverse, double scale) scale = sqrt(fabs(scale)); for(i=0;itcos[i*tstep] = lrint(-cos(alpha) * 2147483648.0); - s->tsin[i*tstep] = lrint(-sin(alpha) * 2147483648.0); -#else s->tcos[i*tstep] = FIX15(-cos(alpha) * scale); s->tsin[i*tstep] = FIX15(-sin(alpha) * scale); -#endif } return 0; fail: @@ -206,7 +199,7 @@ void ff_mdct_calc_c(FFTContext *s, FFTSample *out, const FFTSample *input) } } -av_cold void ff_mdct_end(FFTContext *s) +void ff_mdct_end(FFTContext *s) { av_freep(&s->tcos); ff_fft_end(s); diff --git a/ext/at3_standalone/mem.c b/ext/at3_standalone/mem.c index 6519a1df70..a880c2a59c 100644 --- a/ext/at3_standalone/mem.c +++ b/ext/at3_standalone/mem.c @@ -26,8 +26,6 @@ #define _XOPEN_SOURCE 600 -#include "config.h" - #include #include #include diff --git a/ext/at3_standalone/mem.h b/ext/at3_standalone/mem.h index 5568110edb..e622e4c058 100644 --- a/ext/at3_standalone/mem.h +++ b/ext/at3_standalone/mem.h @@ -28,9 +28,10 @@ #include #include +#include +#include #include "compat.h" -#include "error.h" #include "avutil.h" /** diff --git a/ext/at3_standalone/qsort.h b/ext/at3_standalone/qsort.h deleted file mode 100644 index 39b7a08852..0000000000 --- a/ext/at3_standalone/qsort.h +++ /dev/null @@ -1,122 +0,0 @@ -/* - * copyright (c) 2012 Michael Niedermayer - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef AVUTIL_QSORT_H -#define AVUTIL_QSORT_H - -#include "common.h" - - -/** - * Quicksort - * This sort is fast, and fully inplace but not stable and it is possible - * to construct input that requires O(n^2) time but this is very unlikely to - * happen with non constructed input. - */ -#define AV_QSORT(p, num, type, cmp) do {\ - void *stack[64][2];\ - int sp= 1;\ - stack[0][0] = p;\ - stack[0][1] = (p)+(num)-1;\ - while(sp){\ - type *start= stack[--sp][0];\ - type *end = stack[ sp][1];\ - while(start < end){\ - if(start < end-1) {\ - int checksort=0;\ - type *right = end-2;\ - type *left = start+1;\ - type *mid = start + ((end-start)>>1);\ - if(cmp(start, end) > 0) {\ - if(cmp( end, mid) > 0) FFSWAP(type, *start, *mid);\ - else FFSWAP(type, *start, *end);\ - }else{\ - if(cmp(start, mid) > 0) FFSWAP(type, *start, *mid);\ - else checksort= 1;\ - }\ - if(cmp(mid, end) > 0){ \ - FFSWAP(type, *mid, *end);\ - checksort=0;\ - }\ - if(start == end-2) break;\ - FFSWAP(type, end[-1], *mid);\ - while(left <= right){\ - while(left<=right && cmp(left, end-1) < 0)\ - left++;\ - while(left<=right && cmp(right, end-1) > 0)\ - right--;\ - if(left <= right){\ - FFSWAP(type, *left, *right);\ - left++;\ - right--;\ - }\ - }\ - FFSWAP(type, end[-1], *left);\ - if(checksort && (mid == left-1 || mid == left)){\ - mid= start;\ - while(mid 0)\ - FFSWAP(type, *start, *end);\ - break;\ - }\ - }\ - }\ -} while (0) - -/** - * Merge sort, this sort requires a temporary buffer and is stable, its worst - * case time is O(n log n) - * @param p must be a lvalue pointer, this function may exchange it with tmp - * @param tmp must be a lvalue pointer, this function may exchange it with p - */ -#define AV_MSORT(p, tmp, num, type, cmp) do {\ - unsigned i, j, step;\ - for(step=1; step<(num); step+=step){\ - for(i=0; i<(num); i+=2*step){\ - unsigned a[2] = {i, i+step};\ - unsigned end = FFMIN(i+2*step, (num));\ - for(j=i; a[0] 0;\ - tmp[j] = p[ a[idx]++ ];\ - }\ - if(a[0]>=i+step) a[0] = a[1];\ - for(; j -#include -#include - -typedef struct SampleFmtInfo { - char name[8]; - int bits; - int planar; - enum AVSampleFormat altform; ///< planar<->packed alternative form -} SampleFmtInfo; - -/** this table gives more information about formats */ -static const SampleFmtInfo sample_fmt_info[AV_SAMPLE_FMT_NB] = { - [AV_SAMPLE_FMT_U8] = { .name = "u8", .bits = 8, .planar = 0, .altform = AV_SAMPLE_FMT_U8P }, - [AV_SAMPLE_FMT_S16] = { .name = "s16", .bits = 16, .planar = 0, .altform = AV_SAMPLE_FMT_S16P }, - [AV_SAMPLE_FMT_S32] = { .name = "s32", .bits = 32, .planar = 0, .altform = AV_SAMPLE_FMT_S32P }, - [AV_SAMPLE_FMT_FLT] = { .name = "flt", .bits = 32, .planar = 0, .altform = AV_SAMPLE_FMT_FLTP }, - [AV_SAMPLE_FMT_DBL] = { .name = "dbl", .bits = 64, .planar = 0, .altform = AV_SAMPLE_FMT_DBLP }, - [AV_SAMPLE_FMT_U8P] = { .name = "u8p", .bits = 8, .planar = 1, .altform = AV_SAMPLE_FMT_U8 }, - [AV_SAMPLE_FMT_S16P] = { .name = "s16p", .bits = 16, .planar = 1, .altform = AV_SAMPLE_FMT_S16 }, - [AV_SAMPLE_FMT_S32P] = { .name = "s32p", .bits = 32, .planar = 1, .altform = AV_SAMPLE_FMT_S32 }, - [AV_SAMPLE_FMT_FLTP] = { .name = "fltp", .bits = 32, .planar = 1, .altform = AV_SAMPLE_FMT_FLT }, - [AV_SAMPLE_FMT_DBLP] = { .name = "dblp", .bits = 64, .planar = 1, .altform = AV_SAMPLE_FMT_DBL }, -}; - -const char *av_get_sample_fmt_name(enum AVSampleFormat sample_fmt) -{ - if (sample_fmt < 0 || sample_fmt >= AV_SAMPLE_FMT_NB) - return NULL; - return sample_fmt_info[sample_fmt].name; -} - -enum AVSampleFormat av_get_sample_fmt(const char *name) -{ - int i; - - for (i = 0; i < AV_SAMPLE_FMT_NB; i++) - if (!strcmp(sample_fmt_info[i].name, name)) - return i; - return AV_SAMPLE_FMT_NONE; -} - -enum AVSampleFormat av_get_alt_sample_fmt(enum AVSampleFormat sample_fmt, int planar) -{ - if (sample_fmt < 0 || sample_fmt >= AV_SAMPLE_FMT_NB) - return AV_SAMPLE_FMT_NONE; - if (sample_fmt_info[sample_fmt].planar == planar) - return sample_fmt; - return sample_fmt_info[sample_fmt].altform; -} - -enum AVSampleFormat av_get_packed_sample_fmt(enum AVSampleFormat sample_fmt) -{ - if (sample_fmt < 0 || sample_fmt >= AV_SAMPLE_FMT_NB) - return AV_SAMPLE_FMT_NONE; - if (sample_fmt_info[sample_fmt].planar) - return sample_fmt_info[sample_fmt].altform; - return sample_fmt; -} - -enum AVSampleFormat av_get_planar_sample_fmt(enum AVSampleFormat sample_fmt) -{ - if (sample_fmt < 0 || sample_fmt >= AV_SAMPLE_FMT_NB) - return AV_SAMPLE_FMT_NONE; - if (sample_fmt_info[sample_fmt].planar) - return sample_fmt; - return sample_fmt_info[sample_fmt].altform; -} - -char *av_get_sample_fmt_string (char *buf, int buf_size, enum AVSampleFormat sample_fmt) -{ - /* print header */ - if (sample_fmt < 0) - snprintf(buf, buf_size, "name " " depth"); - else if (sample_fmt < AV_SAMPLE_FMT_NB) { - SampleFmtInfo info = sample_fmt_info[sample_fmt]; - snprintf (buf, buf_size, "%-6s" " %2d ", info.name, info.bits); - } - - return buf; -} - -int av_get_bytes_per_sample(enum AVSampleFormat sample_fmt) -{ - return sample_fmt < 0 || sample_fmt >= AV_SAMPLE_FMT_NB ? - 0 : sample_fmt_info[sample_fmt].bits >> 3; -} - -int av_sample_fmt_is_planar(enum AVSampleFormat sample_fmt) -{ - if (sample_fmt < 0 || sample_fmt >= AV_SAMPLE_FMT_NB) - return 0; - return sample_fmt_info[sample_fmt].planar; -} - -int av_samples_get_buffer_size(int *linesize, int nb_channels, int nb_samples, - enum AVSampleFormat sample_fmt, int align) -{ - int line_size; - int sample_size = av_get_bytes_per_sample(sample_fmt); - int planar = av_sample_fmt_is_planar(sample_fmt); - - /* validate parameter ranges */ - if (!sample_size || nb_samples <= 0 || nb_channels <= 0) - return AVERROR(EINVAL); - - /* auto-select alignment if not specified */ - if (!align) { - if (nb_samples > INT_MAX - 31) - return AVERROR(EINVAL); - align = 1; - nb_samples = FFALIGN(nb_samples, 32); - } - - /* check for integer overflow */ - if (nb_channels > INT_MAX / align || - (int64_t)nb_channels * nb_samples > (INT_MAX - (align * nb_channels)) / sample_size) - return AVERROR(EINVAL); - - line_size = planar ? FFALIGN(nb_samples * sample_size, align) : - FFALIGN(nb_samples * sample_size * nb_channels, align); - if (linesize) - *linesize = line_size; - - return planar ? line_size * nb_channels : line_size; -} - -int av_samples_fill_arrays(uint8_t **audio_data, int *linesize, - const uint8_t *buf, int nb_channels, int nb_samples, - enum AVSampleFormat sample_fmt, int align) -{ - int ch, planar, buf_size, line_size; - - planar = av_sample_fmt_is_planar(sample_fmt); - buf_size = av_samples_get_buffer_size(&line_size, nb_channels, nb_samples, - sample_fmt, align); - if (buf_size < 0) - return buf_size; - - audio_data[0] = (uint8_t *)buf; - for (ch = 1; planar && ch < nb_channels; ch++) - audio_data[ch] = audio_data[ch-1] + line_size; - - if (linesize) - *linesize = line_size; - - return buf_size; -} - -int av_samples_alloc(uint8_t **audio_data, int *linesize, int nb_channels, - int nb_samples, enum AVSampleFormat sample_fmt, int align) -{ - uint8_t *buf; - int size = av_samples_get_buffer_size(NULL, nb_channels, nb_samples, - sample_fmt, align); - if (size < 0) - return size; - - buf = av_malloc(size); - if (!buf) - return AVERROR(ENOMEM); - - size = av_samples_fill_arrays(audio_data, linesize, buf, nb_channels, - nb_samples, sample_fmt, align); - if (size < 0) { - av_free(buf); - return size; - } - - av_samples_set_silence(audio_data, 0, nb_samples, nb_channels, sample_fmt); - - return size; -} - -int av_samples_copy(uint8_t **dst, uint8_t * const *src, int dst_offset, - int src_offset, int nb_samples, int nb_channels, - enum AVSampleFormat sample_fmt) -{ - int planar = av_sample_fmt_is_planar(sample_fmt); - int planes = planar ? nb_channels : 1; - int block_align = av_get_bytes_per_sample(sample_fmt) * (planar ? 1 : nb_channels); - int data_size = nb_samples * block_align; - int i; - - dst_offset *= block_align; - src_offset *= block_align; - - if((dst[0] < src[0] ? src[0] - dst[0] : dst[0] - src[0]) >= data_size) { - for (i = 0; i < planes; i++) - memcpy(dst[i] + dst_offset, src[i] + src_offset, data_size); - } else { - for (i = 0; i < planes; i++) - memmove(dst[i] + dst_offset, src[i] + src_offset, data_size); - } - - return 0; -} - -int av_samples_set_silence(uint8_t **audio_data, int offset, int nb_samples, - int nb_channels, enum AVSampleFormat sample_fmt) -{ - int planar = av_sample_fmt_is_planar(sample_fmt); - int planes = planar ? nb_channels : 1; - int block_align = av_get_bytes_per_sample(sample_fmt) * (planar ? 1 : nb_channels); - int data_size = nb_samples * block_align; - int fill_char = (sample_fmt == AV_SAMPLE_FMT_U8 || - sample_fmt == AV_SAMPLE_FMT_U8P) ? 0x80 : 0x00; - int i; - - offset *= block_align; - - for (i = 0; i < planes; i++) - memset(audio_data[i] + offset, fill_char, data_size); - - return 0; -} diff --git a/ext/at3_standalone/samplefmt.h b/ext/at3_standalone/samplefmt.h deleted file mode 100644 index 632bb4e852..0000000000 --- a/ext/at3_standalone/samplefmt.h +++ /dev/null @@ -1,259 +0,0 @@ -/* - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef AVUTIL_SAMPLEFMT_H -#define AVUTIL_SAMPLEFMT_H - -#include - -#include "avutil.h" -#include "compat.h" - -/** - * @addtogroup lavu_audio - * @{ - * - * @defgroup lavu_sampfmts Audio sample formats - * - * Audio sample format enumeration and related convenience functions. - * @{ - * - */ - -/** - * Audio sample formats - * - * - The data described by the sample format is always in native-endian order. - * Sample values can be expressed by native C types, hence the lack of a signed - * 24-bit sample format even though it is a common raw audio data format. - * - * - The floating-point formats are based on full volume being in the range - * [-1.0, 1.0]. Any values outside this range are beyond full volume level. - * - * - The data layout as used in av_samples_fill_arrays() and elsewhere in FFmpeg - * (such as AVFrame in libavcodec) is as follows: - * - * @par - * For planar sample formats, each audio channel is in a separate data plane, - * and linesize is the buffer size, in bytes, for a single plane. All data - * planes must be the same size. For packed sample formats, only the first data - * plane is used, and samples for each channel are interleaved. In this case, - * linesize is the buffer size, in bytes, for the 1 plane. - * - */ -enum AVSampleFormat { - AV_SAMPLE_FMT_NONE = -1, - AV_SAMPLE_FMT_U8, ///< unsigned 8 bits - AV_SAMPLE_FMT_S16, ///< signed 16 bits - AV_SAMPLE_FMT_S32, ///< signed 32 bits - AV_SAMPLE_FMT_FLT, ///< float - AV_SAMPLE_FMT_DBL, ///< double - - AV_SAMPLE_FMT_U8P, ///< unsigned 8 bits, planar - AV_SAMPLE_FMT_S16P, ///< signed 16 bits, planar - AV_SAMPLE_FMT_S32P, ///< signed 32 bits, planar - AV_SAMPLE_FMT_FLTP, ///< float, planar - AV_SAMPLE_FMT_DBLP, ///< double, planar - - AV_SAMPLE_FMT_NB ///< Number of sample formats. DO NOT USE if linking dynamically -}; - -/** - * Return the name of sample_fmt, or NULL if sample_fmt is not - * recognized. - */ -const char *av_get_sample_fmt_name(enum AVSampleFormat sample_fmt); - -/** - * Return a sample format corresponding to name, or AV_SAMPLE_FMT_NONE - * on error. - */ -enum AVSampleFormat av_get_sample_fmt(const char *name); - -/** - * Return the planar<->packed alternative form of the given sample format, or - * AV_SAMPLE_FMT_NONE on error. If the passed sample_fmt is already in the - * requested planar/packed format, the format returned is the same as the - * input. - */ -enum AVSampleFormat av_get_alt_sample_fmt(enum AVSampleFormat sample_fmt, int planar); - -/** - * Get the packed alternative form of the given sample format. - * - * If the passed sample_fmt is already in packed format, the format returned is - * the same as the input. - * - * @return the packed alternative form of the given sample format or - AV_SAMPLE_FMT_NONE on error. - */ -enum AVSampleFormat av_get_packed_sample_fmt(enum AVSampleFormat sample_fmt); - -/** - * Get the planar alternative form of the given sample format. - * - * If the passed sample_fmt is already in planar format, the format returned is - * the same as the input. - * - * @return the planar alternative form of the given sample format or - AV_SAMPLE_FMT_NONE on error. - */ -enum AVSampleFormat av_get_planar_sample_fmt(enum AVSampleFormat sample_fmt); - -/** - * Generate a string corresponding to the sample format with - * sample_fmt, or a header if sample_fmt is negative. - * - * @param buf the buffer where to write the string - * @param buf_size the size of buf - * @param sample_fmt the number of the sample format to print the - * corresponding info string, or a negative value to print the - * corresponding header. - * @return the pointer to the filled buffer or NULL if sample_fmt is - * unknown or in case of other errors - */ -char *av_get_sample_fmt_string(char *buf, int buf_size, enum AVSampleFormat sample_fmt); - -/** - * Return number of bytes per sample. - * - * @param sample_fmt the sample format - * @return number of bytes per sample or zero if unknown for the given - * sample format - */ -int av_get_bytes_per_sample(enum AVSampleFormat sample_fmt); - -/** - * Check if the sample format is planar. - * - * @param sample_fmt the sample format to inspect - * @return 1 if the sample format is planar, 0 if it is interleaved - */ -int av_sample_fmt_is_planar(enum AVSampleFormat sample_fmt); - -/** - * Get the required buffer size for the given audio parameters. - * - * @param[out] linesize calculated linesize, may be NULL - * @param nb_channels the number of channels - * @param nb_samples the number of samples in a single channel - * @param sample_fmt the sample format - * @param align buffer size alignment (0 = default, 1 = no alignment) - * @return required buffer size, or negative error code on failure - */ -int av_samples_get_buffer_size(int *linesize, int nb_channels, int nb_samples, - enum AVSampleFormat sample_fmt, int align); - -/** - * @} - * - * @defgroup lavu_sampmanip Samples manipulation - * - * Functions that manipulate audio samples - * @{ - */ - -/** - * Fill plane data pointers and linesize for samples with sample - * format sample_fmt. - * - * The audio_data array is filled with the pointers to the samples data planes: - * for planar, set the start point of each channel's data within the buffer, - * for packed, set the start point of the entire buffer only. - * - * The value pointed to by linesize is set to the aligned size of each - * channel's data buffer for planar layout, or to the aligned size of the - * buffer for all channels for packed layout. - * - * The buffer in buf must be big enough to contain all the samples - * (use av_samples_get_buffer_size() to compute its minimum size), - * otherwise the audio_data pointers will point to invalid data. - * - * @see enum AVSampleFormat - * The documentation for AVSampleFormat describes the data layout. - * - * @param[out] audio_data array to be filled with the pointer for each channel - * @param[out] linesize calculated linesize, may be NULL - * @param buf the pointer to a buffer containing the samples - * @param nb_channels the number of channels - * @param nb_samples the number of samples in a single channel - * @param sample_fmt the sample format - * @param align buffer size alignment (0 = default, 1 = no alignment) - * @return >=0 on success or a negative error code on failure - * @todo return minimum size in bytes required for the buffer in case - * of success at the next bump - */ -int av_samples_fill_arrays(uint8_t **audio_data, int *linesize, - const uint8_t *buf, - int nb_channels, int nb_samples, - enum AVSampleFormat sample_fmt, int align); - -/** - * Allocate a samples buffer for nb_samples samples, and fill data pointers and - * linesize accordingly. - * The allocated samples buffer can be freed by using av_freep(&audio_data[0]) - * Allocated data will be initialized to silence. - * - * @see enum AVSampleFormat - * The documentation for AVSampleFormat describes the data layout. - * - * @param[out] audio_data array to be filled with the pointer for each channel - * @param[out] linesize aligned size for audio buffer(s), may be NULL - * @param nb_channels number of audio channels - * @param nb_samples number of samples per channel - * @param align buffer size alignment (0 = default, 1 = no alignment) - * @return >=0 on success or a negative error code on failure - * @todo return the size of the allocated buffer in case of success at the next bump - * @see av_samples_fill_arrays() - * @see av_samples_alloc_array_and_samples() - */ -int av_samples_alloc(uint8_t **audio_data, int *linesize, int nb_channels, - int nb_samples, enum AVSampleFormat sample_fmt, int align); - -/** - * Copy samples from src to dst. - * - * @param dst destination array of pointers to data planes - * @param src source array of pointers to data planes - * @param dst_offset offset in samples at which the data will be written to dst - * @param src_offset offset in samples at which the data will be read from src - * @param nb_samples number of samples to be copied - * @param nb_channels number of audio channels - * @param sample_fmt audio sample format - */ -int av_samples_copy(uint8_t **dst, uint8_t * const *src, int dst_offset, - int src_offset, int nb_samples, int nb_channels, - enum AVSampleFormat sample_fmt); - -/** - * Fill an audio buffer with silence. - * - * @param audio_data array of pointers to data planes - * @param offset offset in samples at which to start filling - * @param nb_samples number of samples to fill - * @param nb_channels number of audio channels - * @param sample_fmt audio sample format - */ -int av_samples_set_silence(uint8_t **audio_data, int offset, int nb_samples, - int nb_channels, enum AVSampleFormat sample_fmt); - -/** - * @} - * @} - */ -#endif /* AVUTIL_SAMPLEFMT_H */ diff --git a/ext/at3_standalone/sinewin.c b/ext/at3_standalone/sinewin.c index 4532dc7354..eec241f128 100644 --- a/ext/at3_standalone/sinewin.c +++ b/ext/at3_standalone/sinewin.c @@ -16,6 +16,44 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#define USE_FIXED 0 +#define _USE_MATH_DEFINES +#include + +#include +#include "aac_defines.h" +#include "compat.h" +#include "common.h" + +#include "mem.h" +#include "aac_defines.h" + #include "sinewin.h" -#include "sinewin_tablegen.h" + +SINETABLE(32); +SINETABLE(64); +SINETABLE(128); +SINETABLE(256); +SINETABLE(512); +SINETABLE(1024); +SINETABLE(2048); +SINETABLE(4096); +SINETABLE(8192); + +float * const ff_sine_windows[] = { + NULL, NULL, NULL, NULL, NULL, // unused + ff_sine_32 , ff_sine_64, ff_sine_128, + ff_sine_256, ff_sine_512, ff_sine_1024, + ff_sine_2048,ff_sine_4096, ff_sine_8192 +}; + +// Generate a sine window. +void ff_sine_window_init(float *window, int n) { + int i; + for (i = 0; i < n; i++) + window[i] = sinf((i + 0.5) * (M_PI / (2.0 * n))); +} + +void ff_init_ff_sine_windows(int index) { + assert(index >= 0 && index < FF_ARRAY_ELEMS(ff_sine_windows)); + ff_sine_window_init(ff_sine_windows[index], 1 << index); +} diff --git a/ext/at3_standalone/sinewin.h b/ext/at3_standalone/sinewin.h index 811b6bd243..bf2b2efc17 100644 --- a/ext/at3_standalone/sinewin.h +++ b/ext/at3_standalone/sinewin.h @@ -18,47 +18,31 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVCODEC_SINEWIN_H -#define AVCODEC_SINEWIN_H - -#include "mem.h" -#include "aac_defines.h" - -#if CONFIG_HARDCODED_TABLES -# define SINETABLE_CONST const -#else -# define SINETABLE_CONST -#endif - -#ifndef USE_FIXED -#define USE_FIXED 0 -#endif +#pragma once #define SINETABLE(size) \ - SINETABLE_CONST DECLARE_ALIGNED(32, INTFLOAT, AAC_RENAME(ff_sine_##size))[size] + DECLARE_ALIGNED(32, float, ff_sine_##size)[size] -/** - * Generate a sine window. - * @param window pointer to half window - * @param n size of half window - */ -void AAC_RENAME(ff_sine_window_init)(INTFLOAT *window, int n); + /** + * Generate a sine window. + * @param window pointer to half window + * @param n size of half window + */ +void ff_sine_window_init(float *window, int n); /** * initialize the specified entry of ff_sine_windows */ -void AAC_RENAME(ff_init_ff_sine_windows)(int index); +void ff_init_ff_sine_windows(int index); -extern SINETABLE( 32); -extern SINETABLE( 64); -extern SINETABLE( 128); -extern SINETABLE( 256); -extern SINETABLE( 512); +extern SINETABLE(32); +extern SINETABLE(64); +extern SINETABLE(128); +extern SINETABLE(256); +extern SINETABLE(512); extern SINETABLE(1024); extern SINETABLE(2048); extern SINETABLE(4096); extern SINETABLE(8192); -extern SINETABLE_CONST INTFLOAT * const AAC_RENAME(ff_sine_windows)[14]; - -#endif /* AVCODEC_SINEWIN_H */ +extern float * const ff_sine_windows[14]; diff --git a/ext/at3_standalone/sinewin_tablegen.c b/ext/at3_standalone/sinewin_tablegen.c deleted file mode 100644 index dd602668ee..0000000000 --- a/ext/at3_standalone/sinewin_tablegen.c +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Generate a header file for hardcoded sine windows - * - * Copyright (c) 2009 Reimar Döffinger - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#define USE_FIXED 0 -#include "sinewin_tablegen_template.c" diff --git a/ext/at3_standalone/sinewin_tablegen.h b/ext/at3_standalone/sinewin_tablegen.h deleted file mode 100644 index 36271fb39c..0000000000 --- a/ext/at3_standalone/sinewin_tablegen.h +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Header file for hardcoded sine windows - * - * Copyright (c) 2009 Reimar Döffinger - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef AVCODEC_SINEWIN_TABLEGEN_H -#define AVCODEC_SINEWIN_TABLEGEN_H - -#include -// do not use libavutil/libm.h since this is compiled both -// for the host and the target and config.h is only valid for the target -#include - -#include "aac_defines.h" -#include "compat.h" -#include "common.h" - -#if !CONFIG_HARDCODED_TABLES -SINETABLE( 32); -SINETABLE( 64); -SINETABLE( 128); -SINETABLE( 256); -SINETABLE( 512); -SINETABLE(1024); -SINETABLE(2048); -SINETABLE(4096); -SINETABLE(8192); -#else -#if USE_FIXED -#include "libavcodec/sinewin_fixed_tables.h" -#else -#include "libavcodec/sinewin_tables.h" -#endif -#endif - -#if USE_FIXED -#define SIN_FIX(a) (int)floor((a) * 0x80000000 + 0.5) -#else -#define SIN_FIX(a) a -#endif - -SINETABLE_CONST INTFLOAT * const AAC_RENAME(ff_sine_windows)[] = { - NULL, NULL, NULL, NULL, NULL, // unused - AAC_RENAME(ff_sine_32) , AAC_RENAME(ff_sine_64), AAC_RENAME(ff_sine_128), - AAC_RENAME(ff_sine_256), AAC_RENAME(ff_sine_512), AAC_RENAME(ff_sine_1024), - AAC_RENAME(ff_sine_2048), AAC_RENAME(ff_sine_4096), AAC_RENAME(ff_sine_8192) -}; - -// Generate a sine window. -av_cold void AAC_RENAME(ff_sine_window_init)(INTFLOAT *window, int n) { - int i; - for(i = 0; i < n; i++) - window[i] = SIN_FIX(sinf((i + 0.5) * (M_PI / (2.0 * n)))); -} - -av_cold void AAC_RENAME(ff_init_ff_sine_windows)(int index) { - assert(index >= 0 && index < FF_ARRAY_ELEMS(AAC_RENAME(ff_sine_windows))); -#if !CONFIG_HARDCODED_TABLES - AAC_RENAME(ff_sine_window_init)(AAC_RENAME(ff_sine_windows)[index], 1 << index); -#endif -} - -#endif /* AVCODEC_SINEWIN_TABLEGEN_H */ diff --git a/ext/at3_standalone/util_internal.h b/ext/at3_standalone/util_internal.h deleted file mode 100644 index a796d15223..0000000000 --- a/ext/at3_standalone/util_internal.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - * copyright (c) 2006 Michael Niedermayer - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/** - * @file - * common internal API header - */ - -#ifndef AVUTIL_INTERNAL_H -#define AVUTIL_INTERNAL_H - -#if !defined(DEBUG) && !defined(NDEBUG) -# define NDEBUG -#endif - -#include -#include - -#include "libm.h" - -extern const uint8_t ff_reverse[256]; - -#endif /* AVUTIL_INTERNAL_H */ diff --git a/ext/at3_standalone/utils.c b/ext/at3_standalone/utils.c deleted file mode 100644 index 3b77ffb4e7..0000000000 --- a/ext/at3_standalone/utils.c +++ /dev/null @@ -1,145 +0,0 @@ -/* - * utils for libavcodec - * Copyright (c) 2001 Fabrice Bellard - * Copyright (c) 2002-2004 Michael Niedermayer - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/** - * @file - * utils. - */ - -#include "util_internal.h" -#include "avcodec.h" -#include "compat.h" -#include "channel_layout.h" -#include "common.h" -#include "mathematics.h" -#include "samplefmt.h" -#include "avcodec.h" -#include "bytestream.h" -#include "version.h" -#include -#include -#include -#include - -int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *codec, void **options) -{ - if ((codec && avctx->codec && codec != avctx->codec)) { - av_log(avctx, AV_LOG_ERROR, "This AVCodecContext was allocated for %s, " - "but %s passed to avcodec_open2()\n", avctx->codec->name, codec->name); - return AVERROR(EINVAL); - } - if (!codec) - codec = avctx->codec; - - if (avctx->extradata_size < 0 || avctx->extradata_size >= FF_MAX_EXTRADATA_SIZE) - return AVERROR(EINVAL); - - int ret = 0; - - if (codec->priv_data_size > 0) { - if (!avctx->priv_data) { - avctx->priv_data = av_mallocz(codec->priv_data_size); - if (!avctx->priv_data) { - ret = AVERROR(ENOMEM); - goto end; - } - if (codec->priv_class) { - *(const AVClass **)avctx->priv_data = codec->priv_class; - } - } - } else { - avctx->priv_data = NULL; - } - - if (avctx->channels > FF_SANE_NB_CHANNELS) { - ret = AVERROR(EINVAL); - goto free_and_end; - } - - avctx->codec = codec; - avctx->codec_id = codec->id; - - avctx->frame_number = 0; - - if (avctx->codec->init) { - ret = avctx->codec->init(avctx); - if (ret < 0) { - goto free_and_end; - } - } - - ret=0; - - /* validate channel layout from the decoder */ - if (avctx->channel_layout) { - int channels = av_get_channel_layout_nb_channels(avctx->channel_layout); - if (!avctx->channels) - avctx->channels = channels; - else if (channels != avctx->channels) { - char buf[512] = ""; - av_log(avctx, AV_LOG_WARNING, - "Channel layout '%s' with %d channels does not match specified number of channels %d: " - "ignoring specified channel layout\n", - buf, channels, avctx->channels); - avctx->channel_layout = 0; - } - } - if (avctx->channels && avctx->channels < 0 || - avctx->channels > FF_SANE_NB_CHANNELS) { - ret = AVERROR(EINVAL); - goto free_and_end; - } - if (codec->priv_data_size > 0 && avctx->priv_data && codec->priv_class) { - av_assert0(*(const AVClass **)avctx->priv_data == codec->priv_class); - } - -end: - - return ret; -free_and_end: - if (avctx->codec) - avctx->codec->close(avctx); - - av_freep(&avctx->priv_data); - avctx->codec = NULL; - goto end; -} - -av_cold int avcodec_close(AVCodecContext *avctx) -{ - int i; - - if (!avctx) - return 0; - - if (avctx->codec && avctx->codec->close) - avctx->codec->close(avctx); - av_freep(&avctx->priv_data); - avctx->codec = NULL; - return 0; -} - -void avcodec_flush_buffers(AVCodecContext *avctx) -{ - if (avctx->codec->flush) - avctx->codec->flush(avctx); -} diff --git a/ext/at3_standalone/version.h b/ext/at3_standalone/version.h deleted file mode 100644 index 62a77de4d4..0000000000 --- a/ext/at3_standalone/version.h +++ /dev/null @@ -1,62 +0,0 @@ -/* - * copyright (c) 2003 Fabrice Bellard - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef AVUTIL_VERSION_H -#define AVUTIL_VERSION_H - -#include "common.h" - -/** - * @addtogroup version_utils - * - * Useful to check and match library version in order to maintain - * backward compatibility. - * - * @{ - */ - -#define AV_VERSION_INT(a, b, c) ((a)<<16 | (b)<<8 | (c)) -#define AV_VERSION_DOT(a, b, c) a ##.## b ##.## c -#define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c) - -/** - * Extract version components from the full ::AV_VERSION_INT int as returned - * by functions like ::avformat_version() and ::avcodec_version() - */ -#define AV_VERSION_MAJOR(a) ((a) >> 16) -#define AV_VERSION_MINOR(a) (((a) & 0x00FF00) >> 8) -#define AV_VERSION_MICRO(a) ((a) & 0xFF) - -/** - * @} - */ - -/** - * @file - * @ingroup lavu - * Libavutil version macros - */ - - -/** - * @} - */ - -#endif /* AVUTIL_VERSION_H */ From 9c32761a0addc339dc02f9b071e2a9c9bf33a34c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Thu, 11 Apr 2024 09:30:18 +0200 Subject: [PATCH 079/719] Remove fdsp context --- Common/Common.vcxproj | 2 +- Common/Common.vcxproj.filters | 2 +- ext/at3_standalone/atrac3.c | 7 +- ext/at3_standalone/atrac3plus.h | 5 +- ext/at3_standalone/atrac3plusdec.c | 9 +- ext/at3_standalone/atrac3plusdsp.c | 30 ++- ext/at3_standalone/float_dsp.c | 81 +------- ext/at3_standalone/float_dsp.h | 176 ++++-------------- .../{bitstream.c => get_bits.c} | 0 9 files changed, 62 insertions(+), 250 deletions(-) rename ext/at3_standalone/{bitstream.c => get_bits.c} (100%) diff --git a/Common/Common.vcxproj b/Common/Common.vcxproj index 9335079a50..f49ee5ad16 100644 --- a/Common/Common.vcxproj +++ b/Common/Common.vcxproj @@ -610,7 +610,7 @@ - + diff --git a/Common/Common.vcxproj.filters b/Common/Common.vcxproj.filters index d775f3f937..b91f95181d 100644 --- a/Common/Common.vcxproj.filters +++ b/Common/Common.vcxproj.filters @@ -1086,7 +1086,7 @@ ext\at3_standalone - + ext\at3_standalone diff --git a/ext/at3_standalone/atrac3.c b/ext/at3_standalone/atrac3.c index 630bc59dd3..feda479215 100644 --- a/ext/at3_standalone/atrac3.c +++ b/ext/at3_standalone/atrac3.c @@ -106,7 +106,6 @@ typedef struct ATRAC3Context { AtracGCContext gainc_ctx; FFTContext mdct_ctx; - AVFloatDSPContext *fdsp; } ATRAC3Context; static DECLARE_ALIGNED(32, float, mdct_window)[MDCT_SIZE]; @@ -139,7 +138,7 @@ static void imlt(ATRAC3Context *q, float *input, float *output, int odd_band) q->mdct_ctx.imdct_calc(&q->mdct_ctx, output, input); /* Perform windowing on the output. */ - q->fdsp->vector_fmul(output, output, mdct_window, MDCT_SIZE); + vector_fmul(output, output, mdct_window, MDCT_SIZE); } /* @@ -189,7 +188,6 @@ static int atrac3_decode_close(AVCodecContext *avctx) av_freep(&q->units); av_freep(&q->decoded_bytes_buffer); - av_freep(&q->fdsp); ff_mdct_end(&q->mdct_ctx); @@ -906,10 +904,9 @@ static int atrac3_decode_init(AVCodecContext *avctx) } ff_atrac_init_gain_compensation(&q->gainc_ctx, 4, 3); - q->fdsp = avpriv_float_dsp_alloc(avctx->flags & AV_CODEC_FLAG_BITEXACT); q->units = av_mallocz_array(avctx->channels, sizeof(*q->units)); - if (!q->units || !q->fdsp) { + if (!q->units) { atrac3_decode_close(avctx); return AVERROR(ENOMEM); } diff --git a/ext/at3_standalone/atrac3plus.h b/ext/at3_standalone/atrac3plus.h index 8eae592f3b..23f1ff2cee 100644 --- a/ext/at3_standalone/atrac3plus.h +++ b/ext/at3_standalone/atrac3plus.h @@ -192,8 +192,7 @@ void ff_atrac3p_init_wave_synth(void); * @param[in] sb which subband to process * @param[out] out receives processed data */ -void ff_atrac3p_generate_tones(Atrac3pChanUnitCtx *ch_unit, AVFloatDSPContext *fdsp, - int ch_num, int sb, float *out); +void ff_atrac3p_generate_tones(Atrac3pChanUnitCtx *ch_unit, int ch_num, int sb, float *out); /** * Perform power compensation aka noise dithering. @@ -218,7 +217,7 @@ void ff_atrac3p_power_compensation(Atrac3pChanUnitCtx *ctx, int ch_index, * @param[in] wind_id which MDCT window to apply * @param[in] sb subband number */ -void ff_atrac3p_imdct(AVFloatDSPContext *fdsp, FFTContext *mdct_ctx, float *pIn, +void ff_atrac3p_imdct(FFTContext *mdct_ctx, float *pIn, float *pOut, int wind_id, int sb); /** diff --git a/ext/at3_standalone/atrac3plusdec.c b/ext/at3_standalone/atrac3plusdec.c index e82bcab8ba..cf8b376409 100644 --- a/ext/at3_standalone/atrac3plusdec.c +++ b/ext/at3_standalone/atrac3plusdec.c @@ -47,7 +47,6 @@ typedef struct ATRAC3PContext { GetBitContext gb; - AVFloatDSPContext *fdsp; DECLARE_ALIGNED(32, float, samples)[2][ATRAC3P_FRAME_SAMPLES]; ///< quantized MDCT spectrum DECLARE_ALIGNED(32, float, mdct_buf)[2][ATRAC3P_FRAME_SAMPLES]; ///< output of the IMDCT @@ -70,7 +69,6 @@ int atrac3p_decode_close(AVCodecContext *avctx) ATRAC3PContext *ctx = avctx->priv_data; av_freep(&ctx->ch_units); - av_freep(&ctx->fdsp); ff_mdct_end(&ctx->mdct_ctx); ff_mdct_end(&ctx->ipqf_dct_ctx); @@ -171,9 +169,8 @@ int atrac3p_decode_init(AVCodecContext *avctx) ctx->my_channel_layout = avctx->channel_layout; ctx->ch_units = av_mallocz_array(ctx->num_channel_blocks, sizeof(*ctx->ch_units)); - ctx->fdsp = avpriv_float_dsp_alloc(avctx->flags & AV_CODEC_FLAG_BITEXACT); - if (!ctx->ch_units || !ctx->fdsp) { + if (!ctx->ch_units) { atrac3p_decode_close(avctx); return AVERROR(ENOMEM); } @@ -268,7 +265,7 @@ static void reconstruct_frame(ATRAC3PContext *ctx, Atrac3pChanUnitCtx *ch_unit, for (ch = 0; ch < num_channels; ch++) { for (sb = 0; sb < ch_unit->num_subbands; sb++) { /* inverse transform and windowing */ - ff_atrac3p_imdct(ctx->fdsp, &ctx->mdct_ctx, + ff_atrac3p_imdct(&ctx->mdct_ctx, &ctx->samples[ch][sb * ATRAC3P_SUBBAND_SAMPLES], &ctx->mdct_buf[ch][sb * ATRAC3P_SUBBAND_SAMPLES], (ch_unit->channels[ch].wnd_shape_prev[sb] << 1) + @@ -302,7 +299,7 @@ static void reconstruct_frame(ATRAC3PContext *ctx, Atrac3pChanUnitCtx *ch_unit, for (sb = 0; sb < ch_unit->num_subbands; sb++) if (ch_unit->channels[ch].tones_info[sb].num_wavs || ch_unit->channels[ch].tones_info_prev[sb].num_wavs) { - ff_atrac3p_generate_tones(ch_unit, ctx->fdsp, ch, sb, + ff_atrac3p_generate_tones(ch_unit, ch, sb, &ctx->time_buf[ch][sb * 128]); } } diff --git a/ext/at3_standalone/atrac3plusdsp.c b/ext/at3_standalone/atrac3plusdsp.c index 399bbdc17e..d98775b94a 100644 --- a/ext/at3_standalone/atrac3plusdsp.c +++ b/ext/at3_standalone/atrac3plusdsp.c @@ -117,7 +117,6 @@ void ff_atrac3p_init_wave_synth(void) * @param[in] synth_param ptr to common synthesis parameters * @param[in] waves_info parameters for each sine wave * @param[in] envelope envelope data for all waves in a group - * @param[in] fdsp ptr to floating-point DSP context * @param[in] invert_phase flag indicating 180° phase shift * @param[in] reg_offset region offset for trimming envelope data * @param[out] out receives sythesized data @@ -125,7 +124,6 @@ void ff_atrac3p_init_wave_synth(void) static void waves_synth(Atrac3pWaveSynthParams *synth_param, Atrac3pWavesData *waves_info, Atrac3pWaveEnvelope *envelope, - AVFloatDSPContext *fdsp, int invert_phase, int reg_offset, float *out) { int i, wn, inc, pos; @@ -151,7 +149,7 @@ static void waves_synth(Atrac3pWaveSynthParams *synth_param, /* invert phase if requested */ if (invert_phase) - fdsp->vector_fmul_scalar(out, out, -1.0f, 128); + vector_fmul_scalar(out, out, -1.0f, 128); /* fade in with steep Hann window if requested */ if (envelope->has_start_point) { @@ -181,8 +179,7 @@ static void waves_synth(Atrac3pWaveSynthParams *synth_param, } } -void ff_atrac3p_generate_tones(Atrac3pChanUnitCtx *ch_unit, AVFloatDSPContext *fdsp, - int ch_num, int sb, float *out) +void ff_atrac3p_generate_tones(Atrac3pChanUnitCtx *ch_unit, int ch_num, int sb, float *out) { DECLARE_ALIGNED(32, float, wavreg1)[128] = { 0 }; DECLARE_ALIGNED(32, float, wavreg2)[128] = { 0 }; @@ -223,24 +220,24 @@ void ff_atrac3p_generate_tones(Atrac3pChanUnitCtx *ch_unit, AVFloatDSPContext *f /* synthesize waves for both overlapping regions */ if (tones_now->num_wavs && reg1_env_nonzero) waves_synth(ch_unit->waves_info_prev, tones_now, &tones_now->curr_env, - fdsp, ch_unit->waves_info_prev->invert_phase[sb] & ch_num, + ch_unit->waves_info_prev->invert_phase[sb] & ch_num, 128, wavreg1); if (tones_next->num_wavs && reg2_env_nonzero) - waves_synth(ch_unit->waves_info, tones_next, &tones_next->curr_env, fdsp, + waves_synth(ch_unit->waves_info, tones_next, &tones_next->curr_env, ch_unit->waves_info->invert_phase[sb] & ch_num, 0, wavreg2); /* Hann windowing for non-faded wave signals */ if (tones_now->num_wavs && tones_next->num_wavs && reg1_env_nonzero && reg2_env_nonzero) { - fdsp->vector_fmul(wavreg1, wavreg1, &hann_window[128], 128); - fdsp->vector_fmul(wavreg2, wavreg2, hann_window, 128); + vector_fmul(wavreg1, wavreg1, &hann_window[128], 128); + vector_fmul(wavreg2, wavreg2, hann_window, 128); } else { if (tones_now->num_wavs && !tones_now->curr_env.has_stop_point) - fdsp->vector_fmul(wavreg1, wavreg1, &hann_window[128], 128); + vector_fmul(wavreg1, wavreg1, &hann_window[128], 128); if (tones_next->num_wavs && !tones_next->curr_env.has_start_point) - fdsp->vector_fmul(wavreg2, wavreg2, hann_window, 128); + vector_fmul(wavreg2, wavreg2, hann_window, 128); } /* Overlap and add to residual */ @@ -461,7 +458,7 @@ void ff_atrac3p_power_compensation(Atrac3pChanUnitCtx *ctx, int ch_index, } } -void ff_atrac3p_imdct(AVFloatDSPContext *fdsp, FFTContext *mdct_ctx, float *pIn, +void ff_atrac3p_imdct(FFTContext *mdct_ctx, float *pIn, float *pOut, int wind_id, int sb) { int i; @@ -480,16 +477,15 @@ void ff_atrac3p_imdct(AVFloatDSPContext *fdsp, FFTContext *mdct_ctx, float *pIn, * Both regions are 32 samples long. */ if (wind_id & 2) { /* 1st half: steep window */ memset(pOut, 0, sizeof(float) * 32); - fdsp->vector_fmul(&pOut[32], &pOut[32], ff_sine_64, 64); + vector_fmul(&pOut[32], &pOut[32], ff_sine_64, 64); } else /* 1st half: simple sine window */ - fdsp->vector_fmul(pOut, pOut, ff_sine_128, ATRAC3P_MDCT_SIZE / 2); + vector_fmul(pOut, pOut, ff_sine_128, ATRAC3P_MDCT_SIZE / 2); if (wind_id & 1) { /* 2nd half: steep window */ - fdsp->vector_fmul_reverse(&pOut[160], &pOut[160], ff_sine_64, 64); + vector_fmul_reverse(&pOut[160], &pOut[160], ff_sine_64, 64); memset(&pOut[224], 0, sizeof(float) * 32); } else /* 2nd half: simple sine window */ - fdsp->vector_fmul_reverse(&pOut[128], &pOut[128], ff_sine_128, - ATRAC3P_MDCT_SIZE / 2); + vector_fmul_reverse(&pOut[128], &pOut[128], ff_sine_128, ATRAC3P_MDCT_SIZE / 2); } /* lookup table for fast modulo 23 op required for cyclic buffers of the IPQF */ diff --git a/ext/at3_standalone/float_dsp.c b/ext/at3_standalone/float_dsp.c index b1e59ec837..91e78e03e7 100644 --- a/ext/at3_standalone/float_dsp.c +++ b/ext/at3_standalone/float_dsp.c @@ -23,100 +23,27 @@ #include "float_dsp.h" #include "mem.h" -static void vector_fmul_c(float *dst, const float *src0, const float *src1, - int len) -{ +void vector_fmul(float *dst, const float *src0, const float *src1, int len) { int i; for (i = 0; i < len; i++) dst[i] = src0[i] * src1[i]; } -static void vector_fmac_scalar_c(float *dst, const float *src, float mul, - int len) -{ - int i; - for (i = 0; i < len; i++) - dst[i] += src[i] * mul; -} - -static void vector_fmul_scalar_c(float *dst, const float *src, float mul, - int len) -{ +void vector_fmul_scalar(float *dst, const float *src, float mul, int len) { int i; for (i = 0; i < len; i++) dst[i] = src[i] * mul; } -static void vector_dmul_scalar_c(double *dst, const double *src, double mul, - int len) -{ +void vector_fmul_add(float *dst, const float *src0, const float *src1, const float *src2, int len) { int i; - for (i = 0; i < len; i++) - dst[i] = src[i] * mul; -} - -static void vector_fmul_window_c(float *dst, const float *src0, - const float *src1, const float *win, int len) -{ - int i, j; - - dst += len; - win += len; - src0 += len; - - for (i = -len, j = len - 1; i < 0; i++, j--) { - float s0 = src0[i]; - float s1 = src1[j]; - float wi = win[i]; - float wj = win[j]; - dst[i] = s0 * wj - s1 * wi; - dst[j] = s0 * wi + s1 * wj; - } -} - -static void vector_fmul_add_c(float *dst, const float *src0, const float *src1, - const float *src2, int len){ - int i; - for (i = 0; i < len; i++) dst[i] = src0[i] * src1[i] + src2[i]; } -static void vector_fmul_reverse_c(float *dst, const float *src0, - const float *src1, int len) -{ +void vector_fmul_reverse(float *dst, const float *src0, const float *src1, int len) { int i; - src1 += len-1; for (i = 0; i < len; i++) dst[i] = src0[i] * src1[-i]; } - -AVFloatDSPContext *avpriv_float_dsp_alloc(int bit_exact) -{ - AVFloatDSPContext *fdsp = av_mallocz(sizeof(AVFloatDSPContext)); - if (!fdsp) - return NULL; - - fdsp->vector_fmul = vector_fmul_c; - fdsp->vector_fmac_scalar = vector_fmac_scalar_c; - fdsp->vector_fmul_scalar = vector_fmul_scalar_c; - fdsp->vector_dmul_scalar = vector_dmul_scalar_c; - fdsp->vector_fmul_window = vector_fmul_window_c; - fdsp->vector_fmul_add = vector_fmul_add_c; - fdsp->vector_fmul_reverse = vector_fmul_reverse_c; - - /* - if (ARCH_AARCH64) - ff_float_dsp_init_aarch64(fdsp); - if (ARCH_ARM) - ff_float_dsp_init_arm(fdsp); - if (ARCH_PPC) - ff_float_dsp_init_ppc(fdsp, bit_exact); - if (ARCH_X86) - ff_float_dsp_init_x86(fdsp); - if (ARCH_MIPS) - ff_float_dsp_init_mips(fdsp); - */ - return fdsp; -} diff --git a/ext/at3_standalone/float_dsp.h b/ext/at3_standalone/float_dsp.h index b2b433a6f7..9379c7a7d1 100644 --- a/ext/at3_standalone/float_dsp.h +++ b/ext/at3_standalone/float_dsp.h @@ -16,149 +16,45 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVUTIL_FLOAT_DSP_H -#define AVUTIL_FLOAT_DSP_H +#pragma once -typedef struct AVFloatDSPContext { - /** - * Calculate the entry wise product of two vectors of floats and store the result in - * a vector of floats. - * - * @param dst output vector - * constraints: 32-byte aligned - * @param src0 first input vector - * constraints: 32-byte aligned - * @param src1 second input vector - * constraints: 32-byte aligned - * @param len number of elements in the input - * constraints: multiple of 16 - */ - void (*vector_fmul)(float *dst, const float *src0, const float *src1, - int len); - - /** - * Multiply a vector of floats by a scalar float and add to - * destination vector. Source and destination vectors must - * overlap exactly or not at all. - * - * @param dst result vector - * constraints: 32-byte aligned - * @param src input vector - * constraints: 32-byte aligned - * @param mul scalar value - * @param len length of vector - * constraints: multiple of 16 - */ - void (*vector_fmac_scalar)(float *dst, const float *src, float mul, - int len); - - /** - * Multiply a vector of floats by a scalar float. Source and - * destination vectors must overlap exactly or not at all. - * - * @param dst result vector - * constraints: 16-byte aligned - * @param src input vector - * constraints: 16-byte aligned - * @param mul scalar value - * @param len length of vector - * constraints: multiple of 4 - */ - void (*vector_fmul_scalar)(float *dst, const float *src, float mul, - int len); - - /** - * Multiply a vector of double by a scalar double. Source and - * destination vectors must overlap exactly or not at all. - * - * @param dst result vector - * constraints: 32-byte aligned - * @param src input vector - * constraints: 32-byte aligned - * @param mul scalar value - * @param len length of vector - * constraints: multiple of 8 - */ - void (*vector_dmul_scalar)(double *dst, const double *src, double mul, - int len); - - /** - * Overlap/add with window function. - * Used primarily by MDCT-based audio codecs. - * Source and destination vectors must overlap exactly or not at all. - * - * @param dst result vector - * constraints: 16-byte aligned - * @param src0 first source vector - * constraints: 16-byte aligned - * @param src1 second source vector - * constraints: 16-byte aligned - * @param win half-window vector - * constraints: 16-byte aligned - * @param len length of vector - * constraints: multiple of 4 - */ - void (*vector_fmul_window)(float *dst, const float *src0, - const float *src1, const float *win, int len); - - /** - * Calculate the entry wise product of two vectors of floats, add a third vector of - * floats and store the result in a vector of floats. - * - * @param dst output vector - * constraints: 32-byte aligned - * @param src0 first input vector - * constraints: 32-byte aligned - * @param src1 second input vector - * constraints: 32-byte aligned - * @param src2 third input vector - * constraints: 32-byte aligned - * @param len number of elements in the input - * constraints: multiple of 16 - */ - void (*vector_fmul_add)(float *dst, const float *src0, const float *src1, - const float *src2, int len); - - /** - * Calculate the entry wise product of two vectors of floats, and store the result - * in a vector of floats. The second vector of floats is iterated over - * in reverse order. - * - * @param dst output vector - * constraints: 32-byte aligned - * @param src0 first input vector - * constraints: 32-byte aligned - * @param src1 second input vector - * constraints: 32-byte aligned - * @param len number of elements in the input - * constraints: multiple of 16 - */ - void (*vector_fmul_reverse)(float *dst, const float *src0, - const float *src1, int len); -} AVFloatDSPContext; +void vector_fmul(float *dst, const float *src0, const float *src1, int len); /** - * Return the scalar product of two vectors. - * - * @param v1 first input vector - * @param v2 first input vector - * @param len number of elements - * - * @return sum of elementwise products - */ -float avpriv_scalarproduct_float_c(const float *v1, const float *v2, int len); - -void ff_float_dsp_init_aarch64(AVFloatDSPContext *fdsp); -void ff_float_dsp_init_arm(AVFloatDSPContext *fdsp); -void ff_float_dsp_init_ppc(AVFloatDSPContext *fdsp, int strict); -void ff_float_dsp_init_x86(AVFloatDSPContext *fdsp); -void ff_float_dsp_init_mips(AVFloatDSPContext *fdsp); + * Multiply a vector of floats by a scalar float. Source and + * destination vectors must overlap exactly or not at all. + */ +void vector_fmul_scalar(float *dst, const float *src, float mul, int len); /** - * Allocate a float DSP context. - * - * @param strict setting to non-zero avoids using functions which may not be IEEE-754 compliant - */ -AVFloatDSPContext *avpriv_float_dsp_alloc(int strict); + * Calculate the entry wise product of two vectors of floats, add a third vector of + * floats and store the result in a vector of floats. + * + * @param dst output vector + * constraints: 32-byte aligned + * @param src0 first input vector + * constraints: 32-byte aligned + * @param src1 second input vector + * constraints: 32-byte aligned + * @param src2 third input vector + * constraints: 32-byte aligned + * @param len number of elements in the input + * constraints: multiple of 16 + */ +void vector_fmul_add(float *dst, const float *src0, const float *src1, const float *src2, int len); -#endif /* AVUTIL_FLOAT_DSP_H */ +/** + * Calculate the entry wise product of two vectors of floats, and store the result + * in a vector of floats. The second vector of floats is iterated over + * in reverse order. + * + * @param dst output vector + * constraints: 32-byte aligned + * @param src0 first input vector + * constraints: 32-byte aligned + * @param src1 second input vector + * constraints: 32-byte aligned + * @param len number of elements in the input + * constraints: multiple of 16 + */ +void vector_fmul_reverse(float *dst, const float *src0, const float *src1, int len); diff --git a/ext/at3_standalone/bitstream.c b/ext/at3_standalone/get_bits.c similarity index 100% rename from ext/at3_standalone/bitstream.c rename to ext/at3_standalone/get_bits.c From bbb563cc820725dedfa5dcb86006e74d3fd35cf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Thu, 11 Apr 2024 09:42:09 +0200 Subject: [PATCH 080/719] More header cleanup --- Common/Common.vcxproj | 3 - Common/Common.vcxproj.filters | 9 -- ext/at3_standalone/atrac3.c | 4 +- ext/at3_standalone/atrac3plus.c | 1 + ext/at3_standalone/atrac3plusdec.c | 2 +- ext/at3_standalone/avcodec.c | 2 +- ext/at3_standalone/avutil.h | 141 ---------------------------- ext/at3_standalone/bytestream.h | 10 +- ext/at3_standalone/channel_layout.c | 4 +- ext/at3_standalone/common.h | 136 --------------------------- ext/at3_standalone/compat.c | 2 +- ext/at3_standalone/compat.h | 36 +++++++ ext/at3_standalone/get_bits.c | 2 +- ext/at3_standalone/get_bits.h | 3 +- ext/at3_standalone/intmath.c | 15 --- ext/at3_standalone/intmath.h | 15 +-- ext/at3_standalone/log.h | 1 - ext/at3_standalone/mathematics.c | 2 +- ext/at3_standalone/mathematics.h | 72 ++++++++------ ext/at3_standalone/mem.c | 2 - ext/at3_standalone/mem.h | 27 +----- ext/at3_standalone/sinewin.c | 1 - 22 files changed, 101 insertions(+), 389 deletions(-) delete mode 100644 ext/at3_standalone/avutil.h delete mode 100644 ext/at3_standalone/common.h diff --git a/Common/Common.vcxproj b/Common/Common.vcxproj index f49ee5ad16..51862eb690 100644 --- a/Common/Common.vcxproj +++ b/Common/Common.vcxproj @@ -391,10 +391,8 @@ - - @@ -615,7 +613,6 @@ - diff --git a/Common/Common.vcxproj.filters b/Common/Common.vcxproj.filters index b91f95181d..8f29b89bd7 100644 --- a/Common/Common.vcxproj.filters +++ b/Common/Common.vcxproj.filters @@ -554,9 +554,6 @@ ext\at3_standalone - - ext\at3_standalone - ext\at3_standalone @@ -584,9 +581,6 @@ ext\at3_standalone - - ext\at3_standalone - @@ -1083,9 +1077,6 @@ ext\at3_standalone - - ext\at3_standalone - ext\at3_standalone diff --git a/ext/at3_standalone/atrac3.c b/ext/at3_standalone/atrac3.c index feda479215..4baaeda1fa 100644 --- a/ext/at3_standalone/atrac3.c +++ b/ext/at3_standalone/atrac3.c @@ -40,13 +40,15 @@ #include "float_dsp.h" #include "bytestream.h" #include "fft.h" -#include "common.h" +#include "compat.h" #include "get_bits.h" #include "avcodec.h" #include "atrac.h" #include "atrac3data.h" +#define FFALIGN(x, a) (((x)+(a)-1)&~((a)-1)) + #define JOINT_STEREO 0x12 #define STEREO 0x2 diff --git a/ext/at3_standalone/atrac3plus.c b/ext/at3_standalone/atrac3plus.c index ec4ac42be1..4551517541 100644 --- a/ext/at3_standalone/atrac3plus.c +++ b/ext/at3_standalone/atrac3plus.c @@ -29,6 +29,7 @@ #include //#include "avcodec.h" +#include "intmath.h" #include "get_bits.h" #include "atrac3plus.h" #include "atrac3plus_data.h" diff --git a/ext/at3_standalone/atrac3plusdec.c b/ext/at3_standalone/atrac3plusdec.c index cf8b376409..4216cb9f9b 100644 --- a/ext/at3_standalone/atrac3plusdec.c +++ b/ext/at3_standalone/atrac3plusdec.c @@ -41,7 +41,7 @@ #include "float_dsp.h" #include "avcodec.h" #include "get_bits.h" -#include "common.h" +#include "compat.h" #include "atrac.h" #include "atrac3plus.h" diff --git a/ext/at3_standalone/avcodec.c b/ext/at3_standalone/avcodec.c index 1956a1f360..01e3f53037 100644 --- a/ext/at3_standalone/avcodec.c +++ b/ext/at3_standalone/avcodec.c @@ -27,7 +27,7 @@ #include "avcodec.h" #include "compat.h" #include "channel_layout.h" -#include "common.h" +#include "compat.h" #include "mathematics.h" #include "avcodec.h" #include "bytestream.h" diff --git a/ext/at3_standalone/avutil.h b/ext/at3_standalone/avutil.h deleted file mode 100644 index 92a281532e..0000000000 --- a/ext/at3_standalone/avutil.h +++ /dev/null @@ -1,141 +0,0 @@ -/* - * copyright (c) 2006 Michael Niedermayer - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef AVUTIL_AVUTIL_H -#define AVUTIL_AVUTIL_H - -/** - * @file - * external API header - */ - -/** - * @mainpage - * - * @section ffmpeg_intro Introduction - * - * This document describes the usage of the different libraries - * provided by FFmpeg. - * - * @li @ref libavc "libavcodec" encoding/decoding library - * @li @ref lavfi "libavfilter" graph-based frame editing library - * @li @ref libavf "libavformat" I/O and muxing/demuxing library - * @li @ref lavd "libavdevice" special devices muxing/demuxing library - * @li @ref lavu "libavutil" common utility library - * @li @ref lswr "libswresample" audio resampling, format conversion and mixing - * @li @ref lpp "libpostproc" post processing library - * @li @ref libsws "libswscale" color conversion and scaling library - * - * @section ffmpeg_versioning Versioning and compatibility - * - * Each of the FFmpeg libraries contains a version.h header, which defines a - * major, minor and micro version number with the - * LIBRARYNAME_VERSION_{MAJOR,MINOR,MICRO} macros. The major version - * number is incremented with backward incompatible changes - e.g. removing - * parts of the public API, reordering public struct members, etc. The minor - * version number is incremented for backward compatible API changes or major - * new features - e.g. adding a new public function or a new decoder. The micro - * version number is incremented for smaller changes that a calling program - * might still want to check for - e.g. changing behavior in a previously - * unspecified situation. - * - * FFmpeg guarantees backward API and ABI compatibility for each library as long - * as its major version number is unchanged. This means that no public symbols - * will be removed or renamed. Types and names of the public struct members and - * values of public macros and enums will remain the same (unless they were - * explicitly declared as not part of the public API). Documented behavior will - * not change. - * - * In other words, any correct program that works with a given FFmpeg snapshot - * should work just as well without any changes with any later snapshot with the - * same major versions. This applies to both rebuilding the program against new - * FFmpeg versions or to replacing the dynamic FFmpeg libraries that a program - * links against. - * - * However, new public symbols may be added and new members may be appended to - * public structs whose size is not part of public ABI (most public structs in - * FFmpeg). New macros and enum values may be added. Behavior in undocumented - * situations may change slightly (and be documented). All those are accompanied - * by an entry in doc/APIchanges and incrementing either the minor or micro - * version number. - */ - - -/** - * @brief Undefined timestamp value - * - * Usually reported by demuxer that work on containers that do not provide - * either pts or dts. - */ - -#define AV_NOPTS_VALUE ((int64_t)UINT64_C(0x8000000000000000)) - -/** - * Internal time base represented as integer - */ - -#define AV_TIME_BASE 1000000 - -/** - * Internal time base represented as fractional value - */ - -#define AV_TIME_BASE_Q (AVRational){1, AV_TIME_BASE} - -/** - * @} - */ - -/** - * Return x default pointer in case p is NULL. - */ -static inline void *av_x_if_null(const void *p, const void *x) -{ - return (void *)(intptr_t)(p ? p : x); -} - -/** - * Compute the length of an integer list. - * - * @param elsize size in bytes of each list element (only 1, 2, 4 or 8) - * @param term list terminator (usually 0 or -1) - * @param list pointer to the list - * @return length of the list, in elements, not counting the terminator - */ -unsigned av_int_list_length_for_size(unsigned elsize, - const void *list, uint64_t term); - -/** - * Compute the length of an integer list. - * - * @param term list terminator (usually 0 or -1) - * @param list pointer to the list - * @return length of the list, in elements, not counting the terminator - */ -#define av_int_list_length(list, term) \ - av_int_list_length_for_size(sizeof(*(list)), list, term) - - -/** - * @} - * @} - */ - -#endif /* AVUTIL_AVUTIL_H */ diff --git a/ext/at3_standalone/bytestream.h b/ext/at3_standalone/bytestream.h index bf55307c74..c1c3348379 100644 --- a/ext/at3_standalone/bytestream.h +++ b/ext/at3_standalone/bytestream.h @@ -26,7 +26,7 @@ #include #include -#include "common.h" +#include "compat.h" #include "intreadwrite.h" typedef struct GetByteContext { @@ -34,16 +34,16 @@ typedef struct GetByteContext { } GetByteContext; #define DEF(type, name, bytes, read, write) \ -static av_always_inline type bytestream_get_ ## name(const uint8_t **b) \ +static inline type bytestream_get_ ## name(const uint8_t **b) \ { \ (*b) += bytes; \ return read(*b - bytes); \ } \ -static av_always_inline type bytestream2_get_ ## name ## u(GetByteContext *g) \ +static inline type bytestream2_get_ ## name ## u(GetByteContext *g) \ { \ return bytestream_get_ ## name(&g->buffer); \ } \ -static av_always_inline type bytestream2_get_ ## name(GetByteContext *g) \ +static inline type bytestream2_get_ ## name(GetByteContext *g) \ { \ if (g->buffer_end - g->buffer < bytes) { \ g->buffer = g->buffer_end; \ @@ -51,7 +51,7 @@ static av_always_inline type bytestream2_get_ ## name(GetByteContext *g) \ } \ return bytestream2_get_ ## name ## u(g); \ } \ -static av_always_inline type bytestream2_peek_ ## name(GetByteContext *g) \ +static inline type bytestream2_peek_ ## name(GetByteContext *g) \ { \ if (g->buffer_end - g->buffer < bytes) \ return 0; \ diff --git a/ext/at3_standalone/channel_layout.c b/ext/at3_standalone/channel_layout.c index 47fee23733..e925e89c6c 100644 --- a/ext/at3_standalone/channel_layout.c +++ b/ext/at3_standalone/channel_layout.c @@ -27,9 +27,9 @@ #include #include -#include "avutil.h" #include "channel_layout.h" -#include "common.h" +#include "compat.h" +#include "mathematics.h" struct channel_name { const char *name; diff --git a/ext/at3_standalone/common.h b/ext/at3_standalone/common.h deleted file mode 100644 index f1a4bd9d52..0000000000 --- a/ext/at3_standalone/common.h +++ /dev/null @@ -1,136 +0,0 @@ -/* - * copyright (c) 2006 Michael Niedermayer - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/** - * @file - * common internal and external API header - */ - -#ifndef AVUTIL_COMMON_H -#define AVUTIL_COMMON_H - -#if defined(__cplusplus) && !defined(__STDC_CONSTANT_MACROS) && !defined(UINT64_C) -#error missing -D__STDC_CONSTANT_MACROS / #define __STDC_CONSTANT_MACROS -#endif - -#include -#include -#include - -#include "compat.h" -#include "mem.h" - -//rounded division & shift -#define RSHIFT(a,b) ((a) > 0 ? ((a) + ((1<<(b))>>1))>>(b) : ((a) + ((1<<(b))>>1)-1)>>(b)) - -#define FFUDIV(a,b) (((a)>0 ?(a):(a)-(b)+1) / (b)) -#define FFUMOD(a,b) ((a)-(b)*FFUDIV(a,b)) - -#define FF_SANE_NB_CHANNELS 64U - -/** - * @addtogroup preproc_misc Preprocessor String Macros - * - * String manipulation macros - * - * @{ - */ - -#define AV_STRINGIFY(s) AV_TOSTRING(s) -#define AV_TOSTRING(s) #s - -#define AV_GLUE(a, b) a ## b -#define AV_JOIN(a, b) AV_GLUE(a, b) - - /** - * @} - */ - -#define AV_PRAGMA(s) _Pragma(#s) - -#define FFALIGN(x, a) (((x)+(a)-1)&~((a)-1)) - -/** - * Maximum size in bytes of extradata. - * This value was chosen such that every bit of the buffer is - * addressable by a 32-bit signed integer as used by get_bits. - */ -#define FF_MAX_EXTRADATA_SIZE ((1 << 28) - AV_INPUT_BUFFER_PADDING_SIZE) - -/** - * Absolute value, Note, INT_MIN / INT64_MIN result in undefined behavior as they - * are not representable as absolute values of their type. This is the same - * as with *abs() - * @see FFNABS() - */ -#define FFABS(a) ((a) >= 0 ? (a) : (-(a))) - -#define FFMAX(a,b) ((a) > (b) ? (a) : (b)) -#define FFMIN(a,b) ((a) > (b) ? (b) : (a)) - -#define FFSWAP(type,a,b) do{type SWAP_tmp= b; b= a; a= SWAP_tmp;}while(0) -#define FF_ARRAY_ELEMS(a) (sizeof(a) / sizeof((a)[0])) - -#ifndef av_log2 -av_const int av_log2(unsigned v); -#endif - -#ifndef av_log2_16bit -av_const int av_log2_16bit(unsigned v); -#endif - -/** - * Clear high bits from an unsigned integer starting with specific bit position - * @param a value to clip - * @param p bit position to clip at - * @return clipped value - */ -static av_always_inline av_const unsigned av_mod_uintp2(unsigned a, unsigned p) -{ - return a & ((1 << p) - 1); -} - -/** - * Count number of bits set to one in x - * @param x value to count bits of - * @return the number of bits set to one in x - */ -static av_always_inline av_const int av_popcount(uint32_t x) -{ - x -= (x >> 1) & 0x55555555; - x = (x & 0x33333333) + ((x >> 2) & 0x33333333); - x = (x + (x >> 4)) & 0x0F0F0F0F; - x += x >> 8; - return (x + (x >> 16)) & 0x3F; -} - -/** - * Count number of bits set to one in x - * @param x value to count bits of - * @return the number of bits set to one in x - */ -static av_always_inline av_const int av_popcount64(uint64_t x) -{ - return av_popcount((uint32_t)x) + av_popcount((uint32_t)(x >> 32)); -} - -#define MKTAG(a,b,c,d) ((a) | ((b) << 8) | ((c) << 16) | ((unsigned)(d) << 24)) - -#endif /* AVUTIL_COMMON_H */ diff --git a/ext/at3_standalone/compat.c b/ext/at3_standalone/compat.c index 80dfc9a566..a1b0ba4d2d 100644 --- a/ext/at3_standalone/compat.c +++ b/ext/at3_standalone/compat.c @@ -1,8 +1,8 @@ #include #include +#include #include "ext/at3_standalone/compat.h" -#include "ext/at3_standalone/common.h" void av_log(void *avcl, int level, const char *fmt, ...) { diff --git a/ext/at3_standalone/compat.h b/ext/at3_standalone/compat.h index 4bc4ac9b06..fb8d4d8798 100644 --- a/ext/at3_standalone/compat.h +++ b/ext/at3_standalone/compat.h @@ -37,6 +37,9 @@ #define av_printf_format(a,b) #define avpriv_report_missing_feature(...) +#define AV_NOPTS_VALUE ((int64_t)UINT64_C(0x8000000000000000)) +#define AV_TIME_BASE 1000000 +#define AV_TIME_BASE_Q (AVRational){1, AV_TIME_BASE} #define AVERROR(e) (-(e)) ///< Returns a negative error code from a POSIX error code, to return from library functions. #define AVUNERROR(e) (-(e)) ///< Returns a POSIX error code from a library function error return value. @@ -46,6 +49,39 @@ #define AVERROR_INVALIDDATA FFERRTAG( 'I','N','D','A') ///< Invalid data found when processing input #define AVERROR_PATCHWELCOME FFERRTAG( 'P','A','W','E') ///< Not yet implemented in FFmpeg, patches welcome +#define FF_SANE_NB_CHANNELS 64U + +/** + * Maximum size in bytes of extradata. + * This value was chosen such that every bit of the buffer is + * addressable by a 32-bit signed integer as used by get_bits. + */ +#define FF_MAX_EXTRADATA_SIZE ((1 << 28) - AV_INPUT_BUFFER_PADDING_SIZE) + + /** + * Absolute value, Note, INT_MIN / INT64_MIN result in undefined behavior as they + * are not representable as absolute values of their type. This is the same + * as with *abs() + * @see FFNABS() + */ +#define FFABS(a) ((a) >= 0 ? (a) : (-(a))) + +#define FFMAX(a,b) ((a) > (b) ? (a) : (b)) +#define FFMIN(a,b) ((a) > (b) ? (b) : (a)) + +#define FFSWAP(type,a,b) do{type SWAP_tmp= b; b= a; a= SWAP_tmp;}while(0) +#define FF_ARRAY_ELEMS(a) (sizeof(a) / sizeof((a)[0])) + +#ifndef av_log2 +av_const int av_log2(unsigned v); +#endif + +#ifndef av_log2_16bit +av_const int av_log2_16bit(unsigned v); +#endif + +#define MKTAG(a,b,c,d) ((a) | ((b) << 8) | ((c) << 16) | ((unsigned)(d) << 24)) + #pragma warning(disable:4305) #pragma warning(disable:4244) diff --git a/ext/at3_standalone/get_bits.c b/ext/at3_standalone/get_bits.c index 2bd610ce0d..40edf40d26 100644 --- a/ext/at3_standalone/get_bits.c +++ b/ext/at3_standalone/get_bits.c @@ -32,7 +32,7 @@ #include #include "avcodec.h" -#include "common.h" +#include "compat.h" #include "mathematics.h" #include "get_bits.h" diff --git a/ext/at3_standalone/get_bits.h b/ext/at3_standalone/get_bits.h index fed83fbb68..f7eab05f1a 100644 --- a/ext/at3_standalone/get_bits.h +++ b/ext/at3_standalone/get_bits.h @@ -28,8 +28,7 @@ #include -#include "common.h" -#include "common.h" +#include "compat.h" #include "intreadwrite.h" #include "mathematics.h" /* diff --git a/ext/at3_standalone/intmath.c b/ext/at3_standalone/intmath.c index b0c00e1cad..ca9521f987 100644 --- a/ext/at3_standalone/intmath.c +++ b/ext/at3_standalone/intmath.c @@ -17,18 +17,3 @@ */ #include "intmath.h" - -/* undef these to get the function prototypes from common.h */ -#undef av_log2 -#undef av_log2_16bit -#include "common.h" - -int av_log2(unsigned v) -{ - return ff_log2(v); -} - -int av_log2_16bit(unsigned v) -{ - return ff_log2_16bit(v); -} diff --git a/ext/at3_standalone/intmath.h b/ext/at3_standalone/intmath.h index 9adfe5a41d..41020aaefd 100644 --- a/ext/at3_standalone/intmath.h +++ b/ext/at3_standalone/intmath.h @@ -18,20 +18,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVUTIL_INTMATH_H -#define AVUTIL_INTMATH_H +#pragma once #include #include "compat.h" -#if ARCH_ARM -# include "arm/intmath.h" -#endif -#if ARCH_X86 -# include "x86/intmath.h" -#endif - #if HAVE_FAST_CLZ #if AV_GCC_VERSION_AT_LEAST(3,4) #ifndef ff_log2 @@ -136,8 +128,3 @@ static av_always_inline av_const int ff_ctzll_c(long long v) return debruijn_ctz64[(uint64_t)((v & -v) * 0x022FDD63CC95386DU) >> 58]; } #endif - -/** - * @} - */ -#endif /* AVUTIL_INTMATH_H */ diff --git a/ext/at3_standalone/log.h b/ext/at3_standalone/log.h index c85a078fb1..9c90097b32 100644 --- a/ext/at3_standalone/log.h +++ b/ext/at3_standalone/log.h @@ -22,7 +22,6 @@ #define AVUTIL_LOG_H #include -#include "avutil.h" #include "compat.h" typedef enum { diff --git a/ext/at3_standalone/mathematics.c b/ext/at3_standalone/mathematics.c index 0e5a0af793..65d63085c7 100644 --- a/ext/at3_standalone/mathematics.c +++ b/ext/at3_standalone/mathematics.c @@ -28,7 +28,7 @@ #include "mathematics.h" #include "intmath.h" -#include "common.h" +#include "compat.h" /* Stein's binary GCD algorithm: * https://en.wikipedia.org/wiki/Binary_GCD_algorithm */ diff --git a/ext/at3_standalone/mathematics.h b/ext/at3_standalone/mathematics.h index 19c9ac2cbc..f44d89d882 100644 --- a/ext/at3_standalone/mathematics.h +++ b/ext/at3_standalone/mathematics.h @@ -23,28 +23,25 @@ #include #include +#include + #include "compat.h" -#include "common.h" #include "intfloat.h" extern const uint32_t ff_inverse[257]; extern const uint8_t ff_sqrt_tab[256]; -#ifndef sign_extend -static inline av_const int sign_extend(int val, unsigned bits) +static inline int sign_extend(int val, unsigned bits) { unsigned shift = 8 * sizeof(int) - bits; union { unsigned u; int s; } v = { (unsigned)val << shift }; return v.s >> shift; } -#endif -#ifndef zero_extend -static inline av_const unsigned zero_extend(unsigned val, unsigned bits) +static inline unsigned zero_extend(unsigned val, unsigned bits) { return (val << ((8 * sizeof(int)) - bits)) >> ((8 * sizeof(int)) - bits); } -#endif #ifndef NEG_SSR32 # define NEG_SSR32(a,s) ((( int32_t)(a))>>(32-(s))) @@ -54,15 +51,6 @@ static inline av_const unsigned zero_extend(unsigned val, unsigned bits) # define NEG_USR32(a,s) (((uint32_t)(a))>>(32-(s))) #endif -#ifndef M_E -#define M_E 2.7182818284590452354 /* e */ -#endif -#ifndef M_LN2 -#define M_LN2 0.69314718055994530942 /* log_e 2 */ -#endif -#ifndef M_LN10 -#define M_LN10 2.30258509299404568402 /* log_e 10 */ -#endif #ifndef M_LOG2_10 #define M_LOG2_10 3.32192809488736234787 /* log_2 10 */ #endif @@ -81,12 +69,6 @@ static inline av_const unsigned zero_extend(unsigned val, unsigned bits) #ifndef M_SQRT2 #define M_SQRT2 1.41421356237309504880 /* sqrt(2) */ #endif -#ifndef NAN -#define NAN av_int2float(0x7fc00000) -#endif -#ifndef INFINITY -#define INFINITY av_int2float(0x7f800000) -#endif /** * @addtogroup lavu_math @@ -203,7 +185,7 @@ int av_reduce(int *dst_num, int *dst_den, int64_t num, int64_t den, int64_t max) * @param c second rational * @return b*c */ -AVRational av_mul_q(AVRational b, AVRational c) av_const; +AVRational av_mul_q(AVRational b, AVRational c); /** * Divide one rational by another. @@ -211,7 +193,7 @@ AVRational av_mul_q(AVRational b, AVRational c) av_const; * @param c second rational * @return b/c */ -AVRational av_div_q(AVRational b, AVRational c) av_const; +AVRational av_div_q(AVRational b, AVRational c); /** * Add two rationals. @@ -219,14 +201,14 @@ AVRational av_div_q(AVRational b, AVRational c) av_const; * @param c second rational * @return b+c */ -AVRational av_add_q(AVRational b, AVRational c) av_const; +AVRational av_add_q(AVRational b, AVRational c); /** * Invert a rational. * @param q value * @return 1 / q */ -static av_always_inline AVRational av_inv_q(AVRational q) +static inline AVRational av_inv_q(AVRational q) { AVRational r = { q.den, q.num }; return r; @@ -240,6 +222,42 @@ static av_always_inline AVRational av_inv_q(AVRational q) * @param max the maximum allowed numerator and denominator * @return (AVRational) d */ -AVRational av_d2q(double d, int max) av_const; +AVRational av_d2q(double d, int max); + + +/** + * Clear high bits from an unsigned integer starting with specific bit position + * @param a value to clip + * @param p bit position to clip at + * @return clipped value + */ +static inline unsigned av_mod_uintp2(unsigned a, unsigned p) +{ + return a & ((1 << p) - 1); +} + +/** + * Count number of bits set to one in x + * @param x value to count bits of + * @return the number of bits set to one in x + */ +static inline int av_popcount(uint32_t x) +{ + x -= (x >> 1) & 0x55555555; + x = (x & 0x33333333) + ((x >> 2) & 0x33333333); + x = (x + (x >> 4)) & 0x0F0F0F0F; + x += x >> 8; + return (x + (x >> 16)) & 0x3F; +} + +/** + * Count number of bits set to one in x + * @param x value to count bits of + * @return the number of bits set to one in x + */ +static inline int av_popcount64(uint64_t x) +{ + return av_popcount((uint32_t)x) + av_popcount((uint32_t)(x >> 32)); +} #endif /* AVUTIL_MATHEMATICS_H */ diff --git a/ext/at3_standalone/mem.c b/ext/at3_standalone/mem.c index a880c2a59c..0e2314fb3b 100644 --- a/ext/at3_standalone/mem.c +++ b/ext/at3_standalone/mem.c @@ -32,8 +32,6 @@ #include #include "compat.h" -#include "avutil.h" -#include "common.h" #include "intreadwrite.h" #include "mem.h" diff --git a/ext/at3_standalone/mem.h b/ext/at3_standalone/mem.h index e622e4c058..150c21e8b2 100644 --- a/ext/at3_standalone/mem.h +++ b/ext/at3_standalone/mem.h @@ -18,13 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -/** - * @file - * memory handling functions - */ - -#ifndef AVUTIL_MEM_H -#define AVUTIL_MEM_H +#pragma once #include #include @@ -32,25 +26,10 @@ #include #include "compat.h" -#include "avutil.h" -/** - * @addtogroup lavu_mem - * @{ - */ #define FF_MEMORY_POISON 0x2a -#if defined(__INTEL_COMPILER) && __INTEL_COMPILER < 1110 || defined(__SUNPRO_C) - #define DECLARE_ALIGNED(n,t,v) t __attribute__ ((aligned (n))) v - #define DECLARE_ASM_CONST(n,t,v) const t __attribute__ ((aligned (n))) v -#elif defined(__TI_COMPILER_VERSION__) - #define DECLARE_ALIGNED(n,t,v) \ - AV_PRAGMA(DATA_ALIGN(v,n)) \ - t __attribute__((aligned(n))) v - #define DECLARE_ASM_CONST(n,t,v) \ - AV_PRAGMA(DATA_ALIGN(v,n)) \ - static const t __attribute__((aligned(n))) v -#elif defined(__GNUC__) +#if defined(__GNUC__) #define DECLARE_ALIGNED(n,t,v) t __attribute__ ((aligned (n))) v #define DECLARE_ASM_CONST(n,t,v) static const t av_used __attribute__ ((aligned (n))) v #elif defined(_MSC_VER) @@ -235,5 +214,3 @@ void av_fast_mallocz(void *ptr, unsigned int *size, size_t min_size); /** * @} */ - -#endif /* AVUTIL_MEM_H */ diff --git a/ext/at3_standalone/sinewin.c b/ext/at3_standalone/sinewin.c index eec241f128..3af4289101 100644 --- a/ext/at3_standalone/sinewin.c +++ b/ext/at3_standalone/sinewin.c @@ -22,7 +22,6 @@ #include #include "aac_defines.h" #include "compat.h" -#include "common.h" #include "mem.h" #include "aac_defines.h" From 91df8ebfda3373fd5ce9706228ba96cf330fa2b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Thu, 11 Apr 2024 09:57:45 +0200 Subject: [PATCH 081/719] FFT cleanup --- Common/Common.vcxproj | 4 +- Common/Common.vcxproj.filters | 8 +- ext/at3_standalone/atrac3.c | 2 +- ext/at3_standalone/avcodec.c | 34 -- ext/at3_standalone/avcodec.h | 3 - ext/at3_standalone/bytestream.h | 84 ----- ext/at3_standalone/channel_layout.c | 2 + ext/at3_standalone/compat.h | 9 + ext/at3_standalone/{fft_template.c => fft.c} | 42 +-- ext/at3_standalone/fft.h | 22 +- ext/at3_standalone/get_bits.c | 5 - ext/at3_standalone/get_bits.h | 67 +++- ext/at3_standalone/intfloat.h | 77 ---- ext/at3_standalone/log.h | 363 ------------------- ext/at3_standalone/mathematics.h | 1 - ext/at3_standalone/mdct_template.c | 26 +- 16 files changed, 99 insertions(+), 650 deletions(-) delete mode 100644 ext/at3_standalone/bytestream.h rename ext/at3_standalone/{fft_template.c => fft.c} (91%) delete mode 100644 ext/at3_standalone/intfloat.h delete mode 100644 ext/at3_standalone/log.h diff --git a/Common/Common.vcxproj b/Common/Common.vcxproj index 51862eb690..2b258e8440 100644 --- a/Common/Common.vcxproj +++ b/Common/Common.vcxproj @@ -391,13 +391,11 @@ - - @@ -611,7 +609,7 @@ - + diff --git a/Common/Common.vcxproj.filters b/Common/Common.vcxproj.filters index 8f29b89bd7..d255b9e331 100644 --- a/Common/Common.vcxproj.filters +++ b/Common/Common.vcxproj.filters @@ -542,9 +542,6 @@ ext\at3_standalone - - ext\at3_standalone - ext\at3_standalone @@ -560,9 +557,6 @@ ext\at3_standalone - - ext\at3_standalone - ext\at3_standalone @@ -1074,7 +1068,7 @@ ext\at3_standalone - + ext\at3_standalone diff --git a/ext/at3_standalone/atrac3.c b/ext/at3_standalone/atrac3.c index 4baaeda1fa..f78e1784dd 100644 --- a/ext/at3_standalone/atrac3.c +++ b/ext/at3_standalone/atrac3.c @@ -36,9 +36,9 @@ #include #include #include +#include #include "float_dsp.h" -#include "bytestream.h" #include "fft.h" #include "compat.h" #include "get_bits.h" diff --git a/ext/at3_standalone/avcodec.c b/ext/at3_standalone/avcodec.c index 01e3f53037..19cf6a2b3f 100644 --- a/ext/at3_standalone/avcodec.c +++ b/ext/at3_standalone/avcodec.c @@ -28,9 +28,7 @@ #include "compat.h" #include "channel_layout.h" #include "compat.h" -#include "mathematics.h" #include "avcodec.h" -#include "bytestream.h" #include "mem.h" #include @@ -39,11 +37,6 @@ #include #include -static const AVClass av_codec_context_class = { - .class_name = "AVCodecContext", - .category = AV_CLASS_CATEGORY_DECODER, -}; - AVCodecContext *avcodec_alloc_context3(const AVCodec *codec) { AVCodecContext *avctx = av_mallocz(sizeof(AVCodecContext)); @@ -52,8 +45,6 @@ AVCodecContext *avcodec_alloc_context3(const AVCodec *codec) int flags = 0; memset(avctx, 0, sizeof(AVCodecContext)); - avctx->av_class = &av_codec_context_class; - if (codec) { avctx->codec = codec; avctx->codec_id = codec->id; @@ -66,9 +57,6 @@ AVCodecContext *avcodec_alloc_context3(const AVCodec *codec) return NULL; } } - if (codec->priv_class) { - *(const AVClass**)avctx->priv_data = codec->priv_class; - } } return avctx; } @@ -88,17 +76,6 @@ void avcodec_free_context(AVCodecContext **pavctx) int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *codec, void **options) { - if ((codec && avctx->codec && codec != avctx->codec)) { - av_log(avctx, AV_LOG_ERROR, "This AVCodecContext was allocated for %s, " - "but %s passed to avcodec_open2()\n", avctx->codec->name, codec->name); - return AVERROR(EINVAL); - } - if (!codec) - codec = avctx->codec; - - if (avctx->extradata_size < 0 || avctx->extradata_size >= FF_MAX_EXTRADATA_SIZE) - return AVERROR(EINVAL); - int ret = 0; if (codec->priv_data_size > 0) { @@ -108,19 +85,11 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code ret = AVERROR(ENOMEM); goto end; } - if (codec->priv_class) { - *(const AVClass **)avctx->priv_data = codec->priv_class; - } } } else { avctx->priv_data = NULL; } - if (avctx->channels > FF_SANE_NB_CHANNELS) { - ret = AVERROR(EINVAL); - goto free_and_end; - } - avctx->codec = codec; avctx->codec_id = codec->id; @@ -154,9 +123,6 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code ret = AVERROR(EINVAL); goto free_and_end; } - if (codec->priv_data_size > 0 && avctx->priv_data && codec->priv_class) { - av_assert0(*(const AVClass **)avctx->priv_data == codec->priv_class); - } end: diff --git a/ext/at3_standalone/avcodec.h b/ext/at3_standalone/avcodec.h index a2caa92db7..330e3209b0 100644 --- a/ext/at3_standalone/avcodec.h +++ b/ext/at3_standalone/avcodec.h @@ -31,7 +31,6 @@ #include "compat.h" #include "channel_layout.h" #include "mem.h" -#include "log.h" /** * @defgroup libavc Encoding/Decoding Library @@ -294,7 +293,6 @@ typedef struct AVCodecContext { * information on struct for av_log * - set by avcodec_alloc_context3 */ - const AVClass *av_class; const struct AVCodec *codec; #if FF_API_CODEC_NAME /** @@ -488,7 +486,6 @@ typedef struct AVCodec { */ const char *name; enum AVCodecID id; - const AVClass *priv_class; ///< AVClass for the private context /***************************************************************** * No fields below this line are part of the public API. They diff --git a/ext/at3_standalone/bytestream.h b/ext/at3_standalone/bytestream.h deleted file mode 100644 index c1c3348379..0000000000 --- a/ext/at3_standalone/bytestream.h +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Bytestream functions - * copyright (c) 2006 Baptiste Coudurier - * Copyright (c) 2012 Aneesh Dogra (lionaneesh) - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef AVCODEC_BYTESTREAM_H -#define AVCODEC_BYTESTREAM_H - -#include -#include - -#include "compat.h" -#include "intreadwrite.h" - -typedef struct GetByteContext { - const uint8_t *buffer, *buffer_end, *buffer_start; -} GetByteContext; - -#define DEF(type, name, bytes, read, write) \ -static inline type bytestream_get_ ## name(const uint8_t **b) \ -{ \ - (*b) += bytes; \ - return read(*b - bytes); \ -} \ -static inline type bytestream2_get_ ## name ## u(GetByteContext *g) \ -{ \ - return bytestream_get_ ## name(&g->buffer); \ -} \ -static inline type bytestream2_get_ ## name(GetByteContext *g) \ -{ \ - if (g->buffer_end - g->buffer < bytes) { \ - g->buffer = g->buffer_end; \ - return 0; \ - } \ - return bytestream2_get_ ## name ## u(g); \ -} \ -static inline type bytestream2_peek_ ## name(GetByteContext *g) \ -{ \ - if (g->buffer_end - g->buffer < bytes) \ - return 0; \ - return read(g->buffer); \ -} - -DEF(uint64_t, le64, 8, AV_RL64, AV_WL64) -DEF(unsigned int, le32, 4, AV_RL32, AV_WL32) -DEF(unsigned int, le24, 3, AV_RL24, AV_WL24) -DEF(unsigned int, le16, 2, AV_RL16, AV_WL16) -DEF(uint64_t, be64, 8, AV_RB64, AV_WB64) -DEF(unsigned int, be32, 4, AV_RB32, AV_WB32) -DEF(unsigned int, be24, 3, AV_RB24, AV_WB24) -DEF(unsigned int, be16, 2, AV_RB16, AV_WB16) -DEF(unsigned int, byte, 1, AV_RB8 , AV_WB8) - -# define bytestream2_get_ne16 bytestream2_get_le16 -# define bytestream2_get_ne24 bytestream2_get_le24 -# define bytestream2_get_ne32 bytestream2_get_le32 -# define bytestream2_get_ne64 bytestream2_get_le64 -# define bytestream2_get_ne16u bytestream2_get_le16u -# define bytestream2_get_ne24u bytestream2_get_le24u -# define bytestream2_get_ne32u bytestream2_get_le32u -# define bytestream2_get_ne64u bytestream2_get_le64u -# define bytestream2_peek_ne16 bytestream2_peek_le16 -# define bytestream2_peek_ne24 bytestream2_peek_le24 -# define bytestream2_peek_ne32 bytestream2_peek_le32 -# define bytestream2_peek_ne64 bytestream2_peek_le64 - -#endif /* AVCODEC_BYTESTREAM_H */ diff --git a/ext/at3_standalone/channel_layout.c b/ext/at3_standalone/channel_layout.c index e925e89c6c..f35dbf50f2 100644 --- a/ext/at3_standalone/channel_layout.c +++ b/ext/at3_standalone/channel_layout.c @@ -24,6 +24,8 @@ */ #include +#include +#include #include #include diff --git a/ext/at3_standalone/compat.h b/ext/at3_standalone/compat.h index fb8d4d8798..64217744e3 100644 --- a/ext/at3_standalone/compat.h +++ b/ext/at3_standalone/compat.h @@ -51,6 +51,15 @@ #define FF_SANE_NB_CHANNELS 64U +#define AV_LOG_ERROR 16 +#define AV_LOG_WARNING 24 +#define AV_LOG_INFO 32 +#define AV_LOG_VERBOSE 40 +#define AV_LOG_DEBUG 48 +#define AV_LOG_TRACE 56 + +void av_log(void *avcl, int level, const char *fmt, ...) av_printf_format(3, 4); + /** * Maximum size in bytes of extradata. * This value was chosen such that every bit of the buffer is diff --git a/ext/at3_standalone/fft_template.c b/ext/at3_standalone/fft.c similarity index 91% rename from ext/at3_standalone/fft_template.c rename to ext/at3_standalone/fft.c index 94118d4880..128de80f83 100644 --- a/ext/at3_standalone/fft_template.c +++ b/ext/at3_standalone/fft.c @@ -40,9 +40,9 @@ y = a + b; \ } while (0) -#define ff_imdct_calc_c FFT_NAME(ff_imdct_calc_c) -#define ff_imdct_half_c FFT_NAME(ff_imdct_half_c) -#define ff_mdct_calc_c FFT_NAME(ff_mdct_calc_c) +#define ff_imdct_calc_c ff_imdct_calc_c +#define ff_imdct_half_c ff_imdct_half_c +#define ff_mdct_calc_c ff_mdct_calc_c void ff_imdct_calc_c(FFTContext *s, FFTSample *output, const FFTSample *input); void ff_imdct_half_c(FFTContext *s, FFTSample *output, const FFTSample *input); @@ -64,21 +64,21 @@ COSTABLE(16384); COSTABLE(32768); COSTABLE(65536); #endif -COSTABLE_CONST FFTSample * const FFT_NAME(ff_cos_tabs)[] = { +FFTSample * const ff_cos_tabs[] = { NULL, NULL, NULL, NULL, - FFT_NAME(ff_cos_16), - FFT_NAME(ff_cos_32), - FFT_NAME(ff_cos_64), - FFT_NAME(ff_cos_128), - FFT_NAME(ff_cos_256), - FFT_NAME(ff_cos_512), - FFT_NAME(ff_cos_1024), - FFT_NAME(ff_cos_2048), - FFT_NAME(ff_cos_4096), - FFT_NAME(ff_cos_8192), - FFT_NAME(ff_cos_16384), - FFT_NAME(ff_cos_32768), - FFT_NAME(ff_cos_65536), + ff_cos_16, + ff_cos_32, + ff_cos_64, + ff_cos_128, + ff_cos_256, + ff_cos_512, + ff_cos_1024, + ff_cos_2048, + ff_cos_4096, + ff_cos_8192, + ff_cos_16384, + ff_cos_32768, + ff_cos_65536, }; static void fft_permute_c(FFTContext *s, FFTComplex *z); @@ -101,7 +101,7 @@ void ff_init_ff_cos_tabs(int index) int i; int m = 1< +#include "compat.h" + typedef float FFTSample; typedef struct FFTComplex { @@ -47,8 +49,6 @@ typedef struct FFTComplex { typedef struct FFTContext FFTContext; -#define FFT_NAME(x) x - typedef float FFTDouble; typedef struct FFTDComplex { @@ -88,14 +88,8 @@ struct FFTContext { enum mdct_permutation_type mdct_permutation; }; -#if CONFIG_HARDCODED_TABLES -#define COSTABLE_CONST const -#else -#define COSTABLE_CONST -#endif - #define COSTABLE(size) \ - COSTABLE_CONST DECLARE_ALIGNED(32, FFTSample, FFT_NAME(ff_cos_##size))[size/2] + DECLARE_ALIGNED(32, FFTSample, ff_cos_##size)[size/2] extern COSTABLE(16); extern COSTABLE(32); @@ -110,9 +104,7 @@ extern COSTABLE(8192); extern COSTABLE(16384); extern COSTABLE(32768); extern COSTABLE(65536); -extern COSTABLE_CONST FFTSample* const FFT_NAME(ff_cos_tabs)[17]; - -#define ff_init_ff_cos_tabs FFT_NAME(ff_init_ff_cos_tabs) +extern FFTSample* const ff_cos_tabs[17]; /** * Initialize the cosine table in ff_cos_tabs[index] @@ -120,9 +112,6 @@ extern COSTABLE_CONST FFTSample* const FFT_NAME(ff_cos_tabs)[17]; */ void ff_init_ff_cos_tabs(int index); -#define ff_fft_init FFT_NAME(ff_fft_init) -#define ff_fft_end FFT_NAME(ff_fft_end) - /** * Set up a complex FFT. * @param nbits log2 of the length of the input array @@ -132,9 +121,6 @@ int ff_fft_init(FFTContext *s, int nbits, int inverse); void ff_fft_end(FFTContext *s); -#define ff_mdct_init FFT_NAME(ff_mdct_init) -#define ff_mdct_end FFT_NAME(ff_mdct_end) - int ff_mdct_init(FFTContext *s, int nbits, int inverse, double scale); void ff_mdct_end(FFTContext *s); diff --git a/ext/at3_standalone/get_bits.c b/ext/at3_standalone/get_bits.c index 40edf40d26..34b8a3fd5b 100644 --- a/ext/at3_standalone/get_bits.c +++ b/ext/at3_standalone/get_bits.c @@ -140,7 +140,6 @@ static int build_table(VLC *vlc, int table_nb_bits, int nb_codes, if (table_nb_bits > 30) return -1; table_index = alloc_table(vlc, table_size, flags & INIT_VLC_USE_NEW_STATIC); - ff_dlog(NULL, "new table index=%d size=%d\n", table_index, table_size); if (table_index < 0) return table_index; table = (volatile VLC_TYPE (*)[2])&vlc->table[table_index]; @@ -150,7 +149,6 @@ static int build_table(VLC *vlc, int table_nb_bits, int nb_codes, n = codes[i].bits; code = codes[i].code; symbol = codes[i].symbol; - ff_dlog(NULL, "i=%d n=%d code=0x%x\n", i, n, code); if (n <= table_nb_bits) { /* no need to add another table */ j = code >> (32 - table_nb_bits); @@ -162,7 +160,6 @@ static int build_table(VLC *vlc, int table_nb_bits, int nb_codes, } for (k = 0; k < nb; k++) { int bits = table[j][1]; - ff_dlog(NULL, "%4x: code=%d n=%d\n", j, i, n); if (bits != 0 && bits != n) { av_log(NULL, AV_LOG_ERROR, "incorrect codes\n"); return AVERROR_INVALIDDATA; @@ -192,8 +189,6 @@ static int build_table(VLC *vlc, int table_nb_bits, int nb_codes, subtable_bits = FFMIN(subtable_bits, table_nb_bits); j = (flags & INIT_VLC_LE) ? bitswap_32(code_prefix) >> (32 - table_nb_bits) : code_prefix; table[j][1] = -subtable_bits; - ff_dlog(NULL, "%4x: n=%d (subtable)\n", - j, codes[i].bits + table_nb_bits); index = build_table(vlc, subtable_bits, k-i, codes+i, flags); if (index < 0) return index; diff --git a/ext/at3_standalone/get_bits.h b/ext/at3_standalone/get_bits.h index f7eab05f1a..0a4b581785 100644 --- a/ext/at3_standalone/get_bits.h +++ b/ext/at3_standalone/get_bits.h @@ -18,23 +18,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -/** - * @file - * bitstream reader API header. - */ - -#ifndef AVCODEC_GET_BITS_H -#define AVCODEC_GET_BITS_H - +#pragma once #include #include "compat.h" #include "intreadwrite.h" #include "mathematics.h" - /* -#include "libavutil/log.h" -#include "libavutil/avassert.h" -*/ /* * Safe bitstream reading: @@ -474,4 +463,56 @@ static inline int get_bits_left(GetBitContext *gb) return gb->size_in_bits - get_bits_count(gb); } -#endif /* AVCODEC_GET_BITS_H */ +#include "intreadwrite.h" + +typedef struct GetByteContext { + const uint8_t *buffer, *buffer_end, *buffer_start; +} GetByteContext; + +#define DEF(type, name, bytes, read, write) \ +static inline type bytestream_get_ ## name(const uint8_t **b) \ +{ \ + (*b) += bytes; \ + return read(*b - bytes); \ +} \ +static inline type bytestream2_get_ ## name ## u(GetByteContext *g) \ +{ \ + return bytestream_get_ ## name(&g->buffer); \ +} \ +static inline type bytestream2_get_ ## name(GetByteContext *g) \ +{ \ + if (g->buffer_end - g->buffer < bytes) { \ + g->buffer = g->buffer_end; \ + return 0; \ + } \ + return bytestream2_get_ ## name ## u(g); \ +} \ +static inline type bytestream2_peek_ ## name(GetByteContext *g) \ +{ \ + if (g->buffer_end - g->buffer < bytes) \ + return 0; \ + return read(g->buffer); \ +} + +DEF(uint64_t, le64, 8, AV_RL64, AV_WL64) +DEF(unsigned int, le32, 4, AV_RL32, AV_WL32) +DEF(unsigned int, le24, 3, AV_RL24, AV_WL24) +DEF(unsigned int, le16, 2, AV_RL16, AV_WL16) +DEF(uint64_t, be64, 8, AV_RB64, AV_WB64) +DEF(unsigned int, be32, 4, AV_RB32, AV_WB32) +DEF(unsigned int, be24, 3, AV_RB24, AV_WB24) +DEF(unsigned int, be16, 2, AV_RB16, AV_WB16) +DEF(unsigned int, byte, 1, AV_RB8, AV_WB8) + +# define bytestream2_get_ne16 bytestream2_get_le16 +# define bytestream2_get_ne24 bytestream2_get_le24 +# define bytestream2_get_ne32 bytestream2_get_le32 +# define bytestream2_get_ne64 bytestream2_get_le64 +# define bytestream2_get_ne16u bytestream2_get_le16u +# define bytestream2_get_ne24u bytestream2_get_le24u +# define bytestream2_get_ne32u bytestream2_get_le32u +# define bytestream2_get_ne64u bytestream2_get_le64u +# define bytestream2_peek_ne16 bytestream2_peek_le16 +# define bytestream2_peek_ne24 bytestream2_peek_le24 +# define bytestream2_peek_ne32 bytestream2_peek_le32 +# define bytestream2_peek_ne64 bytestream2_peek_le64 diff --git a/ext/at3_standalone/intfloat.h b/ext/at3_standalone/intfloat.h deleted file mode 100644 index 744abec421..0000000000 --- a/ext/at3_standalone/intfloat.h +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Copyright (c) 2011 Mans Rullgard - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef AVUTIL_INTFLOAT_H -#define AVUTIL_INTFLOAT_H - -#include -#include "compat.h" - -union av_intfloat32 { - uint32_t i; - float f; -}; - -union av_intfloat64 { - uint64_t i; - double f; -}; - -/** - * Reinterpret a 32-bit integer as a float. - */ -static av_always_inline float av_int2float(uint32_t i) -{ - union av_intfloat32 v; - v.i = i; - return v.f; -} - -/** - * Reinterpret a float as a 32-bit integer. - */ -static av_always_inline uint32_t av_float2int(float f) -{ - union av_intfloat32 v; - v.f = f; - return v.i; -} - -/** - * Reinterpret a 64-bit integer as a double. - */ -static av_always_inline double av_int2double(uint64_t i) -{ - union av_intfloat64 v; - v.i = i; - return v.f; -} - -/** - * Reinterpret a double as a 64-bit integer. - */ -static av_always_inline uint64_t av_double2int(double f) -{ - union av_intfloat64 v; - v.f = f; - return v.i; -} - -#endif /* AVUTIL_INTFLOAT_H */ diff --git a/ext/at3_standalone/log.h b/ext/at3_standalone/log.h deleted file mode 100644 index 9c90097b32..0000000000 --- a/ext/at3_standalone/log.h +++ /dev/null @@ -1,363 +0,0 @@ -/* - * copyright (c) 2006 Michael Niedermayer - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef AVUTIL_LOG_H -#define AVUTIL_LOG_H - -#include -#include "compat.h" - -typedef enum { - AV_CLASS_CATEGORY_NA = 0, - AV_CLASS_CATEGORY_INPUT, - AV_CLASS_CATEGORY_OUTPUT, - AV_CLASS_CATEGORY_MUXER, - AV_CLASS_CATEGORY_DEMUXER, - AV_CLASS_CATEGORY_ENCODER, - AV_CLASS_CATEGORY_DECODER, - AV_CLASS_CATEGORY_FILTER, - AV_CLASS_CATEGORY_BITSTREAM_FILTER, - AV_CLASS_CATEGORY_SWSCALER, - AV_CLASS_CATEGORY_SWRESAMPLER, - AV_CLASS_CATEGORY_DEVICE_VIDEO_OUTPUT = 40, - AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT, - AV_CLASS_CATEGORY_DEVICE_AUDIO_OUTPUT, - AV_CLASS_CATEGORY_DEVICE_AUDIO_INPUT, - AV_CLASS_CATEGORY_DEVICE_OUTPUT, - AV_CLASS_CATEGORY_DEVICE_INPUT, - AV_CLASS_CATEGORY_NB, ///< not part of ABI/API -}AVClassCategory; - -#define AV_IS_INPUT_DEVICE(category) \ - (((category) == AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT) || \ - ((category) == AV_CLASS_CATEGORY_DEVICE_AUDIO_INPUT) || \ - ((category) == AV_CLASS_CATEGORY_DEVICE_INPUT)) - -#define AV_IS_OUTPUT_DEVICE(category) \ - (((category) == AV_CLASS_CATEGORY_DEVICE_VIDEO_OUTPUT) || \ - ((category) == AV_CLASS_CATEGORY_DEVICE_AUDIO_OUTPUT) || \ - ((category) == AV_CLASS_CATEGORY_DEVICE_OUTPUT)) - -struct AVOptionRanges; - -/** - * Describe the class of an AVClass context structure. That is an - * arbitrary struct of which the first field is a pointer to an - * AVClass struct (e.g. AVCodecContext, AVFormatContext etc.). - */ -typedef struct AVClass { - /** - * The name of the class; usually it is the same name as the - * context structure type to which the AVClass is associated. - */ - const char* class_name; - - /** - * A pointer to a function which returns the name of a context - * instance ctx associated with the class. - */ - const char* (*item_name)(void* ctx); - - /** - * a pointer to the first option specified in the class if any or NULL - * - * @see av_set_default_options() - */ - const struct AVOption *option; - - /** - * LIBAVUTIL_VERSION with which this structure was created. - * This is used to allow fields to be added without requiring major - * version bumps everywhere. - */ - - int version; - - /** - * Offset in the structure where log_level_offset is stored. - * 0 means there is no such variable - */ - int log_level_offset_offset; - - /** - * Offset in the structure where a pointer to the parent context for - * logging is stored. For example a decoder could pass its AVCodecContext - * to eval as such a parent context, which an av_log() implementation - * could then leverage to display the parent context. - * The offset can be NULL. - */ - int parent_log_context_offset; - - /** - * Return next AVOptions-enabled child or NULL - */ - void* (*child_next)(void *obj, void *prev); - - /** - * Return an AVClass corresponding to the next potential - * AVOptions-enabled child. - * - * The difference between child_next and this is that - * child_next iterates over _already existing_ objects, while - * child_class_next iterates over _all possible_ children. - */ - const struct AVClass* (*child_class_next)(const struct AVClass *prev); - - /** - * Category used for visualization (like color) - * This is only set if the category is equal for all objects using this class. - * available since version (51 << 16 | 56 << 8 | 100) - */ - AVClassCategory category; - - /** - * Callback to return the category. - * available since version (51 << 16 | 59 << 8 | 100) - */ - AVClassCategory (*get_category)(void* ctx); - - /** - * Callback to return the supported/allowed ranges. - * available since version (52.12) - */ - int (*query_ranges)(struct AVOptionRanges **, void *obj, const char *key, int flags); -} AVClass; - -/** - * @addtogroup lavu_log - * - * @{ - * - * @defgroup lavu_log_constants Logging Constants - * - * @{ - */ - -/** - * Print no output. - */ -#define AV_LOG_QUIET -8 - -/** - * Something went really wrong and we will crash now. - */ -#define AV_LOG_PANIC 0 - -/** - * Something went wrong and recovery is not possible. - * For example, no header was found for a format which depends - * on headers or an illegal combination of parameters is used. - */ -#define AV_LOG_FATAL 8 - -/** - * Something went wrong and cannot losslessly be recovered. - * However, not all future data is affected. - */ -#define AV_LOG_ERROR 16 - -/** - * Something somehow does not look correct. This may or may not - * lead to problems. An example would be the use of '-vstrict -2'. - */ -#define AV_LOG_WARNING 24 - -/** - * Standard information. - */ -#define AV_LOG_INFO 32 - -/** - * Detailed information. - */ -#define AV_LOG_VERBOSE 40 - -/** - * Stuff which is only useful for libav* developers. - */ -#define AV_LOG_DEBUG 48 - -/** - * Extremely verbose debugging, useful for libav* development. - */ -#define AV_LOG_TRACE 56 - -#define AV_LOG_MAX_OFFSET (AV_LOG_TRACE - AV_LOG_QUIET) - -/** - * @} - */ - -/** - * Sets additional colors for extended debugging sessions. - * @code - av_log(ctx, AV_LOG_DEBUG|AV_LOG_C(134), "Message in purple\n"); - @endcode - * Requires 256color terminal support. Uses outside debugging is not - * recommended. - */ -#define AV_LOG_C(x) ((x) << 8) - -/** - * Send the specified message to the log if the level is less than or equal - * to the current av_log_level. By default, all logging messages are sent to - * stderr. This behavior can be altered by setting a different logging callback - * function. - * @see av_log_set_callback - * - * @param avcl A pointer to an arbitrary struct of which the first field is a - * pointer to an AVClass struct or NULL if general log. - * @param level The importance level of the message expressed using a @ref - * lavu_log_constants "Logging Constant". - * @param fmt The format string (printf-compatible) that specifies how - * subsequent arguments are converted to output. - */ -void av_log(void *avcl, int level, const char *fmt, ...) av_printf_format(3, 4); - - -/** - * Send the specified message to the log if the level is less than or equal - * to the current av_log_level. By default, all logging messages are sent to - * stderr. This behavior can be altered by setting a different logging callback - * function. - * @see av_log_set_callback - * - * @param avcl A pointer to an arbitrary struct of which the first field is a - * pointer to an AVClass struct. - * @param level The importance level of the message expressed using a @ref - * lavu_log_constants "Logging Constant". - * @param fmt The format string (printf-compatible) that specifies how - * subsequent arguments are converted to output. - * @param vl The arguments referenced by the format string. - */ -void av_vlog(void *avcl, int level, const char *fmt, va_list vl); - -/** - * Get the current log level - * - * @see lavu_log_constants - * - * @return Current log level - */ -int av_log_get_level(void); - -/** - * Set the log level - * - * @see lavu_log_constants - * - * @param level Logging level - */ -void av_log_set_level(int level); - -/** - * Set the logging callback - * - * @note The callback must be thread safe, even if the application does not use - * threads itself as some codecs are multithreaded. - * - * @see av_log_default_callback - * - * @param callback A logging function with a compatible signature. - */ -void av_log_set_callback(void (*callback)(void*, int, const char*, va_list)); - -/** - * Default logging callback - * - * It prints the message to stderr, optionally colorizing it. - * - * @param avcl A pointer to an arbitrary struct of which the first field is a - * pointer to an AVClass struct. - * @param level The importance level of the message expressed using a @ref - * lavu_log_constants "Logging Constant". - * @param fmt The format string (printf-compatible) that specifies how - * subsequent arguments are converted to output. - * @param vl The arguments referenced by the format string. - */ -void av_log_default_callback(void *avcl, int level, const char *fmt, - va_list vl); - -/** - * Return the context name - * - * @param ctx The AVClass context - * - * @return The AVClass class_name - */ -const char* av_default_item_name(void* ctx); -AVClassCategory av_default_get_category(void *ptr); - -/** - * Format a line of log the same way as the default callback. - * @param line buffer to receive the formatted line - * @param line_size size of the buffer - * @param print_prefix used to store whether the prefix must be printed; - * must point to a persistent integer initially set to 1 - */ -void av_log_format_line(void *ptr, int level, const char *fmt, va_list vl, - char *line, int line_size, int *print_prefix); - -#if FF_API_DLOG -/** - * av_dlog macros - * @deprecated unused - * Useful to print debug messages that shouldn't get compiled in normally. - */ - -#ifdef DEBUG -# define av_dlog(pctx, ...) av_log(pctx, AV_LOG_DEBUG, __VA_ARGS__) -#else -# define av_dlog(pctx, ...) do { if (0) av_log(pctx, AV_LOG_DEBUG, __VA_ARGS__); } while (0) -#endif -#endif /* FF_API_DLOG */ - -/** - * Skip repeated messages, this requires the user app to use av_log() instead of - * (f)printf as the 2 would otherwise interfere and lead to - * "Last message repeated x times" messages below (f)printf messages with some - * bad luck. - * Also to receive the last, "last repeated" line if any, the user app must - * call av_log(NULL, AV_LOG_QUIET, "%s", ""); at the end - */ -#define AV_LOG_SKIP_REPEATED 1 - -/** - * Include the log severity in messages originating from codecs. - * - * Results in messages such as: - * [rawvideo @ 0xDEADBEEF] [error] encode did not produce valid pts - */ -#define AV_LOG_PRINT_LEVEL 2 - -void av_log_set_flags(int arg); -int av_log_get_flags(void); - -#ifdef DEBUG -# define ff_dlog(ctx, ...) av_log(ctx, AV_LOG_DEBUG, __VA_ARGS__) -#else -# define ff_dlog(ctx, ...) do { if (0) av_log(ctx, AV_LOG_DEBUG, __VA_ARGS__); } while (0) -#endif - -/** - * @} - */ - -#endif /* AVUTIL_LOG_H */ diff --git a/ext/at3_standalone/mathematics.h b/ext/at3_standalone/mathematics.h index f44d89d882..5fd4af7a2d 100644 --- a/ext/at3_standalone/mathematics.h +++ b/ext/at3_standalone/mathematics.h @@ -26,7 +26,6 @@ #include #include "compat.h" -#include "intfloat.h" extern const uint32_t ff_inverse[257]; extern const uint8_t ff_sqrt_tab[256]; diff --git a/ext/at3_standalone/mdct_template.c b/ext/at3_standalone/mdct_template.c index 02d4677655..f17dd1c118 100644 --- a/ext/at3_standalone/mdct_template.c +++ b/ext/at3_standalone/mdct_template.c @@ -21,24 +21,10 @@ #include #include -#include "common.h" + #include "mathematics.h" #include "fft.h" - -/** - * @file - * MDCT/IMDCT transforms. - */ - -#if FFT_FLOAT -# define RSCALE(x) (x) -#else -#if FFT_FIXED_32 -# define RSCALE(x) (((x) + 32) >> 6) -#else /* FFT_FIXED_32 */ -# define RSCALE(x) ((x) >> 1) -#endif /* FFT_FIXED_32 */ -#endif +#include "mem.h" /** * init MDCT or IMDCT computation. @@ -174,13 +160,13 @@ void ff_mdct_calc_c(FFTContext *s, FFTSample *out, const FFTSample *input) /* pre rotation */ for(i=0;i Date: Thu, 11 Apr 2024 10:24:14 +0200 Subject: [PATCH 082/719] Switch at3_standalone to C++ to avoid namespace clashes --- Common/Common.vcxproj | 31 ++- Common/Common.vcxproj.filters | 37 ++-- Core/HW/Atrac3Standalone.cpp | 2 - ext/at3_standalone/at3_decoders.h | 11 +- ext/at3_standalone/{atrac.c => atrac.cpp} | 0 ext/at3_standalone/{atrac3.c => atrac3.cpp} | 23 +-- .../{atrac3plus.c => atrac3plus.cpp} | 2 +- .../{atrac3plusdec.c => atrac3plusdec.cpp} | 18 +- .../{atrac3plusdsp.c => atrac3plusdsp.cpp} | 0 ext/at3_standalone/{avcodec.c => avcodec.cpp} | 5 +- ext/at3_standalone/avcodec.h | 10 - .../{channel_layout.c => channel_layout.cpp} | 50 ++--- ext/at3_standalone/compat.c | 34 --- ext/at3_standalone/compat.cpp | 23 +++ ext/at3_standalone/compat.h | 9 - ext/at3_standalone/{fft.c => fft.cpp} | 194 ++++++++++++++++-- ext/at3_standalone/fft.h | 20 +- .../{float_dsp.c => float_dsp.cpp} | 0 .../{get_bits.c => get_bits.cpp} | 7 +- ext/at3_standalone/get_bits.h | 6 +- ext/at3_standalone/intmath.c | 19 -- ext/at3_standalone/intmath.h | 130 ------------ .../{mathematics.c => mathematics.cpp} | 56 ++++- ext/at3_standalone/mathematics.h | 76 ++++++- ext/at3_standalone/mdct_template.c | 192 ----------------- ext/at3_standalone/{mem.c => mem.cpp} | 2 +- ext/at3_standalone/{sinewin.c => sinewin.cpp} | 0 27 files changed, 410 insertions(+), 547 deletions(-) rename ext/at3_standalone/{atrac.c => atrac.cpp} (100%) rename ext/at3_standalone/{atrac3.c => atrac3.cpp} (98%) rename ext/at3_standalone/{atrac3plus.c => atrac3plus.cpp} (99%) rename ext/at3_standalone/{atrac3plusdec.c => atrac3plusdec.cpp} (97%) rename ext/at3_standalone/{atrac3plusdsp.c => atrac3plusdsp.cpp} (100%) rename ext/at3_standalone/{avcodec.c => avcodec.cpp} (95%) rename ext/at3_standalone/{channel_layout.c => channel_layout.cpp} (73%) delete mode 100644 ext/at3_standalone/compat.c create mode 100644 ext/at3_standalone/compat.cpp rename ext/at3_standalone/{fft.c => fft.cpp} (66%) rename ext/at3_standalone/{float_dsp.c => float_dsp.cpp} (100%) rename ext/at3_standalone/{get_bits.c => get_bits.cpp} (98%) delete mode 100644 ext/at3_standalone/intmath.c delete mode 100644 ext/at3_standalone/intmath.h rename ext/at3_standalone/{mathematics.c => mathematics.cpp} (81%) delete mode 100644 ext/at3_standalone/mdct_template.c rename ext/at3_standalone/{mem.c => mem.cpp} (98%) rename ext/at3_standalone/{sinewin.c => sinewin.cpp} (100%) diff --git a/Common/Common.vcxproj b/Common/Common.vcxproj index 2b258e8440..3db89e65b3 100644 --- a/Common/Common.vcxproj +++ b/Common/Common.vcxproj @@ -396,9 +396,7 @@ - - @@ -601,21 +599,20 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + NotUsing diff --git a/Common/Common.vcxproj.filters b/Common/Common.vcxproj.filters index d255b9e331..a7857c5ebf 100644 --- a/Common/Common.vcxproj.filters +++ b/Common/Common.vcxproj.filters @@ -569,12 +569,6 @@ ext\at3_standalone - - ext\at3_standalone - - - ext\at3_standalone - @@ -1032,49 +1026,46 @@ ext\minimp3 - + ext\at3_standalone - + ext\at3_standalone - + ext\at3_standalone - + ext\at3_standalone - + ext\at3_standalone - + ext\at3_standalone - + ext\at3_standalone - + ext\at3_standalone - + ext\at3_standalone - + ext\at3_standalone - + ext\at3_standalone - + ext\at3_standalone - + ext\at3_standalone - - ext\at3_standalone - - + ext\at3_standalone diff --git a/Core/HW/Atrac3Standalone.cpp b/Core/HW/Atrac3Standalone.cpp index 11be9105f4..517f56b117 100644 --- a/Core/HW/Atrac3Standalone.cpp +++ b/Core/HW/Atrac3Standalone.cpp @@ -3,9 +3,7 @@ #include "SimpleAudioDec.h" #include "ext/at3_standalone/at3_decoders.h" -extern "C" { #include "ext/at3_standalone/avcodec.h" -} inline int16_t clamp16(float f) { if (f >= 1.0f) diff --git a/ext/at3_standalone/at3_decoders.h b/ext/at3_standalone/at3_decoders.h index 4dc6d98329..a9cb81edb7 100644 --- a/ext/at3_standalone/at3_decoders.h +++ b/ext/at3_standalone/at3_decoders.h @@ -5,12 +5,9 @@ struct AVCodecContext; struct AVFrame; -extern "C" { - #include "avcodec.h" - int atrac3_decode_frame(AVCodecContext *avctx, float *out_data[2], int *nb_samples, int *got_frame_ptr, const uint8_t *buf, int buf_size); - int atrac3p_decode_frame(AVCodecContext *avctx, float *out_data[2], int *nb_samples, int *got_frame_ptr, const uint8_t *buf, int buf_size); - extern AVCodec ff_atrac3p_decoder; - extern AVCodec ff_atrac3_decoder; -} +int atrac3_decode_frame(AVCodecContext *avctx, float *out_data[2], int *nb_samples, int *got_frame_ptr, const uint8_t *buf, int buf_size); +int atrac3p_decode_frame(AVCodecContext *avctx, float *out_data[2], int *nb_samples, int *got_frame_ptr, const uint8_t *buf, int buf_size); +extern AVCodec ff_atrac3p_decoder; +extern AVCodec ff_atrac3_decoder; diff --git a/ext/at3_standalone/atrac.c b/ext/at3_standalone/atrac.cpp similarity index 100% rename from ext/at3_standalone/atrac.c rename to ext/at3_standalone/atrac.cpp diff --git a/ext/at3_standalone/atrac3.c b/ext/at3_standalone/atrac3.cpp similarity index 98% rename from ext/at3_standalone/atrac3.c rename to ext/at3_standalone/atrac3.cpp index f78e1784dd..2227f9c1f4 100644 --- a/ext/at3_standalone/atrac3.c +++ b/ext/at3_standalone/atrac3.cpp @@ -186,7 +186,7 @@ static void init_imdct_window(void) static int atrac3_decode_close(AVCodecContext *avctx) { - ATRAC3Context *q = avctx->priv_data; + ATRAC3Context *q = (ATRAC3Context * )avctx->priv_data; av_freep(&q->units); av_freep(&q->decoded_bytes_buffer); @@ -638,7 +638,7 @@ static int decode_channel_sound_unit(ATRAC3Context *q, GetBitContext *gb, static int decode_frame(AVCodecContext *avctx, const uint8_t *databuf, float **out_samples) { - ATRAC3Context *q = avctx->priv_data; + ATRAC3Context *q = (ATRAC3Context *)avctx->priv_data; int ret, i; uint8_t *ptr1; @@ -732,7 +732,7 @@ static int decode_frame(AVCodecContext *avctx, const uint8_t *databuf, int atrac3_decode_frame(AVCodecContext *avctx, float *out_data[2], int *nb_samples, int *got_frame_ptr, const uint8_t *buf, int buf_size) { - ATRAC3Context *q = avctx->priv_data; + ATRAC3Context *q = (ATRAC3Context *)avctx->priv_data; int ret; const uint8_t *databuf; @@ -789,7 +789,7 @@ static int atrac3_decode_init(AVCodecContext *avctx) int i, ret; int version, delay, samples_per_frame, frame_factor; const uint8_t *edata_ptr = avctx->extradata; - ATRAC3Context *q = avctx->priv_data; + ATRAC3Context *q = (ATRAC3Context * )avctx->priv_data; if (avctx->channels <= 0 || avctx->channels > 2) { av_log(avctx, AV_LOG_ERROR, "Channel configuration error!\n"); @@ -879,8 +879,7 @@ static int atrac3_decode_init(AVCodecContext *avctx) if (avctx->block_align >= UINT_MAX / 2) return AVERROR(EINVAL); - q->decoded_bytes_buffer = av_mallocz(FFALIGN(avctx->block_align, 4) + - AV_INPUT_BUFFER_PADDING_SIZE); + q->decoded_bytes_buffer = (uint8_t *)av_mallocz(FFALIGN(avctx->block_align, 4) + AV_INPUT_BUFFER_PADDING_SIZE); if (!q->decoded_bytes_buffer) return AVERROR(ENOMEM); @@ -907,7 +906,7 @@ static int atrac3_decode_init(AVCodecContext *avctx) ff_atrac_init_gain_compensation(&q->gainc_ctx, 4, 3); - q->units = av_mallocz_array(avctx->channels, sizeof(*q->units)); + q->units = (ChannelUnit *)av_mallocz_array(avctx->channels, sizeof(*q->units)); if (!q->units) { atrac3_decode_close(avctx); return AVERROR(ENOMEM); @@ -917,9 +916,9 @@ static int atrac3_decode_init(AVCodecContext *avctx) } AVCodec ff_atrac3_decoder = { - .name = "atrac3", - .id = AV_CODEC_ID_ATRAC3, - .priv_data_size = sizeof(ATRAC3Context), - .init = atrac3_decode_init, - .close = atrac3_decode_close, + "atrac3", + AV_CODEC_ID_ATRAC3, + sizeof(ATRAC3Context), + &atrac3_decode_init, + &atrac3_decode_close, }; diff --git a/ext/at3_standalone/atrac3plus.c b/ext/at3_standalone/atrac3plus.cpp similarity index 99% rename from ext/at3_standalone/atrac3plus.c rename to ext/at3_standalone/atrac3plus.cpp index 4551517541..053b3404c6 100644 --- a/ext/at3_standalone/atrac3plus.c +++ b/ext/at3_standalone/atrac3plus.cpp @@ -29,7 +29,7 @@ #include //#include "avcodec.h" -#include "intmath.h" +#include "mathematics.h" #include "get_bits.h" #include "atrac3plus.h" #include "atrac3plus_data.h" diff --git a/ext/at3_standalone/atrac3plusdec.c b/ext/at3_standalone/atrac3plusdec.cpp similarity index 97% rename from ext/at3_standalone/atrac3plusdec.c rename to ext/at3_standalone/atrac3plusdec.cpp index 4216cb9f9b..15a35dfc30 100644 --- a/ext/at3_standalone/atrac3plusdec.c +++ b/ext/at3_standalone/atrac3plusdec.cpp @@ -66,7 +66,7 @@ typedef struct ATRAC3PContext { int atrac3p_decode_close(AVCodecContext *avctx) { - ATRAC3PContext *ctx = avctx->priv_data; + ATRAC3PContext *ctx = (ATRAC3PContext *)avctx->priv_data; av_freep(&ctx->ch_units); @@ -144,7 +144,7 @@ static int set_channel_params(ATRAC3PContext *ctx, int atrac3p_decode_init(AVCodecContext *avctx) { - ATRAC3PContext *ctx = avctx->priv_data; + ATRAC3PContext *ctx = (ATRAC3PContext *)avctx->priv_data; int i, ch, ret; if (!avctx->block_align) { @@ -168,7 +168,7 @@ int atrac3p_decode_init(AVCodecContext *avctx) ctx->my_channel_layout = avctx->channel_layout; - ctx->ch_units = av_mallocz_array(ctx->num_channel_blocks, sizeof(*ctx->ch_units)); + ctx->ch_units = (Atrac3pChanUnitCtx *)av_mallocz_array(ctx->num_channel_blocks, sizeof(*ctx->ch_units)); if (!ctx->ch_units) { atrac3p_decode_close(avctx); @@ -324,7 +324,7 @@ static void reconstruct_frame(ATRAC3PContext *ctx, Atrac3pChanUnitCtx *ch_unit, int atrac3p_decode_frame(AVCodecContext *avctx, float *out_data[2], int *nb_samples, int *got_frame_ptr, const uint8_t *avpkt_data, int avpkt_size) { - ATRAC3PContext *ctx = avctx->priv_data; + ATRAC3PContext *ctx = (ATRAC3PContext *)avctx->priv_data; int i, ret, ch_unit_id, ch_block = 0, out_ch_index = 0, channels_to_process; float **samples_p = out_data; @@ -378,9 +378,9 @@ int atrac3p_decode_frame(AVCodecContext *avctx, float *out_data[2], int *nb_samp } AVCodec ff_atrac3p_decoder = { - .name = "atrac3plus", - .id = AV_CODEC_ID_ATRAC3P, - .priv_data_size = sizeof(ATRAC3PContext), - .init = atrac3p_decode_init, - .close = atrac3p_decode_close, + "atrac3plus", + AV_CODEC_ID_ATRAC3P, + sizeof(ATRAC3PContext), + atrac3p_decode_init, + atrac3p_decode_close, }; diff --git a/ext/at3_standalone/atrac3plusdsp.c b/ext/at3_standalone/atrac3plusdsp.cpp similarity index 100% rename from ext/at3_standalone/atrac3plusdsp.c rename to ext/at3_standalone/atrac3plusdsp.cpp diff --git a/ext/at3_standalone/avcodec.c b/ext/at3_standalone/avcodec.cpp similarity index 95% rename from ext/at3_standalone/avcodec.c rename to ext/at3_standalone/avcodec.cpp index 19cf6a2b3f..0ef45272c8 100644 --- a/ext/at3_standalone/avcodec.c +++ b/ext/at3_standalone/avcodec.cpp @@ -39,7 +39,7 @@ AVCodecContext *avcodec_alloc_context3(const AVCodec *codec) { - AVCodecContext *avctx = av_mallocz(sizeof(AVCodecContext)); + AVCodecContext *avctx = (AVCodecContext *)av_mallocz(sizeof(AVCodecContext)); if (!avctx) return NULL; int flags = 0; @@ -73,8 +73,7 @@ void avcodec_free_context(AVCodecContext **pavctx) av_freep(pavctx); } - -int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *codec, void **options) +int avcodec_open2(AVCodecContext *avctx, const AVCodec *codec, void *options) { int ret = 0; diff --git a/ext/at3_standalone/avcodec.h b/ext/at3_standalone/avcodec.h index 330e3209b0..1b444e0222 100644 --- a/ext/at3_standalone/avcodec.h +++ b/ext/at3_standalone/avcodec.h @@ -496,11 +496,6 @@ typedef struct AVCodec { */ int priv_data_size; - /** - * Initialize codec static data, called from avcodec_register(). - */ - void (*init_static_data)(struct AVCodec *codec); - int (*init)(AVCodecContext *); /** * Encode data to an AVPacket. @@ -518,11 +513,6 @@ typedef struct AVCodec { * Will be called when seeking */ void (*flush)(AVCodecContext *); - /** - * Internal codec capabilities. - * See FF_CODEC_CAP_* in internal.h - */ - int caps_internal; } AVCodec; /** diff --git a/ext/at3_standalone/channel_layout.c b/ext/at3_standalone/channel_layout.cpp similarity index 73% rename from ext/at3_standalone/channel_layout.c rename to ext/at3_standalone/channel_layout.cpp index f35dbf50f2..f045a381d3 100644 --- a/ext/at3_standalone/channel_layout.c +++ b/ext/at3_standalone/channel_layout.cpp @@ -39,31 +39,31 @@ struct channel_name { }; static const struct channel_name channel_names[] = { - [0] = { "FL", "front left" }, - [1] = { "FR", "front right" }, - [2] = { "FC", "front center" }, - [3] = { "LFE", "low frequency" }, - [4] = { "BL", "back left" }, - [5] = { "BR", "back right" }, - [6] = { "FLC", "front left-of-center" }, - [7] = { "FRC", "front right-of-center" }, - [8] = { "BC", "back center" }, - [9] = { "SL", "side left" }, - [10] = { "SR", "side right" }, - [11] = { "TC", "top center" }, - [12] = { "TFL", "top front left" }, - [13] = { "TFC", "top front center" }, - [14] = { "TFR", "top front right" }, - [15] = { "TBL", "top back left" }, - [16] = { "TBC", "top back center" }, - [17] = { "TBR", "top back right" }, - [29] = { "DL", "downmix left" }, - [30] = { "DR", "downmix right" }, - [31] = { "WL", "wide left" }, - [32] = { "WR", "wide right" }, - [33] = { "SDL", "surround direct left" }, - [34] = { "SDR", "surround direct right" }, - [35] = { "LFE2", "low frequency 2" }, + { "FL", "front left" }, + { "FR", "front right" }, + { "FC", "front center" }, + { "LFE", "low frequency" }, + { "BL", "back left" }, + { "BR", "back right" }, + { "FLC", "front left-of-center" }, + { "FRC", "front right-of-center" }, + { "BC", "back center" }, + { "SL", "side left" }, + { "SR", "side right" }, + { "TC", "top center" }, + { "TFL", "top front left" }, + { "TFC", "top front center" }, + { "TFR", "top front right" }, + { "TBL", "top back left" }, + { "TBC", "top back center" }, + { "TBR", "top back right" }, + { "DL", "downmix left" }, + { "DR", "downmix right" }, + { "WL", "wide left" }, + { "WR", "wide right" }, + { "SDL", "surround direct left" }, + { "SDR", "surround direct right" }, + { "LFE2", "low frequency 2" }, }; static const char *get_channel_name(int channel_id) diff --git a/ext/at3_standalone/compat.c b/ext/at3_standalone/compat.c deleted file mode 100644 index a1b0ba4d2d..0000000000 --- a/ext/at3_standalone/compat.c +++ /dev/null @@ -1,34 +0,0 @@ -#include -#include -#include - -#include "ext/at3_standalone/compat.h" - -void av_log(void *avcl, int level, const char *fmt, ...) { - -} - -int av_get_cpu_flags(void) { - return 0; -} - -size_t av_strlcpy(char *dst, const char *src, size_t size) -{ - size_t len = 0; - while (++len < size && *src) - *dst++ = *src++; - if (len <= size) - *dst = 0; - return len + strlen(src) - 1; -} - -const uint8_t ff_log2_tab[256] = { - 0,0,1,1,2,2,2,2,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4, - 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5, - 6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6, - 6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6, - 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, - 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, - 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, - 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7 -}; diff --git a/ext/at3_standalone/compat.cpp b/ext/at3_standalone/compat.cpp new file mode 100644 index 0000000000..de17629718 --- /dev/null +++ b/ext/at3_standalone/compat.cpp @@ -0,0 +1,23 @@ +#include +#include +#include + +#include "ext/at3_standalone/compat.h" + +void av_log(void *avcl, int level, const char *fmt, ...) { + +} + +int av_get_cpu_flags(void) { + return 0; +} + +size_t av_strlcpy(char *dst, const char *src, size_t size) +{ + size_t len = 0; + while (++len < size && *src) + *dst++ = *src++; + if (len <= size) + *dst = 0; + return len + strlen(src) - 1; +} diff --git a/ext/at3_standalone/compat.h b/ext/at3_standalone/compat.h index 64217744e3..30bc8578f7 100644 --- a/ext/at3_standalone/compat.h +++ b/ext/at3_standalone/compat.h @@ -33,7 +33,6 @@ #define av_assert1(cond) #define av_assert2(cond) #define attribute_deprecated -#define attribute_align_arg #define av_printf_format(a,b) #define avpriv_report_missing_feature(...) @@ -81,14 +80,6 @@ void av_log(void *avcl, int level, const char *fmt, ...) av_printf_format(3, 4); #define FFSWAP(type,a,b) do{type SWAP_tmp= b; b= a; a= SWAP_tmp;}while(0) #define FF_ARRAY_ELEMS(a) (sizeof(a) / sizeof((a)[0])) -#ifndef av_log2 -av_const int av_log2(unsigned v); -#endif - -#ifndef av_log2_16bit -av_const int av_log2_16bit(unsigned v); -#endif - #define MKTAG(a,b,c,d) ((a) | ((b) << 8) | ((c) << 16) | ((unsigned)(d) << 24)) #pragma warning(disable:4305) diff --git a/ext/at3_standalone/fft.c b/ext/at3_standalone/fft.cpp similarity index 66% rename from ext/at3_standalone/fft.c rename to ext/at3_standalone/fft.cpp index 128de80f83..e4c7d67f54 100644 --- a/ext/at3_standalone/fft.c +++ b/ext/at3_standalone/fft.cpp @@ -35,15 +35,6 @@ #define sqrthalf (float)M_SQRT1_2 -#define BF(x, y, a, b) do { \ - x = a - b; \ - y = a + b; \ - } while (0) - -#define ff_imdct_calc_c ff_imdct_calc_c -#define ff_imdct_half_c ff_imdct_half_c -#define ff_mdct_calc_c ff_mdct_calc_c - void ff_imdct_calc_c(FFTContext *s, FFTSample *output, const FFTSample *input); void ff_imdct_half_c(FFTContext *s, FFTSample *output, const FFTSample *input); void ff_mdct_calc_c(FFTContext *s, FFTSample *output, const FFTSample *input); @@ -103,7 +94,7 @@ void ff_init_ff_cos_tabs(int index) double freq = 2*M_PI/m; FFTSample *tab = ff_cos_tabs[index]; for(i=0; i<=m/4; i++) - tab[i] = FIX15(cos(i*freq)); + tab[i] = cos(i*freq); for(i=1; inbits = nbits; n = 1 << nbits; - s->revtab = av_malloc(n * sizeof(uint16_t)); + s->revtab = (uint16_t *)av_malloc(n * sizeof(uint16_t)); if (!s->revtab) goto fail; - s->tmp_buf = av_malloc(n * sizeof(FFTComplex)); + s->tmp_buf = (FFTComplex *)av_malloc(n * sizeof(FFTComplex)); if (!s->tmp_buf) goto fail; s->inverse = inverse; @@ -147,7 +138,6 @@ int ff_fft_init(FFTContext *s, int nbits, int inverse) s->imdct_calc = ff_imdct_calc_c; s->imdct_half = ff_imdct_half_c; s->mdct_calc = ff_mdct_calc_c; - s->mdct_calcw = s->mdct_calc; for(j=4; j<=nbits; j++) { ff_init_ff_cos_tabs(j); } @@ -182,6 +172,11 @@ void ff_fft_end(FFTContext *s) av_freep(&s->tmp_buf); } +#define BF(x, y, a, b) do { \ + x = a - b; \ + y = a + b; \ + } while (0) + #define BUTTERFLIES(a0,a1,a2,a3) {\ BF(t3, t5, t5, t1);\ BF(a2.re, a0.re, a0.re, t5);\ @@ -327,3 +322,176 @@ static void fft_calc_c(FFTContext *s, FFTComplex *z) { fft_dispatch[s->nbits-2](z); } + + +#include +#include + +#include "mathematics.h" +#include "fft.h" +#include "mem.h" + +/** + * init MDCT or IMDCT computation. + */ +int ff_mdct_init(FFTContext *s, int nbits, int inverse, double scale) +{ + int n, n4, i; + double alpha, theta; + int tstep; + + memset(s, 0, sizeof(*s)); + n = 1 << nbits; + s->mdct_bits = nbits; + s->mdct_size = n; + n4 = n >> 2; + s->mdct_permutation = FF_MDCT_PERM_NONE; + + if (ff_fft_init(s, s->mdct_bits - 2, inverse) < 0) + goto fail; + + s->tcos = (FFTSample *)av_malloc_array(n / 2, sizeof(FFTSample)); + if (!s->tcos) + goto fail; + + switch (s->mdct_permutation) { + case FF_MDCT_PERM_NONE: + s->tsin = s->tcos + n4; + tstep = 1; + break; + case FF_MDCT_PERM_INTERLEAVE: + s->tsin = s->tcos + 1; + tstep = 2; + break; + default: + goto fail; + } + + theta = 1.0 / 8.0 + (scale < 0 ? n4 : 0); + scale = sqrt(fabs(scale)); + for (i = 0; i < n4; i++) { + alpha = 2 * M_PI * (i + theta) / n; + s->tcos[i * tstep] = -cos(alpha) * scale; + s->tsin[i * tstep] = -sin(alpha) * scale; + } + return 0; +fail: + ff_mdct_end(s); + return -1; +} + +/** + * Compute the middle half of the inverse MDCT of size N = 2^nbits, + * thus excluding the parts that can be derived by symmetry + * @param output N/2 samples + * @param input N/2 samples + */ +void ff_imdct_half_c(FFTContext *s, FFTSample *output, const FFTSample *input) +{ + int k, n8, n4, n2, n, j; + const uint16_t *revtab = s->revtab; + const FFTSample *tcos = s->tcos; + const FFTSample *tsin = s->tsin; + const FFTSample *in1, *in2; + FFTComplex *z = (FFTComplex *)output; + + n = 1 << s->mdct_bits; + n2 = n >> 1; + n4 = n >> 2; + n8 = n >> 3; + + /* pre rotation */ + in1 = input; + in2 = input + n2 - 1; + for (k = 0; k < n4; k++) { + j = revtab[k]; + CMUL(z[j].re, z[j].im, *in2, *in1, tcos[k], tsin[k]); + in1 += 2; + in2 -= 2; + } + s->fft_calc(s, z); + + /* post rotation + reordering */ + for (k = 0; k < n8; k++) { + FFTSample r0, i0, r1, i1; + CMUL(r0, i1, z[n8 - k - 1].im, z[n8 - k - 1].re, tsin[n8 - k - 1], tcos[n8 - k - 1]); + CMUL(r1, i0, z[n8 + k].im, z[n8 + k].re, tsin[n8 + k], tcos[n8 + k]); + z[n8 - k - 1].re = r0; + z[n8 - k - 1].im = i0; + z[n8 + k].re = r1; + z[n8 + k].im = i1; + } +} + +/** + * Compute inverse MDCT of size N = 2^nbits + * @param output N samples + * @param input N/2 samples + */ +void ff_imdct_calc_c(FFTContext *s, FFTSample *output, const FFTSample *input) +{ + int k; + int n = 1 << s->mdct_bits; + int n2 = n >> 1; + int n4 = n >> 2; + + ff_imdct_half_c(s, output + n4, input); + + for (k = 0; k < n4; k++) { + output[k] = -output[n2 - k - 1]; + output[n - k - 1] = output[n2 + k]; + } +} + +/** + * Compute MDCT of size N = 2^nbits + * @param input N samples + * @param out N/2 samples + */ +void ff_mdct_calc_c(FFTContext *s, FFTSample *out, const FFTSample *input) +{ + int i, j, n, n8, n4, n2, n3; + FFTDouble re, im; + const uint16_t *revtab = s->revtab; + const FFTSample *tcos = s->tcos; + const FFTSample *tsin = s->tsin; + FFTComplex *x = (FFTComplex *)out; + + n = 1 << s->mdct_bits; + n2 = n >> 1; + n4 = n >> 2; + n8 = n >> 3; + n3 = 3 * n4; + + /* pre rotation */ + for (i = 0; i < n8; i++) { + re = (-input[2 * i + n3] - input[n3 - 1 - 2 * i]); + im = (-input[n4 + 2 * i] + input[n4 - 1 - 2 * i]); + j = revtab[i]; + CMUL(x[j].re, x[j].im, re, im, -tcos[i], tsin[i]); + + re = (input[2 * i] - input[n2 - 1 - 2 * i]); + im = (-input[n2 + 2 * i] - input[n - 1 - 2 * i]); + j = revtab[n8 + i]; + CMUL(x[j].re, x[j].im, re, im, -tcos[n8 + i], tsin[n8 + i]); + } + + s->fft_calc(s, x); + + /* post rotation */ + for (i = 0; i < n8; i++) { + FFTSample r0, i0, r1, i1; + CMUL(i1, r0, x[n8 - i - 1].re, x[n8 - i - 1].im, -tsin[n8 - i - 1], -tcos[n8 - i - 1]); + CMUL(i0, r1, x[n8 + i].re, x[n8 + i].im, -tsin[n8 + i], -tcos[n8 + i]); + x[n8 - i - 1].re = r0; + x[n8 - i - 1].im = i0; + x[n8 + i].re = r1; + x[n8 + i].im = i1; + } +} + +void ff_mdct_end(FFTContext *s) +{ + av_freep(&s->tcos); + ff_fft_end(s); +} diff --git a/ext/at3_standalone/fft.h b/ext/at3_standalone/fft.h index 2bc28275eb..79725efcbf 100644 --- a/ext/at3_standalone/fft.h +++ b/ext/at3_standalone/fft.h @@ -19,18 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVCODEC_FFT_H -#define AVCODEC_FFT_H - -#ifndef FFT_FLOAT -#define FFT_FLOAT 1 -#endif - -#ifndef FFT_FIXED_32 -#define FFT_FIXED_32 0 -#endif - -#define FIX15(v) (v) +#pragma once #define CMUL(dre, dim, are, aim, bre, bim) do { \ (dre) = (are) * (bre) - (aim) * (bim); \ @@ -51,10 +40,6 @@ typedef struct FFTContext FFTContext; typedef float FFTDouble; -typedef struct FFTDComplex { - FFTDouble re, im; -} FFTDComplex; - /* FFT computation */ enum mdct_permutation_type { @@ -84,7 +69,6 @@ struct FFTContext { void (*imdct_calc)(struct FFTContext *s, FFTSample *output, const FFTSample *input); void (*imdct_half)(struct FFTContext *s, FFTSample *output, const FFTSample *input); void (*mdct_calc)(struct FFTContext *s, FFTSample *output, const FFTSample *input); - void (*mdct_calcw)(struct FFTContext *s, FFTDouble *output, const FFTSample *input); enum mdct_permutation_type mdct_permutation; }; @@ -123,5 +107,3 @@ void ff_fft_end(FFTContext *s); int ff_mdct_init(FFTContext *s, int nbits, int inverse, double scale); void ff_mdct_end(FFTContext *s); - -#endif /* AVCODEC_FFT_H */ diff --git a/ext/at3_standalone/float_dsp.c b/ext/at3_standalone/float_dsp.cpp similarity index 100% rename from ext/at3_standalone/float_dsp.c rename to ext/at3_standalone/float_dsp.cpp diff --git a/ext/at3_standalone/get_bits.c b/ext/at3_standalone/get_bits.cpp similarity index 98% rename from ext/at3_standalone/get_bits.c rename to ext/at3_standalone/get_bits.cpp index 34b8a3fd5b..818099d5f8 100644 --- a/ext/at3_standalone/get_bits.c +++ b/ext/at3_standalone/get_bits.cpp @@ -82,7 +82,7 @@ static int alloc_table(VLC *vlc, int size, int use_static) if (use_static) abort(); // cannot do anything, init_vlc() is used with too little memory vlc->table_allocated += (1 << vlc->bits); - vlc->table = av_realloc_f(vlc->table, vlc->table_allocated, sizeof(VLC_TYPE) * 2); + vlc->table = (VLC_TYPE(*)[2])av_realloc_f(vlc->table, vlc->table_allocated, sizeof(VLC_TYPE) * 2); if (!vlc->table) { vlc->table_allocated = 0; vlc->table_size = 0; @@ -111,7 +111,8 @@ typedef struct VLCcode { static int compare_vlcspec(const void *a, const void *b) { - const VLCcode *sa = a, *sb = b; + const VLCcode *sa = (VLCcode *)a; + const VLCcode *sb = (VLCcode *)b; return (sa->code >> 1) - (sb->code >> 1); } /** @@ -258,7 +259,7 @@ int ff_init_vlc_sparse(VLC *vlc_arg, int nb_bits, int nb_codes, vlc->table_allocated = 0; vlc->table_size = 0; - buf = av_malloc_array((nb_codes + 1), sizeof(VLCcode)); + buf = (VLCcode *)av_malloc_array((nb_codes + 1), sizeof(VLCcode)); if (!buf) return AVERROR(ENOMEM); } diff --git a/ext/at3_standalone/get_bits.h b/ext/at3_standalone/get_bits.h index 0a4b581785..2b915981ea 100644 --- a/ext/at3_standalone/get_bits.h +++ b/ext/at3_standalone/get_bits.h @@ -207,7 +207,7 @@ static inline int get_bits_count(const GetBitContext *s) static inline int get_sbits(GetBitContext *s, int n) { - register int tmp; + int tmp; OPEN_READER(re, s); av_assert2(n>0 && n<=25); UPDATE_CACHE(re, s); @@ -222,7 +222,7 @@ static inline int get_sbits(GetBitContext *s, int n) */ static inline unsigned int get_bits(GetBitContext *s, int n) { - register int tmp; + int tmp; OPEN_READER(re, s); av_assert2(n>0 && n<=25); UPDATE_CACHE(re, s); @@ -242,7 +242,7 @@ static av_always_inline int get_bitsz(GetBitContext *s, int n) static inline unsigned int get_bits_le(GetBitContext *s, int n) { - register int tmp; + int tmp; OPEN_READER(re, s); av_assert2(n>0 && n<=25); UPDATE_CACHE_LE(re, s); diff --git a/ext/at3_standalone/intmath.c b/ext/at3_standalone/intmath.c deleted file mode 100644 index ca9521f987..0000000000 --- a/ext/at3_standalone/intmath.c +++ /dev/null @@ -1,19 +0,0 @@ -/* - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "intmath.h" diff --git a/ext/at3_standalone/intmath.h b/ext/at3_standalone/intmath.h deleted file mode 100644 index 41020aaefd..0000000000 --- a/ext/at3_standalone/intmath.h +++ /dev/null @@ -1,130 +0,0 @@ -/* - * Copyright (c) 2010 Mans Rullgard - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#pragma once - -#include - -#include "compat.h" - -#if HAVE_FAST_CLZ -#if AV_GCC_VERSION_AT_LEAST(3,4) -#ifndef ff_log2 -# define ff_log2(x) (31 - __builtin_clz((x)|1)) -# ifndef ff_log2_16bit -# define ff_log2_16bit av_log2 -# endif -#endif /* ff_log2 */ -#endif /* AV_GCC_VERSION_AT_LEAST(3,4) */ -#endif - -extern const uint8_t ff_log2_tab[256]; - -#ifndef ff_log2 -#define ff_log2 ff_log2_c -static av_always_inline av_const int ff_log2_c(unsigned int v) -{ - int n = 0; - if (v & 0xffff0000) { - v >>= 16; - n += 16; - } - if (v & 0xff00) { - v >>= 8; - n += 8; - } - n += ff_log2_tab[v]; - - return n; -} -#endif - -#ifndef ff_log2_16bit -#define ff_log2_16bit ff_log2_16bit_c -static av_always_inline av_const int ff_log2_16bit_c(unsigned int v) -{ - int n = 0; - if (v & 0xff00) { - v >>= 8; - n += 8; - } - n += ff_log2_tab[v]; - - return n; -} -#endif - -#define av_log2 ff_log2 -#define av_log2_16bit ff_log2_16bit - -/** - * @addtogroup lavu_math - * @{ - */ - -#if HAVE_FAST_CLZ -#if AV_GCC_VERSION_AT_LEAST(3,4) -#ifndef ff_ctz -#define ff_ctz(v) __builtin_ctz(v) -#endif -#ifndef ff_ctzll -#define ff_ctzll(v) __builtin_ctzll(v) -#endif -#ifndef ff_clz -#define ff_clz(v) __builtin_clz(v) -#endif -#endif -#endif - -#ifndef ff_ctz -#define ff_ctz ff_ctz_c -/** - * Trailing zero bit count. - * - * @param v input value. If v is 0, the result is undefined. - * @return the number of trailing 0-bits - */ -/* We use the De-Bruijn method outlined in: - * http://supertech.csail.mit.edu/papers/debruijn.pdf. */ -static av_always_inline av_const int ff_ctz_c(int v) -{ - static const uint8_t debruijn_ctz32[32] = { - 0, 1, 28, 2, 29, 14, 24, 3, 30, 22, 20, 15, 25, 17, 4, 8, - 31, 27, 13, 23, 21, 19, 16, 7, 26, 12, 18, 6, 11, 5, 10, 9 - }; - return debruijn_ctz32[(uint32_t)((v & -v) * 0x077CB531U) >> 27]; -} -#endif - -#ifndef ff_ctzll -#define ff_ctzll ff_ctzll_c -/* We use the De-Bruijn method outlined in: - * http://supertech.csail.mit.edu/papers/debruijn.pdf. */ -static av_always_inline av_const int ff_ctzll_c(long long v) -{ - static const uint8_t debruijn_ctz64[64] = { - 0, 1, 2, 53, 3, 7, 54, 27, 4, 38, 41, 8, 34, 55, 48, 28, - 62, 5, 39, 46, 44, 42, 22, 9, 24, 35, 59, 56, 49, 18, 29, 11, - 63, 52, 6, 26, 37, 40, 33, 47, 61, 45, 43, 21, 23, 58, 17, 10, - 51, 25, 36, 32, 60, 20, 57, 16, 50, 31, 19, 15, 30, 14, 13, 12 - }; - return debruijn_ctz64[(uint64_t)((v & -v) * 0x022FDD63CC95386DU) >> 58]; -} -#endif diff --git a/ext/at3_standalone/mathematics.c b/ext/at3_standalone/mathematics.cpp similarity index 81% rename from ext/at3_standalone/mathematics.c rename to ext/at3_standalone/mathematics.cpp index 65d63085c7..f99bf1b0d0 100644 --- a/ext/at3_standalone/mathematics.c +++ b/ext/at3_standalone/mathematics.cpp @@ -27,7 +27,6 @@ #include #include "mathematics.h" -#include "intmath.h" #include "compat.h" /* Stein's binary GCD algorithm: @@ -66,11 +65,11 @@ int64_t av_rescale_rnd(int64_t a, int64_t b, int64_t c, enum AVRounding rnd) if (rnd & AV_ROUND_PASS_MINMAX) { if (a == INT64_MIN || a == INT64_MAX) return a; - rnd -= AV_ROUND_PASS_MINMAX; + rnd = (AVRounding)(rnd - AV_ROUND_PASS_MINMAX); } if (a < 0) - return -(uint64_t)av_rescale_rnd(-FFMAX(a, -INT64_MAX), b, c, rnd ^ ((rnd >> 1) & 1)); + return -(uint64_t)av_rescale_rnd(-FFMAX(a, -INT64_MAX), b, c, (AVRounding)((int)rnd ^ (((int)rnd >> 1) & 1))); if (rnd == AV_ROUND_NEAR_INF) r = c / 2; @@ -155,7 +154,7 @@ int av_reduce(int *dst_num, int *dst_den, den = FFABS(den) / gcd; } if (num <= max && den <= max) { - a1 = (AVRational){ num, den }; + a1 = AVRational{ (int)num, (int)den }; den = 0; } @@ -170,12 +169,12 @@ int av_reduce(int *dst_num, int *dst_den, if (a1.den) x = FFMIN(x, (max - a0.den) / a1.den); if (den * (2 * x * a1.den + a0.den) > num * a1.den) - a1 = (AVRational){ x * a1.num + a0.num, x * a1.den + a0.den }; + a1 = AVRational{(int)(x * a1.num + a0.num), (int)(x * a1.den + a0.den) }; break; } a0 = a1; - a1 = (AVRational){ a2n, a2d }; + a1 = AVRational{(int)a2n, (int)a2d }; num = den; den = next_den; } @@ -198,7 +197,7 @@ AVRational av_mul_q(AVRational b, AVRational c) AVRational av_div_q(AVRational b, AVRational c) { - return av_mul_q(b, (AVRational) { c.den, c.num }); + return av_mul_q(b, AVRational { c.den, c.num }); } AVRational av_add_q(AVRational b, AVRational c) { @@ -215,9 +214,9 @@ AVRational av_d2q(double d, int max) int exponent; int64_t den; if (isnan(d)) - return (AVRational) { 0, 0 }; + return AVRational { 0, 0 }; if (fabs(d) > INT_MAX + 3LL) - return (AVRational) { d < 0 ? -1 : 1, 0 }; + return AVRational { d < 0 ? -1 : 1, 0 }; frexp(d, &exponent); exponent = FFMAX(exponent - 1, 0); den = 1LL << (61 - exponent); @@ -228,3 +227,42 @@ AVRational av_d2q(double d, int max) return a; } + +static const uint8_t ff_logg2_tab[256] = { + 0,0,1,1,2,2,2,2,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4, + 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5, + 6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6, + 6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6, + 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, + 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, + 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, + 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7 +}; + +int av_log2(unsigned int v) +{ + int n = 0; + if (v & 0xffff0000) { + v >>= 16; + n += 16; + } + if (v & 0xff00) { + v >>= 8; + n += 8; + } + n += ff_logg2_tab[v]; + + return n; +} + +int av_log2_16bit(unsigned int v) +{ + int n = 0; + if (v & 0xff00) { + v >>= 8; + n += 8; + } + n += ff_logg2_tab[v]; + + return n; +} diff --git a/ext/at3_standalone/mathematics.h b/ext/at3_standalone/mathematics.h index 5fd4af7a2d..4a026e59cb 100644 --- a/ext/at3_standalone/mathematics.h +++ b/ext/at3_standalone/mathematics.h @@ -18,8 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVUTIL_MATHEMATICS_H -#define AVUTIL_MATHEMATICS_H +#pragma once #include #include @@ -27,8 +26,75 @@ #include "compat.h" -extern const uint32_t ff_inverse[257]; -extern const uint8_t ff_sqrt_tab[256]; + +#if HAVE_FAST_CLZ +#if AV_GCC_VERSION_AT_LEAST(3,4) +#ifndef ff_log2 +# define ff_log2(x) (31 - __builtin_clz((x)|1)) +# ifndef ff_log2_16bit +# define ff_log2_16bit av_log2 +# endif +#endif /* ff_log2 */ +#endif /* AV_GCC_VERSION_AT_LEAST(3,4) */ +#endif + +int av_log2(unsigned int v); +int av_log2_16bit(unsigned int v); + +/** + * @addtogroup lavu_math + * @{ + */ + +#if HAVE_FAST_CLZ +#if AV_GCC_VERSION_AT_LEAST(3,4) +#ifndef ff_ctz +#define ff_ctz(v) __builtin_ctz(v) +#endif +#ifndef ff_ctzll +#define ff_ctzll(v) __builtin_ctzll(v) +#endif +#ifndef ff_clz +#define ff_clz(v) __builtin_clz(v) +#endif +#endif +#endif + +#ifndef ff_ctz +#define ff_ctz ff_ctz_c + /** + * Trailing zero bit count. + * + * @param v input value. If v is 0, the result is undefined. + * @return the number of trailing 0-bits + */ + /* We use the De-Bruijn method outlined in: + * http://supertech.csail.mit.edu/papers/debruijn.pdf. */ +static av_always_inline av_const int ff_ctz_c(int v) +{ + static const uint8_t debruijn_ctz32[32] = { + 0, 1, 28, 2, 29, 14, 24, 3, 30, 22, 20, 15, 25, 17, 4, 8, + 31, 27, 13, 23, 21, 19, 16, 7, 26, 12, 18, 6, 11, 5, 10, 9 + }; + return debruijn_ctz32[(uint32_t)((v & -v) * 0x077CB531U) >> 27]; +} +#endif + +#ifndef ff_ctzll +#define ff_ctzll ff_ctzll_c +/* We use the De-Bruijn method outlined in: + * http://supertech.csail.mit.edu/papers/debruijn.pdf. */ +static av_always_inline av_const int ff_ctzll_c(long long v) +{ + static const uint8_t debruijn_ctz64[64] = { + 0, 1, 2, 53, 3, 7, 54, 27, 4, 38, 41, 8, 34, 55, 48, 28, + 62, 5, 39, 46, 44, 42, 22, 9, 24, 35, 59, 56, 49, 18, 29, 11, + 63, 52, 6, 26, 37, 40, 33, 47, 61, 45, 43, 21, 23, 58, 17, 10, + 51, 25, 36, 32, 60, 20, 57, 16, 50, 31, 19, 15, 30, 14, 13, 12 + }; + return debruijn_ctz64[(uint64_t)((v & -v) * 0x022FDD63CC95386DU) >> 58]; +} +#endif static inline int sign_extend(int val, unsigned bits) { @@ -258,5 +324,3 @@ static inline int av_popcount64(uint64_t x) { return av_popcount((uint32_t)x) + av_popcount((uint32_t)(x >> 32)); } - -#endif /* AVUTIL_MATHEMATICS_H */ diff --git a/ext/at3_standalone/mdct_template.c b/ext/at3_standalone/mdct_template.c deleted file mode 100644 index f17dd1c118..0000000000 --- a/ext/at3_standalone/mdct_template.c +++ /dev/null @@ -1,192 +0,0 @@ -/* - * MDCT/IMDCT transforms - * Copyright (c) 2002 Fabrice Bellard - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include -#include - -#include "mathematics.h" -#include "fft.h" -#include "mem.h" - -/** - * init MDCT or IMDCT computation. - */ -int ff_mdct_init(FFTContext *s, int nbits, int inverse, double scale) -{ - int n, n4, i; - double alpha, theta; - int tstep; - - memset(s, 0, sizeof(*s)); - n = 1 << nbits; - s->mdct_bits = nbits; - s->mdct_size = n; - n4 = n >> 2; - s->mdct_permutation = FF_MDCT_PERM_NONE; - - if (ff_fft_init(s, s->mdct_bits - 2, inverse) < 0) - goto fail; - - s->tcos = av_malloc_array(n/2, sizeof(FFTSample)); - if (!s->tcos) - goto fail; - - switch (s->mdct_permutation) { - case FF_MDCT_PERM_NONE: - s->tsin = s->tcos + n4; - tstep = 1; - break; - case FF_MDCT_PERM_INTERLEAVE: - s->tsin = s->tcos + 1; - tstep = 2; - break; - default: - goto fail; - } - - theta = 1.0 / 8.0 + (scale < 0 ? n4 : 0); - scale = sqrt(fabs(scale)); - for(i=0;itcos[i*tstep] = FIX15(-cos(alpha) * scale); - s->tsin[i*tstep] = FIX15(-sin(alpha) * scale); - } - return 0; - fail: - ff_mdct_end(s); - return -1; -} - -/** - * Compute the middle half of the inverse MDCT of size N = 2^nbits, - * thus excluding the parts that can be derived by symmetry - * @param output N/2 samples - * @param input N/2 samples - */ -void ff_imdct_half_c(FFTContext *s, FFTSample *output, const FFTSample *input) -{ - int k, n8, n4, n2, n, j; - const uint16_t *revtab = s->revtab; - const FFTSample *tcos = s->tcos; - const FFTSample *tsin = s->tsin; - const FFTSample *in1, *in2; - FFTComplex *z = (FFTComplex *)output; - - n = 1 << s->mdct_bits; - n2 = n >> 1; - n4 = n >> 2; - n8 = n >> 3; - - /* pre rotation */ - in1 = input; - in2 = input + n2 - 1; - for(k = 0; k < n4; k++) { - j=revtab[k]; - CMUL(z[j].re, z[j].im, *in2, *in1, tcos[k], tsin[k]); - in1 += 2; - in2 -= 2; - } - s->fft_calc(s, z); - - /* post rotation + reordering */ - for(k = 0; k < n8; k++) { - FFTSample r0, i0, r1, i1; - CMUL(r0, i1, z[n8-k-1].im, z[n8-k-1].re, tsin[n8-k-1], tcos[n8-k-1]); - CMUL(r1, i0, z[n8+k ].im, z[n8+k ].re, tsin[n8+k ], tcos[n8+k ]); - z[n8-k-1].re = r0; - z[n8-k-1].im = i0; - z[n8+k ].re = r1; - z[n8+k ].im = i1; - } -} - -/** - * Compute inverse MDCT of size N = 2^nbits - * @param output N samples - * @param input N/2 samples - */ -void ff_imdct_calc_c(FFTContext *s, FFTSample *output, const FFTSample *input) -{ - int k; - int n = 1 << s->mdct_bits; - int n2 = n >> 1; - int n4 = n >> 2; - - ff_imdct_half_c(s, output+n4, input); - - for(k = 0; k < n4; k++) { - output[k] = -output[n2-k-1]; - output[n-k-1] = output[n2+k]; - } -} - -/** - * Compute MDCT of size N = 2^nbits - * @param input N samples - * @param out N/2 samples - */ -void ff_mdct_calc_c(FFTContext *s, FFTSample *out, const FFTSample *input) -{ - int i, j, n, n8, n4, n2, n3; - FFTDouble re, im; - const uint16_t *revtab = s->revtab; - const FFTSample *tcos = s->tcos; - const FFTSample *tsin = s->tsin; - FFTComplex *x = (FFTComplex *)out; - - n = 1 << s->mdct_bits; - n2 = n >> 1; - n4 = n >> 2; - n8 = n >> 3; - n3 = 3 * n4; - - /* pre rotation */ - for(i=0;ifft_calc(s, x); - - /* post rotation */ - for(i=0;itcos); - ff_fft_end(s); -} diff --git a/ext/at3_standalone/mem.c b/ext/at3_standalone/mem.cpp similarity index 98% rename from ext/at3_standalone/mem.c rename to ext/at3_standalone/mem.cpp index 0e2314fb3b..d9ade84de3 100644 --- a/ext/at3_standalone/mem.c +++ b/ext/at3_standalone/mem.cpp @@ -104,7 +104,7 @@ void av_freep(void *arg) void *val; memcpy(&val, arg, sizeof(val)); - memcpy(arg, &(void *){ NULL }, sizeof(val)); + memset(arg, 0, sizeof(val)); av_free(val); } diff --git a/ext/at3_standalone/sinewin.c b/ext/at3_standalone/sinewin.cpp similarity index 100% rename from ext/at3_standalone/sinewin.c rename to ext/at3_standalone/sinewin.cpp From 0d30728832580b541da68aeb8aa3a0ede84517a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Thu, 11 Apr 2024 10:33:55 +0200 Subject: [PATCH 083/719] Remove context parameter from av_log --- Core/HW/Atrac3Standalone.cpp | 1 - ext/at3_standalone/atrac3.cpp | 36 +-- ext/at3_standalone/atrac3plus.cpp | 26 +- ext/at3_standalone/atrac3plus.h | 3 +- ext/at3_standalone/atrac3plusdec.cpp | 20 +- ext/at3_standalone/atrac3plusdsp.cpp | 2 +- ext/at3_standalone/avcodec.cpp | 6 +- ext/at3_standalone/avcodec.h | 430 --------------------------- ext/at3_standalone/compat.cpp | 4 +- ext/at3_standalone/compat.h | 14 +- ext/at3_standalone/get_bits.cpp | 8 +- ext/at3_standalone/mathematics.cpp | 26 +- ext/at3_standalone/mathematics.h | 17 +- ext/at3_standalone/mem.h | 11 - 14 files changed, 62 insertions(+), 542 deletions(-) diff --git a/Core/HW/Atrac3Standalone.cpp b/Core/HW/Atrac3Standalone.cpp index 517f56b117..eecc5a9c97 100644 --- a/Core/HW/Atrac3Standalone.cpp +++ b/Core/HW/Atrac3Standalone.cpp @@ -42,7 +42,6 @@ public: ctx_->block_align = inbytes; ctx_->channels = 2; ctx_->channel_layout = ctx_->channels == 2 ? AV_CH_LAYOUT_STEREO : AV_CH_LAYOUT_MONO; - ctx_->sample_rate = 44100; int retval; if (audioType_ == PSP_CODEC_AT3PLUS) { retval = avcodec_open2(ctx_, &ff_atrac3p_decoder, nullptr); diff --git a/ext/at3_standalone/atrac3.cpp b/ext/at3_standalone/atrac3.cpp index 2227f9c1f4..0f27477935 100644 --- a/ext/at3_standalone/atrac3.cpp +++ b/ext/at3_standalone/atrac3.cpp @@ -578,12 +578,12 @@ static int decode_channel_sound_unit(ATRAC3Context *q, GetBitContext *gb, if (coding_mode == JOINT_STEREO && channel_num == 1) { if (get_bits(gb, 2) != 3) { - av_log(NULL,AV_LOG_ERROR,"JS mono Sound Unit id != 3.\n"); + av_log(AV_LOG_ERROR,"JS mono Sound Unit id != 3.\n"); return AVERROR_INVALIDDATA; } } else { if (get_bits(gb, 6) != 0x28) { - av_log(NULL,AV_LOG_ERROR,"Sound Unit id != 0x28.\n"); + av_log(AV_LOG_ERROR,"Sound Unit id != 0x28.\n"); return AVERROR_INVALIDDATA; } } @@ -737,7 +737,7 @@ int atrac3_decode_frame(AVCodecContext *avctx, float *out_data[2], int *nb_sampl const uint8_t *databuf; if (buf_size < avctx->block_align) { - av_log(avctx, AV_LOG_ERROR, + av_log(AV_LOG_ERROR, "Frame too small (%d bytes). Truncated file?\n", buf_size); return AVERROR_INVALIDDATA; } @@ -755,7 +755,7 @@ int atrac3_decode_frame(AVCodecContext *avctx, float *out_data[2], int *nb_sampl ret = decode_frame(avctx, databuf, out_data); if (ret) { - av_log(NULL, AV_LOG_ERROR, "Frame decoding error!\n"); + av_log( AV_LOG_ERROR, "Frame decoding error!\n"); return ret; } @@ -792,7 +792,7 @@ static int atrac3_decode_init(AVCodecContext *avctx) ATRAC3Context *q = (ATRAC3Context * )avctx->priv_data; if (avctx->channels <= 0 || avctx->channels > 2) { - av_log(avctx, AV_LOG_ERROR, "Channel configuration error!\n"); + av_log(AV_LOG_ERROR, "Channel configuration error!\n"); return AVERROR(EINVAL); } @@ -803,14 +803,14 @@ static int atrac3_decode_init(AVCodecContext *avctx) /* Take care of the codec-specific extradata. */ if (avctx->extradata_size == 14) { /* Parse the extradata, WAV format */ - av_log(avctx, AV_LOG_DEBUG, "[0-1] %d\n", + av_log(AV_LOG_DEBUG, "[0-1] %d\n", bytestream_get_le16(&edata_ptr)); // Unknown value always 1 edata_ptr += 4; // samples per channel q->coding_mode = bytestream_get_le16(&edata_ptr); - av_log(avctx, AV_LOG_DEBUG,"[8-9] %d\n", + av_log(AV_LOG_DEBUG,"[8-9] %d\n", bytestream_get_le16(&edata_ptr)); //Dupe of coding mode frame_factor = bytestream_get_le16(&edata_ptr); // Unknown always 1 - av_log(avctx, AV_LOG_DEBUG,"[12-13] %d\n", + av_log(AV_LOG_DEBUG,"[12-13] %d\n", bytestream_get_le16(&edata_ptr)); // Unknown always 0 /* setup */ @@ -823,7 +823,7 @@ static int atrac3_decode_init(AVCodecContext *avctx) if (avctx->block_align != 96 * avctx->channels * frame_factor && avctx->block_align != 152 * avctx->channels * frame_factor && avctx->block_align != 192 * avctx->channels * frame_factor) { - av_log(avctx, AV_LOG_ERROR, "Unknown frame/channel/frame_factor " + av_log(AV_LOG_ERROR, "Unknown frame/channel/frame_factor " "configuration %d/%d/%d\n", avctx->block_align, avctx->channels, frame_factor); return AVERROR_INVALIDDATA; @@ -837,7 +837,7 @@ static int atrac3_decode_init(AVCodecContext *avctx) q->scrambled_stream = 1; } else { - av_log(NULL, AV_LOG_ERROR, "Unknown extradata size %d.\n", + av_log(AV_LOG_ERROR, "Unknown extradata size %d.\n", avctx->extradata_size); return AVERROR(EINVAL); } @@ -845,33 +845,33 @@ static int atrac3_decode_init(AVCodecContext *avctx) /* Check the extradata */ if (version != 4) { - av_log(avctx, AV_LOG_ERROR, "Version %d != 4.\n", version); + av_log(AV_LOG_ERROR, "Version %d != 4.\n", version); return AVERROR_INVALIDDATA; } if (samples_per_frame != SAMPLES_PER_FRAME && samples_per_frame != SAMPLES_PER_FRAME * 2) { - av_log(avctx, AV_LOG_ERROR, "Unknown amount of samples per frame %d.\n", + av_log(AV_LOG_ERROR, "Unknown amount of samples per frame %d.\n", samples_per_frame); return AVERROR_INVALIDDATA; } if (delay != 0x88E) { - av_log(avctx, AV_LOG_ERROR, "Unknown amount of delay %x != 0x88E.\n", + av_log(AV_LOG_ERROR, "Unknown amount of delay %x != 0x88E.\n", delay); return AVERROR_INVALIDDATA; } if (q->coding_mode == STEREO) - av_log(avctx, AV_LOG_DEBUG, "Normal stereo detected.\n"); + av_log(AV_LOG_DEBUG, "Normal stereo detected.\n"); else if (q->coding_mode == JOINT_STEREO) { if (avctx->channels != 2) { - av_log(avctx, AV_LOG_ERROR, "Invalid coding mode\n"); + av_log(AV_LOG_ERROR, "Invalid coding mode\n"); return AVERROR_INVALIDDATA; } - av_log(avctx, AV_LOG_DEBUG, "Joint stereo detected.\n"); + av_log(AV_LOG_DEBUG, "Joint stereo detected.\n"); } else { - av_log(avctx, AV_LOG_ERROR, "Unknown channel coding mode %x!\n", + av_log(AV_LOG_ERROR, "Unknown channel coding mode %x!\n", q->coding_mode); return AVERROR_INVALIDDATA; } @@ -885,7 +885,7 @@ static int atrac3_decode_init(AVCodecContext *avctx) /* initialize the MDCT transform */ if ((ret = ff_mdct_init(&q->mdct_ctx, 9, 1, 1.0 / 32768)) < 0) { - av_log(avctx, AV_LOG_ERROR, "Error initializing MDCT\n"); + av_log(AV_LOG_ERROR, "Error initializing MDCT\n"); av_freep(&q->decoded_bytes_buffer); return ret; } diff --git a/ext/at3_standalone/atrac3plus.cpp b/ext/at3_standalone/atrac3plus.cpp index 053b3404c6..1db8821a98 100644 --- a/ext/at3_standalone/atrac3plus.cpp +++ b/ext/at3_standalone/atrac3plus.cpp @@ -28,7 +28,6 @@ #include #include -//#include "avcodec.h" #include "mathematics.h" #include "get_bits.h" #include "atrac3plus.h" @@ -230,7 +229,7 @@ static int num_coded_units(GetBitContext *gb, Atrac3pChanParams *chan, } else { chan->num_coded_vals = get_bits(gb, 5); if (chan->num_coded_vals > ctx->num_quant_units) { - av_log(avctx, AV_LOG_ERROR, + av_log(AV_LOG_ERROR, "Invalid number of transmitted units!\n"); return AVERROR_INVALIDDATA; } @@ -262,7 +261,7 @@ static int add_wordlen_weights(Atrac3pChanUnitCtx *ctx, for (i = 0; i < ctx->num_quant_units; i++) { chan->qu_wordlen[i] += weights_tab[i]; if (chan->qu_wordlen[i] < 0 || chan->qu_wordlen[i] > 7) { - av_log(avctx, AV_LOG_ERROR, + av_log(AV_LOG_ERROR, "WL index out of range: pos=%d, val=%d!\n", i, chan->qu_wordlen[i]); return AVERROR_INVALIDDATA; @@ -291,7 +290,7 @@ static int subtract_sf_weights(Atrac3pChanUnitCtx *ctx, for (i = 0; i < ctx->used_quant_units; i++) { chan->qu_sf_idx[i] -= weights_tab[i]; if (chan->qu_sf_idx[i] < 0 || chan->qu_sf_idx[i] > 63) { - av_log(avctx, AV_LOG_ERROR, + av_log(AV_LOG_ERROR, "SF index out of range: pos=%d, val=%d!\n", i, chan->qu_sf_idx[i]); return AVERROR_INVALIDDATA; @@ -372,7 +371,7 @@ static int decode_channel_wordlen(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, if (chan->num_coded_vals) { pos = get_bits(gb, 5); if (pos > chan->num_coded_vals) { - av_log(avctx, AV_LOG_ERROR, + av_log(AV_LOG_ERROR, "WL mode 1: invalid position!\n"); return AVERROR_INVALIDDATA; } @@ -460,7 +459,7 @@ static int decode_channel_wordlen(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, pos = ch_num ? chan->num_coded_vals + chan->split_point : ctx->num_quant_units - chan->split_point; if (pos > FF_ARRAY_ELEMS(chan->qu_wordlen)) { - av_log(avctx, AV_LOG_ERROR, "Split point beyond array\n"); + av_log(AV_LOG_ERROR, "Split point beyond array\n"); pos = FF_ARRAY_ELEMS(chan->qu_wordlen); } for (i = chan->num_coded_vals; i < pos; i++) @@ -526,7 +525,7 @@ static int decode_channel_sf_idx(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, delta_bits = get_bits(gb, 3); min_val = get_bits(gb, 6); if (num_long_vals > ctx->used_quant_units || delta_bits == 7) { - av_log(avctx, AV_LOG_ERROR, + av_log(AV_LOG_ERROR, "SF mode 1: invalid parameters!\n"); return AVERROR_INVALIDDATA; } @@ -685,7 +684,7 @@ static int get_num_ct_values(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, if (get_bits1(gb)) { num_coded_vals = get_bits(gb, 5); if (num_coded_vals > ctx->used_quant_units) { - av_log(avctx, AV_LOG_ERROR, + av_log(AV_LOG_ERROR, "Invalid number of code table indexes: %d!\n", num_coded_vals); return AVERROR_INVALIDDATA; } @@ -1346,7 +1345,7 @@ static int decode_gainc_loc_codes(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, for (i = 0; i < chan->gain_data[sb].num_points; i++) { if (dst->loc_code[i] < 0 || dst->loc_code[i] > 31 || (i && dst->loc_code[i] <= dst->loc_code[i - 1])) { - av_log(avctx, AV_LOG_ERROR, + av_log(AV_LOG_ERROR, "Invalid gain location: ch=%d, sb=%d, pos=%d, val=%d\n", ch_num, sb, i, dst->loc_code[i]); return AVERROR_INVALIDDATA; @@ -1492,10 +1491,9 @@ static int decode_band_numwavs(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, for (sb = 0; sb < ctx->waves_info->num_tone_bands; sb++) if (band_has_tones[sb]) { if (ctx->waves_info->tones_index + dst[sb].num_wavs > 48) { - av_log(avctx, AV_LOG_ERROR, - "Too many tones: %d (max. 48), frame: %d!\n", - ctx->waves_info->tones_index + dst[sb].num_wavs, - avctx->frame_number); + av_log(AV_LOG_ERROR, + "Too many tones: %d (max. 48)!\n", + ctx->waves_info->tones_index + dst[sb].num_wavs); return AVERROR_INVALIDDATA; } dst[sb].start_index = ctx->waves_info->tones_index; @@ -1769,7 +1767,7 @@ int ff_atrac3p_decode_channel_unit(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, /* parse sound header */ ctx->num_quant_units = get_bits(gb, 5) + 1; if (ctx->num_quant_units > 28 && ctx->num_quant_units < 32) { - av_log(avctx, AV_LOG_ERROR, + av_log(AV_LOG_ERROR, "Invalid number of quantization units: %d!\n", ctx->num_quant_units); return AVERROR_INVALIDDATA; diff --git a/ext/at3_standalone/atrac3plus.h b/ext/at3_standalone/atrac3plus.h index 23f1ff2cee..d661bf8551 100644 --- a/ext/at3_standalone/atrac3plus.h +++ b/ext/at3_standalone/atrac3plus.h @@ -173,10 +173,9 @@ int ff_atrac3p_decode_channel_unit(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, /** * Initialize IMDCT transform. * - * @param[in] avctx ptr to the AVCodecContext * @param[in] mdct_ctx pointer to MDCT transform context */ -void ff_atrac3p_init_imdct(AVCodecContext *avctx, FFTContext *mdct_ctx); +void ff_atrac3p_init_imdct(FFTContext *mdct_ctx); /** * Initialize sine waves synthesizer. diff --git a/ext/at3_standalone/atrac3plusdec.cpp b/ext/at3_standalone/atrac3plusdec.cpp index 15a35dfc30..9312540dbe 100644 --- a/ext/at3_standalone/atrac3plusdec.cpp +++ b/ext/at3_standalone/atrac3plusdec.cpp @@ -45,7 +45,7 @@ #include "atrac.h" #include "atrac3plus.h" -typedef struct ATRAC3PContext { +struct ATRAC3PContext { GetBitContext gb; DECLARE_ALIGNED(32, float, samples)[2][ATRAC3P_FRAME_SAMPLES]; ///< quantized MDCT spectrum @@ -62,7 +62,7 @@ typedef struct ATRAC3PContext { int num_channel_blocks; ///< number of channel blocks uint8_t channel_blocks[5]; ///< channel configuration descriptor uint64_t my_channel_layout; ///< current channel layout -} ATRAC3PContext; +}; int atrac3p_decode_close(AVCodecContext *avctx) { @@ -76,16 +76,12 @@ int atrac3p_decode_close(AVCodecContext *avctx) return 0; } -static int set_channel_params(ATRAC3PContext *ctx, - AVCodecContext *avctx) -{ +static int set_channel_params(ATRAC3PContext *ctx, AVCodecContext *avctx) { memset(ctx->channel_blocks, 0, sizeof(ctx->channel_blocks)); - switch (avctx->channels) { case 1: if (avctx->channel_layout != AV_CH_FRONT_LEFT) avctx->channel_layout = AV_CH_LAYOUT_MONO; - ctx->num_channel_blocks = 1; ctx->channel_blocks[0] = CH_UNIT_MONO; break; @@ -134,7 +130,7 @@ static int set_channel_params(ATRAC3PContext *ctx, ctx->channel_blocks[4] = CH_UNIT_MONO; break; default: - av_log(avctx, AV_LOG_ERROR, + av_log(AV_LOG_ERROR, "Unsupported channel count: %d!\n", avctx->channels); return AVERROR_INVALIDDATA; } @@ -148,7 +144,7 @@ int atrac3p_decode_init(AVCodecContext *avctx) int i, ch, ret; if (!avctx->block_align) { - av_log(avctx, AV_LOG_ERROR, "block_align is not set\n"); + av_log(AV_LOG_ERROR, "block_align is not set\n"); return AVERROR(EINVAL); } @@ -157,7 +153,7 @@ int atrac3p_decode_init(AVCodecContext *avctx) /* initialize IPQF */ ff_mdct_init(&ctx->ipqf_dct_ctx, 5, 1, 32.0 / 32768.0); - ff_atrac3p_init_imdct(avctx, &ctx->mdct_ctx); + ff_atrac3p_init_imdct(&ctx->mdct_ctx); ff_atrac_init_gain_compensation(&ctx->gainc_ctx, 6, 2); @@ -333,7 +329,7 @@ int atrac3p_decode_frame(AVCodecContext *avctx, float *out_data[2], int *nb_samp return ret; if (get_bits1(&ctx->gb)) { - av_log(avctx, AV_LOG_ERROR, "Invalid start bit!\n"); + av_log(AV_LOG_ERROR, "Invalid start bit!\n"); return AVERROR_INVALIDDATA; } @@ -345,7 +341,7 @@ int atrac3p_decode_frame(AVCodecContext *avctx, float *out_data[2], int *nb_samp } if (ch_block >= ctx->num_channel_blocks || ctx->channel_blocks[ch_block] != ch_unit_id) { - av_log(avctx, AV_LOG_ERROR, + av_log(AV_LOG_ERROR, "Frame data doesn't match channel configuration!\n"); return AVERROR_INVALIDDATA; } diff --git a/ext/at3_standalone/atrac3plusdsp.cpp b/ext/at3_standalone/atrac3plusdsp.cpp index d98775b94a..0fbcb11e11 100644 --- a/ext/at3_standalone/atrac3plusdsp.cpp +++ b/ext/at3_standalone/atrac3plusdsp.cpp @@ -77,7 +77,7 @@ const float ff_atrac3p_mant_tab[8] = { #define ATRAC3P_MDCT_SIZE (ATRAC3P_SUBBAND_SAMPLES * 2) -void ff_atrac3p_init_imdct(AVCodecContext *avctx, FFTContext *mdct_ctx) +void ff_atrac3p_init_imdct(FFTContext *mdct_ctx) { ff_init_ff_sine_windows(7); ff_init_ff_sine_windows(6); diff --git a/ext/at3_standalone/avcodec.cpp b/ext/at3_standalone/avcodec.cpp index 0ef45272c8..4b94457478 100644 --- a/ext/at3_standalone/avcodec.cpp +++ b/ext/at3_standalone/avcodec.cpp @@ -47,7 +47,6 @@ AVCodecContext *avcodec_alloc_context3(const AVCodec *codec) if (codec) { avctx->codec = codec; - avctx->codec_id = codec->id; } if (codec && codec->priv_data_size) { @@ -90,9 +89,6 @@ int avcodec_open2(AVCodecContext *avctx, const AVCodec *codec, void *options) } avctx->codec = codec; - avctx->codec_id = codec->id; - - avctx->frame_number = 0; if (avctx->codec->init) { ret = avctx->codec->init(avctx); @@ -110,7 +106,7 @@ int avcodec_open2(AVCodecContext *avctx, const AVCodec *codec, void *options) avctx->channels = channels; else if (channels != avctx->channels) { char buf[512] = ""; - av_log(avctx, AV_LOG_WARNING, + av_log(AV_LOG_WARNING, "Channel layout '%s' with %d channels does not match specified number of channels %d: " "ignoring specified channel layout\n", buf, channels, avctx->channels); diff --git a/ext/at3_standalone/avcodec.h b/ext/at3_standalone/avcodec.h index 1b444e0222..d0ed2184b6 100644 --- a/ext/at3_standalone/avcodec.h +++ b/ext/at3_standalone/avcodec.h @@ -21,79 +21,14 @@ #ifndef AVCODEC_AVCODEC_H #define AVCODEC_AVCODEC_H -/** - * @file - * @ingroup libavc - * Libavcodec external API header - */ - #include #include "compat.h" #include "channel_layout.h" #include "mem.h" -/** - * @defgroup libavc Encoding/Decoding Library - * @{ - * - * @defgroup lavc_decoding Decoding - * @{ - * @} - * - * @defgroup lavc_encoding Encoding - * @{ - * @} - * - * @defgroup lavc_codec Codecs - * @{ - * @defgroup lavc_codec_native Native Codecs - * @{ - * @} - * @defgroup lavc_codec_wrappers External library wrappers - * @{ - * @} - * @defgroup lavc_codec_hwaccel Hardware Accelerators bridge - * @{ - * @} - * @} - * @defgroup lavc_internal Internal - * @{ - * @} - * @} - * - */ - -/** - * @defgroup lavc_core Core functions/structures. - * @ingroup libavc - * - * Basic definitions, functions for querying libavcodec capabilities, - * allocating core structures, etc. - * @{ - */ - - -/** - * Identify the syntax and semantics of the bitstream. - * The principle is roughly: - * Two decoders with the same ID can decode the same streams. - * Two encoders with the same ID can encode compatible streams. - * There may be slight deviations from the principle due to implementation - * details. - * - * If you add a codec ID to this list, add it so that - * 1. no value of a existing codec ID changes (that would break ABI), - * 2. it is as close as possible to similar codecs - * - * After adding new codec IDs, do not forget to add an entry to the codec - * descriptor list and bump libavcodec minor version. - */ enum AVCodecID { - AV_CODEC_ID_NONE, - AV_CODEC_ID_ATRAC3, AV_CODEC_ID_ATRAC3P, - AV_CODEC_ID_ATRAC1, }; /** @@ -106,179 +41,6 @@ enum AVCodecID { */ #define AV_INPUT_BUFFER_PADDING_SIZE 32 -/** - * @ingroup lavc_encoding - * minimum encoding buffer size - * Used to avoid some checks during header writing. - */ -#define AV_INPUT_BUFFER_MIN_SIZE 16384 - -#if FF_API_MAX_BFRAMES -/** - * @deprecated there is no libavcodec-wide limit on the number of B-frames - */ -#define FF_MAX_B_FRAMES 16 -#endif - -/* encoding support - These flags can be passed in AVCodecContext.flags before initialization. - Note: Not everything is supported yet. -*/ - -/** - * Allow decoders to produce frames with data planes that are not aligned - * to CPU requirements (e.g. due to cropping). - */ -#define AV_CODEC_FLAG_UNALIGNED (1 << 0) -/** - * Use fixed qscale. - */ -#define AV_CODEC_FLAG_QSCALE (1 << 1) -/** - * 4 MV per MB allowed / advanced prediction for H.263. - */ -#define AV_CODEC_FLAG_4MV (1 << 2) -/** - * Output even those frames that might be corrupted. - */ -#define AV_CODEC_FLAG_OUTPUT_CORRUPT (1 << 3) -/** - * Use qpel MC. - */ -#define AV_CODEC_FLAG_QPEL (1 << 4) -/** - * Use internal 2pass ratecontrol in first pass mode. - */ -#define AV_CODEC_FLAG_PASS1 (1 << 9) -/** - * Use internal 2pass ratecontrol in second pass mode. - */ -#define AV_CODEC_FLAG_PASS2 (1 << 10) -/** - * loop filter. - */ -#define AV_CODEC_FLAG_LOOP_FILTER (1 << 11) -/** - * Only decode/encode grayscale. - */ -#define AV_CODEC_FLAG_GRAY (1 << 13) -/** - * error[?] variables will be set during encoding. - */ -#define AV_CODEC_FLAG_PSNR (1 << 15) -/** - * Input bitstream might be truncated at a random location - * instead of only at frame boundaries. - */ -#define AV_CODEC_FLAG_TRUNCATED (1 << 16) -/** - * Force low delay. - */ -#define AV_CODEC_FLAG_LOW_DELAY (1 << 19) -/** - * Place global headers in extradata instead of every keyframe. - */ -#define AV_CODEC_FLAG_GLOBAL_HEADER (1 << 22) -/** - * Use only bitexact stuff (except (I)DCT). - */ -#define AV_CODEC_FLAG_BITEXACT (1 << 23) -/** - * Allow non spec compliant speedup tricks. - */ -#define AV_CODEC_FLAG2_FAST (1 << 0) -/** - * Skip bitstream encoding. - */ -#define AV_CODEC_FLAG2_NO_OUTPUT (1 << 2) -/** - * Place global headers at every keyframe instead of in extradata. - */ -#define AV_CODEC_FLAG2_LOCAL_HEADER (1 << 3) - -/** - * timecode is in drop frame format. DEPRECATED!!!! - */ -#define AV_CODEC_FLAG2_DROP_FRAME_TIMECODE (1 << 13) - -/** - * Input bitstream might be truncated at a packet boundaries - * instead of only at frame boundaries. - */ -#define AV_CODEC_FLAG2_CHUNKS (1 << 15) -/** - * Discard cropping information from SPS. - */ -#define AV_CODEC_FLAG2_IGNORE_CROP (1 << 16) - -/** - * Show all frames before the first keyframe - */ -#define AV_CODEC_FLAG2_SHOW_ALL (1 << 22) -/** - * Export motion vectors through frame side data - */ -#define AV_CODEC_FLAG2_EXPORT_MVS (1 << 28) -/** - * Do not skip samples and export skip information as frame side data - */ -#define AV_CODEC_FLAG2_SKIP_MANUAL (1 << 29) - -/* Unsupported options : - * Syntax Arithmetic coding (SAC) - * Reference Picture Selection - * Independent Segment Decoding */ -/* /Fx */ -/* codec capabilities */ - -/** - * Encoder or decoder requires flushing with NULL input at the end in order to - * give the complete and correct output. - * - * NOTE: If this flag is not set, the codec is guaranteed to never be fed with - * with NULL data. The user can still send NULL data to the public encode - * or decode function, but libavcodec will not pass it along to the codec - * unless this flag is set. - * - * Decoders: - * The decoder has a non-zero delay and needs to be fed with avpkt->data=NULL, - * avpkt->size=0 at the end to get the delayed data until the decoder no longer - * returns frames. - * - * Encoders: - * The encoder needs to be fed with NULL data at the end of encoding until the - * encoder no longer returns data. - * - * NOTE: For encoders implementing the AVCodec.encode2() function, setting this - * flag also means that the encoder must set the pts and duration for - * each output packet. If this flag is not set, the pts and duration will - * be determined by libavcodec from the input frame. - */ -#define AV_CODEC_CAP_DELAY (1 << 5) -/** - * Codec can be fed a final frame with a smaller size. - * This can be used to prevent truncation of the last audio samples. - */ -#define AV_CODEC_CAP_SMALL_LAST_FRAME (1 << 6) - -#if FF_API_CAP_VDPAU -/** - * Codec can export data for HW decoding (VDPAU). - */ -#define AV_CODEC_CAP_HWACCEL_VDPAU (1 << 7) -#endif - -/** - * The decoder will keep a reference to the frame and may reuse it later. - */ -#define AV_GET_BUFFER_FLAG_REF (1 << 0) - -/** - * @} - */ - -struct AVCodecInternal; - /** * main external API structure. * New fields can be added to the end with minor version bumps. @@ -294,47 +56,9 @@ typedef struct AVCodecContext { * - set by avcodec_alloc_context3 */ const struct AVCodec *codec; -#if FF_API_CODEC_NAME - /** - * @deprecated this field is not used for anything in libavcodec - */ - attribute_deprecated - char codec_name[32]; -#endif - enum AVCodecID codec_id; /* see AV_CODEC_ID_xxx */ - - /** - * fourcc (LSB first, so "ABCD" -> ('D'<<24) + ('C'<<16) + ('B'<<8) + 'A'). - * This is used to work around some encoder bugs. - * A demuxer should set this to what is stored in the field used to identify the codec. - * If there are multiple such fields in a container then the demuxer should choose the one - * which maximizes the information about the used codec. - * If the codec tag field in a container is larger than 32 bits then the demuxer should - * remap the longer ID to 32 bits with a table or other structure. Alternatively a new - * extra_codec_tag + size could be added but for this a clear advantage must be demonstrated - * first. - * - encoding: Set by user, if not then the default based on codec_id will be used. - * - decoding: Set by user, will be converted to uppercase by libavcodec during init. - */ - unsigned int codec_tag; - -#if FF_API_STREAM_CODEC_TAG - /** - * @deprecated this field is unused - */ - attribute_deprecated - unsigned int stream_codec_tag; -#endif void *priv_data; - /** - * AV_CODEC_FLAG_*. - * - encoding: Set by user. - * - decoding: Set by user. - */ - int flags; - /** * some codecs need / can use extradata like Huffman tables. * mjpeg: Huffman tables @@ -372,106 +96,20 @@ typedef struct AVCodecContext { * - decoding: Set by libavcodec. */ int delay; - - /* audio only */ - int sample_rate; ///< samples per second int channels; ///< number of audio channels - /* The following data should not be initialized. */ - /** - * Number of samples per channel in an audio frame. - * - * - encoding: set by libavcodec in avcodec_open2(). Each submitted frame - * except the last must contain exactly frame_size samples per channel. - * May be 0 when the codec has AV_CODEC_CAP_VARIABLE_FRAME_SIZE set, then the - * frame size is not restricted. - * - decoding: may be set by some decoders to indicate constant frame size - */ - int frame_size; - - /** - * Frame counter, set by libavcodec. - * - * - decoding: total number of frames returned from the decoder so far. - * - encoding: total number of frames passed to the encoder so far. - * - * @note the counter is not incremented if encoding/decoding resulted in - * an error. - */ - int frame_number; - /** * number of bytes per packet if constant and known or 0 * Used by some WAV based audio codecs. */ int block_align; - /** - * Audio cutoff bandwidth (0 means "automatic") - * - encoding: Set by user. - * - decoding: unused - */ - int cutoff; - /** * Audio channel layout. * - encoding: set by user. * - decoding: set by user, may be overwritten by libavcodec. */ uint64_t channel_layout; - - /** - * IDCT algorithm, see FF_IDCT_* below. - * - encoding: Set by user. - * - decoding: Set by user. - */ - int idct_algo; -#define FF_IDCT_AUTO 0 -#define FF_IDCT_INT 1 -#define FF_IDCT_SIMPLE 2 -#define FF_IDCT_SIMPLEMMX 3 -#define FF_IDCT_ARM 7 -#define FF_IDCT_ALTIVEC 8 -#if FF_API_ARCH_SH4 -#define FF_IDCT_SH4 9 -#endif -#define FF_IDCT_SIMPLEARM 10 -#if FF_API_UNUSED_MEMBERS -#define FF_IDCT_IPP 13 -#endif /* FF_API_UNUSED_MEMBERS */ -#define FF_IDCT_XVID 14 -#if FF_API_IDCT_XVIDMMX -#define FF_IDCT_XVIDMMX 14 -#endif /* FF_API_IDCT_XVIDMMX */ -#define FF_IDCT_SIMPLEARMV5TE 16 -#define FF_IDCT_SIMPLEARMV6 17 -#if FF_API_ARCH_SPARC -#define FF_IDCT_SIMPLEVIS 18 -#endif -#define FF_IDCT_FAAN 20 -#define FF_IDCT_SIMPLENEON 22 -#if FF_API_ARCH_ALPHA -#define FF_IDCT_SIMPLEALPHA 23 -#endif -#define FF_IDCT_SIMPLEAUTO 128 - - - /** - * Audio only. The number of "priming" samples (padding) inserted by the - * encoder at the beginning of the audio. I.e. this number of leading - * decoded samples must be discarded by the caller to get the original audio - * without leading padding. - * - * - decoding: unused - * - encoding: Set by libavcodec. The timestamps on the output packets are - * adjusted by the encoder so that they always refer to the - * first sample of the data actually contained in the packet, - * including any added padding. E.g. if the timebase is - * 1/samplerate and the timestamp of the first input sample is - * 0, the timestamp of the first output packet will be - * -initial_padding. - */ - int initial_padding; } AVCodecContext; /** @@ -515,78 +153,10 @@ typedef struct AVCodec { void (*flush)(AVCodecContext *); } AVCodec; -/** - * Allocate an AVCodecContext and set its fields to default values. The - * resulting struct should be freed with avcodec_free_context(). - * - * @param codec if non-NULL, allocate private data and initialize defaults - * for the given codec. It is illegal to then call avcodec_open2() - * with a different codec. - * If NULL, then the codec-specific defaults won't be initialized, - * which may result in suboptimal default settings (this is - * important mainly for encoders, e.g. libx264). - * - * @return An AVCodecContext filled with default values or NULL on failure. - * @see avcodec_get_context_defaults - */ AVCodecContext *avcodec_alloc_context3(const AVCodec *codec); - -/** - * Free the codec context and everything associated with it and write NULL to - * the provided pointer. - */ void avcodec_free_context(AVCodecContext **avctx); -/** - * Initialize the AVCodecContext to use the given AVCodec. Prior to using this - * function the context has to be allocated with avcodec_alloc_context3(). - * - * The functions avcodec_find_decoder_by_name(), avcodec_find_encoder_by_name(), - * avcodec_find_decoder() and avcodec_find_encoder() provide an easy way for - * retrieving a codec. - * - * @warning This function is not thread safe! - * - * @note Always call this function before using decoding routines (such as - * @ref avcodec_decode_video2()). - * - * @code - * avcodec_register_all(); - * av_dict_set(&opts, "b", "2.5M", 0); - * codec = avcodec_find_decoder(AV_CODEC_ID_H264); - * if (!codec) - * exit(1); - * - * context = avcodec_alloc_context3(codec); - * - * if (avcodec_open2(context, codec, opts) < 0) - * exit(1); - * @endcode - * - * @param avctx The context to initialize. - * @param codec The codec to open this context for. If a non-NULL codec has been - * previously passed to avcodec_alloc_context3() or - * avcodec_get_context_defaults3() for this context, then this - * parameter MUST be either NULL or equal to the previously passed - * codec. - * @param options A dictionary filled with AVCodecContext and codec-private options. - * On return this object will be filled with options that were not found. - * - * @return zero on success, a negative value on error - * @see avcodec_alloc_context3(), avcodec_find_decoder(), avcodec_find_encoder(), - * av_dict_set(), av_opt_find(). - */ int avcodec_open2(AVCodecContext *avctx, const AVCodec *codec, void *options); - -/** - * Close a given AVCodecContext and free all the data associated with it - * (but not the AVCodecContext itself). - * - * Calling this function on an AVCodecContext that hasn't been opened will free - * the codec-specific data allocated in avcodec_alloc_context3() / - * avcodec_get_context_defaults3() with a non-NULL codec. Subsequent calls will - * do nothing. - */ int avcodec_close(AVCodecContext *avctx); /** diff --git a/ext/at3_standalone/compat.cpp b/ext/at3_standalone/compat.cpp index de17629718..a9c1f1c056 100644 --- a/ext/at3_standalone/compat.cpp +++ b/ext/at3_standalone/compat.cpp @@ -4,9 +4,7 @@ #include "ext/at3_standalone/compat.h" -void av_log(void *avcl, int level, const char *fmt, ...) { - -} +void av_log(int level, const char *fmt, ...) {} int av_get_cpu_flags(void) { return 0; diff --git a/ext/at3_standalone/compat.h b/ext/at3_standalone/compat.h index 30bc8578f7..52f7263fa9 100644 --- a/ext/at3_standalone/compat.h +++ b/ext/at3_standalone/compat.h @@ -20,7 +20,17 @@ #define FF_ENABLE_DEPRECATION_WARNINGS #define CONFIG_FFT 1 -#define DECLARE_ALIGNED(bits, type, name) type name +#if defined(__GNUC__) +#define DECLARE_ALIGNED(n,t,v) t __attribute__ ((aligned (n))) v +#define DECLARE_ASM_CONST(n,t,v) static const t av_used __attribute__ ((aligned (n))) v +#elif defined(_MSC_VER) +#define DECLARE_ALIGNED(n,t,v) __declspec(align(n)) t v +#define DECLARE_ASM_CONST(n,t,v) __declspec(align(n)) static const t v +#else +#define DECLARE_ALIGNED(n,t,v) t v +#define DECLARE_ASM_CONST(n,t,v) static const t v +#endif + #define LOCAL_ALIGNED(bits, type, name, subscript) type name subscript #define av_restrict #define av_always_inline __forceinline @@ -57,7 +67,7 @@ #define AV_LOG_DEBUG 48 #define AV_LOG_TRACE 56 -void av_log(void *avcl, int level, const char *fmt, ...) av_printf_format(3, 4); +void av_log(int level, const char *fmt, ...) av_printf_format(3, 4); /** * Maximum size in bytes of extradata. diff --git a/ext/at3_standalone/get_bits.cpp b/ext/at3_standalone/get_bits.cpp index 818099d5f8..e28eb19a0e 100644 --- a/ext/at3_standalone/get_bits.cpp +++ b/ext/at3_standalone/get_bits.cpp @@ -162,7 +162,7 @@ static int build_table(VLC *vlc, int table_nb_bits, int nb_codes, for (k = 0; k < nb; k++) { int bits = table[j][1]; if (bits != 0 && bits != n) { - av_log(NULL, AV_LOG_ERROR, "incorrect codes\n"); + av_log( AV_LOG_ERROR, "incorrect codes\n"); return AVERROR_INVALIDDATA; } table[j][1] = n; //bits @@ -273,14 +273,14 @@ int ff_init_vlc_sparse(VLC *vlc_arg, int nb_bits, int nb_codes, if (!(condition)) \ continue; \ if (buf[j].bits > 3*nb_bits || buf[j].bits>32) { \ - av_log(NULL, AV_LOG_ERROR, "Too long VLC (%d) in init_vlc\n", buf[j].bits);\ + av_log( AV_LOG_ERROR, "Too long VLC (%d) in init_vlc\n", buf[j].bits);\ if (!(flags & INIT_VLC_USE_NEW_STATIC)) \ av_free(buf); \ return -1; \ } \ GET_DATA(buf[j].code, codes, i, codes_wrap, codes_size); \ if (buf[j].code >= (1LL<table_size != vlc->table_allocated) - av_log(NULL, AV_LOG_ERROR, "needed %d had %d\n", vlc->table_size, vlc->table_allocated); + av_log( AV_LOG_ERROR, "needed %d had %d\n", vlc->table_size, vlc->table_allocated); av_assert0(ret >= 0); *vlc_arg = *vlc; diff --git a/ext/at3_standalone/mathematics.cpp b/ext/at3_standalone/mathematics.cpp index f99bf1b0d0..46e691b705 100644 --- a/ext/at3_standalone/mathematics.cpp +++ b/ext/at3_standalone/mathematics.cpp @@ -52,7 +52,7 @@ int64_t av_gcd(int64_t a, int64_t b) { return (uint64_t)u << k; } -int64_t av_rescale_rnd(int64_t a, int64_t b, int64_t c, enum AVRounding rnd) +int64_t av_rescale_rnd(int64_t a, int64_t b, int64_t c, AVRounding rnd) { int64_t r = 0; av_assert2(c > 0); @@ -128,8 +128,7 @@ int64_t av_rescale(int64_t a, int64_t b, int64_t c) return av_rescale_rnd(a, b, c, AV_ROUND_NEAR_INF); } -int64_t av_rescale_q_rnd(int64_t a, AVRational bq, AVRational cq, - enum AVRounding rnd) +int64_t av_rescale_q_rnd(int64_t a, AVRational bq, AVRational cq, AVRounding rnd) { int64_t b = bq.num * (int64_t)cq.den; int64_t c = cq.num * (int64_t)bq.den; @@ -141,7 +140,6 @@ int64_t av_rescale_q(int64_t a, AVRational bq, AVRational cq) return av_rescale_q_rnd(a, bq, cq, AV_ROUND_NEAR_INF); } - int av_reduce(int *dst_num, int *dst_den, int64_t num, int64_t den, int64_t max) { @@ -208,26 +206,6 @@ AVRational av_add_q(AVRational b, AVRational c) { return b; } -AVRational av_d2q(double d, int max) -{ - AVRational a; - int exponent; - int64_t den; - if (isnan(d)) - return AVRational { 0, 0 }; - if (fabs(d) > INT_MAX + 3LL) - return AVRational { d < 0 ? -1 : 1, 0 }; - frexp(d, &exponent); - exponent = FFMAX(exponent - 1, 0); - den = 1LL << (61 - exponent); - // (int64_t)rint() and llrint() do not work with gcc on ia64 and sparc64 - av_reduce(&a.num, &a.den, floor(d * den + 0.5), den, max); - if ((!a.num || !a.den) && d && max > 0 && max < INT_MAX) - av_reduce(&a.num, &a.den, floor(d * den + 0.5), den, INT_MAX); - - return a; -} - static const uint8_t ff_logg2_tab[256] = { 0,0,1,1,2,2,2,2,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4, 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5, diff --git a/ext/at3_standalone/mathematics.h b/ext/at3_standalone/mathematics.h index 4a026e59cb..09eba9a9d4 100644 --- a/ext/at3_standalone/mathematics.h +++ b/ext/at3_standalone/mathematics.h @@ -140,7 +140,6 @@ static inline unsigned zero_extend(unsigned val, unsigned bits) * @{ */ - enum AVRounding { AV_ROUND_ZERO = 0, ///< Round toward zero. AV_ROUND_INF = 1, ///< Round away from zero. @@ -179,7 +178,7 @@ int64_t av_rescale(int64_t a, int64_t b, int64_t c); * @return rescaled value a, or if AV_ROUND_PASS_MINMAX is set and a is * INT64_MIN or INT64_MAX then a is passed through unchanged. */ -int64_t av_rescale_rnd(int64_t a, int64_t b, int64_t c, enum AVRounding); +int64_t av_rescale_rnd(int64_t a, int64_t b, int64_t c, AVRounding); /** * Rescale a 64-bit integer by 2 rational numbers. @@ -192,8 +191,7 @@ int64_t av_rescale_q(int64_t a, AVRational bq, AVRational cq); * @return rescaled value a, or if AV_ROUND_PASS_MINMAX is set and a is * INT64_MIN or INT64_MAX then a is passed through unchanged. */ -int64_t av_rescale_q_rnd(int64_t a, AVRational bq, AVRational cq, - enum AVRounding); +int64_t av_rescale_q_rnd(int64_t a, AVRational bq, AVRational cq, AVRounding); /** @@ -279,17 +277,6 @@ static inline AVRational av_inv_q(AVRational q) return r; } -/** - * Convert a double precision floating point number to a rational. - * inf is expressed as {1,0} or {-1,0} depending on the sign. - * - * @param d double to convert - * @param max the maximum allowed numerator and denominator - * @return (AVRational) d - */ -AVRational av_d2q(double d, int max); - - /** * Clear high bits from an unsigned integer starting with specific bit position * @param a value to clip diff --git a/ext/at3_standalone/mem.h b/ext/at3_standalone/mem.h index 150c21e8b2..1c40cbf5e6 100644 --- a/ext/at3_standalone/mem.h +++ b/ext/at3_standalone/mem.h @@ -29,17 +29,6 @@ #define FF_MEMORY_POISON 0x2a -#if defined(__GNUC__) - #define DECLARE_ALIGNED(n,t,v) t __attribute__ ((aligned (n))) v - #define DECLARE_ASM_CONST(n,t,v) static const t av_used __attribute__ ((aligned (n))) v -#elif defined(_MSC_VER) - #define DECLARE_ALIGNED(n,t,v) __declspec(align(n)) t v - #define DECLARE_ASM_CONST(n,t,v) __declspec(align(n)) static const t v -#else - #define DECLARE_ALIGNED(n,t,v) t v - #define DECLARE_ASM_CONST(n,t,v) static const t v -#endif - /** * Allocate a block of size bytes with alignment suitable for all * memory accesses (including vectors if available on the CPU). From ae87aa4537ca9507d6407e011bbc1e72b926ecec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Thu, 11 Apr 2024 10:45:29 +0200 Subject: [PATCH 084/719] Initial CMake/Android.mk support --- CMakeLists.txt | 2 +- android/jni/Android.mk | 17 +++++++++++++++++ ext/CMakeLists.txt | 1 + ext/at3_standalone/CMakeLists.txt | 25 +++++++++++++++++++++++++ 4 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 ext/at3_standalone/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 509831913a..85f6b4c2bc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2363,7 +2363,7 @@ endif() include_directories(ext/libchdr/include) -target_link_libraries(${CoreLibName} Common native chdr kirk cityhash sfmt19937 xbrz xxhash rcheevos minimp3 ${GlslangLibs} +target_link_libraries(${CoreLibName} Common native chdr kirk cityhash sfmt19937 xbrz xxhash rcheevos minimp3 at3_standalone ${GlslangLibs} ${CoreExtraLibs} ${OPENGL_LIBRARIES} ${X11_LIBRARIES} ${CMAKE_DL_LIBS}) if(NOT HTTPS_NOT_AVAILABLE) diff --git a/android/jni/Android.mk b/android/jni/Android.mk index 202a40dbcc..87ffa7fa5c 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -112,6 +112,22 @@ NAETT_FILES := \ MINIMP3_FILES := \ ${SRC}/ext/minimp3/minimp3.cpp +AT3_STANDALONE_FILES := \ + ${SRC}/ext/at3_standalone/atrac.cpp \ + ${SRC}/ext/at3_standalone/atrac3.cpp \ + ${SRC}/ext/at3_standalone/atrac3plus.cpp \ + ${SRC}/ext/at3_standalone/atrac3plusdec.cpp \ + ${SRC}/ext/at3_standalone/atrac3plusdsp.cpp \ + ${SRC}/ext/at3_standalone/avcodec.cpp \ + ${SRC}/ext/at3_standalone/get_bits.cpp \ + ${SRC}/ext/at3_standalone/channel_layout.cpp \ + ${SRC}/ext/at3_standalone/compat.cpp \ + ${SRC}/ext/at3_standalone/fft.cpp \ + ${SRC}/ext/at3_standalone/float_dsp.cpp \ + ${SRC}/ext/at3_standalone/mathematics.cpp \ + ${SRC}/ext/at3_standalone/mem.cpp \ + ${SRC}/ext/at3_standalone/sinewin.cpp + RCHEEVOS_FILES := \ ${SRC}/ext/rcheevos/src/rapi/rc_api_common.c \ ${SRC}/ext/rcheevos/src/rapi/rc_api_editor.c \ @@ -221,6 +237,7 @@ EXEC_AND_LIB_FILES := \ $(RCHEEVOS_FILES) \ $(NAETT_FILES) \ $(MINIMP3_FILES) \ + $(AT3_STANDALONE_FILES) \ $(EXT_FILES) \ $(NATIVE_FILES) \ $(SRC)/Common/Buffer.cpp \ diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt index dbd8417791..b0aa7adb2b 100644 --- a/ext/CMakeLists.txt +++ b/ext/CMakeLists.txt @@ -29,6 +29,7 @@ set(ENABLE_GLSLANG_INSTALL OFF) add_subdirectory(glslang EXCLUDE_FROM_ALL) add_subdirectory(snappy) add_subdirectory(minimp3) +add_subdirectory(at3_standalone) add_subdirectory(udis86) add_subdirectory(SPIRV-Cross-build) add_subdirectory(rcheevos-build) diff --git a/ext/at3_standalone/CMakeLists.txt b/ext/at3_standalone/CMakeLists.txt new file mode 100644 index 0000000000..d62845caed --- /dev/null +++ b/ext/at3_standalone/CMakeLists.txt @@ -0,0 +1,25 @@ +cmake_minimum_required (VERSION 3.2.0) +project (at3_standalone) + +set(SRC_DIR .) + +# format +set(ALL_SOURCE_FILES + # rapi + ${SRC_DIR}/atrac.cpp + ${SRC_DIR}/atrac3.cpp + ${SRC_DIR}/atrac3plus.cpp + ${SRC_DIR}/atrac3plusdec.cpp + ${SRC_DIR}/atrac3plusdsp.cpp + ${SRC_DIR}/avcodec.cpp + ${SRC_DIR}/get_bits.cpp + ${SRC_DIR}/channel_layout.cpp + ${SRC_DIR}/compat.cpp + ${SRC_DIR}/fft.cpp + ${SRC_DIR}/float_dsp.cpp + ${SRC_DIR}/mathematics.cpp + ${SRC_DIR}/mem.cpp + ${SRC_DIR}/sinewin.cpp + ) + +add_library(at3_standalone STATIC ${ALL_SOURCE_FILES}) From 8d89a7cfed2da0e7220de950895c3e8a87df8ed8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Thu, 11 Apr 2024 11:39:07 +0200 Subject: [PATCH 085/719] Delete more unused stuff --- CMakeLists.txt | 3 + android/jni/Android.mk | 1 + ext/at3_standalone/compat.h | 26 +---- ext/at3_standalone/fft.cpp | 5 +- ext/at3_standalone/get_bits.cpp | 2 +- ext/at3_standalone/get_bits.h | 63 +----------- ext/at3_standalone/intreadwrite.h | 158 ------------------------------ ext/at3_standalone/mathematics.h | 4 +- 8 files changed, 11 insertions(+), 251 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 85f6b4c2bc..febe3663ac 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2215,6 +2215,9 @@ add_library(${CoreLibName} ${CoreLinkType} Core/HLE/scePauth.h Core/HW/SimpleAudioDec.cpp Core/HW/SimpleAudioDec.h + Core/HW/Atrac3Standalone.cpp + Core/HW/Atrac3Standalone.h + Core/HW/SimpleAudioDec.h Core/HW/AsyncIOManager.cpp Core/HW/AsyncIOManager.h Core/HW/BufferQueue.cpp diff --git a/android/jni/Android.mk b/android/jni/Android.mk index 87ffa7fa5c..c7a6b6e2ab 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -530,6 +530,7 @@ EXEC_AND_LIB_FILES := \ $(SRC)/Core/ELF/PrxDecrypter.cpp \ $(SRC)/Core/ELF/ParamSFO.cpp \ $(SRC)/Core/HW/SimpleAudioDec.cpp \ + $(SRC)/Core/HW/Atrac3Standalone.cpp \ $(SRC)/Core/HW/AsyncIOManager.cpp \ $(SRC)/Core/HW/BufferQueue.cpp \ $(SRC)/Core/HW/Camera.cpp \ diff --git a/ext/at3_standalone/compat.h b/ext/at3_standalone/compat.h index 52f7263fa9..2632af72c9 100644 --- a/ext/at3_standalone/compat.h +++ b/ext/at3_standalone/compat.h @@ -2,24 +2,6 @@ // Compat hacks -#define CONFIG_MEMORY_POISONING 0 -#define CONFIG_HARDCODED_TABLES 0 -#define CONFIG_ME_CMP 0 -#define HWACCEL_CODEC_CAP_EXPERIMENTAL 0 -#define HAVE_THREADS 0 -#define CONFIG_FRAME_THREAD_ENCODER 0 -#define CONFIG_GRAY 0 -#define NULL_IF_CONFIG_SMALL(x) NULL -#define ARCH_AARCH64 0 -#define ARCH_ARM 0 -#define ARCH_PPC 0 -#define ARCH_X86 0 -#define HAVE_MIPSFPU 0 -#define FF_API_AVPACKET_OLD_API 1 -#define FF_DISABLE_DEPRECATION_WARNINGS -#define FF_ENABLE_DEPRECATION_WARNINGS -#define CONFIG_FFT 1 - #if defined(__GNUC__) #define DECLARE_ALIGNED(n,t,v) t __attribute__ ((aligned (n))) v #define DECLARE_ASM_CONST(n,t,v) static const t av_used __attribute__ ((aligned (n))) v @@ -33,16 +15,11 @@ #define LOCAL_ALIGNED(bits, type, name, subscript) type name subscript #define av_restrict -#define av_always_inline __forceinline -#define av_const #define av_alias #define av_unused -#define av_pure -#define av_warn_unused_result #define av_assert0(cond) #define av_assert1(cond) #define av_assert2(cond) -#define attribute_deprecated #define av_printf_format(a,b) #define avpriv_report_missing_feature(...) @@ -117,14 +94,13 @@ size_t av_strlcpy(char *dst, const char *src, size_t size); /** * Locale-independent conversion of ASCII characters to uppercase. */ -static inline av_const int av_toupper(int c) +static inline int av_toupper(int c) { if (c >= 'a' && c <= 'z') c ^= 0x20; return c; } - #define AV_BSWAP16C(x) (((x) << 8 & 0xff00) | ((x) >> 8 & 0x00ff)) #define AV_BSWAP32C(x) (AV_BSWAP16C(x) << 16 | AV_BSWAP16C((x) >> 16)) #define av_be2ne32(x) AV_BSWAP32C((x)) diff --git a/ext/at3_standalone/fft.cpp b/ext/at3_standalone/fft.cpp index e4c7d67f54..10914d0504 100644 --- a/ext/at3_standalone/fft.cpp +++ b/ext/at3_standalone/fft.cpp @@ -40,7 +40,6 @@ void ff_imdct_half_c(FFTContext *s, FFTSample *output, const FFTSample *input); void ff_mdct_calc_c(FFTContext *s, FFTSample *output, const FFTSample *input); /* cos(2*pi*x/n) for 0<=x<=n/4, followed by its reverse */ -#if !CONFIG_HARDCODED_TABLES COSTABLE(16); COSTABLE(32); COSTABLE(64); @@ -54,7 +53,7 @@ COSTABLE(8192); COSTABLE(16384); COSTABLE(32768); COSTABLE(65536); -#endif + FFTSample * const ff_cos_tabs[] = { NULL, NULL, NULL, NULL, ff_cos_16, @@ -88,7 +87,6 @@ static int split_radix_permutation(int i, int n, int inverse) void ff_init_ff_cos_tabs(int index) { -#if (!CONFIG_HARDCODED_TABLES) && (!FFT_FIXED_32) int i; int m = 1<> 8) & 0xFF] << 16 | diff --git a/ext/at3_standalone/get_bits.h b/ext/at3_standalone/get_bits.h index 2b915981ea..1be9576cd4 100644 --- a/ext/at3_standalone/get_bits.h +++ b/ext/at3_standalone/get_bits.h @@ -235,7 +235,7 @@ static inline unsigned int get_bits(GetBitContext *s, int n) /** * Read 0-25 bits. */ -static av_always_inline int get_bitsz(GetBitContext *s, int n) +static inline int get_bitsz(GetBitContext *s, int n) { return n ? get_bits(s, n) : 0; } @@ -398,43 +398,6 @@ void ff_free_vlc(VLC *vlc); SKIP_BITS(name, gb, n); \ } while (0) -#define GET_RL_VLC_INTERNAL(level, run, name, gb, table, bits, \ - max_depth, need_update) \ - do { \ - int n, nb_bits; \ - unsigned int index; \ - \ - index = SHOW_UBITS(name, gb, bits); \ - level = table[index].level; \ - n = table[index].len; \ - \ - if (max_depth > 1 && n < 0) { \ - SKIP_BITS(name, gb, bits); \ - if (need_update) { \ - UPDATE_CACHE(name, gb); \ - } \ - \ - nb_bits = -n; \ - \ - index = SHOW_UBITS(name, gb, nb_bits) + level; \ - level = table[index].level; \ - n = table[index].len; \ - if (max_depth > 2 && n < 0) { \ - LAST_SKIP_BITS(name, gb, nb_bits); \ - if (need_update) { \ - UPDATE_CACHE(name, gb); \ - } \ - nb_bits = -n; \ - \ - index = SHOW_UBITS(name, gb, nb_bits) + level; \ - level = table[index].level; \ - n = table[index].len; \ - } \ - } \ - run = table[index].run; \ - SKIP_BITS(name, gb, n); \ - } while (0) - /** * Parse a vlc code. * @param bits is the number of bits which will be read at once, must be @@ -443,7 +406,7 @@ void ff_free_vlc(VLC *vlc); * read the longest vlc code * = (max_vlc_length + bits - 1) / bits */ -static av_always_inline int get_vlc2(GetBitContext *s, VLC_TYPE (*table)[2], +static inline int get_vlc2(GetBitContext *s, VLC_TYPE (*table)[2], int bits, int max_depth) { int code; @@ -486,33 +449,11 @@ static inline type bytestream2_get_ ## name(GetByteContext *g) \ return 0; \ } \ return bytestream2_get_ ## name ## u(g); \ -} \ -static inline type bytestream2_peek_ ## name(GetByteContext *g) \ -{ \ - if (g->buffer_end - g->buffer < bytes) \ - return 0; \ - return read(g->buffer); \ } -DEF(uint64_t, le64, 8, AV_RL64, AV_WL64) DEF(unsigned int, le32, 4, AV_RL32, AV_WL32) DEF(unsigned int, le24, 3, AV_RL24, AV_WL24) DEF(unsigned int, le16, 2, AV_RL16, AV_WL16) -DEF(uint64_t, be64, 8, AV_RB64, AV_WB64) DEF(unsigned int, be32, 4, AV_RB32, AV_WB32) DEF(unsigned int, be24, 3, AV_RB24, AV_WB24) DEF(unsigned int, be16, 2, AV_RB16, AV_WB16) -DEF(unsigned int, byte, 1, AV_RB8, AV_WB8) - -# define bytestream2_get_ne16 bytestream2_get_le16 -# define bytestream2_get_ne24 bytestream2_get_le24 -# define bytestream2_get_ne32 bytestream2_get_le32 -# define bytestream2_get_ne64 bytestream2_get_le64 -# define bytestream2_get_ne16u bytestream2_get_le16u -# define bytestream2_get_ne24u bytestream2_get_le24u -# define bytestream2_get_ne32u bytestream2_get_le32u -# define bytestream2_get_ne64u bytestream2_get_le64u -# define bytestream2_peek_ne16 bytestream2_peek_le16 -# define bytestream2_peek_ne24 bytestream2_peek_le24 -# define bytestream2_peek_ne32 bytestream2_peek_le32 -# define bytestream2_peek_ne64 bytestream2_peek_le64 diff --git a/ext/at3_standalone/intreadwrite.h b/ext/at3_standalone/intreadwrite.h index f7683aaa7c..21ea176213 100644 --- a/ext/at3_standalone/intreadwrite.h +++ b/ext/at3_standalone/intreadwrite.h @@ -402,162 +402,4 @@ union unaligned_16 { uint16_t l; } __attribute__((packed)) av_alias; } while(0) #endif -#ifndef AV_RB48 -# define AV_RB48(x) \ - (((uint64_t)((const uint8_t*)(x))[0] << 40) | \ - ((uint64_t)((const uint8_t*)(x))[1] << 32) | \ - ((uint64_t)((const uint8_t*)(x))[2] << 24) | \ - ((uint64_t)((const uint8_t*)(x))[3] << 16) | \ - ((uint64_t)((const uint8_t*)(x))[4] << 8) | \ - (uint64_t)((const uint8_t*)(x))[5]) -#endif -#ifndef AV_WB48 -# define AV_WB48(p, darg) do { \ - uint64_t d = (darg); \ - ((uint8_t*)(p))[5] = (d); \ - ((uint8_t*)(p))[4] = (d)>>8; \ - ((uint8_t*)(p))[3] = (d)>>16; \ - ((uint8_t*)(p))[2] = (d)>>24; \ - ((uint8_t*)(p))[1] = (d)>>32; \ - ((uint8_t*)(p))[0] = (d)>>40; \ - } while(0) -#endif - -#ifndef AV_RL48 -# define AV_RL48(x) \ - (((uint64_t)((const uint8_t*)(x))[5] << 40) | \ - ((uint64_t)((const uint8_t*)(x))[4] << 32) | \ - ((uint64_t)((const uint8_t*)(x))[3] << 24) | \ - ((uint64_t)((const uint8_t*)(x))[2] << 16) | \ - ((uint64_t)((const uint8_t*)(x))[1] << 8) | \ - (uint64_t)((const uint8_t*)(x))[0]) -#endif -#ifndef AV_WL48 -# define AV_WL48(p, darg) do { \ - uint64_t d = (darg); \ - ((uint8_t*)(p))[0] = (d); \ - ((uint8_t*)(p))[1] = (d)>>8; \ - ((uint8_t*)(p))[2] = (d)>>16; \ - ((uint8_t*)(p))[3] = (d)>>24; \ - ((uint8_t*)(p))[4] = (d)>>32; \ - ((uint8_t*)(p))[5] = (d)>>40; \ - } while(0) -#endif - -/* - * The AV_[RW]NA macros access naturally aligned data - * in a type-safe way. - */ - -#define AV_RNA(s, p) (((const av_alias##s*)(p))->u##s) -#define AV_WNA(s, p, v) (((av_alias##s*)(p))->u##s = (v)) - -#ifndef AV_RN16A -# define AV_RN16A(p) AV_RNA(16, p) -#endif - -#ifndef AV_RN32A -# define AV_RN32A(p) AV_RNA(32, p) -#endif - -#ifndef AV_RN64A -# define AV_RN64A(p) AV_RNA(64, p) -#endif - -#ifndef AV_WN16A -# define AV_WN16A(p, v) AV_WNA(16, p, v) -#endif - -#ifndef AV_WN32A -# define AV_WN32A(p, v) AV_WNA(32, p, v) -#endif - -#ifndef AV_WN64A -# define AV_WN64A(p, v) AV_WNA(64, p, v) -#endif - -/* - * The AV_COPYxxU macros are suitable for copying data to/from unaligned - * memory locations. - */ - -#define AV_COPYU(n, d, s) AV_WN##n(d, AV_RN##n(s)); - -#ifndef AV_COPY16U -# define AV_COPY16U(d, s) AV_COPYU(16, d, s) -#endif - -#ifndef AV_COPY32U -# define AV_COPY32U(d, s) AV_COPYU(32, d, s) -#endif - -#ifndef AV_COPY64U -# define AV_COPY64U(d, s) AV_COPYU(64, d, s) -#endif - -#ifndef AV_COPY128U -# define AV_COPY128U(d, s) \ - do { \ - AV_COPY64U(d, s); \ - AV_COPY64U((char *)(d) + 8, (const char *)(s) + 8); \ - } while(0) -#endif - -/* Parameters for AV_COPY*, AV_SWAP*, AV_ZERO* must be - * naturally aligned. They may be implemented using MMX, - * so emms_c() must be called before using any float code - * afterwards. - */ - -#define AV_COPY(n, d, s) \ - (((av_alias##n*)(d))->u##n = ((const av_alias##n*)(s))->u##n) - -#ifndef AV_COPY16 -# define AV_COPY16(d, s) AV_COPY(16, d, s) -#endif - -#ifndef AV_COPY32 -# define AV_COPY32(d, s) AV_COPY(32, d, s) -#endif - -#ifndef AV_COPY64 -# define AV_COPY64(d, s) AV_COPY(64, d, s) -#endif - -#ifndef AV_COPY128 -# define AV_COPY128(d, s) \ - do { \ - AV_COPY64(d, s); \ - AV_COPY64((char*)(d)+8, (char*)(s)+8); \ - } while(0) -#endif - -#define AV_SWAP(n, a, b) FFSWAP(av_alias##n, *(av_alias##n*)(a), *(av_alias##n*)(b)) - -#ifndef AV_SWAP64 -# define AV_SWAP64(a, b) AV_SWAP(64, a, b) -#endif - -#define AV_ZERO(n, d) (((av_alias##n*)(d))->u##n = 0) - -#ifndef AV_ZERO16 -# define AV_ZERO16(d) AV_ZERO(16, d) -#endif - -#ifndef AV_ZERO32 -# define AV_ZERO32(d) AV_ZERO(32, d) -#endif - -#ifndef AV_ZERO64 -# define AV_ZERO64(d) AV_ZERO(64, d) -#endif - -#ifndef AV_ZERO128 -# define AV_ZERO128(d) \ - do { \ - AV_ZERO64(d); \ - AV_ZERO64((char*)(d)+8); \ - } while(0) -#endif - #endif /* AVUTIL_INTREADWRITE_H */ diff --git a/ext/at3_standalone/mathematics.h b/ext/at3_standalone/mathematics.h index 09eba9a9d4..6ebe8226da 100644 --- a/ext/at3_standalone/mathematics.h +++ b/ext/at3_standalone/mathematics.h @@ -70,7 +70,7 @@ int av_log2_16bit(unsigned int v); */ /* We use the De-Bruijn method outlined in: * http://supertech.csail.mit.edu/papers/debruijn.pdf. */ -static av_always_inline av_const int ff_ctz_c(int v) +static inline int ff_ctz_c(int v) { static const uint8_t debruijn_ctz32[32] = { 0, 1, 28, 2, 29, 14, 24, 3, 30, 22, 20, 15, 25, 17, 4, 8, @@ -84,7 +84,7 @@ static av_always_inline av_const int ff_ctz_c(int v) #define ff_ctzll ff_ctzll_c /* We use the De-Bruijn method outlined in: * http://supertech.csail.mit.edu/papers/debruijn.pdf. */ -static av_always_inline av_const int ff_ctzll_c(long long v) +static inline int ff_ctzll_c(long long v) { static const uint8_t debruijn_ctz64[64] = { 0, 1, 2, 53, 3, 7, 54, 27, 4, 38, 41, 8, 34, 55, 48, 28, From e871133fe6525b924622a133c5c40739df08a2e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Thu, 11 Apr 2024 12:04:27 +0200 Subject: [PATCH 086/719] Buildfixes --- Core/HW/Atrac3Standalone.cpp | 4 +- ext/at3_standalone/compat.cpp | 14 ------ ext/at3_standalone/compat.h | 33 ++------------ ext/at3_standalone/fft.cpp | 2 +- ext/at3_standalone/fft.h | 1 - ext/at3_standalone/intreadwrite.h | 75 ++----------------------------- ext/at3_standalone/sinewin.cpp | 4 +- ext/at3_standalone/sinewin.h | 2 - 8 files changed, 12 insertions(+), 123 deletions(-) diff --git a/Core/HW/Atrac3Standalone.cpp b/Core/HW/Atrac3Standalone.cpp index eecc5a9c97..df763de6c0 100644 --- a/Core/HW/Atrac3Standalone.cpp +++ b/Core/HW/Atrac3Standalone.cpp @@ -1,5 +1,3 @@ -#pragma once - #include "SimpleAudioDec.h" #include "ext/at3_standalone/at3_decoders.h" @@ -99,7 +97,7 @@ public: // Hmm. ignore for now. } - void SetExtraData(const uint8_t *data, int size, int wav_bytes_per_packet) { + void SetExtraData(const uint8_t *data, int size, int wav_bytes_per_packet) override { // if (audioType_ == PSP_CODEC_AT3PLUS) { _dbg_assert_(ctx_); _dbg_assert_(!codecOpen_); diff --git a/ext/at3_standalone/compat.cpp b/ext/at3_standalone/compat.cpp index a9c1f1c056..319d22b3db 100644 --- a/ext/at3_standalone/compat.cpp +++ b/ext/at3_standalone/compat.cpp @@ -5,17 +5,3 @@ #include "ext/at3_standalone/compat.h" void av_log(int level, const char *fmt, ...) {} - -int av_get_cpu_flags(void) { - return 0; -} - -size_t av_strlcpy(char *dst, const char *src, size_t size) -{ - size_t len = 0; - while (++len < size && *src) - *dst++ = *src++; - if (len <= size) - *dst = 0; - return len + strlen(src) - 1; -} diff --git a/ext/at3_standalone/compat.h b/ext/at3_standalone/compat.h index 2632af72c9..4e85bb35b6 100644 --- a/ext/at3_standalone/compat.h +++ b/ext/at3_standalone/compat.h @@ -1,5 +1,7 @@ #pragma once +#include + // Compat hacks #if defined(__GNUC__) @@ -13,6 +15,8 @@ #define DECLARE_ASM_CONST(n,t,v) static const t v #endif +#define AV_HAVE_FAST_UNALIGNED 0 + #define LOCAL_ALIGNED(bits, type, name, subscript) type name subscript #define av_restrict #define av_alias @@ -72,35 +76,6 @@ void av_log(int level, const char *fmt, ...) av_printf_format(3, 4); #pragma warning(disable:4305) #pragma warning(disable:4244) -int ff_fast_malloc(void *ptr, unsigned int *size, size_t min_size, int zero_realloc); - -/** - * Copy the string src to dst, but no more than size - 1 bytes, and - * null-terminate dst. - * - * This function is the same as BSD strlcpy(). - * - * @param dst destination buffer - * @param src source string - * @param size size of destination buffer - * @return the length of src - * - * @warning since the return value is the length of src, src absolutely - * _must_ be a properly 0-terminated string, otherwise this will read beyond - * the end of the buffer and possibly crash. - */ -size_t av_strlcpy(char *dst, const char *src, size_t size); - -/** - * Locale-independent conversion of ASCII characters to uppercase. - */ -static inline int av_toupper(int c) -{ - if (c >= 'a' && c <= 'z') - c ^= 0x20; - return c; -} - #define AV_BSWAP16C(x) (((x) << 8 & 0xff00) | ((x) >> 8 & 0x00ff)) #define AV_BSWAP32C(x) (AV_BSWAP16C(x) << 16 | AV_BSWAP16C((x) >> 16)) #define av_be2ne32(x) AV_BSWAP32C((x)) diff --git a/ext/at3_standalone/fft.cpp b/ext/at3_standalone/fft.cpp index 10914d0504..c638b9be87 100644 --- a/ext/at3_standalone/fft.cpp +++ b/ext/at3_standalone/fft.cpp @@ -54,7 +54,7 @@ COSTABLE(16384); COSTABLE(32768); COSTABLE(65536); -FFTSample * const ff_cos_tabs[] = { +static FFTSample * const ff_cos_tabs[] = { NULL, NULL, NULL, NULL, ff_cos_16, ff_cos_32, diff --git a/ext/at3_standalone/fft.h b/ext/at3_standalone/fft.h index 79725efcbf..65e7b3a1fb 100644 --- a/ext/at3_standalone/fft.h +++ b/ext/at3_standalone/fft.h @@ -88,7 +88,6 @@ extern COSTABLE(8192); extern COSTABLE(16384); extern COSTABLE(32768); extern COSTABLE(65536); -extern FFTSample* const ff_cos_tabs[17]; /** * Initialize the cosine table in ff_cos_tabs[index] diff --git a/ext/at3_standalone/intreadwrite.h b/ext/at3_standalone/intreadwrite.h index 21ea176213..c6d776c10e 100644 --- a/ext/at3_standalone/intreadwrite.h +++ b/ext/at3_standalone/intreadwrite.h @@ -16,9 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVUTIL_INTREADWRITE_H -#define AVUTIL_INTREADWRITE_H - +#pragma once #include #include "compat.h" @@ -44,45 +42,7 @@ typedef union { uint8_t u8 [2]; } av_alias av_alias16; -/* - * Arch-specific headers can provide any combination of - * AV_[RW][BLN](16|24|32|48|64) and AV_(COPY|SWAP|ZERO)(64|128) macros. - * Preprocessor symbols must be defined, even if these are implemented - * as inline functions. - * - * R/W means read/write, B/L/N means big/little/native endianness. - * The following macros require aligned access, compared to their - * unaligned variants: AV_(COPY|SWAP|ZERO)(64|128), AV_[RW]N[8-64]A. - * Incorrect usage may range from abysmal performance to crash - * depending on the platform. - * - * The unaligned variants are AV_[RW][BLN][8-64] and AV_COPY*U. - */ - -#ifdef HAVE_AV_CONFIG_H - -#include "config.h" - -#if ARCH_ARM -# include "arm/intreadwrite.h" -#elif ARCH_AVR32 -# include "avr32/intreadwrite.h" -#elif ARCH_MIPS -# include "mips/intreadwrite.h" -#elif ARCH_PPC -# include "ppc/intreadwrite.h" -#elif ARCH_TOMI -# include "tomi/intreadwrite.h" -#elif ARCH_X86 -# include "x86/intreadwrite.h" -#endif - -#endif /* HAVE_AV_CONFIG_H */ - -/* - * Map AV_RNXX <-> AV_R[BL]XX for all variants provided by per-arch headers. - */ - +#include "compat.h" # if defined(AV_RN16) && !defined(AV_RL16) # define AV_RL16(p) AV_RN16(p) @@ -148,22 +108,7 @@ typedef union { * Define AV_[RW]N helper macros to simplify definitions not provided * by per-arch headers. */ - -#if defined(__GNUC__) && !defined(__TI_COMPILER_VERSION__) - -union unaligned_64 { uint64_t l; } __attribute__((packed)) av_alias; -union unaligned_32 { uint32_t l; } __attribute__((packed)) av_alias; -union unaligned_16 { uint16_t l; } __attribute__((packed)) av_alias; - -# define AV_RN(s, p) (((const union unaligned_##s *) (p))->l) -# define AV_WN(s, p, v) ((((union unaligned_##s *) (p))->l) = (v)) - -#elif defined(__DECC) - -# define AV_RN(s, p) (*((const __unaligned uint##s##_t*)(p))) -# define AV_WN(s, p, v) (*((__unaligned uint##s##_t*)(p)) = (v)) - -#elif AV_HAVE_FAST_UNALIGNED +#if AV_HAVE_FAST_UNALIGNED # define AV_RN(s, p) (((const av_alias##s*)(p))->u##s) # define AV_WN(s, p, v) (((av_alias##s*)(p))->u##s = (v)) @@ -280,13 +225,8 @@ union unaligned_16 { uint16_t l; } __attribute__((packed)) av_alias; } while(0) #endif -#if AV_HAVE_BIGENDIAN -# define AV_RN(s, p) AV_RB##s(p) -# define AV_WN(s, p, v) AV_WB##s(p, v) -#else # define AV_RN(s, p) AV_RL##s(p) # define AV_WN(s, p, v) AV_WL##s(p, v) -#endif #endif /* HAVE_FAST_UNALIGNED */ @@ -314,17 +254,10 @@ union unaligned_16 { uint16_t l; } __attribute__((packed)) av_alias; # define AV_WN64(p, v) AV_WN(64, p, v) #endif -#if AV_HAVE_BIGENDIAN -# define AV_RB(s, p) AV_RN##s(p) -# define AV_WB(s, p, v) AV_WN##s(p, v) -# define AV_RL(s, p) av_bswap##s(AV_RN##s(p)) -# define AV_WL(s, p, v) AV_WN##s(p, av_bswap##s(v)) -#else # define AV_RB(s, p) av_bswap##s(AV_RN##s(p)) # define AV_WB(s, p, v) AV_WN##s(p, av_bswap##s(v)) # define AV_RL(s, p) AV_RN##s(p) # define AV_WL(s, p, v) AV_WN##s(p, v) -#endif #define AV_RB8(x) (((const uint8_t*)(x))[0]) #define AV_WB8(p, d) do { ((uint8_t*)(p))[0] = (d); } while(0) @@ -401,5 +334,3 @@ union unaligned_16 { uint16_t l; } __attribute__((packed)) av_alias; ((uint8_t*)(p))[2] = (d)>>16; \ } while(0) #endif - -#endif /* AVUTIL_INTREADWRITE_H */ diff --git a/ext/at3_standalone/sinewin.cpp b/ext/at3_standalone/sinewin.cpp index 3af4289101..fa154184a8 100644 --- a/ext/at3_standalone/sinewin.cpp +++ b/ext/at3_standalone/sinewin.cpp @@ -38,7 +38,9 @@ SINETABLE(2048); SINETABLE(4096); SINETABLE(8192); -float * const ff_sine_windows[] = { +// Thie array is only accessed in init. However, not so for the +// sine tables it points to. +static float *ff_sine_windows[] = { NULL, NULL, NULL, NULL, NULL, // unused ff_sine_32 , ff_sine_64, ff_sine_128, ff_sine_256, ff_sine_512, ff_sine_1024, diff --git a/ext/at3_standalone/sinewin.h b/ext/at3_standalone/sinewin.h index bf2b2efc17..2aec7727f2 100644 --- a/ext/at3_standalone/sinewin.h +++ b/ext/at3_standalone/sinewin.h @@ -44,5 +44,3 @@ extern SINETABLE(1024); extern SINETABLE(2048); extern SINETABLE(4096); extern SINETABLE(8192); - -extern float * const ff_sine_windows[14]; From 416ba81d20c34ccbeccbe68d086b50537659e660 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Thu, 11 Apr 2024 12:19:11 +0200 Subject: [PATCH 087/719] Remove the channel_layout stuff --- Common/Common.vcxproj | 3 +- Common/Common.vcxproj.filters | 9 +- Core/HW/Atrac3Standalone.cpp | 1 - android/jni/Android.mk | 1 - ext/at3_standalone/CMakeLists.txt | 1 - ext/at3_standalone/atrac3plusdec.cpp | 12 -- ext/at3_standalone/avcodec.cpp | 24 ---- ext/at3_standalone/avcodec.h | 8 -- ext/at3_standalone/channel_layout.cpp | 152 -------------------------- ext/at3_standalone/channel_layout.h | 129 ---------------------- 10 files changed, 4 insertions(+), 336 deletions(-) delete mode 100644 ext/at3_standalone/channel_layout.cpp delete mode 100644 ext/at3_standalone/channel_layout.h diff --git a/Common/Common.vcxproj b/Common/Common.vcxproj index 3db89e65b3..05b041e8ff 100644 --- a/Common/Common.vcxproj +++ b/Common/Common.vcxproj @@ -391,7 +391,6 @@ - @@ -605,7 +604,6 @@ - @@ -1045,6 +1043,7 @@ + diff --git a/Common/Common.vcxproj.filters b/Common/Common.vcxproj.filters index a7857c5ebf..96f1f70258 100644 --- a/Common/Common.vcxproj.filters +++ b/Common/Common.vcxproj.filters @@ -557,9 +557,6 @@ ext\at3_standalone - - ext\at3_standalone - ext\at3_standalone @@ -1050,9 +1047,6 @@ ext\at3_standalone - - ext\at3_standalone - ext\at3_standalone @@ -1192,6 +1186,9 @@ ext\at3_standalone + + ext\at3_standalone + diff --git a/Core/HW/Atrac3Standalone.cpp b/Core/HW/Atrac3Standalone.cpp index df763de6c0..a195e02a49 100644 --- a/Core/HW/Atrac3Standalone.cpp +++ b/Core/HW/Atrac3Standalone.cpp @@ -39,7 +39,6 @@ public: if (!codecOpen_) { ctx_->block_align = inbytes; ctx_->channels = 2; - ctx_->channel_layout = ctx_->channels == 2 ? AV_CH_LAYOUT_STEREO : AV_CH_LAYOUT_MONO; int retval; if (audioType_ == PSP_CODEC_AT3PLUS) { retval = avcodec_open2(ctx_, &ff_atrac3p_decoder, nullptr); diff --git a/android/jni/Android.mk b/android/jni/Android.mk index c7a6b6e2ab..f85b36ecc4 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -120,7 +120,6 @@ AT3_STANDALONE_FILES := \ ${SRC}/ext/at3_standalone/atrac3plusdsp.cpp \ ${SRC}/ext/at3_standalone/avcodec.cpp \ ${SRC}/ext/at3_standalone/get_bits.cpp \ - ${SRC}/ext/at3_standalone/channel_layout.cpp \ ${SRC}/ext/at3_standalone/compat.cpp \ ${SRC}/ext/at3_standalone/fft.cpp \ ${SRC}/ext/at3_standalone/float_dsp.cpp \ diff --git a/ext/at3_standalone/CMakeLists.txt b/ext/at3_standalone/CMakeLists.txt index d62845caed..a62c4a514a 100644 --- a/ext/at3_standalone/CMakeLists.txt +++ b/ext/at3_standalone/CMakeLists.txt @@ -13,7 +13,6 @@ set(ALL_SOURCE_FILES ${SRC_DIR}/atrac3plusdsp.cpp ${SRC_DIR}/avcodec.cpp ${SRC_DIR}/get_bits.cpp - ${SRC_DIR}/channel_layout.cpp ${SRC_DIR}/compat.cpp ${SRC_DIR}/fft.cpp ${SRC_DIR}/float_dsp.cpp diff --git a/ext/at3_standalone/atrac3plusdec.cpp b/ext/at3_standalone/atrac3plusdec.cpp index 9312540dbe..538275d17f 100644 --- a/ext/at3_standalone/atrac3plusdec.cpp +++ b/ext/at3_standalone/atrac3plusdec.cpp @@ -37,7 +37,6 @@ #include #include -#include "channel_layout.h" #include "float_dsp.h" #include "avcodec.h" #include "get_bits.h" @@ -61,7 +60,6 @@ struct ATRAC3PContext { int num_channel_blocks; ///< number of channel blocks uint8_t channel_blocks[5]; ///< channel configuration descriptor - uint64_t my_channel_layout; ///< current channel layout }; int atrac3p_decode_close(AVCodecContext *avctx) @@ -80,31 +78,25 @@ static int set_channel_params(ATRAC3PContext *ctx, AVCodecContext *avctx) { memset(ctx->channel_blocks, 0, sizeof(ctx->channel_blocks)); switch (avctx->channels) { case 1: - if (avctx->channel_layout != AV_CH_FRONT_LEFT) - avctx->channel_layout = AV_CH_LAYOUT_MONO; ctx->num_channel_blocks = 1; ctx->channel_blocks[0] = CH_UNIT_MONO; break; case 2: - avctx->channel_layout = AV_CH_LAYOUT_STEREO; ctx->num_channel_blocks = 1; ctx->channel_blocks[0] = CH_UNIT_STEREO; break; case 3: - avctx->channel_layout = AV_CH_LAYOUT_SURROUND; ctx->num_channel_blocks = 2; ctx->channel_blocks[0] = CH_UNIT_STEREO; ctx->channel_blocks[1] = CH_UNIT_MONO; break; case 4: - avctx->channel_layout = AV_CH_LAYOUT_4POINT0; ctx->num_channel_blocks = 3; ctx->channel_blocks[0] = CH_UNIT_STEREO; ctx->channel_blocks[1] = CH_UNIT_MONO; ctx->channel_blocks[2] = CH_UNIT_MONO; break; case 6: - avctx->channel_layout = AV_CH_LAYOUT_5POINT1_BACK; ctx->num_channel_blocks = 4; ctx->channel_blocks[0] = CH_UNIT_STEREO; ctx->channel_blocks[1] = CH_UNIT_MONO; @@ -112,7 +104,6 @@ static int set_channel_params(ATRAC3PContext *ctx, AVCodecContext *avctx) { ctx->channel_blocks[3] = CH_UNIT_MONO; break; case 7: - avctx->channel_layout = AV_CH_LAYOUT_6POINT1_BACK; ctx->num_channel_blocks = 5; ctx->channel_blocks[0] = CH_UNIT_STEREO; ctx->channel_blocks[1] = CH_UNIT_MONO; @@ -121,7 +112,6 @@ static int set_channel_params(ATRAC3PContext *ctx, AVCodecContext *avctx) { ctx->channel_blocks[4] = CH_UNIT_MONO; break; case 8: - avctx->channel_layout = AV_CH_LAYOUT_7POINT1; ctx->num_channel_blocks = 5; ctx->channel_blocks[0] = CH_UNIT_STEREO; ctx->channel_blocks[1] = CH_UNIT_MONO; @@ -162,8 +152,6 @@ int atrac3p_decode_init(AVCodecContext *avctx) if ((ret = set_channel_params(ctx, avctx)) < 0) return ret; - ctx->my_channel_layout = avctx->channel_layout; - ctx->ch_units = (Atrac3pChanUnitCtx *)av_mallocz_array(ctx->num_channel_blocks, sizeof(*ctx->ch_units)); if (!ctx->ch_units) { diff --git a/ext/at3_standalone/avcodec.cpp b/ext/at3_standalone/avcodec.cpp index 4b94457478..e3a189d792 100644 --- a/ext/at3_standalone/avcodec.cpp +++ b/ext/at3_standalone/avcodec.cpp @@ -26,9 +26,6 @@ #include "avcodec.h" #include "compat.h" -#include "channel_layout.h" -#include "compat.h" -#include "avcodec.h" #include "mem.h" #include @@ -98,27 +95,6 @@ int avcodec_open2(AVCodecContext *avctx, const AVCodec *codec, void *options) } ret = 0; - - /* validate channel layout from the decoder */ - if (avctx->channel_layout) { - int channels = av_get_channel_layout_nb_channels(avctx->channel_layout); - if (!avctx->channels) - avctx->channels = channels; - else if (channels != avctx->channels) { - char buf[512] = ""; - av_log(AV_LOG_WARNING, - "Channel layout '%s' with %d channels does not match specified number of channels %d: " - "ignoring specified channel layout\n", - buf, channels, avctx->channels); - avctx->channel_layout = 0; - } - } - if (avctx->channels && avctx->channels < 0 || - avctx->channels > FF_SANE_NB_CHANNELS) { - ret = AVERROR(EINVAL); - goto free_and_end; - } - end: return ret; diff --git a/ext/at3_standalone/avcodec.h b/ext/at3_standalone/avcodec.h index d0ed2184b6..5a4ec7818b 100644 --- a/ext/at3_standalone/avcodec.h +++ b/ext/at3_standalone/avcodec.h @@ -23,7 +23,6 @@ #include #include "compat.h" -#include "channel_layout.h" #include "mem.h" enum AVCodecID { @@ -103,13 +102,6 @@ typedef struct AVCodecContext { * Used by some WAV based audio codecs. */ int block_align; - - /** - * Audio channel layout. - * - encoding: set by user. - * - decoding: set by user, may be overwritten by libavcodec. - */ - uint64_t channel_layout; } AVCodecContext; /** diff --git a/ext/at3_standalone/channel_layout.cpp b/ext/at3_standalone/channel_layout.cpp deleted file mode 100644 index f045a381d3..0000000000 --- a/ext/at3_standalone/channel_layout.cpp +++ /dev/null @@ -1,152 +0,0 @@ -/* - * Copyright (c) 2006 Michael Niedermayer - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/** - * @file - * audio channel layout utility functions - */ - -#include -#include -#include -#include -#include - -#include "channel_layout.h" -#include "compat.h" -#include "mathematics.h" - -struct channel_name { - const char *name; - const char *description; -}; - -static const struct channel_name channel_names[] = { - { "FL", "front left" }, - { "FR", "front right" }, - { "FC", "front center" }, - { "LFE", "low frequency" }, - { "BL", "back left" }, - { "BR", "back right" }, - { "FLC", "front left-of-center" }, - { "FRC", "front right-of-center" }, - { "BC", "back center" }, - { "SL", "side left" }, - { "SR", "side right" }, - { "TC", "top center" }, - { "TFL", "top front left" }, - { "TFC", "top front center" }, - { "TFR", "top front right" }, - { "TBL", "top back left" }, - { "TBC", "top back center" }, - { "TBR", "top back right" }, - { "DL", "downmix left" }, - { "DR", "downmix right" }, - { "WL", "wide left" }, - { "WR", "wide right" }, - { "SDL", "surround direct left" }, - { "SDR", "surround direct right" }, - { "LFE2", "low frequency 2" }, -}; - -static const char *get_channel_name(int channel_id) -{ - if (channel_id < 0 || channel_id >= FF_ARRAY_ELEMS(channel_names)) - return NULL; - return channel_names[channel_id].name; -} - -static const struct { - const char *name; - int nb_channels; - uint64_t layout; -} channel_layout_map[] = { - { "mono", 1, AV_CH_LAYOUT_MONO }, - { "stereo", 2, AV_CH_LAYOUT_STEREO }, -}; - -static uint64_t get_channel_layout_single(const char *name, int name_len) -{ - int i; - char *end; - int64_t layout; - - for (i = 0; i < FF_ARRAY_ELEMS(channel_layout_map); i++) { - if (strlen(channel_layout_map[i].name) == name_len && - !memcmp(channel_layout_map[i].name, name, name_len)) - return channel_layout_map[i].layout; - } - for (i = 0; i < FF_ARRAY_ELEMS(channel_names); i++) - if (channel_names[i].name && - strlen(channel_names[i].name) == name_len && - !memcmp(channel_names[i].name, name, name_len)) - return (int64_t)1 << i; - - errno = 0; - i = strtol(name, &end, 10); - - if (!errno && (end + 1 - name == name_len && *end == 'c')) - return av_get_default_channel_layout(i); - - errno = 0; - layout = strtoll(name, &end, 0); - if (!errno && end - name == name_len) - return FFMAX(layout, 0); - return 0; -} - -uint64_t av_get_channel_layout(const char *name) -{ - const char *n, *e; - const char *name_end = name + strlen(name); - int64_t layout = 0, layout_single; - - for (n = name; n < name_end; n = e + 1) { - for (e = n; e < name_end && *e != '+' && *e != '|'; e++); - layout_single = get_channel_layout_single(n, e - n); - if (!layout_single) - return 0; - layout |= layout_single; - } - return layout; -} - -int av_get_channel_layout_nb_channels(uint64_t channel_layout) -{ - return av_popcount64(channel_layout); -} - -int64_t av_get_default_channel_layout(int nb_channels) { - int i; - for (i = 0; i < FF_ARRAY_ELEMS(channel_layout_map); i++) - if (nb_channels == channel_layout_map[i].nb_channels) - return channel_layout_map[i].layout; - return 0; -} - -int av_get_channel_layout_channel_index(uint64_t channel_layout, - uint64_t channel) -{ - if (!(channel_layout & channel) || - av_get_channel_layout_nb_channels(channel) != 1) - return AVERROR(EINVAL); - channel_layout &= channel - 1; - return av_get_channel_layout_nb_channels(channel_layout); -} diff --git a/ext/at3_standalone/channel_layout.h b/ext/at3_standalone/channel_layout.h deleted file mode 100644 index 98a249044d..0000000000 --- a/ext/at3_standalone/channel_layout.h +++ /dev/null @@ -1,129 +0,0 @@ -/* - * Copyright (c) 2006 Michael Niedermayer - * Copyright (c) 2008 Peter Ross - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef AVUTIL_CHANNEL_LAYOUT_H -#define AVUTIL_CHANNEL_LAYOUT_H - -#include - -/** - * @file - * audio channel layout utility functions - */ - -/** - * @addtogroup lavu_audio - * @{ - */ - -/** - * @defgroup channel_masks Audio channel masks - * - * A channel layout is a 64-bits integer with a bit set for every channel. - * The number of bits set must be equal to the number of channels. - * The value 0 means that the channel layout is not known. - * @note this data structure is not powerful enough to handle channels - * combinations that have the same channel multiple times, such as - * dual-mono. - * - * @{ - */ -#define AV_CH_FRONT_LEFT 0x00000001 -#define AV_CH_FRONT_RIGHT 0x00000002 -#define AV_CH_FRONT_CENTER 0x00000004 -#define AV_CH_LOW_FREQUENCY 0x00000008 -#define AV_CH_BACK_LEFT 0x00000010 -#define AV_CH_BACK_RIGHT 0x00000020 -#define AV_CH_FRONT_LEFT_OF_CENTER 0x00000040 -#define AV_CH_FRONT_RIGHT_OF_CENTER 0x00000080 -#define AV_CH_BACK_CENTER 0x00000100 -#define AV_CH_SIDE_LEFT 0x00000200 -#define AV_CH_SIDE_RIGHT 0x00000400 -#define AV_CH_TOP_CENTER 0x00000800 -#define AV_CH_TOP_FRONT_LEFT 0x00001000 -#define AV_CH_TOP_FRONT_CENTER 0x00002000 -#define AV_CH_TOP_FRONT_RIGHT 0x00004000 -#define AV_CH_TOP_BACK_LEFT 0x00008000 -#define AV_CH_TOP_BACK_CENTER 0x00010000 -#define AV_CH_TOP_BACK_RIGHT 0x00020000 -#define AV_CH_STEREO_LEFT 0x20000000 ///< Stereo downmix. -#define AV_CH_STEREO_RIGHT 0x40000000 ///< See AV_CH_STEREO_LEFT. -#define AV_CH_WIDE_LEFT 0x0000000080000000ULL -#define AV_CH_WIDE_RIGHT 0x0000000100000000ULL -#define AV_CH_SURROUND_DIRECT_LEFT 0x0000000200000000ULL -#define AV_CH_SURROUND_DIRECT_RIGHT 0x0000000400000000ULL -#define AV_CH_LOW_FREQUENCY_2 0x0000000800000000ULL - -/** Channel mask value used for AVCodecContext.request_channel_layout - to indicate that the user requests the channel order of the decoder output - to be the native codec channel order. */ -#define AV_CH_LAYOUT_NATIVE 0x8000000000000000ULL - -/** - * @} - * @defgroup channel_mask_c Audio channel layouts - * @{ - * */ -#define AV_CH_LAYOUT_MONO (AV_CH_FRONT_CENTER) -#define AV_CH_LAYOUT_STEREO (AV_CH_FRONT_LEFT|AV_CH_FRONT_RIGHT) -#define AV_CH_LAYOUT_2POINT1 (AV_CH_LAYOUT_STEREO|AV_CH_LOW_FREQUENCY) -#define AV_CH_LAYOUT_2_1 (AV_CH_LAYOUT_STEREO|AV_CH_BACK_CENTER) -#define AV_CH_LAYOUT_SURROUND (AV_CH_LAYOUT_STEREO|AV_CH_FRONT_CENTER) -#define AV_CH_LAYOUT_3POINT1 (AV_CH_LAYOUT_SURROUND|AV_CH_LOW_FREQUENCY) -#define AV_CH_LAYOUT_4POINT0 (AV_CH_LAYOUT_SURROUND|AV_CH_BACK_CENTER) -#define AV_CH_LAYOUT_4POINT1 (AV_CH_LAYOUT_4POINT0|AV_CH_LOW_FREQUENCY) -#define AV_CH_LAYOUT_2_2 (AV_CH_LAYOUT_STEREO|AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT) -#define AV_CH_LAYOUT_QUAD (AV_CH_LAYOUT_STEREO|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT) -#define AV_CH_LAYOUT_5POINT0 (AV_CH_LAYOUT_SURROUND|AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT) -#define AV_CH_LAYOUT_5POINT1 (AV_CH_LAYOUT_5POINT0|AV_CH_LOW_FREQUENCY) -#define AV_CH_LAYOUT_5POINT0_BACK (AV_CH_LAYOUT_SURROUND|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT) -#define AV_CH_LAYOUT_5POINT1_BACK (AV_CH_LAYOUT_5POINT0_BACK|AV_CH_LOW_FREQUENCY) -#define AV_CH_LAYOUT_6POINT0 (AV_CH_LAYOUT_5POINT0|AV_CH_BACK_CENTER) -#define AV_CH_LAYOUT_6POINT0_FRONT (AV_CH_LAYOUT_2_2|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER) -#define AV_CH_LAYOUT_HEXAGONAL (AV_CH_LAYOUT_5POINT0_BACK|AV_CH_BACK_CENTER) -#define AV_CH_LAYOUT_6POINT1 (AV_CH_LAYOUT_5POINT1|AV_CH_BACK_CENTER) -#define AV_CH_LAYOUT_6POINT1_BACK (AV_CH_LAYOUT_5POINT1_BACK|AV_CH_BACK_CENTER) -#define AV_CH_LAYOUT_6POINT1_FRONT (AV_CH_LAYOUT_6POINT0_FRONT|AV_CH_LOW_FREQUENCY) -#define AV_CH_LAYOUT_7POINT0 (AV_CH_LAYOUT_5POINT0|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT) -#define AV_CH_LAYOUT_7POINT0_FRONT (AV_CH_LAYOUT_5POINT0|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER) -#define AV_CH_LAYOUT_7POINT1 (AV_CH_LAYOUT_5POINT1|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT) -#define AV_CH_LAYOUT_7POINT1_WIDE (AV_CH_LAYOUT_5POINT1|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER) -#define AV_CH_LAYOUT_7POINT1_WIDE_BACK (AV_CH_LAYOUT_5POINT1_BACK|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER) -#define AV_CH_LAYOUT_OCTAGONAL (AV_CH_LAYOUT_5POINT0|AV_CH_BACK_LEFT|AV_CH_BACK_CENTER|AV_CH_BACK_RIGHT) -#define AV_CH_LAYOUT_HEXADECAGONAL (AV_CH_LAYOUT_OCTAGONAL|AV_CH_WIDE_LEFT|AV_CH_WIDE_RIGHT|AV_CH_TOP_BACK_LEFT|AV_CH_TOP_BACK_RIGHT|AV_CH_TOP_BACK_CENTER|AV_CH_TOP_FRONT_CENTER|AV_CH_TOP_FRONT_LEFT|AV_CH_TOP_FRONT_RIGHT) -#define AV_CH_LAYOUT_STEREO_DOWNMIX (AV_CH_STEREO_LEFT|AV_CH_STEREO_RIGHT) - -/** - * Return the number of channels in the channel layout. - */ -int av_get_channel_layout_nb_channels(uint64_t channel_layout); - -/** - * Return default channel layout for a given number of channels. - */ -int64_t av_get_default_channel_layout(int nb_channels); - -/** - * @} - * @} - */ - -#endif /* AVUTIL_CHANNEL_LAYOUT_H */ From 843119411f27f48d799605ad099968f8ce2e3db9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Thu, 11 Apr 2024 12:33:26 +0200 Subject: [PATCH 088/719] Stop passing around the AVCodecContext pointer so much --- ext/at3_standalone/atrac3.cpp | 36 ++++++----- ext/at3_standalone/atrac3plus.cpp | 92 ++++++++++------------------ ext/at3_standalone/atrac3plus.h | 4 +- ext/at3_standalone/atrac3plusdec.cpp | 22 +++---- 4 files changed, 64 insertions(+), 90 deletions(-) diff --git a/ext/at3_standalone/atrac3.cpp b/ext/at3_standalone/atrac3.cpp index 0f27477935..af666b52d0 100644 --- a/ext/at3_standalone/atrac3.cpp +++ b/ext/at3_standalone/atrac3.cpp @@ -635,17 +635,16 @@ static int decode_channel_sound_unit(ATRAC3Context *q, GetBitContext *gb, return 0; } -static int decode_frame(AVCodecContext *avctx, const uint8_t *databuf, +static int decode_frame(ATRAC3Context *q, int block_align, int channels, const uint8_t *databuf, float **out_samples) { - ATRAC3Context *q = (ATRAC3Context *)avctx->priv_data; int ret, i; uint8_t *ptr1; if (q->coding_mode == JOINT_STEREO) { /* channel coupling mode */ /* decode Sound Unit 1 */ - init_get_bits(&q->gb, databuf, avctx->block_align * 8); + init_get_bits(&q->gb, databuf, block_align * 8); ret = decode_channel_sound_unit(q, &q->gb, q->units, out_samples[0], 0, JOINT_STEREO); @@ -655,26 +654,26 @@ static int decode_frame(AVCodecContext *avctx, const uint8_t *databuf, /* Framedata of the su2 in the joint-stereo mode is encoded in * reverse byte order so we need to swap it first. */ if (databuf == q->decoded_bytes_buffer) { - uint8_t *ptr2 = q->decoded_bytes_buffer + avctx->block_align - 1; + uint8_t *ptr2 = q->decoded_bytes_buffer + block_align - 1; ptr1 = q->decoded_bytes_buffer; - for (i = 0; i < avctx->block_align / 2; i++, ptr1++, ptr2--) + for (i = 0; i < block_align / 2; i++, ptr1++, ptr2--) FFSWAP(uint8_t, *ptr1, *ptr2); } else { - const uint8_t *ptr2 = databuf + avctx->block_align - 1; - for (i = 0; i < avctx->block_align; i++) + const uint8_t *ptr2 = databuf + block_align - 1; + for (i = 0; i < block_align; i++) q->decoded_bytes_buffer[i] = *ptr2--; } /* Skip the sync codes (0xF8). */ ptr1 = q->decoded_bytes_buffer; for (i = 4; *ptr1 == 0xF8; i++, ptr1++) { - if (i >= avctx->block_align) + if (i >= block_align) return AVERROR_INVALIDDATA; } /* set the bitstream reader at the start of the second Sound Unit*/ - init_get_bits8(&q->gb, ptr1, q->decoded_bytes_buffer + avctx->block_align - ptr1); + init_get_bits8(&q->gb, ptr1, q->decoded_bytes_buffer + block_align - ptr1); /* Fill the Weighting coeffs delay buffer */ memmove(q->weighting_delay, &q->weighting_delay[2], @@ -703,11 +702,11 @@ static int decode_frame(AVCodecContext *avctx, const uint8_t *databuf, } else { /* normal stereo mode or mono */ /* Decode the channel sound units. */ - for (i = 0; i < avctx->channels; i++) { + for (i = 0; i < channels; i++) { /* Set the bitstream reader at the start of a channel sound unit. */ init_get_bits(&q->gb, - databuf + i * avctx->block_align / avctx->channels, - avctx->block_align * 8 / avctx->channels); + databuf + i * block_align / channels, + block_align * 8 / channels); ret = decode_channel_sound_unit(q, &q->gb, &q->units[i], out_samples[i], i, q->coding_mode); @@ -717,7 +716,7 @@ static int decode_frame(AVCodecContext *avctx, const uint8_t *databuf, } /* Apply the iQMF synthesis filter. */ - for (i = 0; i < avctx->channels; i++) { + for (i = 0; i < channels; i++) { float *p1 = out_samples[i]; float *p2 = p1 + 256; float *p3 = p2 + 256; @@ -736,7 +735,10 @@ int atrac3_decode_frame(AVCodecContext *avctx, float *out_data[2], int *nb_sampl int ret; const uint8_t *databuf; - if (buf_size < avctx->block_align) { + const int block_align = avctx->block_align; + const int channels = avctx->channels; + + if (buf_size < block_align) { av_log(AV_LOG_ERROR, "Frame too small (%d bytes). Truncated file?\n", buf_size); return AVERROR_INVALIDDATA; @@ -747,13 +749,13 @@ int atrac3_decode_frame(AVCodecContext *avctx, float *out_data[2], int *nb_sampl /* Check if we need to descramble and what buffer to pass on. */ if (q->scrambled_stream) { - decode_bytes(buf, q->decoded_bytes_buffer, avctx->block_align); + decode_bytes(buf, q->decoded_bytes_buffer, block_align); databuf = q->decoded_bytes_buffer; } else { databuf = buf; } - ret = decode_frame(avctx, databuf, out_data); + ret = decode_frame(q, block_align, channels, databuf, out_data); if (ret) { av_log( AV_LOG_ERROR, "Frame decoding error!\n"); return ret; @@ -761,7 +763,7 @@ int atrac3_decode_frame(AVCodecContext *avctx, float *out_data[2], int *nb_sampl *got_frame_ptr = 1; - return avctx->block_align; + return block_align; } static void atrac3_init_static_data(void) diff --git a/ext/at3_standalone/atrac3plus.cpp b/ext/at3_standalone/atrac3plus.cpp index 1db8821a98..851e9c4182 100644 --- a/ext/at3_standalone/atrac3plus.cpp +++ b/ext/at3_standalone/atrac3plus.cpp @@ -217,11 +217,9 @@ void ff_atrac3p_init_vlcs(void) * @param[in] gb the GetBit context * @param[in,out] chan ptr to the channel parameters * @param[in,out] ctx ptr to the channel unit context - * @param[in] avctx ptr to the AVCodecContext * @return result code: 0 = OK, otherwise - error code */ -static int num_coded_units(GetBitContext *gb, Atrac3pChanParams *chan, - Atrac3pChanUnitCtx *ctx, AVCodecContext *avctx) +static int num_coded_units(GetBitContext *gb, Atrac3pChanParams *chan, Atrac3pChanUnitCtx *ctx) { chan->fill_mode = get_bits(gb, 2); if (!chan->fill_mode) { @@ -247,12 +245,10 @@ static int num_coded_units(GetBitContext *gb, Atrac3pChanParams *chan, * @param[in,out] ctx ptr to the channel unit context * @param[in,out] chan ptr to the channel parameters * @param[in] wtab_idx index of the table of weights - * @param[in] avctx ptr to the AVCodecContext * @return result code: 0 = OK, otherwise - error code */ static int add_wordlen_weights(Atrac3pChanUnitCtx *ctx, - Atrac3pChanParams *chan, int wtab_idx, - AVCodecContext *avctx) + Atrac3pChanParams *chan, int wtab_idx) { int i; const int8_t *weights_tab = @@ -277,12 +273,10 @@ static int add_wordlen_weights(Atrac3pChanUnitCtx *ctx, * @param[in,out] ctx ptr to the channel unit context * @param[in,out] chan ptr to the channel parameters * @param[in] wtab_idx index of table of weights - * @param[in] avctx ptr to the AVCodecContext * @return result code: 0 = OK, otherwise - error code */ static int subtract_sf_weights(Atrac3pChanUnitCtx *ctx, - Atrac3pChanParams *chan, int wtab_idx, - AVCodecContext *avctx) + Atrac3pChanParams *chan, int wtab_idx) { int i; const int8_t *weights_tab = &atrac3p_sf_weights[wtab_idx - 1][0]; @@ -331,11 +325,9 @@ static inline void unpack_vq_shape(int start_val, const int8_t *shape_vec, * @param[in] gb the GetBit context * @param[in,out] ctx ptr to the channel unit context * @param[in] ch_num channel to process - * @param[in] avctx ptr to the AVCodecContext * @return result code: 0 = OK, otherwise - error code */ -static int decode_channel_wordlen(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, - int ch_num, AVCodecContext *avctx) +static int decode_channel_wordlen(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, int ch_num) { int i, weight_idx = 0, delta, diff, pos, delta_bits, min_val, flag, ret, start_val; @@ -352,7 +344,7 @@ static int decode_channel_wordlen(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, break; case 1: if (ch_num) { - if ((ret = num_coded_units(gb, chan, ctx, avctx)) < 0) + if ((ret = num_coded_units(gb, chan, ctx)) < 0) return ret; if (chan->num_coded_vals) { @@ -365,7 +357,7 @@ static int decode_channel_wordlen(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, } } else { weight_idx = get_bits(gb, 2); - if ((ret = num_coded_units(gb, chan, ctx, avctx)) < 0) + if ((ret = num_coded_units(gb, chan, ctx)) < 0) return ret; if (chan->num_coded_vals) { @@ -388,7 +380,7 @@ static int decode_channel_wordlen(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, } break; case 2: - if ((ret = num_coded_units(gb, chan, ctx, avctx)) < 0) + if ((ret = num_coded_units(gb, chan, ctx)) < 0) return ret; if (ch_num && chan->num_coded_vals) { @@ -435,7 +427,7 @@ static int decode_channel_wordlen(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, break; case 3: weight_idx = get_bits(gb, 2); - if ((ret = num_coded_units(gb, chan, ctx, avctx)) < 0) + if ((ret = num_coded_units(gb, chan, ctx)) < 0) return ret; if (chan->num_coded_vals) { @@ -467,7 +459,7 @@ static int decode_channel_wordlen(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, } if (weight_idx) - return add_wordlen_weights(ctx, chan, weight_idx, avctx); + return add_wordlen_weights(ctx, chan, weight_idx); return 0; } @@ -478,11 +470,9 @@ static int decode_channel_wordlen(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, * @param[in] gb the GetBit context * @param[in,out] ctx ptr to the channel unit context * @param[in] ch_num channel to process - * @param[in] avctx ptr to the AVCodecContext * @return result code: 0 = OK, otherwise - error code */ -static int decode_channel_sf_idx(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, - int ch_num, AVCodecContext *avctx) +static int decode_channel_sf_idx(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, int ch_num) { int i, weight_idx = 0, delta, diff, num_long_vals, delta_bits, min_val, vlc_sel, start_val; @@ -602,7 +592,7 @@ static int decode_channel_sf_idx(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, } if (weight_idx && weight_idx < 3) - return subtract_sf_weights(ctx, chan, weight_idx, avctx); + return subtract_sf_weights(ctx, chan, weight_idx); return 0; } @@ -613,11 +603,10 @@ static int decode_channel_sf_idx(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, * @param[in] gb the GetBit context * @param[in,out] ctx ptr to the channel unit context * @param[in] num_channels number of channels to process - * @param[in] avctx ptr to the AVCodecContext * @return result code: 0 = OK, otherwise - error code */ static int decode_quant_wordlen(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, - int num_channels, AVCodecContext *avctx) + int num_channels) { int ch_num, i, ret; @@ -625,7 +614,7 @@ static int decode_quant_wordlen(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, memset(ctx->channels[ch_num].qu_wordlen, 0, sizeof(ctx->channels[ch_num].qu_wordlen)); - if ((ret = decode_channel_wordlen(gb, ctx, ch_num, avctx)) < 0) + if ((ret = decode_channel_wordlen(gb, ctx, ch_num)) < 0) return ret; } @@ -646,11 +635,10 @@ static int decode_quant_wordlen(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, * @param[in] gb the GetBit context * @param[in,out] ctx ptr to the channel unit context * @param[in] num_channels number of channels to process - * @param[in] avctx ptr to the AVCodecContext * @return result code: 0 = OK, otherwise - error code */ static int decode_scale_factors(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, - int num_channels, AVCodecContext *avctx) + int num_channels) { int ch_num, ret; @@ -661,7 +649,7 @@ static int decode_scale_factors(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, memset(ctx->channels[ch_num].qu_sf_idx, 0, sizeof(ctx->channels[ch_num].qu_sf_idx)); - if ((ret = decode_channel_sf_idx(gb, ctx, ch_num, avctx)) < 0) + if ((ret = decode_channel_sf_idx(gb, ctx, ch_num)) < 0) return ret; } @@ -673,11 +661,9 @@ static int decode_scale_factors(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, * * @param[in] gb the GetBit context * @param[in,out] ctx ptr to the channel unit context - * @param[in] avctx ptr to the AVCodecContext * @return result code: 0 = OK, otherwise - error code */ -static int get_num_ct_values(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, - AVCodecContext *avctx) +static int get_num_ct_values(GetBitContext *gb, Atrac3pChanUnitCtx *ctx) { int num_coded_vals; @@ -694,7 +680,7 @@ static int get_num_ct_values(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, } #define DEC_CT_IDX_COMMON(OP) \ - num_vals = get_num_ct_values(gb, ctx, avctx); \ + num_vals = get_num_ct_values(gb, ctx); \ if (num_vals < 0) \ return num_vals; \ \ @@ -726,11 +712,10 @@ static int get_num_ct_values(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, * @param[in] gb the GetBit context * @param[in,out] ctx ptr to the channel unit context * @param[in] ch_num channel to process - * @param[in] avctx ptr to the AVCodecContext * @return result code: 0 = OK, otherwise - error code */ static int decode_channel_code_tab(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, - int ch_num, AVCodecContext *avctx) + int ch_num) { int i, num_vals, num_bits, pred; int mask = ctx->use_full_table ? 7 : 3; /* mask for modular arithmetic */ @@ -779,11 +764,10 @@ static int decode_channel_code_tab(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, * @param[in] gb the GetBit context * @param[in,out] ctx ptr to the channel unit context * @param[in] num_channels number of channels to process - * @param[in] avctx ptr to the AVCodecContext * @return result code: 0 = OK, otherwise - error code */ static int decode_code_table_indexes(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, - int num_channels, AVCodecContext *avctx) + int num_channels) { int ch_num, ret; @@ -796,7 +780,7 @@ static int decode_code_table_indexes(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, memset(ctx->channels[ch_num].qu_tab_idx, 0, sizeof(ctx->channels[ch_num].qu_tab_idx)); - if ((ret = decode_channel_code_tab(gb, ctx, ch_num, avctx)) < 0) + if ((ret = decode_channel_code_tab(gb, ctx, ch_num)) < 0) return ret; } @@ -852,10 +836,9 @@ static void decode_qu_spectra(GetBitContext *gb, const Atrac3pSpecCodeTab *tab, * @param[in] gb the GetBit context * @param[in,out] ctx ptr to the channel unit context * @param[in] num_channels number of channels to process - * @param[in] avctx ptr to the AVCodecContext */ static void decode_spectrum(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, - int num_channels, AVCodecContext *avctx) + int num_channels) { int i, ch_num, qu, wordlen, codetab, tab_index, num_specs; const Atrac3pSpecCodeTab *tab; @@ -1208,12 +1191,10 @@ static inline void gainc_loc_mode1(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, * @param[in,out] ctx ptr to the channel unit context * @param[in] ch_num channel to process * @param[in] coded_subbands number of subbands to process - * @param[in] avctx ptr to the AVCodecContext * @return result code: 0 = OK, otherwise - error code */ static int decode_gainc_loc_codes(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, - int ch_num, int coded_subbands, - AVCodecContext *avctx) + int ch_num, int coded_subbands) { int sb, i, delta, delta_bits, min_val, pred, more_than_ref; AtracGainInfo *dst, *ref; @@ -1362,11 +1343,10 @@ static int decode_gainc_loc_codes(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, * @param[in] gb the GetBit context * @param[in,out] ctx ptr to the channel unit context * @param[in] num_channels number of channels to process - * @param[in] avctx ptr to the AVCodecContext * @return result code: 0 = OK, otherwise - error code */ static int decode_gainc_data(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, - int num_channels, AVCodecContext *avctx) + int num_channels) { int ch_num, coded_subbands, sb, ret; @@ -1383,7 +1363,7 @@ static int decode_gainc_data(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, if ((ret = decode_gainc_npoints(gb, ctx, ch_num, coded_subbands)) < 0 || (ret = decode_gainc_levels(gb, ctx, ch_num, coded_subbands)) < 0 || - (ret = decode_gainc_loc_codes(gb, ctx, ch_num, coded_subbands, avctx)) < 0) + (ret = decode_gainc_loc_codes(gb, ctx, ch_num, coded_subbands)) < 0) return ret; if (coded_subbands > 0) { /* propagate gain data if requested */ @@ -1446,12 +1426,10 @@ static void decode_tones_envelope(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, * @param[in] ch_num channel to process * @param[in] band_has_tones ptr to an array of per-band-flags: * 1 - tone data present - * @param[in] avctx ptr to the AVCodecContext * @return result code: 0 = OK, otherwise - error code */ static int decode_band_numwavs(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, - int ch_num, int band_has_tones[], - AVCodecContext *avctx) + int ch_num, int band_has_tones[]) { int mode, sb, delta; Atrac3pWavesData *dst = ctx->channels[ch_num].tones_info; @@ -1694,11 +1672,10 @@ static void decode_tones_phase(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, * @param[in] gb the GetBit context * @param[in,out] ctx ptr to the channel unit context * @param[in] num_channels number of channels to process - * @param[in] avctx ptr to the AVCodecContext * @return result code: 0 = OK, otherwise - error code */ static int decode_tones_info(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, - int num_channels, AVCodecContext *avctx) + int num_channels) { int ch_num, i, ret; int band_has_tones[16]; @@ -1736,8 +1713,7 @@ static int decode_tones_info(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, band_has_tones[i] = !ch_num ? 1 : !ctx->waves_info->tone_sharing[i]; decode_tones_envelope(gb, ctx, ch_num, band_has_tones); - if ((ret = decode_band_numwavs(gb, ctx, ch_num, band_has_tones, - avctx)) < 0) + if ((ret = decode_band_numwavs(gb, ctx, ch_num, band_has_tones)) < 0) return ret; decode_tones_frequency(gb, ctx, ch_num, band_has_tones); @@ -1760,7 +1736,7 @@ static int decode_tones_info(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, } int ff_atrac3p_decode_channel_unit(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, - int num_channels, AVCodecContext *avctx) + int num_channels) { int ret; @@ -1776,7 +1752,7 @@ int ff_atrac3p_decode_channel_unit(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, ctx->mute_flag = get_bits1(gb); /* decode various sound parameters */ - if ((ret = decode_quant_wordlen(gb, ctx, num_channels, avctx)) < 0) + if ((ret = decode_quant_wordlen(gb, ctx, num_channels)) < 0) return ret; ctx->num_subbands = atrac3p_qu_to_subband[ctx->num_quant_units - 1] + 1; @@ -1784,13 +1760,13 @@ int ff_atrac3p_decode_channel_unit(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, ? atrac3p_qu_to_subband[ctx->used_quant_units - 1] + 1 : 0; - if ((ret = decode_scale_factors(gb, ctx, num_channels, avctx)) < 0) + if ((ret = decode_scale_factors(gb, ctx, num_channels)) < 0) return ret; - if ((ret = decode_code_table_indexes(gb, ctx, num_channels, avctx)) < 0) + if ((ret = decode_code_table_indexes(gb, ctx, num_channels)) < 0) return ret; - decode_spectrum(gb, ctx, num_channels, avctx); + decode_spectrum(gb, ctx, num_channels); if (num_channels == 2) { get_subband_flags(gb, ctx->swap_channels, ctx->num_coded_subbands); @@ -1799,10 +1775,10 @@ int ff_atrac3p_decode_channel_unit(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, decode_window_shape(gb, ctx, num_channels); - if ((ret = decode_gainc_data(gb, ctx, num_channels, avctx)) < 0) + if ((ret = decode_gainc_data(gb, ctx, num_channels)) < 0) return ret; - if ((ret = decode_tones_info(gb, ctx, num_channels, avctx)) < 0) + if ((ret = decode_tones_info(gb, ctx, num_channels)) < 0) return ret; /* decode global noise info */ diff --git a/ext/at3_standalone/atrac3plus.h b/ext/at3_standalone/atrac3plus.h index d661bf8551..b0710828f2 100644 --- a/ext/at3_standalone/atrac3plus.h +++ b/ext/at3_standalone/atrac3plus.h @@ -32,7 +32,6 @@ #include "float_dsp.h" #include "atrac.h" -#include "avcodec.h" #include "fft.h" #include "get_bits.h" @@ -164,11 +163,10 @@ void ff_atrac3p_init_vlcs(void); * @param[in] gb the GetBit context * @param[in,out] ctx ptr to the channel unit context * @param[in] num_channels number of channels to process - * @param[in] avctx ptr to the AVCodecContext * @return result code: 0 = OK, otherwise - error code */ int ff_atrac3p_decode_channel_unit(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, - int num_channels, AVCodecContext *avctx); + int num_channels); /** * Initialize IMDCT transform. diff --git a/ext/at3_standalone/atrac3plusdec.cpp b/ext/at3_standalone/atrac3plusdec.cpp index 538275d17f..8e908fd4e3 100644 --- a/ext/at3_standalone/atrac3plusdec.cpp +++ b/ext/at3_standalone/atrac3plusdec.cpp @@ -74,9 +74,9 @@ int atrac3p_decode_close(AVCodecContext *avctx) return 0; } -static int set_channel_params(ATRAC3PContext *ctx, AVCodecContext *avctx) { +static int set_channel_params(ATRAC3PContext *ctx, int channels) { memset(ctx->channel_blocks, 0, sizeof(ctx->channel_blocks)); - switch (avctx->channels) { + switch (channels) { case 1: ctx->num_channel_blocks = 1; ctx->channel_blocks[0] = CH_UNIT_MONO; @@ -121,7 +121,7 @@ static int set_channel_params(ATRAC3PContext *ctx, AVCodecContext *avctx) { break; default: av_log(AV_LOG_ERROR, - "Unsupported channel count: %d!\n", avctx->channels); + "Unsupported channel count: %d!\n", channels); return AVERROR_INVALIDDATA; } @@ -149,7 +149,7 @@ int atrac3p_decode_init(AVCodecContext *avctx) ff_atrac3p_init_wave_synth(); - if ((ret = set_channel_params(ctx, avctx)) < 0) + if ((ret = set_channel_params(ctx, avctx->channels)) < 0) return ret; ctx->ch_units = (Atrac3pChanUnitCtx *)av_mallocz_array(ctx->num_channel_blocks, sizeof(*ctx->ch_units)); @@ -179,8 +179,7 @@ int atrac3p_decode_init(AVCodecContext *avctx) static void decode_residual_spectrum(Atrac3pChanUnitCtx *ctx, float out[2][ATRAC3P_FRAME_SAMPLES], - int num_channels, - AVCodecContext *avctx) + int num_channels) { int i, sb, ch, qu, nspeclines, RNG_index; float *dst, q; @@ -242,7 +241,7 @@ static void decode_residual_spectrum(Atrac3pChanUnitCtx *ctx, } static void reconstruct_frame(ATRAC3PContext *ctx, Atrac3pChanUnitCtx *ch_unit, - int num_channels, AVCodecContext *avctx) + int num_channels) { int ch, sb; @@ -324,7 +323,7 @@ int atrac3p_decode_frame(AVCodecContext *avctx, float *out_data[2], int *nb_samp while (get_bits_left(&ctx->gb) >= 2 && (ch_unit_id = get_bits(&ctx->gb, 2)) != CH_UNIT_TERMINATOR) { if (ch_unit_id == CH_UNIT_EXTENSION) { - avpriv_report_missing_feature(avctx, "Channel unit extension"); + avpriv_report_missing_feature("Channel unit extension"); return AVERROR_PATCHWELCOME; } if (ch_block >= ctx->num_channel_blocks || @@ -339,14 +338,13 @@ int atrac3p_decode_frame(AVCodecContext *avctx, float *out_data[2], int *nb_samp if ((ret = ff_atrac3p_decode_channel_unit(&ctx->gb, &ctx->ch_units[ch_block], - channels_to_process, - avctx)) < 0) + channels_to_process)) < 0) return ret; decode_residual_spectrum(&ctx->ch_units[ch_block], ctx->samples, - channels_to_process, avctx); + channels_to_process); reconstruct_frame(ctx, &ctx->ch_units[ch_block], - channels_to_process, avctx); + channels_to_process); for (i = 0; i < channels_to_process; i++) memcpy(samples_p[out_ch_index + i], ctx->outp_buf[i], From 33ba30694a657d1c6923cccc83e572c115af342d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Thu, 11 Apr 2024 12:48:29 +0200 Subject: [PATCH 089/719] Revert "Disable FFMPEG temporarily to avoid symbol clashes" This reverts commit 14222f5977e8aa0c167e8879450d84d77df3b1a2. --- Core/Core.vcxproj | 18 +++++++++--------- Windows/PPSSPP.vcxproj | 8 ++++---- headless/Headless.vcxproj | 2 +- unittest/UnitTests.vcxproj | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Core/Core.vcxproj b/Core/Core.vcxproj index 0888f9cba1..e88cd217ae 100644 --- a/Core/Core.vcxproj +++ b/Core/Core.vcxproj @@ -139,7 +139,7 @@ Level3 ..\ffmpeg\WindowsInclude;..\ext\libchdr\include;..\ffmpeg\Windows\x86\include;../common;..;../ext/glew;../ext/snappy;../ext/libpng17;../ext/zlib;../ext;../ext/zstd/lib - RC_CLIENT_SUPPORTS_RAINTEGRATION;_CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;WITH_UPNP;WIN32;_ARCH_32=1;_M_IX86=1;_DEBUG;_LIB;_UNICODE;UNICODE;MINIUPNP_STATICLIB;ARMIPS_USE_STD_FILESYSTEM;%(PreprocessorDefinitions) + RC_CLIENT_SUPPORTS_RAINTEGRATION;_CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;USE_FFMPEG;WITH_UPNP;WIN32;_ARCH_32=1;_M_IX86=1;_DEBUG;_LIB;_UNICODE;UNICODE;MINIUPNP_STATICLIB;ARMIPS_USE_STD_FILESYSTEM;%(PreprocessorDefinitions) StreamingSIMDExtensions2 Precise true @@ -166,7 +166,7 @@ Level3 ..\ffmpeg\WindowsInclude;..\ext\libchdr\include;..\ffmpeg\Windows\x86_64\include;../common;..;../ext/glew;../ext/snappy;../ext/libpng17;../ext/zlib;../ext;../ext/zstd/lib;../ext/zstd/lib - RC_CLIENT_SUPPORTS_RAINTEGRATION;_CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;WITH_UPNP;WIN32;_ARCH_64=1;_M_X64=1;_DEBUG;_LIB;_UNICODE;UNICODE;MINIUPNP_STATICLIB;ARMIPS_USE_STD_FILESYSTEM;%(PreprocessorDefinitions) + RC_CLIENT_SUPPORTS_RAINTEGRATION;_CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;USE_FFMPEG;WITH_UPNP;WIN32;_ARCH_64=1;_M_X64=1;_DEBUG;_LIB;_UNICODE;UNICODE;MINIUPNP_STATICLIB;ARMIPS_USE_STD_FILESYSTEM;%(PreprocessorDefinitions) NotSet Precise false @@ -194,7 +194,7 @@ Level3 ..\ffmpeg\WindowsInclude;..\ext\libchdr\include;..\ffmpeg\Windows\aarch64\include;../common;..;../ext/glew;../ext/snappy;../ext/libpng17;../ext/zlib;../ext;../ext/zstd/lib - _CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;WITH_UPNP;WIN32;_ARCH_64=1;_DEBUG;_LIB;_UNICODE;UNICODE;ARMIPS_USE_STD_FILESYSTEM;%(PreprocessorDefinitions) + _CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;USE_FFMPEG;WITH_UPNP;WIN32;_ARCH_64=1;_DEBUG;_LIB;_UNICODE;UNICODE;ARMIPS_USE_STD_FILESYSTEM;%(PreprocessorDefinitions) NotSet Precise false @@ -222,7 +222,7 @@ Level3 ..\ffmpeg\WindowsInclude;..\ext\libchdr\include;..\ffmpeg\Windows\arm\include;../common;..;../ext/glew;../ext/snappy;../ext/libpng17;../ext/zlib;../ext;../ext/zstd/lib - _CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;WITH_UPNP;WIN32;_ARCH_32=1;_DEBUG;_LIB;_UNICODE;UNICODE;ARMIPS_USE_STD_FILESYSTEM;%(PreprocessorDefinitions) + _CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;USE_FFMPEG;WITH_UPNP;WIN32;_ARCH_32=1;_DEBUG;_LIB;_UNICODE;UNICODE;ARMIPS_USE_STD_FILESYSTEM;%(PreprocessorDefinitions) NotSet Precise false @@ -257,7 +257,7 @@ false StreamingSIMDExtensions2 Precise - RC_CLIENT_SUPPORTS_RAINTEGRATION;USING_WIN_UI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;WITH_UPNP;WIN32;_ARCH_32=1;_M_IX86=1;_LIB;NDEBUG;_UNICODE;UNICODE;MINIUPNP_STATICLIB;ARMIPS_USE_STD_FILESYSTEM;%(PreprocessorDefinitions) + RC_CLIENT_SUPPORTS_RAINTEGRATION;USING_WIN_UI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;USE_FFMPEG;WITH_UPNP;WIN32;_ARCH_32=1;_M_IX86=1;_LIB;NDEBUG;_UNICODE;UNICODE;MINIUPNP_STATICLIB;ARMIPS_USE_STD_FILESYSTEM;%(PreprocessorDefinitions) Speed MultiThreaded true @@ -294,7 +294,7 @@ Speed false true - RC_CLIENT_SUPPORTS_RAINTEGRATION;USING_WIN_UI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;WITH_UPNP;WIN32;_ARCH_64=1;_M_X64=1;_LIB;NDEBUG;_UNICODE;UNICODE;MINIUPNP_STATICLIB;ARMIPS_USE_STD_FILESYSTEM;%(PreprocessorDefinitions) + RC_CLIENT_SUPPORTS_RAINTEGRATION;USING_WIN_UI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;USE_FFMPEG;WITH_UPNP;WIN32;_ARCH_64=1;_M_X64=1;_LIB;NDEBUG;_UNICODE;UNICODE;MINIUPNP_STATICLIB;ARMIPS_USE_STD_FILESYSTEM;%(PreprocessorDefinitions) false MultiThreaded true @@ -329,7 +329,7 @@ Speed false true - USING_WIN_UI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;WITH_UPNP;WIN32;_ARCH_64=1;_LIB;NDEBUG;_UNICODE;UNICODE;ARMIPS_USE_STD_FILESYSTEM;%(PreprocessorDefinitions) + USING_WIN_UI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;USE_FFMPEG;WITH_UPNP;WIN32;_ARCH_64=1;_LIB;NDEBUG;_UNICODE;UNICODE;ARMIPS_USE_STD_FILESYSTEM;%(PreprocessorDefinitions) false MultiThreaded true @@ -364,7 +364,7 @@ Speed false true - USING_WIN_UI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;WITH_UPNP;WIN32;_ARCH_32=1;_LIB;NDEBUG;_UNICODE;UNICODE;ARMIPS_USE_STD_FILESYSTEM;%(PreprocessorDefinitions) + USING_WIN_UI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;USE_FFMPEG;WITH_UPNP;WIN32;_ARCH_32=1;_LIB;NDEBUG;_UNICODE;UNICODE;ARMIPS_USE_STD_FILESYSTEM;%(PreprocessorDefinitions) false MultiThreaded true @@ -1495,4 +1495,4 @@ - + \ No newline at end of file diff --git a/Windows/PPSSPP.vcxproj b/Windows/PPSSPP.vcxproj index 0ab91e049c..c9835d7268 100644 --- a/Windows/PPSSPP.vcxproj +++ b/Windows/PPSSPP.vcxproj @@ -249,7 +249,7 @@ stdcpp17 - winhttp.lib;uxtheme.lib;mf.lib;mfplat.lib;mfreadwrite.lib;mfuuid.lib;shlwapi.lib;Winmm.lib;Ws2_32.lib;dsound.lib;comctl32.lib;d3d9.lib;dxguid.lib;swresample.lib;swscale.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) + winhttp.lib;uxtheme.lib;mf.lib;mfplat.lib;mfreadwrite.lib;mfuuid.lib;shlwapi.lib;Winmm.lib;Ws2_32.lib;dsound.lib;comctl32.lib;d3d9.lib;dxguid.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) ../ffmpeg/Windows/x86/lib true Windows @@ -289,7 +289,7 @@ stdcpp17 - winhttp.lib;uxtheme.lib;mf.lib;mfplat.lib;mfreadwrite.lib;mfuuid.lib;shlwapi.lib;Winmm.lib;Ws2_32.lib;dsound.lib;comctl32.lib;d3d9.lib;dxguid.lib;swresample.lib;swscale.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) + winhttp.lib;uxtheme.lib;mf.lib;mfplat.lib;mfreadwrite.lib;mfuuid.lib;shlwapi.lib;Winmm.lib;Ws2_32.lib;dsound.lib;comctl32.lib;d3d9.lib;dxguid.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) ../ffmpeg/Windows/x86_64/lib true $(OutDir)$(ProjectName).pdb @@ -325,7 +325,7 @@ stdcpp17 - winhttp.lib;uxtheme.lib;mf.lib;mfplat.lib;mfreadwrite.lib;mfuuid.lib;shlwapi.lib;Winmm.lib;Ws2_32.lib;dsound.lib;comctl32.lib;d3d9.lib;dxguid.lib;swresample.lib;swscale.lib;oleaut32.lib;comdlg32.lib;shell32.lib;user32.lib;gdi32.lib;advapi32.lib;ole32.lib;%(AdditionalDependencies) + winhttp.lib;uxtheme.lib;mf.lib;mfplat.lib;mfreadwrite.lib;mfuuid.lib;shlwapi.lib;Winmm.lib;Ws2_32.lib;dsound.lib;comctl32.lib;d3d9.lib;dxguid.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;oleaut32.lib;comdlg32.lib;shell32.lib;user32.lib;gdi32.lib;advapi32.lib;ole32.lib;%(AdditionalDependencies) ../ffmpeg/Windows/aarch64/lib true $(OutDir)$(ProjectName).pdb @@ -359,7 +359,7 @@ stdcpp17 - winhttp.lib;uxtheme.lib;mf.lib;mfplat.lib;mfreadwrite.lib;mfuuid.lib;shlwapi.lib;Winmm.lib;Ws2_32.lib;dsound.lib;comctl32.lib;d3d9.lib;dxguid.lib;swresample.lib;swscale.lib;oleaut32.lib;comdlg32.lib;shell32.lib;user32.lib;gdi32.lib;advapi32.lib;ole32.lib;%(AdditionalDependencies) + winhttp.lib;uxtheme.lib;mf.lib;mfplat.lib;mfreadwrite.lib;mfuuid.lib;shlwapi.lib;Winmm.lib;Ws2_32.lib;dsound.lib;comctl32.lib;d3d9.lib;dxguid.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;oleaut32.lib;comdlg32.lib;shell32.lib;user32.lib;gdi32.lib;advapi32.lib;ole32.lib;%(AdditionalDependencies) ../ffmpeg/Windows/arm/lib true $(OutDir)$(ProjectName).pdb diff --git a/headless/Headless.vcxproj b/headless/Headless.vcxproj index cd5b985ce9..b500d26de4 100644 --- a/headless/Headless.vcxproj +++ b/headless/Headless.vcxproj @@ -225,7 +225,7 @@ Console true - winhttp.lib;mf.lib;mfplat.lib;mfreadwrite.lib;mfuuid.lib;shlwapi.lib;Winmm.lib;Ws2_32.lib;dsound.lib;swresample.lib;swscale.lib;comctl32.lib;d3d9.lib;d3dx9d.lib;dxguid.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) + winhttp.lib;mf.lib;mfplat.lib;mfreadwrite.lib;mfuuid.lib;shlwapi.lib;Winmm.lib;Ws2_32.lib;dsound.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;comctl32.lib;d3d9.lib;d3dx9d.lib;dxguid.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) 0x00400000 false true diff --git a/unittest/UnitTests.vcxproj b/unittest/UnitTests.vcxproj index 95b0b214d4..76ce396780 100644 --- a/unittest/UnitTests.vcxproj +++ b/unittest/UnitTests.vcxproj @@ -205,7 +205,7 @@ Console true - winhttp.lib;mf.lib;mfplat.lib;mfreadwrite.lib;mfuuid.lib;shlwapi.lib;Ws2_32.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;dsound.lib;swresample.lib;swscale.lib;comctl32.lib;d3d9.lib;dxguid.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) + winhttp.lib;mf.lib;mfplat.lib;mfreadwrite.lib;mfuuid.lib;shlwapi.lib;Ws2_32.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;dsound.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;comctl32.lib;d3d9.lib;dxguid.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) /ignore:4049 /ignore:4217 %(AdditionalOptions) ../ffmpeg/Windows/x86_64/lib From bf280eb410c3672562fd30d20fa10ceea17e0906 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Thu, 11 Apr 2024 13:02:36 +0200 Subject: [PATCH 090/719] Remove "SetExtraData" from AudioDecoder, pass in the data at creation instead --- Core/HW/Atrac3Standalone.cpp | 40 +++++++++++++++++++++--------------- Core/HW/Atrac3Standalone.h | 3 ++- Core/HW/SimpleAudioDec.cpp | 22 +++----------------- Core/HW/SimpleAudioDec.h | 3 +-- UI/BackgroundAudio.cpp | 11 ++++++++-- 5 files changed, 38 insertions(+), 41 deletions(-) diff --git a/Core/HW/Atrac3Standalone.cpp b/Core/HW/Atrac3Standalone.cpp index a195e02a49..dc73b46cc0 100644 --- a/Core/HW/Atrac3Standalone.cpp +++ b/Core/HW/Atrac3Standalone.cpp @@ -16,12 +16,25 @@ inline int16_t clamp16(float f) { // Test case for ATRAC3: Mega Man Maverick Hunter X, PSP menu sound class Atrac3Audio : public AudioDecoder { public: - Atrac3Audio(PSPAudioType audioType) : audioType_(audioType) { + Atrac3Audio(PSPAudioType audioType, int channels, size_t blockAlign, const uint8_t *extraData, size_t extraDataSize) : audioType_(audioType) { if (audioType == PSP_CODEC_AT3PLUS) { ctx_ = avcodec_alloc_context3(&ff_atrac3p_decoder); } else { ctx_ = avcodec_alloc_context3(&ff_atrac3_decoder); } + if (audioType_ == PSP_CODEC_AT3) { + _dbg_assert_(ctx_); + _dbg_assert_(!codecOpen_); + ctx_->extradata = (uint8_t *)av_mallocz(extraDataSize); + ctx_->extradata_size = (int)extraDataSize; + ctx_->block_align = (int)blockAlign; + codecOpen_ = false; + if (extraData != nullptr) { + memcpy(ctx_->extradata, extraData, extraDataSize); + } + } else { + ctx_->block_align = (int)blockAlign; + } for (int i = 0; i < 2; i++) { buffers_[i] = new float[4096]; } @@ -52,6 +65,10 @@ public: codecOpen_ = true; } + if (inbytes != ctx_->block_align) { + WARN_LOG(ME, "Atrac3Audio::Decode: Unexpected block align %d (expected %d)", inbytes, ctx_->block_align); + } + // We just call the decode function directly without going through the whole packet machinery. int got_frame = 0; int result; @@ -96,20 +113,6 @@ public: // Hmm. ignore for now. } - void SetExtraData(const uint8_t *data, int size, int wav_bytes_per_packet) override { - // if (audioType_ == PSP_CODEC_AT3PLUS) { - _dbg_assert_(ctx_); - _dbg_assert_(!codecOpen_); - ctx_->extradata = (uint8_t *)av_mallocz(size); - ctx_->extradata_size = size; - ctx_->block_align = wav_bytes_per_packet; - codecOpen_ = false; - if (data != nullptr) { - memcpy(ctx_->extradata, data, size); - } - //} - } - PSPAudioType GetAudioType() const override { return audioType_; } private: @@ -124,6 +127,9 @@ private: PSPAudioType audioType_; }; -AudioDecoder *CreateAtrac3Audio(PSPAudioType audioType) { - return new Atrac3Audio(audioType); +AudioDecoder *CreateAtrac3Audio(int channels, size_t blockAlign, const uint8_t *extraData, size_t extraDataSize) { + return new Atrac3Audio(PSP_CODEC_AT3, channels, blockAlign, extraData, extraDataSize); +} +AudioDecoder *CreateAtrac3PlusAudio(int channels, size_t blockAlign) { + return new Atrac3Audio(PSP_CODEC_AT3PLUS, channels, blockAlign, nullptr, 0); } diff --git a/Core/HW/Atrac3Standalone.h b/Core/HW/Atrac3Standalone.h index 713b1a21a2..a86fae1729 100644 --- a/Core/HW/Atrac3Standalone.h +++ b/Core/HW/Atrac3Standalone.h @@ -2,4 +2,5 @@ #include "SimpleAudioDec.h" -AudioDecoder *CreateAtrac3Audio(PSPAudioType audioType); +AudioDecoder *CreateAtrac3Audio(int channels, size_t blockAlign, const uint8_t *extraData, size_t extraDataSize); +AudioDecoder *CreateAtrac3PlusAudio(int channels, size_t blockAlign); diff --git a/Core/HW/SimpleAudioDec.cpp b/Core/HW/SimpleAudioDec.cpp index 0f72ae0469..83b79ec975 100644 --- a/Core/HW/SimpleAudioDec.cpp +++ b/Core/HW/SimpleAudioDec.cpp @@ -117,8 +117,6 @@ public: return srcPos; } - // Not save stated, only used by UI. Used for ATRAC3 (non+) files. - void SetExtraData(const uint8_t *data, int size, int wav_bytes_per_packet) override; void SetChannels(int channels) override; // These two are only here because of save states. @@ -144,13 +142,14 @@ private: bool codecOpen_; }; -AudioDecoder *CreateAudioDecoder(PSPAudioType audioType, int sampleRateHz, int channels) { +AudioDecoder *CreateAudioDecoder(PSPAudioType audioType, int sampleRateHz, int channels, size_t blockAlign, const uint8_t *extraData, size_t extraDataSize) { switch (audioType) { case PSP_CODEC_MP3: return new MiniMp3Audio(); case PSP_CODEC_AT3: + return CreateAtrac3Audio(channels, blockAlign, extraData, extraDataSize); case PSP_CODEC_AT3PLUS: - return CreateAtrac3Audio(audioType); + return CreateAtrac3PlusAudio(channels, blockAlign); default: // Only AAC falls back to FFMPEG now. return new SimpleAudio(audioType, sampleRateHz, channels); @@ -240,21 +239,6 @@ bool SimpleAudio::OpenCodec(int block_align) { #endif // USE_FFMPEG } -void SimpleAudio::SetExtraData(const uint8_t *data, int size, int wav_bytes_per_packet) { -#ifdef USE_FFMPEG - if (codecCtx_) { - codecCtx_->extradata = (uint8_t *)av_mallocz(size); - codecCtx_->extradata_size = size; - codecCtx_->block_align = wav_bytes_per_packet; - codecOpen_ = false; - - if (data != nullptr) { - memcpy(codecCtx_->extradata, data, size); - } - } -#endif -} - void SimpleAudio::SetChannels(int channels) { if (channels_ == channels) { // Do nothing, already set. diff --git a/Core/HW/SimpleAudioDec.h b/Core/HW/SimpleAudioDec.h index e4c2cf0116..8ee4e45aa1 100644 --- a/Core/HW/SimpleAudioDec.h +++ b/Core/HW/SimpleAudioDec.h @@ -47,7 +47,6 @@ public: virtual int GetSourcePos() const = 0; virtual void SetChannels(int channels) = 0; - virtual void SetExtraData(const uint8_t *data, int size, int wav_bytes_per_packet) {} // Just metadata. void SetCtxPtr(uint32_t ptr) { ctxPtr = ptr; } @@ -60,7 +59,7 @@ private: void AudioClose(AudioDecoder **ctx); const char *GetCodecName(int codec); // audioType bool IsValidCodec(PSPAudioType codec); -AudioDecoder *CreateAudioDecoder(PSPAudioType audioType, int sampleRateHz = 44100, int channels = 2); +AudioDecoder *CreateAudioDecoder(PSPAudioType audioType, int sampleRateHz = 44100, int channels = 2, size_t blockAlign = 0, const uint8_t *extraData = nullptr, size_t extraDataSize = 0); class AuCtx { public: diff --git a/UI/BackgroundAudio.cpp b/UI/BackgroundAudio.cpp index 471d245476..fc528274fa 100644 --- a/UI/BackgroundAudio.cpp +++ b/UI/BackgroundAudio.cpp @@ -189,10 +189,17 @@ public: wave_.Read(file_); - decoder_ = CreateAudioDecoder((PSPAudioType)wave_.codec, wave_.sample_rate, wave_.num_channels); + uint8_t *extraData = nullptr; + size_t extraDataSize = 0; + size_t blockSize = 0; if (wave_.codec == PSP_CODEC_AT3) { - decoder_->SetExtraData(&wave_.at3_extradata[2], 14, wave_.raw_bytes_per_frame); + extraData = &wave_.at3_extradata[2]; + extraDataSize = 14; + blockSize = wave_.raw_bytes_per_frame; + } else if (wave_.codec == PSP_CODEC_AT3PLUS) { + blockSize = wave_.raw_bytes_per_frame; } + decoder_ = CreateAudioDecoder((PSPAudioType)wave_.codec, wave_.sample_rate, wave_.num_channels, blockSize, extraData, extraDataSize); INFO_LOG(AUDIO, "read ATRAC, frames: %d, rate %d", wave_.numFrames, wave_.sample_rate); } From 6ea8efc0e94f521b6da37c8b81192e9e8456c875 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Thu, 11 Apr 2024 13:11:55 +0200 Subject: [PATCH 091/719] Bypass AvCodecContext for atrac3plus, for a simpler API. --- Core/HW/Atrac3Standalone.cpp | 32 ++++++++++-------- ext/at3_standalone/at3_decoders.h | 9 +++-- ext/at3_standalone/atrac3plus.cpp | 3 +- ext/at3_standalone/atrac3plusdec.cpp | 50 +++++++++++----------------- 4 files changed, 47 insertions(+), 47 deletions(-) diff --git a/Core/HW/Atrac3Standalone.cpp b/Core/HW/Atrac3Standalone.cpp index dc73b46cc0..6a7c742c58 100644 --- a/Core/HW/Atrac3Standalone.cpp +++ b/Core/HW/Atrac3Standalone.cpp @@ -18,7 +18,8 @@ class Atrac3Audio : public AudioDecoder { public: Atrac3Audio(PSPAudioType audioType, int channels, size_t blockAlign, const uint8_t *extraData, size_t extraDataSize) : audioType_(audioType) { if (audioType == PSP_CODEC_AT3PLUS) { - ctx_ = avcodec_alloc_context3(&ff_atrac3p_decoder); + at3pCtx_ = atrac3p_alloc(blockAlign, channels); + codecOpen_ = true; } else { ctx_ = avcodec_alloc_context3(&ff_atrac3_decoder); } @@ -32,17 +33,20 @@ public: if (extraData != nullptr) { memcpy(ctx_->extradata, extraData, extraDataSize); } - } else { - ctx_->block_align = (int)blockAlign; } for (int i = 0; i < 2; i++) { buffers_[i] = new float[4096]; } } ~Atrac3Audio() { - avcodec_close(ctx_); - av_freep(&ctx_->extradata); - av_freep(&ctx_); + if (ctx_) { + avcodec_close(ctx_); + av_freep(&ctx_->extradata); + av_freep(&ctx_); + } + if (at3pCtx_) { + atrac3p_free(at3pCtx_); + } for (int i = 0; i < 2; i++) { delete[] buffers_[i]; } @@ -50,12 +54,12 @@ public: bool Decode(const uint8_t *inbuf, int inbytes, uint8_t *outbuf, int *outbytes) override { if (!codecOpen_) { - ctx_->block_align = inbytes; - ctx_->channels = 2; int retval; if (audioType_ == PSP_CODEC_AT3PLUS) { - retval = avcodec_open2(ctx_, &ff_atrac3p_decoder, nullptr); + _dbg_assert_(false); } else { + ctx_->block_align = inbytes; + ctx_->channels = 2; retval = avcodec_open2(ctx_, &ff_atrac3_decoder, nullptr); } _dbg_assert_(retval >= 0); @@ -65,17 +69,16 @@ public: codecOpen_ = true; } - if (inbytes != ctx_->block_align) { - WARN_LOG(ME, "Atrac3Audio::Decode: Unexpected block align %d (expected %d)", inbytes, ctx_->block_align); - } - // We just call the decode function directly without going through the whole packet machinery. int got_frame = 0; int result; int nb_samples = 0; if (audioType_ == PSP_CODEC_AT3PLUS) { - result = atrac3p_decode_frame(ctx_, buffers_, &nb_samples, &got_frame, inbuf, inbytes); + result = atrac3p_decode_frame(at3pCtx_, buffers_, &nb_samples, &got_frame, inbuf, inbytes); } else { + if (inbytes != ctx_->block_align) { + WARN_LOG(ME, "Atrac3Audio::Decode: Unexpected block align %d (expected %d)", inbytes, ctx_->block_align); + } result = atrac3_decode_frame(ctx_, buffers_, &nb_samples, &got_frame, inbuf, inbytes); } if (result < 0) { @@ -116,6 +119,7 @@ public: PSPAudioType GetAudioType() const override { return audioType_; } private: + ATRAC3PContext *at3pCtx_ = nullptr; AVCodecContext* ctx_ = nullptr; int outSamples_ = 0; diff --git a/ext/at3_standalone/at3_decoders.h b/ext/at3_standalone/at3_decoders.h index a9cb81edb7..69df17bb41 100644 --- a/ext/at3_standalone/at3_decoders.h +++ b/ext/at3_standalone/at3_decoders.h @@ -2,12 +2,17 @@ #include +struct ATRAC3PContext; + struct AVCodecContext; struct AVFrame; #include "avcodec.h" int atrac3_decode_frame(AVCodecContext *avctx, float *out_data[2], int *nb_samples, int *got_frame_ptr, const uint8_t *buf, int buf_size); -int atrac3p_decode_frame(AVCodecContext *avctx, float *out_data[2], int *nb_samples, int *got_frame_ptr, const uint8_t *buf, int buf_size); -extern AVCodec ff_atrac3p_decoder; + +ATRAC3PContext *atrac3p_alloc(int block_align, int channels); +void atrac3p_free(ATRAC3PContext *ctx); + +int atrac3p_decode_frame(ATRAC3PContext *ctx, float *out_data[2], int *nb_samples, int *got_frame_ptr, const uint8_t *buf, int buf_size); extern AVCodec ff_atrac3_decoder; diff --git a/ext/at3_standalone/atrac3plus.cpp b/ext/at3_standalone/atrac3plus.cpp index 851e9c4182..6c9b0adf13 100644 --- a/ext/at3_standalone/atrac3plus.cpp +++ b/ext/at3_standalone/atrac3plus.cpp @@ -219,7 +219,8 @@ void ff_atrac3p_init_vlcs(void) * @param[in,out] ctx ptr to the channel unit context * @return result code: 0 = OK, otherwise - error code */ -static int num_coded_units(GetBitContext *gb, Atrac3pChanParams *chan, Atrac3pChanUnitCtx *ctx) +static int num_coded_units(GetBitContext *gb, Atrac3pChanParams *chan, + Atrac3pChanUnitCtx *ctx) { chan->fill_mode = get_bits(gb, 2); if (!chan->fill_mode) { diff --git a/ext/at3_standalone/atrac3plusdec.cpp b/ext/at3_standalone/atrac3plusdec.cpp index 8e908fd4e3..14cfb812e5 100644 --- a/ext/at3_standalone/atrac3plusdec.cpp +++ b/ext/at3_standalone/atrac3plusdec.cpp @@ -38,10 +38,10 @@ #include #include "float_dsp.h" -#include "avcodec.h" #include "get_bits.h" #include "compat.h" #include "atrac.h" +#include "mem.h" #include "atrac3plus.h" struct ATRAC3PContext { @@ -60,18 +60,16 @@ struct ATRAC3PContext { int num_channel_blocks; ///< number of channel blocks uint8_t channel_blocks[5]; ///< channel configuration descriptor + + int block_align; }; -int atrac3p_decode_close(AVCodecContext *avctx) +void atrac3p_free(ATRAC3PContext *ctx) { - ATRAC3PContext *ctx = (ATRAC3PContext *)avctx->priv_data; - av_freep(&ctx->ch_units); - ff_mdct_end(&ctx->mdct_ctx); ff_mdct_end(&ctx->ipqf_dct_ctx); - - return 0; + av_freep(&ctx); } static int set_channel_params(ATRAC3PContext *ctx, int channels) { @@ -124,20 +122,19 @@ static int set_channel_params(ATRAC3PContext *ctx, int channels) { "Unsupported channel count: %d!\n", channels); return AVERROR_INVALIDDATA; } - return 0; } -int atrac3p_decode_init(AVCodecContext *avctx) -{ - ATRAC3PContext *ctx = (ATRAC3PContext *)avctx->priv_data; +ATRAC3PContext *atrac3p_alloc(int block_align, int channels) { int i, ch, ret; - - if (!avctx->block_align) { + if (!block_align) { av_log(AV_LOG_ERROR, "block_align is not set\n"); - return AVERROR(EINVAL); + return nullptr; } + ATRAC3PContext *ctx = (ATRAC3PContext *)av_mallocz(sizeof(ATRAC3PContext)); + ctx->block_align = block_align; + ff_atrac3p_init_vlcs(); /* initialize IPQF */ @@ -149,14 +146,16 @@ int atrac3p_decode_init(AVCodecContext *avctx) ff_atrac3p_init_wave_synth(); - if ((ret = set_channel_params(ctx, avctx->channels)) < 0) - return ret; + if ((ret = set_channel_params(ctx, channels)) < 0) { + atrac3p_free(ctx); + return nullptr; + } ctx->ch_units = (Atrac3pChanUnitCtx *)av_mallocz_array(ctx->num_channel_blocks, sizeof(*ctx->ch_units)); if (!ctx->ch_units) { - atrac3p_decode_close(avctx); - return AVERROR(ENOMEM); + atrac3p_free(ctx); + return nullptr; } for (i = 0; i < ctx->num_channel_blocks; i++) { @@ -174,7 +173,7 @@ int atrac3p_decode_init(AVCodecContext *avctx) ctx->ch_units[i].waves_info_prev = &ctx->ch_units[i].wave_synth_hist[1]; } - return 0; + return ctx; } static void decode_residual_spectrum(Atrac3pChanUnitCtx *ctx, @@ -305,9 +304,8 @@ static void reconstruct_frame(ATRAC3PContext *ctx, Atrac3pChanUnitCtx *ch_unit, FFSWAP(Atrac3pWaveSynthParams *, ch_unit->waves_info, ch_unit->waves_info_prev); } -int atrac3p_decode_frame(AVCodecContext *avctx, float *out_data[2], int *nb_samples, int *got_frame_ptr, const uint8_t *avpkt_data, int avpkt_size) +int atrac3p_decode_frame(ATRAC3PContext *ctx, float *out_data[2], int *nb_samples, int *got_frame_ptr, const uint8_t *avpkt_data, int avpkt_size) { - ATRAC3PContext *ctx = (ATRAC3PContext *)avctx->priv_data; int i, ret, ch_unit_id, ch_block = 0, out_ch_index = 0, channels_to_process; float **samples_p = out_data; @@ -356,13 +354,5 @@ int atrac3p_decode_frame(AVCodecContext *avctx, float *out_data[2], int *nb_samp *got_frame_ptr = 1; - return FFMIN(avctx->block_align, avpkt_size); + return FFMIN(ctx->block_align, avpkt_size); } - -AVCodec ff_atrac3p_decoder = { - "atrac3plus", - AV_CODEC_ID_ATRAC3P, - sizeof(ATRAC3PContext), - atrac3p_decode_init, - atrac3p_decode_close, -}; From b35b3518022d9273cd2e8aca42a3e802ebe069e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Thu, 11 Apr 2024 13:34:29 +0200 Subject: [PATCH 092/719] Finally remove the AVCodecContext --- Common/Common.vcxproj | 2 - Common/Common.vcxproj.filters | 6 - Core/HW/Atrac3Standalone.cpp | 58 +++------- ext/at3_standalone/CMakeLists.txt | 1 - ext/at3_standalone/at3_decoders.h | 16 ++- ext/at3_standalone/atrac.cpp | 1 - ext/at3_standalone/atrac3.cpp | 124 ++++++++++---------- ext/at3_standalone/atrac3plusdec.cpp | 2 +- ext/at3_standalone/atrac3plusdsp.cpp | 1 - ext/at3_standalone/avcodec.cpp | 128 --------------------- ext/at3_standalone/avcodec.h | 165 --------------------------- ext/at3_standalone/compat.h | 1 + ext/at3_standalone/get_bits.cpp | 2 +- ext/at3_standalone/sinewin.h | 2 + libretro/Makefile.common | 16 +++ 15 files changed, 105 insertions(+), 420 deletions(-) delete mode 100644 ext/at3_standalone/avcodec.cpp delete mode 100644 ext/at3_standalone/avcodec.h diff --git a/Common/Common.vcxproj b/Common/Common.vcxproj index 05b041e8ff..17e2d3ab13 100644 --- a/Common/Common.vcxproj +++ b/Common/Common.vcxproj @@ -390,7 +390,6 @@ - @@ -609,7 +608,6 @@ - diff --git a/Common/Common.vcxproj.filters b/Common/Common.vcxproj.filters index 96f1f70258..2940bc7f88 100644 --- a/Common/Common.vcxproj.filters +++ b/Common/Common.vcxproj.filters @@ -551,9 +551,6 @@ ext\at3_standalone - - ext\at3_standalone - ext\at3_standalone @@ -1044,9 +1041,6 @@ ext\at3_standalone - - ext\at3_standalone - ext\at3_standalone diff --git a/Core/HW/Atrac3Standalone.cpp b/Core/HW/Atrac3Standalone.cpp index 6a7c742c58..558d29d635 100644 --- a/Core/HW/Atrac3Standalone.cpp +++ b/Core/HW/Atrac3Standalone.cpp @@ -1,7 +1,6 @@ #include "SimpleAudioDec.h" #include "ext/at3_standalone/at3_decoders.h" -#include "ext/at3_standalone/avcodec.h" inline int16_t clamp16(float f) { if (f >= 1.0f) @@ -17,32 +16,23 @@ inline int16_t clamp16(float f) { class Atrac3Audio : public AudioDecoder { public: Atrac3Audio(PSPAudioType audioType, int channels, size_t blockAlign, const uint8_t *extraData, size_t extraDataSize) : audioType_(audioType) { + blockAlign_ = blockAlign; if (audioType == PSP_CODEC_AT3PLUS) { - at3pCtx_ = atrac3p_alloc(blockAlign, channels); - codecOpen_ = true; - } else { - ctx_ = avcodec_alloc_context3(&ff_atrac3_decoder); - } - if (audioType_ == PSP_CODEC_AT3) { - _dbg_assert_(ctx_); - _dbg_assert_(!codecOpen_); - ctx_->extradata = (uint8_t *)av_mallocz(extraDataSize); - ctx_->extradata_size = (int)extraDataSize; - ctx_->block_align = (int)blockAlign; - codecOpen_ = false; - if (extraData != nullptr) { - memcpy(ctx_->extradata, extraData, extraDataSize); - } + at3pCtx_ = atrac3p_alloc(channels, blockAlign); + if (at3pCtx_) + codecOpen_ = true; + } else if (audioType_ == PSP_CODEC_AT3) { + at3Ctx_ = atrac3_alloc(channels, blockAlign, extraData, extraDataSize); + if (at3Ctx_) + codecOpen_ = true; } for (int i = 0; i < 2; i++) { buffers_[i] = new float[4096]; } } ~Atrac3Audio() { - if (ctx_) { - avcodec_close(ctx_); - av_freep(&ctx_->extradata); - av_freep(&ctx_); + if (at3Ctx_) { + atrac3_free(at3Ctx_); } if (at3pCtx_) { atrac3p_free(at3pCtx_); @@ -54,21 +44,11 @@ public: bool Decode(const uint8_t *inbuf, int inbytes, uint8_t *outbuf, int *outbytes) override { if (!codecOpen_) { - int retval; - if (audioType_ == PSP_CODEC_AT3PLUS) { - _dbg_assert_(false); - } else { - ctx_->block_align = inbytes; - ctx_->channels = 2; - retval = avcodec_open2(ctx_, &ff_atrac3_decoder, nullptr); - } - _dbg_assert_(retval >= 0); - if (retval < 0) { - return false; - } - codecOpen_ = true; + _dbg_assert_(false); + } + if (inbytes != blockAlign_) { + WARN_LOG(ME, "Atrac3Audio::Decode: Unexpected block align %d (expected %d)", inbytes, blockAlign_); } - // We just call the decode function directly without going through the whole packet machinery. int got_frame = 0; int result; @@ -76,10 +56,8 @@ public: if (audioType_ == PSP_CODEC_AT3PLUS) { result = atrac3p_decode_frame(at3pCtx_, buffers_, &nb_samples, &got_frame, inbuf, inbytes); } else { - if (inbytes != ctx_->block_align) { - WARN_LOG(ME, "Atrac3Audio::Decode: Unexpected block align %d (expected %d)", inbytes, ctx_->block_align); - } - result = atrac3_decode_frame(ctx_, buffers_, &nb_samples, &got_frame, inbuf, inbytes); + + result = atrac3_decode_frame(at3Ctx_, buffers_, &nb_samples, &got_frame, inbuf, inbytes); } if (result < 0) { *outbytes = 0; @@ -120,7 +98,9 @@ public: private: ATRAC3PContext *at3pCtx_ = nullptr; - AVCodecContext* ctx_ = nullptr; + ATRAC3Context *at3Ctx_ = nullptr; + + int blockAlign_ = 0; int outSamples_ = 0; int srcPos_ = 0; diff --git a/ext/at3_standalone/CMakeLists.txt b/ext/at3_standalone/CMakeLists.txt index a62c4a514a..8c5ab175e2 100644 --- a/ext/at3_standalone/CMakeLists.txt +++ b/ext/at3_standalone/CMakeLists.txt @@ -11,7 +11,6 @@ set(ALL_SOURCE_FILES ${SRC_DIR}/atrac3plus.cpp ${SRC_DIR}/atrac3plusdec.cpp ${SRC_DIR}/atrac3plusdsp.cpp - ${SRC_DIR}/avcodec.cpp ${SRC_DIR}/get_bits.cpp ${SRC_DIR}/compat.cpp ${SRC_DIR}/fft.cpp diff --git a/ext/at3_standalone/at3_decoders.h b/ext/at3_standalone/at3_decoders.h index 69df17bb41..df7f0f42da 100644 --- a/ext/at3_standalone/at3_decoders.h +++ b/ext/at3_standalone/at3_decoders.h @@ -2,17 +2,15 @@ #include +// The full external API for the standalone Atrac3/3+ decoder. + +struct ATRAC3Context; struct ATRAC3PContext; -struct AVCodecContext; -struct AVFrame; +ATRAC3Context *atrac3_alloc(int channels, int block_align, const uint8_t *extra_data, int extra_data_size); +void atrac3_free(ATRAC3Context *ctx); +int atrac3_decode_frame(ATRAC3Context *ctx, float *out_data[2], int *nb_samples, int *got_frame_ptr, const uint8_t *buf, int buf_size); -#include "avcodec.h" - -int atrac3_decode_frame(AVCodecContext *avctx, float *out_data[2], int *nb_samples, int *got_frame_ptr, const uint8_t *buf, int buf_size); - -ATRAC3PContext *atrac3p_alloc(int block_align, int channels); +ATRAC3PContext *atrac3p_alloc(int channels, int block_align); void atrac3p_free(ATRAC3PContext *ctx); - int atrac3p_decode_frame(ATRAC3PContext *ctx, float *out_data[2], int *nb_samples, int *got_frame_ptr, const uint8_t *buf, int buf_size); -extern AVCodec ff_atrac3_decoder; diff --git a/ext/at3_standalone/atrac.cpp b/ext/at3_standalone/atrac.cpp index 8c6a3f0f89..53b082883c 100644 --- a/ext/at3_standalone/atrac.cpp +++ b/ext/at3_standalone/atrac.cpp @@ -30,7 +30,6 @@ #include #include -#include "avcodec.h" #include "atrac.h" float ff_atrac_sf_table[64]; diff --git a/ext/at3_standalone/atrac3.cpp b/ext/at3_standalone/atrac3.cpp index af666b52d0..51e4b74300 100644 --- a/ext/at3_standalone/atrac3.cpp +++ b/ext/at3_standalone/atrac3.cpp @@ -40,10 +40,10 @@ #include "float_dsp.h" #include "fft.h" +#include "mem.h" #include "compat.h" #include "get_bits.h" -#include "avcodec.h" #include "atrac.h" #include "atrac3data.h" @@ -108,6 +108,9 @@ typedef struct ATRAC3Context { AtracGCContext gainc_ctx; FFTContext mdct_ctx; + + int block_align; + int channels; } ATRAC3Context; static DECLARE_ALIGNED(32, float, mdct_window)[MDCT_SIZE]; @@ -184,16 +187,13 @@ static void init_imdct_window(void) } } -static int atrac3_decode_close(AVCodecContext *avctx) +void atrac3_free(ATRAC3Context *ctx) { - ATRAC3Context *q = (ATRAC3Context * )avctx->priv_data; + av_freep(&ctx->units); + av_freep(&ctx->decoded_bytes_buffer); - av_freep(&q->units); - av_freep(&q->decoded_bytes_buffer); - - ff_mdct_end(&q->mdct_ctx); - - return 0; + ff_mdct_end(&ctx->mdct_ctx); + av_freep(&ctx); } /** @@ -729,14 +729,13 @@ static int decode_frame(ATRAC3Context *q, int block_align, int channels, const u return 0; } -int atrac3_decode_frame(AVCodecContext *avctx, float *out_data[2], int *nb_samples, int *got_frame_ptr, const uint8_t *buf, int buf_size) +int atrac3_decode_frame(ATRAC3Context *ctx, float *out_data[2], int *nb_samples, int *got_frame_ptr, const uint8_t *buf, int buf_size) { - ATRAC3Context *q = (ATRAC3Context *)avctx->priv_data; int ret; const uint8_t *databuf; - const int block_align = avctx->block_align; - const int channels = avctx->channels; + const int block_align = ctx->block_align; + const int channels = ctx->channels; if (buf_size < block_align) { av_log(AV_LOG_ERROR, @@ -748,14 +747,14 @@ int atrac3_decode_frame(AVCodecContext *avctx, float *out_data[2], int *nb_sampl *nb_samples = SAMPLES_PER_FRAME; /* Check if we need to descramble and what buffer to pass on. */ - if (q->scrambled_stream) { - decode_bytes(buf, q->decoded_bytes_buffer, block_align); - databuf = q->decoded_bytes_buffer; + if (ctx->scrambled_stream) { + decode_bytes(buf, ctx->decoded_bytes_buffer, block_align); + databuf = ctx->decoded_bytes_buffer; } else { databuf = buf; } - ret = decode_frame(q, block_align, channels, databuf, out_data); + ret = decode_frame(ctx, block_align, channels, databuf, out_data); if (ret) { av_log( AV_LOG_ERROR, "Frame decoding error!\n"); return ret; @@ -786,24 +785,27 @@ static void atrac3_init_static_data(void) static int static_init_done; -static int atrac3_decode_init(AVCodecContext *avctx) -{ +ATRAC3Context *atrac3_alloc(int channels, int block_align, const uint8_t *extra_data, int extra_data_size) { int i, ret; int version, delay, samples_per_frame, frame_factor; - const uint8_t *edata_ptr = avctx->extradata; - ATRAC3Context *q = (ATRAC3Context * )avctx->priv_data; - if (avctx->channels <= 0 || avctx->channels > 2) { + const uint8_t *edata_ptr = extra_data; + + if (channels <= 0 || channels > 2) { av_log(AV_LOG_ERROR, "Channel configuration error!\n"); - return AVERROR(EINVAL); + return nullptr; } + ATRAC3Context *q = (ATRAC3Context *)av_mallocz(sizeof(ATRAC3Context)); + q->channels = channels; + q->block_align = block_align; + if (!static_init_done) atrac3_init_static_data(); static_init_done = 1; /* Take care of the codec-specific extradata. */ - if (avctx->extradata_size == 14) { + if (extra_data_size == 14) { /* Parse the extradata, WAV format */ av_log(AV_LOG_DEBUG, "[0-1] %d\n", bytestream_get_le16(&edata_ptr)); // Unknown value always 1 @@ -816,21 +818,22 @@ static int atrac3_decode_init(AVCodecContext *avctx) bytestream_get_le16(&edata_ptr)); // Unknown always 0 /* setup */ - samples_per_frame = SAMPLES_PER_FRAME * avctx->channels; + samples_per_frame = SAMPLES_PER_FRAME * channels; version = 4; delay = 0x88E; q->coding_mode = q->coding_mode ? JOINT_STEREO : STEREO; q->scrambled_stream = 0; - if (avctx->block_align != 96 * avctx->channels * frame_factor && - avctx->block_align != 152 * avctx->channels * frame_factor && - avctx->block_align != 192 * avctx->channels * frame_factor) { + if (block_align != 96 * channels * frame_factor && + block_align != 152 * channels * frame_factor && + block_align != 192 * channels * frame_factor) { av_log(AV_LOG_ERROR, "Unknown frame/channel/frame_factor " - "configuration %d/%d/%d\n", avctx->block_align, - avctx->channels, frame_factor); - return AVERROR_INVALIDDATA; + "configuration %d/%d/%d\n", block_align, + channels, frame_factor); + atrac3_free(q); + return nullptr; } - } else if (avctx->extradata_size == 12 || avctx->extradata_size == 10) { + } else if (extra_data_size == 12 || extra_data_size == 10) { /* Parse the extradata, RM format. */ version = bytestream_get_be32(&edata_ptr); samples_per_frame = bytestream_get_be16(&edata_ptr); @@ -840,56 +843,58 @@ static int atrac3_decode_init(AVCodecContext *avctx) } else { av_log(AV_LOG_ERROR, "Unknown extradata size %d.\n", - avctx->extradata_size); - return AVERROR(EINVAL); + extra_data_size); + atrac3_free(q); + return nullptr; } /* Check the extradata */ if (version != 4) { av_log(AV_LOG_ERROR, "Version %d != 4.\n", version); - return AVERROR_INVALIDDATA; + atrac3_free(q); + return nullptr; } if (samples_per_frame != SAMPLES_PER_FRAME && samples_per_frame != SAMPLES_PER_FRAME * 2) { av_log(AV_LOG_ERROR, "Unknown amount of samples per frame %d.\n", samples_per_frame); - return AVERROR_INVALIDDATA; - } + atrac3_free(q); + return nullptr; + } if (delay != 0x88E) { av_log(AV_LOG_ERROR, "Unknown amount of delay %x != 0x88E.\n", delay); - return AVERROR_INVALIDDATA; - } + atrac3_free(q); + return nullptr; + } if (q->coding_mode == STEREO) av_log(AV_LOG_DEBUG, "Normal stereo detected.\n"); else if (q->coding_mode == JOINT_STEREO) { - if (avctx->channels != 2) { + if (channels != 2) { av_log(AV_LOG_ERROR, "Invalid coding mode\n"); - return AVERROR_INVALIDDATA; - } + atrac3_free(q); + return nullptr; + } av_log(AV_LOG_DEBUG, "Joint stereo detected.\n"); } else { av_log(AV_LOG_ERROR, "Unknown channel coding mode %x!\n", q->coding_mode); - return AVERROR_INVALIDDATA; - } + atrac3_free(q); + return nullptr; + } - if (avctx->block_align >= UINT_MAX / 2) - return AVERROR(EINVAL); - - q->decoded_bytes_buffer = (uint8_t *)av_mallocz(FFALIGN(avctx->block_align, 4) + AV_INPUT_BUFFER_PADDING_SIZE); - if (!q->decoded_bytes_buffer) - return AVERROR(ENOMEM); + q->decoded_bytes_buffer = (uint8_t *)av_mallocz(FFALIGN(block_align, 4) + AV_INPUT_BUFFER_PADDING_SIZE); /* initialize the MDCT transform */ if ((ret = ff_mdct_init(&q->mdct_ctx, 9, 1, 1.0 / 32768)) < 0) { av_log(AV_LOG_ERROR, "Error initializing MDCT\n"); av_freep(&q->decoded_bytes_buffer); - return ret; + + return nullptr; } /* init the joint-stereo decoding data */ @@ -908,19 +913,6 @@ static int atrac3_decode_init(AVCodecContext *avctx) ff_atrac_init_gain_compensation(&q->gainc_ctx, 4, 3); - q->units = (ChannelUnit *)av_mallocz_array(avctx->channels, sizeof(*q->units)); - if (!q->units) { - atrac3_decode_close(avctx); - return AVERROR(ENOMEM); - } - - return 0; + q->units = (ChannelUnit *)av_mallocz_array(channels, sizeof(*q->units)); + return q; } - -AVCodec ff_atrac3_decoder = { - "atrac3", - AV_CODEC_ID_ATRAC3, - sizeof(ATRAC3Context), - &atrac3_decode_init, - &atrac3_decode_close, -}; diff --git a/ext/at3_standalone/atrac3plusdec.cpp b/ext/at3_standalone/atrac3plusdec.cpp index 14cfb812e5..db923bba90 100644 --- a/ext/at3_standalone/atrac3plusdec.cpp +++ b/ext/at3_standalone/atrac3plusdec.cpp @@ -125,7 +125,7 @@ static int set_channel_params(ATRAC3PContext *ctx, int channels) { return 0; } -ATRAC3PContext *atrac3p_alloc(int block_align, int channels) { +ATRAC3PContext *atrac3p_alloc(int channels, int block_align) { int i, ch, ret; if (!block_align) { av_log(AV_LOG_ERROR, "block_align is not set\n"); diff --git a/ext/at3_standalone/atrac3plusdsp.cpp b/ext/at3_standalone/atrac3plusdsp.cpp index 0fbcb11e11..ab0dbc299b 100644 --- a/ext/at3_standalone/atrac3plusdsp.cpp +++ b/ext/at3_standalone/atrac3plusdsp.cpp @@ -29,7 +29,6 @@ #include #include "float_dsp.h" -#include "avcodec.h" #include "sinewin.h" #include "fft.h" #include "atrac3plus.h" diff --git a/ext/at3_standalone/avcodec.cpp b/ext/at3_standalone/avcodec.cpp deleted file mode 100644 index e3a189d792..0000000000 --- a/ext/at3_standalone/avcodec.cpp +++ /dev/null @@ -1,128 +0,0 @@ -/* - * Copyright (c) 2001 Fabrice Bellard - * Copyright (c) 2002-2004 Michael Niedermayer - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/** - * @file - * Options definition for AVCodecContext. - */ - -#include "avcodec.h" -#include "compat.h" -#include "mem.h" - -#include -#include -#include -#include -#include - -AVCodecContext *avcodec_alloc_context3(const AVCodec *codec) -{ - AVCodecContext *avctx = (AVCodecContext *)av_mallocz(sizeof(AVCodecContext)); - if (!avctx) - return NULL; - int flags = 0; - memset(avctx, 0, sizeof(AVCodecContext)); - - if (codec) { - avctx->codec = codec; - } - - if (codec && codec->priv_data_size) { - if (!avctx->priv_data) { - avctx->priv_data = av_mallocz(codec->priv_data_size); - if (!avctx->priv_data) { - return NULL; - } - } - } - return avctx; -} - -void avcodec_free_context(AVCodecContext **pavctx) -{ - AVCodecContext *avctx = *pavctx; - - if (!avctx) - return; - - avcodec_close(avctx); - av_freep(&avctx->extradata); - av_freep(pavctx); -} - -int avcodec_open2(AVCodecContext *avctx, const AVCodec *codec, void *options) -{ - int ret = 0; - - if (codec->priv_data_size > 0) { - if (!avctx->priv_data) { - avctx->priv_data = av_mallocz(codec->priv_data_size); - if (!avctx->priv_data) { - ret = AVERROR(ENOMEM); - goto end; - } - } - } else { - avctx->priv_data = NULL; - } - - avctx->codec = codec; - - if (avctx->codec->init) { - ret = avctx->codec->init(avctx); - if (ret < 0) { - goto free_and_end; - } - } - - ret = 0; -end: - - return ret; -free_and_end: - if (avctx->codec) - avctx->codec->close(avctx); - - av_freep(&avctx->priv_data); - avctx->codec = NULL; - goto end; -} - -int avcodec_close(AVCodecContext *avctx) -{ - int i; - - if (!avctx) - return 0; - - if (avctx->codec && avctx->codec->close) - avctx->codec->close(avctx); - av_freep(&avctx->priv_data); - avctx->codec = NULL; - return 0; -} - -void avcodec_flush_buffers(AVCodecContext *avctx) -{ - if (avctx->codec->flush) - avctx->codec->flush(avctx); -} diff --git a/ext/at3_standalone/avcodec.h b/ext/at3_standalone/avcodec.h deleted file mode 100644 index 5a4ec7818b..0000000000 --- a/ext/at3_standalone/avcodec.h +++ /dev/null @@ -1,165 +0,0 @@ -/* - * copyright (c) 2001 Fabrice Bellard - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef AVCODEC_AVCODEC_H -#define AVCODEC_AVCODEC_H - -#include -#include "compat.h" -#include "mem.h" - -enum AVCodecID { - AV_CODEC_ID_ATRAC3, - AV_CODEC_ID_ATRAC3P, -}; - -/** - * @ingroup lavc_decoding - * Required number of additionally allocated bytes at the end of the input bitstream for decoding. - * This is mainly needed because some optimized bitstream readers read - * 32 or 64 bit at once and could read over the end.
- * Note: If the first 23 bits of the additional bytes are not 0, then damaged - * MPEG bitstreams could cause overread and segfault. - */ -#define AV_INPUT_BUFFER_PADDING_SIZE 32 - -/** - * main external API structure. - * New fields can be added to the end with minor version bumps. - * Removal, reordering and changes to existing fields require a major - * version bump. - * Please use AVOptions (av_opt* / av_set/get*()) to access these fields from user - * applications. - * sizeof(AVCodecContext) must not be used outside libav*. - */ -typedef struct AVCodecContext { - /** - * information on struct for av_log - * - set by avcodec_alloc_context3 - */ - const struct AVCodec *codec; - - void *priv_data; - - /** - * some codecs need / can use extradata like Huffman tables. - * mjpeg: Huffman tables - * rv10: additional flags - * mpeg4: global headers (they can be in the bitstream or here) - * The allocated memory should be AV_INPUT_BUFFER_PADDING_SIZE bytes larger - * than extradata_size to avoid problems if it is read with the bitstream reader. - * The bytewise contents of extradata must not depend on the architecture or CPU endianness. - * - encoding: Set/allocated/freed by libavcodec. - * - decoding: Set/allocated/freed by user. - */ - uint8_t *extradata; - int extradata_size; - - /** - * Codec delay. - * - * Encoding: Number of frames delay there will be from the encoder input to - * the decoder output. (we assume the decoder matches the spec) - * Decoding: Number of frames delay in addition to what a standard decoder - * as specified in the spec would produce. - * - * Video: - * Number of frames the decoded output will be delayed relative to the - * encoded input. - * - * Audio: - * For encoding, this field is unused (see initial_padding). - * - * For decoding, this is the number of samples the decoder needs to - * output before the decoder's output is valid. When seeking, you should - * start decoding this many samples prior to your desired seek point. - * - * - encoding: Set by libavcodec. - * - decoding: Set by libavcodec. - */ - int delay; - int channels; ///< number of audio channels - - /** - * number of bytes per packet if constant and known or 0 - * Used by some WAV based audio codecs. - */ - int block_align; -} AVCodecContext; - -/** - * AVCodec. - */ -typedef struct AVCodec { - /** - * Name of the codec implementation. - * The name is globally unique among encoders and among decoders (but an - * encoder and a decoder can share the same name). - * This is the primary way to find a codec from the user perspective. - */ - const char *name; - enum AVCodecID id; - - /***************************************************************** - * No fields below this line are part of the public API. They - * may not be used outside of libavcodec and can be changed and - * removed at will. - * New public fields should be added right above. - ***************************************************************** - */ - int priv_data_size; - - int (*init)(AVCodecContext *); - /** - * Encode data to an AVPacket. - * - * @param avctx codec context - * @param avpkt output AVPacket (may contain a user-provided buffer) - * @param[in] frame AVFrame containing the raw data to be encoded - * @param[out] got_packet_ptr encoder sets to 0 or 1 to indicate that a - * non-empty packet was returned in avpkt. - * @return 0 on success, negative error code on failure - */ - int (*close)(AVCodecContext *); - /** - * Flush buffers. - * Will be called when seeking - */ - void (*flush)(AVCodecContext *); -} AVCodec; - -AVCodecContext *avcodec_alloc_context3(const AVCodec *codec); -void avcodec_free_context(AVCodecContext **avctx); - -int avcodec_open2(AVCodecContext *avctx, const AVCodec *codec, void *options); -int avcodec_close(AVCodecContext *avctx); - -/** - * Reset the internal decoder state / flush internal buffers. Should be called - * e.g. when seeking or when switching to a different stream. - * - * @note when refcounted frames are not used (i.e. avctx->refcounted_frames is 0), - * this invalidates the frames previously returned from the decoder. When - * refcounted frames are used, the decoder just releases any references it might - * keep internally, but the caller's reference remains valid. - */ -void avcodec_flush_buffers(AVCodecContext *avctx); - -#endif /* AVCODEC_AVCODEC_H */ diff --git a/ext/at3_standalone/compat.h b/ext/at3_standalone/compat.h index 4e85bb35b6..7e236bb9cb 100644 --- a/ext/at3_standalone/compat.h +++ b/ext/at3_standalone/compat.h @@ -16,6 +16,7 @@ #endif #define AV_HAVE_FAST_UNALIGNED 0 +#define AV_INPUT_BUFFER_PADDING_SIZE 32 #define LOCAL_ALIGNED(bits, type, name, subscript) type name subscript #define av_restrict diff --git a/ext/at3_standalone/get_bits.cpp b/ext/at3_standalone/get_bits.cpp index 0930975a4d..08e606cd2e 100644 --- a/ext/at3_standalone/get_bits.cpp +++ b/ext/at3_standalone/get_bits.cpp @@ -31,8 +31,8 @@ #include #include -#include "avcodec.h" #include "compat.h" +#include "mem.h" #include "mathematics.h" #include "get_bits.h" diff --git a/ext/at3_standalone/sinewin.h b/ext/at3_standalone/sinewin.h index 2aec7727f2..5965a56fe8 100644 --- a/ext/at3_standalone/sinewin.h +++ b/ext/at3_standalone/sinewin.h @@ -20,6 +20,8 @@ #pragma once +#include "compat.h" + #define SINETABLE(size) \ DECLARE_ALIGNED(32, float, ff_sine_##size)[size] diff --git a/libretro/Makefile.common b/libretro/Makefile.common index d698f90632..4b3794fc48 100644 --- a/libretro/Makefile.common +++ b/libretro/Makefile.common @@ -259,6 +259,22 @@ SOURCES_C += \ $(EXTDIR)/libchdr/src/libchdr_flac.c \ $(EXTDIR)/libchdr/src/libchdr_huffman.c +INCFLAGS += -I$(EXTDIR)/at3_standalone + +SOURCES_C += \ + ${EXTDIR}/at3_standalone/atrac.cpp \ + ${EXTDIR}/at3_standalone/atrac3.cpp \ + ${EXTDIR}/at3_standalone/atrac3plus.cpp \ + ${EXTDIR}/at3_standalone/atrac3plusdec.cpp \ + ${EXTDIR}/at3_standalone/atrac3plusdsp.cpp \ + ${EXTDIR}/at3_standalone/get_bits.cpp \ + ${EXTDIR}/at3_standalone/compat.cpp \ + ${EXTDIR}/at3_standalone/fft.cpp \ + ${EXTDIR}/at3_standalone/float_dsp.cpp \ + ${EXTDIR}/at3_standalone/mathematics.cpp \ + ${EXTDIR}/at3_standalone/mem.cpp \ + ${EXTDIR}/at3_standalone/sinewin.cpp + ifeq ($(PLATFORM_EXT), android) COREFLAGS += -DHAVE_DLFCN_H else ifneq ($(PLATFORM_EXT), win32) From 6ee008af72be6612d9c516baedc1282fbf3f8361 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Thu, 11 Apr 2024 14:48:27 +0200 Subject: [PATCH 093/719] Warning fix, rename some variables to avoid clashes with actual ffmpeg --- ext/at3_standalone/atrac3plus.cpp | 12 ++++++------ ext/at3_standalone/atrac3plus.h | 6 +++--- ext/at3_standalone/atrac3plusdec.cpp | 12 ++++++------ ext/at3_standalone/atrac3plusdsp.cpp | 16 ++++++++-------- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/ext/at3_standalone/atrac3plus.cpp b/ext/at3_standalone/atrac3plus.cpp index 6c9b0adf13..583eadcd7e 100644 --- a/ext/at3_standalone/atrac3plus.cpp +++ b/ext/at3_standalone/atrac3plus.cpp @@ -854,8 +854,8 @@ static void decode_spectrum(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, memset(chan->power_levs, ATRAC3P_POWER_COMP_OFF, sizeof(chan->power_levs)); for (qu = 0; qu < ctx->used_quant_units; qu++) { - num_specs = ff_atrac3p_qu_to_spec_pos[qu + 1] - - ff_atrac3p_qu_to_spec_pos[qu]; + num_specs = av_atrac3p_qu_to_spec_pos[qu + 1] - + av_atrac3p_qu_to_spec_pos[qu]; wordlen = chan->qu_wordlen[qu]; codetab = chan->qu_tab_idx[qu]; @@ -871,14 +871,14 @@ static void decode_spectrum(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, tab_index = tab->redirect; decode_qu_spectra(gb, tab, &spec_vlc_tabs[tab_index], - &chan->spectrum[ff_atrac3p_qu_to_spec_pos[qu]], + &chan->spectrum[av_atrac3p_qu_to_spec_pos[qu]], num_specs); } else if (ch_num && ctx->channels[0].qu_wordlen[qu] && !codetab) { /* copy coefficients from master */ - memcpy(&chan->spectrum[ff_atrac3p_qu_to_spec_pos[qu]], - &ctx->channels[0].spectrum[ff_atrac3p_qu_to_spec_pos[qu]], + memcpy(&chan->spectrum[av_atrac3p_qu_to_spec_pos[qu]], + &ctx->channels[0].spectrum[av_atrac3p_qu_to_spec_pos[qu]], num_specs * - sizeof(chan->spectrum[ff_atrac3p_qu_to_spec_pos[qu]])); + sizeof(chan->spectrum[av_atrac3p_qu_to_spec_pos[qu]])); chan->qu_wordlen[qu] = ctx->channels[0].qu_wordlen[qu]; } } diff --git a/ext/at3_standalone/atrac3plus.h b/ext/at3_standalone/atrac3plus.h index b0710828f2..c2d2759ca0 100644 --- a/ext/at3_standalone/atrac3plus.h +++ b/ext/at3_standalone/atrac3plus.h @@ -229,8 +229,8 @@ void ff_atrac3p_imdct(FFTContext *mdct_ctx, float *pIn, void ff_atrac3p_ipqf(FFTContext *dct_ctx, Atrac3pIPQFChannelCtx *hist, const float *in, float *out); -extern const uint16_t ff_atrac3p_qu_to_spec_pos[33]; -extern const float ff_atrac3p_sf_tab[64]; -extern const float ff_atrac3p_mant_tab[8]; +extern const uint16_t av_atrac3p_qu_to_spec_pos[33]; +extern const float av_atrac3p_sf_tab[64]; +extern const float av_atrac3p_mant_tab[8]; #endif /* AVCODEC_ATRAC3PLUS_H */ diff --git a/ext/at3_standalone/atrac3plusdec.cpp b/ext/at3_standalone/atrac3plusdec.cpp index db923bba90..35e1b030c8 100644 --- a/ext/at3_standalone/atrac3plusdec.cpp +++ b/ext/at3_standalone/atrac3plusdec.cpp @@ -205,14 +205,14 @@ static void decode_residual_spectrum(Atrac3pChanUnitCtx *ctx, memset(out[ch], 0, ATRAC3P_FRAME_SAMPLES * sizeof(*out[ch])); for (qu = 0; qu < ctx->used_quant_units; qu++) { - src = &ctx->channels[ch].spectrum[ff_atrac3p_qu_to_spec_pos[qu]]; - dst = &out[ch][ff_atrac3p_qu_to_spec_pos[qu]]; - nspeclines = ff_atrac3p_qu_to_spec_pos[qu + 1] - - ff_atrac3p_qu_to_spec_pos[qu]; + src = &ctx->channels[ch].spectrum[av_atrac3p_qu_to_spec_pos[qu]]; + dst = &out[ch][av_atrac3p_qu_to_spec_pos[qu]]; + nspeclines = av_atrac3p_qu_to_spec_pos[qu + 1] - + av_atrac3p_qu_to_spec_pos[qu]; if (ctx->channels[ch].qu_wordlen[qu] > 0) { - q = ff_atrac3p_sf_tab[ctx->channels[ch].qu_sf_idx[qu]] * - ff_atrac3p_mant_tab[ctx->channels[ch].qu_wordlen[qu]]; + q = av_atrac3p_sf_tab[ctx->channels[ch].qu_sf_idx[qu]] * + av_atrac3p_mant_tab[ctx->channels[ch].qu_wordlen[qu]]; for (i = 0; i < nspeclines; i++) dst[i] = src[i] * q; } diff --git a/ext/at3_standalone/atrac3plusdsp.cpp b/ext/at3_standalone/atrac3plusdsp.cpp index ab0dbc299b..1f6a76fca4 100644 --- a/ext/at3_standalone/atrac3plusdsp.cpp +++ b/ext/at3_standalone/atrac3plusdsp.cpp @@ -38,7 +38,7 @@ * To get the number of spectral lines in each quant unit do the following: * num_specs = qu_to_spec_pos[i+1] - qu_to_spec_pos[i] */ -const uint16_t ff_atrac3p_qu_to_spec_pos[33] = { +const uint16_t av_atrac3p_qu_to_spec_pos[33] = { 0, 16, 32, 48, 64, 80, 96, 112, 128, 160, 192, 224, 256, 288, 320, 352, 384, 448, 512, 576, 640, 704, 768, 896, @@ -48,7 +48,7 @@ const uint16_t ff_atrac3p_qu_to_spec_pos[33] = { /* Scalefactors table. */ /* Approx. Equ: pow(2.0, (i - 16.0 + 0.501783948) / 3.0) */ -const float ff_atrac3p_sf_tab[64] = { +const float av_atrac3p_sf_tab[64] = { 0.027852058, 0.0350914, 0.044212341, 0.055704117, 0.0701828, 0.088424683, 0.11140823, 0.1403656, 0.17684937, 0.22281647, 0.2807312, 0.35369873, 0.44563293, 0.5614624, 0.70739746, 0.89126587, 1.1229248, 1.4147949, 1.7825317, @@ -63,7 +63,7 @@ const float ff_atrac3p_sf_tab[64] = { /* Mantissa table. */ /* pow(10, x * log10(2) + 0.05) / 2 / ([1,2,3,5,7,15,31] + 0.5) */ -const float ff_atrac3p_mant_tab[8] = { +const float av_atrac3p_mant_tab[8] = { 0.0, 0.74801636, 0.44882202, @@ -167,7 +167,7 @@ static void waves_synth(Atrac3pWaveSynthParams *synth_param, /* fade out with steep Hann window if requested */ if (envelope->has_stop_point) { - pos = (envelope->stop_pos + 1 << 2) - reg_offset; + pos = ((envelope->stop_pos + 1) << 2) - reg_offset; if (pos > 0 && pos <= 128) { out[pos - 4] *= hann_window[96]; out[pos - 3] *= hann_window[64]; @@ -445,12 +445,12 @@ void ff_atrac3p_power_compensation(Atrac3pChanUnitCtx *ctx, int ch_index, if (ctx->channels[ch_index].qu_wordlen[qu] <= 0) continue; - qu_lev = ff_atrac3p_sf_tab[ctx->channels[ch_index].qu_sf_idx[qu]] * - ff_atrac3p_mant_tab[ctx->channels[ch_index].qu_wordlen[qu]] / + qu_lev = av_atrac3p_sf_tab[ctx->channels[ch_index].qu_sf_idx[qu]] * + av_atrac3p_mant_tab[ctx->channels[ch_index].qu_wordlen[qu]] / (1 << ctx->channels[ch_index].qu_wordlen[qu]) * grp_lev; - dst = &sp[ff_atrac3p_qu_to_spec_pos[qu]]; - nsp = ff_atrac3p_qu_to_spec_pos[qu + 1] - ff_atrac3p_qu_to_spec_pos[qu]; + dst = &sp[av_atrac3p_qu_to_spec_pos[qu]]; + nsp = av_atrac3p_qu_to_spec_pos[qu + 1] - av_atrac3p_qu_to_spec_pos[qu]; for (i = 0; i < nsp; i++) dst[i] += pwcsp[i] * qu_lev; From 0d1f7e2e6ca4ec9feb87b0f8b3f9dc35bb12dac6 Mon Sep 17 00:00:00 2001 From: Herman Semenov Date: Thu, 11 Apr 2024 15:50:42 +0300 Subject: [PATCH 094/719] [Core/GL/UI] Not all fields initilize and minor code refactor --- Common/FakeEmitter.h | 10 +++++----- Common/GPU/OpenGL/GLQueueRunner.h | 2 +- Core/MIPS/fake/FakeJit.cpp | 2 +- Core/Util/DisArm64.cpp | 12 +++++++++--- UI/ControlMappingScreen.cpp | 19 ++++++++++--------- UI/MemStickScreen.cpp | 2 +- 6 files changed, 27 insertions(+), 20 deletions(-) diff --git a/Common/FakeEmitter.h b/Common/FakeEmitter.h index f1d7a3f584..5727be7b5c 100644 --- a/Common/FakeEmitter.h +++ b/Common/FakeEmitter.h @@ -145,26 +145,26 @@ public: return Type; } Operand2() {} - Operand2(u32 imm, OpType type = TYPE_IMM) + Operand2(u32 imm, OpType type = TYPE_IMM) : IndexOrShift(), Shift() { Type = type; Value = imm; Rotation = 0; } - Operand2(FakeReg Reg) + Operand2(FakeReg Reg) : IndexOrShift(), Shift() { Type = TYPE_REG; Value = Reg; Rotation = 0; } - Operand2(u8 imm, u8 rotation) + Operand2(u8 imm, u8 rotation) : IndexOrShift(), Shift() { Type = TYPE_IMM; Value = imm; Rotation = rotation; } - Operand2(FakeReg base, ShiftType type, FakeReg shift) // RSR + Operand2(FakeReg base, ShiftType type, FakeReg shift) : Rotation(0) // RSR { Type = TYPE_RSR; _assert_msg_(type != ST_RRX, "Invalid Operand2: RRX does not take a register shift amount"); @@ -173,7 +173,7 @@ public: Value = base; } - Operand2(FakeReg base, ShiftType type, u8 shift)// For IMM shifted register + Operand2(FakeReg base, ShiftType type, u8 shift) : Rotation(0) // For IMM shifted register { if(shift == 32) shift = 0; switch (type) diff --git a/Common/GPU/OpenGL/GLQueueRunner.h b/Common/GPU/OpenGL/GLQueueRunner.h index df86b9565f..87d9a76be6 100644 --- a/Common/GPU/OpenGL/GLQueueRunner.h +++ b/Common/GPU/OpenGL/GLQueueRunner.h @@ -298,7 +298,7 @@ enum GLRAspect { const char *GLRAspectToString(GLRAspect aspect); struct GLRStep { - GLRStep(GLRStepType _type) : stepType(_type) {} + GLRStep(GLRStepType _type) : stepType(_type), tag() {} GLRStepType stepType; FastVec commands; TinySet dependencies; diff --git a/Core/MIPS/fake/FakeJit.cpp b/Core/MIPS/fake/FakeJit.cpp index 3e696814c8..7ed0af300b 100644 --- a/Core/MIPS/fake/FakeJit.cpp +++ b/Core/MIPS/fake/FakeJit.cpp @@ -40,7 +40,7 @@ void DisassembleFake(const u8 *data, int size) { namespace MIPSComp { -FakeJit::FakeJit(MIPSState *mipsState) : blocks(mipsState, this), mips_(mipsState) +FakeJit::FakeJit(MIPSState *mipsState) : blocks(mipsState, this), mips_(mipsState), js() { logBlocks = 0; dontLogBlocks = 0; diff --git a/Core/Util/DisArm64.cpp b/Core/Util/DisArm64.cpp index 5fc2a6eba9..325d46372b 100644 --- a/Core/Util/DisArm64.cpp +++ b/Core/Util/DisArm64.cpp @@ -749,15 +749,21 @@ static void FPandASIMD1(uint32_t w, uint64_t addr, Instruction *instr) { int dst_index = imm5 >> (size + 1); int src_index = imm4 >> size; int op = (w >> 29) & 1; - char s = "bhsd"[size]; + char s; + switch (size) { + case 0x00: s = 'b'; break; + case 0x01: s = 'h'; break; + case 0x02: s = 's'; break; + case 0x03: s = 'd'; break; + } if (op == 0 && imm4 == 0) { // DUP (element) int idxdsize = (imm5 & 8) ? 128 : 64; - char r = "dq"[idxdsize == 128]; + char r = (idxdsize == 128) ? 'q' : 'd'; snprintf(instr->text, sizeof(instr->text), "dup %c%d, %c%d.%c[%d]", r, Rd, r, Rn, s, dst_index); } else { int idxdsize = (imm4 & 8) ? 128 : 64; - char r = "dq"[idxdsize == 128]; + char r = (idxdsize == 128) ? 'q' : 'd'; snprintf(instr->text, sizeof(instr->text), "ins %c%d.%c[%d], %c%d.%c[%d]", r, Rd, s, dst_index, r, Rn, s, src_index); } } diff --git a/UI/ControlMappingScreen.cpp b/UI/ControlMappingScreen.cpp index c95e732783..30f3e73477 100644 --- a/UI/ControlMappingScreen.cpp +++ b/UI/ControlMappingScreen.cpp @@ -97,15 +97,16 @@ void SingleControlMapper::Refresh() { Clear(); auto mc = GetI18NCategory(I18NCat::MAPPABLECONTROLS); - std::map keyImages; - keyImages["Circle"] = ImageID("I_CIRCLE"); - keyImages["Cross"] = ImageID("I_CROSS"); - keyImages["Square"] = ImageID("I_SQUARE"); - keyImages["Triangle"] = ImageID("I_TRIANGLE"); - keyImages["Start"] = ImageID("I_START"); - keyImages["Select"] = ImageID("I_SELECT"); - keyImages["L"] = ImageID("I_L"); - keyImages["R"] = ImageID("I_R"); + std::map keyImages = { + { "Circle", ImageID("I_CIRCLE") }, + { "Cross", ImageID("I_CROSS") }, + { "Square", ImageID("I_SQUARE") }, + { "Triangle", ImageID("I_TRIANGLE") }, + { "Start", ImageID("I_START") }, + { "Select", ImageID("I_SELECT") }, + { "L", ImageID("I_L") }, + { "R", ImageID("I_R") } + }; using namespace UI; diff --git a/UI/MemStickScreen.cpp b/UI/MemStickScreen.cpp index e1ce789268..f7a7a69cfd 100644 --- a/UI/MemStickScreen.cpp +++ b/UI/MemStickScreen.cpp @@ -456,7 +456,7 @@ void MemStickScreen::update() { } ConfirmMemstickMoveScreen::ConfirmMemstickMoveScreen(Path newMemstickFolder, bool initialSetup) - : newMemstickFolder_(newMemstickFolder), initialSetup_(initialSetup) { + : newMemstickFolder_(newMemstickFolder), initialSetup_(initialSetup), progressReporter_() { existingFilesInNewFolder_ = FolderSeemsToBeUsed(newMemstickFolder); if (initialSetup_) { moveData_ = false; From 8e580045cd423b6cfff0a2c30e53e32f675cf9e8 Mon Sep 17 00:00:00 2001 From: Herman Semenov Date: Thu, 11 Apr 2024 16:56:59 +0300 Subject: [PATCH 095/719] Fixed condition always false using unsigned int and logical AND 0 & 4 --- Common/Buffer.cpp | 2 +- Common/GPU/OpenGL/GLRenderManager.h | 1 - Core/Util/DisArm64.cpp | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Common/Buffer.cpp b/Common/Buffer.cpp index 25af9607d1..683c520500 100644 --- a/Common/Buffer.cpp +++ b/Common/Buffer.cpp @@ -111,7 +111,7 @@ void Buffer::Printf(const char *fmt, ...) { // Output was truncated. TODO: Do something. ERROR_LOG(IO, "Buffer::Printf truncated output"); } - if (retval < 0) { + if ((int)retval < 0) { ERROR_LOG(IO, "Buffer::Printf failed"); } va_end(vl); diff --git a/Common/GPU/OpenGL/GLRenderManager.h b/Common/GPU/OpenGL/GLRenderManager.h index b3230da67f..4c7e1a5509 100644 --- a/Common/GPU/OpenGL/GLRenderManager.h +++ b/Common/GPU/OpenGL/GLRenderManager.h @@ -421,7 +421,6 @@ public: // an init command, that's for sure. GLRInitStep &step = initSteps_.push_uninitialized(); step.stepType = GLRInitStepType::BUFFER_SUBDATA; - _dbg_assert_(offset >= 0); _dbg_assert_(offset <= buffer->size_ - size); step.buffer_subdata.buffer = buffer; step.buffer_subdata.offset = (int)offset; diff --git a/Core/Util/DisArm64.cpp b/Core/Util/DisArm64.cpp index 5fc2a6eba9..5b92a22346 100644 --- a/Core/Util/DisArm64.cpp +++ b/Core/Util/DisArm64.cpp @@ -916,8 +916,6 @@ static void FPandASIMD2(uint32_t w, uint64_t addr, Instruction *instr) { } else if (((w >> 10) & 0x3f) == 0x0 && opcode == 0) { char ir = sf ? 'x' : 'w'; char roundmode = "npmz"[(w >> 19) & 3]; - if (opcode & 0x4) - roundmode = 'a'; char fr = ((w >> 22) & 1) ? 'd' : 's'; snprintf(instr->text, sizeof(instr->text), "fcvt%cs %c%d, %c%d", roundmode, ir, Rd, fr, Rn); } else if ((opcode & 6) == 2) { From d4023fb894c4112ecae041eaf2c4306029d45d2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Thu, 11 Apr 2024 15:25:01 +0200 Subject: [PATCH 096/719] Buildfixes Buildfix UWP buildfix libretro buildfix --- UWP/CommonUWP/CommonUWP.vcxproj | 30 +++++++++ UWP/CommonUWP/CommonUWP.vcxproj.filters | 89 +++++++++++++++++++++++++ UWP/CoreUWP/CoreUWP.vcxproj | 2 + UWP/CoreUWP/CoreUWP.vcxproj.filters | 6 ++ android/jni/Android.mk | 1 - ext/at3_standalone/atrac.h | 2 +- ext/at3_standalone/compat.cpp | 6 +- libretro/Makefile.common | 1 + 8 files changed, 130 insertions(+), 7 deletions(-) diff --git a/UWP/CommonUWP/CommonUWP.vcxproj b/UWP/CommonUWP/CommonUWP.vcxproj index f9b157200e..fcaeb8cc3f 100644 --- a/UWP/CommonUWP/CommonUWP.vcxproj +++ b/UWP/CommonUWP/CommonUWP.vcxproj @@ -240,6 +240,20 @@ + + + + + + + + + + + + + + @@ -381,6 +395,18 @@ + + + + + + + + + + + + @@ -423,6 +449,10 @@ {c249f016-7f82-45cf-bb6e-0642a988c4d3} + + + + diff --git a/UWP/CommonUWP/CommonUWP.vcxproj.filters b/UWP/CommonUWP/CommonUWP.vcxproj.filters index 0de87ec64c..0855ecae23 100644 --- a/UWP/CommonUWP/CommonUWP.vcxproj.filters +++ b/UWP/CommonUWP/CommonUWP.vcxproj.filters @@ -100,6 +100,9 @@ {7b5c3ddc-225d-48d5-a829-9a1e71e304be} + + {47e3b9c8-3a5f-4c78-b62b-3fa65bf23594} + @@ -462,6 +465,42 @@ ext\minimp3 + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + @@ -877,6 +916,48 @@ ext\minimp3 + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + + + ext\at3_standalone + @@ -917,4 +998,12 @@ ext\basis_universal + + + ext\at3_standalone + + + ext\at3_standalone + + \ No newline at end of file diff --git a/UWP/CoreUWP/CoreUWP.vcxproj b/UWP/CoreUWP/CoreUWP.vcxproj index 207fa9ad79..fde72ab21e 100644 --- a/UWP/CoreUWP/CoreUWP.vcxproj +++ b/UWP/CoreUWP/CoreUWP.vcxproj @@ -261,6 +261,7 @@ + @@ -508,6 +509,7 @@ + diff --git a/UWP/CoreUWP/CoreUWP.vcxproj.filters b/UWP/CoreUWP/CoreUWP.vcxproj.filters index 82bf9b68af..7e6404054a 100644 --- a/UWP/CoreUWP/CoreUWP.vcxproj.filters +++ b/UWP/CoreUWP/CoreUWP.vcxproj.filters @@ -258,6 +258,9 @@ HW + + HW + HW @@ -1306,6 +1309,9 @@ HW + + HW + HW diff --git a/android/jni/Android.mk b/android/jni/Android.mk index f85b36ecc4..639a700c50 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -118,7 +118,6 @@ AT3_STANDALONE_FILES := \ ${SRC}/ext/at3_standalone/atrac3plus.cpp \ ${SRC}/ext/at3_standalone/atrac3plusdec.cpp \ ${SRC}/ext/at3_standalone/atrac3plusdsp.cpp \ - ${SRC}/ext/at3_standalone/avcodec.cpp \ ${SRC}/ext/at3_standalone/get_bits.cpp \ ${SRC}/ext/at3_standalone/compat.cpp \ ${SRC}/ext/at3_standalone/fft.cpp \ diff --git a/ext/at3_standalone/atrac.h b/ext/at3_standalone/atrac.h index 960c0e1185..5bef52a1ce 100644 --- a/ext/at3_standalone/atrac.h +++ b/ext/at3_standalone/atrac.h @@ -26,7 +26,7 @@ * ATRAC common header */ -#include "ext/at3_standalone/compat.h" +#include "compat.h" #ifndef AVCODEC_ATRAC_H #define AVCODEC_ATRAC_H diff --git a/ext/at3_standalone/compat.cpp b/ext/at3_standalone/compat.cpp index 319d22b3db..cba19869da 100644 --- a/ext/at3_standalone/compat.cpp +++ b/ext/at3_standalone/compat.cpp @@ -1,7 +1,3 @@ -#include -#include -#include - -#include "ext/at3_standalone/compat.h" +#include "compat.h" void av_log(int level, const char *fmt, ...) {} diff --git a/libretro/Makefile.common b/libretro/Makefile.common index 4b3794fc48..9aa8621a94 100644 --- a/libretro/Makefile.common +++ b/libretro/Makefile.common @@ -718,6 +718,7 @@ SOURCES_CXX += \ $(COREDIR)/HW/Camera.cpp \ $(COREDIR)/HW/Display.cpp \ $(COREDIR)/HW/SimpleAudioDec.cpp \ + $(COREDIR)/HW/Atrac3Standalone.cpp \ $(COREDIR)/HW/AsyncIOManager.cpp \ $(COREDIR)/HW/MediaEngine.cpp \ $(COREDIR)/HW/MpegDemux.cpp \ From 58cb2ba804cac16502791a7e5f006d53ae6e0536 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Thu, 11 Apr 2024 16:04:22 +0200 Subject: [PATCH 097/719] Fix playback of atrac3+ when block align not specified --- Core/HW/Atrac3Standalone.cpp | 12 ++++++++---- ext/at3_standalone/at3_decoders.h | 6 ++++-- ext/at3_standalone/atrac3.cpp | 18 ++++++++++++------ ext/at3_standalone/atrac3plusdec.cpp | 13 +++++++------ 4 files changed, 31 insertions(+), 18 deletions(-) diff --git a/Core/HW/Atrac3Standalone.cpp b/Core/HW/Atrac3Standalone.cpp index 558d29d635..5d7b923069 100644 --- a/Core/HW/Atrac3Standalone.cpp +++ b/Core/HW/Atrac3Standalone.cpp @@ -18,11 +18,11 @@ public: Atrac3Audio(PSPAudioType audioType, int channels, size_t blockAlign, const uint8_t *extraData, size_t extraDataSize) : audioType_(audioType) { blockAlign_ = blockAlign; if (audioType == PSP_CODEC_AT3PLUS) { - at3pCtx_ = atrac3p_alloc(channels, blockAlign); + at3pCtx_ = atrac3p_alloc(channels, &blockAlign_); if (at3pCtx_) codecOpen_ = true; } else if (audioType_ == PSP_CODEC_AT3) { - at3Ctx_ = atrac3_alloc(channels, blockAlign, extraData, extraDataSize); + at3Ctx_ = atrac3_alloc(channels, &blockAlign_, extraData, extraDataSize); if (at3Ctx_) codecOpen_ = true; } @@ -42,13 +42,18 @@ public: } } + bool IsOK() const override { + return codecOpen_; + } + bool Decode(const uint8_t *inbuf, int inbytes, uint8_t *outbuf, int *outbytes) override { if (!codecOpen_) { _dbg_assert_(false); } - if (inbytes != blockAlign_) { + if (inbytes != blockAlign_ && blockAlign_ != 0) { WARN_LOG(ME, "Atrac3Audio::Decode: Unexpected block align %d (expected %d)", inbytes, blockAlign_); } + blockAlign_ = inbytes; // We just call the decode function directly without going through the whole packet machinery. int got_frame = 0; int result; @@ -82,7 +87,6 @@ public: return true; } - bool IsOK() const override { return true; } int GetOutSamples() const override { return outSamples_; } diff --git a/ext/at3_standalone/at3_decoders.h b/ext/at3_standalone/at3_decoders.h index df7f0f42da..bbac4d75f7 100644 --- a/ext/at3_standalone/at3_decoders.h +++ b/ext/at3_standalone/at3_decoders.h @@ -7,10 +7,12 @@ struct ATRAC3Context; struct ATRAC3PContext; -ATRAC3Context *atrac3_alloc(int channels, int block_align, const uint8_t *extra_data, int extra_data_size); +// If the block_align passed in is 0, tries to audio detect. + +ATRAC3Context *atrac3_alloc(int channels, int *block_align, const uint8_t *extra_data, int extra_data_size); void atrac3_free(ATRAC3Context *ctx); int atrac3_decode_frame(ATRAC3Context *ctx, float *out_data[2], int *nb_samples, int *got_frame_ptr, const uint8_t *buf, int buf_size); -ATRAC3PContext *atrac3p_alloc(int channels, int block_align); +ATRAC3PContext *atrac3p_alloc(int channels, int *block_align); void atrac3p_free(ATRAC3PContext *ctx); int atrac3p_decode_frame(ATRAC3PContext *ctx, float *out_data[2], int *nb_samples, int *got_frame_ptr, const uint8_t *buf, int buf_size); diff --git a/ext/at3_standalone/atrac3.cpp b/ext/at3_standalone/atrac3.cpp index 51e4b74300..1906ce0cc8 100644 --- a/ext/at3_standalone/atrac3.cpp +++ b/ext/at3_standalone/atrac3.cpp @@ -785,7 +785,7 @@ static void atrac3_init_static_data(void) static int static_init_done; -ATRAC3Context *atrac3_alloc(int channels, int block_align, const uint8_t *extra_data, int extra_data_size) { +ATRAC3Context *atrac3_alloc(int channels, int *block_align, const uint8_t *extra_data, int extra_data_size) { int i, ret; int version, delay, samples_per_frame, frame_factor; @@ -798,7 +798,13 @@ ATRAC3Context *atrac3_alloc(int channels, int block_align, const uint8_t *extra_ ATRAC3Context *q = (ATRAC3Context *)av_mallocz(sizeof(ATRAC3Context)); q->channels = channels; - q->block_align = block_align; + if (*block_align) { + q->block_align = *block_align; + } else { + // Atrac3 (unlike Atrac3+) requires a specified block align. + atrac3_free(q); + return nullptr; + } if (!static_init_done) atrac3_init_static_data(); @@ -824,9 +830,9 @@ ATRAC3Context *atrac3_alloc(int channels, int block_align, const uint8_t *extra_ q->coding_mode = q->coding_mode ? JOINT_STEREO : STEREO; q->scrambled_stream = 0; - if (block_align != 96 * channels * frame_factor && - block_align != 152 * channels * frame_factor && - block_align != 192 * channels * frame_factor) { + if (q->block_align != 96 * channels * frame_factor && + q->block_align != 152 * channels * frame_factor && + q->block_align != 192 * channels * frame_factor) { av_log(AV_LOG_ERROR, "Unknown frame/channel/frame_factor " "configuration %d/%d/%d\n", block_align, channels, frame_factor); @@ -887,7 +893,7 @@ ATRAC3Context *atrac3_alloc(int channels, int block_align, const uint8_t *extra_ return nullptr; } - q->decoded_bytes_buffer = (uint8_t *)av_mallocz(FFALIGN(block_align, 4) + AV_INPUT_BUFFER_PADDING_SIZE); + q->decoded_bytes_buffer = (uint8_t *)av_mallocz(FFALIGN(q->block_align, 4) + AV_INPUT_BUFFER_PADDING_SIZE); /* initialize the MDCT transform */ if ((ret = ff_mdct_init(&q->mdct_ctx, 9, 1, 1.0 / 32768)) < 0) { diff --git a/ext/at3_standalone/atrac3plusdec.cpp b/ext/at3_standalone/atrac3plusdec.cpp index 35e1b030c8..f1a58d726a 100644 --- a/ext/at3_standalone/atrac3plusdec.cpp +++ b/ext/at3_standalone/atrac3plusdec.cpp @@ -125,15 +125,16 @@ static int set_channel_params(ATRAC3PContext *ctx, int channels) { return 0; } -ATRAC3PContext *atrac3p_alloc(int channels, int block_align) { +ATRAC3PContext *atrac3p_alloc(int channels, int *block_align) { int i, ch, ret; - if (!block_align) { - av_log(AV_LOG_ERROR, "block_align is not set\n"); - return nullptr; - } ATRAC3PContext *ctx = (ATRAC3PContext *)av_mallocz(sizeof(ATRAC3PContext)); - ctx->block_align = block_align; + ctx->block_align = *block_align; + + if (!*block_align) { + // No block align was passed in, using the default. + *block_align = 0x000002e8; + } ff_atrac3p_init_vlcs(); From 45936e88264979e4d5201e7c0e0f66fcb226e54d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Thu, 11 Apr 2024 16:35:27 +0200 Subject: [PATCH 098/719] Atrac: Add "flush_buffers" api. The ffmpeg atrac decoder was missing this. --- Core/HW/Atrac3Standalone.cpp | 9 +++++++++ Core/HW/SimpleAudioDec.h | 2 ++ ext/at3_standalone/at3_decoders.h | 3 +++ ext/at3_standalone/atrac3.cpp | 5 +++++ ext/at3_standalone/atrac3plusdec.cpp | 4 ++++ 5 files changed, 23 insertions(+) diff --git a/Core/HW/Atrac3Standalone.cpp b/Core/HW/Atrac3Standalone.cpp index 5d7b923069..4aa506a183 100644 --- a/Core/HW/Atrac3Standalone.cpp +++ b/Core/HW/Atrac3Standalone.cpp @@ -46,6 +46,15 @@ public: return codecOpen_; } + void FlushBuffers() { + if (at3Ctx_) { + atrac3_flush_buffers(at3Ctx_); + } + if (at3pCtx_) { + atrac3p_flush_buffers(at3pCtx_); + } + } + bool Decode(const uint8_t *inbuf, int inbytes, uint8_t *outbuf, int *outbytes) override { if (!codecOpen_) { _dbg_assert_(false); diff --git a/Core/HW/SimpleAudioDec.h b/Core/HW/SimpleAudioDec.h index 8ee4e45aa1..b227b3889a 100644 --- a/Core/HW/SimpleAudioDec.h +++ b/Core/HW/SimpleAudioDec.h @@ -48,6 +48,8 @@ public: virtual void SetChannels(int channels) = 0; + virtual void FlushBuffers() {} + // Just metadata. void SetCtxPtr(uint32_t ptr) { ctxPtr = ptr; } uint32_t GetCtxPtr() const { return ctxPtr; } diff --git a/ext/at3_standalone/at3_decoders.h b/ext/at3_standalone/at3_decoders.h index bbac4d75f7..0762c1a72d 100644 --- a/ext/at3_standalone/at3_decoders.h +++ b/ext/at3_standalone/at3_decoders.h @@ -8,11 +8,14 @@ struct ATRAC3Context; struct ATRAC3PContext; // If the block_align passed in is 0, tries to audio detect. +// flush_buffers should be called when seeking before the next decode_frame. ATRAC3Context *atrac3_alloc(int channels, int *block_align, const uint8_t *extra_data, int extra_data_size); void atrac3_free(ATRAC3Context *ctx); +void atrac3_flush_buffers(ATRAC3Context *ctx); int atrac3_decode_frame(ATRAC3Context *ctx, float *out_data[2], int *nb_samples, int *got_frame_ptr, const uint8_t *buf, int buf_size); ATRAC3PContext *atrac3p_alloc(int channels, int *block_align); void atrac3p_free(ATRAC3PContext *ctx); +void atrac3p_flush_buffers(ATRAC3PContext *ctx); int atrac3p_decode_frame(ATRAC3PContext *ctx, float *out_data[2], int *nb_samples, int *got_frame_ptr, const uint8_t *buf, int buf_size); diff --git a/ext/at3_standalone/atrac3.cpp b/ext/at3_standalone/atrac3.cpp index 1906ce0cc8..387378b1ee 100644 --- a/ext/at3_standalone/atrac3.cpp +++ b/ext/at3_standalone/atrac3.cpp @@ -765,6 +765,11 @@ int atrac3_decode_frame(ATRAC3Context *ctx, float *out_data[2], int *nb_samples, return block_align; } +void atrac3_flush_buffers(ATRAC3Context *c) { + // There's no known correct way to do this, so let's just reset some stuff. + memset(c->temp_buf, 0, sizeof(c->temp_buf)); +} + static void atrac3_init_static_data(void) { int i; diff --git a/ext/at3_standalone/atrac3plusdec.cpp b/ext/at3_standalone/atrac3plusdec.cpp index f1a58d726a..f46a1c2301 100644 --- a/ext/at3_standalone/atrac3plusdec.cpp +++ b/ext/at3_standalone/atrac3plusdec.cpp @@ -357,3 +357,7 @@ int atrac3p_decode_frame(ATRAC3PContext *ctx, float *out_data[2], int *nb_sample return FFMIN(ctx->block_align, avpkt_size); } + +void atrac3p_flush_buffers(ATRAC3PContext *ctx) { + // TODO: Not sure what should be zeroed here. +} From 5ed77b58ca9228d8a790deebd1c2323cd9be6502 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Thu, 11 Apr 2024 16:46:55 +0200 Subject: [PATCH 099/719] Improve the AudioDecoder API to avoid having to call a function to get the bytes consumed --- Core/HLE/sceAudiocodec.cpp | 3 ++- Core/HLE/sceMp3.cpp | 5 ++-- Core/HW/Atrac3Standalone.cpp | 10 +++----- Core/HW/MediaEngine.cpp | 3 ++- Core/HW/SimpleAudioDec.cpp | 47 +++++++++++++++--------------------- Core/HW/SimpleAudioDec.h | 4 +-- UI/BackgroundAudio.cpp | 3 ++- ext/at3_standalone/compat.h | 2 +- 8 files changed, 34 insertions(+), 43 deletions(-) diff --git a/Core/HLE/sceAudiocodec.cpp b/Core/HLE/sceAudiocodec.cpp index 0da9ede65d..9934aa1d56 100644 --- a/Core/HLE/sceAudiocodec.cpp +++ b/Core/HLE/sceAudiocodec.cpp @@ -118,7 +118,8 @@ static int sceAudiocodecDecode(u32 ctxPtr, int codec) { // Use SimpleAudioDec to decode audio auto ctx = PSPPointer::Create(ctxPtr); // On stack, no need to allocate. // Decode audio - decoder->Decode(Memory::GetPointer(ctx->inDataPtr), ctx->inDataSize, Memory::GetPointerWrite(ctx->outDataPtr), &outbytes); + int inDataConsumed = 0; + decoder->Decode(Memory::GetPointer(ctx->inDataPtr), ctx->inDataSize, &inDataConsumed, Memory::GetPointerWrite(ctx->outDataPtr), &outbytes); } DEBUG_LOG(ME, "sceAudiocodecDec(%08x, %i (%s))", ctxPtr, codec, GetCodecName(codec)); return 0; diff --git a/Core/HLE/sceMp3.cpp b/Core/HLE/sceMp3.cpp index f73ea438aa..cdd8f09964 100644 --- a/Core/HLE/sceMp3.cpp +++ b/Core/HLE/sceMp3.cpp @@ -743,10 +743,11 @@ static u32 sceMp3LowLevelDecode(u32 mp3, u32 sourceAddr, u32 sourceBytesConsumed auto outbuff = Memory::GetPointerWriteUnchecked(samplesAddr); int outpcmbytes = 0; - ctx->decoder->Decode(inbuff, 4096, outbuff, &outpcmbytes); + int inbytesConsumed = 0; + ctx->decoder->Decode(inbuff, 4096, &inbytesConsumed, outbuff, &outpcmbytes); NotifyMemInfo(MemBlockFlags::WRITE, samplesAddr, outpcmbytes, "Mp3LowLevelDecode"); - Memory::Write_U32(ctx->decoder->GetSourcePos(), sourceBytesConsumedAddr); + Memory::Write_U32(inbytesConsumed, sourceBytesConsumedAddr); Memory::Write_U32(outpcmbytes, sampleBytesAddr); return 0; } diff --git a/Core/HW/Atrac3Standalone.cpp b/Core/HW/Atrac3Standalone.cpp index 4aa506a183..da1ccdcd21 100644 --- a/Core/HW/Atrac3Standalone.cpp +++ b/Core/HW/Atrac3Standalone.cpp @@ -55,7 +55,7 @@ public: } } - bool Decode(const uint8_t *inbuf, int inbytes, uint8_t *outbuf, int *outbytes) override { + bool Decode(const uint8_t *inbuf, int inbytes, int *inbytesConsumed, uint8_t *outbuf, int *outbytes) override { if (!codecOpen_) { _dbg_assert_(false); } @@ -70,19 +70,18 @@ public: if (audioType_ == PSP_CODEC_AT3PLUS) { result = atrac3p_decode_frame(at3pCtx_, buffers_, &nb_samples, &got_frame, inbuf, inbytes); } else { - result = atrac3_decode_frame(at3Ctx_, buffers_, &nb_samples, &got_frame, inbuf, inbytes); } if (result < 0) { *outbytes = 0; return false; } - srcPos_ = result; + *inbytesConsumed = result; outSamples_ = nb_samples; if (nb_samples > 0) { *outbytes = nb_samples * 2 * 2; - // Convert frame to outbuf. + // Convert frame to outbuf. TODO: Very SIMDable, though hardly hot. for (int channel = 0; channel < 2; channel++) { int16_t *output = (int16_t *)outbuf; for (int i = 0; i < nb_samples; i++) { @@ -99,9 +98,6 @@ public: int GetOutSamples() const override { return outSamples_; } - int GetSourcePos() const override { - return srcPos_; - } void SetChannels(int channels) override { // Hmm. ignore for now. diff --git a/Core/HW/MediaEngine.cpp b/Core/HW/MediaEngine.cpp index c1e23612ab..cd5d1b9b1e 100644 --- a/Core/HW/MediaEngine.cpp +++ b/Core/HW/MediaEngine.cpp @@ -1077,7 +1077,8 @@ int MediaEngine::getAudioSamples(u32 bufferPtr) { m_audioContext->SetChannels(1); } - if (!m_audioContext->Decode(audioFrame, frameSize, buffer, &outbytes)) { + int inbytesConsumed = 0; + if (!m_audioContext->Decode(audioFrame, frameSize, &inbytesConsumed, buffer, &outbytes)) { ERROR_LOG(ME, "Audio (%s) decode failed during video playback", GetCodecName(m_audioType)); } diff --git a/Core/HW/SimpleAudioDec.cpp b/Core/HW/SimpleAudioDec.cpp index 83b79ec975..c1e57ffdaa 100644 --- a/Core/HW/SimpleAudioDec.cpp +++ b/Core/HW/SimpleAudioDec.cpp @@ -65,10 +65,10 @@ public: } ~MiniMp3Audio() {} - bool Decode(const uint8_t* inbuf, int inbytes, uint8_t *outbuf, int *outbytes) override { + bool Decode(const uint8_t* inbuf, int inbytes, int *inbytesConsumed, uint8_t *outbuf, int *outbytes) override { mp3dec_frame_info_t info{}; int samplesWritten = mp3dec_decode_frame(&mp3_, inbuf, inbytes, (mp3d_sample_t *)outbuf, &info); - srcPos_ = info.frame_bytes; + *inbytesConsumed = info.frame_bytes; *outbytes = samplesWritten * sizeof(mp3d_sample_t) * info.channels; outSamples_ = samplesWritten * info.channels; return true; @@ -78,9 +78,6 @@ public: int GetOutSamples() const override { return outSamples_; } - int GetSourcePos() const override { - return srcPos_; - } void SetChannels(int channels) override { // Hmm. ignore for now. @@ -101,7 +98,7 @@ public: SimpleAudio(PSPAudioType audioType, int sampleRateHz = 44100, int channels = 2); ~SimpleAudio(); - bool Decode(const uint8_t* inbuf, int inbytes, uint8_t *outbuf, int *outbytes) override; + bool Decode(const uint8_t* inbuf, int inbytes, int *inbytesConsumed, uint8_t *outbuf, int *outbytes) override; bool IsOK() const override { #ifdef USE_FFMPEG return codec_ != 0; @@ -111,10 +108,7 @@ public: } int GetOutSamples() const override { - return outSamples; - } - int GetSourcePos() const override { - return srcPos; + return outSamples_; } void SetChannels(int channels) override; @@ -128,18 +122,17 @@ private: PSPAudioType audioType; int sample_rate_; int channels_; - int outSamples; // output samples per frame - int srcPos; // bytes consumed in source during the last decoding + int outSamples_ = 0; // output samples per frame - AVFrame *frame_; + AVFrame *frame_ = nullptr; #if HAVE_LIBAVCODEC_CONST_AVCODEC // USE_FFMPEG is implied const #endif - AVCodec *codec_; - AVCodecContext *codecCtx_; - SwrContext *swrCtx_; + AVCodec *codec_ = nullptr; + AVCodecContext *codecCtx_ = nullptr; + SwrContext *swrCtx_ = nullptr; - bool codecOpen_; + bool codecOpen_ = false; }; AudioDecoder *CreateAudioDecoder(PSPAudioType audioType, int sampleRateHz, int channels, size_t blockAlign, const uint8_t *extraData, size_t extraDataSize) { @@ -176,10 +169,7 @@ static int GetAudioCodecID(int audioType) { } SimpleAudio::SimpleAudio(PSPAudioType audioType, int sampleRateHz, int channels) - : audioType(audioType), sample_rate_(sampleRateHz), channels_(channels), - outSamples(0), srcPos(0), - frame_(0), codec_(0), codecCtx_(0), swrCtx_(0), - codecOpen_(false) { + : audioType(audioType), sample_rate_(sampleRateHz), channels_(channels) { #ifdef USE_FFMPEG #if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(58, 18, 100) @@ -274,7 +264,7 @@ SimpleAudio::~SimpleAudio() { } // Decodes a single input frame. -bool SimpleAudio::Decode(const uint8_t *inbuf, int inbytes, uint8_t *outbuf, int *outbytes) { +bool SimpleAudio::Decode(const uint8_t *inbuf, int inbytes, int *inbytesConsumed, uint8_t *outbuf, int *outbytes) { #ifdef USE_FFMPEG if (!codecOpen_) { OpenCodec(inbytes); @@ -289,7 +279,7 @@ bool SimpleAudio::Decode(const uint8_t *inbuf, int inbytes, uint8_t *outbuf, int av_frame_unref(frame_); *outbytes = 0; - srcPos = 0; + *inbytesConsumed = 0; #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101) if (inbytes != 0) { int err = avcodec_send_packet(codecCtx_, &packet); @@ -321,7 +311,7 @@ bool SimpleAudio::Decode(const uint8_t *inbuf, int inbytes, uint8_t *outbuf, int } // get bytes consumed in source - srcPos = len; + *inbytesConsumed = len; if (got_frame) { // Initializing the sample rate convert. We will use it to convert float output into int. @@ -358,10 +348,10 @@ bool SimpleAudio::Decode(const uint8_t *inbuf, int inbytes, uint8_t *outbuf, int return false; } // output samples per frame, we should *2 since we have two channels - outSamples = swrRet * 2; + outSamples_ = swrRet * 2; // each sample occupies 2 bytes - *outbytes = outSamples * 2; + *outbytes = outSamples_ * 2; // Save outbuf into pcm audio, you can uncomment this line to save and check the decoded audio into pcm file. // SaveAudio("dump.pcm", outbuf, *outbytes); @@ -446,7 +436,8 @@ u32 AuCtx::AuDecode(u32 pcmAddr) { if (!sourcebuff.empty()) { // FFmpeg doesn't seem to search for a sync for us, so let's do that. int nextSync = (int)FindNextMp3Sync(); - decoder->Decode(&sourcebuff[nextSync], (int)sourcebuff.size() - nextSync, outbuf, &outpcmbufsize); + int inbytesConsumed = 0; + decoder->Decode(&sourcebuff[nextSync], (int)sourcebuff.size() - nextSync, &inbytesConsumed, outbuf, &outpcmbufsize); if (outpcmbufsize == 0) { // Nothing was output, hopefully we're at the end of the stream. @@ -456,7 +447,7 @@ u32 AuCtx::AuDecode(u32 pcmAddr) { // Update our total decoded samples, but don't count stereo. SumDecodedSamples += decoder->GetOutSamples() / 2; // get consumed source length - int srcPos = decoder->GetSourcePos() + nextSync; + int srcPos = inbytesConsumed + nextSync; // remove the consumed source if (srcPos > 0) sourcebuff.erase(sourcebuff.begin(), sourcebuff.begin() + srcPos); diff --git a/Core/HW/SimpleAudioDec.h b/Core/HW/SimpleAudioDec.h index b227b3889a..d000850133 100644 --- a/Core/HW/SimpleAudioDec.h +++ b/Core/HW/SimpleAudioDec.h @@ -39,12 +39,12 @@ public: virtual PSPAudioType GetAudioType() const = 0; - virtual bool Decode(const uint8_t* inbuf, int inbytes, uint8_t *outbuf, int *outbytes) = 0; + // inbytesConsumed can include skipping metadata. + virtual bool Decode(const uint8_t *inbuf, int inbytes, int *inbytesConsumed, uint8_t *outbuf, int *outbytes) = 0; virtual bool IsOK() const = 0; // These two are only ever called after Decode, so can initialize on first. virtual int GetOutSamples() const = 0; - virtual int GetSourcePos() const = 0; virtual void SetChannels(int channels) = 0; diff --git a/UI/BackgroundAudio.cpp b/UI/BackgroundAudio.cpp index fc528274fa..0231c77edc 100644 --- a/UI/BackgroundAudio.cpp +++ b/UI/BackgroundAudio.cpp @@ -218,7 +218,8 @@ public: while (bgQueue.size() < (size_t)(len * 2)) { int outBytes = 0; - decoder_->Decode(wave_.raw_data + raw_offset_, wave_.raw_bytes_per_frame, (uint8_t *)buffer_, &outBytes); + int inbytesConsumed = 0; + decoder_->Decode(wave_.raw_data + raw_offset_, wave_.raw_bytes_per_frame, &inbytesConsumed, (uint8_t *)buffer_, &outBytes); if (!outBytes) return false; diff --git a/ext/at3_standalone/compat.h b/ext/at3_standalone/compat.h index 7e236bb9cb..4eac214f2e 100644 --- a/ext/at3_standalone/compat.h +++ b/ext/at3_standalone/compat.h @@ -2,7 +2,7 @@ #include -// Compat hacks +// Compat hacks to make an FFMPEG-like environment, so we can keep the core code mostly unchanged. #if defined(__GNUC__) #define DECLARE_ALIGNED(n,t,v) t __attribute__ ((aligned (n))) v From ff372f878db48909cb970040e373e93eaf01b3af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Thu, 11 Apr 2024 16:54:29 +0200 Subject: [PATCH 100/719] Minor code cleanup --- Core/HLE/sceAtrac.cpp | 57 +++++++++++++++--------------------- Core/HLE/sceAtrac.h | 10 +++---- Core/HW/Atrac3Standalone.cpp | 4 +-- 3 files changed, 29 insertions(+), 42 deletions(-) diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp index 7fcfc949d5..db27f22461 100644 --- a/Core/HLE/sceAtrac.cpp +++ b/Core/HLE/sceAtrac.cpp @@ -179,20 +179,9 @@ struct AVPacket { #endif struct Atrac { - Atrac() : atracID_(-1), dataBuf_(0), decodePos_(0), bufferPos_(0), - channels_(0), outputChannels_(2), bitrate_(64), bytesPerFrame_(0), bufferMaxSize_(0), jointStereo_(0), - currentSample_(0), endSample_(0), firstSampleOffset_(0), dataOff_(0), - loopStartSample_(-1), loopEndSample_(-1), loopNum_(0), - failedDecode_(false), ignoreDataBuf_(false), codecType_(0), - bufferState_(ATRAC_STATUS_NO_DATA) { + Atrac() { memset(&first_, 0, sizeof(first_)); memset(&second_, 0, sizeof(second_)); -#ifdef USE_FFMPEG - codecCtx_ = nullptr; - swrCtx_ = nullptr; - frame_ = nullptr; - packet_ = nullptr; -#endif // USE_FFMPEG context_ = 0; } @@ -401,40 +390,40 @@ struct Atrac { return remainingBytes / bytesPerFrame_; } - int atracID_; - u8 *dataBuf_; + int atracID_ = -1; + u8 *dataBuf_ = nullptr; - u32 decodePos_; + u32 decodePos_ = 0; // Used by low-level decoding and to track streaming. - u32 bufferPos_; - u32 bufferValidBytes_; + u32 bufferPos_ = 0; + u32 bufferValidBytes_ = 0; u32 bufferHeaderSize_ = 0; - u16 channels_; - u16 outputChannels_; - u32 bitrate_; - u16 bytesPerFrame_; - u32 bufferMaxSize_; - int jointStereo_; + u16 channels_ = 0; + u16 outputChannels_ = 2; + u32 bitrate_ = 64; + u16 bytesPerFrame_ = 0; + u32 bufferMaxSize_ = 0; + int jointStereo_ = 0; - int currentSample_; - int endSample_; - int firstSampleOffset_; + int currentSample_ = 0; + int endSample_ = 0; + int firstSampleOffset_ = 0; // Offset of the first sample in the input buffer - int dataOff_; + int dataOff_ = 0; std::vector loopinfo_; - int loopStartSample_; - int loopEndSample_; - int loopNum_; + int loopStartSample_ = -1; + int loopEndSample_ = -1; + int loopNum_ = 0; - bool failedDecode_; + bool failedDecode_ = false; // Indicates that the dataBuf_ array should not be used. - bool ignoreDataBuf_; + bool ignoreDataBuf_ = false; - u32 codecType_; - AtracStatus bufferState_; + u32 codecType_ = 0; + AtracStatus bufferState_ = ATRAC_STATUS_NO_DATA; InputBuffer first_; InputBuffer second_; diff --git a/Core/HLE/sceAtrac.h b/Core/HLE/sceAtrac.h index f0914c1c63..cc2c14e943 100644 --- a/Core/HLE/sceAtrac.h +++ b/Core/HLE/sceAtrac.h @@ -48,8 +48,7 @@ typedef AtracStatus AtracStatus_le; typedef swap_struct_t > AtracStatus_le; #endif -typedef struct -{ +struct SceAtracIdInfo { u32_le decodePos; // 0 u32_le endSample; // 4 u32_le loopStart; // 8 @@ -76,15 +75,14 @@ typedef struct u32_le secondBufferByte; // 68 // make sure the size is 128 u8 unk[56]; -} SceAtracIdInfo; +}; -typedef struct -{ +struct SceAtracId { // size 128 SceAudiocodecCodec codec; // size 128 SceAtracIdInfo info; -} SceAtracId; +}; // provide some decoder interface diff --git a/Core/HW/Atrac3Standalone.cpp b/Core/HW/Atrac3Standalone.cpp index da1ccdcd21..1e505c02db 100644 --- a/Core/HW/Atrac3Standalone.cpp +++ b/Core/HW/Atrac3Standalone.cpp @@ -16,13 +16,13 @@ inline int16_t clamp16(float f) { class Atrac3Audio : public AudioDecoder { public: Atrac3Audio(PSPAudioType audioType, int channels, size_t blockAlign, const uint8_t *extraData, size_t extraDataSize) : audioType_(audioType) { - blockAlign_ = blockAlign; + blockAlign_ = (int)blockAlign; if (audioType == PSP_CODEC_AT3PLUS) { at3pCtx_ = atrac3p_alloc(channels, &blockAlign_); if (at3pCtx_) codecOpen_ = true; } else if (audioType_ == PSP_CODEC_AT3) { - at3Ctx_ = atrac3_alloc(channels, &blockAlign_, extraData, extraDataSize); + at3Ctx_ = atrac3_alloc(channels, &blockAlign_, extraData, (int)extraDataSize); if (at3Ctx_) codecOpen_ = true; } From 39b884cfb35724ecd977901ecf6921f120e06573 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Thu, 11 Apr 2024 17:25:36 +0200 Subject: [PATCH 101/719] Atrac3/3+: Improve error handling --- Core/HLE/sceAtrac.cpp | 8 +++----- Core/HW/Atrac3Standalone.cpp | 5 ++--- ext/at3_standalone/at3_decoders.h | 4 ++-- ext/at3_standalone/atrac3.cpp | 10 ++++------ ext/at3_standalone/atrac3plusdec.cpp | 12 ++++++------ 5 files changed, 17 insertions(+), 22 deletions(-) diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp index db27f22461..50bd94d83f 100644 --- a/Core/HLE/sceAtrac.cpp +++ b/Core/HLE/sceAtrac.cpp @@ -543,7 +543,7 @@ struct Atrac { return true; } - bool FillLowLevelPacket(u8 *ptr) { + AtracDecodeResult DecodeLowLevelPacket(u8 *ptr) { #ifdef USE_FFMPEG av_init_packet(packet_); @@ -551,7 +551,7 @@ struct Atrac { packet_->size = bytesPerFrame_; packet_->pos = 0; #endif // USE_FFMPEG - return true; + return DecodePacket(); } AtracDecodeResult DecodePacket() { @@ -2516,9 +2516,7 @@ static int sceAtracLowLevelDecode(int atracID, u32 sourceAddr, u32 sourceBytesCo int numSamples = (atrac->codecType_ == PSP_MODE_AT_3_PLUS ? ATRAC3PLUS_MAX_SAMPLES : ATRAC3_MAX_SAMPLES); if (!atrac->failedDecode_) { - atrac->FillLowLevelPacket(srcp); - - AtracDecodeResult res = atrac->DecodePacket(); + AtracDecodeResult res = atrac->DecodeLowLevelPacket(srcp); if (res == ATDECODE_GOTFRAME) { #ifdef USE_FFMPEG // got a frame diff --git a/Core/HW/Atrac3Standalone.cpp b/Core/HW/Atrac3Standalone.cpp index 1e505c02db..27646a35c8 100644 --- a/Core/HW/Atrac3Standalone.cpp +++ b/Core/HW/Atrac3Standalone.cpp @@ -64,13 +64,12 @@ public: } blockAlign_ = inbytes; // We just call the decode function directly without going through the whole packet machinery. - int got_frame = 0; int result; int nb_samples = 0; if (audioType_ == PSP_CODEC_AT3PLUS) { - result = atrac3p_decode_frame(at3pCtx_, buffers_, &nb_samples, &got_frame, inbuf, inbytes); + result = atrac3p_decode_frame(at3pCtx_, buffers_, &nb_samples, inbuf, inbytes); } else { - result = atrac3_decode_frame(at3Ctx_, buffers_, &nb_samples, &got_frame, inbuf, inbytes); + result = atrac3_decode_frame(at3Ctx_, buffers_, &nb_samples, inbuf, inbytes); } if (result < 0) { *outbytes = 0; diff --git a/ext/at3_standalone/at3_decoders.h b/ext/at3_standalone/at3_decoders.h index 0762c1a72d..97c9145e68 100644 --- a/ext/at3_standalone/at3_decoders.h +++ b/ext/at3_standalone/at3_decoders.h @@ -13,9 +13,9 @@ struct ATRAC3PContext; ATRAC3Context *atrac3_alloc(int channels, int *block_align, const uint8_t *extra_data, int extra_data_size); void atrac3_free(ATRAC3Context *ctx); void atrac3_flush_buffers(ATRAC3Context *ctx); -int atrac3_decode_frame(ATRAC3Context *ctx, float *out_data[2], int *nb_samples, int *got_frame_ptr, const uint8_t *buf, int buf_size); +int atrac3_decode_frame(ATRAC3Context *ctx, float *out_data[2], int *nb_samples, const uint8_t *buf, int buf_size); ATRAC3PContext *atrac3p_alloc(int channels, int *block_align); void atrac3p_free(ATRAC3PContext *ctx); void atrac3p_flush_buffers(ATRAC3PContext *ctx); -int atrac3p_decode_frame(ATRAC3PContext *ctx, float *out_data[2], int *nb_samples, int *got_frame_ptr, const uint8_t *buf, int buf_size); +int atrac3p_decode_frame(ATRAC3PContext *ctx, float *out_data[2], int *nb_samples, const uint8_t *buf, int buf_size); diff --git a/ext/at3_standalone/atrac3.cpp b/ext/at3_standalone/atrac3.cpp index 387378b1ee..d267733a9e 100644 --- a/ext/at3_standalone/atrac3.cpp +++ b/ext/at3_standalone/atrac3.cpp @@ -729,7 +729,7 @@ static int decode_frame(ATRAC3Context *q, int block_align, int channels, const u return 0; } -int atrac3_decode_frame(ATRAC3Context *ctx, float *out_data[2], int *nb_samples, int *got_frame_ptr, const uint8_t *buf, int buf_size) +int atrac3_decode_frame(ATRAC3Context *ctx, float *out_data[2], int *nb_samples, const uint8_t *buf, int buf_size) { int ret; const uint8_t *databuf; @@ -737,15 +737,14 @@ int atrac3_decode_frame(ATRAC3Context *ctx, float *out_data[2], int *nb_samples, const int block_align = ctx->block_align; const int channels = ctx->channels; + *nb_samples = 0; + if (buf_size < block_align) { av_log(AV_LOG_ERROR, "Frame too small (%d bytes). Truncated file?\n", buf_size); return AVERROR_INVALIDDATA; } - /* get output buffer */ - *nb_samples = SAMPLES_PER_FRAME; - /* Check if we need to descramble and what buffer to pass on. */ if (ctx->scrambled_stream) { decode_bytes(buf, ctx->decoded_bytes_buffer, block_align); @@ -760,8 +759,7 @@ int atrac3_decode_frame(ATRAC3Context *ctx, float *out_data[2], int *nb_samples, return ret; } - *got_frame_ptr = 1; - + *nb_samples = SAMPLES_PER_FRAME; return block_align; } diff --git a/ext/at3_standalone/atrac3plusdec.cpp b/ext/at3_standalone/atrac3plusdec.cpp index f46a1c2301..678f564115 100644 --- a/ext/at3_standalone/atrac3plusdec.cpp +++ b/ext/at3_standalone/atrac3plusdec.cpp @@ -305,13 +305,14 @@ static void reconstruct_frame(ATRAC3PContext *ctx, Atrac3pChanUnitCtx *ch_unit, FFSWAP(Atrac3pWaveSynthParams *, ch_unit->waves_info, ch_unit->waves_info_prev); } -int atrac3p_decode_frame(ATRAC3PContext *ctx, float *out_data[2], int *nb_samples, int *got_frame_ptr, const uint8_t *avpkt_data, int avpkt_size) +int atrac3p_decode_frame(ATRAC3PContext *ctx, float *out_data[2], int *nb_samples, const uint8_t *indata, int indata_size) { int i, ret, ch_unit_id, ch_block = 0, out_ch_index = 0, channels_to_process; float **samples_p = out_data; - *nb_samples = ATRAC3P_FRAME_SAMPLES; - if ((ret = init_get_bits8(&ctx->gb, avpkt_data, avpkt_size)) < 0) + *nb_samples = 0; + + if ((ret = init_get_bits8(&ctx->gb, indata, indata_size)) < 0) return ret; if (get_bits1(&ctx->gb)) { @@ -353,9 +354,8 @@ int atrac3p_decode_frame(ATRAC3PContext *ctx, float *out_data[2], int *nb_sample out_ch_index += channels_to_process; } - *got_frame_ptr = 1; - - return FFMIN(ctx->block_align, avpkt_size); + *nb_samples = ATRAC3P_FRAME_SAMPLES; + return FFMIN(ctx->block_align, indata_size); } void atrac3p_flush_buffers(ATRAC3PContext *ctx) { From 70a13a4df54bfb8c105a5db3bc556ef6a88b00f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Thu, 11 Apr 2024 17:31:33 +0200 Subject: [PATCH 102/719] Implement logging for at3_standalone --- ext/at3_standalone/compat.cpp | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/ext/at3_standalone/compat.cpp b/ext/at3_standalone/compat.cpp index cba19869da..b46ae77af8 100644 --- a/ext/at3_standalone/compat.cpp +++ b/ext/at3_standalone/compat.cpp @@ -1,3 +1,25 @@ -#include "compat.h" +#include +#include -void av_log(int level, const char *fmt, ...) {} +#include "compat.h" +#include "Common/Log.h" + +void av_log(int level, const char *fmt, ...) { + char buffer[512]; + va_list vl; + va_start(vl, fmt); + size_t retval = vsnprintf(buffer, sizeof(buffer), fmt, vl); + va_end(vl); + + // lazy + switch (level) { + case AV_LOG_DEBUG: + case AV_LOG_TRACE: + case AV_LOG_VERBOSE: DEBUG_LOG(ME, "Atrac3/3+: %s", buffer); break; + case AV_LOG_ERROR: ERROR_LOG(ME, "Atrac3/3+: %s", buffer); break; + case AV_LOG_INFO: INFO_LOG(ME, "Atrac3/3+: %s", buffer); break; + case AV_LOG_WARNING: + default: + WARN_LOG(ME, "Atrac3/3+: %s", buffer); break; + } +} From 117e5f088c81c4a645f655f0d559ac79371f5f4d Mon Sep 17 00:00:00 2001 From: Herman Semenov Date: Fri, 12 Apr 2024 13:54:26 +0300 Subject: [PATCH 103/719] [UI] Fixed 'info' always true --- UI/DisplayLayoutScreen.cpp | 2 +- UI/GameSettingsScreen.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/UI/DisplayLayoutScreen.cpp b/UI/DisplayLayoutScreen.cpp index a1920f9897..93e09d6c2b 100644 --- a/UI/DisplayLayoutScreen.cpp +++ b/UI/DisplayLayoutScreen.cpp @@ -172,7 +172,7 @@ static std::string PostShaderTranslateName(std::string_view value) { const ShaderInfo *info = GetPostShaderInfo(value); if (info) { auto ps = GetI18NCategory(I18NCat::POSTSHADERS); - return std::string(ps->T(value, info ? info->name : value)); + return std::string(ps->T(value, info->name)); } else { return std::string(value); } diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp index 5d2ba62883..3e5202ad94 100644 --- a/UI/GameSettingsScreen.cpp +++ b/UI/GameSettingsScreen.cpp @@ -163,7 +163,7 @@ static std::string TextureTranslateName(std::string_view value) { const TextureShaderInfo *info = GetTextureShaderInfo(value); if (info) { auto ts = GetI18NCategory(I18NCat::TEXTURESHADERS); - return std::string(ts->T(value, info ? info->name.c_str() : value)); + return std::string(ts->T(value, info->name.c_str())); } else { return std::string(value); } @@ -210,7 +210,7 @@ static std::string PostShaderTranslateName(std::string_view value) { const ShaderInfo *info = GetPostShaderInfo(value); if (info) { auto ps = GetI18NCategory(I18NCat::POSTSHADERS); - return std::string(ps->T(value, info ? info->name : value)); + return std::string(ps->T(value, info->name)); } else { return std::string(value); } From c43442f801c04fb78c1d890c0652a9a51cb10e8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Fri, 12 Apr 2024 10:28:13 +0200 Subject: [PATCH 104/719] Improve and cleanup logging in sceAtrac --- Core/HLE/sceAtrac.cpp | 278 ++++++++++++++++++++---------------------- 1 file changed, 132 insertions(+), 146 deletions(-) diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp index 50bd94d83f..6f2455fcce 100644 --- a/Core/HLE/sceAtrac.cpp +++ b/Core/HLE/sceAtrac.cpp @@ -727,7 +727,6 @@ static Atrac *getAtrac(int atracID) { // This value is actually abused by games to store the SAS voice number. atrac->loopNum_ = atrac->context_->info.loopNum; } - return atrac; } @@ -1072,15 +1071,25 @@ u32 _AtracAddStreamData(int atracID, u32 bufPtr, u32 bytesToAdd) { return 0; } +static u32 AtracValidateData(const Atrac *atrac) { + if (!atrac) { + return hleLogError(ME, ATRAC_ERROR_BAD_ATRACID, "bad atrac ID"); + } else if (atrac->bufferState_ == ATRAC_STATUS_NO_DATA) { + return hleLogError(ME, ATRAC_ERROR_NO_DATA, "no data"); + } else { + return 0; + } +} + static u32 AtracValidateManaged(const Atrac *atrac) { if (!atrac) { return hleLogError(ME, ATRAC_ERROR_BAD_ATRACID, "bad atrac ID"); } else if (atrac->bufferState_ == ATRAC_STATUS_NO_DATA) { return hleLogError(ME, ATRAC_ERROR_NO_DATA, "no data"); } else if (atrac->bufferState_ == ATRAC_STATUS_LOW_LEVEL) { - return hleLogError(ME, ATRAC_ERROR_IS_LOW_LEVEL, "cannot use for low level stream"); + return hleLogError(ME, ATRAC_ERROR_IS_LOW_LEVEL, "low level stream, can't use"); } else if (atrac->bufferState_ == ATRAC_STATUS_FOR_SCESAS) { - return hleLogError(ME, ATRAC_ERROR_IS_FOR_SCESAS, "cannot use for SAS stream"); + return hleLogError(ME, ATRAC_ERROR_IS_FOR_SCESAS, "SAS stream, can't use"); } else { return 0; } @@ -1469,146 +1478,130 @@ static u32 sceAtracGetBufferInfoForResetting(int atracID, int sample, u32 buffer return hleLogWarning(ME, ATRAC_ERROR_BAD_SAMPLE, "invalid sample position"); } else { AtracGetResetBufferInfo(atrac, bufferInfo, sample); - return hleLogSuccessInfoI(ME, 0); } } static u32 sceAtracGetBitrate(int atracID, u32 outBitrateAddr) { Atrac *atrac = getAtrac(atracID); - if (!atrac) { - ERROR_LOG(ME, "sceAtracGetBitrate(%i, %08x): bad atrac ID", atracID, outBitrateAddr); - return ATRAC_ERROR_BAD_ATRACID; - } else if (!atrac->dataBuf_) { - ERROR_LOG(ME, "sceAtracGetBitrate(%i, %08x): no data", atracID, outBitrateAddr); - return ATRAC_ERROR_NO_DATA; + u32 err = AtracValidateData(atrac); + if (err != 0) { + // Already logged. + return err; + } + + atrac->bitrate_ = (atrac->bytesPerFrame_ * 352800) / 1000; + if (atrac->codecType_ == PSP_MODE_AT_3_PLUS) + atrac->bitrate_ = ((atrac->bitrate_ >> 11) + 8) & 0xFFFFFFF0; + else + atrac->bitrate_ = (atrac->bitrate_ + 511) >> 10; + if (Memory::IsValidAddress(outBitrateAddr)) { + Memory::WriteUnchecked_U32(atrac->bitrate_, outBitrateAddr); + return hleLogSuccessI(ME, 0); } else { - atrac->bitrate_ = (atrac->bytesPerFrame_ * 352800) / 1000; - if (atrac->codecType_ == PSP_MODE_AT_3_PLUS) - atrac->bitrate_ = ((atrac->bitrate_ >> 11) + 8) & 0xFFFFFFF0; - else - atrac->bitrate_ = (atrac->bitrate_ + 511) >> 10; - if (Memory::IsValidAddress(outBitrateAddr)) { - Memory::Write_U32(atrac->bitrate_, outBitrateAddr); - DEBUG_LOG(ME, "sceAtracGetBitrate(%i, %08x[%d])", atracID, outBitrateAddr, atrac->bitrate_); - } - else - DEBUG_LOG_REPORT(ME, "sceAtracGetBitrate(%i, %08x[%d]) invalid address", atracID, outBitrateAddr, atrac->bitrate_); + return hleLogError(ME, 0, "invalid address"); } - return 0; } static u32 sceAtracGetChannel(int atracID, u32 channelAddr) { Atrac *atrac = getAtrac(atracID); - if (!atrac) { - ERROR_LOG(ME, "sceAtracGetChannel(%i, %08x): bad atrac ID", atracID, channelAddr); - return ATRAC_ERROR_BAD_ATRACID; - } else if (!atrac->dataBuf_) { - ERROR_LOG(ME, "sceAtracGetChannel(%i, %08x): no data", atracID, channelAddr); - return ATRAC_ERROR_NO_DATA; + u32 err = AtracValidateData(atrac); + if (err != 0) { + // Already logged. + return err; + } + + if (Memory::IsValidAddress(channelAddr)){ + Memory::WriteUnchecked_U32(atrac->channels_, channelAddr); + return hleLogSuccessI(ME, 0); } else { - if (Memory::IsValidAddress(channelAddr)){ - Memory::Write_U32(atrac->channels_, channelAddr); - DEBUG_LOG(ME, "sceAtracGetChannel(%i, %08x[%d])", atracID, channelAddr, atrac->channels_); - } - else - DEBUG_LOG_REPORT(ME, "sceAtracGetChannel(%i, %08x[%d]) invalid address", atracID, channelAddr, atrac->channels_); + return hleLogError(ME, 0, "invalid address"); } - return 0; } static u32 sceAtracGetLoopStatus(int atracID, u32 loopNumAddr, u32 statusAddr) { Atrac *atrac = getAtrac(atracID); - if (!atrac) { - ERROR_LOG(ME, "sceAtracGetLoopStatus(%i, %08x, %08x): bad atrac ID", atracID, loopNumAddr, statusAddr); - return ATRAC_ERROR_BAD_ATRACID; - } else if (!atrac->dataBuf_) { - ERROR_LOG(ME, "sceAtracGetLoopStatus(%i, %08x, %08x): no data", atracID, loopNumAddr, statusAddr); - return ATRAC_ERROR_NO_DATA; + u32 err = AtracValidateData(atrac); + if (err != 0) { + // Already logged. + return err; + } + + if (Memory::IsValidAddress(loopNumAddr)) + Memory::WriteUnchecked_U32(atrac->loopNum_, loopNumAddr); + // return audio's loopinfo in at3 file + if (Memory::IsValidAddress(statusAddr)) { + if (atrac->loopinfo_.size() > 0) + Memory::WriteUnchecked_U32(1, statusAddr); + else + Memory::WriteUnchecked_U32(0, statusAddr); + return hleLogSuccessI(ME, 0); } else { - DEBUG_LOG(ME, "sceAtracGetLoopStatus(%i, %08x, %08x)", atracID, loopNumAddr, statusAddr); - if (Memory::IsValidAddress(loopNumAddr)) - Memory::Write_U32(atrac->loopNum_, loopNumAddr); - // return audio's loopinfo in at3 file - if (Memory::IsValidAddress(statusAddr)) { - if (atrac->loopinfo_.size() > 0) - Memory::Write_U32(1, statusAddr); - else - Memory::Write_U32(0, statusAddr); - } + return hleLogError(ME, 0, "invalid address"); } - return 0; } static u32 sceAtracGetInternalErrorInfo(int atracID, u32 errorAddr) { Atrac *atrac = getAtrac(atracID); - if (!atrac) { - ERROR_LOG(ME, "sceAtracGetInternalErrorInfo(%i, %08x): bad atrac ID", atracID, errorAddr); - return ATRAC_ERROR_BAD_ATRACID; - } else if (!atrac->dataBuf_) { - WARN_LOG(ME, "sceAtracGetInternalErrorInfo(%i, %08x): no data", atracID, errorAddr); - return ATRAC_ERROR_NO_DATA; - } else { - ERROR_LOG(ME, "UNIMPL sceAtracGetInternalErrorInfo(%i, %08x)", atracID, errorAddr); - if (Memory::IsValidAddress(errorAddr)) - Memory::Write_U32(0, errorAddr); + u32 err = AtracValidateData(atrac); + if (err != 0) { + // Already logged. + return err; } + ERROR_LOG(ME, "UNIMPL sceAtracGetInternalErrorInfo(%i, %08x)", atracID, errorAddr); + if (Memory::IsValidAddress(errorAddr)) + Memory::WriteUnchecked_U32(0, errorAddr); return 0; } static u32 sceAtracGetMaxSample(int atracID, u32 maxSamplesAddr) { Atrac *atrac = getAtrac(atracID); - if (!atrac) { - ERROR_LOG(ME, "sceAtracGetMaxSample(%i, %08x): bad atrac ID", atracID, maxSamplesAddr); - return ATRAC_ERROR_BAD_ATRACID; - } else if (!atrac->dataBuf_) { - ERROR_LOG(ME, "sceAtracGetMaxSample(%i, %08x): no data", atracID, maxSamplesAddr); - return ATRAC_ERROR_NO_DATA; + u32 err = AtracValidateData(atrac); + if (err != 0) { + // Already logged. + return err; + } + + if (Memory::IsValidAddress(maxSamplesAddr)) { + Memory::WriteUnchecked_U32(atrac->SamplesPerFrame(), maxSamplesAddr); + return hleLogSuccessI(ME, 0); } else { - DEBUG_LOG(ME, "sceAtracGetMaxSample(%i, %08x)", atracID, maxSamplesAddr); - if (Memory::IsValidAddress(maxSamplesAddr)) { - Memory::Write_U32(atrac->SamplesPerFrame(), maxSamplesAddr); - } + return hleLogError(ME, 0, "invalid address"); } - return 0; } static u32 sceAtracGetNextDecodePosition(int atracID, u32 outposAddr) { Atrac *atrac = getAtrac(atracID); - if (!atrac) { - ERROR_LOG(ME, "sceAtracGetNextDecodePosition(%i, %08x): bad atrac ID", atracID, outposAddr); - return ATRAC_ERROR_BAD_ATRACID; - } else if (!atrac->dataBuf_) { - ERROR_LOG(ME, "sceAtracGetNextDecodePosition(%i, %08x): no data", atracID, outposAddr); - return ATRAC_ERROR_NO_DATA; - } else { - DEBUG_LOG(ME, "sceAtracGetNextDecodePosition(%i, %08x)", atracID, outposAddr); + u32 err = AtracValidateData(atrac); + if (err != 0) { + // Already logged. + return err; + } + + if (Memory::IsValidAddress(outposAddr)) { if (atrac->currentSample_ >= atrac->endSample_) { - if (Memory::IsValidAddress(outposAddr)) - Memory::Write_U32(0, outposAddr); - return ATRAC_ERROR_ALL_DATA_DECODED; + Memory::WriteUnchecked_U32(0, outposAddr); + return hleLogSuccessI(ME, ATRAC_ERROR_ALL_DATA_DECODED, "all data decoded"); } else { - if (Memory::IsValidAddress(outposAddr)) - Memory::Write_U32(atrac->currentSample_, outposAddr); + Memory::WriteUnchecked_U32(atrac->currentSample_, outposAddr); + return hleLogSuccessI(ME, 0); } + } else { + return hleLogError(ME, 0, "invalid address"); } - return 0; } static u32 sceAtracGetNextSample(int atracID, u32 outNAddr) { Atrac *atrac = getAtrac(atracID); - if (!atrac) { - ERROR_LOG(ME, "sceAtracGetNextSample(%i, %08x): bad atrac ID", atracID, outNAddr); - return ATRAC_ERROR_BAD_ATRACID; - } else if (!atrac->dataBuf_) { - ERROR_LOG(ME, "sceAtracGetNextSample(%i, %08x): no data", atracID, outNAddr); - return ATRAC_ERROR_NO_DATA; + u32 err = AtracValidateData(atrac); + if (err != 0) { + // Already logged. + return err; } else { if (atrac->currentSample_ >= atrac->endSample_) { if (Memory::IsValidAddress(outNAddr)) - Memory::Write_U32(0, outNAddr); - DEBUG_LOG(ME, "sceAtracGetNextSample(%i, %08x): 0 samples left", atracID, outNAddr); - return 0; + Memory::WriteUnchecked_U32(0, outNAddr); + return hleLogSuccessI(ME, 0, "0 samples left"); } else { // It seems like the PSP aligns the sample position to 0x800...? u32 skipSamples = atrac->firstSampleOffset_ + atrac->FirstOffsetExtra(); @@ -1628,11 +1621,10 @@ static u32 sceAtracGetNextSample(int atracID, u32 outNAddr) { atrac->bufferState_ = ATRAC_STATUS_ALL_DATA_LOADED; } if (Memory::IsValidAddress(outNAddr)) - Memory::Write_U32(numSamples, outNAddr); - DEBUG_LOG(ME, "sceAtracGetNextSample(%i, %08x): %d samples left", atracID, outNAddr, numSamples); + Memory::WriteUnchecked_U32(numSamples, outNAddr); + return hleLogSuccessI(ME, 0, "%d samples left", numSamples); } } - return 0; } // Obtains the number of frames remaining in the buffer which can be decoded. @@ -1724,11 +1716,11 @@ static u32 sceAtracGetStreamDataInfo(int atracID, u32 writePtrAddr, u32 writable atrac->CalculateStreamInfo(&readOffset); if (Memory::IsValidAddress(writePtrAddr)) - Memory::Write_U32(atrac->first_.addr + atrac->first_.offset, writePtrAddr); + Memory::WriteUnchecked_U32(atrac->first_.addr + atrac->first_.offset, writePtrAddr); if (Memory::IsValidAddress(writableBytesAddr)) - Memory::Write_U32(atrac->first_.writableBytes, writableBytesAddr); + Memory::WriteUnchecked_U32(atrac->first_.writableBytes, writableBytesAddr); if (Memory::IsValidAddress(readOffsetAddr)) - Memory::Write_U32(readOffset, readOffsetAddr); + Memory::WriteUnchecked_U32(readOffset, readOffsetAddr); return hleLogSuccessI(ME, 0); } @@ -1989,6 +1981,7 @@ static int _AtracSetData(Atrac *atrac, u32 buffer, u32 readSize, u32 bufferSize, static int _AtracSetData(int atracID, u32 buffer, u32 readSize, u32 bufferSize, bool needReturnAtracID = false) { Atrac *atrac = getAtrac(atracID); + // Don't use AtracValidateManaged here. if (!atrac) return hleLogError(ME, ATRAC_ERROR_BAD_ATRACID, "invalid atrac ID"); int ret = _AtracSetData(atrac, buffer, readSize, bufferSize, needReturnAtracID ? atracID : 0); @@ -1998,9 +1991,11 @@ static int _AtracSetData(int atracID, u32 buffer, u32 readSize, u32 bufferSize, static u32 sceAtracSetHalfwayBuffer(int atracID, u32 buffer, u32 readSize, u32 bufferSize) { Atrac *atrac = getAtrac(atracID); + // Don't use AtracValidateManaged here. if (!atrac) { - return hleLogError(ME, ATRAC_ERROR_BAD_ATRACID, "bad atrac ID"); + return hleLogError(ME, ATRAC_ERROR_BAD_ATRACID, "invalid atrac ID"); } + if (readSize > bufferSize) { return hleLogError(ME, ATRAC_ERROR_INCORRECT_READ_SIZE, "read size too large"); } @@ -2037,8 +2032,7 @@ static u32 sceAtracSetSecondBuffer(int atracID, u32 secondBuffer, u32 secondBuff atrac->second_.addr = secondBuffer; atrac->second_.size = secondBufferSize; atrac->second_.fileoffset = secondFileOffset; - - return 0; + return hleLogSuccessI(ME, 0); } static u32 sceAtracSetData(int atracID, u32 buffer, u32 bufferSize) { @@ -2115,30 +2109,25 @@ static u32 sceAtracStartEntry() { static u32 sceAtracSetLoopNum(int atracID, int loopNum) { Atrac *atrac = getAtrac(atracID); - if (!atrac) { - ERROR_LOG(ME, "sceAtracSetLoopNum(%i, %i): bad atrac ID", atracID, loopNum); - return ATRAC_ERROR_BAD_ATRACID; - } else if (!atrac->dataBuf_) { - ERROR_LOG(ME, "sceAtracSetLoopNum(%i, %i): no data", atracID, loopNum); - return ATRAC_ERROR_NO_DATA; - } else { - if (atrac->loopinfo_.size() == 0) { - DEBUG_LOG(ME, "sceAtracSetLoopNum(%i, %i): error: no loop information", atracID, loopNum); - return ATRAC_ERROR_NO_LOOP_INFORMATION; - } - // Spammed in MHU - DEBUG_LOG(ME, "sceAtracSetLoopNum(%i, %i)", atracID, loopNum); - atrac->loopNum_ = loopNum; - if (loopNum != 0 && atrac->loopinfo_.size() == 0) { - // Just loop the whole audio - atrac->loopStartSample_ = atrac->firstSampleOffset_ + atrac->FirstOffsetExtra(); - atrac->loopEndSample_ = atrac->endSample_ + atrac->firstSampleOffset_ + atrac->FirstOffsetExtra(); - } - if (atrac->context_.IsValid()) { - _AtracGenerateContext(atrac); - } + u32 err = AtracValidateData(atrac); + if (err != 0) { + // Already logged. + return err; } - return 0; + if (atrac->loopinfo_.size() == 0) { + return hleLogError(ME, ATRAC_ERROR_NO_LOOP_INFORMATION, "no loop information"); + } + // Spammed in MHU + atrac->loopNum_ = loopNum; + if (loopNum != 0 && atrac->loopinfo_.size() == 0) { + // Just loop the whole audio + atrac->loopStartSample_ = atrac->firstSampleOffset_ + atrac->FirstOffsetExtra(); + atrac->loopEndSample_ = atrac->endSample_ + atrac->firstSampleOffset_ + atrac->FirstOffsetExtra(); + } + if (atrac->context_.IsValid()) { + _AtracGenerateContext(atrac); + } + return hleLogSuccessI(ME, 0); } static int sceAtracReinit(int at3Count, int at3plusCount) { @@ -2178,30 +2167,27 @@ static int sceAtracReinit(int at3Count, int at3plusCount) { // If we ran out of space, we still initialize some, but return an error. int result = space >= 0 ? 0 : (int)SCE_KERNEL_ERROR_OUT_OF_MEMORY; if (atracInited || next == 0) { - INFO_LOG(ME, "sceAtracReinit(%d, %d)", at3Count, at3plusCount); atracInited = true; - return result; + return hleLogSuccessInfoI(ME, result); } else { - INFO_LOG(ME, "sceAtracReinit(%d, %d): init", at3Count, at3plusCount); atracInited = true; - return hleDelayResult(result, "atrac reinit", 400); + return hleDelayResult(hleLogSuccessInfoI(ME, result), "atrac reinit", 400); } } static int sceAtracGetOutputChannel(int atracID, u32 outputChanPtr) { Atrac *atrac = getAtrac(atracID); - if (!atrac) { - ERROR_LOG(ME, "sceAtracGetOutputChannel(%i, %08x): bad atrac ID", atracID, outputChanPtr); - return ATRAC_ERROR_BAD_ATRACID; - } else if (!atrac->dataBuf_) { - ERROR_LOG(ME, "sceAtracGetOutputChannel(%i, %08x): no data", atracID, outputChanPtr); - return ATRAC_ERROR_NO_DATA; + u32 err = AtracValidateData(atrac); + if (err != 0) { + // Already logged. + return err; + } + if (Memory::IsValidAddress(outputChanPtr)) { + Memory::Write_U32(atrac->outputChannels_, outputChanPtr); + return hleLogSuccessI(ME, 0); } else { - DEBUG_LOG(ME, "sceAtracGetOutputChannel(%i, %08x)", atracID, outputChanPtr); - if (Memory::IsValidAddress(outputChanPtr)) - Memory::Write_U32(atrac->outputChannels_, outputChanPtr); + return hleLogError(ME, 0, "invalid address"); } - return 0; } static int sceAtracIsSecondBufferNeeded(int atracID) { @@ -2219,6 +2205,7 @@ static int sceAtracIsSecondBufferNeeded(int atracID) { static int sceAtracSetMOutHalfwayBuffer(int atracID, u32 buffer, u32 readSize, u32 bufferSize) { Atrac *atrac = getAtrac(atracID); + // Don't use AtracValidate* here. if (!atrac) { return hleLogError(ME, ATRAC_ERROR_BAD_ATRACID, "bad atrac ID"); } @@ -2238,14 +2225,14 @@ static int sceAtracSetMOutHalfwayBuffer(int atracID, u32 buffer, u32 readSize, u return hleReportError(ME, ATRAC_ERROR_NOT_MONO, "not mono data"); } else { atrac->outputChannels_ = 1; - ret = _AtracSetData(atracID, buffer, readSize, bufferSize); + return _AtracSetData(atracID, buffer, readSize, bufferSize); } - return ret; } // Note: This doesn't seem to be part of any available libatrac3plus library. static u32 sceAtracSetMOutData(int atracID, u32 buffer, u32 bufferSize) { Atrac *atrac = getAtrac(atracID); + // Don't use AtracValidate* here. if (!atrac) { return hleLogError(ME, ATRAC_ERROR_BAD_ATRACID, "bad atrac ID"); } @@ -2262,9 +2249,8 @@ static u32 sceAtracSetMOutData(int atracID, u32 buffer, u32 bufferSize) { return hleReportError(ME, ATRAC_ERROR_NOT_MONO, "not mono data"); } else { atrac->outputChannels_ = 1; - ret = _AtracSetData(atracID, buffer, bufferSize, bufferSize); + return _AtracSetData(atracID, buffer, bufferSize, bufferSize); } - return ret; } // Note: This doesn't seem to be part of any available libatrac3plus library. From 88a00f62b9d535cf5a8bdfe1e61d9167dbb51452 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Fri, 12 Apr 2024 10:35:00 +0200 Subject: [PATCH 105/719] Fix or supress some warnings --- ext/at3_standalone/atrac.cpp | 4 ++-- ext/at3_standalone/compat.h | 3 +++ ext/at3_standalone/mathematics.cpp | 4 ++-- ext/at3_standalone/mem.cpp | 4 ++-- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ext/at3_standalone/atrac.cpp b/ext/at3_standalone/atrac.cpp index 53b082883c..6f3d0e89a6 100644 --- a/ext/at3_standalone/atrac.cpp +++ b/ext/at3_standalone/atrac.cpp @@ -134,7 +134,7 @@ void ff_atrac_iqmf(float *inlo, float *inhi, unsigned int nIn, float *pOut, p3 = temp + 46; /* loop1 */ - for(i=0; i> 8 & 0x00ff)) #define AV_BSWAP32C(x) (AV_BSWAP16C(x) << 16 | AV_BSWAP16C((x) >> 16)) diff --git a/ext/at3_standalone/mathematics.cpp b/ext/at3_standalone/mathematics.cpp index 46e691b705..5d56b27fda 100644 --- a/ext/at3_standalone/mathematics.cpp +++ b/ext/at3_standalone/mathematics.cpp @@ -99,12 +99,12 @@ int64_t av_rescale_rnd(int64_t a, int64_t b, int64_t c, AVRounding rnd) a0 = a0 * b0 + t1a; a1 = a1 * b1 + (t1 >> 32) + (a0 < t1a); a0 += r; - a1 += a0 < r; + a1 += (int64_t)a0 < r; for (i = 63; i >= 0; i--) { a1 += a1 + ((a0 >> i) & 1); t1 += t1; - if (c <= a1) { + if (c <= (int64_t)a1) { a1 -= c; t1++; } diff --git a/ext/at3_standalone/mem.cpp b/ext/at3_standalone/mem.cpp index d9ade84de3..b63ebefa0b 100644 --- a/ext/at3_standalone/mem.cpp +++ b/ext/at3_standalone/mem.cpp @@ -50,7 +50,7 @@ int ff_fast_malloc(void *ptr, unsigned int *size, size_t min_size, int zero_real memcpy(ptr, &val, sizeof(val)); if (!val) min_size = 0; - *size = min_size; + *size = (unsigned int)min_size; return 1; } @@ -204,7 +204,7 @@ void *av_fast_realloc(void *ptr, unsigned int *size, size_t min_size) if (!ptr) min_size = 0; - *size = min_size; + *size = (unsigned int)min_size; return ptr; } From 6f11b7fe6c5f6262cac3f905294d01bbdf28bb67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Fri, 12 Apr 2024 10:36:45 +0200 Subject: [PATCH 106/719] Reorder fields in struct VLCcode for less memory use --- ext/at3_standalone/get_bits.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/at3_standalone/get_bits.cpp b/ext/at3_standalone/get_bits.cpp index 08e606cd2e..60a9977ff3 100644 --- a/ext/at3_standalone/get_bits.cpp +++ b/ext/at3_standalone/get_bits.cpp @@ -102,11 +102,11 @@ static inline uint32_t bitswap_32(uint32_t x) } typedef struct VLCcode { - uint8_t bits; - uint16_t symbol; /** codeword, with the first bit-to-be-read in the msb * (even if intended for a little-endian bitstream reader) */ uint32_t code; + uint16_t symbol; + uint8_t bits; } VLCcode; static int compare_vlcspec(const void *a, const void *b) From 3409db9b90fd7accf905a53add3aa80fa92c1c99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Fri, 12 Apr 2024 10:41:48 +0200 Subject: [PATCH 107/719] Remove line endings from atrac3+ log strings --- ext/at3_standalone/atrac3.cpp | 36 ++++++++++++++-------------- ext/at3_standalone/atrac3plus.cpp | 2 +- ext/at3_standalone/atrac3plusdec.cpp | 4 ++-- ext/at3_standalone/get_bits.cpp | 8 +++---- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/ext/at3_standalone/atrac3.cpp b/ext/at3_standalone/atrac3.cpp index d267733a9e..9e6cbcef16 100644 --- a/ext/at3_standalone/atrac3.cpp +++ b/ext/at3_standalone/atrac3.cpp @@ -578,12 +578,12 @@ static int decode_channel_sound_unit(ATRAC3Context *q, GetBitContext *gb, if (coding_mode == JOINT_STEREO && channel_num == 1) { if (get_bits(gb, 2) != 3) { - av_log(AV_LOG_ERROR,"JS mono Sound Unit id != 3.\n"); + av_log(AV_LOG_ERROR,"JS mono Sound Unit id != 3."); return AVERROR_INVALIDDATA; } } else { if (get_bits(gb, 6) != 0x28) { - av_log(AV_LOG_ERROR,"Sound Unit id != 0x28.\n"); + av_log(AV_LOG_ERROR,"Sound Unit id != 0x28."); return AVERROR_INVALIDDATA; } } @@ -741,7 +741,7 @@ int atrac3_decode_frame(ATRAC3Context *ctx, float *out_data[2], int *nb_samples, if (buf_size < block_align) { av_log(AV_LOG_ERROR, - "Frame too small (%d bytes). Truncated file?\n", buf_size); + "Frame too small (%d bytes). Truncated file?", buf_size); return AVERROR_INVALIDDATA; } @@ -755,7 +755,7 @@ int atrac3_decode_frame(ATRAC3Context *ctx, float *out_data[2], int *nb_samples, ret = decode_frame(ctx, block_align, channels, databuf, out_data); if (ret) { - av_log( AV_LOG_ERROR, "Frame decoding error!\n"); + av_log(AV_LOG_ERROR, "Frame decoding error!"); return ret; } @@ -795,7 +795,7 @@ ATRAC3Context *atrac3_alloc(int channels, int *block_align, const uint8_t *extra const uint8_t *edata_ptr = extra_data; if (channels <= 0 || channels > 2) { - av_log(AV_LOG_ERROR, "Channel configuration error!\n"); + av_log(AV_LOG_ERROR, "Channel configuration error!"); return nullptr; } @@ -816,14 +816,14 @@ ATRAC3Context *atrac3_alloc(int channels, int *block_align, const uint8_t *extra /* Take care of the codec-specific extradata. */ if (extra_data_size == 14) { /* Parse the extradata, WAV format */ - av_log(AV_LOG_DEBUG, "[0-1] %d\n", + av_log(AV_LOG_DEBUG, "[0-1] %d", bytestream_get_le16(&edata_ptr)); // Unknown value always 1 edata_ptr += 4; // samples per channel q->coding_mode = bytestream_get_le16(&edata_ptr); - av_log(AV_LOG_DEBUG,"[8-9] %d\n", + av_log(AV_LOG_DEBUG,"[8-9] %d", bytestream_get_le16(&edata_ptr)); //Dupe of coding mode frame_factor = bytestream_get_le16(&edata_ptr); // Unknown always 1 - av_log(AV_LOG_DEBUG,"[12-13] %d\n", + av_log(AV_LOG_DEBUG,"[12-13] %d", bytestream_get_le16(&edata_ptr)); // Unknown always 0 /* setup */ @@ -837,7 +837,7 @@ ATRAC3Context *atrac3_alloc(int channels, int *block_align, const uint8_t *extra q->block_align != 152 * channels * frame_factor && q->block_align != 192 * channels * frame_factor) { av_log(AV_LOG_ERROR, "Unknown frame/channel/frame_factor " - "configuration %d/%d/%d\n", block_align, + "configuration %d/%d/%d", block_align, channels, frame_factor); atrac3_free(q); return nullptr; @@ -851,7 +851,7 @@ ATRAC3Context *atrac3_alloc(int channels, int *block_align, const uint8_t *extra q->scrambled_stream = 1; } else { - av_log(AV_LOG_ERROR, "Unknown extradata size %d.\n", + av_log(AV_LOG_ERROR, "Unknown extradata size %d.", extra_data_size); atrac3_free(q); return nullptr; @@ -860,37 +860,37 @@ ATRAC3Context *atrac3_alloc(int channels, int *block_align, const uint8_t *extra /* Check the extradata */ if (version != 4) { - av_log(AV_LOG_ERROR, "Version %d != 4.\n", version); + av_log(AV_LOG_ERROR, "Version %d != 4.", version); atrac3_free(q); return nullptr; } if (samples_per_frame != SAMPLES_PER_FRAME && samples_per_frame != SAMPLES_PER_FRAME * 2) { - av_log(AV_LOG_ERROR, "Unknown amount of samples per frame %d.\n", + av_log(AV_LOG_ERROR, "Unknown amount of samples per frame %d.", samples_per_frame); atrac3_free(q); return nullptr; } if (delay != 0x88E) { - av_log(AV_LOG_ERROR, "Unknown amount of delay %x != 0x88E.\n", + av_log(AV_LOG_ERROR, "Unknown amount of delay %x != 0x88E.", delay); atrac3_free(q); return nullptr; } if (q->coding_mode == STEREO) - av_log(AV_LOG_DEBUG, "Normal stereo detected.\n"); + av_log(AV_LOG_DEBUG, "Normal stereo detected."); else if (q->coding_mode == JOINT_STEREO) { if (channels != 2) { - av_log(AV_LOG_ERROR, "Invalid coding mode\n"); + av_log(AV_LOG_ERROR, "Invalid coding mode"); atrac3_free(q); return nullptr; } - av_log(AV_LOG_DEBUG, "Joint stereo detected.\n"); + av_log(AV_LOG_DEBUG, "Joint stereo detected."); } else { - av_log(AV_LOG_ERROR, "Unknown channel coding mode %x!\n", + av_log(AV_LOG_ERROR, "Unknown channel coding mode %x!", q->coding_mode); atrac3_free(q); return nullptr; @@ -900,7 +900,7 @@ ATRAC3Context *atrac3_alloc(int channels, int *block_align, const uint8_t *extra /* initialize the MDCT transform */ if ((ret = ff_mdct_init(&q->mdct_ctx, 9, 1, 1.0 / 32768)) < 0) { - av_log(AV_LOG_ERROR, "Error initializing MDCT\n"); + av_log(AV_LOG_ERROR, "Error initializing MDCT"); av_freep(&q->decoded_bytes_buffer); return nullptr; diff --git a/ext/at3_standalone/atrac3plus.cpp b/ext/at3_standalone/atrac3plus.cpp index 583eadcd7e..d5add102c8 100644 --- a/ext/at3_standalone/atrac3plus.cpp +++ b/ext/at3_standalone/atrac3plus.cpp @@ -452,7 +452,7 @@ static int decode_channel_wordlen(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, in pos = ch_num ? chan->num_coded_vals + chan->split_point : ctx->num_quant_units - chan->split_point; if (pos > FF_ARRAY_ELEMS(chan->qu_wordlen)) { - av_log(AV_LOG_ERROR, "Split point beyond array\n"); + av_log(AV_LOG_ERROR, "Split point beyond array"); pos = FF_ARRAY_ELEMS(chan->qu_wordlen); } for (i = chan->num_coded_vals; i < pos; i++) diff --git a/ext/at3_standalone/atrac3plusdec.cpp b/ext/at3_standalone/atrac3plusdec.cpp index 678f564115..c57cee7a97 100644 --- a/ext/at3_standalone/atrac3plusdec.cpp +++ b/ext/at3_standalone/atrac3plusdec.cpp @@ -316,7 +316,7 @@ int atrac3p_decode_frame(ATRAC3PContext *ctx, float *out_data[2], int *nb_sample return ret; if (get_bits1(&ctx->gb)) { - av_log(AV_LOG_ERROR, "Invalid start bit!\n"); + av_log(AV_LOG_ERROR, "Invalid start bit!"); return AVERROR_INVALIDDATA; } @@ -329,7 +329,7 @@ int atrac3p_decode_frame(ATRAC3PContext *ctx, float *out_data[2], int *nb_sample if (ch_block >= ctx->num_channel_blocks || ctx->channel_blocks[ch_block] != ch_unit_id) { av_log(AV_LOG_ERROR, - "Frame data doesn't match channel configuration!\n"); + "Frame data doesn't match channel configuration!"); return AVERROR_INVALIDDATA; } diff --git a/ext/at3_standalone/get_bits.cpp b/ext/at3_standalone/get_bits.cpp index 60a9977ff3..d7a6da5226 100644 --- a/ext/at3_standalone/get_bits.cpp +++ b/ext/at3_standalone/get_bits.cpp @@ -162,7 +162,7 @@ static int build_table(VLC *vlc, int table_nb_bits, int nb_codes, for (k = 0; k < nb; k++) { int bits = table[j][1]; if (bits != 0 && bits != n) { - av_log( AV_LOG_ERROR, "incorrect codes\n"); + av_log(AV_LOG_ERROR, "incorrect codes"); return AVERROR_INVALIDDATA; } table[j][1] = n; //bits @@ -273,14 +273,14 @@ int ff_init_vlc_sparse(VLC *vlc_arg, int nb_bits, int nb_codes, if (!(condition)) \ continue; \ if (buf[j].bits > 3*nb_bits || buf[j].bits>32) { \ - av_log( AV_LOG_ERROR, "Too long VLC (%d) in init_vlc\n", buf[j].bits);\ + av_log(AV_LOG_ERROR, "Too long VLC (%d) in init_vlc", buf[j].bits);\ if (!(flags & INIT_VLC_USE_NEW_STATIC)) \ av_free(buf); \ return -1; \ } \ GET_DATA(buf[j].code, codes, i, codes_wrap, codes_size); \ if (buf[j].code >= (1LL<table_size != vlc->table_allocated) - av_log( AV_LOG_ERROR, "needed %d had %d\n", vlc->table_size, vlc->table_allocated); + av_log(AV_LOG_ERROR, "needed %d had %d", vlc->table_size, vlc->table_allocated); av_assert0(ret >= 0); *vlc_arg = *vlc; From 90fa6280847d9cc89768cc01015a4b7c20df93f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Fri, 12 Apr 2024 10:56:23 +0200 Subject: [PATCH 108/719] libretro buildfix --- libretro/Makefile.common | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libretro/Makefile.common b/libretro/Makefile.common index 9aa8621a94..b07317c493 100644 --- a/libretro/Makefile.common +++ b/libretro/Makefile.common @@ -23,6 +23,7 @@ INCFLAGS += \ -I$(EXTDIR)/glslang \ -I$(EXTDIR)/glslang-build \ -I$(EXTDIR)/native \ + -I$(EXTDIR)/minimp3 \ -I$(EXTDIR)/zlib \ -I$(EXTDIR)/cpu_features/include \ -I$(ZSTDDIR) \ @@ -171,7 +172,7 @@ endif SOURCES_C += $(LIBRETRODIR)/ext/glew/glew.c -SOURCES_C += \ +SOURCES_CXX += \ $(EXTDIR)/minimp3/minimp3.cpp SOURCES_C += \ @@ -261,7 +262,7 @@ SOURCES_C += \ INCFLAGS += -I$(EXTDIR)/at3_standalone -SOURCES_C += \ +SOURCES_CXX += \ ${EXTDIR}/at3_standalone/atrac.cpp \ ${EXTDIR}/at3_standalone/atrac3.cpp \ ${EXTDIR}/at3_standalone/atrac3plus.cpp \ From 1692922cd803a1f2dd77d33297d022e5d68b2136 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Fri, 12 Apr 2024 14:02:21 +0200 Subject: [PATCH 109/719] Use proper returns in _AtracDecodeData --- Core/HLE/sceAtrac.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp index 6f2455fcce..b8bcdbf54b 100644 --- a/Core/HLE/sceAtrac.cpp +++ b/Core/HLE/sceAtrac.cpp @@ -1205,11 +1205,10 @@ static u32 sceAtracAddStreamData(int atracID, u32 bytesToAdd) { u32 _AtracDecodeData(int atracID, u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u32 *finish, int *remains) { Atrac *atrac = getAtrac(atracID); - u32 ret = 0; if (atrac == NULL) { - ret = ATRAC_ERROR_BAD_ATRACID; + return ATRAC_ERROR_BAD_ATRACID; } else if (!atrac->dataBuf_) { - ret = ATRAC_ERROR_NO_DATA; + return ATRAC_ERROR_NO_DATA; } else { int loopNum = atrac->loopNum_; if (atrac->bufferState_ == ATRAC_STATUS_FOR_SCESAS) { @@ -1221,7 +1220,11 @@ u32 _AtracDecodeData(int atracID, u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u3 if (atrac->currentSample_ >= atrac->endSample_ && loopNum == 0) { *SamplesNum = 0; *finish = 1; - ret = ATRAC_ERROR_ALL_DATA_DECODED; + if (atrac->context_.IsValid()) { + // refresh context_ + _AtracGenerateContext(atrac); + } + return ATRAC_ERROR_ALL_DATA_DECODED; } else { // TODO: This isn't at all right, but at least it makes the music "last" some time. u32 numSamples = 0; @@ -1366,9 +1369,8 @@ u32 _AtracDecodeData(int atracID, u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u3 // refresh context_ _AtracGenerateContext(atrac); } + return 0; } - - return ret; } static u32 sceAtracDecodeData(int atracID, u32 outAddr, u32 numSamplesAddr, u32 finishFlagAddr, u32 remainAddr) { From ba42c07cfc9914e0289d9e5cfdd102be07477df0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Fri, 12 Apr 2024 14:11:52 +0200 Subject: [PATCH 110/719] _AtracDecodeData: Restructure the inner loop a bit. --- Core/HLE/sceAtrac.cpp | 103 +++++++++++++++++++++--------------------- 1 file changed, 52 insertions(+), 51 deletions(-) diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp index b8bcdbf54b..e60b83c358 100644 --- a/Core/HLE/sceAtrac.cpp +++ b/Core/HLE/sceAtrac.cpp @@ -1256,62 +1256,63 @@ u32 _AtracDecodeData(int atracID, u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u3 int packetSize = atrac->packet_->size; #endif // USE_FFMPEG res = atrac->DecodePacket(); - if (res == ATDECODE_FAILED) { + if (res == ATDECODE_FEEDME) { + continue; + } else if (res == ATDECODE_FAILED) { *SamplesNum = 0; *finish = 1; return ATRAC_ERROR_ALL_DATA_DECODED; - } - - if (res == ATDECODE_GOTFRAME) { -#ifdef USE_FFMPEG - // got a frame - int skipped = std::min(skipSamples, atrac->frame_->nb_samples); - skipSamples -= skipped; - numSamples = atrac->frame_->nb_samples - skipped; - - // If we're at the end, clamp to samples we want. It always returns a full chunk. - numSamples = std::min(maxSamples, numSamples); - - if (skipped > 0 && numSamples == 0) { - // Wait for the next one. - res = ATDECODE_FEEDME; - } - - if (outbuf != NULL && numSamples != 0) { - int inbufOffset = 0; - if (skipped != 0) { - AVSampleFormat fmt = (AVSampleFormat)atrac->frame_->format; - // We want the offset per channel. - inbufOffset = av_samples_get_buffer_size(NULL, 1, skipped, fmt, 1); - } - - u8 *out = outbuf; - const u8 *inbuf[2] = { - atrac->frame_->extended_data[0] + inbufOffset, - atrac->frame_->extended_data[1] + inbufOffset, - }; - int avret = swr_convert(atrac->swrCtx_, &out, numSamples, inbuf, numSamples); - if (outbufPtr != 0) { - u32 outBytes = numSamples * atrac->outputChannels_ * sizeof(s16); - if (packetAddr != 0 && MemBlockInfoDetailed()) { - char tagData[128]; - size_t tagSize = FormatMemWriteTagAt(tagData, sizeof(tagData), "AtracDecode/", packetAddr, packetSize); - NotifyMemInfo(MemBlockFlags::READ, packetAddr, packetSize, tagData, tagSize); - NotifyMemInfo(MemBlockFlags::WRITE, outbufPtr, outBytes, tagData, tagSize); - } else { - NotifyMemInfo(MemBlockFlags::WRITE, outbufPtr, outBytes, "AtracDecode"); - } - } - if (avret < 0) { - ERROR_LOG(ME, "swr_convert: Error while converting %d", avret); - } - } -#endif // USE_FFMPEG - } - if (res == ATDECODE_GOTFRAME || res == ATDECODE_BADFRAME) { - // We only want one frame per call, let's continue the next time. + } else if (res == ATDECODE_BADFRAME) { + // Retry next time. break; } + _dbg_assert_(res == ATDECODE_GOTFRAME); +#ifdef USE_FFMPEG + // got a frame + int skipped = std::min(skipSamples, atrac->frame_->nb_samples); + skipSamples -= skipped; + numSamples = atrac->frame_->nb_samples - skipped; + + // If we're at the end, clamp to samples we want. It always returns a full chunk. + numSamples = std::min(maxSamples, numSamples); + + if (skipped > 0 && numSamples == 0) { + // Wait for the next one. + res = ATDECODE_FEEDME; + } + + if (outbuf != NULL && numSamples != 0) { + int inbufOffset = 0; + if (skipped != 0) { + AVSampleFormat fmt = (AVSampleFormat)atrac->frame_->format; + // We want the offset per channel. + inbufOffset = av_samples_get_buffer_size(NULL, 1, skipped, fmt, 1); + } + + u8 *out = outbuf; + const u8 *inbuf[2] = { + atrac->frame_->extended_data[0] + inbufOffset, + atrac->frame_->extended_data[1] + inbufOffset, + }; + int avret = swr_convert(atrac->swrCtx_, &out, numSamples, inbuf, numSamples); + if (outbufPtr != 0) { + u32 outBytes = numSamples * atrac->outputChannels_ * sizeof(s16); + if (packetAddr != 0 && MemBlockInfoDetailed()) { + char tagData[128]; + size_t tagSize = FormatMemWriteTagAt(tagData, sizeof(tagData), "AtracDecode/", packetAddr, packetSize); + NotifyMemInfo(MemBlockFlags::READ, packetAddr, packetSize, tagData, tagSize); + NotifyMemInfo(MemBlockFlags::WRITE, outbufPtr, outBytes, tagData, tagSize); + } else { + NotifyMemInfo(MemBlockFlags::WRITE, outbufPtr, outBytes, "AtracDecode"); + } + } + if (avret < 0) { + ERROR_LOG(ME, "swr_convert: Error while converting %d", avret); + } + } + // We only want one frame per call, let's continue the next time. + break; +#endif // USE_FFMPEG } if (res != ATDECODE_GOTFRAME && atrac->currentSample_ < atrac->endSample_) { From 6bed7137f7992041e714e3222598fc10c4bed359 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Fri, 12 Apr 2024 14:12:57 +0200 Subject: [PATCH 111/719] Remove excessive indentation --- Core/HLE/sceAtrac.cpp | 312 +++++++++++++++++++++--------------------- 1 file changed, 156 insertions(+), 156 deletions(-) diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp index e60b83c358..795f06f854 100644 --- a/Core/HLE/sceAtrac.cpp +++ b/Core/HLE/sceAtrac.cpp @@ -1209,169 +1209,169 @@ u32 _AtracDecodeData(int atracID, u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u3 return ATRAC_ERROR_BAD_ATRACID; } else if (!atrac->dataBuf_) { return ATRAC_ERROR_NO_DATA; - } else { - int loopNum = atrac->loopNum_; - if (atrac->bufferState_ == ATRAC_STATUS_FOR_SCESAS) { - // TODO: Might need more testing. - loopNum = 0; - } + } - // We already passed the end - return an error (many games check for this.) - if (atrac->currentSample_ >= atrac->endSample_ && loopNum == 0) { - *SamplesNum = 0; - *finish = 1; - if (atrac->context_.IsValid()) { - // refresh context_ - _AtracGenerateContext(atrac); - } - return ATRAC_ERROR_ALL_DATA_DECODED; - } else { - // TODO: This isn't at all right, but at least it makes the music "last" some time. - u32 numSamples = 0; + int loopNum = atrac->loopNum_; + if (atrac->bufferState_ == ATRAC_STATUS_FOR_SCESAS) { + // TODO: Might need more testing. + loopNum = 0; + } - // It seems like the PSP aligns the sample position to 0x800...? - int offsetSamples = atrac->firstSampleOffset_ + atrac->FirstOffsetExtra(); - int skipSamples = 0; - u32 maxSamples = atrac->endSample_ + 1 - atrac->currentSample_; - u32 unalignedSamples = (offsetSamples + atrac->currentSample_) % atrac->SamplesPerFrame(); - if (unalignedSamples != 0) { - // We're off alignment, possibly due to a loop. Force it back on. - maxSamples = atrac->SamplesPerFrame() - unalignedSamples; - skipSamples = unalignedSamples; - } - - if (skipSamples != 0 && atrac->bufferHeaderSize_ == 0) { - // Skip the initial frame used to load state for the looped frame. - // TODO: We will want to actually read this in. - atrac->ConsumeFrame(); - } - - if (!atrac->failedDecode_ && (atrac->codecType_ == PSP_MODE_AT_3 || atrac->codecType_ == PSP_MODE_AT_3_PLUS)) { - atrac->SeekToSample(atrac->currentSample_); - - AtracDecodeResult res = ATDECODE_FEEDME; - while (atrac->FillPacket(-skipSamples)) { - uint32_t packetAddr = atrac->CurBufferAddress(-skipSamples); -#ifdef USE_FFMPEG - int packetSize = atrac->packet_->size; -#endif // USE_FFMPEG - res = atrac->DecodePacket(); - if (res == ATDECODE_FEEDME) { - continue; - } else if (res == ATDECODE_FAILED) { - *SamplesNum = 0; - *finish = 1; - return ATRAC_ERROR_ALL_DATA_DECODED; - } else if (res == ATDECODE_BADFRAME) { - // Retry next time. - break; - } - _dbg_assert_(res == ATDECODE_GOTFRAME); -#ifdef USE_FFMPEG - // got a frame - int skipped = std::min(skipSamples, atrac->frame_->nb_samples); - skipSamples -= skipped; - numSamples = atrac->frame_->nb_samples - skipped; - - // If we're at the end, clamp to samples we want. It always returns a full chunk. - numSamples = std::min(maxSamples, numSamples); - - if (skipped > 0 && numSamples == 0) { - // Wait for the next one. - res = ATDECODE_FEEDME; - } - - if (outbuf != NULL && numSamples != 0) { - int inbufOffset = 0; - if (skipped != 0) { - AVSampleFormat fmt = (AVSampleFormat)atrac->frame_->format; - // We want the offset per channel. - inbufOffset = av_samples_get_buffer_size(NULL, 1, skipped, fmt, 1); - } - - u8 *out = outbuf; - const u8 *inbuf[2] = { - atrac->frame_->extended_data[0] + inbufOffset, - atrac->frame_->extended_data[1] + inbufOffset, - }; - int avret = swr_convert(atrac->swrCtx_, &out, numSamples, inbuf, numSamples); - if (outbufPtr != 0) { - u32 outBytes = numSamples * atrac->outputChannels_ * sizeof(s16); - if (packetAddr != 0 && MemBlockInfoDetailed()) { - char tagData[128]; - size_t tagSize = FormatMemWriteTagAt(tagData, sizeof(tagData), "AtracDecode/", packetAddr, packetSize); - NotifyMemInfo(MemBlockFlags::READ, packetAddr, packetSize, tagData, tagSize); - NotifyMemInfo(MemBlockFlags::WRITE, outbufPtr, outBytes, tagData, tagSize); - } else { - NotifyMemInfo(MemBlockFlags::WRITE, outbufPtr, outBytes, "AtracDecode"); - } - } - if (avret < 0) { - ERROR_LOG(ME, "swr_convert: Error while converting %d", avret); - } - } - // We only want one frame per call, let's continue the next time. - break; -#endif // USE_FFMPEG - } - - if (res != ATDECODE_GOTFRAME && atrac->currentSample_ < atrac->endSample_) { - // Never got a frame. We may have dropped a GHA frame or otherwise have a bug. - // For now, let's try to provide an extra "frame" if possible so games don't infinite loop. - if (atrac->FileOffsetBySample(atrac->currentSample_) < atrac->first_.filesize) { - numSamples = std::min(maxSamples, atrac->SamplesPerFrame()); - u32 outBytes = numSamples * atrac->outputChannels_ * sizeof(s16); - if (outbuf != nullptr) { - memset(outbuf, 0, outBytes); - NotifyMemInfo(MemBlockFlags::WRITE, outbufPtr, outBytes, "AtracDecode"); - } - } - } - } - - *SamplesNum = numSamples; - // update current sample and decodePos - atrac->currentSample_ += numSamples; - atrac->decodePos_ = atrac->DecodePosBySample(atrac->currentSample_); - - atrac->ConsumeFrame(); - - int finishFlag = 0; - // TODO: Verify. - bool hitEnd = atrac->currentSample_ >= atrac->endSample_ || (numSamples == 0 && atrac->first_.size >= atrac->first_.filesize); - int loopEndAdjusted = atrac->loopEndSample_ - atrac->FirstOffsetExtra() - atrac->firstSampleOffset_; - if ((hitEnd || atrac->currentSample_ > loopEndAdjusted) && loopNum != 0) { - atrac->SeekToSample(atrac->loopStartSample_ - atrac->FirstOffsetExtra() - atrac->firstSampleOffset_); - if (atrac->bufferState_ != ATRAC_STATUS_FOR_SCESAS) { - if (atrac->loopNum_ > 0) - atrac->loopNum_--; - } - if ((atrac->bufferState_ & ATRAC_STATUS_STREAMED_MASK) == ATRAC_STATUS_STREAMED_MASK) { - // Whatever bytes we have left were added from the loop. - u32 loopOffset = atrac->FileOffsetBySample(atrac->loopStartSample_ - atrac->FirstOffsetExtra() - atrac->firstSampleOffset_ - atrac->SamplesPerFrame() * 2); - // TODO: Hmm, need to manage the buffer better. But don't move fileoffset if we already have valid data. - if (loopOffset > atrac->first_.fileoffset || loopOffset + atrac->bufferValidBytes_ < atrac->first_.fileoffset) { - // Skip the initial frame at the start. - atrac->first_.fileoffset = atrac->FileOffsetBySample(atrac->loopStartSample_ - atrac->FirstOffsetExtra() - atrac->firstSampleOffset_ - atrac->SamplesPerFrame() * 2); - } - } - } else if (hitEnd) { - finishFlag = 1; - - // Still move forward, so we know that we've read everything. - // This seems to be reflected in the context as well. - atrac->currentSample_ += atrac->SamplesPerFrame() - numSamples; - } - - *finish = finishFlag; - *remains = atrac->RemainingFrames(); - } + // We already passed the end - return an error (many games check for this.) + if (atrac->currentSample_ >= atrac->endSample_ && loopNum == 0) { + *SamplesNum = 0; + *finish = 1; if (atrac->context_.IsValid()) { // refresh context_ _AtracGenerateContext(atrac); } - return 0; + return ATRAC_ERROR_ALL_DATA_DECODED; } + + // TODO: This isn't at all right, but at least it makes the music "last" some time. + u32 numSamples = 0; + + // It seems like the PSP aligns the sample position to 0x800...? + int offsetSamples = atrac->firstSampleOffset_ + atrac->FirstOffsetExtra(); + int skipSamples = 0; + u32 maxSamples = atrac->endSample_ + 1 - atrac->currentSample_; + u32 unalignedSamples = (offsetSamples + atrac->currentSample_) % atrac->SamplesPerFrame(); + if (unalignedSamples != 0) { + // We're off alignment, possibly due to a loop. Force it back on. + maxSamples = atrac->SamplesPerFrame() - unalignedSamples; + skipSamples = unalignedSamples; + } + + if (skipSamples != 0 && atrac->bufferHeaderSize_ == 0) { + // Skip the initial frame used to load state for the looped frame. + // TODO: We will want to actually read this in. + atrac->ConsumeFrame(); + } + + if (!atrac->failedDecode_ && (atrac->codecType_ == PSP_MODE_AT_3 || atrac->codecType_ == PSP_MODE_AT_3_PLUS)) { + atrac->SeekToSample(atrac->currentSample_); + + AtracDecodeResult res = ATDECODE_FEEDME; + while (atrac->FillPacket(-skipSamples)) { + uint32_t packetAddr = atrac->CurBufferAddress(-skipSamples); +#ifdef USE_FFMPEG + int packetSize = atrac->packet_->size; +#endif // USE_FFMPEG + res = atrac->DecodePacket(); + if (res == ATDECODE_FEEDME) { + continue; + } else if (res == ATDECODE_FAILED) { + *SamplesNum = 0; + *finish = 1; + return ATRAC_ERROR_ALL_DATA_DECODED; + } else if (res == ATDECODE_BADFRAME) { + // Retry next time. + break; + } + _dbg_assert_(res == ATDECODE_GOTFRAME); +#ifdef USE_FFMPEG + // got a frame + int skipped = std::min(skipSamples, atrac->frame_->nb_samples); + skipSamples -= skipped; + numSamples = atrac->frame_->nb_samples - skipped; + + // If we're at the end, clamp to samples we want. It always returns a full chunk. + numSamples = std::min(maxSamples, numSamples); + + if (skipped > 0 && numSamples == 0) { + // Wait for the next one. + res = ATDECODE_FEEDME; + } + + if (outbuf != NULL && numSamples != 0) { + int inbufOffset = 0; + if (skipped != 0) { + AVSampleFormat fmt = (AVSampleFormat)atrac->frame_->format; + // We want the offset per channel. + inbufOffset = av_samples_get_buffer_size(NULL, 1, skipped, fmt, 1); + } + + u8 *out = outbuf; + const u8 *inbuf[2] = { + atrac->frame_->extended_data[0] + inbufOffset, + atrac->frame_->extended_data[1] + inbufOffset, + }; + int avret = swr_convert(atrac->swrCtx_, &out, numSamples, inbuf, numSamples); + if (outbufPtr != 0) { + u32 outBytes = numSamples * atrac->outputChannels_ * sizeof(s16); + if (packetAddr != 0 && MemBlockInfoDetailed()) { + char tagData[128]; + size_t tagSize = FormatMemWriteTagAt(tagData, sizeof(tagData), "AtracDecode/", packetAddr, packetSize); + NotifyMemInfo(MemBlockFlags::READ, packetAddr, packetSize, tagData, tagSize); + NotifyMemInfo(MemBlockFlags::WRITE, outbufPtr, outBytes, tagData, tagSize); + } else { + NotifyMemInfo(MemBlockFlags::WRITE, outbufPtr, outBytes, "AtracDecode"); + } + } + if (avret < 0) { + ERROR_LOG(ME, "swr_convert: Error while converting %d", avret); + } + } + // We only want one frame per call, let's continue the next time. + break; +#endif // USE_FFMPEG + } + + if (res != ATDECODE_GOTFRAME && atrac->currentSample_ < atrac->endSample_) { + // Never got a frame. We may have dropped a GHA frame or otherwise have a bug. + // For now, let's try to provide an extra "frame" if possible so games don't infinite loop. + if (atrac->FileOffsetBySample(atrac->currentSample_) < atrac->first_.filesize) { + numSamples = std::min(maxSamples, atrac->SamplesPerFrame()); + u32 outBytes = numSamples * atrac->outputChannels_ * sizeof(s16); + if (outbuf != nullptr) { + memset(outbuf, 0, outBytes); + NotifyMemInfo(MemBlockFlags::WRITE, outbufPtr, outBytes, "AtracDecode"); + } + } + } + } + + *SamplesNum = numSamples; + // update current sample and decodePos + atrac->currentSample_ += numSamples; + atrac->decodePos_ = atrac->DecodePosBySample(atrac->currentSample_); + + atrac->ConsumeFrame(); + + int finishFlag = 0; + // TODO: Verify. + bool hitEnd = atrac->currentSample_ >= atrac->endSample_ || (numSamples == 0 && atrac->first_.size >= atrac->first_.filesize); + int loopEndAdjusted = atrac->loopEndSample_ - atrac->FirstOffsetExtra() - atrac->firstSampleOffset_; + if ((hitEnd || atrac->currentSample_ > loopEndAdjusted) && loopNum != 0) { + atrac->SeekToSample(atrac->loopStartSample_ - atrac->FirstOffsetExtra() - atrac->firstSampleOffset_); + if (atrac->bufferState_ != ATRAC_STATUS_FOR_SCESAS) { + if (atrac->loopNum_ > 0) + atrac->loopNum_--; + } + if ((atrac->bufferState_ & ATRAC_STATUS_STREAMED_MASK) == ATRAC_STATUS_STREAMED_MASK) { + // Whatever bytes we have left were added from the loop. + u32 loopOffset = atrac->FileOffsetBySample(atrac->loopStartSample_ - atrac->FirstOffsetExtra() - atrac->firstSampleOffset_ - atrac->SamplesPerFrame() * 2); + // TODO: Hmm, need to manage the buffer better. But don't move fileoffset if we already have valid data. + if (loopOffset > atrac->first_.fileoffset || loopOffset + atrac->bufferValidBytes_ < atrac->first_.fileoffset) { + // Skip the initial frame at the start. + atrac->first_.fileoffset = atrac->FileOffsetBySample(atrac->loopStartSample_ - atrac->FirstOffsetExtra() - atrac->firstSampleOffset_ - atrac->SamplesPerFrame() * 2); + } + } + } else if (hitEnd) { + finishFlag = 1; + + // Still move forward, so we know that we've read everything. + // This seems to be reflected in the context as well. + atrac->currentSample_ += atrac->SamplesPerFrame() - numSamples; + } + + *finish = finishFlag; + *remains = atrac->RemainingFrames(); + if (atrac->context_.IsValid()) { + // refresh context_ + _AtracGenerateContext(atrac); + } + return 0; } static u32 sceAtracDecodeData(int atracID, u32 outAddr, u32 numSamplesAddr, u32 finishFlagAddr, u32 remainAddr) { From 683a30e964d17dca8e08d08db9e912098a888175 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Fri, 12 Apr 2024 14:24:51 +0200 Subject: [PATCH 112/719] Remove more indentation --- Core/HLE/sceAtrac.cpp | 173 +++++++++++++++++++++--------------------- 1 file changed, 85 insertions(+), 88 deletions(-) diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp index 795f06f854..81e1f21d51 100644 --- a/Core/HLE/sceAtrac.cpp +++ b/Core/HLE/sceAtrac.cpp @@ -1600,34 +1600,33 @@ static u32 sceAtracGetNextSample(int atracID, u32 outNAddr) { if (err != 0) { // Already logged. return err; - } else { - if (atrac->currentSample_ >= atrac->endSample_) { - if (Memory::IsValidAddress(outNAddr)) - Memory::WriteUnchecked_U32(0, outNAddr); - return hleLogSuccessI(ME, 0, "0 samples left"); - } else { - // It seems like the PSP aligns the sample position to 0x800...? - u32 skipSamples = atrac->firstSampleOffset_ + atrac->FirstOffsetExtra(); - u32 firstSamples = (atrac->SamplesPerFrame() - skipSamples) % atrac->SamplesPerFrame(); - u32 numSamples = atrac->endSample_ + 1 - atrac->currentSample_; - if (atrac->currentSample_ == 0 && firstSamples != 0) { - numSamples = firstSamples; - } - u32 unalignedSamples = (skipSamples + atrac->currentSample_) % atrac->SamplesPerFrame(); - if (unalignedSamples != 0) { - // We're off alignment, possibly due to a loop. Force it back on. - numSamples = atrac->SamplesPerFrame() - unalignedSamples; - } - if (numSamples > atrac->SamplesPerFrame()) - numSamples = atrac->SamplesPerFrame(); - if (atrac->bufferState_ == ATRAC_STATUS_STREAMED_LOOP_FROM_END && (int)numSamples + atrac->currentSample_ > atrac->endSample_) { - atrac->bufferState_ = ATRAC_STATUS_ALL_DATA_LOADED; - } - if (Memory::IsValidAddress(outNAddr)) - Memory::WriteUnchecked_U32(numSamples, outNAddr); - return hleLogSuccessI(ME, 0, "%d samples left", numSamples); - } } + if (atrac->currentSample_ >= atrac->endSample_) { + if (Memory::IsValidAddress(outNAddr)) + Memory::WriteUnchecked_U32(0, outNAddr); + return hleLogSuccessI(ME, 0, "0 samples left"); + } + + // It seems like the PSP aligns the sample position to 0x800...? + u32 skipSamples = atrac->firstSampleOffset_ + atrac->FirstOffsetExtra(); + u32 firstSamples = (atrac->SamplesPerFrame() - skipSamples) % atrac->SamplesPerFrame(); + u32 numSamples = atrac->endSample_ + 1 - atrac->currentSample_; + if (atrac->currentSample_ == 0 && firstSamples != 0) { + numSamples = firstSamples; + } + u32 unalignedSamples = (skipSamples + atrac->currentSample_) % atrac->SamplesPerFrame(); + if (unalignedSamples != 0) { + // We're off alignment, possibly due to a loop. Force it back on. + numSamples = atrac->SamplesPerFrame() - unalignedSamples; + } + if (numSamples > atrac->SamplesPerFrame()) + numSamples = atrac->SamplesPerFrame(); + if (atrac->bufferState_ == ATRAC_STATUS_STREAMED_LOOP_FROM_END && (int)numSamples + atrac->currentSample_ > atrac->endSample_) { + atrac->bufferState_ = ATRAC_STATUS_ALL_DATA_LOADED; + } + if (Memory::IsValidAddress(outNAddr)) + Memory::WriteUnchecked_U32(numSamples, outNAddr); + return hleLogSuccessI(ME, 0, "%d samples left", numSamples); } // Obtains the number of frames remaining in the buffer which can be decoded. @@ -1751,68 +1750,66 @@ static u32 sceAtracResetPlayPosition(int atracID, int sample, int bytesWrittenFi return hleReportError(ME, ATRAC_ERROR_SECOND_BUFFER_NEEDED, "no second buffer"); } else if ((u32)sample + atrac->firstSampleOffset_ > (u32)atrac->endSample_ + atrac->firstSampleOffset_) { return hleLogWarning(ME, ATRAC_ERROR_BAD_SAMPLE, "invalid sample position"); - } else { - // Reuse the same calculation as before. - AtracResetBufferInfo bufferInfo; - AtracGetResetBufferInfo(atrac, &bufferInfo, sample); - - if ((u32)bytesWrittenFirstBuf < bufferInfo.first.minWriteBytes || (u32)bytesWrittenFirstBuf > bufferInfo.first.writableBytes) { - return hleLogError(ME, ATRAC_ERROR_BAD_FIRST_RESET_SIZE, "first byte count not in valid range"); - } - if ((u32)bytesWrittenSecondBuf < bufferInfo.second.minWriteBytes || (u32)bytesWrittenSecondBuf > bufferInfo.second.writableBytes) { - return hleLogError(ME, ATRAC_ERROR_BAD_SECOND_RESET_SIZE, "second byte count not in valid range"); - } - - if (atrac->bufferState_ == ATRAC_STATUS_ALL_DATA_LOADED) { - // Always adds zero bytes. - } else if (atrac->bufferState_ == ATRAC_STATUS_HALFWAY_BUFFER) { - // Okay, it's a valid number of bytes. Let's set them up. - if (bytesWrittenFirstBuf != 0) { - if (!atrac->ignoreDataBuf_) { - Memory::Memcpy(atrac->dataBuf_ + atrac->first_.size, atrac->first_.addr + atrac->first_.size, bytesWrittenFirstBuf, "AtracResetPlayPosition"); - } - atrac->first_.fileoffset += bytesWrittenFirstBuf; - atrac->first_.size += bytesWrittenFirstBuf; - atrac->first_.offset += bytesWrittenFirstBuf; - } - - // Did we transition to a full buffer? - if (atrac->first_.size >= atrac->first_.filesize) { - atrac->first_.size = atrac->first_.filesize; - atrac->bufferState_ = ATRAC_STATUS_ALL_DATA_LOADED; - } - } else { - if (bufferInfo.first.filePos > atrac->first_.filesize) { - return hleDelayResult(hleLogError(ME, ATRAC_ERROR_API_FAIL, "invalid file position"), "reset play pos", 200); - } - - // Move the offset to the specified position. - atrac->first_.fileoffset = bufferInfo.first.filePos; - - if (bytesWrittenFirstBuf != 0) { - if (!atrac->ignoreDataBuf_) { - Memory::Memcpy(atrac->dataBuf_ + atrac->first_.fileoffset, atrac->first_.addr, bytesWrittenFirstBuf, "AtracResetPlayPosition"); - } - atrac->first_.fileoffset += bytesWrittenFirstBuf; - } - atrac->first_.size = atrac->first_.fileoffset; - atrac->first_.offset = bytesWrittenFirstBuf; - - atrac->bufferHeaderSize_ = 0; - atrac->bufferPos_ = atrac->bytesPerFrame_; - atrac->bufferValidBytes_ = bytesWrittenFirstBuf - atrac->bufferPos_; - } - - if (atrac->codecType_ == PSP_MODE_AT_3 || atrac->codecType_ == PSP_MODE_AT_3_PLUS) { - atrac->SeekToSample(sample); - } - - if (atrac->context_.IsValid()) { - _AtracGenerateContext(atrac); - } - - return hleDelayResult(hleLogSuccessInfoI(ME, 0), "reset play pos", 3000); } + // Reuse the same calculation as before. + AtracResetBufferInfo bufferInfo; + AtracGetResetBufferInfo(atrac, &bufferInfo, sample); + + if ((u32)bytesWrittenFirstBuf < bufferInfo.first.minWriteBytes || (u32)bytesWrittenFirstBuf > bufferInfo.first.writableBytes) { + return hleLogError(ME, ATRAC_ERROR_BAD_FIRST_RESET_SIZE, "first byte count not in valid range"); + } + if ((u32)bytesWrittenSecondBuf < bufferInfo.second.minWriteBytes || (u32)bytesWrittenSecondBuf > bufferInfo.second.writableBytes) { + return hleLogError(ME, ATRAC_ERROR_BAD_SECOND_RESET_SIZE, "second byte count not in valid range"); + } + + if (atrac->bufferState_ == ATRAC_STATUS_ALL_DATA_LOADED) { + // Always adds zero bytes. + } else if (atrac->bufferState_ == ATRAC_STATUS_HALFWAY_BUFFER) { + // Okay, it's a valid number of bytes. Let's set them up. + if (bytesWrittenFirstBuf != 0) { + if (!atrac->ignoreDataBuf_) { + Memory::Memcpy(atrac->dataBuf_ + atrac->first_.size, atrac->first_.addr + atrac->first_.size, bytesWrittenFirstBuf, "AtracResetPlayPosition"); + } + atrac->first_.fileoffset += bytesWrittenFirstBuf; + atrac->first_.size += bytesWrittenFirstBuf; + atrac->first_.offset += bytesWrittenFirstBuf; + } + + // Did we transition to a full buffer? + if (atrac->first_.size >= atrac->first_.filesize) { + atrac->first_.size = atrac->first_.filesize; + atrac->bufferState_ = ATRAC_STATUS_ALL_DATA_LOADED; + } + } else { + if (bufferInfo.first.filePos > atrac->first_.filesize) { + return hleDelayResult(hleLogError(ME, ATRAC_ERROR_API_FAIL, "invalid file position"), "reset play pos", 200); + } + + // Move the offset to the specified position. + atrac->first_.fileoffset = bufferInfo.first.filePos; + + if (bytesWrittenFirstBuf != 0) { + if (!atrac->ignoreDataBuf_) { + Memory::Memcpy(atrac->dataBuf_ + atrac->first_.fileoffset, atrac->first_.addr, bytesWrittenFirstBuf, "AtracResetPlayPosition"); + } + atrac->first_.fileoffset += bytesWrittenFirstBuf; + } + atrac->first_.size = atrac->first_.fileoffset; + atrac->first_.offset = bytesWrittenFirstBuf; + + atrac->bufferHeaderSize_ = 0; + atrac->bufferPos_ = atrac->bytesPerFrame_; + atrac->bufferValidBytes_ = bytesWrittenFirstBuf - atrac->bufferPos_; + } + + if (atrac->codecType_ == PSP_MODE_AT_3 || atrac->codecType_ == PSP_MODE_AT_3_PLUS) { + atrac->SeekToSample(sample); + } + + if (atrac->context_.IsValid()) { + _AtracGenerateContext(atrac); + } + return hleDelayResult(hleLogSuccessInfoI(ME, 0), "reset play pos", 3000); } #ifdef USE_FFMPEG From c2bcdd3076c176261214f2fc6aacb9bdcaefa7da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Fri, 12 Apr 2024 16:45:45 +0200 Subject: [PATCH 113/719] Buildfix with system ffmpeg --- Core/HW/SimpleAudioDec.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/Core/HW/SimpleAudioDec.cpp b/Core/HW/SimpleAudioDec.cpp index c1e57ffdaa..a6555b8095 100644 --- a/Core/HW/SimpleAudioDec.cpp +++ b/Core/HW/SimpleAudioDec.cpp @@ -125,9 +125,6 @@ private: int outSamples_ = 0; // output samples per frame AVFrame *frame_ = nullptr; -#if HAVE_LIBAVCODEC_CONST_AVCODEC // USE_FFMPEG is implied - const -#endif AVCodec *codec_ = nullptr; AVCodecContext *codecCtx_ = nullptr; SwrContext *swrCtx_ = nullptr; From ea07fdbd866f9fe87333d8565fcb449d427de7ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sat, 13 Apr 2024 00:03:56 +0200 Subject: [PATCH 114/719] sceAtrac: Create standalone decoders as well as ffmpeg. Implement LowLevelDecode. --- Core/HLE/sceAtrac.cpp | 107 ++++++++++++++++++++---------------------- 1 file changed, 51 insertions(+), 56 deletions(-) diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp index 81e1f21d51..3d5cd76ba5 100644 --- a/Core/HLE/sceAtrac.cpp +++ b/Core/HLE/sceAtrac.cpp @@ -29,6 +29,7 @@ #include "Core/Debugger/MemBlockInfo.h" #include "Core/HW/MediaEngine.h" #include "Core/HW/BufferQueue.h" +#include "Core/HW/Atrac3Standalone.h" #include "Core/HLE/sceKernel.h" #include "Core/HLE/sceUtility.h" @@ -391,6 +392,10 @@ struct Atrac { } int atracID_ = -1; + + // TODO: Save the internal state of this, now technically possible. + AudioDecoder *decoder_ = nullptr; + u8 *dataBuf_ = nullptr; u32 decodePos_ = 0; @@ -439,6 +444,8 @@ struct Atrac { #ifdef USE_FFMPEG void ReleaseFFMPEGContext() { + delete decoder_; + decoder_ = nullptr; // All of these allow null pointers. av_freep(&frame_); swr_free(&swrCtx_); @@ -539,19 +546,6 @@ struct Atrac { } else { return false; } - - return true; - } - - AtracDecodeResult DecodeLowLevelPacket(u8 *ptr) { -#ifdef USE_FFMPEG - av_init_packet(packet_); - - packet_->data = ptr; - packet_->size = bytesPerFrame_; - packet_->pos = 0; -#endif // USE_FFMPEG - return DecodePacket(); } AtracDecodeResult DecodePacket() { @@ -1252,7 +1246,11 @@ u32 _AtracDecodeData(int atracID, u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u3 atrac->SeekToSample(atrac->currentSample_); AtracDecodeResult res = ATDECODE_FEEDME; - while (atrac->FillPacket(-skipSamples)) { + while (true) { + if (!atrac->FillPacket(-skipSamples)) { + break; + } + uint32_t packetAddr = atrac->CurBufferAddress(-skipSamples); #ifdef USE_FFMPEG int packetSize = atrac->packet_->size; @@ -1845,7 +1843,36 @@ static int __AtracUpdateOutputMode(Atrac *atrac, int wanted_channels) { } #endif // USE_FFMPEG +// extraData should be 14 zeroed bytes. +void InitAT3ExtraData(Atrac *atrac, uint8_t *extraData) { + // We don't pull this from the RIFF so that we can support OMA also. + + // The only thing that changes are the jointStereo_ values. + extraData[0] = 1; + extraData[3] = atrac->channels_ << 3; + extraData[6] = atrac->jointStereo_; + extraData[8] = atrac->jointStereo_; + extraData[10] = 1; +} + int __AtracSetContext(Atrac *atrac) { + if (atrac->codecCtx_) { + // Shouldn't happen, but just in case. + atrac->ReleaseFFMPEGContext(); + } + if (atrac->decoder_) { + delete atrac->decoder_; + } + + // First, init the standalone decoder. Only used for low-level-decode initially, but simple. + if (atrac->codecType_ == PSP_MODE_AT_3) { + uint8_t extraData[14]{}; + InitAT3ExtraData(atrac, extraData); + atrac->decoder_ = CreateAtrac3Audio(atrac->channels_, atrac->bytesPerFrame_, extraData, sizeof(extraData)); + } else { + atrac->decoder_ = CreateAtrac3PlusAudio(atrac->channels_, atrac->bytesPerFrame_); + } + #ifdef USE_FFMPEG InitFFmpeg(); @@ -1858,11 +1885,6 @@ int __AtracSetContext(Atrac *atrac) { return hleReportError(ME, ATRAC_ERROR_UNKNOWN_FORMAT, "unknown codec type in set context"); } - if (atrac->codecCtx_) { - // Shouldn't happen, but just in case. - atrac->ReleaseFFMPEGContext(); - } - AVCodec *codec = avcodec_find_decoder(ff_codec); atrac->codecCtx_ = avcodec_alloc_context3(codec); @@ -1871,13 +1893,7 @@ int __AtracSetContext(Atrac *atrac) { atrac->codecCtx_->extradata = (uint8_t *)av_mallocz(14); atrac->codecCtx_->extradata_size = 14; - // We don't pull this from the RIFF so that we can support OMA also. - // The only thing that changes are the jointStereo_ values. - atrac->codecCtx_->extradata[0] = 1; - atrac->codecCtx_->extradata[3] = atrac->channels_ << 3; - atrac->codecCtx_->extradata[6] = atrac->jointStereo_; - atrac->codecCtx_->extradata[8] = atrac->jointStereo_; - atrac->codecCtx_->extradata[10] = 1; + InitAT3ExtraData(atrac, atrac->codecCtx_->extradata); } // Appears we need to force mono in some cases. (See CPkmn's comments in issue #4248) @@ -1897,7 +1913,6 @@ int __AtracSetContext(Atrac *atrac) { } // Only one supported, it seems? atrac->codecCtx_->sample_rate = 44100; - atrac->codecCtx_->request_sample_fmt = AV_SAMPLE_FMT_S16; int ret; if ((ret = avcodec_open2(atrac->codecCtx_, codec, nullptr)) < 0) { @@ -1905,8 +1920,9 @@ int __AtracSetContext(Atrac *atrac) { return hleLogError(ME, ATRAC_ERROR_BAD_CODEC_PARAMS, "failed to open decoder %d", ret); } - if ((ret = __AtracUpdateOutputMode(atrac, atrac->outputChannels_)) < 0) + if ((ret = __AtracUpdateOutputMode(atrac, atrac->outputChannels_)) < 0) { return hleLogError(ME, ret, "failed to set the output mode"); + } // alloc audio frame atrac->frame_ = av_frame_alloc(); @@ -1918,10 +1934,9 @@ int __AtracSetContext(Atrac *atrac) { atrac->packet_->data = nullptr; atrac->packet_->size = 0; #endif +#endif // USE_FFMPEG // reinit decodePos, because ffmpeg had changed it. atrac->decodePos_ = 0; -#endif - return 0; } @@ -2466,9 +2481,6 @@ static int sceAtracLowLevelInitDecoder(int atracID, u32 paramsAddr) { atrac->first_.size = 0; atrac->first_.filesize = atrac->bytesPerFrame_; atrac->bufferState_ = ATRAC_STATUS_LOW_LEVEL; - - atrac->dataBuf_ = new u8[atrac->first_.filesize + overAllocBytes]; - memset(atrac->dataBuf_, 0, atrac->first_.filesize + overAllocBytes); atrac->currentSample_ = 0; int ret = __AtracSetContext(atrac); @@ -2500,30 +2512,13 @@ static int sceAtracLowLevelDecode(int atracID, u32 sourceAddr, u32 sourceBytesCo } int numSamples = (atrac->codecType_ == PSP_MODE_AT_3_PLUS ? ATRAC3PLUS_MAX_SAMPLES : ATRAC3_MAX_SAMPLES); + int bytesConsumed = 0; + int bytesWritten = 0; + atrac->decoder_->Decode(srcp, atrac->bytesPerFrame_, &bytesConsumed, outp, &bytesWritten); + *srcConsumed = bytesConsumed; + *outWritten = bytesWritten; - if (!atrac->failedDecode_) { - AtracDecodeResult res = atrac->DecodeLowLevelPacket(srcp); - if (res == ATDECODE_GOTFRAME) { -#ifdef USE_FFMPEG - // got a frame - numSamples = atrac->frame_->nb_samples; - - u8 *out = outp; - int avret = swr_convert(atrac->swrCtx_, &out, numSamples, - (const u8**)atrac->frame_->extended_data, numSamples); - u32 outBytes = numSamples * atrac->outputChannels_ * sizeof(s16); - NotifyMemInfo(MemBlockFlags::WRITE, samplesAddr, outBytes, "AtracLowLevelDecode"); - if (avret < 0) { - ERROR_LOG(ME, "swr_convert: Error while converting %d", avret); - } -#endif // USE_FFMPEG - } else { - // TODO: Error code otherwise? - } - } - - *outWritten = numSamples * atrac->outputChannels_ * sizeof(s16); - *srcConsumed = atrac->bytesPerFrame_; + NotifyMemInfo(MemBlockFlags::WRITE, samplesAddr, bytesWritten, "AtracLowLevelDecode"); return hleLogDebug(ME, hleDelayResult(0, "low level atrac decode data", atracDecodeDelay)); } From 242a87b2dd9848584425e78c148a6dfa9f0a6a8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sat, 13 Apr 2024 00:24:53 +0200 Subject: [PATCH 115/719] Inline FillPacket to make the next step easier --- Core/HLE/sceAtrac.cpp | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp index 3d5cd76ba5..f8addc9380 100644 --- a/Core/HLE/sceAtrac.cpp +++ b/Core/HLE/sceAtrac.cpp @@ -532,22 +532,6 @@ struct Atrac { return 0; } - bool FillPacket(int adjust = 0) { - u32 off = FileOffsetBySample(currentSample_ + adjust); - if (off < first_.size) { -#ifdef USE_FFMPEG - av_init_packet(packet_); - packet_->data = BufferStart() + off; - packet_->size = std::min((u32)bytesPerFrame_, first_.size - off); - packet_->pos = off; -#endif // USE_FFMPEG - - return true; - } else { - return false; - } - } - AtracDecodeResult DecodePacket() { #ifdef USE_FFMPEG if (codecCtx_ == nullptr) { @@ -1247,10 +1231,16 @@ u32 _AtracDecodeData(int atracID, u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u3 AtracDecodeResult res = ATDECODE_FEEDME; while (true) { - if (!atrac->FillPacket(-skipSamples)) { + u32 off = atrac->FileOffsetBySample(atrac->currentSample_ - skipSamples); + if (off >= atrac->first_.size) { break; } - +#ifdef USE_FFMPEG + av_init_packet(atrac->packet_); + atrac->packet_->data = atrac->BufferStart() + off; + atrac->packet_->size = std::min((u32)atrac->bytesPerFrame_, atrac->first_.size - off); + atrac->packet_->pos = off; +#endif // USE_FFMPEG uint32_t packetAddr = atrac->CurBufferAddress(-skipSamples); #ifdef USE_FFMPEG int packetSize = atrac->packet_->size; From a1ac79c18354074d090824f44da612a74cdc7266 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sat, 13 Apr 2024 00:45:25 +0200 Subject: [PATCH 116/719] Remove all remaining FFMPEG use from sceAtrac. --- Core/HLE/sceAtrac.cpp | 326 ++++------------------------------- Core/HW/Atrac3Standalone.cpp | 25 +-- 2 files changed, 46 insertions(+), 305 deletions(-) diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp index f8addc9380..7bf9e7fa45 100644 --- a/Core/HLE/sceAtrac.cpp +++ b/Core/HLE/sceAtrac.cpp @@ -121,19 +121,6 @@ const size_t overAllocBytes = 16384; static const int atracDecodeDelay = 2300; -#ifdef USE_FFMPEG - -extern "C" { -#include "libavformat/avformat.h" -#include "libswresample/swresample.h" -#include "libavutil/samplefmt.h" -#include "libavcodec/avcodec.h" -#include "libavutil/version.h" -} -#include "Core/FFMPEGCompat.h" - -#endif // USE_FFMPEG - enum AtracDecodeResult { ATDECODE_FAILED = -1, ATDECODE_FEEDME = 0, @@ -191,9 +178,8 @@ struct Atrac { } void ResetData() { -#ifdef USE_FFMPEG - ReleaseFFMPEGContext(); -#endif // USE_FFMPEG + delete decoder_; + decoder_ = nullptr; if (dataBuf_) delete [] dataBuf_; @@ -435,50 +421,10 @@ struct Atrac { PSPPointer context_; -#ifdef USE_FFMPEG - AVCodecContext *codecCtx_ = nullptr; - SwrContext *swrCtx_ = nullptr; - AVFrame *frame_ = nullptr; - AVPacket *packet_ = nullptr; -#endif // USE_FFMPEG - -#ifdef USE_FFMPEG - void ReleaseFFMPEGContext() { - delete decoder_; - decoder_ = nullptr; - // All of these allow null pointers. - av_freep(&frame_); - swr_free(&swrCtx_); -#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55, 52, 0) - // If necessary, extradata is automatically freed. - avcodec_free_context(&codecCtx_); -#else - // Future versions may add other things to free, but avcodec_free_context didn't exist yet here. - // Some old versions crash when we try to free extradata and subtitle_header, so let's not. A minor - // leak is better than a segfault. - // av_freep(&codecCtx_->extradata); - // av_freep(&codecCtx_->subtitle_header); - avcodec_close(codecCtx_); - av_freep(&codecCtx_); -#endif -#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 12, 100) - av_packet_free(&packet_); -#else - av_free_packet(packet_); - delete packet_; - packet_ = nullptr; -#endif - } -#endif // USE_FFMPEG - void ForceSeekToSample(int sample) { -#ifdef USE_FFMPEG - avcodec_flush_buffers(codecCtx_); - - // Discard any pending packet data. - packet_->size = 0; -#endif - + if (decoder_) { + decoder_->FlushBuffers(); + } currentSample_ = sample; } @@ -487,18 +433,14 @@ struct Atrac { } void SeekToSample(int sample) { -#ifdef USE_FFMPEG - // Discard any pending packet data. - packet_->size = 0; - // It seems like the PSP aligns the sample position to 0x800...? const u32 offsetSamples = firstSampleOffset_ + FirstOffsetExtra(); const u32 unalignedSamples = (offsetSamples + sample) % SamplesPerFrame(); int seekFrame = sample + offsetSamples - unalignedSamples; - if ((sample != currentSample_ || sample == 0) && codecCtx_ != nullptr) { + if ((sample != currentSample_ || sample == 0) && decoder_ != nullptr) { // Prefill the decode buffer with packets before the first sample offset. - avcodec_flush_buffers(codecCtx_); + decoder_->FlushBuffers(); int adjust = 0; if (sample == 0) { @@ -508,17 +450,11 @@ struct Atrac { const u32 off = FileOffsetBySample(sample + adjust); const u32 backfill = bytesPerFrame_ * 2; const u32 start = off - dataOff_ < backfill ? dataOff_ : off - backfill; - for (u32 pos = start; pos < off; pos += bytesPerFrame_) { - av_init_packet(packet_); - packet_->data = BufferStart() + pos; - packet_->size = bytesPerFrame_; - packet_->pos = pos; - // Process the packet, we don't care about success. - DecodePacket(); + for (u32 pos = start; pos < off; pos += bytesPerFrame_) { + decoder_->Decode(BufferStart() + pos, bytesPerFrame_, nullptr, nullptr, nullptr); } } -#endif // USE_FFMPEG currentSample_ = sample; } @@ -532,56 +468,6 @@ struct Atrac { return 0; } - AtracDecodeResult DecodePacket() { -#ifdef USE_FFMPEG - if (codecCtx_ == nullptr) { - return ATDECODE_FAILED; - } - - int got_frame = 0; -#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101) - if (packet_->size != 0) { - int err = avcodec_send_packet(codecCtx_, packet_); - if (err < 0) { - ERROR_LOG_REPORT(ME, "avcodec_send_packet: Error decoding audio %d / %08x", err, err); - failedDecode_ = true; - return ATDECODE_FAILED; - } - } - - int err = avcodec_receive_frame(codecCtx_, frame_); - int bytes_read = 0; - if (err >= 0) { - bytes_read = frame_->pkt_size; - got_frame = 1; - } else if (err != AVERROR(EAGAIN)) { - bytes_read = err; - } -#else - int bytes_read = avcodec_decode_audio4(codecCtx_, frame_, &got_frame, packet_); -#endif -#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 12, 100) - av_packet_unref(packet_); -#else - av_free_packet(packet_); -#endif - if (bytes_read == AVERROR_PATCHWELCOME) { - ERROR_LOG(ME, "Unsupported feature in ATRAC audio."); - // Let's try the next packet. - packet_->size = 0; - return ATDECODE_BADFRAME; - } else if (bytes_read < 0) { - ERROR_LOG_REPORT(ME, "avcodec_decode_audio4: Error decoding audio %d / %08x", bytes_read, bytes_read); - failedDecode_ = true; - return ATDECODE_FAILED; - } - - return got_frame ? ATDECODE_GOTFRAME : ATDECODE_FEEDME; -#else - return ATDECODE_BADFRAME; -#endif // USE_FFMPEG - } - void CalculateStreamInfo(u32 *readOffset); u32 StreamBufferEnd() const { @@ -641,15 +527,6 @@ void __AtracInit() { atracIDTypes[3] = PSP_MODE_AT_3; atracIDTypes[4] = 0; atracIDTypes[5] = 0; - -#ifdef USE_FFMPEG -#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(58, 18, 100) - avcodec_register_all(); -#endif -#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(58, 12, 100) - av_register_all(); -#endif -#endif // USE_FFMPEG } void __AtracLoadModule(int version, u32 crc) { @@ -1230,39 +1107,26 @@ u32 _AtracDecodeData(int atracID, u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u3 atrac->SeekToSample(atrac->currentSample_); AtracDecodeResult res = ATDECODE_FEEDME; - while (true) { - u32 off = atrac->FileOffsetBySample(atrac->currentSample_ - skipSamples); - if (off >= atrac->first_.size) { - break; - } -#ifdef USE_FFMPEG - av_init_packet(atrac->packet_); - atrac->packet_->data = atrac->BufferStart() + off; - atrac->packet_->size = std::min((u32)atrac->bytesPerFrame_, atrac->first_.size - off); - atrac->packet_->pos = off; -#endif // USE_FFMPEG - uint32_t packetAddr = atrac->CurBufferAddress(-skipSamples); -#ifdef USE_FFMPEG - int packetSize = atrac->packet_->size; -#endif // USE_FFMPEG - res = atrac->DecodePacket(); - if (res == ATDECODE_FEEDME) { - continue; - } else if (res == ATDECODE_FAILED) { + u32 off = atrac->FileOffsetBySample(atrac->currentSample_ - skipSamples); + if (off < atrac->first_.size) { + uint8_t *indata = atrac->BufferStart() + off; + int bytesConsumed = 0; + int outBytes = 0; + if (!atrac->decoder_->Decode(indata, atrac->bytesPerFrame_, &bytesConsumed, + outbuf, &outBytes)) { + // Decode failed. *SamplesNum = 0; *finish = 1; return ATRAC_ERROR_ALL_DATA_DECODED; - } else if (res == ATDECODE_BADFRAME) { - // Retry next time. - break; } - _dbg_assert_(res == ATDECODE_GOTFRAME); -#ifdef USE_FFMPEG - // got a frame - int skipped = std::min(skipSamples, atrac->frame_->nb_samples); - skipSamples -= skipped; - numSamples = atrac->frame_->nb_samples - skipped; + res = ATDECODE_GOTFRAME; + numSamples = outBytes / 4; + uint32_t packetAddr = atrac->CurBufferAddress(-skipSamples); + // got a frame + int skipped = std::min((u32)skipSamples, numSamples); + skipSamples -= skipped; + numSamples = numSamples - skipped; // If we're at the end, clamp to samples we want. It always returns a full chunk. numSamples = std::min(maxSamples, numSamples); @@ -1271,38 +1135,15 @@ u32 _AtracDecodeData(int atracID, u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u3 res = ATDECODE_FEEDME; } - if (outbuf != NULL && numSamples != 0) { - int inbufOffset = 0; - if (skipped != 0) { - AVSampleFormat fmt = (AVSampleFormat)atrac->frame_->format; - // We want the offset per channel. - inbufOffset = av_samples_get_buffer_size(NULL, 1, skipped, fmt, 1); - } - - u8 *out = outbuf; - const u8 *inbuf[2] = { - atrac->frame_->extended_data[0] + inbufOffset, - atrac->frame_->extended_data[1] + inbufOffset, - }; - int avret = swr_convert(atrac->swrCtx_, &out, numSamples, inbuf, numSamples); - if (outbufPtr != 0) { - u32 outBytes = numSamples * atrac->outputChannels_ * sizeof(s16); - if (packetAddr != 0 && MemBlockInfoDetailed()) { - char tagData[128]; - size_t tagSize = FormatMemWriteTagAt(tagData, sizeof(tagData), "AtracDecode/", packetAddr, packetSize); - NotifyMemInfo(MemBlockFlags::READ, packetAddr, packetSize, tagData, tagSize); - NotifyMemInfo(MemBlockFlags::WRITE, outbufPtr, outBytes, tagData, tagSize); - } else { - NotifyMemInfo(MemBlockFlags::WRITE, outbufPtr, outBytes, "AtracDecode"); - } - } - if (avret < 0) { - ERROR_LOG(ME, "swr_convert: Error while converting %d", avret); - } + if (packetAddr != 0 && MemBlockInfoDetailed()) { + char tagData[128]; + size_t tagSize = FormatMemWriteTagAt(tagData, sizeof(tagData), "AtracDecode/", packetAddr, atrac->bytesPerFrame_); + NotifyMemInfo(MemBlockFlags::READ, packetAddr, atrac->bytesPerFrame_, tagData, tagSize); + NotifyMemInfo(MemBlockFlags::WRITE, outbufPtr, outBytes, tagData, tagSize); + } else { + NotifyMemInfo(MemBlockFlags::WRITE, outbufPtr, outBytes, "AtracDecode"); } // We only want one frame per call, let's continue the next time. - break; -#endif // USE_FFMPEG } if (res != ATDECODE_GOTFRAME && atrac->currentSample_ < atrac->endSample_) { @@ -1800,39 +1641,6 @@ static u32 sceAtracResetPlayPosition(int atracID, int sample, int bytesWrittenFi return hleDelayResult(hleLogSuccessInfoI(ME, 0), "reset play pos", 3000); } -#ifdef USE_FFMPEG -static int __AtracUpdateOutputMode(Atrac *atrac, int wanted_channels) { - if (atrac->swrCtx_ && atrac->outputChannels_ == wanted_channels) - return 0; - atrac->outputChannels_ = wanted_channels; - int64_t wanted_channel_layout = av_get_default_channel_layout(wanted_channels); - int64_t dec_channel_layout = av_get_default_channel_layout(atrac->channels_); - - atrac->swrCtx_ = - swr_alloc_set_opts - ( - atrac->swrCtx_, - wanted_channel_layout, - AV_SAMPLE_FMT_S16, - atrac->codecCtx_->sample_rate, - dec_channel_layout, - atrac->codecCtx_->sample_fmt, - atrac->codecCtx_->sample_rate, - 0, - NULL - ); - if (!atrac->swrCtx_) { - ERROR_LOG(ME, "swr_alloc_set_opts: Could not allocate resampler context"); - return -1; - } - if (swr_init(atrac->swrCtx_) < 0) { - ERROR_LOG(ME, "swr_init: Failed to initialize the resampling context"); - return -1; - } - return 0; -} -#endif // USE_FFMPEG - // extraData should be 14 zeroed bytes. void InitAT3ExtraData(Atrac *atrac, uint8_t *extraData) { // We don't pull this from the RIFF so that we can support OMA also. @@ -1846,10 +1654,6 @@ void InitAT3ExtraData(Atrac *atrac, uint8_t *extraData) { } int __AtracSetContext(Atrac *atrac) { - if (atrac->codecCtx_) { - // Shouldn't happen, but just in case. - atrac->ReleaseFFMPEGContext(); - } if (atrac->decoder_) { delete atrac->decoder_; } @@ -1862,69 +1666,6 @@ int __AtracSetContext(Atrac *atrac) { } else { atrac->decoder_ = CreateAtrac3PlusAudio(atrac->channels_, atrac->bytesPerFrame_); } - -#ifdef USE_FFMPEG - InitFFmpeg(); - - AVCodecID ff_codec; - if (atrac->codecType_ == PSP_MODE_AT_3) { - ff_codec = AV_CODEC_ID_ATRAC3; - } else if (atrac->codecType_ == PSP_MODE_AT_3_PLUS) { - ff_codec = AV_CODEC_ID_ATRAC3P; - } else { - return hleReportError(ME, ATRAC_ERROR_UNKNOWN_FORMAT, "unknown codec type in set context"); - } - - AVCodec *codec = avcodec_find_decoder(ff_codec); - atrac->codecCtx_ = avcodec_alloc_context3(codec); - - if (atrac->codecType_ == PSP_MODE_AT_3) { - // For ATRAC3, we need the "extradata" in the RIFF header. - atrac->codecCtx_->extradata = (uint8_t *)av_mallocz(14); - atrac->codecCtx_->extradata_size = 14; - - InitAT3ExtraData(atrac, atrac->codecCtx_->extradata); - } - - // Appears we need to force mono in some cases. (See CPkmn's comments in issue #4248) - if (atrac->channels_ == 1) { - atrac->codecCtx_->channels = 1; - atrac->codecCtx_->channel_layout = AV_CH_LAYOUT_MONO; - } else if (atrac->channels_ == 2) { - atrac->codecCtx_->channels = 2; - atrac->codecCtx_->channel_layout = AV_CH_LAYOUT_STEREO; - } else { - return hleReportError(ME, ATRAC_ERROR_UNKNOWN_FORMAT, "unknown channel layout in set context"); - } - - // Explicitly set the block_align value (needed by newer FFmpeg versions, see #5772.) - if (atrac->codecCtx_->block_align == 0) { - atrac->codecCtx_->block_align = atrac->bytesPerFrame_; - } - // Only one supported, it seems? - atrac->codecCtx_->sample_rate = 44100; - atrac->codecCtx_->request_sample_fmt = AV_SAMPLE_FMT_S16; - int ret; - if ((ret = avcodec_open2(atrac->codecCtx_, codec, nullptr)) < 0) { - // This can mean that the frame size is wrong or etc. - return hleLogError(ME, ATRAC_ERROR_BAD_CODEC_PARAMS, "failed to open decoder %d", ret); - } - - if ((ret = __AtracUpdateOutputMode(atrac, atrac->outputChannels_)) < 0) { - return hleLogError(ME, ret, "failed to set the output mode"); - } - - // alloc audio frame - atrac->frame_ = av_frame_alloc(); -#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 12, 100) - atrac->packet_ = av_packet_alloc(); -#else - atrac->packet_ = new AVPacket; - av_init_packet(atrac->packet_); - atrac->packet_->data = nullptr; - atrac->packet_->size = 0; -#endif -#endif // USE_FFMPEG // reinit decodePos, because ffmpeg had changed it. atrac->decodePos_ = 0; return 0; @@ -2326,11 +2067,6 @@ static int sceAtracSetAA3DataAndGetID(u32 buffer, u32 bufferSize, u32 fileSize, int _AtracGetIDByContext(u32 contextAddr) { int atracID = (int)Memory::Read_U32(contextAddr + 0xfc); -#ifdef USE_FFMPEG - Atrac *atrac = getAtrac(atracID); - if (atrac) - __AtracUpdateOutputMode(atrac, 1); -#endif // USE_FFMPEG return atracID; } diff --git a/Core/HW/Atrac3Standalone.cpp b/Core/HW/Atrac3Standalone.cpp index 27646a35c8..2b2ec92f3c 100644 --- a/Core/HW/Atrac3Standalone.cpp +++ b/Core/HW/Atrac3Standalone.cpp @@ -75,20 +75,25 @@ public: *outbytes = 0; return false; } - *inbytesConsumed = result; + if (inbytesConsumed) { + *inbytesConsumed = result; + } outSamples_ = nb_samples; if (nb_samples > 0) { - *outbytes = nb_samples * 2 * 2; - - // Convert frame to outbuf. TODO: Very SIMDable, though hardly hot. - for (int channel = 0; channel < 2; channel++) { - int16_t *output = (int16_t *)outbuf; - for (int i = 0; i < nb_samples; i++) { - output[i * 2] = clamp16(buffers_[0][i]); - output[i * 2 + 1] = clamp16(buffers_[1][i]); + if (outbytes) { + *outbytes = nb_samples * 2 * 2; + } + if (outbuf) { + // Convert frame to outbuf. TODO: Very SIMDable, though hardly hot. + for (int channel = 0; channel < 2; channel++) { + int16_t *output = (int16_t *)outbuf; + for (int i = 0; i < nb_samples; i++) { + output[i * 2] = clamp16(buffers_[0][i]); + output[i * 2 + 1] = clamp16(buffers_[1][i]); + } } } - } else { + } else if (outbytes) { *outbytes = 0; } return true; From 68c192b892975b5016a2dd530fe1ed85a60da7eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sat, 13 Apr 2024 01:05:55 +0200 Subject: [PATCH 117/719] Fix some symbol clashes apparently affecting the docker build --- UI/GameInfoCache.cpp | 2 +- ext/at3_standalone/atrac.cpp | 6 ++--- ext/at3_standalone/atrac.h | 2 +- ext/at3_standalone/atrac3.cpp | 4 ++-- ext/at3_standalone/atrac3plusdsp.cpp | 8 +++---- ext/at3_standalone/fft.cpp | 36 ++++++++++++++-------------- ext/at3_standalone/fft.h | 2 +- ext/at3_standalone/sinewin.cpp | 12 +++++----- ext/at3_standalone/sinewin.h | 2 +- 9 files changed, 37 insertions(+), 37 deletions(-) diff --git a/UI/GameInfoCache.cpp b/UI/GameInfoCache.cpp index 26bbccf1ae..2ad0ee1bb4 100644 --- a/UI/GameInfoCache.cpp +++ b/UI/GameInfoCache.cpp @@ -357,7 +357,7 @@ void GameInfo::SetupTexture(Draw::DrawContext *thin3d, GameInfoTex &tex) { tex.texture = CreateTextureFromFileData(thin3d, (const uint8_t *)tex.data.data(), tex.data.size(), ImageFileType::DETECT, false, GetTitle().c_str()); tex.timeLoaded = time_now_d(); if (!tex.texture) { - ERROR_LOG(G3D, "Failed creating texture (%s) from %d-byte file", GetTitle().c_str(), tex.data.size()); + ERROR_LOG(G3D, "Failed creating texture (%s) from %d-byte file", GetTitle().c_str(), (int)tex.data.size()); } } diff --git a/ext/at3_standalone/atrac.cpp b/ext/at3_standalone/atrac.cpp index 6f3d0e89a6..7fce83e40c 100644 --- a/ext/at3_standalone/atrac.cpp +++ b/ext/at3_standalone/atrac.cpp @@ -32,7 +32,7 @@ #include "atrac.h" -float ff_atrac_sf_table[64]; +float av_atrac_sf_table[64]; static float qmf_window[48]; static const float qmf_48tap_half[24] = { @@ -50,9 +50,9 @@ void ff_atrac_generate_tables(void) float s; /* Generate scale factors */ - if (!ff_atrac_sf_table[63]) + if (!av_atrac_sf_table[63]) for (i=0 ; i<64 ; i++) - ff_atrac_sf_table[i] = pow(2.0, (i - 15) / 3.0); + av_atrac_sf_table[i] = pow(2.0, (i - 15) / 3.0); /* Generate the QMF window. */ if (!qmf_window[47]) diff --git a/ext/at3_standalone/atrac.h b/ext/at3_standalone/atrac.h index 5bef52a1ce..3a68c8e092 100644 --- a/ext/at3_standalone/atrac.h +++ b/ext/at3_standalone/atrac.h @@ -51,7 +51,7 @@ typedef struct AtracGCContext { int loc_size; ///< size of location code in samples } AtracGCContext; -extern float ff_atrac_sf_table[64]; +extern float av_atrac_sf_table[64]; /** * Generate common tables. diff --git a/ext/at3_standalone/atrac3.cpp b/ext/at3_standalone/atrac3.cpp index 9e6cbcef16..7b2ca124eb 100644 --- a/ext/at3_standalone/atrac3.cpp +++ b/ext/at3_standalone/atrac3.cpp @@ -297,7 +297,7 @@ static int decode_spectrum(GetBitContext *gb, float *output) mantissas, subband_size); /* decode the scale factor for this subband */ - scale_factor = ff_atrac_sf_table[sf_index[i]] * + scale_factor = av_atrac_sf_table[sf_index[i]] * inv_max_quant[subband_vlc_index[i]]; /* inverse quantize the coefficients */ @@ -379,7 +379,7 @@ static int decode_tonal_components(GetBitContext *gb, coded_values = coded_values_per_component + 1; coded_values = FFMIN(max_coded_values, coded_values); - scale_factor = ff_atrac_sf_table[sf_index] * + scale_factor = av_atrac_sf_table[sf_index] * inv_max_quant[quant_step_index]; read_quant_spectral_coeffs(gb, quant_step_index, coding_mode, diff --git a/ext/at3_standalone/atrac3plusdsp.cpp b/ext/at3_standalone/atrac3plusdsp.cpp index 1f6a76fca4..fcdb9caecb 100644 --- a/ext/at3_standalone/atrac3plusdsp.cpp +++ b/ext/at3_standalone/atrac3plusdsp.cpp @@ -476,15 +476,15 @@ void ff_atrac3p_imdct(FFTContext *mdct_ctx, float *pIn, * Both regions are 32 samples long. */ if (wind_id & 2) { /* 1st half: steep window */ memset(pOut, 0, sizeof(float) * 32); - vector_fmul(&pOut[32], &pOut[32], ff_sine_64, 64); + vector_fmul(&pOut[32], &pOut[32], av_sine_64, 64); } else /* 1st half: simple sine window */ - vector_fmul(pOut, pOut, ff_sine_128, ATRAC3P_MDCT_SIZE / 2); + vector_fmul(pOut, pOut, av_sine_128, ATRAC3P_MDCT_SIZE / 2); if (wind_id & 1) { /* 2nd half: steep window */ - vector_fmul_reverse(&pOut[160], &pOut[160], ff_sine_64, 64); + vector_fmul_reverse(&pOut[160], &pOut[160], av_sine_64, 64); memset(&pOut[224], 0, sizeof(float) * 32); } else /* 2nd half: simple sine window */ - vector_fmul_reverse(&pOut[128], &pOut[128], ff_sine_128, ATRAC3P_MDCT_SIZE / 2); + vector_fmul_reverse(&pOut[128], &pOut[128], av_sine_128, ATRAC3P_MDCT_SIZE / 2); } /* lookup table for fast modulo 23 op required for cyclic buffers of the IPQF */ diff --git a/ext/at3_standalone/fft.cpp b/ext/at3_standalone/fft.cpp index c638b9be87..961c43b55d 100644 --- a/ext/at3_standalone/fft.cpp +++ b/ext/at3_standalone/fft.cpp @@ -54,21 +54,21 @@ COSTABLE(16384); COSTABLE(32768); COSTABLE(65536); -static FFTSample * const ff_cos_tabs[] = { +static FFTSample * const av_cos_tabs[] = { NULL, NULL, NULL, NULL, - ff_cos_16, - ff_cos_32, - ff_cos_64, - ff_cos_128, - ff_cos_256, - ff_cos_512, - ff_cos_1024, - ff_cos_2048, - ff_cos_4096, - ff_cos_8192, - ff_cos_16384, - ff_cos_32768, - ff_cos_65536, + av_cos_16, + av_cos_32, + av_cos_64, + av_cos_128, + av_cos_256, + av_cos_512, + av_cos_1024, + av_cos_2048, + av_cos_4096, + av_cos_8192, + av_cos_16384, + av_cos_32768, + av_cos_65536, }; static void fft_permute_c(FFTContext *s, FFTComplex *z); @@ -90,7 +90,7 @@ void ff_init_ff_cos_tabs(int index) int i; int m = 1<= 0 && index < FF_ARRAY_ELEMS(ff_sine_windows)); - ff_sine_window_init(ff_sine_windows[index], 1 << index); + assert(index >= 0 && index < FF_ARRAY_ELEMS(av_sine_windows)); + ff_sine_window_init(av_sine_windows[index], 1 << index); } diff --git a/ext/at3_standalone/sinewin.h b/ext/at3_standalone/sinewin.h index 5965a56fe8..da512bbd1f 100644 --- a/ext/at3_standalone/sinewin.h +++ b/ext/at3_standalone/sinewin.h @@ -23,7 +23,7 @@ #include "compat.h" #define SINETABLE(size) \ - DECLARE_ALIGNED(32, float, ff_sine_##size)[size] + DECLARE_ALIGNED(32, float, av_sine_##size)[size] /** * Generate a sine window. From effae82208b00f91f37d50f88aa3fa75a92cb8b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sat, 13 Apr 2024 09:39:27 +0200 Subject: [PATCH 118/719] sceAtrac: Do some renaming to make things make more sense --- Core/HLE/sceAtrac.cpp | 156 +++++++++++++++++------------------ Core/HLE/sceAtrac.h | 2 +- Core/HW/Atrac3Standalone.cpp | 2 +- Core/HW/SimpleAudioDec.cpp | 46 ++++++----- Core/HW/SimpleAudioDec.h | 3 - 5 files changed, 101 insertions(+), 108 deletions(-) diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp index 7bf9e7fa45..9aae6db15b 100644 --- a/Core/HLE/sceAtrac.cpp +++ b/Core/HLE/sceAtrac.cpp @@ -147,7 +147,7 @@ struct InputBuffer { struct Atrac; int __AtracSetContext(Atrac *atrac); -void _AtracGenerateContext(Atrac *atrac); +static void _AtracWriteContextToPSPMem(Atrac *atrac); struct AtracLoopInfo { int cuePointID; @@ -419,7 +419,7 @@ struct Atrac { InputBuffer first_; InputBuffer second_; - PSPPointer context_; + PSPPointer context_; void ForceSeekToSample(int sample) { if (decoder_) { @@ -511,22 +511,31 @@ struct AtracResetBufferInfo { const int PSP_NUM_ATRAC_IDS = 6; static bool atracInited = true; -static Atrac *atracIDs[PSP_NUM_ATRAC_IDS]; -static u32 atracIDTypes[PSP_NUM_ATRAC_IDS]; +static Atrac *atracContexts[PSP_NUM_ATRAC_IDS]; +static u32 atracContextTypes[PSP_NUM_ATRAC_IDS]; static int atracLibVersion = 0; static u32 atracLibCrc = 0; void __AtracInit() { + _assert_(sizeof(SceAtracContext) == 256); + atracInited = true; - memset(atracIDs, 0, sizeof(atracIDs)); + memset(atracContexts, 0, sizeof(atracContexts)); // Start with 2 of each in this order. - atracIDTypes[0] = PSP_MODE_AT_3_PLUS; - atracIDTypes[1] = PSP_MODE_AT_3_PLUS; - atracIDTypes[2] = PSP_MODE_AT_3; - atracIDTypes[3] = PSP_MODE_AT_3; - atracIDTypes[4] = 0; - atracIDTypes[5] = 0; + atracContextTypes[0] = PSP_MODE_AT_3_PLUS; + atracContextTypes[1] = PSP_MODE_AT_3_PLUS; + atracContextTypes[2] = PSP_MODE_AT_3; + atracContextTypes[3] = PSP_MODE_AT_3; + atracContextTypes[4] = 0; + atracContextTypes[5] = 0; +} + +void __AtracShutdown() { + for (size_t i = 0; i < ARRAY_SIZE(atracContexts); ++i) { + delete atracContexts[i]; + atracContexts[i] = nullptr; + } } void __AtracLoadModule(int version, u32 crc) { @@ -542,16 +551,16 @@ void __AtracDoState(PointerWrap &p) { Do(p, atracInited); for (int i = 0; i < PSP_NUM_ATRAC_IDS; ++i) { - bool valid = atracIDs[i] != NULL; + bool valid = atracContexts[i] != nullptr; Do(p, valid); if (valid) { - Do(p, atracIDs[i]); + Do(p, atracContexts[i]); } else { - delete atracIDs[i]; - atracIDs[i] = NULL; + delete atracContexts[i]; + atracContexts[i] = nullptr; } } - DoArray(p, atracIDTypes, PSP_NUM_ATRAC_IDS); + DoArray(p, atracContextTypes, PSP_NUM_ATRAC_IDS); if (s < 2) { atracLibVersion = 0; atracLibCrc = 0; @@ -562,18 +571,11 @@ void __AtracDoState(PointerWrap &p) { } } -void __AtracShutdown() { - for (size_t i = 0; i < ARRAY_SIZE(atracIDs); ++i) { - delete atracIDs[i]; - atracIDs[i] = NULL; - } -} - static Atrac *getAtrac(int atracID) { if (atracID < 0 || atracID >= PSP_NUM_ATRAC_IDS) { - return NULL; + return nullptr; } - Atrac *atrac = atracIDs[atracID]; + Atrac *atrac = atracContexts[atracID]; if (atrac && atrac->context_.IsValid()) { // Read in any changes from the game to the context. @@ -586,27 +588,24 @@ static Atrac *getAtrac(int atracID) { } static int createAtrac(Atrac *atrac) { - for (int i = 0; i < (int)ARRAY_SIZE(atracIDs); ++i) { - if (atracIDTypes[i] == atrac->codecType_ && atracIDs[i] == 0) { - atracIDs[i] = atrac; + for (int i = 0; i < (int)ARRAY_SIZE(atracContexts); ++i) { + if (atracContextTypes[i] == atrac->codecType_ && atracContexts[i] == 0) { + atracContexts[i] = atrac; atrac->atracID_ = i; return i; } } - return ATRAC_ERROR_NO_ATRACID; } static int deleteAtrac(int atracID) { if (atracID >= 0 && atracID < PSP_NUM_ATRAC_IDS) { - if (atracIDs[atracID] != nullptr) { - delete atracIDs[atracID]; - atracIDs[atracID] = nullptr; - + if (atracContexts[atracID] != nullptr) { + delete atracContexts[atracID]; + atracContexts[atracID] = nullptr; return 0; } } - return ATRAC_ERROR_BAD_ATRACID; } @@ -921,7 +920,7 @@ u32 _AtracAddStreamData(int atracID, u32 bufPtr, u32 bytesToAdd) { atrac->first_.fileoffset += addbytes; if (atrac->context_.IsValid()) { // refresh context_ - _AtracGenerateContext(atrac); + _AtracWriteContextToPSPMem(atrac); } return 0; } @@ -1042,7 +1041,7 @@ static u32 sceAtracAddStreamData(int atracID, u32 bytesToAdd) { if (atrac->bufferState_ == ATRAC_STATUS_HALFWAY_BUFFER) atrac->bufferState_ = ATRAC_STATUS_ALL_DATA_LOADED; if (atrac->context_.IsValid()) { - _AtracGenerateContext(atrac); + _AtracWriteContextToPSPMem(atrac); } } @@ -1078,7 +1077,7 @@ u32 _AtracDecodeData(int atracID, u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u3 *finish = 1; if (atrac->context_.IsValid()) { // refresh context_ - _AtracGenerateContext(atrac); + _AtracWriteContextToPSPMem(atrac); } return ATRAC_ERROR_ALL_DATA_DECODED; } @@ -1198,7 +1197,7 @@ u32 _AtracDecodeData(int atracID, u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u3 *remains = atrac->RemainingFrames(); if (atrac->context_.IsValid()) { // refresh context_ - _AtracGenerateContext(atrac); + _AtracWriteContextToPSPMem(atrac); } return 0; } @@ -1212,12 +1211,12 @@ static u32 sceAtracDecodeData(int atracID, u32 outAddr, u32 numSamplesAddr, u32 int ret = _AtracDecodeData(atracID, Memory::GetPointerWrite(outAddr), outAddr, &numSamples, &finish, &remains); if (ret != (int)ATRAC_ERROR_BAD_ATRACID && ret != (int)ATRAC_ERROR_NO_DATA) { if (Memory::IsValidAddress(numSamplesAddr)) - Memory::Write_U32(numSamples, numSamplesAddr); + Memory::WriteUnchecked_U32(numSamples, numSamplesAddr); if (Memory::IsValidAddress(finishFlagAddr)) - Memory::Write_U32(finish, finishFlagAddr); + Memory::WriteUnchecked_U32(finish, finishFlagAddr); // On error, no remaining frame value is written. if (ret == 0 && Memory::IsValidAddress(remainAddr)) - Memory::Write_U32(remains, remainAddr); + Memory::WriteUnchecked_U32(remains, remainAddr); } DEBUG_LOG(ME, "%08x=sceAtracDecodeData(%i, %08x, %08x[%08x], %08x[%08x], %08x[%d])", ret, atracID, outAddr, numSamplesAddr, numSamples, @@ -1636,7 +1635,7 @@ static u32 sceAtracResetPlayPosition(int atracID, int sample, int bytesWrittenFi } if (atrac->context_.IsValid()) { - _AtracGenerateContext(atrac); + _AtracWriteContextToPSPMem(atrac); } return hleDelayResult(hleLogSuccessInfoI(ME, 0), "reset play pos", 3000); } @@ -1793,7 +1792,7 @@ static u32 sceAtracSetData(int atracID, u32 buffer, u32 bufferSize) { return ret; } - if (atrac->codecType_ != atracIDTypes[atracID]) { + if (atrac->codecType_ != atracContextTypes[atracID]) { // TODO: Should this not change the buffer size? return hleReportError(ME, ATRAC_ERROR_WRONG_CODECTYPE, "atracID uses different codec type than data"); } @@ -1871,20 +1870,20 @@ static u32 sceAtracSetLoopNum(int atracID, int loopNum) { atrac->loopEndSample_ = atrac->endSample_ + atrac->firstSampleOffset_ + atrac->FirstOffsetExtra(); } if (atrac->context_.IsValid()) { - _AtracGenerateContext(atrac); + _AtracWriteContextToPSPMem(atrac); } return hleLogSuccessI(ME, 0); } static int sceAtracReinit(int at3Count, int at3plusCount) { for (int i = 0; i < PSP_NUM_ATRAC_IDS; ++i) { - if (atracIDs[i] != NULL) { + if (atracContexts[i] != nullptr) { ERROR_LOG_REPORT(ME, "sceAtracReinit(%d, %d): cannot reinit while IDs in use", at3Count, at3plusCount); return SCE_KERNEL_ERROR_BUSY; } } - memset(atracIDTypes, 0, sizeof(atracIDTypes)); + memset(atracContextTypes, 0, sizeof(atracContextTypes)); int next = 0; int space = PSP_NUM_ATRAC_IDS; @@ -1900,13 +1899,13 @@ static int sceAtracReinit(int at3Count, int at3plusCount) { for (int i = 0; i < at3plusCount; ++i) { space -= 2; if (space >= 0) { - atracIDTypes[next++] = PSP_MODE_AT_3_PLUS; + atracContextTypes[next++] = PSP_MODE_AT_3_PLUS; } } for (int i = 0; i < at3Count; ++i) { space -= 1; if (space >= 0) { - atracIDTypes[next++] = PSP_MODE_AT_3; + atracContextTypes[next++] = PSP_MODE_AT_3; } } @@ -1929,7 +1928,7 @@ static int sceAtracGetOutputChannel(int atracID, u32 outputChanPtr) { return err; } if (Memory::IsValidAddress(outputChanPtr)) { - Memory::Write_U32(atrac->outputChannels_, outputChanPtr); + Memory::WriteUnchecked_U32(atrac->outputChannels_, outputChanPtr); return hleLogSuccessI(ME, 0); } else { return hleLogError(ME, 0, "invalid address"); @@ -2065,13 +2064,15 @@ static int sceAtracSetAA3DataAndGetID(u32 buffer, u32 bufferSize, u32 fileSize, return _AtracSetData(atracID, buffer, bufferSize, bufferSize, true); } +// Used by SasAudio's AT3 integration. int _AtracGetIDByContext(u32 contextAddr) { int atracID = (int)Memory::Read_U32(contextAddr + 0xfc); return atracID; } -void _AtracGenerateContext(Atrac *atrac) { - SceAtracId *context = atrac->context_; +void _AtracWriteContextToPSPMem(Atrac *atrac) { + // context points into PSP memory. + SceAtracContext *context = atrac->context_; context->info.buffer = atrac->first_.addr; context->info.bufferByte = atrac->bufferMaxSize_; context->info.secondBuffer = atrac->second_.addr; @@ -2102,7 +2103,7 @@ void _AtracGenerateContext(Atrac *atrac) { u8 *buf = (u8 *)context; *(u32_le *)(buf + 0xfc) = atrac->atracID_; - NotifyMemInfo(MemBlockFlags::WRITE, atrac->context_.ptr, sizeof(SceAtracId), "AtracContext"); + NotifyMemInfo(MemBlockFlags::WRITE, atrac->context_.ptr, sizeof(SceAtracContext), "AtracContext"); } static u32 _sceAtracGetContextAddress(int atracID) { @@ -2113,17 +2114,17 @@ static u32 _sceAtracGetContextAddress(int atracID) { } if (!atrac->context_.IsValid()) { // allocate a new context_ - u32 contextsize = 256; - atrac->context_ = kernelMemory.Alloc(contextsize, false, StringFromFormat("AtracCtx/%d", atracID).c_str()); + u32 contextSize = sizeof(SceAtracContext); + // Note that Alloc can increase contextSize to the "grain" size. + atrac->context_ = kernelMemory.Alloc(contextSize, false, StringFromFormat("AtracCtx/%d", atracID).c_str()); if (atrac->context_.IsValid()) - Memory::Memset(atrac->context_.ptr, 0, 256, "AtracContextClear"); - + Memory::Memset(atrac->context_.ptr, 0, contextSize, "AtracContextClear"); WARN_LOG(ME, "%08x=_sceAtracGetContextAddress(%i): allocated new context", atrac->context_.ptr, atracID); } else WARN_LOG(ME, "%08x=_sceAtracGetContextAddress(%i)", atrac->context_.ptr, atracID); if (atrac->context_.IsValid()) - _AtracGenerateContext(atrac); + _AtracWriteContextToPSPMem(atrac); return atrac->context_.ptr; } @@ -2147,27 +2148,6 @@ static const At3HeaderMap at3HeaderMap[] = { { 0x00C0, 2, 1 }, // 66 kbps stereo }; -static bool initAT3Decoder(Atrac *atrac) { - atrac->bitrate_ = (atrac->bytesPerFrame_ * 352800) / 1000; - atrac->bitrate_ = (atrac->bitrate_ + 511) >> 10; - atrac->jointStereo_ = false; - - // See if we can match the actual jointStereo value. - for (size_t i = 0; i < ARRAY_SIZE(at3HeaderMap); ++i) { - if (at3HeaderMap[i].Matches(atrac)) { - atrac->jointStereo_ = at3HeaderMap[i].jointStereo; - return true; - } - } - return false; -} - -static void initAT3plusDecoder(Atrac *atrac) { - atrac->bitrate_ = (atrac->bytesPerFrame_ * 352800) / 1000; - atrac->bitrate_ = ((atrac->bitrate_ >> 11) + 8) & 0xFFFFFFF0; - atrac->jointStereo_ = false; -} - static int sceAtracLowLevelInitDecoder(int atracID, u32 paramsAddr) { Atrac *atrac = getAtrac(atracID); if (!atrac) { @@ -2195,12 +2175,26 @@ static int sceAtracLowLevelInitDecoder(int atracID, u32 paramsAddr) { const char *channelName = atrac->channels_ == 1 ? "mono" : "stereo"; if (atrac->codecType_ == PSP_MODE_AT_3) { - if (!initAT3Decoder(atrac)) { + atrac->bitrate_ = (atrac->bytesPerFrame_ * 352800) / 1000; + atrac->bitrate_ = (atrac->bitrate_ + 511) >> 10; + atrac->jointStereo_ = false; + + // See if we can match the actual jointStereo value. + bool found = false; + for (size_t i = 0; i < ARRAY_SIZE(at3HeaderMap); ++i) { + if (at3HeaderMap[i].Matches(atrac)) { + atrac->jointStereo_ = at3HeaderMap[i].jointStereo; + found = true; + } + } + if (!found) { ERROR_LOG_REPORT(ME, "AT3 header map lacks entry for bpf: %i channels: %i", atrac->bytesPerFrame_, atrac->channels_); // TODO: Should we return an error code for these values? } } else if (atrac->codecType_ == PSP_MODE_AT_3_PLUS) { - initAT3plusDecoder(atrac); + atrac->bitrate_ = (atrac->bytesPerFrame_ * 352800) / 1000; + atrac->bitrate_ = ((atrac->bitrate_ >> 11) + 8) & 0xFFFFFFF0; + atrac->jointStereo_ = false; } atrac->dataOff_ = 0; @@ -2211,7 +2205,7 @@ static int sceAtracLowLevelInitDecoder(int atracID, u32 paramsAddr) { int ret = __AtracSetContext(atrac); if (atrac->context_.IsValid()) { - _AtracGenerateContext(atrac); + _AtracWriteContextToPSPMem(atrac); } if (ret < 0) { diff --git a/Core/HLE/sceAtrac.h b/Core/HLE/sceAtrac.h index cc2c14e943..344f8c26f4 100644 --- a/Core/HLE/sceAtrac.h +++ b/Core/HLE/sceAtrac.h @@ -77,7 +77,7 @@ struct SceAtracIdInfo { u8 unk[56]; }; -struct SceAtracId { +struct SceAtracContext { // size 128 SceAudiocodecCodec codec; // size 128 diff --git a/Core/HW/Atrac3Standalone.cpp b/Core/HW/Atrac3Standalone.cpp index 2b2ec92f3c..b109effd44 100644 --- a/Core/HW/Atrac3Standalone.cpp +++ b/Core/HW/Atrac3Standalone.cpp @@ -46,7 +46,7 @@ public: return codecOpen_; } - void FlushBuffers() { + void FlushBuffers() override { if (at3Ctx_) { atrac3_flush_buffers(at3Ctx_); } diff --git a/Core/HW/SimpleAudioDec.cpp b/Core/HW/SimpleAudioDec.cpp index a6555b8095..abf7722d1d 100644 --- a/Core/HW/SimpleAudioDec.cpp +++ b/Core/HW/SimpleAudioDec.cpp @@ -55,7 +55,9 @@ extern "C" { // AAC decoder candidates: // * https://github.com/mstorsjo/fdk-aac/tree/master - +// h.264 decoder candidates: +// * https://github.com/meerkat-cv/h264_decoder +// * https://github.com/shengbinmeng/ffmpeg-h264-dec // minimp3-based decoder. class MiniMp3Audio : public AudioDecoder { @@ -93,10 +95,11 @@ private: }; // FFMPEG-based decoder. TODO: Replace with individual codecs. -class SimpleAudio : public AudioDecoder { +// Based on http://ffmpeg.org/doxygen/trunk/doc_2examples_2decoding_encoding_8c-example.html#_a13 +class FFmpegAudioDecoder : public AudioDecoder { public: - SimpleAudio(PSPAudioType audioType, int sampleRateHz = 44100, int channels = 2); - ~SimpleAudio(); + FFmpegAudioDecoder(PSPAudioType audioType, int sampleRateHz = 44100, int channels = 2); + ~FFmpegAudioDecoder(); bool Decode(const uint8_t* inbuf, int inbytes, int *inbytesConsumed, uint8_t *outbuf, int *outbytes) override; bool IsOK() const override { @@ -142,7 +145,7 @@ AudioDecoder *CreateAudioDecoder(PSPAudioType audioType, int sampleRateHz, int c return CreateAtrac3PlusAudio(channels, blockAlign); default: // Only AAC falls back to FFMPEG now. - return new SimpleAudio(audioType, sampleRateHz, channels); + return new FFmpegAudioDecoder(audioType, sampleRateHz, channels); } } @@ -165,7 +168,7 @@ static int GetAudioCodecID(int audioType) { #endif // USE_FFMPEG } -SimpleAudio::SimpleAudio(PSPAudioType audioType, int sampleRateHz, int channels) +FFmpegAudioDecoder::FFmpegAudioDecoder(PSPAudioType audioType, int sampleRateHz, int channels) : audioType(audioType), sample_rate_(sampleRateHz), channels_(channels) { #ifdef USE_FFMPEG @@ -205,7 +208,7 @@ SimpleAudio::SimpleAudio(PSPAudioType audioType, int sampleRateHz, int channels) #endif // USE_FFMPEG } -bool SimpleAudio::OpenCodec(int block_align) { +bool FFmpegAudioDecoder::OpenCodec(int block_align) { #ifdef USE_FFMPEG // Some versions of FFmpeg require this set. May be set in SetExtraData(), but optional. // When decoding, we decode by packet, so we know the size. @@ -226,7 +229,7 @@ bool SimpleAudio::OpenCodec(int block_align) { #endif // USE_FFMPEG } -void SimpleAudio::SetChannels(int channels) { +void FFmpegAudioDecoder::SetChannels(int channels) { if (channels_ == channels) { // Do nothing, already set. return; @@ -243,7 +246,7 @@ void SimpleAudio::SetChannels(int channels) { #endif } -SimpleAudio::~SimpleAudio() { +FFmpegAudioDecoder::~FFmpegAudioDecoder() { #ifdef USE_FFMPEG swr_free(&swrCtx_); av_frame_free(&frame_); @@ -261,7 +264,7 @@ SimpleAudio::~SimpleAudio() { } // Decodes a single input frame. -bool SimpleAudio::Decode(const uint8_t *inbuf, int inbytes, int *inbytesConsumed, uint8_t *outbuf, int *outbytes) { +bool FFmpegAudioDecoder::Decode(const uint8_t *inbuf, int inbytes, int *inbytesConsumed, uint8_t *outbuf, int *outbytes) { #ifdef USE_FFMPEG if (!codecOpen_) { OpenCodec(inbytes); @@ -368,7 +371,7 @@ void AudioClose(AudioDecoder **ctx) { #endif // USE_FFMPEG } -void AudioClose(SimpleAudio **ctx) { +void AudioClose(FFmpegAudioDecoder **ctx) { #ifdef USE_FFMPEG delete *ctx; *ctx = 0; @@ -408,10 +411,6 @@ AuCtx::~AuCtx() { } size_t AuCtx::FindNextMp3Sync() { - if (decoder->GetAudioType() != PSP_CODEC_MP3) { - return 0; - } - for (size_t i = 0; i < sourcebuff.size() - 2; ++i) { if ((sourcebuff[i] & 0xFF) == 0xFF && (sourcebuff[i + 1] & 0xC0) == 0xC0) { return i; @@ -432,7 +431,10 @@ u32 AuCtx::AuDecode(u32 pcmAddr) { // Decode a single frame in sourcebuff and output into PCMBuf. if (!sourcebuff.empty()) { // FFmpeg doesn't seem to search for a sync for us, so let's do that. - int nextSync = (int)FindNextMp3Sync(); + int nextSync = 0; + if (decoder->GetAudioType() == PSP_CODEC_MP3) { + nextSync = (int)FindNextMp3Sync(); + } int inbytesConsumed = 0; decoder->Decode(&sourcebuff[nextSync], (int)sourcebuff.size() - nextSync, &inbytesConsumed, outbuf, &outpcmbufsize); @@ -546,18 +548,18 @@ u32 AuCtx::AuGetInfoToAddStreamData(u32 bufPtr, u32 sizePtr, u32 srcPosPtr) { // we can recharge AuBuf from its beginning if (readsize != 0) { if (Memory::IsValidAddress(bufPtr)) - Memory::Write_U32(AuBuf + offset, bufPtr); + Memory::WriteUnchecked_U32(AuBuf + offset, bufPtr); if (Memory::IsValidAddress(sizePtr)) - Memory::Write_U32(readsize, sizePtr); + Memory::WriteUnchecked_U32(readsize, sizePtr); if (Memory::IsValidAddress(srcPosPtr)) - Memory::Write_U32(readPos, srcPosPtr); + Memory::WriteUnchecked_U32(readPos, srcPosPtr); } else { if (Memory::IsValidAddress(bufPtr)) - Memory::Write_U32(0, bufPtr); + Memory::WriteUnchecked_U32(0, bufPtr); if (Memory::IsValidAddress(sizePtr)) - Memory::Write_U32(0, sizePtr); + Memory::WriteUnchecked_U32(0, sizePtr); if (Memory::IsValidAddress(srcPosPtr)) - Memory::Write_U32(0, srcPosPtr); + Memory::WriteUnchecked_U32(0, srcPosPtr); } // Just for old save states. diff --git a/Core/HW/SimpleAudioDec.h b/Core/HW/SimpleAudioDec.h index d000850133..904b8f927f 100644 --- a/Core/HW/SimpleAudioDec.h +++ b/Core/HW/SimpleAudioDec.h @@ -20,11 +20,8 @@ #include "Core/HW/MediaEngine.h" #include "Core/HLE/sceAudio.h" -// Wraps FFMPEG for audio decoding in a nice interface. // Decodes packet by packet - does NOT demux. -// Based on http://ffmpeg.org/doxygen/trunk/doc_2examples_2decoding_encoding_8c-example.html#_a13 - // audioType enum PSPAudioType { PSP_CODEC_AT3PLUS = 0x00001000, From 52111103b8229119a106e92f1681a148dc04a0e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sat, 13 Apr 2024 09:40:16 +0200 Subject: [PATCH 119/719] Simplify the inner loop of ff_atrac3p_ipqf (prepare for SIMD) --- .editorconfig | 4 ++++ ext/at3_standalone/at3_decoders.h | 5 +++++ ext/at3_standalone/atrac3plusdsp.cpp | 14 ++++++++++---- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/.editorconfig b/.editorconfig index 7c6f14d27f..20d5c776b5 100644 --- a/.editorconfig +++ b/.editorconfig @@ -29,6 +29,10 @@ charset = utf-8-bom [Windows/{aboutbox.rc,version.rc}] charset = utf-8 +[ext/at3_standalone/**.{cpp,h}] +indent_style = space +indent_size = 4 + [libretro/**.{cpp,h}] indent_style = space indent_size = 3 diff --git a/ext/at3_standalone/at3_decoders.h b/ext/at3_standalone/at3_decoders.h index 97c9145e68..019ebe306d 100644 --- a/ext/at3_standalone/at3_decoders.h +++ b/ext/at3_standalone/at3_decoders.h @@ -2,6 +2,11 @@ #include +// Notes +// +// Performance-wise, these are OK. +// For Atrac3+, the bottleneck is two functions: decode_qu_spectra and ff_atrac3p_ipqf. At least the latter is quite SIMD-able. + // The full external API for the standalone Atrac3/3+ decoder. struct ATRAC3Context; diff --git a/ext/at3_standalone/atrac3plusdsp.cpp b/ext/at3_standalone/atrac3plusdsp.cpp index fcdb9caecb..27a296a937 100644 --- a/ext/at3_standalone/atrac3plusdsp.cpp +++ b/ext/at3_standalone/atrac3plusdsp.cpp @@ -624,12 +624,18 @@ void ff_atrac3p_ipqf(FFTContext *dct_ctx, Atrac3pIPQFChannelCtx *hist, pos_next = mod23_lut[pos_now + 2]; // pos_next = (pos_now + 1) % 23; for (t = 0; t < ATRAC3P_PQF_FIR_LEN; t++) { + const float *buf1 = hist->buf1[pos_now]; + const float *buf2 = hist->buf2[pos_next]; + const float *coeffs1 = ipqf_coeffs1[t]; + const float *coeffs2 = ipqf_coeffs2[t]; + + float *outp = out + s * 16; for (i = 0; i < 8; i++) { - out[s * 16 + i + 0] += hist->buf1[pos_now][i] * ipqf_coeffs1[t][i] + - hist->buf2[pos_next][i] * ipqf_coeffs2[t][i]; - out[s * 16 + i + 8] += hist->buf1[pos_now][7 - i] * ipqf_coeffs1[t][i + 8] + - hist->buf2[pos_next][7 - i] * ipqf_coeffs2[t][i + 8]; + outp[i] += buf1[i] * coeffs1[i] + buf2[i] * coeffs2[i]; } + for (i = 0; i < 8; i++) { + outp[i + 8] += buf1[7 - i] * coeffs1[i + 8] + buf2[7 - i] * coeffs2[i + 8]; + } pos_now = mod23_lut[pos_next + 2]; // pos_now = (pos_now + 2) % 23; pos_next = mod23_lut[pos_now + 2]; // pos_next = (pos_next + 2) % 23; From 7b6b7ebe3c14ee10278a2c9f1548ed2537b049c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sat, 13 Apr 2024 10:10:31 +0200 Subject: [PATCH 120/719] Add some SSE code for an atrac hotspot just for fun, remove function pointers --- ext/at3_standalone/atrac3.cpp | 2 +- ext/at3_standalone/atrac3plusdsp.cpp | 47 ++++++++++++++++++++++++---- ext/at3_standalone/compat.h | 3 ++ ext/at3_standalone/fft.cpp | 32 ++++++++----------- ext/at3_standalone/fft.h | 26 ++++++++------- 5 files changed, 72 insertions(+), 38 deletions(-) diff --git a/ext/at3_standalone/atrac3.cpp b/ext/at3_standalone/atrac3.cpp index 7b2ca124eb..fe0e71c841 100644 --- a/ext/at3_standalone/atrac3.cpp +++ b/ext/at3_standalone/atrac3.cpp @@ -140,7 +140,7 @@ static void imlt(ATRAC3Context *q, float *input, float *output, int odd_band) FFSWAP(float, input[i], input[255 - i]); } - q->mdct_ctx.imdct_calc(&q->mdct_ctx, output, input); + imdct_calc(&q->mdct_ctx, output, input); /* Perform windowing on the output. */ vector_fmul(output, output, mdct_window, MDCT_SIZE); diff --git a/ext/at3_standalone/atrac3plusdsp.cpp b/ext/at3_standalone/atrac3plusdsp.cpp index 27a296a937..690f93fc9d 100644 --- a/ext/at3_standalone/atrac3plusdsp.cpp +++ b/ext/at3_standalone/atrac3plusdsp.cpp @@ -25,6 +25,22 @@ * DSP functions for ATRAC3+ decoder. */ +#include "ppsspp_config.h" + +#if PPSSPP_ARCH(X86) || PPSSPP_ARCH(AMD64) + +#include + +#elif PPSSPP_ARCH(ARM_NEON) + +#if defined(_MSC_VER) && PPSSPP_ARCH(ARM64) +#include +#else +#include +#endif + +#endif + #include #include @@ -466,7 +482,7 @@ void ff_atrac3p_imdct(FFTContext *mdct_ctx, float *pIn, for (i = 0; i < ATRAC3P_SUBBAND_SAMPLES / 2; i++) FFSWAP(float, pIn[i], pIn[ATRAC3P_SUBBAND_SAMPLES - 1 - i]); - mdct_ctx->imdct_calc(mdct_ctx, pOut, pIn); + imdct_calc(mdct_ctx, pOut, pIn); /* Perform windowing on the output. * ATRAC3+ uses two different MDCT windows: @@ -612,7 +628,7 @@ void ff_atrac3p_ipqf(FFTContext *dct_ctx, Atrac3pIPQFChannelCtx *hist, idct_in[sb] = in[sb * ATRAC3P_SUBBAND_SAMPLES + s]; /* Calculate the sine and cosine part of the PQF using IDCT-IV */ - dct_ctx->imdct_half(dct_ctx, idct_out, idct_in); + imdct_half(dct_ctx, idct_out, idct_in); /* append the result to the history */ for (i = 0; i < 8; i++) { @@ -629,13 +645,32 @@ void ff_atrac3p_ipqf(FFTContext *dct_ctx, Atrac3pIPQFChannelCtx *hist, const float *coeffs1 = ipqf_coeffs1[t]; const float *coeffs2 = ipqf_coeffs2[t]; - float *outp = out + s * 16; + float *outp = out + s * 16; +#if PPSSPP_ARCH(X86) || PPSSPP_ARCH(AMD64) + auto _mm_reverse = [](__m128 x) -> __m128 { + return _mm_shuffle_ps(x, x, _MM_SHUFFLE(0, 1, 2, 3)); + }; + _mm_storeu_ps(outp, _mm_add_ps(_mm_loadu_ps(outp), _mm_add_ps( + _mm_mul_ps(_mm_loadu_ps(buf1), _mm_loadu_ps(coeffs1)), + _mm_mul_ps(_mm_loadu_ps(buf2), _mm_loadu_ps(coeffs2))))); + _mm_storeu_ps(outp + 4, _mm_add_ps(_mm_loadu_ps(outp + 4), _mm_add_ps( + _mm_mul_ps(_mm_loadu_ps(buf1 + 4), _mm_loadu_ps(coeffs1 + 4)), + _mm_mul_ps(_mm_loadu_ps(buf2 + 4), _mm_loadu_ps(coeffs2 + 4))))); + + _mm_storeu_ps(outp + 8, _mm_add_ps(_mm_loadu_ps(outp + 8), _mm_add_ps( + _mm_mul_ps(_mm_reverse(_mm_loadu_ps(buf1 + 4)), _mm_loadu_ps(coeffs1 + 8)), + _mm_mul_ps(_mm_reverse(_mm_loadu_ps(buf2 + 4)), _mm_loadu_ps(coeffs2 + 8))))); + _mm_storeu_ps(outp + 12, _mm_add_ps(_mm_loadu_ps(outp + 12), _mm_add_ps( + _mm_mul_ps(_mm_reverse(_mm_loadu_ps(buf1)), _mm_loadu_ps(coeffs1 + 12)), + _mm_mul_ps(_mm_reverse(_mm_loadu_ps(buf2)), _mm_loadu_ps(coeffs2 + 12))))); +#else for (i = 0; i < 8; i++) { outp[i] += buf1[i] * coeffs1[i] + buf2[i] * coeffs2[i]; } - for (i = 0; i < 8; i++) { - outp[i + 8] += buf1[7 - i] * coeffs1[i + 8] + buf2[7 - i] * coeffs2[i + 8]; - } + for (i = 0; i < 8; i++) { + outp[i + 8] += buf1[7 - i] * coeffs1[i + 8] + buf2[7 - i] * coeffs2[i + 8]; + } +#endif pos_now = mod23_lut[pos_next + 2]; // pos_now = (pos_now + 2) % 23; pos_next = mod23_lut[pos_now + 2]; // pos_next = (pos_next + 2) % 23; diff --git a/ext/at3_standalone/compat.h b/ext/at3_standalone/compat.h index 6c4a4ac45b..bd3e398b32 100644 --- a/ext/at3_standalone/compat.h +++ b/ext/at3_standalone/compat.h @@ -18,6 +18,9 @@ #define AV_HAVE_FAST_UNALIGNED 0 #define AV_INPUT_BUFFER_PADDING_SIZE 32 +// TODO: This should work but doesn't?? +// #define BITSTREAM_READER_LE + #define LOCAL_ALIGNED(bits, type, name, subscript) type name subscript #define av_restrict #define av_alias diff --git a/ext/at3_standalone/fft.cpp b/ext/at3_standalone/fft.cpp index 961c43b55d..184275f870 100644 --- a/ext/at3_standalone/fft.cpp +++ b/ext/at3_standalone/fft.cpp @@ -35,9 +35,9 @@ #define sqrthalf (float)M_SQRT1_2 -void ff_imdct_calc_c(FFTContext *s, FFTSample *output, const FFTSample *input); -void ff_imdct_half_c(FFTContext *s, FFTSample *output, const FFTSample *input); -void ff_mdct_calc_c(FFTContext *s, FFTSample *output, const FFTSample *input); +void imdct_calc(FFTContext *s, FFTSample *output, const FFTSample *input); +void imdct_half(FFTContext *s, FFTSample *output, const FFTSample *input); +void mdct_calc(FFTContext *s, FFTSample *output, const FFTSample *input); /* cos(2*pi*x/n) for 0<=x<=n/4, followed by its reverse */ COSTABLE(16); @@ -71,8 +71,8 @@ static FFTSample * const av_cos_tabs[] = { av_cos_65536, }; -static void fft_permute_c(FFTContext *s, FFTComplex *z); -static void fft_calc_c(FFTContext *s, FFTComplex *z); +void fft_permute(FFTContext *s, FFTComplex *z); +void fft_calc(FFTContext *s, FFTComplex *z); static int split_radix_permutation(int i, int n, int inverse) { @@ -130,11 +130,6 @@ int ff_fft_init(FFTContext *s, int nbits, int inverse) goto fail; s->inverse = inverse; - s->fft_permute = fft_permute_c; - s->fft_calc = fft_calc_c; - s->imdct_calc = ff_imdct_calc_c; - s->imdct_half = ff_imdct_half_c; - s->mdct_calc = ff_mdct_calc_c; for(j=4; j<=nbits; j++) { ff_init_ff_cos_tabs(j); } @@ -152,7 +147,7 @@ int ff_fft_init(FFTContext *s, int nbits, int inverse) return -1; } -static void fft_permute_c(FFTContext *s, FFTComplex *z) +void fft_permute(FFTContext *s, FFTComplex *z) { int j, np; const uint16_t *revtab = s->revtab; @@ -315,12 +310,11 @@ static void (* const fft_dispatch[])(FFTComplex*) = { fft2048, fft4096, fft8192, fft16384, fft32768, fft65536, }; -static void fft_calc_c(FFTContext *s, FFTComplex *z) +void fft_calc(FFTContext *s, FFTComplex *z) { fft_dispatch[s->nbits-2](z); } - #include #include @@ -383,7 +377,7 @@ fail: * @param output N/2 samples * @param input N/2 samples */ -void ff_imdct_half_c(FFTContext *s, FFTSample *output, const FFTSample *input) +void imdct_half(FFTContext *s, FFTSample *output, const FFTSample *input) { int k, n8, n4, n2, n, j; const uint16_t *revtab = s->revtab; @@ -406,7 +400,7 @@ void ff_imdct_half_c(FFTContext *s, FFTSample *output, const FFTSample *input) in1 += 2; in2 -= 2; } - s->fft_calc(s, z); + fft_calc(s, z); /* post rotation + reordering */ for (k = 0; k < n8; k++) { @@ -425,14 +419,14 @@ void ff_imdct_half_c(FFTContext *s, FFTSample *output, const FFTSample *input) * @param output N samples * @param input N/2 samples */ -void ff_imdct_calc_c(FFTContext *s, FFTSample *output, const FFTSample *input) +void imdct_calc(FFTContext *s, FFTSample *output, const FFTSample *input) { int k; int n = 1 << s->mdct_bits; int n2 = n >> 1; int n4 = n >> 2; - ff_imdct_half_c(s, output + n4, input); + imdct_half(s, output + n4, input); for (k = 0; k < n4; k++) { output[k] = -output[n2 - k - 1]; @@ -445,7 +439,7 @@ void ff_imdct_calc_c(FFTContext *s, FFTSample *output, const FFTSample *input) * @param input N samples * @param out N/2 samples */ -void ff_mdct_calc_c(FFTContext *s, FFTSample *out, const FFTSample *input) +void mdct_calc(FFTContext *s, FFTSample *out, const FFTSample *input) { int i, j, n, n8, n4, n2, n3; FFTDouble re, im; @@ -473,7 +467,7 @@ void ff_mdct_calc_c(FFTContext *s, FFTSample *out, const FFTSample *input) CMUL(x[j].re, x[j].im, re, im, -tcos[n8 + i], tsin[n8 + i]); } - s->fft_calc(s, x); + fft_calc(s, x); /* post rotation */ for (i = 0; i < n8; i++) { diff --git a/ext/at3_standalone/fft.h b/ext/at3_standalone/fft.h index 3c9e413bb1..d4dfd940ec 100644 --- a/ext/at3_standalone/fft.h +++ b/ext/at3_standalone/fft.h @@ -57,21 +57,23 @@ struct FFTContext { /* pre/post rotation tables */ FFTSample *tcos; FFTSample *tsin; - /** - * Do the permutation needed BEFORE calling fft_calc(). - */ - void (*fft_permute)(struct FFTContext *s, FFTComplex *z); - /** - * Do a complex FFT with the parameters defined in ff_fft_init(). The - * input data must be permuted before. No 1.0/sqrt(n) normalization is done. - */ - void (*fft_calc)(struct FFTContext *s, FFTComplex *z); - void (*imdct_calc)(struct FFTContext *s, FFTSample *output, const FFTSample *input); - void (*imdct_half)(struct FFTContext *s, FFTSample *output, const FFTSample *input); - void (*mdct_calc)(struct FFTContext *s, FFTSample *output, const FFTSample *input); + enum mdct_permutation_type mdct_permutation; }; +/** + * Do the permutation needed BEFORE calling fft_calc(). + */ +void fft_permute(struct FFTContext *s, FFTComplex *z); +/** + * Do a complex FFT with the parameters defined in ff_fft_init(). The + * input data must be permuted before. No 1.0/sqrt(n) normalization is done. + */ +void fft_calc(struct FFTContext *s, FFTComplex *z); +void imdct_calc(struct FFTContext *s, FFTSample *output, const FFTSample *input); +void imdct_half(struct FFTContext *s, FFTSample *output, const FFTSample *input); +void mdct_calc(struct FFTContext *s, FFTSample *output, const FFTSample *input); + #define COSTABLE(size) \ DECLARE_ALIGNED(32, FFTSample, av_cos_##size)[size/2] From 857584532fc0b0a3f85926e0361c9699919e30e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sat, 13 Apr 2024 10:35:09 +0200 Subject: [PATCH 121/719] Add NEON code too for the atrac3 hotspot --- ext/at3_standalone/atrac3plusdsp.cpp | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/ext/at3_standalone/atrac3plusdsp.cpp b/ext/at3_standalone/atrac3plusdsp.cpp index 690f93fc9d..81cbb30644 100644 --- a/ext/at3_standalone/atrac3plusdsp.cpp +++ b/ext/at3_standalone/atrac3plusdsp.cpp @@ -663,6 +663,26 @@ void ff_atrac3p_ipqf(FFTContext *dct_ctx, Atrac3pIPQFChannelCtx *hist, _mm_storeu_ps(outp + 12, _mm_add_ps(_mm_loadu_ps(outp + 12), _mm_add_ps( _mm_mul_ps(_mm_reverse(_mm_loadu_ps(buf1)), _mm_loadu_ps(coeffs1 + 12)), _mm_mul_ps(_mm_reverse(_mm_loadu_ps(buf2)), _mm_loadu_ps(coeffs2 + 12))))); +#elif PPSSPP_ARCH(ARM_NEON) + auto vreverseq_f32 = [](float32x4_t x) -> float32x4_t { + float32x4_t rev = vrev64q_f32(x); + float32x2_t high = vget_high_f32(rev); //{4,3} + float32x2_t low = vget_low_f32(rev); //{1,2} + return vcombine_f32(high, low); //{4,3,2,1} + }; + vst1q_f32(outp, vaddq_f32(vld1q_f32(outp), vaddq_f32( + vmulq_f32(vld1q_f32(buf1), vld1q_f32(coeffs1)), + vmulq_f32(vld1q_f32(buf2), vld1q_f32(coeffs2))))); + vst1q_f32(outp + 4, vaddq_f32(vld1q_f32(outp + 4), vaddq_f32( + vmulq_f32(vld1q_f32(buf1 + 4), vld1q_f32(coeffs1 + 4)), + vmulq_f32(vld1q_f32(buf2 + 4), vld1q_f32(coeffs2 + 4))))); + + vst1q_f32(outp + 8, vaddq_f32(vld1q_f32(outp + 8), vaddq_f32( + vmulq_f32(vreverseq_f32(vld1q_f32(buf1 + 4)), vld1q_f32(coeffs1 + 8)), + vmulq_f32(vreverseq_f32(vld1q_f32(buf2 + 4)), vld1q_f32(coeffs2 + 8))))); + vst1q_f32(outp + 12, vaddq_f32(vld1q_f32(outp + 12), vaddq_f32( + vmulq_f32(vreverseq_f32(vld1q_f32(buf1)), vld1q_f32(coeffs1 + 12)), + vmulq_f32(vreverseq_f32(vld1q_f32(buf2)), vld1q_f32(coeffs2 + 12))))); #else for (i = 0; i < 8; i++) { outp[i] += buf1[i] * coeffs1[i] + buf2[i] * coeffs2[i]; From fd315a324a6ff96ae5a8d7e9f9075fe5ddd71410 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sat, 13 Apr 2024 10:46:44 +0200 Subject: [PATCH 122/719] Help the compiler out slightly (it can't see that the pos is constant) --- ext/at3_standalone/atrac3plusdsp.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ext/at3_standalone/atrac3plusdsp.cpp b/ext/at3_standalone/atrac3plusdsp.cpp index 81cbb30644..004515819c 100644 --- a/ext/at3_standalone/atrac3plusdsp.cpp +++ b/ext/at3_standalone/atrac3plusdsp.cpp @@ -631,9 +631,12 @@ void ff_atrac3p_ipqf(FFTContext *dct_ctx, Atrac3pIPQFChannelCtx *hist, imdct_half(dct_ctx, idct_out, idct_in); /* append the result to the history */ + const int hist_pos = hist->pos; for (i = 0; i < 8; i++) { - hist->buf1[hist->pos][i] = idct_out[i + 8]; - hist->buf2[hist->pos][i] = idct_out[7 - i]; + hist->buf1[hist_pos][i] = idct_out[i + 8]; + } + for (i = 0; i < 8; i++) { + hist->buf2[hist_pos][i] = idct_out[7 - i]; } pos_now = hist->pos; From 09be5935ab58e2d44aa740387b16637f8a314532 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 14 Apr 2024 10:26:30 +0200 Subject: [PATCH 123/719] Add accessor for bufferState_, cleanup --- Core/HLE/sceAtrac.cpp | 47 +++++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp index 9aae6db15b..c93332735a 100644 --- a/Core/HLE/sceAtrac.cpp +++ b/Core/HLE/sceAtrac.cpp @@ -158,14 +158,6 @@ struct AtracLoopInfo { int playCount; }; -#ifndef USE_FFMPEG -struct AVPacket { - uint8_t *data; - int size; - int64_t pos; -}; -#endif - struct Atrac { Atrac() { memset(&first_, 0, sizeof(first_)); @@ -414,13 +406,16 @@ struct Atrac { bool ignoreDataBuf_ = false; u32 codecType_ = 0; - AtracStatus bufferState_ = ATRAC_STATUS_NO_DATA; InputBuffer first_; InputBuffer second_; PSPPointer context_; + AtracStatus BufferState() const { + return bufferState_; + } + void ForceSeekToSample(int sample) { if (decoder_) { decoder_->FlushBuffers(); @@ -493,6 +488,19 @@ struct Atrac { } } + void UpdateFromPSPRam() { + if (context_.IsValid()) { + // Read in any changes from the game to the context. + // TODO: Might be better to just always track in RAM. + bufferState_ = context_->info.state; + // This value is actually abused by games to store the SAS voice number. + loopNum_ = context_->info.loopNum; + } + } + + // To be moved into private. + AtracStatus bufferState_ = ATRAC_STATUS_NO_DATA; + private: void AnalyzeReset(); }; @@ -576,13 +584,8 @@ static Atrac *getAtrac(int atracID) { return nullptr; } Atrac *atrac = atracContexts[atracID]; - - if (atrac && atrac->context_.IsValid()) { - // Read in any changes from the game to the context. - // TODO: Might be better to just always track in RAM. - atrac->bufferState_ = atrac->context_->info.state; - // This value is actually abused by games to store the SAS voice number. - atrac->loopNum_ = atrac->context_->info.loopNum; + if (atrac) { + atrac->UpdateFromPSPRam(); } return atrac; } @@ -642,13 +645,13 @@ int Atrac::Analyze(u32 addr, u32 size) { return hleReportError(ME, ATRAC_ERROR_SIZE_TOO_SMALL, "buffer too small"); } + // TODO: Check the range (addr, size) instead. if (!Memory::IsValidAddress(first_.addr)) { return hleReportWarning(ME, SCE_KERNEL_ERROR_ILLEGAL_ADDRESS, "invalid buffer address"); } // TODO: Validate stuff. - - if (Memory::Read_U32(first_.addr) != RIFF_CHUNK_MAGIC) { + if (Memory::ReadUnchecked_U32(first_.addr) != RIFF_CHUNK_MAGIC) { return hleReportError(ME, ATRAC_ERROR_UNKNOWN_FORMAT, "invalid RIFF header"); } @@ -928,7 +931,7 @@ u32 _AtracAddStreamData(int atracID, u32 bufPtr, u32 bytesToAdd) { static u32 AtracValidateData(const Atrac *atrac) { if (!atrac) { return hleLogError(ME, ATRAC_ERROR_BAD_ATRACID, "bad atrac ID"); - } else if (atrac->bufferState_ == ATRAC_STATUS_NO_DATA) { + } else if (atrac->BufferState() == ATRAC_STATUS_NO_DATA) { return hleLogError(ME, ATRAC_ERROR_NO_DATA, "no data"); } else { return 0; @@ -938,11 +941,11 @@ static u32 AtracValidateData(const Atrac *atrac) { static u32 AtracValidateManaged(const Atrac *atrac) { if (!atrac) { return hleLogError(ME, ATRAC_ERROR_BAD_ATRACID, "bad atrac ID"); - } else if (atrac->bufferState_ == ATRAC_STATUS_NO_DATA) { + } else if (atrac->BufferState() == ATRAC_STATUS_NO_DATA) { return hleLogError(ME, ATRAC_ERROR_NO_DATA, "no data"); - } else if (atrac->bufferState_ == ATRAC_STATUS_LOW_LEVEL) { + } else if (atrac->BufferState() == ATRAC_STATUS_LOW_LEVEL) { return hleLogError(ME, ATRAC_ERROR_IS_LOW_LEVEL, "low level stream, can't use"); - } else if (atrac->bufferState_ == ATRAC_STATUS_FOR_SCESAS) { + } else if (atrac->BufferState() == ATRAC_STATUS_FOR_SCESAS) { return hleLogError(ME, ATRAC_ERROR_IS_FOR_SCESAS, "SAS stream, can't use"); } else { return 0; From eef667c5ac6bc6a3966d75923c37c65bf7d6668f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 14 Apr 2024 10:38:31 +0200 Subject: [PATCH 124/719] Separate the external interface used by sceSas --- Core/HLE/sceAtrac.cpp | 147 +++++++++++++++++++++--------------------- Core/HLE/sceAtrac.h | 11 ++-- Core/HW/SasAudio.cpp | 6 +- 3 files changed, 81 insertions(+), 83 deletions(-) diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp index c93332735a..8ffe3976e8 100644 --- a/Core/HLE/sceAtrac.cpp +++ b/Core/HLE/sceAtrac.cpp @@ -147,7 +147,6 @@ struct InputBuffer { struct Atrac; int __AtracSetContext(Atrac *atrac); -static void _AtracWriteContextToPSPMem(Atrac *atrac); struct AtracLoopInfo { int cuePointID; @@ -488,7 +487,7 @@ struct Atrac { } } - void UpdateFromPSPRam() { + void UpdateFromPSPMem() { if (context_.IsValid()) { // Read in any changes from the game to the context. // TODO: Might be better to just always track in RAM. @@ -498,6 +497,8 @@ struct Atrac { } } + void WriteContextToPSPMem(); + // To be moved into private. AtracStatus bufferState_ = ATRAC_STATUS_NO_DATA; @@ -585,7 +586,7 @@ static Atrac *getAtrac(int atracID) { } Atrac *atrac = atracContexts[atracID]; if (atrac) { - atrac->UpdateFromPSPRam(); + atrac->UpdateFromPSPMem(); } return atrac; } @@ -908,10 +909,7 @@ static u32 sceAtracGetAtracID(int codecType) { return hleLogSuccessInfoI(ME, atracID); } -u32 _AtracAddStreamData(int atracID, u32 bufPtr, u32 bytesToAdd) { - Atrac *atrac = getAtrac(atracID); - if (!atrac) - return 0; +static u32 _AtracAddStreamData(Atrac *atrac, u32 bufPtr, u32 bytesToAdd) { int addbytes = std::min(bytesToAdd, atrac->first_.filesize - atrac->first_.fileoffset - atrac->FirstOffsetExtra()); Memory::Memcpy(atrac->dataBuf_ + atrac->first_.fileoffset + atrac->FirstOffsetExtra(), bufPtr, addbytes, "AtracAddStreamData"); atrac->first_.size += bytesToAdd; @@ -921,10 +919,8 @@ u32 _AtracAddStreamData(int atracID, u32 bufPtr, u32 bytesToAdd) { atrac->bufferState_ = ATRAC_STATUS_ALL_DATA_LOADED; } atrac->first_.fileoffset += addbytes; - if (atrac->context_.IsValid()) { - // refresh context_ - _AtracWriteContextToPSPMem(atrac); - } + // refresh context_ + atrac->WriteContextToPSPMem(); return 0; } @@ -1043,9 +1039,7 @@ static u32 sceAtracAddStreamData(int atracID, u32 bytesToAdd) { atrac->first_.size = atrac->first_.filesize; if (atrac->bufferState_ == ATRAC_STATUS_HALFWAY_BUFFER) atrac->bufferState_ = ATRAC_STATUS_ALL_DATA_LOADED; - if (atrac->context_.IsValid()) { - _AtracWriteContextToPSPMem(atrac); - } + atrac->WriteContextToPSPMem(); } atrac->first_.offset += bytesToAdd; @@ -1059,15 +1053,7 @@ static u32 sceAtracAddStreamData(int atracID, u32 bytesToAdd) { return hleLogSuccessI(ME, 0); } -u32 _AtracDecodeData(int atracID, u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u32 *finish, int *remains) { - Atrac *atrac = getAtrac(atracID); - - if (atrac == NULL) { - return ATRAC_ERROR_BAD_ATRACID; - } else if (!atrac->dataBuf_) { - return ATRAC_ERROR_NO_DATA; - } - +static u32 _AtracDecodeData(Atrac *atrac, u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u32 *finish, int *remains) { int loopNum = atrac->loopNum_; if (atrac->bufferState_ == ATRAC_STATUS_FOR_SCESAS) { // TODO: Might need more testing. @@ -1078,10 +1064,8 @@ u32 _AtracDecodeData(int atracID, u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u3 if (atrac->currentSample_ >= atrac->endSample_ && loopNum == 0) { *SamplesNum = 0; *finish = 1; - if (atrac->context_.IsValid()) { - // refresh context_ - _AtracWriteContextToPSPMem(atrac); - } + // refresh context_ + atrac->WriteContextToPSPMem(); return ATRAC_ERROR_ALL_DATA_DECODED; } @@ -1198,20 +1182,24 @@ u32 _AtracDecodeData(int atracID, u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u3 *finish = finishFlag; *remains = atrac->RemainingFrames(); - if (atrac->context_.IsValid()) { - // refresh context_ - _AtracWriteContextToPSPMem(atrac); - } + // refresh context_ + atrac->WriteContextToPSPMem(); return 0; } +// Note that outAddr being null is completely valid here, used to skip data. static u32 sceAtracDecodeData(int atracID, u32 outAddr, u32 numSamplesAddr, u32 finishFlagAddr, u32 remainAddr) { - // Note that outAddr being null is completely valid here, used to skip data. + Atrac *atrac = getAtrac(atracID); + if (atrac == NULL) { + return ATRAC_ERROR_BAD_ATRACID; + } else if (!atrac->dataBuf_) { // TODO: Should check bufferState instead? + return ATRAC_ERROR_NO_DATA; + } u32 numSamples = 0; u32 finish = 0; int remains = 0; - int ret = _AtracDecodeData(atracID, Memory::GetPointerWrite(outAddr), outAddr, &numSamples, &finish, &remains); + int ret = _AtracDecodeData(atrac, Memory::GetPointerWrite(outAddr), outAddr, &numSamples, &finish, &remains); if (ret != (int)ATRAC_ERROR_BAD_ATRACID && ret != (int)ATRAC_ERROR_NO_DATA) { if (Memory::IsValidAddress(numSamplesAddr)) Memory::WriteUnchecked_U32(numSamples, numSamplesAddr); @@ -1637,9 +1625,7 @@ static u32 sceAtracResetPlayPosition(int atracID, int sample, int bytesWrittenFi atrac->SeekToSample(sample); } - if (atrac->context_.IsValid()) { - _AtracWriteContextToPSPMem(atrac); - } + atrac->WriteContextToPSPMem(); return hleDelayResult(hleLogSuccessInfoI(ME, 0), "reset play pos", 3000); } @@ -1872,9 +1858,7 @@ static u32 sceAtracSetLoopNum(int atracID, int loopNum) { atrac->loopStartSample_ = atrac->firstSampleOffset_ + atrac->FirstOffsetExtra(); atrac->loopEndSample_ = atrac->endSample_ + atrac->firstSampleOffset_ + atrac->FirstOffsetExtra(); } - if (atrac->context_.IsValid()) { - _AtracWriteContextToPSPMem(atrac); - } + atrac->WriteContextToPSPMem(); return hleLogSuccessI(ME, 0); } @@ -2067,46 +2051,43 @@ static int sceAtracSetAA3DataAndGetID(u32 buffer, u32 bufferSize, u32 fileSize, return _AtracSetData(atracID, buffer, bufferSize, bufferSize, true); } -// Used by SasAudio's AT3 integration. -int _AtracGetIDByContext(u32 contextAddr) { - int atracID = (int)Memory::Read_U32(contextAddr + 0xfc); - return atracID; -} - -void _AtracWriteContextToPSPMem(Atrac *atrac) { +void Atrac::WriteContextToPSPMem() { + if (!context_.IsValid()) { + return; + } // context points into PSP memory. - SceAtracContext *context = atrac->context_; - context->info.buffer = atrac->first_.addr; - context->info.bufferByte = atrac->bufferMaxSize_; - context->info.secondBuffer = atrac->second_.addr; - context->info.secondBufferByte = atrac->second_.size; - context->info.codec = atrac->codecType_; - context->info.loopNum = atrac->loopNum_; - context->info.loopStart = atrac->loopStartSample_ > 0 ? atrac->loopStartSample_ : 0; - context->info.loopEnd = atrac->loopEndSample_ > 0 ? atrac->loopEndSample_ : 0; + SceAtracContext *context = context_; + context->info.buffer = first_.addr; + context->info.bufferByte = bufferMaxSize_; + context->info.secondBuffer = second_.addr; + context->info.secondBufferByte = second_.size; + context->info.codec = codecType_; + context->info.loopNum = loopNum_; + context->info.loopStart = loopStartSample_ > 0 ? loopStartSample_ : 0; + context->info.loopEnd = loopEndSample_ > 0 ? loopEndSample_ : 0; // Note that we read in the state when loading the atrac object, so it's safe // to update it back here all the time. Some games, like Sol Trigger, change it. // TODO: Should we just keep this in PSP ram then, or something? - context->info.state = atrac->bufferState_; - if (atrac->firstSampleOffset_ != 0) { - context->info.samplesPerChan = atrac->firstSampleOffset_ + atrac->FirstOffsetExtra(); + context->info.state = bufferState_; + if (firstSampleOffset_ != 0) { + context->info.samplesPerChan = firstSampleOffset_ + FirstOffsetExtra(); } else { - context->info.samplesPerChan = (atrac->codecType_ == PSP_MODE_AT_3_PLUS ? ATRAC3PLUS_MAX_SAMPLES : ATRAC3_MAX_SAMPLES); + context->info.samplesPerChan = (codecType_ == PSP_MODE_AT_3_PLUS ? ATRAC3PLUS_MAX_SAMPLES : ATRAC3_MAX_SAMPLES); } - context->info.sampleSize = atrac->bytesPerFrame_; - context->info.numChan = atrac->channels_; - context->info.dataOff = atrac->dataOff_; - context->info.endSample = atrac->endSample_ + atrac->firstSampleOffset_ + atrac->FirstOffsetExtra(); - context->info.dataEnd = atrac->first_.filesize; - context->info.curOff = atrac->first_.fileoffset; - context->info.decodePos = atrac->DecodePosBySample(atrac->currentSample_); - context->info.streamDataByte = atrac->first_.size - atrac->dataOff_; + context->info.sampleSize = bytesPerFrame_; + context->info.numChan = channels_; + context->info.dataOff = dataOff_; + context->info.endSample = endSample_ + firstSampleOffset_ + FirstOffsetExtra(); + context->info.dataEnd = first_.filesize; + context->info.curOff = first_.fileoffset; + context->info.decodePos = DecodePosBySample(currentSample_); + context->info.streamDataByte = first_.size - dataOff_; u8 *buf = (u8 *)context; - *(u32_le *)(buf + 0xfc) = atrac->atracID_; + *(u32_le *)(buf + 0xfc) = atracID_; - NotifyMemInfo(MemBlockFlags::WRITE, atrac->context_.ptr, sizeof(SceAtracContext), "AtracContext"); + NotifyMemInfo(MemBlockFlags::WRITE, context_.ptr, sizeof(SceAtracContext), "AtracContext"); } static u32 _sceAtracGetContextAddress(int atracID) { @@ -2126,8 +2107,7 @@ static u32 _sceAtracGetContextAddress(int atracID) { } else WARN_LOG(ME, "%08x=_sceAtracGetContextAddress(%i)", atrac->context_.ptr, atracID); - if (atrac->context_.IsValid()) - _AtracWriteContextToPSPMem(atrac); + atrac->WriteContextToPSPMem(); return atrac->context_.ptr; } @@ -2207,9 +2187,7 @@ static int sceAtracLowLevelInitDecoder(int atracID, u32 paramsAddr) { atrac->currentSample_ = 0; int ret = __AtracSetContext(atrac); - if (atrac->context_.IsValid()) { - _AtracWriteContextToPSPMem(atrac); - } + atrac->WriteContextToPSPMem(); if (ret < 0) { // Already logged. @@ -2268,6 +2246,27 @@ static int sceAtracSetAA3HalfwayBufferAndGetID(u32 buffer, u32 readSize, u32 buf return _AtracSetData(atracID, buffer, readSize, bufferSize, true); } +// External interface used by sceSas' AT3 integration. + +u32 AtracSasAddStreamData(int atracID, u32 bufPtr, u32 bytesToAdd) { + Atrac *atrac = getAtrac(atracID); + if (!atrac) + return 0; + return _AtracAddStreamData(atrac, bufPtr, bytesToAdd); +} + +u32 AtracSasDecodeData(int atracID, u8* outbuf, u32 outbufPtr, u32 *SamplesNum, u32* finish, int *remains) { + Atrac *atrac = getAtrac(atracID); + if (!atrac) + return 0; + return _AtracDecodeData(atrac, outbuf, outbufPtr, SamplesNum, finish, remains); +} + +int AtracSasGetIDByContext(u32 contextAddr) { + int atracID = (int)Memory::Read_U32(contextAddr + 0xfc); + return atracID; +} + const HLEFunction sceAtrac3plus[] = { {0X7DB31251, &WrapU_IU, "sceAtracAddStreamData", 'x', "ix" }, {0X6A8C3CD5, &WrapU_IUUUU, "sceAtracDecodeData", 'x', "ixppp"}, diff --git a/Core/HLE/sceAtrac.h b/Core/HLE/sceAtrac.h index 344f8c26f4..f29c59f798 100644 --- a/Core/HLE/sceAtrac.h +++ b/Core/HLE/sceAtrac.h @@ -25,6 +25,7 @@ void Register_sceAtrac3plus(); void __AtracInit(); void __AtracDoState(PointerWrap &p); void __AtracShutdown(); +void __AtracLoadModule(int version, u32 crc); enum AtracStatus : u8 { ATRAC_STATUS_NO_DATA = 1, @@ -84,9 +85,7 @@ struct SceAtracContext { SceAtracIdInfo info; }; -// provide some decoder interface - -u32 _AtracAddStreamData(int atracID, u32 bufPtr, u32 bytesToAdd); -u32 _AtracDecodeData(int atracID, u8* outbuf, u32 outbufPtr, u32 *SamplesNum, u32* finish, int *remains); -int _AtracGetIDByContext(u32 contextAddr); -void __AtracLoadModule(int version, u32 crc); +// External interface used by sceSas. +u32 AtracSasAddStreamData(int atracID, u32 bufPtr, u32 bytesToAdd); +u32 AtracSasDecodeData(int atracID, u8* outbuf, u32 outbufPtr, u32 *SamplesNum, u32* finish, int *remains); +int AtracSasGetIDByContext(u32 contextAddr); diff --git a/Core/HW/SasAudio.cpp b/Core/HW/SasAudio.cpp index 39ab2564c8..bfdb41834d 100644 --- a/Core/HW/SasAudio.cpp +++ b/Core/HW/SasAudio.cpp @@ -192,7 +192,7 @@ void VagDecoder::DoState(PointerWrap &p) { int SasAtrac3::setContext(u32 context) { contextAddr_ = context; - atracID_ = _AtracGetIDByContext(context); + atracID_ = AtracSasGetIDByContext(context); if (!sampleQueue_) sampleQueue_ = new BufferQueue(); sampleQueue_->clear(); @@ -211,7 +211,7 @@ void SasAtrac3::getNextSamples(s16 *outbuf, int wantedSamples) { u32 numSamples = 0; int remains = 0; static s16 buf[0x800]; - _AtracDecodeData(atracID_, (u8*)buf, 0, &numSamples, &finish, &remains); + AtracSasDecodeData(atracID_, (u8*)buf, 0, &numSamples, &finish, &remains); if (numSamples > 0) sampleQueue_->push((u8*)buf, numSamples * sizeof(s16)); else @@ -223,7 +223,7 @@ void SasAtrac3::getNextSamples(s16 *outbuf, int wantedSamples) { int SasAtrac3::addStreamData(u32 bufPtr, u32 addbytes) { if (atracID_ > 0) { - _AtracAddStreamData(atracID_, bufPtr, addbytes); + AtracSasAddStreamData(atracID_, bufPtr, addbytes); } return 0; } From 7d3fc65478d7312c259738a916a2e6733716f48e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 14 Apr 2024 10:48:01 +0200 Subject: [PATCH 125/719] Make Decode and GetResetBufferInfo member functions of Atrac. --- Core/HLE/sceAtrac.cpp | 136 ++++++++++++++++++++++-------------------- 1 file changed, 70 insertions(+), 66 deletions(-) diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp index 8ffe3976e8..aa159767da 100644 --- a/Core/HLE/sceAtrac.cpp +++ b/Core/HLE/sceAtrac.cpp @@ -157,6 +157,8 @@ struct AtracLoopInfo { int playCount; }; +struct AtracResetBufferInfo; + struct Atrac { Atrac() { memset(&first_, 0, sizeof(first_)); @@ -498,6 +500,8 @@ struct Atrac { } void WriteContextToPSPMem(); + u32 DecodeData(u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u32 *finish, int *remains); + void GetResetBufferInfo(AtracResetBufferInfo *bufferInfo, int sample); // To be moved into private. AtracStatus bufferState_ = ATRAC_STATUS_NO_DATA; @@ -1053,19 +1057,19 @@ static u32 sceAtracAddStreamData(int atracID, u32 bytesToAdd) { return hleLogSuccessI(ME, 0); } -static u32 _AtracDecodeData(Atrac *atrac, u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u32 *finish, int *remains) { - int loopNum = atrac->loopNum_; - if (atrac->bufferState_ == ATRAC_STATUS_FOR_SCESAS) { +u32 Atrac::DecodeData(u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u32 *finish, int *remains) { + int loopNum = loopNum_; + if (bufferState_ == ATRAC_STATUS_FOR_SCESAS) { // TODO: Might need more testing. loopNum = 0; } // We already passed the end - return an error (many games check for this.) - if (atrac->currentSample_ >= atrac->endSample_ && loopNum == 0) { + if (currentSample_ >= endSample_ && loopNum == 0) { *SamplesNum = 0; *finish = 1; // refresh context_ - atrac->WriteContextToPSPMem(); + WriteContextToPSPMem(); return ATRAC_ERROR_ALL_DATA_DECODED; } @@ -1073,32 +1077,33 @@ static u32 _AtracDecodeData(Atrac *atrac, u8 *outbuf, u32 outbufPtr, u32 *Sample u32 numSamples = 0; // It seems like the PSP aligns the sample position to 0x800...? - int offsetSamples = atrac->firstSampleOffset_ + atrac->FirstOffsetExtra(); + int offsetSamples = firstSampleOffset_ + FirstOffsetExtra(); int skipSamples = 0; - u32 maxSamples = atrac->endSample_ + 1 - atrac->currentSample_; - u32 unalignedSamples = (offsetSamples + atrac->currentSample_) % atrac->SamplesPerFrame(); + u32 maxSamples = endSample_ + 1 - currentSample_; + u32 unalignedSamples = (offsetSamples + currentSample_) % SamplesPerFrame(); if (unalignedSamples != 0) { // We're off alignment, possibly due to a loop. Force it back on. - maxSamples = atrac->SamplesPerFrame() - unalignedSamples; + maxSamples = SamplesPerFrame() - unalignedSamples; skipSamples = unalignedSamples; } - if (skipSamples != 0 && atrac->bufferHeaderSize_ == 0) { + if (skipSamples != 0 && bufferHeaderSize_ == 0) { // Skip the initial frame used to load state for the looped frame. // TODO: We will want to actually read this in. - atrac->ConsumeFrame(); + ConsumeFrame(); } - if (!atrac->failedDecode_ && (atrac->codecType_ == PSP_MODE_AT_3 || atrac->codecType_ == PSP_MODE_AT_3_PLUS)) { - atrac->SeekToSample(atrac->currentSample_); + // TODO: We don't support any other codec type, check seems unnecessary? + if (!failedDecode_ && (codecType_ == PSP_MODE_AT_3 || codecType_ == PSP_MODE_AT_3_PLUS)) { + SeekToSample(currentSample_); AtracDecodeResult res = ATDECODE_FEEDME; - u32 off = atrac->FileOffsetBySample(atrac->currentSample_ - skipSamples); - if (off < atrac->first_.size) { - uint8_t *indata = atrac->BufferStart() + off; + u32 off = FileOffsetBySample(currentSample_ - skipSamples); + if (off < first_.size) { + uint8_t *indata = BufferStart() + off; int bytesConsumed = 0; int outBytes = 0; - if (!atrac->decoder_->Decode(indata, atrac->bytesPerFrame_, &bytesConsumed, + if (!decoder_->Decode(indata, bytesPerFrame_, &bytesConsumed, outbuf, &outBytes)) { // Decode failed. *SamplesNum = 0; @@ -1108,7 +1113,7 @@ static u32 _AtracDecodeData(Atrac *atrac, u8 *outbuf, u32 outbufPtr, u32 *Sample res = ATDECODE_GOTFRAME; numSamples = outBytes / 4; - uint32_t packetAddr = atrac->CurBufferAddress(-skipSamples); + uint32_t packetAddr = CurBufferAddress(-skipSamples); // got a frame int skipped = std::min((u32)skipSamples, numSamples); skipSamples -= skipped; @@ -1123,8 +1128,8 @@ static u32 _AtracDecodeData(Atrac *atrac, u8 *outbuf, u32 outbufPtr, u32 *Sample if (packetAddr != 0 && MemBlockInfoDetailed()) { char tagData[128]; - size_t tagSize = FormatMemWriteTagAt(tagData, sizeof(tagData), "AtracDecode/", packetAddr, atrac->bytesPerFrame_); - NotifyMemInfo(MemBlockFlags::READ, packetAddr, atrac->bytesPerFrame_, tagData, tagSize); + size_t tagSize = FormatMemWriteTagAt(tagData, sizeof(tagData), "AtracDecode/", packetAddr, bytesPerFrame_); + NotifyMemInfo(MemBlockFlags::READ, packetAddr, bytesPerFrame_, tagData, tagSize); NotifyMemInfo(MemBlockFlags::WRITE, outbufPtr, outBytes, tagData, tagSize); } else { NotifyMemInfo(MemBlockFlags::WRITE, outbufPtr, outBytes, "AtracDecode"); @@ -1132,12 +1137,12 @@ static u32 _AtracDecodeData(Atrac *atrac, u8 *outbuf, u32 outbufPtr, u32 *Sample // We only want one frame per call, let's continue the next time. } - if (res != ATDECODE_GOTFRAME && atrac->currentSample_ < atrac->endSample_) { + if (res != ATDECODE_GOTFRAME && currentSample_ < endSample_) { // Never got a frame. We may have dropped a GHA frame or otherwise have a bug. // For now, let's try to provide an extra "frame" if possible so games don't infinite loop. - if (atrac->FileOffsetBySample(atrac->currentSample_) < atrac->first_.filesize) { - numSamples = std::min(maxSamples, atrac->SamplesPerFrame()); - u32 outBytes = numSamples * atrac->outputChannels_ * sizeof(s16); + if (FileOffsetBySample(currentSample_) < first_.filesize) { + numSamples = std::min(maxSamples, SamplesPerFrame()); + u32 outBytes = numSamples * outputChannels_ * sizeof(s16); if (outbuf != nullptr) { memset(outbuf, 0, outBytes); NotifyMemInfo(MemBlockFlags::WRITE, outbufPtr, outBytes, "AtracDecode"); @@ -1148,28 +1153,28 @@ static u32 _AtracDecodeData(Atrac *atrac, u8 *outbuf, u32 outbufPtr, u32 *Sample *SamplesNum = numSamples; // update current sample and decodePos - atrac->currentSample_ += numSamples; - atrac->decodePos_ = atrac->DecodePosBySample(atrac->currentSample_); + currentSample_ += numSamples; + decodePos_ = DecodePosBySample(currentSample_); - atrac->ConsumeFrame(); + ConsumeFrame(); int finishFlag = 0; // TODO: Verify. - bool hitEnd = atrac->currentSample_ >= atrac->endSample_ || (numSamples == 0 && atrac->first_.size >= atrac->first_.filesize); - int loopEndAdjusted = atrac->loopEndSample_ - atrac->FirstOffsetExtra() - atrac->firstSampleOffset_; - if ((hitEnd || atrac->currentSample_ > loopEndAdjusted) && loopNum != 0) { - atrac->SeekToSample(atrac->loopStartSample_ - atrac->FirstOffsetExtra() - atrac->firstSampleOffset_); - if (atrac->bufferState_ != ATRAC_STATUS_FOR_SCESAS) { - if (atrac->loopNum_ > 0) - atrac->loopNum_--; + bool hitEnd = currentSample_ >= endSample_ || (numSamples == 0 && first_.size >= first_.filesize); + int loopEndAdjusted = loopEndSample_ - FirstOffsetExtra() - firstSampleOffset_; + if ((hitEnd || currentSample_ > loopEndAdjusted) && loopNum != 0) { + SeekToSample(loopStartSample_ - FirstOffsetExtra() - firstSampleOffset_); + if (bufferState_ != ATRAC_STATUS_FOR_SCESAS) { + if (loopNum_ > 0) + loopNum_--; } - if ((atrac->bufferState_ & ATRAC_STATUS_STREAMED_MASK) == ATRAC_STATUS_STREAMED_MASK) { + if ((bufferState_ & ATRAC_STATUS_STREAMED_MASK) == ATRAC_STATUS_STREAMED_MASK) { // Whatever bytes we have left were added from the loop. - u32 loopOffset = atrac->FileOffsetBySample(atrac->loopStartSample_ - atrac->FirstOffsetExtra() - atrac->firstSampleOffset_ - atrac->SamplesPerFrame() * 2); + u32 loopOffset = FileOffsetBySample(loopStartSample_ - FirstOffsetExtra() - firstSampleOffset_ - SamplesPerFrame() * 2); // TODO: Hmm, need to manage the buffer better. But don't move fileoffset if we already have valid data. - if (loopOffset > atrac->first_.fileoffset || loopOffset + atrac->bufferValidBytes_ < atrac->first_.fileoffset) { + if (loopOffset > first_.fileoffset || loopOffset + bufferValidBytes_ < first_.fileoffset) { // Skip the initial frame at the start. - atrac->first_.fileoffset = atrac->FileOffsetBySample(atrac->loopStartSample_ - atrac->FirstOffsetExtra() - atrac->firstSampleOffset_ - atrac->SamplesPerFrame() * 2); + first_.fileoffset = FileOffsetBySample(loopStartSample_ - FirstOffsetExtra() - firstSampleOffset_ - SamplesPerFrame() * 2); } } } else if (hitEnd) { @@ -1177,13 +1182,13 @@ static u32 _AtracDecodeData(Atrac *atrac, u8 *outbuf, u32 outbufPtr, u32 *Sample // Still move forward, so we know that we've read everything. // This seems to be reflected in the context as well. - atrac->currentSample_ += atrac->SamplesPerFrame() - numSamples; + currentSample_ += SamplesPerFrame() - numSamples; } *finish = finishFlag; - *remains = atrac->RemainingFrames(); + *remains = RemainingFrames(); // refresh context_ - atrac->WriteContextToPSPMem(); + WriteContextToPSPMem(); return 0; } @@ -1199,7 +1204,7 @@ static u32 sceAtracDecodeData(int atracID, u32 outAddr, u32 numSamplesAddr, u32 u32 numSamples = 0; u32 finish = 0; int remains = 0; - int ret = _AtracDecodeData(atrac, Memory::GetPointerWrite(outAddr), outAddr, &numSamples, &finish, &remains); + int ret = atrac->DecodeData(Memory::GetPointerWrite(outAddr), outAddr, &numSamples, &finish, &remains); if (ret != (int)ATRAC_ERROR_BAD_ATRACID && ret != (int)ATRAC_ERROR_NO_DATA) { if (Memory::IsValidAddress(numSamplesAddr)) Memory::WriteUnchecked_U32(numSamples, numSamplesAddr); @@ -1225,47 +1230,47 @@ static u32 sceAtracEndEntry() { return 0; } -static void AtracGetResetBufferInfo(Atrac *atrac, AtracResetBufferInfo *bufferInfo, int sample) { - if (atrac->bufferState_ == ATRAC_STATUS_ALL_DATA_LOADED) { - bufferInfo->first.writePosPtr = atrac->first_.addr; +void Atrac::GetResetBufferInfo(AtracResetBufferInfo *bufferInfo, int sample) { + if (bufferState_ == ATRAC_STATUS_ALL_DATA_LOADED) { + bufferInfo->first.writePosPtr = first_.addr; // Everything is loaded, so nothing needs to be read. bufferInfo->first.writableBytes = 0; bufferInfo->first.minWriteBytes = 0; bufferInfo->first.filePos = 0; - } else if (atrac->bufferState_ == ATRAC_STATUS_HALFWAY_BUFFER) { + } else if (bufferState_ == ATRAC_STATUS_HALFWAY_BUFFER) { // Here the message is: you need to read at least this many bytes to get to that position. // This is because we're filling the buffer start to finish, not streaming. - bufferInfo->first.writePosPtr = atrac->first_.addr + atrac->first_.size; - bufferInfo->first.writableBytes = atrac->first_.filesize - atrac->first_.size; - int minWriteBytes = atrac->FileOffsetBySample(sample) - atrac->first_.size; + bufferInfo->first.writePosPtr = first_.addr + first_.size; + bufferInfo->first.writableBytes = first_.filesize - first_.size; + int minWriteBytes = FileOffsetBySample(sample) - first_.size; if (minWriteBytes > 0) { bufferInfo->first.minWriteBytes = minWriteBytes; } else { bufferInfo->first.minWriteBytes = 0; } - bufferInfo->first.filePos = atrac->first_.size; + bufferInfo->first.filePos = first_.size; } else { // This is without the sample offset. The file offset also includes the previous batch of samples? - int sampleFileOffset = atrac->FileOffsetBySample(sample - atrac->firstSampleOffset_ - atrac->SamplesPerFrame()); + int sampleFileOffset = FileOffsetBySample(sample - firstSampleOffset_ - SamplesPerFrame()); // Update the writable bytes. When streaming, this is just the number of bytes until the end. - const u32 bufSizeAligned = (atrac->bufferMaxSize_ / atrac->bytesPerFrame_) * atrac->bytesPerFrame_; - const int needsMoreFrames = atrac->FirstOffsetExtra(); + const u32 bufSizeAligned = (bufferMaxSize_ / bytesPerFrame_) * bytesPerFrame_; + const int needsMoreFrames = FirstOffsetExtra(); - bufferInfo->first.writePosPtr = atrac->first_.addr; - bufferInfo->first.writableBytes = std::min(atrac->first_.filesize - sampleFileOffset, bufSizeAligned); - if (((sample + atrac->firstSampleOffset_) % (int)atrac->SamplesPerFrame()) >= (int)atrac->SamplesPerFrame() - needsMoreFrames) { + bufferInfo->first.writePosPtr = first_.addr; + bufferInfo->first.writableBytes = std::min(first_.filesize - sampleFileOffset, bufSizeAligned); + if (((sample + firstSampleOffset_) % (int)SamplesPerFrame()) >= (int)SamplesPerFrame() - needsMoreFrames) { // Not clear why, but it seems it wants a bit extra in case the sample is late? - bufferInfo->first.minWriteBytes = atrac->bytesPerFrame_ * 3; + bufferInfo->first.minWriteBytes = bytesPerFrame_ * 3; } else { - bufferInfo->first.minWriteBytes = atrac->bytesPerFrame_ * 2; + bufferInfo->first.minWriteBytes = bytesPerFrame_ * 2; } - if ((u32)sample < (u32)atrac->firstSampleOffset_ && sampleFileOffset != atrac->dataOff_) { - sampleFileOffset -= atrac->bytesPerFrame_; + if ((u32)sample < (u32)firstSampleOffset_ && sampleFileOffset != dataOff_) { + sampleFileOffset -= bytesPerFrame_; } bufferInfo->first.filePos = sampleFileOffset; - if (atrac->second_.size != 0) { + if (second_.size != 0) { // TODO: We have a second buffer. Within it, minWriteBytes should be zero. // The filePos should be after the end of the second buffer (or zero.) // We actually need to ensure we READ from the second buffer before implementing that. @@ -1273,7 +1278,7 @@ static void AtracGetResetBufferInfo(Atrac *atrac, AtracResetBufferInfo *bufferIn } // It seems like this is always the same as the first buffer's pos, weirdly. - bufferInfo->second.writePosPtr = atrac->first_.addr; + bufferInfo->second.writePosPtr = first_.addr; // Reset never needs a second buffer write, since the loop is in a fixed place. bufferInfo->second.writableBytes = 0; bufferInfo->second.minWriteBytes = 0; @@ -1299,7 +1304,7 @@ static u32 sceAtracGetBufferInfoForResetting(int atracID, int sample, u32 buffer } else if ((u32)sample + atrac->firstSampleOffset_ > (u32)atrac->endSample_ + atrac->firstSampleOffset_) { return hleLogWarning(ME, ATRAC_ERROR_BAD_SAMPLE, "invalid sample position"); } else { - AtracGetResetBufferInfo(atrac, bufferInfo, sample); + atrac->GetResetBufferInfo(bufferInfo, sample); return hleLogSuccessInfoI(ME, 0); } } @@ -1572,7 +1577,7 @@ static u32 sceAtracResetPlayPosition(int atracID, int sample, int bytesWrittenFi } // Reuse the same calculation as before. AtracResetBufferInfo bufferInfo; - AtracGetResetBufferInfo(atrac, &bufferInfo, sample); + atrac->GetResetBufferInfo(&bufferInfo, sample); if ((u32)bytesWrittenFirstBuf < bufferInfo.first.minWriteBytes || (u32)bytesWrittenFirstBuf > bufferInfo.first.writableBytes) { return hleLogError(ME, ATRAC_ERROR_BAD_FIRST_RESET_SIZE, "first byte count not in valid range"); @@ -2212,7 +2217,6 @@ static int sceAtracLowLevelDecode(int atracID, u32 sourceAddr, u32 sourceBytesCo return hleReportError(ME, 0, "invalid pointers"); } - int numSamples = (atrac->codecType_ == PSP_MODE_AT_3_PLUS ? ATRAC3PLUS_MAX_SAMPLES : ATRAC3_MAX_SAMPLES); int bytesConsumed = 0; int bytesWritten = 0; atrac->decoder_->Decode(srcp, atrac->bytesPerFrame_, &bytesConsumed, outp, &bytesWritten); @@ -2259,7 +2263,7 @@ u32 AtracSasDecodeData(int atracID, u8* outbuf, u32 outbufPtr, u32 *SamplesNum, Atrac *atrac = getAtrac(atracID); if (!atrac) return 0; - return _AtracDecodeData(atrac, outbuf, outbufPtr, SamplesNum, finish, remains); + return atrac->DecodeData(outbuf, outbufPtr, SamplesNum, finish, remains); } int AtracSasGetIDByContext(u32 contextAddr) { From eeaa3c8445a8b1713de2365a61864213c6c585a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 14 Apr 2024 10:55:17 +0200 Subject: [PATCH 126/719] Make more functions member functions of Atrac --- Core/HLE/sceAtrac.cpp | 109 +++++++++++++++++++++++------------------- 1 file changed, 60 insertions(+), 49 deletions(-) diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp index aa159767da..5196faf4bc 100644 --- a/Core/HLE/sceAtrac.cpp +++ b/Core/HLE/sceAtrac.cpp @@ -146,7 +146,6 @@ struct InputBuffer { }; struct Atrac; -int __AtracSetContext(Atrac *atrac); struct AtracLoopInfo { int cuePointID; @@ -305,7 +304,7 @@ struct Atrac { // Make sure to do this late; it depends on things like bytesPerFrame_. if (p.mode == p.MODE_READ && bufferState_ != ATRAC_STATUS_NO_DATA) { - __AtracSetContext(this); + SetContext(); } if (s >= 2 && s < 9) { @@ -489,19 +488,14 @@ struct Atrac { } } - void UpdateFromPSPMem() { - if (context_.IsValid()) { - // Read in any changes from the game to the context. - // TODO: Might be better to just always track in RAM. - bufferState_ = context_->info.state; - // This value is actually abused by games to store the SAS voice number. - loopNum_ = context_->info.loopNum; - } - } + void UpdateContextFromPSPMem(); void WriteContextToPSPMem(); u32 DecodeData(u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u32 *finish, int *remains); void GetResetBufferInfo(AtracResetBufferInfo *bufferInfo, int sample); + void SetLoopNum(int loopNum); + u32 AddStreamData(u32 bufPtr, u32 bytesToAdd); + int SetContext(); // To be moved into private. AtracStatus bufferState_ = ATRAC_STATUS_NO_DATA; @@ -510,6 +504,17 @@ private: void AnalyzeReset(); }; +void Atrac::SetLoopNum(int loopNum) { + // Spammed in MHU + loopNum_ = loopNum; + if (loopNum != 0 && loopinfo_.size() == 0) { + // Just loop the whole audio + loopStartSample_ = firstSampleOffset_ + FirstOffsetExtra(); + loopEndSample_ = endSample_ + firstSampleOffset_ + FirstOffsetExtra(); + } + WriteContextToPSPMem(); +} + struct AtracSingleResetBufferInfo { u32_le writePosPtr; u32_le writableBytes; @@ -590,7 +595,7 @@ static Atrac *getAtrac(int atracID) { } Atrac *atrac = atracContexts[atracID]; if (atrac) { - atrac->UpdateFromPSPMem(); + atrac->UpdateContextFromPSPMem(); } return atrac; } @@ -631,15 +636,15 @@ void Atrac::AnalyzeReset() { channels_ = 2; } -struct RIFFFmtChunk { - u16_le fmtTag; - u16_le channels; - u32_le samplerate; - u32_le avgBytesPerSec; - u16_le blockAlign; -}; - int Atrac::Analyze(u32 addr, u32 size) { + struct RIFFFmtChunk { + u16_le fmtTag; + u16_le channels; + u32_le samplerate; + u32_le avgBytesPerSec; + u16_le blockAlign; + }; + first_.addr = addr; first_.size = size; @@ -913,18 +918,18 @@ static u32 sceAtracGetAtracID(int codecType) { return hleLogSuccessInfoI(ME, atracID); } -static u32 _AtracAddStreamData(Atrac *atrac, u32 bufPtr, u32 bytesToAdd) { - int addbytes = std::min(bytesToAdd, atrac->first_.filesize - atrac->first_.fileoffset - atrac->FirstOffsetExtra()); - Memory::Memcpy(atrac->dataBuf_ + atrac->first_.fileoffset + atrac->FirstOffsetExtra(), bufPtr, addbytes, "AtracAddStreamData"); - atrac->first_.size += bytesToAdd; - if (atrac->first_.size >= atrac->first_.filesize) { - atrac->first_.size = atrac->first_.filesize; - if (atrac->bufferState_ == ATRAC_STATUS_HALFWAY_BUFFER) - atrac->bufferState_ = ATRAC_STATUS_ALL_DATA_LOADED; +u32 Atrac::AddStreamData(u32 bufPtr, u32 bytesToAdd) { + int addbytes = std::min(bytesToAdd, first_.filesize - first_.fileoffset - FirstOffsetExtra()); + Memory::Memcpy(dataBuf_ + first_.fileoffset + FirstOffsetExtra(), bufPtr, addbytes, "AtracAddStreamData"); + first_.size += bytesToAdd; + if (first_.size >= first_.filesize) { + first_.size = first_.filesize; + if (bufferState_ == ATRAC_STATUS_HALFWAY_BUFFER) + bufferState_ = ATRAC_STATUS_ALL_DATA_LOADED; } - atrac->first_.fileoffset += addbytes; + first_.fileoffset += addbytes; // refresh context_ - atrac->WriteContextToPSPMem(); + WriteContextToPSPMem(); return 0; } @@ -1646,21 +1651,21 @@ void InitAT3ExtraData(Atrac *atrac, uint8_t *extraData) { extraData[10] = 1; } -int __AtracSetContext(Atrac *atrac) { - if (atrac->decoder_) { - delete atrac->decoder_; +int Atrac::SetContext() { + if (decoder_) { + delete decoder_; } // First, init the standalone decoder. Only used for low-level-decode initially, but simple. - if (atrac->codecType_ == PSP_MODE_AT_3) { + if (codecType_ == PSP_MODE_AT_3) { uint8_t extraData[14]{}; - InitAT3ExtraData(atrac, extraData); - atrac->decoder_ = CreateAtrac3Audio(atrac->channels_, atrac->bytesPerFrame_, extraData, sizeof(extraData)); + InitAT3ExtraData(this, extraData); + decoder_ = CreateAtrac3Audio(channels_, bytesPerFrame_, extraData, sizeof(extraData)); } else { - atrac->decoder_ = CreateAtrac3PlusAudio(atrac->channels_, atrac->bytesPerFrame_); + decoder_ = CreateAtrac3PlusAudio(channels_, bytesPerFrame_); } // reinit decodePos, because ffmpeg had changed it. - atrac->decodePos_ = 0; + decodePos_ = 0; return 0; } @@ -1710,7 +1715,7 @@ static int _AtracSetData(Atrac *atrac, u32 buffer, u32 readSize, u32 bufferSize, u32 copybytes = std::min(bufferSize, atrac->first_.filesize); Memory::Memcpy(atrac->dataBuf_, buffer, copybytes, "AtracSetData"); } - int ret = __AtracSetContext(atrac); + int ret = atrac->SetContext(); if (ret < 0) { // Already logged. return ret; @@ -1856,14 +1861,8 @@ static u32 sceAtracSetLoopNum(int atracID, int loopNum) { if (atrac->loopinfo_.size() == 0) { return hleLogError(ME, ATRAC_ERROR_NO_LOOP_INFORMATION, "no loop information"); } - // Spammed in MHU - atrac->loopNum_ = loopNum; - if (loopNum != 0 && atrac->loopinfo_.size() == 0) { - // Just loop the whole audio - atrac->loopStartSample_ = atrac->firstSampleOffset_ + atrac->FirstOffsetExtra(); - atrac->loopEndSample_ = atrac->endSample_ + atrac->firstSampleOffset_ + atrac->FirstOffsetExtra(); - } - atrac->WriteContextToPSPMem(); + + atrac->SetLoopNum(loopNum); return hleLogSuccessI(ME, 0); } @@ -2056,6 +2055,18 @@ static int sceAtracSetAA3DataAndGetID(u32 buffer, u32 bufferSize, u32 fileSize, return _AtracSetData(atracID, buffer, bufferSize, bufferSize, true); } +void Atrac::UpdateContextFromPSPMem() { + if (!context_.IsValid()) { + return; + } + + // Read in any changes from the game to the context. + // TODO: Might be better to just always track in RAM. + bufferState_ = context_->info.state; + // This value is actually abused by games to store the SAS voice number. + loopNum_ = context_->info.loopNum; +} + void Atrac::WriteContextToPSPMem() { if (!context_.IsValid()) { return; @@ -2190,7 +2201,7 @@ static int sceAtracLowLevelInitDecoder(int atracID, u32 paramsAddr) { atrac->first_.filesize = atrac->bytesPerFrame_; atrac->bufferState_ = ATRAC_STATUS_LOW_LEVEL; atrac->currentSample_ = 0; - int ret = __AtracSetContext(atrac); + int ret = atrac->SetContext(); atrac->WriteContextToPSPMem(); @@ -2256,7 +2267,7 @@ u32 AtracSasAddStreamData(int atracID, u32 bufPtr, u32 bytesToAdd) { Atrac *atrac = getAtrac(atracID); if (!atrac) return 0; - return _AtracAddStreamData(atrac, bufPtr, bytesToAdd); + return atrac->AddStreamData(bufPtr, bytesToAdd); } u32 AtracSasDecodeData(int atracID, u8* outbuf, u32 outbufPtr, u32 *SamplesNum, u32* finish, int *remains) { From 35578f0a2e22b9918894dac888ec66aad2223739 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 14 Apr 2024 11:25:19 +0200 Subject: [PATCH 127/719] More member functions --- Core/HLE/sceAtrac.cpp | 332 ++++++++++++++++++++++-------------------- 1 file changed, 173 insertions(+), 159 deletions(-) diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp index 5196faf4bc..d84948cec8 100644 --- a/Core/HLE/sceAtrac.cpp +++ b/Core/HLE/sceAtrac.cpp @@ -181,9 +181,6 @@ struct Atrac { if (context_.IsValid()) kernelMemory.Free(context_.ptr); - - // Clean slate time. - failedDecode_ = false; } void SetBufferState() { @@ -304,7 +301,7 @@ struct Atrac { // Make sure to do this late; it depends on things like bytesPerFrame_. if (p.mode == p.MODE_READ && bufferState_ != ATRAC_STATUS_NO_DATA) { - SetContext(); + CreateDecoder(); } if (s >= 2 && s < 9) { @@ -401,7 +398,6 @@ struct Atrac { int loopEndSample_ = -1; int loopNum_ = 0; - bool failedDecode_ = false; // Indicates that the dataBuf_ array should not be used. bool ignoreDataBuf_ = false; @@ -494,14 +490,19 @@ struct Atrac { u32 DecodeData(u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u32 *finish, int *remains); void GetResetBufferInfo(AtracResetBufferInfo *bufferInfo, int sample); void SetLoopNum(int loopNum); - u32 AddStreamData(u32 bufPtr, u32 bytesToAdd); - int SetContext(); + int AddStreamData(u32 bytesToAdd); + u32 AddStreamDataSas(u32 bufPtr, u32 bytesToAdd); + void CreateDecoder(); + u32 ResetPlayPosition(int sample, int bytesWrittenFirstBuf, int bytesWrittenSecondBuf); + int SetData(u32 buffer, u32 readSize, u32 bufferSize, int successCode = 0); + u32 GetNextSamples(); - // To be moved into private. - AtracStatus bufferState_ = ATRAC_STATUS_NO_DATA; + void InitLowLevel(u32 paramsAddr, bool jointStereo); private: void AnalyzeReset(); + + AtracStatus bufferState_ = ATRAC_STATUS_NO_DATA; }; void Atrac::SetLoopNum(int loopNum) { @@ -918,7 +919,7 @@ static u32 sceAtracGetAtracID(int codecType) { return hleLogSuccessInfoI(ME, atracID); } -u32 Atrac::AddStreamData(u32 bufPtr, u32 bytesToAdd) { +u32 Atrac::AddStreamDataSas(u32 bufPtr, u32 bytesToAdd) { int addbytes = std::min(bytesToAdd, first_.filesize - first_.fileoffset - FirstOffsetExtra()); Memory::Memcpy(dataBuf_ + first_.fileoffset + FirstOffsetExtra(), bufPtr, addbytes, "AtracAddStreamData"); first_.size += bytesToAdd; @@ -1022,44 +1023,51 @@ static u32 sceAtracAddStreamData(int atracID, u32 bytesToAdd) { return err; } - if (atrac->bufferState_ == ATRAC_STATUS_ALL_DATA_LOADED) { + if (atrac->BufferState() == ATRAC_STATUS_ALL_DATA_LOADED) { // Let's avoid spurious warnings. Some games call this with 0 which is pretty harmless. if (bytesToAdd == 0) return hleLogDebug(ME, ATRAC_ERROR_ALL_DATA_LOADED, "stream entirely loaded"); return hleLogWarning(ME, ATRAC_ERROR_ALL_DATA_LOADED, "stream entirely loaded"); } - u32 readOffset; - atrac->CalculateStreamInfo(&readOffset); + int ret = atrac->AddStreamData(bytesToAdd); + if (ret < 0) { + return ret; + } + return hleLogSuccessI(ME, 0); +} - if (bytesToAdd > atrac->first_.writableBytes) +int Atrac::AddStreamData(u32 bytesToAdd) { + u32 readOffset; + CalculateStreamInfo(&readOffset); + if (bytesToAdd > first_.writableBytes) return hleLogWarning(ME, ATRAC_ERROR_ADD_DATA_IS_TOO_BIG, "too many bytes"); if (bytesToAdd > 0) { - atrac->first_.fileoffset = readOffset; - int addbytes = std::min(bytesToAdd, atrac->first_.filesize - atrac->first_.fileoffset); - if (!atrac->ignoreDataBuf_) { - Memory::Memcpy(atrac->dataBuf_ + atrac->first_.fileoffset, atrac->first_.addr + atrac->first_.offset, addbytes, "AtracAddStreamData"); + first_.fileoffset = readOffset; + int addbytes = std::min(bytesToAdd, first_.filesize - first_.fileoffset); + if (!ignoreDataBuf_) { + Memory::Memcpy(dataBuf_ + first_.fileoffset, first_.addr + first_.offset, addbytes, "AtracAddStreamData"); } - atrac->first_.fileoffset += addbytes; + first_.fileoffset += addbytes; } - atrac->first_.size += bytesToAdd; - if (atrac->first_.size >= atrac->first_.filesize) { - atrac->first_.size = atrac->first_.filesize; - if (atrac->bufferState_ == ATRAC_STATUS_HALFWAY_BUFFER) - atrac->bufferState_ = ATRAC_STATUS_ALL_DATA_LOADED; - atrac->WriteContextToPSPMem(); + first_.size += bytesToAdd; + if (first_.size >= first_.filesize) { + first_.size = first_.filesize; + if (bufferState_ == ATRAC_STATUS_HALFWAY_BUFFER) + bufferState_ = ATRAC_STATUS_ALL_DATA_LOADED; + WriteContextToPSPMem(); } - atrac->first_.offset += bytesToAdd; - atrac->bufferValidBytes_ += bytesToAdd; + first_.offset += bytesToAdd; + bufferValidBytes_ += bytesToAdd; - if (PSP_CoreParameter().compat.flags().AtracLoopHack && atrac->bufferState_ == ATRAC_STATUS_STREAMED_LOOP_FROM_END && atrac->RemainingFrames() > 2) { - atrac->loopNum_++; - atrac->SeekToSample(atrac->loopStartSample_ - atrac->FirstOffsetExtra() - atrac->firstSampleOffset_); + if (PSP_CoreParameter().compat.flags().AtracLoopHack && bufferState_ == ATRAC_STATUS_STREAMED_LOOP_FROM_END && RemainingFrames() > 2) { + loopNum_++; + SeekToSample(loopStartSample_ - FirstOffsetExtra() - firstSampleOffset_); } - return hleLogSuccessI(ME, 0); + return 0; } u32 Atrac::DecodeData(u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u32 *finish, int *remains) { @@ -1099,7 +1107,7 @@ u32 Atrac::DecodeData(u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u32 *finish, i } // TODO: We don't support any other codec type, check seems unnecessary? - if (!failedDecode_ && (codecType_ == PSP_MODE_AT_3 || codecType_ == PSP_MODE_AT_3_PLUS)) { + if ((codecType_ == PSP_MODE_AT_3 || codecType_ == PSP_MODE_AT_3_PLUS)) { SeekToSample(currentSample_); AtracDecodeResult res = ATDECODE_FEEDME; @@ -1304,7 +1312,7 @@ static u32 sceAtracGetBufferInfoForResetting(int atracID, int sample, u32 buffer if (!bufferInfo.IsValid()) { return hleReportError(ME, SCE_KERNEL_ERROR_ILLEGAL_ADDR, "invalid buffer, should crash"); - } else if (atrac->bufferState_ == ATRAC_STATUS_STREAMED_LOOP_WITH_TRAILER && atrac->second_.size == 0) { + } else if (atrac->BufferState() == ATRAC_STATUS_STREAMED_LOOP_WITH_TRAILER && atrac->second_.size == 0) { return hleReportError(ME, ATRAC_ERROR_SECOND_BUFFER_NEEDED, "no second buffer"); } else if ((u32)sample + atrac->firstSampleOffset_ > (u32)atrac->endSample_ + atrac->firstSampleOffset_) { return hleLogWarning(ME, ATRAC_ERROR_BAD_SAMPLE, "invalid sample position"); @@ -1436,28 +1444,34 @@ static u32 sceAtracGetNextSample(int atracID, u32 outNAddr) { return hleLogSuccessI(ME, 0, "0 samples left"); } - // It seems like the PSP aligns the sample position to 0x800...? - u32 skipSamples = atrac->firstSampleOffset_ + atrac->FirstOffsetExtra(); - u32 firstSamples = (atrac->SamplesPerFrame() - skipSamples) % atrac->SamplesPerFrame(); - u32 numSamples = atrac->endSample_ + 1 - atrac->currentSample_; - if (atrac->currentSample_ == 0 && firstSamples != 0) { - numSamples = firstSamples; - } - u32 unalignedSamples = (skipSamples + atrac->currentSample_) % atrac->SamplesPerFrame(); - if (unalignedSamples != 0) { - // We're off alignment, possibly due to a loop. Force it back on. - numSamples = atrac->SamplesPerFrame() - unalignedSamples; - } - if (numSamples > atrac->SamplesPerFrame()) - numSamples = atrac->SamplesPerFrame(); - if (atrac->bufferState_ == ATRAC_STATUS_STREAMED_LOOP_FROM_END && (int)numSamples + atrac->currentSample_ > atrac->endSample_) { - atrac->bufferState_ = ATRAC_STATUS_ALL_DATA_LOADED; - } + u32 numSamples = atrac->GetNextSamples(); + if (Memory::IsValidAddress(outNAddr)) Memory::WriteUnchecked_U32(numSamples, outNAddr); return hleLogSuccessI(ME, 0, "%d samples left", numSamples); } +u32 Atrac::GetNextSamples() { + // It seems like the PSP aligns the sample position to 0x800...? + u32 skipSamples = firstSampleOffset_ + FirstOffsetExtra(); + u32 firstSamples = (SamplesPerFrame() - skipSamples) % SamplesPerFrame(); + u32 numSamples = endSample_ + 1 - currentSample_; + if (currentSample_ == 0 && firstSamples != 0) { + numSamples = firstSamples; + } + u32 unalignedSamples = (skipSamples + currentSample_) % SamplesPerFrame(); + if (unalignedSamples != 0) { + // We're off alignment, possibly due to a loop. Force it back on. + numSamples = SamplesPerFrame() - unalignedSamples; + } + if (numSamples > SamplesPerFrame()) + numSamples = SamplesPerFrame(); + if (bufferState_ == ATRAC_STATUS_STREAMED_LOOP_FROM_END && (int)numSamples + currentSample_ > endSample_) { + bufferState_ = ATRAC_STATUS_ALL_DATA_LOADED; + } + return numSamples; +} + // Obtains the number of frames remaining in the buffer which can be decoded. // When no more data would be needed, this returns a negative number. static u32 sceAtracGetRemainFrame(int atracID, u32 remainAddr) { @@ -1495,7 +1509,7 @@ static u32 sceAtracGetSecondBufferInfo(int atracID, u32 fileOffsetAddr, u32 desi return hleReportError(ME, SCE_KERNEL_ERROR_ILLEGAL_ADDR, "invalid addresses"); } - if (atrac->bufferState_ != ATRAC_STATUS_STREAMED_LOOP_WITH_TRAILER) { + if (atrac->BufferState() != ATRAC_STATUS_STREAMED_LOOP_WITH_TRAILER) { // Writes zeroes in this error case. *fileOffset = 0; *desiredSize = 0; @@ -1575,14 +1589,25 @@ static u32 sceAtracResetPlayPosition(int atracID, int sample, int bytesWrittenFi return err; } - if (atrac->bufferState_ == ATRAC_STATUS_STREAMED_LOOP_WITH_TRAILER && atrac->second_.size == 0) { + if (atrac->BufferState() == ATRAC_STATUS_STREAMED_LOOP_WITH_TRAILER && atrac->second_.size == 0) { return hleReportError(ME, ATRAC_ERROR_SECOND_BUFFER_NEEDED, "no second buffer"); } else if ((u32)sample + atrac->firstSampleOffset_ > (u32)atrac->endSample_ + atrac->firstSampleOffset_) { return hleLogWarning(ME, ATRAC_ERROR_BAD_SAMPLE, "invalid sample position"); } + + u32 res = atrac->ResetPlayPosition(sample, bytesWrittenFirstBuf, bytesWrittenSecondBuf); + if (res != 0) { + // Already logged. + return res; + } + + return hleDelayResult(hleLogSuccessInfoI(ME, 0), "reset play pos", 3000); +} + +u32 Atrac::ResetPlayPosition(int sample, int bytesWrittenFirstBuf, int bytesWrittenSecondBuf) { // Reuse the same calculation as before. AtracResetBufferInfo bufferInfo; - atrac->GetResetBufferInfo(&bufferInfo, sample); + GetResetBufferInfo(&bufferInfo, sample); if ((u32)bytesWrittenFirstBuf < bufferInfo.first.minWriteBytes || (u32)bytesWrittenFirstBuf > bufferInfo.first.writableBytes) { return hleLogError(ME, ATRAC_ERROR_BAD_FIRST_RESET_SIZE, "first byte count not in valid range"); @@ -1591,135 +1616,124 @@ static u32 sceAtracResetPlayPosition(int atracID, int sample, int bytesWrittenFi return hleLogError(ME, ATRAC_ERROR_BAD_SECOND_RESET_SIZE, "second byte count not in valid range"); } - if (atrac->bufferState_ == ATRAC_STATUS_ALL_DATA_LOADED) { + if (bufferState_ == ATRAC_STATUS_ALL_DATA_LOADED) { // Always adds zero bytes. - } else if (atrac->bufferState_ == ATRAC_STATUS_HALFWAY_BUFFER) { + } else if (bufferState_ == ATRAC_STATUS_HALFWAY_BUFFER) { // Okay, it's a valid number of bytes. Let's set them up. if (bytesWrittenFirstBuf != 0) { - if (!atrac->ignoreDataBuf_) { - Memory::Memcpy(atrac->dataBuf_ + atrac->first_.size, atrac->first_.addr + atrac->first_.size, bytesWrittenFirstBuf, "AtracResetPlayPosition"); + if (!ignoreDataBuf_) { + Memory::Memcpy(dataBuf_ + first_.size, first_.addr + first_.size, bytesWrittenFirstBuf, "AtracResetPlayPosition"); } - atrac->first_.fileoffset += bytesWrittenFirstBuf; - atrac->first_.size += bytesWrittenFirstBuf; - atrac->first_.offset += bytesWrittenFirstBuf; + first_.fileoffset += bytesWrittenFirstBuf; + first_.size += bytesWrittenFirstBuf; + first_.offset += bytesWrittenFirstBuf; } // Did we transition to a full buffer? - if (atrac->first_.size >= atrac->first_.filesize) { - atrac->first_.size = atrac->first_.filesize; - atrac->bufferState_ = ATRAC_STATUS_ALL_DATA_LOADED; + if (first_.size >= first_.filesize) { + first_.size = first_.filesize; + bufferState_ = ATRAC_STATUS_ALL_DATA_LOADED; } } else { - if (bufferInfo.first.filePos > atrac->first_.filesize) { + if (bufferInfo.first.filePos > first_.filesize) { return hleDelayResult(hleLogError(ME, ATRAC_ERROR_API_FAIL, "invalid file position"), "reset play pos", 200); } // Move the offset to the specified position. - atrac->first_.fileoffset = bufferInfo.first.filePos; + first_.fileoffset = bufferInfo.first.filePos; if (bytesWrittenFirstBuf != 0) { - if (!atrac->ignoreDataBuf_) { - Memory::Memcpy(atrac->dataBuf_ + atrac->first_.fileoffset, atrac->first_.addr, bytesWrittenFirstBuf, "AtracResetPlayPosition"); + if (!ignoreDataBuf_) { + Memory::Memcpy(dataBuf_ + first_.fileoffset, first_.addr, bytesWrittenFirstBuf, "AtracResetPlayPosition"); } - atrac->first_.fileoffset += bytesWrittenFirstBuf; + first_.fileoffset += bytesWrittenFirstBuf; } - atrac->first_.size = atrac->first_.fileoffset; - atrac->first_.offset = bytesWrittenFirstBuf; + first_.size = first_.fileoffset; + first_.offset = bytesWrittenFirstBuf; - atrac->bufferHeaderSize_ = 0; - atrac->bufferPos_ = atrac->bytesPerFrame_; - atrac->bufferValidBytes_ = bytesWrittenFirstBuf - atrac->bufferPos_; + bufferHeaderSize_ = 0; + bufferPos_ = bytesPerFrame_; + bufferValidBytes_ = bytesWrittenFirstBuf - bufferPos_; } - if (atrac->codecType_ == PSP_MODE_AT_3 || atrac->codecType_ == PSP_MODE_AT_3_PLUS) { - atrac->SeekToSample(sample); + if (codecType_ == PSP_MODE_AT_3 || codecType_ == PSP_MODE_AT_3_PLUS) { + SeekToSample(sample); } - atrac->WriteContextToPSPMem(); - return hleDelayResult(hleLogSuccessInfoI(ME, 0), "reset play pos", 3000); + WriteContextToPSPMem(); + return 0; } -// extraData should be 14 zeroed bytes. -void InitAT3ExtraData(Atrac *atrac, uint8_t *extraData) { - // We don't pull this from the RIFF so that we can support OMA also. - - // The only thing that changes are the jointStereo_ values. - extraData[0] = 1; - extraData[3] = atrac->channels_ << 3; - extraData[6] = atrac->jointStereo_; - extraData[8] = atrac->jointStereo_; - extraData[10] = 1; -} - -int Atrac::SetContext() { +void Atrac::CreateDecoder() { if (decoder_) { delete decoder_; } // First, init the standalone decoder. Only used for low-level-decode initially, but simple. if (codecType_ == PSP_MODE_AT_3) { + // We don't pull this from the RIFF so that we can support OMA also. uint8_t extraData[14]{}; - InitAT3ExtraData(this, extraData); + // The only thing that changes are the jointStereo_ values. + extraData[0] = 1; + extraData[3] = channels_ << 3; + extraData[6] = jointStereo_; + extraData[8] = jointStereo_; + extraData[10] = 1; decoder_ = CreateAtrac3Audio(channels_, bytesPerFrame_, extraData, sizeof(extraData)); } else { decoder_ = CreateAtrac3PlusAudio(channels_, bytesPerFrame_); } // reinit decodePos, because ffmpeg had changed it. decodePos_ = 0; - return 0; } -static int _AtracSetData(Atrac *atrac, u32 buffer, u32 readSize, u32 bufferSize, int successCode = 0) { - atrac->first_.addr = buffer; - atrac->first_.size = readSize; +int Atrac::SetData(u32 buffer, u32 readSize, u32 bufferSize, int successCode) { + first_.addr = buffer; + first_.size = readSize; - if (atrac->first_.size > atrac->first_.filesize) - atrac->first_.size = atrac->first_.filesize; - atrac->first_.fileoffset = atrac->first_.size; + if (first_.size > first_.filesize) + first_.size = first_.filesize; + first_.fileoffset = first_.size; // got the size of temp buf, and calculate offset - atrac->bufferMaxSize_ = bufferSize; - atrac->first_.offset = atrac->first_.size; + bufferMaxSize_ = bufferSize; + first_.offset = first_.size; // some games may reuse an atracID for playing sound - atrac->ResetData(); - atrac->SetBufferState(); + ResetData(); + SetBufferState(); - if (atrac->codecType_ != PSP_MODE_AT_3 && atrac->codecType_ != PSP_MODE_AT_3_PLUS) { + if (codecType_ != PSP_MODE_AT_3 && codecType_ != PSP_MODE_AT_3_PLUS) { // Shouldn't have gotten here, Analyze() checks this. - atrac->bufferState_ = ATRAC_STATUS_NO_DATA; + bufferState_ = ATRAC_STATUS_NO_DATA; return hleReportError(ME, ATRAC_ERROR_UNKNOWN_FORMAT, "unexpected codec type in set data"); } - if (atrac->bufferState_ == ATRAC_STATUS_ALL_DATA_LOADED || atrac->bufferState_ == ATRAC_STATUS_HALFWAY_BUFFER) { + if (bufferState_ == ATRAC_STATUS_ALL_DATA_LOADED || bufferState_ == ATRAC_STATUS_HALFWAY_BUFFER) { // This says, don't use the dataBuf_ array, use the PSP RAM. // This way, games can load data async into the buffer, and it still works. // TODO: Support this always, even for streaming. - atrac->ignoreDataBuf_ = true; + ignoreDataBuf_ = true; } - if (atrac->bufferState_ == ATRAC_STATUS_STREAMED_WITHOUT_LOOP || atrac->bufferState_ == ATRAC_STATUS_STREAMED_LOOP_FROM_END || atrac->bufferState_ == ATRAC_STATUS_STREAMED_LOOP_WITH_TRAILER) { - atrac->bufferHeaderSize_ = atrac->dataOff_; - atrac->bufferPos_ = atrac->dataOff_ + atrac->bytesPerFrame_; - atrac->bufferValidBytes_ = atrac->first_.size - atrac->bufferPos_; + if (bufferState_ == ATRAC_STATUS_STREAMED_WITHOUT_LOOP || bufferState_ == ATRAC_STATUS_STREAMED_LOOP_FROM_END || bufferState_ == ATRAC_STATUS_STREAMED_LOOP_WITH_TRAILER) { + bufferHeaderSize_ = dataOff_; + bufferPos_ = dataOff_ + bytesPerFrame_; + bufferValidBytes_ = first_.size - bufferPos_; } - const char *codecName = atrac->codecType_ == PSP_MODE_AT_3 ? "atrac3" : "atrac3+"; - const char *channelName = atrac->channels_ == 1 ? "mono" : "stereo"; + const char *codecName = codecType_ == PSP_MODE_AT_3 ? "atrac3" : "atrac3+"; + const char *channelName = channels_ == 1 ? "mono" : "stereo"; // Over-allocate databuf to prevent going off the end if the bitstream is bad or if there are // bugs in the decoder. This happens, see issue #15788. Arbitrary, but let's make it a whole page on the popular // architecture that has the largest pages (M1). - atrac->dataBuf_ = new u8[atrac->first_.filesize + overAllocBytes]; - memset(atrac->dataBuf_, 0, atrac->first_.filesize + overAllocBytes); - if (!atrac->ignoreDataBuf_) { - u32 copybytes = std::min(bufferSize, atrac->first_.filesize); - Memory::Memcpy(atrac->dataBuf_, buffer, copybytes, "AtracSetData"); - } - int ret = atrac->SetContext(); - if (ret < 0) { - // Already logged. - return ret; + dataBuf_ = new u8[first_.filesize + overAllocBytes]; + memset(dataBuf_, 0, first_.filesize + overAllocBytes); + if (!ignoreDataBuf_) { + u32 copybytes = std::min(bufferSize, first_.filesize); + Memory::Memcpy(dataBuf_, buffer, copybytes, "AtracSetData"); } + CreateDecoder(); return hleLogSuccessInfoI(ME, successCode, "%s %s audio", codecName, channelName); } @@ -1728,7 +1742,7 @@ static int _AtracSetData(int atracID, u32 buffer, u32 readSize, u32 bufferSize, // Don't use AtracValidateManaged here. if (!atrac) return hleLogError(ME, ATRAC_ERROR_BAD_ATRACID, "invalid atrac ID"); - int ret = _AtracSetData(atrac, buffer, readSize, bufferSize, needReturnAtracID ? atracID : 0); + int ret = atrac->SetData(buffer, readSize, bufferSize, needReturnAtracID ? atracID : 0); // not sure the real delay time return hleDelayResult(ret, "atrac set data", 100); } @@ -1769,7 +1783,7 @@ static u32 sceAtracSetSecondBuffer(int atracID, u32 secondBuffer, u32 secondBuff if (secondBufferSize < desiredSize && secondBufferSize < (u32)atrac->bytesPerFrame_ * 3) { return hleReportError(ME, ATRAC_ERROR_SIZE_TOO_SMALL, "too small"); } - if (atrac->bufferState_ != ATRAC_STATUS_STREAMED_LOOP_WITH_TRAILER) { + if (atrac->BufferState() != ATRAC_STATUS_STREAMED_LOOP_WITH_TRAILER) { return hleReportError(ME, ATRAC_ERROR_SECOND_BUFFER_NOT_NEEDED, "not needed"); } @@ -1935,7 +1949,7 @@ static int sceAtracIsSecondBufferNeeded(int atracID) { } // Note that this returns true whether the buffer is already set or not. - int needed = atrac->bufferState_ == ATRAC_STATUS_STREAMED_LOOP_WITH_TRAILER ? 1 : 0; + int needed = atrac->BufferState() == ATRAC_STATUS_STREAMED_LOOP_WITH_TRAILER ? 1 : 0; return hleLogSuccessI(ME, needed); } @@ -1957,7 +1971,7 @@ static int sceAtracSetMOutHalfwayBuffer(int atracID, u32 buffer, u32 readSize, u if (atrac->channels_ != 1) { // It seems it still sets the data. atrac->outputChannels_ = 2; - _AtracSetData(atrac, buffer, readSize, bufferSize); + atrac->SetData(buffer, readSize, bufferSize); return hleReportError(ME, ATRAC_ERROR_NOT_MONO, "not mono data"); } else { atrac->outputChannels_ = 1; @@ -1981,7 +1995,7 @@ static u32 sceAtracSetMOutData(int atracID, u32 buffer, u32 bufferSize) { if (atrac->channels_ != 1) { // It seems it still sets the data. atrac->outputChannels_ = 2; - _AtracSetData(atrac, buffer, bufferSize, bufferSize); + atrac->SetData(buffer, bufferSize, bufferSize); return hleReportError(ME, ATRAC_ERROR_NOT_MONO, "not mono data"); } else { atrac->outputChannels_ = 1; @@ -2163,26 +2177,13 @@ static int sceAtracLowLevelInitDecoder(int atracID, u32 paramsAddr) { return hleReportError(ME, 0, "invalid pointers"); } - atrac->channels_ = Memory::Read_U32(paramsAddr); - atrac->outputChannels_ = Memory::Read_U32(paramsAddr + 4); - atrac->bufferMaxSize_ = Memory::Read_U32(paramsAddr + 8); - atrac->bytesPerFrame_ = atrac->bufferMaxSize_; - atrac->first_.writableBytes = atrac->bytesPerFrame_; - atrac->ResetData(); - - const char *codecName = atrac->codecType_ == PSP_MODE_AT_3 ? "atrac3" : "atrac3+"; - const char *channelName = atrac->channels_ == 1 ? "mono" : "stereo"; - + bool jointStereo = false; if (atrac->codecType_ == PSP_MODE_AT_3) { - atrac->bitrate_ = (atrac->bytesPerFrame_ * 352800) / 1000; - atrac->bitrate_ = (atrac->bitrate_ + 511) >> 10; - atrac->jointStereo_ = false; - // See if we can match the actual jointStereo value. bool found = false; for (size_t i = 0; i < ARRAY_SIZE(at3HeaderMap); ++i) { if (at3HeaderMap[i].Matches(atrac)) { - atrac->jointStereo_ = at3HeaderMap[i].jointStereo; + jointStereo = at3HeaderMap[i].jointStereo; found = true; } } @@ -2190,26 +2191,40 @@ static int sceAtracLowLevelInitDecoder(int atracID, u32 paramsAddr) { ERROR_LOG_REPORT(ME, "AT3 header map lacks entry for bpf: %i channels: %i", atrac->bytesPerFrame_, atrac->channels_); // TODO: Should we return an error code for these values? } - } else if (atrac->codecType_ == PSP_MODE_AT_3_PLUS) { - atrac->bitrate_ = (atrac->bytesPerFrame_ * 352800) / 1000; - atrac->bitrate_ = ((atrac->bitrate_ >> 11) + 8) & 0xFFFFFFF0; - atrac->jointStereo_ = false; } - atrac->dataOff_ = 0; - atrac->first_.size = 0; - atrac->first_.filesize = atrac->bytesPerFrame_; - atrac->bufferState_ = ATRAC_STATUS_LOW_LEVEL; - atrac->currentSample_ = 0; - int ret = atrac->SetContext(); + atrac->InitLowLevel(paramsAddr, jointStereo); - atrac->WriteContextToPSPMem(); + const char *codecName = atrac->codecType_ == PSP_MODE_AT_3 ? "atrac3" : "atrac3+"; + const char *channelName = atrac->channels_ == 1 ? "mono" : "stereo"; + return hleLogSuccessInfoI(ME, 0, "%s %s audio", codecName, channelName); +} - if (ret < 0) { - // Already logged. - return ret; +void Atrac::InitLowLevel(u32 paramsAddr, bool jointStereo) { + channels_ = Memory::Read_U32(paramsAddr); + outputChannels_ = Memory::Read_U32(paramsAddr + 4); + bufferMaxSize_ = Memory::Read_U32(paramsAddr + 8); + bytesPerFrame_ = bufferMaxSize_; + first_.writableBytes = bytesPerFrame_; + ResetData(); + + if (codecType_ == PSP_MODE_AT_3) { + bitrate_ = (bytesPerFrame_ * 352800) / 1000; + bitrate_ = (bitrate_ + 511) >> 10; + jointStereo_ = false; + } else if (codecType_ == PSP_MODE_AT_3_PLUS) { + bitrate_ = (bytesPerFrame_ * 352800) / 1000; + bitrate_ = ((bitrate_ >> 11) + 8) & 0xFFFFFFF0; + jointStereo_ = false; } - return hleLogSuccessInfoI(ME, ret, "%s %s audio", codecName, channelName); + + dataOff_ = 0; + first_.size = 0; + first_.filesize = bytesPerFrame_; + bufferState_ = ATRAC_STATUS_LOW_LEVEL; + currentSample_ = 0; + CreateDecoder(); + WriteContextToPSPMem(); } static int sceAtracLowLevelDecode(int atracID, u32 sourceAddr, u32 sourceBytesConsumedAddr, u32 samplesAddr, u32 sampleBytesAddr) { @@ -2235,7 +2250,6 @@ static int sceAtracLowLevelDecode(int atracID, u32 sourceAddr, u32 sourceBytesCo *outWritten = bytesWritten; NotifyMemInfo(MemBlockFlags::WRITE, samplesAddr, bytesWritten, "AtracLowLevelDecode"); - return hleLogDebug(ME, hleDelayResult(0, "low level atrac decode data", atracDecodeDelay)); } @@ -2267,7 +2281,7 @@ u32 AtracSasAddStreamData(int atracID, u32 bufPtr, u32 bytesToAdd) { Atrac *atrac = getAtrac(atracID); if (!atrac) return 0; - return atrac->AddStreamData(bufPtr, bytesToAdd); + return atrac->AddStreamDataSas(bufPtr, bytesToAdd); } u32 AtracSasDecodeData(int atracID, u8* outbuf, u32 outbufPtr, u32 *SamplesNum, u32* finish, int *remains) { From d8631fa80e2566806c8744e12272baae6e08605e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 14 Apr 2024 12:04:19 +0200 Subject: [PATCH 128/719] Update ar_AE.ini (Arabic), thanks to Alucard --- assets/lang/ar_AE.ini | 300 +++++++++++++++++++++--------------------- 1 file changed, 150 insertions(+), 150 deletions(-) diff --git a/assets/lang/ar_AE.ini b/assets/lang/ar_AE.ini index 90b30bb7db..43198b43fb 100644 --- a/assets/lang/ar_AE.ini +++ b/assets/lang/ar_AE.ini @@ -9,107 +9,107 @@ [Achievements] %1: Attempt failed = %1: المحاولة فشلت %1: Attempt started = %1: بدأت المحاولة -%1 achievements, %2 points = %1انجازات , %2 نقاط +%1 achievements, %2 points = %1انجازات, %2 نقاط Account = الحساب -Achievement progress = تقدم الانجازات -Achievement sound volume = Achievement sound volume -Achievement unlocked = الانجازات المكتملة -Achievements = الانجازات -Achievements are disabled = الانجازات معطلة -Achievements enabled = الانجازات مفعلة +Achievement progress = تقدم الإنجازات +Achievement sound volume = صوت الإنجازات +Achievement unlocked = الإنجازات المكتملة +Achievements = الإنجازات +Achievements are disabled = الإنجازات معطلة +Achievements enabled = الإنجازات مفعلة Achievements with active challenges = انجازات مع تحديات نشطة Allow Save State in Hardcore Mode (but not Load State) = السماح بحالة الحفظ في الوضع المشدد (حالة التحميل غير مسموحة) -Almost completed achievements = انجازات شبه مكتملة +Almost completed achievements = الإنجازات شبه مكتملة Around me = حولي -Can't log in to RetroAchievements right now = غير قادر على تسجيل الدخول في الانجازات الرجعية حاليا +Can't log in to RetroAchievements right now = حاليا RetroAchievements لا يمكنك تسجيل الدخول في Challenge indicator = مؤشر التحدي -Contacting RetroAchievements server... = ...الاتصال بسرفر الانجازات الرجعية +Contacting RetroAchievements server... = . . .RetroAchivements يتم الإتصال بسيرفر Customize = تخصيص -Earned = لقد فتحت 1% من اصل 2% من الانجازات, و تحصلت على 3% من اصل 4% من النقاط -Encore Mode = وضع الظهور -Failed logging in to RetroAchievements = فشل تسجيل الدخول الى الانجازات الرجعية -Failed to connect to RetroAchievements. Achievements will not unlock. = فشل الاتصال بالانجازات الرجعية. لن يتم تسجيل الانجازات. -Failed to identify game. Achievements will not unlock. = فشل في تحديد اللعبة. لن يتم تسجيل الانجازات. +Earned = حصلت +Encore Mode = وضع الإعادة +Failed logging in to RetroAchievements = RetroAchievements فشل تسجيل الدخول في +Failed to connect to RetroAchievements. Achievements will not unlock. = . لن يتم فتح الانجازات RetroAchievements فشل الإتصال في +Failed to identify game. Achievements will not unlock. = فشلت في تحديد اللعبة. لن يتم فتح الإنجازات. Hardcore Mode (no savestates) = الوضع المشدد (لا لحالات الحفظ) Hardcore Mode = الوضع المشدد -How to use RetroAchievements = كيف تستعمل الانجازات الرجعية -In Encore mode - listings may be wrong below = في الوضع المشدد - قد تكون القوائم خاطئة ادناه +How to use RetroAchievements = RetroAchievements كيف تستعمل +In Encore mode - listings may be wrong below = في وضع الإعادة - قد تكون القوائم خاطئة ادناه Leaderboard attempt started or failed = بدأت محاولة قائمة المتصدرين او فشلت Leaderboard result submitted = تم تقديم نتائج قائمة المتصدرين Leaderboard score submission = تقديم نتيجة قائمة المتصدرين Leaderboard submission is enabled = تم تفعيل تقديم قائمة المتصدرين Leaderboard tracker = مقتفي قائمة المتصدرين Leaderboards = قوائم المتصدرين -Links = Links -Locked achievements = انجازات مقفلة +Links = الروابط +Locked achievements = إنجازات مقفلة Log bad memory accesses = تسجيل الوصول الى الذاكرة السيئة Mastered %1 = %تم اتقان 1 -Notifications = الاشعارات -Recently unlocked achievements = الانجازات المتحصل عليها حديثا -Reconnected to RetroAchievements. = تم اعادة الاتصال بالانجازات الرجعية -Register on www.retroachievements.org = www.retroachievements.org قم بتسجيل حساب على -RetroAchievements are not available for this game = ان الانجازات الرجعية غير متوفرة لهاذه اللعبة -RetroAchievements website = موقع الانجازات الرجعية -Rich Presence = الحضور الغني +Notifications = الإشعارات +Recently unlocked achievements = الإنجازات التي تم فتحها مؤخرا +Reconnected to RetroAchievements. = RetroAchievements يتم إعادة الإتصال في +Register on www.retroachievements.org = www.retroachievements.org سجل في +RetroAchievements are not available for this game = RetroAchievements الإنجازات غير متوفرة لهذه اللعبة +RetroAchievements website = RetroAchievements موقع +Rich Presence = حالة ديسكورد Save state loaded without achievement data = تم تنشيط حالة الحفظ بدون بيانات الانجازات Save states not available in Hardcore Mode = حالة الحفظ غير متاحة في الوضع المشدد (الصعب) Sound Effects = مؤثرات صوتية Statistics = الاحصاءات Submitted %1 for %2 = تم تقديم 1% من اصل 2% من -Syncing achievements data... = ...مزامنة بيانات الانجازات -Test Mode = وضع الاختبار -This feature is not available in Hardcore Mode = هاته الخاصية غير متواجدة في الوضع المشدد -This game has no achievements = لا تحتوي هاذه اللعبة على اية انجازات +Syncing achievements data... = ...مزامنة بيانات الإنجازات +Test Mode = وضع الإختبار +This feature is not available in Hardcore Mode = هذه الخاصية غير متواجدة في الوضع المشدد +This game has no achievements = لا تحتوي هذه اللعبة على اية انجازات Top players = افضل اللاعبين -Unlocked achievements = الانجازات المفتوحة -Unofficial achievements = الانجازات الغير رسمية -Unsupported achievements = الانجازات الغير مدعومة +Unlocked achievements = الإنجازات المفتوحة +Unofficial achievements = الإنجازات الغير رسمية +Unsupported achievements = الإنجازات الغير مدعومة [Audio] Alternate speed volume = حجم السرعة البديل Audio backend = ‎(إعادة التشغيل مطلوبة) الخلفية الصوتية -Audio Error = Audio Error -Audio file format not supported. Must be WAV or MP3. = Audio file format not supported. Must be WAV or MP3. +Audio Error = الاخطاء الصوتية +Audio file format not supported. Must be WAV or MP3. = .WAV or MP3 صيغة ملف الصوت غير مدعومة. يجب ان تكون AudioBufferingForBluetooth = ‎معادلة مصادقة البلوتوث (بطئ) -Auto = Auto -Device = Device -Disabled = Disabled +Auto = تلقائي +Device = جهاز +Disabled = غير مفعل DSound (compatible) = ‎DSound (متكامل) Enable Sound = ‎تفعيل الصوت Global volume = ‎الصوت العام Microphone = Microphone -Microphone Device = Microphone device -Mute = Mute -Reverb volume = Reverb volume -Use new audio devices automatically = Use new audio devices automatically -Use global volume = Use global volume +Microphone Device = جهاز المايكروفون +Mute = كتم +Reverb volume = تردد الصوت +Use new audio devices automatically = استعمل اجهزة الصوت الجديده تلقائيا +Use global volume = استعمل الصوت العالمي WASAPI (fast) = ‎WASAPI (سريع) [Controls] -Analog Binding = Analog Binding -Analog Limiter = ‎محدد التناظري -Analog Settings = اعدادات التناظر -Analog Stick = ‎عصا تناظرية -Analog Style = النمط التناظري -Analog trigger threshold = Analog trigger threshold -AnalogLimiter Tip = ‎وضع حد اقصى للتناظر +Analog Binding = ربط الانالوج +Analog Limiter = ‎محدد الانالوج +Analog Settings = اعدادات الانالوج +Analog Stick = ‎عصا الانالوج +Analog Style = النمط الانالوج +Analog trigger threshold = حساسية ضغطة الانالوج +AnalogLimiter Tip = ‎وضع حد اقصى للانالوج Auto = ‎تلقائي -Auto-centering analog stick = ‎تنصيف العصا التناظرية تلقائياً +Auto-centering analog stick = ‎توسيط عصا الانالوج تلقائياً Auto-hide buttons after delay = ‎إخفاء الأزرار تلقائياً بعد ثواني -Auto-rotation speed = Auto-rotation speed -Binds = Binds -Button Binding = Button Binding +Auto-rotation speed = سرعة التدوير التلقائي +Binds = ربط +Button Binding = ربط الزر Button Opacity = ‎شفافية الأزرار Button style = ‎شكل الأزرار Calibrate Analog Stick = معايرة عصا التحكم Calibrate = ‎معايرة -Calibrated = معايرة +Calibrated = تمت معايرته Calibration = ‎المعايرة -Circular deadzone = منطقة ميتة دائرية +Circular deadzone = منطقة الحساسيه الدائرية Circular stick input = ادخال العصا الدائرية Classic = ‎كلاسيكي Confine Mouse = ‎حجز مؤشر الماوس في حدود نافذة البرنامج -Control Mapping = ‎تخطيط التحكم +Control Mapping = ‎تعديل ازرار التحكم Custom Key Setting = اعدادات مفاتيح مخصصة Customize = تخصيص Customize Touch Controls = ‎تعديل نسق إعدادات اللمس... @@ -120,7 +120,7 @@ Disable diagonal input = تعطيل الادخال القطري Double tap = نقر مزدوج Enable analog stick gesture = تفعيل حركة عصا التحكم Enable gesture control = تفعيل تحكم الحركات -Enable standard shortcut keys = تفعيل ازرار الاختصارات المعتادة +Enable standard shortcut keys = تفعيل ازرار الاختصارات الإعتيادية frames = الاطارات Gesture = حركة Gesture mapping = تخطيط الحركات @@ -180,8 +180,8 @@ X = X Y = Y [CwCheats] -Cheats = ‎الشفرات -Edit Cheat File = ‎عدل ملف الشفرة +Cheats = ‎الغش +Edit Cheat File = ‎عدل ملف الغش Import Cheats = ‎إستورد من cheat.db Import from %s = ‎إستورد من %s Refresh interval = ‎معدل التحديث @@ -197,22 +197,22 @@ Backend = ‎&خلفية التصيير(إعادة تشغيل PPSSPP) Bicubic = &Bicubic Break = Break Break on Load = Break on load -Buy Gold = ‎إشتري النسخة الإحترافية & -Control Mapping... = ‎&تخطيط التحكم... +Buy Gold = ‎إشتري النسخة الذهبية +Control Mapping... = ‎تخطيط التحكم... Copy PSP memory base address = Copy PSP memory base &address -Debugging = ‎&تصحيح -Deposterize = ‎&تحديد الحجم -Direct3D9 = Direct3D &9 -Direct3D11 = Direct3D &11 -Disassembly = ‎&التفكيك... +Debugging = ‎Debugging +Deposterize = ‎تحديد الحجم +Direct3D9 = Direct3D9 +Direct3D11 = Direct3D11 +Disassembly = التفكيك Discord = ديسكورد Display Layout && Effects = ‎أظهر مُعدل النسق... Display Rotation = ‎تدوير العرض Dump Next Frame to Log = ‎تصحيح الفريم التالي إلي سجل -Emulation = ‎&محاكاة -Enable Cheats = ‎تفعيل &الشفرات -Enable Sound = ‎تفعيل &الصوت -Exit = ‎&خروج +Emulation = ‎محاكاة +Enable Cheats = ‎تفعيل الغش +Enable Sound = ‎تفعيل الصوت +Exit = خروج Extract File... = ‎&إستخراج ملف... File = ‎&ملف Frame Skipping = ‎&تخطي الإطار @@ -327,7 +327,7 @@ Log View = ‎أظهر السجل Logging Channels = ‎قنوات التسجيل Multi-threaded rendering = Multi-threaded rendering Next = ‎التالي -No block = ‎لا بوك +No block = بدون منع Off = Off Prev = ‎السابق Random = ‎عشوائي @@ -520,12 +520,12 @@ Calculate CRC = Calculate CRC Click "Calculate CRC" to verify ISO = Click "Calculate CRC" to verify ISO ConfirmDelete = ‎مسح CRC checksum does not match, bad or modified ISO = CRC checksum does not match, bad or modified ISO -Create Game Config = ‎أنشي إعدادت للعبة +Create Game Config = ‎أنشاء إعدادت للعبة Create Shortcut = ‎إصنع إختصار Delete Game = ‎إمسح اللعبة Delete Game Config = ‎مسح إعدادات اللعبة Delete Save Data = ‎مسح بيانات الحفظ -Europe = ‎أروبا +Europe = ‎أوروبا File size incorrect, bad or modified ISO = File size incorrect, bad or modified ISO Game = ‎اللعبة Game ID unknown - not in the ReDump database = Game ID unknown - not in the ReDump database @@ -536,14 +536,14 @@ InstallData = ‎تثبيت البيانات ISO OK according to the ReDump project = ISO OK according to the ReDump project Japan = ‎اليابان Korea = كوريا -MB = ‎ميجا +MB = بايت‎ميجا One moment please... = ‎دقيقة واحدة من فضلك... Play = ‎إبدء اللعب Remove From Recent = ‎مسح من "الحالي" SaveData = ‎بيانات الحفظ Setting Background = ‎إعدادات الخلفية Show In Folder = ‎أظهر في المجلد -Time Played: %1h %2m %3s = Time Played: %1h %2m %3s +Time Played: %1h %2m %3s = %1س %2د %3ث : وقت اللعب Uncompressed = تم فك الضغط USA = ‎أمريكا Use UI background = ‎إستخدم خلفية الواجهة @@ -734,8 +734,8 @@ You can press ESC to cancel. = ‎يمكنك ضغط علي زر الخروج ل [MainMenu] Browse = ‎تصفح... -Buy PPSSPP Gold = Buy PPSSPP Gold -Choose folder = Choose folder +Buy PPSSPP Gold = الذهبي PPSSPP اشتر +Choose folder = اختر المجلد Credits = ‎الحقوق PPSSPP Homebrew Store = ‎PPSSPP Homebrew Store Exit = ‎خروج @@ -743,10 +743,10 @@ Game Settings = ‎الإعدادات Games = ‎الألعاب Give PPSSPP permission to access storage = ‎الأذون للوصول إلي مساحة التخزين PPSSPP أعطي الـ Homebrew & Demos = Homebrew && Demos -How to get games = ‎كيف يمكنني الحصول علي الألعاب? +How to get games = ‎كيف يمكنني الحصول على الألعاب How to get homebrew & demos = How can I get homebrew && demos? -Load = ‎تحميل... -Loading... = Loading... +Load = ‎تحميل +Loading... = ...تحميل PinPath = ‎تثبيت PPSSPP can't load games or save right now = ‎لا يمكنه تحميل الألعاب الأن أو الحفظ الأن PPSSPP Recent = ‎الحالي @@ -760,9 +760,9 @@ www.ppsspp.org = www.ppsspp.org [MainSettings] Audio = ‎الصوت Controls = ‎التحكم -Graphics = ‎الجرافك +Graphics = ‎الجرافكس Networking = ‎الشبكة -Search = Search +Search = البحث System = ‎النظام Tools = ‎الأدوات @@ -822,16 +822,16 @@ Rotate Analog (CCW) = Rotate analog (CCW) Rotate Analog (CW) = Rotate analog (CW) Save State = Save state Screen = ‎الشاشة -Screenshot = Screenshot +Screenshot = تصوير الشاشة Select = ‎تحديد SpeedToggle = ‎تفعيل السرعة Square = ‎مربع Start = ‎بدء -Swipe Down = Swipe Down -Swipe Left = Swipe Left -Swipe Right = Swipe Right -Swipe Up = Swipe Up -tap to customize = tap to customize +Swipe Down = اسحب تحت +Swipe Left = اسحب يسار +Swipe Right = اسحب يمين +Swipe Up = اسحب فوق +tap to customize = اضغط للتخصيص Texture Dumping = Texture dumping Texture Replacement = Texture replacement Toggle Fullscreen = ‎تفعيل وضع الشاشة الكاملة @@ -851,14 +851,14 @@ Already contains PSP data = Already contains PSP data Cancelled - try again = Cancelled - try again Checking... = Checking... Create or Choose a PSP folder = Create or Choose a PSP folder -Current = Current +Current = الحالي DataCanBeShared = Data can be shared between PPSSPP regular/Gold DataCannotBeShared = Data CANNOT be shared between PPSSPP regular/Gold! DataWillBeLostOnUninstall = Warning! Data will be lost when you uninstall PPSSPP! DataWillStay = Data will stay even if you uninstall PPSSPP. -Deleting... = Deleting... -Done! = Done! -EasyUSBAccess = Easy USB access +Deleting... = ...يتم الحذف +Done! = !تم +EasyUSBAccess = USBالوصول السهل للـ Failed to move some files! = فشل في نقل بعض الملفات Failed to save config = فشل في حفظ الإعدادات Free space = المساحة المتوفرة @@ -876,7 +876,7 @@ USBAccessThroughGold = USB access through Android/data/org.ppsspp.ppssppgold/fil Use App Private Data = Use App Private Data Use PSP folder at root of storage = Use PSP folder at root of storage Welcome to PPSSPP! = Welcome to PPSSPP! -WhatsThis = What's this? +WhatsThis = ?ما هذا [Networking] AdHoc Server = Ad hoc server @@ -888,46 +888,46 @@ Change proAdhocServer Address = Change PRO ad hoc server IP address (localhost = ChangeMacSaveConfirm = Generate a new MAC address? ChangeMacSaveWarning = Some games verify the MAC address when loading savedata, so this may break old saves. Chat = محادثة -Chat Button Position = Chat button position +Chat Button Position = مكان زر المحادثة Chat Here = تحدث هنا -Chat message = Chat message -Chat Screen Position = Chat screen position -Disconnected from AdhocServer = Disconnected from ad hoc server +Chat message = رسائل الشات +Chat Screen Position = مكان شاشة الشات +Disconnected from AdhocServer = AdhocServer تم قطع الاتصال في سيرفرات DNS Error Resolving = DNS error resolving Enable built-in PRO Adhoc Server = Enable built-in PRO ad hoc server -Enable network chat = Enable network chat -Enable networking = Enable networking/WLAN -Enable UPnP = Enable UPnP (need a few seconds to detect) -EnableQuickChat = Enable quick chat -Enter a new PSP nickname = Enter a new PSP nickname -Enter Quick Chat 1 = Enter quick chat 1 -Enter Quick Chat 2 = Enter quick chat 2 -Enter Quick Chat 3 = Enter quick chat 3 -Enter Quick Chat 4 = Enter quick chat 4 -Enter Quick Chat 5 = Enter quick chat 5 -Error = Error +Enable network chat = تفعيل الشات عبر الشبكه +Enable networking = networking/WLAN تفعيل +Enable UPnP = (يحتاج لبعض الوقت للكشف) UPnP تفعيل +EnableQuickChat = تفعيل الشات السريع +Enter a new PSP nickname = اختيار اسم البي اس بي الجديد +Enter Quick Chat 1 = الدخول الى الشات السريع 1 +Enter Quick Chat 2 = الدخول الى الشات السريع 2 +Enter Quick Chat 3 = الدخول الى الشات السريع 3 +Enter Quick Chat 4 = الدخول الى الشات السريع 4 +Enter Quick Chat 5 = الدخول الى الشات السريع 5 +Error = فشل Failed to Bind Localhost IP = Failed to bind localhost IP Failed to Bind Port = Failed to bind port Failed to connect to Adhoc Server = Failed to connect to ad hoc server Forced First Connect = Forced first connect (faster connect) GM: Data from Unknown Port = GM: Data from Unknown Port -Hostname = Hostname +Hostname = اسم المستضيف Invalid IP or hostname = Invalid IP or hostname Minimum Timeout = Minimum timeout (override in ms, 0 = default) Misc = Miscellaneous (default = PSP compatibility) -Network connected = Network connected +Network connected = متصل بالشبكة Network initialized = ‎الشبكة تُطلق Please change your Port Offset = Please change your port offset Port offset = Port offset (0 = PSP compatibility) Open PPSSPP Multiplayer Wiki Page = Open PPSSPP Multiplayer Wiki Page proAdhocServer Address: = Ad hoc server address: -Quick Chat 1 = Quick chat 1 -Quick Chat 2 = Quick chat 2 -Quick Chat 3 = Quick chat 3 -Quick Chat 4 = Quick chat 4 -Quick Chat 5 = Quick chat 5 -QuickChat = Quick chat -Randomize = Randomize +Quick Chat 1 = الشات السريع 1 +Quick Chat 2 = الشات السريع 2 +Quick Chat 3 = الشات السريع 3 +Quick Chat 4 = الشات السريع 4 +Quick Chat 5 = الشات السريع 5 +QuickChat = الشات السريع +Randomize = عشوائي Send = إرسال Send Discord Presence information = Send Discord "Rich Presence" information Unable to find UPnP device = Unable to find UPnP device @@ -940,7 +940,7 @@ WLAN Channel = WLAN channel You're in Offline Mode, go to lobby or online hall = You're in offline mode, go to lobby or online hall [PSPSettings] -Auto = Auto +Auto = تلقائي Chinese (simplified) = صينية(مبسطة) Chinese (traditional) = صينية(التقليدية) Dutch = هُولَندي @@ -968,8 +968,8 @@ Rewind = ‎إرجاع Save State = ‎حفظ الحالة Settings = ‎الإعدادات Switch UMD = ‎تبديل الـ UMD -Undo last load = Undo last load -Undo last save = Undo last save +Undo last load = تراجع عن اخر تحميل +Undo last save = تراجع عن اخر حفظ [PostShaders] (duplicated setting, previous slider will be used) = (duplicated setting, previous slider will be used) @@ -977,38 +977,38 @@ Undo last save = Undo last save 5xBR = 5xBR pixel art upscaler 5xBR-lv2 = 5xBR-lv2 pixel art upscaler AAColor = ‎AA-لون -Amount = Amount +Amount = عدد Animation speed (0 -> disable) = Animation speed (0 -> disable) Aspect = Aspect -Black border = Black border -Bloom = Bloom -BloomNoBlur = Bloom (no blur) -Brightness = Brightness +Black border = حواف سوداء +Bloom = وهج +BloomNoBlur = وهج (بدون تغبيش) +Brightness = الاضائة Cartoon = ‎كرتوني CatmullRom = Bicubic (Catmull-Rom) Upscaler -ColorCorrection = Color correction -ColorPreservation = Color preservation +ColorCorrection = تصحيح الالوان +ColorPreservation = حفظ الالوان Contrast = Contrast CRT = ‎CRT خطوط الفحص -FakeReflections = FakeReflections +FakeReflections = انعكاسات وهميه FXAA = ‎FXAA منعم الحواف Gamma = Gamma -GreenLevel = Green level -Intensity = Intensity +GreenLevel = مستوى الاخضر +Intensity = الشدة LCDPersistence = LCD Persistence MitchellNetravali = Bicubic (Mitchell-Netravali) Upscaler Natural = ‎الألوان الحقيقية -NaturalA = Natural Colors (no blur) +NaturalA = الوان حقيقية (بدون تغبيش) Off = ‎مغلق -Power = Power -PSPColor = PSP color -RedBlue = Red/Blue glasses +Power = طاقة +PSPColor = PSPلون الـ +RedBlue = نظارات الاحمر و الازرق Saturation = Saturation -Scanlines = Scanlines (CRT) +Scanlines = خطوط (CRT فلتر) Sharpen = ‎تنعيم الحواف SideBySide = Side by side (SBS) SSAA(Gauss) = Supersampling AA (Gauss) -Strength = Strength +Strength = قوة Tex4xBRZ = 4xBRZ TexMMPX = MMPX UpscaleBicubic = UpscaleBicubic @@ -1018,7 +1018,7 @@ Vignette = Vignette [PSPCredits] all the forum mods = all the forum mods -build server = build server +build server = بناء سيرفر Buy Gold = ‎إشتري النسخة الذهبية check = ‎تفحص أيضا برنامج Dolphin, أفضل محاكي جهاز الوي ومكعب الألعاب موجود حالياً: CheckOutPPSSPP = Check out PPSSPP, the awesome PSP emulator: https://www.ppsspp.org/ @@ -1030,13 +1030,13 @@ info2 = ‎من فضلك تحقق أنك تملك الحقوق لأي لعبة info3 = you play by owning the UMD or by buying the digital info4 = download from the PSN store on your real PSP. info5 = PSP is a trademark by Sony, Inc. -iOS builds = iOS builds +iOS builds = IOSنسخ الـ license = ‎برنامج مجاني تحت رخصة GPL 2.0+ list = ‎قائمة التكامل, المنتديات, ومعلومات التطوير PPSSPP Forums = ‎PPSSPP منتديات Privacy Policy = Privacy policy Share PPSSPP = ‎مشاركة PPSSPP -specialthanks = ‎الشكر الجزيل إلي: +specialthanks = ‎شكر خاص : specialthanksKeithGalocy = at NVIDIA (hardware, advice) specialthanksMaxim = for his amazing Atrac3+ decoder work testing = testing @@ -1046,14 +1046,14 @@ tools = ‎الأدوات المجانية المستعملة: # Add translators or contributors who translated PPSSPP into your language here. # Add translators1-6 for up to 6 lines of translator credits. # Leave extra lines blank. 4 contributors per line seems to look best. -translators1 = ‎عمر أنور عجلان +translators1 = ‎ِAlucard_xi translators2 = omar.aglan91@gmail.com translators3 =ma1feesm -translators4 = +translators4 =عمر أنور عجلان translators5 = translators6 = Twitter @PPSSPP_emu = Twitter @PPSSPP_emu -website = ‎تحقق من الموقع الألكتروني: +website = ‎الموقع الألكتروني written = ‎مكتوب في لغة C++ من أجل السرعة والمتانة [RemoteISO] @@ -1123,7 +1123,7 @@ View Feedback = ‎أظهر كل المراجاعات [Savedata] Date = التاريخ Filename = إسم الملف -No screenshot = ‎لا لقطة شاشة +No screenshot = ‎لا تصور الشاشة None yet. Things will appear here after you save. = ‎ليس بعد. الأشياء سوف تظهر هنا بعد الحفظ. Nothing matching '%1' was found. = Nothing matching '%1' was found. Save Data = ‎حفظ البيانات @@ -1140,7 +1140,7 @@ Failed to load state = Failed to load state Failed to save state = Failed to save state fixed = ‎السرعة: الجانبي GLToolsWarning = WARNING: GLTools detected, may cause problems. -In menu = In menu +In menu = في القائمه Loaded State = ‎الحالة تم تحميلها Loaded. Game may refuse to save over different savedata. = Loaded. Game may refuse to save over different savedata. Loaded. Game may refuse to save over newer savedata. = Loaded. Game may refuse to save over newer savedata. @@ -1162,7 +1162,7 @@ Untitled PSP game = Untitled PSP game [Search] Clear filter = Clear filter -Filter = Filter +Filter = فلتر Filtering settings by '%1' = Filtering settings by '%1' Find settings = Find settings No settings matched '%1' = No settings matched '%1' @@ -1232,7 +1232,7 @@ OS Information = OS information Pixel resolution = Pixel resolution PPSSPP build = PPSSPP build Present modes = Present modes -Refresh rate = Refresh rate +Refresh rate = معدل التحديث Release = Release RW/RX exclusive = RW/RX exclusive Sample rate = Sample rate @@ -1286,7 +1286,7 @@ Confirmation Button = ‎زر التأكيد Date Format = ‎صيغة التاريخ Day Light Saving = ‎التوقيت الصيفي DDMMYYYY = ‎يوم شهر سنة -Decrease size = Decrease size +Decrease size = تقليص الحجم Developer Tools = ‎ادوات المطور Display Extra Info = إظهار معلومات أكثر Display Games on a grid = Display "Games" on a grid @@ -1314,7 +1314,7 @@ Memory Stick Folder = Memory Stick folder Memory Stick inserted = ‎تم إدخال الذاكرة MHz, 0:default = ميجا هرتز, 0 = ‎الإفتراضي MMDDYYYY = ‎شهر يوم سنة -Moving background = Moving background +Moving background = خلفية متحركة Newest Save = Newest save No animation = No animation Not a PSP game = ‎PSP ليست لعبة @@ -1396,7 +1396,7 @@ List: = List: Progress: %1% = Progress: %1% Screen representation = Screen representation [Upgrade] -Details = Details +Details = معلومات Dismiss = ‎إلغاء Download = ‎تحميل New version of PPSSPP available = ‎تتوفر نسخة جديدة من البرنامج From c7c7e0a36d02db8461b5e8e596e7afd901cc0b73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 14 Apr 2024 13:43:20 +0200 Subject: [PATCH 129/719] Fix the AxisSwap feature - had a double mutex lock, oops. --- Core/ControlMapper.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/ControlMapper.cpp b/Core/ControlMapper.cpp index 94765edd64..8be39420d4 100644 --- a/Core/ControlMapper.cpp +++ b/Core/ControlMapper.cpp @@ -577,7 +577,7 @@ bool ControlMapper::Key(const KeyInput &key, bool *pauseTrigger) { } void ControlMapper::ToggleSwapAxes() { - std::lock_guard guard(mutex_); + // Note: The lock is already locked here. swapAxes_ = !swapAxes_; From 9bb136f8713f3a25f691162ee692330b718071fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 14 Apr 2024 13:47:22 +0200 Subject: [PATCH 130/719] Remove an unnecessary enum --- Core/HLE/sceAtrac.cpp | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp index d84948cec8..9778ba51d4 100644 --- a/Core/HLE/sceAtrac.cpp +++ b/Core/HLE/sceAtrac.cpp @@ -121,13 +121,6 @@ const size_t overAllocBytes = 16384; static const int atracDecodeDelay = 2300; -enum AtracDecodeResult { - ATDECODE_FAILED = -1, - ATDECODE_FEEDME = 0, - ATDECODE_GOTFRAME = 1, - ATDECODE_BADFRAME = 2, -}; - struct InputBuffer { // Address of the buffer. u32 addr; @@ -145,8 +138,6 @@ struct InputBuffer { u32 fileoffset; }; -struct Atrac; - struct AtracLoopInfo { int cuePointID; int type; @@ -1110,7 +1101,7 @@ u32 Atrac::DecodeData(u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u32 *finish, i if ((codecType_ == PSP_MODE_AT_3 || codecType_ == PSP_MODE_AT_3_PLUS)) { SeekToSample(currentSample_); - AtracDecodeResult res = ATDECODE_FEEDME; + bool gotFrame = false; u32 off = FileOffsetBySample(currentSample_ - skipSamples); if (off < first_.size) { uint8_t *indata = BufferStart() + off; @@ -1123,7 +1114,7 @@ u32 Atrac::DecodeData(u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u32 *finish, i *finish = 1; return ATRAC_ERROR_ALL_DATA_DECODED; } - res = ATDECODE_GOTFRAME; + gotFrame = true; numSamples = outBytes / 4; uint32_t packetAddr = CurBufferAddress(-skipSamples); @@ -1134,11 +1125,6 @@ u32 Atrac::DecodeData(u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u32 *finish, i // If we're at the end, clamp to samples we want. It always returns a full chunk. numSamples = std::min(maxSamples, numSamples); - if (skipped > 0 && numSamples == 0) { - // Wait for the next one. - res = ATDECODE_FEEDME; - } - if (packetAddr != 0 && MemBlockInfoDetailed()) { char tagData[128]; size_t tagSize = FormatMemWriteTagAt(tagData, sizeof(tagData), "AtracDecode/", packetAddr, bytesPerFrame_); @@ -1150,7 +1136,7 @@ u32 Atrac::DecodeData(u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u32 *finish, i // We only want one frame per call, let's continue the next time. } - if (res != ATDECODE_GOTFRAME && currentSample_ < endSample_) { + if (!gotFrame && currentSample_ < endSample_) { // Never got a frame. We may have dropped a GHA frame or otherwise have a bug. // For now, let's try to provide an extra "frame" if possible so games don't infinite loop. if (FileOffsetBySample(currentSample_) < first_.filesize) { From 0f0149d08b0daac140de3ddbba4726de044086ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 14 Apr 2024 14:47:52 +0200 Subject: [PATCH 131/719] Split out the Atrac context class into AtracCtx.cpp/h --- CMakeLists.txt | 2 + Core/Core.vcxproj | 2 + Core/Core.vcxproj.filters | 6 + Core/HLE/AtracCtx.cpp | 1083 ++++++++++++++++++++++ Core/HLE/AtracCtx.h | 267 ++++++ Core/HLE/sceAtrac.cpp | 1281 +-------------------------- UWP/CoreUWP/CoreUWP.vcxproj | 2 + UWP/CoreUWP/CoreUWP.vcxproj.filters | 6 + android/jni/Android.mk | 1 + libretro/Makefile.common | 1 + 10 files changed, 1381 insertions(+), 1270 deletions(-) create mode 100644 Core/HLE/AtracCtx.cpp create mode 100644 Core/HLE/AtracCtx.h diff --git a/CMakeLists.txt b/CMakeLists.txt index febe3663ac..64a10be42c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2079,6 +2079,8 @@ add_library(${CoreLibName} ${CoreLinkType} Core/HLE/__sceAudio.h Core/HLE/sceAdler.cpp Core/HLE/sceAdler.h + Core/HLE/AtracCtx.cpp + Core/HLE/AtracCtx.h Core/HLE/sceAtrac.cpp Core/HLE/sceAtrac.h Core/HLE/sceAudio.cpp diff --git a/Core/Core.vcxproj b/Core/Core.vcxproj index e88cd217ae..2cdf17d477 100644 --- a/Core/Core.vcxproj +++ b/Core/Core.vcxproj @@ -566,6 +566,7 @@ + @@ -1174,6 +1175,7 @@ + diff --git a/Core/Core.vcxproj.filters b/Core/Core.vcxproj.filters index cb3f716cc9..3c1493fc11 100644 --- a/Core/Core.vcxproj.filters +++ b/Core/Core.vcxproj.filters @@ -1309,6 +1309,9 @@ HW + + HLE\Libraries + @@ -2094,6 +2097,9 @@ HW + + HLE\Libraries + diff --git a/Core/HLE/AtracCtx.cpp b/Core/HLE/AtracCtx.cpp new file mode 100644 index 0000000000..b78e68d23a --- /dev/null +++ b/Core/HLE/AtracCtx.cpp @@ -0,0 +1,1083 @@ +// Copyright (c) 2012- PPSSPP Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0 or later versions. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official git repository and contact information can be found at +// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. + +#include "Common/Serialize/Serializer.h" +#include "Common/Serialize/SerializeFuncs.h" +#include "Common/Log.h" +#include "Core/Reporting.h" +#include "Core/MemMapHelpers.h" +#include "Core/System.h" +#include "Core/HLE/HLE.h" +#include "Core/HLE/FunctionWrappers.h" +#include "Core/HLE/sceAtrac.h" +#include "Core/HLE/AtracCtx.h" +#include "Core/HW/Atrac3Standalone.h" +#include "Core/HLE/sceKernelMemory.h" + +const size_t overAllocBytes = 16384; + +const int RIFF_CHUNK_MAGIC = 0x46464952; +const int RIFF_WAVE_MAGIC = 0x45564157; +const int FMT_CHUNK_MAGIC = 0x20746D66; +const int DATA_CHUNK_MAGIC = 0x61746164; +const int SMPL_CHUNK_MAGIC = 0x6C706D73; +const int FACT_CHUNK_MAGIC = 0x74636166; + +void Atrac::DoState(PointerWrap &p) { + auto s = p.Section("Atrac", 1, 9); + if (!s) + return; + + Do(p, channels_); + Do(p, outputChannels_); + if (s >= 5) { + Do(p, jointStereo_); + } + + Do(p, atracID_); + Do(p, first_); + Do(p, bufferMaxSize_); + Do(p, codecType_); + + Do(p, currentSample_); + Do(p, endSample_); + Do(p, firstSampleOffset_); + if (s >= 3) { + Do(p, dataOff_); + } else { + dataOff_ = firstSampleOffset_; + } + + u32 hasDataBuf = dataBuf_ != nullptr; + Do(p, hasDataBuf); + if (hasDataBuf) { + if (p.mode == p.MODE_READ) { + if (dataBuf_) + delete[] dataBuf_; + dataBuf_ = new u8[first_.filesize + overAllocBytes]; + memset(dataBuf_, 0, first_.filesize + overAllocBytes); + } + DoArray(p, dataBuf_, first_.filesize); + } + Do(p, second_); + + Do(p, decodePos_); + if (s < 9) { + u32 oldDecodeEnd = 0; + Do(p, oldDecodeEnd); + } + if (s >= 4) { + Do(p, bufferPos_); + } else { + bufferPos_ = decodePos_; + } + + Do(p, bitrate_); + Do(p, bytesPerFrame_); + + Do(p, loopinfo_); + if (s < 9) { + int oldLoopInfoNum = 42; + Do(p, oldLoopInfoNum); + } + + Do(p, loopStartSample_); + Do(p, loopEndSample_); + Do(p, loopNum_); + + Do(p, context_); + if (s >= 6) { + Do(p, bufferState_); + } else { + if (dataBuf_ == nullptr) { + bufferState_ = ATRAC_STATUS_NO_DATA; + } else { + UpdateBufferState(); + } + } + + if (s >= 7) { + Do(p, ignoreDataBuf_); + } else { + ignoreDataBuf_ = false; + } + + if (s >= 9) { + Do(p, bufferValidBytes_); + Do(p, bufferHeaderSize_); + } else { + bufferHeaderSize_ = dataOff_; + bufferValidBytes_ = std::min(first_.size - dataOff_, StreamBufferEnd() - dataOff_); + if ((bufferState_ & ATRAC_STATUS_STREAMED_MASK) == ATRAC_STATUS_STREAMED_MASK) { + bufferPos_ = dataOff_; + } + } + + if (s < 8 && bufferState_ == ATRAC_STATUS_STREAMED_LOOP_WITH_TRAILER) { + // We didn't actually allow the second buffer to be set this far back. + // Pretend it's a regular loop, we'll just try our best. + bufferState_ = ATRAC_STATUS_STREAMED_LOOP_FROM_END; + } + + // Make sure to do this late; it depends on things like bytesPerFrame_. + if (p.mode == p.MODE_READ && bufferState_ != ATRAC_STATUS_NO_DATA) { + CreateDecoder(); + } + + if (s >= 2 && s < 9) { + bool oldResetBuffer = false; + Do(p, oldResetBuffer); + } +} + +void Atrac::ResetData() { + delete decoder_; + decoder_ = nullptr; + + if (dataBuf_) + delete[] dataBuf_; + dataBuf_ = 0; + ignoreDataBuf_ = false; + bufferState_ = ATRAC_STATUS_NO_DATA; + + if (context_.IsValid()) + kernelMemory.Free(context_.ptr); +} + +void Atrac::AnalyzeReset() { + // Reset some values. + codecType_ = 0; + currentSample_ = 0; + endSample_ = -1; + loopNum_ = 0; + loopinfo_.clear(); + loopStartSample_ = -1; + loopEndSample_ = -1; + decodePos_ = 0; + bufferPos_ = 0; + channels_ = 2; +} + +void Atrac::UpdateContextFromPSPMem() { + if (!context_.IsValid()) { + return; + } + + // Read in any changes from the game to the context. + // TODO: Might be better to just always track in RAM. + bufferState_ = context_->info.state; + // This value is actually abused by games to store the SAS voice number. + loopNum_ = context_->info.loopNum; +} + +void Atrac::WriteContextToPSPMem() { + if (!context_.IsValid()) { + return; + } + // context points into PSP memory. + SceAtracContext *context = context_; + context->info.buffer = first_.addr; + context->info.bufferByte = bufferMaxSize_; + context->info.secondBuffer = second_.addr; + context->info.secondBufferByte = second_.size; + context->info.codec = codecType_; + context->info.loopNum = loopNum_; + context->info.loopStart = loopStartSample_ > 0 ? loopStartSample_ : 0; + context->info.loopEnd = loopEndSample_ > 0 ? loopEndSample_ : 0; + + // Note that we read in the state when loading the atrac object, so it's safe + // to update it back here all the time. Some games, like Sol Trigger, change it. + // TODO: Should we just keep this in PSP ram then, or something? + context->info.state = bufferState_; + if (firstSampleOffset_ != 0) { + context->info.samplesPerChan = firstSampleOffset_ + FirstOffsetExtra(); + } else { + context->info.samplesPerChan = (codecType_ == PSP_MODE_AT_3_PLUS ? ATRAC3PLUS_MAX_SAMPLES : ATRAC3_MAX_SAMPLES); + } + context->info.sampleSize = bytesPerFrame_; + context->info.numChan = channels_; + context->info.dataOff = dataOff_; + context->info.endSample = endSample_ + firstSampleOffset_ + FirstOffsetExtra(); + context->info.dataEnd = first_.filesize; + context->info.curOff = first_.fileoffset; + context->info.decodePos = DecodePosBySample(currentSample_); + context->info.streamDataByte = first_.size - dataOff_; + + u8 *buf = (u8 *)context; + *(u32_le *)(buf + 0xfc) = atracID_; + + NotifyMemInfo(MemBlockFlags::WRITE, context_.ptr, sizeof(SceAtracContext), "AtracContext"); +} + +int Atrac::Analyze(u32 addr, u32 size) { + struct RIFFFmtChunk { + u16_le fmtTag; + u16_le channels; + u32_le samplerate; + u32_le avgBytesPerSec; + u16_le blockAlign; + }; + + first_.addr = addr; + first_.size = size; + + AnalyzeReset(); + + // 72 is about the size of the minimum required data to even be valid. + if (first_.size < 72) { + return hleReportError(ME, ATRAC_ERROR_SIZE_TOO_SMALL, "buffer too small"); + } + + // TODO: Check the range (addr, size) instead. + if (!Memory::IsValidAddress(first_.addr)) { + return hleReportWarning(ME, SCE_KERNEL_ERROR_ILLEGAL_ADDRESS, "invalid buffer address"); + } + + // TODO: Validate stuff. + if (Memory::ReadUnchecked_U32(first_.addr) != RIFF_CHUNK_MAGIC) { + return hleReportError(ME, ATRAC_ERROR_UNKNOWN_FORMAT, "invalid RIFF header"); + } + + u32 offset = 8; + firstSampleOffset_ = 0; + + while (Memory::Read_U32(first_.addr + offset) != RIFF_WAVE_MAGIC) { + // Get the size preceding the magic. + int chunk = Memory::Read_U32(first_.addr + offset - 4); + // Round the chunk size up to the nearest 2. + offset += chunk + (chunk & 1); + if (offset + 12 > first_.size) { + return hleReportError(ME, ATRAC_ERROR_SIZE_TOO_SMALL, "too small for WAVE chunk at %d", offset); + } + if (Memory::Read_U32(first_.addr + offset) != RIFF_CHUNK_MAGIC) { + return hleReportError(ME, ATRAC_ERROR_UNKNOWN_FORMAT, "RIFF chunk did not contain WAVE"); + } + offset += 8; + } + offset += 4; + + if (offset != 12) { + WARN_LOG_REPORT(ME, "RIFF chunk at offset: %d", offset); + } + + // RIFF size excluding chunk header. + first_.filesize = Memory::Read_U32(first_.addr + offset - 8) + 8; + // Even if the RIFF size is too low, it may simply be incorrect. This works on real firmware. + u32 maxSize = std::max(first_.filesize, first_.size); + + bool bfoundData = false; + u32 dataChunkSize = 0; + int sampleOffsetAdjust = 0; + while (maxSize >= offset + 8 && !bfoundData) { + int chunkMagic = Memory::Read_U32(first_.addr + offset); + u32 chunkSize = Memory::Read_U32(first_.addr + offset + 4); + // Account for odd sized chunks. + if (chunkSize & 1) { + WARN_LOG_REPORT_ONCE(oddchunk, ME, "RIFF chunk had uneven size"); + } + chunkSize += (chunkSize & 1); + offset += 8; + if (chunkSize > maxSize - offset) + break; + switch (chunkMagic) { + case FMT_CHUNK_MAGIC: + { + if (codecType_ != 0) { + return hleReportError(ME, ATRAC_ERROR_UNKNOWN_FORMAT, "multiple fmt definitions"); + } + + auto at3fmt = PSPPointer::Create(first_.addr + offset); + if (chunkSize < 32 || (at3fmt->fmtTag == AT3_PLUS_MAGIC && chunkSize < 52)) { + return hleReportError(ME, ATRAC_ERROR_UNKNOWN_FORMAT, "fmt definition too small (%d)", chunkSize); + } + + if (at3fmt->fmtTag == AT3_MAGIC) + codecType_ = PSP_MODE_AT_3; + else if (at3fmt->fmtTag == AT3_PLUS_MAGIC) + codecType_ = PSP_MODE_AT_3_PLUS; + else { + return hleReportError(ME, ATRAC_ERROR_UNKNOWN_FORMAT, "invalid fmt magic: %04x", at3fmt->fmtTag); + } + channels_ = at3fmt->channels; + if (channels_ != 1 && channels_ != 2) { + return hleReportError(ME, ATRAC_ERROR_UNKNOWN_FORMAT, "invalid channel count: %d", channels_); + } + if (at3fmt->samplerate != 44100) { + return hleReportError(ME, ATRAC_ERROR_UNKNOWN_FORMAT, "unsupported sample rate: %d", at3fmt->samplerate); + } + bitrate_ = at3fmt->avgBytesPerSec * 8; + bytesPerFrame_ = at3fmt->blockAlign; + if (bytesPerFrame_ == 0) { + return hleReportError(ME, ATRAC_ERROR_UNKNOWN_FORMAT, "invalid bytes per frame: %d", bytesPerFrame_); + } + + // TODO: There are some format specific bytes here which seem to have fixed values? + // Probably don't need them. + + if (at3fmt->fmtTag == AT3_MAGIC) { + // This is the offset to the jointStereo_ field. + jointStereo_ = Memory::Read_U32(first_.addr + offset + 24); + } + } + break; + case FACT_CHUNK_MAGIC: + { + endSample_ = Memory::Read_U32(first_.addr + offset); + if (chunkSize >= 8) { + firstSampleOffset_ = Memory::Read_U32(first_.addr + offset + 4); + } + if (chunkSize >= 12) { + u32 largerOffset = Memory::Read_U32(first_.addr + offset + 8); + sampleOffsetAdjust = firstSampleOffset_ - largerOffset; + } + } + break; + case SMPL_CHUNK_MAGIC: + { + if (chunkSize < 32) { + return hleReportError(ME, ATRAC_ERROR_UNKNOWN_FORMAT, "smpl chunk too small (%d)", chunkSize); + } + int checkNumLoops = Memory::Read_U32(first_.addr + offset + 28); + if (checkNumLoops != 0 && chunkSize < 36 + 20) { + return hleReportError(ME, ATRAC_ERROR_UNKNOWN_FORMAT, "smpl chunk too small for loop (%d, %d)", checkNumLoops, chunkSize); + } + if (checkNumLoops < 0) { + return hleReportError(ME, ATRAC_ERROR_UNKNOWN_FORMAT, "bad checkNumLoops (%d)", checkNumLoops); + } + + loopinfo_.resize(checkNumLoops); + u32 loopinfoAddr = first_.addr + offset + 36; + // The PSP only cares about the first loop start and end, it seems. + // Most likely can skip the rest of this data, but it's not hurting anyone. + for (int i = 0; i < checkNumLoops && 36 + (u32)i < chunkSize; i++, loopinfoAddr += 24) { + loopinfo_[i].cuePointID = Memory::Read_U32(loopinfoAddr); + loopinfo_[i].type = Memory::Read_U32(loopinfoAddr + 4); + loopinfo_[i].startSample = Memory::Read_U32(loopinfoAddr + 8); + loopinfo_[i].endSample = Memory::Read_U32(loopinfoAddr + 12); + loopinfo_[i].fraction = Memory::Read_U32(loopinfoAddr + 16); + loopinfo_[i].playCount = Memory::Read_U32(loopinfoAddr + 20); + + if (loopinfo_[i].startSample >= loopinfo_[i].endSample) { + return hleReportError(ME, ATRAC_ERROR_BAD_CODEC_PARAMS, "loop starts after it ends"); + } + } + } + break; + case DATA_CHUNK_MAGIC: + { + bfoundData = true; + dataOff_ = offset; + dataChunkSize = chunkSize; + if (first_.filesize < offset + chunkSize) { + WARN_LOG_REPORT(ME, "Atrac data chunk extends beyond riff chunk"); + first_.filesize = offset + chunkSize; + } + } + break; + } + offset += chunkSize; + } + + if (codecType_ == 0) { + return hleReportError(ME, ATRAC_ERROR_UNKNOWN_FORMAT, "could not detect codec"); + } + + if (!bfoundData) { + return hleReportError(ME, ATRAC_ERROR_SIZE_TOO_SMALL, "no data chunk"); + } + + // set the loopStartSample_ and loopEndSample_ by loopinfo_ + if (loopinfo_.size() > 0) { + loopStartSample_ = loopinfo_[0].startSample + FirstOffsetExtra() + sampleOffsetAdjust; + loopEndSample_ = loopinfo_[0].endSample + FirstOffsetExtra() + sampleOffsetAdjust; + } else { + loopStartSample_ = -1; + loopEndSample_ = -1; + } + + // if there is no correct endsample, try to guess it + if (endSample_ <= 0 && bytesPerFrame_ != 0) { + endSample_ = (dataChunkSize / bytesPerFrame_) * SamplesPerFrame(); + endSample_ -= firstSampleOffset_ + FirstOffsetExtra(); + } + endSample_ -= 1; + + if (loopEndSample_ != -1 && loopEndSample_ > endSample_ + firstSampleOffset_ + (int)FirstOffsetExtra()) { + return hleReportError(ME, ATRAC_ERROR_BAD_CODEC_PARAMS, "loop after end of data"); + } + + return 0; +} + +int Atrac::AnalyzeAA3(u32 addr, u32 size, u32 filesize) { + first_.addr = addr; + first_.size = size; + first_.filesize = filesize; + + AnalyzeReset(); + + if (first_.size < 10) { + return hleReportError(ME, ATRAC_ERROR_AA3_SIZE_TOO_SMALL, "buffer too small"); + } + + // TODO: Make sure this validation is correct, more testing. + + const u8 *buffer = Memory::GetPointer(first_.addr); + if (buffer[0] != 'e' || buffer[1] != 'a' || buffer[2] != '3') { + return hleReportError(ME, ATRAC_ERROR_AA3_INVALID_DATA, "invalid ea3 magic bytes"); + } + + // It starts with an id3 header (replaced with ea3.) This is the size. + u32 tagSize = buffer[9] | (buffer[8] << 7) | (buffer[7] << 14) | (buffer[6] << 21); + if (first_.size < tagSize + 36) { + return hleReportError(ME, ATRAC_ERROR_AA3_SIZE_TOO_SMALL, "truncated before id3 end"); + } + + // EA3 header starts at id3 header (10) + tagSize. + buffer = Memory::GetPointer(first_.addr + 10 + tagSize); + if (buffer[0] != 'E' || buffer[1] != 'A' || buffer[2] != '3') { + return hleReportError(ME, ATRAC_ERROR_AA3_INVALID_DATA, "invalid EA3 magic bytes"); + } + + // Based on FFmpeg's code. + u32 codecParams = buffer[35] | (buffer[34] << 8) | (buffer[35] << 16); + const u32 at3SampleRates[8] = { 32000, 44100, 48000, 88200, 96000, 0 }; + + switch (buffer[32]) { + case 0: + codecType_ = PSP_MODE_AT_3; + bytesPerFrame_ = (codecParams & 0x03FF) * 8; + bitrate_ = at3SampleRates[(codecParams >> 13) & 7] * bytesPerFrame_ * 8 / 1024; + channels_ = 2; + jointStereo_ = (codecParams >> 17) & 1; + break; + case 1: + codecType_ = PSP_MODE_AT_3_PLUS; + bytesPerFrame_ = ((codecParams & 0x03FF) * 8) + 8; + bitrate_ = at3SampleRates[(codecParams >> 13) & 7] * bytesPerFrame_ * 8 / 2048; + channels_ = (codecParams >> 10) & 7; + break; + case 3: + case 4: + case 5: + return hleReportError(ME, ATRAC_ERROR_AA3_INVALID_DATA, "unsupported codec type %d", buffer[32]); + default: + return hleReportError(ME, ATRAC_ERROR_AA3_INVALID_DATA, "invalid codec type %d", buffer[32]); + } + + dataOff_ = 10 + tagSize + 96; + firstSampleOffset_ = 0; + if (endSample_ < 0 && bytesPerFrame_ != 0) { + endSample_ = ((first_.filesize - dataOff_) / bytesPerFrame_) * SamplesPerFrame(); + } + endSample_ -= 1; + + return 0; +} + +void Atrac::CalculateStreamInfo(u32 *outReadOffset) { + u32 readOffset = first_.fileoffset; + if (bufferState_ == ATRAC_STATUS_ALL_DATA_LOADED) { + // Nothing to write. + readOffset = 0; + first_.offset = 0; + first_.writableBytes = 0; + } else if (bufferState_ == ATRAC_STATUS_HALFWAY_BUFFER) { + // If we're buffering the entire file, just give the same as readOffset. + first_.offset = readOffset; + // In this case, the bytes writable are just the remaining bytes, always. + first_.writableBytes = first_.filesize - readOffset; + } else { + u32 bufferEnd = StreamBufferEnd(); + u32 bufferValidExtended = bufferPos_ + bufferValidBytes_; + if (bufferValidExtended < bufferEnd) { + first_.offset = bufferValidExtended; + first_.writableBytes = bufferEnd - bufferValidExtended; + } else { + u32 bufferStartUsed = bufferValidExtended - bufferEnd; + first_.offset = bufferStartUsed; + first_.writableBytes = bufferPos_ - bufferStartUsed; + } + + if (readOffset >= first_.filesize) { + if (bufferState_ == ATRAC_STATUS_STREAMED_WITHOUT_LOOP) { + // We don't need anything more, so all 0s. + readOffset = 0; + first_.offset = 0; + first_.writableBytes = 0; + } else { + readOffset = FileOffsetBySample(loopStartSample_ - FirstOffsetExtra() - firstSampleOffset_ - SamplesPerFrame() * 2); + } + } + + if (readOffset + first_.writableBytes > first_.filesize) { + // Never ask for past the end of file, even when the space is free. + first_.writableBytes = first_.filesize - readOffset; + } + + // If you don't think this should be here, remove it. It's just a temporary safety check. + if (first_.offset + first_.writableBytes > bufferMaxSize_) { + ERROR_LOG_REPORT(ME, "Somehow calculated too many writable bytes: %d + %d > %d", first_.offset, first_.writableBytes, bufferMaxSize_); + first_.offset = 0; + first_.writableBytes = bufferMaxSize_; + } + } + + if (outReadOffset) { + *outReadOffset = readOffset; + } +} + +void Atrac::CreateDecoder() { + if (decoder_) { + delete decoder_; + } + + // First, init the standalone decoder. Only used for low-level-decode initially, but simple. + if (codecType_ == PSP_MODE_AT_3) { + // We don't pull this from the RIFF so that we can support OMA also. + uint8_t extraData[14]{}; + // The only thing that changes are the jointStereo_ values. + extraData[0] = 1; + extraData[3] = channels_ << 3; + extraData[6] = jointStereo_; + extraData[8] = jointStereo_; + extraData[10] = 1; + decoder_ = CreateAtrac3Audio(channels_, bytesPerFrame_, extraData, sizeof(extraData)); + } else { + decoder_ = CreateAtrac3PlusAudio(channels_, bytesPerFrame_); + } + // reinit decodePos, because ffmpeg had changed it. + decodePos_ = 0; +} + +void Atrac::GetResetBufferInfo(AtracResetBufferInfo *bufferInfo, int sample) { + if (bufferState_ == ATRAC_STATUS_ALL_DATA_LOADED) { + bufferInfo->first.writePosPtr = first_.addr; + // Everything is loaded, so nothing needs to be read. + bufferInfo->first.writableBytes = 0; + bufferInfo->first.minWriteBytes = 0; + bufferInfo->first.filePos = 0; + } else if (bufferState_ == ATRAC_STATUS_HALFWAY_BUFFER) { + // Here the message is: you need to read at least this many bytes to get to that position. + // This is because we're filling the buffer start to finish, not streaming. + bufferInfo->first.writePosPtr = first_.addr + first_.size; + bufferInfo->first.writableBytes = first_.filesize - first_.size; + int minWriteBytes = FileOffsetBySample(sample) - first_.size; + if (minWriteBytes > 0) { + bufferInfo->first.minWriteBytes = minWriteBytes; + } else { + bufferInfo->first.minWriteBytes = 0; + } + bufferInfo->first.filePos = first_.size; + } else { + // This is without the sample offset. The file offset also includes the previous batch of samples? + int sampleFileOffset = FileOffsetBySample(sample - firstSampleOffset_ - SamplesPerFrame()); + + // Update the writable bytes. When streaming, this is just the number of bytes until the end. + const u32 bufSizeAligned = (bufferMaxSize_ / bytesPerFrame_) * bytesPerFrame_; + const int needsMoreFrames = FirstOffsetExtra(); + + bufferInfo->first.writePosPtr = first_.addr; + bufferInfo->first.writableBytes = std::min(first_.filesize - sampleFileOffset, bufSizeAligned); + if (((sample + firstSampleOffset_) % (int)SamplesPerFrame()) >= (int)SamplesPerFrame() - needsMoreFrames) { + // Not clear why, but it seems it wants a bit extra in case the sample is late? + bufferInfo->first.minWriteBytes = bytesPerFrame_ * 3; + } else { + bufferInfo->first.minWriteBytes = bytesPerFrame_ * 2; + } + if ((u32)sample < (u32)firstSampleOffset_ && sampleFileOffset != dataOff_) { + sampleFileOffset -= bytesPerFrame_; + } + bufferInfo->first.filePos = sampleFileOffset; + + if (second_.size != 0) { + // TODO: We have a second buffer. Within it, minWriteBytes should be zero. + // The filePos should be after the end of the second buffer (or zero.) + // We actually need to ensure we READ from the second buffer before implementing that. + } + } + + // It seems like this is always the same as the first buffer's pos, weirdly. + bufferInfo->second.writePosPtr = first_.addr; + // Reset never needs a second buffer write, since the loop is in a fixed place. + bufferInfo->second.writableBytes = 0; + bufferInfo->second.minWriteBytes = 0; + bufferInfo->second.filePos = 0; +} + +int Atrac::SetData(u32 buffer, u32 readSize, u32 bufferSize, int successCode) { + first_.addr = buffer; + first_.size = readSize; + + if (first_.size > first_.filesize) + first_.size = first_.filesize; + first_.fileoffset = first_.size; + + // got the size of temp buf, and calculate offset + bufferMaxSize_ = bufferSize; + first_.offset = first_.size; + + // some games may reuse an atracID for playing sound + ResetData(); + UpdateBufferState(); + + if (codecType_ != PSP_MODE_AT_3 && codecType_ != PSP_MODE_AT_3_PLUS) { + // Shouldn't have gotten here, Analyze() checks this. + bufferState_ = ATRAC_STATUS_NO_DATA; + return hleReportError(ME, ATRAC_ERROR_UNKNOWN_FORMAT, "unexpected codec type in set data"); + } + + if (bufferState_ == ATRAC_STATUS_ALL_DATA_LOADED || bufferState_ == ATRAC_STATUS_HALFWAY_BUFFER) { + // This says, don't use the dataBuf_ array, use the PSP RAM. + // This way, games can load data async into the buffer, and it still works. + // TODO: Support this always, even for streaming. + ignoreDataBuf_ = true; + } + if (bufferState_ == ATRAC_STATUS_STREAMED_WITHOUT_LOOP || bufferState_ == ATRAC_STATUS_STREAMED_LOOP_FROM_END || bufferState_ == ATRAC_STATUS_STREAMED_LOOP_WITH_TRAILER) { + bufferHeaderSize_ = dataOff_; + bufferPos_ = dataOff_ + bytesPerFrame_; + bufferValidBytes_ = first_.size - bufferPos_; + } + + const char *codecName = codecType_ == PSP_MODE_AT_3 ? "atrac3" : "atrac3+"; + const char *channelName = channels_ == 1 ? "mono" : "stereo"; + + // Over-allocate databuf to prevent going off the end if the bitstream is bad or if there are + // bugs in the decoder. This happens, see issue #15788. Arbitrary, but let's make it a whole page on the popular + // architecture that has the largest pages (M1). + dataBuf_ = new u8[first_.filesize + overAllocBytes]; + memset(dataBuf_, 0, first_.filesize + overAllocBytes); + if (!ignoreDataBuf_) { + u32 copybytes = std::min(bufferSize, first_.filesize); + Memory::Memcpy(dataBuf_, buffer, copybytes, "AtracSetData"); + } + CreateDecoder(); + return hleLogSuccessInfoI(ME, successCode, "%s %s audio", codecName, channelName); +} + +u32 Atrac::SetSecondBuffer(u32 secondBuffer, u32 secondBufferSize) { + u32 secondFileOffset = FileOffsetBySample(loopEndSample_ - firstSampleOffset_); + u32 desiredSize = first_.filesize - secondFileOffset; + + // 3 seems to be the number of frames required to handle a loop. + if (secondBufferSize < desiredSize && secondBufferSize < (u32)BytesPerFrame() * 3) { + return hleReportError(ME, ATRAC_ERROR_SIZE_TOO_SMALL, "too small"); + } + if (BufferState() != ATRAC_STATUS_STREAMED_LOOP_WITH_TRAILER) { + return hleReportError(ME, ATRAC_ERROR_SECOND_BUFFER_NOT_NEEDED, "not needed"); + } + + second_.addr = secondBuffer; + second_.size = secondBufferSize; + second_.fileoffset = secondFileOffset; + return hleLogSuccessI(ME, 0); +} + +void Atrac::UpdateBitrate() { + bitrate_ = (bytesPerFrame_ * 352800) / 1000; + if (codecType_ == PSP_MODE_AT_3_PLUS) + bitrate_ = ((bitrate_ >> 11) + 8) & 0xFFFFFFF0; + else + bitrate_ = (bitrate_ + 511) >> 10; +} + +int Atrac::AddStreamData(u32 bytesToAdd) { + u32 readOffset; + CalculateStreamInfo(&readOffset); + if (bytesToAdd > first_.writableBytes) + return hleLogWarning(ME, ATRAC_ERROR_ADD_DATA_IS_TOO_BIG, "too many bytes"); + + if (bytesToAdd > 0) { + first_.fileoffset = readOffset; + int addbytes = std::min(bytesToAdd, first_.filesize - first_.fileoffset); + if (!ignoreDataBuf_) { + Memory::Memcpy(dataBuf_ + first_.fileoffset, first_.addr + first_.offset, addbytes, "AtracAddStreamData"); + } + first_.fileoffset += addbytes; + } + first_.size += bytesToAdd; + if (first_.size >= first_.filesize) { + first_.size = first_.filesize; + if (bufferState_ == ATRAC_STATUS_HALFWAY_BUFFER) + bufferState_ = ATRAC_STATUS_ALL_DATA_LOADED; + WriteContextToPSPMem(); + } + + first_.offset += bytesToAdd; + bufferValidBytes_ += bytesToAdd; + + if (PSP_CoreParameter().compat.flags().AtracLoopHack && bufferState_ == ATRAC_STATUS_STREAMED_LOOP_FROM_END && RemainingFrames() > 2) { + loopNum_++; + SeekToSample(loopStartSample_ - FirstOffsetExtra() - firstSampleOffset_); + } + + return 0; +} + +u32 Atrac::AddStreamDataSas(u32 bufPtr, u32 bytesToAdd) { + int addbytes = std::min(bytesToAdd, first_.filesize - first_.fileoffset - FirstOffsetExtra()); + Memory::Memcpy(dataBuf_ + first_.fileoffset + FirstOffsetExtra(), bufPtr, addbytes, "AtracAddStreamData"); + first_.size += bytesToAdd; + if (first_.size >= first_.filesize) { + first_.size = first_.filesize; + if (bufferState_ == ATRAC_STATUS_HALFWAY_BUFFER) + bufferState_ = ATRAC_STATUS_ALL_DATA_LOADED; + } + first_.fileoffset += addbytes; + // refresh context_ + WriteContextToPSPMem(); + return 0; +} + +u32 Atrac::GetNextSamples() { + // It seems like the PSP aligns the sample position to 0x800...? + u32 skipSamples = firstSampleOffset_ + FirstOffsetExtra(); + u32 firstSamples = (SamplesPerFrame() - skipSamples) % SamplesPerFrame(); + u32 numSamples = endSample_ + 1 - currentSample_; + if (currentSample_ == 0 && firstSamples != 0) { + numSamples = firstSamples; + } + u32 unalignedSamples = (skipSamples + currentSample_) % SamplesPerFrame(); + if (unalignedSamples != 0) { + // We're off alignment, possibly due to a loop. Force it back on. + numSamples = SamplesPerFrame() - unalignedSamples; + } + if (numSamples > SamplesPerFrame()) + numSamples = SamplesPerFrame(); + if (bufferState_ == ATRAC_STATUS_STREAMED_LOOP_FROM_END && (int)numSamples + currentSample_ > endSample_) { + bufferState_ = ATRAC_STATUS_ALL_DATA_LOADED; + } + return numSamples; +} + +u8 *Atrac::BufferStart() { + return ignoreDataBuf_ ? Memory::GetPointerWrite(first_.addr) : dataBuf_; +} + +void Atrac::ForceSeekToSample(int sample) { + if (decoder_) { + decoder_->FlushBuffers(); + } + currentSample_ = sample; +} + +void Atrac::SeekToSample(int sample) { + // It seems like the PSP aligns the sample position to 0x800...? + const u32 offsetSamples = firstSampleOffset_ + FirstOffsetExtra(); + const u32 unalignedSamples = (offsetSamples + sample) % SamplesPerFrame(); + int seekFrame = sample + offsetSamples - unalignedSamples; + + if ((sample != currentSample_ || sample == 0) && decoder_ != nullptr) { + // Prefill the decode buffer with packets before the first sample offset. + decoder_->FlushBuffers(); + + int adjust = 0; + if (sample == 0) { + int offsetSamples = firstSampleOffset_ + FirstOffsetExtra(); + adjust = -(int)(offsetSamples % SamplesPerFrame()); + } + const u32 off = FileOffsetBySample(sample + adjust); + const u32 backfill = bytesPerFrame_ * 2; + const u32 start = off - dataOff_ < backfill ? dataOff_ : off - backfill; + + for (u32 pos = start; pos < off; pos += bytesPerFrame_) { + decoder_->Decode(BufferStart() + pos, bytesPerFrame_, nullptr, nullptr, nullptr); + } + } + + currentSample_ = sample; +} + +int Atrac::RemainingFrames() const { + if (bufferState_ == ATRAC_STATUS_ALL_DATA_LOADED) { + // Meaning, infinite I guess? We've got it all. + return PSP_ATRAC_ALLDATA_IS_ON_MEMORY; + } + + u32 currentFileOffset = FileOffsetBySample(currentSample_ - SamplesPerFrame() + FirstOffsetExtra()); + if (first_.fileoffset >= first_.filesize) { + if (bufferState_ == ATRAC_STATUS_STREAMED_WITHOUT_LOOP) { + return PSP_ATRAC_NONLOOP_STREAM_DATA_IS_ON_MEMORY; + } + int loopEndAdjusted = loopEndSample_ - FirstOffsetExtra() - firstSampleOffset_; + if (bufferState_ == ATRAC_STATUS_STREAMED_LOOP_WITH_TRAILER && currentSample_ > loopEndAdjusted) { + // No longer looping in this case, outside the loop. + return PSP_ATRAC_NONLOOP_STREAM_DATA_IS_ON_MEMORY; + } + if ((bufferState_ & ATRAC_STATUS_STREAMED_MASK) == ATRAC_STATUS_STREAMED_MASK && loopNum_ == 0) { + return PSP_ATRAC_LOOP_STREAM_DATA_IS_ON_MEMORY; + } + } + + if ((bufferState_ & ATRAC_STATUS_STREAMED_MASK) == ATRAC_STATUS_STREAMED_MASK) { + // Since we're streaming, the remaining frames are what's valid in the buffer. + return bufferValidBytes_ / bytesPerFrame_; + } + + // Since the first frame is shorter by this offset, add to round up at this offset. + const int remainingBytes = first_.fileoffset - currentFileOffset; + if (remainingBytes < 0) { + // Just in case. Shouldn't happen, but once did by mistake. + return 0; + } + return remainingBytes / bytesPerFrame_; +} + +void Atrac::ConsumeFrame() { + bufferPos_ += bytesPerFrame_; + if ((bufferState_ & ATRAC_STATUS_STREAMED_MASK) == ATRAC_STATUS_STREAMED_MASK) { + if (bufferValidBytes_ > bytesPerFrame_) { + bufferValidBytes_ -= bytesPerFrame_; + } else { + bufferValidBytes_ = 0; + } + } + if (bufferPos_ >= StreamBufferEnd()) { + // Wrap around... theoretically, this should only happen at exactly StreamBufferEnd. + bufferPos_ -= StreamBufferEnd(); + bufferHeaderSize_ = 0; + } +} + +u32 Atrac::DecodeData(u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u32 *finish, int *remains) { + int loopNum = loopNum_; + if (bufferState_ == ATRAC_STATUS_FOR_SCESAS) { + // TODO: Might need more testing. + loopNum = 0; + } + + // We already passed the end - return an error (many games check for this.) + if (currentSample_ >= endSample_ && loopNum == 0) { + *SamplesNum = 0; + *finish = 1; + // refresh context_ + WriteContextToPSPMem(); + return ATRAC_ERROR_ALL_DATA_DECODED; + } + + // TODO: This isn't at all right, but at least it makes the music "last" some time. + u32 numSamples = 0; + + // It seems like the PSP aligns the sample position to 0x800...? + int offsetSamples = firstSampleOffset_ + FirstOffsetExtra(); + int skipSamples = 0; + u32 maxSamples = endSample_ + 1 - currentSample_; + u32 unalignedSamples = (offsetSamples + currentSample_) % SamplesPerFrame(); + if (unalignedSamples != 0) { + // We're off alignment, possibly due to a loop. Force it back on. + maxSamples = SamplesPerFrame() - unalignedSamples; + skipSamples = unalignedSamples; + } + + if (skipSamples != 0 && bufferHeaderSize_ == 0) { + // Skip the initial frame used to load state for the looped frame. + // TODO: We will want to actually read this in. + ConsumeFrame(); + } + + // TODO: We don't support any other codec type, check seems unnecessary? + if ((codecType_ == PSP_MODE_AT_3 || codecType_ == PSP_MODE_AT_3_PLUS)) { + SeekToSample(currentSample_); + + bool gotFrame = false; + u32 off = FileOffsetBySample(currentSample_ - skipSamples); + if (off < first_.size) { + uint8_t *indata = BufferStart() + off; + int bytesConsumed = 0; + int outBytes = 0; + if (!decoder_->Decode(indata, bytesPerFrame_, &bytesConsumed, + outbuf, &outBytes)) { + // Decode failed. + *SamplesNum = 0; + *finish = 1; + return ATRAC_ERROR_ALL_DATA_DECODED; + } + gotFrame = true; + + numSamples = outBytes / 4; + uint32_t packetAddr = CurBufferAddress(-skipSamples); + // got a frame + int skipped = std::min((u32)skipSamples, numSamples); + skipSamples -= skipped; + numSamples = numSamples - skipped; + // If we're at the end, clamp to samples we want. It always returns a full chunk. + numSamples = std::min(maxSamples, numSamples); + + if (packetAddr != 0 && MemBlockInfoDetailed()) { + char tagData[128]; + size_t tagSize = FormatMemWriteTagAt(tagData, sizeof(tagData), "AtracDecode/", packetAddr, bytesPerFrame_); + NotifyMemInfo(MemBlockFlags::READ, packetAddr, bytesPerFrame_, tagData, tagSize); + NotifyMemInfo(MemBlockFlags::WRITE, outbufPtr, outBytes, tagData, tagSize); + } else { + NotifyMemInfo(MemBlockFlags::WRITE, outbufPtr, outBytes, "AtracDecode"); + } + // We only want one frame per call, let's continue the next time. + } + + if (!gotFrame && currentSample_ < endSample_) { + // Never got a frame. We may have dropped a GHA frame or otherwise have a bug. + // For now, let's try to provide an extra "frame" if possible so games don't infinite loop. + if (FileOffsetBySample(currentSample_) < first_.filesize) { + numSamples = std::min(maxSamples, SamplesPerFrame()); + u32 outBytes = numSamples * outputChannels_ * sizeof(s16); + if (outbuf != nullptr) { + memset(outbuf, 0, outBytes); + NotifyMemInfo(MemBlockFlags::WRITE, outbufPtr, outBytes, "AtracDecode"); + } + } + } + } + + *SamplesNum = numSamples; + // update current sample and decodePos + currentSample_ += numSamples; + decodePos_ = DecodePosBySample(currentSample_); + + ConsumeFrame(); + + int finishFlag = 0; + // TODO: Verify. + bool hitEnd = currentSample_ >= endSample_ || (numSamples == 0 && first_.size >= first_.filesize); + int loopEndAdjusted = loopEndSample_ - FirstOffsetExtra() - firstSampleOffset_; + if ((hitEnd || currentSample_ > loopEndAdjusted) && loopNum != 0) { + SeekToSample(loopStartSample_ - FirstOffsetExtra() - firstSampleOffset_); + if (bufferState_ != ATRAC_STATUS_FOR_SCESAS) { + if (loopNum_ > 0) + loopNum_--; + } + if ((bufferState_ & ATRAC_STATUS_STREAMED_MASK) == ATRAC_STATUS_STREAMED_MASK) { + // Whatever bytes we have left were added from the loop. + u32 loopOffset = FileOffsetBySample(loopStartSample_ - FirstOffsetExtra() - firstSampleOffset_ - SamplesPerFrame() * 2); + // TODO: Hmm, need to manage the buffer better. But don't move fileoffset if we already have valid data. + if (loopOffset > first_.fileoffset || loopOffset + bufferValidBytes_ < first_.fileoffset) { + // Skip the initial frame at the start. + first_.fileoffset = FileOffsetBySample(loopStartSample_ - FirstOffsetExtra() - firstSampleOffset_ - SamplesPerFrame() * 2); + } + } + } else if (hitEnd) { + finishFlag = 1; + + // Still move forward, so we know that we've read everything. + // This seems to be reflected in the context as well. + currentSample_ += SamplesPerFrame() - numSamples; + } + + *finish = finishFlag; + *remains = RemainingFrames(); + // refresh context_ + WriteContextToPSPMem(); + return 0; +} + +void Atrac::SetLoopNum(int loopNum) { + // Spammed in MHU + loopNum_ = loopNum; + if (loopNum != 0 && loopinfo_.size() == 0) { + // Just loop the whole audio + loopStartSample_ = firstSampleOffset_ + FirstOffsetExtra(); + loopEndSample_ = endSample_ + firstSampleOffset_ + FirstOffsetExtra(); + } + WriteContextToPSPMem(); +} + +u32 Atrac::ResetPlayPosition(int sample, int bytesWrittenFirstBuf, int bytesWrittenSecondBuf) { + // Reuse the same calculation as before. + AtracResetBufferInfo bufferInfo; + GetResetBufferInfo(&bufferInfo, sample); + + if ((u32)bytesWrittenFirstBuf < bufferInfo.first.minWriteBytes || (u32)bytesWrittenFirstBuf > bufferInfo.first.writableBytes) { + return hleLogError(ME, ATRAC_ERROR_BAD_FIRST_RESET_SIZE, "first byte count not in valid range"); + } + if ((u32)bytesWrittenSecondBuf < bufferInfo.second.minWriteBytes || (u32)bytesWrittenSecondBuf > bufferInfo.second.writableBytes) { + return hleLogError(ME, ATRAC_ERROR_BAD_SECOND_RESET_SIZE, "second byte count not in valid range"); + } + + if (bufferState_ == ATRAC_STATUS_ALL_DATA_LOADED) { + // Always adds zero bytes. + } else if (bufferState_ == ATRAC_STATUS_HALFWAY_BUFFER) { + // Okay, it's a valid number of bytes. Let's set them up. + if (bytesWrittenFirstBuf != 0) { + if (!ignoreDataBuf_) { + Memory::Memcpy(dataBuf_ + first_.size, first_.addr + first_.size, bytesWrittenFirstBuf, "AtracResetPlayPosition"); + } + first_.fileoffset += bytesWrittenFirstBuf; + first_.size += bytesWrittenFirstBuf; + first_.offset += bytesWrittenFirstBuf; + } + + // Did we transition to a full buffer? + if (first_.size >= first_.filesize) { + first_.size = first_.filesize; + bufferState_ = ATRAC_STATUS_ALL_DATA_LOADED; + } + } else { + if (bufferInfo.first.filePos > first_.filesize) { + return hleDelayResult(hleLogError(ME, ATRAC_ERROR_API_FAIL, "invalid file position"), "reset play pos", 200); + } + + // Move the offset to the specified position. + first_.fileoffset = bufferInfo.first.filePos; + + if (bytesWrittenFirstBuf != 0) { + if (!ignoreDataBuf_) { + Memory::Memcpy(dataBuf_ + first_.fileoffset, first_.addr, bytesWrittenFirstBuf, "AtracResetPlayPosition"); + } + first_.fileoffset += bytesWrittenFirstBuf; + } + first_.size = first_.fileoffset; + first_.offset = bytesWrittenFirstBuf; + + bufferHeaderSize_ = 0; + bufferPos_ = bytesPerFrame_; + bufferValidBytes_ = bytesWrittenFirstBuf - bufferPos_; + } + + if (codecType_ == PSP_MODE_AT_3 || codecType_ == PSP_MODE_AT_3_PLUS) { + SeekToSample(sample); + } + + WriteContextToPSPMem(); + return 0; +} + +void Atrac::InitLowLevel(u32 paramsAddr, bool jointStereo) { + channels_ = Memory::Read_U32(paramsAddr); + outputChannels_ = Memory::Read_U32(paramsAddr + 4); + bufferMaxSize_ = Memory::Read_U32(paramsAddr + 8); + bytesPerFrame_ = bufferMaxSize_; + first_.writableBytes = bytesPerFrame_; + ResetData(); + + if (codecType_ == PSP_MODE_AT_3) { + bitrate_ = (bytesPerFrame_ * 352800) / 1000; + bitrate_ = (bitrate_ + 511) >> 10; + jointStereo_ = false; + } else if (codecType_ == PSP_MODE_AT_3_PLUS) { + bitrate_ = (bytesPerFrame_ * 352800) / 1000; + bitrate_ = ((bitrate_ >> 11) + 8) & 0xFFFFFFF0; + jointStereo_ = false; + } + + dataOff_ = 0; + first_.size = 0; + first_.filesize = bytesPerFrame_; + bufferState_ = ATRAC_STATUS_LOW_LEVEL; + currentSample_ = 0; + CreateDecoder(); + WriteContextToPSPMem(); +} diff --git a/Core/HLE/AtracCtx.h b/Core/HLE/AtracCtx.h new file mode 100644 index 0000000000..8e0123bee4 --- /dev/null +++ b/Core/HLE/AtracCtx.h @@ -0,0 +1,267 @@ +// Copyright (c) 2012- PPSSPP Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0 or later versions. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official git repository and contact information can be found at +// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. + +#pragma once + +#include "Common/CommonTypes.h" +#include "Common/Swap.h" + +#include "Core/HLE/sceAtrac.h" + +struct AtracSingleResetBufferInfo { + u32_le writePosPtr; + u32_le writableBytes; + u32_le minWriteBytes; + u32_le filePos; +}; + +struct AtracResetBufferInfo { + AtracSingleResetBufferInfo first; + AtracSingleResetBufferInfo second; +}; + +#define AT3_MAGIC 0x0270 +#define AT3_PLUS_MAGIC 0xFFFE +#define PSP_MODE_AT_3_PLUS 0x00001000 +#define PSP_MODE_AT_3 0x00001001 + +#define ATRAC_ERROR_API_FAIL 0x80630002 +#define ATRAC_ERROR_NO_ATRACID 0x80630003 +#define ATRAC_ERROR_INVALID_CODECTYPE 0x80630004 +#define ATRAC_ERROR_BAD_ATRACID 0x80630005 +#define ATRAC_ERROR_UNKNOWN_FORMAT 0x80630006 +#define ATRAC_ERROR_WRONG_CODECTYPE 0x80630007 +#define ATRAC_ERROR_BAD_CODEC_PARAMS 0x80630008 +#define ATRAC_ERROR_ALL_DATA_LOADED 0x80630009 +#define ATRAC_ERROR_NO_DATA 0x80630010 +#define ATRAC_ERROR_SIZE_TOO_SMALL 0x80630011 +#define ATRAC_ERROR_SECOND_BUFFER_NEEDED 0x80630012 +#define ATRAC_ERROR_INCORRECT_READ_SIZE 0x80630013 +#define ATRAC_ERROR_BAD_SAMPLE 0x80630015 +#define ATRAC_ERROR_BAD_FIRST_RESET_SIZE 0x80630016 +#define ATRAC_ERROR_BAD_SECOND_RESET_SIZE 0x80630017 +#define ATRAC_ERROR_ADD_DATA_IS_TOO_BIG 0x80630018 +#define ATRAC_ERROR_NOT_MONO 0x80630019 +#define ATRAC_ERROR_NO_LOOP_INFORMATION 0x80630021 +#define ATRAC_ERROR_SECOND_BUFFER_NOT_NEEDED 0x80630022 +#define ATRAC_ERROR_BUFFER_IS_EMPTY 0x80630023 +#define ATRAC_ERROR_ALL_DATA_DECODED 0x80630024 +#define ATRAC_ERROR_IS_LOW_LEVEL 0x80630031 +#define ATRAC_ERROR_IS_FOR_SCESAS 0x80630040 +#define ATRAC_ERROR_AA3_INVALID_DATA 0x80631003 +#define ATRAC_ERROR_AA3_SIZE_TOO_SMALL 0x80631004 + +const u32 ATRAC3_MAX_SAMPLES = 0x400; +const u32 ATRAC3PLUS_MAX_SAMPLES = 0x800; + +const int PSP_ATRAC_ALLDATA_IS_ON_MEMORY = -1; +const int PSP_ATRAC_NONLOOP_STREAM_DATA_IS_ON_MEMORY = -2; +const int PSP_ATRAC_LOOP_STREAM_DATA_IS_ON_MEMORY = -3; + +struct InputBuffer { + // Address of the buffer. + u32 addr; + // Size of data read so far into dataBuf_ (to be removed.) + u32 size; + // Offset into addr at which new data is added. + u32 offset; + // Last writableBytes number (to be removed.) + u32 writableBytes; + // Unused, always 0. + u32 neededBytes; + // Total size of the entire file data. + u32 filesize; + // Offset into the file at which new data is read. + u32 fileoffset; +}; + +struct AtracLoopInfo { + int cuePointID; + int type; + int startSample; + int endSample; + int fraction; + int playCount; +}; + +class AudioDecoder; + +struct Atrac { + ~Atrac() { + ResetData(); + } + + void ResetData(); + void UpdateBufferState() { + if (bufferMaxSize_ >= first_.filesize) { + if (first_.size < first_.filesize) { + // The buffer is big enough, but we don't have all the data yet. + bufferState_ = ATRAC_STATUS_HALFWAY_BUFFER; + } else { + bufferState_ = ATRAC_STATUS_ALL_DATA_LOADED; + } + } else { + if (loopEndSample_ <= 0) { + // There's no looping, but we need to stream the data in our buffer. + bufferState_ = ATRAC_STATUS_STREAMED_WITHOUT_LOOP; + } else if (loopEndSample_ == endSample_ + firstSampleOffset_ + (int)FirstOffsetExtra()) { + bufferState_ = ATRAC_STATUS_STREAMED_LOOP_FROM_END; + } else { + bufferState_ = ATRAC_STATUS_STREAMED_LOOP_WITH_TRAILER; + } + } + } + + void DoState(PointerWrap &p); + + // Input frame size + int BytesPerFrame() const { + return bytesPerFrame_; + } + // Output frame size + u32 SamplesPerFrame() const { + return codecType_ == PSP_MODE_AT_3_PLUS ? ATRAC3PLUS_MAX_SAMPLES : ATRAC3_MAX_SAMPLES; + } + + u32 FirstOffsetExtra() const { + return codecType_ == PSP_MODE_AT_3_PLUS ? 368 : 69; + } + + u32 DecodePosBySample(int sample) const { + return (u32)(firstSampleOffset_ + sample / (int)SamplesPerFrame() * bytesPerFrame_); + } + + u32 FileOffsetBySample(int sample) const { + int offsetSample = sample + firstSampleOffset_; + int frameOffset = offsetSample / (int)SamplesPerFrame(); + return (u32)(dataOff_ + bytesPerFrame_ + frameOffset * bytesPerFrame_); + } + + void UpdateBitrate(); + + int Bitrate() const { + return bitrate_; + } + int Channels() const { + return channels_; + } + + int RemainingFrames() const; + + int atracID_ = -1; + + u8 *dataBuf_ = nullptr; + // Indicates that the dataBuf_ array should not be used. + bool ignoreDataBuf_ = false; + + u32 decodePos_ = 0; + + u16 channels_ = 0; + u16 outputChannels_ = 2; + + int currentSample_ = 0; + int endSample_ = 0; + int firstSampleOffset_ = 0; + // Offset of the first sample in the input buffer + int dataOff_ = 0; + + std::vector loopinfo_; + + int loopStartSample_ = -1; + int loopEndSample_ = -1; + int loopNum_ = 0; + + InputBuffer first_{}; + InputBuffer second_{}; + + PSPPointer context_{}; + + AtracStatus BufferState() const { + return bufferState_; + } + + void ForceSeekToSample(int sample); + u8 *BufferStart(); + + void SeekToSample(int sample); + + u32 CodecType() const { + return codecType_; + } + AudioDecoder *GetDecoder() const { + return decoder_; + } + + uint32_t CurBufferAddress(int adjust = 0) { + u32 off = FileOffsetBySample(currentSample_ + adjust); + if (off < first_.size && ignoreDataBuf_) { + return first_.addr + off; + } + // If it's in dataBug, it's not in PSP memory. + return 0; + } + + void CalculateStreamInfo(u32 *readOffset); + + u32 StreamBufferEnd() const { + // The buffer is always aligned to a frame in size, not counting an optional header. + // The header will only initially exist after the data is first set. + u32 framesAfterHeader = (bufferMaxSize_ - bufferHeaderSize_) / bytesPerFrame_; + return framesAfterHeader * bytesPerFrame_ + bufferHeaderSize_; + } + + int Analyze(u32 addr, u32 size); + int AnalyzeAA3(u32 addr, u32 size, u32 filesize); + + void UpdateContextFromPSPMem(); + void WriteContextToPSPMem(); + + int AddStreamData(u32 bytesToAdd); + u32 AddStreamDataSas(u32 bufPtr, u32 bytesToAdd); + void CreateDecoder(); + void SetLoopNum(int loopNum); + u32 ResetPlayPosition(int sample, int bytesWrittenFirstBuf, int bytesWrittenSecondBuf); + void GetResetBufferInfo(AtracResetBufferInfo *bufferInfo, int sample); + int SetData(u32 buffer, u32 readSize, u32 bufferSize, int successCode = 0); + u32 SetSecondBuffer(u32 secondBuffer, u32 secondBufferSize); + u32 DecodeData(u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u32 *finish, int *remains); + void ConsumeFrame(); + u32 GetNextSamples(); + + void InitLowLevel(u32 paramsAddr, bool jointStereo); + + // To be moved into private. + u32 codecType_ = 0; + +private: + void AnalyzeReset(); + + u32 bitrate_ = 64; + u16 bytesPerFrame_ = 0; + u32 bufferMaxSize_ = 0; + int jointStereo_ = 0; + + // Used by low-level decoding and to track streaming. + u32 bufferPos_ = 0; + u32 bufferValidBytes_ = 0; + u32 bufferHeaderSize_ = 0; + + // TODO: Save the internal state of this, now technically possible. + AudioDecoder *decoder_ = nullptr; + + AtracStatus bufferState_ = ATRAC_STATUS_NO_DATA; +}; diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp index 9778ba51d4..1d395eba85 100644 --- a/Core/HLE/sceAtrac.cpp +++ b/Core/HLE/sceAtrac.cpp @@ -29,12 +29,12 @@ #include "Core/Debugger/MemBlockInfo.h" #include "Core/HW/MediaEngine.h" #include "Core/HW/BufferQueue.h" -#include "Core/HW/Atrac3Standalone.h" #include "Core/HLE/sceKernel.h" #include "Core/HLE/sceUtility.h" #include "Core/HLE/sceKernelMemory.h" #include "Core/HLE/sceAtrac.h" +#include "Core/HLE/AtracCtx.h" #include "Core/System.h" // Notes about sceAtrac buffer management @@ -72,453 +72,8 @@ // any cache or separate version of the buffer - at most it manages decode state from earlier in // the buffer. -#define ATRAC_ERROR_API_FAIL 0x80630002 -#define ATRAC_ERROR_NO_ATRACID 0x80630003 -#define ATRAC_ERROR_INVALID_CODECTYPE 0x80630004 -#define ATRAC_ERROR_BAD_ATRACID 0x80630005 -#define ATRAC_ERROR_UNKNOWN_FORMAT 0x80630006 -#define ATRAC_ERROR_WRONG_CODECTYPE 0x80630007 -#define ATRAC_ERROR_BAD_CODEC_PARAMS 0x80630008 -#define ATRAC_ERROR_ALL_DATA_LOADED 0x80630009 -#define ATRAC_ERROR_NO_DATA 0x80630010 -#define ATRAC_ERROR_SIZE_TOO_SMALL 0x80630011 -#define ATRAC_ERROR_SECOND_BUFFER_NEEDED 0x80630012 -#define ATRAC_ERROR_INCORRECT_READ_SIZE 0x80630013 -#define ATRAC_ERROR_BAD_SAMPLE 0x80630015 -#define ATRAC_ERROR_BAD_FIRST_RESET_SIZE 0x80630016 -#define ATRAC_ERROR_BAD_SECOND_RESET_SIZE 0x80630017 -#define ATRAC_ERROR_ADD_DATA_IS_TOO_BIG 0x80630018 -#define ATRAC_ERROR_NOT_MONO 0x80630019 -#define ATRAC_ERROR_NO_LOOP_INFORMATION 0x80630021 -#define ATRAC_ERROR_SECOND_BUFFER_NOT_NEEDED 0x80630022 -#define ATRAC_ERROR_BUFFER_IS_EMPTY 0x80630023 -#define ATRAC_ERROR_ALL_DATA_DECODED 0x80630024 -#define ATRAC_ERROR_IS_LOW_LEVEL 0x80630031 -#define ATRAC_ERROR_IS_FOR_SCESAS 0x80630040 -#define ATRAC_ERROR_AA3_INVALID_DATA 0x80631003 -#define ATRAC_ERROR_AA3_SIZE_TOO_SMALL 0x80631004 - -#define AT3_MAGIC 0x0270 -#define AT3_PLUS_MAGIC 0xFFFE -#define PSP_MODE_AT_3_PLUS 0x00001000 -#define PSP_MODE_AT_3 0x00001001 - -const int RIFF_CHUNK_MAGIC = 0x46464952; -const int RIFF_WAVE_MAGIC = 0x45564157; -const int FMT_CHUNK_MAGIC = 0x20746D66; -const int DATA_CHUNK_MAGIC = 0x61746164; -const int SMPL_CHUNK_MAGIC = 0x6C706D73; -const int FACT_CHUNK_MAGIC = 0x74636166; - -const int PSP_ATRAC_ALLDATA_IS_ON_MEMORY = -1; -const int PSP_ATRAC_NONLOOP_STREAM_DATA_IS_ON_MEMORY = -2; -const int PSP_ATRAC_LOOP_STREAM_DATA_IS_ON_MEMORY = -3; - -const u32 ATRAC3_MAX_SAMPLES = 0x400; -const u32 ATRAC3PLUS_MAX_SAMPLES = 0x800; - -const size_t overAllocBytes = 16384; - static const int atracDecodeDelay = 2300; -struct InputBuffer { - // Address of the buffer. - u32 addr; - // Size of data read so far into dataBuf_ (to be removed.) - u32 size; - // Offset into addr at which new data is added. - u32 offset; - // Last writableBytes number (to be removed.) - u32 writableBytes; - // Unused, always 0. - u32 neededBytes; - // Total size of the entire file data. - u32 filesize; - // Offset into the file at which new data is read. - u32 fileoffset; -}; - -struct AtracLoopInfo { - int cuePointID; - int type; - int startSample; - int endSample; - int fraction; - int playCount; -}; - -struct AtracResetBufferInfo; - -struct Atrac { - Atrac() { - memset(&first_, 0, sizeof(first_)); - memset(&second_, 0, sizeof(second_)); - context_ = 0; - } - - ~Atrac() { - ResetData(); - } - - void ResetData() { - delete decoder_; - decoder_ = nullptr; - - if (dataBuf_) - delete [] dataBuf_; - dataBuf_ = 0; - ignoreDataBuf_ = false; - bufferState_ = ATRAC_STATUS_NO_DATA; - - if (context_.IsValid()) - kernelMemory.Free(context_.ptr); - } - - void SetBufferState() { - if (bufferMaxSize_ >= first_.filesize) { - if (first_.size < first_.filesize) { - // The buffer is big enough, but we don't have all the data yet. - bufferState_ = ATRAC_STATUS_HALFWAY_BUFFER; - } else { - bufferState_ = ATRAC_STATUS_ALL_DATA_LOADED; - } - } else { - if (loopEndSample_ <= 0) { - // There's no looping, but we need to stream the data in our buffer. - bufferState_ = ATRAC_STATUS_STREAMED_WITHOUT_LOOP; - } else if (loopEndSample_ == endSample_ + firstSampleOffset_ + (int)FirstOffsetExtra()) { - bufferState_ = ATRAC_STATUS_STREAMED_LOOP_FROM_END; - } else { - bufferState_ = ATRAC_STATUS_STREAMED_LOOP_WITH_TRAILER; - } - } - } - - void DoState(PointerWrap &p) { - auto s = p.Section("Atrac", 1, 9); - if (!s) - return; - - Do(p, channels_); - Do(p, outputChannels_); - if (s >= 5) { - Do(p, jointStereo_); - } - - Do(p, atracID_); - Do(p, first_); - Do(p, bufferMaxSize_); - Do(p, codecType_); - - Do(p, currentSample_); - Do(p, endSample_); - Do(p, firstSampleOffset_); - if (s >= 3) { - Do(p, dataOff_); - } else { - dataOff_ = firstSampleOffset_; - } - - u32 hasDataBuf = dataBuf_ != nullptr; - Do(p, hasDataBuf); - if (hasDataBuf) { - if (p.mode == p.MODE_READ) { - if (dataBuf_) - delete [] dataBuf_; - dataBuf_ = new u8[first_.filesize + overAllocBytes]; - memset(dataBuf_, 0, first_.filesize + overAllocBytes); - } - DoArray(p, dataBuf_, first_.filesize); - } - Do(p, second_); - - Do(p, decodePos_); - if (s < 9) { - u32 oldDecodeEnd = 0; - Do(p, oldDecodeEnd); - } - if (s >= 4) { - Do(p, bufferPos_); - } else { - bufferPos_ = decodePos_; - } - - Do(p, bitrate_); - Do(p, bytesPerFrame_); - - Do(p, loopinfo_); - if (s < 9) { - int oldLoopInfoNum = 42; - Do(p, oldLoopInfoNum); - } - - Do(p, loopStartSample_); - Do(p, loopEndSample_); - Do(p, loopNum_); - - Do(p, context_); - if (s >= 6) { - Do(p, bufferState_); - } else { - if (dataBuf_ == nullptr) { - bufferState_ = ATRAC_STATUS_NO_DATA; - } else { - SetBufferState(); - } - } - - if (s >= 7) { - Do(p, ignoreDataBuf_); - } else { - ignoreDataBuf_ = false; - } - - if (s >= 9) { - Do(p, bufferValidBytes_); - Do(p, bufferHeaderSize_); - } else { - bufferHeaderSize_ = dataOff_; - bufferValidBytes_ = std::min(first_.size - dataOff_, StreamBufferEnd() - dataOff_); - if ((bufferState_ & ATRAC_STATUS_STREAMED_MASK) == ATRAC_STATUS_STREAMED_MASK) { - bufferPos_ = dataOff_; - } - } - - if (s < 8 && bufferState_ == ATRAC_STATUS_STREAMED_LOOP_WITH_TRAILER) { - // We didn't actually allow the second buffer to be set this far back. - // Pretend it's a regular loop, we'll just try our best. - bufferState_ = ATRAC_STATUS_STREAMED_LOOP_FROM_END; - } - - // Make sure to do this late; it depends on things like bytesPerFrame_. - if (p.mode == p.MODE_READ && bufferState_ != ATRAC_STATUS_NO_DATA) { - CreateDecoder(); - } - - if (s >= 2 && s < 9) { - bool oldResetBuffer = false; - Do(p, oldResetBuffer); - } - } - - int Analyze(u32 addr, u32 size); - int AnalyzeAA3(u32 addr, u32 size, u32 filesize); - - u32 SamplesPerFrame() const { - return codecType_ == PSP_MODE_AT_3_PLUS ? ATRAC3PLUS_MAX_SAMPLES : ATRAC3_MAX_SAMPLES; - } - - u32 FirstOffsetExtra() const { - return codecType_ == PSP_CODEC_AT3PLUS ? 368 : 69; - } - - u32 DecodePosBySample(int sample) const { - return (u32)(firstSampleOffset_ + sample / (int)SamplesPerFrame() * bytesPerFrame_); - } - - u32 FileOffsetBySample(int sample) const { - int offsetSample = sample + firstSampleOffset_; - int frameOffset = offsetSample / (int)SamplesPerFrame(); - return (u32)(dataOff_ + bytesPerFrame_ + frameOffset * bytesPerFrame_); - } - - int RemainingFrames() const { - if (bufferState_ == ATRAC_STATUS_ALL_DATA_LOADED) { - // Meaning, infinite I guess? We've got it all. - return PSP_ATRAC_ALLDATA_IS_ON_MEMORY; - } - - u32 currentFileOffset = FileOffsetBySample(currentSample_ - SamplesPerFrame() + FirstOffsetExtra()); - if (first_.fileoffset >= first_.filesize) { - if (bufferState_ == ATRAC_STATUS_STREAMED_WITHOUT_LOOP) { - return PSP_ATRAC_NONLOOP_STREAM_DATA_IS_ON_MEMORY; - } - int loopEndAdjusted = loopEndSample_ - FirstOffsetExtra() - firstSampleOffset_; - if (bufferState_ == ATRAC_STATUS_STREAMED_LOOP_WITH_TRAILER && currentSample_ > loopEndAdjusted) { - // No longer looping in this case, outside the loop. - return PSP_ATRAC_NONLOOP_STREAM_DATA_IS_ON_MEMORY; - } - if ((bufferState_ & ATRAC_STATUS_STREAMED_MASK) == ATRAC_STATUS_STREAMED_MASK && loopNum_ == 0) { - return PSP_ATRAC_LOOP_STREAM_DATA_IS_ON_MEMORY; - } - } - - if ((bufferState_ & ATRAC_STATUS_STREAMED_MASK) == ATRAC_STATUS_STREAMED_MASK) { - // Since we're streaming, the remaining frames are what's valid in the buffer. - return bufferValidBytes_ / bytesPerFrame_; - } - - // Since the first frame is shorter by this offset, add to round up at this offset. - const int remainingBytes = first_.fileoffset - currentFileOffset; - if (remainingBytes < 0) { - // Just in case. Shouldn't happen, but once did by mistake. - return 0; - } - return remainingBytes / bytesPerFrame_; - } - - int atracID_ = -1; - - // TODO: Save the internal state of this, now technically possible. - AudioDecoder *decoder_ = nullptr; - - u8 *dataBuf_ = nullptr; - - u32 decodePos_ = 0; - // Used by low-level decoding and to track streaming. - u32 bufferPos_ = 0; - u32 bufferValidBytes_ = 0; - u32 bufferHeaderSize_ = 0; - - u16 channels_ = 0; - u16 outputChannels_ = 2; - u32 bitrate_ = 64; - u16 bytesPerFrame_ = 0; - u32 bufferMaxSize_ = 0; - int jointStereo_ = 0; - - int currentSample_ = 0; - int endSample_ = 0; - int firstSampleOffset_ = 0; - // Offset of the first sample in the input buffer - int dataOff_ = 0; - - std::vector loopinfo_; - - int loopStartSample_ = -1; - int loopEndSample_ = -1; - int loopNum_ = 0; - - // Indicates that the dataBuf_ array should not be used. - bool ignoreDataBuf_ = false; - - u32 codecType_ = 0; - - InputBuffer first_; - InputBuffer second_; - - PSPPointer context_; - - AtracStatus BufferState() const { - return bufferState_; - } - - void ForceSeekToSample(int sample) { - if (decoder_) { - decoder_->FlushBuffers(); - } - currentSample_ = sample; - } - - u8 *BufferStart() { - return ignoreDataBuf_ ? Memory::GetPointerWrite(first_.addr) : dataBuf_; - } - - void SeekToSample(int sample) { - // It seems like the PSP aligns the sample position to 0x800...? - const u32 offsetSamples = firstSampleOffset_ + FirstOffsetExtra(); - const u32 unalignedSamples = (offsetSamples + sample) % SamplesPerFrame(); - int seekFrame = sample + offsetSamples - unalignedSamples; - - if ((sample != currentSample_ || sample == 0) && decoder_ != nullptr) { - // Prefill the decode buffer with packets before the first sample offset. - decoder_->FlushBuffers(); - - int adjust = 0; - if (sample == 0) { - int offsetSamples = firstSampleOffset_ + FirstOffsetExtra(); - adjust = -(int)(offsetSamples % SamplesPerFrame()); - } - const u32 off = FileOffsetBySample(sample + adjust); - const u32 backfill = bytesPerFrame_ * 2; - const u32 start = off - dataOff_ < backfill ? dataOff_ : off - backfill; - - for (u32 pos = start; pos < off; pos += bytesPerFrame_) { - decoder_->Decode(BufferStart() + pos, bytesPerFrame_, nullptr, nullptr, nullptr); - } - } - - currentSample_ = sample; - } - - uint32_t CurBufferAddress(int adjust = 0) { - u32 off = FileOffsetBySample(currentSample_ + adjust); - if (off < first_.size && ignoreDataBuf_) { - return first_.addr + off; - } - // If it's in dataBug, it's not in PSP memory. - return 0; - } - - void CalculateStreamInfo(u32 *readOffset); - - u32 StreamBufferEnd() const { - // The buffer is always aligned to a frame in size, not counting an optional header. - // The header will only initially exist after the data is first set. - u32 framesAfterHeader = (bufferMaxSize_ - bufferHeaderSize_) / bytesPerFrame_; - return framesAfterHeader * bytesPerFrame_ + bufferHeaderSize_; - } - - void ConsumeFrame() { - bufferPos_ += bytesPerFrame_; - if ((bufferState_ & ATRAC_STATUS_STREAMED_MASK) == ATRAC_STATUS_STREAMED_MASK) { - if (bufferValidBytes_ > bytesPerFrame_) { - bufferValidBytes_ -= bytesPerFrame_; - } else { - bufferValidBytes_ = 0; - } - } - if (bufferPos_ >= StreamBufferEnd()) { - // Wrap around... theoretically, this should only happen at exactly StreamBufferEnd. - bufferPos_ -= StreamBufferEnd(); - bufferHeaderSize_ = 0; - } - } - - void UpdateContextFromPSPMem(); - - void WriteContextToPSPMem(); - u32 DecodeData(u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u32 *finish, int *remains); - void GetResetBufferInfo(AtracResetBufferInfo *bufferInfo, int sample); - void SetLoopNum(int loopNum); - int AddStreamData(u32 bytesToAdd); - u32 AddStreamDataSas(u32 bufPtr, u32 bytesToAdd); - void CreateDecoder(); - u32 ResetPlayPosition(int sample, int bytesWrittenFirstBuf, int bytesWrittenSecondBuf); - int SetData(u32 buffer, u32 readSize, u32 bufferSize, int successCode = 0); - u32 GetNextSamples(); - - void InitLowLevel(u32 paramsAddr, bool jointStereo); - -private: - void AnalyzeReset(); - - AtracStatus bufferState_ = ATRAC_STATUS_NO_DATA; -}; - -void Atrac::SetLoopNum(int loopNum) { - // Spammed in MHU - loopNum_ = loopNum; - if (loopNum != 0 && loopinfo_.size() == 0) { - // Just loop the whole audio - loopStartSample_ = firstSampleOffset_ + FirstOffsetExtra(); - loopEndSample_ = endSample_ + firstSampleOffset_ + FirstOffsetExtra(); - } - WriteContextToPSPMem(); -} - -struct AtracSingleResetBufferInfo { - u32_le writePosPtr; - u32_le writableBytes; - u32_le minWriteBytes; - u32_le filePos; -}; - -struct AtracResetBufferInfo { - AtracSingleResetBufferInfo first; - AtracSingleResetBufferInfo second; -}; - const int PSP_NUM_ATRAC_IDS = 6; static bool atracInited = true; static Atrac *atracContexts[PSP_NUM_ATRAC_IDS]; @@ -594,7 +149,7 @@ static Atrac *getAtrac(int atracID) { static int createAtrac(Atrac *atrac) { for (int i = 0; i < (int)ARRAY_SIZE(atracContexts); ++i) { - if (atracContextTypes[i] == atrac->codecType_ && atracContexts[i] == 0) { + if (atracContextTypes[i] == atrac->CodecType() && atracContexts[i] == 0) { atracContexts[i] = atrac; atrac->atracID_ = i; return i; @@ -614,286 +169,7 @@ static int deleteAtrac(int atracID) { return ATRAC_ERROR_BAD_ATRACID; } -void Atrac::AnalyzeReset() { - // Reset some values. - codecType_ = 0; - currentSample_ = 0; - endSample_ = -1; - loopNum_ = 0; - loopinfo_.clear(); - loopStartSample_ = -1; - loopEndSample_ = -1; - decodePos_ = 0; - bufferPos_ = 0; - channels_ = 2; -} - -int Atrac::Analyze(u32 addr, u32 size) { - struct RIFFFmtChunk { - u16_le fmtTag; - u16_le channels; - u32_le samplerate; - u32_le avgBytesPerSec; - u16_le blockAlign; - }; - - first_.addr = addr; - first_.size = size; - - AnalyzeReset(); - - // 72 is about the size of the minimum required data to even be valid. - if (first_.size < 72) { - return hleReportError(ME, ATRAC_ERROR_SIZE_TOO_SMALL, "buffer too small"); - } - - // TODO: Check the range (addr, size) instead. - if (!Memory::IsValidAddress(first_.addr)) { - return hleReportWarning(ME, SCE_KERNEL_ERROR_ILLEGAL_ADDRESS, "invalid buffer address"); - } - - // TODO: Validate stuff. - if (Memory::ReadUnchecked_U32(first_.addr) != RIFF_CHUNK_MAGIC) { - return hleReportError(ME, ATRAC_ERROR_UNKNOWN_FORMAT, "invalid RIFF header"); - } - - u32 offset = 8; - firstSampleOffset_ = 0; - - while (Memory::Read_U32(first_.addr + offset) != RIFF_WAVE_MAGIC) { - // Get the size preceding the magic. - int chunk = Memory::Read_U32(first_.addr + offset - 4); - // Round the chunk size up to the nearest 2. - offset += chunk + (chunk & 1); - if (offset + 12 > first_.size) { - return hleReportError(ME, ATRAC_ERROR_SIZE_TOO_SMALL, "too small for WAVE chunk at %d", offset); - } - if (Memory::Read_U32(first_.addr + offset) != RIFF_CHUNK_MAGIC) { - return hleReportError(ME, ATRAC_ERROR_UNKNOWN_FORMAT, "RIFF chunk did not contain WAVE"); - } - offset += 8; - } - offset += 4; - - if (offset != 12) { - WARN_LOG_REPORT(ME, "RIFF chunk at offset: %d", offset); - } - - // RIFF size excluding chunk header. - first_.filesize = Memory::Read_U32(first_.addr + offset - 8) + 8; - // Even if the RIFF size is too low, it may simply be incorrect. This works on real firmware. - u32 maxSize = std::max(first_.filesize, first_.size); - - bool bfoundData = false; - u32 dataChunkSize = 0; - int sampleOffsetAdjust = 0; - while (maxSize >= offset + 8 && !bfoundData) { - int chunkMagic = Memory::Read_U32(first_.addr + offset); - u32 chunkSize = Memory::Read_U32(first_.addr + offset + 4); - // Account for odd sized chunks. - if (chunkSize & 1) { - WARN_LOG_REPORT_ONCE(oddchunk, ME, "RIFF chunk had uneven size"); - } - chunkSize += (chunkSize & 1); - offset += 8; - if (chunkSize > maxSize - offset) - break; - switch (chunkMagic) { - case FMT_CHUNK_MAGIC: - { - if (codecType_ != 0) { - return hleReportError(ME, ATRAC_ERROR_UNKNOWN_FORMAT, "multiple fmt definitions"); - } - - auto at3fmt = PSPPointer::Create(first_.addr + offset); - if (chunkSize < 32 || (at3fmt->fmtTag == AT3_PLUS_MAGIC && chunkSize < 52)) { - return hleReportError(ME, ATRAC_ERROR_UNKNOWN_FORMAT, "fmt definition too small (%d)", chunkSize); - } - - if (at3fmt->fmtTag == AT3_MAGIC) - codecType_ = PSP_MODE_AT_3; - else if (at3fmt->fmtTag == AT3_PLUS_MAGIC) - codecType_ = PSP_MODE_AT_3_PLUS; - else { - return hleReportError(ME, ATRAC_ERROR_UNKNOWN_FORMAT, "invalid fmt magic: %04x", at3fmt->fmtTag); - } - channels_ = at3fmt->channels; - if (channels_ != 1 && channels_ != 2) { - return hleReportError(ME, ATRAC_ERROR_UNKNOWN_FORMAT, "invalid channel count: %d", channels_); - } - if (at3fmt->samplerate != 44100) { - return hleReportError(ME, ATRAC_ERROR_UNKNOWN_FORMAT, "unsupported sample rate: %d", at3fmt->samplerate); - } - bitrate_ = at3fmt->avgBytesPerSec * 8; - bytesPerFrame_ = at3fmt->blockAlign; - if (bytesPerFrame_ == 0) { - return hleReportError(ME, ATRAC_ERROR_UNKNOWN_FORMAT, "invalid bytes per frame: %d", bytesPerFrame_); - } - - // TODO: There are some format specific bytes here which seem to have fixed values? - // Probably don't need them. - - if (at3fmt->fmtTag == AT3_MAGIC) { - // This is the offset to the jointStereo_ field. - jointStereo_ = Memory::Read_U32(first_.addr + offset + 24); - } - } - break; - case FACT_CHUNK_MAGIC: - { - endSample_ = Memory::Read_U32(first_.addr + offset); - if (chunkSize >= 8) { - firstSampleOffset_ = Memory::Read_U32(first_.addr + offset + 4); - } - if (chunkSize >= 12) { - u32 largerOffset = Memory::Read_U32(first_.addr + offset + 8); - sampleOffsetAdjust = firstSampleOffset_ - largerOffset; - } - } - break; - case SMPL_CHUNK_MAGIC: - { - if (chunkSize < 32) { - return hleReportError(ME, ATRAC_ERROR_UNKNOWN_FORMAT, "smpl chunk too small (%d)", chunkSize); - } - int checkNumLoops = Memory::Read_U32(first_.addr + offset + 28); - if (checkNumLoops != 0 && chunkSize < 36 + 20) { - return hleReportError(ME, ATRAC_ERROR_UNKNOWN_FORMAT, "smpl chunk too small for loop (%d, %d)", checkNumLoops, chunkSize); - } - if (checkNumLoops < 0) { - return hleReportError(ME, ATRAC_ERROR_UNKNOWN_FORMAT, "bad checkNumLoops (%d)", checkNumLoops); - } - - loopinfo_.resize(checkNumLoops); - u32 loopinfoAddr = first_.addr + offset + 36; - // The PSP only cares about the first loop start and end, it seems. - // Most likely can skip the rest of this data, but it's not hurting anyone. - for (int i = 0; i < checkNumLoops && 36 + (u32)i < chunkSize; i++, loopinfoAddr += 24) { - loopinfo_[i].cuePointID = Memory::Read_U32(loopinfoAddr); - loopinfo_[i].type = Memory::Read_U32(loopinfoAddr + 4); - loopinfo_[i].startSample = Memory::Read_U32(loopinfoAddr + 8); - loopinfo_[i].endSample = Memory::Read_U32(loopinfoAddr + 12); - loopinfo_[i].fraction = Memory::Read_U32(loopinfoAddr + 16); - loopinfo_[i].playCount = Memory::Read_U32(loopinfoAddr + 20); - - if (loopinfo_[i].startSample >= loopinfo_[i].endSample) { - return hleReportError(ME, ATRAC_ERROR_BAD_CODEC_PARAMS, "loop starts after it ends"); - } - } - } - break; - case DATA_CHUNK_MAGIC: - { - bfoundData = true; - dataOff_ = offset; - dataChunkSize = chunkSize; - if (first_.filesize < offset + chunkSize) { - WARN_LOG_REPORT(ME, "Atrac data chunk extends beyond riff chunk"); - first_.filesize = offset + chunkSize; - } - } - break; - } - offset += chunkSize; - } - - if (codecType_ == 0) { - return hleReportError(ME, ATRAC_ERROR_UNKNOWN_FORMAT, "could not detect codec"); - } - - if (!bfoundData) { - return hleReportError(ME, ATRAC_ERROR_SIZE_TOO_SMALL, "no data chunk"); - } - - // set the loopStartSample_ and loopEndSample_ by loopinfo_ - if (loopinfo_.size() > 0) { - loopStartSample_ = loopinfo_[0].startSample + FirstOffsetExtra() + sampleOffsetAdjust; - loopEndSample_ = loopinfo_[0].endSample + FirstOffsetExtra() + sampleOffsetAdjust; - } else { - loopStartSample_ = -1; - loopEndSample_ = -1; - } - - // if there is no correct endsample, try to guess it - if (endSample_ <= 0 && bytesPerFrame_ != 0) { - endSample_ = (dataChunkSize / bytesPerFrame_) * SamplesPerFrame(); - endSample_ -= firstSampleOffset_ + FirstOffsetExtra(); - } - endSample_ -= 1; - - if (loopEndSample_ != -1 && loopEndSample_ > endSample_ + firstSampleOffset_ + (int)FirstOffsetExtra()) { - return hleReportError(ME, ATRAC_ERROR_BAD_CODEC_PARAMS, "loop after end of data"); - } - - return 0; -} - -int Atrac::AnalyzeAA3(u32 addr, u32 size, u32 filesize) { - first_.addr = addr; - first_.size = size; - first_.filesize = filesize; - - AnalyzeReset(); - - if (first_.size < 10) { - return hleReportError(ME, ATRAC_ERROR_AA3_SIZE_TOO_SMALL, "buffer too small"); - } - - // TODO: Make sure this validation is correct, more testing. - - const u8 *buffer = Memory::GetPointer(first_.addr); - if (buffer[0] != 'e' || buffer[1] != 'a' || buffer[2] != '3') { - return hleReportError(ME, ATRAC_ERROR_AA3_INVALID_DATA, "invalid ea3 magic bytes"); - } - - // It starts with an id3 header (replaced with ea3.) This is the size. - u32 tagSize = buffer[9] | (buffer[8] << 7) | (buffer[7] << 14) | (buffer[6] << 21); - if (first_.size < tagSize + 36) { - return hleReportError(ME, ATRAC_ERROR_AA3_SIZE_TOO_SMALL, "truncated before id3 end"); - } - - // EA3 header starts at id3 header (10) + tagSize. - buffer = Memory::GetPointer(first_.addr + 10 + tagSize); - if (buffer[0] != 'E' || buffer[1] != 'A' || buffer[2] != '3') { - return hleReportError(ME, ATRAC_ERROR_AA3_INVALID_DATA, "invalid EA3 magic bytes"); - } - - // Based on FFmpeg's code. - u32 codecParams = buffer[35] | (buffer[34] << 8) | (buffer[35] << 16); - const u32 at3SampleRates[8] = { 32000, 44100, 48000, 88200, 96000, 0 }; - - switch (buffer[32]) { - case 0: - codecType_ = PSP_MODE_AT_3; - bytesPerFrame_ = (codecParams & 0x03FF) * 8; - bitrate_ = at3SampleRates[(codecParams >> 13) & 7] * bytesPerFrame_ * 8 / 1024; - channels_ = 2; - jointStereo_ = (codecParams >> 17) & 1; - break; - case 1: - codecType_ = PSP_MODE_AT_3_PLUS; - bytesPerFrame_ = ((codecParams & 0x03FF) * 8) + 8; - bitrate_ = at3SampleRates[(codecParams >> 13) & 7] * bytesPerFrame_ * 8 / 2048; - channels_ = (codecParams >> 10) & 7; - break; - case 3: - case 4: - case 5: - return hleReportError(ME, ATRAC_ERROR_AA3_INVALID_DATA, "unsupported codec type %d", buffer[32]); - default: - return hleReportError(ME, ATRAC_ERROR_AA3_INVALID_DATA, "invalid codec type %d", buffer[32]); - } - - dataOff_ = 10 + tagSize + 96; - firstSampleOffset_ = 0; - if (endSample_ < 0 && bytesPerFrame_ != 0) { - endSample_ = ((first_.filesize - dataOff_) / bytesPerFrame_) * SamplesPerFrame(); - } - endSample_ -= 1; - - return 0; -} - +// Really, allocate a new Atrac context of a specific codec type. static u32 sceAtracGetAtracID(int codecType) { if (codecType != PSP_MODE_AT_3 && codecType != PSP_MODE_AT_3_PLUS) { return hleReportError(ME, ATRAC_ERROR_INVALID_CODECTYPE, "invalid codecType"); @@ -910,21 +186,6 @@ static u32 sceAtracGetAtracID(int codecType) { return hleLogSuccessInfoI(ME, atracID); } -u32 Atrac::AddStreamDataSas(u32 bufPtr, u32 bytesToAdd) { - int addbytes = std::min(bytesToAdd, first_.filesize - first_.fileoffset - FirstOffsetExtra()); - Memory::Memcpy(dataBuf_ + first_.fileoffset + FirstOffsetExtra(), bufPtr, addbytes, "AtracAddStreamData"); - first_.size += bytesToAdd; - if (first_.size >= first_.filesize) { - first_.size = first_.filesize; - if (bufferState_ == ATRAC_STATUS_HALFWAY_BUFFER) - bufferState_ = ATRAC_STATUS_ALL_DATA_LOADED; - } - first_.fileoffset += addbytes; - // refresh context_ - WriteContextToPSPMem(); - return 0; -} - static u32 AtracValidateData(const Atrac *atrac) { if (!atrac) { return hleLogError(ME, ATRAC_ERROR_BAD_ATRACID, "bad atrac ID"); @@ -949,59 +210,6 @@ static u32 AtracValidateManaged(const Atrac *atrac) { } } -void Atrac::CalculateStreamInfo(u32 *outReadOffset) { - u32 readOffset = first_.fileoffset; - if (bufferState_ == ATRAC_STATUS_ALL_DATA_LOADED) { - // Nothing to write. - readOffset = 0; - first_.offset = 0; - first_.writableBytes = 0; - } else if (bufferState_ == ATRAC_STATUS_HALFWAY_BUFFER) { - // If we're buffering the entire file, just give the same as readOffset. - first_.offset = readOffset; - // In this case, the bytes writable are just the remaining bytes, always. - first_.writableBytes = first_.filesize - readOffset; - } else { - u32 bufferEnd = StreamBufferEnd(); - u32 bufferValidExtended = bufferPos_ + bufferValidBytes_; - if (bufferValidExtended < bufferEnd) { - first_.offset = bufferValidExtended; - first_.writableBytes = bufferEnd - bufferValidExtended; - } else { - u32 bufferStartUsed = bufferValidExtended - bufferEnd; - first_.offset = bufferStartUsed; - first_.writableBytes = bufferPos_ - bufferStartUsed; - } - - if (readOffset >= first_.filesize) { - if (bufferState_ == ATRAC_STATUS_STREAMED_WITHOUT_LOOP) { - // We don't need anything more, so all 0s. - readOffset = 0; - first_.offset = 0; - first_.writableBytes = 0; - } else { - readOffset = FileOffsetBySample(loopStartSample_ - FirstOffsetExtra() - firstSampleOffset_ - SamplesPerFrame() * 2); - } - } - - if (readOffset + first_.writableBytes > first_.filesize) { - // Never ask for past the end of file, even when the space is free. - first_.writableBytes = first_.filesize - readOffset; - } - - // If you don't think this should be here, remove it. It's just a temporary safety check. - if (first_.offset + first_.writableBytes > bufferMaxSize_) { - ERROR_LOG_REPORT(ME, "Somehow calculated too many writable bytes: %d + %d > %d", first_.offset, first_.writableBytes, bufferMaxSize_); - first_.offset = 0; - first_.writableBytes = bufferMaxSize_; - } - } - - if (outReadOffset) { - *outReadOffset = readOffset; - } -} - // Notifies that more data is (OR will be very soon) available in the buffer. // This implies it has been added to whatever position sceAtracGetStreamDataInfo would indicate. // @@ -1028,169 +236,6 @@ static u32 sceAtracAddStreamData(int atracID, u32 bytesToAdd) { return hleLogSuccessI(ME, 0); } -int Atrac::AddStreamData(u32 bytesToAdd) { - u32 readOffset; - CalculateStreamInfo(&readOffset); - if (bytesToAdd > first_.writableBytes) - return hleLogWarning(ME, ATRAC_ERROR_ADD_DATA_IS_TOO_BIG, "too many bytes"); - - if (bytesToAdd > 0) { - first_.fileoffset = readOffset; - int addbytes = std::min(bytesToAdd, first_.filesize - first_.fileoffset); - if (!ignoreDataBuf_) { - Memory::Memcpy(dataBuf_ + first_.fileoffset, first_.addr + first_.offset, addbytes, "AtracAddStreamData"); - } - first_.fileoffset += addbytes; - } - first_.size += bytesToAdd; - if (first_.size >= first_.filesize) { - first_.size = first_.filesize; - if (bufferState_ == ATRAC_STATUS_HALFWAY_BUFFER) - bufferState_ = ATRAC_STATUS_ALL_DATA_LOADED; - WriteContextToPSPMem(); - } - - first_.offset += bytesToAdd; - bufferValidBytes_ += bytesToAdd; - - if (PSP_CoreParameter().compat.flags().AtracLoopHack && bufferState_ == ATRAC_STATUS_STREAMED_LOOP_FROM_END && RemainingFrames() > 2) { - loopNum_++; - SeekToSample(loopStartSample_ - FirstOffsetExtra() - firstSampleOffset_); - } - - return 0; -} - -u32 Atrac::DecodeData(u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u32 *finish, int *remains) { - int loopNum = loopNum_; - if (bufferState_ == ATRAC_STATUS_FOR_SCESAS) { - // TODO: Might need more testing. - loopNum = 0; - } - - // We already passed the end - return an error (many games check for this.) - if (currentSample_ >= endSample_ && loopNum == 0) { - *SamplesNum = 0; - *finish = 1; - // refresh context_ - WriteContextToPSPMem(); - return ATRAC_ERROR_ALL_DATA_DECODED; - } - - // TODO: This isn't at all right, but at least it makes the music "last" some time. - u32 numSamples = 0; - - // It seems like the PSP aligns the sample position to 0x800...? - int offsetSamples = firstSampleOffset_ + FirstOffsetExtra(); - int skipSamples = 0; - u32 maxSamples = endSample_ + 1 - currentSample_; - u32 unalignedSamples = (offsetSamples + currentSample_) % SamplesPerFrame(); - if (unalignedSamples != 0) { - // We're off alignment, possibly due to a loop. Force it back on. - maxSamples = SamplesPerFrame() - unalignedSamples; - skipSamples = unalignedSamples; - } - - if (skipSamples != 0 && bufferHeaderSize_ == 0) { - // Skip the initial frame used to load state for the looped frame. - // TODO: We will want to actually read this in. - ConsumeFrame(); - } - - // TODO: We don't support any other codec type, check seems unnecessary? - if ((codecType_ == PSP_MODE_AT_3 || codecType_ == PSP_MODE_AT_3_PLUS)) { - SeekToSample(currentSample_); - - bool gotFrame = false; - u32 off = FileOffsetBySample(currentSample_ - skipSamples); - if (off < first_.size) { - uint8_t *indata = BufferStart() + off; - int bytesConsumed = 0; - int outBytes = 0; - if (!decoder_->Decode(indata, bytesPerFrame_, &bytesConsumed, - outbuf, &outBytes)) { - // Decode failed. - *SamplesNum = 0; - *finish = 1; - return ATRAC_ERROR_ALL_DATA_DECODED; - } - gotFrame = true; - - numSamples = outBytes / 4; - uint32_t packetAddr = CurBufferAddress(-skipSamples); - // got a frame - int skipped = std::min((u32)skipSamples, numSamples); - skipSamples -= skipped; - numSamples = numSamples - skipped; - // If we're at the end, clamp to samples we want. It always returns a full chunk. - numSamples = std::min(maxSamples, numSamples); - - if (packetAddr != 0 && MemBlockInfoDetailed()) { - char tagData[128]; - size_t tagSize = FormatMemWriteTagAt(tagData, sizeof(tagData), "AtracDecode/", packetAddr, bytesPerFrame_); - NotifyMemInfo(MemBlockFlags::READ, packetAddr, bytesPerFrame_, tagData, tagSize); - NotifyMemInfo(MemBlockFlags::WRITE, outbufPtr, outBytes, tagData, tagSize); - } else { - NotifyMemInfo(MemBlockFlags::WRITE, outbufPtr, outBytes, "AtracDecode"); - } - // We only want one frame per call, let's continue the next time. - } - - if (!gotFrame && currentSample_ < endSample_) { - // Never got a frame. We may have dropped a GHA frame or otherwise have a bug. - // For now, let's try to provide an extra "frame" if possible so games don't infinite loop. - if (FileOffsetBySample(currentSample_) < first_.filesize) { - numSamples = std::min(maxSamples, SamplesPerFrame()); - u32 outBytes = numSamples * outputChannels_ * sizeof(s16); - if (outbuf != nullptr) { - memset(outbuf, 0, outBytes); - NotifyMemInfo(MemBlockFlags::WRITE, outbufPtr, outBytes, "AtracDecode"); - } - } - } - } - - *SamplesNum = numSamples; - // update current sample and decodePos - currentSample_ += numSamples; - decodePos_ = DecodePosBySample(currentSample_); - - ConsumeFrame(); - - int finishFlag = 0; - // TODO: Verify. - bool hitEnd = currentSample_ >= endSample_ || (numSamples == 0 && first_.size >= first_.filesize); - int loopEndAdjusted = loopEndSample_ - FirstOffsetExtra() - firstSampleOffset_; - if ((hitEnd || currentSample_ > loopEndAdjusted) && loopNum != 0) { - SeekToSample(loopStartSample_ - FirstOffsetExtra() - firstSampleOffset_); - if (bufferState_ != ATRAC_STATUS_FOR_SCESAS) { - if (loopNum_ > 0) - loopNum_--; - } - if ((bufferState_ & ATRAC_STATUS_STREAMED_MASK) == ATRAC_STATUS_STREAMED_MASK) { - // Whatever bytes we have left were added from the loop. - u32 loopOffset = FileOffsetBySample(loopStartSample_ - FirstOffsetExtra() - firstSampleOffset_ - SamplesPerFrame() * 2); - // TODO: Hmm, need to manage the buffer better. But don't move fileoffset if we already have valid data. - if (loopOffset > first_.fileoffset || loopOffset + bufferValidBytes_ < first_.fileoffset) { - // Skip the initial frame at the start. - first_.fileoffset = FileOffsetBySample(loopStartSample_ - FirstOffsetExtra() - firstSampleOffset_ - SamplesPerFrame() * 2); - } - } - } else if (hitEnd) { - finishFlag = 1; - - // Still move forward, so we know that we've read everything. - // This seems to be reflected in the context as well. - currentSample_ += SamplesPerFrame() - numSamples; - } - - *finish = finishFlag; - *remains = RemainingFrames(); - // refresh context_ - WriteContextToPSPMem(); - return 0; -} - // Note that outAddr being null is completely valid here, used to skip data. static u32 sceAtracDecodeData(int atracID, u32 outAddr, u32 numSamplesAddr, u32 finishFlagAddr, u32 remainAddr) { Atrac *atrac = getAtrac(atracID); @@ -1229,61 +274,6 @@ static u32 sceAtracEndEntry() { return 0; } -void Atrac::GetResetBufferInfo(AtracResetBufferInfo *bufferInfo, int sample) { - if (bufferState_ == ATRAC_STATUS_ALL_DATA_LOADED) { - bufferInfo->first.writePosPtr = first_.addr; - // Everything is loaded, so nothing needs to be read. - bufferInfo->first.writableBytes = 0; - bufferInfo->first.minWriteBytes = 0; - bufferInfo->first.filePos = 0; - } else if (bufferState_ == ATRAC_STATUS_HALFWAY_BUFFER) { - // Here the message is: you need to read at least this many bytes to get to that position. - // This is because we're filling the buffer start to finish, not streaming. - bufferInfo->first.writePosPtr = first_.addr + first_.size; - bufferInfo->first.writableBytes = first_.filesize - first_.size; - int minWriteBytes = FileOffsetBySample(sample) - first_.size; - if (minWriteBytes > 0) { - bufferInfo->first.minWriteBytes = minWriteBytes; - } else { - bufferInfo->first.minWriteBytes = 0; - } - bufferInfo->first.filePos = first_.size; - } else { - // This is without the sample offset. The file offset also includes the previous batch of samples? - int sampleFileOffset = FileOffsetBySample(sample - firstSampleOffset_ - SamplesPerFrame()); - - // Update the writable bytes. When streaming, this is just the number of bytes until the end. - const u32 bufSizeAligned = (bufferMaxSize_ / bytesPerFrame_) * bytesPerFrame_; - const int needsMoreFrames = FirstOffsetExtra(); - - bufferInfo->first.writePosPtr = first_.addr; - bufferInfo->first.writableBytes = std::min(first_.filesize - sampleFileOffset, bufSizeAligned); - if (((sample + firstSampleOffset_) % (int)SamplesPerFrame()) >= (int)SamplesPerFrame() - needsMoreFrames) { - // Not clear why, but it seems it wants a bit extra in case the sample is late? - bufferInfo->first.minWriteBytes = bytesPerFrame_ * 3; - } else { - bufferInfo->first.minWriteBytes = bytesPerFrame_ * 2; - } - if ((u32)sample < (u32)firstSampleOffset_ && sampleFileOffset != dataOff_) { - sampleFileOffset -= bytesPerFrame_; - } - bufferInfo->first.filePos = sampleFileOffset; - - if (second_.size != 0) { - // TODO: We have a second buffer. Within it, minWriteBytes should be zero. - // The filePos should be after the end of the second buffer (or zero.) - // We actually need to ensure we READ from the second buffer before implementing that. - } - } - - // It seems like this is always the same as the first buffer's pos, weirdly. - bufferInfo->second.writePosPtr = first_.addr; - // Reset never needs a second buffer write, since the loop is in a fixed place. - bufferInfo->second.writableBytes = 0; - bufferInfo->second.minWriteBytes = 0; - bufferInfo->second.filePos = 0; -} - // Obtains information about what needs to be in the buffer to seek (or "reset") // Generally called by games right before calling sceAtracResetPlayPosition(). static u32 sceAtracGetBufferInfoForResetting(int atracID, int sample, u32 bufferInfoAddr) { @@ -1316,13 +306,10 @@ static u32 sceAtracGetBitrate(int atracID, u32 outBitrateAddr) { return err; } - atrac->bitrate_ = (atrac->bytesPerFrame_ * 352800) / 1000; - if (atrac->codecType_ == PSP_MODE_AT_3_PLUS) - atrac->bitrate_ = ((atrac->bitrate_ >> 11) + 8) & 0xFFFFFFF0; - else - atrac->bitrate_ = (atrac->bitrate_ + 511) >> 10; + atrac->UpdateBitrate(); + if (Memory::IsValidAddress(outBitrateAddr)) { - Memory::WriteUnchecked_U32(atrac->bitrate_, outBitrateAddr); + Memory::WriteUnchecked_U32(atrac->Bitrate(), outBitrateAddr); return hleLogSuccessI(ME, 0); } else { return hleLogError(ME, 0, "invalid address"); @@ -1338,7 +325,7 @@ static u32 sceAtracGetChannel(int atracID, u32 channelAddr) { } if (Memory::IsValidAddress(channelAddr)){ - Memory::WriteUnchecked_U32(atrac->channels_, channelAddr); + Memory::WriteUnchecked_U32(atrac->Channels(), channelAddr); return hleLogSuccessI(ME, 0); } else { return hleLogError(ME, 0, "invalid address"); @@ -1437,27 +424,6 @@ static u32 sceAtracGetNextSample(int atracID, u32 outNAddr) { return hleLogSuccessI(ME, 0, "%d samples left", numSamples); } -u32 Atrac::GetNextSamples() { - // It seems like the PSP aligns the sample position to 0x800...? - u32 skipSamples = firstSampleOffset_ + FirstOffsetExtra(); - u32 firstSamples = (SamplesPerFrame() - skipSamples) % SamplesPerFrame(); - u32 numSamples = endSample_ + 1 - currentSample_; - if (currentSample_ == 0 && firstSamples != 0) { - numSamples = firstSamples; - } - u32 unalignedSamples = (skipSamples + currentSample_) % SamplesPerFrame(); - if (unalignedSamples != 0) { - // We're off alignment, possibly due to a loop. Force it back on. - numSamples = SamplesPerFrame() - unalignedSamples; - } - if (numSamples > SamplesPerFrame()) - numSamples = SamplesPerFrame(); - if (bufferState_ == ATRAC_STATUS_STREAMED_LOOP_FROM_END && (int)numSamples + currentSample_ > endSample_) { - bufferState_ = ATRAC_STATUS_ALL_DATA_LOADED; - } - return numSamples; -} - // Obtains the number of frames remaining in the buffer which can be decoded. // When no more data would be needed, this returns a negative number. static u32 sceAtracGetRemainFrame(int atracID, u32 remainAddr) { @@ -1590,139 +556,6 @@ static u32 sceAtracResetPlayPosition(int atracID, int sample, int bytesWrittenFi return hleDelayResult(hleLogSuccessInfoI(ME, 0), "reset play pos", 3000); } -u32 Atrac::ResetPlayPosition(int sample, int bytesWrittenFirstBuf, int bytesWrittenSecondBuf) { - // Reuse the same calculation as before. - AtracResetBufferInfo bufferInfo; - GetResetBufferInfo(&bufferInfo, sample); - - if ((u32)bytesWrittenFirstBuf < bufferInfo.first.minWriteBytes || (u32)bytesWrittenFirstBuf > bufferInfo.first.writableBytes) { - return hleLogError(ME, ATRAC_ERROR_BAD_FIRST_RESET_SIZE, "first byte count not in valid range"); - } - if ((u32)bytesWrittenSecondBuf < bufferInfo.second.minWriteBytes || (u32)bytesWrittenSecondBuf > bufferInfo.second.writableBytes) { - return hleLogError(ME, ATRAC_ERROR_BAD_SECOND_RESET_SIZE, "second byte count not in valid range"); - } - - if (bufferState_ == ATRAC_STATUS_ALL_DATA_LOADED) { - // Always adds zero bytes. - } else if (bufferState_ == ATRAC_STATUS_HALFWAY_BUFFER) { - // Okay, it's a valid number of bytes. Let's set them up. - if (bytesWrittenFirstBuf != 0) { - if (!ignoreDataBuf_) { - Memory::Memcpy(dataBuf_ + first_.size, first_.addr + first_.size, bytesWrittenFirstBuf, "AtracResetPlayPosition"); - } - first_.fileoffset += bytesWrittenFirstBuf; - first_.size += bytesWrittenFirstBuf; - first_.offset += bytesWrittenFirstBuf; - } - - // Did we transition to a full buffer? - if (first_.size >= first_.filesize) { - first_.size = first_.filesize; - bufferState_ = ATRAC_STATUS_ALL_DATA_LOADED; - } - } else { - if (bufferInfo.first.filePos > first_.filesize) { - return hleDelayResult(hleLogError(ME, ATRAC_ERROR_API_FAIL, "invalid file position"), "reset play pos", 200); - } - - // Move the offset to the specified position. - first_.fileoffset = bufferInfo.first.filePos; - - if (bytesWrittenFirstBuf != 0) { - if (!ignoreDataBuf_) { - Memory::Memcpy(dataBuf_ + first_.fileoffset, first_.addr, bytesWrittenFirstBuf, "AtracResetPlayPosition"); - } - first_.fileoffset += bytesWrittenFirstBuf; - } - first_.size = first_.fileoffset; - first_.offset = bytesWrittenFirstBuf; - - bufferHeaderSize_ = 0; - bufferPos_ = bytesPerFrame_; - bufferValidBytes_ = bytesWrittenFirstBuf - bufferPos_; - } - - if (codecType_ == PSP_MODE_AT_3 || codecType_ == PSP_MODE_AT_3_PLUS) { - SeekToSample(sample); - } - - WriteContextToPSPMem(); - return 0; -} - -void Atrac::CreateDecoder() { - if (decoder_) { - delete decoder_; - } - - // First, init the standalone decoder. Only used for low-level-decode initially, but simple. - if (codecType_ == PSP_MODE_AT_3) { - // We don't pull this from the RIFF so that we can support OMA also. - uint8_t extraData[14]{}; - // The only thing that changes are the jointStereo_ values. - extraData[0] = 1; - extraData[3] = channels_ << 3; - extraData[6] = jointStereo_; - extraData[8] = jointStereo_; - extraData[10] = 1; - decoder_ = CreateAtrac3Audio(channels_, bytesPerFrame_, extraData, sizeof(extraData)); - } else { - decoder_ = CreateAtrac3PlusAudio(channels_, bytesPerFrame_); - } - // reinit decodePos, because ffmpeg had changed it. - decodePos_ = 0; -} - -int Atrac::SetData(u32 buffer, u32 readSize, u32 bufferSize, int successCode) { - first_.addr = buffer; - first_.size = readSize; - - if (first_.size > first_.filesize) - first_.size = first_.filesize; - first_.fileoffset = first_.size; - - // got the size of temp buf, and calculate offset - bufferMaxSize_ = bufferSize; - first_.offset = first_.size; - - // some games may reuse an atracID for playing sound - ResetData(); - SetBufferState(); - - if (codecType_ != PSP_MODE_AT_3 && codecType_ != PSP_MODE_AT_3_PLUS) { - // Shouldn't have gotten here, Analyze() checks this. - bufferState_ = ATRAC_STATUS_NO_DATA; - return hleReportError(ME, ATRAC_ERROR_UNKNOWN_FORMAT, "unexpected codec type in set data"); - } - - if (bufferState_ == ATRAC_STATUS_ALL_DATA_LOADED || bufferState_ == ATRAC_STATUS_HALFWAY_BUFFER) { - // This says, don't use the dataBuf_ array, use the PSP RAM. - // This way, games can load data async into the buffer, and it still works. - // TODO: Support this always, even for streaming. - ignoreDataBuf_ = true; - } - if (bufferState_ == ATRAC_STATUS_STREAMED_WITHOUT_LOOP || bufferState_ == ATRAC_STATUS_STREAMED_LOOP_FROM_END || bufferState_ == ATRAC_STATUS_STREAMED_LOOP_WITH_TRAILER) { - bufferHeaderSize_ = dataOff_; - bufferPos_ = dataOff_ + bytesPerFrame_; - bufferValidBytes_ = first_.size - bufferPos_; - } - - const char *codecName = codecType_ == PSP_MODE_AT_3 ? "atrac3" : "atrac3+"; - const char *channelName = channels_ == 1 ? "mono" : "stereo"; - - // Over-allocate databuf to prevent going off the end if the bitstream is bad or if there are - // bugs in the decoder. This happens, see issue #15788. Arbitrary, but let's make it a whole page on the popular - // architecture that has the largest pages (M1). - dataBuf_ = new u8[first_.filesize + overAllocBytes]; - memset(dataBuf_, 0, first_.filesize + overAllocBytes); - if (!ignoreDataBuf_) { - u32 copybytes = std::min(bufferSize, first_.filesize); - Memory::Memcpy(dataBuf_, buffer, copybytes, "AtracSetData"); - } - CreateDecoder(); - return hleLogSuccessInfoI(ME, successCode, "%s %s audio", codecName, channelName); -} - static int _AtracSetData(int atracID, u32 buffer, u32 readSize, u32 bufferSize, bool needReturnAtracID = false) { Atrac *atrac = getAtrac(atracID); // Don't use AtracValidateManaged here. @@ -1762,21 +595,7 @@ static u32 sceAtracSetSecondBuffer(int atracID, u32 secondBuffer, u32 secondBuff return err; } - u32 secondFileOffset = atrac->FileOffsetBySample(atrac->loopEndSample_ - atrac->firstSampleOffset_); - u32 desiredSize = atrac->first_.filesize - secondFileOffset; - - // 3 seems to be the number of frames required to handle a loop. - if (secondBufferSize < desiredSize && secondBufferSize < (u32)atrac->bytesPerFrame_ * 3) { - return hleReportError(ME, ATRAC_ERROR_SIZE_TOO_SMALL, "too small"); - } - if (atrac->BufferState() != ATRAC_STATUS_STREAMED_LOOP_WITH_TRAILER) { - return hleReportError(ME, ATRAC_ERROR_SECOND_BUFFER_NOT_NEEDED, "not needed"); - } - - atrac->second_.addr = secondBuffer; - atrac->second_.size = secondBufferSize; - atrac->second_.fileoffset = secondFileOffset; - return hleLogSuccessI(ME, 0); + return atrac->SetSecondBuffer(secondBuffer, secondBufferSize); } static u32 sceAtracSetData(int atracID, u32 buffer, u32 bufferSize) { @@ -2055,57 +874,6 @@ static int sceAtracSetAA3DataAndGetID(u32 buffer, u32 bufferSize, u32 fileSize, return _AtracSetData(atracID, buffer, bufferSize, bufferSize, true); } -void Atrac::UpdateContextFromPSPMem() { - if (!context_.IsValid()) { - return; - } - - // Read in any changes from the game to the context. - // TODO: Might be better to just always track in RAM. - bufferState_ = context_->info.state; - // This value is actually abused by games to store the SAS voice number. - loopNum_ = context_->info.loopNum; -} - -void Atrac::WriteContextToPSPMem() { - if (!context_.IsValid()) { - return; - } - // context points into PSP memory. - SceAtracContext *context = context_; - context->info.buffer = first_.addr; - context->info.bufferByte = bufferMaxSize_; - context->info.secondBuffer = second_.addr; - context->info.secondBufferByte = second_.size; - context->info.codec = codecType_; - context->info.loopNum = loopNum_; - context->info.loopStart = loopStartSample_ > 0 ? loopStartSample_ : 0; - context->info.loopEnd = loopEndSample_ > 0 ? loopEndSample_ : 0; - - // Note that we read in the state when loading the atrac object, so it's safe - // to update it back here all the time. Some games, like Sol Trigger, change it. - // TODO: Should we just keep this in PSP ram then, or something? - context->info.state = bufferState_; - if (firstSampleOffset_ != 0) { - context->info.samplesPerChan = firstSampleOffset_ + FirstOffsetExtra(); - } else { - context->info.samplesPerChan = (codecType_ == PSP_MODE_AT_3_PLUS ? ATRAC3PLUS_MAX_SAMPLES : ATRAC3_MAX_SAMPLES); - } - context->info.sampleSize = bytesPerFrame_; - context->info.numChan = channels_; - context->info.dataOff = dataOff_; - context->info.endSample = endSample_ + firstSampleOffset_ + FirstOffsetExtra(); - context->info.dataEnd = first_.filesize; - context->info.curOff = first_.fileoffset; - context->info.decodePos = DecodePosBySample(currentSample_); - context->info.streamDataByte = first_.size - dataOff_; - - u8 *buf = (u8 *)context; - *(u32_le *)(buf + 0xfc) = atracID_; - - NotifyMemInfo(MemBlockFlags::WRITE, context_.ptr, sizeof(SceAtracContext), "AtracContext"); -} - static u32 _sceAtracGetContextAddress(int atracID) { Atrac *atrac = getAtrac(atracID); if (!atrac) { @@ -2133,7 +901,7 @@ struct At3HeaderMap { u8 jointStereo; bool Matches(const Atrac *at) const { - return bytes == at->bytesPerFrame_ && channels == at->channels_; + return bytes == at->BytesPerFrame() && channels == at->Channels(); } }; @@ -2174,7 +942,7 @@ static int sceAtracLowLevelInitDecoder(int atracID, u32 paramsAddr) { } } if (!found) { - ERROR_LOG_REPORT(ME, "AT3 header map lacks entry for bpf: %i channels: %i", atrac->bytesPerFrame_, atrac->channels_); + ERROR_LOG_REPORT(ME, "AT3 header map lacks entry for bpf: %i channels: %i", atrac->BytesPerFrame(), atrac->Channels()); // TODO: Should we return an error code for these values? } } @@ -2186,33 +954,6 @@ static int sceAtracLowLevelInitDecoder(int atracID, u32 paramsAddr) { return hleLogSuccessInfoI(ME, 0, "%s %s audio", codecName, channelName); } -void Atrac::InitLowLevel(u32 paramsAddr, bool jointStereo) { - channels_ = Memory::Read_U32(paramsAddr); - outputChannels_ = Memory::Read_U32(paramsAddr + 4); - bufferMaxSize_ = Memory::Read_U32(paramsAddr + 8); - bytesPerFrame_ = bufferMaxSize_; - first_.writableBytes = bytesPerFrame_; - ResetData(); - - if (codecType_ == PSP_MODE_AT_3) { - bitrate_ = (bytesPerFrame_ * 352800) / 1000; - bitrate_ = (bitrate_ + 511) >> 10; - jointStereo_ = false; - } else if (codecType_ == PSP_MODE_AT_3_PLUS) { - bitrate_ = (bytesPerFrame_ * 352800) / 1000; - bitrate_ = ((bitrate_ >> 11) + 8) & 0xFFFFFFF0; - jointStereo_ = false; - } - - dataOff_ = 0; - first_.size = 0; - first_.filesize = bytesPerFrame_; - bufferState_ = ATRAC_STATUS_LOW_LEVEL; - currentSample_ = 0; - CreateDecoder(); - WriteContextToPSPMem(); -} - static int sceAtracLowLevelDecode(int atracID, u32 sourceAddr, u32 sourceBytesConsumedAddr, u32 samplesAddr, u32 sampleBytesAddr) { auto srcp = PSPPointer::Create(sourceAddr); auto srcConsumed = PSPPointer::Create(sourceBytesConsumedAddr); @@ -2231,7 +972,7 @@ static int sceAtracLowLevelDecode(int atracID, u32 sourceAddr, u32 sourceBytesCo int bytesConsumed = 0; int bytesWritten = 0; - atrac->decoder_->Decode(srcp, atrac->bytesPerFrame_, &bytesConsumed, outp, &bytesWritten); + atrac->GetDecoder()->Decode(srcp, atrac->BytesPerFrame(), &bytesConsumed, outp, &bytesWritten); *srcConsumed = bytesConsumed; *outWritten = bytesWritten; diff --git a/UWP/CoreUWP/CoreUWP.vcxproj b/UWP/CoreUWP/CoreUWP.vcxproj index fde72ab21e..372cf7e0ee 100644 --- a/UWP/CoreUWP/CoreUWP.vcxproj +++ b/UWP/CoreUWP/CoreUWP.vcxproj @@ -174,6 +174,7 @@ + @@ -425,6 +426,7 @@ + diff --git a/UWP/CoreUWP/CoreUWP.vcxproj.filters b/UWP/CoreUWP/CoreUWP.vcxproj.filters index 7e6404054a..1d6c5090dc 100644 --- a/UWP/CoreUWP/CoreUWP.vcxproj.filters +++ b/UWP/CoreUWP/CoreUWP.vcxproj.filters @@ -1199,6 +1199,9 @@ Util + + HLE + @@ -1882,6 +1885,9 @@ Util + + HLE + diff --git a/android/jni/Android.mk b/android/jni/Android.mk index 639a700c50..bd1939220d 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -614,6 +614,7 @@ EXEC_AND_LIB_FILES := \ $(SRC)/Core/HLE/Plugins.cpp \ $(SRC)/Core/HLE/sceAdler.cpp \ $(SRC)/Core/HLE/sceAtrac.cpp \ + $(SRC)/Core/HLE/AtracCtx.cpp \ $(SRC)/Core/HLE/__sceAudio.cpp.arm \ $(SRC)/Core/HLE/sceAudio.cpp.arm \ $(SRC)/Core/HLE/sceAudiocodec.cpp.arm \ diff --git a/libretro/Makefile.common b/libretro/Makefile.common index b07317c493..3aded79f28 100644 --- a/libretro/Makefile.common +++ b/libretro/Makefile.common @@ -651,6 +651,7 @@ SOURCES_CXX += \ $(COREDIR)/HLE/ReplaceTables.cpp \ $(COREDIR)/HLE/HLEHelperThread.cpp \ $(COREDIR)/HLE/HLETables.cpp \ + $(COREDIR)/HLE/AtracCtx.cpp \ $(COREDIR)/HLE/sceAdler.cpp \ $(COREDIR)/HLE/sceAtrac.cpp \ $(COREDIR)/HLE/sceAudio.cpp \ From 2a3b6b8cfb6f0f8740b31a9115c391bcc72a8b22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 14 Apr 2024 16:29:20 +0200 Subject: [PATCH 132/719] Remove unnecessary check, allowing us to de-indent --- Core/HLE/AtracCtx.cpp | 88 +++++++++++++++++++++---------------------- 1 file changed, 43 insertions(+), 45 deletions(-) diff --git a/Core/HLE/AtracCtx.cpp b/Core/HLE/AtracCtx.cpp index b78e68d23a..5b79fb1b23 100644 --- a/Core/HLE/AtracCtx.cpp +++ b/Core/HLE/AtracCtx.cpp @@ -891,54 +891,52 @@ u32 Atrac::DecodeData(u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u32 *finish, i } // TODO: We don't support any other codec type, check seems unnecessary? - if ((codecType_ == PSP_MODE_AT_3 || codecType_ == PSP_MODE_AT_3_PLUS)) { - SeekToSample(currentSample_); + SeekToSample(currentSample_); - bool gotFrame = false; - u32 off = FileOffsetBySample(currentSample_ - skipSamples); - if (off < first_.size) { - uint8_t *indata = BufferStart() + off; - int bytesConsumed = 0; - int outBytes = 0; - if (!decoder_->Decode(indata, bytesPerFrame_, &bytesConsumed, - outbuf, &outBytes)) { - // Decode failed. - *SamplesNum = 0; - *finish = 1; - return ATRAC_ERROR_ALL_DATA_DECODED; - } - gotFrame = true; - - numSamples = outBytes / 4; - uint32_t packetAddr = CurBufferAddress(-skipSamples); - // got a frame - int skipped = std::min((u32)skipSamples, numSamples); - skipSamples -= skipped; - numSamples = numSamples - skipped; - // If we're at the end, clamp to samples we want. It always returns a full chunk. - numSamples = std::min(maxSamples, numSamples); - - if (packetAddr != 0 && MemBlockInfoDetailed()) { - char tagData[128]; - size_t tagSize = FormatMemWriteTagAt(tagData, sizeof(tagData), "AtracDecode/", packetAddr, bytesPerFrame_); - NotifyMemInfo(MemBlockFlags::READ, packetAddr, bytesPerFrame_, tagData, tagSize); - NotifyMemInfo(MemBlockFlags::WRITE, outbufPtr, outBytes, tagData, tagSize); - } else { - NotifyMemInfo(MemBlockFlags::WRITE, outbufPtr, outBytes, "AtracDecode"); - } - // We only want one frame per call, let's continue the next time. + bool gotFrame = false; + u32 off = FileOffsetBySample(currentSample_ - skipSamples); + if (off < first_.size) { + uint8_t *indata = BufferStart() + off; + int bytesConsumed = 0; + int outBytes = 0; + if (!decoder_->Decode(indata, bytesPerFrame_, &bytesConsumed, + outbuf, &outBytes)) { + // Decode failed. + *SamplesNum = 0; + *finish = 1; + return ATRAC_ERROR_ALL_DATA_DECODED; } + gotFrame = true; - if (!gotFrame && currentSample_ < endSample_) { - // Never got a frame. We may have dropped a GHA frame or otherwise have a bug. - // For now, let's try to provide an extra "frame" if possible so games don't infinite loop. - if (FileOffsetBySample(currentSample_) < first_.filesize) { - numSamples = std::min(maxSamples, SamplesPerFrame()); - u32 outBytes = numSamples * outputChannels_ * sizeof(s16); - if (outbuf != nullptr) { - memset(outbuf, 0, outBytes); - NotifyMemInfo(MemBlockFlags::WRITE, outbufPtr, outBytes, "AtracDecode"); - } + numSamples = outBytes / 4; + uint32_t packetAddr = CurBufferAddress(-skipSamples); + // got a frame + int skipped = std::min((u32)skipSamples, numSamples); + skipSamples -= skipped; + numSamples = numSamples - skipped; + // If we're at the end, clamp to samples we want. It always returns a full chunk. + numSamples = std::min(maxSamples, numSamples); + + if (packetAddr != 0 && MemBlockInfoDetailed()) { + char tagData[128]; + size_t tagSize = FormatMemWriteTagAt(tagData, sizeof(tagData), "AtracDecode/", packetAddr, bytesPerFrame_); + NotifyMemInfo(MemBlockFlags::READ, packetAddr, bytesPerFrame_, tagData, tagSize); + NotifyMemInfo(MemBlockFlags::WRITE, outbufPtr, outBytes, tagData, tagSize); + } else { + NotifyMemInfo(MemBlockFlags::WRITE, outbufPtr, outBytes, "AtracDecode"); + } + // We only want one frame per call, let's continue the next time. + } + + if (!gotFrame && currentSample_ < endSample_) { + // Never got a frame. We may have dropped a GHA frame or otherwise have a bug. + // For now, let's try to provide an extra "frame" if possible so games don't infinite loop. + if (FileOffsetBySample(currentSample_) < first_.filesize) { + numSamples = std::min(maxSamples, SamplesPerFrame()); + u32 outBytes = numSamples * outputChannels_ * sizeof(s16); + if (outbuf != nullptr) { + memset(outbuf, 0, outBytes); + NotifyMemInfo(MemBlockFlags::WRITE, outbufPtr, outBytes, "AtracDecode"); } } } From c9f5ccee3ed9beddd24c4b6bdc49c8b122601417 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 14 Apr 2024 16:30:05 +0200 Subject: [PATCH 133/719] Add comment --- Core/HLE/AtracCtx.h | 11 ++++------- Core/HLE/sceAtrac.cpp | 2 ++ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Core/HLE/AtracCtx.h b/Core/HLE/AtracCtx.h index 8e0123bee4..ba25ccf127 100644 --- a/Core/HLE/AtracCtx.h +++ b/Core/HLE/AtracCtx.h @@ -162,25 +162,22 @@ struct Atrac { int RemainingFrames() const; - int atracID_ = -1; - u8 *dataBuf_ = nullptr; + // Offset of the first sample in the input buffer + int dataOff_ = 0; // Indicates that the dataBuf_ array should not be used. bool ignoreDataBuf_ = false; - u32 decodePos_ = 0; + int atracID_ = -1; u16 channels_ = 0; u16 outputChannels_ = 2; int currentSample_ = 0; int endSample_ = 0; int firstSampleOffset_ = 0; - // Offset of the first sample in the input buffer - int dataOff_ = 0; std::vector loopinfo_; - int loopStartSample_ = -1; int loopEndSample_ = -1; int loopNum_ = 0; @@ -255,7 +252,7 @@ private: u32 bufferMaxSize_ = 0; int jointStereo_ = 0; - // Used by low-level decoding and to track streaming. + // Used to track streaming. u32 bufferPos_ = 0; u32 bufferValidBytes_ = 0; u32 bufferHeaderSize_ = 0; diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp index 1d395eba85..410490237d 100644 --- a/Core/HLE/sceAtrac.cpp +++ b/Core/HLE/sceAtrac.cpp @@ -291,6 +291,7 @@ static u32 sceAtracGetBufferInfoForResetting(int atracID, int sample, u32 buffer } else if (atrac->BufferState() == ATRAC_STATUS_STREAMED_LOOP_WITH_TRAILER && atrac->second_.size == 0) { return hleReportError(ME, ATRAC_ERROR_SECOND_BUFFER_NEEDED, "no second buffer"); } else if ((u32)sample + atrac->firstSampleOffset_ > (u32)atrac->endSample_ + atrac->firstSampleOffset_) { + // NOTE: Above we have to add firstSampleOffset to both sides - we seem to rely on wraparound. return hleLogWarning(ME, ATRAC_ERROR_BAD_SAMPLE, "invalid sample position"); } else { atrac->GetResetBufferInfo(bufferInfo, sample); @@ -544,6 +545,7 @@ static u32 sceAtracResetPlayPosition(int atracID, int sample, int bytesWrittenFi if (atrac->BufferState() == ATRAC_STATUS_STREAMED_LOOP_WITH_TRAILER && atrac->second_.size == 0) { return hleReportError(ME, ATRAC_ERROR_SECOND_BUFFER_NEEDED, "no second buffer"); } else if ((u32)sample + atrac->firstSampleOffset_ > (u32)atrac->endSample_ + atrac->firstSampleOffset_) { + // NOTE: Above we have to add firstSampleOffset to both sides - we seem to rely on wraparound. return hleLogWarning(ME, ATRAC_ERROR_BAD_SAMPLE, "invalid sample position"); } From bd84e3055327f7d8c172072490245f41aca6d042 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 14 Apr 2024 17:44:12 +0200 Subject: [PATCH 134/719] Start breaking out Analyze* functions --- Core/HLE/AtracCtx.cpp | 49 ++++++++++++++++++++++--------------------- Core/HLE/AtracCtx.h | 12 +++++++---- 2 files changed, 33 insertions(+), 28 deletions(-) diff --git a/Core/HLE/AtracCtx.cpp b/Core/HLE/AtracCtx.cpp index 5b79fb1b23..4e676029ff 100644 --- a/Core/HLE/AtracCtx.cpp +++ b/Core/HLE/AtracCtx.cpp @@ -238,32 +238,32 @@ int Atrac::Analyze(u32 addr, u32 size) { AnalyzeReset(); // 72 is about the size of the minimum required data to even be valid. - if (first_.size < 72) { + if (size < 72) { return hleReportError(ME, ATRAC_ERROR_SIZE_TOO_SMALL, "buffer too small"); } // TODO: Check the range (addr, size) instead. - if (!Memory::IsValidAddress(first_.addr)) { + if (!Memory::IsValidAddress(addr)) { return hleReportWarning(ME, SCE_KERNEL_ERROR_ILLEGAL_ADDRESS, "invalid buffer address"); } // TODO: Validate stuff. - if (Memory::ReadUnchecked_U32(first_.addr) != RIFF_CHUNK_MAGIC) { + if (Memory::ReadUnchecked_U32(addr) != RIFF_CHUNK_MAGIC) { return hleReportError(ME, ATRAC_ERROR_UNKNOWN_FORMAT, "invalid RIFF header"); } u32 offset = 8; firstSampleOffset_ = 0; - while (Memory::Read_U32(first_.addr + offset) != RIFF_WAVE_MAGIC) { + while (Memory::Read_U32(addr + offset) != RIFF_WAVE_MAGIC) { // Get the size preceding the magic. - int chunk = Memory::Read_U32(first_.addr + offset - 4); + int chunk = Memory::Read_U32(addr + offset - 4); // Round the chunk size up to the nearest 2. offset += chunk + (chunk & 1); - if (offset + 12 > first_.size) { + if (offset + 12 > size) { return hleReportError(ME, ATRAC_ERROR_SIZE_TOO_SMALL, "too small for WAVE chunk at %d", offset); } - if (Memory::Read_U32(first_.addr + offset) != RIFF_CHUNK_MAGIC) { + if (Memory::Read_U32(addr + offset) != RIFF_CHUNK_MAGIC) { return hleReportError(ME, ATRAC_ERROR_UNKNOWN_FORMAT, "RIFF chunk did not contain WAVE"); } offset += 8; @@ -275,16 +275,18 @@ int Atrac::Analyze(u32 addr, u32 size) { } // RIFF size excluding chunk header. - first_.filesize = Memory::Read_U32(first_.addr + offset - 8) + 8; + first_.filesize = Memory::Read_U32(addr + offset - 8) + 8; + // Even if the RIFF size is too low, it may simply be incorrect. This works on real firmware. - u32 maxSize = std::max(first_.filesize, first_.size); + u32 maxSize = std::max(first_.filesize, size); bool bfoundData = false; u32 dataChunkSize = 0; int sampleOffsetAdjust = 0; + while (maxSize >= offset + 8 && !bfoundData) { - int chunkMagic = Memory::Read_U32(first_.addr + offset); - u32 chunkSize = Memory::Read_U32(first_.addr + offset + 4); + int chunkMagic = Memory::Read_U32(addr + offset); + u32 chunkSize = Memory::Read_U32(addr + offset + 4); // Account for odd sized chunks. if (chunkSize & 1) { WARN_LOG_REPORT_ONCE(oddchunk, ME, "RIFF chunk had uneven size"); @@ -300,7 +302,7 @@ int Atrac::Analyze(u32 addr, u32 size) { return hleReportError(ME, ATRAC_ERROR_UNKNOWN_FORMAT, "multiple fmt definitions"); } - auto at3fmt = PSPPointer::Create(first_.addr + offset); + auto at3fmt = PSPPointer::Create(addr + offset); if (chunkSize < 32 || (at3fmt->fmtTag == AT3_PLUS_MAGIC && chunkSize < 52)) { return hleReportError(ME, ATRAC_ERROR_UNKNOWN_FORMAT, "fmt definition too small (%d)", chunkSize); } @@ -330,18 +332,18 @@ int Atrac::Analyze(u32 addr, u32 size) { if (at3fmt->fmtTag == AT3_MAGIC) { // This is the offset to the jointStereo_ field. - jointStereo_ = Memory::Read_U32(first_.addr + offset + 24); + jointStereo_ = Memory::Read_U32(addr + offset + 24); } } break; case FACT_CHUNK_MAGIC: { - endSample_ = Memory::Read_U32(first_.addr + offset); + endSample_ = Memory::Read_U32(addr + offset); if (chunkSize >= 8) { - firstSampleOffset_ = Memory::Read_U32(first_.addr + offset + 4); + firstSampleOffset_ = Memory::Read_U32(addr + offset + 4); } if (chunkSize >= 12) { - u32 largerOffset = Memory::Read_U32(first_.addr + offset + 8); + u32 largerOffset = Memory::Read_U32(addr + offset + 8); sampleOffsetAdjust = firstSampleOffset_ - largerOffset; } } @@ -351,7 +353,7 @@ int Atrac::Analyze(u32 addr, u32 size) { if (chunkSize < 32) { return hleReportError(ME, ATRAC_ERROR_UNKNOWN_FORMAT, "smpl chunk too small (%d)", chunkSize); } - int checkNumLoops = Memory::Read_U32(first_.addr + offset + 28); + int checkNumLoops = Memory::Read_U32(addr + offset + 28); if (checkNumLoops != 0 && chunkSize < 36 + 20) { return hleReportError(ME, ATRAC_ERROR_UNKNOWN_FORMAT, "smpl chunk too small for loop (%d, %d)", checkNumLoops, chunkSize); } @@ -360,7 +362,7 @@ int Atrac::Analyze(u32 addr, u32 size) { } loopinfo_.resize(checkNumLoops); - u32 loopinfoAddr = first_.addr + offset + 36; + u32 loopinfoAddr = addr + offset + 36; // The PSP only cares about the first loop start and end, it seems. // Most likely can skip the rest of this data, but it's not hurting anyone. for (int i = 0; i < checkNumLoops && 36 + (u32)i < chunkSize; i++, loopinfoAddr += 24) { @@ -430,25 +432,25 @@ int Atrac::AnalyzeAA3(u32 addr, u32 size, u32 filesize) { AnalyzeReset(); - if (first_.size < 10) { + if (size < 10) { return hleReportError(ME, ATRAC_ERROR_AA3_SIZE_TOO_SMALL, "buffer too small"); } // TODO: Make sure this validation is correct, more testing. - const u8 *buffer = Memory::GetPointer(first_.addr); + const u8 *buffer = Memory::GetPointer(addr); if (buffer[0] != 'e' || buffer[1] != 'a' || buffer[2] != '3') { return hleReportError(ME, ATRAC_ERROR_AA3_INVALID_DATA, "invalid ea3 magic bytes"); } // It starts with an id3 header (replaced with ea3.) This is the size. u32 tagSize = buffer[9] | (buffer[8] << 7) | (buffer[7] << 14) | (buffer[6] << 21); - if (first_.size < tagSize + 36) { + if (size < tagSize + 36) { return hleReportError(ME, ATRAC_ERROR_AA3_SIZE_TOO_SMALL, "truncated before id3 end"); } // EA3 header starts at id3 header (10) + tagSize. - buffer = Memory::GetPointer(first_.addr + 10 + tagSize); + buffer = Memory::GetPointer(addr + 10 + tagSize); if (buffer[0] != 'E' || buffer[1] != 'A' || buffer[2] != '3') { return hleReportError(ME, ATRAC_ERROR_AA3_INVALID_DATA, "invalid EA3 magic bytes"); } @@ -482,10 +484,9 @@ int Atrac::AnalyzeAA3(u32 addr, u32 size, u32 filesize) { dataOff_ = 10 + tagSize + 96; firstSampleOffset_ = 0; if (endSample_ < 0 && bytesPerFrame_ != 0) { - endSample_ = ((first_.filesize - dataOff_) / bytesPerFrame_) * SamplesPerFrame(); + endSample_ = ((filesize - dataOff_) / bytesPerFrame_) * SamplesPerFrame(); } endSample_ -= 1; - return 0; } diff --git a/Core/HLE/AtracCtx.h b/Core/HLE/AtracCtx.h index ba25ccf127..3764e69e3f 100644 --- a/Core/HLE/AtracCtx.h +++ b/Core/HLE/AtracCtx.h @@ -100,6 +100,10 @@ struct AtracLoopInfo { class AudioDecoder; +inline u32 FirstOffsetExtra(int codecType) { + return codecType == PSP_MODE_AT_3_PLUS ? 368 : 69; +} + struct Atrac { ~Atrac() { ResetData(); @@ -137,10 +141,6 @@ struct Atrac { return codecType_ == PSP_MODE_AT_3_PLUS ? ATRAC3PLUS_MAX_SAMPLES : ATRAC3_MAX_SAMPLES; } - u32 FirstOffsetExtra() const { - return codecType_ == PSP_MODE_AT_3_PLUS ? 368 : 69; - } - u32 DecodePosBySample(int sample) const { return (u32)(firstSampleOffset_ + sample / (int)SamplesPerFrame() * bytesPerFrame_); } @@ -214,6 +214,10 @@ struct Atrac { void CalculateStreamInfo(u32 *readOffset); + u32 FirstOffsetExtra() const { + return ::FirstOffsetExtra(codecType_); + } + u32 StreamBufferEnd() const { // The buffer is always aligned to a frame in size, not counting an optional header. // The header will only initially exist after the data is first set. From efd9962c6e3c05a4402f1cd471d27c2e8fbfe765 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 14 Apr 2024 18:00:24 +0200 Subject: [PATCH 135/719] Start separating out static track parameters: Move first_.filesize to track_.fileSize --- Core/HLE/AtracCtx.cpp | 97 ++++++++++++++++++++++++++++--------------- Core/HLE/AtracCtx.h | 15 +++++-- Core/HLE/sceAtrac.cpp | 12 +----- 3 files changed, 76 insertions(+), 48 deletions(-) diff --git a/Core/HLE/AtracCtx.cpp b/Core/HLE/AtracCtx.cpp index 4e676029ff..c4f607ec2e 100644 --- a/Core/HLE/AtracCtx.cpp +++ b/Core/HLE/AtracCtx.cpp @@ -49,7 +49,14 @@ void Atrac::DoState(PointerWrap &p) { } Do(p, atracID_); + if (p.mode != p.MODE_READ) { + first_._filesize_dontuse = track_.fileSize; + } Do(p, first_); + if (p.mode == p.MODE_READ) { + track_.fileSize = first_._filesize_dontuse; + } + Do(p, bufferMaxSize_); Do(p, codecType_); @@ -68,10 +75,10 @@ void Atrac::DoState(PointerWrap &p) { if (p.mode == p.MODE_READ) { if (dataBuf_) delete[] dataBuf_; - dataBuf_ = new u8[first_.filesize + overAllocBytes]; - memset(dataBuf_, 0, first_.filesize + overAllocBytes); + dataBuf_ = new u8[track_.fileSize + overAllocBytes]; + memset(dataBuf_, 0, track_.fileSize + overAllocBytes); } - DoArray(p, dataBuf_, first_.filesize); + DoArray(p, dataBuf_, track_.fileSize); } Do(p, second_); @@ -212,7 +219,7 @@ void Atrac::WriteContextToPSPMem() { context->info.numChan = channels_; context->info.dataOff = dataOff_; context->info.endSample = endSample_ + firstSampleOffset_ + FirstOffsetExtra(); - context->info.dataEnd = first_.filesize; + context->info.dataEnd = track_.fileSize; context->info.curOff = first_.fileoffset; context->info.decodePos = DecodePosBySample(currentSample_); context->info.streamDataByte = first_.size - dataOff_; @@ -224,6 +231,9 @@ void Atrac::WriteContextToPSPMem() { } int Atrac::Analyze(u32 addr, u32 size) { + Track *track = &track_; + *track = {}; + struct RIFFFmtChunk { u16_le fmtTag; u16_le channels; @@ -232,6 +242,7 @@ int Atrac::Analyze(u32 addr, u32 size) { u16_le blockAlign; }; + first_ = {}; first_.addr = addr; first_.size = size; @@ -275,10 +286,10 @@ int Atrac::Analyze(u32 addr, u32 size) { } // RIFF size excluding chunk header. - first_.filesize = Memory::Read_U32(addr + offset - 8) + 8; + track->fileSize = Memory::Read_U32(addr + offset - 8) + 8; // Even if the RIFF size is too low, it may simply be incorrect. This works on real firmware. - u32 maxSize = std::max(first_.filesize, size); + u32 maxSize = std::max(track->fileSize, size); bool bfoundData = false; u32 dataChunkSize = 0; @@ -384,9 +395,9 @@ int Atrac::Analyze(u32 addr, u32 size) { bfoundData = true; dataOff_ = offset; dataChunkSize = chunkSize; - if (first_.filesize < offset + chunkSize) { + if (track->fileSize < offset + chunkSize) { WARN_LOG_REPORT(ME, "Atrac data chunk extends beyond riff chunk"); - first_.filesize = offset + chunkSize; + track->fileSize = offset + chunkSize; } } break; @@ -422,13 +433,18 @@ int Atrac::Analyze(u32 addr, u32 size) { return hleReportError(ME, ATRAC_ERROR_BAD_CODEC_PARAMS, "loop after end of data"); } + first_._filesize_dontuse = track->fileSize; return 0; } int Atrac::AnalyzeAA3(u32 addr, u32 size, u32 filesize) { + Track *track = &track_; + *track = {}; + first_.addr = addr; first_.size = size; - first_.filesize = filesize; + track->fileSize = filesize; + first_._filesize_dontuse = filesize; AnalyzeReset(); @@ -501,7 +517,7 @@ void Atrac::CalculateStreamInfo(u32 *outReadOffset) { // If we're buffering the entire file, just give the same as readOffset. first_.offset = readOffset; // In this case, the bytes writable are just the remaining bytes, always. - first_.writableBytes = first_.filesize - readOffset; + first_.writableBytes = track_.fileSize - readOffset; } else { u32 bufferEnd = StreamBufferEnd(); u32 bufferValidExtended = bufferPos_ + bufferValidBytes_; @@ -514,7 +530,7 @@ void Atrac::CalculateStreamInfo(u32 *outReadOffset) { first_.writableBytes = bufferPos_ - bufferStartUsed; } - if (readOffset >= first_.filesize) { + if (readOffset >= track_.fileSize) { if (bufferState_ == ATRAC_STATUS_STREAMED_WITHOUT_LOOP) { // We don't need anything more, so all 0s. readOffset = 0; @@ -525,9 +541,9 @@ void Atrac::CalculateStreamInfo(u32 *outReadOffset) { } } - if (readOffset + first_.writableBytes > first_.filesize) { + if (readOffset + first_.writableBytes > track_.fileSize) { // Never ask for past the end of file, even when the space is free. - first_.writableBytes = first_.filesize - readOffset; + first_.writableBytes = track_.fileSize - readOffset; } // If you don't think this should be here, remove it. It's just a temporary safety check. @@ -577,7 +593,7 @@ void Atrac::GetResetBufferInfo(AtracResetBufferInfo *bufferInfo, int sample) { // Here the message is: you need to read at least this many bytes to get to that position. // This is because we're filling the buffer start to finish, not streaming. bufferInfo->first.writePosPtr = first_.addr + first_.size; - bufferInfo->first.writableBytes = first_.filesize - first_.size; + bufferInfo->first.writableBytes = track_.fileSize - first_.size; int minWriteBytes = FileOffsetBySample(sample) - first_.size; if (minWriteBytes > 0) { bufferInfo->first.minWriteBytes = minWriteBytes; @@ -594,7 +610,7 @@ void Atrac::GetResetBufferInfo(AtracResetBufferInfo *bufferInfo, int sample) { const int needsMoreFrames = FirstOffsetExtra(); bufferInfo->first.writePosPtr = first_.addr; - bufferInfo->first.writableBytes = std::min(first_.filesize - sampleFileOffset, bufSizeAligned); + bufferInfo->first.writableBytes = std::min(track_.fileSize - sampleFileOffset, bufSizeAligned); if (((sample + firstSampleOffset_) % (int)SamplesPerFrame()) >= (int)SamplesPerFrame() - needsMoreFrames) { // Not clear why, but it seems it wants a bit extra in case the sample is late? bufferInfo->first.minWriteBytes = bytesPerFrame_ * 3; @@ -625,8 +641,8 @@ int Atrac::SetData(u32 buffer, u32 readSize, u32 bufferSize, int successCode) { first_.addr = buffer; first_.size = readSize; - if (first_.size > first_.filesize) - first_.size = first_.filesize; + if (first_.size > track_.fileSize) + first_.size = track_.fileSize; first_.fileoffset = first_.size; // got the size of temp buf, and calculate offset @@ -661,10 +677,10 @@ int Atrac::SetData(u32 buffer, u32 readSize, u32 bufferSize, int successCode) { // Over-allocate databuf to prevent going off the end if the bitstream is bad or if there are // bugs in the decoder. This happens, see issue #15788. Arbitrary, but let's make it a whole page on the popular // architecture that has the largest pages (M1). - dataBuf_ = new u8[first_.filesize + overAllocBytes]; - memset(dataBuf_, 0, first_.filesize + overAllocBytes); + dataBuf_ = new u8[track_.fileSize + overAllocBytes]; + memset(dataBuf_, 0, track_.fileSize + overAllocBytes); if (!ignoreDataBuf_) { - u32 copybytes = std::min(bufferSize, first_.filesize); + u32 copybytes = std::min(bufferSize, track_.fileSize); Memory::Memcpy(dataBuf_, buffer, copybytes, "AtracSetData"); } CreateDecoder(); @@ -673,7 +689,7 @@ int Atrac::SetData(u32 buffer, u32 readSize, u32 bufferSize, int successCode) { u32 Atrac::SetSecondBuffer(u32 secondBuffer, u32 secondBufferSize) { u32 secondFileOffset = FileOffsetBySample(loopEndSample_ - firstSampleOffset_); - u32 desiredSize = first_.filesize - secondFileOffset; + u32 desiredSize = track_.fileSize - secondFileOffset; // 3 seems to be the number of frames required to handle a loop. if (secondBufferSize < desiredSize && secondBufferSize < (u32)BytesPerFrame() * 3) { @@ -689,6 +705,19 @@ u32 Atrac::SetSecondBuffer(u32 secondBuffer, u32 secondBufferSize) { return hleLogSuccessI(ME, 0); } +int Atrac::GetSecondBufferInfo(u32 *fileOffset, u32 *desiredSize) { + if (BufferState() != ATRAC_STATUS_STREAMED_LOOP_WITH_TRAILER) { + // Writes zeroes in this error case. + *fileOffset = 0; + *desiredSize = 0; + return hleLogWarning(ME, ATRAC_ERROR_SECOND_BUFFER_NOT_NEEDED, "not needed"); + } + + *fileOffset = FileOffsetBySample(loopEndSample_ - firstSampleOffset_); + *desiredSize = track_.fileSize - *fileOffset; + return hleLogSuccessI(ME, 0); +} + void Atrac::UpdateBitrate() { bitrate_ = (bytesPerFrame_ * 352800) / 1000; if (codecType_ == PSP_MODE_AT_3_PLUS) @@ -705,15 +734,15 @@ int Atrac::AddStreamData(u32 bytesToAdd) { if (bytesToAdd > 0) { first_.fileoffset = readOffset; - int addbytes = std::min(bytesToAdd, first_.filesize - first_.fileoffset); + int addbytes = std::min(bytesToAdd, track_.fileSize - first_.fileoffset); if (!ignoreDataBuf_) { Memory::Memcpy(dataBuf_ + first_.fileoffset, first_.addr + first_.offset, addbytes, "AtracAddStreamData"); } first_.fileoffset += addbytes; } first_.size += bytesToAdd; - if (first_.size >= first_.filesize) { - first_.size = first_.filesize; + if (first_.size >= track_.fileSize) { + first_.size = track_.fileSize; if (bufferState_ == ATRAC_STATUS_HALFWAY_BUFFER) bufferState_ = ATRAC_STATUS_ALL_DATA_LOADED; WriteContextToPSPMem(); @@ -731,11 +760,11 @@ int Atrac::AddStreamData(u32 bytesToAdd) { } u32 Atrac::AddStreamDataSas(u32 bufPtr, u32 bytesToAdd) { - int addbytes = std::min(bytesToAdd, first_.filesize - first_.fileoffset - FirstOffsetExtra()); + int addbytes = std::min(bytesToAdd, track_.fileSize - first_.fileoffset - FirstOffsetExtra()); Memory::Memcpy(dataBuf_ + first_.fileoffset + FirstOffsetExtra(), bufPtr, addbytes, "AtracAddStreamData"); first_.size += bytesToAdd; - if (first_.size >= first_.filesize) { - first_.size = first_.filesize; + if (first_.size >= track_.fileSize) { + first_.size = track_.fileSize; if (bufferState_ == ATRAC_STATUS_HALFWAY_BUFFER) bufferState_ = ATRAC_STATUS_ALL_DATA_LOADED; } @@ -811,7 +840,7 @@ int Atrac::RemainingFrames() const { } u32 currentFileOffset = FileOffsetBySample(currentSample_ - SamplesPerFrame() + FirstOffsetExtra()); - if (first_.fileoffset >= first_.filesize) { + if (first_.fileoffset >= track_.fileSize) { if (bufferState_ == ATRAC_STATUS_STREAMED_WITHOUT_LOOP) { return PSP_ATRAC_NONLOOP_STREAM_DATA_IS_ON_MEMORY; } @@ -932,7 +961,7 @@ u32 Atrac::DecodeData(u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u32 *finish, i if (!gotFrame && currentSample_ < endSample_) { // Never got a frame. We may have dropped a GHA frame or otherwise have a bug. // For now, let's try to provide an extra "frame" if possible so games don't infinite loop. - if (FileOffsetBySample(currentSample_) < first_.filesize) { + if (FileOffsetBySample(currentSample_) < track_.fileSize) { numSamples = std::min(maxSamples, SamplesPerFrame()); u32 outBytes = numSamples * outputChannels_ * sizeof(s16); if (outbuf != nullptr) { @@ -951,7 +980,7 @@ u32 Atrac::DecodeData(u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u32 *finish, i int finishFlag = 0; // TODO: Verify. - bool hitEnd = currentSample_ >= endSample_ || (numSamples == 0 && first_.size >= first_.filesize); + bool hitEnd = currentSample_ >= endSample_ || (numSamples == 0 && first_.size >= track_.fileSize); int loopEndAdjusted = loopEndSample_ - FirstOffsetExtra() - firstSampleOffset_; if ((hitEnd || currentSample_ > loopEndAdjusted) && loopNum != 0) { SeekToSample(loopStartSample_ - FirstOffsetExtra() - firstSampleOffset_); @@ -1020,12 +1049,12 @@ u32 Atrac::ResetPlayPosition(int sample, int bytesWrittenFirstBuf, int bytesWrit } // Did we transition to a full buffer? - if (first_.size >= first_.filesize) { - first_.size = first_.filesize; + if (first_.size >= track_.fileSize) { + first_.size = track_.fileSize; bufferState_ = ATRAC_STATUS_ALL_DATA_LOADED; } } else { - if (bufferInfo.first.filePos > first_.filesize) { + if (bufferInfo.first.filePos > track_.fileSize) { return hleDelayResult(hleLogError(ME, ATRAC_ERROR_API_FAIL, "invalid file position"), "reset play pos", 200); } @@ -1074,7 +1103,7 @@ void Atrac::InitLowLevel(u32 paramsAddr, bool jointStereo) { dataOff_ = 0; first_.size = 0; - first_.filesize = bytesPerFrame_; + track_.fileSize = bytesPerFrame_; // not really meaningful bufferState_ = ATRAC_STATUS_LOW_LEVEL; currentSample_ = 0; CreateDecoder(); diff --git a/Core/HLE/AtracCtx.h b/Core/HLE/AtracCtx.h index 3764e69e3f..d824f6a107 100644 --- a/Core/HLE/AtracCtx.h +++ b/Core/HLE/AtracCtx.h @@ -72,6 +72,8 @@ const int PSP_ATRAC_ALLDATA_IS_ON_MEMORY = -1; const int PSP_ATRAC_NONLOOP_STREAM_DATA_IS_ON_MEMORY = -2; const int PSP_ATRAC_LOOP_STREAM_DATA_IS_ON_MEMORY = -3; +// This is not a PSP-native struct. +// But, it's stored in its entirety in savestates, which makes it awkward to change it. struct InputBuffer { // Address of the buffer. u32 addr; @@ -84,7 +86,7 @@ struct InputBuffer { // Unused, always 0. u32 neededBytes; // Total size of the entire file data. - u32 filesize; + u32 _filesize_dontuse; // Offset into the file at which new data is read. u32 fileoffset; }; @@ -104,6 +106,10 @@ inline u32 FirstOffsetExtra(int codecType) { return codecType == PSP_MODE_AT_3_PLUS ? 368 : 69; } +struct Track { + u32 fileSize; +}; + struct Atrac { ~Atrac() { ResetData(); @@ -111,8 +117,8 @@ struct Atrac { void ResetData(); void UpdateBufferState() { - if (bufferMaxSize_ >= first_.filesize) { - if (first_.size < first_.filesize) { + if (bufferMaxSize_ >= track_.fileSize) { + if (first_.size < track_.fileSize) { // The buffer is big enough, but we don't have all the data yet. bufferState_ = ATRAC_STATUS_HALFWAY_BUFFER; } else { @@ -185,6 +191,8 @@ struct Atrac { InputBuffer first_{}; InputBuffer second_{}; + Track track_{}; + PSPPointer context_{}; AtracStatus BufferState() const { @@ -239,6 +247,7 @@ struct Atrac { void GetResetBufferInfo(AtracResetBufferInfo *bufferInfo, int sample); int SetData(u32 buffer, u32 readSize, u32 bufferSize, int successCode = 0); u32 SetSecondBuffer(u32 secondBuffer, u32 secondBufferSize); + int GetSecondBufferInfo(u32 *fileOffset, u32 *desiredSize); u32 DecodeData(u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u32 *finish, int *remains); void ConsumeFrame(); u32 GetNextSamples(); diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp index 410490237d..689b9592c4 100644 --- a/Core/HLE/sceAtrac.cpp +++ b/Core/HLE/sceAtrac.cpp @@ -462,17 +462,7 @@ static u32 sceAtracGetSecondBufferInfo(int atracID, u32 fileOffsetAddr, u32 desi return hleReportError(ME, SCE_KERNEL_ERROR_ILLEGAL_ADDR, "invalid addresses"); } - if (atrac->BufferState() != ATRAC_STATUS_STREAMED_LOOP_WITH_TRAILER) { - // Writes zeroes in this error case. - *fileOffset = 0; - *desiredSize = 0; - return hleLogWarning(ME, ATRAC_ERROR_SECOND_BUFFER_NOT_NEEDED, "not needed"); - } - - *fileOffset = atrac->FileOffsetBySample(atrac->loopEndSample_ - atrac->firstSampleOffset_); - *desiredSize = atrac->first_.filesize - *fileOffset; - - return hleLogSuccessI(ME, 0); + return atrac->GetSecondBufferInfo(fileOffset, desiredSize); } static u32 sceAtracGetSoundSample(int atracID, u32 outEndSampleAddr, u32 outLoopStartSampleAddr, u32 outLoopEndSampleAddr) { From babf2e1a3a4d246d7cc4653820c33d23b534b431 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 14 Apr 2024 18:04:39 +0200 Subject: [PATCH 136/719] Move codecType_ into track_ --- Core/HLE/AtracCtx.cpp | 33 ++++++++++++++++----------------- Core/HLE/AtracCtx.h | 11 +++++------ Core/HLE/sceAtrac.cpp | 13 ++++--------- 3 files changed, 25 insertions(+), 32 deletions(-) diff --git a/Core/HLE/AtracCtx.cpp b/Core/HLE/AtracCtx.cpp index c4f607ec2e..0aa1858109 100644 --- a/Core/HLE/AtracCtx.cpp +++ b/Core/HLE/AtracCtx.cpp @@ -58,7 +58,7 @@ void Atrac::DoState(PointerWrap &p) { } Do(p, bufferMaxSize_); - Do(p, codecType_); + Do(p, track_.codecType); Do(p, currentSample_); Do(p, endSample_); @@ -167,7 +167,6 @@ void Atrac::ResetData() { void Atrac::AnalyzeReset() { // Reset some values. - codecType_ = 0; currentSample_ = 0; endSample_ = -1; loopNum_ = 0; @@ -201,7 +200,7 @@ void Atrac::WriteContextToPSPMem() { context->info.bufferByte = bufferMaxSize_; context->info.secondBuffer = second_.addr; context->info.secondBufferByte = second_.size; - context->info.codec = codecType_; + context->info.codec = track_.codecType; context->info.loopNum = loopNum_; context->info.loopStart = loopStartSample_ > 0 ? loopStartSample_ : 0; context->info.loopEnd = loopEndSample_ > 0 ? loopEndSample_ : 0; @@ -213,7 +212,7 @@ void Atrac::WriteContextToPSPMem() { if (firstSampleOffset_ != 0) { context->info.samplesPerChan = firstSampleOffset_ + FirstOffsetExtra(); } else { - context->info.samplesPerChan = (codecType_ == PSP_MODE_AT_3_PLUS ? ATRAC3PLUS_MAX_SAMPLES : ATRAC3_MAX_SAMPLES); + context->info.samplesPerChan = (track_.codecType == PSP_MODE_AT_3_PLUS ? ATRAC3PLUS_MAX_SAMPLES : ATRAC3_MAX_SAMPLES); } context->info.sampleSize = bytesPerFrame_; context->info.numChan = channels_; @@ -309,7 +308,7 @@ int Atrac::Analyze(u32 addr, u32 size) { switch (chunkMagic) { case FMT_CHUNK_MAGIC: { - if (codecType_ != 0) { + if (track->codecType != 0) { return hleReportError(ME, ATRAC_ERROR_UNKNOWN_FORMAT, "multiple fmt definitions"); } @@ -319,9 +318,9 @@ int Atrac::Analyze(u32 addr, u32 size) { } if (at3fmt->fmtTag == AT3_MAGIC) - codecType_ = PSP_MODE_AT_3; + track->codecType = PSP_MODE_AT_3; else if (at3fmt->fmtTag == AT3_PLUS_MAGIC) - codecType_ = PSP_MODE_AT_3_PLUS; + track->codecType = PSP_MODE_AT_3_PLUS; else { return hleReportError(ME, ATRAC_ERROR_UNKNOWN_FORMAT, "invalid fmt magic: %04x", at3fmt->fmtTag); } @@ -405,7 +404,7 @@ int Atrac::Analyze(u32 addr, u32 size) { offset += chunkSize; } - if (codecType_ == 0) { + if (track->codecType == 0) { return hleReportError(ME, ATRAC_ERROR_UNKNOWN_FORMAT, "could not detect codec"); } @@ -477,14 +476,14 @@ int Atrac::AnalyzeAA3(u32 addr, u32 size, u32 filesize) { switch (buffer[32]) { case 0: - codecType_ = PSP_MODE_AT_3; + track->codecType = PSP_MODE_AT_3; bytesPerFrame_ = (codecParams & 0x03FF) * 8; bitrate_ = at3SampleRates[(codecParams >> 13) & 7] * bytesPerFrame_ * 8 / 1024; channels_ = 2; jointStereo_ = (codecParams >> 17) & 1; break; case 1: - codecType_ = PSP_MODE_AT_3_PLUS; + track->codecType = PSP_MODE_AT_3_PLUS; bytesPerFrame_ = ((codecParams & 0x03FF) * 8) + 8; bitrate_ = at3SampleRates[(codecParams >> 13) & 7] * bytesPerFrame_ * 8 / 2048; channels_ = (codecParams >> 10) & 7; @@ -565,7 +564,7 @@ void Atrac::CreateDecoder() { } // First, init the standalone decoder. Only used for low-level-decode initially, but simple. - if (codecType_ == PSP_MODE_AT_3) { + if (track_.codecType == PSP_MODE_AT_3) { // We don't pull this from the RIFF so that we can support OMA also. uint8_t extraData[14]{}; // The only thing that changes are the jointStereo_ values. @@ -653,7 +652,7 @@ int Atrac::SetData(u32 buffer, u32 readSize, u32 bufferSize, int successCode) { ResetData(); UpdateBufferState(); - if (codecType_ != PSP_MODE_AT_3 && codecType_ != PSP_MODE_AT_3_PLUS) { + if (track_.codecType != PSP_MODE_AT_3 && track_.codecType != PSP_MODE_AT_3_PLUS) { // Shouldn't have gotten here, Analyze() checks this. bufferState_ = ATRAC_STATUS_NO_DATA; return hleReportError(ME, ATRAC_ERROR_UNKNOWN_FORMAT, "unexpected codec type in set data"); @@ -671,7 +670,7 @@ int Atrac::SetData(u32 buffer, u32 readSize, u32 bufferSize, int successCode) { bufferValidBytes_ = first_.size - bufferPos_; } - const char *codecName = codecType_ == PSP_MODE_AT_3 ? "atrac3" : "atrac3+"; + const char *codecName = track_.codecType == PSP_MODE_AT_3 ? "atrac3" : "atrac3+"; const char *channelName = channels_ == 1 ? "mono" : "stereo"; // Over-allocate databuf to prevent going off the end if the bitstream is bad or if there are @@ -720,7 +719,7 @@ int Atrac::GetSecondBufferInfo(u32 *fileOffset, u32 *desiredSize) { void Atrac::UpdateBitrate() { bitrate_ = (bytesPerFrame_ * 352800) / 1000; - if (codecType_ == PSP_MODE_AT_3_PLUS) + if (track_.codecType == PSP_MODE_AT_3_PLUS) bitrate_ = ((bitrate_ >> 11) + 8) & 0xFFFFFFF0; else bitrate_ = (bitrate_ + 511) >> 10; @@ -1075,7 +1074,7 @@ u32 Atrac::ResetPlayPosition(int sample, int bytesWrittenFirstBuf, int bytesWrit bufferValidBytes_ = bytesWrittenFirstBuf - bufferPos_; } - if (codecType_ == PSP_MODE_AT_3 || codecType_ == PSP_MODE_AT_3_PLUS) { + if (track_.codecType == PSP_MODE_AT_3 || track_.codecType == PSP_MODE_AT_3_PLUS) { SeekToSample(sample); } @@ -1091,11 +1090,11 @@ void Atrac::InitLowLevel(u32 paramsAddr, bool jointStereo) { first_.writableBytes = bytesPerFrame_; ResetData(); - if (codecType_ == PSP_MODE_AT_3) { + if (track_.codecType == PSP_MODE_AT_3) { bitrate_ = (bytesPerFrame_ * 352800) / 1000; bitrate_ = (bitrate_ + 511) >> 10; jointStereo_ = false; - } else if (codecType_ == PSP_MODE_AT_3_PLUS) { + } else if (track_.codecType == PSP_MODE_AT_3_PLUS) { bitrate_ = (bytesPerFrame_ * 352800) / 1000; bitrate_ = ((bitrate_ >> 11) + 8) & 0xFFFFFFF0; jointStereo_ = false; diff --git a/Core/HLE/AtracCtx.h b/Core/HLE/AtracCtx.h index d824f6a107..e2ede3ef26 100644 --- a/Core/HLE/AtracCtx.h +++ b/Core/HLE/AtracCtx.h @@ -108,6 +108,8 @@ inline u32 FirstOffsetExtra(int codecType) { struct Track { u32 fileSize; + u32 codecType; + u32 bytesPerFrame; }; struct Atrac { @@ -144,7 +146,7 @@ struct Atrac { } // Output frame size u32 SamplesPerFrame() const { - return codecType_ == PSP_MODE_AT_3_PLUS ? ATRAC3PLUS_MAX_SAMPLES : ATRAC3_MAX_SAMPLES; + return track_.codecType == PSP_MODE_AT_3_PLUS ? ATRAC3PLUS_MAX_SAMPLES : ATRAC3_MAX_SAMPLES; } u32 DecodePosBySample(int sample) const { @@ -205,7 +207,7 @@ struct Atrac { void SeekToSample(int sample); u32 CodecType() const { - return codecType_; + return track_.codecType; } AudioDecoder *GetDecoder() const { return decoder_; @@ -223,7 +225,7 @@ struct Atrac { void CalculateStreamInfo(u32 *readOffset); u32 FirstOffsetExtra() const { - return ::FirstOffsetExtra(codecType_); + return ::FirstOffsetExtra(track_.codecType); } u32 StreamBufferEnd() const { @@ -254,9 +256,6 @@ struct Atrac { void InitLowLevel(u32 paramsAddr, bool jointStereo); - // To be moved into private. - u32 codecType_ = 0; - private: void AnalyzeReset(); diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp index 689b9592c4..6d65cce582 100644 --- a/Core/HLE/sceAtrac.cpp +++ b/Core/HLE/sceAtrac.cpp @@ -176,7 +176,7 @@ static u32 sceAtracGetAtracID(int codecType) { } Atrac *atrac = new Atrac(); - atrac->codecType_ = codecType; + atrac->track_.codecType = codecType; int atracID = createAtrac(atrac); if (atracID < 0) { delete atrac; @@ -602,7 +602,7 @@ static u32 sceAtracSetData(int atracID, u32 buffer, u32 bufferSize) { return ret; } - if (atrac->codecType_ != atracContextTypes[atracID]) { + if (atrac->track_.codecType != atracContextTypes[atracID]) { // TODO: Should this not change the buffer size? return hleReportError(ME, ATRAC_ERROR_WRONG_CODECTYPE, "atracID uses different codec type than data"); } @@ -913,18 +913,13 @@ static int sceAtracLowLevelInitDecoder(int atracID, u32 paramsAddr) { return hleLogError(ME, ATRAC_ERROR_BAD_ATRACID, "bad atrac ID"); } - if (atrac->codecType_ != PSP_MODE_AT_3 && atrac->codecType_ != PSP_MODE_AT_3_PLUS) { - // TODO: Error code? Was silently 0 before, and just didn't work. Shouldn't ever happen... - return hleReportError(ME, ATRAC_ERROR_UNKNOWN_FORMAT, "bad codec type"); - } - if (!Memory::IsValidAddress(paramsAddr)) { // TODO: Returning zero as code was before. Needs testing. return hleReportError(ME, 0, "invalid pointers"); } bool jointStereo = false; - if (atrac->codecType_ == PSP_MODE_AT_3) { + if (atrac->track_.codecType == PSP_MODE_AT_3) { // See if we can match the actual jointStereo value. bool found = false; for (size_t i = 0; i < ARRAY_SIZE(at3HeaderMap); ++i) { @@ -941,7 +936,7 @@ static int sceAtracLowLevelInitDecoder(int atracID, u32 paramsAddr) { atrac->InitLowLevel(paramsAddr, jointStereo); - const char *codecName = atrac->codecType_ == PSP_MODE_AT_3 ? "atrac3" : "atrac3+"; + const char *codecName = atrac->track_.codecType == PSP_MODE_AT_3 ? "atrac3" : "atrac3+"; const char *channelName = atrac->channels_ == 1 ? "mono" : "stereo"; return hleLogSuccessInfoI(ME, 0, "%s %s audio", codecName, channelName); } From 976f7e5ce685005bbfa65ade35950364275fffc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 14 Apr 2024 18:10:07 +0200 Subject: [PATCH 137/719] Move bytesPerFrame into track --- Core/HLE/AtracCtx.cpp | 76 +++++++++++++++++++++---------------------- Core/HLE/AtracCtx.h | 13 ++++---- 2 files changed, 44 insertions(+), 45 deletions(-) diff --git a/Core/HLE/AtracCtx.cpp b/Core/HLE/AtracCtx.cpp index 0aa1858109..b4778e7f94 100644 --- a/Core/HLE/AtracCtx.cpp +++ b/Core/HLE/AtracCtx.cpp @@ -94,7 +94,7 @@ void Atrac::DoState(PointerWrap &p) { } Do(p, bitrate_); - Do(p, bytesPerFrame_); + Do(p, track_.bytesPerFrame); Do(p, loopinfo_); if (s < 9) { @@ -214,7 +214,7 @@ void Atrac::WriteContextToPSPMem() { } else { context->info.samplesPerChan = (track_.codecType == PSP_MODE_AT_3_PLUS ? ATRAC3PLUS_MAX_SAMPLES : ATRAC3_MAX_SAMPLES); } - context->info.sampleSize = bytesPerFrame_; + context->info.sampleSize = track_.bytesPerFrame; context->info.numChan = channels_; context->info.dataOff = dataOff_; context->info.endSample = endSample_ + firstSampleOffset_ + FirstOffsetExtra(); @@ -332,9 +332,9 @@ int Atrac::Analyze(u32 addr, u32 size) { return hleReportError(ME, ATRAC_ERROR_UNKNOWN_FORMAT, "unsupported sample rate: %d", at3fmt->samplerate); } bitrate_ = at3fmt->avgBytesPerSec * 8; - bytesPerFrame_ = at3fmt->blockAlign; - if (bytesPerFrame_ == 0) { - return hleReportError(ME, ATRAC_ERROR_UNKNOWN_FORMAT, "invalid bytes per frame: %d", bytesPerFrame_); + track->bytesPerFrame = at3fmt->blockAlign; + if (track->bytesPerFrame == 0) { + return hleReportError(ME, ATRAC_ERROR_UNKNOWN_FORMAT, "invalid bytes per frame: %d", track->bytesPerFrame); } // TODO: There are some format specific bytes here which seem to have fixed values? @@ -422,8 +422,8 @@ int Atrac::Analyze(u32 addr, u32 size) { } // if there is no correct endsample, try to guess it - if (endSample_ <= 0 && bytesPerFrame_ != 0) { - endSample_ = (dataChunkSize / bytesPerFrame_) * SamplesPerFrame(); + if (endSample_ <= 0 && track->bytesPerFrame != 0) { + endSample_ = (dataChunkSize / track->bytesPerFrame) * SamplesPerFrame(); endSample_ -= firstSampleOffset_ + FirstOffsetExtra(); } endSample_ -= 1; @@ -477,15 +477,15 @@ int Atrac::AnalyzeAA3(u32 addr, u32 size, u32 filesize) { switch (buffer[32]) { case 0: track->codecType = PSP_MODE_AT_3; - bytesPerFrame_ = (codecParams & 0x03FF) * 8; - bitrate_ = at3SampleRates[(codecParams >> 13) & 7] * bytesPerFrame_ * 8 / 1024; + track->bytesPerFrame = (codecParams & 0x03FF) * 8; + bitrate_ = at3SampleRates[(codecParams >> 13) & 7] * track->bytesPerFrame * 8 / 1024; channels_ = 2; jointStereo_ = (codecParams >> 17) & 1; break; case 1: track->codecType = PSP_MODE_AT_3_PLUS; - bytesPerFrame_ = ((codecParams & 0x03FF) * 8) + 8; - bitrate_ = at3SampleRates[(codecParams >> 13) & 7] * bytesPerFrame_ * 8 / 2048; + track->bytesPerFrame = ((codecParams & 0x03FF) * 8) + 8; + bitrate_ = at3SampleRates[(codecParams >> 13) & 7] * track->bytesPerFrame * 8 / 2048; channels_ = (codecParams >> 10) & 7; break; case 3: @@ -498,8 +498,8 @@ int Atrac::AnalyzeAA3(u32 addr, u32 size, u32 filesize) { dataOff_ = 10 + tagSize + 96; firstSampleOffset_ = 0; - if (endSample_ < 0 && bytesPerFrame_ != 0) { - endSample_ = ((filesize - dataOff_) / bytesPerFrame_) * SamplesPerFrame(); + if (endSample_ < 0 && track->bytesPerFrame != 0) { + endSample_ = ((filesize - dataOff_) / track->bytesPerFrame) * SamplesPerFrame(); } endSample_ -= 1; return 0; @@ -573,9 +573,9 @@ void Atrac::CreateDecoder() { extraData[6] = jointStereo_; extraData[8] = jointStereo_; extraData[10] = 1; - decoder_ = CreateAtrac3Audio(channels_, bytesPerFrame_, extraData, sizeof(extraData)); + decoder_ = CreateAtrac3Audio(channels_, track_.bytesPerFrame, extraData, sizeof(extraData)); } else { - decoder_ = CreateAtrac3PlusAudio(channels_, bytesPerFrame_); + decoder_ = CreateAtrac3PlusAudio(channels_, track_.bytesPerFrame); } // reinit decodePos, because ffmpeg had changed it. decodePos_ = 0; @@ -605,19 +605,19 @@ void Atrac::GetResetBufferInfo(AtracResetBufferInfo *bufferInfo, int sample) { int sampleFileOffset = FileOffsetBySample(sample - firstSampleOffset_ - SamplesPerFrame()); // Update the writable bytes. When streaming, this is just the number of bytes until the end. - const u32 bufSizeAligned = (bufferMaxSize_ / bytesPerFrame_) * bytesPerFrame_; + const u32 bufSizeAligned = (bufferMaxSize_ / track_.bytesPerFrame) * track_.bytesPerFrame; const int needsMoreFrames = FirstOffsetExtra(); bufferInfo->first.writePosPtr = first_.addr; bufferInfo->first.writableBytes = std::min(track_.fileSize - sampleFileOffset, bufSizeAligned); if (((sample + firstSampleOffset_) % (int)SamplesPerFrame()) >= (int)SamplesPerFrame() - needsMoreFrames) { // Not clear why, but it seems it wants a bit extra in case the sample is late? - bufferInfo->first.minWriteBytes = bytesPerFrame_ * 3; + bufferInfo->first.minWriteBytes = track_.bytesPerFrame * 3; } else { - bufferInfo->first.minWriteBytes = bytesPerFrame_ * 2; + bufferInfo->first.minWriteBytes = track_.bytesPerFrame * 2; } if ((u32)sample < (u32)firstSampleOffset_ && sampleFileOffset != dataOff_) { - sampleFileOffset -= bytesPerFrame_; + sampleFileOffset -= track_.bytesPerFrame; } bufferInfo->first.filePos = sampleFileOffset; @@ -666,7 +666,7 @@ int Atrac::SetData(u32 buffer, u32 readSize, u32 bufferSize, int successCode) { } if (bufferState_ == ATRAC_STATUS_STREAMED_WITHOUT_LOOP || bufferState_ == ATRAC_STATUS_STREAMED_LOOP_FROM_END || bufferState_ == ATRAC_STATUS_STREAMED_LOOP_WITH_TRAILER) { bufferHeaderSize_ = dataOff_; - bufferPos_ = dataOff_ + bytesPerFrame_; + bufferPos_ = dataOff_ + track_.bytesPerFrame; bufferValidBytes_ = first_.size - bufferPos_; } @@ -718,7 +718,7 @@ int Atrac::GetSecondBufferInfo(u32 *fileOffset, u32 *desiredSize) { } void Atrac::UpdateBitrate() { - bitrate_ = (bytesPerFrame_ * 352800) / 1000; + bitrate_ = (track_.bytesPerFrame * 352800) / 1000; if (track_.codecType == PSP_MODE_AT_3_PLUS) bitrate_ = ((bitrate_ >> 11) + 8) & 0xFFFFFFF0; else @@ -821,11 +821,11 @@ void Atrac::SeekToSample(int sample) { adjust = -(int)(offsetSamples % SamplesPerFrame()); } const u32 off = FileOffsetBySample(sample + adjust); - const u32 backfill = bytesPerFrame_ * 2; + const u32 backfill = track_.bytesPerFrame * 2; const u32 start = off - dataOff_ < backfill ? dataOff_ : off - backfill; - for (u32 pos = start; pos < off; pos += bytesPerFrame_) { - decoder_->Decode(BufferStart() + pos, bytesPerFrame_, nullptr, nullptr, nullptr); + for (u32 pos = start; pos < off; pos += track_.bytesPerFrame) { + decoder_->Decode(BufferStart() + pos, track_.bytesPerFrame, nullptr, nullptr, nullptr); } } @@ -855,7 +855,7 @@ int Atrac::RemainingFrames() const { if ((bufferState_ & ATRAC_STATUS_STREAMED_MASK) == ATRAC_STATUS_STREAMED_MASK) { // Since we're streaming, the remaining frames are what's valid in the buffer. - return bufferValidBytes_ / bytesPerFrame_; + return bufferValidBytes_ / track_.bytesPerFrame; } // Since the first frame is shorter by this offset, add to round up at this offset. @@ -864,14 +864,14 @@ int Atrac::RemainingFrames() const { // Just in case. Shouldn't happen, but once did by mistake. return 0; } - return remainingBytes / bytesPerFrame_; + return remainingBytes / track_.bytesPerFrame; } void Atrac::ConsumeFrame() { - bufferPos_ += bytesPerFrame_; + bufferPos_ += track_.bytesPerFrame; if ((bufferState_ & ATRAC_STATUS_STREAMED_MASK) == ATRAC_STATUS_STREAMED_MASK) { - if (bufferValidBytes_ > bytesPerFrame_) { - bufferValidBytes_ -= bytesPerFrame_; + if (bufferValidBytes_ > track_.bytesPerFrame) { + bufferValidBytes_ -= track_.bytesPerFrame; } else { bufferValidBytes_ = 0; } @@ -928,7 +928,7 @@ u32 Atrac::DecodeData(u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u32 *finish, i uint8_t *indata = BufferStart() + off; int bytesConsumed = 0; int outBytes = 0; - if (!decoder_->Decode(indata, bytesPerFrame_, &bytesConsumed, + if (!decoder_->Decode(indata, track_.bytesPerFrame, &bytesConsumed, outbuf, &outBytes)) { // Decode failed. *SamplesNum = 0; @@ -948,8 +948,8 @@ u32 Atrac::DecodeData(u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u32 *finish, i if (packetAddr != 0 && MemBlockInfoDetailed()) { char tagData[128]; - size_t tagSize = FormatMemWriteTagAt(tagData, sizeof(tagData), "AtracDecode/", packetAddr, bytesPerFrame_); - NotifyMemInfo(MemBlockFlags::READ, packetAddr, bytesPerFrame_, tagData, tagSize); + size_t tagSize = FormatMemWriteTagAt(tagData, sizeof(tagData), "AtracDecode/", packetAddr, track_.bytesPerFrame); + NotifyMemInfo(MemBlockFlags::READ, packetAddr, track_.bytesPerFrame, tagData, tagSize); NotifyMemInfo(MemBlockFlags::WRITE, outbufPtr, outBytes, tagData, tagSize); } else { NotifyMemInfo(MemBlockFlags::WRITE, outbufPtr, outBytes, "AtracDecode"); @@ -1070,7 +1070,7 @@ u32 Atrac::ResetPlayPosition(int sample, int bytesWrittenFirstBuf, int bytesWrit first_.offset = bytesWrittenFirstBuf; bufferHeaderSize_ = 0; - bufferPos_ = bytesPerFrame_; + bufferPos_ = track_.bytesPerFrame; bufferValidBytes_ = bytesWrittenFirstBuf - bufferPos_; } @@ -1086,23 +1086,23 @@ void Atrac::InitLowLevel(u32 paramsAddr, bool jointStereo) { channels_ = Memory::Read_U32(paramsAddr); outputChannels_ = Memory::Read_U32(paramsAddr + 4); bufferMaxSize_ = Memory::Read_U32(paramsAddr + 8); - bytesPerFrame_ = bufferMaxSize_; - first_.writableBytes = bytesPerFrame_; + track_.bytesPerFrame = bufferMaxSize_; + first_.writableBytes = track_.bytesPerFrame; ResetData(); if (track_.codecType == PSP_MODE_AT_3) { - bitrate_ = (bytesPerFrame_ * 352800) / 1000; + bitrate_ = (track_.bytesPerFrame * 352800) / 1000; bitrate_ = (bitrate_ + 511) >> 10; jointStereo_ = false; } else if (track_.codecType == PSP_MODE_AT_3_PLUS) { - bitrate_ = (bytesPerFrame_ * 352800) / 1000; + bitrate_ = (track_.bytesPerFrame * 352800) / 1000; bitrate_ = ((bitrate_ >> 11) + 8) & 0xFFFFFFF0; jointStereo_ = false; } dataOff_ = 0; first_.size = 0; - track_.fileSize = bytesPerFrame_; // not really meaningful + track_.fileSize = track_.bytesPerFrame; // not really meaningful bufferState_ = ATRAC_STATUS_LOW_LEVEL; currentSample_ = 0; CreateDecoder(); diff --git a/Core/HLE/AtracCtx.h b/Core/HLE/AtracCtx.h index e2ede3ef26..10c9347cb6 100644 --- a/Core/HLE/AtracCtx.h +++ b/Core/HLE/AtracCtx.h @@ -109,7 +109,7 @@ inline u32 FirstOffsetExtra(int codecType) { struct Track { u32 fileSize; u32 codecType; - u32 bytesPerFrame; + u16 bytesPerFrame; }; struct Atrac { @@ -142,7 +142,7 @@ struct Atrac { // Input frame size int BytesPerFrame() const { - return bytesPerFrame_; + return track_.bytesPerFrame; } // Output frame size u32 SamplesPerFrame() const { @@ -150,13 +150,13 @@ struct Atrac { } u32 DecodePosBySample(int sample) const { - return (u32)(firstSampleOffset_ + sample / (int)SamplesPerFrame() * bytesPerFrame_); + return (u32)(firstSampleOffset_ + sample / (int)SamplesPerFrame() * track_.bytesPerFrame); } u32 FileOffsetBySample(int sample) const { int offsetSample = sample + firstSampleOffset_; int frameOffset = offsetSample / (int)SamplesPerFrame(); - return (u32)(dataOff_ + bytesPerFrame_ + frameOffset * bytesPerFrame_); + return (u32)(dataOff_ + track_.bytesPerFrame + frameOffset * track_.bytesPerFrame); } void UpdateBitrate(); @@ -231,8 +231,8 @@ struct Atrac { u32 StreamBufferEnd() const { // The buffer is always aligned to a frame in size, not counting an optional header. // The header will only initially exist after the data is first set. - u32 framesAfterHeader = (bufferMaxSize_ - bufferHeaderSize_) / bytesPerFrame_; - return framesAfterHeader * bytesPerFrame_ + bufferHeaderSize_; + u32 framesAfterHeader = (bufferMaxSize_ - bufferHeaderSize_) / track_.bytesPerFrame; + return framesAfterHeader * track_.bytesPerFrame + bufferHeaderSize_; } int Analyze(u32 addr, u32 size); @@ -260,7 +260,6 @@ private: void AnalyzeReset(); u32 bitrate_ = 64; - u16 bytesPerFrame_ = 0; u32 bufferMaxSize_ = 0; int jointStereo_ = 0; From 3f96f69b706d96215534793a5bb947d019836b9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 14 Apr 2024 18:18:23 +0200 Subject: [PATCH 138/719] Move firstSampleOffset_ into Track --- Core/HLE/AtracCtx.cpp | 88 +++++++++++++++++++++---------------------- Core/HLE/AtracCtx.h | 31 +++++++++------ Core/HLE/sceAtrac.cpp | 14 +++---- 3 files changed, 71 insertions(+), 62 deletions(-) diff --git a/Core/HLE/AtracCtx.cpp b/Core/HLE/AtracCtx.cpp index b4778e7f94..d5b7d69fad 100644 --- a/Core/HLE/AtracCtx.cpp +++ b/Core/HLE/AtracCtx.cpp @@ -62,11 +62,11 @@ void Atrac::DoState(PointerWrap &p) { Do(p, currentSample_); Do(p, endSample_); - Do(p, firstSampleOffset_); + Do(p, track_.firstSampleOffset); if (s >= 3) { Do(p, dataOff_); } else { - dataOff_ = firstSampleOffset_; + dataOff_ = track_.firstSampleOffset; } u32 hasDataBuf = dataBuf_ != nullptr; @@ -209,15 +209,15 @@ void Atrac::WriteContextToPSPMem() { // to update it back here all the time. Some games, like Sol Trigger, change it. // TODO: Should we just keep this in PSP ram then, or something? context->info.state = bufferState_; - if (firstSampleOffset_ != 0) { - context->info.samplesPerChan = firstSampleOffset_ + FirstOffsetExtra(); + if (track_.firstSampleOffset != 0) { + context->info.samplesPerChan = track_.firstSampleOffset + FirstOffsetExtra(); } else { context->info.samplesPerChan = (track_.codecType == PSP_MODE_AT_3_PLUS ? ATRAC3PLUS_MAX_SAMPLES : ATRAC3_MAX_SAMPLES); } context->info.sampleSize = track_.bytesPerFrame; context->info.numChan = channels_; context->info.dataOff = dataOff_; - context->info.endSample = endSample_ + firstSampleOffset_ + FirstOffsetExtra(); + context->info.endSample = endSample_ + track_.firstSampleOffset + FirstOffsetExtra(); context->info.dataEnd = track_.fileSize; context->info.curOff = first_.fileoffset; context->info.decodePos = DecodePosBySample(currentSample_); @@ -263,7 +263,7 @@ int Atrac::Analyze(u32 addr, u32 size) { } u32 offset = 8; - firstSampleOffset_ = 0; + track->firstSampleOffset = 0; while (Memory::Read_U32(addr + offset) != RIFF_WAVE_MAGIC) { // Get the size preceding the magic. @@ -350,11 +350,11 @@ int Atrac::Analyze(u32 addr, u32 size) { { endSample_ = Memory::Read_U32(addr + offset); if (chunkSize >= 8) { - firstSampleOffset_ = Memory::Read_U32(addr + offset + 4); + track->firstSampleOffset = Memory::Read_U32(addr + offset + 4); } if (chunkSize >= 12) { u32 largerOffset = Memory::Read_U32(addr + offset + 8); - sampleOffsetAdjust = firstSampleOffset_ - largerOffset; + sampleOffsetAdjust = track->firstSampleOffset - largerOffset; } } break; @@ -423,12 +423,12 @@ int Atrac::Analyze(u32 addr, u32 size) { // if there is no correct endsample, try to guess it if (endSample_ <= 0 && track->bytesPerFrame != 0) { - endSample_ = (dataChunkSize / track->bytesPerFrame) * SamplesPerFrame(); - endSample_ -= firstSampleOffset_ + FirstOffsetExtra(); + endSample_ = (dataChunkSize / track->bytesPerFrame) * track_.SamplesPerFrame(); + endSample_ -= track->firstSampleOffset + FirstOffsetExtra(); } endSample_ -= 1; - if (loopEndSample_ != -1 && loopEndSample_ > endSample_ + firstSampleOffset_ + (int)FirstOffsetExtra()) { + if (loopEndSample_ != -1 && loopEndSample_ > endSample_ + track->firstSampleOffset + (int)FirstOffsetExtra()) { return hleReportError(ME, ATRAC_ERROR_BAD_CODEC_PARAMS, "loop after end of data"); } @@ -497,9 +497,9 @@ int Atrac::AnalyzeAA3(u32 addr, u32 size, u32 filesize) { } dataOff_ = 10 + tagSize + 96; - firstSampleOffset_ = 0; + track->firstSampleOffset = 0; if (endSample_ < 0 && track->bytesPerFrame != 0) { - endSample_ = ((filesize - dataOff_) / track->bytesPerFrame) * SamplesPerFrame(); + endSample_ = ((filesize - dataOff_) / track->bytesPerFrame) * track_.SamplesPerFrame(); } endSample_ -= 1; return 0; @@ -536,7 +536,7 @@ void Atrac::CalculateStreamInfo(u32 *outReadOffset) { first_.offset = 0; first_.writableBytes = 0; } else { - readOffset = FileOffsetBySample(loopStartSample_ - FirstOffsetExtra() - firstSampleOffset_ - SamplesPerFrame() * 2); + readOffset = FileOffsetBySample(loopStartSample_ - FirstOffsetExtra() - track_.firstSampleOffset - track_.SamplesPerFrame() * 2); } } @@ -602,7 +602,7 @@ void Atrac::GetResetBufferInfo(AtracResetBufferInfo *bufferInfo, int sample) { bufferInfo->first.filePos = first_.size; } else { // This is without the sample offset. The file offset also includes the previous batch of samples? - int sampleFileOffset = FileOffsetBySample(sample - firstSampleOffset_ - SamplesPerFrame()); + int sampleFileOffset = FileOffsetBySample(sample - track_.firstSampleOffset - track_.SamplesPerFrame()); // Update the writable bytes. When streaming, this is just the number of bytes until the end. const u32 bufSizeAligned = (bufferMaxSize_ / track_.bytesPerFrame) * track_.bytesPerFrame; @@ -610,13 +610,13 @@ void Atrac::GetResetBufferInfo(AtracResetBufferInfo *bufferInfo, int sample) { bufferInfo->first.writePosPtr = first_.addr; bufferInfo->first.writableBytes = std::min(track_.fileSize - sampleFileOffset, bufSizeAligned); - if (((sample + firstSampleOffset_) % (int)SamplesPerFrame()) >= (int)SamplesPerFrame() - needsMoreFrames) { + if (((sample + track_.firstSampleOffset) % (int)track_.SamplesPerFrame()) >= (int)track_.SamplesPerFrame() - needsMoreFrames) { // Not clear why, but it seems it wants a bit extra in case the sample is late? bufferInfo->first.minWriteBytes = track_.bytesPerFrame * 3; } else { bufferInfo->first.minWriteBytes = track_.bytesPerFrame * 2; } - if ((u32)sample < (u32)firstSampleOffset_ && sampleFileOffset != dataOff_) { + if ((u32)sample < (u32)track_.firstSampleOffset && sampleFileOffset != dataOff_) { sampleFileOffset -= track_.bytesPerFrame; } bufferInfo->first.filePos = sampleFileOffset; @@ -687,11 +687,11 @@ int Atrac::SetData(u32 buffer, u32 readSize, u32 bufferSize, int successCode) { } u32 Atrac::SetSecondBuffer(u32 secondBuffer, u32 secondBufferSize) { - u32 secondFileOffset = FileOffsetBySample(loopEndSample_ - firstSampleOffset_); + u32 secondFileOffset = FileOffsetBySample(loopEndSample_ - track_.firstSampleOffset); u32 desiredSize = track_.fileSize - secondFileOffset; // 3 seems to be the number of frames required to handle a loop. - if (secondBufferSize < desiredSize && secondBufferSize < (u32)BytesPerFrame() * 3) { + if (secondBufferSize < desiredSize && secondBufferSize < (u32)track_.BytesPerFrame() * 3) { return hleReportError(ME, ATRAC_ERROR_SIZE_TOO_SMALL, "too small"); } if (BufferState() != ATRAC_STATUS_STREAMED_LOOP_WITH_TRAILER) { @@ -712,7 +712,7 @@ int Atrac::GetSecondBufferInfo(u32 *fileOffset, u32 *desiredSize) { return hleLogWarning(ME, ATRAC_ERROR_SECOND_BUFFER_NOT_NEEDED, "not needed"); } - *fileOffset = FileOffsetBySample(loopEndSample_ - firstSampleOffset_); + *fileOffset = FileOffsetBySample(loopEndSample_ - track_.firstSampleOffset); *desiredSize = track_.fileSize - *fileOffset; return hleLogSuccessI(ME, 0); } @@ -752,7 +752,7 @@ int Atrac::AddStreamData(u32 bytesToAdd) { if (PSP_CoreParameter().compat.flags().AtracLoopHack && bufferState_ == ATRAC_STATUS_STREAMED_LOOP_FROM_END && RemainingFrames() > 2) { loopNum_++; - SeekToSample(loopStartSample_ - FirstOffsetExtra() - firstSampleOffset_); + SeekToSample(loopStartSample_ - FirstOffsetExtra() - track_.firstSampleOffset); } return 0; @@ -775,19 +775,19 @@ u32 Atrac::AddStreamDataSas(u32 bufPtr, u32 bytesToAdd) { u32 Atrac::GetNextSamples() { // It seems like the PSP aligns the sample position to 0x800...? - u32 skipSamples = firstSampleOffset_ + FirstOffsetExtra(); - u32 firstSamples = (SamplesPerFrame() - skipSamples) % SamplesPerFrame(); + u32 skipSamples = track_.firstSampleOffset + FirstOffsetExtra(); + u32 firstSamples = (track_.SamplesPerFrame() - skipSamples) % track_.SamplesPerFrame(); u32 numSamples = endSample_ + 1 - currentSample_; if (currentSample_ == 0 && firstSamples != 0) { numSamples = firstSamples; } - u32 unalignedSamples = (skipSamples + currentSample_) % SamplesPerFrame(); + u32 unalignedSamples = (skipSamples + currentSample_) % track_.SamplesPerFrame(); if (unalignedSamples != 0) { // We're off alignment, possibly due to a loop. Force it back on. - numSamples = SamplesPerFrame() - unalignedSamples; + numSamples = track_.SamplesPerFrame() - unalignedSamples; } - if (numSamples > SamplesPerFrame()) - numSamples = SamplesPerFrame(); + if (numSamples > track_.SamplesPerFrame()) + numSamples = track_.SamplesPerFrame(); if (bufferState_ == ATRAC_STATUS_STREAMED_LOOP_FROM_END && (int)numSamples + currentSample_ > endSample_) { bufferState_ = ATRAC_STATUS_ALL_DATA_LOADED; } @@ -807,8 +807,8 @@ void Atrac::ForceSeekToSample(int sample) { void Atrac::SeekToSample(int sample) { // It seems like the PSP aligns the sample position to 0x800...? - const u32 offsetSamples = firstSampleOffset_ + FirstOffsetExtra(); - const u32 unalignedSamples = (offsetSamples + sample) % SamplesPerFrame(); + const u32 offsetSamples = track_.firstSampleOffset + FirstOffsetExtra(); + const u32 unalignedSamples = (offsetSamples + sample) % track_.SamplesPerFrame(); int seekFrame = sample + offsetSamples - unalignedSamples; if ((sample != currentSample_ || sample == 0) && decoder_ != nullptr) { @@ -817,8 +817,8 @@ void Atrac::SeekToSample(int sample) { int adjust = 0; if (sample == 0) { - int offsetSamples = firstSampleOffset_ + FirstOffsetExtra(); - adjust = -(int)(offsetSamples % SamplesPerFrame()); + int offsetSamples = track_.firstSampleOffset + FirstOffsetExtra(); + adjust = -(int)(offsetSamples % track_.SamplesPerFrame()); } const u32 off = FileOffsetBySample(sample + adjust); const u32 backfill = track_.bytesPerFrame * 2; @@ -838,12 +838,12 @@ int Atrac::RemainingFrames() const { return PSP_ATRAC_ALLDATA_IS_ON_MEMORY; } - u32 currentFileOffset = FileOffsetBySample(currentSample_ - SamplesPerFrame() + FirstOffsetExtra()); + u32 currentFileOffset = FileOffsetBySample(currentSample_ - track_.SamplesPerFrame() + FirstOffsetExtra()); if (first_.fileoffset >= track_.fileSize) { if (bufferState_ == ATRAC_STATUS_STREAMED_WITHOUT_LOOP) { return PSP_ATRAC_NONLOOP_STREAM_DATA_IS_ON_MEMORY; } - int loopEndAdjusted = loopEndSample_ - FirstOffsetExtra() - firstSampleOffset_; + int loopEndAdjusted = loopEndSample_ - FirstOffsetExtra() - track_.firstSampleOffset; if (bufferState_ == ATRAC_STATUS_STREAMED_LOOP_WITH_TRAILER && currentSample_ > loopEndAdjusted) { // No longer looping in this case, outside the loop. return PSP_ATRAC_NONLOOP_STREAM_DATA_IS_ON_MEMORY; @@ -903,13 +903,13 @@ u32 Atrac::DecodeData(u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u32 *finish, i u32 numSamples = 0; // It seems like the PSP aligns the sample position to 0x800...? - int offsetSamples = firstSampleOffset_ + FirstOffsetExtra(); + int offsetSamples = track_.firstSampleOffset + FirstOffsetExtra(); int skipSamples = 0; u32 maxSamples = endSample_ + 1 - currentSample_; - u32 unalignedSamples = (offsetSamples + currentSample_) % SamplesPerFrame(); + u32 unalignedSamples = (offsetSamples + currentSample_) % track_.SamplesPerFrame(); if (unalignedSamples != 0) { // We're off alignment, possibly due to a loop. Force it back on. - maxSamples = SamplesPerFrame() - unalignedSamples; + maxSamples = track_.SamplesPerFrame() - unalignedSamples; skipSamples = unalignedSamples; } @@ -961,7 +961,7 @@ u32 Atrac::DecodeData(u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u32 *finish, i // Never got a frame. We may have dropped a GHA frame or otherwise have a bug. // For now, let's try to provide an extra "frame" if possible so games don't infinite loop. if (FileOffsetBySample(currentSample_) < track_.fileSize) { - numSamples = std::min(maxSamples, SamplesPerFrame()); + numSamples = std::min(maxSamples, track_.SamplesPerFrame()); u32 outBytes = numSamples * outputChannels_ * sizeof(s16); if (outbuf != nullptr) { memset(outbuf, 0, outBytes); @@ -980,20 +980,20 @@ u32 Atrac::DecodeData(u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u32 *finish, i int finishFlag = 0; // TODO: Verify. bool hitEnd = currentSample_ >= endSample_ || (numSamples == 0 && first_.size >= track_.fileSize); - int loopEndAdjusted = loopEndSample_ - FirstOffsetExtra() - firstSampleOffset_; + int loopEndAdjusted = loopEndSample_ - FirstOffsetExtra() - track_.firstSampleOffset; if ((hitEnd || currentSample_ > loopEndAdjusted) && loopNum != 0) { - SeekToSample(loopStartSample_ - FirstOffsetExtra() - firstSampleOffset_); + SeekToSample(loopStartSample_ - FirstOffsetExtra() - track_.firstSampleOffset); if (bufferState_ != ATRAC_STATUS_FOR_SCESAS) { if (loopNum_ > 0) loopNum_--; } if ((bufferState_ & ATRAC_STATUS_STREAMED_MASK) == ATRAC_STATUS_STREAMED_MASK) { // Whatever bytes we have left were added from the loop. - u32 loopOffset = FileOffsetBySample(loopStartSample_ - FirstOffsetExtra() - firstSampleOffset_ - SamplesPerFrame() * 2); + u32 loopOffset = FileOffsetBySample(loopStartSample_ - FirstOffsetExtra() - track_.firstSampleOffset - track_.SamplesPerFrame() * 2); // TODO: Hmm, need to manage the buffer better. But don't move fileoffset if we already have valid data. if (loopOffset > first_.fileoffset || loopOffset + bufferValidBytes_ < first_.fileoffset) { // Skip the initial frame at the start. - first_.fileoffset = FileOffsetBySample(loopStartSample_ - FirstOffsetExtra() - firstSampleOffset_ - SamplesPerFrame() * 2); + first_.fileoffset = FileOffsetBySample(loopStartSample_ - FirstOffsetExtra() - track_.firstSampleOffset - track_.SamplesPerFrame() * 2); } } } else if (hitEnd) { @@ -1001,7 +1001,7 @@ u32 Atrac::DecodeData(u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u32 *finish, i // Still move forward, so we know that we've read everything. // This seems to be reflected in the context as well. - currentSample_ += SamplesPerFrame() - numSamples; + currentSample_ += track_.SamplesPerFrame() - numSamples; } *finish = finishFlag; @@ -1016,8 +1016,8 @@ void Atrac::SetLoopNum(int loopNum) { loopNum_ = loopNum; if (loopNum != 0 && loopinfo_.size() == 0) { // Just loop the whole audio - loopStartSample_ = firstSampleOffset_ + FirstOffsetExtra(); - loopEndSample_ = endSample_ + firstSampleOffset_ + FirstOffsetExtra(); + loopStartSample_ = track_.firstSampleOffset + FirstOffsetExtra(); + loopEndSample_ = endSample_ + track_.firstSampleOffset + FirstOffsetExtra(); } WriteContextToPSPMem(); } diff --git a/Core/HLE/AtracCtx.h b/Core/HLE/AtracCtx.h index 10c9347cb6..9f2c8644a5 100644 --- a/Core/HLE/AtracCtx.h +++ b/Core/HLE/AtracCtx.h @@ -110,6 +110,17 @@ struct Track { u32 fileSize; u32 codecType; u16 bytesPerFrame; + u32 firstSampleOffset; + + // Input frame size + int BytesPerFrame() const { + return bytesPerFrame; + } + + // Output frame size + u32 SamplesPerFrame() const { + return codecType == PSP_MODE_AT_3_PLUS ? ATRAC3PLUS_MAX_SAMPLES : ATRAC3_MAX_SAMPLES; + } }; struct Atrac { @@ -130,7 +141,7 @@ struct Atrac { if (loopEndSample_ <= 0) { // There's no looping, but we need to stream the data in our buffer. bufferState_ = ATRAC_STATUS_STREAMED_WITHOUT_LOOP; - } else if (loopEndSample_ == endSample_ + firstSampleOffset_ + (int)FirstOffsetExtra()) { + } else if (loopEndSample_ == endSample_ + track_.firstSampleOffset + (int)FirstOffsetExtra()) { bufferState_ = ATRAC_STATUS_STREAMED_LOOP_FROM_END; } else { bufferState_ = ATRAC_STATUS_STREAMED_LOOP_WITH_TRAILER; @@ -140,25 +151,24 @@ struct Atrac { void DoState(PointerWrap &p); - // Input frame size - int BytesPerFrame() const { - return track_.bytesPerFrame; - } - // Output frame size u32 SamplesPerFrame() const { - return track_.codecType == PSP_MODE_AT_3_PLUS ? ATRAC3PLUS_MAX_SAMPLES : ATRAC3_MAX_SAMPLES; + return track_.SamplesPerFrame(); } u32 DecodePosBySample(int sample) const { - return (u32)(firstSampleOffset_ + sample / (int)SamplesPerFrame() * track_.bytesPerFrame); + return (u32)(track_.firstSampleOffset + sample / (int)track_.SamplesPerFrame() * track_.bytesPerFrame); } u32 FileOffsetBySample(int sample) const { - int offsetSample = sample + firstSampleOffset_; - int frameOffset = offsetSample / (int)SamplesPerFrame(); + int offsetSample = sample + track_.firstSampleOffset; + int frameOffset = offsetSample / (int)track_.SamplesPerFrame(); return (u32)(dataOff_ + track_.bytesPerFrame + frameOffset * track_.bytesPerFrame); } + const Track &GetTrack() const { + return track_; + } + void UpdateBitrate(); int Bitrate() const { @@ -183,7 +193,6 @@ struct Atrac { int currentSample_ = 0; int endSample_ = 0; - int firstSampleOffset_ = 0; std::vector loopinfo_; int loopStartSample_ = -1; diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp index 6d65cce582..1c8a9421b0 100644 --- a/Core/HLE/sceAtrac.cpp +++ b/Core/HLE/sceAtrac.cpp @@ -290,7 +290,7 @@ static u32 sceAtracGetBufferInfoForResetting(int atracID, int sample, u32 buffer return hleReportError(ME, SCE_KERNEL_ERROR_ILLEGAL_ADDR, "invalid buffer, should crash"); } else if (atrac->BufferState() == ATRAC_STATUS_STREAMED_LOOP_WITH_TRAILER && atrac->second_.size == 0) { return hleReportError(ME, ATRAC_ERROR_SECOND_BUFFER_NEEDED, "no second buffer"); - } else if ((u32)sample + atrac->firstSampleOffset_ > (u32)atrac->endSample_ + atrac->firstSampleOffset_) { + } else if ((u32)sample + atrac->GetTrack().firstSampleOffset > (u32)atrac->endSample_ + atrac->GetTrack().firstSampleOffset) { // NOTE: Above we have to add firstSampleOffset to both sides - we seem to rely on wraparound. return hleLogWarning(ME, ATRAC_ERROR_BAD_SAMPLE, "invalid sample position"); } else { @@ -478,10 +478,10 @@ static u32 sceAtracGetSoundSample(int atracID, u32 outEndSampleAddr, u32 outLoop *outEndSample = atrac->endSample_; auto outLoopStart = PSPPointer::Create(outLoopStartSampleAddr); if (outLoopStart.IsValid()) - *outLoopStart = atrac->loopStartSample_ == -1 ? -1 : atrac->loopStartSample_ - atrac->firstSampleOffset_ - atrac->FirstOffsetExtra(); + *outLoopStart = atrac->loopStartSample_ == -1 ? -1 : atrac->loopStartSample_ - atrac->track_.firstSampleOffset - atrac->FirstOffsetExtra(); auto outLoopEnd = PSPPointer::Create(outLoopEndSampleAddr); if (outLoopEnd.IsValid()) - *outLoopEnd = atrac->loopEndSample_ == -1 ? -1 : atrac->loopEndSample_ - atrac->firstSampleOffset_ - atrac->FirstOffsetExtra(); + *outLoopEnd = atrac->loopEndSample_ == -1 ? -1 : atrac->loopEndSample_ - atrac->track_.firstSampleOffset - atrac->FirstOffsetExtra(); if (!outEndSample.IsValid() || !outLoopStart.IsValid() || !outLoopEnd.IsValid()) { return hleReportError(ME, 0, "invalid address"); @@ -534,7 +534,7 @@ static u32 sceAtracResetPlayPosition(int atracID, int sample, int bytesWrittenFi if (atrac->BufferState() == ATRAC_STATUS_STREAMED_LOOP_WITH_TRAILER && atrac->second_.size == 0) { return hleReportError(ME, ATRAC_ERROR_SECOND_BUFFER_NEEDED, "no second buffer"); - } else if ((u32)sample + atrac->firstSampleOffset_ > (u32)atrac->endSample_ + atrac->firstSampleOffset_) { + } else if ((u32)sample + atrac->GetTrack().firstSampleOffset > (u32)atrac->endSample_ + atrac->GetTrack().firstSampleOffset) { // NOTE: Above we have to add firstSampleOffset to both sides - we seem to rely on wraparound. return hleLogWarning(ME, ATRAC_ERROR_BAD_SAMPLE, "invalid sample position"); } @@ -893,7 +893,7 @@ struct At3HeaderMap { u8 jointStereo; bool Matches(const Atrac *at) const { - return bytes == at->BytesPerFrame() && channels == at->Channels(); + return bytes == at->GetTrack().BytesPerFrame() && channels == at->Channels(); } }; @@ -929,7 +929,7 @@ static int sceAtracLowLevelInitDecoder(int atracID, u32 paramsAddr) { } } if (!found) { - ERROR_LOG_REPORT(ME, "AT3 header map lacks entry for bpf: %i channels: %i", atrac->BytesPerFrame(), atrac->Channels()); + ERROR_LOG_REPORT(ME, "AT3 header map lacks entry for bpf: %i channels: %i", atrac->GetTrack().BytesPerFrame(), atrac->Channels()); // TODO: Should we return an error code for these values? } } @@ -959,7 +959,7 @@ static int sceAtracLowLevelDecode(int atracID, u32 sourceAddr, u32 sourceBytesCo int bytesConsumed = 0; int bytesWritten = 0; - atrac->GetDecoder()->Decode(srcp, atrac->BytesPerFrame(), &bytesConsumed, outp, &bytesWritten); + atrac->GetDecoder()->Decode(srcp, atrac->GetTrack().BytesPerFrame(), &bytesConsumed, outp, &bytesWritten); *srcConsumed = bytesConsumed; *outWritten = bytesWritten; From 15b71af95f15c38fcbff682ae9545b96c5d0e0e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 14 Apr 2024 18:23:28 +0200 Subject: [PATCH 139/719] Move endSample into track_ --- Core/HLE/AtracCtx.cpp | 42 +++++++++++++++++++++--------------------- Core/HLE/AtracCtx.h | 6 +++--- Core/HLE/sceAtrac.cpp | 10 +++++----- 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/Core/HLE/AtracCtx.cpp b/Core/HLE/AtracCtx.cpp index d5b7d69fad..eaa643aaaf 100644 --- a/Core/HLE/AtracCtx.cpp +++ b/Core/HLE/AtracCtx.cpp @@ -61,7 +61,7 @@ void Atrac::DoState(PointerWrap &p) { Do(p, track_.codecType); Do(p, currentSample_); - Do(p, endSample_); + Do(p, track_.endSample); Do(p, track_.firstSampleOffset); if (s >= 3) { Do(p, dataOff_); @@ -168,7 +168,7 @@ void Atrac::ResetData() { void Atrac::AnalyzeReset() { // Reset some values. currentSample_ = 0; - endSample_ = -1; + track_.endSample = -1; loopNum_ = 0; loopinfo_.clear(); loopStartSample_ = -1; @@ -217,7 +217,7 @@ void Atrac::WriteContextToPSPMem() { context->info.sampleSize = track_.bytesPerFrame; context->info.numChan = channels_; context->info.dataOff = dataOff_; - context->info.endSample = endSample_ + track_.firstSampleOffset + FirstOffsetExtra(); + context->info.endSample = track_.endSample + track_.firstSampleOffset + FirstOffsetExtra(); context->info.dataEnd = track_.fileSize; context->info.curOff = first_.fileoffset; context->info.decodePos = DecodePosBySample(currentSample_); @@ -348,7 +348,7 @@ int Atrac::Analyze(u32 addr, u32 size) { break; case FACT_CHUNK_MAGIC: { - endSample_ = Memory::Read_U32(addr + offset); + track->endSample = Memory::Read_U32(addr + offset); if (chunkSize >= 8) { track->firstSampleOffset = Memory::Read_U32(addr + offset + 4); } @@ -414,21 +414,21 @@ int Atrac::Analyze(u32 addr, u32 size) { // set the loopStartSample_ and loopEndSample_ by loopinfo_ if (loopinfo_.size() > 0) { - loopStartSample_ = loopinfo_[0].startSample + FirstOffsetExtra() + sampleOffsetAdjust; - loopEndSample_ = loopinfo_[0].endSample + FirstOffsetExtra() + sampleOffsetAdjust; + loopStartSample_ = loopinfo_[0].startSample + ::FirstOffsetExtra(track->codecType) + sampleOffsetAdjust; + loopEndSample_ = loopinfo_[0].endSample + ::FirstOffsetExtra(track->codecType) + sampleOffsetAdjust; } else { loopStartSample_ = -1; loopEndSample_ = -1; } // if there is no correct endsample, try to guess it - if (endSample_ <= 0 && track->bytesPerFrame != 0) { - endSample_ = (dataChunkSize / track->bytesPerFrame) * track_.SamplesPerFrame(); - endSample_ -= track->firstSampleOffset + FirstOffsetExtra(); + if (track->endSample <= 0 && track->bytesPerFrame != 0) { + track->endSample = (dataChunkSize / track->bytesPerFrame) * track->SamplesPerFrame(); + track->endSample -= track->firstSampleOffset + ::FirstOffsetExtra(track->codecType); } - endSample_ -= 1; + track->endSample -= 1; - if (loopEndSample_ != -1 && loopEndSample_ > endSample_ + track->firstSampleOffset + (int)FirstOffsetExtra()) { + if (loopEndSample_ != -1 && loopEndSample_ > track->endSample + track->firstSampleOffset + (int)::FirstOffsetExtra(track->codecType)) { return hleReportError(ME, ATRAC_ERROR_BAD_CODEC_PARAMS, "loop after end of data"); } @@ -498,10 +498,10 @@ int Atrac::AnalyzeAA3(u32 addr, u32 size, u32 filesize) { dataOff_ = 10 + tagSize + 96; track->firstSampleOffset = 0; - if (endSample_ < 0 && track->bytesPerFrame != 0) { - endSample_ = ((filesize - dataOff_) / track->bytesPerFrame) * track_.SamplesPerFrame(); + if (track->endSample < 0 && track->bytesPerFrame != 0) { + track->endSample = ((filesize - dataOff_) / track->bytesPerFrame) * track->SamplesPerFrame(); } - endSample_ -= 1; + track->endSample -= 1; return 0; } @@ -777,7 +777,7 @@ u32 Atrac::GetNextSamples() { // It seems like the PSP aligns the sample position to 0x800...? u32 skipSamples = track_.firstSampleOffset + FirstOffsetExtra(); u32 firstSamples = (track_.SamplesPerFrame() - skipSamples) % track_.SamplesPerFrame(); - u32 numSamples = endSample_ + 1 - currentSample_; + u32 numSamples = track_.endSample + 1 - currentSample_; if (currentSample_ == 0 && firstSamples != 0) { numSamples = firstSamples; } @@ -788,7 +788,7 @@ u32 Atrac::GetNextSamples() { } if (numSamples > track_.SamplesPerFrame()) numSamples = track_.SamplesPerFrame(); - if (bufferState_ == ATRAC_STATUS_STREAMED_LOOP_FROM_END && (int)numSamples + currentSample_ > endSample_) { + if (bufferState_ == ATRAC_STATUS_STREAMED_LOOP_FROM_END && (int)numSamples + currentSample_ > track_.endSample) { bufferState_ = ATRAC_STATUS_ALL_DATA_LOADED; } return numSamples; @@ -891,7 +891,7 @@ u32 Atrac::DecodeData(u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u32 *finish, i } // We already passed the end - return an error (many games check for this.) - if (currentSample_ >= endSample_ && loopNum == 0) { + if (currentSample_ >= track_.endSample && loopNum == 0) { *SamplesNum = 0; *finish = 1; // refresh context_ @@ -905,7 +905,7 @@ u32 Atrac::DecodeData(u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u32 *finish, i // It seems like the PSP aligns the sample position to 0x800...? int offsetSamples = track_.firstSampleOffset + FirstOffsetExtra(); int skipSamples = 0; - u32 maxSamples = endSample_ + 1 - currentSample_; + u32 maxSamples = track_.endSample + 1 - currentSample_; u32 unalignedSamples = (offsetSamples + currentSample_) % track_.SamplesPerFrame(); if (unalignedSamples != 0) { // We're off alignment, possibly due to a loop. Force it back on. @@ -957,7 +957,7 @@ u32 Atrac::DecodeData(u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u32 *finish, i // We only want one frame per call, let's continue the next time. } - if (!gotFrame && currentSample_ < endSample_) { + if (!gotFrame && currentSample_ < track_.endSample) { // Never got a frame. We may have dropped a GHA frame or otherwise have a bug. // For now, let's try to provide an extra "frame" if possible so games don't infinite loop. if (FileOffsetBySample(currentSample_) < track_.fileSize) { @@ -979,7 +979,7 @@ u32 Atrac::DecodeData(u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u32 *finish, i int finishFlag = 0; // TODO: Verify. - bool hitEnd = currentSample_ >= endSample_ || (numSamples == 0 && first_.size >= track_.fileSize); + bool hitEnd = currentSample_ >= track_.endSample || (numSamples == 0 && first_.size >= track_.fileSize); int loopEndAdjusted = loopEndSample_ - FirstOffsetExtra() - track_.firstSampleOffset; if ((hitEnd || currentSample_ > loopEndAdjusted) && loopNum != 0) { SeekToSample(loopStartSample_ - FirstOffsetExtra() - track_.firstSampleOffset); @@ -1017,7 +1017,7 @@ void Atrac::SetLoopNum(int loopNum) { if (loopNum != 0 && loopinfo_.size() == 0) { // Just loop the whole audio loopStartSample_ = track_.firstSampleOffset + FirstOffsetExtra(); - loopEndSample_ = endSample_ + track_.firstSampleOffset + FirstOffsetExtra(); + loopEndSample_ = track_.endSample + track_.firstSampleOffset + FirstOffsetExtra(); } WriteContextToPSPMem(); } diff --git a/Core/HLE/AtracCtx.h b/Core/HLE/AtracCtx.h index 9f2c8644a5..4b3b710a26 100644 --- a/Core/HLE/AtracCtx.h +++ b/Core/HLE/AtracCtx.h @@ -110,7 +110,8 @@ struct Track { u32 fileSize; u32 codecType; u16 bytesPerFrame; - u32 firstSampleOffset; + int firstSampleOffset; + int endSample; // Input frame size int BytesPerFrame() const { @@ -141,7 +142,7 @@ struct Atrac { if (loopEndSample_ <= 0) { // There's no looping, but we need to stream the data in our buffer. bufferState_ = ATRAC_STATUS_STREAMED_WITHOUT_LOOP; - } else if (loopEndSample_ == endSample_ + track_.firstSampleOffset + (int)FirstOffsetExtra()) { + } else if (loopEndSample_ == track_.endSample + track_.firstSampleOffset + (int)FirstOffsetExtra()) { bufferState_ = ATRAC_STATUS_STREAMED_LOOP_FROM_END; } else { bufferState_ = ATRAC_STATUS_STREAMED_LOOP_WITH_TRAILER; @@ -192,7 +193,6 @@ struct Atrac { u16 outputChannels_ = 2; int currentSample_ = 0; - int endSample_ = 0; std::vector loopinfo_; int loopStartSample_ = -1; diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp index 1c8a9421b0..8e59219ac3 100644 --- a/Core/HLE/sceAtrac.cpp +++ b/Core/HLE/sceAtrac.cpp @@ -290,7 +290,7 @@ static u32 sceAtracGetBufferInfoForResetting(int atracID, int sample, u32 buffer return hleReportError(ME, SCE_KERNEL_ERROR_ILLEGAL_ADDR, "invalid buffer, should crash"); } else if (atrac->BufferState() == ATRAC_STATUS_STREAMED_LOOP_WITH_TRAILER && atrac->second_.size == 0) { return hleReportError(ME, ATRAC_ERROR_SECOND_BUFFER_NEEDED, "no second buffer"); - } else if ((u32)sample + atrac->GetTrack().firstSampleOffset > (u32)atrac->endSample_ + atrac->GetTrack().firstSampleOffset) { + } else if ((u32)sample + atrac->GetTrack().firstSampleOffset > (u32)atrac->GetTrack().endSample + atrac->GetTrack().firstSampleOffset) { // NOTE: Above we have to add firstSampleOffset to both sides - we seem to rely on wraparound. return hleLogWarning(ME, ATRAC_ERROR_BAD_SAMPLE, "invalid sample position"); } else { @@ -393,7 +393,7 @@ static u32 sceAtracGetNextDecodePosition(int atracID, u32 outposAddr) { } if (Memory::IsValidAddress(outposAddr)) { - if (atrac->currentSample_ >= atrac->endSample_) { + if (atrac->currentSample_ >= atrac->GetTrack().endSample) { Memory::WriteUnchecked_U32(0, outposAddr); return hleLogSuccessI(ME, ATRAC_ERROR_ALL_DATA_DECODED, "all data decoded"); } else { @@ -412,7 +412,7 @@ static u32 sceAtracGetNextSample(int atracID, u32 outNAddr) { // Already logged. return err; } - if (atrac->currentSample_ >= atrac->endSample_) { + if (atrac->currentSample_ >= atrac->GetTrack().endSample) { if (Memory::IsValidAddress(outNAddr)) Memory::WriteUnchecked_U32(0, outNAddr); return hleLogSuccessI(ME, 0, "0 samples left"); @@ -475,7 +475,7 @@ static u32 sceAtracGetSoundSample(int atracID, u32 outEndSampleAddr, u32 outLoop auto outEndSample = PSPPointer::Create(outEndSampleAddr); if (outEndSample.IsValid()) - *outEndSample = atrac->endSample_; + *outEndSample = atrac->GetTrack().endSample; auto outLoopStart = PSPPointer::Create(outLoopStartSampleAddr); if (outLoopStart.IsValid()) *outLoopStart = atrac->loopStartSample_ == -1 ? -1 : atrac->loopStartSample_ - atrac->track_.firstSampleOffset - atrac->FirstOffsetExtra(); @@ -534,7 +534,7 @@ static u32 sceAtracResetPlayPosition(int atracID, int sample, int bytesWrittenFi if (atrac->BufferState() == ATRAC_STATUS_STREAMED_LOOP_WITH_TRAILER && atrac->second_.size == 0) { return hleReportError(ME, ATRAC_ERROR_SECOND_BUFFER_NEEDED, "no second buffer"); - } else if ((u32)sample + atrac->GetTrack().firstSampleOffset > (u32)atrac->endSample_ + atrac->GetTrack().firstSampleOffset) { + } else if ((u32)sample + atrac->GetTrack().firstSampleOffset > (u32)atrac->GetTrack().endSample + atrac->GetTrack().firstSampleOffset) { // NOTE: Above we have to add firstSampleOffset to both sides - we seem to rely on wraparound. return hleLogWarning(ME, ATRAC_ERROR_BAD_SAMPLE, "invalid sample position"); } From fe17ff6e69238d1442a2bf438ea850fff2b0176c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 14 Apr 2024 18:28:49 +0200 Subject: [PATCH 140/719] Move loop info into Track --- Core/HLE/AtracCtx.cpp | 70 ++++++++++++++++++++++--------------------- Core/HLE/AtracCtx.h | 12 ++++---- Core/HLE/sceAtrac.cpp | 8 ++--- 3 files changed, 46 insertions(+), 44 deletions(-) diff --git a/Core/HLE/AtracCtx.cpp b/Core/HLE/AtracCtx.cpp index eaa643aaaf..e686a5bcf5 100644 --- a/Core/HLE/AtracCtx.cpp +++ b/Core/HLE/AtracCtx.cpp @@ -96,14 +96,14 @@ void Atrac::DoState(PointerWrap &p) { Do(p, bitrate_); Do(p, track_.bytesPerFrame); - Do(p, loopinfo_); + Do(p, track_.loopinfo); if (s < 9) { int oldLoopInfoNum = 42; Do(p, oldLoopInfoNum); } - Do(p, loopStartSample_); - Do(p, loopEndSample_); + Do(p, track_.loopStartSample); + Do(p, track_.loopEndSample); Do(p, loopNum_); Do(p, context_); @@ -170,9 +170,9 @@ void Atrac::AnalyzeReset() { currentSample_ = 0; track_.endSample = -1; loopNum_ = 0; - loopinfo_.clear(); - loopStartSample_ = -1; - loopEndSample_ = -1; + track_.loopinfo.clear(); + track_.loopStartSample = -1; + track_.loopEndSample = -1; decodePos_ = 0; bufferPos_ = 0; channels_ = 2; @@ -202,8 +202,8 @@ void Atrac::WriteContextToPSPMem() { context->info.secondBufferByte = second_.size; context->info.codec = track_.codecType; context->info.loopNum = loopNum_; - context->info.loopStart = loopStartSample_ > 0 ? loopStartSample_ : 0; - context->info.loopEnd = loopEndSample_ > 0 ? loopEndSample_ : 0; + context->info.loopStart = track_.loopStartSample > 0 ? track_.loopStartSample : 0; + context->info.loopEnd = track_.loopEndSample > 0 ? track_.loopEndSample : 0; // Note that we read in the state when loading the atrac object, so it's safe // to update it back here all the time. Some games, like Sol Trigger, change it. @@ -371,19 +371,19 @@ int Atrac::Analyze(u32 addr, u32 size) { return hleReportError(ME, ATRAC_ERROR_UNKNOWN_FORMAT, "bad checkNumLoops (%d)", checkNumLoops); } - loopinfo_.resize(checkNumLoops); + track->loopinfo.resize(checkNumLoops); u32 loopinfoAddr = addr + offset + 36; // The PSP only cares about the first loop start and end, it seems. // Most likely can skip the rest of this data, but it's not hurting anyone. for (int i = 0; i < checkNumLoops && 36 + (u32)i < chunkSize; i++, loopinfoAddr += 24) { - loopinfo_[i].cuePointID = Memory::Read_U32(loopinfoAddr); - loopinfo_[i].type = Memory::Read_U32(loopinfoAddr + 4); - loopinfo_[i].startSample = Memory::Read_U32(loopinfoAddr + 8); - loopinfo_[i].endSample = Memory::Read_U32(loopinfoAddr + 12); - loopinfo_[i].fraction = Memory::Read_U32(loopinfoAddr + 16); - loopinfo_[i].playCount = Memory::Read_U32(loopinfoAddr + 20); + track->loopinfo[i].cuePointID = Memory::Read_U32(loopinfoAddr); + track->loopinfo[i].type = Memory::Read_U32(loopinfoAddr + 4); + track->loopinfo[i].startSample = Memory::Read_U32(loopinfoAddr + 8); + track->loopinfo[i].endSample = Memory::Read_U32(loopinfoAddr + 12); + track->loopinfo[i].fraction = Memory::Read_U32(loopinfoAddr + 16); + track->loopinfo[i].playCount = Memory::Read_U32(loopinfoAddr + 20); - if (loopinfo_[i].startSample >= loopinfo_[i].endSample) { + if (track->loopinfo[i].startSample >= track->loopinfo[i].endSample) { return hleReportError(ME, ATRAC_ERROR_BAD_CODEC_PARAMS, "loop starts after it ends"); } } @@ -413,12 +413,12 @@ int Atrac::Analyze(u32 addr, u32 size) { } // set the loopStartSample_ and loopEndSample_ by loopinfo_ - if (loopinfo_.size() > 0) { - loopStartSample_ = loopinfo_[0].startSample + ::FirstOffsetExtra(track->codecType) + sampleOffsetAdjust; - loopEndSample_ = loopinfo_[0].endSample + ::FirstOffsetExtra(track->codecType) + sampleOffsetAdjust; + if (track->loopinfo.size() > 0) { + track->loopStartSample = track->loopinfo[0].startSample + ::FirstOffsetExtra(track->codecType) + sampleOffsetAdjust; + track->loopEndSample = track->loopinfo[0].endSample + ::FirstOffsetExtra(track->codecType) + sampleOffsetAdjust; } else { - loopStartSample_ = -1; - loopEndSample_ = -1; + track->loopStartSample = -1; + track->loopEndSample = -1; } // if there is no correct endsample, try to guess it @@ -428,7 +428,7 @@ int Atrac::Analyze(u32 addr, u32 size) { } track->endSample -= 1; - if (loopEndSample_ != -1 && loopEndSample_ > track->endSample + track->firstSampleOffset + (int)::FirstOffsetExtra(track->codecType)) { + if (track->loopEndSample != -1 && track->loopEndSample > track->endSample + track->firstSampleOffset + (int)::FirstOffsetExtra(track->codecType)) { return hleReportError(ME, ATRAC_ERROR_BAD_CODEC_PARAMS, "loop after end of data"); } @@ -536,7 +536,7 @@ void Atrac::CalculateStreamInfo(u32 *outReadOffset) { first_.offset = 0; first_.writableBytes = 0; } else { - readOffset = FileOffsetBySample(loopStartSample_ - FirstOffsetExtra() - track_.firstSampleOffset - track_.SamplesPerFrame() * 2); + readOffset = FileOffsetBySample(track_.loopStartSample - FirstOffsetExtra() - track_.firstSampleOffset - track_.SamplesPerFrame() * 2); } } @@ -687,7 +687,7 @@ int Atrac::SetData(u32 buffer, u32 readSize, u32 bufferSize, int successCode) { } u32 Atrac::SetSecondBuffer(u32 secondBuffer, u32 secondBufferSize) { - u32 secondFileOffset = FileOffsetBySample(loopEndSample_ - track_.firstSampleOffset); + u32 secondFileOffset = FileOffsetBySample(track_.loopEndSample - track_.firstSampleOffset); u32 desiredSize = track_.fileSize - secondFileOffset; // 3 seems to be the number of frames required to handle a loop. @@ -712,7 +712,7 @@ int Atrac::GetSecondBufferInfo(u32 *fileOffset, u32 *desiredSize) { return hleLogWarning(ME, ATRAC_ERROR_SECOND_BUFFER_NOT_NEEDED, "not needed"); } - *fileOffset = FileOffsetBySample(loopEndSample_ - track_.firstSampleOffset); + *fileOffset = FileOffsetBySample(track_.loopEndSample - track_.firstSampleOffset); *desiredSize = track_.fileSize - *fileOffset; return hleLogSuccessI(ME, 0); } @@ -752,7 +752,7 @@ int Atrac::AddStreamData(u32 bytesToAdd) { if (PSP_CoreParameter().compat.flags().AtracLoopHack && bufferState_ == ATRAC_STATUS_STREAMED_LOOP_FROM_END && RemainingFrames() > 2) { loopNum_++; - SeekToSample(loopStartSample_ - FirstOffsetExtra() - track_.firstSampleOffset); + SeekToSample(track_.loopStartSample - FirstOffsetExtra() - track_.firstSampleOffset); } return 0; @@ -843,7 +843,7 @@ int Atrac::RemainingFrames() const { if (bufferState_ == ATRAC_STATUS_STREAMED_WITHOUT_LOOP) { return PSP_ATRAC_NONLOOP_STREAM_DATA_IS_ON_MEMORY; } - int loopEndAdjusted = loopEndSample_ - FirstOffsetExtra() - track_.firstSampleOffset; + int loopEndAdjusted = track_.loopEndSample - FirstOffsetExtra() - track_.firstSampleOffset; if (bufferState_ == ATRAC_STATUS_STREAMED_LOOP_WITH_TRAILER && currentSample_ > loopEndAdjusted) { // No longer looping in this case, outside the loop. return PSP_ATRAC_NONLOOP_STREAM_DATA_IS_ON_MEMORY; @@ -980,20 +980,20 @@ u32 Atrac::DecodeData(u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u32 *finish, i int finishFlag = 0; // TODO: Verify. bool hitEnd = currentSample_ >= track_.endSample || (numSamples == 0 && first_.size >= track_.fileSize); - int loopEndAdjusted = loopEndSample_ - FirstOffsetExtra() - track_.firstSampleOffset; + int loopEndAdjusted = track_.loopEndSample - FirstOffsetExtra() - track_.firstSampleOffset; if ((hitEnd || currentSample_ > loopEndAdjusted) && loopNum != 0) { - SeekToSample(loopStartSample_ - FirstOffsetExtra() - track_.firstSampleOffset); + SeekToSample(track_.loopStartSample - FirstOffsetExtra() - track_.firstSampleOffset); if (bufferState_ != ATRAC_STATUS_FOR_SCESAS) { if (loopNum_ > 0) loopNum_--; } if ((bufferState_ & ATRAC_STATUS_STREAMED_MASK) == ATRAC_STATUS_STREAMED_MASK) { // Whatever bytes we have left were added from the loop. - u32 loopOffset = FileOffsetBySample(loopStartSample_ - FirstOffsetExtra() - track_.firstSampleOffset - track_.SamplesPerFrame() * 2); + u32 loopOffset = FileOffsetBySample(track_.loopStartSample - FirstOffsetExtra() - track_.firstSampleOffset - track_.SamplesPerFrame() * 2); // TODO: Hmm, need to manage the buffer better. But don't move fileoffset if we already have valid data. if (loopOffset > first_.fileoffset || loopOffset + bufferValidBytes_ < first_.fileoffset) { // Skip the initial frame at the start. - first_.fileoffset = FileOffsetBySample(loopStartSample_ - FirstOffsetExtra() - track_.firstSampleOffset - track_.SamplesPerFrame() * 2); + first_.fileoffset = FileOffsetBySample(track_.loopStartSample - FirstOffsetExtra() - track_.firstSampleOffset - track_.SamplesPerFrame() * 2); } } } else if (hitEnd) { @@ -1014,10 +1014,12 @@ u32 Atrac::DecodeData(u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u32 *finish, i void Atrac::SetLoopNum(int loopNum) { // Spammed in MHU loopNum_ = loopNum; - if (loopNum != 0 && loopinfo_.size() == 0) { + if (loopNum != 0 && track_.loopinfo.size() == 0) { // Just loop the whole audio - loopStartSample_ = track_.firstSampleOffset + FirstOffsetExtra(); - loopEndSample_ = track_.endSample + track_.firstSampleOffset + FirstOffsetExtra(); + // This is a rare modification of track_ after the fact. + // Maybe we can get away with setting these by default. + track_.loopStartSample = track_.firstSampleOffset + FirstOffsetExtra(); + track_.loopEndSample = track_.endSample + track_.firstSampleOffset + FirstOffsetExtra(); } WriteContextToPSPMem(); } diff --git a/Core/HLE/AtracCtx.h b/Core/HLE/AtracCtx.h index 4b3b710a26..674ec9a973 100644 --- a/Core/HLE/AtracCtx.h +++ b/Core/HLE/AtracCtx.h @@ -113,6 +113,10 @@ struct Track { int firstSampleOffset; int endSample; + std::vector loopinfo; + int loopStartSample = -1; + int loopEndSample = -1; + // Input frame size int BytesPerFrame() const { return bytesPerFrame; @@ -139,10 +143,10 @@ struct Atrac { bufferState_ = ATRAC_STATUS_ALL_DATA_LOADED; } } else { - if (loopEndSample_ <= 0) { + if (track_.loopEndSample <= 0) { // There's no looping, but we need to stream the data in our buffer. bufferState_ = ATRAC_STATUS_STREAMED_WITHOUT_LOOP; - } else if (loopEndSample_ == track_.endSample + track_.firstSampleOffset + (int)FirstOffsetExtra()) { + } else if (track_.loopEndSample == track_.endSample + track_.firstSampleOffset + (int)FirstOffsetExtra()) { bufferState_ = ATRAC_STATUS_STREAMED_LOOP_FROM_END; } else { bufferState_ = ATRAC_STATUS_STREAMED_LOOP_WITH_TRAILER; @@ -193,10 +197,6 @@ struct Atrac { u16 outputChannels_ = 2; int currentSample_ = 0; - - std::vector loopinfo_; - int loopStartSample_ = -1; - int loopEndSample_ = -1; int loopNum_ = 0; InputBuffer first_{}; diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp index 8e59219ac3..3ee875cf4e 100644 --- a/Core/HLE/sceAtrac.cpp +++ b/Core/HLE/sceAtrac.cpp @@ -345,7 +345,7 @@ static u32 sceAtracGetLoopStatus(int atracID, u32 loopNumAddr, u32 statusAddr) { Memory::WriteUnchecked_U32(atrac->loopNum_, loopNumAddr); // return audio's loopinfo in at3 file if (Memory::IsValidAddress(statusAddr)) { - if (atrac->loopinfo_.size() > 0) + if (atrac->GetTrack().loopinfo.size() > 0) Memory::WriteUnchecked_U32(1, statusAddr); else Memory::WriteUnchecked_U32(0, statusAddr); @@ -478,10 +478,10 @@ static u32 sceAtracGetSoundSample(int atracID, u32 outEndSampleAddr, u32 outLoop *outEndSample = atrac->GetTrack().endSample; auto outLoopStart = PSPPointer::Create(outLoopStartSampleAddr); if (outLoopStart.IsValid()) - *outLoopStart = atrac->loopStartSample_ == -1 ? -1 : atrac->loopStartSample_ - atrac->track_.firstSampleOffset - atrac->FirstOffsetExtra(); + *outLoopStart = atrac->GetTrack().loopStartSample == -1 ? -1 : atrac->GetTrack().loopStartSample - atrac->GetTrack().firstSampleOffset - atrac->FirstOffsetExtra(); auto outLoopEnd = PSPPointer::Create(outLoopEndSampleAddr); if (outLoopEnd.IsValid()) - *outLoopEnd = atrac->loopEndSample_ == -1 ? -1 : atrac->loopEndSample_ - atrac->track_.firstSampleOffset - atrac->FirstOffsetExtra(); + *outLoopEnd = atrac->GetTrack().loopEndSample == -1 ? -1 : atrac->GetTrack().loopEndSample - atrac->GetTrack().firstSampleOffset - atrac->FirstOffsetExtra(); if (!outEndSample.IsValid() || !outLoopStart.IsValid() || !outLoopEnd.IsValid()) { return hleReportError(ME, 0, "invalid address"); @@ -669,7 +669,7 @@ static u32 sceAtracSetLoopNum(int atracID, int loopNum) { // Already logged. return err; } - if (atrac->loopinfo_.size() == 0) { + if (atrac->GetTrack().loopinfo.size() == 0) { return hleLogError(ME, ATRAC_ERROR_NO_LOOP_INFORMATION, "no loop information"); } From 5c1ab7e6991d27eda6f4d010c3d9eeda1fdede13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 14 Apr 2024 18:31:26 +0200 Subject: [PATCH 141/719] Move dataOff into Track --- Core/HLE/AtracCtx.cpp | 30 +++++++++++++++--------------- Core/HLE/AtracCtx.h | 6 +++--- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Core/HLE/AtracCtx.cpp b/Core/HLE/AtracCtx.cpp index e686a5bcf5..38dbffacbb 100644 --- a/Core/HLE/AtracCtx.cpp +++ b/Core/HLE/AtracCtx.cpp @@ -64,9 +64,9 @@ void Atrac::DoState(PointerWrap &p) { Do(p, track_.endSample); Do(p, track_.firstSampleOffset); if (s >= 3) { - Do(p, dataOff_); + Do(p, track_.dataOff); } else { - dataOff_ = track_.firstSampleOffset; + track_.dataOff = track_.firstSampleOffset; } u32 hasDataBuf = dataBuf_ != nullptr; @@ -127,10 +127,10 @@ void Atrac::DoState(PointerWrap &p) { Do(p, bufferValidBytes_); Do(p, bufferHeaderSize_); } else { - bufferHeaderSize_ = dataOff_; - bufferValidBytes_ = std::min(first_.size - dataOff_, StreamBufferEnd() - dataOff_); + bufferHeaderSize_ = track_.dataOff; + bufferValidBytes_ = std::min(first_.size - track_.dataOff, StreamBufferEnd() - track_.dataOff); if ((bufferState_ & ATRAC_STATUS_STREAMED_MASK) == ATRAC_STATUS_STREAMED_MASK) { - bufferPos_ = dataOff_; + bufferPos_ = track_.dataOff; } } @@ -216,12 +216,12 @@ void Atrac::WriteContextToPSPMem() { } context->info.sampleSize = track_.bytesPerFrame; context->info.numChan = channels_; - context->info.dataOff = dataOff_; + context->info.dataOff = track_.dataOff; context->info.endSample = track_.endSample + track_.firstSampleOffset + FirstOffsetExtra(); context->info.dataEnd = track_.fileSize; context->info.curOff = first_.fileoffset; context->info.decodePos = DecodePosBySample(currentSample_); - context->info.streamDataByte = first_.size - dataOff_; + context->info.streamDataByte = first_.size - track_.dataOff; u8 *buf = (u8 *)context; *(u32_le *)(buf + 0xfc) = atracID_; @@ -392,7 +392,7 @@ int Atrac::Analyze(u32 addr, u32 size) { case DATA_CHUNK_MAGIC: { bfoundData = true; - dataOff_ = offset; + track->dataOff = offset; dataChunkSize = chunkSize; if (track->fileSize < offset + chunkSize) { WARN_LOG_REPORT(ME, "Atrac data chunk extends beyond riff chunk"); @@ -496,10 +496,10 @@ int Atrac::AnalyzeAA3(u32 addr, u32 size, u32 filesize) { return hleReportError(ME, ATRAC_ERROR_AA3_INVALID_DATA, "invalid codec type %d", buffer[32]); } - dataOff_ = 10 + tagSize + 96; + track->dataOff = 10 + tagSize + 96; track->firstSampleOffset = 0; if (track->endSample < 0 && track->bytesPerFrame != 0) { - track->endSample = ((filesize - dataOff_) / track->bytesPerFrame) * track->SamplesPerFrame(); + track->endSample = ((filesize - track->dataOff) / track->bytesPerFrame) * track->SamplesPerFrame(); } track->endSample -= 1; return 0; @@ -616,7 +616,7 @@ void Atrac::GetResetBufferInfo(AtracResetBufferInfo *bufferInfo, int sample) { } else { bufferInfo->first.minWriteBytes = track_.bytesPerFrame * 2; } - if ((u32)sample < (u32)track_.firstSampleOffset && sampleFileOffset != dataOff_) { + if ((u32)sample < (u32)track_.firstSampleOffset && sampleFileOffset != track_.dataOff) { sampleFileOffset -= track_.bytesPerFrame; } bufferInfo->first.filePos = sampleFileOffset; @@ -665,8 +665,8 @@ int Atrac::SetData(u32 buffer, u32 readSize, u32 bufferSize, int successCode) { ignoreDataBuf_ = true; } if (bufferState_ == ATRAC_STATUS_STREAMED_WITHOUT_LOOP || bufferState_ == ATRAC_STATUS_STREAMED_LOOP_FROM_END || bufferState_ == ATRAC_STATUS_STREAMED_LOOP_WITH_TRAILER) { - bufferHeaderSize_ = dataOff_; - bufferPos_ = dataOff_ + track_.bytesPerFrame; + bufferHeaderSize_ = track_.dataOff; + bufferPos_ = track_.dataOff + track_.bytesPerFrame; bufferValidBytes_ = first_.size - bufferPos_; } @@ -822,7 +822,7 @@ void Atrac::SeekToSample(int sample) { } const u32 off = FileOffsetBySample(sample + adjust); const u32 backfill = track_.bytesPerFrame * 2; - const u32 start = off - dataOff_ < backfill ? dataOff_ : off - backfill; + const u32 start = off - track_.dataOff < backfill ? track_.dataOff : off - backfill; for (u32 pos = start; pos < off; pos += track_.bytesPerFrame) { decoder_->Decode(BufferStart() + pos, track_.bytesPerFrame, nullptr, nullptr, nullptr); @@ -1102,7 +1102,7 @@ void Atrac::InitLowLevel(u32 paramsAddr, bool jointStereo) { jointStereo_ = false; } - dataOff_ = 0; + track_.dataOff = 0; first_.size = 0; track_.fileSize = track_.bytesPerFrame; // not really meaningful bufferState_ = ATRAC_STATUS_LOW_LEVEL; diff --git a/Core/HLE/AtracCtx.h b/Core/HLE/AtracCtx.h index 674ec9a973..68ab88faf0 100644 --- a/Core/HLE/AtracCtx.h +++ b/Core/HLE/AtracCtx.h @@ -112,6 +112,8 @@ struct Track { u16 bytesPerFrame; int firstSampleOffset; int endSample; + // Offset of the first sample in the input buffer + int dataOff = 0; std::vector loopinfo; int loopStartSample = -1; @@ -167,7 +169,7 @@ struct Atrac { u32 FileOffsetBySample(int sample) const { int offsetSample = sample + track_.firstSampleOffset; int frameOffset = offsetSample / (int)track_.SamplesPerFrame(); - return (u32)(dataOff_ + track_.bytesPerFrame + frameOffset * track_.bytesPerFrame); + return (u32)(track_.dataOff + track_.bytesPerFrame + frameOffset * track_.bytesPerFrame); } const Track &GetTrack() const { @@ -186,8 +188,6 @@ struct Atrac { int RemainingFrames() const; u8 *dataBuf_ = nullptr; - // Offset of the first sample in the input buffer - int dataOff_ = 0; // Indicates that the dataBuf_ array should not be used. bool ignoreDataBuf_ = false; u32 decodePos_ = 0; From 0a275883ec87f58b99dad4e6e14b71f46de54a41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 14 Apr 2024 18:34:27 +0200 Subject: [PATCH 142/719] Move bitrate and jointstereo fields into Atrac --- Core/HLE/AtracCtx.cpp | 36 ++++++++++++++++++------------------ Core/HLE/AtracCtx.h | 6 +++--- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Core/HLE/AtracCtx.cpp b/Core/HLE/AtracCtx.cpp index 38dbffacbb..a655abbfef 100644 --- a/Core/HLE/AtracCtx.cpp +++ b/Core/HLE/AtracCtx.cpp @@ -45,7 +45,7 @@ void Atrac::DoState(PointerWrap &p) { Do(p, channels_); Do(p, outputChannels_); if (s >= 5) { - Do(p, jointStereo_); + Do(p, track_.jointStereo); } Do(p, atracID_); @@ -93,7 +93,7 @@ void Atrac::DoState(PointerWrap &p) { bufferPos_ = decodePos_; } - Do(p, bitrate_); + Do(p, track_.bitrate); Do(p, track_.bytesPerFrame); Do(p, track_.loopinfo); @@ -331,7 +331,7 @@ int Atrac::Analyze(u32 addr, u32 size) { if (at3fmt->samplerate != 44100) { return hleReportError(ME, ATRAC_ERROR_UNKNOWN_FORMAT, "unsupported sample rate: %d", at3fmt->samplerate); } - bitrate_ = at3fmt->avgBytesPerSec * 8; + track->bitrate = at3fmt->avgBytesPerSec * 8; track->bytesPerFrame = at3fmt->blockAlign; if (track->bytesPerFrame == 0) { return hleReportError(ME, ATRAC_ERROR_UNKNOWN_FORMAT, "invalid bytes per frame: %d", track->bytesPerFrame); @@ -342,7 +342,7 @@ int Atrac::Analyze(u32 addr, u32 size) { if (at3fmt->fmtTag == AT3_MAGIC) { // This is the offset to the jointStereo_ field. - jointStereo_ = Memory::Read_U32(addr + offset + 24); + track->jointStereo = Memory::Read_U32(addr + offset + 24); } } break; @@ -478,14 +478,14 @@ int Atrac::AnalyzeAA3(u32 addr, u32 size, u32 filesize) { case 0: track->codecType = PSP_MODE_AT_3; track->bytesPerFrame = (codecParams & 0x03FF) * 8; - bitrate_ = at3SampleRates[(codecParams >> 13) & 7] * track->bytesPerFrame * 8 / 1024; + track->bitrate = at3SampleRates[(codecParams >> 13) & 7] * track->bytesPerFrame * 8 / 1024; channels_ = 2; - jointStereo_ = (codecParams >> 17) & 1; + track->jointStereo = (codecParams >> 17) & 1; break; case 1: track->codecType = PSP_MODE_AT_3_PLUS; track->bytesPerFrame = ((codecParams & 0x03FF) * 8) + 8; - bitrate_ = at3SampleRates[(codecParams >> 13) & 7] * track->bytesPerFrame * 8 / 2048; + track->bitrate = at3SampleRates[(codecParams >> 13) & 7] * track->bytesPerFrame * 8 / 2048; channels_ = (codecParams >> 10) & 7; break; case 3: @@ -570,8 +570,8 @@ void Atrac::CreateDecoder() { // The only thing that changes are the jointStereo_ values. extraData[0] = 1; extraData[3] = channels_ << 3; - extraData[6] = jointStereo_; - extraData[8] = jointStereo_; + extraData[6] = track_.jointStereo; + extraData[8] = track_.jointStereo; extraData[10] = 1; decoder_ = CreateAtrac3Audio(channels_, track_.bytesPerFrame, extraData, sizeof(extraData)); } else { @@ -718,11 +718,11 @@ int Atrac::GetSecondBufferInfo(u32 *fileOffset, u32 *desiredSize) { } void Atrac::UpdateBitrate() { - bitrate_ = (track_.bytesPerFrame * 352800) / 1000; + track_.bitrate = (track_.bytesPerFrame * 352800) / 1000; if (track_.codecType == PSP_MODE_AT_3_PLUS) - bitrate_ = ((bitrate_ >> 11) + 8) & 0xFFFFFFF0; + track_.bitrate = ((track_.bitrate >> 11) + 8) & 0xFFFFFFF0; else - bitrate_ = (bitrate_ + 511) >> 10; + track_.bitrate = (track_.bitrate + 511) >> 10; } int Atrac::AddStreamData(u32 bytesToAdd) { @@ -1093,13 +1093,13 @@ void Atrac::InitLowLevel(u32 paramsAddr, bool jointStereo) { ResetData(); if (track_.codecType == PSP_MODE_AT_3) { - bitrate_ = (track_.bytesPerFrame * 352800) / 1000; - bitrate_ = (bitrate_ + 511) >> 10; - jointStereo_ = false; + track_.bitrate = (track_.bytesPerFrame * 352800) / 1000; + track_.bitrate = (track_.bitrate + 511) >> 10; + track_.jointStereo = false; } else if (track_.codecType == PSP_MODE_AT_3_PLUS) { - bitrate_ = (track_.bytesPerFrame * 352800) / 1000; - bitrate_ = ((bitrate_ >> 11) + 8) & 0xFFFFFFF0; - jointStereo_ = false; + track_.bitrate = (track_.bytesPerFrame * 352800) / 1000; + track_.bitrate = ((track_.bitrate >> 11) + 8) & 0xFFFFFFF0; + track_.jointStereo = false; } track_.dataOff = 0; diff --git a/Core/HLE/AtracCtx.h b/Core/HLE/AtracCtx.h index 68ab88faf0..c2339ff6e9 100644 --- a/Core/HLE/AtracCtx.h +++ b/Core/HLE/AtracCtx.h @@ -114,6 +114,8 @@ struct Track { int endSample; // Offset of the first sample in the input buffer int dataOff = 0; + u32 bitrate = 64; + int jointStereo = 0; std::vector loopinfo; int loopStartSample = -1; @@ -179,7 +181,7 @@ struct Atrac { void UpdateBitrate(); int Bitrate() const { - return bitrate_; + return track_.bitrate; } int Channels() const { return channels_; @@ -268,9 +270,7 @@ struct Atrac { private: void AnalyzeReset(); - u32 bitrate_ = 64; u32 bufferMaxSize_ = 0; - int jointStereo_ = 0; // Used to track streaming. u32 bufferPos_ = 0; From 9d0dac5acbd207f10faebfa90bfdde097c8b4410 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 14 Apr 2024 18:37:32 +0200 Subject: [PATCH 143/719] Move channels into Track --- Core/HLE/AtracCtx.cpp | 26 +++++++++++++------------- Core/HLE/AtracCtx.h | 4 ++-- Core/HLE/sceAtrac.cpp | 10 +++++----- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Core/HLE/AtracCtx.cpp b/Core/HLE/AtracCtx.cpp index a655abbfef..3d9e1702e7 100644 --- a/Core/HLE/AtracCtx.cpp +++ b/Core/HLE/AtracCtx.cpp @@ -42,7 +42,7 @@ void Atrac::DoState(PointerWrap &p) { if (!s) return; - Do(p, channels_); + Do(p, track_.channels); Do(p, outputChannels_); if (s >= 5) { Do(p, track_.jointStereo); @@ -175,7 +175,7 @@ void Atrac::AnalyzeReset() { track_.loopEndSample = -1; decodePos_ = 0; bufferPos_ = 0; - channels_ = 2; + track_.channels = 2; } void Atrac::UpdateContextFromPSPMem() { @@ -215,7 +215,7 @@ void Atrac::WriteContextToPSPMem() { context->info.samplesPerChan = (track_.codecType == PSP_MODE_AT_3_PLUS ? ATRAC3PLUS_MAX_SAMPLES : ATRAC3_MAX_SAMPLES); } context->info.sampleSize = track_.bytesPerFrame; - context->info.numChan = channels_; + context->info.numChan = track_.channels; context->info.dataOff = track_.dataOff; context->info.endSample = track_.endSample + track_.firstSampleOffset + FirstOffsetExtra(); context->info.dataEnd = track_.fileSize; @@ -324,9 +324,9 @@ int Atrac::Analyze(u32 addr, u32 size) { else { return hleReportError(ME, ATRAC_ERROR_UNKNOWN_FORMAT, "invalid fmt magic: %04x", at3fmt->fmtTag); } - channels_ = at3fmt->channels; - if (channels_ != 1 && channels_ != 2) { - return hleReportError(ME, ATRAC_ERROR_UNKNOWN_FORMAT, "invalid channel count: %d", channels_); + track->channels = at3fmt->channels; + if (track->channels != 1 && track->channels != 2) { + return hleReportError(ME, ATRAC_ERROR_UNKNOWN_FORMAT, "invalid channel count: %d", track->channels); } if (at3fmt->samplerate != 44100) { return hleReportError(ME, ATRAC_ERROR_UNKNOWN_FORMAT, "unsupported sample rate: %d", at3fmt->samplerate); @@ -479,14 +479,14 @@ int Atrac::AnalyzeAA3(u32 addr, u32 size, u32 filesize) { track->codecType = PSP_MODE_AT_3; track->bytesPerFrame = (codecParams & 0x03FF) * 8; track->bitrate = at3SampleRates[(codecParams >> 13) & 7] * track->bytesPerFrame * 8 / 1024; - channels_ = 2; + track->channels = 2; track->jointStereo = (codecParams >> 17) & 1; break; case 1: track->codecType = PSP_MODE_AT_3_PLUS; track->bytesPerFrame = ((codecParams & 0x03FF) * 8) + 8; track->bitrate = at3SampleRates[(codecParams >> 13) & 7] * track->bytesPerFrame * 8 / 2048; - channels_ = (codecParams >> 10) & 7; + track->channels = (codecParams >> 10) & 7; break; case 3: case 4: @@ -569,13 +569,13 @@ void Atrac::CreateDecoder() { uint8_t extraData[14]{}; // The only thing that changes are the jointStereo_ values. extraData[0] = 1; - extraData[3] = channels_ << 3; + extraData[3] = track_.channels << 3; extraData[6] = track_.jointStereo; extraData[8] = track_.jointStereo; extraData[10] = 1; - decoder_ = CreateAtrac3Audio(channels_, track_.bytesPerFrame, extraData, sizeof(extraData)); + decoder_ = CreateAtrac3Audio(track_.channels, track_.bytesPerFrame, extraData, sizeof(extraData)); } else { - decoder_ = CreateAtrac3PlusAudio(channels_, track_.bytesPerFrame); + decoder_ = CreateAtrac3PlusAudio(track_.channels, track_.bytesPerFrame); } // reinit decodePos, because ffmpeg had changed it. decodePos_ = 0; @@ -671,7 +671,7 @@ int Atrac::SetData(u32 buffer, u32 readSize, u32 bufferSize, int successCode) { } const char *codecName = track_.codecType == PSP_MODE_AT_3 ? "atrac3" : "atrac3+"; - const char *channelName = channels_ == 1 ? "mono" : "stereo"; + const char *channelName = track_.channels == 1 ? "mono" : "stereo"; // Over-allocate databuf to prevent going off the end if the bitstream is bad or if there are // bugs in the decoder. This happens, see issue #15788. Arbitrary, but let's make it a whole page on the popular @@ -1085,7 +1085,7 @@ u32 Atrac::ResetPlayPosition(int sample, int bytesWrittenFirstBuf, int bytesWrit } void Atrac::InitLowLevel(u32 paramsAddr, bool jointStereo) { - channels_ = Memory::Read_U32(paramsAddr); + track_.channels = Memory::Read_U32(paramsAddr); outputChannels_ = Memory::Read_U32(paramsAddr + 4); bufferMaxSize_ = Memory::Read_U32(paramsAddr + 8); track_.bytesPerFrame = bufferMaxSize_; diff --git a/Core/HLE/AtracCtx.h b/Core/HLE/AtracCtx.h index c2339ff6e9..09458be3f4 100644 --- a/Core/HLE/AtracCtx.h +++ b/Core/HLE/AtracCtx.h @@ -116,6 +116,7 @@ struct Track { int dataOff = 0; u32 bitrate = 64; int jointStereo = 0; + u16 channels = 0; std::vector loopinfo; int loopStartSample = -1; @@ -184,7 +185,7 @@ struct Atrac { return track_.bitrate; } int Channels() const { - return channels_; + return track_.channels; } int RemainingFrames() const; @@ -195,7 +196,6 @@ struct Atrac { u32 decodePos_ = 0; int atracID_ = -1; - u16 channels_ = 0; u16 outputChannels_ = 2; int currentSample_ = 0; diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp index 3ee875cf4e..8d8dad1466 100644 --- a/Core/HLE/sceAtrac.cpp +++ b/Core/HLE/sceAtrac.cpp @@ -765,7 +765,7 @@ static int sceAtracSetMOutHalfwayBuffer(int atracID, u32 buffer, u32 readSize, u // Already logged. return ret; } - if (atrac->channels_ != 1) { + if (atrac->GetTrack().channels != 1) { // It seems it still sets the data. atrac->outputChannels_ = 2; atrac->SetData(buffer, readSize, bufferSize); @@ -789,7 +789,7 @@ static u32 sceAtracSetMOutData(int atracID, u32 buffer, u32 bufferSize) { // Already logged. return ret; } - if (atrac->channels_ != 1) { + if (atrac->GetTrack().channels != 1) { // It seems it still sets the data. atrac->outputChannels_ = 2; atrac->SetData(buffer, bufferSize, bufferSize); @@ -809,7 +809,7 @@ static int sceAtracSetMOutDataAndGetID(u32 buffer, u32 bufferSize) { delete atrac; return ret; } - if (atrac->channels_ != 1) { + if (atrac->GetTrack().channels != 1) { delete atrac; return hleReportError(ME, ATRAC_ERROR_NOT_MONO, "not mono data"); } @@ -834,7 +834,7 @@ static int sceAtracSetMOutHalfwayBufferAndGetID(u32 buffer, u32 readSize, u32 bu delete atrac; return ret; } - if (atrac->channels_ != 1) { + if (atrac->GetTrack().channels != 1) { delete atrac; return hleReportError(ME, ATRAC_ERROR_NOT_MONO, "not mono data"); } @@ -937,7 +937,7 @@ static int sceAtracLowLevelInitDecoder(int atracID, u32 paramsAddr) { atrac->InitLowLevel(paramsAddr, jointStereo); const char *codecName = atrac->track_.codecType == PSP_MODE_AT_3 ? "atrac3" : "atrac3+"; - const char *channelName = atrac->channels_ == 1 ? "mono" : "stereo"; + const char *channelName = atrac->GetTrack().channels == 1 ? "mono" : "stereo"; return hleLogSuccessInfoI(ME, 0, "%s %s audio", codecName, channelName); } From 3c700aab35b747d9a0a6d0cdda55eac7a399985d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 14 Apr 2024 18:40:19 +0200 Subject: [PATCH 144/719] Break out the separate analyze functions. --- Core/HLE/AtracCtx.cpp | 44 +++++++++++++++++++++++-------------------- Core/HLE/AtracCtx.h | 3 +++ 2 files changed, 27 insertions(+), 20 deletions(-) diff --git a/Core/HLE/AtracCtx.cpp b/Core/HLE/AtracCtx.cpp index 3d9e1702e7..a84805aea3 100644 --- a/Core/HLE/AtracCtx.cpp +++ b/Core/HLE/AtracCtx.cpp @@ -230,17 +230,7 @@ void Atrac::WriteContextToPSPMem() { } int Atrac::Analyze(u32 addr, u32 size) { - Track *track = &track_; - *track = {}; - - struct RIFFFmtChunk { - u16_le fmtTag; - u16_le channels; - u32_le samplerate; - u32_le avgBytesPerSec; - u16_le blockAlign; - }; - + track_ = {}; first_ = {}; first_.addr = addr; first_.size = size; @@ -262,6 +252,20 @@ int Atrac::Analyze(u32 addr, u32 size) { return hleReportError(ME, ATRAC_ERROR_UNKNOWN_FORMAT, "invalid RIFF header"); } + int retval = AnalyzeAtracTrack(addr, size, &track_); + first_._filesize_dontuse = track_.fileSize; + return retval; +} + +int AnalyzeAtracTrack(u32 addr, u32 size, Track *track) { + struct RIFFFmtChunk { + u16_le fmtTag; + u16_le channels; + u32_le samplerate; + u32_le avgBytesPerSec; + u16_le blockAlign; + }; + u32 offset = 8; track->firstSampleOffset = 0; @@ -432,25 +436,23 @@ int Atrac::Analyze(u32 addr, u32 size) { return hleReportError(ME, ATRAC_ERROR_BAD_CODEC_PARAMS, "loop after end of data"); } - first_._filesize_dontuse = track->fileSize; return 0; } -int Atrac::AnalyzeAA3(u32 addr, u32 size, u32 filesize) { - Track *track = &track_; - *track = {}; - +int Atrac::AnalyzeAA3(u32 addr, u32 size, u32 fileSize) { first_.addr = addr; first_.size = size; - track->fileSize = filesize; - first_._filesize_dontuse = filesize; + first_._filesize_dontuse = fileSize; AnalyzeReset(); + return AnalyzeAA3Track(addr, size, fileSize, &track_); +} + +int AnalyzeAA3Track(u32 addr, u32 size, u32 fileSize, Track *track) { if (size < 10) { return hleReportError(ME, ATRAC_ERROR_AA3_SIZE_TOO_SMALL, "buffer too small"); } - // TODO: Make sure this validation is correct, more testing. const u8 *buffer = Memory::GetPointer(addr); @@ -469,6 +471,8 @@ int Atrac::AnalyzeAA3(u32 addr, u32 size, u32 filesize) { if (buffer[0] != 'E' || buffer[1] != 'A' || buffer[2] != '3') { return hleReportError(ME, ATRAC_ERROR_AA3_INVALID_DATA, "invalid EA3 magic bytes"); } + + track->fileSize = fileSize; // Based on FFmpeg's code. u32 codecParams = buffer[35] | (buffer[34] << 8) | (buffer[35] << 16); @@ -499,7 +503,7 @@ int Atrac::AnalyzeAA3(u32 addr, u32 size, u32 filesize) { track->dataOff = 10 + tagSize + 96; track->firstSampleOffset = 0; if (track->endSample < 0 && track->bytesPerFrame != 0) { - track->endSample = ((filesize - track->dataOff) / track->bytesPerFrame) * track->SamplesPerFrame(); + track->endSample = ((track->fileSize - track->dataOff) / track->bytesPerFrame) * track->SamplesPerFrame(); } track->endSample -= 1; return 0; diff --git a/Core/HLE/AtracCtx.h b/Core/HLE/AtracCtx.h index 09458be3f4..da73066886 100644 --- a/Core/HLE/AtracCtx.h +++ b/Core/HLE/AtracCtx.h @@ -133,6 +133,9 @@ struct Track { } }; +int AnalyzeAA3Track(u32 addr, u32 size, u32 filesize, Track *track); +int AnalyzeAtracTrack(u32 addr, u32 size, Track *track); + struct Atrac { ~Atrac() { ResetData(); From fcf0d8e06e58979b48b9207c34b86a85a24a06a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 14 Apr 2024 19:30:54 +0200 Subject: [PATCH 145/719] Add an outputChannels parameter to SetData to simplify the code --- Core/HLE/AtracCtx.cpp | 7 ++++--- Core/HLE/AtracCtx.h | 6 +++++- Core/HLE/sceAtrac.cpp | 42 +++++++++++++++--------------------------- 3 files changed, 24 insertions(+), 31 deletions(-) diff --git a/Core/HLE/AtracCtx.cpp b/Core/HLE/AtracCtx.cpp index a84805aea3..c31dee74b9 100644 --- a/Core/HLE/AtracCtx.cpp +++ b/Core/HLE/AtracCtx.cpp @@ -640,7 +640,9 @@ void Atrac::GetResetBufferInfo(AtracResetBufferInfo *bufferInfo, int sample) { bufferInfo->second.filePos = 0; } -int Atrac::SetData(u32 buffer, u32 readSize, u32 bufferSize, int successCode) { +int Atrac::SetData(u32 buffer, u32 readSize, u32 bufferSize, int outputChannels, int successCode) { + outputChannels_ = outputChannels; + first_.addr = buffer; first_.size = readSize; @@ -932,8 +934,7 @@ u32 Atrac::DecodeData(u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u32 *finish, i uint8_t *indata = BufferStart() + off; int bytesConsumed = 0; int outBytes = 0; - if (!decoder_->Decode(indata, track_.bytesPerFrame, &bytesConsumed, - outbuf, &outBytes)) { + if (!decoder_->Decode(indata, track_.bytesPerFrame, &bytesConsumed, outbuf, &outBytes)) { // Decode failed. *SamplesNum = 0; *finish = 1; diff --git a/Core/HLE/AtracCtx.h b/Core/HLE/AtracCtx.h index da73066886..ae02e1b767 100644 --- a/Core/HLE/AtracCtx.h +++ b/Core/HLE/AtracCtx.h @@ -108,6 +108,7 @@ inline u32 FirstOffsetExtra(int codecType) { struct Track { u32 fileSize; + // This both does and doesn't belong in Track - it's fixed for an Atrac instance. Oh well. u32 codecType; u16 bytesPerFrame; int firstSampleOffset; @@ -192,6 +193,9 @@ struct Atrac { } int RemainingFrames() const; + int GetOutputChannels() const { + return outputChannels_; + } u8 *dataBuf_ = nullptr; // Indicates that the dataBuf_ array should not be used. @@ -261,7 +265,7 @@ struct Atrac { void SetLoopNum(int loopNum); u32 ResetPlayPosition(int sample, int bytesWrittenFirstBuf, int bytesWrittenSecondBuf); void GetResetBufferInfo(AtracResetBufferInfo *bufferInfo, int sample); - int SetData(u32 buffer, u32 readSize, u32 bufferSize, int successCode = 0); + int SetData(u32 buffer, u32 readSize, u32 bufferSize, int outputChannels, int successCode); u32 SetSecondBuffer(u32 secondBuffer, u32 secondBufferSize); int GetSecondBufferInfo(u32 *fileOffset, u32 *desiredSize); u32 DecodeData(u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u32 *finish, int *remains); diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp index 8d8dad1466..13344f209a 100644 --- a/Core/HLE/sceAtrac.cpp +++ b/Core/HLE/sceAtrac.cpp @@ -548,12 +548,12 @@ static u32 sceAtracResetPlayPosition(int atracID, int sample, int bytesWrittenFi return hleDelayResult(hleLogSuccessInfoI(ME, 0), "reset play pos", 3000); } -static int _AtracSetData(int atracID, u32 buffer, u32 readSize, u32 bufferSize, bool needReturnAtracID = false) { +static int _AtracSetData(int atracID, u32 buffer, u32 readSize, u32 bufferSize, int outputChannels, bool needReturnAtracID) { Atrac *atrac = getAtrac(atracID); // Don't use AtracValidateManaged here. if (!atrac) return hleLogError(ME, ATRAC_ERROR_BAD_ATRACID, "invalid atrac ID"); - int ret = atrac->SetData(buffer, readSize, bufferSize, needReturnAtracID ? atracID : 0); + int ret = atrac->SetData(buffer, readSize, bufferSize, outputChannels, needReturnAtracID ? atracID : 0); // not sure the real delay time return hleDelayResult(ret, "atrac set data", 100); } @@ -575,8 +575,7 @@ static u32 sceAtracSetHalfwayBuffer(int atracID, u32 buffer, u32 readSize, u32 b return ret; } - atrac->outputChannels_ = 2; - return _AtracSetData(atracID, buffer, readSize, bufferSize); + return _AtracSetData(atracID, buffer, readSize, bufferSize, 2, false); } static u32 sceAtracSetSecondBuffer(int atracID, u32 secondBuffer, u32 secondBufferSize) { @@ -607,8 +606,7 @@ static u32 sceAtracSetData(int atracID, u32 buffer, u32 bufferSize) { return hleReportError(ME, ATRAC_ERROR_WRONG_CODECTYPE, "atracID uses different codec type than data"); } - atrac->outputChannels_ = 2; - return _AtracSetData(atracID, buffer, bufferSize, bufferSize); + return _AtracSetData(atracID, buffer, bufferSize, bufferSize, 2, false); } static int sceAtracSetDataAndGetID(u32 buffer, int bufferSize) { @@ -632,8 +630,7 @@ static int sceAtracSetDataAndGetID(u32 buffer, int bufferSize) { return hleLogError(ME, atracID, "no free ID"); } - atrac->outputChannels_ = 2; - return _AtracSetData(atracID, buffer, bufferSize, bufferSize, true); + return _AtracSetData(atracID, buffer, bufferSize, bufferSize, 2, true); } static int sceAtracSetHalfwayBufferAndGetID(u32 buffer, u32 readSize, u32 bufferSize) { @@ -652,9 +649,7 @@ static int sceAtracSetHalfwayBufferAndGetID(u32 buffer, u32 readSize, u32 buffer delete atrac; return hleLogError(ME, atracID, "no free ID"); } - - atrac->outputChannels_ = 2; - return _AtracSetData(atracID, buffer, readSize, bufferSize, true); + return _AtracSetData(atracID, buffer, readSize, bufferSize, 2, true); } static u32 sceAtracStartEntry() { @@ -730,7 +725,7 @@ static int sceAtracGetOutputChannel(int atracID, u32 outputChanPtr) { return err; } if (Memory::IsValidAddress(outputChanPtr)) { - Memory::WriteUnchecked_U32(atrac->outputChannels_, outputChanPtr); + Memory::WriteUnchecked_U32(atrac->GetOutputChannels(), outputChanPtr); return hleLogSuccessI(ME, 0); } else { return hleLogError(ME, 0, "invalid address"); @@ -767,12 +762,10 @@ static int sceAtracSetMOutHalfwayBuffer(int atracID, u32 buffer, u32 readSize, u } if (atrac->GetTrack().channels != 1) { // It seems it still sets the data. - atrac->outputChannels_ = 2; - atrac->SetData(buffer, readSize, bufferSize); + atrac->SetData(buffer, readSize, bufferSize, 2, 0); return hleReportError(ME, ATRAC_ERROR_NOT_MONO, "not mono data"); } else { - atrac->outputChannels_ = 1; - return _AtracSetData(atracID, buffer, readSize, bufferSize); + return _AtracSetData(atracID, buffer, readSize, bufferSize, 1, false); } } @@ -791,12 +784,11 @@ static u32 sceAtracSetMOutData(int atracID, u32 buffer, u32 bufferSize) { } if (atrac->GetTrack().channels != 1) { // It seems it still sets the data. - atrac->outputChannels_ = 2; - atrac->SetData(buffer, bufferSize, bufferSize); + atrac->SetData(buffer, bufferSize, bufferSize, 2, 0); return hleReportError(ME, ATRAC_ERROR_NOT_MONO, "not mono data"); } else { atrac->outputChannels_ = 1; - return _AtracSetData(atracID, buffer, bufferSize, bufferSize); + return _AtracSetData(atracID, buffer, bufferSize, bufferSize, 1, false); } } @@ -819,8 +811,7 @@ static int sceAtracSetMOutDataAndGetID(u32 buffer, u32 bufferSize) { return hleLogError(ME, atracID, "no free ID"); } - atrac->outputChannels_ = 1; - return _AtracSetData(atracID, buffer, bufferSize, bufferSize, true); + return _AtracSetData(atracID, buffer, bufferSize, bufferSize, 1, true); } static int sceAtracSetMOutHalfwayBufferAndGetID(u32 buffer, u32 readSize, u32 bufferSize) { @@ -844,8 +835,7 @@ static int sceAtracSetMOutHalfwayBufferAndGetID(u32 buffer, u32 readSize, u32 bu return hleLogError(ME, atracID, "no free ID"); } - atrac->outputChannels_ = 1; - return _AtracSetData(atracID, buffer, readSize, bufferSize, true); + return _AtracSetData(atracID, buffer, readSize, bufferSize, 1, true); } static int sceAtracSetAA3DataAndGetID(u32 buffer, u32 bufferSize, u32 fileSize, u32 metadataSizeAddr) { @@ -862,8 +852,7 @@ static int sceAtracSetAA3DataAndGetID(u32 buffer, u32 bufferSize, u32 fileSize, return hleLogError(ME, atracID, "no free ID"); } - atrac->outputChannels_ = 2; - return _AtracSetData(atracID, buffer, bufferSize, bufferSize, true); + return _AtracSetData(atracID, buffer, bufferSize, bufferSize, 2, true); } static u32 _sceAtracGetContextAddress(int atracID) { @@ -985,8 +974,7 @@ static int sceAtracSetAA3HalfwayBufferAndGetID(u32 buffer, u32 readSize, u32 buf return hleLogError(ME, atracID, "no free ID"); } - atrac->outputChannels_ = 2; - return _AtracSetData(atracID, buffer, readSize, bufferSize, true); + return _AtracSetData(atracID, buffer, readSize, bufferSize, 2, true); } // External interface used by sceSas' AT3 integration. From 3e49a32fa8870185c36c910f1daf12a866d4865f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 14 Apr 2024 19:49:15 +0200 Subject: [PATCH 146/719] Comment fixes --- Core/HLE/AtracCtx.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/Core/HLE/AtracCtx.cpp b/Core/HLE/AtracCtx.cpp index c31dee74b9..8d5d668b19 100644 --- a/Core/HLE/AtracCtx.cpp +++ b/Core/HLE/AtracCtx.cpp @@ -925,7 +925,6 @@ u32 Atrac::DecodeData(u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u32 *finish, i ConsumeFrame(); } - // TODO: We don't support any other codec type, check seems unnecessary? SeekToSample(currentSample_); bool gotFrame = false; From d4020687459c5e428b27016066eea8af897fd21a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 14 Apr 2024 19:43:37 +0200 Subject: [PATCH 147/719] Fix mono output from Atrac decoders. (sceAtrac*MOut* functions) --- Core/HLE/AtracCtx.cpp | 4 ++-- Core/HLE/sceAtrac.cpp | 2 +- Core/HLE/sceAudiocodec.cpp | 2 +- Core/HLE/sceMp3.cpp | 2 +- Core/HW/Atrac3Standalone.cpp | 24 +++++++++++++++++------- Core/HW/MediaEngine.cpp | 2 +- Core/HW/SimpleAudioDec.cpp | 11 +++++++---- Core/HW/SimpleAudioDec.h | 2 +- UI/BackgroundAudio.cpp | 2 +- 9 files changed, 32 insertions(+), 19 deletions(-) diff --git a/Core/HLE/AtracCtx.cpp b/Core/HLE/AtracCtx.cpp index 8d5d668b19..0a9dffce8d 100644 --- a/Core/HLE/AtracCtx.cpp +++ b/Core/HLE/AtracCtx.cpp @@ -831,7 +831,7 @@ void Atrac::SeekToSample(int sample) { const u32 start = off - track_.dataOff < backfill ? track_.dataOff : off - backfill; for (u32 pos = start; pos < off; pos += track_.bytesPerFrame) { - decoder_->Decode(BufferStart() + pos, track_.bytesPerFrame, nullptr, nullptr, nullptr); + decoder_->Decode(BufferStart() + pos, track_.bytesPerFrame, nullptr, 2, nullptr, nullptr); } } @@ -933,7 +933,7 @@ u32 Atrac::DecodeData(u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u32 *finish, i uint8_t *indata = BufferStart() + off; int bytesConsumed = 0; int outBytes = 0; - if (!decoder_->Decode(indata, track_.bytesPerFrame, &bytesConsumed, outbuf, &outBytes)) { + if (!decoder_->Decode(indata, track_.bytesPerFrame, &bytesConsumed, outputChannels_, outbuf, &outBytes)) { // Decode failed. *SamplesNum = 0; *finish = 1; diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp index 13344f209a..192c099184 100644 --- a/Core/HLE/sceAtrac.cpp +++ b/Core/HLE/sceAtrac.cpp @@ -948,7 +948,7 @@ static int sceAtracLowLevelDecode(int atracID, u32 sourceAddr, u32 sourceBytesCo int bytesConsumed = 0; int bytesWritten = 0; - atrac->GetDecoder()->Decode(srcp, atrac->GetTrack().BytesPerFrame(), &bytesConsumed, outp, &bytesWritten); + atrac->GetDecoder()->Decode(srcp, atrac->GetTrack().BytesPerFrame(), &bytesConsumed, 2, outp, &bytesWritten); *srcConsumed = bytesConsumed; *outWritten = bytesWritten; diff --git a/Core/HLE/sceAudiocodec.cpp b/Core/HLE/sceAudiocodec.cpp index 9934aa1d56..7361468063 100644 --- a/Core/HLE/sceAudiocodec.cpp +++ b/Core/HLE/sceAudiocodec.cpp @@ -119,7 +119,7 @@ static int sceAudiocodecDecode(u32 ctxPtr, int codec) { auto ctx = PSPPointer::Create(ctxPtr); // On stack, no need to allocate. // Decode audio int inDataConsumed = 0; - decoder->Decode(Memory::GetPointer(ctx->inDataPtr), ctx->inDataSize, &inDataConsumed, Memory::GetPointerWrite(ctx->outDataPtr), &outbytes); + decoder->Decode(Memory::GetPointer(ctx->inDataPtr), ctx->inDataSize, &inDataConsumed, 2, Memory::GetPointerWrite(ctx->outDataPtr), &outbytes); } DEBUG_LOG(ME, "sceAudiocodecDec(%08x, %i (%s))", ctxPtr, codec, GetCodecName(codec)); return 0; diff --git a/Core/HLE/sceMp3.cpp b/Core/HLE/sceMp3.cpp index cdd8f09964..1b337e800f 100644 --- a/Core/HLE/sceMp3.cpp +++ b/Core/HLE/sceMp3.cpp @@ -744,7 +744,7 @@ static u32 sceMp3LowLevelDecode(u32 mp3, u32 sourceAddr, u32 sourceBytesConsumed int outpcmbytes = 0; int inbytesConsumed = 0; - ctx->decoder->Decode(inbuff, 4096, &inbytesConsumed, outbuff, &outpcmbytes); + ctx->decoder->Decode(inbuff, 4096, &inbytesConsumed, 2, outbuff, &outpcmbytes); NotifyMemInfo(MemBlockFlags::WRITE, samplesAddr, outpcmbytes, "Mp3LowLevelDecode"); Memory::Write_U32(inbytesConsumed, sourceBytesConsumedAddr); diff --git a/Core/HW/Atrac3Standalone.cpp b/Core/HW/Atrac3Standalone.cpp index b109effd44..63845bbc37 100644 --- a/Core/HW/Atrac3Standalone.cpp +++ b/Core/HW/Atrac3Standalone.cpp @@ -15,7 +15,8 @@ inline int16_t clamp16(float f) { // Test case for ATRAC3: Mega Man Maverick Hunter X, PSP menu sound class Atrac3Audio : public AudioDecoder { public: - Atrac3Audio(PSPAudioType audioType, int channels, size_t blockAlign, const uint8_t *extraData, size_t extraDataSize) : audioType_(audioType) { + Atrac3Audio(PSPAudioType audioType, int channels, size_t blockAlign, const uint8_t *extraData, size_t extraDataSize) + : audioType_(audioType), channels_(channels) { blockAlign_ = (int)blockAlign; if (audioType == PSP_CODEC_AT3PLUS) { at3pCtx_ = atrac3p_alloc(channels, &blockAlign_); @@ -55,7 +56,7 @@ public: } } - bool Decode(const uint8_t *inbuf, int inbytes, int *inbytesConsumed, uint8_t *outbuf, int *outbytes) override { + bool Decode(const uint8_t *inbuf, int inbytes, int *inbytesConsumed, int outputChannels, uint8_t *outbuf, int *outbytes) override { if (!codecOpen_) { _dbg_assert_(false); } @@ -84,12 +85,20 @@ public: *outbytes = nb_samples * 2 * 2; } if (outbuf) { - // Convert frame to outbuf. TODO: Very SIMDable, though hardly hot. - for (int channel = 0; channel < 2; channel++) { - int16_t *output = (int16_t *)outbuf; + _dbg_assert_(outputChannels == 1 || outputChannels == 2); + int16_t *output = (int16_t *)outbuf; + const float *left = buffers_[0]; + if (outputChannels == 2) { + // Stereo output, standard. + const float *right = channels_ == 2 ? buffers_[1] : buffers_[0]; for (int i = 0; i < nb_samples; i++) { - output[i * 2] = clamp16(buffers_[0][i]); - output[i * 2 + 1] = clamp16(buffers_[1][i]); + output[i * 2] = clamp16(left[i]); + output[i * 2 + 1] = clamp16(right[i]); + } + } else { + // Mono output, just take the left channel. + for (int i = 0; i < nb_samples; i++) { + output[i] = clamp16(left[i]); } } } @@ -113,6 +122,7 @@ private: ATRAC3PContext *at3pCtx_ = nullptr; ATRAC3Context *at3Ctx_ = nullptr; + int channels_ = 0; int blockAlign_ = 0; int outSamples_ = 0; diff --git a/Core/HW/MediaEngine.cpp b/Core/HW/MediaEngine.cpp index cd5d1b9b1e..c7f89de5c4 100644 --- a/Core/HW/MediaEngine.cpp +++ b/Core/HW/MediaEngine.cpp @@ -1078,7 +1078,7 @@ int MediaEngine::getAudioSamples(u32 bufferPtr) { } int inbytesConsumed = 0; - if (!m_audioContext->Decode(audioFrame, frameSize, &inbytesConsumed, buffer, &outbytes)) { + if (!m_audioContext->Decode(audioFrame, frameSize, &inbytesConsumed, 2, buffer, &outbytes)) { ERROR_LOG(ME, "Audio (%s) decode failed during video playback", GetCodecName(m_audioType)); } diff --git a/Core/HW/SimpleAudioDec.cpp b/Core/HW/SimpleAudioDec.cpp index abf7722d1d..2b7a16055f 100644 --- a/Core/HW/SimpleAudioDec.cpp +++ b/Core/HW/SimpleAudioDec.cpp @@ -67,7 +67,9 @@ public: } ~MiniMp3Audio() {} - bool Decode(const uint8_t* inbuf, int inbytes, int *inbytesConsumed, uint8_t *outbuf, int *outbytes) override { + bool Decode(const uint8_t* inbuf, int inbytes, int *inbytesConsumed, int outputChannels, uint8_t *outbuf, int *outbytes) override { + _dbg_assert_(outputChannels == 2); + mp3dec_frame_info_t info{}; int samplesWritten = mp3dec_decode_frame(&mp3_, inbuf, inbytes, (mp3d_sample_t *)outbuf, &info); *inbytesConsumed = info.frame_bytes; @@ -101,7 +103,7 @@ public: FFmpegAudioDecoder(PSPAudioType audioType, int sampleRateHz = 44100, int channels = 2); ~FFmpegAudioDecoder(); - bool Decode(const uint8_t* inbuf, int inbytes, int *inbytesConsumed, uint8_t *outbuf, int *outbytes) override; + bool Decode(const uint8_t* inbuf, int inbytes, int *inbytesConsumed, int outputChannels, uint8_t *outbuf, int *outbytes) override; bool IsOK() const override { #ifdef USE_FFMPEG return codec_ != 0; @@ -264,7 +266,7 @@ FFmpegAudioDecoder::~FFmpegAudioDecoder() { } // Decodes a single input frame. -bool FFmpegAudioDecoder::Decode(const uint8_t *inbuf, int inbytes, int *inbytesConsumed, uint8_t *outbuf, int *outbytes) { +bool FFmpegAudioDecoder::Decode(const uint8_t *inbuf, int inbytes, int *inbytesConsumed, int outputChannels, uint8_t *outbuf, int *outbytes) { #ifdef USE_FFMPEG if (!codecOpen_) { OpenCodec(inbytes); @@ -315,6 +317,7 @@ bool FFmpegAudioDecoder::Decode(const uint8_t *inbuf, int inbytes, int *inbytesC if (got_frame) { // Initializing the sample rate convert. We will use it to convert float output into int. + _dbg_assert_(outputChannels == 2); int64_t wanted_channel_layout = AV_CH_LAYOUT_STEREO; // we want stereo output layout int64_t dec_channel_layout = frame_->channel_layout; // decoded channel layout @@ -436,7 +439,7 @@ u32 AuCtx::AuDecode(u32 pcmAddr) { nextSync = (int)FindNextMp3Sync(); } int inbytesConsumed = 0; - decoder->Decode(&sourcebuff[nextSync], (int)sourcebuff.size() - nextSync, &inbytesConsumed, outbuf, &outpcmbufsize); + decoder->Decode(&sourcebuff[nextSync], (int)sourcebuff.size() - nextSync, &inbytesConsumed, 2, outbuf, &outpcmbufsize); if (outpcmbufsize == 0) { // Nothing was output, hopefully we're at the end of the stream. diff --git a/Core/HW/SimpleAudioDec.h b/Core/HW/SimpleAudioDec.h index 904b8f927f..ddf3d9c589 100644 --- a/Core/HW/SimpleAudioDec.h +++ b/Core/HW/SimpleAudioDec.h @@ -37,7 +37,7 @@ public: virtual PSPAudioType GetAudioType() const = 0; // inbytesConsumed can include skipping metadata. - virtual bool Decode(const uint8_t *inbuf, int inbytes, int *inbytesConsumed, uint8_t *outbuf, int *outbytes) = 0; + virtual bool Decode(const uint8_t *inbuf, int inbytes, int *inbytesConsumed, int outputChannels, uint8_t *outbuf, int *outbytes) = 0; virtual bool IsOK() const = 0; // These two are only ever called after Decode, so can initialize on first. diff --git a/UI/BackgroundAudio.cpp b/UI/BackgroundAudio.cpp index 0231c77edc..2f6c7ea3f7 100644 --- a/UI/BackgroundAudio.cpp +++ b/UI/BackgroundAudio.cpp @@ -219,7 +219,7 @@ public: while (bgQueue.size() < (size_t)(len * 2)) { int outBytes = 0; int inbytesConsumed = 0; - decoder_->Decode(wave_.raw_data + raw_offset_, wave_.raw_bytes_per_frame, &inbytesConsumed, (uint8_t *)buffer_, &outBytes); + decoder_->Decode(wave_.raw_data + raw_offset_, wave_.raw_bytes_per_frame, &inbytesConsumed, 2, (uint8_t *)buffer_, &outBytes); if (!outBytes) return false; From 4680d87fcd75e8bd852ae98c471eae7d3a3d4aaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Mon, 15 Apr 2024 12:18:40 +0200 Subject: [PATCH 148/719] Change the databuf check in sceAtracDecodeData Making a separate commit for bisection's sake. --- Core/HLE/sceAtrac.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp index 13344f209a..0de0badf6c 100644 --- a/Core/HLE/sceAtrac.cpp +++ b/Core/HLE/sceAtrac.cpp @@ -239,10 +239,10 @@ static u32 sceAtracAddStreamData(int atracID, u32 bytesToAdd) { // Note that outAddr being null is completely valid here, used to skip data. static u32 sceAtracDecodeData(int atracID, u32 outAddr, u32 numSamplesAddr, u32 finishFlagAddr, u32 remainAddr) { Atrac *atrac = getAtrac(atracID); - if (atrac == NULL) { - return ATRAC_ERROR_BAD_ATRACID; - } else if (!atrac->dataBuf_) { // TODO: Should check bufferState instead? - return ATRAC_ERROR_NO_DATA; + u32 err = AtracValidateData(atrac); + if (err != 0) { + // Already logged. + return err; } u32 numSamples = 0; From d03f2a58887e3ba0d8eab75eac909ada5018a2c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Mon, 15 Apr 2024 11:45:57 +0200 Subject: [PATCH 149/719] Atrac: Add missing accessors --- Core/HLE/AtracCtx.cpp | 10 ++++++++++ Core/HLE/AtracCtx.h | 8 ++++++++ Core/HLE/sceAtrac.cpp | 25 +++++++++++++------------ 3 files changed, 31 insertions(+), 12 deletions(-) diff --git a/Core/HLE/AtracCtx.cpp b/Core/HLE/AtracCtx.cpp index 0a9dffce8d..295d7173bd 100644 --- a/Core/HLE/AtracCtx.cpp +++ b/Core/HLE/AtracCtx.cpp @@ -731,6 +731,16 @@ void Atrac::UpdateBitrate() { track_.bitrate = (track_.bitrate + 511) >> 10; } +void Atrac::GetStreamDataInfo(u32 *writePtr, u32 *writableBytes, u32 *readOffset) { + u32 calculatedReadOffset; + // TODO: Feels like this should already have been computed? + CalculateStreamInfo(&calculatedReadOffset); + + *writePtr = first_.addr + first_.offset; + *writableBytes = first_.writableBytes; + *readOffset = calculatedReadOffset; +} + int Atrac::AddStreamData(u32 bytesToAdd) { u32 readOffset; CalculateStreamInfo(&readOffset); diff --git a/Core/HLE/AtracCtx.h b/Core/HLE/AtracCtx.h index ae02e1b767..6da6de2cdb 100644 --- a/Core/HLE/AtracCtx.h +++ b/Core/HLE/AtracCtx.h @@ -179,6 +179,10 @@ struct Atrac { return (u32)(track_.dataOff + track_.bytesPerFrame + frameOffset * track_.bytesPerFrame); } + u32 SecondBufferSize() const { + return second_.size; + } + const Track &GetTrack() const { return track_; } @@ -223,6 +227,9 @@ struct Atrac { u8 *BufferStart(); void SeekToSample(int sample); + int CurrentSample() const { + return currentSample_; + } u32 CodecType() const { return track_.codecType; @@ -259,6 +266,7 @@ struct Atrac { void UpdateContextFromPSPMem(); void WriteContextToPSPMem(); + void GetStreamDataInfo(u32 *writePtr, u32 *writableBytes, u32 *readOffset); int AddStreamData(u32 bytesToAdd); u32 AddStreamDataSas(u32 bufPtr, u32 bytesToAdd); void CreateDecoder(); diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp index a94c1e2348..1e6841ad5f 100644 --- a/Core/HLE/sceAtrac.cpp +++ b/Core/HLE/sceAtrac.cpp @@ -288,7 +288,7 @@ static u32 sceAtracGetBufferInfoForResetting(int atracID, int sample, u32 buffer if (!bufferInfo.IsValid()) { return hleReportError(ME, SCE_KERNEL_ERROR_ILLEGAL_ADDR, "invalid buffer, should crash"); - } else if (atrac->BufferState() == ATRAC_STATUS_STREAMED_LOOP_WITH_TRAILER && atrac->second_.size == 0) { + } else if (atrac->BufferState() == ATRAC_STATUS_STREAMED_LOOP_WITH_TRAILER && atrac->SecondBufferSize() == 0) { return hleReportError(ME, ATRAC_ERROR_SECOND_BUFFER_NEEDED, "no second buffer"); } else if ((u32)sample + atrac->GetTrack().firstSampleOffset > (u32)atrac->GetTrack().endSample + atrac->GetTrack().firstSampleOffset) { // NOTE: Above we have to add firstSampleOffset to both sides - we seem to rely on wraparound. @@ -393,11 +393,11 @@ static u32 sceAtracGetNextDecodePosition(int atracID, u32 outposAddr) { } if (Memory::IsValidAddress(outposAddr)) { - if (atrac->currentSample_ >= atrac->GetTrack().endSample) { + if (atrac->CurrentSample() >= atrac->GetTrack().endSample) { Memory::WriteUnchecked_U32(0, outposAddr); return hleLogSuccessI(ME, ATRAC_ERROR_ALL_DATA_DECODED, "all data decoded"); } else { - Memory::WriteUnchecked_U32(atrac->currentSample_, outposAddr); + Memory::WriteUnchecked_U32(atrac->CurrentSample(), outposAddr); return hleLogSuccessI(ME, 0); } } else { @@ -412,7 +412,7 @@ static u32 sceAtracGetNextSample(int atracID, u32 outNAddr) { // Already logged. return err; } - if (atrac->currentSample_ >= atrac->GetTrack().endSample) { + if (atrac->CurrentSample() >= atrac->GetTrack().endSample) { if (Memory::IsValidAddress(outNAddr)) Memory::WriteUnchecked_U32(0, outNAddr); return hleLogSuccessI(ME, 0, "0 samples left"); @@ -500,13 +500,15 @@ static u32 sceAtracGetStreamDataInfo(int atracID, u32 writePtrAddr, u32 writable return err; } - u32 readOffset; - atrac->CalculateStreamInfo(&readOffset); + u32 writePtr = 0; + u32 writableBytes = 0; + u32 readOffset = 0; + atrac->GetStreamDataInfo(&writePtr, &writableBytes, &readOffset); if (Memory::IsValidAddress(writePtrAddr)) - Memory::WriteUnchecked_U32(atrac->first_.addr + atrac->first_.offset, writePtrAddr); + Memory::WriteUnchecked_U32(writePtr, writePtrAddr); if (Memory::IsValidAddress(writableBytesAddr)) - Memory::WriteUnchecked_U32(atrac->first_.writableBytes, writableBytesAddr); + Memory::WriteUnchecked_U32(writableBytes, writableBytesAddr); if (Memory::IsValidAddress(readOffsetAddr)) Memory::WriteUnchecked_U32(readOffset, readOffsetAddr); @@ -532,7 +534,7 @@ static u32 sceAtracResetPlayPosition(int atracID, int sample, int bytesWrittenFi return err; } - if (atrac->BufferState() == ATRAC_STATUS_STREAMED_LOOP_WITH_TRAILER && atrac->second_.size == 0) { + if (atrac->BufferState() == ATRAC_STATUS_STREAMED_LOOP_WITH_TRAILER && atrac->SecondBufferSize() == 0) { return hleReportError(ME, ATRAC_ERROR_SECOND_BUFFER_NEEDED, "no second buffer"); } else if ((u32)sample + atrac->GetTrack().firstSampleOffset > (u32)atrac->GetTrack().endSample + atrac->GetTrack().firstSampleOffset) { // NOTE: Above we have to add firstSampleOffset to both sides - we seem to rely on wraparound. @@ -787,7 +789,6 @@ static u32 sceAtracSetMOutData(int atracID, u32 buffer, u32 bufferSize) { atrac->SetData(buffer, bufferSize, bufferSize, 2, 0); return hleReportError(ME, ATRAC_ERROR_NOT_MONO, "not mono data"); } else { - atrac->outputChannels_ = 1; return _AtracSetData(atracID, buffer, bufferSize, bufferSize, 1, false); } } @@ -908,7 +909,7 @@ static int sceAtracLowLevelInitDecoder(int atracID, u32 paramsAddr) { } bool jointStereo = false; - if (atrac->track_.codecType == PSP_MODE_AT_3) { + if (atrac->GetTrack().codecType == PSP_MODE_AT_3) { // See if we can match the actual jointStereo value. bool found = false; for (size_t i = 0; i < ARRAY_SIZE(at3HeaderMap); ++i) { @@ -925,7 +926,7 @@ static int sceAtracLowLevelInitDecoder(int atracID, u32 paramsAddr) { atrac->InitLowLevel(paramsAddr, jointStereo); - const char *codecName = atrac->track_.codecType == PSP_MODE_AT_3 ? "atrac3" : "atrac3+"; + const char *codecName = atrac->GetTrack().codecType == PSP_MODE_AT_3 ? "atrac3" : "atrac3+"; const char *channelName = atrac->GetTrack().channels == 1 ? "mono" : "stereo"; return hleLogSuccessInfoI(ME, 0, "%s %s audio", codecName, channelName); } From 14f141b1b8ca680c3110d763d39d29e90b1f8cc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Mon, 15 Apr 2024 11:36:03 +0200 Subject: [PATCH 150/719] Split Atrac into AtracBase and Atrac --- Core/HLE/AtracCtx.cpp | 25 +--- Core/HLE/AtracCtx.h | 269 +++++++++++++++++++++++++----------------- Core/HLE/sceAtrac.cpp | 10 +- 3 files changed, 167 insertions(+), 137 deletions(-) diff --git a/Core/HLE/AtracCtx.cpp b/Core/HLE/AtracCtx.cpp index 295d7173bd..1ce2aea597 100644 --- a/Core/HLE/AtracCtx.cpp +++ b/Core/HLE/AtracCtx.cpp @@ -167,18 +167,15 @@ void Atrac::ResetData() { void Atrac::AnalyzeReset() { // Reset some values. + track_.AnalyzeReset(); + currentSample_ = 0; - track_.endSample = -1; loopNum_ = 0; - track_.loopinfo.clear(); - track_.loopStartSample = -1; - track_.loopEndSample = -1; decodePos_ = 0; bufferPos_ = 0; - track_.channels = 2; } -void Atrac::UpdateContextFromPSPMem() { +void AtracBase::UpdateContextFromPSPMem() { if (!context_.IsValid()) { return; } @@ -562,7 +559,7 @@ void Atrac::CalculateStreamInfo(u32 *outReadOffset) { } } -void Atrac::CreateDecoder() { +void AtracBase::CreateDecoder() { if (decoder_) { delete decoder_; } @@ -581,8 +578,6 @@ void Atrac::CreateDecoder() { } else { decoder_ = CreateAtrac3PlusAudio(track_.channels, track_.bytesPerFrame); } - // reinit decodePos, because ffmpeg had changed it. - decodePos_ = 0; } void Atrac::GetResetBufferInfo(AtracResetBufferInfo *bufferInfo, int sample) { @@ -723,14 +718,6 @@ int Atrac::GetSecondBufferInfo(u32 *fileOffset, u32 *desiredSize) { return hleLogSuccessI(ME, 0); } -void Atrac::UpdateBitrate() { - track_.bitrate = (track_.bytesPerFrame * 352800) / 1000; - if (track_.codecType == PSP_MODE_AT_3_PLUS) - track_.bitrate = ((track_.bitrate >> 11) + 8) & 0xFFFFFFF0; - else - track_.bitrate = (track_.bitrate + 511) >> 10; -} - void Atrac::GetStreamDataInfo(u32 *writePtr, u32 *writableBytes, u32 *readOffset) { u32 calculatedReadOffset; // TODO: Feels like this should already have been computed? @@ -810,10 +797,6 @@ u32 Atrac::GetNextSamples() { return numSamples; } -u8 *Atrac::BufferStart() { - return ignoreDataBuf_ ? Memory::GetPointerWrite(first_.addr) : dataBuf_; -} - void Atrac::ForceSeekToSample(int sample) { if (decoder_) { decoder_->FlushBuffers(); diff --git a/Core/HLE/AtracCtx.h b/Core/HLE/AtracCtx.h index 6da6de2cdb..c73a6a4e39 100644 --- a/Core/HLE/AtracCtx.h +++ b/Core/HLE/AtracCtx.h @@ -132,18 +132,127 @@ struct Track { u32 SamplesPerFrame() const { return codecType == PSP_MODE_AT_3_PLUS ? ATRAC3PLUS_MAX_SAMPLES : ATRAC3_MAX_SAMPLES; } + + void UpdateBitrate() { + bitrate = (bytesPerFrame * 352800) / 1000; + if (codecType == PSP_MODE_AT_3_PLUS) + bitrate = ((bitrate >> 11) + 8) & 0xFFFFFFF0; + else + bitrate = (bitrate + 511) >> 10; + } + + void AnalyzeReset() { + endSample = -1; + loopinfo.clear(); + loopStartSample = -1; + loopEndSample = -1; + channels = 2; + // TODO: Could probably reset more. + } }; int AnalyzeAA3Track(u32 addr, u32 size, u32 filesize, Track *track); int AnalyzeAtracTrack(u32 addr, u32 size, Track *track); -struct Atrac { +struct AtracBase { + virtual ~AtracBase() {} + virtual void UpdateBufferState() = 0; + + virtual void DoState(PointerWrap &p) = 0; + + u32 DecodePosBySample(int sample) const { + return (u32)(track_.firstSampleOffset + sample / (int)track_.SamplesPerFrame() * track_.bytesPerFrame); + } + + u32 FileOffsetBySample(int sample) const { + int offsetSample = sample + track_.firstSampleOffset; + int frameOffset = offsetSample / (int)track_.SamplesPerFrame(); + return (u32)(track_.dataOff + track_.bytesPerFrame + frameOffset * track_.bytesPerFrame); + } + + const Track &GetTrack() const { + return track_; + } + // This should be rare. + Track &GetTrackMut() { + return track_; + } + + int Bitrate() const { + return track_.bitrate; + } + int Channels() const { + return track_.channels; + } + + int GetOutputChannels() const { + return outputChannels_; + } + + int atracID_ = -1; + u16 outputChannels_ = 2; + int loopNum_ = 0; + Track track_{}; + + PSPPointer context_{}; + + AtracStatus BufferState() const { + return bufferState_; + } + + u32 CodecType() const { + return track_.codecType; + } + AudioDecoder *GetDecoder() const { + return decoder_; + } + u32 FirstOffsetExtra() const { + return ::FirstOffsetExtra(track_.codecType); + } + void CreateDecoder(); + + virtual uint32_t CurBufferAddress(int adjust = 0) const = 0; + virtual int CurrentSample() const = 0; + virtual int RemainingFrames() const = 0; + virtual u32 SecondBufferSize() const = 0; + + virtual int Analyze(u32 addr, u32 size) = 0; + virtual int AnalyzeAA3(u32 addr, u32 size, u32 filesize) = 0; + + void UpdateContextFromPSPMem(); + virtual void WriteContextToPSPMem() = 0; + + virtual void GetStreamDataInfo(u32 *writePtr, u32 *writableBytes, u32 *readOffset) = 0; + virtual int AddStreamData(u32 bytesToAdd) = 0; + virtual u32 AddStreamDataSas(u32 bufPtr, u32 bytesToAdd) = 0; + virtual void SetLoopNum(int loopNum) = 0; + virtual u32 ResetPlayPosition(int sample, int bytesWrittenFirstBuf, int bytesWrittenSecondBuf) = 0; + virtual void GetResetBufferInfo(AtracResetBufferInfo *bufferInfo, int sample) = 0; + virtual int SetData(u32 buffer, u32 readSize, u32 bufferSize, int outputChannels, int successCode) = 0; + virtual u32 SetSecondBuffer(u32 secondBuffer, u32 secondBufferSize) = 0; + virtual int GetSecondBufferInfo(u32 *fileOffset, u32 *desiredSize) = 0; + virtual void ForceSeekToSample(int sample) = 0; + virtual void SeekToSample(int sample) = 0; + virtual u32 DecodeData(u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u32 *finish, int *remains) = 0; + virtual u32 GetNextSamples() = 0; + virtual void InitLowLevel(u32 paramsAddr, bool jointStereo) = 0; + +protected: + virtual void AnalyzeReset() = 0; + + // TODO: Save the internal state of this, now technically possible. + AudioDecoder *decoder_ = nullptr; + AtracStatus bufferState_ = ATRAC_STATUS_NO_DATA; +}; + +class Atrac : public AtracBase { +public: ~Atrac() { ResetData(); } - void ResetData(); - void UpdateBufferState() { + + virtual void UpdateBufferState() { if (bufferMaxSize_ >= track_.fileSize) { if (first_.size < track_.fileSize) { // The buffer is big enough, but we don't have all the data yet. @@ -163,82 +272,7 @@ struct Atrac { } } - void DoState(PointerWrap &p); - - u32 SamplesPerFrame() const { - return track_.SamplesPerFrame(); - } - - u32 DecodePosBySample(int sample) const { - return (u32)(track_.firstSampleOffset + sample / (int)track_.SamplesPerFrame() * track_.bytesPerFrame); - } - - u32 FileOffsetBySample(int sample) const { - int offsetSample = sample + track_.firstSampleOffset; - int frameOffset = offsetSample / (int)track_.SamplesPerFrame(); - return (u32)(track_.dataOff + track_.bytesPerFrame + frameOffset * track_.bytesPerFrame); - } - - u32 SecondBufferSize() const { - return second_.size; - } - - const Track &GetTrack() const { - return track_; - } - - void UpdateBitrate(); - - int Bitrate() const { - return track_.bitrate; - } - int Channels() const { - return track_.channels; - } - - int RemainingFrames() const; - int GetOutputChannels() const { - return outputChannels_; - } - - u8 *dataBuf_ = nullptr; - // Indicates that the dataBuf_ array should not be used. - bool ignoreDataBuf_ = false; - u32 decodePos_ = 0; - - int atracID_ = -1; - u16 outputChannels_ = 2; - - int currentSample_ = 0; - int loopNum_ = 0; - - InputBuffer first_{}; - InputBuffer second_{}; - - Track track_{}; - - PSPPointer context_{}; - - AtracStatus BufferState() const { - return bufferState_; - } - - void ForceSeekToSample(int sample); - u8 *BufferStart(); - - void SeekToSample(int sample); - int CurrentSample() const { - return currentSample_; - } - - u32 CodecType() const { - return track_.codecType; - } - AudioDecoder *GetDecoder() const { - return decoder_; - } - - uint32_t CurBufferAddress(int adjust = 0) { + uint32_t CurBufferAddress(int adjust = 0) const override { u32 off = FileOffsetBySample(currentSample_ + adjust); if (off < first_.size && ignoreDataBuf_) { return first_.addr + off; @@ -247,53 +281,66 @@ struct Atrac { return 0; } - void CalculateStreamInfo(u32 *readOffset); - - u32 FirstOffsetExtra() const { - return ::FirstOffsetExtra(track_.codecType); + u8 *BufferStart() { + return ignoreDataBuf_ ? Memory::GetPointerWrite(first_.addr) : dataBuf_; } + void DoState(PointerWrap &p) override; + void WriteContextToPSPMem() override; + + int Analyze(u32 addr, u32 size) override; + int AnalyzeAA3(u32 addr, u32 size, u32 filesize) override; + + int CurrentSample() const override { + return currentSample_; + } + int RemainingFrames() const override; + u32 SecondBufferSize() const override { + return second_.size; + } + + void GetStreamDataInfo(u32 *writePtr, u32 *writableBytes, u32 *readOffset) override; + int AddStreamData(u32 bytesToAdd) override; + u32 AddStreamDataSas(u32 bufPtr, u32 bytesToAdd) override; + void SetLoopNum(int loopNum) override; + u32 ResetPlayPosition(int sample, int bytesWrittenFirstBuf, int bytesWrittenSecondBuf) override; + void GetResetBufferInfo(AtracResetBufferInfo *bufferInfo, int sample) override; + int SetData(u32 buffer, u32 readSize, u32 bufferSize, int outputChannels, int successCode) override; + u32 SetSecondBuffer(u32 secondBuffer, u32 secondBufferSize) override; + int GetSecondBufferInfo(u32 *fileOffset, u32 *desiredSize) override; + void ForceSeekToSample(int sample) override; + void SeekToSample(int sample) override; + u32 DecodeData(u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u32 *finish, int *remains) override; + u32 GetNextSamples() override; + void InitLowLevel(u32 paramsAddr, bool jointStereo); + + // Indicates that the dataBuf_ array should not be used. + u8 *dataBuf_ = nullptr; + + InputBuffer first_{}; + InputBuffer second_{}; + +protected: + void AnalyzeReset(); + +private: u32 StreamBufferEnd() const { // The buffer is always aligned to a frame in size, not counting an optional header. // The header will only initially exist after the data is first set. u32 framesAfterHeader = (bufferMaxSize_ - bufferHeaderSize_) / track_.bytesPerFrame; return framesAfterHeader * track_.bytesPerFrame + bufferHeaderSize_; } - - int Analyze(u32 addr, u32 size); - int AnalyzeAA3(u32 addr, u32 size, u32 filesize); - - void UpdateContextFromPSPMem(); - void WriteContextToPSPMem(); - - void GetStreamDataInfo(u32 *writePtr, u32 *writableBytes, u32 *readOffset); - int AddStreamData(u32 bytesToAdd); - u32 AddStreamDataSas(u32 bufPtr, u32 bytesToAdd); - void CreateDecoder(); - void SetLoopNum(int loopNum); - u32 ResetPlayPosition(int sample, int bytesWrittenFirstBuf, int bytesWrittenSecondBuf); - void GetResetBufferInfo(AtracResetBufferInfo *bufferInfo, int sample); - int SetData(u32 buffer, u32 readSize, u32 bufferSize, int outputChannels, int successCode); - u32 SetSecondBuffer(u32 secondBuffer, u32 secondBufferSize); - int GetSecondBufferInfo(u32 *fileOffset, u32 *desiredSize); - u32 DecodeData(u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u32 *finish, int *remains); void ConsumeFrame(); - u32 GetNextSamples(); + void CalculateStreamInfo(u32 *readOffset); - void InitLowLevel(u32 paramsAddr, bool jointStereo); - -private: - void AnalyzeReset(); + bool ignoreDataBuf_ = false; + int currentSample_ = 0; + u32 decodePos_ = 0; u32 bufferMaxSize_ = 0; // Used to track streaming. u32 bufferPos_ = 0; u32 bufferValidBytes_ = 0; u32 bufferHeaderSize_ = 0; - - // TODO: Save the internal state of this, now technically possible. - AudioDecoder *decoder_ = nullptr; - - AtracStatus bufferState_ = ATRAC_STATUS_NO_DATA; }; diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp index 1e6841ad5f..eb68116402 100644 --- a/Core/HLE/sceAtrac.cpp +++ b/Core/HLE/sceAtrac.cpp @@ -307,7 +307,7 @@ static u32 sceAtracGetBitrate(int atracID, u32 outBitrateAddr) { return err; } - atrac->UpdateBitrate(); + atrac->GetTrackMut().UpdateBitrate(); if (Memory::IsValidAddress(outBitrateAddr)) { Memory::WriteUnchecked_U32(atrac->Bitrate(), outBitrateAddr); @@ -377,7 +377,7 @@ static u32 sceAtracGetMaxSample(int atracID, u32 maxSamplesAddr) { } if (Memory::IsValidAddress(maxSamplesAddr)) { - Memory::WriteUnchecked_U32(atrac->SamplesPerFrame(), maxSamplesAddr); + Memory::WriteUnchecked_U32(atrac->GetTrack().SamplesPerFrame(), maxSamplesAddr); return hleLogSuccessI(ME, 0); } else { return hleLogError(ME, 0, "invalid address"); @@ -500,9 +500,9 @@ static u32 sceAtracGetStreamDataInfo(int atracID, u32 writePtrAddr, u32 writable return err; } - u32 writePtr = 0; - u32 writableBytes = 0; - u32 readOffset = 0; + u32 writePtr; + u32 writableBytes; + u32 readOffset; atrac->GetStreamDataInfo(&writePtr, &writableBytes, &readOffset); if (Memory::IsValidAddress(writePtrAddr)) From 6c648a2cdd4b1859734961479739321ea5a5064f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Mon, 15 Apr 2024 12:13:18 +0200 Subject: [PATCH 151/719] Use AtracBase instead of Atrac in sceAtrac (so now we can replace it) --- Common/Serialize/SerializeFuncs.h | 11 +++++ Core/HLE/AtracCtx.h | 3 +- Core/HLE/sceAtrac.cpp | 76 +++++++++++++++---------------- 3 files changed, 51 insertions(+), 39 deletions(-) diff --git a/Common/Serialize/SerializeFuncs.h b/Common/Serialize/SerializeFuncs.h index c2919de799..7e32c76f3f 100644 --- a/Common/Serialize/SerializeFuncs.h +++ b/Common/Serialize/SerializeFuncs.h @@ -71,6 +71,17 @@ void DoClass(PointerWrap &p, T *&x) { x->DoState(p); } +template +void DoSubClass(PointerWrap &p, T *&x) { + if (p.mode == PointerWrap::MODE_READ) { + if (x != nullptr) + delete x; + x = new S(); + } + x->DoState(p); +} + + template void DoArray(PointerWrap &p, T *x, int count) { DoHelper_::DoArray(p, x, count); diff --git a/Core/HLE/AtracCtx.h b/Core/HLE/AtracCtx.h index c73a6a4e39..52fb6d7acc 100644 --- a/Core/HLE/AtracCtx.h +++ b/Core/HLE/AtracCtx.h @@ -154,7 +154,8 @@ struct Track { int AnalyzeAA3Track(u32 addr, u32 size, u32 filesize, Track *track); int AnalyzeAtracTrack(u32 addr, u32 size, Track *track); -struct AtracBase { +class AtracBase { +public: virtual ~AtracBase() {} virtual void UpdateBufferState() = 0; diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp index eb68116402..802971958a 100644 --- a/Core/HLE/sceAtrac.cpp +++ b/Core/HLE/sceAtrac.cpp @@ -76,7 +76,7 @@ static const int atracDecodeDelay = 2300; const int PSP_NUM_ATRAC_IDS = 6; static bool atracInited = true; -static Atrac *atracContexts[PSP_NUM_ATRAC_IDS]; +static AtracBase *atracContexts[PSP_NUM_ATRAC_IDS]; static u32 atracContextTypes[PSP_NUM_ATRAC_IDS]; static int atracLibVersion = 0; static u32 atracLibCrc = 0; @@ -119,7 +119,7 @@ void __AtracDoState(PointerWrap &p) { bool valid = atracContexts[i] != nullptr; Do(p, valid); if (valid) { - Do(p, atracContexts[i]); + DoSubClass(p, atracContexts[i]); } else { delete atracContexts[i]; atracContexts[i] = nullptr; @@ -136,18 +136,18 @@ void __AtracDoState(PointerWrap &p) { } } -static Atrac *getAtrac(int atracID) { +static AtracBase *getAtrac(int atracID) { if (atracID < 0 || atracID >= PSP_NUM_ATRAC_IDS) { return nullptr; } - Atrac *atrac = atracContexts[atracID]; + AtracBase *atrac = atracContexts[atracID]; if (atrac) { atrac->UpdateContextFromPSPMem(); } return atrac; } -static int createAtrac(Atrac *atrac) { +static int createAtrac(AtracBase *atrac) { for (int i = 0; i < (int)ARRAY_SIZE(atracContexts); ++i) { if (atracContextTypes[i] == atrac->CodecType() && atracContexts[i] == 0) { atracContexts[i] = atrac; @@ -175,7 +175,7 @@ static u32 sceAtracGetAtracID(int codecType) { return hleReportError(ME, ATRAC_ERROR_INVALID_CODECTYPE, "invalid codecType"); } - Atrac *atrac = new Atrac(); + AtracBase *atrac = new Atrac(); atrac->track_.codecType = codecType; int atracID = createAtrac(atrac); if (atracID < 0) { @@ -186,7 +186,7 @@ static u32 sceAtracGetAtracID(int codecType) { return hleLogSuccessInfoI(ME, atracID); } -static u32 AtracValidateData(const Atrac *atrac) { +static u32 AtracValidateData(const AtracBase *atrac) { if (!atrac) { return hleLogError(ME, ATRAC_ERROR_BAD_ATRACID, "bad atrac ID"); } else if (atrac->BufferState() == ATRAC_STATUS_NO_DATA) { @@ -196,7 +196,7 @@ static u32 AtracValidateData(const Atrac *atrac) { } } -static u32 AtracValidateManaged(const Atrac *atrac) { +static u32 AtracValidateManaged(const AtracBase *atrac) { if (!atrac) { return hleLogError(ME, ATRAC_ERROR_BAD_ATRACID, "bad atrac ID"); } else if (atrac->BufferState() == ATRAC_STATUS_NO_DATA) { @@ -215,7 +215,7 @@ static u32 AtracValidateManaged(const Atrac *atrac) { // // The total size of the buffer is atrac->bufferMaxSize_. static u32 sceAtracAddStreamData(int atracID, u32 bytesToAdd) { - Atrac *atrac = getAtrac(atracID); + AtracBase *atrac = getAtrac(atracID); u32 err = AtracValidateManaged(atrac); if (err != 0) { // Already logged. @@ -238,7 +238,7 @@ static u32 sceAtracAddStreamData(int atracID, u32 bytesToAdd) { // Note that outAddr being null is completely valid here, used to skip data. static u32 sceAtracDecodeData(int atracID, u32 outAddr, u32 numSamplesAddr, u32 finishFlagAddr, u32 remainAddr) { - Atrac *atrac = getAtrac(atracID); + AtracBase *atrac = getAtrac(atracID); u32 err = AtracValidateData(atrac); if (err != 0) { // Already logged. @@ -279,7 +279,7 @@ static u32 sceAtracEndEntry() { static u32 sceAtracGetBufferInfoForResetting(int atracID, int sample, u32 bufferInfoAddr) { auto bufferInfo = PSPPointer::Create(bufferInfoAddr); - Atrac *atrac = getAtrac(atracID); + AtracBase *atrac = getAtrac(atracID); u32 err = AtracValidateManaged(atrac); if (err != 0) { // Already logged. @@ -300,7 +300,7 @@ static u32 sceAtracGetBufferInfoForResetting(int atracID, int sample, u32 buffer } static u32 sceAtracGetBitrate(int atracID, u32 outBitrateAddr) { - Atrac *atrac = getAtrac(atracID); + AtracBase *atrac = getAtrac(atracID); u32 err = AtracValidateData(atrac); if (err != 0) { // Already logged. @@ -318,7 +318,7 @@ static u32 sceAtracGetBitrate(int atracID, u32 outBitrateAddr) { } static u32 sceAtracGetChannel(int atracID, u32 channelAddr) { - Atrac *atrac = getAtrac(atracID); + AtracBase *atrac = getAtrac(atracID); u32 err = AtracValidateData(atrac); if (err != 0) { // Already logged. @@ -334,7 +334,7 @@ static u32 sceAtracGetChannel(int atracID, u32 channelAddr) { } static u32 sceAtracGetLoopStatus(int atracID, u32 loopNumAddr, u32 statusAddr) { - Atrac *atrac = getAtrac(atracID); + AtracBase *atrac = getAtrac(atracID); u32 err = AtracValidateData(atrac); if (err != 0) { // Already logged. @@ -356,7 +356,7 @@ static u32 sceAtracGetLoopStatus(int atracID, u32 loopNumAddr, u32 statusAddr) { } static u32 sceAtracGetInternalErrorInfo(int atracID, u32 errorAddr) { - Atrac *atrac = getAtrac(atracID); + AtracBase *atrac = getAtrac(atracID); u32 err = AtracValidateData(atrac); if (err != 0) { // Already logged. @@ -369,7 +369,7 @@ static u32 sceAtracGetInternalErrorInfo(int atracID, u32 errorAddr) { } static u32 sceAtracGetMaxSample(int atracID, u32 maxSamplesAddr) { - Atrac *atrac = getAtrac(atracID); + AtracBase *atrac = getAtrac(atracID); u32 err = AtracValidateData(atrac); if (err != 0) { // Already logged. @@ -385,7 +385,7 @@ static u32 sceAtracGetMaxSample(int atracID, u32 maxSamplesAddr) { } static u32 sceAtracGetNextDecodePosition(int atracID, u32 outposAddr) { - Atrac *atrac = getAtrac(atracID); + AtracBase *atrac = getAtrac(atracID); u32 err = AtracValidateData(atrac); if (err != 0) { // Already logged. @@ -406,7 +406,7 @@ static u32 sceAtracGetNextDecodePosition(int atracID, u32 outposAddr) { } static u32 sceAtracGetNextSample(int atracID, u32 outNAddr) { - Atrac *atrac = getAtrac(atracID); + AtracBase *atrac = getAtrac(atracID); u32 err = AtracValidateData(atrac); if (err != 0) { // Already logged. @@ -430,7 +430,7 @@ static u32 sceAtracGetNextSample(int atracID, u32 outNAddr) { static u32 sceAtracGetRemainFrame(int atracID, u32 remainAddr) { auto remainingFrames = PSPPointer::Create(remainAddr); - Atrac *atrac = getAtrac(atracID); + AtracBase *atrac = getAtrac(atracID); u32 err = AtracValidateManaged(atrac); if (err != 0) { // Already logged. @@ -450,7 +450,7 @@ static u32 sceAtracGetSecondBufferInfo(int atracID, u32 fileOffsetAddr, u32 desi auto fileOffset = PSPPointer::Create(fileOffsetAddr); auto desiredSize = PSPPointer::Create(desiredSizeAddr); - Atrac *atrac = getAtrac(atracID); + AtracBase *atrac = getAtrac(atracID); u32 err = AtracValidateManaged(atrac); if (err != 0) { // Already logged. @@ -466,7 +466,7 @@ static u32 sceAtracGetSecondBufferInfo(int atracID, u32 fileOffsetAddr, u32 desi } static u32 sceAtracGetSoundSample(int atracID, u32 outEndSampleAddr, u32 outLoopStartSampleAddr, u32 outLoopEndSampleAddr) { - Atrac *atrac = getAtrac(atracID); + AtracBase *atrac = getAtrac(atracID); u32 err = AtracValidateManaged(atrac); if (err != 0) { // Already logged. @@ -493,7 +493,7 @@ static u32 sceAtracGetSoundSample(int atracID, u32 outEndSampleAddr, u32 outLoop // such as where the data read from, where the data add to, // and how many bytes are allowed to add. static u32 sceAtracGetStreamDataInfo(int atracID, u32 writePtrAddr, u32 writableBytesAddr, u32 readOffsetAddr) { - Atrac *atrac = getAtrac(atracID); + AtracBase *atrac = getAtrac(atracID); u32 err = AtracValidateManaged(atrac); if (err != 0) { // Already logged. @@ -527,7 +527,7 @@ static u32 sceAtracReleaseAtracID(int atracID) { // Normally, sceAtracGetBufferInfoForResetting() is called to determine how to buffer. // The game must add sufficient packets to the buffer in order to complete the seek. static u32 sceAtracResetPlayPosition(int atracID, int sample, int bytesWrittenFirstBuf, int bytesWrittenSecondBuf) { - Atrac *atrac = getAtrac(atracID); + AtracBase *atrac = getAtrac(atracID); u32 err = AtracValidateManaged(atrac); if (err != 0) { // Already logged. @@ -551,7 +551,7 @@ static u32 sceAtracResetPlayPosition(int atracID, int sample, int bytesWrittenFi } static int _AtracSetData(int atracID, u32 buffer, u32 readSize, u32 bufferSize, int outputChannels, bool needReturnAtracID) { - Atrac *atrac = getAtrac(atracID); + AtracBase *atrac = getAtrac(atracID); // Don't use AtracValidateManaged here. if (!atrac) return hleLogError(ME, ATRAC_ERROR_BAD_ATRACID, "invalid atrac ID"); @@ -561,7 +561,7 @@ static int _AtracSetData(int atracID, u32 buffer, u32 readSize, u32 bufferSize, } static u32 sceAtracSetHalfwayBuffer(int atracID, u32 buffer, u32 readSize, u32 bufferSize) { - Atrac *atrac = getAtrac(atracID); + AtracBase *atrac = getAtrac(atracID); // Don't use AtracValidateManaged here. if (!atrac) { return hleLogError(ME, ATRAC_ERROR_BAD_ATRACID, "invalid atrac ID"); @@ -581,7 +581,7 @@ static u32 sceAtracSetHalfwayBuffer(int atracID, u32 buffer, u32 readSize, u32 b } static u32 sceAtracSetSecondBuffer(int atracID, u32 secondBuffer, u32 secondBufferSize) { - Atrac *atrac = getAtrac(atracID); + AtracBase *atrac = getAtrac(atracID); u32 err = AtracValidateManaged(atrac); if (err != 0) { // Already logged. @@ -592,7 +592,7 @@ static u32 sceAtracSetSecondBuffer(int atracID, u32 secondBuffer, u32 secondBuff } static u32 sceAtracSetData(int atracID, u32 buffer, u32 bufferSize) { - Atrac *atrac = getAtrac(atracID); + AtracBase *atrac = getAtrac(atracID); if (!atrac) { return hleLogError(ME, ATRAC_ERROR_BAD_ATRACID, "bad atrac ID"); } @@ -660,7 +660,7 @@ static u32 sceAtracStartEntry() { } static u32 sceAtracSetLoopNum(int atracID, int loopNum) { - Atrac *atrac = getAtrac(atracID); + AtracBase *atrac = getAtrac(atracID); u32 err = AtracValidateData(atrac); if (err != 0) { // Already logged. @@ -720,7 +720,7 @@ static int sceAtracReinit(int at3Count, int at3plusCount) { } static int sceAtracGetOutputChannel(int atracID, u32 outputChanPtr) { - Atrac *atrac = getAtrac(atracID); + AtracBase *atrac = getAtrac(atracID); u32 err = AtracValidateData(atrac); if (err != 0) { // Already logged. @@ -735,7 +735,7 @@ static int sceAtracGetOutputChannel(int atracID, u32 outputChanPtr) { } static int sceAtracIsSecondBufferNeeded(int atracID) { - Atrac *atrac = getAtrac(atracID); + AtracBase *atrac = getAtrac(atracID); u32 err = AtracValidateManaged(atrac); if (err != 0) { // Already logged. @@ -748,7 +748,7 @@ static int sceAtracIsSecondBufferNeeded(int atracID) { } static int sceAtracSetMOutHalfwayBuffer(int atracID, u32 buffer, u32 readSize, u32 bufferSize) { - Atrac *atrac = getAtrac(atracID); + AtracBase *atrac = getAtrac(atracID); // Don't use AtracValidate* here. if (!atrac) { return hleLogError(ME, ATRAC_ERROR_BAD_ATRACID, "bad atrac ID"); @@ -773,7 +773,7 @@ static int sceAtracSetMOutHalfwayBuffer(int atracID, u32 buffer, u32 readSize, u // Note: This doesn't seem to be part of any available libatrac3plus library. static u32 sceAtracSetMOutData(int atracID, u32 buffer, u32 bufferSize) { - Atrac *atrac = getAtrac(atracID); + AtracBase *atrac = getAtrac(atracID); // Don't use AtracValidate* here. if (!atrac) { return hleLogError(ME, ATRAC_ERROR_BAD_ATRACID, "bad atrac ID"); @@ -857,7 +857,7 @@ static int sceAtracSetAA3DataAndGetID(u32 buffer, u32 bufferSize, u32 fileSize, } static u32 _sceAtracGetContextAddress(int atracID) { - Atrac *atrac = getAtrac(atracID); + AtracBase *atrac = getAtrac(atracID); if (!atrac) { ERROR_LOG(ME, "_sceAtracGetContextAddress(%i): bad atrac id", atracID); return 0; @@ -882,7 +882,7 @@ struct At3HeaderMap { u16 channels; u8 jointStereo; - bool Matches(const Atrac *at) const { + bool Matches(const AtracBase *at) const { return bytes == at->GetTrack().BytesPerFrame() && channels == at->Channels(); } }; @@ -898,7 +898,7 @@ static const At3HeaderMap at3HeaderMap[] = { }; static int sceAtracLowLevelInitDecoder(int atracID, u32 paramsAddr) { - Atrac *atrac = getAtrac(atracID); + AtracBase *atrac = getAtrac(atracID); if (!atrac) { return hleLogError(ME, ATRAC_ERROR_BAD_ATRACID, "bad atrac ID"); } @@ -937,7 +937,7 @@ static int sceAtracLowLevelDecode(int atracID, u32 sourceAddr, u32 sourceBytesCo auto outp = PSPPointer::Create(samplesAddr); auto outWritten = PSPPointer::Create(sampleBytesAddr); - Atrac *atrac = getAtrac(atracID); + AtracBase *atrac = getAtrac(atracID); if (!atrac) { return hleLogError(ME, ATRAC_ERROR_BAD_ATRACID, "bad atrac ID"); } @@ -981,14 +981,14 @@ static int sceAtracSetAA3HalfwayBufferAndGetID(u32 buffer, u32 readSize, u32 buf // External interface used by sceSas' AT3 integration. u32 AtracSasAddStreamData(int atracID, u32 bufPtr, u32 bytesToAdd) { - Atrac *atrac = getAtrac(atracID); + AtracBase *atrac = getAtrac(atracID); if (!atrac) return 0; return atrac->AddStreamDataSas(bufPtr, bytesToAdd); } u32 AtracSasDecodeData(int atracID, u8* outbuf, u32 outbufPtr, u32 *SamplesNum, u32* finish, int *remains) { - Atrac *atrac = getAtrac(atracID); + AtracBase *atrac = getAtrac(atracID); if (!atrac) return 0; return atrac->DecodeData(outbuf, outbufPtr, SamplesNum, finish, remains); From 5e8a46fde054f9e77a28af504d28187b56673145 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Mon, 15 Apr 2024 12:41:22 +0200 Subject: [PATCH 152/719] Slim down the AtracBase class --- Core/HLE/AtracCtx.cpp | 46 +++++++++++++++++------- Core/HLE/AtracCtx.h | 83 +++++++++++++++---------------------------- Core/HLE/sceAtrac.cpp | 16 ++++----- 3 files changed, 70 insertions(+), 75 deletions(-) diff --git a/Core/HLE/AtracCtx.cpp b/Core/HLE/AtracCtx.cpp index 1ce2aea597..3cfad06b3d 100644 --- a/Core/HLE/AtracCtx.cpp +++ b/Core/HLE/AtracCtx.cpp @@ -217,7 +217,7 @@ void Atrac::WriteContextToPSPMem() { context->info.endSample = track_.endSample + track_.firstSampleOffset + FirstOffsetExtra(); context->info.dataEnd = track_.fileSize; context->info.curOff = first_.fileoffset; - context->info.decodePos = DecodePosBySample(currentSample_); + context->info.decodePos = track_.DecodePosBySample(currentSample_); context->info.streamDataByte = first_.size - track_.dataOff; u8 *buf = (u8 *)context; @@ -537,7 +537,7 @@ void Atrac::CalculateStreamInfo(u32 *outReadOffset) { first_.offset = 0; first_.writableBytes = 0; } else { - readOffset = FileOffsetBySample(track_.loopStartSample - FirstOffsetExtra() - track_.firstSampleOffset - track_.SamplesPerFrame() * 2); + readOffset = track_.FileOffsetBySample(track_.loopStartSample - FirstOffsetExtra() - track_.firstSampleOffset - track_.SamplesPerFrame() * 2); } } @@ -592,7 +592,7 @@ void Atrac::GetResetBufferInfo(AtracResetBufferInfo *bufferInfo, int sample) { // This is because we're filling the buffer start to finish, not streaming. bufferInfo->first.writePosPtr = first_.addr + first_.size; bufferInfo->first.writableBytes = track_.fileSize - first_.size; - int minWriteBytes = FileOffsetBySample(sample) - first_.size; + int minWriteBytes = track_.FileOffsetBySample(sample) - first_.size; if (minWriteBytes > 0) { bufferInfo->first.minWriteBytes = minWriteBytes; } else { @@ -601,7 +601,7 @@ void Atrac::GetResetBufferInfo(AtracResetBufferInfo *bufferInfo, int sample) { bufferInfo->first.filePos = first_.size; } else { // This is without the sample offset. The file offset also includes the previous batch of samples? - int sampleFileOffset = FileOffsetBySample(sample - track_.firstSampleOffset - track_.SamplesPerFrame()); + int sampleFileOffset = track_.FileOffsetBySample(sample - track_.firstSampleOffset - track_.SamplesPerFrame()); // Update the writable bytes. When streaming, this is just the number of bytes until the end. const u32 bufSizeAligned = (bufferMaxSize_ / track_.bytesPerFrame) * track_.bytesPerFrame; @@ -688,7 +688,7 @@ int Atrac::SetData(u32 buffer, u32 readSize, u32 bufferSize, int outputChannels, } u32 Atrac::SetSecondBuffer(u32 secondBuffer, u32 secondBufferSize) { - u32 secondFileOffset = FileOffsetBySample(track_.loopEndSample - track_.firstSampleOffset); + u32 secondFileOffset = track_.FileOffsetBySample(track_.loopEndSample - track_.firstSampleOffset); u32 desiredSize = track_.fileSize - secondFileOffset; // 3 seems to be the number of frames required to handle a loop. @@ -713,7 +713,7 @@ int Atrac::GetSecondBufferInfo(u32 *fileOffset, u32 *desiredSize) { return hleLogWarning(ME, ATRAC_ERROR_SECOND_BUFFER_NOT_NEEDED, "not needed"); } - *fileOffset = FileOffsetBySample(track_.loopEndSample - track_.firstSampleOffset); + *fileOffset = track_.FileOffsetBySample(track_.loopEndSample - track_.firstSampleOffset); *desiredSize = track_.fileSize - *fileOffset; return hleLogSuccessI(ME, 0); } @@ -728,6 +728,26 @@ void Atrac::GetStreamDataInfo(u32 *writePtr, u32 *writableBytes, u32 *readOffset *readOffset = calculatedReadOffset; } +void Atrac::UpdateBufferState() { + if (bufferMaxSize_ >= track_.fileSize) { + if (first_.size < track_.fileSize) { + // The buffer is big enough, but we don't have all the data yet. + bufferState_ = ATRAC_STATUS_HALFWAY_BUFFER; + } else { + bufferState_ = ATRAC_STATUS_ALL_DATA_LOADED; + } + } else { + if (track_.loopEndSample <= 0) { + // There's no looping, but we need to stream the data in our buffer. + bufferState_ = ATRAC_STATUS_STREAMED_WITHOUT_LOOP; + } else if (track_.loopEndSample == track_.endSample + track_.firstSampleOffset + (int)FirstOffsetExtra()) { + bufferState_ = ATRAC_STATUS_STREAMED_LOOP_FROM_END; + } else { + bufferState_ = ATRAC_STATUS_STREAMED_LOOP_WITH_TRAILER; + } + } +} + int Atrac::AddStreamData(u32 bytesToAdd) { u32 readOffset; CalculateStreamInfo(&readOffset); @@ -819,7 +839,7 @@ void Atrac::SeekToSample(int sample) { int offsetSamples = track_.firstSampleOffset + FirstOffsetExtra(); adjust = -(int)(offsetSamples % track_.SamplesPerFrame()); } - const u32 off = FileOffsetBySample(sample + adjust); + const u32 off = track_.FileOffsetBySample(sample + adjust); const u32 backfill = track_.bytesPerFrame * 2; const u32 start = off - track_.dataOff < backfill ? track_.dataOff : off - backfill; @@ -837,7 +857,7 @@ int Atrac::RemainingFrames() const { return PSP_ATRAC_ALLDATA_IS_ON_MEMORY; } - u32 currentFileOffset = FileOffsetBySample(currentSample_ - track_.SamplesPerFrame() + FirstOffsetExtra()); + u32 currentFileOffset = track_.FileOffsetBySample(currentSample_ - track_.SamplesPerFrame() + FirstOffsetExtra()); if (first_.fileoffset >= track_.fileSize) { if (bufferState_ == ATRAC_STATUS_STREAMED_WITHOUT_LOOP) { return PSP_ATRAC_NONLOOP_STREAM_DATA_IS_ON_MEMORY; @@ -921,7 +941,7 @@ u32 Atrac::DecodeData(u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u32 *finish, i SeekToSample(currentSample_); bool gotFrame = false; - u32 off = FileOffsetBySample(currentSample_ - skipSamples); + u32 off = track_.FileOffsetBySample(currentSample_ - skipSamples); if (off < first_.size) { uint8_t *indata = BufferStart() + off; int bytesConsumed = 0; @@ -957,7 +977,7 @@ u32 Atrac::DecodeData(u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u32 *finish, i if (!gotFrame && currentSample_ < track_.endSample) { // Never got a frame. We may have dropped a GHA frame or otherwise have a bug. // For now, let's try to provide an extra "frame" if possible so games don't infinite loop. - if (FileOffsetBySample(currentSample_) < track_.fileSize) { + if (track_.FileOffsetBySample(currentSample_) < track_.fileSize) { numSamples = std::min(maxSamples, track_.SamplesPerFrame()); u32 outBytes = numSamples * outputChannels_ * sizeof(s16); if (outbuf != nullptr) { @@ -970,7 +990,7 @@ u32 Atrac::DecodeData(u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u32 *finish, i *SamplesNum = numSamples; // update current sample and decodePos currentSample_ += numSamples; - decodePos_ = DecodePosBySample(currentSample_); + decodePos_ = track_.DecodePosBySample(currentSample_); ConsumeFrame(); @@ -986,11 +1006,11 @@ u32 Atrac::DecodeData(u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u32 *finish, i } if ((bufferState_ & ATRAC_STATUS_STREAMED_MASK) == ATRAC_STATUS_STREAMED_MASK) { // Whatever bytes we have left were added from the loop. - u32 loopOffset = FileOffsetBySample(track_.loopStartSample - FirstOffsetExtra() - track_.firstSampleOffset - track_.SamplesPerFrame() * 2); + u32 loopOffset = track_.FileOffsetBySample(track_.loopStartSample - FirstOffsetExtra() - track_.firstSampleOffset - track_.SamplesPerFrame() * 2); // TODO: Hmm, need to manage the buffer better. But don't move fileoffset if we already have valid data. if (loopOffset > first_.fileoffset || loopOffset + bufferValidBytes_ < first_.fileoffset) { // Skip the initial frame at the start. - first_.fileoffset = FileOffsetBySample(track_.loopStartSample - FirstOffsetExtra() - track_.firstSampleOffset - track_.SamplesPerFrame() * 2); + first_.fileoffset = track_.FileOffsetBySample(track_.loopStartSample - FirstOffsetExtra() - track_.firstSampleOffset - track_.SamplesPerFrame() * 2); } } } else if (hitEnd) { diff --git a/Core/HLE/AtracCtx.h b/Core/HLE/AtracCtx.h index 52fb6d7acc..5fa111bc39 100644 --- a/Core/HLE/AtracCtx.h +++ b/Core/HLE/AtracCtx.h @@ -141,6 +141,16 @@ struct Track { bitrate = (bitrate + 511) >> 10; } + u32 DecodePosBySample(int sample) const { + return (u32)(firstSampleOffset + sample / (int)SamplesPerFrame() * bytesPerFrame); + } + + u32 FileOffsetBySample(int sample) const { + int offsetSample = sample + firstSampleOffset; + int frameOffset = offsetSample / (int)SamplesPerFrame(); + return (u32)(dataOff + bytesPerFrame + frameOffset * bytesPerFrame); + } + void AnalyzeReset() { endSample = -1; loopinfo.clear(); @@ -157,20 +167,9 @@ int AnalyzeAtracTrack(u32 addr, u32 size, Track *track); class AtracBase { public: virtual ~AtracBase() {} - virtual void UpdateBufferState() = 0; virtual void DoState(PointerWrap &p) = 0; - u32 DecodePosBySample(int sample) const { - return (u32)(track_.firstSampleOffset + sample / (int)track_.SamplesPerFrame() * track_.bytesPerFrame); - } - - u32 FileOffsetBySample(int sample) const { - int offsetSample = sample + track_.firstSampleOffset; - int frameOffset = offsetSample / (int)track_.SamplesPerFrame(); - return (u32)(track_.dataOff + track_.bytesPerFrame + frameOffset * track_.bytesPerFrame); - } - const Track &GetTrack() const { return track_; } @@ -179,21 +178,11 @@ public: return track_; } - int Bitrate() const { - return track_.bitrate; - } - int Channels() const { - return track_.channels; - } - int GetOutputChannels() const { return outputChannels_; } int atracID_ = -1; - u16 outputChannels_ = 2; - int loopNum_ = 0; - Track track_{}; PSPPointer context_{}; @@ -201,15 +190,19 @@ public: return bufferState_; } + int LoopNum() const { + return loopNum_; + } u32 CodecType() const { return track_.codecType; } - AudioDecoder *GetDecoder() const { + AudioDecoder *Decoder() const { return decoder_; } u32 FirstOffsetExtra() const { return ::FirstOffsetExtra(track_.codecType); } + void CreateDecoder(); virtual uint32_t CurBufferAddress(int adjust = 0) const = 0; @@ -232,8 +225,6 @@ public: virtual int SetData(u32 buffer, u32 readSize, u32 bufferSize, int outputChannels, int successCode) = 0; virtual u32 SetSecondBuffer(u32 secondBuffer, u32 secondBufferSize) = 0; virtual int GetSecondBufferInfo(u32 *fileOffset, u32 *desiredSize) = 0; - virtual void ForceSeekToSample(int sample) = 0; - virtual void SeekToSample(int sample) = 0; virtual u32 DecodeData(u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u32 *finish, int *remains) = 0; virtual u32 GetNextSamples() = 0; virtual void InitLowLevel(u32 paramsAddr, bool jointStereo) = 0; @@ -241,6 +232,10 @@ public: protected: virtual void AnalyzeReset() = 0; + Track track_{}; + u16 outputChannels_ = 2; + int loopNum_ = 0; + // TODO: Save the internal state of this, now technically possible. AudioDecoder *decoder_ = nullptr; AtracStatus bufferState_ = ATRAC_STATUS_NO_DATA; @@ -251,30 +246,9 @@ public: ~Atrac() { ResetData(); } - void ResetData(); - - virtual void UpdateBufferState() { - if (bufferMaxSize_ >= track_.fileSize) { - if (first_.size < track_.fileSize) { - // The buffer is big enough, but we don't have all the data yet. - bufferState_ = ATRAC_STATUS_HALFWAY_BUFFER; - } else { - bufferState_ = ATRAC_STATUS_ALL_DATA_LOADED; - } - } else { - if (track_.loopEndSample <= 0) { - // There's no looping, but we need to stream the data in our buffer. - bufferState_ = ATRAC_STATUS_STREAMED_WITHOUT_LOOP; - } else if (track_.loopEndSample == track_.endSample + track_.firstSampleOffset + (int)FirstOffsetExtra()) { - bufferState_ = ATRAC_STATUS_STREAMED_LOOP_FROM_END; - } else { - bufferState_ = ATRAC_STATUS_STREAMED_LOOP_WITH_TRAILER; - } - } - } uint32_t CurBufferAddress(int adjust = 0) const override { - u32 off = FileOffsetBySample(currentSample_ + adjust); + u32 off = track_.FileOffsetBySample(currentSample_ + adjust); if (off < first_.size && ignoreDataBuf_) { return first_.addr + off; } @@ -309,22 +283,18 @@ public: int SetData(u32 buffer, u32 readSize, u32 bufferSize, int outputChannels, int successCode) override; u32 SetSecondBuffer(u32 secondBuffer, u32 secondBufferSize) override; int GetSecondBufferInfo(u32 *fileOffset, u32 *desiredSize) override; - void ForceSeekToSample(int sample) override; - void SeekToSample(int sample) override; u32 DecodeData(u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u32 *finish, int *remains) override; u32 GetNextSamples() override; void InitLowLevel(u32 paramsAddr, bool jointStereo); - // Indicates that the dataBuf_ array should not be used. - u8 *dataBuf_ = nullptr; - - InputBuffer first_{}; - InputBuffer second_{}; - protected: void AnalyzeReset(); private: + void UpdateBufferState(); + void ResetData(); + void SeekToSample(int sample); + void ForceSeekToSample(int sample); u32 StreamBufferEnd() const { // The buffer is always aligned to a frame in size, not counting an optional header. // The header will only initially exist after the data is first set. @@ -334,6 +304,11 @@ private: void ConsumeFrame(); void CalculateStreamInfo(u32 *readOffset); + InputBuffer first_{}; + InputBuffer second_{}; + + u8 *dataBuf_ = nullptr; + // Indicates that the dataBuf_ array should not be used. bool ignoreDataBuf_ = false; int currentSample_ = 0; diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp index 802971958a..775d21ec28 100644 --- a/Core/HLE/sceAtrac.cpp +++ b/Core/HLE/sceAtrac.cpp @@ -176,7 +176,7 @@ static u32 sceAtracGetAtracID(int codecType) { } AtracBase *atrac = new Atrac(); - atrac->track_.codecType = codecType; + atrac->GetTrackMut().codecType = codecType; int atracID = createAtrac(atrac); if (atracID < 0) { delete atrac; @@ -310,7 +310,7 @@ static u32 sceAtracGetBitrate(int atracID, u32 outBitrateAddr) { atrac->GetTrackMut().UpdateBitrate(); if (Memory::IsValidAddress(outBitrateAddr)) { - Memory::WriteUnchecked_U32(atrac->Bitrate(), outBitrateAddr); + Memory::WriteUnchecked_U32(atrac->GetTrack().bitrate, outBitrateAddr); return hleLogSuccessI(ME, 0); } else { return hleLogError(ME, 0, "invalid address"); @@ -326,7 +326,7 @@ static u32 sceAtracGetChannel(int atracID, u32 channelAddr) { } if (Memory::IsValidAddress(channelAddr)){ - Memory::WriteUnchecked_U32(atrac->Channels(), channelAddr); + Memory::WriteUnchecked_U32(atrac->GetTrack().channels, channelAddr); return hleLogSuccessI(ME, 0); } else { return hleLogError(ME, 0, "invalid address"); @@ -342,7 +342,7 @@ static u32 sceAtracGetLoopStatus(int atracID, u32 loopNumAddr, u32 statusAddr) { } if (Memory::IsValidAddress(loopNumAddr)) - Memory::WriteUnchecked_U32(atrac->loopNum_, loopNumAddr); + Memory::WriteUnchecked_U32(atrac->LoopNum(), loopNumAddr); // return audio's loopinfo in at3 file if (Memory::IsValidAddress(statusAddr)) { if (atrac->GetTrack().loopinfo.size() > 0) @@ -603,7 +603,7 @@ static u32 sceAtracSetData(int atracID, u32 buffer, u32 bufferSize) { return ret; } - if (atrac->track_.codecType != atracContextTypes[atracID]) { + if (atrac->GetTrack().codecType != atracContextTypes[atracID]) { // TODO: Should this not change the buffer size? return hleReportError(ME, ATRAC_ERROR_WRONG_CODECTYPE, "atracID uses different codec type than data"); } @@ -883,7 +883,7 @@ struct At3HeaderMap { u8 jointStereo; bool Matches(const AtracBase *at) const { - return bytes == at->GetTrack().BytesPerFrame() && channels == at->Channels(); + return bytes == at->GetTrack().BytesPerFrame() && channels == at->GetTrack().channels; } }; @@ -919,7 +919,7 @@ static int sceAtracLowLevelInitDecoder(int atracID, u32 paramsAddr) { } } if (!found) { - ERROR_LOG_REPORT(ME, "AT3 header map lacks entry for bpf: %i channels: %i", atrac->GetTrack().BytesPerFrame(), atrac->Channels()); + ERROR_LOG_REPORT(ME, "AT3 header map lacks entry for bpf: %i channels: %i", atrac->GetTrack().BytesPerFrame(), atrac->GetTrack().channels); // TODO: Should we return an error code for these values? } } @@ -949,7 +949,7 @@ static int sceAtracLowLevelDecode(int atracID, u32 sourceAddr, u32 sourceBytesCo int bytesConsumed = 0; int bytesWritten = 0; - atrac->GetDecoder()->Decode(srcp, atrac->GetTrack().BytesPerFrame(), &bytesConsumed, 2, outp, &bytesWritten); + atrac->Decoder()->Decode(srcp, atrac->GetTrack().BytesPerFrame(), &bytesConsumed, 2, outp, &bytesWritten); *srcConsumed = bytesConsumed; *outWritten = bytesWritten; From f3d6c93339798ece207f96c38b169ecfaaf9694b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Mon, 15 Apr 2024 13:50:16 +0200 Subject: [PATCH 153/719] Add empty AtracCtx2 implementation, and a dev setting to select it. Savestates don't work. --- CMakeLists.txt | 2 + Core/Config.cpp | 1 + Core/Config.h | 1 + Core/Core.vcxproj | 2 + Core/Core.vcxproj.filters | 6 +++ Core/HLE/AtracCtx.cpp | 4 ++ Core/HLE/AtracCtx.h | 15 +++--- Core/HLE/AtracCtx2.cpp | 73 +++++++++++++++++++++++++++++ Core/HLE/AtracCtx2.h | 35 ++++++++++++++ Core/HLE/sceAtrac.cpp | 26 ++++++---- Core/HLE/sceAudiocodec.h | 4 +- UI/GameSettingsScreen.cpp | 2 + UWP/CoreUWP/CoreUWP.vcxproj | 2 + UWP/CoreUWP/CoreUWP.vcxproj.filters | 6 +++ android/jni/Android.mk | 1 + libretro/Makefile.common | 1 + 16 files changed, 163 insertions(+), 18 deletions(-) create mode 100644 Core/HLE/AtracCtx2.cpp create mode 100644 Core/HLE/AtracCtx2.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 64a10be42c..37e33e968a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2081,6 +2081,8 @@ add_library(${CoreLibName} ${CoreLinkType} Core/HLE/sceAdler.h Core/HLE/AtracCtx.cpp Core/HLE/AtracCtx.h + Core/HLE/AtracCtx2.cpp + Core/HLE/AtracCtx2.h Core/HLE/sceAtrac.cpp Core/HLE/sceAtrac.h Core/HLE/sceAudio.cpp diff --git a/Core/Config.cpp b/Core/Config.cpp index 50f12cc59b..2175c1a55d 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -699,6 +699,7 @@ static const ConfigSetting soundSettings[] = { ConfigSetting("AchievementSoundVolume", &g_Config.iAchievementSoundVolume, 6, CfgFlag::PER_GAME), ConfigSetting("AudioDevice", &g_Config.sAudioDevice, "", CfgFlag::DEFAULT), ConfigSetting("AutoAudioDevice", &g_Config.bAutoAudioDevice, true, CfgFlag::DEFAULT), + ConfigSetting("UseNewAtrac", &g_Config.bUseNewAtrac, false, CfgFlag::DEFAULT), }; static bool DefaultShowTouchControls() { diff --git a/Core/Config.h b/Core/Config.h index 2008572f1b..f504a39a43 100644 --- a/Core/Config.h +++ b/Core/Config.h @@ -274,6 +274,7 @@ public: bool bExtraAudioBuffering; // For bluetooth std::string sAudioDevice; bool bAutoAudioDevice; + bool bUseNewAtrac; // UI bool bShowDebuggerOnLoad; diff --git a/Core/Core.vcxproj b/Core/Core.vcxproj index 2cdf17d477..af66592e01 100644 --- a/Core/Core.vcxproj +++ b/Core/Core.vcxproj @@ -567,6 +567,7 @@ + @@ -1176,6 +1177,7 @@ + diff --git a/Core/Core.vcxproj.filters b/Core/Core.vcxproj.filters index 3c1493fc11..2fd6262e01 100644 --- a/Core/Core.vcxproj.filters +++ b/Core/Core.vcxproj.filters @@ -1312,6 +1312,9 @@ HLE\Libraries + + HLE\Libraries + @@ -2100,6 +2103,9 @@ HLE\Libraries + + HLE\Libraries + diff --git a/Core/HLE/AtracCtx.cpp b/Core/HLE/AtracCtx.cpp index 3cfad06b3d..d8a2725e1a 100644 --- a/Core/HLE/AtracCtx.cpp +++ b/Core/HLE/AtracCtx.cpp @@ -175,6 +175,10 @@ void Atrac::AnalyzeReset() { bufferPos_ = 0; } +u8 *Atrac::BufferStart() { + return ignoreDataBuf_ ? Memory::GetPointerWrite(first_.addr) : dataBuf_; +} + void AtracBase::UpdateContextFromPSPMem() { if (!context_.IsValid()) { return; diff --git a/Core/HLE/AtracCtx.h b/Core/HLE/AtracCtx.h index 5fa111bc39..fdaa82b5ec 100644 --- a/Core/HLE/AtracCtx.h +++ b/Core/HLE/AtracCtx.h @@ -17,9 +17,12 @@ #pragma once +#include + #include "Common/CommonTypes.h" #include "Common/Swap.h" +#include "Core/MemMap.h" #include "Core/HLE/sceAtrac.h" struct AtracSingleResetBufferInfo { @@ -205,7 +208,6 @@ public: void CreateDecoder(); - virtual uint32_t CurBufferAddress(int adjust = 0) const = 0; virtual int CurrentSample() const = 0; virtual int RemainingFrames() const = 0; virtual u32 SecondBufferSize() const = 0; @@ -230,8 +232,6 @@ public: virtual void InitLowLevel(u32 paramsAddr, bool jointStereo) = 0; protected: - virtual void AnalyzeReset() = 0; - Track track_{}; u16 outputChannels_ = 2; int loopNum_ = 0; @@ -247,7 +247,7 @@ public: ResetData(); } - uint32_t CurBufferAddress(int adjust = 0) const override { + uint32_t CurBufferAddress(int adjust = 0) const { u32 off = track_.FileOffsetBySample(currentSample_ + adjust); if (off < first_.size && ignoreDataBuf_) { return first_.addr + off; @@ -256,10 +256,7 @@ public: return 0; } - u8 *BufferStart() { - return ignoreDataBuf_ ? Memory::GetPointerWrite(first_.addr) : dataBuf_; - } - + u8 *BufferStart(); void DoState(PointerWrap &p) override; void WriteContextToPSPMem() override; @@ -285,7 +282,7 @@ public: int GetSecondBufferInfo(u32 *fileOffset, u32 *desiredSize) override; u32 DecodeData(u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u32 *finish, int *remains) override; u32 GetNextSamples() override; - void InitLowLevel(u32 paramsAddr, bool jointStereo); + void InitLowLevel(u32 paramsAddr, bool jointStereo) override; protected: void AnalyzeReset(); diff --git a/Core/HLE/AtracCtx2.cpp b/Core/HLE/AtracCtx2.cpp new file mode 100644 index 0000000000..0c868982f7 --- /dev/null +++ b/Core/HLE/AtracCtx2.cpp @@ -0,0 +1,73 @@ +#include "Common/Log.h" +#include "AtracCtx2.h" + +void Atrac2::DoState(PointerWrap &p) { + _assert_msg_(false, "Savestates not yet support with new Atrac implementation"); +} + +void Atrac2::WriteContextToPSPMem() { + +} + +int Atrac2::Analyze(u32 addr, u32 size) { + return 0; +} +int Atrac2::AnalyzeAA3(u32 addr, u32 size, u32 filesize) { + return 0; +} + +int Atrac2::RemainingFrames() const { + return 0; +} + +u32 Atrac2::SecondBufferSize() const { + return 0; +} + +void Atrac2::GetStreamDataInfo(u32 *writePtr, u32 *writableBytes, u32 *readOffset) { + +} + +int Atrac2::AddStreamData(u32 bytesToAdd) { + return 0; +} + +u32 Atrac2::AddStreamDataSas(u32 bufPtr, u32 bytesToAdd) { + return 0; +} + +void Atrac2::SetLoopNum(int loopNum) { + +} + +u32 Atrac2::ResetPlayPosition(int sample, int bytesWrittenFirstBuf, int bytesWrittenSecondBuf) { + return 0; +} + +void Atrac2::GetResetBufferInfo(AtracResetBufferInfo *bufferInfo, int sample) { + +} + +int Atrac2::SetData(u32 buffer, u32 readSize, u32 bufferSize, int outputChannels, int successCode) { + return 0; +} + +u32 Atrac2::SetSecondBuffer(u32 secondBuffer, u32 secondBufferSize) { + return 0; +} + +int Atrac2::GetSecondBufferInfo(u32 *fileOffset, u32 *desiredSize) { + return 0; +} + +u32 Atrac2::DecodeData(u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u32 *finish, int *remains) { + return 0; +} + +u32 Atrac2::GetNextSamples() { + return 0; +} + +void Atrac2::InitLowLevel(u32 paramsAddr, bool jointStereo) { + +} diff --git a/Core/HLE/AtracCtx2.h b/Core/HLE/AtracCtx2.h new file mode 100644 index 0000000000..df6734d285 --- /dev/null +++ b/Core/HLE/AtracCtx2.h @@ -0,0 +1,35 @@ +#pragma once + +#include + +#include "Core/HLE/AtracCtx.h" + + +class Atrac2 : public AtracBase { +public: + void DoState(PointerWrap &p) override; + void WriteContextToPSPMem() override; + + int Analyze(u32 addr, u32 size) override; + int AnalyzeAA3(u32 addr, u32 size, u32 filesize) override; + + int CurrentSample() const override { return currentSample_; } + int RemainingFrames() const override; + u32 SecondBufferSize() const override; + + void GetStreamDataInfo(u32 *writePtr, u32 *writableBytes, u32 *readOffset) override; + int AddStreamData(u32 bytesToAdd) override; + u32 AddStreamDataSas(u32 bufPtr, u32 bytesToAdd) override; + void SetLoopNum(int loopNum) override; + u32 ResetPlayPosition(int sample, int bytesWrittenFirstBuf, int bytesWrittenSecondBuf) override; + void GetResetBufferInfo(AtracResetBufferInfo *bufferInfo, int sample) override; + int SetData(u32 buffer, u32 readSize, u32 bufferSize, int outputChannels, int successCode) override; + u32 SetSecondBuffer(u32 secondBuffer, u32 secondBufferSize) override; + int GetSecondBufferInfo(u32 *fileOffset, u32 *desiredSize) override; + u32 DecodeData(u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u32 *finish, int *remains) override; + u32 GetNextSamples() override; + void InitLowLevel(u32 paramsAddr, bool jointStereo) override; + +private: + int currentSample_ = 0; +}; diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp index 775d21ec28..15513b031d 100644 --- a/Core/HLE/sceAtrac.cpp +++ b/Core/HLE/sceAtrac.cpp @@ -35,6 +35,7 @@ #include "Core/HLE/sceKernelMemory.h" #include "Core/HLE/sceAtrac.h" #include "Core/HLE/AtracCtx.h" +#include "Core/HLE/AtracCtx2.h" #include "Core/System.h" // Notes about sceAtrac buffer management @@ -136,6 +137,14 @@ void __AtracDoState(PointerWrap &p) { } } +static AtracBase *allocAtrac(bool forceOld = false) { + if (g_Config.bUseNewAtrac && !forceOld) { + return new Atrac2(); + } else { + return new Atrac(); + } +} + static AtracBase *getAtrac(int atracID) { if (atracID < 0 || atracID >= PSP_NUM_ATRAC_IDS) { return nullptr; @@ -169,13 +178,14 @@ static int deleteAtrac(int atracID) { return ATRAC_ERROR_BAD_ATRACID; } -// Really, allocate a new Atrac context of a specific codec type. +// Really, allocate an Atrac context of a specific codec type. +// Useful to initialize a context for low level decode. static u32 sceAtracGetAtracID(int codecType) { if (codecType != PSP_MODE_AT_3 && codecType != PSP_MODE_AT_3_PLUS) { return hleReportError(ME, ATRAC_ERROR_INVALID_CODECTYPE, "invalid codecType"); } - AtracBase *atrac = new Atrac(); + AtracBase *atrac = allocAtrac(); atrac->GetTrackMut().codecType = codecType; int atracID = createAtrac(atrac); if (atracID < 0) { @@ -619,7 +629,7 @@ static int sceAtracSetDataAndGetID(u32 buffer, int bufferSize) { bufferSize = 0x10000000; } - Atrac *atrac = new Atrac(); + AtracBase *atrac = allocAtrac(); int ret = atrac->Analyze(buffer, bufferSize); if (ret < 0) { // Already logged. @@ -639,7 +649,7 @@ static int sceAtracSetHalfwayBufferAndGetID(u32 buffer, u32 readSize, u32 buffer if (readSize > bufferSize) { return hleLogError(ME, ATRAC_ERROR_INCORRECT_READ_SIZE, "read size too large"); } - Atrac *atrac = new Atrac(); + AtracBase *atrac = allocAtrac(); int ret = atrac->Analyze(buffer, readSize); if (ret < 0) { // Already logged. @@ -795,7 +805,7 @@ static u32 sceAtracSetMOutData(int atracID, u32 buffer, u32 bufferSize) { // Note: This doesn't seem to be part of any available libatrac3plus library. static int sceAtracSetMOutDataAndGetID(u32 buffer, u32 bufferSize) { - Atrac *atrac = new Atrac(); + AtracBase *atrac = allocAtrac(); int ret = atrac->Analyze(buffer, bufferSize); if (ret < 0) { // Already logged. @@ -819,7 +829,7 @@ static int sceAtracSetMOutHalfwayBufferAndGetID(u32 buffer, u32 readSize, u32 bu if (readSize > bufferSize) { return hleLogError(ME, ATRAC_ERROR_INCORRECT_READ_SIZE, "read size too large"); } - Atrac *atrac = new Atrac(); + AtracBase *atrac = allocAtrac(); int ret = atrac->Analyze(buffer, readSize); if (ret < 0) { // Already logged. @@ -840,7 +850,7 @@ static int sceAtracSetMOutHalfwayBufferAndGetID(u32 buffer, u32 readSize, u32 bu } static int sceAtracSetAA3DataAndGetID(u32 buffer, u32 bufferSize, u32 fileSize, u32 metadataSizeAddr) { - Atrac *atrac = new Atrac(); + AtracBase *atrac = allocAtrac(); int ret = atrac->AnalyzeAA3(buffer, bufferSize, fileSize); if (ret < 0) { // Already logged. @@ -962,7 +972,7 @@ static int sceAtracSetAA3HalfwayBufferAndGetID(u32 buffer, u32 readSize, u32 buf return hleLogError(ME, ATRAC_ERROR_INCORRECT_READ_SIZE, "read size too large"); } - Atrac *atrac = new Atrac(); + AtracBase *atrac = allocAtrac(); int ret = atrac->AnalyzeAA3(buffer, readSize, fileSize); if (ret < 0) { // Already logged. diff --git a/Core/HLE/sceAudiocodec.h b/Core/HLE/sceAudiocodec.h index 8f190cb84e..21d9106e82 100644 --- a/Core/HLE/sceAudiocodec.h +++ b/Core/HLE/sceAudiocodec.h @@ -17,6 +17,8 @@ #pragma once +class PointerWrap; + typedef struct { s32_le unk0; s32_le unk4; @@ -58,4 +60,4 @@ typedef struct { void __AudioCodecInit(); void __AudioCodecShutdown(); void Register_sceAudiocodec(); -void __sceAudiocodecDoState(PointerWrap &p); \ No newline at end of file +void __sceAudiocodecDoState(PointerWrap &p); diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp index 2be2db01fd..3ffdd66445 100644 --- a/UI/GameSettingsScreen.cpp +++ b/UI/GameSettingsScreen.cpp @@ -1783,6 +1783,8 @@ void DeveloperToolsScreen::CreateViews() { cpuTests->SetEnabled(TestsAvailable()); #endif + list->Add(new CheckBox(&g_Config.bUseNewAtrac, dev->T("Use experimental sceAtrac"))); + AddOverlayList(list, screenManager()); list->Add(new CheckBox(&g_Config.bEnableLogging, dev->T("Enable Logging")))->OnClick.Handle(this, &DeveloperToolsScreen::OnLoggingChanged); diff --git a/UWP/CoreUWP/CoreUWP.vcxproj b/UWP/CoreUWP/CoreUWP.vcxproj index 372cf7e0ee..5a8eafb8dd 100644 --- a/UWP/CoreUWP/CoreUWP.vcxproj +++ b/UWP/CoreUWP/CoreUWP.vcxproj @@ -175,6 +175,7 @@ + @@ -427,6 +428,7 @@ + diff --git a/UWP/CoreUWP/CoreUWP.vcxproj.filters b/UWP/CoreUWP/CoreUWP.vcxproj.filters index 1d6c5090dc..591347ecc2 100644 --- a/UWP/CoreUWP/CoreUWP.vcxproj.filters +++ b/UWP/CoreUWP/CoreUWP.vcxproj.filters @@ -1202,6 +1202,9 @@ HLE + + HLE + @@ -1888,6 +1891,9 @@ HLE + + HLE + diff --git a/android/jni/Android.mk b/android/jni/Android.mk index bd1939220d..cfc31293e8 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -615,6 +615,7 @@ EXEC_AND_LIB_FILES := \ $(SRC)/Core/HLE/sceAdler.cpp \ $(SRC)/Core/HLE/sceAtrac.cpp \ $(SRC)/Core/HLE/AtracCtx.cpp \ + $(SRC)/Core/HLE/AtracCtx2.cpp \ $(SRC)/Core/HLE/__sceAudio.cpp.arm \ $(SRC)/Core/HLE/sceAudio.cpp.arm \ $(SRC)/Core/HLE/sceAudiocodec.cpp.arm \ diff --git a/libretro/Makefile.common b/libretro/Makefile.common index 3aded79f28..47a886af34 100644 --- a/libretro/Makefile.common +++ b/libretro/Makefile.common @@ -652,6 +652,7 @@ SOURCES_CXX += \ $(COREDIR)/HLE/HLEHelperThread.cpp \ $(COREDIR)/HLE/HLETables.cpp \ $(COREDIR)/HLE/AtracCtx.cpp \ + $(COREDIR)/HLE/AtracCtx2.cpp \ $(COREDIR)/HLE/sceAdler.cpp \ $(COREDIR)/HLE/sceAtrac.cpp \ $(COREDIR)/HLE/sceAudio.cpp \ From 5470885178b2329fd23255423dd0ce26c588900b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Mon, 15 Apr 2024 14:08:01 +0200 Subject: [PATCH 154/719] Add some basics. --- Core/HLE/AtracCtx2.cpp | 82 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 77 insertions(+), 5 deletions(-) diff --git a/Core/HLE/AtracCtx2.cpp b/Core/HLE/AtracCtx2.cpp index 0c868982f7..f0a6790eb3 100644 --- a/Core/HLE/AtracCtx2.cpp +++ b/Core/HLE/AtracCtx2.cpp @@ -1,18 +1,65 @@ #include "Common/Log.h" -#include "AtracCtx2.h" +#include "Core/MemMapHelpers.h" +#include "Core/HLE/HLE.h" +#include "Core/HLE/FunctionWrappers.h" +#include "Core/HLE/AtracCtx2.h" void Atrac2::DoState(PointerWrap &p) { - _assert_msg_(false, "Savestates not yet support with new Atrac implementation"); + _assert_msg_(false, "Savestates not yet support with new Atrac implementation.\n\nTurn it off in Developer settings.\n\n"); } void Atrac2::WriteContextToPSPMem() { + if (!context_.IsValid()) { + return; + } + // context points into PSP memory. + SceAtracContext *context = context_; + context->info.buffer = 0; // bufferAddr_; // first_.addr; + context->info.bufferByte = 0; // bufferMaxSize_; + context->info.secondBuffer = 0; // TODO + context->info.secondBufferByte = 0; // TODO + context->info.codec = track_.codecType; + context->info.loopNum = loopNum_; + context->info.loopStart = track_.loopStartSample > 0 ? track_.loopStartSample : 0; + context->info.loopEnd = track_.loopEndSample > 0 ? track_.loopEndSample : 0; + // Note that we read in the state when loading the atrac object, so it's safe + // to update it back here all the time. Some games, like Sol Trigger, change it. + // TODO: Should we just keep this in PSP ram then, or something? + context->info.state = bufferState_; + if (track_.firstSampleOffset != 0) { + context->info.samplesPerChan = track_.firstSampleOffset + FirstOffsetExtra(); + } else { + context->info.samplesPerChan = (track_.codecType == PSP_MODE_AT_3_PLUS ? ATRAC3PLUS_MAX_SAMPLES : ATRAC3_MAX_SAMPLES); + } + context->info.sampleSize = track_.bytesPerFrame; + context->info.numChan = track_.channels; + context->info.dataOff = track_.dataOff; + context->info.endSample = track_.endSample + track_.firstSampleOffset + FirstOffsetExtra(); + context->info.dataEnd = track_.fileSize; + context->info.curOff = 0; // first_.fileoffset; + context->info.decodePos = track_.DecodePosBySample(currentSample_); + context->info.streamDataByte = 0; // first_.size - track_.dataOff; + + u8 *buf = (u8 *)context; + *(u32_le *)(buf + 0xfc) = atracID_; + + NotifyMemInfo(MemBlockFlags::WRITE, context_.ptr, sizeof(SceAtracContext), "AtracContext"); } int Atrac2::Analyze(u32 addr, u32 size) { + int retval = AnalyzeAtracTrack(addr, size, &track_); + if (retval < 0) { + return retval; + } return 0; } int Atrac2::AnalyzeAA3(u32 addr, u32 size, u32 filesize) { + int retval = AnalyzeAA3Track(addr, size, filesize, &track_); + if (retval < 0) { + return retval; + } + return 0; } @@ -49,7 +96,12 @@ void Atrac2::GetResetBufferInfo(AtracResetBufferInfo *bufferInfo, int sample) { } int Atrac2::SetData(u32 buffer, u32 readSize, u32 bufferSize, int outputChannels, int successCode) { - return 0; + if (readSize == bufferSize) { + bufferState_ = ATRAC_STATUS_ALL_DATA_LOADED; + } else { + bufferState_ = ATRAC_STATUS_HALFWAY_BUFFER; + } + return hleLogSuccessI(ME, successCode); } u32 Atrac2::SetSecondBuffer(u32 secondBuffer, u32 secondBufferSize) { @@ -57,10 +109,13 @@ u32 Atrac2::SetSecondBuffer(u32 secondBuffer, u32 secondBufferSize) { } int Atrac2::GetSecondBufferInfo(u32 *fileOffset, u32 *desiredSize) { - return 0; + *fileOffset = 0; + *desiredSize = 0; + return hleLogSuccessInfoI(ME, ATRAC_ERROR_SECOND_BUFFER_NOT_NEEDED, "not needed"); } u32 Atrac2::DecodeData(u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u32 *finish, int *remains) { + return 0; } @@ -69,5 +124,22 @@ u32 Atrac2::GetNextSamples() { } void Atrac2::InitLowLevel(u32 paramsAddr, bool jointStereo) { - + track_.AnalyzeReset(); + track_.channels = Memory::Read_U32(paramsAddr); + outputChannels_ = Memory::Read_U32(paramsAddr + 4); + track_.bytesPerFrame = Memory::Read_U32(paramsAddr + 8); + if (track_.codecType == PSP_MODE_AT_3) { + track_.bitrate = (track_.bytesPerFrame * 352800) / 1000; + track_.bitrate = (track_.bitrate + 511) >> 10; + track_.jointStereo = false; + } else if (track_.codecType == PSP_MODE_AT_3_PLUS) { + track_.bitrate = (track_.bytesPerFrame * 352800) / 1000; + track_.bitrate = ((track_.bitrate >> 11) + 8) & 0xFFFFFFF0; + track_.jointStereo = false; + } + track_.dataOff = 0; + bufferState_ = ATRAC_STATUS_LOW_LEVEL; + currentSample_ = 0; + CreateDecoder(); + WriteContextToPSPMem(); } From e188f3cadcae3f7f0dc4b38fc369a6effdbfc3b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Mon, 15 Apr 2024 21:23:19 +0200 Subject: [PATCH 155/719] Fix camera on Windows. Forgot to re-enable USE_FFMPEG in the project. We use FFMPEG's swscaler system for scaling camera images (this should be changed at some point, though). --- Windows/PPSSPP.vcxproj | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Windows/PPSSPP.vcxproj b/Windows/PPSSPP.vcxproj index c9835d7268..7fd1101e82 100644 --- a/Windows/PPSSPP.vcxproj +++ b/Windows/PPSSPP.vcxproj @@ -231,7 +231,7 @@ - RC_CLIENT_SUPPORTS_RAINTEGRATION;_CRTDBG_MAP_ALLOC;USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_ARCH_32=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) + USE_FFMPEG;RC_CLIENT_SUPPORTS_RAINTEGRATION;_CRTDBG_MAP_ALLOC;USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_ARCH_32=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) false Sync Use @@ -271,7 +271,7 @@ false - RC_CLIENT_SUPPORTS_RAINTEGRATION;_CRTDBG_MAP_ALLOC;USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_ARCH_64=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) + USE_FFMPEG;RC_CLIENT_SUPPORTS_RAINTEGRATION;_CRTDBG_MAP_ALLOC;USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_ARCH_64=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) Sync Use Level3 @@ -307,7 +307,7 @@ false - _CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_ARCH_64=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) + USE_FFMPEG;_CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_ARCH_64=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) Sync Use Level3 @@ -343,7 +343,7 @@ false - _CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_ARCH_32=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) + USE_FFMPEG;_CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_ARCH_32=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) Use Level3 ProgramDatabase @@ -378,7 +378,7 @@ AnySuitable true Speed - RC_CLIENT_SUPPORTS_RAINTEGRATION;USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_ARCH_32=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) + USE_FFMPEG;RC_CLIENT_SUPPORTS_RAINTEGRATION;USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_ARCH_32=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) true Sync MultiThreaded @@ -428,7 +428,7 @@ true Speed false - RC_CLIENT_SUPPORTS_RAINTEGRATION;USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_ARCH_64=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) + USE_FFMPEG;RC_CLIENT_SUPPORTS_RAINTEGRATION;USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_ARCH_64=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) true Sync MultiThreaded @@ -471,7 +471,7 @@ true Speed false - USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_ARCH_64=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) + USE_FFMPEG;USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_ARCH_64=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) true Sync MultiThreaded @@ -513,7 +513,7 @@ true Speed false - USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_ARCH_32=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) + USE_FFMPEG;USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_ARCH_32=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) true Sync MultiThreaded From 1b366afa35c7465243d03805fc5d734b0846fc7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Tue, 16 Apr 2024 15:31:11 +0200 Subject: [PATCH 156/719] Refactor: Change *outBytes to *outSamples in AudioDecoder::Decode. --- Core/HLE/AtracCtx.cpp | 7 +++--- Core/HLE/sceAtrac.cpp | 7 +++--- Core/HLE/sceAudiocodec.cpp | 4 ++-- Core/HLE/sceMp3.cpp | 13 ++++++----- Core/HW/Atrac3Standalone.cpp | 28 ++++++++++------------- Core/HW/MediaEngine.cpp | 9 ++++---- Core/HW/SimpleAudioDec.cpp | 43 ++++++++++++++---------------------- Core/HW/SimpleAudioDec.h | 7 ++---- UI/BackgroundAudio.cpp | 7 +++--- 9 files changed, 57 insertions(+), 68 deletions(-) diff --git a/Core/HLE/AtracCtx.cpp b/Core/HLE/AtracCtx.cpp index d8a2725e1a..d871e39164 100644 --- a/Core/HLE/AtracCtx.cpp +++ b/Core/HLE/AtracCtx.cpp @@ -949,16 +949,17 @@ u32 Atrac::DecodeData(u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u32 *finish, i if (off < first_.size) { uint8_t *indata = BufferStart() + off; int bytesConsumed = 0; - int outBytes = 0; - if (!decoder_->Decode(indata, track_.bytesPerFrame, &bytesConsumed, outputChannels_, outbuf, &outBytes)) { + int outSamples = 0; + if (!decoder_->Decode(indata, track_.bytesPerFrame, &bytesConsumed, outputChannels_, (int16_t *)outbuf, &outSamples)) { // Decode failed. *SamplesNum = 0; *finish = 1; return ATRAC_ERROR_ALL_DATA_DECODED; } + int outBytes = outSamples * outputChannels_ * sizeof(int16_t); gotFrame = true; - numSamples = outBytes / 4; + numSamples = outSamples; uint32_t packetAddr = CurBufferAddress(-skipSamples); // got a frame int skipped = std::min((u32)skipSamples, numSamples); diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp index 15513b031d..2002895974 100644 --- a/Core/HLE/sceAtrac.cpp +++ b/Core/HLE/sceAtrac.cpp @@ -944,7 +944,7 @@ static int sceAtracLowLevelInitDecoder(int atracID, u32 paramsAddr) { static int sceAtracLowLevelDecode(int atracID, u32 sourceAddr, u32 sourceBytesConsumedAddr, u32 samplesAddr, u32 sampleBytesAddr) { auto srcp = PSPPointer::Create(sourceAddr); auto srcConsumed = PSPPointer::Create(sourceBytesConsumedAddr); - auto outp = PSPPointer::Create(samplesAddr); + auto outp = PSPPointer::Create(samplesAddr); auto outWritten = PSPPointer::Create(sampleBytesAddr); AtracBase *atrac = getAtrac(atracID); @@ -958,8 +958,9 @@ static int sceAtracLowLevelDecode(int atracID, u32 sourceAddr, u32 sourceBytesCo } int bytesConsumed = 0; - int bytesWritten = 0; - atrac->Decoder()->Decode(srcp, atrac->GetTrack().BytesPerFrame(), &bytesConsumed, 2, outp, &bytesWritten); + int outSamples = 0; + atrac->Decoder()->Decode(srcp, atrac->GetTrack().BytesPerFrame(), &bytesConsumed, 2, outp, &outSamples); + int bytesWritten = outSamples * 2 * sizeof(int16_t); *srcConsumed = bytesConsumed; *outWritten = bytesWritten; diff --git a/Core/HLE/sceAudiocodec.cpp b/Core/HLE/sceAudiocodec.cpp index 7361468063..7676593630 100644 --- a/Core/HLE/sceAudiocodec.cpp +++ b/Core/HLE/sceAudiocodec.cpp @@ -102,7 +102,6 @@ static int sceAudiocodecDecode(u32 ctxPtr, int codec) { } if (IsValidCodec(audioType)){ - int outbytes = 0; // find a decoder in audioList auto decoder = findDecoder(ctxPtr); @@ -119,7 +118,8 @@ static int sceAudiocodecDecode(u32 ctxPtr, int codec) { auto ctx = PSPPointer::Create(ctxPtr); // On stack, no need to allocate. // Decode audio int inDataConsumed = 0; - decoder->Decode(Memory::GetPointer(ctx->inDataPtr), ctx->inDataSize, &inDataConsumed, 2, Memory::GetPointerWrite(ctx->outDataPtr), &outbytes); + int outSamples = 0; + decoder->Decode(Memory::GetPointer(ctx->inDataPtr), ctx->inDataSize, &inDataConsumed, 2, (int16_t *)Memory::GetPointerWrite(ctx->outDataPtr), &outSamples); } DEBUG_LOG(ME, "sceAudiocodecDec(%08x, %i (%s))", ctxPtr, codec, GetCodecName(codec)); return 0; diff --git a/Core/HLE/sceMp3.cpp b/Core/HLE/sceMp3.cpp index 1b337e800f..f364acd80f 100644 --- a/Core/HLE/sceMp3.cpp +++ b/Core/HLE/sceMp3.cpp @@ -739,16 +739,17 @@ static u32 sceMp3LowLevelDecode(u32 mp3, u32 sourceAddr, u32 sourceBytesConsumed return -1; } - auto inbuff = Memory::GetPointerWriteUnchecked(sourceAddr); - auto outbuff = Memory::GetPointerWriteUnchecked(samplesAddr); + const u8 *inbuff = Memory::GetPointerWriteUnchecked(sourceAddr); + int16_t *outbuf = (int16_t *)Memory::GetPointerWriteUnchecked(samplesAddr); - int outpcmbytes = 0; + int outSamples = 0; int inbytesConsumed = 0; - ctx->decoder->Decode(inbuff, 4096, &inbytesConsumed, 2, outbuff, &outpcmbytes); - NotifyMemInfo(MemBlockFlags::WRITE, samplesAddr, outpcmbytes, "Mp3LowLevelDecode"); + ctx->decoder->Decode(inbuff, 4096, &inbytesConsumed, 2, outbuf, &outSamples); + int outBytes = outSamples * sizeof(int16_t) * 2; + NotifyMemInfo(MemBlockFlags::WRITE, samplesAddr, outBytes, "Mp3LowLevelDecode"); Memory::Write_U32(inbytesConsumed, sourceBytesConsumedAddr); - Memory::Write_U32(outpcmbytes, sampleBytesAddr); + Memory::Write_U32(outBytes, sampleBytesAddr); return 0; } diff --git a/Core/HW/Atrac3Standalone.cpp b/Core/HW/Atrac3Standalone.cpp index 63845bbc37..6fb5ffc540 100644 --- a/Core/HW/Atrac3Standalone.cpp +++ b/Core/HW/Atrac3Standalone.cpp @@ -56,7 +56,7 @@ public: } } - bool Decode(const uint8_t *inbuf, int inbytes, int *inbytesConsumed, int outputChannels, uint8_t *outbuf, int *outbytes) override { + bool Decode(const uint8_t *inbuf, int inbytes, int *inbytesConsumed, int outputChannels, int16_t *outbuf, int *outSamples) override { if (!codecOpen_) { _dbg_assert_(false); } @@ -73,45 +73,42 @@ public: result = atrac3_decode_frame(at3Ctx_, buffers_, &nb_samples, inbuf, inbytes); } if (result < 0) { - *outbytes = 0; + if (outSamples) { + *outSamples = 0; + } return false; } if (inbytesConsumed) { *inbytesConsumed = result; } - outSamples_ = nb_samples; + if (outSamples) { + *outSamples = nb_samples; + } if (nb_samples > 0) { - if (outbytes) { - *outbytes = nb_samples * 2 * 2; + if (outSamples) { + *outSamples = nb_samples; } if (outbuf) { _dbg_assert_(outputChannels == 1 || outputChannels == 2); - int16_t *output = (int16_t *)outbuf; const float *left = buffers_[0]; if (outputChannels == 2) { // Stereo output, standard. const float *right = channels_ == 2 ? buffers_[1] : buffers_[0]; for (int i = 0; i < nb_samples; i++) { - output[i * 2] = clamp16(left[i]); - output[i * 2 + 1] = clamp16(right[i]); + outbuf[i * 2] = clamp16(left[i]); + outbuf[i * 2 + 1] = clamp16(right[i]); } } else { // Mono output, just take the left channel. for (int i = 0; i < nb_samples; i++) { - output[i] = clamp16(left[i]); + outbuf[i] = clamp16(left[i]); } } } - } else if (outbytes) { - *outbytes = 0; } return true; } - int GetOutSamples() const override { - return outSamples_; - } - void SetChannels(int channels) override { // Hmm. ignore for now. } @@ -125,7 +122,6 @@ private: int channels_ = 0; int blockAlign_ = 0; - int outSamples_ = 0; int srcPos_ = 0; float *buffers_[2]{}; diff --git a/Core/HW/MediaEngine.cpp b/Core/HW/MediaEngine.cpp index c7f89de5c4..79c52a5763 100644 --- a/Core/HW/MediaEngine.cpp +++ b/Core/HW/MediaEngine.cpp @@ -1054,7 +1054,7 @@ int MediaEngine::getNextAudioFrame(u8 **buf, int *headerCode1, int *headerCode2) } int MediaEngine::getAudioSamples(u32 bufferPtr) { - u8 *buffer = Memory::GetPointerWriteRange(bufferPtr, 8192); + int16_t *buffer = (int16_t *)Memory::GetPointerWriteRange(bufferPtr, 8192); if (buffer == nullptr) { ERROR_LOG_REPORT(ME, "Ignoring bad audio decode address %08x during video playback", bufferPtr); } @@ -1068,7 +1068,7 @@ int MediaEngine::getAudioSamples(u32 bufferPtr) { if (frameSize == 0) { return 0; } - int outbytes = 0; + int outSamples = 0; if (m_audioContext != nullptr) { if (headerCode1 == 0x24) { @@ -1078,11 +1078,12 @@ int MediaEngine::getAudioSamples(u32 bufferPtr) { } int inbytesConsumed = 0; - if (!m_audioContext->Decode(audioFrame, frameSize, &inbytesConsumed, 2, buffer, &outbytes)) { + if (!m_audioContext->Decode(audioFrame, frameSize, &inbytesConsumed, 2, buffer, &outSamples)) { ERROR_LOG(ME, "Audio (%s) decode failed during video playback", GetCodecName(m_audioType)); } + int outBytes = outSamples * sizeof(int16_t) * 2; - NotifyMemInfo(MemBlockFlags::WRITE, bufferPtr, outbytes, "VideoDecodeAudio"); + NotifyMemInfo(MemBlockFlags::WRITE, bufferPtr, outBytes, "VideoDecodeAudio"); } return 0x2000; diff --git a/Core/HW/SimpleAudioDec.cpp b/Core/HW/SimpleAudioDec.cpp index 2b7a16055f..538886cc22 100644 --- a/Core/HW/SimpleAudioDec.cpp +++ b/Core/HW/SimpleAudioDec.cpp @@ -67,22 +67,17 @@ public: } ~MiniMp3Audio() {} - bool Decode(const uint8_t* inbuf, int inbytes, int *inbytesConsumed, int outputChannels, uint8_t *outbuf, int *outbytes) override { + bool Decode(const uint8_t* inbuf, int inbytes, int *inbytesConsumed, int outputChannels, int16_t *outbuf, int *outSamples) override { _dbg_assert_(outputChannels == 2); mp3dec_frame_info_t info{}; int samplesWritten = mp3dec_decode_frame(&mp3_, inbuf, inbytes, (mp3d_sample_t *)outbuf, &info); *inbytesConsumed = info.frame_bytes; - *outbytes = samplesWritten * sizeof(mp3d_sample_t) * info.channels; - outSamples_ = samplesWritten * info.channels; + *outSamples = samplesWritten; return true; } bool IsOK() const override { return true; } - int GetOutSamples() const override { - return outSamples_; - } - void SetChannels(int channels) override { // Hmm. ignore for now. } @@ -92,8 +87,6 @@ public: private: // We use the lowest-level API. mp3dec_t mp3_{}; - int outSamples_ = 0; - int srcPos_ = 0; }; // FFMPEG-based decoder. TODO: Replace with individual codecs. @@ -103,7 +96,7 @@ public: FFmpegAudioDecoder(PSPAudioType audioType, int sampleRateHz = 44100, int channels = 2); ~FFmpegAudioDecoder(); - bool Decode(const uint8_t* inbuf, int inbytes, int *inbytesConsumed, int outputChannels, uint8_t *outbuf, int *outbytes) override; + bool Decode(const uint8_t* inbuf, int inbytes, int *inbytesConsumed, int outputChannels, int16_t *outbuf, int *outSamples) override; bool IsOK() const override { #ifdef USE_FFMPEG return codec_ != 0; @@ -112,10 +105,6 @@ public: #endif } - int GetOutSamples() const override { - return outSamples_; - } - void SetChannels(int channels) override; // These two are only here because of save states. @@ -127,7 +116,6 @@ private: PSPAudioType audioType; int sample_rate_; int channels_; - int outSamples_ = 0; // output samples per frame AVFrame *frame_ = nullptr; AVCodec *codec_ = nullptr; @@ -266,7 +254,7 @@ FFmpegAudioDecoder::~FFmpegAudioDecoder() { } // Decodes a single input frame. -bool FFmpegAudioDecoder::Decode(const uint8_t *inbuf, int inbytes, int *inbytesConsumed, int outputChannels, uint8_t *outbuf, int *outbytes) { +bool FFmpegAudioDecoder::Decode(const uint8_t *inbuf, int inbytes, int *inbytesConsumed, int outputChannels, int16_t *outbuf, int *outSamples) { #ifdef USE_FFMPEG if (!codecOpen_) { OpenCodec(inbytes); @@ -280,8 +268,12 @@ bool FFmpegAudioDecoder::Decode(const uint8_t *inbuf, int inbytes, int *inbytesC int got_frame = 0; av_frame_unref(frame_); - *outbytes = 0; - *inbytesConsumed = 0; + if (outSamples) { + *outSamples = 0; + } + if (inbytesConsumed) { + *inbytesConsumed = 0; + } #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101) if (inbytes != 0) { int err = avcodec_send_packet(codecCtx_, &packet); @@ -344,17 +336,14 @@ bool FFmpegAudioDecoder::Decode(const uint8_t *inbuf, int inbytes, int *inbytesC // convert audio to AV_SAMPLE_FMT_S16 int swrRet = 0; if (outbuf != nullptr) { - swrRet = swr_convert(swrCtx_, &outbuf, frame_->nb_samples, (const u8 **)frame_->extended_data, frame_->nb_samples); + swrRet = swr_convert(swrCtx_, (uint8_t **)&outbuf, frame_->nb_samples, (const u8 **)frame_->extended_data, frame_->nb_samples); } if (swrRet < 0) { ERROR_LOG(ME, "swr_convert: Error while converting: %d", swrRet); return false; } - // output samples per frame, we should *2 since we have two channels - outSamples_ = swrRet * 2; - - // each sample occupies 2 bytes - *outbytes = outSamples_ * 2; + // output stereo samples per frame + *outSamples = swrRet; // Save outbuf into pcm audio, you can uncomment this line to save and check the decoded audio into pcm file. // SaveAudio("dump.pcm", outbuf, *outbytes); @@ -439,7 +428,9 @@ u32 AuCtx::AuDecode(u32 pcmAddr) { nextSync = (int)FindNextMp3Sync(); } int inbytesConsumed = 0; - decoder->Decode(&sourcebuff[nextSync], (int)sourcebuff.size() - nextSync, &inbytesConsumed, 2, outbuf, &outpcmbufsize); + int outSamples = 0; + decoder->Decode(&sourcebuff[nextSync], (int)sourcebuff.size() - nextSync, &inbytesConsumed, 2, (int16_t *)outbuf, &outSamples); + outpcmbufsize = outSamples * 2 * sizeof(int16_t); if (outpcmbufsize == 0) { // Nothing was output, hopefully we're at the end of the stream. @@ -447,7 +438,7 @@ u32 AuCtx::AuDecode(u32 pcmAddr) { sourcebuff.clear(); } else { // Update our total decoded samples, but don't count stereo. - SumDecodedSamples += decoder->GetOutSamples() / 2; + SumDecodedSamples += outSamples; // get consumed source length int srcPos = inbytesConsumed + nextSync; // remove the consumed source diff --git a/Core/HW/SimpleAudioDec.h b/Core/HW/SimpleAudioDec.h index ddf3d9c589..34bf3b9342 100644 --- a/Core/HW/SimpleAudioDec.h +++ b/Core/HW/SimpleAudioDec.h @@ -37,14 +37,11 @@ public: virtual PSPAudioType GetAudioType() const = 0; // inbytesConsumed can include skipping metadata. - virtual bool Decode(const uint8_t *inbuf, int inbytes, int *inbytesConsumed, int outputChannels, uint8_t *outbuf, int *outbytes) = 0; + // outSamples is in stereo samples. So you have to multiply by 4 for 16-bit stereo audio to get bytes. + virtual bool Decode(const uint8_t *inbuf, int inbytes, int *inbytesConsumed, int outputChannels, int16_t *outbuf, int *outSamples) = 0; virtual bool IsOK() const = 0; - // These two are only ever called after Decode, so can initialize on first. - virtual int GetOutSamples() const = 0; - virtual void SetChannels(int channels) = 0; - virtual void FlushBuffers() {} // Just metadata. diff --git a/UI/BackgroundAudio.cpp b/UI/BackgroundAudio.cpp index 2f6c7ea3f7..100c79d66d 100644 --- a/UI/BackgroundAudio.cpp +++ b/UI/BackgroundAudio.cpp @@ -217,11 +217,12 @@ public: return false; while (bgQueue.size() < (size_t)(len * 2)) { - int outBytes = 0; + int outSamples = 0; int inbytesConsumed = 0; - decoder_->Decode(wave_.raw_data + raw_offset_, wave_.raw_bytes_per_frame, &inbytesConsumed, 2, (uint8_t *)buffer_, &outBytes); - if (!outBytes) + bool result = decoder_->Decode(wave_.raw_data + raw_offset_, wave_.raw_bytes_per_frame, &inbytesConsumed, 2, (int16_t *)buffer_, &outSamples); + if (!result || !outSamples) return false; + int outBytes = outSamples * 2 * sizeof(int16_t); if (wave_.raw_offset_loop_end != 0 && raw_offset_ == wave_.raw_offset_loop_end) { // Only take the remaining bytes, but convert to stereo s16. From dbd774040e9b7e4a560d98c364f39867bc5d9516 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Tue, 16 Apr 2024 20:33:06 +0200 Subject: [PATCH 157/719] Add option to mirror the camera image horizontally. Only for Windows right now - since the PSP expects the image as a JPEG and the various backends deliver it as such, we have to add platform-specific code to mirror the image pre-compression. --- Core/Config.cpp | 1 + Core/Config.h | 1 + UI/GameSettingsScreen.cpp | 3 +++ Windows/CaptureDevice.cpp | 24 ++++++++++++++++++++++-- 4 files changed, 27 insertions(+), 2 deletions(-) diff --git a/Core/Config.cpp b/Core/Config.cpp index 2175c1a55d..5e7f497168 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -603,6 +603,7 @@ static const ConfigSetting graphicsSettings[] = { ConfigSetting("D3D11Device", &g_Config.sD3D11Device, "", CfgFlag::DEFAULT), #endif ConfigSetting("CameraDevice", &g_Config.sCameraDevice, "", CfgFlag::DEFAULT), + ConfigSetting("CameraMirrorHorizontal", &g_Config.bCameraMirrorHorizontal, false, CfgFlag::DEFAULT), ConfigSetting("AndroidFramerateMode", &g_Config.iDisplayFramerateMode, 1, CfgFlag::DEFAULT), ConfigSetting("VendorBugChecksEnabled", &g_Config.bVendorBugChecksEnabled, true, CfgFlag::DONT_SAVE), ConfigSetting("UseGeometryShader", &g_Config.bUseGeometryShader, false, CfgFlag::PER_GAME), diff --git a/Core/Config.h b/Core/Config.h index f504a39a43..7d48414be7 100644 --- a/Core/Config.h +++ b/Core/Config.h @@ -158,6 +158,7 @@ public: std::string sD3D11Device; // Windows only std::string sCameraDevice; std::string sMicDevice; + bool bCameraMirrorHorizontal; int iDisplayFramerateMode; // enum DisplayFramerateMode. Android-only. bool bSoftwareRendering; diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp index 3ffdd66445..a854b14298 100644 --- a/UI/GameSettingsScreen.cpp +++ b/UI/GameSettingsScreen.cpp @@ -587,6 +587,9 @@ void GameSettingsScreen::CreateGraphicsSettings(UI::ViewGroup *graphicsSettings) graphicsSettings->Add(new ItemHeader(gr->T("Camera"))); PopupMultiChoiceDynamic *cameraChoice = graphicsSettings->Add(new PopupMultiChoiceDynamic(&g_Config.sCameraDevice, gr->T("Camera Device"), cameraList, I18NCat::NONE, screenManager())); cameraChoice->OnChoice.Handle(this, &GameSettingsScreen::OnCameraDeviceChange); +#if PPSSPP_PLATFORM(WINDOWS) && !PPSSPP_PLATFORM(UWP) + graphicsSettings->Add(new CheckBox(&g_Config.bCameraMirrorHorizontal, gr->T("Mirror camera image"))); +#endif } graphicsSettings->Add(new ItemHeader(gr->T("Hack Settings", "Hack Settings (these WILL cause glitches)"))); diff --git a/Windows/CaptureDevice.cpp b/Windows/CaptureDevice.cpp index 3e36c7eb7f..924e147cbe 100644 --- a/Windows/CaptureDevice.cpp +++ b/Windows/CaptureDevice.cpp @@ -16,6 +16,7 @@ // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. #include + #include "Common/Thread/ThreadUtil.h" #include "CaptureDevice.h" #include "BufferLock.h" @@ -180,8 +181,8 @@ HRESULT ReaderCallback::OnReadSample( else srcPadding = device->deviceParam.default_stride - lStride; - if (SUCCEEDED(hr)) { #ifdef USE_FFMPEG + if (SUCCEEDED(hr)) { // Convert image to RGB24 if (lStride > 0) { imgConvert( @@ -199,6 +200,25 @@ HRESULT ReaderCallback::OnReadSample( av_free(invertedSrcImg); } + // Mirror the image in-place if needed. + if (g_Config.bCameraMirrorHorizontal) { + for (int y = 0; y < dstH; y++) { + uint8_t *line = device->imageRGB + y * device->imgRGBLineSizes[0]; + for (int x = 0; x < dstW / 2; x++) { + const uint8_t r = line[x * 3]; + const uint8_t g = line[x * 3 + 1]; + const uint8_t b = line[x * 3 + 1]; + const int invX = (dstW - 1 - x); + line[x * 3 + 0] = line[invX * 3 + 0]; + line[x * 3 + 1] = line[invX * 3 + 1]; + line[x * 3 + 2] = line[invX * 3 + 2]; + line[invX * 3 + 0] = r; + line[invX * 3 + 1] = g; + line[invX * 3 + 2] = b; + } + } + } + // Compress image to jpeg from RGB24. jpge::compress_image_to_jpeg_file_in_memory( device->imageJpeg, imgJpegSize, @@ -206,8 +226,8 @@ HRESULT ReaderCallback::OnReadSample( dstH, 3, device->imageRGB); -#endif } +#endif Camera::pushCameraImage(imgJpegSize, device->imageJpeg); } // Request the next frame. From 188d19afb0e2e4f0e2ca614dc6f45561deb3b307 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Tue, 16 Apr 2024 20:38:29 +0200 Subject: [PATCH 158/719] Add translation string, update langtool deps --- Tools/langtool/Cargo.lock | 51 ++++++++++++++++++++---------------- assets/lang/ar_AE.ini | 1 + assets/lang/az_AZ.ini | 1 + assets/lang/bg_BG.ini | 1 + assets/lang/ca_ES.ini | 1 + assets/lang/cz_CZ.ini | 1 + assets/lang/da_DK.ini | 1 + assets/lang/de_DE.ini | 1 + assets/lang/dr_ID.ini | 1 + assets/lang/en_US.ini | 1 + assets/lang/es_ES.ini | 1 + assets/lang/es_LA.ini | 1 + assets/lang/fa_IR.ini | 1 + assets/lang/fi_FI.ini | 1 + assets/lang/fr_FR.ini | 1 + assets/lang/gl_ES.ini | 1 + assets/lang/gr_EL.ini | 1 + assets/lang/he_IL.ini | 1 + assets/lang/he_IL_invert.ini | 1 + assets/lang/hr_HR.ini | 1 + assets/lang/hu_HU.ini | 1 + assets/lang/id_ID.ini | 1 + assets/lang/it_IT.ini | 1 + assets/lang/ja_JP.ini | 1 + assets/lang/jv_ID.ini | 1 + assets/lang/ko_KR.ini | 1 + assets/lang/lo_LA.ini | 1 + assets/lang/lt-LT.ini | 1 + assets/lang/ms_MY.ini | 1 + assets/lang/nl_NL.ini | 1 + assets/lang/no_NO.ini | 1 + assets/lang/pl_PL.ini | 1 + assets/lang/pt_BR.ini | 1 + assets/lang/pt_PT.ini | 1 + assets/lang/ro_RO.ini | 1 + assets/lang/ru_RU.ini | 1 + assets/lang/sv_SE.ini | 1 + assets/lang/tg_PH.ini | 1 + assets/lang/th_TH.ini | 1 + assets/lang/tr_TR.ini | 1 + assets/lang/uk_UA.ini | 1 + assets/lang/vi_VN.ini | 1 + assets/lang/zh_CN.ini | 1 + assets/lang/zh_TW.ini | 1 + 44 files changed, 72 insertions(+), 22 deletions(-) diff --git a/Tools/langtool/Cargo.lock b/Tools/langtool/Cargo.lock index 625e0c8159..2a74eb06ff 100644 --- a/Tools/langtool/Cargo.lock +++ b/Tools/langtool/Cargo.lock @@ -111,18 +111,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.79" +version = "1.0.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" +checksum = "a56dea16b0a29e94408b9aa5e2940a4eedbd128a1ba20e8f7ae60fd3d465af0e" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -135,9 +135,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "syn" -version = "2.0.58" +version = "2.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" +checksum = "4a6531ffc7b071655e4ce2e04bd464c4830bb585a61cabb96cf808f05172615a" dependencies = [ "proc-macro2", "quote", @@ -167,13 +167,14 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", "windows_i686_gnu", + "windows_i686_gnullvm", "windows_i686_msvc", "windows_x86_64_gnu", "windows_x86_64_gnullvm", @@ -182,42 +183,48 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" diff --git a/assets/lang/ar_AE.ini b/assets/lang/ar_AE.ini index 43198b43fb..4181c7a8a3 100644 --- a/assets/lang/ar_AE.ini +++ b/assets/lang/ar_AE.ini @@ -640,6 +640,7 @@ LowCurves Tip = ‎فقط يستخدم من بعض الألعاب, يتحكم ب Lower resolution for effects (reduces artifacts) = Lower resolution for effects (reduces artifacts) Manual Scaling = ‎تكبير يدوي Medium = ‎متوسط +Mirror camera image = Mirror camera image Mode = ‎الوضع Must Restart = ‎يجب عليك إعادة تشغيل البرنامج لكي تُطبق التغييرات. Native device resolution = ‎حجم الجهاز الأساسي diff --git a/assets/lang/az_AZ.ini b/assets/lang/az_AZ.ini index cfee777310..a339158ad8 100644 --- a/assets/lang/az_AZ.ini +++ b/assets/lang/az_AZ.ini @@ -632,6 +632,7 @@ LowCurves Tip = Only used by some games, controls smoothness of curves Lower resolution for effects (reduces artifacts) = Lower resolution for effects (reduces artifacts) Manual Scaling = Manual scaling Medium = Medium +Mirror camera image = Mirror camera image Mode = Mode Must Restart = You must restart PPSSPP for this change to take effect. Native device resolution = Native device resolution diff --git a/assets/lang/bg_BG.ini b/assets/lang/bg_BG.ini index 93b30926db..c85c7fece0 100644 --- a/assets/lang/bg_BG.ini +++ b/assets/lang/bg_BG.ini @@ -632,6 +632,7 @@ LowCurves Tip = Only used by some games, controls smoothness of curves Lower resolution for effects (reduces artifacts) = Lower resolution for effects (reduces artifacts) Manual Scaling = Manual scaling Medium = Medium +Mirror camera image = Mirror camera image Mode = Режим Must Restart = You must restart PPSSPP for this change to take effect. Native device resolution = Native device resolution diff --git a/assets/lang/ca_ES.ini b/assets/lang/ca_ES.ini index 2e0d6c0e28..4bb9113503 100644 --- a/assets/lang/ca_ES.ini +++ b/assets/lang/ca_ES.ini @@ -632,6 +632,7 @@ LowCurves Tip = Augmenta/redueix significativament el renderitzat de corbes Béz Lower resolution for effects (reduces artifacts) = Efectes en baixa resolució\n(redueix errors gràfics per escalat) Manual Scaling = Escalat manual Medium = Intermèdia +Mirror camera image = Mirror camera image Mode = Mode Must Restart = Heu de reiniciar PPSSPP per aplicar aquest canvi. Native device resolution = Resolució nativa del dispositiu diff --git a/assets/lang/cz_CZ.ini b/assets/lang/cz_CZ.ini index 8af02aa03b..aefd5fe26a 100644 --- a/assets/lang/cz_CZ.ini +++ b/assets/lang/cz_CZ.ini @@ -632,6 +632,7 @@ LowCurves Tip = Only used by some games, controls smoothness of curves Lower resolution for effects (reduces artifacts) = Nižší rozlišení efektů (snižuje artefakty) Manual Scaling = Ruční zvětšení Medium = Střední +Mirror camera image = Mirror camera image Mode = Režim Must Restart = Aby došlo k použití těchto změn, je nutné PPSSPP restartovat. Native device resolution = Původní rozlišení zařízení diff --git a/assets/lang/da_DK.ini b/assets/lang/da_DK.ini index c00d010656..f6414e2912 100644 --- a/assets/lang/da_DK.ini +++ b/assets/lang/da_DK.ini @@ -632,6 +632,7 @@ LowCurves Tip = Bruges kun af nogle spil, kontrollerer glathed af kurver Lower resolution for effects (reduces artifacts) = Lavere opløsning for effekter (reducerer artefakter) Manual Scaling = Manuel scaling Medium = Medium +Mirror camera image = Mirror camera image Mode = Tilstand Must Restart = Du må genstarte PPSSPP for at aktivere denne ændring. Native device resolution = Standard enheds opløsning diff --git a/assets/lang/de_DE.ini b/assets/lang/de_DE.ini index b625782d6e..73e556d34e 100644 --- a/assets/lang/de_DE.ini +++ b/assets/lang/de_DE.ini @@ -632,6 +632,7 @@ LowCurves Tip = Diese Option regelt die Qualität von Bezierkurven und Splines Lower resolution for effects (reduces artifacts) = Niedrigere Auflösung für Effekte (reduziert Artifakte) Manual Scaling = Manuelle Skalierung Medium = Mittel +Mirror camera image = Mirror camera image Mode = Modus Must Restart = Sie müssen PPSSPP neustarten, damit die Änderungen wirksam werden. Native device resolution = Native Auflösung diff --git a/assets/lang/dr_ID.ini b/assets/lang/dr_ID.ini index ed86934e88..3105600b36 100644 --- a/assets/lang/dr_ID.ini +++ b/assets/lang/dr_ID.ini @@ -632,6 +632,7 @@ LowCurves Tip = Only used by some games, controls smoothness of curves Lower resolution for effects (reduces artifacts) = Lower resolution for effects (reduces artifacts) Manual Scaling = Manual scaling Medium = Medium +Mirror camera image = Mirror camera image Mode = Mode Must Restart = You must restart PPSSPP for this change to take effect. Native device resolution = Native device resolution diff --git a/assets/lang/en_US.ini b/assets/lang/en_US.ini index 565b5c0417..e0ff636c0a 100644 --- a/assets/lang/en_US.ini +++ b/assets/lang/en_US.ini @@ -656,6 +656,7 @@ LowCurves Tip = Only used by some games, controls smoothness of curves Lower resolution for effects (reduces artifacts) = Lower resolution for effects (reduces artifacts) Manual Scaling = Manual scaling Medium = Medium +Mirror camera image = Mirror camera image Mode = Mode Must Restart = You must restart PPSSPP for this change to take effect. Native device resolution = Native device resolution diff --git a/assets/lang/es_ES.ini b/assets/lang/es_ES.ini index d9f0934a7c..2a12dd7a91 100644 --- a/assets/lang/es_ES.ini +++ b/assets/lang/es_ES.ini @@ -632,6 +632,7 @@ LowCurves Tip = Aumenta/reduce significativamente el renderizado de curvas Bézi Lower resolution for effects (reduces artifacts) = Efectos en baja resolución\n(reduce errores gráficos por escalado) Manual Scaling = Escalado manual Medium = Intermedia +Mirror camera image = Mirror camera image Mode = Modo Must Restart = Debes reiniciar PPSSPP para aplicar este cambio. Native device resolution = Resolución nativa del dispositivo diff --git a/assets/lang/es_LA.ini b/assets/lang/es_LA.ini index dfe50e86fa..91197c382f 100644 --- a/assets/lang/es_LA.ini +++ b/assets/lang/es_LA.ini @@ -632,6 +632,7 @@ LowCurves Tip = Controla la calidad de las curvas renderizadas, pero solo se uti Lower resolution for effects (reduces artifacts) = Efectos en baja resolución\n(reduce errores gráficos por escalado) Manual Scaling = Escalado manual Medium = Media +Mirror camera image = Mirror camera image Mode = Modo Must Restart = Debes reiniciar PPSSPP para aplicar este cambio. Native device resolution = Resolución nativa del dispositivo diff --git a/assets/lang/fa_IR.ini b/assets/lang/fa_IR.ini index ee75c28a55..ad3f991441 100644 --- a/assets/lang/fa_IR.ini +++ b/assets/lang/fa_IR.ini @@ -632,6 +632,7 @@ LowCurves Tip = ‎فقط در تعدادی بازی استفاده میشود، Lower resolution for effects (reduces artifacts) = ‎کاهش رزولوشن افکت ها (کاهش باگ گرافیکی) Manual Scaling = ‎تغییر سایز دستی Medium = ‎متوسط +Mirror camera image = Mirror camera image Mode = ‎حالت Must Restart = ‎برای اعمال این تنظیم باید برنامه را ریستارت کنید Native device resolution = ‎رزولوشن دستگاه diff --git a/assets/lang/fi_FI.ini b/assets/lang/fi_FI.ini index 3759ddcde5..73f45b4077 100644 --- a/assets/lang/fi_FI.ini +++ b/assets/lang/fi_FI.ini @@ -632,6 +632,7 @@ LowCurves Tip = Käytetään vain joissakin peleissä, ohjaa käyrien sileyttä Lower resolution for effects (reduces artifacts) = Alempi resoluutio efekteille (vähentää häiriöitä) Manual Scaling = Manuaalinen skaalaus Medium = Keskitaso +Mirror camera image = Mirror camera image Mode = Mode Must Restart = Sinun täytyy käynnistää PPSSPP uudelleen, jotta tämä muutos astuisi voimaan. Native device resolution = Laiteen alkuperäinen resoluutio diff --git a/assets/lang/fr_FR.ini b/assets/lang/fr_FR.ini index dbbbb5bd64..3f34a7483a 100644 --- a/assets/lang/fr_FR.ini +++ b/assets/lang/fr_FR.ini @@ -632,6 +632,7 @@ LowCurves Tip = Seulement utilisé par certains jeux, contrôle le lissage des c Lower resolution for effects (reduces artifacts) = Réduire définition des effets (réduit artéfacts) Manual Scaling = Mise à l'échelle man. Medium = Moyenne +Mirror camera image = Mirror camera image Mode = Mode Must Restart = Vous devez redémarrer PPSSPP pour que cette modification prenne effet. Native device resolution = Définition native de l'appareil diff --git a/assets/lang/gl_ES.ini b/assets/lang/gl_ES.ini index cda54884ed..c2655fdd95 100644 --- a/assets/lang/gl_ES.ini +++ b/assets/lang/gl_ES.ini @@ -632,6 +632,7 @@ LowCurves Tip = Only used by some games, controls smoothness of curves Lower resolution for effects (reduces artifacts) = Lower resolution for effects (reduces artifacts) Manual Scaling = Manual scaling Medium = Media +Mirror camera image = Mirror camera image Mode = Modo Must Restart = Debes reiniciar PPSSPP para aplicar este cambio. Native device resolution = Resolución nativa do dispositivo diff --git a/assets/lang/gr_EL.ini b/assets/lang/gr_EL.ini index 234ac4e3f7..7c077aa9c2 100644 --- a/assets/lang/gr_EL.ini +++ b/assets/lang/gr_EL.ini @@ -632,6 +632,7 @@ LowCurves Tip = Αυτή η επιλογή θα βελτιώσει/μειώσε Lower resolution for effects (reduces artifacts) = Χαμηλότερη ανάλυση για εφέ (λιγότερα προβλήματα) Manual Scaling = Χειροκίνητη Κλιμάκωση Medium = Μέτρια +Mirror camera image = Mirror camera image Mode = Τρόπος Must Restart = Πρέπει να επανεκκινήσετε το PPSSPP για να εφαρμοστούν οι αλλαγές. Native device resolution = Χρήση ανάλυσης συσκευής diff --git a/assets/lang/he_IL.ini b/assets/lang/he_IL.ini index 5cee4ed585..db0dd96e92 100644 --- a/assets/lang/he_IL.ini +++ b/assets/lang/he_IL.ini @@ -632,6 +632,7 @@ LowCurves Tip = Only used by some games, controls smoothness of curves Lower resolution for effects (reduces artifacts) = Lower resolution for effects (reduces artifacts) Manual Scaling = Manual scaling Medium = Medium +Mirror camera image = Mirror camera image Mode = מצב Must Restart = You must restart PPSSPP for this change to take effect. Native device resolution = Native device resolution diff --git a/assets/lang/he_IL_invert.ini b/assets/lang/he_IL_invert.ini index 9e8cf3b107..456986aecb 100644 --- a/assets/lang/he_IL_invert.ini +++ b/assets/lang/he_IL_invert.ini @@ -632,6 +632,7 @@ LowCurves Tip = Only used by some games, controls smoothness of curves Lower resolution for effects (reduces artifacts) = Lower resolution for effects (reduces artifacts) Manual Scaling = Manual scaling Medium = Medium +Mirror camera image = Mirror camera image Mode = בצמ Must Restart = You must restart PPSSPP for this change to take effect. Native device resolution = Native device resolution diff --git a/assets/lang/hr_HR.ini b/assets/lang/hr_HR.ini index a28740b519..71029f043a 100644 --- a/assets/lang/hr_HR.ini +++ b/assets/lang/hr_HR.ini @@ -632,6 +632,7 @@ LowCurves Tip = Jedino korišteno od strane nekoliko igara, kontrolira uglađeno Lower resolution for effects (reduces artifacts) = Snizi rezoluciju za efekte (smanjuje artefakte) Manual Scaling = Ručno mjerenje Medium = Srednje +Mirror camera image = Mirror camera image Mode = Način Must Restart = Morate ponovno pokrenuti PPSSPP da bi se efekat primjenio. Native device resolution = Urođena rezolucija uređaja diff --git a/assets/lang/hu_HU.ini b/assets/lang/hu_HU.ini index acf1031d05..1bcdcae7e0 100644 --- a/assets/lang/hu_HU.ini +++ b/assets/lang/hu_HU.ini @@ -632,6 +632,7 @@ LowCurves Tip = Csak néhány játék használja, a görbék simaságát szabál Lower resolution for effects (reduces artifacts) = Effektek alacsonyabb felbontásssal (gyengíti a látványt) Manual Scaling = Kézi skálázás Medium = Közepes +Mirror camera image = Mirror camera image Mode = Renderelési üzemmód Must Restart = A beállítások érvénybeléptetéséhez újra kell indítani a PPSSPP-t. Native device resolution = Natív készülék felbontás diff --git a/assets/lang/id_ID.ini b/assets/lang/id_ID.ini index 5de6d0b572..c9d195e86b 100644 --- a/assets/lang/id_ID.ini +++ b/assets/lang/id_ID.ini @@ -632,6 +632,7 @@ LowCurves Tip = Hanya digunakan oleh beberapa permainan, mengontrol kualitas kur Lower resolution for effects (reduces artifacts) = Resolusi efek lebih rendah (mengurangi artefak) Manual Scaling = Penskala manual Medium = Menengah +Mirror camera image = Mirror camera image Mode = Mode Must Restart = Anda harus memulai ulang PPSSPP agar perubahan ini berfungsi. Native device resolution = Resolusi asli diff --git a/assets/lang/it_IT.ini b/assets/lang/it_IT.ini index e9cf2ae131..8373dc768b 100644 --- a/assets/lang/it_IT.ini +++ b/assets/lang/it_IT.ini @@ -633,6 +633,7 @@ LowCurves Tip = Usato solo in alcuni giochi, controlla la fluidità delle curve Lower resolution for effects (reduces artifacts) = Bassa risoluzione degli effetti (riduce gli artefatti) Manual Scaling = Scaling manuale Medium = Media +Mirror camera image = Mirror camera image Mode = Modalità Must Restart = Sarà necessario riavviare PPSSPP per attivare le modifiche. Native device resolution = Risoluzione nativa della periferica diff --git a/assets/lang/ja_JP.ini b/assets/lang/ja_JP.ini index 6f57e4c544..baf633bf35 100644 --- a/assets/lang/ja_JP.ini +++ b/assets/lang/ja_JP.ini @@ -632,6 +632,7 @@ LowCurves Tip = いくつかのゲームでのみ用いられ、曲線の滑ら Lower resolution for effects (reduces artifacts) = エフェクトを低解像度にする (生成物を減らす) Manual Scaling = 手動で拡大 Medium = 中 +Mirror camera image = Mirror camera image Mode = モード Must Restart = この変更を適用するにはPPSSPPを再起動してください Native device resolution = 機器のネイティブ解像度 diff --git a/assets/lang/jv_ID.ini b/assets/lang/jv_ID.ini index ceb39f555a..6600ef66e0 100644 --- a/assets/lang/jv_ID.ini +++ b/assets/lang/jv_ID.ini @@ -632,6 +632,7 @@ LowCurves Tip = Only used by some games, controls smoothness of curves Lower resolution for effects (reduces artifacts) = Resolusi ngisor kanggo efek (nyuda artefak) Manual Scaling = Manual njongko Medium = Sedang +Mirror camera image = Mirror camera image Mode = Mode Must Restart = Wiwiti maneh PPSSPP kanggo aplikasi setelan. Native device resolution = Resolusi piranti asal diff --git a/assets/lang/ko_KR.ini b/assets/lang/ko_KR.ini index b551b7bf7a..1514f77021 100644 --- a/assets/lang/ko_KR.ini +++ b/assets/lang/ko_KR.ini @@ -632,6 +632,7 @@ LowCurves Tip = 일부 게임에서만 사용되며 곡선의 부드러움을 Lower resolution for effects (reduces artifacts) = 효과에 대한 낮은 해상도 (인공물 감소) Manual Scaling = 수동 스케일링 Medium = 중간 +Mirror camera image = Mirror camera image Mode = 모드 Must Restart = 이 변경 사항을 적용하려면 PPSSPP를 다시 시작해야 합니다. Native device resolution = 기본 장치 해상도 diff --git a/assets/lang/lo_LA.ini b/assets/lang/lo_LA.ini index 0a15e33b58..7320277871 100644 --- a/assets/lang/lo_LA.ini +++ b/assets/lang/lo_LA.ini @@ -632,6 +632,7 @@ LowCurves Tip = ໃຊ້ສະເພາະບາງເກມ, ເພື່ອ Lower resolution for effects (reduces artifacts) = ຫຼຸດຄວາມລະອຽດຂອງເອັບເຟກໃຫ້ຕ່ຳລົງ (ແກ້ພາບແຈ້ງ) Manual Scaling = ກຳນົດຂະໜາດເອງ Medium = ປານກາງ +Mirror camera image = Mirror camera image Mode = ໂໝດ Must Restart = ເຈົ້າຄວນເລີ່ມ PPSSPP ໃໝ່ເພື່ອເຫັນຜົນການປ່ຽນແປງ. Native device resolution = ຄ່າຄວາມລະອຽດດັ້ງເດີມຂອງອຸປະກອນ diff --git a/assets/lang/lt-LT.ini b/assets/lang/lt-LT.ini index 987929d8c8..58b2bc0553 100644 --- a/assets/lang/lt-LT.ini +++ b/assets/lang/lt-LT.ini @@ -632,6 +632,7 @@ LowCurves Tip = Only used by some games, controls smoothness of curves Lower resolution for effects (reduces artifacts) = Lower resolution for effects (reduces artifacts) Manual Scaling = Manual scaling Medium = Vidutinė +Mirror camera image = Mirror camera image Mode = Režimas Must Restart = Jūs turite perkrauti "PPSSPP" programą, kad pakeisti parametrai turėtų efektą Native device resolution = Įrenginio rezoliucija diff --git a/assets/lang/ms_MY.ini b/assets/lang/ms_MY.ini index 75ad6addc7..3f3b02890a 100644 --- a/assets/lang/ms_MY.ini +++ b/assets/lang/ms_MY.ini @@ -632,6 +632,7 @@ LowCurves Tip = Only used by some games, controls smoothness of curves Lower resolution for effects (reduces artifacts) = Lower resolution for effects (reduces artifacts) Manual Scaling = Manual scaling Medium = Medium +Mirror camera image = Mirror camera image Mode = Mod Must Restart = You must restart PPSSPP for this change to take effect. Native device resolution = Native device resolution diff --git a/assets/lang/nl_NL.ini b/assets/lang/nl_NL.ini index 3d48fbb108..93e01078dc 100644 --- a/assets/lang/nl_NL.ini +++ b/assets/lang/nl_NL.ini @@ -632,6 +632,7 @@ LowCurves Tip = Alleen gebruikt in sommige games, bestuurt de afronding van curv Lower resolution for effects (reduces artifacts) = Effectresolutie verlagen (minder objecten) Manual Scaling = Handmatig schalen Medium = Normaal +Mirror camera image = Mirror camera image Mode = Modus Must Restart = U moet PPSSPP herstarten om de wijzigingen door te voeren. Native device resolution = Apparaatresolutie diff --git a/assets/lang/no_NO.ini b/assets/lang/no_NO.ini index c72d093168..97684a50e3 100644 --- a/assets/lang/no_NO.ini +++ b/assets/lang/no_NO.ini @@ -632,6 +632,7 @@ LowCurves Tip = Only used by some games, controls smoothness of curves Lower resolution for effects (reduces artifacts) = Lower resolution for effects (reduces artifacts) Manual Scaling = Manual scaling Medium = Medium +Mirror camera image = Mirror camera image Mode = Mode Must Restart = You must restart PPSSPP for this change to take effect. Native device resolution = Native device resolution diff --git a/assets/lang/pl_PL.ini b/assets/lang/pl_PL.ini index 3c9322c11c..20f6e1c3eb 100644 --- a/assets/lang/pl_PL.ini +++ b/assets/lang/pl_PL.ini @@ -637,6 +637,7 @@ LowCurves Tip = Używane tylko przez niektóre gry, kontroluje gładkość krzyw Lower resolution for effects (reduces artifacts) = Zmniejszenie rozdzielczość efektów (mniej błędów) Manual Scaling = Ręczne skalowanie Medium = Średnie +Mirror camera image = Mirror camera image Mode = Tryb Must Restart = Musisz zrestartować PPSSPP, aby zastosować zmiany. Native device resolution = Natywna rozdzielczość urządzenia diff --git a/assets/lang/pt_BR.ini b/assets/lang/pt_BR.ini index 3ea764f06e..ec21e45617 100644 --- a/assets/lang/pt_BR.ini +++ b/assets/lang/pt_BR.ini @@ -657,6 +657,7 @@ LowCurves Tip = Usado só por alguns jogos, controla a suavidade das curvas Lower resolution for effects (reduces artifacts) = Resolução menor dos efeitos (reduz artefatos) Manual Scaling = Dimensionamento manual Medium = Média +Mirror camera image = Mirror camera image Mode = Modo Must Restart = Você deve reiniciar o PPSSPP pra esta mudança ter efeito. Native device resolution = Resolução nativa do dispositivo diff --git a/assets/lang/pt_PT.ini b/assets/lang/pt_PT.ini index da95144cc3..aa90a3fbd4 100644 --- a/assets/lang/pt_PT.ini +++ b/assets/lang/pt_PT.ini @@ -656,6 +656,7 @@ LowCurves Tip = Usado só em alguns jogos, controla a suavidade das curvas Lower resolution for effects (reduces artifacts) = Menor Resolução dos efeitos (reduz artefatos) Manual Scaling = Dimensionamento manual Medium = Média +Mirror camera image = Mirror camera image Mode = Modo Must Restart = Deverás reiniciar o PPSSPP para esta mudança ter efeito. Native device resolution = Resolução Nativa do Dispositivo diff --git a/assets/lang/ro_RO.ini b/assets/lang/ro_RO.ini index 35c1fb84b2..e749467e13 100644 --- a/assets/lang/ro_RO.ini +++ b/assets/lang/ro_RO.ini @@ -633,6 +633,7 @@ LowCurves Tip = Only used by some games, controls smoothness of curves Lower resolution for effects (reduces artifacts) = Rezoluții mai mici pt. efecte (reduce artefacte) Manual Scaling = Manual scaling Medium = Mediu +Mirror camera image = Mirror camera image Mode = Mod Must Restart = Trebuie să resartezi PPSSPP pt. ca această schimbare să aibă efect. Native device resolution = Rezoluție nativă dispozitiv diff --git a/assets/lang/ru_RU.ini b/assets/lang/ru_RU.ini index 9089dc35c3..c380708029 100644 --- a/assets/lang/ru_RU.ini +++ b/assets/lang/ru_RU.ini @@ -632,6 +632,7 @@ LowCurves Tip = Используется в некоторых играх, вл Lower resolution for effects (reduces artifacts) = Эффекты низкого качества (меньше артефактов) Manual Scaling = Свой масштаб Medium = Среднее +Mirror camera image = Mirror camera image Mode = Режим Must Restart = Вы должны перезапустить PPSSPP, чтобы изменения вступили в силу. Native device resolution = Разрешение устройства diff --git a/assets/lang/sv_SE.ini b/assets/lang/sv_SE.ini index 1a0452fb28..b57243973a 100644 --- a/assets/lang/sv_SE.ini +++ b/assets/lang/sv_SE.ini @@ -633,6 +633,7 @@ LowCurves Tip = Only used by some games, controls smoothness of curves Lower resolution for effects (reduces artifacts) = Lägre upplösning för effekter (bättre kvalitet) Manual Scaling = Manuell skalning Medium = Medium +Mirror camera image = Mirror camera image Mode = Mode Must Restart = Starta om PPSSPP för att ändringen ska få effekt. Native device resolution = Native device resolution diff --git a/assets/lang/tg_PH.ini b/assets/lang/tg_PH.ini index c1cf8b3b5e..58fa81001f 100644 --- a/assets/lang/tg_PH.ini +++ b/assets/lang/tg_PH.ini @@ -633,6 +633,7 @@ LowCurves Tip = Only used by some games, controls smoothness of curves Lower resolution for effects (reduces artifacts) = Lower resolution for effects (reduces artifacts) Manual Scaling = Manual scaling Medium = Medium +Mirror camera image = Mirror camera image Mode = Mode Must Restart = Kailangan i-restart ang PPSSPP upang maging epiktibo ito Native device resolution = Native device resolution diff --git a/assets/lang/th_TH.ini b/assets/lang/th_TH.ini index e79e29af88..7a7637dda2 100644 --- a/assets/lang/th_TH.ini +++ b/assets/lang/th_TH.ini @@ -638,6 +638,7 @@ LowCurves Tip = ใช้แค่ในบางเกม ช่วยปรั Lower resolution for effects (reduces artifacts) = ลดความละเอียดของเอฟเฟ็คต์ให้ต่ำลง (ลดขอบภาพสว่าง) Manual Scaling = กำหนดขนาดเอง Medium = ปานกลาง +Mirror camera image = Mirror camera image Mode = โหมด Must Restart = คุณควรรีสตาร์ท PPSSPP อีกครั้งนึง เพื่อให้เกิดผลลัพธ์ที่เปลี่ยนแปลง Native device resolution = ค่าความละเอียดดั้งเดิมของอุปกรณ์ diff --git a/assets/lang/tr_TR.ini b/assets/lang/tr_TR.ini index db0b9c702e..6e0333ce92 100644 --- a/assets/lang/tr_TR.ini +++ b/assets/lang/tr_TR.ini @@ -634,6 +634,7 @@ LowCurves Tip = Sadece bazı oyunlar tarafından kullanılır, eğrilerin pürü Lower resolution for effects (reduces artifacts) = Efektler için daha az çözünürlük (sorunları azaltır) Manual Scaling = El ile ölçekleme Medium = Orta +Mirror camera image = Mirror camera image Mode = Mod Must Restart = Bu değişikliğin uygulanması için PPSSPP'yi yeniden başlatmalısın. Native device resolution = Yerel aygıt çözünürlüğü diff --git a/assets/lang/uk_UA.ini b/assets/lang/uk_UA.ini index 8ce36fd239..3db6e8b99a 100644 --- a/assets/lang/uk_UA.ini +++ b/assets/lang/uk_UA.ini @@ -632,6 +632,7 @@ LowCurves Tip = Використовується лише в деяких ігр Lower resolution for effects (reduces artifacts) = Ефекти низької якості (зменшує артефакти) Manual Scaling = Свій масштаб Medium = Середня +Mirror camera image = Mirror camera image Mode = Режим Must Restart = Ви повинні перезавантажити PPSSPP, щоб зміни вступили в силу. Native device resolution = Роздільна здатність пристрою diff --git a/assets/lang/vi_VN.ini b/assets/lang/vi_VN.ini index 7594588525..ba1e750fd9 100644 --- a/assets/lang/vi_VN.ini +++ b/assets/lang/vi_VN.ini @@ -632,6 +632,7 @@ LowCurves Tip = Chỉ được sử dụng bởi một số trò chơi, kiểm s Lower resolution for effects (reduces artifacts) = Độ phân giải thấp cho các hiệu ứng (làm giảm vật thể) Manual Scaling = Nhân rộng thủ công Medium = Trung bình +Mirror camera image = Mirror camera image Mode = Chế độ Must Restart = Bạn cần khởi động lại PPSSPP để những thay đổi có hiệu lực. Native device resolution = Độ phân giải tự nhiên. diff --git a/assets/lang/zh_CN.ini b/assets/lang/zh_CN.ini index 1240ab05f9..086ae4119f 100644 --- a/assets/lang/zh_CN.ini +++ b/assets/lang/zh_CN.ini @@ -632,6 +632,7 @@ LowCurves Tip = 适用于极少部分游戏，控制曲线的细节质量 Lower resolution for effects (reduces artifacts) = 降低特效分辨率 (减少特效瑕疵) Manual Scaling = 手动缩放 Medium = 中质量 +Mirror camera image = Mirror camera image Mode = 渲染模式 Must Restart = 重启PPSSPP才能使这项设置生效。 Native device resolution = 屏幕原生分辨率 diff --git a/assets/lang/zh_TW.ini b/assets/lang/zh_TW.ini index c3e702bf05..c7514df27a 100644 --- a/assets/lang/zh_TW.ini +++ b/assets/lang/zh_TW.ini @@ -632,6 +632,7 @@ LowCurves Tip = 僅供少數遊戲使用，控制曲線平滑度 Lower resolution for effects (reduces artifacts) = 降低效果解析度 (降低失真) Manual Scaling = 手動縮放 Medium = 中 +Mirror camera image = Mirror camera image Mode = 模式 Must Restart = 您必須重新啟動 PPSSPP 以使這項變更生效 Native device resolution = 原生裝置解析度 From 178147b20abb89ca8b20cb0dbe4cd1e211e6a4af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Tue, 16 Apr 2024 19:54:48 +0200 Subject: [PATCH 159/719] Make asserts work better in headless when running tests on Windows --- Common/Log.cpp | 18 ++++++++++++++---- Common/Log.h | 1 + headless/Headless.cpp | 1 + 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/Common/Log.cpp b/Common/Log.cpp index 988e51f439..31c614a9aa 100644 --- a/Common/Log.cpp +++ b/Common/Log.cpp @@ -37,9 +37,10 @@ static bool hitAnyAsserts = false; -std::mutex g_extraAssertInfoMutex; -std::string g_extraAssertInfo = "menu"; -double g_assertInfoTime = 0.0; +static std::mutex g_extraAssertInfoMutex; +static std::string g_extraAssertInfo = "menu"; +static double g_assertInfoTime = 0.0; +static bool g_exitOnAssert; void SetExtraAssertInfo(const char *info) { std::lock_guard guard(g_extraAssertInfoMutex); @@ -47,6 +48,10 @@ void SetExtraAssertInfo(const char *info) { g_assertInfoTime = time_now_d(); } +void SetCleanExitOnAssert() { + g_exitOnAssert = true; +} + bool HandleAssert(const char *function, const char *file, int line, const char *expression, const char* format, ...) { // Read message and write it to the log char text[LOG_BUF_SIZE]; @@ -78,8 +83,13 @@ bool HandleAssert(const char *function, const char *file, int line, const char * std::wstring wtext = ConvertUTF8ToWString(formatted) + L"\n\nTry to continue?"; std::wstring wcaption = ConvertUTF8ToWString(std::string(caption) + " " + GetCurrentThreadName()); OutputDebugString(wtext.c_str()); + printf("%s\n", formatted); if (IDYES != MessageBox(0, wtext.c_str(), wcaption.c_str(), msgBoxStyle)) { - return false; + if (g_exitOnAssert) { + // Hard exit. + ExitProcess(1); + return false; + } } else { return true; } diff --git a/Common/Log.h b/Common/Log.h index 91b834b7fa..eaa20ac7c0 100644 --- a/Common/Log.h +++ b/Common/Log.h @@ -121,6 +121,7 @@ __attribute__((format(printf, 5, 6))) bool HitAnyAsserts(); void ResetHitAnyAsserts(); void SetExtraAssertInfo(const char *info); +void SetCleanExitOnAssert(); #if defined(__ANDROID__) // Tricky macro to get the basename, that also works if *built* on Win32. diff --git a/headless/Headless.cpp b/headless/Headless.cpp index a396c591a0..6ce62ffa81 100644 --- a/headless/Headless.cpp +++ b/headless/Headless.cpp @@ -319,6 +319,7 @@ int main(int argc, const char* argv[]) { PROFILE_INIT(); #if PPSSPP_PLATFORM(WINDOWS) + SetCleanExitOnAssert(); timeBeginPeriod(1); #else // Ignore sigpipe. From f05f9a6de33fd11ee20cf6e96a43b080dcef5a66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Tue, 16 Apr 2024 15:13:08 +0200 Subject: [PATCH 160/719] Code cleanup and comments --- Core/HLE/AtracCtx.cpp | 88 +++++++++++++++++++++++------------------- Core/HLE/AtracCtx.h | 66 ++++++++++++++++++++++--------- Core/HLE/AtracCtx2.cpp | 43 +++++++++++++++++---- Core/HLE/AtracCtx2.h | 1 - Core/HLE/sceAtrac.cpp | 6 +-- 5 files changed, 133 insertions(+), 71 deletions(-) diff --git a/Core/HLE/AtracCtx.cpp b/Core/HLE/AtracCtx.cpp index d8a2725e1a..a6e84bf580 100644 --- a/Core/HLE/AtracCtx.cpp +++ b/Core/HLE/AtracCtx.cpp @@ -64,9 +64,9 @@ void Atrac::DoState(PointerWrap &p) { Do(p, track_.endSample); Do(p, track_.firstSampleOffset); if (s >= 3) { - Do(p, track_.dataOff); + Do(p, track_.dataByteOffset); } else { - track_.dataOff = track_.firstSampleOffset; + track_.dataByteOffset = track_.firstSampleOffset; } u32 hasDataBuf = dataBuf_ != nullptr; @@ -127,10 +127,10 @@ void Atrac::DoState(PointerWrap &p) { Do(p, bufferValidBytes_); Do(p, bufferHeaderSize_); } else { - bufferHeaderSize_ = track_.dataOff; - bufferValidBytes_ = std::min(first_.size - track_.dataOff, StreamBufferEnd() - track_.dataOff); + bufferHeaderSize_ = track_.dataByteOffset; + bufferValidBytes_ = std::min(first_.size - track_.dataByteOffset, StreamBufferEnd() - track_.dataByteOffset); if ((bufferState_ & ATRAC_STATUS_STREAMED_MASK) == ATRAC_STATUS_STREAMED_MASK) { - bufferPos_ = track_.dataOff; + bufferPos_ = track_.dataByteOffset; } } @@ -211,18 +211,18 @@ void Atrac::WriteContextToPSPMem() { // TODO: Should we just keep this in PSP ram then, or something? context->info.state = bufferState_; if (track_.firstSampleOffset != 0) { - context->info.samplesPerChan = track_.firstSampleOffset + FirstOffsetExtra(); + context->info.samplesPerChan = track_.FirstSampleOffsetFull(); } else { context->info.samplesPerChan = (track_.codecType == PSP_MODE_AT_3_PLUS ? ATRAC3PLUS_MAX_SAMPLES : ATRAC3_MAX_SAMPLES); } context->info.sampleSize = track_.bytesPerFrame; context->info.numChan = track_.channels; - context->info.dataOff = track_.dataOff; - context->info.endSample = track_.endSample + track_.firstSampleOffset + FirstOffsetExtra(); + context->info.dataOff = track_.dataByteOffset; + context->info.endSample = track_.endSample + track_.FirstSampleOffsetFull(); context->info.dataEnd = track_.fileSize; context->info.curOff = first_.fileoffset; context->info.decodePos = track_.DecodePosBySample(currentSample_); - context->info.streamDataByte = first_.size - track_.dataOff; + context->info.streamDataByte = first_.size - track_.dataByteOffset; u8 *buf = (u8 *)context; *(u32_le *)(buf + 0xfc) = atracID_; @@ -230,6 +230,13 @@ void Atrac::WriteContextToPSPMem() { NotifyMemInfo(MemBlockFlags::WRITE, context_.ptr, sizeof(SceAtracContext), "AtracContext"); } +void Track::DebugLog() { + DEBUG_LOG(ME, "ATRAC analyzed: %s channels: %d filesize: %d bitrate: %d kbps jointStereo: %d", + codecType == PSP_MODE_AT_3 ? "AT3" : "AT3Plus", channels, fileSize, bitrate / 1024, jointStereo); + DEBUG_LOG(ME, "dataoff: %d firstSampleOffset: %d endSample: %d", dataByteOffset, firstSampleOffset, endSample); + DEBUG_LOG(ME, "loopStartSample: %d loopEndSample: %d", loopStartSample, loopEndSample); +} + int Atrac::Analyze(u32 addr, u32 size) { track_ = {}; first_ = {}; @@ -255,6 +262,7 @@ int Atrac::Analyze(u32 addr, u32 size) { int retval = AnalyzeAtracTrack(addr, size, &track_); first_._filesize_dontuse = track_.fileSize; + track_.DebugLog(); return retval; } @@ -397,7 +405,7 @@ int AnalyzeAtracTrack(u32 addr, u32 size, Track *track) { case DATA_CHUNK_MAGIC: { bfoundData = true; - track->dataOff = offset; + track->dataByteOffset = offset; dataChunkSize = chunkSize; if (track->fileSize < offset + chunkSize) { WARN_LOG_REPORT(ME, "Atrac data chunk extends beyond riff chunk"); @@ -419,8 +427,8 @@ int AnalyzeAtracTrack(u32 addr, u32 size, Track *track) { // set the loopStartSample_ and loopEndSample_ by loopinfo_ if (track->loopinfo.size() > 0) { - track->loopStartSample = track->loopinfo[0].startSample + ::FirstOffsetExtra(track->codecType) + sampleOffsetAdjust; - track->loopEndSample = track->loopinfo[0].endSample + ::FirstOffsetExtra(track->codecType) + sampleOffsetAdjust; + track->loopStartSample = track->loopinfo[0].startSample + track->FirstOffsetExtra() + sampleOffsetAdjust; + track->loopEndSample = track->loopinfo[0].endSample + track->FirstOffsetExtra() + sampleOffsetAdjust; } else { track->loopStartSample = -1; track->loopEndSample = -1; @@ -429,11 +437,11 @@ int AnalyzeAtracTrack(u32 addr, u32 size, Track *track) { // if there is no correct endsample, try to guess it if (track->endSample <= 0 && track->bytesPerFrame != 0) { track->endSample = (dataChunkSize / track->bytesPerFrame) * track->SamplesPerFrame(); - track->endSample -= track->firstSampleOffset + ::FirstOffsetExtra(track->codecType); + track->endSample -= track->FirstSampleOffsetFull(); } track->endSample -= 1; - if (track->loopEndSample != -1 && track->loopEndSample > track->endSample + track->firstSampleOffset + (int)::FirstOffsetExtra(track->codecType)) { + if (track->loopEndSample != -1 && track->loopEndSample > track->endSample + track->FirstSampleOffsetFull()) { return hleReportError(ME, ATRAC_ERROR_BAD_CODEC_PARAMS, "loop after end of data"); } @@ -501,10 +509,10 @@ int AnalyzeAA3Track(u32 addr, u32 size, u32 fileSize, Track *track) { return hleReportError(ME, ATRAC_ERROR_AA3_INVALID_DATA, "invalid codec type %d", buffer[32]); } - track->dataOff = 10 + tagSize + 96; + track->dataByteOffset = 10 + tagSize + 96; track->firstSampleOffset = 0; if (track->endSample < 0 && track->bytesPerFrame != 0) { - track->endSample = ((track->fileSize - track->dataOff) / track->bytesPerFrame) * track->SamplesPerFrame(); + track->endSample = ((track->fileSize - track->dataByteOffset) / track->bytesPerFrame) * track->SamplesPerFrame(); } track->endSample -= 1; return 0; @@ -541,7 +549,7 @@ void Atrac::CalculateStreamInfo(u32 *outReadOffset) { first_.offset = 0; first_.writableBytes = 0; } else { - readOffset = track_.FileOffsetBySample(track_.loopStartSample - FirstOffsetExtra() - track_.firstSampleOffset - track_.SamplesPerFrame() * 2); + readOffset = track_.FileOffsetBySample(track_.loopStartSample - track_.FirstSampleOffsetFull() - track_.SamplesPerFrame() * 2); } } @@ -609,7 +617,7 @@ void Atrac::GetResetBufferInfo(AtracResetBufferInfo *bufferInfo, int sample) { // Update the writable bytes. When streaming, this is just the number of bytes until the end. const u32 bufSizeAligned = (bufferMaxSize_ / track_.bytesPerFrame) * track_.bytesPerFrame; - const int needsMoreFrames = FirstOffsetExtra(); + const int needsMoreFrames = track_.FirstOffsetExtra(); // ? bufferInfo->first.writePosPtr = first_.addr; bufferInfo->first.writableBytes = std::min(track_.fileSize - sampleFileOffset, bufSizeAligned); @@ -619,7 +627,7 @@ void Atrac::GetResetBufferInfo(AtracResetBufferInfo *bufferInfo, int sample) { } else { bufferInfo->first.minWriteBytes = track_.bytesPerFrame * 2; } - if ((u32)sample < (u32)track_.firstSampleOffset && sampleFileOffset != track_.dataOff) { + if ((u32)sample < (u32)track_.firstSampleOffset && sampleFileOffset != track_.dataByteOffset) { sampleFileOffset -= track_.bytesPerFrame; } bufferInfo->first.filePos = sampleFileOffset; @@ -670,8 +678,8 @@ int Atrac::SetData(u32 buffer, u32 readSize, u32 bufferSize, int outputChannels, ignoreDataBuf_ = true; } if (bufferState_ == ATRAC_STATUS_STREAMED_WITHOUT_LOOP || bufferState_ == ATRAC_STATUS_STREAMED_LOOP_FROM_END || bufferState_ == ATRAC_STATUS_STREAMED_LOOP_WITH_TRAILER) { - bufferHeaderSize_ = track_.dataOff; - bufferPos_ = track_.dataOff + track_.bytesPerFrame; + bufferHeaderSize_ = track_.dataByteOffset; + bufferPos_ = track_.dataByteOffset + track_.bytesPerFrame; bufferValidBytes_ = first_.size - bufferPos_; } @@ -744,7 +752,7 @@ void Atrac::UpdateBufferState() { if (track_.loopEndSample <= 0) { // There's no looping, but we need to stream the data in our buffer. bufferState_ = ATRAC_STATUS_STREAMED_WITHOUT_LOOP; - } else if (track_.loopEndSample == track_.endSample + track_.firstSampleOffset + (int)FirstOffsetExtra()) { + } else if (track_.loopEndSample == track_.endSample + track_.FirstSampleOffsetFull()) { bufferState_ = ATRAC_STATUS_STREAMED_LOOP_FROM_END; } else { bufferState_ = ATRAC_STATUS_STREAMED_LOOP_WITH_TRAILER; @@ -779,15 +787,15 @@ int Atrac::AddStreamData(u32 bytesToAdd) { if (PSP_CoreParameter().compat.flags().AtracLoopHack && bufferState_ == ATRAC_STATUS_STREAMED_LOOP_FROM_END && RemainingFrames() > 2) { loopNum_++; - SeekToSample(track_.loopStartSample - FirstOffsetExtra() - track_.firstSampleOffset); + SeekToSample(track_.loopStartSample - track_.FirstSampleOffsetFull()); } return 0; } u32 Atrac::AddStreamDataSas(u32 bufPtr, u32 bytesToAdd) { - int addbytes = std::min(bytesToAdd, track_.fileSize - first_.fileoffset - FirstOffsetExtra()); - Memory::Memcpy(dataBuf_ + first_.fileoffset + FirstOffsetExtra(), bufPtr, addbytes, "AtracAddStreamData"); + int addbytes = std::min(bytesToAdd, track_.fileSize - first_.fileoffset - track_.FirstOffsetExtra()); + Memory::Memcpy(dataBuf_ + first_.fileoffset + track_.FirstOffsetExtra(), bufPtr, addbytes, "AtracAddStreamData"); first_.size += bytesToAdd; if (first_.size >= track_.fileSize) { first_.size = track_.fileSize; @@ -802,7 +810,7 @@ u32 Atrac::AddStreamDataSas(u32 bufPtr, u32 bytesToAdd) { u32 Atrac::GetNextSamples() { // It seems like the PSP aligns the sample position to 0x800...? - u32 skipSamples = track_.firstSampleOffset + FirstOffsetExtra(); + u32 skipSamples = track_.FirstSampleOffsetFull(); u32 firstSamples = (track_.SamplesPerFrame() - skipSamples) % track_.SamplesPerFrame(); u32 numSamples = track_.endSample + 1 - currentSample_; if (currentSample_ == 0 && firstSamples != 0) { @@ -830,7 +838,7 @@ void Atrac::ForceSeekToSample(int sample) { void Atrac::SeekToSample(int sample) { // It seems like the PSP aligns the sample position to 0x800...? - const u32 offsetSamples = track_.firstSampleOffset + FirstOffsetExtra(); + const u32 offsetSamples = track_.FirstSampleOffsetFull(); const u32 unalignedSamples = (offsetSamples + sample) % track_.SamplesPerFrame(); int seekFrame = sample + offsetSamples - unalignedSamples; @@ -840,12 +848,12 @@ void Atrac::SeekToSample(int sample) { int adjust = 0; if (sample == 0) { - int offsetSamples = track_.firstSampleOffset + FirstOffsetExtra(); + int offsetSamples = track_.FirstSampleOffsetFull(); adjust = -(int)(offsetSamples % track_.SamplesPerFrame()); } const u32 off = track_.FileOffsetBySample(sample + adjust); const u32 backfill = track_.bytesPerFrame * 2; - const u32 start = off - track_.dataOff < backfill ? track_.dataOff : off - backfill; + const u32 start = off - track_.dataByteOffset < backfill ? track_.dataByteOffset : off - backfill; for (u32 pos = start; pos < off; pos += track_.bytesPerFrame) { decoder_->Decode(BufferStart() + pos, track_.bytesPerFrame, nullptr, 2, nullptr, nullptr); @@ -861,12 +869,12 @@ int Atrac::RemainingFrames() const { return PSP_ATRAC_ALLDATA_IS_ON_MEMORY; } - u32 currentFileOffset = track_.FileOffsetBySample(currentSample_ - track_.SamplesPerFrame() + FirstOffsetExtra()); + u32 currentFileOffset = track_.FileOffsetBySample(currentSample_ - track_.SamplesPerFrame() + track_.FirstOffsetExtra()); if (first_.fileoffset >= track_.fileSize) { if (bufferState_ == ATRAC_STATUS_STREAMED_WITHOUT_LOOP) { return PSP_ATRAC_NONLOOP_STREAM_DATA_IS_ON_MEMORY; } - int loopEndAdjusted = track_.loopEndSample - FirstOffsetExtra() - track_.firstSampleOffset; + int loopEndAdjusted = track_.loopEndSample - track_.FirstOffsetExtra() - track_.firstSampleOffset; if (bufferState_ == ATRAC_STATUS_STREAMED_LOOP_WITH_TRAILER && currentSample_ > loopEndAdjusted) { // No longer looping in this case, outside the loop. return PSP_ATRAC_NONLOOP_STREAM_DATA_IS_ON_MEMORY; @@ -926,7 +934,7 @@ u32 Atrac::DecodeData(u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u32 *finish, i u32 numSamples = 0; // It seems like the PSP aligns the sample position to 0x800...? - int offsetSamples = track_.firstSampleOffset + FirstOffsetExtra(); + int offsetSamples = track_.FirstSampleOffsetFull(); int skipSamples = 0; u32 maxSamples = track_.endSample + 1 - currentSample_; u32 unalignedSamples = (offsetSamples + currentSample_) % track_.SamplesPerFrame(); @@ -1001,20 +1009,20 @@ u32 Atrac::DecodeData(u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u32 *finish, i int finishFlag = 0; // TODO: Verify. bool hitEnd = currentSample_ >= track_.endSample || (numSamples == 0 && first_.size >= track_.fileSize); - int loopEndAdjusted = track_.loopEndSample - FirstOffsetExtra() - track_.firstSampleOffset; + int loopEndAdjusted = track_.loopEndSample - track_.FirstSampleOffsetFull(); if ((hitEnd || currentSample_ > loopEndAdjusted) && loopNum != 0) { - SeekToSample(track_.loopStartSample - FirstOffsetExtra() - track_.firstSampleOffset); + SeekToSample(track_.loopStartSample - track_.FirstSampleOffsetFull()); if (bufferState_ != ATRAC_STATUS_FOR_SCESAS) { if (loopNum_ > 0) loopNum_--; } if ((bufferState_ & ATRAC_STATUS_STREAMED_MASK) == ATRAC_STATUS_STREAMED_MASK) { // Whatever bytes we have left were added from the loop. - u32 loopOffset = track_.FileOffsetBySample(track_.loopStartSample - FirstOffsetExtra() - track_.firstSampleOffset - track_.SamplesPerFrame() * 2); + u32 loopOffset = track_.FileOffsetBySample(track_.loopStartSample - track_.FirstSampleOffsetFull() - track_.SamplesPerFrame() * 2); // TODO: Hmm, need to manage the buffer better. But don't move fileoffset if we already have valid data. if (loopOffset > first_.fileoffset || loopOffset + bufferValidBytes_ < first_.fileoffset) { // Skip the initial frame at the start. - first_.fileoffset = track_.FileOffsetBySample(track_.loopStartSample - FirstOffsetExtra() - track_.firstSampleOffset - track_.SamplesPerFrame() * 2); + first_.fileoffset = track_.FileOffsetBySample(track_.loopStartSample - track_.FirstSampleOffsetFull() - track_.SamplesPerFrame() * 2); } } } else if (hitEnd) { @@ -1032,15 +1040,15 @@ u32 Atrac::DecodeData(u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u32 *finish, i return 0; } -void Atrac::SetLoopNum(int loopNum) { +void AtracBase::SetLoopNum(int loopNum) { // Spammed in MHU loopNum_ = loopNum; if (loopNum != 0 && track_.loopinfo.size() == 0) { // Just loop the whole audio // This is a rare modification of track_ after the fact. // Maybe we can get away with setting these by default. - track_.loopStartSample = track_.firstSampleOffset + FirstOffsetExtra(); - track_.loopEndSample = track_.endSample + track_.firstSampleOffset + FirstOffsetExtra(); + track_.loopStartSample = track_.FirstSampleOffsetFull(); + track_.loopEndSample = track_.endSample + track_.FirstSampleOffsetFull(); } WriteContextToPSPMem(); } @@ -1123,7 +1131,7 @@ void Atrac::InitLowLevel(u32 paramsAddr, bool jointStereo) { track_.jointStereo = false; } - track_.dataOff = 0; + track_.dataByteOffset = 0; first_.size = 0; track_.fileSize = track_.bytesPerFrame; // not really meaningful bufferState_ = ATRAC_STATUS_LOW_LEVEL; diff --git a/Core/HLE/AtracCtx.h b/Core/HLE/AtracCtx.h index fdaa82b5ec..a0cda78203 100644 --- a/Core/HLE/AtracCtx.h +++ b/Core/HLE/AtracCtx.h @@ -105,24 +105,42 @@ struct AtracLoopInfo { class AudioDecoder; -inline u32 FirstOffsetExtra(int codecType) { - return codecType == PSP_MODE_AT_3_PLUS ? 368 : 69; -} - struct Track { - u32 fileSize; // This both does and doesn't belong in Track - it's fixed for an Atrac instance. Oh well. - u32 codecType; - u16 bytesPerFrame; - int firstSampleOffset; - int endSample; - // Offset of the first sample in the input buffer - int dataOff = 0; + u32 codecType = 0; + + // Size of the full track being streamed or played. Can be a lot larger than the in-memory buffer in the streaming modes. + u32 fileSize = 0; + + // Not really used for much except queries, this keeps track of the bitrate of the track. u32 bitrate = 64; + + // Signifies whether to use a more efficient coding mode with less stereo separation. For our purposes, just metadata. int jointStereo = 0; + + // Number of audio channels in the track. u16 channels = 0; + // The size of an encoded frame in bytes. + u16 bytesPerFrame = 0; + + // Byte offset of the first encoded frame in the input buffer. Note: Some samples may be skipped according to firstSampleOffset. + int dataByteOffset = 0; + + // How many samples to skip from the beginning of a track when decoding. + // Actually, the real number is this added to FirstOffsetExtra(codecType). You can call + // FirstSampleOffset2() to get that. + // Some use of these offsets around the code seem to be inconsistent, sometimes the extra is included, + // sometimes not. + int firstSampleOffset = 0; + + // Last sample number. Though, we made it so in Analyze, it's exclusive in the file. + // Does not take firstSampleOffset into account. + int endSample = 0; + + // Loop configuration. The PSP only supports one loop but we store them all. std::vector loopinfo; + // The actual used loop offsets. These appear to be raw offsets, not taking FirstSampleOffset2() into account. int loopStartSample = -1; int loopEndSample = -1; @@ -131,7 +149,16 @@ struct Track { return bytesPerFrame; } - // Output frame size + inline int FirstOffsetExtra() const { + return codecType == PSP_MODE_AT_3_PLUS ? 368 : 69; + } + + // Includes the extra offset. See firstSampleOffset comment above. + int FirstSampleOffsetFull() const { + return FirstOffsetExtra() + firstSampleOffset; + } + + // Output frame size, different between the two supported codecs. u32 SamplesPerFrame() const { return codecType == PSP_MODE_AT_3_PLUS ? ATRAC3PLUS_MAX_SAMPLES : ATRAC3_MAX_SAMPLES; } @@ -144,14 +171,17 @@ struct Track { bitrate = (bitrate + 511) >> 10; } + // This appears to be buggy, should probably include FirstOffsetExtra? + // Actually the units don't even make sense here. u32 DecodePosBySample(int sample) const { return (u32)(firstSampleOffset + sample / (int)SamplesPerFrame() * bytesPerFrame); } + // This appears to be buggy, should probably include FirstOffsetExtra? u32 FileOffsetBySample(int sample) const { int offsetSample = sample + firstSampleOffset; int frameOffset = offsetSample / (int)SamplesPerFrame(); - return (u32)(dataOff + bytesPerFrame + frameOffset * bytesPerFrame); + return (u32)(dataByteOffset + bytesPerFrame + frameOffset * bytesPerFrame); } void AnalyzeReset() { @@ -162,6 +192,8 @@ struct Track { channels = 2; // TODO: Could probably reset more. } + + void DebugLog(); }; int AnalyzeAA3Track(u32 addr, u32 size, u32 filesize, Track *track); @@ -202,9 +234,6 @@ public: AudioDecoder *Decoder() const { return decoder_; } - u32 FirstOffsetExtra() const { - return ::FirstOffsetExtra(track_.codecType); - } void CreateDecoder(); @@ -221,7 +250,7 @@ public: virtual void GetStreamDataInfo(u32 *writePtr, u32 *writableBytes, u32 *readOffset) = 0; virtual int AddStreamData(u32 bytesToAdd) = 0; virtual u32 AddStreamDataSas(u32 bufPtr, u32 bytesToAdd) = 0; - virtual void SetLoopNum(int loopNum) = 0; + virtual void SetLoopNum(int loopNum); virtual u32 ResetPlayPosition(int sample, int bytesWrittenFirstBuf, int bytesWrittenSecondBuf) = 0; virtual void GetResetBufferInfo(AtracResetBufferInfo *bufferInfo, int sample) = 0; virtual int SetData(u32 buffer, u32 readSize, u32 bufferSize, int outputChannels, int successCode) = 0; @@ -274,7 +303,6 @@ public: void GetStreamDataInfo(u32 *writePtr, u32 *writableBytes, u32 *readOffset) override; int AddStreamData(u32 bytesToAdd) override; u32 AddStreamDataSas(u32 bufPtr, u32 bytesToAdd) override; - void SetLoopNum(int loopNum) override; u32 ResetPlayPosition(int sample, int bytesWrittenFirstBuf, int bytesWrittenSecondBuf) override; void GetResetBufferInfo(AtracResetBufferInfo *bufferInfo, int sample) override; int SetData(u32 buffer, u32 readSize, u32 bufferSize, int outputChannels, int successCode) override; @@ -302,7 +330,7 @@ private: void CalculateStreamInfo(u32 *readOffset); InputBuffer first_{}; - InputBuffer second_{}; + InputBuffer second_{}; // only addr, size, fileoffset are used (incomplete) u8 *dataBuf_ = nullptr; // Indicates that the dataBuf_ array should not be used. diff --git a/Core/HLE/AtracCtx2.cpp b/Core/HLE/AtracCtx2.cpp index f0a6790eb3..7f99bef720 100644 --- a/Core/HLE/AtracCtx2.cpp +++ b/Core/HLE/AtracCtx2.cpp @@ -3,6 +3,37 @@ #include "Core/HLE/HLE.h" #include "Core/HLE/FunctionWrappers.h" #include "Core/HLE/AtracCtx2.h" +#include "Core/HW/Atrac3Standalone.h" + +// Convenient command line: +// Windows\x64\debug\PPSSPPHeadless.exe --root pspautotests/tests/../ --compare --timeout=5 --new-atrac --graphics=software pspautotests/tests/audio/atrac/decode.prx + +// See the big comment in sceAtrac.cpp for an overview of the different modes of operation. +// +// Test cases +// +// Halfway buffer +// +// * None found yet +// +// All-data-loaded +// +// * MotoGP (menu music with specified loop). Simple repeated calls to sceAtracDecodeData +// * Archer MacLean's Mercury (in-game, not menu) +// * Crisis Core +// +// Streaming +// +// - Good ones (early) +// * Everybody's Golf 2 (0x2000 buffer size, loop from end) +// * Burnout Legends (no loop, 0x1800 buffer size) +// * Suicide Barbie +// - Others +// * Bleach +// * God of War: Chains of Olympus +// * Ape Academy 2 (bufsize 8192) +// * Half Minute Hero (bufsize 65536) +// * Flatout (tricky! needs investigation) void Atrac2::DoState(PointerWrap &p) { _assert_msg_(false, "Savestates not yet support with new Atrac implementation.\n\nTurn it off in Developer settings.\n\n"); @@ -28,14 +59,14 @@ void Atrac2::WriteContextToPSPMem() { // TODO: Should we just keep this in PSP ram then, or something? context->info.state = bufferState_; if (track_.firstSampleOffset != 0) { - context->info.samplesPerChan = track_.firstSampleOffset + FirstOffsetExtra(); + context->info.samplesPerChan = track_.FirstSampleOffsetFull(); } else { context->info.samplesPerChan = (track_.codecType == PSP_MODE_AT_3_PLUS ? ATRAC3PLUS_MAX_SAMPLES : ATRAC3_MAX_SAMPLES); } context->info.sampleSize = track_.bytesPerFrame; context->info.numChan = track_.channels; - context->info.dataOff = track_.dataOff; - context->info.endSample = track_.endSample + track_.firstSampleOffset + FirstOffsetExtra(); + context->info.dataOff = track_.dataByteOffset; + context->info.endSample = track_.endSample + track_.FirstSampleOffsetFull(); context->info.dataEnd = track_.fileSize; context->info.curOff = 0; // first_.fileoffset; context->info.decodePos = track_.DecodePosBySample(currentSample_); @@ -83,10 +114,6 @@ u32 Atrac2::AddStreamDataSas(u32 bufPtr, u32 bytesToAdd) { return 0; } -void Atrac2::SetLoopNum(int loopNum) { - -} - u32 Atrac2::ResetPlayPosition(int sample, int bytesWrittenFirstBuf, int bytesWrittenSecondBuf) { return 0; } @@ -137,7 +164,7 @@ void Atrac2::InitLowLevel(u32 paramsAddr, bool jointStereo) { track_.bitrate = ((track_.bitrate >> 11) + 8) & 0xFFFFFFF0; track_.jointStereo = false; } - track_.dataOff = 0; + track_.dataByteOffset = 0; bufferState_ = ATRAC_STATUS_LOW_LEVEL; currentSample_ = 0; CreateDecoder(); diff --git a/Core/HLE/AtracCtx2.h b/Core/HLE/AtracCtx2.h index df6734d285..3c8f1fab7f 100644 --- a/Core/HLE/AtracCtx2.h +++ b/Core/HLE/AtracCtx2.h @@ -20,7 +20,6 @@ public: void GetStreamDataInfo(u32 *writePtr, u32 *writableBytes, u32 *readOffset) override; int AddStreamData(u32 bytesToAdd) override; u32 AddStreamDataSas(u32 bufPtr, u32 bytesToAdd) override; - void SetLoopNum(int loopNum) override; u32 ResetPlayPosition(int sample, int bytesWrittenFirstBuf, int bytesWrittenSecondBuf) override; void GetResetBufferInfo(AtracResetBufferInfo *bufferInfo, int sample) override; int SetData(u32 buffer, u32 readSize, u32 bufferSize, int outputChannels, int successCode) override; diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp index 15513b031d..c57c826d2e 100644 --- a/Core/HLE/sceAtrac.cpp +++ b/Core/HLE/sceAtrac.cpp @@ -405,7 +405,7 @@ static u32 sceAtracGetNextDecodePosition(int atracID, u32 outposAddr) { if (Memory::IsValidAddress(outposAddr)) { if (atrac->CurrentSample() >= atrac->GetTrack().endSample) { Memory::WriteUnchecked_U32(0, outposAddr); - return hleLogSuccessI(ME, ATRAC_ERROR_ALL_DATA_DECODED, "all data decoded"); + return hleLogSuccessI(ME, ATRAC_ERROR_ALL_DATA_DECODED, "all data decoded - beyond endSample"); } else { Memory::WriteUnchecked_U32(atrac->CurrentSample(), outposAddr); return hleLogSuccessI(ME, 0); @@ -488,10 +488,10 @@ static u32 sceAtracGetSoundSample(int atracID, u32 outEndSampleAddr, u32 outLoop *outEndSample = atrac->GetTrack().endSample; auto outLoopStart = PSPPointer::Create(outLoopStartSampleAddr); if (outLoopStart.IsValid()) - *outLoopStart = atrac->GetTrack().loopStartSample == -1 ? -1 : atrac->GetTrack().loopStartSample - atrac->GetTrack().firstSampleOffset - atrac->FirstOffsetExtra(); + *outLoopStart = atrac->GetTrack().loopStartSample == -1 ? -1 : atrac->GetTrack().loopStartSample - atrac->GetTrack().FirstSampleOffsetFull(); auto outLoopEnd = PSPPointer::Create(outLoopEndSampleAddr); if (outLoopEnd.IsValid()) - *outLoopEnd = atrac->GetTrack().loopEndSample == -1 ? -1 : atrac->GetTrack().loopEndSample - atrac->GetTrack().firstSampleOffset - atrac->FirstOffsetExtra(); + *outLoopEnd = atrac->GetTrack().loopEndSample == -1 ? -1 : atrac->GetTrack().loopEndSample - atrac->GetTrack().FirstSampleOffsetFull(); if (!outEndSample.IsValid() || !outLoopStart.IsValid() || !outLoopEnd.IsValid()) { return hleReportError(ME, 0, "invalid address"); From 5b625bfd3e8c38bbc67e7861cb8280d67476a670 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Tue, 16 Apr 2024 14:53:43 +0200 Subject: [PATCH 161/719] Share GetSecondBufferInfo between implementations --- Core/HLE/AtracCtx.cpp | 4 +++- Core/HLE/AtracCtx.h | 4 ++-- Core/HLE/AtracCtx2.cpp | 6 ------ Core/HLE/AtracCtx2.h | 4 ++-- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/Core/HLE/AtracCtx.cpp b/Core/HLE/AtracCtx.cpp index a6e84bf580..592d6b64e4 100644 --- a/Core/HLE/AtracCtx.cpp +++ b/Core/HLE/AtracCtx.cpp @@ -717,7 +717,7 @@ u32 Atrac::SetSecondBuffer(u32 secondBuffer, u32 secondBufferSize) { return hleLogSuccessI(ME, 0); } -int Atrac::GetSecondBufferInfo(u32 *fileOffset, u32 *desiredSize) { +int AtracBase::GetSecondBufferInfo(u32 *fileOffset, u32 *desiredSize) { if (BufferState() != ATRAC_STATUS_STREAMED_LOOP_WITH_TRAILER) { // Writes zeroes in this error case. *fileOffset = 0; @@ -947,6 +947,8 @@ u32 Atrac::DecodeData(u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u32 *finish, i if (skipSamples != 0 && bufferHeaderSize_ == 0) { // Skip the initial frame used to load state for the looped frame. // TODO: We will want to actually read this in. + // TODO again: This seems to happen on the first frame of playback regardless of loops. + // Can't be good. ConsumeFrame(); } diff --git a/Core/HLE/AtracCtx.h b/Core/HLE/AtracCtx.h index a0cda78203..0f5245c259 100644 --- a/Core/HLE/AtracCtx.h +++ b/Core/HLE/AtracCtx.h @@ -254,8 +254,9 @@ public: virtual u32 ResetPlayPosition(int sample, int bytesWrittenFirstBuf, int bytesWrittenSecondBuf) = 0; virtual void GetResetBufferInfo(AtracResetBufferInfo *bufferInfo, int sample) = 0; virtual int SetData(u32 buffer, u32 readSize, u32 bufferSize, int outputChannels, int successCode) = 0; + + virtual int GetSecondBufferInfo(u32 *fileOffset, u32 *desiredSize); virtual u32 SetSecondBuffer(u32 secondBuffer, u32 secondBufferSize) = 0; - virtual int GetSecondBufferInfo(u32 *fileOffset, u32 *desiredSize) = 0; virtual u32 DecodeData(u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u32 *finish, int *remains) = 0; virtual u32 GetNextSamples() = 0; virtual void InitLowLevel(u32 paramsAddr, bool jointStereo) = 0; @@ -307,7 +308,6 @@ public: void GetResetBufferInfo(AtracResetBufferInfo *bufferInfo, int sample) override; int SetData(u32 buffer, u32 readSize, u32 bufferSize, int outputChannels, int successCode) override; u32 SetSecondBuffer(u32 secondBuffer, u32 secondBufferSize) override; - int GetSecondBufferInfo(u32 *fileOffset, u32 *desiredSize) override; u32 DecodeData(u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u32 *finish, int *remains) override; u32 GetNextSamples() override; void InitLowLevel(u32 paramsAddr, bool jointStereo) override; diff --git a/Core/HLE/AtracCtx2.cpp b/Core/HLE/AtracCtx2.cpp index 7f99bef720..b30f3444f3 100644 --- a/Core/HLE/AtracCtx2.cpp +++ b/Core/HLE/AtracCtx2.cpp @@ -135,12 +135,6 @@ u32 Atrac2::SetSecondBuffer(u32 secondBuffer, u32 secondBufferSize) { return 0; } -int Atrac2::GetSecondBufferInfo(u32 *fileOffset, u32 *desiredSize) { - *fileOffset = 0; - *desiredSize = 0; - return hleLogSuccessInfoI(ME, ATRAC_ERROR_SECOND_BUFFER_NOT_NEEDED, "not needed"); -} - u32 Atrac2::DecodeData(u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u32 *finish, int *remains) { return 0; diff --git a/Core/HLE/AtracCtx2.h b/Core/HLE/AtracCtx2.h index 3c8f1fab7f..aeebec399f 100644 --- a/Core/HLE/AtracCtx2.h +++ b/Core/HLE/AtracCtx2.h @@ -15,7 +15,6 @@ public: int CurrentSample() const override { return currentSample_; } int RemainingFrames() const override; - u32 SecondBufferSize() const override; void GetStreamDataInfo(u32 *writePtr, u32 *writableBytes, u32 *readOffset) override; int AddStreamData(u32 bytesToAdd) override; @@ -24,7 +23,8 @@ public: void GetResetBufferInfo(AtracResetBufferInfo *bufferInfo, int sample) override; int SetData(u32 buffer, u32 readSize, u32 bufferSize, int outputChannels, int successCode) override; u32 SetSecondBuffer(u32 secondBuffer, u32 secondBufferSize) override; - int GetSecondBufferInfo(u32 *fileOffset, u32 *desiredSize) override; + u32 SecondBufferSize() const override; + u32 DecodeData(u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u32 *finish, int *remains) override; u32 GetNextSamples() override; void InitLowLevel(u32 paramsAddr, bool jointStereo) override; From a74a0fdbde4e64dde33fdf95e9d8ef4a0314d7ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Tue, 16 Apr 2024 12:10:40 +0200 Subject: [PATCH 162/719] Add a way to test new atrac using headless. --- headless/Headless.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/headless/Headless.cpp b/headless/Headless.cpp index 6ce62ffa81..4d84a1f265 100644 --- a/headless/Headless.cpp +++ b/headless/Headless.cpp @@ -339,6 +339,7 @@ int main(int argc, const char* argv[]) GPUCore gpuCore = GPUCORE_SOFTWARE; CPUCore cpuCore = CPUCore::JIT; int debuggerPort = -1; + bool newAtrac = false; std::vector testFilenames; const char *mountIso = nullptr; @@ -375,6 +376,8 @@ int main(int argc, const char* argv[]) testOptions.bench = true; else if (!strcmp(argv[i], "-v") || !strcmp(argv[i], "--verbose")) testOptions.verbose = true; + else if (!strcmp(argv[i], "--new-atrac")) + newAtrac = true; else if (!strncmp(argv[i], "--graphics=", strlen("--graphics=")) && strlen(argv[i]) > strlen("--graphics=")) { const char *gpuName = argv[i] + strlen("--graphics="); @@ -498,6 +501,7 @@ int main(int argc, const char* argv[]) g_Config.iGlobalVolume = VOLUME_FULL; g_Config.iReverbVolume = VOLUME_FULL; g_Config.internalDataDirectory.clear(); + g_Config.bUseNewAtrac = newAtrac; Path exePath = File::GetExeDirectory(); g_Config.flash0Directory = exePath / "assets/flash0"; From e50ca3808a6fddf7ed5c753a1252aba49796be31 Mon Sep 17 00:00:00 2001 From: Eric Warmenhoven Date: Fri, 19 Apr 2024 09:29:35 -0400 Subject: [PATCH 163/719] iOS: Update VulkanLoader for MoltenVK 1.2.8-style framework finding --- Common/GPU/Vulkan/VulkanLoader.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Common/GPU/Vulkan/VulkanLoader.cpp b/Common/GPU/Vulkan/VulkanLoader.cpp index 34abe21723..c5b4ce6814 100644 --- a/Common/GPU/Vulkan/VulkanLoader.cpp +++ b/Common/GPU/Vulkan/VulkanLoader.cpp @@ -282,6 +282,7 @@ static const char * const device_name_blacklist[] = { static const char * const so_names[] = { #if PPSSPP_PLATFORM(IOS) "@executable_path/Frameworks/libMoltenVK.dylib", + "MoltenVK", #elif PPSSPP_PLATFORM(MAC) "@executable_path/../Frameworks/libMoltenVK.dylib", #else From 1cf7254cb0f2bf354e7172969aabc4655ed0d27c Mon Sep 17 00:00:00 2001 From: AdamN <7974720+anr2me@users.noreply.github.com> Date: Sat, 20 Apr 2024 12:06:49 +0700 Subject: [PATCH 164/719] Update sceAudio.cpp --- Core/HLE/sceAudio.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/Core/HLE/sceAudio.cpp b/Core/HLE/sceAudio.cpp index beb06566dd..a2ea98a116 100644 --- a/Core/HLE/sceAudio.cpp +++ b/Core/HLE/sceAudio.cpp @@ -492,6 +492,16 @@ static int sceAudioInput(u32 maxSamples, u32 sampleRate, u32 bufAddr) { return __MicInput(maxSamples, sampleRate, bufAddr, AUDIOINPUT, false); } +static int sceAudioInputInit(s32 unknown1, s32 gain, s32 unknown2) { + ERROR_LOG(HLE, "UNIMPL sceAudioInputInit: unknown1: %d, gain: %d, unknown2: %d", unknown1, gain, unknown2); + return 0; +} + +static int sceAudioInputInitEx(u32 pspAudioInputParamsAddr) { + ERROR_LOG(HLE, "UNIMPL sceAudioInputInitEx: pspAudioInputParamsAddr: %08x", pspAudioInputParamsAddr); + return 0; +} + static int sceAudioGetInputLength() { int ret = Microphone::getReadMicDataLength() / 2; ERROR_LOG(HLE, "UNTEST sceAudioGetInputLength(ret: %d)", ret); @@ -559,8 +569,8 @@ const HLEFunction sceAudio[] = {0XB61595C0, nullptr, "sceAudioLoopbackTest", '?', "" }, // Microphone interface - {0X7DE61688, nullptr, "sceAudioInputInit", '?', "" }, - {0XE926D3FB, nullptr, "sceAudioInputInitEx", '?', "" }, + {0X7DE61688, &WrapI_III, "sceAudioInputInit", 'i', "iii" }, + {0XE926D3FB, &WrapI_U, "sceAudioInputInitEx", 'i', "x" }, {0X6D4BEC68, &WrapI_UUU, "sceAudioInput", 'i', "xxx" }, {0X086E5895, &WrapI_UUU, "sceAudioInputBlocking", 'i', "xxx" }, {0XA708C6A6, &WrapI_V, "sceAudioGetInputLength", 'i', "" }, From bbe2c341ed8efcd39ee128853b58b5de9e4ea996 Mon Sep 17 00:00:00 2001 From: AdamN <7974720+anr2me@users.noreply.github.com> Date: Sat, 20 Apr 2024 12:41:27 +0700 Subject: [PATCH 165/719] oops --- Core/HLE/sceAudio.cpp | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/Core/HLE/sceAudio.cpp b/Core/HLE/sceAudio.cpp index a2ea98a116..42504d4e28 100644 --- a/Core/HLE/sceAudio.cpp +++ b/Core/HLE/sceAudio.cpp @@ -492,13 +492,23 @@ static int sceAudioInput(u32 maxSamples, u32 sampleRate, u32 bufAddr) { return __MicInput(maxSamples, sampleRate, bufAddr, AUDIOINPUT, false); } -static int sceAudioInputInit(s32 unknown1, s32 gain, s32 unknown2) { +static int sceAudioInputInit(int unknown1, int gain, int unknown2) { ERROR_LOG(HLE, "UNIMPL sceAudioInputInit: unknown1: %d, gain: %d, unknown2: %d", unknown1, gain, unknown2); return 0; } -static int sceAudioInputInitEx(u32 pspAudioInputParamsAddr) { - ERROR_LOG(HLE, "UNIMPL sceAudioInputInitEx: pspAudioInputParamsAddr: %08x", pspAudioInputParamsAddr); +static int sceAudioInputInitEx(u32 paramAddr) { + ERROR_LOG(HLE, "UNIMPL sceAudioInputInitEx: paramAddr: %08x", paramAddr); + return 0; +} + +static int sceAudioPollInputEnd() { + ERROR_LOG(HLE, "UNIMPL sceAudioPollInputEnd"); + return 0; +} + +static int sceAudioWaitInputEnd() { + ERROR_LOG(HLE, "UNIMPL sceAudioWaitInputEnd"); return 0; } @@ -574,8 +584,8 @@ const HLEFunction sceAudio[] = {0X6D4BEC68, &WrapI_UUU, "sceAudioInput", 'i', "xxx" }, {0X086E5895, &WrapI_UUU, "sceAudioInputBlocking", 'i', "xxx" }, {0XA708C6A6, &WrapI_V, "sceAudioGetInputLength", 'i', "" }, - {0XA633048E, nullptr, "sceAudioPollInputEnd", '?', "" }, - {0X87B2E651, nullptr, "sceAudioWaitInputEnd", '?', "" }, + {0XA633048E, &WrapI_V, "sceAudioPollInputEnd", 'i', "" }, + {0X87B2E651, &WrapI_V, "sceAudioWaitInputEnd", 'i', "" }, {0X36FD8AA9, &WrapU_U, "sceAudioRoutingSetMode", 'x', "x" }, {0X39240E7D, &WrapU_V, "sceAudioRoutingGetMode", 'x', "" }, From 4677aec4d637459394ce357e3e4c430392a3a968 Mon Sep 17 00:00:00 2001 From: santiago046 <88282401+santiago046@users.noreply.github.com> Date: Fri, 26 Apr 2024 17:07:04 -0300 Subject: [PATCH 166/719] Refactor atlas/zimtool CMakeLists.txt --- ext/native/tools/CMakeLists.txt | 62 ++++++++++++++++----------------- 1 file changed, 30 insertions(+), 32 deletions(-) diff --git a/ext/native/tools/CMakeLists.txt b/ext/native/tools/CMakeLists.txt index 0547a25af7..53b82104b1 100644 --- a/ext/native/tools/CMakeLists.txt +++ b/ext/native/tools/CMakeLists.txt @@ -1,44 +1,42 @@ -cmake_minimum_required(VERSION 2.6) - +cmake_minimum_required(VERSION 3.8) project (Tools) -add_definitions(-O2) -add_definitions(-Wall) -add_definitions(-DSDL) -add_definitions(-Wno-multichar) -add_definitions(-fno-strict-aliasing) -#add_definitions(-fopenmp) +set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD_REQUIRED ON) +add_compile_definitions(SDL MAX_LOGLEVEL=-1) +add_compile_options(-O2 -Wall -Wno-multichar -fno-strict-aliasing) + +# Obsolete code? if(IOS) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libstdc++ -DMAX_LOGLEVEL=-1") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libstdc++") elseif(APPLE) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -mmacosx-version-min=10.7 -DMAX_LOGLEVEL=-1") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -mmacosx-version-min=10.7") endif() -if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.7.0) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -DMAX_LOGLEVEL=-1") -else() - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -DMAX_LOGLEVEL=-1") -endif() +# Find dependencies +find_package(Freetype REQUIRED) +find_package(ZLIB REQUIRED) +find_library(UTIL util REQUIRED) +find_library(ZSTD zstd REQUIRED) -# add_definitions(-fstrict-aliasing) - -include_directories(..) -include_directories(../..) -include_directories(../../..) - -link_directories(/opt/local/lib) - -# Horrible horrible hack -include_directories(/usr/include/freetype2) -include_directories(/usr/local/include/freetype2) -include_directories(/opt/local/include/freetype2) -include_directories(/opt/local/include) +include_directories(${FREETYPE_INCLUDE_DIRS} + ../ + ../../ + ../../../ +) add_subdirectory(../../libpng17 png17) -add_executable(build/atlastool atlastool.cpp ../../../Common/Data/Format/PNGLoad.cpp ../../../Common/Data/Encoding/Utf8.cpp ../../../Common/Data/Format/ZIMSave.cpp) -target_link_libraries(build/atlastool freetype util png17 z zstd) +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/build) -add_executable(build/zimtool zimtool.cpp ../../../Common/Data/Format/PNGLoad.cpp ../../../Common/Data/Format/ZIMSave.cpp) -target_link_libraries(build/zimtool freetype util png17 z zstd) +set(COMMON_FILES + ../../../Common/Data/Format/PNGLoad.cpp + ../../../Common/Data/Format/ZIMSave.cpp +) + +# Both executables are linked to the same libraries +link_libraries(${FREETYPE_LIBRARIES} ${UTIL} png17 ${ZLIB_LIBRARIES} ${ZSTD}) + +add_executable(atlastool atlastool.cpp ../../../Common/Data/Encoding/Utf8.cpp ${COMMON_FILES}) +add_executable(zimtool zimtool.cpp ${COMMON_FILES}) From adaa9fbbb4c7c51e4ee6986264c42980e853586d Mon Sep 17 00:00:00 2001 From: santiago046 <88282401+santiago046@users.noreply.github.com> Date: Fri, 26 Apr 2024 17:23:52 -0300 Subject: [PATCH 167/719] Update CMakeLists.txt --- ext/native/tools/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/native/tools/CMakeLists.txt b/ext/native/tools/CMakeLists.txt index 53b82104b1..168067fd0a 100644 --- a/ext/native/tools/CMakeLists.txt +++ b/ext/native/tools/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.8) -project (Tools) +project(Tools) set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) From 31bf179879be8e2041b29d1c21d19518d5aec878 Mon Sep 17 00:00:00 2001 From: santiago046 <88282401+santiago046@users.noreply.github.com> Date: Fri, 26 Apr 2024 17:31:27 -0300 Subject: [PATCH 168/719] Include ARM files in ext/libpng17/CMakeLists.txt for ARM processors Needed when building atlas/zimtool.It fixes this error: ``` /usr/bin/ld: png17/libpng17.a(pngrutil.c.o): in function `png_read_process_IDAT': pngrutil.c:(.text+0x548c): undefined reference to `png_init_filter_functions_neon' collect2: error: ld returned 1 exit status make[2]: *** [CMakeFiles/zimtool.dir/build.make:134: build/zimtool] Error 1 make[1]: *** [CMakeFiles/Makefile2:128: CMakeFiles/zimtool.dir/all] Error 2 make[1]: *** Waiting for unfinished jobs.... ``` --- ext/libpng17/CMakeLists.txt | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/ext/libpng17/CMakeLists.txt b/ext/libpng17/CMakeLists.txt index d2829cd3fe..7d6ae56ccb 100644 --- a/ext/libpng17/CMakeLists.txt +++ b/ext/libpng17/CMakeLists.txt @@ -1,6 +1,7 @@ -cmake_minimum_required(VERSION 2.6) +cmake_minimum_required(VERSION 3.8) +project(libpng17) -add_library(png17 +add_library(png17 STATIC pngconf.h pngdebug.h png.c @@ -18,9 +19,24 @@ add_library(png17 pngrutil.c pngset.c pngstruct.h - pngtest.c pngtrans.c pngwio.c pngwrite.c pngwtran.c - pngwutil.c) + pngwutil.c +) + +# Add arm files for ARM processors +if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "arm(64)?|aarch64") + set (ARM_FILES arm/arm_init.c + ) + + # Check if it's 32 bit + if("${CMAKE_SIZEOF_VOID_P}" EQUAL 4) + list(APPEND ARM_FILES arm/filter_neon.S) + else() + list(APPEND ARM_FILES arm/filter_neon_intrinsics.c) + endif() + + target_sources(png17 PRIVATE ${ARM_FILES}) +endif() From 6979be0e3e124ca4c514cdef8a0328a1b744239b Mon Sep 17 00:00:00 2001 From: santiago046 <88282401+santiago046@users.noreply.github.com> Date: Fri, 26 Apr 2024 17:38:39 -0300 Subject: [PATCH 169/719] Update ext/libpng17/CMakeLists.txt --- ext/libpng17/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/ext/libpng17/CMakeLists.txt b/ext/libpng17/CMakeLists.txt index 7d6ae56ccb..6c155a686a 100644 --- a/ext/libpng17/CMakeLists.txt +++ b/ext/libpng17/CMakeLists.txt @@ -19,6 +19,7 @@ add_library(png17 STATIC pngrutil.c pngset.c pngstruct.h + pngtest.c pngtrans.c pngwio.c pngwrite.c From 59ba9ab9738afe35443f334b5b5b6bf1a9b11fcc Mon Sep 17 00:00:00 2001 From: Brad Smith Date: Sat, 27 Apr 2024 07:44:37 -0400 Subject: [PATCH 170/719] Fix building on OpenBSD/riscv64. Unbreak on riscv64, we don't have sys/auxv.h or getauxval(). OpenBSD/riscv64 assumes RV64GC, aka RV64IMAFDC. Our kernel provides no support for the V extension. --- Common/RiscVCPUDetect.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Common/RiscVCPUDetect.cpp b/Common/RiscVCPUDetect.cpp index cb006238ae..f0aee40191 100644 --- a/Common/RiscVCPUDetect.cpp +++ b/Common/RiscVCPUDetect.cpp @@ -27,7 +27,9 @@ #include #include #include +#ifndef __OpenBSD__ #include +#endif #include #include "Common/Common.h" #include "Common/CPUDetect.h" @@ -201,6 +203,15 @@ void CPUInfo::Detect() } #endif +#ifdef __OpenBSD__ + /* OpenBSD uses RV64GC */ + RiscV_M = true; + RiscV_A = true; + RiscV_F = true; + RiscV_D = true; + RiscV_C = true; + RiscV_V = false; +#else unsigned long hwcap = getauxval(AT_HWCAP); RiscV_M = ExtensionSupported(hwcap, 'M'); RiscV_A = ExtensionSupported(hwcap, 'A'); @@ -208,6 +219,7 @@ void CPUInfo::Detect() RiscV_D = ExtensionSupported(hwcap, 'D'); RiscV_C = ExtensionSupported(hwcap, 'C'); RiscV_V = ExtensionSupported(hwcap, 'V'); +#endif // We assume as in RVA20U64 that F means Zicsr is available. RiscV_Zicsr = RiscV_F; From 2cb3bd1cbe4706c8b50fac9800e92ab99e473e74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 28 Apr 2024 14:27:58 +0200 Subject: [PATCH 171/719] Use the dwmapi to disable rounded corners on Windows 11. Hopefully just ignored on lower windows versions... --- Windows/MainWindow.cpp | 5 +++++ Windows/PPSSPP.vcxproj | 16 ++++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/Windows/MainWindow.cpp b/Windows/MainWindow.cpp index c162a510ee..96ef112635 100644 --- a/Windows/MainWindow.cpp +++ b/Windows/MainWindow.cpp @@ -29,6 +29,7 @@ #include #include #include +#include #include "Common/System/Display.h" #include "Common/System/NativeApp.h" @@ -483,6 +484,10 @@ namespace MainWindow SetWindowLong(hwndMain, GWL_EXSTYLE, WS_EX_APPWINDOW); + + const DWM_WINDOW_CORNER_PREFERENCE pref = DWMWCP_DONOTROUND; + DwmSetWindowAttribute(hwndMain, DWMWA_WINDOW_CORNER_PREFERENCE, &pref, sizeof(pref)); + RECT rcClient; GetClientRect(hwndMain, &rcClient); diff --git a/Windows/PPSSPP.vcxproj b/Windows/PPSSPP.vcxproj index 7fd1101e82..f9dddd9731 100644 --- a/Windows/PPSSPP.vcxproj +++ b/Windows/PPSSPP.vcxproj @@ -249,7 +249,7 @@ stdcpp17 - winhttp.lib;uxtheme.lib;mf.lib;mfplat.lib;mfreadwrite.lib;mfuuid.lib;shlwapi.lib;Winmm.lib;Ws2_32.lib;dsound.lib;comctl32.lib;d3d9.lib;dxguid.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) + dwmapi.lib;winhttp.lib;uxtheme.lib;mf.lib;mfplat.lib;mfreadwrite.lib;mfuuid.lib;shlwapi.lib;Winmm.lib;Ws2_32.lib;dsound.lib;comctl32.lib;d3d9.lib;dxguid.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) ../ffmpeg/Windows/x86/lib true Windows @@ -289,7 +289,7 @@ stdcpp17 - winhttp.lib;uxtheme.lib;mf.lib;mfplat.lib;mfreadwrite.lib;mfuuid.lib;shlwapi.lib;Winmm.lib;Ws2_32.lib;dsound.lib;comctl32.lib;d3d9.lib;dxguid.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) + dwmapi.lib;winhttp.lib;uxtheme.lib;mf.lib;mfplat.lib;mfreadwrite.lib;mfuuid.lib;shlwapi.lib;Winmm.lib;Ws2_32.lib;dsound.lib;comctl32.lib;d3d9.lib;dxguid.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) ../ffmpeg/Windows/x86_64/lib true $(OutDir)$(ProjectName).pdb @@ -325,7 +325,7 @@ stdcpp17 - winhttp.lib;uxtheme.lib;mf.lib;mfplat.lib;mfreadwrite.lib;mfuuid.lib;shlwapi.lib;Winmm.lib;Ws2_32.lib;dsound.lib;comctl32.lib;d3d9.lib;dxguid.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;oleaut32.lib;comdlg32.lib;shell32.lib;user32.lib;gdi32.lib;advapi32.lib;ole32.lib;%(AdditionalDependencies) + dwmapi.lib;winhttp.lib;uxtheme.lib;mf.lib;mfplat.lib;mfreadwrite.lib;mfuuid.lib;shlwapi.lib;Winmm.lib;Ws2_32.lib;dsound.lib;comctl32.lib;d3d9.lib;dxguid.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;oleaut32.lib;comdlg32.lib;shell32.lib;user32.lib;gdi32.lib;advapi32.lib;ole32.lib;%(AdditionalDependencies) ../ffmpeg/Windows/aarch64/lib true $(OutDir)$(ProjectName).pdb @@ -359,7 +359,7 @@ stdcpp17 - winhttp.lib;uxtheme.lib;mf.lib;mfplat.lib;mfreadwrite.lib;mfuuid.lib;shlwapi.lib;Winmm.lib;Ws2_32.lib;dsound.lib;comctl32.lib;d3d9.lib;dxguid.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;oleaut32.lib;comdlg32.lib;shell32.lib;user32.lib;gdi32.lib;advapi32.lib;ole32.lib;%(AdditionalDependencies) + dwmapi.lib;winhttp.lib;uxtheme.lib;mf.lib;mfplat.lib;mfreadwrite.lib;mfuuid.lib;shlwapi.lib;Winmm.lib;Ws2_32.lib;dsound.lib;comctl32.lib;d3d9.lib;dxguid.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;oleaut32.lib;comdlg32.lib;shell32.lib;user32.lib;gdi32.lib;advapi32.lib;ole32.lib;%(AdditionalDependencies) ../ffmpeg/Windows/arm/lib true $(OutDir)$(ProjectName).pdb @@ -397,7 +397,7 @@ stdcpp17 - winhttp.lib;uxtheme.lib;mf.lib;mfplat.lib;mfreadwrite.lib;mfuuid.lib;shlwapi.lib;Winmm.lib;Ws2_32.lib;dsound.lib;comctl32.lib;d3d9.lib;dxguid.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) + dwmapi.lib;winhttp.lib;uxtheme.lib;mf.lib;mfplat.lib;mfreadwrite.lib;mfuuid.lib;shlwapi.lib;Winmm.lib;Ws2_32.lib;dsound.lib;comctl32.lib;d3d9.lib;dxguid.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) ../ffmpeg/Windows/x86/lib;%(AdditionalLibraryDirectories) $(OutDir)$(TargetName)$(TargetExt) true @@ -446,7 +446,7 @@ stdcpp17 - winhttp.lib;uxtheme.lib;mf.lib;mfplat.lib;mfreadwrite.lib;mfuuid.lib;shlwapi.lib;Winmm.lib;Ws2_32.lib;dsound.lib;comctl32.lib;d3d9.lib;dxguid.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) + dwmapi.lib;winhttp.lib;uxtheme.lib;mf.lib;mfplat.lib;mfreadwrite.lib;mfuuid.lib;shlwapi.lib;Winmm.lib;Ws2_32.lib;dsound.lib;comctl32.lib;d3d9.lib;dxguid.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) ../ffmpeg/Windows/x86_64/lib;%(AdditionalLibraryDirectories) true Windows @@ -489,7 +489,7 @@ stdcpp17 - winhttp.lib;uxtheme.lib;mf.lib;mfplat.lib;mfreadwrite.lib;mfuuid.lib;shlwapi.lib;Winmm.lib;Ws2_32.lib;dsound.lib;comctl32.lib;d3d9.lib;dxguid.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;oleaut32.lib;comdlg32.lib;shell32.lib;user32.lib;gdi32.lib;advapi32.lib;ole32.lib;%(AdditionalDependencies) + dwmapi.lib;winhttp.lib;uxtheme.lib;mf.lib;mfplat.lib;mfreadwrite.lib;mfuuid.lib;shlwapi.lib;Winmm.lib;Ws2_32.lib;dsound.lib;comctl32.lib;d3d9.lib;dxguid.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;oleaut32.lib;comdlg32.lib;shell32.lib;user32.lib;gdi32.lib;advapi32.lib;ole32.lib;%(AdditionalDependencies) ../ffmpeg/Windows/aarch64/lib;%(AdditionalLibraryDirectories) true Windows @@ -530,7 +530,7 @@ stdcpp17 - winhttp.lib;uxtheme.lib;mf.lib;mfplat.lib;mfreadwrite.lib;mfuuid.lib;shlwapi.lib;Winmm.lib;Ws2_32.lib;dsound.lib;comctl32.lib;d3d9.lib;dxguid.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;oleaut32.lib;comdlg32.lib;shell32.lib;user32.lib;gdi32.lib;advapi32.lib;ole32.lib;%(AdditionalDependencies) + dwmapi.lib;winhttp.lib;uxtheme.lib;mf.lib;mfplat.lib;mfreadwrite.lib;mfuuid.lib;shlwapi.lib;Winmm.lib;Ws2_32.lib;dsound.lib;comctl32.lib;d3d9.lib;dxguid.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;oleaut32.lib;comdlg32.lib;shell32.lib;user32.lib;gdi32.lib;advapi32.lib;ole32.lib;%(AdditionalDependencies) ../ffmpeg/Windows/arm/lib;%(AdditionalLibraryDirectories) true Windows From 5cb7b7a686282db157bd93540638bf8415cd35e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20V?= Date: Mon, 29 Apr 2024 07:46:48 +0200 Subject: [PATCH 172/719] OpenXR - Support for Meta Horizon OS --- Common/VR/PPSSPPVR.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common/VR/PPSSPPVR.cpp b/Common/VR/PPSSPPVR.cpp index 84c76e970b..630573f2b9 100644 --- a/Common/VR/PPSSPPVR.cpp +++ b/Common/VR/PPSSPPVR.cpp @@ -154,7 +154,7 @@ void InitVROnAndroid(void* vm, void* activity, const char* system, int version, if (strcmp(vendor, "PICO") == 0) { VR_SetPlatformFLag(VR_PLATFORM_CONTROLLER_PICO, true); VR_SetPlatformFLag(VR_PLATFORM_EXTENSION_INSTANCE, true); - } else if ((strcmp(vendor, "META") == 0) || (strcmp(vendor, "OCULUS") == 0)) { + } else { VR_SetPlatformFLag(VR_PLATFORM_CONTROLLER_QUEST, true); VR_SetPlatformFLag(VR_PLATFORM_EXTENSION_FOVEATION, true); VR_SetPlatformFLag(VR_PLATFORM_EXTENSION_PASSTHROUGH, true); From 431a30b9c804221269e06e32083043185da8466b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Mon, 29 Apr 2024 10:31:42 +0200 Subject: [PATCH 173/719] Temporarily disable the JIT_IR unit test on Mac (not sure why it started crashing, OS upgrade?) --- unittest/JitHarness.cpp | 2 ++ unittest/UnitTest.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/unittest/JitHarness.cpp b/unittest/JitHarness.cpp index 71dd8f92c5..cf21c59623 100644 --- a/unittest/JitHarness.cpp +++ b/unittest/JitHarness.cpp @@ -197,8 +197,10 @@ bool TestJit() { ir_speed = ExecCPUTest(); mipsr4k.UpdateCore(CPUCore::JIT); jit_speed = ExecCPUTest(); +#if !PPSSPP_PLATFORM(MAC) mipsr4k.UpdateCore(CPUCore::JIT_IR); jit_ir_speed = ExecCPUTest(false); +#endif // Disassemble JitBlockCacheDebugInterface *cache = MIPSComp::jit->GetBlockCacheDebugInterface(); diff --git a/unittest/UnitTest.cpp b/unittest/UnitTest.cpp index c71a19bf4b..ec2d0f5b94 100644 --- a/unittest/UnitTest.cpp +++ b/unittest/UnitTest.cpp @@ -1099,7 +1099,7 @@ int main(int argc, const char *argv[]) { return 2; } } else if (testFunc == nullptr) { - fprintf(stderr, "You may select a test to run by passing an argument.\n"); + fprintf(stderr, "You may select a test to run by passing an argument, either \"all\" or one or more of the below.\n"); fprintf(stderr, "\n"); fprintf(stderr, "Available tests:\n"); for (auto f : availableTests) { From 8397fd679189ac5276102a5289a5f568c133be6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Mon, 29 Apr 2024 11:13:35 +0200 Subject: [PATCH 174/719] Also disable the GPU JIT tests on ARM64, not applicable --- Common/CPUDetect.cpp | 28 ++++++++++++++++++++++++++++ Common/CPUDetect.h | 2 ++ GPU/Software/Sampler.cpp | 1 + UI/DebugOverlay.cpp | 1 + UI/DevScreens.cpp | 28 ---------------------------- UI/DevScreens.h | 1 - unittest/TestArm64Emitter.cpp | 2 +- unittest/TestSoftwareGPUJit.cpp | 10 ++++++++++ unittest/UnitTest.cpp | 5 +++++ 9 files changed, 48 insertions(+), 30 deletions(-) diff --git a/Common/CPUDetect.cpp b/Common/CPUDetect.cpp index 057a892390..2cbe99b4cf 100644 --- a/Common/CPUDetect.cpp +++ b/Common/CPUDetect.cpp @@ -542,3 +542,31 @@ std::string CPUInfo::Summarize() { } #endif // PPSSPP_ARCH(X86) || PPSSPP_ARCH(AMD64) + +const char *GetCompilerABI() { +#if PPSSPP_ARCH(ARMV7) + return "armeabi-v7a"; +#elif PPSSPP_ARCH(ARM) + return "armeabi"; +#elif PPSSPP_ARCH(ARM64) + return "arm64"; +#elif PPSSPP_ARCH(X86) + return "x86"; +#elif PPSSPP_ARCH(AMD64) + return "x86-64"; +#elif PPSSPP_ARCH(RISCV64) + //https://github.com/riscv/riscv-toolchain-conventions#cc-preprocessor-definitions + //https://github.com/riscv/riscv-c-api-doc/blob/master/riscv-c-api.md#abi-related-preprocessor-definitions + #if defined(__riscv_float_abi_single) + return "lp64f"; + #elif defined(__riscv_float_abi_double) + return "lp64d"; + #elif defined(__riscv_float_abi_quad) + return "lp64q"; + #elif defined(__riscv_float_abi_soft) + return "lp64"; + #endif +#else + return "other"; +#endif +} diff --git a/Common/CPUDetect.h b/Common/CPUDetect.h index e4f0a567a4..20bb523415 100644 --- a/Common/CPUDetect.h +++ b/Common/CPUDetect.h @@ -161,3 +161,5 @@ private: }; extern CPUInfo cpu_info; + +const char *GetCompilerABI(); diff --git a/GPU/Software/Sampler.cpp b/GPU/Software/Sampler.cpp index 60afbd39a9..9dee5a656a 100644 --- a/GPU/Software/Sampler.cpp +++ b/GPU/Software/Sampler.cpp @@ -181,6 +181,7 @@ NearestFunc SamplerJitCache::GetByID(const SamplerID &id, size_t key, BinManager } if (!binner) { + printf("No binner, can't compile\n"); // Can't compile, let's try to do it later when there's an opportunity. compileQueue_.insert(id); return nullptr; diff --git a/UI/DebugOverlay.cpp b/UI/DebugOverlay.cpp index 6a54cc882b..9e402144ac 100644 --- a/UI/DebugOverlay.cpp +++ b/UI/DebugOverlay.cpp @@ -2,6 +2,7 @@ #include "Common/GPU/thin3d.h" #include "Common/System/System.h" #include "Common/Data/Text/I18n.h" +#include "Common/CPUDetect.h" #include "Core/MIPS/MIPS.h" #include "Core/HW/Display.h" #include "Core/FrameTiming.h" diff --git a/UI/DevScreens.cpp b/UI/DevScreens.cpp index 3c5aea442b..0d614b61ff 100644 --- a/UI/DevScreens.cpp +++ b/UI/DevScreens.cpp @@ -452,34 +452,6 @@ UI::EventReturn JitDebugScreen::OnDisableAll(UI::EventParams &e) { return UI::EVENT_DONE; } -const char *GetCompilerABI() { -#if PPSSPP_ARCH(ARMV7) - return "armeabi-v7a"; -#elif PPSSPP_ARCH(ARM) - return "armeabi"; -#elif PPSSPP_ARCH(ARM64) - return "arm64"; -#elif PPSSPP_ARCH(X86) - return "x86"; -#elif PPSSPP_ARCH(AMD64) - return "x86-64"; -#elif PPSSPP_ARCH(RISCV64) - //https://github.com/riscv/riscv-toolchain-conventions#cc-preprocessor-definitions - //https://github.com/riscv/riscv-c-api-doc/blob/master/riscv-c-api.md#abi-related-preprocessor-definitions - #if defined(__riscv_float_abi_single) - return "lp64f"; - #elif defined(__riscv_float_abi_double) - return "lp64d"; - #elif defined(__riscv_float_abi_quad) - return "lp64q"; - #elif defined(__riscv_float_abi_soft) - return "lp64"; - #endif -#else - return "other"; -#endif -} - void SystemInfoScreen::update() { TabbedUIDialogScreenWithGameBackground::update(); g_OSD.NudgeSidebar(); diff --git a/UI/DevScreens.h b/UI/DevScreens.h index 0321aab1a3..29fbf5690b 100644 --- a/UI/DevScreens.h +++ b/UI/DevScreens.h @@ -264,6 +264,5 @@ protected: }; void DrawProfile(UIContext &ui); -const char *GetCompilerABI(); void AddOverlayList(UI::ViewGroup *items, ScreenManager *screenManager); diff --git a/unittest/TestArm64Emitter.cpp b/unittest/TestArm64Emitter.cpp index a795cfbb2f..66d373f16b 100644 --- a/unittest/TestArm64Emitter.cpp +++ b/unittest/TestArm64Emitter.cpp @@ -282,7 +282,7 @@ bool TestArm64Emitter() { emitter.EORI2R(X1, X3, 0x3F0000003F0, INVALID_REG); RET(CheckLast(emitter, "d21c1461 eor x1, x3, #0x3f0000003f0")); - printf("yay!\n"); + printf("ARM64 emitter test completed!\n"); //emitter.ANDI2R(W1, W3, 0xFF00FF00FF00FF00ULL, INVALID_REG); //RET(CheckLast(emitter, "00000000 and x1, x3, 0xFF00FF00FF00FF00")); diff --git a/unittest/TestSoftwareGPUJit.cpp b/unittest/TestSoftwareGPUJit.cpp index 5d7c6946d4..ab2f5ff73c 100644 --- a/unittest/TestSoftwareGPUJit.cpp +++ b/unittest/TestSoftwareGPUJit.cpp @@ -24,6 +24,7 @@ #include "GPU/Software/SoftGpu.h" static bool TestSamplerJit() { +#if PPSSPP_ARCH(AMD64) using namespace Sampler; SamplerJitCache *cache = new SamplerJitCache(); BinManager binner; @@ -108,9 +109,14 @@ static bool TestSamplerJit() { delete cache; return successes == count && !HitAnyAsserts(); +#else + // Don't test sampler jit, not supported. + return true; +#endif } static bool TestPixelJit() { +#if PPSSPP_ARCH(AMD64) using namespace Rasterizer; PixelJitCache *cache = new PixelJitCache(); BinManager binner; @@ -159,6 +165,10 @@ static bool TestPixelJit() { delete [] zb_data; delete cache; return successes == count && !HitAnyAsserts(); +#else + // Not yet supported + return true; +#endif } bool TestSoftwareGPUJit() { diff --git a/unittest/UnitTest.cpp b/unittest/UnitTest.cpp index ec2d0f5b94..0fa08b8ed8 100644 --- a/unittest/UnitTest.cpp +++ b/unittest/UnitTest.cpp @@ -1061,6 +1061,10 @@ TestItem availableTests[] = { int main(int argc, const char *argv[]) { SetCurrentThreadName("UnitTest"); + printf("CPU name: %s\n", cpu_info.cpu_string); + printf("ABI: %s\n", GetCompilerABI()); + + // In case we're on ARM, assume these are available. cpu_info.bNEON = true; cpu_info.bVFP = true; cpu_info.bVFPv3 = true; @@ -1096,6 +1100,7 @@ int main(int argc, const char *argv[]) { printf("%d tests passed.\n", passes); } if (fails > 0) { + printf("%d tests failed!\n", fails); return 2; } } else if (testFunc == nullptr) { From 0e57cf30c7dfbb1bb0addabecbbc0f8ba0af827a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Mon, 29 Apr 2024 11:32:54 +0200 Subject: [PATCH 175/719] ARM64: Disable the JIT implementation of the vh2f instruction, not accurate --- Core/MIPS/ARM64/Arm64CompVFPU.cpp | 6 ++++++ GPU/Software/Sampler.cpp | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Core/MIPS/ARM64/Arm64CompVFPU.cpp b/Core/MIPS/ARM64/Arm64CompVFPU.cpp index d5dd416d6f..0d84f2851d 100644 --- a/Core/MIPS/ARM64/Arm64CompVFPU.cpp +++ b/Core/MIPS/ARM64/Arm64CompVFPU.cpp @@ -948,6 +948,12 @@ namespace MIPSComp { } void Arm64Jit::Comp_Vh2f(MIPSOpcode op) { + // TODO: Fix by porting the general SSE solution to NEON + // FCVTL doesn't provide identical results to the PSP hardware, according to the unit test: + // O vh2f: 00000000,400c0000,00000000,7ff00000 + // E vh2f: 00000000,400c0000,00000000,7f800380 + DISABLE; + CONDITIONAL_DISABLE(VFPU_VEC); if (js.HasUnknownPrefix()) { DISABLE; diff --git a/GPU/Software/Sampler.cpp b/GPU/Software/Sampler.cpp index 9dee5a656a..60afbd39a9 100644 --- a/GPU/Software/Sampler.cpp +++ b/GPU/Software/Sampler.cpp @@ -181,7 +181,6 @@ NearestFunc SamplerJitCache::GetByID(const SamplerID &id, size_t key, BinManager } if (!binner) { - printf("No binner, can't compile\n"); // Can't compile, let's try to do it later when there's an opportunity. compileQueue_.insert(id); return nullptr; From 168afab263e695785047c698aee554348f90eeaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Mon, 29 Apr 2024 11:42:58 +0200 Subject: [PATCH 176/719] Temporarily disable the gpu/vertices/texcoords test that is not quite working 100% on ARM --- headless/headless.txt | 5 ++--- test.py | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/headless/headless.txt b/headless/headless.txt index ddc43e4cfc..194a14ca98 100644 --- a/headless/headless.txt +++ b/headless/headless.txt @@ -1,7 +1,6 @@ -Plan: +TODO: This documentation is outdated and needs updating. - -This is intended to be a port that does not have graphics, it just starts up the system without a display, prints all debug output (as configured) to the console using printf(), and exits when the emulated binary exits. +This is a build of PPSSPP that does not have graphics, it just starts up the system without a display, prints all debug output (as configured) to the console using printf(), and exits when the emulated binary exits. Usage: diff --git a/test.py b/test.py index 7b55c8a692..a992913b9c 100755 --- a/test.py +++ b/test.py @@ -196,7 +196,7 @@ tests_good = [ "gpu/transfer/overlap", "gpu/vertices/colors", "gpu/vertices/morph", - "gpu/vertices/texcoords", + # "gpu/vertices/texcoords", # See issue #19093 "hash/hash", "hle/check_not_used_uids", "intr/intr", From 28ab4518edb301e52d5e6f8b21accb4e8d76956a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 28 Apr 2024 14:51:48 +0200 Subject: [PATCH 177/719] Add a workaround and an assert, trying to fix #18982 Not sure what it is if this doesn't fix #18982. We already seem to be doing things correctly. --- Common/GPU/Vulkan/VulkanContext.cpp | 3 ++- Common/GPU/Vulkan/VulkanLoader.cpp | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Common/GPU/Vulkan/VulkanContext.cpp b/Common/GPU/Vulkan/VulkanContext.cpp index 238c15ab1b..58862ba234 100644 --- a/Common/GPU/Vulkan/VulkanContext.cpp +++ b/Common/GPU/Vulkan/VulkanContext.cpp @@ -263,7 +263,7 @@ VkResult VulkanContext::CreateInstance(const CreateInfo &info) { return res; } - if (extensionsLookup_.KHR_get_physical_device_properties2) { + if (extensionsLookup_.KHR_get_physical_device_properties2 && vkGetPhysicalDeviceProperties2) { for (uint32_t i = 0; i < gpu_count; i++) { VkPhysicalDeviceProperties2 props2{VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2}; VkPhysicalDevicePushDescriptorPropertiesKHR pushProps{VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PUSH_DESCRIPTOR_PROPERTIES_KHR}; @@ -291,6 +291,7 @@ VkResult VulkanContext::CreateInstance(const CreateInfo &info) { } if (extensionsLookup_.EXT_debug_utils) { + _assert_(vkCreateDebugUtilsMessengerEXT != nullptr); InitDebugUtilsCallback(); } diff --git a/Common/GPU/Vulkan/VulkanLoader.cpp b/Common/GPU/Vulkan/VulkanLoader.cpp index c5b4ce6814..d2a5653350 100644 --- a/Common/GPU/Vulkan/VulkanLoader.cpp +++ b/Common/GPU/Vulkan/VulkanLoader.cpp @@ -576,6 +576,7 @@ bool VulkanLoad(std::string *errorStr) { if (vkCreateInstance && vkGetInstanceProcAddr && vkGetDeviceProcAddr && vkEnumerateInstanceExtensionProperties && vkEnumerateInstanceLayerProperties) { INFO_LOG(G3D, "VulkanLoad: Base functions loaded."); + // NOTE: It's ok if vkEnumerateInstanceVersion is missing. return true; } else { *errorStr = "Failed to load Vulkan base functions"; From 917f5897bd09106ca00e2e69e96596c1ed2b715e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Mon, 29 Apr 2024 19:58:11 +0200 Subject: [PATCH 178/719] Add back a lost-in-refactoring hack for the SasAudio/sceAtrac integration. Fixes #19075 --- Core/HLE/AtracCtx.h | 4 ++++ Core/HLE/sceAtrac.cpp | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/Core/HLE/AtracCtx.h b/Core/HLE/AtracCtx.h index 0f5245c259..8f2bf38fda 100644 --- a/Core/HLE/AtracCtx.h +++ b/Core/HLE/AtracCtx.h @@ -216,6 +216,10 @@ public: int GetOutputChannels() const { return outputChannels_; } + void SetOutputChannels(int channels) { + // Only used for sceSas audio. To be refactored away in the future. + outputChannels_ = channels; + } int atracID_ = -1; diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp index 278002c196..75fd75a430 100644 --- a/Core/HLE/sceAtrac.cpp +++ b/Core/HLE/sceAtrac.cpp @@ -1007,6 +1007,11 @@ u32 AtracSasDecodeData(int atracID, u8* outbuf, u32 outbufPtr, u32 *SamplesNum, int AtracSasGetIDByContext(u32 contextAddr) { int atracID = (int)Memory::Read_U32(contextAddr + 0xfc); + // Restored old hack here that forces outputChannels_ to 1, since sceSas expects mono output, unlike normal usage. + // This is for savestate compatibility. + // I think it would be better to simply pass in a 1 as a parameter to atrac->DecodeData in AtracSasDecodeData above. + AtracBase *atrac = getAtrac(atracID); + atrac->SetOutputChannels(1); return atracID; } From 7a6d646bebcc12decd848382b42d0c7cc70dd94a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Mon, 29 Apr 2024 20:32:53 +0200 Subject: [PATCH 179/719] RetroAchievements: Add support for hashing homebrew We finally defined a method in https://github.com/RetroAchievements/rcheevos/issues/244 . --- Core/Config.cpp | 4 +-- Core/RetroAchievements.cpp | 55 +++++++++++++++++++++++++++++--------- 2 files changed, 45 insertions(+), 14 deletions(-) diff --git a/Core/Config.cpp b/Core/Config.cpp index 5e7f497168..395e2651ee 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -1519,9 +1519,9 @@ void Config::RemoveRecent(const std::string &file) { private_->ResetRecentIsosThread(); std::lock_guard guard(private_->recentIsosLock); - const auto &filename = File::ResolvePath(file); + const std::string filename = File::ResolvePath(file); auto iter = std::remove_if(recentIsos.begin(), recentIsos.end(), [filename](const auto &str) { - const auto &recent = File::ResolvePath(str); + const std::string recent = File::ResolvePath(str); return filename == recent; }); // remove_if is weird. diff --git a/Core/RetroAchievements.cpp b/Core/RetroAchievements.cpp index 5b85f08075..dec6a239e9 100644 --- a/Core/RetroAchievements.cpp +++ b/Core/RetroAchievements.cpp @@ -91,9 +91,19 @@ static bool HashISOFile(ISOFileSystem *fs, const std::string filename, md5_conte return true; } +static std::string FormatRCheevosMD5(uint8_t digest[16]) { + char hashStr[33]; + /* NOTE: sizeof(hash) is 4 because it's still treated like a pointer, despite specifying a size */ + snprintf(hashStr, 33, "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x", + digest[0], digest[1], digest[2], digest[3], digest[4], digest[5], digest[6], digest[7], + digest[8], digest[9], digest[10], digest[11], digest[12], digest[13], digest[14], digest[15] + ); + return std::string(hashStr); +} + // Consumes the blockDevice. // If failed, returns an empty string, otherwise a 32-character string with the hash in hex format. -static std::string ComputePSPHash(BlockDevice *blockDevice) { +static std::string ComputePSPISOHash(BlockDevice *blockDevice) { md5_context md5; ppsspp_md5_starts(&md5); @@ -111,14 +121,23 @@ static std::string ComputePSPHash(BlockDevice *blockDevice) { uint8_t digest[16]; ppsspp_md5_finish(&md5, digest); + return FormatRCheevosMD5(digest); +} - char hashStr[33]; - /* NOTE: sizeof(hash) is 4 because it's still treated like a pointer, despite specifying a size */ - snprintf(hashStr, 33, "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x", - digest[0], digest[1], digest[2], digest[3], digest[4], digest[5], digest[6], digest[7], - digest[8], digest[9], digest[10], digest[11], digest[12], digest[13], digest[14], digest[15] - ); - return std::string(hashStr); +static std::string ComputePSPHomebrewHash(FileLoader *fileLoader) { + md5_context md5; + ppsspp_md5_starts(&md5); + + // Cap the data we read to 16MB, and hash that. + std::vector buffer; + size_t fileSize = std::min((s64)(1024 * 1024 * 16), fileLoader->FileSize()); + buffer.resize(fileSize); + fileLoader->ReadAt(0, fileSize, buffer.data(), FileLoader::Flags::NONE); + ppsspp_md5_update(&md5, buffer.data(), (int)buffer.size()); + + uint8_t digest[16]; + ppsspp_md5_finish(&md5, digest); + return FormatRCheevosMD5(digest); } static inline const char *DeNull(const char *ptr) { @@ -927,11 +946,17 @@ bool IsReadyToStart() { } void SetGame(const Path &path, IdentifiedFileType fileType, FileLoader *fileLoader) { + bool homebrew = false; switch (fileType) { case IdentifiedFileType::PSP_ISO: case IdentifiedFileType::PSP_ISO_NP: // These file types are OK. break; + case IdentifiedFileType::PSP_PBP_DIRECTORY: + // This should be a homebrew, which we now support as well. + // We select the homebrew hashing method. + homebrew = true; + break; default: // Other file types are not yet supported. // TODO: Should we show an OSD popup here? @@ -957,8 +982,14 @@ void SetGame(const Path &path, IdentifiedFileType fileType, FileLoader *fileLoad g_gamePath = path; g_isIdentifying = true; - // TODO: Fish the block device out of the loading process somewhere else. Though, probably easier to just do it here. - { + if (homebrew) { + // Homebrew hashing method - just hash the eboot. + s_game_hash = ComputePSPHomebrewHash(fileLoader); + } else { + // ISO hashing method. + // + // TODO: Fish the block device out of the loading process somewhere else. Though, probably easier to just do it here, + // we need a temporary blockdevice anyway since it gets consumed by ComputePSPISOHash. BlockDevice *blockDevice(constructBlockDevice(fileLoader)); if (!blockDevice) { ERROR_LOG(ACHIEVEMENTS, "Failed to construct block device for '%s' - can't identify", path.c_str()); @@ -967,7 +998,7 @@ void SetGame(const Path &path, IdentifiedFileType fileType, FileLoader *fileLoad } // This consumes the blockDevice. - s_game_hash = ComputePSPHash(blockDevice); + s_game_hash = ComputePSPISOHash(blockDevice); if (!s_game_hash.empty()) { INFO_LOG(ACHIEVEMENTS, "Hash: %s", s_game_hash.c_str()); } @@ -1031,7 +1062,7 @@ void ChangeUMD(const Path &path, FileLoader *fileLoader) { g_isIdentifying = true; // This consumes the blockDevice. - s_game_hash = ComputePSPHash(blockDevice); + s_game_hash = ComputePSPISOHash(blockDevice); if (s_game_hash.empty()) { ERROR_LOG(ACHIEVEMENTS, "Failed to hash - can't identify"); return; From 167fabaa56af72bfc7d45f2c5916e285e057437a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Mon, 29 Apr 2024 23:31:46 +0200 Subject: [PATCH 180/719] Increase the hashing limit to 64MB, to match rcheevos' rhash max limit --- Core/RetroAchievements.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Core/RetroAchievements.cpp b/Core/RetroAchievements.cpp index dec6a239e9..51edc65297 100644 --- a/Core/RetroAchievements.cpp +++ b/Core/RetroAchievements.cpp @@ -128,9 +128,9 @@ static std::string ComputePSPHomebrewHash(FileLoader *fileLoader) { md5_context md5; ppsspp_md5_starts(&md5); - // Cap the data we read to 16MB, and hash that. + // Cap the data we read to 64MB (MAX_BUFFER_SIZE in rcheevos' hash.c), and hash that. std::vector buffer; - size_t fileSize = std::min((s64)(1024 * 1024 * 16), fileLoader->FileSize()); + size_t fileSize = std::min((s64)(1024 * 1024 * 64), fileLoader->FileSize()); buffer.resize(fileSize); fileLoader->ReadAt(0, fileSize, buffer.data(), FileLoader::Flags::NONE); ppsspp_md5_update(&md5, buffer.data(), (int)buffer.size()); From c9dc2444e79002726627c70f4c802a860b7c8545 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Tue, 30 Apr 2024 00:47:00 +0200 Subject: [PATCH 181/719] Bump rcheevos --- ext/rcheevos | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/rcheevos b/ext/rcheevos index a6cdbb4a52..e88f749925 160000 --- a/ext/rcheevos +++ b/ext/rcheevos @@ -1 +1 @@ -Subproject commit a6cdbb4a529d85b74777597fcff037dde7bef66b +Subproject commit e88f74992527b9ade48ae1591378ec2cf363bef9 From b0a71d450d8e3a007d99ac6690ea60ffe97a1190 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Tue, 30 Apr 2024 00:49:55 +0200 Subject: [PATCH 182/719] Use new API to notify raintegration of the console ID --- Core/RetroAchievements.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Core/RetroAchievements.cpp b/Core/RetroAchievements.cpp index 51edc65297..587a896f49 100644 --- a/Core/RetroAchievements.cpp +++ b/Core/RetroAchievements.cpp @@ -549,6 +549,7 @@ static void load_integration_callback(int result, const char *error_message, rc_ // DLL was loaded correctly. g_OSD.Show(OSDType::MESSAGE_SUCCESS, ac->T("RAIntegration DLL loaded.")); + rc_client_raintegration_set_console_id(g_rcClient, RC_CONSOLE_PSP); rc_client_raintegration_set_event_handler(g_rcClient, &raintegration_event_handler); rc_client_raintegration_set_write_memory_function(g_rcClient, &raintegration_write_memory_handler); rc_client_raintegration_set_get_game_name_function(g_rcClient, &raintegration_get_game_name_handler); From 7ff48f97c3eea796697e5151823169225d2cc3c1 Mon Sep 17 00:00:00 2001 From: Katharine Chui Date: Mon, 29 Apr 2024 18:41:26 +0800 Subject: [PATCH 183/719] implement sysclib_sprintf --- Core/HLE/sceKernelInterrupt.cpp | 165 +++++++++++++++++++++++++++++++- 1 file changed, 162 insertions(+), 3 deletions(-) diff --git a/Core/HLE/sceKernelInterrupt.cpp b/Core/HLE/sceKernelInterrupt.cpp index 76e1788e39..e1acceddf3 100644 --- a/Core/HLE/sceKernelInterrupt.cpp +++ b/Core/HLE/sceKernelInterrupt.cpp @@ -742,10 +742,169 @@ static int sysclib_memcmp(u32 dst, u32 src, u32 size) { } static int sysclib_sprintf(u32 dst, u32 fmt) { - ERROR_LOG(SCEKERNEL, "Unimpl sysclib_sprintf(dest=%08x, src=%08x)", dst, fmt); + ERROR_LOG(SCEKERNEL, "Untested sysclib_sprintf(dst=%08x, fmt=%08x)", dst, fmt); if (Memory::IsValidAddress(dst) && Memory::IsValidAddress(fmt)) { - // TODO: Properly use the format string with more parameters. - return sprintf((char *)Memory::GetPointerUnchecked(dst), "%s", Memory::GetCharPointerUnchecked(fmt)); + + + u32 psp_stack_pointer = currentMIPS->r[MIPS_REG_SP]; + ERROR_LOG(SCEKERNEL, "Fmt: %s", Memory::GetCharPointerUnchecked(fmt)); + ERROR_LOG(SCEKERNEL, "PSP arg reg dump: 0x%08x 0x%08x 0x%08x 0x%08x 0x%08x 0x%08x 0x%08x 0x%08x", + currentMIPS->r[MIPS_REG_A0], + currentMIPS->r[MIPS_REG_A1], + currentMIPS->r[MIPS_REG_A2], + currentMIPS->r[MIPS_REG_A3], + currentMIPS->r[MIPS_REG_T0], + currentMIPS->r[MIPS_REG_T1], + currentMIPS->r[MIPS_REG_T2], + currentMIPS->r[MIPS_REG_T3] + ); + for(int i = 0;i < 24; i+=8){ + u32 base = psp_stack_pointer + i * 4; + ERROR_LOG(SCEKERNEL, "PSP stack dump: 0x%08x 0x%08x 0x%08x 0x%08x 0x%08x 0x%08x 0x%08x 0x%08x", + Memory::Read_U32(base), + Memory::Read_U32(base + 1 * 4), + Memory::Read_U32(base + 2 * 4), + Memory::Read_U32(base + 3 * 4), + Memory::Read_U32(base + 4 * 4), + Memory::Read_U32(base + 5 * 4), + Memory::Read_U32(base + 6 * 4), + Memory::Read_U32(base + 7 * 4) + ); + } + int state = 0; + std::string result = ""; + std::string cur_fmt = ""; + int bytes_to_read = 0; + int arg_idx = 0; + int fmt_len = 0; + + for(const char *c = Memory::GetCharPointerUnchecked(fmt); *c != '\0'; c++){ + // in case we have a bad fmt string, try not to crash the whole emulator + fmt_len++; + if(fmt_len == 1024){ + ERROR_LOG(SCEKERNEL, "sprintf, fmt is longer than 1024"); + return 0; + } + + if(state == 0){ + if(*c == '%'){ + cur_fmt = "%"; + state = 1; + bytes_to_read = 0; + }else{ + result.append(1, *c); + } + }else{ + cur_fmt.append(1, *c); + + // going by https://cplusplus.com/reference/cstdio/printf/#compatibility + // no idea what the kernel module really supports as of writing this + + if(*c == '%'){ + result.append(cur_fmt); + state = 0; + }else if(*c == 'd' || + *c == 'i' || + *c == 'u' || + *c == 'o' || + *c == 'x' || + *c == 'X' || + *c == 'f' || + *c == 'e' || + *c == 'E' || + *c == 'g' || + *c == 'G' || + *c == 'c' || + *c == 'p' || + *c == 'n' || + *c == 's' + ){ + // we have a format ending + if(*c == 's'){ + // consume 4 bytes from arguments + u32 val = 0; + if(arg_idx <= 1){ + val = currentMIPS->r[MIPS_REG_A2 + arg_idx]; + }else if(arg_idx <= 5){ + val = currentMIPS->r[MIPS_REG_T0 + arg_idx - 2]; + }else{ + // XXX assuming right to left arg pushing + int stack_idx = arg_idx - 6; + u32 stack_cur = psp_stack_pointer + stack_idx * 4; + + if(!Memory::IsValidAddress(stack_cur)){ + ERROR_LOG(SCEKERNEL, "sprintf, bad stack pointer %08x", stack_cur); + return 0; + } + val = Memory::Read_U32(stack_cur); + } + arg_idx++; + + if(!Memory::IsValidAddress(val)){ + ERROR_LOG(SCEKERNEL, "sprintf, bad string reference %08x", val); + return 0; + } + + const char *str = Memory::GetCharPointerUnchecked(val); + // limit the string length and hope that we don't crash on a bad string reference + char buf[1024] = {0}; + strncpy(buf, str, sizeof(buf)); + buf[sizeof(buf) - 1] = '\0'; + result.append(buf); + }else{ + u64 val = 0; + if(bytes_to_read == 0){ + bytes_to_read = 4; + } + int read_cnt = 0; + while(bytes_to_read != 0){ + u64 val_from_arg = 0; + if(arg_idx <= 1){ + val_from_arg = currentMIPS->r[MIPS_REG_A2 + arg_idx]; + }else if(arg_idx <= 5){ + val_from_arg = currentMIPS->r[MIPS_REG_T0 + arg_idx - 2]; + }else{ + // XXX assuming right to left arg pushing + int stack_idx = arg_idx - 6; + u32 stack_cur = psp_stack_pointer + stack_idx * 4; + + if(!Memory::IsValidAddress(stack_cur)){ + ERROR_LOG(SCEKERNEL, "sprintf, bad stack pointer %08x", stack_cur); + return 0; + } + val_from_arg = Memory::Read_U32(stack_cur); + } + arg_idx++; + + val = val | (val_from_arg << (read_cnt * 32)); + + bytes_to_read = bytes_to_read - 4; + read_cnt++; + } + /* + // windows compiler don't like this + int space_needed = snprintf(nullptr, 0, cur_fmt.c_str(), val); + char buf[space_needed + 1]; + sprintf(buf, cur_fmt.c_str(), val); + */ + char buf[1024] = {0}; + snprintf(buf, sizeof(buf), cur_fmt.c_str(), val); + buf[sizeof(buf) - 1] = '\0'; + result.append(buf); + } + state = 0; + }else if(*c == 'h'){ + // allegrex calling convention is 4 bytes aligned + bytes_to_read = 4; + }else if(*c == 'l'){ + bytes_to_read = bytes_to_read + 4; + } + } + } + + // if a small buffer was allocated by the program, we will likely crash + strcpy((char *)Memory::GetPointerUnchecked(dst), result.c_str()); + return result.length(); } else { // What to do? Crash, probably. return 0; From fa0eaebfb51e21dc890db0e8fef485833fda7c45 Mon Sep 17 00:00:00 2001 From: Katharine Chui Date: Wed, 1 May 2024 01:41:57 +0800 Subject: [PATCH 184/719] cleanup --- Core/HLE/sceKernelInterrupt.cpp | 315 +++++++++++++++----------------- 1 file changed, 152 insertions(+), 163 deletions(-) diff --git a/Core/HLE/sceKernelInterrupt.cpp b/Core/HLE/sceKernelInterrupt.cpp index e1acceddf3..72596e6ceb 100644 --- a/Core/HLE/sceKernelInterrupt.cpp +++ b/Core/HLE/sceKernelInterrupt.cpp @@ -743,172 +743,161 @@ static int sysclib_memcmp(u32 dst, u32 src, u32 size) { static int sysclib_sprintf(u32 dst, u32 fmt) { ERROR_LOG(SCEKERNEL, "Untested sysclib_sprintf(dst=%08x, fmt=%08x)", dst, fmt); - if (Memory::IsValidAddress(dst) && Memory::IsValidAddress(fmt)) { - - - u32 psp_stack_pointer = currentMIPS->r[MIPS_REG_SP]; - ERROR_LOG(SCEKERNEL, "Fmt: %s", Memory::GetCharPointerUnchecked(fmt)); - ERROR_LOG(SCEKERNEL, "PSP arg reg dump: 0x%08x 0x%08x 0x%08x 0x%08x 0x%08x 0x%08x 0x%08x 0x%08x", - currentMIPS->r[MIPS_REG_A0], - currentMIPS->r[MIPS_REG_A1], - currentMIPS->r[MIPS_REG_A2], - currentMIPS->r[MIPS_REG_A3], - currentMIPS->r[MIPS_REG_T0], - currentMIPS->r[MIPS_REG_T1], - currentMIPS->r[MIPS_REG_T2], - currentMIPS->r[MIPS_REG_T3] - ); - for(int i = 0;i < 24; i+=8){ - u32 base = psp_stack_pointer + i * 4; - ERROR_LOG(SCEKERNEL, "PSP stack dump: 0x%08x 0x%08x 0x%08x 0x%08x 0x%08x 0x%08x 0x%08x 0x%08x", - Memory::Read_U32(base), - Memory::Read_U32(base + 1 * 4), - Memory::Read_U32(base + 2 * 4), - Memory::Read_U32(base + 3 * 4), - Memory::Read_U32(base + 4 * 4), - Memory::Read_U32(base + 5 * 4), - Memory::Read_U32(base + 6 * 4), - Memory::Read_U32(base + 7 * 4) - ); - } - int state = 0; - std::string result = ""; - std::string cur_fmt = ""; - int bytes_to_read = 0; - int arg_idx = 0; - int fmt_len = 0; - - for(const char *c = Memory::GetCharPointerUnchecked(fmt); *c != '\0'; c++){ - // in case we have a bad fmt string, try not to crash the whole emulator - fmt_len++; - if(fmt_len == 1024){ - ERROR_LOG(SCEKERNEL, "sprintf, fmt is longer than 1024"); - return 0; - } - - if(state == 0){ - if(*c == '%'){ - cur_fmt = "%"; - state = 1; - bytes_to_read = 0; - }else{ - result.append(1, *c); - } - }else{ - cur_fmt.append(1, *c); - - // going by https://cplusplus.com/reference/cstdio/printf/#compatibility - // no idea what the kernel module really supports as of writing this - - if(*c == '%'){ - result.append(cur_fmt); - state = 0; - }else if(*c == 'd' || - *c == 'i' || - *c == 'u' || - *c == 'o' || - *c == 'x' || - *c == 'X' || - *c == 'f' || - *c == 'e' || - *c == 'E' || - *c == 'g' || - *c == 'G' || - *c == 'c' || - *c == 'p' || - *c == 'n' || - *c == 's' - ){ - // we have a format ending - if(*c == 's'){ - // consume 4 bytes from arguments - u32 val = 0; - if(arg_idx <= 1){ - val = currentMIPS->r[MIPS_REG_A2 + arg_idx]; - }else if(arg_idx <= 5){ - val = currentMIPS->r[MIPS_REG_T0 + arg_idx - 2]; - }else{ - // XXX assuming right to left arg pushing - int stack_idx = arg_idx - 6; - u32 stack_cur = psp_stack_pointer + stack_idx * 4; - - if(!Memory::IsValidAddress(stack_cur)){ - ERROR_LOG(SCEKERNEL, "sprintf, bad stack pointer %08x", stack_cur); - return 0; - } - val = Memory::Read_U32(stack_cur); - } - arg_idx++; - - if(!Memory::IsValidAddress(val)){ - ERROR_LOG(SCEKERNEL, "sprintf, bad string reference %08x", val); - return 0; - } - - const char *str = Memory::GetCharPointerUnchecked(val); - // limit the string length and hope that we don't crash on a bad string reference - char buf[1024] = {0}; - strncpy(buf, str, sizeof(buf)); - buf[sizeof(buf) - 1] = '\0'; - result.append(buf); - }else{ - u64 val = 0; - if(bytes_to_read == 0){ - bytes_to_read = 4; - } - int read_cnt = 0; - while(bytes_to_read != 0){ - u64 val_from_arg = 0; - if(arg_idx <= 1){ - val_from_arg = currentMIPS->r[MIPS_REG_A2 + arg_idx]; - }else if(arg_idx <= 5){ - val_from_arg = currentMIPS->r[MIPS_REG_T0 + arg_idx - 2]; - }else{ - // XXX assuming right to left arg pushing - int stack_idx = arg_idx - 6; - u32 stack_cur = psp_stack_pointer + stack_idx * 4; - - if(!Memory::IsValidAddress(stack_cur)){ - ERROR_LOG(SCEKERNEL, "sprintf, bad stack pointer %08x", stack_cur); - return 0; - } - val_from_arg = Memory::Read_U32(stack_cur); - } - arg_idx++; - - val = val | (val_from_arg << (read_cnt * 32)); - - bytes_to_read = bytes_to_read - 4; - read_cnt++; - } - /* - // windows compiler don't like this - int space_needed = snprintf(nullptr, 0, cur_fmt.c_str(), val); - char buf[space_needed + 1]; - sprintf(buf, cur_fmt.c_str(), val); - */ - char buf[1024] = {0}; - snprintf(buf, sizeof(buf), cur_fmt.c_str(), val); - buf[sizeof(buf) - 1] = '\0'; - result.append(buf); - } - state = 0; - }else if(*c == 'h'){ - // allegrex calling convention is 4 bytes aligned - bytes_to_read = 4; - }else if(*c == 'l'){ - bytes_to_read = bytes_to_read + 4; - } - } - } - - // if a small buffer was allocated by the program, we will likely crash - strcpy((char *)Memory::GetPointerUnchecked(dst), result.c_str()); - return result.length(); - } else { + if (!Memory::IsValidAddress(dst) || !Memory::IsValidAddress(fmt)) { // What to do? Crash, probably. return 0; } + + DEBUG_LOG(SCEKERNEL, "sysclib_sprintf fmt: %s", Memory::GetCharPointerUnchecked(fmt)); + DEBUG_LOG(SCEKERNEL, "sysclib_sprintf a0-a4, t0-t4: 0x%08x 0x%08x 0x%08x 0x%08x 0x%08x 0x%08x 0x%08x 0x%08x", + currentMIPS->r[MIPS_REG_A0], + currentMIPS->r[MIPS_REG_A1], + currentMIPS->r[MIPS_REG_A2], + currentMIPS->r[MIPS_REG_A3], + currentMIPS->r[MIPS_REG_T0], + currentMIPS->r[MIPS_REG_T1], + currentMIPS->r[MIPS_REG_T2], + currentMIPS->r[MIPS_REG_T3] + ); + + bool processing_specifier = false; + std::string specifier = ""; + int bytes_to_read = 0; + int arg_idx = 0; + int fmt_len = 0; + std::string result = ""; + for (const char *c = Memory::GetCharPointerUnchecked(fmt); *c != '\0'; c++) { + // in case we have a bad fmt string, try not to crash the whole emulator + fmt_len++; + if (fmt_len == 1024) { + ERROR_LOG(SCEKERNEL, "sysclib_sprintf fmt is longer than 1024"); + return 0; + } + + if (!processing_specifier) { + if (*c == '%') { + specifier = "%"; + processing_specifier = true; + bytes_to_read = 0; + } else { + result.append(1, *c); + } + } else { + specifier.append(1, *c); + + // going by https://cplusplus.com/reference/cstdio/printf/#compatibility + // no idea what the kernel module really supports as of writing this + switch (*c) { + case '%': + { + result.append(specifier); + processing_specifier = false; + break; + } + case 's': + { + // consume 4 bytes from arguments + u32 val = 0; + if (arg_idx <= 1) { + val = currentMIPS->r[MIPS_REG_A2 + arg_idx]; + } else if(arg_idx <= 5) { + val = currentMIPS->r[MIPS_REG_T0 + arg_idx - 2]; + } else { + int stack_idx = arg_idx - 6; + u32 stack_cur = currentMIPS->r[MIPS_REG_SP] + stack_idx * 4; + + if (!Memory::IsValidAddress(stack_cur)) { + ERROR_LOG(SCEKERNEL, "sysclib_sprintf bad stack pointer %08x", stack_cur); + return 0; + } + val = Memory::Read_U32(stack_cur); + DEBUG_LOG(SCEKERNEL, "sysclib_sprintf fetching %08x from sp + %u", val, stack_idx * 4); + } + arg_idx++; + + if (!Memory::IsValidAddress(val)) { + ERROR_LOG(SCEKERNEL, "sysclib_sprintf bad string reference %08x", val); + return 0; + } + + const char *str = Memory::GetCharPointerUnchecked(val); + // limit the string length and hope that we don't crash on a bad string reference + char buf[1024] = {0}; + strncpy(buf, str, sizeof(buf)); + buf[sizeof(buf) - 1] = '\0'; + result.append(buf); + processing_specifier = false; + break; + } + case 'd': + case 'i': + case 'u': + case 'o': + case 'x': + case 'X': + case 'f': + case 'e': + case 'E': + case 'g': + case 'G': + case 'c': + case 'p': + case 'n': + { + u64 val = 0; + if (bytes_to_read == 0) { + bytes_to_read = 4; + } + int read_cnt = 0; + while (bytes_to_read != 0) { + u32 val_from_arg = 0; + if (arg_idx <= 1) { + val_from_arg = currentMIPS->r[MIPS_REG_A2 + arg_idx]; + } else if (arg_idx <= 5) { + val_from_arg = currentMIPS->r[MIPS_REG_T0 + arg_idx - 2]; + } else { + int stack_idx = arg_idx - 6; + u32 stack_cur = currentMIPS->r[MIPS_REG_SP] + stack_idx * 4; + + if (!Memory::IsValidAddress(stack_cur)) { + ERROR_LOG(SCEKERNEL, "sysclib_sprintf bad stack pointer %08x", stack_cur); + return 0; + } + val_from_arg = Memory::Read_U32(stack_cur); + DEBUG_LOG(SCEKERNEL, "sysclib_sprintf fetching %08x from sp + %u", val_from_arg, stack_idx * 4); + } + arg_idx++; + + val = val | ((u64)val_from_arg << (read_cnt * 32)); + + bytes_to_read = bytes_to_read - 4; + read_cnt++; + } + char buf[1024] = {0}; + snprintf(buf, sizeof(buf), specifier.c_str(), val); + buf[sizeof(buf) - 1] = '\0'; + result.append(buf); + processing_specifier = false; + break; + } + case 'h': + { + // allegrex calling convention is 4 bytes aligned + bytes_to_read = 4; + break; + } + case 'l': + { + bytes_to_read = bytes_to_read + 4; + break; + } + } + } + } + + // if a small buffer was allocated by the program, we will likely crash + strcpy((char *)Memory::GetPointerUnchecked(dst), result.c_str()); + return result.length(); } static u32 sysclib_memset(u32 destAddr, int data, int size) { From 93c32e1e8db5626bdd02c38656ea6b37e9af693b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Wed, 1 May 2024 12:28:08 +0200 Subject: [PATCH 185/719] Add missing include to get_bits.h --- ext/at3_standalone/get_bits.h | 1 + 1 file changed, 1 insertion(+) diff --git a/ext/at3_standalone/get_bits.h b/ext/at3_standalone/get_bits.h index 1be9576cd4..4cc1178889 100644 --- a/ext/at3_standalone/get_bits.h +++ b/ext/at3_standalone/get_bits.h @@ -20,6 +20,7 @@ #pragma once #include +#include #include "compat.h" #include "intreadwrite.h" From 9745fa813fc2d84891e84accea6b2d4448a3ecfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Tue, 30 Apr 2024 00:57:46 +0200 Subject: [PATCH 186/719] Delete some unused code --- ext/at3_standalone/fft.cpp | 1 - ext/at3_standalone/mathematics.cpp | 189 ----------------------- ext/at3_standalone/mathematics.h | 235 ----------------------------- ext/rcheevos | 2 +- 4 files changed, 1 insertion(+), 426 deletions(-) diff --git a/ext/at3_standalone/fft.cpp b/ext/at3_standalone/fft.cpp index 184275f870..1e5536fe59 100644 --- a/ext/at3_standalone/fft.cpp +++ b/ext/at3_standalone/fft.cpp @@ -37,7 +37,6 @@ void imdct_calc(FFTContext *s, FFTSample *output, const FFTSample *input); void imdct_half(FFTContext *s, FFTSample *output, const FFTSample *input); -void mdct_calc(FFTContext *s, FFTSample *output, const FFTSample *input); /* cos(2*pi*x/n) for 0<=x<=n/4, followed by its reverse */ COSTABLE(16); diff --git a/ext/at3_standalone/mathematics.cpp b/ext/at3_standalone/mathematics.cpp index 5d56b27fda..44efb6f18b 100644 --- a/ext/at3_standalone/mathematics.cpp +++ b/ext/at3_standalone/mathematics.cpp @@ -29,183 +29,6 @@ #include "mathematics.h" #include "compat.h" -/* Stein's binary GCD algorithm: - * https://en.wikipedia.org/wiki/Binary_GCD_algorithm */ -int64_t av_gcd(int64_t a, int64_t b) { - int za, zb, k; - int64_t u, v; - if (a == 0) - return b; - if (b == 0) - return a; - za = ff_ctzll(a); - zb = ff_ctzll(b); - k = FFMIN(za, zb); - u = llabs(a >> za); - v = llabs(b >> zb); - while (u != v) { - if (u > v) - FFSWAP(int64_t, v, u); - v -= u; - v >>= ff_ctzll(v); - } - return (uint64_t)u << k; -} - -int64_t av_rescale_rnd(int64_t a, int64_t b, int64_t c, AVRounding rnd) -{ - int64_t r = 0; - av_assert2(c > 0); - av_assert2(b >=0); - av_assert2((unsigned)(rnd&~AV_ROUND_PASS_MINMAX)<=5 && (rnd&~AV_ROUND_PASS_MINMAX)!=4); - - if (c <= 0 || b < 0 || !((unsigned)(rnd&~AV_ROUND_PASS_MINMAX)<=5 && (rnd&~AV_ROUND_PASS_MINMAX)!=4)) - return INT64_MIN; - - if (rnd & AV_ROUND_PASS_MINMAX) { - if (a == INT64_MIN || a == INT64_MAX) - return a; - rnd = (AVRounding)(rnd - AV_ROUND_PASS_MINMAX); - } - - if (a < 0) - return -(uint64_t)av_rescale_rnd(-FFMAX(a, -INT64_MAX), b, c, (AVRounding)((int)rnd ^ (((int)rnd >> 1) & 1))); - - if (rnd == AV_ROUND_NEAR_INF) - r = c / 2; - else if (rnd & 1) - r = c - 1; - - if (b <= INT_MAX && c <= INT_MAX) { - if (a <= INT_MAX) - return (a * b + r) / c; - else { - int64_t ad = a / c; - int64_t a2 = (a % c * b + r) / c; - if (ad >= INT32_MAX && b && ad > (INT64_MAX - a2) / b) - return INT64_MIN; - return ad * b + a2; - } - } else { -#if 1 - uint64_t a0 = a & 0xFFFFFFFF; - uint64_t a1 = a >> 32; - uint64_t b0 = b & 0xFFFFFFFF; - uint64_t b1 = b >> 32; - uint64_t t1 = a0 * b1 + a1 * b0; - uint64_t t1a = t1 << 32; - int i; - - a0 = a0 * b0 + t1a; - a1 = a1 * b1 + (t1 >> 32) + (a0 < t1a); - a0 += r; - a1 += (int64_t)a0 < r; - - for (i = 63; i >= 0; i--) { - a1 += a1 + ((a0 >> i) & 1); - t1 += t1; - if (c <= (int64_t)a1) { - a1 -= c; - t1++; - } - } - if (t1 > INT64_MAX) - return INT64_MIN; - return t1; - } -#else - AVInteger ai; - ai = av_mul_i(av_int2i(a), av_int2i(b)); - ai = av_add_i(ai, av_int2i(r)); - - return av_i2int(av_div_i(ai, av_int2i(c))); - } -#endif -} - -int64_t av_rescale(int64_t a, int64_t b, int64_t c) -{ - return av_rescale_rnd(a, b, c, AV_ROUND_NEAR_INF); -} - -int64_t av_rescale_q_rnd(int64_t a, AVRational bq, AVRational cq, AVRounding rnd) -{ - int64_t b = bq.num * (int64_t)cq.den; - int64_t c = cq.num * (int64_t)bq.den; - return av_rescale_rnd(a, b, c, rnd); -} - -int64_t av_rescale_q(int64_t a, AVRational bq, AVRational cq) -{ - return av_rescale_q_rnd(a, bq, cq, AV_ROUND_NEAR_INF); -} - -int av_reduce(int *dst_num, int *dst_den, - int64_t num, int64_t den, int64_t max) -{ - AVRational a0 = { 0, 1 }, a1 = { 1, 0 }; - int sign = (num < 0) ^ (den < 0); - int64_t gcd = av_gcd(FFABS(num), FFABS(den)); - - if (gcd) { - num = FFABS(num) / gcd; - den = FFABS(den) / gcd; - } - if (num <= max && den <= max) { - a1 = AVRational{ (int)num, (int)den }; - den = 0; - } - - while (den) { - uint64_t x = num / den; - int64_t next_den = num - den * x; - int64_t a2n = x * a1.num + a0.num; - int64_t a2d = x * a1.den + a0.den; - - if (a2n > max || a2d > max) { - if (a1.num) x = (max - a0.num) / a1.num; - if (a1.den) x = FFMIN(x, (max - a0.den) / a1.den); - - if (den * (2 * x * a1.den + a0.den) > num * a1.den) - a1 = AVRational{(int)(x * a1.num + a0.num), (int)(x * a1.den + a0.den) }; - break; - } - - a0 = a1; - a1 = AVRational{(int)a2n, (int)a2d }; - num = den; - den = next_den; - } - av_assert2(av_gcd(a1.num, a1.den) <= 1U); - av_assert2(a1.num <= max && a1.den <= max); - - *dst_num = sign ? -a1.num : a1.num; - *dst_den = a1.den; - - return den == 0; -} - -AVRational av_mul_q(AVRational b, AVRational c) -{ - av_reduce(&b.num, &b.den, - b.num * (int64_t)c.num, - b.den * (int64_t)c.den, INT_MAX); - return b; -} - -AVRational av_div_q(AVRational b, AVRational c) -{ - return av_mul_q(b, AVRational { c.den, c.num }); -} - -AVRational av_add_q(AVRational b, AVRational c) { - av_reduce(&b.num, &b.den, - b.num * (int64_t)c.den + - c.num * (int64_t)b.den, - b.den * (int64_t)c.den, INT_MAX); - return b; -} - static const uint8_t ff_logg2_tab[256] = { 0,0,1,1,2,2,2,2,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4, 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5, @@ -232,15 +55,3 @@ int av_log2(unsigned int v) return n; } - -int av_log2_16bit(unsigned int v) -{ - int n = 0; - if (v & 0xff00) { - v >>= 8; - n += 8; - } - n += ff_logg2_tab[v]; - - return n; -} diff --git a/ext/at3_standalone/mathematics.h b/ext/at3_standalone/mathematics.h index 6ebe8226da..6a0ac4882d 100644 --- a/ext/at3_standalone/mathematics.h +++ b/ext/at3_standalone/mathematics.h @@ -26,75 +26,7 @@ #include "compat.h" - -#if HAVE_FAST_CLZ -#if AV_GCC_VERSION_AT_LEAST(3,4) -#ifndef ff_log2 -# define ff_log2(x) (31 - __builtin_clz((x)|1)) -# ifndef ff_log2_16bit -# define ff_log2_16bit av_log2 -# endif -#endif /* ff_log2 */ -#endif /* AV_GCC_VERSION_AT_LEAST(3,4) */ -#endif - int av_log2(unsigned int v); -int av_log2_16bit(unsigned int v); - -/** - * @addtogroup lavu_math - * @{ - */ - -#if HAVE_FAST_CLZ -#if AV_GCC_VERSION_AT_LEAST(3,4) -#ifndef ff_ctz -#define ff_ctz(v) __builtin_ctz(v) -#endif -#ifndef ff_ctzll -#define ff_ctzll(v) __builtin_ctzll(v) -#endif -#ifndef ff_clz -#define ff_clz(v) __builtin_clz(v) -#endif -#endif -#endif - -#ifndef ff_ctz -#define ff_ctz ff_ctz_c - /** - * Trailing zero bit count. - * - * @param v input value. If v is 0, the result is undefined. - * @return the number of trailing 0-bits - */ - /* We use the De-Bruijn method outlined in: - * http://supertech.csail.mit.edu/papers/debruijn.pdf. */ -static inline int ff_ctz_c(int v) -{ - static const uint8_t debruijn_ctz32[32] = { - 0, 1, 28, 2, 29, 14, 24, 3, 30, 22, 20, 15, 25, 17, 4, 8, - 31, 27, 13, 23, 21, 19, 16, 7, 26, 12, 18, 6, 11, 5, 10, 9 - }; - return debruijn_ctz32[(uint32_t)((v & -v) * 0x077CB531U) >> 27]; -} -#endif - -#ifndef ff_ctzll -#define ff_ctzll ff_ctzll_c -/* We use the De-Bruijn method outlined in: - * http://supertech.csail.mit.edu/papers/debruijn.pdf. */ -static inline int ff_ctzll_c(long long v) -{ - static const uint8_t debruijn_ctz64[64] = { - 0, 1, 2, 53, 3, 7, 54, 27, 4, 38, 41, 8, 34, 55, 48, 28, - 62, 5, 39, 46, 44, 42, 22, 9, 24, 35, 59, 56, 49, 18, 29, 11, - 63, 52, 6, 26, 37, 40, 33, 47, 61, 45, 43, 21, 23, 58, 17, 10, - 51, 25, 36, 32, 60, 20, 57, 16, 50, 31, 19, 15, 30, 14, 13, 12 - }; - return debruijn_ctz64[(uint64_t)((v & -v) * 0x022FDD63CC95386DU) >> 58]; -} -#endif static inline int sign_extend(int val, unsigned bits) { @@ -134,149 +66,6 @@ static inline unsigned zero_extend(unsigned val, unsigned bits) #ifndef M_SQRT2 #define M_SQRT2 1.41421356237309504880 /* sqrt(2) */ #endif - -/** - * @addtogroup lavu_math - * @{ - */ - -enum AVRounding { - AV_ROUND_ZERO = 0, ///< Round toward zero. - AV_ROUND_INF = 1, ///< Round away from zero. - AV_ROUND_DOWN = 2, ///< Round toward -infinity. - AV_ROUND_UP = 3, ///< Round toward +infinity. - AV_ROUND_NEAR_INF = 5, ///< Round to nearest and halfway cases away from zero. - AV_ROUND_PASS_MINMAX = 8192, ///< Flag to pass INT64_MIN/MAX through instead of rescaling, this avoids special cases for AV_NOPTS_VALUE -}; - -/** - * rational number numerator/denominator - */ -typedef struct AVRational { - int num; ///< numerator - int den; ///< denominator -} AVRational; - -/** - * Compute the greatest common divisor of a and b. - * - * @return gcd of a and b up to sign; if a >= 0 and b >= 0, return value is >= 0; - * if a == 0 and b == 0, returns 0. - */ -int64_t av_gcd(int64_t a, int64_t b); - -/** - * Rescale a 64-bit integer with rounding to nearest. - * A simple a*b/c isn't possible as it can overflow. - */ -int64_t av_rescale(int64_t a, int64_t b, int64_t c); - -/** - * Rescale a 64-bit integer with specified rounding. - * A simple a*b/c isn't possible as it can overflow. - * - * @return rescaled value a, or if AV_ROUND_PASS_MINMAX is set and a is - * INT64_MIN or INT64_MAX then a is passed through unchanged. - */ -int64_t av_rescale_rnd(int64_t a, int64_t b, int64_t c, AVRounding); - -/** - * Rescale a 64-bit integer by 2 rational numbers. - */ -int64_t av_rescale_q(int64_t a, AVRational bq, AVRational cq); - -/** - * Rescale a 64-bit integer by 2 rational numbers with specified rounding. - * - * @return rescaled value a, or if AV_ROUND_PASS_MINMAX is set and a is - * INT64_MIN or INT64_MAX then a is passed through unchanged. - */ -int64_t av_rescale_q_rnd(int64_t a, AVRational bq, AVRational cq, AVRounding); - - -/** - * Create a rational. - * Useful for compilers that do not support compound literals. - * @note The return value is not reduced. - */ -static inline AVRational av_make_q(int num, int den) -{ - AVRational r = { num, den }; - return r; -} - -/** - * Compare two rationals. - * @param a first rational - * @param b second rational - * @return 0 if a==b, 1 if a>b, -1 if a> 63) | 1; - else if (b.den && a.den) return 0; - else if (a.num && b.num) return (a.num >> 31) - (b.num >> 31); - else return INT_MIN; -} - -/** - * Convert rational to double. - * @param a rational to convert - * @return (double) a - */ -static inline double av_q2d(AVRational a) { - return a.num / (double)a.den; -} - -/** - * Reduce a fraction. - * This is useful for framerate calculations. - * @param dst_num destination numerator - * @param dst_den destination denominator - * @param num source numerator - * @param den source denominator - * @param max the maximum allowed for dst_num & dst_den - * @return 1 if exact, 0 otherwise - */ -int av_reduce(int *dst_num, int *dst_den, int64_t num, int64_t den, int64_t max); - -/** - * Multiply two rationals. - * @param b first rational - * @param c second rational - * @return b*c - */ -AVRational av_mul_q(AVRational b, AVRational c); - -/** - * Divide one rational by another. - * @param b first rational - * @param c second rational - * @return b/c - */ -AVRational av_div_q(AVRational b, AVRational c); - -/** - * Add two rationals. - * @param b first rational - * @param c second rational - * @return b+c - */ -AVRational av_add_q(AVRational b, AVRational c); - -/** - * Invert a rational. - * @param q value - * @return 1 / q - */ -static inline AVRational av_inv_q(AVRational q) -{ - AVRational r = { q.den, q.num }; - return r; -} - /** * Clear high bits from an unsigned integer starting with specific bit position * @param a value to clip @@ -287,27 +76,3 @@ static inline unsigned av_mod_uintp2(unsigned a, unsigned p) { return a & ((1 << p) - 1); } - -/** - * Count number of bits set to one in x - * @param x value to count bits of - * @return the number of bits set to one in x - */ -static inline int av_popcount(uint32_t x) -{ - x -= (x >> 1) & 0x55555555; - x = (x & 0x33333333) + ((x >> 2) & 0x33333333); - x = (x + (x >> 4)) & 0x0F0F0F0F; - x += x >> 8; - return (x + (x >> 16)) & 0x3F; -} - -/** - * Count number of bits set to one in x - * @param x value to count bits of - * @return the number of bits set to one in x - */ -static inline int av_popcount64(uint64_t x) -{ - return av_popcount((uint32_t)x) + av_popcount((uint32_t)(x >> 32)); -} diff --git a/ext/rcheevos b/ext/rcheevos index a6cdbb4a52..e88f749925 160000 --- a/ext/rcheevos +++ b/ext/rcheevos @@ -1 +1 @@ -Subproject commit a6cdbb4a529d85b74777597fcff037dde7bef66b +Subproject commit e88f74992527b9ade48ae1591378ec2cf363bef9 From e010f8fcc3cf1e77d3825296ef15b9e896afd798 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Tue, 30 Apr 2024 00:59:22 +0200 Subject: [PATCH 187/719] Remove generated code for very large FFTs (unused) --- ext/at3_standalone/fft.cpp | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/ext/at3_standalone/fft.cpp b/ext/at3_standalone/fft.cpp index 1e5536fe59..b5a5d88ebd 100644 --- a/ext/at3_standalone/fft.cpp +++ b/ext/at3_standalone/fft.cpp @@ -297,20 +297,12 @@ DECL_FFT(512,256,128) #define pass pass_big #endif DECL_FFT(1024,512,256) -DECL_FFT(2048,1024,512) -DECL_FFT(4096,2048,1024) -DECL_FFT(8192,4096,2048) -DECL_FFT(16384,8192,4096) -DECL_FFT(32768,16384,8192) -DECL_FFT(65536,32768,16384) static void (* const fft_dispatch[])(FFTComplex*) = { fft4, fft8, fft16, fft32, fft64, fft128, fft256, fft512, fft1024, - fft2048, fft4096, fft8192, fft16384, fft32768, fft65536, }; -void fft_calc(FFTContext *s, FFTComplex *z) -{ +void fft_calc(FFTContext *s, FFTComplex *z) { fft_dispatch[s->nbits-2](z); } From 50bb07a6f58fb5c1e29c8d7ec219cd618ce1f312 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Tue, 30 Apr 2024 01:01:25 +0200 Subject: [PATCH 188/719] Minor optimization --- ext/at3_standalone/fft.cpp | 47 -------------------------------------- ext/at3_standalone/fft.h | 1 - 2 files changed, 48 deletions(-) diff --git a/ext/at3_standalone/fft.cpp b/ext/at3_standalone/fft.cpp index b5a5d88ebd..2201901c32 100644 --- a/ext/at3_standalone/fft.cpp +++ b/ext/at3_standalone/fft.cpp @@ -425,53 +425,6 @@ void imdct_calc(FFTContext *s, FFTSample *output, const FFTSample *input) } } -/** - * Compute MDCT of size N = 2^nbits - * @param input N samples - * @param out N/2 samples - */ -void mdct_calc(FFTContext *s, FFTSample *out, const FFTSample *input) -{ - int i, j, n, n8, n4, n2, n3; - FFTDouble re, im; - const uint16_t *revtab = s->revtab; - const FFTSample *tcos = s->tcos; - const FFTSample *tsin = s->tsin; - FFTComplex *x = (FFTComplex *)out; - - n = 1 << s->mdct_bits; - n2 = n >> 1; - n4 = n >> 2; - n8 = n >> 3; - n3 = 3 * n4; - - /* pre rotation */ - for (i = 0; i < n8; i++) { - re = (-input[2 * i + n3] - input[n3 - 1 - 2 * i]); - im = (-input[n4 + 2 * i] + input[n4 - 1 - 2 * i]); - j = revtab[i]; - CMUL(x[j].re, x[j].im, re, im, -tcos[i], tsin[i]); - - re = (input[2 * i] - input[n2 - 1 - 2 * i]); - im = (-input[n2 + 2 * i] - input[n - 1 - 2 * i]); - j = revtab[n8 + i]; - CMUL(x[j].re, x[j].im, re, im, -tcos[n8 + i], tsin[n8 + i]); - } - - fft_calc(s, x); - - /* post rotation */ - for (i = 0; i < n8; i++) { - FFTSample r0, i0, r1, i1; - CMUL(i1, r0, x[n8 - i - 1].re, x[n8 - i - 1].im, -tsin[n8 - i - 1], -tcos[n8 - i - 1]); - CMUL(i0, r1, x[n8 + i].re, x[n8 + i].im, -tsin[n8 + i], -tcos[n8 + i]); - x[n8 - i - 1].re = r0; - x[n8 - i - 1].im = i0; - x[n8 + i].re = r1; - x[n8 + i].im = i1; - } -} - void ff_mdct_end(FFTContext *s) { av_freep(&s->tcos); diff --git a/ext/at3_standalone/fft.h b/ext/at3_standalone/fft.h index d4dfd940ec..c3d1952f3d 100644 --- a/ext/at3_standalone/fft.h +++ b/ext/at3_standalone/fft.h @@ -72,7 +72,6 @@ void fft_permute(struct FFTContext *s, FFTComplex *z); void fft_calc(struct FFTContext *s, FFTComplex *z); void imdct_calc(struct FFTContext *s, FFTSample *output, const FFTSample *input); void imdct_half(struct FFTContext *s, FFTSample *output, const FFTSample *input); -void mdct_calc(struct FFTContext *s, FFTSample *output, const FFTSample *input); #define COSTABLE(size) \ DECLARE_ALIGNED(32, FFTSample, av_cos_##size)[size/2] From c6502155ab88957c5bcf65ce6a9d3d8bf542eac7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Wed, 1 May 2024 11:56:24 +0200 Subject: [PATCH 189/719] Delete mathematics.cpp/h --- Common/Common.vcxproj | 2 - Common/Common.vcxproj.filters | 6 -- UWP/CommonUWP/CommonUWP.vcxproj | 4 +- UWP/CommonUWP/CommonUWP.vcxproj.filters | 8 +-- android/jni/Android.mk | 1 - ext/at3_standalone/CMakeLists.txt | 1 - ext/at3_standalone/atrac3plus.cpp | 39 ++++++++++++- ext/at3_standalone/atrac3plusdsp.cpp | 1 + ext/at3_standalone/fft.cpp | 23 +------- ext/at3_standalone/float_dsp.cpp | 8 +-- ext/at3_standalone/float_dsp.h | 17 ------ ext/at3_standalone/get_bits.cpp | 1 - ext/at3_standalone/get_bits.h | 21 ++++++- ext/at3_standalone/mathematics.cpp | 57 ------------------ ext/at3_standalone/mathematics.h | 78 ------------------------- libretro/Makefile.common | 1 - 16 files changed, 65 insertions(+), 203 deletions(-) delete mode 100644 ext/at3_standalone/mathematics.cpp delete mode 100644 ext/at3_standalone/mathematics.h diff --git a/Common/Common.vcxproj b/Common/Common.vcxproj index 17e2d3ab13..8745044801 100644 --- a/Common/Common.vcxproj +++ b/Common/Common.vcxproj @@ -395,7 +395,6 @@ - @@ -606,7 +605,6 @@ - diff --git a/Common/Common.vcxproj.filters b/Common/Common.vcxproj.filters index 2940bc7f88..50f2086669 100644 --- a/Common/Common.vcxproj.filters +++ b/Common/Common.vcxproj.filters @@ -551,9 +551,6 @@ ext\at3_standalone - - ext\at3_standalone - ext\at3_standalone @@ -1044,9 +1041,6 @@ ext\at3_standalone - - ext\at3_standalone - ext\at3_standalone diff --git a/UWP/CommonUWP/CommonUWP.vcxproj b/UWP/CommonUWP/CommonUWP.vcxproj index fcaeb8cc3f..4939854018 100644 --- a/UWP/CommonUWP/CommonUWP.vcxproj +++ b/UWP/CommonUWP/CommonUWP.vcxproj @@ -251,7 +251,6 @@ - @@ -404,7 +403,6 @@ - @@ -456,4 +454,4 @@ - \ No newline at end of file + diff --git a/UWP/CommonUWP/CommonUWP.vcxproj.filters b/UWP/CommonUWP/CommonUWP.vcxproj.filters index 0855ecae23..bea74ab0cc 100644 --- a/UWP/CommonUWP/CommonUWP.vcxproj.filters +++ b/UWP/CommonUWP/CommonUWP.vcxproj.filters @@ -492,9 +492,6 @@ ext\at3_standalone - - ext\at3_standalone - ext\at3_standalone @@ -949,9 +946,6 @@ ext\at3_standalone - - ext\at3_standalone - ext\at3_standalone @@ -1006,4 +1000,4 @@ ext\at3_standalone - \ No newline at end of file + diff --git a/android/jni/Android.mk b/android/jni/Android.mk index cfc31293e8..f6ddf4100e 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -122,7 +122,6 @@ AT3_STANDALONE_FILES := \ ${SRC}/ext/at3_standalone/compat.cpp \ ${SRC}/ext/at3_standalone/fft.cpp \ ${SRC}/ext/at3_standalone/float_dsp.cpp \ - ${SRC}/ext/at3_standalone/mathematics.cpp \ ${SRC}/ext/at3_standalone/mem.cpp \ ${SRC}/ext/at3_standalone/sinewin.cpp diff --git a/ext/at3_standalone/CMakeLists.txt b/ext/at3_standalone/CMakeLists.txt index 8c5ab175e2..e9c5452b13 100644 --- a/ext/at3_standalone/CMakeLists.txt +++ b/ext/at3_standalone/CMakeLists.txt @@ -15,7 +15,6 @@ set(ALL_SOURCE_FILES ${SRC_DIR}/compat.cpp ${SRC_DIR}/fft.cpp ${SRC_DIR}/float_dsp.cpp - ${SRC_DIR}/mathematics.cpp ${SRC_DIR}/mem.cpp ${SRC_DIR}/sinewin.cpp ) diff --git a/ext/at3_standalone/atrac3plus.cpp b/ext/at3_standalone/atrac3plus.cpp index d5add102c8..01a5fbe801 100644 --- a/ext/at3_standalone/atrac3plus.cpp +++ b/ext/at3_standalone/atrac3plus.cpp @@ -28,7 +28,6 @@ #include #include -#include "mathematics.h" #include "get_bits.h" #include "atrac3plus.h" #include "atrac3plus_data.h" @@ -41,6 +40,34 @@ static VLC spec_vlc_tabs[112]; static VLC gain_vlc_tabs[11]; static VLC tone_vlc_tabs[7]; +static const uint8_t ff_logg2_tab[256] = { + 0,0,1,1,2,2,2,2,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4, + 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5, + 6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6, + 6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6, + 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, + 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, + 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, + 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7 +}; + +// todo: Replace with clz type instructions. +int av_log2(unsigned int v) +{ + int n = 0; + if (v & 0xffff0000) { + v >>= 16; + n += 16; + } + if (v & 0xff00) { + v >>= 8; + n += 8; + } + n += ff_logg2_tab[v]; + + return n; +} + /** * Generate canonical VLC table from given descriptor. * @@ -788,6 +815,16 @@ static int decode_code_table_indexes(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, return 0; } +/** + * Clear high bits from an unsigned integer starting with specific bit position + * @param a value to clip + * @param p bit position to clip at + * @return clipped value + */ +inline unsigned av_mod_uintp2(unsigned a, unsigned p) { + return a & ((1 << p) - 1); +} + /** * Decode huffman-coded spectral lines for a given quant unit. * diff --git a/ext/at3_standalone/atrac3plusdsp.cpp b/ext/at3_standalone/atrac3plusdsp.cpp index 004515819c..d7bbd0b792 100644 --- a/ext/at3_standalone/atrac3plusdsp.cpp +++ b/ext/at3_standalone/atrac3plusdsp.cpp @@ -41,6 +41,7 @@ #endif +#define _USE_MATH_DEFINES #include #include diff --git a/ext/at3_standalone/fft.cpp b/ext/at3_standalone/fft.cpp index 2201901c32..fa07c7844a 100644 --- a/ext/at3_standalone/fft.cpp +++ b/ext/at3_standalone/fft.cpp @@ -29,8 +29,10 @@ #include #include +#define _USE_MATH_DEFINES +#include + #include "mem.h" -#include "mathematics.h" #include "fft.h" #define sqrthalf (float)M_SQRT1_2 @@ -70,7 +72,6 @@ static FFTSample * const av_cos_tabs[] = { av_cos_65536, }; -void fft_permute(FFTContext *s, FFTComplex *z); void fft_calc(FFTContext *s, FFTComplex *z); static int split_radix_permutation(int i, int n, int inverse) @@ -146,17 +147,6 @@ int ff_fft_init(FFTContext *s, int nbits, int inverse) return -1; } -void fft_permute(FFTContext *s, FFTComplex *z) -{ - int j, np; - const uint16_t *revtab = s->revtab; - np = 1 << s->nbits; - /* TODO: handle split-radix permute in a more optimal way, probably in-place */ - for(j=0;jtmp_buf[revtab[j]] = z[j]; - memcpy(z, s->tmp_buf, np * sizeof(FFTComplex)); -} - void ff_fft_end(FFTContext *s) { av_freep(&s->revtab); @@ -269,7 +259,6 @@ static void fft8(FFTComplex *z) TRANSFORM(z[1],z[3],z[5],z[7],sqrthalf,sqrthalf); } -#if !CONFIG_SMALL static void fft16(FFTComplex *z) { FFTDouble t1, t2, t3, t4, t5, t6; @@ -285,17 +274,12 @@ static void fft16(FFTComplex *z) TRANSFORM(z[1],z[5],z[9],z[13],cos_16_1,cos_16_3); TRANSFORM(z[3],z[7],z[11],z[15],cos_16_3,cos_16_1); } -#else -DECL_FFT(16,8,4) -#endif DECL_FFT(32,16,8) DECL_FFT(64,32,16) DECL_FFT(128,64,32) DECL_FFT(256,128,64) DECL_FFT(512,256,128) -#if !CONFIG_SMALL #define pass pass_big -#endif DECL_FFT(1024,512,256) static void (* const fft_dispatch[])(FFTComplex*) = { @@ -309,7 +293,6 @@ void fft_calc(FFTContext *s, FFTComplex *z) { #include #include -#include "mathematics.h" #include "fft.h" #include "mem.h" diff --git a/ext/at3_standalone/float_dsp.cpp b/ext/at3_standalone/float_dsp.cpp index 91e78e03e7..75dbdb6918 100644 --- a/ext/at3_standalone/float_dsp.cpp +++ b/ext/at3_standalone/float_dsp.cpp @@ -35,15 +35,9 @@ void vector_fmul_scalar(float *dst, const float *src, float mul, int len) { dst[i] = src[i] * mul; } -void vector_fmul_add(float *dst, const float *src0, const float *src1, const float *src2, int len) { - int i; - for (i = 0; i < len; i++) - dst[i] = src0[i] * src1[i] + src2[i]; -} - void vector_fmul_reverse(float *dst, const float *src0, const float *src1, int len) { int i; - src1 += len-1; + src1 += len - 1; for (i = 0; i < len; i++) dst[i] = src0[i] * src1[-i]; } diff --git a/ext/at3_standalone/float_dsp.h b/ext/at3_standalone/float_dsp.h index 9379c7a7d1..c379dd17ba 100644 --- a/ext/at3_standalone/float_dsp.h +++ b/ext/at3_standalone/float_dsp.h @@ -26,23 +26,6 @@ void vector_fmul(float *dst, const float *src0, const float *src1, int len); */ void vector_fmul_scalar(float *dst, const float *src, float mul, int len); -/** - * Calculate the entry wise product of two vectors of floats, add a third vector of - * floats and store the result in a vector of floats. - * - * @param dst output vector - * constraints: 32-byte aligned - * @param src0 first input vector - * constraints: 32-byte aligned - * @param src1 second input vector - * constraints: 32-byte aligned - * @param src2 third input vector - * constraints: 32-byte aligned - * @param len number of elements in the input - * constraints: multiple of 16 - */ -void vector_fmul_add(float *dst, const float *src0, const float *src1, const float *src2, int len); - /** * Calculate the entry wise product of two vectors of floats, and store the result * in a vector of floats. The second vector of floats is iterated over diff --git a/ext/at3_standalone/get_bits.cpp b/ext/at3_standalone/get_bits.cpp index d7a6da5226..02812a1601 100644 --- a/ext/at3_standalone/get_bits.cpp +++ b/ext/at3_standalone/get_bits.cpp @@ -33,7 +33,6 @@ #include "compat.h" #include "mem.h" -#include "mathematics.h" #include "get_bits.h" static const uint8_t ff_reverse[256] = { diff --git a/ext/at3_standalone/get_bits.h b/ext/at3_standalone/get_bits.h index 4cc1178889..9366026eea 100644 --- a/ext/at3_standalone/get_bits.h +++ b/ext/at3_standalone/get_bits.h @@ -24,7 +24,26 @@ #include "compat.h" #include "intreadwrite.h" -#include "mathematics.h" + +#ifndef NEG_SSR32 +# define NEG_SSR32(a,s) ((( int32_t)(a))>>(32-(s))) +#endif + +#ifndef NEG_USR32 +# define NEG_USR32(a,s) (((uint32_t)(a))>>(32-(s))) +#endif + +static inline unsigned zero_extend(unsigned val, unsigned bits) +{ + return (val << ((8 * sizeof(int)) - bits)) >> ((8 * sizeof(int)) - bits); +} + +static inline int sign_extend(int val, unsigned bits) +{ + unsigned shift = 8 * sizeof(int) - bits; + union { unsigned u; int s; } v = { (unsigned)val << shift }; + return v.s >> shift; +} /* * Safe bitstream reading: diff --git a/ext/at3_standalone/mathematics.cpp b/ext/at3_standalone/mathematics.cpp deleted file mode 100644 index 44efb6f18b..0000000000 --- a/ext/at3_standalone/mathematics.cpp +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright (c) 2005-2012 Michael Niedermayer - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/** - * @file - * miscellaneous math routines and tables - */ - -#include -#include - -#include "mathematics.h" -#include "compat.h" - -static const uint8_t ff_logg2_tab[256] = { - 0,0,1,1,2,2,2,2,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4, - 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5, - 6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6, - 6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6, - 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, - 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, - 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, - 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7 -}; - -int av_log2(unsigned int v) -{ - int n = 0; - if (v & 0xffff0000) { - v >>= 16; - n += 16; - } - if (v & 0xff00) { - v >>= 8; - n += 8; - } - n += ff_logg2_tab[v]; - - return n; -} diff --git a/ext/at3_standalone/mathematics.h b/ext/at3_standalone/mathematics.h deleted file mode 100644 index 6a0ac4882d..0000000000 --- a/ext/at3_standalone/mathematics.h +++ /dev/null @@ -1,78 +0,0 @@ -/* - * copyright (c) 2005-2012 Michael Niedermayer - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#pragma once - -#include -#include -#include - -#include "compat.h" - -int av_log2(unsigned int v); - -static inline int sign_extend(int val, unsigned bits) -{ - unsigned shift = 8 * sizeof(int) - bits; - union { unsigned u; int s; } v = { (unsigned)val << shift }; - return v.s >> shift; -} - -static inline unsigned zero_extend(unsigned val, unsigned bits) -{ - return (val << ((8 * sizeof(int)) - bits)) >> ((8 * sizeof(int)) - bits); -} - -#ifndef NEG_SSR32 -# define NEG_SSR32(a,s) ((( int32_t)(a))>>(32-(s))) -#endif - -#ifndef NEG_USR32 -# define NEG_USR32(a,s) (((uint32_t)(a))>>(32-(s))) -#endif - -#ifndef M_LOG2_10 -#define M_LOG2_10 3.32192809488736234787 /* log_2 10 */ -#endif -#ifndef M_PHI -#define M_PHI 1.61803398874989484820 /* phi / golden ratio */ -#endif -#ifndef M_PI -#define M_PI 3.14159265358979323846 /* pi */ -#endif -#ifndef M_PI_2 -#define M_PI_2 1.57079632679489661923 /* pi/2 */ -#endif -#ifndef M_SQRT1_2 -#define M_SQRT1_2 0.70710678118654752440 /* 1/sqrt(2) */ -#endif -#ifndef M_SQRT2 -#define M_SQRT2 1.41421356237309504880 /* sqrt(2) */ -#endif -/** - * Clear high bits from an unsigned integer starting with specific bit position - * @param a value to clip - * @param p bit position to clip at - * @return clipped value - */ -static inline unsigned av_mod_uintp2(unsigned a, unsigned p) -{ - return a & ((1 << p) - 1); -} diff --git a/libretro/Makefile.common b/libretro/Makefile.common index 47a886af34..7e6a998116 100644 --- a/libretro/Makefile.common +++ b/libretro/Makefile.common @@ -272,7 +272,6 @@ SOURCES_CXX += \ ${EXTDIR}/at3_standalone/compat.cpp \ ${EXTDIR}/at3_standalone/fft.cpp \ ${EXTDIR}/at3_standalone/float_dsp.cpp \ - ${EXTDIR}/at3_standalone/mathematics.cpp \ ${EXTDIR}/at3_standalone/mem.cpp \ ${EXTDIR}/at3_standalone/sinewin.cpp From b6b869ddeec2c61ea733dd9bc07632a96e9f7a7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Wed, 1 May 2024 11:58:53 +0200 Subject: [PATCH 190/719] Remove float_dsp.cpp, inline the functions --- Common/Common.vcxproj | 1 - Common/Common.vcxproj.filters | 3 -- UWP/CommonUWP/CommonUWP.vcxproj | 2 - UWP/CommonUWP/CommonUWP.vcxproj.filters | 6 --- android/jni/Android.mk | 1 - ext/at3_standalone/CMakeLists.txt | 1 - ext/at3_standalone/float_dsp.cpp | 43 --------------------- ext/at3_standalone/float_dsp.h | 51 ++++++++++++++++--------- libretro/Makefile.common | 1 - 9 files changed, 32 insertions(+), 77 deletions(-) delete mode 100644 ext/at3_standalone/float_dsp.cpp diff --git a/Common/Common.vcxproj b/Common/Common.vcxproj index 8745044801..73c7f834ab 100644 --- a/Common/Common.vcxproj +++ b/Common/Common.vcxproj @@ -604,7 +604,6 @@ - diff --git a/Common/Common.vcxproj.filters b/Common/Common.vcxproj.filters index 50f2086669..2fa42ddc7c 100644 --- a/Common/Common.vcxproj.filters +++ b/Common/Common.vcxproj.filters @@ -1029,9 +1029,6 @@ ext\at3_standalone - - ext\at3_standalone - ext\at3_standalone diff --git a/UWP/CommonUWP/CommonUWP.vcxproj b/UWP/CommonUWP/CommonUWP.vcxproj index 4939854018..5d6e99ea6a 100644 --- a/UWP/CommonUWP/CommonUWP.vcxproj +++ b/UWP/CommonUWP/CommonUWP.vcxproj @@ -248,7 +248,6 @@ - @@ -401,7 +400,6 @@ - diff --git a/UWP/CommonUWP/CommonUWP.vcxproj.filters b/UWP/CommonUWP/CommonUWP.vcxproj.filters index bea74ab0cc..1795ce8645 100644 --- a/UWP/CommonUWP/CommonUWP.vcxproj.filters +++ b/UWP/CommonUWP/CommonUWP.vcxproj.filters @@ -486,9 +486,6 @@ ext\at3_standalone - - ext\at3_standalone - ext\at3_standalone @@ -937,9 +934,6 @@ ext\at3_standalone - - ext\at3_standalone - ext\at3_standalone diff --git a/android/jni/Android.mk b/android/jni/Android.mk index f6ddf4100e..838a037439 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -121,7 +121,6 @@ AT3_STANDALONE_FILES := \ ${SRC}/ext/at3_standalone/get_bits.cpp \ ${SRC}/ext/at3_standalone/compat.cpp \ ${SRC}/ext/at3_standalone/fft.cpp \ - ${SRC}/ext/at3_standalone/float_dsp.cpp \ ${SRC}/ext/at3_standalone/mem.cpp \ ${SRC}/ext/at3_standalone/sinewin.cpp diff --git a/ext/at3_standalone/CMakeLists.txt b/ext/at3_standalone/CMakeLists.txt index e9c5452b13..e3b282c5ce 100644 --- a/ext/at3_standalone/CMakeLists.txt +++ b/ext/at3_standalone/CMakeLists.txt @@ -14,7 +14,6 @@ set(ALL_SOURCE_FILES ${SRC_DIR}/get_bits.cpp ${SRC_DIR}/compat.cpp ${SRC_DIR}/fft.cpp - ${SRC_DIR}/float_dsp.cpp ${SRC_DIR}/mem.cpp ${SRC_DIR}/sinewin.cpp ) diff --git a/ext/at3_standalone/float_dsp.cpp b/ext/at3_standalone/float_dsp.cpp deleted file mode 100644 index 75dbdb6918..0000000000 --- a/ext/at3_standalone/float_dsp.cpp +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright 2005 Balatoni Denes - * Copyright 2006 Loren Merritt - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "compat.h" -#include "float_dsp.h" -#include "mem.h" - -void vector_fmul(float *dst, const float *src0, const float *src1, int len) { - int i; - for (i = 0; i < len; i++) - dst[i] = src0[i] * src1[i]; -} - -void vector_fmul_scalar(float *dst, const float *src, float mul, int len) { - int i; - for (i = 0; i < len; i++) - dst[i] = src[i] * mul; -} - -void vector_fmul_reverse(float *dst, const float *src0, const float *src1, int len) { - int i; - src1 += len - 1; - for (i = 0; i < len; i++) - dst[i] = src0[i] * src1[-i]; -} diff --git a/ext/at3_standalone/float_dsp.h b/ext/at3_standalone/float_dsp.h index c379dd17ba..f02764382f 100644 --- a/ext/at3_standalone/float_dsp.h +++ b/ext/at3_standalone/float_dsp.h @@ -18,26 +18,39 @@ #pragma once -void vector_fmul(float *dst, const float *src0, const float *src1, int len); +inline void vector_fmul(float *dst, const float *src0, const float *src1, int len) { + int i; + for (i = 0; i < len; i++) + dst[i] = src0[i] * src1[i]; +} /** - * Multiply a vector of floats by a scalar float. Source and - * destination vectors must overlap exactly or not at all. - */ -void vector_fmul_scalar(float *dst, const float *src, float mul, int len); +* Multiply a vector of floats by a scalar float. Source and +* destination vectors must overlap exactly or not at all. +*/ +inline void vector_fmul_scalar(float *dst, const float *src, float mul, int len) { + int i; + for (i = 0; i < len; i++) + dst[i] = src[i] * mul; +} /** - * Calculate the entry wise product of two vectors of floats, and store the result - * in a vector of floats. The second vector of floats is iterated over - * in reverse order. - * - * @param dst output vector - * constraints: 32-byte aligned - * @param src0 first input vector - * constraints: 32-byte aligned - * @param src1 second input vector - * constraints: 32-byte aligned - * @param len number of elements in the input - * constraints: multiple of 16 - */ -void vector_fmul_reverse(float *dst, const float *src0, const float *src1, int len); +* Calculate the entry wise product of two vectors of floats, and store the result +* in a vector of floats. The second vector of floats is iterated over +* in reverse order. +* +* @param dst output vector +* constraints: 32-byte aligned +* @param src0 first input vector +* constraints: 32-byte aligned +* @param src1 second input vector +* constraints: 32-byte aligned +* @param len number of elements in the input +* constraints: multiple of 16 +*/ +inline void vector_fmul_reverse(float *dst, const float *src0, const float *src1, int len) { + int i; + src1 += len - 1; + for (i = 0; i < len; i++) + dst[i] = src0[i] * src1[-i]; +} diff --git a/libretro/Makefile.common b/libretro/Makefile.common index 7e6a998116..75b51cdef5 100644 --- a/libretro/Makefile.common +++ b/libretro/Makefile.common @@ -271,7 +271,6 @@ SOURCES_CXX += \ ${EXTDIR}/at3_standalone/get_bits.cpp \ ${EXTDIR}/at3_standalone/compat.cpp \ ${EXTDIR}/at3_standalone/fft.cpp \ - ${EXTDIR}/at3_standalone/float_dsp.cpp \ ${EXTDIR}/at3_standalone/mem.cpp \ ${EXTDIR}/at3_standalone/sinewin.cpp From a93bbf39ba3feaaeeff72d04f810da7d8aa817b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Wed, 1 May 2024 12:06:38 +0200 Subject: [PATCH 191/719] Remove sinewin.cpp/h --- Common/Common.vcxproj | 2 - Common/Common.vcxproj.filters | 6 --- UWP/CommonUWP/CommonUWP.vcxproj | 2 - UWP/CommonUWP/CommonUWP.vcxproj.filters | 6 --- android/jni/Android.mk | 3 +- ext/at3_standalone/CMakeLists.txt | 1 - ext/at3_standalone/atrac3plusdsp.cpp | 15 +++++-- ext/at3_standalone/sinewin.cpp | 60 ------------------------- ext/at3_standalone/sinewin.h | 48 -------------------- libretro/Makefile.common | 3 +- 10 files changed, 14 insertions(+), 132 deletions(-) delete mode 100644 ext/at3_standalone/sinewin.cpp delete mode 100644 ext/at3_standalone/sinewin.h diff --git a/Common/Common.vcxproj b/Common/Common.vcxproj index 73c7f834ab..cb78a6ceb6 100644 --- a/Common/Common.vcxproj +++ b/Common/Common.vcxproj @@ -396,7 +396,6 @@ - @@ -605,7 +604,6 @@ - NotUsing diff --git a/Common/Common.vcxproj.filters b/Common/Common.vcxproj.filters index 2fa42ddc7c..e9ea060b0c 100644 --- a/Common/Common.vcxproj.filters +++ b/Common/Common.vcxproj.filters @@ -557,9 +557,6 @@ ext\at3_standalone - - ext\at3_standalone - @@ -1032,9 +1029,6 @@ ext\at3_standalone - - ext\at3_standalone - ext\at3_standalone diff --git a/UWP/CommonUWP/CommonUWP.vcxproj b/UWP/CommonUWP/CommonUWP.vcxproj index 5d6e99ea6a..b7bf692fbf 100644 --- a/UWP/CommonUWP/CommonUWP.vcxproj +++ b/UWP/CommonUWP/CommonUWP.vcxproj @@ -251,7 +251,6 @@ - @@ -402,7 +401,6 @@ - diff --git a/UWP/CommonUWP/CommonUWP.vcxproj.filters b/UWP/CommonUWP/CommonUWP.vcxproj.filters index 1795ce8645..183f8f48f0 100644 --- a/UWP/CommonUWP/CommonUWP.vcxproj.filters +++ b/UWP/CommonUWP/CommonUWP.vcxproj.filters @@ -492,9 +492,6 @@ ext\at3_standalone - - ext\at3_standalone - @@ -943,9 +940,6 @@ ext\at3_standalone - - ext\at3_standalone - diff --git a/android/jni/Android.mk b/android/jni/Android.mk index 838a037439..ac949a57ef 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -121,8 +121,7 @@ AT3_STANDALONE_FILES := \ ${SRC}/ext/at3_standalone/get_bits.cpp \ ${SRC}/ext/at3_standalone/compat.cpp \ ${SRC}/ext/at3_standalone/fft.cpp \ - ${SRC}/ext/at3_standalone/mem.cpp \ - ${SRC}/ext/at3_standalone/sinewin.cpp + ${SRC}/ext/at3_standalone/mem.cpp RCHEEVOS_FILES := \ ${SRC}/ext/rcheevos/src/rapi/rc_api_common.c \ diff --git a/ext/at3_standalone/CMakeLists.txt b/ext/at3_standalone/CMakeLists.txt index e3b282c5ce..80a237b3de 100644 --- a/ext/at3_standalone/CMakeLists.txt +++ b/ext/at3_standalone/CMakeLists.txt @@ -15,7 +15,6 @@ set(ALL_SOURCE_FILES ${SRC_DIR}/compat.cpp ${SRC_DIR}/fft.cpp ${SRC_DIR}/mem.cpp - ${SRC_DIR}/sinewin.cpp ) add_library(at3_standalone STATIC ${ALL_SOURCE_FILES}) diff --git a/ext/at3_standalone/atrac3plusdsp.cpp b/ext/at3_standalone/atrac3plusdsp.cpp index d7bbd0b792..1cf345ced6 100644 --- a/ext/at3_standalone/atrac3plusdsp.cpp +++ b/ext/at3_standalone/atrac3plusdsp.cpp @@ -46,7 +46,6 @@ #include #include "float_dsp.h" -#include "sinewin.h" #include "fft.h" #include "atrac3plus.h" @@ -91,12 +90,22 @@ const float av_atrac3p_mant_tab[8] = { 0.035619736 }; +DECLARE_ALIGNED(32, float, av_sine_64)[64]; +DECLARE_ALIGNED(32, float, av_sine_128)[128]; + +// Generate a sine window. +static void ff_sine_window_init(float *window, int n) { + int i; + for (i = 0; i < n; i++) + window[i] = sinf((i + 0.5) * (M_PI / (2.0 * n))); +} + #define ATRAC3P_MDCT_SIZE (ATRAC3P_SUBBAND_SAMPLES * 2) void ff_atrac3p_init_imdct(FFTContext *mdct_ctx) { - ff_init_ff_sine_windows(7); - ff_init_ff_sine_windows(6); + ff_sine_window_init(av_sine_64, 64); + ff_sine_window_init(av_sine_128, 128); /* Initialize the MDCT transform. */ ff_mdct_init(mdct_ctx, 8, 1, -1.0); diff --git a/ext/at3_standalone/sinewin.cpp b/ext/at3_standalone/sinewin.cpp deleted file mode 100644 index 8f75b8b79c..0000000000 --- a/ext/at3_standalone/sinewin.cpp +++ /dev/null @@ -1,60 +0,0 @@ -/* - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#define _USE_MATH_DEFINES -#include - -#include -#include "aac_defines.h" -#include "compat.h" - -#include "mem.h" -#include "aac_defines.h" - -#include "sinewin.h" - -SINETABLE(32); -SINETABLE(64); -SINETABLE(128); -SINETABLE(256); -SINETABLE(512); -SINETABLE(1024); -SINETABLE(2048); -SINETABLE(4096); -SINETABLE(8192); - -// Thie array is only accessed in init. However, not so for the -// sine tables it points to. -static float *av_sine_windows[] = { - NULL, NULL, NULL, NULL, NULL, // unused - av_sine_32, av_sine_64, av_sine_128, - av_sine_256, av_sine_512, av_sine_1024, - av_sine_2048, av_sine_4096, av_sine_8192 -}; - -// Generate a sine window. -void ff_sine_window_init(float *window, int n) { - int i; - for (i = 0; i < n; i++) - window[i] = sinf((i + 0.5) * (M_PI / (2.0 * n))); -} - -void ff_init_ff_sine_windows(int index) { - assert(index >= 0 && index < FF_ARRAY_ELEMS(av_sine_windows)); - ff_sine_window_init(av_sine_windows[index], 1 << index); -} diff --git a/ext/at3_standalone/sinewin.h b/ext/at3_standalone/sinewin.h deleted file mode 100644 index da512bbd1f..0000000000 --- a/ext/at3_standalone/sinewin.h +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (c) 2008 Robert Swain - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#pragma once - -#include "compat.h" - -#define SINETABLE(size) \ - DECLARE_ALIGNED(32, float, av_sine_##size)[size] - - /** - * Generate a sine window. - * @param window pointer to half window - * @param n size of half window - */ -void ff_sine_window_init(float *window, int n); - -/** - * initialize the specified entry of ff_sine_windows - */ -void ff_init_ff_sine_windows(int index); - -extern SINETABLE(32); -extern SINETABLE(64); -extern SINETABLE(128); -extern SINETABLE(256); -extern SINETABLE(512); -extern SINETABLE(1024); -extern SINETABLE(2048); -extern SINETABLE(4096); -extern SINETABLE(8192); diff --git a/libretro/Makefile.common b/libretro/Makefile.common index 75b51cdef5..e91b78e722 100644 --- a/libretro/Makefile.common +++ b/libretro/Makefile.common @@ -271,8 +271,7 @@ SOURCES_CXX += \ ${EXTDIR}/at3_standalone/get_bits.cpp \ ${EXTDIR}/at3_standalone/compat.cpp \ ${EXTDIR}/at3_standalone/fft.cpp \ - ${EXTDIR}/at3_standalone/mem.cpp \ - ${EXTDIR}/at3_standalone/sinewin.cpp + ${EXTDIR}/at3_standalone/mem.cpp ifeq ($(PLATFORM_EXT), android) COREFLAGS += -DHAVE_DLFCN_H From 5536ca4fdadad4d5b289a45d6c9fa6e6b038a964 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Wed, 1 May 2024 12:13:00 +0200 Subject: [PATCH 192/719] Remove more unused code --- ext/at3_standalone/fft.cpp | 12 --- ext/at3_standalone/fft.h | 4 - ext/at3_standalone/get_bits.cpp | 1 - ext/at3_standalone/mem.cpp | 138 +++----------------------------- ext/at3_standalone/mem.h | 73 ----------------- 5 files changed, 12 insertions(+), 216 deletions(-) diff --git a/ext/at3_standalone/fft.cpp b/ext/at3_standalone/fft.cpp index fa07c7844a..2e3d040ace 100644 --- a/ext/at3_standalone/fft.cpp +++ b/ext/at3_standalone/fft.cpp @@ -48,12 +48,6 @@ COSTABLE(128); COSTABLE(256); COSTABLE(512); COSTABLE(1024); -COSTABLE(2048); -COSTABLE(4096); -COSTABLE(8192); -COSTABLE(16384); -COSTABLE(32768); -COSTABLE(65536); static FFTSample * const av_cos_tabs[] = { NULL, NULL, NULL, NULL, @@ -64,12 +58,6 @@ static FFTSample * const av_cos_tabs[] = { av_cos_256, av_cos_512, av_cos_1024, - av_cos_2048, - av_cos_4096, - av_cos_8192, - av_cos_16384, - av_cos_32768, - av_cos_65536, }; void fft_calc(FFTContext *s, FFTComplex *z); diff --git a/ext/at3_standalone/fft.h b/ext/at3_standalone/fft.h index c3d1952f3d..9df03ca19b 100644 --- a/ext/at3_standalone/fft.h +++ b/ext/at3_standalone/fft.h @@ -61,10 +61,6 @@ struct FFTContext { enum mdct_permutation_type mdct_permutation; }; -/** - * Do the permutation needed BEFORE calling fft_calc(). - */ -void fft_permute(struct FFTContext *s, FFTComplex *z); /** * Do a complex FFT with the parameters defined in ff_fft_init(). The * input data must be permuted before. No 1.0/sqrt(n) normalization is done. diff --git a/ext/at3_standalone/get_bits.cpp b/ext/at3_standalone/get_bits.cpp index 02812a1601..4c7725f89b 100644 --- a/ext/at3_standalone/get_bits.cpp +++ b/ext/at3_standalone/get_bits.cpp @@ -318,7 +318,6 @@ int ff_init_vlc_sparse(VLC *vlc_arg, int nb_bits, int nb_codes, return 0; } - void ff_free_vlc(VLC *vlc) { av_freep(&vlc->table); diff --git a/ext/at3_standalone/mem.cpp b/ext/at3_standalone/mem.cpp index b63ebefa0b..4577223662 100644 --- a/ext/at3_standalone/mem.cpp +++ b/ext/at3_standalone/mem.cpp @@ -35,23 +35,19 @@ #include "intreadwrite.h" #include "mem.h" -int ff_fast_malloc(void *ptr, unsigned int *size, size_t min_size, int zero_realloc) + /** + * Multiply two size_t values checking for overflow. + * @return 0 if success, AVERROR(EINVAL) if overflow. + */ +static inline int av_size_mult(size_t a, size_t b, size_t *r) { - void *val; - - memcpy(&val, ptr, sizeof(val)); - if (min_size <= *size) { - av_assert0(val || !min_size); - return 0; - } - min_size = FFMAX(min_size + min_size / 16 + 32, min_size); - av_freep(ptr); - val = zero_realloc ? av_mallocz(min_size) : av_malloc(min_size); - memcpy(ptr, &val, sizeof(val)); - if (!val) - min_size = 0; - *size = (unsigned int)min_size; - return 1; + size_t t = a * b; + /* Hack inspired from glibc: only try the division if nelem and elsize + * are both greater than sqrt(SIZE_MAX). */ + if ((a | b) >= ((size_t)1 << (sizeof(size_t) * 4)) && a && t / a != b) + return AVERROR(EINVAL); + *r = t; + return 0; } #define ALIGN (HAVE_AVX ? 32 : 16) @@ -87,13 +83,6 @@ void *av_realloc_f(void *ptr, size_t nelem, size_t elsize) return r; } -void *av_realloc_array(void *ptr, size_t nmemb, size_t size) -{ - if (!size || nmemb >= INT_MAX / size) - return NULL; - return av_realloc(ptr, nmemb * size); -} - void av_free(void *ptr) { free(ptr); @@ -115,106 +104,3 @@ void *av_mallocz(size_t size) memset(ptr, 0, size); return ptr; } - -static void fill16(uint8_t *dst, int len) -{ - uint32_t v = AV_RN16(dst - 2); - - v |= v << 16; - - while (len >= 4) { - AV_WN32(dst, v); - dst += 4; - len -= 4; - } - - while (len--) { - *dst = dst[-2]; - dst++; - } -} - -static void fill24(uint8_t *dst, int len) -{ -#if HAVE_BIGENDIAN - uint32_t v = AV_RB24(dst - 3); - uint32_t a = v << 8 | v >> 16; - uint32_t b = v << 16 | v >> 8; - uint32_t c = v << 24 | v; -#else - uint32_t v = AV_RL24(dst - 3); - uint32_t a = v | v << 24; - uint32_t b = v >> 8 | v << 16; - uint32_t c = v >> 16 | v << 8; -#endif - - while (len >= 12) { - AV_WN32(dst, a); - AV_WN32(dst + 4, b); - AV_WN32(dst + 8, c); - dst += 12; - len -= 12; - } - - if (len >= 4) { - AV_WN32(dst, a); - dst += 4; - len -= 4; - } - - if (len >= 4) { - AV_WN32(dst, b); - dst += 4; - len -= 4; - } - - while (len--) { - *dst = dst[-3]; - dst++; - } -} - -static void fill32(uint8_t *dst, int len) -{ - uint32_t v = AV_RN32(dst - 4); - - while (len >= 4) { - AV_WN32(dst, v); - dst += 4; - len -= 4; - } - - while (len--) { - *dst = dst[-4]; - dst++; - } -} - -void *av_fast_realloc(void *ptr, unsigned int *size, size_t min_size) -{ - if (min_size < *size) - return ptr; - - min_size = FFMAX(min_size + min_size / 16 + 32, min_size); - - ptr = av_realloc(ptr, min_size); - /* we could set this to the unmodified min_size but this is safer - * if the user lost the ptr and uses NULL now - */ - if (!ptr) - min_size = 0; - - *size = (unsigned int)min_size; - - return ptr; -} - -void av_fast_malloc(void *ptr, unsigned int *size, size_t min_size) -{ - ff_fast_malloc(ptr, size, min_size, 0); -} - -void av_fast_mallocz(void *ptr, unsigned int *size, size_t min_size) -{ - ff_fast_malloc(ptr, size, min_size, 1); -} diff --git a/ext/at3_standalone/mem.h b/ext/at3_standalone/mem.h index 1c40cbf5e6..0e01ff92a4 100644 --- a/ext/at3_standalone/mem.h +++ b/ext/at3_standalone/mem.h @@ -27,8 +27,6 @@ #include "compat.h" -#define FF_MEMORY_POISON 0x2a - /** * Allocate a block of size bytes with alignment suitable for all * memory accesses (including vectors if available on the CPU). @@ -70,7 +68,6 @@ static inline void *av_malloc_array(size_t nmemb, size_t size) * pointers from such functions can be passed to realloc() at all. * The situation is undefined according to POSIX and may crash with * some libc implementations. - * @see av_fast_realloc() */ void *av_realloc(void *ptr, size_t size); @@ -84,25 +81,6 @@ void *av_realloc(void *ptr, size_t size); */ void *av_realloc_f(void *ptr, size_t nelem, size_t elsize); -/** - * Allocate or reallocate an array. - * If ptr is NULL and nmemb > 0, allocate a new block. If - * nmemb is zero, free the memory block pointed to by ptr. - * @param ptr Pointer to a memory block already allocated with - * av_realloc() or NULL. - * @param nmemb Number of elements - * @param size Size of the single element - * @return Pointer to a newly-reallocated block or NULL if the block - * cannot be reallocated or the function is used to free the memory block. - * @warning Pointers originating from the av_malloc() family of functions must - * not be passed to av_realloc(). The former can be implemented using - * memalign() (or other functions), and there is no guarantee that - * pointers from such functions can be passed to realloc() at all. - * The situation is undefined according to POSIX and may crash with - * some libc implementations. - */ -void *av_realloc_array(void *ptr, size_t nmemb, size_t size); - /** * Free a memory block which has been allocated with av_malloc(z)() or * av_realloc(). @@ -149,57 +127,6 @@ static inline void *av_mallocz_array(size_t nmemb, size_t size) */ void av_freep(void *ptr); -/** - * Multiply two size_t values checking for overflow. - * @return 0 if success, AVERROR(EINVAL) if overflow. - */ -static inline int av_size_mult(size_t a, size_t b, size_t *r) -{ - size_t t = a * b; - /* Hack inspired from glibc: only try the division if nelem and elsize - * are both greater than sqrt(SIZE_MAX). */ - if ((a | b) >= ((size_t)1 << (sizeof(size_t) * 4)) && a && t / a != b) - return AVERROR(EINVAL); - *r = t; - return 0; -} - -/** - * Reallocate the given block if it is not large enough, otherwise do nothing. - * - * @see av_realloc - */ -void *av_fast_realloc(void *ptr, unsigned int *size, size_t min_size); - -/** - * Allocate a buffer, reusing the given one if large enough. - * - * Contrary to av_fast_realloc the current buffer contents might not be - * preserved and on error the old buffer is freed, thus no special - * handling to avoid memleaks is necessary. - * - * @param ptr pointer to pointer to already allocated buffer, overwritten with pointer to new buffer - * @param size size of the buffer *ptr points to - * @param min_size minimum size of *ptr buffer after returning, *ptr will be NULL and - * *size 0 if an error occurred. - */ -void av_fast_malloc(void *ptr, unsigned int *size, size_t min_size); - -/** - * Allocate a buffer, reusing the given one if large enough. - * - * All newly allocated space is initially cleared - * Contrary to av_fast_realloc the current buffer contents might not be - * preserved and on error the old buffer is freed, thus no special - * handling to avoid memleaks is necessary. - * - * @param ptr pointer to pointer to already allocated buffer, overwritten with pointer to new buffer - * @param size size of the buffer *ptr points to - * @param min_size minimum size of *ptr buffer after returning, *ptr will be NULL and - * *size 0 if an error occurred. - */ -void av_fast_mallocz(void *ptr, unsigned int *size, size_t min_size); - /** * @} */ From 49cd9c76d97e41548231fde0747e0fb682d7f542 Mon Sep 17 00:00:00 2001 From: Katharine Chui Date: Wed, 1 May 2024 18:40:06 +0800 Subject: [PATCH 193/719] sysclib_sprintf psp memory bound checking instead of length limits --- Core/HLE/sceKernelInterrupt.cpp | 59 ++++++++++++++++++++------------- 1 file changed, 36 insertions(+), 23 deletions(-) diff --git a/Core/HLE/sceKernelInterrupt.cpp b/Core/HLE/sceKernelInterrupt.cpp index 72596e6ceb..49ab0ad591 100644 --- a/Core/HLE/sceKernelInterrupt.cpp +++ b/Core/HLE/sceKernelInterrupt.cpp @@ -743,9 +743,20 @@ static int sysclib_memcmp(u32 dst, u32 src, u32 size) { static int sysclib_sprintf(u32 dst, u32 fmt) { ERROR_LOG(SCEKERNEL, "Untested sysclib_sprintf(dst=%08x, fmt=%08x)", dst, fmt); - if (!Memory::IsValidAddress(dst) || !Memory::IsValidAddress(fmt)) { - // What to do? Crash, probably. - return 0; + + // check fmt before using it + int i = 0; + while (true) { + u32 char_at = fmt + i; + if (!Memory::IsValidAddress(char_at)) { + ERROR_LOG(SCEKERNEL, "sysclib_sprintf bad fmt"); + return 0; + } + const char *c = Memory::GetCharPointerUnchecked(char_at); + if (*c == '\0') { + break; + } + i++; } DEBUG_LOG(SCEKERNEL, "sysclib_sprintf fmt: %s", Memory::GetCharPointerUnchecked(fmt)); @@ -764,16 +775,8 @@ static int sysclib_sprintf(u32 dst, u32 fmt) { std::string specifier = ""; int bytes_to_read = 0; int arg_idx = 0; - int fmt_len = 0; std::string result = ""; for (const char *c = Memory::GetCharPointerUnchecked(fmt); *c != '\0'; c++) { - // in case we have a bad fmt string, try not to crash the whole emulator - fmt_len++; - if (fmt_len == 1024) { - ERROR_LOG(SCEKERNEL, "sysclib_sprintf fmt is longer than 1024"); - return 0; - } - if (!processing_specifier) { if (*c == '%') { specifier = "%"; @@ -815,17 +818,22 @@ static int sysclib_sprintf(u32 dst, u32 fmt) { } arg_idx++; - if (!Memory::IsValidAddress(val)) { - ERROR_LOG(SCEKERNEL, "sysclib_sprintf bad string reference %08x", val); - return 0; + // check and copy the string reference + i = 0; + while (true) { + u32 char_at = val + i; + if (!Memory::IsValidAddress(char_at)) { + ERROR_LOG(SCEKERNEL, "sysclib_sprintf bad string reference at %08x", val); + return 0; + } + const char* ref_c = Memory::GetCharPointerUnchecked(char_at); + if (*ref_c == '\0') { + break; + } + result.append(1, *ref_c); + i++; } - const char *str = Memory::GetCharPointerUnchecked(val); - // limit the string length and hope that we don't crash on a bad string reference - char buf[1024] = {0}; - strncpy(buf, str, sizeof(buf)); - buf[sizeof(buf) - 1] = '\0'; - result.append(buf); processing_specifier = false; break; } @@ -873,7 +881,7 @@ static int sysclib_sprintf(u32 dst, u32 fmt) { bytes_to_read = bytes_to_read - 4; read_cnt++; } - char buf[1024] = {0}; + char buf[128] = {0}; snprintf(buf, sizeof(buf), specifier.c_str(), val); buf[sizeof(buf) - 1] = '\0'; result.append(buf); @@ -895,8 +903,13 @@ static int sysclib_sprintf(u32 dst, u32 fmt) { } } - // if a small buffer was allocated by the program, we will likely crash - strcpy((char *)Memory::GetPointerUnchecked(dst), result.c_str()); + DEBUG_LOG(SCEKERNEL, "sysclib_sprintf result string has length %u, content:", result.length()); + DEBUG_LOG(SCEKERNEL, "%s", result.c_str()); + if (!Memory::IsValidRange(dst, result.length() + 1)) { + ERROR_LOG(SCEKERNEL, "sysclib_sprintf result string is too long or dst is invalid"); + return 0; + } + memcpy((char *)Memory::GetPointerUnchecked(dst), result.c_str(), result.length() + 1); return result.length(); } From b570cacd90e9063d6635af0f8ad66e14a9820c13 Mon Sep 17 00:00:00 2001 From: Katharine Chui Date: Wed, 1 May 2024 22:45:32 +0800 Subject: [PATCH 194/719] add Memory::IsValidNullTerminatedString --- Core/HLE/sceKernelInterrupt.cpp | 35 +++++++-------------------------- Core/MemMap.h | 15 ++++++++++++++ 2 files changed, 22 insertions(+), 28 deletions(-) diff --git a/Core/HLE/sceKernelInterrupt.cpp b/Core/HLE/sceKernelInterrupt.cpp index 49ab0ad591..ab3fc4ff7b 100644 --- a/Core/HLE/sceKernelInterrupt.cpp +++ b/Core/HLE/sceKernelInterrupt.cpp @@ -744,19 +744,9 @@ static int sysclib_memcmp(u32 dst, u32 src, u32 size) { static int sysclib_sprintf(u32 dst, u32 fmt) { ERROR_LOG(SCEKERNEL, "Untested sysclib_sprintf(dst=%08x, fmt=%08x)", dst, fmt); - // check fmt before using it - int i = 0; - while (true) { - u32 char_at = fmt + i; - if (!Memory::IsValidAddress(char_at)) { - ERROR_LOG(SCEKERNEL, "sysclib_sprintf bad fmt"); - return 0; - } - const char *c = Memory::GetCharPointerUnchecked(char_at); - if (*c == '\0') { - break; - } - i++; + if (!Memory::IsValidNullTerminatedString(fmt)) { + ERROR_LOG(SCEKERNEL, "sysclib_sprintf bad fmt"); + return 0; } DEBUG_LOG(SCEKERNEL, "sysclib_sprintf fmt: %s", Memory::GetCharPointerUnchecked(fmt)); @@ -818,22 +808,11 @@ static int sysclib_sprintf(u32 dst, u32 fmt) { } arg_idx++; - // check and copy the string reference - i = 0; - while (true) { - u32 char_at = val + i; - if (!Memory::IsValidAddress(char_at)) { - ERROR_LOG(SCEKERNEL, "sysclib_sprintf bad string reference at %08x", val); - return 0; - } - const char* ref_c = Memory::GetCharPointerUnchecked(char_at); - if (*ref_c == '\0') { - break; - } - result.append(1, *ref_c); - i++; + if (!Memory::IsValidNullTerminatedString(val)) { + ERROR_LOG(SCEKERNEL, "sysclib_sprintf bad string reference at %08x", val); + return 0; } - + result.append(Memory::GetCharPointerUnchecked(val)); processing_specifier = false; break; } diff --git a/Core/MemMap.h b/Core/MemMap.h index 67e17babcd..8a8b62d89e 100644 --- a/Core/MemMap.h +++ b/Core/MemMap.h @@ -310,6 +310,21 @@ inline bool IsValidAddress(const u32 address) { } } +inline bool IsValidNullTerminatedString(const u32 address) { + int i = 0; + while (true) { + u32 char_at = address + i; + if (!IsValidAddress(char_at)) { + return false; + } + const char *c = GetCharPointerUnchecked(char_at); + if (*c == '\0') { + return true; + } + i++; + } +} + inline u32 ValidSize(const u32 address, const u32 requested_size) { u32 max_size; if ((address & 0x3E000000) == 0x08000000) { From 090d1f8d0e207dd1927b272823ea53242dc65f2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Thu, 2 May 2024 16:56:32 +0200 Subject: [PATCH 195/719] atrac3: Add a cross platform restrict modifier, use it for the vector math functions Also remove redundant parameters. There are a bunch of other places where we could use this, so just experimenting here. This enables autovectorization to work here. --- ext/at3_standalone/atrac3.cpp | 2 +- ext/at3_standalone/atrac3plusdsp.cpp | 18 ++++++++-------- ext/at3_standalone/compat.h | 10 +++++++-- ext/at3_standalone/float_dsp.h | 31 +++++++++++++--------------- 4 files changed, 32 insertions(+), 29 deletions(-) diff --git a/ext/at3_standalone/atrac3.cpp b/ext/at3_standalone/atrac3.cpp index fe0e71c841..6c1afcb166 100644 --- a/ext/at3_standalone/atrac3.cpp +++ b/ext/at3_standalone/atrac3.cpp @@ -143,7 +143,7 @@ static void imlt(ATRAC3Context *q, float *input, float *output, int odd_band) imdct_calc(&q->mdct_ctx, output, input); /* Perform windowing on the output. */ - vector_fmul(output, output, mdct_window, MDCT_SIZE); + vector_fmul(output, mdct_window, MDCT_SIZE); } /* diff --git a/ext/at3_standalone/atrac3plusdsp.cpp b/ext/at3_standalone/atrac3plusdsp.cpp index 1cf345ced6..a070148e0e 100644 --- a/ext/at3_standalone/atrac3plusdsp.cpp +++ b/ext/at3_standalone/atrac3plusdsp.cpp @@ -174,7 +174,7 @@ static void waves_synth(Atrac3pWaveSynthParams *synth_param, /* invert phase if requested */ if (invert_phase) - vector_fmul_scalar(out, out, -1.0f, 128); + vector_fmul_scalar(out, -1.0f, 128); /* fade in with steep Hann window if requested */ if (envelope->has_start_point) { @@ -255,14 +255,14 @@ void ff_atrac3p_generate_tones(Atrac3pChanUnitCtx *ch_unit, int ch_num, int sb, /* Hann windowing for non-faded wave signals */ if (tones_now->num_wavs && tones_next->num_wavs && reg1_env_nonzero && reg2_env_nonzero) { - vector_fmul(wavreg1, wavreg1, &hann_window[128], 128); - vector_fmul(wavreg2, wavreg2, hann_window, 128); + vector_fmul(wavreg1, &hann_window[128], 128); + vector_fmul(wavreg2, hann_window, 128); } else { if (tones_now->num_wavs && !tones_now->curr_env.has_stop_point) - vector_fmul(wavreg1, wavreg1, &hann_window[128], 128); + vector_fmul(wavreg1, &hann_window[128], 128); if (tones_next->num_wavs && !tones_next->curr_env.has_start_point) - vector_fmul(wavreg2, wavreg2, hann_window, 128); + vector_fmul(wavreg2, hann_window, 128); } /* Overlap and add to residual */ @@ -502,15 +502,15 @@ void ff_atrac3p_imdct(FFTContext *mdct_ctx, float *pIn, * Both regions are 32 samples long. */ if (wind_id & 2) { /* 1st half: steep window */ memset(pOut, 0, sizeof(float) * 32); - vector_fmul(&pOut[32], &pOut[32], av_sine_64, 64); + vector_fmul(&pOut[32], av_sine_64, 64); } else /* 1st half: simple sine window */ - vector_fmul(pOut, pOut, av_sine_128, ATRAC3P_MDCT_SIZE / 2); + vector_fmul(pOut, av_sine_128, ATRAC3P_MDCT_SIZE / 2); if (wind_id & 1) { /* 2nd half: steep window */ - vector_fmul_reverse(&pOut[160], &pOut[160], av_sine_64, 64); + vector_fmul_reverse(&pOut[160], av_sine_64, 64); memset(&pOut[224], 0, sizeof(float) * 32); } else /* 2nd half: simple sine window */ - vector_fmul_reverse(&pOut[128], &pOut[128], av_sine_128, ATRAC3P_MDCT_SIZE / 2); + vector_fmul_reverse(&pOut[128], av_sine_128, ATRAC3P_MDCT_SIZE / 2); } /* lookup table for fast modulo 23 op required for cyclic buffers of the IPQF */ diff --git a/ext/at3_standalone/compat.h b/ext/at3_standalone/compat.h index bd3e398b32..57b0244de4 100644 --- a/ext/at3_standalone/compat.h +++ b/ext/at3_standalone/compat.h @@ -4,15 +4,22 @@ // Compat hacks to make an FFMPEG-like environment, so we can keep the core code mostly unchanged. -#if defined(__GNUC__) +#if defined(__clang__) +#define DECLARE_ALIGNED(n, t, v) t __attribute__((aligned(n))) v +#define DECLARE_ASM_CONST(n, t, v) static const t av_used __attribute__((aligned(n))) v +#define av_restrict __restrict +#elif defined(__GNUC__) #define DECLARE_ALIGNED(n,t,v) t __attribute__ ((aligned (n))) v #define DECLARE_ASM_CONST(n,t,v) static const t av_used __attribute__ ((aligned (n))) v +#define av_restrict __restrict__ #elif defined(_MSC_VER) #define DECLARE_ALIGNED(n,t,v) __declspec(align(n)) t v #define DECLARE_ASM_CONST(n,t,v) __declspec(align(n)) static const t v +#define av_restrict __restrict #else #define DECLARE_ALIGNED(n,t,v) t v #define DECLARE_ASM_CONST(n,t,v) static const t v +#define av_restrict #endif #define AV_HAVE_FAST_UNALIGNED 0 @@ -22,7 +29,6 @@ // #define BITSTREAM_READER_LE #define LOCAL_ALIGNED(bits, type, name, subscript) type name subscript -#define av_restrict #define av_alias #define av_unused #define av_assert0(cond) diff --git a/ext/at3_standalone/float_dsp.h b/ext/at3_standalone/float_dsp.h index f02764382f..c9664a814b 100644 --- a/ext/at3_standalone/float_dsp.h +++ b/ext/at3_standalone/float_dsp.h @@ -18,20 +18,20 @@ #pragma once -inline void vector_fmul(float *dst, const float *src0, const float *src1, int len) { - int i; - for (i = 0; i < len; i++) - dst[i] = src0[i] * src1[i]; +#include "compat.h" + +inline void vector_fmul(float * av_restrict dst, const float * av_restrict src, int len) { + for (int i = 0; i < len; i++) + dst[i] = dst[i] * src[i]; } /** * Multiply a vector of floats by a scalar float. Source and * destination vectors must overlap exactly or not at all. */ -inline void vector_fmul_scalar(float *dst, const float *src, float mul, int len) { - int i; - for (i = 0; i < len; i++) - dst[i] = src[i] * mul; +inline void vector_fmul_scalar(float *dst, float mul, int len) { + for (int i = 0; i < len; i++) + dst[i] *= mul; } /** @@ -39,18 +39,15 @@ inline void vector_fmul_scalar(float *dst, const float *src, float mul, int len) * in a vector of floats. The second vector of floats is iterated over * in reverse order. * -* @param dst output vector +* @param dst output and first input vector * constraints: 32-byte aligned -* @param src0 first input vector -* constraints: 32-byte aligned -* @param src1 second input vector +* @param src second input vector * constraints: 32-byte aligned * @param len number of elements in the input * constraints: multiple of 16 */ -inline void vector_fmul_reverse(float *dst, const float *src0, const float *src1, int len) { - int i; - src1 += len - 1; - for (i = 0; i < len; i++) - dst[i] = src0[i] * src1[-i]; +inline void vector_fmul_reverse(float * av_restrict dst, const float * av_restrict src, int len) { + src += len - 1; + for (int i = 0; i < len; i++) + dst[i] *= src[-i]; } From 47c7fab92840812e8f29d178a94f40a555f85d81 Mon Sep 17 00:00:00 2001 From: Katharine Chui Date: Fri, 3 May 2024 19:42:50 +0800 Subject: [PATCH 196/719] optimize Memory::IsValidNullTerminatedString --- Core/MemMap.h | 50 ++++++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/Core/MemMap.h b/Core/MemMap.h index 8a8b62d89e..56acfe823b 100644 --- a/Core/MemMap.h +++ b/Core/MemMap.h @@ -310,35 +310,37 @@ inline bool IsValidAddress(const u32 address) { } } -inline bool IsValidNullTerminatedString(const u32 address) { - int i = 0; - while (true) { - u32 char_at = address + i; - if (!IsValidAddress(char_at)) { - return false; - } - const char *c = GetCharPointerUnchecked(char_at); - if (*c == '\0') { - return true; - } - i++; +inline u32 MaxSizeAtAddress(const u32 address){ + if ((address & 0x3E000000) == 0x08000000) { + return 0x08000000 + g_MemorySize - (address & 0x3FFFFFFF); + } else if ((address & 0x3F800000) == 0x04000000) { + return 0x04800000 - (address & 0x3FFFFFFF); + } else if ((address & 0xBFFFC000) == 0x00010000) { + return 0x00014000 - (address & 0x3FFFFFFF); + } else if ((address & 0x3F000000) >= 0x08000000 && (address & 0x3F000000) < 0x08000000 + g_MemorySize) { + return 0x08000000 + g_MemorySize - (address & 0x3FFFFFFF); + } else { + return 0; } } -inline u32 ValidSize(const u32 address, const u32 requested_size) { - u32 max_size; - if ((address & 0x3E000000) == 0x08000000) { - max_size = 0x08000000 + g_MemorySize - (address & 0x3FFFFFFF); - } else if ((address & 0x3F800000) == 0x04000000) { - max_size = 0x04800000 - (address & 0x3FFFFFFF); - } else if ((address & 0xBFFFC000) == 0x00010000) { - max_size = 0x00014000 - (address & 0x3FFFFFFF); - } else if ((address & 0x3F000000) >= 0x08000000 && (address & 0x3F000000) < 0x08000000 + g_MemorySize) { - max_size = 0x08000000 + g_MemorySize - (address & 0x3FFFFFFF); - } else { - max_size = 0; +inline bool IsValidNullTerminatedString(const u32 address) { + u32 max_size = MaxSizeAtAddress(address); + if (max_size == 0) { + return false; } + const char *c = GetCharPointerUnchecked(address); + for (u32 i = 0; i < max_size; i++) { + if (c[i] == '\0') { + return true; + } + } + return false; +} + +inline u32 ValidSize(const u32 address, const u32 requested_size) { + u32 max_size = MaxSizeAtAddress(address); if (requested_size > max_size) { return max_size; } From e7cfb5234fa06d692947babbfbee63cac4575d6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Fri, 3 May 2024 16:49:28 +0200 Subject: [PATCH 197/719] Improve checks for JIT ability Prep for iOS --- Core/Config.cpp | 7 +++++++ UI/GameSettingsScreen.cpp | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Core/Config.cpp b/Core/Config.cpp index 395e2651ee..3730d51599 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -1227,6 +1227,13 @@ void Config::Load(const char *iniFileName, const char *controllerIniFilename) { ResetControlLayout(); } + // Force JIT setting to a valid value for the current system configuration. + if (!System_GetPropertyBool(SYSPROP_CAN_JIT)) { + if (g_Config.iCpuCore == (int)CPUCore::JIT || g_Config.iCpuCore == (int)CPUCore::JIT_IR) { + g_Config.iCpuCore = (int)CPUCore::IR_INTERPRETER; + } + } + const char *gitVer = PPSSPP_GIT_VERSION; Version installed(gitVer); Version upgrade(upgradeVersion); diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp index a854b14298..7c8af35a3f 100644 --- a/UI/GameSettingsScreen.cpp +++ b/UI/GameSettingsScreen.cpp @@ -1755,7 +1755,7 @@ void DeveloperToolsScreen::CreateViews() { list->Add(new ItemHeader(sy->T("General"))); - bool canUseJit = true; + bool canUseJit = System_GetPropertyBool(SYSPROP_CAN_JIT); // iOS can now use JIT on all modes, apparently. // The bool may come in handy for future non-jit platforms though (UWP XB1?) From 0ae0c9bbe9efcf88e099d3c1d98a2068563623c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Fri, 3 May 2024 17:00:36 +0200 Subject: [PATCH 198/719] Minor cleanup in main.cpp --- Windows/main.cpp | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/Windows/main.cpp b/Windows/main.cpp index 87b99608d0..48ca4c1d73 100644 --- a/Windows/main.cpp +++ b/Windows/main.cpp @@ -269,23 +269,23 @@ extern WindowsAudioBackend *winAudioBackend; #ifdef _WIN32 #if PPSSPP_PLATFORM(UWP) -static int ScreenDPI() { - return 96; // TODO UWP +static float ScreenDPI() { + return 96.0f; // TODO UWP } #else -static int ScreenDPI() { +static float ScreenDPI() { HDC screenDC = GetDC(nullptr); int dotsPerInch = GetDeviceCaps(screenDC, LOGPIXELSY); ReleaseDC(nullptr, screenDC); - return dotsPerInch ? dotsPerInch : 96; + return dotsPerInch ? (float)dotsPerInch : 96.0f; } #endif #endif -static int ScreenRefreshRateHz() { - static int rate = 0; +static float ScreenRefreshRateHz() { + static float rate = 0.0f; static double lastCheck = 0.0; - double now = time_now_d(); + const double now = time_now_d(); if (!rate || lastCheck < now - 10.0) { lastCheck = now; DEVMODE lpDevMode{}; @@ -295,12 +295,12 @@ static int ScreenRefreshRateHz() { // TODO: Use QueryDisplayConfig instead (Win7+) so we can get fractional refresh rates correctly. if (EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &lpDevMode) == 0) { - rate = 60; // default value + rate = 60.0f; // default value } else { if (lpDevMode.dmFields & DM_DISPLAYFREQUENCY) { - rate = lpDevMode.dmDisplayFrequency > 60 ? lpDevMode.dmDisplayFrequency : 60; + rate = (float)(lpDevMode.dmDisplayFrequency > 60 ? lpDevMode.dmDisplayFrequency : 60); } else { - rate = 60; + rate = 60.0f; } } } @@ -340,9 +340,9 @@ int64_t System_GetPropertyInt(SystemProperty prop) { float System_GetPropertyFloat(SystemProperty prop) { switch (prop) { case SYSPROP_DISPLAY_REFRESH_RATE: - return (float)ScreenRefreshRateHz(); + return ScreenRefreshRateHz(); case SYSPROP_DISPLAY_DPI: - return (float)ScreenDPI(); + return ScreenDPI(); case SYSPROP_DISPLAY_SAFE_INSET_LEFT: case SYSPROP_DISPLAY_SAFE_INSET_RIGHT: case SYSPROP_DISPLAY_SAFE_INSET_TOP: @@ -480,7 +480,7 @@ void System_Notify(SystemNotification notification) { } } -std::wstring MakeFilter(std::wstring filter) { +static std::wstring MakeFilter(std::wstring filter) { for (size_t i = 0; i < filter.length(); i++) { if (filter[i] == '|') filter[i] = '\0'; @@ -651,7 +651,8 @@ bool System_MakeRequest(SystemRequestType type, int requestId, const std::string void System_AskForPermission(SystemPermission permission) {} PermissionStatus System_GetPermissionStatus(SystemPermission permission) { return PERMISSION_STATUS_GRANTED; } -void EnableCrashingOnCrashes() { +// Don't swallow exceptions. +static void EnableCrashingOnCrashes() { typedef BOOL (WINAPI *tGetPolicy)(LPDWORD lpFlags); typedef BOOL (WINAPI *tSetPolicy)(DWORD dwFlags); const DWORD EXCEPTION_SWALLOWING = 0x1; From ae1ee41eb05273f3d30d5eea8ef05e11f33100db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Fri, 3 May 2024 17:54:57 +0200 Subject: [PATCH 199/719] Add functionality to limit a pathbrowser to a specific root --- Common/File/Path.cpp | 3 +++ Common/File/PathBrowser.cpp | 20 +++++++++++++++++++- Common/File/PathBrowser.h | 12 ++++++------ Common/System/System.h | 4 ++++ Core/KeyMapDefaults.cpp | 2 +- UI/MainScreen.cpp | 8 ++++++-- UI/RemoteISOScreen.cpp | 5 +++-- ios/main.mm | 2 ++ 8 files changed, 44 insertions(+), 12 deletions(-) diff --git a/Common/File/Path.cpp b/Common/File/Path.cpp index c9302437eb..4448dffe92 100644 --- a/Common/File/Path.cpp +++ b/Common/File/Path.cpp @@ -240,6 +240,9 @@ bool Path::FilePathContainsNoCase(std::string_view needle) const { } bool Path::StartsWith(const Path &other) const { + if (other.empty()) { + return true; + } if (type_ != other.type_) { // Bad return false; diff --git a/Common/File/PathBrowser.cpp b/Common/File/PathBrowser.cpp index 40689c0c9f..16e83a39bc 100644 --- a/Common/File/PathBrowser.cpp +++ b/Common/File/PathBrowser.cpp @@ -124,9 +124,15 @@ PathBrowser::~PathBrowser() { void PathBrowser::SetPath(const Path &path) { path_ = path; + ApplyRestriction(); HandlePath(); } +void PathBrowser::RestrictToRoot(const Path &root) { + INFO_LOG(SYSTEM, "Restricting to root: %s", root.c_str()); + restrictedRoot_ = root; +} + void PathBrowser::HandlePath() { if (!path_.empty() && path_.ToString()[0] == '!') { if (pendingActive_) @@ -203,7 +209,7 @@ bool PathBrowser::IsListingReady() { std::string PathBrowser::GetFriendlyPath() const { std::string str = GetPath().ToVisualString(); // Show relative to memstick root if there. - if (startsWith(str, aliasMatch_)) { + if (path_.StartsWith(aliasMatch_)) { return aliasDisplay_ + str.substr(aliasMatch_.size()); } @@ -229,12 +235,24 @@ bool PathBrowser::GetListing(std::vector &fileInfo, const char * return true; } +void PathBrowser::ApplyRestriction() { + if (!path_.StartsWith(restrictedRoot_) && !startsWith(path_.ToString(), "!")) { + WARN_LOG(SYSTEM, "Applying path restriction: %s (%s didn't match)", restrictedRoot_.c_str(), path_.c_str()); + path_ = restrictedRoot_; + } +} + bool PathBrowser::CanNavigateUp() { + if (path_ == restrictedRoot_) { + return false; + } return path_.CanNavigateUp(); } void PathBrowser::NavigateUp() { + _dbg_assert_(CanNavigateUp()); path_ = path_.NavigateUp(); + ApplyRestriction(); } // TODO: Support paths like "../../hello" diff --git a/Common/File/PathBrowser.h b/Common/File/PathBrowser.h index f6a8e782df..9e6435b59f 100644 --- a/Common/File/PathBrowser.h +++ b/Common/File/PathBrowser.h @@ -8,7 +8,6 @@ #include #include - #include "Common/File/DirListing.h" #include "Common/File/Path.h" @@ -18,7 +17,6 @@ class PathBrowser { public: PathBrowser() {} - PathBrowser(const Path &path) { SetPath(path); } ~PathBrowser(); void SetPath(const Path &path); @@ -41,11 +39,11 @@ public: void SetUserAgent(const std::string &s) { userAgent_ = s; } - void SetRootAlias(const std::string &alias, const std::string &longValue) { + void SetRootAlias(const std::string &alias, const Path &rootPath) { aliasDisplay_ = alias; - aliasMatch_ = longValue; + aliasMatch_ = rootPath; } - + void RestrictToRoot(const Path &root); bool empty() const { return path_.empty(); } @@ -53,12 +51,14 @@ public: private: void HandlePath(); void ResetPending(); + void ApplyRestriction(); Path path_; Path pendingPath_; + Path restrictedRoot_; std::string userAgent_; std::string aliasDisplay_; - std::string aliasMatch_; + Path aliasMatch_; std::vector pendingFiles_; std::condition_variable pendingCond_; std::mutex pendingLock_; diff --git a/Common/System/System.h b/Common/System/System.h index 763c31f517..96f6bed953 100644 --- a/Common/System/System.h +++ b/Common/System/System.h @@ -193,6 +193,10 @@ enum SystemProperty { SYSPROP_USER_DOCUMENTS_DIR, + // iOS app store limitation: The documents directory should be the only browsable directory. + // We'll not return true for this in non-app-store builds. + SYSPROP_LIMITED_FILE_BROWSING, + SYSPROP_OK_BUTTON_LEFT, SYSPROP_MAIN_WINDOW_HANDLE, diff --git a/Core/KeyMapDefaults.cpp b/Core/KeyMapDefaults.cpp index 3c08f2c94c..b0493a1c2b 100644 --- a/Core/KeyMapDefaults.cpp +++ b/Core/KeyMapDefaults.cpp @@ -352,7 +352,7 @@ void SetDefaultKeyMap(DefaultMaps dmap, bool replace) { switch (dmap) { case DEFAULT_MAPPING_KEYBOARD: { - int keyboardLayout = System_GetPropertyInt(SYSPROP_KEYBOARD_LAYOUT); + int keyboardLayout = (int)System_GetPropertyInt(SYSPROP_KEYBOARD_LAYOUT); switch (keyboardLayout) { case KEYBOARD_LAYOUT_QWERTZ: SetDefaultKeyMap(DEVICE_ID_KEYBOARD, defaultQwertzKeyboardKeyMap, ARRAY_SIZE(defaultQwertzKeyboardKeyMap), replace); diff --git a/UI/MainScreen.cpp b/UI/MainScreen.cpp index f0e2005bfe..751cf8cd5a 100644 --- a/UI/MainScreen.cpp +++ b/UI/MainScreen.cpp @@ -510,10 +510,14 @@ void DirButton::Draw(UIContext &dc) { } GameBrowser::GameBrowser(int token, const Path &path, BrowseFlags browseFlags, bool *gridStyle, ScreenManager *screenManager, std::string_view lastText, std::string_view lastLink, UI::LayoutParams *layoutParams) - : LinearLayout(UI::ORIENT_VERTICAL, layoutParams), path_(path), gridStyle_(gridStyle), browseFlags_(browseFlags), lastText_(lastText), lastLink_(lastLink), screenManager_(screenManager), token_(token) { + : LinearLayout(UI::ORIENT_VERTICAL, layoutParams), gridStyle_(gridStyle), browseFlags_(browseFlags), lastText_(lastText), lastLink_(lastLink), screenManager_(screenManager), token_(token) { using namespace UI; path_.SetUserAgent(StringFromFormat("PPSSPP/%s", PPSSPP_GIT_VERSION)); - path_.SetRootAlias("ms:", GetSysDirectory(DIRECTORY_MEMSTICK_ROOT).ToVisualString() + "/"); + path_.SetRootAlias("ms:", GetSysDirectory(DIRECTORY_MEMSTICK_ROOT)); + if (System_GetPropertyBool(SYSPROP_LIMITED_FILE_BROWSING)) { + path_.RestrictToRoot(GetSysDirectory(DIRECTORY_MEMSTICK_ROOT)); + } + path_.SetPath(path); Refresh(); } diff --git a/UI/RemoteISOScreen.cpp b/UI/RemoteISOScreen.cpp index ccfb4e6d83..2d9b436100 100644 --- a/UI/RemoteISOScreen.cpp +++ b/UI/RemoteISOScreen.cpp @@ -253,10 +253,11 @@ bool RemoteISOConnectScreen::FindServer(std::string &resultHost, int &resultPort } static bool LoadGameList(const Path &url, std::vector &games) { - PathBrowser browser(url); + PathBrowser browser; + browser.SetPath(url); std::vector files; browser.SetUserAgent(StringFromFormat("PPSSPP/%s", PPSSPP_GIT_VERSION)); - browser.SetRootAlias("ms:", GetSysDirectory(DIRECTORY_MEMSTICK_ROOT).ToVisualString() + "/"); + browser.SetRootAlias("ms:", GetSysDirectory(DIRECTORY_MEMSTICK_ROOT)); browser.GetListing(files, "iso:cso:chd:pbp:elf:prx:ppdmp:", &scanCancelled); if (scanCancelled) { return false; diff --git a/ios/main.mm b/ios/main.mm index 5be93aae33..0389d3452e 100644 --- a/ios/main.mm +++ b/ios/main.mm @@ -349,6 +349,8 @@ bool System_GetPropertyBool(SystemProperty prop) { #endif case SYSPROP_CAN_JIT: return g_jitAvailable; + case SYSPROP_LIMITED_FILE_BROWSING: + return false; // But will return true in app store builds. #ifndef HTTPS_NOT_AVAILABLE case SYSPROP_SUPPORTS_HTTPS: return true; From c8cf56ff21429c76b04f1570f312fba208a68a70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sat, 4 May 2024 10:30:22 +0200 Subject: [PATCH 200/719] Update zstd dependency --- ext/zstd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/zstd b/ext/zstd index 63779c7982..794ea1b0af 160000 --- a/ext/zstd +++ b/ext/zstd @@ -1 +1 @@ -Subproject commit 63779c798237346c2b245c546c40b72a5a5913fe +Subproject commit 794ea1b0afca0f020f4e57b6732332231fb23c70 From e631be36071a9d509bf56b07208890de4d512514 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sat, 4 May 2024 10:48:54 +0200 Subject: [PATCH 201/719] Make a simpler CMakeLists.txt for zstd --- CMakeLists.txt | 4 +-- Core/HLE/sceKernelInterrupt.cpp | 2 +- ext/zstd-build/CMakeLists.txt | 51 +++++++++++++++++++++++++++++++++ 3 files changed, 53 insertions(+), 4 deletions(-) create mode 100644 ext/zstd-build/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 37e33e968a..a11cdfaa46 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2361,9 +2361,7 @@ if(USE_SYSTEM_ZSTD) target_include_directories(${CoreLibName} PRIVATE ${ZSTD_INCLUDE_DIR}) target_link_libraries(${CoreLibName} ${ZSTD_LIBRARY}) else() - set(ZSTD_BUILD_PROGRAMS OFF CACHE BOOL "we don't need zstd programs" FORCE) - set(ZSTD_LEGACY_SUPPORT OFF CACHE BOOL "we don't use any old zstd files" FORCE) - add_subdirectory(ext/zstd/build/cmake EXCLUDE_FROM_ALL) + add_subdirectory(ext/zstd-build) set(CoreExtraLibs ${CoreExtraLibs} libzstd_static) include_directories(ext/zstd/lib) endif() diff --git a/Core/HLE/sceKernelInterrupt.cpp b/Core/HLE/sceKernelInterrupt.cpp index ab3fc4ff7b..3554e2c878 100644 --- a/Core/HLE/sceKernelInterrupt.cpp +++ b/Core/HLE/sceKernelInterrupt.cpp @@ -882,7 +882,7 @@ static int sysclib_sprintf(u32 dst, u32 fmt) { } } - DEBUG_LOG(SCEKERNEL, "sysclib_sprintf result string has length %u, content:", result.length()); + DEBUG_LOG(SCEKERNEL, "sysclib_sprintf result string has length %d, content:", (int)result.length()); DEBUG_LOG(SCEKERNEL, "%s", result.c_str()); if (!Memory::IsValidRange(dst, result.length() + 1)) { ERROR_LOG(SCEKERNEL, "sysclib_sprintf result string is too long or dst is invalid"); diff --git a/ext/zstd-build/CMakeLists.txt b/ext/zstd-build/CMakeLists.txt new file mode 100644 index 0000000000..c295da5461 --- /dev/null +++ b/ext/zstd-build/CMakeLists.txt @@ -0,0 +1,51 @@ +cmake_minimum_required (VERSION 3.2.0) +project (libzstd_static) + +set(SRC_DIR ../zstd/lib) +message(${SRC_DIR}) + +set(ALL_SOURCE_FILES + ${SRC_DIR}/common/debug.c + ${SRC_DIR}/common/entropy_common.c + ${SRC_DIR}/common/error_private.c + ${SRC_DIR}/common/fse_decompress.c + ${SRC_DIR}/common/pool.c + ${SRC_DIR}/common/threading.c + ${SRC_DIR}/common/xxhash.c + ${SRC_DIR}/common/zstd_common.c + ${SRC_DIR}/compress/fse_compress.c + ${SRC_DIR}/compress/hist.c + ${SRC_DIR}/compress/huf_compress.c + ${SRC_DIR}/compress/zstd_compress.c + ${SRC_DIR}/compress/zstd_compress_literals.c + ${SRC_DIR}/compress/zstd_compress_sequences.c + ${SRC_DIR}/compress/zstd_compress_superblock.c + ${SRC_DIR}/compress/zstd_double_fast.c + ${SRC_DIR}/compress/zstd_fast.c + ${SRC_DIR}/compress/zstd_lazy.c + ${SRC_DIR}/compress/zstd_ldm.c + ${SRC_DIR}/compress/zstd_opt.c + ${SRC_DIR}/compress/zstdmt_compress.c + ${SRC_DIR}/decompress/huf_decompress.c + ${SRC_DIR}/decompress/zstd_ddict.c + ${SRC_DIR}/decompress/zstd_decompress.c + ${SRC_DIR}/decompress/zstd_decompress_block.c + ${SRC_DIR}/dictBuilder/cover.c + ${SRC_DIR}/dictBuilder/divsufsort.c + ${SRC_DIR}/dictBuilder/fastcover.c + ${SRC_DIR}/dictBuilder/zdict.c +) + +if (MSVC) + add_compile_options(-DZSTD_DISABLE_ASM) +else () + if(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64.*|AMD64.*|x86_64.*|X86_64.*") + set(ALL_SOURCE_FILES ${ALL_SOURCE_FILES} ${SRC_DIR}/decompress/huf_decompress_amd64.S) + else() + add_compile_options(-DZSTD_DISABLE_ASM) + endif() +endif () + +add_library(libzstd_static STATIC ${ALL_SOURCE_FILES}) + +target_include_directories(libzstd_static PUBLIC ../zstd/lib) From 654e2319e46953a2068e47a1d91030ce5ae27c96 Mon Sep 17 00:00:00 2001 From: haorui wang <1905811497@qq.com> Date: Sat, 4 May 2024 22:47:10 +0800 Subject: [PATCH 202/719] [what][build] add `dwmapi` to CMakeLists.txt [why] use cmake build directly in win32 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a11cdfaa46..4da7206ba2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2606,7 +2606,7 @@ set(WindowsFiles list(APPEND LinkCommon ${CoreLibName} ${CMAKE_THREAD_LIBS_INIT}) if(WIN32) - list(APPEND LinkCommon kernel32 user32 gdi32 shell32 comctl32 dsound xinput d3d9 winmm dinput8 ole32 winspool ksuser mf uxtheme mfplat mfreadwrite mfuuid shlwapi) + list(APPEND LinkCommon kernel32 user32 gdi32 shell32 comctl32 dsound xinput d3d9 winmm dinput8 ole32 winspool ksuser dwmapi mf uxtheme mfplat mfreadwrite mfuuid shlwapi) #setup_target_project(${TargetBin} Windows) list(APPEND NativeAppSource ${WindowsFiles}) endif() From d769c3223ccdac35cf9e7cda6a57d10921f1be69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 5 May 2024 11:20:29 +0200 Subject: [PATCH 203/719] Fix camera mirroring color issue, fix warning --- Core/HLE/sceKernelInterrupt.cpp | 4 ++-- Windows/CaptureDevice.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Core/HLE/sceKernelInterrupt.cpp b/Core/HLE/sceKernelInterrupt.cpp index 3554e2c878..85e2bf425c 100644 --- a/Core/HLE/sceKernelInterrupt.cpp +++ b/Core/HLE/sceKernelInterrupt.cpp @@ -888,8 +888,8 @@ static int sysclib_sprintf(u32 dst, u32 fmt) { ERROR_LOG(SCEKERNEL, "sysclib_sprintf result string is too long or dst is invalid"); return 0; } - memcpy((char *)Memory::GetPointerUnchecked(dst), result.c_str(), result.length() + 1); - return result.length(); + memcpy((char *)Memory::GetPointerUnchecked(dst), result.c_str(), (int)result.length() + 1); + return (int)result.length(); } static u32 sysclib_memset(u32 destAddr, int data, int size) { diff --git a/Windows/CaptureDevice.cpp b/Windows/CaptureDevice.cpp index 924e147cbe..9b6683f614 100644 --- a/Windows/CaptureDevice.cpp +++ b/Windows/CaptureDevice.cpp @@ -205,10 +205,10 @@ HRESULT ReaderCallback::OnReadSample( for (int y = 0; y < dstH; y++) { uint8_t *line = device->imageRGB + y * device->imgRGBLineSizes[0]; for (int x = 0; x < dstW / 2; x++) { - const uint8_t r = line[x * 3]; + const int invX = dstW - 1 - x; + const uint8_t r = line[x * 3 + 0]; const uint8_t g = line[x * 3 + 1]; - const uint8_t b = line[x * 3 + 1]; - const int invX = (dstW - 1 - x); + const uint8_t b = line[x * 3 + 2]; line[x * 3 + 0] = line[invX * 3 + 0]; line[x * 3 + 1] = line[invX * 3 + 1]; line[x * 3 + 2] = line[invX * 3 + 2]; From dae44c1120f1a26715adb47a6aca316aadaeb527 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Wed, 24 Jan 2024 09:23:41 +0100 Subject: [PATCH 204/719] SavedataParam: optimize PSPMatch --- Core/Dialog/SavedataParam.cpp | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/Core/Dialog/SavedataParam.cpp b/Core/Dialog/SavedataParam.cpp index fd0477f572..6d8427607a 100644 --- a/Core/Dialog/SavedataParam.cpp +++ b/Core/Dialog/SavedataParam.cpp @@ -110,32 +110,31 @@ namespace return info; } - bool PSPMatch(const std::string &text, const std::string ®exp) - { - if(text.empty() && regexp.empty()) + bool PSPMatch(std::string_view text, std::string_view regexp) { + if (text.empty() && regexp.empty()) return true; - else if(regexp == "*") + else if (regexp == "*") return true; - else if(text.empty()) + else if (text.empty()) return false; - else if(regexp.empty()) + else if (regexp.empty()) return false; - else if(regexp == "?" && text.length() == 1) + else if (regexp == "?" && text.length() == 1) return true; - else if(text == regexp) + else if (text == regexp) return true; - else if(regexp.data()[0] == '*') + else if (regexp.data()[0] == '*') { bool res = PSPMatch(text.substr(1),regexp.substr(1)); if(!res) res = PSPMatch(text.substr(1),regexp); return res; } - else if(regexp.data()[0] == '?') + else if (regexp.data()[0] == '?') { return PSPMatch(text.substr(1),regexp.substr(1)); } - else if(regexp.data()[0] == text.data()[0]) + else if (regexp.data()[0] == text.data()[0]) { return PSPMatch(text.substr(1),regexp.substr(1)); } From e5178d2bc405471c8f905f2ecb2a5df9b4906b8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 5 May 2024 11:58:35 +0200 Subject: [PATCH 205/719] Remove unused code, some string_view --- Common/Data/Format/IniFile.h | 32 +------------------------------- Common/StringUtils.cpp | 8 ++++---- Common/StringUtils.h | 2 +- 3 files changed, 6 insertions(+), 36 deletions(-) diff --git a/Common/Data/Format/IniFile.h b/Common/Data/Format/IniFile.h index 8fa1e5c750..d5161787fe 100644 --- a/Common/Data/Format/IniFile.h +++ b/Common/Data/Format/IniFile.h @@ -133,30 +133,7 @@ public: // Returns true if key exists in section bool Exists(const char* sectionName, const char* key) const; - // TODO: Get rid of these, in favor of the Section ones. - void Set(const char* sectionName, const char* key, const char* newValue) { - GetOrCreateSection(sectionName)->Set(key, newValue); - } - void Set(const char* sectionName, const char* key, const std::string& newValue) { - GetOrCreateSection(sectionName)->Set(key, newValue.c_str()); - } - void Set(const char* sectionName, const char* key, int newValue) { - GetOrCreateSection(sectionName)->Set(key, newValue); - } - void Set(const char* sectionName, const char* key, uint32_t newValue) { - GetOrCreateSection(sectionName)->Set(key, newValue); - } - void Set(const char* sectionName, const char* key, uint64_t newValue) { - GetOrCreateSection(sectionName)->Set(key, newValue); - } - void Set(const char* sectionName, const char* key, bool newValue) { - GetOrCreateSection(sectionName)->Set(key, newValue); - } - void Set(const char* sectionName, const char* key, const std::vector& newValues) { - GetOrCreateSection(sectionName)->Set(key, newValues); - } - - // TODO: Get rid of these, in favor of the Section ones. + // These will not create the section if it doesn't exist. bool Get(const char* sectionName, const char* key, std::string* value, const char* defaultValue = ""); bool Get(const char* sectionName, const char* key, int* value, int defaultValue = 0); bool Get(const char* sectionName, const char* key, uint32_t* value, uint32_t defaultValue = 0); @@ -164,13 +141,6 @@ public: bool Get(const char* sectionName, const char* key, bool* value, bool defaultValue = false); bool Get(const char* sectionName, const char* key, std::vector& values); - template bool GetIfExists(const char* sectionName, const char* key, T value) - { - if (Exists(sectionName, key)) - return Get(sectionName, key, value); - return false; - } - bool GetKeys(const char* sectionName, std::vector& keys) const; bool DeleteKey(const char* sectionName, const char* key); diff --git a/Common/StringUtils.cpp b/Common/StringUtils.cpp index abf2970ce5..7aa9c55945 100644 --- a/Common/StringUtils.cpp +++ b/Common/StringUtils.cpp @@ -334,7 +334,7 @@ void SplitString(std::string_view str, const char delim, std::vector &output) { +void GetQuotedStrings(std::string_view str, std::vector &output) { size_t next = 0; bool even = 0; for (size_t pos = 0, len = str.length(); pos < len; ++pos) { @@ -372,11 +372,11 @@ void GetQuotedStrings(const std::string& str, std::vector &output) } } +// TODO: this is quite inefficient. std::string ReplaceAll(std::string_view input, std::string_view src, std::string_view dest) { size_t pos = 0; std::string result(input); - if (src == dest) return result; diff --git a/Common/StringUtils.h b/Common/StringUtils.h index da1ddf7468..2930d419e5 100644 --- a/Common/StringUtils.h +++ b/Common/StringUtils.h @@ -86,7 +86,7 @@ void SplitString(std::string_view str, const char delim, std::vector &output); -void GetQuotedStrings(const std::string& str, std::vector& output); +void GetQuotedStrings(std::string_view str, std::vector &output); std::string ReplaceAll(std::string_view input, std::string_view src, std::string_view dest); From 9d0c127961d06321d40519225d1a9919673ae634 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 5 May 2024 12:04:58 +0200 Subject: [PATCH 206/719] IniFile: Switch keys to string_view (avoids recomputing length every time) --- Common/Data/Format/IniFile.cpp | 57 ++++++++++++++-------------------- Common/Data/Format/IniFile.h | 56 ++++++++++++++++----------------- 2 files changed, 52 insertions(+), 61 deletions(-) diff --git a/Common/Data/Format/IniFile.cpp b/Common/Data/Format/IniFile.cpp index 43e3ca8822..829f09097b 100644 --- a/Common/Data/Format/IniFile.cpp +++ b/Common/Data/Format/IniFile.cpp @@ -198,7 +198,7 @@ bool Section::GetKeys(std::vector &keys) const { return true; } -ParsedIniLine *Section::GetLine(const char *key) { +ParsedIniLine *Section::GetLine(std::string_view key) { for (auto &line : lines_) { if (equalsNoCase(line.Key(), key)) return &line; @@ -206,7 +206,7 @@ ParsedIniLine *Section::GetLine(const char *key) { return nullptr; } -const ParsedIniLine *Section::GetLine(const char* key) const { +const ParsedIniLine *Section::GetLine(std::string_view key) const { for (auto &line : lines_) { if (equalsNoCase(line.Key(), key)) return &line; @@ -214,38 +214,38 @@ const ParsedIniLine *Section::GetLine(const char* key) const { return nullptr; } -void Section::Set(const char* key, uint32_t newValue) { +void Section::Set(std::string_view key, uint32_t newValue) { char temp[128]; snprintf(temp, sizeof(temp), "0x%08x", newValue); Set(key, (const char *)temp); } -void Section::Set(const char* key, uint64_t newValue) { +void Section::Set(std::string_view key, uint64_t newValue) { char temp[128]; snprintf(temp, sizeof(temp), "0x%016" PRIx64, newValue); Set(key, (const char *)temp); } -void Section::Set(const char* key, float newValue) { +void Section::Set(std::string_view key, float newValue) { _dbg_assert_(!my_isnanorinf(newValue)); char temp[128]; snprintf(temp, sizeof(temp), "%f", newValue); Set(key, (const char *)temp); } -void Section::Set(const char* key, double newValue) { +void Section::Set(std::string_view key, double newValue) { char temp[128]; snprintf(temp, sizeof(temp), "%f", newValue); Set(key, (const char *)temp); } -void Section::Set(const char* key, int newValue) { +void Section::Set(std::string_view key, int newValue) { char temp[128]; snprintf(temp, sizeof(temp), "%d", newValue); Set(key, (const char *)temp); } -void Section::Set(const char* key, const char* newValue) { +void Section::Set(std::string_view key, const char* newValue) { ParsedIniLine *line = GetLine(key); if (line) { line->SetValue(newValue); @@ -255,7 +255,7 @@ void Section::Set(const char* key, const char* newValue) { } } -void Section::Set(const char* key, const std::string& newValue, const std::string& defaultValue) +void Section::Set(std::string_view key, const std::string& newValue, const std::string& defaultValue) { if (newValue != defaultValue) Set(key, newValue); @@ -263,7 +263,7 @@ void Section::Set(const char* key, const std::string& newValue, const std::strin Delete(key); } -bool Section::Get(const char* key, std::string* value, const char* defaultValue) const { +bool Section::Get(std::string_view key, std::string* value, const char* defaultValue) const { const ParsedIniLine *line = GetLine(key); if (!line) { if (defaultValue) { @@ -276,7 +276,7 @@ bool Section::Get(const char* key, std::string* value, const char* defaultValue) return true; } -void Section::Set(const char* key, const float newValue, const float defaultValue) +void Section::Set(std::string_view key, const float newValue, const float defaultValue) { if (newValue != defaultValue) Set(key, newValue); @@ -284,7 +284,7 @@ void Section::Set(const char* key, const float newValue, const float defaultValu Delete(key); } -void Section::Set(const char* key, int newValue, int defaultValue) +void Section::Set(std::string_view key, int newValue, int defaultValue) { if (newValue != defaultValue) Set(key, newValue); @@ -292,7 +292,7 @@ void Section::Set(const char* key, int newValue, int defaultValue) Delete(key); } -void Section::Set(const char* key, bool newValue, bool defaultValue) +void Section::Set(std::string_view key, bool newValue, bool defaultValue) { if (newValue != defaultValue) Set(key, newValue); @@ -300,7 +300,7 @@ void Section::Set(const char* key, bool newValue, bool defaultValue) Delete(key); } -void Section::Set(const char* key, const std::vector& newValues) +void Section::Set(std::string_view key, const std::vector& newValues) { std::string temp; // Join the strings with , @@ -319,12 +319,10 @@ void Section::AddComment(const std::string &comment) { lines_.emplace_back(ParsedIniLine::CommentOnly("# " + comment)); } -bool Section::Get(const char* key, std::vector& values) const -{ +bool Section::Get(std::string_view key, std::vector& values) const { std::string temp; bool retval = Get(key, &temp, 0); - if (!retval || temp.empty()) - { + if (!retval || temp.empty()) { return false; } // ignore starting , if any @@ -333,7 +331,6 @@ bool Section::Get(const char* key, std::vector& values) const // split by , while (subStart != std::string::npos) { - // Find next , subEnd = temp.find_first_of(',', subStart); if (subStart != subEnd) @@ -347,8 +344,7 @@ bool Section::Get(const char* key, std::vector& values) const return true; } -bool Section::Get(const char* key, int* value, int defaultValue) const -{ +bool Section::Get(std::string_view key, int* value, int defaultValue) const { std::string temp; bool retval = Get(key, &temp, 0); if (retval && TryParse(temp, value)) @@ -357,8 +353,7 @@ bool Section::Get(const char* key, int* value, int defaultValue) const return false; } -bool Section::Get(const char* key, uint32_t* value, uint32_t defaultValue) const -{ +bool Section::Get(std::string_view key, uint32_t* value, uint32_t defaultValue) const { std::string temp; bool retval = Get(key, &temp, 0); if (retval && TryParse(temp, value)) @@ -367,8 +362,7 @@ bool Section::Get(const char* key, uint32_t* value, uint32_t defaultValue) const return false; } -bool Section::Get(const char* key, uint64_t* value, uint64_t defaultValue) const -{ +bool Section::Get(std::string_view key, uint64_t* value, uint64_t defaultValue) const { std::string temp; bool retval = Get(key, &temp, 0); if (retval && TryParse(temp, value)) @@ -377,8 +371,7 @@ bool Section::Get(const char* key, uint64_t* value, uint64_t defaultValue) const return false; } -bool Section::Get(const char* key, bool* value, bool defaultValue) const -{ +bool Section::Get(std::string_view key, bool* value, bool defaultValue) const { std::string temp; bool retval = Get(key, &temp, 0); if (retval && TryParse(temp, value)) @@ -387,8 +380,7 @@ bool Section::Get(const char* key, bool* value, bool defaultValue) const return false; } -bool Section::Get(const char* key, float* value, float defaultValue) const -{ +bool Section::Get(std::string_view key, float* value, float defaultValue) const { std::string temp; bool retval = Get(key, &temp, 0); if (retval && TryParse(temp, value)) @@ -397,8 +389,7 @@ bool Section::Get(const char* key, float* value, float defaultValue) const return false; } -bool Section::Get(const char* key, double* value, double defaultValue) const -{ +bool Section::Get(std::string_view key, double* value, double defaultValue) const { std::string temp; bool retval = Get(key, &temp, 0); if (retval && TryParse(temp, value)) @@ -407,7 +398,7 @@ bool Section::Get(const char* key, double* value, double defaultValue) const return false; } -bool Section::Exists(const char *key) const { +bool Section::Exists(std::string_view key) const { for (auto &line : lines_) { if (equalsNoCase(key, line.Key())) return true; @@ -425,7 +416,7 @@ std::map Section::ToMap() const { return outMap; } -bool Section::Delete(const char *key) { +bool Section::Delete(std::string_view key) { ParsedIniLine *line = GetLine(key); for (auto liter = lines_.begin(); liter != lines_.end(); ++liter) { if (line == &*liter) { diff --git a/Common/Data/Format/IniFile.h b/Common/Data/Format/IniFile.h index d5161787fe..8e944f8d1e 100644 --- a/Common/Data/Format/IniFile.h +++ b/Common/Data/Format/IniFile.h @@ -54,56 +54,56 @@ class Section { public: Section() {} - Section(const std::string& name) : name_(name) {} + Section(std::string_view name) : name_(name) {} - bool Exists(const char *key) const; - bool Delete(const char *key); + bool Exists(std::string_view key) const; + bool Delete(std::string_view key); void Clear(); std::map ToMap() const; - ParsedIniLine *GetLine(const char *key); - const ParsedIniLine *GetLine(const char *key) const; + ParsedIniLine *GetLine(std::string_view key); + const ParsedIniLine *GetLine(std::string_view key) const; - void Set(const char* key, const char* newValue); - void Set(const char* key, const std::string& newValue, const std::string& defaultValue); + void Set(std::string_view key, const char* newValue); + void Set(std::string_view key, const std::string& newValue, const std::string& defaultValue); - void Set(const std::string &key, const std::string &value) { - Set(key.c_str(), value.c_str()); + void Set(std::string_view key, const std::string &value) { + Set(key, value.c_str()); } - bool Get(const char* key, std::string* value, const char* defaultValue) const; + bool Get(std::string_view key, std::string* value, const char* defaultValue) const; - void Set(const char* key, uint32_t newValue); - void Set(const char* key, uint64_t newValue); - void Set(const char* key, float newValue); - void Set(const char* key, const float newValue, const float defaultValue); - void Set(const char* key, double newValue); + void Set(std::string_view key, uint32_t newValue); + void Set(std::string_view key, uint64_t newValue); + void Set(std::string_view key, float newValue); + void Set(std::string_view key, const float newValue, const float defaultValue); + void Set(std::string_view key, double newValue); - void Set(const char* key, int newValue, int defaultValue); - void Set(const char* key, int newValue); + void Set(std::string_view key, int newValue, int defaultValue); + void Set(std::string_view key, int newValue); - void Set(const char* key, bool newValue, bool defaultValue); - void Set(const char* key, bool newValue) { + void Set(std::string_view key, bool newValue, bool defaultValue); + void Set(std::string_view key, bool newValue) { Set(key, newValue ? "True" : "False"); } - void Set(const char* key, const std::vector& newValues); + void Set(std::string_view key, const std::vector& newValues); // Declare without a body to make it fail to compile. This is to prevent accidentally // setting a pointer as a bool. The failure is in the linker unfortunately, but that's better // than accidentally succeeding in a bad way. template - void Set(const char *key, T *ptr); + void Set(std::string_view key, T *ptr); void AddComment(const std::string &comment); - bool Get(const char* key, int* value, int defaultValue = 0) const; - bool Get(const char* key, uint32_t* value, uint32_t defaultValue = 0) const; - bool Get(const char* key, uint64_t* value, uint64_t defaultValue = 0) const; - bool Get(const char* key, bool* value, bool defaultValue = false) const; - bool Get(const char* key, float* value, float defaultValue = false) const; - bool Get(const char* key, double* value, double defaultValue = false) const; - bool Get(const char* key, std::vector& values) const; + bool Get(std::string_view key, int* value, int defaultValue = 0) const; + bool Get(std::string_view key, uint32_t* value, uint32_t defaultValue = 0) const; + bool Get(std::string_view key, uint64_t* value, uint64_t defaultValue = 0) const; + bool Get(std::string_view key, bool* value, bool defaultValue = false) const; + bool Get(std::string_view key, float* value, float defaultValue = false) const; + bool Get(std::string_view key, double* value, double defaultValue = false) const; + bool Get(std::string_view key, std::vector& values) const; // Return a list of all keys in this section bool GetKeys(std::vector &keys) const; From 85f8fd0bdbcfd249536c25aed69da52bd903b79a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 5 May 2024 12:08:41 +0200 Subject: [PATCH 207/719] Safety fix for GetCharPointer Uses IsValidNullTerminatedString from #19103 by Kethen --- Core/MemMap.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Core/MemMap.h b/Core/MemMap.h index 56acfe823b..247d4d3478 100644 --- a/Core/MemMap.h +++ b/Core/MemMap.h @@ -270,16 +270,6 @@ inline bool IsKernelAndNotVolatileAddress(const u32 address) { bool IsScratchpadAddress(const u32 address); -// Used for auto-converted char * parameters, which can sometimes legitimately be null - -// so we don't want to get caught in GetPointer's crash reporting. -inline const char* GetCharPointer(const u32 address) { - if (address) { - return (const char *)GetPointer(address); - } else { - return nullptr; - } -} - inline const char *GetCharPointerUnchecked(const u32 address) { return (const char *)GetPointerUnchecked(address); } @@ -351,6 +341,16 @@ inline bool IsValidRange(const u32 address, const u32 size) { return ValidSize(address, size) == size; } +// Used for auto-converted char * parameters, which can sometimes legitimately be null - +// so we don't want to get caught in GetPointer's crash reporting. +inline const char *GetCharPointer(const u32 address) { + if (address && IsValidNullTerminatedString(address)) { + return GetCharPointerUnchecked(address); + } else { + return nullptr; + } +} + } // namespace Memory // Avoiding a global include for NotifyMemInfo. From c004bea5e463f6d8c97ee7a96da21fca80cfde75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 5 May 2024 12:17:29 +0200 Subject: [PATCH 208/719] Use memchr in IsValidNullTerminatedString --- Core/MemMap.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Core/MemMap.h b/Core/MemMap.h index 247d4d3478..b9f01fb506 100644 --- a/Core/MemMap.h +++ b/Core/MemMap.h @@ -270,10 +270,6 @@ inline bool IsKernelAndNotVolatileAddress(const u32 address) { bool IsScratchpadAddress(const u32 address); -inline const char *GetCharPointerUnchecked(const u32 address) { - return (const char *)GetPointerUnchecked(address); -} - inline void MemcpyUnchecked(void *to_data, const u32 from_address, const u32 len) { memcpy(to_data, GetPointerUnchecked(from_address), len); } @@ -314,6 +310,8 @@ inline u32 MaxSizeAtAddress(const u32 address){ } } +// NOTE: Unlike the similar IsValidRange/IsValidAddress functions, this one is linear cost vs the size of the string, +// for hopefully-obvious reasons. inline bool IsValidNullTerminatedString(const u32 address) { u32 max_size = MaxSizeAtAddress(address); if (max_size == 0) { @@ -321,10 +319,8 @@ inline bool IsValidNullTerminatedString(const u32 address) { } const char *c = GetCharPointerUnchecked(address); - for (u32 i = 0; i < max_size; i++) { - if (c[i] == '\0') { - return true; - } + if (memchr(c, '\0', max_size)) { + return true; } return false; } @@ -341,6 +337,10 @@ inline bool IsValidRange(const u32 address, const u32 size) { return ValidSize(address, size) == size; } +inline const char *GetCharPointerUnchecked(const u32 address) { + return (const char *)GetPointerUnchecked(address); +} + // Used for auto-converted char * parameters, which can sometimes legitimately be null - // so we don't want to get caught in GetPointer's crash reporting. inline const char *GetCharPointer(const u32 address) { From 0b91aa50eeb80fbb2999c542342a908736b28d65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 5 May 2024 12:23:43 +0200 Subject: [PATCH 209/719] Improve memory safety, add bugfix to little-used sysclib functions --- Core/HLE/sceIo.cpp | 23 +++++++++++++++++------ Core/HLE/sceKernelInterrupt.cpp | 28 ++++++++++++++-------------- Core/HLE/sceKernelModule.cpp | 2 +- Core/MemMap.h | 13 +++++++------ 4 files changed, 39 insertions(+), 27 deletions(-) diff --git a/Core/HLE/sceIo.cpp b/Core/HLE/sceIo.cpp index d370f81438..974a224a26 100644 --- a/Core/HLE/sceIo.cpp +++ b/Core/HLE/sceIo.cpp @@ -838,6 +838,12 @@ static void IoStartAsyncThread(int id, FileNode *f) { static u32 sceIoAssign(u32 alias_addr, u32 physical_addr, u32 filesystem_addr, int mode, u32 arg_addr, int argSize) { + if (!Memory::IsValidNullTerminatedString(alias_addr) || + !Memory::IsValidNullTerminatedString(physical_addr) || + !Memory::IsValidNullTerminatedString(filesystem_addr)) { + return hleLogError(SCEIO, -1, "Bad parameters"); + } + std::string alias = Memory::GetCharPointer(alias_addr); std::string physical_dev = Memory::GetCharPointer(physical_addr); std::string filesystem_dev = Memory::GetCharPointer(filesystem_addr); @@ -2009,8 +2015,7 @@ static u32 sceIoDevctl(const char *name, int cmd, u32 argAddr, int argLen, u32 o { // Emulator special tricks! - enum - { + enum { EMULATOR_DEVCTL__GET_HAS_DISPLAY = 1, EMULATOR_DEVCTL__SEND_OUTPUT, EMULATOR_DEVCTL__IS_EMULATOR, @@ -2031,14 +2036,14 @@ static u32 sceIoDevctl(const char *name, int cmd, u32 argAddr, int argLen, u32 o Memory::Write_U32(PSP_CoreParameter().headLess ? 0 : 1, outPtr); return 0; case EMULATOR_DEVCTL__SEND_OUTPUT: - { - std::string data(Memory::GetCharPointer(argAddr), argLen); + if (Memory::IsValidRange(argAddr, argLen)) { + std::string data(Memory::GetCharPointerUnchecked(argAddr), argLen); if (!System_SendDebugOutput(data)) DEBUG_LOG(SCEIO, "%s", data.c_str()); if (PSP_CoreParameter().collectDebugOutput) *PSP_CoreParameter().collectDebugOutput += data; - return 0; } + return 0; case EMULATOR_DEVCTL__IS_EMULATOR: if (Memory::IsValidAddress(outPtr)) Memory::Write_U32(1, outPtr); @@ -2932,7 +2937,13 @@ static int IoAsyncFinish(int id) { case IoAsyncOp::OPEN: { // See notes on timing in sceIoOpen. - const std::string filename = Memory::GetCharPointer(params.open.filenameAddr); + if (!Memory::IsValidNullTerminatedString(params.open.filenameAddr)) { + // Bad + ERROR_LOG(SCEIO, "Bad pointer to filename %08x", params.open.filenameAddr); + us = 80; + break; + } + const std::string filename = Memory::GetCharPointerUnchecked(params.open.filenameAddr); IFileSystem *sys = pspFileSystem.GetSystemFromFilename(filename); if (sys) { if (f->asyncResult == (int)SCE_KERNEL_ERROR_ERRNO_FILE_NOT_FOUND) { diff --git a/Core/HLE/sceKernelInterrupt.cpp b/Core/HLE/sceKernelInterrupt.cpp index 85e2bf425c..33dcf2f303 100644 --- a/Core/HLE/sceKernelInterrupt.cpp +++ b/Core/HLE/sceKernelInterrupt.cpp @@ -697,7 +697,7 @@ static u32 sysclib_memcpy(u32 dst, u32 src, u32 size) { static u32 sysclib_strcat(u32 dst, u32 src) { ERROR_LOG(SCEKERNEL, "Untested sysclib_strcat(dest=%08x, src=%08x)", dst, src); - if (Memory::IsValidAddress(dst) && Memory::IsValidAddress(src)) { + if (Memory::IsValidNullTerminatedString(dst) && Memory::IsValidNullTerminatedString(src)) { strcat((char *)Memory::GetPointerWriteUnchecked(dst), (const char *)Memory::GetPointerUnchecked(src)); } return dst; @@ -705,7 +705,7 @@ static u32 sysclib_strcat(u32 dst, u32 src) { static int sysclib_strcmp(u32 dst, u32 src) { ERROR_LOG(SCEKERNEL, "Untested sysclib_strcmp(dest=%08x, src=%08x)", dst, src); - if (Memory::IsValidAddress(dst) && Memory::IsValidAddress(src)) { + if (Memory::IsValidNullTerminatedString(dst) && Memory::IsValidNullTerminatedString(src)) { return strcmp((const char *)Memory::GetPointerUnchecked(dst), (const char *)Memory::GetPointerUnchecked(src)); } else { // What to do? Crash, probably. @@ -715,7 +715,7 @@ static int sysclib_strcmp(u32 dst, u32 src) { static u32 sysclib_strcpy(u32 dst, u32 src) { ERROR_LOG(SCEKERNEL, "Untested sysclib_strcpy(dest=%08x, src=%08x)", dst, src); - if (Memory::IsValidAddress(dst) && Memory::IsValidAddress(src)) { + if (Memory::IsValidAddress(dst) && Memory::IsValidNullTerminatedString(src)) { strcpy((char *)Memory::GetPointerWriteUnchecked(dst), (const char *)Memory::GetPointerUnchecked(src)); } return dst; @@ -723,7 +723,7 @@ static u32 sysclib_strcpy(u32 dst, u32 src) { static u32 sysclib_strlen(u32 src) { ERROR_LOG(SCEKERNEL, "Untested sysclib_strlen(src=%08x)", src); - if (Memory::IsValidAddress(src)) { + if (Memory::IsValidNullTerminatedString(src)) { // TODO: This computes the length, could reuse it maybe. return (u32)strlen(Memory::GetCharPointerUnchecked(src)); } else { // What to do? Crash, probably. @@ -893,7 +893,7 @@ static int sysclib_sprintf(u32 dst, u32 fmt) { } static u32 sysclib_memset(u32 destAddr, int data, int size) { - ERROR_LOG(SCEKERNEL, "Untested sysclib_memset(dest=%08x, data=%d ,size=%d)", destAddr, data, size); + DEBUG_LOG(SCEKERNEL, "Untested sysclib_memset(dest=%08x, data=%d ,size=%d)", destAddr, data, size); if (Memory::IsValidRange(destAddr, size)) { memset(Memory::GetPointerWriteUnchecked(destAddr), data, size); } @@ -902,8 +902,8 @@ static u32 sysclib_memset(u32 destAddr, int data, int size) { } static int sysclib_strstr(u32 s1, u32 s2) { - ERROR_LOG(SCEKERNEL, "Untested sysclib_strstr(%08x, %08x)", s1, s2); - if (Memory::IsValidAddress(s1) && Memory::IsValidAddress(s2)) { + DEBUG_LOG(SCEKERNEL, "Untested sysclib_strstr(%08x, %08x)", s1, s2); + if (Memory::IsValidNullTerminatedString(s1) && Memory::IsValidNullTerminatedString(s2)) { std::string str1 = Memory::GetCharPointerUnchecked(s1); std::string str2 = Memory::GetCharPointerUnchecked(s2); size_t index = str1.find(str2); @@ -916,8 +916,8 @@ static int sysclib_strstr(u32 s1, u32 s2) { } static int sysclib_strncmp(u32 s1, u32 s2, u32 size) { - ERROR_LOG(SCEKERNEL, "Untested sysclib_strncmp(%08x, %08x, %08x)", s1, s2, size); - if (Memory::IsValidAddress(s1) && Memory::IsValidAddress(s2)) { + DEBUG_LOG(SCEKERNEL, "Untested sysclib_strncmp(%08x, %08x, %08x)", s1, s2, size); + if (Memory::IsValidRange(s1, size) && Memory::IsValidRange(s2, size)) { const char * str1 = Memory::GetCharPointerUnchecked(s1); const char * str2 = Memory::GetCharPointerUnchecked(s2); return strncmp(str1, str2, size); @@ -926,7 +926,7 @@ static int sysclib_strncmp(u32 s1, u32 s2, u32 size) { } static u32 sysclib_memmove(u32 dst, u32 src, u32 size) { - ERROR_LOG(SCEKERNEL, "Untested sysclib_memmove(%08x, %08x, %08x)", dst, src, size); + DEBUG_LOG(SCEKERNEL, "Untested sysclib_memmove(%08x, %08x, %08x)", dst, src, size); if (Memory::IsValidRange(dst, size) && Memory::IsValidRange(src, size)) { memmove(Memory::GetPointerWriteUnchecked(dst), Memory::GetPointerUnchecked(src), size); } @@ -937,7 +937,7 @@ static u32 sysclib_memmove(u32 dst, u32 src, u32 size) { } static u32 sysclib_strncpy(u32 dest, u32 src, u32 size) { - if (!Memory::IsValidAddress(dest) || Memory::IsValidAddress(src)) { + if (!Memory::IsValidAddress(dest) || !Memory::IsValidAddress(src)) { return hleLogError(SCEKERNEL, 0, "invalid address"); } @@ -962,7 +962,7 @@ static u32 sysclib_strncpy(u32 dest, u32 src, u32 size) { } static u32 sysclib_strtol(u32 strPtr, u32 endPtrPtr, int base) { - if (!Memory::IsValidAddress(strPtr)) { + if (!Memory::IsValidNullTerminatedString(strPtr)) { return hleLogError(SCEKERNEL, 0, "invalid address"); } const char* str = Memory::GetCharPointer(strPtr); @@ -974,7 +974,7 @@ static u32 sysclib_strtol(u32 strPtr, u32 endPtrPtr, int base) { } static u32 sysclib_strchr(u32 src, int c) { - if (!Memory::IsValidAddress(src)) { + if (!Memory::IsValidNullTerminatedString(src)) { return hleLogError(SCEKERNEL, 0, "invalid address"); } const std::string str = Memory::GetCharPointer(src); @@ -986,7 +986,7 @@ static u32 sysclib_strchr(u32 src, int c) { } static u32 sysclib_strrchr(u32 src, int c) { - if (!Memory::IsValidAddress(src)) { + if (!Memory::IsValidNullTerminatedString(src)) { return hleLogError(SCEKERNEL, 0, "invalid address"); } const std::string str = Memory::GetCharPointer(src); diff --git a/Core/HLE/sceKernelModule.cpp b/Core/HLE/sceKernelModule.cpp index bd61e25b75..409698cea8 100644 --- a/Core/HLE/sceKernelModule.cpp +++ b/Core/HLE/sceKernelModule.cpp @@ -1814,7 +1814,7 @@ bool __KernelLoadExec(const char *filename, u32 paramPtr, std::string *error_str } if (param.keyp != 0) { u32 keyAddr = param.keyp; - size_t keylen = strlen(Memory::GetCharPointer(keyAddr))+1; + size_t keylen = strlen(Memory::GetCharPointer(keyAddr)) + 1; param_key = new u8[keylen]; Memory::Memcpy(param_key, keyAddr, (u32)keylen, "KernelLoadParam"); } diff --git a/Core/MemMap.h b/Core/MemMap.h index b9f01fb506..c53a75f4a4 100644 --- a/Core/MemMap.h +++ b/Core/MemMap.h @@ -310,6 +310,10 @@ inline u32 MaxSizeAtAddress(const u32 address){ } } +inline const char *GetCharPointerUnchecked(const u32 address) { + return (const char *)GetPointerUnchecked(address); +} + // NOTE: Unlike the similar IsValidRange/IsValidAddress functions, this one is linear cost vs the size of the string, // for hopefully-obvious reasons. inline bool IsValidNullTerminatedString(const u32 address) { @@ -337,14 +341,11 @@ inline bool IsValidRange(const u32 address, const u32 size) { return ValidSize(address, size) == size; } -inline const char *GetCharPointerUnchecked(const u32 address) { - return (const char *)GetPointerUnchecked(address); -} - // Used for auto-converted char * parameters, which can sometimes legitimately be null - -// so we don't want to get caught in GetPointer's crash reporting. +// so we don't want to get caught in GetPointer's crash reporting +// TODO: This should use IsValidNullTerminatedString, but may be expensive since this is used so much - needs evaluation. inline const char *GetCharPointer(const u32 address) { - if (address && IsValidNullTerminatedString(address)) { + if (address && IsValidAddress(address)) { return GetCharPointerUnchecked(address); } else { return nullptr; From 671159b31d91882f004980b4557a3ce0c2a4f41a Mon Sep 17 00:00:00 2001 From: Narugakuruga <31060534+Narugakuruga@users.noreply.github.com> Date: Sun, 5 May 2024 23:35:03 +0800 Subject: [PATCH 210/719] Update zh_CN.ini --- assets/lang/zh_CN.ini | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/assets/lang/zh_CN.ini b/assets/lang/zh_CN.ini index 086ae4119f..e2ce0bbe1c 100644 --- a/assets/lang/zh_CN.ini +++ b/assets/lang/zh_CN.ini @@ -4,7 +4,7 @@ %1 achievements, %2 points = %1成就，%2点数 Account = 账号 Achievement progress = 成就进度 -Achievement sound volume = Achievement sound volume +Achievement sound volume = 成就提示音 Achievement unlocked = 成就达成！ Achievements = 成就 Achievements are disabled = 未启用成就功能 @@ -403,7 +403,7 @@ Log in = 登录 Log out = 退出 Logged in! = 登录成功！ Logging in... = 登录中… -More information... = 更多了解... +More information... = 了解更多... Move = 移动位置 Move Down = 移至下层 Move Up = 移至上层 @@ -562,7 +562,7 @@ Use UI background = 使用背景为壁纸 9x PSP = 9倍PSP 10x PSP = 10倍PSP 16x = 16倍 -AdrenoTools driver manager = 高通驱动管理器 +AdrenoTools driver manager = 骁龙GPU驱动管理 Aggressive = 激进 Alternative Speed = 备选速度1 Alternative Speed 2 = 备选速度2 @@ -590,7 +590,7 @@ Cheats = 金手指 Copy to texture = 复制到纹理 Current GPU Driver = 使用的GPU驱动 Debugging = 调试设置 -Default GPU driver = 默认GPU驱动程序 +Default GPU driver = 系统默认GPU驱动 DefaultCPUClockRequired = 警告：此游戏需要将CPU频率设置为默认。 Deposterize = 色调融合 Deposterize Tip = 修复纹理被放大时可见的缝隙 @@ -632,7 +632,7 @@ LowCurves Tip = 适用于极少部分游戏，控制曲线的细节质量 Lower resolution for effects (reduces artifacts) = 降低特效分辨率 (减少特效瑕疵) Manual Scaling = 手动缩放 Medium = 中质量 -Mirror camera image = Mirror camera image +Mirror camera image = 镜像摄像头画面 Mode = 渲染模式 Must Restart = 重启PPSSPP才能使这项设置生效。 Native device resolution = 屏幕原生分辨率 @@ -671,7 +671,7 @@ Software Rendering = 软件渲染 (慢) Software Skinning = 软件蒙皮 SoftwareSkinning Tip = 将模型绘制转移至CPU，在较多游戏中更快，但也有减速的反例 Speed = 运行速度 -Speed Hacks = 额外提速 (可影响画面渲染) +Speed Hacks = 额外提速 (影响渲染效果) Stereo display shader = 立体显示模式 Stereo rendering = 立体渲染 Stretch = 拉伸 @@ -722,7 +722,7 @@ Map Mouse = 鼠标映射 Replace = 替换现有 Show PSP = PSP 布局 Standard PSP controls = PSP基本按键 -Strict combo input order = Strict combo input order +Strict combo input order = 遵循连招顺序 You can press ESC to cancel. = 可以按下Esc键取消 [MainMenu] @@ -1201,7 +1201,7 @@ GPU Information = GPU信息 High precision float range = 高精度浮点范围 High precision int range = 高精度整数范围 Icon cache = 图标缓存 -Instance = Instance +Instance = 进程 JIT available = JIT可用 Lang/Region = 语言/区域 Memory Page Size = 内存页大小 @@ -1220,7 +1220,7 @@ Refresh rate = 刷新率 Release = 发布版 RW/RX exclusive = RW/RX独占 Sample rate = 采样率 -Screen notch insets = Screen notch insets +Screen notch insets = 屏幕前摄坐标 Shading Language = 着色语言 Storage = 存储 Sustained perf mode = 持续性能模式 @@ -1249,11 +1249,11 @@ Cache ISO in RAM = 在内存中缓存完整ISO Change CPU Clock = 修改PSP的CPU频率 (不稳定) CPU Core = CPU核心模式 Dynarec/JIT (recommended) = 动态重编译 (推荐) -Enable plugins = Enable plugins -JIT using IR = JIT using IR +Enable plugins = 启用插件 +JIT using IR = 带IR的动态重编译 Loaded plugin: %1 = 已加载插件: %1 Only JPG and PNG images are supported = 只支持JPG和PNG图片 -Plugins = Plugins +Plugins = 插件 Recording = 录制中 RetroAchievements = 成就系统 Rewind Snapshot Interval = 倒带快照间隔 From a5526d3b651d0a08e87d2708ca522ec6166a1600 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Mon, 6 May 2024 17:33:33 +0200 Subject: [PATCH 211/719] PPSSPP Store: Increase the height of the top bar, the back button was too small --- UI/Store.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/UI/Store.cpp b/UI/Store.cpp index 9dd2efc254..1815f62018 100644 --- a/UI/Store.cpp +++ b/UI/Store.cpp @@ -483,9 +483,9 @@ void StoreScreen::CreateViews() { auto mm = GetI18NCategory(I18NCat::MAINMENU); // Top bar - LinearLayout *topBar = root_->Add(new LinearLayout(ORIENT_HORIZONTAL)); - topBar->Add(new Button(di->T("Back")))->OnClick.Handle(this, &UIScreen::OnBack); - titleText_ = new TextView(mm->T("PPSSPP Homebrew Store")); + LinearLayout *topBar = root_->Add(new LinearLayout(ORIENT_HORIZONTAL, new LinearLayoutParams(FILL_PARENT, 64.0f))); + topBar->Add(new Choice(di->T("Back"), new LinearLayoutParams(WRAP_CONTENT, FILL_PARENT)))->OnClick.Handle(this, &UIScreen::OnBack); + titleText_ = new TextView(mm->T("PPSSPP Homebrew Store"), ALIGN_VCENTER, false, new LinearLayoutParams(WRAP_CONTENT, FILL_PARENT)); topBar->Add(titleText_); UI::Drawable solid(0xFFbd9939); topBar->SetBG(solid); From a75516f53eb80103c04279a91cd182219a46102e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Mon, 6 May 2024 13:50:56 +0200 Subject: [PATCH 212/719] Add support for a "content rating" field for apps in the homebrew store. This is to maximize likelihood of passing iOS review. --- UI/Store.cpp | 8 +++++++- UI/Store.h | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/UI/Store.cpp b/UI/Store.cpp index 1815f62018..e558c4c9dd 100644 --- a/UI/Store.cpp +++ b/UI/Store.cpp @@ -456,7 +456,7 @@ void StoreScreen::ParseListing(const std::string &json) { entries_.clear(); for (const JsonNode *pgame : entries->value) { JsonGet game = pgame->value; - StoreEntry e; + StoreEntry e{}; e.type = ENTRY_PBPZIP; e.name = GetTranslatedString(game, "name"); e.description = GetTranslatedString(game, "description", ""); @@ -464,6 +464,12 @@ void StoreScreen::ParseListing(const std::string &json) { e.size = game.getInt("size"); e.downloadURL = game.getStringOr("download-url", ""); e.iconURL = game.getStringOr("icon-url", ""); + e.contentRating = game.getInt("content-rating", 0); +#if PPSSPP_PLATFORM(IOS_APP_STORE) + if (e.contentRating >= 100) { + continue; + } +#endif e.hidden = false; // NOTE: Handling of the "hidden" flag is broken in old versions of PPSSPP. Do not use. const char *file = game.getStringOr("file", nullptr); if (!file) diff --git a/UI/Store.h b/UI/Store.h index 1782037b9b..6b742c12e4 100644 --- a/UI/Store.h +++ b/UI/Store.h @@ -54,6 +54,7 @@ struct StoreEntry { std::string category; std::string downloadURL; // Only set for games that are not hosted on store.ppsspp.org bool hidden; + int contentRating; // 100 means to hide it on iOS. No other values defined yet. u64 size; }; From 508d6ebd58cb805f55208a8561c35a4c83a1e0dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Mon, 6 May 2024 22:46:54 +0200 Subject: [PATCH 213/719] Minor code cleanup --- UI/RetroAchievementScreens.cpp | 12 ++++++------ UI/RetroAchievementScreens.h | 6 ------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/UI/RetroAchievementScreens.cpp b/UI/RetroAchievementScreens.cpp index ac7162409e..8fc80fc8d8 100644 --- a/UI/RetroAchievementScreens.cpp +++ b/UI/RetroAchievementScreens.cpp @@ -410,7 +410,7 @@ void MeasureAchievement(const UIContext &dc, const rc_client_achievement_t *achi } } -void MeasureGameAchievementSummary(const UIContext &dc, float *w, float *h) { +static void MeasureGameAchievementSummary(const UIContext &dc, float *w, float *h) { std::string description = Achievements::GetGameAchievementSummary(); float tw, th; @@ -421,12 +421,12 @@ void MeasureGameAchievementSummary(const UIContext &dc, float *w, float *h) { *w += 8.0f; } -void MeasureLeaderboardSummary(const UIContext &dc, const rc_client_leaderboard_t *leaderboard, float *w, float *h) { +static void MeasureLeaderboardSummary(const UIContext &dc, const rc_client_leaderboard_t *leaderboard, float *w, float *h) { *w = 0.0f; *h = 72.0f; } -void MeasureLeaderboardEntry(const UIContext &dc, const rc_client_leaderboard_entry_t *entry, float *w, float *h) { +static void MeasureLeaderboardEntry(const UIContext &dc, const rc_client_leaderboard_entry_t *entry, float *w, float *h) { *w = 0.0f; *h = 72.0f; } @@ -537,7 +537,7 @@ void RenderAchievement(UIContext &dc, const rc_client_achievement_t *achievement dc.PopScissor(); } -void RenderGameAchievementSummary(UIContext &dc, const Bounds &bounds, float alpha) { +static void RenderGameAchievementSummary(UIContext &dc, const Bounds &bounds, float alpha) { using namespace UI; UI::Drawable background = dc.theme->itemStyle.background; @@ -579,7 +579,7 @@ void RenderGameAchievementSummary(UIContext &dc, const Bounds &bounds, float alp dc.RebindTexture(); } -void RenderLeaderboardSummary(UIContext &dc, const rc_client_leaderboard_t *leaderboard, AchievementRenderStyle style, const Bounds &bounds, float alpha, float startTime, float time_s, bool hasFocus) { +static void RenderLeaderboardSummary(UIContext &dc, const rc_client_leaderboard_t *leaderboard, AchievementRenderStyle style, const Bounds &bounds, float alpha, float startTime, float time_s, bool hasFocus) { using namespace UI; UI::Drawable background = dc.theme->itemStyle.background; if (hasFocus) { @@ -622,7 +622,7 @@ void RenderLeaderboardSummary(UIContext &dc, const rc_client_leaderboard_t *lead dc.RebindTexture(); } -void RenderLeaderboardEntry(UIContext &dc, const rc_client_leaderboard_entry_t *entry, const Bounds &bounds, float alpha, bool hasFocus, bool isCurrentUser) { +static void RenderLeaderboardEntry(UIContext &dc, const rc_client_leaderboard_entry_t *entry, const Bounds &bounds, float alpha, bool hasFocus, bool isCurrentUser) { using namespace UI; UI::Drawable background = dc.theme->itemStyle.background; if (hasFocus) { diff --git a/UI/RetroAchievementScreens.h b/UI/RetroAchievementScreens.h index b3fe0826e2..bfef98a868 100644 --- a/UI/RetroAchievementScreens.h +++ b/UI/RetroAchievementScreens.h @@ -92,12 +92,6 @@ enum class AchievementRenderStyle { void MeasureAchievement(const UIContext &dc, const rc_client_achievement_t *achievement, AchievementRenderStyle style, float *w, float *h); void RenderAchievement(UIContext &dc, const rc_client_achievement_t *achievement, AchievementRenderStyle style, const Bounds &bounds, float alpha, float startTime, float time_s, bool hasFocus); -void MeasureGameAchievementSummary(const UIContext &dc, float *w, float *h); -void RenderGameAchievementSummary(UIContext &dc, const Bounds &bounds, float alpha); - -void MeasureLeaderboardEntry(const UIContext &dc, const rc_client_leaderboard_entry_t *entry, float *w, float *h); -void RenderLeaderboardEntry(UIContext &dc, const rc_client_leaderboard_entry_t *entry, const Bounds &bounds, float alpha); - class AchievementView : public UI::ClickableItem { public: AchievementView(const rc_client_achievement_t *achievement, UI::LayoutParams *layoutParams = nullptr) : UI::ClickableItem(layoutParams), achievement_(achievement) { From ac40fb83d4fa18375ebe3320c7a63c6bbe3aba3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Mon, 6 May 2024 22:49:46 +0200 Subject: [PATCH 214/719] iOS: Hide non-working RetroAchievements login, until we can fix it (still usable through ini file) --- UI/GameSettingsScreen.cpp | 23 +++++++++++++++++------ UI/RetroAchievementScreens.cpp | 2 ++ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp index 7c8af35a3f..6e800652df 100644 --- a/UI/GameSettingsScreen.cpp +++ b/UI/GameSettingsScreen.cpp @@ -970,12 +970,23 @@ void GameSettingsScreen::CreateToolsSettings(UI::ViewGroup *tools) { tools->Add(new ItemHeader(ms->T("Tools"))); - auto retro = tools->Add(new Choice(sy->T("RetroAchievements"))); - retro->OnClick.Add([=](UI::EventParams &) -> UI::EventReturn { - screenManager()->push(new RetroAchievementsSettingsScreen(gamePath_)); - return UI::EVENT_DONE; - }); - retro->SetIcon(ImageID("I_RETROACHIEVEMENTS_LOGO")); + bool showRetroAchievements = true; +#if PPSSPP_PLATFORM(IOS_APP_STORE) + // Hide RetroAchievements login (unless the user has specified a login via the ini file). + // A non-working login won't pass App Store review. + if (g_Config.sAchievementsUserName.empty()) { + showRetroAchievements = false; + } +#endif + if (showRetroAchievements) { + auto retro = tools->Add(new Choice(sy->T("RetroAchievements"))); + retro->OnClick.Add([=](UI::EventParams &) -> UI::EventReturn { + screenManager()->push(new RetroAchievementsSettingsScreen(gamePath_)); + return UI::EVENT_DONE; + }); + retro->SetIcon(ImageID("I_RETROACHIEVEMENTS_LOGO")); + } + // These were moved here so use the wrong translation objects, to avoid having to change all inis... This isn't a sustainable situation :P tools->Add(new Choice(sa->T("Savedata Manager")))->OnClick.Add([=](UI::EventParams &) { screenManager()->push(new SavedataScreen(gamePath_)); diff --git a/UI/RetroAchievementScreens.cpp b/UI/RetroAchievementScreens.cpp index 8fc80fc8d8..5a9e1ff4a7 100644 --- a/UI/RetroAchievementScreens.cpp +++ b/UI/RetroAchievementScreens.cpp @@ -308,6 +308,8 @@ void RetroAchievementsSettingsScreen::CreateAccountTab(UI::ViewGroup *viewGroup) return UI::EVENT_DONE; }); } else { + // TODO: For text input on iOS, look into https://stackoverflow.com/questions/7253477/how-to-display-the-iphone-ipad-keyboard-over-a-full-screen-opengl-es-app + // Hack up a temporary quick login-form-ish-thing viewGroup->Add(new PopupTextInputChoice(GetRequesterToken(), &username_, di->T("Username"), "", 128, screenManager())); viewGroup->Add(new PopupTextInputChoice(GetRequesterToken(), &password_, di->T("Password"), "", 128, screenManager()))->SetPasswordDisplay(); From 81846cd737e6b626c95d923d00066a09f6423bb5 Mon Sep 17 00:00:00 2001 From: Eric Warmenhoven Date: Wed, 8 May 2024 12:21:47 -0400 Subject: [PATCH 215/719] macOS: Update VulkanLoader for MoltenVK 1.2.8-style framework finding --- Common/GPU/Vulkan/VulkanLoader.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Common/GPU/Vulkan/VulkanLoader.cpp b/Common/GPU/Vulkan/VulkanLoader.cpp index d2a5653350..17596b50a3 100644 --- a/Common/GPU/Vulkan/VulkanLoader.cpp +++ b/Common/GPU/Vulkan/VulkanLoader.cpp @@ -285,6 +285,7 @@ static const char * const so_names[] = { "MoltenVK", #elif PPSSPP_PLATFORM(MAC) "@executable_path/../Frameworks/libMoltenVK.dylib", + "MoltenVK", #else "libvulkan.so", #if !defined(__ANDROID__) From 7f127e35670562cc2d3a274bd28965c9d5ad45b0 Mon Sep 17 00:00:00 2001 From: Lubos Date: Wed, 8 May 2024 21:57:31 +0200 Subject: [PATCH 216/719] Revert "OpenXR - Projection matrix on Quest 3 fixed" This reverts commit 4d61896403362d7300b88dcd76f6150174a2ca2c. --- Common/VR/PPSSPPVR.cpp | 57 ++++++++++++++++++++++++++------------- Core/Config.cpp | 1 + Core/Config.h | 1 + UI/GameSettingsScreen.cpp | 1 + 4 files changed, 42 insertions(+), 18 deletions(-) diff --git a/Common/VR/PPSSPPVR.cpp b/Common/VR/PPSSPPVR.cpp index 630573f2b9..6414eac0fe 100644 --- a/Common/VR/PPSSPPVR.cpp +++ b/Common/VR/PPSSPPVR.cpp @@ -26,6 +26,13 @@ #include "Core/KeyMap.h" #include "Core/System.h" +enum VRMatrix { + VR_PROJECTION_MATRIX, + VR_VIEW_MATRIX_LEFT_EYE, + VR_VIEW_MATRIX_RIGHT_EYE, + VR_MATRIX_COUNT +}; + enum VRMirroring { VR_MIRRORING_AXIS_X, VR_MIRRORING_AXIS_Y, @@ -44,10 +51,9 @@ static int vr3DGeometryCount = 0; static long vrCompat[VR_COMPAT_MAX]; static bool vrFlatForced = false; static bool vrFlatGame = false; -static double vrFov[2] = {}; +static float vrMatrix[VR_MATRIX_COUNT][16]; static bool vrMirroring[VR_MIRRORING_COUNT]; static int vrMirroringVariant = 0; -static float vrViewMatrix[2][16]; static XrView vrView[2]; static void (*cbNativeAxis)(const AxisInput *axis, size_t count); @@ -636,16 +642,28 @@ bool StartVRRender() { } UpdateVRViewMatrices(); - // Calculate field of view + // Update projection matrix XrFovf fov = {}; - for (auto & eye : vrView) { - fov.angleLeft += eye.fov.angleLeft / 2.0f; - fov.angleRight += eye.fov.angleRight / 2.0f; - fov.angleUp += eye.fov.angleUp / 2.0f; - fov.angleDown += eye.fov.angleDown / 2.0f; + for (int eye = 0; eye < ovrMaxNumEyes; eye++) { + fov.angleLeft += vrView[eye].fov.angleLeft / 2.0f; + fov.angleRight += vrView[eye].fov.angleRight / 2.0f; + fov.angleUp += vrView[eye].fov.angleUp / 2.0f; + fov.angleDown += vrView[eye].fov.angleDown / 2.0f; } - vrFov[0] = 2.0 / (tan(fov.angleRight) - tan(fov.angleLeft)); - vrFov[1] = 2.0 / (tan(fov.angleUp) - tan(fov.angleDown)); + float nearZ = g_Config.fFieldOfViewPercentage / 200.0f; + float tanAngleLeft = tanf(fov.angleLeft); + float tanAngleRight = tanf(fov.angleRight); + float tanAngleDown = tanf(fov.angleDown); + float tanAngleUp = tanf(fov.angleUp); + float M[16] = {}; + M[0] = 2 / (tanAngleRight - tanAngleLeft); + M[2] = (tanAngleRight + tanAngleLeft) / (tanAngleRight - tanAngleLeft); + M[5] = 2 / (tanAngleUp - tanAngleDown); + M[6] = (tanAngleUp + tanAngleDown) / (tanAngleUp - tanAngleDown); + M[10] = -1; + M[11] = -(nearZ + nearZ); + M[14] = -1; + memcpy(vrMatrix[VR_PROJECTION_MATRIX], M, sizeof(float) * 16); // Decide if the scene is 3D or not VR_SetConfigFloat(VR_CONFIG_CANVAS_ASPECT, 480.0f / 272.0f); @@ -790,16 +808,19 @@ void UpdateVRParams(float* projMatrix) { } void UpdateVRProjection(float* projMatrix, float* leftEye, float* rightEye) { - float hmdProjection[16]; - memcpy(hmdProjection, projMatrix, 16 * sizeof(float)); - hmdProjection[0] = vrFov[0]; - hmdProjection[5] = vrFov[1]; + float* hmdProjection = vrMatrix[VR_PROJECTION_MATRIX]; + for (int i = 0; i < 16; i++) { + if ((hmdProjection[i] > 0) != (projMatrix[i] > 0)) { + hmdProjection[i] *= -1.0f; + } + } memcpy(leftEye, hmdProjection, 16 * sizeof(float)); memcpy(rightEye, hmdProjection, 16 * sizeof(float)); } void UpdateVRView(float* leftEye, float* rightEye) { float* dst[] = {leftEye, rightEye}; + float* matrix[] = {vrMatrix[VR_VIEW_MATRIX_LEFT_EYE], vrMatrix[VR_VIEW_MATRIX_RIGHT_EYE]}; for (int index = 0; index < 2; index++) { // Validate the view matrix @@ -813,7 +834,7 @@ void UpdateVRView(float* leftEye, float* rightEye) { // Get view matrix from the headset Lin::Matrix4x4 hmdView = {}; - memcpy(hmdView.m, vrViewMatrix[index], 16 * sizeof(float)); + memcpy(hmdView.m, matrix[index], 16 * sizeof(float)); // Combine the matrices Lin::Matrix4x4 renderView = hmdView * gameView; @@ -922,12 +943,12 @@ void UpdateVRViewMatrices() { M[11] += side.z; } - for (int eye = 0; eye < ovrMaxNumEyes; eye++) { + for (int matrix = VR_VIEW_MATRIX_LEFT_EYE; matrix <= VR_VIEW_MATRIX_RIGHT_EYE; matrix++) { // Stereoscopy bool vrStereo = !PSP_CoreParameter().compat.vrCompat().ForceMono && g_Config.bEnableStereo; if (vrStereo) { - bool mirrored = vrMirroring[VR_MIRRORING_AXIS_Z] ^ (eye == 1); + bool mirrored = vrMirroring[VR_MIRRORING_AXIS_Z] ^ (matrix == VR_VIEW_MATRIX_RIGHT_EYE); float dx = fabs(vrView[1].pose.position.x - vrView[0].pose.position.x); float dy = fabs(vrView[1].pose.position.y - vrView[0].pose.position.y); float dz = fabs(vrView[1].pose.position.z - vrView[0].pose.position.z); @@ -940,6 +961,6 @@ void UpdateVRViewMatrices() { M[11] += separation.z; } - memcpy(vrViewMatrix[eye], M, sizeof(float) * 16); + memcpy(vrMatrix[matrix], M, sizeof(float) * 16); } } diff --git a/Core/Config.cpp b/Core/Config.cpp index 3730d51599..ae19a040e0 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -958,6 +958,7 @@ static const ConfigSetting vrSettings[] = { ConfigSetting("VRCameraPitch", &g_Config.iCameraPitch, 0, CfgFlag::PER_GAME), ConfigSetting("VRCanvasDistance", &g_Config.fCanvasDistance, 12.0f, CfgFlag::DEFAULT), ConfigSetting("VRCanvas3DDistance", &g_Config.fCanvas3DDistance, 3.0f, CfgFlag::DEFAULT), + ConfigSetting("VRFieldOfView", &g_Config.fFieldOfViewPercentage, 100.0f, CfgFlag::PER_GAME), ConfigSetting("VRHeadUpDisplayScale", &g_Config.fHeadUpDisplayScale, 0.3f, CfgFlag::PER_GAME), ConfigSetting("VRMotionLength", &g_Config.fMotionLength, 0.5f, CfgFlag::DEFAULT), ConfigSetting("VRHeadRotationScale", &g_Config.fHeadRotationScale, 5.0f, CfgFlag::PER_GAME), diff --git a/Core/Config.h b/Core/Config.h index 7d48414be7..f6addf3f1c 100644 --- a/Core/Config.h +++ b/Core/Config.h @@ -482,6 +482,7 @@ public: float fCameraSide; float fCanvasDistance; float fCanvas3DDistance; + float fFieldOfViewPercentage; float fHeadUpDisplayScale; float fMotionLength; float fHeadRotationScale; diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp index 6e800652df..40283066fe 100644 --- a/UI/GameSettingsScreen.cpp +++ b/UI/GameSettingsScreen.cpp @@ -1267,6 +1267,7 @@ void GameSettingsScreen::CreateVRSettings(UI::ViewGroup *vrSettings) { vrSettings->Add(new ItemHeader(vr->T("VR camera"))); vrSettings->Add(new PopupSliderChoiceFloat(&g_Config.fCanvasDistance, 1.0f, 15.0f, 12.0f, vr->T("Distance to 2D menus and scenes"), 1.0f, screenManager(), "")); vrSettings->Add(new PopupSliderChoiceFloat(&g_Config.fCanvas3DDistance, 1.0f, 15.0f, 3.0f, vr->T("Distance to 3D scenes when VR disabled"), 1.0f, screenManager(), "")); + vrSettings->Add(new PopupSliderChoiceFloat(&g_Config.fFieldOfViewPercentage, 100.0f, 200.0f, 100.0f, vr->T("Field of view scale"), 10.0f, screenManager(), vr->T("% of native FoV"))); vrSettings->Add(new CheckBox(&g_Config.bRescaleHUD, vr->T("Heads-up display detection"))); PopupSliderChoiceFloat* vrHudScale = vrSettings->Add(new PopupSliderChoiceFloat(&g_Config.fHeadUpDisplayScale, 0.0f, 1.5f, 0.3f, vr->T("Heads-up display scale"), 0.1f, screenManager(), "")); vrHudScale->SetEnabledPtr(&g_Config.bRescaleHUD); From 1d07aa378f46543ea552b0c814c782e1d3f041c1 Mon Sep 17 00:00:00 2001 From: Lubos Date: Wed, 8 May 2024 22:19:51 +0200 Subject: [PATCH 217/719] OpenXR - Restore FoV texts --- assets/lang/ar_AE.ini | 2 ++ assets/lang/az_AZ.ini | 2 ++ assets/lang/bg_BG.ini | 2 ++ assets/lang/ca_ES.ini | 2 ++ assets/lang/cz_CZ.ini | 2 ++ assets/lang/da_DK.ini | 2 ++ assets/lang/de_DE.ini | 2 ++ assets/lang/dr_ID.ini | 2 ++ assets/lang/en_US.ini | 2 ++ assets/lang/es_ES.ini | 2 ++ assets/lang/es_LA.ini | 2 ++ assets/lang/fa_IR.ini | 2 ++ assets/lang/fi_FI.ini | 2 ++ assets/lang/fr_FR.ini | 2 ++ assets/lang/gl_ES.ini | 2 ++ assets/lang/gr_EL.ini | 2 ++ assets/lang/he_IL.ini | 2 ++ assets/lang/he_IL_invert.ini | 2 ++ assets/lang/hr_HR.ini | 2 ++ assets/lang/hu_HU.ini | 2 ++ assets/lang/id_ID.ini | 2 ++ assets/lang/it_IT.ini | 2 ++ assets/lang/ja_JP.ini | 2 ++ assets/lang/jv_ID.ini | 2 ++ assets/lang/ko_KR.ini | 2 ++ assets/lang/lo_LA.ini | 2 ++ assets/lang/lt-LT.ini | 2 ++ assets/lang/ms_MY.ini | 2 ++ assets/lang/nl_NL.ini | 2 ++ assets/lang/no_NO.ini | 2 ++ assets/lang/pl_PL.ini | 2 ++ assets/lang/pt_BR.ini | 2 ++ assets/lang/pt_PT.ini | 2 ++ assets/lang/ro_RO.ini | 2 ++ assets/lang/ru_RU.ini | 2 ++ assets/lang/sv_SE.ini | 2 ++ assets/lang/tg_PH.ini | 2 ++ assets/lang/th_TH.ini | 2 ++ assets/lang/tr_TR.ini | 2 ++ assets/lang/uk_UA.ini | 2 ++ assets/lang/vi_VN.ini | 2 ++ assets/lang/zh_CN.ini | 2 ++ assets/lang/zh_TW.ini | 2 ++ 43 files changed, 86 insertions(+) diff --git a/assets/lang/ar_AE.ini b/assets/lang/ar_AE.ini index 4181c7a8a3..fcd15beb3c 100644 --- a/assets/lang/ar_AE.ini +++ b/assets/lang/ar_AE.ini @@ -1403,11 +1403,13 @@ Download = ‎تحميل New version of PPSSPP available = ‎تتوفر نسخة جديدة من البرنامج [VR] +% of native FoV = % of native FoV 6DoF movement = 6DoF movement Camera type = وضع الكاميرا Distance to 2D menus and scenes = Distance to 2D menus and scenes Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled Experts only = Experts only +Field of view scale = Field of view scale Force 72Hz update = Force 72Hz update Game camera rotation step per frame = Game camera rotation step per frame Game camera uses rotation smoothing = Game camera uses rotation smoothing diff --git a/assets/lang/az_AZ.ini b/assets/lang/az_AZ.ini index a339158ad8..768293af4e 100644 --- a/assets/lang/az_AZ.ini +++ b/assets/lang/az_AZ.ini @@ -1395,11 +1395,13 @@ Download = Download New version of PPSSPP available = New version of PPSSPP available [VR] +% of native FoV = % of native FoV 6DoF movement = 6DoF movement Camera type = Camera type Distance to 2D menus and scenes = Distance to 2D menus and scenes Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled Experts only = Experts only +Field of view scale = Field of view scale Force 72Hz update = Force 72Hz update Game camera rotation step per frame = Game camera rotation step per frame Game camera uses rotation smoothing = Game camera uses rotation smoothing diff --git a/assets/lang/bg_BG.ini b/assets/lang/bg_BG.ini index c85c7fece0..a5f7398adc 100644 --- a/assets/lang/bg_BG.ini +++ b/assets/lang/bg_BG.ini @@ -1395,11 +1395,13 @@ Download = Свали New version of PPSSPP available = Налична е нова версия на PPSSPP [VR] +% of native FoV = % of native FoV 6DoF movement = 6DoF movement Camera type = Camera type Distance to 2D menus and scenes = Distance to 2D menus and scenes Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled Experts only = Experts only +Field of view scale = Field of view scale Force 72Hz update = Force 72Hz update Game camera rotation step per frame = Game camera rotation step per frame Game camera uses rotation smoothing = Game camera uses rotation smoothing diff --git a/assets/lang/ca_ES.ini b/assets/lang/ca_ES.ini index 4bb9113503..7b5ca41f19 100644 --- a/assets/lang/ca_ES.ini +++ b/assets/lang/ca_ES.ini @@ -1395,11 +1395,13 @@ Download = Descarregar New version of PPSSPP available = Nova versió de PPSSPP disponible [VR] +% of native FoV = % of native FoV 6DoF movement = 6DoF movement Camera type = Camera type Distance to 2D menus and scenes = Distance to 2D menus and scenes Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled Experts only = Experts only +Field of view scale = Field of view scale Force 72Hz update = Force 72Hz update Game camera rotation step per frame = Game camera rotation step per frame Game camera uses rotation smoothing = Game camera uses rotation smoothing diff --git a/assets/lang/cz_CZ.ini b/assets/lang/cz_CZ.ini index aefd5fe26a..a51f16e2a1 100644 --- a/assets/lang/cz_CZ.ini +++ b/assets/lang/cz_CZ.ini @@ -1395,11 +1395,13 @@ Download = Stáhnout New version of PPSSPP available = Je dostupná nová verze PPSSPP [VR] +% of native FoV = % výchozího FoV 6DoF movement = 6DoF movement Camera type = Camera type Distance to 2D menus and scenes = Distance to 2D menus and scenes Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled Experts only = Experts only +Field of view scale = Poměr zorného pole Force 72Hz update = Force 72Hz update Game camera rotation step per frame = Game camera rotation step per frame Game camera uses rotation smoothing = Game camera uses rotation smoothing diff --git a/assets/lang/da_DK.ini b/assets/lang/da_DK.ini index f6414e2912..99a4e535fd 100644 --- a/assets/lang/da_DK.ini +++ b/assets/lang/da_DK.ini @@ -1395,11 +1395,13 @@ Download = Download New version of PPSSPP available = Ny version af PPSSPP tilgængelig [VR] +% of native FoV = % of native FoV 6DoF movement = 6DoF movement Camera type = Camera type Distance to 2D menus and scenes = Distance to 2D menus and scenes Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled Experts only = Experts only +Field of view scale = Field of view scale Force 72Hz update = Force 72Hz update Game camera rotation step per frame = Game camera rotation step per frame Game camera uses rotation smoothing = Game camera uses rotation smoothing diff --git a/assets/lang/de_DE.ini b/assets/lang/de_DE.ini index 73e556d34e..2fd9571140 100644 --- a/assets/lang/de_DE.ini +++ b/assets/lang/de_DE.ini @@ -1395,11 +1395,13 @@ Download = Herunterladen New version of PPSSPP available = Neue PPSSPP Version verfügbar [VR] +% of native FoV = % of native FoV 6DoF movement = 6DoF movement Camera type = Kameratyp Distance to 2D menus and scenes = Distance to 2D menus and scenes Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled Experts only = Experts only +Field of view scale = Field of view scale Force 72Hz update = Force 72Hz update Game camera rotation step per frame = Game camera rotation step per frame Game camera uses rotation smoothing = Game camera uses rotation smoothing diff --git a/assets/lang/dr_ID.ini b/assets/lang/dr_ID.ini index 3105600b36..aafc5567f6 100644 --- a/assets/lang/dr_ID.ini +++ b/assets/lang/dr_ID.ini @@ -1395,11 +1395,13 @@ Download = Download New version of PPSSPP available = New version of PPSSPP available [VR] +% of native FoV = % of native FoV 6DoF movement = 6DoF movement Camera type = Camera type Distance to 2D menus and scenes = Distance to 2D menus and scenes Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled Experts only = Experts only +Field of view scale = Field of view scale Force 72Hz update = Force 72Hz update Game camera rotation step per frame = Game camera rotation step per frame Game camera uses rotation smoothing = Game camera uses rotation smoothing diff --git a/assets/lang/en_US.ini b/assets/lang/en_US.ini index e0ff636c0a..78d349e7c4 100644 --- a/assets/lang/en_US.ini +++ b/assets/lang/en_US.ini @@ -1420,12 +1420,14 @@ Progress: %1% = Progress: %1% Screen representation = Screen representation [VR] +% of native FoV = % of native FoV 6DoF movement = 6DoF movement Distance to 2D menus and scenes = Distance to 2D menus and scenes Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled Experts only = Experts only Game camera rotation step per frame = Game camera rotation step per frame Game camera uses rotation smoothing = Game camera uses rotation smoothing +Field of view scale = Field of view scale Force 72Hz update = Force 72Hz update Heads-up display scale = Heads-up display scale Heads-up display detection = Heads-up display detection diff --git a/assets/lang/es_ES.ini b/assets/lang/es_ES.ini index 2a12dd7a91..8630154c69 100644 --- a/assets/lang/es_ES.ini +++ b/assets/lang/es_ES.ini @@ -1397,11 +1397,13 @@ Download = Descargar New version of PPSSPP available = Nueva versión de PPSSPP disponible [VR] +% of native FoV = % de campo de visión nativo 6DoF movement = Movimiento 6DoF Camera type = Camera type Distance to 2D menus and scenes = Distancia de los menús y escenas 2D Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled Experts only = Experts only +Field of view scale = Escala de campo de visión Force 72Hz update = Forzar actualizar a 72Hz Game camera rotation step per frame = Game camera rotation step per frame Game camera uses rotation smoothing = Game camera uses rotation smoothing diff --git a/assets/lang/es_LA.ini b/assets/lang/es_LA.ini index 91197c382f..36f30b1ef6 100644 --- a/assets/lang/es_LA.ini +++ b/assets/lang/es_LA.ini @@ -1397,11 +1397,13 @@ Download = Descargar New version of PPSSPP available = Nueva versión de PPSSPP disponible [VR] +% of native FoV = % of native FoV 6DoF movement = 6DoF movement Camera type = Camera type Distance to 2D menus and scenes = Distance to 2D menus and scenes Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled Experts only = Experts only +Field of view scale = Field of view scale Force 72Hz update = Force 72Hz update Game camera rotation step per frame = Game camera rotation step per frame Game camera uses rotation smoothing = Game camera uses rotation smoothing diff --git a/assets/lang/fa_IR.ini b/assets/lang/fa_IR.ini index ad3f991441..4577096ad8 100644 --- a/assets/lang/fa_IR.ini +++ b/assets/lang/fa_IR.ini @@ -1395,11 +1395,13 @@ Download = دانلود New version of PPSSPP available = ورژن جدیدی از ppsspp موجود است [VR] +% of native FoV = % of native FoV 6DoF movement = 6DoF movement Camera type = Camera type Distance to 2D menus and scenes = Distance to 2D menus and scenes Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled Experts only = Experts only +Field of view scale = Field of view scale Force 72Hz update = Force 72Hz update Game camera rotation step per frame = Game camera rotation step per frame Game camera uses rotation smoothing = Game camera uses rotation smoothing diff --git a/assets/lang/fi_FI.ini b/assets/lang/fi_FI.ini index 73f45b4077..47d5900c49 100644 --- a/assets/lang/fi_FI.ini +++ b/assets/lang/fi_FI.ini @@ -1397,11 +1397,13 @@ Download = Lataa New version of PPSSPP available = Uusi PPSSPP-versio saatavilla [VR] +% of native FoV = % of native FoV 6DoF movement = 6DoF-liike (kuusi vapausastetta) Camera type = Kameratyyppi Distance to 2D menus and scenes = Etäisyys 2D-valikkoihin ja kohtauksiin Distance to 3D scenes when VR disabled = Etäisyys 3D-kohtauksiin, kun VR on poistettu käytöstä Experts only = Vain asiantuntijoille +Field of view scale = Field of view scale Force 72Hz update = Pakota 72Hz päivitys Game camera rotation step per frame = Pelikameran kiertovaihe per kuva Game camera uses rotation smoothing = Pelikamera käyttää kiertotason tasoitusta diff --git a/assets/lang/fr_FR.ini b/assets/lang/fr_FR.ini index 3f34a7483a..36602913f1 100644 --- a/assets/lang/fr_FR.ini +++ b/assets/lang/fr_FR.ini @@ -1386,11 +1386,13 @@ Download = Télécharger New version of PPSSPP available = Nouvelle version de PPSSPP disponible [VR] +% of native FoV = % of native FoV 6DoF movement = 6DoF movement Camera type = Camera type Distance to 2D menus and scenes = Distance to 2D menus and scenes Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled Experts only = Experts only +Field of view scale = Field of view scale Force 72Hz update = Force 72Hz update Game camera rotation step per frame = Game camera rotation step per frame Game camera uses rotation smoothing = Game camera uses rotation smoothing diff --git a/assets/lang/gl_ES.ini b/assets/lang/gl_ES.ini index c2655fdd95..0d6f23ce53 100644 --- a/assets/lang/gl_ES.ini +++ b/assets/lang/gl_ES.ini @@ -1395,11 +1395,13 @@ Download = Descargar New version of PPSSPP available = Nova versión de PPSSPP dispoñible [VR] +% of native FoV = % of native FoV 6DoF movement = 6DoF movement Camera type = Camera type Distance to 2D menus and scenes = Distance to 2D menus and scenes Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled Experts only = Experts only +Field of view scale = Field of view scale Force 72Hz update = Force 72Hz update Game camera rotation step per frame = Game camera rotation step per frame Game camera uses rotation smoothing = Game camera uses rotation smoothing diff --git a/assets/lang/gr_EL.ini b/assets/lang/gr_EL.ini index 7c077aa9c2..c1d418d99e 100644 --- a/assets/lang/gr_EL.ini +++ b/assets/lang/gr_EL.ini @@ -1395,11 +1395,13 @@ Download = Κατέβασμα New version of PPSSPP available = Νέα διαθέσιμη έκδοση PPSSPP [VR] +% of native FoV = % of native FoV 6DoF movement = 6DoF movement Camera type = Camera type Distance to 2D menus and scenes = Distance to 2D menus and scenes Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled Experts only = Experts only +Field of view scale = Field of view scale Force 72Hz update = Force 72Hz update Game camera rotation step per frame = Game camera rotation step per frame Game camera uses rotation smoothing = Game camera uses rotation smoothing diff --git a/assets/lang/he_IL.ini b/assets/lang/he_IL.ini index db0dd96e92..f9c1cbf526 100644 --- a/assets/lang/he_IL.ini +++ b/assets/lang/he_IL.ini @@ -1395,11 +1395,13 @@ Download = Download New version of PPSSPP available = New version of PPSSPP available [VR] +% of native FoV = % of native FoV 6DoF movement = 6DoF movement Camera type = Camera type Distance to 2D menus and scenes = Distance to 2D menus and scenes Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled Experts only = Experts only +Field of view scale = Field of view scale Force 72Hz update = Force 72Hz update Game camera rotation step per frame = Game camera rotation step per frame Game camera uses rotation smoothing = Game camera uses rotation smoothing diff --git a/assets/lang/he_IL_invert.ini b/assets/lang/he_IL_invert.ini index 456986aecb..c386ebd822 100644 --- a/assets/lang/he_IL_invert.ini +++ b/assets/lang/he_IL_invert.ini @@ -1395,11 +1395,13 @@ Download = Download New version of PPSSPP available = New version of PPSSPP available [VR] +% of native FoV = % of native FoV 6DoF movement = 6DoF movement Camera type = Camera type Distance to 2D menus and scenes = Distance to 2D menus and scenes Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled Experts only = Experts only +Field of view scale = Field of view scale Force 72Hz update = Force 72Hz update Game camera rotation step per frame = Game camera rotation step per frame Game camera uses rotation smoothing = Game camera uses rotation smoothing diff --git a/assets/lang/hr_HR.ini b/assets/lang/hr_HR.ini index 71029f043a..d728c8a986 100644 --- a/assets/lang/hr_HR.ini +++ b/assets/lang/hr_HR.ini @@ -1395,11 +1395,13 @@ Download = Instaliraj New version of PPSSPP available = Nova verzija PPSSPP-a je dostupna [VR] +% of native FoV = % of native FoV 6DoF movement = 6DoF movement Camera type = Camera type Distance to 2D menus and scenes = Distance to 2D menus and scenes Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled Experts only = Experts only +Field of view scale = Field of view scale Force 72Hz update = Force 72Hz update Game camera rotation step per frame = Game camera rotation step per frame Game camera uses rotation smoothing = Game camera uses rotation smoothing diff --git a/assets/lang/hu_HU.ini b/assets/lang/hu_HU.ini index 1bcdcae7e0..8a6dcc5309 100644 --- a/assets/lang/hu_HU.ini +++ b/assets/lang/hu_HU.ini @@ -1395,11 +1395,13 @@ Download = Letöltés New version of PPSSPP available = Elérhető a PPSSPP egy újabb verziója [VR] +% of native FoV = % of native FoV 6DoF movement = 6DoF movement Camera type = Camera type Distance to 2D menus and scenes = Distance to 2D menus and scenes Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled Experts only = Experts only +Field of view scale = Field of view scale Force 72Hz update = Force 72Hz update Game camera rotation step per frame = Game camera rotation step per frame Game camera uses rotation smoothing = Game camera uses rotation smoothing diff --git a/assets/lang/id_ID.ini b/assets/lang/id_ID.ini index c9d195e86b..bf9dcbfef7 100644 --- a/assets/lang/id_ID.ini +++ b/assets/lang/id_ID.ini @@ -1395,11 +1395,13 @@ Download = Unduh New version of PPSSPP available = Versi baru PPSSPP tersedia [VR] +% of native FoV = % of native FoV 6DoF movement = 6DoF movement Camera type = Camera type Distance to 2D menus and scenes = Distance to 2D menus and scenes Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled Experts only = Experts only +Field of view scale = Field of view scale Force 72Hz update = Force 72Hz update Game camera rotation step per frame = Game camera rotation step per frame Game camera uses rotation smoothing = Game camera uses rotation smoothing diff --git a/assets/lang/it_IT.ini b/assets/lang/it_IT.ini index 8373dc768b..6f00cae72b 100644 --- a/assets/lang/it_IT.ini +++ b/assets/lang/it_IT.ini @@ -1397,11 +1397,13 @@ Download = Scarica New version of PPSSPP available = È disponibile una nuova versione di PPSSPP [VR] +% of native FoV = % del FoV nativo 6DoF movement = Movimento 6DoF Camera type = Tipo di telecamera Distance to 2D menus and scenes = Distanza dai menu e dalle scene 2D Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled Experts only = Solo per esperti +Field of view scale = Scalatura "Field of view" Force 72Hz update = Forza aggiornamento a 72Hz Game camera rotation step per frame = Passo di rotazione della telecamera di gioco per fotogramma Game camera uses rotation smoothing = La telecamera di gioco utilizza la rotazione fluida diff --git a/assets/lang/ja_JP.ini b/assets/lang/ja_JP.ini index baf633bf35..642ff0a482 100644 --- a/assets/lang/ja_JP.ini +++ b/assets/lang/ja_JP.ini @@ -1395,11 +1395,13 @@ Download = ダウンロード New version of PPSSPP available = 新しいバージョンのPPSSPPを利用できます [VR] +% of native FoV = ネイティブ視野角(FoV)の % 6DoF movement = 6DoF動作 Camera type = Camera type Distance to 2D menus and scenes = 2Dメニューと空間までの距離 Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled Experts only = Experts only +Field of view scale = 視野角のスケール Force 72Hz update = 72Hzに強制的に更新 Game camera rotation step per frame = Game camera rotation step per frame Game camera uses rotation smoothing = Game camera uses rotation smoothing diff --git a/assets/lang/jv_ID.ini b/assets/lang/jv_ID.ini index 6600ef66e0..06580dec76 100644 --- a/assets/lang/jv_ID.ini +++ b/assets/lang/jv_ID.ini @@ -1395,11 +1395,13 @@ Download = Unduh New version of PPSSPP available = Versi anyar PPSSPP mpun ono monggo di comot [VR] +% of native FoV = % of native FoV 6DoF movement = 6DoF movement Camera type = Camera type Distance to 2D menus and scenes = Distance to 2D menus and scenes Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled Experts only = Experts only +Field of view scale = Field of view scale Force 72Hz update = Force 72Hz update Game camera rotation step per frame = Game camera rotation step per frame Game camera uses rotation smoothing = Game camera uses rotation smoothing diff --git a/assets/lang/ko_KR.ini b/assets/lang/ko_KR.ini index 1514f77021..8eae6d1fec 100644 --- a/assets/lang/ko_KR.ini +++ b/assets/lang/ko_KR.ini @@ -1396,12 +1396,14 @@ Progress: %1% = 진행율: %1% Screen representation = 화면 표현 [VR] +% of native FoV = 실제 시야의 % 6DoF movement = 6DoF 이동 Distance to 2D menus and scenes = 2D 메뉴 및 장면까지의 거리 Distance to 3D scenes when VR disabled = VR 비활성화 시 3D 장면까지의 거리 Experts only = 전문가 전용 Game camera rotation step per frame = 프레임당 게임 카메라 회전 단계 Game camera uses rotation smoothing = 회전 스무딩을 사용하는 게임 카메라 +Field of view scale = 시야 스케일 Force 72Hz update = 강제 72Hz 업데이트 Heads-up display scale = 헤드업 디스플레이 스케일 Heads-up display detection = 헤드업 디스플레이 감지 diff --git a/assets/lang/lo_LA.ini b/assets/lang/lo_LA.ini index 7320277871..beec4b0f8c 100644 --- a/assets/lang/lo_LA.ini +++ b/assets/lang/lo_LA.ini @@ -1395,11 +1395,13 @@ Download = ດາວໂຫຼດ New version of PPSSPP available = ເວີຊັ່ນໃໝ່ຂອງ PPSSPP ພ້ອມໃຫ້ໂຫຼດແລ້ວ! [VR] +% of native FoV = % of native FoV 6DoF movement = 6DoF movement Camera type = Camera type Distance to 2D menus and scenes = Distance to 2D menus and scenes Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled Experts only = Experts only +Field of view scale = Field of view scale Force 72Hz update = Force 72Hz update Game camera rotation step per frame = Game camera rotation step per frame Game camera uses rotation smoothing = Game camera uses rotation smoothing diff --git a/assets/lang/lt-LT.ini b/assets/lang/lt-LT.ini index 58b2bc0553..148a2f12c5 100644 --- a/assets/lang/lt-LT.ini +++ b/assets/lang/lt-LT.ini @@ -1395,11 +1395,13 @@ Download = Parsisiūsti New version of PPSSPP available = Galima nauja "PPSSPP" versija [VR] +% of native FoV = % of native FoV 6DoF movement = 6DoF movement Camera type = Camera type Distance to 2D menus and scenes = Distance to 2D menus and scenes Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled Experts only = Experts only +Field of view scale = Field of view scale Force 72Hz update = Force 72Hz update Game camera rotation step per frame = Game camera rotation step per frame Game camera uses rotation smoothing = Game camera uses rotation smoothing diff --git a/assets/lang/ms_MY.ini b/assets/lang/ms_MY.ini index 3f3b02890a..68f6340080 100644 --- a/assets/lang/ms_MY.ini +++ b/assets/lang/ms_MY.ini @@ -1395,11 +1395,13 @@ Download = Muat turun New version of PPSSPP available = Versi terbaru PPSSPP tersedia [VR] +% of native FoV = % of native FoV 6DoF movement = 6DoF movement Camera type = Camera type Distance to 2D menus and scenes = Distance to 2D menus and scenes Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled Experts only = Experts only +Field of view scale = Field of view scale Force 72Hz update = Force 72Hz update Game camera rotation step per frame = Game camera rotation step per frame Game camera uses rotation smoothing = Game camera uses rotation smoothing diff --git a/assets/lang/nl_NL.ini b/assets/lang/nl_NL.ini index 93e01078dc..63fe3927f8 100644 --- a/assets/lang/nl_NL.ini +++ b/assets/lang/nl_NL.ini @@ -1395,11 +1395,13 @@ Download = Downloaden New version of PPSSPP available = Er is een nieuwe versie van PPSSPP beschikbaar [VR] +% of native FoV = % of native FoV 6DoF movement = 6DoF movement Camera type = Camera type Distance to 2D menus and scenes = Distance to 2D menus and scenes Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled Experts only = Experts only +Field of view scale = Field of view scale Force 72Hz update = Force 72Hz update Game camera rotation step per frame = Game camera rotation step per frame Game camera uses rotation smoothing = Game camera uses rotation smoothing diff --git a/assets/lang/no_NO.ini b/assets/lang/no_NO.ini index 97684a50e3..4bc7c46797 100644 --- a/assets/lang/no_NO.ini +++ b/assets/lang/no_NO.ini @@ -1395,11 +1395,13 @@ Download = Download New version of PPSSPP available = New version of PPSSPP available [VR] +% of native FoV = % of native FoV 6DoF movement = 6DoF movement Camera type = Camera type Distance to 2D menus and scenes = Distance to 2D menus and scenes Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled Experts only = Experts only +Field of view scale = Field of view scale Force 72Hz update = Force 72Hz update Game camera rotation step per frame = Game camera rotation step per frame Game camera uses rotation smoothing = Game camera uses rotation smoothing diff --git a/assets/lang/pl_PL.ini b/assets/lang/pl_PL.ini index 20f6e1c3eb..39e77dc219 100644 --- a/assets/lang/pl_PL.ini +++ b/assets/lang/pl_PL.ini @@ -1401,11 +1401,13 @@ Download = Pobierz New version of PPSSPP available = Dostępna jest nowa wersja PPSSPP! [VR] +% of native FoV = % natywnego FoV 6DoF movement = 6DoF movement Camera type = Typ kamery Distance to 2D menus and scenes = Dystans do elemtentów 2D Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled Experts only = Tylko dla ekspertów +Field of view scale = Skala pola widzenia Force 72Hz update = Wymuś odświeżanie w 72Hz Game camera rotation step per frame = Krok obrotu kamery gry na klatkę Game camera uses rotation smoothing = Kamera gry wykorzystuje wygładzanie rotacji diff --git a/assets/lang/pt_BR.ini b/assets/lang/pt_BR.ini index ec21e45617..3cbab259c5 100644 --- a/assets/lang/pt_BR.ini +++ b/assets/lang/pt_BR.ini @@ -1422,12 +1422,14 @@ Progress: %1% = Progresso: %1% Screen representation = Representação da tela [VR] +% of native FoV = % do campo de visão nativo 6DoF movement = Movimentação do 6DoF Distance to 2D menus and scenes = Distância até os menus e cenas 2D Distance to 3D scenes when VR disabled = Distância nas cenas em 3D quando a realidade virtual está desativada Experts only = Só pra experts Game camera rotation step per frame = Passo da rotação da câmera do jogo por frame Game camera uses rotation smoothing = A câmera do jogo usa suavização da rotação +Field of view scale = Escala do campo de visualização Force 72Hz update = Forçar atualização em 72 Hz Heads-up display scale = Escala do aviso antecipado da exibição Heads-up display detection = Detecção do aviso antecipado da exibição diff --git a/assets/lang/pt_PT.ini b/assets/lang/pt_PT.ini index aa90a3fbd4..18b5816e6e 100644 --- a/assets/lang/pt_PT.ini +++ b/assets/lang/pt_PT.ini @@ -1422,11 +1422,13 @@ Progress: %1% = Progresso: %1% Screen representation = Representação da tela [VR] +% of native FoV = % do campo de visão (FoV) nativo 6DoF movement = Movimento 6DoF Camera type = Tipo de câmera Distance to 2D menus and scenes = Distância aos menus e cenas 2D Distance to 3D scenes when VR disabled = Distância às cenas 3D quando a realidade virtual estiver desativada Experts only = Apenas programadores +Field of view scale = Escala do campo de visão (FoV) Force 72Hz update = Forçar taxa de atualização de 72Hz Game camera rotation step per frame = Passo da rotação da câmera do jogo por frame Game camera uses rotation smoothing = A câmera do jogo usa suavização da rotação diff --git a/assets/lang/ro_RO.ini b/assets/lang/ro_RO.ini index e749467e13..213ca0b982 100644 --- a/assets/lang/ro_RO.ini +++ b/assets/lang/ro_RO.ini @@ -1396,11 +1396,13 @@ Download = Descarcă New version of PPSSPP available = Nouă versiune de PPSSPP disponibilă. [VR] +% of native FoV = % of native FoV 6DoF movement = 6DoF movement Camera type = Camera type Distance to 2D menus and scenes = Distance to 2D menus and scenes Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled Experts only = Experts only +Field of view scale = Field of view scale Force 72Hz update = Force 72Hz update Game camera rotation step per frame = Game camera rotation step per frame Game camera uses rotation smoothing = Game camera uses rotation smoothing diff --git a/assets/lang/ru_RU.ini b/assets/lang/ru_RU.ini index c380708029..a37b361305 100644 --- a/assets/lang/ru_RU.ini +++ b/assets/lang/ru_RU.ini @@ -1395,11 +1395,13 @@ Download = Загрузить New version of PPSSPP available = Доступна новая версия PPSSPP [VR] +% of native FoV = % стандартного угла обзора 6DoF movement = Движение 6DoF Camera type = Тип камеры Distance to 2D menus and scenes = Расстояние до 2D-меню и сцен Distance to 3D scenes when VR disabled = Расстояние до 3D-сцен при отключенной ВР Experts only = Только для экспертов +Field of view scale = Масштаб угла обзора Force 72Hz update = Принудительная частота обновления 72 Гц Game camera rotation step per frame = Шаг поворота внутриигровой камеры за 1 кадр Game camera uses rotation smoothing = При повороте внутриигровой камеры используется сглаживание diff --git a/assets/lang/sv_SE.ini b/assets/lang/sv_SE.ini index b57243973a..a2d2179138 100644 --- a/assets/lang/sv_SE.ini +++ b/assets/lang/sv_SE.ini @@ -1396,11 +1396,13 @@ Download = Ladda ner New version of PPSSPP available = Ny version av PPSSPP tillgänglig [VR] +% of native FoV = % of native FoV 6DoF movement = 6DoF rörelse Camera type = Kameratyp Distance to 2D menus and scenes = Avstånd till 2D-menyer och scener Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled Experts only = Experts only +Field of view scale = Field of view-skala Force 72Hz update = Tvinga 72Hz uppdateringsfrekvens Game camera rotation step per frame = Game camera rotation step per frame Game camera uses rotation smoothing = Game camera uses rotation smoothing diff --git a/assets/lang/tg_PH.ini b/assets/lang/tg_PH.ini index 58fa81001f..a1d56a52f7 100644 --- a/assets/lang/tg_PH.ini +++ b/assets/lang/tg_PH.ini @@ -1399,11 +1399,13 @@ Download = Download New version of PPSSPP available = Meron nang bagong bersiyon ang PPSSPP [VR] +% of native FoV = % of native FoV 6DoF movement = 6DoF movement Camera type = Uri ng Camera Distance to 2D menus and scenes = Distansya sa mga 2D na menu at mga eksena Distance to 3D scenes when VR disabled = Distansya sa mga 3D na eksena noong hindi pinagana ang VR Experts only = Mga eksperto lamang +Field of view scale = Field of view scale Force 72Hz update = Force 72Hz update Game camera rotation step per frame = Hakbang sa pag-ikot ng camera ng laro sa bawat frame Game camera uses rotation smoothing = Gumagamit ng rotation smoothing ang camera ng laro diff --git a/assets/lang/th_TH.ini b/assets/lang/th_TH.ini index 7a7637dda2..138fe30d6a 100644 --- a/assets/lang/th_TH.ini +++ b/assets/lang/th_TH.ini @@ -1423,6 +1423,7 @@ Download = ดาวน์โหลด New version of PPSSPP available = PPSSPP เวอร์ชั่นใหม่พร้อมให้ดาวน์โหลดแล้ว! [VR] +% of native FoV = % ของค่า FoV ดั้งเดิม 6DoF movement = การเคลื่อนไหวแบบ 6DoF Camera type = ปรับแต่งประเภทมุมกล้อง Disabled = ปิดการใช้งาน @@ -1430,6 +1431,7 @@ Distance to 2D menus and scenes = ระยะห่างจากเมนู Distance to 3D scenes when VR disabled = ระยะห่างจากฉากสามมิติ เมื่อ VR ถูกปิดใช้งาน Enable passthrough = เปิดใช้งานการส่งผ่าน Experts only = สำหรับผู้เชี่ยวชาญเท่านั้น +Field of view scale = สเกลของมุมมองพื้นที่รอบตัว First person -> Top view = มุมมองบุคคลที่หนึ่ง -> มุมมองจากด้านบน Force 72Hz update = บังคับรีเฟรชเรทไปที่ 72Hz Game camera rotation step per frame = สเต็ปการหมุนมุมกล้องเกมต่อเฟรม diff --git a/assets/lang/tr_TR.ini b/assets/lang/tr_TR.ini index 6e0333ce92..0bd1d6fd50 100644 --- a/assets/lang/tr_TR.ini +++ b/assets/lang/tr_TR.ini @@ -1396,11 +1396,13 @@ Download = İndir New version of PPSSPP available = PPSSPP'nin yeni versiyonu mevcut [VR] +% of native FoV = % of native FoV 6DoF movement = 6DoF movement Camera type = Camera type Distance to 2D menus and scenes = Distance to 2D menus and scenes Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled Experts only = Experts only +Field of view scale = Field of view scale Force 72Hz update = Force 72Hz update Game camera rotation step per frame = Game camera rotation step per frame Game camera uses rotation smoothing = Game camera uses rotation smoothing diff --git a/assets/lang/uk_UA.ini b/assets/lang/uk_UA.ini index 3db6e8b99a..a8b6f6a826 100644 --- a/assets/lang/uk_UA.ini +++ b/assets/lang/uk_UA.ini @@ -1395,11 +1395,13 @@ Download = Завантажити New version of PPSSPP available = Доступна нова версія PPSSPP [VR] +% of native FoV = % of native FoV 6DoF movement = 6DoF movement Camera type = Camera type Distance to 2D menus and scenes = Distance to 2D menus and scenes Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled Experts only = Experts only +Field of view scale = Field of view scale Force 72Hz update = Force 72Hz update Game camera rotation step per frame = Game camera rotation step per frame Game camera uses rotation smoothing = Game camera uses rotation smoothing diff --git a/assets/lang/vi_VN.ini b/assets/lang/vi_VN.ini index ba1e750fd9..200b0fefe5 100644 --- a/assets/lang/vi_VN.ini +++ b/assets/lang/vi_VN.ini @@ -1395,11 +1395,13 @@ Download = Tải về New version of PPSSPP available = Đã có phiên bản mới của PPSSPP [VR] +% of native FoV = % of native FoV 6DoF movement = 6DoF movement Camera type = Camera type Distance to 2D menus and scenes = Distance to 2D menus and scenes Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled Experts only = Experts only +Field of view scale = Field of view scale Force 72Hz update = Force 72Hz update Game camera rotation step per frame = Game camera rotation step per frame Game camera uses rotation smoothing = Game camera uses rotation smoothing diff --git a/assets/lang/zh_CN.ini b/assets/lang/zh_CN.ini index e2ce0bbe1c..87472b1165 100644 --- a/assets/lang/zh_CN.ini +++ b/assets/lang/zh_CN.ini @@ -1398,11 +1398,13 @@ No settings matched '%1' = 没有找到选项“%1” Search term = 搜索关键词 [VR] +% of native FoV = 原生视角的% 6DoF movement = 6自由度移动 Camera type = 相机类型 Distance to 2D menus and scenes = 2D菜单和场景的距离 Distance to 3D scenes when VR disabled = 3D场景的距离 (VR关闭时) Experts only = 专家模式 +Field of view scale = 视角比例 Force 72Hz update = 强制72Hz刷新 Game camera rotation step per frame = 游戏视角每帧灵敏度 Game camera uses rotation smoothing = 游戏视角平滑转动 diff --git a/assets/lang/zh_TW.ini b/assets/lang/zh_TW.ini index c7514df27a..075e7ee573 100644 --- a/assets/lang/zh_TW.ini +++ b/assets/lang/zh_TW.ini @@ -1396,11 +1396,13 @@ Progress: %1% = 進度：%1% Screen representation = 螢幕呈現 [VR] +% of native FoV = % 於原生視野 6DoF movement = 六自由度移動 Camera type = 相機類型 Distance to 2D menus and scenes = 2D 選單及場景距離 Distance to 3D scenes when VR disabled = VR 停用時的 3D 場景距離 Experts only = 僅限專家 +Field of view scale = 視野縮放 Force 72Hz update = 強制 72Hz 更新 Game camera rotation step per frame = 遊戲相機每影格旋轉步數 Game camera uses rotation smoothing = 遊戲相機使用旋轉平滑 From 8409914b798b16ac5ee22ae56bcd29d90811d6ba Mon Sep 17 00:00:00 2001 From: Nemoumbra Date: Thu, 9 May 2024 04:43:45 +0300 Subject: [PATCH 218/719] Added deciphering of ~SCE headers (cracked by me) --- Core/HLE/sceKernelModule.cpp | 65 +++++++++++++++++++++++++++++++++++- 1 file changed, 64 insertions(+), 1 deletion(-) diff --git a/Core/HLE/sceKernelModule.cpp b/Core/HLE/sceKernelModule.cpp index 409698cea8..1b2908e28c 100644 --- a/Core/HLE/sceKernelModule.cpp +++ b/Core/HLE/sceKernelModule.cpp @@ -1150,6 +1150,62 @@ static int gzipDecompress(u8 *OutBuffer, int OutBufferLength, u8 *InBuffer) { return stream.total_out; } +static void parsePrxLibInfo(const u8* ptr, u32 headerSize) { + // 0x0 - ~SCE + // 0x4 - the header's size + // At some offset (starting from 0x8) - the lib info + const u8 start = 0x8; + const u8 lib_info_size = 8 + 12 + 4; // The prefix, libname and version + + if (headerSize - start < lib_info_size) { + // That's very wrong! + WARN_LOG(SCEMODULE, "~SCE module, header too small (0x%x bytes) to fit a lib info", headerSize); + return; + } + + auto end = ptr + headerSize; + ptr += start; + while (*ptr == 0x0 && ptr < end) { + ++ptr; + } + + // Now that we have found the start, let's do one more check + if (end - ptr < lib_info_size) { + // That's very wrong! + WARN_LOG(SCEMODULE, "~SCE module, unexpected header (not an error)"); + return; + } + + // The lib info prefix looks like {'\', 'y', 'r', '=', '`', 'c', '`', '0'} (Big Endian) + const u64_le lib_info_prefix = 0x306063603D72795C; + auto lib_info_ptr = reinterpret_cast(ptr); + if (*lib_info_ptr != lib_info_prefix) { + // That's very wrong! + WARN_LOG(SCEMODULE, "~SCE module, unexpected header (not an error)"); + return; + } + ptr += sizeof(lib_info_prefix); + + // Decipher the Caesar cipher with sanity checks (isprint) + + u8 nameBuffer[12 + 1]; + for (int i = 0; i < 12; ++i, ++ptr) { + u8 symbol = *ptr - 0x12u; + nameBuffer[i] = isprint(symbol) ? symbol : '?'; + } + nameBuffer[12] = '\0'; + + u8 versionBuffer[8] = "?.?.?.?"; + for (int i = 0; i < 4; ++i, ++ptr) { + u8 symbol = *ptr - 0x14u; + if (isprint(symbol)) { + versionBuffer[2 * i] = symbol; + } + } + + INFO_LOG(SCEMODULE, "~SCE module: Lib-PSP %s (SDK %s)", nameBuffer, versionBuffer); +} + static PSPModule *__KernelLoadELFFromPtr(const u8 *ptr, size_t elfSize, u32 loadAddress, bool fromTop, std::string *error_string, u32 *magic, u32 &error) { PSPModule *module = new PSPModule(); kernelObjects.Create(module); @@ -1164,13 +1220,20 @@ static PSPModule *__KernelLoadELFFromPtr(const u8 *ptr, size_t elfSize, u32 load u8 *newptr = 0; u32_le *magicPtr = (u32_le *) ptr; if (*magicPtr == 0x4543537e) { // "~SCE" - INFO_LOG(SCEMODULE, "~SCE module, skipping header"); + u32 headerSize = *(u32_le*)(ptr + 4); if (headerSize < elfSize) { + // Parse and print the lib info + parsePrxLibInfo(ptr, headerSize); + + // Advance the pointer to the relevant data ptr += headerSize; elfSize -= headerSize; magicPtr = (u32_le *)ptr; } + else { + ERROR_LOG(SCEMODULE, "~SCE module: bad data"); + } } *magic = *magicPtr; if (*magic == 0x5053507e && elfSize > sizeof(PSP_Header)) { // "~PSP" From b7321f5bbfaf6bad57d95de096dec8dd230dfbc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Thu, 9 May 2024 15:59:26 +0200 Subject: [PATCH 219/719] Hook up the Smart 2D texture filtering option for retroarch --- libretro/libretro.cpp | 9 +++++++++ libretro/libretro_core_options.h | 10 ++++++++++ 2 files changed, 19 insertions(+) diff --git a/libretro/libretro.cpp b/libretro/libretro.cpp index 4788a15964..0a19b55135 100644 --- a/libretro/libretro.cpp +++ b/libretro/libretro.cpp @@ -842,6 +842,15 @@ static void check_variables(CoreParameter &coreParam) g_Config.iTexFiltering = 4; } + var.key = "ppsspp_smart_2d_texture_filtering"; + if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) + { + if (!strcmp(var.value, "disabled")) + g_Config.bSmart2DTexFiltering = false; + else + g_Config.bSmart2DTexFiltering = true; + } + var.key = "ppsspp_texture_replacement"; if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) { diff --git a/libretro/libretro_core_options.h b/libretro/libretro_core_options.h index e572242b5a..a39e03e4b6 100644 --- a/libretro/libretro_core_options.h +++ b/libretro/libretro_core_options.h @@ -584,6 +584,16 @@ struct retro_core_option_v2_definition option_defs_us[] = { }, "Auto" }, + { + "ppsspp_smart_2d_texture_filtering", + "Smart 2D Texture Filtering", + NULL, + "Gets rid of some visual artifacts caused by unnecessary texture filtering in some 2D games, by switching to nearest filtering.", + NULL, + "video", + BOOL_OPTIONS, + "disabled" + }, { "ppsspp_texture_replacement", "Texture Replacement", From d66054b15f4bb3b943049feaac4dcca9833c52d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Fri, 10 May 2024 13:30:49 +0200 Subject: [PATCH 220/719] Bump langtool deps --- Tools/langtool/Cargo.lock | 39 +++++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/Tools/langtool/Cargo.lock b/Tools/langtool/Cargo.lock index 2a74eb06ff..576bc7023a 100644 --- a/Tools/langtool/Cargo.lock +++ b/Tools/langtool/Cargo.lock @@ -4,47 +4,48 @@ version = 3 [[package]] name = "anstream" -version = "0.6.13" +version = "0.6.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" +checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", + "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" +checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" [[package]] name = "anstyle-parse" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5" dependencies = [ "windows-sys", ] [[package]] name = "anstyle-wincon" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" dependencies = [ "anstyle", "windows-sys", @@ -92,9 +93,9 @@ checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "colorchoice" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" [[package]] name = "heck" @@ -102,6 +103,12 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" +[[package]] +name = "is_terminal_polyfill" +version = "1.70.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" + [[package]] name = "langtool" version = "0.1.0" @@ -111,9 +118,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.80" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56dea16b0a29e94408b9aa5e2940a4eedbd128a1ba20e8f7ae60fd3d465af0e" +checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b" dependencies = [ "unicode-ident", ] @@ -135,9 +142,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "syn" -version = "2.0.59" +version = "2.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a6531ffc7b071655e4ce2e04bd464c4830bb585a61cabb96cf808f05172615a" +checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9" dependencies = [ "proc-macro2", "quote", From 8bfba2ce35ac2644f9c36932ed3caa4a98386a26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Fri, 10 May 2024 13:36:37 +0200 Subject: [PATCH 221/719] Fix mono audio with sceAtracLowLevelDecode. Fixes #19117 --- Core/HLE/sceAtrac.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp index 75fd75a430..cf53775b07 100644 --- a/Core/HLE/sceAtrac.cpp +++ b/Core/HLE/sceAtrac.cpp @@ -959,8 +959,9 @@ static int sceAtracLowLevelDecode(int atracID, u32 sourceAddr, u32 sourceBytesCo int bytesConsumed = 0; int outSamples = 0; - atrac->Decoder()->Decode(srcp, atrac->GetTrack().BytesPerFrame(), &bytesConsumed, 2, outp, &outSamples); - int bytesWritten = outSamples * 2 * sizeof(int16_t); + int channels = atrac->GetOutputChannels(); + atrac->Decoder()->Decode(srcp, atrac->GetTrack().BytesPerFrame(), &bytesConsumed, channels, outp, &outSamples); + int bytesWritten = outSamples * channels * sizeof(int16_t); *srcConsumed = bytesConsumed; *outWritten = bytesWritten; From 359b4fe1cfbd40b0011f30208b7774e9670d9d20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Fri, 10 May 2024 13:46:44 +0200 Subject: [PATCH 222/719] Windows: Fix tiny memory leak with drag-drop --- Windows/MainWindow.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Windows/MainWindow.cpp b/Windows/MainWindow.cpp index 96ef112635..9aec239c14 100644 --- a/Windows/MainWindow.cpp +++ b/Windows/MainWindow.cpp @@ -1008,19 +1008,19 @@ namespace MainWindow return DefWindowProc(hWnd, message, wParam, lParam); HDROP hdrop = (HDROP)wParam; - int count = DragQueryFile(hdrop,0xFFFFFFFF,0,0); + int count = DragQueryFile(hdrop, 0xFFFFFFFF, 0, 0); if (count != 1) { - MessageBox(hwndMain,L"You can only load one file at a time",L"Error",MB_ICONINFORMATION); - } - else - { - TCHAR filename[512]; - if (DragQueryFile(hdrop, 0, filename, 512) != 0) { + // TODO: Translate? Or just not bother? + MessageBox(hwndMain, L"You can only load one file at a time", L"Error", MB_ICONINFORMATION); + } else { + TCHAR filename[1024]; + if (DragQueryFile(hdrop, 0, filename, ARRAY_SIZE(filename)) != 0) { const std::string utf8_filename = ReplaceAll(ConvertWStringToUTF8(filename), "\\", "/"); System_PostUIMessage(UIMessage::REQUEST_GAME_BOOT, utf8_filename); Core_EnableStepping(false); } } + DragFinish(hdrop); } break; From 70ae4a35c1d3064306426a0270626fb9a7d879ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Fri, 10 May 2024 13:50:49 +0200 Subject: [PATCH 223/719] Fix faulty formula for block transfer size-check. --- Core/MemMap.h | 1 + GPU/GPUCommon.cpp | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Core/MemMap.h b/Core/MemMap.h index c53a75f4a4..e447620b78 100644 --- a/Core/MemMap.h +++ b/Core/MemMap.h @@ -337,6 +337,7 @@ inline u32 ValidSize(const u32 address, const u32 requested_size) { return requested_size; } +// NOTE: If size == 0, any address will be accepted. This may not be ideal for all cases. inline bool IsValidRange(const u32 address, const u32 size) { return ValidSize(address, size) == size; } diff --git a/GPU/GPUCommon.cpp b/GPU/GPUCommon.cpp index 08ad845e05..1710f50c36 100644 --- a/GPU/GPUCommon.cpp +++ b/GPU/GPUCommon.cpp @@ -1675,11 +1675,12 @@ void GPUCommon::DoBlockTransfer(u32 skipDrawReason) { if ((dstBasePtr & 0x04800000) == 0x04800000) dstBasePtr &= ~0x00800000; - // Use height less one to account for width, which can be greater or less than stride. + // Use height less one to account for width, which can be greater or less than stride, and then add it on for the last line. + // NOTE: The sizes are only used for validity checks and memory info tracking. const uint32_t src = srcBasePtr + (srcY * srcStride + srcX) * bpp; - const uint32_t srcSize = (height - 1) * (srcStride + width) * bpp; const uint32_t dst = dstBasePtr + (dstY * dstStride + dstX) * bpp; - const uint32_t dstSize = (height - 1) * (dstStride + width) * bpp; + const uint32_t srcSize = ((height - 1) * srcStride) + width * bpp; + const uint32_t dstSize = ((height - 1) * dstStride) + width * bpp; bool srcDstOverlap = src + srcSize > dst && dst + dstSize > src; bool srcValid = Memory::IsValidRange(src, srcSize); From 8ce7982d8b101cd47827ef4277b245c8d6ff3927 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Fri, 10 May 2024 13:58:03 +0200 Subject: [PATCH 224/719] Increase the bad texture size threshold. Fixes #19116 --- GPU/Common/TextureCacheCommon.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/GPU/Common/TextureCacheCommon.cpp b/GPU/Common/TextureCacheCommon.cpp index 2b57e6a5a8..c56e11b51d 100644 --- a/GPU/Common/TextureCacheCommon.cpp +++ b/GPU/Common/TextureCacheCommon.cpp @@ -2833,7 +2833,10 @@ bool TextureCacheCommon::PrepareBuildTexture(BuildTexturePlan &plan, TexCacheEnt plan.scaleFactor = 1; } else if (!g_DoubleTextureCoordinates) { // Refuse to load invalid-ly sized textures, which can happen through display list corruption. - if (plan.w > 1024 || plan.h > 1024) { + // However, turns out some games uses huge textures for font rendering for no apparent reason. + // These will only work correctly in the top 512x512 part. So, I've increased the threshold quite a bit. + // We probably should handle these differently, by clamping the texture size and texture coordinates, but meh. + if (plan.w > 2048 || plan.h > 2048) { ERROR_LOG(G3D, "Bad texture dimensions: %dx%d", plan.w, plan.h); return false; } From 699a41a3fad1ca1f869a3be5099690de48f795b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Fri, 10 May 2024 14:15:07 +0200 Subject: [PATCH 225/719] GameInfoCache: Fix issue reloading the BG texture after wiping it from memory Fixes #19077 --- UI/GameInfoCache.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/UI/GameInfoCache.cpp b/UI/GameInfoCache.cpp index 2ad0ee1bb4..98eedf05cd 100644 --- a/UI/GameInfoCache.cpp +++ b/UI/GameInfoCache.cpp @@ -52,6 +52,7 @@ void GameInfoTex::Clear() { texture->Release(); texture = nullptr; } + timeLoaded = 0.0; } GameInfo::GameInfo(const Path &gamePath) : filePath_(gamePath) { From 91d9ef9b816120d5b49ea5cdfa828cb04882e37d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Fri, 10 May 2024 18:27:29 +0200 Subject: [PATCH 226/719] Minor IR interpreter optimization --- Core/MIPS/IR/IRInterpreter.cpp | 9 +++++---- Core/MIPS/IR/IRJit.cpp | 3 +-- Core/MIPS/IR/IRJit.h | 3 +++ 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Core/MIPS/IR/IRInterpreter.cpp b/Core/MIPS/IR/IRInterpreter.cpp index 2590b0ea9a..09805fa7fa 100644 --- a/Core/MIPS/IR/IRInterpreter.cpp +++ b/Core/MIPS/IR/IRInterpreter.cpp @@ -1138,13 +1138,14 @@ u32 IRInterpret(MIPSState *mips, const IRInst *inst, int count) { // Unimplemented IR op. Bad. Crash(); } -#ifdef _DEBUG - if (mips->r[0] != 0) - Crash(); -#endif inst++; } +#ifdef _DEBUG + if (mips->r[0] != 0) + Crash(); +#endif + // We hit count. If this is a full block, it was badly constructed. return 0; } diff --git a/Core/MIPS/IR/IRJit.cpp b/Core/MIPS/IR/IRJit.cpp index bc866ee04b..3d9f9e5eaf 100644 --- a/Core/MIPS/IR/IRJit.cpp +++ b/Core/MIPS/IR/IRJit.cpp @@ -250,8 +250,7 @@ void IRJit::RunLoopUntil(u64 globalticks) { u32 inst = Memory::ReadUnchecked_U32(mips_->pc); u32 opcode = inst & 0xFF000000; if (opcode == MIPS_EMUHACK_OPCODE) { - u32 data = inst & 0xFFFFFF; - IRBlock *block = blocks_.GetBlock(data); + IRBlock *block = blocks_.GetBlockUnchecked(inst & 0xFFFFFF); u32 startPC = mips_->pc; mips_->pc = IRInterpret(mips_, block->GetInstructions(), block->GetNumInstructions()); // Note: this will "jump to zero" on a badly constructed block missing exits. diff --git a/Core/MIPS/IR/IRJit.h b/Core/MIPS/IR/IRJit.h index 60460ea878..734f576066 100644 --- a/Core/MIPS/IR/IRJit.h +++ b/Core/MIPS/IR/IRJit.h @@ -127,6 +127,9 @@ public: return nullptr; } } + IRBlock *GetBlockUnchecked(int i) { + return &blocks_[i]; + } const IRBlock *GetBlock(int i) const { if (i >= 0 && i < (int)blocks_.size()) { return &blocks_[i]; From 092179c42d6879c423b5ecef4a1f9d08310e6ffd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Fri, 10 May 2024 18:41:55 +0200 Subject: [PATCH 227/719] More IR interpreter tweaks --- Core/MIPS/IR/IRInterpreter.cpp | 24 ++++++------------------ Core/MIPS/MIPSIntVFPU.cpp | 3 ++- 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/Core/MIPS/IR/IRInterpreter.cpp b/Core/MIPS/IR/IRInterpreter.cpp index 09805fa7fa..c8d98ad6fd 100644 --- a/Core/MIPS/IR/IRInterpreter.cpp +++ b/Core/MIPS/IR/IRInterpreter.cpp @@ -283,33 +283,20 @@ u32 IRInterpret(MIPSState *mips, const IRInst *inst, int count) { case IROp::LoadVec4: { u32 base = mips->r[inst->src1] + inst->constant; -#if defined(_M_SSE) - _mm_store_ps(&mips->f[inst->dest], _mm_load_ps((const float *)Memory::GetPointerUnchecked(base))); -#else - for (int i = 0; i < 4; i++) - mips->f[inst->dest + i] = Memory::ReadUnchecked_Float(base + 4 * i); -#endif + // This compiles to a nice SSE load/store on x86, and hopefully similar on ARM. + memcpy(&mips->f[inst->dest], Memory::GetPointerUnchecked(base), 4 * 4); break; } case IROp::StoreVec4: { u32 base = mips->r[inst->src1] + inst->constant; -#if defined(_M_SSE) - _mm_store_ps((float *)Memory::GetPointerUnchecked(base), _mm_load_ps(&mips->f[inst->dest])); -#else - for (int i = 0; i < 4; i++) - Memory::WriteUnchecked_Float(mips->f[inst->dest + i], base + 4 * i); -#endif + memcpy((float *)Memory::GetPointerUnchecked(base), &mips->f[inst->dest], 4 * 4); break; } case IROp::Vec4Init: { -#if defined(_M_SSE) - _mm_store_ps(&mips->f[inst->dest], _mm_load_ps(vec4InitValues[inst->src1])); -#else memcpy(&mips->f[inst->dest], vec4InitValues[inst->src1], 4 * sizeof(float)); -#endif break; } @@ -398,8 +385,9 @@ u32 IRInterpret(MIPSState *mips, const IRInst *inst, int count) { #if defined(_M_SSE) _mm_store_ps(&mips->f[inst->dest], _mm_mul_ps(_mm_load_ps(&mips->f[inst->src1]), _mm_set1_ps(mips->f[inst->src2]))); #else + const float factor = mips->f[inst->src2]; for (int i = 0; i < 4; i++) - mips->f[inst->dest + i] = mips->f[inst->src1 + i] * mips->f[inst->src2]; + mips->f[inst->dest + i] = mips->f[inst->src1 + i] * factor; #endif break; } @@ -792,7 +780,7 @@ u32 IRInterpret(MIPSState *mips, const IRInst *inst, int count) { mips->f[inst->dest] = mips->f[inst->src1] - mips->f[inst->src2]; break; case IROp::FMul: - if ((my_isinf(mips->f[inst->src1]) && mips->f[inst->src2] == 0.0f) || (my_isinf(mips->f[inst->src2]) && mips->f[inst->src1] == 0.0f)) { + if ((mips->f[inst->src2] == 0.0f && my_isinf(mips->f[inst->src1])) || (mips->f[inst->src1] == 0.0f && my_isinf(mips->f[inst->src2]))) { mips->fi[inst->dest] = 0x7fc00000; } else { mips->f[inst->dest] = mips->f[inst->src1] * mips->f[inst->src2]; diff --git a/Core/MIPS/MIPSIntVFPU.cpp b/Core/MIPS/MIPSIntVFPU.cpp index 9edb668226..6388d1652a 100644 --- a/Core/MIPS/MIPSIntVFPU.cpp +++ b/Core/MIPS/MIPSIntVFPU.cpp @@ -621,8 +621,9 @@ namespace MIPSInt break; default: ApplySwizzleS(s, sz); + break; } - for (int i = 0; i < n; i++) { + for (int i = 0; i < (int)n; i++) { switch (optype) { case 0: d[i] = s[i]; break; //vmov case 1: d[i] = s[i]; break; //vabs (prefix) From 39966730e9602355a02356eff4f183b19be901dd Mon Sep 17 00:00:00 2001 From: Lubos Date: Fri, 10 May 2024 19:12:38 +0200 Subject: [PATCH 228/719] OpenXR - Fix projection matrix --- Common/VR/PPSSPPVR.cpp | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/Common/VR/PPSSPPVR.cpp b/Common/VR/PPSSPPVR.cpp index 6414eac0fe..b16a57a9c7 100644 --- a/Common/VR/PPSSPPVR.cpp +++ b/Common/VR/PPSSPPVR.cpp @@ -650,19 +650,20 @@ bool StartVRRender() { fov.angleUp += vrView[eye].fov.angleUp / 2.0f; fov.angleDown += vrView[eye].fov.angleDown / 2.0f; } - float nearZ = g_Config.fFieldOfViewPercentage / 200.0f; + float nearZ = 0.01f; + float fovHack = g_Config.fFieldOfViewPercentage / 200.0f; float tanAngleLeft = tanf(fov.angleLeft); float tanAngleRight = tanf(fov.angleRight); float tanAngleDown = tanf(fov.angleDown); float tanAngleUp = tanf(fov.angleUp); float M[16] = {}; M[0] = 2 / (tanAngleRight - tanAngleLeft); - M[2] = (tanAngleRight + tanAngleLeft) / (tanAngleRight - tanAngleLeft); M[5] = 2 / (tanAngleUp - tanAngleDown); - M[6] = (tanAngleUp + tanAngleDown) / (tanAngleUp - tanAngleDown); + M[8] = (tanAngleRight + tanAngleLeft) / (tanAngleRight - tanAngleLeft); + M[9] = (tanAngleUp + tanAngleDown) / (tanAngleUp - tanAngleDown); M[10] = -1; - M[11] = -(nearZ + nearZ); - M[14] = -1; + M[11] = -(fovHack + fovHack); + M[14] = -(nearZ + nearZ); memcpy(vrMatrix[VR_PROJECTION_MATRIX], M, sizeof(float) * 16); // Decide if the scene is 3D or not @@ -808,14 +809,19 @@ void UpdateVRParams(float* projMatrix) { } void UpdateVRProjection(float* projMatrix, float* leftEye, float* rightEye) { - float* hmdProjection = vrMatrix[VR_PROJECTION_MATRIX]; + float output[16]; for (int i = 0; i < 16; i++) { - if ((hmdProjection[i] > 0) != (projMatrix[i] > 0)) { - hmdProjection[i] *= -1.0f; + if (fabs(projMatrix[i]) > 0) { + output[i] = vrMatrix[VR_PROJECTION_MATRIX][i]; + if ((output[i] > 0) != (projMatrix[i] > 0)) { + output[i] *= -1.0f; + } + } else { + output[i] = 0; } } - memcpy(leftEye, hmdProjection, 16 * sizeof(float)); - memcpy(rightEye, hmdProjection, 16 * sizeof(float)); + memcpy(leftEye, output, 16 * sizeof(float)); + memcpy(rightEye, output, 16 * sizeof(float)); } void UpdateVRView(float* leftEye, float* rightEye) { From e76a5b1d3da256f7952146147891cf6a89546315 Mon Sep 17 00:00:00 2001 From: Lubos Date: Fri, 10 May 2024 19:40:13 +0200 Subject: [PATCH 229/719] OpenXR - Gran Turismo projection hack --- Common/VR/PPSSPPVR.cpp | 4 +++- Core/Compatibility.cpp | 1 + Core/Compatibility.h | 1 + assets/compatvr.ini | 11 +++++++++++ 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/Common/VR/PPSSPPVR.cpp b/Common/VR/PPSSPPVR.cpp index b16a57a9c7..a3a735d10c 100644 --- a/Common/VR/PPSSPPVR.cpp +++ b/Common/VR/PPSSPPVR.cpp @@ -811,7 +811,9 @@ void UpdateVRParams(float* projMatrix) { void UpdateVRProjection(float* projMatrix, float* leftEye, float* rightEye) { float output[16]; for (int i = 0; i < 16; i++) { - if (fabs(projMatrix[i]) > 0) { + if (PSP_CoreParameter().compat.vrCompat().ProjectionHack && ((i == 8) || (i == 9))) { + output[i] = 0; + } else if (fabs(projMatrix[i]) > 0) { output[i] = vrMatrix[VR_PROJECTION_MATRIX][i]; if ((output[i] > 0) != (projMatrix[i] > 0)) { output[i] *= -1.0f; diff --git a/Core/Compatibility.cpp b/Core/Compatibility.cpp index 6494760a24..bbc1e34c42 100644 --- a/Core/Compatibility.cpp +++ b/Core/Compatibility.cpp @@ -145,6 +145,7 @@ void Compatibility::CheckVRSettings(IniFile &iniFile, const std::string &gameID) CheckSetting(iniFile, gameID, "ForceMono", &vrCompat_.ForceMono); CheckSetting(iniFile, gameID, "IdentityViewHack", &vrCompat_.IdentityViewHack); CheckSetting(iniFile, gameID, "MirroringVariant", &vrCompat_.MirroringVariant); + CheckSetting(iniFile, gameID, "ProjectionHack", &vrCompat_.ProjectionHack); CheckSetting(iniFile, gameID, "Skyplane", &vrCompat_.Skyplane); CheckSetting(iniFile, gameID, "UnitsPerMeter", &vrCompat_.UnitsPerMeter); diff --git a/Core/Compatibility.h b/Core/Compatibility.h index 1739112d36..82cbabbf4f 100644 --- a/Core/Compatibility.h +++ b/Core/Compatibility.h @@ -115,6 +115,7 @@ struct VRCompat { bool ForceFlatScreen; bool IdentityViewHack; int MirroringVariant; + bool ProjectionHack; bool Skyplane; float UnitsPerMeter; }; diff --git a/assets/compatvr.ini b/assets/compatvr.ini index 84fac0d978..e05251c5a5 100644 --- a/assets/compatvr.ini +++ b/assets/compatvr.ini @@ -110,6 +110,17 @@ ULES00035 = 3 ULUS10014 = 3 +[ProjectionHack] +# Forces ignoring of projection matrix pivot point. + +# Gran Turismo: The Real Driving Simulator +NPJG00027 = true +UCAS40265 = true +UCES01245 = true +UCJS10100 = true +UCUS98632 = true + + [Skyplane] # Workaround to remove the background skyplane and add clearing framebuffer with a fog color. From d21fef52aed17130ec56fbab05aa45aa09861f35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Fri, 10 May 2024 21:01:03 +0200 Subject: [PATCH 230/719] Allow taking screenshots in the app menu --- Core/SaveState.cpp | 2 +- Core/Screenshot.cpp | 17 ++++++++++------- Core/Screenshot.h | 5 ++++- GPU/Common/FramebufferManagerCommon.cpp | 17 ++++++++++++----- GPU/Common/FramebufferManagerCommon.h | 3 +++ UI/NativeApp.cpp | 6 +++--- UI/ReportScreen.cpp | 2 +- Windows/MainWindowMenu.cpp | 1 - 8 files changed, 34 insertions(+), 19 deletions(-) diff --git a/Core/SaveState.cpp b/Core/SaveState.cpp index 771785fd98..fb42b68bdc 100644 --- a/Core/SaveState.cpp +++ b/Core/SaveState.cpp @@ -1056,7 +1056,7 @@ namespace SaveState case SAVESTATE_SAVE_SCREENSHOT: { int maxResMultiplier = 2; - tempResult = TakeGameScreenshot(op.filename, ScreenshotFormat::JPG, SCREENSHOT_DISPLAY, nullptr, nullptr, maxResMultiplier); + tempResult = TakeGameScreenshot(nullptr, op.filename, ScreenshotFormat::JPG, SCREENSHOT_DISPLAY, nullptr, nullptr, maxResMultiplier); callbackResult = tempResult ? Status::SUCCESS : Status::FAILURE; if (!tempResult) { ERROR_LOG(SAVESTATE, "Failed to take a screenshot for the savestate! %s", op.filename.c_str()); diff --git a/Core/Screenshot.cpp b/Core/Screenshot.cpp index a1bbaaafc8..9c267204a9 100644 --- a/Core/Screenshot.cpp +++ b/Core/Screenshot.cpp @@ -30,6 +30,7 @@ #include "Core/Screenshot.h" #include "Core/Core.h" #include "GPU/Common/GPUDebugInterface.h" +#include "GPU/Common/FramebufferManagerCommon.h" #include "GPU/GPUInterface.h" #include "GPU/GPUState.h" @@ -328,28 +329,30 @@ static GPUDebugBuffer ApplyRotation(const GPUDebugBuffer &buf, DisplayRotation r return rotated; } -bool TakeGameScreenshot(const Path &filename, ScreenshotFormat fmt, ScreenshotType type, int *width, int *height, int maxRes) { - if (!gpuDebug) { - ERROR_LOG(SYSTEM, "Can't take screenshots when GPU not running"); - return false; - } +bool TakeGameScreenshot(Draw::DrawContext *draw, const Path &filename, ScreenshotFormat fmt, ScreenshotType type, int *width, int *height, int maxRes) { GPUDebugBuffer buf; bool success = false; u32 w = (u32)-1; u32 h = (u32)-1; if (type == SCREENSHOT_DISPLAY || type == SCREENSHOT_RENDER) { + if (!gpuDebug) { + ERROR_LOG(SYSTEM, "Can't take screenshots when GPU not running"); + return false; + } success = gpuDebug->GetCurrentFramebuffer(buf, type == SCREENSHOT_RENDER ? GPU_DBG_FRAMEBUF_RENDER : GPU_DBG_FRAMEBUF_DISPLAY, maxRes); w = maxRes > 0 ? 480 * maxRes : PSP_CoreParameter().renderWidth; h = maxRes > 0 ? 272 * maxRes : PSP_CoreParameter().renderHeight; } else if (g_display.rotation != DisplayRotation::ROTATE_0) { + _dbg_assert_(draw); GPUDebugBuffer temp; - success = gpuDebug->GetOutputFramebuffer(temp); + success = ::GetOutputFramebuffer(draw, buf); if (success) { buf = ApplyRotation(temp, g_display.rotation); } } else { - success = gpuDebug->GetOutputFramebuffer(buf); + _dbg_assert_(draw); + success = ::GetOutputFramebuffer(draw, buf); } if (!success) { diff --git a/Core/Screenshot.h b/Core/Screenshot.h index ac124fef9a..69794bb6de 100644 --- a/Core/Screenshot.h +++ b/Core/Screenshot.h @@ -20,6 +20,9 @@ #include "Common/File/Path.h" struct GPUDebugBuffer; +namespace Draw { +class DrawContext; +} enum class ScreenshotFormat { PNG, @@ -38,7 +41,7 @@ enum ScreenshotType { const u8 *ConvertBufferToScreenshot(const GPUDebugBuffer &buf, bool alpha, u8 *&temp, u32 &w, u32 &h); // Can only be used while in game. -bool TakeGameScreenshot(const Path &filename, ScreenshotFormat fmt, ScreenshotType type, int *width = nullptr, int *height = nullptr, int maxRes = -1); +bool TakeGameScreenshot(Draw::DrawContext *draw, const Path &filename, ScreenshotFormat fmt, ScreenshotType type, int *width = nullptr, int *height = nullptr, int maxRes = -1); bool Save888RGBScreenshot(const Path &filename, ScreenshotFormat fmt, const u8 *bufferRGB888, int w, int h); bool Save8888RGBAScreenshot(const Path &filename, const u8 *bufferRGBA8888, int w, int h); diff --git a/GPU/Common/FramebufferManagerCommon.cpp b/GPU/Common/FramebufferManagerCommon.cpp index c4fbffd549..df309de01f 100644 --- a/GPU/Common/FramebufferManagerCommon.cpp +++ b/GPU/Common/FramebufferManagerCommon.cpp @@ -3076,15 +3076,22 @@ bool FramebufferManagerCommon::GetStencilbuffer(u32 fb_address, int fb_stride, G return retval; } -bool FramebufferManagerCommon::GetOutputFramebuffer(GPUDebugBuffer &buffer) { +bool GetOutputFramebuffer(Draw::DrawContext *draw, GPUDebugBuffer &buffer) { int w, h; - draw_->GetFramebufferDimensions(nullptr, &w, &h); - Draw::DataFormat fmt = draw_->PreferredFramebufferReadbackFormat(nullptr); + draw->GetFramebufferDimensions(nullptr, &w, &h); + Draw::DataFormat fmt = draw->PreferredFramebufferReadbackFormat(nullptr); // Ignore preferred formats other than BGRA. if (fmt != Draw::DataFormat::B8G8R8A8_UNORM) fmt = Draw::DataFormat::R8G8B8A8_UNORM; - buffer.Allocate(w, h, fmt == Draw::DataFormat::R8G8B8A8_UNORM ? GPU_DBG_FORMAT_8888 : GPU_DBG_FORMAT_8888_BGRA, false); - bool retval = draw_->CopyFramebufferToMemory(nullptr, Draw::FB_COLOR_BIT, 0, 0, w, h, fmt, buffer.GetData(), w, Draw::ReadbackMode::BLOCK, "GetOutputFramebuffer"); + + bool flipped = g_Config.iGPUBackend == (int)GPUBackend::OPENGL; + + buffer.Allocate(w, h, fmt == Draw::DataFormat::R8G8B8A8_UNORM ? GPU_DBG_FORMAT_8888 : GPU_DBG_FORMAT_8888_BGRA, flipped); + return draw->CopyFramebufferToMemory(nullptr, Draw::FB_COLOR_BIT, 0, 0, w, h, fmt, buffer.GetData(), w, Draw::ReadbackMode::BLOCK, "GetOutputFramebuffer"); +} + +bool FramebufferManagerCommon::GetOutputFramebuffer(GPUDebugBuffer &buffer) { + bool retval = ::GetOutputFramebuffer(draw_, buffer); // That may have unbound the framebuffer, rebind to avoid crashes when debugging. RebindFramebuffer("RebindFramebuffer - GetOutputFramebuffer"); return retval; diff --git a/GPU/Common/FramebufferManagerCommon.h b/GPU/Common/FramebufferManagerCommon.h index 99c45295b0..994727dcfc 100644 --- a/GPU/Common/FramebufferManagerCommon.h +++ b/GPU/Common/FramebufferManagerCommon.h @@ -647,3 +647,6 @@ protected: u8 *convBuf_ = nullptr; u32 convBufSize_ = 0; }; + +// Should probably live elsewhere. +bool GetOutputFramebuffer(Draw::DrawContext *draw, GPUDebugBuffer &buffer); diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp index 3f022572c1..b1cefec604 100644 --- a/UI/NativeApp.cpp +++ b/UI/NativeApp.cpp @@ -968,7 +968,7 @@ void NativeShutdownGraphics() { INFO_LOG(SYSTEM, "NativeShutdownGraphics done"); } -static void TakeScreenshot() { +static void TakeScreenshot(Draw::DrawContext *draw) { Path path = GetSysDirectory(DIRECTORY_SCREENSHOT); if (!File::Exists(path)) { File::CreateDir(path); @@ -991,7 +991,7 @@ static void TakeScreenshot() { i++; } - bool success = TakeGameScreenshot(filename, g_Config.bScreenshotsAsPNG ? ScreenshotFormat::PNG : ScreenshotFormat::JPG, SCREENSHOT_OUTPUT); + bool success = TakeGameScreenshot(draw, filename, g_Config.bScreenshotsAsPNG ? ScreenshotFormat::PNG : ScreenshotFormat::JPG, SCREENSHOT_OUTPUT); if (success) { g_OSD.Show(OSDType::MESSAGE_FILE_LINK, filename.ToString(), 0.0f, "screenshot_link"); if (System_GetPropertyBool(SYSPROP_CAN_SHOW_FILE)) { @@ -1012,7 +1012,7 @@ static void TakeScreenshot() { void CallbackPostRender(UIContext *dc, void *userdata) { if (g_TakeScreenshot) { - TakeScreenshot(); + TakeScreenshot(dc->GetDrawContext()); g_TakeScreenshot = false; } } diff --git a/UI/ReportScreen.cpp b/UI/ReportScreen.cpp index 361540bce7..3701db3d63 100644 --- a/UI/ReportScreen.cpp +++ b/UI/ReportScreen.cpp @@ -179,7 +179,7 @@ ScreenRenderFlags ReportScreen::render(ScreenRenderMode mode) { File::CreateDir(path); } screenshotFilename_ = path / ".reporting.jpg"; - if (TakeGameScreenshot(screenshotFilename_, ScreenshotFormat::JPG, SCREENSHOT_DISPLAY, nullptr, nullptr, 4)) { + if (TakeGameScreenshot(screenManager()->getDrawContext(), screenshotFilename_, ScreenshotFormat::JPG, SCREENSHOT_DISPLAY, nullptr, nullptr, 4)) { // Redo the views already, now with a screenshot included. RecreateViews(); } else { diff --git a/Windows/MainWindowMenu.cpp b/Windows/MainWindowMenu.cpp index af6a81f5c5..4a195cda30 100644 --- a/Windows/MainWindowMenu.cpp +++ b/Windows/MainWindowMenu.cpp @@ -107,7 +107,6 @@ namespace MainWindow { EnableMenuItem(menu, ID_DEBUG_LOADSYMFILE, menuEnable); EnableMenuItem(menu, ID_DEBUG_SAVESYMFILE, menuEnable); EnableMenuItem(menu, ID_DEBUG_RESETSYMBOLTABLE, menuEnable); - EnableMenuItem(menu, ID_DEBUG_TAKESCREENSHOT, menuEnable); EnableMenuItem(menu, ID_DEBUG_SHOWDEBUGSTATISTICS, menuInGameEnable); EnableMenuItem(menu, ID_DEBUG_EXTRACTFILE, menuEnable); EnableMenuItem(menu, ID_DEBUG_MEMORYBASE, menuInGameEnable); From c332d564db4daaaeefc3ae3ed7d96319996696a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Fri, 10 May 2024 23:21:51 +0200 Subject: [PATCH 231/719] IRInterpreter: Cache the MIPSState pointer in a local, faster address check --- Core/MIPS/IR/IRJit.cpp | 17 ++++++++++------- Core/MemMap.h | 15 +++++++++++++++ 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/Core/MIPS/IR/IRJit.cpp b/Core/MIPS/IR/IRJit.cpp index 3d9f9e5eaf..4de788a875 100644 --- a/Core/MIPS/IR/IRJit.cpp +++ b/Core/MIPS/IR/IRJit.cpp @@ -246,21 +246,24 @@ void IRJit::RunLoopUntil(u64 globalticks) { if (coreState != 0) { break; } - while (mips_->downcount >= 0) { - u32 inst = Memory::ReadUnchecked_U32(mips_->pc); + + MIPSState *mips = mips_; + + while (mips->downcount >= 0) { + u32 inst = Memory::ReadUnchecked_U32(mips->pc); u32 opcode = inst & 0xFF000000; if (opcode == MIPS_EMUHACK_OPCODE) { IRBlock *block = blocks_.GetBlockUnchecked(inst & 0xFFFFFF); - u32 startPC = mips_->pc; - mips_->pc = IRInterpret(mips_, block->GetInstructions(), block->GetNumInstructions()); + u32 startPC = mips->pc; + mips->pc = IRInterpret(mips, block->GetInstructions(), block->GetNumInstructions()); // Note: this will "jump to zero" on a badly constructed block missing exits. - if (!Memory::IsValidAddress(mips_->pc) || (mips_->pc & 3) != 0) { - Core_ExecException(mips_->pc, startPC, ExecExceptionType::JUMP); + if (!Memory::IsValid4AlignedAddress(mips->pc)) { + Core_ExecException(mips->pc, startPC, ExecExceptionType::JUMP); break; } } else { // RestoreRoundingMode(true); - Compile(mips_->pc); + Compile(mips->pc); // ApplyRoundingMode(true); } } diff --git a/Core/MemMap.h b/Core/MemMap.h index e447620b78..8c2d6f2dda 100644 --- a/Core/MemMap.h +++ b/Core/MemMap.h @@ -296,6 +296,21 @@ inline bool IsValidAddress(const u32 address) { } } +inline bool IsValid4AlignedAddress(const u32 address) { + if ((address & 0x3E000003) == 0x08000000) { + return true; + } else if ((address & 0x3F800003) == 0x04000000) { + return true; + } else if ((address & 0xBFFFC003) == 0x00010000) { + return true; + } else if ((address & 0x3F000000) >= 0x08000000 && (address & 0x3F000000) < 0x08000000 + g_MemorySize) { + return (address & 3) == 0; + } else { + return false; + } +} + + inline u32 MaxSizeAtAddress(const u32 address){ if ((address & 0x3E000000) == 0x08000000) { return 0x08000000 + g_MemorySize - (address & 0x3FFFFFFF); From 7a097cb34aabc0ebaed7f1f07d2a8d2cae800086 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Fri, 10 May 2024 23:23:58 +0200 Subject: [PATCH 232/719] Shave a couple instructions in the common case --- Core/MIPS/IR/IRJit.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Core/MIPS/IR/IRJit.cpp b/Core/MIPS/IR/IRJit.cpp index 4de788a875..688f1dfed1 100644 --- a/Core/MIPS/IR/IRJit.cpp +++ b/Core/MIPS/IR/IRJit.cpp @@ -254,11 +254,10 @@ void IRJit::RunLoopUntil(u64 globalticks) { u32 opcode = inst & 0xFF000000; if (opcode == MIPS_EMUHACK_OPCODE) { IRBlock *block = blocks_.GetBlockUnchecked(inst & 0xFFFFFF); - u32 startPC = mips->pc; mips->pc = IRInterpret(mips, block->GetInstructions(), block->GetNumInstructions()); // Note: this will "jump to zero" on a badly constructed block missing exits. if (!Memory::IsValid4AlignedAddress(mips->pc)) { - Core_ExecException(mips->pc, startPC, ExecExceptionType::JUMP); + Core_ExecException(mips->pc, block->GetOriginalStart(), ExecExceptionType::JUMP); break; } } else { From fae846e52a907a0a32f8966b336e1ea78320df0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Fri, 10 May 2024 23:31:24 +0200 Subject: [PATCH 233/719] Remove the count parameter from IRInterpret. This is a good speed boost! --- Core/MIPS/IR/IRInst.h | 6 +++--- Core/MIPS/IR/IRInterpreter.cpp | 24 +++++++++++------------- Core/MIPS/IR/IRInterpreter.h | 2 +- Core/MIPS/IR/IRJit.cpp | 2 +- Core/MIPS/IR/IRNativeCommon.cpp | 7 ++++--- 5 files changed, 20 insertions(+), 21 deletions(-) diff --git a/Core/MIPS/IR/IRInst.h b/Core/MIPS/IR/IRInst.h index e727697d3f..cec31c7ee3 100644 --- a/Core/MIPS/IR/IRInst.h +++ b/Core/MIPS/IR/IRInst.h @@ -18,8 +18,6 @@ // MIPS->target JITs. enum class IROp : uint8_t { - Nop, - SetConst, SetConstF, @@ -230,6 +228,8 @@ enum class IROp : uint8_t { ValidateAddress16, ValidateAddress32, ValidateAddress128, + + Nop, }; enum IRComparison { @@ -358,7 +358,7 @@ struct IRInst { }; // Returns the new PC. -u32 IRInterpret(MIPSState *ms, const IRInst *inst, int count); +u32 IRInterpret(MIPSState *ms, const IRInst *inst); // Each IR block gets a constant pool. class IRWriter { diff --git a/Core/MIPS/IR/IRInterpreter.cpp b/Core/MIPS/IR/IRInterpreter.cpp index c8d98ad6fd..bf00db5c78 100644 --- a/Core/MIPS/IR/IRInterpreter.cpp +++ b/Core/MIPS/IR/IRInterpreter.cpp @@ -108,13 +108,9 @@ u32 RunValidateAddress(u32 pc, u32 addr, u32 isWrite) { } // We cannot use NEON on ARM32 here until we make it a hard dependency. We can, however, on ARM64. -u32 IRInterpret(MIPSState *mips, const IRInst *inst, int count) { - const IRInst *end = inst + count; - while (inst != end) { +u32 IRInterpret(MIPSState *mips, const IRInst *inst) { + while (true) { switch (inst->op) { - case IROp::Nop: - _assert_(false); - break; case IROp::SetConst: mips->r[inst->dest] = inst->constant; break; @@ -1121,19 +1117,21 @@ u32 IRInterpret(MIPSState *mips, const IRInst *inst, int count) { case IROp::UpdateRoundingMode: // TODO: Implement break; - + case IROp::Nop: + _assert_(false); + break; default: // Unimplemented IR op. Bad. Crash(); } + +#ifdef _DEBUG + if (mips->r[0] != 0) + Crash(); +#endif inst++; } -#ifdef _DEBUG - if (mips->r[0] != 0) - Crash(); -#endif - - // We hit count. If this is a full block, it was badly constructed. + // We should not reach here anymore. return 0; } diff --git a/Core/MIPS/IR/IRInterpreter.h b/Core/MIPS/IR/IRInterpreter.h index 21e7f15dc7..d381183586 100644 --- a/Core/MIPS/IR/IRInterpreter.h +++ b/Core/MIPS/IR/IRInterpreter.h @@ -23,4 +23,4 @@ inline static u32 ReverseBits32(u32 v) { u32 IRRunBreakpoint(u32 pc); u32 IRRunMemCheck(u32 pc, u32 addr); -u32 IRInterpret(MIPSState *ms, const IRInst *inst, int count); +u32 IRInterpret(MIPSState *ms, const IRInst *inst); diff --git a/Core/MIPS/IR/IRJit.cpp b/Core/MIPS/IR/IRJit.cpp index 688f1dfed1..c89c5fa41f 100644 --- a/Core/MIPS/IR/IRJit.cpp +++ b/Core/MIPS/IR/IRJit.cpp @@ -254,7 +254,7 @@ void IRJit::RunLoopUntil(u64 globalticks) { u32 opcode = inst & 0xFF000000; if (opcode == MIPS_EMUHACK_OPCODE) { IRBlock *block = blocks_.GetBlockUnchecked(inst & 0xFFFFFF); - mips->pc = IRInterpret(mips, block->GetInstructions(), block->GetNumInstructions()); + mips->pc = IRInterpret(mips, block->GetInstructions()); // Note: this will "jump to zero" on a badly constructed block missing exits. if (!Memory::IsValid4AlignedAddress(mips->pc)) { Core_ExecException(mips->pc, block->GetOriginalStart(), ExecExceptionType::JUMP); diff --git a/Core/MIPS/IR/IRNativeCommon.cpp b/Core/MIPS/IR/IRNativeCommon.cpp index bb1589303b..abd76511ec 100644 --- a/Core/MIPS/IR/IRNativeCommon.cpp +++ b/Core/MIPS/IR/IRNativeCommon.cpp @@ -153,13 +153,14 @@ void IRNativeBackend::DoMIPSInst(uint32_t value) { } uint32_t IRNativeBackend::DoIRInst(uint64_t value) { - IRInst inst; + IRInst inst[2]; memcpy(&inst, &value, sizeof(inst)); if constexpr (enableDebugStats) - debugSeenNotCompiledIR[(uint8_t)inst.op]++; + debugSeenNotCompiledIR[(uint8_t)inst[0].op]++; - return IRInterpret(currentMIPS, &inst, 1); + inst[1].op = IROp::ExitToPC; + return IRInterpret(currentMIPS, &inst[0]); } int IRNativeBackend::ReportBadAddress(uint32_t addr, uint32_t alignment, uint32_t isWrite) { From 3e11e5440504a433f31dc3733e1dadc7d8af2f45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sat, 11 May 2024 09:59:16 +0200 Subject: [PATCH 234/719] Remove obsolete flag --- GPU/Common/VertexDecoderCommon.cpp | 2 +- GPU/Common/VertexDecoderCommon.h | 1 - GPU/Vulkan/DrawEngineVulkan.cpp | 4 ---- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/GPU/Common/VertexDecoderCommon.cpp b/GPU/Common/VertexDecoderCommon.cpp index 4921e3bba8..ee31129140 100644 --- a/GPU/Common/VertexDecoderCommon.cpp +++ b/GPU/Common/VertexDecoderCommon.cpp @@ -1265,7 +1265,7 @@ void VertexDecoder::SetVertexType(u32 fmt, const VertexDecoderOptions &options, decOff += DecFmtSize(DecVtxFormat::PosFmt()); } - decFmt.stride = options.alignOutputToWord ? align(decOff, 4) : decOff; + decFmt.stride = align(decOff, 4); decFmt.ComputeID(); diff --git a/GPU/Common/VertexDecoderCommon.h b/GPU/Common/VertexDecoderCommon.h index 4a30c5bef6..c5a72a7b41 100644 --- a/GPU/Common/VertexDecoderCommon.h +++ b/GPU/Common/VertexDecoderCommon.h @@ -326,7 +326,6 @@ struct VertexDecoderOptions { bool expandAllWeightsToFloat; bool expand8BitNormalsToFloat; bool applySkinInDecode; - bool alignOutputToWord; }; class VertexDecoder { diff --git a/GPU/Vulkan/DrawEngineVulkan.cpp b/GPU/Vulkan/DrawEngineVulkan.cpp index 85df9c2dd7..f141d06119 100644 --- a/GPU/Vulkan/DrawEngineVulkan.cpp +++ b/GPU/Vulkan/DrawEngineVulkan.cpp @@ -62,10 +62,6 @@ DrawEngineVulkan::DrawEngineVulkan(Draw::DrawContext *draw) : draw_(draw) { decOptions_.expandAllWeightsToFloat = false; decOptions_.expand8BitNormalsToFloat = false; -#if PPSSPP_PLATFORM(MAC) || PPSSPP_PLATFORM(IOS) - decOptions_.alignOutputToWord = true; -#endif - indexGen.Setup(decIndex_); } From afca3717bafb9df1b42a1e5a4fae607b54082282 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Tue, 19 Dec 2023 14:14:10 +0100 Subject: [PATCH 235/719] Specialized vertex decoder for GTA --- GPU/Common/VertexDecoderX86.cpp | 108 ++++++++++++++++++++++++++++++++ 1 file changed, 108 insertions(+) diff --git a/GPU/Common/VertexDecoderX86.cpp b/GPU/Common/VertexDecoderX86.cpp index f35e6c1ed8..3871792cd0 100644 --- a/GPU/Common/VertexDecoderX86.cpp +++ b/GPU/Common/VertexDecoderX86.cpp @@ -21,6 +21,7 @@ #include #include "Common/CPUDetect.h" +#include "Common/Data/Convert/ColorConv.h" #include "Core/Config.h" #include "GPU/GPUState.h" #include "GPU/Common/VertexDecoderCommon.h" @@ -166,7 +167,114 @@ static const JitLookup jitLookup[] = { {&VertexDecoder::Step_Color5551Morph, &VertexDecoderJitCache::Jit_Color5551Morph}, }; +void GTA_Tu8_C5551_Ps16(const u8 *srcp, u8 *dstp, int count, const UVScale *uvScaleOffset) { + struct GTAVTX { + union { + struct { + u8 u; + u8 v; + }; + u16 uv; + }; + u16 col; + s16 x; + s16 y; + s16 z; + }; + // NOTE: This might be different for different vertex format. + struct OutVTX { + float u; + float v; + uint32_t col; + float x; + float y; + float z; + }; + const GTAVTX *src = (const GTAVTX *)srcp; + OutVTX *dst = (OutVTX *)dstp; + float uscale = uvScaleOffset->uScale * (1.0f / 128.0f); + float vscale = uvScaleOffset->vScale * (1.0f / 128.0f); + float uoff = uvScaleOffset->uOff; + float voff = uvScaleOffset->vOff; + + u32 alpha = 0xFFFFFFFF; + +#if PPSSPP_ARCH(SSE2) + __m128 uvOff = _mm_setr_ps(uoff, voff, uoff, voff); + __m128 uvScale = _mm_setr_ps(uscale, vscale, uscale, vscale); + __m128 posScale = _mm_set1_ps(1.0f / 32768.0f); + __m128i rmask = _mm_set1_epi32(0x001F); + __m128i gmask = _mm_set1_epi32(0x03E0); + __m128i bmask = _mm_set1_epi32(0x7c00); + __m128i amask = _mm_set1_epi32(0x8000); + __m128i lowbits = _mm_set1_epi32(0x00070707); + + // Two vertices at a time, we can share some calculations. + for (int i = 0; i < count; i += 2) { + __m128i pos0 = _mm_loadl_epi64((const __m128i *) & src[i].x); + __m128i pos1 = _mm_loadl_epi64((const __m128i *) & src[i + 1].x); + // Translate UV, combined. TODO: Can possibly shuffle UV and col together here + uint32_t uv0 = (uint32_t)src[i].uv | ((uint32_t)src[i + 1].uv << 16); + uint64_t col0 = (uint64_t)src[i].col | ((uint64_t)src[i + 1].col << 32); + __m128i pos0_32 = _mm_srai_epi32(_mm_unpacklo_epi16(pos0, pos0), 16); + __m128i pos1_32 = _mm_srai_epi32(_mm_unpacklo_epi16(pos1, pos1), 16); + __m128 pos0_ext = _mm_mul_ps(_mm_cvtepi32_ps(pos0_32), posScale); + __m128 pos1_ext = _mm_mul_ps(_mm_cvtepi32_ps(pos1_32), posScale); + + __m128i uv8 = _mm_set1_epi32(uv0); + __m128i uv16 = _mm_unpacklo_epi8(uv8, uv8); + __m128i uv32 = _mm_srli_epi32(_mm_unpacklo_epi16(uv16, uv16), 24); + __m128d uvf = _mm_castps_pd(_mm_add_ps(_mm_mul_ps(_mm_cvtepi32_ps(uv32), uvScale), uvOff)); + alpha &= col0; + + // Combined RGBA + __m128i col = _mm_set1_epi64x(col0); + __m128i r = _mm_slli_epi32(_mm_and_si128(col, rmask), 8 - 5); + __m128i g = _mm_slli_epi32(_mm_and_si128(col, gmask), 16 - 10); + __m128i b = _mm_slli_epi32(_mm_and_si128(col, bmask), 24 - 15); + __m128i a = _mm_srai_epi32(_mm_slli_epi32(_mm_and_si128(col, amask), 16), 7); + col = _mm_or_si128(_mm_or_si128(r, g), b); + col = _mm_or_si128(col, _mm_and_si128(_mm_srli_epi32(col, 5), lowbits)); + col = _mm_or_si128(col, a); + + // TODO: Mix into fewer stores. + _mm_storeu_ps(&dst[i].x, pos0_ext); + _mm_storeu_ps(&dst[i + 1].x, pos1_ext); + _mm_storel_pd((double *)&dst[i].u, uvf); + _mm_storeh_pd((double *)&dst[i + 1].u, uvf); + dst[i].col = _mm_cvtsi128_si32(col); + dst[i + 1].col = _mm_cvtsi128_si32(_mm_shuffle_epi32(col, _MM_SHUFFLE(1, 1, 1, 1))); + } + + alpha = alpha & (alpha >> 16); + +#else + + for (int i = 0; i < count; i++) { + float u = src[i].u * uscale + uoff; + float v = src[i].v * vscale + voff; + alpha &= src[i].col; + uint32_t color = RGBA5551ToRGBA8888(src[i].col); + float x = src[i].x * (1.0f / 32768.0f); + float y = src[i].y * (1.0f / 32768.0f); + float z = src[i].z * (1.0f / 32768.0f); + dst[i].col = color; + dst[i].u = u; + dst[i].v = v; + dst[i].x = x; + dst[i].y = y; + dst[i].z = z; + } + +#endif + gstate_c.vertexFullAlpha = (alpha >> 15) & 1; +} + JittedVertexDecoder VertexDecoderJitCache::Compile(const VertexDecoder &dec, int32_t *jittedSize) { + if ((dec.fmt_ & ~0x04000000) == (GE_VTYPE_TC_8BIT | GE_VTYPE_COL_5551 | GE_VTYPE_POS_16BIT)) { + return >A_Tu8_C5551_Ps16; + } + dec_ = &dec; BeginWrite(4096); const u8 *start = this->AlignCode16(); From 81f1b3fd95af253199b77f665cbbe9cb2bbdece7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Fri, 10 May 2024 18:59:37 +0200 Subject: [PATCH 236/719] Make handwritten vertex decoders work with non-compiled vertex decoding --- CMakeLists.txt | 2 + GPU/Common/VertexDecoderCommon.cpp | 9 ++ GPU/Common/VertexDecoderHandwritten.cpp | 115 ++++++++++++++++++++++++ GPU/Common/VertexDecoderHandwritten.h | 6 ++ GPU/Common/VertexDecoderX86.cpp | 108 +--------------------- GPU/GPU.vcxproj | 2 + GPU/GPU.vcxproj.filters | 6 ++ UWP/GPU_UWP/GPU_UWP.vcxproj | 4 +- UWP/GPU_UWP/GPU_UWP.vcxproj.filters | 4 +- android/jni/Android.mk | 1 + libretro/Makefile.common | 1 + 11 files changed, 149 insertions(+), 109 deletions(-) create mode 100644 GPU/Common/VertexDecoderHandwritten.cpp create mode 100644 GPU/Common/VertexDecoderHandwritten.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 4da7206ba2..4d1207d5c1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1858,6 +1858,8 @@ set(GPU_SOURCES GPU/Common/SoftwareTransformCommon.h GPU/Common/VertexDecoderCommon.cpp GPU/Common/VertexDecoderCommon.h + GPU/Common/VertexDecoderHandwritten.cpp + GPU/Common/VertexDecoderHandwritten.h GPU/Common/TransformCommon.cpp GPU/Common/TransformCommon.h GPU/Common/IndexGenerator.cpp diff --git a/GPU/Common/VertexDecoderCommon.cpp b/GPU/Common/VertexDecoderCommon.cpp index ee31129140..01916b99a3 100644 --- a/GPU/Common/VertexDecoderCommon.cpp +++ b/GPU/Common/VertexDecoderCommon.cpp @@ -36,6 +36,7 @@ #include "GPU/ge_constants.h" #include "GPU/Math3D.h" #include "GPU/Common/VertexDecoderCommon.h" +#include "GPU/Common/VertexDecoderHandwritten.h" static const u8 tcsize[4] = { 0, 2, 4, 8 }, tcalign[4] = { 0, 1, 2, 4 }; static const u8 colsize[8] = { 0, 0, 0, 0, 2, 2, 2, 4 }, colalign[8] = { 0, 0, 0, 0, 2, 2, 2, 4 }; @@ -1282,6 +1283,14 @@ void VertexDecoder::SetVertexType(u32 fmt, const VertexDecoderOptions &options, _assert_msg_(decFmt.uvfmt == DEC_FLOAT_2 || decFmt.uvfmt == DEC_NONE, "Reader only supports float UV"); + // See GetVertTypeID + uint32_t fmtWithoutSkinFlag = (fmt_ & ~0x04000000); + if (fmtWithoutSkinFlag == (GE_VTYPE_TC_8BIT | GE_VTYPE_COL_5551 | GE_VTYPE_POS_16BIT)) { + // Can skip looking up in the JIT. + jitted_ = &VtxDec_Tu8_C5551_Ps16; + return; + } + // Attempt to JIT as well. But only do that if the main CPU JIT is enabled, in order to aid // debugging attempts - if the main JIT doesn't work, this one won't do any better, probably. if (jitCache) { diff --git a/GPU/Common/VertexDecoderHandwritten.cpp b/GPU/Common/VertexDecoderHandwritten.cpp new file mode 100644 index 0000000000..cb139dd1f5 --- /dev/null +++ b/GPU/Common/VertexDecoderHandwritten.cpp @@ -0,0 +1,115 @@ +#include "Common/CommonTypes.h" +#include "Common/Data/Convert/ColorConv.h" +#include "GPU/Common/VertexDecoderCommon.h" +#include "GPU/GPUState.h" + + +// Candidates for hand-writing +// (found using our custom Very Sleepy). +// GPU::P:_f_N:_s8_C:_8888_T:_u16__(24b)_040001BE (5%+ of God of War execution) +// GPU::P:_f_N:_s8_C:_8888_T:_u16_W:_f_(1x)__(28b)_040007BE (1%+ of God of War execution) + + +void VtxDec_Tu8_C5551_Ps16(const u8 *srcp, u8 *dstp, int count, const UVScale *uvScaleOffset) { + struct GTAVTX { + union { + struct { + u8 u; + u8 v; + }; + u16 uv; + }; + u16 col; + s16 x; + s16 y; + s16 z; + }; + // NOTE: This might be different for different vertex format. + struct OutVTX { + float u; + float v; + uint32_t col; + float x; + float y; + float z; + }; + const GTAVTX *src = (const GTAVTX *)srcp; + OutVTX *dst = (OutVTX *)dstp; + float uscale = uvScaleOffset->uScale * (1.0f / 128.0f); + float vscale = uvScaleOffset->vScale * (1.0f / 128.0f); + float uoff = uvScaleOffset->uOff; + float voff = uvScaleOffset->vOff; + + u32 alpha = 0xFFFFFFFF; + +#if PPSSPP_ARCH(SSE2) + __m128 uvOff = _mm_setr_ps(uoff, voff, uoff, voff); + __m128 uvScale = _mm_setr_ps(uscale, vscale, uscale, vscale); + __m128 posScale = _mm_set1_ps(1.0f / 32768.0f); + __m128i rmask = _mm_set1_epi32(0x001F); + __m128i gmask = _mm_set1_epi32(0x03E0); + __m128i bmask = _mm_set1_epi32(0x7c00); + __m128i amask = _mm_set1_epi32(0x8000); + __m128i lowbits = _mm_set1_epi32(0x00070707); + + // Two vertices at a time, we can share some calculations. + // It's OK to accidentally decode an extra vertex. + for (int i = 0; i < count; i += 2) { + __m128i pos0 = _mm_loadl_epi64((const __m128i *) & src[i].x); + __m128i pos1 = _mm_loadl_epi64((const __m128i *) & src[i + 1].x); + // Translate UV, combined. TODO: Can possibly shuffle UV and col together here + uint32_t uv0 = (uint32_t)src[i].uv | ((uint32_t)src[i + 1].uv << 16); + uint64_t col0 = (uint64_t)src[i].col | ((uint64_t)src[i + 1].col << 32); + __m128i pos0_32 = _mm_srai_epi32(_mm_unpacklo_epi16(pos0, pos0), 16); + __m128i pos1_32 = _mm_srai_epi32(_mm_unpacklo_epi16(pos1, pos1), 16); + __m128 pos0_ext = _mm_mul_ps(_mm_cvtepi32_ps(pos0_32), posScale); + __m128 pos1_ext = _mm_mul_ps(_mm_cvtepi32_ps(pos1_32), posScale); + + __m128i uv8 = _mm_set1_epi32(uv0); + __m128i uv16 = _mm_unpacklo_epi8(uv8, uv8); + __m128i uv32 = _mm_srli_epi32(_mm_unpacklo_epi16(uv16, uv16), 24); + __m128d uvf = _mm_castps_pd(_mm_add_ps(_mm_mul_ps(_mm_cvtepi32_ps(uv32), uvScale), uvOff)); + alpha &= col0; + + // Combined RGBA + __m128i col = _mm_set1_epi64x(col0); + __m128i r = _mm_slli_epi32(_mm_and_si128(col, rmask), 8 - 5); + __m128i g = _mm_slli_epi32(_mm_and_si128(col, gmask), 16 - 10); + __m128i b = _mm_slli_epi32(_mm_and_si128(col, bmask), 24 - 15); + __m128i a = _mm_srai_epi32(_mm_slli_epi32(_mm_and_si128(col, amask), 16), 7); + col = _mm_or_si128(_mm_or_si128(r, g), b); + col = _mm_or_si128(col, _mm_and_si128(_mm_srli_epi32(col, 5), lowbits)); + col = _mm_or_si128(col, a); + + // TODO: Mix into fewer stores. + _mm_storeu_ps(&dst[i].x, pos0_ext); + _mm_storeu_ps(&dst[i + 1].x, pos1_ext); + _mm_storel_pd((double *)&dst[i].u, uvf); + _mm_storeh_pd((double *)&dst[i + 1].u, uvf); + dst[i].col = _mm_cvtsi128_si32(col); + dst[i + 1].col = _mm_cvtsi128_si32(_mm_shuffle_epi32(col, _MM_SHUFFLE(1, 1, 1, 1))); + } + + alpha = alpha & (alpha >> 16); + +#else + + for (int i = 0; i < count; i++) { + float u = src[i].u * uscale + uoff; + float v = src[i].v * vscale + voff; + alpha &= src[i].col; + uint32_t color = RGBA5551ToRGBA8888(src[i].col); + float x = src[i].x * (1.0f / 32768.0f); + float y = src[i].y * (1.0f / 32768.0f); + float z = src[i].z * (1.0f / 32768.0f); + dst[i].col = color; + dst[i].u = u; + dst[i].v = v; + dst[i].x = x; + dst[i].y = y; + dst[i].z = z; + } + +#endif + gstate_c.vertexFullAlpha = (alpha >> 15) & 1; +} diff --git a/GPU/Common/VertexDecoderHandwritten.h b/GPU/Common/VertexDecoderHandwritten.h new file mode 100644 index 0000000000..4ea698a380 --- /dev/null +++ b/GPU/Common/VertexDecoderHandwritten.h @@ -0,0 +1,6 @@ +#pragma once + +// These are useful on JIT-less platforms - they don't beat the jitted vertex decoders by much, but they +// will beat the function-call-stitched ones by a lot. + +void VtxDec_Tu8_C5551_Ps16(const u8 *srcp, u8 *dstp, int count, const UVScale *uvScaleOffset); diff --git a/GPU/Common/VertexDecoderX86.cpp b/GPU/Common/VertexDecoderX86.cpp index 3871792cd0..1df3be8388 100644 --- a/GPU/Common/VertexDecoderX86.cpp +++ b/GPU/Common/VertexDecoderX86.cpp @@ -25,6 +25,7 @@ #include "Core/Config.h" #include "GPU/GPUState.h" #include "GPU/Common/VertexDecoderCommon.h" +#include "GPU/Common/VertexDecoderHandwritten.h" // We start out by converting the active matrices into 4x4 which are easier to multiply with // using SSE / NEON and store them here. @@ -167,114 +168,7 @@ static const JitLookup jitLookup[] = { {&VertexDecoder::Step_Color5551Morph, &VertexDecoderJitCache::Jit_Color5551Morph}, }; -void GTA_Tu8_C5551_Ps16(const u8 *srcp, u8 *dstp, int count, const UVScale *uvScaleOffset) { - struct GTAVTX { - union { - struct { - u8 u; - u8 v; - }; - u16 uv; - }; - u16 col; - s16 x; - s16 y; - s16 z; - }; - // NOTE: This might be different for different vertex format. - struct OutVTX { - float u; - float v; - uint32_t col; - float x; - float y; - float z; - }; - const GTAVTX *src = (const GTAVTX *)srcp; - OutVTX *dst = (OutVTX *)dstp; - float uscale = uvScaleOffset->uScale * (1.0f / 128.0f); - float vscale = uvScaleOffset->vScale * (1.0f / 128.0f); - float uoff = uvScaleOffset->uOff; - float voff = uvScaleOffset->vOff; - - u32 alpha = 0xFFFFFFFF; - -#if PPSSPP_ARCH(SSE2) - __m128 uvOff = _mm_setr_ps(uoff, voff, uoff, voff); - __m128 uvScale = _mm_setr_ps(uscale, vscale, uscale, vscale); - __m128 posScale = _mm_set1_ps(1.0f / 32768.0f); - __m128i rmask = _mm_set1_epi32(0x001F); - __m128i gmask = _mm_set1_epi32(0x03E0); - __m128i bmask = _mm_set1_epi32(0x7c00); - __m128i amask = _mm_set1_epi32(0x8000); - __m128i lowbits = _mm_set1_epi32(0x00070707); - - // Two vertices at a time, we can share some calculations. - for (int i = 0; i < count; i += 2) { - __m128i pos0 = _mm_loadl_epi64((const __m128i *) & src[i].x); - __m128i pos1 = _mm_loadl_epi64((const __m128i *) & src[i + 1].x); - // Translate UV, combined. TODO: Can possibly shuffle UV and col together here - uint32_t uv0 = (uint32_t)src[i].uv | ((uint32_t)src[i + 1].uv << 16); - uint64_t col0 = (uint64_t)src[i].col | ((uint64_t)src[i + 1].col << 32); - __m128i pos0_32 = _mm_srai_epi32(_mm_unpacklo_epi16(pos0, pos0), 16); - __m128i pos1_32 = _mm_srai_epi32(_mm_unpacklo_epi16(pos1, pos1), 16); - __m128 pos0_ext = _mm_mul_ps(_mm_cvtepi32_ps(pos0_32), posScale); - __m128 pos1_ext = _mm_mul_ps(_mm_cvtepi32_ps(pos1_32), posScale); - - __m128i uv8 = _mm_set1_epi32(uv0); - __m128i uv16 = _mm_unpacklo_epi8(uv8, uv8); - __m128i uv32 = _mm_srli_epi32(_mm_unpacklo_epi16(uv16, uv16), 24); - __m128d uvf = _mm_castps_pd(_mm_add_ps(_mm_mul_ps(_mm_cvtepi32_ps(uv32), uvScale), uvOff)); - alpha &= col0; - - // Combined RGBA - __m128i col = _mm_set1_epi64x(col0); - __m128i r = _mm_slli_epi32(_mm_and_si128(col, rmask), 8 - 5); - __m128i g = _mm_slli_epi32(_mm_and_si128(col, gmask), 16 - 10); - __m128i b = _mm_slli_epi32(_mm_and_si128(col, bmask), 24 - 15); - __m128i a = _mm_srai_epi32(_mm_slli_epi32(_mm_and_si128(col, amask), 16), 7); - col = _mm_or_si128(_mm_or_si128(r, g), b); - col = _mm_or_si128(col, _mm_and_si128(_mm_srli_epi32(col, 5), lowbits)); - col = _mm_or_si128(col, a); - - // TODO: Mix into fewer stores. - _mm_storeu_ps(&dst[i].x, pos0_ext); - _mm_storeu_ps(&dst[i + 1].x, pos1_ext); - _mm_storel_pd((double *)&dst[i].u, uvf); - _mm_storeh_pd((double *)&dst[i + 1].u, uvf); - dst[i].col = _mm_cvtsi128_si32(col); - dst[i + 1].col = _mm_cvtsi128_si32(_mm_shuffle_epi32(col, _MM_SHUFFLE(1, 1, 1, 1))); - } - - alpha = alpha & (alpha >> 16); - -#else - - for (int i = 0; i < count; i++) { - float u = src[i].u * uscale + uoff; - float v = src[i].v * vscale + voff; - alpha &= src[i].col; - uint32_t color = RGBA5551ToRGBA8888(src[i].col); - float x = src[i].x * (1.0f / 32768.0f); - float y = src[i].y * (1.0f / 32768.0f); - float z = src[i].z * (1.0f / 32768.0f); - dst[i].col = color; - dst[i].u = u; - dst[i].v = v; - dst[i].x = x; - dst[i].y = y; - dst[i].z = z; - } - -#endif - gstate_c.vertexFullAlpha = (alpha >> 15) & 1; -} - JittedVertexDecoder VertexDecoderJitCache::Compile(const VertexDecoder &dec, int32_t *jittedSize) { - if ((dec.fmt_ & ~0x04000000) == (GE_VTYPE_TC_8BIT | GE_VTYPE_COL_5551 | GE_VTYPE_POS_16BIT)) { - return >A_Tu8_C5551_Ps16; - } - dec_ = &dec; BeginWrite(4096); const u8 *start = this->AlignCode16(); diff --git a/GPU/GPU.vcxproj b/GPU/GPU.vcxproj index 87c79f3462..147e31c724 100644 --- a/GPU/GPU.vcxproj +++ b/GPU/GPU.vcxproj @@ -371,6 +371,7 @@ + @@ -511,6 +512,7 @@ true + true diff --git a/GPU/GPU.vcxproj.filters b/GPU/GPU.vcxproj.filters index 6b35f8f33a..c59e28ed7b 100644 --- a/GPU/GPU.vcxproj.filters +++ b/GPU/GPU.vcxproj.filters @@ -273,6 +273,9 @@ Common + + Common + @@ -542,6 +545,9 @@ Common + + Common + diff --git a/UWP/GPU_UWP/GPU_UWP.vcxproj b/UWP/GPU_UWP/GPU_UWP.vcxproj index ffc2d6f0c0..9e22d246ef 100644 --- a/UWP/GPU_UWP/GPU_UWP.vcxproj +++ b/UWP/GPU_UWP/GPU_UWP.vcxproj @@ -136,6 +136,7 @@ + @@ -203,6 +204,7 @@ + @@ -257,4 +259,4 @@ - \ No newline at end of file + diff --git a/UWP/GPU_UWP/GPU_UWP.vcxproj.filters b/UWP/GPU_UWP/GPU_UWP.vcxproj.filters index 314574f863..804554a2c5 100644 --- a/UWP/GPU_UWP/GPU_UWP.vcxproj.filters +++ b/UWP/GPU_UWP/GPU_UWP.vcxproj.filters @@ -22,6 +22,7 @@ + @@ -86,6 +87,7 @@ + @@ -130,4 +132,4 @@ - \ No newline at end of file + diff --git a/android/jni/Android.mk b/android/jni/Android.mk index ac949a57ef..c49ac79c4e 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -481,6 +481,7 @@ EXEC_AND_LIB_FILES := \ $(SRC)/GPU/Common/ReinterpretFramebuffer.cpp \ $(SRC)/GPU/Common/DepthBufferCommon.cpp \ $(SRC)/GPU/Common/VertexDecoderCommon.cpp.arm \ + $(SRC)/GPU/Common/VertexDecoderHandwritten.cpp.arm \ $(SRC)/GPU/Common/TextureCacheCommon.cpp.arm \ $(SRC)/GPU/Common/TextureScalerCommon.cpp.arm \ $(SRC)/GPU/Common/ShaderCommon.cpp \ diff --git a/libretro/Makefile.common b/libretro/Makefile.common index e91b78e722..8a5b0b9214 100644 --- a/libretro/Makefile.common +++ b/libretro/Makefile.common @@ -463,6 +463,7 @@ SOURCES_C +=\ SOURCES_CXX += \ $(GPUCOMMONDIR)/Draw2D.cpp \ $(GPUCOMMONDIR)/VertexDecoderCommon.cpp \ + $(GPUCOMMONDIR)/VertexDecoderHandwritten.cpp \ $(GPUCOMMONDIR)/GPUStateUtils.cpp \ $(GPUCOMMONDIR)/DrawEngineCommon.cpp \ $(GPUCOMMONDIR)/SplineCommon.cpp \ From 35264161739f0756296d22b3f1719974e577ed6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Fri, 10 May 2024 23:11:51 +0200 Subject: [PATCH 237/719] Add another handwritten vertex decoder --- GPU/Common/VertexDecoderCommon.cpp | 3 ++ GPU/Common/VertexDecoderHandwritten.cpp | 69 ++++++++++++++++++++++++- GPU/Common/VertexDecoderHandwritten.h | 1 + 3 files changed, 72 insertions(+), 1 deletion(-) diff --git a/GPU/Common/VertexDecoderCommon.cpp b/GPU/Common/VertexDecoderCommon.cpp index 01916b99a3..f5e9658524 100644 --- a/GPU/Common/VertexDecoderCommon.cpp +++ b/GPU/Common/VertexDecoderCommon.cpp @@ -1289,6 +1289,9 @@ void VertexDecoder::SetVertexType(u32 fmt, const VertexDecoderOptions &options, // Can skip looking up in the JIT. jitted_ = &VtxDec_Tu8_C5551_Ps16; return; + } else if (!options.expand8BitNormalsToFloat && fmtWithoutSkinFlag == (GE_VTYPE_TC_16BIT | GE_VTYPE_NRM_8BIT | GE_VTYPE_COL_8888 | GE_VTYPE_POS_FLOAT)) { + jitted_ = &VtxDec_Tu16_C8888_Pfloat; + return; } // Attempt to JIT as well. But only do that if the main CPU JIT is enabled, in order to aid diff --git a/GPU/Common/VertexDecoderHandwritten.cpp b/GPU/Common/VertexDecoderHandwritten.cpp index cb139dd1f5..c33807987f 100644 --- a/GPU/Common/VertexDecoderHandwritten.cpp +++ b/GPU/Common/VertexDecoderHandwritten.cpp @@ -9,6 +9,73 @@ // GPU::P:_f_N:_s8_C:_8888_T:_u16__(24b)_040001BE (5%+ of God of War execution) // GPU::P:_f_N:_s8_C:_8888_T:_u16_W:_f_(1x)__(28b)_040007BE (1%+ of God of War execution) +void VtxDec_Tu16_C8888_Pfloat(const u8 *srcp, u8 *dstp, int count, const UVScale *uvScaleOffset) { + struct GOWVTX { + union { + struct { + u16 u; + u16 v; + }; + u32 packed_uv; + }; + u32 packed_normal; + u32 col; + float x; + float y; + float z; + }; + // NOTE: This might be different for different vertex formats. + struct OutVTX { + float u; + float v; + u32 packed_normal; + uint32_t col; + float x; + float y; + float z; + }; + const GOWVTX *src = (const GOWVTX *)srcp; + OutVTX *dst = (OutVTX *)dstp; + float uscale = uvScaleOffset->uScale * (1.0f / 32768.0f); + float vscale = uvScaleOffset->vScale * (1.0f / 32768); + float uoff = uvScaleOffset->uOff; + float voff = uvScaleOffset->vOff; + + u32 alpha = 0xFFFFFFFF; + +#if PPSSPP_ARCH(SSE2) + __m128 uvOff = _mm_setr_ps(uoff, voff, uoff, voff); + __m128 uvScale = _mm_setr_ps(uscale, vscale, uscale, vscale); + for (int i = 0; i < count; i++) { + __m128i uv = _mm_set1_epi32(src[i].packed_uv); + __m128 fuv = _mm_cvtepi32_ps(_mm_unpacklo_epi16(uv, _mm_setzero_si128())); + __m128 finalUV = _mm_add_ps(_mm_mul_ps(fuv, uvScale), uvOff); + u32 normal = src[i].packed_normal; + __m128 colpos = _mm_loadu_ps((const float *)&src[i].col); + _mm_store1_pd((double *)&dst[i].u, _mm_castps_pd(finalUV)); + dst[i].packed_normal = normal; + _mm_storeu_ps((float *)&dst[i].col, colpos); + } +#else + for (int i = 0; i < count; i++) { + float u = src[i].u * uscale + uoff; + float v = src[i].v * vscale + voff; + uint32_t color = src[i].col; + alpha &= color; + float x = src[i].x; + float y = src[i].y; + float z = src[i].z; + dst[i].col = color; + dst[i].packed_normal = src[i].packed_normal; + dst[i].u = u; + dst[i].v = v; + dst[i].x = x; + dst[i].y = y; + dst[i].z = z; + } +#endif + gstate_c.vertexFullAlpha = (alpha >> 24) == 0xFF; +} void VtxDec_Tu8_C5551_Ps16(const u8 *srcp, u8 *dstp, int count, const UVScale *uvScaleOffset) { struct GTAVTX { @@ -24,7 +91,7 @@ void VtxDec_Tu8_C5551_Ps16(const u8 *srcp, u8 *dstp, int count, const UVScale *u s16 y; s16 z; }; - // NOTE: This might be different for different vertex format. + // NOTE: This might be different for different vertex formats. struct OutVTX { float u; float v; diff --git a/GPU/Common/VertexDecoderHandwritten.h b/GPU/Common/VertexDecoderHandwritten.h index 4ea698a380..fdf666cc85 100644 --- a/GPU/Common/VertexDecoderHandwritten.h +++ b/GPU/Common/VertexDecoderHandwritten.h @@ -3,4 +3,5 @@ // These are useful on JIT-less platforms - they don't beat the jitted vertex decoders by much, but they // will beat the function-call-stitched ones by a lot. +void VtxDec_Tu16_C8888_Pfloat(const u8 *srcp, u8 *dstp, int count, const UVScale *uvScaleOffset); void VtxDec_Tu8_C5551_Ps16(const u8 *srcp, u8 *dstp, int count, const UVScale *uvScaleOffset); From bafff7f5db2bf1ce4b455bf26d698c6bbd937596 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sat, 11 May 2024 11:11:21 +0200 Subject: [PATCH 238/719] Temporarily disable the custom GoW vertex decoder, it needs some work. --- GPU/Common/VertexDecoderCommon.cpp | 6 ++++-- GPU/Common/VertexDecoderHandwritten.cpp | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/GPU/Common/VertexDecoderCommon.cpp b/GPU/Common/VertexDecoderCommon.cpp index f5e9658524..c7787342e0 100644 --- a/GPU/Common/VertexDecoderCommon.cpp +++ b/GPU/Common/VertexDecoderCommon.cpp @@ -1289,10 +1289,12 @@ void VertexDecoder::SetVertexType(u32 fmt, const VertexDecoderOptions &options, // Can skip looking up in the JIT. jitted_ = &VtxDec_Tu8_C5551_Ps16; return; - } else if (!options.expand8BitNormalsToFloat && fmtWithoutSkinFlag == (GE_VTYPE_TC_16BIT | GE_VTYPE_NRM_8BIT | GE_VTYPE_COL_8888 | GE_VTYPE_POS_FLOAT)) { + } + /* // Fails to update alphaFull properly. + else if (!options.expand8BitNormalsToFloat && fmtWithoutSkinFlag == (GE_VTYPE_TC_16BIT | GE_VTYPE_NRM_8BIT | GE_VTYPE_COL_8888 | GE_VTYPE_POS_FLOAT)) { jitted_ = &VtxDec_Tu16_C8888_Pfloat; return; - } + }*/ // Attempt to JIT as well. But only do that if the main CPU JIT is enabled, in order to aid // debugging attempts - if the main JIT doesn't work, this one won't do any better, probably. diff --git a/GPU/Common/VertexDecoderHandwritten.cpp b/GPU/Common/VertexDecoderHandwritten.cpp index c33807987f..7e52199517 100644 --- a/GPU/Common/VertexDecoderHandwritten.cpp +++ b/GPU/Common/VertexDecoderHandwritten.cpp @@ -43,6 +43,8 @@ void VtxDec_Tu16_C8888_Pfloat(const u8 *srcp, u8 *dstp, int count, const UVScale u32 alpha = 0xFFFFFFFF; + // TODO: Update alpha properly! Forgot about that. + #if PPSSPP_ARCH(SSE2) __m128 uvOff = _mm_setr_ps(uoff, voff, uoff, voff); __m128 uvScale = _mm_setr_ps(uscale, vscale, uscale, vscale); From 4a66f8978b1939358b9406d19c405389b6489812 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sat, 11 May 2024 13:26:53 +0200 Subject: [PATCH 239/719] Fix the GoW optimized vertex decoder, add NEON optimizations --- GPU/Common/VertexDecoderCommon.cpp | 4 +-- GPU/Common/VertexDecoderHandwritten.cpp | 40 ++++++++++++++++++++++--- 2 files changed, 38 insertions(+), 6 deletions(-) diff --git a/GPU/Common/VertexDecoderCommon.cpp b/GPU/Common/VertexDecoderCommon.cpp index c7787342e0..e505085f1b 100644 --- a/GPU/Common/VertexDecoderCommon.cpp +++ b/GPU/Common/VertexDecoderCommon.cpp @@ -1290,11 +1290,11 @@ void VertexDecoder::SetVertexType(u32 fmt, const VertexDecoderOptions &options, jitted_ = &VtxDec_Tu8_C5551_Ps16; return; } - /* // Fails to update alphaFull properly. + // Fails to update alphaFull properly. else if (!options.expand8BitNormalsToFloat && fmtWithoutSkinFlag == (GE_VTYPE_TC_16BIT | GE_VTYPE_NRM_8BIT | GE_VTYPE_COL_8888 | GE_VTYPE_POS_FLOAT)) { jitted_ = &VtxDec_Tu16_C8888_Pfloat; return; - }*/ + } // Attempt to JIT as well. But only do that if the main CPU JIT is enabled, in order to aid // debugging attempts - if the main JIT doesn't work, this one won't do any better, probably. diff --git a/GPU/Common/VertexDecoderHandwritten.cpp b/GPU/Common/VertexDecoderHandwritten.cpp index 7e52199517..8cfe310800 100644 --- a/GPU/Common/VertexDecoderHandwritten.cpp +++ b/GPU/Common/VertexDecoderHandwritten.cpp @@ -3,12 +3,26 @@ #include "GPU/Common/VertexDecoderCommon.h" #include "GPU/GPUState.h" +#ifdef _M_SSE +#include +#include +#endif + +#if PPSSPP_ARCH(ARM_NEON) +#if defined(_MSC_VER) && PPSSPP_ARCH(ARM64) +#include +#else +#include +#endif +#endif + // Candidates for hand-writing // (found using our custom Very Sleepy). // GPU::P:_f_N:_s8_C:_8888_T:_u16__(24b)_040001BE (5%+ of God of War execution) // GPU::P:_f_N:_s8_C:_8888_T:_u16_W:_f_(1x)__(28b)_040007BE (1%+ of God of War execution) +// This is the first GoW one. void VtxDec_Tu16_C8888_Pfloat(const u8 *srcp, u8 *dstp, int count, const UVScale *uvScaleOffset) { struct GOWVTX { union { @@ -43,21 +57,39 @@ void VtxDec_Tu16_C8888_Pfloat(const u8 *srcp, u8 *dstp, int count, const UVScale u32 alpha = 0xFFFFFFFF; - // TODO: Update alpha properly! Forgot about that. - #if PPSSPP_ARCH(SSE2) __m128 uvOff = _mm_setr_ps(uoff, voff, uoff, voff); __m128 uvScale = _mm_setr_ps(uscale, vscale, uscale, vscale); + __m128i alphaMask = _mm_set1_epi32(0xFFFFFFFF); for (int i = 0; i < count; i++) { __m128i uv = _mm_set1_epi32(src[i].packed_uv); __m128 fuv = _mm_cvtepi32_ps(_mm_unpacklo_epi16(uv, _mm_setzero_si128())); __m128 finalUV = _mm_add_ps(_mm_mul_ps(fuv, uvScale), uvOff); u32 normal = src[i].packed_normal; - __m128 colpos = _mm_loadu_ps((const float *)&src[i].col); + __m128i colpos = _mm_loadu_si128((const __m128i *)&src[i].col); _mm_store1_pd((double *)&dst[i].u, _mm_castps_pd(finalUV)); dst[i].packed_normal = normal; - _mm_storeu_ps((float *)&dst[i].col, colpos); + _mm_storeu_si128((__m128i *)&dst[i].col, colpos); + alphaMask = _mm_and_si128(alphaMask, colpos); } + alpha = _mm_cvtsi128_si32(alphaMask); + +#elif PPSSPP_ARCH(ARM_NEON) + float32x2_t uvScale = vmul_f32(vld1_f32(&uvScaleOffset->uScale), vdup_n_f32(1.0f / 32768.0f)); + float32x2_t uvOff = vld1_f32(&uvScaleOffset->uOff); + uint32x4_t alphaMask = vdupq_n_u32(0xFFFFFFFF); + for (int i = 0; i < count; i++) { + uint16x4_t uv = vld1_u16(&src[i].u); // TODO: We only need the first two lanes, maybe there's a better way? + uint32x2_t fuv = vget_low_u32(vmovl_u16(uv)); // Only using the first two lanes + float32x2_t finalUV = vadd_f32(vmul_f32(vcvt_f32_u32(fuv), uvScale), uvOff); + u32 normal = src[i].packed_normal; + uint32x4_t colpos = vld1q_u32((const u32 *)&src[i].col); + alphaMask = vandq_u32(alphaMask, colpos); + vst1_f32(&dst[i].u, finalUV); + dst[i].packed_normal = normal; + vst1q_u32(&dst[i].col, colpos); + } + alpha = vgetq_lane_u32(alphaMask, 0); #else for (int i = 0; i < count; i++) { float u = src[i].u * uscale + uoff; From f569d47edda69e16e361a82d205400ac6bce8ec6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sat, 11 May 2024 13:27:22 +0200 Subject: [PATCH 240/719] Fix display of some parameters in a debug screen --- UI/DevScreens.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UI/DevScreens.cpp b/UI/DevScreens.cpp index 0d614b61ff..8da4308886 100644 --- a/UI/DevScreens.cpp +++ b/UI/DevScreens.cpp @@ -1590,7 +1590,7 @@ void TouchTestScreen::DrawForeground(UIContext &dc) { "g_dpi_scale_real: %0.3fx%0.3f\n" "delta: %0.2f ms fps: %0.3f\n%s", #if PPSSPP_PLATFORM(ANDROID) - System_GetPropertyInt(SYSPROP_DISPLAY_XRES), System_GetPropertyInt(SYSPROP_DISPLAY_YRES), + (int)System_GetPropertyInt(SYSPROP_DISPLAY_XRES), (int)System_GetPropertyInt(SYSPROP_DISPLAY_YRES), #endif g_display.dp_xres, g_display.dp_yres, g_display.pixel_xres, g_display.pixel_yres, g_display.dpi, g_display.dpi_scale_x, g_display.dpi_scale_y, From 6452ce8ac5e21e4f8b1de52a24ea5847d1c2b035 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sat, 11 May 2024 14:13:29 +0200 Subject: [PATCH 241/719] NEON-optimize the GTA vertex decoder too. --- GPU/Common/VertexDecoderHandwritten.cpp | 61 ++++++++++++++++++++++++- 1 file changed, 59 insertions(+), 2 deletions(-) diff --git a/GPU/Common/VertexDecoderHandwritten.cpp b/GPU/Common/VertexDecoderHandwritten.cpp index 8cfe310800..30be6d6f98 100644 --- a/GPU/Common/VertexDecoderHandwritten.cpp +++ b/GPU/Common/VertexDecoderHandwritten.cpp @@ -141,7 +141,7 @@ void VtxDec_Tu8_C5551_Ps16(const u8 *srcp, u8 *dstp, int count, const UVScale *u float uoff = uvScaleOffset->uOff; float voff = uvScaleOffset->vOff; - u32 alpha = 0xFFFFFFFF; + uint64_t alpha = 0xFFFFFFFFFFFFFFFFULL; #if PPSSPP_ARCH(SSE2) __m128 uvOff = _mm_setr_ps(uoff, voff, uoff, voff); @@ -191,7 +191,63 @@ void VtxDec_Tu8_C5551_Ps16(const u8 *srcp, u8 *dstp, int count, const UVScale *u dst[i + 1].col = _mm_cvtsi128_si32(_mm_shuffle_epi32(col, _MM_SHUFFLE(1, 1, 1, 1))); } - alpha = alpha & (alpha >> 16); + alpha = alpha & (alpha >> 32); + +#elif PPSSPP_ARCH(ARM_NEON) + + float32x4_t uvScaleOff = vld1q_f32(&uvScaleOffset->uScale); + float32x4_t uvScale = vmulq_f32(vcombine_f32(vget_low_f32(uvScaleOff), vget_low_f32(uvScaleOff)), vdupq_n_f32(1.0f / 128.0f)); + float32x4_t uvOffset = vcombine_f32(vget_high_f32(uvScaleOff), vget_high_f32(uvScaleOff)); + float32x4_t posScale = vdupq_n_f32(1.0f / 32768.0f); + uint32x2_t rmask = vdup_n_u32(0x001F); + uint32x2_t gmask = vdup_n_u32(0x03E0); + uint32x2_t bmask = vdup_n_u32(0x7c00); + uint32x2_t amask = vdup_n_u32(0x8000); + uint32x2_t lowbits = vdup_n_u32(0x00070707); + + // Two vertices at a time, we can share some calculations. + // It's OK to accidentally decode an extra vertex. + // Doing four vertices at a time might be even better, can share more of the pesky color format conversion. + for (int i = 0; i < count; i += 2) { + int16x4_t pos0 = vld1_s16(&src[i].x); + int16x4_t pos1 = vld1_s16(&src[i + 1].x); + // Translate UV, combined. TODO: Can possibly shuffle UV and col together here + uint32_t uv0 = (uint32_t)src[i].uv | ((uint32_t)src[i + 1].uv << 16); + uint64_t col0 = (uint64_t)src[i].col | ((uint64_t)src[i + 1].col << 32); + int32x4_t pos0_32 = vmovl_s16(pos0); + int32x4_t pos1_32 = vmovl_s16(pos1); + float32x4_t pos0_ext = vmulq_f32(vcvtq_f32_s32(pos0_32), posScale); + float32x4_t pos1_ext = vmulq_f32(vcvtq_f32_s32(pos1_32), posScale); + + uint64x1_t uv8_one = vdup_n_u64(uv0); + uint8x8_t uv8 = vreinterpret_s8_u64(uv8_one); + uint16x4_t uv16 = vget_low_u16(vmovl_u8(uv8)); + uint32x4_t uv32 = vmovl_u16(uv16); + float32x4_t uvf = vaddq_f32(vmulq_f32(vcvtq_f32_u32(uv32), uvScale), uvOffset); + + alpha &= col0; + + // Combined RGBA + uint32x2_t col = vreinterpret_u32_u64(vdup_n_u64(col0)); + uint32x2_t r = vshl_n_u32(vand_u32(col, rmask), 8 - 5); + uint32x2_t g = vshl_n_u32(vand_u32(col, gmask), 16 - 10); + uint32x2_t b = vshl_n_u32(vand_u32(col, bmask), 24 - 15); + int32x2_t a_shifted = vshr_n_s32(vreinterpret_s32_u32(vshl_n_u32(vand_u32(col, amask), 16)), 7); + uint32x2_t a = vreinterpret_u32_s32(a_shifted); + col = vorr_u32(vorr_u32(r, g), b); + col = vorr_u32(col, vand_u32(vshl_n_u32(col, 5), lowbits)); + col = vorr_u32(col, a); + + // TODO: Mix into fewer stores. + vst1q_f32(&dst[i].x, pos0_ext); + vst1q_f32(&dst[i + 1].x, pos1_ext); + vst1_f32(&dst[i].u, vget_low_f32(uvf)); + vst1_f32(&dst[i + 1].u, vget_high_f32(uvf)); + dst[i].col = vget_lane_u32(col, 0); + dst[i + 1].col = vget_lane_u32(col, 1); + } + + alpha = alpha & (alpha >> 32); #else @@ -212,5 +268,6 @@ void VtxDec_Tu8_C5551_Ps16(const u8 *srcp, u8 *dstp, int count, const UVScale *u } #endif + gstate_c.vertexFullAlpha = (alpha >> 15) & 1; } From fb599cd0a6991c71401e011e89d7f799e18a7392 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sat, 11 May 2024 14:18:42 +0200 Subject: [PATCH 242/719] Only use the optimized decoders if SSE or NEON is available. --- GPU/Common/VertexDecoderCommon.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/GPU/Common/VertexDecoderCommon.cpp b/GPU/Common/VertexDecoderCommon.cpp index e505085f1b..c055c3a3d2 100644 --- a/GPU/Common/VertexDecoderCommon.cpp +++ b/GPU/Common/VertexDecoderCommon.cpp @@ -1283,6 +1283,8 @@ void VertexDecoder::SetVertexType(u32 fmt, const VertexDecoderOptions &options, _assert_msg_(decFmt.uvfmt == DEC_FLOAT_2 || decFmt.uvfmt == DEC_NONE, "Reader only supports float UV"); + // Only use the handwritten decoders if we have SSE or NEON. Don't want to use these on RISC-V, probably? +#if PPSSPP_ARCH(ARM_NEON) || PPSSPP_ARCH(SSE2) // See GetVertTypeID uint32_t fmtWithoutSkinFlag = (fmt_ & ~0x04000000); if (fmtWithoutSkinFlag == (GE_VTYPE_TC_8BIT | GE_VTYPE_COL_5551 | GE_VTYPE_POS_16BIT)) { @@ -1295,6 +1297,7 @@ void VertexDecoder::SetVertexType(u32 fmt, const VertexDecoderOptions &options, jitted_ = &VtxDec_Tu16_C8888_Pfloat; return; } +#endif // Attempt to JIT as well. But only do that if the main CPU JIT is enabled, in order to aid // debugging attempts - if the main JIT doesn't work, this one won't do any better, probably. From 6ed8f96e98e395d13dadc1e090d9c5a31242792e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sat, 11 May 2024 20:36:51 +0200 Subject: [PATCH 243/719] Indentation fix --- GPU/Common/VertexDecoderHandwritten.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/GPU/Common/VertexDecoderHandwritten.cpp b/GPU/Common/VertexDecoderHandwritten.cpp index 30be6d6f98..07de5fa90d 100644 --- a/GPU/Common/VertexDecoderHandwritten.cpp +++ b/GPU/Common/VertexDecoderHandwritten.cpp @@ -84,12 +84,12 @@ void VtxDec_Tu16_C8888_Pfloat(const u8 *srcp, u8 *dstp, int count, const UVScale float32x2_t finalUV = vadd_f32(vmul_f32(vcvt_f32_u32(fuv), uvScale), uvOff); u32 normal = src[i].packed_normal; uint32x4_t colpos = vld1q_u32((const u32 *)&src[i].col); - alphaMask = vandq_u32(alphaMask, colpos); + alphaMask = vandq_u32(alphaMask, colpos); vst1_f32(&dst[i].u, finalUV); dst[i].packed_normal = normal; vst1q_u32(&dst[i].col, colpos); } - alpha = vgetq_lane_u32(alphaMask, 0); + alpha = vgetq_lane_u32(alphaMask, 0); #else for (int i = 0; i < count; i++) { float u = src[i].u * uscale + uoff; From c38ce2a5bea0e6a4e0646710c192032a5052b5e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sat, 11 May 2024 21:28:26 +0200 Subject: [PATCH 244/719] Fix an issue when bringin up the dev menu with transparent background disabled --- Common/GPU/Vulkan/VulkanRenderManager.h | 4 ++++ Common/GPU/Vulkan/thin3d_vulkan.cpp | 7 ++++++ Common/GPU/thin3d.h | 9 +++++++ Common/UI/Screen.cpp | 6 ++++- Common/UI/Screen.h | 10 +++++++- UI/EmuScreen.cpp | 32 ++++++++++++++++++------- UI/EmuScreen.h | 2 +- 7 files changed, 58 insertions(+), 12 deletions(-) diff --git a/Common/GPU/Vulkan/VulkanRenderManager.h b/Common/GPU/Vulkan/VulkanRenderManager.h index 44031a54fa..ea452de49f 100644 --- a/Common/GPU/Vulkan/VulkanRenderManager.h +++ b/Common/GPU/Vulkan/VulkanRenderManager.h @@ -533,6 +533,10 @@ public: void StartThreads(); void StopThreads(); + size_t GetNumSteps() const { + return steps_.size(); + } + private: void EndCurRenderStep(); diff --git a/Common/GPU/Vulkan/thin3d_vulkan.cpp b/Common/GPU/Vulkan/thin3d_vulkan.cpp index 8061ba1cf7..6e3af3cf2b 100644 --- a/Common/GPU/Vulkan/thin3d_vulkan.cpp +++ b/Common/GPU/Vulkan/thin3d_vulkan.cpp @@ -380,6 +380,13 @@ public: VKContext(VulkanContext *vulkan, bool useRenderThread); ~VKContext(); + BackendState GetCurrentBackendState() const override { + return BackendState{ + (u32)renderManager_.GetNumSteps(), + true, + }; + } + void DebugAnnotate(const char *annotation) override; void Wait() override { vkDeviceWaitIdle(vulkan_->GetDevice()); diff --git a/Common/GPU/thin3d.h b/Common/GPU/thin3d.h index 83101eeb1c..dc7ba23b24 100644 --- a/Common/GPU/thin3d.h +++ b/Common/GPU/thin3d.h @@ -687,6 +687,11 @@ enum class DebugFlags { }; ENUM_CLASS_BITOPS(DebugFlags); +struct BackendState { + u32 passes; + bool valid; +}; + class DrawContext { public: virtual ~DrawContext(); @@ -705,6 +710,10 @@ public: virtual std::vector GetPresentModeList(std::string_view currentMarkerString) const { return std::vector(); } virtual std::vector GetSurfaceFormatList() const { return std::vector(); } + virtual BackendState GetCurrentBackendState() const { + return BackendState{}; + } + // Describes the primary shader language that this implementation prefers. const ShaderLanguageDesc &GetShaderLanguageDesc() { return shaderLanguageDesc_; diff --git a/Common/UI/Screen.cpp b/Common/UI/Screen.cpp index 12c360d6f5..0ffb30b16d 100644 --- a/Common/UI/Screen.cpp +++ b/Common/UI/Screen.cpp @@ -187,7 +187,8 @@ ScreenRenderFlags ScreenManager::render() { bool first = true; do { --iter; - if (!foundBackgroundScreen && iter->screen->canBeBackground(first)) { + ScreenRenderRole role = iter->screen->renderRole(first); + if (!foundBackgroundScreen && (role & ScreenRenderRole::CAN_BE_BACKGROUND)) { // There still might be a screen that wants to be background - generally the EmuScreen if present. layers.push_back(iter->screen); foundBackgroundScreen = iter->screen; @@ -198,6 +199,9 @@ ScreenRenderFlags ScreenManager::render() { coveringScreen = iter->screen; } first = false; + if (role & ScreenRenderRole::MUST_BE_FIRST) { + break; + } } while (iter != stack_.begin()); if (backgroundScreen_ && !foundBackgroundScreen) { diff --git a/Common/UI/Screen.h b/Common/UI/Screen.h index de40bae684..8b015c925a 100644 --- a/Common/UI/Screen.h +++ b/Common/UI/Screen.h @@ -61,6 +61,14 @@ enum class ScreenRenderFlags { }; ENUM_CLASS_BITOPS(ScreenRenderFlags); + +enum class ScreenRenderRole { + NONE = 0, + CAN_BE_BACKGROUND = 1, + MUST_BE_FIRST = 2, +}; +ENUM_CLASS_BITOPS(ScreenRenderRole); + class Screen { public: Screen() : screenManager_(nullptr) { } @@ -74,7 +82,7 @@ public: virtual void sendMessage(UIMessage message, const char *value) {} virtual void deviceLost() {} virtual void deviceRestored() {} - virtual bool canBeBackground(bool isTop) const { return false; } + virtual ScreenRenderRole renderRole(bool isTop) const { return ScreenRenderRole::NONE; } virtual bool wantBrightBackground() const { return false; } // special hack for DisplayLayoutScreen. virtual void focusChanged(ScreenFocusChange focusChange); diff --git a/UI/EmuScreen.cpp b/UI/EmuScreen.cpp index 0f79c36663..da7d4f278f 100644 --- a/UI/EmuScreen.cpp +++ b/UI/EmuScreen.cpp @@ -1279,17 +1279,25 @@ bool EmuScreen::checkPowerDown() { return false; } -bool EmuScreen::canBeBackground(bool isTop) const { - if (g_Config.bSkipBufferEffects) { - return isTop || (g_Config.bTransparentBackground && Core_ShouldRunBehind()); - } +ScreenRenderRole EmuScreen::renderRole(bool isTop) const { + auto CanBeBackground = [&]() -> bool { + if (g_Config.bSkipBufferEffects) { + return isTop || (g_Config.bTransparentBackground && Core_ShouldRunBehind()); + } - if (!g_Config.bTransparentBackground && !isTop) { - if (Core_ShouldRunBehind() || screenManager()->topScreen()->wantBrightBackground()) - return true; - return false; + if (!g_Config.bTransparentBackground && !isTop) { + if (Core_ShouldRunBehind() || screenManager()->topScreen()->wantBrightBackground()) + return true; + return false; + } + return true; + }; + + ScreenRenderRole role = ScreenRenderRole::MUST_BE_FIRST; + if (CanBeBackground()) { + role |= ScreenRenderRole::CAN_BE_BACKGROUND; } - return true; + return role; } void EmuScreen::darken() { @@ -1313,6 +1321,12 @@ ScreenRenderFlags EmuScreen::render(ScreenRenderMode mode) { return flags; // shouldn't really happen but I've seen a suspicious stack trace.. } + // Sanity check +#ifdef _DEBUG + Draw::BackendState state = draw->GetCurrentBackendState(); + _dbg_assert_(!state.valid || state.passes == 0); +#endif + GamepadUpdateOpacity(); bool skipBufferEffects = g_Config.bSkipBufferEffects; diff --git a/UI/EmuScreen.h b/UI/EmuScreen.h index 50157a6002..77df9e3816 100644 --- a/UI/EmuScreen.h +++ b/UI/EmuScreen.h @@ -46,7 +46,7 @@ public: void dialogFinished(const Screen *dialog, DialogResult result) override; void sendMessage(UIMessage message, const char *value) override; void resized() override; - bool canBeBackground(bool isTop) const override; + ScreenRenderRole renderRole(bool isTop) const override; // Note: Unlike your average boring UIScreen, here we override the Unsync* functions // to get minimal latency and full control. We forward to UIScreen when needed. From 336732afa8c69ee8e91f1279985579c7506d7d32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 12 May 2024 00:07:51 +0200 Subject: [PATCH 245/719] Remove accidental enabling of Mali driver workaround on other GPUs. May help #19133 --- Common/GPU/Vulkan/thin3d_vulkan.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/Common/GPU/Vulkan/thin3d_vulkan.cpp b/Common/GPU/Vulkan/thin3d_vulkan.cpp index 6e3af3cf2b..4f8fb6465f 100644 --- a/Common/GPU/Vulkan/thin3d_vulkan.cpp +++ b/Common/GPU/Vulkan/thin3d_vulkan.cpp @@ -1054,8 +1054,6 @@ VKContext::VKContext(VulkanContext *vulkan, bool useRenderThread) INFO_LOG(G3D, "KHR_depth_stencil_resolve not supported, disabling multisampling"); } - bugs_.Infest(Draw::Bugs::NO_DEPTH_CANNOT_DISCARD_STENCIL_MALI); - // We limit multisampling functionality to reasonably recent and known-good tiling GPUs. if (multisampleAllowed) { // Check for depth stencil resolve. Without it, depth textures won't work, and we don't want that mess From f75d7d13a075d8f3a0bcf9614f61937911e937f7 Mon Sep 17 00:00:00 2001 From: Herman Semenov Date: Sat, 11 May 2024 19:43:13 -0500 Subject: [PATCH 246/719] [Net/Web] Fixed strict reduce types to 32 bit sizes, changed to memsize --- Common/Net/HTTPServer.cpp | 2 +- Common/Net/NetBuffer.cpp | 6 +++--- Common/Net/Sinks.cpp | 8 ++++---- Core/WebServer.cpp | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Common/Net/HTTPServer.cpp b/Common/Net/HTTPServer.cpp index a4e19d805b..83d90a94bd 100644 --- a/Common/Net/HTTPServer.cpp +++ b/Common/Net/HTTPServer.cpp @@ -353,7 +353,7 @@ void Server::HandleRequestDefault(const ServerRequest &request) { void Server::Handle404(const ServerRequest &request) { INFO_LOG(IO, "No handler for '%s', falling back to 404.", request.resource()); const char *payload = "404 not found\r\n"; - request.WriteHttpResponseHeader("1.0", 404, (int)strlen(payload)); + request.WriteHttpResponseHeader("1.0", 404, strlen(payload)); request.Out()->Push(payload); } diff --git a/Common/Net/NetBuffer.cpp b/Common/Net/NetBuffer.cpp index 09a4853963..1682582440 100644 --- a/Common/Net/NetBuffer.cpp +++ b/Common/Net/NetBuffer.cpp @@ -48,7 +48,7 @@ bool Buffer::FlushSocket(uintptr_t sock, double timeout, bool *cancelled) { return false; } } - int sent = send(sock, &data_[pos], (int)(end - pos), MSG_NOSIGNAL); + int sent = send(sock, &data_[pos], end - pos, MSG_NOSIGNAL); // TODO: Do we need some retry logic here, instead of just giving up? if (sent < 0) { ERROR_LOG(IO, "FlushSocket failed to send: %d", errno); @@ -85,7 +85,7 @@ bool Buffer::ReadAllWithProgress(int fd, int knownSize, RequestProgress *progres ready = fd_util::WaitUntilReady(fd, CANCEL_INTERVAL, false); } - int retval = recv(fd, &buf[0], (int)buf.size(), MSG_NOSIGNAL); + int retval = recv(fd, &buf[0], buf.size(), MSG_NOSIGNAL); if (retval == 0) { return true; } else if (retval < 0) { @@ -116,7 +116,7 @@ int Buffer::Read(int fd, size_t sz) { char buf[1024]; int retval; size_t received = 0; - while ((retval = recv(fd, buf, (int)std::min(sz, sizeof(buf)), MSG_NOSIGNAL)) > 0) { + while ((retval = recv(fd, buf, std::min(sz, sizeof(buf)), MSG_NOSIGNAL)) > 0) { if (retval < 0) { return retval; } diff --git a/Common/Net/Sinks.cpp b/Common/Net/Sinks.cpp index 62eb407dac..0d18cbaf09 100644 --- a/Common/Net/Sinks.cpp +++ b/Common/Net/Sinks.cpp @@ -176,7 +176,7 @@ void InputSink::Fill() { // Whatever isn't valid and follows write_ is what's available. size_t avail = BUFFER_SIZE - std::max(write_, valid_); - int bytes = recv(fd_, buf_ + write_, (int)avail, MSG_NOSIGNAL); + int bytes = recv(fd_, buf_ + write_, avail, MSG_NOSIGNAL); AccountFill(bytes); } } @@ -266,7 +266,7 @@ size_t OutputSink::PushAtMost(const char *buf, size_t bytes) { if (valid_ == 0 && bytes > PRESSURE) { // Special case for pushing larger buffers: let's try to send directly. - int sentBytes = send(fd_, buf, (int)bytes, MSG_NOSIGNAL); + int sentBytes = send(fd_, buf, bytes, MSG_NOSIGNAL); // If it was 0 or EWOULDBLOCK, that's fine, we'll enqueue as we can. if (sentBytes > 0) { return sentBytes; @@ -348,7 +348,7 @@ bool OutputSink::Flush(bool allowBlock) { while (valid_ > 0) { size_t avail = std::min(BUFFER_SIZE - read_, valid_); - int bytes = send(fd_, buf_ + read_, (int)avail, MSG_NOSIGNAL); + int bytes = send(fd_, buf_ + read_, avail, MSG_NOSIGNAL); #if !PPSSPP_PLATFORM(WINDOWS) if (bytes == -1 && (errno == EAGAIN || errno == EWOULDBLOCK)) bytes = 0; @@ -380,7 +380,7 @@ void OutputSink::Drain() { // Let's just do contiguous valid. size_t avail = std::min(BUFFER_SIZE - read_, valid_); - int bytes = send(fd_, buf_ + read_, (int)avail, MSG_NOSIGNAL); + int bytes = send(fd_, buf_ + read_, avail, MSG_NOSIGNAL); #if !PPSSPP_PLATFORM(WINDOWS) if (bytes == -1 && (errno == EAGAIN || errno == EWOULDBLOCK)) bytes = 0; diff --git a/Core/WebServer.cpp b/Core/WebServer.cpp index e7a80ae486..21987575ad 100644 --- a/Core/WebServer.cpp +++ b/Core/WebServer.cpp @@ -332,7 +332,7 @@ static bool ServeDebuggerFile(const http::ServerRequest &request) { mimeType = "text/css"; } - request.WriteHttpResponseHeader("1.0", 200, (int)size, mimeType); + request.WriteHttpResponseHeader("1.0", 200, size, mimeType); request.Out()->Push((char *)data, size); delete[] data; @@ -341,7 +341,7 @@ static bool ServeDebuggerFile(const http::ServerRequest &request) { static void RedirectToDebugger(const http::ServerRequest &request) { static const std::string payload = "Redirecting to debugger UI...\r\n"; - request.WriteHttpResponseHeader("1.0", 301, (int)payload.size(), "text/plain", "Location: /debugger/index.html\r\n"); + request.WriteHttpResponseHeader("1.0", 301, payload.size(), "text/plain", "Location: /debugger/index.html\r\n"); request.Out()->Push(payload); } @@ -375,7 +375,7 @@ static void HandleFallback(const http::ServerRequest &request) { } static const std::string payload = "404 not found\r\n"; - request.WriteHttpResponseHeader("1.0", 404, (int)payload.size(), "text/plain"); + request.WriteHttpResponseHeader("1.0", 404, payload.size(), "text/plain"); request.Out()->Push(payload); } From 27d0ac6cce641e1d34f941b82bd5b9c9fbb6dfe4 Mon Sep 17 00:00:00 2001 From: Herman Semenov Date: Sat, 11 May 2024 19:50:35 -0500 Subject: [PATCH 247/719] [Util] Fixed strict reduce to 32 bit types for progressReporter.SetProgress() --- Core/Util/MemStick.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/Util/MemStick.cpp b/Core/Util/MemStick.cpp index ceca99e9e3..64da3b699b 100644 --- a/Core/Util/MemStick.cpp +++ b/Core/Util/MemStick.cpp @@ -237,7 +237,7 @@ MoveResult *MoveDirectoryContentsSafe(Path moveSrc, Path moveDest, MoveProgressR bool ok = true; for (size_t i = 0; i < fileSuffixesToMove.size(); i++) { const auto &fileSuffix = fileSuffixesToMove[i]; - progressReporter.SetProgress(ms->T("Checking..."), (int)i, (int)fileSuffixesToMove.size()); + progressReporter.SetProgress(ms->T("Checking..."), i, fileSuffixesToMove.size()); Path to = moveDest / fileSuffix.suffix; From a059750f5aa11d6f42383f1637a3e1ef156485fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 12 May 2024 18:01:25 +0200 Subject: [PATCH 248/719] Add basic checkbox UI for GPI switched, add display of GPO LEDs Try it with Parappa. --- Common/UI/View.cpp | 5 +++++ Common/UI/View.h | 6 ++---- Core/Config.cpp | 2 ++ Core/Config.h | 3 +++ Core/HLE/sceKernel.cpp | 16 ++++++++++------ Core/HLE/sceKernel.h | 3 +++ UI/DevScreens.cpp | 16 ++++++++++++++++ UI/DevScreens.h | 9 +++++++++ UI/EmuScreen.cpp | 22 ++++++++++++++++++++++ UI/GameSettingsScreen.cpp | 5 +++++ 10 files changed, 77 insertions(+), 10 deletions(-) diff --git a/Common/UI/View.cpp b/Common/UI/View.cpp index 18c573fcb2..3dcd94ef10 100644 --- a/Common/UI/View.cpp +++ b/Common/UI/View.cpp @@ -852,6 +852,11 @@ void CheckBox::GetContentDimensions(const UIContext &dc, float &w, float &h) con w = bounds_.w; } +BitCheckBox::BitCheckBox(uint32_t *bitfield, uint32_t bit, std::string_view text, std::string_view smallText, LayoutParams *layoutParams) + : CheckBox(nullptr, text, smallText, layoutParams), bitfield_(bitfield), bit_(bit) { + _dbg_assert_msg_(bit != 0, "bit is a mask, not a bit index"); +} + void BitCheckBox::Toggle() { if (bitfield_) { *bitfield_ = *bitfield_ ^ bit_; diff --git a/Common/UI/View.h b/Common/UI/View.h index 2372d1ad06..42af14edab 100644 --- a/Common/UI/View.h +++ b/Common/UI/View.h @@ -916,10 +916,8 @@ private: class BitCheckBox : public CheckBox { public: - BitCheckBox(uint32_t *bitfield, uint32_t bit, std::string_view text, std::string_view smallText = "", LayoutParams *layoutParams = nullptr) - : CheckBox(nullptr, text, smallText, layoutParams), bitfield_(bitfield), bit_(bit) { - } - + // bit is a bitmask (should only have a single bit set), not a bit index. + BitCheckBox(uint32_t *bitfield, uint32_t bit, std::string_view text, std::string_view smallText = "", LayoutParams *layoutParams = nullptr); BitCheckBox(int *bitfield, int bit, std::string_view text, std::string_view smallText = "", LayoutParams *layoutParams = nullptr) : BitCheckBox((uint32_t *)bitfield, (uint32_t)bit, text, smallText, layoutParams) {} void Toggle() override; diff --git a/Core/Config.cpp b/Core/Config.cpp index ae19a040e0..6bdbf8e06c 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -306,6 +306,8 @@ static const ConfigSetting generalSettings[] = { ConfigSetting("IgnoreCompatSettings", &g_Config.sIgnoreCompatSettings, "", CfgFlag::PER_GAME | CfgFlag::REPORT), ConfigSetting("RunBehindPauseMenu", &g_Config.bRunBehindPauseMenu, false, CfgFlag::DEFAULT), + + ConfigSetting("ShowGPOLEDs", &g_Config.bShowGPOLEDs, false, CfgFlag::PER_GAME), }; static bool DefaultSasThread() { diff --git a/Core/Config.h b/Core/Config.h index f6addf3f1c..61a30c5d5a 100644 --- a/Core/Config.h +++ b/Core/Config.h @@ -265,6 +265,9 @@ public: bool bRenderDuplicateFrames; bool bRenderMultiThreading; + // HW debug + bool bShowGPOLEDs; + // Sound bool bEnableSound; int iAudioBackend; diff --git a/Core/HLE/sceKernel.cpp b/Core/HLE/sceKernel.cpp index 28d6a60a0b..d4da98bf42 100644 --- a/Core/HLE/sceKernel.cpp +++ b/Core/HLE/sceKernel.cpp @@ -100,6 +100,8 @@ static bool kernelRunning = false; KernelObjectPool kernelObjects; KernelStats kernelStats; u32 registeredExitCbId; +u32 g_GPOBits; // Really just 8 bits on the real hardware. +u32 g_GPIBits; // Really just 8 bits on the real hardware. void __KernelInit() { @@ -161,6 +163,7 @@ void __KernelInit() __PPGeInit(); kernelRunning = true; + g_GPOBits = 0; INFO_LOG(SCEKERNEL, "Kernel initialized."); } @@ -355,18 +358,19 @@ int sceKernelRegisterDefaultExceptionHandler() return 0; } -void sceKernelSetGPO(u32 ledAddr) +void sceKernelSetGPO(u32 ledBits) { - // Sets debug LEDs. - // Not really interesting, and a few games really spam it - // DEBUG_LOG(SCEKERNEL, "sceKernelSetGPO(%02x)", ledAddr); + // Sets debug LEDs. Some games do interesting stuff with this, like a metronome in Parappa. + // Shows up as a vertical strip of LEDs at the side of the screen, if enabled. + g_GPOBits = ledBits; } u32 sceKernelGetGPI() { // Always returns 0 on production systems. - DEBUG_LOG(SCEKERNEL, "0=sceKernelGetGPI()"); - return 0; + // On developer systems, there are 8 switches that control the lower 8 bits of the return value. + DEBUG_LOG(SCEKERNEL, "%d=sceKernelGetGPI()", g_GPIBits); + return g_GPIBits; } // #define LOG_CACHE diff --git a/Core/HLE/sceKernel.h b/Core/HLE/sceKernel.h index 722f89d37d..4c03d5848b 100644 --- a/Core/HLE/sceKernel.h +++ b/Core/HLE/sceKernel.h @@ -569,6 +569,9 @@ struct KernelStats { extern KernelStats kernelStats; extern u32 registeredExitCbId; +extern u32 g_GPOBits; +extern u32 g_GPIBits; + void Register_ThreadManForUser(); void Register_ThreadManForKernel(); void Register_LoadExecForUser(); diff --git a/UI/DevScreens.cpp b/UI/DevScreens.cpp index 8da4308886..f16dbfef01 100644 --- a/UI/DevScreens.cpp +++ b/UI/DevScreens.cpp @@ -56,6 +56,7 @@ #include "Core/System.h" #include "Core/Reporting.h" #include "Core/CoreParameter.h" +#include "Core/HLE/sceKernel.h" // GPI/GPO #include "Core/MIPS/MIPSTables.h" #include "Core/MIPS/JitCommon/JitBlockCache.h" #include "Core/MIPS/JitCommon/JitCommon.h" @@ -141,6 +142,11 @@ void DevMenuScreen::CreatePopupContents(UI::ViewGroup *parent) { items->Add(new Choice(dev->T("Reset limited logging")))->OnClick.Handle(this, &DevMenuScreen::OnResetLimitedLogging); + items->Add(new Choice(dev->T("GPI/GPO switches/LEDs")))->OnClick.Add([=](UI::EventParams &e) { + screenManager()->push(new GPIGPOScreen(dev->T("GPI/GPO switches/LEDs"))); + return UI::EVENT_DONE; + }); + items->Add(new Choice(dev->T("Create frame dump")))->OnClick.Add([](UI::EventParams &e) { GPURecord::RecordNextFrame([](const Path &dumpPath) { NOTICE_LOG(SYSTEM, "Frame dump created at '%s'", dumpPath.c_str()); @@ -213,6 +219,16 @@ void DevMenuScreen::dialogFinished(const Screen *dialog, DialogResult result) { // TriggerFinish(DR_OK); } +void GPIGPOScreen::CreatePopupContents(UI::ViewGroup *parent) { + using namespace UI; + auto dev = GetI18NCategory(I18NCat::DEVELOPER); + parent->Add(new CheckBox(&g_Config.bShowGPOLEDs, dev->T("Show GPO LEDs"))); + for (int i = 0; i < 8; i++) { + std::string name = ApplySafeSubstitutions(dev->T("GPI switch %1"), i); + parent->Add(new BitCheckBox(&g_GPIBits, 1 << i, name)); + } +} + void LogScreen::UpdateLog() { using namespace UI; RingbufferLogListener *ring = LogManager::GetInstance()->GetRingbufferListener(); diff --git a/UI/DevScreens.h b/UI/DevScreens.h index 29fbf5690b..9ae176a840 100644 --- a/UI/DevScreens.h +++ b/UI/DevScreens.h @@ -145,6 +145,15 @@ private: unsigned int addr_; }; +class GPIGPOScreen : public PopupScreen { +public: + GPIGPOScreen(std::string_view title) : PopupScreen(title, "OK") {} + const char *tag() const override { return "GPIGPO"; } + +protected: + void CreatePopupContents(UI::ViewGroup *parent) override; +}; + class JitCompareScreen : public UIDialogScreenWithBackground { public: void CreateViews() override; diff --git a/UI/EmuScreen.cpp b/UI/EmuScreen.cpp index da7d4f278f..eafa4c9fde 100644 --- a/UI/EmuScreen.cpp +++ b/UI/EmuScreen.cpp @@ -1521,6 +1521,8 @@ bool EmuScreen::hasVisibleUI() { return true; if (g_Config.bEnableCardboardVR || g_Config.bEnableNetworkChat) return true; + if (g_Config.bShowGPOLEDs) + return true; // Debug UI. if ((DebugOverlay)g_Config.iDebugOverlay != DebugOverlay::OFF || g_Config.bShowDeveloperMenu) return true; @@ -1571,6 +1573,26 @@ void EmuScreen::renderUI() { } #endif + if (g_Config.bShowGPOLEDs) { + // Draw a vertical strip of LEDs at the right side of the screen. + const float ledSize = 24.0f; + const float spacing = 4.0f; + const float height = 8 * ledSize + 7 * spacing; + const float x = ctx->GetBounds().w - spacing - ledSize; + const float y = (ctx->GetBounds().h - height) * 0.5f; + ctx->FillRect(UI::Drawable(0xFF000000), Bounds(x - spacing, y - spacing, ledSize + spacing * 2, height + spacing * 2)); + for (int i = 0; i < 8; i++) { + int bit = (g_GPOBits >> i) & 1; + uint32_t color = 0xFF30FF30; + if (!bit) { + color = darkenColor(darkenColor(color)); + } + Bounds ledBounds(x, y + (spacing + ledSize) * i, ledSize, ledSize); + ctx->FillRect(UI::Drawable(color), ledBounds); + } + ctx->Flush(); + } + if (coreState == CORE_RUNTIME_ERROR || coreState == CORE_STEPPING) { const MIPSExceptionInfo &info = Core_GetExceptionInfo(); if (info.type != MIPSExceptionType::NONE) { diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp index 40283066fe..5dc9404dd7 100644 --- a/UI/GameSettingsScreen.cpp +++ b/UI/GameSettingsScreen.cpp @@ -1843,6 +1843,11 @@ void DeveloperToolsScreen::CreateViews() { list->Add(new CheckBox(&g_Config.bShowOnScreenMessages, dev->T("Show on-screen messages"))); + list->Add(new Choice(dev->T("GPI/GPO switches/LEDs")))->OnClick.Add([=](UI::EventParams &e) { + screenManager()->push(new GPIGPOScreen(dev->T("GPI/GPO switches/LEDs"))); + return UI::EVENT_DONE; + }); + #if PPSSPP_PLATFORM(ANDROID) static const char *framerateModes[] = { "Default", "Request 60Hz", "Force 60Hz" }; PopupMultiChoice *framerateMode = list->Add(new PopupMultiChoice(&g_Config.iDisplayFramerateMode, gr->T("Framerate mode"), framerateModes, 0, ARRAY_SIZE(framerateModes), I18NCat::GRAPHICS, screenManager())); From 1dd363ae3efa922161577621e9249f484b054b00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 12 May 2024 18:10:53 +0200 Subject: [PATCH 249/719] Add the new UI strings for GPI/GPO switches/leds --- Tools/langtool/Cargo.lock | 4 ++-- assets/lang/ar_AE.ini | 3 +++ assets/lang/az_AZ.ini | 3 +++ assets/lang/bg_BG.ini | 3 +++ assets/lang/ca_ES.ini | 3 +++ assets/lang/cz_CZ.ini | 3 +++ assets/lang/da_DK.ini | 3 +++ assets/lang/de_DE.ini | 3 +++ assets/lang/dr_ID.ini | 3 +++ assets/lang/en_US.ini | 3 +++ assets/lang/es_ES.ini | 3 +++ assets/lang/es_LA.ini | 3 +++ assets/lang/fa_IR.ini | 3 +++ assets/lang/fi_FI.ini | 3 +++ assets/lang/fr_FR.ini | 3 +++ assets/lang/gl_ES.ini | 3 +++ assets/lang/gr_EL.ini | 3 +++ assets/lang/he_IL.ini | 3 +++ assets/lang/he_IL_invert.ini | 3 +++ assets/lang/hr_HR.ini | 3 +++ assets/lang/hu_HU.ini | 3 +++ assets/lang/id_ID.ini | 3 +++ assets/lang/it_IT.ini | 3 +++ assets/lang/ja_JP.ini | 3 +++ assets/lang/jv_ID.ini | 3 +++ assets/lang/ko_KR.ini | 3 +++ assets/lang/lo_LA.ini | 3 +++ assets/lang/lt-LT.ini | 3 +++ assets/lang/ms_MY.ini | 3 +++ assets/lang/nl_NL.ini | 3 +++ assets/lang/no_NO.ini | 3 +++ assets/lang/pl_PL.ini | 3 +++ assets/lang/pt_BR.ini | 3 +++ assets/lang/pt_PT.ini | 3 +++ assets/lang/ro_RO.ini | 3 +++ assets/lang/ru_RU.ini | 3 +++ assets/lang/sv_SE.ini | 3 +++ assets/lang/tg_PH.ini | 3 +++ assets/lang/th_TH.ini | 3 +++ assets/lang/tr_TR.ini | 3 +++ assets/lang/uk_UA.ini | 3 +++ assets/lang/vi_VN.ini | 3 +++ assets/lang/zh_CN.ini | 3 +++ assets/lang/zh_TW.ini | 3 +++ 44 files changed, 131 insertions(+), 2 deletions(-) diff --git a/Tools/langtool/Cargo.lock b/Tools/langtool/Cargo.lock index 576bc7023a..b1e6e644d5 100644 --- a/Tools/langtool/Cargo.lock +++ b/Tools/langtool/Cargo.lock @@ -142,9 +142,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "syn" -version = "2.0.61" +version = "2.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9" +checksum = "bf5be731623ca1a1fb7d8be6f261a3be6d3e2337b8a1f97be944d020c8fcb704" dependencies = [ "proc-macro2", "quote", diff --git a/assets/lang/ar_AE.ini b/assets/lang/ar_AE.ini index fcd15beb3c..012e420844 100644 --- a/assets/lang/ar_AE.ini +++ b/assets/lang/ar_AE.ini @@ -315,6 +315,8 @@ Fragment = Fragment Frame timing = Frame timing Framedump tests = Framedump tests Frame Profiler = Frame profiler +GPI switch %1 = GPI switch %1 +GPI/GPO switches/LEDs = GPI/GPO switches/LEDs GPU Allocator Viewer = GPU Allocator Viewer GPU Driver Test = GPU driver test GPU log profiler = GPU log profiler @@ -341,6 +343,7 @@ Run CPU Tests = ‎شغل فحوص المعالج Save new textures = ‎حفظ الرسم الجديد Shader Viewer = ‎مستعرض الرسوميات Show Developer Menu = ‎أظهر قائمة المطور +Show GPO LEDs = Show GPO LEDs Show on-screen messages = إظهار الرسائل على الشاشة Stats = ‎الحالات System Information = ‎معلومات النظام diff --git a/assets/lang/az_AZ.ini b/assets/lang/az_AZ.ini index 768293af4e..5aa8da182a 100644 --- a/assets/lang/az_AZ.ini +++ b/assets/lang/az_AZ.ini @@ -307,6 +307,8 @@ Fragment = Fragment Frame timing = Frame timing Framedump tests = Framedump tests Frame Profiler = Frame profiler +GPI switch %1 = GPI switch %1 +GPI/GPO switches/LEDs = GPI/GPO switches/LEDs GPU Allocator Viewer = GPU Allocator Viewer GPU Driver Test = GPU driver test GPU log profiler = GPU log profiler @@ -333,6 +335,7 @@ Run CPU Tests = Run CPU tests Save new textures = Save new textures Shader Viewer = Shader viewer Show Developer Menu = Show developer menu +Show GPO LEDs = Show GPO LEDs Show on-screen messages = Show on-screen messages Stats = Stats System Information = System information diff --git a/assets/lang/bg_BG.ini b/assets/lang/bg_BG.ini index a5f7398adc..f686e30541 100644 --- a/assets/lang/bg_BG.ini +++ b/assets/lang/bg_BG.ini @@ -307,6 +307,8 @@ Fragment = Fragment Frame timing = Frame timing Framedump tests = Framedump tests Frame Profiler = Frame profiler +GPI switch %1 = GPI switch %1 +GPI/GPO switches/LEDs = GPI/GPO switches/LEDs GPU Allocator Viewer = GPU Allocator Viewer GPU Driver Test = GPU driver test GPU log profiler = GPU log profiler @@ -333,6 +335,7 @@ Run CPU Tests = Run CPU tests Save new textures = Save new textures Shader Viewer = Shader viewer Show Developer Menu = Покажи developer меню +Show GPO LEDs = Show GPO LEDs Show on-screen messages = Show on-screen messages Stats = Stats System Information = Системна информация diff --git a/assets/lang/ca_ES.ini b/assets/lang/ca_ES.ini index 7b5ca41f19..598945f370 100644 --- a/assets/lang/ca_ES.ini +++ b/assets/lang/ca_ES.ini @@ -307,6 +307,8 @@ Fragment = Fragment Frame timing = Frame timing Framedump tests = Framedump tests Frame Profiler = Amidar el rendiment +GPI switch %1 = GPI switch %1 +GPI/GPO switches/LEDs = GPI/GPO switches/LEDs GPU Allocator Viewer = GPU Allocator Viewer GPU Driver Test = GPU driver test GPU log profiler = GPU log profiler @@ -333,6 +335,7 @@ Run CPU Tests = Proves de CPU Save new textures = Desa les noves textures Shader Viewer = Visualitzador de shader Show Developer Menu = Mostra el menú de desenvolupament +Show GPO LEDs = Show GPO LEDs Show on-screen messages = Show on-screen messages Stats = Estadístiques System Information = Informació del sistema diff --git a/assets/lang/cz_CZ.ini b/assets/lang/cz_CZ.ini index a51f16e2a1..fcc519dc91 100644 --- a/assets/lang/cz_CZ.ini +++ b/assets/lang/cz_CZ.ini @@ -307,6 +307,8 @@ Fragment = Fragment Frame timing = Frame timing Framedump tests = Framedump tests Frame Profiler = Profilovač snímku +GPI switch %1 = GPI switch %1 +GPI/GPO switches/LEDs = GPI/GPO switches/LEDs GPU Allocator Viewer = GPU Allocator Viewer GPU Driver Test = GPU driver test GPU log profiler = GPU log profiler @@ -333,6 +335,7 @@ Run CPU Tests = Spustit zkoušky CPU Save new textures = Save new textures Shader Viewer = Prohlížeč shaderů Show Developer Menu = Zobrazit nabídku pro vývojáře +Show GPO LEDs = Show GPO LEDs Show on-screen messages = Show on-screen messages Stats = Statistiky System Information = Informace o systému diff --git a/assets/lang/da_DK.ini b/assets/lang/da_DK.ini index 99a4e535fd..4d47d22e61 100644 --- a/assets/lang/da_DK.ini +++ b/assets/lang/da_DK.ini @@ -307,6 +307,8 @@ Fragment = Fragment Frame timing = Frame timing Framedump tests = Framedump tests Frame Profiler = Frame profiler +GPI switch %1 = GPI switch %1 +GPI/GPO switches/LEDs = GPI/GPO switches/LEDs GPU Allocator Viewer = GPU Allocator Viewer GPU Driver Test = GPU driver test GPU log profiler = GPU log profiler @@ -333,6 +335,7 @@ Run CPU Tests = Kør CPU test Save new textures = Gem nye textures Shader Viewer = Shader viewer Show Developer Menu = Vis udviklermenu +Show GPO LEDs = Show GPO LEDs Show on-screen messages = Show on-screen messages Stats = Stats System Information = System information diff --git a/assets/lang/de_DE.ini b/assets/lang/de_DE.ini index 2fd9571140..8a3592be55 100644 --- a/assets/lang/de_DE.ini +++ b/assets/lang/de_DE.ini @@ -307,6 +307,8 @@ Fragment = Fragment Frame timing = Frame timing Framedump tests = Framedump tests Frame Profiler = Frame Profiler +GPI switch %1 = GPI switch %1 +GPI/GPO switches/LEDs = GPI/GPO switches/LEDs GPU Allocator Viewer = GPU Allocator Viewer GPU Driver Test = GPU Treibertest GPU log profiler = GPU log profiler @@ -333,6 +335,7 @@ Run CPU Tests = CPU Test starten Save new textures = Speichere neue Texturen Shader Viewer = Shader-Anzeige Show Developer Menu = Zeige Entwicklermenü +Show GPO LEDs = Show GPO LEDs Show on-screen messages = Show on-screen messages Stats = Statistiken System Information = Systeminformationen diff --git a/assets/lang/dr_ID.ini b/assets/lang/dr_ID.ini index aafc5567f6..4fc7cc3723 100644 --- a/assets/lang/dr_ID.ini +++ b/assets/lang/dr_ID.ini @@ -307,6 +307,8 @@ Fragment = Fragment Frame timing = Frame timing Framedump tests = Framedump tests Frame Profiler = Frame profiler +GPI switch %1 = GPI switch %1 +GPI/GPO switches/LEDs = GPI/GPO switches/LEDs GPU Allocator Viewer = GPU Allocator Viewer GPU Driver Test = GPU driver test GPU log profiler = GPU log profiler @@ -333,6 +335,7 @@ Run CPU Tests = Pajalanni tes CPU Save new textures = Save new textures Shader Viewer = Shader viewer Show Developer Menu = Show developer menu +Show GPO LEDs = Show GPO LEDs Show on-screen messages = Show on-screen messages Stats = Stats System Information = Pempakitan to sistem dipake diff --git a/assets/lang/en_US.ini b/assets/lang/en_US.ini index 78d349e7c4..25e65c4577 100644 --- a/assets/lang/en_US.ini +++ b/assets/lang/en_US.ini @@ -333,6 +333,8 @@ FPU = FPU Framedump tests = Framedump tests Frame Profiler = Frame profiler Frame timing = Frame timing +GPI switch %1 = GPI switch %1 +GPI/GPO switches/LEDs = GPI/GPO switches/LEDs GPU Allocator Viewer = GPU Allocator Viewer GPU Driver Test = GPU driver test GPU Profile = GPU profile @@ -359,6 +361,7 @@ Run CPU Tests = Run CPU tests Save new textures = Save new textures Shader Viewer = Shader viewer Show Developer Menu = Show developer menu +Show GPO LEDs = Show GPO LEDs Show on-screen messages = Show on-screen messages Stats = Stats System Information = System information diff --git a/assets/lang/es_ES.ini b/assets/lang/es_ES.ini index 8630154c69..8af6764b0a 100644 --- a/assets/lang/es_ES.ini +++ b/assets/lang/es_ES.ini @@ -307,6 +307,8 @@ Fragment = Fragment Frame Profiler = Medir rendimiento Frame timing = Frame timing Framedump tests = Tests de volcado de cuadros +GPI switch %1 = GPI switch %1 +GPI/GPO switches/LEDs = GPI/GPO switches/LEDs GPU Allocator Viewer = GPU Allocator Viewer GPU Driver Test = Test de controlador GPU GPU log profiler = log de perfiles GPU @@ -333,6 +335,7 @@ Run CPU Tests = Pruebas de CPU Save new textures = Guardar texturas nuevas Shader Viewer = Visor de shader Show Developer Menu = Mostrar menú de desarrollo +Show GPO LEDs = Show GPO LEDs Show on-screen messages = Mostrar mensajes en pantalla Stats = Estadísticas System Information = Información del sistema diff --git a/assets/lang/es_LA.ini b/assets/lang/es_LA.ini index 36f30b1ef6..aa8c59d08c 100644 --- a/assets/lang/es_LA.ini +++ b/assets/lang/es_LA.ini @@ -307,6 +307,8 @@ Fragment = Fragment Frame timing = Frame timing Framedump tests = Pruebas de volcado de frames Frame Profiler = Perfilado de frame +GPI switch %1 = GPI switch %1 +GPI/GPO switches/LEDs = GPI/GPO switches/LEDs GPU Allocator Viewer = GPU Allocator Viewer GPU Driver Test = Probar controlador GPU GPU log profiler = GPU log profiler @@ -333,6 +335,7 @@ Run CPU Tests = Ejecutando pruebas de CPU Save new textures = Guardar nuevas texturas Shader Viewer = Visor de shader Show Developer Menu = Mostrar menú de desarrollador +Show GPO LEDs = Show GPO LEDs Show on-screen messages = Mostrar mensajes en pantalla Stats = Estadísticas System Information = Información del sistema diff --git a/assets/lang/fa_IR.ini b/assets/lang/fa_IR.ini index 4577096ad8..3ed47bfe90 100644 --- a/assets/lang/fa_IR.ini +++ b/assets/lang/fa_IR.ini @@ -307,6 +307,8 @@ Fragment = Fragment Frame timing = Frame timing Framedump tests = Framedump tests Frame Profiler = Frame profiler +GPI switch %1 = GPI switch %1 +GPI/GPO switches/LEDs = GPI/GPO switches/LEDs GPU Allocator Viewer = GPU Allocator Viewer GPU Driver Test = تست کردن جی پی یو سخت افزار GPU log profiler = GPU log profiler @@ -333,6 +335,7 @@ Run CPU Tests = ‎CPU اجرای تست Save new textures = ذخیره بافت جدید Shader Viewer = Shader viewer Show Developer Menu = نمایش منو توسعه دهنده +Show GPO LEDs = Show GPO LEDs Show on-screen messages = نمایش پیام اسکرین Stats = Stats System Information = ‎اطلاعات سیستم diff --git a/assets/lang/fi_FI.ini b/assets/lang/fi_FI.ini index 47d5900c49..1186f18f99 100644 --- a/assets/lang/fi_FI.ini +++ b/assets/lang/fi_FI.ini @@ -307,6 +307,8 @@ Fragment = Fragment Frame timing = Frame timing Framedump tests = Framedump tests Frame Profiler = Frame profiler +GPI switch %1 = GPI switch %1 +GPI/GPO switches/LEDs = GPI/GPO switches/LEDs GPU Allocator Viewer = GPU Allocator Viewer GPU Driver Test = GPU driver test GPU log profiler = GPU log profiler @@ -333,6 +335,7 @@ Run CPU Tests = Suorita suoritin testi Save new textures = Save new textures Shader Viewer = Shader viewer Show Developer Menu = Show developer menu +Show GPO LEDs = Show GPO LEDs Show on-screen messages = Show on-screen messages Stats = Stats System Information = System information diff --git a/assets/lang/fr_FR.ini b/assets/lang/fr_FR.ini index 36602913f1..a3155c3f96 100644 --- a/assets/lang/fr_FR.ini +++ b/assets/lang/fr_FR.ini @@ -307,6 +307,8 @@ Fragment = Fragment Frame timing = Frame timing Framedump tests = Framedump tests Frame Profiler = Profileur d'image +GPI switch %1 = GPI switch %1 +GPI/GPO switches/LEDs = GPI/GPO switches/LEDs GPU Allocator Viewer = GPU Allocator Viewer GPU Driver Test = Test du pilote du GPU GPU log profiler = GPU log profiler @@ -333,6 +335,7 @@ Run CPU Tests = Exécuter des tests CPU Save new textures = Sauvegarder les nouvelles textures Shader Viewer = Visionneur de shader Show Developer Menu = Montrer le menu développeur "MenuDev" +Show GPO LEDs = Show GPO LEDs Show on-screen messages = Afficher les messages à l'écran Stats = Statistiques System Information = Informations système diff --git a/assets/lang/gl_ES.ini b/assets/lang/gl_ES.ini index 0d6f23ce53..591a569939 100644 --- a/assets/lang/gl_ES.ini +++ b/assets/lang/gl_ES.ini @@ -307,6 +307,8 @@ Fragment = Fragment Frame timing = Frame timing Framedump tests = Framedump tests Frame Profiler = Frame profiler +GPI switch %1 = GPI switch %1 +GPI/GPO switches/LEDs = GPI/GPO switches/LEDs GPU Allocator Viewer = GPU Allocator Viewer GPU Driver Test = GPU driver test GPU log profiler = GPU log profiler @@ -333,6 +335,7 @@ Run CPU Tests = Probas de CPU Save new textures = Save new textures Shader Viewer = Shader viewer Show Developer Menu = Mostrar menú de desenrolo +Show GPO LEDs = Show GPO LEDs Show on-screen messages = Show on-screen messages Stats = Stats System Information = Información do sistema diff --git a/assets/lang/gr_EL.ini b/assets/lang/gr_EL.ini index c1d418d99e..50ad8f6954 100644 --- a/assets/lang/gr_EL.ini +++ b/assets/lang/gr_EL.ini @@ -307,6 +307,8 @@ Fragment = Fragment Frame timing = Frame timing Framedump tests = Framedump tests Frame Profiler = Profiler πλαισίου +GPI switch %1 = GPI switch %1 +GPI/GPO switches/LEDs = GPI/GPO switches/LEDs GPU Allocator Viewer = GPU Allocator Viewer GPU Driver Test = GPU driver test GPU log profiler = GPU log profiler @@ -333,6 +335,7 @@ Run CPU Tests = Εκκίνηση τέστ CPU Save new textures = Αποθήκευση νέων υφών Shader Viewer = Προβολέας Shader Show Developer Menu = Εμφάνιση μενού προγραμματιστών +Show GPO LEDs = Show GPO LEDs Show on-screen messages = Show on-screen messages Stats = Στατιστικά System Information = Πληροφορίες Συστήματος diff --git a/assets/lang/he_IL.ini b/assets/lang/he_IL.ini index f9c1cbf526..49c397a6b8 100644 --- a/assets/lang/he_IL.ini +++ b/assets/lang/he_IL.ini @@ -307,6 +307,8 @@ Fragment = Fragment Frame timing = Frame timing Framedump tests = Framedump tests Frame Profiler = Frame profiler +GPI switch %1 = GPI switch %1 +GPI/GPO switches/LEDs = GPI/GPO switches/LEDs GPU Allocator Viewer = GPU Allocator Viewer GPU Driver Test = GPU driver test GPU log profiler = GPU log profiler @@ -333,6 +335,7 @@ Run CPU Tests = הרץ בדיקות מעבד Save new textures = Save new textures Shader Viewer = Shader viewer Show Developer Menu = Show developer menu +Show GPO LEDs = Show GPO LEDs Show on-screen messages = Show on-screen messages Stats = Stats System Information = מידע על המערכת diff --git a/assets/lang/he_IL_invert.ini b/assets/lang/he_IL_invert.ini index c386ebd822..2efb9e43e9 100644 --- a/assets/lang/he_IL_invert.ini +++ b/assets/lang/he_IL_invert.ini @@ -307,6 +307,8 @@ Fragment = Fragment Frame timing = Frame timing Framedump tests = Framedump tests Frame Profiler = Frame profiler +GPI switch %1 = GPI switch %1 +GPI/GPO switches/LEDs = GPI/GPO switches/LEDs GPU Allocator Viewer = GPU Allocator Viewer GPU Driver Test = GPU driver test GPU log profiler = GPU log profiler @@ -333,6 +335,7 @@ Run CPU Tests = דבעמ תוקידב ץרה Save new textures = Save new textures Shader Viewer = Shader viewer Show Developer Menu = Show developer menu +Show GPO LEDs = Show GPO LEDs Show on-screen messages = Show on-screen messages Stats = Stats System Information = תכרעמה לע עדימ diff --git a/assets/lang/hr_HR.ini b/assets/lang/hr_HR.ini index d728c8a986..682de67403 100644 --- a/assets/lang/hr_HR.ini +++ b/assets/lang/hr_HR.ini @@ -307,6 +307,8 @@ Fragment = Fragment Frame timing = Frame timing Framedump tests = Framedump tests Frame Profiler = Frame profiler +GPI switch %1 = GPI switch %1 +GPI/GPO switches/LEDs = GPI/GPO switches/LEDs GPU Allocator Viewer = GPU Allocator Viewer GPU Driver Test = Testiranje GPU drivera GPU log profiler = GPU log profiler @@ -333,6 +335,7 @@ Run CPU Tests = Pokreni CPU testove Save new textures = Spremi nove teksture Shader Viewer = Pregled sjenčanja Show Developer Menu = Prikaži developer izbornik +Show GPO LEDs = Show GPO LEDs Show on-screen messages = Show on-screen messages Stats = Stats System Information = System informacija diff --git a/assets/lang/hu_HU.ini b/assets/lang/hu_HU.ini index 8a6dcc5309..b6b5fc6187 100644 --- a/assets/lang/hu_HU.ini +++ b/assets/lang/hu_HU.ini @@ -307,6 +307,8 @@ Fragment = Fragment Frame timing = Frame timing Framedump tests = Framedump tests Frame Profiler = Képkocka profilozó +GPI switch %1 = GPI switch %1 +GPI/GPO switches/LEDs = GPI/GPO switches/LEDs GPU Allocator Viewer = GPU Allocator Viewer GPU Driver Test = GPU driver teszt GPU log profiler = GPU log profiler @@ -333,6 +335,7 @@ Run CPU Tests = CPU tesztek futtatása Save new textures = Új textúrák mentése Shader Viewer = Shader megjelenítő Show Developer Menu = Fejlesztői menü megjelenítése +Show GPO LEDs = Show GPO LEDs Show on-screen messages = Show on-screen messages Stats = Statisztikák System Information = Rendszer információ diff --git a/assets/lang/id_ID.ini b/assets/lang/id_ID.ini index bf9dcbfef7..188fee0f8e 100644 --- a/assets/lang/id_ID.ini +++ b/assets/lang/id_ID.ini @@ -307,6 +307,8 @@ Fragment = Fragment Frame timing = Frame timing Framedump tests = Tes pembuangan laju bingkai Frame Profiler = Profil laju bingkai +GPI switch %1 = GPI switch %1 +GPI/GPO switches/LEDs = GPI/GPO switches/LEDs GPU Allocator Viewer = GPU Allocator Viewer GPU Driver Test = Tes driver GPU GPU log profiler = GPU log profiler @@ -333,6 +335,7 @@ Run CPU Tests = Jalankan pengujian CPU Save new textures = Simpan tekstur baru Shader Viewer = Penampil shader Show Developer Menu = Tampilkan menu pengembang +Show GPO LEDs = Show GPO LEDs Show on-screen messages = Tampilkan obrolan di layar Stats = Statistik System Information = Informasi sistem diff --git a/assets/lang/it_IT.ini b/assets/lang/it_IT.ini index 6f00cae72b..fb4f40644c 100644 --- a/assets/lang/it_IT.ini +++ b/assets/lang/it_IT.ini @@ -307,6 +307,8 @@ Fragment = Frammento Frame timing = Frame timing Framedump tests = Test del framedump Frame Profiler = Profilatore di Frame +GPI switch %1 = GPI switch %1 +GPI/GPO switches/LEDs = GPI/GPO switches/LEDs GPU Allocator Viewer = Visualizzatore dell'Allocatore GPU GPU Driver Test = Test dei driver GPU GPU log profiler = Profilatore dei registri GPU @@ -333,6 +335,7 @@ Run CPU Tests = Fai Test CPU Save new textures = Salva nuove texture Shader Viewer = Visualizzatore shader Show Developer Menu = Mostra Menu Sviluppatore +Show GPO LEDs = Show GPO LEDs Show on-screen messages = Mostra i messaggi on-screen Stats = Statistiche System Information = Informazioni Sistema diff --git a/assets/lang/ja_JP.ini b/assets/lang/ja_JP.ini index 642ff0a482..71b75c4c76 100644 --- a/assets/lang/ja_JP.ini +++ b/assets/lang/ja_JP.ini @@ -307,6 +307,8 @@ Fragment = フラグメント Frame timing = フレームタイミング Framedump tests = フレームダンプのテスト Frame Profiler = フレームプロファイラ +GPI switch %1 = GPI switch %1 +GPI/GPO switches/LEDs = GPI/GPO switches/LEDs GPU Allocator Viewer = GPU Allocator Viewer GPU Driver Test = GPUドライバをテスト GPU Profile = GPUプロファイル @@ -333,6 +335,7 @@ Run CPU Tests = CPUテストを実行する Save new textures = 新しいテクスチャを保存する Shader Viewer = シェーダビューワ Show Developer Menu = 開発者向けメニューを表示する +Show GPO LEDs = Show GPO LEDs Show on-screen messages = オンスクリーンメッセージを表示する Stats = 状況 System Information = システム情報 diff --git a/assets/lang/jv_ID.ini b/assets/lang/jv_ID.ini index 06580dec76..64d0de71d4 100644 --- a/assets/lang/jv_ID.ini +++ b/assets/lang/jv_ID.ini @@ -307,6 +307,8 @@ Fragment = Fragment Frame timing = Frame timing Framedump tests = Framedump tests Frame Profiler = Pigura Profiler +GPI switch %1 = GPI switch %1 +GPI/GPO switches/LEDs = GPI/GPO switches/LEDs GPU Allocator Viewer = GPU Allocator Viewer GPU Driver Test = GPU driver test GPU log profiler = GPU log profiler @@ -333,6 +335,7 @@ Run CPU Tests = Mbukak Tes CPU Save new textures = Save new textures Shader Viewer = Tampilan shader Show Developer Menu = Tampilno menu pengembang +Show GPO LEDs = Show GPO LEDs Show on-screen messages = Show on-screen messages Stats = Stats System Information = Informasi Sistem diff --git a/assets/lang/ko_KR.ini b/assets/lang/ko_KR.ini index 8eae6d1fec..088dac5b26 100644 --- a/assets/lang/ko_KR.ini +++ b/assets/lang/ko_KR.ini @@ -309,6 +309,8 @@ FPU = FPU Framedump tests = 프레임 덤프 테스트 Frame Profiler = 프레임 프로파일러 Frame timing = 프레임 타이밍 +GPI switch %1 = GPI switch %1 +GPI/GPO switches/LEDs = GPI/GPO switches/LEDs GPU Allocator Viewer = GPU 할당기 뷰어 GPU Driver Test = GPU 드라이버 테스트 GPU Profile = GPU 프로파일 @@ -335,6 +337,7 @@ Run CPU Tests = CPU 테스트 실행 Save new textures = 새로운 텍스처 저장 Shader Viewer = 셰이더 뷰어 Show Developer Menu = 개발자 메뉴 표시 +Show GPO LEDs = Show GPO LEDs Show on-screen messages = 화면 메시지 표시 Stats = 상태 System Information = 시스템 정보 diff --git a/assets/lang/lo_LA.ini b/assets/lang/lo_LA.ini index beec4b0f8c..2b5290e2e2 100644 --- a/assets/lang/lo_LA.ini +++ b/assets/lang/lo_LA.ini @@ -307,6 +307,8 @@ Fragment = Fragment Frame timing = Frame timing Framedump tests = Framedump tests Frame Profiler = ລາຍລະອຽດຂອງເຟຣມ +GPI switch %1 = GPI switch %1 +GPI/GPO switches/LEDs = GPI/GPO switches/LEDs GPU Allocator Viewer = GPU Allocator Viewer GPU Driver Test = GPU driver test GPU log profiler = GPU log profiler @@ -333,6 +335,7 @@ Run CPU Tests = ເອີ້ນໃຊ້ການທົດສອບ CPU Save new textures = ບັນທຶກພື້ນຜິວໃໝ່ Shader Viewer = ມຸມມອງການປັບໄລ່ເສດສີ Show Developer Menu = ສະແດງເມນູສຳລັບນັກພັດທະນາ +Show GPO LEDs = Show GPO LEDs Show on-screen messages = Show on-screen messages Stats = ສະຖິຕິ System Information = ຂໍ້ມູນຂອງລະບົບ diff --git a/assets/lang/lt-LT.ini b/assets/lang/lt-LT.ini index 148a2f12c5..07225fd07b 100644 --- a/assets/lang/lt-LT.ini +++ b/assets/lang/lt-LT.ini @@ -307,6 +307,8 @@ Fragment = Fragment Frame timing = Frame timing Framedump tests = Framedump tests Frame Profiler = Frame profiler +GPI switch %1 = GPI switch %1 +GPI/GPO switches/LEDs = GPI/GPO switches/LEDs GPU Allocator Viewer = GPU Allocator Viewer GPU Driver Test = GPU driver test GPU log profiler = GPU log profiler @@ -333,6 +335,7 @@ Run CPU Tests = Atidaryti pagrindinio procesoriaus testus Save new textures = Save new textures Shader Viewer = Shader viewer Show Developer Menu = Rodyti kūrėjų meniu +Show GPO LEDs = Show GPO LEDs Show on-screen messages = Show on-screen messages Stats = Stats System Information = Sistemos informacija diff --git a/assets/lang/ms_MY.ini b/assets/lang/ms_MY.ini index 68f6340080..9486488adb 100644 --- a/assets/lang/ms_MY.ini +++ b/assets/lang/ms_MY.ini @@ -307,6 +307,8 @@ Fragment = Fragment Frame timing = Frame timing Framedump tests = Framedump tests Frame Profiler = Frame profiler +GPI switch %1 = GPI switch %1 +GPI/GPO switches/LEDs = GPI/GPO switches/LEDs GPU Allocator Viewer = GPU Allocator Viewer GPU Driver Test = Ujian driver GPU GPU log profiler = GPU log profiler @@ -333,6 +335,7 @@ Run CPU Tests = Jalankan percubaan CPU Save new textures = Save new textures Shader Viewer = Shader viewer Show Developer Menu = Papar menu pembangun +Show GPO LEDs = Show GPO LEDs Show on-screen messages = Show on-screen messages Stats = Stats System Information = Maklumat sistem diff --git a/assets/lang/nl_NL.ini b/assets/lang/nl_NL.ini index 63fe3927f8..9b7aa0a2db 100644 --- a/assets/lang/nl_NL.ini +++ b/assets/lang/nl_NL.ini @@ -307,6 +307,8 @@ Fragment = Fragment Frame timing = Frame timing Framedump tests = Framedump tests Frame Profiler = Frameanalyse +GPI switch %1 = GPI switch %1 +GPI/GPO switches/LEDs = GPI/GPO switches/LEDs GPU Allocator Viewer = GPU Allocator Viewer GPU Driver Test = GPU driver test GPU log profiler = GPU log profiler @@ -333,6 +335,7 @@ Run CPU Tests = CPU-controles uitvoeren Save new textures = Nieuwe textures opslaan Shader Viewer = Shader weergeven Show Developer Menu = Ontwikkelaarsmenu weergeven +Show GPO LEDs = Show GPO LEDs Show on-screen messages = Show on-screen messages Stats = Statistieken System Information = Systeeminformatie diff --git a/assets/lang/no_NO.ini b/assets/lang/no_NO.ini index 4bc7c46797..56d664a88a 100644 --- a/assets/lang/no_NO.ini +++ b/assets/lang/no_NO.ini @@ -307,6 +307,8 @@ Fragment = Fragment Frame timing = Frame timing Framedump tests = Framedump tests Frame Profiler = Frame profiler +GPI switch %1 = GPI switch %1 +GPI/GPO switches/LEDs = GPI/GPO switches/LEDs GPU Allocator Viewer = GPU Allocator Viewer GPU Driver Test = GPU driver test GPU log profiler = GPU log profiler @@ -333,6 +335,7 @@ Run CPU Tests = Kjør CPU-test Save new textures = Save new textures Shader Viewer = Shader viewer Show Developer Menu = Show developer menu +Show GPO LEDs = Show GPO LEDs Show on-screen messages = Show on-screen messages Stats = Stats System Information = Systeminformasjon diff --git a/assets/lang/pl_PL.ini b/assets/lang/pl_PL.ini index 39e77dc219..bd798bd96e 100644 --- a/assets/lang/pl_PL.ini +++ b/assets/lang/pl_PL.ini @@ -307,6 +307,8 @@ Fragment = Fragment Frame timing = Frame timing Framedump tests = Test zrzutu klatki Frame Profiler = Profiler klatki +GPI switch %1 = GPI switch %1 +GPI/GPO switches/LEDs = GPI/GPO switches/LEDs GPU Allocator Viewer = GPU Allocator Viewer GPU Driver Test = Test sterownika GPU GPU log profiler = Profilowanie logów GPU @@ -333,6 +335,7 @@ Run CPU Tests = Uruchom testy CPU Save new textures = Zapisz nową teksturę Shader Viewer = Podgląd Shaderów Show Developer Menu = Pokaż przycisk menu dewelopera +Show GPO LEDs = Show GPO LEDs Show on-screen messages = Pokaż komunikaty na ekranie Stats = Statystyki System Information = Informacje o systemie diff --git a/assets/lang/pt_BR.ini b/assets/lang/pt_BR.ini index 3cbab259c5..5b33d86559 100644 --- a/assets/lang/pt_BR.ini +++ b/assets/lang/pt_BR.ini @@ -333,6 +333,8 @@ FPU = FPU Framedump tests = Testes dos dumps dos frames Frame Profiler = Analista dos frames Frame timing = Tempo do frame +GPI switch %1 = GPI switch %1 +GPI/GPO switches/LEDs = GPI/GPO switches/LEDs GPU Allocator Viewer = Visualizador do Distribuidor da GPU GPU Driver Test = Teste do driver da GPU GPU Profile = Perfil da GPU @@ -359,6 +361,7 @@ Run CPU Tests = Executar testes da CPU Save new textures = Salvar novas texturas Shader Viewer = Visualizador dos shaders Show Developer Menu = Mostrar menu do desenvolvedor +Show GPO LEDs = Show GPO LEDs Show on-screen messages = Mostrar mensagens na tela Stats = Estatísticas System Information = Informação do sistema diff --git a/assets/lang/pt_PT.ini b/assets/lang/pt_PT.ini index 18b5816e6e..dd31981376 100644 --- a/assets/lang/pt_PT.ini +++ b/assets/lang/pt_PT.ini @@ -331,6 +331,8 @@ Fragment = Fragmento Frame timing = Tempo do frame Framedump tests = Testes dos dumps dos frames Frame Profiler = Analista dos frames +GPI switch %1 = GPI switch %1 +GPI/GPO switches/LEDs = GPI/GPO switches/LEDs GPU Allocator Viewer = Visualizador do Distribuidor da GPU GPU Driver Test = Teste do driver da GPU GPU Profile = Perfil da GPU @@ -357,6 +359,7 @@ Run CPU Tests = Executar testes na CPU Save new textures = Guardar novas texturas Shader Viewer = Visualizador dos Shaders Show Developer Menu = Mostrar Menu de Desenvolvedor +Show GPO LEDs = Show GPO LEDs Show on-screen messages = Mostrar mensagens no ecrã Stats = Estatísticas System Information = Informação do sistema diff --git a/assets/lang/ro_RO.ini b/assets/lang/ro_RO.ini index 213ca0b982..a5e100524c 100644 --- a/assets/lang/ro_RO.ini +++ b/assets/lang/ro_RO.ini @@ -308,6 +308,8 @@ Fragment = Fragment Frame timing = Frame timing Framedump tests = Framedump tests Frame Profiler = Frame profiler +GPI switch %1 = GPI switch %1 +GPI/GPO switches/LEDs = GPI/GPO switches/LEDs GPU Allocator Viewer = GPU Allocator Viewer GPU Driver Test = GPU driver test GPU log profiler = GPU log profiler @@ -334,6 +336,7 @@ Run CPU Tests = Run CPU tests Save new textures = Save new textures Shader Viewer = Shader viewer Show Developer Menu = Show developer menu +Show GPO LEDs = Show GPO LEDs Show on-screen messages = Show on-screen messages Stats = Stats System Information = System information diff --git a/assets/lang/ru_RU.ini b/assets/lang/ru_RU.ini index a37b361305..f2cc3907ee 100644 --- a/assets/lang/ru_RU.ini +++ b/assets/lang/ru_RU.ini @@ -307,6 +307,8 @@ Fragment = Фрагмент Frame timing = Время кадра Framedump tests = Тест дампов кадров Frame Profiler = Профайлер кадров +GPI switch %1 = GPI switch %1 +GPI/GPO switches/LEDs = GPI/GPO switches/LEDs GPU Allocator Viewer = Просмотрщик аллокатора ГП GPU Driver Test = Проверка драйвера ГП GPU log profiler = Профилировщик логов ГП @@ -333,6 +335,7 @@ Run CPU Tests = Запустить тесты ЦП Save new textures = Сохранять новые текстуры Shader Viewer = Просмотрщик шейдеров Show Developer Menu = Показывать меню разработчика +Show GPO LEDs = Show GPO LEDs Show on-screen messages = Показывать сообщения на экране Stats = Статистика System Information = Информация о системе diff --git a/assets/lang/sv_SE.ini b/assets/lang/sv_SE.ini index a2d2179138..cdb626dd30 100644 --- a/assets/lang/sv_SE.ini +++ b/assets/lang/sv_SE.ini @@ -307,6 +307,8 @@ Fragment = Fragment Frame timing = Frame timing Framedump tests = Framedump-tester Frame Profiler = Frame-profiler +GPI switch %1 = GPI switch %1 +GPI/GPO switches/LEDs = GPI/GPO switches/LEDs GPU Allocator Viewer = GPU Allocator Viewer GPU Driver Test = GPU drivrutins-test GPU log profiler = GPU logg-profiler @@ -333,6 +335,7 @@ Run CPU Tests = Kör CPU-tester Save new textures = Spara nya texturer Shader Viewer = Shader-visare Show Developer Menu = Visa Developer-menyn +Show GPO LEDs = Show GPO LEDs Show on-screen messages = Show on-screen messages Stats = Stats System Information = Systeminformation diff --git a/assets/lang/tg_PH.ini b/assets/lang/tg_PH.ini index a1d56a52f7..d3f004c64d 100644 --- a/assets/lang/tg_PH.ini +++ b/assets/lang/tg_PH.ini @@ -308,6 +308,8 @@ Fragment = Fragment Frame timing = Timing ng frame Framedump tests = Framedump tests Frame Profiler = Frame profiler +GPI switch %1 = GPI switch %1 +GPI/GPO switches/LEDs = GPI/GPO switches/LEDs GPU Allocator Viewer = GPU Allocator Viewer GPU Driver Test = GPU driver test GPU log profiler = GPU log profiler @@ -334,6 +336,7 @@ Run CPU Tests = Magsagawa ng CPU Tests Save new textures = I-save ang mga bagong texture Shader Viewer = Shader viewer Show Developer Menu = Ipakita ang Developer Menu +Show GPO LEDs = Show GPO LEDs Show on-screen messages = Ipakita ang mensahe sa screen Stats = Istatistik System Information = Impormasyon tungkol sa sistema diff --git a/assets/lang/th_TH.ini b/assets/lang/th_TH.ini index 138fe30d6a..ce1655a304 100644 --- a/assets/lang/th_TH.ini +++ b/assets/lang/th_TH.ini @@ -308,6 +308,8 @@ Framebuffer List = รายการของเฟรมบัฟเฟอร Framedump tests = ทดสอบไฟล์เฟรมดั๊มพ์ Frame Profiler = รายละเอียดของเฟรม Frame timing = ช่วงเวลาของเฟรม +GPI switch %1 = GPI switch %1 +GPI/GPO switches/LEDs = GPI/GPO switches/LEDs GPU Allocator Viewer = ตัวแสดงการจัดสรร GPU GPU Driver Test = ทดสอบไดรเวอร์ GPU GPU log profiler = ตัวแสดงค่าโปรไฟล์ GPU @@ -334,6 +336,7 @@ Run CPU Tests = เรียกใช้การทดสอบซีพีย Save new textures = บันทึกพื้นผิวลงในแหล่งที่เก็บข้อมูล Shader Viewer = มุมมองการปรับเฉดแสงสี Show Developer Menu = แสดงเมนูสำหรับนักพัฒนา +Show GPO LEDs = Show GPO LEDs Show on-screen messages = แสดงข้อความการแจ้งเตือนต่างๆ Stats = สถิติ System Information = ข้อมูลโดยรวมของระบบ diff --git a/assets/lang/tr_TR.ini b/assets/lang/tr_TR.ini index 0bd1d6fd50..35036b4f08 100644 --- a/assets/lang/tr_TR.ini +++ b/assets/lang/tr_TR.ini @@ -309,6 +309,8 @@ Fragment = Fragment Frame timing = Frame timing Framedump tests = Framedump testleri Frame Profiler = Frame profiler +GPI switch %1 = GPI switch %1 +GPI/GPO switches/LEDs = GPI/GPO switches/LEDs GPU Allocator Viewer = GPU Allocator Viewer GPU Driver Test = GPU sürücü testi GPU log profiler = GPU log profiler @@ -335,6 +337,7 @@ Run CPU Tests = İşlemci testlerini başlat Save new textures = Yeni dokuları kaydet Shader Viewer = Shader Görüntüleyici Show Developer Menu = Geliştirici Menüsünü Göster +Show GPO LEDs = Show GPO LEDs Show on-screen messages = Ekran üzerinde mesajları göster Stats = İstatistikler System Information = Sistem bilgisi diff --git a/assets/lang/uk_UA.ini b/assets/lang/uk_UA.ini index a8b6f6a826..c86c1f052d 100644 --- a/assets/lang/uk_UA.ini +++ b/assets/lang/uk_UA.ini @@ -307,6 +307,8 @@ Fragment = Fragment Frame timing = Frame timing Framedump tests = Framedump tests Frame Profiler = Профілі кадрів +GPI switch %1 = GPI switch %1 +GPI/GPO switches/LEDs = GPI/GPO switches/LEDs GPU Allocator Viewer = GPU Allocator Viewer GPU Driver Test = Перевірка драйверу GPU GPU log profiler = GPU log profiler @@ -333,6 +335,7 @@ Run CPU Tests = Запустити тести CPU Save new textures = Зберегти нові текстури Shader Viewer = Переглядач шейдеру Show Developer Menu = Показати меню розробника +Show GPO LEDs = Show GPO LEDs Show on-screen messages = Show on-screen messages Stats = Статистика System Information = Інформація про систему diff --git a/assets/lang/vi_VN.ini b/assets/lang/vi_VN.ini index 200b0fefe5..c18822c6bd 100644 --- a/assets/lang/vi_VN.ini +++ b/assets/lang/vi_VN.ini @@ -307,6 +307,8 @@ Fragment = Fragment Frame timing = Frame timing Framedump tests = Framedump tests Frame Profiler = Khung hồ sơ +GPI switch %1 = GPI switch %1 +GPI/GPO switches/LEDs = GPI/GPO switches/LEDs GPU Allocator Viewer = GPU Allocator Viewer GPU Driver Test = GPU driver test GPU log profiler = GPU log profiler @@ -333,6 +335,7 @@ Run CPU Tests = Chạy thử CPU Save new textures = Lưu file textures mới Shader Viewer = Xem trước đỗ bóng Show Developer Menu = Hiện menu NPH +Show GPO LEDs = Show GPO LEDs Show on-screen messages = Show on-screen messages Stats = Thống kê System Information = Thông tin hệ thống diff --git a/assets/lang/zh_CN.ini b/assets/lang/zh_CN.ini index 87472b1165..80fb1f682a 100644 --- a/assets/lang/zh_CN.ini +++ b/assets/lang/zh_CN.ini @@ -307,6 +307,8 @@ Fragment = 片段着色器 Frame timing = 帧时间统计信息 Framedump tests = 帧转储测试 Frame Profiler = 帧分析器 +GPI switch %1 = GPI switch %1 +GPI/GPO switches/LEDs = GPI/GPO switches/LEDs GPU Allocator Viewer = GPU分配器查看 GPU Driver Test = GPU驱动程序测试 GPU log profiler = GPU日志分析器 @@ -333,6 +335,7 @@ Run CPU Tests = 运行CPU测试 Save new textures = 保存新纹理 Shader Viewer = 着色器查看器 Show Developer Menu = 显示开发者菜单 +Show GPO LEDs = Show GPO LEDs Show on-screen messages = 屏幕上方显示消息 Stats = 统计数据 System Information = 系统信息 diff --git a/assets/lang/zh_TW.ini b/assets/lang/zh_TW.ini index 075e7ee573..5dd87d76ca 100644 --- a/assets/lang/zh_TW.ini +++ b/assets/lang/zh_TW.ini @@ -307,6 +307,8 @@ Fragment = 片段 Frame timing = 影格計時 Framedump tests = 影格傾印測試 Frame Profiler = 影格分析工具 +GPI switch %1 = GPI switch %1 +GPI/GPO switches/LEDs = GPI/GPO switches/LEDs GPU Allocator Viewer = GPU 配置器檢視器 GPU Driver Test = GPU 驅動程式測試 GPU Profile = GPU 設定檔 @@ -333,6 +335,7 @@ Run CPU Tests = 執行 CPU 測試 Save new textures = 儲存新紋理 Shader Viewer = 著色器檢視器 Show Developer Menu = 顯示開發人員選單 +Show GPO LEDs = Show GPO LEDs Show on-screen messages = 顯示螢幕訊息 Stats = 統計資料 System Information = 系統資訊 From 4d0f3183f29774377f32ca155a1d950ea63304eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Mon, 13 May 2024 01:37:53 +0200 Subject: [PATCH 250/719] Windows: When using "Create shortcut", use the game's icon instead of PPSSPP's. Since on Windows, shortcuts can't embed icons, we first save the game's icon .png as an .ico in the SAVESTATE folder (there might be a better place, but it also doesn't seem worth it to create a new folder for this). Part of #10885 (Android functionality still missing, for example). --- Windows/W32Util/ShellUtil.cpp | 69 +++++++++++++++++++++++++++++++++-- Windows/W32Util/ShellUtil.h | 26 +++++++------ Windows/main.cpp | 22 ++++++++++- 3 files changed, 101 insertions(+), 16 deletions(-) diff --git a/Windows/W32Util/ShellUtil.cpp b/Windows/W32Util/ShellUtil.cpp index 32c5d3b272..0a3621ad30 100644 --- a/Windows/W32Util/ShellUtil.cpp +++ b/Windows/W32Util/ShellUtil.cpp @@ -6,6 +6,8 @@ #include #include "Common/Data/Encoding/Utf8.h" +#include "Common/File/FileUtil.h" +#include "Common/Data/Format/PNGLoad.h" #include "ShellUtil.h" #include @@ -188,7 +190,7 @@ namespace W32Util { // http://msdn.microsoft.com/en-us/library/aa969393.aspx -HRESULT CreateLink(LPCWSTR lpszPathObj, LPCWSTR lpszArguments, LPCWSTR lpszPathLink, LPCWSTR lpszDesc) { +static HRESULT CreateLink(LPCWSTR lpszPathObj, LPCWSTR lpszArguments, LPCWSTR lpszPathLink, LPCWSTR lpszDesc, LPCWSTR lpszIcon, int iconIndex) { HRESULT hres; IShellLink *psl = nullptr; hres = CoInitializeEx(NULL, COINIT_MULTITHREADED); @@ -205,7 +207,9 @@ HRESULT CreateLink(LPCWSTR lpszPathObj, LPCWSTR lpszArguments, LPCWSTR lpszPathL psl->SetPath(lpszPathObj); psl->SetArguments(lpszArguments); psl->SetDescription(lpszDesc); - // psl->SetIconLocation(..) + if (lpszIcon) { + psl->SetIconLocation(lpszIcon, iconIndex); + } // Query IShellLink for the IPersistFile interface, used for saving the // shortcut in persistent storage. @@ -223,7 +227,7 @@ HRESULT CreateLink(LPCWSTR lpszPathObj, LPCWSTR lpszArguments, LPCWSTR lpszPathL return hres; } -bool CreateDesktopShortcut(std::string_view argumentPath, std::string_view gameTitleStr) { +bool CreateDesktopShortcut(std::string_view argumentPath, std::string_view gameTitleStr, const Path &icoFile) { // Get the desktop folder wchar_t *pathbuf = new wchar_t[4096]; SHGetFolderPath(0, CSIDL_DESKTOPDIRECTORY, NULL, SHGFP_TYPE_CURRENT, pathbuf); @@ -264,7 +268,12 @@ bool CreateDesktopShortcut(std::string_view argumentPath, std::string_view gameT sanitizedArgument = "\"" + sanitizedArgument + "\""; - CreateLink(moduleFilename.c_str(), ConvertUTF8ToWString(sanitizedArgument).c_str(), pathbuf, ConvertUTF8ToWString(gameTitle).c_str()); + std::wstring icon; + if (!icoFile.empty()) { + icon = icoFile.ToWString(); + } + + CreateLink(moduleFilename.c_str(), ConvertUTF8ToWString(sanitizedArgument).c_str(), pathbuf, ConvertUTF8ToWString(gameTitle).c_str(), icon.empty() ? nullptr : icon.c_str(), 0); // TODO: Also extract the game icon and convert to .ico, put it somewhere under Memstick, and set it. @@ -272,4 +281,56 @@ bool CreateDesktopShortcut(std::string_view argumentPath, std::string_view gameT return false; } +// Function to create an icon file from PNG image data (these icons require Windows Vista). +// The Old New Thing comes to the rescue again! ChatGPT failed miserably. +// https://devblogs.microsoft.com/oldnewthing/20101018-00/?p=12513 +// https://devblogs.microsoft.com/oldnewthing/20101022-00/?p=12473 +bool CreateICOFromPNGData(const uint8_t *imageData, size_t imageDataSize, const Path &icoPath) { + if (imageDataSize <= sizeof(PNGHeaderPeek)) { + return false; + } + // Parse the PNG + PNGHeaderPeek pngHeader; + memcpy(&pngHeader, imageData, sizeof(PNGHeaderPeek)); + if (pngHeader.Width() > 256 || pngHeader.Height() > 256) { + // Reject the png as an icon. + return false; + } + + struct IconHeader { + uint16_t reservedZero; + uint16_t type; // should be 1 + uint16_t imageCount; + }; + IconHeader hdr{ 0, 1, 1 }; + struct IconDirectoryEntry { + BYTE bWidth; + BYTE bHeight; + BYTE bColorCount; + BYTE bReserved; + WORD wPlanes; + WORD wBitCount; + DWORD dwBytesInRes; + DWORD dwImageOffset; + }; + IconDirectoryEntry entry{}; + entry.bWidth = pngHeader.Width(); + entry.bHeight = pngHeader.Height(); + entry.bColorCount = 0; + entry.dwBytesInRes = (DWORD)imageDataSize; + entry.wPlanes = 32; + entry.wBitCount = 32; + entry.dwImageOffset = sizeof(hdr) + sizeof(entry); + + FILE *file = File::OpenCFile(icoPath, "wb"); + if (!file) { + return false; + } + fwrite(&hdr, sizeof(hdr), 1, file); + fwrite(&entry, sizeof(entry), 1, file); + fwrite(imageData, 1, imageDataSize, file); + fclose(file); + return true; +} + } // namespace diff --git a/Windows/W32Util/ShellUtil.h b/Windows/W32Util/ShellUtil.h index fb0247e7f3..8201ae691b 100644 --- a/Windows/W32Util/ShellUtil.h +++ b/Windows/W32Util/ShellUtil.h @@ -5,18 +5,22 @@ #include #include +class Path; + namespace W32Util { - // Can't make initialPath a string_view, need the null so might as well require it. - std::string BrowseForFolder(HWND parent, std::string_view title, std::string_view initialPath); - std::string BrowseForFolder(HWND parent, const wchar_t *title, std::string_view initialPath); - bool BrowseForFileName (bool _bLoad, HWND _hParent, const wchar_t*_pTitle, - const wchar_t *_pInitialFolder,const wchar_t *_pFilter,const wchar_t*_pExtension, - std::string& _strFileName); - std::vector BrowseForFileNameMultiSelect(bool _bLoad, HWND _hParent, const wchar_t*_pTitle, - const wchar_t*_pInitialFolder,const wchar_t*_pFilter,const wchar_t*_pExtension); +// Can't make initialPath a string_view, need the null so might as well require it. +std::string BrowseForFolder(HWND parent, std::string_view title, std::string_view initialPath); +std::string BrowseForFolder(HWND parent, const wchar_t *title, std::string_view initialPath); +bool BrowseForFileName(bool _bLoad, HWND _hParent, const wchar_t*_pTitle, + const wchar_t *_pInitialFolder, const wchar_t *_pFilter, const wchar_t*_pExtension, + std::string& _strFileName); +std::vector BrowseForFileNameMultiSelect(bool _bLoad, HWND _hParent, const wchar_t*_pTitle, + const wchar_t*_pInitialFolder, const wchar_t*_pFilter, const wchar_t*_pExtension); - std::string UserDocumentsPath(); +std::string UserDocumentsPath(); - bool CreateDesktopShortcut(std::string_view argumentPath, std::string_view gameTitle); -} // namespace +bool CreateDesktopShortcut(std::string_view argumentPath, std::string_view gameTitle, const Path &icoFile); +bool CreateICOFromPNGData(const uint8_t *imageData, size_t imageDataSize, const Path &icoPath); + +} // namespace diff --git a/Windows/main.cpp b/Windows/main.cpp index 48ca4c1d73..73ac6ee784 100644 --- a/Windows/main.cpp +++ b/Windows/main.cpp @@ -635,7 +635,27 @@ bool System_MakeRequest(SystemRequestType type, int requestId, const std::string return true; } case SystemRequestType::CREATE_GAME_SHORTCUT: - return W32Util::CreateDesktopShortcut(param1, param2); + { + // Get the game info to get our hands on the icon png + Path gamePath(param1); + std::shared_ptr info = g_gameInfoCache->GetInfo(nullptr, gamePath, GameInfoFlags::ICON); + Path icoPath; + if (info->icon.dataLoaded) { + // Write the icon png out as a .ICO file so the shortcut can point to it + + // Savestate seems like a good enough place to put ico files. + Path iconFolder = GetSysDirectory(PSPDirectories::DIRECTORY_SAVESTATE); + + icoPath = iconFolder / (info->id + ".ico"); + if (!File::Exists(icoPath)) { + if (!W32Util::CreateICOFromPNGData((const uint8_t *)info->icon.data.data(), info->icon.data.size(), icoPath)) { + ERROR_LOG(SYSTEM, "ICO creation failed"); + icoPath.clear(); + } + } + } + return W32Util::CreateDesktopShortcut(param1, param2, icoPath); + } case SystemRequestType::RUN_CALLBACK_IN_WNDPROC: { auto func = reinterpret_cast(param3); From bb7972c4372426ef1005ab981cc8fa043e8034a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Mon, 13 May 2024 01:48:15 +0200 Subject: [PATCH 251/719] Correct the wPlanes field in the ico format --- Windows/W32Util/ShellUtil.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Windows/W32Util/ShellUtil.cpp b/Windows/W32Util/ShellUtil.cpp index 0a3621ad30..c0f3af4a49 100644 --- a/Windows/W32Util/ShellUtil.cpp +++ b/Windows/W32Util/ShellUtil.cpp @@ -318,7 +318,7 @@ bool CreateICOFromPNGData(const uint8_t *imageData, size_t imageDataSize, const entry.bHeight = pngHeader.Height(); entry.bColorCount = 0; entry.dwBytesInRes = (DWORD)imageDataSize; - entry.wPlanes = 32; + entry.wPlanes = 1; entry.wBitCount = 32; entry.dwImageOffset = sizeof(hdr) + sizeof(entry); From bc378fd0d613dbfc5c9c585ff5fe0fef3480a048 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Mon, 13 May 2024 01:58:22 +0200 Subject: [PATCH 252/719] Android: Compile using the newest SDK, update targetVersion to 34 --- android/build.gradle | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 157ca6ca14..01bd6f8b2f 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -11,6 +11,7 @@ androidGitVersion { } dependencies { + // 1.2.0 is the newest version we can use that won't complain about minSdk version. def appcompat_version = "1.2.0" implementation "androidx.appcompat:appcompat:$appcompat_version" @@ -21,7 +22,7 @@ dependencies { } android { - flavorDimensions "variant" + flavorDimensions += "variant" namespace 'org.ppsspp.ppsspp' signingConfigs { debug { @@ -45,10 +46,20 @@ android { } } - compileSdk 33 + compileSdk 34 ndkVersion "21.4.7075529" defaultConfig { + /* + configurations.all { + resolutionStrategy { + // Newer versions are not compatible with our minsdk. Should find a way to exclude it entirely + // since we have no use for this transitive dependency. + force 'androidx.emoji2:emoji2-views-helper:1.0.0' + } + } + */ + applicationId 'org.ppsspp.ppsspp' if (androidGitVersion.name() != "unknown" && androidGitVersion.code() >= 14000000) { // Start using automatic Android version numbers from version 1.4. @@ -63,7 +74,7 @@ android { new File("versioncode.txt").write(androidGitVersion.code().toString()) minSdk 9 - targetSdk 33 + targetSdk 34 if (project.hasProperty("ANDROID_VERSION_CODE") && project.hasProperty("ANDROID_VERSION_NAME")) { versionCode ANDROID_VERSION_CODE versionName ANDROID_VERSION_NAME From ec5eff6aa243db533c6f76c175e29ecd3c661ac3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Mon, 13 May 2024 15:34:02 +0200 Subject: [PATCH 253/719] Android: implement loading icons for shortcuts - but only works if PPSSPP is running in the background. --- android/jni/app-android.cpp | 59 ++++++++++++++++++- .../org/ppsspp/ppsspp/ShortcutActivity.java | 44 ++++++++++---- 2 files changed, 90 insertions(+), 13 deletions(-) diff --git a/android/jni/app-android.cpp b/android/jni/app-android.cpp index 74a30bfc94..f49e51529b 100644 --- a/android/jni/app-android.cpp +++ b/android/jni/app-android.cpp @@ -547,6 +547,8 @@ bool System_GetPropertyBool(SystemProperty prop) { return deviceType != DEVICE_TYPE_VR; case SYSPROP_HAS_ACCELEROMETER: return deviceType == DEVICE_TYPE_MOBILE; + case SYSPROP_CAN_CREATE_SHORTCUT: + return false; // We can't create shortcuts directly from game code, but we can from the Android UI. #ifndef HTTPS_NOT_AVAILABLE case SYSPROP_SUPPORTS_HTTPS: return !g_Config.bDisableHTTPS; @@ -1662,7 +1664,7 @@ static void VulkanEmuThread(ANativeWindow *wnd) { // NOTE: This is defunct and not working, due to how the Android storage functions currently require // a PpssppActivity specifically and we don't have one here. -extern "C" jstring Java_org_ppsspp_ppsspp_ShortcutActivity_queryGameName(JNIEnv *env, jclass, jstring jpath) { +extern "C" jstring Java_org_ppsspp_ppsspp_ShortcutActivity_queryGameName(JNIEnv * env, jclass, jstring jpath) { bool teardownThreadManager = false; if (!g_threadManager.IsInitialized()) { INFO_LOG(SYSTEM, "No thread manager - initializing one"); @@ -1710,3 +1712,58 @@ extern "C" jstring Java_org_ppsspp_ppsspp_ShortcutActivity_queryGameName(JNIEnv return env->NewStringUTF(result.c_str()); } + + +extern "C" +JNIEXPORT jbyteArray JNICALL +Java_org_ppsspp_ppsspp_ShortcutActivity_queryGameIcon(JNIEnv * env, jclass clazz, jstring jpath) { + bool teardownThreadManager = false; + if (!g_threadManager.IsInitialized()) { + INFO_LOG(SYSTEM, "No thread manager - initializing one"); + // Need a thread manager. + teardownThreadManager = true; + g_threadManager.Init(1, 1); + } + // TODO: implement requestIcon() + + Path path = Path(GetJavaString(env, jpath)); + + INFO_LOG(SYSTEM, "queryGameIcon(%s)", path.c_str()); + + jbyteArray result = nullptr; + + GameInfoCache *cache = new GameInfoCache(); + std::shared_ptr info = cache->GetInfo(nullptr, path, GameInfoFlags::ICON); + // Wait until it's done: this is synchronous, unfortunately. + if (info) { + INFO_LOG(SYSTEM, "GetInfo successful, waiting"); + int attempts = 1000; + while (!info->Ready(GameInfoFlags::ICON)) { + sleep_ms(1); + attempts--; + if (!attempts) { + break; + } + } + INFO_LOG(SYSTEM, "Done waiting"); + if (info->Ready(GameInfoFlags::ICON)) { + if (!info->icon.data.empty()) { + INFO_LOG(SYSTEM, "requestIcon: Got icon"); + result = env->NewByteArray(info->icon.data.size()); + env->SetByteArrayRegion(result, 0, info->icon.data.size(), (const jbyte *)info->icon.data.data()); + } + } else { + INFO_LOG(SYSTEM, "requestIcon: Filetype unknown"); + } + } else { + INFO_LOG(SYSTEM, "No info from cache"); + } + + delete cache; + + if (teardownThreadManager) { + g_threadManager.Teardown(); + } + + return result; +} diff --git a/android/src/org/ppsspp/ppsspp/ShortcutActivity.java b/android/src/org/ppsspp/ppsspp/ShortcutActivity.java index d21c3bddca..f7717f823a 100644 --- a/android/src/org/ppsspp/ppsspp/ShortcutActivity.java +++ b/android/src/org/ppsspp/ppsspp/ShortcutActivity.java @@ -4,6 +4,8 @@ import android.app.Activity; import android.app.AlertDialog; import android.content.Intent; import android.content.Intent.ShortcutIconResource; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; import android.net.Uri; import android.os.Build; import android.os.Bundle; @@ -75,6 +77,7 @@ public class ShortcutActivity extends Activity { } public static native String queryGameName(String path); + public static native byte[] queryGameIcon(String path); // Create shortcut as response for ACTION_CREATE_SHORTCUT intent. private void respondToShortcutRequest(Uri uri) { @@ -99,13 +102,13 @@ public class ShortcutActivity extends Activity { if (path.startsWith("content://")) { String [] segments = path.split("/"); try { - pathStr = java.net.URLDecoder.decode(segments[segments.length - 1], StandardCharsets.UTF_8.name()); + pathStr = java.net.URLDecoder.decode(segments[segments.length - 1], "UTF-8"); } catch (Exception e) { Log.i(TAG, "Exception getting name: " + e); } } else if (path.startsWith("file:///")) { try { - pathStr = java.net.URLDecoder.decode(path.substring(7), StandardCharsets.UTF_8.name()); + pathStr = java.net.URLDecoder.decode(path.substring(7), "UTF-8"); } catch (Exception e) { Log.i(TAG, "Exception getting name: " + e); } @@ -116,16 +119,19 @@ public class ShortcutActivity extends Activity { String[] pathSegments = pathStr.split("/"); name = pathSegments[pathSegments.length - 1]; - /* - // No longer working for various reasons. - PpssppActivity.CheckABIAndLoadLibrary(); - String name = queryGameName(path); - if (name.equals("")) { + String gameName = queryGameName(path); + byte [] iconData = null; + if (gameName.equals("")) { Log.i(TAG, "Failed to retrieve game name - ignoring."); - showBadGameMessage(); - return; - }*/ + // This probably happened because PPSSPP isn't running so the GameInfoCache isn't working. + // Let's just continue with our fallback name until we can fix that. + // showBadGameMessage(); + // return; + } else { + name = gameName; + iconData = queryGameIcon(path); + } Log.i(TAG, "Game name: " + name + " : Creating shortcut to " + uri.toString()); @@ -134,9 +140,23 @@ public class ShortcutActivity extends Activity { Intent responseIntent = new Intent(); responseIntent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, shortcutIntent); responseIntent.putExtra(Intent.EXTRA_SHORTCUT_NAME, name); - ShortcutIconResource iconResource = ShortcutIconResource.fromContext(this, R.drawable.ic_launcher); - responseIntent.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE, iconResource); + boolean setIcon = false; + if (iconData != null) { + // Try to create a PNG from the iconData. + Bitmap bmp = BitmapFactory.decodeByteArray(iconData, 0, iconData.length); + if (bmp != null) { + // Scale it to a square. + Bitmap scaledBitmap = Bitmap.createScaledBitmap(bmp, 144, 144, true); + responseIntent.putExtra(Intent.EXTRA_SHORTCUT_ICON, scaledBitmap); + } + setIcon = true; + } + if (!setIcon) { + // Fall back to the PPSSPP icon. + ShortcutIconResource iconResource = ShortcutIconResource.fromContext(this, R.drawable.ic_launcher); + responseIntent.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE, iconResource); + } setResult(RESULT_OK, responseIntent); // Must call finish for result to be returned immediately From ecdc7940f4e628b6f254a8f73d82e2c205bac350 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Tue, 14 May 2024 00:02:59 +0200 Subject: [PATCH 254/719] Android: Fix issue where shortcuts wouldn't override the currently running game. --- UI/GameInfoCache.cpp | 2 +- UI/GameInfoCache.h | 4 ++++ android/jni/app-android.cpp | 16 ++++++++++++---- .../src/org/ppsspp/ppsspp/NativeActivity.java | 9 +++++++++ .../src/org/ppsspp/ppsspp/PpssppActivity.java | 4 +++- 5 files changed, 29 insertions(+), 6 deletions(-) diff --git a/UI/GameInfoCache.cpp b/UI/GameInfoCache.cpp index 98eedf05cd..9c7a45b2a2 100644 --- a/UI/GameInfoCache.cpp +++ b/UI/GameInfoCache.cpp @@ -456,7 +456,7 @@ public: // Mark everything requested as done, so std::unique_lock lock(info_->lock); info_->MarkReadyNoLock(flags_); - ERROR_LOG(LOADER, "Failed getting game info."); + ERROR_LOG(LOADER, "Failed getting game info for %s", info_->GetFilePath().ToVisualString().c_str()); return; } diff --git a/UI/GameInfoCache.h b/UI/GameInfoCache.h index 589882a3dd..b7f0ed5510 100644 --- a/UI/GameInfoCache.h +++ b/UI/GameInfoCache.h @@ -109,6 +109,10 @@ public: std::string GetTitle(); void SetTitle(const std::string &newTitle); + const Path &GetFilePath() const { + return filePath_; + } + bool Ready(GameInfoFlags flags) { std::unique_lock guard(lock); // Avoid the operator, we want to check all the bits. diff --git a/android/jni/app-android.cpp b/android/jni/app-android.cpp index f49e51529b..c4c4d36e10 100644 --- a/android/jni/app-android.cpp +++ b/android/jni/app-android.cpp @@ -791,6 +791,7 @@ extern "C" void Java_org_ppsspp_ppsspp_NativeApp_init std::vector temp; args.push_back(app_name.c_str()); if (!shortcut_param.empty()) { + EARLY_LOG("NativeInit shortcut param %s", shortcut_param.c_str()); parse_args(temp, shortcut_param); for (const auto &arg : temp) { args.push_back(arg.c_str()); @@ -799,7 +800,7 @@ extern "C" void Java_org_ppsspp_ppsspp_NativeApp_init NativeInit((int)args.size(), &args[0], user_data_path.c_str(), externalStorageDir.c_str(), cacheDir.c_str()); - // In debug mode, don't allow creating software Vulkan devices (reject by VulkaMaybeAvailable). + // In debug mode, don't allow creating software Vulkan devices (reject by VulkanMaybeAvailable). // Needed for #16931. #ifdef NDEBUG if (!VulkanMayBeAvailable()) { @@ -1321,9 +1322,9 @@ extern "C" void JNICALL Java_org_ppsspp_ppsspp_NativeApp_accelerometer(JNIEnv *, NativeAccelerometer(x, y, z); } -extern "C" void JNICALL Java_org_ppsspp_ppsspp_NativeApp_sendMessageFromJava(JNIEnv *env, jclass, jstring message, jstring param) { - std::string msg = GetJavaString(env, message); - std::string prm = GetJavaString(env, param); +extern "C" void JNICALL Java_org_ppsspp_ppsspp_NativeApp_sendMessageFromJava(JNIEnv *env, jclass, jstring jmessage, jstring jparam) { + std::string msg = GetJavaString(env, jmessage); + std::string prm = GetJavaString(env, jparam); // A bit ugly, see InputDeviceState.java. static InputDeviceID nextInputDeviceID = DEVICE_ID_ANY; @@ -1366,6 +1367,13 @@ extern "C" void JNICALL Java_org_ppsspp_ppsspp_NativeApp_sendMessageFromJava(JNI System_PostUIMessage(UIMessage::POWER_SAVING, prm); } else if (msg == "exception") { g_OSD.Show(OSDType::MESSAGE_ERROR, std::string("Java Exception"), prm, 10.0f); + } else if (msg == "shortcutParam") { + if (prm.empty()) { + WARN_LOG(SYSTEM, "shortcutParam empty"); + return; + } + INFO_LOG(SYSTEM, "shortcutParam received: %s", prm.c_str()); + System_PostUIMessage(UIMessage::REQUEST_GAME_BOOT, StripQuotes(prm)); } else { ERROR_LOG(SYSTEM, "Got unexpected message from Java, ignoring: %s / %s", msg.c_str(), prm.c_str()); } diff --git a/android/src/org/ppsspp/ppsspp/NativeActivity.java b/android/src/org/ppsspp/ppsspp/NativeActivity.java index ecedbf2c3e..8061f7426d 100644 --- a/android/src/org/ppsspp/ppsspp/NativeActivity.java +++ b/android/src/org/ppsspp/ppsspp/NativeActivity.java @@ -443,6 +443,7 @@ public abstract class NativeActivity extends Activity { String languageRegion = Locale.getDefault().getLanguage() + "_" + Locale.getDefault().getCountry(); String shortcut = overrideShortcutParam == null ? shortcutParam : overrideShortcutParam; overrideShortcutParam = null; + shortcutParam = null; NativeApp.audioConfig(optimalFramesPerBuffer, optimalSampleRate); NativeApp.init(model, deviceType, languageRegion, apkFilePath, dataDir, extStorageDir, externalFilesDir, nativeLibDir, additionalStorageDirs, cacheDir, shortcut, Build.VERSION.SDK_INT, Build.BOARD); @@ -594,6 +595,7 @@ public abstract class NativeActivity extends Activity { // whether to start at 1x or 2x. sizeManager.updateDisplayMeasurements(); + boolean wasInitialized = initialized; if (!initialized) { Initialize(); initialized = true; @@ -661,6 +663,13 @@ public abstract class NativeActivity extends Activity { Log.i(TAG, "setcontentview after"); startRenderLoopThread(); } + + if (shortcutParam != null && shortcutParam.length() > 0) { + Log.i(TAG, "Got shortcutParam in onCreate on secondary run: " + shortcutParam); + // Make sure we only send it once. + NativeApp.sendMessageFromJava("shortcutParam", shortcutParam); + shortcutParam = null; + } } @Override diff --git a/android/src/org/ppsspp/ppsspp/PpssppActivity.java b/android/src/org/ppsspp/ppsspp/PpssppActivity.java index d661c887d8..397731140a 100644 --- a/android/src/org/ppsspp/ppsspp/PpssppActivity.java +++ b/android/src/org/ppsspp/ppsspp/PpssppActivity.java @@ -99,7 +99,9 @@ public class PpssppActivity extends NativeActivity { if (data != null) { String path = data.toString(); Log.i(TAG, "Found Shortcut Parameter in data: " + path); - super.setShortcutParam("\"" + path.replace("\\", "\\\\").replace("\"", "\\\"") + "\""); + String escaped = "\"" + path.replace("\\", "\\\\").replace("\"", "\\\"") + "\""; + Log.i(TAG, "Escaped: " + escaped); + super.setShortcutParam(escaped); // Toast.makeText(getApplicationContext(), path, Toast.LENGTH_SHORT).show(); } else { String param = getIntent().getStringExtra(SHORTCUT_EXTRA_KEY); From dadc37cb9b09ab8ee0d6d5590895bdc74b9e2749 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Tue, 14 May 2024 00:04:40 +0200 Subject: [PATCH 255/719] EmuScreen: If a requested-to-boot game is already running, ignore the request. --- UI/EmuScreen.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/UI/EmuScreen.cpp b/UI/EmuScreen.cpp index eafa4c9fde..a06b1c60ef 100644 --- a/UI/EmuScreen.cpp +++ b/UI/EmuScreen.cpp @@ -537,6 +537,11 @@ void EmuScreen::sendMessage(UIMessage message, const char *value) { return; } } else if (message == UIMessage::REQUEST_GAME_BOOT) { + // TODO: Ignore or not if it's the same game that's already running? + if (gamePath_ == Path(value)) { + WARN_LOG(LOADER, "Game already running, ignoring"); + return; + } const char *ext = strrchr(value, '.'); if (ext != nullptr && !strcmp(ext, ".ppst")) { SaveState::Load(Path(value), -1, &AfterStateBoot); From f1e25742b7616a1aa2fb9d3dda1204bccdcf921c Mon Sep 17 00:00:00 2001 From: Eric Warmenhoven Date: Sun, 19 May 2024 18:22:15 -0400 Subject: [PATCH 256/719] libretro: Add more options for locked cpu speed --- libretro/libretro_core_options.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libretro/libretro_core_options.h b/libretro/libretro_core_options.h index a39e03e4b6..9894c422f8 100644 --- a/libretro/libretro_core_options.h +++ b/libretro/libretro_core_options.h @@ -209,6 +209,12 @@ struct retro_core_option_v2_definition option_defs_us[] = { { "222MHz", NULL }, { "266MHz", NULL }, { "333MHz", NULL }, + { "444MHz", NULL }, + { "555MHz", NULL }, + { "666MHz", NULL }, + { "777MHz", NULL }, + { "888MHz", NULL }, + { "999MHz", NULL }, { NULL, NULL }, }, "disabled" From 8d63f88fa188bd57ba47af7d4b44eb74b8f0b094 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Mon, 20 May 2024 09:44:01 +0200 Subject: [PATCH 257/719] Update tr_TR translation --- assets/lang/tr_TR.ini | 631 +++++++++++++++++++++--------------------- 1 file changed, 313 insertions(+), 318 deletions(-) diff --git a/assets/lang/tr_TR.ini b/assets/lang/tr_TR.ini index 35036b4f08..c5811404c3 100644 --- a/assets/lang/tr_TR.ini +++ b/assets/lang/tr_TR.ini @@ -1,67 +1,67 @@ [Achievements] -%1: Attempt failed = %1: Attempt failed -%1: Attempt started = %1: Attempt started -%1 achievements, %2 points = %1 achievements, %2 points -Account = Account -Achievement progress = Achievement progress -Achievement sound volume = Achievement sound volume -Achievement unlocked = Achievement unlocked -Achievements = Achievements -Achievements are disabled = Achievements are disabled -Achievements enabled = Achievements enabled -Achievements with active challenges = Achievements with active challenges -Allow Save State in Hardcore Mode (but not Load State) = Allow Save State in Hardcore Mode (but not Load State) -Almost completed achievements = Almost completed achievements -Around me = Around me -Can't log in to RetroAchievements right now = Can't log in to RetroAchievements right now -Challenge indicator = Challenge indicator -Contacting RetroAchievements server... = Contacting RetroAchievements server... -Customize = Customize -Earned = You have unlocked %1 of %2 achievements, and earned %3 of %4 points -Encore Mode = Encore Mode -Failed logging in to RetroAchievements = Failed logging in to RetroAchievements -Failed to connect to RetroAchievements. Achievements will not unlock. = Failed to connect to RetroAchievements. Achievements will not unlock. -Failed to identify game. Achievements will not unlock. = Failed to identify game. Achievements will not unlock. -Hardcore Mode (no savestates) = Hardcore Mode (no savestates) -Hardcore Mode = Hardcore Mode -How to use RetroAchievements = How to use RetroAchievements -In Encore mode - listings may be wrong below = In Encore mode - listings may be wrong below -Leaderboard attempt started or failed = Leaderboard attempt started or failed -Leaderboard result submitted = Leaderboard result submitted -Leaderboard score submission = Leaderboard score submission -Leaderboard submission is enabled = Leaderboard submission is enabled -Leaderboard tracker = Leaderboard tracker -Leaderboards = Leaderboards -Links = Links -Locked achievements = Locked achievements -Log bad memory accesses = Log bad memory accesses -Mastered %1 = Mastered %1 -Notifications = Notifications -Recently unlocked achievements = Recently unlocked achievements -Reconnected to RetroAchievements. = Reconnected to RetroAchievements. -Register on www.retroachievements.org = Register on www.retroachievements.org -RetroAchievements are not available for this game = RetroAchievements are not available for this game -RetroAchievements website = RetroAchievements website +%1: Attempt failed = %1: Deneme başarısız oldu +%1: Attempt started = %1: Deneme başladı +%1 achievements, %2 points = %1 başarım, %2 puan +Account = Hesap +Achievement progress = Başarım ilerlemesi +Achievement sound volume = Başarım ses ayarı +Achievement unlocked = Başarımın kilidi açıldı +Achievements = Başarımlar +Achievements are disabled = Başarımlar devre dışı +Achievements enabled = Başarımlar etkin +Achievements with active challenges = Etkin mücadeleler içeren başarımlar +Allow Save State in Hardcore Mode (but not Load State) = Hardcore Modda Durum Kayıtlarına izin verin (yükleme durumu değil) +Almost completed achievements = Neredeyse tamamlanmış başarımlar +Around me = Etrafımda +Can't log in to RetroAchievements right now = RetroAchievements'a şu anda giriş yapılamıyor +Challenge indicator = Mücadele işareti +Contacting RetroAchievements server... = RetroAchievements sunucusuna bağlanılıyor... +Customize = Özelleştir +Earned = %2 başarımın %1 kadarının kilidini açtınız ve %4 puanın %3 kadarını kazandınız +Encore Mode = Encore Mod +Failed logging in to RetroAchievements = RetroAchievements'a giriş başarısız oldu +Failed to connect to RetroAchievements. Achievements will not unlock. = RetroAchievements'a bağlantı başarısız oldu. Başarımların kilidi açılmayacak. +Failed to identify game. Achievements will not unlock. = Oyun belirlenemedi. Başarımların kilidi açılmayacak. +Hardcore Mode (no savestates) = Hardcore Mod (durum kaydı yok) +Hardcore Mode = Hardcore Mod +How to use RetroAchievements = RetroAchievements nasıl kullanılır +In Encore mode - listings may be wrong below = Encore moddasınız - aşağıdaki listelemeler yanlış olabilir +Leaderboard attempt started or failed = Liderlik tablosu denemesi başladı veya başarısız oldu +Leaderboard result submitted = Liderlik tablosu sonucu kaydedildi +Leaderboard score submission = Liderlik tablosu skoru kaydetme +Leaderboard submission is enabled = Liderlik tablosu kaydetme etkin +Leaderboard tracker = Liderlik tablosu izleyici +Leaderboards = Liderlik tabloları +Links = Bağlantılar +Locked achievements = Kilitli başarımlar +Log bad memory accesses = Kötü bellek erişimlerini günlükle +Mastered %1 = %1 ustalaşıldı +Notifications = Bildirimler +Recently unlocked achievements = Yakın zamanda kilidi açılan başarımlar +Reconnected to RetroAchievements. = RetroAchievements'a yeniden bağlanıldı. +Register on www.retroachievements.org = www.retroachievements.org'da kaydolun +RetroAchievements are not available for this game = RetroAchievements bu oyunda kullanılamaz +RetroAchievements website = RetroAchievements web sitesi Rich Presence = Rich Presence -Save state loaded without achievement data = Save state loaded without achievement data -Save states not available in Hardcore Mode = Save states not available in Hardcore Mode -Sound Effects = Sound Effects -Statistics = Statistics -Submitted %1 for %2 = Submitted %1 for %2 -Syncing achievements data... = Syncing achievements data... -Test Mode = Test Mode -This feature is not available in Hardcore Mode = This feature is not available in Hardcore Mode -This game has no achievements = This game has no achievements -Top players = Top players -Unlocked achievements = Unlocked achievements -Unofficial achievements = Unofficial achievements -Unsupported achievements = Unsupported achievements +Save state loaded without achievement data = Başarım verileri olmadan durum kaydını kaydet +Save states not available in Hardcore Mode = Durum kayıtları Hardcore Mod'da kullanılamaz +Sound Effects = Ses Efektleri +Statistics = İstatistikler +Submitted %1 for %2 = %2 için %1 kaydedildi +Syncing achievements data... = Başarım verileri eşitleniyor... +Test Mode = Sınama Modu +This feature is not available in Hardcore Mode = Bu özellik Hardcore Mod'da kullanılamaz +This game has no achievements = Bu oyunun başarımları yok +Top players = En iyi oyuncular +Unlocked achievements = Kilidi açılmış başarımlar +Unofficial achievements = Resmi olmayan başarımlar +Unsupported achievements = Desteklenmeyen başarımlar [Audio] Alternate speed volume = Alternatif hız hacmi Audio backend = Ses alttabanı (Yeniden başlatma gerekir) Audio Error = Ses Hatası -Audio file format not supported. Must be WAV or MP3. = Audio file format not supported. Must be WAV or MP3. +Audio file format not supported. Must be WAV. = Ses dosya biçimi desteklenmiyor. WAV olmalı. AudioBufferingForBluetooth = Bluetooth uyumlu arabellek (daha yavaş) Auto = Otomatik Device = Cihaz @@ -83,7 +83,7 @@ Analog Limiter = Analog sınırlayıcı Analog Settings = Analog Ayarları Analog Stick = Analog çubuk Analog Style = Analog Biçimi -Analog trigger threshold = Analog trigger threshold +Analog trigger threshold = Analog tetik eşiği AnalogLimiter Tip = Analog sınırlayıcı tuşuna basınca Auto = Otomatik Auto-centering analog stick = Analog çubuğu otomatik ortala @@ -97,7 +97,7 @@ Calibrate Analog Stick = Analog Çubuğu Kalibre Et Calibrate = Kalibre Calibrated = Kalibre edildi Calibration = Kalibrasyon -Circular deadzone = Circular deadzone +Circular deadzone = Dairesel ölü bölge Circular stick input = Dairesel çubuk girişi Classic = Klasik Confine Mouse = Fareyi belirli bir pencere/görüntü alanı içinde sınırla @@ -110,10 +110,10 @@ Deadzone radius = Ölü bölge yarıçapı Disable D-Pad diagonals (4-way touch) = D-Pad'i devre dışı bırak (4'lü Yön Tuşları) Disable diagonal input = Diyagonal girişi devre dışı bırak Double tap = Çift dokunma -Enable analog stick gesture = Enable analog stick gesture +Enable analog stick gesture = Analog çubuk hareketini etkinleştir Enable gesture control = Hareket kontrolünü etkinleştir Enable standard shortcut keys = Standart kısayol tuşlarını etkinleştir -frames = frames +frames = kareler Gesture = Hareket Gesture mapping = Hareket kontrollerini düzenle Glowing borders = Parlayan kenarlar @@ -135,7 +135,7 @@ Low end radius = Düşük uç yarıçapı Mouse = Fare ayarları Mouse sensitivity = Fare hassasiyeti Mouse smoothing = Fare yumuşatma -Mouse wheel button-release delay = Mouse wheel button-release delay +Mouse wheel button-release delay = Fare tekerleği tuşunu bırakma gecikmesi MouseControl Tip = Fareye 'Kontrolleri Ayarlama' bölümünden 'M' simgesine basarak kontrol atayabilirsiniz. None (Disabled) = Hiçbiri (Devre dışı) Off = Kapalı @@ -143,7 +143,7 @@ OnScreen = Dokunmatik ekran kontrolleri Portrait = Dikey Portrait Reversed = Ters dikey PSP Action Buttons = PSP eylem tuşları -Rapid fire interval = Rapid fire interval +Rapid fire interval = Hızlı ateş aralığı Raw input = Saf girdi Repeat mode = Tekrar modu Reset to defaults = Varsayılanlara sıfırla @@ -152,7 +152,7 @@ Sensitivity (scale) = Hassasiyet (ölçek) Sensitivity = Hassasiyet Shape = Şekil Show Touch Pause Menu Button = Duraklama menüsü tuşunu göster -Sticky D-Pad (easier sweeping movements) = Sticky D-Pad (easier sweeping movements) +Sticky D-Pad (easier sweeping movements) = Yapışkan D-Pad (daha kolay sürükleme hareketleri) Swipe = Kaydır Swipe sensitivity = Kaydırma hassasiyeti Swipe smoothing = Pürüzsüz kaydırma @@ -161,7 +161,7 @@ Tilt control setup = Eğimi düzenle... Tilt Input Type = Eğim giriş türü Tilt Sensitivity along X axis = X ekseni boyunca eğim hassasiyeti Tilt Sensitivity along Y axis = Y ekseni boyunca eğim hassasiyeti -To Calibrate = Cihazı tercih ettiğiniz açıda tutun ve "Kalibre" ya basın. +To Calibrate = Cihazı tercih ettiğiniz açıda tutun ve "Kalibre"ye basın. Toggle mode = Geçiş modu Touch Control Visibility = Dokunmatik kontrol görünürlüğü Use custom right analog = Özel sağ analog kullan @@ -189,20 +189,20 @@ Auto = &Otomatik Auto Max Quality = Otomatik en yüksek &kalite Backend = Oluşturma &Arkaucu (PPSSPP'yi yeniden başlatır) Bicubic = &Bikübik -Break = Break -Break on Load = Break on load -Buy Gold = Altın Sürümünü Satın Al +Break = Kırılma +Break on Load = Yüklemede kırılma +Buy Gold = Gold Sürümünü Satın Al Control Mapping... = Kontrol Ayarlama... -Copy PSP memory base address = Copy PSP memory base &address +Copy PSP memory base address = PSP bellek tabanı &adresini kopyala Debugging = &Hata Ayıklama Deposterize = &Deposterize Direct3D9 = &Direct3D9 Direct3D11 = Direct3D &11 -Disassembly = &Disassembly... +Disassembly = &Sökme... Discord = Discord Display Layout && Effects = Ekran düzeni düzenleyici... Display Rotation = Ekran rotasyonu -Dump Next Frame to Log = D&ump Next Frame to Log +Dump Next Frame to Log = Sonraki Kareyi Günlüğe D&ökümle Emulation = &Emülasyon Enable Cheats = &Hileleri Aç Enable Sound = Sesi Aç @@ -213,7 +213,7 @@ Frame Skipping = &Kare Atlama Frame Skipping Type = Kare atlama türü Fullscreen = Tam Ekran Game Settings = &Oyun Ayarları -GE Debugger... = GE Debugge&r... +GE Debugger... = GE Hata Ayıklayıcıs&ı... GitHub = Git&Hub Hardware Transform = &Donanım Dönüştürme Help = Yardım @@ -235,15 +235,15 @@ Log Console = &Günlük Konsolu Memory View... = Bellek &Görünümü... More Settings... = &Daha Fazla Ayar... Nearest = &En Yakın -Recent = &Recent -Restart Graphics = Restart Graphics +Recent = &En Son +Restart Graphics = Ekran Kartını Yeniden Başlat Skip Buffer Effects = &Arabellek efektlerini atla (arabelleğe alınmaz, daha hızlıdır) Off = &Kapalı -Open Chat = Open Chat +Open Chat = Sohbeti Aç Open Directory... = Dizin Aç... Open from MS:/PSP/GAME... = Şurdan Aç MS:/PSP/GAME... Open Memory Stick = Hafıza Kartını Aç -Open New Instance = Open new instance +Open New Instance = Yeni örnek aç OpenGL = &OpenGL Pause = PPSSPP Menüsü Pause When Not Focused = &Başka programa geçildiğinde duraklat @@ -256,46 +256,46 @@ Record Display = Görüntü Kaydet Rendering Mode = İşleme Modu Rendering Resolution = &İşleme Çözünürlüğü Reset = Sıfırla -Reset Symbol Table = Reset S&ymbol Table +Reset Symbol Table = S&imge Tablosunu Sıfırla Run = Çalıştır Save .sym File... = .sym Dosyası Kaydet... Save Map File... = &Harita Dosyası Kaydet... Save State = Durum Kaydet Save State File... = &Durum Kaydı Dosyası... Savestate Slot = Durum Kaydı Yeri -Screen Scaling Filter = Scr&een Scaling Filter +Screen Scaling Filter = Ekr&an Ölçekleme Filtresi Show Debug Statistics = Hata Ayıklama İstatistiklerini Göster Show FPS Counter = FPS Sayacını Göster Skip Number of Frames = Şu kadar kare sayısını atla Skip Percent of FPS = Şu kadar FPS yüzdesini atla -Smart 2D texture filtering = Smart 2D texture filtering +Smart 2D texture filtering = Akıllı 2D doku filtreleme Stop = &Dur Switch UMD = UMD Değiştir Take Screenshot = &Ekran Görüntüsü Al Texture Filtering = Doku Filtreleme Texture Scaling = &Doku Ölçekleme -Use Lossless Video Codec (FFV1) = &Kayıpsız video kodek'i kullan (FFV1) +Use Lossless Video Codec (FFV1) = &Kayıpsız video kodeği kullan (FFV1) Use output buffer for video = Video için çıkış arabelleğini kullan VSync = Dikey Eşleme (VSync) Vulkan = Vulkan Window Size = &Pencere Boyutu -www.ppsspp.org = www.&ppsspp.org Ziyaret Et +www.ppsspp.org = www.&ppsspp.org'u Ziyaret Et xBRZ = &xBRZ [Developer] -Allocator Viewer = Allocator viewer (Vulkan) +Allocator Viewer = Ayırıcı görüntüleyici (Vulkan) Allow remote debugger = Uzaktan hata ayıklamaya izin ver Backspace = Silme Tuşu Block address = Adresi engelle By Address = Adrese Göre Copy savestates to memstick root = Durum kayıtlarını hafıza kartına kopyalayın -Create frame dump = Create frame dump +Create frame dump = Kare dökümü oluştur Create/Open textures.ini file for current game = Şu anki oyun için textures.ini dosyası Oluştur/Aç -Current = Current -Debug overlay = Debug overlay -Debug stats = Debug stats +Current = Şimdi +Debug overlay = Hata ayıklama yer paylaşımı +Debug stats = Hata ayıklama istatistikleri Dev Tools = Geliştirme araçları -DevMenu = DevMenu +DevMenu = Geliştirici Menüsü Disabled JIT functionality = JIT işlevselliğini devre dışı bırakın Draw Frametimes Graph = Kare süreleri grafiğini çizin Dump Decrypted Eboot = Şifresi çözülmüş EBOOT.BIN'i oyun açılışında temizleyin @@ -303,28 +303,26 @@ Dump next frame to log = Sonraki kareyi günlüğe dökümle Enable driver bug workarounds = Sürücü hatası geçici çözümlerini etkinleştirin Enable Logging = Hata ayıklama günlüğünü etkinleştirin Enter address = Adres Gir -Fast-forward mode = Fast-forward mode +Fast-forward mode = Hızlı ileri sarma modu FPU = FPU -Fragment = Fragment -Frame timing = Frame timing +Fragment = Parça +Frame timing = Kare zamanlama Framedump tests = Framedump testleri -Frame Profiler = Frame profiler -GPI switch %1 = GPI switch %1 -GPI/GPO switches/LEDs = GPI/GPO switches/LEDs -GPU Allocator Viewer = GPU Allocator Viewer +Frame Profiler = Frame profilleyici +GPU Allocator Viewer = GPU Ayırıcı Görüntüleyici GPU Driver Test = GPU sürücü testi -GPU log profiler = GPU log profiler +GPU log profiler = GPU günlük profilleyici GPU Profile = GPU profili Jit Compare = Jit karşılaştırma JIT debug tools = JIT hata ayıklama araçları -Log Dropped Frame Statistics = Düşen kare istatistiklerini günlüğe kaydet +Log Dropped Frame Statistics = Düşen kare istatistiklerini günlükle Log Level = Günlük seviyesi Log View = Günlük görünümü Logging Channels = Günlük kanalları -Multi-threaded rendering = Multi-threaded rendering +Multi-threaded rendering = Çok izlekli işleme Next = Sonraki -No block = No block -Off = Off +No block = Blok yok +Off = Kapalı Prev = Önceki Random = Rastgele Replace textures = Dokuları değiştir @@ -335,25 +333,24 @@ RestoreGameDefaultSettings = Oyun için ayarlanmış olan özel ayarları PPSSPP Resume = Devam ettir Run CPU Tests = İşlemci testlerini başlat Save new textures = Yeni dokuları kaydet -Shader Viewer = Shader Görüntüleyici +Shader Viewer = Gölgelendirici Görüntüleyici Show Developer Menu = Geliştirici Menüsünü Göster -Show GPO LEDs = Show GPO LEDs Show on-screen messages = Ekran üzerinde mesajları göster Stats = İstatistikler System Information = Sistem bilgisi -Texture ini file created = Texture ini file created +Texture ini file created = Doku ini dosyası oluşturuldu Texture Replacement = Doku değiştirme -Audio Debug = Ses hata ayıklamasını -Control Debug = Control Debug +Audio Debug = Ses hata ayıklaması +Control Debug = Hata ayıklamayı kontrol et Toggle Freeze = Donmayı Aç/Kapa Touchscreen Test = Dokunmatik ekran testi -Ubershaders = Ubershaders +Ubershaders = Ubershader'lar Vertex = Vertex VFPU = VFPU [Dialog] %d ms = %d ms -%d seconds = %d saniyeler +%d seconds = %d saniye * PSP res = * PSP Çözünürlüğü Active = Etkin Back = Geri @@ -367,9 +364,9 @@ Center Right = Sağ orta Changing this setting requires PPSSPP to restart. = Bu ayarın değiştirilmesi, PPSSPP'nin yeniden başlatılmasını gerektirir. Channel: = Kanal: Choose PPSSPP save folder = PPSSPP kayıt dosyası seç -Confirm Overwrite = Veriyi üstüne yazmak istiyor musun? -Confirm Save = Bu veriyi kaydetmek istiyor musun? -ConfirmLoad = Veriyi yüklemek istiyor musun? +Confirm Overwrite = Verinin üstüne yazmak istiyor musunuz? +Confirm Save = Bu veriyi kaydetmek istiyor musunuz? +ConfirmLoad = Veriyi yüklemek istiyor musunuz? ConnectingAP = Erişim noktasına bağlanılıyor.\nLütfen bekleyin.... ConnectingPleaseWait = Bağlanılıyor.\nLütfen bekleyin... ConnectionName = Bağlantı adı @@ -384,34 +381,34 @@ DeleteConfirmGameConfig = Bu oyun için ayarları silmek istediğine emin misin? DeleteFailed = Veri silinemedi. Deleting = Siliniyor\nLütfen Bekleyin... Disable All = Hepsini devre dışı bırak -Disabled = Disabled +Disabled = Devre dışı Dumps = Dökümler Edit = Düzenle Enable All = Hepsini etkinleştir -Enabled = Enabled +Enabled = Etkin Enter = Gir -Failed to connect to server, check your internet connection. = Failed to connect to server, check your internet connection. -Failed to log in, check your username and password. = Failed to log in, check your username and password. +Failed to connect to server, check your internet connection. = Sunucuya bağlanılamadı, internetinizi kontrol edin. +Failed to log in, check your username and password. = Giriş yapılamadı, kullanıcı adı ve şifrenizi kontrol edin. Filter = Filtre Finish = Bitir GE Frame Dumps = GE Kare Dökümleri Grid = Izgara Inactive = Ektin değil -Installing... = Installing... +Installing... = Yükleniyor... InternalError = Dahili bir hata oluştu. -Links = Links +Links = Bağlantılar Load = Yükle Load completed = Yükleme tamamlandı. Loading = Yükleniyor\nLütfen Bekleyin... LoadingFailed = Veri yüklenemedi. -Log in = Log in -Log out = Log out -Logged in! = Logged in! -Logging in... = Logging in... -More information... = More information... +Log in = Giriş yap +Log out = Çıkış yap +Logged in! = Giriş yapıldı! +Logging in... = Giriş yapılıyor... +More information... = Daha fazla bilgi... Move = Taşı -Move Down = Move Down -Move Up = Move Up +Move Down = Aşağı Taşı +Move Up = Yukarı Taşı Network Connection = Ağ Bağlantısı NEW DATA = YENİ VERİ No = Hayır @@ -420,8 +417,8 @@ ObtainingIP = IP adresi alınıyor.\nLütfen bekleyin... OK = Tamam Old savedata detected = Eski kayıt bulundu. Options = Ayarlar -Password = Password -Remove = Remove +Password = Şifre +Remove = Kaldır Reset = Sıfırla Resize = Yeniden Boyutlandır Restart = Tekrar başlat @@ -431,9 +428,9 @@ Save completed = Kaydedildi. Saving = Kaydediliyor\nLütfen Bekleyin... SavingFailed = Veri kaydedilemiyor. Search = Ara -seconds, 0:off = saniye, 0 = off +seconds, 0:off = saniye, 0 = kapalı Select = Seç -Settings = Settings +Settings = Ayarlar Shift = Shift Skip = Geç Snap = Hizala @@ -448,7 +445,7 @@ Top Center = Orta üst Top Left = Sol üst Top Right = Sağ üst Unsupported = Desteklenmiyor -Username = Username +Username = Kullanıcı adı When you save, it will load on a PSP, but not an older PPSSPP = Kayıt aldığında almış olduğunuz kayıt PSP'de yüklenebilecek ama eski bir PPSSPP sürümünde yüklenemeyecek. When you save, it will not work on outdated PSP Firmware anymore = Kaydettiğinde artık eski PSP yazılımı üzerinde çalışmayacaktır. Yes = Evet @@ -457,6 +454,7 @@ Zoom = Yakınlaştır [Error] 7z file detected (Require 7-Zip) = dosya sıkıştırılmış (7z).\nLütfen ilk olarak dosyayı çıkartın (7-zip ya da WinRAR kullanın). A PSP game couldn't be found on the disc. = Diskte bir PSP oyunu bulunamadı. +BadCHD = Bad CHD file.\nCompress using "chdman createdvd" for good performance Cannot boot ELF located outside mountRoot. = mountRoot dışında bulunan ELF önyüklenemiyor. Could not save screenshot file = Ekran görüntüsü kaydedilemedi. D3D9or11 = Direct3D 9? (Direct3D 11 için hayır'a basın) @@ -503,9 +501,9 @@ Save encryption failed. This save won't work on real PSP = Kayıt şifrelemesi b textures.ini filenames may not be cross-platform = "textures.ini" dosya adları çapraz platform olmayabilir. This is a saved state, not a game. = Bu bir durum kaydı, bir oyun değil This is save data, not a game. = Bu bir kayıt dosyası, bir oyun değil. -Unable to create cheat file, disk may be full = Hile dosyası oluşturulamadı, belkide disk doludur. -Unable to initialize rendering engine. = Render motoru başlatılamıyor. -Unable to write savedata, disk may be full = Kayıt verisi yazılamadı, belkide disk doludur. +Unable to create cheat file, disk may be full = Hile dosyası oluşturulamadı, belki de disk doludur. +Unable to initialize rendering engine. = İşleme motoru başlatılamıyor. +Unable to write savedata, disk may be full = Kayıt verisi yazılamadı, belki de disk doludur. Warning: Video memory FULL, reducing upscaling and switching to slow caching mode = UYARI: Video belleği (VRAM) DOLU, video ölçekleme azaltılıyor ve yavaş önbellekleme moduna geçiliyor. Warning: Video memory FULL, switching to slow caching mode = UYARI: Video belleği (VRAM) DOLU, yavaş önbellekleme moduna geçiliyor. ZIP file detected (Require UnRAR) = Dosya sıkıştırılmış (ZIP).\nLütfen ilk olarak dosyayı çıkartın (UnRAR'ı deneyin). @@ -514,23 +512,23 @@ ZIP file detected (Require WINRAR) = Dosya sıkıştırlmış (ZIP).\nLütfen il [Game] Asia = Asya Calculate CRC = CRC'yi Hesapla -Click "Calculate CRC" to verify ISO = Click "Calculate CRC" to verify ISO +Click "Calculate CRC" to verify ISO = ISO'yu doğrulamak için "CRC'yi Hesapla"ya tıklayın ConfirmDelete = Sil -CRC checksum does not match, bad or modified ISO = CRC checksum does not match, bad or modified ISO +CRC checksum does not match, bad or modified ISO = CRC sağlama toplamı eşleşmiyor, ISO hatalı veya değiştirilmiş olabilir. Create Game Config = Oyun için yapılandırma dosyası oluştur Create Shortcut = Kısayol oluştur Delete Game = Oyunu Sil Delete Game Config = Oyun ayarını sil Delete Save Data = Oyun kaydını sil Europe = Avrupa -File size incorrect, bad or modified ISO = File size incorrect, bad or modified ISO +File size incorrect, bad or modified ISO = Dosya boyutu yanlış, ISO hatalı veya değiştirilmiş olabilir. Game = Oyun -Game ID unknown - not in the ReDump database = Game ID unknown - not in the ReDump database +Game ID unknown - not in the ReDump database = Oyun ID'si bilinmiyor - ReDump veritabanında yok Game Settings = Oyun ayarları Homebrew = Homebrew Hong Kong = Hong Kong InstallData = Veri yükle -ISO OK according to the ReDump project = ISO OK according to the ReDump project +ISO OK according to the ReDump project = ReDump projesine göre ISO OK Japan = Japonya Korea = Kore MB = MB @@ -540,16 +538,16 @@ Remove From Recent = Geçmişten sil SaveData = Kayıt Setting Background = Arkaplan ayarlanıyor Show In Folder = Dosyada göster -Time Played: %1h %2m %3s = Time Played: %1h %2m %3s -Uncompressed = Uncompressed +Time Played: %1h %2m %3s = Oynandığı Süre: %1h %2m %3s +Uncompressed = Sıkıştırılmamış USA = ABD Use UI background = Arayüz arkaplanı olarak kullan [Graphics] -% of the void = % of the void -% of viewport = % of viewport +% of the void = boşluğun %'si +% of viewport = viewport'un %'si %, 0:unlimited = %, 0 = sınırsız -(supersampling) = (supersampling) +(supersampling) = (süper örnekleme) (upscaling) = (ölçekleme) 1x PSP = 1× PSP 2x = 2× @@ -567,55 +565,56 @@ Use UI background = Arayüz arkaplanı olarak kullan 9x PSP = 9× PSP 10x PSP = 10× PSP 16x = 16× -AdrenoTools driver manager = AdrenoTools driver manager +AdrenoTools driver manager = AdrenoTools sürücü yöneticisi Aggressive = Agresif Alternative Speed = Alternatif Hız (% 0 = sınırsız) Alternative Speed 2 = Alternatif Hız 2 (% 0 = sınırsız) Anisotropic Filtering = Anizotropik filtreleme -Antialiasing (MSAA) = Antialiasing (MSAA) -Aspect Ratio = Aspect Ratio +Antialiasing (MSAA) = Kenar yumuşatma (MSAA) +Aspect Ratio = En Boy Oranı Auto = Otomatik Auto (1:1) = Otomatik (1:1) +Auto (same as Rendering) = Otomatik (İşleme Çözünürlüğüyle Aynı) Auto FrameSkip = Otomatik kare atlama Auto Max Quality = Otomatik En Yüksek Kalite Auto Scaling = Otomatik ölçekleme Backend = Arkauç Balanced = Dengeli -Bicubic = Çift Kübik +Bicubic = Bikübik Both = İkisi de -Buffer graphics commands (faster, input lag) = Grafik komutlarını arabellekle (daha hızlı, input lag'e sebep olabilir) +Buffer graphics commands (faster, input lag) = Grafik komutlarını arabellekle (daha hızlıdır, input lag'e sebep olabilir) BufferedRenderingRequired = Uyarı: Bu oyun "işleme modunun" "yükleyerek işleme"ye alınmasını gerektirir. Camera = Kamera Camera Device = Kamera cihazı -Cardboard Screen Size = Ekran Boyutu (görüntü alanının %si olarak) -Cardboard Screen X Shift = X shift (boş alanın %si olarak) -Cardboard Screen Y Shift = Y shift (boş alanın %si olarak) +Cardboard Screen Size = Ekran Boyutu (görüntü alanının %'si olarak) +Cardboard Screen X Shift = X shift (boş alanın %'si olarak) +Cardboard Screen Y Shift = Y shift (boş alanın %'si olarak) Cardboard VR Settings = Google Cardboard VR Ayarları Cheats = Hileler -Copy to texture = Copy to texture -Current GPU Driver = Current GPU Driver +Copy to texture = Dokuya kopyala +Current GPU Driver = Şimdiki GPU Sürücüsü Debugging = Hata Ayıklama -Default GPU driver = Default GPU driver +Default GPU driver = Varsayılan GPU Sürücüsü DefaultCPUClockRequired = Uyarı: Bu oyun CPU saatinin varsayılana ayarlanmasını gerektirir. Deposterize = Deposterize Deposterize Tip = Yeniden ölçeklenen dokulardaki görsel şerit hatalarını düzeltir Device = Cihaz Direct3D 9 = Direct3D 9 Direct3D 11 = Direct3D 11 -Disable culling = Disable culling +Disable culling = Ayırma işlemini devre dışı bırak Disabled = Devre dışı Display Layout && Effects = Görüntü Düzeni Düzenleyicisi Display Resolution (HW scaler) = Görüntü Çözünürlüğü (HW scaler) -Driver requires Android API version %1, current is %2 = Driver requires Android API version %1, current is %2 -Drivers = Drivers +Driver requires Android API version %1, current is %2 = Sürücü, Android API'nin %1 sürümünü gerektiriyor, şu anki sürüm %2 +Drivers = Sürücüler Enable Cardboard VR = Cardboard VR'ı Etkinleştirin FPS = FPS Frame Rate Control = Kare hızı denetimi Frame Skipping = Kare atla Frame Skipping Type = Kare atlama türü FullScreen = Tam ekran -Geometry shader culling = Geometry shader culling -GPUReadbackRequired = Warning: This game requires "Skip GPU Readbacks" to be set to Off. +Geometry shader culling = Geometri gölgelendiricisi ayıklama +GPUReadbackRequired = Uyarı: Bu oyun "GPU Okumalarını Atla" seçeneğinin Kapalı olarak ayarlanmasını gerektirir. Hack Settings = Hack ayarları (Küçük teknik problemlere neden olabilir.) Hardware Tessellation = Donanım Mozaikleme Hardware Transform = Donanım dönüştürme @@ -625,11 +624,11 @@ High = Yüksek Hybrid = Hibrit Hybrid + Bicubic = Hibrit + Bikübik Ignore camera notch when centering = Merkezleme sırasında kamera çentiğini yoksay -Install custom driver... = Install custom driver... -Integer scale factor = Integer scale factor +Install custom driver... = Özel sürücü yükle... +Integer scale factor = Tamsayı ölçek faktörü Internal Resolution = İç çözünürlük Lazy texture caching = Yavaş doku önbellekleme (hızlandırır) -Lazy texture caching Tip = Faster, but can cause text problems in a few games +Lazy texture caching Tip = Daha hızlıdır ancak bazı oyunlarda metin sorunlarına neden olabilir Linear = Doğrusal Low = Düşük LowCurves = Spline/Bezier eğri kalitesi @@ -637,18 +636,16 @@ LowCurves Tip = Sadece bazı oyunlar tarafından kullanılır, eğrilerin pürü Lower resolution for effects (reduces artifacts) = Efektler için daha az çözünürlük (sorunları azaltır) Manual Scaling = El ile ölçekleme Medium = Orta -Mirror camera image = Mirror camera image Mode = Mod -Must Restart = Bu değişikliğin uygulanması için PPSSPP'yi yeniden başlatmalısın. +Must Restart = Bu değişikliğin uygulanması için PPSSPP yeniden başlatılmalıdır. Native device resolution = Yerel aygıt çözünürlüğü Nearest = En yakın -No (default) = No (default) +No (default) = Hayır (varsayılan) No buffer = Arabellek/tampon bellek yok -Render all frames = Render all frames -Same as Rendering resolution = Otomatik (İşleme Çözünürlüğüyle Aynı) -Show Battery % = Show Battery % -Show Speed = Show Speed -Skip = Skip +Render all frames = Tüm kareleri işle +Show Battery % = Pil Yüzdesini Göster +Show Speed = Hızı Göster +Skip = Atla Skip Buffer Effects = Arabellek efektlerini atla (arabelleğe alınmaz, daha hızlıdır) None = Hiçbiri Number of Frames = Kare sayısı @@ -659,7 +656,7 @@ Partial Stretch = Tam ekran (kısmi sünme) Percent of FPS = FPS yüzdesi Performance = Performans Postprocessing shaders = Postprocessing gölgelendiricisi -Recreate Activity = Recreate activity +Recreate Activity = Etkinliği yeniden oluştur Render duplicate frames to 60hz = Yinelenen kareleri 60Hz'de işleyin RenderDuplicateFrames Tip = Daha düşük kare hızlarında çalışan oyunlarda kare hızını düzeltebilir Rendering Mode = İşleme modu @@ -670,29 +667,29 @@ Safe = Güvenli Screen Scaling Filter = Ekran ölçekleme filtresi Show Debug Statistics = Hata ayıklama istatistiklerini göster Show FPS Counter = FPS sayacını göster -Skip GPU Readbacks = Skip GPU Readbacks -Smart 2D texture filtering = Smart 2D texture filtering +Skip GPU Readbacks = GPU Okumalarını Atla +Smart 2D texture filtering = Akıllı 2D doku filtreleme Software Rendering = Yazılımsal işleme (Deneysel) -Software Skinning = Software skinning -SoftwareSkinning Tip = Combine skinned model draws on the CPU, faster in most games +Software Skinning = Yazılımsal Kaplama +SoftwareSkinning Tip = Kaplamalı model çizimlerini CPU'da birleştirin, çoğu oyunu hızlandırır Speed = Hız -Speed Hacks = Hız Hacks (Küçük teknik problemlere neden olabilir.) -Stereo display shader = Stereo display shader -Stereo rendering = Stereo rendering +Speed Hacks = Speed Hack'leri (Küçük teknik problemlere neden olabilir.) +Stereo display shader = Stereo ekran gölgelendiricisi +Stereo rendering = Stereo işleme Stretch = Serbest tam ekran (sünme) Texture Filter = Doku filtreleme Texture Filtering = Doku filtreleme -Texture replacement pack activated = Texture replacement pack activated +Texture replacement pack activated = Doku değiştirme paketi etkinleştirildi Texture Scaling = Doku ölçekleme Texture Shader = Doku gölgelendiricisi -The chosen ZIP file doesn't contain a valid driver = The chosen ZIP file doesn't contain a valid driver -Turn off Hardware Tessellation - unsupported = "Donanım mozaikleme"yi kapatın: desteklenmiyor +The chosen ZIP file doesn't contain a valid driver = Seçilen ZIP dosyası geçerli bir sürücü içermiyor +Turn off Hardware Tessellation - unsupported = "Donanım mozaikleme"yi kapatın: çünkü desteklenmiyor. Unlimited = Sınırsız Up to 1 = 1'e kadar Up to 2 = 2'ye kadar Upscale Level = Ölçeklendirme seviyesi Upscale Type = Ölçeklendirme türü -UpscaleLevel Tip = CPU ağır - takılmayı önlemek için bazı yeniden ölçeklendirmeler gecikebilir +UpscaleLevel Tip = CPU'ya ağır yüklenir - takılmayı önlemek için bazı yeniden ölçeklendirmeler gecikebilir Use all displays = Tüm ekranları kullan VSync = Dikey eşleme (Vsync) Vulkan = Vulkan @@ -700,34 +697,34 @@ Window Size = Pencere boyutu xBRZ = xBRZ [InstallZip] -Delete ZIP file = Zip dosyasını sil +Delete ZIP file = ZIP dosyasını sil Install = Yükle -Install game from ZIP file? = Zip dosyasından oyun yüklensin mi? -Install textures from ZIP file? = Zip dosyasından dokular yüklensin mi? -Installation failed = Installation failed +Install game from ZIP file? = ZIP dosyasından oyun yüklensin mi? +Install textures from ZIP file? = ZIP dosyasından dokular yüklensin mi? +Installation failed = Yükleme başarısız Installed! = Yüklendi! Texture pack doesn't support install = Doku paketi yüklemeyi desteklemiyor Zip archive corrupt = ZIP arşivi bozuk Zip file does not contain PSP software = ZIP dosyası PSP yazılımı içermiyor [KeyMapping] -Allow combo mappings = Allow combo mappings +Allow combo mappings = Birleşik eşlemelere izin ver Autoconfigure = Otomatik ayarla Autoconfigure for device = Cihaz için otomatik ayarla Bind All = Hepsini Bağla Clear All = Hepsini Temizle -Combo mappings are not enabled = Combo mappings are not enabled -Control modifiers = Control modifiers +Combo mappings are not enabled = Birleşik eşlemeler etkin değil +Control modifiers = Kontrol değiştiricileri Default All = Varsayılana Döndür -Emulator controls = Emulator controls -Extended PSP controls = Extended PSP controls +Emulator controls = Emülator kontrolleri +Extended PSP controls = Genişletilmiş PSP kontrolleri Map a new key for = Yeni bir tuş girin Map Key = Tuş girin -Map Mouse = Mouse eşleştir +Map Mouse = Fare eşleştir Replace = Değiştir Show PSP = PSP'yi Göster -Standard PSP controls = Standard PSP controls -Strict combo input order = Strict combo input order +Standard PSP controls = Standart PSP kontrolleri +Strict combo input order = Katı birleşik giriş sırası You can press ESC to cancel. = İptal etmek için Esc'ye basabilirsiniz. [MainMenu] @@ -759,8 +756,8 @@ www.ppsspp.org = www.ppsspp.org Audio = Ses Controls = Kontroller Graphics = Grafik -Networking = Ağ ayarları -Search = Ara +Networking = Ağ +Search = Arama System = Sistem Tools = Araçlar @@ -784,31 +781,31 @@ D-pad left = D-pad sol D-pad right = D-pad sağ D-pad up = D-pad yukarı DevMenu = Geliştirici Menüsü -Display Landscape = Display Landscape -Display Landscape Reversed = Display Landscape Reversed -Display Portrait = Display Portrait -Display Portrait Reversed = Display Portrait Reversed +Display Landscape = Yatay Ekran +Display Landscape Reversed = Ters Yatay Ekran +Display Portrait = Dikey Ekran +Display Portrait Reversed = Ters Dikey Ekran Double tap button = Düğmeye çift basın Down = Dpad Aşağı Dpad = Dpad -Exit App = Exit App -Frame Advance = Frame advance +Exit App = Uygulamadan Çık +Frame Advance = Kare ilerlemesi Hold = Basılı tut Home = Ev L = L Left = Dpad Sol Load State = Durum Yükle Mute toggle = Sessize al -Next Slot = Sonraki Yer +Next Slot = Sonraki Slot None = Hiçbiri Note = Not -OpenChat = Chat'i Aç +OpenChat = Sohbeti Aç Pause = PPSSPP Menüsü -Previous Slot = Previous Slot +Previous Slot = Önceki Slot R = R RapidFire = Seri Ateş -Record = Record -Remote hold = Remote hold +Record = Kayıt +Remote hold = Uzaktan tutma Rewind = Geri Sar Right = Dpad Sağ Right Analog Stick = Sağ Analog çubuk @@ -821,7 +818,7 @@ Rotate Analog (CW) = Analoğu döndür (CW) Save State = Durum Kaydet Screen = Ekran Screenshot = Ekran görüntüsü -Select = Select +Select = Seç SpeedToggle = Hızı ayarla Square = Kare Start = Başlat @@ -833,28 +830,28 @@ tap to customize = özelleştirmek için dokun Texture Dumping = Doku Dökümü Texture Replacement = Doku değiştirme Toggle Fullscreen = Tam ekran -Toggle mode = Toggle mode -Toggle mouse input = Toggle mouse input -Toggle touch controls = Toggle touch controls -Toggle WLAN = Toggle WLAN +Toggle mode = Geçiş modu +Toggle mouse input = Fare girişine geç +Toggle touch controls = Dokunmatik kontrollerine geç +Toggle WLAN = WLAN aç/kapat Triangle = Üçgen -Fast-forward = Fast-forward +Fast-forward = Hızlı ileri sar Up = Dpad Yukarı -Vol + = Vol + -Vol - = Vol - +Vol + = Ses + +Vol - = Ses - Wlan = WLAN [MemStick] Already contains PSP data = Zaten PSP verisi içeriyor -Cancelled - try again = Cancelled - try again -Checking... = Checking... +Cancelled - try again = İptal edildi - tekrar deneyin +Checking... = Kontrol ediliyor... Create or Choose a PSP folder = Bir PSP klasörü oluştur veya seç -Current = Current +Current = Şimdiki DataCanBeShared = Veri PPSSPP normal/Gold arasında paylaşılabilir DataCannotBeShared = Veri PPSSPP normal/Gold arasında PAYLAŞILAMAZ! DataWillBeLostOnUninstall = Uyarı! PPSSPP'yi kaldırdığınızda veriler kaybolacak! -DataWillStay = Data will stay even if you uninstall PPSSPP. -Deleting... = Deleting... +DataWillStay = PPSSPP'yi kaldırsanız bile veriler kalacaktır. +Deleting... = Siliniyor... Done! = Tamamlandı! EasyUSBAccess = Kolay USB erişimi Failed to move some files! = Bazı dosyalar taşınamadı! @@ -883,13 +880,13 @@ AM: Data from Unknown Port = AM: Bilinmeyen Porttan Veri Auto = Otomatik Change Mac Address = MAC adresini değiştir Change proAdhocServer Address = PRO Ad Hoc Server IP adresini değiştir (localhost = çoklu örnek) -ChangeMacSaveConfirm = Generate a new MAC address? -ChangeMacSaveWarning = Some games verify the MAC address when loading savedata, so this may break old saves. -Chat = Chat -Chat Button Position = Chat düğmesinin konumu +ChangeMacSaveConfirm = Yeni MAC adresi yaratılsın mı? +ChangeMacSaveWarning = Bazı oyunlar, kayıtlı verileri yüklerken MAC adresini doğrular; dolayısıyla bu, eski kayıtların bozulmasına neden olabilir. +Chat = Sohbet +Chat Button Position = Sohbet düğmesinin konumu Chat Here = Buraya yazın -Chat message = Chat mesajı -Chat Screen Position = Chat ekranının konumu +Chat message = Sohbet mesajı +Chat Screen Position = Sohbet ekranının konumu Disconnected from AdhocServer = Ad hoc sunucu bağlantısı kesildi DNS Error Resolving = DNS hatası teşhis ediliyor Enable built-in PRO Adhoc Server = Yerleşik PRO Ad Hoc Sunucusunu etkinleştir @@ -899,22 +896,22 @@ Enable UPnP = UPnP'yi etkinleştirin (algılamak için birkaç saniye gerekir) EnableQuickChat = Hızlı sohbeti etkinleştirin Enter a new PSP nickname = Yeni bir PSP kullanıcı adı girin Enter Quick Chat 1 = Hızlı sohbet 1'e girin -Enter Quick Chat 2 = Hızlı sohbet 2'ye girin +Enter Quick Chat 2 = Hızlı sohbet 2'e girin Enter Quick Chat 3 = Hızlı sohbet 3'e girin Enter Quick Chat 4 = Hızlı sohbet 4'e girin Enter Quick Chat 5 = Hızlı sohbet 5'e girin Error = Hata -Failed to Bind Localhost IP = Failed to bind localhost IP -Failed to Bind Port = Failed to bind port +Failed to Bind Localhost IP = Yerel ana makine IP'si bağlanamadı +Failed to Bind Port = Port bağlanamadı Failed to connect to Adhoc Server = Ad hoc sunucusuna bağlanılamadı Forced First Connect = Zorunlu ilk bağlantı (daha hızlı bağlantı) GM: Data from Unknown Port = GM: Bilinmeyen Porttan Veri -Hostname = Hostname -Invalid IP or hostname = Geçersiz IP veya host adı +Hostname = Ana makine adı +Invalid IP or hostname = Geçersiz IP veya ana makine adı Minimum Timeout = En düşük zaman aşımı (ms cinsinden geçersiz kılma, 0 = varsayılan) Misc = Çeşitli (varsayılan = PSP uyumluluğu) -Network connected = Network connected -Network initialized = Network Switch +Network connected = Ağ bağlandı +Network initialized = Ağ anahtarı Please change your Port Offset = Lütfen Port Offset'i değiştirin Port offset = Port offset(0 = PSP uyumluluğu) Open PPSSPP Multiplayer Wiki Page = PPSSPP Ad-Hoc Wiki Sayfası @@ -925,34 +922,34 @@ Quick Chat 3 = Hızlı sohbet 3 Quick Chat 4 = Hızlı sohbet 4 Quick Chat 5 = Hızlı sohbet 5 QuickChat = Hızlı sohbet -Randomize = Randomize +Randomize = Rastgeleleştir Send = Gönder -Send Discord Presence information = Discord "Rich Presence" bilgisi gönder +Send Discord Presence information = Discord'a Rich Presence bilgisi gönder Unable to find UPnP device = UPnP cihazı bulunamıyor UPnP (port-forwarding) = UPnP (port yönlendirme) UPnP need to be reinitialized = UPnP'nin yeniden başlatılması gerekiyor UPnP use original port = UPnP orijinal portu kullan (etkin = PSP uyumluluğu) -UseOriginalPort Tip = May not work for all devices or games, see wiki. +UseOriginalPort Tip = Tüm cihazlar veya oyunlarda çalışmayabilir, wiki'ye bakın. Validating address... = Adres doğrulanıyor... WLAN Channel = WLAN Kanalı You're in Offline Mode, go to lobby or online hall = Çevrimdışı moddasınız, lobiye veya çevrimiçi salona gidin [PSPSettings] -Auto = Auto -Chinese (simplified) = Chinese (simplified) -Chinese (traditional) = Chinese (traditional) -Dutch = Dutch -English = English -French = French -Game language = Game language -German = German -Italian = Italian -Japanese = Japanese -Korean = Korean -Games often don't support all languages = Games often don't support all languages -Portuguese = Portuguese -Russian = Russian -Spanish = Spanish +Auto = Otomatik +Chinese (simplified) = Çince (basitleştirilmiş) +Chinese (traditional) = Çince (geleneksel) +Dutch = Felemenkçe +English = İngilizce +French = Fransızca +Game language = Oyun dili +German = Almanca +Italian = İtalyanca +Japanese = Japonca +Korean = Korece +Games often don't support all languages = Oyunlar genellikle tüm dilleri desteklemez +Portuguese = Portekizce +Russian = Rusça +Spanish = İspanyolca [Pause] Cheats = Hileler @@ -967,7 +964,7 @@ Save State = Kaydet Settings = Ayarlar Switch UMD = UMD değiştir Undo last load = Son yüklemeyi geri al -Undo last save = Son kaydetmeyi geri al +Undo last save = Son kaydı geri al [PostShaders] (duplicated setting, previous slider will be used) = (yinelenen ayar, önceki kaydırıcı kullanılacaktır) 4xHqGLSL = 4xHQ pixel art upscaler @@ -975,37 +972,37 @@ Undo last save = Son kaydetmeyi geri al 5xBR-lv2 = 5xBR-lv2 pixel art upscaler AAColor = AA-Color Amount = Miktar -Animation speed (0 -> disable) = Animation speed (0 -> disable) +Animation speed (0 -> disable) = Animasyon hızı (0 -> devre dışı) Aspect = Aspect Black border = Siyah çerçeve Bloom = Bloom -BloomNoBlur = Bloom (no blur) +BloomNoBlur = Bloom (bulanıklık yok) Brightness = Parlaklık Cartoon = Çizgi film -CatmullRom = Bicubic (Catmull-Rom) Upscaler -ColorCorrection = Color correction -ColorPreservation = Color preservation +CatmullRom = Bikübik (Catmull-Rom) Upscaler +ColorCorrection = Renk düzeltme +ColorPreservation = Renk koruma Contrast = Karşıtlık CRT = CRT tarama çizgileri FakeReflections = FakeReflections FXAA = FXAA Kenar Yumuşatma Gamma = Gamma -GreenLevel = Green level +GreenLevel = Yeşil seviyesi Intensity = Yoğunluk -LCDPersistence = LCD Persistence +LCDPersistence = LCD Kalıcılığı MitchellNetravali = Bicubic (Mitchell-Netravali) Upscaler Natural = Doğal Renkler NaturalA = Doğal Renkler (bulanıklık yok) Off = Kapalı Power = Güç PSPColor = PSP rengi -RedBlue = Red/Blue glasses +RedBlue = Kırmızı/Mavi gözlük Saturation = Doygunluk Scanlines = Tarama Çizgileri (CRT) Sharpen = Keskinleştir -SideBySide = Side by side (SBS) +SideBySide = Yan yana (SBS) SSAA(Gauss) = Süper örneklemeli Kenar Yumuşatma (Gauss) -Strength = Strength +Strength = Kuvvet Tex4xBRZ = 4xBRZ TexMMPX = MMPX UpscaleBicubic = UpscaleBicubic @@ -1014,9 +1011,9 @@ VideoSmoothingAA = VideoSmoothingAA Vignette = Vinyet [PSPCredits] -all the forum mods = Bütün forum modlarına +all the forum mods = Bütün forum moderatörlerine build server = build server -Buy Gold = Altın Sürümü alın +Buy Gold = Gold Sürümü alın check = Ayrıca etraftaki en iyi Wii/GC emülatörü olan Dolphin'e göz atın: CheckOutPPSSPP = PPSSPP'ye göz atın: https://www.ppsspp.org/ contributors = Yardımcılar: @@ -1043,13 +1040,13 @@ tools = Kullanılan Ücretsiz Araçlar: # Add translators or contributors who translated PPSSPP into your language here. # Add translators1-6 for up to 6 lines of translator credits. # Leave extra lines blank. 4 contributors per line seems to look best. -translators1 = Gravityy -translators2 = mygizli04 -translators3 = Kyria Crown +translators1 = misty rosetta +translators2 = Gravityy +translators3 = mygizli04 translators4 = translators5 = translators6 = -Twitter @PPSSPP_emu = Twitter +Twitter @PPSSPP_emu = X @PPSSPP_emu website = PPSSPP.org written = Hız ve Taşınabilirlik için C++ ile Yazıldı @@ -1070,7 +1067,7 @@ RemoteISOWinFirewall = UYARI: Windows Güvenlik Duvarı paylaşımı engelliyor Settings = Ayarlar Share Games (Server) = Oyunları paylaş (sunucu) Share on PPSSPP startup = PPSSPP açılışında paylaşın -Show Remote tab on main screen = Show Remote tab on main screen +Show Remote tab on main screen = Uzak sekmesini ana ekranda göster Stop Sharing = Paylaşmayı durdur Stopping.. = Durduruluyor... @@ -1138,6 +1135,7 @@ Failed to save state = Durum kaydedilemedi. fixed = Hız: Alternatif GLToolsWarning = UYARI: GLTools algılandı, problemlere sebep olabilir. In menu = Menüde +Load savestate failed = Durum kaydı yüklenemedi. Loaded State = Durum yüklendi. Loaded. Game may refuse to save over different savedata. = Yüklendi. Oyun belki farklı verilerin üzerine kaydetmeyi reddedebilir. Loaded. Game may refuse to save over newer savedata. = Yüklendi. Oyun belki yeni verilerin üzerine kaydetmeyi reddedebilir. @@ -1149,6 +1147,7 @@ Playing = Oynatılıyor... PressESC = PPSSPP menüsünü açmak için ESC'ye basın. replaceTextures_false = Dokular artık değiştirilmiyor. replaceTextures_true = Doku değiştirme etkinleştirildi. +Save State Failed = Durum kaydı yapılamadı! Saved State = Durum kaydedildi. saveNewTextures_false = Doku kaydetme devre dışı bırakıldı. saveNewTextures_true = Dokular şimdi cihazınıza kaydedilecek. @@ -1163,7 +1162,7 @@ Filter = Filtre Filtering settings by '%1' = Ayarlar '%1''e göre filtreleniyor Find settings = Ayarları ara No settings matched '%1' = '%1' ile eşleşen ayar yok -Search term = Search term +Search term = Arama terimi [Store] Connection Error = Bağlantı hatası @@ -1189,8 +1188,8 @@ Board = Board Build Config = Yapı konfigürasyonu Build Configuration = Yapı konfigürasyonu Built by = Tarafından yapıldı -Compressed texture formats = Compressed texture formats -Core Context = Core context +Compressed texture formats = Sıkıştırılmış doku biçimleri +Core Context = Temel bağlam Cores = Çekirdekler CPU Extensions = CPU uzantıları CPU Information = CPU bilgisi @@ -1198,7 +1197,7 @@ CPU Name = Ad D3DCompiler Version = D3DCompiler sürümü Debug = Hata Ayıklama Debugger Present = Hata ayıklayıcı var -Depth buffer format = Depth buffer format +Depth buffer format = Derinlik tampon formatı Device Info = Cihaz bilgisi Directories = Dizinler Display Color Formats = Renk Biçimlerini Görüntüle @@ -1210,11 +1209,11 @@ EGL Extensions = EGL eklentileri Frames per buffer = Tampon başına çerçeveler GPU Flags = GPU Flags GPU Information = GPU bilgisi -High precision float range = High precision float range -High precision int range = High precision int range -Icon cache = Icon cache -Instance = Instance -JIT available = JIT available +High precision float range = Yüksek duyarlılıklı float aralığı +High precision int range = Yüksek duyarlılıklı int aralığı +Icon cache = Simge önbelleği +Instance = Örnek +JIT available = JIT mümkün Lang/Region = Dil/Bölge Memory Page Size = Bellek sayfa boyutu Native resolution = Yerel çözünürlük @@ -1226,14 +1225,14 @@ OpenGL Extensions = OpenGL eklentileri Optimal frames per buffer = Optimum tampon başına çerçeveler Optimal sample rate = Optimum örnekleme hızı OS Information = İşletim sistemi bilgisi -Pixel resolution = Pixel resolution +Pixel resolution = Piksel çözünürlüğü PPSSPP build = PPSSPP derlemesi -Present modes = Present modes +Present modes = Mevcut modlar Refresh rate = Yenileme hızı Release = Release RW/RX exclusive = RW/RX'e özel Sample rate = Örnekleme hızı -Screen notch insets = Screen notch insets +Screen notch insets = Ekran çentiği ekleri Shading Language = Gölgelendirme dili Storage = Depolama Sustained perf mode = Sürekli performans modu @@ -1241,9 +1240,9 @@ System Information = Sistem bilgisi System Name = Ad System Version = Sistem sürümü Threads = İzlekler -UI resolution = UI resolution +UI resolution = Arayüz çözünürlüğü Vendor = Üretici -Vendor (detected) = Üretici (tespit edildi) +Vendor (detected) = Üretici (tespit edilen) Version Information = Sürüm bilgisi Vulkan Extensions = Vulkan eklentileri Vulkan Features = Vulkan özellikleri @@ -1262,14 +1261,13 @@ Color Saturation = Renk Doygunluğu Color Tint = Renk Tonu CPU Core = İşlemci Çekirdeği Dynarec/JIT (recommended) = Dynarec/JIT (tavsiye edilen) -Enable plugins = Enable plugins Error: load undo state is from a different game = Hata: yükleme geri alma durumu farklı bir oyundan Failed to load state for load undo. Error in the file system. = Yüklemeyi geri alma durumu yüklenemedi. Dosya sisteminde hata. Floating symbols = Kayan simgeler -Game crashed = Game crashed -JIT using IR = JIT using IR +Game crashed = Oyun çöktü +JIT using IR = IR kullanarak JIT Language = Dil -Loaded plugin: %1 = Loaded plugin: %1 +Loaded plugin: %1 = Yüklenen uzantı: %1 Memory Stick folder = Hafıza Kartı klasörü Memory Stick size = Hafıza Kartı boyutu Change Nickname = Kullanıcı adını değiştir @@ -1301,7 +1299,7 @@ Games list settings = Oyun listesi ayarları General = Genel Grid icon size = Izgara simge boyutu Help the PPSSPP team = PPSSPP takımına yardım et -Host (bugs, less lag) = Host (buglu, daha az kasma) +Host (bugs, less lag) = Ana makine (buglu, daha az kasma) Ignore bad memory accesses = Kötü bellek erişimlerini yoksay Increase size = Boyutu arttır Interpreter = Tercüman @@ -1317,9 +1315,8 @@ No animation = animasyon yok Not a PSP game = Bir PSP oyunu değil Off = Kapalı Oldest Save = En eski kayıt -Only JPG and PNG images are supported = Only JPG and PNG images are supported +Only JPG and PNG images are supported = Sadece JPG ve PNG resimleri desteklenir Path does not exist! = Yol mevcut değil! -Plugins = Plugins PSP Memory Stick = PSP Hafıza Kartı PSP Model = PSP modeli PSP Settings = PSP ayarları @@ -1328,7 +1325,7 @@ PSP-2000/3000 = PSP-2000/3000 Recent games = En son oyunlar Record Audio = Sesi kaydet Record Display = Görüntüyü kaydet -Recording = Recording +Recording = Kaydediliyor Reset Recording on Save/Load State = Kaydet/Yükle durumunda kaydı sıfırla Restore Default Settings = Varsayılan ayarları yükle RetroAchievements = RetroAchievements @@ -1338,13 +1335,13 @@ Save path in My Documents = Dosyaları "Belgeler"'e kaydet Savestate Slot = Durum kaydı yeri Savestate slot backups = Durum kaydı slot yedekleri Screenshots as PNG = Ekran görüntülerini PNG olarak kaydet -Set Memory Stick folder = Set Memory Stick folder +Set Memory Stick folder = Hafıza Kartı klasörünü seç Set UI background... = Arayüz arkaplanı ayarla... Show ID = ID'yi göster Show Memory Stick folder = Hafıza Kartı klasörünü göster Show region flag = Bölge bayrağını göster Simulate UMD delays = UMD gecikmelerini simule et -Simulate UMD slow reading speed = Simulate UMD slow reading speed +Simulate UMD slow reading speed = UMD yavaş okuma hızını simule et Slot 1 = Slot 1 Slot 2 = Slot 2 Slot 3 = Slot 3 @@ -1354,10 +1351,10 @@ Storage full = Depolama dolu Sustained performance mode = Sürekli performans modu Theme = Tema Time Format = Zaman biçimi -Transparent UI background = Transparent UI background -UI = Kullanıcı arayüzü -UI background animation = UI arka plan animasyonu -UI Sound = UI sesi +Transparent UI background = Şeffaf arayüz arkaplanı +UI = Arayüz +UI background animation = Arayüz arkaplan animasyonu +UI Sound = Arayüz sesleri undo %c = %c 'yi yedekle USB = USB Use Lossless Video Codec (FFV1) = Kayıpsız video codec'i kullan (FFV1) @@ -1372,13 +1369,13 @@ Waves = Dalgalar YYYYMMDD = YYYYAAGG [TextureShaders] -Off = Off +Off = Kapalı TexMMPX = TexMMPX Tex2xBRZ = Tex2xBRZ Tex4xBRZ = Tex4xBRZ [Themes] -Dark = Dark +Dark = Koyu Default = Varsayılan [UI Elements] @@ -1390,32 +1387,30 @@ Default = Varsayılan %1 text field = %1 metin alanı Choices: = Seçenekler: List: = Liste: -Progress: %1% = Progress: %1% +Progress: %1% = İlerleme: %1% Screen representation = Ekran gösterimi [Upgrade] Details = Detaylar Dismiss = Reddet Download = İndir -New version of PPSSPP available = PPSSPP'nin yeni versiyonu mevcut +New version of PPSSPP available = PPSSPP'nin yeni sürümü mevcut [VR] -% of native FoV = % of native FoV -6DoF movement = 6DoF movement -Camera type = Camera type -Distance to 2D menus and scenes = Distance to 2D menus and scenes -Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled -Experts only = Experts only -Field of view scale = Field of view scale -Force 72Hz update = Force 72Hz update -Game camera rotation step per frame = Game camera rotation step per frame -Game camera uses rotation smoothing = Game camera uses rotation smoothing -Heads-up display detection = Heads-up display detection -Heads-up display scale = Heads-up display scale -Manual switching between flat screen and VR using SCREEN key = Manual switching between flat screen and VR using SCREEN key -Map controller movements to keys = Map controller movements to keys -Map HMD rotations on keys instead of VR camera = Map HMD rotations on keys instead of VR camera -Motion needed to generate action = Motion needed to generate action -Stereoscopic vision (Experimental) = Stereoscopic vision (Experimental) -Virtual reality = Virtual reality -VR camera = VR camera -VR controllers = VR controllers +6DoF movement = 6DoF hareketi +Camera type = Kamera türü +Distance to 2D menus and scenes = 2D menülere ve sahnelere olan mesafe +Distance to 3D scenes when VR disabled = VR devre dışı bırakıldığında 3D sahnelere olan mesafe +Experts only = Yalnızca uzmanlar +Force 72Hz update = 72Hz güncellemeyi zorla +Game camera rotation step per frame = Kare başına oyun kamerası döndürme adımı +Game camera uses rotation smoothing = Oyun kamerası dönüş yumuşatma özelliğini kullanır +Heads-up display detection = HUD algılama +Heads-up display scale = HUD ölçeği +Manual switching between flat screen and VR using SCREEN key = SCREEN tuşunu kullanarak düz ekran ve VR arasında manuel geçiş +Map controller movements to keys = Kontrolcü hareketlerini tuşlarla eşleyin +Map HMD rotations on keys instead of VR camera = HMD rotasyonlarını VR kamera yerine tuşlara eşleyin +Motion needed to generate action = Aksiyon oluşturmak için hareket gerekli +Stereoscopic vision (Experimental) = Stereoskopik görüş (Deneysel) +Virtual reality = Sanal gerçeklik +VR camera = VR kamera +VR controllers = VR kontrolcüleri From b25a99653ce39b78a2e6fbd60ff9cab586ad3538 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Mon, 20 May 2024 09:46:24 +0200 Subject: [PATCH 258/719] Update tr_TR.ini with some new untranslated lines --- Tools/langtool/Cargo.lock | 8 ++++---- assets/lang/tr_TR.ini | 10 ++++++++++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Tools/langtool/Cargo.lock b/Tools/langtool/Cargo.lock index b1e6e644d5..577aa6d669 100644 --- a/Tools/langtool/Cargo.lock +++ b/Tools/langtool/Cargo.lock @@ -118,9 +118,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.82" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b" +checksum = "0b33eb56c327dec362a9e55b3ad14f9d2f0904fb5a5b03b513ab5465399e9f43" dependencies = [ "unicode-ident", ] @@ -142,9 +142,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "syn" -version = "2.0.63" +version = "2.0.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf5be731623ca1a1fb7d8be6f261a3be6d3e2337b8a1f97be944d020c8fcb704" +checksum = "d2863d96a84c6439701d7a38f9de935ec562c8832cc55d1dde0f513b52fad106" dependencies = [ "proc-macro2", "quote", diff --git a/assets/lang/tr_TR.ini b/assets/lang/tr_TR.ini index c5811404c3..b85263108c 100644 --- a/assets/lang/tr_TR.ini +++ b/assets/lang/tr_TR.ini @@ -61,6 +61,7 @@ Unsupported achievements = Desteklenmeyen başarımlar Alternate speed volume = Alternatif hız hacmi Audio backend = Ses alttabanı (Yeniden başlatma gerekir) Audio Error = Ses Hatası +Audio file format not supported. Must be WAV or MP3. = Audio file format not supported. Must be WAV or MP3. Audio file format not supported. Must be WAV. = Ses dosya biçimi desteklenmiyor. WAV olmalı. AudioBufferingForBluetooth = Bluetooth uyumlu arabellek (daha yavaş) Auto = Otomatik @@ -309,6 +310,8 @@ Fragment = Parça Frame timing = Kare zamanlama Framedump tests = Framedump testleri Frame Profiler = Frame profilleyici +GPI switch %1 = GPI switch %1 +GPI/GPO switches/LEDs = GPI/GPO switches/LEDs GPU Allocator Viewer = GPU Ayırıcı Görüntüleyici GPU Driver Test = GPU sürücü testi GPU log profiler = GPU günlük profilleyici @@ -335,6 +338,7 @@ Run CPU Tests = İşlemci testlerini başlat Save new textures = Yeni dokuları kaydet Shader Viewer = Gölgelendirici Görüntüleyici Show Developer Menu = Geliştirici Menüsünü Göster +Show GPO LEDs = Show GPO LEDs Show on-screen messages = Ekran üzerinde mesajları göster Stats = İstatistikler System Information = Sistem bilgisi @@ -636,6 +640,7 @@ LowCurves Tip = Sadece bazı oyunlar tarafından kullanılır, eğrilerin pürü Lower resolution for effects (reduces artifacts) = Efektler için daha az çözünürlük (sorunları azaltır) Manual Scaling = El ile ölçekleme Medium = Orta +Mirror camera image = Mirror camera image Mode = Mod Must Restart = Bu değişikliğin uygulanması için PPSSPP yeniden başlatılmalıdır. Native device resolution = Yerel aygıt çözünürlüğü @@ -643,6 +648,7 @@ Nearest = En yakın No (default) = Hayır (varsayılan) No buffer = Arabellek/tampon bellek yok Render all frames = Tüm kareleri işle +Same as Rendering resolution = Same as Rendering resolution Show Battery % = Pil Yüzdesini Göster Show Speed = Hızı Göster Skip = Atla @@ -1261,6 +1267,7 @@ Color Saturation = Renk Doygunluğu Color Tint = Renk Tonu CPU Core = İşlemci Çekirdeği Dynarec/JIT (recommended) = Dynarec/JIT (tavsiye edilen) +Enable plugins = Enable plugins Error: load undo state is from a different game = Hata: yükleme geri alma durumu farklı bir oyundan Failed to load state for load undo. Error in the file system. = Yüklemeyi geri alma durumu yüklenemedi. Dosya sisteminde hata. Floating symbols = Kayan simgeler @@ -1317,6 +1324,7 @@ Off = Kapalı Oldest Save = En eski kayıt Only JPG and PNG images are supported = Sadece JPG ve PNG resimleri desteklenir Path does not exist! = Yol mevcut değil! +Plugins = Plugins PSP Memory Stick = PSP Hafıza Kartı PSP Model = PSP modeli PSP Settings = PSP ayarları @@ -1396,11 +1404,13 @@ Download = İndir New version of PPSSPP available = PPSSPP'nin yeni sürümü mevcut [VR] +% of native FoV = % of native FoV 6DoF movement = 6DoF hareketi Camera type = Kamera türü Distance to 2D menus and scenes = 2D menülere ve sahnelere olan mesafe Distance to 3D scenes when VR disabled = VR devre dışı bırakıldığında 3D sahnelere olan mesafe Experts only = Yalnızca uzmanlar +Field of view scale = Field of view scale Force 72Hz update = 72Hz güncellemeyi zorla Game camera rotation step per frame = Kare başına oyun kamerası döndürme adımı Game camera uses rotation smoothing = Oyun kamerası dönüş yumuşatma özelliğini kullanır From 97e1a23d22a9a7b38db4e2e833aa3acd37a0c5ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Mon, 20 May 2024 09:49:30 +0200 Subject: [PATCH 259/719] Add ku_SO translation (contributed by M. Omer) --- assets/lang/ku_SO.ini | 1430 +++++++++++++++++++++++++++++++++++++++++ assets/langregion.ini | 1 + 2 files changed, 1431 insertions(+) create mode 100644 assets/lang/ku_SO.ini diff --git a/assets/lang/ku_SO.ini b/assets/lang/ku_SO.ini new file mode 100644 index 0000000000..a4641620b5 --- /dev/null +++ b/assets/lang/ku_SO.ini @@ -0,0 +1,1430 @@ +# Thanks for your interest in translating PPSSPP. +# Please note, while translating: +# +# Hash/sharp symbols (#) in this file indicate a comment. Lines that begin without one are +# considered to be a part of the actual translations. +# +# Example 1: &File. This will make it so when you press ALT + F on Windows, it'll open the File menu. +# Example 2: Homebrew && Demos. This would show one real ampersand in the menu. +# I've Added a font named Rabar_014 because my language font looks better with it. +# وەرگێڕان کراوە لەلایەن محمد عمر حسێن، [ناوی بەڕێزت] +# تکایە هەر بەڕێزێک لەدوای من وەرگێڕانی کرد تەنها بە بەکارهێنانی بەرنامەی وەرگێران نەیکات +# بەڵکو ڕەچاوی بەکارهێنانی ڕۆژانە بکات بۆ بەکارهێنەر + +[Achievements] +%1 achievements, %2 points = %1 achievements, %2 points +%1: Attempt started = %1: Attempt started +%1: Attempt failed = %1: Attempt failed +Account = Account +Achievement sound volume = ئاستی دەنگی کردنەوەی دەستکەوت +Achievement unlocked = Achievement unlocked +Achievement progress = Achievement progress +Achievements = Achievements +Achievements enabled = Achievements enabled +Achievements are disabled = Achievements are disabled +Achievements with active challenges = Achievements with active challenges +Allow Save State in Hardcore Mode (but not Load State) = Allow Save State in Hardcore Mode (but not Load State) +Almost completed achievements = Almost completed achievements +Can't log in to RetroAchievements right now = Can't log in to RetroAchievements right now +Challenge indicator = Challenge indicator +Contacting RetroAchievements server... = Contacting RetroAchievements server... +Customize = Customize +Earned = You have unlocked %1 of %2 achievements, and earned %3 of %4 points +Encore Mode = Encore Mode +Failed logging in to RetroAchievements = Failed logging in to RetroAchievements +Failed to connect to RetroAchievements. Achievements will not unlock. = Failed to connect to RetroAchievements. Achievements will not unlock. +Failed to identify game. Achievements will not unlock. = Failed to identify game. Achievements will not unlock. +Hardcore Mode (no savestates) = Hardcore Mode (no savestates) +Hardcore Mode = Hardcore Mode +How to use RetroAchievements = How to use RetroAchievements +In Encore mode - listings may be wrong below = In Encore mode - listings may be wrong below +Leaderboard attempt started or failed = Leaderboard attempt started or failed +Leaderboard result submitted = Leaderboard result submitted +Leaderboard score submission = Leaderboard score submission +Leaderboard submission is enabled = Leaderboard submission is enabled +Leaderboards = Leaderboards +Leaderboard tracker = Leaderboard tracker +Links = Links +Locked achievements = دەستکەوتە قفڵ کراوەکان +Log bad memory accesses = Log bad memory accesses +Mastered %1 = Mastered %1 +Around me = Around me +Notifications = ئاگادارکردنەوەکان +Recently unlocked achievements = دەستکەوتە تازە کراوەکان +Reconnected to RetroAchievements. = RetroAchievements دووبارە پەیوەست بوویتەوە بە +Register on www.retroachievements.org = www.retroachievements.org خۆت تۆماربکە لە +RetroAchievements are not available for this game = بەردەست نییە بۆ ئەم یاریە RetroAchievements +RetroAchievements website = RetroAchievements وێبسایتی +Rich Presence = Rich Presence +Save state loaded without achievement data = Save state loaded without achievement data +Save states not available in Hardcore Mode = Save states not available in Hardcore Mode +Sound Effects = ئیفێکتەکانی دەنگ +Statistics = Statistics +Submitted %1 for %2 = Submitted %1 for %2 +Syncing achievements data... = Syncing achievements data... +Test Mode = Test Mode +This feature is not available in Hardcore Mode = This feature is not available in Hardcore Mode +This game has no achievements = ئەم یاریە دەستکەوتی نییە +Top players = Top players +Unlocked achievements = دەستکەوتە کراوەکان +Unsupported achievements = دەستکەوتە پاڵپشت نەکراوەکان +Unofficial achievements = دەستکەوتە نافەرمیەکان + +[Audio] +Alternate speed volume = خێرایی دەنگی جێگرەوە +Audio backend = باکئێندی دەنگ (پێویستە کە ئاپەکە دووبارە بکرێتەوە) +Audio file format not supported. Must be WAV. = بێت WAV شێوازی دەنگەکە پاڵپشتی نەکراوە، مەرجە کە شێوازی +Audio Error = هەڵەی دەنگ ڕوویدا +AudioBufferingForBluetooth = (خاوتر) Bluetooth بەفەرێک باشبێت بۆ +Auto = Auto +Device = ئامێر +Disabled = لەکار خراوە +DSound (compatible) = DSound (گونجاو) +Enable Sound = بەکارکردنی دەنگ +Global volume = دەنگی گشتی +Microphone = مایکرۆفۆن +Microphone Device = ئامێری مایکرۆفۆن +Mute = بێدەنگ کردن +Reverb volume = ئاستی دەنگی گشت ئاڕاستە +Use new audio devices automatically = بەکارهێنانی ئامێری دەنگی تازە بە شێوەیەکی ئۆتۆماتیکی +Use global volume = بەکارهێنانی دەنگی گشتی +WASAPI (fast) = WASAPI (خێرا) + +[Controls] +Analog Binding = بەستنەوەی ئەنالۆگ +Analog Limiter = سنوورداری ئەنالۆگ +Analog Settings = ڕێکخستنەکانی ئەنالۆگ +Analog Stick = Analog stick +Analog Style = شێوازی ئانالۆگ +Analog trigger threshold = ئاستی کارپێکردنی ئەنالۆگ +AnalogLimiter Tip = When the analog limiter button is pressed +Auto = Auto +Auto-centering analog stick = هێنانە ناوەڕاستی ستیکی ئەنالۆگ بە شێوەی ئۆتۆماتیکی +Auto-hide buttons after delay = شاردنەوەی دوگمەکان بە شێوەی ئۆتۆماتیکی پاش +Auto-rotation speed = خێرایی خولانەوەی ئۆتۆماتیکی +Binds = بەستنەوەکان +Button Binding = بەستنەوەی دوگمەکان +Button Opacity = دیاربوونی دوگمەکان +Button style = شێوازی دوگمەکان +Calibrate Analog Stick = قەبارەدانان بۆ ستیکی ئەنالۆگ +Calibrate = Calibrate +Calibrated = Calibrated +Calibration = Calibration +Circular deadzone = Circular deadzone +Circular stick input = Circular stick input +Classic = کلاسیک +Confine Mouse = Trap mouse within window/display area +Control Mapping = Control mapping +Custom Key Setting = Custom Key Setting +Customize = Customize +Customize Touch Controls = Edit touch control layout... +D-PAD = دوگمەکان +Deadzone radius = Deadzone radius +Disable D-Pad diagonals (4-way touch) = Disable D-Pad diagonals (4-way touch) +Disable diagonal input = Disable diagonal input +Double tap = Double tap +Enable analog stick gesture = Enable analog stick gesture +Enable gesture control = Enable gesture control +Enable standard shortcut keys = Enable standard shortcut keys +frames = frames +Gesture = Gesture +Gesture mapping = Gesture mapping +Glowing borders = Glowing borders +HapticFeedback = Haptic feedback (vibration) +Hide touch analog stick background circle = Hide touch analog stick background circle +Icon = Icon +Ignore gamepads when not focused = Ignore gamepads when not focused +Ignore Windows Key = Disable Windows key +Invert Axes = Invert axes +Invert Tilt along X axis = Invert tilt along X axis +Invert Tilt along Y axis = Invert tilt along Y axis +Keep this button pressed when right analog is pressed = Keep this button pressed when right analog is pressed +Keyboard = Keyboard control settings +L/R Trigger Buttons = L/R trigger buttons +Landscape = Landscape +Landscape Auto = Landscape auto +Landscape Reversed = Landscape reversed +Low end radius = Low end radius +Mouse = Mouse settings +Mouse sensitivity = Mouse sensitivity +Mouse smoothing = Mouse smoothing +Mouse wheel button-release delay = Mouse wheel button-release delay +MouseControl Tip = You can now map mouse in control mapping screen by pressing the 'M' icon. +None (Disabled) = None (disabled) +Off = Off +OnScreen = On-screen touch controls +Portrait = Portrait +Portrait Reversed = Portrait reversed +PSP Action Buttons = PSP action buttons +Rapid fire interval = Rapid fire interval +Raw input = Raw input +Reset to defaults = Reset to defaults +Screen Rotation = Screen rotation +Sensitivity = Sensitivity +Sensitivity (scale) = Sensitivity (scale) +Shape = Shape +Show Touch Pause Menu Button = Show pause menu button +Sticky D-Pad (easier sweeping movements) = Sticky D-Pad (easier sweeping movements) +Swipe = Swipe +Swipe sensitivity = Swipe sensitivity +Swipe smoothing = Swipe smoothing +Thin borders = Thin borders +Tilt control setup = Tilt control setup +Tilt Input Type = Tilt input type +Tilt Sensitivity along X axis = Tilt sensitivity along X axis +Tilt Sensitivity along Y axis = Tilt sensitivity along Y axis +To Calibrate = Hold device at your preferred angle and press "Calibrate". +Toggle mode = Toggle mode +Repeat mode = Repeat mode +Touch Control Visibility = Touch control visibility +Use custom right analog = Use custom right analog +Use Mouse Control = Use mouse control +Visibility = Visibility +Visible = Visible +X = X +Y = Y + +[CwCheats] +Cheats = Cheats +Edit Cheat File = Edit cheat file +Import Cheats = Import from cheat.db +Import from %s = Import from %s +Refresh interval = Refresh interval + +[DesktopUI] +# If your language does not show well with the default font, you can use Font to specify a different one. +# Just add it to your language's ini file and uncomment it (remove the # by Font). +#Font = Trebuchet MS +Font = Rabar_014 +About PPSSPP... = PPSSPP زانیاری دەربارەی +Auto = ئۆتۆماتیکی +Auto Max Quality = بەرزترین کوالیتی ئۆتۆماتیکی +Backend = نیشاندانەوەی باکئێند(بەرنامەکە ریستارت دەکاتەوە) +Bicubic = &Bicubic +Break = شکاندنی یاری +Break on Load = شکاندنی یاری لەکاتی لۆو کردن +Buy Gold = PPSSPP کڕینی گۆلد +Control Mapping... = بەستنەوەی کۆنترۆڵەکان +Copy PSP memory base address = Copy PSP memory base &address +Debugging = &Debug +Deposterize = &Deposterize +Direct3D9 = Direct3D &9 +Direct3D11 = Direct3D &11 +Disassembly = &Disassembly... +Discord = Discord +Display Layout && Effects = شێوازی پیشاندان و ئیفێکتەکان +Display Rotation = خولاندنەوەی شاشە +Dump Next Frame to Log = D&ump next frame to log +Emulation = &Emulation +Enable Cheats = cheats بەکار‌ێنانی +Enable Sound = بەکارکردنی دەنگ +Exit = دەرچوون +Extract File... = گواستنەوەی فایل... +File = فایل +Frame Skipping = Frame پەڕاندنی +Frame Skipping Type = Frame شیوازی پەڕاندنی +Fullscreen = Fu&llscreen +Game Settings = سێتینگی یاریەکە +GE Debugger... = GE debugge&r... +GitHub = Git&Hub +Hardware Transform = &Hardware transform +Help = یارمەتی +Hybrid = &Hybrid +Hybrid + Bicubic = H&ybrid + bicubic +Ignore Illegal Reads/Writes = &Ignore illegal reads/writes +Ignore Windows Key = Ignore Windows key +Keep PPSSPP On Top = &Keep PPSSPP on top +Landscape = ئاسۆیی +Landscape reversed = ئاسۆیی پێچەوانە +Language... = زمان... +Linear = &Linear +Load = &Load... +Load .sym File... = Lo&ad .sym file... +Load Map File... = Load &Map file... +Load State = L&oad state +Load State File... = &Load state file... +Log Console = &Log console +Memory View... = بینینی میمۆری +More Settings... = سێتینگی زیاتر... +Nearest = نزیکترین +Restart Graphics = دووبارە ئیش پێ کردنەوەی گرافیکەکان +Skip Buffer Effects = &Skip buffer effects +Off = کوژاندنەوە +Open Chat = کردنەوەی چات +Open Directory... = Open &directory... +Open from MS:/PSP/GAME... = O&pen from MS:/PSP/GAME... +Open Memory Stick = Open &Memory Stick +Open New Instance = Open new instance +OpenGL = &OpenGL +Pause = &Pause +Pause When Not Focused = &Pause when not focused +Portrait = Portrait +Portrait reversed = Portrait reversed +PPSSPP Forums = PPSSPP &forums +Recent = &Recent +Record = &Record +Record Audio = Record &audio +Record Display = Record &display +Rendering Mode = Rendering m&ode +Rendering Resolution = &Rendering resolution +Reset = R&eset +Reset Symbol Table = Reset s&ymbol table +Run = &Run +Save .sym File... = Sav&e .sym file... +Save Map File... = &Save map file... +Save State = S&ave state +Save State File... = &Save state file... +Savestate Slot = Saves&tate slot +Screen Scaling Filter = Scr&een scaling filter +Show Debug Statistics = Show debu&g statistics +Show FPS Counter = Show &FPS counter +Skip Number of Frames = Skip number of frames +Skip Percent of FPS = Skip percent of FPS +Smart 2D texture filtering = Smart 2D texture filtering +Stop = &Stop +Switch UMD = Switch UMD +Take Screenshot = &Take screenshot +Texture Filtering = Te&xture filtering +Texture Scaling = &Texture scaling +Use Lossless Video Codec (FFV1) = &Use lossless video codec (FFV1) +Use output buffer for video = Use output buffer for video +VSync = VS&ync +Vulkan = Vulkan +Window Size = &Window size +www.ppsspp.org = Visit www.&ppsspp.org +xBRZ = &xBRZ + +[Developer] +Allocator Viewer = Allocator viewer (Vulkan) +Allow remote debugger = Allow remote debugger +Audio Debug = Audio Debug +Backspace = Backspace +Block address = Block address +By Address = By address +Control Debug = Control Debug +Copy savestates to memstick root = Copy save states to Memory Stick root +Create frame dump = Create frame dump +Create/Open textures.ini file for current game = Create/Open textures.ini file for current game +Current = Current +Debug overlay = Debug overlay +Debug stats = Debug stats +Dev Tools = Development tools +DevMenu = DevMenu +Disabled JIT functionality = Disabled JIT functionality +Draw Frametimes Graph = Draw frametimes graph +Dump Decrypted Eboot = Dump decrypted EBOOT.BIN on game boot +Dump next frame to log = Dump next frame to log +Enable driver bug workarounds = Enable driver bug workarounds +Enable Logging = Enable debug logging +Enter address = Enter address +Fast-forward mode = Fast-forward mode +Fragment = Fragment +FPU = FPU +Framedump tests = Framedump tests +Frame Profiler = Frame profiler +Frame timing = Frame timing +GPU Allocator Viewer = GPU Allocator Viewer +GPU Driver Test = GPU driver test +GPU Profile = GPU profile +GPU log profiler = GPU log profiler +Jit Compare = JIT compare +JIT debug tools = JIT debug tools +Log Dropped Frame Statistics = Log dropped frame statistics +Log Level = Log level +Log View = Log view +Logging Channels = Logging channels +Multi-threaded rendering = Multi-threaded rendering +Next = Next +No block = No block +Off = Off +Prev = Previous +Random = Random +Replace textures = Replace textures +Reset = Reset +Reset limited logging = Reset limited logging +RestoreDefaultSettings = Restore these settings back to their defaults?\nYou can't undo this.\nPlease restart PPSSPP after restoring settings. +RestoreGameDefaultSettings = Are you sure you want to restore the game-specific settings\nback to the PPSSPP defaults? +Resume = بەردەوام بوون +Run CPU Tests = تاقیکردنەوەی سی پی یو ئەنجام بدە +Save new textures = Save new textures +Shader Viewer = Shader viewer +Show Developer Menu = Show developer menu +Show on-screen messages = Show on-screen messages +Stats = Stats +System Information = System information +Texture ini file created = Texture ini file created +Texture Replacement = Texture replacement +Toggle Freeze = Toggle freeze +Touchscreen Test = Touchscreen test +Ubershaders = Ubershaders +Vertex = Vertex +VFPU = VFPU + +[Dialog] +%d ms = %d ms +%d seconds = %d seconds +* PSP res = * PSP res +Active = چالاک +Back = گەڕانەوە +Bottom Center = خوارەوە ناوەڕاست +Bottom Left = خوارەوە چەپ +Bottom Right = خوارەوە ڕاست +Cancel = هەڵوەشاندنەوە +Center = ناوەڕاست +Center Left = ناوەڕاست چەپ +Center Right = لە ناوەڕاستدا ڕاست +Channel: = کەناڵ: +Changing this setting requires PPSSPP to restart. = PPSSPP گۆڕینی ئەم ڕێکخستنە پێویستی بە هەیە کە دووبارە دەستپێبکاتەوە. +Choose PPSSPP save folder = هەڵبژێرە PPSSPP فۆڵدەری خەزن کردنی +Confirm Overwrite = دەتەوێت زانیاریەکان دووبارە بنووسیتەوە لەسەر هەمان شوێن؟ +Confirm Save = ئایا دەتەوێت زانیاریەکان خەزن بکەیت؟ +ConfirmLoad = ئەم زانیاریانا لۆد ئەکەیت؟ +ConnectingAP = پەیوەندی ئەکەین بە خاڵی دەست بە یەک گەستن.\nتکایە بووەستە... +ConnectingPleaseWait = پەیوەندی ئەکەین.\nتکایە بووەستە... +ConnectionName = ناوی پەیوەندی +Corrupted Data = زانیاریەکە تێکچووە +Delete = سڕینەوە +Delete all = سڕینەوەی هەمووی +Delete completed = سڕینەوەکە سەرکەووتوو بوو +DeleteConfirm = زانیارە خەخن کراوە دەسڕدرێتەوە.\nئایا تۆ دڵنیایت لە بەردەوام بوون؟ +DeleteConfirmAll = ئایە تۆ دڵنیایت لە\nسڕینەوەی هەموو زانیاریە خەزنکروەکان بۆ ئەم یاریە؟? +DeleteConfirmGame = ئایا تۆ دڵنیایت کە\nئەم یاریە بسڕیتەوە لە ئامێرەکەت؟ ئەم کارە گەڕانەوەی نییە +DeleteConfirmGameConfig = ئایا تۆ دڵنیایت لە سڕینەوەی سێتینگەکانت بۆ ئەم یاریە؟ +DeleteFailed = نەتوانرا زانیاریەکان بسڕدرێنەوە. +Deleting = دەسڕدرێتەوە\nتکایە چاوەڕوان بە... +Disable All = لە کارخستنی هەمووی +Disabled = لە کارخرا +Dumps = Dumps +Edit = دەستکاری کردن +Enable All = بەکارپێکردنی هەمووی +Enabled = بەکارخرا +Enter = Enter +Failed to log in, check your username and password. = Failed to log in, check your username and password. +Failed to connect to server, check your internet connection. = Failed to connect to server, check your internet connection. +Filter = Filter +Finish = تەواوکردن +GE Frame Dumps = GE Frame Dumps +Grid = Grid +Inactive = ناچالاک +Installing... = Installing... +InternalError = An internal error has occurred. +Links = Links +Load = Load +Load completed = Load completed. +Loading = Loading\nPlease Wait... +LoadingFailed = Unable to load data. +Log in = Log in +Log out = Log out +Logging in... = Logging in... +Logged in! = Logged in! +More information... = More information... +Move = Move +Move Up = Move Up +Move Down = Move Down +Network Connection = Network Connection +NEW DATA = NEW DATA +No = No +None = None +ObtainingIP = Obtaining IP address.\nPlease wait... +OK = OK +Old savedata detected = Old savedata detected +Options = Options +Password = وشەی نهێنی +Remove = لابردن +Reset = Reset +Resize = گۆڕینی قەبارە +Restart = Restart +Retry = دووبارە هەوڵدانەوە +Save = خەزن کردن +Save completed = خەزن کرا +Saving = خەزن دەکرێت\nتکایە چاوەڕوان بە... +SavingFailed = ناتوانرێت زانیاریەکان خەزن بکرێت +Search = گەڕان +seconds, 0:off = چرکەکان، 0 = کوژاوە +Select = دەستنیشان کردن +Settings = سێتینگەکان +Shift = Shift +Skip = پەڕاندن +Snap = Snap +Space = Space +SSID = SSID +Submit = Submit +Supported = Supported +There is no data = زانیاری بوونی نیە لەسەری +Toggle All = Toggle all +Toggle List = Toggle list +Top Center = Top center +Top Left = Top left +Top Right = Top right +Unsupported = Unsupported +Username = Username +When you save, it will load on a PSP, but not an older PPSSPP = When you save, it will load on a PSP, but not an older PPSSPP +When you save, it will not work on outdated PSP Firmware anymore = When you save, it will not work on outdated PSP firmware anymore +Yes = بەڵێ +Zoom = نزیک کردنەوە + +[Error] +7z file detected (Require 7-Zip) = File is compressed (7z).\nPlease decompress first (try 7-Zip or WinRAR). +A PSP game couldn't be found on the disc. = A PSP game couldn't be found on the disc. +Cannot boot ELF located outside mountRoot. = Cannot boot ELF located outside mountRoot. +BadCHD = Bad CHD file.\nCompress using "chdman createdvd" for good performance. +Could not save screenshot file = Could not save screenshot file. +D3D9or11 = Direct3D 9? (or "no" for Direct3D 11) +D3D11CompilerMissing = D3DCompiler_47.dll not found. Please install. Or press Yes to try again using Direct3D 9 instead. +D3D11InitializationError = Direct3D 11 initialization error +D3D11Missing = Your operating system version does not include D3D11. Please run Windows Update.\n\nPress Yes to try again using Direct3D 9 instead. +D3D11NotSupported = Your GPU does not appear to support Direct3D 11.\n\nWould you like to try again using Direct3D 9 instead? +Disk full while writing data = Disk full while writing data. +ELF file truncated - can't load = ELF file truncated - can't load +Error loading file = Could not load game. +Error reading file = Error reading file. +Failed initializing CPU/Memory = Failed initializing CPU or memory +Failed to load executable: = Failed to load executable: +File corrupt = File corrupt +Game disc read error - ISO corrupt = Game disc read error: ISO corrupt. +GenericAllStartupError = PPSSPP failed to start up with any graphics backend. Try upgrading your graphics and other drivers. +GenericBackendSwitchCrash = PPSSPP crashed while starting.\n\nThis usually means a graphics driver problem. Try upgrading your graphics drivers.\n\nGraphics backend has been switched: +GenericDirect3D9Error = Failed initializing graphics. Try upgrading your graphics drivers and DirectX 9 runtime.\n\nWould you like to try switching to OpenGL?\n\nError message: +GenericGraphicsError = Graphics Error +GenericOpenGLError = Failed initializing graphics. Try upgrading your graphics drivers.\n\nWould you like to try switching to DirectX 9?\n\nError message: +GenericVulkanError = Failed initializing graphics. Try upgrading your graphics drivers.\n\nWould you like to try switching to OpenGL?\n\nError message: +InsufficientOpenGLDriver = Insufficient OpenGL driver support detected!\n\nYour GPU reports that it does not support OpenGL 2.0. Would you like to try using DirectX instead?\n\nDirectX is currently compatible with less games, but on your GPU it may be the only choice.\n\nVisit the forums at https://forums.ppsspp.org for more information.\n\n +Just a directory. = Just a directory. +Missing key = Missing key +MsgErrorCode = Error code: +MsgErrorSavedataDataBroken = Save data was corrupt. +MsgErrorSavedataMSFull = Memory Stick full. Check your storage space. +MsgErrorSavedataNoData = Warning: no save data was found. +MsgErrorSavedataNoMS = Memory Stick not inserted. +No EBOOT.PBP, misidentified game = No EBOOT.PBP, misidentified game. +Not a valid disc image. = Not a valid disc image. +OpenGLDriverError = OpenGL driver error +PPSSPP doesn't support UMD Music. = PPSSPP doesn't support UMD Music. +PPSSPP doesn't support UMD Video. = PPSSPP doesn't support UMD Video. +PPSSPP plays PSP games, not PlayStation 1 or 2 games. = PPSSPP plays PSP games, not PlayStation 1 or 2 games. +PPSSPPDoesNotSupportInternet = PPSSPP currently does not support connecting to the Internet for DLC, PSN, or game updates. +PS1 EBOOTs are not supported by PPSSPP. = PS1 EBOOTs are not supported by PPSSPP. +PSX game image detected. = File is a MODE2 image. PPSSPP doesn't support PS1 games. +RAR file detected (Require UnRAR) = File is compressed (RAR).\nPlease decompress first (try UnRAR). +RAR file detected (Require WINRAR) = File is compressed (RAR).\nPlease decompress first (try WinRAR). +Running slow: try frameskip, sound is choppy when slow = Running slow: try frameskip, sound is choppy when slow +Running slow: Try turning off Software Rendering = Running slow: try turning off "software rendering" +Save encryption failed. This save won't work on real PSP = Save encryption failed. This save won't work on real PSP +textures.ini filenames may not be cross-platform = "textures.ini" filenames may not be cross-platform. +This is a saved state, not a game. = This is a saved state, not a game. +This is save data, not a game. = This is save data, not a game. +Unable to create cheat file, disk may be full = Unable to create cheat file, disk may be full. +Unable to initialize rendering engine. = Unable to initialize rendering engine. +Unable to write savedata, disk may be full = Unable to write savedata, disk may be full. +Warning: Video memory FULL, reducing upscaling and switching to slow caching mode = Warning: Video memory FULL, reducing upscaling and switching to slow caching mode. +Warning: Video memory FULL, switching to slow caching mode = Warning: Video memory FULL, switching to slow caching mode. +ZIP file detected (Require UnRAR) = File is compressed (ZIP).\nPlease decompress first (try UnRAR). +ZIP file detected (Require WINRAR) = File is compressed (ZIP).\nPlease decompress first (try WinRAR). + +[Game] +Asia = ئاسیا +Calculate CRC = Calculate CRC +Click "Calculate CRC" to verify ISO = Click "Calculate CRC" to verify ISO +ConfirmDelete = سڕینەوە +CRC checksum does not match, bad or modified ISO = CRC checksum does not match, bad or modified ISO +Create Game Config = درووستکردنی سێتینگی تایبەت بە یاریەکە +Create Shortcut = Create shortcut +Delete Game = سڕینەوەی یاریەکە +Delete Game Config = سڕینەوەی سێتینگی تایبەت بە یاریەکە +Delete Save Data = سڕینەوەی زانیاری خەزن کراوی یاریەکە +Europe = ئەوروپا +File size incorrect, bad or modified ISO = بریگەی فایلەکە هەڵەیە، ISO هەڵەیە یان دەستکاری کراوە +Game = یاری +Game ID unknown - not in the ReDump database = Game ID unknown - not in the ReDump database +Game Settings = سێتینگەکانی یاریەکە +Homebrew = Homebrew +Hong Kong = هۆنگ کۆنگ +InstallData = Data install +ISO OK according to the ReDump project = ISO OK according to the ReDump project +Japan = یابان +Korea = کۆریا +MB = MB +One moment please... = تکایە یەک چرکە... +Play = دەست کردن بە یاری +Remove From Recent = لابردن لە بەشی "Recent" +SaveData = Savedata +Setting Background = Setting background +Show In Folder = نیشاندانەوە لە فۆڵدەر +Time Played: %1h %2m %3s = Time Played: %1h %2m %3s +Uncompressed = Uncompressed +USA = USA +Use UI background = دا UI بەکارهێنانی لە باکگراوند + +[Graphics] +% of the void = % of the void +% of viewport = % of viewport +%, 0:unlimited = %, 0 = unlimited +(supersampling) = (supersampling) +(upscaling) = (upscaling) +1x PSP = 1× PSP +2x = 2× +2x PSP = 2× PSP +3x = 3× +3x PSP = 3× PSP +4x = 4× +4x PSP = 4x PSP (1080p) +5x = 5× +5x PSP = 5× PSP +6x PSP = 6× PSP +7x PSP = 7× PSP +8x = 8× +8x PSP = 8x PSP (4K) +9x PSP = 9× PSP +10x PSP = 10× PSP +16x = 16× +AdrenoTools driver manager = AdrenoTools driver manager +Aggressive = Aggressive +Alternative Speed = خێرایی جێگرەوە(بە ٪ دیاری بکە، 0 = بێسنوور) +Alternative Speed 2 = خێرایی جێگرەوەی دووهەم(بە ٪ دیاری بکە، 0 = بێسنوور) +Anisotropic Filtering = Anisotropic filtering +Antialiasing (MSAA) = Antialiasing (MSAA) +Aspect Ratio = Aspect Ratio +Auto = Auto +Auto (1:1) = Auto (1:1) +Auto (same as Rendering) = Auto (same as rendering resolution) +Auto FrameSkip = Auto frameskip +Auto Max Quality = Auto Max Quality +Auto Scaling = Auto scaling +Backend = Backend +Balanced = Balanced +Bicubic = Bicubic +Copy to texture = Copy to texture +Current GPU Driver = Current GPU Driver +Default GPU driver = Default GPU driver +Disable culling = Disable culling +Driver requires Android API version %1, current is %2 = Driver requires Android API version %1, current is %2 +Drivers = Drivers +GPUReadbackRequired = Warning: This game requires "Skip GPU Readbacks" to be set to Off. +Both = Both +Buffer graphics commands (faster, input lag) = Buffer graphics commands (faster, input lag) +BufferedRenderingRequired = Warning: This game is not compatible with "Skip buffer effects" +Camera = Camera +Camera Device = Camera device +Cardboard Screen Size = Screen size (in % of the viewport) +Cardboard Screen X Shift = X shift (in % of the blank space) +Cardboard Screen Y Shift = Y shift (in % of the blank space) +Cardboard VR Settings = Google Cardboard VR settings +Cheats = Cheats +Debugging = Debugging +DefaultCPUClockRequired = Warning: This game requires the CPU clock to be set to default. +Deposterize = Deposterize +Deposterize Tip = Fixes visual banding glitches in upscaled textures +Device = Device +Direct3D 9 = Direct3D 9 +Direct3D 11 = Direct3D 11 +Disabled = Disabled +Display Layout && Effects = Display layout && effects +Display Resolution (HW scaler) = Display resolution (HW scaler) +Enable Cardboard VR = Enable Cardboard VR +FPS = FPS +Frame Rate Control = Framerate control +Frame Skipping = Frame skipping +Frame Skipping Type = Frame skipping type +FullScreen = Fullscreen +Geometry shader culling = Geometry shader culling +Hack Settings = Hack settings (may cause glitches) +Hardware Tessellation = Hardware tessellation +Hardware Transform = Hardware transform +hardware transform error - falling back to software = Hardware transform error, falling back to software +HardwareTessellation Tip = Uses hardware to make curves +High = High +Hybrid = Hybrid +Hybrid + Bicubic = Hybrid + Bicubic +Ignore camera notch when centering = Ignore camera notch when centering +Install custom driver... = Install custom driver... +Integer scale factor = Integer scale factor +Internal Resolution = Internal resolution +Lazy texture caching = Lazy texture caching (speedup) +Lazy texture caching Tip = Faster, but can cause text problems in a few games +Linear = Linear +Low = Low +LowCurves = Spline/Bezier curves quality +LowCurves Tip = Only used by some games, controls smoothness of curves +Lower resolution for effects (reduces artifacts) = Lower resolution for effects (reduces artifacts) +Manual Scaling = Manual scaling +Medium = Medium +Mode = Mode +Must Restart = You must restart PPSSPP for this change to take effect. +Native device resolution = Native device resolution +Nearest = Nearest +No (default) = No (default) +No buffer = No buffer +Show Battery % = Show Battery % +Show Speed = Show Speed +Skip = Skip +Skip Buffer Effects = Skip buffer effects +None = None +Number of Frames = Number of frames +Off = Off +OpenGL = OpenGL +Overlay Information = Overlay information +Partial Stretch = Partial stretch +Percent of FPS = Percent of FPS +Performance = Performance +Postprocessing shaders = Postprocessing shaders +Recreate Activity = Recreate activity +Render all frames = Render all frames +Render duplicate frames to 60hz = Render duplicate frames to 60 Hz +RenderDuplicateFrames Tip = Can make framerate smoother in games that run at lower framerates +Rendering Mode = Rendering mode +Rendering Resolution = Rendering resolution +RenderingMode NonBuffered Tip = Faster, but nothing may draw in some games +Rotation = Rotation +Safe = Safe +Screen Scaling Filter = Screen scaling filter +Show Debug Statistics = Show debug statistics +Show FPS Counter = Show FPS counter +Skip GPU Readbacks = Skip GPU Readbacks +Smart 2D texture filtering = Smart 2D texture filtering +Software Rendering = Software rendering (slow, accurate) +Software Skinning = Software skinning +SoftwareSkinning Tip = Combine skinned model draws on the CPU, faster in most games +Speed = Speed +Speed Hacks = Speed Hacks (can cause rendering errors!) +Stereo display shader = Stereo display shader +Stereo rendering = Stereo rendering +Stretch = Stretch +Texture Filter = Texture filtering +Texture Filtering = Texture filtering +Texture replacement pack activated = Texture replacement pack activated +Texture Scaling = Texture scaling +Texture Shader = Texture shader +The chosen ZIP file doesn't contain a valid driver = The chosen ZIP file doesn't contain a valid driver +Turn off Hardware Tessellation - unsupported = Turn off "hardware tessellation": unsupported +Unlimited = Unlimited +Up to 1 = Up to 1 +Up to 2 = Up to 2 +Upscale Level = Upscale level +Upscale Type = Upscale type +UpscaleLevel Tip = CPU heavy - some scaling may be delayed to avoid stutter +Use all displays = Use all displays +VSync = VSync +Vulkan = Vulkan +Window Size = Window size +xBRZ = xBRZ + +[InstallZip] +Delete ZIP file = Delete ZIP file +Install = Install +Install game from ZIP file? = Install game from ZIP file? +Install textures from ZIP file? = Install textures from ZIP file? +Installation failed = Installation failed +Installed! = Installed! +Texture pack doesn't support install = Texture pack doesn't support install +Zip archive corrupt = ZIP archive corrupt +Zip file does not contain PSP software = ZIP file does not contain PSP software + +[KeyMapping] +Allow combo mappings = Allow combo mappings +Autoconfigure = Auto configure +Autoconfigure for device = Autoconfigure for device +Bind All = Bind All +Clear All = Clear all +Combo mappings are not enabled = Combo mappings are not enabled +Control modifiers = Control modifiers +Default All = Restore defaults +Emulator controls = Emulator controls +Extended PSP controls = Extended PSP controls +Map a new key for = Map a new key for +Map Key = Map key +Map Mouse = Map mouse +Replace = Replace +Show PSP = Show PSP +Standard PSP controls = Standard PSP controls +Strict combo input order = Strict combo input order +You can press ESC to cancel. = You can press Esc to cancel. + +[MainMenu] +Browse = گەڕان... +Buy PPSSPP Gold = گۆلد بکڕە PPSSPP +Choose folder = فۆڵدەرێک هەڵبژێرە +Credits = لیستی کرێدیت +PPSSPP Homebrew Store = PPSSPP Homebrew Store +Exit = دەرچوون +Game Settings = سێتینگ +Games = یاریەکان +Give PPSSPP permission to access storage = بدە کە دەسەڵاتی خەزن کردنی هەبێت PPSSPP ڕێگە بە +Homebrew & Demos = یاری دێمۆ و دروستکراوە بچووکەکان +How to get games = چۆن یاریم دەست بکەوێت؟ +How to get homebrew & demos = How can I get homebrew && demos? +Load = Load... +Loading... = Loading... +PinPath = Pin +PPSSPP can't load games or save right now = PPSSPP can't load games or save right now +Recent = دوایین یاریەکان +SavesAreTemporary = PPSSPP is saving in temporary storage +SavesAreTemporaryGuidance = Extract PPSSPP somewhere to save permanently +SavesAreTemporaryIgnore = Ignore warning +UnpinPath = Unpin +UseBrowseOrLoad = بۆ هەڵبژاردنی فایلێک (Load) بەکاربێنە بۆ هەڵبژاردنی فۆڵدەرێک، یان (Browse) +www.ppsspp.org = www.ppsspp.org + +[MainSettings] +Audio = دەنگ +Controls = کۆنترۆڵەکان +Graphics = گرافیکەکان +Networking = نێتوۆرک +System = سیستەم +Tools = ئامرازەکان +Search = گەڕان + +[MappableControls] +Alt speed 1 = Alt speed 1 +Alt speed 2 = Alt speed 2 +An.Down = Analog Down +An.Left = Analog Left +An.Right = Analog Right +An.Up = Analog Up +Analog limiter = Analog limiter +Analog speed = Analog speed +Analog Stick = Analog stick +Audio/Video Recording = Audio/Video recording +AxisSwap = Axis swap +Circle = Circle +Cross = Cross +Custom %d = Custom %d +D-pad down = D-pad down +D-pad left = D-pad left +D-pad right = D-pad right +D-pad up = D-pad up +DevMenu = DevMenu +Double tap button = Double tap button +Down = Dpad Down +Dpad = Dpad +Exit App = Exit App +Frame Advance = Frame advance +Hold = Hold +Home = Home +L = L +Left = Dpad Left +Load State = Load state +Mute toggle = Mute toggle +Next Slot = Next slot +None = None +Note = Note +OpenChat = Open chat +Pause = Pause +Previous Slot = Previous Slot +R = R +RapidFire = Rapid-fire +Record = Record +Remote hold = Remote hold +Rewind = Rewind +Right = Dpad Right +Right Analog Stick = Right Analog Stick +RightAn.Down = RightAn.Down +RightAn.Left = RightAn.Left +RightAn.Right = RightAn.Right +RightAn.Up = RightAn.Up +Rotate Analog (CCW) = Rotate analog (CCW) +Rotate Analog (CW) = Rotate analog (CW) +Save State = Save state +Screen = Screen +Screenshot = Screenshot +Select = Select +SpeedToggle = Speed toggle +Square = Square +Start = Start +Swipe Down = Swipe Down +Swipe Left = Swipe Left +Swipe Right = Swipe Right +Swipe Up = Swipe Up +tap to customize = tap to customize +Texture Dumping = Texture dumping +Texture Replacement = Texture replacement +Toggle Fullscreen = Toggle fullscreen +Toggle mode = Toggle mode +Toggle mouse input = Toggle mouse input +Toggle touch controls = Toggle touch controls +Toggle WLAN = Toggle WLAN +Triangle = Triangle +Fast-forward = Fast-forward +Up = Dpad Up +Vol + = Vol + +Vol - = Vol - +Wlan = WLAN +Display Landscape = Display Landscape +Display Landscape Reversed = Display Landscape Reversed +Display Portrait = Display Portrait +Display Portrait Reversed = Display Portrait Reversed + +[Networking] +AdHoc Server = Ad hoc server +AdhocServer Failed to Bind Port = Ad hoc server failed to bind port +AM: Data from Unknown Port = AM: Data from Unknown Port +Auto = Auto +Change Mac Address = Change MAC address +ChangeMacSaveConfirm = Generate a new MAC address? +ChangeMacSaveWarning = Some games verify the MAC address when loading savedata, so this may break old saves. +Change proAdhocServer Address = Change PRO ad hoc server IP address (localhost = multiple instances) +Chat = Chat +Chat Button Position = Chat button position +Chat Here = Chat here +Chat message = Chat message +Chat Screen Position = Chat screen position +Disconnected from AdhocServer = Disconnected from ad hoc server +DNS Error Resolving = DNS error resolving +Enable built-in PRO Adhoc Server = Enable built-in PRO ad hoc server +Enable network chat = Enable network chat +Enable networking = Enable networking/WLAN +Enable UPnP = Enable UPnP (need a few seconds to detect) +EnableQuickChat = Enable quick chat +Enter a new PSP nickname = Enter a new PSP nickname +Enter Quick Chat 1 = Enter quick chat 1 +Enter Quick Chat 2 = Enter quick chat 2 +Enter Quick Chat 3 = Enter quick chat 3 +Enter Quick Chat 4 = Enter quick chat 4 +Enter Quick Chat 5 = Enter quick chat 5 +Error = Error +Failed to Bind Localhost IP = Failed to bind localhost IP +Failed to Bind Port = Failed to bind port +Failed to connect to Adhoc Server = Failed to connect to ad hoc server +Forced First Connect = Forced first connect (faster connect) +GM: Data from Unknown Port = GM: Data from Unknown Port +Hostname = Hostname +Invalid IP or hostname = Invalid IP or hostname +Minimum Timeout = Minimum timeout (override in ms, 0 = default) +Misc = Miscellaneous (default = PSP compatibility) +Network connected = Network connected +Network initialized = Network initialized +Please change your Port Offset = Please change your port offset +Port offset = Port offset (0 = PSP compatibility) +Open PPSSPP Multiplayer Wiki Page = Open PPSSPP Multiplayer Wiki Page +proAdhocServer Address: = Ad hoc server address: +Quick Chat 1 = Quick chat 1 +Quick Chat 2 = Quick chat 2 +Quick Chat 3 = Quick chat 3 +Quick Chat 4 = Quick chat 4 +Quick Chat 5 = Quick chat 5 +QuickChat = Quick chat +Randomize = Randomize +Send = Send +Send Discord Presence information = Send Discord "Rich Presence" information +Unable to find UPnP device = Unable to find UPnP device +UPnP (port-forwarding) = UPnP (port forwarding) +UPnP need to be reinitialized = UPnP need to be reinitialized +UPnP use original port = UPnP use original port (enabled = PSP compatibility) +UseOriginalPort Tip = May not work for all devices or games, see wiki. +Validating address... = Validating address... +WLAN Channel = WLAN channel +You're in Offline Mode, go to lobby or online hall = You're in offline mode, go to lobby or online hall + +[Pause] +Cheats = Cheats +Continue = بەردەوام بە لە یاری +Create Game Config = سێتینگ درووست بکە بۆ ئەم یاریە +Delete Game Config = سێتینگی ئەم یاریە بسڕەوە +Exit to menu = چوونە دەرەوە بۆ مێنیو +Game Settings = سێتینگی یاریەکە +Load State = Load state +Rewind = Rewind +Save State = Save state +Settings = سێتینگ +Switch UMD = Switch UMD +Undo last load = Undo last load +Undo last save = Undo last save + +[PostShaders] +(duplicated setting, previous slider will be used) = (duplicated setting, previous slider will be used) +4xHqGLSL = 4xHQ pixel art upscaler +5xBR = 5xBR pixel art upscaler +5xBR-lv2 = 5xBR-lv2 pixel art upscaler +AAColor = AA-Color +Amount = Amount +Aspect = Aspect +Black border = Black border +Bloom = Bloom +BloomNoBlur = Bloom (no blur) +Brightness = Brightness +Cartoon = Cartoon +ColorCorrection = Color correction +ColorPreservation = Color preservation +Contrast = Contrast +CRT = CRT scanlines +FXAA = FXAA Antialiasing +Gamma = Gamma +GreenLevel = Green level +FakeReflections = FakeReflections +Intensity = Intensity +LCDPersistence = LCD Persistence +Natural = Natural Colors +NaturalA = Natural Colors (no blur) +Off = Off +Power = Power +PSPColor = PSP color +RedBlue = Red/Blue glasses +Saturation = Saturation +Scanlines = Scanlines (CRT) +Sharpen = Sharpen +SideBySide = Side by side (SBS) +SSAA(Gauss) = Supersampling AA (Gauss) +Strength = Strength +Tex4xBRZ = 4xBRZ +TexMMPX = MMPX +UpscaleBicubic = UpscaleBicubic +UpscaleSpline36 = Spline36 Upscaler +VideoSmoothingAA = Video Smoothing AA +Vignette = Vignette +Animation speed (0 -> disable) = Animation speed (0 -> disable) +CatmullRom = Bicubic (Catmull-Rom) Upscaler +MitchellNetravali = Bicubic (Mitchell-Netravali) Upscaler + +[PSPCredits] +all the forum mods = all the forum mods +build server = build server +Buy Gold = Buy Gold +check = Also check out Dolphin, the best Wii/GC emu around: +CheckOutPPSSPP = Check out PPSSPP, the awesome PSP emulator: https://www.ppsspp.org/ +contributors = Contributors: +created = درووست کراوە لەلایەن +Discord = Discord +info1 = PPSSPP is intended for educational purposes only. +info2 = Please make sure that you own the rights to any games +info3 = you play by owning the UMD or by buying the digital +info4 = download from the PSN store on your real PSP. +info5 = PSP is a trademark by Sony, Inc. +iOS builds = iOS builds +license = Free software under GPL 2.0+ +list = compatibility lists, forums, and development info +PPSSPP Forums = PPSSPP فۆڕمەکانی +Privacy Policy = سیاسەتی پاراستنی نهێنی +Share PPSSPP = بڵاو بکەرەوە PPSSPP +specialthanks = سوپاسی تایبەت بۆ: +specialthanksKeithGalocy = at NVIDIA (hardware, advice) +specialthanksMaxim = for his amazing Atrac3+ decoder work +testing = testing +this translation by = ئەم وەرگێڕانە لەلایەن: +title = A fast and portable PSP emulator +tools = Free tools used: +# Add translators or contributors who translated PPSSPP into your language here. +# Add translators1-6 for up to 6 lines of translator credits. +# Leave extra lines blank. 4 contributors per line seems to look best. +translators1 = MrYadro, mgaver, VIRGINKLM, raven02 +translators2 = sum2012, vnctdj, unknownbrackets, ufdada +translators3 = The Dax, wuspring, hrydgard, adrian17 +translators4 = papel, Mhamad99 +translators5 = +translators6 = +Twitter @PPSSPP_emu = Twitter @PPSSPP_emu +website = Check out the website: +written = Written in C++ for speed and portability + +[MemStick] +Already contains PSP data = Already contains PSP data +Cancelled - try again = Cancelled - try again +Checking... = Checking... +Create or Choose a PSP folder = Create or Choose a PSP folder +Current = Current +DataCanBeShared = Data can be shared between PPSSPP regular/Gold +DataCannotBeShared = Data CANNOT be shared between PPSSPP regular/Gold! +DataWillBeLostOnUninstall = Warning! Data will be lost when you uninstall PPSSPP! +DataWillStay = Data will stay even if you uninstall PPSSPP +Deleting... = Deleting... +Done! = Done! +EasyUSBAccess = Easy USB access +Failed to move some files! = Failed to move some files! +Failed to save config = Failed to save config +Free space = Free space +Manually specify PSP folder = Manually specify PSP folder +MemoryStickDescription = Choose where to keep PSP data (Memory Stick) +Move Data = Move Data +Selected PSP Data Folder = Selected PSP Data Folder +Skip for now = Skip for now +No data will be changed = No data will be changed +PPSSPP will restart after the change = PPSSPP will restart after the change +Starting move... = Starting move... +That folder doesn't work as a memstick folder. = That folder doesn't work as a memstick folder. +USBAccessThrough = USB access through Android/data/org.ppsspp.ppsspp/files +USBAccessThroughGold = USB access through Android/data/org.ppsspp.ppssppgold/files +Use App Private Data = Use App Private Data +Use PSP folder at root of storage = Use PSP folder at root of storage +Welcome to PPSSPP! = Welcome to PPSSPP! +WhatsThis = What's this? + +[PSPSettings] +Auto = Auto +Chinese (simplified) = چینی (سادۆکراو) +Chinese (traditional) = چینی (تەقلیدی) +Dutch = هۆڵەندی +English = ئینگلیزی +French = فەڕەنسی +Game language = زمانی یاری +German = ئەڵمانی +Italian = ئیتاڵی +Japanese = یابانی +Korean = کۆری +Games often don't support all languages = یاریەکان زۆربەی کات پاڵپشتی هەموو زمانەکان ناکەن +Portuguese = پورتوگالی +Russian = ڕووسی +Spanish = ئیسپانی + +[RemoteISO] +Browse Games = Browse games +Local Server Port = Local server port +Manual Mode Client = Manually configure client +Remote disc streaming = Remote disc streaming +Remote Port = Remote port +Remote Server = Remote server +Remote Subdirectory = Remote subdirectory +RemoteISODesc = Games in your "Recent" list will be shared +RemoteISOLoading = Connected, loading game list... +RemoteISOScanning = Scanning... Click "share games" on your server device +RemoteISOScanningTimeout = Scanning... check your desktop's firewall settings +RemoteISOWifi = Note: Connect both devices to the same Wi-Fi network +RemoteISOWinFirewall = WARNING: Windows Firewall is blocking sharing +Settings = Settings +Share Games (Server) = Share games (server) +Share on PPSSPP startup = Share on PPSSPP startup +Show Remote tab on main screen = Show Remote tab on main screen +Stop Sharing = Stop sharing +Stopping.. = Stopping... + +[Reporting] +Bad = Bad +FeedbackCRCCalculating = Disc CRC: Calculating... +FeedbackCRCValue = Disc CRC: %1 +FeedbackDelayInfo = Your data is being submitted in the background. +FeedbackDesc = How's the emulation? Let us and the community know! +FeedbackDisabled = Compatibility server reports must be enabled. +FeedbackIncludeCRC = Note: Battery will be used to send a disc CRC +FeedbackIncludeScreen = Include a screenshot +FeedbackSubmitDone = Your data has been submitted. +FeedbackSubmitFail = Could not submit data to server. Try updating PPSSPP. +FeedbackThanks = Thanks for your feedback! +Gameplay = Gameplay +Graphics = Graphics +Great = Great +In-game = In-game +In-game Description = Gets into gameplay, but too buggy to complete +Menu/Intro = Menu/Intro +Menu/Intro Description = Can't get into the game itself +Nothing = Nothing +Nothing Description = Completely broken +OK = OK +Open Browser = Open reporting website +Overall = Overall +Perfect = Perfect +Perfect Description = Flawless emulation for the entire game - great! +Plays = Plays +Plays Description = Fully playable but might be with glitches +ReportButton = Report feedback +Show disc CRC = Show disc CRC +Speed = Speed +Submit Feedback = Submit feedback +SuggestionConfig = See reports on website for good settings. +SuggestionCPUSpeed0 = Disable locked CPU speed setting. +SuggestionDowngrade = Downgrade to an older PPSSPP version (please report this bug). +SuggestionsFound = Other users have reported better results. Tap "View Feedback" for more detail. +SuggestionsNone = This game isn't working for other users too. +SuggestionsWaiting = Submitting and checking other users feedback... +SuggestionUpgrade = Upgrade to a newer PPSSPP build. +SuggestionVerifyDisc = Check your ISO is a good copy of your disc. +Unselected Overall Description = How well does this game emulate? +View Feedback = View all feedbacks + +[Savedata] +Date = Date +Filename = Filename +No screenshot = No screenshot +None yet. Things will appear here after you save. = None yet. Things will appear here after you save. +Nothing matching '%1' was found. = Nothing matching '%1' was found. +Save Data = Save data +Save States = Save states +Savedata Manager = Savedata manager +Showing matches for '%1'. = Showing matches for '%1'. +Size = Size + +[Screen] +Cardboard VR OFF = Cardboard VR off +Chainfire3DWarning = WARNING: Chainfire3D detected, may cause problems. +ExtractedISOWarning = Extracted ISOs often don't work.\nPlay the ISO file directly. +Failed to load state = Failed to load state +Failed to save state = Failed to save state +fixed = Speed: alternate +GLToolsWarning = WARNING: GLTools detected, may cause problems. +In menu = In menu +Load savestate failed = Load savestate failed +Loaded State = State loaded +Loaded. Save in game, restart, and load for less bugs. = Loaded. Save in game, restart, and load for less bugs. +Loaded. Game may refuse to save over different savedata. = Loaded. Game may refuse to save over different savedata. +Loaded. Game may refuse to save over newer savedata. = Loaded. Game may refuse to save over newer savedata. +LoadStateDoesntExist = Failed to load state: Savestate doesn't exist! +LoadStateWrongVersion = Failed to load state: Savestate is for an older version of PPSSPP! +norewind = No rewind save states available. +Playing = Playing +PressESC = Press ESC to open the pause menu. +replaceTextures_false = Textures no longer are being replaced. +replaceTextures_true = Texture replacement is enabled. +Save State Failed = Failed to save state! +Saved State = State saved +saveNewTextures_false = Texture saving was disabled. +saveNewTextures_true = Textures will now be saved to your storage. +SpeedCustom2 = Speed: alternate 2 +standard = Speed: standard +State load undone = State load undone +Untitled PSP game = Untitled PSP game + +[Store] +Connection Error = Connection error +Install = Install +Installed = Installed +Launch Game = Launch game +Loading... = Loading... +MB = MB +Size = Size +Uninstall = Uninstall + +[SysInfo] +%d (%d per core, %d cores) = %d (%d per core, %d cores) +%d bytes = %d bytes +%d Hz = %d Hz +%0.2f Hz = %0.2f Hz +(none detected) = (none detected) +3D API = 3D API +ABI = ABI +API Version = API version +Audio Information = Audio information +Board = Board +Build Config = Build config +Build Configuration = Build Configuration +Built by = Built by +Compressed texture formats = Compressed texture formats +Core Context = Core context +Cores = Cores +CPU Extensions = CPU extensions +CPU Information = CPU زانیاری +CPU Name = Name +D3DCompiler Version = D3DCompiler version +Debug = Debug +Debugger Present = Debugger present +Depth buffer format = Depth buffer format +Device Info = Device info +Directories = Directories +Display Information = Display information +DPI = DPI +Driver bugs = Driver bugs +Driver Version = Driver version +EGL Extensions = EGL extensions +Frames per buffer = Frames per buffer +GPU Flags = GPU Flags +GPU Information = GPU زانیاری +High precision float range = High precision float range +High precision int range = High precision int range +Icon cache = Icon cache +Instance = Instance +JIT available = JIT available +Lang/Region = زمان/هەرێم +Memory Page Size = Memory page size +Native resolution = Native resolution +No GPU driver bugs detected = No GPU driver bugs detected +OGL Extensions = OGL extensions +OpenGL ES 2.0 Extensions = OpenGL ES 2.0 extensions +OpenGL ES 3.0 Extensions = OpenGL ES 3.0 extensions +OpenGL Extensions = OpenGL extensions +Optimal frames per buffer = Optimal frames per buffer +Optimal sample rate = Optimal sample rate +OS Information = OS information +Pixel resolution = Pixel resolution +PPSSPP build = PPSSPP build +Present modes = Present modes +Refresh rate = Refresh rate +Release = Release +RW/RX exclusive = RW/RX exclusive +Sample rate = Sample rate +Screen notch insets = Screen notch insets +Shading Language = Shading language +Storage = Storage +Sustained perf mode = Sustained perf mode +System Information = System information +System Name = Name +System Version = System version +Threads = Threads +UI resolution = UI resolution +Vendor = Vendor +Vendor (detected) = Vendor (detected) +Version Information = Version information +Vulkan Extensions = Vulkan extensions +Vulkan Features = Vulkan features +Display Color Formats = Display Color Formats + +[System] +(broken) = (broken) +12HR = 12 کاتژمێری +24HR = 24 کاتژمێری +Auto = Auto +Auto Load Savestate = Auto load savestate +AVI Dump started. = AVI dump started +AVI Dump stopped. = AVI dump stopped +Cache ISO in RAM = Cache full ISO in RAM +Change CPU Clock = Change emulated PSP's CPU clock (unstable) +CPU Core = CPU core +Dynarec/JIT (recommended) = Dynarec/JIT (recommended) +JIT using IR = JIT using IR +Loaded plugin: %1 = Loaded plugin: %1 +Memory Stick folder = فۆڵدەری میمۆری +Memory Stick size = قەبارەی میمۆری +Change Nickname = گۆڕینی نازناو +ChangingMemstickPath = Save games, save states, and other data will not be copied to this folder.\n\nChange the Memory Stick folder? +ChangingMemstickPathInvalid = That path couldn't be used to save Memory Stick files. +Cheats = Cheats +Clear Recent = سڕینەوەی "دوایین یاریەکان" +Clear Recent Games List = "دوایین یاریەکان" سڕینەوەی لیستی +Clear UI background = UI لابردنی باکگراوندی +Confirmation Button = دوگمەی پشتڕاستکردنەوە(Confirm) +Date Format = Date format +Day Light Saving = Daylight savings +DDMMYYYY = DDMMYYYY +Decrease size = کەم کردنەوەی قەبارە +Developer Tools = Developer tools +Display Extra Info = زانیاری زیادە پیشان بدە +Display Games on a grid = نیشاندانەوەی "یاریەکان" لەسەر خشتەیەک +Display Homebrew on a grid = نیشاندانەوەی "دێمۆ و دروستکراوە بچووکەکان" لەسەر خشتەیەک +Display Recent on a grid = نیشاندانەوەی "دوایین یاریەکان" لەسەر خشتەیەک +Emulation = Emulation +Enable Cheats = Enable cheats +Enable Compatibility Server Reports = Enable compatibility server reports +Error: load undo state is from a different game = Error: load undo state is from a different game +Failed to load state. Error in the file system. = Failed to load state. Error in the file system. +Failed to save state. Error in the file system. = Failed to save state. Error in the file system. +Failed to load state for load undo. Error in the file system. = Failed to load state for load undo. Error in the file system. +Fast (lag on slow storage) = Fast (lag on slow storage) +Fast Memory = میمۆری خێرا(ناجێگیر) +Floating symbols = هێمای جوڵاو +Force real clock sync (slower, less lag) = Force real clock sync (slower, less lag) +Game crashed = Game crashed +Games list settings = سێتینگەکانی لیستی یاریەکان +General = گشتی +Grid icon size = Grid icon size +Help the PPSSPP team = Help the PPSSPP team +Host (bugs, less lag) = Host (bugs, less lag) +Ignore bad memory accesses = Ignore bad memory accesses +Increase size = زیادکردنی قەبارە +Interpreter = Interpreter +IO timing method = I/O timing method +IR Interpreter = IR interpreter +Language = زمان +Memory Stick Folder = Memory Stick folder +Memory Stick inserted = Memory Stick inserted +MHz, 0:default = MHz, 0 = default +MMDDYYYY = MMDDYYYY +Moving background = باکگراوندی جوڵاو +Newest Save = Newest save +No animation = بەبێ ئەنیمەیشن +Not a PSP game = Not a PSP game +Off = Off +Oldest Save = Oldest save +Only JPG and PNG images are supported = Only JPG and PNG images are supported +Path does not exist! = Path does not exist! +PSP Memory Stick = PSP Memory Stick +PSP Model = PSP مۆدێلی +PSP Settings = PSP settings +PSP-1000 = PSP-1000 +PSP-2000/3000 = PSP-2000/3000 +Recent games = تازەترین یاری کراوە +Record Audio = تۆمارکردنی دەنگ +Record Display = تۆمارکردنی شاشە +Recording = Recording +Reset Recording on Save/Load State = Reset recording on Save/Load state +Restore Default Settings = Restore PPSSPP's settings to default +RetroAchievements = RetroAchievements +Rewind Snapshot Interval = Rewind Snapshot Interval (mem hog) +Save path in installed.txt = Save path in installed.txt +Save path in My Documents = Save path in My Documents +Savestate Slot = Savestate slot +Savestate slot backups = Savestate slot backups +Screenshots as PNG = PNG خەزن کردنی سکریین شۆت بە شیوەی +Set Memory Stick folder = Set Memory Stick folder +Set UI background... = UI گۆڕینی باکگراوندی +Show ID = Show ID +Show region flag = Show region flag +Simulate UMD delays = Simulate UMD delays +Simulate UMD slow reading speed = Simulate UMD slow reading speed +Slot 1 = Slot 1 +Slot 2 = Slot 2 +Slot 3 = Slot 3 +Slot 4 = Slot 4 +Slot 5 = Slot 5 +Storage full = Storage full +Sustained performance mode = Sustained performance mode +Time Format = شێوازی کاتژمێر +Transparent UI background = ڕوون(شەفاف) UI باکگراوندێکی +UI = UI +UI Sound = UI دەنگی +UI background animation = UI ئەنیمەیشنی باکگراوندی +undo %c = backup %c +USB = USB +Use Lossless Video Codec (FFV1) = Use lossless video codec (FFV1) +Use O to confirm = بەکاربهێنە بۆ پشتراست کردنەوە (O) دوگمەی +Use output buffer (with overlay) for recording = Use output buffer (with overlay) for recording +Use system native keyboard = Use system native keyboard +Use X to confirm = بەکاربهێنە بۆ پشتراست کردنەوە (X) دوگمەی +VersionCheck = Check for new versions of PPSSPP +WARNING: Android battery save mode is on = WARNING: Android battery save mode is On +WARNING: Battery save mode is on = WARNING: Battery save mode is on +Waves = شەپۆل +YYYYMMDD = YYYYMMDD +Theme = Theme +Color Tint = گۆڕینی ڕەنگ +Color Saturation = تۆخی ڕەنگ +Show Memory Stick folder = نیشاندانی فۆڵدەری میمۆری + +[Themes] +Dark = Dark +Default = Default + +[TextureShaders] +Off = Off +TexMMPX = TexMMPX +Tex2xBRZ = Tex2xBRZ +Tex4xBRZ = Tex4xBRZ + +[Search] +No settings matched '%1' = No settings matched '%1' +Filtering settings by '%1' = Filtering settings by '%1' +Find settings = Find settings +Filter = فلتەر کردن +Clear filter = لابردنی فلتەر +Search term = Search term + +[Upgrade] +Details = Details +Dismiss = Dismiss +Download = Download +New version of PPSSPP available = New version of PPSSPP available + +[UI Elements] +%1 button = %1 button +%1 checkbox = %1 checkbox +%1 choice = %1 choice +%1 heading = %1 heading +%1 radio button = %1 radio button +%1 text field = %1 text field +Choices: = Choices: +List: = List: +Progress: %1% = Progress: %1% +Screen representation = Screen representation + +[VR] +6DoF movement = 6DoF movement +Distance to 2D menus and scenes = Distance to 2D menus and scenes +Distance to 3D scenes when VR disabled = Distance to 3D scenes when VR disabled +Experts only = Experts only +Game camera rotation step per frame = Game camera rotation step per frame +Game camera uses rotation smoothing = Game camera uses rotation smoothing +Force 72Hz update = Force 72Hz update +Heads-up display scale = Heads-up display scale +Heads-up display detection = Heads-up display detection +Map controller movements to keys = Map controller movements to keys +Map HMD rotations on keys instead of VR camera = Map HMD rotations on keys instead of VR camera +Manual switching between flat screen and VR using SCREEN key = Manual switching between flat screen and VR using SCREEN key +Camera type = Camera type +Motion needed to generate action = Motion needed to generate action +Stereoscopic vision (Experimental) = Stereoscopic vision (Experimental) +Virtual reality = Virtual reality +VR camera = VR camera +VR controllers = VR controllers diff --git a/assets/langregion.ini b/assets/langregion.ini index 6c9d8b1016..7e12509d2e 100644 --- a/assets/langregion.ini +++ b/assets/langregion.ini @@ -12,6 +12,7 @@ pt_PT = "Português" pt_BR = "Português Brasileiro" ru_RU = "Русский" ko_KR = "한국어" +ku_SO = "کوردی ناوەندی" zh_TW = "繁體中文" zh_CN = "简体中文" ar_AE = "العربية" From fa8c8b542d967a2e948afe7830384317f0a629b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Mon, 20 May 2024 10:03:16 +0200 Subject: [PATCH 260/719] Remove some obsolete translation lines --- assets/lang/tr_TR.ini | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/assets/lang/tr_TR.ini b/assets/lang/tr_TR.ini index b85263108c..40bb9786ac 100644 --- a/assets/lang/tr_TR.ini +++ b/assets/lang/tr_TR.ini @@ -61,8 +61,7 @@ Unsupported achievements = Desteklenmeyen başarımlar Alternate speed volume = Alternatif hız hacmi Audio backend = Ses alttabanı (Yeniden başlatma gerekir) Audio Error = Ses Hatası -Audio file format not supported. Must be WAV or MP3. = Audio file format not supported. Must be WAV or MP3. -Audio file format not supported. Must be WAV. = Ses dosya biçimi desteklenmiyor. WAV olmalı. +Audio file format not supported. Must be WAV or MP3. = Ses dosya biçimi desteklenmiyor. WAV, MP3 olmalı. AudioBufferingForBluetooth = Bluetooth uyumlu arabellek (daha yavaş) Auto = Otomatik Device = Cihaz @@ -458,7 +457,6 @@ Zoom = Yakınlaştır [Error] 7z file detected (Require 7-Zip) = dosya sıkıştırılmış (7z).\nLütfen ilk olarak dosyayı çıkartın (7-zip ya da WinRAR kullanın). A PSP game couldn't be found on the disc. = Diskte bir PSP oyunu bulunamadı. -BadCHD = Bad CHD file.\nCompress using "chdman createdvd" for good performance Cannot boot ELF located outside mountRoot. = mountRoot dışında bulunan ELF önyüklenemiyor. Could not save screenshot file = Ekran görüntüsü kaydedilemedi. D3D9or11 = Direct3D 9? (Direct3D 11 için hayır'a basın) @@ -578,7 +576,6 @@ Antialiasing (MSAA) = Kenar yumuşatma (MSAA) Aspect Ratio = En Boy Oranı Auto = Otomatik Auto (1:1) = Otomatik (1:1) -Auto (same as Rendering) = Otomatik (İşleme Çözünürlüğüyle Aynı) Auto FrameSkip = Otomatik kare atlama Auto Max Quality = Otomatik En Yüksek Kalite Auto Scaling = Otomatik ölçekleme @@ -1141,7 +1138,6 @@ Failed to save state = Durum kaydedilemedi. fixed = Hız: Alternatif GLToolsWarning = UYARI: GLTools algılandı, problemlere sebep olabilir. In menu = Menüde -Load savestate failed = Durum kaydı yüklenemedi. Loaded State = Durum yüklendi. Loaded. Game may refuse to save over different savedata. = Yüklendi. Oyun belki farklı verilerin üzerine kaydetmeyi reddedebilir. Loaded. Game may refuse to save over newer savedata. = Yüklendi. Oyun belki yeni verilerin üzerine kaydetmeyi reddedebilir. @@ -1153,7 +1149,6 @@ Playing = Oynatılıyor... PressESC = PPSSPP menüsünü açmak için ESC'ye basın. replaceTextures_false = Dokular artık değiştirilmiyor. replaceTextures_true = Doku değiştirme etkinleştirildi. -Save State Failed = Durum kaydı yapılamadı! Saved State = Durum kaydedildi. saveNewTextures_false = Doku kaydetme devre dışı bırakıldı. saveNewTextures_true = Dokular şimdi cihazınıza kaydedilecek. From 45f094569a1b61b9f8d0bc482fab707dd95e33a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Thu, 2 May 2024 17:15:23 +0200 Subject: [PATCH 261/719] CMake: Add IOS_APP_STORE build option, which will enable required restrictions. --- CMakeLists.txt | 7 +++++++ UI/MainScreen.cpp | 2 ++ b-appstore.sh | 11 +++++++++++ 3 files changed, 20 insertions(+) create mode 100755 b-appstore.sh diff --git a/CMakeLists.txt b/CMakeLists.txt index 4d1207d5c1..739393c178 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -134,6 +134,13 @@ else() message("Normal Build") endif() +if(IOS_APP_STORE) + add_definitions(-DPPSSPP_PLATFORM_IOS_APP_STORE) + message("iOS App Store build") +else() + message("iOS sideload build") +endif() + # User-editable options (go into CMakeCache.txt) # :: Processors option(ARMV7 "Set to ON if targeting an ARMv7 processor" ${ARMV7_DEVICE}) diff --git a/UI/MainScreen.cpp b/UI/MainScreen.cpp index 751cf8cd5a..4a8b032a74 100644 --- a/UI/MainScreen.cpp +++ b/UI/MainScreen.cpp @@ -1269,11 +1269,13 @@ void MainScreen::CreateViews() { if (!vertical) { rightColumnChoices->Add(new Choice(mm->T("www.ppsspp.org")))->OnClick.Handle(this, &MainScreen::OnPPSSPPOrg); +#if !PPSSPP_PLATFORM(IOS_APP_STORE) if (!System_GetPropertyBool(SYSPROP_APP_GOLD) && (System_GetPropertyInt(SYSPROP_DEVICE_TYPE) != DEVICE_TYPE_VR)) { Choice *gold = rightColumnChoices->Add(new Choice(mm->T("Buy PPSSPP Gold"))); gold->OnClick.Handle(this, &MainScreen::OnSupport); gold->SetIcon(ImageID("I_ICONGOLD"), 0.5f); } +#endif } rightColumnChoices->Add(new Spacer(25.0)); diff --git a/b-appstore.sh b/b-appstore.sh new file mode 100755 index 0000000000..079a4b2340 --- /dev/null +++ b/b-appstore.sh @@ -0,0 +1,11 @@ +# Build script for iOS app store + +mkdir build-ios +pushd build-ios +cmake .. -DIOS_APP_STORE=ON -DCMAKE_TOOLCHAIN_FILE=cmake/Toolchains/ios.cmake -DIOS_PLATFORM=OS -GXcode +# TODO: Get a MoltenVK somewhere. +#cp ../MoltenVK/iOS/Frameworks/libMoltenVK.dylib PPSSPP.app/Frameworks +popd + +# To open the xcode project: +# open build-ios/PPSSPP.xcodeproj \ No newline at end of file From f5b6836bf927501d2dd1befe32c48e6eddd0b8be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Thu, 2 May 2024 20:34:17 +0200 Subject: [PATCH 262/719] Initial work on app store support --- CMakeLists.txt | 51 +++++++--- b-appstore.sh | 3 +- ios/PPSSPP-AppStore.plist | 204 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 245 insertions(+), 13 deletions(-) create mode 100644 ios/PPSSPP-AppStore.plist diff --git a/CMakeLists.txt b/CMakeLists.txt index 739393c178..07950f8598 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,6 +3,11 @@ cmake_minimum_required(VERSION 3.8) project(PPSSPP) enable_testing() +# This little macro lets you set any XCode specific property +macro(set_xcode_property TARGET XCODE_PROPERTY XCODE_VALUE) + set_property (TARGET ${TARGET} PROPERTY XCODE_ATTRIBUTE_${XCODE_PROPERTY} ${XCODE_VALUE}) +endmacro(set_xcode_property) + #This is supposed to work but doesn't! if(NOT ANDROID) set(CMAKE_CXX_STANDARD 17) @@ -429,7 +434,11 @@ if(NOT MSVC) endif() if(IOS) - set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0") + if(IOS_APP_STORE) + set(CMAKE_OSX_DEPLOYMENT_TARGET "12.0") + else() + set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0") + endif() elseif(APPLE AND NOT CMAKE_CROSSCOMPILING) if(LIBRETRO AND ARM64) set(CMAKE_OSX_DEPLOYMENT_TARGET "10.14") @@ -1317,6 +1326,7 @@ elseif(IOS AND NOT LIBRETRO) set_source_files_properties(ios/LocationHelper.mm PROPERTIES COMPILE_FLAGS -fobjc-arc) set_source_files_properties(UI/DarwinFileSystemServices.mm PROPERTIES COMPILE_FLAGS -fobjc-arc) set_source_files_properties(Common/Battery/AppleBatteryClient.m PROPERTIES COMPILE_FLAGS -fobjc-arc) + set(TargetBin PPSSPP) elseif(IOS AND LIBRETRO) set(nativeExtraLibs ${nativeExtraLibs} "-framework GLKit") @@ -2829,17 +2839,34 @@ if(IOS AND NOT LIBRETRO) COMMAND /bin/bash "${CMAKE_SOURCE_DIR}/ios/macbundle.sh" \"${APP_DIR_NAME}\" ) set(MACOSX_DEPLOYMENT_TARGET ${DEPLOYMENT_TARGET}) - set_target_properties(${TargetBin} PROPERTIES - MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/ios/PPSSPP-Info.plist" - RESOURCE "ios/Launch Screen.storyboard" - RESOURCE "ios/Settings.bundle" - RESOURCE "ext/vulkan/iOS/Frameworks" - XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET ${DEPLOYMENT_TARGET} - XCODE_ATTRIBUTE_TARGETED_DEVICE_FAMILY "iPhone/iPad" - XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC YES - XCODE_ATTRIBUTE_ENABLE_BITCODE NO - XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "-" - ) + if(IOS_APP_STORE) + # https://stackoverflow.com/questions/40664125/cmake-and-code-signing-in-xcode-8-for-ios-projects + set_target_properties(${TargetBin} PROPERTIES + MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/ios/PPSSPP-AppStore.plist" + RESOURCE "ios/Launch Screen.storyboard" + RESOURCE "ios/Settings.bundle" + RESOURCE "ext/vulkan/iOS/Frameworks" + XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET ${DEPLOYMENT_TARGET} + XCODE_ATTRIBUTE_TARGETED_DEVICE_FAMILY "iPhone/iPad" + XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC YES + XCODE_ATTRIBUTE_ENABLE_BITCODE NO + XCODE_ATTRIBUTE_DEVELOPMENT_TEAM "97NS59EENG" + XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "Apple Development" + XCODE_ATTRIBUTE_CODE_SIGN_STYLE "Automatic" + ) + else() + set_target_properties(${TargetBin} PROPERTIES + MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/ios/PPSSPP-Info.plist" + RESOURCE "ios/Launch Screen.storyboard" + RESOURCE "ios/Settings.bundle" + RESOURCE "ext/vulkan/iOS/Frameworks" + XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET ${DEPLOYMENT_TARGET} + XCODE_ATTRIBUTE_TARGETED_DEVICE_FAMILY "iPhone/iPad" + XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC YES + XCODE_ATTRIBUTE_ENABLE_BITCODE NO + XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "-" + ) + endif() endif() if(MACOSX AND NOT IOS) diff --git a/b-appstore.sh b/b-appstore.sh index 079a4b2340..4a525cf152 100755 --- a/b-appstore.sh +++ b/b-appstore.sh @@ -2,7 +2,8 @@ mkdir build-ios pushd build-ios -cmake .. -DIOS_APP_STORE=ON -DCMAKE_TOOLCHAIN_FILE=cmake/Toolchains/ios.cmake -DIOS_PLATFORM=OS -GXcode + +cmake .. -DIOS_APP_STORE=ON -DCMAKE_TOOLCHAIN_FILE=cmake/Toolchains/ios.cmake -DDEVELOPMENT_TEAM_ID=97NS59EENG -DIOS_PLATFORM=OS -GXcode # TODO: Get a MoltenVK somewhere. #cp ../MoltenVK/iOS/Frameworks/libMoltenVK.dylib PPSSPP.app/Frameworks popd diff --git a/ios/PPSSPP-AppStore.plist b/ios/PPSSPP-AppStore.plist new file mode 100644 index 0000000000..b97b089486 --- /dev/null +++ b/ios/PPSSPP-AppStore.plist @@ -0,0 +1,204 @@ + + + + + UISupportsDocumentBrowser + + NSLocationWhenInUseUsageDescription + Your location may be used to emulate Go!Explore, a GPS accessory + NSCameraUsageDescription + Your camera may be used to emulate Go!Cam, a camera accessory + NSMicrophoneUsageDescription + Your microphone may be used to emulate Go!Cam/Talkman, a microphone accessory + CFBundleDisplayName + PPSSPP + CFBundleExecutable + PPSSPP + CFBundleIdentifier + org.ppsspp.ppsspp-free + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + PPSSPP + CFBundlePackageType + APPL + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1.0 + LSRequiresIPhoneOS + + UIViewControllerBasedStatusBarAppearance + + UIRequiredDeviceCapabilities + + arm64 + + UIStatusBarHidden + + UISupportedInterfaceOrientations + + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + CFBundleIconFiles + + assets/Icon-72.png + assets/Icon-72@2x.png + assets/Icon.png + assets/Icon@2x.png + + UILaunchImageFile + Default.png + UIFileSharingEnabled + + UIDeviceFamily + + 1 + 2 + + UILaunchStoryboardName + Launch Screen + CFBundleDocumentTypes + + + CFBundleTypeIconFiles + + CFBundleTypeName + ISO File + LSHandlerRank + Owner + LSItemContentTypes + + ppsspp.iso + + + + CFBundleTypeIconFiles + + CFBundleTypeName + CSO File + LSHandlerRank + Owner + LSItemContentTypes + + ppsspp.cso + + + + CFBundleTypeIconFiles + + CFBundleTypeName + ELF File + LSHandlerRank + Owner + LSItemContentTypes + + ppsspp.elf + + + + CFBundleTypeIconFiles + + CFBundleTypeName + PBP File + LSHandlerRank + Owner + LSItemContentTypes + + ppsspp.pbp + + + + UTExportedTypeDeclarations + + + UTTypeConformsTo + + public.data + public.iso-image + + UTTypeDescription + ISO File + UTTypeIconFiles + + UTTypeIdentifier + ppsspp.iso + UTTypeTagSpecification + + public.filename-extension + + iso + + + + + UTTypeConformsTo + + public.data + dyn.ah62d4rv4ge80g65t + + UTTypeDescription + CSO File + UTTypeIconFiles + + UTTypeIdentifier + ppsspp.cso + UTTypeTagSpecification + + public.filename-extension + + cso + + + + + UTTypeConformsTo + + public.data + dyn.ah62d4rv4ge80n5dg + + UTTypeDescription + ELF File + UTTypeIconFiles + + UTTypeIdentifier + ppsspp.elf + UTTypeTagSpecification + + public.filename-extension + + elf + + + + + UTTypeConformsTo + + public.data + dyn.ah62d4rv4ge81a2xu + + UTTypeDescription + PBP File + UTTypeIconFiles + + UTTypeIdentifier + ppsspp.pbp + UTTypeTagSpecification + + public.filename-extension + + pbp + + + + + + From 1f13eaa874743a31292df4e91a284a2a4326b3c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Fri, 3 May 2024 22:20:50 +0200 Subject: [PATCH 263/719] Add gold icon files for iOS --- ios/assets/IconGold-72.png | Bin 0 -> 7610 bytes ios/assets/IconGold-72@2x.png | Bin 0 -> 20904 bytes ios/assets/IconGold-72@3x.png | Bin 0 -> 34148 bytes ios/assets/IconGold.png | Bin 0 -> 5423 bytes ios/assets/IconGold@2x.png | Bin 0 -> 14972 bytes ios/assets/IconGold@3x.png | Bin 0 -> 27007 bytes 6 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 ios/assets/IconGold-72.png create mode 100644 ios/assets/IconGold-72@2x.png create mode 100644 ios/assets/IconGold-72@3x.png create mode 100644 ios/assets/IconGold.png create mode 100644 ios/assets/IconGold@2x.png create mode 100644 ios/assets/IconGold@3x.png diff --git a/ios/assets/IconGold-72.png b/ios/assets/IconGold-72.png new file mode 100644 index 0000000000000000000000000000000000000000..5e4f7445e26cf83e9294b7151aae94c61bdf199d GIT binary patch literal 7610 zcmV;r9Yx}aP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D9ZyL_K~!i%rF#jK zT}OFl)!pBH`+L1hy-8}RwaZ#8V_ROp7(2nn4%l#D41q9qfZ;G<&J1C~OoosQXBeD; z5DpUvkZ?GJbAn?djKBt)7~9yEya-u)x1{ctx?8=ze*3%od{y_}x2Ux=nNQXCR{d4? zumAt6>aV}MAj7O-ZNRI0Pw&S)mtmphpP+~X!7nB7-kVMh6 zY*3pX0eC)a9^S$R;k`K*f`+^s5Iir)H4sq3im-*MNU|iVvM7lHbOSG5;nf@RM?BPu zutB3IR?Yv=(gO!s5*m-Tbk82=7oG{rKB;~W$YFtlS@{wOK@~&29Rn|f6f`8BWjl}; zLuFcyZ99w>Gzh!q1*oKJiYy8~k%Q&@ESR{i$Mp`XnG}K4J~-VYupJEG7kL9tWfy)8 z;O8%sm}0DD06!O$8)QEGkjS#3k%I!JB9kwu1bACq_(<_)n57{x1W09voT$1-i+0}i zr&Oa&T{qld7}s&Rb?VQvOrr%;*3Z_2}-(H zZLCG`$HAJ~ytb~i?a`b=r)`?ENRBwyM~(Zsmj38n6_ULvZ!-nPeAFCN9P^Na@5@uwRWVdTiOfjvWu&dGg*BiB9|pTtuO#!i~O6@ zyZ0Tqag8cBjai*%9Zi%l+v-TKh)Wa$eBFYFxqqXWU4AiO$}g5j=Ui$qWjrc7ck0z0 zoz+d9#evjZXM8#tnNUU6&|eFLN`jPs7W!wTZNGt>2n3kQ5vC8(2;!u0OFFDcKyGggti1smF%aoylF3KrM zjY&#WQdB{bDSD;UF^&AxE0*Ja{+WlqG1b0S=6u7x8eLvSN#L@?fDE}Y#oz`^+YwW1 zb}#42+XT4=y@@n#dEdDC$isKkuJ1oL7(JBDcBZ!d2Yddv#62&m{c3D=B-yX0Rz(tR ziXLZLiBj;e2VXCkm9j`GGx>o7lc|gZ>Lp_k6k2I5rR9JrWl;npfeIKg44gk#{Hh?w z`frp%BAZn_0hU{?y3uG_-}yyx@XwXu&&kO(@x+-_&)#@PeM6?aW zGlGU!fT%>^$}{@J^{MJ&=xzfUF2&`^aMe}Agw3HfB!rHt%;t0*d@AxsIRjjLMgh?W zp5)s3M3zelz59LK$}P zJ7ss4tEZqnuec;3KtSBa1!K*adc=*W(9M?+Ayx1=y9HU?8^n+XW}FG<<6)6{p0?oi zSKjgQ0WK34PNXXe0VGw26z#F;JK{#kVI44Wcu)Mk93Iw{#yv(rxGDnY!5P-?LEi6! zb;EMJ#8ObxDUw4AkzA#RBJefK#5~WdRtiy8sG!8ug>Bi=0+yN2JXFpfhamYR<_QJU zwk5=4n2Mfv(I!-@we;E4m%*YN0hM>tUWPn7 z{c+AXtn=?dp5J&oc4u^oEEUhprLd-Kvl#k-6@v-8TBOJ73>_?=K&{`#bL&9-lOM(`68oYpw%#@NC%#noa#+YB(w!ZBBq`EhtoYNkxSbUje+*Q?IXBhO~Qft z6n@41+PW2NZ@ZfN&V$dSv|OxxrxJ}bORof!R`c`a#bdHaPR$NKu>U4kP%qf*ps-oD zcBN}u+lxbOx!&|_TXafS@_wMnhK9vs8A(mKj_K4UW=lN}J#p80c0};m@+$}Jed~u6 zS;Cy!QsvkB{8h0J6EI_&Ov6aF#S4Qfa#FGeEMBq zpXfp;@!8>px34|d8J|t-6RN~FB4~o+WvBfl$v}$?mED)MiT^*iRS)6iR zOBBcpqt}0ZBm>g>2AoIU^7^jcL*0pSXhp@e80pv2o8z6klRZ0IE$kpGeK(-u+3FXvufac8dMMmsq~SZ<0)kn$8<>_Omy!}b#IQh4@8nz zIwg2m&p7O%n{{oA{D=_B6DD?EN44cRhG}8vHf)=b>nb2MwGJ*mcn^w9U!9JX%mj89 zt2SM@_-c7^+I8*A4;_MW%dF%^QR%qkvBO(mDa9}wzqG5ewe2bRd{Ih7(>;=+u_Gz( zi6z$SGGLaeF;uQf&2_1k83Z8>h?%uJLB#l?5!@@6Cy605pkR*QlV!FpJ(UU_lKHs%nBzj1!^AO7nQHr+c{(@*bxBPLzMutzh)azy9K zTniA`@yyCaSu&1KtUFxR;=cbNo-9c?)QBC!d$6?p{##FF0LwL%SQgzEJThm~f=LRF zSB2AY<=;$*zdDoZ(mQ+8B~7k4cFm|_U=ibmSu~PzOB4rs8xWL zlI789m*$~~Ns7d|A!gpUy7-YzGoRi$_Q~y|>ow)+`NTq1dHk4KEOz#0^!C_A1ay{} zH_JFpMkFxpv{?bocIm*tlBtUx~9H zPnf6Yim^uchiNu#AwYuG-p-h{v#qwZv$U>#X;o@I8=Z>C22M}_nh`+}r3|7Xt9AjJ z!^IU1{h8By|LWlCkvt`a@$PlikKZ)Cz56whxKPhuYq(kt`QlS|ef3nwU`Kra=kFO# zRjacnqMP0&j66!J2Z@kolB^WeG!4tD<|^6;zq|gmf|d&37-5yx6=Q}^i0*xZg^eBg zHEp@h#9T6RvH9H~72~3uWE-U#5oHxoEMr|Mm2+c`xhSF~CF6_he(?I{FC9%0Z1ke> z#TyHMu>EXj>JO-jC#j++Da;LB4wQ0$KJnI};$SrT^V#^=g8WZ!YO>SO+ZKKD@Tza0NJILs+*Nto&3oj5d)?fK zKt*cIkzcGKK(NlsLW4|zwXguOvH!%CIwb*N7Z_GxX9~YlGo%+|wc$tb1 z?~)(cH?AtGHGP20eL)u2l1K-cdxERPrhLG0MSyFH6FG_1{`1$}f-Tg43TP+>6kW1K zTe@LKe{|a?sB#nSemg0iBTHW+bk$0x2Zj{OPgY`R><}D~weGZW%Wz?Lmo%5xkCc_D zD3)ycpO{Pie<&d~?KnamGuA{zHuS2m2U! z772x?duzw{wA3x~(7TD8fcqw7J+q@zVCGpt$2eEWiiQBsrLspgRh2jP8cTWQsZq7W z-U7KlJ6<*Nk%6vwdm3w1W52gm#$Xh|GgsIJ14IgLA{M8j=@(|q1BcD}G81F{Tl^gS zJ&TX#j6b?jwFUb|-o*1W|OI`E=S@^pQ4(^hJT$n&}v5yeX_B@+L z2dNe>m7VWBS4gm*5}9sdyl)HR!ZB~!@7S{L-h1Ai5*EzaBT`~DIq?N@@&A(2aj;mq zR_NIwsw2ciNv&GS7atR!J1Y(KME>r>(tB>OdNlFrvtrd0e*BU-KI8UwM0?s}vaEVS z#8a|Fz%E}xfWo@tYOu%=f7m_2l`F$WNlZ|+o9Jt4d_7g-FeHTg>WjGumI2oWQ<0At zFUXV@TyfAixIy}yTe=`;Z=}VO#G3k@-m7twiniEBr3f~IpB{2Q^SFSHzy45i->?&l zsMimxzrRV&FSy6&gk$sGw|`ZP33PB(GL?){Q6);6s$Cd4V)CCX*vmuy8kDM3$`GxO z#)hDbkXTD&tEir)ijILX4QC;59sX@$qCzzufP{*1AjrC~Q0^f4J9c(S0^$r^u;+<2 zdyO|xP$anX9L}3^7v#erjLp&yf3vb^iXYmS`s6!x%u82@2%_5C6?yy4*oJoD$D=l} zgw{M=-J|{Bb6u5+GL3k zO(Ib-rHOje2PU-Z<_Gu(+z_~boVHm^L-nK_7NLV630AmCtc7phg~saF>N^A9eL7APqcNzDE3 zhx+c@*PTkr2=gj6dp=j2m?@tcFC88!y*yfbb;89U6J3Nd9kPhXx2{Yxpx6UUbb>&Z zon<6ZI6GPS;lsiMx5pjZ5i4VSvGOMyLv=abQ0tjOd^1fC;ru(hP$9_HP?%Njo z(PuYyBweBoxbw%IS%mN^X1x#}7Sd~|gw@N`8=tEF{gX3)xqp#pE}5;q_qN#mH)SVh zD~C>&51cUzvpmp_Ns)+{l-RHRL8n)S80*{Y=U8*BLfbA{?xr@nZ+k{SuLjOvRW>W2 z22b2aA#p8R5+-3#zX&la9OVH_>kL)T-TS@R6c#_-pshGKpp%rm+zX7|uY3NGl-(fJ4ddIFgT zZ*70@o_7$npTvf|Qr;Q=FN9=>$BqT)8YXj#V{WZVl?41DEW2j4{?6U0Br$(AYISGi zcvMb=lWk?{G$2O%HU(MM8+#g&X}5)BQR^6U54S4z?*gj_w2)&M8cIo-Aky z#M9BZG|;L2;|ohT7qRy+tiOK?*juVlO#CrU?AMH(J2qW|*McoQqOk9#FrfTR5H#@| z%d=~qZLk+ya+bz6NFBFI?VJ6L{;_AzKlV}$>-*6Md)D>0lNgRg5)z_1np{gW+dLWD zl*wHQ912)UU}(*}Y@B=EDbB-Tv?b*`R(lr=2ZwyW6%xi1X0I2onJ^VM2EL&VO3F2F z&!Dt-a|R}KiWfbrh$RGn%M=rIs&)vmK`}inWrwBAIx*QJL^BlUPU;;woxA(dvqTd9 z-L36^@}5DpZ4Y)>YvdQ=-e&g_0FMEMxBA|zq$seQLA-Ge7iFK+rzCp!`n z0tr-tm7>USB2@z?fE9suyv0|H0Z+=Z1k0GVGe2b<{MzO{*L4u)9o%x&nq91pO_ffL z4oy~pMb9Im{v;8hTirqx(ViAAKC#J-iq&W=TZ z6<|`Yn6Eu>OJ^*q*tuz^JPmJ%#T+;)$nVcPo(WP=WJ?$mRmt`%ige=a(r-p;F@<7r zK_tVp{O6i*wF!w4yD!Lk9)=sj!9u2mnd~eYMy=owTVy+cN|UOfvcQ?MTQ<$%vm`0_ zgn4$V^7_}eUALvfnmJ!R`!o^w;ebgMNY<1M5fojpiEVkO7>j@Z$+3sNGTGTF!Q8AK zK|W)?tlKMq{|3#00<#MLw15>U(FJi;XRM=B?rqn*bQwEngAsqAkyz0)Z43Rf7M5^& z0*(|XtT+zQjokuHF34OdQP(Ov6&&U1`o1WO8o<`HY6dQd>{w4tz52z=C&s6Bgw}WF6n}h6Wu<$I$M)DaM7RKL! zOW-|+Pu08N37RYL9PA5HpWtDv51uL(D;AMuA(9OgYou`8fCe!vdZJyJBaV|zs<*Ax z$~CkO+5RpG=O*^sA0{Dm16PnRc5L{N=lmRm8sTsSq$aQv0VS21!M+t_c4hS$nf_wL zm|3W@H#@PcTUX2n%k$WDc>;)Fm*%mhsH(JcC`!s~HeMYXr&OBI<=f#DdS|baUf32 ztGRez8u0MHeuHJ}@?njUnqgFH*t*!Ta7&;%G=NVC66b_WnB$4yq*H-;_$I?8Wx(ck z;#?lPxfqF3ImJHNXjK44Xw1px1lSd;un2AgJyDXTjB`VVOA~-OgNb9?wk)wp=Yu&9 z)Z+?mnM-3?{!DPIC)BV^cyCTjJ{BPOwSI~Vub#?RYqp>$LZpqw&CQ}WJ}a zPe~c zR9t-dpZOeXmtyTwvQ3VsBt0f5DtiOPq8awXeywINzkV`2dkZ5vOaZ3;>(}fDG6R}VOCUi zDWX%vM_3G8KF@Zr*CDn(H(5M+uJGFF{IjRZ=g-3M0!gu#P#GD1fx%}A4Tp2X8`yD|xK*%)& z=BFyl@XsuU3}`KYMKx8y`o%QHo)%DfoR^!e9saxBn+8+U^OcEShz*e0S_lHM|_Bn?r0#im8(|nHcHdhdf zvY1AaBy5o2k06-0WGkhiQ3ID@!W2Un0u^A7s=>u-ZN>@gyL~Q6AdU~1Qx+w3jBAa3 zQ;p5SX>I~3<|{VFPK&Vj&+Ku|#IL;usHaLWfZ+dcJpaiiyIz9{_OUgv9tIsFgEAsU zHhr7T!e;~5E+8}m4^|8V0TbG>W6QEex-7&s84)rhYq81-V7qK?!%g$j@Aj~$b+2J! zVY9SdOb_H(c;Ys1(^un&esR3z%fJdqt$^mRI*zaY@`L$UG_?{0M*1C%5kib~55kg= z4DNxw-(vF^;yQ@>VX2l0ed%!cCHM@d*=IBZoU!n#hN(yr+GzZQjvW(*3tC(ejjsMJ cni2B<0EX6Q8QgnSO8@`>07*qoM6N<$g6glvJ^%m! literal 0 HcmV?d00001 diff --git a/ios/assets/IconGold-72@2x.png b/ios/assets/IconGold-72@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..5b2fc31ff7e4971bbbabf547f65be0bc9892db18 GIT binary patch literal 20904 zcmV(`K-0g8P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>DQ9VgSK~#8Ny}bvV zWLJ47dTtICJBOK`oTCy-mIO#B*#Z#^OY{#|ygcKFv9X_@*O9gHnzh$nd+|Cv?6sF* zFeVrzk`NLI38YaTjYgW>J<~JYJsm68&F}x6d#mbJ>h96Z=-;QSPWVpz&i9?~+i4lrMDFskHT=*xW61_ z?W?Iv$ZP5fVyl+T8PC!9ZcsL(l``%F5NM}}&=%1#su@HOHGEmOY6$~%6I#RdF~XqO zj_bO9sZxapLC6-Swj_ucyKLGlRV--6khlgOY%4O10n`Eu3wedt4oI8UodY7E_Z)(WTwSrU_`)?P>(Y6Qy>uD0GfI!YKyX(_0+ z-0t;I3Pizmy>!BGp#ixLbUhyo1M?imlOQ5d6)nZ^U@SWP20g?}k!3I*LR+?M9^FJ) zLlo7B4gyqGwVbMLV+s*t5atPSDu8%P^Ojr`6(OXI9QvZkGV_@tNwA;dNww^;sHn7B zO5~a-nv&Ym+TAiL5y^411lz(u6h%g$?RvK3S+;=zE0ura z1J(;xM6kF}u0T+1ub#JwvKbVG|0o4K-%!zalheu7&uZb^v&)t1>1Z6b9*d zFuwy~=e#kjNU$8F?B;8@hdM&*dMjF@S}o!Ba1CU{qd*K6i9TkSMss9ac zTi$vtO%}G=f~&LCZOTPzqQce3IO2lh&2#%8tI=NcQ~t z?DS~zyrGmaudwFGB0Dy_?QP$Cz2}%A%ff;>)f=K)e3a5Qb(X;@C|5($#xS6zEnSPj zV39T9`H(Z{2(0N?+ncBxftEtr5>`P8)WnE5H027kF%$juvcEM^-jdDlA6VMjo9jg@n}@iQfVArlImHz5p=*xl&dJIBg23w zYpo-lOTus@46W+GlJHZ8F3V!RRE@@_jz-p&LfR6#P@)zT3Enu2m3<*ciAHpy7VV9te?Fj_m%y@Yy9{EO>3^4S4f@PrD5 zf_};0rd!*3^1J$TyZe@gQnP8}L`Gv8-whLcIvL};@@h zSS_)JPH}DMLeLg{A?#ck%PS>0hKg@kx}NWYu1>LPp2dQpUB{TkggIFL zfwwv3UX`+TrVHzO=Et%Sqq$yVmc&S4u+cyaespCLbSLJKoRO5IteSRt&a>xH8?rxh zZp-_=ce@N*kBq)(C)(019&U|mLl=U!=u5~mFzmyjhkv#sieFaFxUmtV2+_Tjl)}Y` z{4f~`K3jslAOw;W>{sp0>B63YJlt4zF{Pi$Xn6x0FwTjN96}UD;vWTLcO++IH6v>Y zS{u;U> zGNDwp!^-On1G?1_#V^CN8d`bOk!MhwE)%SPwnqWBR+@cB+S-?`Z0=he$;@oX&JLy( zg`K7g3CPW@hKRW_L@^{rOpwyDoRrjrteFy+B!fwatyK+DL9mLs!t8U1L#*qw-+TD2 zUpzfFpnzX3*LqqT+@S-pfmjKvr{riR$DCFbnJ&Fz@vd57mxcAWe>g_ht%4|iWuCQl zCeAaGMJ)R)NJ-w7bZJL#ZvS9zLv}H1p3UeB36%*@tBD)cjrUk*e(WuNr|C*(T#PWx zQc~8kvI;&yj8svgv5%^1XD>G0c6Dj$X@;r7%lN|cxBcpqyEf?(l46QHL{qROjd1xG z2Gnw(6WFKgno=xV_@v8n4qcVy32gGe5ugz>qnw zD~<$%1^+yW)+CP^yFaB3?J7L|=U)CtU;zz2XObu-Bsmp{k!nDUz_dn1?M!M0*2mn` zORhbS99YJlJbm>Y54>iBtnwSHD5O?SYs2ekP3TV8HRXbUR;5j&>bNlFWKmEQnY3c# zYJH=>%k-R*IwiNobsavsSd@{24Vme5&lTp@-w=E5b{*!q;1<*)lX~vb#%}Rl(JMZI zj)O_6vBvD#o*uj+GrT7~v?bZMR!{XRnnB#6^1@|pnKnnj+9s*#dQ1D0v-?cTYUEq7 zgq5p^u!_d45)}&^3UpObRfR5!@klTX74SM56)jUGC3R|2TU0X<0^H%xeSY4YuQ28n zrR19A{*OSU1oJfkcESSFx4uu#Y!Td2BBQ5=ug;9@PY-Q2dxq6S2C5H(&dXR8huQ%% zB$Nx}P8+9R(^H)y1zAVfz_9SpwV)nPu0~pS@w7&KJbES91e9SpZpCuSmQ|`$iWZq^5G z);7OYP!dw^pyIqBsXc%Tvf?SXAWiQQWsc50dQ209b9 z$8z?9n{Bl=M<7Hl3PosM)@vWlXpf?p4ul=!;t&K?WM^~Yxk67MGB5wr(u<$Vh!^mkntk4CZTA8pjMLZUA z1KnooO2VL16C{dptfDberXgX321nZ`MyDvC)Aa02$=mMd?BJ?FYya>#Yzn{hl5d&n zz+MOz6HS^xWbA27xta+n7FaAOvcO>inYI@TQE;jy&&h`~x9TbnpV;KW1fhE^5lILh z>e7V{SS>kvFG&Je9SmFWf;(%XI&e$yk#5%wWaF&L$dq&%_n4$ zX1iZFAP>D!%4}qw%_JSWDwbHovin%iRV;HAOYUQ0mQ_#i>|GnM8o=)N9LK57g^kr^ z=fLSLlT`ykPhD;K~p124}Fbr1kTum$d1e!i z&)hPZ`QV>qMDZ65Sq+P#!c3*Sr8l=2Uf@Ew-rg`2b*Qt83TYt9v!WCDH&F95lEOm3 zEvU+bfo&z?qR6<5OIQ<6V}Y8t5!FN)Lloa>c2HCpE%@FkJGgt@?7BW*+x@5JmU{#_ zLE;6yhn&^(?Br+J^w-$=Z?oA4*y4{^`7jt;FZ`7Qg$v9sou_$#sVcI?((u1e4D`r| zuQ$1^mM+y^pa@0)4-AbCv!X&%Qz1!^uzKbAhJ2N)bjrxkiDz_9xfyLnM-8z+Yo1Oq zA)(RP;BpP_3U&bNHbv?5nDlgMo;p5`iQL30=|YJf~Hpn~N=l)sMLmafpTwXbOa(<|vL1Q5;b` zDvE=yw`$Vk2TxBv`K9XN-*gx514mqMl;wZIiYJIW670jqQhaG4sjx)}XjNK2e??Da z4t84CF02}>E&%*x^05yjVehDHD* zn)nY-ot~L|f^2xcJh={I_DMGX6!Qu-E90_2Ry9GSdw5tK(i+@FR3QDni58jEE>cATqW-jy_o&3nS4u z&&m0|!g7zZ>NJ!1hV1fyFJtMjUMyoH*;yvi6HpP)LKn3;?&4@kin)3TO)j3Y96%Pb zsX^Z6>f;ht8ABt~9KT$+HKhfpkOR|4ggta{ChgXCje%SCTyXI;oB07NA7z5hqc1hc z?vN#H(m5bx>$B%~tNdgrN8_utE3M%b0R~_qVrCL2E)?B!v`pk?!bYgI0ED?Cp2x$S zCv_J`6v-zNvCNc&L+3QxlR}Q69M`T=dzKz%mBTQRDE4wd5M(uC7+Nxtn%j~tRjEz2 z7SoQ?-wOlO@X|My6hHmPbsVfM!5UlLtwZvSz<^gpKVfM(^87L<5g=mC2XW6egbxy43eW=`C@FL`)FWzfQK%jX*96Y9SbROyEem#tqHx$&Cl-35`#cQGSjqQ2 zTF@>l0wyW2I}CWxCP`#_`}2&Rv8azk3&O~TRc{sp5<~!nn;&dx0XjS7!1b-8%k}Et5rJX{^ds)GlQ zaB{8SVUJTY=U0Jc7#90)MRQyu)QOg(!zc($3;aU`=bhVfL#f4(VFHu&MBim!#(4R5 zX(2pBrOE7Ee)wCHeHl8YNZ>@P1vDxDWVX*-SvzU@v*oJfSvykJjRQ09SwH^k`^Mk1 z^Uxc%JbL~5qdWS~4kngV*`|%CS2=!e%kxD&#p?}ATM=N`mCFqDWs)=U(~-9zUkYBo z&e}R~mPaDaQIkVhV?wga1wpXO1-pDMY!SB4ixu;Wr^ZqOBqVm)z7sDAW{RNgT<^}cQ6AKdf&yLLTw*VbqDkDMCIp6fAkh8*SMGm{{T?&RFY zAIzk(p=7U)XCcGl=$`FTGB1Rm_kvA{>d$N#r)7+o=qbj4tY}gC)2fAPXUI12*dlb1uu#6?Jc$UcGK`@!gxxer)%|hxWd7`=%e= zxZ$O}L#Ibli>6Wy4TLBs_tRIcd=-*i=>O*Ffeh_MW9;hGfI5V++dde131NBNb6hab zfG(v`C;X*q^@i-i-@pCglvd>t%IxrM zL4;|X2>c@ECE`)94d5-8%t<+?u1x9 z^XiCFqOZXBE4Gyt%b$P8f$hC#!p*B{j->}TELX_IfRtgraQ-&nknt<&+X&K{WHdyj9yGAR0Of7jY9}iOvEHflC!d! zk+g)Y>U7F~cHFUMFnFkXy4drfZ~WZJYEs8UX<=9wL<~c%hCxs6VonvxRYj6?RVh{J zq$Mw=OIa7kGfZF4bX$HdcnR_<=Xzzrrz9|?996C>~L~Ukz5c%lF+Qio~?#PP{6J^ zBhguZlOD)WH9AI4hm@oA;vD4r1Z`^g!)m|vz`b9d92u0`Px*HS5uq+aQ;Fw+;Ym|R+1r6ISrXwdFs1!$ZGz%U9oh<%6%^^uorTXnws$#X(RW+MVVC1Woi-dC30!czwIWJZLPPQy*Ya(h-DdLl}YQEe< zedMsqi*${u9=-&?PT4Cjo(=ql>|(GEPjCM7XGi*V=p#Bk;d|bUW_)1R(yr8lA)i8o zBZWdlIjI_J&FqfU;FX!7-RYq%iM};@s#jk9S^prAWEJIvB$y;a>G>_DWz{QN2_&sp zOKjJzST;B`w^VRFdMwF%V{p2;NH)=v z(9!Aps%;vYt|_{vmgvkQ>{(EPx*IwtQAff`x)5;CW|jHs@r5j%UJ9eIuGx#l+2;$h zXXqvw4f92?O%PnGQq7;DVq*Bw@hd-fvUiOJWr%SPY}XqZO#X*$69dYjdP~p+N$pSe zZ-A~-j6}4f4>?2wvP{3agRW%OZpZ~JqqCiTB`(h4EMEaNja~yr&vu-uWy1`Cz!A6V z9bK-tE=emlfXk37J$u%qhoqy(h(}gwJU{hZB{v)RE{}R8fapLO`W_e`#bBvFF*ow* z17ql;B!$Y*otD&(?yFqWb6>od$YEy3L>a4D&C<9Okksgg9E!t)S=T!UTLMcMPh0`~ zk-270pe$&}r9wI6R@ltQg~XAo#YU)y>#h+^lP8WC1**u(?BKL{zC4PdjI#wT@qMeb za5#Vdgi|R-Q5OVySau0Iww{moj(zRm_NSH-1F$u){s;b)%igp_{n@dDD(ycbz^5iQ zsAh_MmlTqs3R3j28a~!$W=ABK-YnT2Fi65%G*WuQ711EY#sWTsVq+8YHU(|C4`zmx5|okX~y?pJ?j^6rI9}=Tbe(HH9D*fz?^vO z zjiZ?$tu7!k&NhVH>Y`IE(W`@1jqh+*Mrq-kQ$1g&1-E7jiNE;q{+EiWtg28UzIT=> zzkW4)>-ujfLio@e0j)B7w!*l$bOy@!Lx{15 zT6w8hitO@?Yx^W>vf8oo2vCNlTzTn8oU`csm!G}nuMQ54B^B5jXuzx!ymoW)WBXqm z(O#~f00x<2j3j#3G-;Vj2)gp;JJnf1RIyi(BzLYja{sBm49wFuj>(b$>yKXPYD2O- zX<*ycT^I(`@^)x;Q&gw)_Bf0WeSt|!o-k+AyS$2GQ1FG4FQg?*J4uyAQwp9v=ltub zR6$@+igMY$~OZIP-AjgfGFDdv8wX1pB7!bn(%kBB>k%1H!xH!u&WY}Dx z5tc(cV|XNO?e1tGIhLJMJZYKqwlsuMI95w12uePi^@O|&COOw<%WoUYzi0dOhxZ(L z)4GLXG5JhRF(m;un(jMi!Jiv_c zT-Wz(f!;8p1fqZZ?9ijLMusH6(Qf$ARLo+X-XtJla||nSe>(#%fM>)adO8gpasyTg zgjtUjY*rN9ovF$jM+)!VKKK4zr#^7Sp?B|p;q{x3?iiXJPR(ZY3M^`5fkOdVqj=?- zlXr|dl4U+Jr>l~v(0wT>p-7tNK6u=JeBD>-8&$Biy z4hSM?O=j-evB}*j?S=D+lVv4EH>c=sQc@9S^Ul|fX$9E**-XE2Hg5L==p77qyE5y+ z7?Cxrv}Bde)VmCi<+9HmxcW;c`}z&Jz@+!wcGX*6xBsfK)EoOgmlAVyRKa7~#$Pcu z-o=WimC6C|zQaIVVo>?6>tMZv-J!_hOu_i_(M*c3Vy%^9*$x6&9OyNdun6@oM&EUW z1@KX(d*oo!yeH(qC*L11t$T)x@7%KZ{@oKF+<*8Nt~hkpwwLw}pIMVV54q80%0*%n z76jD%C=s6cOai5;IJ<{Vzixd#8zjDWUU!*nq61I`vS@hzV-vv-CbPP{VNFIzDhpAz z5L`pT7_neO)}CSx0r7fbV*7_5**K)@ur;uvI=1t3uigK)*KX>~uJ z=0$k{UQR5G+C(;2HvZ%X`;Qb;J@is;m}UOK>EbOLtZR0xQAe(q2d@#7t=hV~=uHOD zqBGxS?hL)g;PL~l|JvC84j9(dBusO+%<@NA zX@ZrGvdRhOPBFUZd>MJ>`q*HhrF01u8t-dQrr-PJp0T7vfi7YurPp(#qmfEJjDFr{ z`!c29yY+z`LsR{UrKCppqg#Y2ViM^zSf@RT-lv(PdS=YbtTWPsS|Uq#_UP?}o%Xgh zV2M(V6!QA8a@`_TUuz7C$7qda=6+_wiM<))%wpoDqLP%617^RJl-a=<_upQ|>b8Eg zC)sDt(lZAFf1@RKqoP!F%)fkS#}B46gIG)Hx`sa;$iMwF%A2?RSQQoo?Fx1D9x1z- z9>@$|U?3?hv6iJbv-D1u*~1b$=phN~6s2A+KnGCm7$QlQT~GYX^LhevgqE?0q6Kv; zv6W}om=vwx_D%Bx$x?KRfuruBL6IRpDLuW}$c*WkAwAirVhh8!M4@6@JtRfd%&Z_{ zRm=13BnlvL!AuBf-D5k3CvI9_P6g%z=Z(B8W?^}YGWJV);5~H0J2=yqG}o@_aZIJa zpJu0@MtSJyrvLoN@Q8^Okd$HGc3-o#@8j1U9Z{cTseAQ3zoV_aS-^gaB#euuy~N6A zS$UF`&#~$(bCy_Tk~!0tk73}7&onYRpbjM2_N3>J$tQ}U+5Hfel-jVDdzzDjKn#L2 zRsRiZ^IHe!Ay^>z5j`rZe{r^1yrbNq$N4+VUYpH4as-!ekwKc^V-HYiE_f7KV+TycmMQXD4rwqUP&`!@dZ|RkiT&P^CNW2Df3GM zK@HG$-bX`|&&-MUy(p&mJM}vXS)5@&oFXWC!8+BscH?An@D3)VgX)x|rnE#4vCc2B zRCF)>BCNi_N$8;w3C)GoGZrW?%H7Mj{eY;Dv2UJ zF(OF`RhTch-#n%~douH_6J|zLAb*&vW!KxWx$n1cIkzEw9F|647wywuai{(75zv9<4`C3@}vtGsYIo*^e=L`y;xU=^Z0;T$BzORE}P ze_PX2e$B?*)dS+oGuqLdgry3mh%QSBkxiB*T~x5dq8!in=8VK2ypG+r{w1jNpgQgs zpJwhN6SIQcCrF0q&kFJ=OKo7KaaMSoZ2DIdG?*DCspuX0h;7-Ao^h8Pf&bD-L=s15 zhJ~~W3r?1Uw{DmjF)PaG&HDP=h2+hW?+VT{Y~+{O;4RE4vGd<$?)l57=wXbg^d?dI zJw>uMF%x;m&^@rtP}z=={H_wJ;>ebmb*MNcc0=b8wN&Hrep-Mk_$$fqRE;Y&&b z+ih@xAJW05lDHMlN6tT`H|buzp>*3izqqKJDez59ttZfja^NbilhU=}9x-KLb3$B4 znY;B-Vlcslrb!bL2!$Q=^ z@LdepnC`rO`)O7>82H0--!4JxWvNZ{Vnd*CisheXL5aVH5{j$7Z@u(@+$ai6a8epH zrkqn7e{R0~)u*h}OR0f$awr? z05vPBer4P*kMkcQz*4}iu2%`@kQQizXbhT!UKY#VzdTw=>tyfnE;L~ohEb#4z&8W` z?p--kE4zz75);?Uy*r}481|cBUiN2L@+zioW@3_f=2v*$%L25XHq6)p6VDXTKQmaf+k$0#O*kr!hi1LM+m>eHQ-a$&$ezYwy6Y)c2tFR%H3)b)3WdN0|8^tvXscXvu=uxB!@(eHgu4% znCc85ma|Llt(z-X-1w{7t`A75F%mDbt&!-lrI+a?hq)J6?l3DHXQk7udWv4u3kkTK za010ALor&1fTE@R?RTW_9+CSDv`r|x{_vWfzq(i4q*uRpN-PA7-^d1E<)kK@n63QV zGj_3{j`Sx6Gq5IMc5+E=h^!JwNhT%)Yy^FD2LsX=vQ}m+!;iL99;!u=Lh@)B{i>ji z2zn1qG}JANC(o3Ac-TrCaS4k&om3*{8E=;0_(7&G^R73)Z^t#a3v$BCPuk~xf_TyF zrFR=1`)}<0pV2ag?MwLuRy__Y8f8YMTowdgpt=IOf?*}4&l#qC?>X^Tzb+18PKvT0 z_;Z2!pYP1P``U$@b_Un4Ws_6Fp?Q{27%3TkBU=x=M_w%7cf>PgV{AZA)3u;*UF0SS z-#jqcAo~pluveznZpL`l0nLm7>THQVkQ<+15^)InHlTN)DSd*zR!D4xqN2+>9I`5& zowdI9bSb5R4}>s2gp^vxRbrd21n7sdW%W1Tb^HFEn^Vq&Klv@|)IWJ=KP5=pY!k55RzNP)FvUhPB4cBEh9+$jzI`f zSSq;x^h6Gu4=!RY42!Q}&1~aM^L0`9!Q;WcsHfb)eXg`pG{ZOQSxQa1gU_v+V-m7q3>0hq=a>4u%k zYd6c~CI5*DPsdISwu>k!vYb%alP8Lwf3hU{>PVm24}Q`CTYgEUCTjFbVr_t|Dkl&1 zwVc9_#+<|`fKbx%p)sXL&_;#CCLz65Om7vEYXzfUP?KZYhfMIoVzk3Y3^ zrWDXK*R2xPY;?o{LhNInnwUC#bmlErcw<9@Oi0jMn!MApxmz>`Y3ZuI^lCATu9JFl zFKu{90*Gf2uOGkYe((#`{*(&lK_kpmh2Oes@ZGPe@?YH|SpmHt|Bs8&HvvN9?!UzSS)u{pH?9M6eaoi1jUY;X6D!Qa0}8SC+UNJ%u-H0bcdYR@E;YqlBp?9{!o z_u~_`EW_dl+px!zlcsoVy8M+#7H0Bnv@bE#qs#PL=-hfF#>0t%VhF~NAom1Lk=~q2 zd;*6&QqgjT42Q%#3fKMt?eDi;xuQ1d=6v0nN`O{VJgL}&V<9%hBZlS;)@fEBW zgSWHNNmhF5!mdlTa)Q9)Y6+bPpkaJ<(8mO)mPJdk>kFUx_TooBTfn{wYgypB(}Mnw zA6)Yb*E?L%P*ZttxvO~yk}#k5zkQ(an_pX)p7%zQm;vae7kG~A*mFzPz*zG4?p^n` zn+8UE`6;57CP9xmWj}W!uoncim#JCkH$gV&{%0sa$kLLB*G!)nJ3nw7e`c|IYN|3h zT{<#ec=}Z3+oxa-7w7)HMEtAQvY@co?Q?#ozT`lvPBBlz^- zBqp1$3VCc+Fmpq)u86gqduw5Q^A2=IQ@kIDhM(9H{SpBmdRY>mc&T*#pH5>ACsY+n z`*hj+(4Fi5_-)!?(&Il)95M-t5i^;CXXGA875NXJuKu6z&Hm{Fxr8C4Wd^OPYf`CL zJfADsi{72L41DY@8*bT?qU{=;FpB|2@u^I^z-XXCzQ)L?2F@hLY|CFPIEA8hYN~wj zWbyeE#Y5x8XJ-Re=K9bSdo@{wG!Q)+Odt;x5EkCRG7O_8Awxh9)Orh!{lov;y>Ywf z`H(OwM-2)h8SzoR)_K?*Y5?(Jju=7B+aZekf&hlE)<+@g0E|3wvFQEE-<f-yjgJWc$t1p1;6X#0});4_PV{FUjaCcUkL zrt3P2ELAI&O1U&!vY4v={+q|%b?fksH82n$9Xx9{P_>*x#LB?)g1MYEF;khCDxaDx zJbj}4&6Acj?Jz}v7$p=@hfa^o!0@xyu*ie&$PUr_wK7+{0aq0lCD;6jI}&Oj=baeXvMZ{b>>cY@}S@VW2Ly#KGK zhX!|PLTYQbi*DGVM$h(^O72qL znx3ybf1+^kWckpk!edhoD?uC~Mp8zX3|Wj6UDQJ4=K~m)!$B$C(atb{IG!+dG|h26 zdNEGm&n&s0{8{f~Z!uIEGmXSna*L7+dnqdYl`x}*4&LY+!mJ3rS22>0uqRml#lt6y zZ~c>_Cko<#PRr+1#l7n_Yyal`!y5-Nxp;f9ITfYAu6Q$#GVGtIv_LR6h}kW48UW!? z+UgL6s^$OW#oVXnv5Omc>5shT#vtX~R{UbcJ4N!r=$5 z7Zgg)_;ls;48$n^!l}~3C#+NF98#ePSyv?!yL!G|C*Gg~7tWy;bYK|zLO-!1iRG%5 zGIcDHm1-3$#9Oy{fAx#Wksg_DD1xWHB~{K)rOkcsj2KO;cbV*gBc%5U>2*ASnqaAk z#ftY^fA`Y=`e9+D2UALPU2je^@B7&Hd-n66;0~bvSpMU;&Z~W7>`~7ub z8^w#w?hq3Lq}y9Hq~Lk%=_C37`HiVBJYLe1Lazc147Nek+^XZ`mhAnT&4ecYC;WOv>}iLTT(>*&5~4y4RmCnu7DdWwJv}lnq4m#mWXs$IV1wp^Y z?zyfHvpc-jfQ|)~8A>ENu922O(}1*tXXnL`)>3+!EF> zDGJY=ntRRe(Kr6gE-A5r4h1+-mj&~V+3Vk(1c`qlV#JXLPw+?Dgd*ztG zK~QzxbVFZH+6bVY=<=u-RL;{8Oqi{FBw`~|N4T^^fezrQk<}J`x?=BDqS;rAC1p4@ zSN(&3K7ItFW+-T1mEK&_^INZzHV&tmzJ_Uo%vjHi4NS=}&+<+`7!<$BgdyIruq&Nf z5QykVU@!Q^Njhz;CTr_u4P<`_JJu&&w<~EaR)08QCFymq5qs*0h+h?ua%cq&Uu~4R z<1M0lP|wf#CudwHt2Fl|6>9*KGvT`c_?Xwf%5l-BUT3n~J2xtv95WX!)rVPuF ze&wr1EeTH@UVO*jo$5(pw*j$cvlaKItJeO`z5N4ek+~J-=2>zF{fL!k(Y0DhlX`cG z12>4-YnZV^kO#0P2W~DZtt05iDdoT|dBxL#WeHkRXnD|`-oh1p`{|rzd9c_GUG4O8 zlUD;UI(E``qivl9JY+=4a(9o&*YECA6wV>2M9=X{XE--&88P(BgQwF6O&Omqc+*`8 zQION3K7_HBU~t#DB?@y()*t@Uk%On~OoHA+=sIpGoB6AEj@a`W^nmoMNzv$m?Jg!qVJil?=XsG}On0CJw5U4c=g$QJ?DZ68WW6PtB0Tu`%*#uT z?0aN#NCND#j-y5Tsq-ja0)Sy$!kQ}RQX4FLY|#Y&&TINpDgMe^j32frd1$2CIPmYT zgA#Hmyl+JB0+R(LD;jI0^j4{7yVSEq%B~Z2*zvIf0`}z}O#acA&ky!#Fv(EcY%%z? zpWFEUTN1kLGJONDiNhi1Mw@BGJG`Ud*+XjDbfFU|yRnG0DBNWxT(hMky1uVV{r(y>xf&uc*UO1kA>t7vJGznXH4lCmuvpj!JwFUdix3ss2< zeY5BsKUb>d;78uo9vHoU#pDWtgN|K9^Nfw*NR3a zI(b53M@A@B4_T486NSYk`=9ThC@=Wf_YjrqmPPH?ZXen+3gd2oB{mW#77noK`<%o7 z%{}qU{v!W;+al%$#%X{4sa_5S1d1 z%6;4Y%DgxIBYrP9CiKmq`j-Kv;vXB*s+7dU;&0#+p#y^l4$Ms~S@hg^o7{+^m^AfL z#RA8nQXJP!7&^UTgWp2DRFD#5JGdt*vU|zVP7BLepX}dz;}C!Q2%-hp#D0Dp3%&r8 zA+=fV*(UdGlY2JF=@HTFq1)=A4N0hTD3T%g(7jT{J9)PBs*U$Wy zFP{DSLvzp0IfEu$r2{>BULETF%Xh5ZGlp?QMwf2VLm}H$``j~RA2Ky?%3{xM+K0_N zN0&yQ1DNC8Jw$Say${SUfOpB{gu26V!l=upXfdA$gup`<$e% zxt?b^?j__FAPnC4mdLv@&uB3!Io^owee07~Zd;$Cn?qQvJUg(kKAUu1jvjvx3*aIg z2cpq-IB=-!E*9*?T=mGA!gI$92T$Z*I9(o}<9A?9ktL))RhDIuR&BcK1Bvu!ma3op z;GW;Sw@;CpM%crz=I3T+wwScB(!SjY0^$})rb$`EH55S1UV292)=(I(8A zg`)l4-`#QN4I}iPi4e5Y?8YHV!JM-kZ)(0eey((8x_D$F|M;=e!zZis^9u=y>5`#H z2Hlk4*X3Y_!-y8dif!{C_~oCUEPwC6@44gJ0X|DOMA2QEwk96ps*krZs0zvbLSmgi z_h>-J2s=tx^d0wwsQ0wdkH8hRK4Z&kMa`gCN%-a?Gxz@ass1Eg8E;`20G1+af?f=z z6w6hp!#0wOg)n$SoMBBs?PwE5(eolLOzrXg*=g%DA6xgKdpEUpnfEwk5@Xe>w^Xo~ z^49oN@tI@!7fu!qju#KlxU7Ipjlfb;S`7~}K!zwMfbviSJ~2-bRj%3?max+E^OgVc zq4gho+s0@FprEWu_0(fNZQEm)90QxqiVO58J`YC!9YLeJJYcIZ!Ps)UobD&TC>%PG zzw5soF1Ugr@go>Dpr|k;Npy=Y>`Np0m7}!`tYLAZqX7()s>m2P=q62-Az1a9U3R=} z{o?g|`!$VEVJt;(v?XJX>z`k!K7VZKvFB#*f8@+ReCzZ_zj*o!Upe>CONB#oZq5}` zx{}PQiKLoDp>)BUU+w0Cg-M~vvY~6(mST#cV4wDCoM9{|`QCu)-E+e*GEt?1=q#LZ z=U-?$WQQiHG`}cQ6xA7&+Ll?ux2i+>CwB5>lFy zOsk0jd=Z20jGELHr6ER`ku?r+Klf3u!{*=<7NhOBw(Vj!Q?6E_5?z;mm;{glZ#?h5 z<(l60BPJhZkO$7vS#BRT`V%7J0u6WQ>x3w^14R^7PYJL|S&v@8i-ylHRloY^V$z@> zbpQq{>_Xqqq>{GlRBen{YkS(TB0*PlVHjE_irB8BdYGz)ra>cOZx5M6+rZ8Q3qJqE z!k4}`^T1D+4la1Iq@*%RBBf%VZ^Asnl1zshYDXbMKHqMHSf^*o<@K~b6 ze|g5fb$?>tHvSp|VzubzW_^2!tHEW_U`i8vS{c&?foCbb8$}h%D%l;L>;L^D^E&1s zZz^(QLPINJH;q9vwAEY}?$GyDLNeEGkGvdVNf-^-rcg)V7B+)E%r6W39Sg#b7{0d< zAZLat4GblEQwc*=4PD2ILu*crJ<%Vz8bVIBp+jsC(9DPdOIfMl?BA$ezq?=NFHFRg z_ewdxI90ps)H?8d?Q4&Yp((Y^7o`f!tIFvyDSX4WDADWegTJ@gn2|fYA~qG7wZ14J}sfs^b}k z$q7P2_}UsuL)ZcBu~@g8Xc0hpY5BnM(n7xWJ368une=na)K(g|@T=ik!AYAbV&T^4 zC=&n%xWz@DKz9OqQp(L+bXJMBH0Y>h)6dp~0tXL2S8=%jhSeJwwXqSVU-@oAJZ8_RL@j%4e*OaHMCF>58AUgfWia8D=h{d|2dH$NSX4EbtZG7^e|hP zAB{r)>w%h!m3z^yNy5-NUPS{i48oscfhJUCxm2lOX$eOQpO{LpoADhodSC^+xBD6Ab$FoSt*!xhhSnGi9I>Y-mCpersd6(RE2C4N+>>b z4Kztuh=_{loAQP(2AYGSZ!LM%Ql#SpwsFMV+ACSe^{Rs|oCm%y3qs1&VGSm9jczSA zH=oaM?kLzu07{iAb{+DkvgqLu*0{tLkXbQO7y}gMsRx z4D-bj0u{@)EE@_Iy0NVm3YwC5WY#+|S*U9#Nl(x+=J8*1qH5@yBMk6-p$id@iCmmK z3;^-GSg>Wcc;0vDeXl43+smuBCRvr{HIcrGpr>=7)?ogjCGcYrfuSMGHS4j~3+|#g z?wSJKT`bTMnAWr+(UmZSFc`8ZI$U0P^BTE%5UB#o`Df1MYY~B{YNFl)yMtnulah`S z7NSPqmc0QcdQ~iAkp=F1p(EXh&=%NSj6 zj1LC~`5K+ABOcjsvAh(Za3htLv5HGS%NZe?Qt#NL=WMPdUlFL(W`tEqeB|3xLy*yd z^m3(2SCk|vS1MbM9cy}23U?IK7SZmSNGPT)D()aN*u#NIrlCRAMRgT2phh3d&LbOe3-#@D0ES(+$zbK^tjH^K zEdZ;Mh6c%@nB> zjwKjfSPh9T0TPA=^DSR0!|DdxXpMqgJ$}(`dEkT1D$FxC7y&i2_}~+eU9C zWd-lp+4%NZ$1>)J%UI}|g^Ukr456I0PT&T8=o9Hd7Jqr##R>u4^3_xnOY?DhQ08Mm<;W1C0K{e422n~E3dAWJa5FcF~U zu`7iLOAHIVf2TY`sQ^g0L%A1>-zmnw#MC= z4++~6d8sP_G$A&pVIEacJdd~?rnVJwF*9nVyj|0|r7N(C?QR%SZ`?O%=wwO>lH`_( z&f<7c{iF{80sfMIuq9{w32Y(M&exx*vkSZ%Y~vR+JoTACMluCp{;E9n6_*&`>CBKB%BMz)gxg&_8D4?m||sk)PMmGP<4 z>2rmb$McUKD;+plVM{JJ#B|Y+MUB6hgCvsHw$9uNCj;7kF+FcVongT0i(M_{W#Sna zhC!X5DE;q0*z^9oH$->od@ujSl;pH&n+-?Qx1EUv3U zoMAv~t=+L&%FDqsVp!nMFI9f&j=}%=u`9zvRDkcfWGHb3wJe8_N@C@_6xqV-+@Iv!uujQH5bI(wpOGg`!+x?KM_~fwu02;MRbSWd+8ztk6pri)E_| z?S(<;yC%-CWwBC)Xl0iUthS|{a(B*)jTe@&o7T$z{;8Y$(rUyTLAjr(Bi~=xk$3GIdes?*RopsYuGjb2hh(^DpwZ18tFI z(bTnkF+2s#(#b@nYB|^lhZGlq3u0LG-wre}l`z8XUZ-UbSh=YrHy{(}?m;u-JLH9J zUZx`n{!c%3{na}%O)sG2`S}p@M?pP*E@z#>YBW_kc_#Pt@xoV6RM=^Y!JJIWf+8j) zx;`1o5wD8!*E}4}tqB47MKt6OwhhewI0ZU_ovfy+`BE9h!mvyy3^dl}X9gppR|=u` znmg&M-nbRfsY*oE9|!=?x-@IKD$swr8Ad0u=!rOowm$Kyn(}hig3?`@vA+C?-EV)x z27dFNTMglR3yTiK=-gcC;ECLG$MY|o%sqbAV)Sn1fMFACNJ%>H!c!BrAlm0y>dhhTNY6}I=7uSPl4sE zs%R5hi5bT)s{q|{bO6RLl`t*r)@vxBhnz7TK}o*9Fj@WYA6fS+@7gViL9S?zPnRdA zO5>BcgD3M394()nsF38PB&Lccf8knqz@PHdXFG>3puuRZZQB*wQ6worPs&zZxA8O> zS|>}QuG13}@K?doF0UNmxPW>)F^q<(MdYGD$AU3-no2J`vn*Rx6;ns+>CAAgeJi(y zPgv*>C10w*0)w7OmT9@k3usq-lPj+Qv}$4hNguY&-a6bso}HQtXjgkhVF#d+*hh)wT%#Zuf8Ml)__i; zGPHmKt0>10f~27Fna_{2X!*(m3g@TZQjFkVQ?G>YX4T2B6?fyrt+%U^fBhNyC7K!L9|iHs+&7FDCK%b?2@H zgekC33`sB&l8()+BGayi*u|xaHcQ+?&1rz=z9^s!G#f?14n&2}dx0N7H?E@WOHex) zwkhjSF- z)C&Z6`JyP58WmPc%M* zNea2+R$oNchF3hN1iGZ|Vb#QwP-EtQkK0MG$af_w0PXz7MlfwdAI7cW&W zj9Xv^G&wZFQn9pDEFuO$L{bu;f6xske}lwj!>c6Cbu=?f5IBeEwE-%Bj-NlzqNCd| zwJ{J~T8HRY+-~rUggBQkKsZoi6uoND{tp%!pKaL5!ioteJ&YHAl-N*ZnV7mNmA(pe zDCQECygEq6$VTpI8Yzq$7E|=!^T`-;9sH51LDMiIkUaj}b@##LDczHS4vEXscLAMg zQ1FTU5b{GQlE^v^62K(Wz*ebTu2!LPVH(gw)32nC7IZG+5)`}|F!uigy>J0s?QRn9 P00000NkvXXu0mjfoOX0{ literal 0 HcmV?d00001 diff --git a/ios/assets/IconGold-72@3x.png b/ios/assets/IconGold-72@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..25fa7224ce8dc86c5077f6d68ea9cebda584ca1c GIT binary patch literal 34148 zcmV)hK%>8jP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>Dg!xHCK~#8N<^2bk zBw2YT3Wrbc%5_zDwfAm%rpE)rAYfqd3{G4m1mc1mdZgWbw7c4U_FlQGy?3S6{z6FN zYM0d-nUz2i-VY2jzyRZ?d)iEUTV1}=XGVtm-|w8r%!tg0tf*?s|G#}Y>%=+Vao>64 zJ0_gC>5acE1VD8E20#pp42=N90U37Cm4Pp&DVF1yre)aiZB3h`MI5 z9Y<4@Y$~2jC35LRIuXYq>WWTvB_hMQ+6u2CIVC|&(F#SD^O+PX-(T~aQ85p$vTz@+ zL0(}*Tpd5rR zsJ{4iKuE&AGEiXO)3b$C*7t%1L$)i*?Y z4ucABhjrtS0c;gW&yUzILs0TIJjva^40O;90Ka8PN+)ADb6TcVsW%i^LP2Onx7z;n zzN1ihqNguEwISCP_C9SlDQ_;DOB`78)i-X~ct<=)6oS0T0NxRIX)`@pw#SEW9@Dw`?25 zfi!%g28$&MSW>hzkJc`q6l)i1*D@^KXsL>fM!9W8*2`tcXCo01BIXMY%__VMPfWOw zA5rBZV!#}6#U=R@L`&`nddt941kzYpW>RGK;7=vv)p`>XM095^om?nZLCQ=b-X2T? z;feA~^&f%p^`=gf07kxaA~u9sLQIW7h-Cy|W6M>XGG-=~!~~I~L3YZPvph8U)vjIG z+6bD&*@YRZ8@K{^N{?ERtE;ddgBL3(DX_4x@bCy9x>6XDU=%SrgAu7j9AhO0H4Mt= zIo-gp=|BSOms(wKwG2%ES!WI?#1rn9@+Y7;m@b%M4A4VaTGdu+WPQ5^*Pq;vZk$gF zwS{E`$I&R=C{^o4(NV5){MWtG! z(QLs!v7x^QAz6EZIceO3LEth@8pBAfskh8T3`Vidt6&62_)_qLu4`wwtXmbL5D^H= zKD5|q^&u(r8FYt98^%gd1dPKR9}%QY+eSF)RG>uwY#8%Kfk)2o#YC`>P31C4WV~3a zVhn{nrlHz5`wULrhi;rtiq#U?QPT{wSgn(#3qVNLA;ALxu0vfYq}ei?x}mAGW#q<% zV&%oGCP`FuSIr#0?(iYJVIgVS`-4I7#n1spWH7G71`L|nWCH3$Abzu{1jI0FbOrj7 z2f-iSPRDbApNJfukp4&)z6k#T9Z|Nd`-1Z42nqKD57H!K2j&2n zk7At;KWR*nKt-GbLF(#3a9ntbL3wo%P09-p@h;cvNgb-R&=Nv*H6X%|?lIH{a|K%! z)09M9#RSfv4Y?*oaS4v_0}njm%nP#t`%7go7?zbx#1M)iaLD9((3?XLx)JcX_7A_@ zakM=lrFan{;0g9=)p4-U;@b|e_sAaOODdrmIMaMKY}s-dd{WVpgkVL9y+j1MX;;q0 z&@?MDjT}%X&TN=Ttf?{a2X#9A7m@<-9eCgmM{WG|Xm=cylKyokn7+`%^9R1MZ z%5iK(FecKK&AG(`qn9!5_|s=!g&5kVV#SegD8gesF`WvdE<8Whina{f&|y9=Jn6&G zD-t0|I3gzQAtKOC7_O`E%>8MghPbL&Hcm}bj>N_AoV^uu|1zvR`2eZGTy)9T6=@HB zNXA-+NoQ88uT7P94bAQzp4mM-yDnYI#AwrgsTu#7FaPX9GfgUD!mH$>KRB?$RH-&K zgD|*UhF*~fNx~5&aX%3`x@m*jvs}*YG&m#kX{_h8TBBKOP=CNw@Tgw+f(PW^jS5c@ zDY*~+V2`Egu_&HN7u!;TfMXeJ(zVUGrJX}F`$wiX=NBhZWmWD;NJ)SBTkm>qb_4lI z39j*ChwlI75Jko(6@Fet#LAPew!knV0^Kb8$P=M7mImE~1+Q*c8k@CX+3RkX1j3i= zfFin4;VB{|_n{rk$>-_9uGzzXMm{?(=@@gj<>&W~%H-0nBFq$O}#h2 z4kDEjF0}IG0B0V-jbTJ|Cw%k^#@Lowh&MK7m$nz?_K!|)FU(`iO{f;hM8>1%w*2Pf zZ^m?4q@7E)zV#wRC4Gn>){}9RB!jT>DvWBCGM5zFLV`~Cy0SW#I8~F)z^!t)bt`+k`Sq@rtB&ag@{16a^&+>b(wnS(ut;F#x)K8hThU! z20We)2ua=>99Bv<+$YgKX!DOB;|L=zFB4T@OAXr^OV&1Ii+eEJ8=l=!m|v5s#+8+g zx&7e9_Os~szW2jZJ8~^{o#fU@%x|Q>5W>BROSIDJp+pg=hHBBLX zYK_Lluu^)3+RW?3aI?qgCyH@RZR)L<)LN6OV4er&?H!o~3rCZ6F1>p2a`0cosH@0o zUX(SXF~uW0`0TMgfAG{#(FD<*CPpA4aGkgqE^@uOh+gVx6NvbWkt$8-ibdoiA|zQd zO*RmREtUtUIZ`RU37>mqmj|G)-R(Uqt2VX_Rrjx1+LFGoy|6HuDWxwD}H2d^yj|xh@@zu1dB*@i)Iwv|0_g`(5(D`XvJ#VI#cc!$;lERwe%WZwdK*@3#y;|ucU`Ov zyGD^!*Ny8UR1@J5p)t{LmB~F=E+_O|E|Zi+X|Y`Ow%toaAYz3)>3u1pB@fZsvZtWS zKQ}q^#WX*yXPO2XtQZIy zP!B^s{o=vDc<~h!?M@TJY8D(ms2!nMMZ{Gm_aG=I+i{XHEgn-BOVwl|hS9lFZ=(G? zR^0dyBcd;5#0quA{2GXmJX~e{T;wdo)esq&ABCTF>wAF-}Qf} zL))5XA8lR!s~)q|3*S-$i;cXZWtDhZQ4^T$vH2XU)w1OCL9~o!aq6j_B;UKZ{+~bk z78qC0G%-vY!Qo-jEFv^A8m=l zow_pQ3r!IcF^G;`bgbcIy7-}e&w+gF($$QnQ&4aQqGLJA=sQyTK8$rr?eL$Qi{I`i zV%O}^n46HnJeu&q>?I_Hv4o>j{K|pZLTUPl*(!P)dZm*3@K@fmsHbU}(w!!HB!U~& zk5IWt8H6kUngbeCBzg$0RHMhrU`3skaP%9(wv`H45*h8JIdGGQ5xd5wKSX za1u)E?c0y-8eRYkMQwwWyiKsVs9&d89w|a>!$V4XlVi5*`cy~f$i}gGv7(}8W2p_P z;oaHsJM(LA&#l>+8k&fu@|gS)MM#vFyL!-^Qp>pqZHy%A8?r@2_O`KusAXPN-LA4} zD}y7%G!=i@L*L0{JcdKdwqvT&sf6E9`05t1qFu4oG;O&w?b)H@*!G2`_?S9&P*8JLvt;YXkO!P7DQavqk=v3P*`J%ZJ2$aE zGrB2}8&eZ$Nv8dF5~AW((Tq?iTB;{MRd%))=9w48vA-@n2T`jKEEhF(biu0w3_-oA zW0~A&>IOZ)KrbCo70eRpj&d#oBBC~)3i;|5v7%iumo@=FL`Ymn8aDyVIC;QBvtg-c zD&uaf)smCzlH1>%-1mPeV~>z&q-S|)CMm^6Vw)aTQXAoST4gOJBnvyUYYyfo?#hkt zN)4}%Wri>WyMym_AfFdXEZILR*gHCd6Dz1(9>Sa(+i_v&5px|&-{S&>yaK)PD|gGl zFzsfm1wNK*^+{un zCoZApR`~@nv0W|ffm4Qdim3y3t!OtdBUyagZ^kyhLDUMOqbud-x&1y3CVnE;1rd0=SAjc|*2!zFT z!^sz#!=S9YU^R7zW;%0i+cG7q@zx#Z=-nWeWmQf~sm*eBvy$GTdqOrIzqn;lPf{Z(qOV&9!6O+xQ5Van z86d%WgZ>YyFvYC6Wr=57$QYV^uApYhHfG|1x;IeF%%-X~=Q7!Mz9z_kboXZ7~|c zsN<%qsf%T{UJ)D-T&zCZJodLn>4e}Ig4Gnnn2_2c$VtI51yL1RCBZHU&XQom)kr2v zxz`#rAMG;``$lJ|bv86)vvvkMSK0>zdR%Xc9_Nwm!W$awdUAn7O*83uCK)F##??YL zr6}}XzuuJGtsHXBH#B$Q+gKiCXa~h{3>W=B4Dkupd_X;6>zYyCbNO{`1u`7bp6r2_bL@D|jfTl%y^@`h! zHgr?|(ur*txM`ZmY7(X;Uq`G4p5&{|353h05?JOIE48L>Hgp5j$);!{&~_h@?F9q| zcYF^95V8Hk5t?PBvcjtrB{{#OLMvxk6bgyfYc`$hBtu_XOD{^v?dr&GK^+!soy?~c zr&O{g#7BkHdLg?*$n6)h`-RNyLVUBJjtj;jlZ;gPs|4EKYSe7A?kz1Yn~$E`Rx{(o zGm3yzXk~6L7jXiCg2}j6s?;5fLv&SAY?-Da%c|mepM)QAO(lETbIVIO`1VZzxEW$z zhF~cmG{OryKY|e{Ii%1Tk|ebZ^TcebYJg`h9Me`N9#PiZB}fUus*~AcHxtly4%VtR z8>5x1pp6Kr%|dRsFnq5t_JE*{3PR_tOV<~oBr6)`wLTQ$%`N%%wl>#6G)=4uo~&0< z3VR2xWjUUgn$peXEyL(;1NwpPPA0UWY!b6c(9sPY2)Xn-^ea5y32BG~k)s0I0FF>uW=jgzZCfZ1a;l)^Jjd>-9ROx{l_S zac%*<@MX6`hgG62(}OnbZqIfe^fC!%^nAiB8a-xNcBS4-#?@SkMkmax+>{}%XJ`(# zqJ5#B0AE~i@;-FMf=?(ye}u@ViIy$iFM|4l9I7bTULr=Y*lD*RZq zUYU7ZxcoI?{=35bqr%*`g~jg*#V3XGGeYe!n>xBnUj*+lNyY$ibS8%rOq={*a_76W{BBWFY^&zzbHe|f7``1GG+d|_A?Iv1SsaR|sljv*s^#q1CMUyZ+@V9A8VJWMzr=gi4 zA=9!fB8UJmO|I{nK`hsrm=PAT$y8j+q+@++a!OqLp~RNADw!>|Q8pG|Y@Yc_{rUeOocsl0 z;m5QJp+VUe)Pf-I6r{8u#%ZQVb4PcHdV|5HiP@g^tV>rXGi7*!ln}0%fhz0Z+Hw)R zg5@h#>bhYl3PuvKRIS&Vt-vWFPAGI0e(CL2?%R}OSkusLu&zh|m|;Mjebo+bgFn=h z#^Yt+#~l}lu0R{q0PZ|+WmtRpBk$Dq@vW~B*1k^CQpVz;#_7-1p8do63%}Bu`tOdD z5f;BEG}-13Y$n~i598;{@#a7j``0U~Z0{Tjy!(N}ZF_+8D$8}fB5{XyW!mcA($Bt`qK9fjjN>gu@$~9d#`bz6M&j^Jay6_!zz{~N# za}=Bc=t~rgt_&&`oPzdcU=!upim^~^HqL&fcIXq$W4~h-zlE0D4kpNo(0pDf9}~OWHK~WrD&SlPuN-{}Hk~A~ zp0fodKCGy+U~58VyCB7cR#7Pa$i3WmlYttDdToYk>4D>jUp~1Vrkkx-$S4f%t$~P^ za5YjZs}gSl$cM!W)+mgD%jbZ``_B~L3D9?XF!Y6nCHEpU!jG;PnTdX&Nf;8u)-$K( zDBfexp)OOe3Sv^IJ|k4m2zH%frDWuyuPYo0b1QYIr%~%O<%x6^9vV4sfKdciBNZ); z2bN{?r$wVskfYO+p2FbmIyQv+g8D?rdA+_PaxQ!a;pmFFg)^`w;XgT;l~W7pk^z$W zV74mMqZSO|i$ZIWf@I9huCjx#5wNz`dUq2u@z&P-66_+il!j=6+idP!Z3Mc0^azBw zo+5f(pw!CX)`omho!6we=>y=42^RB*;>Z&aA$cFVVyLDM5^b$ssbKmdbNNV~Q?Y$T`~6zBQoqZEK_cyM||}vD8SnoxbMwwB3h6aaVzBnr-CFyhH>d zrVAE}TW~#C1KHtrCLt0?M_`N)n zY?%IAuW7wfVmZSvvwiFvcR_hsz>q7NdzHL{@lsLfuMwzCGwl8;O05Cr@y+U5qh&izJkqyXuNml@!pyi+OStpE z8_ZoBzF^-0bG=}pUIDl^e8E&3e^4Lz77nA@p{d@-*D;=0t*d_7;dKHQ@pSh?vZqpXO{A-n zS$6k>rxzID4`}|iKsQ^3I)MO}>0-6@UHKewKvBM! zV6mw649SWaLhfM8opZ%(QSaTHvy75+OHUKiJz7X==C;BTYZPm1ua0_;uMymAn=QJP zD-ox6fPiiIiDUh&Nc5ph2ocqoYtxRb00RQs0)F%bM1h}(o=gYk7O|*cF@I=yR=ya& z7~TCqFS?woC(o1$tOH#@KkfC3H~1EU5=-@0ZOt2HT(a=Hf9m2+DT zy52Cb*%-&bz72`=1rN-i4c_cvPz-N8rYRN}xqY~N`Tf2m6K6z=~rAh(*HV>~&<@?7?y)`_STWvZ>0!ca4-e(Q=GL&4@9PN_2&oqG^_B(@k&t#>=~h`91dxq;5-1 zjLBNe4Y_q7ijC5YUcJcfg7u-QYu`A%nQphF8!p|`Eh4}?IxU%F%ww)iN2rM6ZF?+H z+ciA<`i&>wyZwca?tkh7dk#Ic`OKb?xi#r}Y~|lLN~*@AXE!f3X)ex*&|Bq|G$D+L zK(uUb78mgcOr)JvVKiBL^(Ozrn)H^3tQzm#*}2IOMYCC}E*uUt95KcG+UadgOXCKH zeg~p&%w;45kQyFZfn%xBT9+x`HGb)>+m2(l_mSJ4|LHwP?p=Fnb8ayg*RS$pABt?h zIJ@T5(g@X-N)4*>GL7gWn22a3%QIRwp5nt3M2uO!#I^)0l}!@`OMly*%ZlWi%7{`T zmZB-wEd^%IVG5#QqxLXsVL_(bRhKqqbD#fI3I$Qi8bt zbsurPZJ@Q9s+g9=S{*T)u2^`2h%w8T2njyc*jCFn^qkiGUmy7XWSZTQ&EW`=lFF~W zz57n~n+_V3=W2^b13L?v{@ur4`S}w&QDLexV-=0jyro?*e>(sjj}uW5%+XY1TYiy! z+Gu)9zPKh;l~-}4q7An|kdMCZk&@{h_gUMh>(vWAo%8IKH6QzOgfAonh4nyO|Jt8# zdr923=|R+7I=N7)nC*{LF$3AjEJCh8TYjK)#H`%E4DJDSj{|FH*hUkU=Fi^w?1PhM zygdfwChn%YU3?vRlOT##t67?UmM;19H5vg=Tv+$3Uw)0GsG_XW)yv)~WZN!5md${Z zsyUe{Z!0X^Ha5GXFt@o-&c^g;+6;m>dr6R$0!?gU8Ci?VYD_|XB-v5D_eN1h6m>(=6B;%dR%)do1Y3cudt>2CFAWgu*-(8YmsD z-aaWhV0MC5&9I1$ZU5rECw}$r=Xo>-;?u+X;@RO_f{21so;}m5Uk>c1YD@j4FF$m6 zc1Tt+Km=O8HCF!u^fHW zNJ~g`GJsfIfXj&(e2Q0|cg&`@FA(|huRr{wD;tP_RBeJAw?fFd&F&nL+rm^bUaZtD z%ZkUeCL>=anaHLRvLu0vR1%l=RwoSCkc+({?lH~C*)%aGHs8AQVviCeC8;HPZ_l|2 z5XEM7iN1vv($K$rcK26KY!c`l`wA$??&lx|($hAgv@Tux@c!pNy#Ixd-v0c1cOQA> z`b*mi#X@4`OO1}%qZ$dano;9p@yyypZbLFRnaGT3N&31L>JUgKP_tFP7F%p=$tQCP`PoXBSH-BcDz2^OGTh7CN%a zNJq)4M~Y7sxFh3nW-+tWclU#-SLjOMO@?S2tw!;bd*lad|MGm{uMX{oU!s@txYzec z&vXZZpee$?d+MNf4(fkFcD*cL*qQr*d*)8djeYuHy@)NgZ$F?N$ zYt&>$f+a?|B-*R!F6efROn>Cw(K%LCN_jP)mLVGqzPU`QQlnQ%;1CwkFwLQCN>${g zas?r!N)2TdvgqtinY_|o*9YD<=3E3zdxQI38@^z!HR?bdT&X56R(!?}inYxp+ca2r z-$Xd|;uXtm1X>Ey7XSRI{S{r66j`Jfzi}4Yj%7%aQy9ws%0tzA#?CU?$Y`q^kQB_c z)+P(vvtxJUChp9Q?@13&#xrywo(5kM=Auk`Inac=uN7MhOIWA#9-*^`IO*oPBF9fL zWH0Ki7AzvD#;ssXQ&Y*2qIReZf7ozTjwjJ9%xI6i_p)az) zf$(%EGL_YQEWIH$v^P6`XKvzPcFneAVXcEm z8>JbmRSGNi)6eWWzmx(C>E23Oc0tLuz}~Wz&cxrmYwDitQ?6(a*e!)m05EK zeNk)8&eZT^ES<+{!+ms`tM{4$XN#itK7|NiAa9wx zS;#_DvPooguvozivRrMrijCUN<;A$tx|NEM1XAq|<~)Rf$y~1Xs);(-GHZ*+%G1Y< z2EQ@lhR{(Ijb^o3Io;le@d34Z^5Xd49o_PA{>TqE>9g$V2&oyYpNQ*?WbUKxV)!~ibV8+x^&7jh|0mBB)c z7{zMcoltW`Ei#&zM=BZ@8K?_UC#i15PcH>+*3hnkVCeJZnP;numu%}sJmZJuUTx`I zn0l%$<^O$pKbEoXpiFFK_m;vU3gX($>)$o`*m!KtmG%R5PZl;1`G6ZjJ}(q4*{{5{ znabt@PI4Zx%F2Wi5jnbCtTjjS8PFVy6&gZ%aBaD`V$elUn#Gb)5ni|)dNVAqc(Zh- zbmfpy7e> zz^oB?av}fMFYYEeVj-(IjjI+``IgbzwR`;|BcJQJfrA50lhq`KW0uX$0aJ+*hS9+PAltL64Z6m~zGD2=b1 zcx2O4n-dpY={_X#TiKu-Rj1b;w5{FyR(dpa_wa&an;k0vV!6J^pa<;R2u;jR+YTa@ z;Sq~ktEh4vxD}&c`UZ8yi2u9C9{B3)gDndaFD4NJ#A1nBUwXMTeXLdITO5wz%GKt`a(Sckur`}dQT-``k~!q}PE&uFn|5yf_||_|8}~ht=mJfXq|C@pNxi9GS|#9=Veeoj6Yhq<#TEPe z7bmY&vn-5F+XoT}t%l`D#x?pj6@8|_kvATARm-6LnecS}m{7Ukh(XnfO8O20LgHjbl!E6;<^?4Ec)DpDrSuJXd7tQ8U;Fb;W z$sg|h?%8q4Wg$BcU=%ERaC2y+@UwTEecjM^T~R;K#AJSZEImZNn+?ou>C=K%jlFM; zW*4+2FG(*i6b{dhV)aiHel@g2533 z@?AL>0XIpHA!nx{dFX5t#ZtNP!&C7K;=!@BJ|3SRTnr_&%~oU1&~-&kFvGLLijkct z){7^DHx32i=}V)(_nq5CS&?K_!0eFTm&f)Esn_gR-!t}+wf{3Nx7-9Cpp{CjkRIN| zc6n|AND>xRW(((=O07Vxh>mipseSv*Bq@S-1?e;xhyn|1%~qw}FicA~483JUY+J+= zF<5L+;+34@V3-#?tm|kap1N69V;E?0rW%IzmG8}c{PTDJ<=MB->)CM4FtC%@XwH;o zo~bHV)l84ynep%)}gN!}cxj9{*}i4Sr=0 zDv>N~0)tsIZwV-|G+XkMgNOW*ymPb~^PEWS4(bKMW2$1=PNUg^9i>jA3!8#Gw(D+w zeR%+d+wcesk`0avO);?CzV>t$&TQ9)&Mq{B_CHuQER6Q&sDY5fpJqdU>V){RapzD* zT%VZs?#K6o*TrZo8jZ3j#}zd`pyFQCmZprxY?#gZ>le2Ed`h07m?r*iIlUWVsZSaE|znUz!=AxPt;_;=x>bF^w{b7%hm6mUsp@*UZ0xFsmr{#4*Ib%V$^0V!=`&h z75{r_dqAIKuGE)~1*x6tes(GQyWhRLZqWCQ*`SOtv=S3qdQ-){cWwCC3&ewI@k z_A}M=;zn{2-NMw~0gF%@53_gp;`S{K?jfwcFF#G!`+6>@U*~QVA_$%B}h=J?h!H znV=VRzgBhrgl#ngiHL^%`^WEiae4?VW%fJ@riSj-JXC7k<_#a+_4vN@F;^NurR2Oi z@rWQ6?AC?U&@T4wltER!@qlVgqh(n-Z9;*C^jraqy*yJ%{NVfu^hS)L4hYZ)rM2uh zhG$vEDjE7gh=zmg=G$G7K1Ac9UnWWl);)f>$23_WKWli+H*UXNZz)IT@<`1#P%vb)O(WkZVYQo{t$pvz z(0uH+wdvxJ7IKqS8&m|A;f;B-*^re4JyX)#Ua?-BZq=s9`1S#!Up+bbsUPoVd)Eqo z5`Y?L)7g?pXm7vAdhh6GJ+lRRLP#5bXME#NiCS8$y__nnk8BZcAfQa!HjO$>5Sc|} z8kTiS`rP3$7D7a1f5)BfoU#;ScOT{<_T zi+~&m(WvQyE1lTp60XBVq7+rqaT024Q?7K++AHtcdE#RS5C89X9C`1a6Zfo}-cqP! zV^~;ql0?F~bm=WS&L=hJ*lb?6RhU&`A=e1~Fzd*sDaBI#$y3RT^1(H!#+vxT;8t;c z8qFoFjU_puXfdLcZB^&afTKa$Cj9A-c0YDzf*wawR4QARUwiMK?Hk5t7t2Fy$3C>@ z*?Y3jx}pFYDhaXezY-t6&o&$4(vvY2i_qRXqHhtPHHOh-DrJ)&8lB~YD*W(#{(LFH z`iwCpOsy;mixUI?+1|Lg?lm8D;|QK~VOda2XdE%m2X@E}5$a3=G)W&$>XVtuzOnh; zBMW;+7GVVw?f0EsE1WKked33EpSZXIRY1Y+lEVJq%jktNMqE=n9Or7RGbc7$`#UDSu z?mz!{lDuRr2~2i*u%WpNf3lEFdWaZ6K2HFrpDI~v)769HGjHC0<|7AQ`sl$UKePY% zt2SKOIZRJRhQ0V~5KzRxHV(yWSj21`(vQz&%LW!PY{wp2qwx_xWExR%NtT**{l_Py z6V{!>8DTQM{QeG{WmH4Q}Mk1Wgky3tFX>3b%+*X~U4e zdbB`#Vw$4gXy_p#hbM7ZKE3+ykdGFqRJ`M0sj($rde!<%@7Yab?nm!9@{V1n?^-*% zK37X?M&uf{;h{I}gGwq4+u%$PxxFy|rtO!Smi*F8ft1A-F}#KZ;s?vvvCmzqJ$7zg zGqr1ddN$j$nbHSVE~*pELPY-Ui(5W(c#8xI%ASow+qyDelH!?rcaMz?kI4CL>hJ+U z*=Se3kEu#x&;J=)`$|#G306&7dS0kMPaiD0wSjRJI%N7}Z6q#=UpbO%n*3dLBtxDE z=oy;Bz!dMZe7-*5g<&1FCZlgDly;9S-Znb7ZMeKPQ(KL-Yr`#&F8RY@W|oz;tP)Eq zD%}85FU{)JGmweW(&y$j{L%MzADJIVrchS<(mK7;0%IZ#)3#w#jCEl5=!XxUc+JR< zur}(o^~-?rgeuMzGe7^256o8MvZ@K-BC!xux3SigCE?)**Ztm`3PamoE2lP6s8KTJ zk6KG7V_V-U$H!>)tj`N4|5#{%h_~k3mtEMlU2it2lc)n&+Xd0Eg`fE!8xKvTh!V8n zg})KH2XYaK$XQ5+jt5Zbv{$Uj=K5@P>rm;ovH4vi3)_Y&g+wz_$${{gJ=9-Ta*TNy zgrYvdD0!!}LP0X6Mp zI{B{qmG^IbVoU0>n>YZhm9CcY%M~s{G5_WpcYNvCB)i21>qoXy2E8nLH~Qw?+y9Td zzi{`^k;L9V)h1sjX*sHZs5nMhRP&-$5tNKjJS?2}4c5Uix0G8IjV65>h&P|rlsy0E zmq$MHLV=E{?F2477=c4`FTg^U8S<3Sg@w4jYk2WB8!x_p@5{e**GnJ1{n%T!pF1!< zzb;E_j!4CN!O6$CCCRFy4QZ)~L}oIP-;~Hr#L~lRJVlp}X~NVCS&PT$6~%E=Uv$sR za43>}U~KxeTW4k~>X~Amnu9d7^}z0{_3rPqtV5^jKU~TJX`#79M6`>7Q^oAoEt=|ZYXRqwI?J^o$qQBaJ16K-e0CB>B_b^1 z&vFm@4FI!+#QKR;?U7w4_lz#=7%q(@8iTJ)3hvQ|*EG{#&Ij;@38YZxRG zr3kcGFq*ac(gmYAOU;PT@Nb>p@h3mreX&x&e1ff7m}vxTlV0p(nW9a%#>HaV8}3Pd zaQD;ub7v`A;wcr!%IJ99L$syXh<)TA?m9l3cFiGe6``@z5uBu_Sgg8WR%n2(Ul!^Yg!)+l3mRiuaGF@JGe+JjFfEKT zXm?i|z~Rfv2mb2_#vf`vt8El6%Gr(WeZ*d2&oS{(+>&4V{n!3zQ@%>?SYD|%yk<{= z;md1@@pxukG6%D_E}j`t6B+gfG^MW^k$~A)EHxy_DGbwOzn9BoYkuL)J1&}zbY!+* z3ABhI!-hsO-7(XM7CM-WzkIg#?ep7}{Dw`bxrF8}61k~k=8%?(+=K8xe{%CTPmZlb z%pm3az4m;rrI%q6mvfx8BeY!PEjzLKVJ#BwlRD)CsI3BJhxg=FWz; zo2(5wVCIniqN^H)^oFe$a&d!&ERU|)gOfESHX2KhCvzJTx%D*Wrt(TWMQ;SWMry@r zr^eG-Vw9F2MulqM+kUDDIh06iAM2HqSMJ+XIx`=isb|nY+PEQlkpQC?U8F`}qpttx zW#OcCU?d~0OD#$CDkP#^w*zQcm!F@?|K7K@nF3e{$EXRtu|YYWjKA|f`TdjMftV;% zMX4Oy{0H$}KO?6%!t|0kRFagZ1cS#e15(%7Y*1#^mQ)(D)s#>>Czvz0%onIpHPIGS zQUaa8qz#;YF;#y0oO)^=l_XVC$3$SFpNN1jN#}q@t)?N|vvzjN(4a5fdB5 z)iw7?u`yH(1Gi&Vo#vcKpDbn16Jlz3{I`Xf&j?H36^c&?^8D_`HhL}n1(SomZ0vHGs2p;39r>|Jv#m4#OD;Vv z4ILC@jLx=TR)vMfX=x(DqF|WDZ;UyN+UgC~VKm6Ll5i(fk|RdpP)Q<8YJ zOwE@eVw=nOg_j=vd(-xdNsYg8rz@Ts-l8V6pdLE|7_h_}dPvCaq0X)xzF7kb?e8QD zf)KOJI-ODIT1LUP;@TckA9*$xDsR~{59J-5PGaIl;{fRpQba_yh(RmpbH*>6to?Xy zYbrmoKDqdx9$)wLdA3rfSqGym8$&QCZ{NTD*Y`g;k(g0N-yU24Mmag|n02dk(zx-^uESN=@3E~?IqkiJVujMG_xwaDVLf;mOZBmLe4rL7c}l;$ThJ8wyunS}K1qr&AS zIw6UPOod!H3_U~yd4|JpR7OQ*SirzX3>6fuz+TV8>50D$A#s~9 z_F6&B(iErq98>Gf0rY}Jj2g?*Yr*Xn*OYfCVM^@sGOjrHZ&-T8*2eh-WvY^*p@9BF z0IGlt{?bKih%T1(@1Kf&`{nF2=TjyH&^2WuBIxT_VD0e4=m+mvdi~lH)ECN_oL+C0 zP8*jWHLrZuE`8InYO=Z}9v`Ng8^j?YyMq=hm?JJ767(}SQDZ9sl;Suth)7%a>?9CDZw4k47!^+JB25K#y6{VPEu?Kuy+L6jQ1&NVuULtT!T7T=F#j&h?bUI$M zG&G7dNi2j~$uzQaRJ3eip{AM+z2ngP7y!x2!h`p%{pFoc#uS)QO)%%|@+oWSaR(&B z(nQXSlBTMfLThkUFc*dNK0(XTCSnmpJjE`n{3HO~EhioHI5f#d6*%Z;spfqBMOyVU zJrNrRBMK2aAcHp)YrbwrRUN%g8{V&u+$JXXI8EJd9*JirPy;4a7DnDBjNC`&P@fg% zzb)8x>f@UYXar_k)zY>Ns?dAV+38EaZ92MoVFcOd_57 z;48@!D`_!A^o6pCi1cC+!P&55>#rR=yfs&H`3+~+K|WDR@KTV338D(JXw3?-O+s=l zhJB&@lF&T;6Jin3V(3J3lq@x$TIx=6puNvMW3*_s=F*VqClnEh$n;BEvnA1f^S0AU zV_M2=RfqPfL%WrsJ%YSRv8E)kMsvaBL1FS;LSh{yshkoPzi~^=vS|?$OG>gzw>yw_ zyylQRj8ZNm!Lm%udT2*!|D^TujJDW>X=GcABmi+H$r#CUAdSNwLgPbYBR~5J{p}l$ zLx|_YGQ{G8MlN0)Lg29-$zoZ;CuFu!Ce;%{7Q?fM}_Laax%C zCALP<*tq_Ls=sEZadA<)xTMnfK#K7zm(QdvtFo~4qZ7hKXVYZf7)=^H!%jaDDS0WL;;_aR z#Iz{KM7p?qf%a~GG5}Iof?5!i_9hNf7d%&%tnVIa(NZr!Q@scwBG8x44G@LNZ2gs+ zmS9!v+7ZXf!yHOlp6nlLlUzqvtFW3@(sX8D`3u3RqZCSp`rUevWmQ!)jE%HW!zjXO z$33Lh?nq6%8BJSnzpYwtNzY%7GYvBpx52XH3p=Z&w_Z9v_r&>OIWxQ^-$E06AHP>`Z17(+otdT~i-0CjoEh|;DD!YxPo??1|1SYY>Ow28>G0?;=1*QT{| zsaXI1OO4~T$>E&3A=iS^kWVLn*TX2z@<&q4F*RF?ivpI@^i&OHc5~70{2p{_M!P8( z^y2(MQr0NO#keMa{e^m|PLpOXI)IAv8EK|BoLg{^rMQf03Aqq<-Z>Sv-*bz&O%XfK%s|zIjBc$0jxv%p4}n#JP4U0V6eq zgNu#`I$EN@A1m{hat+ZX6#MN1y4>|~1j{=@d_s`R$d2PCr0u!ZbC5sY&fscoFl zlAxsMuH)FSkQ}F*n$lZ^)HcCr2(3%E+B67S!a5i_!AL`F=#13lCl82nc3%Cr|CFrg zHoINCeWJ5JZ36ORzK#KdY10SZmTo-#($Z5iBk5dvbG}6{1!Vkoe_e~neqB1^P_;4S z3997i?l^Nb2;~{-N;b_W5h5H6x|`D!rEv}2k_j?aDhB~{IjY#B0>8Y_aFTO6ZfhnhUOYAabmN{Dt- zB=rW&uzfu1AR^B=2Jp=Lw*xl-C1Y$f1Su(EsmciFIzdns@t=NFZ1T_Avfd8k;xcnY zKNl$z6brk!ckg{~e)GHHBl|>51Z{&ZOv{5m!QA|#V zO7DhoT$8?Ys4}(0rinyB(gly|0oEApIbw)}3r0b>L_GH92k-frw>`Ld!&(U|!{#*j z*Shf4*6BYsr$42Rz7t%ex?=({L%uP+r(Q4pobx*QNtc8a1({! z|NBe!caK?gHILRbq*JsWGsXN!{%0T1-o9;)(N`YN3Gcj1%BST+7p#Us&zd0v>PqSY zvJ;dW6-O5u&z)cT`XQqzk8Bzi3-ko0%Q^R#mCNhkP9kxVYdJ^Gh!!R}{PP?^n(U>H zH(*d)DA4n?-C@xQfC-qA5o6rF}jDypiYh%rb`sY7;e1^Y3XeT)lK8t;R{Atr@@2h$hb(I(Jl*v3=U`K zs^58`c&<@cH>^!$X+lZ#@>pe-r<*_h!ZgMTL=KontAcEKOQNEWHY@;jVP+2w`AKOp zHYz4JOJw#yJ`BEVL@g&MF{)B0(Q<&{|Hmg64O+tC%wxYn=p!N!+9)j3>9fv*TlIm8jI6!{@QcKqs(` z43~}&#ve9Oq4(6;M_-=(!m|xAGqQC=O2--V+7m}!AD%zsB_+pbD8|{=tidi8Ae{d4B4vR1=;Jr(rNaX866bdQ%3s04ns%%or zG702j5D`OwY-oDUTV&gMOMcV-Rw0c;&y32^F>8`?TS+O^GxV^egFJf>o@hzh3loy|3WK7&DQ zqrc_4dFD#0C>0bLc?S4d)}D zDm`&jcOOPU_k)P^aG*52cJyDqBlExQ!z_)-v*zBqH7zix{pwRM+(Z+>4sJVYUSps`MiGPW`*o5yk)ft@7`DrUWh0mJL%Vtx;er zRPoIZ@A-q*FC^(+t#(5C!Ef&&_jR&;_PqIj{r$`{XZRw3EvWIIDVFX@vrOAI@QVOw zc>9j=UwOyIM-FHyjMOB`Rn0v80H2JST|DX3&#+_8KUmF}pyWhi9;TIPTHZ=*Nkjrn zY^C6ZJ3_N%P0j1aF4hm9tG;xu3KpKdQl+P9(J&er@R!+gceEiT04#AY#Bm}b^YK3c z=*D=6XrU8-YDeSKKd-x4w-qf4W;``1W^Wg2m?L7b(w?|n4Z?MW7!=InJwoB~UBHAW zd5dn~r5aKXQw!Ry5XF;MjQ9M1W@ARo*gn89M1a-t~61KtQ$!BWjUeWm{LrN(n7%P(K5AHPs3 z)@U6D{qVkK(`cG)Gc8ge`*l@;AeK`vxI^oNK!fXYta6scr5xNs8tFyC2g%mWtA~le6Y?KfLWLtUR3lkYkZ>Cuhyy|GTM2 z4^{awJs(IUalpzEJkN@=E58jttlWh;^1AwexDUd6X4_PC@ zvT6Fj>qeR*C#J>7iaRORS}>ah#8lNT#CyC0j0v0vzgJT%|MFR754OutN>{E&`F zI0zAm2)L1qh;-UQN0y;~=2xuycd!%MEd#%zD(Z^J-r>@N5N%NEw#O$FA|H$(;l8kT zfMYrFjSg1#48)FZ{o$1`#s2kAPt%~xiHIJt>Ds<1+OK-e{!hF^AEQ;8E6+0E>G>h1 zLkjDD%9sVRKP18h+To7#*&mnx;Io&figaS5Yhe=e8Dx#Jgj${c5v6E9&%rQ$=UtmV z{^qrB+^y28X+_G32wpo!sMgJk^UY%y>Mx$D9647zIaQmQZ$cX$@{!G>7PTEUi8qj| zg8i^V_RA04zyOHjulnh>7$Hm$iXa2aJXBMfBU-j){q{SJk37g^!rBbE0Hd+QOp=H_eg!=xs?*7Cy z9z9<@d!yJbqc7uy(c=NsOgm8G_{7Vf-&j@d&Lbe^=OXa{I7s zWXHVfZH2Nw|LVVA{;S6p*h-ndBZ_tdU;$!D^?h&M{reA@Fb$NbE#K}2OpkSI_DR85 z!t_MU?2xjX1cluc7XgnRuKnRZOAPCE>&r%!8YERV$k|F;d;kh_K*Lt z|NN)(2Ve=KB8-TDn+qsc$fXrUZs6>!)7xMvqCHLAGhu!9*Hzkm1$Y(7IjXrJI^m-; zi7<~J?XbSMh^mGdFK|ExjwvKIh}o^|fJwX6CLgr^jpvIW{Ew&TLLE1UIQ57~w4U96 z|K2}+Z+ypSSDyXlen7Mqk2>X}wEYWmpdfWf&hHUZYp93_bSc*DPkwdwzkKbA>409C zrqbklIG3?Zt5m6gfS4^}5hFS#YJ}1Gp$E7B${R=T+l;yRaw=*I6syL$nFh%B!kNl( z%=RwV=ZZS*R&tw1s_2Zl?h1n%$(zZU#eP_h{D&X9SP}WW7(hgT6d{XZCY>zTYT0xO z^VU+ej-qH+mrWB@q4kx2mD;sVVa=o%)P$x;#-c=b+4!o})>WU*`T~~0G8qgwqKE&* z;XBDt5xCk&#r&vPHQ)FDoIG^4Dl3}924y6N?FU1LCWe3G-5Wl9m#;+x=mE(^*{RQ2 zv)^M)Zp+XuDh^#GE9?-p4C7*7)%)=Dnda~Q&G~1~>KKp}RmPODT5mR6Ez&uSLbP#4 zJC4i{By*`>df(okzdt#i=leTtw5wnm_FSoj2PhGAbK3xslh2F6L?qS4G&LU6ikPWj29r)=(y&y*{Lkik!QACfJ`{iV zz3p$j@G7DM&5EQ?v-U6`8s6o5!H+(9e?a>vdghKP=5H5MYujl$DrSE~@%R7k+@E}5 zO60GWG>{c>;n4{%MG*8>po zy{^|&QU{o+q!MwQER}i#(U>Xb(kV?R9QK-+d9oVtY`=fIx5B#3W?>p3Q&q zvm^I!zJJ{i~amI>NvnhH{4vWS`*n6{X-a)f$fitxxiNeZXk zbDUxP8ml516`CjYUgbN475S{2(ROFF6>A4C5uPW;d=9(@0U;LLd=Vo+% ziw!-Jf|}FK4N_(}`@uJ?fB)@04Z#E?CS>=~n_n;}PyM4HU>O_MTPQ*n%(7Fv2xeoL z7G-TvGZ==`(p&DzZdjAVN}`JSHhmz2<&Qr^P3AhIswkeCYJB^J;^Fhv>7v=fYyx(j z-M2;;+2~RmyH1VY&IN04CaxZsPN)@B5b3E6D))M#hloILkszNeONm&FeR$l)lBL#Y zTF@p5(geyd?04Ri%BEC|Qmk!mQw6h5&)E00;VK9hlGGDCAamQ0a{HvrI(87C*8lv~ zi~sY{Y1UiRXAs%Ab}XGrl&h7y?%V!vUZ?a9$}orNz4YiBe3u>*YKMIFS6A|dv0M%9%#k8%a4*uz_mWfGAgI5QSqGtH1H- z)Ag1k(=}!4wvj^q7vB9-uQ;$XJ-X)ocR6>g_1t6yz|w1Lh3tMojya8a`_ktfi#ggFt=|@=B2aM#Tv~K+g(6pB9Ov49l<~L%c<#M z9?3BIn`rh1Ku)jkC!$X?Sg*AV6Vni0RbO@Keg{C@F`?eKD^0DX(~g~ayvv(&)Mh_* zf{5e^3yL0uNSWL6@Lgh@-`vm(H0?M4+nE}LltH|n2aE}RHKN(2DNynvk-dAuf zBAY`yWi2bjC+USMW{DnL5^N!JyO7y|Iih1W?AfQB@{a>vH03WX zplqnfv7GuPyS^yONl{BJ%Zr32zGh$MmHUQXzF3_uS;(}VqQflKeDZ{jxjezGhHxSR z%hVastmE1C*dzB9l5uwbk4s0Kjv!)@ZjW0oBZ8-+0{V=wyhH#TdX1z!c2J~`&j;Y* zeDk0Gm(!)1MJr_xkqjQ_VPSTa8qGhjOTA3GndO={Ii$Sn6+@cr96ndq-B&_04Z9xp zr)w7p6nkrf9{dh?Y(8OOoN%G+Dhzq;2}*^(1*&Qb4}tO zQIG~@?!?%Tw-=c6dIKFRw;y5YJTX2w#My=zpOmxfg7=U`;cHLN|IMRQ>}0}Zid{s( zKYDV_UbAh(hwqlM2~E&1(HjBm78ybl<1%a?dtMe!RGs>~U>p{#1#)(SmeT!bSEtvp zm^M(p=9qPJ=E>H@A7ij)=Q^F`18~od4A#`>pqQ$p6R|{$tUg^D;?!Kp=scT8p_VPlQf4UoGY@U}z#S|E=an%lIFgW9OYhp_GYv<_qy`>QO-e%# zi>ccLb-m!ou$_*@UwVcT*-oSntQvIchE<+MYNxeil`oK8#z>7-{6ICFnQk7NA|fKK zs?tWUY0^vUnNj>nLR2CGAzXx_=-m&J=)CvU6AF8`5S`6T5j0J#&amCYw&`tab&z(w zkpty=(ajv@P?z)jj9ciRSi$KJ*m>L&zTjjz|Y50Jc-!G>3i0T+USqI9}LM<9t9o>q8`mk%Y zDXTgs$_XikMNH_x)ii`J{CKfgZRjntsT&xebLnKW#oqez69qZFemDK?p@#QC>g5-e=-sd_Bg&)8QX_B1CRDW z6rMa<{Ad5~F1m8i09=O$sBg6Jp~`Mi-QXAoELk zbjvE(D9ReW=~YWhi6JR9Dy7#;=}D(@UNG3DXUe4WLz)e$zZYl=&SXij>Q?!zqqjtu zM%r!+fU1ap_r!F=VDE&I1jDd2Rl%Z5H;gEKcM!jgnnY=@|&d0xD;obAbow-!Kc1_@vpygg+^qVO%3_Y z4VdFw=GFr{|J@s6<5^gHEL~+GcbAYqAShY#!{Eqq$JWX6(C93If9A3OYF+-0IrX?T z^@KJ3xHbEPJ@=$N|3iD}dBJQjCPnS(P)eX^+qA0Z?OIWa_Xw7{-QN6EoD&zJ(;Fq_}d`ox68x3<)Q6zZoQNm7PS=HJVFu3C_FDw zcs4jE_l~Em#mJ!@HHj7CAd1 zCGwayp?i1&w;IdAwr#NR(AkQtvNZ~sL)4wtD4^x5U%l%$UMwEOES-4R0*G%CooS#%uJ#J-(8FwN&MVX+*m<=8FsrKskm%ywn;9-8fK{3&hy zed^dw@K3}NQbKjslXNAS@3G?3&N>3S=zvl>R9Q~Lz`vQAaIDnd_k+|K2zS_7I>_qpuAoPfI z9M#sSIxV^f$BT7C>f|s{6NBtxsSG|1wryx`Jf>nzQ>xS@QED_>3&o12$n-!6-TZcQ z;I)VxgW3=bq~I!boZah_ckj%xgEpWP+qTN*`Ya+>FeWG%b20CaiLntmvr);z?CnyA zx5?RcQW9fsg540n5!`dZAezzNTEjd))A-(@rN4iC=F{J}T-9MvU=GDM?bxyJ02LN zRsxc5r?GV@IWE&@54*X| z*jdLSeISpo6Z(k=tfU@j8Pyw(sN6e_h@GC;=l9b&i zB}W~r4(sU9=gPW!E1YN0zzPWGN-mRtq8(dOvPy28hjeghL4V?C1*~E{b% z?X(uyW*e3olWexfTz-@>k_(Sl*WDP0G5o6?-N@${OUsm|6>5O#$qQJ;IyU=S@kRJ zElH8Cok*inZWGQZYyPlZi}oea$i!rXn`V)-G1E$__7{KWj@!0odsJyv zW(3<3<2gx<3-qcrQr2=R4*}H-3uvcWH_py9j$f=jf3kS=LiOc~)wv@3q7EcTyR^m2 zI!uJJF&SrpG!`+2LHRT{ltkx!@4ojB-zsTJP>X3$zNBA#oYo>8IEENor|ta}DN$&h z{Jb^uMM2ECQH14N1Z|-TQJLuzv$4iXZhxbc;LilQm|4;v{;eZZMS4vcvZfYN8-szB zilRulG`*#*RIM3?iIG~8<)w1xbV1j&AKH{JNbOH2Ro#Fan$ z;<-IYeIt)OJbym4sgv5WPmPgUtWW2YZG2}41#BE9_AG|f~pUa2<>lNK&+^v!@cc7KmW z90cBU{8BsG)n;cG8!Xu)-}moI|HHq#T~&OOm`G^reW9#hm}wq5TRwcI^3u8Tnd$mM zu|+33Qy-N~;D_!m3}ZsOQtXFiNBPOJRLEo&%N2gcLxfkD?G_pM^XI>|@4c@a_H-)) z2IbO>e(u}teZfA^HfM`whwi$n4VE|e4n|}_4%j^4{LoRPlq`v*6S1$^wF z7ww9*TJ~&FKYpQlu>t4mnu55`b;OC-T@R@Mt`B*JPaDhWm5GfmMhC#3B1+_Eh{P! zVNR0qSUM4>yWLpB^p*jW&h0ttT6Xsey@9~|U%$Ekp}R(d^~r1E2-SvhVYYb;%sW*& zdcJbvVs&bv(Y{PaJma9Yfyilrefg6Z!H}#;ieG@7H zpzfIOr;~|drCO`&O#YAIv^;qH=z=S;eVLcOlR`53@bmYN0z45CR&y`_Gu~k#@P6WTug^ zlb6AYVt@yUWXcLTDVnO{5Wk6-mIOnwaA_H=b6KBQ7M3yZc-6XG(lf%cJdMSRj!hr$ z8cdh~xbn*+izej<31bq}l9S^~ddQm?bD?KWmXBO;?|$IQ;87TXo2?ek#&j~?)LV(T zmWam}N@X;^BXeUBP^fnwaS*bpBrG}j$6tQ|V}p5aCY40PU}n&##0chra5^r&>y`8l zOuc1csqysj;%6Se{1;z7|HuD$=Fh%x=Ft}xUpil#UNUT0J1i{t+JcDVdcZu!Ip(M| z`p=l>abEJVgHGe%f!W5e16S8|WQR&El`DG7#A$h^TNP5pOhgeh%Rm1_mr-w{J+QqM&y%&~@6b8{nn$ zna8hu;&bQz{0nFQ=eI6Cd8~BmN~2h}Bw3|(EZuMb&ap)Uv#!}g#;z7P zFFW9YJ#ga?>j?3fh6>{p0w-uR?%qbv7%EV;x2;XyzuSLhQj+XO)v8`5dmN6zgb78o zWMNWtpaV z22+9t;84Z%Ka;`$heOQ0R9VKT4dc&M1Orm4ncsPS@wwCG%kz3&$GVetQfPR^Xz6aR z@LxtdVjkBWTahpi`$e1GW+S!(9>9K=2P%ZAEy#z;y8K1jZfZ7dwC!|Ec;uC9+L<$m zl4G{a;#n+K5XubwN&tCE<{o){9dtzkBEvzZTy(6aI<#5Re79{UV$v6Xyily;Oe2*c zq|+jlfaVY9v-Fb7S{>b|C^D8RZuAPU@)Xe!GVb_+W?)#x3zHeETjWRN@VFZOE?RWC=lH&*__1dSSg-3_m9_gMFPR2 zT<1@Q|7O#w_r88IpHg>Cvai}O5%Mrl1LzWS3Z?`sM3*frm9SXJr&Hl=3xivMYYsU% zxzqLf;b|gK0ky{{oJl4$Rl$4_A!r=EtB!T4ZPS{%;oi7GVdNnyN`+ijmQ~#_QU5pw zcui}z46=NTfNj?;)V@+{;CzAy1gq7XrAqe+6(3cIPH+;2PhNAsV z!>qLo+RT&WR5EF|wa3)r!VT)jiaXf{tVcpKVD&`Nm@phV+q0M9h>9j93g~iH1Ma%M zj$`U^(*%GCFxQu?H=^rnAA4Lc6stBbSiMi{-MKAIR>3`Tfd=AKBo@No4uK4oZtUom zKqwLW+m6~}Bwi|4i&df{&MHz7n`I^AahM%fjzC<*G8nVTYC|UOz!LBdmQackX)NjdEQtoBDk{uA9~iZ@AA<8Vom9 zW5G6BtN~qYTbmfmak~yt2-0sTLiIl|)%5|0=(f+}T=+s6sP1GA8>wVGlSx>q!H??ES6}6zuQ4AQylh2~QbqNAIeD;Gt8+ zrqMf2$;qrJ@;9@05(MYx3-TPWFnli{)~Aw&6B}agMa4Dr#pUVmr2` zDRfO5MGwN@*p+}+r;F|Zof-6pc|`H-Z1d7W&rsz^@wBL<$tZSJ*7bRvTM&0%^hCL? zo3iVpgPvn@y=mKUY}2ZhydePW!fl(_r-T-| z=(gT=zji@Qtv7U#RZ~=+XFR5*;#hIhH!_yPD%Hdbau1?_s*Spfl_tGP$_?aj9Eqlh z!wweR)S9*ngjWC+=(vC&s$j=?Qn@+xqDO`tPbr&~Iqy|Ij@!1tG_YwR{r`zUFA-s^ zK$k>32D{}31pz$=I&y!<)6;OsU}=VBO)irf%4UXg87#WXwK@!HA8P}#Vnw3zF-=Xx zV!ew&Urv41_W17ewCS>V)U6)W@U+;nIdCXno?I27O zYnUeLyz(8~wlSTG@oq&Hlz{mIF(B$jLr$&R!8~-m1Rat|CsT1yQ8m~L+^LCCI1?r$ z(le%@qiI{MmWg>}*z>c#phz_B1%~^WMmz2Jg^E2F!NYUookU%0BYje}-~GUZ#C8_j z5FN`f=1+I7ulTxdrTy3|KQOc9GRFzzm_@4^4{8T zEuwAHJ5z@9Su8u|7fY2|BbRC4#}!H45DJz98*uivS_a=N2(yL0#Dh-aV1R|1qU1A~ zQnfZ;EMqN|P9@s=7@@hjmBAlTLZL5Tsx4M~#sNo8&|5l*tIQ6$4du>@o+zL588X-P z9`_`1b9K=Zsw z4g%f2WItB}>g(m~oUah-nW#XIsESg^rpvXO-lAI!7m5`O(Ajiyxm6JZub3oWS!kV@ z@;^0W!w( zw~D~U#ZsBw63gv6qz2|j<1x&leE4j+M^Ka%IfeC#$$P&|0)D{Z4QdzFabEO9bzM8N zZZ@4D{B@80NthE9voh?Q@vO1e0h5u zYd4!hJau%ANqT_kVS1Q78`jsd9&|#yGHr*dav#fvISOLG?AR;pIxjkh9s#zky=3c6 zKM#eiAGgDwT%+{kD#yq_U!vApN@` zfsXw_VN{;SwZS6Eb(8R{df*l4I`*H#&4xSCHmYW=;?6GGSd))!S;JN^NXPzPb6oRG z*&LDXX|QU|W;R2+(*SyLD4S{Mt))_h+P(^`CebQehYA+URdA^QE(#7N8(6F)6LD1D zcIZOR0Jx`FdtrIvV(nt@wzeS0Q<9dY0gh{j>dATFacv)q^tc}I5U+sG@&A2}{pl0t zSvh89fkk^D3b${CDgdNpe{VRbf(-8QasUxY6mz6%t%>0$mr0{LF*RJk(wW^{!{x#e zUean*u$nYfM^V5s3x*I&mUJSXN+d8xG&}deE~^fRv5VoNEFV7Szxx3Ly`oB~QOBlR zYng&sem$-SJ+ZDsI^H>c*99H-rE;_E!WShQ<#`MNJf?%&Hl^tPbNA@Fz%4%rIR9ly z!jObPi5)Iq5jpAZBLbN9n&~9n{a>uqU;t>RHvqxZT$Zpw2v4-a>>v&br z8DFzSRDI8Rsj~DB-=A&Lt?~dRTA@Z)59l+UOu!sq^`|OIDjuhgDKGb?JQ|ugU=A>- z%`X*U2>II6jp#+NUV}rIL3pB7Wru24YK^(Y5~j8hS?B@XKnW%uI=P_t-2LDPYG#OZ zg<6pV6@nZC`^&}JE(|?lu4`w-^Xxd!U!S}n*?P%r^nQGEVo2LE-hCVW4FilHC#l>?m@JyC7frW0qB@2HL5B(56($27}JuD^{$Oy0Ae->toD`fCY{$nkg# z(>l8AitPnrfUP%mOxXulB7lfpgeDDb+p1a|l4wZq#vP zEiUuBA9{d7f}D?J9_RJ?+*Ls`uwLn#Cf>0vL&cyWSDSxS;53pY+Qjv4wt$R=X@a0$ zjrM~tR>EDN)?C+#WiB|h-+40VI*RHIgY%|a-u0$-!}~(R9D9U@@WQDj3h+Xbl*}l- z*0C+#F4O%>&V!Cvue%PwOw8TZZudRM-VG@PQe{}#Y+JiikL%=U-I(i zwXo<-&sM{3%+WN_XU2uC6Nzp7S*jaVIq=V<2i~nrG66{!K$@s0=9tu1&rL_|@R z^tma!RiRsTZX__M(aWB7Fi(^U{pkbN#i2fGE{hMj-`yD!&;jiv8*m z5%9{RX`&#_h}iRvN&=dk%g|?z=_z{D zoY{$ZOoOp?CERv};X1W;<=I9}L2|60iG^^w;b59LobimpG_;BO>?PY|?;u#+7I#N~bi>NY$2$fC;^l?rp|jP;4=-I_ z^b(Q0w;;sfyWiw`+km!U{&JZNP2A~zKgY7^TW#r7vQn+J{O=eIZ`k!~@yc_Kl!E5O z)OwRXfCVo8<-fk`o%fA!dUjBJ@rl;L2~mppg&%JA*r#PsfRd2oBT8mi$&M=NoRUmq zs1^9fo>s>>4&FM4-hDc?pucpk{L=Z_3#ZFxrkfY%nwZ+kl0)LKq~e zcIIg9^ml0=Cmf7^&{si z&z~;8e5v~K#Y(wuiL?m?15Q`iL`f!Lwpq{8U8hdDT7(jjgDZ+_3oQt2#=xdsr)IA_ z+XyL`MWip-+l-5^+LQaj@7{wm(2WKpNuQl69r|*wMWm$$26Xmxn50SZAvryw!t7=8 zN-`s9F(My{fqC?Y{3`{ozawB7dS#*U@}=70vy~Umluul$y?n7m>nA3_$wq$|3p>AV z1pB=;0U|!^dZYB!AY4`Qa1~uY-38=KTm-8u6N{BKIrTgL>D6n!uLu)Gt5I8e`U{S! zGe)uRr=ok64A!|yc1+C-fqXD~H0E*!Q-)W;JWLpDr$V1Ls=s`(_T0(h@r$+N7s|6m z`d~DdA>OfRZ^o$c7({6%1E&U8*^!8&E!^1KDLF#K5cYn zy7nS{+NgTuT=~qEYK_QGOk+Y_lDYKi9MVDOkbLa`*AocVaC%2SY^VjWOLIKx#-N9Y zz*QE1RmsEKe*Ki<%b63AMrYH+?{9s0_piTWqZ{W!)EB3*=B1@ZEar}SNVPiV0aQNa z(9o?*b9ERz47eC}Ph6^=o36pEasqKqwdqA@hqcMae(2Es;fF4`NEpy+%s_JKl*H~% zfN)bcqTQc=%^(in^{~Irz*QE1RmsEKe*Kiv&6yhpy2+kC!D7ARzR~~oFAw(i2M*z` zihQo&m@VqZF4BhtpFdSTb-8-WU6#-%fW_MJ`wCXrXV5E*LAT6|}F>ccvs0fcokFJZf2| zhdl_*nGq3PL6?)jsSiCg`TzN)y(}gOlnqVzFy>yItDn4Fd+sEC(e2oU%9*LEXUqkd zj_DZx&~SE0zf8gvW4}DS577yMCP2xlRDylGfj)nP*`$pR92bYK|LAPcrsv}wmi?~#(fGgQ_if-!Bbq^P>L4!fP;d~alXJm38p1>U3 zFzKNuS7z9}UaHV+Cwjk9hr!VY(yUBe{O%vVV)NQGLcr`R3(eD4>d&7d<{dqc z)ke8RPp*1$hMx`*M!&30Z7#Zp9gln9Mf6IB0hKT0vU;n9B`^jDYKLQEEJA6eO06>s z>;Y1Nd~guJU{Y^1y$?V|z|~fJbwmWZ1xKj@+L?&QaHfKY)KMaRnGE_WSE{updwG(J z)wc&lsPtjB1Xh2@kI2LVhx0l5F!oBm2g}m(B@2Cl`u9J)V{#<^?8(xLr%Pw1YZqo} zv^4GHMjj#-`^Ww5LpK&+hM&Cru#1&+b|he)m&>Fv^0>!bGm4x^({SVl1p#7cHfn=E zsMX5rbyW=!hwglX>+Jz5LRG`0!84OvZCMyJv-EitTW^^(P$-J+2smr$V?3CFqB zEVTW@kKIsU6`ec)J((f%d^TOgKNA%UYqz@IKA=0%voO)V z0#;QPl!74=xj`dfUcK3b@i$Bp;hp@hMnhnTZCj&5Ib>3;)jLy9Om|Qs<^U_~d(Jlc zbvec<#z9v*=<9BD%&vU6A+%7Z*G0IOTexdCi^Mu%*BahDVa5}&7(&?dN)$j=AWiRF zZMJyGif|pO8-!3I;xwWccqWrz46D7TLMyKub%Nkv0f+>5`$mY|uzJ99mURq5eR-`s zV*)eVFaw#PTvm}KZfG&Qa2p9Wt@Ot7wlMppDsl#aUi5WK&N((X^FSWkcI`$`vw<5#r74lh|edP;!Uo$*}{4rmIEyTnWhGB*CZh|Y1U;4|c?4o1#;My!~ zSDbOw1rNEA;ANs{=maNYJgz0C%gHb>uqCkMSmc_P z>AxkL?~I^o2q8~&AOY`H7uTqD81b{|G**a}TD@h^*EcantE$#$HZc!C&0&MdWV+%j z0iP+l;MHd>aPy)+$lnVdaq}Sxu!YU0jrGwffu0__Wvbdn*CL{~Fs>D{^fD)! z^s6!!6=0!dSu|^BD=Emp&fu))bX*nuD!2-TpbjxjLxmTLB@D;(J#ttiiQf8y>Z95) z13G)iW_5)yYV{>0Hgb^14ZQV$nsurdQqNnf@?9dLy69T;9N+#`WQ9gIS;jOA_8ncz zFIJ2ca_Hb|IHF41-@P;NhzSl6Sxl{dK;o z%x^Ysp~}ngwOhT_fuVyf(WwhD_fnQhW!*602l-m2nNB8b%a&w`&G%M4=KwqjuSOdp zed`rNGpd6bI;sQa#WgLLO=DpMc3vx8gWQ;X;Q-EpX=KGHJ|&aBgH$$xJ$lnPRQ( z|6vftl zS~ivl2K|j_6tAB;sA7g`f*dK-DMlA>V8t=Lz}e!8Tpgf_d^U|zO6(#KD2THWGibIa z*Da#sgFJqtspXm?w7?r)lU2cU)x-m)Mu)AJ=@5)eC*v3d>rJe`__au#Z_!1=s#i9V z02Wqjb-D=R*jTvW^tgsB#Ck}U<)u=U&N`a6(5KTeX@TRMEjG;#LdU8 zQ7Z_p`}p3i1r0bvPZs)|E|L*x8ztH`JSwIN3kPy-Q@LfCJ2pZOXA zbb|eZ<%c2Uz}PwIv983l64NJm24v-fM=DwZAhO`K0NRELs46S&P|pgNB~g|o zj2A43!emJ*!HPYTOx(b_-cYq%dkDh+7Z<%ewnW|4;s5{u07*qoM6N<$ Ef;2tO<^TWy literal 0 HcmV?d00001 diff --git a/ios/assets/IconGold.png b/ios/assets/IconGold.png new file mode 100644 index 0000000000000000000000000000000000000000..7dbce17ae0213a732c8ec82180369a6faa7e36dd GIT binary patch literal 5423 zcmV+~70~L5P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D6vRnHK~!i%jamtC zUDbI$=k9v@(|b>{cG)tPcOxUPal(?tVA4q(;sD7onUu67X-a8RhM^2INi$8GrW2Z$ z2EwGIX)`gMkc5yx3WN{}q&5MAF_t%3n=M(p^!DZM{m!}fJw4eH;rG$GXZ_E2|8xH3 z+-KT-?T z0G(_SI#}I*dSzZ>gO(Fpo|D(j2C&R4Gjc84=E>1b8xyLa7;BUS0rG?3QS=sLT{a+mgPE`nY!Q;nP^GCQqi5HYGnJvfK{rO(8zO62av7Y`qX;+0#DFo&fG0Aa}2y)v2 zR&SKoOVNne04K{Oiw>Q#gtSF6#MvD*ZfQ+_vVHz^I#_lfWj@@S#U$#l=s5gD)rb}A zs+?+d+I7Phy~0Is6HPC&$D+vvlwlX@H$Hz{3qkJRIXB8%ks_|R?srIiY%hQGy|*nZ4{{T4ow3e#Npbz zBX(b7WlJ*KlU!_z%rpkZG`Y+a3X+qe*fiT({NCYP??2tKUg1nY%fQu@d2vbAmJ=p1 ziFMuZg}OPc;LFV;zru2k+1;d-`EfZNmfj~ zT$(%b;^5u`FK_K>@EF#yUIyBuOImmX)EfG&n-=Zb`-OTAoR*)5YGurDfA)bhd$xz= z!c(%gN$dTK@~Qg;DIh8_NezgyDoQ|IQ&!?wW`6q6;LMJzp1yXiEVGWKMObOI+C{`p zBimsc9Jt=GKX0=^Ok=$Q&pefcsdQ~K7jIf0+WiY{=R-zN0@j0ATPN3Zc+MldEyET}AA-dLEmyv3_L{hHU{&1DI7 zY&W)5l0?+m$zre13=xRSmHpLbdXxEskym98O`^x9RJ-jSDG(-lmJ}yQ;ViKW_4|Gi zNlE}Jx+#?*o{q9be2mq_YBfIr7;k0-pt6LM#pH|xYs@EjfBsCb#v8mzyd^HUC(J}v zmx{05?TkN5ibG`nZ%E}7PCp;H0!fO77g?K_C&cD_dGcZTtZQ}F#9R;DxNTY%7pQA9 z!h5oQF}iN2f3E8exL>bpK|vD8aL&Fl_(DhMn1oG|14M^VRlk2FLI`1$;2F%{4fo_6 zNdlVs6_yjW9*{r`KPT>e;As4+w|(A_YJor42=?Gb-o{u6;?QEd1M{CBAerX~)p*yc z1gwJG7}du68;g_h(42|)V4RV>rHCs_0>UGlRgB6w@PbQS{zx1NJ{RP*BCE0R>wY6| zAu=793F{WIjPi=Ixs)U|tV(1{GRM5I$HeEz6DPwZ^R{rhLeA0b?}6YK5Ta~IEfUA}*>b%u*ksfoqZO7X zRcC)H`{1^TUtE9efA_!q@E`r?Bkl9&3=CXGwBtjc<2)(&RL@e)rSK=q{058}FB&g@ z;>eDUfl%{qQBm32??RLo7pKkqnc;=a{Xf5^S(Im>Gk8hK`9R3%OO`gLa_bU{Es>e1 zHVpBzsFSP7GXr~Xf2DVALv3Y7wBv(!D6-66)+JEDrOt~G`%iklVE^E{!H@5FwIR`` zh9d8Vl~S`@%*`Bu>3RH(8}E8!?Ut~6+uDVVsZ3{lJ{7tUR_9>Rm~$3`f}9kUu&f3g z$1cymd19*XeZSn*tuk{}BQd`I3KmDp5^Mt^Q68j$E=3Gt#jHzvRsHIvrIJPcN%ydYJ zusXdnQJTdz`$$+~gYeW%kcBgVa&=nWIM%?4kf`9kkWr6K?tql7;z(xdSS7c}#w^`_3yf&Dv~W>piMH zNL|C1{py4xYdKVsos*+Yhq6jk#Gdnud)xJ&@kT%l3CX@9p>Jz0Y-q~1#}*R73jw8s zFo2mADIv;;sYA@BWQV9*!G<0k-}Rl>*8TF7w57H5mFs4%?K!SVS=c>@B3q8%{p1Ip z9u7TzSNo?vvCpC*+0B!ozeKo3XzfC?DnZ?GcYfrBwfDXn>kRmfVgz!fWYMNqge%|u z*y}fMKh)nb+?|+c3@$bVQ=VDTU{=D-N-!#^8Z3(vNLiNX7}<{ah3k7}dmAJFITrot z@5ALvb9bsC70ZgE^W@Q8-#(H$u!DSl=PRMko2BMHB55SJlQ=S|oP|a8*I$jOOyyv% zB0v6?7Oe&yVz_%7lR6Fe4LLXaCknPv2){!I0Z-p=uM!zd|V7+{y$QD}hFr zh8$OGiWT19ySS%I8M+XD_>JJthZ`5l%7gpJ{=ONjaL%53KoWW=F-ZC#w7eSJy$dmL zu9|{DcxS*qS)f5a1G)vdvd+9M>ur6GS~lFI zH^=Pr4ibYTk%8%mu2*QFm8c2QvX^w+MbveKY3^#ojGv?^fj~%*qX<=9K|MQXcZSH` z4*GA;3){aP`0qpUyq#1OILJj)>2if2Vt+od#(*UT0)`((-nLxZaIF$`Y$*`izCJ|C z%tIlG;m)mGgYWMb76$|^M$bM-GA|K3{T{^N+B86X2wZ2(;dO-NabN1Mx)6pDiYldouY&l6V*vt_JF(3Du?8}aYy92ZQFcD%S)!J#O zmj>1lO>=Gck>6%QD*MQUGqBZLut5^unJs)I@{=TaSO{Jt6i*Rz{12ZkEGDS7+>FEU z%5ie%cio%!hVH#tOGcHx4cdXrRfEuj&s*O=R1Aq^U3)AVk5Fuy+Uml88uQG52>~iM zk%n#|+)HB{XlyMFt|4+bUm=rIg@NJ1uTPaFrkjMWx#qU2-00Mt_2bXwKYq0?D6Nu{ zB}g@_V9NKZR`v;3qQH81@R_uA+ds~}GN%0B-?#1AEIGD71(8Z(vE=^GYq>8SoSi>y z^zWo!yS@EG{V7$Gh-JCuMG9xC262bP>Xu<=^2XF$X=uD~e7Nw&+43`^HZjGvM#bBC zy5{}2vInII3(sY&zrD6{-)*>@mnC}{&?SuZK(TQRYe{q+7(DdE_?N$$|A()4-gj#X z&fCeJCuWJpFQW=9i8DH0di3d;e|kDcGNrq334iGm-Mw95Feq27g-qrARPpq=!m**^ zp|h1E6S!>&Bq)&vv0282bm;^F>n+G(!Vqy!o6g=;`M>UoMl_ceMlQx!kCK&boFJj; zYN`c}9ACKd{?Y#Rfv4_Y*VYnq?T|I{AH=B;IU&Zj2;ntE63vSB(p%{V4o)6MNhz*baI0+UaR`@ux&+B38vNjJdEa zQb^JodO8Ci?T;i=?ypaq&%RlD?u0Rr7eb00i^`FZh(J(-GiPX4Cf{ZuI4~`n-QO48 z@p+LnB#4}JU_O`;LE_grB-?dt+p$g8%o7dTum)3~eCfi^eq8y|7H4})ku=>zBHM5m zceU$X7eNQOOLl(9IR9H~c8C~eOLO49&vgImfdpw#+LB7ECPKxTJU9xTubTX?;2v-^ z;8uP5ybjv|ZFLcPdnnm&8ir$5fD*w6Ra=Evznt8PjXO1xx#Rm6$nL;yEt?%lo0}~@^u!oBL;wBumdzV3 zgF`k?9&~c&^`n1hocx+o7<65Qy)8JfTbyE-CiU?{#4tLV15F8`Wa1Xi#3YM?ECD%> z!BFZLVu!`7Oimg{tTcp$mG2S5r8Vy&OOB<(0GB3S8b?~|K z-+W@?sbj{0eX;vK-Q6IUt;ydRBVVOjzgw7a4d{!+PdS$10%34P*RDvBZY2dUmUEAPq^&&m$(uMO1Z50z)j(=e{qXzR?25za*PEkr(F0XyX3J2vGuDMT)V7w zUazcK_pKkEx%Y{5OQVEFT%?in8~=*rOVXDsNMYX&siw%8vf0-m1!eN;n^RA`aPD7z zGIsZm#(((K!m|UFx6{N%EEto+Q8^J*g0h$)j#kn4U(>7-L!Um*l+`M7hv|Li{I09CsnBpLzK54V}Tlz;B%LoEJy?a;%Dz7x;$|By036=jIRi*l}&xPw2uOM))7$&p;l#s->ra)V((wbD7Q~>2;t7qIJ z41?~mAUx}iPUMLsQ!T;G95ZxWrIsw6S77Z9waW``xx6OXaDBHlYuX0C?ekMzU4SLr zs%yz_WOrFjh88l=re*4wYTJ+)>?q)|F9zO7|CLz69P9x5eT~&z(jc4|LEMD%1T$yh z4VF;)Kt1xx2(XG~Ar}cMyDw`XWgH8SYYoz>iTxY{K>{AX(xA9z&(Lo0@kefKf(e=K7;f3U2s232;Piq3w-VeN#d0?AF- z=cfxqRfUG6gV*NdgY!_bGH@G?Rf37Ni?c-6+nNJCZ91-6$XoO;0cHg*9N{a!Ep<>Yi(DC zH-9wNw~xq5Q(V1aQ=o(^3SZ!o#D3&}P!Xu0f)+8*wjS0;p4Pu>0K+ckfj#0z^J_f-j}R?g&a$igakrn*&{ap>>xBx;LsV9dfME5fq%6q4C_| zf%MU76SmxExGcd0IF=8I4WNlD_j$Gwgni>3^|p=Ca>IHl(Rs_gBIZ2*t*aX~JN@>{ zVjwO@Q*tCG2SYd*L=@rwN+okXT|PIJKRud#`)uyz)5Q~`7D+12n#h)g*A%ehT%@ZI zP4ok69aV9GfSynECSL*++u=Q!Kcb6M<>Qa_Z|zNB&xnj&qK;|j3Oep2BNMrS;p~w! z`JbLClW~V2N{xv^gBX)2%(KTGI>a87{i4YmRv_Bge^COifzp>$C*LBXNE929J!SmT;gW1Dp^1mB2NQRK8NWvnnqZ)G_ zJ|9I!Xhm@x;VZemvsK|2s{OU)e4>q4+yE$Eyn9ivibKr&8O+a8A2td06|w&y?vs zli1L*7NUV0_l^r|1$*0zVPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>DIuS`kK~#8Ny?qC` zZAW$9>^-}letUoS_4|5}^bjh1Du58Zi(ng@Vq&mkY^U(W#{OdBnApZKcKkVn#CC{H zFd&+dgh7%4>8VTash8K=eYe+Bci;Kf?0xDz_r99^ckbTPXU&>5Yu4;`r1fw4G^<03 z&k>}0P+C1HjQG$R#0U* zWmz>t99JEm2%0LJx{4O7^{q!=;?Zl<{bh+nOxYOyd3A)#On zMAOhzE=w9$!03db+KvN}jk3pOn`#573N90mM9xq`xG4_>;yBSF4yLYQ{K}T?dR|0B zl!FqZU=yOW_$=~At`Mn!CaJTs!>32Wi5bj7)6C+1Xs(s zvep_dP%fLdYNO?F`vNS73uYGYsyNjnSwy!i&CQv9kg;14)8;paeIY?$%s!XIFl#d!aWy(U&}*&@8NNn8Zt! zUm2N43iUkpU|qi^YH~VGc;)h#KrnRd#e1cXuxj=cWfTQ(fkS%88EvR6!(WsKpK0 zUq1T5KRi0LNyl)DY8!;20qr8A>}`{puzH3yQdY1PpzPKE`Y8g;8rb2Oo9G7?D2Qzn zWp!_3De}i*aROg3>79U0fRAu;uv2$;<|_NT3!6I^26NMc>6wH&uW_^@_$Z2qlH>;> z?t#%ic=`5UdTiH50~(gN-q`9YERN7FsUhwn*u56ovK638+sZ7on2uH6^IbBA;02Qvo}}T(YZ9zF}p4|*J+;96&I|GnAnz;GS6}?qi6}cG!?kZ z3TKDU?|R#hZs}LCuye{Ia@KK4oNbP{63&9HzY=-Gu>};llDYA!4_^b(ZHYiW%+vF} z5J?v1H1DRYbxmhsW5>*f?&YEEd_p^KDkPFMJ`xA3N2(MmN9o{NO3{;wW^zT7VRFiH zaptU5I0^4ussE$*zWub7HZb6gcvjYvlJ08eo>qv$C} zrJ@#k<9@(abe7a^dQ$Nu9_|Ha>)>mSiD)Q$8s5EGxPxZ0eBoMG1oI}rnG zIWA(P(KidW#yQ$nN0F@zY(zs^GVc39jr68dGbpmTYt7jj(yBh}g2IthdEel(>vz7Z zWAm>#yMs6jr zU=r(d@W9eq*D=RrY}2Bg;@GZGV{H5M)uPt~Is!&w?WQYD!T^Qvf~}}aR2SD71>-;! z6m0HbbA|>M;2%zx{AZ>UMT`061!Ln|Q`di6?fD2q(A@TMo?2({<=o)bZ2wrQd&o$4 zD7uMF50z`EXH8%u$06NOTf^CzJy2`)LL$0WRg@`46d>1-qcJK*J+UFSDY5}Dhb+gd zI8I4iSA)=3rIo6U4^=b;qF{4vEg1x=IlAQVscCuH8SrMlQ$F#4*1J1%^XId-J){rc zz;svzxAsy(G^fsa3b_K%lbR~G_hT^)8X?NjC#x`gJ*GTDgOx9W8VglD#c;;B#`KQ!MThbMtKe1vd8#TX>Nb zPB5# z5|#t79Gn%q>S~k1H7bGnWT^VYd1Z7R6jS}LAr2^EU{$PlUB9XK`rqQY_5S=(*`8y` zewIJZUi&Cp{2?nm&dM*dpv)vCDsoA{D(5-2XD^^{3iqBnv*nbf8`M=0&_qy6D8fak z2m%<0jHafls^SL$wwJYHiXvl$f+xB>f{ZnYOSy4GJ-+G_X-ygG0Rak%F$Dw#)kt(r zli94?7mU0+C{5%a`_HAvZV%6Vg*l6iYmE0WsfWqkOwL{&Pa~*W5=XR~)|baR^NUad zF^Gn`i-?O|Ev|~@^q9cy$LjzQ72kX2rzT@&3K@$s^ES1U@^h09>Ro#l54JV-P zi@XitmOvF0i8^b*+&EVBpMCV<^5I{0C;!HGSx|bCEgU8(kvmtZ}`mt2gJFap(&35#h_vViL3HUi=BB}r;GPs ztE;l|b8P-;7GUYW^kr%VFmg(?DF|6lYV!37r!3?(Zhs|p7Xefygz~ZqS5adt&`?o3 zx)2afL{&qT`>k*=Z*{!ZIccvT^-8{STn%G-|kfs$9)esSTS7f26mPm|S z0Q%m(Wj14$K@ucOPh{i7s{%<59LKfhLA5LwUpYH=xU6Tyjx)}%2C5ywcw@g0hL%F< zgvS>APz{~2#PSD+7e6sJ{;RuQ`{=6OTLs>m4sis zF|+uK>*qec<=Cfoz4YOohu^UA(C&eg!`Z2%mWS@nS316NV&Gyb2V3{YUP8OvZCKnk z)TXS63YRPFrh&?i{&8?M3_LB_D=t)D6+qDZ^5VJBE21$N%1h;*@1E?*HebqWgd4Ca zpUs1nF2e%1Csldh!16C_nfTT1M?Xa(dGPv?SI4@~b|vQx#e%*D>m#KCHely?&#@5} zDl{1)tkO!Ittczc1Sk=D3we zi>DQreKuvIb$@%pdPi^Ju8otwzWdZ?_Pz4X?GN9w;nf{|XL?gJDYYDlB$yZ-QBdMZ zMeov+gJxzV(J>-P3D=rKyvo`6h4nw0%H))Y6RScRx&32M*rq`|g~xWilxbKFRsk=1 zprI9)##wrd)OEcnxA4SWPmlFsQDv&ppXu9jLG^S&fZF`bNw;!7u1RA5@XQ;2{n1UM zDNU03gd5)0Res-=@vU8pUFnIg#I#xE1%?(Jj65VkC@OPVNpm%$((PVTRyEEQ(kUX* zsTA^4hfr3L*}bpc_zOSVy`FAIu4Q`5XaGEwWvNuLkT+>+72C$L2nV`Fv(?5UAQB1H zv?^-Zs?o8R9-@CwYUl5XH7nf>0g~T13-tdKI27647q>}4x z=u$p+>+!qx{$$_qvm=>lgA*&U7s0st;$o8|>k8eY+?49xo$0?OJFqj;yWY(8sEHJ8 zVIoiT6nzj6Cx}aBjIHmOH#l7cj1pIKqU);) z-@K-&p6fCKM_yyi}YUzx*9n7?zi&02##rF#XRh_59^iqe)U_vg7%koyJFZp6*nSh}$JZn336-$o0|_2wWI;5g*%k ztvwXo#1SP-mF?)sU$Cq!8mI>7ado$1Ic3X1P_PNUhx&>_w6kQ_ddbvzPf_6tbW*O~r#kI0kz%#VftidEkV{G~#6u(PW#Iib)M3(8K-xe&b>7HWd@3txmSEl#=R$w*YO zG(U58`!D}=)1awiF`u%7JGPjg+4oFVnT+lepxsp0HX&=5$S4TrGayZ0!5a`p?ADmI|xV!&< z9=da)JVs(0^BmdS^5Sdxsn?uRz8cjI5^SB4T{s@`6y(pB^{+g+5mQv*bmhrO8o#n< za=3dOBffn#v7brsz|w~l&vMM`S~fW@~MNHadmdn_MF2`=YUNp*vJkI1ji_V%WG2hs~VcOnxK6$F08 zE=~EKM3y7W##Tt!_!j3*1b#VgO=91F;lO`+eqba?_Rx8keeQMaeH-tSLyJ;jXY2Z8G>NZeGE%JkCckIrSVMXvD;lA~)Xj%9io#plV<-O-CxK)an)HKq;U znxYT@f83DG`D_t^;m6v9m(z)97KRUDSUp}x67Ly|LMaO&H`sBa8_JwZk z7>$!y;S-%>S4C6_f_<)CfKj2Ue5um$jiX(e=67r`V{pWzK^#wv>~2iEM9xAarAo-A zA(9SUP*S`%W$m{OFMe#t)W6<;=I8dj@Xj62T)*zrfpy2;)X(gE>WM{NRg^AWNwDDl z)9?>jMy@lB-bjJ=3l0VAVi*u%l_)%>mHiTnF`Ot z&^Gixdc)#%T|a_^NXm%5>C>Dki4^R)hJm?4V6W`hA%>c3PN3fZYOjNhLe;XtDF_0( zx~M4Vp)_>sN9qh~U|chQ;g820Cuo&QC}GDI?`sOo{&_S|*v_TGek{nn8sE7;pP``H8EODXfd%Z#!Ap!IE+&wg3q zn1zkKxKfk~bDmqlnpCj#PknRWgEPq<^s}J_>L#bxh&CH+cx`a`_BI2-j_eH`}v#JAKlVB-k)ADRR`PwbK;8^RjU+!B<<)w zefvl`=_MbWF+Ex7(v*ZE{p?iu<5RgVb7UyzCe`J-*kUcS7F?_1IhI=)ukmzZx$AfD z-#ry1i=lMq{>}gLu3PTd#yYI;`ZiN~-k;q2Np8>c`~yrPWAo~Pu9-k#%CZV6Ju#jA z$+($mP_Gf9cSa*=twH3#0lPgRmGp8HPEy#V`ulU%{+`Ot-ojAF+;Db2YtCwzY2vXM z5;1TP2f-1lgYGqF6)g*oT|SG|rq(+6Qg+#6r?3CZr`A6_ml)Io*rEl?&RgDxcZVN8 zFuk|$X%*Y|YE@CqQE?nV*jFBT!|y&dGLqI@KbT_b!QX$&&DZa77bhww?lm^NRqNl! zPJWHeeuc?>RQT$_^Sp{x0Usfe_Z%Mh(0BSrQsN3^GiQMow#KjmHt&U-O!vC3$~ArE z^<9hWI_CQ`^M+b56w$XD6NN|g8+$xmRy!0eDPEs2xS|R>6l$?lUOea8)3w&&fr^;S z_kZuDy`OuwkA-}gd%ovPVsD>he{_TO?j6Va6UU(_h5ir);E^On_70sLd*j`^diA8n z<#8+c$Ufuqw>&a@{eM=6Zw@`1$(j^6?C77f<-3`bV3NU@!K4eD!xsZ=04g@-t)y^v z=v3;a|1~gxPKuSP1yBNeh~fs!dEw1n`fK0Aw){VN+iLd2CijPbI`~Po7qt_+i#@1 zR5Qg@>~pa1Xb-3YY{^x#8_EFND#}Kecj-y{;oS5aHk{v?HJ_eNo~dY^x{@*EXQzX2 zylkq{@Vc%vz|f8bJ$#qov?I zo0fZ0g-F3c&=kE}TrKZUbX{v^hxKGa)e|($FJ*o~gtcUjD_P&Q!qAbp2KqutPw3vx z!4q%V;HLe={gY-v;zOo_<>tq)22Y;v?9KEKclb%8baZC$Gxv@9ieYd*Uh&_xEA^S{ zpY77=*4R~`C5=%{M&Bum}N*8d!{7un2rgbKS- za-oh@Jp=Kj=R;)<&XP`GddBqkk1oA)qZ^crgOe)Ply03TWu73@Le9Ivjbqv0xqYHL zQSkjTv(IAFASpcoGg&al)gfl&*uvxV4Bb`SV#Pq0gHY+f=9C_))0O9sx=+rq%!(%m zczP7NRUnS16Ev#tN^c&1AS>(orgx~rZ|Zk^qXu zvoQ&z(rYZJ{6AnTSQCI}OwFQ2P1TM~xDUSKVT~2EiG@g@fvrH5QHm6vEVK7+^@sI` zJiA-#zfQ`IF{7I*Eu3I>i3J5=wLpbmg%uV$K~=H5Dp2II%wJt#?7u37(>#5-fqB}YZw8A$GIopTMht{Oh|8|~)(T*Bbmfp;|Z(->J%-F(0ow?_) z3h5Ya`icry0<45&PGMeQkEqNPjKBDC@<@@Vxn%j_w9QhAY$}o-20wbP^5{w4l}Zoy zs7W1rb1EVVN)X{tHX%P!{A$ugQ&<i6w>@hvredK>n*I3fOW)?-@}} z0iGJ&6?>`iT0&U#*`U01+kyR=>%OS=>?Engk{x)=o@dT7gHl6Yzrrd<1<@Bx_nLqy z?=!5dLSVTPO6u1SYJYZ69Zbp{wL-1&Z4MXQj}sD+I6x#0p+TXky$-)Z>v6`z)UYmSnD%)fCo4koww7OV2I_ z8SLT-F&|o`HR3EPChq`g`~ObvPG}ItSx^0g_hdf(#=@PO*uo5ZdYr+0?a?Pmn3E$nM%Xw@sYO+|c$QNa;b8qY9& zKr%N-28;o+Neqp@e6n=#sGY8T)kJ`&*9mEDhysdUaA1AkJKu6kuQIKTf5STQ+ri?C zYX2RQ6tJ0lSg?+woteR(>j@wle`M^VaCeh zIzt;q3Xn*$(4%=tdrFvtb>KK}zY)Tvk8pwf~2@?GXwpW|bb!_>5?T(d=c&rZ$F2M161fhK1)HI?Mgjay&) zS>E^Lb$#ic4ysD1X<{x4Nk%_RW9BRf>5INyBG^cORaTNnCMB(xB{oRutx{%-oL(;_ z`y?&P6oWKL)M?CkS;oyl87R(yz z(Qe(7*fYqVI&Pm`3R8xXF%(l__dmUS-^<0`lsVF$GEFVg2{Pt8OWU}%S-qL_N`o7nOp=A6ASTk9-~ zAtLIBIjroD4#f2c=~AZ@srk(DUW%anMx+9rlE5h zZ@Zx=*h;4;B!F5`AJ}U9K|-?b|1Ep-faC{cx9HLmj2JO+)vOJu^Q<|(j%s{EI=oVt z+8QeK9uV5)T)yYArFZ@5Twk{dNt$8mJ-@l`9ecxoJ`6=nM2YA!uE{i9q%&1W+L>J}a#}cA=!AdefA(DaP z21^C^>~v*(s`$c*!qdmgkDRJ3Em02C33X2&Qbg+!N#sFN9a8_zcTsi1Plu4HDyP>w z=&_ApChy+&tKJ>^WxAgTQ#{DabaxdwYb3UVNUEme9M#;eKSlX?H&ym$2TAIv5-T0Wvq2aB&lv&&g}JfL1D5+rGS#{Sv^)4%;-nK{nJ zlp6ZpQogV_W4-D6+`sw2hFkaM3|-vpXauSh)CFE>+1})WJvm!Bb~b!9ncDcCHsRIwb-^QITQ|MnsO6L;#^34jFd zEptB~)!4#T5voQtC&gHqAB#UvOI`cOB1Y}9?E37F|Ig{)`}XocuTil5uEE@W|9ZpD zVXiEPDbYj3)R-$vo)8$gi7&A_2}5@r_gvokR<-#^}!HB?EODzd-*jcp&hH7U3jFs(0i^8WY_nU|+ME>;_`F||d` zZI-ksk7xs(m8H1_=UWfW|N1?PLBSqOL{CoGb5oVkEy+Ll!0=5wvr7f%wKMq_PZVD| zRlN7K%Vq;+aEPR-V>?F|D~S=rz(^Ql4vLtI0@(V&$Rm!lqD5aF!j>iQgSld5H0A&J zcRL0;HLMs?;L1hpxFI~0zsjrC6+&}-Qz)>drza_{gpV!YsdYPJuc!<3V6Xz; zw;hj|E3?xJ-UkjO*Yzc_FQnOOFJt#sYnWKoz^x{4Gf(TFA`pF(_gpK%7(`giA$#lk*AcmUOV>b58eKu8#9}_i?q%lIrn;4BL3-r2>s@Fkg*>LoUn8@s1zhMC23|n zNTSd{k8%6{+^!+zr>~YLm;JP%Bs4Xd(#pP^O=y{%kxpn>#8n068fLnXP%-6e5N%uz zcxt4^Rw4xkfJ-kX(u*Ca78YBn5Zt!I+_O0wlFg_ww?alAsoJ#}7oVF^jSXF%+b5^` zV)^3op;s5)`xhrWbGpgpBa4;Ky#Mt#Tz3tVvdo!bi7hO*KUg>xOntL{>t8e>lqx9Y zp|cbe&q4)DT1FU~aYMS!_iReNbALv2oCjXB(mF9t$CQK_8}l(@AP|qpRRKM*Tz3Gr z&7z4o9cP6dIcqz$m|XRj_m-bY2Pla)>p%+C;s6*wI1g%|GXy zeaK%vFDMsQplEk&H1UU@-1xsg**{qj?*UP-1Sg4+)t+8eKnd)Ky$z_dHDnbD(=UAY zO?`=kxUtM+k_*9*CPd;R$ZSfaZpU5%>1D3;9iV%8QGz6W>%sB=__Z0#*}xA=lJ-|0 z-*o*Zms#^Hv7V_pvGpKZlJV_fs9|3p(ldcI^BeV7jREBJ%R%9EVA+zMmel&9ujq0v zss7+l0bWy6VLrx1{@(yfV0)E^?Z?fK!@CI@~_HRBoaxQv;fo{P|kf6X9+!Rw=oEsb_J9ZKtmX|QFQ9|NrIkAy< z9Z&~v)z-a9>DnB(B}wJ7`<3sXDKCc!h39Q=aDB%o-q?{cJeJtadhcXfmhPL%YUozH zvj^Ri4|r!D_NSiY z8F3w*z620QT>&7iRV5HN)6^P~!&s^8U%yd%{jM$%B?nF=D2>x99H$F9sFzskAd=YU zYLeC|C)e@p7T&pycW!}r%E>Mmm|{HO z$FjR2;KAH;?zzW#*VeEy?;QTMVEVrYONWE}3!yc^7(Ic}o&j+zG#L+^c^C;wZj_#9 zfD$iyUwODeD=GhggEJdN@KVJ-Qibj_}U?>cB1P=o{6Mo7I6mykk^ObkJiKgn$eSG$>10 zNEY+X6EDnt;UCVhUV4IcrsRF_=7Dz~0N)KV;a;#k?*5C zm*s?Rjj`(JaG4!nbU$`$ZzdfvNb;7jaC?&4At#1-b~EqXu5^t-D0r$@##*67uir*Y z6pntQB$!^XPM*#G^zigIA2|0vzJKbo-hl+efhGILsbr?wq%9 z#+!eI1=CE~EN2G%$tOZ*N|IEN9S`x|H|5q1Bq5|^GwWSS$C%Q! zMad3fcFS5qiXPF2JfZ-x5~pyv=uXa*UpTsW-y;)W|M8hWz5Dck`1|wUd0^q-N&84q z%4*o*pl*3?(fPt%>ppZ-hJI;AnTAo3DD zV%RZa5w)daaKkq9nr$#zDVA1Pl|Jni7r>GBXOiRi3(L;wiNYh#&ivq^@xT7TsZW0W z>{q`z`NKo`r^ek0k9TGDREM5PX+4=Fvh`h2FZ0nY8-QPn`1)@dbBT8e*3X2tQZozut*y2x~ zn!5Xe(_g&%^l$(D*>Bx9`{2vvmzIK*qGmgdRF)owORBWk%8G*hv8pPL_&^^}a^0On z${Y4{QCB3{Tb_0%pA;X?5DPYXSw2c%C8cd^m1FpiC|e0iYDmMl1)kcuUQ#ef%ys<# z`QThie2Wl?;;O!c<;&1jlq%cwp5JAmX&9v58{X3r1td)!EulN$Y^h>_usPemu}}WT z|8#A4x8YiT*>b1nE62|lPoB#^bEI(pk<#QjhXpcAaF$ZKup@(pBDygK!d07q=7L0k zt=I@hKU;wHVf5zn1A5o9_+Jts-0$_3In_J(a=6VsB zn5o?KxtHdPVUpfDBzjC;!vNEVTF}$BHC!y}Y^>?l7^qeSOJo_#CHR_7no#HHy%vT? zi~hC!>haUd-~Q(_e|GoD-}?ILuirECPfr(~pMz=1GdUxb(~?ONN%1~%wBv>>Ks&^I zg~L$Uu8U?+d6}A^!9#elFCrN>V@N&50T^8@Vcf@~^jIj;DGg2>+nt0uHXD_f(|nySE}PbLhIYT34~tA5}o zSon7b=fC;GnV+4sr(89wt7ckFVs;x?MWc&AV4!%z1wH{$SsP$kK#wt6I3gQN(8<%* z2XE;Z9i-Q&5aTXPgkHl&4p@V6tJKrX#nphUt_RU@WBRL~j(g=yiSCGit+3CGPBMxq)CdHd94&F=t2Yy8tV3jD z+$+t8p0K+mwrQB`nFt`kc3ik3mMTcApr@tIs*B<;$~B0CC<~x!G>|W1jymu|a-kHW zJqd?pkF`=ZMSeP=f~<1*$RZ3_YF?IkqKmc|M55pw zv9IQ0(yQ08$Xi3Z{Ky~$_M&f>iP(^B9Z9e(eNi82sKfT?N9jOC?QKc{q+UM2*0^zy ziEtDE&|Vo+Ls6hx%NFU`hmbEWD(THXv1qtUn$geP=4kW=A(Mj3FXGENmdrI zO=t;TKIk(IkUpqw-=l6f3>~$BK9Upus7=rUH3SVI%#k`GibWP6DqeT!8NCiJ?!Gl~ zRwSZP4GZ0jcXp~sF?2y&m-LPht8@%e_XQZ&0+FXygmJ$(N1xtd5?A@wbt$?rPxaPn zi(IuMSLQ@N4UMFde&KBjE66)0z3~DQ(fM~Ue*9~Ycf|2sd^MNhiiDx0LS_$zYWkbKNB4jrR zVCY~~!ZsCBi5(EJi<+ysI?**>J6H9!frtdNgadr~ifg@uaM*+>hmI_kED|V$lvHQj z;2ILz%Ij+Wm5hdZb@E=RNaGi>(Z0m~LA?aNQZ5`X%GD~ZIZ)6N6FJO1+Og@H2Fo7; zSSYRh5Ge9h(coQyRnyQBSTK&`!VrcA7hmd*K8fChgeo6AXOGWW(K^Z#873#_ig*)5 zJ8c;Utj1_j1XX$T#T_b=G?kmTm{#S|ZoM>SMb)s>X^Stnx$;dH!2;j6VD#HAtm5YJ ziAic2sK)fz)e=RpAzX9BSr_IZeGHC%Q3_Lo@-~3(?nvcH|J+3M)J(_?QzrFFW>ync zXI!chHiYNX1*S(uHsJ z4_AdGDPD0laKyzFSz14sVmhf;k$8!~YN0By>no0179Y85YKf#(G>$1LW~HDPOP25o z7mreduhG>qHhNcc@x|CU*jOZX^u4UdUtP4sThPRYG;In*_Ez4tl)C`vZjc=YR$xtg z6=A~#;f8_4hHe=Kc|%1P?@&R2^$30?Rsv0qq_q)W!auSNAJ_nEu0I1gxRH+2SZQdI#2eh-J8v!U5U|s$AgLLx5bn(Ye0yD+{GEr?%I|C5 zvRUismgy_J;sFlWLo|9a1`MivxHo~|&U64e|~!EJ3l%1{l{i!yigTa zG_NkCt^;q4y&yqc<)t4(m+2#VwPF1K##uDDWIKDh7Wb|J--!#TsxE zBd%p+vr9?$sF^M$mEmTBKC>M?w~xX^uizsnCdYg?D3;xYW&8Me;rO}2i^rE9JW@V( zvcepRZe(QD9$ldeBF#OFI({Y023zlpJmN@*c)6m=3$$^ySPylzv}`^1S2yh4nu99v z%Ejg9f5MHdlI>N~9Xy%hx=$4f#=F9L{g~xMv=rniK!HLf#vw~%hsuh(wT|Ev&WVmJyLw?RD~^v^z2KTXLL>< zsv!oVSj0_%6&yv~;@4bY3X%|)E72>nmkg=vx*A(o!HU6*08J4zUH6U9K64}1<~}Ci z{Q1%sJ~8~+U)&8=P)AWf%u31&zYs~!3rZDte5O1;U3%^G@>56hPaiKHJMXeGgGfp# zo)ORePyrO7M#O)u?P`_qRHFzegMEClOgs3LX<$$2(t|^n45{-uxc_W9W|MDp;_ zrDu;9esZ#8Ph)5$mgTC!6LjHG@DVXotEid0O-)45>47T_BZ=;{R7nAaFfpTRp2>uP z4Sn-1gNp^&`j*(+1~t-Jfl*Zzx{b)WWZ6ztmeztG)Pw+$GL%pXTxuf-NQHXMyWYwF zcH@STOtI)pEmWpv%P*f=dj5F+`4joaPTBOM@mZOr6kX*empGUb8Md_nUNO{-043lZ zIA}YrA?{|2jeC?Nez{rbR+vKAo3^WGjk;sBvK37>lSKZOYLG|M$Sgs_CT5D`T2Az- z(zV(H#n``6lWAXuolpMTGQsqyEIE*v~wI(HIweu%9tGkH>_mwM2; zAQXSK8YqkbUW1%r$+#SDUrX35&^paWP6vgy?H!XomgFu$Bt=NIai!(eWKeo2WXWoF1(dJZNM z$woe|EtKtn643xd6JZ0IFm#YXzunlrrc16rLY=MX45l__N1U;r7NKx#0S#>n_L*fSR^r+;Ktf)C7G%oRs$-hixKp+llX|NBtaq2 z8xa=*3SyYGtM*$(t%$~`d8F3v>?MF30~;eBIEZdkZ2CGrW~+@=NZj8B7gh}7rH!h% zR2n2OQ1sK@Zo5x$w*j;sEle_*9MOgcWk8Qu@~;3*EniwkE*^Cv(N)KF=#fN~e%Kg` zEh4crwG-G&8&&WSe6cLMV%c;T>mqmx<%?p)vQ?^(3Wi3)5u<~FNv9G}Sr?i{tD~vh zRTIw^aC2aT@K9IDq@bokSdMhUzL9?Eka~drh}$(HZwmyMR$)~f4NgMCp!_P?S^+Ut zx#EgP_^{f63=~fa`vWT~kyKqQ82i8f6a3X>c-_kY0000Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>DX%tCBK~#8N)x8Ix zCC61JT%E&>FUQGIVMZE7Tb2WoEnyjK85;-IfJti`Fs%6r|L)I{c3}hjgoPz7uwK9f z0}fcWnx)WQXT8z5VoR7mg73ESF`L|-Lf6W)Ky6WGmQe{ zgX9|8VxjL`~=@N2mP~Q4EHb6ufHEt6@ z%I~=u8QP6Tq6LW~TN0BGL&POQsInv~l3cePu!TxZLxt%_7|5nnMHVF*bC%`QYzKxR z%+-Q8Cb=>)+L|K6oLG*B+&FF8>h8h_QEW4jSBk1J?nP0o)-B6+B@vMU^dN~PB94xd zk(AnuODZt>+ln|YDXkqFQ>=q%7HE#W4Y5hexI|G9FvekB0gQOW*p7$M535kA*)_`% znE(R-e_*pEcL8}NQG_m`7FiTjMT!KpZh_52&MMfm90z}8iBCpcnK%+k0daJcjGn2m zE{V#MlwqCvJFqduI!N>bP-1tX3DvYjB{C63qPuLz#Xy&35oQ*H4AVcvR;<=Bd>z+c zS}S7^uU`oLZ8?mAX`7)0+jTM5q;)NA>WU;LmlPo}jUwxoQ?1*IjEO)~B#BG8rz$mk zg2dvw5%^RV^d9ccMhetGOtvxkCJRi!I-X#6p@`{>Oo(a&B|`0?0Z{*J%EVmY`94O1 z?~^}>9)}x%83Cy=eRq*9F)e??L%5Zi0s|oFnktAwxoVYb78egsZ_u?Nifty+5jm%x z7a+Uql2IW!HOFg{HbUs!hBTRJ9{$d)t^m$Pws9B3Lh1~5^4gm-7_ifPu6TnA!hk*2?z1>?kE1)%}! zdMcf<$yDoO(|NEKxG6e}OLtWDV$lk>MdXVjv=NAB2AYUp#&`vV1`Q`Ke15=ut=tZcJwNoqb+e=$|S6l zp+f^gMD*?L?Oh0`gMz1Y6%IM(d-!D-jnIZLy@_T-Vrfxi532RDG|`>~XKiCW5DK19 z^dJFmn`z&Ywhm+~+xu3Bv$NZ>=f~0o6KhgV2|!3om60F)^4%v313DA{@()`?KV9{< zVcpa?v4@(jkIiMdn1T~E0Eo(H5#qX~@|!3rU4!6}MO75&0Q4YX&}>j(6xoBSJ4;&( zA7+ufxg0UrX&QF|0mI!E+&xC^=Dx~x{gu6a#i8^<-ZdaUpqXsdi6kYGP{~mrwz4c z$nei2spB^hsL2i3=Z@X^qmN&`Tfi*H>@aE*MzBkzL?|Z{sDz#tPBEx|Cgs zm!u*Wf%P>2h^lXIU;M#QS({FD?rJ@F!?^PDi{R;qg;>7a!|MkFI zUM%JFvOt&h6B!Hf{}UxZLtBg6Py>L7zNLZ5429SB>yFnd`xr^xvtEG|!{v>PBp)1N z;qM9X-o+&^P-W{o2CZxJ#e=!xj{I8QoXhDK@;cLH5+@9MFWcS#l}&$0>Y|jDl&q|# zWXc%0g900o?46m?f&SIQ!)yEd3xnyRCQn1; zszl|6f?rSWJS`-^q%KMsS&X?Rs~5S=?bFnT5Ge<`)&p7pjfy9pLqJMKl9A) zU7E~YfsQ65v?wVmA#NjFLY5dkvZ8NwP0>}gP==cnp`ii5`c*blTbi?OmZWC)Qi4$M zfgm~oTkx1m3pRgD_pUSS-P!77eq~4B{GPsri43G(g)MHZr;)Fh)FWNuzk(= z>ngt;W5Y#rLv3!=0AT$pqg0+RJOtLsk}U3ySa61OtklobodLJcw7(-)zb0SZl`jls z7Dh5tqv>LrFW3TcM45cIZ&#ezzh#VWF(e>V2ofcvE=zJ=l1)iP&?QBaq)_T1C0C6k zR95F|YbQbtfGhCy?8MJM_|^-SY2pME0jFt4XIv5uVw0oS#U*5k(UKLNj1iDBv|8Op zcVoUTSL?9`yoGB(TSe>F8m02w;bAMfqLP~38U;aMz)zah@7gtU)j)Y9y`0fcO6a@_ZV5tzEN8M5H}(bVVl(wf3l>9I!pv@(&#O(i?U^dhNFIj?se|nfX4$TGI0) z=?XH_citr#<6e1*@#l$1E$FTdEVHiYqegyTX88L2*bUi{{i%ToJu{#fX-QE@{6xw_ zFRt4`sw0_1&Mz=vS+PC8R>e39qX_ZA2IVCrZu?20$7As5*MH z?@NAl7WP?E2es6;RR2LpJvVkFH?l9)Kdz;7lA^=O z8Yr}_sQ7q;;xD@POUkkyU{)~eua+vd?fCo-YG{Z;Ya`|N+{h2Y)8^mSqaKI|df2V5 z*hD(MGVy({8nD|Y3){0x0qawSuGhw2C*^Ml{64?(Y~Tc9>U#6gPsn`-g6h1q_MmP` zMsAy)4o5l0>!uzvzX*teXVtJK2wBE&-P7+sxr;o()@#G9XvQU_Zh-X)yoBOn>hKNn z&~t+ExvFaCGZ@bQJ+CGz0>3Jc)@N^)IEB*UO@N$MJc}7lw%&O;@rC~|N{1OWguqNbQ z;zo>J98j3Roa$QO*TaIr=3Hsy(-%hiM1F6-tG48UxB=oU7nv3PW9q8LUujZR8U7s^ z^(e84O{zer1^{7``C%{S)?@jim4H|ce9TcId&9QkXnKX7s}`8I@{nX)FApB1>~IA! zB1M^*N zx;rh4Ppt||r5x8~n%a(o$3M-yqh2!*FImdj=1+5Ov)<#(yGTm_kf9>58 zhn9Bt3{i1SG&655fYzt(!e1W2Uv0oagCH)D-lcI5cfd&^ikw*ou~@#KVLv zEr?P()H6n$8vY6VqT}z#IJbFHNd!&@bTzLlq63#SUo-(( zYMO#Yy&nXMBpSMA@#S5s9l)`wNSGrm+l9BNt1^H59i7;T){aX^Ziz}r?Gf2Pl$um8 z&>D+*K{Wg*2y1~UR{1~7nPu?Nz`STO z!Q8mZF9AUyO0uNnL+0^o$ZTJKk%_J!&aUe;eVrr@jL7Kd;sGhUUQnysiXx>9{$Qp> zVr~^bfoj0Yg?T{$7eSF_=s{wwjfW^gB+#@(#ia3Hj_{-{ss&L}4C>03zKc?E1oj2y zd&V|#=lhj`JYIO{BF8wAMfEdVMmBp+H zPf;qBtF@X%8qpQvPK*i%nnw+^N5yB!gbA_TK-KLaGp>kY*_CJ3g7Pb0tUUQE_2a+l z7r)|ps_(3^)o(IuiO6Kk&ER=cwS4=KTbw~S0C{8T=8UyKD=+k26u&vFOO3?d>Fp`e zSvcb9?FcUHPH=?~MG>;cf}v8aLu0~}ZnO-eW>pF7B=V6&xIS9y=*TP3HUKlLYyb4m zUn!sZpF#aa8sv0;NOHY2D}95NPt(I&F#F_~Uv$Nn0ytSp^rirv1+3q!AIMkfRS#m| zVtKf9o_po&7JUfBgIgGhVui~d`jVg~5yJ5lR}mgk;3lGZ-kwOI@wa(Mp-I>aEp#yz z=a1a0K{8U| z{Ej6d>L{W}3?1l5Z4a%bwS|tv%>ovJ>ZH|cOYW}FumPy23(dHM)RrjDW8*MFLY5Xp zsbHZ2=z%N>FP75N<-t~s_3SERIxBpW)n=HeFfmQ5gDU_SSW%MHY@;dQYBW1Psd)52 zG-tiZeoI4IkQ{rF`1T6fD0j;&umNpC>PCfcs=%fa@aHh=qH=sO7sYURPR;j4=1jAt z$5`nYWw^{fU<2SsRt=Io2h6}^erBKUSTqqtNIKdYU>tWGTn=<}WmipzXvQV*(GnFO zZj_}3QEJ>knh3DsJ29JT>0#!%W#4nj`Ct7qD?G>-=vPPsz>%crLU=WT^Es9-?aY?= zbC!@xWQvd&1(=4`Qwo)VpHEn8XLo>ASX^u-PDQ2Yyy1O!owi%a@8kWyP*aIE0 z%_AN<(2S@57~Fzzb}3u5)o|cJB?7PPIsBlAU>A<2p;XG6a6YbtC<|BBme zDSq1nrSQaNAjI+Qp`ES~pj)PCdYH?hIl9(!}2WB`Ki$#L@ZYkW8Hv3rUAh zbitX2_z}uATcHgIT6f#qGDMe@QE(VyG$LA}n-R?;9@@a8x>B1FT=kmgZNP{(CE=S@ zacU{wx_WNjbU1>;-*Os-uBz7w@hm{u_}}nPC%U4;>=6<&wL~SP_RfptfW+#; z+*-z^r(eQ2ID-Y>!@4#+zp{WUpc-%qqf^F)Q)~P4B_|Yp6G_dyXhelLE^VzPK@Uj8 z^q@D!LwHq(D*#;yLa=<{f-98~9g8o*#qiSN2VATY0L{3B)Rw4C<&CcjfF(zW#@YsqcTyO%5S=aV2{LED+-ZHXMDg}|$Y9HLi>)uDep zHI!43LN`{Do3kOBnW7`K)zmdzQ}}KyVjZSH5X*shvT7|mPQUE!(d#!4tbXT?segO* ziJ!dw*!!+}{tY{i3V!|*=LfT485hrpu#uVSuj}uzDccvU;jg8P>{g9a;UpZF3*lf8jj`j^DlavG3UX z!i^JWclRyjb*r&NYQPJsFJ3tCLRHQ1w2Ng18gL{!jIdGu^%P?LxD851GEwkODO&8B z0sFe~vs!pD2L0tbsyQMme50Q$2|;k{)#}`;Pz;1}K)3kD&C2UW7r%Gc`JcY})DK;A;w^i=b<^a_`v=cXWEbvSr z3yWxnF1yF(c0IC^%F&x3?egCQW8E46Y?SZvDFM0(B!O=QzQXJ`?_Nx6wA&Ye9+dTd zS!-LGUv>yW;Cq#o3$DG?+O>+zR?6d_JJ*+^H*tH~fEKCKC@*-zyc-n!peTC#HT%X~ z<<9Yi_v}6Ok;6xS?7E}(?0xp|$f<4lnSOIMrFe=IOT9zvTn}0+RAqK*b@0ox!&pFv zh!R31v(^OsfFF(yIlwe8V#9n9K@#2iaqE?gH0m|qvu$h6FMZ?v&+Z$V3U6^CTF>lG z4{qz~lFJD}s27*Z%ST}GnKvj6?9xBTKWJGbj_1mLu_HL4+a$gdU%OY~-g$29l$ zv~@UF-_=(h%`T1SrnhBh`;0)Mdv`HnuZ4dRDmQTf-;?ElEu-k{M^ zn(nQH@lCAP<&5w(Jh#}Y0XY7~)K%}k|45#t6q&p)Vje$S z^7s$uwdf0F&u6OrhFtZgfy&kWmC5{C&YT-CXZm#7@*;VBw<4B0l})d~_tDM=sv*(R zRI05`+qIdHEBu}>^#8~|zir+&!>#c<&A_^dHGtP;X!P6}J%LoCtFZK-F|?PzV@!;! zgSg5bMC<2`{&HX*pl|NrUwr$+^CKoYtJj;2 zJs{5{|UZHKH zI8ERw`hcwJoZvD;5Ufg}x^}#yGa;c*K6m}^9Gx7;+Di;~CZH=;Q;zW79Sc8m;7t^QQ!681pC3%a1YD#B(AHlFrl~>Xg;JHo?Rkc#q;#!Pqh}E_ zDFdrixUUhXy%3Mf9z^Tsjs60$7b22+N{+r{7(cC{9Wk#FI*A$)9ibzU7lPgu zg>$xkYPGLbpIxU$1z(JgUkU=hR#pCXM|5^w4$Lk*l-AyE6mZjogrGWJFmd?T<)1%V>oJ zf3W3_C3xA>UmVoxjmOu*GBy)nF=z@Xma4SF3~dG}_vbUHoW1}AF$hAHz5(K4LWpYH zJWyQtH~iBR3F+WU6eTMVPRyknHUNJ;YsIP2=3^!xW0kL14I*^aP_X$BKTB}@BV^kJaikR7=;JG?X1H>#yE&6}|B zRC*|lxW_g?^e%(hN}V^BZ_HP!+_WTiX)j=g0yS0cdi3o#_<-}vYnJ1}E1(-tp0D#e z)0h#G_@lfnp$l=tNGI2$>`sD&F&c!ki)qV^b$}+^N@?-A%JK!zvAGhoifJprr`TFy z8ZB=v8`J%Cq5qG*H6aO_Mkby=9su!s;yd<=_iQ_sm6o};5`*4zOzY`gsljWrqc`S9 z4`qgS8F?D$FyPUZ&A4-ThKqzC$Z9$|=FsHAk%7vp)9AzSVB-*blN>biumZN-a=C^< zuP8EnL&JbWK)Z!ghit&^dZ|%+!)n)~jJ;0Gf`V|qm|dv0JS%{MAgC2imF8crmsa2z z5Yt!M`P{fB(G`0#)t>DKqXWkG?qA-aKjL*XNRZ6_J?WwC zMs`5aO+n(9@~QVik+0MI&4TV&#@EPEq^_`Q1}kuu!=m|++Z5Ux%7ID6a@}&xN*h`_ zWmIbxOajdoAvP#_3);p(lYO5gzEoDG*ZOJBZGh{B>#SCmUnnh}bL$mSf-TVlL2zo7 zTJdy8VUoz6y0GK7pC6krxc?s}2SHJk-hW8Eec;oOLu<2P`L)z`&CF6?g<;FOB}NeN z?Q^g&=4XtlBAdvqF~i{xE?k7G6z{Xu4)nO=(7Ps;Y7L_w;tv}Ug)mDq#0e1^=iQ-s z$Y+KYG$|sW3A!YnE(;55De%+Lps;~<<$Q7B#p>!Df0T5yZB7Q-=(*Lxg}`&77!Ejq zOBLx8PaP~+niz_o8vt0!>v#3vyX~2rTxqrcXo;w#jQmLA=-NVXS0H+TF+|RsyE9u~ zp$(n8`?n`zE=dG!KvQijI%(%goOPzQODjI?r0Pa*3eGhBZ4zOzjhSEi=JeQ^(jLsj zZI*z8mP=j@tM=mj3A<7xW&Aeupk7*aYICjjA7#O+K5*jtPn;q9&)-*p{C&^yg2BEY zI(UA6>S4YBYlE5Fg#o&m?)bI<$z3&uSLhG zFsrdW110`aIYor=-3VEuw~1xi98DU(`ZXBqJgFOT@yT7<8QX&@Il2p-WTc<;hoybz z@u}deb15a*H=GmmYP`i)3n(TCTx->_D(D&hT-QYyVboP!ou8bu*(v`Vt$$QMIF3~0%0$ngxlXi|=rn55#mV|!2~M<;xDp(JvJ3ubh!Cltxpjk+Ia8F4iNO2DmZsy}DalbSy_!bWu?^RW)rRyILzWFSCb0 z)`w3W{MbXg#|=f06?8GbXXP*I+Rxt_+%fz&{7QclIM%bf^~^wf^ksw~!gSSruPlgY zsU(VG%@bcbyM4x%>7Heewr5P;@jTjv$njjymqxF;wN}TvCcG)!jh4vd0y|@SP$fq< z(2zR*I)O0j3dKOoinKDMtAnDb%c3cG&&}Kacp@uE+egzzUZ3MexUFQWN1)e?tm-`T z6}q-cE3w|S3xWr`vGhvd+pRpp0L&Cqzxv>jRom1Rz8^IT3H&vmz5BYp5AOYZpR(HF z0Ltn>dSJV-<=b2K21MpLj_a%mB3)yEW1uL`vs2r@RWx$kY3h(EI$6PdrpT456(%7@ z%I>-jHUO=|KX_8~cO4*GD5*9ooHVqaj`=y&&^i{H+;C~fsraG4FsD^tSa5=p?`6%} zJH`w9(zS1_X(qLdCS?4@oRyZulxKhSmEfhd;fyvun0C@~p|zF}Ve6dQvSXpC&;!1^ za1y{vb#>OM&o{UOaELY4-#mTeU%Wg#sLSCk0J=QpIAhxffBL#t4rQKb+JCMH$dc;c zPtUS84A_-`KsVCu5;&x{>I7L={A2SY56@+C)Lh;s{Dds=GxVcMuOjjF4mB!}w8?95 zNary&P=eOf^$FXPN$xy=9duvaXBb4QUcg-!f6T1CZfxlX_RswE_2)l)-O0D?dHT-X z=dSCMzcrsaYs-ef!oB@TkfN9t{g>vQ&rTVxGnvn3MvZA`e4-xsZq=zRVyQ^0XPF-9 ziqb*|qFpW0M)I`UZ9$@9yizfW^+$=B|hTzdb$b3cCM_=j#d{#^%NJTgADqkq2N zETmLFtvdS$FWkAapj+m{tH!D;Wa$xVG6oPyS`}2weR#@$a%Mm_c8{g&8Kpq#9@Q3s z_W(S^f?ZuB|Ce@zh^;hCsB2f2&xM~8X+RR$d|CdJ$BsNWn;SM{Uyv-%7XyFBm+!sC z__qh2A68!phdo{SnRuVJ{q@YQn1)TS7F}Tw--7E{uut4jQP0@E{Q0B9kZdUa4kf_3 z>v}pp2%>0;qN$27@unY0l;Wi*0STN=XkE_X2SUYXMVIbAG0nL(Yah;8dk3mxxs|cp z?2i0GpW(yEH^tV-$$_%SA$QqhXRrUn3wu6$J~OHb3eo$4=LJ4I8K-Q!6<>Vs5&47H z%^ezgGA-7jYTXERQPD@u{J5g0dEW(<<(XRXWNR1U5YoNx#p{3Q%X`N)O_1e`X=u9s z+{{YI&+M@Fp;Mg4vyic{~u4c4i^;Qiz6ar@+r(;o-`yxNOZ0 z%93?sU+LcM%RhF_!bc8G-Fxt*H}8M?wL8yTGcq@pDH{s0k|eJtkgAAm@8H~#@uht! z?Mw4|#gS7G0-p}x8K{zw7QAnq_a2zbYr(dmte#gEx_L!EAb3!i+G5~gxv05Tt+H}F z+;_79blR!qk)QkW!N50ERay0fJFnmS{=0A5GdlRjN&l^bzi-mB%TVZmDdWb0539pB zu+nLz_9WI~$sKpOfd(i zSGJClLOlY|6*kPf$JRVn3Iv-4{jzg)fAMWQ=0AMs{LkHR?tNFExP8~rL*rAs`WJ>$ zl@z}h>V*o^jWDvSb`bX))vHI&-ZkOWs>UO$h7&N8W`xi)fQQIR1?&Ek>RffmOpQ&X z=QJ_lA_qDI2Gg}xoO;c!E;n8S3V}m7fPeDD4WFCpA2ei!nKck}S$gf^-QWGjt6sZT z>%;1+d^BWI-SJ^#@7o2*5Z0a%YtPf0?XL=WlU!&3d4dwU0=8hOXnyKMCfB*|VHr_l;$wytdGB%??1Z)M;KV2&|4a!UOo)iG4r&*sf6xoR9;k z2*I(rW!n?(zHws5&Ykk$4PyFcud*tpj-;;rVJWwV*(GuLUzmM{Z*1@?0S=9a(ab$0 z^o1ljp7QY*G8q~k)WTj$5CVR{_eX~bpq$}w$A8yn%f8^#JH4KscD}REx~8wbbD%hw zS(?nwjApB8g~%f6=qCY9sS8k9Q<5{HV(`xb@h=0xmw|s?yg={h(2}MTBtphctW4Z@ z^y>e7Y?yiKHW@{NO^=)d*S1|}*$!T_&-}=Zi?5qJIiS+><~^8+y9P@}(Vr^hfBF8` zeCm95!o=#4?&k)sJ1uA*zE%DYcWV>Zf1jA$%Y4fzP6u{L8N8aV!<0_4!{+7|T??15g z0euK_Go`abjWp+9(b;(SdV z17pbM!#8pR&#^3f#Sw4VCVuc1=k8t43>(wvsUUzSg0lEzK%iquw4a~e^{#(9ShtO= z1_OX%e5{z~Q>ov7v-sZK|DeMB`Aom+&-A_b^7SON9TrSy&Kj%Dvg!p^InAo4m^H<` zWnwFScH_zbYkP|}m*@Q?3YIJU^~1T3-j~~!MJGecyZWvLQg#Pl3$)S1CqXdp32&QN z`Pl0p-rl#A)k}urVG#jcPngu>QI0^vOG?RVRy9WS%%qvyZsai58=nP&W+vJ9E=a1T zn*D-ccy0i_}Y$Wyuu%Q>)$=Ultc?yM}Z9 zgQ=P(!(lbTDKlI{W7HHZ^S2(@_xM6~n0yvQk{-?a(hnZVfB)4_^lJ;gZ;9p`l(9EU zxn1<_5h@>kqDz~e8$&F$on`j1+*K@dH8b}yr^=kUE2;!=1sF7&Yyf^$MJ!h3PrRUU z(+F{fx{-{Q)nL04(DW}rv;2I(Zrgb#r_+yiRvKBT5bb#C5`EKGe~ z*6CqL63HcjN;T55*5`Yo=g>2vT%*H4RwN+vFO6qbZrVP5V_se^nJ*O7tOT<|YXpqf zv?QcN@5%GdgEM`aG%|u&L7x=`H4um^5P<6QFYfwJkB^K){BZvG9U#~BCMO4f<~4JN z^N;y{N$UGI#x*~qjNJ-{fy58N!`$G&x0zd}P0yVobIQ!Ku+U+(Y1;dazI<|}K>eUn zjeI!()i2hihh9-uEm7msT||}yDYNqs@69f7*@zqGUDsG35>(z3(z zYI^EJuNB|E<7<*wmPdX{Kk$Rf;9rhZ%)j}vUX_;yNKw&JiqXdc#mBItMPR50G>)PBd`#Ee-z`8Q4a3v0&HMHLH|6kSUu0*nkpbe@`WzjV&<+4j-AJeaOk9q}(8-~G2QX9nOm z)1`Gd0RECA+v)11F^nZOaF{*;67tH6UCB;&0jZ zZ|rjpPoBr@9U6T6nE4%Ark_7ICkhyp$|M`Ui)jO_c$B(e>qdVEU|LioC(0QgOJLvO zt>t<^m%(u?Lk|>L+|j@KroAgWb$M!4KUtE}nA}NYVDP1s!mOJ6z$^B13uD9C-04~6 zKR!B;k`w@KL8~pt3r72X<#oj)LysuK?^7pk4?NdhdfuM;XM5_8rSe~?et~6fVa5pa zYi#v-<}5R@k8gMnJB&GE-J8*u4}#=N>2M-IR~VXfent4yOJW-BCI#4(1^`XEFbmv) zvKvgO?oHdz^pD;p5cg{+``bsE!>NMGe30#T7fI0uUb=P!@xUpSS{_+0$R z2>JW&yrTcY>x_H%znGF;pJg!go!KvY3xDrdpA#ihH+Bg@iAiHDvzMm))#sS?@~e3{ zs0ksEGUUf_8vtcrstAu93u>+)LnTNc$wKMSfDX`*cNwd=-d($3fF4MKG|^YR zep~UjvEb;u_Hq%k0QU-ziu~{p1*S0>Aa?<+4g6J?z3Jf4M{d2aGc)6}6m#eN%Ja-! z6vV6`_3>o_j0xN$houiNSz~K2u=?>=?UHZ{X!#;%0*PKC2>Ss;@mnvtFBMsetamh| zyRp6o5EK@iuLW=4d^J_z_l<2 zLXc;DZ(xJB(5CO@DYpDY`UE5y;VTC;SXOkX0!>JCDIzihB(O*cXuZ&va&OsPzHQ8t zEcKCj$%HXL>*)R|4}1vuzNee|%@g%)`M}gXatnkG(}K>GQJ{xKpkRu|h)|zn)nnZ3 zz1ko{Xaq_=Y&E!rLv(z``|=5wG=PM;js|ofrX*jGUrQ)^!nk3*cK5X5PkD7k${&Dl z48NP@57Tr=RWi2nEL-_4CXR6pxWb+=Sin?H&&q|L)F*+((?NI;!2FBS?jh^u-Sw-p z?AaN$;E;Hcmp75-JAwK2wc+RowCmfjc1g z?H5&eo(hvq{2dl$eAW~k_=bFBwDb=~i{V<2yi|K+3Wt3|eez%m#vm3y?^gPiFgH3u{k-qh7^Vs6 z3GE$oMOsR_nhd&Prw!2!>u3z1H^k35Pd-x#jrBQEMSbY{u@~SW|qEz>HC<}kHQ(&OINIGII!xIX@bXWO&4xs zvEi4Ffu*wYhhNJ)d`212nl0qUF6tn-dTBM7TdjZTh1&5sJ)6mm<(UEd5>5(ql{Hoc zj5bjX1kD$9Qoz8D?iYOf2pI|w+R=7lHY96AVALstOwFPf&~|i!rpS-HSUbJ!^5=yJ z5oHUc^p0zz!x+tu0Z=+z0oZ^VyLF;=&FEQC>C^W9R~3r_B}KX+!3m;ww`eYaJy0@C z?`P&HOYLCB1glQNk-p-d0lgIAGZ`)$S!^=eTpMUuNcTUl|HA#sC|qXhCTeQUV+&Qm z5?Hte3*{F@Ll#ZZe_^in$>&_p%Z%i;zO<;x0wx90`!G<+{8Ur|F%<~95O_kg?O;M* z_e6r2%wlXrF1-2r z9jSx=QQQ4C$rz#}jDGr+=wq;z3#>9l_sbE=XISMteHN&8l8gk+1y>YaAUOd%em+=f zywWe+{*!ak$No<897&O(l+;Ey2(G_+_?Pdj)++u}3qn@LYzh+^c@k+^OnJ^%pRYW2 zK{6$Ms9(z&Xbq_p^)l_<7L^ZGz)CET(tL$n7ibb}X*H^%!P_O&Fsy?l8h+M@;*!F| zhTy{u*FXi)+>DA>-v?Fa6C#}A~o-!3TG zz^!_vnZPNMHvn!b)9mDLu*J`@wTD^ZQC9pWt31PM$GMAeMemdH&JdkIqicmN8X$>s z&6WP>OVX!a5b_2kk;meA3%R~uxl4KX4TanH2cs(c%t@i-vJ8e0^%v!ZJxHm+nc3>+ zp0U@eN+y$@?4!>=P*NDU_@OeqA|;U1=u~=ofUb^1PN9T2YwI8+Y$uD)5@YcP!6)k* zx?GaM)Db}+5wv`x&%u=E`Tz49MV+>&Cr-L20x7ed&jMWu5$K`Fpcb%q-FD~)zUMpl z?cFK5C1?2s``j1o6aT@tWO?X1LDE=#ku83nz6r;|v4u`iC|vPH0pKyihe2);5BG_r zuRIt0*76wuR0Kf>oScrA_UxG=CP(*^j6v^;KihZ6-#NIq-w!^8;Iw-}(CM zGpST#r38@K4T~N^NNzN9%6~r#g*1mqU znl+%EgeWOSiv|EmB10b0_ZAmd{`&EkGV}M}zT+__<^>s(&2ZqoDCvi#><;Eu*xJ*~ zx$tUV9TQwJPq)Z0kw?Oyr>5$z__q()|Kp)x3?juarH%~>y8i#%J#f!eYYJurE<8St z#av1{yi2`(pCa1q>#sO8W1z5beTDyI57>)SrN4i!=2cl=J~Nu5MJQRCrUr!iC&D!r zw1Gg%GPlOOa?>J0oE03HST{vN~vBok%l0#J^~H@3>|1qi?i^Q@$U2&Lp$& z+L0_x4ydm?s9ifQKYh+QUGOvst1Hw&o*!sZil|!lgHM*8n5s##xoz0Uz&;=^uaS$N z7f8lH7Sx=e53@iCoRxTOjL;&paG;0g9Raf^q;5=zsl7sWpP0r#9~bliK~2+y+e_+H zYJ8QGe0Nr}ys7#6H(xG2e6;lFyp^R1ty=+@F!uWQMTfnCF2m1)?cSQRe((EN4^8?W zePadH1d`I(mFK#y4*aS4-y}YFLz%{_HyZ&0>eD>dz-g=#DV^*R}=W9lql+DpsKNuvNLhLFAUW8DLX|!ILizW`$#JA_fv z0DctyX+snj+5q447K-klzNhwqH(`pxK#K}fWl=&)ycIYs$;EV_t93l0J$Bt5pj6b; zr11h}z&9o^Zh2%VK0%hnCr{Kq_y_YZt_h<$eMKA-#j+jTa^2V;y+3tm%<;o*l&Bp% zL)_q-$){Eh6(3S*TSiwgoY;J8m8L&^_DUd?eqW zqD2%hp&bxI-~|?cv|NF|qSE!duu|U1oTv*iQ}pWxiv|0_Vtsb8Ha%Z?X{!A6Is2hA z7F%>!N)*#_zk*o|>|p{TzN26KgbnG!`Wg^|Qs@!vz@INTKlgg;XWkj~rN~0^R8bLX zGAr@>W4uE{bhQN$$iSoHv>xqkLsB^{z;J=Ltp@46v=E15f=YNhq4tYK??3(Z%9EIKT!e&o){AG&M&#+|S_iFy!mNa!VXs*}?MwBxJi z1%A0*!szYq z<*EE6`bz*`q&?6%^b^@V%y0f&)w^ql^LsxS>>U;98&JGHm^L-wJH5te8fpNCph{|H z6Jcr>S$vip8v#Sg+{w)GQ2Jpb$fsk%rygGZ-rt!W$|*A6P6kRmXR!~xb@wm7!x+o@ z0X%?+9tR@xEPw4K%*0}52R-@`$%ZJJAX;Hz&Heia=KtucD=(Gh{b{jSsizE0mV{EN z?7|c{&RW?WnN0uUyLR7uYv1GmJP(L5DquaJGl^?@E4gla)w)-yx>F04qo*rRohrX@ zw*1nZRiJGP_^?*Qyez5wIS2ALsRO2)Kz{CxG@|NZpTYG7)Zm_-N_vKiVv`ez@UxP5OZ{)jlt<*%Lg3s12? z6!b|kyH_v=xG_i)9kj(`PrXw4s|VNq;EVHvIeP!W&{b8DtCgx{*J)n@+g_~%@4j>L z!{0f6%YjVB;NP9-2Gz_3AFyiGT`D>&1#4lYb{w|-RQ2npYG)L;54+uV=;phAinkHJE-aC-|k0pZU!%ERW^kRKxz$ z;~#U1_Fvz#?_+OPRa#Glta6`Al!N-JH~%PoOA6A!uc(WuJwk4$poF`^v@-%Aws2)n*o}XD$?vP1PQpvgf8<+F>OprFGdhhEIBI=}MW!oPcaI;DrM0Qe9^dqs4XXwU%YE<|^AS_0Z> zTF&_4hUEmdVD1z0`=WZO{S>f_`{zgI-tpU~2Mt-F{o3gbkh!{d&+U8u_yhgh2FO}* zK!LHmR+(G$=D!uxFVLzivP7_eE>rrX+*M+FlpYaF)B_PSOK{>s?GNvp`@?75z_N#! zOJab+(MrJ$T)R-S>*e6}HxK^sT@&}-oJ||DWqY$L^%EDW$Ig^6sh^mtys+diU`Drn zrqkQA;c$l?i-esZb$$^3iQ+FE(17oa4&y=rv=t7Hu4&a;9i5>ma@sVi^*T-$>;7B! zvA_87>`*p*AO}2&f>RP}=VLD0(b8|phd@`~CZHn+)*W(Q8oC+lD4g+*;kC=+=?m4L z{@tVZ9k)iadcYq5cO7qKu>Zav+j-Anz5_`J2sLvJQ*z$<`~8Lcm;_owxK|yCeO~ zsnWO3mgkEetz4kHvXGKR_>*m8ol2(V21lpVw?OPIkkZ?)i4F;I$^0WjnApIPuBnnN zxeorhzVE9-@N(Jz;nx`bIgPhL;uqls!6~Av!E94f)QS8cjB6&eph?63w$a2VEj0W; zH{CGa`9orAm^v()8tJ)!dfofPmoNPO{i~yST3*8kbOdq54u0vocfR*En5_922Qb97 zNtW3k)KZ2 z;er%hIs{*Iol%e^QrJ2kU+QnZgvgU)z zJPTAo<=>5H=ON6HGQ`&$%)VxSTC}WxIbrEwr&YG}8;^DTiNW)~3XoFUuZ|Ae(alpF zLAx;cw)@?$8R*OCp(_yfMNnIy`4w&%I)e8_vwM)YdBSaeOcNn2yfr4KiQ@1FG(Lvl zs5E#DWE@6Ekc6jRUi;bqa~8%|jotwCVZp}tj(y~|VCQg_sl#-`UY}&@7&CV=HHQ-Y z)l=T=KXDI$Uk8LZqsn5mv5jNWgTSr(mGgmBqeY`?Hu|LrGMQ|0M7#As_Nrm=!I!Jl zIlLSi_*~rlm%uZ;nrNR#TR<#Rr*sFp`*w82KRN60x70AD(c?gZl7>2=-($j-{5V83 zMa0n^Kn%QWgm$Vh#1tq5&bcJz_tQ-jP&6P3ORM((zHjREw3SlG2O~BdcSSNj{Q7~L zc6hAx46BD*Is`1Wiy4!2_Z^yCnPv8q%wHr=(68~wtzvJVS4bB^J6OVhOnHLrmrpx0 zkGKmj1x}q?@-A6=!SI0k-aAHa*rqxGGx!dUh>kn9wcJ-TU=~QW0U@~AY6sLd@JsdJ zwR_B)uId+PiX&$bs^HfP^wt19PS69f)TkSqXYBx6z2I45_JGv4yKUIfYgT`SsTgVWAlHmxzT^C5VPv)D=C1*%IA@q6yMd53>$rBdCMY&|yJo z|LUwLynMFw(LZ@*!3(lFJtK=jX1Reioc}NPPQG?GT{tC?OC~d5{0BIDWXusOs97<$ z18WL#@LHkokeInj&?bZW0&NV?+3I$HDf)xyTn^ldSDFfJTTo0v!L$ekYO)7@DmCwa zJ+LSR4wh6{_G_wwbrn~ue-%oA`47y19vI!T)^@U?yO^QQI$bl`@MhQ<(uy<;jfhz`nFw`m)9Sj_e!+5);S zv12Y%z-lnI0c{$&fqK@lCbay!uJ4;1HKQA#ltb{#)BFVio}EXx{Otx92oFMa@c8uX zlYLhDM01;z+b{JUgxQy}lVWNB?ssQlqVW00=6>qq=ZEte*4EU=FaVaj=is(qdVBxQ z0shI?)IrvFE7M0vFd|e0^FMLx*B0GVpYdj%pfLBSH}{yo@GXDkIWl8N?#*-vbY2TE zo@M4${qhCBRuYwzpv6zh&~}f(GslWAF1ab0o?28D*>*_761y1u8=49-*YmE-OwpnN zK(odT>V``*yX?N>rtEETF9DM23+ z(>vhkNdpI^{ykE5LNxmX)u4q&qQ@!;r>85w_~);jDS9c5UICyEgaerC`}KP#-+B#} zsVYk!V%bAX29pkR*WB}u_-p4R40Py9WzISJbN=dASoNi#c9L1s^!%1v;BAkZ4>3au z?ZWN?wT_e0q#*kBMc;9i{5Hx-pq5Y1)xQ2*IcLf#!+?pjZ2GuAPi+Il5B;DoJ@PLA zxvt9@NTA$8gp*bnS`JZjV&F~@e(63}%|A0!vFh-uD2lR?Z`DU0dsnWwSXellc69Zf z0Crd#7BdH=!JCxP+mvm$s}r{i0#RU!Xj|StK5*fI7pp@i zJ(~-f!1Weg@q@1!{qDp3>5TMMEWMN7XDXj!E06hS{@OYEJ>Jx3gW6&!9zoe9h~rEg zh9?*ZnLscDrqP~*u@wfw-w0uBM<6~ML@@DsV69@(k2N4LHRM_aLZ5X|Zf$@KxQa6xA`<2X5J(Ryo;Q&dZ#&eVPSGtj z9xu>MnDRNAYa{S#eCV=6vXl%#8c8I99932_}Y_h7LDzMeM_r0$f9LP6U=g908 z&XFrXmxkc7iGoBsEl8O?a{pDz0Os|bQf5Rna{QVad^c`nyE{0PH&O)wev#|@YeoC$ znc@RaFMj&#(|`A+bANXK%%487<_BU%r3dyb?-t zSLfX27s&ziW|=r5_3Z_d-t0G-eZFx)5L|@pY=DR$nT}$8N7RO-3_Z0#QKC?-`$u0| zeQC+bDB**9ot+E=Kp%crlwz5GFa!#Xsg@q{BvrV4;s>PEwu8}O%+^NL@!nyLxx+IhM$pQ2i9si!!?E2}u zvZMJ%!Mv+Q#jls`=_doPE(rWh2d5%t4}ckO;pw10wccAU8>s^&caxB{GnM>U)R$a< zC(jffKT%K7gEe792dE}R7FAh>4~WS^l_ks?W#|rl1}-AH9DoKS%mN$NNcNaj3hryK zG7s&^NswF!Q4q}mGVl3GDLo*nDelJsXkb!rA|DEZ)CHkd_vV)CXQ#_YPpp3Bn{$8p z(~>P@79nm{f+mCnt!SS54E8NIDbSaV zC?2lB*_rBn&sI`=(}M0<05OoXo|d33yQANldR0^Oi?acc~f@Zqha^S!y1`tkGSV`obzr;4YhE6>i_i_1QJti%wQ zDd!bQhOj9YWv0I274y!7(1pHCdaYdXx%13myu%?9$)1Yh zKS)FH0v~@erdcRgP(P{+n}s#VV%hpH@0*pxkL8fnmOhyK7|!pOc-`6XO(w7 z9kd{7Lwi$_u`VfAyvp#6#`Z(JUR1%)>Ff9L*9B2b=*s!Q za?w6FTRCy2@WcxXpZ%Aa|MA(WpZ)uDfA`s$ufJS6S8zqFK@8Q@l@#Xn@G&Xw)A2h@ z7$JOiCpDmebJT}64{LPS(=l z&R&s#=_8;igBDYm*K(P(<2w9%?@7FE4LVD1T?=#qEl%kgFo1@wY z>)HTXq0&&T+cp_1Q-=)db-QlaDbs*3;IArzFk5u~@f$0TzEXO5!Cv#EK2u9&RU;** zG=;u!52?elQ?t2kr{;5!Q~RSXh!IxXvtgVdFjU&U3Z{~GWV5$0_pB}0cOFh(x1VnI zb5NSQHcelZBQvlGAR{tG*`q%pnkQ}1y#NiUN#>}W>5n5A+?}sIxw2Bme2O}v2E%}1 zTwz9AEtWC88M;On0qF&p4Y3K5O@JP!?*Lga3aCM-Sr%+|#?*5u_-Zt>BBt)xwR+vq z=!20k4p^8ErsM%rp6E+W^ySiKDwE2jQz<^yLov14c7Duzkq&9fZ4XTjh>7-q92obu z6MiS0N5-9n%9s^Q%~h&3EXR2ik`zr)^Rzl>meDA?8L&u+LUw!?0|(Y}u8%Ez7E|>!^Z++(0B5 zfFFd-xEP=ei;O=_K%IaFq{O4=>q`YYT!v5+Bt^{({z@1F7xmVCDOM#V3c;gUsZzx>%8jE?uED}O39Y+qNYH>rD**6> z6+AR_wODar_hY_ctVj$Ir=$n`(HGz1&H?nJTDNqKp4b6GqMqOd_Cj}Bui{XTWXhjB zQCVKA(Mc4Gd9DxUtSO{cG$NxA3zr%hhDJm)H0c{?jf?`ukK|h`zSU#~6Y8})Q*fQg zMi5E#i+*kN5)LS~6G?Gf1ZV*9+Y$)PbKYX8XVtQBkWCq;uG0E2@T>4zL*bK95a@AR zE^#0%hDWy)))Lwgc5RQ)iMHg{Lg|}2!HL?!N-e%5K(UgM6+~hEqbV>4f)Ibj<0RCoQ49{H+U}HUN_tuQ35d z{$?x^ZQCtYYLuNo?4b>qo>kZZQG&M!!JCGPDJ`byMz8o}P>(i{l$Df@u0+tf@0Dr# z1SeNM5c{HPh-w}yE^07=m}(7FAQ~M>q%Ez9aCS#%LmPQiNTVo%;FeaJ*C+#K81kF< z81=fB*b0uG36}{?4M2m?i*#EezSPgw97Rn(Jn`&x$$SziHke_MjDV^`2fzaMW z1R7~PG|)(cjzBr!%~mZNt_=)ERB{WVVyWa1joitBvIs0~YNnxKJ%V~ErZX!QNF4Db z!w^67;##E|`(Fe>O83(&(4Y=OeAH4@l%Wl61g%FcfzU|dfdf{_tFL+W_~UB<(=}<& zM2acoUE#DdR}`8BUx7e20NkYv4XaYia+X(1k|be$%6o{|?tzfmHed`w?`>Fv9+$P7 z8Bq9UAh4WifOKiC2yU`z`rtgYHA?M zT(WU!J836wpevp>V6GHH1t5sRP@leSTrF@{Afb=0I7IYH#xxXJE|x1b%SP+q;u(fc zi@mrR7X`?EorX2bqh8zq8H2=Ms#Z}TEW77f|CyIadKsErY z5kJ6xEb(a}jcFcETqdRS4Ul+GG(&4gAn?ep*xrHAJns$P_Z3-ERk>WPp=Y5182i;~ zT@qc)+p=r*^&CthQ^e;_6$;gO>n7wCB{>ydD&`E}r!DY5 zk!0h*!J}I!JJ6aGg&2);nBY~{yv9`lxB|MoW0YJ0>g&r4&dCM{*8+4Y3TrvI+!*@0 zrd4WnEd6-W=5P^h*(@nK3|v7G(x?Zs#L4@l76HXw9%UI{GxMu4*bWYf*_e$ zCWWp*LpE`Uk0L3C2ET#Uq(-25fsW#=Jn*91Xdr(<^zEWoEk~shf{77xFe}(C^VGM4 z#8N`8W!OxHg#dck{R;#B>6Z1i#T(+>3r~Bh^+juoCfg+RQ5<@2;MRr9c z25^sA0CQ3Fm4D?oun7>6*12VMv-3P8`r z3e$~_zDFjeS4uBk|1Ub-PHArX<~85 z+mVdudH^N^tn~{;tmEo*MW=J1#oV_bAu1V3gqzL`PT-#wN>$i{F0Q&j-NBi6f|KV~ z_}hO`yrk-qp673~&}m!$(Rl=(8i#JQrc#LWHp=0r;ZID1G3dFKH8@(}j29A&^=rGw z!sqIErY!}ELl0nO2lEMWVhF)^#>~!nNuX==OFW?PJg;o;Wnn5#JOnLfaunCozR?2(njM@#!*J)B;tN z_HXBp*i#W(4Zimqn5)#W-k`3-oUSPFrjq*)8qnaqCD0H4b2OvF=7&kms73-0IBy)Z z28v0F+b|Gf-jRj>CWk1A^gtDk%~(_O)%YeMiV!6;*ZO)8k;b4SviZ%J2%zGrJcN08 zxEKhc;@4LEI-J2M1~|Ms&7AP@mPUz<(!b3>z+wu=s1N}yYj$8)XtMz=KpNJv)CXPQ zQDJtDc9OMsj(IO%dQIJc{g)(qt{#hgwAIk)VN_D^B=ph% zVoOydg}=em6C1F-C9O&-WP^eQMUvQ}dttufIq(a399#h-C2F}|9kCS%MQ+inu^#PI zBFLtk-KJ06oVn(E)xIHqWjex8PJ8|KRGC(+TPb@0I&Zt4H3Oy|y+tHQ zlD)R-m1jG5q5AefkDt&MCpCy)kPXQgQgS=Ak^RQxwdRg%&29Vjk!?z@U*wwzMc~gN zpPel~@J!LvFvh_3W*fK}pm^JLJ=cf$T#ugB@VuUnpG)QhX#mh5fK38*)-)~4ktBg0 z$4;`}y|KB*Y(NzyZ?3E^2tidKEB~E04G#3_-0OzD6TN!PSw6*IP5<^lM%AJB(jj#v zC8x*L!2|l(HRj}1#^ioue5W=rDrfSdMxV8y4(;kdNfgQz`)|LxXqe%{K~elx0sb(i z7@Ky2r3ZP|DZgptTbK-BJusJG0ftgkh2JH*2wW6#FGPi0Vp)NZ(&cX)E3FnFq$mzh z()mjgKbd#>{us1s704r(Jlx4X>mtV-G)Kt}W z=mi0whbnD}0&lvI4G2l$(VZd$b=H3K8wRf0k;OQS(gdMCf1bZYysm!(&?tAgc@K9P z(nY;r&287lt}?e@pW1QAnB1!kj>+kqsL?JbG>Rd`FmwP6LkwU-pbrz&ZLd;wFa><$ zrL`xH7hNZyZ^967A@!ApFmUr*qr(`cro#yckKsc?14`v8Jd1{@O5$~^*xy_^>r#ax z2wZ1nzV`DU*zq5~|6tmPHvfcv7oLB_UV2H865kkyo5-ckd=Lm~UNZWmRG*y6LDFy} zB~{~}0ONIZOS%Ijbz;=By|uDaC_5{K+NtUC)2B+0zfyj9s?Mt3P)31!LXTZguWnTz zUK|oMfLkQG%?ewEAIw0{MXUl-&QC*rN;7M^Bw$q@8@IXx(+`yqA7OiLIH@Ze~NqHu_Bw2lB*=pEQjH&|M; zrk86A%eC{f^p5P~r>jq#uCWE1Wkn%P-weTmjdoKYdO}pf6$donJHrG1+XNpn(f=O& zT{P24#cWl}+sYv&rnk)OLd`w)$G2a#GuvWQh+xta2*^TneV>Q7y8*pkaM#zvk~94ZCUV{613eTuCyP2h2{7!T;61-?`<4ZN**P;?dH!_axl^TMXNxb- z)t4#(a{{7NMN<(q{x&RcIsFos(J>wIGy3fYT0!^e>8)+gcH*1eTa8u?0Fqf*7Z;r+ zslAs_Zz7^{A`S4|m6G-E-?jZe|H#!OgD?r*Y1Je}6Cm|4GJM5<9e^qnydP9+?sCyC zl&ra>>alaBZ=NW9{bYIiLX{N85LH>!MS-?HAfXfZWf`ti^1P_0bb(^vyxC z>Xd~`l&cHW2*8z*R`N;RU`I$V+l07-m@0K3rNbjqw$=^eN&Qv%Wg>Nn(RFEhCiJ`unfbPBHj zxqpA;yIwmIIfD)Gf}#bR<5lWjz3wg->MxxwK6ASC%*o=jrwh|XpMM@&V6=z6n36=9 zn|R7hf7*rJdQ4?Ek2?U}r1@Qxpln!YA*O>AeV8##tW8VR8paZt1Wi#DrChB=6k7+O z|E9a?PuROLz)<6~mR>krdh|r;p;HyM zV6m($Yq0I{WKOcCJiMOpln%IQ;s@bRTznLh4B{(oXp$`Z+`PlykX+l_L#-C2Oxmc{ zEyr=`5f4MF)4Mt@c#4R&2$2SC0#U^q){l-)8;0#Ta9`=+zJTsbL}?r6?nJ0hiY%ii z!mWmI4BJ?hx?0w*BdIwMS0Y z*tE^kjOFE&3fG;l)4*!j*$sI|)wNVgDJ`d)0Ggw#s;;Z$O4ae`E$nQ{bUY8{vZFbm zKwG9j^aB<9p*t`Y+Q3dPNgMLS=OhbplIQ<=z*>uWrX@cCSJ18$^^_9B!=AG(?zGqL}_Ku!hJ3U=IK3#o&!DDM469bl! zG_2X+%2DYwDMUi0!uk4;&YBf%Sn2wp;b9tl>sT9A!P;XwKm!Y*eaH1nmdiZ;R0zZ>3x+JJBy>KqsaX2M%j0D>4x-<0SMZJ8 zU@qRD2{xHwiNV|-6^7z13w>A+G1mb}T{Kv@*w5rHwT8ykYA0zl$BxEP9PXbANEN4^;u z6o6|19Y|DMc%6=J;m`?*y`drBHsV4^DIsz+4gL%aK*lsIn=ZR=u9mG}r5$Y=5Q+-F z;YSYQJ&og9H&Huf4+2OCLpIzLk9T93((-2`pb+H4ib$5oW5T!xLy(oKDJX*&iwM_4 zTyrQ(E@>`xk~C~S#mB-XDkO36b4sMlTZxbn__1i7u50LIMS(WE8~QZu*kZn*0lUK^ zFaecB@#uXhsm*ul3j2bF5{)@Z42d^H*umk^B>?_Eq>j!imMeuy4dX@CH1LBd23`f` z(TgaR<^q745(3XFc*OA?hw{dz^&2oc!;NF9ToHnma}1ZXFZ z!I+_~L}7c8f~h^svuVWbxyW{*YH$Lntd+~efhg2$ho)~)ER@O{U1(|p=sJl>2Pkgy zg={&(iZKx+&1F}bEAH;{Zi2H`C|8Q*Di$7K4sw8zG7L?YMEC@-T2l1N=H?L-UsNW5 zUS+H!lc~{umH-)Or~=(3p~Hx5(+CBQznJ^+8@J+O*}5{g(p*XUSTqZSpsUb=h@M`9 zDmX4&Fd2}fTHR9N8*cEmgRRkDh>IR__I<1=Y=>4&xeVRTFIK9t@GcI>q$*MxhDFn0 z-mtdB;w0pDYdGEz$<=V=?O1~H&k0OhvL3_3q%4IB1OjAcgLS<@{h||kBEhIC3Db3k( zbZP*4!Sl&Oq3*z9EKOIZaj43&WxJ-X!J@9q_?EQ_7Mt!X*mkW}=a+*n!TfUs0hAby zSG8_I%r)8u$j4@-kI%=?%)_HZW8jO2 zsVF>c8fc^AI+!G|2nx`^O|W}0*r2#AuI*ybumLUo8!nefv_Y{_DOajA3-C}VmLU(M zf*MrZBoG-V?}0dR69P;iiH82SGcM`ci%)M6p$slrNv16+8f@p%Dfm5n*;$32qzsL3 iJ-D^l@&dOAjQxMx;SbCNcig1_0000 Date: Thu, 2 May 2024 20:41:56 +0200 Subject: [PATCH 264/719] Disable the JIT hackery in app store builds --- CMakeLists.txt | 2 +- Core/Config.cpp | 8 ++++++++ UI/GameSettingsScreen.cpp | 3 ++- b-appstore.sh | 4 +++- ios/main.mm | 33 ++++++++++++++++++++------------- 5 files changed, 34 insertions(+), 16 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 07950f8598..ee3a6e2b78 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2850,7 +2850,7 @@ if(IOS AND NOT LIBRETRO) XCODE_ATTRIBUTE_TARGETED_DEVICE_FAMILY "iPhone/iPad" XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC YES XCODE_ATTRIBUTE_ENABLE_BITCODE NO - XCODE_ATTRIBUTE_DEVELOPMENT_TEAM "97NS59EENG" + XCODE_ATTRIBUTE_DEVELOPMENT_TEAM ${DEVELOPMENT_TEAM_ID} XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "Apple Development" XCODE_ATTRIBUTE_CODE_SIGN_STYLE "Automatic" ) diff --git a/Core/Config.cpp b/Core/Config.cpp index 6bdbf8e06c..6f259b6eb5 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -1168,6 +1168,14 @@ void Config::Load(const char *iniFileName, const char *controllerIniFilename) { if (iMaxRecent == 0) iMaxRecent = 60; + // Fix JIT setting if no longer available. + if (!System_GetPropertyBool(SYSPROP_CAN_JIT)) { + if (iCpuCore == (int)CPUCore::JIT || iCpuCore == (int)CPUCore::JIT_IR) { + WARN_LOG(LOADER, "Forcing JIT off due to unavailablility"); + iCpuCore = (int)CPUCore::IR_INTERPRETER; + } + } + if (iMaxRecent > 0) { private_->ResetRecentIsosThread(); std::lock_guard guard(private_->recentIsosLock); diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp index 5dc9404dd7..d048e64cdf 100644 --- a/UI/GameSettingsScreen.cpp +++ b/UI/GameSettingsScreen.cpp @@ -1770,6 +1770,7 @@ void DeveloperToolsScreen::CreateViews() { bool canUseJit = System_GetPropertyBool(SYSPROP_CAN_JIT); // iOS can now use JIT on all modes, apparently. // The bool may come in handy for future non-jit platforms though (UWP XB1?) + // In iOS App Store builds, we disable the JIT. static const char *cpuCores[] = {"Interpreter", "Dynarec/JIT (recommended)", "IR Interpreter", "JIT using IR"}; PopupMultiChoice *core = list->Add(new PopupMultiChoice(&g_Config.iCpuCore, sy->T("CPU Core"), cpuCores, 0, ARRAY_SIZE(cpuCores), I18NCat::SYSTEM, screenManager())); @@ -1782,7 +1783,7 @@ void DeveloperToolsScreen::CreateViews() { core->HideChoice(1); core->HideChoice(3); } - // TODO: Enable on more architectures. + // TODO: Enable "JIT using IR" on more architectures. #if !PPSSPP_ARCH(X86) && !PPSSPP_ARCH(AMD64) && !PPSSPP_ARCH(ARM64) core->HideChoice(3); #endif diff --git a/b-appstore.sh b/b-appstore.sh index 4a525cf152..6da7cc9869 100755 --- a/b-appstore.sh +++ b/b-appstore.sh @@ -1,9 +1,11 @@ # Build script for iOS app store +# Set the development team ID as a DEVTEAM env variable. + mkdir build-ios pushd build-ios -cmake .. -DIOS_APP_STORE=ON -DCMAKE_TOOLCHAIN_FILE=cmake/Toolchains/ios.cmake -DDEVELOPMENT_TEAM_ID=97NS59EENG -DIOS_PLATFORM=OS -GXcode +cmake .. -DIOS_APP_STORE=ON -DCMAKE_TOOLCHAIN_FILE=cmake/Toolchains/ios.cmake -DDEVELOPMENT_TEAM_ID=$(DEVTEAM) -DIOS_PLATFORM=OS -GXcode # TODO: Get a MoltenVK somewhere. #cp ../MoltenVK/iOS/Frameworks/libMoltenVK.dylib PPSSPP.app/Frameworks popd diff --git a/ios/main.mm b/ios/main.mm index 0389d3452e..4c1151185a 100644 --- a/ios/main.mm +++ b/ios/main.mm @@ -29,6 +29,9 @@ #include "Common/Log.h" #include "UI/DarwinFileSystemServices.h" +// Compile out all the hackery in app store builds. +#if !PPSSPP_PLATFORM(IOS_APP_STORE) + struct cs_blob_index { uint32_t type; uint32_t offset; @@ -269,6 +272,7 @@ bool jb_enable_ptrace_hack(void) { return true; } +#endif float g_safeInsetLeft = 0.0; float g_safeInsetRight = 0.0; @@ -473,23 +477,21 @@ void System_Vibrate(int mode) { int main(int argc, char *argv[]) { - // Hacky hacks to try to enable JIT by pretending to be a debugger. - csops = reinterpret_cast(dlsym(dlopen(nullptr, RTLD_LAZY), "csops")); - exc_server = reinterpret_cast(dlsym(dlopen(NULL, RTLD_LAZY), "exc_server")); - ptrace = reinterpret_cast(dlsym(dlopen(NULL, RTLD_LAZY), "ptrace")); - // see https://github.com/hrydgard/ppsspp/issues/11905 - - // Tried checking for JIT support here with AllocateExecutableMemory and ProtectMemoryPages, - // but it just succeeds, and then fails when you try to execute from it. - - // So, we'll just resort to a version check. - version = [[[UIDevice currentDevice] systemVersion] UTF8String]; if (2 != sscanf(version.c_str(), "%d", &g_iosVersionMajor)) { // Just set it to 14.0 if the parsing fails for whatever reason. g_iosVersionMajor = 14; } +#if PPSSPP_PLATFORM(IOS_APP_STORE) + g_jitAvailable = false; +#else + // Hacky hacks to try to enable JIT by pretending to be a debugger. + csops = reinterpret_cast(dlsym(dlopen(nullptr, RTLD_LAZY), "csops")); + exc_server = reinterpret_cast(dlsym(dlopen(NULL, RTLD_LAZY), "exc_server")); + ptrace = reinterpret_cast(dlsym(dlopen(NULL, RTLD_LAZY), "ptrace")); + // see https://github.com/hrydgard/ppsspp/issues/11905 + if (jb_spawn_ptrace_child(argc, argv)) { INFO_LOG(SYSTEM, "JIT: ptrace() child spawn trick\n"); } else if (jb_has_jit_entitlement()) { @@ -505,6 +507,11 @@ int main(int argc, char *argv[]) g_jitAvailable = false; } + // Tried checking for JIT support here with AllocateExecutableMemory and ProtectMemoryPages, + // but it just succeeds, and then fails when you try to execute from it. + + // So, we'll just resort to a version check. + // TODO: This seems outdated. /* if (g_iosVersionMajor > 14 || (g_iosVersionMajor == 14 && g_iosVersionMinor >= 4)) { g_jitAvailable = false; @@ -512,13 +519,13 @@ int main(int argc, char *argv[]) g_jitAvailable = true; } */ - - PROFILE_INIT(); +#endif // Ignore sigpipe. if (signal(SIGPIPE, SIG_IGN) == SIG_ERR) { perror("Unable to ignore SIGPIPE"); } + PROFILE_INIT(); @autoreleasepool { return UIApplicationMain(argc, argv, NSStringFromClass([PPSSPPUIApplication class]), NSStringFromClass([AppDelegate class])); From 3011a5222a9cfe44ccf3aa3e136ba7bba0e2453a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Fri, 3 May 2024 00:20:12 +0200 Subject: [PATCH 265/719] Pass in team ID, start of gold prep --- CMakeLists.txt | 19 ++-- b-appstore.sh | 7 +- ios/PPSSPP-AppStoreGold.plist | 204 ++++++++++++++++++++++++++++++++++ 3 files changed, 222 insertions(+), 8 deletions(-) create mode 100644 ios/PPSSPP-AppStoreGold.plist diff --git a/CMakeLists.txt b/CMakeLists.txt index ee3a6e2b78..c4bee8ee7e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,11 +3,6 @@ cmake_minimum_required(VERSION 3.8) project(PPSSPP) enable_testing() -# This little macro lets you set any XCode specific property -macro(set_xcode_property TARGET XCODE_PROPERTY XCODE_VALUE) - set_property (TARGET ${TARGET} PROPERTY XCODE_ATTRIBUTE_${XCODE_PROPERTY} ${XCODE_VALUE}) -endmacro(set_xcode_property) - #This is supposed to work but doesn't! if(NOT ANDROID) set(CMAKE_CXX_STANDARD 17) @@ -2812,7 +2807,11 @@ if(NOT ANDROID) endif() # packaging and code signing if(IOS AND NOT LIBRETRO) - set(DEPLOYMENT_TARGET 11.0) + if(IOS_APP_STORE) + set(DEPLOYMENT_TARGET 12.0) + else() + set(DEPLOYMENT_TARGET 11.0) + endif() file(GLOB IOSAssets ios/assets/*.png) list(REMOVE_ITEM IOSAssets ${CMAKE_CURRENT_SOURCE_DIR}/ios/assets/Default-568h@2x.png) list(REMOVE_ITEM IOSAssets ${CMAKE_CURRENT_SOURCE_DIR}/ios/assets/Default-568h@3x.png) @@ -2840,9 +2839,15 @@ if(IOS AND NOT LIBRETRO) ) set(MACOSX_DEPLOYMENT_TARGET ${DEPLOYMENT_TARGET}) if(IOS_APP_STORE) + if(GOLD) + set(BUNDLE_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/ios/PPSSPP-AppStoreGold.plist") + else() + set(BUNDLE_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/ios/PPSSPP-AppStore.plist") + endif() + # message(${DEVELOPMENT_TEAM_ID}) # https://stackoverflow.com/questions/40664125/cmake-and-code-signing-in-xcode-8-for-ios-projects set_target_properties(${TargetBin} PROPERTIES - MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/ios/PPSSPP-AppStore.plist" + MACOSX_BUNDLE_INFO_PLIST ${BUNDLE_PLIST} RESOURCE "ios/Launch Screen.storyboard" RESOURCE "ios/Settings.bundle" RESOURCE "ext/vulkan/iOS/Frameworks" diff --git a/b-appstore.sh b/b-appstore.sh index 6da7cc9869..66b08c0aba 100755 --- a/b-appstore.sh +++ b/b-appstore.sh @@ -5,7 +5,12 @@ mkdir build-ios pushd build-ios -cmake .. -DIOS_APP_STORE=ON -DCMAKE_TOOLCHAIN_FILE=cmake/Toolchains/ios.cmake -DDEVELOPMENT_TEAM_ID=$(DEVTEAM) -DIOS_PLATFORM=OS -GXcode +BUILD_TYPE=Release + +echo $DEVTEAM +echo $BUILD_TYPE + +cmake .. -DIOS_APP_STORE=ON -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_TOOLCHAIN_FILE=cmake/Toolchains/ios.cmake -DDEVELOPMENT_TEAM_ID=${DEVTEAM} -DIOS_PLATFORM=OS -GXcode # TODO: Get a MoltenVK somewhere. #cp ../MoltenVK/iOS/Frameworks/libMoltenVK.dylib PPSSPP.app/Frameworks popd diff --git a/ios/PPSSPP-AppStoreGold.plist b/ios/PPSSPP-AppStoreGold.plist new file mode 100644 index 0000000000..062e474d38 --- /dev/null +++ b/ios/PPSSPP-AppStoreGold.plist @@ -0,0 +1,204 @@ + + + + + UISupportsDocumentBrowser + + NSLocationWhenInUseUsageDescription + Your location may be used to emulate Go!Explore, a GPS accessory + NSCameraUsageDescription + Your camera may be used to emulate Go!Cam, a camera accessory + NSMicrophoneUsageDescription + Your microphone may be used to emulate Go!Cam/Talkman, a microphone accessory + CFBundleDisplayName + PPSSPP Gold + CFBundleExecutable + PPSSPPGold + CFBundleIdentifier + org.ppsspp.ppsspp-gold + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + PPSSPP Gold + CFBundlePackageType + APPL + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1.0 + LSRequiresIPhoneOS + + UIViewControllerBasedStatusBarAppearance + + UIRequiredDeviceCapabilities + + arm64 + + UIStatusBarHidden + + UISupportedInterfaceOrientations + + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + CFBundleIconFiles + + assets/Icon-72.png + assets/Icon-72@2x.png + assets/Icon.png + assets/Icon@2x.png + + UILaunchImageFile + Default.png + UIFileSharingEnabled + + UIDeviceFamily + + 1 + 2 + + UILaunchStoryboardName + Launch Screen + CFBundleDocumentTypes + + + CFBundleTypeIconFiles + + CFBundleTypeName + ISO File + LSHandlerRank + Owner + LSItemContentTypes + + ppsspp.iso + + + + CFBundleTypeIconFiles + + CFBundleTypeName + CSO File + LSHandlerRank + Owner + LSItemContentTypes + + ppsspp.cso + + + + CFBundleTypeIconFiles + + CFBundleTypeName + ELF File + LSHandlerRank + Owner + LSItemContentTypes + + ppsspp.elf + + + + CFBundleTypeIconFiles + + CFBundleTypeName + PBP File + LSHandlerRank + Owner + LSItemContentTypes + + ppsspp.pbp + + + + UTExportedTypeDeclarations + + + UTTypeConformsTo + + public.data + public.iso-image + + UTTypeDescription + ISO File + UTTypeIconFiles + + UTTypeIdentifier + ppsspp.iso + UTTypeTagSpecification + + public.filename-extension + + iso + + + + + UTTypeConformsTo + + public.data + dyn.ah62d4rv4ge80g65t + + UTTypeDescription + CSO File + UTTypeIconFiles + + UTTypeIdentifier + ppsspp.cso + UTTypeTagSpecification + + public.filename-extension + + cso + + + + + UTTypeConformsTo + + public.data + dyn.ah62d4rv4ge80n5dg + + UTTypeDescription + ELF File + UTTypeIconFiles + + UTTypeIdentifier + ppsspp.elf + UTTypeTagSpecification + + public.filename-extension + + elf + + + + + UTTypeConformsTo + + public.data + dyn.ah62d4rv4ge81a2xu + + UTTypeDescription + PBP File + UTTypeIconFiles + + UTTypeIdentifier + ppsspp.pbp + UTTypeTagSpecification + + public.filename-extension + + pbp + + + + + + From dbf1f9db9b7b6570f9e7c91ec66f07daf1fea1dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Fri, 3 May 2024 09:37:35 +0200 Subject: [PATCH 266/719] Remove the Exit button on app store builds (review guidelines) --- UI/MainScreen.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/UI/MainScreen.cpp b/UI/MainScreen.cpp index 4a8b032a74..f1eda81956 100644 --- a/UI/MainScreen.cpp +++ b/UI/MainScreen.cpp @@ -1279,7 +1279,10 @@ void MainScreen::CreateViews() { } rightColumnChoices->Add(new Spacer(25.0)); +#if !PPSSPP_PLATFORM(IOS_APP_STORE) + // Officially, iOS apps should not have exit buttons. Remove it to maximize app store review chances. rightColumnChoices->Add(new Choice(mm->T("Exit")))->OnClick.Handle(this, &MainScreen::OnExit); +#endif if (vertical) { root_ = new LinearLayout(ORIENT_VERTICAL); From a2a150a95ec3f1d5893ad6d13bcdd388c0f71bee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Fri, 3 May 2024 23:39:20 +0200 Subject: [PATCH 267/719] More work on iOS Gold version --- CMakeLists.txt | 16 +++++++++++++--- UI/MainScreen.cpp | 2 +- b-appstore.sh | 13 ++++++++++++- ios/PPSSPP-AppStoreGold.plist | 10 +++++----- 4 files changed, 31 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c4bee8ee7e..430196b0be 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -319,6 +319,8 @@ endif() if(NOT CMAKE_BUILD_TYPE) message(STATUS "No build type selected, default to Release") set(CMAKE_BUILD_TYPE "Release") +else() + message(STATUS "Build type: ${CMAKE_BUILD_TYPE}") endif() message("CMAKE_SYSTEM_PROCESSOR: ${CMAKE_SYSTEM_PROCESSOR}") @@ -2841,10 +2843,18 @@ if(IOS AND NOT LIBRETRO) if(IOS_APP_STORE) if(GOLD) set(BUNDLE_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/ios/PPSSPP-AppStoreGold.plist") + set(BUNDLE_IDENTIFIER "org.ppsspp.ppsspp-gold") + set(ICON_NAME "IconGold") + set(PRODUCT_NAME "PPSSPPGold") else() set(BUNDLE_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/ios/PPSSPP-AppStore.plist") + set(BUNDLE_IDENTIFIER "org.ppsspp.ppsspp-free") + set(ICON_NAME "Icon") + set(PRODUCT_NAME "PPSSPP") endif() - # message(${DEVELOPMENT_TEAM_ID}) + message(STATUS ${DEVELOPMENT_TEAM_ID}) + message(STATUS ${ICON_NAME}) + message(STATUS ${DEPLOYMENT_TARGET}) # https://stackoverflow.com/questions/40664125/cmake-and-code-signing-in-xcode-8-for-ios-projects set_target_properties(${TargetBin} PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${BUNDLE_PLIST} @@ -2852,7 +2862,7 @@ if(IOS AND NOT LIBRETRO) RESOURCE "ios/Settings.bundle" RESOURCE "ext/vulkan/iOS/Frameworks" XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET ${DEPLOYMENT_TARGET} - XCODE_ATTRIBUTE_TARGETED_DEVICE_FAMILY "iPhone/iPad" + XCODE_ATTRIBUTE_TARGETED_DEVICE_FAMILY "1,2" XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC YES XCODE_ATTRIBUTE_ENABLE_BITCODE NO XCODE_ATTRIBUTE_DEVELOPMENT_TEAM ${DEVELOPMENT_TEAM_ID} @@ -2866,7 +2876,7 @@ if(IOS AND NOT LIBRETRO) RESOURCE "ios/Settings.bundle" RESOURCE "ext/vulkan/iOS/Frameworks" XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET ${DEPLOYMENT_TARGET} - XCODE_ATTRIBUTE_TARGETED_DEVICE_FAMILY "iPhone/iPad" + XCODE_ATTRIBUTE_TARGETED_DEVICE_FAMILY "1,2" XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC YES XCODE_ATTRIBUTE_ENABLE_BITCODE NO XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "-" diff --git a/UI/MainScreen.cpp b/UI/MainScreen.cpp index f1eda81956..7001ccd964 100644 --- a/UI/MainScreen.cpp +++ b/UI/MainScreen.cpp @@ -652,7 +652,7 @@ Path GameBrowser::HomePath() { if (!homePath_.empty()) { return homePath_; } -#if PPSSPP_PLATFORM(ANDROID) || PPSSPP_PLATFORM(SWITCH) || defined(USING_WIN_UI) || PPSSPP_PLATFORM(UWP) +#if PPSSPP_PLATFORM(ANDROID) || PPSSPP_PLATFORM(SWITCH) || defined(USING_WIN_UI) || PPSSPP_PLATFORM(UWP) || PPSSPP_PLATFORM(IOS) return g_Config.memStickDirectory; #else return Path(getenv("HOME")); diff --git a/b-appstore.sh b/b-appstore.sh index 66b08c0aba..dd0ab208d2 100755 --- a/b-appstore.sh +++ b/b-appstore.sh @@ -2,6 +2,17 @@ # Set the development team ID as a DEVTEAM env variable. +if [[ -z "${DEVTEAM}" ]]; then + echo "DEVTEAM not in environment, exiting" + exit 1 +fi + +if [[ -z "${GOLD}" ]]; then + echo "GOLD is not set (should be YES or NO), exiting" + exit 1 +fi + +rm -rf build-ios mkdir build-ios pushd build-ios @@ -10,7 +21,7 @@ BUILD_TYPE=Release echo $DEVTEAM echo $BUILD_TYPE -cmake .. -DIOS_APP_STORE=ON -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_TOOLCHAIN_FILE=cmake/Toolchains/ios.cmake -DDEVELOPMENT_TEAM_ID=${DEVTEAM} -DIOS_PLATFORM=OS -GXcode +cmake .. -DIOS_APP_STORE=ON -DGOLD=$GOLD -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_TOOLCHAIN_FILE=cmake/Toolchains/ios.cmake -DDEVELOPMENT_TEAM_ID=${DEVTEAM} -DIOS_PLATFORM=OS -GXcode # TODO: Get a MoltenVK somewhere. #cp ../MoltenVK/iOS/Frameworks/libMoltenVK.dylib PPSSPP.app/Frameworks popd diff --git a/ios/PPSSPP-AppStoreGold.plist b/ios/PPSSPP-AppStoreGold.plist index 062e474d38..513870c38a 100644 --- a/ios/PPSSPP-AppStoreGold.plist +++ b/ios/PPSSPP-AppStoreGold.plist @@ -19,7 +19,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName - PPSSPP Gold + PPSSPPGold CFBundlePackageType APPL CFBundleShortVersionString @@ -50,10 +50,10 @@ CFBundleIconFiles - assets/Icon-72.png - assets/Icon-72@2x.png - assets/Icon.png - assets/Icon@2x.png + assets/IconGold-72.png + assets/IconGold-72@2x.png + assets/IconGold.png + assets/IconGold@2x.png UILaunchImageFile Default.png From fe91f246b2d22a25fcd52deb57211f1e86717c35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sat, 4 May 2024 10:53:51 +0200 Subject: [PATCH 268/719] Bump a few minimum-cmake-version statements --- CMakeLists.txt | 2 +- ext/at3_standalone/CMakeLists.txt | 2 +- ext/minimp3/CMakeLists.txt | 2 +- ext/native/tools/CMakeLists.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 430196b0be..6595266623 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ # vim:noexpandtab: -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.16) project(PPSSPP) enable_testing() diff --git a/ext/at3_standalone/CMakeLists.txt b/ext/at3_standalone/CMakeLists.txt index 80a237b3de..ced9df1024 100644 --- a/ext/at3_standalone/CMakeLists.txt +++ b/ext/at3_standalone/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.2.0) +cmake_minimum_required (VERSION 3.16) project (at3_standalone) set(SRC_DIR .) diff --git a/ext/minimp3/CMakeLists.txt b/ext/minimp3/CMakeLists.txt index 9f1b86afe5..4b347f3509 100644 --- a/ext/minimp3/CMakeLists.txt +++ b/ext/minimp3/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.2.0) +cmake_minimum_required (VERSION 3.16) project (minimp3) set(SRC_DIR .) diff --git a/ext/native/tools/CMakeLists.txt b/ext/native/tools/CMakeLists.txt index 168067fd0a..2f939d89c1 100644 --- a/ext/native/tools/CMakeLists.txt +++ b/ext/native/tools/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.16)) project(Tools) set(CMAKE_CXX_STANDARD 17) From 6295631aca094c2eb2f7f3bfe89e1c821c0c0e5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sat, 4 May 2024 17:30:59 +0200 Subject: [PATCH 269/719] Add a hack to fix the first-try builds in XCode --- b-appstore.sh | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/b-appstore.sh b/b-appstore.sh index dd0ab208d2..b112568c85 100755 --- a/b-appstore.sh +++ b/b-appstore.sh @@ -1,5 +1,7 @@ # Build script for iOS app store +echo "PPSSPP App Store XCode generator script" + # Set the development team ID as a DEVTEAM env variable. if [[ -z "${DEVTEAM}" ]]; then @@ -12,9 +14,19 @@ if [[ -z "${GOLD}" ]]; then exit 1 fi -rm -rf build-ios -mkdir build-ios -pushd build-ios +FOLDER_NAME="build-ios" + +if [[ "$GOLD" = "YES" ]]; then + echo "GOLD is set to YES, setting folder to build-ios-gold" + FOLDER_NAME="build-ios-gold" +else + echo "Non-GOLD build." +fi + +rm -rf $FOLDER_NAME +mkdir $FOLDER_NAME + +pushd $FOLDER_NAME BUILD_TYPE=Release @@ -26,5 +38,9 @@ cmake .. -DIOS_APP_STORE=ON -DGOLD=$GOLD -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_ #cp ../MoltenVK/iOS/Frameworks/libMoltenVK.dylib PPSSPP.app/Frameworks popd +# Very gross hack +# Avoid XCode race condition (???) by pre-generating git-version.cpp +cmake -DSOURCE_DIR=. -DOUTPUT_DIR=$FOLDER_NAME -P git-version.cmake + # To open the xcode project: # open build-ios/PPSSPP.xcodeproj \ No newline at end of file From 6270d24c7058ac9d26c2e02180b89876265e5571 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sat, 4 May 2024 17:38:02 +0200 Subject: [PATCH 270/719] iOS: Don't generate more than one xcode "xcheme" for the app store builds --- CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6595266623..74d737f52a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -136,6 +136,7 @@ endif() if(IOS_APP_STORE) add_definitions(-DPPSSPP_PLATFORM_IOS_APP_STORE) + set(CMAKE_XCODE_GENERATE_SCHEME NO) message("iOS App Store build") else() message("iOS sideload build") @@ -2858,6 +2859,7 @@ if(IOS AND NOT LIBRETRO) # https://stackoverflow.com/questions/40664125/cmake-and-code-signing-in-xcode-8-for-ios-projects set_target_properties(${TargetBin} PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${BUNDLE_PLIST} + XCODE_GENERATE_SCHEME YES # Avoid the scheme bloat in XCode RESOURCE "ios/Launch Screen.storyboard" RESOURCE "ios/Settings.bundle" RESOURCE "ext/vulkan/iOS/Frameworks" @@ -2872,6 +2874,7 @@ if(IOS AND NOT LIBRETRO) else() set_target_properties(${TargetBin} PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/ios/PPSSPP-Info.plist" + XCODE_GENERATE_SCHEME YES RESOURCE "ios/Launch Screen.storyboard" RESOURCE "ios/Settings.bundle" RESOURCE "ext/vulkan/iOS/Frameworks" From 640eb1f799f731e9af54a8f7abd85580eb0a68e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 5 May 2024 14:13:10 +0200 Subject: [PATCH 271/719] Limit file browsing in app store builds --- ios/main.mm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ios/main.mm b/ios/main.mm index 4c1151185a..3536464887 100644 --- a/ios/main.mm +++ b/ios/main.mm @@ -354,7 +354,11 @@ bool System_GetPropertyBool(SystemProperty prop) { case SYSPROP_CAN_JIT: return g_jitAvailable; case SYSPROP_LIMITED_FILE_BROWSING: +#if PPSSPP_PLATFORM(IOS_APP_STORE) + return true; +#else return false; // But will return true in app store builds. +#endif #ifndef HTTPS_NOT_AVAILABLE case SYSPROP_SUPPORTS_HTTPS: return true; From aa9486712816750edfe38f8eb14ab1c14d25c65f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 5 May 2024 16:48:33 +0200 Subject: [PATCH 272/719] Warning fixes --- CMakeLists.txt | 8 +++----- Core/FileSystems/DirectoryFileSystem.cpp | 2 +- Core/FileSystems/VirtualDiscFileSystem.cpp | 2 +- Core/HLE/proAdhoc.cpp | 8 ++++---- Core/HLE/proAdhocServer.cpp | 18 +++++++++--------- cmake/Toolchains/ios.cmake | 2 +- ios/PPSSPP-AppStore.plist | 7 ++----- ios/PPSSPP-AppStoreGold.plist | 2 ++ ios/macbundle.sh | 2 ++ 9 files changed, 25 insertions(+), 26 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 74d737f52a..a383f92c51 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -377,6 +377,8 @@ if(NOT MSVC) add_definitions(-Wno-nullability-completeness) add_definitions(-Wno-tautological-pointer-compare) add_definitions(-Wno-deprecated-register) + add_definitions(-Wno-sign-conversion) + add_definitions(-Wno-shorten-64-to-32) endif() if(USE_ASAN) @@ -432,11 +434,7 @@ if(NOT MSVC) endif() if(IOS) - if(IOS_APP_STORE) - set(CMAKE_OSX_DEPLOYMENT_TARGET "12.0") - else() - set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0") - endif() + set(CMAKE_OSX_DEPLOYMENT_TARGET "12.0") elseif(APPLE AND NOT CMAKE_CROSSCOMPILING) if(LIBRETRO AND ARM64) set(CMAKE_OSX_DEPLOYMENT_TARGET "10.14") diff --git a/Core/FileSystems/DirectoryFileSystem.cpp b/Core/FileSystems/DirectoryFileSystem.cpp index 9c39ece529..a626e4cf22 100644 --- a/Core/FileSystems/DirectoryFileSystem.cpp +++ b/Core/FileSystems/DirectoryFileSystem.cpp @@ -382,7 +382,7 @@ size_t DirectoryFileHandle::Seek(s32 position, FileMove type) // The actual, underlying file hasn't been truncated (yet.) if (type == FILEMOVE_END) { type = FILEMOVE_BEGIN; - position = needsTrunc_ + position; + position = (s32)(needsTrunc_ + position); } } diff --git a/Core/FileSystems/VirtualDiscFileSystem.cpp b/Core/FileSystems/VirtualDiscFileSystem.cpp index df73ad544d..5a0855c3a5 100644 --- a/Core/FileSystems/VirtualDiscFileSystem.cpp +++ b/Core/FileSystems/VirtualDiscFileSystem.cpp @@ -135,7 +135,7 @@ void VirtualDiscFileSystem::LoadFileListIndex() { if (trunc != entry.fileName.npos && trunc != entry.fileName.size()) entry.fileName.resize(trunc + 1); - entry.firstBlock = strtol(line.c_str(), NULL, 16); + entry.firstBlock = (u32)strtol(line.c_str(), NULL, 16); if (entry.handler != NULL && entry.handler->IsValid()) { HandlerFileHandle temp = entry.handler; if (temp.Open(basePath.ToString(), entry.fileName, FILEACCESS_READ)) { diff --git a/Core/HLE/proAdhoc.cpp b/Core/HLE/proAdhoc.cpp index 8e932d598f..e30edb4974 100644 --- a/Core/HLE/proAdhoc.cpp +++ b/Core/HLE/proAdhoc.cpp @@ -1322,7 +1322,7 @@ void sendChat(const std::string &chatString) { strcpy(chat.message, message.c_str()); //Send Chat Messages if (IsSocketReady((int)metasocket, false, true) > 0) { - int chatResult = send((int)metasocket, (const char*)&chat, sizeof(chat), MSG_NOSIGNAL); + int chatResult = (int)send((int)metasocket, (const char*)&chat, sizeof(chat), MSG_NOSIGNAL); NOTICE_LOG(SCENET, "Send Chat %s to Adhoc Server", chat.message); std::string name = g_Config.sNickName; @@ -1437,7 +1437,7 @@ int friendFinder(){ // Send Ping to Server, may failed with socket error 10054/10053 if someone else with the same IP already connected to AdHoc Server (the server might need to be modified to differentiate MAC instead of IP) if (IsSocketReady((int)metasocket, false, true) > 0) { - int iResult = send((int)metasocket, (const char*)&opcode, 1, MSG_NOSIGNAL); + int iResult = (int)send((int)metasocket, (const char*)&opcode, 1, MSG_NOSIGNAL); int error = errno; // KHBBS seems to be getting error 10053 often if (iResult == SOCKET_ERROR) { @@ -1464,7 +1464,7 @@ int friendFinder(){ // Check for Incoming Data if (IsSocketReady((int)metasocket, true, false) > 0) { - int received = recv((int)metasocket, (char*)(rx + rxpos), sizeof(rx) - rxpos, MSG_NOSIGNAL); + int received = (int)recv((int)metasocket, (char*)(rx + rxpos), sizeof(rx) - rxpos, MSG_NOSIGNAL); // Free Network Lock //_freeNetworkLock(); @@ -2262,7 +2262,7 @@ int initNetwork(SceNetAdhocctlAdhocId *adhoc_id){ IsSocketReady((int)metasocket, false, true, nullptr, adhocDefaultTimeout); DEBUG_LOG(SCENET, "InitNetwork: Sending LOGIN OPCODE %d", packet.base.opcode); - int sent = send((int)metasocket, (char*)&packet, sizeof(packet), MSG_NOSIGNAL); + int sent = (int)send((int)metasocket, (char*)&packet, sizeof(packet), MSG_NOSIGNAL); if (sent > 0) { socklen_t addrLen = sizeof(LocalIP); memset(&LocalIP, 0, addrLen); diff --git a/Core/HLE/proAdhocServer.cpp b/Core/HLE/proAdhocServer.cpp index ca4e460897..975ce81015 100644 --- a/Core/HLE/proAdhocServer.cpp +++ b/Core/HLE/proAdhocServer.cpp @@ -859,7 +859,7 @@ void connect_user(SceNetAdhocctlUserNode * user, SceNetAdhocctlGroupName * group packet.ip = user->resolver.ip; // Send Data - int iResult = send(peer->stream, (const char*)&packet, sizeof(packet), MSG_NOSIGNAL); + int iResult = (int)send(peer->stream, (const char*)&packet, sizeof(packet), MSG_NOSIGNAL); if (iResult < 0) ERROR_LOG(SCENET, "AdhocServer: connect_user[send peer] (Socket error %d)", errno); // Set Player Name @@ -872,7 +872,7 @@ void connect_user(SceNetAdhocctlUserNode * user, SceNetAdhocctlGroupName * group packet.ip = peer->resolver.ip; // Send Data - iResult = send(user->stream, (const char*)&packet, sizeof(packet), MSG_NOSIGNAL); + iResult = (int)send(user->stream, (const char*)&packet, sizeof(packet), MSG_NOSIGNAL); if (iResult < 0) ERROR_LOG(SCENET, "AdhocServer: connect_user[send user] (Socket error %d)", errno); // Set BSSID @@ -894,7 +894,7 @@ void connect_user(SceNetAdhocctlUserNode * user, SceNetAdhocctlGroupName * group g->playercount++; // Send Network BSSID to User - int iResult = send(user->stream, (const char*)&bssid, sizeof(bssid), MSG_NOSIGNAL); + int iResult = (int)send(user->stream, (const char*)&bssid, sizeof(bssid), MSG_NOSIGNAL); if (iResult < 0) ERROR_LOG(SCENET, "AdhocServer: connect_user[send user bssid] (Socket error %d)", errno); // Notify User @@ -986,7 +986,7 @@ void disconnect_user(SceNetAdhocctlUserNode * user) packet.ip = user->resolver.ip; // Send Data - int iResult = send(peer->stream, (const char*)&packet, sizeof(packet), MSG_NOSIGNAL); + int iResult = (int)send(peer->stream, (const char*)&packet, sizeof(packet), MSG_NOSIGNAL); if (iResult < 0) ERROR_LOG(SCENET, "AdhocServer: disconnect_user[send peer] (Socket error %d)", errno); // Move Pointer @@ -1085,13 +1085,13 @@ void send_scan_results(SceNetAdhocctlUserNode * user) } // Send Group Packet - int iResult = send(user->stream, (const char*)&packet, sizeof(packet), MSG_NOSIGNAL); + int iResult = (int)send(user->stream, (const char*)&packet, sizeof(packet), MSG_NOSIGNAL); if (iResult < 0) ERROR_LOG(SCENET, "AdhocServer: send_scan_result[send user] (Socket error %d)", errno); } // Notify Player of End of Scan uint8_t opcode = OPCODE_SCAN_COMPLETE; - int iResult = send(user->stream, (const char*)&opcode, 1, MSG_NOSIGNAL); + int iResult = (int)send(user->stream, (const char*)&opcode, 1, MSG_NOSIGNAL); if (iResult < 0) ERROR_LOG(SCENET, "AdhocServer: send_scan_result[send peer complete] (Socket error %d)", errno); // Notify User @@ -1150,7 +1150,7 @@ void spread_message(SceNetAdhocctlUserNode *user, const char *message) strcpy(packet.base.message, message); // Send Data - int iResult = send(user->stream, (const char*)&packet, sizeof(packet), MSG_NOSIGNAL); + int iResult = (int)send(user->stream, (const char*)&packet, sizeof(packet), MSG_NOSIGNAL); if (iResult < 0) ERROR_LOG(SCENET, "AdhocServer: spread_message[send user chat] (Socket error %d)", errno); } } @@ -1192,7 +1192,7 @@ void spread_message(SceNetAdhocctlUserNode *user, const char *message) packet.name = user->resolver.name; // Send Data - int iResult = send(peer->stream, (const char*)&packet, sizeof(packet), MSG_NOSIGNAL); + int iResult = (int)send(peer->stream, (const char*)&packet, sizeof(packet), MSG_NOSIGNAL); if (iResult < 0) ERROR_LOG(SCENET, "AdhocServer: spread_message[send peer chat] (Socket error %d)", errno); // Move Pointer @@ -1939,7 +1939,7 @@ int server_loop(int server) SceNetAdhocctlUserNode * next = user->next; // Receive Data from User - int recvresult = recv(user->stream, (char*)user->rx + user->rxpos, sizeof(user->rx) - user->rxpos, MSG_NOSIGNAL); + int recvresult = (int)recv(user->stream, (char*)user->rx + user->rxpos, sizeof(user->rx) - user->rxpos, MSG_NOSIGNAL); // Connection Closed or Timed Out if(recvresult == 0 || (recvresult == -1 && errno != EAGAIN && errno != EWOULDBLOCK) || get_user_state(user) == USER_STATE_TIMED_OUT) diff --git a/cmake/Toolchains/ios.cmake b/cmake/Toolchains/ios.cmake index 2e5dca4ca2..5ffad1d907 100644 --- a/cmake/Toolchains/ios.cmake +++ b/cmake/Toolchains/ios.cmake @@ -12,7 +12,7 @@ # PPSSPP platform flags set(MOBILE_DEVICE ON) set(USING_GLES2 ON) -set(IPHONEOS_DEPLOYMENT_TARGET 11.0) +set(IPHONEOS_DEPLOYMENT_TARGET 12.0) add_definitions( -DGL_ETC1_RGB8_OES=0 -U__STRICT_ANSI__ diff --git a/ios/PPSSPP-AppStore.plist b/ios/PPSSPP-AppStore.plist index b97b089486..4dace2bd9f 100644 --- a/ios/PPSSPP-AppStore.plist +++ b/ios/PPSSPP-AppStore.plist @@ -32,6 +32,8 @@ UIViewControllerBasedStatusBarAppearance + UIRequiresFullScreen + UIRequiredDeviceCapabilities arm64 @@ -59,11 +61,6 @@ Default.png UIFileSharingEnabled - UIDeviceFamily - - 1 - 2 - UILaunchStoryboardName Launch Screen CFBundleDocumentTypes diff --git a/ios/PPSSPP-AppStoreGold.plist b/ios/PPSSPP-AppStoreGold.plist index 513870c38a..a4e1e828a0 100644 --- a/ios/PPSSPP-AppStoreGold.plist +++ b/ios/PPSSPP-AppStoreGold.plist @@ -32,6 +32,8 @@ UIViewControllerBasedStatusBarAppearance + UIRequiresFullScreen + UIRequiredDeviceCapabilities arm64 diff --git a/ios/macbundle.sh b/ios/macbundle.sh index eed70114e9..90ee8934ab 100644 --- a/ios/macbundle.sh +++ b/ios/macbundle.sh @@ -18,3 +18,5 @@ else plutil -replace CFBundleShortVersionString -string "" ${PPSSPP}/Info.plist plutil -replace CFBundleVersion -string "" ${PPSSPP}/Info.plist fi + +echo "macbundle.sh: Updated ${PPSSPP}/Info.plist" \ No newline at end of file From 2df7a24748557d381796103e04343e3d9540af3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 5 May 2024 19:15:50 +0200 Subject: [PATCH 273/719] Messy hackery, we now seem to be able to export --- CMakeLists.txt | 62 +++++++++++++++++++++++++++-------- ios/ExportFree.plist | 7 ++++ ios/PPSSPP-AppStoreGold.plist | 4 +-- ios/macbundle.sh | 2 +- 4 files changed, 59 insertions(+), 16 deletions(-) create mode 100644 ios/ExportFree.plist diff --git a/CMakeLists.txt b/CMakeLists.txt index a383f92c51..524cac2f9f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -374,11 +374,14 @@ if(NOT MSVC) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++17") endif() if(CLANG) - add_definitions(-Wno-nullability-completeness) - add_definitions(-Wno-tautological-pointer-compare) - add_definitions(-Wno-deprecated-register) - add_definitions(-Wno-sign-conversion) - add_definitions(-Wno-shorten-64-to-32) + add_definitions( + -Wno-nullability-completeness + -Wno-tautological-pointer-compare + -Wno-deprecated-register + -Wno-sign-conversion + -Wno-shorten-64-to-32 + #-Wdeprecated-declarations + ) endif() if(USE_ASAN) @@ -2827,24 +2830,21 @@ if(IOS AND NOT LIBRETRO) set_source_files_properties(${RSRC_XIB_FILES} PROPERTIES MACOSX_PACKAGE_LOCATION Resources ) + #This breaks in modern XCode. Not sure when it worked... #if(CMAKE_GENERATOR STREQUAL "Xcode") # set(APP_DIR_NAME "$(TARGET_BUILD_DIR)/$(FULL_PRODUCT_NAME)") #else() set(APP_DIR_NAME "$") #endif() - add_custom_command(TARGET PPSSPP POST_BUILD - COMMAND mkdir -p \"${APP_DIR_NAME}\" - COMMAND tar -c -C ${CMAKE_CURRENT_BINARY_DIR} --exclude .DS_Store --exclude .git assets *.png | tar -x -C \"${APP_DIR_NAME}\" - COMMAND /bin/bash "${CMAKE_SOURCE_DIR}/ios/macbundle.sh" \"${APP_DIR_NAME}\" - ) + set(MACOSX_DEPLOYMENT_TARGET ${DEPLOYMENT_TARGET}) if(IOS_APP_STORE) if(GOLD) set(BUNDLE_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/ios/PPSSPP-AppStoreGold.plist") set(BUNDLE_IDENTIFIER "org.ppsspp.ppsspp-gold") set(ICON_NAME "IconGold") - set(PRODUCT_NAME "PPSSPPGold") + set(PRODUCT_NAME "PPSSPP") else() set(BUNDLE_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/ios/PPSSPP-AppStore.plist") set(BUNDLE_IDENTIFIER "org.ppsspp.ppsspp-free") @@ -2854,13 +2854,41 @@ if(IOS AND NOT LIBRETRO) message(STATUS ${DEVELOPMENT_TEAM_ID}) message(STATUS ${ICON_NAME}) message(STATUS ${DEPLOYMENT_TARGET}) + # This is for injecting the version into the plist. + add_custom_command(TARGET ${TargetBin} POST_BUILD + COMMAND mkdir -p \"${APP_DIR_NAME}\" + COMMAND tar -c -C ${CMAKE_CURRENT_BINARY_DIR} --exclude .DS_Store --exclude .git assets *.png | tar -x -C \"${APP_DIR_NAME}\" + COMMAND /bin/bash "${CMAKE_SOURCE_DIR}/ios/macbundle.sh" \"${APP_DIR_NAME}\" + ) # https://stackoverflow.com/questions/40664125/cmake-and-code-signing-in-xcode-8-for-ios-projects set_target_properties(${TargetBin} PROPERTIES - MACOSX_BUNDLE_INFO_PLIST ${BUNDLE_PLIST} - XCODE_GENERATE_SCHEME YES # Avoid the scheme bloat in XCode + XCODE_GENERATE_SCHEME YES # Avoid the scheme bloat in XCode by only setting it to YES for this target. RESOURCE "ios/Launch Screen.storyboard" RESOURCE "ios/Settings.bundle" RESOURCE "ext/vulkan/iOS/Frameworks" + XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER ${BUNDLE_IDENTIFIER} + XCODE_ATTRIBUTE_PRODUCT_NAME ${PRODUCT_NAME} + XCODE_ATTRIBUTE_ASSETCATALOG_COMPILER_APPICON_NAME ${ICON_NAME} + MACOSX_BUNDLE_INFO_PLIST ${BUNDLE_PLIST} + # Some sources say we should generate the PLIST. There's stuff in it that + # I don't know how to generate, though. + #XCODE_ATTRIBUTE_GENERATE_INFOPLIST_FILE "YES" + ##XCODE_ATTRIBUTE_INFOPLIST_FILE "${CMAKE_CURRENT_SOURCE_DIR}/Info.plist" + #XCODE_ATTRIBUTE_INFOPLIST_KEY_CFBundleDisplayName "PPSSPP" + #XCODE_ATTRIBUTE_INFOPLIST_KEY_NSHumanReadableCopyright "(c)2024 PPSSPP Project" + #XCODE_ATTRIBUTE_INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight" + #XCODE_ATTRIBUTE_INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight" + #XCODE_ATTRIBUTE_INFOPLIST_KEY_NSLocationWhenInUseUsageDescription "Your location may be used to emulate Go!Explore, a GPS accessory" + #XCODE_ATTRIBUTE_INFOPLIST_KEY_NSCameraUsageDescription "Your camera may be used to emulate Go!Cam, a camera accessory" + #XCODE_ATTRIBUTE_INFOPLIST_KEY_NSMicrophoneUsageDescription "Your microphone may be used to emulate Go!Cam/Talkman, a microphone accessory" + #XCODE_ATTRIBUTE_INFOPLIST_KEY_UILaunchImageFile "Default.png" + #UIFileSharingEnabled and LSSupportsOpeningDocumentsInPlace + #XCODE_ATTRIBUTE_INFOPLIST_KEY_UIStatusBarHidden YES + #XCODE_ATTRIBUTE_INFOPLIST_KEY_UIViewControllerBasedStatusBarAppearance YES + #XCODE_ATTRIBUTE_INFOPLIST_KEY_UIRequiredDeviceCapabilities arm64 + XCODE_ATTRIBUTE_INFOPLIST_KEY_UIFileSharingEnabled YES + XCODE_EMBED_FRAMEWORKS_REMOVE_HEADERS_ON_COPY YES + XCODE_EMBED_FRAMEWORKS_CODE_SIGN_ON_COPY YES XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET ${DEPLOYMENT_TARGET} XCODE_ATTRIBUTE_TARGETED_DEVICE_FAMILY "1,2" XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC YES @@ -2868,8 +2896,16 @@ if(IOS AND NOT LIBRETRO) XCODE_ATTRIBUTE_DEVELOPMENT_TEAM ${DEVELOPMENT_TEAM_ID} XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "Apple Development" XCODE_ATTRIBUTE_CODE_SIGN_STYLE "Automatic" + XCODE_ATTRIBUTE_SKIP_INSTALL NO + XCODE_ATTRIBUTE_INSTALL_PATH "$(LOCAL_APPS_DIR)" ) else() + # This is for injecting the version into the plist. + add_custom_command(TARGET PPSSPP POST_BUILD + COMMAND mkdir -p \"${APP_DIR_NAME}\" + COMMAND tar -c -C ${CMAKE_CURRENT_BINARY_DIR} --exclude .DS_Store --exclude .git assets *.png | tar -x -C \"${APP_DIR_NAME}\" + COMMAND /bin/bash "${CMAKE_SOURCE_DIR}/ios/macbundle.sh" \"${APP_DIR_NAME}\" + ) set_target_properties(${TargetBin} PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/ios/PPSSPP-Info.plist" XCODE_GENERATE_SCHEME YES diff --git a/ios/ExportFree.plist b/ios/ExportFree.plist new file mode 100644 index 0000000000..f27da5cd5e --- /dev/null +++ b/ios/ExportFree.plist @@ -0,0 +1,7 @@ + + + + method + app-store-connect + + diff --git a/ios/PPSSPP-AppStoreGold.plist b/ios/PPSSPP-AppStoreGold.plist index a4e1e828a0..8d28cf3abf 100644 --- a/ios/PPSSPP-AppStoreGold.plist +++ b/ios/PPSSPP-AppStoreGold.plist @@ -13,13 +13,13 @@ CFBundleDisplayName PPSSPP Gold CFBundleExecutable - PPSSPPGold + PPSSPP CFBundleIdentifier org.ppsspp.ppsspp-gold CFBundleInfoDictionaryVersion 6.0 CFBundleName - PPSSPPGold + PPSSPP CFBundlePackageType APPL CFBundleShortVersionString diff --git a/ios/macbundle.sh b/ios/macbundle.sh index 90ee8934ab..dbb7412638 100644 --- a/ios/macbundle.sh +++ b/ios/macbundle.sh @@ -4,7 +4,7 @@ PPSSPP="${1}" PPSSPPiOS="${PPSSPP}/PPSSPP" if [ ! -f "${PPSSPPiOS}" ]; then - echo "No such file: ${PPSSPPiOS}!" + echo "macbundle.sh: No such file: ${PPSSPPiOS}!" exit 0 fi From 90f7a90aa866ddb836520ecf8ed27a02c7c0cd7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Mon, 6 May 2024 11:44:43 +0200 Subject: [PATCH 274/719] More build work --- CMakeLists.txt | 32 +++++++++++++------------------- Qt/macbundle.sh | 6 +++++- SDL/macbundle.sh | 2 +- b-appstore.sh | 3 --- ios/iosbundle.sh | 38 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 57 insertions(+), 24 deletions(-) create mode 100644 ios/iosbundle.sh diff --git a/CMakeLists.txt b/CMakeLists.txt index 524cac2f9f..7e2fc33fcc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -131,11 +131,14 @@ if(GOLD) add_definitions(-DGOLD) message("Gold Build") else() - message("Normal Build") + message("Non-gold Build") endif() if(IOS_APP_STORE) add_definitions(-DPPSSPP_PLATFORM_IOS_APP_STORE) + add_definitions(-DGLES_SILENCE_DEPRECATION) + # Set a global default to not generate schemes for each target. + # Makes using XCode sligthly more sane. set(CMAKE_XCODE_GENERATE_SCHEME NO) message("iOS App Store build") else() @@ -1256,6 +1259,9 @@ add_library(basis_universal STATIC ext/basis_universal/basisu_transcoder_tables_pvrtc2_alpha_33.inc ext/basis_universal/basisu_transcoder_uastc.h ) + +# Hack around a bad check for __GNUC__ that makes it use old stuff on iOS +target_compile_options(basis_universal PRIVATE "-Wno-deprecated-builtins") set(BASISU_LIBRARIES basis_universal) set(nativeExtra) @@ -2851,14 +2857,13 @@ if(IOS AND NOT LIBRETRO) set(ICON_NAME "Icon") set(PRODUCT_NAME "PPSSPP") endif() - message(STATUS ${DEVELOPMENT_TEAM_ID}) - message(STATUS ${ICON_NAME}) - message(STATUS ${DEPLOYMENT_TARGET}) + message(STATUS "DevTeam: ${DEVELOPMENT_TEAM_ID} Icon: ${ICON_NAME} Target: ${TargetBin}") # This is for injecting the version into the plist. add_custom_command(TARGET ${TargetBin} POST_BUILD - COMMAND mkdir -p \"${APP_DIR_NAME}\" - COMMAND tar -c -C ${CMAKE_CURRENT_BINARY_DIR} --exclude .DS_Store --exclude .git assets *.png | tar -x -C \"${APP_DIR_NAME}\" - COMMAND /bin/bash "${CMAKE_SOURCE_DIR}/ios/macbundle.sh" \"${APP_DIR_NAME}\" + #COMMAND mkdir -p \"${APP_DIR_NAME}\" + # This tar command seems questionable? It seems to just copy png files, we already have steps for that? + COMMAND tar -c -C ${CMAKE_CURRENT_BINARY_DIR} --exclude .DS_Store --exclude .git assets *.png | tar -x -C -v \"${APP_DIR_NAME}\" + COMMAND /bin/bash "${CMAKE_SOURCE_DIR}/ios/iosbundle.sh" \"${APP_DIR_NAME}\" ) # https://stackoverflow.com/questions/40664125/cmake-and-code-signing-in-xcode-8-for-ios-projects set_target_properties(${TargetBin} PROPERTIES @@ -2869,22 +2874,11 @@ if(IOS AND NOT LIBRETRO) XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER ${BUNDLE_IDENTIFIER} XCODE_ATTRIBUTE_PRODUCT_NAME ${PRODUCT_NAME} XCODE_ATTRIBUTE_ASSETCATALOG_COMPILER_APPICON_NAME ${ICON_NAME} + BUILD_WITH_INSTALL_RPATH YES MACOSX_BUNDLE_INFO_PLIST ${BUNDLE_PLIST} # Some sources say we should generate the PLIST. There's stuff in it that # I don't know how to generate, though. #XCODE_ATTRIBUTE_GENERATE_INFOPLIST_FILE "YES" - ##XCODE_ATTRIBUTE_INFOPLIST_FILE "${CMAKE_CURRENT_SOURCE_DIR}/Info.plist" - #XCODE_ATTRIBUTE_INFOPLIST_KEY_CFBundleDisplayName "PPSSPP" - #XCODE_ATTRIBUTE_INFOPLIST_KEY_NSHumanReadableCopyright "(c)2024 PPSSPP Project" - #XCODE_ATTRIBUTE_INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight" - #XCODE_ATTRIBUTE_INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight" - #XCODE_ATTRIBUTE_INFOPLIST_KEY_NSLocationWhenInUseUsageDescription "Your location may be used to emulate Go!Explore, a GPS accessory" - #XCODE_ATTRIBUTE_INFOPLIST_KEY_NSCameraUsageDescription "Your camera may be used to emulate Go!Cam, a camera accessory" - #XCODE_ATTRIBUTE_INFOPLIST_KEY_NSMicrophoneUsageDescription "Your microphone may be used to emulate Go!Cam/Talkman, a microphone accessory" - #XCODE_ATTRIBUTE_INFOPLIST_KEY_UILaunchImageFile "Default.png" - #UIFileSharingEnabled and LSSupportsOpeningDocumentsInPlace - #XCODE_ATTRIBUTE_INFOPLIST_KEY_UIStatusBarHidden YES - #XCODE_ATTRIBUTE_INFOPLIST_KEY_UIViewControllerBasedStatusBarAppearance YES #XCODE_ATTRIBUTE_INFOPLIST_KEY_UIRequiredDeviceCapabilities arm64 XCODE_ATTRIBUTE_INFOPLIST_KEY_UIFileSharingEnabled YES XCODE_EMBED_FRAMEWORKS_REMOVE_HEADERS_ON_COPY YES diff --git a/Qt/macbundle.sh b/Qt/macbundle.sh index 989cde3d17..457e618d37 100644 --- a/Qt/macbundle.sh +++ b/Qt/macbundle.sh @@ -8,6 +8,11 @@ if [ ! -f "${PPSSPPQt}" ]; then exit 0 fi +GIT_VERSION_LINE=$(grep "PPSSPP_GIT_VERSION = " "$(dirname "${0}")/../git-version.cpp") + +echo "Running Qt macbundle.sh for $PPSSPP/Contents/Info.plist ($GIT_VERSION_LINE)" + +# Why don't we just put these in the template? plutil -replace NSPrincipalClass -string NSApplication ${PPSSPP}/Contents/Info.plist plutil -replace NSHighResolutionCapable -bool YES ${PPSSPP}/Contents/Info.plist @@ -15,7 +20,6 @@ plutil -replace NSLocationWhenInUseUsageDescription -string "Your location may b plutil -replace NSCameraUsageDescription -string "Your camera may be used to emulate Go!Cam, a camera accessory" ${PPSSPP}/Contents/Info.plist plutil -replace NSMicrophoneUsageDescription -string "Your microphone may be used to emulate Go!Cam/Talkman, a microphone accessory" ${PPSSPP}/Contents/Info.plist -GIT_VERSION_LINE=$(grep "PPSSPP_GIT_VERSION = " "$(dirname "${0}")/../git-version.cpp") SHORT_VERSION_MATCH='.*"v([0-9\.]+(-[0-9]+)?).*";' LONG_VERSION_MATCH='.*"v(.*)";' if [[ "${GIT_VERSION_LINE}" =~ ^${SHORT_VERSION_MATCH}$ ]]; then diff --git a/SDL/macbundle.sh b/SDL/macbundle.sh index b51e804ce3..8cf177908c 100755 --- a/SDL/macbundle.sh +++ b/SDL/macbundle.sh @@ -1,6 +1,6 @@ #!/bin/bash -echo "Hello from macbundle.sh" +echo "SDL macbundle.sh" PPSSPP="${1}" PPSSPP_SHORTNAME="${2}" diff --git a/b-appstore.sh b/b-appstore.sh index b112568c85..f2b111d0d2 100755 --- a/b-appstore.sh +++ b/b-appstore.sh @@ -30,9 +30,6 @@ pushd $FOLDER_NAME BUILD_TYPE=Release -echo $DEVTEAM -echo $BUILD_TYPE - cmake .. -DIOS_APP_STORE=ON -DGOLD=$GOLD -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_TOOLCHAIN_FILE=cmake/Toolchains/ios.cmake -DDEVELOPMENT_TEAM_ID=${DEVTEAM} -DIOS_PLATFORM=OS -GXcode # TODO: Get a MoltenVK somewhere. #cp ../MoltenVK/iOS/Frameworks/libMoltenVK.dylib PPSSPP.app/Frameworks diff --git a/ios/iosbundle.sh b/ios/iosbundle.sh new file mode 100644 index 0000000000..f1321dbb44 --- /dev/null +++ b/ios/iosbundle.sh @@ -0,0 +1,38 @@ +#!/bin/bash + +echo "iosbundle.sh params 0: ${0} 1: ${1} 2: ${2}" + +PPSSPP="${1}" +PPSSPPiOS="${PPSSPP}/PPSSPP" + +if [ ! -f "${PPSSPPiOS}" ]; then + echo "iosbundle.sh: No such file: ${PPSSPPiOS}!" + exit 0 +fi + +GIT_VERSION_FILE="${1}/../../git-version.cpp" +if [ ! -f "${GIT_VERSION_FILE}" ]; then + echo "iosbundle.sh: No git-version.cpp file: ${GIT_VERSION_FILE}" + exit 0 +fi +echo "GIT_VERSION_FILE: ${GIT_VERSION_FILE}" + +GIT_VERSION_LINE=$(grep "PPSSPP_GIT_VERSION = " $GIT_VERSION_FILE) + +SHORT_VERSION_MATCH='.*"v([0-9\.]+(-[0-9]+)?).*";' +LONG_VERSION_MATCH='.*"v(.*)";' + +SHORT_VERSION=$(echo ${GIT_VERSION_LINE} | perl -pe "s/${SHORT_VERSION_MATCH}/\$1/g") +LONG_VERSION=$(echo ${GIT_VERSION_LINE} | perl -pe "s/${LONG_VERSION_MATCH}/\$1/g") + +echo "Writing versions to Info.plist. Short, long: $SHORT_VERSION , $LONG_VERSION" + +if [[ "${GIT_VERSION_LINE}" =~ ^${SHORT_VERSION_MATCH}$ ]]; then + plutil -replace CFBundleShortVersionString -string $SHORT_VERSION ${PPSSPP}/Info.plist + plutil -replace CFBundleVersion -string $LONG_VERSION ${PPSSPP}/Info.plist +else + plutil -replace CFBundleShortVersionString -string "" ${PPSSPP}/Info.plist + plutil -replace CFBundleVersion -string "" ${PPSSPP}/Info.plist +fi + +echo "iosbundle.sh: Updated ${PPSSPP}/Info.plist" From fc554050fd8f9c3c5741f7328d6ef5182418a54b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Mon, 6 May 2024 12:11:54 +0200 Subject: [PATCH 275/719] Fix updating the version in the plist, various cleanup --- CMakeLists.txt | 19 +++++++++++-------- ios/iosbundle.sh | 2 +- ios/main.mm | 1 + 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7e2fc33fcc..2de5f3b562 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -383,7 +383,8 @@ if(NOT MSVC) -Wno-deprecated-register -Wno-sign-conversion -Wno-shorten-64-to-32 - #-Wdeprecated-declarations + # Hack around a bad check for __GNUC__ in basis_universal that makes it use old stuff on iOS + -Wno-deprecated-builtins ) endif() @@ -1259,9 +1260,6 @@ add_library(basis_universal STATIC ext/basis_universal/basisu_transcoder_tables_pvrtc2_alpha_33.inc ext/basis_universal/basisu_transcoder_uastc.h ) - -# Hack around a bad check for __GNUC__ that makes it use old stuff on iOS -target_compile_options(basis_universal PRIVATE "-Wno-deprecated-builtins") set(BASISU_LIBRARIES basis_universal) set(nativeExtra) @@ -2858,12 +2856,17 @@ if(IOS AND NOT LIBRETRO) set(PRODUCT_NAME "PPSSPP") endif() message(STATUS "DevTeam: ${DEVELOPMENT_TEAM_ID} Icon: ${ICON_NAME} Target: ${TargetBin}") + message(STATUS "CURRENT_BINARY_DIR: ${CMAKE_CURRENT_BINARY_DIR}") + # This is for injecting the version into the plist. add_custom_command(TARGET ${TargetBin} POST_BUILD - #COMMAND mkdir -p \"${APP_DIR_NAME}\" - # This tar command seems questionable? It seems to just copy png files, we already have steps for that? - COMMAND tar -c -C ${CMAKE_CURRENT_BINARY_DIR} --exclude .DS_Store --exclude .git assets *.png | tar -x -C -v \"${APP_DIR_NAME}\" - COMMAND /bin/bash "${CMAKE_SOURCE_DIR}/ios/iosbundle.sh" \"${APP_DIR_NAME}\" + COMMAND echo "Creating ${APP_DIR_NAME}" + COMMAND mkdir -p \"${APP_DIR_NAME}\" + # This tar command seems to be responsible for copying assets. I thought we had another step that did that.. + # Prepend -v to the extracting command to see the files copied. + COMMAND tar -c -C ${CMAKE_CURRENT_BINARY_DIR} --exclude .DS_Store --exclude .git assets *.png | tar -x -C \"${APP_DIR_NAME}\" + # This updates the version in the plist. + COMMAND /bin/bash "${CMAKE_SOURCE_DIR}/ios/iosbundle.sh" \"${APP_DIR_NAME}\" "${CMAKE_CURRENT_BINARY_DIR}" ) # https://stackoverflow.com/questions/40664125/cmake-and-code-signing-in-xcode-8-for-ios-projects set_target_properties(${TargetBin} PROPERTIES diff --git a/ios/iosbundle.sh b/ios/iosbundle.sh index f1321dbb44..d83c7f0447 100644 --- a/ios/iosbundle.sh +++ b/ios/iosbundle.sh @@ -10,7 +10,7 @@ if [ ! -f "${PPSSPPiOS}" ]; then exit 0 fi -GIT_VERSION_FILE="${1}/../../git-version.cpp" +GIT_VERSION_FILE="${2}/git-version.cpp" if [ ! -f "${GIT_VERSION_FILE}" ]; then echo "iosbundle.sh: No git-version.cpp file: ${GIT_VERSION_FILE}" exit 0 diff --git a/ios/main.mm b/ios/main.mm index 3536464887..21b75f294b 100644 --- a/ios/main.mm +++ b/ios/main.mm @@ -370,6 +370,7 @@ bool System_GetPropertyBool(SystemProperty prop) { void System_Notify(SystemNotification notification) { switch (notification) { + default: break; } } From ca7f781ae82c775ed582d480629f344856df7f61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Mon, 6 May 2024 12:24:26 +0200 Subject: [PATCH 276/719] Rename ExportFree.plist to Export.plist --- ios/{ExportFree.plist => Export.plist} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename ios/{ExportFree.plist => Export.plist} (100%) diff --git a/ios/ExportFree.plist b/ios/Export.plist similarity index 100% rename from ios/ExportFree.plist rename to ios/Export.plist From 3af181d35d3f7a368d63a45c59ae37c9f1644a58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Mon, 6 May 2024 23:45:52 +0200 Subject: [PATCH 277/719] Hide the nickname picker on iOS (until we have keyboard support) --- UI/GameSettingsScreen.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp index d048e64cdf..19600bdb03 100644 --- a/UI/GameSettingsScreen.cpp +++ b/UI/GameSettingsScreen.cpp @@ -1231,7 +1231,9 @@ void GameSettingsScreen::CreateSystemSettings(UI::ViewGroup *systemSettings) { systemSettings->Add(new PopupMultiChoice(&g_Config.iLanguage, psps->T("Game language"), defaultLanguages, -1, ARRAY_SIZE(defaultLanguages), I18NCat::PSPSETTINGS, screenManager())); static const char *models[] = { "PSP-1000", "PSP-2000/3000" }; systemSettings->Add(new PopupMultiChoice(&g_Config.iPSPModel, sy->T("PSP Model"), models, 0, ARRAY_SIZE(models), I18NCat::SYSTEM, screenManager()))->SetEnabled(!PSP_IsInited()); +#if !PPSSPP_PLATFORM(IOS_APP_STORE) systemSettings->Add(new PopupTextInputChoice(GetRequesterToken(), &g_Config.sNickName, sy->T("Change Nickname"), "", 32, screenManager())); +#endif systemSettings->Add(new CheckBox(&g_Config.bDayLightSavings, sy->T("Day Light Saving"))); static const char *dateFormat[] = { "YYYYMMDD", "MMDDYYYY", "DDMMYYYY" }; systemSettings->Add(new PopupMultiChoice(&g_Config.iDateFormat, sy->T("Date Format"), dateFormat, 0, ARRAY_SIZE(dateFormat), I18NCat::SYSTEM, screenManager())); From 9da5ab726de0f59d0a01f6fee781ed01c6762100 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Tue, 7 May 2024 10:44:04 +0200 Subject: [PATCH 278/719] Disable copying MoltenVK into the iOS app for now (need a different approach for app store) --- CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2de5f3b562..ec77892678 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2783,7 +2783,9 @@ if(TargetBin) if(IOS) add_executable(${TargetBin} MACOSX_BUNDLE ${ICON_PATH_ABS} ${NativeAssets} ${BigFontAssets} ${SHADER_FILES} ${THEME_FILE} ${DEBUGGER_FILES} ${FLASH0_FILES} ${LANG_FILES} ${NativeAppSource} "ios/Settings.bundle" "ios/Launch Screen.storyboard") - file(INSTALL "${CMAKE_SOURCE_DIR}/ext/vulkan/iOS/Frameworks/libMoltenVK.dylib" DESTINATION "${CMAKE_BINARY_DIR}/PPSSPP.app/Frameworks/") + if(NOT IOS_APP_STORE) + file(INSTALL "${CMAKE_SOURCE_DIR}/ext/vulkan/iOS/Frameworks/libMoltenVK.dylib" DESTINATION "${CMAKE_BINARY_DIR}/PPSSPP.app/Frameworks/") + endif() else() add_executable(${TargetBin} MACOSX_BUNDLE ${ICON_PATH_ABS} ${NativeAssets} ${BigFontAssets} ${SHADER_FILES} ${THEME_FILE} ${DEBUGGER_FILES} ${FLASH0_FILES} ${LANG_FILES} ${NativeAppSource}) file(INSTALL "${CMAKE_SOURCE_DIR}/ext/vulkan/macOS/Frameworks/libMoltenVK.dylib" DESTINATION "${CMAKE_BINARY_DIR}/${TargetBin}.app/Contents/Frameworks/") From 16dffaa92dd5b979fb40cf6596b3e06f995ae3f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Tue, 7 May 2024 11:44:03 +0200 Subject: [PATCH 279/719] Add a little perl script to try to convert version numbers to Apple-compatible format. --- ios/iosbundle.sh | 22 +++++++++++++--------- ios/version-transform.pl | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 9 deletions(-) mode change 100644 => 100755 ios/iosbundle.sh create mode 100644 ios/version-transform.pl diff --git a/ios/iosbundle.sh b/ios/iosbundle.sh old mode 100644 new mode 100755 index d83c7f0447..822263a07f --- a/ios/iosbundle.sh +++ b/ios/iosbundle.sh @@ -1,14 +1,9 @@ #!/bin/bash echo "iosbundle.sh params 0: ${0} 1: ${1} 2: ${2}" +echo $(pwd) PPSSPP="${1}" -PPSSPPiOS="${PPSSPP}/PPSSPP" - -if [ ! -f "${PPSSPPiOS}" ]; then - echo "iosbundle.sh: No such file: ${PPSSPPiOS}!" - exit 0 -fi GIT_VERSION_FILE="${2}/git-version.cpp" if [ ! -f "${GIT_VERSION_FILE}" ]; then @@ -21,11 +16,20 @@ GIT_VERSION_LINE=$(grep "PPSSPP_GIT_VERSION = " $GIT_VERSION_FILE) SHORT_VERSION_MATCH='.*"v([0-9\.]+(-[0-9]+)?).*";' LONG_VERSION_MATCH='.*"v(.*)";' +FULL_VERSION=$(echo ${GIT_VERSION_LINE} | perl -pe "s/${LONG_VERSION_MATCH}/\$1/g") -SHORT_VERSION=$(echo ${GIT_VERSION_LINE} | perl -pe "s/${SHORT_VERSION_MATCH}/\$1/g") -LONG_VERSION=$(echo ${GIT_VERSION_LINE} | perl -pe "s/${LONG_VERSION_MATCH}/\$1/g") +echo "Full version string: $FULL_VERSION" -echo "Writing versions to Info.plist. Short, long: $SHORT_VERSION , $LONG_VERSION" +# Crunches to version number to something that XCode will validate. +SHORT_VERSION=$(perl $2/../ios/version-transform.pl $FULL_VERSION) +#LONG_VERSION=$FULL_VERSION + +# Turns out we can't have anything except numbers or dots, or XCode will crash +# during validation. So for now, let's set them to the same thing. Not really sure +# why you'd differentiate. +LONG_VERSION=$SHORT_VERSION + +echo "Writing versions to Info.plist. Short: $SHORT_VERSION Long: $LONG_VERSION" if [[ "${GIT_VERSION_LINE}" =~ ^${SHORT_VERSION_MATCH}$ ]]; then plutil -replace CFBundleShortVersionString -string $SHORT_VERSION ${PPSSPP}/Info.plist diff --git a/ios/version-transform.pl b/ios/version-transform.pl new file mode 100644 index 0000000000..9a4ad23de1 --- /dev/null +++ b/ios/version-transform.pl @@ -0,0 +1,36 @@ +# Used to convert git describe strings like 1.17.1-421-g0100c6b32b +# to three dot-separated integers, as iOS wants for the short version. + +$version = $ARGV[0]; + +# Strip a "v" if the version starts with it. +$version =~ s/^v//; + +# Use multiple regexes to parse the various formats we may encounter. +# I don't know perl better than this. + +if ($version =~ /^(\d+)\.(\d+)\.(\d+)-(\d+)/) { + my $major = $1 * 10000 + $2; + my $minor = $3; + my $rev = $4; + print $major . "." . $minor . "." . $rev . "\n"; # Output: 1017.1.421 + exit +} + +if ($version =~ /^(\d+)\.(\d+)\.(\d+)/) { + my $major = $1 * 10000 + $2; + my $minor = $3; + my $rev = "0"; + print $major . "." . $minor . "." . $rev . "\n"; # Output: 1017.0.0 + exit +} + +if ($version =~ /^(\d+)\.(\d+)/) { + my $major = $1 * 10000 + $2; + my $minor = "0"; + my $rev = "0"; + print $major . "." . $minor . "." . $rev . "\n"; # Output: 1017.0.0 + exit +} + +die($version) \ No newline at end of file From ac058261fe47787221c0213e67fd7f9d42cfc3a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Tue, 7 May 2024 12:41:21 +0200 Subject: [PATCH 280/719] iOS: Remove use of a non-public vibration API in app store builds --- ios/main.mm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ios/main.mm b/ios/main.mm index 21b75f294b..ea35024b66 100644 --- a/ios/main.mm +++ b/ios/main.mm @@ -443,7 +443,9 @@ void System_AskForPermission(SystemPermission permission) {} PermissionStatus System_GetPermissionStatus(SystemPermission permission) { return PERMISSION_STATUS_GRANTED; } +#if !PPSSPP_PLATFORM(IOS_APP_STORE) FOUNDATION_EXTERN void AudioServicesPlaySystemSoundWithVibration(unsigned long, objc_object*, NSDictionary*); +#endif BOOL SupportsTaptic() { // we're on an iOS version that cannot instantiate UISelectionFeedbackGenerator, so no. @@ -470,6 +472,7 @@ void System_Vibrate(int mode) { } [app.feedbackGenerator selectionChanged]; } else { +#if !PPSSPP_PLATFORM(IOS_APP_STORE) NSMutableDictionary *dictionary = [NSMutableDictionary dictionary]; NSArray *pattern = @[@YES, @30, @NO, @2]; @@ -477,6 +480,7 @@ void System_Vibrate(int mode) { dictionary[@"Intensity"] = @2; AudioServicesPlaySystemSoundWithVibration(kSystemSoundID_Vibrate, nil, dictionary); +#endif } } From c8a4961f956130948cd80bfc538b9dc3f8069dc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Tue, 7 May 2024 16:10:27 +0200 Subject: [PATCH 281/719] Add 1024x1024 icons (as now required for iOS apps...) --- ios/assets/icon_backfill_1024.png | Bin 0 -> 144558 bytes ios/assets/icon_gold_backfill_1024.png | Bin 0 -> 156902 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 ios/assets/icon_backfill_1024.png create mode 100644 ios/assets/icon_gold_backfill_1024.png diff --git a/ios/assets/icon_backfill_1024.png b/ios/assets/icon_backfill_1024.png new file mode 100644 index 0000000000000000000000000000000000000000..0a1b2de3c99c976ee861a9b2b14a3069e3704594 GIT binary patch literal 144558 zcmd43by$>b_bz!VovTZ zj~?9fv=j62c6ht0#0x<}koJvhMvqgMC+}7+TBQ8m)l5BmPAJUG+}M0S)uJ$Xfe$l!vQ-o%n>Cf1On2#Yb~0v%QVK!vdas{C#-uNj!U8tm^e+BoxmjSw<&E zOlri3UH%83Bq>Dd9%`MoUYdcjye-SLwHc zj>Cju5abX}JI+z#hh-UU^=Mya!A3?Q$)l>^a?czs@E>$4f|B}_9I~=1jPUz&OEQ{v zOY(VjOvczeW$Jlc+6BKO)D-+s8p7``qg%W%Sn*eyByba)GHJ+~tVwP)e?5f&Tb|qz zXJ6m_ny*b~9^tyYHTDOn>&?!Tb%9rmqf#f)wEH6e+{bYx4LLjC#7(|aARzN2=WEmD z0YAI3GjGUQkrr+)f{$>HfyBb$EV9YzgS)(GcV%{6l&BZvU&b%oUYkwHO7i_sveM=K zWpT@`x`9l%DhzH;_dq2cO@)_5Z?z`V#e!X=o}`_NQKvjT=_v6;R8CQge$q9jy&v51!_el(o=H-?6MjwFm?p(!U4R3Z1V!!m-2@gB>_TOn+}bp5PSo zQ2qh9A+0H18=5MAA<5ji$#tsH!7=En>aAn84fwBc@UD|I`E>m%(%h|m8j@|F_h`1m z+tR$IutdtFaVUDJqh)bB$6~U{IzzB3cv5G|+0_gK|BF{s5%6c>}x?ZJ39dr}QR$9@s-< z6Q5_9)HZXj)fQW4oteu~{yx)=bUMDBs{?nv#|2LD9qlc#FHXZLN??gsJs3#Ufre=m z)nVKBCDUD1Rzq)#L(=5)OO!31Z%tj)$&%KF?13Kj!f5-dP%Uq|Uo^fJR7tmDXOaHXmR=j+}K^KzB!9Nj+a(s8^(NlKc#rRL3UKIZMMZHG>? zDMktD!|aiyH-{idPLOugqjMAC+iq@Ctc0bgB%lr5Jl$1R;Hazj7s9t^^Ox!(=+LOG zDdZ&9Mo{Q?FSx^qleV5GH)Ye1IcC_SEltAJUsv}{g6+-^CyNaD&34A0Qrl1pcwSy~ zxaBG9X|%nS4KJmwR{f7QO<#;?M3Q3 zI9X5gi;8K~vil)vO^pJRvJ7fG8g4cYy-5az`2)2wZznpWlB8f&k?Xrtlo;Agi)X+A z$k}j9*L$3hsjhGIE%O+AP<`uC$r3eA+;?pFwsc>D9E;+>Ngi zOzp)c$b0rynAxP)@0iK%H*)<9(Nabm)1zMsLY~iQmlhP>Y}>C%=d&&<9T4oQ(3A|i zYS_nSt57l=Pi_50O5;PLM3TS)3Zj7OXYz_UDxiw3O>^-yHKH#m`e_zrqF8c9E3eb}m4YnJS8oS`o6j1!9Jg060}ud1F5X6n)$Nz8X(;_vPVa*=~UaxBZz? z(p+VTCVDb6;}&>)J#9td{?~xQ-OC$VAwCJwTyaO1oauON*N{RYrQyY(Fbk;Z1ZrJE zXP@WnfIDiYdo@Xh|MmMnj*cv?m|)LKtx6m z@)6)3h;|RjO2546e;8ovd9Ti@(*1&3i~V4fP0VVk1FXnX4T3N{G!5(+J`1GFvuHV1 z!Dl**G4>~@Z<_!aoJX|AI>l@Sle_KHs0z54i}WW#WohU77dS7RT;k2F5Rt=70#hZ70Y1 zm)WLR(Dy0Eel; zvD6w}va)D`ihX!PbKNN!rq2M}&V68pI7?$E1?tgkV%(r)L&V+n;_z*AQ@0jJ8SEScU%>i=F?ywtb7qslbcPb}>Ve7lvPu%yu5fLoY4x z8CUCb0RqT;4>V16EWzCe<^Q4xP6=$h@CYZWvFm1SfeCu4>!4`)0(Y4@+NETcKFQ^ zrjz~L;oDikktqsKv+VtCOiv0QT7qsAv1HO#LGv4`>A)Qz1In9*vhBx>ay?2lcY9j& zpBs#i@ML;gIegNF*xL|L?+GCDj;=#dt0!r`7=LMauE5T3S^=JrG+P(JKv95}u2Jpy z(RuJNgY$HZ(D_re#pHEGuZlPUXJ&&x|<|U4UXKF3J3*WZt z^wwD1dQq|bN+IOM8ofi|lxu#-(8$teJgFu49XMCWhz1cDA88Nlxja`e-MN2}`o{#g z+V(xoMIDMp<}|f6>Q7``M+1*d(~&#RayN6uhesTJxd!%35A0qheEa8?^LEPbjLmlq zr?f#7iWj6-@wYH!2hf&tF`5oScR$k3CWg^OY|t?Qr!cH$CDDyNMHh%;UYb_Fjhf-#+TnTNy;SZ ze#m*%%KmSj(%&9SfBVMcxXe1}>_!!DX1fA7{*aUxOzkj5&#G?z(*}$<7L?_TO)C@_T5`-(!!}9qc~wJga1Saeb-p zhYf>J=ue~*3{o`*>(O`PmPu>Q(e=Px8kRi>*0e3O*?FHI zyz=C2M(VePLX*B6&-Y6|_9^Y&!ccvyEkBe2exC2aAWjg^RRfG|eNZkszyp7!Qz)!^!$3yR|i_z zWBa>XSG;vBPpQ(xT<`*j`B$o2c~eh32!j8yWdYn4>xJRu+?0Eca?49gBii>u)|OZ& zZ^O~&1t3p*nmD44+?wmFG0V8z?KQNZxJZKlq#S*Of%EfI<4xa3eWiT@_az0oDiqZH zUD}gh8K%&oXCpu0DMA5p4x-c4?M!M#rp;$zv=#@DZ~_fM@6~1A582kxvBz3Ru8x<8 z2EDgPyB{LgsGIxYl~nBX)>d1!j9=PU02iEQl5$zmb`4>d#|=UWw_$m-Ktc~}tis^K z0!cG+Rp(CkvY30DX1NN-a)FDOM_cXr;Ss$5C7!_gR*LsSWpb_Ba0NH+1e?fKU8R1W7BA zlV<&DrqW?(e5loiTEXA)qK|yw1n+=T9W~xqAenP5x%dVx*GLe>(gtP% z_rP9*Rpq>UT7qK5b}o`?=_4zwJ^Ax7`LRP(^IWGCv&Ie#N~GymGzf3){xF^ zs8enG%+>WFHf8v{$(43rx{hb}PAn3`w}EddWV!_4=E!C6%5E?2?CrZ)oqhuqU!X3= zs&Gh7R`U>LmXY8R^}LAUX;4(^(e3@EK<4%JsDVvxV9kgSo^j`^d%05Ltv^+_EpBIQ z2J~AQH1-=2oij&r8Qi!@n%2{g9rT3j+e3-d{MD z)Uv?wa4qffv#eYicFoXlG>LcH^$FV5_c0aLwi+K=8fX+gV-=})N)=Mo2F{`Pn$}u| z^DJtn_b7~dsCfFDvcWAs$)!U}Fm?XW@TxsO4r#vgdMvD}3A zLu4-)>M;#kVQT^-{eI3oY1;>J?6jX4vHNY}U5@-jpTQtz^N_3-u@CKqgiqi2uBsF48BV^%oqv_>>OV2?GN) z2u_`C)hN9DNWuufdXOUZz67!EM()7(4xSFL!2Mr8K&W!|1t=kIy+aJx?QdIQAj!KZ zhIY11{4mUR1L(FAZE3OUYl4iVxAp);y)zR$Qhjk))@MIrn^=+^+N@LO^K-c+F{S7E z6c!o28XjqJ`?u};G4i%^#QVJK=mT5}(p;P<-BaocrrD&laG=(XMWbT*XxqO2YmIEN z_ElgWW6srtTt?XQQ~q+_#G9wMCXZ{!&DOo8gAA0Q%zx?@;a%?ddDP=IY(=1V=&nt7 z#fwEtmJ^ejr${tox5+lJdEVj^x-83^cpfI<^8qjXU!g&ergNOY#LibDo}%>b6!#CV z`BPJEuxRMOmkx~b7mTlPOkOq`90kUSF4?qm`3EJ@#nyZQqFLvx8XU?iA~;d8>E||n zXGor(d66ppmWAa7B1#hxVm=jJ3UKAahtj+q63jO1jlZNV+^UO9rtA&(p6;#DFjfNh zVJNfcz9zNRV|z|~XRb%NQR&vhJ@3 zagoa9Dzw$ls)Hq<$fTMr(hbWwx36 z=#qN-{zu*Bd#~@p)@tY}_RmoDk?z<_|u^_SxAbyR5vHtng8`$MBmNR0C( znmFu0RLZL_X2!UO+bVoK1@pZ3uftz*bhNp`M3*=l?MfyL0AH^LeEsTaSlRwNmb_tP5k5i=34$`k0Hox>e#nU>4xUS%@}H`6Ssjtl!jIGqzyf>CUnzI3*-x& z{?g}f!!sKU889Md47AKk^)T>@H$_ADQJzHm#b*4QocJZn{pa^z+uv0S0`lP5F)ken zU*(E@TYfiP0ZLlAsnL_17xgEZI1flB)x^I{D5j6yZ9lH~?!S+zHI=bg`4sdblIM9= zQ>j_TG_&-)f5a-6=N+}&+`z`1zCN0#FP@4Gkond<@bIIZ@me1MqbrR-G35AbQ<7!LGM)gZ_)D_h-tZ0|yA4iCE;v~ngt~+LQcH4&dA?noByt(RP#Ib@;Zxe0?Yt|75Q4=<(VUYtJ@Jg@gAtR$ zwvh|5x$BPl0DM;8gg#IHi~**NKK3h|Gw;*dSIn>*eAdYi_2?ZXRWN)T*7iuVhC)hi zJ}@Y|_CeU%f2=71=wBkI>{;90>V=gNQoXmvf5BYd1~uP?w08}MER_IGIHg*N@5mdP z?V0;~2V0E5%z#|z3b@@txCp{^5o_N}*`yCim+FpYZ!Gy(@X90Pb@gnL&X9mhhkY2p z+W@3Fzp|1&UjiQTkVPX!*W~Y^x_@0V18~W%0g8R;_>x)DPQ`J^)ap^dB^7X|@qI1c zC|B}^j(n1oxtf1GBoxj7839y{d-C<1tam6;Pu+j|;s5P?Fkut@nbL>RAX&1AQ|gpT zTBinnLzy$6X^CSTO;T;Wx61~woI!s6Y4=`qwc8YV%x}r?u^JV6U13R$5I>VUFIHsU zn_PUDN_-bgb6s6%;5F_nv<7v?{wze4jsMd);ul) zj0Mfdq8T#8to8_xBfhiG0eSA^3gDrHQ4$$>AjCq4@pB4InO>X((^RZrrr~trCEr+7Wh;$H4!|eV+hU`JzKmDss=@?RB)V7U1aF zR8Nff-UJRewfr2CY+f!!q_G9(j{-G1``(J3y^-pAr%3@ia3~|+7CL?1$iKT|?}tFw zKW2wf2;%Cy_p_Gjmf96vNT$yqrUgJa{-jA46FbB6<^D`ZvzvpaT4lr1o!heH3`#ro z8g-5B!O)3ycr2#w#xrPqvT3onMg==n)y#STtJ)sGF6&>_M%+8IhQ;lqwMU3#2;u`n z>XBuS#)t%xFo7ZVwOzHH`O3S7a@!MtFDKm4P`af^tc$@)BfNe^G$UA@_Ofd_z^KN|^P=i8IlWG^TRhmM&-x;=VDosw5GXpBEX3{X*K%54D zEE>f?3E*gl$CChY>5hZ^#|*e8$(wf>J-5GU#R^L>Yd_D~wJShiBq691=t%3m=6Uxb z^PS&*=o{=))O?8j*_+VBluF0+eQwnwb~hoj=#!(r+LR7(ogB?YjtTsTNm>YU*KT#RQ$=S*fT8KLjydy61uS9Z$ z1wXDwxkteL5#I351S`8LZ?TEt({y7W*6^P^zTXqz}AOAU@>RZMKBg3Y?p6ce4L)(K#$qnQWqBokrko(tj;~)7zC1h0}s&* z^=CwD+))|8f#=eIN-A(N#2xI^#@_zz(t%vp`a~G03TS1IR1Uh=hOd5kat~0ORY45s zG7N~15c)olb#K_w$Bs891u@NDS1#FJy)YmN0Uw~%8#@zCukQb#SkY1pv6k@gn5rZV zQ9gVLT!X!nhZm>u26nC4-nIH}&UN&N>{n2&=&dvIg(kKih!ccBysi^~^Z_rds=h2v z_xkra^vQu^obXR?l@>N1S^LOBMjd%ZhtXa_UMB@-X{Y1qOcPmnA%b1T#kO2oE+02O z(5QmNRxJHEs^n49aJUSavj|= z4qt7R6@rA2U>B9_Rty-%H*oe;BZ;>YH?8Hv@r_N5OM4*x(e^!hxvv=bkaXUa-if#S0if;&nA7TE32N|2w_$*Li+>NWn+rY)ZdSfMz;)QOSQbCsA01Wsmkk>R z3p4g~hKD`v(; zgI__w9}dNuyjg^N($@Fabw^hNB9{@+5gOorOMG|=(z~$$Wuy~BHjN+ zN=JV1v|*c1(KN8{EHFBMVxByA19ay^Vje5HnH~3pdlMiiQ1SqeH?p<_gs&aq=QF5T zdCG~h_r_`@dTo6#pGf@UGbVnjYJ8_TjVeWF^Zz&vITjie94|(&D|2Js27x3Y^}UVu z1XzLUksf=sr!B_)lV+8v;uZ{h<$tn@+-u;RG$WIsK z9G*MO*zCy*P@>@Aa|rs=3(%r{XrN)~d!z)QR;AxI0&E0?S+Cn~W#+Q$I>g&ETbYM9 z7GHbG3j<{wnoqb+;-wPEwY9-b&5OSKuW#2%(rOh>mcF;&*f-3(Ygq)BTJ&l)_(P0L z%e2_rAqW)AnKchlX3Y4Fnvuo}i#Q7#&;~4Y8HgDcz}eZ3b=yJd??#BZQL8$VI!uth zGB6b#JGykjF(yNhtK>=ifvZW!ix4>QqiV?pb?|`4{=<5K?nKCOOqAqVXceEawZ3jn zvm>oH#~>>QVIE3%G2wg$O@c}^)k$vyI}E~0#rD?GYpg13f|q$6SM!D4nkL1 z*52rbQrCZ7``3%mq=Ea+^GZ+p?L=zTC9k^U;GzkGfFrPdJYAVo8+P-=81Te2z{)Hv zPItnT0WNTQJpV4~fx1*e>mk=ldE`vpYq*R&=A<#kGfFQj!8f}%A65vMpFMy5Q2 z-%EsXP1!gE2EDN#C_WPq=k6{Tz6$Wl0$a(TvrPEvbK%asprsuqfsV_4l2G>)2i&rq3JO58mIryXw^4L}7Zh!O-m|d|rPiU-KumC= z$E-|d|9+%bZDGE;$|A(%v>Kj_dwJO|1@_I?GT^RGrIPyBmW{?mtVk#df_CoFL!L>$ z7NO6a@QE~|wGFv`(x&n>h5z^Fqml+TcpuPf=x-Ag7oR+mT=TfX+-7#s24el zXQ+q3t#JkuKH%kXG;mlvr7&`!WwaeBQh@$FOcAB2(5|<2R3OPk|6d&MXbNtE_;Bzq@f9=f?SW3+$8WkAx zqqHf$^|JLg{&+JIf(%}R!>F$Eg@S_^{6f=I7N)oFa-}Jx%mvgpJm7-5e&UXjj^FCj zo4o%ed)GV~r|CBmL77HwV^;I~^X9(CR5@?gD}-pa^w|e3Bk#LGQUG#jf`DgPR;&PZ zUsgN|1yj>>yQG+Km!3gh@bY!f!*C!Rr6C~U)m5go;{`m=pZg(8OLFY@l3;wBN8{K) z2m(<|j+=o4&OF()2{4px;O;i2*AD-Cr+i)v$Gpt6cIIgioOJ6U53W7+9@)VR)IF0L zZ$W>t?gxd<9X|PiT?n#eFP=hYbql5AY9r(iSykc#TTZSo6nv)%RifS>pPVy38vdF53B9{}KEiXAm36K1aC;@o+OEuR^%d)0c#t{+ z;f3_LtMp()#eFvA4<%B=`;(uW@?&kH=RuNp1Mu#t@oJ#<9jyb@@#+PjH!h2ik%g;h z@Dm7WrxY6e^i@N~(mZ)zGz$fu9z$yRc-DfxOpI={dwm+%^*Jmk)`IR8L1Wo zK^lT`X%l?IS$q?oBIrBg+&E1QGRJ85=P`PM=8mhJr~zCEylROh&^o1-2~s`H0izQe zF8G1X5z0KJ_Ex9Ym>=?RQFRKuo6ZCE4ZN|owzf+F399$29eS_M-Chbw#PJ(Y%bV7# zxzQdZoT0g0!a2NCS5-GgQ?v4kIDV6WDaA4}hiBJcMUn9WEWBenODc zF3yWMUaf?Xn_R)-Jn1uXABW}+S44cgJYt*WgHzqsc?u#u|yk#_rL z0+h+B`u-_`&SC2FZ(fu&_ubGM895%HuyS#wA0$m0$tae|YTa5$+I`=w=v^6)fDzGC5Fik_$3vY>wjbFl}* zJpN%>>wjDc9e5;rAEVOxSuXqdrFegluI-hO8)!kUkYhN(GgJskL42HnnwJml96Ln# zm`W}Ct=ZZ_Nz?s&1mqjP0zOh*VNh}yklP_GYetC@R`e5wKfWXe1i7FP(?Va;h{bR2 z9~Vw;0eQtG6Z5A}A_;>$TYH3atdx5WK9uPj8CabP!|1ub+`wZ3OmG**nM=J!PG~y}lo3&>TIjUEion|(M2|KQ^c)G|&5xpc~9zO(&$Il=>*l`eAo9-wQ?INKcg z`|F!4&NAj8FzP)BTE;SwWc$Hs)AH)k3bV}&A?>mv#F}M=0>tondR>xrRqq%M&$P?LxFSWSo)dN(k zcb?QfPK@s?fBI3TQC2Epb8q)VbQg^_^|Fl+L7np>jxByfxp;z5UIS7mu_?cg&4lad zbY@^13$s5>Hv8Cy7TZv1!J(mx_clb^7t~h`ed=g#0!ui{K={D6I_=-JP71hcxrMD` z5&!kK)QRO_Caw?tt9ee=3uL>CC<%P$=H)M^I~X9oXqst+H$R>T@vUXW?BDTO1+Nf$ z>u!hp?QYC~v&@|rNuf&*4fmse)UYd4-uxy(lfl|PkkXI*2f@qQ)NM$OikP<_#5TtE zN~id42M!+&eEs!452hmiaQvmi0PP8ZoW+yE3bJs~y=EF5$#i`NZPss1a!+vc;{-=t z?O_xz&Eq)1&`>z34nkgY@qYd^H83q*#*z!Z)f|Hh+BjXKnFXMqZ9YN10n$C!Q$Zy> ztz{E6JcW5*3um4#ri$zJi^u^b-rlRTXO;UA5fbPP3|HPyvNq?;$({S@Y3ba1GxNhc z-p`dosO0jwuV3ofGr92hT@G41zE3uBLJ$(*%3zbQ5KDfjQ{q!G?8Deh;FW(8d}^*m z=L~qHG=A!m99JwoipyA=e+eU>ULkkROtk2*uKD+d{DM%}sqA|o;i?I$agNFXoO~RT zfUOv7iWh#VL=Qnp0CBqpxl<|KZDm~$lb{E7%WXdaWbd9qL8y&|y|BM=3ptJs(zV1o z`#S>s6*?1Jp!%K>gpz#aA{&jzHR<8=X7pwi=B0duIq{c0~Nn{D*)eU{nEuR6vZjy@8b0wmlIS>3tbdr|iRnX@aO2p=o9~ zDP#$+CtzDbCHyl9N05SfS%Z=}%}~v?YDATuWdun$H?kq9BfmHqM!?#xMdgrNXp|sm zt;g7DDas%VW}1JZdPbf70dRuj6eM9~;*m-c9UVdnw*-&zkNu75<``An*L1=!WcO17A18Y~`WY}ntKrV8@B37Pf74v++rVDKE?GyyM)Douh1JZLFI8xYb1 z#3mm>jeWh%J8)9oaU#;CT?|0ChTaNRG_|-`pftxO;K!s0Dsvv-}g_xkEz5J9XvLk$uk_V>R2>PG|5o@^xb46hcYb`IU_a9B6>k<;J&fTNi#dE-_1qS6&WE*_%&0RrZZ1b$5$ z__Z>HUcju~3Om*L&F4;prBObds;uJHA9StEJ3GY!hfo($k$h=Mt9V_nt5SQir?^d zlBqU2<@t|Qw~q+)f9kC^!4FECYGv<2kQty%pcPONs72X=(Eo=K8mT_>IL;j}5aWJ^ z)b~-hZ)CVkZV4YlBJIkQ<7DSh;WodpsH^ZU&mzn+ZBw7wi8|&6n644a|RzD z$4~x=^O$EKD-%jR`uIeiAbX0i*)Z(&WTFEX#>$Kz5`+iCNtOuGS61XbG|H?nzl}`4 zN=G10ftVlV+9mNYIgeGL$jBT&~}K>`CvFQ zd%VtO381OF${jz&yRO_;&<#j}iLTORw)Oc`du`hqGhmopu`fU+!n3^VN;`|{sW^ap z6d(I%{9!(&si}n~-46V&?#cbH4jhHc+=Qn8IV;4QPrGM$wL=}hAkT^?n;33>-#Y!G z_xB!!;cN=bR{p^O8P!(2Wb^3{8HKR}WnrPu|0CSrd$%{&;Ji%=$DiHalOJiF-fXGe zxhRPd*FPHy}J*i?0D{rwKx6Pv%YjQd&s0=d|-S_n_@dPev^rP z2GMbC*yf3oL)K|-Q5aOlLH+QFxaeMv*?!bFuuQocZ*BK;=jta`)i1|Ok6-(G(Pi%Hx_#L3tgQ_Da~b5LQNl>+X>8o=y;tzB}4K zf=IzEzR}rVJnM6#hD8{u)S8iy91y{<{zo`eO5aR`z)TU4ZCHZ)&6S8}3;xNY0 z_5dryO*C<0)D?s3`Jg0d9}QO^sN}hwjYr;@TN@_cBmOz1fR&qYFF69yMEg6fyPCO7|MP z@Zp=AZp=dd43WPx!l{;7SS?|=E+|Mtg48us89S~ClmNaWr?&QeN_G2svoaPYCzSy_ zxjP=tEa?aEh@)cst}YrS0VmymmX0jzU#=QjsM=Z?AHPt~(FfW{&nR0_PgCtS{Z3(e zhKqHU2)R&!m^ubE;g3J1*^Vt2_Garlb2#>lGnjz5=mrW|t)R?srmQc=O|A0IWyIr- z$1L8T(zZQYKKSJ;#=BQrU3J-H^$_06db8z|`|;NZR{V+7k>y!0$_?d6vf_!!{FSJh zN#r$;cyn>Y+O90&UJlvQJc!9ir>mN{&>VC;^pOa~8;gB9ueRHa2 z7B643d`E|w5hLkBFT#(AUIZ)v`2w2~>Pr@GqwE(V_~QJWKc%seiF$l@w=Y6jvSQB8 zg8mx|Ef+du@8Z?Nocbc++5Yzs?)G2?f&H`1{?vK;(>A9L$I=3`mOi6|YXQnL46~{N zQg2~MKp=OYK+w;Awd^839UrN&N50I-=TR8 z3g!5%!~Cpwe^YIG&;;7nb^kD8oRq!6V8q5^`FVk@!P!##uh8A zz~E4l)3a6QA7>hsCQ4W*QZL@W3Uzh`gN$2fp$t@=#rI0JxYO}X_CsyileYzCoCLhb zi`+n*IE@iE0qjE#o{awT59`9XsiyzgOQ5{0u^3?|mK$biWUGMk2^JjC@6f5%cyOh@ znR%ySM@yrzsZ=UX_>sg`)X6=KSU-Ej=it&;RZ6tcr=S~bL=Qa*04;0YC=m~pWP?kT zoHK&>jKIJY0D1&QzP&Oy0t*cnV8=OJTzBo=Qsnce9GBq=)e2UtnT*gur5hbEqg#{} zbxQXy&{at*SM!{=DsP(PZhb%!cJsgwNS8j8&u(LEo-T0PW@W`(4yqz8GY5RxksaDm zi-Q7a3h;Sn)_vkDbtoxM0h%HiinIAw@X6Lr<#_q;)*)f~Z4j0zlq^9+{Z|*Q*bGZ{N-p*Q}1`bdeiwwP_v+92DK)m0P<{GK35YuBIV7=R>uw zV+P)hIv$MCf$pSKr&Dtph1od)A9j-+I`0a@-mAWo1af2mRRzoX|INfI>{+A$vtKo! z4mIx)vwvvq#1KD5Pvy=Z%HDl*2Gf`M3Nfl%3RI(H1t5A#;ZIzm*N;nf8UyI40x-A4 zy{7qTRol4+v@Y)i`e2vY9%Ym}f#&&7N-mootIk(36k!ZkQ!T3o9Ku+DII+&)At=|_ zI84Zh!P{`Ho@RoHaYzQ@T}t?1=U|}**ZVT^4Cx5wFY8wYw}SS~XY(9>>E%4X9kI=9 zlX(33SM=k9IX3Ul^G)|oIQtTpY@1zT2Br0Era$vVUafp>a;+&@^f3EQn&vSfWsqjx z8Exdpxc|vBQHHtk-j;GY-+lJqd6arM*WL}<5ypsM`lf)EpM8^_u}IQPb;fN~EOos4 z+LUe4n6)=I=dBZ*(EM1&y&m$s)?037Gw4InP%}Y!T~ew1(`J~;rqZ6FOp)7>yo45xH z?R-K+oGkPP<&+_rA=j&06v`{CcATWMB*U58_)sgi*eXIp^Ib*>&wM^A2N)pIFY>6) z|96DQ49u40;uALT{taNl%5iaXIs`?Vxcvy&P9b@lNDr+I_%`CYDYGbEN4b$`u|fyI zLalGR*9ts(@(W3<5*MEOS+|*ySN@1~O|7?P`)jOpS*g#X5LB1$jf&^1=U||2C`vOr zlWd|!kN#ZOtJylxzE$5UUQoN!<0{IacE>?taO<~6_gS3=ZFF%avhxn~9<*|(0$996 zt|ogJduDdtb(gMk_gDCsv>7vdo=)N;;G@^B3#Ly5==Is8he60W6IPGqI0R|!@;JR; zDVQn=`t+FHyZBQHg8j;2p<~&Oc`0E2YQ)h$IB`$U5X?bX1-)PB!Cu9h-nFr(BLo1I zw(SP_tdl#u?n+}rZ&`BtN7UotxpvFyeJAR=5+2faUb_IC&%yTsG`}0zd|;#Xsnu%^ zY4Bh{ZOS!K8G{}9YO4<@?8%>UWoIeg0qf2ZI^DA}7vICPiFfZt^Gw=sEp0N84n{{4 zAFu}dKi?36nT*67PJ+9JM7+Y>qK)000Exgm_oHQ_0;xu8D^BnFc4dd&w&@wX?VAgH z9Go=$kjQos7FvFw=WFeK`*~#^wk{6#W3?O=YoFfTvD_YC#Tc9TEZBJ#3Oi zV4l>v%9S{#-CS*hgHN$}-HCg=`L(Cw#u zAwQcR1&rsl1Dl8i*oQ-%XKt?wOd}|fhA@)NqgO>?g^FY+o;hN&xYMO6tiUXH z0Gb&DFweh04jr_CqUF$&)k=MLZ|zzr6>(7GXw@rVZ_lo+)9sB`Cw*)qF)_w`q_R+gV)eG;urqmL*kLWKg2Sc(i zzezUyJ1~E_RBYM-Mi+PJp4pcK+L-3a7sD_!ZclS18xDrSo#x^%zjTOu2ati-ph=$g zXx2K7VN*uE(@hk`Aj`6VvazZ7YJ{i^&4&z%IrVuYorMW?R`RS9Vs*n@9}Krg!;qJG(D zvWl~hFa6$3_BgUQTGL5>;P>+qjB?mQz9_3ZC0*R^7%tg;OXZ#p4;{hlT)gHac7==m z@=gC-R+1mTKWeFyuNYUD70Ik&<@Ogc_ghY{`5c=KP7jVLrZvZDmPCz#0tu8 zs(CY@L1_^>|2P)(Dof#)veMISK=)0)#sizMbZ-X2t-ijzEW{OM>W$0%$1Xi|RLNLk zqs}(`6CV(oq#Wlg*?0mq|R2c!A#nRd>GZzm>>2^N?Xx~OD; zFCD-UFR_8#iqEb5H&$?=os&sgy0Kvxho|=Z9mM1Ay_?tHAy&mk10+5|G}SWt2SSe7 zT+thtdlO2cB$E_gyiQ1Byu zkZ+;gUU0#g|HYz@K&L=_?nK|weW!Ev^$H^pwdxcW@a-Z@t7rT!bkB#7Sl5FB(zl3I zeBXwy&DT>$yS+X%I}#P-9^X#&V~@H}HDo%rK+^sJzNg`>o8kZXP6Yj9Ny@`ptM6s#c0|rrQb%QY}M5135lX*{)1s3rQ?e} zNP(L7-uerhtu1NAf+!{57dFE&wPMj9zA-tbW-;+j$}+1JyJJm@`i#4mzxdLft<6IS z?PCWAEm{hw}3)MjS2&o76gQUxnNnng{rEVxXJ6GTdSO3bd0AGM$6&STFMx z1P^S2h@_gVq>LQT*{SlGmkH_JVH5g2-dZ=Ttc@a&Z2RHa1f;_K@c z4m1DvtT%R4YQ(X6sHS8~A!O<@qRfK_?ZHIrWw9MOsNbEJJ48m1K0I82^YI~UUV)~=zRx~FKsxW;S=++<2tZ(`%?F65v2KlSn^ z9q>gbjk+0$fjkiQ9>XbMFed-Om<{BM-F`0 zn6=CH@WAg6G?QZ6dA!T5)lSNu|B~o+@SPHIHMI!Je~)5(n-#ytl}rgiW>3~78fKjr4Pdzvsu4>c=Pb`QCuz( zRT8Cv@}HcXTH0T-0$s2yYH@aK+rgVl-rYN#k|W)RE}X{oJ@i55WW7W;4?E_8kj$b1 z#-hPEK5yH8tUj@zG_bO`Z?|@K*O*j0ys8r1{Q*!-7_Z)-gr=dL8 zw~{NbL>+FGtMJhn6g9x0+@|2qfEEf+dPjR|Gr>xBM|NaxtSSDu>u#w#7x#W)(v$_Y ziGdXRpaqTTtw+0`zgl9Kxu?vBbNWbAq1dULV)?CWiSbDG&5g zYN~?MS$s_cedyo&DGlf>T-^DXiwlD$bBH5Aj=rS^(J$=#9GL3tA5rWtE2}7NmqA5` zJf6KuUKVV$5TtjC|8LBG$xS~Em`jHW1M7q2`N!U(EGSiflq>>31OwR3)Sz1+n@huC zBH)hGoaOt^{k?jo28^nGXL*2B(vORKKBc!Gysk7=s0quOsH6QjHF^|9j;tAiV=eXu zP+jx*)xXeN(p9g5u)CWovmKJ7_8wQ$`F&6G&Z92>_45q)dlbvPjvioL4KRrhhaSvp zM;Qe@e|*;T_%Z?OURuX9DJ|{;?%g8vD)*&4fkwxr3W6emZtqnwH+JIw^=Q~~#+LL{ zD-8WK;Atf{{9LPI^O5 zF7{C>*-0F5TvRK+0T^zdxVFh}{owG?^wC{_nq&er^Z_Q{=KRHP#N1QTwGrLl$z;gU zEbxSOG4n!KsvhKcIS$S-|D;6)Jcl|(0e0CJ&=;2ooT6ae%5=0LW$2O zoKd?6dWFE2jnB7k05p(6{>oWla)aQeC5sSJi6afgE7FO5k~=|#n} zyfG8=c&)j{4G-T&2p-7|blP*>evOHwYY>!PE(&<-3Vm8K1Z>CHI_3nHKn&=~{^VCJ zbj|qn0ghjGC*FrkNc%g!x)!kLOSc8E^ky5>zvn36*!&W0SdK>14*U@R zEh4>~OpZKK#9N*~($=Tj8khf_nnhucKex-WR;Ir$%YxRAFE4*g&Jb?z!)5^gAO-ln zG?&{W=3e*gOh*m-O()sL859Ep{$o{Q#07@FaL!dyYuqdc$Qu9P5~#v}S%^h6ari$e z{KcOgXFdms-b=KopGk8c1ejbraBbIF7nl{jA-N!UwusKiXtTf1DD6Df)zhQ5_2_sM zf4&c>WK{fZ!}y|t{|}|+z2qMJe^e0*6QD}tE6#UT8$H`b zh5qvcE={dmvh;YH_`Cy@6NZR7&|d`lSco_804O-Fe!e+dH3P*sQUXXYtY>tQ_k}jW zFhHln%^osZ0KOcK`dn}Bi0ve>f*V4AK}GadEmxau3|ZF;J&;e?4RTW>W&N0rRd$X_%-u}}B+_q#F*h`Deld0hCDQG&cz zH|t#oMHhxXx`H2^w`^WKP9?H8D=Bk`vjHa1Sc_Rhy_@!cEgju%oMvvz4s3q%ORt2) z*AT!4hCdfa&w&jLX}gLK2nF%`msnbi$pKfhO&UBW>|{)8;q4)MUeh525&$0VmJC2p z;rktt*G_M-i6}JcGX&ZEIZW_boj_QIImUjSQQpE#OfM@uB|M6w#iGFYu+sNwN{F>q z51(|ArNGm_6FuZXxCNoOKV#D+egH5&y7T5V6XY@ISnY&y$eUw;(zg63Zel2ofbVRc-K0Q@J9*<49}6gM0XAkZzK@nPBj=s}85Un!lT!Gt zAZofz-0Ne*%ef=R?m{A5i8k8d%7|(=pK#B~mb&Y00LwAjb|$F2zhwNBHWvf|^GBd(my{rB#SOGXGdF7w3^N)s$DJUNC1*3!uY_vu zw5-1E7W>ZC1le~21mxjGWdeVU;O{gkWLp+=ye5Sq#)WfZdRbEzde*iSVfl^}Wa&Xb zWi0M+ii0S|Nhccrfp(|7`2+($;ImX*aI92_+Po;X@&jDzmzBTtYFu7C$j=0RCS}kt z*1u}HoKVW`FJeT9a7lIpDfO86m6eiyAq2L}2oeet*8+;4sy5&jT%sWGR{Tr>@OWUc zkwGc(HsAVD-H)N?D2z|C0NsC(gkb^V0^^?ecQmRCzc9@dSk6&;0LJCxpC7LMqh27o z25QU0jYfazAjXm61(_v)rDdVOYC7>rkH32-z`i1m_Pf(;|A1UESYC#SV0hH^SE=`r zhaAm2V2cuS83t|Xt;zvZfmk}}f83bMPTZIZfPi;!+D3WvD}RQLFG2A3t{~|DCJlhT z9;Ihytspf_4wW|bp%;(H{e5CR&e!p|n=5w8;Z?Dl=%09SLLMPLcq%=fSvqZS{&n{j zE%PP%2B6X_{;a1)reeUFA@q&ykLdv<=Oi31z#@lxY;J(Rf@wS~8}KK(dt^^+=3TU0 zxO2i#i6Hu&{L2o#6hO4ek}uHv6>p6`Dd~?+mtEp0-Aq&*ToLPqh8(T2x0|}avIIVK zXRq?3d&>ffE+OS{oA_51_{v|*rmwHhus9qa*Jt0kcMJ`AygTo2yIv(ymdcOwyI)1d z9*fMb^fAb=&fHhQG4+1yWkKF5J za@YW7V0e1&GcS{#+*B@)0#eQ25s~vamC39YvoCWg_K|zoHfyonOfy(kZcDC?1vxTG z`3*f7o08&)*$l&HHKB1I_tO^?M<`iph)Dw}8~m+_bs@E8^G>Gfd3LEYb; zTM5IndN6_Cp54+O1jR4kk$VNrH$c9)`&GNz=O1zEMU`v4hMawuhV(Aa7aJ@*p zW!><=s4Etne>6y99t;oJKx-g{o^7hx;TADi*GwG|CjVGgtKSQ?ET>j9V-#@@zlWdQ zj&r@udQ#5uTvSJ#R<&Aqm4Kz6+E!ZAjZd|e-Uh@&*2>>I>5pQA9$|VvnXeNv$1r|d zryz(Pl}9ZLj-&_>AzUdh%2$=ieb*nKvP;pW!r_AnbA=hDM0fSR62!i~d+ek9P6_+M z_%%JQES-ro9;>f&(ZGmP$erJb`f1H-5&sF*a}9c1Q72QS)njDydT(Q5Nm=_keN-G? zjBeGX1@~--KB0GjSLL&M*=XoYM_CrBYS(=_)|6+*S8oo-KYGdm`q4`yAspl))kQt- zSrvQ2Zw-=@f0ON9C~_knL3^Fylz;E8I^leEdZm1~dqWUvOq7;Cl18!2U-i6%95y;! zAvFYlwQdrEpElQbz&@&pz9vD38`OlmJ{D04a&3ma%ZcWIsQq}U=4*G+_*1iz{u3(c zROxmSVbKk)Gv5zm_{*W<31B>A=Wk8H?qS|9N{z^SpFz)a*e`EMHd}yB0lvpCYHpp5JYHl_&N)p^eGi3 z@qOyqOn8{&BKZn1bxbY&0a>g~dKB&5q6M*n$O4_hfanUPfgV=UpnW;M%f3QAKd$#{ zXFO>=|6#naT{eYkvW=?>bbt{zA0*5^_eVjd!L5re&Jvt4bR-toO<9X~5)Fp^M)GRN zkGqOTQZWejaVz_o#b%v}l{a_V#meZ4|o?zVtU<(Iq=I zY3n7?KroaqRsF{kb%i1R=OsKQBK%DGHh#hIb~&1kB@rNcH~ndj#u$E2xlXo4UQc>> z%s^llY3pSA?lsx95(C^qiE%B6;4*yS^x54+5+ah3*A_s)YkOK-skCLe<>E4;nlRMR z@P)W}m!$3TjuMk!SYSMcy3p(!m5M4=Ok5dJ((mA>ddJ5mK6qP8kV{a&l3`54gJ0Nq z=#Tm`s#rUzif*R9Anu3bI>ed^8Jel$u=RBb@G-JWh{qTb-#=iR@bIRy^DvE%FyF72 z9GgmU6`%i=w~Ns8tP+${UWGGsRta?I^Xutf_)=44Ro~{YxeXNvW&K%X$(kV(%o6Z_ z57w;AqGPwJ4GyQE^P&TH!f8s1`b=`-@pjFvD|lcXs$DkvwDUv}iTk*Ox9QURjNh~n z#sP5+S~d`iV~3v(h2ONBp@s2KeHpL~H92_f{=1oH5oFMN?cImnFy-sl>Yiyyf#M_4 z*Q7vn#EWdQUZBeS6{Z=2(zXpH-z^l=AA2UQ+YF}y$hNk>{0@1OcwEri898L*yuByh zUG#WAhx_h{jC17~LHY(ZrN={d4$9txFIgMaQ^%niaiH>JcId--9y>nuH{^UMQObvH^)&ty<<~vU+;^23^$SGEd-)%X@o)TrL`mGz$;MzCs*` zvdanXU8PZ>eg=ZA4nmd*ORU(S9!(Ih~MHyH}=+KtG&4(jtVA7Q*e z7EZd|yq6Vd&^e7%wRTX77Gc4vY5<&{&m>GKMdLT9S+LA_^~XxpPe0p za1up9GG$_kIAQyeWMZTj2S;WwaA>BU-4HS<2H7m)>I?L~a_fn@>IjmxLUfa{X%mL# zlM4SdZqWL2el^i$B(Ung)=XIl?RpDt3MNHH_bP2S~zc z9An>IJ%8FcXw%oZcKG!v!I-pswMMRV%Fd3H z_;TdM1z{R@jgEXeqM)=i`{{J@P2A^w4h(7R7`t*AK=zjOZNqq z7NWcoPvs46Yl-xy#6Nt-*IgjpO@x%(u@vq;e0F`!Li^V9v*-ZluMNDGgqOD*Nq?jS zvO|p(6Dh3czs{0L=pQ7JGe7^U&n9f-8D^A#sHs=-Cj1yk?BCvmuE$Pu&=Hl_|E4c= zEBdfmC0>qQQZ!tG=b$072U*82z?vfdMMW_+8EPjXpqt?O*9wbjm| z9F3Rp@8*XgT_QKP)5rkCVE2*ru8F-RtybW2ylC>Dl3jKG^=E>Fi4Skl!sM^+9w)HH z8`xr+u30qk=9eWe>95(*JU?WgtRG8>hhA)&6OYiY2H`wob?cF+-qqdHFG6_W$Q3eZ z#=-C8o5dpUIw;D`obm{wJ~r-VEnrgy>`)r`f&7LOJcYLj_ErbjO48K-c=hkk(hLJT z2J*z-ARE7%&9Jk#k}z9mO@ji1$YCjvg~iKvuC5eZ{-|or7{73?(jQ1z0YQ^9y|RvM1u@3yUvtEcegSDU?%8Qh)QRFfr<7 z%*)uMtLl5Aok0qlx%hDfO|m5Wh%6GNoSyuoxh?0&ku$N&lSu}C^CSy3T$E+?lgH%K zLXg78xnMX`$ZPWc2RBZw`Sz$OIcpdule)s(IL2bl(5yGz=af3Mjx?#T>nlsW6YbCs zb}cmR@DgqBYFIDoTnxkC8oX?^5LIXCj^kr0QhHWsGug(c{_R<;1sBXp%al(6VY>R9 z3uN65Ql)FZKfFdD5pm4|F?B#-cPA>3>xUTXGt=7PpbNtl2Dp7vv(KZ*6R^LZgrP>& zEBl%nql?F$)V&`6g+37q|75l|=8<|j1g>0ycqhy~%Aax~=1Au9qZZR<+$s31m;dAk zfC9)nT19}wwBcG093FwpFKTbAVNszL#7qpho+D5=F9FXlN2;p|8~48z7K{8b!1Ai9 zshb7Fh7yEbJNVLiRQjkt61xvB=GM*v9XRmc zpAj@PRF#M2@)(ueCjkkuK@2_q4G>+OZRVL3f0_Lm9e>>Nf%bWS!xvP79q0! zB7K)Lb5Z9LcbsNg$;wXV!Y@YbnnJMQk2PmqYO4b~TdIW*t0M5<-rQogSOWX?tK)ei zp&j+mPKnQhmbgJ7AZ8bKf(fd>XM9ga=iUO#>TWYC8f z`OXZ08n9bRFBDp-vTf~Vt9%Sk;dY&7p7cFne%k*rmlTqDs(-uU24;V{bhxt~T6M~u zEUxSw{WASWqGkMp{PrjQ0BAaWARp)j`mF^(+V8zJ;}@fQ=iI6u4uL#`2od^ha}k*H z1NcOX)-ubc68Gfmj3?kXU)e$T7f5GI^p*vX*oKj;(2MBADf9V`v#Gj<0L|#qEPUWx zN1gu$e77B%9*aZYI)b3+PG;`;8(CUU;@I zT~Y;VX=(E76cutRA1*7fd~+aXj|4=s_RrjH^Q-<>gPhajsA7AEK8)H`0c_l2cK^6 z1Bond#E+2Mrf#Q}ME$`pZZ8FOh36}YMDS?_0~t~U{1OgXOc+}K@gkdUIQyB{B|%;- zCL)5FwiJ&wwl3P_4d3b`QoW)GZT@_!6-uBdkl^vf%zbOON5x)|Dd48IfoY@ohYhq% z0s-7&b8Savkd=dnP_~FbM2(fB19$0~ak(`seZ!q0=V2wLwu>7_x{5jYxBKw<9DMzK zE@%jFsMa4I35%H@{eo}uC4>iwuiY}{rhikks`O$mM495Iyg5KtNUSZ=pSoV>RrO#4 zPFAZDEo?KXcZ>k2!+(^)I(!*4HsAE*i#V6NmKBndnah3Mo_fr0Z;}nk?!CFV)?A}6 zQAG&Z)phUb&|){)R?G}zy!J2u@lKN$&C}m~jQGt^+#|=3&tKc2&6aD}ur=CSCFko_ zk|N3&?;<5T^8}&oI|p8geO^u+AxDhEKc3wRRVJoRRVU|Q{;U<2+Hh9o1^OX>3cVtC zWFakIp(a5H3jR7~-xiew-Clo!Q9S#rP`f4^&Y6`M6o_(XD6l zK|WkL_s5Nv)}NFn#`kHp!5-7;0mLAo=bMweJN?NM&Dxh#sp_oxUF!ZU6`HU_QdQb3 zUcgxs0UBHVif)^hvVP6Er_&4K`SUh&X`Op6`}dPhlu1g${nL*o8Fm5s+xtXsC+*f3 zvAd+o+&kPkT)*z+e~^C#4f{Mx{dC2F5nrg)thE8YV8GjbDLdC6y78o$DJEUysimD@ zz_UWw+dA0UqPwp%kR)`;l3eJw*&8frHPn*J?vudY7#?t4o%3cZFfDAVt z;7J>3XMfzuK(TX-Jw+1!QqqsjNc(z^i1acIqS+uGL2>rh6C zCOvi&@#fKk6(Ep3y*t6UbD17DdJLGOZB-viE+#X(~dB0l7APlvbKYF>P*@}NkAa%}hdpSiF&7THZe+#)~kvk13FHJMMk{qH28*P_` zk!IAwHUaxN^bDsz#VS@-Y6J3utn*8CJ^_I1?+b_q-PynY&0FlYRqoOOV>q?zP-Eva z_!9-s$9BKJz_AfgxXvhDg%F0U6o!)|ittSV@0;Oo0@jbhJFF9W`##9Bx%@u1l%N%4$9YdC} zDSE)R!{kLe$6m0=W$((LA~8Ri@$T1U!940KZl%TtHdl zf!I=9T}Z`oZwMzzb_yx*y@wxUw_j_^(P!V#2@`tlJKugdrqvJmNn-c@2MSGa?_I@5 zhSR|}_w=31pC5Vf@D8iIw_Ha(f7*ZN^F?8=!S?xoIc!nv7@VNHG}0vQ%b|1Mi32wZ z^^ATi@4cN$&bMXIs|Dh|6oEt_^z#nmr_v;ytfCowmod~t2wR_zIa~~E-+AQCyk7hI z9uVhi5`zny?ts_>4`^!Am}&I8R##WDECW>VKLtU94;Id6%;9mUq?kW>Ru@*wXEhsW zg-l8|2eTyJ zO_@s^qvw_*aUZTxYu}(2M=k=DM+)9wGtBBf*zeznwwROu(gSVA7e3ZrTz7n#e`8AA z&Hf{;z5V*nSFvneX~l9=#-x99@K#IUs_q&xY}oMMzYZJliWHH z!&6T7?==lGW(lSo<-TMvlQwOJBD#d=+fz<8ZeWv8)8&|!@PZnozJES};8vw7g zbKTrl^__a8lMh}iuU*Mzs(<O23zW^p;~K0R`wa1fd;OmIk6cUPDX~#k%Yf z2oJwEFv9tVGo-hXrR_}t2()nm>Cv>CIC9|J{-sY1`FPx5^)vHH{{znY^?a+1=Gr;# zCt{=$4=;oke3rmJJn2`PkYK^Gyb?tyT3SF_J`AfB2PoSPM$BzoBx=#hNn~OWmytb+DZ%fxv{um0H_JXtS4Y8S=HZ9+xc$ugdWb4K<( zkMMoJ1h(CP-UX_I!z1l~eObP{z7LFuy^a?I56{9&O$5UwZ$iFkNwJE~JBwth+EoK$ z(8JAh+1ky=l2@DqvZKcqlWvwi?9=mc{A;`tNE;BUkXxH3zMd7KA8LwA>B12;Zxf0A zkBOW0?$FbnzQ~*Pgh!Y=N~z<~^G%4&2ao?ZfeGQBM?niE!}z5c@w$dTN=%y0K$}YY zQZsQTy6zE1${4aU0AXFAsMJgd-*6_oIY`v!^YD&0Umwx=KNHoF zpyz?GHYR{KG!^rES>B>8F>_4)1O@$5no!OX^5P~C0;r0u8DY6H=EobaMJ|?DKOWGhF z!Ptj4z3D;n=8+(le&G0#p$snGPD4+}Q-X6zVolOh4$M8 zxOacQ0J6h=ISUcblY76;R8_?4OwCS8USLH1C++50UKS~0!?XShn=R%rG8D^=H>Ru- zd@0`r?IKv(20OX@F^kk&UDTw^p*Q!!GEBmKj0oq)gbA5WUu^H^2_xO^H6|fE^eX0B z4{$atyO<^}nJoXj<(?Y73t6Q?YM@}A`=vvqr|`VK^C5rmmR@{Gt*uQ%*zLQT&8Isw zQkw>sIW|IoJ}&P`I<*fAn~U$YS40I|{XL8A>X$_1qDy?c+?WeSu21~Bv*YaA+{Fc# zBg9{|VU{;wANmnf8mktl+(kH_Km672Y%VNqW&YpGOm*-yc)U)1X88PiGsQ`;i#C>&lQ zdLCBtg5IXJZZ56}5mqj(l*eYlp&_%oSWw3pAW>$#xWAydJ#81&z~1m0Qpt&C*Bac` zkvm0Fd_Dgpq7dVDpyqmXp)gOS!16gVWZnAmXB+hk zXGvLw`pTR_}K<;B@@eiKkW~+(yd50`zh$sd=jq6#wdT`0hF(UI!lmx+ z@6^|;Qwvs-Hk7sn+?tpVf@>>Id{=0HxU-#qJiS#DW+y?i^PYQQo!dO88oFUVb1s6M zl`JKkU&rbE$##8sHa~a5HTcT@gEpPK!n*yW|5={!+RgoD5mH#e-uqCT&luL_FO)gy znuSxr-Rm|Kwn!r(eiK|u+&+H-3x1c9+{!fE>bh#Rz|VR5s1uQ zFRllat&>07u{G`1=yOJ}dsJ<&CC3n;&w8AJ-mlimB5sxn)%02fsO!1O=OgTl=ZVm9 z!~0vVkmZJn2N(7%7+PCpEe&%Gydh5PM+tBGYAs7L7`v)T+$aXg>^dB|3Q{2-5F`!= zS7X9FT2ryW+$ND)@MiGiYpa(@y#32M!2(Dk_VcW3nA`Of>K~={LSY+d@9>VEqr9%3 zr$jLrb`g;m&YOoywO??q^Z2f`fXGUS&o`EnG9N1ecxi%6r|X;-XY2SD69!w3|BZVx zKiz(CQdHYKuW*oMxB<5V10Qcx#(c_$o`TQb8LeW=W*X!E?wppT=nE`)9-hsXhpEv$ z*QsJq2Kq@x?1ZfS(M3TOhYD*bA@WGz5&3+h8LS+7<+W~(?=K&JIRt$f-bejv`W0m~ zG@m>5`fNpQ;!Ov_hZdWg;DvmgG5dncms{Im^_|B|?$DeMKW#H}>`Ck&r8j5e=3ju0 zcnKK$qU&>6%BlVb4m$m>!8jijj-9uzmP7{DBFWw?_z|c&-W$&$i-((eCf%z5uL$D# zL6eykGxIy`RQH+PWMW!%lJk?TqfxR;eKMTvUr$-7ElB4xqaBBUeg3-V`KTfwiR#o$ zR}{R5ESQ9>hlwJo4e?)uCP!az$J9>jLQd}NRyIsdO;VS@pH^VENL}^Vtu`)`Q~XWb zsNK=T>1hxJ)_z3tGq<$c`$CJe&k#PQsPXn$YCtsIo2_Fwks!0Wy;#fg(Dyhu{C5XM zC0d95^dOZrqcQOU{e5oR6j3hYQ%&bT%|`@#&jM@1@;9C?-k@=Jco-lDT(zA1 zMZ>Hh;%56}|I)9JU(rCh+c0MP(iv2Np{JRH!~UJV=D>(I-Ozj6h;OzK#HAML8rQg@ zlC9u7ze1Lgs1#a+^WB)6;pO30Trd%^F0n9FrjR>bL;mO0h=eU$&S1jH>u*q`*H6w$iHmar}lfdonCSyGT~Bk$-fH9Gp%GbxyPeoWo~ zZ42#t!Z$LnJh3~XGDbDS`)H!gwtgSr66US9cuWxib*x(DgBO>hL4lvAvV>R>Bc4Di z2xJpDfBPWo;YIPoUF$V0v-zss&CT|aJaKyc{>xhXZS;XJu4nh^aO+n+i%vhfnbgOx z!Y_C4crRqjW!3p*=jqd{4t#4HvW{0bQ$9m#s-x}50enHQkH7G#91`R|m=v~*wuG*O z$})du`_DM}Hx0)nA<#Op=RhZi&02d*C&fa46dqBFe!j4c?FKKNV8j%5Va*`r_=572bDXwLR^>oDNAGbN71xW(KR{Q+MzdfugFyoQ<6f(m*rw`+9ROLOrQ# ztT?3=0Ht&q|68P=fyFaaz(OMbbr8c@UfqH9@7u9l1A(ySq-kKR;v8-oA9RFqMrvfJ zZt1u+`eR7Wr%7`tFS6MM0vz=h((X;|qklEkGcGv3sRa7qVUHpWa_~T3tVA7;edXAD zT|BqZ{&18kvZC$xBQ&^6*ZZQTH>%6(bgM6{(m#cVPxJZ_$mWsZLDSk)dtwxU;M(FU z-IaEuWarSXE7%)p3zEqN1wYIWJNLwjL&Hj$=czw=(#LL~Fq0RxF*V@Qg%URkhSNPV z^My3L`UQa6nYrF^E-YQNZj(k3m&|u{9)W51G;b%AJ-!fW39~=prHE%YSksTsis8`ncm_F#zJ=eQV4N6rvuF?oUYfFB!rQ2+H1!JPGFWZ6u zla$#zaSGL!X?-khbJOddXASeY&gHvqlh1pMx2YWcz2jnNO*YV#p@4_SlF~N?4&}x< zQ6Z)_V@;fG>uQC$gQ$S2^x$BYC;du3~3j6_%Ii+kY0K=dR-i=g|nyIJMd z%d<9od)Gc5>^l81G*X|#Ps*%KuJKe z)$%pn5eW3Tcu85+<2gW8gJ^p|s63DjZ=DtR-vvRK!=1}FwdA=SlpiNq>iW;D1U`+} z+K$^Wt*pA?%Y+_HRGa^$%^iV|h1Xa6gjcK;HVx*|SWkLlME~sH*}nzIBSI1Q%BO_Q zp}0E~Njdm;r(XwGpVl29ydd-|n5vtmuY^MY0K-EitmDM08q2*#5I+y@nEugQ{uXTv z<|T2wilHV`!&A^h#|+OZt5y{WI@clngT*0yGF+arYO}u&!bXlk@*-WaA~XtE&UG-<#Y}BfcMjHz3jKYlpr)3i$n3Wec8Y zz62gH1|dd-AVE$3Fm903ssN1=^5RxAzsoHu571&4{ zF6|0qCW(gsZedm0_SU#!-wM_G`q5XM&2)EV)2X+dEFq(}1$8E)+lmdxYQP`1*MeDe zfF94KzvueV;i|^NhNUN`)8trm(K$gl+*OeC5q=E?=s3=2Tbvy$9_eRGqYd}-KV4RH zGRB9#T)$Yt{J{#jUV<4Nx(Z=~b@APvPW)W`Y$0jC4OHGo!@a)ngdenwOM$#1R!}KA z1T3Q0=q9#$w{NSv+}t;VPj_}!I3Aop@C57B|D^sG{5TTJb!##uMC-{nG15< zTjkOs!7hAt_N>yo(XnshzE$fUZRh8bYcJ!Ek*?qUi2Vbdj=(2|63naP-4fcHO)ra> z^d{g`@LvP)$1|~2=k3mC0L&(94fIqZX_jL?k+@4$O=Q6S9Q7yoc`BzK@g)!EQz#JX z^Cl;_`-ni!kn_C?(D6bbEdD6Wv=z@|nM}a=Ywy$>zvcxKT=MSid`IV651Vr})@Fpq zt#Usg(>x{?Mc#uureV?b$~zx)^){dt)j@42G~FIMAQ;yTd>U;+3v1x3Oj7GLlr6_7 zvGz|gt|7`#k&oILmbqtGmjN|pRU>2=cwrmQ3N^)PVPD9e;GR4OFI-WlPybP;Xr^Le z5X$Bs&+iw_MrhR`_F!ahd-Dt#qKC~s+HxJB1(5C9?{v>``CQic0+26pknb&ORglt?k-8IG-c(6dG|6hmdD#v8 zNYvfuoE*2enV8D>z|bi*$nYwz$syrbn1MLw$iPaq?s_!=;6Ut8T_v#SA3buKxuOO1 zt*>)SXwD{#DR|fj^FuXY82cZ$Mjs8m>4$VHIN&x=pl5mzIOakUYd|;BPP* z2~H9QkF+@W3PyC0>MNmdT>CwBmrJ>p^%C1{4KreN{Uk&RV&C0SU0(lDFOVS~7$syg z!CEB*?Q$J@%yy-}9J6Q>6i^yYW1SDB>I%4%r|%L9EBQz{a>Myf_!76d%)N0BM27FDv2Bi7E0jd8G0)9m&sDfxaM{E=xKdeh$ZjI(POmrbAhgb z>0p^p{L}@ar6LvZgCyRwNBQ9a@;-S5bNE8NrAo~xvZJvzZ;0bdw+%BthaErMbrTyz zE)K!l8XR%+mQ2R2w|1jwUd;Qpchxv-R8I2*(3T=R@RFw1GF4UzOySrVWuOqyV`xGD z_494e3`yxmBFu!>(d6_!JezT7$Q|5w<{m-`IfL6rFg}I*?(nB90+s?tSPErl%TJ$oIr;{;O`d6+C=*wxYQu5r#Xm;ITc^VFO1NL`e9RbTE4NWw5gEQrdIbuZ1 za#Z5iBseHYopi@LkfvqQlTt{}Bch)wxO*cXErl9b!9ee_dcxhw*D1Qg;Zb)j)s17E zulppSv@(Z$CstZ9DIL|p;;yoHI{K1$qguTDY)L%#%Y+Eyv!toZ_Q<)}rqlnY5TDb3 zn(DcqjGoG`iSM($EG5y@Urm~5-;R$NwndRdfT~1^4`(W;UMH8)tfw7P#yI}{j|q0& zxMG3~uN})2GW`xF@ zyUtU%%Tdnkei`qXIWhB`=B1;7Tdse{=O2N8hcMdB`NRb!%08biTm+DoNf5o&_BuS< z!}%vS#!>npOa1tq0Rz@V?+ex!hRVQlx`0akRW#cLn|ajCcOP(OG}M#@1C=^l;Olw| zvYNY6XMR&Fq*a6=LepZ-S2m`TQTqM>MFROq$isQ?XnL0GWuv8?Wf4Kf!-yS84(Q#* zS3V+)W*~luI>&NVLvS!7c)lpnY@1UhH24w|*1GTHA!?d~iJP0|EzTQb{tf2T4DxAK zREPchNAaK1tux#g9R#%0|M6_HqPPvj53<%oKnsULkbtPih`X@>QTu$pP)mL)LcAE@ zOpn=GPeyWg5q$sD7cLN|J|F$=X)@WL2Wel=_g7RsOagiMg50hn77)qws*8osBfY%L zK`1c-_dJ5ZEgjDzacEo>Hx8!qo^>PgLw?i%t;tKDhS0%~M1emix~lmU@4jgUFhSw7Bf) zym8mzI$Yg(^XtTXufd4Y8>`iIj{?)%dB0yKL`#!=1?xtidn}qEOC6!?DgZY%J`yRI z(;fr>Wx8yfRzg{KioNtPWD$!7{xUDlfAZhJ>ncQrG-P4^8r6Oqz2$rIALk3muCtdO zt=Ri_yvXtXgt&>g%y zy~uV?uj4Abmsf8A*s9JTexUB6b9PiRDNTd#rT|xRn&Pnr;g>B>hO7G6VkwYpx;R3X z4ZPf2{YFW5RK=)DT!;!jl7oN)P0DTVbDBQ-7&xj`H4c-nX4T8K_vemY5ORkSa=Wjy zik)+3AZos1cHi&hfYr#wWHbGu{LAh%=oG9po;D?CB#7Vol(eZuetH8?9`36{oeD}! zOzUIo&iZIDkz!Glwx$g(w{|S)g5L{jY&2+K>2GiwYFh~gT$m2Jfz_05vcjTwl|YvT z=SnS3x7;8=J=&N?`~@x?YDvJ1Y2;2?`Nzn6&4alF*R_eKssR6h0~kl(h}(rPH###Q z!m?=e-U_`u+fFqrz-i81Ft#m0hQC6_02cAf1YuG2V%;@)l=PW=JP@# zI>J&}YXiPT0k-^&4xFPxqJAo_NWn!o;BF+`hIj+4!tJKsdGP<;~fDyuq#< z)Av31O$JX$Gkq?BYT3_tN889R(ONddYMyPRmiv|0&Jw4ls?uFUc1oQP1YcKR7V0Ai z%d#!vfCU6~#YIF)gkh>M$t3bsj*9gs;dmkP>pyqVBqk(Wjz5>Smgj*X9R-wWaph^==HWbDU~?JoNZ2yM)7UQ?b+G z!ZLV-ZZlPER78&fX({_WoYa2Rt$#a?{W^gv-DoIfS#wU%vy){{7OtQ7qKG9-8F)Om z2|R{DFtxj&c9s4bstfp=K2>pv(7YyoU(Yjw0dHUtfQ+h&?iBIK*HmrE;-jg19Z1cn zce;U0cyO47V?xbRL!gYKn&-JeF-dOk8mCojL~oK)Y0j9)lw=BMJzq#0@Hoe+oQw+! z9dnle=^xJ8XcXc5V7?FD_xtwORl*Smx;dyImvlGHxASA9?c$#O{Z%{8;~Qo_A&~Y~ z-^<%-O+}8~AoHt;lL{wva(iQ8}Yj+pX@rLmZ^aA3EU!TwMao$_rx2k`gdG`Rf>cg?i`3d21 zf%-LqdC$Myj)(`?Ji`A>m^P&_ox-eeX=C)k8bBwNC_4TR4dX z7yekMC@^hU22_(zx`IGw%me6mN(#pR;ik=TG-xuo9V~bpqn#}JFang?NCB!^96QPG zx(iHyfOx{4I~QZR&ffQ~-FPu}_oHnd+Vj7Bs$OgBt)3_bCoJK*xIYGzVq}lfwBm-GF+H*>)B1*+55f~>F!u*rwuB!C^!ql zx2a|Xu{V;1!gA;>EF@Ui2<7yA$;xx?!Pw332$I{3porQ6;su;0xh5@$rTEoqJ_b~A z<6&*68>W7T?BDElP>6JqLH(hFgE5`!cdi+vtkFkxsS?gN%2*@zFqsnpnvpTEu9Ue5-(AAjTp zht&ZKMj7s|c8EjY|2A^p&K@w#sEMtSR#fybp4sV!8mICI(ueh6I5ZtnA(joiO_A>Y zB42+&M>uA05)6JMa!NO)?jA=MPv8}&q@El%90+kR$164{XiwgIFn(LleY`3M|9d|#_)t;o@AF_>aX%rB zf5s6ov42h#DXQVVrV#j)9^lZZ)4A)qh2)3@6&u%}V>#-bbIg@%jJG@?w9o=H?YgbPe$Pny!AIPHtko^ zhD39S$;{;YxDLUu#`*pE`81?2)=A<^=Z%8NDa|!v{)Fk?zaL8E^#R1fLLMwi1i>H8 z=eSim;*aPl>NCUuaBpF4%b7t59j|5|Fmqck|7riNlUlC${p|bo#+bI*ud{df_2GbN z!|;Uq(su_tl;)7BTLS7e~BdZ3>9y0C$U#^|EVPk z2Id~8+$yEs*?Y#8@@-w&E57gP8ce?~9ub7thsDZdg;v+jQmq6t|8`vdKnR>?- z$2CXg!xBvD>Ue9Mk?67--Bv4R4GkWu;w{ zufH$Jx@H>~u8?5bP^R3o!}+DHBR*3UaE`_I9CaVw=>Jv$f(>@CxD21UxknRCyzQcV#@AJOD z>-&d`Ke%8H=bXLQUVH6ze6M%{{r|T51}<;kw(z}tF+B2p_K~z`ufea6g|Hv(m#Mh+ z>$M8Q@_rYdaphR&tH-m1qgkc%OfeLt8n;>eym6mB8rcis3exy6BB+XRd9Zv%PS9g- z)EG)oi0L{|6_3<8RUm&!QoL5if0`K42g0chR0Zp~RM+eWU8cZlbF`17T6V18hW@ri`x^_dRhFzDD-|NBCyk?JDL zh-BZGX~vHbOylX+1X$H|05Iu}Ej^Pf`r){cSnQnlFXsVTqABujs71gZ?4ueKA&(Vl4drC=? z1Q73zzsxgOq<^mD#p?Zujn}D23jfAYqyLyuMU8@B{*kvd#Ck}RgJu`pg$R`mk zY^DCi3`lA@Qgf4AreBJgKk3~5hJAu;Ywy_1Uc|ASOt&TxjV9Xbq5wISfyn0`iD<+G zBymQ3uU9^uJ>vuW&xvwrLxiz<&Et?=h1*mqmNxORg!xd_{y7;hn(Q;C{XRDgzrEb+Iv z%Q9=FJo@&7Yx*0AwN9i@C*+D6{&?+vi~aI=LZ47O)G&@OxS*pnXDN}Ax`PIPQ_Swl$S{@R!1A;ee04;kRTf+ zI?{2u>5d^l>Zb1~_IBp#JN%-d(vx|SXS03G6qSmto&G7J=RPdnj$>2aGUWwJnXzBpEGmd4%kMTX!l0<3+?Hy3>nQ0 z-&aW?h&Q`Cp$NllUPOVIA1eAVt*+<5MVZgJ>&#N5(IZ8oVL#6|5!}%g-9)c^Fn+wY zrdpGK(v6GosRNpEI9Xyb8b05Vu6Tn6; zmh8Fsvd`&FwV_qk?7g7im21FPcXh)}3Nf>(`J-YPGD61D;z#+URuZA&H%xcE+3xWy z$XqTB;YTFee7nta)GDQ=jBNJ8fEwrAk1R41=Wbr!Jv7?Hb|2@PyIRgvd>C(#xmF&& z62V?$1(C%Q5ALB4uNL(%Jrx5}}#1U%3vhG}|9jp4Vz{__+(>~|& zvyP=}VUUSOj@ATw4vzvrE3U)3Jeen9z~U0b9Eaq0g`Dk{k`U&<>g|HbIO4r7o^BCS zn1j;~^Izk8!mS?hG;qg&LFQ>#Tciby?&r{)D6CV=@dlf}S;~UT=*ViSh