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

Merge pull request #2619 from dgcampea/ffmpeg-vaapi 

Expose more levels and profiles for FFmpeg VAAPI
master
Jim 2020-05-20 19:49:41 -07:00 committed by GitHub
parent cb98f456eb b216b90a5c
commit 89ccad8a2b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -550,15 +550,27 @@ static obs_properties_t *vaapi_properties(void *unused)
obs_property_list_add_int(list, "H.264 (default)", AV_CODEC_ID_H264); obs_property_list_add_int(list, "H.264 (default)", AV_CODEC_ID_H264);
list = obs_properties_add_list(props, "profile", "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", "Level", list = obs_properties_add_list(props, "level", "Level",
OBS_COMBO_TYPE_LIST, OBS_COMBO_TYPE_LIST,
OBS_COMBO_FORMAT_INT); OBS_COMBO_FORMAT_INT);
obs_property_list_add_int(list, "480p30 (3.0)", 30); obs_property_list_add_int(list, "Auto", FF_LEVEL_UNKNOWN);
obs_property_list_add_int(list, "720p30/480p60 (3.1)", 31); obs_property_list_add_int(list, "3.0", 30);
obs_property_list_add_int(list, "Compatibility mode (4.0 default)", obs_property_list_add_int(list, "3.1", 31);
obs_property_list_add_int(list, "4.0 (default) (Compatibility mode)",
40); 40);
obs_property_list_add_int(list, "720p60/1080p30 (4.1)", 41); obs_property_list_add_int(list, "4.1", 41);
obs_property_list_add_int(list, "1080p60 (4.2)", 42); 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", list = obs_properties_add_list(props, "rate_control",
obs_module_text("RateControl"), obs_module_text("RateControl"),