Revert "[Feature][T106_eSDK]update from T106-V2.01.01.02P56U06.AP.15.11_CAP.15.11.01 to T106-V2.01.01.02P56U06.AP.16.08_CAP.16.08.01 -- code"
This reverts commit 39d99118f249054d01992819702e0612dfdfe3b9.
Reason for revert:revert 16.08_patch
Change-Id: Ib9848be6d113db9be3378524981a30d0c3a0c1a5
diff --git a/esdk/layers/meta-zxic-custom/recipes-lynq/lynq-qser-voice-demo/files/lynq-qser-voice-demo.cpp b/esdk/layers/meta-zxic-custom/recipes-lynq/lynq-qser-voice-demo/files/lynq-qser-voice-demo.cpp
index e7eebc3..41c5c97 100755
--- a/esdk/layers/meta-zxic-custom/recipes-lynq/lynq-qser-voice-demo/files/lynq-qser-voice-demo.cpp
+++ b/esdk/layers/meta-zxic-custom/recipes-lynq/lynq-qser-voice-demo/files/lynq-qser-voice-demo.cpp
@@ -29,8 +29,6 @@
{7, "qser_voice_set_test_num"},
{8, "qser_voice_fast_ecall"},
#endif
- {9, "qser_voice_set_audio_mode"},
- {10, "qser_voice_get_audio_mode"},
{-1, NULL}
};
@@ -53,9 +51,6 @@
int (*qser_voice_set_speech_volume)(const int volume);
int (*qser_voice_get_speech_volume)(int *volume);
int (*qser_voice_set_dtmf)(const char callnum);
-int (*qser_voice_set_audio_mode)(const int audio_mode);
-int (*qser_voice_get_audio_mode)(int* audio_mode);
-
#ifdef ECALL_SUPPORT
int (*qser_voice_set_test_num)(voice_client_handle_type* h_voice,E_QSER_VOICE_ECALL_SET_TYPE_T type, const char *test_num, int test_num_length);
@@ -124,7 +119,6 @@
int ret = 0;
int voice_call_id = 0;
voice_client_handle_type h_voice = 0;
- int audio_mode = 0;
const char *lynqLibPath_Call = "/lib/liblynq-qser-voice.so";
dlHandle_call = dlopen(lynqLibPath_Call, RTLD_NOW);
@@ -236,23 +230,7 @@
printf("qser_voice_add_ecall_indhandler not defined or exported in %s\n", lynqLibPath_Call);
return -1;
}
-#endif
-
- qser_voice_set_audio_mode = (int(*)(const int audio_mode))dlsym(dlHandle_call, "qser_voice_set_audio_mode");
- if(qser_voice_set_audio_mode == NULL)
- {
- printf("qser_voice_set_audio_mode not defined or exported in %s\n", lynqLibPath_Call);
- return -1;
- }
-
-
- qser_voice_get_audio_mode = (int(*)(int* audio_mode))dlsym(dlHandle_call, "qser_voice_get_audio_mode");
- if(qser_voice_get_audio_mode == NULL)
- {
- printf("qser_voice_get_audio_mode not defined or exported in %s\n", lynqLibPath_Call);
- return -1;
- }
-
+#endif
ret = qser_voice_call_client_init(&h_voice);
if(ret != 0 )
@@ -371,12 +349,8 @@
case 7:
{
char PhoneNum[32] = {0};
- printf("please input test phone number(input null means \"\"): \n");
- scanf("%s", PhoneNum);
- if(0 == strcmp(PhoneNum, "null"))
- {
- PhoneNum[0]='\0';
- }
+ printf("please input test phone number: \n");
+ scanf("%s", PhoneNum);
ret = qser_voice_set_test_num(&h_voice, E_QSER_VOICE_ECALL_SET_NUMBER, PhoneNum, strlen(PhoneNum)+1);
printf("qser_voice_set_test_num ret = %d\n", ret);
break;
@@ -404,22 +378,6 @@
break;
}
#endif
- case 9:
- {
-
- printf("please input voice audio mode: 0 codec, 1 rtp\n");
- scanf("%d", &audio_mode);
- ret = qser_voice_set_audio_mode(audio_mode);
- printf("qser_voice_set_audio_mode ret = %d, audio_mode is %d\n", ret, audio_mode);
- break;
- }
- case 10:
- {
- ret = qser_voice_get_audio_mode(&audio_mode);
- printf("qser_voice_get_audio_mode ret = %d, audio_mode is %d\n", ret, audio_mode);
- break;
- }
-
default:
print_help();
break;