fix

diff --git a/Reply/fmp4Decode.go b/Reply/fmp4Decode.go
index 3d2a2567d1f7379a73827102b2b0c6c02bb2fe23..b81dcc1f05148e22113f4c3d0afb6f44549166b8 100644 (file)
--- a/Reply/fmp4Decode.go
+++ b/Reply/fmp4Decode.go
@@ -3,7 +3,6 @@ package reply
 import (
        "bytes"
        "errors"
-       "fmt"
 
        F "github.com/qydysky/bili_danmu/F"
 )
@@ -260,7 +259,10 @@ func (t *Fmp4Decoder) Seach_stream_fmp4(buf []byte) (keyframes [][]byte, last_av
 
                        if track.handlerType == 'v' {
                                if timeStamp < frameTime {
-                                       err = fmt.Errorf("时间戳异常: (current)%d < (last)%d", timeStamp, frameTime)
+                                       // log.Default().Println("时间戳异常 忽略到下个关键帧")
+                                       iskeyFrame = false
+                                       haveKeyframe = false
+                                       keyframe = []byte{}
                                        break
                                }
                                frameTime = timeStamp

diff --git a/demo/go.mod b/demo/go.mod
index 6859a058c98c9f52cc7a71f1a5dd59dfc0d1a7a0..c44aaabd79122b6e30794d060d1800780cec705d 100644 (file)
--- a/demo/go.mod
+++ b/demo/go.mod
@@ -15,7 +15,7 @@ require (
        github.com/mdp/qrterminal/v3 v3.0.0 // indirect
        github.com/miekg/dns v1.1.50 // indirect
        github.com/mitchellh/mapstructure v1.5.0 // indirect
-       github.com/qydysky/part v0.19.2 // indirect
+       github.com/qydysky/part v0.20.0 // indirect
        github.com/shirou/gopsutil v3.21.11+incompatible // indirect
        github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect
        github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 // indirect

diff --git a/demo/go.sum b/demo/go.sum
index a2cb305a2f0ba6c8684d54df8268642d05dc45e7..b16321b03c0ae75a3319e60f4b8f8e20ee685ab0 100644 (file)
--- a/demo/go.sum
+++ b/demo/go.sum
@@ -130,6 +130,8 @@ github.com/qydysky/part v0.19.1 h1:3AdjJtm5Q594Jd/My1E1wQIiRPXgmS+KM1DJhofLr1M=
 github.com/qydysky/part v0.19.1/go.mod h1:BG0tulTKW58jSkC0EZ0MrxDHe+gkPULfGNzksiGCayw=
 github.com/qydysky/part v0.19.2 h1:peR1UBrBgnjB63nv5F100oJ72hRoJnn8cuZPXDiGZOM=
 github.com/qydysky/part v0.19.2/go.mod h1:BG0tulTKW58jSkC0EZ0MrxDHe+gkPULfGNzksiGCayw=
+github.com/qydysky/part v0.20.0 h1:JkAdTrGwXjbL8FJuiinKK8Vrd2HU/rcRD+Bdx4RpGGw=
+github.com/qydysky/part v0.20.0/go.mod h1:BG0tulTKW58jSkC0EZ0MrxDHe+gkPULfGNzksiGCayw=
 github.com/shirou/gopsutil v3.20.12+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
 github.com/shirou/gopsutil v3.21.5+incompatible h1:OloQyEerMi7JUrXiNzy8wQ5XN+baemxSl12QgIzt0jc=
 github.com/shirou/gopsutil v3.21.5+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=

diff --git a/go.mod b/go.mod
index 9f4240924964a1f11d763c94b02360c98d575287..262640730a43b3970d0b911868fe0523157a6030 100644 (file)
--- a/go.mod
+++ b/go.mod
@@ -7,7 +7,7 @@ require (
        github.com/gofrs/uuid v4.3.0+incompatible
        github.com/gotk3/gotk3 v0.6.1
        github.com/mdp/qrterminal/v3 v3.0.0
-       github.com/qydysky/part v0.19.2
+       github.com/qydysky/part v0.20.0
        github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e
        github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
        golang.org/x/text v0.3.8

diff --git a/go.sum b/go.sum
index f2aba98a6cb69eb92930c8c5b86afd11a29b3fc5..4fc02e054aa3999da1a6fb004b549b07ab961c19 100644 (file)
--- a/go.sum
+++ b/go.sum
@@ -64,6 +64,8 @@ github.com/qydysky/part v0.19.1 h1:3AdjJtm5Q594Jd/My1E1wQIiRPXgmS+KM1DJhofLr1M=
 github.com/qydysky/part v0.19.1/go.mod h1:BG0tulTKW58jSkC0EZ0MrxDHe+gkPULfGNzksiGCayw=
 github.com/qydysky/part v0.19.2 h1:peR1UBrBgnjB63nv5F100oJ72hRoJnn8cuZPXDiGZOM=
 github.com/qydysky/part v0.19.2/go.mod h1:BG0tulTKW58jSkC0EZ0MrxDHe+gkPULfGNzksiGCayw=
+github.com/qydysky/part v0.20.0 h1:JkAdTrGwXjbL8FJuiinKK8Vrd2HU/rcRD+Bdx4RpGGw=
+github.com/qydysky/part v0.20.0/go.mod h1:BG0tulTKW58jSkC0EZ0MrxDHe+gkPULfGNzksiGCayw=
 github.com/shirou/gopsutil v3.20.12+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
 github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI=
 github.com/shirou/gopsutil v3.21.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=