提交 4706d394 authored 作者: Giovanni Maruzzelli's avatar Giovanni Maruzzelli

skypopen: performance improvements in skypopen_protocol.c and alsa/dummy.c .…

skypopen: performance improvements in skypopen_protocol.c and alsa/dummy.c . Added pcm*c to alsa/. Let's hope the larger period in dummy.c does not make problems on ubuntu
上级 df52cc09
差异被折叠。
...@@ -177,7 +177,7 @@ int skypopen_signaling_read(private_t *tech_pvt) ...@@ -177,7 +177,7 @@ int skypopen_signaling_read(private_t *tech_pvt)
if (tech_pvt->silent_mode) { if (tech_pvt->silent_mode) {
DEBUGA_SKYPE("Resetting SILENT_MODE on skype_call: %s.\n", SKYPOPEN_P_LOG, id); DEBUGA_SKYPE("Resetting SILENT_MODE on skype_call: %s.\n", SKYPOPEN_P_LOG, id);
skypopen_signaling_write(tech_pvt, "SET SILENT_MODE ON"); skypopen_signaling_write(tech_pvt, "SET SILENT_MODE ON");
switch_sleep(1000); //switch_sleep(1000);
} }
} }
if (!strcasecmp(message, "ERROR 68")) { if (!strcasecmp(message, "ERROR 68")) {
...@@ -403,13 +403,13 @@ int skypopen_signaling_read(private_t *tech_pvt) ...@@ -403,13 +403,13 @@ int skypopen_signaling_read(private_t *tech_pvt)
tech_pvt->chatmessages[i].type, tech_pvt->chatmessages[i].id); tech_pvt->chatmessages[i].type, tech_pvt->chatmessages[i].id);
sprintf(msg_to_skype, "GET CHATMESSAGE %s CHATNAME", id); sprintf(msg_to_skype, "GET CHATMESSAGE %s CHATNAME", id);
skypopen_signaling_write(tech_pvt, msg_to_skype); skypopen_signaling_write(tech_pvt, msg_to_skype);
skypopen_sleep(1000); //skypopen_sleep(1000);
sprintf(msg_to_skype, "GET CHATMESSAGE %s FROM_HANDLE", id); sprintf(msg_to_skype, "GET CHATMESSAGE %s FROM_HANDLE", id);
skypopen_signaling_write(tech_pvt, msg_to_skype); skypopen_signaling_write(tech_pvt, msg_to_skype);
skypopen_sleep(1000); //skypopen_sleep(1000);
sprintf(msg_to_skype, "GET CHATMESSAGE %s FROM_DISPNAME", id); sprintf(msg_to_skype, "GET CHATMESSAGE %s FROM_DISPNAME", id);
skypopen_signaling_write(tech_pvt, msg_to_skype); skypopen_signaling_write(tech_pvt, msg_to_skype);
skypopen_sleep(1000); //skypopen_sleep(1000);
sprintf(msg_to_skype, "GET CHATMESSAGE %s BODY", id); sprintf(msg_to_skype, "GET CHATMESSAGE %s BODY", id);
skypopen_signaling_write(tech_pvt, msg_to_skype); skypopen_signaling_write(tech_pvt, msg_to_skype);
} }
...@@ -576,7 +576,7 @@ int skypopen_signaling_read(private_t *tech_pvt) ...@@ -576,7 +576,7 @@ int skypopen_signaling_read(private_t *tech_pvt)
skypopen_signaling_write(tech_pvt, msg_to_skype); skypopen_signaling_write(tech_pvt, msg_to_skype);
sprintf(msg_to_skype, "ALTER CALL %s HANGUP", id); sprintf(msg_to_skype, "ALTER CALL %s HANGUP", id);
skypopen_signaling_write(tech_pvt, msg_to_skype); skypopen_signaling_write(tech_pvt, msg_to_skype);
skypopen_sleep(10000); //skypopen_sleep(10000);
} }
if (!strcasecmp(prop, "STATUS")) { if (!strcasecmp(prop, "STATUS")) {
...@@ -592,10 +592,10 @@ int skypopen_signaling_read(private_t *tech_pvt) ...@@ -592,10 +592,10 @@ int skypopen_signaling_read(private_t *tech_pvt)
SKYPOPEN_P_LOG, id); SKYPOPEN_P_LOG, id);
sprintf(msg_to_skype, "GET CALL %s PARTNER_DISPNAME", id); sprintf(msg_to_skype, "GET CALL %s PARTNER_DISPNAME", id);
skypopen_signaling_write(tech_pvt, msg_to_skype); skypopen_signaling_write(tech_pvt, msg_to_skype);
skypopen_sleep(100); //skypopen_sleep(100);
sprintf(msg_to_skype, "GET CALL %s PARTNER_HANDLE", id); sprintf(msg_to_skype, "GET CALL %s PARTNER_HANDLE", id);
skypopen_signaling_write(tech_pvt, msg_to_skype); skypopen_signaling_write(tech_pvt, msg_to_skype);
skypopen_sleep(10000); //skypopen_sleep(10000);
} else { } else {
/* we are inside an active call */ /* we are inside an active call */
if (!strcasecmp(tech_pvt->skype_call_id, id)) { if (!strcasecmp(tech_pvt->skype_call_id, id)) {
...@@ -630,7 +630,7 @@ int skypopen_signaling_read(private_t *tech_pvt) ...@@ -630,7 +630,7 @@ int skypopen_signaling_read(private_t *tech_pvt)
SKYPOPEN_P_LOG, id); SKYPOPEN_P_LOG, id);
sprintf(msg_to_skype, "GET CALL %s PARTNER_HANDLE", id); sprintf(msg_to_skype, "GET CALL %s PARTNER_HANDLE", id);
skypopen_signaling_write(tech_pvt, msg_to_skype); skypopen_signaling_write(tech_pvt, msg_to_skype);
skypopen_sleep(10000); //skypopen_sleep(10000);
} }
} }
} else if (!strcasecmp(value, "EARLYMEDIA")) { } else if (!strcasecmp(value, "EARLYMEDIA")) {
...@@ -645,10 +645,10 @@ int skypopen_signaling_read(private_t *tech_pvt) ...@@ -645,10 +645,10 @@ int skypopen_signaling_read(private_t *tech_pvt)
return CALLFLOW_INCOMING_HANGUP; return CALLFLOW_INCOMING_HANGUP;
} }
} }
skypopen_sleep(1000); //skypopen_sleep(1000);
sprintf(msg_to_skype, "ALTER CALL %s SET_INPUT PORT=\"%d\"", id, tech_pvt->tcp_cli_port); sprintf(msg_to_skype, "ALTER CALL %s SET_INPUT PORT=\"%d\"", id, tech_pvt->tcp_cli_port);
skypopen_signaling_write(tech_pvt, msg_to_skype); skypopen_signaling_write(tech_pvt, msg_to_skype);
skypopen_sleep(1000); //skypopen_sleep(1000);
sprintf(msg_to_skype, "#output ALTER CALL %s SET_OUTPUT PORT=\"%d\"", id, tech_pvt->tcp_srv_port); sprintf(msg_to_skype, "#output ALTER CALL %s SET_OUTPUT PORT=\"%d\"", id, tech_pvt->tcp_srv_port);
skypopen_signaling_write(tech_pvt, msg_to_skype); skypopen_signaling_write(tech_pvt, msg_to_skype);
...@@ -732,10 +732,10 @@ int skypopen_signaling_read(private_t *tech_pvt) ...@@ -732,10 +732,10 @@ int skypopen_signaling_read(private_t *tech_pvt)
return CALLFLOW_INCOMING_HANGUP; return CALLFLOW_INCOMING_HANGUP;
} }
} }
skypopen_sleep(1000); //skypopen_sleep(1000);
sprintf(msg_to_skype, "ALTER CALL %s SET_INPUT PORT=\"%d\"", id, tech_pvt->tcp_cli_port); sprintf(msg_to_skype, "ALTER CALL %s SET_INPUT PORT=\"%d\"", id, tech_pvt->tcp_cli_port);
skypopen_signaling_write(tech_pvt, msg_to_skype); skypopen_signaling_write(tech_pvt, msg_to_skype);
skypopen_sleep(1000); //skypopen_sleep(1000);
sprintf(msg_to_skype, "#output ALTER CALL %s SET_OUTPUT PORT=\"%d\"", id, tech_pvt->tcp_srv_port); sprintf(msg_to_skype, "#output ALTER CALL %s SET_OUTPUT PORT=\"%d\"", id, tech_pvt->tcp_srv_port);
skypopen_signaling_write(tech_pvt, msg_to_skype); skypopen_signaling_write(tech_pvt, msg_to_skype);
} }
...@@ -769,7 +769,7 @@ int skypopen_signaling_read(private_t *tech_pvt) ...@@ -769,7 +769,7 @@ int skypopen_signaling_read(private_t *tech_pvt)
skypopen_strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1); skypopen_strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
tech_pvt->interface_state = SKYPOPEN_STATE_DOWN; tech_pvt->interface_state = SKYPOPEN_STATE_DOWN;
tech_pvt->skype_call_id[0] = '\0'; tech_pvt->skype_call_id[0] = '\0';
skypopen_sleep(1000); //skypopen_sleep(1000);
return CALLFLOW_INCOMING_HANGUP; return CALLFLOW_INCOMING_HANGUP;
} else if (!strcasecmp(value, "WAITING_REDIAL_COMMAND")) { } else if (!strcasecmp(value, "WAITING_REDIAL_COMMAND")) {
tech_pvt->skype_callflow = CALLFLOW_STATUS_FAILED; tech_pvt->skype_callflow = CALLFLOW_STATUS_FAILED;
...@@ -779,7 +779,7 @@ int skypopen_signaling_read(private_t *tech_pvt) ...@@ -779,7 +779,7 @@ int skypopen_signaling_read(private_t *tech_pvt)
skypopen_strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1); skypopen_strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
tech_pvt->interface_state = SKYPOPEN_STATE_DOWN; tech_pvt->interface_state = SKYPOPEN_STATE_DOWN;
tech_pvt->skype_call_id[0] = '\0'; tech_pvt->skype_call_id[0] = '\0';
skypopen_sleep(1000); //skypopen_sleep(1000);
return CALLFLOW_INCOMING_HANGUP; return CALLFLOW_INCOMING_HANGUP;
} else { } else {
WARNINGA("skype_call: %s, STATUS: %s is not recognized\n", SKYPOPEN_P_LOG, id, value); WARNINGA("skype_call: %s, STATUS: %s is not recognized\n", SKYPOPEN_P_LOG, id, value);
...@@ -1566,8 +1566,8 @@ int skypopen_send_message(private_t *tech_pvt, const char *message_P) ...@@ -1566,8 +1566,8 @@ int skypopen_send_message(private_t *tech_pvt, const char *message_P)
unsigned int len = strlen(message_P); unsigned int len = strlen(message_P);
XEvent e; XEvent e;
skypopen_sleep(1000); //skypopen_sleep(1000);
XFlush(disp); //XFlush(disp);
memset(&e, 0, sizeof(e)); memset(&e, 0, sizeof(e));
e.xclient.type = ClientMessage; e.xclient.type = ClientMessage;
...@@ -1868,7 +1868,7 @@ void *skypopen_do_skypeapi_thread_func(void *obj) ...@@ -1868,7 +1868,7 @@ void *skypopen_do_skypeapi_thread_func(void *obj)
case ClientMessage: case ClientMessage:
if (an_event.xclient.format != 8) { if (an_event.xclient.format != 8) {
skypopen_sleep(1000); //0.1 msec //skypopen_sleep(1000); //0.1 msec
break; break;
} }
...@@ -1924,17 +1924,18 @@ void *skypopen_do_skypeapi_thread_func(void *obj) ...@@ -1924,17 +1924,18 @@ void *skypopen_do_skypeapi_thread_func(void *obj)
howmany = strlen(b) + 1; howmany = strlen(b) + 1;
howmany = write(SkypopenHandles->fdesc[1], b, howmany); howmany = write(SkypopenHandles->fdesc[1], b, howmany);
memset(buffer, '\0', 17000); memset(buffer, '\0', 17000);
XFlush(disp); //XFlush(disp);
there_were_continues = 0; there_were_continues = 0;
} }
skypopen_sleep(1000); //0.1 msec //skypopen_sleep(1000); //0.1 msec
break; break;
default: default:
skypopen_sleep(1000); //0.1 msec //skypopen_sleep(1000); //0.1 msec
break; break;
} //switch event.type } //switch event.type
} //while XPending } //while XPending
XFlush(disp);
} // if select } // if select
} //while running } //while running
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论