Skip to content

build(deps): bump actions/cache from 4 to 5 #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dependabot wants to merge 3 commits into
base: hw-encoder-vaapi2
Choose a base branch
from
Open

build(deps): bump actions/cache from 4 to 5 #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
116c13e
encavcodecInit: Enable libav verbosity and show codec options if glob…
sgothel Jul 20, 2020
e0d003d
hw-encoder-vaapi: Enables VAAPI if available and supported
sgothel Nov 29, 2025
53af4d3
build(deps): bump actions/cache from 4 to 5
dependabot[bot] Dec 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

- name: Cargo-C Toolchain Cache
id: linux-cargo-c-toolchain
uses: actions/cache@v4
uses: actions/cache@v5
with:
path: |
~/.cargo/bin/cargo-capi
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/mac.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ jobs:

- name: Toolchain Cache
id: mac-toolchain
uses: actions/cache@v4
uses: actions/cache@v5
with:
path: ~/mac-toolchain
key: ${{ runner.os }}-${{ runner.arch }}-toolchain-${{ hashFiles('**/scripts/mac-toolchain-build') }}

- name: Cargo-C Toolchain Cache
id: mac-cargo-c-toolchain
uses: actions/cache@v4
uses: actions/cache@v5
with:
path: |
~/.cargo/bin/cargo-capi
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ jobs:

- name: Cargo-C Toolchain Cache
id: windows-cargo-c-toolchain
uses: actions/cache@v4
uses: actions/cache@v5
with:
path: |
~/.cargo/bin/cargo-capi
Expand Down
11 changes: 11 additions & 0 deletions contrib/ffmpeg/module.defs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,17 @@ FFMPEG.CONFIGURE.extra += \
--enable-filter=scale_cuda
endif

ifeq (1,$(FEATURE.vaapi))
FFMPEG.CONFIGURE.extra += \
--enable-hwaccels \
--enable-vaapi \
--enable-encoder=h264_vaapi \
--enable-encoder=hevc_vaapi \
--enable-encoder=av1_vaapi \
--enable-encoder=vp8_vaapi \
--enable-encoder=vp9_vaapi
endif

ifeq (1,$(FEATURE.mf))
FFMPEG.CONFIGURE.extra += \
--enable-hwaccel=h264_d3d11va \
Expand Down
4 changes: 2 additions & 2 deletions gtk/src/callbacks.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,8 +423,8 @@ static GhbBinding widget_bindings[] =
{"PictureDetelecine", "active-id", "custom10", "PictureDetelecineCustom", "visible"},
{"PictureColorspacePreset", "active-id", "custom11", "PictureColorspaceCustom", "visible"},
{"VideoEncoder", "active-id", "svt_av1|svt_av1_10bit|x264|x264_10bit", "x264FastDecode", "visible"},
{"VideoEncoder", "active-id", "svt_av1|svt_av1_10bit|x264|x264_10bit|x265|x265_10bit|x265_12bit|x265_16bit|mpeg4|mpeg2|VP8|VP9|VP9_10bit|qsv_av1|qsv_av1_10bit|qsv_h264|qsv_h265|qsv_h265_10bit", "VideoOptionExtraWindow", "visible"},
{"VideoEncoder", "active-id", "svt_av1|svt_av1_10bit|x264|x264_10bit|x265|x265_10bit|x265_12bit|x265_16bit|mpeg4|mpeg2|VP8|VP9|VP9_10bit|qsv_av1|qsv_av1_10bit|qsv_h264|qsv_h265|qsv_h265_10bit", "VideoOptionExtraLabel", "visible"},
{"VideoEncoder", "active-id", "svt_av1|svt_av1_10bit|x264|x264_10bit|x265|x265_10bit|x265_12bit|x265_16bit|mpeg4|mpeg2|VP8|VP9|VP9_10bit|qsv_av1|qsv_av1_10bit|qsv_h264|qsv_h265|qsv_h265_10bit|vaapi_h264|vaapi_hevc|vaapi_vp8|vaapi_vp9", "VideoOptionExtraWindow", "visible"},
{"VideoEncoder", "active-id", "svt_av1|svt_av1_10bit|x264|x264_10bit|x265|x265_10bit|x265_12bit|x265_16bit|mpeg4|mpeg2|VP8|VP9|VP9_10bit|qsv_av1|qsv_av1_10bit|qsv_h264|qsv_h265|qsv_h265_10bit|vaapi_h264|vaapi_hevc|vaapi_vp8|vaapi_vp9", "VideoOptionExtraLabel", "visible"},
{"auto_name", "active", NULL, "autoname_box", "sensitive"},
{"CustomTmpEnable", "active", NULL, "CustomTmpDir", "sensitive"},
{"PresetCategory", "active-id", "new", "PresetCategoryName", "visible"},
Expand Down
60 changes: 60 additions & 0 deletions libhb/common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@
#if HB_PROJECT_FEATURE_NVENC
#include "handbrake/nvenc_common.h"
#endif
#if HB_PROJECT_FEATURE_VAAPI
#include "handbrake/vaapi_common.h"
#endif
#if HB_PROJECT_FEATURE_VCE
#include "handbrake/vce_common.h"
#endif
Expand All @@ -63,12 +66,14 @@ enum
HB_GID_NONE = -1, // encoders must NEVER use it
HB_GID_VCODEC_H264_MF,
HB_GID_VCODEC_H264_NVENC,
HB_GID_VCODEC_H264_VAAPI,
HB_GID_VCODEC_H264_QSV,
HB_GID_VCODEC_H264_VCE,
HB_GID_VCODEC_H264_VT,
HB_GID_VCODEC_H264_X264,
HB_GID_VCODEC_H265_MF,
HB_GID_VCODEC_H265_NVENC,
HB_GID_VCODEC_H265_VAAPI,
HB_GID_VCODEC_H265_QSV,
HB_GID_VCODEC_H265_VCE,
HB_GID_VCODEC_H265_VT,
Expand All @@ -77,12 +82,15 @@ enum
HB_GID_VCODEC_MPEG4,
HB_GID_VCODEC_THEORA,
HB_GID_VCODEC_VP8,
HB_GID_VCODEC_VP8_VAAPI,
HB_GID_VCODEC_VP9,
HB_GID_VCODEC_VP9_VAAPI,
HB_GID_VCODEC_AV1_SVT,
HB_GID_VCODEC_AV1_QSV,
HB_GID_VCODEC_AV1_NVENC,
HB_GID_VCODEC_AV1_VCE,
HB_GID_VCODEC_AV1_MF,
HB_GID_VCODEC_AV1_VAAPI,
HB_GID_VCODEC_FFV1,
HB_GID_ACODEC_ALAC,
HB_GID_ACODEC_ALAC_PASS,
Expand Down Expand Up @@ -291,12 +299,14 @@ hb_encoder_internal_t hb_video_encoders[] =
{ { "AV1 10-bit (NVEnc)", "nvenc_av1_10bit", "AV1 10-bit (NVEnc)", HB_VCODEC_FFMPEG_NVENC_AV1_10BIT, HB_MUX_MASK_MP4|HB_MUX_MASK_WEBM|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_VCODEC_AV1_NVENC, },
{ { "AV1 (AMD VCE)", "vce_av1", "AV1 (AMD VCE)", HB_VCODEC_FFMPEG_VCE_AV1, HB_MUX_MASK_MP4|HB_MUX_MASK_WEBM|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_VCODEC_AV1_VCE, },
{ { "AV1 (MediaFoundation)", "mf_av1", "AV1 (MediaFoundation)", HB_VCODEC_FFMPEG_MF_AV1, HB_MUX_MASK_MP4|HB_MUX_MASK_WEBM|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_VCODEC_AV1_MF, },
{ { "AV1 (vaapi)", "vaapi_av1", "AV1 (vaapi)", HB_VCODEC_FFMPEG_VAAPI_AV1, HB_MUX_MASK_MP4|HB_MUX_MASK_WEBM|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_VCODEC_AV1_VAAPI, },
{ { "FFV1", "ffv1", "FFV1 (libavcodec)", HB_VCODEC_FFMPEG_FFV1, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_VCODEC_FFV1, },
{ { "H.264 (x264)", "x264", "H.264 (libx264)", HB_VCODEC_X264_8BIT, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_VCODEC_H264_X264, },
{ { "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, 0, 1, HB_GID_VCODEC_H264_X264, },
{ { "H.264 (Intel QSV)", "qsv_h264", "H.264 (Intel QSV)", HB_VCODEC_FFMPEG_QSV_H264, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_VCODEC_H264_QSV, },
{ { "H.264 (AMD VCE)", "vce_h264", "H.264 (AMD VCE)", HB_VCODEC_FFMPEG_VCE_H264, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_VCODEC_H264_VCE, },
{ { "H.264 (NVEnc)", "nvenc_h264", "H.264 (NVEnc)", HB_VCODEC_FFMPEG_NVENC_H264, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_VCODEC_H264_NVENC, },
{ { "H.264 (vaapi)", "vaapi_h264", "H.264 (vaapi)", HB_VCODEC_FFMPEG_VAAPI_H264, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_VCODEC_H264_VAAPI, },
{ { "H.264 (MediaFoundation)", "mf_h264", "H.264 (MediaFoundation)", HB_VCODEC_FFMPEG_MF_H264, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_VCODEC_H264_MF, },
{ { "H.264 (VideoToolbox)", "vt_h264", "H.264 (VideoToolbox)", HB_VCODEC_VT_H264, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_VCODEC_H264_VT, },
{ { "H.265 (x265)", "x265", "H.265 (libx265)", HB_VCODEC_X265_8BIT, HB_MUX_AV_MP4|HB_MUX_AV_MKV, }, NULL, 0, 1, HB_GID_VCODEC_H265_X265, },
Expand All @@ -308,14 +318,17 @@ hb_encoder_internal_t hb_video_encoders[] =
{ { "H.265 (AMD VCE)", "vce_h265", "H.265 (AMD VCE)", HB_VCODEC_FFMPEG_VCE_H265, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_VCODEC_H265_VCE, },
{ { "H.265 10-bit (AMD VCE)", "vce_h265_10bit", "H.265 10-bit (AMD VCE)", HB_VCODEC_FFMPEG_VCE_H265_10BIT, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_VCODEC_H265_VCE, },
{ { "H.265 (NVEnc)", "nvenc_h265", "H.265 (NVEnc)", HB_VCODEC_FFMPEG_NVENC_H265, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_VCODEC_H265_NVENC, },
{ { "H.265 (vaapi)", "vaapi_hevc", "H.265 (vaapi)", HB_VCODEC_FFMPEG_VAAPI_H265, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_VCODEC_H265_VAAPI, },
{ { "H.265 10-bit (NVEnc)", "nvenc_h265_10bit", "H.265 10-bit (NVEnc)", HB_VCODEC_FFMPEG_NVENC_H265_10BIT, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_VCODEC_H265_NVENC, },
{ { "H.265 (MediaFoundation)", "mf_h265", "H.265 (MediaFoundation)", HB_VCODEC_FFMPEG_MF_H265, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_VCODEC_H265_MF, },
{ { "H.265 (VideoToolbox)", "vt_h265", "H.265 (VideoToolbox)", HB_VCODEC_VT_H265, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_VCODEC_H265_VT, },
{ { "H.265 10-bit (VideoToolbox)", "vt_h265_10bit", "H.265 10-bit (VideoToolbox)", HB_VCODEC_VT_H265_10BIT, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_VCODEC_H265_VT, },
{ { "MPEG-4", "mpeg4", "MPEG-4 (libavcodec)", HB_VCODEC_FFMPEG_MPEG4, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_VCODEC_MPEG4, },
{ { "MPEG-2", "mpeg2", "MPEG-2 (libavcodec)", HB_VCODEC_FFMPEG_MPEG2, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_VCODEC_MPEG2, },
{ { "VP8", "VP8", "VP8 (libvpx)", HB_VCODEC_FFMPEG_VP8, HB_MUX_MASK_WEBM|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_VCODEC_VP8, },
{ { "VP8 (vaapi)", "vaapi_VP8", "VP8 (vaapi)", HB_VCODEC_FFMPEG_VAAPI_VP8, HB_MUX_MASK_WEBM|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_VCODEC_VP8_VAAPI, },
{ { "VP9", "VP9", "VP9 (libvpx)", HB_VCODEC_FFMPEG_VP9, HB_MUX_MASK_MP4|HB_MUX_MASK_WEBM|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_VCODEC_VP9, },
{ { "VP9 (vaapi)", "vaapi_VP9", "VP9 (vaapi)", HB_VCODEC_FFMPEG_VAAPI_VP9, HB_MUX_MASK_WEBM|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_VCODEC_VP9_VAAPI, },
{ { "VP9 10-bit", "VP9_10bit", "VP9 10-bit (libvpx)", HB_VCODEC_FFMPEG_VP9_10BIT, HB_MUX_MASK_MP4|HB_MUX_MASK_WEBM|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_VCODEC_VP9, },
{ { "Theora", "theora", "Theora (libtheora)", HB_VCODEC_THEORA, HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_VCODEC_THEORA, },
};
Expand Down Expand Up @@ -355,6 +368,15 @@ static int hb_video_encoder_is_enabled(int encoder, int disable_hardware)
return hb_nvenc_av1_available();
#endif

#if HB_PROJECT_FEATURE_VAAPI
case HB_VCODEC_FFMPEG_VAAPI_H264:
case HB_VCODEC_FFMPEG_VAAPI_H265:
case HB_VCODEC_FFMPEG_VAAPI_AV1:
case HB_VCODEC_FFMPEG_VAAPI_VP8:
case HB_VCODEC_FFMPEG_VAAPI_VP9:
return hb_vaapi_encoder_available(encoder);
#endif

#ifdef __APPLE__
case HB_VCODEC_VT_H264:
case HB_VCODEC_VT_H265:
Expand Down Expand Up @@ -586,10 +608,20 @@ static void hb_common_global_hw_init()
hb_qsv_available();
hb_register_hwaccel(&hb_hwaccel_qsv);
#endif
#if HB_PROJECT_FEATURE_VAAPI
hb_vaapi_init();
#endif

hb_hwaccel_common_hwaccel_init();
}

static void hb_common_global_hw_close()
{
#if HB_PROJECT_FEATURE_VAAPI
hb_vaapi_free();
#endif
}

void hb_common_global_init(int disable_hardware)
{
static int common_init_done = 0;
Expand Down Expand Up @@ -853,6 +885,14 @@ void hb_common_global_init(int disable_hardware)
common_init_done = 1;
}

void hb_common_global_close(int disable_hardware)
{
if (!disable_hardware)
{
hb_common_global_hw_close();
}
}

int hb_video_framerate_get_from_name(const char *name)
{
if (name == NULL || *name == '\0')
Expand Down Expand Up @@ -1619,13 +1659,16 @@ void hb_video_quality_get_limits(uint32_t codec, float *low, float *high,
case HB_VCODEC_FFMPEG_NVENC_H264:
case HB_VCODEC_FFMPEG_NVENC_H265:
case HB_VCODEC_FFMPEG_NVENC_H265_10BIT:
case HB_VCODEC_FFMPEG_VAAPI_H264:
case HB_VCODEC_FFMPEG_VAAPI_H265:
*direction = 1;
*granularity = 0.1;
*low = 1.;
*high = 51.;
break;
case HB_VCODEC_FFMPEG_NVENC_AV1:
case HB_VCODEC_FFMPEG_NVENC_AV1_10BIT:
case HB_VCODEC_FFMPEG_VAAPI_AV1:
*direction = 1;
*granularity = 0.1;
*low = 1.;
Expand Down Expand Up @@ -1667,6 +1710,8 @@ void hb_video_quality_get_limits(uint32_t codec, float *low, float *high,
case HB_VCODEC_FFMPEG_VP8:
case HB_VCODEC_FFMPEG_VP9:
case HB_VCODEC_FFMPEG_VP9_10BIT:
case HB_VCODEC_FFMPEG_VAAPI_VP8:
case HB_VCODEC_FFMPEG_VAAPI_VP9:
case HB_VCODEC_SVT_AV1:
case HB_VCODEC_SVT_AV1_10BIT:
*direction = 1;
Expand Down Expand Up @@ -1754,6 +1799,11 @@ const char* hb_video_quality_get_name(uint32_t codec)
case HB_VCODEC_FFMPEG_MF_AV1:
return "Quality";

case HB_VCODEC_FFMPEG_VAAPI_VP8:
case HB_VCODEC_FFMPEG_VAAPI_VP9:
case HB_VCODEC_FFMPEG_VAAPI_H264:
case HB_VCODEC_FFMPEG_VAAPI_H265:
case HB_VCODEC_FFMPEG_VAAPI_AV1:
default:
return "QP";
}
Expand Down Expand Up @@ -1875,6 +1925,11 @@ int hb_video_encoder_is_supported(int encoder)
return 0;
}

int hb_video_encoder_is_vaapi(int encoder)
{
return HB_VCODEC_VAAPI_MASK == (encoder & HB_VCODEC_VAAPI_MASK);
}

int hb_video_encoder_get_count_of_analysis_passes(int encoder)
{
switch (encoder)
Expand Down Expand Up @@ -2050,6 +2105,9 @@ const char* const* hb_video_encoder_get_profiles(int encoder)
case HB_VCODEC_FFMPEG_MF_H264:
case HB_VCODEC_FFMPEG_MF_H265:
case HB_VCODEC_FFMPEG_MF_AV1:
case HB_VCODEC_FFMPEG_VAAPI_H264:
case HB_VCODEC_FFMPEG_VAAPI_H265:
case HB_VCODEC_FFMPEG_VAAPI_AV1:
return hb_av_profile_get_names(encoder);

case HB_VCODEC_SVT_AV1:
Expand Down Expand Up @@ -2079,6 +2137,7 @@ const char* const* hb_video_encoder_get_levels(int encoder)
{
case HB_VCODEC_X264_8BIT:
case HB_VCODEC_X264_10BIT:
case HB_VCODEC_FFMPEG_VAAPI_H264:
return hb_h264_level_names;

#if HB_PROJECT_FEATURE_VCE
Expand All @@ -2090,6 +2149,7 @@ const char* const* hb_video_encoder_get_levels(int encoder)
case HB_VCODEC_X265_10BIT:
case HB_VCODEC_X265_12BIT:
case HB_VCODEC_X265_16BIT:
case HB_VCODEC_FFMPEG_VAAPI_H265:
return hb_h265_level_names;

#ifdef __APPLE__
Expand Down
Loading
Loading