Преглед на файлове

Revert "linux-v4l2: Add 'unbuffered' property"

This reverts commit cd306d975a5711e6c9bffe9943ba6e78d346828b.

This removes the 'unbuffered' property for the time being.  There should
be a better way of handling this, such as using system timestamps.
Also, the obs_source_frame::flags member needs to be removed and
replaced with something a bit more ideal.
jp9000 преди 11 години
родител
ревизия
ae0f6b5e3f
променени са 2 файла, в които са добавени 1 реда и са изтрити 8 реда
  1. 0 1
      plugins/linux-v4l2/data/locale/en-US.ini
  2. 1 7
      plugins/linux-v4l2/v4l2-input.c

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

@@ -5,4 +5,3 @@ ImageFormat="Video Format"
 Resolution="Resolution"
 FrameRate="Frame Rate"
 LeaveUnchanged="Leave Unchanged"
-Unbuffered="Unbuffered video playback"

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

@@ -57,7 +57,6 @@ struct v4l2_data {
 	int pixfmt;
 	int resolution;
 	int framerate;
-	bool unbuffered;
 
 	/* internal data */
 	obs_source_t *source;
@@ -179,7 +178,7 @@ static void *v4l2_thread(void *vptr)
 		}
 
 		out.timestamp = timeval2ns(buf.timestamp);
-		out.flags = data->unbuffered ? OBS_VIDEO_UNBUFFERED : 0;
+		out.flags = 0;
 		start = (uint8_t *) data->buffers.info[buf.index].start;
 		for (uint_fast32_t i = 0; i < MAX_AV_PLANES; ++i)
 			out.data[i] = start + plane_offsets[i];
@@ -211,7 +210,6 @@ static void v4l2_defaults(obs_data_t *settings)
 	obs_data_set_default_int(settings, "pixelformat", -1);
 	obs_data_set_default_int(settings, "resolution", -1);
 	obs_data_set_default_int(settings, "framerate", -1);
-	obs_data_set_default_bool(settings, "unbuffered", false);
 }
 
 /*
@@ -579,9 +577,6 @@ static obs_properties_t *v4l2_properties(void *unused)
 			"framerate", obs_module_text("FrameRate"),
 			OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
 
-	obs_properties_add_bool(props,
-			"unbuffered", obs_module_text("Unbuffered"));
-
 	v4l2_device_list(device_list, NULL);
 	obs_property_set_modified_callback(device_list, device_selected);
 	obs_property_set_modified_callback(input_list, input_selected);
@@ -717,7 +712,6 @@ static void v4l2_update(void *vptr, obs_data_t *settings)
 	data->pixfmt     = obs_data_get_int(settings, "pixelformat");
 	data->resolution = obs_data_get_int(settings, "resolution");
 	data->framerate  = obs_data_get_int(settings, "framerate");
-	data->unbuffered = obs_data_get_bool(settings, "unbuffered");
 
 	v4l2_init(data);
 }