Request 4040 (accepted)

Overview

Request 4040 (accepted)

- Update to version 20.1.3:
* libobs: Update to version 20.1.3
* libobs: Fix FFmpeg constants
* libobs: Update to version 20.1.2
* libobs-d3d11: Allow rebuild even if output duplicator fails
* graphics-hook: blacklist OpenGL capture for "cm_client.exe"
* UI: Fix custom ffmpeg output file / URL entry
* linux-pulseaudio: Get correct default device
* libobs: Rename obs_video_thread to obs_graphics_thread
* libobs: Use new ffmpeg constants
* obs-ffmpeg: Use new ffmpeg constants
* deps/media-playback: Use new ffmpeg constants
* UI: Log when output timer events stop outputs

Created by boombatower over 6 years ago
In state accepted
Package maintainers: boombatower and frispete

Submit obs-studio

Submit package home:boombatow...es:Multimedia / obs-studio to package Multimedia / obs-studio

obs-studio.changes Changed

obs-studio.spec Changed

_service Changed

_servicedata Changed

obs-studio-20.1.1.tar.xz/UI/forms/OBSBasicSettings.ui -> obs-studio-20.1.3.tar.xz/UI/forms/OBSBasicSettings.ui Changed

obs-studio-20.1.1.tar.xz/UI/frontend-plugins/frontend-tools/output-timer.cpp -> obs-studio-20.1.3.tar.xz/UI/frontend-plugins/frontend-tools/output-timer.cpp Changed

obs-studio-20.1.1.tar.xz/deps/media-playback/media-playback/decode.c -> obs-studio-20.1.3.tar.xz/deps/media-playback/media-playback/decode.c Changed

obs-studio-20.1.1.tar.xz/deps/media-playback/media-playback/decode.h -> obs-studio-20.1.3.tar.xz/deps/media-playback/media-playback/decode.h Changed

obs-studio-20.1.1.tar.xz/libobs-d3d11/d3d11-duplicator.cpp -> obs-studio-20.1.3.tar.xz/libobs-d3d11/d3d11-duplicator.cpp Changed

obs-studio-20.1.1.tar.xz/libobs-d3d11/d3d11-rebuild.cpp -> obs-studio-20.1.3.tar.xz/libobs-d3d11/d3d11-rebuild.cpp Changed

obs-studio-20.1.1.tar.xz/libobs/media-io/media-remux.c -> obs-studio-20.1.3.tar.xz/libobs/media-io/media-remux.c Changed

obs-studio-20.1.1.tar.xz/libobs/obs-config.h -> obs-studio-20.1.3.tar.xz/libobs/obs-config.h Changed

obs-studio-20.1.1.tar.xz/libobs/obs-ffmpeg-compat.h -> obs-studio-20.1.3.tar.xz/libobs/obs-ffmpeg-compat.h Changed

obs-studio-20.1.1.tar.xz/libobs/obs-internal.h -> obs-studio-20.1.3.tar.xz/libobs/obs-internal.h Changed

obs-studio-20.1.1.tar.xz/libobs/obs-video.c -> obs-studio-20.1.3.tar.xz/libobs/obs-video.c Changed

obs-studio-20.1.1.tar.xz/libobs/obs.c -> obs-studio-20.1.3.tar.xz/libobs/obs.c Changed

obs-studio-20.1.1.tar.xz/plugins/linux-pulseaudio/pulse-input.c -> obs-studio-20.1.3.tar.xz/plugins/linux-pulseaudio/pulse-input.c Changed

@@ -33,6 +33,7 @@
 
 	/* user settings */
 	char *device;
+	bool input;
 
 	/* server info */
 	enum speaker_layout speakers;
@@ -164,11 +165,30 @@
 	void *userdata)
 {
 	UNUSED_PARAMETER(c);
-	UNUSED_PARAMETER(userdata);
+	PULSE_DATA(userdata);
 
 	blog(LOG_INFO, "Server name: '%s %s'",
 		i->server_name, i->server_version);
 
+	if (data->device && strcmp("default", data->device) == 0) {
+		if (data->input) {
+			bfree(data->device);
+			data->device = bstrdup(i->default_source_name);
+
+			blog(LOG_DEBUG, "Default input device: '%s'", data->device);
+		} else {
+			char *monitor = bzalloc(strlen(i->default_sink_name) + 9);
+			strcat(monitor, i->default_sink_name);
+			strcat(monitor, ".monitor");
+
+			bfree(data->device);
+			data->device = bstrdup(monitor);
+
+			blog(LOG_DEBUG, "Default output device: '%s'", data->device);
+			bfree(monitor);
+		}
+	}
+
 	pulse_signal(0);
 }
 
@@ -374,6 +394,12 @@
 		pulse_get_sink_info_list(pulse_output_info, (void *) devices);
 	pulse_unref();
 
+	size_t count = obs_property_list_item_count(devices);
+
+	if (count > 0)
+		obs_property_list_insert_string(devices, 0,
+				obs_module_text("Default"), "default");
+
 	return props;
 }
 
@@ -392,60 +418,11 @@
 }
 
 /**
- * Server info callback
- */
-static void pulse_input_device(pa_context *c, const pa_server_info *i,
-	void *userdata)
-{
-	UNUSED_PARAMETER(c);
-	obs_data_t *settings = (obs_data_t*) userdata;
-
-	obs_data_set_default_string(settings, "device_id",
-		i->default_source_name);
-	blog(LOG_DEBUG, "Default input device: '%s'", i->default_source_name);
-
-	pulse_signal(0);
-}
-
-static void pulse_output_device(pa_context *c, const pa_server_info *i,
-	void *userdata)
-{
-	UNUSED_PARAMETER(c);
-	obs_data_t *settings = (obs_data_t*) userdata;
-
-	char *monitor = bzalloc(strlen(i->default_sink_name) + 9);
-	strcat(monitor, i->default_sink_name);
-	strcat(monitor, ".monitor");
-
-	obs_data_set_default_string(settings, "device_id", monitor);
-	blog(LOG_DEBUG, "Default output device: '%s'", monitor);
-	bfree(monitor);
-
-	pulse_signal(0);
-}
-
-/**
  * Get plugin defaults
  */
-static void pulse_defaults(obs_data_t *settings, bool input)
+static void pulse_defaults(obs_data_t *settings)
 {
-	pulse_init();
-
-	pa_server_info_cb_t cb = (input)
-		? pulse_input_device : pulse_output_device;
-	pulse_get_server_info(cb, (void *) settings);
-
-	pulse_unref();
-}
-
-static void pulse_input_defaults(obs_data_t *settings)
-{
-	return pulse_defaults(settings, true);
-}
-
-static void pulse_output_defaults(obs_data_t *settings)
-{
-	return pulse_defaults(settings, false);
+	obs_data_set_default_string(settings, "device_id", "default");
 }
 
 /**
@@ -510,10 +487,11 @@
 /**
  * Create the plugin object
  */
-static void *pulse_create(obs_data_t *settings, obs_source_t *source)
+static void *pulse_create(obs_data_t *settings, obs_source_t *source, bool input)
 {
 	struct pulse_data *data = bzalloc(sizeof(struct pulse_data));
 
+	data->input    = input;
 	data->source   = source;
 
 	pulse_init();
@@ -522,16 +500,26 @@
 	return data;
 }
 
+static void *pulse_input_create(obs_data_t *settings, obs_source_t *source)
+{
+	return pulse_create(settings, source, true);
+}
+
+static void *pulse_output_create(obs_data_t *settings, obs_source_t *source)
+{
+	return pulse_create(settings, source, false);
+}
+
 struct obs_source_info pulse_input_capture = {
 	.id             = "pulse_input_capture",
 	.type           = OBS_SOURCE_TYPE_INPUT,
 	.output_flags   = OBS_SOURCE_AUDIO |
 	                  OBS_SOURCE_DO_NOT_DUPLICATE,
 	.get_name       = pulse_input_getname,
-	.create         = pulse_create,
+	.create         = pulse_input_create,
 	.destroy        = pulse_destroy,
 	.update         = pulse_update,
-	.get_defaults   = pulse_input_defaults,
+	.get_defaults   = pulse_defaults,
 	.get_properties = pulse_input_properties
 };
 
@@ -542,9 +530,9 @@
 	                  OBS_SOURCE_DO_NOT_DUPLICATE |
 	                  OBS_SOURCE_DO_NOT_SELF_MONITOR,
 	.get_name       = pulse_output_getname,
-	.create         = pulse_create,
+	.create         = pulse_output_create,
 	.destroy        = pulse_destroy,
 	.update         = pulse_update,
-	.get_defaults   = pulse_output_defaults,
+	.get_defaults   = pulse_defaults,
 	.get_properties = pulse_output_properties
 };

obs-studio-20.1.1.tar.xz/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c -> obs-studio-20.1.3.tar.xz/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c Changed

obs-studio-20.1.1.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-audio-encoders.c -> obs-studio-20.1.3.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-audio-encoders.c Changed

obs-studio-20.1.1.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-compat.h -> obs-studio-20.1.3.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-compat.h Changed

obs-studio-20.1.1.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-output.c -> obs-studio-20.1.3.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-output.c Changed

obs-studio-20.1.1.tar.xz/plugins/win-capture/graphics-hook/gl-capture.c -> obs-studio-20.1.3.tar.xz/plugins/win-capture/graphics-hook/gl-capture.c Changed

obs-studio-20.1.1.tar.xz/plugins/win-dshow/ffmpeg-decode.c -> obs-studio-20.1.3.tar.xz/plugins/win-dshow/ffmpeg-decode.c Changed

@@ -16,6 +16,7 @@
 ******************************************************************************/
 
 #include "ffmpeg-decode.h"
+#include "obs-ffmpeg-compat.h"
 #include <obs-avc.h>
 
 int ffmpeg_decode_init(struct ffmpeg_decode *decode, enum AVCodecID id)
@@ -37,8 +38,8 @@
 		return ret;
 	}
 
-	if (decode->codec->capabilities & CODEC_CAP_TRUNCATED)
-		decode->decoder->flags |= CODEC_FLAG_TRUNCATED;
+	if (decode->codec->capabilities & CODEC_CAP_TRUNC)
+		decode->decoder->flags |= CODEC_FLAG_TRUNC;
 
 	return 0;
 }
@@ -96,7 +97,7 @@
 static inline void copy_data(struct ffmpeg_decode *decode, uint8_t *data,
 		size_t size)
 {
-	size_t new_size = size + FF_INPUT_BUFFER_PADDING_SIZE;
+	size_t new_size = size + INPUT_BUFFER_PADDING_SIZE;
 
 	if (decode->packet_size < new_size) {
 		decode->packet_buffer = brealloc(decode->packet_buffer,
@@ -104,7 +105,7 @@
 		decode->packet_size   = new_size;
 	}
 
-	memset(decode->packet_buffer + size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
+	memset(decode->packet_buffer + size, 0, INPUT_BUFFER_PADDING_SIZE);
 	memcpy(decode->packet_buffer, data, size);
 }

Build Results
RPM Lint

Refresh

Comments for request 4040 0

Request History

boombatower created request over 6 years ago

boombatower accepted request over 6 years ago