jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

obs-ffmpeg: Remove codec property from VAAPI encoder

Browse Source 
Encoders have only one codec so this property is not needed.

Also rename the encoder to "FFMPEG VAAPI H.264".
This commit is contained in:
tytan652 2022-06-05 10:12:02 +02:00 committed by Jim
parent f4854dccb4
commit 6cc7cf3d55
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/obs-ffmpeg/obs-ffmpeg-vaapi.c
View File

@ -77,7 +77,7 @@ struct vaapi_encoder {
static const char *vaapi_getname(void *unused) static const char *vaapi_getname(void *unused)
{ {
UNUSED_PARAMETER(unused); UNUSED_PARAMETER(unused);
return "FFMPEG VAAPI"; return "FFMPEG VAAPI H.264";
} }
static inline bool valid_format(enum video_format format) static inline bool valid_format(enum video_format format)
@ -351,11 +351,7 @@ static void *vaapi_create(obs_data_t *settings, obs_encoder_t *encoder)
enc = bzalloc(sizeof(*enc)); enc = bzalloc(sizeof(*enc));
enc->encoder = encoder; enc->encoder = encoder;
int vaapi_codec = (int)obs_data_get_int(settings, "vaapi_codec"); enc->vaapi = avcodec_find_encoder_by_name("h264_vaapi");
if (vaapi_codec == AV_CODEC_ID_H264) {
enc->vaapi = avcodec_find_encoder_by_name("h264_vaapi");
}
enc->first_packet = true; enc->first_packet = true;
@ -517,7 +513,6 @@ static void vaapi_defaults(obs_data_t *settings)
{ {
obs_data_set_default_string(settings, "vaapi_device", obs_data_set_default_string(settings, "vaapi_device",
"/dev/dri/renderD128"); "/dev/dri/renderD128");
obs_data_set_default_int(settings, "vaapi_codec", AV_CODEC_ID_H264);
obs_data_set_default_int(settings, "profile", obs_data_set_default_int(settings, "profile",
FF_PROFILE_H264_CONSTRAINED_BASELINE); FF_PROFILE_H264_CONSTRAINED_BASELINE);
obs_data_set_default_int(settings, "level", 40); obs_data_set_default_int(settings, "level", 40);
@ -647,13 +642,6 @@ 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", list = obs_properties_add_list(props, "profile",
obs_module_text("Profile"), obs_module_text("Profile"),
OBS_COMBO_TYPE_LIST, OBS_COMBO_TYPE_LIST,