Skip to content

cgo/ffmpeg: free C strings passed to FFmpeg lookups and options #133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
OvOhao wants to merge 1 commit into
base: master
Choose a base branch
from
Open

cgo/ffmpeg: free C strings passed to FFmpeg lookups and options #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 25 additions & 10 deletions cgo/ffmpeg/audio.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,12 @@ import (

const debug = false

func avOptSetInt(obj unsafe.Pointer, name string, val C.int64_t) {
cname := C.CString(name)
defer C.free(unsafe.Pointer(cname))
C.av_opt_set_int(obj, cname, val, 0)
}

type Resampler struct {
inSampleFormat, OutSampleFormat av.SampleFormat
inChannelLayout, OutChannelLayout av.ChannelLayout
Expand Down Expand Up @@ -82,12 +88,12 @@ func (self *Resampler) Resample(in av.AudioFrame) (out av.AudioFrame, err error)
self.inSampleRate = in.SampleRate
self.inChannelLayout = in.ChannelLayout
avr := C.avresample_alloc_context()
C.av_opt_set_int(unsafe.Pointer(avr), C.CString("in_channel_layout"), C.int64_t(channelLayoutAV2FF(self.inChannelLayout)), 0)
C.av_opt_set_int(unsafe.Pointer(avr), C.CString("out_channel_layout"), C.int64_t(channelLayoutAV2FF(self.OutChannelLayout)), 0)
C.av_opt_set_int(unsafe.Pointer(avr), C.CString("in_sample_rate"), C.int64_t(self.inSampleRate), 0)
C.av_opt_set_int(unsafe.Pointer(avr), C.CString("out_sample_rate"), C.int64_t(self.OutSampleRate), 0)
C.av_opt_set_int(unsafe.Pointer(avr), C.CString("in_sample_fmt"), C.int64_t(sampleFormatAV2FF(self.inSampleFormat)), 0)
C.av_opt_set_int(unsafe.Pointer(avr), C.CString("out_sample_fmt"), C.int64_t(sampleFormatAV2FF(self.OutSampleFormat)), 0)
avOptSetInt(unsafe.Pointer(avr), "in_channel_layout", C.int64_t(channelLayoutAV2FF(self.inChannelLayout)))
avOptSetInt(unsafe.Pointer(avr), "out_channel_layout", C.int64_t(channelLayoutAV2FF(self.OutChannelLayout)))
avOptSetInt(unsafe.Pointer(avr), "in_sample_rate", C.int64_t(self.inSampleRate))
avOptSetInt(unsafe.Pointer(avr), "out_sample_rate", C.int64_t(self.OutSampleRate))
avOptSetInt(unsafe.Pointer(avr), "in_sample_fmt", C.int64_t(sampleFormatAV2FF(self.inSampleFormat)))
avOptSetInt(unsafe.Pointer(avr), "out_sample_fmt", C.int64_t(sampleFormatAV2FF(self.OutSampleFormat)))
C.avresample_open(avr)
self.avr = avr
}
Expand Down Expand Up @@ -244,21 +250,28 @@ func (self *AudioEncoder) SetOption(key string, val interface{}) (err error) {

sval := fmt.Sprint(val)
if key == "profile" {
ff.profile = C.avcodec_profile_name_to_int(ff.codec, C.CString(sval))
csval := C.CString(sval)
defer C.free(unsafe.Pointer(csval))
ff.profile = C.avcodec_profile_name_to_int(ff.codec, csval)
if ff.profile == C.FF_PROFILE_UNKNOWN {
err = fmt.Errorf("ffmpeg: profile `%s` invalid", sval)
return
}
return
}

C.av_dict_set(&ff.options, C.CString(key), C.CString(sval), 0)
ckey, cval := C.CString(key), C.CString(sval)
defer C.free(unsafe.Pointer(ckey))
defer C.free(unsafe.Pointer(cval))
C.av_dict_set(&ff.options, ckey, cval, 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)
ckey := C.CString(key)
defer C.free(unsafe.Pointer(ckey))
entry := C.av_dict_get(ff.options, ckey, nil, 0)
if entry == nil {
err = fmt.Errorf("ffmpeg: GetOption failed: `%s` not exists", key)
return
Expand Down Expand Up @@ -642,7 +655,9 @@ func NewAudioEncoderByCodecType(typ av.CodecType) (enc *AudioEncoder, err error)
func NewAudioEncoderByName(name string) (enc *AudioEncoder, err error) {
_enc := &AudioEncoder{}

codec := C.avcodec_find_encoder_by_name(C.CString(name))
cname := C.CString(name)
defer C.free(unsafe.Pointer(cname))
codec := C.avcodec_find_encoder_by_name(cname)
if codec == nil || C.avcodec_get_type(codec.id) != C.AVMEDIA_TYPE_AUDIO {
err = fmt.Errorf("ffmpeg: cannot find audio encoder name=%s", name)
return
Expand Down
8 changes: 6 additions & 2 deletions cgo/ffmpeg/ffmpeg.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,15 @@ const (
)

func HasEncoder(name string) bool {
return C.avcodec_find_encoder_by_name(C.CString(name)) != nil
cname := C.CString(name)
defer C.free(unsafe.Pointer(cname))
return C.avcodec_find_encoder_by_name(cname) != nil
}

func HasDecoder(name string) bool {
return C.avcodec_find_decoder_by_name(C.CString(name)) != nil
cname := C.CString(name)
defer C.free(unsafe.Pointer(cname))
return C.avcodec_find_decoder_by_name(cname) != nil
}

//func EncodersList() []string
Expand Down
1 change: 1 addition & 0 deletions cgo/ffmpeg/ffmpeg.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#include <libavutil/avutil.h>
#include <libavresample/avresample.h>
#include <libavutil/opt.h>
#include <stdlib.h>
#include <string.h>
#include <libswscale/swscale.h>

Expand Down