summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Lazarow <[email protected]>2017-09-12 21:20:12 -0400
committerMatthew Lazarow <[email protected]>2017-09-12 21:20:12 -0400
commit4ae3ce9cadfb3286dc073e02b0fcae12ae7f8124 (patch)
treeb49279cb9a2fdfaa415907b179aaf123636cadcb
parent124d6801bf25b9f73f51174c2cee09fa043998a1 (diff)
first attempt adding nvenc to common.c
-rw-r--r--libhb/common.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/libhb/common.c b/libhb/common.c
index 08bf0f08d..fb02e0124 100644
--- a/libhb/common.c
+++ b/libhb/common.c
@@ -63,6 +63,8 @@ enum
HB_GID_ACODEC_FLAC_PASS,
HB_GID_ACODEC_MP3,
HB_GID_ACODEC_MP3_PASS,
+ HB_GID_ACODEC_H264_NVENC,
+ HB_GID_ACODEC_HEVC_NVENC,
HB_GID_ACODEC_TRUEHD_PASS,
HB_GID_ACODEC_VORBIS,
HB_GID_ACODEC_OPUS,
@@ -236,6 +238,8 @@ hb_encoder_internal_t hb_video_encoders[] =
{ { "H.264 (x264)", "x264", "H.264 (libx264)", HB_VCODEC_X264_8BIT, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_VCODEC_H264, },
{ { "H.264 10-bit (x264)", "x264_10bit", "H.264 10-bit (libx264)", HB_VCODEC_X264_10BIT, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_VCODEC_H264, },
{ { "H.264 (Intel QSV)", "qsv_h264", "H.264 (Intel Media SDK)", HB_VCODEC_QSV_H264, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_VCODEC_H264, },
+ { { "H.264 (NVENC)", "x264_nvenc", "H.264 (NVENC)", HB_VCODEC_H264_NVENC, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_VCODEC_H264, },
+ { { "H.264 (HEVC)", "x264_nvenc", "H.264 (HEVC)", HB_VCODEC_HEVC_NVENC, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_VCODEC_H264, },
{ { "H.265 (x265)", "x265", "H.265 (libx265)", HB_VCODEC_X265_8BIT, HB_MUX_AV_MP4|HB_MUX_AV_MKV, }, NULL, 1, HB_GID_VCODEC_H265, },
{ { "H.265 10-bit (x265)", "x265_10bit", "H.265 10-bit (libx265)", HB_VCODEC_X265_10BIT, HB_MUX_AV_MP4|HB_MUX_AV_MKV, }, NULL, 1, HB_GID_VCODEC_H265, },
{ { "H.265 12-bit (x265)", "x265_12bit", "H.265 12-bit (libx265)", HB_VCODEC_X265_12BIT, HB_MUX_AV_MP4|HB_MUX_AV_MKV, }, NULL, 1, HB_GID_VCODEC_H265, },
@@ -263,6 +267,8 @@ static int hb_video_encoder_is_enabled(int encoder)
case HB_VCODEC_THEORA:
case HB_VCODEC_FFMPEG_MPEG4:
case HB_VCODEC_FFMPEG_MPEG2:
+ case HB_VCODEC_H264_NVENC:
+ case HB_VCODEC_HEVC_NVENC:
case HB_VCODEC_FFMPEG_VP8:
case HB_VCODEC_FFMPEG_VP9:
return 1;