jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #911 from fryshorts/decklink-fixes

Browse Source 
Decklink fixes
This commit is contained in:
Jim 2017-05-10 16:44:53 -07:00 committed by GitHub
commit 01db15128c
6 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/decklink/audio-repack.c
View File

@ -25,7 +25,7 @@ int check_buffer(struct audio_repack *repack,
squash data array
| FL | FR |LFE | FC | BL | BR |emp |emp |
| | x | |
| | x | |
| FL | FR | FC |LFE | BL | BR |
*/
int repack_8to6ch_swap23(struct audio_repack *repack,
@ -34,8 +34,6 @@ int repack_8to6ch_swap23(struct audio_repack *repack,
if (check_buffer(repack, frame_count) < 0)
return -1;
const uint32_t size = frame_count * repack->base_src_size;
const __m128i *src = (__m128i *)bsrc;
const __m128i *esrc = src + frame_count;
uint32_t *dst = (uint32_t *)repack->packet_buffer;
@ -62,8 +60,6 @@ int repack_8ch_swap23(struct audio_repack *repack,
if (check_buffer(repack, frame_count) < 0)
return -1;
const uint32_t size = frame_count * repack->base_src_size;
const __m128i *src = (__m128i *)bsrc;
const __m128i *esrc = src + frame_count;
__m128i *dst = (__m128i *)repack->packet_buffer;

2
plugins/decklink/decklink-device.cpp
View File

@ -128,7 +128,7 @@ const std::string& DeckLinkDevice::GetName(void) const
return name;
}
const int32_t DeckLinkDevice::GetMaxChannel(void) const
int32_t DeckLinkDevice::GetMaxChannel(void) const
{
return maxChannel;
}

2
plugins/decklink/decklink-device.hpp
View File

@ -31,7 +31,7 @@ public:
const std::string& GetHash(void) const;
const std::vector<DeckLinkDeviceMode *>& GetModes(void) const;
const std::string& GetName(void) const;
const int32_t GetMaxChannel(void) const;
int32_t GetMaxChannel(void) const;
bool GetInput(IDeckLinkInput **input);

5
plugins/decklink/linux/CMakeLists.txt
View File

@ -1,5 +1,10 @@
project(linux-decklink)
if(DISABLE_DECKLINK)
message(STATUS "decklink plugin disabled")
return()
endif()
set(linux-decklink-sdk_HEADERS
decklink-sdk/DeckLinkAPI.h
decklink-sdk/DeckLinkAPIConfiguration.h

5
plugins/decklink/mac/CMakeLists.txt
View File

@ -1,5 +1,10 @@
project(mac-decklink)
if(DISABLE_DECKLINK)
message(STATUS "decklink plugin disabled")
return()
endif()
find_library(COREFOUNDATION CoreFoundation)
include_directories(${COREFOUNDATION})

5
plugins/decklink/win/CMakeLists.txt
View File

@ -1,5 +1,10 @@
project(win-decklink)
if(DISABLE_DECKLINK)
message(STATUS "decklink plugin disabled")
return()
endif()
include(IDLFileHelper)
set(win-decklink-sdk_IDLS