Convert WebAudio file handlers to use AudioBus.

media/audio/audio_util.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Software adjust volume of samples, allows each audio stream its own
 // volume without impacting master volume for chrome and other applications.
 
 // Implemented as templates to allow 8, 16 and 32 bit implementations.
 // 8 bit is unsigned and biased by 128.
 
@@ skipping 159 matching lines @@
           reinterpret_cast<int32*>(buf),
           sample_count,
           volume,
           channels);
       return true;
     }
   }
   return false;
 }
 
-// TODO(dalecurtis): Delete once everywhere is using the AudioBus version:
-// http://crbug.com/120319.
-bool DeinterleaveAudioChannel(void* source,
-                              float* destination,
-                              int channels,
-                              int channel_index,
-                              int bytes_per_sample,
-                              size_t number_of_frames) {
-  switch (bytes_per_sample) {
-    case 1:
-    {
-      uint8* source8 = reinterpret_cast<uint8*>(source) + channel_index;
-      const float kScale = 1.0f / 128.0f;
-      for (unsigned i = 0; i < number_of_frames; ++i) {
-        destination[i] = kScale * (static_cast<int>(*source8) - 128);
-        source8 += channels;
-      }
-      return true;
-    }
-
-    case 2:
-    {
-      int16* source16 = reinterpret_cast<int16*>(source) + channel_index;
-      const float kScale = 1.0f / 32768.0f;
-      for (unsigned i = 0; i < number_of_frames; ++i) {
-        destination[i] = kScale * *source16;
-        source16 += channels;
-      }
-      return true;
-    }
-
-    case 4:
-    {
-      int32* source32 = reinterpret_cast<int32*>(source) + channel_index;
-      const float kScale = 1.0f / 2147483648.0f;
-      for (unsigned i = 0; i < number_of_frames; ++i) {
-        destination[i] = kScale * *source32;
-        source32 += channels;
-      }
-      return true;
-    }
-
-    default:
-     break;
-  }
-  return false;
-}
-
 // TODO(enal): use template specialization and size-specific intrinsics.
 //             Call is on the time-critical path, and by using SSE/AVX
 //             instructions we can speed things up by ~4-8x, more for the case
 //             when we have to adjust volume as well.
 template<class Format, class Fixed, int min_value, int max_value, int bias>
 static void MixStreams(Format* dst, Format* src, int count, float volume) {
   if (volume == 0.0f)
     return;
   if (volume == 1.0f) {
     // Most common case -- no need to adjust volume.
@@ skipping 208 matching lines @@
   //    out performance was degraded compared to XP.
   //  - The regression was fixed in Windows 7 and most configurations will work
   //    with 2, but some (e.g., some Sound Blasters) still need 3.
   //  - Some XP configurations (even multi-processor ones) also need 3.
   return (base::win::GetVersion() == base::win::VERSION_VISTA) ? 4 : 3;
 }
 
 #endif
 
 }  // namespace media