summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authordalecurtis@chromium.org <dalecurtis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-23 01:32:25 +0000
committerdalecurtis@chromium.org <dalecurtis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-23 01:32:25 +0000
commit3fadf264a573d214319d4c8113650e1f0e7caefe (patch)
treea2a495a0a0855ede13e03fffe9c254baa4590e83 /media
parent21f183be69887e460f751c9e74c99187029cc8f1 (diff)
downloadchromium_src-3fadf264a573d214319d4c8113650e1f0e7caefe.zip
chromium_src-3fadf264a573d214319d4c8113650e1f0e7caefe.tar.gz
chromium_src-3fadf264a573d214319d4c8113650e1f0e7caefe.tar.bz2
Remove extra memcpys from AudioPullFifo.
Due to AudioPullFifo always clearing the |fifo_| before reading another block from |read_cb_| we can actually remove the AudioFifo object in favor of a plain AudioBus. Speedup is ~17% over the old version per AudioConverter benchmark using --audio-converter-iterations=500000: Old: 430.04ms New: 355.44ms BUG=none TEST=media_unittests Review URL: https://chromiumcodereview.appspot.com/15394003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201662 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/base/audio_converter.cc1
-rw-r--r--media/base/audio_pull_fifo.cc57
-rw-r--r--media/base/audio_pull_fifo.h13
-rw-r--r--media/base/audio_pull_fifo_unittest.cc1
4 files changed, 39 insertions, 33 deletions
diff --git a/media/base/audio_converter.cc b/media/base/audio_converter.cc
index d7c09f7..ac82e31 100644
--- a/media/base/audio_converter.cc
+++ b/media/base/audio_converter.cc
@@ -14,6 +14,7 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
+#include "media/base/audio_bus.h"
#include "media/base/audio_pull_fifo.h"
#include "media/base/channel_mixer.h"
#include "media/base/multi_channel_resampler.h"
diff --git a/media/base/audio_pull_fifo.cc b/media/base/audio_pull_fifo.cc
index 4943591..cf25142 100644
--- a/media/base/audio_pull_fifo.cc
+++ b/media/base/audio_pull_fifo.cc
@@ -7,53 +7,60 @@
#include <algorithm>
#include "base/logging.h"
+#include "media/base/audio_bus.h"
namespace media {
AudioPullFifo::AudioPullFifo(int channels, int frames, const ReadCB& read_cb)
- : read_cb_(read_cb) {
- fifo_.reset(new AudioFifo(channels, frames));
- bus_ = AudioBus::Create(channels, frames);
-}
+ : read_cb_(read_cb),
+ fifo_(AudioBus::Create(channels, frames)),
+ fifo_index_(frames) {}
-AudioPullFifo::~AudioPullFifo() {
- read_cb_.Reset();
-}
+AudioPullFifo::~AudioPullFifo() {}
void AudioPullFifo::Consume(AudioBus* destination, int frames_to_consume) {
- DCHECK(destination);
DCHECK_LE(frames_to_consume, destination->frames());
- int write_pos = 0;
int remaining_frames_to_provide = frames_to_consume;
// Try to fulfill the request using what's available in the FIFO.
- ReadFromFifo(destination, &remaining_frames_to_provide, &write_pos);
+ int frames_read = ReadFromFifo(destination, remaining_frames_to_provide, 0);
+ int write_pos = frames_read;
+ remaining_frames_to_provide -= frames_read;
// Get the remaining audio frames from the producer using the callback.
while (remaining_frames_to_provide > 0) {
+ DCHECK_EQ(fifo_index_, fifo_->frames());
+ fifo_index_ = 0;
+
// Fill up the FIFO by acquiring audio data from the producer.
- read_cb_.Run(write_pos, bus_.get());
- fifo_->Push(bus_.get());
+ read_cb_.Run(write_pos, fifo_.get());
// Try to fulfill the request using what's available in the FIFO.
- ReadFromFifo(destination, &remaining_frames_to_provide, &write_pos);
+ frames_read =
+ ReadFromFifo(destination, remaining_frames_to_provide, write_pos);
+ write_pos += frames_read;
+ remaining_frames_to_provide -= frames_read;
}
}
-void AudioPullFifo::Clear() {
- fifo_->Clear();
-}
+void AudioPullFifo::Clear() { fifo_index_ = fifo_->frames(); }
+
+int AudioPullFifo::ReadFromFifo(AudioBus* destination,
+ int frames_to_provide,
+ int write_pos) {
+ int frames = std::min(frames_to_provide, fifo_->frames() - fifo_index_);
+ if (frames <= 0)
+ return 0;
+
+ for (int ch = 0; ch < fifo_->channels(); ++ch) {
+ const float* src = fifo_->channel(ch) + fifo_index_;
+ float* dest = destination->channel(ch) + write_pos;
+ memcpy(dest, src, frames * sizeof(*src));
+ }
-void AudioPullFifo::ReadFromFifo(AudioBus* destination,
- int* frames_to_provide,
- int* write_pos) {
- DCHECK(frames_to_provide);
- DCHECK(write_pos);
- int frames = std::min(fifo_->frames(), *frames_to_provide);
- fifo_->Consume(destination, *write_pos, frames);
- *write_pos += frames;
- *frames_to_provide -= frames;
+ fifo_index_ += frames;
+ return frames;
}
} // namespace media
diff --git a/media/base/audio_pull_fifo.h b/media/base/audio_pull_fifo.h
index caf73e4..338f9b4 100644
--- a/media/base/audio_pull_fifo.h
+++ b/media/base/audio_pull_fifo.h
@@ -6,10 +6,10 @@
#define MEDIA_BASE_AUDIO_PULL_FIFO_H_
#include "base/callback.h"
-#include "media/base/audio_fifo.h"
#include "media/base/media_export.h"
namespace media {
+class AudioBus;
// A FIFO (First In First Out) buffer to handle mismatches in buffer sizes
// between a producer and consumer. The consumer will pull data from this FIFO.
@@ -43,17 +43,14 @@ class MEDIA_EXPORT AudioPullFifo {
private:
// Attempt to fulfill the request using what is available in the FIFO.
// Append new data to the |destination| starting at |write_pos|.
- void ReadFromFifo(
- AudioBus* destination, int* frames_to_provide, int* write_pos);
+ int ReadFromFifo(AudioBus* destination, int frames_to_provide, int write_pos);
// Source of data to the FIFO.
- ReadCB read_cb_;
-
- // The actual FIFO.
- scoped_ptr<AudioFifo> fifo_;
+ const ReadCB read_cb_;
// Temporary audio bus to hold the data from the producer.
- scoped_ptr<AudioBus> bus_;
+ scoped_ptr<AudioBus> fifo_;
+ int fifo_index_;
DISALLOW_COPY_AND_ASSIGN(AudioPullFifo);
};
diff --git a/media/base/audio_pull_fifo_unittest.cc b/media/base/audio_pull_fifo_unittest.cc
index cec4d35..b0e7afd 100644
--- a/media/base/audio_pull_fifo_unittest.cc
+++ b/media/base/audio_pull_fifo_unittest.cc
@@ -5,6 +5,7 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/stringprintf.h"
+#include "media/base/audio_bus.h"
#include "media/base/audio_pull_fifo.h"
#include "testing/gtest/include/gtest/gtest.h"