package/mpp
1
0
Fork 0
mirror of https://github.com/nyanmisaka/mpp.git synced 2025-10-05 17:16:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[misc]: Fix some minor issues

Browse Source 
1. Fix rga.cpp compile error on Linux.
2. Fix mpp_runtime.cpp warning on Linux.
3. Remove print when fail to dlopen vpuapi library.

Change-Id: I3891bdd39ae77bac68a67a39893d8caa31dbe6fb
Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
This commit is contained in:
Herman Chen
2018-05-09 16:23:09 +08:00
parent c87119b698
commit e855cb171a
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mpp/legacy/vpu_api.cpp
View File

@@ -230,15 +230,13 @@ public:
rkvpu_close_cxt = (RK_S32 (*)(VpuCodecContext **ctx)) rkvpu_close_cxt = (RK_S32 (*)(VpuCodecContext **ctx))
dlsym(rkapi_hdl, "vpu_close_context"); dlsym(rkapi_hdl, "vpu_close_context");
mpp_log("dlopen vpu lib %s success\n", codec_paths[i]); mpp_log("dlopen vpu lib %s success\n", codec_paths[i]);
} else {
mpp_err("dlopen vpu lib failed\n");
} }
} }
~VpulibDlsym() { ~VpulibDlsym() {
if (rkapi_hdl) { if (rkapi_hdl) {
dlclose(rkapi_hdl); dlclose(rkapi_hdl);
mpp_log("dlclose vpu lib"); rkapi_hdl = NULL;
} }
} }
}; };

1
mpp/vproc/rga/rga.cpp
View File

@@ -23,6 +23,7 @@
#include "mpp_mem.h" #include "mpp_mem.h"
#include "mpp_log.h" #include "mpp_log.h"
#include "mpp_common.h"
#include "rga.h" #include "rga.h"
#include "rga_api.h" #include "rga_api.h"

7
osal/mpp_runtime.cpp
View File

@@ -125,10 +125,15 @@ MppRuntimeService::MppRuntimeService()
RK_S32 val = 0; RK_S32 val = 0;
FILE *fp = fopen(path, "rb"); FILE *fp = fopen(path, "rb");
if (fp) { if (fp) {
fread(&val, 1, 4, fp); size_t len = fread(&val, 1, 4, fp);
// zero for ion non-zero for drm -> // zero for ion non-zero for drm ->
// zero - disable drm // zero - disable drm
// non-zero - disable ion // non-zero - disable ion
if (len != 4) {
mpp_err("failed to read dts allocator value default 0\n");
val = 0;
}
if (val == 0) { if (val == 0) {
allocator_valid[MPP_BUFFER_TYPE_DRM] = 0; allocator_valid[MPP_BUFFER_TYPE_DRM] = 0;
mpp_log("found ion allocator in dts\n"); mpp_log("found ion allocator in dts\n");