浏览代码

linux-v4l2: Add "Default" color range setting

VIDEO_RANGE_DEFAULT uses partial range for YUV and full range for RGB.
Previous default was always partial.
jpark37 6 年之前
父节点
当前提交
1b6c55135e
共有 2 个文件被更改,包括 5 次插入1 次删除
  1. 1 0
      plugins/linux-v4l2/data/locale/en-US.ini
  2. 4 1
      plugins/linux-v4l2/v4l2-input.c

+ 1 - 0
plugins/linux-v4l2/data/locale/en-US.ini

@@ -9,5 +9,6 @@ FrameRate="Frame Rate"
 LeaveUnchanged="Leave Unchanged"
 UseBuffering="Use Buffering"
 ColorRange="Color Range"
+ColorRange.Default="Default"
 ColorRange.Partial="Partial"
 ColorRange.Full="Full"

+ 4 - 1
plugins/linux-v4l2/v4l2-input.c

@@ -231,7 +231,7 @@ static void v4l2_defaults(obs_data_t *settings)
 	obs_data_set_default_int(settings, "dv_timing", -1);
 	obs_data_set_default_int(settings, "resolution", -1);
 	obs_data_set_default_int(settings, "framerate", -1);
-	obs_data_set_default_int(settings, "color_range", VIDEO_RANGE_PARTIAL);
+	obs_data_set_default_int(settings, "color_range", VIDEO_RANGE_DEFAULT);
 	obs_data_set_default_bool(settings, "buffering", true);
 }
 
@@ -770,6 +770,9 @@ static obs_properties_t *v4l2_properties(void *vptr)
 	obs_property_t *color_range_list = obs_properties_add_list(
 		props, "color_range", obs_module_text("ColorRange"),
 		OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
+	obs_property_list_add_int(color_range_list,
+				  obs_module_text("ColorRange.Default"),
+				  VIDEO_RANGE_DEFAULT);
 	obs_property_list_add_int(color_range_list,
 				  obs_module_text("ColorRange.Partial"),
 				  VIDEO_RANGE_PARTIAL);