From: Seungbae Shin Date: Wed, 4 Nov 2020 07:43:52 +0000 (+0900) Subject: [ITC][tone-player][Non-ACR][Adjust the number of tones with proper stream type] X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=85adf61335d61b1cee61acc009543b921e9c52ff;p=test%2Ftct%2Fnative%2Fapi.git [ITC][tone-player][Non-ACR][Adjust the number of tones with proper stream type] Fixes a timeout issue for targets without a built-in speaker unit. Tests various types of representative tones instead of partial DTMF tones. Removed stream types which is not well matched with tone playback. Change-Id: Ie6c7ebd287e4865b168611af35aeebb9209fc546 --- diff --git a/src/itc/tone-player/ITs-tone-player.c b/src/itc/tone-player/ITs-tone-player.c index 2a5fbee76..7d43ad2d9 100755 --- a/src/itc/tone-player/ITs-tone-player.c +++ b/src/itc/tone-player/ITs-tone-player.c @@ -20,121 +20,6 @@ * @{ */ -tone_type_e g_eToneType[] = { - TONE_TYPE_DEFAULT, - TONE_TYPE_DEFAULT, - TONE_TYPE_DTMF_0, - TONE_TYPE_DTMF_1, - TONE_TYPE_DTMF_2, - TONE_TYPE_DTMF_3, - TONE_TYPE_DTMF_4, - TONE_TYPE_DTMF_5, - // TONE_TYPE_DTMF_6, - // TONE_TYPE_DTMF_7, - // TONE_TYPE_DTMF_8, - // TONE_TYPE_DTMF_9, - // TONE_TYPE_DTMF_S, - // TONE_TYPE_DTMF_P, - // TONE_TYPE_DTMF_A, - // TONE_TYPE_DTMF_B, - // TONE_TYPE_DTMF_C, - // TONE_TYPE_DTMF_D, - // TONE_TYPE_SUP_DIAL, - // TONE_TYPE_ANSI_DIAL, - // TONE_TYPE_JAPAN_DIAL, - // TONE_TYPE_SUP_BUSY, - // TONE_TYPE_ANSI_BUSY, - // TONE_TYPE_JAPAN_BUSY, - // TONE_TYPE_SUP_CONGESTION, - // TONE_TYPE_ANSI_CONGESTION, - // TONE_TYPE_SUP_RADIO_ACK, - // TONE_TYPE_JAPAN_RADIO_ACK, - // TONE_TYPE_SUP_RADIO_NOTAVAIL, - // TONE_TYPE_SUP_ERROR, - // TONE_TYPE_SUP_CALL_WAITING, - // TONE_TYPE_ANSI_CALL_WAITING, - // TONE_TYPE_SUP_RINGTONE, - // TONE_TYPE_ANSI_RINGTONE, - // TONE_TYPE_PROP_BEEP, - // TONE_TYPE_PROP_ACK, - // TONE_TYPE_PROP_NACK, - // TONE_TYPE_PROP_PROMPT, - // TONE_TYPE_PROP_BEEP2, - // TONE_TYPE_SUP_INTERCEPT, - // TONE_TYPE_SUP_INTERCEPT_ABBREV, - // TONE_TYPE_SUP_CONGESTION_ABBREV, - // TONE_TYPE_SUP_CONFIRM, - // TONE_TYPE_SUP_PIP, - // TONE_TYPE_CDMA_DIAL_TONE_LITE, - // TONE_TYPE_CDMA_NETWORK_USA_RINGBACK, - // TONE_TYPE_CDMA_INTERCEPT, - // TONE_TYPE_CDMA_ABBR_INTERCEPT, - // TONE_TYPE_CDMA_REORDER, - // TONE_TYPE_CDMA_ABBR_REORDER, - // TONE_TYPE_CDMA_NETWORK_BUSY, - // TONE_TYPE_CDMA_CONFIRM, - // TONE_TYPE_CDMA_ANSWER, - // TONE_TYPE_CDMA_NETWORK_CALLWAITING, - // TONE_TYPE_CDMA_PIP, - // TONE_TYPE_CDMA_CALL_SIGNAL_ISDN_NORMAL, - // TONE_TYPE_CDMA_CALL_SIGNAL_ISDN_INTERGROUP, - // TONE_TYPE_CDMA_CALL_SIGNAL_ISDN_SP_PRI, - // TONE_TYPE_CDMA_CALL_SIGNAL_ISDN_PAT3, - // TONE_TYPE_CDMA_CALL_SIGNAL_ISDN_PING_RING, - // TONE_TYPE_CDMA_CALL_SIGNAL_ISDN_PAT5, - // TONE_TYPE_CDMA_CALL_SIGNAL_ISDN_PAT6, - // TONE_TYPE_CDMA_CALL_SIGNAL_ISDN_PAT7, - // TONE_TYPE_CDMA_HIGH_L, - // TONE_TYPE_CDMA_MED_L, - // TONE_TYPE_CDMA_LOW_L, - // TONE_TYPE_CDMA_HIGH_SS, - // TONE_TYPE_CDMA_MED_SS, - // TONE_TYPE_CDMA_LOW_SS, - // TONE_TYPE_CDMA_HIGH_SSL, - // TONE_TYPE_CDMA_MED_SSL, - // TONE_TYPE_CDMA_LOW_SSL, - // TONE_TYPE_CDMA_HIGH_SS_2, - // TONE_TYPE_CDMA_MED_SS_2, - // TONE_TYPE_CDMA_LOW_SS_2, - // TONE_TYPE_CDMA_HIGH_SLS, - // TONE_TYPE_CDMA_MED_SLS, - // TONE_TYPE_CDMA_LOW_SLS, - // TONE_TYPE_CDMA_HIGH_S_X4, - // TONE_TYPE_CDMA_MED_S_X4, - // TONE_TYPE_CDMA_LOW_S_X4, - // TONE_TYPE_CDMA_HIGH_PBX_L, - // TONE_TYPE_CDMA_MED_PBX_L, - // TONE_TYPE_CDMA_LOW_PBX_L, - // TONE_TYPE_CDMA_HIGH_PBX_SS, - // TONE_TYPE_CDMA_MED_PBX_SS, - // TONE_TYPE_CDMA_LOW_PBX_SS, - // TONE_TYPE_CDMA_HIGH_PBX_SSL, - // TONE_TYPE_CDMA_MED_PBX_SSL, - // TONE_TYPE_CDMA_LOW_PBX_SSL, - // TONE_TYPE_CDMA_HIGH_PBX_SLS, - // TONE_TYPE_CDMA_MED_PBX_SLS, - // TONE_TYPE_CDMA_LOW_PBX_SLS, - // TONE_TYPE_CDMA_HIGH_PBX_S_X4, - // TONE_TYPE_CDMA_MED_PBX_S_X4, - // TONE_TYPE_CDMA_LOW_PBX_S_X4, - // TONE_TYPE_CDMA_ALERT_NETWORK_LITE, - // TONE_TYPE_CDMA_ALERT_AUTOREDIAL_LITE, - // TONE_TYPE_CDMA_ONE_MIN_BEEP, - // TONE_TYPE_CDMA_KEYPAD_VOLUME_KEY_LITE, - // TONE_TYPE_CDMA_PRESSHOLDKEY_LITE, - // TONE_TYPE_CDMA_ALERT_INCALL_LITE, - // TONE_TYPE_CDMA_EMERGENCY_RINGBACK, - // TONE_TYPE_CDMA_ALERT_CALL_GUARD, - // TONE_TYPE_CDMA_SOFT_ERROR_LITE, - // TONE_TYPE_CDMA_CALLDROP_LITE, - // TONE_TYPE_CDMA_NETWORK_BUSY_ONE_SHOT, - // TONE_TYPE_CDMA_ABBR_ALERT, - // TONE_TYPE_CDMA_SIGNAL_OFF, - // TONE_TYPE_USER_DEFINED_LOW_FRE, - // TONE_TYPE_USER_DEFINED_MED_FRE, - // TONE_TYPE_USER_DEFINED_HIGH_FRE -}; - //& set: TonePlayer /** * @function ITs_tone_player_startup @@ -219,14 +104,19 @@ int ITc_tone_player_start_new_stop_p(void) sound_stream_info_h hStreamInfo = NULL; sound_stream_type_e arrStreamType[] = { - SOUND_STREAM_TYPE_MEDIA, /**< Sound stream type for media */ - SOUND_STREAM_TYPE_SYSTEM, /**< Sound stream type for system */ - SOUND_STREAM_TYPE_ALARM, /**< Sound stream type for alarm */ - SOUND_STREAM_TYPE_NOTIFICATION, /**< Sound stream type for notification */ - SOUND_STREAM_TYPE_EMERGENCY, /**< Sound stream type for emergency */ - SOUND_STREAM_TYPE_VOICE_INFORMATION, /**< Sound stream type for voice information */ - SOUND_STREAM_TYPE_RINGTONE_VOIP, /**< Sound stream type for ring-tone for VoIP */ - SOUND_STREAM_TYPE_VOIP /**< Sound stream type for VoIP */ + SOUND_STREAM_TYPE_MEDIA, + SOUND_STREAM_TYPE_SYSTEM, + SOUND_STREAM_TYPE_ALARM, + SOUND_STREAM_TYPE_NOTIFICATION, + SOUND_STREAM_TYPE_EMERGENCY, + SOUND_STREAM_TYPE_RINGTONE_VOIP, + }; + + tone_type_e g_eToneType[] = { + TONE_TYPE_DTMF_0, + TONE_TYPE_ANSI_DIAL, + TONE_TYPE_SUP_BUSY, + TONE_TYPE_CDMA_CONFIRM, }; int enum_size1 = sizeof(arrStreamType) / sizeof(arrStreamType[0]); @@ -247,7 +137,8 @@ int ITc_tone_player_start_new_stop_p(void) nRet = tone_player_start_new(g_eToneType[enum_counter2], hStreamInfo, nDurationMs, &nId); if ( nRet != TONE_PLAYER_ERROR_NONE ) { - FPRINTF("[line : %d][%s] tone_player_start_new failed for StreamType = %s and ToneType = %s, error returned = %s\\n", __LINE__, API_NAMESPACE, SoundManagerGetStreamType(arrStreamType[enum_counter1]), TonePlayerGetType(g_eToneType[enum_counter2]), TonePlayerGetError(nRet)); + FPRINTF("[line : %d][%s] tone_player_start_new failed for StreamType = %s and ToneType = %s, error returned = %s\\n", + __LINE__, API_NAMESPACE, SoundManagerGetStreamType(arrStreamType[enum_counter1]), TonePlayerGetType(g_eToneType[enum_counter2]), TonePlayerGetError(nRet)); sound_manager_destroy_stream_information(hStreamInfo); return 1; } @@ -260,7 +151,8 @@ int ITc_tone_player_start_new_stop_p(void) nRet = tone_player_stop(nId); if ( nRet != TONE_PLAYER_ERROR_NONE ) { - FPRINTF("[line : %d][%s] tone_player_stop failed for StreamType = %s and ToneType = %s, error returned = %s\\n", __LINE__, API_NAMESPACE, SoundManagerGetStreamType(arrStreamType[enum_counter1]), TonePlayerGetType(g_eToneType[enum_counter2]), TonePlayerGetError(nRet)); + FPRINTF("[line : %d][%s] tone_player_stop failed for StreamType = %s and ToneType = %s, error returned = %s\\n", + __LINE__, API_NAMESPACE, SoundManagerGetStreamType(arrStreamType[enum_counter1]), TonePlayerGetType(g_eToneType[enum_counter2]), TonePlayerGetError(nRet)); sound_manager_destroy_stream_information(hStreamInfo); return 1; }