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

Commit 879996a5 authored by Toshikazu Saito's avatar Toshikazu Saito Committed by Shuhei Miyazaki
Browse files

Support Australia specific supervisory tone 

The change in "Australia Supervisory DIAL tone"
seems not following ITU-T specification.
This patch implements TONE_AUSTRALIA_DIAL as per ITU-T
specification.

Bug: 63120712
Test: Build and test ringback tone for Australia
Change-Id: I7409732e57cf8d39ac2248e7e3e10217e30a118e
parent 5babf61c

media/libaudioclient/ToneGenerator.cpp

+5 −1
Original line number Diff line number Diff line
@@ -759,6 +759,10 @@ const ToneGenerator::ToneDescriptor ToneGenerator::sToneDescriptors[] = { 
                        { .duration = 0, .waveFreq = { 0 }, 0, 0}},

          .repeatCnt = ToneGenerator::TONEGEN_INF,

          .repeatSegment = 0 },                              // TONE_GB_RINGTONE

        { .segments = { { .duration = ToneGenerator::TONEGEN_INF, .waveFreq = { 400, 425, 450, 0 }, 0, 0 },

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

          .repeatCnt = ToneGenerator::TONEGEN_INF,

          .repeatSegment = 0 },                              // TONE_AUSTRALIA_DIAL

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

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

                        { .duration = 400, .waveFreq = { 400, 450, 0 }, 0, 0 },
@@ -819,7 +823,7 @@ const unsigned char /*tone_type*/ ToneGenerator::sToneMappingTable[NUM_REGIONS-1 
            TONE_GB_RINGTONE             // TONE_SUP_RINGTONE

        },

        {   // AUSTRALIA

            TONE_ANSI_DIAL,             // TONE_SUP_DIAL

            TONE_AUSTRALIA_DIAL,        // TONE_SUP_DIAL

            TONE_AUSTRALIA_BUSY,        // TONE_SUP_BUSY

            TONE_AUSTRALIA_CONGESTION,  // TONE_SUP_CONGESTION

            TONE_SUP_RADIO_ACK,         // TONE_SUP_RADIO_ACK

media/libaudioclient/include/media/ToneGenerator.h

+1 −0
Original line number Diff line number Diff line
@@ -198,6 +198,7 @@ private: 
        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_DIAL,        // Dial tone: 425 Hz tone modulated with 25 Hz, continuous

        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.

        TONE_AUSTRALIA_BUSY,        // Busy tone: 425 Hz repeated in a 0.375s on, 0.375s off pattern.

        TONE_AUSTRALIA_CALL_WAITING,// Call waiting tone: 425Hz tone repeated in a 0.2s on, 0.2s off, 0.2s on, 4.4s off pattern.