zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove SetNotAlive method from the thread class.

Browse Source 
Also cleaning up methods with the same name in other classes that are derived from the above method.

R=perkj@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/41759004

Cr-Commit-Position: refs/heads/master@{#8242}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8242 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
tommi@webrtc.org
2015-02-04 11:11:53 +00:00
parent c5f697135e
commit 875c97ed9d
37 changed files with 18 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
webrtc/modules/video_render/windows/video_render_direct3d9.cc
View File

@ -312,7 +312,6 @@ VideoRenderDirect3D9::~VideoRenderDirect3D9()
_screenUpdateThread = NULL;
if (tmpPtr)
{
tmpPtr->SetNotAlive();
_screenUpdateEvent->Set();
_screenUpdateEvent->StopTimer();
@ -515,7 +514,7 @@ int VideoRenderDirect3D9::InitDevice()
{ 1.0f, -1.0f, 0.0f, 0xffffffff, 1, 1 }, { 1.0f, 1.0f, 0.0f,
0xffffffff, 1, 0 } };
// Create the vertex buffer.
// Create the vertex buffer.
if (FAILED(_pd3dDevice->CreateVertexBuffer(sizeof(Vertices), 0,
D3DFVF_CUSTOMVERTEX,
D3DPOOL_DEFAULT, &_pVB, NULL )))
@ -837,7 +836,7 @@ int32_t VideoRenderDirect3D9::DeleteChannel(const uint32_t streamId)
if (ddIt != _d3dChannels.end())
{
delete ddIt->second;
_d3dChannels.erase(ddIt);
_d3dChannels.erase(ddIt);
return 0;
}
return -1;
@ -853,7 +852,7 @@ VideoRenderCallback* VideoRenderDirect3D9::CreateChannel(const uint32_t channel,
CriticalSectionScoped cs(&_refD3DCritsect);
//FIXME this should be done in VideoAPIWindows? stop the frame deliver first
//remove the old channel
//remove the old channel
DeleteChannel(channel);
D3D9Channel* d3dChannel = new D3D9Channel(_pd3dDevice,
@ -890,9 +889,8 @@ int32_t VideoRenderDirect3D9::GetStreamSettings(const uint32_t channel,
"Direct3D render failed to find channel");
return -1;
}
// Only allow one stream per channel, demuxing is
// Only allow one stream per channel, demuxing is
return ddobj->GetStreamSettings(0, zOrder, left, top, right, bottom);
//return ddobj->GetStreamSettings(streamId, zOrder, left, top, right, bottom);
}
int VideoRenderDirect3D9::UpdateVerticeBuffer(LPDIRECT3DVERTEXBUFFER9 pVB,
@ -1092,7 +1090,7 @@ int32_t VideoRenderDirect3D9::SetBitmap(const void* bitMap,
int pitch = bmap.bmWidth * 4;
if (pbi.bmiHeader.biBitCount == 24)
{
{
ConvertRGB24ToARGB(srcPtr, dstPtr, bmap.bmWidth, bmap.bmHeight, 0);
}
else
@ -1168,7 +1166,7 @@ int32_t VideoRenderDirect3D9::ConfigureRenderer(const uint32_t channel,
"Direct3D render failed to find channel");
return -1;
}
// Only allow one stream per channel, demuxing is
// Only allow one stream per channel, demuxing is
ddobj->SetStreamSettings(0, zOrder, left, top, right, bottom);
return 0;