diff options
| author | John Stebbins <[email protected]> | 2019-04-17 10:43:25 -0600 |
|---|---|---|
| committer | John Stebbins <[email protected]> | 2019-04-17 11:25:13 -0600 |
| commit | 7147389186a86b4c188929fcf4c3b68c5321323b (patch) | |
| tree | 720410e325aad2be8e3e5b79cf6f90363caea549 /libhb | |
| parent | 4f78a721fd33fc828e61f9ce9462b7ba06eccbbb (diff) | |
vce: use HB_PROJECT_FEATURE_VCE instead of USE_VCE
Diffstat (limited to 'libhb')
| -rw-r--r-- | libhb/common.c | 9 | ||||
| -rw-r--r-- | libhb/module.defs | 4 | ||||
| -rw-r--r-- | libhb/vce_common.c | 8 | ||||
| -rw-r--r-- | libhb/work.c | 2 |
4 files changed, 10 insertions, 13 deletions
diff --git a/libhb/common.c b/libhb/common.c index 8ddb594ee..b99fc9fa0 100644 --- a/libhb/common.c +++ b/libhb/common.c @@ -34,8 +34,7 @@ #if HB_PROJECT_FEATURE_NVENC #include "nvenc_common.h" #endif - -#ifdef USE_VCE +#if HB_PROJECT_FEATURE_VCE #include "vce_common.h" #endif @@ -284,7 +283,7 @@ static int hb_video_encoder_is_enabled(int encoder, int disable_hardware) #endif switch (encoder){ -#ifdef USE_VCE +#if HB_PROJECT_FEATURE_VCE case HB_VCODEC_FFMPEG_VCE_H264: return hb_vce_h264_available(); case HB_VCODEC_FFMPEG_VCE_H265: @@ -1537,7 +1536,7 @@ const char* const* hb_video_encoder_get_profiles(int encoder) case HB_VCODEC_X265_16BIT: return hb_h265_profile_names_16bit; -#ifdef USE_VCE +#if HB_PROJECT_FEATURE_VCE case HB_VCODEC_FFMPEG_VCE_H264: return hb_vce_h264_profile_names; case HB_VCODEC_FFMPEG_VCE_H265: @@ -1571,7 +1570,7 @@ const char* const* hb_video_encoder_get_levels(int encoder) case HB_VCODEC_FFMPEG_VT_H264: return hb_h264_level_names; -#ifdef USE_VCE +#if HB_PROJECT_FEATURE_VCE case HB_VCODEC_FFMPEG_VCE_H264: return hb_vce_h264_level_names; // Not quite the same as x264 #endif diff --git a/libhb/module.defs b/libhb/module.defs index e6e88ae91..686e12798 100644 --- a/libhb/module.defs +++ b/libhb/module.defs @@ -83,10 +83,6 @@ ifeq (1,$(FEATURE.qsv)) LIBHB.GCC.D += HAVE_THREADS=1 endif -ifeq (1,$(FEATURE.vce)) - LIBHB.GCC.D += USE_VCE -endif - ifeq (1,$(COMPAT.strtok_r)) LIBHB.GCC.D += HB_NEED_STRTOK_R endif diff --git a/libhb/vce_common.c b/libhb/vce_common.c index d0bb2a005..632bf9757 100644 --- a/libhb/vce_common.c +++ b/libhb/vce_common.c @@ -7,7 +7,9 @@ * For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html */ -#ifdef USE_VCE +#include "project.h" + +#if HB_PROJECT_FEATURE_VCE #include "AMF/core/Factory.h" #include "AMF/components/VideoEncoderVCE.h" #include "AMF/components/VideoEncoderHEVC.h" @@ -116,7 +118,7 @@ int hb_vce_h265_available() return (check_component_available(AMFVideoEncoder_HEVC) == AMF_OK) ? 1 : 0; } -#else // !USE_VCE +#else // !HB_PROJECT_FEATURE_VCE int hb_vce_h264_available() { @@ -128,4 +130,4 @@ int hb_vce_h265_available() return 0; } -#endif // USE_VCE +#endif // HB_PROJECT_FEATURE_VCE diff --git a/libhb/work.c b/libhb/work.c index 72a8cfd1b..a20f33dbd 100644 --- a/libhb/work.c +++ b/libhb/work.c @@ -264,7 +264,7 @@ hb_work_object_t* hb_video_encoder(hb_handle_t *h, int vcodec) w = hb_get_work(h, WORK_ENCX265); break; #endif -#ifdef USE_VCE +#if HB_PROJECT_FEATURE_VCE case HB_VCODEC_FFMPEG_VCE_H264: w = hb_get_work(h, WORK_ENCAVCODEC); w->codec_param = AV_CODEC_ID_H264; |