gerrit.automotivelinux Code Review - AGL/meta-agl-devel.git/blob

   1 From c186e40905f78f41cbc015da0e204735a0398450 Mon Sep 17 00:00:00 2001
   2 From: Julian Bouzas <julian.bouzas@collabora.com>
   3 Date: Fri, 19 Jul 2019 08:38:21 -0400
   4 Subject: [PATCH] a2dpsink: fix infinite loop when buffer could not be encoded
   5
   6 Upstream-Status: Backport [4b202b965665bbcb55194b4ab827984e5804e3e0]
   7 ---
   8  spa/plugins/bluez5/a2dp-sink.c | 7 ++++++-
   9  1 file changed, 6 insertions(+), 1 deletion(-)
  10
  11 diff --git a/spa/plugins/bluez5/a2dp-sink.c b/spa/plugins/bluez5/a2dp-sink.c
  12 index 731577e5..d6d9e7d6 100644
  13 --- a/spa/plugins/bluez5/a2dp-sink.c
  14 +++ b/spa/plugins/bluez5/a2dp-sink.c
  15 @@ -558,8 +558,13 @@ static int flush_data(struct impl *this, uint64_t now_time)
  16                 n_bytes = add_data(this, src + offs, l0);
  17                 if (n_bytes > 0 && l1 > 0)
  18                         n_bytes += add_data(this, src, l1);
  19 -               if (n_bytes <= 0)
  20 +               if (n_bytes <= 0) {
  21 +                       spa_list_remove(&b->link);
  22 +                       b->outstanding = true;
  23 +                       spa_node_call_reuse_buffer(&this->callbacks, 0, b->id);
  24 +                       port->ready_offset = 0;
  25                         break;
  26 +               }
  27
  28                 n_frames = n_bytes / port->frame_size;
  29
  30 --
  31 2.23.0.rc1
  32