diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-08-05 22:41:06 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-08-05 22:41:06 +0000 |
| commit | 1e53d98a1dff98e0192532c7f6b76d4bdfa190f7 (patch) | |
| tree | 24dbd9bd14812d9b02d1530649a65b48ed56b92a | |
| parent | ee9605b8bf26d4530a3d654cf0d7658185716368 (diff) | |
| parent | d9ed162e8b032d09716890343680d1c8db58dbc3 (diff) | |
| download | libhevc-1e53d98a1dff98e0192532c7f6b76d4bdfa190f7.tar.gz | |
Merge "cmake: Move hevcdec specific macros to its cmake file" am: 000859511f am: 09d4a64758 am: d9ed162e8b
Original change: https://android-review.googlesource.com/c/platform/external/libhevc/+/2175956
Change-Id: I3df7b20e42bb7667d554e1662b5a4c209dbf4af3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | cmake/utils.cmake | 2 | ||||
| -rw-r--r-- | encoder/ihevce_profile.h | 2 | ||||
| -rw-r--r-- | test/decoder/hevcdec.cmake | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/cmake/utils.cmake b/cmake/utils.cmake index 57b939f..1476f19 100644 --- a/cmake/utils.cmake +++ b/cmake/utils.cmake @@ -32,8 +32,6 @@ endfunction() # Adds defintions for all targets function(libhevc_add_definitions) - add_definitions(-DPROFILE_ENABLE -DMD5_DISABLE) - if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "aarch64") add_definitions(-DARMV8 -DDEFAULT_ARCH=D_ARCH_ARMV8_GENERIC) elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "aarch32") diff --git a/encoder/ihevce_profile.h b/encoder/ihevce_profile.h index b9282a9..5b836d9 100644 --- a/encoder/ihevce_profile.h +++ b/encoder/ihevce_profile.h @@ -36,7 +36,9 @@ /*****************************************************************************/ /* Constant Macros */ /*****************************************************************************/ +#ifndef PROFILE_ENABLE #define PROFILE_ENABLE 0 +#endif typedef struct { diff --git a/test/decoder/hevcdec.cmake b/test/decoder/hevcdec.cmake index 7eccf9d..bc38001 100644 --- a/test/decoder/hevcdec.cmake +++ b/test/decoder/hevcdec.cmake @@ -1,2 +1,4 @@ libhevc_add_executable(hevcdec libhevcdec SOURCES ${HEVC_ROOT}/test/decoder/main.c) +target_compile_definitions(hevcdec + PRIVATE PROFILE_ENABLE MD5_DISABLE) |