move MP4 boxes inside go-mp4

bluenviron · Jan 16, 2024 · 252e2ce · 252e2ce
1 parent b051aac
commit 252e2ce
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 34 deletions.
diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/bluenviron/mediacommon
 go 1.19
 
 require (
-	github.com/abema/go-mp4 v1.1.1
+	github.com/abema/go-mp4 v1.2.0
 	github.com/asticode/go-astits v1.13.0
 	github.com/stretchr/testify v1.8.4
 )

diff --git a/go.sum b/go.sum
@@ -1,5 +1,5 @@
-github.com/abema/go-mp4 v1.1.1 h1:OfzkdMO6SWTBR1ltNSVwlTHatrAK9I3iYLQfkdEMMuc=
-github.com/abema/go-mp4 v1.1.1/go.mod h1:vPl9t5ZK7K0x68jh12/+ECWBCXoWuIDtNgPtU2f04ws=
+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/asticode/go-astikit v0.30.0 h1:DkBkRQRIxYcknlaU7W7ksNfn4gMFsB0tqMJflxkRsZA=
 github.com/asticode/go-astikit v0.30.0/go.mod h1:h4ly7idim1tNhaVkdVBeXQZEE3L0xblP7fCWbgwipF0=
 github.com/asticode/go-astits v1.13.0 h1:XOgkaadfZODnyZRR5Y0/DWkA9vrkLLPLeeOvDwfKZ1c=

diff --git a/pkg/formats/fmp4/boxes.go b/pkg/formats/fmp4/boxes.go
diff --git a/pkg/formats/fmp4/init.go b/pkg/formats/fmp4/init.go
@@ -524,7 +524,7 @@ func (i *Init) Unmarshal(r io.ReadSeeker) error {
 			if err != nil {
 				return nil, err
 			}
-			pcmc := box.(*PcmC)
+			pcmc := box.(*mp4.PcmC)
 
 			curTrack.Codec = &CodecLPCM{
 				LittleEndian: (pcmc.FormatFlags & 0x01) != 0,

diff --git a/pkg/formats/fmp4/init_track.go b/pkg/formats/fmp4/init_track.go
@@ -804,7 +804,7 @@ func (track *InitTrack) marshal(w *mp4Writer) error {
 		_, err = w.writeBoxStart(&mp4.AudioSampleEntry{ // <ipcm>
 			SampleEntry: mp4.SampleEntry{
 				AnyTypeBox: mp4.AnyTypeBox{
-					Type: BoxTypeIpcm(),
+					Type: mp4.BoxTypeIpcm(),
 				},
 				DataReferenceIndex: 1,
 			},
@@ -816,7 +816,7 @@ func (track *InitTrack) marshal(w *mp4Writer) error {
 			return err
 		}
 
-		_, err = w.writeBox(&PcmC{ // <pcmC/>
+		_, err = w.writeBox(&mp4.PcmC{ // <pcmC/>
 			FormatFlags: func() uint8 {
 				if codec.LittleEndian {
 					return 1