summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorwjia@chromium.org <wjia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-30 23:29:20 +0000
committerwjia@chromium.org <wjia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-30 23:29:20 +0000
commitbb8f10a98c8f3a96025c47100c6473e2ce9645ad (patch)
tree1d8eb1d236d64322f975d6757e07079cc157aca2 /media
parent9806ffc8f9ecbd5121b45902cd7624c5327c8ccb (diff)
downloadchromium_src-bb8f10a98c8f3a96025c47100c6473e2ce9645ad.zip
chromium_src-bb8f10a98c8f3a96025c47100c6473e2ce9645ad.tar.gz
chromium_src-bb8f10a98c8f3a96025c47100c6473e2ce9645ad.tar.bz2
change LOG to DVLOG(1)
Review URL: https://chromiumcodereview.appspot.com/10451085 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139681 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/video/capture/linux/video_capture_device_linux.cc4
-rw-r--r--media/video/capture/video_capture_device_unittest.cc10
-rw-r--r--media/video/capture/win/video_capture_device_win.cc2
3 files changed, 8 insertions, 8 deletions
diff --git a/media/video/capture/linux/video_capture_device_linux.cc b/media/video/capture/linux/video_capture_device_linux.cc
index 4c3420a..56f5727 100644
--- a/media/video/capture/linux/video_capture_device_linux.cc
+++ b/media/video/capture/linux/video_capture_device_linux.cc
@@ -106,7 +106,7 @@ VideoCaptureDevice* VideoCaptureDevice::Create(const Name& device_name) {
// allocates the camera.
int fd = open(device_name.unique_id.c_str(), O_RDONLY);
if (fd < 0) {
- DPLOG(ERROR) << "Cannot open device";
+ DVLOG(1) << "Cannot open device";
delete self;
return NULL;
}
@@ -451,7 +451,7 @@ void VideoCaptureDeviceLinux::DeAllocateVideoBuffers() {
}
void VideoCaptureDeviceLinux::SetErrorState(const std::string& reason) {
- DLOG(ERROR) << reason;
+ DVLOG(1) << reason;
state_ = kError;
observer_->OnError();
}
diff --git a/media/video/capture/video_capture_device_unittest.cc b/media/video/capture/video_capture_device_unittest.cc
index 5ad9b26..c646918 100644
--- a/media/video/capture/video_capture_device_unittest.cc
+++ b/media/video/capture/video_capture_device_unittest.cc
@@ -87,7 +87,7 @@ TEST_F(VideoCaptureDeviceTest, OpenInvalidDevice) {
TEST_F(VideoCaptureDeviceTest, CaptureVGA) {
VideoCaptureDevice::GetDeviceNames(&names_);
if (!names_.size()) {
- LOG(WARNING) << "No camera available. Exiting test.";
+ DVLOG(1) << "No camera available. Exiting test.";
return;
}
@@ -115,7 +115,7 @@ TEST_F(VideoCaptureDeviceTest, CaptureVGA) {
TEST_F(VideoCaptureDeviceTest, Capture720p) {
VideoCaptureDevice::GetDeviceNames(&names_);
if (!names_.size()) {
- LOG(WARNING) << "No camera available. Exiting test.";
+ DVLOG(1) << "No camera available. Exiting test.";
return;
}
@@ -145,7 +145,7 @@ TEST_F(VideoCaptureDeviceTest, Capture720p) {
TEST_F(VideoCaptureDeviceTest, MAYBE_AllocateBadSize) {
VideoCaptureDevice::GetDeviceNames(&names_);
if (!names_.size()) {
- LOG(WARNING) << "No camera available. Exiting test.";
+ DVLOG(1) << "No camera available. Exiting test.";
return;
}
scoped_ptr<VideoCaptureDevice> device(
@@ -166,7 +166,7 @@ TEST_F(VideoCaptureDeviceTest, MAYBE_AllocateBadSize) {
TEST_F(VideoCaptureDeviceTest, ReAllocateCamera) {
VideoCaptureDevice::GetDeviceNames(&names_);
if (!names_.size()) {
- LOG(WARNING) << "No camera available. Exiting test.";
+ DVLOG(1) << "No camera available. Exiting test.";
return;
}
scoped_ptr<VideoCaptureDevice> device(
@@ -199,7 +199,7 @@ TEST_F(VideoCaptureDeviceTest, ReAllocateCamera) {
TEST_F(VideoCaptureDeviceTest, DeAllocateCameraWhileRunning) {
VideoCaptureDevice::GetDeviceNames(&names_);
if (!names_.size()) {
- LOG(WARNING) << "No camera available. Exiting test.";
+ DVLOG(1) << "No camera available. Exiting test.";
return;
}
scoped_ptr<VideoCaptureDevice> device(
diff --git a/media/video/capture/win/video_capture_device_win.cc b/media/video/capture/win/video_capture_device_win.cc
index 67b7cdb..55b5a16 100644
--- a/media/video/capture/win/video_capture_device_win.cc
+++ b/media/video/capture/win/video_capture_device_win.cc
@@ -653,7 +653,7 @@ int VideoCaptureDeviceWin::GetBestMatchedCapability(int requested_width,
}
void VideoCaptureDeviceWin::SetErrorState(const char* reason) {
- DLOG(ERROR) << reason;
+ DVLOG(1) << reason;
state_ = kError;
observer_->OnError();
}