Changes of Revision 76
obs-studio.changes
Changed
x
1
2
-------------------------------------------------------------------3
+Tue Mar 24 15:03:52 UTC 2020 - jimmy@boombatower.com4
+5
+- Update to version 25.0.3:6
+ * libobs: Update to 25.0.3 (linux hotfix once again)7
+ * linux-v4l2: Fixup invalid id8
+ * libobs-d3d11: Log device PCI IDs9
+ * obs-outputs: Fix mbed TLS build issues10
+11
+-------------------------------------------------------------------12
Mon Mar 23 16:10:08 UTC 2020 - jimmy@boombatower.com13
14
- Update to version 25.0.2:15
obs-studio.spec
Changed
8
1
2
Name: obs-studio3
-Version: 25.0.24
+Version: 25.0.35
Release: 06
Summary: A recording/broadcasting program7
Group: Productivity/Multimedia/Video/Editors and Convertors8
_service
Changed
10
1
2
<services>3
<service name="tar_scm" mode="disabled">4
<param name="versionformat">@PARENT_TAG@</param>5
- <param name="revision">refs/tags/25.0.2</param>6
+ <param name="revision">refs/tags/25.0.3</param>7
<param name="url">git://github.com/jp9000/obs-studio.git</param>8
<param name="scm">git</param>9
<param name="changesgenerate">enable</param>10
_servicedata
Changed
9
1
2
<servicedata>3
<service name="tar_scm">4
<param name="url">git://github.com/jp9000/obs-studio.git</param>5
- <param name="changesrevision">a0e8adbc42df198f95c3778335e4a883e0c2fd09</param>6
+ <param name="changesrevision">3c78a8aa8d5f5c3fd0242697c06582dc96daa012</param>7
</service>8
</servicedata>9
obs-studio-25.0.2.tar.xz/libobs-d3d11/d3d11-subsystem.cpp -> obs-studio-25.0.3.tar.xz/libobs-d3d11/d3d11-subsystem.cpp
Changed
10
1
2
desc.DedicatedVideoMemory);3
blog(LOG_INFO, "\t Shared VRAM: %u",4
desc.SharedSystemMemory);5
+ blog(LOG_INFO, "\t PCI ID: %x:%x", desc.VendorId,6
+ desc.DeviceId);7
8
/* driver version */9
LARGE_INTEGER umd;10
obs-studio-25.0.2.tar.xz/libobs/obs-config.h -> obs-studio-25.0.3.tar.xz/libobs/obs-config.h
Changed
10
1
2
*3
* Reset to zero each major or minor version4
*/5
-#define LIBOBS_API_PATCH_VER 26
+#define LIBOBS_API_PATCH_VER 37
8
#define MAKE_SEMANTIC_VERSION(major, minor, patch) \9
((major << 24) | (minor << 16) | patch)10
obs-studio-25.0.2.tar.xz/plugins/linux-v4l2/v4l2-controls.c -> obs-studio-25.0.3.tar.xz/plugins/linux-v4l2/v4l2-controls.c
Changed
118
1
2
return 0;3
}4
5
+#define INVALID_CONTROL_FLAGS \6
+ (V4L2_CTRL_FLAG_DISABLED | V4L2_CTRL_FLAG_READ_ONLY | \7
+ V4L2_CTRL_FLAG_VOLATILE)8
+9
+static inline bool valid_control(struct v4l2_queryctrl *qctrl)10
+{11
+ return (qctrl->flags & INVALID_CONTROL_FLAGS) == 0;12
+}13
+14
+static inline bool add_control_property(obs_properties_t *props,15
+ obs_data_t *settings, int_fast32_t dev,16
+ struct v4l2_queryctrl *qctrl)17
+{18
+ obs_property_t *prop = NULL;19
+20
+ if (!valid_control(qctrl)) {21
+ return;22
+ }23
+24
+ switch (qctrl->type) {25
+ case V4L2_CTRL_TYPE_INTEGER:26
+ prop = obs_properties_add_int_slider(27
+ props, (char *)qctrl->name, (char *)qctrl->name,28
+ qctrl->minimum, qctrl->maximum, qctrl->step);29
+ obs_data_set_default_int(settings, (char *)qctrl->name,30
+ qctrl->default_value);31
+ obs_property_set_modified_callback2(prop, v4l2_control_changed,32
+ UINT_TO_POINTER(qctrl->id));33
+ break;34
+ case V4L2_CTRL_TYPE_BOOLEAN:35
+ prop = obs_properties_add_bool(props, (char *)qctrl->name,36
+ (char *)qctrl->name);37
+ obs_data_set_default_bool(settings, (char *)qctrl->name,38
+ qctrl->default_value);39
+ obs_property_set_modified_callback2(prop, v4l2_control_changed,40
+ UINT_TO_POINTER(qctrl->id));41
+ break;42
+ case V4L2_CTRL_TYPE_MENU:43
+ case V4L2_CTRL_TYPE_INTEGER_MENU:44
+ v4l2_update_controls_menu(dev, props, qctrl);45
+ obs_data_set_default_int(settings, (char *)qctrl->name,46
+ qctrl->default_value);47
+ blog(LOG_INFO, "setting default for %s to %d",48
+ (char *)qctrl->name, qctrl->default_value);49
+ break;50
+ }51
+}52
+53
int_fast32_t v4l2_update_controls(int_fast32_t dev, obs_properties_t *props,54
obs_data_t *settings)55
{56
struct v4l2_queryctrl qctrl;57
- obs_property_t *prop = NULL;58
59
if (!dev || !props)60
return -1;61
62
memset(&qctrl, 0, sizeof(qctrl));63
qctrl.id = V4L2_CTRL_FLAG_NEXT_CTRL;64
while (0 == v4l2_ioctl(dev, VIDIOC_QUERYCTRL, &qctrl)) {65
+ add_control_property(props, settings, dev, &qctrl);66
qctrl.id |= V4L2_CTRL_FLAG_NEXT_CTRL;67
-68
- if (qctrl.flags & V4L2_CTRL_FLAG_DISABLED) {69
- blog(LOG_INFO, "found control %s but it is disabled",70
- qctrl.name);71
- continue;72
- }73
-74
- if (qctrl.flags & V4L2_CTRL_FLAG_READ_ONLY) {75
- blog(LOG_INFO, "found control %s but it is readonly",76
- qctrl.name);77
- continue;78
- }79
-80
- if (qctrl.flags & V4L2_CTRL_FLAG_VOLATILE) {81
- blog(LOG_INFO, "found control %s but it is volatile",82
- qctrl.name);83
- continue;84
- }85
-86
- switch (qctrl.type) {87
- case V4L2_CTRL_TYPE_INTEGER:88
- prop = obs_properties_add_int_slider(89
- props, (char *)qctrl.name, (char *)qctrl.name,90
- qctrl.minimum, qctrl.maximum, qctrl.step);91
- obs_data_set_default_int(settings, (char *)qctrl.name,92
- qctrl.default_value);93
- obs_property_set_modified_callback2(94
- prop, v4l2_control_changed,95
- UINT_TO_POINTER(qctrl.id));96
- break;97
- case V4L2_CTRL_TYPE_BOOLEAN:98
- prop = obs_properties_add_bool(99
- props, (char *)qctrl.name, (char *)qctrl.name);100
- obs_data_set_default_bool(settings, (char *)qctrl.name,101
- qctrl.default_value);102
- obs_property_set_modified_callback2(103
- prop, v4l2_control_changed,104
- UINT_TO_POINTER(qctrl.id));105
- break;106
- case V4L2_CTRL_TYPE_MENU:107
- case V4L2_CTRL_TYPE_INTEGER_MENU:108
- v4l2_update_controls_menu(dev, props, &qctrl);109
- obs_data_set_default_int(settings, (char *)qctrl.name,110
- qctrl.default_value);111
- blog(LOG_INFO, "setting default for %s to %d",112
- (char *)qctrl.name, qctrl.default_value);113
- break;114
- }115
}116
117
return 0;118
obs-studio-25.0.2.tar.xz/plugins/obs-outputs/librtmp/rtmp.c -> obs-studio-25.0.3.tar.xz/plugins/obs-outputs/librtmp/rtmp.c
Changed
10
1
2
#if defined(USE_MBEDTLS)3
typedef mbedtls_md5_context MD5_CTX;4
5
-#if MBEDTLS_VERSION_NUMBER >= 0x020400006
+#if MBEDTLS_VERSION_NUMBER >= 0x020700007
#define MD5_Init(ctx) mbedtls_md5_init(ctx); mbedtls_md5_starts_ret(ctx)8
#define MD5_Update(ctx,data,len) mbedtls_md5_update_ret(ctx,(unsigned char *)data,len)9
#define MD5_Final(dig,ctx) mbedtls_md5_finish_ret(ctx,dig); mbedtls_md5_free(ctx)10
obs-studio-25.0.2.tar.xz/plugins/obs-outputs/librtmp/rtmp.h -> obs-studio-25.0.3.tar.xz/plugins/obs-outputs/librtmp/rtmp.h
Changed
24
1
2
#define TLS_shutdown(s) gnutls_bye(s, GNUTLS_SHUT_RDWR)3
#define TLS_close(s) gnutls_deinit(s)4
5
-#elif defined(USE_ONLY_MD5)6
-#include "md5.h"7
-#include "cencode.h"8
-#define MD5_DIGEST_LENGTH 169
-10
#else /* USE_OPENSSL */11
#define TLS_CTX SSL_CTX *12
#define TLS_client(ctx,s) s = SSL_new(ctx)13
14
#define TLS_close(s) SSL_free(s)15
16
#endif17
+#elif defined(USE_ONLY_MD5)18
+#include "md5.h"19
+#include "cencode.h"20
+#define MD5_DIGEST_LENGTH 1621
#endif22
23
#ifdef __cplusplus24