Require use of AudioBus::create() to avoid ref-counting issues

Source/core/platform/audio/chromium/AudioDestinationChromium.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 35 matching lines @@
 
 // Factory method: Chromium-implementation
 PassOwnPtr<AudioDestination> AudioDestination::create(AudioIOCallback& callback, const String& inputDeviceId, unsigned numberOfInputChannels, unsigned numberOfOutputChannels, float sampleRate)
 {
     return adoptPtr(new AudioDestinationChromium(callback, inputDeviceId, numberOfInputChannels, numberOfOutputChannels, sampleRate));
 }
 
 AudioDestinationChromium::AudioDestinationChromium(AudioIOCallback& callback, const String& inputDeviceId, unsigned numberOfInputChannels, unsigned numberOfOutputChannels, float sampleRate)
     : m_callback(callback)
     , m_numberOfOutputChannels(numberOfOutputChannels)
-    , m_inputBus(numberOfInputChannels, renderBufferSize)
-    , m_renderBus(numberOfOutputChannels, renderBufferSize, false)
+    , m_inputBus(AudioBus::create(numberOfInputChannels, renderBufferSize))
+    , m_renderBus(AudioBus::create(numberOfOutputChannels, renderBufferSize, false))
     , m_sampleRate(sampleRate)
     , m_isPlaying(false)
 {
     // Use the optimal buffer size recommended by the audio backend.
     m_callbackBufferSize = WebKit::Platform::current()->audioHardwareBufferSize();
 
     // Quick exit if the requested size is too large.
     ASSERT(m_callbackBufferSize + renderBufferSize <= fifoSize);
     if (m_callbackBufferSize + renderBufferSize > fifoSize)
         return;
 
     m_audioDevice = adoptPtr(WebKit::Platform::current()->createAudioDevice(m_callbackBufferSize, numberOfInputChannels, numberOfOutputChannels, sampleRate, this, inputDeviceId));
     ASSERT(m_audioDevice);
 
     // Create a FIFO to handle the possibility of the callback size
     // not being a multiple of the render size. If the FIFO already
     // contains enough data, the data will be provided directly.
     // Otherwise, the FIFO will call the provider enough times to
     // satisfy the request for data.
     m_fifo = adoptPtr(new AudioPullFIFO(*this, numberOfOutputChannels, fifoSize, renderBufferSize));
 
     // Input buffering.
     m_inputFifo = adoptPtr(new AudioFIFO(numberOfInputChannels, fifoSize));
 
     // If the callback size does not match the render size, then we need to buffer some
     // extra silence for the input. Otherwise, we can over-consume the input FIFO.
     if (m_callbackBufferSize != renderBufferSize) {
         // FIXME: handle multi-channel input and don't hard-code to stereo.
-        AudioBus silence(2, renderBufferSize);
-        m_inputFifo->push(&silence);
+        RefPtr<AudioBus> silence = AudioBus::create(2, renderBufferSize);
+        m_inputFifo->push(silence.get());
     }
 }
 
 AudioDestinationChromium::~AudioDestinationChromium()
 {
     stop();
 }
 
 void AudioDestinationChromium::start()
 {
@@ skipping 31 matching lines @@
 
     bool isBufferSizeGood = numberOfFrames == m_callbackBufferSize;
     if (!isBufferSizeGood) {
         ASSERT_NOT_REACHED();
         return;
     }
 
     // Buffer optional live input.
     if (sourceData.size() >= 2) {
         // FIXME: handle multi-channel input and don't hard-code to stereo.
-        AudioBus wrapperBus(2, numberOfFrames, false);
-        wrapperBus.setChannelMemory(0, sourceData[0], numberOfFrames);
-        wrapperBus.setChannelMemory(1, sourceData[1], numberOfFrames);
-        m_inputFifo->push(&wrapperBus);
+        RefPtr<AudioBus> wrapperBus = AudioBus::create(2, numberOfFrames, false);
+        wrapperBus->setChannelMemory(0, sourceData[0], numberOfFrames);
+        wrapperBus->setChannelMemory(1, sourceData[1], numberOfFrames);
+        m_inputFifo->push(wrapperBus.get());
     }
 
     for (unsigned i = 0; i < m_numberOfOutputChannels; ++i)
-        m_renderBus.setChannelMemory(i, audioData[i], numberOfFrames);
+        m_renderBus->setChannelMemory(i, audioData[i], numberOfFrames);
 
-    m_fifo->consume(&m_renderBus, numberOfFrames);
+    m_fifo->consume(m_renderBus.get(), numberOfFrames);
 }
 
 void AudioDestinationChromium::provideInput(AudioBus* bus, size_t framesToProcess)
 {
     AudioBus* sourceBus = 0;
     if (m_inputFifo->framesInFifo() >= framesToProcess) {
-        m_inputFifo->consume(&m_inputBus, framesToProcess);
-        sourceBus = &m_inputBus;
+        m_inputFifo->consume(m_inputBus.get(), framesToProcess);
+        sourceBus = m_inputBus.get();
     }
 
     m_callback.render(sourceBus, bus, framesToProcess);
 }
 
 } // namespace WebCore
 
 #endif // ENABLE(WEB_AUDIO)