package/gortsplib
1
0
Fork 0
mirror of https://github.com/aler9/gortsplib synced 2025-10-23 15:13:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

examples: insert SPS/PPS before IDR groups once

Browse Source
This commit is contained in:
aler9
2022-10-29 17:07:09 +02:00
parent 29e624aad9
commit d40f9a53c9
2 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
examples/client-read-h264-save-to-disk/mpegtsmuxer.go
View File

@@ -81,11 +81,6 @@ func (e *mpegtsMuxer) encode(nalus [][]byte, pts time.Duration) error {
case h264.NALUTypeIDR: case h264.NALUTypeIDR:
idrPresent = true idrPresent = true
// add SPS and PPS before every IDR
if e.sps != nil && e.pps != nil {
filteredNALUs = append(filteredNALUs, e.sps, e.pps)
}
case h264.NALUTypeNonIDR: case h264.NALUTypeNonIDR:
nonIDRPresent = true nonIDRPresent = true
} }
@@ -93,10 +88,17 @@ func (e *mpegtsMuxer) encode(nalus [][]byte, pts time.Duration) error {
filteredNALUs = append(filteredNALUs, nalu) filteredNALUs = append(filteredNALUs, nalu)
} }
nalus = filteredNALUs
if !nonIDRPresent && !idrPresent { if !nonIDRPresent && !idrPresent {
return nil return nil
} }
// add SPS and PPS before every group that contains an IDR
if idrPresent {
nalus = append([][]byte{e.sps, e.pps}, nalus...)
}
var dts time.Duration var dts time.Duration
if !e.firstIDRReceived { if !e.firstIDRReceived {
@@ -109,7 +111,7 @@ func (e *mpegtsMuxer) encode(nalus [][]byte, pts time.Duration) error {
e.dtsExtractor = h264.NewDTSExtractor() e.dtsExtractor = h264.NewDTSExtractor()
var err error var err error
dts, err = e.dtsExtractor.Extract(filteredNALUs, pts) dts, err = e.dtsExtractor.Extract(nalus, pts)
if err != nil { if err != nil {
return err return err
} }
@@ -120,7 +122,7 @@ func (e *mpegtsMuxer) encode(nalus [][]byte, pts time.Duration) error {
} else { } else {
var err error var err error
dts, err = e.dtsExtractor.Extract(filteredNALUs, pts) dts, err = e.dtsExtractor.Extract(nalus, pts)
if err != nil { if err != nil {
return err return err
} }
@@ -143,7 +145,7 @@ func (e *mpegtsMuxer) encode(nalus [][]byte, pts time.Duration) error {
} }
// encode into Annex-B // encode into Annex-B
annexb, err := h264.AnnexBMarshal(filteredNALUs) annexb, err := h264.AnnexBMarshal(nalus)
if err != nil { if err != nil {
return err return err
} }

18
examples/server-h264-save-to-disk/mpegtsmuxer.go
View File

@@ -81,11 +81,6 @@ func (e *mpegtsMuxer) encode(nalus [][]byte, pts time.Duration) error {
case h264.NALUTypeIDR: case h264.NALUTypeIDR:
idrPresent = true idrPresent = true
// add SPS and PPS before every IDR
if e.sps != nil && e.pps != nil {
filteredNALUs = append(filteredNALUs, e.sps, e.pps)
}
case h264.NALUTypeNonIDR: case h264.NALUTypeNonIDR:
nonIDRPresent = true nonIDRPresent = true
} }
@@ -93,10 +88,17 @@ func (e *mpegtsMuxer) encode(nalus [][]byte, pts time.Duration) error {
filteredNALUs = append(filteredNALUs, nalu) filteredNALUs = append(filteredNALUs, nalu)
} }
nalus = filteredNALUs
if !nonIDRPresent && !idrPresent { if !nonIDRPresent && !idrPresent {
return nil return nil
} }
// add SPS and PPS before every group that contains an IDR
if idrPresent {
nalus = append([][]byte{e.sps, e.pps}, nalus...)
}
var dts time.Duration var dts time.Duration
if !e.firstIDRReceived { if !e.firstIDRReceived {
@@ -109,7 +111,7 @@ func (e *mpegtsMuxer) encode(nalus [][]byte, pts time.Duration) error {
e.dtsExtractor = h264.NewDTSExtractor() e.dtsExtractor = h264.NewDTSExtractor()
var err error var err error
dts, err = e.dtsExtractor.Extract(filteredNALUs, pts) dts, err = e.dtsExtractor.Extract(nalus, pts)
if err != nil { if err != nil {
return err return err
} }
@@ -120,7 +122,7 @@ func (e *mpegtsMuxer) encode(nalus [][]byte, pts time.Duration) error {
} else { } else {
var err error var err error
dts, err = e.dtsExtractor.Extract(filteredNALUs, pts) dts, err = e.dtsExtractor.Extract(nalus, pts)
if err != nil { if err != nil {
return err return err
} }
@@ -143,7 +145,7 @@ func (e *mpegtsMuxer) encode(nalus [][]byte, pts time.Duration) error {
} }
// encode into Annex-B // encode into Annex-B
annexb, err := h264.AnnexBMarshal(filteredNALUs) annexb, err := h264.AnnexBMarshal(nalus)
if err != nil { if err != nil {
return err return err
} }