Change members's order and combine duplicated method for FFTFrame.

Source/platform/audio/mac/FFTFrameMac.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 62 matching lines @@
     m_frame.imagp = 0;
 
     m_FFTSize = 0;
     m_log2FFTSize = 0;
 }
 
 // Copy constructor
 FFTFrame::FFTFrame(const FFTFrame& frame)
     : m_FFTSize(frame.m_FFTSize)
     , m_log2FFTSize(frame.m_log2FFTSize)
-    , m_FFTSetup(frame.m_FFTSetup)
     , m_realData(frame.m_FFTSize)
     , m_imagData(frame.m_FFTSize)
+    , m_FFTSetup(frame.m_FFTSetup)
 {
     // Setup frame data
     m_frame.realp = m_realData.data();
     m_frame.imagp = m_imagData.data();
 
     // Copy/setup frame data
     unsigned nbytes = sizeof(float) * m_FFTSize;
     memcpy(realData(), frame.m_frame.realp, nbytes);
     memcpy(imagData(), frame.m_frame.imagp, nbytes);
 }
 
 FFTFrame::~FFTFrame()
 {
 }
 
 void FFTFrame::doFFT(const float* data)
 {
     AudioFloatArray scaledData(m_FFTSize);
     // veclib fft returns a result that is twice as large as would be expected. Compensate for that
     // by scaling the input by half so the FFT has the correct scaling.
     float scale = 0.5f;
     VectorMath::vsmul(data, 1, &scale, scaledData.data(), 1, m_FFTSize);

[KhNo, 2014/09/04 04:11:36]

It is using VectorMath::vsmul since vDSP_vsmul is called inside of
VectorMatch::vsmul by MACOSX macro.

 
     vDSP_ctoz((DSPComplex*)scaledData.data(), 2, &m_frame, 1, m_FFTSize / 2);
     vDSP_fft_zrip(m_FFTSetup, &m_frame, 1, m_log2FFTSize, FFT_FORWARD);
 }
 
 void FFTFrame::doInverseFFT(float* data)
 {
     vDSP_fft_zrip(m_FFTSetup, &m_frame, 1, m_log2FFTSize, FFT_INVERSE);
     vDSP_ztoc(&m_frame, 1, (DSPComplex*)data, 2, m_FFTSize / 2);
 
     // Do final scaling so that x == IFFT(FFT(x))
     float scale = 1.0f / m_FFTSize;
-    vDSP_vsmul(data, 1, &scale, data, 1, m_FFTSize);
+    VectorMath::vsmul(data, 1, &scale, data, 1, m_FFTSize);

[Raymond Toy, 2014/09/03 16:42:47]

This looks wrong.  Why the change from vDSP_vsmul to VectorMath::vsmul?

[KhNo, 2014/09/04 04:11:36]

To make it has unity and code maintenance.

[Raymond Toy, 2014/09/04 17:14:57]

I would prefer this change be done separately.  This has nothing to do with what
the CL is doing.

 }
 
 FFTSetup FFTFrame::fftSetupForSize(unsigned fftSize)
 {
     if (!fftSetups) {
         fftSetups = (FFTSetup*)malloc(sizeof(FFTSetup) * kMaxFFTPow2Size);
         memset(fftSetups, 0, sizeof(FFTSetup) * kMaxFFTPow2Size);
     }
 
     int pow2size = static_cast<int>(log2(fftSize));
@@ skipping 15 matching lines @@
 
     for (int i = 0; i < kMaxFFTPow2Size; ++i) {
         if (fftSetups[i])
             vDSP_destroy_fftsetup(fftSetups[i]);
     }
 
     free(fftSetups);
     fftSetups = 0;
 }
 
-float* FFTFrame::realData() const
-{
-    return m_frame.realp;

[KhNo, 2014/09/04 04:11:36]

.realp and .imap are just pointer of m_realData.data() and m_imagData.data().

[Raymond Toy, 2014/09/04 17:14:57]

Oh, because of line 62-63 in FFTFrame::FFTFrame.

Ok.

-}
-
-float* FFTFrame::imagData() const
-{
-    return m_frame.imagp;
-}
-
 } // namespace blink
 
 #endif // #if OS(MACOSX)
 
 #endif // ENABLE(WEB_AUDIO)