mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-01 22:58:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

alsa: remove unused properties and hardcoded values

Browse source
This commit is contained in:
Wim Taymans 2022-01-12 17:51:49 +01:00
parent 776b52749f
commit c8d4cef2d2
3 changed files with 3 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

26
spa/plugins/alsa/alsa-pcm-sink.c
View file

@ -42,14 +42,10 @@
#define CHECK_PORT(this,d,p) ((d) == SPA_DIRECTION_INPUT && (p) == 0) #define CHECK_PORT(this,d,p) ((d) == SPA_DIRECTION_INPUT && (p) == 0)
static const char default_device[] = "hw:0"; static const char default_device[] = "hw:0";
static const uint32_t default_min_latency = MIN_LATENCY;
static const uint32_t default_max_latency = MAX_LATENCY;
static void reset_props(struct props *props) static void reset_props(struct props *props)
{ {
strncpy(props->device, default_device, 64); strncpy(props->device, default_device, 64);
props->min_latency = default_min_latency;
props->max_latency = default_max_latency;
props->use_chmap = DEFAULT_USE_CHMAP; props->use_chmap = DEFAULT_USE_CHMAP;
} }
@ -160,27 +156,13 @@ static int impl_node_enum_params(void *object, int seq,
SPA_PROP_INFO_type, SPA_POD_Stringn(p->card_name, sizeof(p->card_name))); SPA_PROP_INFO_type, SPA_POD_Stringn(p->card_name, sizeof(p->card_name)));
break; break;
case 3: case 3:
param = spa_pod_builder_add_object(&b,
SPA_TYPE_OBJECT_PropInfo, id,
SPA_PROP_INFO_id, SPA_POD_Id(SPA_PROP_minLatency),
SPA_PROP_INFO_description, SPA_POD_String("The minimum latency"),
SPA_PROP_INFO_type, SPA_POD_CHOICE_RANGE_Int(p->min_latency, 1, INT32_MAX));
break;
case 4:
param = spa_pod_builder_add_object(&b,
SPA_TYPE_OBJECT_PropInfo, id,
SPA_PROP_INFO_id, SPA_POD_Id(SPA_PROP_maxLatency),
SPA_PROP_INFO_description, SPA_POD_String("The maximum latency"),
SPA_PROP_INFO_type, SPA_POD_CHOICE_RANGE_Int(p->max_latency, 1, INT32_MAX));
break;
case 5:
param = spa_pod_builder_add_object(&b, param = spa_pod_builder_add_object(&b,
SPA_TYPE_OBJECT_PropInfo, id, SPA_TYPE_OBJECT_PropInfo, id,
SPA_PROP_INFO_id, SPA_POD_Id(SPA_PROP_latencyOffsetNsec), SPA_PROP_INFO_id, SPA_POD_Id(SPA_PROP_latencyOffsetNsec),
SPA_PROP_INFO_description, SPA_POD_String("Latency offset (ns)"), SPA_PROP_INFO_description, SPA_POD_String("Latency offset (ns)"),
SPA_PROP_INFO_type, SPA_POD_CHOICE_RANGE_Long(0LL, 0LL, INT64_MAX)); SPA_PROP_INFO_type, SPA_POD_CHOICE_RANGE_Long(0LL, 0LL, INT64_MAX));
break; break;
case 6: case 4:
if (!this->is_iec958 && !this->is_hdmi) if (!this->is_iec958 && !this->is_hdmi)
goto next; goto next;
param = spa_pod_builder_add_object(&b, param = spa_pod_builder_add_object(&b,
@ -193,7 +175,7 @@ static int impl_node_enum_params(void *object, int seq,
SPA_PROP_INFO_container, SPA_POD_Id(SPA_TYPE_Array)); SPA_PROP_INFO_container, SPA_POD_Id(SPA_TYPE_Array));
break; break;
default: default:
param = spa_alsa_enum_propinfo(this, result.index - 7, &b); param = spa_alsa_enum_propinfo(this, result.index - 5, &b);
if (param == NULL) if (param == NULL)
return 0; return 0;
} }
@ -213,8 +195,6 @@ static int impl_node_enum_params(void *object, int seq,
SPA_PROP_device, SPA_POD_Stringn(p->device, sizeof(p->device)), SPA_PROP_device, SPA_POD_Stringn(p->device, sizeof(p->device)),
SPA_PROP_deviceName, SPA_POD_Stringn(p->device_name, sizeof(p->device_name)), SPA_PROP_deviceName, SPA_POD_Stringn(p->device_name, sizeof(p->device_name)),
SPA_PROP_cardName, SPA_POD_Stringn(p->card_name, sizeof(p->card_name)), SPA_PROP_cardName, SPA_POD_Stringn(p->card_name, sizeof(p->card_name)),
SPA_PROP_minLatency, SPA_POD_Int(p->min_latency),
SPA_PROP_maxLatency, SPA_POD_Int(p->max_latency),
SPA_PROP_latencyOffsetNsec, SPA_POD_Long(this->process_latency.ns), SPA_PROP_latencyOffsetNsec, SPA_POD_Long(this->process_latency.ns),
0); 0);
@ -343,8 +323,6 @@ static int impl_node_set_param(void *object, uint32_t id, uint32_t flags,
spa_pod_parse_object(param, spa_pod_parse_object(param,
SPA_TYPE_OBJECT_Props, NULL, SPA_TYPE_OBJECT_Props, NULL,
SPA_PROP_device, SPA_POD_OPT_Stringn(p->device, sizeof(p->device)), SPA_PROP_device, SPA_POD_OPT_Stringn(p->device, sizeof(p->device)),
SPA_PROP_minLatency, SPA_POD_OPT_Int(&p->min_latency),
SPA_PROP_maxLatency, SPA_POD_OPT_Int(&p->max_latency),
SPA_PROP_latencyOffsetNsec, SPA_POD_OPT_Long(&info.ns), SPA_PROP_latencyOffsetNsec, SPA_POD_OPT_Long(&info.ns),
SPA_PROP_iec958Codecs, SPA_POD_OPT_Pod(&iec958_codecs), SPA_PROP_iec958Codecs, SPA_POD_OPT_Pod(&iec958_codecs),
SPA_PROP_params, SPA_POD_OPT_Pod(&params)); SPA_PROP_params, SPA_POD_OPT_Pod(&params));

24
spa/plugins/alsa/alsa-pcm-source.c
View file

@ -44,14 +44,10 @@
#define CHECK_PORT(this,d,p) ((d) == SPA_DIRECTION_OUTPUT && (p) == 0) #define CHECK_PORT(this,d,p) ((d) == SPA_DIRECTION_OUTPUT && (p) == 0)
static const char default_device[] = "hw:0"; static const char default_device[] = "hw:0";
static const uint32_t default_min_latency = MIN_LATENCY;
static const uint32_t default_max_latency = MAX_LATENCY;
static void reset_props(struct props *props) static void reset_props(struct props *props)
{ {
strncpy(props->device, default_device, 64); strncpy(props->device, default_device, 64);
props->min_latency = default_min_latency;
props->max_latency = default_max_latency;
props->use_chmap = DEFAULT_USE_CHMAP; props->use_chmap = DEFAULT_USE_CHMAP;
} }
@ -160,20 +156,6 @@ static int impl_node_enum_params(void *object, int seq,
SPA_PROP_INFO_type, SPA_POD_Stringn(p->card_name, sizeof(p->card_name))); SPA_PROP_INFO_type, SPA_POD_Stringn(p->card_name, sizeof(p->card_name)));
break; break;
case 3: case 3:
param = spa_pod_builder_add_object(&b,
SPA_TYPE_OBJECT_PropInfo, id,
SPA_PROP_INFO_id, SPA_POD_Id(SPA_PROP_minLatency),
SPA_PROP_INFO_description, SPA_POD_String("The minimum latency"),
SPA_PROP_INFO_type, SPA_POD_CHOICE_RANGE_Int(p->min_latency, 1, INT32_MAX));
break;
case 4:
param = spa_pod_builder_add_object(&b,
SPA_TYPE_OBJECT_PropInfo, id,
SPA_PROP_INFO_id, SPA_POD_Id(SPA_PROP_maxLatency),
SPA_PROP_INFO_description, SPA_POD_String("The maximum latency"),
SPA_PROP_INFO_type, SPA_POD_CHOICE_RANGE_Int(p->max_latency, 1, INT32_MAX));
break;
case 5:
param = spa_pod_builder_add_object(&b, param = spa_pod_builder_add_object(&b,
SPA_TYPE_OBJECT_PropInfo, id, SPA_TYPE_OBJECT_PropInfo, id,
SPA_PROP_INFO_id, SPA_POD_Id(SPA_PROP_latencyOffsetNsec), SPA_PROP_INFO_id, SPA_POD_Id(SPA_PROP_latencyOffsetNsec),
@ -181,7 +163,7 @@ static int impl_node_enum_params(void *object, int seq,
SPA_PROP_INFO_type, SPA_POD_CHOICE_RANGE_Long(0LL, 0LL, INT64_MAX)); SPA_PROP_INFO_type, SPA_POD_CHOICE_RANGE_Long(0LL, 0LL, INT64_MAX));
break; break;
default: default:
param = spa_alsa_enum_propinfo(this, result.index - 6, &b); param = spa_alsa_enum_propinfo(this, result.index - 4, &b);
if (param == NULL) if (param == NULL)
return 0; return 0;
} }
@ -199,8 +181,6 @@ static int impl_node_enum_params(void *object, int seq,
SPA_PROP_device, SPA_POD_Stringn(p->device, sizeof(p->device)), SPA_PROP_device, SPA_POD_Stringn(p->device, sizeof(p->device)),
SPA_PROP_deviceName, SPA_POD_Stringn(p->device_name, sizeof(p->device_name)), SPA_PROP_deviceName, SPA_POD_Stringn(p->device_name, sizeof(p->device_name)),
SPA_PROP_cardName, SPA_POD_Stringn(p->card_name, sizeof(p->card_name)), SPA_PROP_cardName, SPA_POD_Stringn(p->card_name, sizeof(p->card_name)),
SPA_PROP_minLatency, SPA_POD_Int(p->min_latency),
SPA_PROP_maxLatency, SPA_POD_Int(p->max_latency),
SPA_PROP_latencyOffsetNsec, SPA_POD_Long(this->process_latency.ns), SPA_PROP_latencyOffsetNsec, SPA_POD_Long(this->process_latency.ns),
0); 0);
spa_alsa_add_prop_params(this, &b); spa_alsa_add_prop_params(this, &b);
@ -323,8 +303,6 @@ static int impl_node_set_param(void *object, uint32_t id, uint32_t flags,
spa_pod_parse_object(param, spa_pod_parse_object(param,
SPA_TYPE_OBJECT_Props, NULL, SPA_TYPE_OBJECT_Props, NULL,
SPA_PROP_device, SPA_POD_OPT_Stringn(p->device, sizeof(p->device)), SPA_PROP_device, SPA_POD_OPT_Stringn(p->device, sizeof(p->device)),
SPA_PROP_minLatency, SPA_POD_OPT_Int(&p->min_latency),
SPA_PROP_maxLatency, SPA_POD_OPT_Int(&p->max_latency),
SPA_PROP_latencyOffsetNsec, SPA_POD_OPT_Long(&info.ns), SPA_PROP_latencyOffsetNsec, SPA_POD_OPT_Long(&info.ns),
SPA_PROP_params, SPA_POD_OPT_Pod(&params)); SPA_PROP_params, SPA_POD_OPT_Pod(&params));

5
spa/plugins/alsa/alsa-pcm.h
View file

@ -52,9 +52,6 @@ extern "C" {
#include "dll.h" #include "dll.h"
#define MIN_LATENCY 16
#define MAX_LATENCY 8192
#define MAX_RATES 16 #define MAX_RATES 16
#define DEFAULT_PERIOD 1024u #define DEFAULT_PERIOD 1024u
@ -66,8 +63,6 @@ struct props {
char device[64]; char device[64];
char device_name[128]; char device_name[128];
char card_name[128]; char card_name[128];
uint32_t min_latency;
uint32_t max_latency;
bool use_chmap; bool use_chmap;
}; };