summaryrefslogtreecommitdiffstats
path: root/media/base
diff options
context:
space:
mode:
authorpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-19 23:49:42 +0000
committerpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-19 23:49:42 +0000
commit5f2d7017a397fef6245981de1a27c72c8dc89084 (patch)
tree4db716c2e459ed85af20e06ad3875fdc9c2810ac /media/base
parent7d9664e3f23011ded7a44aafe87b3e4c63b1e013 (diff)
downloadchromium_src-5f2d7017a397fef6245981de1a27c72c8dc89084.zip
chromium_src-5f2d7017a397fef6245981de1a27c72c8dc89084.tar.gz
chromium_src-5f2d7017a397fef6245981de1a27c72c8dc89084.tar.bz2
Convert LOG(INFO) to VLOG(1) - media/.
Also, remove some extra {}s, remove "else" after "return", eliminate a "using". BUG=none TEST=none Review URL: http://codereview.chromium.org/3912001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63140 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base')
-rw-r--r--media/base/pipeline_impl.cc13
-rw-r--r--media/base/seekable_buffer_unittest.cc2
2 files changed, 7 insertions, 8 deletions
diff --git a/media/base/pipeline_impl.cc b/media/base/pipeline_impl.cc
index 5d7759c..64a1ecd 100644
--- a/media/base/pipeline_impl.cc
+++ b/media/base/pipeline_impl.cc
@@ -84,12 +84,11 @@ bool PipelineImpl::Start(FilterFactory* factory,
DCHECK(factory);
scoped_ptr<PipelineCallback> callback(start_callback);
if (running_) {
- LOG(INFO) << "Media pipeline is already running";
+ VLOG(1) << "Media pipeline is already running";
return false;
}
- if (!factory) {
+ if (!factory)
return false;
- }
// Kick off initialization!
running_ = true;
@@ -107,7 +106,7 @@ void PipelineImpl::Stop(PipelineCallback* stop_callback) {
AutoLock auto_lock(lock_);
scoped_ptr<PipelineCallback> callback(stop_callback);
if (!running_) {
- LOG(INFO) << "Media pipeline has already stopped";
+ VLOG(1) << "Media pipeline has already stopped";
return;
}
@@ -121,7 +120,7 @@ void PipelineImpl::Seek(base::TimeDelta time,
AutoLock auto_lock(lock_);
scoped_ptr<PipelineCallback> callback(seek_callback);
if (!running_) {
- LOG(INFO) << "Media pipeline must be running";
+ VLOG(1) << "Media pipeline must be running";
return;
}
@@ -438,7 +437,7 @@ PipelineImpl::State PipelineImpl::FindNextState(State current) {
void PipelineImpl::SetError(PipelineError error) {
DCHECK(IsRunning());
DCHECK(error != PIPELINE_OK) << "PIPELINE_OK isn't an error!";
- LOG(INFO) << "Media pipeline error: " << error;
+ VLOG(1) << "Media pipeline error: " << error;
message_loop_->PostTask(FROM_HERE,
NewRunnableMethod(this, &PipelineImpl::ErrorChangedTask, error));
@@ -764,7 +763,7 @@ void PipelineImpl::SeekTask(base::TimeDelta time,
if (state_ != kStarted && state_ != kEnded) {
// TODO(scherkus): should we run the callback? I'm tempted to say the API
// will only execute the first Seek() request.
- LOG(INFO) << "Media pipeline has not started, ignoring seek to "
+ VLOG(1) << "Media pipeline has not started, ignoring seek to "
<< time.InMicroseconds();
delete seek_callback;
return;
diff --git a/media/base/seekable_buffer_unittest.cc b/media/base/seekable_buffer_unittest.cc
index 286580b..50f5d15 100644
--- a/media/base/seekable_buffer_unittest.cc
+++ b/media/base/seekable_buffer_unittest.cc
@@ -25,7 +25,7 @@ class SeekableBufferTest : public testing::Test {
// Setup seed.
size_t seed = static_cast<int32>(base::Time::Now().ToInternalValue());
srand(seed);
- LOG(INFO) << "Random seed: " << seed;
+ VLOG(1) << "Random seed: " << seed;
// Creates a test data.
for (size_t i = 0; i < kDataSize; i++)