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

Unified Diff: media/base/audio_fifo.cc

Issue 10915123: Adds media::AudioPullFifo class to Chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: AudioFIFO changes based on comments from Andrew Created 8 years, 3 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
Index: media/base/audio_fifo.cc
diff --git a/media/base/audio_fifo.cc b/media/base/audio_fifo.cc
index 67d10e2b8ca7416294edd97ca5d838492ce54b68..4cc941b0d7898b9bf96f7247ffa097474390458b 100644
--- a/media/base/audio_fifo.cc
+++ b/media/base/audio_fifo.cc
@@ -39,23 +39,20 @@ static int UpdatePos(int pos, int step, int max_size) {
AudioFifo::AudioFifo(int channels, int frames)
: audio_bus_(AudioBus::Create(channels, frames)),
- max_frames_in_fifo_(frames),
- frames_in_fifo_(0),
+ max_frames_(frames),
+ frames_(0),
read_pos_(0),
write_pos_(0) {}
AudioFifo::~AudioFifo() {}
-bool AudioFifo::Push(const AudioBus* source) {
+void AudioFifo::Push(const AudioBus* source) {
DCHECK(source);
DCHECK_EQ(source->channels(), audio_bus_->channels());
// Ensure that there is space for the new data in the FIFO.
const int source_size = source->frames();
- if (frames_in_fifo_ + source_size > max_frames()) {
- DLOG(ERROR) << "FIFO overflow.";
- return false;
- }
+ CHECK_LE(source_size + frames_, max_frames_);
// Figure out if wrapping is needed and if so what segment sizes we need
// when adding the new audio bus content to the FIFO.
@@ -76,28 +73,21 @@ bool AudioFifo::Push(const AudioBus* source) {
}
}
- frames_in_fifo_ += source_size;
- DCHECK_LE(frames_in_fifo_, max_frames());
+ frames_ += source_size;
+ DCHECK_LE(frames_, max_frames());
write_pos_ = UpdatePos(write_pos_, source_size, max_frames());
- return true;
}
-bool AudioFifo::Consume(AudioBus* destination, int frames_to_consume) {
+void AudioFifo::Consume(AudioBus* destination, int frames_to_consume) {
DCHECK(destination);
DCHECK_EQ(destination->channels(), audio_bus_->channels());
// It is not possible to ask for more data than what is available in the FIFO.
- if (frames_to_consume > frames_in_fifo_) {
- DLOG(ERROR) << "FIFO underrun.";
- return false;
- }
+ CHECK_LE(frames_to_consume, frames_);
// A copy from the FIFO to |destination| will only be performed if the
// allocated memory in |destination| is sufficient.
- if (frames_to_consume > destination->frames()) {
- DLOG(ERROR) << "Insufficient space in destination.";
- return false;
- }
+ CHECK_LE(frames_to_consume, destination->frames());
// Figure out if wrapping is needed and if so what segment sizes we need
// when removing audio bus content from the FIFO.
@@ -120,13 +110,12 @@ bool AudioFifo::Consume(AudioBus* destination, int frames_to_consume) {
}
}
- frames_in_fifo_ -= frames_to_consume;
+ frames_ -= frames_to_consume;
read_pos_ = UpdatePos(read_pos_, frames_to_consume, max_frames());
- return true;
}
void AudioFifo::Clear() {
- frames_in_fifo_ = 0;
+ frames_ = 0;
read_pos_ = 0;
write_pos_ = 0;
}

Powered by Google App Engine
This is Rietveld 408576698