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

bugfix: only f.linesize[0] is valid

Browse Source
This commit is contained in:
nareix 2016-06-07 19:32:31 +08:00
parent a49ccdb0ca
commit ff6d406d5e
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
audio.go
View File

@ -16,6 +16,8 @@ import (
"github.com/nareix/codec/aacparser" "github.com/nareix/codec/aacparser"
) )
const debug = false
type ffctx struct { type ffctx struct {
ff C.FFCtx ff C.FFCtx
} }
@ -370,7 +372,7 @@ func audioFrameAssignToAVData(f *C.AVFrame, frame *av.AudioFrame) {
frame.SampleCount = int(f.nb_samples) frame.SampleCount = int(f.nb_samples)
frame.Data = make([][]byte, int(f.channels)) frame.Data = make([][]byte, int(f.channels))
for i := 0; i < int(f.channels); i++ { for i := 0; i < int(f.channels); i++ {
frame.Data[i] = C.GoBytes(unsafe.Pointer(f.data[i]), f.linesize[i]) frame.Data[i] = C.GoBytes(unsafe.Pointer(f.data[i]), f.linesize[0])
} }
} }
@ -478,6 +480,9 @@ func (self *AudioDecoder) Setup() (err error) {
ff.codecCtx.extradata = (*C.uint8_t)(unsafe.Pointer(&self.Extradata[0])) ff.codecCtx.extradata = (*C.uint8_t)(unsafe.Pointer(&self.Extradata[0]))
ff.codecCtx.extradata_size = C.int(len(self.Extradata)) ff.codecCtx.extradata_size = C.int(len(self.Extradata))
} }
if debug {
fmt.Println("ffmpeg: Decoder.Setup Extradata.len", len(self.Extradata))
}
ff.codecCtx.sample_rate = C.int(self.SampleRate) ff.codecCtx.sample_rate = C.int(self.SampleRate)
ff.codecCtx.channel_layout = channelLayoutAV2FF(self.ChannelLayout) ff.codecCtx.channel_layout = channelLayoutAV2FF(self.ChannelLayout)
@ -500,6 +505,7 @@ func (self *AudioDecoder) Decode(data []byte) (gotframe bool, frame av.AudioFram
cgotframe := C.int(0) cgotframe := C.int(0)
cerr := C.wrap_avcodec_decode_audio4(ff.codecCtx, ff.frame, unsafe.Pointer(&data[0]), C.int(len(data)), &cgotframe) cerr := C.wrap_avcodec_decode_audio4(ff.codecCtx, ff.frame, unsafe.Pointer(&data[0]), C.int(len(data)), &cgotframe)
if cerr < C.int(0) { if cerr < C.int(0) {
err = fmt.Errorf("avcodec_decode_audio4 failed: %d", cerr) err = fmt.Errorf("avcodec_decode_audio4 failed: %d", cerr)
return return
@ -509,6 +515,10 @@ func (self *AudioDecoder) Decode(data []byte) (gotframe bool, frame av.AudioFram
gotframe = true gotframe = true
audioFrameAssignToAV(ff.frame, &frame) audioFrameAssignToAV(ff.frame, &frame)
frame.SampleRate = self.SampleRate frame.SampleRate = self.SampleRate
if debug {
fmt.Println("ffmpeg: Decode", fmt.Sprintf("%x", data[:8]), "len", len(data))
}
} }
return return