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

Replace old logging mechanism in webrtc/modules/video_capture/linux

Browse Source 
This replaces the WEBRTC_TRACE macros with LOG-macros.

Patchset 1: Run a formatting script, found in issue webrtc:5118.

Patchset 2: Apply manual fixes.
 - Fix cases and formatting not handled by the script
 - Replace a bit-shift / casting circus with utility function
   in video_capture_linux.cc

Bug: webrtc:5118
Change-Id: Ib49c1c4d2502834b9d655dafa7c34bc47f1d73d9
Reviewed-on: https://chromium-review.googlesource.com/603709
Commit-Queue: Sam Zackrisson <saza@webrtc.org>
Reviewed-by: Per Kjellander <perkj@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#19371}
This commit is contained in:
Sam Zackrisson
2017-08-16 13:39:25 +02:00
committed by Commit Bot
parent c103653113
commit 2ed6e4f022
3 changed files with 44 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
webrtc/modules/video_capture/linux/device_info_linux.cc
View File

@ -20,7 +20,7 @@
//v4l includes
#include <linux/videodev2.h>
#include "webrtc/system_wrappers/include/trace.h"
#include "webrtc/rtc_base/logging.h"
namespace webrtc
@ -49,8 +49,7 @@ DeviceInfoLinux::~DeviceInfoLinux()
uint32_t DeviceInfoLinux::NumberOfDevices()
{
WEBRTC_TRACE(webrtc::kTraceApiCall,
webrtc::kTraceVideoCapture, 0, "%s", __FUNCTION__);
LOG(LS_INFO) << __FUNCTION__;
uint32_t count = 0;
char device[20];
@ -79,8 +78,7 @@ int32_t DeviceInfoLinux::GetDeviceName(
char* /*productUniqueIdUTF8*/,
uint32_t /*productUniqueIdUTF8Length*/)
{
WEBRTC_TRACE(webrtc::kTraceApiCall,
webrtc::kTraceVideoCapture, 0, "%s", __FUNCTION__);
LOG(LS_INFO) << __FUNCTION__;
// Travel through /dev/video [0-63]
uint32_t count = 0;
@ -110,9 +108,8 @@ int32_t DeviceInfoLinux::GetDeviceName(
struct v4l2_capability cap;
if (ioctl(fd, VIDIOC_QUERYCAP, &cap) < 0)
{
WEBRTC_TRACE(webrtc::kTraceError, webrtc::kTraceVideoCapture, 0,
"error in querying the device capability for device %s. errno = %d",
device, errno);
LOG(LS_INFO) << "error in querying the device capability for device "
<< device << ". errno = " << errno;
close(fd);
return -1;
}
@ -129,8 +126,7 @@ int32_t DeviceInfoLinux::GetDeviceName(
}
else
{
WEBRTC_TRACE(webrtc::kTraceError, webrtc::kTraceVideoCapture, 0,
"buffer passed is too small");
LOG(LS_INFO) << "buffer passed is too small";
return -1;
}
@ -145,8 +141,7 @@ int32_t DeviceInfoLinux::GetDeviceName(
}
else
{
WEBRTC_TRACE(webrtc::kTraceError, webrtc::kTraceVideoCapture, 0,
"buffer passed is too small");
LOG(LS_INFO) << "buffer passed is too small";
return -1;
}
}
@ -165,12 +160,11 @@ int32_t DeviceInfoLinux::CreateCapabilityMap(
(int32_t) strlen((char*) deviceUniqueIdUTF8);
if (deviceUniqueIdUTF8Length > kVideoCaptureUniqueNameLength)
{
WEBRTC_TRACE(webrtc::kTraceError,
webrtc::kTraceVideoCapture, 0, "Device name too long");
LOG(LS_INFO) << "Device name too long";
return -1;
}
WEBRTC_TRACE(webrtc::kTraceInfo, webrtc::kTraceVideoCapture, 0,
"CreateCapabilityMap called for device %s", deviceUniqueIdUTF8);
LOG(LS_INFO) << "CreateCapabilityMap called for device "
<< deviceUniqueIdUTF8;
/* detect /dev/video [0-63] entries */
for (int n = 0; n < 64; ++n)
@ -209,8 +203,7 @@ int32_t DeviceInfoLinux::CreateCapabilityMap(
if (!found)
{
WEBRTC_TRACE(webrtc::kTraceError,
webrtc::kTraceVideoCapture, 0, "no matching device found");
LOG(LS_INFO) << "no matching device found";
return -1;
}
@ -227,11 +220,7 @@ int32_t DeviceInfoLinux::CreateCapabilityMap(
_lastUsedDeviceNameLength + 1);
memcpy(_lastUsedDeviceName, deviceUniqueIdUTF8, _lastUsedDeviceNameLength + 1);
WEBRTC_TRACE(webrtc::kTraceInfo,
webrtc::kTraceVideoCapture,
0,
"CreateCapabilityMap %u",
static_cast<unsigned int>(_captureCapabilities.size()));
LOG(LS_INFO) << "CreateCapabilityMap " << _captureCapabilities.size();
return size;
}
@ -315,20 +304,16 @@ int32_t DeviceInfoLinux::FillCapabilities(int fd)
_captureCapabilities.push_back(cap);
index++;
WEBRTC_TRACE(
webrtc::kTraceInfo, webrtc::kTraceVideoCapture, 0,
"Camera capability, width:%d height:%d type:%d fps:%d",
cap.width, cap.height, cap.videoType, cap.maxFPS);
LOG(LS_VERBOSE) << "Camera capability, width:" << cap.width
<< " height:" << cap.height << " type:"
<< static_cast<int32_t>(cap.videoType)
<< " fps:" << cap.maxFPS;
}
}
}
}
WEBRTC_TRACE(webrtc::kTraceInfo,
webrtc::kTraceVideoCapture,
0,
"CreateCapabilityMap %u",
static_cast<unsigned int>(_captureCapabilities.size()));
LOG(LS_INFO) << "CreateCapabilityMap " << _captureCapabilities.size();
return _captureCapabilities.size();
}