admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor fix to severl image path in vie_win_test

Browse Source 
BUG = NULL
TEST = Manual test with vie_win_test
Review URL: https://webrtc-codereview.appspot.com/479007

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2006 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
braveyao@webrtc.org 2012-04-11 10:24:18 +00:00
parent c35f5ced92
commit efbdec0542
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/video_engine/main/test/WindowsTest/CaptureDevicePool.cc
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
* Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
*
* Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source
@ -56,13 +56,8 @@ WebRtc_Word32 CaptureDevicePool::GetCaptureDevice(int& captureId, const char* un
WebRtc_Word32 result=_vieCapture->AllocateCaptureDevice(device->uniqeDeviceName,strlen(device->uniqeDeviceName),device->captureId);
if(result==0)
{
//CaptureCapability cap;
/*cap.height=1080;
cap.width=1920;
cap.maxFPS=25;
cap.interlaced=true;*/
// result=_vieCapture->StartCapture(device->captureId,cap);
result=_vieFile->SetCaptureDeviceImage(device->captureId,"captureDeviceImage.jpg");
result=_vieFile->SetCaptureDeviceImage(device->captureId,
"./main/test/WindowsTest/captureDeviceImage.jpg");
}
captureId=device->captureId;
_deviceMap.Insert(captureId,device);

6
src/video_engine/main/test/WindowsTest/ChannelDlg.cc
View File

@ -661,9 +661,11 @@ void CDXChannelDlg::ConfigureRender()
{
TEST_MUSTPASS(_vieRender->AddRenderer(_channelId,m_ctrlLiveRemoteVideo.m_hWnd, 0, 0.0f, 0.0f,1.0f,1.0f),-5);
TEST_MUSTPASS(_vieFile->SetRenderStartImage(_channelId,"renderStartImage.jpg"),-5);
TEST_MUSTPASS(_vieFile->SetRenderStartImage(_channelId,
"./main/test/WindowsTest/renderStartImage.jpg"),-5);
TEST_MUSTPASS(_vieRender->StartRender(_channelId),-5);
TEST_MUSTPASS(_vieFile->SetRenderTimeoutImage(_channelId,"renderTimeoutImage.jpg"),-5);
TEST_MUSTPASS(_vieFile->SetRenderTimeoutImage(_channelId,
"./main/test/WindowsTest/renderTimeoutImage.jpg"),-5);
}