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

Source/platform/audio/android/FFTFrameOpenMAXDLAndroid.cpp

 /* Copyright (C) 2013 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
  *     notice, this list of conditions and the following disclaimer in the
@@ skipping 27 matching lines @@
 namespace blink {
 
 #if ENABLE(ASSERT)
 const unsigned kMaxFFTPow2Size = 15;
 #endif
 
 // Normal constructor: allocates for a given fftSize.
 FFTFrame::FFTFrame(unsigned fftSize)
     : m_FFTSize(fftSize)
     , m_log2FFTSize(static_cast<unsigned>(log2(fftSize)))
+    , m_realData(fftSize / 2)
+    , m_imagData(fftSize / 2)
     , m_forwardContext(0)
     , m_inverseContext(0)
     , m_complexData(fftSize)
-    , m_realData(fftSize / 2)
-    , m_imagData(fftSize / 2)
 {
     // We only allow power of two.
     ASSERT(1UL << m_log2FFTSize == m_FFTSize);
 
     m_forwardContext = contextForSize(m_log2FFTSize);
     m_inverseContext = contextForSize(m_log2FFTSize);
 }
 
 // Creates a blank/empty frame (interpolate() must later be called).
 FFTFrame::FFTFrame()
     : m_FFTSize(0)
     , m_log2FFTSize(0)
     , m_forwardContext(0)
     , m_inverseContext(0)
 {
 }
 
 // Copy constructor.
 FFTFrame::FFTFrame(const FFTFrame& frame)
     : m_FFTSize(frame.m_FFTSize)
     , m_log2FFTSize(frame.m_log2FFTSize)
+    , m_realData(frame.m_FFTSize / 2)
+    , m_imagData(frame.m_FFTSize / 2)
     , m_forwardContext(0)
     , m_inverseContext(0)
     , m_complexData(frame.m_FFTSize)
-    , m_realData(frame.m_FFTSize / 2)
-    , m_imagData(frame.m_FFTSize / 2)
 {
     m_forwardContext = contextForSize(m_log2FFTSize);
     m_inverseContext = contextForSize(m_log2FFTSize);
 
     // Copy/setup frame data.
     unsigned nbytes = sizeof(float) * (m_FFTSize / 2);
     memcpy(realData(), frame.realData(), nbytes);
     memcpy(imagData(), frame.imagData(), nbytes);
 }
 
@@ skipping 58 matching lines @@
         }
         fftData[0] = real[0];
         fftData[1] = 0;
         fftData[m_FFTSize] = imag[0];
         fftData[m_FFTSize + 1] = 0;
 
         omxSP_FFTInv_CCSToR_F32(fftData, data, m_inverseContext);
     }
 }
 
-float* FFTFrame::realData() const
-{
-    return const_cast<float*>(m_realData.data());
-}
-
-float* FFTFrame::imagData() const
-{
-    return const_cast<float*>(m_imagData.data());
-}
-
 OMXFFTSpec_R_F32* FFTFrame::contextForSize(unsigned log2FFTSize)
 {
     ASSERT(log2FFTSize);
     ASSERT(log2FFTSize <= kMaxFFTPow2Size);
     int bufSize;
     OMXResult status = omxSP_FFTGetBufSize_R_F32(log2FFTSize, &bufSize);
 
     if (status == OMX_Sts_NoErr) {
         OMXFFTSpec_R_F32* context = static_cast<OMXFFTSpec_R_F32*>(malloc(bufSize));
         omxSP_FFTInit_R_F32(context, log2FFTSize);
         return context;
     }
 
     return 0;
 }
 
 } // namespace blink
 
 #endif // #if OS(ANDROID) && !USE(WEBAUDIO_OPENMAX_DL_FFT)
 
 #endif // ENABLE(WEB_AUDIO)