asgardius/alsa-utils
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-utils synced 2024-12-23 08:36:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

axfer: test: minor code arrangement to use the same file descriptor for container-test

Browse source 
In container test program, two file descriptors open to the same file
for builder and parser contexts, however the same file descriptor is
available for the case.

This commit arranges to use the same file descriptor for the contexts.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Takashi Sakamoto 2021-03-11 14:21:39 +09:00 committed by Jaroslav Kysela
parent e9a4d32e29
commit c45d994867
1 changed files with 23 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
axfer/test/container-test.c
View file

@ -24,8 +24,8 @@ struct container_trial {
bool verbose; bool verbose;
}; };
static void test_builder(struct container_context *cntr, static void test_builder(struct container_context *cntr, int fd,
enum container_format format, const char *const name, enum container_format format,
snd_pcm_access_t access, snd_pcm_access_t access,
snd_pcm_format_t sample_format, snd_pcm_format_t sample_format,
unsigned int samples_per_frame, unsigned int samples_per_frame,
@ -33,7 +33,6 @@ static void test_builder(struct container_context *cntr,
void *frame_buffer, unsigned int frame_count, void *frame_buffer, unsigned int frame_count,
bool verbose) bool verbose)
{ {
int fd;
snd_pcm_format_t sample; snd_pcm_format_t sample;
unsigned int channels; unsigned int channels;
unsigned int rate; unsigned int rate;
@ -42,9 +41,6 @@ static void test_builder(struct container_context *cntr,
uint64_t total_frame_count; uint64_t total_frame_count;
int err; int err;
fd = open(name, O_RDWR | O_CREAT | O_TRUNC, 0644);
assert(fd >= 0);
err = container_builder_init(cntr, fd, format, verbose); err = container_builder_init(cntr, fd, format, verbose);
assert(err == 0); assert(err == 0);
@ -73,18 +69,16 @@ static void test_builder(struct container_context *cntr,
assert(total_frame_count == frame_count); assert(total_frame_count == frame_count);
container_context_destroy(cntr); container_context_destroy(cntr);
close(fd);
} }
static void test_parser(struct container_context *cntr, static void test_parser(struct container_context *cntr, int fd,
enum container_format format, const char *const name, enum container_format format,
snd_pcm_access_t access, snd_pcm_format_t sample_format, snd_pcm_access_t access, snd_pcm_format_t sample_format,
unsigned int samples_per_frame, unsigned int samples_per_frame,
unsigned int frames_per_second, unsigned int frames_per_second,
void *frame_buffer, unsigned int frame_count, void *frame_buffer, unsigned int frame_count,
bool verbose) bool verbose)
{ {
int fd;
snd_pcm_format_t sample; snd_pcm_format_t sample;
unsigned int channels; unsigned int channels;
unsigned int rate; unsigned int rate;
@ -92,9 +86,6 @@ static void test_parser(struct container_context *cntr,
unsigned int handled_frame_count; unsigned int handled_frame_count;
int err; int err;
fd = open(name, O_RDONLY);
assert(fd >= 0);
err = container_parser_init(cntr, fd, verbose); err = container_parser_init(cntr, fd, verbose);
assert(err == 0); assert(err == 0);
@ -122,7 +113,6 @@ static void test_parser(struct container_context *cntr,
assert(total_frame_count == handled_frame_count); assert(total_frame_count == handled_frame_count);
container_context_destroy(cntr); container_context_destroy(cntr);
close(fd);
} }
static int callback(struct test_generator *gen, snd_pcm_access_t access, static int callback(struct test_generator *gen, snd_pcm_access_t access,
@ -156,26 +146,42 @@ static int callback(struct test_generator *gen, snd_pcm_access_t access,
unlink(name); unlink(name);
for (i = 0; i < ARRAY_SIZE(entries); ++i) { for (i = 0; i < ARRAY_SIZE(entries); ++i) {
int fd;
off64_t pos;
frames_per_second = entries[i]; frames_per_second = entries[i];
test_builder(&trial->cntr, trial->format, name, access, fd = open(name, O_RDWR | O_CREAT | O_TRUNC, 0644);
if (fd < 0) {
err = -errno;
break;
}
test_builder(&trial->cntr, fd, trial->format, access,
sample_format, samples_per_frame, sample_format, samples_per_frame,
frames_per_second, frame_buffer, frame_count, frames_per_second, frame_buffer, frame_count,
trial->verbose); trial->verbose);
test_parser(&trial->cntr, trial->format, name, access, pos = lseek64(fd, 0, SEEK_SET);
if (pos < 0) {
err = -errno;
break;
}
test_parser(&trial->cntr, fd, trial->format, access,
sample_format, samples_per_frame, frames_per_second, sample_format, samples_per_frame, frames_per_second,
buf, frame_count, trial->verbose); buf, frame_count, trial->verbose);
err = memcmp(buf, frame_buffer, size); err = memcmp(buf, frame_buffer, size);
assert(err == 0); assert(err == 0);
close(fd);
unlink(name); unlink(name);
} }
free(buf); free(buf);
return 0; return err;
} }
int main(int argc, const char *argv[]) int main(int argc, const char *argv[])