Skip to content
This repository has been archived by the owner on Sep 9, 2024. It is now read-only.

Commit

Permalink
Game packaging issue fix attempt for UE5
Browse files Browse the repository at this point in the history
- Try fixing the packaging for UE4 by removing the default FilterPlugin.ini file
- If this doesn't work we will have to revert to have single FilterPlugin.ini file for all platforms
- On UE5 it seems to try default one and then move to FilterPluginMac.ini, but for UE4 it doesn't
  -> I can't find any configuration about this where it is set to choose which one to use
  • Loading branch information
djova-dolby committed Oct 5, 2023
1 parent 4b136e2 commit 9a7acea
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 31 deletions.
8 changes: 0 additions & 8 deletions DolbyIO/Config/FilterPlugin.ini

This file was deleted.

48 changes: 25 additions & 23 deletions DolbyIO/Source/Private/DolbyIOModule.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include "Utils/DolbyIOCppSdk.h"
#include "Utils/DolbyIOLogging.h"

#include "Runtime/Launch/Resources/Version.h"
#include "HAL/PlatformProcess.h"
#include "Interfaces/IPluginManager.h"
#include "Misc/Paths.h"
Expand All @@ -24,34 +25,35 @@ class FDolbyIOModule final : public IModuleInterface
[](std::size_t Count, std::size_t Al) { return ::operator new(Count, static_cast<std::align_val_t>(Al)); },
::operator delete,
[](void* Ptr, std::size_t Al) { ::operator delete(Ptr, static_cast<std::align_val_t>(Al)); }};
BaseDir = FPaths::Combine(BaseDir, TEXT("bin"));
LoadDll(BaseDir, "avutil-57.dll");
LoadDll(BaseDir, "avcodec-59.dll");
LoadDll(BaseDir, "dvclient.dll");
LoadDll(BaseDir, "dolbyio_comms_media.dll");
LoadDll(BaseDir, "dolbyio_comms_sdk.dll");
LoadDll(BaseDir, "bin/avutil-57.dll");
LoadDll(BaseDir, "bin/avcodec-59.dll");
LoadDll(BaseDir, "bin/dvclient.dll");
LoadDll(BaseDir, "bin/dolbyio_comms_media.dll");
LoadDll(BaseDir, "bin/dolbyio_comms_sdk.dll");
sdk::set_app_allocator(Allocator);
LoadDll(BaseDir, "opencv_core451.dll");
LoadDll(BaseDir, "opencv_imgproc451.dll");
LoadDll(BaseDir, "opencv_imgcodecs451.dll");
LoadDll(BaseDir, "dvdnr.dll");
LoadDll(BaseDir, "dlb_vidseg_c_api.dll");
LoadDll(BaseDir, "video_processor.dll");
LoadDll(BaseDir, "bin/opencv_core451.dll");
LoadDll(BaseDir, "bin/opencv_imgproc451.dll");
LoadDll(BaseDir, "bin/opencv_imgcodecs451.dll");
LoadDll(BaseDir, "bin/dlb_vidseg_c_api.dll");
LoadDll(BaseDir, "bin/video_processor.dll");
dolbyio::comms::plugin::video_processor::set_app_allocator(Allocator);
#elif PLATFORM_MAC
BaseDir = FPaths::Combine(BaseDir, TEXT("lib"));
LoadDll(BaseDir, "libdolbyio_comms_media.dylib");
LoadDll(BaseDir, "libdolbyio_comms_sdk.dylib");
LoadDll(BaseDir, "libvideo_processor.dylib");
LoadDll(BaseDir, "lib/libdvclient.dylib");
LoadDll(BaseDir, "lib/libdolbyio_comms_media.dylib");
LoadDll(BaseDir, "lib/libdolbyio_comms_sdk.dylib");
LoadDll(BaseDir, "lib/libopencv_core.4.5.dylib");
LoadDll(BaseDir, "lib/libopencv_imgcodecs.4.5.dylib");
LoadDll(BaseDir, "lib/libopencv_imgproc.4.5.dylib");
LoadDll(BaseDir, "lib/libdlb_vidseg_c_api.dylib");
LoadDll(BaseDir, "lib/libvideo_processor.dylib");
#elif PLATFORM_LINUX
BaseDir += "-ubuntu-20.04-clang10-libc++10";
BaseDir = FPaths::Combine(BaseDir, TEXT("lib"));
LoadDll(BaseDir, "libavutil.so.57");
LoadDll(BaseDir, "libavcodec.so.59");
LoadDll(BaseDir, "libavformat.so.59");
LoadDll(BaseDir, "libdvclient.so");
LoadDll(BaseDir, "libdolbyio_comms_media.so");
LoadDll(BaseDir, "libdolbyio_comms_sdk.so");
LoadDll(BaseDir, "lib/libavutil.so.57");
LoadDll(BaseDir, "lib/libavcodec.so.59");
LoadDll(BaseDir, "lib/libavformat.so.59");
LoadDll(BaseDir, "lib/libdvclient.so");
LoadDll(BaseDir, "lib/libdolbyio_comms_media.so");
LoadDll(BaseDir, "lib/libdolbyio_comms_sdk.so");
#endif
}

Expand Down

0 comments on commit 9a7acea

Please sign in to comment.