@@ -1,4 +1,272 @@

 -------------------------------------------------------------------

+Sun Jan 08 14:16:44 UTC 2023 - hpj@urpla.net

+

+- Update to version 29.0.0:

+  * rtmp-services: Specify RTMP_SERVICES_FORMAT_VERSION in package.json

+  * CI: Revise repository conditions to validate JSON schema of services

+  * libobs: Update version to 29.0.0

+  * win-capture: Always reset timeout when searching for target display

+  * UI: Lock volume meter sliders to LTR

+  * UI: Use stream encoder when resetting encoders

+  * obs-filters: Log NVIDIA Effects version only if lib is found

+  * CI: Use Flatpak build-bundle option

+  * CI: Update Flatpak Actions

+  * Revert "libobs-d3d11: Default to Intel IGPU on IGPU+DGPU systems"

+  * Revert "libobs-d3d11: Make sure libobs knows the new adapter index"

+  * Revert "libobs: Fix adapter index not getting applied to resets"

+  * UI: Restrict GNOME wayland override

+  * obs-ffmpeg, obs-qsv11: Ensure adapter order in encoder tests

+  * obs-ffmpeg: Remove EnumOutputs from encoder tests

+  * libobs: Add funcs to get windows video adapter LUIDs

+  * rtmp-services: Remove defunct servers/services

+  * obs-ffmpeg: Set chroma location for VA-API

+  * obs-qsv11: Put mastering primaries in GBR order

+  * mac-videotoolbox: Add HDR metadata

+  * obs-ffmpeg: Fix AMF default CQP value

+  * libobs: Duplicate URL string for OBS_BUTTON_URL

+  * UI: Fix Qt AutoUic warning

+  * obs-ffmpeg: Add new rate control method mappings for AVC/HEVC

+  * obs-filter: Fix upward compressor

+  * obs-ffmpeg: Use enum for av1 encoders

+  * cmake: Fix FindGio.cmake to find libgio

+  * docs: Add missing source functions

+  * obs-ffmpeg: Bump AMF version to v1.4.29

+  * obs-ffmpeg: Add new rate control methods for AMD AVC/HEVC

+  * docs: Fix reference count info of obs_frontend_get_streaming_service

+  * libcaption: Fix invalid data at utf8_load_text_file

+  * docs: Add versionadded for 29.0.0 functions

+  * docs: Add info on property modified callback

+  * mac-videotoolbox: Don't parse HEVC as AVC

+  * UI: Guard GetMonitorName behind Qt < 6.4

+  * UI: Fix slide counter with no slides

+  * obs-ffmpeg: Improve chroma location decision

+  * docs: Clarify signal_handler_connect()

+  * obs-filters: Use correct signal to reset greenscreen filter

+  * image-source: Remove cleared missing files from slideshow

+  * libobs: Override fps ovi for aux views

+  * updater: Bump to version 2.2

+  * obs-ffmpeg: Allow srt stream to disconnect after timeout

+  * rtmp-services: Add Bitmovin

+  * obs-qsv11: Set subprocess timeout to 10 sec

+  * win-dshow: Ignore FFmpeg colorspace if overridden

+  * obs-ffmpeg: Disable VBAQ for H264 CQP rate control

+  * obs-qsv11: Fix QSV detection

+  * obs-qsv11: Fix encoder capping resolution on dgpus

+  * Revert "obs-qsv11: Don't set to low power mode if AV1"

+  * obs-qsv11: Fix HDR not working with AV1

+  * obs-qsv11: Don't set to low power mode if AV1

+  * obs-qsv11: Keep ExtParam value around

+  * UI: Hide "Update Channel" label on macOS

+  * UI: Guard AutoBetaOptIn as Windows-only

+  * UI: Delay timed update check until branch migration

+  * UI: Fix monitor name for projectors on Windows

+  * obs-qsv11: Remove statics, fix buffer misuse

+  * obs-qsv11: Add HEVC

+  * obs-qsv11: Don't declare vars in switch w/o braces

+  * obs-qsv11: Remove unused function

+  * obs-qsv11: Fix profile default for AV1

+  * obs-qsv11: Remove unused function declaration

+  * obs-ffmpeg: Disable VBAQ for HEVC CQP rate control

+  * libobs: Suppress LNK4098

+  * rtmp-services: Suppress LNK4098

+  * UI: Add QSV AV1 to simple output mode

+  * obs-qsv11: Simplify CQP

+  * obs-qsv11: Add QSV AV1 encoder

+  * obs-qsv11: Add codec enum

+  * obs-qsv11: Only reinitialize bitrate

+  * obs-qsv11: Add startup process to test QSV support

+  * libobs: Fix adapter index not getting applied to resets

+  * UI: Switch to beta branch when running beta/rc for the first time

+  * UI: Add update channels (Windows)

+  * updater: Add --branch/--portable command line arguments

+  * cmake/libobs: Set OBS_COMMIT based on git describe

+  * flatpak: Update deps based on obs-deps 2022-11-21

+  * CI: Update deps to obs-deps 2022-11-21 release

+  * libobs-d3d11: Make sure libobs knows the new adapter index

+  * obs-ffmpeg: Fix building without HEVC on Windows

+  * cmake: Specify utf-8 for MSVC builds

+  * CI,obs-vst: Update Flatpak KDE Runtime to version 6.4

+  * UI, image-source: Add slide counter to slideshow toolbar

+  * obs-vst: Improve some string handling

+  * obs-vst: Use libobs memory allocation functions

+  * UI: Disable toolbar buttons when no source is selected

+  * obs-ffmpeg: Improve RIST/SRT log messages

+  * UI: Use blog for "Attempted path" log messages

+  * ffmpeg: fix cqp rate control on svtav1

+  * ffmpeg: fix "cqp" mode for libaom

+  * libobs: Deprecate obs_get/set_master_volume

+  * obs-browser: Don't use QPointF for pointer position

+  * obs-browser: Update version to 2.19.0

+  * libdshowcapture: Support more capture cards with uncoupled audio

+  * obs-ffmpeg: Use Libva in FFmpeg VA-API

+  * UI: Add filters button to scenes toolbar

+  * UI: Remove Qt taskbar overlay

+  * obs-ffmpeg: Fix SVT-AV1 rate control mode selection

+  * libobs: Allow overriding video resolution per view

+  * decklink: Always output BGRA

+  * UI: Clarify that RGB output format is BGRA

+  * flatpak: Add Jansson to modules

+  * mac-videotoolbox: Default to High profile

+  * UI: Add Apple Hardware Encoder to AutoConfig

+  * win-dshow: Recognise higher FPS values from devices

+  * CI: Name Docs zip based on commit/tag

+  * obs-ffmpeg: Fix encoder preset quality fallbacks for AVC/HEVC/AV1

+  * obs-ffmpeg: Suggest docs to reference for AMF/FFmpeg options

+  * UI: Add AMD AV1 to simple output mode

+  * obs-ffmpeg: Add AMF AV1 encoder

+  * obs-ffmpeg: Use codec enum for AMF texture encode check

+  * obs-ffmpeg: Make AMF AVC encoder name consistent w/ others

+  * obs-ffmpeg: Only show b-frames AMF property for AVC

+  * obs-ffmpeg: Only allow AMF high/baseline profiles for AVC

+  * obs-ffmpeg: Allow 0-51 for CQP property

+  * obs-ffmpeg: Use codec enum for amf_properties_internal

+  * obs-ffmpeg: Fix transcoding API typo

+  * obs-ffmpeg: Update AMF SDK for AV1 support

+  * UI: Change Simple Output NVENC default preset to P5

+  * CI: Re-enable scripting in Windows builds

+  * obs-ffmpeg: Change default nvenc preset to P5

+  * win-capture,UI: Look up display by id, not index

+  * Revert "virtualcam-module: Don't send frames on initial pause"

+  * obs-websocket: Update version to 5.1.0

+  * obs-ffmpeg: Fix SRT error type comparison (#7802)

+  * win-capture: Invert output when drawing monochrome cursors

+  * rtmp-services: Add ffmpeg-mpegts-muxer in schema v4

+  * obs-ffmpeg: Direct setting of  encryption & auth for SRT & RIST

+  * UI: Use weak source for projectors

+  * obs-ffmpeg: Use compatibility options on nvnenc init fail

+  * libobs: Fix SRGB to SCRGB async video rendering

+  * CI: Fix building in PowerShell 7.3.x

+  * CI: Fix services checkers using wrong port for RTMPS

+  * UI: Add separator in source toolbar

+  * obs-outputs: Shorten dynamic bitrate increment timeout

+  * rtmp-services: Add IRLToolkit

+  * UI: Remove number from multiview labels

+  * CI: Add debian debug symbols to CI artifacts

+  * cmake: Fix debian packages loosing all debug symbols

+  * mac-capture: Disable all SCK modes besides WindowCapture on macOS 12

+  * mac-videotoolbox: Support P010 and HDR color spaces

+  * obs-filters: NVIDIA Background Removal variable mask refresh

+  * obs-filters: Add temporal processing to Background Removal

+  * obs-filters: Warn if NVIDIA Audio FX is outdated

+  * obs-filters: Warn if NVIDIA Video FX is oudated

+  * obs-outputs: Increase librtmp send timeout to 15 seconds

+  * UI: Fix snprintf calls with literals as buffer sizes

+  * obs-outputs: Fix snprintf calls with literals as buffer sizes

+  * obs-filters: Fix snprintf calls with literals as buffer sizes

+  * image-source: Fix snprintf calls with literals as buffer sizes

+  * coreaudio-encoder: Fix snprintf calls with literals as buffer sizes

+  * obs-x264: Fix snprintf calls with literals as buffer sizes

+  * win-capture: Replace invocations of sprintf with snprintf

+  * obs-ffmpeg: Replace invocations of sprintf with snprintf

+  * libobs-d3d11: Replace invocations of sprintf with snprintf

+  * linux-v4l2: Replace invocations of sprintf with snprintf

+  * linux-capture: Replace invocations of sprintf with snprintf

+  * UI: Replace invocations of sprintf with snprintf

+  * obs-outputs: Replace invocations of sprintf with snprintf

+  * mac-capture: Replace invocations of sprintf with snprintf

+  * libobs: Replace invocations of sprintf with snprintf

+  * deps: Replace invocations of sprintf with snprintf

+  * obs-ffmpeg: Fix deprecation of channels member of several structs

+  * libobs: Change audio resampler to new channel API

+  * obs-ffmpeg: Update mpegts to channel API change

+  * docs: Add info on funcs to use for properties

+  * aja: Fix capturing UHD/4K YUV on Kona HDMI.

+  * UI: Fix QStyle memory leak

+  * libobs-d3d11: Support advanced SDR window preview

+  * mac-capture: Support P3 for HDR recordings

+  * libobs: Add P3 shaders for Mac

+  * libobs-opengl: Support l10r IOSurface

+  * decklink-output-ui: Pipeline GPU data for preview

+  * libobs: Log Windows emulation status

+  * libobs: Log macOS Rosetta status

+  * UI: Remove Rosetta detection log

+  * libobs/util: Add function to get Windows x64 emulation status

+  * UI: Use on_foo_bar properly for docks context menu

+  * UI: Replace manual usage of on_foo_bar for show/hide transition

+  * UI: Remove support for toggling Aero

+  * libobs: Remove Aero logging

+  * mac-avcapture: Add DeskCam support

+  * rtmp-services: Add Whowatch

+  * libobs: Fix reading Windows release name

+  * UI: Set Replay Buffer Memory limit dynamically

+  * libobs: Add utility function to get total RAM

+  * libobs: Move async filtering from render to tick

+  * libobs: Add "source_update" signal

+  * docs: Add clarifications

+  * UI: Fix always on top not being saved on exit

+  * libobs: Update to 28.1.2

+  * CI: Upload beta builds as Steam Playtest

+  * obs-filters: Add a simple 3-band equalizer

​

@@ -8,7 +8,7 @@

 %endif

 Name:           obs-studio

-Version:        28.1.2

+Version:        29.0.0

 Release:        0

 Summary:        A recording/broadcasting program

 Group:          Productivity/Multimedia/Video/Editors and Convertors

@@ -55,12 +55,13 @@

 BuildRequires:  pkgconfig(libavfilter)

 BuildRequires:  pkgconfig(libavformat)

 BuildRequires:  pkgconfig(libavutil)

+BuildRequires:  pkgconfig(librist)

 BuildRequires:  pkgconfig(libswresample)

 BuildRequires:  pkgconfig(libswscale)

-BuildRequires:  pkgconfig(librist)

+BuildRequires:  pkgconfig(libva)

 BuildRequires:  pkgconfig(lua)

 BuildRequires:  pkgconfig(luajit)

-BuildRequires:  pkgconfig(srt)

+BuildRequires:  pkgconfig(srt) >= 1.4

 BuildRequires:  python3-devel

 %if 0%{?suse_version} != 1315 || 0%{?is_opensuse}

 BuildRequires:  speexdsp-devel

​

@@ -1,7 +1,7 @@

 <services>

   <service name="tar_scm" mode="disabled">

     <param name="versionformat">@PARENT_TAG@</param>

-    <param name="revision">refs/tags/28.1.2</param>

+    <param name="revision">refs/tags/29.0.0</param>

     <param name="url">https://github.com/obsproject/obs-studio.git</param>

     <param name="scm">git</param>

     <param name="changesgenerate">enable</param>

​

@@ -1,6 +1,6 @@

 <servicedata>

   <service name="tar_scm">

     <param name="url">https://github.com/obsproject/obs-studio.git</param>

-    <param name="changesrevision">c1841e43b04e662ae3be146ce10596eb7be866fa</param>

+    <param name="changesrevision">b51773b97b551cb409603146a97b2827d2a66ec3</param>

   </service>

 </servicedata>

\ No newline at end of file

​

@@ -1,238 +0,0 @@

-{

-    "$schema": "http://json-schema.org/draft-07/schema#",

-    "type": "object",

-    "properties": {

-        "format_version": {

-            "type": "integer",

-            "description": "Identifier for parsing this file.\n- v3 introduced 'ffmpeg_hls_muxer' to services/recommended/output\n - v2 introduced 'alt_names' to services"

-        },

-        "services": {

-            "type": "array",

-            "items": {

-                "type": "object",

-                "properties": {

-                    "name": {

-                        "type": "string",

-                        "description": "Name of the streaming service. Will be displayed in the Service dropdown.",

-                        "minLength": 1

-                    },

-                    "common": {

-                        "type": "boolean",

-                        "description": "Whether or not the service is shown in the list before it is expanded to all services by the user.",

-                        "default": false

-                    },

-                    "stream_key_link": {

-                        "$ref": "#/definitions/saneUrl",

-                        "description": "Link where a logged-in user can find the 'stream key', presented as a button alongside the stream key field."

-                    },

-                    "supported video codecs": {

-                        "type": "array",

-                        "description": "Video codecs that are supported by the service.",

-                        "items": {

-                            "type": "string",

-                            "description": "Short-form codec names.",

-                            "minLength": 1,

-                            "enum": 

-                                "h264",

-                                "hevc"

-                            

-                        }

-                    },

-                    "supported audio codecs": {

-                        "type": "array",

-                        "description": "Audio codecs that are supported by the service.",

-                        "items": {

-                            "type": "string",

-                            "description": "Short-form codec names.",

-                            "minLength": 1,

-                            "enum": 

-                                "aac",

-                                "opus"

-                            

-                        }

-                    },

-                    "servers": {

-                        "type": "array",

-                        "description": "List of servers.",

-                        "items": {

-                            "type": "object",

-                            "properties": {

-                                "name": {

-                                    "type": "string",

-                                    "description": "Name of the server (e.g. location, primary/backup), displayed in the Server dropdown.",

-                                    "minLength": 1

-                                },

-                                "url": {

-                                    "$ref": "#/definitions/serviceUri",

-                                    "description": "RTMP(S) or HLS URL of the ingest server.",

-                                    "minLength": 1

-                                }

-                            },

-                            "additionalProperties": false,

-                            "required": 

-                                "name",

-                                "url"

-                            

-                        },

-                        "default": 

-                            {

-                                "name": "",

-                                "url": ""

-                            }

-                        ,

-                        "minItems": 1,

-                        "additionalItems": true

-                    },

-                    "recommended": {

-                        "type": "object",

-                        "description": "Recommended service settings. Users will be unable to choose values outside of these by default, so choose recommended values carefully.",

-                        "properties": {

-                            "keyint": {

-                                "type": "integer",

-                                "description": "Keyframe interval (seconds)."

-                            },

-                            "max video bitrate": {

-                                "type": "integer",

-                                "description": "Highest supported video bitrate (kbps)."

-                            },

-                            "max audio bitrate": {

-                                "type": "integer",

-                                "description": "Highest supported audio bitrate (kbps)."

-                            },

-                            "x264opts": {

-                                "type": "string",

-                                "description": "Additional x264 encoder options. Space-separated.",

-                                "pattern": "^(\\S+=\\S+\\s*)+$"

-                            },

-                            "output": {

-                                "type": "string",

-                                "description": "OBS output module used.",

-                                "enum": 

-                                    "rtmp_output",

-                                    "ffmpeg_hls_muxer",

-                                    "ftl_output"

-                                

-                            },

-                            "profile": {

-                                "type": "string",

-                                "description": "H.264 Profile.",

-                                "minLength": 1,

-                                "enum": 

-                                    "high",

-                                    "main",

-                                    "baseline"

-                                

-                            },

-                            "bframes": {

-                                "type": "integer",

-                                "description": "Maximum allowed number of B-Frames."

-                            },

-                            "supported resolutions": {

-                                "type": "array",

-                                "description": "List of supported resolutions in format {width}x{height}",

-                                "items": {

-                                    "$ref": "#/definitions/resolution"

-                                },

-                                "minItems": 1,

-                                "additionalItems": true

-                            },

-                            "max fps": {

-                                "type": "integer",

-                                "description": "Maximum supported framerate."

-                            },

-                            "bitrate matrix": {

-                                "type": "array",

-                                "description": "List of resolutions and frame rate combinations with their recommended maximum bitrate.",

-                                "items": {

-                                    "type": "object",

-                                    "properties": {

-                                        "res": {

-                                            "$ref": "#/definitions/resolution",

-                                            "description": "Resolution in format {width}x{height}"

-                                        },

-                                        "fps": {

-                                            "type": "integer",

-                                            "description": "Frame rate"

-                                        },

-                                        "max bitrate": {

-                                            "type": "integer",

-                                            "description": "Maximum bitrate in kbps."

-                                        }

-                                    },

-                                    "minItems": 1,

-                                    "additionalProperties": false,

-                                    "required": 

-                                        "res",

-                                        "fps",

-                                        "max bitrate"

-                                    

-                                },

-                                "default": 

-                                    {

-                                        "res": "",

-                                        "fps": "",

-                                        "max bitrate": ""

-                                    }

-                                ,

-                                "additionalItems": true

-                            }

-                        },

-                        "additionalProperties": false

-                    },

-                    "more_info_link": {

-                        "$ref": "#/definitions/saneUrl",

-                        "description": "Link that provides additional info about the service, presented in the UI as a button next to the services dropdown."

-                    },

-                    "alt_names": {

-                        "type": "array",

-                        "description": "Previous names of the service used for migrating existing users to the updated entry.",

-                        "items": {

-                            "type": "string",

-                            "minLength": 1

-                        },

-                        "default": 

-                            ""

-                        

-                    }

-                },

-                "additionalProperties": false,

-                "required": 

​

@@ -14,6 +14,10 @@

     steps:

       - name: Checkout

         uses: actions/checkout@v3

+      - name: Setup Environment

+        id: setup

+        run: |

+          echo "commitHash=$(git describe --exact-match --tags 2> /dev/null || git rev-parse --short HEAD)" >> $GITHUB_OUTPUT

       - name: Bump Version Number

         shell: bash

         if: github.event_name == 'push'

@@ -45,7 +49,7 @@

           pre_build_commands: 'pip install -Iv sphinx==5.1.1'

       - uses: actions/upload-artifact@v3

         with:

-          name: OBS Studio Documentation (HTML)

+          name: 'OBS Studio Docs ${{ steps.setup.outputs.commitHash }}'

           path: |

             ${{ runner.temp }}/_github_home/_build

             !${{ runner.temp }}/_github_home/_build/.doctrees

​

@@ -50,7 +50,7 @@

     env:

       FLATPAK_BUILD_PATH: flatpak_app/files/share

     container:

-      image: bilelmoussaoui/flatpak-github-actions:kde-6.3

+      image: bilelmoussaoui/flatpak-github-actions:kde-6.4

       options: --privileged

     strategy:

       matrix:

@@ -68,7 +68,7 @@

           echo "commitHash=$(git rev-parse --short=9 HEAD)" >> $GITHUB_OUTPUT

       - name: Build Flatpak Manifest

-        uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@master

+        uses: flatpak/flatpak-github-actions/flatpak-builder@v5

         with:

           bundle: obs-studio-${{ steps.setup.outputs.commitHash }}.flatpak

           manifest-path: CI/flatpak/com.obsproject.Studio.json

@@ -94,7 +94,7 @@

           ostree commit --repo=repo --canonical-permissions --branch=screenshots/x86_64 flatpak_app/screenshots

       - name: Publish to Flathub Beta

-        uses: bilelmoussaoui/flatpak-github-actions/flat-manager@v4

+        uses: flatpak/flatpak-github-actions/flat-manager@v5

         if: matrix.branch == 'beta'

         with:

           flat-manager-url: https://hub.flathub.org/

@@ -102,7 +102,7 @@

           token: ${{ secrets.FLATHUB_BETA_TOKEN }}

       - name: Publish to Flathub

-        uses: bilelmoussaoui/flatpak-github-actions/flat-manager@v4

+        uses: flatpak/flatpak-github-actions/flat-manager@v5

         if: matrix.branch == 'stable'

         with:

           flat-manager-url: https://hub.flathub.org/

​

@@ -18,15 +18,15 @@

   CEF_HASH_MAC_ARM64: '98679b92eea6ea9959ac5aa54f46ca60681d8a86c768c35f496dbdd409bf0642'

   CEF_BUILD_VERSION_LINUX: '5060'

   CEF_BUILD_VERSION_WIN: '5060'

-  QT_VERSION_MAC: '6.3.1'

-  QT_HASH_MAC_X86_64: 'a83f72a11023b03b6cb2dc365f0a66ad9df31163bbb4fe2df32d601856a9fad3'

-  QT_HASH_MAC_ARM64: '2f30af90c049670a5660656adbb440668aa1b0567f75a5f29e1def9108928403'

-  QT_HASH_MAC_UNIVERSAL: '252e6684f43ab9c6f262c73af739e2296ce391b998da2c4ee04c254aaa07db18'

-  QT_VERSION_WIN: '6.3.1'

-  DEPS_VERSION_MAC: '2022-08-02'

-  DEPS_HASH_MAC_X86_64: '7637e52305e6fc53014b5aabd583f1a4490b1d97450420e977cae9a336a29525'

-  DEPS_HASH_MAC_ARM64: '755e0fa69b17a3ae444e1befa9d91d77e3cafe628fbd1c6333686091826595cd'

-  DEPS_VERSION_WIN: '2022-08-02'

+  QT_VERSION_MAC: '6.4.1'

+  QT_HASH_MAC_X86_64: 'c5ed7bc9f6e802910ec539066bcf0a8d64100fafce568071f264c88c22c5859b'

+  QT_HASH_MAC_ARM64: '1ce472fd1e28f947456b72b1d7ab929d6e93cb774c2928e22eca9bb751b12ccf'

+  QT_HASH_MAC_UNIVERSAL: '873f7c9c9f7fcee740a79c075b32a505c932c816d928807fa16f3439c610fbfd'

+  QT_VERSION_WIN: '6.4.1'

+  DEPS_VERSION_MAC: '2022-11-21'

+  DEPS_HASH_MAC_X86_64: 'ed0a145e88496f8975da14a07939dbe5633e60510aada34509a4aef64a66e438'

+  DEPS_HASH_MAC_ARM64: 'f397dc524e5ee7f85684f0b9661c45957446e28d166fcd6dfacf895c9d4d2521'

+  DEPS_VERSION_WIN: '2022-11-21'

   VLC_VERSION_MAC: '3.0.8'

   VLC_HASH_MAC: 'e0149ef4a20a19b9ecd87309c2d27787ee3f47dfd47c6639644bc1f6fd95bdf6'

   VLC_VERSION_WIN: '3.0.0-git'

@@ -273,6 +273,7 @@

           CI/linux/03_package_obs.sh

           ARTIFACT_NAME=$(basename $(/usr/bin/find build  -maxdepth 1 -type f -name "obs-studio-*.deb" | sort -rn | head -1))

           echo "FILE_NAME=${ARTIFACT_NAME}" >> $GITHUB_ENV

+          echo "DEBUG_FILE_NAME=${ARTIFACT_NAME//.deb/-dbgsym.ddeb}" >> $GITHUB_ENV

       - name: 'Upload build Artifact'

         if: ${{ success() && (github.event_name != 'pull_request' || env.SEEKING_TESTERS == '1') }}

@@ -281,6 +282,13 @@

           name: 'obs-studio-${{ matrix.ubuntu }}-${{ steps.setup.outputs.commitHash }}'

           path: '${{ github.workspace }}/obs-studio/build/${{ env.FILE_NAME }}'

+      - name: 'Upload debug symbol Artifact'

+        if: ${{ success() && (github.event_name != 'pull_request' || env.SEEKING_TESTERS == '1') }}

+        uses: actions/upload-artifact@v3

+        with:

+          name: 'obs-studio-${{ matrix.ubuntu }}-${{ steps.setup.outputs.commitHash }}-dbgsym'

+          path: '${{ github.workspace }}/obs-studio/build/${{ env.DEBUG_FILE_NAME }}'

+

   windows_build:

     name: '02 - Windows'

     runs-on: windows-2022

@@ -362,7 +370,7 @@

           path: '${{ env.FILE_NAME }}'

   linux_package:

-    name: '02 - Flatpak Bundle'

+    name: '02 - Flatpak'

     runs-on: ubuntu-latest

     needs: clang_check

     if: always()

@@ -370,7 +378,7 @@

       run:

         shell: bash

     container:

-      image: bilelmoussaoui/flatpak-github-actions:kde-6.3

+      image: bilelmoussaoui/flatpak-github-actions:kde-6.4

       options: --privileged

     steps:

       - name: 'Check for Github Labels'

@@ -385,13 +393,11 @@

       - name: 'Checkout'

         uses: actions/checkout@v3

-        if: ${{ success() && (github.event_name != 'pull_request' || env.SEEKING_TESTERS == '1') }}

         with:

           submodules: 'recursive'

           fetch-depth: 0

       - name: 'Setup build environment'

-        if: ${{ success() && (github.event_name != 'pull_request' || env.SEEKING_TESTERS == '1') }}

         run: |

           git config --global --add safe.directory $GITHUB_WORKSPACE

           echo "OBS_GIT_BRANCH=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_ENV

@@ -399,9 +405,9 @@

           echo "OBS_GIT_TAG=$(git describe --tags --abbrev=0)" >> $GITHUB_ENV

       - name: Build Flatpak Manifest

-        uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v4

-        if: ${{ success() && (github.event_name != 'pull_request' || env.SEEKING_TESTERS == '1') }}

+        uses: flatpak/flatpak-github-actions/flatpak-builder@v5

         with:

+          build-bundle: ${{ github.event_name != 'pull_request' || env.SEEKING_TESTERS == '1' }}

           bundle: obs-studio-flatpak-${{ env.OBS_GIT_HASH }}.flatpak

           manifest-path: CI/flatpak/com.obsproject.Studio.json

           cache-key: flatpak-builder-${{ hashFiles('CI/flatpak/com.obsproject.Studio.json') }}

​

@@ -17,6 +17,7 @@

   schema:

     name: Schema

     runs-on: ubuntu-20.04

+    if: ${{ github.repository_owner == 'obsproject' || github.event_name != 'schedule' }}

     steps:

       - name: Checkout

         uses: actions/checkout@v3

@@ -46,7 +47,7 @@

     name: Service Check

     runs-on: ubuntu-20.04

     needs: schema

-    if: ${{ github.repository_owner == 'obsproject' && (github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') }}

+    if: ${{ github.repository_owner == 'obsproject' && github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}

     steps:

       - name: Checkout

​

@@ -27,6 +27,7 @@

   STEAM_NIGHTLY_BRANCH: nightly

   STEAM_STABLE_BRANCH: staging

   STEAM_BETA_BRANCH: beta_staging

+  STEAM_PLAYTEST_BRANCH: staging

   SEVENZIP_HASH: 5290409e7bbe2f133d0bd7e7482548678157ea2be276b0f9cb440600f4be9a2d

 jobs:

@@ -145,8 +146,14 @@

       run: |

         if  '${{ steps.build-info.outputs.type }}' == 'release' || '${{ steps.cache.outputs.cache-hit }}' != 'true' ; then

             echo "result=true" >> $GITHUB_OUTPUT

+            if  '${{ steps.build-info.outputs.branch }}' == '${{ env.STEAM_BETA_BRANCH }}' ; then

+                echo "result_playtest=true" >> $GITHUB_OUTPUT

+            else

+                echo "result_playtest=false" >> $GITHUB_OUTPUT

+            fi

         else

             echo "result=false" >> $GITHUB_OUTPUT

+            echo "result_playtest=false" >> $GITHUB_OUTPUT

         fi

     - name: Download and prepare builds

@@ -256,6 +263,26 @@

         steamcmd +login '${{ secrets.STEAM_USER }}' '${{ secrets.STEAM_PASSWORD }}' '${{ steps.steam-totp.outputs.code }}' +run_app_build "$(pwd)/build.vdf" +quit

         echo "::endgroup::"

+    - name: Generate Steam auth code (Playtest)

+      if: steps.should-run.outputs.result_playtest == 'true'

+      id: steam-totp-playtest

+      uses: CyberAndrii/steam-totp@0fc9e59dc5bbf4368d23d5a33956f104248da31a

+      with:

+        shared_secret: ${{ secrets.STEAM_SHARED_SECRET }}

+

+    - name: Upload to Steam (Playtest)

+      if: steps.should-run.outputs.result_playtest == 'true'

+      run: |

+        cd steam

+        echo "::group::Prepare Steam build script"

+        sed 's/@@DESC@@/${{ steps.build-info.outputs.branch }}-${{ steps.build-info.outputs.desc }}/;s/@@BRANCH@@/${{ env.STEAM_PLAYTEST_BRANCH }}/' ../source/CI/steam/obs_playtest_build.vdf > build_playtest.vdf

+        echo "Generated file:"

+        cat build_playtest.vdf

+        echo "::endgroup::"

+        echo "::group::Upload to Steam"

+        steamcmd +login '${{ secrets.STEAM_USER }}' '${{ secrets.STEAM_PASSWORD }}' '${{ steps.steam-totp-playtest.outputs.code }}' +run_app_build "$(pwd)/build_playtest.vdf" +quit

+        echo "::endgroup::"

+

     - name: Upload Steam build logs

       if: steps.should-run.outputs.result == 'true'

       uses: actions/upload-artifact@v3

​

@@ -87,7 +87,13 @@

     """Try connecting and sending a RTMP handshake (with SSL if necessary)"""

     parsed = urlparse(uri)

     hostname, port = parsed.netloc.partition(':')::2

-    port = int(port) if port else 1935

+

+    if port:

+        port = int(port)

+    elif parsed.scheme == 'rtmps':

+        port = 443

+    else:

+        port = 1935

     try:

         recv = b''

​

@@ -1,7 +1,7 @@

 {

   "app-id": "com.obsproject.Studio",

   "runtime": "org.kde.Platform",

-  "runtime-version": "6.3",

+  "runtime-version": "6.4",

   "sdk": "org.kde.Sdk",

   "command": "obs",

   "finish-args": 

@@ -19,7 +19,7 @@

     "--talk-name=org.a11y.Bus",

     "--own-name=org.kde.StatusNotifierItem-2-2",

     "--system-talk-name=org.freedesktop.Avahi",

-    "--env=VST_PATH=/app/extensions/Plugins/lxvst"

+    "--env=VST_PATH=/app/extensions/Plugins/vst"

   ,

   "add-extensions": {

     "com.obsproject.Studio.Plugin": {

@@ -32,9 +32,9 @@

     },

     "org.freedesktop.LinuxAudio.Plugins": {

       "directory": "extensions/Plugins",

-      "version": "21.08",

+      "version": "22.08",

       "add-ld-path": "lib",

-      "merge-dirs": "lxvst",

+      "merge-dirs": "vst",

       "subdirectories": true,

       "no-autodownload": true

     }

@@ -58,7 +58,7 @@

         {

           "type": "git",

           "url": "https://code.videolan.org/videolan/x264.git",

-          "commit": "baee400fa9ced6f5481a728138fed6e867b0ff7f"

+          "commit": "b093bbe7d9bc642c8f24067cbdcc73bb43562eab"

         }

     },

@@ -119,8 +119,8 @@

         {

           "type": "git",

           "url": "https://github.com/Haivision/srt.git",

-          "tag": "v1.5.0",

-          "commit": "060c0d1a2af8082c053018fa6a6fe2dba67d71a8"

+          "tag": "v1.5.1",

+          "commit": "0bc3b03202b3159fc9b085b3ae6d66ec071c25d6"

         }

     },

@@ -191,8 +191,8 @@

         {

           "type": "git",

           "url": "https://aomedia.googlesource.com/aom.git",

-          "commit": "fc430c57c7b0307b4c5ffb686cd90b3c010d08d2",

-          "tag": "v3.4.0"

+          "commit": "bcfe6fbfed315f83ee8a95465c654ee8078dbff9",

+          "tag": "v3.5.0"

         }

     },

@@ -216,8 +216,8 @@

         {

           "type": "git",

           "url": "https://gitlab.com/AOMediaCodec/SVT-AV1.git",

-          "tag": "v1.1.0",

-          "commit": "6e87a1de98281840abebc030781780edd822bae5"

+          "tag": "v1.3.0",

+          "commit": "91b94efb2809e83d9bf041d8575b32f234dfef27"

         }

     },

@@ -248,22 +248,20 @@

         {

           "type": "git",

           "url": "https://github.com/FFmpeg/FFmpeg.git",

-          "commit": "9687cae2b468e09e35df4cea92cc2e6a0e6c93b3",

+          "commit": "eacfcbae690f914a4b1b4ad06999f138540cc3d8",

           "disable-shallow-clone": true

         },

         {

           "type": "git",

           "dest": "obs-deps",

           "url": "https://github.com/obsproject/obs-deps.git",

-          "tag": "2022-07-29",

-          "commit": "71df2dddb0eb732496448f626553b61bcda8f993"

+          "tag": "2022-11-21",

+          "commit": "ba56d64e4cbcc0aec4fa0efcef5f5a1e6a1ba91d"

         },

         {

           "type": "shell",

           "commands": 

-            "patch -Np1 -i obs-deps/deps.ffmpeg/patches/FFmpeg/0001-FFmpeg-9010.patch",

-            "patch -Np1 -i obs-deps/deps.ffmpeg/patches/FFmpeg/0002-FFmpeg-5.0.1-OBS.patch",

-            "patch -Np1 -i obs-deps/deps.ffmpeg/patches/FFmpeg/0003-FFmpeg-5.0.1-librist-7f3f3539e8.patch"

+            "patch -Np1 -i obs-deps/deps.ffmpeg/patches/FFmpeg/0001-FFmpeg-5.1.2-OBS.patch"

         }

@@ -281,7 +279,7 @@

         {

           "type": "git",

           "url": "https://luajit.org/git/luajit-2.0.git",

-          "commit": "3065c910ad6027031aabe2dfd3c26a3d0f014b4f",

+          "commit": "7a0cf5fd4c6c841d0455a51271af4fd4390c7884",

           "disable-shallow-clone": true

         },

         {

@@ -333,56 +331,47 @@

     },

     {

-      "name": "pipewire",

-      "buildsystem": "meson",

+      "name": "ntv2",

+      "buildsystem": "cmake-ninja",

+      "builddir": true,

       "config-opts": 

-        "-Daudiotestsrc=disabled",

-        "-Droc=disabled",

-        "-Dvideotestsrc=disabled",

-        "-Dvolume=disabled",

-        "-Dvulkan=disabled",

-        "-Ddocs=disabled",

-        "-Dman=disabled",

-        "-Dbluez5-codec-ldac=disabled",

-        "-Dbluez5-codec-aptx=disabled",

-        "-Dlibcamera=disabled",

-        "-Dudevrulesdir=/app/lib/udev/rules.d/",

-        "-Dsession-managers=",

-        "-Dtests=disabled",

-        "-Dexamples=disabled",

-        "-Dpw-cat=disabled"

+        "-DCMAKE_BUILD_TYPE=Release",

+        "-DAJA_BUILD_OPENSOURCE=ON",

+        "-DAJA_BUILD_APPS=OFF",

+        "-DAJA_INSTALL_HEADERS=ON"

       ,

       "cleanup": 

-        "/bin"

+        "/include"

       ,

       "sources": 

         {

           "type": "git",

-          "url": "https://github.com/pipewire/pipewire.git",

-          "tag": "0.3.40",

-          "commit": "7afd80052b7c49754a13c9ab49c368f95b60e0a7"

+          "url": "https://github.com/aja-video/ntv2.git",

+          "tag": "v16.2-bugfix5",

+          "commit": "0acbac70a0b5e6509cca78cfbf69974c73c10db9"

         }

     },

     {

-      "name": "ntv2",

+      "name": "jansson",

       "buildsystem": "cmake-ninja",

       "builddir": true,

       "config-opts": 

-        "-DCMAKE_BUILD_TYPE=Release",

-        "-DAJA_BUILD_OPENSOURCE=ON",

-        "-DAJA_BUILD_APPS=OFF",

-        "-DAJA_INSTALL_HEADERS=ON"

+        "-DJANSSON_EXAMPLES=OFF",

+        "-DJANSSON_BUILD_DOCS=OFF",

+        "-DJANSSON_BUILD_SHARED_LIBS=ON",

+        "-DJANSSON_WITHOUT_TESTS=ON"

       ,

       "cleanup": 

-        "/include"

+        "/include",

+        "/lib/pkgconfig"

       ,

       "sources": 

         {

           "type": "git",

-          "url": "https://github.com/aja-video/ntv2.git",

-          "tag": "v16.2-bugfix5",

-          "commit": "0acbac70a0b5e6509cca78cfbf69974c73c10db9"

+          "url": "https://github.com/akheron/jansson.git",

+          "tag": "v2.14",

+          "commit": "684e18c927e89615c2d501737e90018f4930d6c5"

         }

     },

​

@@ -21,9 +21,14 @@

     cmake --build ${BUILD_DIR} -t package

     DEB_NAME=$(find ${BUILD_DIR} -maxdepth 1 -type f -name "obs*.deb" | sort -rn | head -1)

+    DEBUG_NAME="${DEB_NAME//.deb/-dbgsym.ddeb}"

     if  "${DEB_NAME}" ; then

-        mv ${DEB_NAME} ${BUILD_DIR}/${FILE_NAME}

+        mv "${DEB_NAME}" "${BUILD_DIR}/${FILE_NAME}"

+

+        if  "${DEBUG_NAME}" ; then

+            mv "${DEBUG_NAME}" "${BUILD_DIR}/${FILE_NAME//.deb/-dbgsym.ddeb}"

+        fi

     else

         error "ERROR No suitable OBS debian package generated"

     fi

​

@@ -0,0 +1,35 @@

+"AppBuild"

+{

+   "AppID" "1905640"

+   "Desc" "github_@@DESC@@"

+

+   "ContentRoot" "./"

+   "BuildOutput" "build/"

+   

+   "SetLive" "@@BRANCH@@"

+

+   "Depots"

+   {

+       "1905642" // Windows

+       {

+           "ContentRoot" "./steam-windows"

+           "FileMapping"

+           {

+               "LocalPath" "*"

+               "DepotPath" "."

+               "recursive" "1"

+           }

+       }

+       

+       "1905641" // Mac

+       {

+           "ContentRoot" "./steam-macos"

+           "FileMapping"

+           {

+               "LocalPath" "*"

+               "DepotPath" "."

+               "recursive" "1"

+           }

+       }

+   }

+}

​

@@ -63,31 +63,59 @@

     $BuildDirectoryActual = "${BuildDirectory}$(if (${BuildArch} -eq "x64") { "64" } else { "32" })"

     $GeneratorPlatform = "$(if (${BuildArch} -eq "x64") { "x64" } else { "Win32" })"

-    $CmakeCommand = @(

-        "-G", ${CmakeGenerator}

-        "-DCMAKE_GENERATOR_PLATFORM=`"${GeneratorPlatform}`"",

-        "-DCMAKE_SYSTEM_VERSION=`"${CmakeSystemVersion}`"",

-        "-DCMAKE_PREFIX_PATH:PATH=`"${CmakePrefixPath}`"",

-        "-DCEF_ROOT_DIR:PATH=`"${CefDirectory}`"",

-        "-DENABLE_BROWSER=ON",

-        "-DVLC_PATH:PATH=`"${CheckoutDir}/../obs-build-dependencies/vlc-${WindowsVlcVersion}`"",

-        "-DENABLE_VLC=ON",

-        "-DCMAKE_INSTALL_PREFIX=`"${BuildDirectoryActual}/install`"",

-        "-DVIRTUALCAM_GUID=`"${Env:VIRTUALCAM-GUID}`"",

-        "-DTWITCH_CLIENTID=`"${Env:TWITCH_CLIENTID}`"",

-        "-DTWITCH_HASH=`"${Env:TWITCH_HASH}`"",

-        "-DRESTREAM_CLIENTID=`"${Env:RESTREAM_CLIENTID}`"",

-        "-DRESTREAM_HASH=`"${Env:RESTREAM_HASH}`"",

-        "-DYOUTUBE_CLIENTID=`"${Env:YOUTUBE_CLIENTID}`"",

-        "-DYOUTUBE_CLIENTID_HASH=`"${Env:YOUTUBE_CLIENTID_HASH}`"",

-        "-DYOUTUBE_SECRET=`"${Env:YOUTUBE_SECRET}`"",

-        "-DYOUTUBE_SECRET_HASH=`"${Env:YOUTUBE_SECRET_HASH}`"",

-        "-DCOPIED_DEPENDENCIES=OFF",

-        "-DCOPY_DEPENDENCIES=ON",

-        "-DBUILD_FOR_DISTRIBUTION=`"$(if (Test-Path Env:BUILD_FOR_DISTRIBUTION) { "ON" } else { "OFF" })`"",

-        "$(if (Test-Path Env:CI) { "-DOBS_BUILD_NUMBER=${Env:GITHUB_RUN_ID}" })",

-        "$(if (Test-Path Variable:$Quiet) { "-Wno-deprecated -Wno-dev --log-level=ERROR" })"

-    )

+    if ( $PSVersionTable.PSVersion -ge '7.3.0' ) {

+        $CmakeCommand = @(

+            "-G", ${CmakeGenerator}

+            "-DCMAKE_GENERATOR_PLATFORM=${GeneratorPlatform}",

+            "-DCMAKE_SYSTEM_VERSION=${CmakeSystemVersion}",

+            "-DCMAKE_PREFIX_PATH:PATH=${CmakePrefixPath}",

+            "-DCEF_ROOT_DIR:PATH=${CefDirectory}",

+            "-DENABLE_BROWSER=ON",

+            "-DVLC_PATH:PATH=${CheckoutDir}/../obs-build-dependencies/vlc-${WindowsVlcVersion}",

+            "-DENABLE_VLC=ON",

+            "-DCMAKE_INSTALL_PREFIX=${BuildDirectoryActual}/install",

+            "-DVIRTUALCAM_GUID=${Env:VIRTUALCAM-GUID}",

+            "-DTWITCH_CLIENTID=${Env:TWITCH_CLIENTID}",

+            "-DTWITCH_HASH=${Env:TWITCH_HASH}",

+            "-DRESTREAM_CLIENTID=${Env:RESTREAM_CLIENTID}",

+            "-DRESTREAM_HASH=${Env:RESTREAM_HASH}",

+            "-DYOUTUBE_CLIENTID=${Env:YOUTUBE_CLIENTID}",

+            "-DYOUTUBE_CLIENTID_HASH=${Env:YOUTUBE_CLIENTID_HASH}",

+            "-DYOUTUBE_SECRET=${Env:YOUTUBE_SECRET}",

+            "-DYOUTUBE_SECRET_HASH=${Env:YOUTUBE_SECRET_HASH}",

+            "-DCOPIED_DEPENDENCIES=OFF",

+            "-DCOPY_DEPENDENCIES=ON",

+            "-DBUILD_FOR_DISTRIBUTION=$(if (Test-Path Env:BUILD_FOR_DISTRIBUTION) { "ON" } else { "OFF" })",

+            "$(if (Test-Path Env:CI) { "-DOBS_BUILD_NUMBER=${Env:GITHUB_RUN_ID}" })",

+            "$(if (Test-Path Variable:$Quiet) { "-Wno-deprecated -Wno-dev --log-level=ERROR" })"

+        )

+    } else {

+        $CmakeCommand = @(

+            "-G", ${CmakeGenerator}

+            "-DCMAKE_GENERATOR_PLATFORM=`"${GeneratorPlatform}`"",

+            "-DCMAKE_SYSTEM_VERSION=`"${CmakeSystemVersion}`"",

+            "-DCMAKE_PREFIX_PATH:PATH=`"${CmakePrefixPath}`"",

+            "-DCEF_ROOT_DIR:PATH=`"${CefDirectory}`"",

+            "-DENABLE_BROWSER=ON",

+            "-DVLC_PATH:PATH=`"${CheckoutDir}/../obs-build-dependencies/vlc-${WindowsVlcVersion}`"",

+            "-DENABLE_VLC=ON",

+            "-DCMAKE_INSTALL_PREFIX=`"${BuildDirectoryActual}/install`"",

+            "-DVIRTUALCAM_GUID=`"${Env:VIRTUALCAM-GUID}`"",

+            "-DTWITCH_CLIENTID=`"${Env:TWITCH_CLIENTID}`"",

+            "-DTWITCH_HASH=`"${Env:TWITCH_HASH}`"",

+            "-DRESTREAM_CLIENTID=`"${Env:RESTREAM_CLIENTID}`"",

+            "-DRESTREAM_HASH=`"${Env:RESTREAM_HASH}`"",

+            "-DYOUTUBE_CLIENTID=`"${Env:YOUTUBE_CLIENTID}`"",

+            "-DYOUTUBE_CLIENTID_HASH=`"${Env:YOUTUBE_CLIENTID_HASH}`"",

+            "-DYOUTUBE_SECRET=`"${Env:YOUTUBE_SECRET}`"",

+            "-DYOUTUBE_SECRET_HASH=`"${Env:YOUTUBE_SECRET_HASH}`"",

+            "-DCOPIED_DEPENDENCIES=OFF",

+            "-DCOPY_DEPENDENCIES=ON",

+            "-DBUILD_FOR_DISTRIBUTION=`"$(if (Test-Path Env:BUILD_FOR_DISTRIBUTION) { "ON" } else { "OFF" })`"",

+            "$(if (Test-Path Env:CI) { "-DOBS_BUILD_NUMBER=${Env:GITHUB_RUN_ID}" })",

+            "$(if (Test-Path Variable:$Quiet) { "-Wno-deprecated -Wno-dev --log-level=ERROR" })"

+        )

+    }

     Invoke-External cmake -S . -B  "${BuildDirectoryActual}" @CmakeCommand

​

@@ -642,6 +642,26 @@

        return Str(string);

    }

+   bool obs_frontend_is_theme_dark(void) override

+   {

+       return App()->IsThemeDark();

+   }

+

+   char *obs_frontend_get_last_recording(void) override

+   {

+       return bstrdup(main->outputHandler->lastRecordingPath.c_str());

+   }

+

+   char *obs_frontend_get_last_screenshot(void) override

+   {

+       return bstrdup(main->lastScreenshot.c_str());

+   }

+

+   char *obs_frontend_get_last_replay(void) override

+   {

+       return bstrdup(main->lastReplay.c_str());

+   }

+

    void on_load(obs_data_t *settings) override

    {

        for (size_t i = saveCallbacks.size(); i > 0; i--) {

​

@@ -311,10 +311,12 @@

    const char *device_str =

        get_os_text(mod, "Monitor", "DisplayCapture.Display", "Screen");

    ui->deviceLabel->setText(device_str);

+#ifndef _WIN32

    is_int = true;

+#endif

 #ifdef _WIN32

-   prop_name = "monitor";

+   prop_name = "monitor_id";

 #elif __APPLE__

    prop_name = "display";

 #else

​

@@ -113,6 +113,7 @@

 SourceProperties="Open Source Properties"

 SourceFilters="Open Source Filters"

 MixerToolbarMenu="Audio Mixer Menu"

+SceneFilters="Open Scene Filters"

 # warning for plugin load failures

 PluginsFailedToLoad.Title="Plugin Load Error"

@@ -204,6 +205,7 @@

 Basic.AutoConfig.StreamPage.Service.Custom="Custom..."

 Basic.AutoConfig.StreamPage.Server="Server"

 Basic.AutoConfig.StreamPage.StreamKey="Stream Key"

+Basic.AutoConfig.StreamPage.StreamKey.ToolTip="RIST: enter the encryption passphrase.\nRTMP: enter the key provided by the service.\nSRT: enter the streamid if the service uses one."

 Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(Link)"

 Basic.AutoConfig.StreamPage.EncoderKey="Encoder Key"

 Basic.AutoConfig.StreamPage.ConnectedAccount="Connected account"

@@ -266,6 +268,8 @@

 Updater.Running.Text="Outputs are currently active, please shut down any active outputs before attempting to update"

 Updater.NoUpdatesAvailable.Title="No updates available"

 Updater.NoUpdatesAvailable.Text="No updates are currently available"

+Updater.BranchNotFound.Title="Update Channel Removed"

+Updater.BranchNotFound.Text="Your selected update channel is no longer available, OBS has been reset to the default."

 Updater.RepairButUpdatesAvailable.Title="Integrity Check Unavailable"

 Updater.RepairButUpdatesAvailable.Text="Checking file integrity is only possible for the latest version available. Use Help → Check For Updates to verify and update your OBS installation."

 Updater.RepairConfirm.Title="Confirm Integrity Check"

@@ -833,6 +837,10 @@

 Basic.Settings.General="General"

 Basic.Settings.General.Theme="Theme"

 Basic.Settings.General.Language="Language"

+Basic.Settings.General.Updater="Updates"

+Basic.Settings.General.UpdateChannel="Update Channel"

+Basic.Settings.General.UpdateChannelDisabled="(Disabled)"

+Basic.Settings.General.UpdateChannelDefault="(Default)"

 Basic.Settings.General.EnableAutoUpdates="Automatically check for updates on startup"

 Basic.Settings.General.OpenStatsOnStartup="Open stats dialog on startup"

 Basic.Settings.General.HideOBSWindowsFromCapture="Hide OBS windows from screen capture"

@@ -884,12 +892,20 @@

 Basic.Settings.General.MultiviewLayout.16Scene="Scenes only (16 Scenes)"

 Basic.Settings.General.MultiviewLayout.25Scene="Scenes only (25 Scenes)"

+# default channel name translations

+Basic.Settings.General.ChannelName.stable="Stable"

+Basic.Settings.General.ChannelDescription.stable="Latest stable release"

+Basic.Settings.General.ChannelName.beta="Betas / Release Candidates"

+Basic.Settings.General.ChannelDescription.beta="Potentially unstable pre-release versions"

+

 # basic mode 'stream' settings

 Basic.Settings.Stream="Stream"

 Basic.Settings.Stream.StreamType="Stream Type"

 Basic.Settings.Stream.Custom.UseAuthentication="Use authentication"

 Basic.Settings.Stream.Custom.Username="Username"

 Basic.Settings.Stream.Custom.Password="Password"

+Basic.Settings.Stream.Custom.Username.ToolTip="RIST: enter the srp_username.\nRTMP: enter the username.\nSRT: not used."

+Basic.Settings.Stream.Custom.Password.ToolTip="RIST: enter the srp_password.\nRTMP: enter the password.\nSRT: enter the encryption passphrase."

 Basic.Settings.Stream.BandwidthTestMode="Enable Bandwidth Test Mode"

 Basic.Settings.Stream.TTVAddon="Twitch Chat Add-Ons"

 Basic.Settings.Stream.TTVAddon.None="None"

@@ -926,6 +942,7 @@

 Basic.Settings.Output.ReplayBuffer.SecondsMax="Maximum Replay Time"

 Basic.Settings.Output.ReplayBuffer.MegabytesMax="Maximum Memory (Megabytes)"

 Basic.Settings.Output.ReplayBuffer.Estimate="Estimated memory usage: %1 MB"

+Basic.Settings.Output.ReplayBuffer.EstimateTooLarge="Warning: Estimated memory usage of %1 MiB is larger than recommended maximum of %2 MiB"

 Basic.Settings.Output.ReplayBuffer.EstimateUnknown="Cannot estimate memory usage. Please set maximum memory limit."

 Basic.Settings.Output.ReplayBuffer.Prefix="Replay Buffer Filename Prefix"

 Basic.Settings.Output.ReplayBuffer.Suffix="Suffix"

@@ -944,12 +961,15 @@

 Basic.Settings.Output.Simple.Warn.Lossless.Title="Lossless quality warning!"

 Basic.Settings.Output.Simple.Encoder.Software="Software (x264)"

 Basic.Settings.Output.Simple.Encoder.Hardware.QSV.H264="Hardware (QSV, H.264)"

+Basic.Settings.Output.Simple.Encoder.Hardware.QSV.AV1="Hardware (QSV, AV1)"

 Basic.Settings.Output.Simple.Encoder.Hardware.AMD.H264="Hardware (AMD, H.264)"

 Basic.Settings.Output.Simple.Encoder.Hardware.AMD.HEVC="Hardware (AMD, HEVC)"

+Basic.Settings.Output.Simple.Encoder.Hardware.AMD.AV1="Hardware (AMD, AV1)"

 Basic.Settings.Output.Simple.Encoder.Hardware.NVENC.H264="Hardware (NVENC, H.264)"

 Basic.Settings.Output.Simple.Encoder.Hardware.NVENC.AV1="Hardware (NVENC, AV1)"

 Basic.Settings.Output.Simple.Encoder.Hardware.NVENC.HEVC="Hardware (NVENC, HEVC)"

 Basic.Settings.Output.Simple.Encoder.Hardware.Apple.H264="Hardware (Apple, H.264)"

+Basic.Settings.Output.Simple.Encoder.Hardware.Apple.HEVC="Hardware (Apple, HEVC)"

 Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="Software (x264 low CPU usage preset, increases file size)"

 Basic.Settings.Output.Simple.TwitchVodTrack="Twitch VOD Track (Uses Track 2)"

 Basic.Settings.Output.Warn.EnforceResolutionFPS.Title="Incompatible Resolution/Framerate"

@@ -1046,7 +1066,6 @@

 Basic.Settings.Video.ScaledResolution="Output (Scaled) Resolution"

 Basic.Settings.Video.DownscaleFilter="Downscale Filter"

 Basic.Settings.Video.DownscaleFilter.Unavailable="Resolutions match, no downscaling required"

-Basic.Settings.Video.DisableAeroWindows="Disable Aero (Windows only)"

 Basic.Settings.Video.FPS="FPS"

 Basic.Settings.Video.FPSCommon="Common FPS Values"

 Basic.Settings.Video.FPSInteger="Integer FPS Value"

@@ -1056,7 +1075,6 @@

 Basic.Settings.Video.Renderer="Renderer"

 Basic.Settings.Video.InvalidResolution="Invalid resolution value. Must be widthxheight (i.e. 1920x1080)"

 Basic.Settings.Video.CurrentlyActive="Video output is currently active. Please turn off any outputs to change video settings."

-Basic.Settings.Video.DisableAero="Disable Aero"

 # scale filters

 Basic.Settings.Video.DownscaleFilter.Bilinear="Bilinear (Fastest, but blurry if scaling)"

@@ -1135,7 +1153,7 @@

 Basic.Settings.Advanced.Video.ColorFormat.I444="I444 (8-bit, 4:4:4, 3 planes)"

 Basic.Settings.Advanced.Video.ColorFormat.P010="P010 (10-bit, 4:2:0, 2 planes)"

 Basic.Settings.Advanced.Video.ColorFormat.I010="I010 (10-bit, 4:2:0, 3 planes)"

-Basic.Settings.Advanced.Video.ColorFormat.RGB="RGB (8-bit)"

+Basic.Settings.Advanced.Video.ColorFormat.BGRA="BGRA (8-bit)"

 Basic.Settings.Advanced.Video.ColorSpace="Color Space"

 Basic.Settings.Advanced.Video.ColorSpace.sRGB="sRGB"

 Basic.Settings.Advanced.Video.ColorSpace.601="Rec. 601"

@@ -1164,7 +1182,7 @@

 Basic.Settings.Advanced.Hotkeys.NeverDisableHotkeys="Never disable hotkeys"

 Basic.Settings.Advanced.Hotkeys.DisableHotkeysInFocus="Disable hotkeys when main window is in focus"

 Basic.Settings.Advanced.Hotkeys.DisableHotkeysOutOfFocus="Disable hotkeys when main window is not in focus"

-Basic.Settings.Advanced.AutoRemux="Automatically remux to mp4"

+Basic.Settings.Advanced.AutoRemux="Automatically remux to %1"

 Basic.Settings.Advanced.AutoRemux.MP4="(record as mkv)"

 # advanced audio properties

@@ -1254,6 +1272,7 @@

 # Output warnings

 OutputWarnings.NoTracksSelected="You must select at least one track"

 OutputWarnings.MP4Recording="Warning: Recordings saved to MP4/MOV will be unrecoverable if the file cannot be finalized (e.g. as a result of BSODs, power losses, etc.). If you want to record multiple audio tracks consider using MKV and remux the recording to MP4/MOV after it is finished (File → Remux Recordings)"

+OutputWarnings.ProResRecording="Apple ProRes is not supported by the %1 container format - supported container formats are mov (preferred) and mkv."

 OutputWarnings.CannotPause="Warning: Recordings cannot be paused if the recording encoder is set to \"(Use stream encoder)\""

 # deleting final scene

​

@@ -524,6 +524,10 @@

     qproperty-icon: url(./Dark/media-pause.svg);

 }

+* themeID="filtersIcon" {

+    qproperty-icon: url(./Dark/filter.svg);

+}

+

 QToolBarExtension {

     background: palette(button);

     min-width: 12px;

@@ -819,7 +823,7 @@

     background-color: rgb(22,31,65);

 }

-QPushButton:disabled {

+QPushButton:disabled, QToolButton:disabled {

     background-color: rgb(22,31,65);

 }

@@ -1519,3 +1523,8 @@

 OBSBasicStats {

     background: palette(dark);

 }

+

+/* Advanced audio dialog */

+OBSBasicAdvAudio #scrollAreaWidgetContents {

+    background: palette(dark);

+}

​

@@ -328,6 +328,10 @@

     qproperty-icon: url(./Dark/cogs.svg);

 }

+* themeID="filtersIcon" {

+    qproperty-icon: url(./Dark/filter.svg);

+}

+

 /* Tab Widget */