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

ffmpg: add setopt/getopt. add C.AV_CODEC_FLAG_GLOBAL_HEADER for codecctx

Browse Source
This commit is contained in:
nareix 2016-07-16 10:24:21 +08:00
parent 9a54f1ee8f
commit 038b70d129
3 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
cgo/ffmpeg/audio.go
View File

@ -224,7 +224,29 @@ func (self *AudioEncoder) SetChannelLayout(ch av.ChannelLayout) (err error) {
return
}
func (self *AudioEncoder) SetOption(opt string) (err error) {
func (self *AudioEncoder) SetOption(key string, val interface{}) (err error) {
ff := &self.ff.ff
s := fmt.Sprint(val)
C.av_dict_set(&ff.options, C.CString(key), C.CString(s), 0)
return
}
func (self *AudioEncoder) GetOption(key string, val interface{}) (err error) {
ff := &self.ff.ff
entry := C.av_dict_get(ff.options, C.CString(key), nil, 0)
if entry == nil {
err = fmt.Errorf("ffmpeg: GetOption failed: `%s` not exists", key)
return
}
switch p := val.(type) {
case *string:
*p = C.GoString(entry.value)
case *int:
fmt.Sscanf(C.GoString(entry.value), "%d", p)
default:
err = fmt.Errorf("ffmpeg: GetOption failed: val must be *string or *int receiver")
return
}
return
}
@ -236,6 +258,7 @@ func (self *AudioEncoder) Setup() (err error) {
if self.SampleFormat == av.SampleFormat(0) {
self.SampleFormat = sampleFormatFF2AV(*ff.codec.sample_fmts)
}
if self.BitRate == 0 {
self.BitRate = 80000
}
@ -251,6 +274,8 @@ func (self *AudioEncoder) Setup() (err error) {
ff.codecCtx.bit_rate = C.int64_t(self.BitRate)
ff.codecCtx.channel_layout = channelLayoutAV2FF(self.ChannelLayout)
ff.codecCtx.strict_std_compliance = C.FF_COMPLIANCE_EXPERIMENTAL
ff.codecCtx.flags = C.AV_CODEC_FLAG_GLOBAL_HEADER
if C.avcodec_open2(ff.codecCtx, ff.codec, nil) != 0 {
err = fmt.Errorf("ffmpeg: encoder: avcodec_open2 failed")
return
@ -259,6 +284,7 @@ func (self *AudioEncoder) Setup() (err error) {
self.FrameSampleCount = int(ff.codecCtx.frame_size)
extradata := C.GoBytes(unsafe.Pointer(ff.codecCtx.extradata), ff.codecCtx.extradata_size)
switch ff.codecCtx.codec_id {
case C.AV_CODEC_ID_AAC:
if self.codecData, err = aacparser.NewCodecDataFromMPEG4AudioConfigBytes(extradata); err != nil {
@ -696,6 +722,7 @@ func AudioCodecHandler(h *avutil.RegisterHandler) {
return dec, err
}
}
h.AudioEncoder = func(typ av.CodecType) (av.AudioEncoder, error) {
if enc, err := NewAudioEncoderByCodecType(typ); err != nil {
return nil, nil

4
cgo/ffmpeg/ffmpeg.go
View File

@ -60,12 +60,14 @@ func freeFFCtx(self *ffctx) {
ff := &self.ff
if ff.frame != nil {
C.av_frame_free(&ff.frame)
ff.frame = nil
}
if ff.codecCtx != nil {
C.avcodec_close(ff.codecCtx)
C.av_free(unsafe.Pointer(ff.codecCtx))
ff.codecCtx = nil
}
if ff.options != nil {
C.av_dict_free(&ff.options)
}
}

1
cgo/ffmpeg/ffmpeg.h
View File

@ -10,5 +10,6 @@ typedef struct {
AVCodec *codec;
AVCodecContext *codecCtx;
AVFrame *frame;
AVDictionary *options;
} FFCtx;