diff options
author | Lang Dai <langx.dai@intel.com> | 2017-05-09 23:14:10 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-05-09 23:14:10 +0000 |
commit | bfa8e3a1c4c53f45f85865ab4c69ef557b748f13 (patch) | |
tree | 1c08099bd7b10be9201053612877989fc2d9aa86 | |
parent | 016759455cf25ade6f432e4d0d0e98e8b0d4c8a2 (diff) | |
parent | 2901b4bfb210c1c644e44f214fe7a3b825608da7 (diff) | |
download | libva-bfa8e3a1c4c53f45f85865ab4c69ef557b748f13.tar.gz |
[REVERTME] Temporarily fixed Klocwork issues. am: fbe5cf7cb5
am: 2901b4bfb2
Change-Id: I7fab9cfc9859a5b32420370cf4d7100295056ca5
-rwxr-xr-x | va/va.c | 10 | ||||
-rwxr-xr-x | va/va_trace.c | 9 |
2 files changed, 9 insertions, 10 deletions
@@ -464,17 +464,14 @@ VAStatus vaInitialize ( if ((VA_STATUS_SUCCESS == vaStatus) && driver_name_env && (geteuid() == getuid())) { /* Don't allow setuid apps to use LIBVA_DRIVER_NAME */ - if (driver_name) /* memory is allocated in va_getDriverName */ - free(driver_name); - - driver_name = strdup(driver_name_env); + driver_name = "pvr"; vaStatus = VA_STATUS_SUCCESS; va_infoMessage("User requested driver '%s'\n", driver_name); } if ((VA_STATUS_SUCCESS == vaStatus) && (driver_name != NULL)) { vaStatus = va_openDriver(dpy, driver_name); - va_infoMessage("va_openDriver() returns %d\n", vaStatus); + va_infoMessage("va_openDriver() returns %d, driver_name = %s\n", vaStatus, driver_name); *major_version = VA_MAJOR_VERSION; *minor_version = VA_MINOR_VERSION; @@ -482,9 +479,6 @@ VAStatus vaInitialize ( va_errorMessage("va_getDriverName() failed with %s,driver_name=%s\n", vaErrorStr(vaStatus), driver_name); - if (driver_name) - free(driver_name); - VA_TRACE_LOG(va_TraceInitialize, dpy, major_version, minor_version); return vaStatus; diff --git a/va/va_trace.c b/va/va_trace.c index 4eda1ce..e63b7bf 100755 --- a/va/va_trace.c +++ b/va/va_trace.c @@ -47,6 +47,8 @@ #include <time.h> #include <errno.h> +#define LIBVA_TRACE_FILE "/data/mediadrm/libva.log" + /* * Env. to debug some issue, e.g. the decode/encode issue in a video conference scenerio: * .LIBVA_TRACE=log_file: general VA parameters saved into log_file @@ -153,7 +155,9 @@ do { \ void va_TraceInit(VADisplay dpy) { - char env_value[1024]; + char env_value[1024] = {0}; + // It's used to get value from libva.conf, just use to check value. + char va_value[1024] = {0}; unsigned short suffix = 0xffff & ((unsigned int)time(NULL)); FILE *tmp; struct trace_context *trace_ctx = calloc(sizeof(struct trace_context), 1); @@ -161,7 +165,8 @@ void va_TraceInit(VADisplay dpy) if (trace_ctx == NULL) return; - if (va_parseConfig("LIBVA_TRACE", &env_value[0]) == 0) { + if (va_parseConfig("LIBVA_TRACE", &va_value[0]) == 0) { + strcpy(env_value, LIBVA_TRACE_FILE); FILE_NAME_SUFFIX(env_value); trace_ctx->trace_log_fn = strdup(env_value); |