From 252e2cec8e16d2330b4be8bf73f9c839706647ec Mon Sep 17 00:00:00 2001
From: aler9 <46489434+aler9@users.noreply.github.com>
Date: Tue, 16 Jan 2024 12:40:04 +0100
Subject: [PATCH] move MP4 boxes inside go-mp4

---
 go.mod                         |  2 +-
 go.sum                         |  4 ++--
 pkg/formats/fmp4/boxes.go      | 28 ----------------------------
 pkg/formats/fmp4/init.go       |  2 +-
 pkg/formats/fmp4/init_track.go |  4 ++--
 5 files changed, 6 insertions(+), 34 deletions(-)
 delete mode 100644 pkg/formats/fmp4/boxes.go

diff --git a/go.mod b/go.mod
index 919c5a9..dc50264 100644
--- 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
index 5308b47..f3c8feb 100644
--- 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
deleted file mode 100644
index 4e9e028..0000000
--- a/pkg/formats/fmp4/boxes.go
+++ /dev/null
@@ -1,28 +0,0 @@
-//nolint:gochecknoinits,revive,gocritic
-package fmp4
-
-import (
-	gomp4 "github.com/abema/go-mp4"
-)
-
-func BoxTypeIpcm() gomp4.BoxType { return gomp4.StrToBoxType("ipcm") }
-
-func init() {
-	gomp4.AddAnyTypeBoxDef(&gomp4.AudioSampleEntry{}, BoxTypeIpcm())
-}
-
-func BoxTypePcmC() gomp4.BoxType { return gomp4.StrToBoxType("pcmC") }
-
-func init() {
-	gomp4.AddBoxDef(&PcmC{}, 0, 1)
-}
-
-type PcmC struct {
-	gomp4.FullBox `mp4:"0,extend"`
-	FormatFlags   uint8 `mp4:"1,size=8"`
-	PCMSampleSize uint8 `mp4:"1,size=8"`
-}
-
-func (PcmC) GetType() gomp4.BoxType {
-	return BoxTypePcmC()
-}
diff --git a/pkg/formats/fmp4/init.go b/pkg/formats/fmp4/init.go
index eba30cc..52fc4df 100644
--- 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
index 697a827..8afe253 100644
--- 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