Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(124)

Unified Diff: media/audio/audio_input_device.cc

Issue 2452183003: Revert of Make more media APIs aware of |delay| and |delay_timestamp| (Closed)
Patch Set: Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/audio/audio_device_thread.cc ('k') | media/audio/audio_output_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/audio_input_device.cc
diff --git a/media/audio/audio_input_device.cc b/media/audio/audio_input_device.cc
index ce3067cd5d75b95ec9458e3b228d6142a3d1901b..cee639bb68073055d8dab39ff8306086e9c2cfbb 100644
--- a/media/audio/audio_input_device.cc
+++ b/media/audio/audio_input_device.cc
@@ -41,7 +41,7 @@
void MapSharedMemory() override;
// Called whenever we receive notifications about pending data.
- void Process(int64_t pending_data, base::TimeTicks data_timestamp) override;
+ void Process(uint32_t pending_data) override;
private:
const double bytes_per_ms_;
@@ -307,9 +307,7 @@
}
}
-void AudioInputDevice::AudioThreadCallback::Process(
- int64_t pending_data,
- base::TimeTicks data_timestamp) {
+void AudioInputDevice::AudioThreadCallback::Process(uint32_t pending_data) {
// The shared memory represents parameters, size of the data buffer and the
// actual data buffer containing audio data. Map the memory into this
// structure and parse out parameters and the data area.
@@ -331,9 +329,9 @@
capture_callback_->OnCaptureError(message);
}
if (current_segment_id_ != static_cast<int>(pending_data)) {
- std::string message =
- base::StringPrintf("Segment id not matching. Remote = %d. Local = %d.",
- static_cast<int>(pending_data), current_segment_id_);
+ std::string message = base::StringPrintf(
+ "Segment id not matching. Remote = %u. Local = %d.",
+ pending_data, current_segment_id_);
LOG(ERROR) << message;
capture_callback_->OnCaptureError(message);
}
« no previous file with comments | « media/audio/audio_device_thread.cc ('k') | media/audio/audio_output_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698