diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2017-05-17 14:17:35 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-05-17 14:17:35 +0000 |
commit | a2ecca468b6b556c8f6ca23ca764424a42ed58d1 (patch) | |
tree | 53589257cba7d531a0d7b615ea6495ab14160197 | |
parent | 016759455cf25ade6f432e4d0d0e98e8b0d4c8a2 (diff) | |
parent | a49a95403f6b214f91fb9c6251dd7440d5069d48 (diff) | |
download | libva-oreo-m3-release.tar.gz |
release-request-323db86e-b638-4d24-8eb1-d2e3bf4a9d1a-for-git_oc-mr1-release-4017779 snap-temp-L47900000064949209android-wear-8.1.0_r1android-vts-8.1_r9android-vts-8.1_r8android-vts-8.1_r7android-vts-8.1_r6android-vts-8.1_r5android-vts-8.1_r4android-vts-8.1_r3android-vts-8.1_r14android-vts-8.1_r13android-vts-8.1_r12android-vts-8.1_r11android-vts-8.1_r10android-security-8.1.0_r93android-security-8.1.0_r92android-security-8.1.0_r91android-security-8.1.0_r90android-security-8.1.0_r89android-security-8.1.0_r88android-security-8.1.0_r87android-security-8.1.0_r86android-security-8.1.0_r85android-security-8.1.0_r84android-security-8.1.0_r83android-security-8.1.0_r82android-cts-8.1_r9android-cts-8.1_r8android-cts-8.1_r7android-cts-8.1_r6android-cts-8.1_r5android-cts-8.1_r4android-cts-8.1_r3android-cts-8.1_r25android-cts-8.1_r24android-cts-8.1_r23android-cts-8.1_r22android-cts-8.1_r21android-cts-8.1_r20android-cts-8.1_r2android-cts-8.1_r19android-cts-8.1_r18android-cts-8.1_r17android-cts-8.1_r16android-cts-8.1_r15android-cts-8.1_r14android-cts-8.1_r13android-cts-8.1_r12android-cts-8.1_r11android-cts-8.1_r10android-cts-8.1_r1android-8.1.0_r9android-8.1.0_r81android-8.1.0_r80android-8.1.0_r8android-8.1.0_r79android-8.1.0_r78android-8.1.0_r77android-8.1.0_r76android-8.1.0_r75android-8.1.0_r74android-8.1.0_r73android-8.1.0_r72android-8.1.0_r71android-8.1.0_r70android-8.1.0_r7android-8.1.0_r69android-8.1.0_r68android-8.1.0_r67android-8.1.0_r66android-8.1.0_r65android-8.1.0_r64android-8.1.0_r63android-8.1.0_r62android-8.1.0_r61android-8.1.0_r60android-8.1.0_r6android-8.1.0_r53android-8.1.0_r52android-8.1.0_r51android-8.1.0_r50android-8.1.0_r5android-8.1.0_r48android-8.1.0_r47android-8.1.0_r46android-8.1.0_r45android-8.1.0_r43android-8.1.0_r42android-8.1.0_r41android-8.1.0_r40android-8.1.0_r4android-8.1.0_r39android-8.1.0_r38android-8.1.0_r37android-8.1.0_r36android-8.1.0_r35android-8.1.0_r33android-8.1.0_r32android-8.1.0_r31android-8.1.0_r30android-8.1.0_r3android-8.1.0_r29android-8.1.0_r28android-8.1.0_r27android-8.1.0_r26android-8.1.0_r25android-8.1.0_r23android-8.1.0_r22android-8.1.0_r21android-8.1.0_r20android-8.1.0_r2android-8.1.0_r19android-8.1.0_r18android-8.1.0_r17android-8.1.0_r16android-8.1.0_r15android-8.1.0_r14android-8.1.0_r13android-8.1.0_r12android-8.1.0_r11android-8.1.0_r10android-8.1.0_r1security-oc-mr1-releaseoreo-mr1-wear-releaseoreo-mr1-vts-releaseoreo-mr1-security-releaseoreo-mr1-s1-releaseoreo-mr1-releaseoreo-mr1-cuttlefish-testingoreo-mr1-cts-releaseoreo-m8-releaseoreo-m7-releaseoreo-m6-s4-releaseoreo-m6-s3-releaseoreo-m6-s2-releaseoreo-m5-releaseoreo-m4-s9-releaseoreo-m4-s8-releaseoreo-m4-s7-releaseoreo-m4-s6-releaseoreo-m4-s5-releaseoreo-m4-s4-releaseoreo-m4-s3-releaseoreo-m4-s2-releaseoreo-m4-s12-releaseoreo-m4-s11-releaseoreo-m4-s10-releaseoreo-m4-s1-releaseoreo-m3-releaseoreo-m2-s5-releaseoreo-m2-s4-releaseoreo-m2-s3-releaseoreo-m2-s2-releaseoreo-m2-s1-releaseoreo-m2-release
Change-Id: Ic28b80a1156581e9abb065fabbf0ed26d084e2a4
-rwxr-xr-x | va/Android.mk | 2 | ||||
-rw-r--r-- | va/android/va_android.cpp | 1 | ||||
-rwxr-xr-x | va/va.c | 10 | ||||
-rw-r--r-- | va/va_android.h | 2 | ||||
-rwxr-xr-x | va/va_trace.c | 9 |
5 files changed, 12 insertions, 12 deletions
diff --git a/va/Android.mk b/va/Android.mk index 0ea46c7..92443ac 100755 --- a/va/Android.mk +++ b/va/Android.mk @@ -121,7 +121,7 @@ LOCAL_CFLAGS += -Werror LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libva-android -LOCAL_SHARED_LIBRARIES := libva libdrm +LOCAL_SHARED_LIBRARIES := libva libdrm libnativewindow include $(BUILD_SHARED_LIBRARY) diff --git a/va/android/va_android.cpp b/va/android/va_android.cpp index 3e220a6..efbc35a 100644 --- a/va/android/va_android.cpp +++ b/va/android/va_android.cpp @@ -39,6 +39,7 @@ #include <dlfcn.h> #include <errno.h> +#include <system/window.h> #define CHECK_SYMBOL(func) { if (!func) printf("func %s not found\n", #func); return VA_STATUS_ERROR_UNKNOWN; } #define DEVICE_NAME "/dev/dri/card0" @@ -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_android.h b/va/va_android.h index 978becd..1268955 100644 --- a/va/va_android.h +++ b/va/va_android.h @@ -48,9 +48,9 @@ VADisplay vaGetDisplay ( #ifdef __cplusplus #ifdef ANDROID -#include <system/window.h> #include <utils/StrongPointer.h> using namespace android; +struct ANativeWindow; /* * Output rendering 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); |