mirror
/
av
mirror of https://bitbucket.org/ausocean/av.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merged in http-post-fix (pull request #250) 

codec/h264/parse.go: skip over access unit delimiters when getting nalType

Approved-by: Alan Noble <anoble@gmail.com>
This commit is contained in:
Saxon Milton 2019-09-12 01:39:59 +00:00
parent 54fb4a551e e0509e7e61
commit 04fa5c1e2b
3 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
codec/h264/h264dec/frame.go
View File

@ -11,7 +11,7 @@ const (
naluTypeSEI naluTypeSEI
NALTypeSPS NALTypeSPS
naluTypePPS naluTypePPS
naluTypeAccessUnitDelimiter NALTypeAccessUnitDelimiter
naluTypeEndOfSequence naluTypeEndOfSequence
naluTypeEndOfStream naluTypeEndOfStream
naluTypeFillerData naluTypeFillerData

39
codec/h264/parse.go
View File

@ -26,34 +26,43 @@ LICENSE
package h264 package h264
import "errors" import (
"errors"
"bitbucket.org/ausocean/av/codec/h264/h264dec"
)
var errNotEnoughBytes = errors.New("not enough bytes to read") var errNotEnoughBytes = errors.New("not enough bytes to read")
// NALType returns the NAL type of the given NAL unit bytes. The given NAL unit // NALType returns the NAL type of the given NAL unit bytes. The given NAL unit
// may be in byte stream or packet format. // may be in byte stream or packet format.
// NB: access unit delimiters are skipped.
func NALType(n []byte) (int, error) { func NALType(n []byte) (int, error) {
sc := frameScanner{buf: n} sc := frameScanner{buf: n}
b, ok := sc.readByte() for {
if !ok { b, ok := sc.readByte()
return 0, errNotEnoughBytes
}
for i := 1; b == 0x00 && i != 4; i++ {
b, ok = sc.readByte()
if !ok { if !ok {
return 0, errNotEnoughBytes return 0, errNotEnoughBytes
} }
if b != 0x01 || (i != 2 && i != 3) { for i := 1; b == 0x00 && i != 4; i++ {
continue b, ok = sc.readByte()
} if !ok {
return 0, errNotEnoughBytes
}
if b != 0x01 || (i != 2 && i != 3) {
continue
}
b, ok = sc.readByte() b, ok = sc.readByte()
if !ok { if !ok {
return 0, errNotEnoughBytes return 0, errNotEnoughBytes
}
nalType := int(b & 0x1f)
if nalType != h264dec.NALTypeAccessUnitDelimiter {
return nalType, nil
}
} }
return int(b & 0x1f), nil
} }
return int(b & 0x1f), nil
} }
type frameScanner struct { type frameScanner struct {

5
container/mts/encoder_test.go
View File

@ -101,7 +101,10 @@ func TestEncodeVideo(t *testing.T) {
// Create the dst and write the test data to encoder. // Create the dst and write the test data to encoder.
dst := &destination{} dst := &destination{}
_, err := NewEncoder(nopCloser{dst}, 25, EncodeH264).Write(data) e := NewEncoder(nopCloser{dst}, 25, EncodeH264)
e.NALBasedPSI(false, psiSendCount)
_, err := e.Write(data)
if err != nil { if err != nil {
t.Fatalf("could not write data to encoder, failed with err: %v\n", err) t.Fatalf("could not write data to encoder, failed with err: %v\n", err)
} }