Improve SPS parser
This commit is contained in:
@@ -5,6 +5,7 @@ import (
|
|||||||
"encoding/hex"
|
"encoding/hex"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -83,3 +84,12 @@ func TestGetProfileLevelID(t *testing.T) {
|
|||||||
profile = GetProfileLevelID(s)
|
profile = GetProfileLevelID(s)
|
||||||
require.Equal(t, "640029", profile)
|
require.Equal(t, "640029", profile)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestDecodeSPS2(t *testing.T) {
|
||||||
|
s := "6764001fad84010c20086100430802184010c200843b50740932"
|
||||||
|
b, err := hex.DecodeString(s)
|
||||||
|
require.Nil(t, err)
|
||||||
|
|
||||||
|
sps := DecodeSPS(b)
|
||||||
|
assert.Nil(t, sps) // broken SPS?
|
||||||
|
}
|
||||||
|
|||||||
+23
-3
@@ -115,9 +115,14 @@ func DecodeSPS(sps []byte) *SPS {
|
|||||||
s.seq_scaling_matrix_present_flag = r.ReadBit()
|
s.seq_scaling_matrix_present_flag = r.ReadBit()
|
||||||
if s.seq_scaling_matrix_present_flag != 0 {
|
if s.seq_scaling_matrix_present_flag != 0 {
|
||||||
for i := byte(0); i < n; i++ {
|
for i := byte(0); i < n; i++ {
|
||||||
ssl := r.ReadBit() // seq_scaling_list_present_flag[i]
|
//goland:noinspection GoSnakeCaseUsage
|
||||||
if ssl != 0 {
|
seq_scaling_list_present_flag := r.ReadBit()
|
||||||
return nil // not implemented
|
if seq_scaling_list_present_flag != 0 {
|
||||||
|
if i < 6 {
|
||||||
|
s.scaling_list(r, 16)
|
||||||
|
} else {
|
||||||
|
s.scaling_list(r, 64)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -209,3 +214,18 @@ func DecodeSPS(sps []byte) *SPS {
|
|||||||
|
|
||||||
return s
|
return s
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//goland:noinspection GoSnakeCaseUsage
|
||||||
|
func (s *SPS) scaling_list(r *bits.Reader, sizeOfScalingList int) {
|
||||||
|
lastScale := int32(8)
|
||||||
|
nextScale := int32(8)
|
||||||
|
for j := 0; j < sizeOfScalingList; j++ {
|
||||||
|
if nextScale != 0 {
|
||||||
|
delta_scale := r.ReadSEGolomb()
|
||||||
|
nextScale = (lastScale + delta_scale + 256) % 256
|
||||||
|
}
|
||||||
|
if nextScale != 0 {
|
||||||
|
lastScale = nextScale
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user