diff mbox series

display: xlnx_dp: Provide sufficient bytes for silent audio channel

Message ID 1573833408-2388-1-git-send-email-sai.pavan.boddu@xilinx.com
State New
Headers show
Series display: xlnx_dp: Provide sufficient bytes for silent audio channel | expand

Commit Message

Sai Pavan Boddu Nov. 15, 2019, 3:56 p.m. UTC
Fill the audio channel with required number of bytes to cover the
elapsed time. This prevents rate control reset, and avoids debug prints
like below

log:
	Resetting rate control (65692 samples)
	...
	Resetting rate control (65721 samples)
	...

Signed-off-by: Sai Pavan Boddu <sai.pavan.boddu@xilinx.com>
---
 hw/display/xlnx_dp.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

Comments

Alistair Francis Nov. 15, 2019, 7:29 p.m. UTC | #1
On Fri, Nov 15, 2019 at 10:59 AM Sai Pavan Boddu
<sai.pavan.boddu@xilinx.com> wrote:
>
> Fill the audio channel with required number of bytes to cover the
> elapsed time. This prevents rate control reset, and avoids debug prints
> like below
>
> log:
>         Resetting rate control (65692 samples)
>         ...
>         Resetting rate control (65721 samples)
>         ...
>
> Signed-off-by: Sai Pavan Boddu <sai.pavan.boddu@xilinx.com>

Reviewed-by: Alistair Francis <alistair.francis@wdc.com>

Alistair

> ---
>  hw/display/xlnx_dp.c | 9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/hw/display/xlnx_dp.c b/hw/display/xlnx_dp.c
> index fde3b21..7058443 100644
> --- a/hw/display/xlnx_dp.c
> +++ b/hw/display/xlnx_dp.c
> @@ -394,13 +394,18 @@ static void xlnx_dp_audio_callback(void *opaque, int avail)
>              written = AUD_write(s->amixer_output_stream,
>                                  &s->out_buffer[s->data_ptr], s->byte_left);
>          } else {
> +             int len_to_copy;
>              /*
>               * There is nothing to play.. We don't have any data! Fill the
>               * buffer with zero's and send it.
>               */
>              written = 0;
> -            memset(s->out_buffer, 0, 1024);
> -            AUD_write(s->amixer_output_stream, s->out_buffer, 1024);
> +            while (avail) {
> +                len_to_copy = MIN(AUD_CHBUF_MAX_DEPTH, avail);
> +                memset(s->out_buffer, 0, len_to_copy);
> +                avail -= AUD_write(s->amixer_output_stream, s->out_buffer,
> +                                   len_to_copy);
> +            }
>          }
>      } else {
>          written = AUD_write(s->amixer_output_stream,
> --
> 2.7.4
>
>
Philippe Mathieu-Daudé Nov. 15, 2019, 8:12 p.m. UTC | #2
Cc'ing Gerd (Audio)

On 11/15/19 4:56 PM, Sai Pavan Boddu wrote:
> Fill the audio channel with required number of bytes to cover the
> elapsed time. This prevents rate control reset, and avoids debug prints
> like below
> 
> log:
> 	Resetting rate control (65692 samples)
> 	...
> 	Resetting rate control (65721 samples)
> 	...
> 
> Signed-off-by: Sai Pavan Boddu <sai.pavan.boddu@xilinx.com>
> ---
>   hw/display/xlnx_dp.c | 9 +++++++--
>   1 file changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/display/xlnx_dp.c b/hw/display/xlnx_dp.c
> index fde3b21..7058443 100644
> --- a/hw/display/xlnx_dp.c
> +++ b/hw/display/xlnx_dp.c
> @@ -394,13 +394,18 @@ static void xlnx_dp_audio_callback(void *opaque, int avail)
>               written = AUD_write(s->amixer_output_stream,
>                                   &s->out_buffer[s->data_ptr], s->byte_left);
>           } else {
> +             int len_to_copy;
>               /*
>                * There is nothing to play.. We don't have any data! Fill the
>                * buffer with zero's and send it.
>                */
>               written = 0;
> -            memset(s->out_buffer, 0, 1024);
> -            AUD_write(s->amixer_output_stream, s->out_buffer, 1024);
> +            while (avail) {
> +                len_to_copy = MIN(AUD_CHBUF_MAX_DEPTH, avail);
> +                memset(s->out_buffer, 0, len_to_copy);
> +                avail -= AUD_write(s->amixer_output_stream, s->out_buffer,
> +                                   len_to_copy);
> +            }
>           }
>       } else {
>           written = AUD_write(s->amixer_output_stream,
>
diff mbox series

Patch

diff --git a/hw/display/xlnx_dp.c b/hw/display/xlnx_dp.c
index fde3b21..7058443 100644
--- a/hw/display/xlnx_dp.c
+++ b/hw/display/xlnx_dp.c
@@ -394,13 +394,18 @@  static void xlnx_dp_audio_callback(void *opaque, int avail)
             written = AUD_write(s->amixer_output_stream,
                                 &s->out_buffer[s->data_ptr], s->byte_left);
         } else {
+             int len_to_copy;
             /*
              * There is nothing to play.. We don't have any data! Fill the
              * buffer with zero's and send it.
              */
             written = 0;
-            memset(s->out_buffer, 0, 1024);
-            AUD_write(s->amixer_output_stream, s->out_buffer, 1024);
+            while (avail) {
+                len_to_copy = MIN(AUD_CHBUF_MAX_DEPTH, avail);
+                memset(s->out_buffer, 0, len_to_copy);
+                avail -= AUD_write(s->amixer_output_stream, s->out_buffer,
+                                   len_to_copy);
+            }
         }
     } else {
         written = AUD_write(s->amixer_output_stream,