client/player: Use QoS interval on transport.send

This makes use of QoS interval when sending a file.

Signed-off-by: Manika Shrivastava <manika.sh@samsung.com>
Signed-off-by: Ayush Garg <ayush.garg@samsung.com>

diff --git a/client/player.c b/client/player.c
index c435fd1..c25c96d 100644 (file)
--- a/client/player.c
+++ b/client/player.c
@@ -2980,9 +2980,56 @@ static int open_file(const char *filename, int flags)
        return fd;
 }
 
-static int transport_send(struct transport *transport, int fd)
+#define NSEC_USEC(_t) (_t / 1000L)
+#define SEC_USEC(_t)  (_t  * 1000000L)
+#define TS_USEC(_ts)  (SEC_USEC((_ts)->tv_sec) + NSEC_USEC((_ts)->tv_nsec))
+
+static void send_wait(struct timespec *t_start, uint32_t us)
+{
+       struct timespec t_now;
+       struct timespec t_diff;
+       int64_t delta_us;
+
+       /* Skip sleep at start */
+       if (!us)
+               return;
+
+       if (clock_gettime(CLOCK_MONOTONIC, &t_now) < 0) {
+               bt_shell_printf("clock_gettime: %s (%d)", strerror(errno),
+                                                               errno);
+               return;
+       }
+
+       t_diff.tv_sec = t_now.tv_sec - t_start->tv_sec;
+       t_diff.tv_nsec = t_now.tv_nsec - t_start->tv_nsec;
+
+       delta_us = us - TS_USEC(&t_diff);
+
+       if (delta_us < 0) {
+               bt_shell_printf("Send is behind: %lld us - skip sleep",
+                                                       delta_us);
+               delta_us = 1000;
+       }
+
+       usleep(delta_us);
+
+       if (clock_gettime(CLOCK_MONOTONIC, t_start) < 0)
+               bt_shell_printf("clock_gettime: %s (%d)", strerror(errno),
+                                                               errno);
+}
+
+static int transport_send(struct transport *transport, int fd,
+                                       struct bt_iso_qos *qos)
 {
+       struct timespec t_start;
        uint8_t *buf;
+       uint32_t num = 0;
+
+       if (qos && clock_gettime(CLOCK_MONOTONIC, &t_start) < 0) {
+               bt_shell_printf("clock_gettime: %s (%d)", strerror(errno),
+                                                               errno);
+               return -errno;
+       }
 
        buf = malloc(transport->mtu[1]);
        if (!buf) {
@@ -2990,6 +3037,10 @@ static int transport_send(struct transport *transport, int fd)
                return -ENOMEM;
        }
 
+       /* num of packets = latency (ms) / interval (us) */
+       if (qos)
+               num = (qos->out.latency * 1000 / qos->out.interval);
+
        for (transport->seq = 0; ; transport->seq++) {
                ssize_t ret;
                int queued;
@@ -3015,6 +3066,11 @@ static int transport_send(struct transport *transport, int fd)
                bt_shell_printf("[seq %d] send: %zd bytes "
                                "(TIOCOUTQ %d bytes)\n",
                                transport->seq, ret, queued);
+
+               if (qos) {
+                       if (transport->seq && !((transport->seq + 1) % num))
+                               send_wait(&t_start, num * qos->out.interval);
+               }
        }
 
        free(buf);
@@ -3025,6 +3081,8 @@ static void cmd_send_transport(int argc, char *argv[])
        GDBusProxy *proxy;
        struct transport *transport;
        int fd, err;
+       struct bt_iso_qos qos;
+       socklen_t len;
 
        proxy = g_dbus_proxy_lookup(transports, NULL, argv[1],
                                        BLUEZ_MEDIA_TRANSPORT_INTERFACE);
@@ -3048,7 +3106,14 @@ static void cmd_send_transport(int argc, char *argv[])
 
        bt_shell_printf("Sending ...\n");
 
-       err = transport_send(transport, fd);
+       /* Read QoS if available */
+       memset(&qos, 0, sizeof(qos));
+       len = sizeof(qos);
+       if (getsockopt(transport->sk, SOL_BLUETOOTH, BT_ISO_QOS, &qos,
+                                                       &len) < 0)
+               err = transport_send(transport, fd, NULL);
+       else
+               err = transport_send(transport, fd, &qos);
 
        close(fd);
 

diff --git a/tools/bluetooth-player.c b/tools/bluetooth-player.c
index 238a9f3..0975754 100755 (executable)
--- a/tools/bluetooth-player.c
+++ b/tools/bluetooth-player.c
@@ -35,7 +35,6 @@
 #define PROMPT_ON      COLOR_BLUE "[bluetooth]" COLOR_OFF "# "
 #define PROMPT_OFF     "[bluetooth]# "
 
-
 static DBusConnection *dbus_conn;
 
 static void connect_handler(DBusConnection *connection, void *user_data)