summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorLibravatar Dominik Süß <dominik@suess.wtf>2023-07-27 10:31:36 +0200
committerLibravatar GitHub <noreply@github.com>2023-07-27 10:31:36 +0200
commit98c2b8ff7e70c70b5f5cfc25a7bd9eaad70850a6 (patch)
tree9c873f3b1b83a1888c6cc8dc9a7bd733cd7497b7 /vendor
parent[feature] Support setting private notes on accounts (#1982) (diff)
downloadgotosocial-98c2b8ff7e70c70b5f5cfc25a7bd9eaad70850a6.tar.xz
[chore] update go-mp4 to latest commit (#2028)
This adds support for probing mp4 files with a co64 box instead of an stco box, which is the case for videos recorded on newer android devices.
Diffstat (limited to 'vendor')
-rw-r--r--vendor/github.com/abema/go-mp4/probe.go31
-rw-r--r--vendor/modules.txt2
2 files changed, 22 insertions, 11 deletions
diff --git a/vendor/github.com/abema/go-mp4/probe.go b/vendor/github.com/abema/go-mp4/probe.go
index 812be5bb6..e407b95c2 100644
--- a/vendor/github.com/abema/go-mp4/probe.go
+++ b/vendor/github.com/abema/go-mp4/probe.go
@@ -66,7 +66,7 @@ type Sample struct {
type Chunks []*Chunk
type Chunk struct {
- DataOffset uint32
+ DataOffset uint64
SamplesPerChunk uint32
}
@@ -195,6 +195,7 @@ func probeTrak(r io.ReadSeeker, bi *BoxInfo) (*Track, error) {
{BoxTypeMdia(), BoxTypeMinf(), BoxTypeStbl(), BoxTypeStsd(), BoxTypeEnca()},
{BoxTypeMdia(), BoxTypeMinf(), BoxTypeStbl(), BoxTypeStsd(), BoxTypeEnca(), BoxTypeEsds()},
{BoxTypeMdia(), BoxTypeMinf(), BoxTypeStbl(), BoxTypeStco()},
+ {BoxTypeMdia(), BoxTypeMinf(), BoxTypeStbl(), BoxTypeCo64()},
{BoxTypeMdia(), BoxTypeMinf(), BoxTypeStbl(), BoxTypeStts()},
{BoxTypeMdia(), BoxTypeMinf(), BoxTypeStbl(), BoxTypeCtts()},
{BoxTypeMdia(), BoxTypeMinf(), BoxTypeStbl(), BoxTypeStsc()},
@@ -215,6 +216,7 @@ func probeTrak(r io.ReadSeeker, bi *BoxInfo) (*Track, error) {
var stsc *Stsc
var ctts *Ctts
var stsz *Stsz
+ var co64 *Co64
for _, bip := range bips {
switch bip.Info.Type {
case BoxTypeTkhd():
@@ -250,6 +252,8 @@ func probeTrak(r io.ReadSeeker, bi *BoxInfo) (*Track, error) {
ctts = bip.Payload.(*Ctts)
case BoxTypeStsz():
stsz = bip.Payload.(*Stsz)
+ case BoxTypeCo64():
+ co64 = bip.Payload.(*Co64)
}
}
@@ -299,14 +303,21 @@ func probeTrak(r io.ReadSeeker, bi *BoxInfo) (*Track, error) {
}
}
- if stco == nil {
- return nil, errors.New("stco box not found")
- }
track.Chunks = make([]*Chunk, 0)
- for _, offset := range stco.ChunkOffset {
- track.Chunks = append(track.Chunks, &Chunk{
- DataOffset: offset,
- })
+ if stco != nil {
+ for _, offset := range stco.ChunkOffset {
+ track.Chunks = append(track.Chunks, &Chunk{
+ DataOffset: uint64(offset),
+ })
+ }
+ } else if co64 != nil {
+ for _, offset := range co64.ChunkOffset {
+ track.Chunks = append(track.Chunks, &Chunk{
+ DataOffset: offset,
+ })
+ }
+ } else {
+ return nil, errors.New("stco/co64 box not found")
}
if stts == nil {
@@ -572,7 +583,7 @@ func FindIDRFrames(r io.ReadSeeker, trackInfo *TrackInfo) ([]int, error) {
continue
}
for nalOffset := uint32(0); nalOffset+lengthSize+1 <= sample.Size; {
- if _, err := r.Seek(int64(dataOffset+nalOffset), io.SeekStart); err != nil {
+ if _, err := r.Seek(int64(dataOffset+uint64(nalOffset)), io.SeekStart); err != nil {
return nil, err
}
data := make([]byte, lengthSize+1)
@@ -591,7 +602,7 @@ func FindIDRFrames(r io.ReadSeeker, trackInfo *TrackInfo) ([]int, error) {
}
nalOffset += lengthSize + length
}
- dataOffset += sample.Size
+ dataOffset += uint64(sample.Size)
}
}
return idxs, nil
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 0b5c6d819..4c4a36271 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -73,7 +73,7 @@ codeberg.org/gruf/go-store/v2/util
## explicit; go 1.19
github.com/KimMachineGun/automemlimit
github.com/KimMachineGun/automemlimit/memlimit
-# github.com/abema/go-mp4 v0.10.1
+# github.com/abema/go-mp4 v0.10.2-0.20230727031202-a1a707db6ecd
## explicit; go 1.14
github.com/abema/go-mp4
github.com/abema/go-mp4/bitio