3e5aaf49ce
This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/pipewire.git#4467dc0ac39ed04eb0f686004dcd8e66555c6ad6
142 lines
5.1 KiB
Diff
142 lines
5.1 KiB
Diff
From 7a5a94470453e0cbd3a087b1be2aa8960ff43c07 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Danis?= <frederic.danis@collabora.com>
|
|
Date: Wed, 17 Feb 2021 18:41:24 +0100
|
|
Subject: [PATCH 11/30] bluez5: backend-native: Check volume values
|
|
|
|
The value from +VGM/+VGS AT commands or events should be between 0 than 15.
|
|
---
|
|
spa/plugins/bluez5/backend-native.c | 68 +++++++++++++++++++++++------
|
|
1 file changed, 55 insertions(+), 13 deletions(-)
|
|
|
|
diff --git a/spa/plugins/bluez5/backend-native.c b/spa/plugins/bluez5/backend-native.c
|
|
index b4d4e5edf..2979a0f2e 100644
|
|
--- a/spa/plugins/bluez5/backend-native.c
|
|
+++ b/spa/plugins/bluez5/backend-native.c
|
|
@@ -199,6 +199,8 @@ static void rfcomm_send_reply(struct spa_source *source, char *data)
|
|
#ifdef HAVE_BLUEZ_5_BACKEND_HSP_NATIVE
|
|
static bool rfcomm_hsp_ag(struct spa_source *source, char* buf)
|
|
{
|
|
+ struct rfcomm *rfcomm = source->data;
|
|
+ struct spa_bt_backend *backend = rfcomm->backend;
|
|
unsigned int gain, dummy;
|
|
|
|
/* There are only three HSP AT commands:
|
|
@@ -206,11 +208,21 @@ static bool rfcomm_hsp_ag(struct spa_source *source, char* buf)
|
|
* AT+VGM=value: value between 0 and 15, sent by the HS to AG to set the microphone gain.
|
|
* AT+CKPD=200: Sent by HS when headset button is pressed. */
|
|
if (sscanf(buf, "AT+VGS=%d", &gain) == 1) {
|
|
- /* t->speaker_gain = gain; */
|
|
- rfcomm_send_reply(source, "OK");
|
|
+ if (gain <= 15) {
|
|
+ /* t->speaker_gain = gain; */
|
|
+ rfcomm_send_reply(source, "OK");
|
|
+ } else {
|
|
+ spa_log_debug(backend->log, NAME": RFCOMM receive unsupported VGS gain: %s", buf);
|
|
+ rfcomm_send_reply(source, "ERROR");
|
|
+ }
|
|
} else if (sscanf(buf, "AT+VGM=%d", &gain) == 1) {
|
|
- /* t->microphone_gain = gain; */
|
|
- rfcomm_send_reply(source, "OK");
|
|
+ if (gain <= 15) {
|
|
+ /* t->microphone_gain = gain; */
|
|
+ rfcomm_send_reply(source, "OK");
|
|
+ } else {
|
|
+ rfcomm_send_reply(source, "ERROR");
|
|
+ spa_log_debug(backend->log, NAME": RFCOMM receive unsupported VGM gain: %s", buf);
|
|
+ }
|
|
} else if (sscanf(buf, "AT+CKPD=%d", &dummy) == 1) {
|
|
rfcomm_send_reply(source, "OK");
|
|
} else {
|
|
@@ -222,6 +234,8 @@ static bool rfcomm_hsp_ag(struct spa_source *source, char* buf)
|
|
|
|
static bool rfcomm_hsp_hs(struct spa_source *source, char* buf)
|
|
{
|
|
+ struct rfcomm *rfcomm = source->data;
|
|
+ struct spa_bt_backend *backend = rfcomm->backend;
|
|
unsigned int gain;
|
|
|
|
/* There are only three HSP AT result codes:
|
|
@@ -232,9 +246,17 @@ static bool rfcomm_hsp_hs(struct spa_source *source, char* buf)
|
|
* RING: Sent by AG to HS to notify of an incoming call. It can safely be ignored because
|
|
* it does not expect a reply. */
|
|
if (sscanf(buf, "\r\n+VGS=%d\r\n", &gain) == 1) {
|
|
- /* t->microphone_gain = gain; */
|
|
+ if (gain <= 15) {
|
|
+ /* t->microphone_gain = gain; */
|
|
+ } else {
|
|
+ spa_log_debug(backend->log, NAME": RFCOMM receive unsupported VGS gain: %s", buf);
|
|
+ }
|
|
} else if (sscanf(buf, "\r\n+VGM=%d\r\n", &gain) == 1) {
|
|
- /* t->speaker_gain = gain; */
|
|
+ if (gain <= 15) {
|
|
+ /* t->speaker_gain = gain; */
|
|
+ } else {
|
|
+ spa_log_debug(backend->log, NAME": RFCOMM receive unsupported VGM gain: %s", buf);
|
|
+ }
|
|
}
|
|
|
|
return true;
|
|
@@ -420,11 +442,21 @@ static bool rfcomm_hfp_ag(struct spa_source *source, char* buf)
|
|
}
|
|
rfcomm_send_reply(source, "OK");
|
|
} else if (sscanf(buf, "AT+VGM=%u", &gain) == 1) {
|
|
- /* t->microphone_gain = gain; */
|
|
- rfcomm_send_reply(source, "OK");
|
|
+ if (gain <= 15) {
|
|
+ /* t->microphone_gain = gain; */
|
|
+ rfcomm_send_reply(source, "OK");
|
|
+ } else {
|
|
+ spa_log_debug(backend->log, NAME": RFCOMM receive unsupported VGM gain: %s", buf);
|
|
+ rfcomm_send_reply(source, "ERROR");
|
|
+ }
|
|
} else if (sscanf(buf, "AT+VGS=%u", &gain) == 1) {
|
|
- /* t->speaker_gain = gain; */
|
|
- rfcomm_send_reply(source, "OK");
|
|
+ if (gain <= 15) {
|
|
+ /* t->speaker_gain = gain; */
|
|
+ rfcomm_send_reply(source, "OK");
|
|
+ } else {
|
|
+ spa_log_debug(backend->log, NAME": RFCOMM receive unsupported VGS gain: %s", buf);
|
|
+ rfcomm_send_reply(source, "ERROR");
|
|
+ }
|
|
} else {
|
|
return false;
|
|
}
|
|
@@ -437,7 +469,7 @@ static bool rfcomm_hfp_hf(struct spa_source *source, char* buf)
|
|
struct rfcomm *rfcomm = source->data;
|
|
struct spa_bt_backend *backend = rfcomm->backend;
|
|
unsigned int features;
|
|
- unsigned int SPA_UNUSED gain;
|
|
+ unsigned int gain;
|
|
unsigned int selected_codec;
|
|
char* token;
|
|
char separators[] = "\r\n:";
|
|
@@ -491,12 +523,22 @@ static bool rfcomm_hfp_hf(struct spa_source *source, char* buf)
|
|
/* get next token */
|
|
token = strtok(NULL, separators);
|
|
gain = atoi(token);
|
|
- /* t->speaker_gain = gain; */
|
|
+
|
|
+ if (gain <= 15) {
|
|
+ /* t->speaker_gain = gain; */
|
|
+ } else {
|
|
+ spa_log_debug(backend->log, NAME": RFCOMM receive unsupported VGM gain: %s", token);
|
|
+ }
|
|
} else if (strncmp(token, "+VGS", 4) == 0) {
|
|
/* get next token */
|
|
token = strtok(NULL, separators);
|
|
gain = atoi(token);
|
|
- /* t->microphone_gain = gain; */
|
|
+
|
|
+ if (gain <= 15) {
|
|
+ /* t->microphone_gain = gain; */
|
|
+ } else {
|
|
+ spa_log_debug(backend->log, NAME": RFCOMM receive unsupported VGS gain: %s", token);
|
|
+ }
|
|
} else if (strncmp(token, "OK", 5) == 0) {
|
|
switch(rfcomm->hf_state) {
|
|
case hfp_hf_brsf:
|
|
--
|
|
2.26.2
|
|
|