Merge "Add Australia specific supervisory tones." into nyc-mr1-dev (2e1dfc8e) · Commits · e / os / android_frameworks_av

include/media/ToneGenerator.h

+6 −0

Original line number	Diff line number	Diff line
		@@ -195,6 +195,11 @@ private:
		TONE_JAPAN_RADIO_ACK, // Radio path acknowlegment: 400Hz, 1s ON, 2s OFF...
		// UK Supervisory tones
		TONE_UK_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.
		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.
		TONE_AUSTRALIA_CONGESTION, // Congestion tone: 425Hz tone repeated in a 0.375s on, 0.375s off pattern
		NUM_ALTERNATE_TONES
		};

		@@ -202,6 +207,7 @@ private:
		ANSI,
		JAPAN,
		UK,
		AUSTRALIA,
		CEPT,
		NUM_REGIONS
		};

media/libmedia/ToneGenerator.cpp

+36 −4

Original line number	Diff line number	Diff line
		@@ -747,9 +747,30 @@ const ToneGenerator::ToneDescriptor ToneGenerator::sToneDescriptors[] = {
		{ .duration = 0, .waveFreq = { 0 }, 0, 0}},
		.repeatCnt = ToneGenerator::TONEGEN_INF,
		.repeatSegment = 0 }, // TONE_UK_RINGTONE



		{ .segments = { { .duration = 400, .waveFreq = { 400, 450, 0 }, 0, 0 },
		{ .duration = 200, .waveFreq = { 0 }, 0, 0 },
		{ .duration = 400, .waveFreq = { 400, 450, 0 }, 0, 0 },
		{ .duration = 2000, .waveFreq = { 0 }, 0, 0},
		{ .duration = 0, .waveFreq = { 0 }, 0, 0}},
		.repeatCnt = ToneGenerator::TONEGEN_INF,
		.repeatSegment = 0 }, // TONE_AUSTRALIA_RINGTONE
		{ .segments = { { .duration = 375, .waveFreq = { 425, 0 }, 0, 0 },
		{ .duration = 375, .waveFreq = { 0 }, 0, 0 },
		{ .duration = 0 , .waveFreq = { 0 }, 0, 0}},
		.repeatCnt = ToneGenerator::TONEGEN_INF,
		.repeatSegment = 0 }, // TONE_AUSTRALIA_BUSY
		{ .segments = { { .duration = 200, .waveFreq = { 425, 0 }, 0, 0 },
		{ .duration = 200, .waveFreq = { 0 }, 0, 0 },
		{ .duration = 200, .waveFreq = { 425, 0 }, 0, 0 },
		{ .duration = 4400, .waveFreq = { 0 }, 0, 0 },
		{ .duration = 0 , .waveFreq = { 0 }, 0, 0}},
		.repeatCnt = ToneGenerator::TONEGEN_INF,
		.repeatSegment = 0 }, // TONE_AUSTRALIA_CALL_WAITING
		{ .segments = { { .duration = 375, .waveFreq = { 425, 0 }, 0, 0 },
		{ .duration = 375, .waveFreq = { 0 }, 0, 0 },
		{ .duration = 0 , .waveFreq = { 0 }, 0, 0}},
		.repeatCnt = ToneGenerator::TONEGEN_INF,
		.repeatSegment = 0 }, // TONE_AUSTRALIA_CONGESTION
		};

		// Used by ToneGenerator::getToneForRegion() to convert user specified supervisory tone type
		@@ -784,8 +805,17 @@ const unsigned char /tone_type/ ToneGenerator::sToneMappingTable[NUM_REGIONS-1
		TONE_SUP_ERROR, // TONE_SUP_ERROR
		TONE_SUP_CALL_WAITING, // TONE_SUP_CALL_WAITING
		TONE_UK_RINGTONE // TONE_SUP_RINGTONE
		},
		{ // AUSTRALIA
		TONE_ANSI_DIAL, // TONE_SUP_DIAL
		TONE_AUSTRALIA_BUSY, // TONE_SUP_BUSY
		TONE_AUSTRALIA_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_AUSTRALIA_CALL_WAITING,// TONE_SUP_CALL_WAITING
		TONE_AUSTRALIA_RINGTONE // TONE_SUP_RINGTONE
		}

		};


		@@ -841,6 +871,8 @@ ToneGenerator::ToneGenerator(audio_stream_type_t streamType, float volume, bool
		mRegion = JAPAN;
		} else if (strstr(value, "uk") != NULL) {
		mRegion = UK;
		} else if (strstr(value, "au") != NULL) {
		mRegion = AUSTRALIA;
		} else {
		mRegion = CEPT;
		}