Merge "CCodec: don't use array mode if in block model"

        }

        if (oStreamFormat.value == C2BufferData::LINEAR) {

            if (buffersBoundToCodec) {

                // WORKAROUND: if we're using early CSD workaround we convert to

                //             array mode, to appease apps assuming the output

                //             buffers to be of the same size.

                output->buffers = output->buffers->toArrayMode(numOutputSlots);

            }

            int32_t channelCount;

            int32_t sampleRate;