Skip to content

Commit 5ba1c9c

Browse files
committed
bump Golang to 1.23
1 parent 2831f92 commit 5ba1c9c

File tree

6 files changed

+12
-19
lines changed

6 files changed

+12
-19
lines changed

.github/workflows/lint.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ jobs:
1515

1616
- uses: actions/setup-go@v3
1717
with:
18-
go-version: "1.22"
18+
go-version: "1.23"
1919

2020
- uses: golangci/golangci-lint-action@v3
2121
with:
22-
version: v1.59.1
22+
version: v1.61.0
2323

2424
go-mod-tidy:
2525
runs-on: ubuntu-22.04
@@ -29,7 +29,7 @@ jobs:
2929

3030
- uses: actions/setup-go@v3
3131
with:
32-
go-version: "1.22"
32+
go-version: "1.23"
3333

3434
- run: |
3535
go mod tidy

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-22.04
1212
strategy:
1313
matrix:
14-
go: ["1.20", "1.21", "1.22"]
14+
go: ["1.21", "1.22", "1.23"]
1515

1616
steps:
1717
- uses: actions/checkout@v4
@@ -24,7 +24,7 @@ jobs:
2424

2525
- run: make test-nodocker
2626

27-
- if: matrix.go == '1.22'
27+
- if: matrix.go == '1.23'
2828
uses: codecov/codecov-action@v3
2929
with:
3030
token: ${{ secrets.CODECOV_TOKEN }}

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
BASE_IMAGE = golang:1.22-alpine3.18
2-
LINT_IMAGE = golangci/golangci-lint:v1.59.1
1+
BASE_IMAGE = golang:1.23-alpine3.20
2+
LINT_IMAGE = golangci/golangci-lint:v1.61.0
33

44
.PHONY: $(shell ls)
55

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/bluenviron/mediacommon
22

3-
go 1.20
3+
go 1.21
44

55
require (
66
github.com/abema/go-mp4 v1.2.0

pkg/codecs/h264/dts_extractor2.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,10 @@ func getPictureOrderCount(buf []byte, sps *SPS, idr bool) (uint32, error) {
6565
}
6666

6767
func getPictureOrderCountDiff(a uint32, b uint32, sps *SPS) int32 {
68-
max := uint32(1 << (sps.Log2MaxPicOrderCntLsbMinus4 + 4))
69-
d := (a - b) & (max - 1)
70-
if d > (max / 2) {
71-
return int32(d) - int32(max)
68+
maxVal := uint32(1 << (sps.Log2MaxPicOrderCntLsbMinus4 + 4))
69+
d := (a - b) & (maxVal - 1)
70+
if d > (maxVal / 2) {
71+
return int32(d) - int32(maxVal)
7272
}
7373
return int32(d)
7474
}

pkg/codecs/h265/sps.go

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,6 @@ var subHeightC = []uint32{
2727
1,
2828
}
2929

30-
func min(a, b int) int {
31-
if a < b {
32-
return a
33-
}
34-
return b
35-
}
36-
3730
// SPS_ScalingListData is a scaling list data.
3831
type SPS_ScalingListData struct { //nolint:revive
3932
ScalingListPredModeFlag [4][6]bool

0 commit comments

Comments
 (0)