Merge "C2SoftOpusEnc: Fix higher bitrate encoding at lower sample rates" into qt-dev

        uint8_t* outPtr = wView.data() + mBytesEncoded;

        int encodedBytes =

            opus_multistream_encode(mEncoder, mInputBufferPcm16,

                                    mNumSamplesPerFrame, outPtr, kMaxPayload);

                                    mNumSamplesPerFrame, outPtr, kMaxPayload - mBytesEncoded);

        ALOGV("encoded %i Opus bytes from %zu PCM bytes", encodedBytes,

              processSize);

        if (encodedBytes < 0 || encodedBytes > kMaxPayload) {

        if (encodedBytes < 0 || encodedBytes > (kMaxPayload - mBytesEncoded)) {

            ALOGE("opus_encode failed, encodedBytes : %d", encodedBytes);

            mSignalledError = true;

            work->result = C2_CORRUPTED;

private:

    /* OPUS_FRAMESIZE_20_MS */

    const int kFrameSize = 960;

    const int kMaxPayload = 4000;

    const int kMaxSampleRate = 48000;

    const int kMinSampleRate = 8000;

    const int kMaxPayload = (4000 * kMaxSampleRate) / kMinSampleRate;

    const int kMaxNumChannels = 8;

    std::shared_ptr<IntfImpl> mIntf;