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

Merge pull request #510 from craysiii/testing-branch 

linux capture: Fix issues with XComposite Window Capture
master
Jim 2016-02-21 19:54:46 -08:00
parent 2b7036dc93 2e642fcc61
commit 7233a6bf88
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/linux-capture/xcompcap-main.cpp
View File

@ -354,12 +354,7 @@ void XCompcapMain::updateSettings(obs_data_t *settings)
uint8_t *texData = new uint8_t[width() * height() * 4]; uint8_t *texData = new uint8_t[width() * height() * 4];
for (unsigned int i = 0; i < width() * height() * 4; i += 4) { memset(texData, 0, width() * height() * 4);
texData[i + 0] = p->swapRedBlue ? 0 : 0xFF;
texData[i + 1] = 0;
texData[i + 2] = p->swapRedBlue ? 0xFF : 0;
texData[i + 3] = 0xFF;
}
const uint8_t* texDataArr[] = { texData, 0 }; const uint8_t* texDataArr[] = { texData, 0 };
@ -520,6 +515,10 @@ void XCompcapMain::tick(float seconds)
void XCompcapMain::render(gs_effect_t *effect) void XCompcapMain::render(gs_effect_t *effect)
{ {
PLock lock(&p->lock, true); PLock lock(&p->lock, true);
if (!p->win)
return;
effect = obs_get_base_effect(OBS_EFFECT_OPAQUE); effect = obs_get_base_effect(OBS_EFFECT_OPAQUE);
if (!lock.isLocked() || !p->tex) if (!lock.isLocked() || !p->tex)