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

Commit df813a3b authored by Jean-Michel Trivi's avatar Jean-Michel Trivi
Browse files

audio_attributes_t for SoundPool 

Add support for the audio_attributes_t structure in the
 SoundPoool constructor.
Remove SRC quality which was never implemented.
Remove stream types.

Add file to contain audio helper functions related to policy.

Change-Id: I1720ff15e7b23ea7b713a4395fdfac26dc3fd4da
parent 8bce8414

include/media/AudioPolicyHelper.h

0 → 100644
+64 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2014 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

#ifndef AUDIO_POLICY_HELPER_H_

#define AUDIO_POLICY_HELPER_H_



#include <system/audio.h>



audio_stream_type_t audio_attributes_to_stream_type(const audio_attributes_t *attr)

{

    // flags to stream type mapping

    if ((attr->flags & AUDIO_FLAG_AUDIBILITY_ENFORCED) == AUDIO_FLAG_AUDIBILITY_ENFORCED) {

        return AUDIO_STREAM_ENFORCED_AUDIBLE;

    }

    if ((attr->flags & AUDIO_FLAG_SCO) == AUDIO_FLAG_SCO) {

        return AUDIO_STREAM_BLUETOOTH_SCO;

    }



    // usage to stream type mapping

    switch (attr->usage) {

    case AUDIO_USAGE_MEDIA:

    case AUDIO_USAGE_GAME:

    case AUDIO_USAGE_ASSISTANCE_ACCESSIBILITY:

    case AUDIO_USAGE_ASSISTANCE_NAVIGATION_GUIDANCE:

        return AUDIO_STREAM_MUSIC;

    case AUDIO_USAGE_ASSISTANCE_SONIFICATION:

        return AUDIO_STREAM_SYSTEM;

    case AUDIO_USAGE_VOICE_COMMUNICATION:

        return AUDIO_STREAM_VOICE_CALL;



    case AUDIO_USAGE_VOICE_COMMUNICATION_SIGNALLING:

        return AUDIO_STREAM_DTMF;



    case AUDIO_USAGE_ALARM:

        return AUDIO_STREAM_ALARM;

    case AUDIO_USAGE_NOTIFICATION_TELEPHONY_RINGTONE:

        return AUDIO_STREAM_RING;



    case AUDIO_USAGE_NOTIFICATION:

    case AUDIO_USAGE_NOTIFICATION_COMMUNICATION_REQUEST:

    case AUDIO_USAGE_NOTIFICATION_COMMUNICATION_INSTANT:

    case AUDIO_USAGE_NOTIFICATION_COMMUNICATION_DELAYED:

    case AUDIO_USAGE_NOTIFICATION_EVENT:

        return AUDIO_STREAM_NOTIFICATION;



    case AUDIO_USAGE_UNKNOWN:

    default:

        return AUDIO_STREAM_MUSIC;

    }

}



#endif //AUDIO_POLICY_HELPER_H_

include/media/SoundPool.h

+3 −5
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ class SoundPool { 
    friend class SoundPoolThread;

    friend class SoundChannel;

public:

    SoundPool(int maxChannels, audio_stream_type_t streamType, int srcQuality);

    SoundPool(int maxChannels, const audio_attributes_t* pAttributes);

    ~SoundPool();

    int load(const char* url, int priority);

    int load(int fd, int64_t offset, int64_t length, int priority);
@@ -183,8 +183,7 @@ public: 
    void setPriority(int channelID, int priority);

    void setLoop(int channelID, int loop);

    void setRate(int channelID, float rate);

    audio_stream_type_t streamType() const { return mStreamType; }

    int srcQuality() const { return mSrcQuality; }

    const audio_attributes_t* attributes() { return &mAttributes; }



    // called from SoundPoolThread

    void sampleLoaded(int sampleID);
@@ -225,8 +224,7 @@ private: 
    List<SoundChannel*>     mStop;

    DefaultKeyedVector< int, sp<Sample> >   mSamples;

    int                     mMaxChannels;

    audio_stream_type_t     mStreamType;

    int                     mSrcQuality;

    audio_attributes_t      mAttributes;

    int                     mAllocated;

    int                     mNextSampleID;

    int                     mNextChannelID;

media/libmedia/SoundPool.cpp

+6 −6
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <media/mediaplayer.h>

#include <media/SoundPool.h>

#include "SoundPoolThread.h"

#include <media/AudioPolicyHelper.h>



namespace android

{
@@ -39,10 +40,10 @@ uint32_t kDefaultFrameCount = 1200; 
size_t kDefaultHeapSize = 1024 * 1024; // 1MB





SoundPool::SoundPool(int maxChannels, audio_stream_type_t streamType, int srcQuality)

SoundPool::SoundPool(int maxChannels, const audio_attributes_t* pAttributes)

{

    ALOGV("SoundPool constructor: maxChannels=%d, streamType=%d, srcQuality=%d",

            maxChannels, streamType, srcQuality);

    ALOGV("SoundPool constructor: maxChannels=%d, attr.usage=%d, attr.flags=0x%x, attr.tags=%s",

            maxChannels, pAttributes->usage, pAttributes->flags, pAttributes->tags);



    // check limits

    mMaxChannels = maxChannels;
@@ -56,8 +57,7 @@ SoundPool::SoundPool(int maxChannels, audio_stream_type_t streamType, int srcQua 


    mQuit = false;

    mDecodeThread = 0;

    mStreamType = streamType;

    mSrcQuality = srcQuality;

    memcpy(&mAttributes, pAttributes, sizeof(audio_attributes_t));

    mAllocated = 0;

    mNextSampleID = 0;

    mNextChannelID = 0;
@@ -580,7 +580,7 @@ void SoundChannel::play(const sp<Sample>& sample, int nextChannelID, float leftV 
        // initialize track

        size_t afFrameCount;

        uint32_t afSampleRate;

        audio_stream_type_t streamType = mSoundPool->streamType();

        audio_stream_type_t streamType = audio_attributes_to_stream_type(mSoundPool->attributes());

        if (AudioSystem::getOutputFrameCount(&afFrameCount, streamType) != NO_ERROR) {

            afFrameCount = kDefaultFrameCount;

        }