From 47b0a18ef3d998ea238fa172a1d7657c35b6fb17 Mon Sep 17 00:00:00 2001
From: liyi <m18269109817@163.com>
Date: Tue, 8 Apr 2025 16:43:11 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E8=B0=83=E6=95=B4=E8=A7=86=E9=A2=91?=
 =?UTF-8?q?=E5=B8=A7=E7=BC=93=E5=86=B2=E5=8C=BA=E9=80=BB=E8=BE=91=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97=E9=80=BB=E8=BE=91=EF=BC=8C=E5=A2=9E=E5=8A=A0=E7=BC=93?=
 =?UTF-8?q?=E5=86=B2=E5=8C=BA=E6=9C=80=E5=A4=A7=E5=A4=A7=E5=B0=8F=E8=87=B3?=
 =?UTF-8?q?20=E5=B8=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/talkView/talk_view_logic.dart       | 48 +++++++++++--------
 1 file changed, 27 insertions(+), 21 deletions(-)

diff --git a/lib/talk/starChart/views/talkView/talk_view_logic.dart b/lib/talk/starChart/views/talkView/talk_view_logic.dart
index 8c0e3737..05d0636c 100644
--- a/lib/talk/starChart/views/talkView/talk_view_logic.dart
+++ b/lib/talk/starChart/views/talkView/talk_view_logic.dart
@@ -56,6 +56,9 @@ class TalkViewLogic extends BaseGetXController {
 
   final Map<String, ui.Image> _imageCache = {};
 
+  // 添加一个变量用于记录上一帧的时间戳
+  int _lastFrameTimestamp = 0; // 初始值为 0
+
   // 添加帧率计算相关变量
   int _frameCount = 0;
   int _lastFpsUpdateTime = 0;
@@ -100,11 +103,11 @@ class TalkViewLogic extends BaseGetXController {
       // 判断数据类型，进行分发处理
       switch (contentType) {
         case TalkData_ContentTypeE.G711:
-          // 第一帧到达时记录开始时间
-          if (_isFirstAudioFrame) {
-            _startAudioTime = currentTime;
-            _isFirstAudioFrame = false;
-          }
+          // // 第一帧到达时记录开始时间
+          // if (_isFirstAudioFrame) {
+          //   _startAudioTime = currentTime;
+          //   _isFirstAudioFrame = false;
+          // }
 
           // 计算音频延迟
           final expectedTime = _startAudioTime + talkData.durationMs;
@@ -130,15 +133,16 @@ class TalkViewLogic extends BaseGetXController {
           if (_isFirstFrame) {
             _startTime = currentTime;
             _isFirstFrame = false;
-            // AppLog.log('记录第一帧的时间戳${currentTime},${talkData.durationMs}');
+            AppLog.log('第一帧帧的时间戳：${talkData.durationMs}');
           }
+          // AppLog.log('其他帧的时间戳：${talkData.durationMs}');
+          // 计算帧间间隔
+          if (_lastFrameTimestamp != 0) {
+            final int frameInterval = talkData.durationMs - _lastFrameTimestamp;
+            _adjustBufferSize(frameInterval); // 根据帧间间隔调整缓冲区
+          }
+          _lastFrameTimestamp = talkData.durationMs; // 更新上一帧时间戳
 
-          // 计算实际延迟：当前时间 - 预期播放时间
-          final expectedTime = _startTime + talkData.durationMs;
-          final videoDelay = currentTime - expectedTime; // 修改延迟计算方式
-
-          // 动态调整缓冲区
-          _adjustBufferSize(videoDelay);
           // 然后添加到播放缓冲区
           if (state.videoBuffer.length >= bufferSize) {
             state.videoBuffer.removeAt(0);
@@ -257,19 +261,21 @@ class TalkViewLogic extends BaseGetXController {
   }
 
   // 新增：动态调整缓冲区大小的方法
-  void _adjustBufferSize(int delay) {
-    const int delayThresholdHigh = 250; // 高延迟阈值（约3帧的时间）
-    const int delayThresholdLow = 166; // 低延迟阈值（约2帧的时间）
+  void _adjustBufferSize(int frameInterval) {
+    const int frameDuration = 83; // 假设每帧的时间间隔为 83ms（12fps）
+    const int delayThresholdHigh = frameDuration * 2; // 高延迟阈值（2帧时间）
+    const int delayThresholdLow = frameDuration; // 低延迟阈值（1帧时间）
     const int adjustInterval = 1; // 每次调整1帧
 
-    if (delay > delayThresholdHigh && bufferSize < maxBufferSize) {
-      // 延迟较大，增加缓冲区
+    if (frameInterval > delayThresholdHigh && bufferSize < maxBufferSize) {
+      // 帧间间隔较大，增加缓冲区
       bufferSize = min(bufferSize + adjustInterval, maxBufferSize);
-      // AppLog.log('📈 增加缓冲区 - 当前大小: $bufferSize, 延迟: ${delay}ms');
-    } else if (delay < delayThresholdLow && bufferSize > minBufferSize) {
-      // 延迟较小，减少缓冲区
+      AppLog.log('📈 增加缓冲区 - 当前大小: $bufferSize, 帧间间隔: ${frameInterval}ms');
+    } else if (frameInterval < delayThresholdLow &&
+        bufferSize > minBufferSize) {
+      // 帧间间隔较小，减少缓冲区
       bufferSize = max(bufferSize - adjustInterval, minBufferSize);
-      // AppLog.log('📉 减少缓冲区 - 当前大小: $bufferSize, 延迟: ${delay}ms');
+      AppLog.log('📉 减少缓冲区 - 当前大小: $bufferSize, 帧间间隔: ${frameInterval}ms');
     }
   }