From 24f5686c988f3d2a35b1d53b74b238f8d013f43b Mon Sep 17 00:00:00 2001 From: Martin Riedl Date: Thu, 7 Nov 2024 19:03:54 +0100 Subject: [PATCH] some refactoring --- Box.go | 26 +++++++++++++------------- MediaHeaderBox.go | 2 +- Parser.go | 12 ++++++------ 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Box.go b/Box.go index 23dbd91..69ea768 100644 --- a/Box.go +++ b/Box.go @@ -28,18 +28,18 @@ const ( BoxTypeMovie = "moov" // BoxTypeMovieHeader Movie Header Box BoxTypeMovieHeader = "mvhd" - // BoxTypeTrackBox Track Box - BoxTypeTrackBox = "trak" - // BoxTypeTrackHeaderBox Track Header Box - BoxTypeTrackHeaderBox = "tkhd" - // BoxTypeMediaBox Media Box - BoxTypeMediaBox = "mdia" - // BoxTypeMediaHeaderBox Media Header Box - BoxTypeMediaHeaderBox = "mdhd" - // BoxTypeHandlerReferenceBox Handler Reference Box - BoxTypeHandlerReferenceBox = "hdlr" - // BoxTypeMediaInformationBox Media Information Box - BoxTypeMediaInformationBox = "minf" + // BoxTypeTrack Track Box + BoxTypeTrack = "trak" + // BoxTypeTrackHeader Track Header Box + BoxTypeTrackHeader = "tkhd" + // BoxTypeMedia Media Box + BoxTypeMedia = "mdia" + // BoxTypeMediaHeader Media Header Box + BoxTypeMediaHeader = "mdhd" + // BoxTypeHandlerReference Handler Reference Box + BoxTypeHandlerReference = "hdlr" + // BoxTypeMediaInformation Media Information Box + BoxTypeMediaInformation = "minf" // BoxTypeMovieFragment Movie Fragment Box BoxTypeMovieFragment = "moof" // BoxTypeMovieFragmentHeader Movie Fragment Header Box @@ -48,7 +48,7 @@ const ( BoxTypeTrackFragment = "traf" // BoxTypeTrackFragmentHeader Track Fragment Header BoxTypeTrackFragmentHeader = "tfhd" - // BoxTypeTrackFragmentRun Track Fragment Run Box + // BoxTypeTrackFragmentRun Track Fragment Run Box BoxTypeTrackFragmentRun = "trun" // BoxTypeVideoMediaHeader Video Media Header Box BoxTypeVideoMediaHeader = "vmhd" diff --git a/MediaHeaderBox.go b/MediaHeaderBox.go index 39646af..e419995 100644 --- a/MediaHeaderBox.go +++ b/MediaHeaderBox.go @@ -58,7 +58,7 @@ type MediaHeaderBox struct { // TODO: parse language language } -// ParseMediaHeaderBox creates a new Track Header Box struct +// ParseMediaHeaderBox creates a new Media Header Box struct func ParseMediaHeaderBox(filePosition uint64, headerSize uint32, content []byte) *MediaHeaderBox { box := &MediaHeaderBox{ FullBox: newFullBox(&Box{filePosition, headerSize}, content[0:4]), diff --git a/Parser.go b/Parser.go index 12e5f5f..dc3f2f5 100644 --- a/Parser.go +++ b/Parser.go @@ -112,17 +112,17 @@ func parseNextBox(reader io.Reader, filePosition uint64) (box interface{}, endPo box, err = ParseMovieBox(filePosition, boxHeaderSize, boxContentBytes) case BoxTypeMovieHeader: box = ParseMovieHeaderBox(filePosition, boxHeaderSize, boxContentBytes) - case BoxTypeTrackBox: + case BoxTypeTrack: box, err = ParseTrackBox(filePosition, boxHeaderSize, boxContentBytes) - case BoxTypeTrackHeaderBox: + case BoxTypeTrackHeader: box = ParseTrackHeaderBox(filePosition, boxHeaderSize, boxContentBytes) - case BoxTypeMediaBox: + case BoxTypeMedia: box, err = ParseMediaBox(filePosition, boxHeaderSize, boxContentBytes) - case BoxTypeMediaHeaderBox: + case BoxTypeMediaHeader: box = ParseMediaHeaderBox(filePosition, boxHeaderSize, boxContentBytes) - case BoxTypeHandlerReferenceBox: + case BoxTypeHandlerReference: box = ParseHandlerReferenceBox(filePosition, boxHeaderSize, boxContentBytes) - case BoxTypeMediaInformationBox: + case BoxTypeMediaInformation: box, err = ParseMediaInformationBox(filePosition, boxHeaderSize, boxContentBytes) case BoxTypeMovieFragment: box, err = ParseMovieFragmentBox(filePosition, boxHeaderSize, boxContentBytes)