support timeout 4 data_channnel 2 get frame

lib/async_vid/http/reader.dart

@@ -6,17 +6,18 @@ import '../reader.dart';
 
 class AsyncHttpVidDataReader extends AsyncVidDataReaderBase {
   late final VidUsDataHttpReader _inner;
+  DownloadCallback? downloadCallback;
 
   AsyncHttpVidDataReader(
     String url, {
-    DownloadCallback? downloadCallback,
+    this.downloadCallback,
     int minChunkSize = 65536,
     int connectTimeout = 30000,
     int receiveTimeout = 30000,
   }) : super(url, downloadCallback: downloadCallback) {
     _inner = VidUsDataHttpReader(
       url,
-      downloadCallback: downloadCallback,
+      downloadCallback: _onDownloadCallback,
       minChunkSize: minChunkSize,
       connectTimeout: connectTimeout,
       receiveTimeout: receiveTimeout,
@@ -29,9 +30,6 @@ class AsyncHttpVidDataReader extends AsyncVidDataReaderBase {
     return _inner.toBytes();
   }
 
-  @override
-  int getBufferedSize() => _inner.toBytes().length;
-
   @override
   void close() {
     _inner.close();
@@ -39,4 +37,10 @@ class AsyncHttpVidDataReader extends AsyncVidDataReaderBase {
 
   @override
   void startDownload() {}
+
+  void _onDownloadCallback(double progress, DownloadErrorException? error) {
+    downloadCallback?.call(progress, error);
+    final bufferedSize = (progress * totalSize).toInt();
+    setBufferSize(bufferedSize);
+  }
 }

lib/async_vid/reader.dart

@@ -7,7 +7,7 @@ typedef AsyncVidDataReaderBytesProxy = Uint8List Function();
 
 abstract class AsyncVidDataReaderBase {
   Uint8List _chunkedData = Uint8List(0);
-  int _bufferdSize = 0;
+  int _bufferSize = 0;
   int _index = 0;
   bool _error = false;
   String _errorMsg = '';
@@ -23,8 +23,7 @@ abstract class AsyncVidDataReaderBase {
 
   Uint8List get _underlyingData {
     if (_bytesProxy != null) {
-      final d = _bytesProxy!.call();
-      return d;
+      return _bytesProxy!.call();
     }
     return _chunkedData;
   }
@@ -32,10 +31,6 @@ abstract class AsyncVidDataReaderBase {
   int get downloadedSize => _bufferSize;
   int get totalSize => _underlyingData.length;
 
-  int get _bufferSize => getBufferedSize();
-
-  int getBufferedSize() => _bufferdSize;
-
   void startDownload();
 
   void initChunk(int size) {
@@ -43,8 +38,13 @@ abstract class AsyncVidDataReaderBase {
   }
 
   void appendChunk(Uint8List chunk) {
-    _chunkedData.setAll(_bufferdSize, chunk);
-    _bufferdSize += chunk.length;
+    _chunkedData.setAll(_bufferSize, chunk);
+    setBufferSize(_bufferSize + chunk.length);
+  }
+
+  @protected
+  void setBufferSize(int size) {
+    _bufferSize = size;
   }
 
   void setError(bool hasErr, [String msg = '']) {

lib/async_vid/vid_data.dart

@@ -70,6 +70,9 @@ abstract class AsyncVidImageDataBase {
     return _reader.toBytes();
   }
 
+  void setReadHeaderTimeout(int timeout) => _readHeaderTimeout = timeout;
+  void setReadImageTimeout(int timeout) => _readImageTimeout = timeout;
+
   ///Initialize the HttpVidUsImageData, must be called firstly.
   Future<bool> initialize() async {
     if (!_initialized) {
@@ -96,8 +99,10 @@ abstract class AsyncVidImageDataBase {
 
   ///Close the HttpVidUsImageData, it will force close the download operation and reading operation.
   void close() {
-    // _closed = true;
-    // _reader.close();
+    if (_closed) return;
+
+    _closed = true;
+    _reader.close();
   }
 
   @protected

lib/data_channel/channel.dart

@@ -36,14 +36,14 @@ abstract class VidDataChannel {
 
   /// 开始加载数据
   ///
-  /// [timeoute] 超时时间，单位ms, 默认10s
-  Future<bool> load([int timeoute = 10 * 1000]) async {
+  /// [timeout] 超时时间，单位ms, 默认5s
+  Future<bool> load([int timeout = 5 * 1000]) async {
     if (_initialized) return true;
 
     try {
       final completer = Completer<bool>();
       final timer = Timer(
-        Duration(milliseconds: timeoute),
+        Duration(milliseconds: timeout),
         () {
           if (!completer.isCompleted) {
             completer.complete(_initialized);
@@ -53,7 +53,7 @@ abstract class VidDataChannel {
           }
         },
       );
-      _innerLoad().then((value) {
+      _innerLoad(timeout).then((value) {
         _initialized = true;
         if (timer.isActive) {
           timer.cancel();
@@ -73,9 +73,10 @@ abstract class VidDataChannel {
     downloadProgressChanged.emit(this, info);
   }
 
-  Future<bool> _innerLoad() async {
+  Future<bool> _innerLoad(int timeout) async {
     try {
       source = await buildSource();
+      source!.setReadHeaderTimeout(timeout + 50); // 50ms buffer 4 timer
       await source!.initialize();
       return true;
     } catch (e) {
@@ -91,10 +92,21 @@ abstract class VidDataChannel {
   /// 获取指定帧
   ///
   /// [index] 帧索引
-  Future<VidUsImage> getImage(int index) async {
+  ///
+  /// [timeout] 超时时间ms
+  Future<VidUsImage> getImage(int index, [int timeout = 500]) async {
+    source!.setReadImageTimeout(timeout);
     return source!.getImage(index);
   }
 
+  /// 关闭通道
+  void close() {
+    _initialized = false;
+    try {
+      source?.close();
+    } catch (e) {}
+  }
+
   @protected
   Future<AsyncVidImageDataBase> buildSource();
 }

lib/data_channel/test.dart

@@ -1,21 +0,0 @@
-import 'channel.dart';
-
-class VidChannelTest {
-  void run() async {
-    final channel = VidDataChannel.create(
-        "http://cdn-bj.fis.plus/0B344F48BA574ECD82B7FEDB8848421A.vid");
-    channel.downloadProgressChanged.addListener((sender, e) {
-      if (e.progress == 1) {
-        print('downloadProgressChanged: ${e.progress}');
-      }
-      if (e.error != null) {
-        print('occur error');
-      }
-    });
-    final loaded = await channel.load();
-    if (loaded) {
-      final frame = await channel.getImage(0);
-      print('Frame-${frame.index}');
-    }
-  }
-}

test/fis_lib_vid_test.dart

@@ -1,4 +1,3 @@
-import 'package:fis_vid/data_channel/test.dart';
 import 'package:flutter_test/flutter_test.dart';
 
 void main() {