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

Commit 1e1ec584 authored by Eric Laurent's avatar Eric Laurent Committed by Android (Google) Code Review
Browse files

Merge "audio policy: allows to use reference for volume table"

parents aeead926 c9d7c4e3

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

+1 −0
Original line number Diff line number Diff line
@@ -198,6 +198,7 @@ struct VolumeTraits 
    {

        static const char stream[];

        static const char deviceCategory[];

        static const char reference[];

    };



    typedef VolumeCurve Element;

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

+31 −2
Original line number Diff line number Diff line
@@ -47,6 +47,24 @@ const char *const PolicySerializer::rootName = "audioPolicyConfiguration"; 
const char *const PolicySerializer::versionAttribute = "version";

const uint32_t PolicySerializer::gMajor = 1;

const uint32_t PolicySerializer::gMinor = 0;

static const char *const gReferenceElementName = "reference";

static const char *const gReferenceAttributeName = "name";



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

{

    const _xmlNode *cur = root->xmlChildrenNode;

    while (cur != NULL) {

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

            string name = getXmlAttribute(cur, gReferenceAttributeName);

              if (refName == name) {

                  refNode = cur;

                  return;

              }

        }

        cur = cur->next;

    }

    return;

}



template <class Trait>

static status_t deserializeCollection(_xmlDoc *doc, const _xmlNode *cur,
@@ -490,7 +508,7 @@ const char *const VolumeTraits::volumePointTag = "point"; 


const char VolumeTraits::Attributes::stream[] = "stream";

const char VolumeTraits::Attributes::deviceCategory[] = "deviceCategory";



const char VolumeTraits::Attributes::reference[] = "ref";



status_t VolumeTraits::deserialize(_xmlDoc *doc, const _xmlNode *root, PtrElement &element,

                                   PtrSerializingCtx /*serializingContext*/)
@@ -516,9 +534,20 @@ status_t VolumeTraits::deserialize(_xmlDoc *doc, const _xmlNode *root, PtrElemen 
              deviceCategoryLiteral.c_str());

        return BAD_VALUE;

    }



    string referenceName = getXmlAttribute(root, Attributes::reference);

    const _xmlNode *ref = NULL;

    if (!referenceName.empty()) {

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

        if (ref == NULL) {

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

            return BAD_VALUE;

        }

    }



    element = new Element(deviceCategory, streamType);



    const xmlNode *child = root->xmlChildrenNode;

    const xmlNode *child = referenceName.empty() ? root->xmlChildrenNode : ref->xmlChildrenNode;

    while (child != NULL) {

        if (!xmlStrcmp(child->name, (const xmlChar *)volumePointTag)) {

            xmlChar *pointDefinition = xmlNodeListGetString(doc, child->xmlChildrenNode, 1);;

services/audiopolicy/config/audio_policy_configuration.xml

+0 −2
Original line number Diff line number Diff line
@@ -213,6 +213,4 @@ 


    <!-- End of Volume section -->







</audioPolicyConfiguration>

services/audiopolicy/config/audio_policy_volumes.xml

+44 −124
Original line number Diff line number Diff line
@@ -41,54 +41,24 @@ 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">

        <point>1,-5800</point>

        <point>20,-4000</point>

        <point>60,-1700</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_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">

        <point>1,-2400</point>

        <point>33,-1800</point>

        <point>66,-1200</point>

        <point>100,-600</point>

    </volume>

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

        <point>1,-2400</point>

        <point>33,-1800</point>

        <point>66,-1200</point>

        <point>100,-600</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_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">

        <point>1,-5800</point>

        <point>20,-4000</point>

        <point>60,-1700</point>

        <point>100,0</point>

    </volume>

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

        <point>1,-5800</point>

        <point>20,-4000</point>

        <point>60,-1700</point>

        <point>100,0</point>

    </volume>

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

        <point>1,-5800</point>

        <point>20,-4000</point>

        <point>60,-1700</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_ALARM" deviceCategory="DEVICE_CATEGORY_SPEAKER">

        <point>1,-2970</point>

        <point>33,-2010</point>
@@ -119,113 +89,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">

        <point>1,-5800</point>

        <point>33,-4000</point>

        <point>66,-1700</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_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">

        <point>1,-2400</point>

        <point>33,-1800</point>

        <point>66,-1200</point>

        <point>100,-600</point>

    </volume>

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

        <point>1,-2400</point>

        <point>33,-1800</point>

        <point>66,-1200</point>

        <point>100,-600</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_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">

        <point>1,-2400</point>

        <point>33,-1800</point>

        <point>66,-1200</point>

        <point>100,-600</point>

    </volume>

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

        <point>1,-2400</point>

        <point>33,-1800</point>

        <point>66,-1200</point>

        <point>100,-600</point>

    </volume>

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

        <point>0,-9600</point>

        <point>100,-9600</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">

        <point>0,-9600</point>

        <point>100,-9600</point>

    </volume>

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

    <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>

    </volume>

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

        <point>1,-5800</point>

        <point>33,-4000</point>

        <point>66,-1700</point>

        <point>100,0</point>

    </volume>

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

        <point>1,-5800</point>

        <point>33,-4000</point>

        <point>66,-1700</point>

        <point>100,0</point>

    </volume>

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

    </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>33,-4000</point>

        <point>66,-1700</point>

        <point>100,0</point>

    </volume>

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

        <point>0,0</point>

        <point>100,0</point>

    </volume>

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

        <point>0,0</point>

        <point>100,0</point>

    </volume>

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

        <point>0,0</point>

        <point>100,0</point>

    </volume>

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

        <point>0,0</point>

        <point>100,0</point>

    </volume>

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

        <point>0,0</point>

        <point>100,0</point>

    </volume>

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

        <point>0,0</point>

        <point>100,0</point>

    </volume>

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

        <point>0,0</point>

        <point>100,0</point>

    </volume>

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

        <point>0,0</point>

        <point>20,-4000</point>

        <point>60,-1700</point>

        <point>100,0</point>

    </volume>

    </reference>

</volumes>