S.O.N.G/voaac-go
S.O.N.G/voaac-go
3
0
Fork 0
Code Issues Pull requests Releases Activity

_Ctype -> C. go1.12+

Browse source
This commit is contained in:
aam335 2020-04-08 10:00:16 +03:00
parent 22bab76ef2
commit 52c23bd389
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
aacenc/aacenc.go
View file

@ -333,12 +333,12 @@ func (e *Encoder) EncodePcmBlock(inPcm []int16) (aac []byte, err uint) {
if len(inPcm) != e.blockSize { if len(inPcm) != e.blockSize {
return nil, VoErrInvalidArg return nil, VoErrInvalidArg
} }
var ret _Ctype_VO_U32 var ret C.VO_U32
len := C.encode(e.handle, len := C.encode(e.handle,
unsafe.Pointer(&inPcm[0]), unsafe.Pointer(&inPcm[0]),
_Ctype_int(len(inPcm)*2), // int16 C.int(len(inPcm)*2), // int16
unsafe.Pointer(&e.outbuff[0]), unsafe.Pointer(&e.outbuff[0]),
_Ctype_int(len(e.outbuff)), C.int(len(e.outbuff)),
&ret) &ret)
err = uint(ret) err = uint(ret)
if err != VoErrNone { // error if err != VoErrNone { // error
@ -351,10 +351,10 @@ func (e *Encoder) EncodePcmBlock(inPcm []int16) (aac []byte, err uint) {
func (e *Encoder) SetParamAac(aacSamplerate, nChannels int) (err uint) { func (e *Encoder) SetParamAac(aacSamplerate, nChannels int) (err uint) {
e.blockSize = 1024 * nChannels e.blockSize = 1024 * nChannels
setParametersBlock := C.AACENC_PARAM{ setParametersBlock := C.AACENC_PARAM{
sampleRate: _Ctype_int(aacSamplerate), /*! audio file sample rate */ sampleRate: C.int(aacSamplerate), /*! audio file sample rate */
bitRate: 64000, /*! encoder bit rate in bits/sec */ bitRate: 64000, /*! encoder bit rate in bits/sec */
nChannels: _Ctype_short(nChannels), /*! number of channels on input (1,2) */ nChannels: C.short(nChannels), /*! number of channels on input (1,2) */
adtsUsed: 1, /*! whether write adts header */ adtsUsed: 1, /*! whether write adts header */
} }
return uint(C.voAACEncSetParam(e.handle, VoPidAacEncparam, _Ctype_VO_PTR(&setParametersBlock))) return uint(C.voAACEncSetParam(e.handle, VoPidAacEncparam, C.VO_PTR(&setParametersBlock)))
} }