From a5e9c7a0966bb943e167e01f807b6614b4d11d12 Mon Sep 17 00:00:00 2001 From: nareix Date: Wed, 8 Jun 2016 17:55:43 +0800 Subject: [PATCH] remove av.H264CodecData --- aacparser/parser.go | 4 +--- h264parser/parser.go | 8 ++------ 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/aacparser/parser.go b/aacparser/parser.go index 29b28b2..1bcf0a4 100644 --- a/aacparser/parser.go +++ b/aacparser/parser.go @@ -365,14 +365,12 @@ func (self CodecData) MakeADTSHeader(samples int, payloadLength int) []byte { return MakeADTSHeader(self.ConfigInfo, samples, payloadLength) } -func NewCodecDataFromMPEG4AudioConfigBytes(config []byte) (codec av.AACCodecData, err error) { - self := CodecData{} +func NewCodecDataFromMPEG4AudioConfigBytes(config []byte) (self CodecData, err error) { self.Config = config if self.ConfigInfo, err = ParseMPEG4AudioConfig(config); err != nil { err = fmt.Errorf("parse MPEG4AudioConfig failed(%s)", err) return } - codec = self return } diff --git a/h264parser/parser.go b/h264parser/parser.go index 72ef921..6da4d53 100644 --- a/h264parser/parser.go +++ b/h264parser/parser.go @@ -575,8 +575,7 @@ func (self CodecData) Height() int { return int(self.SPSInfo.Height) } -func NewCodecDataFromAVCDecoderConfRecord(record []byte) (codec av.H264CodecData, err error) { - self := CodecData{} +func NewCodecDataFromAVCDecoderConfRecord(record []byte) (self CodecData, err error) { self.Record = record if self.RecordInfo, err = ParseAVCDecoderConfRecord(record); err != nil { return @@ -593,11 +592,10 @@ func NewCodecDataFromAVCDecoderConfRecord(record []byte) (codec av.H264CodecData err = fmt.Errorf("parse SPS failed(%s)", err) return } - codec = self return } -func NewCodecDataFromSPSAndPPS(sps, pps []byte) (codec av.H264CodecData, err error) { +func NewCodecDataFromSPSAndPPS(sps, pps []byte) (self CodecData, err error) { recordinfo := AVCDecoderConfRecord{} recordinfo.AVCProfileIndication = uint(sps[1]) recordinfo.ProfileCompatibility = uint(sps[2]) @@ -609,13 +607,11 @@ func NewCodecDataFromSPSAndPPS(sps, pps []byte) (codec av.H264CodecData, err err if err = WriteAVCDecoderConfRecord(buf, recordinfo); err != nil { return } - self := CodecData{} self.RecordInfo = recordinfo self.Record = buf.Bytes() if self.SPSInfo, err = ParseSPS(sps); err != nil { return } - codec = self return }