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

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

Merge "ToneGenerator: add ringback tone for Japan"

parents 204fafe4 d60fe4ca

media/libaudioclient/ToneGenerator.cpp

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

          .repeatCnt = ToneGenerator::TONEGEN_INF,

          .repeatSegment = 0 },                              // TONE_JAPAN_RADIO_ACK

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

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

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

          .repeatCnt = ToneGenerator::TONEGEN_INF,

          .repeatSegment = 0 },                              // TONE_JAPAN_RINGTONE

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

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

                        { .duration = 0 , .waveFreq = { 0 }, 0, 0}},
@@ -881,7 +886,7 @@ const unsigned char /*tone_type*/ ToneGenerator::sToneMappingTable[NUM_REGIONS-1 
            TONE_SUP_RADIO_NOTAVAIL,     // TONE_SUP_RADIO_NOTAVAIL

            TONE_SUP_ERROR,              // TONE_SUP_ERROR

            TONE_SUP_CALL_WAITING,       // TONE_SUP_CALL_WAITING

            TONE_SUP_RINGTONE            // TONE_SUP_RINGTONE

            TONE_JAPAN_RINGTONE          // TONE_SUP_RINGTONE

        },

        {   // GB

            TONE_ANSI_DIAL,              // TONE_SUP_DIAL

media/libaudioclient/include/media/ToneGenerator.h

+1 −0
Original line number Diff line number Diff line
@@ -193,6 +193,7 @@ private: 
        TONE_JAPAN_DIAL,            // Dial tone: 400Hz, continuous

        TONE_JAPAN_BUSY,            // Busy tone: 400Hz, 500ms ON, 500ms OFF...

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

        TONE_JAPAN_RINGTONE,        // Ring Tone: 400 Hz repeated in a 1 s on, 2 s off pattern.

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