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

Commit 4555e90e authored by Eric Laurent's avatar Eric Laurent Committed by Automerger Merge Worker
Browse files

Merge "ToneGenerator: add tones for New Zealand" into tm-d1-dev am: 07118e7c 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/18605042



Change-Id: I826d00c56bc50c1cf6ec74b7e2ed77f4443c93b2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b2e0c4e1 07118e7c

media/libaudioclient/ToneGenerator.cpp

+17 −0
Original line number Original line Diff line number Diff line
@@ -867,6 +867,11 @@ const ToneGenerator::ToneDescriptor ToneGenerator::sToneDescriptors[] = { 
                        { .duration = 0 , .waveFreq = { 0 }, 0, 0}},

                        { .duration = 0 , .waveFreq = { 0 }, 0, 0}},

          .repeatCnt = ToneGenerator::TONEGEN_INF,

          .repeatCnt = ToneGenerator::TONEGEN_INF,

          .repeatSegment = 0 },                               // TONE_TW_RINGTONE

          .repeatSegment = 0 },                               // TONE_TW_RINGTONE

        { .segments = { { .duration = 200, .waveFreq = { 400, 0 }, 0, 0 },

                        { .duration = 3000, .waveFreq = { 0 }, 0, 0 },

                        { .duration = 0 , .waveFreq = { 0 }, 0, 0}},

          .repeatCnt = 3,

          .repeatSegment = 0 },                              // TONE_NZ_CALL_WAITING

};

};





// Used by ToneGenerator::getToneForRegion() to convert user specified supervisory tone type

// Used by ToneGenerator::getToneForRegion() to convert user specified supervisory tone type
@@ -961,6 +966,16 @@ const unsigned char /*tone_type*/ ToneGenerator::sToneMappingTable[NUM_REGIONS-1 
            TONE_SUP_ERROR,              // TONE_SUP_ERROR

            TONE_SUP_ERROR,              // TONE_SUP_ERROR

            TONE_SUP_CALL_WAITING,       // TONE_SUP_CALL_WAITING

            TONE_SUP_CALL_WAITING,       // TONE_SUP_CALL_WAITING

            TONE_TW_RINGTONE             // TONE_SUP_RINGTONE

            TONE_TW_RINGTONE             // TONE_SUP_RINGTONE

        },

        {   // NEW ZEALAND

            TONE_JAPAN_DIAL,              // TONE_SUP_DIAL

            TONE_JAPAN_BUSY,              // TONE_SUP_BUSY

            TONE_SUP_CONGESTION,          // TONE_SUP_CONGESTION

            TONE_SUP_RADIO_ACK,           // TONE_SUP_RADIO_ACK

            TONE_SUP_RADIO_NOTAVAIL,      // TONE_SUP_RADIO_NOTAVAIL

            TONE_SUP_ERROR,               // TONE_SUP_ERROR

            TONE_NZ_CALL_WAITING,         // TONE_SUP_CALL_WAITING

            TONE_GB_RINGTONE              // TONE_SUP_RINGTONE

        }

        }

};

};
@@ -1038,6 +1053,8 @@ ToneGenerator::ToneGenerator(audio_stream_type_t streamType, float volume, bool 
        mRegion = INDIA;

        mRegion = INDIA;

    } else if (strstr(value, "tw") != NULL) {

    } else if (strstr(value, "tw") != NULL) {

        mRegion = TAIWAN;

        mRegion = TAIWAN;

    } else if (strstr(value, "nz") != NULL) {

        mRegion = NZ;

    } else {

    } else {

        mRegion = CEPT;

        mRegion = CEPT;

    }

    }

media/libaudioclient/include/media/ToneGenerator.h

+5 −0
Original line number Original line Diff line number Diff line
@@ -225,7 +225,11 @@ private: 
        TONE_INDIA_CONGESTION,      // Congestion tone: 400 Hz, 250ms ON, 250ms OFF...

        TONE_INDIA_CONGESTION,      // Congestion tone: 400 Hz, 250ms ON, 250ms OFF...

        TONE_INDIA_CALL_WAITING,    // Call waiting tone: 400 Hz, tone repeated in a 0.2s on, 0.1s off, 0.2s on, 7.5s off pattern.

        TONE_INDIA_CALL_WAITING,    // Call waiting tone: 400 Hz, tone repeated in a 0.2s on, 0.1s off, 0.2s on, 7.5s off pattern.

        TONE_INDIA_RINGTONE,        // Ring tone: 400 Hz tone modulated with 25Hz, 0.4 on 0.2 off 0.4 on 2..0 off

        TONE_INDIA_RINGTONE,        // Ring tone: 400 Hz tone modulated with 25Hz, 0.4 on 0.2 off 0.4 on 2..0 off

         // TAIWAN supervisory tones

        TONE_TW_RINGTONE,           // Ring Tone: 440 Hz + 480 Hz repeated with pattern 1s on, 3s off.

        TONE_TW_RINGTONE,           // Ring Tone: 440 Hz + 480 Hz repeated with pattern 1s on, 3s off.

         // NEW ZEALAND supervisory tones

        TONE_NZ_CALL_WAITING,       // Call waiting tone: 400 Hz,  0.2s ON, 3s OFF,

                                    //        0.2s ON, 3s OFF, 0.2s ON, 3s OFF, 0.2s ON

        NUM_ALTERNATE_TONES

        NUM_ALTERNATE_TONES

    };

    };
@@ -239,6 +243,7 @@ private: 
        IRELAND,

        IRELAND,

        INDIA,

        INDIA,

        TAIWAN,

        TAIWAN,

        NZ,

        CEPT,

        CEPT,

        NUM_REGIONS

        NUM_REGIONS

    };

    };