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

Commit 19219b44 authored by François Gaffie's avatar François Gaffie Committed by Eric Laurent
Browse files

audio policy: use reference for all default volume table 



This patch migrates all default volume tables as reference
volume tables.
No implicit volume tables is allowed any more, the reference
must be given for all stream type and device category.
It allows removing the WA that was introduce to use the stream CNT
to host the default volume tables.

Change-Id: I19f5e9d2a62d448f0f8447f93acbbd2e1a723958
Signed-off-by: default avatarFrançois Gaffie <francois.gaffie@intel.com>
parent c9d7c4e3

services/audiopolicy/common/managerdefinitions/include/AudioPolicyConfig.h

+0 −1
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ public: 
    {

        if (mVolumeCurves != nullptr) {

            *mVolumeCurves = volumes;

            mVolumeCurves->setDefaultCurves();

        }

    }

services/audiopolicy/common/managerdefinitions/include/VolumeCurve.h

+2 −21
Original line number Diff line number Diff line
@@ -150,8 +150,8 @@ class VolumeCurvesCollection : public KeyedVector<audio_stream_type_t, VolumeCur 
public:

    VolumeCurvesCollection()

    {

        // Create an empty collection of curves even for CNT stream (used for default curves)

        for (ssize_t i = 0 ; i <= AUDIO_STREAM_CNT; i++) {

        // Create an empty collection of curves

        for (ssize_t i = 0 ; i < AUDIO_STREAM_CNT; i++) {

            audio_stream_type_t stream = static_cast<audio_stream_type_t>(i);

            KeyedVector::add(stream, VolumeCurvesForStream());

        }
@@ -218,25 +218,6 @@ public: 
        ALOG_ASSERT(indexOfKey(stream) >= 0, "Invalid stream type for Volume Curve");

        return valueFor(stream);

    }

    void setDefaultCurves()

    {

        for (size_t i = 0 ; i < AUDIO_STREAM_CNT; i++) {

            audio_stream_type_t stream = static_cast<audio_stream_type_t>(i);

            ALOG_ASSERT(indexOfKey(stream) >= 0, "No Default volume table found!");



            VolumeCurvesForStream &curvesForStream = editValueAt(stream);

            // Sanity check on All device categories

            for (int i = 0; i < DEVICE_CATEGORY_CNT; i++) {

                device_category cat = (device_category)i;

                if (curvesForStream.getCurvesFor(cat) == 0) {

                    ALOG_ASSERT(valueAt(AUDIO_STREAM_CNT).getCurvesFor(cat) != 0,

                                "No Default volume table found for device category %d", cat);

                    ALOGW("Switching to default table for stream %d category %d", stream, cat);

                    curvesForStream.add(valueAt(AUDIO_STREAM_CNT).getCurvesFor(cat));

                }

            }

        }

    }

};



}; // namespace android

services/audiopolicy/common/managerdefinitions/src/Serializer.cpp

+17 −10
Original line number Diff line number Diff line
@@ -50,9 +50,13 @@ const uint32_t PolicySerializer::gMinor = 0; 
static const char *const gReferenceElementName = "reference";

static const char *const gReferenceAttributeName = "name";



template <class Trait>

static void getReference(const _xmlNode *root, const _xmlNode *&refNode, const string &refName)

{

    const _xmlNode *cur = root->xmlChildrenNode;

    const _xmlNode *col = root;

    while (col != NULL) {

        if (!xmlStrcmp(col->name, (const xmlChar *)Trait::collectionTag)) {

            const xmlNode *cur = col->children;

            while (cur != NULL) {

                if ((!xmlStrcmp(cur->name, (const xmlChar *)gReferenceElementName))) {

                    string name = getXmlAttribute(cur, gReferenceAttributeName);
@@ -63,6 +67,9 @@ static void getReference(const _xmlNode *root, const _xmlNode *&refNode, const s 
                }

                cur = cur->next;

            }

        }

        col = col->next;

    }

    return;

}
@@ -538,7 +545,7 @@ status_t VolumeTraits::deserialize(_xmlDoc *doc, const _xmlNode *root, PtrElemen 
    string referenceName = getXmlAttribute(root, Attributes::reference);

    const _xmlNode *ref = NULL;

    if (!referenceName.empty()) {

        getReference(root->parent, ref, referenceName);

        getReference<VolumeTraits>(root->parent, ref, referenceName);

        if (ref == NULL) {

            ALOGE("%s: No reference Ptr found for %s", __FUNCTION__, referenceName.c_str());

            return BAD_VALUE;

services/audiopolicy/common/managerdefinitions/src/TypeConverter.cpp

+0 −2
Original line number Diff line number Diff line
@@ -220,8 +220,6 @@ const StreamTypeConverter::Table StreamTypeConverter::mTable[] = { 
    MAKE_STRING_FROM_ENUM(AUDIO_STREAM_ACCESSIBILITY),

    MAKE_STRING_FROM_ENUM(AUDIO_STREAM_REROUTING),

    MAKE_STRING_FROM_ENUM(AUDIO_STREAM_PATCH),



    MAKE_STRING_FROM_ENUM(AUDIO_STREAM_CNT) // Required to manage default volume tables

};



template<>

services/audiopolicy/config/audio_policy_volumes.xml

+80 −52
Original line number Diff line number Diff line
@@ -41,36 +41,64 @@ volume index from 0 to 100. 
        <point>66,-800</point>

        <point>100,0</point>

    </volume>

    <volume stream="AUDIO_STREAM_VOICE_CALL" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA" ref="DEFAULT_MEDIA_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_VOICE_CALL" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"

                                             ref="DEFAULT_MEDIA_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_HEADSET">

        <point>1,-3000</point>

        <point>33,-2600</point>

        <point>66,-2200</point>

        <point>100,-1800</point>

    </volume>

    <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_SPEAKER" ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_EARPIECE" ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_SPEAKER"

                                         ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_EARPIECE"

                                         ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"

                                         ref="DEFAULT_DEVICE_CATEGORY_EXT_MEDIA_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_HEADSET"

                                       ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_SPEAKER">

        <point>1,-2970</point>

        <point>33,-2010</point>

        <point>66,-1020</point>

        <point>100,0</point>

    </volume>

    <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_HEADSET" ref="DEFAULT_MEDIA_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_EARPIECE" ref="DEFAULT_MEDIA_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA" ref="DEFAULT_MEDIA_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_EARPIECE"

                                       ref="DEFAULT_DEVICE_CATEGORY_EARPIECE_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"

                                       ref="DEFAULT_DEVICE_CATEGORY_EXT_MEDIA_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_HEADSET"

                                        ref="DEFAULT_MEDIA_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_SPEAKER"

                                        ref="DEFAULT_DEVICE_CATEGORY_SPEAKER_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_EARPIECE"

                                        ref="DEFAULT_MEDIA_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"

                                        ref="DEFAULT_MEDIA_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_HEADSET"

                                        ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_SPEAKER">

        <point>1,-2970</point>

        <point>33,-2010</point>

        <point>66,-1020</point>

        <point>100,0</point>

    </volume>

    <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_EARPIECE"

                                        ref="DEFAULT_DEVICE_CATEGORY_EARPIECE_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"

                                        ref="DEFAULT_DEVICE_CATEGORY_EXT_MEDIA_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_HEADSET"

                                               ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_SPEAKER">

        <point>1,-2970</point>

        <point>33,-2010</point>

        <point>66,-1020</point>

        <point>100,0</point>

    </volume>

    <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_EARPIECE"

                                               ref="DEFAULT_DEVICE_CATEGORY_EARPIECE_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"

                                               ref="DEFAULT_DEVICE_CATEGORY_EXT_MEDIA_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_BLUETOOTH_SCO" deviceCategory="DEVICE_CATEGORY_HEADSET">

        <point>0,-4200</point>

        <point>33,-2800</point>
@@ -89,63 +117,63 @@ volume index from 0 to 100. 
        <point>66,-1400</point>

        <point>100,0</point>

    </volume>

    <volume stream="AUDIO_STREAM_BLUETOOTH_SCO" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA" ref="DEFAULT_MEDIA_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_BLUETOOTH_SCO" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"

                                                ref="DEFAULT_MEDIA_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_HEADSET">

        <point>1,-3000</point>

        <point>33,-2600</point>

        <point>66,-2200</point>

        <point>100,-1800</point>

    </volume>

    <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_SPEAKER" ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_EARPIECE" ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_SPEAKER"

                                                   ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_EARPIECE"

                                                   ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"

                                                   ref="DEFAULT_DEVICE_CATEGORY_EXT_MEDIA_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_HEADSET">

        <point>1,-3000</point>

        <point>33,-2600</point>

        <point>66,-2200</point>

        <point>100,-1800</point>

    </volume>

    <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_SPEAKER" ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_EARPIECE" ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_TTS" deviceCategory="DEVICE_CATEGORY_HEADSET" ref="SILENT_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_TTS" deviceCategory="DEVICE_CATEGORY_SPEAKER">

        <point>0,0</point>

        <point>100,0</point>

    </volume>

    <volume stream="AUDIO_STREAM_TTS" deviceCategory="DEVICE_CATEGORY_EARPIECE" ref="SILENT_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_TTS" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA" ref="SILENT_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_ACCESSIBILITY" deviceCategory="DEVICE_CATEGORY_HEADSET" ref="DEFAULT_MEDIA_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_ACCESSIBILITY" deviceCategory="DEVICE_CATEGORY_EARPIECE" ref="DEFAULT_MEDIA_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_ACCESSIBILITY" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA" ref="DEFAULT_MEDIA_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_REROUTING" deviceCategory="DEVICE_CATEGORY_HEADSET" ref="FULL_SCALE_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_REROUTING" deviceCategory="DEVICE_CATEGORY_SPEAKER" ref="FULL_SCALE_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_REROUTING" deviceCategory="DEVICE_CATEGORY_EARPIECE" ref="FULL_SCALE_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_REROUTING" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA" ref="FULL_SCALE_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_PATCH" deviceCategory="DEVICE_CATEGORY_HEADSET" ref="FULL_SCALE_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_PATCH" deviceCategory="DEVICE_CATEGORY_SPEAKER" ref="FULL_SCALE_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_PATCH" deviceCategory="DEVICE_CATEGORY_EARPIECE" ref="FULL_SCALE_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_PATCH" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA" ref="FULL_SCALE_VOLUME_CURVE"/>

    <reference name="FULL_SCALE_VOLUME_CURVE">

    <!-- Full Scale reference Volume Curve -->

        <point>0,0</point>

        <point>100,0</point>

    </reference>

    <reference name="SILENT_VOLUME_CURVE">

        <point>0,-9600</point>

        <point>100,-9600</point>

    </reference>

    <reference name="DEFAULT_SYSTEM_VOLUME_CURVE">

    <!-- Default System reference Volume Curve -->

        <point>1,-2400</point>

        <point>33,-1800</point>

        <point>66,-1200</point>

        <point>100,-600</point>

    </reference>

    <reference name="DEFAULT_MEDIA_VOLUME_CURVE">

    <!-- Default Media reference Volume Curve -->

        <point>1,-5800</point>

        <point>20,-4000</point>

        <point>60,-1700</point>

        <point>100,0</point>

    </reference>

    <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_SPEAKER"

                                       ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_EARPIECE"

                                       ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"

                                       ref="DEFAULT_DEVICE_CATEGORY_EXT_MEDIA_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_TTS" deviceCategory="DEVICE_CATEGORY_HEADSET"

                                      ref="SILENT_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_TTS" deviceCategory="DEVICE_CATEGORY_SPEAKER"

                                      ref="FULL_SCALE_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_TTS" deviceCategory="DEVICE_CATEGORY_EARPIECE"

                                      ref="SILENT_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_TTS" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"

                                      ref="SILENT_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_ACCESSIBILITY" deviceCategory="DEVICE_CATEGORY_HEADSET"

                                                ref="DEFAULT_MEDIA_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_ACCESSIBILITY" deviceCategory="DEVICE_CATEGORY_SPEAKER"

                                                ref="DEFAULT_DEVICE_CATEGORY_SPEAKER_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_ACCESSIBILITY" deviceCategory="DEVICE_CATEGORY_EARPIECE"

                                                ref="DEFAULT_MEDIA_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_ACCESSIBILITY" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"

                                                ref="DEFAULT_MEDIA_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_REROUTING" deviceCategory="DEVICE_CATEGORY_HEADSET"

                                            ref="FULL_SCALE_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_REROUTING" deviceCategory="DEVICE_CATEGORY_SPEAKER"

                                            ref="FULL_SCALE_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_REROUTING" deviceCategory="DEVICE_CATEGORY_EARPIECE"

                                            ref="FULL_SCALE_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_REROUTING" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"

                                            ref="FULL_SCALE_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_PATCH" deviceCategory="DEVICE_CATEGORY_HEADSET"

                                        ref="FULL_SCALE_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_PATCH" deviceCategory="DEVICE_CATEGORY_SPEAKER"

                                        ref="FULL_SCALE_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_PATCH" deviceCategory="DEVICE_CATEGORY_EARPIECE"

                                        ref="FULL_SCALE_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_PATCH" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"

                                        ref="FULL_SCALE_VOLUME_CURVE"/>

</volumes>