Projects
home:darix:branches:Multimedia
obs-studio
Sign Up
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 2
View file
obs-studio.changes
Changed
@@ -1,4 +1,29 @@ ------------------------------------------------------------------- +Fri Nov 20 17:12:40 UTC 2026 - darix <packman@nordisch.org> + +- Update to version 33.0.2: + * libobs: Fix improper return value + * libobs: Update version to 33.0.2 + * libobs: Fix duplicated group names + * obs-browser: Update version to 2.27.6 + * cmake, build-aux: Use v2 of CEF 150 to fix various issues + * cmake: Copy WebGPU DLLs for obs-browser + * virtualcam-module: Make placeholder initialization thread-safe + * shared: Close child dialogs on properties refresh + * virtualcam-module: Improve lock tracking for DLL unloading + * decklink: Fix frequent audio dropouts on output + * frontend: Fix repeated log entries + * win-dshow: Close device dialogs during shutdown + * libobs,frontend: Load vertex and index buffers before drawing + * libobs-d3d11: Fix crashes from stale vertex buffer data + * frontend: Fix blank projectors on startup + * frontend: Fix YT AutoStop copying AutoStart value SaveSettings incorrectly passed the AutoStart value to the AutoStop parameter in the config_set_bool call, when remember settings was activated in the YouTube manage broadcast window. + * frontend: Fix spinbox crash + * cmake: Populate Bluetooth usage Plist description + * mac-capture: Don't try to use 64RGBAHalf on Intel systems + * obs-outputs: Fix Hybrid MP4 not splitting by time + +------------------------------------------------------------------- Thu Nov 12 14:26:22 UTC 2026 - darix <packman@nordisch.org> - Fix BuildRequires for mbedtls to make it build on 16.x
View file
obs-studio.spec
Changed
@@ -47,7 +47,7 @@ %endif Name: obs-studio -Version: 33.0.1 +Version: 33.0.2 Release: 0 Summary: A recording/broadcasting program Group: Productivity/Multimedia/Video/Editors and Convertors
View file
_service
Changed
@@ -1,7 +1,7 @@ <services> <service name="tar_scm" mode="manual"> <param name="versionformat">@PARENT_TAG@</param> - <param name="revision">33.0.1</param> + <param name="revision">33.0.2</param> <param name="url">https://github.com/obsproject/obs-studio.git</param> <param name="versionrewrite-pattern">(\.\d+)-(a-z.*)</param> <param name="versionrewrite-replacement">\1~\2</param>
View file
_servicedata
Changed
@@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/obsproject/obs-studio.git</param> - <param name="changesrevision">65c320b46e1af5c7a555161aea6182cdf7a8c524</param> + <param name="changesrevision">3047d4a4fd5cc32767338a6dd218ada532f51043</param> </service> </servicedata> \ No newline at end of file
View file
obs-studio-33.0.1.tar.xz/CMakePresets.json -> obs-studio-33.0.2.tar.xz/CMakePresets.json
Changed
@@ -56,14 +56,21 @@ "baseUrl": "https://cdn-fastly.obsproject.com/downloads", "label": "Chromium Embedded Framework", "hashes": { - "macos-x86_64": "980783bba509e7e79a671c29040bbe29d832a934c1368b500a17a22e076eb0f4", - "macos-arm64": "0343233fc462384c2f1f58a4222028bc6171f05948a822241f89df2faa7cee8d", - "ubuntu-x86_64": "8ffc64d06ea74da613eeda7f2aa5d4e98661af6fa3ed8c68724c9a6e4e89ea8e", - "ubuntu-aarch64": "b05cf13b0f482e3b0149ac21268268c536d091b5e6608c742019ebd6c8e8a1e3", - "windows-x64": "54cd191a3f56bb1f05be22b95e1fa8041061b38bd5fe94e0776fb34dd599f341", - "windows-arm64": "3f5b604eab71baab20c08f054d68c6212d06237e172fb8d38271c2384c2eb3a6" + "macos-x86_64": "c3b4ac0dea0afdb46d637fdfbc3c8d5973d8a674678f0b57177f712be19e38d0", + "macos-arm64": "f1693ef12b28df06bbd9ebf215c9fe2d84e3066c220b905e71dc033bd5b6fbfc", + "ubuntu-x86_64": "3f5c74f8c4c4b24dbbe9ff4cff7ba764aa4d0a72127b96976342e4360e435db3", + "ubuntu-aarch64": "a6f04ea5a1a0555d683f2dafa663e0704a0ea954d703dee4cab5ff67ba074ad0", + "windows-x64": "3f120367db3f2314041fef20e67904e5c2c2adf550addbd0e1d2cbbac20a8b9a", + "windows-arm64": "e8b9e07a0d04244ea5c2f4843f5a0ed2c1d6198aba35a84b947ca7b2804cf3dd" }, - "revision": {} + "revision": { + "macos-x86_64": 2, + "macos-arm64": 2, + "ubuntu-x86_64": 2, + "ubuntu-aarch64": 2, + "windows-x64": 2, + "windows-arm64": 2 + } } }, "tools": {
View file
obs-studio-33.0.1.tar.xz/build-aux/com.obsproject.Studio.json -> obs-studio-33.0.2.tar.xz/build-aux/com.obsproject.Studio.json
Changed
@@ -121,8 +121,8 @@ "sources": { "type": "archive", - "url": "https://cdn-fastly.obsproject.com/downloads/cef_binary_7871_linux_x86_64.tar.xz", - "sha256": "8ffc64d06ea74da613eeda7f2aa5d4e98661af6fa3ed8c68724c9a6e4e89ea8e" + "url": "https://cdn-fastly.obsproject.com/downloads/cef_binary_7871_linux_x86_64_v2.tar.xz", + "sha256": "3f5c74f8c4c4b24dbbe9ff4cff7ba764aa4d0a72127b96976342e4360e435db3" } },
View file
obs-studio-33.0.1.tar.xz/cmake/macos/helpers.cmake -> obs-studio-33.0.2.tar.xz/cmake/macos/helpers.cmake
Changed
@@ -69,6 +69,7 @@ INFOPLIST_KEY_NSCameraUsageDescription "OBS needs to access the camera to enable camera sources to work." INFOPLIST_KEY_NSMicrophoneUsageDescription "OBS needs to access the microphone to enable audio input." INFOPLIST_KEY_NSAppleEventsUsageDescription "OBS needs to access background events to enable hotkeys while not in focus." + INFOPLIST_KEY_NSBluetoothAlwaysUsageDescription "A webpage in OBS Studio is trying to access Bluetooth. OBS Studio will never need access. We recommend denying this request." ) get_property(obs_dependencies GLOBAL PROPERTY _OBS_DEPENDENCIES)
View file
obs-studio-33.0.1.tar.xz/cmake/windows/helpers.cmake -> obs-studio-33.0.2.tar.xz/cmake/windows/helpers.cmake
Changed
@@ -121,7 +121,8 @@ COMMAND "${CMAKE_COMMAND}" -E make_directory "${OBS_OUTPUT_DIR}/$<CONFIG>/${target_destination}" COMMAND "${CMAKE_COMMAND}" -E copy_if_different "${imported_location}" "${cef_location}/chrome_elf.dll" - "${cef_location}/libEGL.dll" "${cef_location}/libGLESv2.dll" "${cef_location}/v8_context_snapshot.bin" + "${cef_location}/dxcompiler.dll" "${cef_location}/dxil.dll" "${cef_location}/libEGL.dll" + "${cef_location}/libGLESv2.dll" "${cef_location}/v8_context_snapshot.bin" "${OBS_OUTPUT_DIR}/$<CONFIG>/${target_destination}" COMMAND "${CMAKE_COMMAND}" -E copy_if_different "${cef_root_location}/Resources/chrome_100_percent.pak" @@ -137,6 +138,8 @@ FILES "${imported_location}" "${cef_location}/chrome_elf.dll" + "${cef_location}/dxcompiler.dll" + "${cef_location}/dxil.dll" "${cef_location}/libEGL.dll" "${cef_location}/libGLESv2.dll" "${cef_location}/v8_context_snapshot.bin"
View file
obs-studio-33.0.1.tar.xz/frontend/dialogs/OBSYoutubeActions.cpp -> obs-studio-33.0.2.tar.xz/frontend/dialogs/OBSYoutubeActions.cpp
Changed
@@ -635,7 +635,7 @@ config_set_string(main->activeConfiguration, "YouTube", "Latency", QT_TO_UTF8(broadcast.latency)); config_set_bool(main->activeConfiguration, "YouTube", "MadeForKids", broadcast.made_for_kids); config_set_bool(main->activeConfiguration, "YouTube", "AutoStart", broadcast.auto_start); - config_set_bool(main->activeConfiguration, "YouTube", "AutoStop", broadcast.auto_start); + config_set_bool(main->activeConfiguration, "YouTube", "AutoStop", broadcast.auto_stop); config_set_bool(main->activeConfiguration, "YouTube", "DVR", broadcast.dvr); config_set_bool(main->activeConfiguration, "YouTube", "ScheduleForLater", broadcast.schedul_for_later); config_set_string(main->activeConfiguration, "YouTube", "Projection", QT_TO_UTF8(broadcast.projection));
View file
obs-studio-33.0.1.tar.xz/frontend/obs-main.cpp -> obs-studio-33.0.2.tar.xz/frontend/obs-main.cpp
Changed
@@ -162,9 +162,11 @@ static mutex log_mutex; static const char *last_msg_ptr = nullptr; static int last_char_sum = 0; + static size_t last_len = 0; static int rep_count = 0; int new_sum = sum_chars(output_str); + size_t new_len = strlen(output_str); lock_guard<mutex> guard(log_mutex); @@ -177,6 +179,8 @@ if (diff < MAX_CHAR_VARIATION) { return (rep_count++ >= MAX_REPEATED_LINES); } + } else if (last_len == new_len && last_char_sum == new_sum) { + return (rep_count++ >= MAX_REPEATED_LINES); } if (rep_count > MAX_REPEATED_LINES) { @@ -186,6 +190,7 @@ last_msg_ptr = msg; last_char_sum = new_sum; + last_len = new_len; rep_count = 0; return false;
View file
obs-studio-33.0.1.tar.xz/frontend/utility/display-helpers.hpp -> obs-studio-33.0.2.tar.xz/frontend/utility/display-helpers.hpp
Changed
@@ -130,6 +130,7 @@ transform.y.y = cy; gs_load_vertexbuffer(vb); + gs_load_indexbuffer(nullptr); gs_matrix_push(); gs_matrix_mul(&transform);
View file
obs-studio-33.0.1.tar.xz/frontend/widgets/OBSBasicPreview.cpp -> obs-studio-33.0.2.tar.xz/frontend/widgets/OBSBasicPreview.cpp
Changed
@@ -1902,6 +1902,7 @@ gs_matrix_translate3f(0.0f, -HANDLE_RADIUS * 2 / 3, 0.0f); gs_load_vertexbuffer(circle); + gs_load_indexbuffer(nullptr); gs_draw(GS_TRISTRIP, 0, 0); gs_matrix_pop(); @@ -2217,6 +2218,7 @@ gs_technique_begin_pass(tech, 0); gs_load_vertexbuffer(main->box); + gs_load_indexbuffer(nullptr); gs_effect_set_vec4(colParam, &red); if (selected) { @@ -2288,6 +2290,7 @@ gs_effect_set_vec4(colParam, &fillColor); gs_load_vertexbuffer(rectFill); + gs_load_indexbuffer(nullptr); gs_draw(GS_TRISTRIP, 0, 0); gs_effect_set_vec4(colParam, &borderColor);
View file
obs-studio-33.0.1.tar.xz/frontend/widgets/OBSBasic_Preview.cpp -> obs-studio-33.0.2.tar.xz/frontend/widgets/OBSBasic_Preview.cpp
Changed
@@ -118,6 +118,7 @@ gs_matrix_scale3f(float(cx), float(cy), 1.0f); gs_load_vertexbuffer(box); + gs_load_indexbuffer(nullptr); gs_draw(GS_TRISTRIP, 0, 0); gs_matrix_pop();
View file
obs-studio-33.0.1.tar.xz/frontend/widgets/OBSProjector.cpp -> obs-studio-33.0.2.tar.xz/frontend/widgets/OBSProjector.cpp
Changed
@@ -47,12 +47,6 @@ setWindowIcon(QIcon::fromTheme("obs", QIcon(":/res/images/obs.png"))); #endif - if (monitor == -1) { - resize(480, 270); - } else { - SetMonitor(monitor); - } - if (source) { UpdateProjectorTitle(QT_UTF8(obs_source_get_name(source))); } else { @@ -96,6 +90,12 @@ ready = true; + if (monitor == -1) { + resize(480, 270); + } else { + SetMonitor(monitor); + } + show(); // We need it here to allow keyboard input in X11 to listen to Escape
View file
obs-studio-33.0.1.tar.xz/libobs-d3d11/d3d11-rebuild.cpp -> obs-studio-33.0.2.tar.xz/libobs-d3d11/d3d11-rebuild.cpp
Changed
@@ -575,6 +575,8 @@ curVertexShader = nullptr; curPixelShader = nullptr; curSwapChain = nullptr; + lastVertexBuffer = nullptr; + lastVertexShader = nullptr; zstencilStateChanged = true; rasterStateChanged = true; blendStateChanged = true;
View file
obs-studio-33.0.1.tar.xz/libobs-d3d11/d3d11-shader.cpp -> obs-studio-33.0.2.tar.xz/libobs-d3d11/d3d11-shader.cpp
Changed
@@ -47,7 +47,9 @@ { for (size_t i = 0; i < inputs.size(); i++) { const D3D11_INPUT_ELEMENT_DESC &input = inputsi; - if (strcmp(input.SemanticName, "NORMAL") == 0) { + if (strcmp(input.SemanticName, "SV_Position") == 0) { + hasPositions = true; + } else if (strcmp(input.SemanticName, "NORMAL") == 0) { hasNormals = true; } else if (strcmp(input.SemanticName, "TANGENT") == 0) { hasTangents = true; @@ -61,6 +63,7 @@ gs_vertex_shader::gs_vertex_shader(gs_device_t *device, const char *file, const char *shaderString) : gs_shader(device, gs_type::gs_vertex_shader, GS_SHADER_VERTEX), + hasPositions(false), hasNormals(false), hasColors(false), hasTangents(false), @@ -406,9 +409,16 @@ void gs_shader_destroy(gs_shader_t *shader) { - if (shader && shader->device->lastVertexShader == shader) { - shader->device->lastVertexShader = nullptr; + if (shader) { + gs_device_t *device = shader->device; + if (device->curVertexShader == shader) { + device->curVertexShader = nullptr; + } + if (device->lastVertexShader == shader) { + device->lastVertexShader = nullptr; + } } + delete shader; }
View file
obs-studio-33.0.1.tar.xz/libobs-d3d11/d3d11-subsystem.cpp -> obs-studio-33.0.2.tar.xz/libobs-d3d11/d3d11-subsystem.cpp
Changed
@@ -2901,9 +2901,16 @@ void gs_vertexbuffer_destroy(gs_vertbuffer_t *vertbuffer) { - if (vertbuffer && vertbuffer->device->lastVertexBuffer == vertbuffer) { - vertbuffer->device->lastVertexBuffer = nullptr; + if (vertbuffer) { + gs_device_t *device = vertbuffer->device; + if (device->curVertexBuffer == vertbuffer) { + device->curVertexBuffer = nullptr; + } + if (device->lastVertexBuffer == vertbuffer) { + device->lastVertexBuffer = nullptr; + } } + delete vertbuffer; } @@ -2956,6 +2963,10 @@ void gs_indexbuffer_destroy(gs_indexbuffer_t *indexbuffer) { + if (indexbuffer && indexbuffer->device->curIndexBuffer == indexbuffer) { + indexbuffer->device->curIndexBuffer = nullptr; + } + delete indexbuffer; }
View file
obs-studio-33.0.1.tar.xz/libobs-d3d11/d3d11-subsystem.hpp -> obs-studio-33.0.2.tar.xz/libobs-d3d11/d3d11-subsystem.hpp
Changed
@@ -723,6 +723,7 @@ std::vector<D3D11_INPUT_ELEMENT_DESC> layoutData; + bool hasPositions; bool hasNormals; bool hasColors; bool hasTangents; @@ -739,7 +740,10 @@ inline uint32_t NumBuffersExpected() const { - uint32_t count = nTexUnits + 1; + uint32_t count = nTexUnits; + if (hasPositions) { + count++; + } if (hasNormals) { count++; }
View file
obs-studio-33.0.1.tar.xz/libobs-d3d11/d3d11-vertexbuffer.cpp -> obs-studio-33.0.2.tar.xz/libobs-d3d11/d3d11-vertexbuffer.cpp
Changed
@@ -48,8 +48,10 @@ UINT gs_vertex_buffer::MakeBufferList(gs_vertex_shader *shader, ID3D11Buffer **buffers, uint32_t *strides) { UINT numBuffers = 0; - PushBuffer(&numBuffers, buffers, strides, vertexBuffer, sizeof(vec3), "point"); + if (shader->hasPositions) { + PushBuffer(&numBuffers, buffers, strides, vertexBuffer, sizeof(vec3), "point"); + } if (shader->hasNormals) { PushBuffer(&numBuffers, buffers, strides, normalBuffer, sizeof(vec3), "normal"); }
View file
obs-studio-33.0.1.tar.xz/libobs/obs-config.h -> obs-studio-33.0.2.tar.xz/libobs/obs-config.h
Changed
@@ -41,7 +41,7 @@ * * Reset to zero each major or minor version */ -#define LIBOBS_API_PATCH_VER 1 +#define LIBOBS_API_PATCH_VER 2 #define MAKE_SEMANTIC_VERSION(major, minor, patch) ((major << 24) | (minor << 16) | patch)
View file
obs-studio-33.0.1.tar.xz/libobs/obs-properties.c -> obs-studio-33.0.2.tar.xz/libobs/obs-properties.c
Changed
@@ -1249,7 +1249,7 @@ bool obs_property_list_item_bool(obs_property_t *p, size_t idx) { struct list_data *data = get_list_fmt_data(p, OBS_COMBO_FORMAT_BOOL); - return (data && idx < data->items.num) ? data->items.arrayidx.d : false; + return (data && idx < data->items.num) ? data->items.arrayidx.b : false; } enum obs_editable_list_type obs_property_editable_list_type(obs_property_t *p)
View file
obs-studio-33.0.1.tar.xz/libobs/obs-scene.c -> obs-studio-33.0.2.tar.xz/libobs/obs-scene.c
Changed
@@ -1828,7 +1828,7 @@ } } - return obs_source_duplicate(source, private ? obs_source_get_name(source) : NULL, private); + return obs_source_duplicate(source, obs_source_get_name(source), private); } static inline obs_source_t *new_ref(obs_source_t *source)
View file
obs-studio-33.0.1.tar.xz/libobs/obs-source.c -> obs-studio-33.0.2.tar.xz/libobs/obs-source.c
Changed
@@ -2458,6 +2458,8 @@ gs_effect_set_val(max_param, frame->color_range_max, sizeof(float) * 3); } + gs_load_vertexbuffer(NULL); + gs_load_indexbuffer(NULL); gs_draw(GS_TRIS, 0, 3); gs_technique_end_pass(tech);
View file
obs-studio-33.0.1.tar.xz/libobs/obs-video.c -> obs-studio-33.0.2.tar.xz/libobs/obs-video.c
Changed
@@ -331,6 +331,9 @@ gs_set_render_target(target, NULL); set_render_size(width, height); + gs_load_vertexbuffer(NULL); + gs_load_indexbuffer(NULL); + size_t passes = gs_technique_begin(tech); for (size_t i = 0; i < passes; i++) { gs_technique_begin_pass(tech, i);
View file
obs-studio-33.0.1.tar.xz/plugins/decklink/decklink-device-instance.cpp -> obs-studio-33.0.2.tar.xz/plugins/decklink/decklink-device-instance.cpp
Changed
@@ -558,7 +558,7 @@ } const HRESULT audioResult = output_->EnableAudioOutput(bmdAudioSampleRate48kHz, bmdAudioSampleType16bitInteger, - 2, bmdAudioOutputStreamTimestamped); + 2, bmdAudioOutputStreamContinuous); if (audioResult != S_OK) { LOG(LOG_ERROR, "Failed to enable audio output"); return false; @@ -697,7 +697,7 @@ void DeckLinkDeviceInstance::WriteAudio(audio_data *frames) { uint32_t sampleFramesWritten; - output->WriteAudioSamplesSync(frames->data0, frames->frames, &sampleFramesWritten); + output->ScheduleAudioSamples(frames->data0, frames->frames, 0, 0, &sampleFramesWritten); } #define TIME_BASE 1000000000
View file
obs-studio-33.0.1.tar.xz/plugins/mac-capture/mac-sck-common.h -> obs-studio-33.0.2.tar.xz/plugins/mac-capture/mac-sck-common.h
Changed
@@ -4,7 +4,6 @@ #include <stdlib.h> #include <obs-module.h> #include <util/threading.h> -#include <pthread.h> #include <IOSurface/IOSurface.h> #include <ScreenCaptureKit/ScreenCaptureKit.h> @@ -68,6 +67,8 @@ bool is_screen_capture_available(void); +OSType sck_get_preferred_pixel_format(void); + API_AVAILABLE(macos(12.5)) void screen_capture_build_content_list(struct screen_capture *sc, bool display_capture); API_AVAILABLE(macos(12.5)) bool build_display_list(struct screen_capture *sc, obs_properties_t *props);
View file
obs-studio-33.0.1.tar.xz/plugins/mac-capture/mac-sck-common.m -> obs-studio-33.0.2.tar.xz/plugins/mac-capture/mac-sck-common.m
Changed
@@ -1,4 +1,5 @@ #include "mac-sck-common.h" +#include <sys/sysctl.h> bool is_screen_capture_available(void) { @@ -9,6 +10,24 @@ } } +OSType sck_get_preferred_pixel_format(void) +{ + int64_t isAarch64 = 0; + size_t size = sizeof(isAarch64); + sysctlbyname("hw.optional.arm64", &isAarch64, &size, NULL, 0); + // Use 64RGBAHalf where available, for superior 16-bit float color and alpha depth. On prior macOS versions, or + // x86_64 machines where 64RGBAHalf is unavailable, fall back to 32BGRA (8-bit UInt color and alpha). + if (@available(macOS 15.0, *)) { + if (isAarch64 == 1) { + return kCVPixelFormatType_64RGBAHalf; + } else { + return kCVPixelFormatType_32BGRA; + } + } else { + return kCVPixelFormatType_32BGRA; + } +} + #pragma mark - ScreenCaptureDelegate @implementation ScreenCaptureDelegate
View file
obs-studio-33.0.1.tar.xz/plugins/mac-capture/mac-sck-video-capture.m -> obs-studio-33.0.2.tar.xz/plugins/mac-capture/mac-sck-video-capture.m
Changed
@@ -209,13 +209,9 @@ } else { blog(LOG_WARNING, "Unable to retrieve OBS output FPS when initializing macOS Screen Capture"); } - // Use 64RGBAHalf where available, for superior 16-bit float color and alpha depth. On prior macOS versions where - // 64RGBAHalf is unavailable, fall back to 32BGRA (8-bit UInt color and alpha). - if (@available(macOS 15.0, *)) { - sc->stream_properties setPixelFormat:kCVPixelFormatType_64RGBAHalf; - } else { - sc->stream_properties setPixelFormat:kCVPixelFormatType_32BGRA; - } + + OSType pixelFormat = sck_get_preferred_pixel_format(); + sc->stream_properties setPixelFormat:pixelFormat; if (@available(macOS 13.0, *)) { sc->stream_properties setCapturesAudio:YES;
View file
obs-studio-33.0.1.tar.xz/plugins/nv-filters/nvidia-videofx-filter.c -> obs-studio-33.0.2.tar.xz/plugins/nv-filters/nvidia-videofx-filter.c
Changed
@@ -942,6 +942,9 @@ gs_effect_set_texture_srgb(filter->image_param, gs_texrender_get_texture(render)); gs_effect_set_float(filter->multiplier_param, multiplier); + gs_load_vertexbuffer(NULL); + gs_load_indexbuffer(NULL); + while (gs_effect_loop(filter->effect, tech_name)) { gs_draw(GS_TRIS, 0, 3); }
View file
obs-studio-33.0.1.tar.xz/plugins/obs-browser/browser-app.cpp -> obs-studio-33.0.2.tar.xz/plugins/obs-browser/browser-app.cpp
Changed
@@ -74,7 +74,7 @@ CefString errorMessage; CefRefPtr<CefValue> optionValue = CefValue::Create(); - constexpr std::array<std::string_view, 20> kBrowserFeaturesToDisable{ + constexpr std::array<std::string_view, 18> kBrowserFeaturesToDisable{ "autofill.credit_card_enabled", "autofill.enabled", "autofill.iban_enabled", @@ -91,8 +91,6 @@ "shopping_list_enabled", "side_panel.google_search_side_panel_enabled", "side_search.enabled", - "signin.allowed", - "signin.allowed_on_next_startup", "translate", "url_keyed_anonymized_data_collection.enabled"}; @@ -163,6 +161,7 @@ } command_line->AppendSwitchWithValue("autoplay-policy", "no-user-gesture-required"); + command_line->AppendSwitchWithValue("allow-browser-signin", "false"); command_line->AppendSwitch("disable-extensions"); command_line->AppendSwitchWithValue("disable-features", disableFeatures); command_line->AppendSwitch("hide-crash-restore-bubble");
View file
obs-studio-33.0.1.tar.xz/plugins/obs-browser/browser-version.h -> obs-studio-33.0.2.tar.xz/plugins/obs-browser/browser-version.h
Changed
@@ -2,7 +2,7 @@ #define OBS_BROWSER_VERSION_MAJOR 2 #define OBS_BROWSER_VERSION_MINOR 27 -#define OBS_BROWSER_VERSION_PATCH 5 +#define OBS_BROWSER_VERSION_PATCH 6 #ifndef MAKE_SEMANTIC_VERSION #define MAKE_SEMANTIC_VERSION(major, minor, patch) ((major << 24) | (minor << 16) | patch)
View file
obs-studio-33.0.2.tar.xz/plugins/obs-browser/cmake/macos/Helper.plist.in
Added
@@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>LSEnvironment</key> + <dict> + <key>MallocNanoZone</key> + <string>0</string> + </dict> + <key>LSFileQuarantineEnabled</key> + <true/> + <key>NSSupportsAutomaticGraphicsSwitching</key> + <true/> +</dict> +</plist>
View file
obs-studio-33.0.1.tar.xz/plugins/obs-browser/cmake/os-macos.cmake -> obs-studio-33.0.2.tar.xz/plugins/obs-browser/cmake/os-macos.cmake
Changed
@@ -51,6 +51,7 @@ PROPERTIES OUTPUT_NAME "${target_output_name}" FOLDER plugins/obs-browser/Helpers + MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/cmake/macos/Helper.plist.in" XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER com.obsproject.obs-studio.helper${helper_plist} XCODE_ATTRIBUTE_CURRENT_PROJECT_VERSION ${OBS_BUILD_NUMBER} XCODE_ATTRIBUTE_MARKETING_VERSION ${OBS_VERSION_CANONICAL} @@ -58,6 +59,7 @@ XCODE_ATTRIBUTE_INFOPLIST_KEY_CFBundleDisplayName "${target_output_name}" XCODE_ATTRIBUTE_INFOPLIST_KEY_LSApplicationCategoryType "public.app-category.video" XCODE_ATTRIBUTE_INFOPLIST_KEY_NSHumanReadableCopyright "(c) 2012-${CURRENT_YEAR} Lain Bailey" + XCODE_ATTRIBUTE_INFOPLIST_KEY_LSUIElement YES XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS "${CMAKE_CURRENT_SOURCE_DIR}/cmake/macos/entitlements-helper${helper_plist}.plist" ) endforeach()
View file
obs-studio-33.0.1.tar.xz/plugins/obs-outputs/mp4-output.c -> obs-studio-33.0.2.tar.xz/plugins/obs-outputs/mp4-output.c
Changed
@@ -352,7 +352,7 @@ if (out->max_time > 0) { const int64_t current_runtime = packet->dts_usec - out->start_time; /* Allow a small error in timestamps (up to 1 ms). */ - return llabs(out->max_time - current_runtime) < 1000LL; + return out->max_time - current_runtime < 1000LL; } return false;
View file
obs-studio-33.0.1.tar.xz/plugins/win-dshow/virtualcam-module/placeholder.cpp -> obs-studio-33.0.2.tar.xz/plugins/win-dshow/virtualcam-module/placeholder.cpp
Changed
@@ -8,13 +8,18 @@ extern HINSTANCE dll_inst; -static std::vector<uint8_t> placeholder; -static bool initialized = false; -int cx, cy; +namespace { + +struct Placeholder { + std::vector<uint8_t> data; + int cx = 0; + int cy = 0; + bool valid = false; +}; /* XXX: optimize this later. or don't, it's only called once. */ -static void convert_placeholder(const uint8_t *rgb_in, int width, int height) +std::vector<uint8_t> convert_placeholder(const uint8_t *rgb_in, int width, int height) { size_t size = width * height * 3; size_t linesize = width * 3; @@ -36,12 +41,13 @@ *(out++) = (uint8_t)(((112 * r - 94 * g - 18 * b + 128) >> 8) + 128); } - placeholder.resize(width * height * 3 / 2); + std::vector<uint8_t> nv12_out; + nv12_out.resize(width * height * 3 / 2); in = &yuv_out0; end = in + size; - out = &placeholder0; + out = &nv12_out0; uint8_t *chroma = out + width * height; while (in < end) { @@ -76,20 +82,23 @@ in = in2; out = out2; } + + return nv12_out; } -static bool load_placeholder_internal() +Placeholder load_placeholder_internal() { + Placeholder result; Status s; wchar_t fileMAX_PATH; if (!GetModuleFileNameW(dll_inst, file, MAX_PATH)) { - return false; + return result; } wchar_t *slash = wcsrchr(file, '\\'); if (!slash) { - return false; + return result; } slash1 = 0; @@ -98,46 +107,68 @@ Bitmap bmp(file); if (bmp.GetLastStatus() != Status::Ok) { - return false; + return result; } - cx = bmp.GetWidth(); - cy = bmp.GetHeight(); + const int cx = bmp.GetWidth(); + const int cy = bmp.GetHeight(); BitmapData bmd = {}; Rect r(0, 0, cx, cy); s = bmp.LockBits(&r, ImageLockModeRead, PixelFormat24bppRGB, &bmd); if (s != Status::Ok) { - return false; + return result; } - convert_placeholder((const uint8_t *)bmd.Scan0, cx, cy); + result.data = convert_placeholder((const uint8_t *)bmd.Scan0, cx, cy); + result.cx = cx; + result.cy = cy; + result.valid = true; bmp.UnlockBits(&bmd); - return true; + return result; } -bool initialize_placeholder() +Placeholder load_placeholder() { - if (initialized) { - return true; - } - GdiplusStartupInput si; ULONG_PTR token; - GdiplusStartup(&token, &si, nullptr); - initialized = load_placeholder_internal(); + if (GdiplusStartup(&token, &si, nullptr) != Status::Ok) { + return Placeholder(); + } + + Placeholder result = load_placeholder_internal(); GdiplusShutdown(token); - return initialized; + return result; +} + +// A single application can create any number of VCamFilter instances, each of +// which loads the placeholder from its own thread. As this is shared global +// state, ensure only a single copy is initialized with C++11 function-local +// static initialization to prevent multiple initializations stomping on +// each other. +const Placeholder &get_placeholder() +{ + static const Placeholder placeholder = load_placeholder(); + return placeholder; +} + +} // namespace + +bool initialize_placeholder() +{ + return get_placeholder().valid; } const uint8_t *get_placeholder_ptr() { - if (initialized) { - return placeholder.data(); + const Placeholder &placeholder = get_placeholder(); + + if (placeholder.valid) { + return placeholder.data.data(); } return nullptr; @@ -145,9 +176,11 @@ const bool get_placeholder_size(int *out_cx, int *out_cy) { - if (initialized) { - *out_cx = cx; - *out_cy = cy; + const Placeholder &placeholder = get_placeholder(); + + if (placeholder.valid) { + *out_cx = placeholder.cx; + *out_cy = placeholder.cy; return true; }
View file
obs-studio-33.0.1.tar.xz/plugins/win-dshow/virtualcam-module/virtualcam-filter.cpp -> obs-studio-33.0.2.tar.xz/plugins/win-dshow/virtualcam-module/virtualcam-filter.cpp
Changed
@@ -16,6 +16,9 @@ VCamFilter::VCamFilter() : OutputFilter() { + os_atomic_inc_long(&locks); + AddRef(); + thread_start = CreateEvent(nullptr, true, false, nullptr); thread_stop = CreateEvent(nullptr, true, false, nullptr); @@ -94,9 +97,6 @@ /* ---------------------------------------- */ th = std::thread(this { Thread(); }); - - AddRef(); - os_atomic_inc_long(&locks); } VCamFilter::~VCamFilter()
View file
obs-studio-33.0.1.tar.xz/plugins/win-dshow/virtualcam-module/virtualcam-module.cpp -> obs-studio-33.0.2.tar.xz/plugins/win-dshow/virtualcam-module/virtualcam-module.cpp
Changed
@@ -17,7 +17,8 @@ CLSID cls; public: - inline VCamFactory(CLSID cls_) : cls(cls_) {} + inline VCamFactory(CLSID cls_) : cls(cls_) { os_atomic_inc_long(&locks); } + inline ~VCamFactory() { os_atomic_dec_long(&locks); } // IUnknown STDMETHODIMP QueryInterface(REFIID riid, void **p_ptr);
View file
obs-studio-33.0.1.tar.xz/plugins/win-dshow/win-dshow.cpp -> obs-studio-33.0.2.tar.xz/plugins/win-dshow/win-dshow.cpp
Changed
@@ -184,6 +184,14 @@ static DWORD CALLBACK DShowThread(LPVOID ptr); +static BOOL CALLBACK CloseDShowDialogs(HWND window, LPARAM) +{ + if (IsWindowVisible(window)) { + PostMessage(window, WM_CLOSE, 0, 0); + } + return TRUE; +} + struct DShowInput { obs_source_t *source; Device device; @@ -273,6 +281,7 @@ } ReleaseSemaphore(semaphore, 1, nullptr); + EnumThreadWindows(GetThreadId(thread), CloseDShowDialogs, 0); WaitForSingleObject(thread, INFINITE); }
View file
obs-studio-33.0.1.tar.xz/shared/properties-view/properties-view.cpp -> obs-studio-33.0.2.tar.xz/shared/properties-view/properties-view.cpp
Changed
@@ -114,6 +114,10 @@ void OBSPropertiesView::RefreshProperties() { + if (auto dialog = findChild<QDialog *>()) { + dialog->reject(); + } + int h, v, hend, vend; GetScrollPos(h, v, hend, vend);
View file
obs-studio-33.0.1.tar.xz/shared/qt/obs-spinbox/DoubleSpinBox.cpp -> obs-studio-33.0.2.tar.xz/shared/qt/obs-spinbox/DoubleSpinBox.cpp
Changed
@@ -107,6 +107,11 @@ void DoubleSpinBox::mousePressEvent(QMouseEvent *event) { + if (!(event->buttons() & Qt::LeftButton)) { + QDoubleSpinBox::mousePressEvent(event); + return; + } + QStyleOptionSpinBox opt; initStyleOption(&opt);
View file
obs-studio-33.0.1.tar.xz/shared/qt/obs-spinbox/SpinBox.cpp -> obs-studio-33.0.2.tar.xz/shared/qt/obs-spinbox/SpinBox.cpp
Changed
@@ -106,6 +106,11 @@ void SpinBox::mousePressEvent(QMouseEvent *event) { + if (!(event->buttons() & Qt::LeftButton)) { + QSpinBox::mousePressEvent(event); + return; + } + QStyleOptionSpinBox opt; initStyleOption(&opt);
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.