On 05-11-18, 14:23, Daniel Baluta wrote:
> cplay first writes frag * fragment_size and then
> it only writes one fragment at a time.
>
> This means for example than if the user supplied a buffer_size
> it will only be used for the first write.
>
> Signed-off-by: Daniel Baluta <daniel.baluta@xxxxxxx>
> ---
> I noticed this while investigating why cplay prints buffer_size as
> 0 when not specified as command line argument to cplay.
>
> I also noticed that cred always reads frag * frament_size, so I think
> this patch should be OK, but marking it as RFC to get your thoughts.
>
> src/utils/cplay.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/src/utils/cplay.c b/src/utils/cplay.c
> index 2a52b52..b016f52 100644
> --- a/src/utils/cplay.c
> +++ b/src/utils/cplay.c
> @@ -435,15 +435,15 @@ void play_samples(char *name, unsigned int card, unsigned int device,
> };
> if (verbose)
> printf("%s: Opened compress device\n", __func__);
> - size = config.fragment_size;
> - buffer = malloc(size * config.fragments);
> + size = config.fragments * config.fragment_size;
> + buffer = malloc(size);
net result of this change is no change. Leaving alone the variable names
from this discussion, we allocate memory for size of config.fragments * config.fragment_size
> if (!buffer) {
> fprintf(stderr, "Unable to allocate %d bytes\n", size);
> goto COMP_EXIT;
> }
>
> /* we will write frag fragment_size and then start */
> - num_read = fread(buffer, 1, size * config.fragments, file);
> + num_read = fread(buffer, 1, size, file);
> if (num_read > 0) {
> if (verbose)
> printf("%s: Doing first buffer write of %d\n", __func__, num_read);
> @@ -459,7 +459,7 @@ void play_samples(char *name, unsigned int card, unsigned int device,
> }
> }
> printf("Playing file %s On Card %u device %u, with buffer of %lu bytes\n",
> - name, card, device, buffer_size);
> + name, card, device, size);
I would prefer to fix the buffer_size when you dont specify in cmdline
and we use driver defaults, in that case we calculate this, something
like..
diff --git a/src/utils/cplay.c b/src/utils/cplay.c
index 87863a307b47..a77e417ddf85 100644
--- a/src/utils/cplay.c
+++ b/src/utils/cplay.c
@@ -347,6 +347,11 @@ void play_samples(char *name, unsigned int card, unsigned int device,
};
if (verbose)
printf("%s: Opened compress device\n", __func__);
+
+ /* check if buffer_size is used (driver defaults being used */
+ if (!buffer_size)
+ buffer_size = config.fragment_size * config.fragments;
+
size = config.fragment_size;
buffer = malloc(size * config.fragments);
if (!buffer) {
And of course, we need to optimize the size variable usage! This does
not seem optimal :)
--
~Vinod
_______________________________________________
Alsa-devel mailing list
Alsa-devel@xxxxxxxxxxxxxxxx
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
