summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authortedvessenes@gmail.com <tedvessenes@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-03 17:09:28 +0000
committertedvessenes@gmail.com <tedvessenes@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-03 17:09:28 +0000
commite26450a83c71d47822fb839776fd4da218e5a10f (patch)
tree2695965d4066de88d42749f46e4a12db8dece8eb /media
parent2c0cff64dd923cab3fdaaa9a4b2d3ea9a7000e15 (diff)
downloadchromium_src-e26450a83c71d47822fb839776fd4da218e5a10f.zip
chromium_src-e26450a83c71d47822fb839776fd4da218e5a10f.tar.gz
chromium_src-e26450a83c71d47822fb839776fd4da218e5a10f.tar.bz2
Convert uses of int ms to TimeDelta in media/audio.
R=tommi@chromium.org BUG=108171 Review URL: http://codereview.chromium.org/9580038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124865 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/audio/audio_input_unittest.cc5
-rw-r--r--media/audio/audio_low_latency_input_output_unittest.cc2
-rw-r--r--media/audio/audio_output_controller.cc4
-rw-r--r--media/audio/linux/alsa_output.cc5
4 files changed, 10 insertions, 6 deletions
diff --git a/media/audio/audio_input_unittest.cc b/media/audio/audio_input_unittest.cc
index 54ece0c..35efcb8 100644
--- a/media/audio/audio_input_unittest.cc
+++ b/media/audio/audio_input_unittest.cc
@@ -159,7 +159,10 @@ TEST(AudioInputTest, Record) {
ais->Start(&test_callback);
// Verify at least 500ms worth of audio was recorded, after giving sufficient
// extra time.
- message_loop.PostDelayedTask(FROM_HERE, MessageLoop::QuitClosure(), 590);
+ message_loop.PostDelayedTask(
+ FROM_HERE,
+ MessageLoop::QuitClosure(),
+ base::TimeDelta::FromMilliseconds(590));
message_loop.Run();
EXPECT_GE(test_callback.callback_count(), 10);
EXPECT_FALSE(test_callback.had_error());
diff --git a/media/audio/audio_low_latency_input_output_unittest.cc b/media/audio/audio_low_latency_input_output_unittest.cc
index cea2554..9ad8a98 100644
--- a/media/audio/audio_low_latency_input_output_unittest.cc
+++ b/media/audio/audio_low_latency_input_output_unittest.cc
@@ -442,7 +442,7 @@ TEST_F(AudioLowLatencyInputOutputTest, DISABLED_FullDuplexDelayMeasurement) {
// in loop back during this time. At the same time, delay recordings are
// performed and stored in the output text file.
message_loop()->PostDelayedTask(FROM_HERE,
- MessageLoop::QuitClosure(), TestTimeouts::action_timeout_ms());
+ MessageLoop::QuitClosure(), TestTimeouts::action_timeout());
message_loop()->Run();
aos->Stop();
diff --git a/media/audio/audio_output_controller.cc b/media/audio/audio_output_controller.cc
index 7e14fac..0291c38 100644
--- a/media/audio/audio_output_controller.cc
+++ b/media/audio/audio_output_controller.cc
@@ -162,7 +162,7 @@ void AudioOutputController::DoPlay() {
FROM_HERE,
base::Bind(&AudioOutputController::PollAndStartIfDataReady,
weak_this_.GetWeakPtr()),
- kPollPauseInMilliseconds);
+ base::TimeDelta::FromMilliseconds(kPollPauseInMilliseconds));
}
void AudioOutputController::PollAndStartIfDataReady() {
@@ -187,7 +187,7 @@ void AudioOutputController::PollAndStartIfDataReady() {
FROM_HERE,
base::Bind(&AudioOutputController::PollAndStartIfDataReady,
weak_this_.GetWeakPtr()),
- kPollPauseInMilliseconds);
+ base::TimeDelta::FromMilliseconds(kPollPauseInMilliseconds));
}
}
diff --git a/media/audio/linux/alsa_output.cc b/media/audio/linux/alsa_output.cc
index 0cd2d0c..a57c276 100644
--- a/media/audio/linux/alsa_output.cc
+++ b/media/audio/linux/alsa_output.cc
@@ -604,10 +604,11 @@ void AlsaPcmOutputStream::ScheduleNextWrite(bool source_exhausted) {
} else {
// TODO(ajwong): Measure the reliability of the delay interval. Use
// base/metrics/histogram.h.
- manager_->GetMessageLoop()->PostDelayedTask(FROM_HERE,
+ manager_->GetMessageLoop()->PostDelayedTask(
+ FROM_HERE,
base::Bind(&AlsaPcmOutputStream::WriteTask,
weak_factory_.GetWeakPtr()),
- next_fill_time_ms);
+ base::TimeDelta::FromMilliseconds(next_fill_time_ms));
}
}
}