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

Source/core/platform/audio/AudioFIFO.cpp

 /*
  * Copyright (C) 2012 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 17 matching lines @@
 
 #include "config.h"
 
 #if ENABLE(WEB_AUDIO)
 
 #include "core/platform/audio/AudioFIFO.h"
 
 namespace WebCore {
 
 AudioFIFO::AudioFIFO(unsigned numberOfChannels, size_t fifoLength)
-    : m_fifoAudioBus(numberOfChannels, fifoLength)
+    : m_fifoAudioBus(new AudioBus(numberOfChannels, fifoLength))

[Chris Rogers, 2013/05/02 17:48:46]

need to wrap the new in adoptRef()

     , m_fifoLength(fifoLength)
     , m_framesInFifo(0)
     , m_readIndex(0)
     , m_writeIndex(0)
 {
 }
 
 void AudioFIFO::consume(AudioBus* destination, size_t framesToConsume)
 {
     bool isGood = destination && (framesToConsume <= m_fifoLength) && (framesToConsume <= m_framesInFifo) && (destination->length() >= framesToConsume);
     ASSERT(isGood);
     if (!isGood)
         return;
 
     // Copy the requested number of samples to the destination.
 
     size_t part1Length;
     size_t part2Length;
     findWrapLengths(m_readIndex, framesToConsume, part1Length, part2Length);
 
-    size_t numberOfChannels = m_fifoAudioBus.numberOfChannels();
+    size_t numberOfChannels = m_fifoAudioBus->numberOfChannels();
 
     for (size_t channelIndex = 0; channelIndex < numberOfChannels; ++channelIndex) {
         float* destinationData = destination->channel(channelIndex)->mutableData();
-        const float* sourceData = m_fifoAudioBus.channel(channelIndex)->data();
+        const float* sourceData = m_fifoAudioBus->channel(channelIndex)->data();
 
         bool isCopyGood = ((m_readIndex < m_fifoLength)
                            && (m_readIndex + part1Length) <= m_fifoLength
                            && (part1Length <= destination->length())
                            && (part1Length + part2Length) <= destination->length());
         ASSERT(isCopyGood);
         if (!isCopyGood)
             return;
 
         memcpy(destinationData, sourceData + m_readIndex, part1Length * sizeof(*sourceData));
@@ skipping 12 matching lines @@
 
     bool isGood = sourceBus && (m_framesInFifo + sourceBus->length() <= m_fifoLength);
     if (!isGood)
         return;
 
     size_t sourceLength = sourceBus->length();
     size_t part1Length;
     size_t part2Length;
     findWrapLengths(m_writeIndex, sourceLength, part1Length, part2Length);
 
-    size_t numberOfChannels = m_fifoAudioBus.numberOfChannels();
+    size_t numberOfChannels = m_fifoAudioBus->numberOfChannels();
 
     for (size_t channelIndex = 0; channelIndex < numberOfChannels; ++channelIndex) {
-        float* destination = m_fifoAudioBus.channel(channelIndex)->mutableData();
+        float* destination = m_fifoAudioBus->channel(channelIndex)->mutableData();
         const float* source = sourceBus->channel(channelIndex)->data();
 
         bool isCopyGood = ((m_writeIndex < m_fifoLength)
                            && (m_writeIndex + part1Length) <= m_fifoLength
                            && part2Length < m_fifoLength
                            && part1Length + part2Length <= sourceLength);
         ASSERT(isCopyGood);
         if (!isCopyGood)
             return;
 
@@ skipping 25 matching lines @@
     } else {
         // Invalid values for index or size. Set the part lengths to zero so nothing is copied.
         part1Length = 0;
         part2Length = 0;
     }
 }
 
 } // namespace WebCore
 
 #endif // ENABLE(WEB_AUDIO)