FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

decklink: Use the macOS version of the SDK on macOS and not the Linux one

Browse Source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4738>
This commit is contained in:
Sebastian Dröge 2023-05-30 15:27:21 +03:00 committed by Sebastian Dröge
parent a2850bcb88
commit ab946cd41e
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
subprojects/gst-plugins-bad/sys/decklink/gstdecklink.h
View File

@ -28,10 +28,6 @@
#include <stdint.h> #include <stdint.h>
#ifdef G_OS_UNIX
#include "linux/DeckLinkAPI.h"
#endif
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
#include "win/DeckLinkAPI.h" #include "win/DeckLinkAPI.h"
@ -51,8 +47,7 @@
# define CONVERT_TO_COM_STRING(s) G_STMT_START { char * _s = (char *)s; s = _com_util::ConvertStringToBSTR(_s); g_free(_s); } G_STMT_END # define CONVERT_TO_COM_STRING(s) G_STMT_START { char * _s = (char *)s; s = _com_util::ConvertStringToBSTR(_s); g_free(_s); } G_STMT_END
# endif /* __MINGW32__ */ # endif /* __MINGW32__ */
#elif defined(__APPLE__) #elif defined(__APPLE__)
#include "osx/DeckLinkAPI.h"
#include <CoreFoundation/CoreFoundation.h>
#define COMSTR_T CFStringRef #define COMSTR_T CFStringRef
#define CONVERT_COM_STRING(s) G_STMT_START { CFStringRef _s = (CFStringRef)s; s = (char*) malloc(100); CFStringGetCString(_s, s, 100, kCFStringEncodingUTF8); CFRelease(_s); } G_STMT_END #define CONVERT_COM_STRING(s) G_STMT_START { CFStringRef _s = (CFStringRef)s; s = (char*) malloc(100); CFStringGetCString(_s, s, 100, kCFStringEncodingUTF8); CFRelease(_s); } G_STMT_END
@ -60,6 +55,8 @@
#define CONVERT_TO_COM_STRING(s) G_STMT_START { char * _s = (char *)s; s = CFStringCreateWithCString(kCFAllocatorDefault, _s, kCFStringEncodingUTF8); g_free(_s); } G_STMT_END #define CONVERT_TO_COM_STRING(s) G_STMT_START { char * _s = (char *)s; s = CFStringCreateWithCString(kCFAllocatorDefault, _s, kCFStringEncodingUTF8); g_free(_s); } G_STMT_END
#define WINAPI #define WINAPI
#else /* Linux */ #else /* Linux */
#include "linux/DeckLinkAPI.h"
#define COMSTR_T const char* #define COMSTR_T const char*
#define CONVERT_COM_STRING(s) #define CONVERT_COM_STRING(s)
#define CONVERT_TO_COM_STRING(s) #define CONVERT_TO_COM_STRING(s)