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

Unified Diff: Source/core/platform/audio/AudioBus.cpp

Issue 14628008: Require use of AudioBus::create() to avoid ref-counting issues (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Require use of Created 7 years, 7 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 | « Source/core/platform/audio/AudioBus.h ('k') | Source/core/platform/audio/AudioFIFO.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/platform/audio/AudioBus.cpp
diff --git a/Source/core/platform/audio/AudioBus.cpp b/Source/core/platform/audio/AudioBus.cpp
index 6d7e294e33c38c2668969f2bda459d55b040c807..4da8425afff44f5fc68b496a46d3504b36a9cde3 100644
--- a/Source/core/platform/audio/AudioBus.cpp
+++ b/Source/core/platform/audio/AudioBus.cpp
@@ -48,16 +48,21 @@ using namespace VectorMath;
const unsigned MaxBusChannels = 32;
+PassRefPtr<AudioBus> AudioBus::create(unsigned numberOfChannels, size_t length, bool allocate)
+{
+ ASSERT(numberOfChannels <= MaxBusChannels);
+ if (numberOfChannels > MaxBusChannels)
+ return 0;
+
+ return adoptRef(new AudioBus(numberOfChannels, length, allocate));
+}
+
AudioBus::AudioBus(unsigned numberOfChannels, size_t length, bool allocate)
: m_length(length)
, m_busGain(1)
, m_isFirstTime(true)
, m_sampleRate(0)
{
- ASSERT(numberOfChannels <= MaxBusChannels);
- if (numberOfChannels > MaxBusChannels)
- return;
-
m_channels.reserveInitialCapacity(numberOfChannels);
for (unsigned i = 0; i < numberOfChannels; ++i) {
@@ -177,7 +182,7 @@ PassRefPtr<AudioBus> AudioBus::createBufferFromRange(const AudioBus* sourceBuffe
size_t rangeLength = endFrame - startFrame;
- RefPtr<AudioBus> audioBus = adoptRef(new AudioBus(numberOfChannels, rangeLength));
+ RefPtr<AudioBus> audioBus = create(numberOfChannels, rangeLength);
audioBus->setSampleRate(sourceBuffer->sampleRate());
for (unsigned i = 0; i < numberOfChannels; ++i)
@@ -543,7 +548,7 @@ PassRefPtr<AudioBus> AudioBus::createBySampleRateConverting(const AudioBus* sour
}
if (sourceBus->isSilent()) {
- RefPtr<AudioBus> silentBus = adoptRef(new AudioBus(numberOfSourceChannels, sourceBus->length() / sampleRateRatio));
+ RefPtr<AudioBus> silentBus = create(numberOfSourceChannels, sourceBus->length() / sampleRateRatio);
silentBus->setSampleRate(newSampleRate);
return silentBus;
}
@@ -565,7 +570,7 @@ PassRefPtr<AudioBus> AudioBus::createBySampleRateConverting(const AudioBus* sour
// Create destination bus with same number of channels.
unsigned numberOfDestinationChannels = resamplerSourceBus->numberOfChannels();
- RefPtr<AudioBus> destinationBus(adoptRef(new AudioBus(numberOfDestinationChannels, destinationLength)));
+ RefPtr<AudioBus> destinationBus = create(numberOfDestinationChannels, destinationLength);
// Sample-rate convert each channel.
for (unsigned i = 0; i < numberOfDestinationChannels; ++i) {
@@ -584,7 +589,7 @@ PassRefPtr<AudioBus> AudioBus::createBySampleRateConverting(const AudioBus* sour
PassRefPtr<AudioBus> AudioBus::createByMixingToMono(const AudioBus* sourceBus)
{
if (sourceBus->isSilent())
- return adoptRef(new AudioBus(1, sourceBus->length()));
+ return create(1, sourceBus->length());
switch (sourceBus->numberOfChannels()) {
case 1:
@@ -593,7 +598,7 @@ PassRefPtr<AudioBus> AudioBus::createByMixingToMono(const AudioBus* sourceBus)
case 2:
{
unsigned n = sourceBus->length();
- RefPtr<AudioBus> destinationBus(adoptRef(new AudioBus(1, n)));
+ RefPtr<AudioBus> destinationBus = create(1, n);
const float* sourceL = sourceBus->channel(0)->data();
const float* sourceR = sourceBus->channel(1)->data();
« no previous file with comments | « Source/core/platform/audio/AudioBus.h ('k') | Source/core/platform/audio/AudioFIFO.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698