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

Commit 5babf61c authored by tomoki hanzawa's avatar tomoki hanzawa Committed by Shuhei Miyazaki
Browse files

Support GB specific supervisory tone 

Modified gb's SupervisoryTone
when the following ToneType is selected to cover
GB market/operators requirement.
 - TONE_SUP_DIAL
 - TONE_SUP_BUSY
 - TONE_SUP_CONGESTION

Bug: 63121347
Test: Build and Test ringback tone for UK.
Change-Id: I248b1b27f4156de37fd07bc878be719e3f6d6b95
parent 69545369

media/libaudioclient/ToneGenerator.cpp

+15 −3
Original line number Diff line number Diff line
@@ -740,6 +740,18 @@ const ToneGenerator::ToneDescriptor ToneGenerator::sToneDescriptors[] = { 
                        { .duration = 0 , .waveFreq = { 0 }, 0, 0}},

          .repeatCnt = ToneGenerator::TONEGEN_INF,

          .repeatSegment = 0 },                              // TONE_JAPAN_RADIO_ACK

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

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

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

          .repeatCnt = ToneGenerator::TONEGEN_INF,

          .repeatSegment = 0 },                              // TONE_GB_BUSY

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

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

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

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

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

          .repeatCnt = ToneGenerator::TONEGEN_INF,

          .repeatSegment = 0 },                              // TONE_GB_CONGESTION

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

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

                        { .duration = 400, .waveFreq = { 400, 450, 0 }, 0, 0 },
@@ -797,9 +809,9 @@ const unsigned char /*tone_type*/ ToneGenerator::sToneMappingTable[NUM_REGIONS-1 
            TONE_SUP_RINGTONE            // TONE_SUP_RINGTONE

        },

        {   // GB

            TONE_SUP_DIAL,               // TONE_SUP_DIAL

            TONE_SUP_BUSY,               // TONE_SUP_BUSY

            TONE_SUP_CONGESTION,         // TONE_SUP_CONGESTION

            TONE_ANSI_DIAL,              // TONE_SUP_DIAL

            TONE_GB_BUSY,                // TONE_SUP_BUSY

            TONE_GB_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

media/libaudioclient/include/media/ToneGenerator.h

+2 −0
Original line number Diff line number Diff line
@@ -194,6 +194,8 @@ private: 
        TONE_JAPAN_BUSY,            // Busy tone: 400Hz, 500ms ON, 500ms OFF...

        TONE_JAPAN_RADIO_ACK,       // Radio path acknowlegment: 400Hz, 1s ON, 2s OFF...

        // GB Supervisory tones

        TONE_GB_BUSY,               // Busy tone: 400 Hz, 375ms ON, 375ms OFF...

        TONE_GB_CONGESTION,         // Congestion Tone: 400 Hz, 400ms ON, 350ms OFF, 225ms ON, 525ms OFF...

        TONE_GB_RINGTONE,           // Ring Tone: A 400Hz + 450Hz tone repeated in a 0.4s on, 0.2s off, 0.4s on, 2.0s off pattern.

        // AUSTRALIA Supervisory tones

        TONE_AUSTRALIA_RINGTONE,    // Ring tone: A 400Hz + 450Hz tone repeated in a 0.4s on, 0.2s off, 0.4s on, 2.0s off pattern.