openharmony/third_party_tinyalsa
1
0
Fork 0
mirror of https://github.com/openharmony/third_party_tinyalsa.git synced 2026-07-19 15:24:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9 from gabrbedd/topic/params

Browse Source 
Topic/params - add parameters to select card, etc.
This commit is contained in:
tinyalsa
2012-02-10 14:26:41 -08:00
parent 350211381a 9989fc25de
commit 19eda2de96
4 changed files with 88 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pcm.c
+1 -1
View File
@@ -558,7 +558,7 @@ struct pcm *pcm_open(unsigned int card, unsigned int device,
sparams.silence_threshold = config->silence_threshold;
pcm->boundary = sparams.boundary = pcm->buffer_size;
while (pcm->boundary * 2 <= LONG_MAX - pcm->buffer_size)
while (pcm->boundary * 2 <= INT_MAX - pcm->buffer_size)
pcm->boundary *= 2;
if (ioctl(pcm->fd, SNDRV_PCM_IOCTL_SW_PARAMS, &sparams)) {
tinycap.c
+38 -15
View File
@@ -57,9 +57,10 @@ struct wav_header {
int capturing = 1;
unsigned int capture_sample(FILE *file, unsigned int device,
unsigned int capture_sample(FILE *file, unsigned int card, unsigned int device,
unsigned int channels, unsigned int rate,
unsigned int bits);
unsigned int bits, unsigned int period_size,
unsigned int period_count);
void sigint_handler(int sig)
{
@@ -70,14 +71,17 @@ int main(int argc, char **argv)
{
FILE *file;
struct wav_header header;
unsigned int card = 0;
unsigned int device = 0;
unsigned int channels = 2;
unsigned int rate = 44100;
unsigned int bits = 16;
unsigned int frames;
unsigned int period_size = 1024;
unsigned int period_count = 4;
if (argc < 2) {
fprintf(stderr, "Usage: %s file.wav [-d device] [-c channels] "
fprintf(stderr, "Usage: %s file.wav [-D card] [-d device] [-c channels] "
"[-r rate] [-b bits]\n", argv[0]);
return 1;
}
@@ -93,18 +97,35 @@ int main(int argc, char **argv)
while (*argv) {
if (strcmp(*argv, "-d") == 0) {
argv++;
device = atoi(*argv);
if (*argv)
device = atoi(*argv);
} else if (strcmp(*argv, "-c") == 0) {
argv++;
channels = atoi(*argv);
if (*argv)
channels = atoi(*argv);
} else if (strcmp(*argv, "-r") == 0) {
argv++;
rate = atoi(*argv);
if (*argv)
rate = atoi(*argv);
} else if (strcmp(*argv, "-b") == 0) {
argv++;
bits = atoi(*argv);
if (*argv)
bits = atoi(*argv);
} else if (strcmp(*argv, "-D") == 0) {
argv++;
if (*argv)
card = atoi(*argv);
} else if (strcmp(*argv, "-p") == 0) {
argv++;
if (*argv)
period_size = atoi(*argv);
} else if (strcmp(*argv, "-n") == 0) {
argv++;
if (*argv)
period_count = atoi(*argv);
}
argv++;
if (*argv)
argv++;
}
header.riff_id = ID_RIFF;
@@ -125,8 +146,9 @@ int main(int argc, char **argv)
/* install signal handler and begin capturing */
signal(SIGINT, sigint_handler);
frames = capture_sample(file, device, header.num_channels,
header.sample_rate, header.bits_per_sample);
frames = capture_sample(file, card, device, header.num_channels,
header.sample_rate, header.bits_per_sample,
period_size, period_count);
printf("Captured %d frames\n", frames);
/* write header now all information is known */
@@ -139,9 +161,10 @@ int main(int argc, char **argv)
return 0;
}
unsigned int capture_sample(FILE *file, unsigned int device,
unsigned int capture_sample(FILE *file, unsigned int card, unsigned int device,
unsigned int channels, unsigned int rate,
unsigned int bits)
unsigned int bits, unsigned int period_size,
unsigned int period_count)
{
struct pcm_config config;
struct pcm *pcm;
@@ -151,8 +174,8 @@ unsigned int capture_sample(FILE *file, unsigned int device,
config.channels = channels;
config.rate = rate;
config.period_size = 1024;
config.period_count = 4;
config.period_size = period_size;
config.period_count = period_count;
if (bits == 32)
config.format = PCM_FORMAT_S32_LE;
else if (bits == 16)
@@ -161,7 +184,7 @@ unsigned int capture_sample(FILE *file, unsigned int device,
config.stop_threshold = 0;
config.silence_threshold = 0;
pcm = pcm_open(0, device, PCM_IN, &config);
pcm = pcm_open(card, device, PCM_IN, &config);
if (!pcm || !pcm_is_ready(pcm)) {
fprintf(stderr, "Unable to open PCM device (%s)\n",
pcm_get_error(pcm));
tinymix.c
+14 -2
View File
@@ -41,8 +41,20 @@ static void tinymix_print_enum(struct mixer_ctl *ctl, int print_all);
int main(int argc, char **argv)
{
struct mixer *mixer;
int card = 0;
mixer = mixer_open(0);
if ((argc > 2) && (strcmp(argv[1], "-D") == 0)) {
argv++;
if (argv[1]) {
card = atoi(argv[1]);
argv++;
argc -= 2;
} else {
argc -= 1;
}
}
mixer = mixer_open(card);
if (!mixer) {
fprintf(stderr, "Failed to open mixer\n");
return EXIT_FAILURE;
@@ -55,7 +67,7 @@ int main(int argc, char **argv)
else if (argc == 3)
tinymix_set_value(mixer, atoi(argv[1]), argv[2]);
else
printf("Usage: tinymix [control id] [value to set]\n");
printf("Usage: tinymix [-D card] [control id] [value to set]\n");
mixer_close(mixer);
tinyplay.c
+35 -12
View File
@@ -54,17 +54,22 @@ struct wav_header {
uint32_t data_sz;
};
void play_sample(FILE *file, unsigned int device, unsigned int channels,
unsigned int rate, unsigned int bits);
void play_sample(FILE *file, unsigned int card, unsigned int device, unsigned int channels,
unsigned int rate, unsigned int bits, unsigned int period_size,
unsigned int period_count);
int main(int argc, char **argv)
{
FILE *file;
struct wav_header header;
unsigned int device = 0;
unsigned int card = 0;
unsigned int period_size = 1024;
unsigned int period_count = 4;
if (argc < 2) {
fprintf(stderr, "Usage: %s file.wav [-d device]\n", argv[0]);
fprintf(stderr, "Usage: %s file.wav [-D card] [-d device] [-p period_size]"
" [-n n_periods] \n", argv[0]);
return 1;
}
@@ -79,9 +84,26 @@ int main(int argc, char **argv)
while (*argv) {
if (strcmp(*argv, "-d") == 0) {
argv++;
device = atoi(*argv);
if (*argv)
device = atoi(*argv);
}
argv++;
if (strcmp(*argv, "-p") == 0) {
argv++;
if (*argv)
period_size = atoi(*argv);
}
if (strcmp(*argv, "-n") == 0) {
argv++;
if (*argv)
period_count = atoi(*argv);
}
if (strcmp(*argv, "-D") == 0) {
argv++;
if (*argv)
card = atoi(*argv);
}
if (*argv)
argv++;
}
fread(&header, sizeof(struct wav_header), 1, file);
@@ -96,16 +118,17 @@ int main(int argc, char **argv)
return 1;
}
play_sample(file, device, header.num_channels, header.sample_rate,
header.bits_per_sample);
play_sample(file, card, device, header.num_channels, header.sample_rate,
header.bits_per_sample, period_size, period_count);
fclose(file);
return 0;
}
void play_sample(FILE *file, unsigned int device, unsigned int channels,
unsigned int rate, unsigned int bits)
void play_sample(FILE *file, unsigned int card, unsigned int device, unsigned int channels,
unsigned int rate, unsigned int bits, unsigned int period_size,
unsigned int period_count)
{
struct pcm_config config;
struct pcm *pcm;
@@ -115,8 +138,8 @@ void play_sample(FILE *file, unsigned int device, unsigned int channels,
config.channels = channels;
config.rate = rate;
config.period_size = 1024;
config.period_count = 4;
config.period_size = period_size;
config.period_count = period_count;
if (bits == 32)
config.format = PCM_FORMAT_S32_LE;
else if (bits == 16)
@@ -125,7 +148,7 @@ void play_sample(FILE *file, unsigned int device, unsigned int channels,
config.stop_threshold = 0;
config.silence_threshold = 0;
pcm = pcm_open(0, device, PCM_OUT, &config);
pcm = pcm_open(card, device, PCM_OUT, &config);
if (!pcm || !pcm_is_ready(pcm)) {
fprintf(stderr, "Unable to open PCM device %u (%s)\n",
device, pcm_get_error(pcm));