From 4587f8d5507300782e329f9527f35f905f3bb697 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期二, 29 十月 2019 14:13:25 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.5.5:29418/valib/goffmpeg
---
libcffmpeg.h | 48 ++++++++++++++++++++++++------------------------
1 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/libcffmpeg.h b/libcffmpeg.h
index 231ff64..7bc4998 100644
--- a/libcffmpeg.h
+++ b/libcffmpeg.h
@@ -14,22 +14,23 @@
typedef cffmpeg(*lib_cffmpeg_create2)(const char*);
typedef void (*lib_cffmpeg_destroy)(const cffmpeg);
typedef void (*lib_cffmpeg_run)(const cffmpeg, const char*);
+typedef int (*lib_cffmpeg_fps)(const cffmpeg);
typedef void (*lib_cffmpeg_gb28181)(const cffmpeg);
typedef void (*lib_cffmpeg_cpu)(const cffmpeg);
typedef void (*lib_cffmpeg_rec_duration)(const cffmpeg, const int, const int);
-typedef void (*lib_cffmpeg_recorder)(const cffmpeg, const char*, const char*, int, int, int);
+typedef void (*lib_cffmpeg_recorder)(const cffmpeg, const char*, const char*, const int64_t, int, int, int);
typedef void (*lib_cffmpeg_fire_recorder)(const cffmpeg, const char*, const int64_t);
typedef void (*lib_cffmpeg_info_recorder)(const cffmpeg, int*, char**, int*, char**, int*);
typedef void (*lib_cffmpeg_decoder)(const cffmpeg);
typedef void*(*lib_cffmpeg_pic)(const cffmpeg, int*, int*, int*, int*, int64_t*);
typedef void*(*lib_cffmpeg_avpacket)(const cffmpeg, int*, int*);
typedef void*(*lib_cffmpeg_decode)(const char*, const int, int*, int*);
-typedef void*(*lib_gpu_conv)(void*, const int, const int, const int, const int, int *);
static lib_cffmpeg_create fn_create = NULL;
static lib_cffmpeg_create2 fn_create2 = NULL;
static lib_cffmpeg_destroy fn_destroy = NULL;
static lib_cffmpeg_run fn_run = NULL;
+static lib_cffmpeg_fps fn_fps = NULL;
static lib_cffmpeg_gb28181 fn_gb28181 = NULL;
static lib_cffmpeg_cpu fn_cpu = NULL;
static lib_cffmpeg_rec_duration fn_rec_duration = NULL;
@@ -40,27 +41,26 @@
static lib_cffmpeg_pic fn_decoder_pic = NULL;
static lib_cffmpeg_avpacket fn_get_avpacket = NULL;
static lib_cffmpeg_decode fn_decode = NULL;
-static lib_gpu_conv fn_gpu_conv = NULL;
typedef void* libcffmpeg;
libcffmpeg init_libcffmpeg(const char *so_file);
void release_libcffmpeg(libcffmpeg lib);
-cffmpeg wrap_fn_create();
-cffmpeg wrap_fn_create2(const char *logfile);
-void wrap_fn_destroy(const cffmpeg h);
-void wrap_fn_run(const cffmpeg h, const char* input);
-void wrap_fn_run_gb28181(const cffmpeg h);
-void wrap_fn_use_cpu(const cffmpeg h);
-void wrap_fn_rec_duration(const cffmpeg h, const int min, const int max);
-void wrap_fn_recorder(const cffmpeg h, const char* id, const char* dir, int mind, int maxd, int audio);
-void wrap_fn_fire_recorder(const cffmpeg h, const char *sid, const int64_t id);
-void wrap_fn_info_recorder(const cffmpeg, int* index, char** recid, int* recidLen, char** fpath, int* pathLen);
-void wrap_fn_decoder(const cffmpeg h);
-void* wrap_fn_decoder_pic(const cffmpeg h, int *wid, int *hei, int *format, int *length, int64_t *id);
-void* wrap_fn_get_avpacket(const cffmpeg h, int* size, int* key);
-void* wrap_fn_decode(const char* file, const int gb, int* wid, int* hei);
-void* wran_fn_gpu_conv(void *in, const int w, const int h, const int dst_w, const int dst_h, int *length);
+cffmpeg wrap_fn_create(void *lib);
+cffmpeg wrap_fn_create2(void *lib, const char *logfile);
+void wrap_fn_destroy(void *lib, const cffmpeg h);
+void wrap_fn_run(void *lib, const cffmpeg h, const char* input);
+int wrap_fn_fps(void *lib, const cffmpeg h);
+void wrap_fn_run_gb28181(void *lib, const cffmpeg h);
+void wrap_fn_use_cpu(void *lib, const cffmpeg h);
+void wrap_fn_rec_duration(void *lib, const cffmpeg h, const int min, const int max);
+void wrap_fn_recorder(void *lib, const cffmpeg h, const char* id, const char* dir, const int64_t fid, int mind, int maxd, int audio);
+void wrap_fn_fire_recorder(void *lib, const cffmpeg h, const char *sid, const int64_t id);
+void wrap_fn_info_recorder(void *lib, const cffmpeg, int* index, char** recid, int* recidLen, char** fpath, int* pathLen);
+void wrap_fn_decoder(void *lib, const cffmpeg h);
+void* wrap_fn_decoder_pic(void *lib, const cffmpeg h, int *wid, int *hei, int *format, int *length, int64_t *id);
+void* wrap_fn_get_avpacket(void *lib, const cffmpeg h, int* size, int* key);
+void* wrap_fn_decode(void *lib, const char* file, const int gb, int* wid, int* hei);
// for encoder
typedef void* cencoder;
typedef cencoder (*lib_cffmpeg_create_encoder)(const int w, const int h, const int fps, const int br, const int scale_flag, const int gi);
@@ -71,9 +71,9 @@
static lib_cffmpeg_destroy_encoder fn_destroy_encoder = NULL;
static lib_cffmpeg_encode fn_encode = NULL;
-cencoder wrap_fn_create_encoder(const int w, const int h, const int fps, const int br, const int scale_flag, const int gi);
-void wrap_fn_destroy_encoder(const cencoder h);
-void* wrap_fn_encode(cencoder hdl, void *in, const int w, const int h, int *out_size, int *key);
+cencoder wrap_fn_create_encoder(void *lib, const int w, const int h, const int fps, const int br, const int scale_flag, const int gi);
+void wrap_fn_destroy_encoder(void *lib, const cencoder h);
+void* wrap_fn_encode(void *lib, cencoder hdl, void *in, const int w, const int h, int *out_size, int *key);
// for conv
@@ -86,10 +86,10 @@
static lib_cffmpeg_destroy_conv fn_destroy_conv = NULL;
static lib_cffmpeg_conv fn_conv = NULL;
-cconv wrap_fn_create_conv(const int srcW, const int srcH, const int srcFormat,
+cconv wrap_fn_create_conv(void *lib, const int srcW, const int srcH, const int srcFormat,
const int dstW, const int dstH, const int dstFormat, const int flag);
-void wrap_fn_destroy_conv(const cconv h);
-void* wrap_fn_conv(const cconv h, uint8_t *in);
+void wrap_fn_destroy_conv(void *lib, const cconv h);
+void* wrap_fn_conv(void *lib, const cconv h, uint8_t *in);
#ifdef __cplusplus
}
--
Gitblit v1.8.0