diff options
| -rw-r--r-- | cmake/modules/FindAML.cmake | 14 | ||||
| -rw-r--r-- | xbmc/cores/VideoPlayer/DVDCodecs/Video/AMLCodec.cpp | 9 |
2 files changed, 18 insertions, 5 deletions
diff --git a/cmake/modules/FindAML.cmake b/cmake/modules/FindAML.cmake index 5b9a859ead..602f5d9a2b 100644 --- a/cmake/modules/FindAML.cmake +++ b/cmake/modules/FindAML.cmake @@ -20,9 +20,23 @@ include(FindPackageHandleStandardArgs) find_package_handle_standard_args(AML REQUIRED_VARS AML_INCLUDE_DIR) +include(CheckCSourceCompiles) +set(CMAKE_REQUIRED_INCLUDES ${AML_INCLUDE_DIR}) +check_c_source_compiles("#include <amcodec/codec.h> + + int main() + { + int i = VIDEO_DEC_FORMAT_VP9; + return 0; + } + " AML_HAS_VP9) + if(AML_FOUND) set(AML_INCLUDE_DIRS ${AML_INCLUDE_DIR}) set(AML_DEFINITIONS -DHAS_LIBAMCODEC=1) + if(AML_HAS_VP9) + list(APPEND AML_DEFINITIONS -DHAS_LIBAMCODEC_VP9=1) + endif() if(NOT TARGET AML::AML) add_library(AML::AML UNKNOWN IMPORTED) diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/AMLCodec.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/AMLCodec.cpp index 2cd19d065d..54768ba4bb 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/AMLCodec.cpp +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/AMLCodec.cpp @@ -247,11 +247,10 @@ static const int64_t INT64_0 = 0x8000000000000000ULL; #ifndef CODEC_TAG_VC_1 #define CODEC_TAG_VC_1 (0x312D4356) #endif -#ifndef VFORMAT_VP9 -#define VFORMAT_VP9 VFORMAT_UNSUPPORT -#endif -#ifndef VIDEO_DEC_FORMAT_VP9 -#define VIDEO_DEC_FORMAT_VP9 VIDEO_DEC_FORMAT_MAX + +#ifndef HAS_LIBAMCODEC_VP9 +#define VFORMAT_VP9 VFORMAT_UNSUPPORT +#define VIDEO_DEC_FORMAT_VP9 VIDEO_DEC_FORMAT_MAX #endif #define CODEC_TAG_RV30 (0x30335652) |