You've already forked UnrealEngineUWP
mirror of
https://github.com/izzy2lost/UnrealEngineUWP.git
synced 2026-03-26 18:15:20 -07:00
- Removing UE4 references from MediaIO libs and SceneCapturer
- Removed ue4 from Blackmagic middle lib solution name #jira UE-111047, UE-111226, UE-111277, UE-111424, UE-111792, UE-111207 #rb none #ROBOMERGE-SOURCE: CL 15846745 in //UE5/Release-5.0-EarlyAccess/... #ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v786-15839533) [CL 15846751 by simon therriault in ue5-main branch]
This commit is contained in:
simon therriault
@@ -51980,8 +51980,8 @@
|
||||
<File Name="Engine/Plugins/Lumin/MagicLeapSharedFile/Resources/Icon128.png" Hash="b44e4711259f11f930397b081f029189edccc8db" />
|
||||
<File Name="Engine/Plugins/Lumin/MagicLeapSharedFile/Resources/Icon16.png" Hash="e63109b9c93201997e98f843fb5b5e8af8d4969c" />
|
||||
<File Name="Engine/Plugins/Lumin/MagicLeapSharedFile/Resources/Icon64.png" Hash="ef28f4d03736316df970eacbcb80e7ebdcb46014" />
|
||||
<File Name="Engine/Plugins/Media/AjaMedia/Binaries/ThirdParty/Win64/AJA.dll" Hash="8c8d6758be7643bbd4911691e2e3da4cfe227c21" />
|
||||
<File Name="Engine/Plugins/Media/AjaMedia/Binaries/ThirdParty/Win64/AJA.lib" Hash="8ec91f83e724fa9479b935edeb9d24e9b8f4003b" />
|
||||
<File Name="Engine/Plugins/Media/AjaMedia/Binaries/ThirdParty/Win64/AJA.dll" Hash="4c1391afd505de947e460eee4feba01665ab8fed" />
|
||||
<File Name="Engine/Plugins/Media/AjaMedia/Binaries/ThirdParty/Win64/AJA.lib" Hash="23a1c409b8146cc0118571400277eca889494720" />
|
||||
<File Name="Engine/Plugins/Media/AjaMedia/Content/Editor/Icons/AjaMediaOutput_20x.png" Hash="a65c65183b2a0604d30a1449aceac100121003a3" />
|
||||
<File Name="Engine/Plugins/Media/AjaMedia/Content/Editor/Icons/AjaMediaOutput_64x.png" Hash="88f9c885b5da17d0acae6ae69616c26881e0064c" />
|
||||
<File Name="Engine/Plugins/Media/AjaMedia/Content/Editor/Icons/AjaMediaSource_20x.png" Hash="6afd21eccc9baaf5d0194123561389bdeaae68cd" />
|
||||
@@ -51999,8 +51999,8 @@
|
||||
<File Name="Engine/Plugins/Media/AvidDNxMedia/Source/Thirdparty/DNxHR/lib64/DNxHR.lib" Hash="d7d7d0ecb77ec46a36ba332dc9428b90b7089fa3" />
|
||||
<File Name="Engine/Plugins/Media/AvidDNxMedia/Source/Thirdparty/DNxMXF/lib64/DNxMXF-dynamic.lib" Hash="5932134f368bc4cb31f8377a66392c881b9f6583" />
|
||||
<File Name="Engine/Plugins/Media/AvidDNxMedia/Source/Thirdparty/DNxUncompressed/lib64/DNxUncompressedSDK.lib" Hash="deb0852713f838e1ae81e51efbdc30246393abe1" />
|
||||
<File Name="Engine/Plugins/Media/BlackmagicMedia/Binaries/ThirdParty/Win64/BlackmagicLib.dll" Hash="ee90a6fdd83ab5bb8df92d0e9ef2e9a73f645d56" />
|
||||
<File Name="Engine/Plugins/Media/BlackmagicMedia/Binaries/ThirdParty/Win64/BlackmagicLib.lib" Hash="a70e655cc72e344883e375fb414fa94ab8c4129a" />
|
||||
<File Name="Engine/Plugins/Media/BlackmagicMedia/Binaries/ThirdParty/Win64/BlackmagicLib.dll" Hash="fa75894325b5b1b1f1c78eae4d4b23d976bc0b1f" />
|
||||
<File Name="Engine/Plugins/Media/BlackmagicMedia/Binaries/ThirdParty/Win64/BlackmagicLib.lib" Hash="84eb304defd0ac9a8fe256026cba571810ccd4e9" />
|
||||
<File Name="Engine/Plugins/Media/BlackmagicMedia/Content/Editor/Icons/BlackmagicMediaOutput_20x.png" Hash="983feff6ad028b6d3d973fd291072b55fba99389" />
|
||||
<File Name="Engine/Plugins/Media/BlackmagicMedia/Content/Editor/Icons/BlackmagicMediaOutput_64x.png" Hash="82254955b13ee9e4d0ca255dffa5f6d4b19dd675" />
|
||||
<File Name="Engine/Plugins/Media/BlackmagicMedia/Content/Editor/Icons/BlackmagicMediaSource_20x.png" Hash="e9faa4687fa765eb233082646d9bc9b125e0daba" />
|
||||
@@ -77474,6 +77474,7 @@
|
||||
<Blob Hash="23a006399e530ddf8608cd52bfc3f9872d05c3b4" Size="6265" PackHash="24fe2cbadcbf9ec68fa6b34c4d8696420622257f" PackOffset="8" />
|
||||
<Blob Hash="23a036d1f1179e7e0b68ef3e92320ad1e5ab418d" Size="1732" PackHash="4b05f845cd1b0402ee89f6247ea7071582aaec0f" PackOffset="2083798" />
|
||||
<Blob Hash="23a063075313f37198695b1437e1a3a11ee700bc" Size="1580" PackHash="0a79b68fc843ff09e7eeffe5fafe58c90b6ece69" PackOffset="1338268" />
|
||||
<Blob Hash="23a1c409b8146cc0118571400277eca889494720" Size="47612" PackHash="552ae618f297a1639a9546b995d28bf6e71cc69e" PackOffset="1883656" />
|
||||
<Blob Hash="23a26dee38ef88cde4254b48fcf338c78175ec5d" Size="1053" PackHash="79089140e5202cefce11d8a2b34030d6624160d9" PackOffset="246898" />
|
||||
<Blob Hash="23a343daf8837a36b13e1f8826c443b520a5f726" Size="20480" PackHash="d1502749abeb755f99761ccb68b7579bb7d61299" PackOffset="2059784" />
|
||||
<Blob Hash="23a390ff180fb4a29655d036c94c039ab0c7c11f" Size="4450" PackHash="c6a87a27121ee980a108fbacde92cb925b2682d0" PackOffset="715167" />
|
||||
@@ -85005,6 +85006,7 @@
|
||||
<Blob Hash="4c11b757c34627b21e493201a3173ed12ebe04a6" Size="115501" PackHash="acf6558b1e3950d55a31da4e8614e4a357aa653c" PackOffset="1115417" />
|
||||
<Blob Hash="4c11c54d4042de6114ad7d3a1ec4be769e6c896b" Size="820" PackHash="efd73054c096cd4a5bc1ba2dbe16349a22f5f682" PackOffset="1466140" />
|
||||
<Blob Hash="4c127e5597273688eff4afd573e4ddc33421748c" Size="134" PackHash="27121601acbe7178335d2b27550880f69147f685" PackOffset="2058026" />
|
||||
<Blob Hash="4c1391afd505de947e460eee4feba01665ab8fed" Size="1883648" PackHash="552ae618f297a1639a9546b995d28bf6e71cc69e" PackOffset="8" />
|
||||
<Blob Hash="4c1bbba4e271d4f9151419d8684df30079382ca6" Size="46855" PackHash="0e0fc56444fa93555de76ff8aaa98b0bd94a186d" PackOffset="68878" />
|
||||
<Blob Hash="4c1c3398eb2cdb2e358988a6aa31a587b4be2e76" Size="2560178" PackHash="5dea9b6fce25b6e705cabdf75c5c60c4a0eedf0c" PackOffset="8" />
|
||||
<Blob Hash="4c1c93e14fbc00b8b1e78b8d9631599164305eb1" Size="283" PackHash="eef645665d668dc309bebdc77ca5e0d66043c9e6" PackOffset="9506" />
|
||||
@@ -95542,6 +95544,7 @@
|
||||
<Blob Hash="84e8786a62c68abfae05e8523b3ed0fc9b5995dd" Size="1508" PackHash="27121601acbe7178335d2b27550880f69147f685" PackOffset="1437819" />
|
||||
<Blob Hash="84e8cf3dcc00523fc710959fbb852aeb12effec8" Size="3426" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1182919" />
|
||||
<Blob Hash="84ea52c8c9230c89de19dc4d3c053cbcbcd703e6" Size="100" PackHash="d2a5fd36db8b15ae3778e1aee34cc6f737b9f2ac" PackOffset="1477440" />
|
||||
<Blob Hash="84eb304defd0ac9a8fe256026cba571810ccd4e9" Size="30638" PackHash="552ae618f297a1639a9546b995d28bf6e71cc69e" PackOffset="2002436" />
|
||||
<Blob Hash="84ec29f94416f4e3a67f80920b51d7d80855b841" Size="49" PackHash="92264046926dbcf1c60be703935611cac5122762" PackOffset="2097089" />
|
||||
<Blob Hash="84ef4ded31a8c45ba5e87752b57f45687c80ad1b" Size="227" PackHash="4b0f6024494e02f2b2cdd75b48b059c81bde532c" PackOffset="820411" />
|
||||
<Blob Hash="84ef912efa35eeac5b9595a36b88c570588b1a13" Size="860" PackHash="3c98ec5b717885bece15f3f02421570d3c21ea28" PackOffset="7874" />
|
||||
@@ -96940,7 +96943,6 @@
|
||||
<Blob Hash="8c8b78733be8cc6f1de6b7f2afcc669ebde8824d" Size="14524" PackHash="0e0fc56444fa93555de76ff8aaa98b0bd94a186d" PackOffset="1023199" />
|
||||
<Blob Hash="8c8c0618f0ee2507c19b96326f34c5baf48294b2" Size="5120" PackHash="ededb5a86297fe84eb15fa6ca8998f05a9a750eb" PackOffset="2017854" />
|
||||
<Blob Hash="8c8ca9d1ddef698405887fa0386ced852f5e528a" Size="584" PackHash="375fc7daadf4e7c57ed3fb499492997b710a6201" PackOffset="1391472" />
|
||||
<Blob Hash="8c8d6758be7643bbd4911691e2e3da4cfe227c21" Size="1883648" PackHash="a3ed59b58cc0d6128de6eb6daf5be4c5918c7f0e" PackOffset="8" />
|
||||
<Blob Hash="8c8ebfdd4398180a9236243caf64316e47f089f0" Size="340375" PackHash="8eac56bd8c8cee088d0978068da9b9aefd77c5a3" PackOffset="1631026" />
|
||||
<Blob Hash="8c92b8a0c72a46c1be396c374dfa6154e5d69419" Size="83117" PackHash="10fa41b2a3c01a5678a288d047be3d7cc7d87788" PackOffset="1997035" />
|
||||
<Blob Hash="8c92c975ec9ccfb1d5e9338a4b90c7c27b0738a3" Size="2229" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="2043747" />
|
||||
@@ -97330,7 +97332,6 @@
|
||||
<Blob Hash="8ec2deddc8db21c07170217e2998e05b5df8def5" Size="3759" PackHash="4960db9d662770e20eb0be0913a076e8bcfe266b" PackOffset="127120" />
|
||||
<Blob Hash="8ec4100c7960827dd01c803b594c2219ce57aedf" Size="88" PackHash="d2a5fd36db8b15ae3778e1aee34cc6f737b9f2ac" PackOffset="1718760" />
|
||||
<Blob Hash="8ec57d216b57c38b14d8d1aebec0605e37bd8a0b" Size="1220" PackHash="830cc93f966e96754b4b160b2d5ffbe64678ec80" PackOffset="1891160" />
|
||||
<Blob Hash="8ec91f83e724fa9479b935edeb9d24e9b8f4003b" Size="47612" PackHash="a3ed59b58cc0d6128de6eb6daf5be4c5918c7f0e" PackOffset="1883656" />
|
||||
<Blob Hash="8ec9a4cac56ffff46f6206d83ac9a47ebb74d19a" Size="88" PackHash="a44dc4b35972b9dad88e2ad3e0a47c8db7399c27" PackOffset="2086484" />
|
||||
<Blob Hash="8ecb66f5db1d307558cc54d54667cd62a3defecd" Size="184" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="2089780" />
|
||||
<Blob Hash="8ecba31e6024191b9eabe8ab0ee03ef6aa5bb1d7" Size="47496" PackHash="b12b39dbdb0a04aacf11eeccf049dae4c81f9e3d" PackOffset="2040296" />
|
||||
@@ -101881,7 +101882,6 @@
|
||||
<Blob Hash="a708865839c3857bbd22721b34f67327f3b2046c" Size="18076" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1837404" />
|
||||
<Blob Hash="a70b4a3ad4c0ba0d87870312ebdc560e04c0e401" Size="112" PackHash="d2a5fd36db8b15ae3778e1aee34cc6f737b9f2ac" PackOffset="1560544" />
|
||||
<Blob Hash="a70d2864f60a38e56fa28c52a54e4afce6bc6eed" Size="27301" PackHash="6c07a6afa58f52f15c3d074d42be81d0126aa564" PackOffset="53544" />
|
||||
<Blob Hash="a70e655cc72e344883e375fb414fa94ab8c4129a" Size="30638" PackHash="3f47a68ebabb515eecc6fe468b56b2dd472c948b" PackOffset="71688" />
|
||||
<Blob Hash="a70f618d2ff1b379b272d9e87416781a2ae94754" Size="268288" PackHash="6879240d6e02b1d55dc52f4ab93b441cf676723e" PackOffset="1066504" />
|
||||
<Blob Hash="a712d7b4b423b14bcff9bfaed36f14c9d58987a8" Size="358" PackHash="f2e71a6b9591b5cc7b359bb30ddc78c580f95ad5" PackOffset="896489" />
|
||||
<Blob Hash="a7144b614eadb393260add5d7c3bd607693f997e" Size="104" PackHash="830cc93f966e96754b4b160b2d5ffbe64678ec80" PackOffset="364000" />
|
||||
@@ -115158,7 +115158,6 @@
|
||||
<Blob Hash="ee8e50fb41c0b9610c4572cadd12cb5b1172e005" Size="33263516" PackHash="94ea71936e6b7c2986a03709b0d91e66490eacbd" PackOffset="8" />
|
||||
<Blob Hash="ee8e790aac2cacae498959d5b88388315c423105" Size="266" PackHash="b5ca4cf47eef50dc0732aff0b9d00c282415892e" PackOffset="726927" />
|
||||
<Blob Hash="ee8f046c494732ddda7f14db149ad1c0c27f57d1" Size="4418176" PackHash="dcf8de06fe9eecf356cedab2e162a642032098f3" PackOffset="8" />
|
||||
<Blob Hash="ee90a6fdd83ab5bb8df92d0e9ef2e9a73f645d56" Size="71680" PackHash="3f47a68ebabb515eecc6fe468b56b2dd472c948b" PackOffset="8" />
|
||||
<Blob Hash="ee91e5dec4a68574c9ff78bf49c19c3e1097d482" Size="3777" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="906279" />
|
||||
<Blob Hash="ee94ac0f68d2c69e3710da382216ada1495a8180" Size="3167" PackHash="bf6ccb8b8cb10a5dfa1a4c6e7c988496d81ee69d" PackOffset="1521177" />
|
||||
<Blob Hash="ee9766f75d4d5ceb04633d05d65e837ca1116e24" Size="584" PackHash="59a22d89e715263368cd4cef014c11cb8f400878" PackOffset="286820" />
|
||||
@@ -117277,6 +117276,7 @@
|
||||
<Blob Hash="fa7278d7e9c821ef6f43ebdce70328aec25109d7" Size="63579" PackHash="963e0edaaa81506b436422a867cd9deae6151d24" PackOffset="174693" />
|
||||
<Blob Hash="fa728eeba8751f4ce032ed32aecfde124d1b68e2" Size="1777" PackHash="f25f5da5b49f7c1000f7e4195d4038bda16e5c38" PackOffset="1701475" />
|
||||
<Blob Hash="fa74e014f4049c71d716aa19c866902453b700e5" Size="5652" PackHash="d7cd467675e181dbeba3cf24443590ebb76f9515" PackOffset="1130987" />
|
||||
<Blob Hash="fa75894325b5b1b1f1c78eae4d4b23d976bc0b1f" Size="71168" PackHash="552ae618f297a1639a9546b995d28bf6e71cc69e" PackOffset="1931268" />
|
||||
<Blob Hash="fa78249ef9c1999137a4bd7333b9c6e42cb7ce09" Size="98343" PackHash="26997bbfc6355dd7c34248e38d341a3ffbafdbd1" PackOffset="542629" />
|
||||
<Blob Hash="fa798950f2dfb9c2502a80b7c7eff58202911a10" Size="148" PackHash="4b0f6024494e02f2b2cdd75b48b059c81bde532c" PackOffset="740483" />
|
||||
<Blob Hash="fa7a7818ed9ee6228f09a49400124f3c4ea9725c" Size="1708" PackHash="a47d2340e2c544950f3bd2ce9b31e3fd97d1401f" PackOffset="800454" />
|
||||
@@ -119798,6 +119798,7 @@
|
||||
<Pack Hash="54ce1d601df08958e89d2d95d9b9fadb62dc7848" Size="5683270" CompressedSize="1057389" RemotePath="2937134-8587487d7e4b4b94afa92f680c591755" />
|
||||
<Pack Hash="551654d82bdacbe12dfe0a27ff7948b6ad1894b5" Size="2097080" CompressedSize="2067802" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
|
||||
<Pack Hash="552839daffa9ca50b0ff405fa5e05ffca579065f" Size="2437032" CompressedSize="1163587" RemotePath="UnrealEngine-15198989" />
|
||||
<Pack Hash="552ae618f297a1639a9546b995d28bf6e71cc69e" Size="2033074" CompressedSize="670350" RemotePath="UnrealEngine-15846745" />
|
||||
<Pack Hash="552d946628c1370037d0ea07e10c87eec93c6af8" Size="68384432" CompressedSize="19314641" RemotePath="UnrealEngine-6550419-5b15c7c1f0a44c4f83c440737d93b283" />
|
||||
<Pack Hash="5532cce2d69239b40861cd1a239abfa1e451398e" Size="20234520" CompressedSize="3297847" RemotePath="UnrealEngine-14448996-2eb60521abc842a7b14a9b0ef0a02b1e" />
|
||||
<Pack Hash="5533d2eace422fb5ee7cf96ad8db1d31db2ff0da" Size="8006296" CompressedSize="12286" RemotePath="3362661-c42b75bbdfa5405597d5cca909cf2e91" />
|
||||
|
||||
@@ -104,7 +104,7 @@ void USceneCapturer::InitCaptureComponent(USceneCaptureComponent2D* CaptureCompo
|
||||
CaptureComponent->TextureTarget->TargetGamma = 2.2f;
|
||||
CaptureComponent->RegisterComponentWithWorld( GetWorld() ); //GWorld
|
||||
|
||||
// UE4 cannot serialize an array of subobject pointers, so add these objects to the root
|
||||
// Unreal Engine cannot serialize an array of subobject pointers, so add these objects to the root
|
||||
CaptureComponent->AddToRoot();
|
||||
}
|
||||
|
||||
@@ -298,7 +298,7 @@ USceneCapturer::USceneCapturer()
|
||||
UnprojectedAtlasWidth = NumberOfHorizontalSteps * StripWidth;
|
||||
UnprojectedAtlasHeight = NumberOfVerticalSteps * StripHeight;
|
||||
|
||||
//NOTE: ikrimae: Ensure that the main gameview is > CaptureWidth x CaptureHeight. Bug in UE4 that won't re-alloc scene render targets to the correct size
|
||||
//NOTE: ikrimae: Ensure that the main gameview is > CaptureWidth x CaptureHeight. Bug in Unreal Engine that won't re-alloc scene render targets to the correct size
|
||||
// when the scenecapture component > current window render target. https://answers.unrealengine.com/questions/80531/scene-capture-2d-max-resolution.html
|
||||
//TODO: ikrimae: Ensure that r.SceneRenderTargetResizeMethod=2
|
||||
FSystemResolution::RequestResolutionChange(CaptureWidth, CaptureHeight, EWindowMode::Windowed);
|
||||
@@ -444,13 +444,13 @@ void USceneCapturer::Reset()
|
||||
LeftEyeCaptureComponent->SetVisibility( false );
|
||||
LeftEyeCaptureComponent->SetHiddenInGame( true );
|
||||
|
||||
// UE4 cannot serialize an array of subobject pointers, so work around the GC problems
|
||||
// Unreal Engine cannot serialize an array of subobject pointers, so work around the GC problems
|
||||
LeftEyeCaptureComponent->RemoveFromRoot();
|
||||
|
||||
RightEyeCaptureComponent->SetVisibility( false );
|
||||
RightEyeCaptureComponent->SetHiddenInGame( true );
|
||||
|
||||
// UE4 cannot serialize an array of subobject pointers, so work around the GC problems
|
||||
// Unreal Engine cannot serialize an array of subobject pointers, so work around the GC problems
|
||||
RightEyeCaptureComponent->RemoveFromRoot();
|
||||
}
|
||||
|
||||
|
||||
@@ -44,7 +44,7 @@ void AStereoCapturePawn::UpdateStereoAtlas(UObject* WorldContextObject, struct F
|
||||
StereoPanoramaManager->PanoramicScreenshot(0, 0, CopyAtlasToTexDelegate, World);
|
||||
|
||||
//TODO: ikrimae: Not cool b/c we're passing memory ownership to the LatentActionManager but at the same time we need a reference to this action to update when it's done
|
||||
// Got to dig deeper into UE4 to see proper way
|
||||
// Got to dig deeper into Unreal Engine to see proper way
|
||||
StereoCaptureDoneAction = new FStereoCaptureDoneAction(LatentInfo);
|
||||
|
||||
|
||||
|
||||
@@ -2,10 +2,10 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#ifdef UE4BLACKMAGICDESIGN_EXPORTS
|
||||
#define UE4BLACKMAGICDESIGN_API __declspec(dllexport)
|
||||
#ifdef UEBLACKMAGICDESIGN_EXPORTS
|
||||
#define UEBLACKMAGICDESIGN_API __declspec(dllexport)
|
||||
#else
|
||||
#define UE4BLACKMAGICDESIGN_API __declspec(dllimport)
|
||||
#define UEBLACKMAGICDESIGN_API __declspec(dllimport)
|
||||
#endif
|
||||
|
||||
#include "BlackmagicReferencePtr.h"
|
||||
@@ -42,7 +42,7 @@ namespace BlackmagicDesign
|
||||
|
||||
/* FUniqueIdentifier definition
|
||||
*****************************************************************************/
|
||||
struct UE4BLACKMAGICDESIGN_API FUniqueIdentifier
|
||||
struct UEBLACKMAGICDESIGN_API FUniqueIdentifier
|
||||
{
|
||||
FUniqueIdentifier();
|
||||
explicit FUniqueIdentifier(int32_t InIdentifier);
|
||||
@@ -56,7 +56,7 @@ namespace BlackmagicDesign
|
||||
/* FTimecode definition
|
||||
* limited to 30fps
|
||||
*****************************************************************************/
|
||||
struct UE4BLACKMAGICDESIGN_API FTimecode
|
||||
struct UEBLACKMAGICDESIGN_API FTimecode
|
||||
{
|
||||
FTimecode();
|
||||
bool operator== (const FTimecode& Other) const;
|
||||
@@ -86,7 +86,7 @@ namespace BlackmagicDesign
|
||||
/* FFormatInfo definition
|
||||
* Information about a given frame desc
|
||||
*****************************************************************************/
|
||||
struct UE4BLACKMAGICDESIGN_API FFormatInfo
|
||||
struct UEBLACKMAGICDESIGN_API FFormatInfo
|
||||
{
|
||||
/** Framerate */
|
||||
uint32_t FrameRateNumerator;
|
||||
@@ -104,7 +104,7 @@ namespace BlackmagicDesign
|
||||
|
||||
/* FChannelInfo definition
|
||||
*****************************************************************************/
|
||||
struct UE4BLACKMAGICDESIGN_API FChannelInfo
|
||||
struct UEBLACKMAGICDESIGN_API FChannelInfo
|
||||
{
|
||||
int32_t DeviceIndex;
|
||||
|
||||
@@ -113,7 +113,7 @@ namespace BlackmagicDesign
|
||||
|
||||
/* FInputChannelOptions definition
|
||||
*****************************************************************************/
|
||||
struct UE4BLACKMAGICDESIGN_API FInputChannelOptions
|
||||
struct UEBLACKMAGICDESIGN_API FInputChannelOptions
|
||||
{
|
||||
FInputChannelOptions();
|
||||
|
||||
@@ -133,7 +133,7 @@ namespace BlackmagicDesign
|
||||
|
||||
/* FOutputChannelOptions definition
|
||||
*****************************************************************************/
|
||||
struct UE4BLACKMAGICDESIGN_API FOutputChannelOptions
|
||||
struct UEBLACKMAGICDESIGN_API FOutputChannelOptions
|
||||
{
|
||||
FOutputChannelOptions();
|
||||
|
||||
@@ -154,9 +154,9 @@ namespace BlackmagicDesign
|
||||
|
||||
/* IInputEventCallback definition
|
||||
*****************************************************************************/
|
||||
struct UE4BLACKMAGICDESIGN_API IInputEventCallback
|
||||
struct UEBLACKMAGICDESIGN_API IInputEventCallback
|
||||
{
|
||||
struct UE4BLACKMAGICDESIGN_API FFrameReceivedInfo
|
||||
struct UEBLACKMAGICDESIGN_API FFrameReceivedInfo
|
||||
{
|
||||
FFrameReceivedInfo();
|
||||
|
||||
@@ -198,9 +198,9 @@ namespace BlackmagicDesign
|
||||
|
||||
/* IOutputEventCallback definition
|
||||
*****************************************************************************/
|
||||
struct UE4BLACKMAGICDESIGN_API IOutputEventCallback
|
||||
struct UEBLACKMAGICDESIGN_API IOutputEventCallback
|
||||
{
|
||||
struct UE4BLACKMAGICDESIGN_API FFrameSentInfo
|
||||
struct UEBLACKMAGICDESIGN_API FFrameSentInfo
|
||||
{
|
||||
FFrameSentInfo();
|
||||
|
||||
@@ -221,7 +221,7 @@ namespace BlackmagicDesign
|
||||
virtual void OnInterlacedOddFieldEvent() = 0;
|
||||
};
|
||||
|
||||
struct UE4BLACKMAGICDESIGN_API FFrameDescriptor
|
||||
struct UEBLACKMAGICDESIGN_API FFrameDescriptor
|
||||
{
|
||||
uint8_t* VideoBuffer;
|
||||
int32_t VideoWidth;
|
||||
@@ -233,13 +233,13 @@ namespace BlackmagicDesign
|
||||
|
||||
/* BlackmagicDeviceScanner definition
|
||||
*****************************************************************************/
|
||||
class UE4BLACKMAGICDESIGN_API BlackmagicDeviceScanner
|
||||
class UEBLACKMAGICDESIGN_API BlackmagicDeviceScanner
|
||||
{
|
||||
public:
|
||||
const static int32_t FormatedTextSize = 64;
|
||||
using FormatedTextType = TCHAR[FormatedTextSize];
|
||||
|
||||
struct UE4BLACKMAGICDESIGN_API DeviceInfo
|
||||
struct UEBLACKMAGICDESIGN_API DeviceInfo
|
||||
{
|
||||
bool bIsSupported;
|
||||
bool bCanDoCapture;
|
||||
@@ -277,9 +277,9 @@ namespace BlackmagicDesign
|
||||
|
||||
/* BlackmagicVideoFormats definition
|
||||
*****************************************************************************/
|
||||
struct UE4BLACKMAGICDESIGN_API BlackmagicVideoFormats
|
||||
struct UEBLACKMAGICDESIGN_API BlackmagicVideoFormats
|
||||
{
|
||||
struct UE4BLACKMAGICDESIGN_API VideoFormatDescriptor
|
||||
struct UEBLACKMAGICDESIGN_API VideoFormatDescriptor
|
||||
{
|
||||
VideoFormatDescriptor();
|
||||
|
||||
@@ -315,19 +315,19 @@ namespace BlackmagicDesign
|
||||
|
||||
/* Configure Logging
|
||||
*****************************************************************************/
|
||||
UE4BLACKMAGICDESIGN_API void SetLoggingCallbacks(LoggingCallbackPtr LogInfoFunc, LoggingCallbackPtr LogWarningFunc, LoggingCallbackPtr LogErrorFunc);
|
||||
UEBLACKMAGICDESIGN_API void SetLoggingCallbacks(LoggingCallbackPtr LogInfoFunc, LoggingCallbackPtr LogWarningFunc, LoggingCallbackPtr LogErrorFunc);
|
||||
|
||||
/* Initialization
|
||||
*****************************************************************************/
|
||||
UE4BLACKMAGICDESIGN_API bool ApiInitialization();
|
||||
UE4BLACKMAGICDESIGN_API void ApiUninitialization();
|
||||
UEBLACKMAGICDESIGN_API bool ApiInitialization();
|
||||
UEBLACKMAGICDESIGN_API void ApiUninitialization();
|
||||
|
||||
/* Register/Unregister
|
||||
*****************************************************************************/
|
||||
UE4BLACKMAGICDESIGN_API FUniqueIdentifier RegisterCallbackForChannel(const FChannelInfo& InChannelInfo, const FInputChannelOptions& InChannelOptions, ReferencePtr<IInputEventCallback> InCallback);
|
||||
UE4BLACKMAGICDESIGN_API void UnregisterCallbackForChannel(const FChannelInfo& InChannelInfo, FUniqueIdentifier InIdentifier);
|
||||
UEBLACKMAGICDESIGN_API FUniqueIdentifier RegisterCallbackForChannel(const FChannelInfo& InChannelInfo, const FInputChannelOptions& InChannelOptions, ReferencePtr<IInputEventCallback> InCallback);
|
||||
UEBLACKMAGICDESIGN_API void UnregisterCallbackForChannel(const FChannelInfo& InChannelInfo, FUniqueIdentifier InIdentifier);
|
||||
|
||||
UE4BLACKMAGICDESIGN_API FUniqueIdentifier RegisterOutputChannel(const FChannelInfo& InChannelInfo, const FOutputChannelOptions& InChannelOptions, ReferencePtr<IOutputEventCallback> InCallback);
|
||||
UE4BLACKMAGICDESIGN_API void UnregisterOutputChannel(const FChannelInfo& InChannelInfo, FUniqueIdentifier InIdentifier, bool bCallCompleted);
|
||||
UE4BLACKMAGICDESIGN_API bool SendVideoFrameData(const FChannelInfo& InChannelInfo, const FFrameDescriptor& InFrame);
|
||||
UEBLACKMAGICDESIGN_API FUniqueIdentifier RegisterOutputChannel(const FChannelInfo& InChannelInfo, const FOutputChannelOptions& InChannelOptions, ReferencePtr<IOutputEventCallback> InCallback);
|
||||
UEBLACKMAGICDESIGN_API void UnregisterOutputChannel(const FChannelInfo& InChannelInfo, FUniqueIdentifier InIdentifier, bool bCallCompleted);
|
||||
UEBLACKMAGICDESIGN_API bool SendVideoFrameData(const FChannelInfo& InChannelInfo, const FFrameDescriptor& InFrame);
|
||||
};
|
||||
|
||||
@@ -2,10 +2,10 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#ifdef UE4BLACKMAGICDESIGN_EXPORTS
|
||||
#define UE4BLACKMAGICDESIGN_REFPTR_API __declspec(dllexport)
|
||||
#ifdef UEBLACKMAGICDESIGN_EXPORTS
|
||||
#define UEBLACKMAGICDESIGN_REFPTR_API __declspec(dllexport)
|
||||
#else
|
||||
#define UE4BLACKMAGICDESIGN_REFPTR_API __declspec(dllimport)
|
||||
#define UEBLACKMAGICDESIGN_REFPTR_API __declspec(dllimport)
|
||||
#endif
|
||||
|
||||
namespace BlackmagicDesign
|
||||
|
||||
Reference in New Issue
Block a user