Merge "aaudio: use unique_ptr for mixer buffer"

using android::FifoBuffer;

using android::fifo_frames_t;

AAudioMixer::~AAudioMixer() {

    delete[] mOutputBuffer;

}

void AAudioMixer::allocate(int32_t samplesPerFrame, int32_t framesPerBurst) {

    mSamplesPerFrame = samplesPerFrame;

    mFramesPerBurst = framesPerBurst;

    int32_t samplesPerBuffer = samplesPerFrame * framesPerBurst;

    mOutputBuffer = new float[samplesPerBuffer];

    mOutputBuffer = std::make_unique<float[]>(samplesPerBuffer);

    mBufferSizeInBytes = samplesPerBuffer * sizeof(float);

}

void AAudioMixer::clear() {

    memset(mOutputBuffer, 0, mBufferSizeInBytes);

    memset(mOutputBuffer.get(), 0, mBufferSizeInBytes);

}

int32_t AAudioMixer::mix(int streamIndex, FifoBuffer *fifo, bool allowUnderflow) {

    WrappingBuffer wrappingBuffer;

    float *destination = mOutputBuffer;

    float *destination = mOutputBuffer.get();

#if AAUDIO_MIXER_ATRACE_ENABLED

    ATRACE_BEGIN("aaMix");

}

float *AAudioMixer::getOutputBuffer() {

    return mOutputBuffer;

    return mOutputBuffer.get();

}

class AAudioMixer {

public:

    AAudioMixer() {}

    ~AAudioMixer();

    void allocate(int32_t samplesPerFrame, int32_t framesPerBurst);

private:

    void mixPart(float *destination, float *source, int32_t numFrames);

    float   *mOutputBuffer = nullptr;

    std::unique_ptr<float[]> mOutputBuffer;

    int32_t  mSamplesPerFrame = 0;

    int32_t  mFramesPerBurst = 0;

    int32_t  mBufferSizeInBytes = 0;