From 17486d221e1a1135f036b4066ffaefd0eca03f5c Mon Sep 17 00:00:00 2001 From: itouakirai Date: Tue, 30 Sep 2025 21:35:12 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E9=83=A8=E5=88=86aac=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- go.mod | 2 +- go.sum | 2 ++ utils/runv2/runv2.go | 4 ---- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index bf21aa8..91c31bb 100644 --- a/go.mod +++ b/go.mod @@ -38,7 +38,7 @@ require ( github.com/beevik/etree v1.3.0 github.com/fatih/color v1.18.0 github.com/go-resty/resty/v2 v2.16.5 - github.com/itouakirai/mp4ff v0.0.0-20250929054714-77e796d393ee + github.com/itouakirai/mp4ff v0.0.0-20250930132656-98812935a1c7 github.com/olekukonko/tablewriter v0.0.5 github.com/zhaarey/go-mp4tag v0.0.0-20250210094042-22578afc09bf gopkg.in/yaml.v2 v2.2.8 diff --git a/go.sum b/go.sum index bd7774d..a322af2 100644 --- a/go.sum +++ b/go.sum @@ -29,6 +29,8 @@ github.com/hinshun/vt10x v0.0.0-20220119200601-820417d04eec h1:qv2VnGeEQHchGaZ/u github.com/hinshun/vt10x v0.0.0-20220119200601-820417d04eec/go.mod h1:Q48J4R4DvxnHolD5P8pOtXigYlRuPLGl6moFx3ulM68= github.com/itouakirai/mp4ff v0.0.0-20250929054714-77e796d393ee h1:IIMI9QdTGdveHtSy/d1NWLVd42bw4OXBINlwtdgIS9s= github.com/itouakirai/mp4ff v0.0.0-20250929054714-77e796d393ee/go.mod h1:epcaTcHNf0fgnK8d2MP/gPQNji50kvZa9ZxzX06UOoA= +github.com/itouakirai/mp4ff v0.0.0-20250930132656-98812935a1c7 h1:KhMNPs/FW9fsiei6qD8h07ArJqYjvpIjk1zqeyv06Xw= +github.com/itouakirai/mp4ff v0.0.0-20250930132656-98812935a1c7/go.mod h1:epcaTcHNf0fgnK8d2MP/gPQNji50kvZa9ZxzX06UOoA= github.com/k0kubun/go-ansi v0.0.0-20180517002512-3bf9e2903213/go.mod h1:vNUNkEQ1e29fT/6vq2aBdFsgNPmy8qMdSay1npru+Sw= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8= diff --git a/utils/runv2/runv2.go b/utils/runv2/runv2.go index 1eb582f..78c4f48 100644 --- a/utils/runv2/runv2.go +++ b/utils/runv2/runv2.go @@ -624,7 +624,6 @@ func cbcsDecryptSamples(samples []mp4.FullSample, conn *bufio.ReadWriter, func DecryptFragment(frag *mp4.Fragment, tracks map[uint32]mp4.DecryptTrackInfo, conn *bufio.ReadWriter) error { moof := frag.Moof var bytesRemoved uint64 = 0 - var sxxxBytesRemoved uint64 for _, traf := range moof.Trafs { ti, ok := tracks[traf.Tfhd.TrackID] @@ -675,9 +674,6 @@ func DecryptFragment(frag *mp4.Fragment, tracks map[uint32]mp4.DecryptTrackInfo, } bytesRemoved += traf.RemoveEncryptionBoxes() - // remove sbgp and sgpd - traf.Children, sxxxBytesRemoved = FilterSbgpSgpd(traf.Children) - bytesRemoved += sxxxBytesRemoved } _, psshBytesRemoved := moof.RemovePsshs() bytesRemoved += psshBytesRemoved