From 380d83f9a968da60419e0afbd8b37bd50ba953de Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Sep 2023 11:33:10 +0100 Subject: [chore]: Bump github.com/abema/go-mp4 from 0.13.0 to 1.0.0 (#2222) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- vendor/github.com/abema/go-mp4/README.md | 5 +- vendor/github.com/abema/go-mp4/bitio/bitio.go | 8 -- vendor/github.com/abema/go-mp4/bitio/read.go | 97 ---------------------- vendor/github.com/abema/go-mp4/bitio/write.go | 61 -------------- vendor/github.com/abema/go-mp4/box.go | 2 +- .../abema/go-mp4/box_types_iso14496_12.go | 4 +- .../github.com/abema/go-mp4/box_types_metadata.go | 2 +- .../abema/go-mp4/internal/bitio/bitio.go | 8 ++ .../github.com/abema/go-mp4/internal/bitio/read.go | 97 ++++++++++++++++++++++ .../abema/go-mp4/internal/bitio/write.go | 61 ++++++++++++++ vendor/github.com/abema/go-mp4/internal/util/io.go | 30 +++++++ .../abema/go-mp4/internal/util/string.go | 42 ++++++++++ vendor/github.com/abema/go-mp4/marshaller.go | 2 +- vendor/github.com/abema/go-mp4/probe.go | 2 +- vendor/github.com/abema/go-mp4/string.go | 2 +- vendor/github.com/abema/go-mp4/util/io.go | 30 ------- vendor/github.com/abema/go-mp4/util/string.go | 42 ---------- 17 files changed, 248 insertions(+), 247 deletions(-) delete mode 100644 vendor/github.com/abema/go-mp4/bitio/bitio.go delete mode 100644 vendor/github.com/abema/go-mp4/bitio/read.go delete mode 100644 vendor/github.com/abema/go-mp4/bitio/write.go create mode 100644 vendor/github.com/abema/go-mp4/internal/bitio/bitio.go create mode 100644 vendor/github.com/abema/go-mp4/internal/bitio/read.go create mode 100644 vendor/github.com/abema/go-mp4/internal/bitio/write.go create mode 100644 vendor/github.com/abema/go-mp4/internal/util/io.go create mode 100644 vendor/github.com/abema/go-mp4/internal/util/string.go delete mode 100644 vendor/github.com/abema/go-mp4/util/io.go delete mode 100644 vendor/github.com/abema/go-mp4/util/string.go (limited to 'vendor/github.com') diff --git a/vendor/github.com/abema/go-mp4/README.md b/vendor/github.com/abema/go-mp4/README.md index 2c6acfdd3..c876a2166 100644 --- a/vendor/github.com/abema/go-mp4/README.md +++ b/vendor/github.com/abema/go-mp4/README.md @@ -6,7 +6,8 @@ go-mp4 [![Coverage Status](https://coveralls.io/repos/github/abema/go-mp4/badge.svg)](https://coveralls.io/github/abema/go-mp4) [![Go Report Card](https://goreportcard.com/badge/github.com/abema/go-mp4)](https://goreportcard.com/report/github.com/abema/go-mp4) -go-mp4 is Go library for reading and writing MP4. +go-mp4 is Go library and CLI tool which provide low-level I/O interfaces of MP4. +This library supports you to parse or build any MP4 boxes(atoms) directly. ## Integration with your Go application @@ -135,7 +136,7 @@ If you should reduce Read function calls, you can wrap the io.ReadSeeker by [buf Install mp4tool as follows: ```sh -go install github.com/abema/go-mp4/mp4tool@latest +go install github.com/abema/go-mp4/cmd/mp4tool@latest mp4tool -help ``` diff --git a/vendor/github.com/abema/go-mp4/bitio/bitio.go b/vendor/github.com/abema/go-mp4/bitio/bitio.go deleted file mode 100644 index 404fd1b82..000000000 --- a/vendor/github.com/abema/go-mp4/bitio/bitio.go +++ /dev/null @@ -1,8 +0,0 @@ -package bitio - -import "errors" - -var ( - ErrInvalidAlignment = errors.New("invalid alignment") - ErrDiscouragedReader = errors.New("discouraged reader implementation") -) diff --git a/vendor/github.com/abema/go-mp4/bitio/read.go b/vendor/github.com/abema/go-mp4/bitio/read.go deleted file mode 100644 index 4da76eae6..000000000 --- a/vendor/github.com/abema/go-mp4/bitio/read.go +++ /dev/null @@ -1,97 +0,0 @@ -package bitio - -import "io" - -type Reader interface { - io.Reader - - // alignment: - // |-1-byte-block-|--------------|--------------|--------------| - // |<-offset->|<-------------------width---------------------->| - ReadBits(width uint) (data []byte, err error) - - ReadBit() (bit bool, err error) -} - -type ReadSeeker interface { - Reader - io.Seeker -} - -type reader struct { - reader io.Reader - octet byte - width uint -} - -func NewReader(r io.Reader) Reader { - return &reader{reader: r} -} - -func (r *reader) Read(p []byte) (n int, err error) { - if r.width != 0 { - return 0, ErrInvalidAlignment - } - return r.reader.Read(p) -} - -func (r *reader) ReadBits(size uint) ([]byte, error) { - bytes := (size + 7) / 8 - data := make([]byte, bytes) - offset := (bytes * 8) - (size) - - for i := uint(0); i < size; i++ { - bit, err := r.ReadBit() - if err != nil { - return nil, err - } - - byteIdx := (offset + i) / 8 - bitIdx := 7 - (offset+i)%8 - if bit { - data[byteIdx] |= 0x1 << bitIdx - } - } - - return data, nil -} - -func (r *reader) ReadBit() (bool, error) { - if r.width == 0 { - buf := make([]byte, 1) - if n, err := r.reader.Read(buf); err != nil { - return false, err - } else if n != 1 { - return false, ErrDiscouragedReader - } - r.octet = buf[0] - r.width = 8 - } - - r.width-- - return (r.octet>>r.width)&0x01 != 0, nil -} - -type readSeeker struct { - reader - seeker io.Seeker -} - -func NewReadSeeker(r io.ReadSeeker) ReadSeeker { - return &readSeeker{ - reader: reader{reader: r}, - seeker: r, - } -} - -func (r *readSeeker) Seek(offset int64, whence int) (int64, error) { - if whence == io.SeekCurrent && r.reader.width != 0 { - return 0, ErrInvalidAlignment - } - n, err := r.seeker.Seek(offset, whence) - if err != nil { - return n, err - } - r.reader.width = 0 - return n, nil -} diff --git a/vendor/github.com/abema/go-mp4/bitio/write.go b/vendor/github.com/abema/go-mp4/bitio/write.go deleted file mode 100644 index 5f63dd2d2..000000000 --- a/vendor/github.com/abema/go-mp4/bitio/write.go +++ /dev/null @@ -1,61 +0,0 @@ -package bitio - -import ( - "io" -) - -type Writer interface { - io.Writer - - // alignment: - // |-1-byte-block-|--------------|--------------|--------------| - // |<-offset->|<-------------------width---------------------->| - WriteBits(data []byte, width uint) error - - WriteBit(bit bool) error -} - -type writer struct { - writer io.Writer - octet byte - width uint -} - -func NewWriter(w io.Writer) Writer { - return &writer{writer: w} -} - -func (w *writer) Write(p []byte) (n int, err error) { - if w.width != 0 { - return 0, ErrInvalidAlignment - } - return w.writer.Write(p) -} - -func (w *writer) WriteBits(data []byte, width uint) error { - length := uint(len(data)) * 8 - offset := length - width - for i := offset; i < length; i++ { - oi := i / 8 - if err := w.WriteBit((data[oi]>>(7-i%8))&0x01 != 0); err != nil { - return err - } - } - return nil -} - -func (w *writer) WriteBit(bit bool) error { - if bit { - w.octet |= 0x1 << (7 - w.width) - } - w.width++ - - if w.width == 8 { - if _, err := w.writer.Write([]byte{w.octet}); err != nil { - return err - } - w.octet = 0x00 - w.width = 0 - } - return nil -} diff --git a/vendor/github.com/abema/go-mp4/box.go b/vendor/github.com/abema/go-mp4/box.go index 72a137951..c69e89257 100644 --- a/vendor/github.com/abema/go-mp4/box.go +++ b/vendor/github.com/abema/go-mp4/box.go @@ -5,7 +5,7 @@ import ( "io" "math" - "github.com/abema/go-mp4/bitio" + "github.com/abema/go-mp4/internal/bitio" ) const LengthUnlimited = math.MaxUint32 diff --git a/vendor/github.com/abema/go-mp4/box_types_iso14496_12.go b/vendor/github.com/abema/go-mp4/box_types_iso14496_12.go index b3e46fd75..f87fb467b 100644 --- a/vendor/github.com/abema/go-mp4/box_types_iso14496_12.go +++ b/vendor/github.com/abema/go-mp4/box_types_iso14496_12.go @@ -5,8 +5,8 @@ import ( "fmt" "io" - "github.com/abema/go-mp4/bitio" - "github.com/abema/go-mp4/util" + "github.com/abema/go-mp4/internal/bitio" + "github.com/abema/go-mp4/internal/util" ) /*************************** btrt ****************************/ diff --git a/vendor/github.com/abema/go-mp4/box_types_metadata.go b/vendor/github.com/abema/go-mp4/box_types_metadata.go index a56145e99..de2146975 100644 --- a/vendor/github.com/abema/go-mp4/box_types_metadata.go +++ b/vendor/github.com/abema/go-mp4/box_types_metadata.go @@ -3,7 +3,7 @@ package mp4 import ( "fmt" - "github.com/abema/go-mp4/util" + "github.com/abema/go-mp4/internal/util" ) /*************************** ilst ****************************/ diff --git a/vendor/github.com/abema/go-mp4/internal/bitio/bitio.go b/vendor/github.com/abema/go-mp4/internal/bitio/bitio.go new file mode 100644 index 000000000..404fd1b82 --- /dev/null +++ b/vendor/github.com/abema/go-mp4/internal/bitio/bitio.go @@ -0,0 +1,8 @@ +package bitio + +import "errors" + +var ( + ErrInvalidAlignment = errors.New("invalid alignment") + ErrDiscouragedReader = errors.New("discouraged reader implementation") +) diff --git a/vendor/github.com/abema/go-mp4/internal/bitio/read.go b/vendor/github.com/abema/go-mp4/internal/bitio/read.go new file mode 100644 index 000000000..4da76eae6 --- /dev/null +++ b/vendor/github.com/abema/go-mp4/internal/bitio/read.go @@ -0,0 +1,97 @@ +package bitio + +import "io" + +type Reader interface { + io.Reader + + // alignment: + // |-1-byte-block-|--------------|--------------|--------------| + // |<-offset->|<-------------------width---------------------->| + ReadBits(width uint) (data []byte, err error) + + ReadBit() (bit bool, err error) +} + +type ReadSeeker interface { + Reader + io.Seeker +} + +type reader struct { + reader io.Reader + octet byte + width uint +} + +func NewReader(r io.Reader) Reader { + return &reader{reader: r} +} + +func (r *reader) Read(p []byte) (n int, err error) { + if r.width != 0 { + return 0, ErrInvalidAlignment + } + return r.reader.Read(p) +} + +func (r *reader) ReadBits(size uint) ([]byte, error) { + bytes := (size + 7) / 8 + data := make([]byte, bytes) + offset := (bytes * 8) - (size) + + for i := uint(0); i < size; i++ { + bit, err := r.ReadBit() + if err != nil { + return nil, err + } + + byteIdx := (offset + i) / 8 + bitIdx := 7 - (offset+i)%8 + if bit { + data[byteIdx] |= 0x1 << bitIdx + } + } + + return data, nil +} + +func (r *reader) ReadBit() (bool, error) { + if r.width == 0 { + buf := make([]byte, 1) + if n, err := r.reader.Read(buf); err != nil { + return false, err + } else if n != 1 { + return false, ErrDiscouragedReader + } + r.octet = buf[0] + r.width = 8 + } + + r.width-- + return (r.octet>>r.width)&0x01 != 0, nil +} + +type readSeeker struct { + reader + seeker io.Seeker +} + +func NewReadSeeker(r io.ReadSeeker) ReadSeeker { + return &readSeeker{ + reader: reader{reader: r}, + seeker: r, + } +} + +func (r *readSeeker) Seek(offset int64, whence int) (int64, error) { + if whence == io.SeekCurrent && r.reader.width != 0 { + return 0, ErrInvalidAlignment + } + n, err := r.seeker.Seek(offset, whence) + if err != nil { + return n, err + } + r.reader.width = 0 + return n, nil +} diff --git a/vendor/github.com/abema/go-mp4/internal/bitio/write.go b/vendor/github.com/abema/go-mp4/internal/bitio/write.go new file mode 100644 index 000000000..5f63dd2d2 --- /dev/null +++ b/vendor/github.com/abema/go-mp4/internal/bitio/write.go @@ -0,0 +1,61 @@ +package bitio + +import ( + "io" +) + +type Writer interface { + io.Writer + + // alignment: + // |-1-byte-block-|--------------|--------------|--------------| + // |<-offset->|<-------------------width---------------------->| + WriteBits(data []byte, width uint) error + + WriteBit(bit bool) error +} + +type writer struct { + writer io.Writer + octet byte + width uint +} + +func NewWriter(w io.Writer) Writer { + return &writer{writer: w} +} + +func (w *writer) Write(p []byte) (n int, err error) { + if w.width != 0 { + return 0, ErrInvalidAlignment + } + return w.writer.Write(p) +} + +func (w *writer) WriteBits(data []byte, width uint) error { + length := uint(len(data)) * 8 + offset := length - width + for i := offset; i < length; i++ { + oi := i / 8 + if err := w.WriteBit((data[oi]>>(7-i%8))&0x01 != 0); err != nil { + return err + } + } + return nil +} + +func (w *writer) WriteBit(bit bool) error { + if bit { + w.octet |= 0x1 << (7 - w.width) + } + w.width++ + + if w.width == 8 { + if _, err := w.writer.Write([]byte{w.octet}); err != nil { + return err + } + w.octet = 0x00 + w.width = 0 + } + return nil +} diff --git a/vendor/github.com/abema/go-mp4/internal/util/io.go b/vendor/github.com/abema/go-mp4/internal/util/io.go new file mode 100644 index 000000000..1e4681186 --- /dev/null +++ b/vendor/github.com/abema/go-mp4/internal/util/io.go @@ -0,0 +1,30 @@ +package util + +import ( + "bytes" + "io" +) + +func ReadString(r io.Reader) (string, error) { + b := make([]byte, 1) + buf := bytes.NewBuffer(nil) + for { + if _, err := r.Read(b); err != nil { + return "", err + } + if b[0] == 0 { + return buf.String(), nil + } + buf.Write(b) + } +} + +func WriteString(w io.Writer, s string) error { + if _, err := w.Write([]byte(s)); err != nil { + return err + } + if _, err := w.Write([]byte{0}); err != nil { + return err + } + return nil +} diff --git a/vendor/github.com/abema/go-mp4/internal/util/string.go b/vendor/github.com/abema/go-mp4/internal/util/string.go new file mode 100644 index 000000000..b38251bb3 --- /dev/null +++ b/vendor/github.com/abema/go-mp4/internal/util/string.go @@ -0,0 +1,42 @@ +package util + +import ( + "strconv" + "strings" + "unicode" +) + +func FormatSignedFixedFloat1616(val int32) string { + if val&0xffff == 0 { + return strconv.Itoa(int(val >> 16)) + } else { + return strconv.FormatFloat(float64(val)/(1<<16), 'f', 5, 64) + } +} + +func FormatUnsignedFixedFloat1616(val uint32) string { + if val&0xffff == 0 { + return strconv.Itoa(int(val >> 16)) + } else { + return strconv.FormatFloat(float64(val)/(1<<16), 'f', 5, 64) + } +} + +func FormatSignedFixedFloat88(val int16) string { + if val&0xff == 0 { + return strconv.Itoa(int(val >> 8)) + } else { + return strconv.FormatFloat(float64(val)/(1<<8), 'f', 3, 32) + } +} + +func EscapeUnprintable(r rune) rune { + if unicode.IsGraphic(r) { + return r + } + return rune('.') +} + +func EscapeUnprintables(src string) string { + return strings.Map(EscapeUnprintable, src) +} diff --git a/vendor/github.com/abema/go-mp4/marshaller.go b/vendor/github.com/abema/go-mp4/marshaller.go index b5c66860b..18ff79a0c 100644 --- a/vendor/github.com/abema/go-mp4/marshaller.go +++ b/vendor/github.com/abema/go-mp4/marshaller.go @@ -8,7 +8,7 @@ import ( "math" "reflect" - "github.com/abema/go-mp4/bitio" + "github.com/abema/go-mp4/internal/bitio" ) const ( diff --git a/vendor/github.com/abema/go-mp4/probe.go b/vendor/github.com/abema/go-mp4/probe.go index e407b95c2..2ffaf7aca 100644 --- a/vendor/github.com/abema/go-mp4/probe.go +++ b/vendor/github.com/abema/go-mp4/probe.go @@ -5,7 +5,7 @@ import ( "errors" "io" - "github.com/abema/go-mp4/bitio" + "github.com/abema/go-mp4/internal/bitio" ) type ProbeInfo struct { diff --git a/vendor/github.com/abema/go-mp4/string.go b/vendor/github.com/abema/go-mp4/string.go index 56afff1bb..4bc368e42 100644 --- a/vendor/github.com/abema/go-mp4/string.go +++ b/vendor/github.com/abema/go-mp4/string.go @@ -7,7 +7,7 @@ import ( "reflect" "strconv" - "github.com/abema/go-mp4/util" + "github.com/abema/go-mp4/internal/util" ) type stringifier struct { diff --git a/vendor/github.com/abema/go-mp4/util/io.go b/vendor/github.com/abema/go-mp4/util/io.go deleted file mode 100644 index 1e4681186..000000000 --- a/vendor/github.com/abema/go-mp4/util/io.go +++ /dev/null @@ -1,30 +0,0 @@ -package util - -import ( - "bytes" - "io" -) - -func ReadString(r io.Reader) (string, error) { - b := make([]byte, 1) - buf := bytes.NewBuffer(nil) - for { - if _, err := r.Read(b); err != nil { - return "", err - } - if b[0] == 0 { - return buf.String(), nil - } - buf.Write(b) - } -} - -func WriteString(w io.Writer, s string) error { - if _, err := w.Write([]byte(s)); err != nil { - return err - } - if _, err := w.Write([]byte{0}); err != nil { - return err - } - return nil -} diff --git a/vendor/github.com/abema/go-mp4/util/string.go b/vendor/github.com/abema/go-mp4/util/string.go deleted file mode 100644 index b38251bb3..000000000 --- a/vendor/github.com/abema/go-mp4/util/string.go +++ /dev/null @@ -1,42 +0,0 @@ -package util - -import ( - "strconv" - "strings" - "unicode" -) - -func FormatSignedFixedFloat1616(val int32) string { - if val&0xffff == 0 { - return strconv.Itoa(int(val >> 16)) - } else { - return strconv.FormatFloat(float64(val)/(1<<16), 'f', 5, 64) - } -} - -func FormatUnsignedFixedFloat1616(val uint32) string { - if val&0xffff == 0 { - return strconv.Itoa(int(val >> 16)) - } else { - return strconv.FormatFloat(float64(val)/(1<<16), 'f', 5, 64) - } -} - -func FormatSignedFixedFloat88(val int16) string { - if val&0xff == 0 { - return strconv.Itoa(int(val >> 8)) - } else { - return strconv.FormatFloat(float64(val)/(1<<8), 'f', 3, 32) - } -} - -func EscapeUnprintable(r rune) rune { - if unicode.IsGraphic(r) { - return r - } - return rune('.') -} - -func EscapeUnprintables(src string) string { - return strings.Map(EscapeUnprintable, src) -} -- cgit v1.2.3