Request 5044 (accepted)

Overview

Request 5044 (accepted)

- Update to version 25.0.2:
* linux-v4l2: readonly controls cause infinite loop
* libobs: Update version to 25.0.2 (linux hotfix)
* UI: Set correct window title for fullscreen projector
* CI: Update Linux CI from Ubuntu 16.04 to 18.04
* UI: Make links in updater clickable
* obs-filters: Fix LUT file extension filter on Linux
* win-wasapi: Fix leaking IPropertyStore
* win-wasapi: Fix crash on certain devices
* obs-qsv11: Fix target usage values
* UI: Fix crash on settings update
* libobs: Add move assignment operator for BPtr
* libobs: Fix missing assignment operator return
* libobs: Fix size mismatch warning
* libobs: Handle noexcept warnings
* UI: Make Importer destructor virtual
* UI: Add setting for Mixer add-on choice
* linux-capture: Use RandR monitors for screen information

Created by boombatower about 4 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

@@ -1,4 +1,26 @@
 -------------------------------------------------------------------
+Mon Mar 23 16:10:08 UTC 2020 - jimmy@boombatower.com
+
+- Update to version 25.0.2:
+  * linux-v4l2: readonly controls cause infinite loop
+  * libobs: Update version to 25.0.2 (linux hotfix)
+  * UI: Set correct window title for fullscreen projector
+  * CI: Update Linux CI from Ubuntu 16.04 to 18.04
+  * UI: Make links in updater clickable
+  * obs-filters: Fix LUT file extension filter on Linux
+  * win-wasapi: Fix leaking IPropertyStore
+  * win-wasapi: Fix crash on certain devices
+  * obs-qsv11: Fix target usage values
+  * UI: Fix crash on settings update
+  * libobs: Add move assignment operator for BPtr
+  * libobs: Fix missing assignment operator return
+  * libobs: Fix size mismatch warning
+  * libobs: Handle noexcept warnings
+  * UI: Make Importer destructor virtual
+  * UI: Add setting for Mixer add-on choice
+  * linux-capture: Use RandR monitors for screen information
+
+-------------------------------------------------------------------
 Thu Mar 19 19:26:37 UTC 2020 - jimmy@boombatower.com
 
 - Update to version 25.0.1:

obs-studio.spec Changed

_service Changed

_servicedata Changed

obs-studio-25.0.1.tar.xz/UI/auth-mixer.cpp -> obs-studio-25.0.2.tar.xz/UI/auth-mixer.cpp Changed

obs-studio-25.0.1.tar.xz/UI/data/locale/en-US.ini -> obs-studio-25.0.2.tar.xz/UI/data/locale/en-US.ini Changed

obs-studio-25.0.1.tar.xz/UI/forms/OBSBasicSettings.ui -> obs-studio-25.0.2.tar.xz/UI/forms/OBSBasicSettings.ui Changed

@@ -151,8 +151,8 @@
              <rect>
               <x>0</x>
               <y>0</y>
-              <width>806</width>
-              <height>1254</height>
+              <width>803</width>
+              <height>1026</height>
              </rect>
             </property>
             <layout class="QVBoxLayout" name="verticalLayout_19">
@@ -1140,7 +1140,7 @@
                </property>
               </widget>
              </item>
-             <item row="8" column="0">
+             <item row="9" column="0">
               <widget class="QLabel" name="authUsernameLabel">
                <property name="text">
                 <string>Basic.Settings.Stream.Custom.Username</string>
@@ -1150,10 +1150,10 @@
                </property>
               </widget>
              </item>
-             <item row="8" column="1">
+             <item row="9" column="1">
               <widget class="QLineEdit" name="authUsername"/>
              </item>
-             <item row="9" column="0">
+             <item row="10" column="0">
               <widget class="QLabel" name="authPwLabel">
                <property name="text">
                 <string>Basic.Settings.Stream.Custom.Password</string>
@@ -1163,7 +1163,7 @@
                </property>
               </widget>
              </item>
-             <item row="9" column="1">
+             <item row="10" column="1">
               <widget class="QWidget" name="authPwWidget" native="true">
                <layout class="QHBoxLayout" name="horizontalLayout_25">
                 <property name="leftMargin">
@@ -1208,6 +1208,19 @@
                </property>
               </widget>
              </item>
+             <item row="8" column="0">
+              <widget class="QLabel" name="mixerAddonLabel">
+               <property name="text">
+                <string>Basic.Settings.Stream.MixerAddon</string>
+               </property>
+               <property name="buddy">
+                <cstring>mixerAddonDropdown</cstring>
+               </property>
+              </widget>
+             </item>
+             <item row="8" column="1">
+              <widget class="QComboBox" name="mixerAddonDropdown"/>
+             </item>
             </layout>
            </widget>
           </widget>
@@ -1244,8 +1257,8 @@
              <rect>
               <x>0</x>
               <y>0</y>
-              <width>813</width>
-              <height>761</height>
+              <width>603</width>
+              <height>631</height>
              </rect>
             </property>
             <layout class="QVBoxLayout" name="verticalLayout_21">
@@ -3753,8 +3766,8 @@
              <rect>
               <x>0</x>
               <y>0</y>
-              <width>767</width>
-              <height>582</height>
+              <width>555</width>
+              <height>469</height>
              </rect>
             </property>
             <layout class="QVBoxLayout" name="verticalLayout_50">
@@ -4609,8 +4622,8 @@
              <rect>
               <x>0</x>
               <y>0</y>
-              <width>791</width>
-              <height>970</height>
+              <width>596</width>
+              <height>781</height>
              </rect>
             </property>
             <layout class="QVBoxLayout" name="verticalLayout_23">

obs-studio-25.0.1.tar.xz/UI/forms/OBSUpdate.ui -> obs-studio-25.0.2.tar.xz/UI/forms/OBSUpdate.ui Changed

obs-studio-25.0.1.tar.xz/UI/importers/importers.hpp -> obs-studio-25.0.2.tar.xz/UI/importers/importers.hpp Changed

obs-studio-25.0.1.tar.xz/UI/window-basic-settings-stream.cpp -> obs-studio-25.0.2.tar.xz/UI/window-basic-settings-stream.cpp Changed

@@ -41,6 +41,8 @@
 	ui->bandwidthTestEnable->setVisible(false);
 	ui->twitchAddonDropdown->setVisible(false);
 	ui->twitchAddonLabel->setVisible(false);
+	ui->mixerAddonDropdown->setVisible(false);
+	ui->mixerAddonLabel->setVisible(false);
 
 	int vertSpacing = ui->topStreamLayout->verticalSpacing();
 
@@ -67,6 +69,11 @@
 	ui->twitchAddonDropdown->addItem(
 		QTStr("Basic.Settings.Stream.TTVAddon.Both"));
 
+	ui->mixerAddonDropdown->addItem(
+		QTStr("Basic.Settings.Stream.MixerAddon.None"));
+	ui->mixerAddonDropdown->addItem(
+		QTStr("Basic.Settings.Stream.MixerAddon.MEE"));
+
 	connect(ui->service, SIGNAL(currentIndexChanged(int)), this,
 		SLOT(UpdateServerList()));
 	connect(ui->service, SIGNAL(currentIndexChanged(int)), this,
@@ -112,6 +119,9 @@
 
 		idx = config_get_int(main->Config(), "Twitch", "AddonChoice");
 		ui->twitchAddonDropdown->setCurrentIndex(idx);
+
+		idx = config_get_int(main->Config(), "Mixer", "AddonChoice");
+		ui->mixerAddonDropdown->setCurrentIndex(idx);
 	}
 
 	UpdateServerList();
@@ -189,6 +199,19 @@
 		if (choiceExists && currentChoice != newChoice)
 			forceAuthReload = true;
 	}
+	if (!!auth && strcmp(auth->service(), "Mixer") == 0) {
+		bool choiceExists = config_has_user_value(
+			main->Config(), "Mixer", "AddonChoice");
+		int currentChoice =
+			config_get_int(main->Config(), "Mixer", "AddonChoice");
+		int newChoice = ui->mixerAddonDropdown->currentIndex();
+
+		config_set_int(main->Config(), "Mixer", "AddonChoice",
+			       newChoice);
+
+		if (choiceExists && currentChoice != newChoice)
+			forceAuthReload = true;
+	}
 
 	obs_data_set_string(settings, "key", QT_TO_UTF8(ui->key->text()));
 
@@ -309,6 +332,8 @@
 	ui->bandwidthTestEnable->setVisible(false);
 	ui->twitchAddonDropdown->setVisible(false);
 	ui->twitchAddonLabel->setVisible(false);
+	ui->mixerAddonDropdown->setVisible(false);
+	ui->mixerAddonLabel->setVisible(false);
 
 #ifdef BROWSER_AVAILABLE
 	if (cef) {
@@ -467,6 +492,10 @@
 			ui->twitchAddonLabel->setVisible(true);
 			ui->twitchAddonDropdown->setVisible(true);
 		}
+		if (strcmp(a->service(), "Mixer") == 0) {
+			ui->mixerAddonLabel->setVisible(true);
+			ui->mixerAddonDropdown->setVisible(true);
+		}
 	}
 
 	ui->streamStackWidget->setCurrentIndex((int)Section::StreamKey);

obs-studio-25.0.1.tar.xz/UI/window-basic-settings.cpp -> obs-studio-25.0.2.tar.xz/UI/window-basic-settings.cpp Changed

obs-studio-25.0.1.tar.xz/UI/window-projector.cpp -> obs-studio-25.0.2.tar.xz/UI/window-projector.cpp Changed

obs-studio-25.0.1.tar.xz/azure-pipelines.yml -> obs-studio-25.0.2.tar.xz/azure-pipelines.yml Changed

obs-studio-25.0.1.tar.xz/libobs/obs-config.h -> obs-studio-25.0.2.tar.xz/libobs/obs-config.h Changed

obs-studio-25.0.1.tar.xz/libobs/obs-source.c -> obs-studio-25.0.2.tar.xz/libobs/obs-source.c Changed

obs-studio-25.0.1.tar.xz/libobs/obs.hpp -> obs-studio-25.0.2.tar.xz/libobs/obs.hpp Changed

obs-studio-25.0.1.tar.xz/libobs/util/util.hpp -> obs-studio-25.0.2.tar.xz/libobs/util/util.hpp Changed

@@ -20,6 +20,7 @@
 
 #include <string.h>
 #include <stdarg.h>
+#include <utility>
 
 #include "bmem.h"
 #include "config-file.h"
@@ -36,7 +37,7 @@
 
 public:
 	inline BPtr(T *p = nullptr) : ptr(p) {}
-	inline BPtr(BPtr &&other) : ptr(other.ptr) { other.ptr = nullptr; }
+	inline BPtr(BPtr &&other) { *this = std::move(other); }
 	inline ~BPtr() { bfree(ptr); }
 
 	inline T *operator=(T *p)
@@ -45,6 +46,14 @@
 		ptr = p;
 		return p;
 	}
+
+	inline BPtr &operator=(BPtr &&other)
+	{
+		ptr = other.ptr;
+		other.ptr = nullptr;
+		return *this;
+	}
+
 	inline operator T *() { return ptr; }
 	inline T **operator&()
 	{
@@ -68,7 +77,7 @@
 
 public:
 	inline ConfigFile() : config(NULL) {}
-	inline ConfigFile(ConfigFile &&other) : config(other.config)
+	inline ConfigFile(ConfigFile &&other) noexcept : config(other.config)
 	{
 		other.config = nullptr;
 	}
@@ -120,7 +129,7 @@
 
 public:
 	inline TextLookup(lookup_t *lookup = nullptr) : lookup(lookup) {}
-	inline TextLookup(TextLookup &&other) : lookup(other.lookup)
+	inline TextLookup(TextLookup &&other) noexcept : lookup(other.lookup)
 	{
 		other.lookup = nullptr;
 	}

obs-studio-25.0.1.tar.xz/libobs/util/windows/CoTaskMemPtr.hpp -> obs-studio-25.0.2.tar.xz/libobs/util/windows/CoTaskMemPtr.hpp Changed

obs-studio-25.0.1.tar.xz/plugins/linux-capture/xhelpers.c -> obs-studio-25.0.2.tar.xz/plugins/linux-capture/xhelpers.c Changed

@@ -104,6 +104,22 @@
 	return true;
 }
 
+static bool randr_has_monitors(xcb_connection_t *xcb)
+{
+	xcb_randr_query_version_cookie_t ver_c;
+	xcb_randr_query_version_reply_t *ver_r;
+
+	ver_c = xcb_randr_query_version(xcb, XCB_RANDR_MAJOR_VERSION,
+					XCB_RANDR_MINOR_VERSION);
+	ver_r = xcb_randr_query_version_reply(xcb, ver_c, 0);
+	if (!ver_r)
+		return 0;
+
+	bool ret = ver_r->major_version > 1 || ver_r->minor_version >= 5;
+	free(ver_r);
+	return ret;
+}
+
 int randr_screen_count(xcb_connection_t *xcb)
 {
 	if (!xcb)
@@ -111,6 +127,19 @@
 	xcb_screen_t *screen;
 	screen = xcb_setup_roots_iterator(xcb_get_setup(xcb)).data;
 
+	if (randr_has_monitors(xcb)) {
+		xcb_randr_get_monitors_cookie_t mon_c;
+		xcb_randr_get_monitors_reply_t *mon_r;
+
+		mon_c = xcb_randr_get_monitors(xcb, screen->root, true);
+		mon_r = xcb_randr_get_monitors_reply(xcb, mon_c, 0);
+		if (!mon_r)
+			return 0;
+
+		int count = xcb_randr_get_monitors_monitors_length(mon_r);
+		free(mon_r);
+		return count;
+	}
 	xcb_randr_get_screen_resources_cookie_t res_c;
 	xcb_randr_get_screen_resources_reply_t *res_r;
 
@@ -124,11 +153,58 @@
 
 int randr_screen_geo(xcb_connection_t *xcb, int_fast32_t screen,
 		     int_fast32_t *x, int_fast32_t *y, int_fast32_t *w,
-		     int_fast32_t *h, xcb_screen_t **rscreen)
+		     int_fast32_t *h, xcb_screen_t **rscreen, char **name)
 {
 	xcb_screen_t *xscreen;
 	xscreen = xcb_setup_roots_iterator(xcb_get_setup(xcb)).data;
 
+	if (randr_has_monitors(xcb)) {
+		xcb_randr_get_monitors_cookie_t mon_c;
+		xcb_randr_get_monitors_reply_t *mon_r;
+
+		mon_c = xcb_randr_get_monitors(xcb, xscreen->root, true);
+		mon_r = xcb_randr_get_monitors_reply(xcb, mon_c, 0);
+		if (!mon_r)
+			return 0;
+
+		int monitors = xcb_randr_get_monitors_monitors_length(mon_r);
+		if (screen < 0 || screen >= monitors) {
+			free(mon_r);
+			goto fail;
+		}
+
+		xcb_randr_monitor_info_iterator_t mon_i;
+		mon_i = xcb_randr_get_monitors_monitors_iterator(mon_r);
+
+		int s;
+		for (s = 0; s < screen; s++)
+			xcb_randr_monitor_info_next(&mon_i);
+
+		xcb_randr_monitor_info_t *mon = mon_i.data;
+
+		*x = mon->x;
+		*y = mon->y;
+		*w = mon->width;
+		*h = mon->height;
+		if (rscreen)
+			*rscreen = xscreen;
+
+		if (mon->name && name) {
+			xcb_get_atom_name_cookie_t atom_c;
+			xcb_get_atom_name_reply_t *atom_r;
+
+			atom_c = xcb_get_atom_name(xcb, mon->name);
+			atom_r = xcb_get_atom_name_reply(xcb, atom_c, 0);
+			if (atom_r) {
+				*name = strndup(
+					xcb_get_atom_name_name(atom_r),
+					xcb_get_atom_name_name_length(atom_r));
+				free(atom_r);
+			}
+		}
+		free(mon_r);
+		return 0;
+	}
 	xcb_randr_get_screen_resources_cookie_t res_c;
 	xcb_randr_get_screen_resources_reply_t *res_r;

obs-studio-25.0.1.tar.xz/plugins/linux-capture/xhelpers.h -> obs-studio-25.0.2.tar.xz/plugins/linux-capture/xhelpers.h Changed

obs-studio-25.0.1.tar.xz/plugins/linux-capture/xshm-input.c -> obs-studio-25.0.2.tar.xz/plugins/linux-capture/xshm-input.c Changed

@@ -104,7 +104,7 @@
 	if (data->use_randr) {
 		if (randr_screen_geo(data->xcb, data->screen_id, &data->x_org,
 				     &data->y_org, &data->width, &data->height,
-				     &data->xcb_screen) < 0) {
+				     &data->xcb_screen, NULL) < 0) {
 			return -1;
 		}
 	} else if (data->use_xinerama) {
@@ -308,21 +308,31 @@
 				  : xcb_setup_roots_length(xcb_get_setup(xcb));
 
 	for (int_fast32_t i = 0; i < count; ++i) {
+		char *name;
+		char name_tmp[12];
 		int_fast32_t x, y, w, h;
 		x = y = w = h = 0;
 
+		name = NULL;
 		if (randr)
-			randr_screen_geo(xcb, i, &x, &y, &w, &h, NULL);
+			randr_screen_geo(xcb, i, &x, &y, &w, &h, NULL, &name);
 		else if (xinerama)
 			xinerama_screen_geo(xcb, i, &x, &y, &w, &h);
 		else
 			x11_screen_geo(xcb, i, &w, &h);
 
+		if (name == NULL) {
+			sprintf(name_tmp, "%" PRIuFAST32, i);
+			name = name_tmp;
+		}
+
 		dstr_printf(&screen_info,
-			    "Screen %" PRIuFAST32 " (%" PRIuFAST32
-			    "x%" PRIuFAST32 " @ %" PRIuFAST32 ",%" PRIuFAST32
-			    ")",
-			    i, w, h, x, y);
+			    "Screen %s (%" PRIuFAST32 "x%" PRIuFAST32
+			    " @ %" PRIuFAST32 ",%" PRIuFAST32 ")",
+			    name, w, h, x, y);
+
+		if (name != name_tmp)
+			free(name);
 
 		if (h > 0 && w > 0)
 			obs_property_list_add_int(screens, screen_info.array,

obs-studio-25.0.1.tar.xz/plugins/linux-v4l2/v4l2-controls.c -> obs-studio-25.0.2.tar.xz/plugins/linux-v4l2/v4l2-controls.c Changed

obs-studio-25.0.1.tar.xz/plugins/obs-filters/color-grade-filter.c -> obs-studio-25.0.2.tar.xz/plugins/obs-filters/color-grade-filter.c Changed

obs-studio-25.0.1.tar.xz/plugins/obs-qsv11/QSV_Encoder.h -> obs-studio-25.0.2.tar.xz/plugins/obs-qsv11/QSV_Encoder.h Changed

obs-studio-25.0.1.tar.xz/plugins/win-wasapi/win-wasapi.cpp -> obs-studio-25.0.2.tar.xz/plugins/win-wasapi/win-wasapi.cpp Changed

Build Results
RPM Lint

Refresh

Comments for request 5044 0

Request History

boombatower created request about 4 years ago

boombatower accepted request about 4 years ago