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

Commit 16e57ce

Browse files
djova-dolbydjova-dolby
authored
Packaging improvements + screen share crash #419 
2 parents 89aed11 + 7c13ce5 commit 16e57ce

File tree

9 files changed

+87
-23
lines changed

9 files changed

+87
-23
lines changed

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ permissions:
99
packages: write
1010

1111
env:
12-
PLUGIN_VERSION: "1.2.0"
12+
PLUGIN_VERSION: "1.2.2"
1313
CPP_SDK_VERSION: "2.6.1"
1414
CPP_SDK_URL: "https://github.com/DolbyIO/comms-sdk-cpp/releases/download"
1515
PLUGIN_SOURCE_DIR: "DolbyIO"

‎DolbyIO/Config/FilterPlugin.ini‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,37 @@
66
; /README.txt
77
; /Extras/...
88
; /Binaries/ThirdParty/*.dll
9+
; MacOS
10+
/sdk-release/include/...
11+
/sdk-release/lib/libcac_dvdnr.dylib
12+
/sdk-release/lib/libdlb_vidseg_c_api.dylib
13+
/sdk-release/lib/libdolbyio_comms_media.dylib
14+
/sdk-release/lib/libdolbyio_comms_sdk.dylib
15+
/sdk-release/lib/libdvclient.dylib
16+
/sdk-release/lib/libdvdnr.dylib
17+
/sdk-release/lib/libopencv_core.4.5.dylib
18+
/sdk-release/lib/libopencv_imgcodecs.4.5.dylib
19+
/sdk-release/lib/libopencv_imgproc.4.5.dylib
20+
/sdk-release/lib/libvideo_processor.dylib
21+
/sdk-release/lib/model.dnr
22+
/sdk-release/lib/video_processor.model
23+
; Linux
24+
/sdk-release-ubuntu-20.04-clang10-libc++10/include/...
25+
/sdk-release-ubuntu-20.04-clang10-libc++10/lib/libavcodec.so.59
26+
/sdk-release-ubuntu-20.04-clang10-libc++10/lib/libavformat.so.59
27+
/sdk-release-ubuntu-20.04-clang10-libc++10/lib/libavutil.so.57
28+
/sdk-release-ubuntu-20.04-clang10-libc++10/lib/libcac_dvdnr.so
29+
/sdk-release-ubuntu-20.04-clang10-libc++10/lib/libdolbyio_comms_media.so
30+
/sdk-release-ubuntu-20.04-clang10-libc++10/lib/libdolbyio_comms_sdk.so
31+
/sdk-release-ubuntu-20.04-clang10-libc++10/lib/libdvclient.so
32+
/sdk-release-ubuntu-20.04-clang10-libc++10/lib/model.dnr
33+
; Windows
34+
/sdk-release/include/...
35+
/sdk-release/bin/*.dll
36+
/sdk-release/bin/model.dnr
37+
/sdk-release/bin/video_processor.model
38+
/sdk-release/lib/dolbyio_comms_media.lib
39+
/sdk-release/lib/dolbyio_comms_sdk.lib
40+
/sdk-release/lib/video_processor.lib
41+
; Android
42+
/sdk-release-android/...

‎DolbyIO/DolbyIO.uplugin‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"FileVersion": 3,
33
"Version": 1,
4-
"VersionName": "1.2.0",
4+
"VersionName": "1.2.2",
55
"FriendlyName": "Dolby.io Virtual Worlds",
66
"Description": "Plugin integrating Dolby.io Communications.",
77
"Category": "Communications",

‎DolbyIO/Source/DolbyIO.Build.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ public DolbyIO(ReadOnlyTargetRules Target) : base(Target)
3838

3939
string[] Dlls = new string[] { "avutil-57.dll",
4040
"avcodec-59.dll",
41+
"avformat-59.dll",
4142
"dvclient.dll",
4243
"dolbyio_comms_media.dll",
4344
"dolbyio_comms_sdk.dll",
@@ -69,12 +70,12 @@ public DolbyIO(ReadOnlyTargetRules Target) : base(Target)
6970
{
7071
RuntimeDependencies.Add(Lib);
7172
}
72-
RuntimeDependencies.Add(Path.Combine(LibDir, "libdlb_vidseg_c_api.dylib"));
7373
RuntimeDependencies.Add(Path.Combine(LibDir, "libdvclient.dylib"));
74-
RuntimeDependencies.Add(Path.Combine(LibDir, "libdvdnr.dylib"));
7574
RuntimeDependencies.Add(Path.Combine(LibDir, "libopencv_core.4.5.dylib"));
7675
RuntimeDependencies.Add(Path.Combine(LibDir, "libopencv_imgcodecs.4.5.dylib"));
7776
RuntimeDependencies.Add(Path.Combine(LibDir, "libopencv_imgproc.4.5.dylib"));
77+
RuntimeDependencies.Add(Path.Combine(LibDir, "libdvdnr.dylib"));
78+
RuntimeDependencies.Add(Path.Combine(LibDir, "libdlb_vidseg_c_api.dylib"));
7879
RuntimeDependencies.Add(Path.Combine(LibDir, "model.dnr"));
7980
RuntimeDependencies.Add(Path.Combine(LibDir, "video_processor.model"));
8081
}

‎DolbyIO/Source/Private/DolbyIOModule.cpp‎

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,11 @@ class FDolbyIOModule final : public IModuleInterface
2424
[](std::size_t Count, std::size_t Al) { return ::operator new(Count, static_cast<std::align_val_t>(Al)); },
2525
::operator delete,
2626
[](void* Ptr, std::size_t Al) { ::operator delete(Ptr, static_cast<std::align_val_t>(Al)); }};
27+
// Add this here as I am not sure how Windows paths are interpreted (do I need the backslash)
2728
BaseDir = FPaths::Combine(BaseDir, TEXT("bin"));
2829
LoadDll(BaseDir, "avutil-57.dll");
2930
LoadDll(BaseDir, "avcodec-59.dll");
31+
LoadDll(BaseDir, "avformat-59.dll");
3032
LoadDll(BaseDir, "dvclient.dll");
3133
LoadDll(BaseDir, "dolbyio_comms_media.dll");
3234
LoadDll(BaseDir, "dolbyio_comms_sdk.dll");
@@ -39,19 +41,23 @@ class FDolbyIOModule final : public IModuleInterface
3941
LoadDll(BaseDir, "video_processor.dll");
4042
dolbyio::comms::plugin::video_processor::set_app_allocator(Allocator);
4143
#elif PLATFORM_MAC
42-
BaseDir = FPaths::Combine(BaseDir, TEXT("lib"));
43-
LoadDll(BaseDir, "libdolbyio_comms_media.dylib");
44-
LoadDll(BaseDir, "libdolbyio_comms_sdk.dylib");
45-
LoadDll(BaseDir, "libvideo_processor.dylib");
44+
LoadDll(BaseDir, "lib/libdvclient.dylib");
45+
LoadDll(BaseDir, "lib/libdolbyio_comms_media.dylib");
46+
LoadDll(BaseDir, "lib/libdolbyio_comms_sdk.dylib");
47+
LoadDll(BaseDir, "lib/libopencv_core.4.5.dylib");
48+
LoadDll(BaseDir, "lib/libopencv_imgproc.4.5.dylib");
49+
LoadDll(BaseDir, "lib/libopencv_imgcodecs.4.5.dylib");
50+
LoadDll(BaseDir, "lib/libdlb_vidseg_c_api.dylib");
51+
LoadDll(BaseDir, "lib/libdvdnr.dylib");
52+
LoadDll(BaseDir, "lib/libvideo_processor.dylib");
4653
#elif PLATFORM_LINUX
4754
BaseDir += "-ubuntu-20.04-clang10-libc++10";
48-
BaseDir = FPaths::Combine(BaseDir, TEXT("lib"));
49-
LoadDll(BaseDir, "libavutil.so.57");
50-
LoadDll(BaseDir, "libavcodec.so.59");
51-
LoadDll(BaseDir, "libavformat.so.59");
52-
LoadDll(BaseDir, "libdvclient.so");
53-
LoadDll(BaseDir, "libdolbyio_comms_media.so");
54-
LoadDll(BaseDir, "libdolbyio_comms_sdk.so");
55+
LoadDll(BaseDir, "lib/libavutil.so.57");
56+
LoadDll(BaseDir, "lib/libavcodec.so.59");
57+
LoadDll(BaseDir, "lib/libavformat.so.59");
58+
LoadDll(BaseDir, "lib/libdvclient.so");
59+
LoadDll(BaseDir, "lib/libdolbyio_comms_media.so");
60+
LoadDll(BaseDir, "lib/libdolbyio_comms_sdk.so");
5561
#endif
5662
}
5763

‎DolbyIO/Source/Private/Subsystem/DolbyIOScreenshare.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ void UDolbyIOSubsystem::GetCurrentScreenshareSource()
119119
void UDolbyIOSubsystem::Handle(const screen_share_error& Event)
120120
{
121121
DLB_UE_LOG_BASE(Warning, "Received screen_share_error event source=%s type=%s description=%s force_stopped=%d",
122-
*ToString(Event.source), Event.type, *ToFString(Event.description), Event.force_stopped);
122+
*ToString(Event.source), *ToString(Event.type), *ToFString(Event.description), Event.force_stopped);
123123
if (Event.force_stopped)
124124
{
125125
StopScreenshare();

‎DolbyIO/Source/Private/Utils/DolbyIOConversions.cpp‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,18 @@ namespace DolbyIO
105105
*(ToFText(Source.title).ToString()));
106106
}
107107

108+
FString ToString(dolbyio::comms::screen_share_error::error_type err_type) {
109+
switch (err_type) {
110+
case dolbyio::comms::screen_share_error::error_type::continuos_temporary:
111+
return "Continuous but temporary";
112+
case dolbyio::comms::screen_share_error::error_type::permanent:
113+
return "Permanent";
114+
default:
115+
return "";
116+
}
117+
}
118+
119+
108120
EDolbyIOParticipantStatus ToEDolbyIOParticipantStatus(std::optional<participant_status> Status)
109121
{
110122
if (Status)

‎DolbyIO/Source/Private/Utils/DolbyIOConversions.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ namespace DolbyIO
1919
FString ToString(enum dolbyio::comms::audio_device::direction Direction);
2020
FString ToString(const dolbyio::comms::camera_device& Device);
2121
FString ToString(const dolbyio::comms::screen_share_source& Source);
22+
FString ToString(dolbyio::comms::screen_share_error::error_type err_type);
2223

2324
EDolbyIOParticipantStatus ToEDolbyIOParticipantStatus(std::optional<dolbyio::comms::participant_status> Status);
2425
FDolbyIOParticipantInfo ToFDolbyIOParticipantInfo(const dolbyio::comms::participant_info& Info);

‎docs/package-lock.json‎

Lines changed: 17 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)