Merge "Fix underruns when sample rate != native sample rate"

        // Ensure that buffer depth covers at least audio hardware latency

        uint32_t minBufCount = afLatency / ((1000 * afFrameCount)/afSampleRate);

        if (minBufCount < 2) {

            minBufCount = 2;

        ALOGV("afFrameCount=%d, minBufCount=%d, afSampleRate=%u, afLatency=%d",

                afFrameCount, minBufCount, afSampleRate, afLatency);

        if (minBufCount <= 2) {

            minBufCount = sampleRate == afSampleRate ? 2 : 3;

        }

        size_t minFrameCount = (afFrameCount*sampleRate*minBufCount)/afSampleRate;