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

Merge pull request #476 from bssteph/master

Browse Source 
Clean up Intensity Pro 4K commit a bit
This commit is contained in:
Jim 2015-09-16 17:48:36 -07:00
commit 7788ccdd86
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/decklink/decklink-device-instance.cpp
View File

@ -17,10 +17,10 @@ DeckLinkDeviceInstance::DeckLinkDeviceInstance(DeckLink *decklink_,
// implement BMDDeckLinkPersistentID
if (std::string("Intensity Pro 4K").compare(device_->GetName()) == 0) {
currentFrame.format = VIDEO_FORMAT_BGRX;
doRgb = true;
pixelFormat = bmdFormat8BitBGRA;
} else {
currentFrame.format = VIDEO_FORMAT_UYVY;
doRgb = false;
pixelFormat = bmdFormat8BitYUV;
}
currentPacket.samples_per_sec = 48000;
@ -91,14 +91,8 @@ bool DeckLinkDeviceInstance::StartCapture(DeckLinkDeviceMode *mode_)
input->SetCallback(this);
BMDPixelFormat pixelFormat;
const BMDDisplayMode displayMode = mode_->GetDisplayMode();
if (doRgb)
pixelFormat = bmdFormat8BitBGRA;
else
pixelFormat = bmdFormat8BitYUV;
const HRESULT videoResult = input->EnableVideoInput(displayMode,
pixelFormat, bmdVideoInputFlagDefault);

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

@ -8,8 +8,8 @@ protected:
struct obs_source_audio currentPacket;
DeckLink *decklink = nullptr;
DeckLinkDevice *device = nullptr;
bool doRgb = false;
DeckLinkDeviceMode *mode = nullptr;
BMDPixelFormat pixelFormat = bmdFormat8BitYUV;
ComPtr<IDeckLinkInput> input;
volatile long refCount = 1;