thefoxon/joy4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

interface change av.Packet -> []byte

Browse Source
This commit is contained in:
nareix 2016-06-22 22:33:31 +08:00
parent 99334d2a92
commit 4776c64d2f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
audio.go
View File

@ -262,7 +262,7 @@ func (self *AudioEncoder) CodecData() (codec av.AudioCodecData) {
return self.codecData return self.codecData
} }
func (self *AudioEncoder) encodeOne(frame av.AudioFrame) (gotpkt bool, pkt av.Packet, err error) { func (self *AudioEncoder) encodeOne(frame av.AudioFrame) (gotpkt bool, pkt []byte, err error) {
ff := &self.ff.ff ff := &self.ff.ff
if ff.frame == nil { if ff.frame == nil {
@ -291,11 +291,11 @@ func (self *AudioEncoder) encodeOne(frame av.AudioFrame) (gotpkt bool, pkt av.Pa
if cgotpkt != 0 { if cgotpkt != 0 {
gotpkt = true gotpkt = true
pkt.Data = C.GoBytes(unsafe.Pointer(cpkt.data), cpkt.size) pkt = C.GoBytes(unsafe.Pointer(cpkt.data), cpkt.size)
C.av_packet_unref(&cpkt) C.av_packet_unref(&cpkt)
if debug { if debug {
fmt.Println("ffmpeg: Encode", frame.SampleCount, frame.SampleRate, frame.ChannelLayout, frame.SampleFormat, "len", len(pkt.Data)) fmt.Println("ffmpeg: Encode", frame.SampleCount, frame.SampleRate, frame.ChannelLayout, frame.SampleFormat, "len", len(pkt))
} }
} }
@ -316,9 +316,9 @@ func (self *AudioEncoder) resample(in av.AudioFrame) (out av.AudioFrame, err err
return return
} }
func (self *AudioEncoder) Encode(frame av.AudioFrame) (pkts []av.Packet, err error) { func (self *AudioEncoder) Encode(frame av.AudioFrame) (pkts [][]byte, err error) {
var gotpkt bool var gotpkt bool
var pkt av.Packet var pkt []byte
if frame.SampleFormat != self.SampleFormat || frame.ChannelLayout != self.ChannelLayout || frame.SampleRate != self.SampleRate { if frame.SampleFormat != self.SampleFormat || frame.ChannelLayout != self.ChannelLayout || frame.SampleRate != self.SampleRate {
if frame, err = self.resample(frame); err != nil { if frame, err = self.resample(frame); err != nil {