Added fmt to log callback

This commit is contained in:
Quentin Renard
2022-03-24 15:35:37 +01:00
parent 12f9a2e067
commit fe4242eb59
6 changed files with 15 additions and 10 deletions

10
log.go
View File

@@ -3,7 +3,7 @@ package astiav
//#cgo pkg-config: libavutil
//#include <libavutil/log.h>
/*
extern void goAstiavLogCallback(int level, char* msg, char* parent);
extern void goAstiavLogCallback(int level, char* fmt, char* msg, char* parent);
static inline void astiavLogCallback(void *avcl, int level, const char *fmt, va_list vl)
{
@@ -15,7 +15,7 @@ static inline void astiavLogCallback(void *avcl, int level, const char *fmt, va_
}
char msg[1024];
vsprintf(msg, fmt, vl);
goAstiavLogCallback(level, msg, parent);
goAstiavLogCallback(level, (char*)(fmt), msg, parent);
}
static inline void astiavSetLogCallback()
{
@@ -51,7 +51,7 @@ func SetLogLevel(l LogLevel) {
C.av_log_set_level(C.int(l))
}
type LogCallback func(l LogLevel, msg, parent string)
type LogCallback func(l LogLevel, fmt, msg, parent string)
var logCallback LogCallback
@@ -61,11 +61,11 @@ func SetLogCallback(c LogCallback) {
}
//export goAstiavLogCallback
func goAstiavLogCallback(level C.int, msg, parent *C.char) {
func goAstiavLogCallback(level C.int, fmt, msg, parent *C.char) {
if logCallback == nil {
return
}
logCallback(LogLevel(level), C.GoString(msg), C.GoString(parent))
logCallback(LogLevel(level), C.GoString(fmt), C.GoString(msg), C.GoString(parent))
}
func ResetLogCallback() {