generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Review URL: http://webrtc-codereview.appspot.com/92006

Browse Source 
git-svn-id: http://webrtc.googlecode.com/svn/trunk@352 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
mallinath@google.com 2011-08-11 18:22:17 +00:00
parent 911e36c525
commit 16f1dfc953
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/modules/video_capture/main/interface/video_capture_defines.h
View File

@ -37,10 +37,10 @@ enum VideoCaptureRotation
struct VideoCaptureCapability struct VideoCaptureCapability
{ {
WebRtc_UWord32 width; WebRtc_Word32 width;
WebRtc_UWord32 height; WebRtc_Word32 height;
WebRtc_UWord32 maxFPS; WebRtc_Word32 maxFPS;
WebRtc_UWord32 expectedCaptureDelay; WebRtc_Word32 expectedCaptureDelay;
RawVideoType rawType; RawVideoType rawType;
VideoCodecType codecType; VideoCodecType codecType;
bool interlaced; bool interlaced;

16
src/modules/video_capture/main/source/Linux/video_capture_linux.cc
View File

@ -120,9 +120,9 @@ WebRtc_Word32 VideoCaptureModuleV4L2::StartCapture(
{ {
if (_captureStarted) if (_captureStarted)
{ {
if (capability.width == _currentWidth if (capability.width == _currentWidth &&
&& capability.height == _currentHeight capability.height == _currentHeight &&
&& _captureVideoType == capability.rawType) _captureVideoType == capability.rawType)
{ {
return 0; return 0;
} }
@ -202,9 +202,8 @@ WebRtc_Word32 VideoCaptureModuleV4L2::StartCapture(
//start capture thread; //start capture thread;
if (!_captureThread) if (!_captureThread)
{ {
_captureThread = ThreadWrapper::CreateThread(VideoCaptureModuleV4L2::CaptureThread, _captureThread = ThreadWrapper::CreateThread(
this, VideoCaptureModuleV4L2::CaptureThread, this, kHighPriority);
kHighPriority);
unsigned int id; unsigned int id;
_captureThread->Start(id); _captureThread->Start(id);
} }
@ -214,7 +213,8 @@ WebRtc_Word32 VideoCaptureModuleV4L2::StartCapture(
type = V4L2_BUF_TYPE_VIDEO_CAPTURE; type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
if (ioctl(_deviceFd, VIDIOC_STREAMON, &type) == -1) if (ioctl(_deviceFd, VIDIOC_STREAMON, &type) == -1)
{ {
WEBRTC_TRACE(webrtc::kTraceError, webrtc::kTraceVideoCapture, _id, "Failed to turn on stream"); WEBRTC_TRACE(webrtc::kTraceError, webrtc::kTraceVideoCapture, _id,
"Failed to turn on stream");
return -1; return -1;
} }
@ -305,7 +305,7 @@ bool VideoCaptureModuleV4L2::AllocateVideoBuffers()
if (MAP_FAILED == pool[i].start) if (MAP_FAILED == pool[i].start)
{ {
for (int j = 0; j < i; j++) for (unsigned int j = 0; j < i; j++)
munmap(pool[j].start, pool[j].length); munmap(pool[j].start, pool[j].length);
return false; return false;
} }