ducoterra/obs-studio-nobara
1
0
Fork 0
mirror of https://gitlab.com/GloriousEggroll/obs-studio-nobara.git synced 2025-12-11 00:00:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

add hevc vaapi patch

Browse Source
This commit is contained in:
Thomas Crider
2022-03-12 11:36:22 -07:00
parent 117daf20da
commit 30abe2426e
5 changed files with 3227 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2879
.build-27.2.3-20220312.b65ee7e.fc35.log Normal file
View File

File diff suppressed because one or more lines are too long

10
README.md
View File

@@ -1,4 +1,12 @@
This is obs-studio compiled with the browser plugin and game-capture plugin, found here:
This is obs-studio compiled with a few extra add-ons:
(1) browser source plugin:
https://github.com/obsproject/obs-browser
(2) hevc-vaapi encoder support:
https://github.com/obsproject/obs-studio/pull/2246
(3) game-capture plugin:
https://github.com/nowrep/obs-vkcapture/
Note, you -will- need additional packages from here for game-capture to work:

336
hevc-vaapi.diff Normal file
View File

@@ -0,0 +1,336 @@
diff --git a/plugins/obs-ffmpeg/obs-ffmpeg-vaapi.c b/plugins/obs-ffmpeg/obs-ffmpeg-vaapi.c
index 1598d39db..9b927a9e5 100644
--- a/plugins/obs-ffmpeg/obs-ffmpeg-vaapi.c
+++ b/plugins/obs-ffmpeg/obs-ffmpeg-vaapi.c
@@ -72,10 +72,35 @@ struct vaapi_encoder {
bool initialized;
};
-static const char *vaapi_getname(void *unused)
+/* Identify codecs, and some default values */
+struct type_data {
+ const int id;
+ const int profile;
+ const int level;
+ const char *name;
+ const char *rate_control;
+};
+
+static struct type_data h264_type = {
+ .id = AV_CODEC_ID_H264,
+ .profile = FF_PROFILE_H264_CONSTRAINED_BASELINE,
+ .level = 40,
+ .rate_control = "CBR",
+ .name = "FFMPEG VAAPI",
+};
+
+static struct type_data hevc_type = {
+ .id = AV_CODEC_ID_HEVC,
+ .profile = FF_PROFILE_HEVC_MAIN,
+ .level = 120,
+ .rate_control = "CBR",
+ .name = "FFMPEG VAAPI (hevc)",
+};
+
+static const char *vaapi_getname(void *type_data)
{
- UNUSED_PARAMETER(unused);
- return "FFMPEG VAAPI";
+ struct type_data *data = type_data;
+ return data->name;
}
static inline bool valid_format(enum video_format format)
@@ -173,15 +198,15 @@ typedef struct {
bool maxrate;
} rc_mode_t;
+/* Set "allowed" options per Rate Control */
+static const rc_mode_t RC_MODES[] = {
+ {.name = "CBR", .qp = false, .bitrate = true, .maxrate = false},
+ {.name = "CQP", .qp = true, .bitrate = false, .maxrate = false},
+ {.name = "VBR", .qp = false, .bitrate = true, .maxrate = true},
+ NULL};
+
static const rc_mode_t *get_rc_mode(const char *name)
{
- /* Set "allowed" options per Rate Control */
- static const rc_mode_t RC_MODES[] = {
- {.name = "CBR", .qp = false, .bitrate = true, .maxrate = false},
- {.name = "CQP", .qp = true, .bitrate = false, .maxrate = false},
- {.name = "VBR", .qp = false, .bitrate = true, .maxrate = true},
- NULL};
-
const rc_mode_t *rc_mode = RC_MODES;
while (!!rc_mode && strcmp(rc_mode->name, name) != 0)
@@ -281,6 +306,7 @@ static bool vaapi_update(void *data, obs_data_t *settings)
info("settings:\n"
"\tdevice: %s\n"
+ "\tcodec: %s\n"
"\trate_control: %s\n"
"\tprofile: %d\n"
"\tlevel: %d\n"
@@ -291,9 +317,9 @@ static bool vaapi_update(void *data, obs_data_t *settings)
"\twidth: %d\n"
"\theight: %d\n"
"\tb-frames: %d\n",
- device, rate_control, profile, level, qp, bitrate, maxrate,
- enc->context->gop_size, enc->context->width, enc->context->height,
- enc->context->max_b_frames);
+ device, enc->vaapi->name, rate_control, profile, level, qp,
+ bitrate, maxrate, enc->context->gop_size, enc->context->width,
+ enc->context->height, enc->context->max_b_frames);
return vaapi_init_codec(enc, device);
}
@@ -347,9 +373,12 @@ static void *vaapi_create(obs_data_t *settings, obs_encoder_t *encoder)
if (vaapi_codec == AV_CODEC_ID_H264) {
enc->vaapi = avcodec_find_encoder_by_name("h264_vaapi");
+ enc->first_packet = true;
+ }
+ if (vaapi_codec == AV_CODEC_ID_HEVC) {
+ enc->vaapi = avcodec_find_encoder_by_name("hevc_vaapi");
+ enc->first_packet = false;
}
-
- enc->first_packet = true;
blog(LOG_INFO, "---------------------------------");
@@ -485,7 +514,10 @@ static bool vaapi_encode(void *data, struct encoder_frame *frame,
packet->data = enc->buffer.array;
packet->size = enc->buffer.num;
packet->type = OBS_ENCODER_VIDEO;
- packet->keyframe = obs_avc_keyframe(packet->data, packet->size);
+ packet->keyframe =
+ enc->vaapi->id == AV_CODEC_ID_H264
+ ? obs_avc_keyframe(packet->data, packet->size)
+ : av_pkt.flags & AV_PKT_FLAG_KEY;
*received_packet = true;
} else {
*received_packet = false;
@@ -506,19 +538,20 @@ static void set_visible(obs_properties_t *ppts, const char *name, bool visible)
obs_property_set_visible(p, visible);
}
-static void vaapi_defaults(obs_data_t *settings)
+static void vaapi_defaults(obs_data_t *settings, void *type_data)
{
+ struct type_data *codec = type_data;
+
obs_data_set_default_string(settings, "vaapi_device",
"/dev/dri/renderD128");
- obs_data_set_default_int(settings, "vaapi_codec", AV_CODEC_ID_H264);
- obs_data_set_default_int(settings, "profile",
- FF_PROFILE_H264_CONSTRAINED_BASELINE);
- obs_data_set_default_int(settings, "level", 40);
+ obs_data_set_default_int(settings, "vaapi_codec", codec->id);
+ obs_data_set_default_int(settings, "profile", codec->profile);
+ obs_data_set_default_int(settings, "level", codec->level);
obs_data_set_default_int(settings, "bitrate", 2500);
obs_data_set_default_int(settings, "keyint_sec", 0);
obs_data_set_default_int(settings, "bf", 0);
- obs_data_set_default_int(settings, "rendermode", 0);
- obs_data_set_default_string(settings, "rate_control", "CBR");
+ obs_data_set_default_string(settings, "rate_control",
+ codec->rate_control);
obs_data_set_default_int(settings, "qp", 20);
obs_data_set_default_int(settings, "maxrate", 0);
}
@@ -566,9 +599,13 @@ static bool get_device_name_from_pci(struct pci_access *pacc, char *pci_slot,
return false;
}
-static obs_properties_t *vaapi_properties(void *unused)
+static obs_properties_t *vaapi_properties(void *unused, void *type_data)
{
UNUSED_PARAMETER(unused);
+ struct type_data *codec = type_data;
+ struct dstr name;
+
+ dstr_init(&name);
obs_properties_t *props = obs_properties_create();
obs_property_t *list;
@@ -632,40 +669,63 @@ static obs_properties_t *vaapi_properties(void *unused)
}
}
- list = obs_properties_add_list(props, "vaapi_codec",
- obs_module_text("VAAPI.Codec"),
- OBS_COMBO_TYPE_LIST,
- OBS_COMBO_FORMAT_INT);
-
- obs_property_list_add_int(list, "H.264 (default)", AV_CODEC_ID_H264);
-
- list = obs_properties_add_list(props, "profile",
- obs_module_text("Profile"),
- OBS_COMBO_TYPE_LIST,
- OBS_COMBO_FORMAT_INT);
- obs_property_list_add_int(list, "Constrained Baseline (default)",
- FF_PROFILE_H264_CONSTRAINED_BASELINE);
- obs_property_list_add_int(list, "Main", FF_PROFILE_H264_MAIN);
- obs_property_list_add_int(list, "High", FF_PROFILE_H264_HIGH);
-
- list = obs_properties_add_list(props, "level", obs_module_text("Level"),
- OBS_COMBO_TYPE_LIST,
- OBS_COMBO_FORMAT_INT);
- obs_property_list_add_int(list, "Auto", FF_LEVEL_UNKNOWN);
- obs_property_list_add_int(list, "3.0", 30);
- obs_property_list_add_int(list, "3.1", 31);
- obs_property_list_add_int(list, "4.0 (default) (Compatibility mode)",
- 40);
- obs_property_list_add_int(list, "4.1", 41);
- obs_property_list_add_int(list, "4.2", 42);
- obs_property_list_add_int(list, "5.0", 50);
- obs_property_list_add_int(list, "5.1", 51);
- obs_property_list_add_int(list, "5.2", 52);
-
- list = obs_properties_add_list(props, "rate_control",
- obs_module_text("RateControl"),
- OBS_COMBO_TYPE_LIST,
- OBS_COMBO_FORMAT_STRING);
+ if (codec->id == AV_CODEC_ID_H264) {
+ list = obs_properties_add_list(props, "profile",
+ obs_module_text("Profile"),
+ OBS_COMBO_TYPE_LIST,
+ OBS_COMBO_FORMAT_INT);
+ obs_property_list_add_int(list, "Constrained Baseline (default)",
+ FF_PROFILE_H264_CONSTRAINED_BASELINE);
+ obs_property_list_add_int(list, "Main", FF_PROFILE_H264_MAIN);
+ obs_property_list_add_int(list, "High", FF_PROFILE_H264_HIGH);
+
+ list = obs_properties_add_list(props, "level",
+ obs_module_text("Level"),
+ OBS_COMBO_TYPE_LIST,
+ OBS_COMBO_FORMAT_INT);
+ obs_property_list_add_int(list, "Auto", FF_LEVEL_UNKNOWN);
+ obs_property_list_add_int(list, "3.0", 30);
+ obs_property_list_add_int(list, "3.1", 31);
+ obs_property_list_add_int(list, "4.0 (default) (Compatibility mode)",
+ 40);
+ obs_property_list_add_int(list, "4.1", 41);
+ obs_property_list_add_int(list, "4.2", 42);
+ obs_property_list_add_int(list, "5.0", 50);
+ obs_property_list_add_int(list, "5.1", 51);
+ obs_property_list_add_int(list, "5.2", 52);
+ } else if (codec->id == AV_CODEC_ID_HEVC) {
+ list = obs_properties_add_list(props, "profile",
+ obs_module_text("Profile"),
+ OBS_COMBO_TYPE_LIST,
+ OBS_COMBO_FORMAT_INT);
+ obs_property_list_add_int(list, "Main", FF_PROFILE_HEVC_MAIN);
+ obs_property_list_add_int(list, "Main10", FF_PROFILE_HEVC_MAIN_10);
+ obs_property_list_add_int(list, "Rext", FF_PROFILE_HEVC_REXT);
+
+ list = obs_properties_add_list(props, "level",
+ obs_module_text("Level"),
+ OBS_COMBO_TYPE_LIST,
+ OBS_COMBO_FORMAT_INT);
+ obs_property_list_add_int(list, "Auto", FF_LEVEL_UNKNOWN);
+ obs_property_list_add_int(list, "1", 30);
+ obs_property_list_add_int(list, "2", 60);
+ obs_property_list_add_int(list, "2.1", 63);
+ obs_property_list_add_int(list, "3", 90);
+ obs_property_list_add_int(list, "3.1", 93);
+ obs_property_list_add_int(list, "4", 120);
+ obs_property_list_add_int(list, "4.1", 123);
+ obs_property_list_add_int(list, "5", 150);
+ obs_property_list_add_int(list, "5.1", 153);
+ obs_property_list_add_int(list, "5.2", 156);
+ obs_property_list_add_int(list, "6", 180);
+ obs_property_list_add_int(list, "6.1", 183);
+ obs_property_list_add_int(list, "6.2", 186);
+ }
+
+ list = obs_properties_add_list(props, "rate_control",
+ obs_module_text("RateControl"),
+ OBS_COMBO_TYPE_LIST,
+ OBS_COMBO_FORMAT_STRING);
obs_property_list_add_string(list, "CBR (default)", "CBR");
obs_property_list_add_string(list, "CQP", "CQP");
obs_property_list_add_string(list, "VBR", "VBR");
@@ -687,6 +747,7 @@ static obs_properties_t *vaapi_properties(void *unused)
obs_module_text("KeyframeIntervalSec"), 0, 20,
1);
+ dstr_free(&name);
return props;
}
@@ -716,11 +777,28 @@ struct obs_encoder_info vaapi_encoder_info = {
.create = vaapi_create,
.destroy = vaapi_destroy,
.encode = vaapi_encode,
- .get_defaults = vaapi_defaults,
- .get_properties = vaapi_properties,
+ .get_defaults2 = vaapi_defaults,
+ .get_properties2 = vaapi_properties,
+ .get_extra_data = vaapi_extra_data,
+ .get_sei_data = vaapi_sei_data,
+ .get_video_info = vaapi_video_info,
+ .type_data = &h264_type,
+};
+
+struct obs_encoder_info vaapi_hevc_encoder_info = {
+ .id = "ffmpeg_vaapi_hevc",
+ .type = OBS_ENCODER_VIDEO,
+ .codec = "hevc",
+ .get_name = vaapi_getname,
+ .create = vaapi_create,
+ .destroy = vaapi_destroy,
+ .encode = vaapi_encode,
+ .get_defaults2 = vaapi_defaults,
+ .get_properties2 = vaapi_properties,
.get_extra_data = vaapi_extra_data,
.get_sei_data = vaapi_sei_data,
.get_video_info = vaapi_video_info,
+ .type_data = &hevc_type,
};
#endif
diff --git a/plugins/obs-ffmpeg/obs-ffmpeg.c b/plugins/obs-ffmpeg/obs-ffmpeg.c
index b25201572..84594f2b6 100644
--- a/plugins/obs-ffmpeg/obs-ffmpeg.c
+++ b/plugins/obs-ffmpeg/obs-ffmpeg.c
@@ -37,6 +37,7 @@ extern struct obs_encoder_info aom_av1_encoder_info;
#ifdef LIBAVUTIL_VAAPI_AVAILABLE
extern struct obs_encoder_info vaapi_encoder_info;
+extern struct obs_encoder_info vaapi_hevc_encoder_info;
#endif
#ifndef __APPLE__
@@ -215,9 +216,9 @@ finish:
#endif
#ifdef LIBAVUTIL_VAAPI_AVAILABLE
-static bool vaapi_supported(void)
+static bool vaapi_supported(const char *codec_name)
{
- AVCodec *vaenc = avcodec_find_encoder_by_name("h264_vaapi");
+ AVCodec *vaenc = avcodec_find_encoder_by_name(codec_name);
return !!vaenc;
}
#endif
@@ -269,9 +270,13 @@ bool obs_module_load(void)
obs_register_encoder(&nvenc_encoder_info);
}
#if !defined(_WIN32) && defined(LIBAVUTIL_VAAPI_AVAILABLE)
- if (vaapi_supported()) {
- blog(LOG_INFO, "FFMPEG VAAPI supported");
- obs_register_encoder(&vaapi_encoder_info);
+ if (vaapi_supported("h264_vaapi")) {
+ blog(LOG_INFO, "FFMPEG VAAPI supported");
+ obs_register_encoder(&vaapi_encoder_info);
+ }
+ if (vaapi_supported("hevc_vaapi")) {
+ blog(LOG_INFO, "FFMPEG HEVC VAAPI supported");
+ obs_register_encoder(&vaapi_hevc_encoder_info);
}
#endif
#endif

BIN
obs-studio-27.2.3-20220312.b65ee7e.fc35.src.rpm
View File

Binary file not shown.

4
obs-studio.spec
View File

@@ -3,7 +3,7 @@
%global __python %{__python3}
%define version_string 27.2.3
%global build_timestamp %(date +"%Y%m%d")
%global build_timestamp 2%(date +"%Y%m%d")
%global rel_build %{build_timestamp}.%{shortcommit}%{?dist}
# obs version and commit
@@ -36,6 +36,7 @@ Source2: https://github.com/obsproject/obs-browser/archive/%{commit2}/obs
Source3: https://cdn-fastly.obsproject.com/downloads/cef_binary_4638_linux64.tar.bz2
Source4: https://github.com/nowrep/obs-vkcapture/archive/%{commit3}/obs-vkcapture-%{shortcommit3}.tar.gz
Patch0: hevc-vaapi.diff
Patch1: vkcapture.diff
BuildRequires: gcc
@@ -133,6 +134,7 @@ tar -xf %{SOURCE3} -C ../
mkdir -p plugins/obs-vkcapture
tar -xf %{SOURCE4} -C plugins/obs-vkcapture --strip-components=1
patch -Np1 < %{PATCH0}
patch -Np1 < %{PATCH1}
%build