mirror of git://git.sysmocom.de/ofono
emulator: add codec negotiation support
This commit is contained in:
Simon Fels
Denis Kenzior
parent
989f9b26e2
commit
046f032b32
|
|
@ -112,6 +112,11 @@ void ofono_emulator_set_hf_indicator_active(struct ofono_emulator *em,
|
|||
void ofono_emulator_set_handsfree_card(struct ofono_emulator *em,
|
||||
struct ofono_handsfree_card *card);
|
||||
|
||||
typedef void (*ofono_emulator_codec_negotiation_cb)(int err, void *data);
|
||||
|
||||
int ofono_emulator_start_codec_negotiation(struct ofono_emulator *em,
|
||||
ofono_emulator_codec_negotiation_cb cb, void *data);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
259
src/emulator.c
259
src/emulator.c
|
|
@ -27,6 +27,7 @@
|
|||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
#include <stdbool.h>
|
||||
#include <errno.h>
|
||||
|
||||
#include <glib.h>
|
||||
|
||||
|
|
@ -40,6 +41,15 @@
|
|||
|
||||
#define RING_TIMEOUT 3
|
||||
|
||||
#define CVSD_OFFSET 0
|
||||
#define MSBC_OFFSET 1
|
||||
#define CODECS_COUNT (MSBC_OFFSET + 1)
|
||||
|
||||
struct hfp_codec_info {
|
||||
unsigned char type;
|
||||
ofono_bool_t supported;
|
||||
};
|
||||
|
||||
struct ofono_emulator {
|
||||
struct ofono_atom *atom;
|
||||
enum ofono_emulator_type type;
|
||||
|
|
@ -51,6 +61,13 @@ struct ofono_emulator {
|
|||
guint callsetup_source;
|
||||
int pns_id;
|
||||
struct ofono_handsfree_card *card;
|
||||
struct hfp_codec_info r_codecs[CODECS_COUNT];
|
||||
unsigned char selected_codec;
|
||||
unsigned char negotiated_codec;
|
||||
unsigned char proposed_codec;
|
||||
ofono_emulator_codec_negotiation_cb codec_negotiation_cb;
|
||||
void *codec_negotiation_data;
|
||||
ofono_bool_t bac_received;
|
||||
bool slc : 1;
|
||||
unsigned int events_mode : 2;
|
||||
bool events_ind : 1;
|
||||
|
|
@ -939,6 +956,176 @@ fail:
|
|||
}
|
||||
}
|
||||
|
||||
static void finish_codec_negotiation(struct ofono_emulator *em,
|
||||
int err)
|
||||
{
|
||||
if (em->codec_negotiation_cb == NULL)
|
||||
return;
|
||||
|
||||
em->codec_negotiation_cb(err, em->codec_negotiation_data);
|
||||
|
||||
em->codec_negotiation_cb = NULL;
|
||||
em->codec_negotiation_data = NULL;
|
||||
}
|
||||
|
||||
static void bac_cb(GAtServer *server, GAtServerRequestType type,
|
||||
GAtResult *result, gpointer user_data)
|
||||
{
|
||||
struct ofono_emulator *em = user_data;
|
||||
GAtResultIter iter;
|
||||
int val;
|
||||
|
||||
DBG("");
|
||||
|
||||
switch (type) {
|
||||
case G_AT_SERVER_REQUEST_TYPE_SET:
|
||||
g_at_result_iter_init(&iter, result);
|
||||
g_at_result_iter_next(&iter, "");
|
||||
|
||||
/*
|
||||
* CVSD codec is mandatory and must come first.
|
||||
* See HFP v1.6 4.34.1
|
||||
*/
|
||||
if (g_at_result_iter_next_number(&iter, &val) == FALSE ||
|
||||
val != HFP_CODEC_CVSD)
|
||||
goto fail;
|
||||
|
||||
em->bac_received = TRUE;
|
||||
|
||||
em->negotiated_codec = 0;
|
||||
em->r_codecs[CVSD_OFFSET].supported = TRUE;
|
||||
|
||||
while (g_at_result_iter_next_number(&iter, &val)) {
|
||||
switch (val) {
|
||||
case HFP_CODEC_MSBC:
|
||||
em->r_codecs[MSBC_OFFSET].supported = TRUE;
|
||||
break;
|
||||
default:
|
||||
DBG("Unsupported HFP codec %d", val);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
g_at_server_send_final(server, G_AT_SERVER_RESULT_OK);
|
||||
|
||||
/*
|
||||
* If we're currently in the process of selecting a codec
|
||||
* we have to restart that now
|
||||
*/
|
||||
if (em->proposed_codec) {
|
||||
em->proposed_codec = 0;
|
||||
ofono_emulator_start_codec_negotiation(em, NULL, NULL);
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
default:
|
||||
fail:
|
||||
DBG("Process AT+BAC failed");
|
||||
g_at_server_send_final(server, G_AT_SERVER_RESULT_ERROR);
|
||||
|
||||
finish_codec_negotiation(em, -EIO);
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static void connect_sco(struct ofono_emulator *em)
|
||||
{
|
||||
int err;
|
||||
|
||||
DBG("");
|
||||
|
||||
if (em->card == NULL) {
|
||||
finish_codec_negotiation(em, -EINVAL);
|
||||
return;
|
||||
}
|
||||
|
||||
err = ofono_handsfree_card_connect_sco(em->card);
|
||||
if (err == 0) {
|
||||
finish_codec_negotiation(em, 0);
|
||||
return;
|
||||
}
|
||||
|
||||
/* If we have another codec we can try then lets do that */
|
||||
if (em->negotiated_codec != HFP_CODEC_CVSD) {
|
||||
em->selected_codec = HFP_CODEC_CVSD;
|
||||
ofono_emulator_start_codec_negotiation(em,
|
||||
em->codec_negotiation_cb,
|
||||
em->codec_negotiation_data);
|
||||
return;
|
||||
}
|
||||
|
||||
finish_codec_negotiation(em, -EIO);
|
||||
}
|
||||
|
||||
static void bcs_cb(GAtServer *server, GAtServerRequestType type,
|
||||
GAtResult *result, gpointer user_data)
|
||||
{
|
||||
struct ofono_emulator *em = user_data;
|
||||
GAtResultIter iter;
|
||||
int val;
|
||||
|
||||
switch (type) {
|
||||
case G_AT_SERVER_REQUEST_TYPE_SET:
|
||||
g_at_result_iter_init(&iter, result);
|
||||
g_at_result_iter_next(&iter, "");
|
||||
|
||||
if (!g_at_result_iter_next_number(&iter, &val))
|
||||
break;
|
||||
|
||||
if (em->proposed_codec != val) {
|
||||
em->proposed_codec = 0;
|
||||
break;
|
||||
}
|
||||
|
||||
em->proposed_codec = 0;
|
||||
em->negotiated_codec = val;
|
||||
|
||||
DBG("negotiated codec %d", val);
|
||||
|
||||
if (em->card != NULL)
|
||||
ofono_handsfree_card_set_codec(em->card,
|
||||
em->negotiated_codec);
|
||||
|
||||
g_at_server_send_final(server, G_AT_SERVER_RESULT_OK);
|
||||
|
||||
connect_sco(em);
|
||||
|
||||
return;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
finish_codec_negotiation(em, -EIO);
|
||||
|
||||
g_at_server_send_final(server, G_AT_SERVER_RESULT_ERROR);
|
||||
}
|
||||
|
||||
static void bcc_cb(GAtServer *server, GAtServerRequestType type,
|
||||
GAtResult *result, gpointer user_data)
|
||||
{
|
||||
struct ofono_emulator *em = user_data;
|
||||
|
||||
switch (type) {
|
||||
case G_AT_SERVER_REQUEST_TYPE_COMMAND_ONLY:
|
||||
g_at_server_send_final(server, G_AT_SERVER_RESULT_OK);
|
||||
|
||||
if (!em->negotiated_codec) {
|
||||
ofono_emulator_start_codec_negotiation(em, NULL, NULL);
|
||||
return;
|
||||
}
|
||||
|
||||
connect_sco(em);
|
||||
|
||||
return;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
g_at_server_send_final(server, G_AT_SERVER_RESULT_ERROR);
|
||||
}
|
||||
|
||||
static void emulator_add_indicator(struct ofono_emulator *em, const char* name,
|
||||
int min, int max, int dflt,
|
||||
gboolean mandatory)
|
||||
|
|
@ -1048,6 +1235,9 @@ void ofono_emulator_register(struct ofono_emulator *em, int fd)
|
|||
g_at_server_register(em->server, "+BIA", bia_cb, em, NULL);
|
||||
g_at_server_register(em->server, "+BIND", bind_cb, em, NULL);
|
||||
g_at_server_register(em->server, "+BIEV", biev_cb, em, NULL);
|
||||
g_at_server_register(em->server, "+BAC", bac_cb, em, NULL);
|
||||
g_at_server_register(em->server, "+BCC", bcc_cb, em, NULL);
|
||||
g_at_server_register(em->server, "+BCS", bcs_cb, em, NULL);
|
||||
}
|
||||
|
||||
__ofono_atom_register(em->atom, emulator_unregister);
|
||||
|
|
@ -1102,6 +1292,7 @@ struct ofono_emulator *ofono_emulator_create(struct ofono_modem *modem,
|
|||
em->l_features |= HFP_AG_FEATURE_ENHANCED_CALL_CONTROL;
|
||||
em->l_features |= HFP_AG_FEATURE_EXTENDED_RES_CODE;
|
||||
em->l_features |= HFP_AG_FEATURE_HF_INDICATORS;
|
||||
em->l_features |= HFP_AG_FEATURE_CODEC_NEGOTIATION;
|
||||
em->events_mode = 3; /* default mode is forwarding events */
|
||||
em->cmee_mode = 0; /* CME ERROR disabled by default */
|
||||
|
||||
|
|
@ -1477,3 +1668,71 @@ void ofono_emulator_set_handsfree_card(struct ofono_emulator *em,
|
|||
|
||||
em->card = card;
|
||||
}
|
||||
|
||||
static unsigned char select_codec(struct ofono_emulator *em)
|
||||
{
|
||||
if (ofono_handsfree_audio_has_wideband() &&
|
||||
em->r_codecs[MSBC_OFFSET].supported)
|
||||
return HFP_CODEC_MSBC;
|
||||
|
||||
/* CVSD is mandatory for both sides */
|
||||
return HFP_CODEC_CVSD;
|
||||
}
|
||||
|
||||
int ofono_emulator_start_codec_negotiation(struct ofono_emulator *em,
|
||||
ofono_emulator_codec_negotiation_cb cb, void *data)
|
||||
{
|
||||
char buf[64];
|
||||
unsigned char codec;
|
||||
|
||||
if (em == NULL)
|
||||
return -EINVAL;
|
||||
|
||||
if (cb != NULL && em->codec_negotiation_cb != NULL)
|
||||
return -EALREADY;
|
||||
|
||||
if (em->proposed_codec > 0)
|
||||
return -EALREADY;
|
||||
|
||||
if (!em->bac_received || em->negotiated_codec > 0) {
|
||||
/*
|
||||
* Report we're done even if we don't have done any
|
||||
* negotiation as the other side may have to clean up.
|
||||
*/
|
||||
cb(0, data);
|
||||
|
||||
/*
|
||||
* If we didn't received any +BAC during the SLC setup the
|
||||
* remote side doesn't support codec negotiation and we can
|
||||
* directly connect our card. Otherwise if we got +BAC and
|
||||
* already have a negotiated codec we can proceed here
|
||||
* without doing any negotiation again.
|
||||
*/
|
||||
ofono_handsfree_card_connect_sco(em->card);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (em->selected_codec > 0) {
|
||||
codec = em->selected_codec;
|
||||
em->selected_codec = 0;
|
||||
goto done;
|
||||
}
|
||||
|
||||
codec = select_codec(em);
|
||||
if (!codec) {
|
||||
DBG("Failed to select HFP codec");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
done:
|
||||
em->proposed_codec = codec;
|
||||
|
||||
em->codec_negotiation_cb = cb;
|
||||
em->codec_negotiation_data = data;
|
||||
|
||||
snprintf(buf, 64, "+BCS: %d", em->proposed_codec);
|
||||
g_at_server_send_unsolicited(em->server, buf);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue