Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 04353390 authored by Eric Laurent's avatar Eric Laurent
Browse files

resolved conflicts for merge of 393dd03e to ics-scoop-plus-aosp 

Change-Id: Ib6af53957780a09e59d663206b956a39fe883d6a
parents 634db582 393dd03e

include/media/AudioTrack.h

+4 −2
Original line number Diff line number Diff line
@@ -130,8 +130,10 @@ public: 
     * format:             Audio format (e.g AUDIO_FORMAT_PCM_16_BIT for signed

     *                     16 bits per sample).

     * channelMask:        Channel mask: see audio_channels_t.

     * frameCount:         Total size of track PCM buffer in frames. This defines the

     *                     latency of the track.

     * frameCount:         Minimum size of track PCM buffer in frames. This defines the

     *                     latency of the track. The actual size selected by the AudioTrack could be

     *                     larger if the requested size is not compatible with current audio HAL

     *                     latency.

     * flags:              Reserved for future use.

     * cbf:                Callback function. If not null, this function is called periodically

     *                     to request new PCM data.

media/libmedia/AudioTrack.cpp

+3 −6
Original line number Diff line number Diff line
@@ -763,13 +763,10 @@ status_t AudioTrack::createTrack_l( 
                mNotificationFramesAct = frameCount/2;

            }

            if (frameCount < minFrameCount) {

                if (enforceFrameCount) {

                    ALOGE("Invalid buffer size: minFrameCount %d, frameCount %d", minFrameCount, frameCount);

                    return BAD_VALUE;

                } else {

                ALOGW_IF(enforceFrameCount, "Minimum buffer size corrected from %d to %d",

                         frameCount, minFrameCount);

                frameCount = minFrameCount;

            }

            }

        } else {

            // Ensure that buffer alignment matches channelcount

            int channelCount = popcount(channelMask);