Skip to content
Permalink
Browse files

[libva] Use our new cflags

  • Loading branch information...
mean
mean committed Oct 16, 2016
1 parent b68664e commit 4993361091f4205be49c36d1a21b954959157d1c
@@ -12,6 +12,8 @@ IF(USE_VDPAU)
ENDIF(USE_VDPAU)

IF(USE_LIBVA)
ADD_DEFINITIONS(${LIBVA_CFLAGS})
INCLUDE_DIRECTORIES(${LIBVA_INCLUDE_DIR})
ADD_CORE_INCLUDE(ADM_coreLibVA)
ADD_IF_ENABLED(USE_LIBVA ADM_ffmpeg_libva.cpp)
ENDIF(USE_LIBVA)
@@ -299,13 +299,14 @@ bool admLibVA::setupConfig(void)
return false;


checkProfile(VAProfileH264High, &ADM_coreLibVA::configH264,"H264 Hight");
checkProfile(VAProfileHEVCMain, &ADM_coreLibVA::configH265,"HEVC Main");
checkProfile(VAProfileH264High, &ADM_coreLibVA::configH264,"H264 Hight");
checkProfile(VAProfileVC1Advanced, &ADM_coreLibVA::configVC1 ,"VC1");
#ifdef LIBVA_HEVC_DEC
checkProfile(VAProfileHEVCMain, &ADM_coreLibVA::configH265,"HEVC Main");
checkProfile(VAProfileHEVCMain10, &ADM_coreLibVA::configH26510Bits ,"H265 10Bits");
#endif


#ifdef ADM_VA_HAS_VP9
#ifdef LIBVA_VP9_DEC
checkProfile(VAProfileVP9Profile3, &ADM_coreLibVA::configVP9 ,"VP9");
#endif
return true;
@@ -383,10 +384,13 @@ bool admLibVA::fillContext(VAProfile profile ,vaapi_context *c)
switch(profile)
{
case VAProfileH264High: cid=ADM_coreLibVA::configH264;break;
case VAProfileHEVCMain: cid=ADM_coreLibVA::configH265;break;
case VAProfileHEVCMain10: cid=ADM_coreLibVA::configH26510Bits;break;
case VAProfileVC1Advanced: cid=ADM_coreLibVA::configVC1;break;
#ifdef ADM_VA_HAS_VP9
#ifdef LIBVA_HEVC_DEC
case VAProfileHEVCMain: cid=ADM_coreLibVA::configH265;break;
case VAProfileHEVCMain10: cid=ADM_coreLibVA::configH26510Bits;break;
#endif

#ifdef LIBVA_VP9_DEC
case VAProfileVP9Profile3: cid=ADM_coreLibVA::configVP9;break;
#endif
default:
@@ -475,10 +479,13 @@ bool admLibVA::supported(VAProfile profile)
switch(profile)
{
SUPSUP(VAProfileH264High,configH264)
SUPSUP(VAProfileVC1Advanced,configVC1)
#ifdef LIBVA_HEVC_DEC
SUPSUP(VAProfileHEVCMain,configH265)
SUPSUP(VAProfileHEVCMain10,configH26510Bits)
SUPSUP(VAProfileVC1Advanced,configVC1)
#ifdef ADM_VA_HAS_VP9
#endif

#ifdef LIBVA_VP9_DEC
SUPSUP(VAProfileVP9Profile3,configVP9)
#endif
default:
@@ -504,14 +511,17 @@ VAContextID admLibVA::createDecoder(VAProfile profile,int width, int heig
switch(profile)
{
case VAProfileH264High: cid=ADM_coreLibVA::configH264;break;
case VAProfileVC1Advanced: cid=ADM_coreLibVA::configVC1;break;
#ifdef LIBVA_HEVC_DEC
case VAProfileHEVCMain: cid=ADM_coreLibVA::configH265;break;
case VAProfileHEVCMain10: cid=ADM_coreLibVA::configH26510Bits;break;
case VAProfileVC1Advanced: cid=ADM_coreLibVA::configVC1;break;
#ifdef ADM_VA_HAS_VP9
#endif
#ifdef LIBVA_VP9_DEC
case VAProfileVP9Profile3: cid=ADM_coreLibVA::configVP9;break;
#endif
default:
ADM_assert(0);
break;

}

@@ -1,7 +1,9 @@

SET(ADM_libva_SRCS
ADM_coreLibVA.cpp
)
)
INCLUDE_DIRECTORIES(${LIBVA_INCLUDE_DIR})
ADD_DEFINITIONS(${LIBVA_CFLAGS})
#*************************************************
#*************************************************
ADM_ADD_SHARED_LIBRARY(ADM_coreLibVA6 ${ADM_libva_SRCS})

0 comments on commit 4993361

Please sign in to comment.
You can’t perform that action at this time.