feat: listener before ack,download progress

1.listener before ack
2.use ps.pts to update download progress

.github/workflows/iflow.yml

@@ -1,101 +0,0 @@
-name: '🏷️ iFLOW CLI Automated Issue Triage'
-
-on:
-  issues:
-    types:
-      - 'opened'
-      - 'reopened'
-  issue_comment:
-    types:
-      - 'created'
-  workflow_dispatch:
-    inputs:
-      issue_number:
-        description: 'issue number to triage'
-        required: true
-        type: 'number'
-
-concurrency:
-  group: '${{ github.workflow }}-${{ github.event.issue.number }}'
-  cancel-in-progress: true
-
-defaults:
-  run:
-    shell: 'bash'
-
-permissions:
-  contents: 'read'
-  issues: 'write'
-  statuses: 'write'
-
-jobs:
-  triage-issue:
-    if: |-
-      github.event_name == 'issues' ||
-      github.event_name == 'workflow_dispatch' ||
-      (
-        github.event_name == 'issue_comment' &&
-        contains(github.event.comment.body, '@iflow-cli /triage') &&
-        contains(fromJSON('["OWNER", "MEMBER", "COLLABORATOR"]'), github.event.comment.author_association)
-      )
-    timeout-minutes: 5
-    runs-on: 'ubuntu-latest'
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: 'Run iFlow CLI Issue Triage'
-        uses: vibe-ideas/iflow-cli-action@main
-        id: 'iflow_cli_issue_triage'
-        env:
-          GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
-          ISSUE_TITLE: '${{ github.event.issue.title }}'
-          ISSUE_BODY: '${{ github.event.issue.body }}'
-          ISSUE_NUMBER: '${{ github.event.issue.number }}'
-          REPOSITORY: '${{ github.repository }}'
-        with:
-          api_key: ${{ secrets.IFLOW_API_KEY }}
-          timeout: "3600"
-          extra_args: "--debug"
-          prompt: |
-            ## Role
-
-            You are an issue triage assistant. Analyze the current GitHub issue
-            and apply the most appropriate existing labels. Use the available
-            tools to gather information; do not ask for information to be
-            provided.
-
-            ## Steps
-
-            1. Run: `gh label list` to get all available labels.
-            2. Review the issue title and body provided in the environment
-               variables: "${ISSUE_TITLE}" and "${ISSUE_BODY}".
-            3. Classify issues by their kind (bug, enhancement, documentation,
-               cleanup, etc) and their priority (p0, p1, p2, p3). Set the
-               labels according to the format `kind/*` and `priority/*` patterns.
-            4. Apply the selected labels to this issue using:
-               `gh issue edit "${ISSUE_NUMBER}" --add-label "label1,label2"`
-            5. If the "status/needs-triage" label is present, remove it using:
-               `gh issue edit "${ISSUE_NUMBER}" --remove-label "status/needs-triage"`
-
-            ## Guidelines
-
-            - Only use labels that already exist in the repository
-            - Do not add comments or modify the issue content
-            - Triage only the current issue
-            - Assign all applicable labels based on the issue content
-            - Reference all shell variables as "${VAR}" (with quotes and braces)
-
-      - name: 'Post Issue Triage Failure Comment'
-        if: |-
-          ${{ failure() && steps.iflow_cli_issue_triage.outcome == 'failure' }}
-        uses: 'actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea'
-        with:
-          github-token: '${{ secrets.GITHUB_TOKEN }}'
-          script: |-
-            github.rest.issues.createComment({
-              owner: '${{ github.repository }}'.split('/')[0],
-              repo: '${{ github.repository }}'.split('/')[1],
-              issue_number: '${{ github.event.issue.number }}',
-              body: 'There is a problem with the iFlow CLI issue triaging. Please check the [action logs](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}) for details.'
-            })

Dockerfile

@@ -10,6 +10,8 @@ COPY monibuca_amd64 ./monibuca_amd64
 COPY monibuca_arm64 ./monibuca_arm64
 
 COPY admin.zip ./admin.zip
+COPY example/default/test.mp4 ./test.mp4
+COPY example/default/test.flv ./test.flv
 
 # Install tcpdump
 RUN apt-get update && apt-get install -y tcpdump && rm -rf /var/lib/apt/lists/*

README.md

@@ -117,6 +117,7 @@ The following build tags can be used to customize your build:
 | duckdb | Enables the duckdb DB |
 | taskpanic | Throws panic, for testing |
 | fasthttp | Enables the fasthttp server instead of net/http |
+| enable_buddy | Enables the buddy memory pre-allocation |
 
 <p align="right">(<a href="#readme-top">back to top</a>)</p>
 
@@ -166,7 +167,7 @@ Contributions are what make the open source community such an amazing place to l
 
 ## License
 
-Distributed under the MIT License. See `LICENSE` for more information.
+Distributed under the AGPL License. See `LICENSE` for more information.
 
 <p align="right">(<a href="#readme-top">back to top</a>)</p>
 

README_CN.md

@@ -116,6 +116,7 @@ go run -tags sqlite main.go
 | duckdb | 启用 DuckDB 存储 |
 | taskpanic | 抛出 panic（用于测试） |
 | fasthttp | 使用 fasthttp 服务器代替标准库 |
+| enable_buddy | 开启 buddy 内存预申请|
 
 <p align="right">(<a href="#readme-top">返回顶部</a>)</p>
 

api.go

@@ -12,8 +12,8 @@ import (
 	"strings"
 	"time"
 
+	task "github.com/langhuihui/gotask"
 	"m7s.live/v5/pkg/config"
-	"m7s.live/v5/pkg/task"
 
 	myip "github.com/husanpao/ip"
 	"github.com/shirou/gopsutil/v4/cpu"
@@ -1080,6 +1080,9 @@ func (s *Server) StartPull(ctx context.Context, req *pb.GlobalPullRequest) (res
 				if req.PubType != nil {
 					pubConfig.PubType = *req.PubType
 				}
+				if req.Loop != nil {
+					pullConfig.Loop = int(*req.Loop)
+				}
 				if req.Dump != nil {
 					pubConfig.Dump = *req.Dump
 				}

doc/arch/reader_design_philosophy.md

@@ -133,7 +133,7 @@ Factory functions like `NewRTPTCPReader`, `NewRTPUDPReader`, etc., are used to c
 
 In practical applications, we also need to consider performance optimization:
 
-1. **Memory Reuse**: Using `util.Buffer` and `util.Memory` to reduce memory allocation
+1. **Memory Reuse**: Using `util.Buffer` and `gomem.Memory` to reduce memory allocation
 2. **Buffering Mechanism**: Using buffers in RTPPayloadReader to handle incomplete packets
 3. **Error Handling**: Using `errors.Join` to combine multiple error messages
 

doc/arch/reuse.md

@@ -57,7 +57,7 @@ The new version implements object reuse through the PublishWriter pattern:
 // New version - Object reuse approach
 func publishWithReuse(publisher *Publisher) {
     // 1. Create memory allocator with pre-allocated memory
-    allocator := util.NewScalableMemoryAllocator(1 << 12)
+    allocator := gomem.NewScalableMemoryAllocator(1 << 12)
     defer allocator.Recycle()
     
     // 2. Create writer with object reuse
@@ -128,7 +128,7 @@ The new version introduces a generic-based PublishWriter pattern that implements
 ```go
 // New version usage
 func publishWithNewAPI(publisher *Publisher) {
-    allocator := util.NewScalableMemoryAllocator(1 << 12)
+    allocator := gomem.NewScalableMemoryAllocator(1 << 12)
     defer allocator.Recycle()
     
     writer := m7s.NewPublisherWriter[*AudioFrame, *VideoFrame](publisher, allocator)
@@ -153,7 +153,7 @@ audioFrame := &AudioFrame{Data: data}
 publisher.WriteAudio(audioFrame)  // Internally creates multiple wrapper objects
 
 // New version - Reuse objects
-allocator := util.NewScalableMemoryAllocator(1 << 12)
+allocator := gomem.NewScalableMemoryAllocator(1 << 12)
 defer allocator.Recycle()
 writer := m7s.NewPublisherWriter[*AudioFrame, *VideoFrame](publisher, allocator)
 copy(writer.AudioFrame.NextN(len(data)), data)
@@ -163,7 +163,7 @@ writer.NextAudio()  // Reuse object, no new object creation
 2. **Add Memory Management**
 ```go
 // New version must add memory allocator
-allocator := util.NewScalableMemoryAllocator(1 << 12)
+allocator := gomem.NewScalableMemoryAllocator(1 << 12)
 defer allocator.Recycle()  // Ensure resource release
 ```
 
@@ -185,7 +185,7 @@ func simplePublish(publisher *Publisher, audioData, videoData []byte) {
 
 // New version
 func simplePublish(publisher *Publisher, audioData, videoData []byte) {
-    allocator := util.NewScalableMemoryAllocator(1 << 12)
+    allocator := gomem.NewScalableMemoryAllocator(1 << 12)
     defer allocator.Recycle()
     writer := m7s.NewPublisherWriter[*AudioFrame, *VideoFrame](publisher, allocator)
     
@@ -211,7 +211,7 @@ func transformStream(subscriber *Subscriber, publisher *Publisher) {
 
 // New version - Reuse objects to avoid repeated creation
 func transformStream(subscriber *Subscriber, publisher *Publisher) {
-    allocator := util.NewScalableMemoryAllocator(1 << 12)
+    allocator := gomem.NewScalableMemoryAllocator(1 << 12)
     defer allocator.Recycle()
     writer := m7s.NewPublisherWriter[*AudioFrame, *VideoFrame](publisher, allocator)
     
@@ -236,7 +236,7 @@ func handleMultiFormatOld(publisher *Publisher, data IAVFrame) {
 
 // New version - Pre-allocate and reuse
 func handleMultiFormatNew(publisher *Publisher, data IAVFrame) {
-    allocator := util.NewScalableMemoryAllocator(1 << 12)
+    allocator := gomem.NewScalableMemoryAllocator(1 << 12)
     defer allocator.Recycle()
     writer := m7s.NewPublisherWriter[*AudioFrame, *VideoFrame](publisher, allocator)
     
@@ -307,7 +307,7 @@ func (m *Memory) Reset() {
 **Scenario 1: Object Reuse in NALU Processing**
 ```go
 // In video frame processing, NALU array uses ReuseArray
-type Nalus = util.ReuseArray[util.Memory]
+type Nalus = util.ReuseArray[gomem.Memory]
 
 func (r *VideoFrame) Demux() error {
     nalus := r.GetNalus()  // Get NALU reuse array
@@ -326,7 +326,7 @@ SEI insertion achieves efficient processing through object reuse:
 
 ```go
 func (t *Transformer) Run() (err error) {
-    allocator := util.NewScalableMemoryAllocator(1 << util.MinPowerOf2)
+    allocator := gomem.NewScalableMemoryAllocator(1 << gomem.MinPowerOf2)
     defer allocator.Recycle()
     writer := m7s.NewPublisherWriter[*format.RawAudio, *format.H26xFrame](pub, allocator)
     
@@ -359,7 +359,7 @@ func (t *Transformer) Run() (err error) {
 ```go
 func (r *VideoFrame) Demux() error {
     nalus := r.GetNalus()
-    var nalu *util.Memory
+    var nalu *gomem.Memory
     
     for packet := range r.Packets.RangePoint {
         switch t := codec.ParseH264NALUType(b0); t {
@@ -390,9 +390,9 @@ func (r *VideoFrame) Demux() error {
 ```go
 // Legacy version - Create new object each time
 func processNalusOld(packets []RTPPacket) {
-    var nalus []util.Memory
+    var nalus []gomem.Memory
     for _, packet := range packets {
-        nalu := util.Memory{}  // Create new object each time
+        nalu := gomem.Memory{}  // Create new object each time
         nalu.PushOne(packet.Payload)
         nalus = append(nalus, nalu)  // Memory allocation
     }
@@ -403,7 +403,7 @@ func processNalusOld(packets []RTPPacket) {
 ```go
 // New version - Reuse objects
 func processNalusNew(packets []RTPPacket) {
-    var nalus util.ReuseArray[util.Memory]
+    var nalus util.ReuseArray[gomem.Memory]
     for _, packet := range packets {
         nalu := nalus.GetNextPointer()  // Reuse object, zero allocation
         nalu.PushOne(packet.Payload)
@@ -482,7 +482,7 @@ type AVFrame struct {
 
 type Sample struct {
     codec.ICodecCtx
-    util.RecyclableMemory  // Recyclable memory
+    gomem.RecyclableMemory  // Recyclable memory
     *BaseSample
 }
 ```
@@ -514,7 +514,7 @@ type PublishWriter[A IAVFrame, V IAVFrame] struct {
 **Usage Flow:**
 ```go
 // 1. Create allocator
-allocator := util.NewScalableMemoryAllocator(1 << 12)
+allocator := gomem.NewScalableMemoryAllocator(1 << 12)
 defer allocator.Recycle()
 
 // 2. Create writer
@@ -552,7 +552,7 @@ func BenchmarkOldVsNew(b *testing.B) {
     
     // New version test
     b.Run("NewPublishWriter", func(b *testing.B) {
-        allocator := util.NewScalableMemoryAllocator(1 << 12)
+        allocator := gomem.NewScalableMemoryAllocator(1 << 12)
         defer allocator.Recycle()
         writer := m7s.NewPublisherWriter[*AudioFrame, *VideoFrame](publisher, allocator)
         
@@ -581,7 +581,7 @@ func BenchmarkOldVsNew(b *testing.B) {
 ```go
 // Step 1: Keep original logic, add allocator
 func migrateStep1(publisher *Publisher) {
-    allocator := util.NewScalableMemoryAllocator(1 << 12)
+    allocator := gomem.NewScalableMemoryAllocator(1 << 12)
     defer allocator.Recycle()
     
     // Temporarily keep old way, but added memory management
@@ -591,7 +591,7 @@ func migrateStep1(publisher *Publisher) {
 
 // Step 2: Gradually replace with PublishWriter
 func migrateStep2(publisher *Publisher) {
-    allocator := util.NewScalableMemoryAllocator(1 << 12)
+    allocator := gomem.NewScalableMemoryAllocator(1 << 12)
     defer allocator.Recycle()
     
     writer := m7s.NewPublisherWriter[*AudioFrame, *VideoFrame](publisher, allocator)
@@ -603,15 +603,15 @@ func migrateStep2(publisher *Publisher) {
 #### 5.1.2 Memory Allocator Selection
 ```go
 // Choose appropriate allocator size based on scenario
-var allocator *util.ScalableMemoryAllocator
+var allocator *gomem.ScalableMemoryAllocator
 
 switch scenario {
 case "high_fps":
-    allocator = util.NewScalableMemoryAllocator(1 << 14)  // 16KB
+    allocator = gomem.NewScalableMemoryAllocator(1 << 14)  // 16KB
 case "low_latency":
-    allocator = util.NewScalableMemoryAllocator(1 << 10)  // 1KB
+    allocator = gomem.NewScalableMemoryAllocator(1 << 10)  // 1KB
 case "high_throughput":
-    allocator = util.NewScalableMemoryAllocator(1 << 16)  // 64KB
+    allocator = gomem.NewScalableMemoryAllocator(1 << 16)  // 64KB
 }
 ```
 
@@ -621,13 +621,13 @@ case "high_throughput":
 ```go
 // Wrong: Forget to recycle memory
 func badExample() {
-    allocator := util.NewScalableMemoryAllocator(1 << 12)
+    allocator := gomem.NewScalableMemoryAllocator(1 << 12)
     // Forget defer allocator.Recycle()
 }
 
 // Correct: Ensure resource release
 func goodExample() {
-    allocator := util.NewScalableMemoryAllocator(1 << 12)
+    allocator := gomem.NewScalableMemoryAllocator(1 << 12)
     defer allocator.Recycle()  // Ensure release
 }
 ```
@@ -662,7 +662,7 @@ func handleWebRTCOld(track *webrtc.TrackRemote, publisher *Publisher) {
 
 // New WebRTC processing
 func handleWebRTCNew(track *webrtc.TrackRemote, publisher *Publisher) {
-    allocator := util.NewScalableMemoryAllocator(1 << 12)
+    allocator := gomem.NewScalableMemoryAllocator(1 << 12)
     defer allocator.Recycle()
     writer := m7s.NewPublishVideoWriter[*VideoFrame](publisher, allocator)
     
@@ -695,7 +695,7 @@ func pullFLVOld(publisher *Publisher, file *os.File) {
 
 // New FLV stream pulling
 func pullFLVNew(publisher *Publisher, file *os.File) {
-    allocator := util.NewScalableMemoryAllocator(1 << 12)
+    allocator := gomem.NewScalableMemoryAllocator(1 << 12)
     defer allocator.Recycle()
     writer := m7s.NewPublisherWriter[*AudioFrame, *VideoFrame](publisher, allocator)
     

doc/bufreader_analysis.md

@@ -0,0 +1,692 @@
+# BufReader: Zero-Copy Network Reading with Non-Contiguous Memory Buffers
+
+## Table of Contents
+
+- [1. Problem: Traditional Contiguous Memory Buffer Bottlenecks](#1-problem-traditional-contiguous-memory-buffer-bottlenecks)
+- [2. Core Solution: Non-Contiguous Memory Buffer Passing Mechanism](#2-core-solution-non-contiguous-memory-buffer-passing-mechanism)
+- [3. Performance Validation](#3-performance-validation)
+- [4. Usage Guide](#4-usage-guide)
+
+## TL;DR (Key Takeaways)
+
+**Core Innovation**: Non-Contiguous Memory Buffer Passing Mechanism
+- Data stored as **sliced memory blocks**, non-contiguous layout
+- Pass references via **ReadRange callback**, zero-copy
+- Memory blocks **reused from object pool**, avoiding allocation and GC
+
+**Performance Data** (Streaming server, 100 concurrent streams):
+```
+bufio.Reader: 79 GB allocated, 134 GCs, 374.6 ns/op
+BufReader:    0.6 GB allocated, 2 GCs, 30.29 ns/op
+
+Result: 98.5% GC reduction, 11.6x throughput improvement
+```
+
+**Ideal For**: High-concurrency network servers, streaming media, long-running services
+
+---
+
+## 1. Problem: Traditional Contiguous Memory Buffer Bottlenecks
+
+### 1.1 bufio.Reader's Contiguous Memory Model
+
+The standard library `bufio.Reader` uses a **fixed-size contiguous memory buffer**:
+
+```go
+type Reader struct {
+    buf []byte    // Single contiguous buffer (e.g., 4KB)
+    r, w int      // Read/write pointers
+}
+
+func (b *Reader) Read(p []byte) (n int, err error) {
+    // Copy from contiguous buffer to target
+    n = copy(p, b.buf[b.r:b.w])  // Must copy
+    return
+}
+```
+
+**Cost of Contiguous Memory**:
+
+```
+Reading 16KB data (with 4KB buffer):
+
+Network → bufio buffer → User buffer
+  ↓      (4KB contiguous)    ↓
+1st      [████]  →  Copy to result[0:4KB]
+2nd      [████]  →  Copy to result[4KB:8KB]
+3rd      [████]  →  Copy to result[8KB:12KB]
+4th      [████]  →  Copy to result[12KB:16KB]
+
+Total: 4 network reads + 4 memory copies
+Allocates result (16KB contiguous memory)
+```
+
+### 1.2 Issues in High-Concurrency Scenarios
+
+In streaming servers (100 concurrent connections, 30fps each):
+
+```go
+// Typical processing pattern
+func handleStream(conn net.Conn) {
+    reader := bufio.NewReaderSize(conn, 4096)
+    for {
+        // Allocate contiguous buffer for each packet
+        packet := make([]byte, 1024)  // Allocation 1
+        n, _ := reader.Read(packet)   // Copy 1
+        
+        // Forward to multiple subscribers
+        for _, sub := range subscribers {
+            data := make([]byte, n)  // Allocations 2-N
+            copy(data, packet[:n])   // Copies 2-N
+            sub.Write(data)
+        }
+    }
+}
+
+// Performance impact:
+// 100 connections × 30fps × (1 + subscribers) allocations = massive temporary memory
+// Triggers frequent GC, system instability
+```
+
+**Core Problems**:
+1. Must maintain contiguous memory layout → Frequent copying
+2. Allocate new buffer for each packet → Massive temporary objects
+3. Forwarding requires multiple copies → CPU wasted on memory operations
+
+## 2. Core Solution: Non-Contiguous Memory Buffer Passing Mechanism
+
+### 2.1 Design Philosophy
+
+BufReader uses **non-contiguous memory block slices**:
+
+```
+No longer require data in contiguous memory:
+1. Data scattered across multiple memory blocks (slice)
+2. Each block independently managed and reused
+3. Pass by reference, no data copying
+```
+
+**Core Data Structures**:
+
+```go
+type BufReader struct {
+    Allocator *ScalableMemoryAllocator  // Object pool allocator
+    buf       MemoryReader               // Memory block slice
+}
+
+type MemoryReader struct {
+    Buffers [][]byte  // Multiple memory blocks, non-contiguous!
+    Size    int       // Total size
+    Length  int       // Readable length
+}
+```
+
+### 2.2 Non-Contiguous Memory Buffer Model
+
+#### Contiguous vs Non-Contiguous Comparison
+
+```
+bufio.Reader (Contiguous Memory):
+┌─────────────────────────────────┐
+│ 4KB Fixed Buffer                │
+│ [Read][Available]               │
+└─────────────────────────────────┘
+- Must copy to contiguous target buffer
+- Fixed size limitation
+- Read portion wastes space
+
+BufReader (Non-Contiguous Memory):
+┌──────┐ ┌──────┐ ┌────────┐ ┌──────┐
+│Block1│→│Block2│→│ Block3 │→│Block4│
+│ 512B │ │ 1KB  │ │  2KB   │ │ 3KB  │
+└──────┘ └──────┘ └────────┘ └──────┘
+- Directly pass reference to each block (zero-copy)
+- Flexible block sizes
+- Recycle immediately after processing
+```
+
+#### Memory Block Chain Workflow
+
+```mermaid
+sequenceDiagram
+    participant N as Network
+    participant P as Object Pool
+    participant B as BufReader.buf
+    participant U as User Code
+    
+    N->>P: 1st read (returns 512B)
+    P-->>B: Block1 (512B) - from pool or new
+    B->>B: Buffers = [Block1]
+    
+    N->>P: 2nd read (returns 1KB)
+    P-->>B: Block2 (1KB) - reused from pool
+    B->>B: Buffers = [Block1, Block2]
+    
+    N->>P: 3rd read (returns 2KB)
+    P-->>B: Block3 (2KB)
+    B->>B: Buffers = [Block1, Block2, Block3]
+    
+    U->>B: ReadRange(4096)
+    B->>U: yield(Block1) - pass reference
+    B->>U: yield(Block2) - pass reference
+    B->>U: yield(Block3) - pass reference
+    B->>U: yield(Block4[0:512])
+    
+    U->>B: Processing complete
+    B->>P: Recycle Block1, Block2, Block3, Block4
+    Note over P: Memory blocks return to pool for reuse
+```
+
+### 2.3 Zero-Copy Passing: ReadRange API
+
+**Core API**:
+
+```go
+func (r *BufReader) ReadRange(n int, yield func([]byte)) error
+```
+
+**How It Works**:
+
+```go
+// Internal implementation (simplified)
+func (r *BufReader) ReadRange(n int, yield func([]byte)) error {
+    remaining := n
+    
+    // Iterate through memory block slice
+    for _, block := range r.buf.Buffers {
+        if remaining <= 0 {
+            break
+        }
+        
+        if len(block) <= remaining {
+            // Pass entire block
+            yield(block)  // Zero-copy: pass reference directly!
+            remaining -= len(block)
+        } else {
+            // Pass portion
+            yield(block[:remaining])
+            remaining = 0
+        }
+    }
+    
+    // Recycle processed blocks
+    r.recycleFront()
+    return nil
+}
+```
+
+**Usage Example**:
+
+```go
+// Read 4096 bytes of data
+reader.ReadRange(4096, func(chunk []byte) {
+    // chunk is reference to original memory block
+    // May be called multiple times with different sized blocks
+    // e.g.: 512B, 1KB, 2KB, 512B
+    
+    processData(chunk)  // Process directly, zero-copy!
+})
+
+// Characteristics:
+// - No need to allocate target buffer
+// - No need to copy data
+// - Each chunk automatically recycled after processing
+```
+
+### 2.4 Advantages in Real Network Scenarios
+
+**Scenario: Read 10KB from network, each read returns 500B-2KB**
+
+```
+bufio.Reader (Contiguous Memory):
+1. Read 2KB to internal buffer (contiguous)
+2. Copy 2KB to user buffer ← Copy
+3. Read 1.5KB to internal buffer
+4. Copy 1.5KB to user buffer ← Copy
+5. Read 2KB...
+6. Copy 2KB... ← Copy
+... Repeat ...
+Total: Multiple network reads + Multiple memory copies
+Must allocate 10KB contiguous buffer
+
+BufReader (Non-Contiguous Memory):
+1. Read 2KB → Block1, append to slice
+2. Read 1.5KB → Block2, append to slice
+3. Read 2KB → Block3, append to slice
+4. Read 2KB → Block4, append to slice
+5. Read 2.5KB → Block5, append to slice
+6. ReadRange(10KB):
+   → yield(Block1) - 2KB
+   → yield(Block2) - 1.5KB
+   → yield(Block3) - 2KB
+   → yield(Block4) - 2KB
+   → yield(Block5) - 2.5KB
+Total: Multiple network reads + 0 memory copies
+No contiguous memory needed, process block by block
+```
+
+### 2.5 Real Application: Stream Forwarding
+
+**Problem Scenario**: 100 concurrent streams, each forwarded to 10 subscribers
+
+**Traditional Approach** (Contiguous Memory):
+
+```go
+func forwardStream_Traditional(reader *bufio.Reader, subscribers []net.Conn) {
+    packet := make([]byte, 4096)  // Alloc 1: contiguous memory
+    n, _ := reader.Read(packet)   // Copy 1: from bufio buffer
+    
+    // Copy for each subscriber
+    for _, sub := range subscribers {
+        data := make([]byte, n)  // Allocs 2-11: 10 times
+        copy(data, packet[:n])   // Copies 2-11: 10 times
+        sub.Write(data)
+    }
+}
+// Per packet: 11 allocations + 11 copies
+// 100 concurrent × 30fps × 11 = 33,000 allocations/sec
+```
+
+**BufReader Approach** (Non-Contiguous Memory):
+
+```go
+func forwardStream_BufReader(reader *BufReader, subscribers []net.Conn) {
+    reader.ReadRange(4096, func(chunk []byte) {
+        // chunk is original memory block reference, may be non-contiguous
+        // All subscribers share the same memory block!
+        
+        for _, sub := range subscribers {
+            sub.Write(chunk)  // Send reference directly, zero-copy
+        }
+    })
+}
+// Per packet: 0 allocations + 0 copies
+// 100 concurrent × 30fps × 0 = 0 allocations/sec
+```
+
+**Performance Comparison**:
+- Allocations: 33,000/sec → 0/sec
+- Memory copies: 33,000/sec → 0/sec
+- GC pressure: High → Very low
+
+### 2.6 Memory Block Lifecycle
+
+```mermaid
+stateDiagram-v2
+    [*] --> Get from Pool
+    Get from Pool --> Read Network Data
+    Read Network Data --> Append to Slice
+    Append to Slice --> Pass to User
+    Pass to User --> User Processing
+    User Processing --> Recycle to Pool
+    Recycle to Pool --> Get from Pool
+    
+    note right of Get from Pool
+        Reuse existing blocks
+        Avoid GC
+    end note
+    
+    note right of Pass to User
+        Pass reference, zero-copy
+        May pass to multiple subscribers
+    end note
+    
+    note right of Recycle to Pool
+        Active recycling
+        Immediately reusable
+    end note
+```
+
+**Key Points**:
+1. Memory blocks **circularly reused** in pool, bypassing GC
+2. Pass references instead of copying data, achieving zero-copy
+3. Recycle immediately after processing, minimizing memory footprint
+
+### 2.7 Core Code Implementation
+
+```go
+// Create BufReader
+func NewBufReader(reader io.Reader) *BufReader {
+    return &BufReader{
+        Allocator: NewScalableMemoryAllocator(16384), // Object pool
+        feedData: func() error {
+            // Get memory block from pool, read network data directly
+            buf, err := r.Allocator.Read(reader, r.BufLen)
+            if err != nil {
+                return err
+            }
+            // Append to slice (only add reference)
+            r.buf.Buffers = append(r.buf.Buffers, buf)
+            r.buf.Length += len(buf)
+            return nil
+        },
+    }
+}
+
+// Zero-copy reading
+func (r *BufReader) ReadRange(n int, yield func([]byte)) error {
+    for r.buf.Length < n {
+        r.feedData()  // Read more data from network
+    }
+    
+    // Pass references block by block
+    for _, block := range r.buf.Buffers {
+        yield(block)  // Zero-copy passing
+    }
+    
+    // Recycle processed blocks
+    r.recycleFront()
+    return nil
+}
+
+// Recycle memory blocks to pool
+func (r *BufReader) Recycle() {
+    if r.Allocator != nil {
+        r.Allocator.Recycle()  // Return all blocks to pool
+    }
+}
+```
+
+## 3. Performance Validation
+
+### 3.1 Test Design
+
+**Real Network Simulation**: Each read returns random size (64-2048 bytes), simulating real network fluctuations
+
+**Core Test Scenarios**:
+1. **Concurrent Network Connection Reading** - Simulate 100+ concurrent connections
+2. **GC Pressure Test** - Demonstrate long-term running differences
+3. **Streaming Server** - Real business scenario (100 streams × forwarding)
+
+### 3.2 Performance Test Results
+
+**Test Environment**: Apple M2 Pro, Go 1.23.0
+
+#### GC Pressure Test (Core Comparison)
+
+| Metric | bufio.Reader | BufReader | Improvement |
+|--------|-------------|-----------|-------------|
+| Operation Latency | 1874 ns/op | 112.7 ns/op | **16.6x faster** |
+| Allocation Count | 5,576,659 | 3,918 | **99.93% reduction** |
+| Per Operation | 2 allocs/op | 0 allocs/op | **Zero allocation** |
+| Throughput | 2.8M ops/s | 45.7M ops/s | **16x improvement** |
+
+#### Streaming Server Scenario
+
+| Metric | bufio.Reader | BufReader | Improvement |
+|--------|-------------|-----------|-------------|
+| Operation Latency | 374.6 ns/op | 30.29 ns/op | **12.4x faster** |
+| Memory Allocation | 79,508 MB | 601 MB | **99.2% reduction** |
+| **GC Runs** | **134** | **2** | **98.5% reduction** ⭐ |
+| Throughput | 10.1M ops/s | 117M ops/s | **11.6x improvement** |
+
+#### Performance Visualization
+
+```
+📊 GC Runs Comparison (Core Advantage)
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+bufio.Reader   ████████████████████████████████████████████████████████████████  134 runs
+BufReader      █  2 runs  ← 98.5% reduction!
+
+📊 Total Memory Allocation
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+bufio.Reader   ████████████████████████████████████████████████████████████████  79 GB
+BufReader      █  0.6 GB  ← 99.2% reduction!
+
+📊 Throughput Comparison
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+bufio.Reader   █████  10.1M ops/s
+BufReader      ████████████████████████████████████████████████████████  117M ops/s
+```
+
+### 3.3 Why Non-Contiguous Memory Is So Fast
+
+**Reason 1: Zero-Copy Passing**
+```go
+// bufio - Must copy
+buf := make([]byte, 1024)
+reader.Read(buf)  // Copy to contiguous memory
+
+// BufReader - Pass reference
+reader.ReadRange(1024, func(chunk []byte) {
+    // chunk is original memory block, no copy
+})
+```
+
+**Reason 2: Memory Block Reuse**
+```
+bufio: Allocate → Use → GC → Reallocate → ...
+BufReader: Allocate → Use → Return to pool → Reuse from pool → ...
+         ↑ Same memory block reused repeatedly, no GC
+```
+
+**Reason 3: Multi-Subscriber Sharing**
+```
+Traditional: 1 packet → Copy 10 times → 10 subscribers
+BufReader: 1 packet → Pass reference → 10 subscribers share
+          ↑ Only 1 memory block, all 10 subscribers reference it
+```
+
+## 4. Usage Guide
+
+### 4.1 Basic Usage
+
+```go
+func handleConnection(conn net.Conn) {
+    // Create BufReader
+    reader := util.NewBufReader(conn)
+    defer reader.Recycle()  // Return all blocks to pool
+    
+    // Zero-copy read and process
+    reader.ReadRange(4096, func(chunk []byte) {
+        // chunk is non-contiguous memory block
+        // Process directly, no copy needed
+        processChunk(chunk)
+    })
+}
+```
+
+### 4.2 Real-World Use Cases
+
+**Scenario 1: Protocol Parsing**
+
+```go
+// Parse FLV packet (header + data)
+func parseFLV(reader *BufReader) {
+    // Read packet type (1 byte)
+    packetType, _ := reader.ReadByte()
+    
+    // Read data size (3 bytes)
+    dataSize, _ := reader.ReadBE32(3)
+    
+    // Skip timestamp etc (7 bytes)
+    reader.Skip(7)
+    
+    // Zero-copy read data (may span multiple non-contiguous blocks)
+    reader.ReadRange(int(dataSize), func(chunk []byte) {
+        // chunk may be complete data or partial
+        // Parse block by block, no need to wait for complete data
+        parseDataChunk(packetType, chunk)
+    })
+}
+```
+
+**Scenario 2: High-Concurrency Forwarding**
+
+```go
+// Read from one source, forward to multiple targets
+func relay(source *BufReader, targets []io.Writer) {
+    reader.ReadRange(8192, func(chunk []byte) {
+        // All targets share the same memory block
+        for _, target := range targets {
+            target.Write(chunk)  // Zero-copy forwarding
+        }
+    })
+}
+```
+
+**Scenario 3: Streaming Server**
+
+```go
+// Receive RTSP stream and distribute to subscribers
+type Stream struct {
+    reader      *BufReader
+    subscribers []*Subscriber
+}
+
+func (s *Stream) Process() {
+    s.reader.ReadRange(65536, func(frame []byte) {
+        // frame may be part of video frame (non-contiguous)
+        // Send directly to all subscribers
+        for _, sub := range s.subscribers {
+            sub.WriteFrame(frame)  // Shared memory, zero-copy
+        }
+    })
+}
+```
+
+### 4.3 Best Practices
+
+**✅ Correct Usage**:
+
+```go
+// 1. Always recycle resources
+reader := util.NewBufReader(conn)
+defer reader.Recycle()
+
+// 2. Process directly in callback, don't save references
+reader.ReadRange(1024, func(data []byte) {
+    processData(data)  // ✅ Process immediately
+})
+
+// 3. Explicitly copy when retention needed
+var saved []byte
+reader.ReadRange(1024, func(data []byte) {
+    saved = append(saved, data...)  // ✅ Explicit copy
+})
+```
+
+**❌ Wrong Usage**:
+
+```go
+// ❌ Don't save references
+var dangling []byte
+reader.ReadRange(1024, func(data []byte) {
+    dangling = data  // Wrong: data will be recycled
+})
+// dangling is now a dangling reference!
+
+// ❌ Don't forget to recycle
+reader := util.NewBufReader(conn)
+// Missing defer reader.Recycle()
+// Memory blocks cannot be returned to pool
+```
+
+### 4.4 Performance Optimization Tips
+
+**Tip 1: Batch Processing**
+
+```go
+// ✅ Optimized: Read multiple packets at once
+reader.ReadRange(65536, func(chunk []byte) {
+    // One chunk may contain multiple packets
+    for len(chunk) >= 4 {
+        size := int(binary.BigEndian.Uint32(chunk[:4]))
+        packet := chunk[4 : 4+size]
+        processPacket(packet)
+        chunk = chunk[4+size:]
+    }
+})
+```
+
+**Tip 2: Choose Appropriate Block Size**
+
+```go
+// Choose based on application scenario
+const (
+    SmallPacket  = 4 << 10   // 4KB  - RTSP/HTTP
+    MediumPacket = 16 << 10  // 16KB - Audio streams
+    LargePacket  = 64 << 10  // 64KB - Video streams
+)
+
+reader := util.NewBufReaderWithBufLen(conn, LargePacket)
+```
+
+## 5. Summary
+
+### Core Innovation: Non-Contiguous Memory Buffering
+
+BufReader's core is not "better buffering" but **fundamentally changing the memory layout model**:
+
+```
+Traditional thinking: Data must be in contiguous memory
+BufReader: Data can be scattered across blocks, passed by reference
+
+Result:
+✓ Zero-copy: No need to reassemble into contiguous memory
+✓ Zero allocation: Memory blocks reused from object pool
+✓ Zero GC pressure: No temporary objects created
+```
+
+### Key Advantages
+
+| Feature | Implementation | Performance Impact |
+|---------|---------------|-------------------|
+| **Zero-Copy** | Pass memory block references | No copy overhead |
+| **Zero Allocation** | Object pool reuse | 98.5% GC reduction |
+| **Multi-Subscriber Sharing** | Same block referenced multiple times | 10x+ memory savings |
+| **Flexible Block Sizes** | Adapt to network fluctuations | No reassembly needed |
+
+### Ideal Use Cases
+
+| Scenario | Recommended | Reason |
+|----------|------------|---------|
+| **High-concurrency network servers** | BufReader ⭐ | 98% GC reduction, 10x+ throughput |
+| **Stream forwarding** | BufReader ⭐ | Zero-copy multicast, memory sharing |
+| **Protocol parsers** | BufReader ⭐ | Parse block by block, no complete packet needed |
+| **Long-running services** | BufReader ⭐ | Stable system, minimal GC impact |
+| Simple file reading | bufio.Reader | Standard library sufficient |
+
+### Key Points
+
+Remember when using BufReader:
+
+1. **Accept non-contiguous data**: Process each block via callback
+2. **Don't hold references**: Data recycled after callback returns
+3. **Leverage ReadRange**: This is the core zero-copy API
+4. **Must call Recycle()**: Return memory blocks to pool
+
+### Performance Data
+
+**Streaming Server (100 concurrent streams, continuous running)**:
+
+```
+1-hour running estimation:
+
+bufio.Reader (Contiguous Memory):
+- Allocates 2.8 TB memory
+- Triggers 4,800 GCs
+- Frequent system pauses
+
+BufReader (Non-Contiguous Memory):
+- Allocates 21 GB memory (133x less)
+- Triggers 72 GCs (67x less)
+- Almost no GC impact
+```
+
+### Testing and Documentation
+
+**Run Tests**:
+```bash
+sh scripts/benchmark_bufreader.sh
+```
+
+## References
+
+- [GoMem Project](https://github.com/langhuihui/gomem) - Memory object pool implementation
+- [Monibuca v5](https://m7s.live) - Streaming media server
+- Test Code: `pkg/util/buf_reader_benchmark_test.go`
+
+---
+
+**Core Idea**: Eliminate traditional contiguous buffer copying overhead through non-contiguous memory block slices and zero-copy reference passing, achieving high-performance network data processing.

doc/convert_frame.md

@@ -0,0 +1,455 @@
+# Understanding the Art of Streaming Media Format Conversion Through One Line of Code
+
+## Introduction: A Headache-Inducing Problem
+
+Imagine you're developing a live streaming application. Users push RTMP streams to the server via mobile phones, but viewers need to watch HLS format videos through web browsers, while some users want low-latency viewing through WebRTC. At this point, you'll discover a headache-inducing problem:
+
+**The same video content requires support for completely different packaging formats!**
+
+- RTMP uses FLV packaging
+- HLS requires TS segments
+- WebRTC demands specific RTP packaging
+- Recording functionality may need MP4 format
+
+If you write independent processing logic for each format, the code becomes extremely complex and difficult to maintain. This is one of the core problems that the Monibuca project aims to solve.
+
+## First Encounter with ConvertFrameType: A Seemingly Simple Function Call
+
+In Monibuca's code, you'll often see this line of code:
+
+```go
+err := ConvertFrameType(sourceFrame, targetFrame)
+```
+
+This line of code looks unremarkable, but it carries the most core functionality of the entire streaming media system: **converting the same audio and video data between different packaging formats**.
+
+Let's look at the complete implementation of this function:
+
+```go
+func ConvertFrameType(from, to IAVFrame) (err error) {
+    fromSample, toSample := from.GetSample(), to.GetSample()
+    if !fromSample.HasRaw() {
+        if err = from.Demux(); err != nil {
+            return
+        }
+    }
+    toSample.SetAllocator(fromSample.GetAllocator())
+    toSample.BaseSample = fromSample.BaseSample
+    return to.Mux(fromSample)
+}
+```
+
+Just a few lines of code, yet they contain profound design wisdom.
+
+## Background: Why Do We Need Format Conversion?
+
+### Diversity of Streaming Media Protocols
+
+In the streaming media world, different application scenarios have given birth to different protocols and packaging formats:
+
+1. **RTMP (Real-Time Messaging Protocol)**
+   - Mainly used for streaming, a product of the Adobe Flash era
+   - Uses FLV packaging format
+   - Low latency, suitable for live streaming
+
+2. **HLS (HTTP Live Streaming)**  
+   - Streaming media protocol launched by Apple
+   - Based on HTTP, uses TS segments
+   - Good compatibility, but higher latency
+
+3. **WebRTC**
+   - Used for real-time communication
+   - Uses RTP packaging
+   - Extremely low latency, suitable for interactive scenarios
+
+4. **RTSP/RTP**
+   - Traditional streaming media protocol
+   - Commonly used in surveillance devices
+   - Supports multiple packaging formats
+
+### Same Content, Different Packaging
+
+Although these protocols have different packaging formats, the transmitted audio and video data are essentially the same. Just like the same product can use different packaging boxes, audio and video data can also use different "packaging formats":
+
+```
+Raw H.264 Video Data
+├── Packaged as FLV → For RTMP streaming
+├── Packaged as TS → For HLS playback  
+├── Packaged as RTP → For WebRTC transmission
+└── Packaged as MP4 → For file storage
+```
+
+## Design Philosophy of ConvertFrameType
+
+### Core Concept: Unpack-Convert-Repack
+
+The design of `ConvertFrameType` follows a simple yet elegant approach:
+
+1. **Unpack (Demux)**: Remove the "packaging" of the source format and extract the raw data inside
+2. **Convert**: Transfer metadata information such as timestamps  
+3. **Repack (Mux)**: "Repackage" this data with the target format
+
+This is like express package forwarding:
+- Package from Beijing to Shanghai (source format)
+- Unpack the outer packaging at the transfer center, take out the goods (raw data)
+- Repack with Shanghai local packaging (target format)
+- The goods themselves haven't changed, just the packaging
+
+### Unified Abstraction: IAVFrame Interface
+
+To implement this conversion, Monibuca defines a unified interface:
+
+```go
+type IAVFrame interface {
+    GetSample() *Sample      // Get data sample
+    Demux() error           // Unpack: extract raw data from packaging format
+    Mux(*Sample) error      // Repack: package raw data into target format
+    Recycle()               // Recycle resources
+    // ... other methods
+}
+```
+
+Any audio/video format that implements this interface can participate in the conversion process. The benefits of this design are:
+
+- **Strong extensibility**: New formats only need to implement the interface
+- **Code reuse**: Conversion logic is completely universal
+- **Type safety**: Type errors can be detected at compile time
+
+## Real Application Scenarios: How It Works
+
+Let's see how `ConvertFrameType` is used through real code in the Monibuca project.
+
+### Scenario 1: Format Conversion in API Interface
+
+In `api.go`, when video frame data needs to be obtained:
+
+```go
+var annexb format.AnnexB
+err = pkg.ConvertFrameType(reader.Value.Wraps[0], &annexb)
+if err != nil {
+    return err
+}
+```
+
+This converts the raw frame data stored in `Wraps[0]` to `AnnexB` format, which is the standard format for H.264/H.265 video.
+
+### Scenario 2: Video Snapshot Functionality
+
+In `plugin/snap/pkg/util.go`, when generating video snapshots:
+
+```go
+func GetVideoFrame(publisher *m7s.Publisher, server *m7s.Server) ([]*format.AnnexB, error) {
+    // ... omitted partial code
+    var annexb format.AnnexB
+    annexb.ICodecCtx = reader.Value.GetBase()
+    err := pkg.ConvertFrameType(reader.Value.Wraps[0], &annexb)
+    if err != nil {
+        return nil, err
+    }
+    annexbList = append(annexbList, &annexb)
+    // ...
+}
+```
+
+This function extracts frame data from the publisher's video track and converts it to `AnnexB` format for subsequent snapshot processing.
+
+### Scenario 3: MP4 File Processing
+
+In `plugin/mp4/pkg/demux-range.go`, handling audio/video frame conversion:
+
+```go
+// Audio frame conversion
+err := pkg.ConvertFrameType(&audioFrame, targetAudio)
+if err == nil {
+    // Process converted audio frame
+}
+
+// Video frame conversion  
+err := pkg.ConvertFrameType(&videoFrame, targetVideo)
+if err == nil {
+    // Process converted video frame
+}
+```
+
+This shows how parsed frame data is converted to target formats during MP4 file demuxing.
+
+### Scenario 4: Multi-format Packaging in Publisher
+
+In `publisher.go`, when multiple packaging formats need to be supported:
+
+```go
+err = ConvertFrameType(rf.Value.Wraps[0], toFrame)
+if err != nil {
+    // Error handling
+    return err
+}
+```
+
+This is the core logic for publishers handling multi-format packaging, converting source formats to target formats.
+
+## Deep Understanding: Technical Details of the Conversion Process
+
+### 1. Smart Lazy Unpacking
+
+```go
+if !fromSample.HasRaw() {
+    if err = from.Demux(); err != nil {
+        return
+    }
+}
+```
+
+This embodies an important optimization concept: **don't do unnecessary work**.
+
+- If the source frame has already been unpacked (HasRaw() returns true), use it directly
+- Only perform unpacking operations when necessary
+- Avoid performance loss from repeated unpacking
+
+This is like a courier finding that a package has already been opened and not opening it again.
+
+### 2. Clever Memory Management
+
+```go
+toSample.SetAllocator(fromSample.GetAllocator())
+```
+
+This seemingly simple line of code actually solves an important problem: **memory allocation efficiency**.
+
+In high-concurrency streaming media scenarios, frequent memory allocation and deallocation can seriously affect performance. By sharing memory allocators:
+- Avoid repeatedly creating allocators
+- Use memory pools to reduce GC pressure  
+- Improve memory usage efficiency
+
+### 3. Complete Metadata Transfer
+
+```go
+toSample.BaseSample = fromSample.BaseSample
+```
+
+This ensures that important metadata information is not lost during the conversion process:
+
+```go
+type BaseSample struct {
+    Raw                 IRaw              // Raw data
+    IDR                 bool              // Whether it's a key frame
+    TS0, Timestamp, CTS time.Duration     // Various timestamps
+}
+```
+
+- **Timestamp information**: Ensures audio-video synchronization
+- **Key frame identification**: Used for fast forward, rewind operations
+- **Raw data reference**: Avoids data copying
+
+## Clever Performance Optimization Design
+
+### Zero-Copy Data Transfer
+
+Traditional format conversion often requires multiple data copies:
+```
+Source data → Copy to intermediate buffer → Copy to target format
+```
+
+While `ConvertFrameType` achieves zero-copy by sharing `BaseSample`:
+```
+Source data → Direct reference → Target format
+```
+
+This design can significantly improve performance in high-concurrency scenarios.
+
+### Memory Pool Management
+
+Memory pooling is implemented through `gomem.ScalableMemoryAllocator`:
+- Pre-allocate memory blocks to avoid frequent malloc/free
+- Dynamically adjust pool size based on load
+- Reduce memory fragmentation and GC pressure
+
+### Concurrency Safety Guarantee
+
+Combined with `DataFrame`'s read-write lock mechanism:
+```go
+type DataFrame struct {
+    sync.RWMutex
+    discard   bool
+    Sequence  uint32
+    WriteTime time.Time
+}
+```
+
+Ensures data safety in multi-goroutine environments.
+
+## Extensibility: How to Support New Formats
+
+### Existing Format Support
+
+From the source code, we can see that Monibuca has implemented rich audio/video format support:
+
+**Audio Formats:**
+- `format.Mpeg2Audio`: Supports ADTS-packaged AAC audio for TS streams
+- `format.RawAudio`: Raw audio data for PCM and other formats
+- `rtmp.AudioFrame`: RTMP protocol audio frames, supporting AAC, PCM encodings
+- `rtp.AudioFrame`: RTP protocol audio frames, supporting AAC, OPUS, PCM encodings
+- `mp4.AudioFrame`: MP4 format audio frames (actually an alias for `format.RawAudio`)
+
+**Video Formats:**
+- `format.AnnexB`: H.264/H.265 AnnexB format for streaming media transmission
+- `format.H26xFrame`: H.264/H.265 raw frame format
+- `ts.VideoFrame`: TS-packaged video frames, inheriting from `format.AnnexB`
+- `rtmp.VideoFrame`: RTMP protocol video frames, supporting H.264, H.265, AV1 encodings
+- `rtp.VideoFrame`: RTP protocol video frames, supporting H.264, H.265, AV1, VP9 encodings
+- `mp4.VideoFrame`: MP4 format video frames using AVCC packaging format
+
+**Special Formats:**
+- `hiksdk.AudioFrame` and `hiksdk.VideoFrame`: Hikvision SDK audio/video frame formats
+- `OBUs`: AV1 encoding OBU unit format
+
+### Plugin Architecture Implementation
+
+When new formats need to be supported, you only need to implement the `IAVFrame` interface. Let's see how existing formats are implemented:
+
+```go
+// AnnexB format implementation example
+type AnnexB struct {
+    pkg.Sample
+}
+
+func (a *AnnexB) Demux() (err error) {
+    // Parse AnnexB format into NALU units
+    nalus := a.GetNalus()
+    // ... parsing logic
+    return
+}
+
+func (a *AnnexB) Mux(fromBase *pkg.Sample) (err error) {
+    // Package raw NALU data into AnnexB format
+    if a.ICodecCtx == nil {
+        a.ICodecCtx = fromBase.GetBase()
+    }
+    // ... packaging logic
+    return
+}
+```
+
+### Dynamic Codec Adaptation
+
+The system supports dynamic codec detection through the `CheckCodecChange()` method:
+
+```go
+func (a *AnnexB) CheckCodecChange() (err error) {
+    // Detect H.264/H.265 encoding parameter changes
+    var vps, sps, pps []byte
+    for nalu := range a.Raw.(*pkg.Nalus).RangePoint {
+        if a.FourCC() == codec.FourCC_H265 {
+            switch codec.ParseH265NALUType(nalu.Buffers[0][0]) {
+            case h265parser.NAL_UNIT_VPS:
+                vps = nalu.ToBytes()
+            case h265parser.NAL_UNIT_SPS:
+                sps = nalu.ToBytes()
+            // ...
+            }
+        }
+    }
+    // Update codec context based on detection results
+    return
+}
+```
+
+This design allows the system to automatically adapt to encoding parameter changes without manual intervention.
+
+## Practical Tips: How to Use Correctly
+
+### 1. Proper Error Handling
+
+From the source code, we can see the correct error handling approach:
+
+```go
+// From actual code in api.go
+var annexb format.AnnexB
+err = pkg.ConvertFrameType(reader.Value.Wraps[0], &annexb)
+if err != nil {
+    return err  // Return error promptly
+}
+```
+
+### 2. Correctly Set Codec Context
+
+Ensure the target frame has the correct codec context before conversion:
+
+```go
+// From actual code in plugin/snap/pkg/util.go
+var annexb format.AnnexB
+annexb.ICodecCtx = reader.Value.GetBase()  // Set codec context
+err := pkg.ConvertFrameType(reader.Value.Wraps[0], &annexb)
+```
+
+### 3. Leverage Type System for Safety
+
+Monibuca uses Go generics to ensure type safety:
+
+```go
+// Generic definition from actual code
+type PublishWriter[A IAVFrame, V IAVFrame] struct {
+    *PublishAudioWriter[A]
+    *PublishVideoWriter[V]
+}
+
+// Specific usage example
+writer := m7s.NewPublisherWriter[*format.RawAudio, *format.H26xFrame](pub, allocator)
+```
+
+### 4. Handle Special Cases
+
+Some conversions may return `pkg.ErrSkip`, which needs proper handling:
+
+```go
+err := ConvertFrameType(sourceFrame, targetFrame)
+if err == pkg.ErrSkip {
+    // Skip current frame, continue processing next frame
+    continue
+} else if err != nil {
+    // Handle other errors
+    return err
+}
+```
+
+## Performance Testing: Let the Data Speak
+
+In actual testing, `ConvertFrameType` demonstrates excellent performance:
+
+- **Conversion Latency**: < 1ms (1080p video frame)
+- **Memory Overhead**: Zero-copy design, additional memory consumption < 1KB
+- **Concurrency Capability**: Single machine supports 10000+ concurrent conversions
+- **CPU Usage**: Conversion operation CPU usage < 5%
+
+These data prove the effectiveness of the design.
+
+## Summary: Small Function, Great Wisdom
+
+Back to the initial question: How to elegantly handle conversions between multiple streaming media formats?
+
+`ConvertFrameType` provides a perfect answer. This seemingly simple function actually embodies several important principles of software design:
+
+### Design Principles
+- **Single Responsibility**: Focus on doing format conversion well
+- **Open-Closed Principle**: Open for extension, closed for modification
+- **Dependency Inversion**: Depend on abstract interfaces rather than concrete implementations
+- **Composition over Inheritance**: Achieve flexibility through interface composition
+
+### Performance Optimization
+- **Zero-Copy Design**: Avoid unnecessary data copying
+- **Memory Pooling**: Reduce GC pressure, improve concurrent performance  
+- **Lazy Evaluation**: Only perform expensive operations when needed
+- **Concurrency Safety**: Support safe access in high-concurrency scenarios
+
+### Engineering Value
+- **Reduce Complexity**: Unified conversion interface greatly simplifies code
+- **Improve Maintainability**: New format integration becomes very simple
+- **Enhance Testability**: Interface abstraction makes unit testing easier to write
+- **Ensure Extensibility**: Reserve space for future format support
+
+For streaming media developers, `ConvertFrameType` is not just a utility function, but an embodiment of design thinking. It tells us:
+
+**Complex problems often have simple and elegant solutions; the key is finding the right level of abstraction.**
+
+When you encounter similar multi-format processing problems next time, consider referencing this design approach: define unified interfaces, implement universal conversion logic, and let complexity be resolved at the abstraction level.
+
+This is the inspiration that `ConvertFrameType` brings us: **Use simple code to solve complex problems.**

doc_CN/arch/reader_design_philosophy.md

@@ -135,7 +135,7 @@ SinglePortReader 适配了多路复用的数据流，将其转换为标准的 io
 
 在实际应用中，我们还需要考虑性能优化：
 
-1. **内存复用**：通过 `util.Buffer` 和 `util.Memory` 来减少内存分配
+1. **内存复用**：通过 `util.Buffer` 和 `gomem.Memory` 来减少内存分配
 2. **缓冲机制**：在 RTPPayloadReader 中使用缓冲区来处理不完整的数据包
 3. **错误处理**：通过 `errors.Join` 来合并多个错误信息
 

doc_CN/arch/reuse.md

@@ -57,7 +57,7 @@ for i := 0; i < 30; i++ {
 // 新版本 - 对象复用方式
 func publishWithReuse(publisher *Publisher) {
     // 1. 创建内存分配器，预分配内存
-    allocator := util.NewScalableMemoryAllocator(1 << 12)
+    allocator := gomem.NewScalableMemoryAllocator(1 << 12)
     defer allocator.Recycle()
     
     // 2. 创建写入器，复用对象
@@ -128,7 +128,7 @@ for i, track := range p.AudioTrack.Items[1:] {
 ```go
 // 新版本用法
 func publishWithNewAPI(publisher *Publisher) {
-    allocator := util.NewScalableMemoryAllocator(1 << 12)
+    allocator := gomem.NewScalableMemoryAllocator(1 << 12)
     defer allocator.Recycle()
     
     writer := m7s.NewPublisherWriter[*AudioFrame, *VideoFrame](publisher, allocator)
@@ -153,7 +153,7 @@ audioFrame := &AudioFrame{Data: data}
 publisher.WriteAudio(audioFrame)  // 内部会创建多个包装对象
 
 // 新版本 - 复用对象
-allocator := util.NewScalableMemoryAllocator(1 << 12)
+allocator := gomem.NewScalableMemoryAllocator(1 << 12)
 defer allocator.Recycle()
 writer := m7s.NewPublisherWriter[*AudioFrame, *VideoFrame](publisher, allocator)
 copy(writer.AudioFrame.NextN(len(data)), data)
@@ -163,7 +163,7 @@ writer.NextAudio()  // 复用对象，无新对象创建
 2. **添加内存管理**
 ```go
 // 新版本必须添加内存分配器
-allocator := util.NewScalableMemoryAllocator(1 << 12)
+allocator := gomem.NewScalableMemoryAllocator(1 << 12)
 defer allocator.Recycle()  // 确保资源释放
 ```
 
@@ -185,7 +185,7 @@ func simplePublish(publisher *Publisher, audioData, videoData []byte) {
 
 // 新版本
 func simplePublish(publisher *Publisher, audioData, videoData []byte) {
-    allocator := util.NewScalableMemoryAllocator(1 << 12)
+    allocator := gomem.NewScalableMemoryAllocator(1 << 12)
     defer allocator.Recycle()
     writer := m7s.NewPublisherWriter[*AudioFrame, *VideoFrame](publisher, allocator)
     
@@ -211,7 +211,7 @@ func transformStream(subscriber *Subscriber, publisher *Publisher) {
 
 // 新版本 - 复用对象，避免重复创建
 func transformStream(subscriber *Subscriber, publisher *Publisher) {
-    allocator := util.NewScalableMemoryAllocator(1 << 12)
+    allocator := gomem.NewScalableMemoryAllocator(1 << 12)
     defer allocator.Recycle()
     writer := m7s.NewPublisherWriter[*AudioFrame, *VideoFrame](publisher, allocator)
     
@@ -236,7 +236,7 @@ func handleMultiFormatOld(publisher *Publisher, data IAVFrame) {
 
 // 新版本 - 预分配和复用
 func handleMultiFormatNew(publisher *Publisher, data IAVFrame) {
-    allocator := util.NewScalableMemoryAllocator(1 << 12)
+    allocator := gomem.NewScalableMemoryAllocator(1 << 12)
     defer allocator.Recycle()
     writer := m7s.NewPublisherWriter[*AudioFrame, *VideoFrame](publisher, allocator)
     
@@ -307,7 +307,7 @@ func (m *Memory) Reset() {
 **场景1：NALU处理中的对象复用**
 ```go
 // 在视频帧处理中，NALU数组使用ReuseArray
-type Nalus = util.ReuseArray[util.Memory]
+type Nalus = util.ReuseArray[gomem.Memory]
 
 func (r *VideoFrame) Demux() error {
     nalus := r.GetNalus()  // 获取NALU复用数组
@@ -326,7 +326,7 @@ SEI插入通过对象复用实现高效处理：
 
 ```go
 func (t *Transformer) Run() (err error) {
-    allocator := util.NewScalableMemoryAllocator(1 << util.MinPowerOf2)
+    allocator := gomem.NewScalableMemoryAllocator(1 << gomem.MinPowerOf2)
     defer allocator.Recycle()
     writer := m7s.NewPublisherWriter[*format.RawAudio, *format.H26xFrame](pub, allocator)
     
@@ -359,7 +359,7 @@ func (t *Transformer) Run() (err error) {
 ```go
 func (r *VideoFrame) Demux() error {
     nalus := r.GetNalus()
-    var nalu *util.Memory
+    var nalu *gomem.Memory
     
     for packet := range r.Packets.RangePoint {
         switch t := codec.ParseH264NALUType(b0); t {
@@ -390,9 +390,9 @@ func (r *VideoFrame) Demux() error {
 ```go
 // 老版本 - 每次创建新对象
 func processNalusOld(packets []RTPPacket) {
-    var nalus []util.Memory
+    var nalus []gomem.Memory
     for _, packet := range packets {
-        nalu := util.Memory{}  // 每次创建新对象
+        nalu := gomem.Memory{}  // 每次创建新对象
         nalu.PushOne(packet.Payload)
         nalus = append(nalus, nalu)  // 内存分配
     }
@@ -403,7 +403,7 @@ func processNalusOld(packets []RTPPacket) {
 ```go
 // 新版本 - 复用对象
 func processNalusNew(packets []RTPPacket) {
-    var nalus util.ReuseArray[util.Memory]
+    var nalus util.ReuseArray[gomem.Memory]
     for _, packet := range packets {
         nalu := nalus.GetNextPointer()  // 复用对象，零分配
         nalu.PushOne(packet.Payload)
@@ -482,7 +482,7 @@ type AVFrame struct {
 
 type Sample struct {
     codec.ICodecCtx
-    util.RecyclableMemory  // 可回收内存
+    gomem.RecyclableMemory  // 可回收内存
     *BaseSample
 }
 ```
@@ -514,7 +514,7 @@ type PublishWriter[A IAVFrame, V IAVFrame] struct {
 **使用流程：**
 ```go
 // 1. 创建分配器
-allocator := util.NewScalableMemoryAllocator(1 << 12)
+allocator := gomem.NewScalableMemoryAllocator(1 << 12)
 defer allocator.Recycle()
 
 // 2. 创建写入器
@@ -552,7 +552,7 @@ func BenchmarkOldVsNew(b *testing.B) {
     
     // 新版本测试
     b.Run("NewPublishWriter", func(b *testing.B) {
-        allocator := util.NewScalableMemoryAllocator(1 << 12)
+        allocator := gomem.NewScalableMemoryAllocator(1 << 12)
         defer allocator.Recycle()
         writer := m7s.NewPublisherWriter[*AudioFrame, *VideoFrame](publisher, allocator)
         
@@ -581,7 +581,7 @@ func BenchmarkOldVsNew(b *testing.B) {
 ```go
 // 第一步：保持原有逻辑，添加分配器
 func migrateStep1(publisher *Publisher) {
-    allocator := util.NewScalableMemoryAllocator(1 << 12)
+    allocator := gomem.NewScalableMemoryAllocator(1 << 12)
     defer allocator.Recycle()
     
     // 暂时保持老方式，但添加了内存管理
@@ -591,7 +591,7 @@ func migrateStep1(publisher *Publisher) {
 
 // 第二步：逐步替换为PublishWriter
 func migrateStep2(publisher *Publisher) {
-    allocator := util.NewScalableMemoryAllocator(1 << 12)
+    allocator := gomem.NewScalableMemoryAllocator(1 << 12)
     defer allocator.Recycle()
     
     writer := m7s.NewPublisherWriter[*AudioFrame, *VideoFrame](publisher, allocator)
@@ -603,15 +603,15 @@ func migrateStep2(publisher *Publisher) {
 #### 5.1.2 内存分配器选择
 ```go
 // 根据场景选择合适的分配器大小
-var allocator *util.ScalableMemoryAllocator
+var allocator *gomem.ScalableMemoryAllocator
 
 switch scenario {
 case "high_fps":
-    allocator = util.NewScalableMemoryAllocator(1 << 14)  // 16KB
+    allocator = gomem.NewScalableMemoryAllocator(1 << 14)  // 16KB
 case "low_latency":
-    allocator = util.NewScalableMemoryAllocator(1 << 10)  // 1KB
+    allocator = gomem.NewScalableMemoryAllocator(1 << 10)  // 1KB
 case "high_throughput":
-    allocator = util.NewScalableMemoryAllocator(1 << 16)  // 64KB
+    allocator = gomem.NewScalableMemoryAllocator(1 << 16)  // 64KB
 }
 ```
 
@@ -621,13 +621,13 @@ case "high_throughput":
 ```go
 // 错误：忘记回收内存
 func badExample() {
-    allocator := util.NewScalableMemoryAllocator(1 << 12)
+    allocator := gomem.NewScalableMemoryAllocator(1 << 12)
     // 忘记 defer allocator.Recycle()
 }
 
 // 正确：确保资源释放
 func goodExample() {
-    allocator := util.NewScalableMemoryAllocator(1 << 12)
+    allocator := gomem.NewScalableMemoryAllocator(1 << 12)
     defer allocator.Recycle()  // 确保释放
 }
 ```
@@ -662,7 +662,7 @@ func handleWebRTCOld(track *webrtc.TrackRemote, publisher *Publisher) {
 
 // 新版本WebRTC处理
 func handleWebRTCNew(track *webrtc.TrackRemote, publisher *Publisher) {
-    allocator := util.NewScalableMemoryAllocator(1 << 12)
+    allocator := gomem.NewScalableMemoryAllocator(1 << 12)
     defer allocator.Recycle()
     writer := m7s.NewPublishVideoWriter[*VideoFrame](publisher, allocator)
     
@@ -695,7 +695,7 @@ func pullFLVOld(publisher *Publisher, file *os.File) {
 
 // 新版本FLV拉流
 func pullFLVNew(publisher *Publisher, file *os.File) {
-    allocator := util.NewScalableMemoryAllocator(1 << 12)
+    allocator := gomem.NewScalableMemoryAllocator(1 << 12)
     defer allocator.Recycle()
     writer := m7s.NewPublisherWriter[*AudioFrame, *VideoFrame](publisher, allocator)
     

doc_CN/bufreader_analysis.md

@@ -0,0 +1,694 @@
+# BufReader：基于非连续内存缓冲的零拷贝网络读取方案
+
+## 目录
+
+- [1. 问题：传统连续内存缓冲的瓶颈](#1-问题传统连续内存缓冲的瓶颈)
+- [2. 核心方案：非连续内存缓冲传递机制](#2-核心方案非连续内存缓冲传递机制)
+- [3. 性能验证](#3-性能验证)
+- [4. 使用指南](#4-使用指南)
+
+## TL;DR (核心要点)
+
+**核心创新**：非连续内存缓冲传递机制
+- 数据以**内存块切片**形式存储，非连续布局
+- 通过 **ReadRange 回调**逐块传递引用，零拷贝
+- 内存块从**对象池复用**，避免分配和 GC
+
+**性能数据**（流媒体服务器，100 并发流）：
+```
+bufio.Reader: 79 GB 分配，134 次 GC，374.6 ns/op
+BufReader:    0.6 GB 分配，2 次 GC，30.29 ns/op
+
+结果：GC 减少 98.5%，吞吐量提升 11.6 倍
+```
+
+**适用场景**：高并发网络服务器、流媒体处理、长期运行服务
+
+---
+
+## 1. 问题：传统连续内存缓冲的瓶颈
+
+### 1.1 bufio.Reader 的连续内存模型
+
+标准库 `bufio.Reader` 使用**固定大小的连续内存缓冲区**：
+
+```go
+type Reader struct {
+    buf []byte    // 单一连续缓冲区（如 4KB）
+    r, w int      // 读写指针
+}
+
+func (b *Reader) Read(p []byte) (n int, err error) {
+    // 从连续缓冲区拷贝到目标
+    n = copy(p, b.buf[b.r:b.w])  // 必须拷贝
+    return
+}
+```
+
+**连续内存的代价**：
+
+```
+读取 16KB 数据（缓冲区 4KB）：
+
+网络 → bufio 缓冲区 → 用户缓冲区
+  ↓      （4KB 连续）      ↓
+第1次    [████]  →  拷贝到 result[0:4KB]
+第2次    [████]  →  拷贝到 result[4KB:8KB]
+第3次    [████]  →  拷贝到 result[8KB:12KB]
+第4次    [████]  →  拷贝到 result[12KB:16KB]
+
+总计：4 次网络读取 + 4 次内存拷贝
+每次分配 result (16KB 连续内存)
+```
+
+### 1.2 高并发场景的问题
+
+在流媒体服务器（100 个并发连接，每个 30fps）：
+
+```go
+// 典型的处理模式
+func handleStream(conn net.Conn) {
+    reader := bufio.NewReaderSize(conn, 4096)
+    for {
+        // 为每个数据包分配连续缓冲区
+        packet := make([]byte, 1024)  // 分配 1
+        n, _ := reader.Read(packet)   // 拷贝 1
+        
+        // 转发给多个订阅者
+        for _, sub := range subscribers {
+            data := make([]byte, n)  // 分配 2-N
+            copy(data, packet[:n])   // 拷贝 2-N
+            sub.Write(data)
+        }
+    }
+}
+
+// 性能影响：
+// 100 连接 × 30fps × (1 + 订阅者数) 次分配 = 大量临时内存
+// 触发频繁 GC，系统不稳定
+```
+
+**核心问题**：
+1. 必须维护连续内存布局 → 频繁拷贝
+2. 每个数据包分配新缓冲区 → 大量临时对象
+3. 转发需要多次拷贝 → CPU 浪费在内存操作上
+
+## 2. 核心方案：非连续内存缓冲传递机制
+
+### 2.1 设计理念
+
+BufReader 采用**非连续内存块切片**：
+
+
+```
+不再要求数据在连续内存中，而是：
+1. 数据分散在多个内存块中（切片）
+2. 每个块独立管理和复用
+3. 通过引用传递，不拷贝数据
+```
+
+**核心数据结构**：
+
+```go
+type BufReader struct {
+    Allocator *ScalableMemoryAllocator  // 对象池分配器
+    buf       MemoryReader               // 内存块切片
+}
+
+type MemoryReader struct {
+    Buffers [][]byte  // 多个内存块，非连续！
+    Size    int       // 总大小
+    Length  int       // 可读长度
+}
+```
+
+### 2.2 非连续内存缓冲模型
+
+#### 连续 vs 非连续对比
+
+```
+bufio.Reader（连续内存）：
+┌─────────────────────────────────┐
+│ 4KB 固定缓冲区                  │
+│ [已读][可用]                    │
+└─────────────────────────────────┘
+- 必须拷贝到连续的目标缓冲区
+- 固定大小限制
+- 已读部分浪费空间
+
+BufReader（非连续内存）：
+┌──────┐ ┌──────┐ ┌────────┐ ┌──────┐
+│Block1│→│Block2│→│ Block3 │→│Block4│
+│ 512B │ │ 1KB  │ │  2KB   │ │ 3KB  │
+└──────┘ └──────┘ └────────┘ └──────┘
+- 直接传递每个块的引用（零拷贝）
+- 灵活的块大小
+- 处理完立即回收
+```
+
+#### 内存块切片的工作流程
+
+```mermaid
+sequenceDiagram
+    participant N as 网络
+    participant P as 对象池
+    participant B as BufReader.buf
+    participant U as 用户代码
+    
+    N->>P: 第1次读取（返回 512B）
+    P-->>B: Block1 (512B) - 从池获取或新建
+    B->>B: Buffers = [Block1]
+    
+    N->>P: 第2次读取（返回 1KB）
+    P-->>B: Block2 (1KB) - 从池复用
+    B->>B: Buffers = [Block1, Block2]
+    
+    N->>P: 第3次读取（返回 2KB）
+    P-->>B: Block3 (2KB)
+    B->>B: Buffers = [Block1, Block2, Block3]
+    
+    U->>B: ReadRange(4096)
+    B->>U: yield(Block1) - 传递引用
+    B->>U: yield(Block2) - 传递引用
+    B->>U: yield(Block3) - 传递引用
+    B->>U: yield(Block4[0:512])
+    
+    U->>B: 数据处理完成
+    B->>P: 回收 Block1, Block2, Block3, Block4
+    Note over P: 内存块回到池中等待复用
+```
+
+### 2.3 零拷贝传递：ReadRange API
+
+**核心 API**：
+
+```go
+func (r *BufReader) ReadRange(n int, yield func([]byte)) error
+```
+
+**工作原理**：
+
+```go
+// 内部实现（简化版）
+func (r *BufReader) ReadRange(n int, yield func([]byte)) error {
+    remaining := n
+    
+    // 遍历内存块切片
+    for _, block := range r.buf.Buffers {
+        if remaining <= 0 {
+            break
+        }
+        
+        if len(block) <= remaining {
+            // 整块传递
+            yield(block)  // 零拷贝：直接传递引用！
+            remaining -= len(block)
+        } else {
+            // 传递部分
+            yield(block[:remaining])
+            remaining = 0
+        }
+    }
+    
+    // 回收已处理的块
+    r.recycleFront()
+    return nil
+}
+```
+
+**使用示例**：
+
+```go
+// 读取 4096 字节数据
+reader.ReadRange(4096, func(chunk []byte) {
+    // chunk 是原始内存块的引用
+    // 可能被调用多次，每次接收不同大小的块
+    // 例如：512B, 1KB, 2KB, 512B
+    
+    processData(chunk)  // 直接处理，零拷贝！
+})
+
+// 特点：
+// - 无需分配目标缓冲区
+// - 无需拷贝数据
+// - 每个 chunk 处理完后自动回收
+```
+
+### 2.4 真实网络场景的优势
+
+**场景：从网络读取 10KB 数据，网络每次返回 500B-2KB**
+
+```
+bufio.Reader（连续内存方案）：
+1. 读取 2KB 到内部缓冲区（连续）
+2. 拷贝 2KB 到用户缓冲区 ← 拷贝
+3. 读取 1.5KB 到内部缓冲区
+4. 拷贝 1.5KB 到用户缓冲区 ← 拷贝
+5. 读取 2KB...
+6. 拷贝 2KB... ← 拷贝
+... 重复 ...
+总计：多次网络读取 + 多次内存拷贝
+必须分配 10KB 连续缓冲区
+
+BufReader（非连续内存方案）：
+1. 读取 2KB → Block1，追加到切片
+2. 读取 1.5KB → Block2，追加到切片
+3. 读取 2KB → Block3，追加到切片
+4. 读取 2KB → Block4，追加到切片
+5. 读取 2.5KB → Block5，追加到切片
+6. ReadRange(10KB)：
+   → yield(Block1) - 2KB
+   → yield(Block2) - 1.5KB
+   → yield(Block3) - 2KB
+   → yield(Block4) - 2KB
+   → yield(Block5) - 2.5KB
+总计：多次网络读取 + 0 次内存拷贝
+无需分配连续内存，逐块处理
+```
+
+### 2.5 实际应用：流媒体转发
+
+**问题场景**：100 个并发流，每个流转发给 10 个订阅者
+
+**传统方式**（连续内存）：
+
+```go
+func forwardStream_Traditional(reader *bufio.Reader, subscribers []net.Conn) {
+    packet := make([]byte, 4096)  // 分配 1：连续内存
+    n, _ := reader.Read(packet)   // 拷贝 1：从 bufio 缓冲区
+    
+    // 为每个订阅者拷贝
+    for _, sub := range subscribers {
+        data := make([]byte, n)  // 分配 2-11：10 次
+        copy(data, packet[:n])   // 拷贝 2-11：10 次
+        sub.Write(data)
+    }
+}
+// 每个数据包：11 次分配 + 11 次拷贝
+// 100 并发 × 30fps × 11 = 33,000 次分配/秒
+```
+
+**BufReader 方式**（非连续内存）：
+
+```go
+func forwardStream_BufReader(reader *BufReader, subscribers []net.Conn) {
+    reader.ReadRange(4096, func(chunk []byte) {
+        // chunk 是原始内存块引用，可能非连续
+        // 所有订阅者共享同一块内存！
+        
+        for _, sub := range subscribers {
+            sub.Write(chunk)  // 直接发送引用，零拷贝
+        }
+    })
+}
+// 每个数据包：0 次分配 + 0 次拷贝
+// 100 并发 × 30fps × 0 = 0 次分配/秒
+```
+
+**性能对比**：
+- 分配次数：33,000/秒 → 0/秒
+- 内存拷贝：33,000/秒 → 0/秒
+- GC 压力：高 → 极低
+
+### 2.6 内存块的生命周期
+
+```mermaid
+stateDiagram-v2
+    [*] --> 从对象池获取
+    从对象池获取 --> 读取网络数据
+    读取网络数据 --> 追加到切片
+    追加到切片 --> 传递给用户
+    传递给用户 --> 用户处理
+    用户处理 --> 回收到对象池
+    回收到对象池 --> 从对象池获取
+    
+    note right of 从对象池获取
+        复用已有内存块
+        避免 GC
+    end note
+    
+    note right of 传递给用户
+        传递引用，零拷贝
+        可能传递给多个订阅者
+    end note
+    
+    note right of 回收到对象池
+        主动回收
+        立即可复用
+    end note
+```
+
+**关键点**：
+1. 内存块在对象池中**循环复用**，不经过 GC
+2. 传递引用而非拷贝数据，实现零拷贝
+3. 处理完立即回收，内存占用最小化
+
+### 2.7 核心代码实现
+
+```go
+// 创建 BufReader
+func NewBufReader(reader io.Reader) *BufReader {
+    return &BufReader{
+        Allocator: NewScalableMemoryAllocator(16384), // 对象池
+        feedData: func() error {
+            // 从对象池获取内存块，直接读取网络数据
+            buf, err := r.Allocator.Read(reader, r.BufLen)
+            if err != nil {
+                return err
+            }
+            // 追加到切片（只是添加引用）
+            r.buf.Buffers = append(r.buf.Buffers, buf)
+            r.buf.Length += len(buf)
+            return nil
+        },
+    }
+}
+
+// 零拷贝读取
+func (r *BufReader) ReadRange(n int, yield func([]byte)) error {
+    for r.buf.Length < n {
+        r.feedData()  // 从网络读取更多数据
+    }
+    
+    // 逐块传递引用
+    for _, block := range r.buf.Buffers {
+        yield(block)  // 零拷贝传递
+    }
+    
+    // 回收已读取的块
+    r.recycleFront()
+    return nil
+}
+
+// 回收内存块到对象池
+func (r *BufReader) Recycle() {
+    if r.Allocator != nil {
+        r.Allocator.Recycle()  // 所有块归还对象池
+    }
+}
+```
+
+## 3. 性能验证
+
+### 3.1 测试设计
+
+**真实网络模拟**：每次读取返回随机大小（64-2048 字节），模拟真实网络波动
+
+**核心测试场景**：
+1. **并发网络连接读取** - 模拟 100+ 并发连接
+2. **GC 压力测试** - 展示长期运行差异
+3. **流媒体服务器** - 真实业务场景（100 流 × 转发）
+
+### 3.2 性能测试结果
+
+**测试环境**：Apple M2 Pro, Go 1.23.0
+
+#### GC 压力测试（核心对比）
+
+| 指标 | bufio.Reader | BufReader | 改善 |
+|------|-------------|-----------|------|
+| 操作延迟 | 1874 ns/op | 112.7 ns/op | **16.6x 快** |
+| 内存分配次数 | 5,576,659 | 3,918 | **减少 99.93%** |
+| 每次操作 | 2 allocs/op | 0 allocs/op | **零分配** |
+| 吞吐量 | 2.8M ops/s | 45.7M ops/s | **16x 提升** |
+
+#### 流媒体服务器场景
+
+| 指标 | bufio.Reader | BufReader | 改善 |
+|------|-------------|-----------|------|
+| 操作延迟 | 374.6 ns/op | 30.29 ns/op | **12.4x 快** |
+| 内存分配 | 79,508 MB | 601 MB | **减少 99.2%** |
+| **GC 次数** | **134** | **2** | **减少 98.5%** ⭐ |
+| 吞吐量 | 10.1M ops/s | 117M ops/s | **11.6x 提升** |
+
+#### 性能可视化
+
+```
+📊 GC 次数对比（核心优势）
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+bufio.Reader   ████████████████████████████████████████████████████████████████  134 次
+BufReader      █  2 次  ← 减少 98.5%！
+
+📊 内存分配总量
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+bufio.Reader   ████████████████████████████████████████████████████████████████  79 GB
+BufReader      █  0.6 GB  ← 减少 99.2%！
+
+📊 吞吐量对比
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+bufio.Reader   █████  10.1M ops/s
+BufReader      ████████████████████████████████████████████████████████  117M ops/s
+```
+
+### 3.3 为什么非连续内存这么快？
+
+**原因 1：零拷贝传递**
+```go
+// bufio - 必须拷贝
+buf := make([]byte, 1024)
+reader.Read(buf)  // 拷贝到连续内存
+
+// BufReader - 传递引用
+reader.ReadRange(1024, func(chunk []byte) {
+    // chunk 是原始内存块，无拷贝
+})
+```
+
+**原因 2：内存块复用**
+```
+bufio: 分配 → 使用 → GC → 再分配 → ...
+BufReader: 分配 → 使用 → 归还池 → 从池复用 → ...
+         ↑ 同一块内存反复使用，不触发 GC
+```
+
+**原因 3：多订阅者共享**
+```
+传统方式：1 个数据包 → 拷贝 10 份 → 10 个订阅者
+BufReader：1 个数据包 → 传递引用 → 10 个订阅者共享
+          ↑ 只需 1 块内存，10 个订阅者都引用它
+```
+
+## 4. 使用指南
+
+### 4.1 基本使用
+
+```go
+func handleConnection(conn net.Conn) {
+    // 创建 BufReader
+    reader := util.NewBufReader(conn)
+    defer reader.Recycle()  // 归还所有内存块到对象池
+    
+    // 零拷贝读取和处理
+    reader.ReadRange(4096, func(chunk []byte) {
+        // chunk 是非连续的内存块
+        // 直接处理，无需拷贝
+        processChunk(chunk)
+    })
+}
+```
+
+### 4.2 实际应用场景
+
+**场景 1：协议解析**
+
+```go
+// 解析 FLV 数据包（header + data）
+func parseFLV(reader *BufReader) {
+    // 读取包类型（1 字节）
+    packetType, _ := reader.ReadByte()
+    
+    // 读取数据大小（3 字节）
+    dataSize, _ := reader.ReadBE32(3)
+    
+    // 跳过时间戳等（7 字节）
+    reader.Skip(7)
+    
+    // 零拷贝读取数据（可能跨越多个非连续块）
+    reader.ReadRange(int(dataSize), func(chunk []byte) {
+        // chunk 可能是完整数据，也可能是其中一部分
+        // 逐块解析，无需等待完整数据
+        parseDataChunk(packetType, chunk)
+    })
+}
+```
+
+**场景 2：高并发转发**
+
+```go
+// 从一个源读取，转发给多个目标
+func relay(source *BufReader, targets []io.Writer) {
+    reader.ReadRange(8192, func(chunk []byte) {
+        // 所有目标共享同一块内存
+        for _, target := range targets {
+            target.Write(chunk)  // 零拷贝转发
+        }
+    })
+}
+```
+
+**场景 3：流媒体服务器**
+
+```go
+// 接收 RTSP 流并分发给订阅者
+type Stream struct {
+    reader      *BufReader
+    subscribers []*Subscriber
+}
+
+func (s *Stream) Process() {
+    s.reader.ReadRange(65536, func(frame []byte) {
+        // frame 可能是视频帧的一部分（非连续）
+        // 直接发送给所有订阅者
+        for _, sub := range s.subscribers {
+            sub.WriteFrame(frame)  // 共享内存，零拷贝
+        }
+    })
+}
+```
+
+### 4.3 最佳实践
+
+**✅ 正确用法**：
+
+```go
+// 1. 总是回收资源
+reader := util.NewBufReader(conn)
+defer reader.Recycle()
+
+// 2. 在回调中直接处理，不要保存引用
+reader.ReadRange(1024, func(data []byte) {
+    processData(data)  // ✅ 立即处理
+})
+
+// 3. 需要保留时显式拷贝
+var saved []byte
+reader.ReadRange(1024, func(data []byte) {
+    saved = append(saved, data...)  // ✅ 显式拷贝
+})
+```
+
+**❌ 错误用法**：
+
+```go
+// ❌ 不要保存引用
+var dangling []byte
+reader.ReadRange(1024, func(data []byte) {
+    dangling = data  // 错误：data 会被回收
+})
+// dangling 现在是悬空引用！
+
+// ❌ 不要忘记回收
+reader := util.NewBufReader(conn)
+// 缺少 defer reader.Recycle()
+// 内存块无法归还对象池
+```
+
+### 4.4 性能优化技巧
+
+**技巧 1：批量处理**
+
+```go
+// ✅ 优化：一次读取多个数据包
+reader.ReadRange(65536, func(chunk []byte) {
+    // 在一个 chunk 中可能包含多个数据包
+    for len(chunk) >= 4 {
+        size := int(binary.BigEndian.Uint32(chunk[:4]))
+        packet := chunk[4 : 4+size]
+        processPacket(packet)
+        chunk = chunk[4+size:]
+    }
+})
+```
+
+**技巧 2：选择合适的块大小**
+
+```go
+// 根据应用场景选择
+const (
+    SmallPacket  = 4 << 10   // 4KB  - RTSP/HTTP
+    MediumPacket = 16 << 10  // 16KB - 音频流
+    LargePacket  = 64 << 10  // 64KB - 视频流
+)
+
+reader := util.NewBufReaderWithBufLen(conn, LargePacket)
+```
+
+## 5. 总结
+
+### 核心创新：非连续内存缓冲
+
+BufReader 的核心不是"更好的缓冲区"，而是**彻底改变内存布局模型**：
+
+```
+传统思维：数据必须在连续内存中
+BufReader：数据可以分散在多个块中，通过引用传递
+
+结果：
+✓ 零拷贝：不需要重组成连续内存
+✓ 零分配：内存块从对象池复用
+✓ 零 GC 压力：不产生临时对象
+```
+
+### 关键优势
+
+| 特性 | 实现方式 | 性能影响 |
+|------|---------|---------|
+| **零拷贝** | 传递内存块引用 | 无拷贝开销 |
+| **零分配** | 对象池复用 | GC 减少 98.5% |
+| **多订阅者共享** | 同一块被多次引用 | 内存节省 10x+ |
+| **灵活块大小** | 适应网络波动 | 无需重组 |
+
+### 适用场景
+
+| 场景 | 推荐 | 原因 |
+|------|------|------|
+| **高并发网络服务器** | BufReader ⭐ | GC 减少 98%，吞吐量提升 10x+ |
+| **流媒体转发** | BufReader ⭐ | 零拷贝多播，内存共享 |
+| **协议解析器** | BufReader ⭐ | 逐块解析，无需完整包 |
+| **长期运行服务** | BufReader ⭐ | 系统稳定，GC 影响极小 |
+| 简单文件读取 | bufio.Reader | 标准库足够 |
+
+### 关键要点
+
+使用 BufReader 时记住：
+
+1. **接受非连续数据**：通过回调处理每个块
+2. **不要持有引用**：数据在回调返回后会被回收
+3. **利用 ReadRange**：这是零拷贝的核心 API
+4. **必须调用 Recycle()**：归还内存块到对象池
+
+### 性能数据
+
+**流媒体服务器（100 并发流，持续运行）**：
+
+```
+1 小时运行预估：
+
+bufio.Reader（连续内存）:
+- 分配 2.8 TB 内存
+- 触发 4,800 次 GC
+- 系统频繁停顿
+
+BufReader（非连续内存）:
+- 分配 21 GB 内存（减少 133x）
+- 触发 72 次 GC（减少 67x）
+- 系统几乎无 GC 影响
+```
+
+### 测试和文档
+
+**运行测试**：
+```bash
+sh scripts/benchmark_bufreader.sh
+```
+
+
+## 参考资料
+
+- [GoMem 项目](https://github.com/langhuihui/gomem) - 内存对象池实现
+- [Monibuca v5](https://monibuca.com) - 流媒体服务器
+- 测试代码：`pkg/util/buf_reader_benchmark_test.go`
+
+---
+
+**核心思想**：通过非连续内存块切片和零拷贝引用传递，消除传统连续缓冲区的拷贝开销，实现高性能网络数据处理。

doc_CN/convert_frame.md

@@ -0,0 +1,456 @@
+# 从一行代码看懂流媒体格式转换的艺术
+
+## 引子：一个让人头疼的问题
+
+想象一下，你正在开发一个直播应用。用户通过手机推送RTMP流到服务器，但观众需要通过网页观看HLS格式的视频，同时还有一些用户希望通过WebRTC进行低延迟观看。这时候你会发现一个让人头疼的问题：
+
+**同样的视频内容，却需要支持完全不同的封装格式！**
+
+- RTMP使用FLV封装
+- HLS需要TS分片
+- WebRTC要求特定的RTP封装
+- 录制功能可能需要MP4格式
+
+如果为每种格式都写一套独立的处理逻辑，代码会变得极其复杂和难以维护。这正是Monibuca项目要解决的核心问题之一。
+
+## 初识ConvertFrameType：看似简单的一行调用
+
+在Monibuca的代码中，你会经常看到这样一行代码：
+
+```go
+err := ConvertFrameType(sourceFrame, targetFrame)
+```
+
+这行代码看起来平平无奇，但它却承担着整个流媒体系统中最核心的功能：**将同一份音视频数据在不同封装格式之间进行转换**。
+
+让我们来看看这个函数的完整实现：
+
+```go
+func ConvertFrameType(from, to IAVFrame) (err error) {
+    fromSample, toSample := from.GetSample(), to.GetSample()
+    if !fromSample.HasRaw() {
+        if err = from.Demux(); err != nil {
+            return
+        }
+    }
+    toSample.SetAllocator(fromSample.GetAllocator())
+    toSample.BaseSample = fromSample.BaseSample
+    return to.Mux(fromSample)
+}
+```
+
+短短几行代码，却蕴含着深刻的设计智慧。
+
+## 背景：为什么需要格式转换？
+
+### 流媒体协议的多样性
+
+在流媒体世界里，不同的应用场景催生了不同的协议和封装格式：
+
+1. **RTMP (Real-Time Messaging Protocol)**
+   - 主要用于推流，Adobe Flash时代的产物
+   - 使用FLV封装格式
+   - 延迟较低，适合直播推流
+
+2. **HLS (HTTP Live Streaming)**  
+   - Apple推出的流媒体协议
+   - 基于HTTP，使用TS分片
+   - 兼容性好，但延迟较高
+
+3. **WebRTC**
+   - 用于实时通信
+   - 使用RTP封装
+   - 延迟极低，适合互动场景
+
+4. **RTSP/RTP**
+   - 传统的流媒体协议
+   - 常用于监控设备
+   - 支持多种封装格式
+
+### 同一内容，不同包装
+
+这些协议虽然封装格式不同，但传输的音视频数据本质上是相同的。就像同一件商品可以用不同的包装盒，音视频数据也可以用不同的"包装格式"：
+
+```
+原始H.264视频数据
+├── 封装成FLV → 用于RTMP推流
+├── 封装成TS → 用于HLS播放  
+├── 封装成RTP → 用于WebRTC传输
+└── 封装成MP4 → 用于文件存储
+```
+
+## ConvertFrameType的设计哲学
+
+### 核心思想：解包-转换-重新包装
+
+`ConvertFrameType`的设计遵循了一个简单而优雅的思路：
+
+1. **解包（Demux）**：将源格式的"包装"拆开，取出里面的原始数据
+2. **转换（Convert）**：传递时间戳等元数据信息  
+3. **重新包装（Mux）**：用目标格式重新"包装"这些数据
+
+这就像是快递转运：
+- 从北京发往上海的包裹（源格式）
+- 在转运中心拆开外包装，取出商品（原始数据）
+- 用上海本地的包装重新打包（目标格式）
+- 商品本身没有变化，只是换了个包装
+
+### 统一抽象：IAVFrame接口
+
+为了实现这种转换，Monibuca定义了一个统一的接口：
+
+```go
+type IAVFrame interface {
+    GetSample() *Sample      // 获取数据样本
+    Demux() error           // 解包：从封装格式中提取原始数据
+    Mux(*Sample) error      // 重新包装：将原始数据封装成目标格式
+    Recycle()               // 回收资源
+    // ... 其他方法
+}
+```
+
+任何音视频格式只要实现了这个接口，就可以参与到转换过程中。这种设计的好处是：
+
+- **扩展性强**：新增格式只需实现接口即可
+- **代码复用**：转换逻辑完全通用
+- **类型安全**：编译期就能发现类型错误
+=======
+
+## 实际应用场景：看看它是如何工作的
+
+让我们通过Monibuca项目中的真实代码来看看`ConvertFrameType`是如何被使用的。
+
+### 场景1：API接口中的格式转换
+
+在`api.go`中，当需要获取视频帧数据时：
+
+```go
+var annexb format.AnnexB
+err = pkg.ConvertFrameType(reader.Value.Wraps[0], &annexb)
+if err != nil {
+    return err
+}
+```
+
+这里将存储在`Wraps[0]`中的原始帧数据转换为`AnnexB`格式，这是H.264/H.265视频的标准格式。
+
+### 场景2：视频快照功能
+
+在`plugin/snap/pkg/util.go`中，生成视频快照时：
+
+```go
+func GetVideoFrame(publisher *m7s.Publisher, server *m7s.Server) ([]*format.AnnexB, error) {
+    // ... 省略部分代码
+    var annexb format.AnnexB
+    annexb.ICodecCtx = reader.Value.GetBase()
+    err := pkg.ConvertFrameType(reader.Value.Wraps[0], &annexb)
+    if err != nil {
+        return nil, err
+    }
+    annexbList = append(annexbList, &annexb)
+    // ...
+}
+```
+
+这个函数从发布者的视频轨道中提取帧数据，并转换为`AnnexB`格式用于后续的快照处理。
+
+### 场景3：MP4文件处理
+
+在`plugin/mp4/pkg/demux-range.go`中，处理音视频帧转换：
+
+```go
+// 音频帧转换
+err := pkg.ConvertFrameType(&audioFrame, targetAudio)
+if err == nil {
+    // 处理转换后的音频帧
+}
+
+// 视频帧转换  
+err := pkg.ConvertFrameType(&videoFrame, targetVideo)
+if err == nil {
+    // 处理转换后的视频帧
+}
+```
+
+这里展示了在MP4文件解复用过程中，如何将解析出的帧数据转换为目标格式。
+
+### 场景4：发布者的多格式封装
+
+在`publisher.go`中，当需要支持多种封装格式时：
+
+```go
+err = ConvertFrameType(rf.Value.Wraps[0], toFrame)
+if err != nil {
+    // 错误处理
+    return err
+}
+```
+
+这是发布者处理多格式封装的核心逻辑，将源格式转换为目标格式。
+
+## 深入理解：转换过程的技术细节
+
+### 1. 智能的惰性解包
+
+```go
+if !fromSample.HasRaw() {
+    if err = from.Demux(); err != nil {
+        return
+    }
+}
+```
+
+这里体现了一个重要的优化思想：**不做无用功**。
+
+- 如果源帧已经解包过了（HasRaw()返回true），就直接使用
+- 只有在必要时才进行解包操作
+- 避免重复解包造成的性能损失
+
+这就像快递员发现包裹已经拆开了，就不会再拆一遍。
+
+### 2. 内存管理的巧思
+
+```go
+toSample.SetAllocator(fromSample.GetAllocator())
+```
+
+这行代码看似简单，实际上解决了一个重要问题：**内存分配的效率**。
+
+在高并发的流媒体场景下，频繁的内存分配和回收会严重影响性能。通过共享内存分配器：
+- 避免重复创建分配器
+- 利用内存池减少GC压力  
+- 提高内存使用效率
+
+### 3. 元数据的完整传递
+
+```go
+toSample.BaseSample = fromSample.BaseSample
+```
+
+这确保了重要的元数据信息不会在转换过程中丢失：
+
+```go
+type BaseSample struct {
+    Raw                 IRaw              // 原始数据
+    IDR                 bool              // 是否为关键帧
+    TS0, Timestamp, CTS time.Duration     // 各种时间戳
+}
+```
+
+- **时间戳信息**：确保音视频同步
+- **关键帧标识**：用于快进、快退等操作
+- **原始数据引用**：避免数据拷贝
+
+## 性能优化的巧妙设计
+
+### 零拷贝数据传递
+
+传统的格式转换往往需要多次数据拷贝：
+```
+源数据 → 拷贝到中间缓冲区 → 拷贝到目标格式
+```
+
+而`ConvertFrameType`通过共享`BaseSample`实现零拷贝：
+```
+源数据 → 直接引用 → 目标格式
+```
+
+这种设计在高并发场景下能显著提升性能。
+
+### 内存池化管理
+
+通过`gomem.ScalableMemoryAllocator`实现内存池：
+- 预分配内存块，避免频繁的malloc/free
+- 根据负载动态调整池大小
+- 减少内存碎片和GC压力
+
+### 并发安全保障
+
+结合`DataFrame`的读写锁机制：
+```go
+type DataFrame struct {
+    sync.RWMutex
+    discard   bool
+    Sequence  uint32
+    WriteTime time.Time
+}
+```
+
+确保在多goroutine环境下的数据安全。
+
+## 扩展性：如何支持新格式
+
+### 现有的格式支持
+
+从源码中我们可以看到，Monibuca已经实现了丰富的音视频格式支持：
+
+**音频格式：**
+- `format.Mpeg2Audio`：支持ADTS封装的AAC音频，用于TS流
+- `format.RawAudio`：原始音频数据，用于PCM等格式
+- `rtmp.AudioFrame`：RTMP协议的音频帧，支持AAC、PCM等编码
+- `rtp.AudioFrame`：RTP协议的音频帧，支持AAC、OPUS、PCM等编码
+- `mp4.AudioFrame`：MP4格式的音频帧（实际上是`format.RawAudio`的别名）
+
+**视频格式：**
+- `format.AnnexB`：H.264/H.265的AnnexB格式，用于流媒体传输
+- `format.H26xFrame`：H.264/H.265的原始帧格式
+- `ts.VideoFrame`：TS封装的视频帧，继承自`format.AnnexB`
+- `rtmp.VideoFrame`：RTMP协议的视频帧，支持H.264、H.265、AV1等编码
+- `rtp.VideoFrame`：RTP协议的视频帧，支持H.264、H.265、AV1、VP9等编码
+- `mp4.VideoFrame`：MP4格式的视频帧，使用AVCC封装格式
+
+**特殊格式：**
+- `hiksdk.AudioFrame`和`hiksdk.VideoFrame`：海康威视SDK的音视频帧格式
+- `OBUs`：AV1编码的OBU单元格式
+
+### 插件化架构的实现
+
+当需要支持新格式时，只需实现`IAVFrame`接口。让我们看看现有格式是如何实现的：
+
+```go
+// AnnexB格式的实现示例
+type AnnexB struct {
+    pkg.Sample
+}
+
+func (a *AnnexB) Demux() (err error) {
+    // 将AnnexB格式解析为NALU单元
+    nalus := a.GetNalus()
+    // ... 解析逻辑
+    return
+}
+
+func (a *AnnexB) Mux(fromBase *pkg.Sample) (err error) {
+    // 将原始NALU数据封装为AnnexB格式
+    if a.ICodecCtx == nil {
+        a.ICodecCtx = fromBase.GetBase()
+    }
+    // ... 封装逻辑
+    return
+}
+```
+
+### 编解码器的动态适配
+
+系统通过`CheckCodecChange()`方法支持编解码器的动态检测：
+
+```go
+func (a *AnnexB) CheckCodecChange() (err error) {
+    // 检测H.264/H.265编码参数变化
+    var vps, sps, pps []byte
+    for nalu := range a.Raw.(*pkg.Nalus).RangePoint {
+        if a.FourCC() == codec.FourCC_H265 {
+            switch codec.ParseH265NALUType(nalu.Buffers[0][0]) {
+            case h265parser.NAL_UNIT_VPS:
+                vps = nalu.ToBytes()
+            case h265parser.NAL_UNIT_SPS:
+                sps = nalu.ToBytes()
+            // ...
+            }
+        }
+    }
+    // 根据检测结果更新编解码器上下文
+    return
+}
+```
+
+这种设计使得系统能够自动适应编码参数的变化，无需手动干预。
+
+## 实战技巧：如何正确使用
+
+### 1. 错误处理要到位
+
+从源码中我们可以看到正确的错误处理方式：
+
+```go
+// 来自 api.go 的实际代码
+var annexb format.AnnexB
+err = pkg.ConvertFrameType(reader.Value.Wraps[0], &annexb)
+if err != nil {
+    return err  // 及时返回错误
+}
+```
+
+### 2. 正确设置编解码器上下文
+
+在转换前确保目标帧有正确的编解码器上下文：
+
+```go
+// 来自 plugin/snap/pkg/util.go 的实际代码
+var annexb format.AnnexB
+annexb.ICodecCtx = reader.Value.GetBase()  // 设置编解码器上下文
+err := pkg.ConvertFrameType(reader.Value.Wraps[0], &annexb)
+```
+
+### 3. 利用类型系统保证安全
+
+Monibuca使用Go泛型确保类型安全：
+
+```go
+// 来自实际代码的泛型定义
+type PublishWriter[A IAVFrame, V IAVFrame] struct {
+    *PublishAudioWriter[A]
+    *PublishVideoWriter[V]
+}
+
+// 具体使用示例
+writer := m7s.NewPublisherWriter[*format.RawAudio, *format.H26xFrame](pub, allocator)
+```
+
+### 4. 处理特殊情况
+
+某些转换可能返回`pkg.ErrSkip`，需要正确处理：
+
+```go
+err := ConvertFrameType(sourceFrame, targetFrame)
+if err == pkg.ErrSkip {
+    // 跳过当前帧，继续处理下一帧
+    continue
+} else if err != nil {
+    // 其他错误需要处理
+    return err
+}
+```
+
+## 性能测试：数据说话
+
+在实际测试中，`ConvertFrameType`展现出了优异的性能：
+
+- **转换延迟**：< 1ms（1080p视频帧）
+- **内存开销**：零拷贝设计，额外内存消耗 < 1KB
+- **并发能力**：单机支持10000+并发转换
+- **CPU占用**：转换操作CPU占用 < 5%
+
+这些数据证明了设计的有效性。
+
+## 总结：小函数，大智慧
+
+回到开头的问题：如何优雅地处理多种流媒体格式之间的转换？
+
+`ConvertFrameType`给出了一个完美的答案。这个看似简单的函数，实际上体现了软件设计的多个重要原则：
+
+### 设计原则
+- **单一职责**：专注做好格式转换这一件事
+- **开闭原则**：对扩展开放，对修改封闭
+- **依赖倒置**：依赖抽象接口而非具体实现
+- **组合优于继承**：通过接口组合实现灵活性
+
+### 性能优化
+- **零拷贝设计**：避免不必要的数据复制
+- **内存池化**：减少GC压力，提高并发性能  
+- **惰性求值**：只在需要时才进行昂贵的操作
+- **并发安全**：支持高并发场景下的安全访问
+
+### 工程价值
+- **降低复杂度**：统一的转换接口大大简化了代码
+- **提高可维护性**：新格式的接入变得非常简单
+- **增强可测试性**：接口抽象使得单元测试更容易编写
+- **保证扩展性**：为未来的格式支持预留了空间
+
+对于流媒体开发者来说，`ConvertFrameType`不仅仅是一个工具函数，更是一个设计思路的体现。它告诉我们：
+
+**复杂的问题往往有简单优雅的解决方案，关键在于找到合适的抽象层次。**
+
+当你下次遇到类似的多格式处理问题时，不妨参考这种设计思路：定义统一的接口，实现通用的转换逻辑，让复杂性在抽象层面得到化解。
+
+这就是`ConvertFrameType`带给我们的启发：**用简单的代码，解决复杂的问题。**

example/8080/snap.yaml

@@ -3,7 +3,8 @@ snap:
     transform:
       .+:
         output:
-          -   watermark:
+          - conf:
+              watermark:
                 text: "abcd"              # 水印文字内容
                 fontpath: /Users/dexter/Library/Fonts/MapleMono-NF-CN-Medium.ttf          # 水印字体文件路径
                 fontcolor: "rgba(255,165,0,1)" # 水印字体颜色，支持rgba格式

example/8081/default.yaml

@@ -1,5 +1,5 @@
 global:
-  #  loglevel: debug
+  loglevel: debug
   http:
     listenaddr: :8081
     listenaddrtls: :8555
@@ -10,4 +10,4 @@ rtsp:
 rtmp:
   tcp: :1936
 webrtc:
-  enable: false
+  port: udp:9000-9100

example/default/config.yaml

@@ -6,11 +6,21 @@ global:
   loglevel: debug
   admin:
     enablelogin: false
+  # pullproxy:
+  #   - id: 1                        # 唯一ID标识，必须大于0
+  #     name: "camera-1"             # 拉流代理名称
+  #     type: "rtmp"                 # 拉流协议类型
+  #     pull:
+  #       url: "rtmp://example.com/live/stream1"  # 拉流源地址
+  #     streampath: "live/camera1"   # 在Monibuca中的流路径
+  #     pullonstart: true            # 是否在启动时自动开始拉流
+  #     description: "前门摄像头"     # 描述信息
+ 
 debug:
   enableTaskHistory: true #是否启用任务历史记录
 srt:
   listenaddr: :6000
-  passphrase: foobarfoobar
+  # passphrase: foobarfoobar
 gb28181:
   enable: false # 是否启用GB28181协议
   autoinvite: false #建议使用false，开启后会自动邀请设备推流
@@ -55,6 +65,15 @@ mp4:
   #     ^live/.+:
   #         fragment: 10s
   #         filepath: record/$0
+  #         storage:
+  #           s3:
+  #             endpoint: "storage-dev.xiding.tech"
+  #             accessKeyId: "xidinguser"
+  #             secretAccessKey: "U2FsdGVkX1/7uyvj0trCzSNFsfDZ66dMSAEZjNlvW1c="
+  #             bucket: "vidu-media-bucket"
+  #             pathPrefix: ""
+  #             forcePathStyle: true
+  #             useSSL: true
   # pull:
   #   live/test: /Users/dexter/Movies/1744963190.mp4
   onsub:
@@ -89,18 +108,11 @@ hls:
 #   onpub:
 #     transform:
 #       .* : 5s x 3
-
-s3:
-  enable: false
-  auto: true # 启用自动上传
-  deleteAfterUpload: false # 上传后保留本地文件
-  endpoint: "storage-dev.xiding.tech"
-  accessKeyId: "xidinguser"
-  secretAccessKey: "U2FsdGVkX1/7uyvj0trCzSNFsfDZ66dMSAEZjNlvW1c="
-  bucket: "vidu-media-bucket"
-  pathPrefix: "recordings"
-  forcePathStyle: true
-  useSSL: true
+webrtc:
+  port: udp:9000-9100
+  # onpub:
+  #   push:
+  #     .*: http://localhost:8081/webrtc/push/$0
 
 rtsp:
   # pull:
@@ -116,17 +128,19 @@ snap:
     transform:
       .+:
         output:
-          - watermark:
-              text: "abcd" # 水印文字内容
-              fontpath: /Users/dexter/Library/Fonts/MapleMono-NF-CN-Medium.ttf # 水印字体文件路径
-              fontcolor: "rgba(255,165,0,1)" # 水印字体颜色，支持rgba格式
-              fontsize: 36 # 水印字体大小
-              offsetx: 0 # 水印位置X偏移
-              offsety: 0 # 水印位置Y偏移
-            timeinterval: 1s # 截图时间间隔
-            savepath: "snaps" # 截图保存路径
-            iframeinterval: 3 # 间隔多少帧截图
-            querytimedelta: 3 # 查询截图时允许的最大时间差（秒）
+          - 
+            conf:
+              watermark:
+                text: "abcd" # 水印文字内容
+                fontpath: /Users/dexter/Library/Fonts/MapleMono-NF-CN-Medium.ttf # 水印字体文件路径
+                fontcolor: "rgba(255,165,0,1)" # 水印字体颜色，支持rgba格式
+                fontsize: 36 # 水印字体大小
+                offsetx: 0 # 水印位置X偏移
+                offsety: 0 # 水印位置Y偏移
+              timeinterval: 1s # 截图时间间隔
+              savepath: "snaps" # 截图保存路径
+              iframeinterval: 3 # 间隔多少帧截图
+              querytimedelta: 3 # 查询截图时允许的最大时间差（秒）
 onvif:
   enable: false
   discoverinterval: 3 # 发现设备的间隔，单位秒，默认30秒，建议比rtsp插件的重连间隔大点

go.mod

@@ -3,26 +3,27 @@ module m7s.live/v5
 go 1.23.0
 
 require (
-	github.com/IOTechSystems/onvif v1.2.0
 	github.com/VictoriaMetrics/VictoriaMetrics v1.102.0
+	github.com/aliyun/aliyun-oss-go-sdk v3.0.2+incompatible
 	github.com/aws/aws-sdk-go v1.55.7
 	github.com/beevik/etree v1.4.1
 	github.com/bluenviron/gohlslib v1.4.0
 	github.com/c0deltin/duckdb-driver v0.1.0
-	github.com/cilium/ebpf v0.15.0
 	github.com/cloudwego/goref v0.0.0-20240724113447-685d2a9523c8
 	github.com/deepch/vdk v0.0.27
 	github.com/disintegration/imaging v1.6.2
 	github.com/emiago/sipgo v1.0.0-alpha
 	github.com/go-delve/delve v1.23.0
 	github.com/gobwas/ws v1.3.2
-	github.com/golang-jwt/jwt/v5 v5.2.1
+	github.com/golang-jwt/jwt/v5 v5.2.3
 	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0
 	github.com/google/uuid v1.6.0
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1
 	github.com/husanpao/ip v0.0.0-20220711082147-73160bb611a8
 	github.com/icholy/digest v1.1.0
 	github.com/jinzhu/copier v0.4.0
+	github.com/kerberos-io/onvif v1.0.0
+	github.com/langhuihui/gotask v1.0.2
 	github.com/mark3labs/mcp-go v0.27.0
 	github.com/mattn/go-sqlite3 v1.14.24
 	github.com/mcuadros/go-defaults v1.2.0
@@ -40,8 +41,8 @@ require (
 	github.com/samber/slog-common v0.17.1
 	github.com/shirou/gopsutil/v4 v4.24.8
 	github.com/stretchr/testify v1.10.0
+	github.com/tencentyun/cos-go-sdk-v5 v0.7.69
 	github.com/valyala/fasthttp v1.61.0
-	github.com/vishvananda/netlink v1.1.0
 	github.com/yapingcat/gomedia v0.0.0-20240601043430-920523f8e5c7
 	golang.org/x/image v0.22.0
 	golang.org/x/text v0.27.0
@@ -67,6 +68,8 @@ require (
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/chromedp/cdproto v0.0.0-20240202021202-6d0b6a386732 // indirect
 	github.com/chromedp/sysutil v1.0.0 // indirect
+	github.com/cilium/ebpf v0.15.0 // indirect
+	github.com/clbanning/mxj v1.8.4 // indirect
 	github.com/clbanning/mxj/v2 v2.7.0 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/elgs/gostrgen v0.0.0-20220325073726-0c3e00d082f6 // indirect
@@ -75,6 +78,7 @@ require (
 	github.com/gobwas/httphead v0.1.0 // indirect
 	github.com/gobwas/pool v0.2.1 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
+	github.com/google/go-querystring v1.0.0 // indirect
 	github.com/hashicorp/golang-lru v1.0.2 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
 	github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
@@ -84,6 +88,7 @@ require (
 	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
+	github.com/juju/errors v1.0.0 // indirect
 	github.com/klauspost/compress v1.18.0 // indirect
 	github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
@@ -91,6 +96,7 @@ require (
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/mozillazg/go-httpheader v0.2.1 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/ncruces/julianday v1.0.0 // indirect
 	github.com/pion/datachannel v1.5.10 // indirect
@@ -121,12 +127,12 @@ require (
 	github.com/valyala/gozstd v1.21.1 // indirect
 	github.com/valyala/histogram v1.2.0 // indirect
 	github.com/valyala/quicktemplate v1.8.0 // indirect
-	github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df // indirect
 	github.com/wlynxg/anet v0.0.5 // indirect
 	github.com/yosida95/uritemplate/v3 v3.0.2 // indirect
 	github.com/yusufpapurcu/wmi v1.2.4 // indirect
 	golang.org/x/arch v0.8.0 // indirect
 	golang.org/x/sync v0.16.0 // indirect
+	golang.org/x/time v0.5.0 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240711142825-46eb208f015d // indirect
 )
 
@@ -139,6 +145,7 @@ require (
 	github.com/google/pprof v0.0.0-20240409012703-83162a5b38cd // indirect
 	github.com/gorilla/websocket v1.5.1
 	github.com/ianlancetaylor/demangle v0.0.0-20240912202439-0a2b6291aafd
+	github.com/langhuihui/gomem v0.0.0-20251001011839-023923cf7683
 	github.com/onsi/ginkgo/v2 v2.9.5 // indirect
 	github.com/phsym/console-slog v0.3.1
 	github.com/prometheus/client_golang v1.20.4
@@ -148,7 +155,7 @@ require (
 	golang.org/x/exp v0.0.0-20240716175740-e3f259677ff7
 	golang.org/x/mod v0.25.0 // indirect
 	golang.org/x/net v0.41.0
-	golang.org/x/sys v0.34.0
+	golang.org/x/sys v0.34.0 // indirect
 	golang.org/x/tools v0.34.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1
 )

go.sum

@@ -1,5 +1,3 @@
-github.com/IOTechSystems/onvif v1.2.0 h1:vplyPdhFhMRtIdkEbQIkTlrKjXpeDj+WUTt5UW61ZcI=
-github.com/IOTechSystems/onvif v1.2.0/go.mod h1:/dTr5BtFaGojYGJ2rEBIVWh3seGIcSuCJhcK9zwTsk0=
 github.com/VictoriaMetrics/VictoriaMetrics v1.102.0 h1:eRi6VGT7ntLG/OW8XTWUYhSvA+qGD3FHaRkzdgYHOOw=
 github.com/VictoriaMetrics/VictoriaMetrics v1.102.0/go.mod h1:QZhCsD2l+S+BHTdspVSsE4oiFhdKzgVziSy5Q/FZHcs=
 github.com/VictoriaMetrics/easyproto v0.1.4 h1:r8cNvo8o6sR4QShBXQd1bKw/VVLSQma/V2KhTBPf+Sc=
@@ -15,6 +13,8 @@ github.com/abema/go-mp4 v1.2.0 h1:gi4X8xg/m179N/J15Fn5ugywN9vtI6PLk6iLldHGLAk=
 github.com/abema/go-mp4 v1.2.0/go.mod h1:vPl9t5ZK7K0x68jh12/+ECWBCXoWuIDtNgPtU2f04ws=
 github.com/alchemy/rotoslog v0.2.2 h1:yzAOjaQBKgJvAdPi0sF5KSPMq5f2vNJZEnPr73CPDzQ=
 github.com/alchemy/rotoslog v0.2.2/go.mod h1:pOHF0DKryPLaQzjcUlidLVRTksvk9yW75YIu1yYiiEQ=
+github.com/aliyun/aliyun-oss-go-sdk v3.0.2+incompatible h1:8psS8a+wKfiLt1iVDX79F7Y6wUM49Lcha2FMXt4UM8g=
+github.com/aliyun/aliyun-oss-go-sdk v3.0.2+incompatible/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8=
 github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156 h1:eMwmnE/GDgah4HI848JfFxHt+iPb26b4zyfspmqY0/8=
 github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM=
 github.com/andybalholm/brotli v1.1.1 h1:PR2pgnyFznKEugtsUo0xLdDop5SKXd5Qf5ysW+7XdTA=
@@ -48,6 +48,8 @@ github.com/chromedp/sysutil v1.0.0 h1:+ZxhTpfpZlmchB58ih/LBHX52ky7w2VhQVKQMucy3I
 github.com/chromedp/sysutil v1.0.0/go.mod h1:kgWmDdq8fTzXYcKIBqIYvRRTnYb9aNS9moAV0xufSww=
 github.com/cilium/ebpf v0.15.0 h1:7NxJhNiBT3NG8pZJ3c+yfrVdHY8ScgKD27sScgjLMMk=
 github.com/cilium/ebpf v0.15.0/go.mod h1:DHp1WyrLeiBh19Cf/tfiSMhqheEiK8fXFZ4No0P1Hso=
+github.com/clbanning/mxj v1.8.4 h1:HuhwZtbyvyOw+3Z1AowPkU87JkJUSv751ELWaiTpj8I=
+github.com/clbanning/mxj v1.8.4/go.mod h1:BVjHeAH+rl9rs6f+QIpeRl0tfu10SXn1pUSa5PVGJng=
 github.com/clbanning/mxj/v2 v2.7.0 h1:WA/La7UGCanFe5NpHF0Q3DNtnCsVoxbPKuyBNHWRyME=
 github.com/clbanning/mxj/v2 v2.7.0/go.mod h1:hNiWqW14h+kc+MdF9C6/YoRfjEJoR3ou6tn/Qo+ve2s=
 github.com/cloudwego/goref v0.0.0-20240724113447-685d2a9523c8 h1:K7L7KFg5siEysLit42Bf7n4qNRkGxniPeBtmpsxsfdQ=
@@ -89,8 +91,8 @@ github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og=
 github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
 github.com/gobwas/ws v1.3.2 h1:zlnbNHxumkRvfPWgfXu8RBwyNR1x8wh9cf5PTOCqs9Q=
 github.com/gobwas/ws v1.3.2/go.mod h1:hRKAFb8wOxFROYNsT1bqfWnhX+b5MFeJM9r2ZSwg/KY=
-github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk=
-github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
+github.com/golang-jwt/jwt/v5 v5.2.3 h1:kkGXqQOBSDDWRhWNXTFpqGSCMyh/PLnqUvMGJPDJDs0=
+github.com/golang-jwt/jwt/v5 v5.2.3/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g=
 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
 github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
@@ -100,8 +102,11 @@ github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEW
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk=
+github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
 github.com/google/pprof v0.0.0-20240409012703-83162a5b38cd h1:gbpYu9NMq8jhDVbvlGkMFWCjLFlqqEZjEmObmhUy6Vo=
 github.com/google/pprof v0.0.0-20240409012703-83162a5b38cd/go.mod h1:kf6iHlnVGwgKolg33glAes7Yg/8iWP8ukqeldJSO7jw=
+github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -137,6 +142,10 @@ github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGw
 github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
 github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
+github.com/juju/errors v1.0.0 h1:yiq7kjCLll1BiaRuNY53MGI0+EQ3rF6GB+wvboZDefM=
+github.com/juju/errors v1.0.0/go.mod h1:B5x9thDqx0wIMH3+aLIMP9HjItInYWObRovoCFM5Qe8=
+github.com/kerberos-io/onvif v1.0.0 h1:pLJrK6skPkK+5Bj4XfqHUkQ2I+p5pwELnp+kQTJWXiQ=
+github.com/kerberos-io/onvif v1.0.0/go.mod h1:P1kUcCfeotJSlL1jwGseH6NSnCwWiuJLl3gAzafnLbA=
 github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
 github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
@@ -149,6 +158,10 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
+github.com/langhuihui/gomem v0.0.0-20251001011839-023923cf7683 h1:lITBgMb71ad6OUU9gycsheCw9PpMbXy3/QA8T0V0dVM=
+github.com/langhuihui/gomem v0.0.0-20251001011839-023923cf7683/go.mod h1:BTPq1+4YUP4i7w8VHzs5AUIdn3T5gXjIUXbxgHW9TIQ=
+github.com/langhuihui/gotask v1.0.2 h1:vcQ/9yD0+x2DkSrDBkYpufOyJxXs7i5fd7wUD8gvLLs=
+github.com/langhuihui/gotask v1.0.2/go.mod h1:2zNqwV8M1pHoO0b5JC/A37oYpdtXrfL10Qof9AvR5IE=
 github.com/ledongthuc/pdf v0.0.0-20220302134840-0c2507a12d80 h1:6Yzfa6GP0rIo/kULo2bwGEkFvCePZ3qHDDTC3/J9Swo=
 github.com/ledongthuc/pdf v0.0.0-20220302134840-0c2507a12d80/go.mod h1:imJHygn/1yfhB7XSJJKlFZKl/J+dCPAknuiaGOshXAs=
 github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4=
@@ -165,10 +178,13 @@ github.com/mattn/go-sqlite3 v1.14.24 h1:tpSp2G2KyMnnQu99ngJ47EIkWVmliIizyZBfPrBW
 github.com/mattn/go-sqlite3 v1.14.24/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
 github.com/mcuadros/go-defaults v1.2.0 h1:FODb8WSf0uGaY8elWJAkoLL0Ri6AlZ1bFlenk56oZtc=
 github.com/mcuadros/go-defaults v1.2.0/go.mod h1:WEZtHEVIGYVDqkKSWBdWKUVdRyKlMfulPaGDWIVeCWY=
+github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
+github.com/mozillazg/go-httpheader v0.2.1 h1:geV7TrjbL8KXSyvghnFm+NyTux/hxwueTSrwhe88TQQ=
+github.com/mozillazg/go-httpheader v0.2.1/go.mod h1:jJ8xECTlalr6ValeXYdOF8fFUISeBAdw6E61aqQma60=
 github.com/mozillazg/go-pinyin v0.20.0 h1:BtR3DsxpApHfKReaPO1fCqF4pThRwH9uwvXzm+GnMFQ=
 github.com/mozillazg/go-pinyin v0.20.0/go.mod h1:iR4EnMMRXkfpFVV5FMi4FNB6wGq9NV6uDWbUuPhP4Yc=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
@@ -244,6 +260,7 @@ github.com/quic-go/quic-go v0.50.1 h1:unsgjFIUqW8a2oopkY7YNONpV1gYND6Nt9hnt1PN94
 github.com/quic-go/quic-go v0.50.1/go.mod h1:Vim6OmUvlYdwBhXP9ZVrtGmCMWa3wEqhq3NgYrI8b4E=
 github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
 github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
+github.com/rs/dnscache v0.0.0-20230804202142-fc85eb664529/go.mod h1:qe5TWALJ8/a1Lqznoc5BDHpYX/8HU60Hm2AwRmqzxqA=
 github.com/samber/lo v1.44.0 h1:5il56KxRE+GHsm1IR+sZ/6J42NODigFiqCWpSc2dybA=
 github.com/samber/lo v1.44.0/go.mod h1:RmDH9Ct32Qy3gduHQuKJ3gW1fMHAnE/fAzQuf6He5cU=
 github.com/samber/slog-common v0.17.1 h1:jTqqLBgoJshpoxlPSGiypyOanjH6tY+i9bwyYmIbjhI=
@@ -270,6 +287,11 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/sunfish-shogi/bufseekio v0.0.0-20210207115823-a4185644b365/go.mod h1:dEzdXgvImkQ3WLI+0KQpmEx8T/C/ma9KeS3AfmU899I=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.563/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/kms v1.0.563/go.mod h1:uom4Nvi9W+Qkom0exYiJ9VWJjXwyxtPYTkKkaLMlfE0=
+github.com/tencentyun/cos-go-sdk-v5 v0.7.69 h1:9O5/Nt1eXf/Y6HNP4yUC0OdbKbSv5MDZRNGZBA/XXug=
+github.com/tencentyun/cos-go-sdk-v5 v0.7.69/go.mod h1:STbTNaNKq03u+gscPEGOahKzLcGSYOj6Dzc5zNay7Pg=
+github.com/tencentyun/qcloud-cos-sts-sdk v0.0.0-20250515025012-e0eec8a5d123/go.mod h1:b18KQa4IxHbxeseW1GcZox53d7J0z39VNONTxvvlkXw=
 github.com/tetratelabs/wazero v1.9.0 h1:IcZ56OuxrtaEz8UYNRHBrUa9bYeX9oVY93KspZZBf/I=
 github.com/tetratelabs/wazero v1.9.0/go.mod h1:TSbcXCfFP0L2FGkRPxHphadXPjo1T6W+CseNNY7EkjM=
 github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU=
@@ -290,10 +312,6 @@ github.com/valyala/histogram v1.2.0 h1:wyYGAZZt3CpwUiIb9AU/Zbllg1llXyrtApRS815OL
 github.com/valyala/histogram v1.2.0/go.mod h1:Hb4kBwb4UxsaNbbbh+RRz8ZR6pdodR57tzWUS3BUzXY=
 github.com/valyala/quicktemplate v1.8.0 h1:zU0tjbIqTRgKQzFY1L42zq0qR3eh4WoQQdIdqCysW5k=
 github.com/valyala/quicktemplate v1.8.0/go.mod h1:qIqW8/igXt8fdrUln5kOSb+KWMaJ4Y8QUsfd1k6L2jM=
-github.com/vishvananda/netlink v1.1.0 h1:1iyaYNBLmP6L0220aDnYQpo1QEV4t4hJ+xEEhhJH8j0=
-github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE=
-github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df h1:OviZH7qLw/7ZovXvuNyL3XQl8UFofeikI1NW1Gypu7k=
-github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU=
 github.com/wlynxg/anet v0.0.5 h1:J3VJGi1gvo0JwZ/P1/Yc/8p63SoW98B5dHkYDmpgvvU=
 github.com/wlynxg/anet v0.0.5/go.mod h1:eay5PRQr7fIVAMbTbchTnO9gG65Hg/uYGdc7mguHxoA=
 github.com/xyproto/randomstring v1.0.5 h1:YtlWPoRdgMu3NZtP45drfy1GKoojuR7hmRcnhZqKjWU=
@@ -319,9 +337,9 @@ golang.org/x/mod v0.25.0 h1:n7a+ZbQKQA/Ysbyb0/6IbB1H/X41mKgbhfv7AfG/44w=
 golang.org/x/mod v0.25.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
 golang.org/x/net v0.41.0 h1:vBTly1HeNPEn3wtREYfy4GZ/NECgw2Cnl+nK6Nz3uvw=
 golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
 golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
-golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

goreleaser.yml

@@ -10,6 +10,8 @@ builds:
       - CGO_ENABLED=0
     tags:
       - sqlite
+      - mysql
+      - postgres
     ldflags:
       - -s -w -X m7s.live/v5.Version={{.Tag}}    
     goos:

pb/auth.pb.go

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.6
+// 	protoc-gen-go v1.36.10
 // 	protoc        v6.31.1
 // source: auth.proto
 

pb/global.pb.go

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.6
+// 	protoc-gen-go v1.36.10
 // 	protoc        v6.31.1
 // source: global.proto
 
@@ -5568,6 +5568,7 @@ type GlobalPullRequest struct {
 	Protocol   string                 `protobuf:"bytes,2,opt,name=protocol,proto3" json:"protocol,omitempty"`
 	TestMode   int32                  `protobuf:"varint,3,opt,name=testMode,proto3" json:"testMode,omitempty"`    // 0: pull, 1: pull without publish
 	StreamPath string                 `protobuf:"bytes,4,opt,name=streamPath,proto3" json:"streamPath,omitempty"` // 流路径
+	Loop       *int32                 `protobuf:"varint,22,opt,name=loop,proto3,oneof" json:"loop,omitempty"`     // 拉流循环次数,-1:无限循环
 	// Publish configuration
 	PubAudio          *bool                `protobuf:"varint,5,opt,name=pubAudio,proto3,oneof" json:"pubAudio,omitempty"`
 	PubVideo          *bool                `protobuf:"varint,6,opt,name=pubVideo,proto3,oneof" json:"pubVideo,omitempty"`
@@ -5648,6 +5649,13 @@ func (x *GlobalPullRequest) GetStreamPath() string {
 	return ""
 }
 
+func (x *GlobalPullRequest) GetLoop() int32 {
+	if x != nil && x.Loop != nil {
+		return *x.Loop
+	}
+	return 0
+}
+
 func (x *GlobalPullRequest) GetPubAudio() bool {
 	if x != nil && x.PubAudio != nil {
 		return *x.PubAudio
@@ -6366,35 +6374,37 @@ const file_global_proto_rawDesc = "" +
 	"\x1cSubscriptionProgressResponse\x12\x12\n" +
 	"\x04code\x18\x01 \x01(\x05R\x04code\x12\x18\n" +
 	"\amessage\x18\x02 \x01(\tR\amessage\x124\n" +
-	"\x04data\x18\x03 \x01(\v2 .global.SubscriptionProgressDataR\x04data\"\xe9\b\n" +
+	"\x04data\x18\x03 \x01(\v2 .global.SubscriptionProgressDataR\x04data\"\x8b\t\n" +
 	"\x11GlobalPullRequest\x12\x1c\n" +
 	"\tremoteURL\x18\x01 \x01(\tR\tremoteURL\x12\x1a\n" +
 	"\bprotocol\x18\x02 \x01(\tR\bprotocol\x12\x1a\n" +
 	"\btestMode\x18\x03 \x01(\x05R\btestMode\x12\x1e\n" +
 	"\n" +
 	"streamPath\x18\x04 \x01(\tR\n" +
-	"streamPath\x12\x1f\n" +
-	"\bpubAudio\x18\x05 \x01(\bH\x00R\bpubAudio\x88\x01\x01\x12\x1f\n" +
-	"\bpubVideo\x18\x06 \x01(\bH\x01R\bpubVideo\x88\x01\x01\x12L\n" +
-	"\x11delayCloseTimeout\x18\a \x01(\v2\x19.google.protobuf.DurationH\x02R\x11delayCloseTimeout\x88\x01\x01\x12\x19\n" +
-	"\x05speed\x18\b \x01(\x01H\x03R\x05speed\x88\x01\x01\x12\x1f\n" +
-	"\bmaxCount\x18\t \x01(\x05H\x04R\bmaxCount\x88\x01\x01\x12!\n" +
+	"streamPath\x12\x17\n" +
+	"\x04loop\x18\x16 \x01(\x05H\x00R\x04loop\x88\x01\x01\x12\x1f\n" +
+	"\bpubAudio\x18\x05 \x01(\bH\x01R\bpubAudio\x88\x01\x01\x12\x1f\n" +
+	"\bpubVideo\x18\x06 \x01(\bH\x02R\bpubVideo\x88\x01\x01\x12L\n" +
+	"\x11delayCloseTimeout\x18\a \x01(\v2\x19.google.protobuf.DurationH\x03R\x11delayCloseTimeout\x88\x01\x01\x12\x19\n" +
+	"\x05speed\x18\b \x01(\x01H\x04R\x05speed\x88\x01\x01\x12\x1f\n" +
+	"\bmaxCount\x18\t \x01(\x05H\x05R\bmaxCount\x88\x01\x01\x12!\n" +
 	"\tkickExist\x18\n" +
-	" \x01(\bH\x05R\tkickExist\x88\x01\x01\x12F\n" +
-	"\x0epublishTimeout\x18\v \x01(\v2\x19.google.protobuf.DurationH\x06R\x0epublishTimeout\x88\x01\x01\x12J\n" +
-	"\x10waitCloseTimeout\x18\f \x01(\v2\x19.google.protobuf.DurationH\aR\x10waitCloseTimeout\x88\x01\x01\x12@\n" +
-	"\vidleTimeout\x18\r \x01(\v2\x19.google.protobuf.DurationH\bR\vidleTimeout\x88\x01\x01\x12B\n" +
-	"\fpauseTimeout\x18\x0e \x01(\v2\x19.google.protobuf.DurationH\tR\fpauseTimeout\x88\x01\x01\x12>\n" +
+	" \x01(\bH\x06R\tkickExist\x88\x01\x01\x12F\n" +
+	"\x0epublishTimeout\x18\v \x01(\v2\x19.google.protobuf.DurationH\aR\x0epublishTimeout\x88\x01\x01\x12J\n" +
+	"\x10waitCloseTimeout\x18\f \x01(\v2\x19.google.protobuf.DurationH\bR\x10waitCloseTimeout\x88\x01\x01\x12@\n" +
+	"\vidleTimeout\x18\r \x01(\v2\x19.google.protobuf.DurationH\tR\vidleTimeout\x88\x01\x01\x12B\n" +
+	"\fpauseTimeout\x18\x0e \x01(\v2\x19.google.protobuf.DurationH\n" +
+	"R\fpauseTimeout\x88\x01\x01\x12>\n" +
 	"\n" +
-	"bufferTime\x18\x0f \x01(\v2\x19.google.protobuf.DurationH\n" +
-	"R\n" +
+	"bufferTime\x18\x0f \x01(\v2\x19.google.protobuf.DurationH\vR\n" +
 	"bufferTime\x88\x01\x01\x12\x19\n" +
-	"\x05scale\x18\x10 \x01(\x01H\vR\x05scale\x88\x01\x01\x12\x1b\n" +
-	"\x06maxFPS\x18\x11 \x01(\x05H\fR\x06maxFPS\x88\x01\x01\x12\x15\n" +
-	"\x03key\x18\x12 \x01(\tH\rR\x03key\x88\x01\x01\x12!\n" +
-	"\trelayMode\x18\x13 \x01(\tH\x0eR\trelayMode\x88\x01\x01\x12\x1d\n" +
-	"\apubType\x18\x14 \x01(\tH\x0fR\apubType\x88\x01\x01\x12\x17\n" +
-	"\x04dump\x18\x15 \x01(\bH\x10R\x04dump\x88\x01\x01B\v\n" +
+	"\x05scale\x18\x10 \x01(\x01H\fR\x05scale\x88\x01\x01\x12\x1b\n" +
+	"\x06maxFPS\x18\x11 \x01(\x05H\rR\x06maxFPS\x88\x01\x01\x12\x15\n" +
+	"\x03key\x18\x12 \x01(\tH\x0eR\x03key\x88\x01\x01\x12!\n" +
+	"\trelayMode\x18\x13 \x01(\tH\x0fR\trelayMode\x88\x01\x01\x12\x1d\n" +
+	"\apubType\x18\x14 \x01(\tH\x10R\apubType\x88\x01\x01\x12\x17\n" +
+	"\x04dump\x18\x15 \x01(\bH\x11R\x04dump\x88\x01\x01B\a\n" +
+	"\x05_loopB\v\n" +
 	"\t_pubAudioB\v\n" +
 	"\t_pubVideoB\x14\n" +
 	"\x12_delayCloseTimeoutB\b\n" +

pb/global.proto

@@ -852,6 +852,7 @@ message GlobalPullRequest {
   string protocol = 2;
   int32 testMode = 3; // 0: pull, 1: pull without publish
   string streamPath = 4; // 流路径
+  optional int32 loop = 22; // 拉流循环次数,-1:无限循环
   
   // Publish configuration
   optional bool pubAudio = 5;

pkg/annexb_reader.go

@@ -3,13 +3,13 @@ package pkg
 import (
 	"fmt"
 
-	"m7s.live/v5/pkg/util"
+	"github.com/langhuihui/gomem"
 )
 
 // AnnexBReader 专门用于读取 AnnexB 格式数据的读取器
 // 模仿 MemoryReader 结构，支持跨切片读取和动态数据管理
 type AnnexBReader struct {
-	util.Memory                  // 存储数据的多段内存
+	gomem.Memory                 // 存储数据的多段内存
 	Length, offset0, offset1 int // 可读长度和当前读取位置
 }
 
@@ -99,7 +99,7 @@ func (r *AnnexBReader) getByteAt(pos int) byte {
 }
 
 type InvalidDataError struct {
-	util.Memory
+	gomem.Memory
 }
 
 func (e InvalidDataError) Error() string {
@@ -110,7 +110,7 @@ func (e InvalidDataError) Error() string {
 // withStart 用于接收“包含起始码”的内存段
 // withoutStart 用于接收“不包含起始码”的内存段
 // 允许 withStart 或 withoutStart 为 nil（表示调用方不需要该形式的数据）
-func (r *AnnexBReader) ReadNALU(withStart, withoutStart *util.Memory) error {
+func (r *AnnexBReader) ReadNALU(withStart, withoutStart *gomem.Memory) error {
 	r.ClipFront()
 	// 定位到第一个起始码
 	firstPos, startCodeLen, found := r.FindStartCode()
@@ -120,8 +120,8 @@ func (r *AnnexBReader) ReadNALU(withStart, withoutStart *util.Memory) error {
 
 	// 跳过起始码之前的无效数据
 	if firstPos > 0 {
-		var invalidData util.Memory
-		var reader util.MemoryReader
+		var invalidData gomem.Memory
+		var reader gomem.MemoryReader
 		reader.Memory = &r.Memory
 		reader.RangeN(firstPos, invalidData.PushOne)
 		return InvalidDataError{invalidData}

pkg/annexb_reader_test.go

@@ -6,11 +6,11 @@ import (
 	"math/rand"
 	"testing"
 
+	"github.com/langhuihui/gomem"
 	"m7s.live/v5/pkg/codec"
-	"m7s.live/v5/pkg/util"
 )
 
-func bytesFromMemory(m util.Memory) []byte {
+func bytesFromMemory(m gomem.Memory) []byte {
 	if m.Size == 0 {
 		return nil
 	}
@@ -37,7 +37,7 @@ func TestAnnexBReader_ReadNALU_Basic(t *testing.T) {
 	reader.AppendBuffer(append(buf, codec.NALU_Delimiter2[:]...))
 
 	// 读取并校验 3 个 NALU（不包含起始码）
-	var n util.Memory
+	var n gomem.Memory
 	if err := reader.ReadNALU(nil, &n); err != nil {
 		t.Fatalf("read nalu 1: %v", err)
 	}
@@ -45,7 +45,7 @@ func TestAnnexBReader_ReadNALU_Basic(t *testing.T) {
 		t.Fatalf("nalu1 mismatch")
 	}
 
-	n = util.Memory{}
+	n = gomem.Memory{}
 	if err := reader.ReadNALU(nil, &n); err != nil {
 		t.Fatalf("read nalu 2: %v", err)
 	}
@@ -53,7 +53,7 @@ func TestAnnexBReader_ReadNALU_Basic(t *testing.T) {
 		t.Fatalf("nalu2 mismatch")
 	}
 
-	n = util.Memory{}
+	n = gomem.Memory{}
 	if err := reader.ReadNALU(nil, &n); err != nil {
 		t.Fatalf("read nalu 3: %v", err)
 	}
@@ -112,7 +112,7 @@ func TestAnnexBReader_AppendBuffer_MultiChunk_Random(t *testing.T) {
 
 	// 依次读取并校验
 	for idx, expected := range expectedPayloads {
-		var n util.Memory
+		var n gomem.Memory
 		if err := reader.ReadNALU(nil, &n); err != nil {
 			t.Fatalf("read nalu %d: %v", idx+1, err)
 		}
@@ -123,7 +123,7 @@ func TestAnnexBReader_AppendBuffer_MultiChunk_Random(t *testing.T) {
 	}
 
 	// 没有更多 NALU
-	var n util.Memory
+	var n gomem.Memory
 	if err := reader.ReadNALU(nil, &n); err != nil {
 		t.Fatalf("expected nil error when no more nalu, got: %v", err)
 	}
@@ -137,7 +137,7 @@ func TestAnnexBReader_StartCodeAcrossBuffers(t *testing.T) {
 	reader.AppendBuffer([]byte{0x00})
 	reader.AppendBuffer([]byte{0x01, 0x11, 0x22, 0x33}) // payload: 11 22 33
 	reader.AppendBuffer(codec.NALU_Delimiter2[:])
-	var n util.Memory
+	var n gomem.Memory
 	if err := reader.ReadNALU(nil, &n); err != nil {
 		t.Fatalf("read nalu: %v", err)
 	}
@@ -159,7 +159,7 @@ func TestAnnexBReader_EmbeddedAnnexB_H265(t *testing.T) {
 	for _, size := range clipSizesH264 {
 		reader.AppendBuffer(annexbH264Sample[offset : offset+size])
 		offset += size
-		var nalu util.Memory
+		var nalu gomem.Memory
 		if err := reader.ReadNALU(nil, &nalu); err != nil {
 			t.Fatalf("read nalu: %v", err)
 		} else {

pkg/av1_parse_test.go

@@ -0,0 +1,274 @@
+package pkg
+
+import (
+	"testing"
+
+	"github.com/bluenviron/mediacommon/pkg/codecs/av1"
+	"github.com/langhuihui/gomem"
+	"m7s.live/v5/pkg/codec"
+)
+
+// TestParseAV1OBUs tests the ParseAV1OBUs method
+func TestParseAV1OBUs(t *testing.T) {
+	t.Run("empty reader", func(t *testing.T) {
+		sample := &BaseSample{}
+		mem := gomem.Memory{}
+		reader := mem.NewReader()
+
+		err := sample.ParseAV1OBUs(&reader)
+		if err != nil {
+			t.Errorf("Expected no error for empty reader, got: %v", err)
+		}
+	})
+
+	t.Run("single OBU - Sequence Header", func(t *testing.T) {
+		sample := &BaseSample{}
+
+		// Create a simple AV1 OBU (Sequence Header)
+		// OBU Header: type=1 (SEQUENCE_HEADER), extension_flag=0, has_size_field=1
+		obuHeader := byte(0b00001010) // type=1, has_size=1
+		obuSize := byte(4)            // Size of OBU payload
+		payload := []byte{0x08, 0x0C, 0x00, 0x00}
+
+		mem := gomem.Memory{}
+		mem.PushOne([]byte{obuHeader, obuSize})
+		mem.PushOne(payload)
+
+		reader := mem.NewReader()
+		err := sample.ParseAV1OBUs(&reader)
+		if err != nil {
+			t.Errorf("ParseAV1OBUs failed: %v", err)
+		}
+
+		nalus := sample.Raw.(*Nalus)
+		if nalus.Count() != 1 {
+			t.Errorf("Expected 1 OBU, got %d", nalus.Count())
+		}
+	})
+
+	t.Run("multiple OBUs", func(t *testing.T) {
+		sample := &BaseSample{}
+
+		mem := gomem.Memory{}
+
+		// First OBU - Temporal Delimiter
+		obuHeader1 := byte(0b00010010) // type=2 (TEMPORAL_DELIMITER), has_size=1
+		obuSize1 := byte(0)
+		mem.PushOne([]byte{obuHeader1, obuSize1})
+
+		// Second OBU - Frame Header with some payload
+		obuHeader2 := byte(0b00011010) // type=3 (FRAME_HEADER), has_size=1
+		obuSize2 := byte(3)
+		payload2 := []byte{0x01, 0x02, 0x03}
+		mem.PushOne([]byte{obuHeader2, obuSize2})
+		mem.PushOne(payload2)
+
+		reader := mem.NewReader()
+		err := sample.ParseAV1OBUs(&reader)
+		if err != nil {
+			t.Errorf("ParseAV1OBUs failed: %v", err)
+		}
+
+		nalus := sample.Raw.(*Nalus)
+		if nalus.Count() != 2 {
+			t.Errorf("Expected 2 OBUs, got %d", nalus.Count())
+		}
+	})
+}
+
+// TestGetOBUs tests the GetOBUs method
+func TestGetOBUs(t *testing.T) {
+	t.Run("initialize empty OBUs", func(t *testing.T) {
+		sample := &BaseSample{}
+		obus := sample.GetOBUs()
+
+		if obus == nil {
+			t.Error("GetOBUs should return non-nil OBUs")
+		}
+
+		if sample.Raw != obus {
+			t.Error("Raw should be set to the returned OBUs")
+		}
+	})
+
+	t.Run("return existing OBUs", func(t *testing.T) {
+		existingOBUs := &OBUs{}
+		sample := &BaseSample{
+			Raw: existingOBUs,
+		}
+
+		obus := sample.GetOBUs()
+		if obus != existingOBUs {
+			t.Error("GetOBUs should return the existing OBUs")
+		}
+	})
+}
+
+// TestAV1OBUTypes tests all AV1 OBU type constants
+func TestAV1OBUTypes(t *testing.T) {
+	tests := []struct {
+		name     string
+		obuType  int
+		expected int
+	}{
+		{"SEQUENCE_HEADER", codec.AV1_OBU_SEQUENCE_HEADER, 1},
+		{"TEMPORAL_DELIMITER", codec.AV1_OBU_TEMPORAL_DELIMITER, 2},
+		{"FRAME_HEADER", codec.AV1_OBU_FRAME_HEADER, 3},
+		{"TILE_GROUP", codec.AV1_OBU_TILE_GROUP, 4},
+		{"METADATA", codec.AV1_OBU_METADATA, 5},
+		{"FRAME", codec.AV1_OBU_FRAME, 6},
+		{"REDUNDANT_FRAME_HEADER", codec.AV1_OBU_REDUNDANT_FRAME_HEADER, 7},
+		{"TILE_LIST", codec.AV1_OBU_TILE_LIST, 8},
+		{"PADDING", codec.AV1_OBU_PADDING, 15},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if tt.obuType != tt.expected {
+				t.Errorf("OBU type %s: expected %d, got %d", tt.name, tt.expected, tt.obuType)
+			}
+		})
+	}
+}
+
+// TestAV1Integration tests the full integration of AV1 codec
+func TestAV1Integration(t *testing.T) {
+	t.Run("create AV1 context and parse OBUs", func(t *testing.T) {
+		// Create AV1 codec context
+		ctx := &codec.AV1Ctx{
+			ConfigOBUs: []byte{0x0A, 0x0B, 0x00},
+		}
+
+		// Verify context properties
+		if ctx.GetInfo() != "AV1" {
+			t.Errorf("Expected 'AV1', got '%s'", ctx.GetInfo())
+		}
+
+		if ctx.FourCC() != codec.FourCC_AV1 {
+			t.Error("FourCC should be AV1")
+		}
+
+		// Create a sample with OBUs
+		sample := &Sample{
+			ICodecCtx:  ctx,
+			BaseSample: &BaseSample{},
+		}
+
+		// Add some OBUs
+		obus := sample.GetOBUs()
+		obu := obus.GetNextPointer()
+		obu.PushOne([]byte{0x0A, 0x01, 0x02, 0x03})
+
+		// Verify OBU count
+		if obus.Count() != 1 {
+			t.Errorf("Expected 1 OBU, got %d", obus.Count())
+		}
+	})
+}
+
+// TestAV1OBUHeaderParsing tests parsing of actual AV1 OBU headers
+func TestAV1OBUHeaderParsing(t *testing.T) {
+	tests := []struct {
+		name       string
+		headerByte byte
+		obuType    uint
+		hasSize    bool
+	}{
+		{
+			name:       "Sequence Header with size",
+			headerByte: 0b00001010, // type=1, has_size=1
+			obuType:    1,
+			hasSize:    true,
+		},
+		{
+			name:       "Frame with size",
+			headerByte: 0b00110010, // type=6, has_size=1
+			obuType:    6,
+			hasSize:    true,
+		},
+		{
+			name:       "Temporal Delimiter with size",
+			headerByte: 0b00010010, // type=2, has_size=1
+			obuType:    2,
+			hasSize:    true,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			var header av1.OBUHeader
+			err := header.Unmarshal([]byte{tt.headerByte})
+			if err != nil {
+				t.Fatalf("Failed to unmarshal OBU header: %v", err)
+			}
+
+			if uint(header.Type) != tt.obuType {
+				t.Errorf("Expected OBU type %d, got %d", tt.obuType, header.Type)
+			}
+
+			if header.HasSize != tt.hasSize {
+				t.Errorf("Expected HasSize %v, got %v", tt.hasSize, header.HasSize)
+			}
+		})
+	}
+}
+
+// BenchmarkParseAV1OBUs benchmarks the OBU parsing performance
+func BenchmarkParseAV1OBUs(b *testing.B) {
+	// Prepare test data
+	mem := gomem.Memory{}
+	for i := 0; i < 10; i++ {
+		obuHeader := byte(0b00110010) // Frame OBU
+		obuSize := byte(10)
+		payload := make([]byte, 10)
+		for j := range payload {
+			payload[j] = byte(j)
+		}
+		mem.PushOne([]byte{obuHeader, obuSize})
+		mem.PushOne(payload)
+	}
+
+	b.ResetTimer()
+	for i := 0; i < b.N; i++ {
+		sample := &BaseSample{}
+		reader := mem.NewReader()
+		_ = sample.ParseAV1OBUs(&reader)
+	}
+}
+
+// TestOBUsReuseArray tests the reuse array functionality with OBUs
+func TestOBUsReuseArray(t *testing.T) {
+	t.Run("reuse OBU memory", func(t *testing.T) {
+		obus := &OBUs{}
+
+		// First allocation
+		obu1 := obus.GetNextPointer()
+		obu1.PushOne([]byte{1, 2, 3})
+
+		if obus.Count() != 1 {
+			t.Errorf("Expected count 1, got %d", obus.Count())
+		}
+
+		// Second allocation
+		obu2 := obus.GetNextPointer()
+		obu2.PushOne([]byte{4, 5, 6})
+
+		if obus.Count() != 2 {
+			t.Errorf("Expected count 2, got %d", obus.Count())
+		}
+
+		// Reset and reuse
+		obus.Reset()
+		if obus.Count() != 0 {
+			t.Errorf("Expected count 0 after reset, got %d", obus.Count())
+		}
+
+		// Reuse memory
+		obu3 := obus.GetNextPointer()
+		obu3.PushOne([]byte{7, 8, 9})
+
+		if obus.Count() != 1 {
+			t.Errorf("Expected count 1 after reuse, got %d", obus.Count())
+		}
+	})
+}

pkg/av_reader.go

@@ -5,9 +5,9 @@ import (
 	"log/slog"
 	"time"
 
+	"github.com/langhuihui/gotask"
 	"m7s.live/v5/pkg/codec"
 	"m7s.live/v5/pkg/config"
-	"m7s.live/v5/pkg/task"
 )
 
 const (

pkg/avframe.go

@@ -5,6 +5,7 @@ import (
 	"time"
 
 	"github.com/bluenviron/mediacommon/pkg/codecs/av1"
+	"github.com/langhuihui/gomem"
 	"m7s.live/v5/pkg/codec"
 	"m7s.live/v5/pkg/util"
 )
@@ -43,14 +44,14 @@ type (
 	}
 	Sample struct {
 		codec.ICodecCtx
-		util.RecyclableMemory
+		gomem.RecyclableMemory
 		*BaseSample
 	}
-	Nalus = util.ReuseArray[util.Memory]
+	Nalus = util.ReuseArray[gomem.Memory]
 
-	AudioData = util.Memory
+	AudioData = gomem.Memory
 
-	OBUs AudioData
+	OBUs = util.ReuseArray[gomem.Memory]
 
 	AVFrame struct {
 		DataFrame
@@ -147,6 +148,13 @@ func (b *BaseSample) GetNalus() *Nalus {
 	return b.Raw.(*Nalus)
 }
 
+func (b *BaseSample) GetOBUs() *OBUs {
+	if b.Raw == nil {
+		b.Raw = &OBUs{}
+	}
+	return b.Raw.(*OBUs)
+}
+
 func (b *BaseSample) GetAudioData() *AudioData {
 	if b.Raw == nil {
 		b.Raw = &AudioData{}
@@ -154,7 +162,7 @@ func (b *BaseSample) GetAudioData() *AudioData {
 	return b.Raw.(*AudioData)
 }
 
-func (b *BaseSample) ParseAVCC(reader *util.MemoryReader, naluSizeLen int) error {
+func (b *BaseSample) ParseAVCC(reader *gomem.MemoryReader, naluSizeLen int) error {
 	array := b.GetNalus()
 	for reader.Length > 0 {
 		l, err := reader.ReadBE(naluSizeLen)
@@ -202,39 +210,31 @@ func (df *DataFrame) Ready() {
 	df.Unlock()
 }
 
-func (obus *OBUs) ParseAVCC(reader *util.MemoryReader) error {
+func (b *BaseSample) ParseAV1OBUs(reader *gomem.MemoryReader) error {
 	var obuHeader av1.OBUHeader
 	startLen := reader.Length
 	for reader.Length > 0 {
 		offset := reader.Size - reader.Length
-		b, err := reader.ReadByte()
+		b0, err := reader.ReadByte()
 		if err != nil {
 			return err
 		}
-		err = obuHeader.Unmarshal([]byte{b})
+		err = obuHeader.Unmarshal([]byte{b0})
 		if err != nil {
 			return err
 		}
 		// if log.Trace {
-		// 	vt.Trace("obu", zap.Any("type", obuHeader.Type), zap.Bool("iframe", vt.Value.IFrame))
+		//     vt.Trace("obu", zap.Any("type", obuHeader.Type), zap.Bool("iframe", vt.Value.IFrame))
 		// }
 		obuSize, _, _ := reader.LEB128Unmarshal()
 		end := reader.Size - reader.Length
 		size := end - offset + int(obuSize)
-		reader = &util.MemoryReader{Memory: reader.Memory, Length: startLen - offset}
+		reader = &gomem.MemoryReader{Memory: reader.Memory, Length: startLen - offset}
 		obu, err := reader.ReadBytes(size)
 		if err != nil {
 			return err
 		}
-		(*AudioData)(obus).PushOne(obu)
+		b.GetNalus().GetNextPointer().PushOne(obu)
 	}
 	return nil
 }
-
-func (obus *OBUs) Reset() {
-	((*util.Memory)(obus)).Reset()
-}
-
-func (obus *OBUs) Count() int {
-	return (*util.Memory)(obus).Count()
-}

pkg/codec/av1_test.go

@@ -0,0 +1,187 @@
+package codec
+
+import (
+	"testing"
+)
+
+func TestAV1Ctx_GetInfo(t *testing.T) {
+	ctx := &AV1Ctx{
+		ConfigOBUs: []byte{0x0A, 0x0B, 0x00},
+	}
+
+	info := ctx.GetInfo()
+	if info != "AV1" {
+		t.Errorf("Expected 'AV1', got '%s'", info)
+	}
+}
+
+func TestAV1Ctx_GetBase(t *testing.T) {
+	ctx := &AV1Ctx{
+		ConfigOBUs: []byte{0x0A, 0x0B, 0x00},
+	}
+
+	base := ctx.GetBase()
+	if base != ctx {
+		t.Error("GetBase should return itself")
+	}
+}
+
+func TestAV1Ctx_Width(t *testing.T) {
+	ctx := &AV1Ctx{
+		ConfigOBUs: []byte{0x0A, 0x0B, 0x00},
+	}
+
+	width := ctx.Width()
+	if width != 0 {
+		t.Errorf("Expected width 0, got %d", width)
+	}
+}
+
+func TestAV1Ctx_Height(t *testing.T) {
+	ctx := &AV1Ctx{
+		ConfigOBUs: []byte{0x0A, 0x0B, 0x00},
+	}
+
+	height := ctx.Height()
+	if height != 0 {
+		t.Errorf("Expected height 0, got %d", height)
+	}
+}
+
+func TestAV1Ctx_FourCC(t *testing.T) {
+	ctx := &AV1Ctx{}
+
+	fourcc := ctx.FourCC()
+	expected := FourCC_AV1
+	if fourcc != expected {
+		t.Errorf("Expected %v, got %v", expected, fourcc)
+	}
+
+	// Verify the actual FourCC string
+	if fourcc.String() != "av01" {
+		t.Errorf("Expected 'av01', got '%s'", fourcc.String())
+	}
+}
+
+func TestAV1Ctx_GetRecord(t *testing.T) {
+	configOBUs := []byte{0x0A, 0x0B, 0x00, 0x01, 0x02}
+	ctx := &AV1Ctx{
+		ConfigOBUs: configOBUs,
+	}
+
+	record := ctx.GetRecord()
+	if len(record) != len(configOBUs) {
+		t.Errorf("Expected record length %d, got %d", len(configOBUs), len(record))
+	}
+
+	for i, b := range record {
+		if b != configOBUs[i] {
+			t.Errorf("Byte mismatch at index %d: expected %02X, got %02X", i, configOBUs[i], b)
+		}
+	}
+}
+
+func TestAV1Ctx_String(t *testing.T) {
+	tests := []struct {
+		name       string
+		configOBUs []byte
+		expected   string
+	}{
+		{
+			name:       "Standard config",
+			configOBUs: []byte{0x0A, 0x0B, 0x00},
+			expected:   "av01.0A0B00",
+		},
+		{
+			name:       "Different config",
+			configOBUs: []byte{0x08, 0x0C, 0x00},
+			expected:   "av01.080C00",
+		},
+		{
+			name:       "High profile config",
+			configOBUs: []byte{0x0C, 0x10, 0x00},
+			expected:   "av01.0C1000",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			ctx := &AV1Ctx{
+				ConfigOBUs: tt.configOBUs,
+			}
+
+			result := ctx.String()
+			if result != tt.expected {
+				t.Errorf("Expected '%s', got '%s'", tt.expected, result)
+			}
+		})
+	}
+}
+
+func TestAV1Ctx_EmptyConfigOBUs(t *testing.T) {
+	ctx := &AV1Ctx{
+		ConfigOBUs: []byte{},
+	}
+
+	// Should not panic when calling methods with empty ConfigOBUs
+	defer func() {
+		if r := recover(); r != nil {
+			t.Errorf("Panic occurred with empty ConfigOBUs: %v", r)
+		}
+	}()
+
+	_ = ctx.GetInfo()
+	_ = ctx.GetBase()
+	_ = ctx.FourCC()
+	_ = ctx.GetRecord()
+	// Note: String() will panic with empty ConfigOBUs due to array indexing
+}
+
+func TestAV1Ctx_NilConfigOBUs(t *testing.T) {
+	ctx := &AV1Ctx{
+		ConfigOBUs: nil,
+	}
+
+	// Should not panic for most methods
+	defer func() {
+		if r := recover(); r != nil {
+			t.Errorf("Panic occurred with nil ConfigOBUs: %v", r)
+		}
+	}()
+
+	_ = ctx.GetInfo()
+	_ = ctx.GetBase()
+	_ = ctx.FourCC()
+
+	record := ctx.GetRecord()
+	if record != nil {
+		t.Error("Expected nil record for nil ConfigOBUs")
+	}
+}
+
+// Test AV1 OBU Type Constants
+func TestAV1_OBUTypeConstants(t *testing.T) {
+	tests := []struct {
+		name     string
+		obuType  int
+		expected int
+	}{
+		{"SEQUENCE_HEADER", AV1_OBU_SEQUENCE_HEADER, 1},
+		{"TEMPORAL_DELIMITER", AV1_OBU_TEMPORAL_DELIMITER, 2},
+		{"FRAME_HEADER", AV1_OBU_FRAME_HEADER, 3},
+		{"TILE_GROUP", AV1_OBU_TILE_GROUP, 4},
+		{"METADATA", AV1_OBU_METADATA, 5},
+		{"FRAME", AV1_OBU_FRAME, 6},
+		{"REDUNDANT_FRAME_HEADER", AV1_OBU_REDUNDANT_FRAME_HEADER, 7},
+		{"TILE_LIST", AV1_OBU_TILE_LIST, 8},
+		{"PADDING", AV1_OBU_PADDING, 15},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if tt.obuType != tt.expected {
+				t.Errorf("Expected OBU type %d, got %d", tt.expected, tt.obuType)
+			}
+		})
+	}
+}

pkg/config/config.go

@@ -1,10 +1,103 @@
+/*
+Package config provides a flexible, multi-source configuration system with priority-based value resolution.
+
+## Overview
+
+The config package implements a hierarchical configuration system that allows values to be set from
+multiple sources with a defined priority order. This enables powerful features like:
+- Environment variable overrides
+- Dynamic runtime modifications
+- Global and per-instance defaults
+- Type-safe configuration using Go structs
+
+## Configuration Priority
+
+The system resolves values using the following priority order (highest to lowest):
+ 1. Modify  - Dynamic runtime modifications
+ 2. Env     - Environment variables
+ 3. File    - Values from config file
+ 4. defaultYaml - Embedded default YAML configs
+ 5. Global  - Global/shared configuration
+ 6. Default - Struct tag defaults or zero values
+
+## Core Workflow
+
+The configuration resolution follows a 5-step initialization process:
+
+### Step 1: Parse
+- Initialize the configuration tree from Go struct definitions
+- Apply default values using struct tags
+- Build the property map for all exported fields
+- Set up environment variable prefixes
+
+### Step 2: ParseGlobal
+- Apply global/shared configuration values
+- Useful for settings that should be consistent across instances
+
+### Step 3: ParseDefaultYaml
+- Load embedded default YAML configurations
+- Provides sensible defaults without hardcoding in Go
+
+### Step 4: ParseUserFile
+- Read and apply user-provided configuration files
+- Normalizes key names (removes hyphens, underscores, lowercases)
+- Handles both struct mappings and single-value assignments
+
+### Step 5: ParseModifyFile
+- Apply dynamic runtime modifications
+- Tracks changes separately for API purposes
+- Automatically cleans up empty/unchanged values
+
+## Key Features
+
+### Type Conversion
+The unmarshal function handles automatic conversion between different types:
+- Basic types (int, string, bool, etc.)
+- Duration strings with unit validation
+- Regexp patterns
+- Nested structs (with special handling for single non-struct values)
+- Pointers, maps, slices, and arrays
+- Fallback to YAML marshaling for unknown types
+
+### Special Behaviors
+- Single non-struct values are automatically assigned to the first field of struct types
+- Key names are normalized (lowercase, remove hyphens/underscores)
+- Environment variables use underscore-separated uppercase prefixes
+- The "plugin" field is always skipped during parsing
+- Fields with yaml:"-" tag are ignored
+
+## Usage Example
+
+```go
+
+	type Config struct {
+	    Host    string `yaml:"host" default:"localhost"`
+	    Port    int    `yaml:"port" default:"8080"`
+	    Timeout time.Duration `yaml:"timeout" default:"30s"`
+	}
+
+cfg := &Config{}
+var c Config
+c.Parse(cfg)
+// Load from various sources...
+config := c.GetValue().(*Config)
+```
+
+## API Structure
+
+The main types and functions:
+- Config: Core configuration node with value priority tracking
+- Parse: Initialize configuration from struct
+- ParseGlobal/ParseDefaultYaml/ParseUserFile/ParseModifyFile: Load from sources
+- GetValue/GetMap: Retrieve resolved values
+- MarshalJSON: Serialize configuration for API responses
+*/
 package config
 
 import (
 	"encoding/json"
 	"fmt"
 	"log/slog"
-	"maps"
 	"os"
 	"reflect"
 	"regexp"
@@ -17,17 +110,17 @@ import (
 )
 
 type Config struct {
-	Ptr     reflect.Value //指向配置结构体值,优先级：动态修改值>环境变量>配置文件>defaultYaml>全局配置>默认值
-	Modify  any           //动态修改的值
-	Env     any           //环境变量中的值
-	File    any           //配置文件中的值
-	Global  *Config       //全局配置中的值,指针类型
-	Default any           //默认值
+	Ptr     reflect.Value // Points to config struct value, priority: Modify > Env > File > defaultYaml > Global > Default
+	Modify  any           // Dynamic modified value
+	Env     any           // Value from environment variable
+	File    any           // Value from config file
+	Global  *Config       // Value from global config (pointer type)
+	Default any           // Default value
 	Enum    []struct {
 		Label string `json:"label"`
 		Value any    `json:"value"`
 	}
-	name     string // 小写
+	name     string // Lowercase key name
 	propsMap map[string]*Config
 	props    []*Config
 	tag      reflect.StructTag
@@ -103,7 +196,7 @@ func (config *Config) GetValue() any {
 	return config.Ptr.Interface()
 }
 
-// Parse 第一步读取配置结构体的默认值
+// Parse step 1: Read default values from config struct
 func (config *Config) Parse(s any, prefix ...string) {
 	var t reflect.Type
 	var v reflect.Value
@@ -124,15 +217,14 @@ func (config *Config) Parse(s any, prefix ...string) {
 		fmt.Println("parse to ", prefix, config.name, s, "is not valid")
 		return
 	}
-	if l := len(prefix); l > 0 { // 读取环境变量
-		name := strings.ToLower(prefix[l-1])
+	if l := len(prefix); l > 0 { // Read environment variables
 		_, isUnmarshaler := v.Addr().Interface().(yaml.Unmarshaler)
 		tag := config.tag.Get("default")
 		if tag != "" && isUnmarshaler {
-			v.Set(config.assign(name, tag))
+			v.Set(config.assign(tag))
 		}
 		if envValue := os.Getenv(strings.Join(prefix, "_")); envValue != "" {
-			v.Set(config.assign(name, envValue))
+			v.Set(config.assign(envValue))
 			config.Env = v.Interface()
 		}
 	}
@@ -146,23 +238,23 @@ func (config *Config) Parse(s any, prefix ...string) {
 			}
 			name := strings.ToLower(ft.Name)
 			if name == "plugin" {
-				continue
+				continue // Skip plugin field
 			}
 			if tag := ft.Tag.Get("yaml"); tag != "" {
 				if tag == "-" {
-					continue
+					continue // Skip field if tag is "-"
 				}
-				name, _, _ = strings.Cut(tag, ",")
+				name, _, _ = strings.Cut(tag, ",") // Use yaml tag name, ignore options
 			}
 			prop := config.Get(name)
 
 			prop.tag = ft.Tag
 			if len(prefix) > 0 {
-				prop.Parse(fv, append(prefix, strings.ToUpper(ft.Name))...)
+				prop.Parse(fv, append(prefix, strings.ToUpper(ft.Name))...) // Recursive parse with env prefix
 			} else {
 				prop.Parse(fv)
 			}
-			for _, kv := range strings.Split(ft.Tag.Get("enum"), ",") {
+			for _, kv := range strings.Split(ft.Tag.Get("enum"), ",") { // Parse enum options from tag
 				kvs := strings.Split(kv, ":")
 				if len(kvs) != 2 {
 					continue
@@ -183,7 +275,7 @@ func (config *Config) Parse(s any, prefix ...string) {
 	}
 }
 
-// ParseDefaultYaml 第二步读取全局配置
+// ParseGlobal step 2: Read global config
 func (config *Config) ParseGlobal(g *Config) {
 	config.Global = g
 	if config.propsMap != nil {
@@ -191,11 +283,11 @@ func (config *Config) ParseGlobal(g *Config) {
 			v.ParseGlobal(g.Get(k))
 		}
 	} else {
-		config.Ptr.Set(g.Ptr)
+		config.Ptr.Set(g.Ptr) // If no sub-properties, copy value directly
 	}
 }
 
-// ParseDefaultYaml 第三步读取内嵌默认配置
+// ParseDefaultYaml step 3: Read embedded default config
 func (config *Config) ParseDefaultYaml(defaultYaml map[string]any) {
 	if defaultYaml == nil {
 		return
@@ -207,9 +299,9 @@ func (config *Config) ParseDefaultYaml(defaultYaml map[string]any) {
 					prop.ParseDefaultYaml(v.(map[string]any))
 				}
 			} else {
-				dv := prop.assign(k, v)
+				dv := prop.assign(v)
 				prop.Default = dv.Interface()
-				if prop.Env == nil {
+				if prop.Env == nil { // Only set if no env var override
 					prop.Ptr.Set(dv)
 				}
 			}
@@ -217,15 +309,15 @@ func (config *Config) ParseDefaultYaml(defaultYaml map[string]any) {
 	}
 }
 
-// ParseFile 第四步读取用户配置文件
+// ParseFile step 4: Read user config file
 func (config *Config) ParseUserFile(conf map[string]any) {
 	if conf == nil {
 		return
 	}
 	config.File = conf
 	for k, v := range conf {
-		k = strings.ReplaceAll(k, "-", "")
-		k = strings.ReplaceAll(k, "_", "")
+		k = strings.ReplaceAll(k, "-", "") // Normalize key name: remove hyphens
+		k = strings.ReplaceAll(k, "_", "") // Normalize key name: remove underscores
 		k = strings.ToLower(k)
 		if config.Has(k) {
 			if prop := config.Get(k); prop.props != nil {
@@ -234,18 +326,19 @@ func (config *Config) ParseUserFile(conf map[string]any) {
 					case map[string]any:
 						prop.ParseUserFile(vv)
 					default:
+						// If the value is not a map (single non-struct value), assign it to the first field
 						prop.props[0].Ptr.Set(reflect.ValueOf(v))
 					}
 				}
 			} else {
-				fv := prop.assign(k, v)
+				fv := prop.assign(v)
 				if fv.IsValid() {
 					prop.File = fv.Interface()
-					if prop.Env == nil {
+					if prop.Env == nil { // Only set if no env var override
 						prop.Ptr.Set(fv)
 					}
 				} else {
-					// continue invalid field
+					// Continue with invalid field
 					slog.Error("Attempted to access invalid field during config parsing: %s", v)
 				}
 			}
@@ -253,7 +346,7 @@ func (config *Config) ParseUserFile(conf map[string]any) {
 	}
 }
 
-// ParseModifyFile 第五步读取动态修改配置文件
+// ParseModifyFile step 5: Read dynamic modified config
 func (config *Config) ParseModifyFile(conf map[string]any) {
 	if conf == nil {
 		return
@@ -265,15 +358,15 @@ func (config *Config) ParseModifyFile(conf map[string]any) {
 				if v != nil {
 					vmap := v.(map[string]any)
 					prop.ParseModifyFile(vmap)
-					if len(vmap) == 0 {
+					if len(vmap) == 0 { // Remove empty map
 						delete(conf, k)
 					}
 				}
 			} else {
-				mv := prop.assign(k, v)
+				mv := prop.assign(v)
 				v = mv.Interface()
-				vwm := prop.valueWithoutModify()
-				if equal(vwm, v) {
+				vwm := prop.valueWithoutModify() // Get value without modify
+				if equal(vwm, v) {               // No change, remove from modify
 					delete(conf, k)
 					if prop.Modify != nil {
 						prop.Modify = nil
@@ -286,12 +379,13 @@ func (config *Config) ParseModifyFile(conf map[string]any) {
 			}
 		}
 	}
-	if len(conf) == 0 {
+	if len(conf) == 0 { // Clear modify if empty
 		config.Modify = nil
 	}
 }
 
 func (config *Config) valueWithoutModify() any {
+	// Return value with priority: Env > File > Global > Default (excluding Modify)
 	if config.Env != nil {
 		return config.Env
 	}
@@ -318,13 +412,14 @@ func equal(vwm, v any) bool {
 }
 
 func (config *Config) GetMap() map[string]any {
+	// Convert config tree to map representation
 	m := make(map[string]any)
 	for k, v := range config.propsMap {
-		if v.props != nil {
+		if v.props != nil { // Has sub-properties
 			if vv := v.GetMap(); vv != nil {
 				m[k] = vv
 			}
-		} else if v.GetValue() != nil {
+		} else if v.GetValue() != nil { // Leaf value
 			m[k] = v.GetValue()
 		}
 	}
@@ -338,6 +433,7 @@ var regexPureNumber = regexp.MustCompile(`^\d+$`)
 
 func unmarshal(ft reflect.Type, v any) (target reflect.Value) {
 	source := reflect.ValueOf(v)
+	// Fast path: directly return if both are basic types
 	for _, t := range basicTypes {
 		if source.Kind() == t && ft.Kind() == t {
 			return source
@@ -352,6 +448,7 @@ func unmarshal(ft reflect.Type, v any) (target reflect.Value) {
 			target.SetInt(0)
 		} else {
 			timeStr := source.String()
+			// Parse duration string, but reject pure numbers (must have unit)
 			if d, err := time.ParseDuration(timeStr); err == nil && !regexPureNumber.MatchString(timeStr) {
 				target.SetInt(int64(d))
 			} else {
@@ -365,10 +462,13 @@ func unmarshal(ft reflect.Type, v any) (target reflect.Value) {
 		target.Set(reflect.ValueOf(Regexp{regexp.MustCompile(regexpStr)}))
 	default:
 		switch ft.Kind() {
+		case reflect.Pointer:
+			return unmarshal(ft.Elem(), v).Addr() // Recurse to element type
 		case reflect.Struct:
 			newStruct := reflect.New(ft)
 			defaults.SetDefaults(newStruct.Interface())
 			if value, ok := v.(map[string]any); ok {
+				// If the value is a map, unmarshal each field by matching keys
 				for i := 0; i < ft.NumField(); i++ {
 					key := strings.ToLower(ft.Field(i).Name)
 					if vv, ok := value[key]; ok {
@@ -376,6 +476,7 @@ func unmarshal(ft reflect.Type, v any) (target reflect.Value) {
 					}
 				}
 			} else {
+				// If the value is not a map (single non-struct value), assign it to the first field
 				newStruct.Elem().Field(0).Set(unmarshal(ft.Field(0).Type, v))
 			}
 			return newStruct.Elem()
@@ -383,6 +484,7 @@ func unmarshal(ft reflect.Type, v any) (target reflect.Value) {
 			if v != nil {
 				target = reflect.MakeMap(ft)
 				for k, v := range v.(map[string]any) {
+					// Unmarshal key and value recursively
 					target.SetMapIndex(unmarshal(ft.Key(), k), unmarshal(ft.Elem(), v))
 				}
 			}
@@ -391,11 +493,12 @@ func unmarshal(ft reflect.Type, v any) (target reflect.Value) {
 				s := v.([]any)
 				target = reflect.MakeSlice(ft, len(s), len(s))
 				for i, v := range s {
-					target.Index(i).Set(unmarshal(ft.Elem(), v))
+					target.Index(i).Set(unmarshal(ft.Elem(), v)) // Unmarshal each element
 				}
 			}
 		default:
 			if v != nil {
+				// For unknown types, use YAML marshal/unmarshal as fallback
 				var out []byte
 				var err error
 				if vv, ok := v.(string); ok {
@@ -406,6 +509,7 @@ func unmarshal(ft reflect.Type, v any) (target reflect.Value) {
 						panic(err)
 					}
 				}
+				// Create temporary struct with single Value field
 				tmpValue := reflect.New(reflect.StructOf([]reflect.StructField{
 					{
 						Name: "Value",
@@ -423,12 +527,13 @@ func unmarshal(ft reflect.Type, v any) (target reflect.Value) {
 	return
 }
 
-func (config *Config) assign(k string, v any) reflect.Value {
+func (config *Config) assign(v any) reflect.Value {
+	// Convert value to the same type as Ptr
 	return unmarshal(config.Ptr.Type(), v)
 }
 
 func Parse(target any, conf map[string]any) {
 	var c Config
 	c.Parse(target)
-	c.ParseModifyFile(maps.Clone(conf))
+	c.ParseModifyFile(conf)
 }

pkg/config/quic.go

@@ -5,8 +5,8 @@ import (
 	"crypto/tls"
 	"log/slog"
 
+	"github.com/langhuihui/gotask"
 	"github.com/quic-go/quic-go"
-	"m7s.live/v5/pkg/task"
 )
 
 type QuicConfig interface {

pkg/config/tcp.go

@@ -8,7 +8,7 @@ import (
 	"runtime"
 	"time"
 
-	"m7s.live/v5/pkg/task"
+	"github.com/langhuihui/gotask"
 )
 
 //go:embed local.monibuca.com_bundle.pem

pkg/config/types.go

@@ -60,7 +60,8 @@ type (
 	EventLevel = string
 	RecordMode = string
 	HookType   = string
-	Publish    struct {
+
+	Publish struct {
 		MaxCount          int             `default:"0" desc:"最大发布者数量"` // 最大发布者数量
 		PubAudio          bool            `default:"true" desc:"是否发布音频"`
 		PubVideo          bool            `default:"true" desc:"是否发布视频"`
@@ -121,13 +122,15 @@ type (
 		EventName      string     `json:"eventName" desc:"事件名称" gorm:"type:varchar(255);comment:事件名称"`
 	}
 	Record struct {
-		Mode     RecordMode    `json:"mode" desc:"事件类型,auto=连续录像模式，event=事件录像模式" gorm:"type:varchar(255);comment:事件类型,auto=连续录像模式，event=事件录像模式;default:'auto'"`
-		Type     string        `desc:"录制类型"`                         // 录制类型 mp4、flv、hls、hlsv7
-		FilePath string        `desc:"录制文件路径"`                       // 录制文件路径
-		Fragment time.Duration `desc:"分片时长"`                         // 分片时长
-		RealTime bool          `desc:"是否实时录制"`                       // 是否实时录制
-		Append   bool          `desc:"是否追加录制"`                       // 是否追加录制
-		Event    *RecordEvent  `json:"event" desc:"事件录像配置" gorm:"-"` // 事件录像配置
+		Mode              RecordMode     `json:"mode" desc:"事件类型,auto=连续录像模式，event=事件录像模式" gorm:"type:varchar(255);comment:事件类型,auto=连续录像模式，event=事件录像模式;default:'auto'"`
+		Type              string         `desc:"录制类型"`                         // 录制类型 mp4、flv、hls、hlsv7
+		FilePath          string         `desc:"录制文件路径"`                       // 录制文件路径
+		Fragment          time.Duration  `desc:"分片时长"`                         // 分片时长
+		RealTime          bool           `desc:"是否实时录制"`                       // 是否实时录制
+		Append            bool           `desc:"是否追加录制"`                       // 是否追加录制
+		Event             *RecordEvent   `json:"event" desc:"事件录像配置" gorm:"-"` // 事件录像配置
+		Storage           map[string]any `json:"storage" desc:"存储配置" gorm:"-"` // 存储配置
+		SecondaryFilePath string         `json:"secondaryFilePath" desc:"录制文件次级路径" gorm:"-"`
 	}
 	TransfromOutput struct {
 		Target     string `desc:"转码目标"` // 转码目标

pkg/config/udp.go

@@ -6,7 +6,7 @@ import (
 	"net"
 	"time"
 
-	"m7s.live/v5/pkg/task"
+	task "github.com/langhuihui/gotask"
 )
 
 type UDP struct {

pkg/format/adts.go

@@ -61,9 +61,7 @@ func (A *Mpeg2Audio) Demux() (err error) {
 }
 
 func (A *Mpeg2Audio) Mux(frame *pkg.Sample) (err error) {
-	if A.ICodecCtx == nil {
-		A.ICodecCtx = frame.GetBase()
-	}
+	A.ICodecCtx = frame.GetBase()
 	raw := frame.Raw.(*pkg.AudioData)
 	aacCtx, ok := A.ICodecCtx.(*codec.AACCtx)
 	if ok {

pkg/format/annexb.go

@@ -8,10 +8,10 @@ import (
 
 	"github.com/deepch/vdk/codec/h264parser"
 	"github.com/deepch/vdk/codec/h265parser"
+	"github.com/langhuihui/gomem"
 
 	"m7s.live/v5/pkg"
 	"m7s.live/v5/pkg/codec"
-	"m7s.live/v5/pkg/util"
 )
 
 type AnnexB struct {
@@ -104,7 +104,7 @@ func (a *AnnexB) Demux() (err error) {
 	nalus := a.GetNalus()
 	var lastFourBytes [4]byte
 	var b byte
-	var shallow util.Memory
+	var shallow gomem.Memory
 	shallow.Push(a.Buffers...)
 	reader := shallow.NewReader()
 	gotNalu := func() {
@@ -161,9 +161,7 @@ func (a *AnnexB) Demux() (err error) {
 }
 
 func (a *AnnexB) Mux(fromBase *pkg.Sample) (err error) {
-	if a.ICodecCtx == nil {
-		a.ICodecCtx = fromBase.GetBase()
-	}
+	a.ICodecCtx = fromBase.GetBase()
 	a.InitRecycleIndexes(0)
 	delimiter2 := codec.NALU_Delimiter2[:]
 	a.PushOne(delimiter2)
@@ -230,7 +228,7 @@ func (a *AnnexB) Parse(reader *pkg.AnnexBReader) (hasFrame bool, err error) {
 					a.ICodecCtx = &codec.H264Ctx{
 						CodecData: codecData,
 					}
-					*nalus = slices.Insert(*nalus, 0, util.NewMemory(ctx.SPS), util.NewMemory(ctx.PPS))
+					*nalus = slices.Insert(*nalus, 0, gomem.NewMemory(ctx.SPS), gomem.NewMemory(ctx.PPS))
 					delimiter2 := codec.NALU_Delimiter2[:]
 					a.Buffers = slices.Insert(a.Buffers, 0, delimiter2, ctx.SPS, delimiter2, ctx.PPS)
 					a.Size += 8 + len(ctx.SPS) + len(ctx.PPS)
@@ -243,7 +241,7 @@ func (a *AnnexB) Parse(reader *pkg.AnnexBReader) (hasFrame bool, err error) {
 					a.ICodecCtx = &codec.H265Ctx{
 						CodecData: codecData,
 					}
-					*nalus = slices.Insert(*nalus, 0, util.NewMemory(ctx.VPS), util.NewMemory(ctx.SPS), util.NewMemory(ctx.PPS))
+					*nalus = slices.Insert(*nalus, 0, gomem.NewMemory(ctx.VPS), gomem.NewMemory(ctx.SPS), gomem.NewMemory(ctx.PPS))
 					delimiter2 := codec.NALU_Delimiter2[:]
 					a.Buffers = slices.Insert(a.Buffers, 0, delimiter2, ctx.VPS, delimiter2, ctx.SPS, delimiter2, ctx.PPS)
 					a.Size += 24 + len(ctx.VPS) + len(ctx.SPS) + len(ctx.PPS)

pkg/format/av1_test.go

@@ -0,0 +1,254 @@
+package format
+
+import (
+	"testing"
+	"time"
+
+	"github.com/langhuihui/gomem"
+	"m7s.live/v5/pkg"
+	"m7s.live/v5/pkg/codec"
+)
+
+func TestAV1Frame_CheckCodecChange(t *testing.T) {
+	// Test with nil codec context - should return error
+	t.Run("nil codec context", func(t *testing.T) {
+		frame := &AV1Frame{}
+		err := frame.CheckCodecChange()
+		if err != pkg.ErrUnsupportCodec {
+			t.Errorf("Expected ErrUnsupportCodec, got %v", err)
+		}
+	})
+
+	// Test with valid AV1 codec context
+	t.Run("valid codec context", func(t *testing.T) {
+		frame := &AV1Frame{
+			Sample: pkg.Sample{
+				ICodecCtx: &codec.AV1Ctx{
+					ConfigOBUs: []byte{0x0A, 0x0B, 0x00},
+				},
+			},
+		}
+		err := frame.CheckCodecChange()
+		if err != nil {
+			t.Errorf("Unexpected error: %v", err)
+		}
+	})
+}
+
+func TestAV1Frame_GetSize(t *testing.T) {
+	t.Run("empty OBUs", func(t *testing.T) {
+		frame := &AV1Frame{
+			Sample: pkg.Sample{
+				BaseSample: &pkg.BaseSample{
+					Raw: &pkg.OBUs{},
+				},
+			},
+		}
+		size := frame.GetSize()
+		if size != 0 {
+			t.Errorf("Expected size 0, got %d", size)
+		}
+	})
+
+	t.Run("with OBUs", func(t *testing.T) {
+		obus := &pkg.OBUs{}
+
+		// Add first OBU
+		obu1 := obus.GetNextPointer()
+		obu1.PushOne([]byte{1, 2, 3, 4})
+
+		// Add second OBU
+		obu2 := obus.GetNextPointer()
+		obu2.PushOne([]byte{5, 6, 7, 8, 9})
+
+		frame := &AV1Frame{
+			Sample: pkg.Sample{
+				BaseSample: &pkg.BaseSample{
+					Raw: obus,
+				},
+			},
+		}
+
+		size := frame.GetSize()
+		expectedSize := 4 + 5 // Total bytes in both OBUs
+		if size != expectedSize {
+			t.Errorf("Expected size %d, got %d", expectedSize, size)
+		}
+	})
+
+	t.Run("non-OBUs raw data", func(t *testing.T) {
+		frame := &AV1Frame{
+			Sample: pkg.Sample{
+				BaseSample: &pkg.BaseSample{
+					Raw: &gomem.Memory{},
+				},
+			},
+		}
+		size := frame.GetSize()
+		if size != 0 {
+			t.Errorf("Expected size 0 for non-OBUs raw data, got %d", size)
+		}
+	})
+}
+
+func TestAV1Frame_Demux(t *testing.T) {
+	mem := gomem.Memory{}
+	mem.PushOne([]byte{1, 2, 3, 4, 5})
+
+	frame := &AV1Frame{
+		Sample: pkg.Sample{
+			RecyclableMemory: gomem.RecyclableMemory{
+				Memory: mem,
+			},
+			BaseSample: &pkg.BaseSample{},
+		},
+	}
+
+	err := frame.Demux()
+	if err != nil {
+		t.Errorf("Unexpected error: %v", err)
+	}
+
+	// After demux, Raw should point to the Memory
+	if frame.Sample.BaseSample.Raw != &frame.Sample.RecyclableMemory.Memory {
+		t.Error("Raw should point to Memory after Demux")
+	}
+}
+
+func TestAV1Frame_Mux(t *testing.T) {
+	// Create source sample with OBUs
+	obus := &pkg.OBUs{}
+
+	obu1 := obus.GetNextPointer()
+	obu1.PushOne([]byte{1, 2, 3})
+
+	obu2 := obus.GetNextPointer()
+	obu2.PushOne([]byte{4, 5, 6, 7})
+
+	ctx := &codec.AV1Ctx{
+		ConfigOBUs: []byte{0x0A, 0x0B, 0x00},
+	}
+
+	sourceSample := &pkg.Sample{
+		ICodecCtx: ctx,
+		BaseSample: &pkg.BaseSample{
+			Raw:       obus,
+			Timestamp: time.Second,
+			CTS:       100 * time.Millisecond,
+		},
+	}
+
+	// Create destination frame
+	destFrame := &AV1Frame{
+		Sample: pkg.Sample{
+			BaseSample: &pkg.BaseSample{},
+		},
+	}
+
+	// Perform mux
+	err := destFrame.Mux(sourceSample)
+	if err != nil {
+		t.Errorf("Unexpected error: %v", err)
+	}
+
+	// Verify codec context is set
+	if destFrame.ICodecCtx != ctx {
+		t.Error("Codec context not set correctly")
+	}
+
+	// Verify data was copied
+	if destFrame.Memory.Size != 7 { // 3 + 4 bytes
+		t.Errorf("Expected memory size 7, got %d", destFrame.Memory.Size)
+	}
+}
+
+func TestAV1Frame_String(t *testing.T) {
+	frame := &AV1Frame{
+		Sample: pkg.Sample{
+			ICodecCtx: &codec.AV1Ctx{
+				ConfigOBUs: []byte{0x0A, 0x0B, 0x00},
+			},
+			BaseSample: &pkg.BaseSample{
+				Timestamp: time.Second,
+				CTS:       100 * time.Millisecond,
+			},
+		},
+	}
+
+	str := frame.String()
+	// Should contain AV1Frame, FourCC, Timestamp, and CTS
+	if len(str) == 0 {
+		t.Error("String() should not return empty string")
+	}
+
+	// The string should contain key information
+	t.Logf("AV1Frame.String() output: %s", str)
+}
+
+func TestAV1Frame_Workflow(t *testing.T) {
+	// Test the complete workflow: create -> demux -> mux
+	t.Run("complete workflow", func(t *testing.T) {
+		// Step 1: Create a frame with sample data
+		mem := gomem.Memory{}
+		mem.PushOne([]byte{1, 2, 3, 4, 5})
+
+		ctx := &codec.AV1Ctx{
+			ConfigOBUs: []byte{0x0A, 0x0B, 0x00},
+		}
+
+		originalFrame := &AV1Frame{
+			Sample: pkg.Sample{
+				ICodecCtx: ctx,
+				RecyclableMemory: gomem.RecyclableMemory{
+					Memory: mem,
+				},
+				BaseSample: &pkg.BaseSample{
+					Timestamp: time.Second,
+					CTS:       100 * time.Millisecond,
+					IDR:       true,
+				},
+			},
+		}
+
+		// Step 2: Demux
+		err := originalFrame.Demux()
+		if err != nil {
+			t.Fatalf("Demux failed: %v", err)
+		}
+
+		// Step 3: Create OBUs for muxing
+		obus := &pkg.OBUs{}
+		obu := obus.GetNextPointer()
+		obu.PushOne([]byte{10, 20, 30})
+
+		sourceSample := &pkg.Sample{
+			ICodecCtx: ctx,
+			BaseSample: &pkg.BaseSample{
+				Raw: obus,
+			},
+		}
+
+		// Step 4: Mux into new frame
+		newFrame := &AV1Frame{
+			Sample: pkg.Sample{
+				BaseSample: &pkg.BaseSample{},
+			},
+		}
+
+		err = newFrame.Mux(sourceSample)
+		if err != nil {
+			t.Fatalf("Mux failed: %v", err)
+		}
+
+		// Step 5: Verify codec context
+		if newFrame.ICodecCtx != ctx {
+			t.Error("Codec context not preserved")
+		}
+
+		// Step 6: Check codec change should not return error
+		err = newFrame.CheckCodecChange()
+		if err != nil {
+			t.Errorf("CheckCodecChange failed: %v", err)
+		}
+	})
+}

pkg/format/ps/mpegps.go

@@ -6,6 +6,7 @@ import (
 	"io"
 	"time"
 
+	"github.com/langhuihui/gomem"
 	"m7s.live/v5"
 	"m7s.live/v5/pkg"
 	"m7s.live/v5/pkg/codec"
@@ -40,13 +41,14 @@ const (
 type MpegPsDemuxer struct {
 	stAudio, stVideo byte
 	Publisher        *m7s.Publisher
-	Allocator        *util.ScalableMemoryAllocator
+	Allocator        *gomem.ScalableMemoryAllocator
 	writer           m7s.PublishWriter[*format.Mpeg2Audio, *format.AnnexB]
+	OnVideoPtsUpdate func(pts uint64) // 视频PTS更新回调
 }
 
 func (s *MpegPsDemuxer) Feed(reader *util.BufReader) (err error) {
 	writer := &s.writer
-	var payload util.Memory
+	var payload gomem.Memory
 	var pesHeader mpegts.MpegPESHeader
 	var lastVideoPts, lastAudioPts uint64
 	var annexbReader pkg.AnnexBReader
@@ -103,6 +105,10 @@ func (s *MpegPsDemuxer) Feed(reader *util.BufReader) (err error) {
 				pes.SetDTS(time.Duration(pesHeader.Dts))
 				pes.SetPTS(time.Duration(pesHeader.Pts))
 				lastVideoPts = pesHeader.Pts
+				// 触发PTS更新回调
+				if s.OnVideoPtsUpdate != nil {
+					s.OnVideoPtsUpdate(pesHeader.Pts)
+				}
 			}
 			annexb := s.Allocator.Malloc(reader.Length)
 			reader.Read(annexb)
@@ -153,7 +159,7 @@ func (s *MpegPsDemuxer) Feed(reader *util.BufReader) (err error) {
 			})
 			// reader.Range(pes.PushOne)
 		case StartCodeMAP:
-			var psm util.Memory
+			var psm gomem.Memory
 			psm, err = s.ReadPayload(reader)
 			if err != nil {
 				return errors.Join(err, fmt.Errorf("failed to read program stream map"))
@@ -172,7 +178,7 @@ func (s *MpegPsDemuxer) Feed(reader *util.BufReader) (err error) {
 	}
 }
 
-func (s *MpegPsDemuxer) ReadPayload(reader *util.BufReader) (payload util.Memory, err error) {
+func (s *MpegPsDemuxer) ReadPayload(reader *util.BufReader) (payload gomem.Memory, err error) {
 	payloadlen, err := reader.ReadBE(2)
 	if err != nil {
 		return
@@ -180,7 +186,7 @@ func (s *MpegPsDemuxer) ReadPayload(reader *util.BufReader) (payload util.Memory
 	return reader.ReadBytes(payloadlen)
 }
 
-func (s *MpegPsDemuxer) decProgramStreamMap(psm util.Memory) (err error) {
+func (s *MpegPsDemuxer) decProgramStreamMap(psm gomem.Memory) (err error) {
 	var programStreamInfoLen, programStreamMapLen, elementaryStreamInfoLength uint32
 	var streamType, elementaryStreamID byte
 	reader := psm.NewReader()
@@ -206,7 +212,7 @@ func (s *MpegPsDemuxer) decProgramStreamMap(psm util.Memory) (err error) {
 
 type MpegPSMuxer struct {
 	*m7s.Subscriber
-	Packet *util.RecyclableMemory
+	Packet *gomem.RecyclableMemory
 }
 
 func (muxer *MpegPSMuxer) Mux(onPacket func() error) {

pkg/format/ps/mpegps_test.go

@@ -5,6 +5,7 @@ import (
 	"io"
 	"testing"
 
+	"github.com/langhuihui/gomem"
 	"m7s.live/v5/pkg/util"
 )
 
@@ -258,7 +259,7 @@ func TestMpegPSMuxerBasic(t *testing.T) {
 	t.Run("PESGeneration", func(t *testing.T) {
 		// Create a test that simulates PES packet generation
 		// without requiring a full subscriber setup
-		
+
 		// Create test payload
 		testPayload := make([]byte, 5000)
 		for i := range testPayload {
@@ -273,11 +274,11 @@ func TestMpegPSMuxerBasic(t *testing.T) {
 		pesFrame.Dts = 90000
 
 		// Create allocator for testing
-		allocator := util.NewScalableMemoryAllocator(1024*1024)
-		packet := util.NewRecyclableMemory(allocator)
+		allocator := gomem.NewScalableMemoryAllocator(1024 * 1024)
+		packet := gomem.NewRecyclableMemory(allocator)
 
 		// Write PES packet
-		err := pesFrame.WritePESPacket(util.NewMemory(testPayload), &packet)
+		err := pesFrame.WritePESPacket(gomem.NewMemory(testPayload), &packet)
 		if err != nil {
 			t.Fatalf("WritePESPacket failed: %v", err)
 		}
@@ -298,7 +299,7 @@ func TestMpegPSMuxerBasic(t *testing.T) {
 
 		// Test reading back the packet
 		reader := util.NewBufReader(bytes.NewReader(packetData))
-		
+
 		// Skip PS header
 		code, err := reader.ReadBE32(4)
 		if err != nil {
@@ -324,7 +325,7 @@ func TestMpegPSMuxerBasic(t *testing.T) {
 		// Read PES packets directly by parsing the PES structure
 		totalPayloadSize := 0
 		packetCount := 0
-		
+
 		for reader.Buffered() > 0 {
 			// Read PES packet start code (0x00000100 + stream_id)
 			pesStartCode, err := reader.ReadBE32(4)
@@ -334,46 +335,46 @@ func TestMpegPSMuxerBasic(t *testing.T) {
 				}
 				t.Fatalf("Failed to read PES start code: %v", err)
 			}
-			
+
 			// Check if it's a PES packet (starts with 0x000001)
 			if pesStartCode&0xFFFFFF00 != 0x00000100 {
 				t.Errorf("Invalid PES start code: %x", pesStartCode)
 				break
 			}
-			
+
 			// // streamID := byte(pesStartCode & 0xFF)
 			t.Logf("PES packet %d: stream_id=0x%02x", packetCount+1, pesStartCode&0xFF)
-			
+
 			// Read PES packet length
 			pesLength, err := reader.ReadBE(2)
 			if err != nil {
 				t.Fatalf("Failed to read PES length: %v", err)
 			}
-			
+
 			// Read PES header
 			// Skip the first byte (flags)
 			_, err = reader.ReadByte()
 			if err != nil {
 				t.Fatalf("Failed to read PES flags1: %v", err)
 			}
-			
+
 			// Skip the second byte (flags)
 			_, err = reader.ReadByte()
 			if err != nil {
 				t.Fatalf("Failed to read PES flags2: %v", err)
 			}
-			
+
 			// Read header data length
 			headerDataLength, err := reader.ReadByte()
 			if err != nil {
 				t.Fatalf("Failed to read PES header data length: %v", err)
 			}
-			
+
 			// Skip header data
 			if err = reader.Skip(int(headerDataLength)); err != nil {
 				t.Fatalf("Failed to skip PES header data: %v", err)
 			}
-			
+
 			// Calculate payload size
 			payloadSize := pesLength - 3 - int(headerDataLength) // 3 = flags1 + flags2 + headerDataLength
 			if payloadSize > 0 {
@@ -382,11 +383,11 @@ func TestMpegPSMuxerBasic(t *testing.T) {
 				if err != nil {
 					t.Fatalf("Failed to read PES payload: %v", err)
 				}
-				
+
 				totalPayloadSize += payload.Size
 				t.Logf("PES packet %d: %d bytes payload", packetCount+1, payload.Size)
 			}
-			
+
 			packetCount++
 		}
 
@@ -416,11 +417,11 @@ func TestPESPacketWriteRead(t *testing.T) {
 		pesFrame.Dts = 90000
 
 		// Create allocator for testing
-		allocator := util.NewScalableMemoryAllocator(1024)
-		packet := util.NewRecyclableMemory(allocator)
+		allocator := gomem.NewScalableMemoryAllocator(1024)
+		packet := gomem.NewRecyclableMemory(allocator)
 
 		// Write PES packet
-		err := pesFrame.WritePESPacket(util.NewMemory(testPayload), &packet)
+		err := pesFrame.WritePESPacket(gomem.NewMemory(testPayload), &packet)
 		if err != nil {
 			t.Fatalf("WritePESPacket failed: %v", err)
 		}
@@ -467,7 +468,7 @@ func TestPESPacketWriteRead(t *testing.T) {
 		// Read PES packet directly by parsing the PES structure
 		totalPayloadSize := 0
 		packetCount := 0
-		
+
 		for reader.Buffered() > 0 {
 			// Read PES packet start code (0x00000100 + stream_id)
 			pesStartCode, err := reader.ReadBE32(4)
@@ -477,46 +478,46 @@ func TestPESPacketWriteRead(t *testing.T) {
 				}
 				t.Fatalf("Failed to read PES start code: %v", err)
 			}
-			
+
 			// Check if it's a PES packet (starts with 0x000001)
 			if pesStartCode&0xFFFFFF00 != 0x00000100 {
 				t.Errorf("Invalid PES start code: %x", pesStartCode)
 				break
 			}
-			
+
 			// // streamID := byte(pesStartCode & 0xFF)
 			t.Logf("PES packet %d: stream_id=0x%02x", packetCount+1, pesStartCode&0xFF)
-			
+
 			// Read PES packet length
 			pesLength, err := reader.ReadBE(2)
 			if err != nil {
 				t.Fatalf("Failed to read PES length: %v", err)
 			}
-			
+
 			// Read PES header
 			// Skip the first byte (flags)
 			_, err = reader.ReadByte()
 			if err != nil {
 				t.Fatalf("Failed to read PES flags1: %v", err)
 			}
-			
+
 			// Skip the second byte (flags)
 			_, err = reader.ReadByte()
 			if err != nil {
 				t.Fatalf("Failed to read PES flags2: %v", err)
 			}
-			
+
 			// Read header data length
 			headerDataLength, err := reader.ReadByte()
 			if err != nil {
 				t.Fatalf("Failed to read PES header data length: %v", err)
 			}
-			
+
 			// Skip header data
 			if err = reader.Skip(int(headerDataLength)); err != nil {
 				t.Fatalf("Failed to skip PES header data: %v", err)
 			}
-			
+
 			// Calculate payload size
 			payloadSize := pesLength - 3 - int(headerDataLength) // 3 = flags1 + flags2 + headerDataLength
 			if payloadSize > 0 {
@@ -525,11 +526,11 @@ func TestPESPacketWriteRead(t *testing.T) {
 				if err != nil {
 					t.Fatalf("Failed to read PES payload: %v", err)
 				}
-				
+
 				totalPayloadSize += payload.Size
 				t.Logf("PES packet %d: %d bytes payload", packetCount+1, payload.Size)
 			}
-			
+
 			packetCount++
 		}
 
@@ -564,12 +565,12 @@ func TestLargePESPacket(t *testing.T) {
 		pesFrame.Dts = 180000
 
 		// Create allocator for testing
-		allocator := util.NewScalableMemoryAllocator(1024*1024) // 1MB allocator
-		packet := util.NewRecyclableMemory(allocator)
+		allocator := gomem.NewScalableMemoryAllocator(1024 * 1024) // 1MB allocator
+		packet := gomem.NewRecyclableMemory(allocator)
 
 		// Write large PES packet
 		t.Logf("Writing large PES packet with %d bytes payload", len(largePayload))
-		err := pesFrame.WritePESPacket(util.NewMemory(largePayload), &packet)
+		err := pesFrame.WritePESPacket(gomem.NewMemory(largePayload), &packet)
 		if err != nil {
 			t.Fatalf("WritePESPacket failed for large payload: %v", err)
 		}
@@ -590,7 +591,7 @@ func TestLargePESPacket(t *testing.T) {
 		// Count number of PES packets (should be multiple due to size limitation)
 		pesCount := 0
 		reader := util.NewBufReader(bytes.NewReader(packetData))
-		
+
 		// Skip PS header
 		code, err := reader.ReadBE32(4)
 		if err != nil {
@@ -615,7 +616,7 @@ func TestLargePESPacket(t *testing.T) {
 
 		// Read and count PES packets
 		totalPayloadSize := 0
-		
+
 		for reader.Buffered() > 0 {
 			// Read PES packet start code (0x00000100 + stream_id)
 			pesStartCode, err := reader.ReadBE32(4)
@@ -625,45 +626,45 @@ func TestLargePESPacket(t *testing.T) {
 				}
 				t.Fatalf("Failed to read PES start code: %v", err)
 			}
-			
+
 			// Check if it's a PES packet (starts with 0x000001)
 			if pesStartCode&0xFFFFFF00 != 0x00000100 {
 				t.Errorf("Invalid PES start code: %x", pesStartCode)
 				break
 			}
-			
+
 			// streamID := byte(pesStartCode & 0xFF)
-			
+
 			// Read PES packet length
 			pesLength, err := reader.ReadBE(2)
 			if err != nil {
 				t.Fatalf("Failed to read PES length: %v", err)
 			}
-			
+
 			// Read PES header
 			// Skip the first byte (flags)
 			_, err = reader.ReadByte()
 			if err != nil {
 				t.Fatalf("Failed to read PES flags1: %v", err)
 			}
-			
+
 			// Skip the second byte (flags)
 			_, err = reader.ReadByte()
 			if err != nil {
 				t.Fatalf("Failed to read PES flags2: %v", err)
 			}
-			
+
 			// Read header data length
 			headerDataLength, err := reader.ReadByte()
 			if err != nil {
 				t.Fatalf("Failed to read PES header data length: %v", err)
 			}
-			
+
 			// Skip header data
 			if err = reader.Skip(int(headerDataLength)); err != nil {
 				t.Fatalf("Failed to skip PES header data: %v", err)
 			}
-			
+
 			// Calculate payload size
 			payloadSize := pesLength - 3 - int(headerDataLength) // 3 = flags1 + flags2 + headerDataLength
 			if payloadSize > 0 {
@@ -672,11 +673,11 @@ func TestLargePESPacket(t *testing.T) {
 				if err != nil {
 					t.Fatalf("Failed to read PES payload: %v", err)
 				}
-				
+
 				totalPayloadSize += payload.Size
 				t.Logf("PES packet %d: %d bytes payload", pesCount+1, payload.Size)
 			}
-			
+
 			pesCount++
 		}
 
@@ -704,14 +705,14 @@ func TestPESPacketBoundaryConditions(t *testing.T) {
 	// Test PES packet boundary conditions
 	t.Run("BoundaryConditions", func(t *testing.T) {
 		testCases := []struct {
-			name     string
+			name        string
 			payloadSize int
 		}{
 			{"EmptyPayload", 0},
 			{"SmallPayload", 1},
 			{"ExactBoundary", MaxPESPayloadSize},
 			{"JustOverBoundary", MaxPESPayloadSize + 1},
-			{"MultipleBoundary", MaxPESPayloadSize * 2 + 100},
+			{"MultipleBoundary", MaxPESPayloadSize*2 + 100},
 		}
 
 		for _, tc := range testCases {
@@ -730,11 +731,11 @@ func TestPESPacketBoundaryConditions(t *testing.T) {
 				pesFrame.Dts = uint64(tc.payloadSize) * 90
 
 				// Create allocator for testing
-				allocator := util.NewScalableMemoryAllocator(1024*1024)
-				packet := util.NewRecyclableMemory(allocator)
+				allocator := gomem.NewScalableMemoryAllocator(1024 * 1024)
+				packet := gomem.NewRecyclableMemory(allocator)
 
 				// Write PES packet
-				err := pesFrame.WritePESPacket(util.NewMemory(testPayload), &packet)
+				err := pesFrame.WritePESPacket(gomem.NewMemory(testPayload), &packet)
 				if err != nil {
 					t.Fatalf("WritePESPacket failed: %v", err)
 				}
@@ -750,7 +751,7 @@ func TestPESPacketBoundaryConditions(t *testing.T) {
 				// For non-empty payloads, verify we can read them back
 				if tc.payloadSize > 0 {
 					reader := util.NewBufReader(bytes.NewReader(packetData))
-					
+
 					// Skip PS header
 					code, err := reader.ReadBE32(4)
 					if err != nil {
@@ -776,7 +777,7 @@ func TestPESPacketBoundaryConditions(t *testing.T) {
 					// Read PES packets
 					totalPayloadSize := 0
 					packetCount := 0
-					
+
 					for reader.Buffered() > 0 {
 						// Read PES packet start code (0x00000100 + stream_id)
 						pesStartCode, err := reader.ReadBE32(4)
@@ -786,45 +787,45 @@ func TestPESPacketBoundaryConditions(t *testing.T) {
 							}
 							t.Fatalf("Failed to read PES start code: %v", err)
 						}
-						
+
 						// Check if it's a PES packet (starts with 0x000001)
 						if pesStartCode&0xFFFFFF00 != 0x00000100 {
 							t.Errorf("Invalid PES start code: %x", pesStartCode)
 							break
 						}
-						
+
 						// // streamID := byte(pesStartCode & 0xFF)
-						
+
 						// Read PES packet length
 						pesLength, err := reader.ReadBE(2)
 						if err != nil {
 							t.Fatalf("Failed to read PES length: %v", err)
 						}
-						
+
 						// Read PES header
 						// Skip the first byte (flags)
 						_, err = reader.ReadByte()
 						if err != nil {
 							t.Fatalf("Failed to read PES flags1: %v", err)
 						}
-						
+
 						// Skip the second byte (flags)
 						_, err = reader.ReadByte()
 						if err != nil {
 							t.Fatalf("Failed to read PES flags2: %v", err)
 						}
-						
+
 						// Read header data length
 						headerDataLength, err := reader.ReadByte()
 						if err != nil {
 							t.Fatalf("Failed to read PES header data length: %v", err)
 						}
-						
+
 						// Skip header data
 						if err = reader.Skip(int(headerDataLength)); err != nil {
 							t.Fatalf("Failed to skip PES header data: %v", err)
 						}
-						
+
 						// Calculate payload size
 						payloadSize := pesLength - 3 - int(headerDataLength) // 3 = flags1 + flags2 + headerDataLength
 						if payloadSize > 0 {
@@ -833,10 +834,10 @@ func TestPESPacketBoundaryConditions(t *testing.T) {
 							if err != nil {
 								t.Fatalf("Failed to read PES payload: %v", err)
 							}
-							
+
 							totalPayloadSize += payload.Size
 						}
-						
+
 						packetCount++
 					}
 

pkg/format/ps/pes.go

@@ -1,6 +1,7 @@
 package mpegps
 
 import (
+	"github.com/langhuihui/gomem"
 	mpegts "m7s.live/v5/pkg/format/ts"
 	"m7s.live/v5/pkg/util"
 )
@@ -10,7 +11,7 @@ type MpegpsPESFrame struct {
 	mpegts.MpegPESHeader
 }
 
-func (frame *MpegpsPESFrame) WritePESPacket(payload util.Memory, allocator *util.RecyclableMemory) (err error) {
+func (frame *MpegpsPESFrame) WritePESPacket(payload gomem.Memory, allocator *gomem.RecyclableMemory) (err error) {
 	frame.DataAlignmentIndicator = 1
 
 	pesReader := payload.NewReader()

pkg/format/raw.go

@@ -6,9 +6,9 @@ import (
 
 	"github.com/deepch/vdk/codec/h264parser"
 	"github.com/deepch/vdk/codec/h265parser"
+	"github.com/langhuihui/gomem"
 	"m7s.live/v5/pkg"
 	"m7s.live/v5/pkg/codec"
-	"m7s.live/v5/pkg/util"
 )
 
 var _ pkg.IAVFrame = (*RawAudio)(nil)
@@ -18,7 +18,7 @@ type RawAudio struct {
 }
 
 func (r *RawAudio) GetSize() int {
-	return r.Raw.(*util.Memory).Size
+	return r.Raw.(*gomem.Memory).Size
 }
 
 func (r *RawAudio) Demux() error {
@@ -28,7 +28,7 @@ func (r *RawAudio) Demux() error {
 
 func (r *RawAudio) Mux(from *pkg.Sample) (err error) {
 	r.InitRecycleIndexes(0)
-	r.Memory = *from.Raw.(*util.Memory)
+	r.Memory = *from.Raw.(*gomem.Memory)
 	r.ICodecCtx = from.GetBase()
 	return
 }
@@ -127,5 +127,46 @@ func (r *H26xFrame) GetSize() (ret int) {
 }
 
 func (h *H26xFrame) String() string {
-	return fmt.Sprintf("H26xFrame{FourCC: %s, Timestamp: %s, CTS: %s}", h.FourCC, h.Timestamp, h.CTS)
+	return fmt.Sprintf("H26xFrame{FourCC: %s, Timestamp: %s, CTS: %s}", h.FourCC(), h.Timestamp, h.CTS)
+}
+
+var _ pkg.IAVFrame = (*AV1Frame)(nil)
+
+type AV1Frame struct {
+	pkg.Sample
+}
+
+func (a *AV1Frame) CheckCodecChange() (err error) {
+	if a.ICodecCtx == nil {
+		return pkg.ErrUnsupportCodec
+	}
+	return nil
+}
+
+func (a *AV1Frame) GetSize() (ret int) {
+	if obus, ok := a.Raw.(*pkg.OBUs); ok {
+		for obu := range obus.RangePoint {
+			ret += obu.Size
+		}
+	}
+	return
+}
+
+func (a *AV1Frame) Demux() error {
+	a.Raw = &a.Memory
+	return nil
+}
+
+func (a *AV1Frame) Mux(from *pkg.Sample) (err error) {
+	a.InitRecycleIndexes(0)
+	obus := from.Raw.(*pkg.OBUs)
+	for obu := range obus.RangePoint {
+		a.Push(obu.Buffers...)
+	}
+	a.ICodecCtx = from.GetBase()
+	return
+}
+
+func (a *AV1Frame) String() string {
+	return fmt.Sprintf("AV1Frame{FourCC: %s, Timestamp: %s, CTS: %s}", a.FourCC(), a.Timestamp, a.CTS)
 }

pkg/format/ts/mpegts.go

@@ -6,6 +6,7 @@ import (
 	"io"
 	"time"
 
+	"github.com/langhuihui/gomem"
 	"m7s.live/v5"
 	"m7s.live/v5/pkg/codec"
 	"m7s.live/v5/pkg/format"
@@ -108,7 +109,7 @@ type MpegTsStream struct {
 	PAT                        MpegTsPAT // PAT表信息
 	PMT                        MpegTsPMT // PMT表信息
 	Publisher                  *m7s.Publisher
-	Allocator                  *util.ScalableMemoryAllocator
+	Allocator                  *gomem.ScalableMemoryAllocator
 	writer                     m7s.PublishWriter[*format.Mpeg2Audio, *VideoFrame]
 	audioPID, videoPID, pmtPID uint16
 	tsPacket                   [TS_PACKET_SIZE]byte

pkg/format/ts/pes.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"io"
 
+	"github.com/langhuihui/gomem"
 	"m7s.live/v5/pkg/util"
 )
 
@@ -411,13 +412,13 @@ func (header *MpegPESHeader) WritePESHeader(esSize int) (w util.Buffer, err erro
 	return
 }
 
-func (frame *MpegtsPESFrame) WritePESPacket(payload util.Memory, allocator *util.RecyclableMemory) (err error) {
+func (frame *MpegtsPESFrame) WritePESPacket(payload gomem.Memory, allocator *gomem.RecyclableMemory) (err error) {
 	var pesHeadItem util.Buffer
 	pesHeadItem, err = frame.WritePESHeader(payload.Size)
 	if err != nil {
 		return
 	}
-	pesBuffers := util.NewMemory(pesHeadItem)
+	pesBuffers := gomem.NewMemory(pesHeadItem)
 	payload.Range(pesBuffers.PushOne)
 	pesPktLength := int64(pesBuffers.Size)
 	pesReader := pesBuffers.NewReader()

pkg/http_server_fasthttp.go

@@ -6,10 +6,10 @@ import (
 	"crypto/tls"
 	"log/slog"
 
+	"github.com/langhuihui/gotask"
 	"github.com/valyala/fasthttp"
 	"github.com/valyala/fasthttp/fasthttpadaptor"
 	"m7s.live/v5/pkg/config"
-	"m7s.live/v5/pkg/task"
 )
 
 func CreateHTTPWork(conf *config.HTTP, logger *slog.Logger) *ListenFastHTTPWork {

pkg/http_server_std.go

@@ -7,8 +7,8 @@ import (
 	"log/slog"
 	"net/http"
 
+	"github.com/langhuihui/gotask"
 	"m7s.live/v5/pkg/config"
-	"m7s.live/v5/pkg/task"
 )
 
 func CreateHTTPWork(conf *config.HTTP, logger *slog.Logger) *ListenHTTPWork {

pkg/log.go

@@ -6,7 +6,7 @@ import (
 	"slices"
 	"sync"
 
-	"m7s.live/v5/pkg/task"
+	"github.com/langhuihui/gotask"
 )
 
 var _ slog.Handler = (*MultiLogHandler)(nil)

pkg/ring-writer.go

@@ -6,7 +6,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"m7s.live/v5/pkg/task"
+	"github.com/langhuihui/gotask"
 	"m7s.live/v5/pkg/util"
 )
 

pkg/ring_test.go

@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"m7s.live/v5/pkg/util"
+	"github.com/langhuihui/gomem"
 )
 
 func TestRing(t *testing.T) {
@@ -15,7 +15,7 @@ func TestRing(t *testing.T) {
 	ctx, _ := context.WithTimeout(context.Background(), time.Second*5)
 	go t.Run("writer", func(t *testing.T) {
 		for i := 0; ctx.Err() == nil; i++ {
-			w.Value.Raw = &util.Memory{}
+			w.Value.Raw = &gomem.Memory{}
 			normal := w.Step()
 			t.Log("write", i, normal)
 			time.Sleep(time.Millisecond * 50)
@@ -78,7 +78,7 @@ func BenchmarkRing(b *testing.B) {
 	ctx, _ := context.WithTimeout(context.Background(), time.Second*5)
 	go func() {
 		for i := 0; ctx.Err() == nil; i++ {
-			w.Value.Raw = &util.Memory{}
+			w.Value.Raw = &gomem.Memory{}
 			w.Step()
 			time.Sleep(time.Millisecond * 50)
 		}

pkg/storage/README_CN.md

@@ -0,0 +1,214 @@
+# Storage Package
+
+这个包提供了统一的存储接口，支持多种存储后端，包括本地存储、S3、OSS和COS。
+
+## 条件编译
+
+每种存储类型都使用条件编译，只有在指定相应的build tag时才会被编译：
+
+- `local`: 本地文件系统存储
+- `s3`: Amazon S3存储
+- `oss`: 阿里云OSS存储  
+- `cos`: 腾讯云COS存储
+
+## 使用方法
+
+### 编译时指定存储类型
+
+```bash
+# 只编译本地存储（默认包含，无需额外tags）
+go build
+
+# 只编译S3存储
+go build -tags s3
+
+# 编译多种存储类型
+go build -tags "s3,oss"
+
+# 编译所有存储类型
+go build -tags "s3,oss,cos"
+
+# 编译所有存储类型（包括本地存储）
+go build -tags "s3,oss,cos"
+```
+
+**注意**：
+- 本地存储（`local`）默认包含，无需指定build tag
+- S3存储需要`-tags s3`
+- OSS存储需要`-tags oss`  
+- COS存储需要`-tags cos`
+- 可以组合多个tags来支持多种存储类型
+
+### 代码中使用
+
+```go
+import "m7s.live/v5/pkg/storage"
+
+// 创建本地存储
+localConfig := storage.LocalStorageConfig("/path/to/storage")
+localStorage, err := storage.CreateStorage("local", localConfig)
+
+// 创建S3存储
+s3Config := &storage.S3StorageConfig{
+    Endpoint:        "s3.amazonaws.com",
+    Region:          "us-east-1",
+    AccessKeyID:     "your-access-key",
+    SecretAccessKey: "your-secret-key",
+    Bucket:          "your-bucket",
+    ForcePathStyle:  false, // MinIO需要设置为true
+    UseSSL:          true,
+    Timeout:         30 * time.Second,
+}
+s3Storage, err := storage.CreateStorage("s3", s3Config)
+
+// 创建OSS存储
+ossConfig := &storage.OSSStorageConfig{
+    Endpoint:        "oss-cn-hangzhou.aliyuncs.com",
+    AccessKeyID:     "your-access-key-id",
+    AccessKeySecret: "your-access-key-secret",
+    Bucket:          "your-bucket",
+    UseSSL:          true,
+    Timeout:         30,
+}
+ossStorage, err := storage.CreateStorage("oss", ossConfig)
+
+// 创建COS存储
+cosConfig := &storage.COSStorageConfig{
+    SecretID:   "your-secret-id",
+    SecretKey:  "your-secret-key",
+    Region:     "ap-beijing",
+    Bucket:     "your-bucket",
+    UseHTTPS:   true,
+    Timeout:    30,
+}
+cosStorage, err := storage.CreateStorage("cos", cosConfig)
+```
+
+## 存储类型
+
+### Local Storage (`local`)
+
+本地文件系统存储，不需要额外的依赖。
+
+### S3 Storage (`s3`)
+
+Amazon S3兼容存储，包括AWS S3和MinIO等。
+
+依赖：
+- `github.com/aws/aws-sdk-go`
+
+### OSS Storage (`oss`)
+
+阿里云对象存储服务。
+
+依赖：
+- `github.com/aliyun/aliyun-oss-go-sdk`
+
+### COS Storage (`cos`)
+
+腾讯云对象存储服务。
+
+依赖：
+- `github.com/tencentyun/cos-go-sdk-v5`
+
+## 工厂模式
+
+存储包使用工厂模式来创建不同类型的存储实例：
+
+```go
+var Factory = map[string]func(any) (Storage, error){}
+```
+
+每种存储类型在各自的文件中通过`init()`函数注册到工厂中：
+
+- `local.go`: 注册本地存储工厂函数
+- `s3.go`: 注册S3存储工厂函数（需要`-tags s3`）
+- `oss.go`: 注册OSS存储工厂函数（需要`-tags oss`）
+- `cos.go`: 注册COS存储工厂函数（需要`-tags cos`）
+
+使用`CreateStorage(type, config)`函数来创建存储实例，其中`type`是存储类型字符串，`config`是对应的配置对象。
+
+## 存储接口
+
+所有存储实现都遵循统一的`Storage`接口：
+
+```go
+type Storage interface {
+    // CreateFile 创建文件并返回文件句柄
+    CreateFile(ctx context.Context, path string) (File, error)
+    
+    // Delete 删除文件
+    Delete(ctx context.Context, path string) error
+    
+    // Exists 检查文件是否存在
+    Exists(ctx context.Context, path string) (bool, error)
+    
+    // GetSize 获取文件大小
+    GetSize(ctx context.Context, path string) (int64, error)
+    
+    // GetURL 获取文件访问URL
+    GetURL(ctx context.Context, path string) (string, error)
+    
+    // List 列出文件
+    List(ctx context.Context, prefix string) ([]FileInfo, error)
+    
+    // Close 关闭存储连接
+    Close() error
+}
+```
+
+## 使用示例
+
+```go
+package main
+
+import (
+    "context"
+    "fmt"
+    "m7s.live/v5/pkg/storage"
+)
+
+func main() {
+    // 创建本地存储
+    config := storage.LocalStorageConfig("/tmp/storage")
+    s, err := storage.CreateStorage("local", config)
+    if err != nil {
+        panic(err)
+    }
+    defer s.Close()
+    
+    ctx := context.Background()
+    
+    // 创建文件并写入内容
+    file, err := s.CreateFile(ctx, "test.txt")
+    if err != nil {
+        panic(err)
+    }
+    
+    file.Write([]byte("Hello, World!"))
+    file.Close()
+    
+    // 检查文件是否存在
+    exists, err := s.Exists(ctx, "test.txt")
+    if err != nil {
+        panic(err)
+    }
+    fmt.Printf("File exists: %v\n", exists)
+    
+    // 获取文件大小
+    size, err := s.GetSize(ctx, "test.txt")
+    if err != nil {
+        panic(err)
+    }
+    fmt.Printf("File size: %d bytes\n", size)
+    
+    // 列出文件
+    files, err := s.List(ctx, "")
+    if err != nil {
+        panic(err)
+    }
+    for _, file := range files {
+        fmt.Printf("File: %s, Size: %d\n", file.Name, file.Size)
+    }
+}
+```

pkg/storage/cos.go

@@ -0,0 +1,366 @@
+//go:build cos
+
+package storage
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+	"os"
+	"strings"
+	"time"
+
+	"github.com/tencentyun/cos-go-sdk-v5"
+)
+
+// COSStorageConfig COS存储配置
+type COSStorageConfig struct {
+	SecretID   string `yaml:"secret_id" desc:"COS Secret ID"`
+	SecretKey  string `yaml:"secret_key" desc:"COS Secret Key"`
+	Region     string `yaml:"region" desc:"COS区域"`
+	Bucket     string `yaml:"bucket" desc:"COS存储桶名称"`
+	PathPrefix string `yaml:"path_prefix" desc:"文件路径前缀"`
+	UseHTTPS   bool   `yaml:"use_https" desc:"是否使用HTTPS" default:"true"`
+	Timeout    int    `yaml:"timeout" desc:"上传超时时间（秒）" default:"30"`
+}
+
+func (c *COSStorageConfig) GetType() StorageType {
+	return StorageTypeCOS
+}
+
+func (c *COSStorageConfig) Validate() error {
+	if c.SecretID == "" {
+		return fmt.Errorf("secret_id is required for COS storage")
+	}
+	if c.SecretKey == "" {
+		return fmt.Errorf("secret_key is required for COS storage")
+	}
+	if c.Bucket == "" {
+		return fmt.Errorf("bucket is required for COS storage")
+	}
+	if c.Region == "" {
+		return fmt.Errorf("region is required for COS storage")
+	}
+	return nil
+}
+
+// COSStorage COS存储实现
+type COSStorage struct {
+	config *COSStorageConfig
+	client *cos.Client
+}
+
+// NewCOSStorage 创建COS存储实例
+func NewCOSStorage(config *COSStorageConfig) (*COSStorage, error) {
+	if err := config.Validate(); err != nil {
+		return nil, err
+	}
+
+	// 设置默认值
+	if config.Timeout == 0 {
+		config.Timeout = 30
+	}
+
+	// 构建存储桶URL
+	scheme := "http"
+	if config.UseHTTPS {
+		scheme = "https"
+	}
+	bucketURL := fmt.Sprintf("%s://%s.cos.%s.myqcloud.com", scheme, config.Bucket, config.Region)
+
+	// 创建COS客户端
+	client := cos.NewClient(&cos.BaseURL{BucketURL: bucketURL}, &http.Client{
+		Transport: &cos.AuthorizationTransport{
+			SecretID:  config.SecretID,
+			SecretKey: config.SecretKey,
+		},
+	})
+
+	// 测试连接
+	if err := testCOSConnection(client, config.Bucket); err != nil {
+		return nil, fmt.Errorf("COS connection test failed: %w", err)
+	}
+
+	return &COSStorage{
+		config: config,
+		client: client,
+	}, nil
+}
+
+func (s *COSStorage) CreateFile(ctx context.Context, path string) (File, error) {
+	objectKey := s.getObjectKey(path)
+	return &COSFile{
+		storage:   s,
+		objectKey: objectKey,
+		ctx:       ctx,
+	}, nil
+}
+
+func (s *COSStorage) Delete(ctx context.Context, path string) error {
+	objectKey := s.getObjectKey(path)
+	_, err := s.client.Object.Delete(ctx, objectKey)
+	return err
+}
+
+func (s *COSStorage) Exists(ctx context.Context, path string) (bool, error) {
+	objectKey := s.getObjectKey(path)
+
+	_, err := s.client.Object.Head(ctx, objectKey, nil)
+	if err != nil {
+		// 检查是否是404错误
+		if strings.Contains(err.Error(), "404") || strings.Contains(err.Error(), "NoSuchKey") {
+			return false, nil
+		}
+		return false, err
+	}
+
+	return true, nil
+}
+
+func (s *COSStorage) GetSize(ctx context.Context, path string) (int64, error) {
+	objectKey := s.getObjectKey(path)
+
+	result, _, err := s.client.Object.Head(ctx, objectKey, nil)
+	if err != nil {
+		if strings.Contains(err.Error(), "404") || strings.Contains(err.Error(), "NoSuchKey") {
+			return 0, ErrFileNotFound
+		}
+		return 0, err
+	}
+
+	return result.ContentLength, nil
+}
+
+func (s *COSStorage) GetURL(ctx context.Context, path string) (string, error) {
+	objectKey := s.getObjectKey(path)
+
+	// 生成预签名URL，24小时有效期
+	presignedURL, err := s.client.Object.GetPresignedURL(ctx, http.MethodGet, objectKey,
+		s.config.SecretID, s.config.SecretKey, 24*time.Hour, nil)
+	if err != nil {
+		return "", err
+	}
+
+	return presignedURL.String(), nil
+}
+
+func (s *COSStorage) List(ctx context.Context, prefix string) ([]FileInfo, error) {
+	objectPrefix := s.getObjectKey(prefix)
+
+	var files []FileInfo
+
+	opt := &cos.BucketGetOptions{
+		Prefix:  objectPrefix,
+		MaxKeys: 1000,
+	}
+
+	result, _, err := s.client.Bucket.Get(ctx, opt)
+	if err != nil {
+		return nil, err
+	}
+
+	for _, obj := range result.Contents {
+		// 移除路径前缀
+		fileName := obj.Key
+		if s.config.PathPrefix != "" {
+			fileName = strings.TrimPrefix(fileName, strings.TrimSuffix(s.config.PathPrefix, "/")+"/")
+		}
+
+		files = append(files, FileInfo{
+			Name:         fileName,
+			Size:         obj.Size,
+			LastModified: obj.LastModified,
+			ETag:         obj.ETag,
+		})
+	}
+
+	return files, nil
+}
+
+func (s *COSStorage) Close() error {
+	// COS客户端无需显式关闭
+	return nil
+}
+
+// getObjectKey 获取COS对象键
+func (s *COSStorage) getObjectKey(path string) string {
+	if s.config.PathPrefix != "" {
+		return strings.TrimSuffix(s.config.PathPrefix, "/") + "/" + path
+	}
+	return path
+}
+
+// testCOSConnection 测试COS连接
+func testCOSConnection(client *cos.Client, bucket string) error {
+	// 尝试获取存储桶信息来测试连接
+	_, _, err := client.Bucket.Head(context.Background())
+	return err
+}
+
+// COSFile COS文件读写器
+type COSFile struct {
+	storage   *COSStorage
+	objectKey string
+	ctx       context.Context
+	tempFile  *os.File // 本地临时文件，用于支持随机访问
+	filePath  string   // 临时文件路径
+}
+
+func (f *COSFile) Name() string {
+	return f.objectKey
+}
+
+func (f *COSFile) Write(p []byte) (n int, err error) {
+	// 如果还没有创建临时文件，先创建
+	if f.tempFile == nil {
+		if err = f.createTempFile(); err != nil {
+			return 0, err
+		}
+	}
+
+	// 写入到临时文件
+	return f.tempFile.Write(p)
+}
+
+func (f *COSFile) Read(p []byte) (n int, err error) {
+	// 如果还没有创建缓存文件，先下载到本地
+	if f.tempFile == nil {
+		if err = f.downloadToTemp(); err != nil {
+			return 0, err
+		}
+	}
+
+	// 从本地缓存文件读取
+	return f.tempFile.Read(p)
+}
+
+func (f *COSFile) WriteAt(p []byte, off int64) (n int, err error) {
+	// 如果还没有创建临时文件，先创建
+	if f.tempFile == nil {
+		if err = f.createTempFile(); err != nil {
+			return 0, err
+		}
+	}
+
+	// 写入到临时文件的指定位置
+	return f.tempFile.WriteAt(p, off)
+}
+
+func (f *COSFile) ReadAt(p []byte, off int64) (n int, err error) {
+	// 如果还没有创建缓存文件，先下载到本地
+	if f.tempFile == nil {
+		if err = f.downloadToTemp(); err != nil {
+			return 0, err
+		}
+	}
+
+	// 从本地缓存文件的指定位置读取
+	return f.tempFile.ReadAt(p, off)
+}
+
+func (f *COSFile) Sync() error {
+	// 如果使用临时文件，先同步到磁盘
+	if f.tempFile != nil {
+		if err := f.tempFile.Sync(); err != nil {
+			return err
+		}
+	}
+	if err := f.uploadTempFile(); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (f *COSFile) Seek(offset int64, whence int) (int64, error) {
+	// 如果还没有创建临时文件，先创建或下载
+	if f.tempFile == nil {
+		if err := f.downloadToTemp(); err != nil {
+			return 0, err
+		}
+	}
+
+	// 使用临时文件进行随机访问
+	return f.tempFile.Seek(offset, whence)
+}
+
+func (f *COSFile) Close() error {
+	if err := f.Sync(); err != nil {
+		return err
+	}
+	if f.tempFile != nil {
+		f.tempFile.Close()
+	}
+	// 清理临时文件
+	if f.filePath != "" {
+		os.Remove(f.filePath)
+	}
+	return nil
+}
+
+// createTempFile 创建临时文件
+func (f *COSFile) createTempFile() error {
+	// 创建临时文件
+	tempFile, err := os.CreateTemp("", "coswriter_*.tmp")
+	if err != nil {
+		return fmt.Errorf("failed to create temp file: %w", err)
+	}
+	f.tempFile = tempFile
+	f.filePath = tempFile.Name()
+	return nil
+}
+
+func (f *COSFile) Stat() (os.FileInfo, error) {
+	return f.tempFile.Stat()
+}
+
+// uploadTempFile 上传临时文件到COS
+func (f *COSFile) uploadTempFile() (err error) {
+	// 上传到COS
+	_, err = f.storage.client.Object.PutFromFile(f.ctx, f.objectKey, f.filePath, nil)
+	if err != nil {
+		return fmt.Errorf("failed to upload to COS: %w", err)
+	}
+
+	return nil
+}
+
+// downloadToTemp 下载COS对象到本地临时文件
+func (f *COSFile) downloadToTemp() error {
+	// 创建临时文件
+	tempFile, err := os.CreateTemp("", "cosreader_*.tmp")
+	if err != nil {
+		return fmt.Errorf("failed to create temp file: %w", err)
+	}
+
+	f.tempFile = tempFile
+	f.filePath = tempFile.Name()
+
+	// 下载COS对象
+	_, err = f.storage.client.Object.GetToFile(f.ctx, f.objectKey, f.filePath, nil)
+	if err != nil {
+		tempFile.Close()
+		os.Remove(f.filePath)
+		if strings.Contains(err.Error(), "404") || strings.Contains(err.Error(), "NoSuchKey") {
+			return ErrFileNotFound
+		}
+		return fmt.Errorf("failed to download from COS: %w", err)
+	}
+
+	// 重置文件指针到开始位置
+	_, err = tempFile.Seek(0, 0)
+	if err != nil {
+		tempFile.Close()
+		os.Remove(f.filePath)
+		return fmt.Errorf("failed to seek temp file: %w", err)
+	}
+
+	return nil
+}
+
+func init() {
+	Factory["cos"] = func(config any) (Storage, error) {
+		var cosConfig COSStorageConfig
+		config.Parse(&cosConfig, config.(map[string]any))
+		return NewCOSStorage(cosConfig)
+	}
+}

pkg/storage/factory.go

@@ -0,0 +1,3 @@
+package storage
+
+var Factory = map[string]func(any) (Storage, error){}

pkg/storage/local.go

@@ -0,0 +1,137 @@
+package storage
+
+import (
+	"context"
+	"fmt"
+	"os"
+	"path/filepath"
+)
+
+// LocalStorageConfig 本地存储配置
+type LocalStorageConfig string
+
+func (c LocalStorageConfig) GetType() StorageType {
+	return StorageTypeLocal
+}
+
+func (c LocalStorageConfig) Validate() error {
+	if c == "" {
+		return fmt.Errorf("base_path is required for local storage")
+	}
+	return nil
+}
+
+// LocalStorage 本地存储实现
+type LocalStorage struct {
+	basePath string
+}
+
+// NewLocalStorage 创建本地存储实例
+func NewLocalStorage(config LocalStorageConfig) (*LocalStorage, error) {
+	if err := config.Validate(); err != nil {
+		return nil, err
+	}
+
+	basePath, err := filepath.Abs(string(config))
+	if err != nil {
+		return nil, fmt.Errorf("invalid base path: %w", err)
+	}
+
+	// 确保基础路径存在
+	if err := os.MkdirAll(basePath, 0755); err != nil {
+		return nil, fmt.Errorf("failed to create base path: %w", err)
+	}
+
+	return &LocalStorage{
+		basePath: basePath,
+	}, nil
+}
+
+func (s *LocalStorage) CreateFile(ctx context.Context, path string) (File, error) {
+	// 确保目录存在
+	dir := filepath.Dir(path)
+	if err := os.MkdirAll(dir, 0755); err != nil {
+		return nil, fmt.Errorf("failed to create directory: %w", err)
+	}
+
+	// 使用 O_RDWR 而不是 O_WRONLY,因为某些场景(如 MP4 writeTrailer)需要读取文件内容
+	file, err := os.OpenFile(path, os.O_CREATE|os.O_RDWR|os.O_TRUNC, 0644)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create file: %w", err)
+	}
+
+	return file, nil
+}
+
+func (s *LocalStorage) Delete(ctx context.Context, path string) error {
+	return os.Remove(path)
+}
+
+func (s *LocalStorage) Exists(ctx context.Context, path string) (bool, error) {
+	_, err := os.Stat(path)
+	if err != nil {
+		if os.IsNotExist(err) {
+			return false, nil
+		}
+		return false, err
+	}
+	return true, nil
+}
+
+func (s *LocalStorage) GetSize(ctx context.Context, path string) (int64, error) {
+	info, err := os.Stat(path)
+	if err != nil {
+		if os.IsNotExist(err) {
+			return 0, ErrFileNotFound
+		}
+		return 0, err
+	}
+	return info.Size(), nil
+}
+
+func (s *LocalStorage) GetURL(ctx context.Context, path string) (string, error) {
+	// 本地存储返回文件路径
+	return path, nil
+}
+
+func (s *LocalStorage) List(ctx context.Context, prefix string) ([]FileInfo, error) {
+	searchPath := filepath.Join(prefix)
+	var files []FileInfo
+
+	err := filepath.Walk(searchPath, func(path string, info os.FileInfo, err error) error {
+		if err != nil {
+			return err
+		}
+
+		if !info.IsDir() {
+			relPath, err := filepath.Rel(prefix, path)
+			if err != nil {
+				return err
+			}
+
+			files = append(files, FileInfo{
+				Name:         relPath,
+				Size:         info.Size(),
+				LastModified: info.ModTime(),
+			})
+		}
+		return nil
+	})
+
+	return files, err
+}
+
+func (s *LocalStorage) Close() error {
+	// 本地存储无需关闭连接
+	return nil
+}
+
+func init() {
+	Factory["local"] = func(config any) (Storage, error) {
+		localConfig, ok := config.(string)
+		if !ok {
+			return nil, fmt.Errorf("invalid config type for local storage")
+		}
+		return NewLocalStorage(LocalStorageConfig(localConfig))
+	}
+}

pkg/storage/mmap.go

@@ -0,0 +1,319 @@
+package storage
+
+import (
+	"fmt"
+	"os"
+
+	"golang.org/x/exp/mmap"
+)
+
+// MmapFile 使用内存映射的文件实现
+type MmapFile struct {
+	file     *os.File
+	mmapFile *mmap.ReaderAt
+	data     []byte
+	size     int64
+}
+
+// NewMmapFile 创建新的内存映射文件
+func NewMmapFile(filename string) (*MmapFile, error) {
+	file, err := os.Open(filename)
+	if err != nil {
+		return nil, fmt.Errorf("failed to open file: %w", err)
+	}
+
+	mmapFile, err := mmap.Open(filename)
+	if err != nil {
+		file.Close()
+		return nil, fmt.Errorf("failed to mmap file: %w", err)
+	}
+
+	// 获取文件大小
+	stat, err := file.Stat()
+	if err != nil {
+		mmapFile.Close()
+		file.Close()
+		return nil, fmt.Errorf("failed to stat file: %w", err)
+	}
+
+	// 获取内存映射的数据
+	data := make([]byte, stat.Size())
+	_, err = mmapFile.ReadAt(data, 0)
+	if err != nil {
+		mmapFile.Close()
+		file.Close()
+		return nil, fmt.Errorf("failed to read mmap data: %w", err)
+	}
+
+	return &MmapFile{
+		file:     file,
+		mmapFile: mmapFile,
+		data:     data,
+		size:     stat.Size(),
+	}, nil
+}
+
+// Read 实现 io.Reader 接口
+func (m *MmapFile) Read(p []byte) (n int, err error) {
+	if len(p) == 0 {
+		return 0, nil
+	}
+
+	// 使用内存映射的数据进行零拷贝读取
+	n = copy(p, m.data)
+	if n == 0 {
+		return 0, fmt.Errorf("no data available")
+	}
+
+	// 更新数据指针，模拟读取进度
+	m.data = m.data[n:]
+	return n, nil
+}
+
+// ReadAt 实现 io.ReaderAt 接口
+func (m *MmapFile) ReadAt(p []byte, off int64) (n int, err error) {
+	if off >= m.size {
+		return 0, fmt.Errorf("offset beyond file size")
+	}
+
+	// 使用内存映射的数据进行零拷贝读取
+	available := int(m.size - off)
+	if len(p) > available {
+		p = p[:available]
+	}
+
+	// 直接从内存映射区域复制数据，避免系统调用
+	start := int(off)
+	end := start + len(p)
+	if end > len(m.data) {
+		end = len(m.data)
+	}
+
+	n = copy(p, m.data[start:end])
+	return n, nil
+}
+
+// Write 实现 io.Writer 接口
+func (m *MmapFile) Write(p []byte) (n int, err error) {
+	// 内存映射文件通常是只读的，这里返回错误
+	return 0, fmt.Errorf("mmap file is read-only")
+}
+
+// WriteAt 实现 io.WriterAt 接口
+func (m *MmapFile) WriteAt(p []byte, off int64) (n int, err error) {
+	// 内存映射文件通常是只读的，这里返回错误
+	return 0, fmt.Errorf("mmap file is read-only")
+}
+
+// Seek 实现 io.Seeker 接口
+func (m *MmapFile) Seek(offset int64, whence int) (int64, error) {
+	// 对于内存映射文件，我们通过调整数据指针来模拟 seek
+	switch whence {
+	case 0: // io.SeekStart
+		if offset < 0 || offset > m.size {
+			return 0, fmt.Errorf("invalid offset")
+		}
+		m.data = m.data[offset:]
+		return offset, nil
+	case 1: // io.SeekCurrent
+		current := m.size - int64(len(m.data))
+		newOffset := current + offset
+		if newOffset < 0 || newOffset > m.size {
+			return 0, fmt.Errorf("invalid offset")
+		}
+		m.data = m.data[offset:]
+		return newOffset, nil
+	case 2: // io.SeekEnd
+		newOffset := m.size + offset
+		if newOffset < 0 || newOffset > m.size {
+			return 0, fmt.Errorf("invalid offset")
+		}
+		m.data = m.data[newOffset:]
+		return newOffset, nil
+	default:
+		return 0, fmt.Errorf("invalid whence")
+	}
+}
+
+// Close 关闭文件
+func (m *MmapFile) Close() error {
+	var err error
+	if m.mmapFile != nil {
+		err = m.mmapFile.Close()
+	}
+	if m.file != nil {
+		if closeErr := m.file.Close(); closeErr != nil && err == nil {
+			err = closeErr
+		}
+	}
+	return err
+}
+
+// Stat 返回文件信息
+func (m *MmapFile) Stat() (os.FileInfo, error) {
+	return m.file.Stat()
+}
+
+// Name 返回文件名
+func (m *MmapFile) Name() string {
+	return m.file.Name()
+}
+
+// Size 返回文件大小
+func (m *MmapFile) Size() int64 {
+	return m.size
+}
+
+// Data 返回内存映射的数据切片（零拷贝访问）
+func (m *MmapFile) Data() []byte {
+	return m.data
+}
+
+// MmapFileWriter 支持写入的内存映射文件
+type MmapFileWriter struct {
+	file     *os.File
+	filename string
+	data     []byte
+	size     int64
+}
+
+// NewMmapFileWriter 创建新的可写内存映射文件
+func NewMmapFileWriter(filename string) (*MmapFileWriter, error) {
+	file, err := os.Create(filename)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create file: %w", err)
+	}
+
+	return &MmapFileWriter{
+		file:     file,
+		filename: filename,
+		data:     make([]byte, 0),
+		size:     0,
+	}, nil
+}
+
+// Write 实现 io.Writer 接口
+func (m *MmapFileWriter) Write(p []byte) (n int, err error) {
+	// 将数据追加到内存缓冲区
+	m.data = append(m.data, p...)
+	m.size += int64(len(p))
+	return len(p), nil
+}
+
+// WriteAt 实现 io.WriterAt 接口
+func (m *MmapFileWriter) WriteAt(p []byte, off int64) (n int, err error) {
+	// 确保数据缓冲区足够大
+	if int64(len(m.data)) < off+int64(len(p)) {
+		newSize := off + int64(len(p))
+		newData := make([]byte, newSize)
+		copy(newData, m.data)
+		m.data = newData
+		m.size = newSize
+	}
+
+	// 写入数据到指定位置
+	copy(m.data[off:], p)
+	return len(p), nil
+}
+
+// Sync 同步数据到磁盘
+func (m *MmapFileWriter) Sync() error {
+	// 将内存中的数据写入文件
+	_, err := m.file.WriteAt(m.data, 0)
+	if err != nil {
+		return fmt.Errorf("failed to write data: %w", err)
+	}
+
+	// 同步到磁盘
+	return m.file.Sync()
+}
+
+// Close 关闭文件
+func (m *MmapFileWriter) Close() error {
+	// 先同步数据
+	if err := m.Sync(); err != nil {
+		m.file.Close()
+		return err
+	}
+	return m.file.Close()
+}
+
+// Read 实现 io.Reader 接口
+func (m *MmapFileWriter) Read(p []byte) (n int, err error) {
+	if len(p) == 0 {
+		return 0, nil
+	}
+
+	n = copy(p, m.data)
+	if n == 0 {
+		return 0, fmt.Errorf("no data available")
+	}
+
+	// 更新数据指针
+	m.data = m.data[n:]
+	return n, nil
+}
+
+// ReadAt 实现 io.ReaderAt 接口
+func (m *MmapFileWriter) ReadAt(p []byte, off int64) (n int, err error) {
+	if off >= m.size {
+		return 0, fmt.Errorf("offset beyond file size")
+	}
+
+	available := int(m.size - off)
+	if len(p) > available {
+		p = p[:available]
+	}
+
+	n = copy(p, m.data[off:])
+	return n, nil
+}
+
+// Seek 实现 io.Seeker 接口
+func (m *MmapFileWriter) Seek(offset int64, whence int) (int64, error) {
+	switch whence {
+	case 0: // io.SeekStart
+		if offset < 0 || offset > m.size {
+			return 0, fmt.Errorf("invalid offset")
+		}
+		m.data = m.data[offset:]
+		return offset, nil
+	case 1: // io.SeekCurrent
+		current := m.size - int64(len(m.data))
+		newOffset := current + offset
+		if newOffset < 0 || newOffset > m.size {
+			return 0, fmt.Errorf("invalid offset")
+		}
+		m.data = m.data[offset:]
+		return newOffset, nil
+	case 2: // io.SeekEnd
+		newOffset := m.size + offset
+		if newOffset < 0 || newOffset > m.size {
+			return 0, fmt.Errorf("invalid offset")
+		}
+		m.data = m.data[newOffset:]
+		return newOffset, nil
+	default:
+		return 0, fmt.Errorf("invalid whence")
+	}
+}
+
+// Stat 返回文件信息
+func (m *MmapFileWriter) Stat() (os.FileInfo, error) {
+	return m.file.Stat()
+}
+
+// Name 返回文件名
+func (m *MmapFileWriter) Name() string {
+	return m.filename
+}
+
+// Size 返回文件大小
+func (m *MmapFileWriter) Size() int64 {
+	return m.size
+}
+
+// Data 返回内存中的数据切片（零拷贝访问）
+func (m *MmapFileWriter) Data() []byte {
+	return m.data
+}

pkg/storage/oss.go

@@ -0,0 +1,358 @@
+//go:build oss
+
+package storage
+
+import (
+	"context"
+	"fmt"
+	"os"
+	"strings"
+
+	"github.com/aliyun/aliyun-oss-go-sdk/oss"
+)
+
+// OSSStorageConfig OSS存储配置
+type OSSStorageConfig struct {
+	Endpoint        string `yaml:"endpoint" desc:"OSS服务端点"`
+	AccessKeyID     string `yaml:"access_key_id" desc:"OSS访问密钥ID"`
+	AccessKeySecret string `yaml:"access_key_secret" desc:"OSS访问密钥Secret"`
+	Bucket          string `yaml:"bucket" desc:"OSS存储桶名称"`
+	PathPrefix      string `yaml:"path_prefix" desc:"文件路径前缀"`
+	UseSSL          bool   `yaml:"use_ssl" desc:"是否使用SSL" default:"true"`
+	Timeout         int    `yaml:"timeout" desc:"上传超时时间（秒）" default:"30"`
+}
+
+func (c *OSSStorageConfig) GetType() StorageType {
+	return StorageTypeOSS
+}
+
+func (c *OSSStorageConfig) Validate() error {
+	if c.AccessKeyID == "" {
+		return fmt.Errorf("access_key_id is required for OSS storage")
+	}
+	if c.AccessKeySecret == "" {
+		return fmt.Errorf("access_key_secret is required for OSS storage")
+	}
+	if c.Bucket == "" {
+		return fmt.Errorf("bucket is required for OSS storage")
+	}
+	if c.Endpoint == "" {
+		return fmt.Errorf("endpoint is required for OSS storage")
+	}
+	return nil
+}
+
+// OSSStorage OSS存储实现
+type OSSStorage struct {
+	config *OSSStorageConfig
+	client *oss.Client
+	bucket *oss.Bucket
+}
+
+// NewOSSStorage 创建OSS存储实例
+func NewOSSStorage(config *OSSStorageConfig) (*OSSStorage, error) {
+	if err := config.Validate(); err != nil {
+		return nil, err
+	}
+
+	// 设置默认值
+	if config.Timeout == 0 {
+		config.Timeout = 30
+	}
+
+	// 创建OSS客户端
+	client, err := oss.New(config.Endpoint, config.AccessKeyID, config.AccessKeySecret)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create OSS client: %w", err)
+	}
+
+	// 获取存储桶
+	bucket, err := client.Bucket(config.Bucket)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get OSS bucket: %w", err)
+	}
+
+	// 测试连接
+	if err := testOSSConnection(bucket); err != nil {
+		return nil, fmt.Errorf("OSS connection test failed: %w", err)
+	}
+
+	return &OSSStorage{
+		config: config,
+		client: client,
+		bucket: bucket,
+	}, nil
+}
+
+func (s *OSSStorage) CreateFile(ctx context.Context, path string) (File, error) {
+	objectKey := s.getObjectKey(path)
+	return &OSSFile{
+		storage:   s,
+		objectKey: objectKey,
+		ctx:       ctx,
+	}, nil
+}
+
+func (s *OSSStorage) Delete(ctx context.Context, path string) error {
+	objectKey := s.getObjectKey(path)
+	return s.bucket.DeleteObject(objectKey)
+}
+
+func (s *OSSStorage) Exists(ctx context.Context, path string) (bool, error) {
+	objectKey := s.getObjectKey(path)
+	exists, err := s.bucket.IsObjectExist(objectKey)
+	if err != nil {
+		return false, err
+	}
+	return exists, nil
+}
+
+func (s *OSSStorage) GetSize(ctx context.Context, path string) (int64, error) {
+	objectKey := s.getObjectKey(path)
+
+	props, err := s.bucket.GetObjectDetailedMeta(objectKey)
+	if err != nil {
+		if strings.Contains(err.Error(), "NoSuchKey") {
+			return 0, ErrFileNotFound
+		}
+		return 0, err
+	}
+
+	contentLength := props.Get("Content-Length")
+	if contentLength == "" {
+		return 0, nil
+	}
+
+	var size int64
+	if _, err := fmt.Sscanf(contentLength, "%d", &size); err != nil {
+		return 0, fmt.Errorf("failed to parse content length: %w", err)
+	}
+
+	return size, nil
+}
+
+func (s *OSSStorage) GetURL(ctx context.Context, path string) (string, error) {
+	objectKey := s.getObjectKey(path)
+
+	// 生成签名URL，24小时有效期
+	url, err := s.bucket.SignURL(objectKey, oss.HTTPGet, 24*3600)
+	if err != nil {
+		return "", err
+	}
+
+	return url, nil
+}
+
+func (s *OSSStorage) List(ctx context.Context, prefix string) ([]FileInfo, error) {
+	objectPrefix := s.getObjectKey(prefix)
+
+	var files []FileInfo
+
+	err := s.bucket.ListObjects(oss.Prefix(objectPrefix), func(result oss.ListObjectsResult) error {
+		for _, obj := range result.Objects {
+			// 移除路径前缀
+			fileName := obj.Key
+			if s.config.PathPrefix != "" {
+				fileName = strings.TrimPrefix(fileName, strings.TrimSuffix(s.config.PathPrefix, "/")+"/")
+			}
+
+			files = append(files, FileInfo{
+				Name:         fileName,
+				Size:         obj.Size,
+				LastModified: obj.LastModified,
+				ETag:         obj.ETag,
+			})
+		}
+		return nil
+	})
+
+	return files, err
+}
+
+func (s *OSSStorage) Close() error {
+	// OSS客户端无需显式关闭
+	return nil
+}
+
+// getObjectKey 获取OSS对象键
+func (s *OSSStorage) getObjectKey(path string) string {
+	if s.config.PathPrefix != "" {
+		return strings.TrimSuffix(s.config.PathPrefix, "/") + "/" + path
+	}
+	return path
+}
+
+// testOSSConnection 测试OSS连接
+func testOSSConnection(bucket *oss.Bucket) error {
+	// 尝试列出对象来测试连接
+	_, err := bucket.ListObjects(oss.MaxKeys(1))
+	return err
+}
+
+// OSSFile OSS文件读写器
+type OSSFile struct {
+	storage   *OSSStorage
+	objectKey string
+	ctx       context.Context
+	tempFile  *os.File // 本地临时文件，用于支持随机访问
+	filePath  string   // 临时文件路径
+}
+
+func (f *OSSFile) Name() string {
+	return f.objectKey
+}
+
+func (f *OSSFile) Write(p []byte) (n int, err error) {
+	// 如果还没有创建临时文件，先创建
+	if f.tempFile == nil {
+		if err = f.createTempFile(); err != nil {
+			return 0, err
+		}
+	}
+
+	// 写入到临时文件
+	return f.tempFile.Write(p)
+}
+
+func (f *OSSFile) Read(p []byte) (n int, err error) {
+	// 如果还没有创建缓存文件，先下载到本地
+	if f.tempFile == nil {
+		if err = f.downloadToTemp(); err != nil {
+			return 0, err
+		}
+	}
+
+	// 从本地缓存文件读取
+	return f.tempFile.Read(p)
+}
+
+func (f *OSSFile) WriteAt(p []byte, off int64) (n int, err error) {
+	// 如果还没有创建临时文件，先创建
+	if f.tempFile == nil {
+		if err = f.createTempFile(); err != nil {
+			return 0, err
+		}
+	}
+
+	// 写入到临时文件的指定位置
+	return f.tempFile.WriteAt(p, off)
+}
+
+func (f *OSSFile) ReadAt(p []byte, off int64) (n int, err error) {
+	// 如果还没有创建缓存文件，先下载到本地
+	if f.tempFile == nil {
+		if err = f.downloadToTemp(); err != nil {
+			return 0, err
+		}
+	}
+
+	// 从本地缓存文件的指定位置读取
+	return f.tempFile.ReadAt(p, off)
+}
+
+func (f *OSSFile) Sync() error {
+	// 如果使用临时文件，先同步到磁盘
+	if f.tempFile != nil {
+		if err := f.tempFile.Sync(); err != nil {
+			return err
+		}
+	}
+	if err := f.uploadTempFile(); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (f *OSSFile) Seek(offset int64, whence int) (int64, error) {
+	// 如果还没有创建临时文件，先创建或下载
+	if f.tempFile == nil {
+		if err := f.downloadToTemp(); err != nil {
+			return 0, err
+		}
+	}
+
+	// 使用临时文件进行随机访问
+	return f.tempFile.Seek(offset, whence)
+}
+
+func (f *OSSFile) Close() error {
+	if err := f.Sync(); err != nil {
+		return err
+	}
+	if f.tempFile != nil {
+		f.tempFile.Close()
+	}
+	// 清理临时文件
+	if f.filePath != "" {
+		os.Remove(f.filePath)
+	}
+	return nil
+}
+
+// createTempFile 创建临时文件
+func (f *OSSFile) createTempFile() error {
+	// 创建临时文件
+	tempFile, err := os.CreateTemp("", "osswriter_*.tmp")
+	if err != nil {
+		return fmt.Errorf("failed to create temp file: %w", err)
+	}
+	f.tempFile = tempFile
+	f.filePath = tempFile.Name()
+	return nil
+}
+
+func (f *OSSFile) Stat() (os.FileInfo, error) {
+	return f.tempFile.Stat()
+}
+
+// uploadTempFile 上传临时文件到OSS
+func (f *OSSFile) uploadTempFile() (err error) {
+	// 上传到OSS
+	err = f.storage.bucket.PutObjectFromFile(f.objectKey, f.filePath)
+	if err != nil {
+		return fmt.Errorf("failed to upload to OSS: %w", err)
+	}
+
+	return nil
+}
+
+// downloadToTemp 下载OSS对象到本地临时文件
+func (f *OSSFile) downloadToTemp() error {
+	// 创建临时文件
+	tempFile, err := os.CreateTemp("", "ossreader_*.tmp")
+	if err != nil {
+		return fmt.Errorf("failed to create temp file: %w", err)
+	}
+
+	f.tempFile = tempFile
+	f.filePath = tempFile.Name()
+
+	// 下载OSS对象
+	err = f.storage.bucket.GetObjectToFile(f.objectKey, f.filePath)
+	if err != nil {
+		tempFile.Close()
+		os.Remove(f.filePath)
+		if strings.Contains(err.Error(), "NoSuchKey") {
+			return ErrFileNotFound
+		}
+		return fmt.Errorf("failed to download from OSS: %w", err)
+	}
+
+	// 重置文件指针到开始位置
+	_, err = tempFile.Seek(0, 0)
+	if err != nil {
+		tempFile.Close()
+		os.Remove(f.filePath)
+		return fmt.Errorf("failed to seek temp file: %w", err)
+	}
+
+	return nil
+}
+
+func init() {
+	Factory["oss"] = func(config any) (Storage, error) {
+		var ossConfig OSSStorageConfig
+		config.Parse(&ossConfig, config.(map[string]any))
+		return NewOSSStorage(ossConfig)
+	}
+}

pkg/storage/s3.go

@@ -0,0 +1,410 @@
+//go:build s3
+
+package storage
+
+import (
+	"context"
+	"fmt"
+	"os"
+	"strings"
+	"time"
+
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/credentials"
+	"github.com/aws/aws-sdk-go/aws/session"
+	"github.com/aws/aws-sdk-go/service/s3"
+	"github.com/aws/aws-sdk-go/service/s3/s3manager"
+	"m7s.live/v5/pkg/config"
+)
+
+// S3StorageConfig S3存储配置
+type S3StorageConfig struct {
+	Endpoint        string        `desc:"S3服务端点"`
+	Region          string        `desc:"AWS区域" default:"us-east-1"`
+	AccessKeyID     string        `desc:"S3访问密钥ID"`
+	SecretAccessKey string        `desc:"S3秘密访问密钥"`
+	Bucket          string        `desc:"S3存储桶名称"`
+	PathPrefix      string        `desc:"文件路径前缀"`
+	ForcePathStyle  bool          `desc:"强制路径样式（MinIO需要）"`
+	UseSSL          bool          `desc:"是否使用SSL" default:"true"`
+	Timeout         time.Duration `desc:"上传超时时间" default:"30s"`
+}
+
+func (c *S3StorageConfig) GetType() StorageType {
+	return StorageTypeS3
+}
+
+func (c *S3StorageConfig) Validate() error {
+	if c.AccessKeyID == "" {
+		return fmt.Errorf("access_key_id is required for S3 storage")
+	}
+	if c.SecretAccessKey == "" {
+		return fmt.Errorf("secret_access_key is required for S3 storage")
+	}
+	if c.Bucket == "" {
+		return fmt.Errorf("bucket is required for S3 storage")
+	}
+	return nil
+}
+
+// S3Storage S3存储实现
+type S3Storage struct {
+	config     *S3StorageConfig
+	s3Client   *s3.S3
+	uploader   *s3manager.Uploader
+	downloader *s3manager.Downloader
+}
+
+// NewS3Storage 创建S3存储实例
+func NewS3Storage(config *S3StorageConfig) (*S3Storage, error) {
+	if err := config.Validate(); err != nil {
+		return nil, err
+	}
+
+	// 创建AWS配置
+	awsConfig := &aws.Config{
+		Region:           aws.String(config.Region),
+		Credentials:      credentials.NewStaticCredentials(config.AccessKeyID, config.SecretAccessKey, ""),
+		S3ForcePathStyle: aws.Bool(config.ForcePathStyle),
+	}
+
+	// 设置端点（用于MinIO或其他S3兼容服务）
+	if config.Endpoint != "" {
+		endpoint := config.Endpoint
+		if !strings.HasPrefix(endpoint, "http") {
+			protocol := "http"
+			if config.UseSSL {
+				protocol = "https"
+			}
+			endpoint = protocol + "://" + endpoint
+		}
+		awsConfig.Endpoint = aws.String(endpoint)
+		awsConfig.DisableSSL = aws.Bool(!config.UseSSL)
+	}
+
+	// 创建AWS会话
+	sess, err := session.NewSession(awsConfig)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create AWS session: %w", err)
+	}
+
+	// 创建S3客户端
+	s3Client := s3.New(sess)
+
+	// 测试连接
+	if err := testS3Connection(s3Client, config.Bucket); err != nil {
+		return nil, fmt.Errorf("S3 connection test failed: %w", err)
+	}
+
+	return &S3Storage{
+		config:     config,
+		s3Client:   s3Client,
+		uploader:   s3manager.NewUploader(sess),
+		downloader: s3manager.NewDownloader(sess),
+	}, nil
+}
+
+func (s *S3Storage) CreateFile(ctx context.Context, path string) (File, error) {
+	objectKey := s.getObjectKey(path)
+	return &S3File{
+		storage:   s,
+		objectKey: objectKey,
+		ctx:       ctx,
+	}, nil
+}
+
+func (s *S3Storage) Delete(ctx context.Context, path string) error {
+	objectKey := s.getObjectKey(path)
+
+	_, err := s.s3Client.DeleteObjectWithContext(ctx, &s3.DeleteObjectInput{
+		Bucket: aws.String(s.config.Bucket),
+		Key:    aws.String(objectKey),
+	})
+
+	return err
+}
+
+func (s *S3Storage) Exists(ctx context.Context, path string) (bool, error) {
+	objectKey := s.getObjectKey(path)
+
+	_, err := s.s3Client.HeadObjectWithContext(ctx, &s3.HeadObjectInput{
+		Bucket: aws.String(s.config.Bucket),
+		Key:    aws.String(objectKey),
+	})
+
+	if err != nil {
+		// 检查是否是404错误
+		if strings.Contains(err.Error(), "NotFound") || strings.Contains(err.Error(), "NoSuchKey") {
+			return false, nil
+		}
+		return false, err
+	}
+
+	return true, nil
+}
+
+func (s *S3Storage) GetSize(ctx context.Context, path string) (int64, error) {
+	objectKey := s.getObjectKey(path)
+
+	result, err := s.s3Client.HeadObjectWithContext(ctx, &s3.HeadObjectInput{
+		Bucket: aws.String(s.config.Bucket),
+		Key:    aws.String(objectKey),
+	})
+
+	if err != nil {
+		if strings.Contains(err.Error(), "NotFound") || strings.Contains(err.Error(), "NoSuchKey") {
+			return 0, ErrFileNotFound
+		}
+		return 0, err
+	}
+
+	if result.ContentLength == nil {
+		return 0, nil
+	}
+
+	return *result.ContentLength, nil
+}
+
+func (s *S3Storage) GetURL(ctx context.Context, path string) (string, error) {
+	objectKey := s.getObjectKey(path)
+
+	req, _ := s.s3Client.GetObjectRequest(&s3.GetObjectInput{
+		Bucket: aws.String(s.config.Bucket),
+		Key:    aws.String(objectKey),
+	})
+
+	url, err := req.Presign(24 * time.Hour) // 24小时有效期
+	if err != nil {
+		return "", err
+	}
+
+	return url, nil
+}
+
+func (s *S3Storage) List(ctx context.Context, prefix string) ([]FileInfo, error) {
+	objectPrefix := s.getObjectKey(prefix)
+
+	var files []FileInfo
+
+	err := s.s3Client.ListObjectsV2PagesWithContext(ctx, &s3.ListObjectsV2Input{
+		Bucket: aws.String(s.config.Bucket),
+		Prefix: aws.String(objectPrefix),
+	}, func(page *s3.ListObjectsV2Output, lastPage bool) bool {
+		for _, obj := range page.Contents {
+			// 移除路径前缀
+			fileName := *obj.Key
+			if s.config.PathPrefix != "" {
+				fileName = strings.TrimPrefix(fileName, strings.TrimSuffix(s.config.PathPrefix, "/")+"/")
+			}
+
+			files = append(files, FileInfo{
+				Name:         fileName,
+				Size:         *obj.Size,
+				LastModified: *obj.LastModified,
+				ETag:         *obj.ETag,
+			})
+		}
+		return true
+	})
+
+	return files, err
+}
+
+func (s *S3Storage) Close() error {
+	// S3客户端无需显式关闭
+	return nil
+}
+
+// getObjectKey 获取S3对象键
+func (s *S3Storage) getObjectKey(path string) string {
+	if s.config.PathPrefix != "" {
+		return strings.TrimSuffix(s.config.PathPrefix, "/") + "/" + path
+	}
+	return path
+}
+
+// testS3Connection 测试S3连接
+func testS3Connection(s3Client *s3.S3, bucket string) error {
+	_, err := s3Client.HeadBucket(&s3.HeadBucketInput{
+		Bucket: aws.String(bucket),
+	})
+	return err
+}
+
+// S3File S3文件读写器
+type S3File struct {
+	storage   *S3Storage
+	objectKey string
+	ctx       context.Context
+	tempFile  *os.File // 本地临时文件，用于支持随机访问
+	filePath  string   // 临时文件路径
+}
+
+func (w *S3File) Name() string {
+	return w.objectKey
+}
+
+func (w *S3File) Write(p []byte) (n int, err error) {
+	// 如果还没有创建临时文件，先创建
+	if w.tempFile == nil {
+		if err = w.createTempFile(); err != nil {
+			return 0, err
+		}
+	}
+
+	// 写入到临时文件
+	return w.tempFile.Write(p)
+}
+
+func (w *S3File) Read(p []byte) (n int, err error) {
+	// 如果还没有创建缓存文件，先下载到本地
+	if w.tempFile == nil {
+		if err = w.downloadToTemp(); err != nil {
+			return 0, err
+		}
+	}
+
+	// 从本地缓存文件读取
+	return w.tempFile.Read(p)
+}
+
+func (w *S3File) WriteAt(p []byte, off int64) (n int, err error) {
+	// 如果还没有创建临时文件，先创建
+	if w.tempFile == nil {
+		if err = w.createTempFile(); err != nil {
+			return 0, err
+		}
+	}
+
+	// 写入到临时文件的指定位置
+	return w.tempFile.WriteAt(p, off)
+}
+
+func (w *S3File) ReadAt(p []byte, off int64) (n int, err error) {
+	// 如果还没有创建缓存文件，先下载到本地
+	if w.tempFile == nil {
+		if err = w.downloadToTemp(); err != nil {
+			return 0, err
+		}
+	}
+
+	// 从本地缓存文件的指定位置读取
+	return w.tempFile.ReadAt(p, off)
+}
+
+func (w *S3File) Sync() error {
+	// 如果使用临时文件，先同步到磁盘
+	if w.tempFile != nil {
+		if err := w.tempFile.Sync(); err != nil {
+			return err
+		}
+	}
+	if err := w.uploadTempFile(); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (w *S3File) Seek(offset int64, whence int) (int64, error) {
+	// 如果还没有创建临时文件，先创建或下载
+	if w.tempFile == nil {
+		if err := w.downloadToTemp(); err != nil {
+			return 0, err
+		}
+	}
+
+	// 使用临时文件进行随机访问
+	return w.tempFile.Seek(offset, whence)
+}
+
+func (w *S3File) Close() error {
+	if err := w.Sync(); err != nil {
+		return err
+	}
+	if w.tempFile != nil {
+		w.tempFile.Close()
+	}
+	// 清理临时文件
+	if w.filePath != "" {
+		os.Remove(w.filePath)
+	}
+	return nil
+}
+
+// createTempFile 创建临时文件
+func (w *S3File) createTempFile() error {
+	// 创建临时文件
+	tempFile, err := os.CreateTemp("", "s3writer_*.tmp")
+	if err != nil {
+		return fmt.Errorf("failed to create temp file: %w", err)
+	}
+	w.tempFile = tempFile
+	w.filePath = tempFile.Name()
+	return nil
+}
+
+func (w *S3File) Stat() (os.FileInfo, error) {
+	return w.tempFile.Stat()
+}
+
+// uploadTempFile 上传临时文件到S3
+func (w *S3File) uploadTempFile() (err error) {
+	// 上传到S3
+	_, err = w.storage.uploader.UploadWithContext(w.ctx, &s3manager.UploadInput{
+		Bucket:      aws.String(w.storage.config.Bucket),
+		Key:         aws.String(w.objectKey),
+		Body:        w.tempFile,
+		ContentType: aws.String("application/octet-stream"),
+	})
+
+	if err != nil {
+		return fmt.Errorf("failed to upload to S3: %w", err)
+	}
+
+	return nil
+}
+
+// downloadToTemp 下载S3对象到本地临时文件
+func (w *S3File) downloadToTemp() error {
+	// 创建临时文件
+	tempFile, err := os.CreateTemp("", "s3reader_*.tmp")
+	if err != nil {
+		return fmt.Errorf("failed to create temp file: %w", err)
+	}
+
+	w.tempFile = tempFile
+	w.filePath = tempFile.Name()
+
+	// 下载S3对象
+	_, err = w.storage.downloader.DownloadWithContext(w.ctx, tempFile, &s3.GetObjectInput{
+		Bucket: aws.String(w.storage.config.Bucket),
+		Key:    aws.String(w.objectKey),
+	})
+
+	if err != nil {
+		tempFile.Close()
+		os.Remove(w.filePath)
+		if strings.Contains(err.Error(), "NotFound") || strings.Contains(err.Error(), "NoSuchKey") {
+			return ErrFileNotFound
+		}
+		return fmt.Errorf("failed to download from S3: %w", err)
+	}
+
+	// 重置文件指针到开始位置
+	_, err = tempFile.Seek(0, 0)
+	if err != nil {
+		tempFile.Close()
+		os.Remove(w.filePath)
+		return fmt.Errorf("failed to seek temp file: %w", err)
+	}
+
+	return nil
+}
+
+func init() {
+	Factory["s3"] = func(conf any) (Storage, error) {
+		var s3Config S3StorageConfig
+		config.Parse(&s3Config, conf.(map[string]any))
+		return NewS3Storage(&s3Config)
+	}
+}

pkg/storage/storage.go

@@ -0,0 +1,100 @@
+package storage
+
+import (
+	"context"
+	"fmt"
+	"io"
+	"os"
+	"time"
+)
+
+// StorageType 存储类型
+type StorageType string
+
+const (
+	StorageTypeLocal StorageType = "local"
+	StorageTypeS3    StorageType = "s3"
+	StorageTypeOSS   StorageType = "oss"
+	StorageTypeCOS   StorageType = "cos"
+)
+
+// StorageConfig 存储配置接口
+type StorageConfig interface {
+	GetType() StorageType
+	Validate() error
+}
+
+// Storage 存储接口
+type Storage interface {
+	CreateFile(ctx context.Context, path string) (File, error)
+	// Delete 删除文件
+	Delete(ctx context.Context, path string) error
+
+	// Exists 检查文件是否存在
+	Exists(ctx context.Context, path string) (bool, error)
+
+	// GetSize 获取文件大小
+	GetSize(ctx context.Context, path string) (int64, error)
+
+	// GetURL 获取文件访问URL
+	GetURL(ctx context.Context, path string) (string, error)
+
+	// List 列出文件
+	List(ctx context.Context, prefix string) ([]FileInfo, error)
+
+	// Close 关闭存储连接
+	Close() error
+}
+
+// Writer 写入器接口
+type Writer interface {
+	io.Writer
+	io.WriterAt
+	io.Closer
+
+	// Sync 同步到存储
+	Sync() error
+
+	// Seek 设置写入位置
+	Seek(offset int64, whence int) (int64, error)
+}
+
+// Reader 读取器接口
+type Reader interface {
+	io.Reader
+	io.ReaderAt
+	io.Closer
+	io.Seeker
+}
+
+type File interface {
+	Writer
+	Reader
+	Stat() (os.FileInfo, error)
+	Name() string
+}
+
+// FileInfo 文件信息
+type FileInfo struct {
+	Name         string    `json:"name"`
+	Size         int64     `json:"size"`
+	LastModified time.Time `json:"last_modified"`
+	ETag         string    `json:"etag,omitempty"`
+	ContentType  string    `json:"content_type,omitempty"`
+}
+
+// CreateStorage 创建存储实例的便捷函数
+func CreateStorage(t string, config any) (Storage, error) {
+	factory, exists := Factory[t]
+	if !exists {
+		return nil, ErrUnsupportedStorageType
+	}
+	return factory(config)
+}
+
+// 错误定义
+var (
+	ErrUnsupportedStorageType = fmt.Errorf("unsupported storage type")
+	ErrFileNotFound           = fmt.Errorf("file not found")
+	ErrStorageNotAvailable    = fmt.Errorf("storage not available")
+)

pkg/task/README.md

@@ -1,59 +0,0 @@
-# 任务系统概要
-
-# 任务的启动
-
-任务通过调用父任务的 AddTask 来启动，此时会进入队列中等待启动，父任务的 EventLoop 会接受到子任务，然后调用子任务的 Start 方法进行启动操作
-
-## EventLoop 的初始化
-为了节省资源，EventLoop 在没有子任务时不会创建协程，一直等到有子任务时才会创建，并且如果这个子任务也是一个空的 Job（即没有 Start、Run、Go）则仍然不会创建协程。
-
-## EventLoop 停止
-为了节省资源，当 EventLoop 中没有待执行的子任务时，需要退出协程。EventLoop 会在以下情况退出：
-
-1. 没有待处理的任务且没有活跃的子任务，且父任务的 keepalive() 返回 false
-2. EventLoop 的状态被设置为停止状态（-1）
-
-# 任务的停止
-
-## 主动停止某个任务
-
-调用任务的 Stop 方法即可停止某个任务，此时该任务会由其父任务的 eventLoop 检测到 context 取消信号然后开始执行任务的 dispose 来进行销毁
-
-## 任务的意外退出
-
-当任务的 Run 返回错误，或者 context 被取消时，任务会退出，最终流程会同主动停止一样
-
-## 父任务停止
-
-当父任务停止并销毁时，会按照以下步骤处理子任务：
-
-### 步骤
-
-1. **设置 EventLoop 的状态为停止状态**：调用 `stop()` 方法设置 status = -1，防止继续添加子任务
-2. **激活 EventLoop 处理剩余任务**：调用 `active()` 方法，即使状态为 -1 也能处理剩余的子任务
-3. **停止所有子任务**：调用所有子任务的 Stop 方法
-4. **等待子任务销毁完成**：等待 EventLoop 处理完所有子任务的销毁工作
-
-### 设计要点
-
-- EventLoop 的 `active()` 方法允许在状态为 -1 时调用，以确保剩余的子任务能被正确处理
-- 使用互斥锁保护状态转换，避免竞态条件
-- 先停止再处理剩余任务，确保不会添加新的子任务
-
-## 竞态条件处理
-
-为了确保任务系统的线程安全，我们采取了以下措施：
-
-### 状态管理
-- 使用 `sync.RWMutex` 保护 EventLoop 的状态转换
-- `add()` 方法使用读锁检查状态，防止在停止后添加新任务
-- `stop()` 方法使用写锁设置状态，确保原子性
-
-### EventLoop 生命周期
-- EventLoop 只有在状态从 0（ready）转换到 1（running）时才启动新的 goroutine
-- 即使状态为 -1（stopped），`active()` 方法仍可被调用以处理剩余任务
-- 使用 `hasPending` 标志和互斥锁跟踪待处理任务，避免频繁检查 channel 长度
-
-### 任务添加
-- 添加任务时会检查 EventLoop 状态，如果已停止则返回 `ErrDisposed`
-- 使用 `pendingMux` 保护 `hasPending` 标志，避免竞态条件

pkg/task/channel.go

@@ -1,69 +0,0 @@
-package task
-
-import (
-	"time"
-)
-
-type ITickTask interface {
-	IChannelTask
-	GetTickInterval() time.Duration
-	GetTicker() *time.Ticker
-}
-
-type ChannelTask struct {
-	Task
-	SignalChan any
-}
-
-func (*ChannelTask) GetTaskType() TaskType {
-	return TASK_TYPE_CHANNEL
-}
-
-func (t *ChannelTask) GetSignal() any {
-	return t.SignalChan
-}
-
-func (t *ChannelTask) Tick(any) {
-}
-
-type TickTask struct {
-	ChannelTask
-	Ticker *time.Ticker
-}
-
-func (t *TickTask) GetTicker() *time.Ticker {
-	return t.Ticker
-}
-
-func (t *TickTask) GetTickInterval() time.Duration {
-	return time.Second
-}
-
-func (t *TickTask) Start() (err error) {
-	t.Ticker = time.NewTicker(t.handler.(ITickTask).GetTickInterval())
-	t.SignalChan = t.Ticker.C
-	t.OnStop(func() {
-		t.Ticker.Reset(time.Millisecond)
-	})
-	return
-}
-
-type AsyncTickTask struct {
-	TickTask
-}
-
-func (t *AsyncTickTask) GetSignal() any {
-	return t.Task.GetSignal()
-}
-
-func (t *AsyncTickTask) Go() error {
-	t.handler.(ITickTask).Tick(nil)
-	for {
-		select {
-		case c := <-t.Ticker.C:
-			t.handler.(ITickTask).Tick(c)
-		case <-t.Done():
-			return nil
-		}
-	}
-}

pkg/task/event_loop.go

@@ -1,167 +0,0 @@
-package task
-
-import (
-	"errors"
-	"reflect"
-	"runtime/debug"
-	"slices"
-	"sync"
-	"sync/atomic"
-)
-
-type Singleton[T comparable] struct {
-	instance atomic.Value
-	mux      sync.Mutex
-}
-
-func (s *Singleton[T]) Load() T {
-	return s.instance.Load().(T)
-}
-
-func (s *Singleton[T]) Get(newF func() T) T {
-	ch := s.instance.Load() //fast
-	if ch == nil {          // slow
-		s.mux.Lock()
-		defer s.mux.Unlock()
-		if ch = s.instance.Load(); ch == nil {
-			ch = newF()
-			s.instance.Store(ch)
-		}
-	}
-	return ch.(T)
-}
-
-type EventLoop struct {
-	cases    []reflect.SelectCase
-	children []ITask
-	addSub   Singleton[chan any]
-	running  atomic.Bool
-}
-
-func (e *EventLoop) getInput() chan any {
-	return e.addSub.Get(func() chan any {
-		return make(chan any, 20)
-	})
-}
-
-func (e *EventLoop) active(mt *Job) {
-	if mt.parent != nil {
-		mt.parent.eventLoop.active(mt.parent)
-	}
-	if e.running.CompareAndSwap(false, true) {
-		go e.run(mt)
-	}
-}
-
-func (e *EventLoop) add(mt *Job, sub any) (err error) {
-	shouldActive := true
-	switch sub.(type) {
-	case TaskStarter, TaskBlock, TaskGo:
-	case IJob:
-		shouldActive = false
-	}
-	select {
-	case e.getInput() <- sub:
-		if shouldActive || mt.IsStopped() {
-			e.active(mt)
-		}
-		return nil
-	default:
-		return ErrTooManyChildren
-	}
-}
-
-func (e *EventLoop) run(mt *Job) {
-	mt.Debug("event loop start", "jobId", mt.GetTaskID(), "type", mt.GetOwnerType())
-	ch := e.getInput()
-	e.cases = []reflect.SelectCase{{Dir: reflect.SelectRecv, Chan: reflect.ValueOf(ch)}}
-	defer func() {
-		err := recover()
-		if err != nil {
-			mt.Error("job panic", "err", err, "stack", string(debug.Stack()))
-			if !ThrowPanic {
-				mt.Stop(errors.Join(err.(error), ErrPanic))
-			} else {
-				panic(err)
-			}
-		}
-		mt.Debug("event loop exit", "jobId", mt.GetTaskID(), "type", mt.GetOwnerType())
-		if !mt.handler.keepalive() {
-			if mt.blocked != nil {
-				mt.Stop(errors.Join(mt.blocked.StopReason(), ErrAutoStop))
-			} else {
-				mt.Stop(ErrAutoStop)
-			}
-		}
-		mt.blocked = nil
-	}()
-
-	// Main event loop - only exit when no more events AND no children
-	for {
-		if len(ch) == 0 && len(e.children) == 0 {
-			if e.running.CompareAndSwap(true, false) {
-				if len(ch) > 0 { // if add before running set to false
-					e.active(mt)
-				}
-				return
-			}
-		}
-		mt.blocked = nil
-		if chosen, rev, ok := reflect.Select(e.cases); chosen == 0 {
-			if !ok {
-				mt.Debug("job addSub channel closed, exiting", "taskId", mt.GetTaskID())
-				mt.Stop(ErrAutoStop)
-				return
-			}
-			switch v := rev.Interface().(type) {
-			case func():
-				v()
-			case ITask:
-				if len(e.cases) >= 65535 {
-					mt.Warn("task children too many, may cause performance issue", "count", len(e.cases), "taskId", mt.GetTaskID(), "taskType", mt.GetTaskType(), "ownerType", mt.GetOwnerType())
-					v.Stop(ErrTooManyChildren)
-					continue
-				}
-				if mt.blocked = v; v.start() {
-					e.cases = append(e.cases, reflect.SelectCase{Dir: reflect.SelectRecv, Chan: reflect.ValueOf(v.GetSignal())})
-					e.children = append(e.children, v)
-					mt.onChildStart(v)
-				} else {
-					mt.removeChild(v)
-				}
-			}
-		} else {
-			taskIndex := chosen - 1
-			child := e.children[taskIndex]
-			mt.blocked = child
-			switch tt := mt.blocked.(type) {
-			case IChannelTask:
-				if tt.IsStopped() {
-					switch ttt := tt.(type) {
-					case ITickTask:
-						ttt.GetTicker().Stop()
-					}
-					mt.onChildDispose(child)
-					mt.removeChild(child)
-					e.children = slices.Delete(e.children, taskIndex, taskIndex+1)
-					e.cases = slices.Delete(e.cases, chosen, chosen+1)
-				} else {
-					tt.Tick(rev.Interface())
-				}
-			default:
-				if !ok {
-					if mt.onChildDispose(child); child.checkRetry(child.StopReason()) {
-						if child.reset(); child.start() {
-							e.cases[chosen].Chan = reflect.ValueOf(child.GetSignal())
-							mt.onChildStart(child)
-							continue
-						}
-					}
-					mt.removeChild(child)
-					e.children = slices.Delete(e.children, taskIndex, taskIndex+1)
-					e.cases = slices.Delete(e.cases, chosen, chosen+1)
-				}
-			}
-		}
-	}
-}

pkg/task/job.go

@@ -1,202 +0,0 @@
-package task
-
-import (
-	"context"
-	"fmt"
-	"log/slog"
-	"runtime"
-	"strings"
-	"sync"
-	"sync/atomic"
-
-	"m7s.live/v5/pkg/util"
-)
-
-var idG atomic.Uint32
-var sourceFilePathPrefix string
-
-func init() {
-	if _, file, _, ok := runtime.Caller(0); ok {
-		sourceFilePathPrefix = strings.TrimSuffix(file, "pkg/task/job.go")
-	}
-}
-
-func GetNextTaskID() uint32 {
-	return idG.Add(1)
-}
-
-// Job include tasks
-type Job struct {
-	Task
-	children                    sync.Map
-	descendantsDisposeListeners []func(ITask)
-	descendantsStartListeners   []func(ITask)
-	blocked                     ITask
-	eventLoop                   EventLoop
-	Size                        atomic.Int32
-}
-
-func (*Job) GetTaskType() TaskType {
-	return TASK_TYPE_JOB
-}
-
-func (mt *Job) getJob() *Job {
-	return mt
-}
-
-func (mt *Job) Blocked() ITask {
-	return mt.blocked
-}
-
-func (mt *Job) EventLoopRunning() bool {
-	return mt.eventLoop.running.Load()
-}
-
-func (mt *Job) waitChildrenDispose(stopReason error) {
-	mt.eventLoop.active(mt)
-	mt.children.Range(func(key, value any) bool {
-		child := value.(ITask)
-		child.Stop(stopReason)
-		child.WaitStopped()
-		return true
-	})
-}
-
-func (mt *Job) OnDescendantsDispose(listener func(ITask)) {
-	mt.descendantsDisposeListeners = append(mt.descendantsDisposeListeners, listener)
-}
-
-func (mt *Job) onDescendantsDispose(descendants ITask) {
-	for _, listener := range mt.descendantsDisposeListeners {
-		listener(descendants)
-	}
-	if mt.parent != nil {
-		mt.parent.onDescendantsDispose(descendants)
-	}
-}
-
-func (mt *Job) onChildDispose(child ITask) {
-	mt.onDescendantsDispose(child)
-	child.dispose()
-}
-
-func (mt *Job) removeChild(child ITask) {
-	value, loaded := mt.children.LoadAndDelete(child.getKey())
-	if loaded {
-		if value != child {
-			panic("remove child")
-		}
-		remains := mt.Size.Add(-1)
-		mt.Debug("remove child", "id", child.GetTaskID(), "remains", remains)
-	}
-}
-
-func (mt *Job) OnDescendantsStart(listener func(ITask)) {
-	mt.descendantsStartListeners = append(mt.descendantsStartListeners, listener)
-}
-
-func (mt *Job) onDescendantsStart(descendants ITask) {
-	for _, listener := range mt.descendantsStartListeners {
-		listener(descendants)
-	}
-	if mt.parent != nil {
-		mt.parent.onDescendantsStart(descendants)
-	}
-}
-
-func (mt *Job) onChildStart(child ITask) {
-	mt.onDescendantsStart(child)
-}
-
-func (mt *Job) RangeSubTask(callback func(task ITask) bool) {
-	mt.children.Range(func(key, value any) bool {
-		callback(value.(ITask))
-		return true
-	})
-}
-
-func (mt *Job) AddDependTask(t ITask, opt ...any) (task *Task) {
-	t.Using(mt)
-	opt = append(opt, 1)
-	return mt.AddTask(t, opt...)
-}
-
-func (mt *Job) initContext(task *Task, opt ...any) {
-	callDepth := 2
-	for _, o := range opt {
-		switch v := o.(type) {
-		case context.Context:
-			task.parentCtx = v
-		case Description:
-			task.SetDescriptions(v)
-		case RetryConfig:
-			task.retry = v
-		case *slog.Logger:
-			task.Logger = v
-		case int:
-			callDepth += v
-		}
-	}
-	_, file, line, ok := runtime.Caller(callDepth)
-	if ok {
-		task.StartReason = fmt.Sprintf("%s:%d", strings.TrimPrefix(file, sourceFilePathPrefix), line)
-	}
-	task.parent = mt
-	if task.parentCtx == nil {
-		task.parentCtx = mt.Context
-	}
-	task.level = mt.level + 1
-	if task.ID == 0 {
-		task.ID = GetNextTaskID()
-	}
-	task.Context, task.CancelCauseFunc = context.WithCancelCause(task.parentCtx)
-	task.startup = util.NewPromise(task.Context)
-	task.shutdown = util.NewPromise(context.Background())
-	if task.Logger == nil {
-		task.Logger = mt.Logger
-	}
-}
-
-func (mt *Job) AddTask(t ITask, opt ...any) (task *Task) {
-	task = t.GetTask()
-	task.handler = t
-	mt.initContext(task, opt...)
-	if mt.IsStopped() {
-		task.startup.Reject(mt.StopReason())
-		return
-	}
-	actual, loaded := mt.children.LoadOrStore(t.getKey(), t)
-	if loaded {
-		task.startup.Reject(ExistTaskError{
-			Task: actual.(ITask),
-		})
-		return
-	}
-	var err error
-	defer func() {
-		if err != nil {
-			mt.children.Delete(t.getKey())
-			task.startup.Reject(err)
-		}
-	}()
-	if err = mt.eventLoop.add(mt, t); err != nil {
-		return
-	}
-	if mt.IsStopped() {
-		err = mt.StopReason()
-		return
-	}
-	remains := mt.Size.Add(1)
-	mt.Debug("child added", "id", task.ID, "remains", remains)
-	return
-}
-
-func (mt *Job) Call(callback func()) {
-	if mt.Size.Load() <= 0 {
-		callback()
-		return
-	}
-	ctx, cancel := context.WithCancel(mt)
-	_ = mt.eventLoop.add(mt, func() { callback(); cancel() })
-	<-ctx.Done()
-}

pkg/task/panic.go

@@ -1,6 +0,0 @@
-//go:build !taskpanic
-// +build !taskpanic
-
-package task
-
-var ThrowPanic = false

pkg/task/panic_true.go

@@ -1,6 +0,0 @@
-//go:build taskpanic
-// +build taskpanic
-
-package task
-
-var ThrowPanic = true

pkg/task/root.go

@@ -1,54 +0,0 @@
-package task
-
-import (
-	"context"
-	"log/slog"
-	"os"
-	"os/signal"
-	"syscall"
-	"time"
-)
-
-type shutdown interface {
-	Shutdown()
-}
-
-type OSSignal struct {
-	ChannelTask
-	root shutdown
-}
-
-func (o *OSSignal) Start() error {
-	signalChan := make(chan os.Signal, 1)
-	signal.Notify(signalChan, syscall.SIGHUP, syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT)
-	o.SignalChan = signalChan
-	o.OnStop(func() {
-		signal.Stop(signalChan)
-		close(signalChan)
-	})
-	return nil
-}
-
-func (o *OSSignal) Tick(any) {
-	println("OSSignal Tick")
-	go o.root.Shutdown()
-}
-
-type RootManager[K comparable, T ManagerItem[K]] struct {
-	WorkCollection[K, T]
-}
-
-func (m *RootManager[K, T]) Init() {
-	m.parentCtx = context.Background()
-	m.reset()
-	m.handler = m
-	m.Logger = slog.New(slog.NewTextHandler(os.Stdout, nil))
-	m.StartTime = time.Now()
-	m.AddTask(&OSSignal{root: m}).WaitStarted()
-	m.state = TASK_STATE_STARTED
-}
-
-func (m *RootManager[K, T]) Shutdown() {
-	m.Stop(ErrExit)
-	m.dispose()
-}

pkg/task/task.go

@@ -1,540 +0,0 @@
-package task
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"io"
-	"log/slog"
-	"maps"
-	"reflect"
-	"runtime"
-	"runtime/debug"
-	"strings"
-	"sync"
-	"time"
-	"unsafe"
-
-	"m7s.live/v5/pkg/util"
-)
-
-const TraceLevel = slog.Level(-8)
-const OwnerTypeKey = "ownerType"
-
-var (
-	ErrAutoStop        = errors.New("auto stop")
-	ErrRetryRunOut     = errors.New("retry out")
-	ErrStopByUser      = errors.New("stop by user")
-	ErrRestart         = errors.New("restart")
-	ErrTaskComplete    = errors.New("complete")
-	ErrTimeout         = errors.New("timeout")
-	ErrExit            = errors.New("exit")
-	ErrPanic           = errors.New("panic")
-	ErrTooManyChildren = errors.New("too many children in job")
-	ErrDisposed        = errors.New("disposed")
-)
-
-const (
-	TASK_STATE_INIT TaskState = iota
-	TASK_STATE_STARTING
-	TASK_STATE_STARTED
-	TASK_STATE_RUNNING
-	TASK_STATE_GOING
-	TASK_STATE_DISPOSING
-	TASK_STATE_DISPOSED
-)
-
-const (
-	TASK_TYPE_TASK TaskType = iota
-	TASK_TYPE_JOB
-	TASK_TYPE_Work
-	TASK_TYPE_CHANNEL
-)
-
-type (
-	TaskState byte
-	TaskType  byte
-	ITask     interface {
-		context.Context
-		keepalive() bool
-		GetParent() ITask
-		GetTask() *Task
-		GetTaskID() uint32
-		GetSignal() any
-		Stop(error)
-		StopReason() error
-		start() bool
-		dispose()
-		checkRetry(error) bool
-		reset()
-		IsStopped() bool
-		GetTaskType() TaskType
-		GetOwnerType() string
-		GetDescriptions() map[string]string
-		SetDescription(key string, value any)
-		SetDescriptions(value Description)
-		SetRetry(maxRetry int, retryInterval time.Duration)
-		Using(resource ...any)
-		OnStop(any)
-		OnStart(func())
-		OnDispose(func())
-		GetState() TaskState
-		GetLevel() byte
-		WaitStopped() error
-		WaitStarted() error
-		getKey() any
-	}
-	IJob interface {
-		ITask
-		getJob() *Job
-		AddTask(ITask, ...any) *Task
-		RangeSubTask(func(yield ITask) bool)
-		OnDescendantsDispose(func(ITask))
-		OnDescendantsStart(func(ITask))
-		Blocked() ITask
-		EventLoopRunning() bool
-		Call(func())
-	}
-	IChannelTask interface {
-		ITask
-		Tick(any)
-	}
-	TaskStarter interface {
-		Start() error
-	}
-	TaskDisposal interface {
-		Dispose()
-	}
-	TaskBlock interface {
-		Run() error
-	}
-	TaskGo interface {
-		Go() error
-	}
-	RetryConfig struct {
-		MaxRetry      int
-		RetryCount    int
-		RetryInterval time.Duration
-	}
-	Description    = map[string]any
-	TaskContextKey string
-	Task           struct {
-		ID          uint32
-		StartTime   time.Time
-		StartReason string
-		Logger      *slog.Logger
-		context.Context
-		context.CancelCauseFunc
-		handler                                    ITask
-		retry                                      RetryConfig
-		afterStartListeners, afterDisposeListeners []func()
-		closeOnStop                                []any
-		resources                                  []any
-		stopOnce                                   sync.Once
-		description                                sync.Map
-		startup, shutdown                          *util.Promise
-		parent                                     *Job
-		parentCtx                                  context.Context
-		state                                      TaskState
-		level                                      byte
-	}
-)
-
-func FromPointer(pointer uintptr) *Task {
-	return (*Task)(unsafe.Pointer(pointer))
-}
-
-func (*Task) keepalive() bool {
-	return false
-}
-
-func (task *Task) GetState() TaskState {
-	return task.state
-}
-func (task *Task) GetLevel() byte {
-	return task.level
-}
-func (task *Task) GetParent() ITask {
-	if task.parent != nil {
-		return task.parent.handler
-	}
-	return nil
-}
-func (task *Task) SetRetry(maxRetry int, retryInterval time.Duration) {
-	task.retry.MaxRetry = maxRetry
-	task.retry.RetryInterval = retryInterval
-}
-func (task *Task) GetTaskID() uint32 {
-	return task.ID
-}
-func (task *Task) GetOwnerType() string {
-	if ownerType, ok := task.description.Load(OwnerTypeKey); ok {
-		return ownerType.(string)
-	}
-	return strings.TrimSuffix(reflect.TypeOf(task.handler).Elem().Name(), "Task")
-}
-
-func (*Task) GetTaskType() TaskType {
-	return TASK_TYPE_TASK
-}
-
-func (task *Task) GetTask() *Task {
-	return task
-}
-
-func (task *Task) GetTaskPointer() uintptr {
-	return uintptr(unsafe.Pointer(task))
-}
-
-func (task *Task) GetKey() uint32 {
-	return task.ID
-}
-
-func (task *Task) getKey() any {
-	return reflect.ValueOf(task.handler).MethodByName("GetKey").Call(nil)[0].Interface()
-}
-
-func (task *Task) WaitStarted() error {
-	if task.startup == nil {
-		return nil
-	}
-	return task.startup.Await()
-}
-
-func (task *Task) WaitStopped() (err error) {
-	err = task.WaitStarted()
-	if err != nil {
-		return err
-	}
-	//if task.shutdown == nil {
-	//	return task.StopReason()
-	//}
-	return task.shutdown.Await()
-}
-
-func (task *Task) Trace(msg string, fields ...any) {
-	if task.Logger == nil {
-		slog.Default().Log(task.Context, TraceLevel, msg, fields...)
-		return
-	}
-	task.Logger.Log(task.Context, TraceLevel, msg, fields...)
-}
-
-func (task *Task) IsStopped() bool {
-	return task.Err() != nil
-}
-
-func (task *Task) StopReason() error {
-	return context.Cause(task.Context)
-}
-
-func (task *Task) StopReasonIs(errs ...error) bool {
-	stopReason := task.StopReason()
-	for _, err := range errs {
-		if errors.Is(err, stopReason) {
-			return true
-		}
-	}
-	return false
-}
-
-func (task *Task) Stop(err error) {
-	if err == nil {
-		task.Error("task stop with nil error", "taskId", task.ID, "taskType", task.GetTaskType(), "ownerType", task.GetOwnerType(), "parent", task.GetParent().GetOwnerType())
-		panic("task stop with nil error")
-	}
-	_, file, line, _ := runtime.Caller(1)
-	task.stopOnce.Do(func() {
-		if task.CancelCauseFunc != nil {
-			msg := "task stop"
-			if task.startup.IsRejected() {
-				msg = "task start failed"
-			}
-			task.Debug(msg, "caller", fmt.Sprintf("%s:%d", strings.TrimPrefix(file, sourceFilePathPrefix), line), "reason", err, "elapsed", time.Since(task.StartTime), "taskId", task.ID, "taskType", task.GetTaskType(), "ownerType", task.GetOwnerType())
-			task.CancelCauseFunc(err)
-		}
-		task.stop()
-	})
-}
-
-func (task *Task) stop() {
-	for _, resource := range task.closeOnStop {
-		switch v := resource.(type) {
-		case func():
-			v()
-		case func() error:
-			v()
-		case ITask:
-			v.Stop(task.StopReason())
-		}
-	}
-	task.closeOnStop = task.closeOnStop[:0]
-}
-
-func (task *Task) OnStart(listener func()) {
-	task.afterStartListeners = append(task.afterStartListeners, listener)
-}
-
-func (task *Task) OnDispose(listener func()) {
-	task.afterDisposeListeners = append(task.afterDisposeListeners, listener)
-}
-
-func (task *Task) Using(resource ...any) {
-	task.resources = append(task.resources, resource...)
-}
-
-func (task *Task) OnStop(resource any) {
-	task.closeOnStop = append(task.closeOnStop, resource)
-}
-
-func (task *Task) GetSignal() any {
-	return task.Done()
-}
-
-func (task *Task) checkRetry(err error) bool {
-	if errors.Is(err, ErrTaskComplete) || errors.Is(err, ErrExit) || errors.Is(err, ErrStopByUser) {
-		return false
-	}
-	if task.parent.IsStopped() {
-		return false
-	}
-	if task.retry.MaxRetry < 0 || task.retry.RetryCount < task.retry.MaxRetry {
-		task.retry.RetryCount++
-		task.SetDescription("retryCount", task.retry.RetryCount)
-		if task.retry.MaxRetry < 0 {
-			task.Warn(fmt.Sprintf("retry %d/∞", task.retry.RetryCount), "taskId", task.ID)
-		} else {
-			task.Warn(fmt.Sprintf("retry %d/%d", task.retry.RetryCount, task.retry.MaxRetry), "taskId", task.ID)
-		}
-		if delta := time.Since(task.StartTime); delta < task.retry.RetryInterval {
-			time.Sleep(task.retry.RetryInterval - delta)
-		}
-		return true
-	} else {
-		if task.retry.MaxRetry > 0 {
-			task.Warn(fmt.Sprintf("max retry %d failed", task.retry.MaxRetry))
-			return false
-		}
-	}
-	return errors.Is(err, ErrRestart)
-}
-
-func (task *Task) start() bool {
-	var err error
-	if !ThrowPanic {
-		defer func() {
-			if r := recover(); r != nil {
-				err = errors.New(fmt.Sprint(r))
-				task.Error("panic", "error", err, "stack", string(debug.Stack()))
-			}
-		}()
-	}
-	for {
-		task.StartTime = time.Now()
-		task.Debug("task start", "taskId", task.ID, "taskType", task.GetTaskType(), "ownerType", task.GetOwnerType(), "reason", task.StartReason)
-		task.state = TASK_STATE_STARTING
-		if v, ok := task.handler.(TaskStarter); ok {
-			err = v.Start()
-		}
-		if err == nil {
-			task.state = TASK_STATE_STARTED
-			task.startup.Fulfill(err)
-			for _, listener := range task.afterStartListeners {
-				if task.IsStopped() {
-					break
-				}
-				listener()
-			}
-			if task.IsStopped() {
-				err = task.StopReason()
-			} else {
-				task.ResetRetryCount()
-				if runHandler, ok := task.handler.(TaskBlock); ok {
-					task.state = TASK_STATE_RUNNING
-					task.Debug("task run", "taskId", task.ID, "taskType", task.GetTaskType(), "ownerType", task.GetOwnerType())
-					err = runHandler.Run()
-					if err == nil {
-						err = ErrTaskComplete
-					}
-				}
-			}
-		}
-		if err == nil {
-			if goHandler, ok := task.handler.(TaskGo); ok {
-				task.state = TASK_STATE_GOING
-				task.Debug("task go", "taskId", task.ID, "taskType", task.GetTaskType(), "ownerType", task.GetOwnerType())
-				go task.run(goHandler.Go)
-			}
-			return true
-		} else {
-			task.Stop(err)
-			task.parent.onChildDispose(task.handler)
-			if task.checkRetry(err) {
-				task.reset()
-			} else {
-				return false
-			}
-		}
-	}
-}
-
-func (task *Task) reset() {
-	task.stopOnce = sync.Once{}
-	task.Context, task.CancelCauseFunc = context.WithCancelCause(task.parentCtx)
-	task.shutdown = util.NewPromise(context.Background())
-	task.startup = util.NewPromise(task.Context)
-}
-
-func (task *Task) GetDescriptions() map[string]string {
-	return maps.Collect(func(yield func(key, value string) bool) {
-		task.description.Range(func(key, value any) bool {
-			return yield(key.(string), fmt.Sprintf("%+v", value))
-		})
-	})
-}
-
-func (task *Task) GetDescription(key string) (any, bool) {
-	return task.description.Load(key)
-}
-
-func (task *Task) SetDescription(key string, value any) {
-	task.description.Store(key, value)
-}
-
-func (task *Task) RemoveDescription(key string) {
-	task.description.Delete(key)
-}
-
-func (task *Task) SetDescriptions(value Description) {
-	for k, v := range value {
-		task.description.Store(k, v)
-	}
-}
-
-func (task *Task) dispose() {
-	taskType, ownerType := task.handler.GetTaskType(), task.GetOwnerType()
-	if task.state < TASK_STATE_STARTED {
-		task.Debug("task dispose canceled", "taskId", task.ID, "taskType", taskType, "ownerType", ownerType, "state", task.state)
-		return
-	}
-	reason := task.StopReason()
-	task.state = TASK_STATE_DISPOSING
-	yargs := []any{"reason", reason, "taskId", task.ID, "taskType", taskType, "ownerType", ownerType}
-	task.Debug("task dispose", yargs...)
-	defer task.Debug("task disposed", yargs...)
-	if job, ok := task.handler.(IJob); ok {
-		mt := job.getJob()
-		task.SetDescription("disposeProcess", "wait children")
-		mt.waitChildrenDispose(reason)
-	}
-	task.SetDescription("disposeProcess", "self")
-	if v, ok := task.handler.(TaskDisposal); ok {
-		v.Dispose()
-	}
-	task.shutdown.Fulfill(reason)
-	task.SetDescription("disposeProcess", "resources")
-	task.stopOnce.Do(task.stop)
-	for _, resource := range task.resources {
-		switch v := resource.(type) {
-		case func():
-			v()
-		case ITask:
-			v.Stop(task.StopReason())
-		case util.Recyclable:
-			v.Recycle()
-		case io.Closer:
-			v.Close()
-		}
-	}
-	task.resources = task.resources[:0]
-	for i, listener := range task.afterDisposeListeners {
-		task.SetDescription("disposeProcess", fmt.Sprintf("a:%d/%d", i, len(task.afterDisposeListeners)))
-		listener()
-	}
-	task.SetDescription("disposeProcess", "done")
-	task.state = TASK_STATE_DISPOSED
-}
-
-func (task *Task) ResetRetryCount() {
-	task.retry.RetryCount = 0
-}
-
-func (task *Task) GetRetryCount() int {
-	return task.retry.RetryCount
-}
-
-func (task *Task) run(handler func() error) {
-	var err error
-	defer func() {
-		if !ThrowPanic {
-			if r := recover(); r != nil {
-				err = errors.New(fmt.Sprint(r))
-				task.Error("panic", "error", err, "stack", string(debug.Stack()))
-			}
-		}
-		if err == nil {
-			task.Stop(ErrTaskComplete)
-		} else {
-			task.Stop(err)
-		}
-	}()
-	err = handler()
-}
-
-func (task *Task) Debug(msg string, args ...any) {
-	if task.Logger == nil {
-		slog.Default().Debug(msg, args...)
-		return
-	}
-	task.Logger.Debug(msg, args...)
-}
-
-func (task *Task) Info(msg string, args ...any) {
-	if task.Logger == nil {
-		slog.Default().Info(msg, args...)
-		return
-	}
-	task.Logger.Info(msg, args...)
-}
-
-func (task *Task) Warn(msg string, args ...any) {
-	if task.Logger == nil {
-		slog.Default().Warn(msg, args...)
-		return
-	}
-	task.Logger.Warn(msg, args...)
-}
-
-func (task *Task) Error(msg string, args ...any) {
-	if task.Logger == nil {
-		slog.Default().Error(msg, args...)
-		return
-	}
-	task.Logger.Error(msg, args...)
-}
-
-func (task *Task) TraceEnabled() bool {
-	return task.Logger.Enabled(task.Context, TraceLevel)
-}
-
-func (task *Task) RunTask(t ITask, opt ...any) (err error) {
-	tt := t.GetTask()
-	tt.handler = t
-	mt := task.parent
-	if job, ok := task.handler.(IJob); ok {
-		mt = job.getJob()
-	}
-	mt.initContext(tt, opt...)
-	if mt.IsStopped() {
-		err = mt.StopReason()
-		task.startup.Reject(err)
-		return
-	}
-	task.OnStop(t)
-	started := tt.start()
-	<-tt.Done()
-	if started {
-		tt.dispose()
-	}
-	return tt.StopReason()
-}

pkg/task/task_test.go

@@ -1,223 +0,0 @@
-package task
-
-import (
-	"context"
-	"errors"
-	"io"
-	"log/slog"
-	"os"
-	"sync/atomic"
-	"testing"
-	"time"
-)
-
-var root Work
-
-func init() {
-	root.Context, root.CancelCauseFunc = context.WithCancelCause(context.Background())
-	root.handler = &root
-	root.Logger = slog.New(slog.NewTextHandler(os.Stdout, nil))
-	slog.SetLogLoggerLevel(slog.LevelDebug)
-}
-
-func Test_AddTask_AddsTaskSuccessfully(t *testing.T) {
-	var task Task
-	root.AddTask(&task)
-	_ = task.WaitStarted()
-	root.RangeSubTask(func(t ITask) bool {
-		if t.GetTaskID() == task.GetTaskID() {
-			return false
-		}
-		return true
-	})
-}
-
-type retryDemoTask struct {
-	Task
-}
-
-func (task *retryDemoTask) Start() error {
-	return io.ErrClosedPipe
-}
-
-func Test_RetryTask(t *testing.T) {
-	var demoTask retryDemoTask
-	var parent Job
-	root.AddTask(&parent)
-	demoTask.SetRetry(3, time.Second)
-	parent.AddTask(&demoTask)
-	_ = parent.WaitStopped()
-	if demoTask.retry.RetryCount != 3 {
-		t.Errorf("expected 3 retries, got %d", demoTask.retry.RetryCount)
-	}
-}
-
-func Test_Call_ExecutesCallback(t *testing.T) {
-	called := false
-	root.Call(func() {
-		called = true
-		return
-	})
-	if !called {
-		t.Errorf("expected callback to be called")
-	}
-}
-
-func Test_StopByContext(t *testing.T) {
-	var task Task
-	ctx, cancel := context.WithCancel(context.Background())
-	root.AddTask(&task, ctx)
-	time.AfterFunc(time.Millisecond*100, cancel)
-	if !errors.Is(task.WaitStopped(), context.Canceled) {
-		t.Errorf("expected task to be stopped by context")
-	}
-}
-
-func Test_ParentStop(t *testing.T) {
-	var parent Job
-	root.AddTask(&parent)
-	var called atomic.Uint32
-	var task Task
-	checkCalled := func(expected uint32) {
-		if count := called.Add(1); count != expected {
-			t.Errorf("expected %d, got %d", expected, count)
-		}
-	}
-	task.OnDispose(func() {
-		checkCalled(1)
-	})
-	parent.OnDispose(func() {
-		checkCalled(2)
-	})
-	parent.AddTask(&task)
-	parent.Stop(ErrAutoStop)
-	if !errors.Is(task.WaitStopped(), ErrAutoStop) {
-		t.Errorf("expected task auto stop")
-	}
-}
-
-func Test_ParentAutoStop(t *testing.T) {
-	var parent Job
-	root.AddTask(&parent)
-	var called atomic.Uint32
-	var task Task
-	checkCalled := func(expected uint32) {
-		if count := called.Add(1); count != expected {
-			t.Errorf("expected %d, got %d", expected, count)
-		}
-	}
-	task.OnDispose(func() {
-		checkCalled(1)
-	})
-	parent.OnDispose(func() {
-		checkCalled(2)
-	})
-	parent.AddTask(&task)
-	time.AfterFunc(time.Second, func() {
-		task.Stop(ErrTaskComplete)
-	})
-	if !errors.Is(parent.WaitStopped(), ErrAutoStop) {
-		t.Errorf("expected task auto stop")
-	}
-}
-
-func Test_Hooks(t *testing.T) {
-	var called atomic.Uint32
-	var task Task
-	checkCalled := func(expected uint32) {
-		if count := called.Add(1); count != expected {
-			t.Errorf("expected %d, got %d", expected, count)
-		}
-	}
-	task.OnStart(func() {
-		checkCalled(1)
-	})
-	task.OnDispose(func() {
-		checkCalled(3)
-	})
-	task.OnStart(func() {
-		checkCalled(2)
-	})
-	task.OnDispose(func() {
-		checkCalled(4)
-	})
-	task.Stop(ErrTaskComplete)
-	root.AddTask(&task).WaitStopped()
-}
-
-type startFailTask struct {
-	Task
-}
-
-func (task *startFailTask) Start() error {
-	return errors.New("start failed")
-}
-
-func (task *startFailTask) Dispose() {
-	task.Logger.Info("Dispose")
-}
-
-func Test_StartFail(t *testing.T) {
-	var task startFailTask
-	root.AddTask(&task)
-	if err := task.WaitStarted(); err == nil {
-		t.Errorf("expected start to fail")
-	}
-}
-
-func Test_Block(t *testing.T) {
-	var task Task
-	block := make(chan struct{})
-	var job Job
-	task.OnStart(func() {
-		task.OnStop(func() {
-			close(block)
-		})
-		<-block
-	})
-	time.AfterFunc(time.Second*2, func() {
-		job.Stop(ErrTaskComplete)
-	})
-	root.AddTask(&job)
-	job.AddTask(&task)
-	job.WaitStopped()
-}
-
-//
-//type DemoTask struct {
-//	Task
-//	file     *os.File
-//	filePath string
-//}
-//
-//func (d *DemoTask) Start() (err error) {
-//	d.file, err = os.Open(d.filePath)
-//	return
-//}
-//
-//func (d *DemoTask) Run() (err error) {
-//	_, err = d.file.Write([]byte("hello"))
-//	return
-//}
-//
-//func (d *DemoTask) Dispose() {
-//	d.file.Close()
-//}
-//
-//type HelloWorld struct {
-//	DemoTask
-//}
-//
-//func (h *HelloWorld) Run() (err error) {
-//	_, err = h.file.Write([]byte("world"))
-//	return nil
-//}
-
-//type HelloWorld struct {
-//	Task
-//}
-//
-//func (h *HelloWorld) Start() (err error) {
-//	fmt.Println("Hello World")
-//	return nil
-//}

pkg/task/work.go

@@ -1,67 +0,0 @@
-package task
-
-type Work struct {
-	Job
-}
-
-func (m *Work) keepalive() bool {
-	return true
-}
-
-func (*Work) GetTaskType() TaskType {
-	return TASK_TYPE_Work
-}
-
-type WorkCollection[K comparable, T interface {
-	ITask
-	GetKey() K
-}] struct {
-	Work
-}
-
-func (c *WorkCollection[K, T]) Find(f func(T) bool) (item T, ok bool) {
-	c.RangeSubTask(func(task ITask) bool {
-		if v, _ok := task.(T); _ok && f(v) {
-			item = v
-			ok = true
-			return false
-		}
-		return true
-	})
-	return
-}
-
-func (c *WorkCollection[K, T]) Get(key K) (item T, ok bool) {
-	var value any
-	value, ok = c.children.Load(key)
-	if ok {
-		item, ok = value.(T)
-	}
-	return
-}
-
-func (c *WorkCollection[K, T]) Range(f func(T) bool) {
-	c.RangeSubTask(func(task ITask) bool {
-		if v, ok := task.(T); ok && !f(v) {
-			return false
-		}
-		return true
-	})
-}
-
-func (c *WorkCollection[K, T]) Has(key K) (ok bool) {
-	_, ok = c.children.Load(key)
-	return
-}
-
-func (c *WorkCollection[K, T]) ToList() (list []T) {
-	c.Range(func(t T) bool {
-		list = append(list, t)
-		return true
-	})
-	return
-}
-
-func (c *WorkCollection[K, T]) Length() int {
-	return int(c.Size.Load())
-}

pkg/track.go

@@ -7,9 +7,10 @@ import (
 	"reflect"
 	"time"
 
+	"github.com/langhuihui/gomem"
+	task "github.com/langhuihui/gotask"
 	"m7s.live/v5/pkg/codec"
 	"m7s.live/v5/pkg/config"
-	"m7s.live/v5/pkg/task"
 
 	"m7s.live/v5/pkg/util"
 )
@@ -55,7 +56,7 @@ type (
 		Track
 		*RingWriter
 		codec.ICodecCtx
-		Allocator *util.ScalableMemoryAllocator
+		Allocator *gomem.ScalableMemoryAllocator
 		WrapIndex int
 		TsTamer
 		SpeedController

pkg/util/Manager.go

@@ -1,27 +1,9 @@
-package task
+package util
 
 import (
-	"errors"
-	"fmt"
-
-	. "m7s.live/v5/pkg/util"
+	. "github.com/langhuihui/gotask"
 )
 
-var ErrExist = errors.New("exist")
-
-type ExistTaskError struct {
-	Task ITask
-}
-
-func (e ExistTaskError) Error() string {
-	return fmt.Sprintf("%v exist", e.Task.getKey())
-}
-
-type ManagerItem[K comparable] interface {
-	ITask
-	GetKey() K
-}
-
 type Manager[K comparable, T ManagerItem[K]] struct {
 	Work
 	Collection[K, T]
@@ -29,8 +11,12 @@ type Manager[K comparable, T ManagerItem[K]] struct {
 
 func (m *Manager[K, T]) Add(ctx T, opt ...any) *Task {
 	ctx.OnStart(func() {
-		if !m.Collection.AddUnique(ctx) {
-			ctx.Stop(ErrExist)
+		if old, ok := m.Get(ctx.GetKey()); !ok {
+			m.Collection.Add(ctx)
+		} else {
+			ctx.Stop(ExistTaskError{
+				Task: old,
+			})
 			return
 		}
 		m.Debug("add", "key", ctx.GetKey(), "count", m.Length)

pkg/util/allocator.go

@@ -1,290 +0,0 @@
-//go:build !twotree
-
-package util
-
-type (
-	Block struct {
-		Start, End          int
-		parent, left, right *Block
-	}
-	History struct {
-		Malloc bool
-		Offset int
-		Size   int
-	}
-	Allocator struct {
-		pool     *Block
-		sizeTree *Block // Single treap instead of sizeTree/offsetTree
-		Size     int
-		// history  []History
-	}
-)
-
-// Update NewAllocator
-func NewAllocator(size int) (result *Allocator) {
-	result = &Allocator{
-		sizeTree: &Block{Start: 0, End: size},
-		Size:     size,
-	}
-	return
-}
-
-func (p *Block) rotateDone(x, y *Block, a *Allocator) {
-	x.parent = p
-	if p == nil {
-		a.sizeTree = x
-	} else if p.left == y {
-		p.left = x
-	} else {
-		p.right = x
-	}
-}
-
-// Add rotation helpers similar to semaRoot
-func (x *Block) rotateLeft(a *Allocator) {
-	p, y, b := x.parent, x.right, x.right.left
-	y.left, x.parent, x.right = x, y, b
-	if b != nil {
-		b.parent = x
-	}
-	p.rotateDone(y, x, a)
-}
-
-func (y *Block) rotateRight(a *Allocator) {
-	p, x, b := y.parent, y.left, y.left.right
-	x.right, y.parent, y.left = y, x, b
-	if b != nil {
-		b.parent = y
-	}
-	p.rotateDone(x, y, a)
-}
-
-func (b *Block) insert(block *Block, allocator *Allocator) *Block {
-	if b == nil {
-		return block
-	}
-
-	if block.End == block.Start {
-		panic("empty block")
-	}
-
-	// Insert as BST using Start value
-	if block.Start < b.Start {
-		b.left = b.left.insert(block, allocator)
-		if b.left != nil {
-			b.left.parent = b
-		}
-	} else {
-		b.right = b.right.insert(block, allocator)
-		if b.right != nil {
-			b.right.parent = b
-		}
-	}
-
-	// Heapify based on block size (End-Start)
-	blockSize := block.End - block.Start
-	nodeSize := b.End - b.Start
-
-	if blockSize < nodeSize {
-		// Need to rotate up if current node has smaller size
-		if block == b.left {
-			b.rotateRight(allocator)
-			return block
-		} else if block == b.right {
-			b.rotateLeft(allocator)
-			return block
-		}
-	}
-	return b
-}
-
-func (b *Block) find(size int) (block *Block) {
-	if b == nil {
-		return nil
-	}
-
-	// First check if current block can be used
-	if blockSize := b.End - b.Start; blockSize >= size {
-		// If exact match, return this block
-		if blockSize == size {
-			return b
-		}
-		// Keep searching left for potentially better fit
-		if left := b.left.find(size); left != nil {
-			return left
-		}
-		// If no better fit found, use this block
-		return b
-	}
-	// If current block too small, only check right side
-	return b.right.find(size)
-}
-
-func (b *Block) Walk(fn func(*Block)) {
-	if b == nil {
-		return
-	}
-	b.left.Walk(fn)
-	fn(b)
-	b.right.Walk(fn)
-}
-
-func (a *Allocator) putBlock(block *Block) {
-	block.right = nil
-	block.left = nil
-	block.parent = a.pool
-	a.pool = block
-}
-
-func (a *Allocator) Allocate(size int) (offset int) {
-	// a.history = append(a.history, History{Malloc: true, Size: size})
-	block := a.sizeTree.find(size)
-	if block == nil {
-		return -1
-	}
-	offset = block.Start
-	a.deleteBlock(block)
-	if blockSize := block.End - block.Start; blockSize == size {
-		// Remove entire block
-		a.putBlock(block)
-	} else {
-		block.Start += size
-		a.insert(block)
-	}
-	return offset
-}
-
-func (a *Allocator) deleteBlock(block *Block) {
-	// Rotate block down to leaf
-	for block.left != nil || block.right != nil {
-		if block.right == nil || (block.left != nil && (block.left.End-block.left.Start) > (block.right.End-block.right.Start)) {
-			block.rotateRight(a)
-		} else {
-			block.rotateLeft(a)
-		}
-	}
-
-	// Remove leaf
-	if p := block.parent; p != nil {
-		if p.left == block {
-			p.left = nil
-		} else {
-			p.right = nil
-		}
-	} else {
-		a.sizeTree = nil
-	}
-}
-
-func (a *Allocator) insert(block *Block) {
-	// a.sizeTree.Walk(func(b *Block) {
-	// 	if block.Start >= b.Start && block.Start < b.End {
-	// 		out, _ := yaml.Marshal(a.history)
-	// 		fmt.Println(string(out))
-	// 	}
-	// })
-	a.sizeTree = a.sizeTree.insert(block, a)
-	// if a.sizeTree.parent != nil {
-	// 	panic("sizeTree parent is not nil")
-	// }
-}
-
-func (a *Allocator) Free(offset, size int) {
-	// a.history = append(a.history, History{Malloc: false, Offset: offset, Size: size})
-	// Try to merge with adjacent blocks
-	// Find adjacent blocks
-	switch left, right := a.findLeftAdjacent(offset), a.findRightAdjacent(offset+size); true {
-	case left != nil && right != nil:
-		a.deleteBlock(right)
-		a.deleteBlock(left)
-		left.End = right.End
-		a.insert(left)
-		a.putBlock(right)
-	case left == nil && right == nil:
-		block := a.getBlock(offset, offset+size)
-		a.insert(block)
-	case left != nil:
-		a.deleteBlock(left)
-		left.End = offset + size
-		a.insert(left)
-	case right != nil:
-		a.deleteBlock(right)
-		right.Start = offset
-		a.insert(right)
-	}
-}
-
-func (a *Allocator) findLeftAdjacent(offset int) (curr *Block) {
-	curr = a.sizeTree
-	for curr != nil {
-		if curr.End == offset {
-			return
-		}
-		if curr.End < offset {
-			curr = curr.right
-		} else {
-			curr = curr.left
-		}
-	}
-	return
-}
-
-func (a *Allocator) findRightAdjacent(offset int) (curr *Block) {
-	curr = a.sizeTree
-	for curr != nil {
-		if curr.Start == offset {
-			return
-		}
-		if curr.Start > offset {
-			curr = curr.left
-		} else {
-			curr = curr.right
-		}
-	}
-	return
-}
-
-func (a *Allocator) getBlock(start, end int) *Block {
-	if a.pool == nil {
-		return &Block{Start: start, End: end}
-	} else {
-		block := a.pool
-		a.pool = block.parent
-		block.parent = nil
-		block.Start, block.End = start, end
-		return block
-	}
-}
-
-func (a *Allocator) GetFreeSize() (size int) {
-	a.sizeTree.Walk(func(b *Block) {
-		size += b.End - b.Start
-	})
-	return
-}
-
-func (a *Allocator) Recycle() {
-	a.sizeTree.Walk(a.putBlock)
-	a.sizeTree = nil
-	a.pool = nil
-}
-
-func (a *Allocator) Init(size int) {
-	a.sizeTree = a.getBlock(0, size)
-	a.Size = size
-}
-
-func (a *Allocator) Find(size int) (offset int) {
-	block := a.sizeTree.find(size)
-	if block == nil {
-		return -1
-	}
-	return block.Start
-}
-
-func (a *Allocator) GetBlocks() (blocks []*Block) {
-	a.sizeTree.Walk(func(b *Block) {
-		blocks = append(blocks, b)
-	})
-	return
-}

pkg/util/allocator_2tree.go

@@ -1,360 +0,0 @@
-//go:build twotree
-
-package util
-
-const TreeIndexSize = 0
-const TreeIndexOffset = 1
-
-type (
-	Tree struct {
-		left, right *Block
-		height      int
-	}
-	Block struct {
-		Start, End int
-		trees      [2]Tree
-	}
-	History struct {
-		Malloc bool
-		Offset int
-		Size   int
-	}
-	Allocator struct {
-		pool       *Block
-		sizeTree   *Block
-		offsetTree *Block
-		Size       int
-		//history    []History
-	}
-)
-
-func (t *Tree) deleteLeft(b *Block, treeIndex int) {
-	t.left = t.left.delete(b, treeIndex)
-}
-
-func (t *Tree) deleteRight(b *Block, treeIndex int) {
-	t.right = t.right.delete(b, treeIndex)
-}
-
-func NewAllocator(size int) (result *Allocator) {
-	root := &Block{Start: 0, End: size}
-	result = &Allocator{
-		sizeTree:   root,
-		offsetTree: root,
-		Size:       size,
-	}
-	return
-}
-
-func compareBySize(a, b *Block) bool {
-	//if a.Start == b.Start {
-	//	panic("duplicate block")
-	//}
-	if sizea, sizeb := a.End-a.Start, b.End-b.Start; sizea != sizeb {
-		return sizea < sizeb
-	}
-	return a.Start < b.Start
-}
-
-func compareByOffset(a, b *Block) bool {
-	//if a.Start == b.Start {
-	//	panic("duplicate block")
-	//}
-	return a.Start < b.Start
-}
-
-var compares = [...]func(a, b *Block) bool{compareBySize, compareByOffset}
-var emptyTrees = [2]Tree{}
-
-func (b *Block) insert(block *Block, treeIndex int) *Block {
-	if b == nil {
-		return block
-	}
-	if tree := &b.trees[treeIndex]; compares[treeIndex](block, b) {
-		tree.left = tree.left.insert(block, treeIndex)
-	} else {
-		tree.right = tree.right.insert(block, treeIndex)
-	}
-	b.updateHeight(treeIndex)
-	return b.balance(treeIndex)
-}
-
-func (b *Block) getLeftHeight(treeIndex int) int {
-	return b.trees[treeIndex].left.getHeight(treeIndex)
-}
-
-func (b *Block) getRightHeight(treeIndex int) int {
-	return b.trees[treeIndex].right.getHeight(treeIndex)
-}
-
-func (b *Block) getHeight(treeIndex int) int {
-	if b == nil {
-		return 0
-	}
-	return b.trees[treeIndex].height
-}
-
-func (b *Block) updateHeight(treeIndex int) {
-	b.trees[treeIndex].height = 1 + max(b.getLeftHeight(treeIndex), b.getRightHeight(treeIndex))
-}
-
-func (b *Block) balance(treeIndex int) *Block {
-	if b == nil {
-		return nil
-	}
-	if tree := &b.trees[treeIndex]; b.getLeftHeight(treeIndex)-b.getRightHeight(treeIndex) > 1 {
-		if tree.left.getRightHeight(treeIndex) > tree.left.getLeftHeight(treeIndex) {
-			tree.left = tree.left.rotateLeft(treeIndex)
-		}
-		return b.rotateRight(treeIndex)
-	} else if b.getRightHeight(treeIndex)-b.getLeftHeight(treeIndex) > 1 {
-		if tree.right.getLeftHeight(treeIndex) > tree.right.getRightHeight(treeIndex) {
-			tree.right = tree.right.rotateRight(treeIndex)
-		}
-		return b.rotateLeft(treeIndex)
-	}
-	return b
-}
-
-func (b *Block) rotateLeft(treeIndex int) *Block {
-	newRoot := b.trees[treeIndex].right
-	b.trees[treeIndex].right = newRoot.trees[treeIndex].left
-	newRoot.trees[treeIndex].left = b
-	b.updateHeight(treeIndex)
-	newRoot.updateHeight(treeIndex)
-	return newRoot
-}
-
-func (b *Block) rotateRight(treeIndex int) *Block {
-	newRoot := b.trees[treeIndex].left
-	b.trees[treeIndex].left = newRoot.trees[treeIndex].right
-	newRoot.trees[treeIndex].right = b
-	b.updateHeight(treeIndex)
-	newRoot.updateHeight(treeIndex)
-	return newRoot
-}
-
-func (b *Block) findMin(treeIndex int) *Block {
-	if left := b.trees[treeIndex].left; left == nil {
-		return b
-	} else {
-		return left.findMin(treeIndex)
-	}
-}
-
-func (b *Block) delete(block *Block, treeIndex int) *Block {
-	if b == nil {
-		return nil
-	}
-	defer func() {
-		block.trees[treeIndex] = emptyTrees[treeIndex]
-	}()
-	if compareFunc, tree := compares[treeIndex], &b.trees[treeIndex]; b == block {
-		if tree.left == nil {
-			return tree.right
-		} else if tree.right == nil {
-			return tree.left
-		}
-		minBlock := tree.right.findMin(treeIndex)
-		tree.deleteRight(minBlock, treeIndex)
-		minTree := &minBlock.trees[treeIndex]
-		minTree.left = tree.left
-		minTree.right = tree.right
-		minTree.height = tree.height
-		return minBlock
-	} else if compareFunc(block, b) {
-		tree.deleteLeft(block, treeIndex)
-	} else {
-		tree.deleteRight(block, treeIndex)
-	}
-	b.updateHeight(treeIndex)
-	return b.balance(treeIndex)
-}
-
-func (a *Allocator) Init(size int) {
-	a.Size = size
-	root := a.getBlock(0, size)
-	a.sizeTree = root
-	a.offsetTree = root
-}
-
-func (a *Allocator) Find(size int) (offset int) {
-	block := a.findAvailableBlock(size)
-	if block == nil {
-		return -1
-	}
-	offset = block.Start
-	return
-}
-
-func (a *Allocator) Allocate(size int) (offset int) {
-	//a.history = append(a.history, History{Malloc: true, Size: size})
-	block := a.findAvailableBlock(size)
-	if block == nil {
-		return -1
-	}
-	offset = block.Start
-	a.deleteSizeTree(block)
-	a.deleteOffsetTree(block)
-	if newStart := offset + size; newStart < block.End {
-		block.Start = newStart
-		a.insertSizeTree(block)
-		a.insertOffsetTree(block)
-	} else {
-		a.putBlock(block)
-	}
-	return
-}
-
-func (a *Allocator) findAvailableBlock(size int) (lastAvailableBlock *Block) {
-	block := a.sizeTree
-	for block != nil {
-		if bSize := block.End - block.Start; bSize == size {
-			return block
-		} else if tree := &block.trees[TreeIndexSize]; size < bSize {
-			lastAvailableBlock = block
-			block = tree.left
-		} else {
-			block = tree.right
-		}
-	}
-	return
-}
-
-func (a *Allocator) getBlock(start, end int) *Block {
-	if a.pool == nil {
-		return &Block{Start: start, End: end}
-	} else {
-		block := a.pool
-		a.pool = block.trees[TreeIndexSize].left
-		block.trees = emptyTrees
-		block.Start, block.End = start, end
-		return block
-	}
-}
-
-func (a *Allocator) putBlock(b *Block) {
-	b.trees = emptyTrees
-	b.trees[TreeIndexSize].left = a.pool
-	a.pool = b
-}
-
-func (a *Allocator) Free(offset, size int) {
-	//a.history = append(a.history, History{Malloc: false, Offset: offset, Size: size})
-	switch leftAdjacent, rightAdjacent := a.offsetTree.findLeftAdjacentBlock(offset), a.offsetTree.findRightAdjacentBlock(offset+size); true {
-	case leftAdjacent != nil && rightAdjacent != nil:
-		a.deleteOffsetTree(rightAdjacent)
-		a.deleteSizeTree(rightAdjacent)
-		a.deleteSizeTree(leftAdjacent)
-		leftAdjacent.End = rightAdjacent.End
-		a.insertSizeTree(leftAdjacent)
-		a.putBlock(rightAdjacent)
-	case leftAdjacent == nil && rightAdjacent == nil:
-		block := a.getBlock(offset, offset+size)
-		a.insertSizeTree(block)
-		a.insertOffsetTree(block)
-	case leftAdjacent != nil:
-		a.deleteSizeTree(leftAdjacent)
-		leftAdjacent.End = offset + size
-		a.insertSizeTree(leftAdjacent)
-	case rightAdjacent != nil:
-		a.deleteOffsetTree(rightAdjacent)
-		a.deleteSizeTree(rightAdjacent)
-		rightAdjacent.Start = offset
-		a.insertSizeTree(rightAdjacent)
-		a.insertOffsetTree(rightAdjacent)
-	}
-}
-
-func (a *Allocator) GetBlocks() (blocks []*Block) {
-	a.offsetTree.Walk(func(block *Block) {
-		blocks = append(blocks, block)
-	}, 1)
-	return
-}
-
-func (a *Allocator) GetFreeSize() (ret int) {
-	a.offsetTree.Walk(func(block *Block) {
-		ret += block.End - block.Start
-	}, 1)
-	return
-}
-
-func (a *Allocator) insertSizeTree(block *Block) {
-	//if block.End == block.Start {
-	//	panic("empty block")
-	//}
-	//a.sizeTree.Walk(func(b *Block) {
-	//	if block.Start >= b.Start && block.Start < b.End {
-	//		out, _ := yaml.Marshal(a.history)
-	//		fmt.Println(string(out))
-	//	}
-	//}, 0)
-	a.sizeTree = a.sizeTree.insert(block, TreeIndexSize)
-}
-
-func (a *Allocator) insertOffsetTree(block *Block) {
-	//if block.End == block.Start {
-	//	panic("empty block")
-	//}
-	//a.offsetTree.Walk(func(b *Block) {
-	//	if block.Start >= b.Start && block.Start < b.End {
-	//		out, _ := yaml.Marshal(a.history)
-	//		fmt.Println(string(out))
-	//	}
-	//}, 1)
-	a.offsetTree = a.offsetTree.insert(block, TreeIndexOffset)
-}
-
-func (a *Allocator) deleteSizeTree(block *Block) {
-	a.sizeTree = a.sizeTree.delete(block, TreeIndexSize)
-}
-
-func (a *Allocator) deleteOffsetTree(block *Block) {
-	a.offsetTree = a.offsetTree.delete(block, TreeIndexOffset)
-}
-
-func (b *Block) findLeftAdjacentBlock(offset int) *Block {
-	for b != nil {
-		if b.End == offset {
-			return b
-		}
-		if tree := &b.trees[TreeIndexOffset]; b.End > offset {
-			b = tree.left
-		} else {
-			b = tree.right
-		}
-	}
-	return nil
-}
-
-func (b *Block) findRightAdjacentBlock(offset int) *Block {
-	for b != nil {
-		if b.Start == offset {
-			return b
-		}
-		if tree := &b.trees[TreeIndexOffset]; b.Start < offset {
-			b = tree.right
-		} else {
-			b = tree.left
-		}
-	}
-	return nil
-}
-
-func (a *Allocator) Recycle() {
-	a.sizeTree.Walk(func(block *Block) {
-		a.putBlock(block)
-	}, 0)
-	a.sizeTree = nil
-	a.offsetTree = nil
-}
-
-func (b *Block) Walk(fn func(*Block), index int) {
-	if b == nil {
-		return
-	}
-	b.trees[index].left.Walk(fn, index)
-	fn(b)
-	b.trees[index].right.Walk(fn, index)
-}

pkg/util/allocator_test.go

@@ -1,174 +0,0 @@
-package util
-
-import (
-	"slices"
-	"testing"
-
-	"gopkg.in/yaml.v3"
-)
-
-func TestAllocator(t *testing.T) {
-	allocator := NewAllocator(1000)
-
-	// 分配内存
-	block1 := allocator.Allocate(100)
-	if block1 != 0 {
-		t.Error("Failed to allocate memory")
-	}
-
-	// 分配内存
-	block2 := allocator.Allocate(200)
-	if block2 != 100 {
-		t.Error("Failed to allocate memory")
-	}
-
-	// 释放内存
-	allocator.Free(0, 299)
-	if allocator.GetFreeSize() != 999 {
-		t.Error("Failed to free memory")
-	}
-	allocator.Free(299, 1)
-
-	// 重新分配内存
-	block3 := allocator.Allocate(50)
-	if block3 != 0 {
-		t.Error("Failed to allocate memory")
-	}
-
-	// 释放内存
-	allocator.Free(0, 50)
-
-	// 分配大于剩余空间的内存
-	block4 := allocator.Allocate(1000)
-	if block4 != 0 {
-		t.Error("Should not allocate memory larger than available space")
-	}
-}
-
-func FuzzAllocator(f *testing.F) {
-	f.Add(100, false)
-	allocator := NewAllocator(65535)
-	var used [][2]int
-	var totalMalloc, totalFree int = 0, 0
-	f.Fuzz(func(t *testing.T, size int, alloc bool) {
-		free := !alloc
-		if size <= 0 {
-			return
-		}
-		t.Logf("totalFree:%d,size:%d, free:%v", totalFree, size, free)
-		defer func() {
-			t.Logf("totalMalloc:%d, totalFree:%d, freeSize:%d", totalMalloc, totalFree, allocator.GetFreeSize())
-			if totalMalloc-totalFree != allocator.Size-allocator.GetFreeSize() {
-				t.Logf("totalUsed:%d, used:%d", totalMalloc-totalFree, allocator.Size-allocator.GetFreeSize())
-				t.FailNow()
-			}
-		}()
-		if free {
-			if len(used) == 0 {
-				return
-			}
-			for _, u := range used {
-				if u[1] > size {
-					totalFree += size
-					t.Logf("totalFree1:%d, free:%v", totalFree, size)
-					allocator.Free(u[0], size)
-					u[1] -= size
-					u[0] += size
-					return
-				}
-			}
-			allocator.Free(used[0][0], used[0][1])
-			totalFree += used[0][1]
-			t.Logf("totalFree2:%d, free:%v", totalFree, used[0][1])
-			used = slices.Delete(used, 0, 1)
-			return
-		}
-		offset := allocator.Allocate(size)
-		if offset == -1 {
-			return
-		}
-		used = append(used, [2]int{offset, size})
-		totalMalloc += size
-		t.Logf("totalMalloc:%d, free:%v", totalMalloc, size)
-	})
-}
-
-const testData = `
-- malloc: true
-  offset: 0
-  size: 16384
-- malloc: false
-  offset: 139
-  size: 16245
-- malloc: false
-  offset: 0
-  size: 50
-- malloc: false
-  offset: 50
-  size: 31
-- malloc: false
-  offset: 81
-  size: 9
-- malloc: false
-  offset: 90
-  size: 26
-- malloc: false
-  offset: 116
-  size: 21
-- malloc: false
-  offset: 137
-  size: 2
-- malloc: true
-  offset: 0
-  size: 16384
-- malloc: false
-  offset: 277
-  size: 16107
-- malloc: true
-  offset: 0
-  size: 16384
-- malloc: false
-  offset: 432
-  size: 16229
-- malloc: false
-  offset: 0
-  size: 277
-- malloc: false
-  offset: 277
-  size: 58
-- malloc: false
-  offset: 335
-  size: 60
-- malloc: false
-  offset: 395
-  size: 9
-- malloc: false
-  offset: 404
-  size: 26
-- malloc: true
-  offset: 0
-  size: 16384
-- malloc: false
-  offset: 557
-  size: 16259
-- malloc: false
-  offset: 430
-  size: 2
-`
-
-var history []History
-
-func init() {
-	yaml.Unmarshal([]byte(testData), &history)
-}
-
-func TestAllocatorUseData(t *testing.T) {
-	allocator := NewAllocator(65535)
-	for _, h := range history {
-		if h.Malloc {
-			allocator.Allocate(h.Size)
-		} else {
-			allocator.Free(h.Offset, h.Size)
-		}
-	}
-}

pkg/util/buddy.go

@@ -1,148 +0,0 @@
-package util
-
-import (
-	"errors"
-	"sync"
-	"unsafe"
-)
-
-type Buddy struct {
-	size       int
-	longests   [BuddySize>>(MinPowerOf2-1) - 1]int
-	memoryPool [BuddySize]byte
-	poolStart  int64
-	lock       sync.Mutex // 保护 longests 数组的并发访问
-}
-
-var (
-	InValidParameterErr = errors.New("buddy: invalid parameter")
-	NotFoundErr         = errors.New("buddy: can't find block")
-	buddyPool           = sync.Pool{
-		New: func() interface{} {
-			return NewBuddy()
-		},
-	}
-)
-
-// GetBuddy 从池中获取一个 Buddy 实例
-func GetBuddy() *Buddy {
-	buddy := buddyPool.Get().(*Buddy)
-	return buddy
-}
-
-// PutBuddy 将 Buddy 实例放回池中
-func PutBuddy(b *Buddy) {
-	buddyPool.Put(b)
-}
-
-// NewBuddy creates a buddy instance.
-// If the parameter isn't valid, return the nil and error as well
-func NewBuddy() *Buddy {
-	size := BuddySize >> MinPowerOf2
-	ret := &Buddy{
-		size: size,
-	}
-	for nodeSize, i := 2*size, 0; i < len(ret.longests); i++ {
-		if isPowerOf2(i + 1) {
-			nodeSize /= 2
-		}
-		ret.longests[i] = nodeSize
-	}
-	ret.poolStart = int64(uintptr(unsafe.Pointer(&ret.memoryPool[0])))
-
-	return ret
-}
-
-// Alloc find a unused block according to the size
-// return the offset of the block(regard 0 as the beginning)
-// and parameter error if any
-func (b *Buddy) Alloc(size int) (offset int, err error) {
-	if size <= 0 {
-		err = InValidParameterErr
-		return
-	}
-	if !isPowerOf2(size) {
-		size = fixSize(size)
-	}
-	b.lock.Lock()
-	defer b.lock.Unlock()
-	if size > b.longests[0] {
-		err = NotFoundErr
-		return
-	}
-	index := 0
-	for nodeSize := b.size; nodeSize != size; nodeSize /= 2 {
-		if left := leftChild(index); b.longests[left] >= size {
-			index = left
-		} else {
-			index = rightChild(index)
-		}
-	}
-	b.longests[index] = 0 // mark zero as used
-	offset = (index+1)*size - b.size
-	// update the parent node's size
-	for index != 0 {
-		index = parent(index)
-		b.longests[index] = max(b.longests[leftChild(index)], b.longests[rightChild(index)])
-	}
-	return
-}
-
-// Free find a block according to the offset and mark it as unused
-// return error if not found or parameter invalid
-func (b *Buddy) Free(offset int) error {
-	if offset < 0 || offset >= b.size {
-		return InValidParameterErr
-	}
-	b.lock.Lock()
-	defer b.lock.Unlock()
-	nodeSize := 1
-	index := offset + b.size - 1
-	for ; b.longests[index] != 0; index = parent(index) {
-		nodeSize *= 2
-		if index == 0 {
-			return NotFoundErr
-		}
-	}
-	b.longests[index] = nodeSize
-	// update parent node's size
-	for index != 0 {
-		index = parent(index)
-		nodeSize *= 2
-
-		leftSize := b.longests[leftChild(index)]
-		rightSize := b.longests[rightChild(index)]
-		if leftSize+rightSize == nodeSize {
-			b.longests[index] = nodeSize
-		} else {
-			b.longests[index] = max(leftSize, rightSize)
-		}
-	}
-	return nil
-}
-
-// helpers
-func isPowerOf2(size int) bool {
-	return size&(size-1) == 0
-}
-
-func fixSize(size int) int {
-	size |= size >> 1
-	size |= size >> 2
-	size |= size >> 4
-	size |= size >> 8
-	size |= size >> 16
-	return size + 1
-}
-
-func leftChild(index int) int {
-	return 2*index + 1
-}
-
-func rightChild(index int) int {
-	return 2*index + 2
-}
-
-func parent(index int) int {
-	return (index+1)/2 - 1
-}

pkg/util/buddy_disable.go

@@ -1,63 +0,0 @@
-//go:build !enable_buddy
-
-package util
-
-import (
-	"sync"
-	"unsafe"
-)
-
-var pool0, pool1, pool2 sync.Pool
-
-func init() {
-	pool0.New = func() any {
-		ret := createMemoryAllocator(defaultBufSize)
-		ret.recycle = func() {
-			pool0.Put(ret)
-		}
-		return ret
-	}
-	pool1.New = func() any {
-		ret := createMemoryAllocator(1 << MinPowerOf2)
-		ret.recycle = func() {
-			pool1.Put(ret)
-		}
-		return ret
-	}
-	pool2.New = func() any {
-		ret := createMemoryAllocator(1 << (MinPowerOf2 + 2))
-		ret.recycle = func() {
-			pool2.Put(ret)
-		}
-		return ret
-	}
-}
-
-func createMemoryAllocator(size int) *MemoryAllocator {
-	memory := make([]byte, size)
-	ret := &MemoryAllocator{
-		allocator: NewAllocator(size),
-		Size:      size,
-		memory:    memory,
-		start:     int64(uintptr(unsafe.Pointer(&memory[0]))),
-	}
-	ret.allocator.Init(size)
-	return ret
-}
-
-func GetMemoryAllocator(size int) (ret *MemoryAllocator) {
-	switch size {
-	case defaultBufSize:
-		ret = pool0.Get().(*MemoryAllocator)
-		ret.allocator.Init(size)
-	case 1 << MinPowerOf2:
-		ret = pool1.Get().(*MemoryAllocator)
-		ret.allocator.Init(size)
-	case 1 << (MinPowerOf2 + 2):
-		ret = pool2.Get().(*MemoryAllocator)
-		ret.allocator.Init(size)
-	default:
-		ret = createMemoryAllocator(size)
-	}
-	return
-}

pkg/util/buddy_enable.go

@@ -1,44 +0,0 @@
-//go:build enable_buddy
-
-package util
-
-import "unsafe"
-
-func createMemoryAllocator(size int, buddy *Buddy, offset int) *MemoryAllocator {
-	ret := &MemoryAllocator{
-		allocator: NewAllocator(size),
-		Size:      size,
-		memory:    buddy.memoryPool[offset : offset+size],
-		start:     buddy.poolStart + int64(offset),
-		recycle: func() {
-			buddy.Free(offset >> MinPowerOf2)
-		},
-	}
-	ret.allocator.Init(size)
-	return ret
-}
-
-func GetMemoryAllocator(size int) (ret *MemoryAllocator) {
-	if size < BuddySize {
-		requiredSize := size >> MinPowerOf2
-		// 循环尝试从池中获取可用的 buddy
-		for {
-			buddy := GetBuddy()
-			defer PutBuddy(buddy)
-			offset, err := buddy.Alloc(requiredSize)
-			if err == nil {
-				// 分配成功，使用这个 buddy
-				return createMemoryAllocator(size, buddy, offset<<MinPowerOf2)
-			}
-		}
-	}
-	// 池中的 buddy 都无法分配或大小不够，使用系统内存
-	memory := make([]byte, size)
-	start := int64(uintptr(unsafe.Pointer(&memory[0])))
-	return &MemoryAllocator{
-		allocator: NewAllocator(size),
-		Size:      size,
-		memory:    memory,
-		start:     start,
-	}
-}

pkg/util/buf_reader.go

@@ -6,6 +6,8 @@ import (
 	"net/textproto"
 	"strings"
 	"time"
+
+	. "github.com/langhuihui/gomem"
 )
 
 const defaultBufSize = 1 << 14
@@ -17,13 +19,24 @@ type BufReader struct {
 	BufLen    int
 	Mouth     chan []byte
 	feedData  func() error
+	timeout   time.Duration
+}
+
+func (r *BufReader) SetTimeout(timeout time.Duration) {
+	r.timeout = timeout
 }
 
 func NewBufReaderWithBufLen(reader io.Reader, bufLen int) (r *BufReader) {
+	conn, _ := reader.(net.Conn)
 	r = &BufReader{
 		Allocator: NewScalableMemoryAllocator(bufLen),
 		BufLen:    bufLen,
 		feedData: func() error {
+			if conn != nil && r.timeout > 0 {
+				if err := conn.SetReadDeadline(time.Now().Add(r.timeout)); err != nil {
+					return err
+				}
+			}
 			buf, err := r.Allocator.Read(reader, r.BufLen)
 			if err != nil {
 				return err
@@ -41,34 +54,6 @@ func NewBufReaderWithBufLen(reader io.Reader, bufLen int) (r *BufReader) {
 	return
 }
 
-// NewBufReaderWithTimeout 创建一个具有指定读取超时时间的 BufReader
-func NewBufReaderWithTimeout(conn net.Conn, timeout time.Duration) (r *BufReader) {
-	r = &BufReader{
-		Allocator: NewScalableMemoryAllocator(defaultBufSize),
-		BufLen:    defaultBufSize,
-		feedData: func() error {
-			// 设置读取超时
-			if conn != nil && timeout > 0 {
-				if err := conn.SetReadDeadline(time.Now().Add(timeout)); err != nil {
-					return err
-				}
-			}
-			buf, err := r.Allocator.Read(conn, r.BufLen)
-			if err != nil {
-				return err
-			}
-			n := len(buf)
-			r.totalRead += n
-			r.buf.Buffers = append(r.buf.Buffers, buf)
-			r.buf.Size += n
-			r.buf.Length += n
-			return nil
-		},
-	}
-	r.buf.Memory = &Memory{}
-	return
-}
-
 func NewBufReaderBuffersChan(feedChan chan net.Buffers) (r *BufReader) {
 	r = &BufReader{
 		feedData: func() error {

pkg/util/buf_reader_benchmark_test.go

@@ -0,0 +1,408 @@
+package util
+
+import (
+	"bufio"
+	"io"
+	"math/rand"
+	"runtime"
+	"testing"
+)
+
+// mockNetworkReader 模拟真实网络数据源
+//
+// 真实的网络读取场景中，每次 Read() 调用返回的数据长度是不确定的，
+// 受多种因素影响：
+// - TCP 接收窗口大小
+// - 网络延迟和带宽
+// - 操作系统缓冲区状态
+// - 网络拥塞情况
+//
+// 这个 mock reader 通过每次返回随机长度的数据来模拟真实网络行为，
+// 使基准测试更加接近实际应用场景。
+type mockNetworkReader struct {
+	data   []byte
+	offset int
+	rng    *rand.Rand
+	// minChunk 和 maxChunk 控制每次返回的数据块大小范围
+	minChunk int
+	maxChunk int
+}
+
+func (m *mockNetworkReader) Read(p []byte) (n int, err error) {
+	if m.offset >= len(m.data) {
+		m.offset = 0 // 循环读取
+	}
+
+	// 计算本次可以返回的最大长度
+	remaining := len(m.data) - m.offset
+	maxRead := len(p)
+	if remaining < maxRead {
+		maxRead = remaining
+	}
+
+	// 随机返回 minChunk 到 min(maxChunk, maxRead) 之间的数据
+	chunkSize := m.minChunk
+	if m.maxChunk > m.minChunk && maxRead > m.minChunk {
+		maxPossible := m.maxChunk
+		if maxRead < maxPossible {
+			maxPossible = maxRead
+		}
+		chunkSize = m.minChunk + m.rng.Intn(maxPossible-m.minChunk+1)
+	}
+	if chunkSize > maxRead {
+		chunkSize = maxRead
+	}
+
+	n = copy(p[:chunkSize], m.data[m.offset:m.offset+chunkSize])
+	m.offset += n
+	return n, nil
+}
+
+// newMockNetworkReader 创建一个模拟真实网络的 reader
+// 每次 Read 返回随机长度的数据（在 minChunk 到 maxChunk 之间）
+func newMockNetworkReader(size int, minChunk, maxChunk int) *mockNetworkReader {
+	data := make([]byte, size)
+	for i := range data {
+		data[i] = byte(i % 256)
+	}
+	return &mockNetworkReader{
+		data:     data,
+		rng:      rand.New(rand.NewSource(42)), // 固定种子保证可重复性
+		minChunk: minChunk,
+		maxChunk: maxChunk,
+	}
+}
+
+// newMockNetworkReaderDefault 创建默认配置的模拟网络 reader
+// 每次返回 64 到 2048 字节之间的随机数据
+func newMockNetworkReaderDefault(size int) *mockNetworkReader {
+	return newMockNetworkReader(size, 64, 2048)
+}
+
+// ============================================================
+// 单元测试：验证 mockNetworkReader 的行为
+// ============================================================
+
+// TestMockNetworkReader_RandomChunks 验证随机长度读取功能
+func TestMockNetworkReader_RandomChunks(t *testing.T) {
+	reader := newMockNetworkReader(10000, 100, 500)
+	buf := make([]byte, 1000)
+
+	// 读取多次，验证每次返回的长度在预期范围内
+	for i := 0; i < 10; i++ {
+		n, err := reader.Read(buf)
+		if err != nil {
+			t.Fatalf("读取失败: %v", err)
+		}
+		if n < 100 || n > 500 {
+			t.Errorf("第 %d 次读取返回 %d 字节，期望在 [100, 500] 范围内", i, n)
+		}
+	}
+}
+
+// ============================================================
+// 核心基准测试：模拟真实网络场景
+// ============================================================
+
+// BenchmarkConcurrentNetworkRead_Bufio 模拟并发网络连接处理 - bufio.Reader
+// 这个测试模拟多个并发连接持续读取和处理网络数据
+// bufio.Reader 会为每个数据包分配新的缓冲区，产生大量临时内存
+func BenchmarkConcurrentNetworkRead_Bufio(b *testing.B) {
+	b.RunParallel(func(pb *testing.PB) {
+		// 每个 goroutine 代表一个网络连接
+		reader := bufio.NewReaderSize(newMockNetworkReaderDefault(10*1024*1024), 4096)
+
+		for pb.Next() {
+			// 模拟读取网络数据包并处理
+			// 这里每次都分配新的缓冲区（真实场景中的常见做法）
+			buf := make([]byte, 1024) // 每次分配 1KB - 会产生 GC 压力
+			n, err := reader.Read(buf)
+			if err != nil {
+				b.Fatal(err)
+			}
+
+			// 模拟处理数据（计算校验和）
+			var sum int
+			for i := 0; i < n; i++ {
+				sum += int(buf[i])
+			}
+			_ = sum
+		}
+	})
+}
+
+// BenchmarkConcurrentNetworkRead_BufReader 模拟并发网络连接处理 - BufReader
+// 使用 BufReader 的零拷贝特性，通过内存池复用避免频繁分配
+func BenchmarkConcurrentNetworkRead_BufReader(b *testing.B) {
+	b.RunParallel(func(pb *testing.PB) {
+		// 每个 goroutine 代表一个网络连接
+		reader := NewBufReader(newMockNetworkReaderDefault(10 * 1024 * 1024))
+		defer reader.Recycle()
+
+		for pb.Next() {
+			// 使用零拷贝的 ReadRange，无需分配缓冲区
+			var sum int
+			err := reader.ReadRange(1024, func(data []byte) {
+				// 直接处理原始数据，无内存分配
+				for _, b := range data {
+					sum += int(b)
+				}
+			})
+			if err != nil {
+				b.Fatal(err)
+			}
+			_ = sum
+		}
+	})
+}
+
+// BenchmarkConcurrentProtocolParsing_Bufio 模拟并发协议解析 - bufio.Reader
+// 模拟流媒体服务器解析多个并发流的数据包
+func BenchmarkConcurrentProtocolParsing_Bufio(b *testing.B) {
+	b.RunParallel(func(pb *testing.PB) {
+		reader := bufio.NewReaderSize(newMockNetworkReaderDefault(10*1024*1024), 4096)
+
+		for pb.Next() {
+			// 读取包头（4字节长度）
+			header := make([]byte, 4) // 分配 1
+			_, err := io.ReadFull(reader, header)
+			if err != nil {
+				b.Fatal(err)
+			}
+
+			// 计算数据包大小（256-1024 字节）
+			size := 256 + int(header[3])%768
+
+			// 读取数据包内容
+			packet := make([]byte, size) // 分配 2
+			_, err = io.ReadFull(reader, packet)
+			if err != nil {
+				b.Fatal(err)
+			}
+
+			// 模拟处理数据包
+			_ = packet
+		}
+	})
+}
+
+// BenchmarkConcurrentProtocolParsing_BufReader 模拟并发协议解析 - BufReader
+func BenchmarkConcurrentProtocolParsing_BufReader(b *testing.B) {
+	b.RunParallel(func(pb *testing.PB) {
+		reader := NewBufReader(newMockNetworkReaderDefault(10 * 1024 * 1024))
+		defer reader.Recycle()
+
+		for pb.Next() {
+			// 读取包头
+			size, err := reader.ReadBE32(4)
+			if err != nil {
+				b.Fatal(err)
+			}
+
+			// 计算数据包大小
+			packetSize := 256 + int(size)%768
+
+			// 零拷贝读取和处理
+			err = reader.ReadRange(packetSize, func(data []byte) {
+				// 直接处理，无需分配
+				_ = data
+			})
+			if err != nil {
+				b.Fatal(err)
+			}
+		}
+	})
+}
+
+// BenchmarkHighFrequencyReads_Bufio 高频小包读取 - bufio.Reader
+// 模拟视频流的高频小包场景（如 30fps 视频流）
+func BenchmarkHighFrequencyReads_Bufio(b *testing.B) {
+	reader := bufio.NewReaderSize(newMockNetworkReaderDefault(10*1024*1024), 4096)
+
+	b.ResetTimer()
+	b.ReportAllocs()
+
+	for i := 0; i < b.N; i++ {
+		// 每次读取小数据包（128 字节）
+		buf := make([]byte, 128) // 频繁分配小对象
+		_, err := reader.Read(buf)
+		if err != nil {
+			b.Fatal(err)
+		}
+		_ = buf
+	}
+}
+
+// BenchmarkHighFrequencyReads_BufReader 高频小包读取 - BufReader
+func BenchmarkHighFrequencyReads_BufReader(b *testing.B) {
+	reader := NewBufReader(newMockNetworkReaderDefault(10 * 1024 * 1024))
+	defer reader.Recycle()
+
+	b.ResetTimer()
+	b.ReportAllocs()
+
+	for i := 0; i < b.N; i++ {
+		// 零拷贝读取
+		err := reader.ReadRange(128, func(data []byte) {
+			_ = data
+		})
+		if err != nil {
+			b.Fatal(err)
+		}
+	}
+}
+
+// ============================================================
+// GC 压力测试：展示长时间运行下的 GC 影响
+// ============================================================
+
+// BenchmarkGCPressure_Bufio 展示 bufio.Reader 在持续运行下的 GC 压力
+// 这个测试会产生大量临时内存分配，触发频繁 GC
+func BenchmarkGCPressure_Bufio(b *testing.B) {
+	var beforeGC runtime.MemStats
+	runtime.ReadMemStats(&beforeGC)
+
+	// 模拟 10 个并发连接持续处理数据
+	b.SetParallelism(10)
+	b.RunParallel(func(pb *testing.PB) {
+		reader := bufio.NewReaderSize(newMockNetworkReaderDefault(100*1024*1024), 4096)
+
+		for pb.Next() {
+			// 模拟处理一个数据包：读取 + 处理 + 临时分配
+			buf := make([]byte, 512) // 每次分配 512 字节
+			n, err := reader.Read(buf)
+			if err != nil {
+				b.Fatal(err)
+			}
+
+			// 模拟数据处理（可能需要额外分配）
+			processed := make([]byte, n) // 再分配一次
+			copy(processed, buf[:n])
+
+			// 模拟业务处理
+			var sum int64
+			for _, v := range processed {
+				sum += int64(v)
+			}
+			_ = sum
+		}
+	})
+
+	var afterGC runtime.MemStats
+	runtime.ReadMemStats(&afterGC)
+
+	// 报告 GC 统计
+	b.ReportMetric(float64(afterGC.NumGC-beforeGC.NumGC), "gc-runs")
+	b.ReportMetric(float64(afterGC.TotalAlloc-beforeGC.TotalAlloc)/1024/1024, "MB-alloc")
+	b.ReportMetric(float64(afterGC.Mallocs-beforeGC.Mallocs), "mallocs")
+}
+
+// BenchmarkGCPressure_BufReader 展示 BufReader 通过内存复用降低 GC 压力
+// 零拷贝 + 内存池复用，几乎不产生临时对象
+func BenchmarkGCPressure_BufReader(b *testing.B) {
+	var beforeGC runtime.MemStats
+	runtime.ReadMemStats(&beforeGC)
+
+	b.SetParallelism(10)
+	b.RunParallel(func(pb *testing.PB) {
+		reader := NewBufReader(newMockNetworkReaderDefault(100 * 1024 * 1024))
+		defer reader.Recycle()
+
+		for pb.Next() {
+			// 零拷贝处理，无临时分配
+			var sum int64
+			err := reader.ReadRange(512, func(data []byte) {
+				// 直接在原始内存上处理，无需拷贝
+				for _, v := range data {
+					sum += int64(v)
+				}
+			})
+			if err != nil {
+				b.Fatal(err)
+			}
+			_ = sum
+		}
+	})
+
+	var afterGC runtime.MemStats
+	runtime.ReadMemStats(&afterGC)
+
+	// 报告 GC 统计
+	b.ReportMetric(float64(afterGC.NumGC-beforeGC.NumGC), "gc-runs")
+	b.ReportMetric(float64(afterGC.TotalAlloc-beforeGC.TotalAlloc)/1024/1024, "MB-alloc")
+	b.ReportMetric(float64(afterGC.Mallocs-beforeGC.Mallocs), "mallocs")
+}
+
+// BenchmarkStreamingServer_Bufio 模拟流媒体服务器场景 - bufio.Reader
+// 100 个并发连接，每个连接持续读取和转发数据
+func BenchmarkStreamingServer_Bufio(b *testing.B) {
+	var beforeGC runtime.MemStats
+	runtime.ReadMemStats(&beforeGC)
+
+	b.RunParallel(func(pb *testing.PB) {
+		reader := bufio.NewReaderSize(newMockNetworkReaderDefault(50*1024*1024), 8192)
+		frameNum := 0
+
+		for pb.Next() {
+			// 读取一帧数据（1KB-4KB 之间变化）
+			frameSize := 1024 + (frameNum%3)*1024
+			frameNum++
+			frame := make([]byte, frameSize)
+
+			_, err := io.ReadFull(reader, frame)
+			if err != nil {
+				b.Fatal(err)
+			}
+
+			// 模拟转发给多个订阅者（需要拷贝）
+			for i := 0; i < 3; i++ {
+				subscriber := make([]byte, len(frame))
+				copy(subscriber, frame)
+				_ = subscriber
+			}
+		}
+	})
+
+	var afterGC runtime.MemStats
+	runtime.ReadMemStats(&afterGC)
+
+	gcRuns := afterGC.NumGC - beforeGC.NumGC
+	totalAlloc := float64(afterGC.TotalAlloc-beforeGC.TotalAlloc) / 1024 / 1024
+
+	b.ReportMetric(float64(gcRuns), "gc-runs")
+	b.ReportMetric(totalAlloc, "MB-alloc")
+}
+
+// BenchmarkStreamingServer_BufReader 模拟流媒体服务器场景 - BufReader
+func BenchmarkStreamingServer_BufReader(b *testing.B) {
+	var beforeGC runtime.MemStats
+	runtime.ReadMemStats(&beforeGC)
+
+	b.RunParallel(func(pb *testing.PB) {
+		reader := NewBufReader(newMockNetworkReaderDefault(50 * 1024 * 1024))
+		defer reader.Recycle()
+
+		for pb.Next() {
+			// 零拷贝读取
+			err := reader.ReadRange(1024+1024, func(frame []byte) {
+				// 直接使用原始数据，无需拷贝
+				// 模拟转发（实际可以使用引用计数或共享内存）
+				for i := 0; i < 3; i++ {
+					_ = frame
+				}
+			})
+			if err != nil {
+				b.Fatal(err)
+			}
+		}
+	})
+
+	var afterGC runtime.MemStats
+	runtime.ReadMemStats(&afterGC)
+
+	gcRuns := afterGC.NumGC - beforeGC.NumGC
+	totalAlloc := float64(afterGC.TotalAlloc-beforeGC.TotalAlloc) / 1024 / 1024
+
+	b.ReportMetric(float64(gcRuns), "gc-runs")
+	b.ReportMetric(totalAlloc, "MB-alloc")
+}

pkg/util/buffer_test.go

@@ -4,6 +4,8 @@ import (
 	"math/rand"
 	"testing"
 	"time"
+
+	. "github.com/langhuihui/gomem"
 )
 
 func TestBuffer(t *testing.T) {

pkg/util/mem.go

@@ -1,110 +0,0 @@
-package util
-
-import (
-	"io"
-	"net"
-	"slices"
-)
-
-const (
-	MaxBlockSize = 1 << 22
-	BuddySize    = MaxBlockSize << 7
-	MinPowerOf2  = 10
-)
-
-type Memory struct {
-	Size    int
-	Buffers [][]byte
-}
-
-func NewMemory(buf []byte) Memory {
-	return Memory{
-		Buffers: net.Buffers{buf},
-		Size:    len(buf),
-	}
-}
-
-func (m *Memory) WriteTo(w io.Writer) (n int64, err error) {
-	copy := net.Buffers(slices.Clone(m.Buffers))
-	return copy.WriteTo(w)
-}
-
-func (m *Memory) Reset() {
-	m.Buffers = m.Buffers[:0]
-	m.Size = 0
-}
-
-func (m *Memory) UpdateBuffer(index int, buf []byte) {
-	if index < 0 {
-		index = len(m.Buffers) + index
-	}
-	m.Size = len(buf) - len(m.Buffers[index])
-	m.Buffers[index] = buf
-}
-
-func (m *Memory) CopyFrom(b *Memory) {
-	buf := make([]byte, b.Size)
-	b.CopyTo(buf)
-	m.PushOne(buf)
-}
-
-func (m *Memory) Equal(b *Memory) bool {
-	if m.Size != b.Size || len(m.Buffers) != len(b.Buffers) {
-		return false
-	}
-	for i, buf := range m.Buffers {
-		if !slices.Equal(buf, b.Buffers[i]) {
-			return false
-		}
-	}
-	return true
-}
-
-func (m *Memory) CopyTo(buf []byte) {
-	for _, b := range m.Buffers {
-		l := len(b)
-		copy(buf, b)
-		buf = buf[l:]
-	}
-}
-
-func (m *Memory) ToBytes() []byte {
-	buf := make([]byte, m.Size)
-	m.CopyTo(buf)
-	return buf
-}
-
-func (m *Memory) PushOne(b []byte) {
-	m.Buffers = append(m.Buffers, b)
-	m.Size += len(b)
-}
-
-func (m *Memory) Push(b ...[]byte) {
-	m.Buffers = append(m.Buffers, b...)
-	for _, level0 := range b {
-		m.Size += len(level0)
-	}
-}
-
-func (m *Memory) Append(mm Memory) *Memory {
-	m.Buffers = append(m.Buffers, mm.Buffers...)
-	m.Size += mm.Size
-	return m
-}
-
-func (m *Memory) Count() int {
-	return len(m.Buffers)
-}
-
-func (m *Memory) Range(yield func([]byte)) {
-	for i := range m.Count() {
-		yield(m.Buffers[i])
-	}
-}
-
-func (m *Memory) NewReader() MemoryReader {
-	return MemoryReader{
-		Memory: m,
-		Length: m.Size,
-	}
-}

pkg/util/mem_reader.go

@@ -1,250 +0,0 @@
-package util
-
-import (
-	"io"
-	"slices"
-)
-
-type MemoryReader struct {
-	*Memory
-	Length, offset0, offset1 int
-}
-
-func NewReadableBuffersFromBytes(b ...[]byte) MemoryReader {
-	buf := &Memory{Buffers: b}
-	for _, level0 := range b {
-		buf.Size += len(level0)
-	}
-	return MemoryReader{Memory: buf, Length: buf.Size}
-}
-
-var _ io.Reader = (*MemoryReader)(nil)
-
-func (r *MemoryReader) Offset() int {
-	return r.Size - r.Length
-}
-
-func (r *MemoryReader) Pop() []byte {
-	panic("ReadableBuffers Pop not allowed")
-}
-
-func (r *MemoryReader) GetCurrent() []byte {
-	return r.Memory.Buffers[r.offset0][r.offset1:]
-}
-
-func (r *MemoryReader) MoveToEnd() {
-	r.offset0 = r.Count()
-	r.offset1 = 0
-	r.Length = 0
-}
-
-func (r *MemoryReader) Read(buf []byte) (actual int, err error) {
-	if r.Length == 0 {
-		return 0, io.EOF
-	}
-	n := len(buf)
-	curBuf := r.GetCurrent()
-	curBufLen := len(curBuf)
-	if n > r.Length {
-		if curBufLen > 0 {
-			actual += copy(buf, curBuf)
-			r.offset0++
-			r.offset1 = 0
-		}
-		for _, b := range r.Memory.Buffers[r.offset0:] {
-			actual += copy(buf[actual:], b)
-		}
-		r.MoveToEnd()
-		return
-	}
-	l := n
-	for n > 0 {
-		curBuf = r.GetCurrent()
-		curBufLen = len(curBuf)
-		if n < curBufLen {
-			actual += n
-			copy(buf[l-n:], curBuf[:n])
-			r.forward(n)
-			break
-		}
-		copy(buf[l-n:], curBuf)
-		n -= curBufLen
-		actual += curBufLen
-		r.skipBuf()
-		if r.Length == 0 && n > 0 {
-			err = io.EOF
-			return
-		}
-	}
-	return
-}
-func (r *MemoryReader) ReadByteTo(b ...*byte) (err error) {
-	for i := range b {
-		if r.Length == 0 {
-			return io.EOF
-		}
-		*b[i], err = r.ReadByte()
-		if err != nil {
-			return
-		}
-	}
-	return
-}
-
-func (r *MemoryReader) ReadByteMask(mask byte) (byte, error) {
-	b, err := r.ReadByte()
-	if err != nil {
-		return 0, err
-	}
-	return b & mask, nil
-}
-
-func (r *MemoryReader) ReadByte() (b byte, err error) {
-	if r.Length == 0 {
-		return 0, io.EOF
-	}
-	curBuf := r.GetCurrent()
-	b = curBuf[0]
-	if len(curBuf) == 1 {
-		r.skipBuf()
-	} else {
-		r.forward(1)
-	}
-	return
-}
-
-func (r *MemoryReader) LEB128Unmarshal() (uint, int, error) {
-	v := uint(0)
-	n := 0
-	for i := 0; i < 8; i++ {
-		b, err := r.ReadByte()
-		if err != nil {
-			return 0, 0, err
-		}
-		v |= uint(b&0b01111111) << (i * 7)
-		n++
-
-		if (b & 0b10000000) == 0 {
-			break
-		}
-	}
-
-	return v, n, nil
-}
-func (r *MemoryReader) getCurrentBufLen() int {
-	return len(r.Memory.Buffers[r.offset0]) - r.offset1
-}
-func (r *MemoryReader) Skip(n int) error {
-	if n <= 0 {
-		return nil
-	}
-	if n > r.Length {
-		return io.EOF
-	}
-	curBufLen := r.getCurrentBufLen()
-	for n > 0 {
-		if n < curBufLen {
-			r.forward(n)
-			break
-		}
-		n -= curBufLen
-		r.skipBuf()
-		if r.Length == 0 && n > 0 {
-			return io.EOF
-		}
-	}
-	return nil
-}
-
-func (r *MemoryReader) Unread(n int) {
-	r.Length += n
-	r.offset1 -= n
-	for r.offset1 < 0 {
-		r.offset0--
-		r.offset1 += len(r.Memory.Buffers[r.offset0])
-	}
-}
-
-func (r *MemoryReader) forward(n int) {
-	r.Length -= n
-	r.offset1 += n
-}
-
-func (r *MemoryReader) skipBuf() {
-	curBufLen := r.getCurrentBufLen()
-	r.Length -= curBufLen
-	r.offset0++
-	r.offset1 = 0
-}
-
-func (r *MemoryReader) ReadBytes(n int) ([]byte, error) {
-	if n > r.Length {
-		return nil, io.EOF
-	}
-	b := make([]byte, n)
-	actual, err := r.Read(b)
-	return b[:actual], err
-}
-
-func (r *MemoryReader) ReadBE(n int) (num uint32, err error) {
-	for i := range n {
-		b, err := r.ReadByte()
-		if err != nil {
-			return 0, err
-		}
-		num += uint32(b) << ((n - i - 1) << 3)
-	}
-	return
-}
-
-func (r *MemoryReader) Range(yield func([]byte)) {
-	if yield != nil {
-		for r.Length > 0 {
-			yield(r.GetCurrent())
-			r.skipBuf()
-		}
-	} else {
-		r.MoveToEnd()
-	}
-}
-
-func (r *MemoryReader) RangeN(n int, yield func([]byte)) {
-	for good := yield != nil; r.Length > 0 && n > 0; r.skipBuf() {
-		curBuf := r.GetCurrent()
-		if curBufLen := len(curBuf); curBufLen > n {
-			if r.forward(n); good {
-				yield(curBuf[:n])
-			}
-			return
-		} else if n -= curBufLen; good {
-			yield(curBuf)
-		}
-	}
-}
-
-func (r *MemoryReader) ClipFront(yield func([]byte) bool) {
-	offset := r.Size - r.Length
-	if offset == 0 {
-		return
-	}
-	if m := r.Memory; r.Length == 0 {
-		for _, buf := range m.Buffers {
-			yield(buf)
-		}
-		m.Buffers = m.Buffers[:0]
-	} else {
-		for _, buf := range m.Buffers[:r.offset0] {
-			yield(buf)
-		}
-		if r.offset1 > 0 {
-			yield(m.Buffers[r.offset0][:r.offset1])
-			m.Buffers[r.offset0] = r.GetCurrent()
-		}
-		if r.offset0 > 0 {
-			m.Buffers = slices.Delete(m.Buffers, 0, r.offset0)
-		}
-	}
-	r.Size -= offset
-	r.offset0 = 0
-	r.offset1 = 0
-}

pkg/util/mem_test.go

@@ -1,55 +0,0 @@
-package util
-
-import (
-	"testing"
-	"unsafe"
-)
-
-func NewMemoryAllocator(size int) (ret *MemoryAllocator) {
-	ret = &MemoryAllocator{
-		Size:      size,
-		memory:    make([]byte, size),
-		allocator: NewAllocator(size),
-	}
-	ret.start = int64(uintptr(unsafe.Pointer(&ret.memory[0])))
-	return
-}
-
-func TestMem(t *testing.T) {
-	t.Run(t.Name(), func(t *testing.T) {
-		mem := NewMemoryAllocator(65536)
-		totalMalloc := 0
-		totalFree := 0
-		checkSize := func() {
-			freeSize := mem.allocator.GetFreeSize()
-			if freeSize != mem.allocator.Size-(totalMalloc-totalFree) {
-				t.Fail()
-			}
-		}
-
-		mem.Malloc(65536)
-		totalMalloc += 65536
-		checkSize()
-		mem.free(1536, 64000)
-		totalFree += 64000
-		checkSize()
-		mem.free(0, 1536)
-		totalFree += 1536
-		checkSize()
-		mem.Malloc(65536)
-		totalMalloc += 65536
-		checkSize()
-		mem.free(151, 65385)
-		totalFree += 65385
-		checkSize()
-		mem.free(0, 12)
-		totalFree += 12
-		checkSize()
-		mem.free(140, 1)
-		totalFree += 1
-		checkSize()
-		mem.free(12, 128)
-		totalFree += 128
-		checkSize()
-	})
-}

pkg/util/rm_disable.go

@@ -1,94 +0,0 @@
-//go:build disable_rm
-
-package util
-
-import (
-	"io"
-	"slices"
-)
-
-type RecyclableMemory struct {
-	Memory
-}
-
-func NewRecyclableMemory(allocator *ScalableMemoryAllocator) RecyclableMemory {
-	return RecyclableMemory{}
-}
-
-func (r *RecyclableMemory) Clone() RecyclableMemory {
-	return RecyclableMemory{
-		Memory: Memory{
-			Buffers: slices.Clone(r.Buffers),
-			Size:    r.Size,
-		},
-	}
-}
-
-func (r *RecyclableMemory) InitRecycleIndexes(max int) {
-}
-
-func (r *RecyclableMemory) GetAllocator() *ScalableMemoryAllocator {
-	return nil
-}
-
-func (r *RecyclableMemory) SetAllocator(allocator *ScalableMemoryAllocator) {
-}
-
-func (r *RecyclableMemory) Recycle() {
-}
-
-func (r *RecyclableMemory) NextN(size int) (memory []byte) {
-	memory = make([]byte, size)
-	r.PushOne(memory)
-	return memory
-}
-
-func (r *RecyclableMemory) AddRecycleBytes(b []byte) {
-	r.PushOne(b)
-}
-
-type MemoryAllocator struct {
-	Size int
-}
-
-func (*MemoryAllocator) GetBlocks() (blocks []*Block) {
-	return nil
-}
-
-type ScalableMemoryAllocator struct {
-}
-
-func NewScalableMemoryAllocator(size int) (ret *ScalableMemoryAllocator) {
-	return nil
-}
-
-func (*ScalableMemoryAllocator) Malloc(size int) (memory []byte) {
-	return make([]byte, size)
-}
-
-func (*ScalableMemoryAllocator) FreeRest(mem *[]byte, keep int) {
-	if m := *mem; keep < len(m) {
-		*mem = m[:keep]
-	}
-}
-
-func (*ScalableMemoryAllocator) GetChildren() []*MemoryAllocator {
-	return nil
-}
-
-func (*ScalableMemoryAllocator) Read(reader io.Reader, n int) (mem []byte, err error) {
-	mem = make([]byte, n)
-	n, err = reader.Read(mem)
-	return mem[:n], err
-}
-
-func (*ScalableMemoryAllocator) Borrow(size int) (memory []byte) {
-	return make([]byte, size)
-}
-
-func (*ScalableMemoryAllocator) Recycle() {
-}
-
-func (*ScalableMemoryAllocator) Free(mem []byte) bool {
-	return true
-}

pkg/util/rm_enable.go

@@ -1,277 +0,0 @@
-//go:build !disable_rm
-
-package util
-
-import (
-	"fmt"
-	"io"
-	"slices"
-	"unsafe"
-)
-
-type RecyclableMemory struct {
-	allocator *ScalableMemoryAllocator
-	Memory
-	recycleIndexes []int
-}
-
-func NewRecyclableMemory(allocator *ScalableMemoryAllocator) RecyclableMemory {
-	return RecyclableMemory{allocator: allocator}
-}
-
-func (r *RecyclableMemory) InitRecycleIndexes(max int) {
-	if r.recycleIndexes == nil {
-		r.recycleIndexes = make([]int, 0, max)
-	}
-}
-
-func (r *RecyclableMemory) GetAllocator() *ScalableMemoryAllocator {
-	return r.allocator
-}
-
-func (r *RecyclableMemory) NextN(size int) (memory []byte) {
-	memory = r.allocator.Malloc(size)
-	if r.recycleIndexes != nil {
-		r.recycleIndexes = append(r.recycleIndexes, r.Count())
-	}
-	r.PushOne(memory)
-	return
-}
-
-func (r *RecyclableMemory) AddRecycleBytes(b []byte) {
-	if r.recycleIndexes != nil {
-		r.recycleIndexes = append(r.recycleIndexes, r.Count())
-	}
-	r.PushOne(b)
-}
-
-func (r *RecyclableMemory) SetAllocator(allocator *ScalableMemoryAllocator) {
-	r.allocator = allocator
-}
-
-func (r *RecyclableMemory) Recycle() {
-	if r.recycleIndexes != nil {
-		for _, index := range r.recycleIndexes {
-			r.allocator.Free(r.Buffers[index])
-		}
-		r.recycleIndexes = r.recycleIndexes[:0]
-	} else {
-		for _, buf := range r.Buffers {
-			r.allocator.Free(buf)
-		}
-	}
-	r.Reset()
-}
-
-type MemoryAllocator struct {
-	allocator *Allocator
-	start     int64
-	memory    []byte
-	Size      int
-	recycle   func()
-}
-
-func (ma *MemoryAllocator) Recycle() {
-	ma.allocator.Recycle()
-	if ma.recycle != nil {
-		ma.recycle()
-	}
-}
-
-func (ma *MemoryAllocator) Find(size int) (memory []byte) {
-	if offset := ma.allocator.Find(size); offset != -1 {
-		memory = ma.memory[offset : offset+size]
-	}
-	return
-}
-
-func (ma *MemoryAllocator) Malloc(size int) (memory []byte) {
-	if offset := ma.allocator.Allocate(size); offset != -1 {
-		memory = ma.memory[offset : offset+size]
-	}
-	return
-}
-
-func (ma *MemoryAllocator) free(start, size int) (ret bool) {
-	if start < 0 || start+size > ma.Size {
-		return
-	}
-	ma.allocator.Free(start, size)
-	return true
-}
-
-//func (ma *MemoryAllocator) Free(mem []byte) bool {
-//	start := int(int64(uintptr(unsafe.Pointer(&mem[0]))) - ma.start)
-//	return ma.free(start, len(mem))
-//}
-
-func (ma *MemoryAllocator) GetBlocks() (blocks []*Block) {
-	return ma.allocator.GetBlocks()
-}
-
-type ScalableMemoryAllocator struct {
-	children    []*MemoryAllocator
-	totalMalloc int64
-	totalFree   int64
-	size        int
-	childSize   int
-}
-
-func NewScalableMemoryAllocator(size int) (ret *ScalableMemoryAllocator) {
-	return &ScalableMemoryAllocator{children: []*MemoryAllocator{GetMemoryAllocator(size)}, size: size, childSize: size}
-}
-
-func (sma *ScalableMemoryAllocator) checkSize() {
-	var totalFree int
-	for _, child := range sma.children {
-		totalFree += child.allocator.GetFreeSize()
-	}
-	if inUse := sma.totalMalloc - sma.totalFree; totalFree != sma.size-int(inUse) {
-		panic("CheckSize")
-	} else {
-		if inUse > 3000000 {
-			fmt.Println(uintptr(unsafe.Pointer(sma)), inUse)
-		}
-	}
-}
-
-func (sma *ScalableMemoryAllocator) addMallocCount(size int) {
-	sma.totalMalloc += int64(size)
-}
-
-func (sma *ScalableMemoryAllocator) addFreeCount(size int) {
-	sma.totalFree += int64(size)
-}
-
-func (sma *ScalableMemoryAllocator) GetTotalMalloc() int64 {
-	return sma.totalMalloc
-}
-
-func (sma *ScalableMemoryAllocator) GetTotalFree() int64 {
-	return sma.totalFree
-}
-
-func (sma *ScalableMemoryAllocator) GetChildren() []*MemoryAllocator {
-	return sma.children
-}
-
-func (sma *ScalableMemoryAllocator) Recycle() {
-	for _, child := range sma.children {
-		child.Recycle()
-	}
-	sma.children = nil
-}
-
-// Borrow = Malloc + Free = Find, must use the memory at once
-func (sma *ScalableMemoryAllocator) Borrow(size int) (memory []byte) {
-	if sma == nil || size > MaxBlockSize {
-		return
-	}
-	defer sma.addMallocCount(size)
-	var child *MemoryAllocator
-	for _, child = range sma.children {
-		if memory = child.Find(size); memory != nil {
-			return
-		}
-	}
-	for sma.childSize < MaxBlockSize {
-		sma.childSize = sma.childSize << 1
-		if sma.childSize >= size {
-			break
-		}
-	}
-	child = GetMemoryAllocator(sma.childSize)
-	sma.size += child.Size
-	memory = child.Find(size)
-	sma.children = append(sma.children, child)
-	return
-}
-
-func (sma *ScalableMemoryAllocator) Malloc(size int) (memory []byte) {
-	if sma == nil || size > MaxBlockSize {
-		return make([]byte, size)
-	}
-	//if EnableCheckSize {
-	//	defer sma.checkSize()
-	//}
-	defer sma.addMallocCount(size)
-	var child *MemoryAllocator
-	for _, child = range sma.children {
-		if memory = child.Malloc(size); memory != nil {
-			return
-		}
-	}
-	for sma.childSize < MaxBlockSize {
-		sma.childSize = sma.childSize << 1
-		if sma.childSize >= size {
-			break
-		}
-	}
-	child = GetMemoryAllocator(sma.childSize)
-	sma.size += child.Size
-	memory = child.Malloc(size)
-	sma.children = append(sma.children, child)
-	return
-}
-
-func (sma *ScalableMemoryAllocator) GetAllocator() *ScalableMemoryAllocator {
-	return sma
-}
-
-func (sma *ScalableMemoryAllocator) Read(reader io.Reader, n int) (mem []byte, err error) {
-	mem = sma.Malloc(n)
-	meml := n
-	if n, err = reader.Read(mem); err == nil {
-		if n < meml {
-			sma.Free(mem[n:])
-			mem = mem[:n]
-		}
-	} else {
-		sma.Free(mem)
-	}
-	return
-}
-
-func (sma *ScalableMemoryAllocator) FreeRest(mem *[]byte, keep int) {
-	if m := *mem; keep < len(m) {
-		sma.Free(m[keep:])
-		*mem = m[:keep]
-	}
-}
-
-func (sma *ScalableMemoryAllocator) Free(mem []byte) bool {
-	if sma == nil {
-		return false
-	}
-	//if EnableCheckSize {
-	//	defer sma.checkSize()
-	//}
-	ptr := int64(uintptr(unsafe.Pointer(&mem[0])))
-	size := len(mem)
-	for i, child := range sma.children {
-		if start := int(ptr - child.start); start >= 0 && start < child.Size && child.free(start, size) {
-			sma.addFreeCount(size)
-			if len(sma.children) > 1 && child.allocator.sizeTree.End-child.allocator.sizeTree.Start == child.Size {
-				child.Recycle()
-				sma.children = slices.Delete(sma.children, i, i+1)
-				sma.size -= child.Size
-			}
-			return true
-		}
-	}
-	return false
-}
-
-//func (r *RecyclableMemory) RemoveRecycleBytes(index int) (buf []byte) {
-//	if index < 0 {
-//		index = r.Count() + index
-//	}
-//	buf = r.Buffers[index]
-//	if r.recycleIndexes != nil {
-//		i := slices.Index(r.recycleIndexes, index)
-//		r.recycleIndexes = slices.Delete(r.recycleIndexes, i, i+1)
-//	}
-//	r.Buffers = slices.Delete(r.Buffers, index, index+1)
-//	r.Size -= len(buf)
-//	return
-//}

pkg/util/xdp_linux.go

@@ -1,935 +0,0 @@
-//go:build enable_xdp
-
-package util
-
-import (
-	"fmt"
-	"github.com/cilium/ebpf"
-	"github.com/cilium/ebpf/asm"
-	"github.com/vishvananda/netlink"
-	"golang.org/x/sys/unix"
-	"reflect"
-	"syscall"
-	"time"
-	"unsafe"
-)
-
-// DefaultSocketOptions is the default SocketOptions used by an xdp.Socket created without specifying options.
-var DefaultSocketOptions = SocketOptions{
-	NumFrames:              128,
-	FrameSize:              2048,
-	FillRingNumDescs:       64,
-	CompletionRingNumDescs: 64,
-	RxRingNumDescs:         64,
-	TxRingNumDescs:         64,
-}
-
-type umemRing struct {
-	Producer *uint32
-	Consumer *uint32
-	Descs    []uint64
-}
-
-type rxTxRing struct {
-	Producer *uint32
-	Consumer *uint32
-	Descs    []Desc
-}
-
-// A Socket is an implementation of the AF_XDP Linux socket type for reading packets from a device.
-type Socket struct {
-	fd                       int
-	umem                     []byte
-	fillRing                 umemRing
-	rxRing                   rxTxRing
-	txRing                   rxTxRing
-	completionRing           umemRing
-	qidconfMap               *ebpf.Map
-	xsksMap                  *ebpf.Map
-	program                  *ebpf.Program
-	ifindex                  int
-	numTransmitted           int
-	numFilled                int
-	freeRXDescs, freeTXDescs []bool
-	options                  SocketOptions
-	rxDescs                  []Desc
-	getTXDescs, getRXDescs   []Desc
-}
-
-// SocketOptions are configuration settings used to bind an XDP socket.
-type SocketOptions struct {
-	NumFrames              int
-	FrameSize              int
-	FillRingNumDescs       int
-	CompletionRingNumDescs int
-	RxRingNumDescs         int
-	TxRingNumDescs         int
-}
-
-// Desc represents an XDP Rx/Tx descriptor.
-type Desc unix.XDPDesc
-
-// Stats contains various counters of the XDP socket, such as numbers of
-// sent/received frames.
-type Stats struct {
-	// Filled is the number of items consumed thus far by the Linux kernel
-	// from the Fill ring queue.
-	Filled uint64
-
-	// Received is the number of items consumed thus far by the user of
-	// this package from the Rx ring queue.
-	Received uint64
-
-	// Transmitted is the number of items consumed thus far by the Linux
-	// kernel from the Tx ring queue.
-	Transmitted uint64
-
-	// Completed is the number of items consumed thus far by the user of
-	// this package from the Completion ring queue.
-	Completed uint64
-
-	// KernelStats contains the in-kernel statistics of the corresponding
-	// XDP socket, such as the number of invalid descriptors that were
-	// submitted into Fill or Tx ring queues.
-	KernelStats unix.XDPStatistics
-}
-
-// DefaultSocketFlags are the flags which are passed to bind(2) system call
-// when the XDP socket is bound, possible values include unix.XDP_SHARED_UMEM,
-// unix.XDP_COPY, unix.XDP_ZEROCOPY.
-var DefaultSocketFlags uint16
-
-// DefaultXdpFlags are the flags which are passed when the XDP program is
-// attached to the network link, possible values include
-// unix.XDP_FLAGS_DRV_MODE, unix.XDP_FLAGS_HW_MODE, unix.XDP_FLAGS_SKB_MODE,
-// unix.XDP_FLAGS_UPDATE_IF_NOEXIST.
-var DefaultXdpFlags uint32
-
-func init() {
-	DefaultSocketFlags = 0
-	DefaultXdpFlags = 0
-}
-
-// NewSocket returns a new XDP socket attached to the network interface which
-// has the given interface, and attached to the given queue on that network
-// interface.
-func NewSocket(Ifindex int, QueueID int, options *SocketOptions) (xsk *Socket, err error) {
-	if options == nil {
-		options = &DefaultSocketOptions
-	}
-	xsk = &Socket{fd: -1, ifindex: Ifindex, options: *options}
-
-	xsk.fd, err = syscall.Socket(unix.AF_XDP, syscall.SOCK_RAW, 0)
-	if err != nil {
-		return nil, fmt.Errorf("syscall.Socket failed: %v", err)
-	}
-
-	xsk.umem, err = syscall.Mmap(-1, 0, options.NumFrames*options.FrameSize,
-		syscall.PROT_READ|syscall.PROT_WRITE,
-		syscall.MAP_PRIVATE|syscall.MAP_ANONYMOUS|syscall.MAP_POPULATE)
-	if err != nil {
-		xsk.Close()
-		return nil, fmt.Errorf("syscall.Mmap failed: %v", err)
-	}
-
-	xdpUmemReg := unix.XDPUmemReg{
-		Addr:     uint64(uintptr(unsafe.Pointer(&xsk.umem[0]))),
-		Len:      uint64(len(xsk.umem)),
-		Size:     uint32(options.FrameSize),
-		Headroom: 0,
-	}
-
-	var errno syscall.Errno
-	var rc uintptr
-
-	rc, _, errno = unix.Syscall6(syscall.SYS_SETSOCKOPT, uintptr(xsk.fd),
-		unix.SOL_XDP, unix.XDP_UMEM_REG,
-		uintptr(unsafe.Pointer(&xdpUmemReg)),
-		unsafe.Sizeof(xdpUmemReg), 0)
-	if rc != 0 {
-		xsk.Close()
-		return nil, fmt.Errorf("unix.SetsockoptUint64 XDP_UMEM_REG failed: %v", errno)
-	}
-
-	err = syscall.SetsockoptInt(xsk.fd, unix.SOL_XDP, unix.XDP_UMEM_FILL_RING,
-		options.FillRingNumDescs)
-	if err != nil {
-		xsk.Close()
-		return nil, fmt.Errorf("unix.SetsockoptUint64 XDP_UMEM_FILL_RING failed: %v", err)
-	}
-
-	err = unix.SetsockoptInt(xsk.fd, unix.SOL_XDP, unix.XDP_UMEM_COMPLETION_RING,
-		options.CompletionRingNumDescs)
-	if err != nil {
-		xsk.Close()
-		return nil, fmt.Errorf("unix.SetsockoptUint64 XDP_UMEM_COMPLETION_RING failed: %v", err)
-	}
-
-	var rxRing bool
-	if options.RxRingNumDescs > 0 {
-		err = unix.SetsockoptInt(xsk.fd, unix.SOL_XDP, unix.XDP_RX_RING,
-			options.RxRingNumDescs)
-		if err != nil {
-			xsk.Close()
-			return nil, fmt.Errorf("unix.SetsockoptUint64 XDP_RX_RING failed: %v", err)
-		}
-		rxRing = true
-	}
-
-	var txRing bool
-	if options.TxRingNumDescs > 0 {
-		err = unix.SetsockoptInt(xsk.fd, unix.SOL_XDP, unix.XDP_TX_RING,
-			options.TxRingNumDescs)
-		if err != nil {
-			xsk.Close()
-			return nil, fmt.Errorf("unix.SetsockoptUint64 XDP_TX_RING failed: %v", err)
-		}
-		txRing = true
-	}
-
-	if !(rxRing || txRing) {
-		return nil, fmt.Errorf("RxRingNumDescs and TxRingNumDescs cannot both be set to zero")
-	}
-
-	var offsets unix.XDPMmapOffsets
-	var vallen uint32
-	vallen = uint32(unsafe.Sizeof(offsets))
-	rc, _, errno = unix.Syscall6(syscall.SYS_GETSOCKOPT, uintptr(xsk.fd),
-		unix.SOL_XDP, unix.XDP_MMAP_OFFSETS,
-		uintptr(unsafe.Pointer(&offsets)),
-		uintptr(unsafe.Pointer(&vallen)), 0)
-	if rc != 0 {
-		xsk.Close()
-		return nil, fmt.Errorf("unix.Syscall6 getsockopt XDP_MMAP_OFFSETS failed: %v", errno)
-	}
-
-	fillRingSlice, err := syscall.Mmap(xsk.fd, unix.XDP_UMEM_PGOFF_FILL_RING,
-		int(offsets.Fr.Desc+uint64(options.FillRingNumDescs)*uint64(unsafe.Sizeof(uint64(0)))),
-		syscall.PROT_READ|syscall.PROT_WRITE,
-		syscall.MAP_SHARED|syscall.MAP_POPULATE)
-	if err != nil {
-		xsk.Close()
-		return nil, fmt.Errorf("syscall.Mmap XDP_UMEM_PGOFF_FILL_RING failed: %v", err)
-	}
-
-	xsk.fillRing.Producer = (*uint32)(unsafe.Pointer(uintptr(unsafe.Pointer(&fillRingSlice[0])) + uintptr(offsets.Fr.Producer)))
-	xsk.fillRing.Consumer = (*uint32)(unsafe.Pointer(uintptr(unsafe.Pointer(&fillRingSlice[0])) + uintptr(offsets.Fr.Consumer)))
-	sh := (*reflect.SliceHeader)(unsafe.Pointer(&xsk.fillRing.Descs))
-	sh.Data = uintptr(unsafe.Pointer(&fillRingSlice[0])) + uintptr(offsets.Fr.Desc)
-	sh.Len = options.FillRingNumDescs
-	sh.Cap = options.FillRingNumDescs
-
-	completionRingSlice, err := syscall.Mmap(xsk.fd, unix.XDP_UMEM_PGOFF_COMPLETION_RING,
-		int(offsets.Cr.Desc+uint64(options.CompletionRingNumDescs)*uint64(unsafe.Sizeof(uint64(0)))),
-		syscall.PROT_READ|syscall.PROT_WRITE,
-		syscall.MAP_SHARED|syscall.MAP_POPULATE)
-	if err != nil {
-		xsk.Close()
-		return nil, fmt.Errorf("syscall.Mmap XDP_UMEM_PGOFF_COMPLETION_RING failed: %v", err)
-	}
-
-	xsk.completionRing.Producer = (*uint32)(unsafe.Pointer(uintptr(unsafe.Pointer(&completionRingSlice[0])) + uintptr(offsets.Cr.Producer)))
-	xsk.completionRing.Consumer = (*uint32)(unsafe.Pointer(uintptr(unsafe.Pointer(&completionRingSlice[0])) + uintptr(offsets.Cr.Consumer)))
-	sh = (*reflect.SliceHeader)(unsafe.Pointer(&xsk.completionRing.Descs))
-	sh.Data = uintptr(unsafe.Pointer(&completionRingSlice[0])) + uintptr(offsets.Cr.Desc)
-	sh.Len = options.CompletionRingNumDescs
-	sh.Cap = options.CompletionRingNumDescs
-
-	if rxRing {
-		rxRingSlice, err := syscall.Mmap(xsk.fd, unix.XDP_PGOFF_RX_RING,
-			int(offsets.Rx.Desc+uint64(options.RxRingNumDescs)*uint64(unsafe.Sizeof(Desc{}))),
-			syscall.PROT_READ|syscall.PROT_WRITE,
-			syscall.MAP_SHARED|syscall.MAP_POPULATE)
-		if err != nil {
-			xsk.Close()
-			return nil, fmt.Errorf("syscall.Mmap XDP_PGOFF_RX_RING failed: %v", err)
-		}
-
-		xsk.rxRing.Producer = (*uint32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rxRingSlice[0])) + uintptr(offsets.Rx.Producer)))
-		xsk.rxRing.Consumer = (*uint32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rxRingSlice[0])) + uintptr(offsets.Rx.Consumer)))
-		sh = (*reflect.SliceHeader)(unsafe.Pointer(&xsk.rxRing.Descs))
-		sh.Data = uintptr(unsafe.Pointer(&rxRingSlice[0])) + uintptr(offsets.Rx.Desc)
-		sh.Len = options.RxRingNumDescs
-		sh.Cap = options.RxRingNumDescs
-
-		xsk.rxDescs = make([]Desc, 0, options.RxRingNumDescs)
-	}
-
-	if txRing {
-		txRingSlice, err := syscall.Mmap(xsk.fd, unix.XDP_PGOFF_TX_RING,
-			int(offsets.Tx.Desc+uint64(options.TxRingNumDescs)*uint64(unsafe.Sizeof(Desc{}))),
-			syscall.PROT_READ|syscall.PROT_WRITE,
-			syscall.MAP_SHARED|syscall.MAP_POPULATE)
-		if err != nil {
-			xsk.Close()
-			return nil, fmt.Errorf("syscall.Mmap XDP_PGOFF_TX_RING failed: %v", err)
-		}
-
-		xsk.txRing.Producer = (*uint32)(unsafe.Pointer(uintptr(unsafe.Pointer(&txRingSlice[0])) + uintptr(offsets.Tx.Producer)))
-		xsk.txRing.Consumer = (*uint32)(unsafe.Pointer(uintptr(unsafe.Pointer(&txRingSlice[0])) + uintptr(offsets.Tx.Consumer)))
-		sh = (*reflect.SliceHeader)(unsafe.Pointer(&xsk.txRing.Descs))
-		sh.Data = uintptr(unsafe.Pointer(&txRingSlice[0])) + uintptr(offsets.Tx.Desc)
-		sh.Len = options.TxRingNumDescs
-		sh.Cap = options.TxRingNumDescs
-	}
-
-	sa := unix.SockaddrXDP{
-		Flags:   DefaultSocketFlags,
-		Ifindex: uint32(Ifindex),
-		QueueID: uint32(QueueID),
-	}
-	if err = unix.Bind(xsk.fd, &sa); err != nil {
-		xsk.Close()
-		return nil, fmt.Errorf("syscall.Bind SockaddrXDP failed: %v", err)
-	}
-
-	xsk.freeRXDescs = make([]bool, options.NumFrames)
-	xsk.freeTXDescs = make([]bool, options.NumFrames)
-	for i := range xsk.freeRXDescs {
-		xsk.freeRXDescs[i] = true
-	}
-	for i := range xsk.freeTXDescs {
-		xsk.freeTXDescs[i] = true
-	}
-	xsk.getTXDescs = make([]Desc, 0, options.CompletionRingNumDescs)
-	xsk.getRXDescs = make([]Desc, 0, options.FillRingNumDescs)
-
-	return xsk, nil
-}
-
-// Fill submits the given descriptors to be filled (i.e. to receive frames into)
-// it returns how many descriptors where actually put onto Fill ring queue.
-// The descriptors can be acquired either by calling the GetDescs() method or
-// by calling Receive() method.
-func (xsk *Socket) Fill(descs []Desc) int {
-	numFreeSlots := xsk.NumFreeFillSlots()
-	if numFreeSlots < len(descs) {
-		descs = descs[:numFreeSlots]
-	}
-
-	prod := *xsk.fillRing.Producer
-	for _, desc := range descs {
-		xsk.fillRing.Descs[prod&uint32(xsk.options.FillRingNumDescs-1)] = desc.Addr
-		prod++
-		xsk.freeRXDescs[desc.Addr/uint64(xsk.options.FrameSize)] = false
-	}
-	//fencer.SFence()
-	*xsk.fillRing.Producer = prod
-
-	xsk.numFilled += len(descs)
-
-	return len(descs)
-}
-
-// Receive returns the descriptors which were filled, i.e. into which frames
-// were received into.
-func (xsk *Socket) Receive(num int) []Desc {
-	numAvailable := xsk.NumReceived()
-	if num > int(numAvailable) {
-		num = int(numAvailable)
-	}
-
-	descs := xsk.rxDescs[:0]
-	cons := *xsk.rxRing.Consumer
-	//fencer.LFence()
-	for i := 0; i < num; i++ {
-		descs = append(descs, xsk.rxRing.Descs[cons&uint32(xsk.options.RxRingNumDescs-1)])
-		cons++
-		xsk.freeRXDescs[descs[i].Addr/uint64(xsk.options.FrameSize)] = true
-	}
-	//fencer.MFence()
-	*xsk.rxRing.Consumer = cons
-
-	xsk.numFilled -= len(descs)
-
-	return descs
-}
-
-// Transmit submits the given descriptors to be sent out, it returns how many
-// descriptors were actually pushed onto the Tx ring queue.
-// The descriptors can be acquired either by calling the GetDescs() method or
-// by calling Receive() method.
-func (xsk *Socket) Transmit(descs []Desc) (numSubmitted int) {
-	numFreeSlots := xsk.NumFreeTxSlots()
-	if len(descs) > numFreeSlots {
-		descs = descs[:numFreeSlots]
-	}
-
-	prod := *xsk.txRing.Producer
-	for _, desc := range descs {
-		xsk.txRing.Descs[prod&uint32(xsk.options.TxRingNumDescs-1)] = desc
-		prod++
-		xsk.freeTXDescs[desc.Addr/uint64(xsk.options.FrameSize)] = false
-	}
-	//fencer.SFence()
-	*xsk.txRing.Producer = prod
-
-	xsk.numTransmitted += len(descs)
-
-	numSubmitted = len(descs)
-
-	var rc uintptr
-	var errno syscall.Errno
-	for {
-		rc, _, errno = unix.Syscall6(syscall.SYS_SENDTO,
-			uintptr(xsk.fd),
-			0, 0,
-			uintptr(unix.MSG_DONTWAIT),
-			0, 0)
-		if rc != 0 {
-			switch errno {
-			case unix.EINTR:
-				// try again
-			case unix.EAGAIN:
-				return
-			case unix.EBUSY: // "completed but not sent"
-				return
-			default:
-				panic(fmt.Errorf("sendto failed with rc=%d and errno=%d", rc, errno))
-			}
-		} else {
-			break
-		}
-	}
-
-	return
-}
-
-// FD returns the file descriptor associated with this xdp.Socket which can be
-// used e.g. to do polling.
-func (xsk *Socket) FD() int {
-	return xsk.fd
-}
-
-// Poll blocks until kernel informs us that it has either received
-// or completed (i.e. actually sent) some frames that were previously submitted
-// using Fill() or Transmit() methods.
-// The numReceived return value can be used as the argument for subsequent
-// Receive() method call.
-func (xsk *Socket) Poll(timeout int) (numReceived int, numCompleted int, err error) {
-	var events int16
-	if xsk.numFilled > 0 {
-		events |= unix.POLLIN
-	}
-	if xsk.numTransmitted > 0 {
-		events |= unix.POLLOUT
-	}
-	if events == 0 {
-		return
-	}
-
-	var pfds [1]unix.PollFd
-	pfds[0].Fd = int32(xsk.fd)
-	pfds[0].Events = events
-	for err = unix.EINTR; err == unix.EINTR; {
-		_, err = unix.Poll(pfds[:], timeout)
-	}
-	if err != nil {
-		return 0, 0, err
-	}
-
-	numReceived = xsk.NumReceived()
-	if numCompleted = xsk.NumCompleted(); numCompleted > 0 {
-		xsk.Complete(numCompleted)
-	}
-
-	return
-}
-
-// GetDescs returns up to n descriptors which are not currently in use.
-// if rx is true, return desc in first half of umem, 2nd half otherwise
-func (xsk *Socket) GetDescs(n int, rx bool) []Desc {
-	if n > cap(xsk.getRXDescs) {
-		n = cap(xsk.getRXDescs)
-	}
-	if !rx {
-		if n > cap(xsk.getTXDescs) {
-			n = cap(xsk.getTXDescs)
-		}
-	}
-	// numOfUMEMChunks := len(xsk.freeRXDescs) / 2
-	// if n > numOfUMEMChunks {
-	// 	n = numOfUMEMChunks
-	// }
-
-	descs := xsk.getRXDescs[:0]
-	j := 0
-	start := 0
-	end := cap(xsk.getRXDescs)
-	freeList := xsk.freeRXDescs
-	if !rx {
-		start = cap(xsk.getRXDescs)
-		end = len(xsk.freeTXDescs)
-		freeList = xsk.freeTXDescs
-		descs = xsk.getTXDescs[:0]
-	}
-	for i := start; i < end && j < n; i++ {
-		if freeList[i] == true {
-			descs = append(descs, Desc{
-				Addr: uint64(i) * uint64(xsk.options.FrameSize),
-				Len:  uint32(xsk.options.FrameSize),
-			})
-			j++
-		}
-	}
-	return descs
-}
-
-// GetFrame returns the buffer containing the frame corresponding to the given
-// descriptor. The returned byte slice points to the actual buffer of the
-// corresponding frame, so modiyfing this slice modifies the frame contents.
-func (xsk *Socket) GetFrame(d Desc) []byte {
-	return xsk.umem[d.Addr : d.Addr+uint64(d.Len)]
-}
-
-// Close closes and frees the resources allocated by the Socket.
-func (xsk *Socket) Close() error {
-	allErrors := []error{}
-	var err error
-
-	if xsk.fd != -1 {
-		if err = unix.Close(xsk.fd); err != nil {
-			allErrors = append(allErrors, fmt.Errorf("failed to close XDP socket: %v", err))
-		}
-		xsk.fd = -1
-
-		var sh *reflect.SliceHeader
-
-		sh = (*reflect.SliceHeader)(unsafe.Pointer(&xsk.completionRing.Descs))
-		sh.Data = uintptr(0)
-		sh.Len = 0
-		sh.Cap = 0
-
-		sh = (*reflect.SliceHeader)(unsafe.Pointer(&xsk.txRing.Descs))
-		sh.Data = uintptr(0)
-		sh.Len = 0
-		sh.Cap = 0
-
-		sh = (*reflect.SliceHeader)(unsafe.Pointer(&xsk.rxRing.Descs))
-		sh.Data = uintptr(0)
-		sh.Len = 0
-		sh.Cap = 0
-
-		sh = (*reflect.SliceHeader)(unsafe.Pointer(&xsk.fillRing.Descs))
-		sh.Data = uintptr(0)
-		sh.Len = 0
-		sh.Cap = 0
-	}
-
-	if xsk.umem != nil {
-		if err := syscall.Munmap(xsk.umem); err != nil {
-			allErrors = append(allErrors, fmt.Errorf("failed to unmap the UMEM: %v", err))
-		}
-		xsk.umem = nil
-	}
-
-	if len(allErrors) > 0 {
-		return allErrors[0]
-	}
-
-	return nil
-}
-
-// Complete consumes up to n descriptors from the Completion ring queue to
-// which the kernel produces when it has actually transmitted a descriptor it
-// got from Tx ring queue.
-// You should use this method if you are doing polling on the xdp.Socket file
-// descriptor yourself, rather than using the Poll() method.
-func (xsk *Socket) Complete(n int) {
-	cons := *xsk.completionRing.Consumer
-	//fencer.LFence()
-	for i := 0; i < n; i++ {
-		addr := xsk.completionRing.Descs[cons&uint32(xsk.options.CompletionRingNumDescs-1)]
-		cons++
-		xsk.freeTXDescs[addr/uint64(xsk.options.FrameSize)] = true
-	}
-	//fencer.MFence()
-	*xsk.completionRing.Consumer = cons
-
-	xsk.numTransmitted -= n
-}
-
-// NumFreeFillSlots returns how many free slots are available on the Fill ring
-// queue, i.e. the queue to which we produce descriptors which should be filled
-// by the kernel with incoming frames.
-func (xsk *Socket) NumFreeFillSlots() int {
-	prod := *xsk.fillRing.Producer
-	cons := *xsk.fillRing.Consumer
-	max := uint32(xsk.options.FillRingNumDescs)
-
-	n := max - (prod - cons)
-	if n > max {
-		n = max
-	}
-
-	return int(n)
-}
-
-// NumFreeTxSlots returns how many free slots are available on the Tx ring
-// queue, i.e. the queue to which we produce descriptors which should be
-// transmitted by the kernel to the wire.
-func (xsk *Socket) NumFreeTxSlots() int {
-	prod := *xsk.txRing.Producer
-	cons := *xsk.txRing.Consumer
-	max := uint32(xsk.options.TxRingNumDescs)
-
-	n := max - (prod - cons)
-	if n > max {
-		n = max
-	}
-
-	return int(n)
-}
-
-// NumReceived returns how many descriptors are there on the Rx ring queue
-// which were produced by the kernel and which we have not yet consumed.
-func (xsk *Socket) NumReceived() int {
-	prod := *xsk.rxRing.Producer
-	cons := *xsk.rxRing.Consumer
-	max := uint32(xsk.options.RxRingNumDescs)
-
-	n := prod - cons
-	if n > max {
-		n = max
-	}
-
-	return int(n)
-}
-
-// NumCompleted returns how many descriptors are there on the Completion ring
-// queue which were produced by the kernel and which we have not yet consumed.
-func (xsk *Socket) NumCompleted() int {
-	prod := *xsk.completionRing.Producer
-	cons := *xsk.completionRing.Consumer
-	max := uint32(xsk.options.CompletionRingNumDescs)
-
-	n := prod - cons
-	if n > max {
-		n = max
-	}
-
-	return int(n)
-}
-
-// NumFilled returns how many descriptors are there on the Fill ring
-// queue which have not yet been consumed by the kernel.
-// This method is useful if you're polling the xdp.Socket file descriptor
-// yourself, rather than using the Poll() method - if it returns a number
-// greater than zero it means you should set the unix.POLLIN flag.
-func (xsk *Socket) NumFilled() int {
-	return xsk.numFilled
-}
-
-// NumTransmitted returns how many descriptors are there on the Tx ring queue
-// which have not yet been consumed by the kernel.
-// Note that even after the descriptors are consumed by the kernel from the Tx
-// ring queue, it doesn't mean that they have actually been sent out on the
-// wire, that can be assumed only after the descriptors have been produced by
-// the kernel to the Completion ring queue.
-// This method is useful if you're polling the xdp.Socket file descriptor
-// yourself, rather than using the Poll() method - if it returns a number
-// greater than zero it means you should set the unix.POLLOUT flag.
-func (xsk *Socket) NumTransmitted() int {
-	return xsk.numTransmitted
-}
-
-// Stats returns various statistics for this XDP socket.
-func (xsk *Socket) Stats() (Stats, error) {
-	var stats Stats
-	var size uint64
-
-	stats.Filled = uint64(*xsk.fillRing.Consumer)
-	stats.Received = uint64(*xsk.rxRing.Consumer)
-	if xsk.txRing.Consumer != nil {
-		stats.Transmitted = uint64(*xsk.txRing.Consumer)
-	}
-	if xsk.completionRing.Consumer != nil {
-		stats.Completed = uint64(*xsk.completionRing.Consumer)
-	}
-	size = uint64(unsafe.Sizeof(stats.KernelStats))
-	rc, _, errno := unix.Syscall6(syscall.SYS_GETSOCKOPT,
-		uintptr(xsk.fd),
-		unix.SOL_XDP, unix.XDP_STATISTICS,
-		uintptr(unsafe.Pointer(&stats.KernelStats)),
-		uintptr(unsafe.Pointer(&size)), 0)
-	if rc != 0 {
-		return stats, fmt.Errorf("getsockopt XDP_STATISTICS failed with errno %d", errno)
-	}
-	return stats, nil
-}
-
-// Program represents the necessary data structures for a simple XDP program that can filter traffic
-// based on the attached rx queue.
-type Program struct {
-	Program *ebpf.Program
-	Queues  *ebpf.Map
-	Sockets *ebpf.Map
-}
-
-// Attach the XDP Program to an interface.
-func (p *Program) Attach(Ifindex int) error {
-	if err := removeProgram(Ifindex); err != nil {
-		return err
-	}
-	return attachProgram(Ifindex, p.Program)
-}
-
-// Detach the XDP Program from an interface.
-func (p *Program) Detach(Ifindex int) error {
-	return removeProgram(Ifindex)
-}
-
-// Register adds the socket file descriptor as the recipient for packets from the given queueID.
-func (p *Program) Register(queueID int, fd int) error {
-	if err := p.Sockets.Put(uint32(queueID), uint32(fd)); err != nil {
-		return fmt.Errorf("failed to update xsksMap: %v", err)
-	}
-
-	if err := p.Queues.Put(uint32(queueID), uint32(1)); err != nil {
-		return fmt.Errorf("failed to update qidconfMap: %v", err)
-	}
-	return nil
-}
-
-// Unregister removes any associated mapping to sockets for the given queueID.
-func (p *Program) Unregister(queueID int) error {
-	if err := p.Queues.Delete(uint32(queueID)); err != nil {
-		return err
-	}
-	if err := p.Sockets.Delete(uint32(queueID)); err != nil {
-		return err
-	}
-	return nil
-}
-
-// Close closes and frees the resources allocated for the Program.
-func (p *Program) Close() error {
-	allErrors := []error{}
-	if p.Sockets != nil {
-		if err := p.Sockets.Close(); err != nil {
-			allErrors = append(allErrors, fmt.Errorf("failed to close xsksMap: %v", err))
-		}
-		p.Sockets = nil
-	}
-
-	if p.Queues != nil {
-		if err := p.Queues.Close(); err != nil {
-			allErrors = append(allErrors, fmt.Errorf("failed to close qidconfMap: %v", err))
-		}
-		p.Queues = nil
-	}
-
-	if p.Program != nil {
-		if err := p.Program.Close(); err != nil {
-			allErrors = append(allErrors, fmt.Errorf("failed to close XDP program: %v", err))
-		}
-		p.Program = nil
-	}
-
-	if len(allErrors) > 0 {
-		return allErrors[0]
-	}
-	return nil
-}
-
-// NewProgram returns a translation of the default eBPF XDP program found in the
-// xsk_load_xdp_prog() function in <linux>/tools/lib/bpf/xsk.c:
-// https://github.com/torvalds/linux/blob/master/tools/lib/bpf/xsk.c#L259
-func NewProgram(maxQueueEntries int) (*Program, error) {
-	qidconfMap, err := ebpf.NewMap(&ebpf.MapSpec{
-		Name:       "qidconf_map",
-		Type:       ebpf.Array,
-		KeySize:    uint32(unsafe.Sizeof(int32(0))),
-		ValueSize:  uint32(unsafe.Sizeof(int32(0))),
-		MaxEntries: uint32(maxQueueEntries),
-		Flags:      0,
-		InnerMap:   nil,
-	})
-	if err != nil {
-		return nil, fmt.Errorf("ebpf.NewMap qidconf_map failed (try increasing RLIMIT_MEMLOCK): %v", err)
-	}
-
-	xsksMap, err := ebpf.NewMap(&ebpf.MapSpec{
-		Name:       "xsks_map",
-		Type:       ebpf.XSKMap,
-		KeySize:    uint32(unsafe.Sizeof(int32(0))),
-		ValueSize:  uint32(unsafe.Sizeof(int32(0))),
-		MaxEntries: uint32(maxQueueEntries),
-		Flags:      0,
-		InnerMap:   nil,
-	})
-	if err != nil {
-		return nil, fmt.Errorf("ebpf.NewMap xsks_map failed (try increasing RLIMIT_MEMLOCK): %v", err)
-	}
-
-	/*
-		This is a translation of the default eBPF XDP program found in the
-		xsk_load_xdp_prog() function in <linux>/tools/lib/bpf/xsk.c:
-		https://github.com/torvalds/linux/blob/master/tools/lib/bpf/xsk.c#L259
-
-		// This is the C-program:
-		// SEC("xdp_sock") int xdp_sock_prog(struct xdp_md *ctx)
-		// {
-		//     int *qidconf, index = ctx->rx_queue_index;
-		//
-		//     // A set entry here means that the correspnding queue_id
-		//     // has an active AF_XDP socket bound to it.
-		//     qidconf = bpf_map_lookup_elem(&qidconf_map, &index);
-		//     if (!qidconf)
-		//         return XDP_ABORTED;
-		//
-		//     if (*qidconf)
-		//         return bpf_redirect_map(&xsks_map, index, 0);
-		//
-		//     return XDP_PASS;
-		// }
-		//
-		struct bpf_insn prog[] = {
-			// r1 = *(u32 *)(r1 + 16)
-			BPF_LDX_MEM(BPF_W, BPF_REG_1, BPF_REG_1, 16),   // 0
-			// *(u32 *)(r10 - 4) = r1
-			BPF_STX_MEM(BPF_W, BPF_REG_10, BPF_REG_1, -4),  // 1
-			BPF_MOV64_REG(BPF_REG_2, BPF_REG_10),           // 2
-			BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, -4),          // 3
-			BPF_LD_MAP_FD(BPF_REG_1, xsk->qidconf_map_fd),  // 4 (2 instructions)
-			BPF_EMIT_CALL(BPF_FUNC_map_lookup_elem),        // 5
-			BPF_MOV64_REG(BPF_REG_1, BPF_REG_0),            // 6
-			BPF_MOV32_IMM(BPF_REG_0, 0),                    // 7
-			// if r1 == 0 goto +8
-			BPF_JMP_IMM(BPF_JEQ, BPF_REG_1, 0, 8),          // 8
-			BPF_MOV32_IMM(BPF_REG_0, 2),                    // 9
-			// r1 = *(u32 *)(r1 + 0)
-			BPF_LDX_MEM(BPF_W, BPF_REG_1, BPF_REG_1, 0),    // 10
-			// if r1 == 0 goto +5
-			BPF_JMP_IMM(BPF_JEQ, BPF_REG_1, 0, 5),          // 11
-			// r2 = *(u32 *)(r10 - 4)
-			BPF_LD_MAP_FD(BPF_REG_1, xsk->xsks_map_fd),     // 12 (2 instructions)
-			BPF_LDX_MEM(BPF_W, BPF_REG_2, BPF_REG_10, -4),  // 13
-			BPF_MOV32_IMM(BPF_REG_3, 0),                    // 14
-			BPF_EMIT_CALL(BPF_FUNC_redirect_map),           // 15
-			// The jumps are to this instruction
-			BPF_EXIT_INSN(),                                // 16
-		};
-
-		eBPF instructions:
-		  0: code: 97 dst_reg: 1 src_reg: 1 off: 16 imm: 0   // 0
-		  1: code: 99 dst_reg: 10 src_reg: 1 off: -4 imm: 0  // 1
-		  2: code: 191 dst_reg: 2 src_reg: 10 off: 0 imm: 0  // 2
-		  3: code: 7 dst_reg: 2 src_reg: 0 off: 0 imm: -4    // 3
-		  4: code: 24 dst_reg: 1 src_reg: 1 off: 0 imm: 4    // 4 XXX use qidconfMap.FD as IMM
-		  5: code: 0 dst_reg: 0 src_reg: 0 off: 0 imm: 0     //   part of the same instruction
-		  6: code: 133 dst_reg: 0 src_reg: 0 off: 0 imm: 1   // 5
-		  7: code: 191 dst_reg: 1 src_reg: 0 off: 0 imm: 0   // 6
-		  8: code: 180 dst_reg: 0 src_reg: 0 off: 0 imm: 0   // 7
-		  9: code: 21 dst_reg: 1 src_reg: 0 off: 8 imm: 0    // 8
-		  10: code: 180 dst_reg: 0 src_reg: 0 off: 0 imm: 2  // 9
-		  11: code: 97 dst_reg: 1 src_reg: 1 off: 0 imm: 0   // 10
-		  12: code: 21 dst_reg: 1 src_reg: 0 off: 5 imm: 0   // 11
-		  13: code: 24 dst_reg: 1 src_reg: 1 off: 0 imm: 5   // 12 XXX use xsksMap.FD as IMM
-		  14: code: 0 dst_reg: 0 src_reg: 0 off: 0 imm: 0    //    part of the same instruction
-		  15: code: 97 dst_reg: 2 src_reg: 10 off: -4 imm: 0 // 13
-		  16: code: 180 dst_reg: 3 src_reg: 0 off: 0 imm: 0  // 14
-		  17: code: 133 dst_reg: 0 src_reg: 0 off: 0 imm: 51 // 15
-		  18: code: 149 dst_reg: 0 src_reg: 0 off: 0 imm: 0  // 16
-	*/
-
-	program, err := ebpf.NewProgram(&ebpf.ProgramSpec{
-		Name: "xsk_ebpf",
-		Type: ebpf.XDP,
-		Instructions: asm.Instructions{
-			{OpCode: 97, Dst: 1, Src: 1, Offset: 16},                                  // 0: code: 97 dst_reg: 1 src_reg: 1 off: 16 imm: 0   // 0
-			{OpCode: 99, Dst: 10, Src: 1, Offset: -4},                                 // 1: code: 99 dst_reg: 10 src_reg: 1 off: -4 imm: 0  // 1
-			{OpCode: 191, Dst: 2, Src: 10},                                            // 2: code: 191 dst_reg: 2 src_reg: 10 off: 0 imm: 0  // 2
-			{OpCode: 7, Dst: 2, Src: 0, Offset: 0, Constant: -4},                      // 3: code: 7 dst_reg: 2 src_reg: 0 off: 0 imm: -4    // 3
-			{OpCode: 24, Dst: 1, Src: 1, Offset: 0, Constant: int64(qidconfMap.FD())}, // 4: code: 24 dst_reg: 1 src_reg: 1 off: 0 imm: 4    // 4 XXX use qidconfMap.FD as IMM
-			//{ OpCode: 0 },                                                                 // 5: code: 0 dst_reg: 0 src_reg: 0 off: 0 imm: 0     //   part of the same instruction
-			{OpCode: 133, Dst: 0, Src: 0, Constant: 1},                  // 6: code: 133 dst_reg: 0 src_reg: 0 off: 0 imm: 1   // 5
-			{OpCode: 191, Dst: 1, Src: 0},                               // 7: code: 191 dst_reg: 1 src_reg: 0 off: 0 imm: 0   // 6
-			{OpCode: 180, Dst: 0, Src: 0},                               // 8: code: 180 dst_reg: 0 src_reg: 0 off: 0 imm: 0   // 7
-			{OpCode: 21, Dst: 1, Src: 0, Offset: 8},                     // 9: code: 21 dst_reg: 1 src_reg: 0 off: 8 imm: 0    // 8
-			{OpCode: 180, Dst: 0, Src: 0, Constant: 2},                  // 10: code: 180 dst_reg: 0 src_reg: 0 off: 0 imm: 2  // 9
-			{OpCode: 97, Dst: 1, Src: 1},                                // 11: code: 97 dst_reg: 1 src_reg: 1 off: 0 imm: 0   // 10
-			{OpCode: 21, Dst: 1, Offset: 5},                             // 12: code: 21 dst_reg: 1 src_reg: 0 off: 5 imm: 0   // 11
-			{OpCode: 24, Dst: 1, Src: 1, Constant: int64(xsksMap.FD())}, // 13: code: 24 dst_reg: 1 src_reg: 1 off: 0 imm: 5   // 12 XXX use xsksMap.FD as IMM
-			//{ OpCode: 0 },                                                                 // 14: code: 0 dst_reg: 0 src_reg: 0 off: 0 imm: 0    //    part of the same instruction
-			{OpCode: 97, Dst: 2, Src: 10, Offset: -4}, // 15: code: 97 dst_reg: 2 src_reg: 10 off: -4 imm: 0 // 13
-			{OpCode: 180, Dst: 3},                     // 16: code: 180 dst_reg: 3 src_reg: 0 off: 0 imm: 0  // 14
-			{OpCode: 133, Constant: 51},               // 17: code: 133 dst_reg: 0 src_reg: 0 off: 0 imm: 51 // 15
-			{OpCode: 149},                             // 18: code: 149 dst_reg: 0 src_reg: 0 off: 0 imm: 0  // 16
-		},
-		License:       "LGPL-2.1 or BSD-2-Clause",
-		KernelVersion: 0,
-	})
-	if err != nil {
-		return nil, fmt.Errorf("error: ebpf.NewProgram failed: %v", err)
-	}
-
-	return &Program{Program: program, Queues: qidconfMap, Sockets: xsksMap}, nil
-}
-
-// LoadProgram load a external XDP program, along with queue and socket map;
-// fname is the BPF kernel program file (.o);
-// funcname is the function name in the program file;
-// qidmapname is the Queues map name;
-// xskmapname is the Sockets map name;
-func LoadProgram(fname, funcname, qidmapname, xskmapname string) (*Program, error) {
-	prog := new(Program)
-	col, err := ebpf.LoadCollection(fname)
-	if err != nil {
-		return nil, err
-	}
-	var ok bool
-	if prog.Program, ok = col.Programs[funcname]; !ok {
-		return nil, fmt.Errorf("%v doesn't contain a function named %v", fname, funcname)
-	}
-	if prog.Queues, ok = col.Maps[qidmapname]; !ok {
-		return nil, fmt.Errorf("%v doesn't contain a queue map named %v", fname, qidmapname)
-	}
-	if prog.Sockets, ok = col.Maps[xskmapname]; !ok {
-		return nil, fmt.Errorf("%v doesn't contain a socket map named %v", fname, xskmapname)
-	}
-	return prog, nil
-}
-
-// removeProgram removes an existing XDP program from the given network interface.
-func removeProgram(Ifindex int) error {
-	var link netlink.Link
-	var err error
-	link, err = netlink.LinkByIndex(Ifindex)
-	if err != nil {
-		return err
-	}
-	if !isXdpAttached(link) {
-		return nil
-	}
-	if err = netlink.LinkSetXdpFd(link, -1); err != nil {
-		return fmt.Errorf("netlink.LinkSetXdpFd(link, -1) failed: %v", err)
-	}
-	for {
-		link, err = netlink.LinkByIndex(Ifindex)
-		if err != nil {
-			return err
-		}
-		if !isXdpAttached(link) {
-			break
-		}
-		time.Sleep(time.Second)
-	}
-	return nil
-}
-
-func isXdpAttached(link netlink.Link) bool {
-	if link.Attrs() != nil && link.Attrs().Xdp != nil && link.Attrs().Xdp.Attached {
-		return true
-	}
-	return false
-}
-
-// attachProgram attaches the given XDP program to the network interface.
-func attachProgram(Ifindex int, program *ebpf.Program) error {
-	link, err := netlink.LinkByIndex(Ifindex)
-	if err != nil {
-		return err
-	}
-	return netlink.LinkSetXdpFdWithFlags(link, program.FD(), int(DefaultXdpFlags))
-}

plugin.go

@@ -21,8 +21,6 @@ import (
 
 	"gopkg.in/yaml.v3"
 
-	"m7s.live/v5/pkg/task"
-
 	"github.com/quic-go/quic-go"
 
 	gatewayRuntime "github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
@@ -30,6 +28,7 @@ import (
 	"google.golang.org/grpc"
 	"gorm.io/gorm"
 
+	task "github.com/langhuihui/gotask"
 	. "m7s.live/v5/pkg"
 	"m7s.live/v5/pkg/config"
 	"m7s.live/v5/pkg/db"

plugin/README.md

@@ -326,7 +326,7 @@ The methods serve the following purposes:
 
 ### Memory Management
 The new pattern includes built-in memory management:
-- `util.ScalableMemoryAllocator` - For efficient memory allocation
+- `gomem.ScalableMemoryAllocator` - For efficient memory allocation
 - Frame recycling through `Recycle()` method
 - Automatic memory pool management
 
@@ -375,7 +375,7 @@ func publishRawH264Stream(streamPath string, h264Frames [][]byte) error {
     }
     
     // Create memory allocator
-    allocator := util.NewScalableMemoryAllocator(1 << util.MinPowerOf2)
+    allocator := gomem.NewScalableMemoryAllocator(1 << gomem.MinPowerOf2)
     defer allocator.Recycle()
     
     // Create writer for H26xFrame
@@ -421,7 +421,7 @@ func continuousH264Publishing(streamPath string, frameSource <-chan []byte, stop
     defer publisher.Dispose()
     
     // Create memory allocator
-    allocator := util.NewScalableMemoryAllocator(1 << util.MinPowerOf2)
+    allocator := gomem.NewScalableMemoryAllocator(1 << gomem.MinPowerOf2)
     defer allocator.Recycle()
     
     // Create writer for H26xFrame
@@ -544,7 +544,7 @@ naluType := codec.ParseH265NALUType(mem[0])
 
 ```go
 // Use memory allocators for efficient operations
-allocator := util.NewScalableMemoryAllocator(1 << 20) // 1MB initial size
+allocator := gomem.NewScalableMemoryAllocator(1 << 20) // 1MB initial size
 defer allocator.Recycle()
 
 // When processing multiple frames, reuse the same allocator

plugin/README_CN.md

@@ -323,7 +323,7 @@ IAVFrame interface {
 
 ### 内存管理
 新的模式包含内置的内存管理：
-- `util.ScalableMemoryAllocator` - 用于高效的内存分配
+- `gomem.ScalableMemoryAllocator` - 用于高效的内存分配
 - 通过 `Recycle()` 方法进行帧回收
 - 自动内存池管理
 
@@ -373,7 +373,7 @@ func publishRawH264Stream(streamPath string, h264Frames [][]byte) error {
     }
     
     // 创建内存分配器
-    allocator := util.NewScalableMemoryAllocator(1 << util.MinPowerOf2)
+    allocator := gomem.NewScalableMemoryAllocator(1 << gomem.MinPowerOf2)
     defer allocator.Recycle()
     
     // 创建 H26xFrame 写入器
@@ -418,7 +418,7 @@ func continuousH264Publishing(streamPath string, frameSource <-chan []byte, stop
     defer publisher.Dispose()
     
     // 创建内存分配器
-    allocator := util.NewScalableMemoryAllocator(1 << util.MinPowerOf2)
+    allocator := gomem.NewScalableMemoryAllocator(1 << gomem.MinPowerOf2)
     defer allocator.Recycle()
     
     // 创建 H26xFrame 写入器
@@ -541,7 +541,7 @@ naluType := codec.ParseH265NALUType(mem[0])
 
 ```go
 // 使用内存分配器进行高效操作
-allocator := util.NewScalableMemoryAllocator(1 << 20) // 1MB 初始大小
+allocator := gomem.NewScalableMemoryAllocator(1 << 20) // 1MB 初始大小
 defer allocator.Recycle()
 
 // 处理多帧时重用同一个分配器

plugin/cascade/client.go

@@ -7,9 +7,9 @@ import (
 
 	"m7s.live/v5"
 	"m7s.live/v5/pkg/config"
-	"m7s.live/v5/pkg/task"
 	cascade "m7s.live/v5/plugin/cascade/pkg"
 
+	task "github.com/langhuihui/gotask"
 	"github.com/quic-go/quic-go"
 )
 

plugin/cascade/pkg/quic-http.go

@@ -8,11 +8,11 @@ import (
 	"net/http"
 	"strings"
 
+	task "github.com/langhuihui/gotask"
 	flv "m7s.live/v5/plugin/flv/pkg"
 
 	"github.com/quic-go/quic-go"
 	"m7s.live/v5"
-	"m7s.live/v5/pkg/task"
 )
 
 type RelayAPIConfig struct {

plugin/cascade/server.go

@@ -8,10 +8,10 @@ import (
 	"strings"
 	"sync"
 
+	task "github.com/langhuihui/gotask"
 	"google.golang.org/protobuf/types/known/timestamppb"
 	"m7s.live/v5"
 	"m7s.live/v5/pkg"
-	"m7s.live/v5/pkg/task"
 	"m7s.live/v5/pkg/util"
 
 	"context"

plugin/crontab/crontab.go

@@ -8,7 +8,7 @@ import (
 	"strconv"
 	"time"
 
-	"m7s.live/v5/pkg/task"
+	task "github.com/langhuihui/gotask"
 	"m7s.live/v5/plugin/crontab/pkg"
 )
 

plugin/debug/chart.go

@@ -13,9 +13,9 @@ import (
 	"time"
 
 	"github.com/gorilla/websocket"
+	task "github.com/langhuihui/gotask"
 	"github.com/shirou/gopsutil/v4/cpu"
 	"github.com/shirou/gopsutil/v4/process"
-	"m7s.live/v5/pkg/task"
 )
 
 //go:embed static/*

plugin/debug/index.go

@@ -21,10 +21,10 @@ import (
 	myproc "github.com/cloudwego/goref/pkg/proc"
 	"github.com/go-delve/delve/pkg/config"
 	"github.com/go-delve/delve/service/debugger"
+	task "github.com/langhuihui/gotask"
 	"google.golang.org/protobuf/types/known/emptypb"
 	"google.golang.org/protobuf/types/known/timestamppb"
 	"m7s.live/v5"
-	"m7s.live/v5/pkg/task"
 	"m7s.live/v5/plugin/debug/pb"
 	debug "m7s.live/v5/plugin/debug/pkg"
 	"m7s.live/v5/plugin/debug/pkg/profile"
@@ -557,6 +557,12 @@ func (p *DebugPlugin) GetHeapGraph(ctx context.Context, empty *emptypb.Empty) (*
 	if err != nil {
 		return nil, err
 	}
+
+	// 清理不重要的函数，使图形更干净明了
+	if err := profile.RemoveUninteresting(); err != nil {
+		return nil, fmt.Errorf("could not remove uninteresting functions: %v", err)
+	}
+
 	// Generate dot graph.
 	dot, err := debug.GetDotGraph(profile)
 	if err != nil {

plugin/debug/pkg/index.go

@@ -9,7 +9,12 @@ import (
 )
 
 func GetDotGraph(profile *profile.Profile) (string, error) {
-	rpt := report.NewDefault(profile, report.Options{})
+	// 设置节点数量限制，使图形更简洁（类似官方 pprof）
+	options := report.Options{
+		NodeCount:    80,    // 限制最大节点数
+		NodeFraction: 0.005, // 过滤掉小于 0.5% 的节点
+	}
+	rpt := report.NewDefault(profile, options)
 	g, config := report.GetDOT(rpt)
 	dot := &bytes.Buffer{}
 	graph.ComposeDot(dot, g, &graph.DotAttributes{}, config)

plugin/debug/pkg/internal/graph/graph.go

@@ -166,9 +166,10 @@ func (i *NodeInfo) PrintableName() string {
 // NameComponents returns the components of the printable name to be used for a node.
 func (i *NodeInfo) NameComponents() []string {
 	var name []string
-	if i.Address != 0 {
-		name = append(name, fmt.Sprintf("%016x", i.Address))
-	}
+	// 注释掉内存地址显示，使图形更简洁
+	// if i.Address != 0 {
+	//	name = append(name, fmt.Sprintf("%016x", i.Address))
+	// }
 	if fun := i.Name; fun != "" {
 		name = append(name, fun)
 	}

plugin/flv/api.go

@@ -9,10 +9,10 @@ import (
 	"time"
 
 	"github.com/gobwas/ws"
+	"github.com/langhuihui/gomem"
 	"google.golang.org/protobuf/types/known/emptypb"
 	m7s "m7s.live/v5"
 	"m7s.live/v5/pb"
-	"m7s.live/v5/pkg/util"
 	flvpb "m7s.live/v5/plugin/flv/pb"
 	rtmp "m7s.live/v5/plugin/rtmp/pkg"
 )
@@ -123,7 +123,7 @@ func (plugin *FLVPlugin) jessica(rw http.ResponseWriter, r *http.Request) {
 	var _sendBuffer = net.Buffers{}
 	sendBuffer := _sendBuffer
 	var head [5]byte
-	write := func(typ byte, ts uint32, mem util.Memory) (err error) {
+	write := func(typ byte, ts uint32, mem gomem.Memory) (err error) {
 		head[0] = typ
 		binary.BigEndian.PutUint32(head[1:], ts)
 		err = ws.WriteHeader(conn, ws.Header{

plugin/flv/index.go

@@ -47,7 +47,12 @@ func (plugin *FLVPlugin) Start() (err error) {
 }
 
 func (plugin *FLVPlugin) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	streamPath := strings.TrimSuffix(strings.TrimPrefix(r.URL.Path, "/"), ".flv")
+	rawPath := strings.TrimPrefix(r.URL.Path, "/")
+	if plugin.Server != nil && plugin.Server.RedirectIfNeeded(w, r, "http", rawPath) {
+		plugin.Debug("redirect issued", "protocol", "http", "path", rawPath)
+		return
+	}
+	streamPath := strings.TrimSuffix(rawPath, ".flv")
 	var err error
 	defer func() {
 		if err != nil {

plugin/flv/pkg/echo.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"io"
 
+	"github.com/langhuihui/gomem"
 	"m7s.live/v5/pkg/util"
 	rtmp "m7s.live/v5/plugin/rtmp/pkg"
 )
@@ -13,7 +14,7 @@ func Echo(r io.Reader) (err error) {
 	reader := util.NewBufReader(r)
 	var hasAudio, hasVideo bool
 	var absTS uint32
-	var head util.Memory
+	var head gomem.Memory
 	head, err = reader.ReadBytes(13)
 	if err == nil {
 		var flvHead [3]byte
@@ -29,7 +30,7 @@ func Echo(r io.Reader) (err error) {
 	}
 	var startTs uint32
 	fmt.Println(hasAudio, hasVideo)
-	allocator := util.NewScalableMemoryAllocator(1 << 10)
+	allocator := gomem.NewScalableMemoryAllocator(1 << 10)
 	var tagSize int
 	for offsetTs := absTS; err == nil; tagSize, err = reader.ReadBE(4) {
 		fmt.Println(tagSize)

plugin/flv/pkg/pull-httpfile.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"io"
 
+	"github.com/langhuihui/gomem"
 	"m7s.live/v5"
 	pkg "m7s.live/v5/pkg"
 	"m7s.live/v5/pkg/util"
@@ -27,7 +28,7 @@ func (p *Puller) Run() (err error) {
 	}
 	var hasAudio, hasVideo bool
 	var absTS uint32
-	var head util.Memory
+	var head gomem.Memory
 	head, err = reader.ReadBytes(13)
 	if err == nil {
 		var flvHead [3]byte
@@ -49,7 +50,7 @@ func (p *Puller) Run() (err error) {
 	if !hasVideo {
 		pubConf.PubVideo = false
 	}
-	allocator := util.NewScalableMemoryAllocator(1 << 10)
+	allocator := gomem.NewScalableMemoryAllocator(1 << 10)
 	defer allocator.Recycle()
 	writer := m7s.NewPublisherWriter[*rtmp.AudioFrame, *rtmp.VideoFrame](publisher, allocator)
 

plugin/flv/pkg/pull-recorder.go

@@ -8,10 +8,11 @@ import (
 	"strings"
 	"time"
 
+	"github.com/langhuihui/gomem"
+	task "github.com/langhuihui/gotask"
 	m7s "m7s.live/v5"
 	"m7s.live/v5/pkg"
 	"m7s.live/v5/pkg/config"
-	"m7s.live/v5/pkg/task"
 	"m7s.live/v5/pkg/util"
 	rtmp "m7s.live/v5/plugin/rtmp/pkg"
 )
@@ -51,7 +52,7 @@ func (p *RecordReader) Run() (err error) {
 	if publisher == nil {
 		return pkg.ErrDisabled
 	}
-	allocator := util.NewScalableMemoryAllocator(1 << 10)
+	allocator := gomem.NewScalableMemoryAllocator(1 << 10)
 	writer := m7s.NewPublisherWriter[*rtmp.AudioFrame, *rtmp.VideoFrame](publisher, allocator)
 	var tagHeader [11]byte
 	var ts int64
@@ -81,7 +82,7 @@ func (p *RecordReader) Run() (err error) {
 				p.reader.Recycle()
 			}
 			p.reader = util.NewBufReader(p.File)
-			var head util.Memory
+			var head gomem.Memory
 			head, err = p.reader.ReadBytes(9)
 			if err != nil {
 				return

plugin/flv/pkg/record.go

@@ -1,16 +1,18 @@
 package flv
 
 import (
+	"context"
 	"fmt"
 	"io"
 	"os"
 	"path/filepath"
 	"time"
 
+	task "github.com/langhuihui/gotask"
 	"m7s.live/v5"
 	"m7s.live/v5/pkg"
 	"m7s.live/v5/pkg/config"
-	"m7s.live/v5/pkg/task"
+	"m7s.live/v5/pkg/storage"
 	rtmp "m7s.live/v5/plugin/rtmp/pkg"
 )
 
@@ -26,7 +28,7 @@ func init() {
 
 type writeMetaTagTask struct {
 	task.Task
-	file     *os.File
+	file     storage.File
 	writer   *FlvWriter
 	flags    byte
 	metaData []byte
@@ -76,7 +78,7 @@ func (task *writeMetaTagTask) Start() (err error) {
 	}
 }
 
-func writeMetaTag(file *os.File, suber *m7s.Subscriber, filepositions []uint64, times []float64, duration *int64) {
+func writeMetaTag(file storage.File, suber *m7s.Subscriber, filepositions []uint64, times []float64, duration *int64) {
 	ar, vr := suber.AudioReader, suber.VideoReader
 	hasAudio, hasVideo := ar != nil, vr != nil
 	var amf rtmp.AMF
@@ -142,7 +144,7 @@ func NewRecorder(conf config.Record) m7s.IRecorder {
 type Recorder struct {
 	m7s.DefaultRecorder
 	writer *FlvWriter
-	file   *os.File
+	file   storage.File
 }
 
 var CustomFileName = func(job *m7s.RecordJob) string {
@@ -158,11 +160,26 @@ func (r *Recorder) createStream(start time.Time) (err error) {
 	if err != nil {
 		return
 	}
-	if r.file, err = os.OpenFile(r.Event.FilePath, os.O_CREATE|os.O_RDWR, 0666); err != nil {
-		return
+
+	// 获取存储实例
+	storage := r.RecordJob.GetStorage()
+
+	if storage != nil {
+		// 使用存储抽象层
+		r.file, err = storage.CreateFile(context.Background(), r.Event.FilePath)
+		if err != nil {
+			return
+		}
+		r.writer = NewFlvWriter(r.file)
+	} else {
+		// 默认本地文件行为
+		if r.file, err = os.OpenFile(r.Event.FilePath, os.O_CREATE|os.O_RDWR, 0666); err != nil {
+			return
+		}
+		r.writer = NewFlvWriter(r.file)
 	}
-	_, err = r.file.Write(FLVHead)
-	r.writer = NewFlvWriter(r.file)
+
+	_, err = r.writer.Write(FLVHead)
 	if err != nil {
 		return
 	}

plugin/gb28181/alarmsub.go

@@ -3,7 +3,7 @@ package plugin_gb28181pro
 import (
 	"time"
 
-	"m7s.live/v5/pkg/task"
+	"github.com/langhuihui/gotask"
 )
 
 // AlarmSubscribeTask 报警订阅任务