move boxes into go-mp4

bluenviron · Sep 27, 2023 · 77460f6 · 77460f6
1 parent 721b24f
commit 77460f6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 41 deletions.
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
@@ -478,7 +478,7 @@ func (i *Init) Unmarshal(byts []byte) error {
 			if err != nil {
 				return nil, err
 			}
-			dac3 := box.(*Dac3)
+			dac3 := box.(*mp4.Dac3)
 
 			curTrack.Codec = &CodecAC3{
 				SampleRate:   sampleRate,

diff --git a/pkg/formats/fmp4/init_track.go b/pkg/formats/fmp4/init_track.go
@@ -482,7 +482,7 @@ func (track *InitTrack) marshal(w *mp4Writer) error {
 		_, err = w.writeBoxStart(&mp4.VisualSampleEntry{ // <mp4v>
 			SampleEntry: mp4.SampleEntry{
 				AnyTypeBox: mp4.AnyTypeBox{
-					Type: BoxTypeMp4v(),
+					Type: mp4.BoxTypeMp4v(),
 				},
 				DataReferenceIndex: 1,
 			},
@@ -538,7 +538,7 @@ func (track *InitTrack) marshal(w *mp4Writer) error {
 		_, err = w.writeBoxStart(&mp4.VisualSampleEntry{ // <mp4v>
 			SampleEntry: mp4.SampleEntry{
 				AnyTypeBox: mp4.AnyTypeBox{
-					Type: BoxTypeMp4v(),
+					Type: mp4.BoxTypeMp4v(),
 				},
 				DataReferenceIndex: 1,
 			},
@@ -594,7 +594,7 @@ func (track *InitTrack) marshal(w *mp4Writer) error {
 		_, err = w.writeBoxStart(&mp4.VisualSampleEntry{ // <mp4v>
 			SampleEntry: mp4.SampleEntry{
 				AnyTypeBox: mp4.AnyTypeBox{
-					Type: BoxTypeMp4v(),
+					Type: mp4.BoxTypeMp4v(),
 				},
 				DataReferenceIndex: 1,
 			},
@@ -771,7 +771,7 @@ func (track *InitTrack) marshal(w *mp4Writer) error {
 		_, err = w.writeBoxStart(&mp4.AudioSampleEntry{ // <ac-3>
 			SampleEntry: mp4.SampleEntry{
 				AnyTypeBox: mp4.AnyTypeBox{
-					Type: BoxTypeAC3(),
+					Type: mp4.BoxTypeAC3(),
 				},
 				DataReferenceIndex: 1,
 			},
@@ -783,7 +783,7 @@ func (track *InitTrack) marshal(w *mp4Writer) error {
 			return err
 		}
 
-		_, err = w.writeBox(&Dac3{ // <dac3/>
+		_, err = w.writeBox(&mp4.Dac3{ // <dac3/>
 			Fscod: codec.Fscod,
 			Bsid:  codec.Bsid,
 			Bsmod: codec.Bsmod,