Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e5edf3f7 authored by Zhihai Xu's avatar Zhihai Xu
Browse files

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
parent 29299953

system/btif/src/btif_media_task.c

+4 −1
Original line number Diff line number Diff line
@@ -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 @@ enum { 
   (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 @@ static void btif_a2dp_data_cb(tUIPC_CH_ID ch_id, tUIPC_EVENT event) 
            /*  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();

system/udrv/ulinux/uipc.c

+1 −1
Original line number Diff line number Diff line
@@ -799,7 +799,7 @@ UDRV_API UINT32 UIPC_Read(tUIPC_CH_ID ch_id, UINT16 *p_msg_evt, UINT8 *p_buf, UI 
        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);