From c55eda47e01008e74a43ca10475bef8cfae5731d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torbj=C3=B6rn=20Einarson?= Date: Thu, 4 Apr 2024 19:15:18 +0200 Subject: [PATCH 1/2] chore: remove unnecessary code --- mp4/boxsr.go | 3 --- mp4/initsegment_test.go | 12 +++--------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/mp4/boxsr.go b/mp4/boxsr.go index 39d69fdb..f6e1afea 100644 --- a/mp4/boxsr.go +++ b/mp4/boxsr.go @@ -214,9 +214,6 @@ LoopBoxes: return nil, err } boxType, boxSize := box.Type(), box.Size() - if err != nil { - return nil, err - } switch boxType { case "mdat": if f.isFragmented { diff --git a/mp4/initsegment_test.go b/mp4/initsegment_test.go index 5da7f871..e0ac6369 100644 --- a/mp4/initsegment_test.go +++ b/mp4/initsegment_test.go @@ -18,17 +18,13 @@ const pps1nalu = "685bdf20" func parseInitFile(fileName string) (*File, error) { fd, err := os.Open(fileName) if err != nil { - if err != nil { - return nil, err - } + return nil, err } defer fd.Close() f, err := DecodeFile(fd) if err != io.EOF && err != nil { - if err != nil { - return nil, err - } + return nil, err } if f.IsFragmented() && f.Init.Ftyp == nil { return nil, fmt.Errorf("No ftyp present") @@ -175,9 +171,7 @@ func TestGenerateInitSegment(t *testing.T) { initRead, err := DecodeFile(&buf) if err != io.EOF && err != nil { - if err != nil { - t.Error(err) - } + t.Error(err) } if initRead.Moov.Size() != init.Moov.Size() { t.Errorf("Mismatch generated vs read moov size: %d != %d", init.Moov.Size(), initRead.Moov.Size()) From 2c1d3aafa9357e0a2af7a5844a720e37f2c6a751 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torbj=C3=B6rn=20Einarson?= Date: Thu, 4 Apr 2024 19:22:33 +0200 Subject: [PATCH 2/2] docs: v0.53.0 --- CHANGELOG.md | 9 +++++++-- mp4/version.go | 4 ++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 156a8c42..106584db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +- Nothing yet + +## [0.43.0] - 2024-04-04 + ### Added - InitSegment.TweakSingleTrakLive changes an init segment to fit live streaming @@ -25,7 +29,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed - kind box full-box header -- stpp support when the optional fields do not even have a zero-termination byte +- stpp support when the optional fields do not have a zero-termination byte - mp4ff-wvttlister now lists all boxes in a sample ## [0.42.0] - 2024-01-26 @@ -558,7 +562,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - New unique repo name: `mp4ff` -[Unreleased]: https://github.com/Eyevinn/mp4ff/compare/v0.42.0...HEAD +[Unreleased]: https://github.com/Eyevinn/mp4ff/compare/v0.43.0...HEAD +[0.43.0]: https://github.com/Eyevinn/mp4ff/compare/v0.42.0...v0.43.0 [0.42.0]: https://github.com/Eyevinn/mp4ff/compare/v0.41.0...v0.42.0 [0.41.0]: https://github.com/Eyevinn/mp4ff/compare/v0.40.2...v0.41.0 [0.40.2]: https://github.com/Eyevinn/mp4ff/compare/v0.40.1...v0.40.2 diff --git a/mp4/version.go b/mp4/version.go index da4f9aba..e47db6f7 100644 --- a/mp4/version.go +++ b/mp4/version.go @@ -7,8 +7,8 @@ import ( ) var ( - commitVersion string = "v0.42.0" // May be updated using build flags - commitDate string = "1706273015" // commitDate in Epoch seconds (may be overridden using build flags) + commitVersion string = "v0.43.0" // May be updated using build flags + commitDate string = "1712251234" // commitDate in Epoch seconds (may be overridden using build flags) ) // GetVersion - get version and also commitHash and commitDate if inserted via Makefile