[patch] pr补充,refactor,Init保持原样,不要传入Feed #205

pull/208/head
q191201771 3 years ago
parent d174d3b911
commit 16f1704d48

@ -100,7 +100,6 @@ func (r *AvPacket2RtmpRemuxer) InitWithAvConfig(asc, vps, sps, pps []byte) {
return
}
if !AvPacket2RtmpRemuxerAddSpsPps2KeyFrameFlag {
if r.audioType != base.AvPacketPtUnknown {
bAsh, err = aac.MakeAudioDataSeqHeaderWithAsc(asc)
if err != nil {
@ -131,34 +130,6 @@ func (r *AvPacket2RtmpRemuxer) InitWithAvConfig(asc, vps, sps, pps []byte) {
if r.videoType != base.AvPacketPtUnknown {
r.emitRtmpAvMsg(false, bVsh, 0)
}
} else {
// 通过FeedAvPacket 传入 合并到关键帧
if r.audioType != base.AvPacketPtUnknown {
r.FeedAvPacket(base.AvPacket{
PayloadType: base.AvPacketPtAac,
Payload: asc,
})
}
if r.videoType != base.AvPacketPtUnknown {
if r.videoType == base.AvPacketPtHevc {
payload, err := hevc.BuildVpsSpsPps2Annexb(vps, sps, pps)
if err != nil {
Log.Errorf("build hevc seq header failed. err=%+v", err)
return
}
r.FeedAvPacket(base.AvPacket{
PayloadType: base.AvPacketPtHevc,
Payload: payload,
})
} else {
r.FeedAvPacket(base.AvPacket{
PayloadType: base.AvPacketPtAvc,
Payload: avc.BuildSpsPps2Annexb(sps, pps),
})
}
}
}
}
// FeedAvPacket

Loading…
Cancel
Save