播放器「卡死 / 无声」修复补丁(diff 参考)

 #define FRAME_SIZE_PER_20MS(x)  (x * CHANNEL_NUM * TIME_SAMPLE_MS / MS_PER_SEC)

// speaker ring buffer 写满时的重试间隔与累计超时。
// ring buffer 仅 DRIVER_SPEAK_FIFO_FRAME_NUM*20ms=40ms, 正常播放时"满"最多等约 40ms 即被 DAC 排空,
// 故 1s 超时不会误伤正常播放; 一旦 DAC 不消费(如待机唤醒后未真正恢复)即可在 1s 内丢帧退出,
// 避免播放线程被无限重试永久 wedge 住。
#define SPK_WRITE_RETRY_INTERVAL_MS  (20)
#define SPK_WRITE_TIMEOUT_MS         (1000)

    // 分段调用 bk_aud_intf_write_spk_data
    while (remaining_size > 0) {
        chunk_size = (remaining_size > spk_ringbuf_size) ? spk_ringbuf_size : remaining_size;

write_spk_retry:
        ret = bk_voice_write_frame_data(g_voice_write_handle, (char *)(pframe->pbuf + offset), chunk_size);
        // ret = bk_voice_write_spk_data(...);
        if (ret == 0) {
            tkl_system_sleep(20);
            goto write_spk_retry;
        }
        // ring buffer 满时 bk_voice_write_frame_data 返回 0, 这里带累计超时重试,
        // 防止 DAC 不消费(如待机唤醒后未真正恢复)导致播放线程永久 wedge。
        UINT_T waited_ms = 0;
        do {
            ret = bk_voice_write_frame_data(g_voice_write_handle, (char *)(pframe->pbuf + offset), chunk_size);
            if (ret != 0) {
                break;
            }
            tkl_system_sleep(SPK_WRITE_RETRY_INTERVAL_MS);
            waited_ms += SPK_WRITE_RETRY_INTERVAL_MS;
        } while (waited_ms < SPK_WRITE_TIMEOUT_MS);

        if (ret == 0) {
            // 超时仍写不进, 判定为底层未在消费, 丢弃本帧并返回, 让上层 player 线程得以 stop+恢复
            os_printf("audio spk write timeout(%u ms), drop frame, chunk:%d \r\n", waited_ms, chunk_size);
            return OPRT_TIMEOUT;
        }

        if (ret < 0) {
            os_printf("audio intf spk semaphore wait fail, ret:%d \r\n", ret);
            return ret;
        }
        offset += chunk_size;
        remaining_size -= chunk_size;
    }
    return OPRT_OK;

 #define PLAYER_IDLE_TIMEOUT_MS  0xFFFFffff
 #define PLAYER_BUSY_TIMEOUT_MS  1
 #define PLAYER_MAX_VOLUME     100

// 兜底: 命令队列深度从 2 加深, 避免播放线程短暂卡顿时 START/STOP 投递立刻失败(-26369);
// 投递给一个有界超时而非 0, 在底层恢复(见 tkl_ao_put_frame 超时)的窗口内重试投递。
#define PLAYER_QUEUE_DEPTH        8
#define PLAYER_CMD_POST_TIMEOUT_MS 200

    TUYA_CALL_ERR_RETURN(tal_queue_create_init(&s_ai_player_ctx.queue, SIZEOF(AI_PLAYER_MSG_T), 2));
    TUYA_CALL_ERR_RETURN(tal_queue_create_init(&s_ai_player_ctx.queue, SIZEOF(AI_PLAYER_MSG_T), PLAYER_QUEUE_DEPTH));

    msg.param.cmd_start.value = value ? mm_strdup(value) : NULL;
    PR_DEBUG("start player %d %d", src, codec);
    TUYA_CALL_ERR_RETURN(tal_queue_post(s_ai_player_ctx.queue, &msg, 0));
    rt = tal_queue_post(s_ai_player_ctx.queue, &msg, PLAYER_CMD_POST_TIMEOUT_MS);
    if (OPRT_OK != rt) {
        PR_ERR("post start cmd failed: %d", rt);
        if (msg.param.cmd_start.value) {
            Free(msg.param.cmd_start.value);
        }
        return rt;
    }

    msg.cmd  = PLAYER_CMD_STOP;
    PR_DEBUG("stop player %d", player->mode);
    TUYA_CALL_ERR_RETURN(tal_queue_post(s_ai_player_ctx.queue, &msg, 0));
    TUYA_CALL_ERR_RETURN(tal_queue_post(s_ai_player_ctx.queue, &msg, PLAYER_CMD_POST_TIMEOUT_MS));