should return correct length and use shorter poll time for ad2p data
the default poll timeout(100ms) is too long for a2dp data read,
because the a2dp timer pertiod to read data is 20ms. The poll timeout
should be far less than a2dp timer pertiod. also when poll timeout happen
for read, we should return the data length which we already read instead of 0.
bug:8252054
Change-Id: Ifa8587c6b7d127cbbbff76d9e20b630303b6379f
diff --git a/btif/src/btif_media_task.c b/btif/src/btif_media_task.c
index ff9f92c..3649f77 100755
--- a/btif/src/btif_media_task.c
+++ b/btif/src/btif_media_task.c
@@ -88,6 +88,7 @@
#define BTIF_MEDIA_TASK_CMD_MBOX TASK_MBOX_0 /* cmd mailbox */
#define BTIF_MEDIA_TASK_DATA_MBOX TASK_MBOX_1 /* data mailbox */
+
/* BTIF media cmd event definition : BTIF_MEDIA_TASK_CMD */
enum
{
@@ -120,6 +121,7 @@
(1000/TICKS_PER_SEC) (10) */
#define BTIF_MEDIA_TIME_TICK (20 * BTIF_MEDIA_NUM_TICK)
+#define A2DP_DATA_READ_POLL_MS (BTIF_MEDIA_TIME_TICK / 2)
/* buffer pool */
#define BTIF_MEDIA_AA_POOL_ID GKI_POOL_ID_3
@@ -553,7 +555,8 @@
/* read directly from media task from here on (keep callback for
connection events */
UIPC_Ioctl(UIPC_CH_ID_AV_AUDIO, UIPC_REG_REMOVE_ACTIVE_READSET, NULL);
-
+ UIPC_Ioctl(UIPC_CH_ID_AV_AUDIO, UIPC_SET_READ_POLL_TMO,
+ (void *)A2DP_DATA_READ_POLL_MS);
/* Start the media task to encode SBC */
btif_media_task_start_aa_req();
diff --git a/udrv/ulinux/uipc.c b/udrv/ulinux/uipc.c
index 7c000c1..1428c7d 100644
--- a/udrv/ulinux/uipc.c
+++ b/udrv/ulinux/uipc.c
@@ -799,7 +799,7 @@
if (poll(&pfd, 1, uipc_main.ch[ch_id].read_poll_tmo_ms) == 0)
{
BTIF_TRACE_EVENT1("poll timeout (%d ms)", uipc_main.ch[ch_id].read_poll_tmo_ms);
- return 0;
+ break;
}
//BTIF_TRACE_EVENT1("poll revents %x", pfd.revents);