@@ -1,4 +1,131 @@

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

+Sat Apr  6 16:14:42 UTC 2019 - Jimmy Berry <jimmy@boombatower.com>

+

+- Add libqt5-qtsvg-devel as a build dependency.

+

+-------------------------------------------------------------------

+Sat Apr 06 02:50:54 UTC 2019 - jimmy@boombatower.com

+

+- Update to version 23.1.0:

+  * obs-ffmpeg: Remove "A" variants from NVENC blacklist

+  * libobs: Fix and simplify Area scale filter

+  * Update translations from Crowdin

+  * libobs: Update version to 23.1.0

+  * UI: Do not show [x] (close) for primary dock widgets

+  * UI: Fix file browser showing up when dir selected

+  * UI: Fix issue where space/esc hotkeys would be blank

+  * UI: Fix crash when using ctrl-c in Linux terminal

+  * UI: Allow smaller Restream docks

+  * libobs, image-source: Fix ABI break in image_file_t structure

+  * UI: Fix act. feed version hide check to <= 23.0.2

+  * libobs: Change internal version to 23.0.3 (temporarily)

+  * obs-ffmpeg: Show encoder name when logging jim-nvenc

+  * UI: Hide act. feed by default if prev ver below 23.1

+  * UI: Remove help icon from source select dialog

+  * UI: Don't open settings or close in event subloop

+  * libobs: Update version to 23.1.0

+  * CI: Add Restream secrets for AppVeyor

+  * obs-ffmpeg: Fix blacklisted adapter check

+  * UI: Add Restream integration

+  * win-dshow: Update libdshowcapture for crash fix

+  * libobs: Remove dead code in sharpness effect

+  * obs-filters: Remove unused function in shader

+  * libobs: Fix Area scale filter for GLSL

+  * CI: Don't build service integration in PRs&Forks

+  * CI: Build service integration on Azure Pipelines

+  * obs-browser: Make DispatchJSEvent asynchronous

+  * libobs: Fix ABI break

+  * UI: Remove and ignore obs.rc

+  * libobs-opengl: Fix bad log string

+  * libobs: Fix output type specifiers

+  * libobs: Fix invalid max_anisotropy value

+  * UI: Use icons from theme on Linux

+  * Revert "UI: Add obs.rc to .gitignore"

+  * libobs: Fix obs_property_float_set_limits

+  * image-source: Re-add fix of repeating images

+  * UI: Remove Area downscale filter option

+  * UI: Add obs.rc to .gitignore

+  * Revert "obs-ffmpeg: Add option to use b-frames as reference"

+  * libobs: Fix effect parsing log specifiers

+  * rtmp-services: Add GameTips.tv

+  * obs-ffmpeg: Use correct calling convention on CreateDXGIFactory1

+  * image-source: Add memory usage limit to slideshow

+  * libobs/graphics: Add memory usage member to image file

+  * libobs: Add function to get libobs object data

+  * image-source: Revert slideshow dynamic loading

+  * libobs: Fix frame not being cleared

+  * CI: Build for Linux on Azure Pipelines

+  * CI: Build on Ubuntu Xenial for Travis CI

+  * Adjust locales for better consistency

+  * libobs-d3d11: Log errors from HasBadNV12Output just in case

+  * libobs-d3d11: Improve NV12 validity check for AMD

+  * CI: Always send travis webhook and remove IRC sections

+  * obs-ffmpeg: Change clear on media end wording for media source

+  * cmake: Fix Qt DLL filenames for debug builds

+  * UI: Add confirmation dialog for bandwidth test mode

+  * UI: Add PAL 25 & 50 FPS as common FPS values

+  * UI: Fix yes/no not using localization in no source dialog

+  * UI: Change HDD to Disk in locale

+  * UI: Add checkbox for Twitch bandwidth test mode

+  * CI: Build 32/64 bit Windows parallel on Azure

+  * CI: Build for windows on Azure Pipelines

+  * obs-text, win-capture: Do not use premultiplied alpha

+  * Add "Area" scale filter

+  * UI: Fix "What's New" showing again each patch version

+  * UI: If from 23.0.1 or 23.0.0, hide activity feed

+  * UI: Add Twitch Activity Feed

+  * libobs: Remove unnecessary count check

+  * libobs: Fix code styling

+  * libobs: Fix first frame when output restarted

+  * UI: Redo settings icons

+  * CI: Fix building on trusty

+  * UI: Add (Do not show again) checkbox to dock closing warning

+  * Revert "Merge pull request #1418 from cabirdme/qsv_feature_add"

+  * Revert "obs-qsv: Enable b-pyramid & change packet priority"

+  * UI: Warn when closing dock widgets for first time

+  * UI: Add way to exec std::function via invokeMethod

+  * obs-ffmpeg: Check avformat context before use

+  * obs-ffmpeg: Fix crash on failed audio codec init (for real)

+  * UI: Always set first scene collection/profiles

+  * obs-ffmpeg: Fix crash on failed audio codec init

+  * libobs-d3d11: Check for bad NV12 output on all devices

+  * libobs-d3d11: Perform actual test for NV12 driver bug

+  * libobs-d3d11: Remove NV12 blacklist

+  * libobs: Always query shared texture handle for encoding

+  * UI: Add preview/program labels in studio mode

+  * decklink: Fix locale (missing word)

+  * decklink: Allow selecting input connections.

+  * decklink: Fix FC<->LFE channel swap for some devices

+  * obs-text: Add text transform property

+  * win-dshow: Fix "Highest FPS" algorithm

+  * libobs-d3d11: Reset handle and re-lock if texture rebuilt

+  * libobs-d3d11: Use discrete function to get shared handle

+  * libobs-d3d11: Set acquired bool when texture acquired

+  * obs-ffmpeg: Always output SEI

+  * obs-ffmpeg: Fix SEI data output

+  * frontend-tools: Fix memory leak when reloading scripts

+  * UI: Show video container warning when selecting MOV

+  * UI: Update tab stop order in Settings

+  * libobs: Tell filters that we want to load

+  * CI: macOS builds on Azure Pipelines

+  * obs-qsv11: Fix crash on destructor after init failure

+  * obs-qsv11: Don't try to free non allocated array on destruction

+  * cmake: Fix pkg-config handling of libvlc

+  * obs-ffmpeg: Fix NVENC blacklisted card check

+  * decklink: Update SDK to 10.11.4

+  * UI: Add ability to copy & paste filters from the mixer

+  * UI: Fix locale for 'disabled' devices in audio settings

+  * rtmp-services: Added GamePlank to services

+  * image-source: Fix repeating of images with slideshow source

+  * libobs-opengl: Log shader compiler errors

+  * libobs/media-io: Fix mono upmix

+  * UI: Reset replay buffer button on "stop" signal

+  * obs-ffmpeg: Add option to use b-frames as reference

+  * obs-filters/expander: Various improvements

+  * linux-v4l2: Add setting to change color range

+  * UI: Automatically generate Windows file description

+

+-------------------------------------------------------------------

 Fri Mar 08 21:04:44 UTC 2019 - jimmy@boombatower.com

 - Update to version 23.0.2:

​

@@ -1,5 +1,5 @@

 Name:           obs-studio

-Version:        23.0.2

+Version:        23.1.0

 Release:        0

 Summary:        A recording/broadcasting program

 Group:          Productivity/Multimedia/Video/Editors and Convertors

@@ -22,6 +22,7 @@

 BuildRequires:  libjansson-devel

 BuildRequires:  libpulse-devel

 BuildRequires:  libqt5-qtbase-devel >= 5.3

+BuildRequires:  libqt5-qtsvg-devel

 BuildRequires:  libqt5-qtx11extras-devel >= 5.3

 BuildRequires:  libudev-devel

 BuildRequires:  libv4l-devel

​

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

 <services>

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

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

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

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

     <param name="url">git://github.com/jp9000/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">git://github.com/jp9000/obs-studio.git</param>

-    <param name="changesrevision">3d63907976bcfb67ac0588185c7fef295d280d36</param>

+    <param name="changesrevision">6550c0dfaaf3b02da6c58bcdde7735682daf2dce</param>

   </service>

 </servicedata>

​

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

-IDI_ICON1 ICON DISCARDABLE "../cmake/winrc/obs-studio.ico"

​

@@ -29,7 +29,7 @@

       before_deploy: "./CI/before-deploy-osx.sh"

     - os: linux

-      dist: trusty

+      dist: xenial

       sudo: required

       before_install: "./CI/install-dependencies-linux.sh"

       before_script: "./CI/before-script-linux.sh"

@@ -50,21 +50,10 @@

     condition: "$TRAVIS_OS_NAME = osx"

     all_branches: true

-# The channel name "azubu.il.us.quakenet.org#obs-dev" is encrypted against jp9000/obs-studio to prevent IRC spam of forks

-#notifications:

-#  irc:

-#    skip_join: false

-#    template:

-#      - "[Travis CI|%{result}] %{repository_name}/%{branch} (%{author} - %{commit_subject}) %{build_url}"

-#    channels:

-#      - secure: k9j7+ogVODMlveZdd5pP73AVLCFl1VbzVaVon0ECn3EQcxnLSpiZbc6l+PnIUKgee5pRKtUB4breufgmr4puq3s69YeQiOVKk5gx2yJGZ5jGacbSne0xTspzPxapiEbVUkcJ2L7gKntDG4+SUiW67dtt4G26O7zsErDF/lY/woQ=

-#    on_failure: always

-#    on_success: change

 notifications:

   webhooks:

     urls:

-      - secure: T5RBY818nO40nr5eC8pdrCfAdQKGkjQdbyYw7mfFrhxWxgt/U5tyKXpX0l9zNGfobS0SnLSqF71OrfW04V97oijXx3q5Y24xV6mSrlLQZOq19+XvGp82LDpkVd4yi2N0kBYpoANB9Pkof4jWT/rKfdQCQttluOLjgr5SM0uWHRg=

       - secure: EVI2cu5OnNxVTl4jdVppps7O869gGN1PDcSi8fqq/HJVM5kif8iDe4wCrIKv6yWrK3dSNwRgBAwpcPZglRJnKRh23PdFoCdnTjgzBQlmjUR6BYlunQvoKR9mVX6AdT8zrFDgmtC4aOtGD2paptpqt+Equo25KrLwv+qOHJOTrSQ=

-    on_success: change

+    on_success: always

     on_failure: always

​

@@ -270,91 +270,94 @@

 Translators:

 Gol D. Ace (goldace)

-medicmomcilo

 ynetwork

+medicmomcilo

 SuslikV

-nikolanikola

 Gige

 shousa

 grocal

-Jaime Muñoz Martín (jmmartin_5)

-Bob Liu (Akagi201)

 georgianizator

+Jaime Muñoz Martín (jmmartin_5)

+Anton R (FirePhoenix)

 Arkkis (j)

+Bob Liu (Akagi201)

 Jirka 'Venty' Michel (VentyCZ)

-Eric Bataille (ThoNohT)

-Anton R (FirePhoenix)

-Alexander Gabilondo (alexgabi)

 NCAA

+Alexander Gabilondo (alexgabi)

+Eric Bataille (ThoNohT)

 TzeKei Lee (chikei)

+Shaolin (admshao)

 GunChleoc

+Manfre#9262 (manfre)

+Vainock (ivo.lemmert)

 Alek Nirov (dectanova)

-Shaolin (admshao)

 Kenta Takumi (kenta0644)

 Michael Fabian Dirks (Xaymar)

 Marcos Vidal Martinez (M4RK22)

 dodgepong

 amirsher

 Imre Kristoffer Eilertsen (DandelionSprout)

-Vainock (ivo.lemmert)

 Luki (luki1412)

-Johnny “max20091” Utah (boostyourprogram)

 pkviet

+Johnny “max20091” Utah (boostyourprogram)

+Cristian Silaghi (stelistcristi)

 jermel

 banrek

 dandalion

-Cristian Silaghi (stelistcristi)

 Ali Kömesöğütlü (Mobile46) (byzlo685)

 shamuntohamd

 LordShadow95

 dwaeji-aizelle

+Albakham (albakham)

 Taesh (magnusmbratteng)

 radzaquiel

 Jaime Martinez Rincon (mrjaime1999)

-Manfre#9262 (manfre)

+Jens Hyllegaard (Hyllegaard)

+anto27

 j3dy

 nyakayed

-Jens Hyllegaard (Hyllegaard)

+Erik Bročko (ericek111)

+Vainbot

 Jarska

 Katerina (katerinaramm)

 Marocco2

-Erik Bročko (ericek111)

-anto27

 Stéphane Lepin (Palakis)

 MartinEwing

 Xesús M. Mosquera Carregal (xesusmosquera)

 Ev1lbl0w

+wwj402_github

 Scourgemcdak

 Roberto Lorenzo (HonzoNebro)

+ZILZAL

 Loyd Stephen Jayme (loydjayme25)

 Sigge Stjärnholm (Kladdy)

-ZILZAL

 amsyar ZeRo (amsyarminer555)

 imcesca

 jbeguna04

 Hưng Nguyễn (hoyostudio)

 lonelywolf11

 omer.karagoz (mrkaragoz)

+Tocram2 (tocram2)

 Michel Snippe (michelsnippe)

 Matt Gajownik (WizardCM)

 philiparniebinag

 Nunzio Conte (nunzioconte54)

+Benet R. i Camps (BennyBeat) (BennyBeat)

 Greendweller

 kristjan.krusic (krusic22)

 smart2128

 Mepharees

 jmontane

+Monsteer

 Nil Campamà (Soifam)

 Ramon Mendes (rbrgameplays)

-Tocram2 (tocram2)

 Benjamin Cambour (lesinfox)

 Abdullah AL-Qahtani (Za7ef_SA)

-Benet R. i Camps (BennyBeat) (BennyBeat)

 Osoitz

 srdjan_m

+MZ MAXIMUM (mahdigamermax)

 Pavel (Shevalie)

 Fabio Madia (Shaolin)

-wwj402_github

 Zakxaev68

 VNGXR

 begjan

@@ -365,48 +368,51 @@

 MaltahlGaming (maltahlgaming)

 Justas Vilimas (tyntas)

 Yberion

+Hexcolyte

 AthlonHD

 Ján M (longmoped)

 Anders G. Jørgensen (spirit55555)

-Mats Edvin Aarø (matsedvin)

 Léo (leeo97one)

+Tiwi90 (tiwi90)

+Mats Edvin Aarø (matsedvin)

 Coen (Trigstur)

 ngoisaosang

 André Biscaia (LazP)

+Alex E. D. B. (alexedb)

 Julian_Lai

 Pikana

 kalmarin

-Alex E. D. B. (alexedb)

 Tasos Sahanidis (tatokis)

 Alireza Firouzi (pikhoshorg)

+EG Gamer (eggamer131)

+Vassamo (jotpl69)

 George T. (tzikas97)

 RisedSky (THEMINECRAFT951)

 Tomás Antunes (tomasantunes)

 AndresTraks

+pan93412

 Seyhan Halil (yildirim17)

+exeldro

 Cemal Dursun (cmldrs)

+Michael Yeh (hinet60613)

 BoboopTeam

 Hisashi

-Tiwi90 (tiwi90)

 Laccy IEST (Laccy)

 DoK_-

-Vassamo (jotpl69)

 Sven Kirschbaum (fallobst22) (fallobst22)

 Andrei Ionescu (abcdedjdmddx)

+Bugo

 David Kuo (s50407s)

 Pilar G. (TheMadnessLady)

-pan93412

 Michele (ScrappyCocco)

+Guilherme Dias (ThisGuy)

 myjourney in Steemit (myjourney)

 joaofvieira

-Bugo

 Danny (Dkamps18)

 Nicole (Dutchess_Nicole)

 peymanr34

 Licardo

-EG Gamer (eggamer131)

 areedw

-Michael Yeh (hinet60613)

 PabloLiu (719018105)

 BlakeNowah

 Gregor Bigalke (gregtcltk)

@@ -414,10 +420,9 @@

 xNaii (lyrikas5)

 aaakjt

 LittleGirl_WithPonyTail (alexs1320)

-You-Ruei Tzeng (e222et)

 Aredio Vani (aredio.vani)

+You-Ruei Tzeng (e222et)

 joaoboia

-Monsteer

 Michał Durak (micechal)

 Anton Lokaj (anlo)

 DarckCrystale

@@ -429,8 +434,8 @@

 MG lolenstine (mglolenstine)

 Sasasu

 mgKaiztra

-Umut kılıç (kilic190787)

 Tommaso Cammelli (tomganguz) (tomganguz)

+Umut kılıç (kilic190787)

 Ben Turner (ben-turner)

 Tim (robske_110) (robske110)

 Matthew Hatcher (MatthewSH)

@@ -442,6 +447,7 @@

 Tommy (nwgat)

 Runicar (dajtisina)

 Albin Pllana (albinnpllanaa)

+Tero Keso (tero.keso)

 DarkInFire

 Aleix Vidal i Gaya (leixet)

 CaioWzy

@@ -452,47 +458,48 @@

 Theguiguix

 Jasper J (JassieJ)

 Alex Thomassen (Decicus)

-MZ MAXIMUM (mahdigamermax)

 Oddbjørn Grytdal (Fooshi)

 Damian Korcz (damikiller)

+Martin Georgiev (DivideByNone)

 Richard Stanway (r1ch)

 Murat Karagöz (anemon_1994)

 鲜童 (xiananjyzy)

-Martin Georgiev (DivideByNone)

 Youtubeur FR│Giaco35 (Giaco35)

 Edoardo Macrì (edomacri)

 Dremski

+André Gama (ToeOficial)

 Łukasz Wójcik (lwojcik)

 sakuhanachan* (sakuhanachanloli)

 Victor Paul (corvinpaul)

-André Gama (ToeOficial)

-fromgate

 Kryštof Černý (cleverline1mc)

+fromgate

 Strange Grey Cat (StrangeGreyCat)

 معتصم دعنا (rozana-media)

 Wildrage

-mdod

+Sergey (LegionAnon)

+Skellytone

 cai_miao

+mdod

+craftwar

 clr0dr1g

 aalonsomb

 Daniel Wieczorek (Kennyluz)

 Red Dayao (steemitph)

+steve_fr

 Andy (anry025)

 Acamicamacaraca

-craftwar

-steve_fr

+Thomas (thomassth)

 EduCare Razmik Badalyan (badalyanrazmik)

-Skellytone

 Opportunity (OpportunityLiu)

 Maximiliano Schtroumpftech Pena-Roig (som2tokmynam)

 MarsYoung

 Sander Skjegstad (r530er)

 Mihai G (babasghenciu)

-ธีรภัทร์ โยชนา (Gataro)

 Rana Awais (ehtisham)

+ธีรภัทร์ โยชนา (Gataro)

 Sakia Normal Human (arcanaarcana5)

-Mateusz (Silesianek)

 Benjamin Klettbach (benklett)

+Mateusz (Silesianek)

 kyllian (tardigradeus)

 Edoardo “OfficialDJMela” Macrì (agersforum)

 Forbidden (cptbl00dra1n)

@@ -500,193 +507,200 @@

 Carlos Plata (carlosesgenial33)

 RedditRook

 Inku Xuan (inkuxuan)

+Jonatan Nyberg (sweuser)

 Alex Kalles (alexakis1997)

-Silpheel

 Юрій (Devinit)

+Silpheel

+Pyscowicz

 Bond-009

+OsteHovel

+ibnehayati

 Hà Phi Hùng (haphihungcom)

 gianni morandi (strabbioboy)

 Anders Urban (minikaliffen)

 Chemi

 Saleh Luxmaroc (salehoukiki)

-Pyscowicz

 gecebekcisi1

-Tero Keso (tero.keso)

 WurstOnAir

 GANGAT Naeem (zboggum)

 Grimpy

-Hexcolyte

 Viktor Kitov (viktorkitov)

-txaro

 markpc

-exeldro

+txaro

 Andrea-M3

 IoeCmcomc (Ioe2015) (hopdaigia2004)

 henrycontreras

-yunluzhang

+Serge Sklyarov (sergesklyarov)

 Uri Ben Yossef (uribenyossef)

+yunluzhang

 Grisou2907

+Omer Kurdish (OmerKurd)

 lebaston100.de

 eskaidom (sergiomalagonmartin)

-Marcos Vidal (markitos.maki22)

 BaguetteDePain_

-Ruben Deig Ramos (rdeigramos)

+Marcos Vidal (markitos.maki22)

 Tensai

-copyliu

+Ruben Deig Ramos (rdeigramos)

+eZ_KrieG3R | Der Fabse (fabian.schwarz.26.06.1998)

 Fisherozzo

+copyliu

 Olle Dahström (odahlstrom)

-F_Producktions

+Deski_

 Mustafa2018

+F_Producktions

+Stoyan Stoyanov (sstoyanov)

+Bilguun Ochirbat (Bil0203)

 LoLLy Nka (lollynka279)

 opl

-Stoyan Stoyanov (sstoyanov)

-Sergio Beneduce (sbeneduce)

-Der Fabse (fabian.schwarz.26.06.1998)

 Boyuan Yang (073plan)

 SneakyFish5

-Deski_

+Sergio Beneduce (sbeneduce)

 Light1c3

 eemiroj

 Nurul Huda (nurulhuda859)

 Obama (Obama44)

 OfficialwobY

 Ndalabo Taema (hake_bsowq)

-Kiznoh

 Ray (Ipsumry)

+Kiznoh

 makiza1 (micosil_2)

 Stanislav_Evtimov

-epic_ziver_D

 djsavta

+epic_ziver_D

 illusdidi

 Watson Tsai (ashaneba)

-b__dm

+Alessandro Sarto (alesarto03)

 Legend27

+b__dm

 Han-Jen Cheng (notexist)

 Inndy.Lin (inndy)

-🌠 DarK | #Hello 🌠 (DarKTV_FR)

 Mathieu Hautebas (matteyeux)

+🌠 DarK | #Hello 🌠 (DarKTV_FR)

 Maky (the.real.maky)

 Sawanyo

 Jong Kwon Choi (dailypro)

+Harm van den Hoek (harm27)

+David Sonico (davidsubsonico)

 Adam Liszkai (adamos42)

 jkcoaster

 iosifidis

-David Sonico (davidsubsonico)

-Harm van den Hoek (harm27)

 Vlad (KoTmaxHo)

-Eleazar Córcoles (MtrElee3)

+manjotsingh0202

 mustafaa

+Eleazar Córcoles (MtrElee3)

+Yolopix

 tburette

 Gabriel Dugny (Gabigabigo)

 បងមាន តែអូន (cheaiphone267)

 Adrien “GameZone Tv” de Decker (redcraft007)

 Palana

-Marque Ziqulr (lugtelort)

 SkyLion

+Marque Ziqulr (lugtelort)

 chaironeko

-Hani Sweileh (hno.sweileh)

 Samuel Nthoroane (Samuel_Nthoroane)

 etxondoko

+Hani Sweileh (hno.sweileh)

 Mixaill

-nongnoobjung (kitcharuk_4)

-盛凤阁 (execzero)

-Raylir

-BWU Wheelman (Wheelman)

 Zalki

-McGuygnol

-Bing Feng (fengbing123)

+BWU Wheelman (Wheelman)

+Raylir

+盛凤阁 (execzero)

+nongnoobjung (kitcharuk_4)

 Jonathan (macburgerjunior)

-geimfis

+Bing Feng (fengbing123)

+McGuygnol

 ArcaneWater

+geimfis

 vargag159

-Johan Keller Jensen (JKeller)

-Jonatan Nyberg (sweuser)

 Charlie W. (wallichc)

-ak-47root

+Johan Keller Jensen (JKeller)

+科技小白堂 (lipeng0820)

 FC Barcelona HD (kurdnews)

+Enderdrache LP (enderdrachelp)

 Sergei Fug1t1v3 (fug)

-科技小白堂 (lipeng0820)

+ak-47root

 Runoff Screen (glebpozbnakov62)

 Meng Hao Li (GazCore)

-Enderdrache LP (enderdrachelp)

 andymidside

-Bo Alsemgeest (bo.alsemgeest.wausie)

-Santiago Pereyra (SannttVIII)

 Append Huang (append)

-Khedi

+Santiago Pereyra (SannttVIII)

 L1Q

-powerdef

+Khedi

+Bo Alsemgeest (bo.alsemgeest.wausie)

 Themis T. (Deminho)

+powerdef

 Alexis Brandner (Alexinfos)

 TheOver (upmeboost)

-Walt Gee (vovanych)

+WeiYuanStudio

 DevilLorde

 Ivan (SKDown)

-NoPressure

 Camille Nury (kamsdu30)

-flor.com (florretardada)

-Prince_of_Raop

-Alessandro Sarto (alesarto03)

+Walt Gee (vovanych)

 HeroGamers (Fido2603)

-JackYeah

-WaterOtaku

+Prince_of_Raop

+NoPressure

+flor.com (florretardada)

 Robin Hielscher (Jack0r)

 Patrick Frings (Ragnos)

-Henrik Mattsson-Mårn (rchk)

 Pere O. (gotrunks)

-Christian Henriksen (cnhenriksen)

-Hydroboost

 Noi (Noi_noel2647)

-神成フィルム (kami00nari)

+Hydroboost

+JackYeah

+Christian Henriksen (cnhenriksen)

+Henrik Mattsson-Mårn (rchk)

+WaterOtaku

 yair (5shekel)

+神成フィルム (kami00nari)

+JorRy

 Alican Gultekin (Vitaefinis)

 Vũ Hải Tây (tayngungo1999)

-JorRy

 Ramon Gonzalez (ramon200000)

-Federico Tensi (habby1337)

-ghsi

-אפיק רוזנר (afikr333)

 Esdras Tarsis (esdrastarsis)

-Yuri Mihaqlov (yurijmi)

 SandoBY

-Julian Meijboom (julianmeijboom)

+אפיק רוזנר (afikr333)

+Federico Tensi (habby1337)

+Yuri Mihaqlov (yurijmi)

+Md Arafat (zonoiko)

+ghsi

 Mnsor The-Ghost (mnsor1722011)

-Maksym Tymoshyk (maximillian_)

-abydosan (abydoshun)

+Julian Meijboom (julianmeijboom)

 Türker Yıldırım (turkeryildirim)

+Maksym Tymoshyk (maximillian_)

+Warchamp7

 FaZe Fakay (fazefakay)

-OYYZ

+abydosan (abydoshun)

 Bob Wei (BobWaver)

-RyyzQ

-Tal Machani (talmachani)

-Rodrigo Ipince (ipince)

+OYYZ

 Ville Närhi (daimaah)

-Jimmy Huang (f56112000)

-Jonas Svensson (jonassanojj99)

+Tal Machani (talmachani)

 曹恩逢 (nelson22768384)

-antome

 Julia Drewniak (ewagsi)

+Jonas Svensson (jonassanojj99)

+RyyzQ

+antome

 basakbk

+Rodrigo Ipince (ipince)

+Jimmy Huang (f56112000)

 AndreLeonardo (andreleonardoyt)

-Alessandro Iepure (alessandro_iepure)

-TR1D

 wordlessWind (wordlesswind)

+JustMaffie

 Aniol Pagès (aniolpages)

 Daniel Aundal (aundal)

-Md Arafat (zonoiko)

-BoJustus

-JustMaffie

+Alessandro Iepure (alessandro_iepure)

 SkylixX

 Hannes Blåman (thebluis)

-Tiim

+TR1D

+BoJustus

 ncb

-cylin

-Kuji Kitamura (KujiKita)

-Michał Lewczak (michal200507)

-Patryk Kunda (ner.i.ol)

 Mats Andreassen (MatsA)

 tomoe-musashi

 TacticalKebab

-Nicolai  (Nicolai9852)

-Alex Shafer (enzanki-ars)

+Kuji Kitamura (KujiKita)

+cylin

 MUHADDIS MEDIA (muhaddismedia)

+Alex Shafer (enzanki-ars)

+Nicolai  (Nicolai9852)

+Yuki Yu (Yukiyu)

+Michał Lewczak (michal200507)

+Patryk Kunda (ner.i.ol)

+Tiim

​

@@ -1,3 +1,3 @@

-robocopy C:\projects\obs-studio\build32\rundir\RelWithDebInfo C:\projects\obs-studio\build\ /E /XF .gitignore

-robocopy C:\projects\obs-studio\build64\rundir\RelWithDebInfo C:\projects\obs-studio\build\ /E /XC /XN /XO /XF .gitignore

-7z a build.zip C:\projects\obs-studio\build\*

\ No newline at end of file

+robocopy .\build32\rundir\RelWithDebInfo .\build\ /E /XF .gitignore

+robocopy .\build64\rundir\RelWithDebInfo .\build\ /E /XC /XN /XO /XF .gitignore

+7z a build.zip .\build\*

\ No newline at end of file

​

@@ -37,6 +37,7 @@

         pkg-config \

         python3-dev \

         qtbase5-dev \

+        libqt5svg5-dev \

         swig

​

@@ -40,4 +40,5 @@

         pkg-config \

         python3-dev \

         qtbase5-dev \

+        libqt5svg5-dev \

         swig

​

@@ -0,0 +1,4 @@

+curl -kLO https://cdn-fastly.obsproject.com/downloads/Qt_5.10.1.7z -f --retry 5 -C -

+7z x Qt_5.10.1.7z -oQt

+mv Qt C:\QtDep

+dir C:\QtDep

\ No newline at end of file

​

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

-if exist dependencies2017.zip (curl -kLO https://obsproject.com/downloads/dependencies2017.zip -f --retry 5 -z dependencies2017.zip) else (curl -kLO https://obsproject.com/downloads/dependencies2017.zip -f --retry 5 -C -)

-if exist vlc.zip (curl -kLO https://obsproject.com/downloads/vlc.zip -f --retry 5 -z vlc.zip) else (curl -kLO https://obsproject.com/downloads/vlc.zip -f --retry 5 -C -)

-if exist cef_binary_%CEF_VERSION%_windows32.zip (curl -kLO https://obsproject.com/downloads/cef_binary_%CEF_VERSION%_windows32.zip -f --retry 5 -z cef_binary_%CEF_VERSION%_windows32.zip) else (curl -kLO https://obsproject.com/downloads/cef_binary_%CEF_VERSION%_windows32.zip -f --retry 5 -C -)

-if exist cef_binary_%CEF_VERSION%_windows64.zip (curl -kLO https://obsproject.com/downloads/cef_binary_%CEF_VERSION%_windows64.zip -f --retry 5 -z cef_binary_%CEF_VERSION%_windows64.zip) else (curl -kLO https://obsproject.com/downloads/cef_binary_%CEF_VERSION%_windows64.zip -f --retry 5 -C -)

+if exist dependencies2017.zip (curl -kLO https://cdn-fastly.obsproject.com/downloads/dependencies2017.zip -f --retry 5 -z dependencies2017.zip) else (curl -kLO https://cdn-fastly.obsproject.com/downloads/dependencies2017.zip -f --retry 5 -C -)

+if exist vlc.zip (curl -kLO https://cdn-fastly.obsproject.com/downloads/vlc.zip -f --retry 5 -z vlc.zip) else (curl -kLO https://cdn-fastly.obsproject.com/downloads/vlc.zip -f --retry 5 -C -)

+if exist cef_binary_%CEF_VERSION%_windows32.zip (curl -kLO https://cdn-fastly.obsproject.com/downloads/cef_binary_%CEF_VERSION%_windows32.zip -f --retry 5 -z cef_binary_%CEF_VERSION%_windows32.zip) else (curl -kLO https://cdn-fastly.obsproject.com/downloads/cef_binary_%CEF_VERSION%_windows32.zip -f --retry 5 -C -)

+if exist cef_binary_%CEF_VERSION%_windows64.zip (curl -kLO https://cdn-fastly.obsproject.com/downloads/cef_binary_%CEF_VERSION%_windows64.zip -f --retry 5 -z cef_binary_%CEF_VERSION%_windows64.zip) else (curl -kLO https://cdn-fastly.obsproject.com/downloads/cef_binary_%CEF_VERSION%_windows64.zip -f --retry 5 -C -)

 7z x dependencies2017.zip -odependencies2017

 7z x vlc.zip -ovlc

 7z x cef_binary_%CEF_VERSION%_windows32.zip -oCEF_32

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

 set DepsPath32=%CD%\dependencies2017\win32

 set DepsPath64=%CD%\dependencies2017\win64

 set VLCPath=%CD%\vlc

-set QTDIR32=C:\Qt\5.11\msvc2015

-set QTDIR64=C:\Qt\5.11\msvc2017_64

+set QTDIR32=C:\QtDep\5.10.1\msvc2017

+set QTDIR64=C:\QtDep\5.10.1\msvc2017_64

 set CEF_32=%CD%\CEF_32\cef_binary_%CEF_VERSION%_windows32

 set CEF_64=%CD%\CEF_64\cef_binary_%CEF_VERSION%_windows64

 set build_config=RelWithDebInfo

 mkdir build build32 build64

+if "%TWITCH-CLIENTID%"=="$(twitch_clientid)" (

 cd ./build32

-cmake -G "Visual Studio 15 2017" -DCOPIED_DEPENDENCIES=false -DCOPY_DEPENDENCIES=true -DBUILD_CAPTIONS=true -DCOMPILE_D3D12_HOOK=true -DBUILD_BROWSER=true -DCEF_ROOT_DIR=%CEF_32% -DTWITCH_CLIENTID="%TWITCH-CLIENTID%" -DTWITCH_HASH="%TWITCH-HASH%" -DMIXER_CLIENTID="%MIXER-CLIENTID%" -DMIXER_HASH="%MIXER-HASH%" ..

+cmake -G "Visual Studio 15 2017" -DCOPIED_DEPENDENCIES=false -DCOPY_DEPENDENCIES=true -DBUILD_CAPTIONS=true -DCOMPILE_D3D12_HOOK=true -DBUILD_BROWSER=true -DCEF_ROOT_DIR=%CEF_32% ..

 cd ../build64

-cmake -G "Visual Studio 15 2017 Win64" -DCOPIED_DEPENDENCIES=false -DCOPY_DEPENDENCIES=true -DBUILD_CAPTIONS=true -DCOMPILE_D3D12_HOOK=true -DBUILD_BROWSER=true -DCEF_ROOT_DIR=%CEF_64% -DTWITCH_CLIENTID="%TWITCH-CLIENTID%" -DTWITCH_HASH="%TWITCH-HASH%" -DMIXER_CLIENTID="%MIXER-CLIENTID%" -DMIXER_HASH="%MIXER-HASH%" ..

+cmake -G "Visual Studio 15 2017 Win64" -DCOPIED_DEPENDENCIES=false -DCOPY_DEPENDENCIES=true -DBUILD_CAPTIONS=true -DCOMPILE_D3D12_HOOK=true -DBUILD_BROWSER=true -DCEF_ROOT_DIR=%CEF_64% ..

+) else (

+cd ./build32

+cmake -G "Visual Studio 15 2017" -DCOPIED_DEPENDENCIES=false -DCOPY_DEPENDENCIES=true -DBUILD_CAPTIONS=true -DCOMPILE_D3D12_HOOK=true -DBUILD_BROWSER=true -DCEF_ROOT_DIR=%CEF_32% -DTWITCH_CLIENTID="%TWITCH-CLIENTID%" -DTWITCH_HASH="%TWITCH-HASH%" -DMIXER_CLIENTID="%MIXER-CLIENTID%" -DMIXER_HASH="%MIXER-HASH%" -DRESTREAM_CLIENTID="%RESTREAM-CLIENTID%" -DRESTREAM_HASH="%RESTREAM-HASH%" ..

+cd ../build64

+cmake -G "Visual Studio 15 2017 Win64" -DCOPIED_DEPENDENCIES=false -DCOPY_DEPENDENCIES=true -DBUILD_CAPTIONS=true -DCOMPILE_D3D12_HOOK=true -DBUILD_BROWSER=true -DCEF_ROOT_DIR=%CEF_64% -DTWITCH_CLIENTID="%TWITCH-CLIENTID%" -DTWITCH_HASH="%TWITCH-HASH%" -DMIXER_CLIENTID="%MIXER-CLIENTID%" -DMIXER_HASH="%MIXER-HASH%" -DRESTREAM_CLIENTID="%RESTREAM-CLIENTID%" -DRESTREAM_HASH="%RESTREAM-HASH%" ..

+)

 cd ..

​

@@ -32,6 +32,16 @@

 include(ObsCpack)

 include(GNUInstallDirs)

+if(WIN32)

+   string(REPLACE "-" ";" UI_VERSION_SPLIT ${OBS_VERSION})

+   list(GET UI_VERSION_SPLIT 0 UI_VERSION)

+   string(REPLACE "." ";" UI_VERSION_SEMANTIC ${UI_VERSION})

+   list(GET UI_VERSION_SEMANTIC 0 UI_VERSION_MAJOR)

+   list(GET UI_VERSION_SEMANTIC 1 UI_VERSION_MINOR)

+   list(GET UI_VERSION_SEMANTIC 2 UI_VERSION_PATCH)

+   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/UI/obs.rc.in ${CMAKE_CURRENT_SOURCE_DIR}/UI/obs.rc)

+endif()

+

 # Must be a string in the format of "x.x.x-rcx"

 if(DEFINED RELEASE_CANDIDATE)

    set(OBS_VERSION "${RELEASE_CANDIDATE}")

​

@@ -63,9 +63,3 @@

    you fully understand -- bad advice is worse than no advice.  When it

    comes to something that you don't fully know or understand, please

    defer to the official help or official channels.

-

-Credits

--------

- - Icons made by `Freepik <https://www.freepik.com>`_ from

-   `Flaticon <https://www.flaticon.com/>`_ are licensed under

-   `CC 3.0 BY <https://creativecommons.org/licenses/by/3.0/>`_.

​

@@ -39,6 +39,16 @@

    set(MIXER_ENABLED TRUE)

 endif()

+if(NOT DEFINED RESTREAM_CLIENTID OR "${RESTREAM_CLIENTID}" STREQUAL "" OR

+   NOT DEFINED RESTREAM_HASH     OR "${RESTREAM_HASH}"     STREQUAL "" OR

+   NOT BROWSER_AVAILABLE_INTERNAL)

+   set(RESTREAM_ENABLED FALSE)

+   set(RESTREAM_CLIENTID "")

+   set(RESTREAM_HASH "0")

+else()

+   set(RESTREAM_ENABLED TRUE)

+endif()

+

 configure_file(

    "${CMAKE_CURRENT_SOURCE_DIR}/ui-config.h.in"

    "${CMAKE_CURRENT_BINARY_DIR}/ui-config.h")

@@ -46,6 +56,8 @@

 set(CMAKE_INCLUDE_CURRENT_DIR TRUE)

 set(CMAKE_AUTOMOC TRUE)

+find_package(Qt5Svg ${FIND_MODE})

+

 find_package(FFmpeg REQUIRED COMPONENTS avcodec avutil avformat)

 if(APPLE)

@@ -157,6 +169,15 @@

            auth-mixer.hpp

            )

    endif()

+

+   if(RESTREAM_ENABLED)

+       list(APPEND obs_PLATFORM_SOURCES

+           auth-restream.cpp

+           )

+       list(APPEND obs_PLATFORM_HEADERS

+           auth-restream.hpp

+           )

+   endif()

 endif()

 set(obs_libffutil_SOURCES

@@ -330,6 +351,7 @@

 target_link_libraries(obs

    libobs

    Qt5::Widgets

+   Qt5::Svg

    obs-frontend-api

    ${FFMPEG_LIBRARIES}

    ${LIBCURL_LIBRARIES}

​

@@ -297,7 +297,14 @@

    obs_data_t *settings = obs_service_get_settings(service);

-   obs_data_set_string(settings, "key", key_.c_str());

+   bool bwtest = obs_data_get_bool(settings, "bwtest");

+

+   if (bwtest && strcmp(this->service(), "Twitch") == 0)

+       obs_data_set_string(settings, "key",

+               key_.append("?bandwidthtest=true").c_str());

+   else

+       obs_data_set_string(settings, "key", key_.c_str());

+

    obs_service_update(service, settings);

    obs_data_release(settings);

​

@@ -0,0 +1,283 @@

+#include "auth-restream.hpp"

+

+#include <QPushButton>

+#include <QHBoxLayout>

+#include <QVBoxLayout>

+#include <qt-wrappers.hpp>

+#include <json11.hpp>

+#include <ctime>

+#include <sstream>

+

+#include <obs-app.hpp>

+#include "window-basic-main.hpp"

+#include "remote-text.hpp"

+#include "ui-config.h"

+#include "obf.h"

+#include <browser-panel.hpp>

+

+using namespace json11;

+

+extern QCef *cef;

+extern QCefCookieManager *panel_cookies;

+

+/* ------------------------------------------------------------------------- */

+

+#define RESTREAM_AUTH_URL "https://obsproject.com/app-auth/restream?action=redirect"

+#define RESTREAM_TOKEN_URL "https://obsproject.com/app-auth/restream-token"

+#define RESTREAM_STREAMKEY_URL "https://api.restream.io/v2/user/streamKey"

+#define RESTREAM_SCOPE_VERSION 1

+

+

+static Auth::Def restreamDef = {

+   "Restream",

+   Auth::Type::OAuth_StreamKey

+};

+

+/* ------------------------------------------------------------------------- */

+

+RestreamAuth::RestreamAuth(const Def &d)

+   : OAuthStreamKey(d)

+{

+}

+

+bool RestreamAuth::GetChannelInfo()

+try {

+   std::string client_id = RESTREAM_CLIENTID;

+   deobfuscate_str(&client_id[0], RESTREAM_HASH);

+

+   if (!GetToken(RESTREAM_TOKEN_URL, client_id, RESTREAM_SCOPE_VERSION))

+       return false;

+   if (token.empty())

+       return false;

+   if (!key_.empty())

+       return true;

+

+   std::string auth;

+   auth += "Authorization: Bearer ";

+   auth += token;

+

+   std::vector<std::string> headers;

+   headers.push_back(std::string("Client-ID: ") + client_id);

+   headers.push_back(std::move(auth));

+

+   std::string output;

+   std::string error;

+   Json json;

+   bool success;

+

+   auto func = [&] () {

+       success = GetRemoteFile(

+               RESTREAM_STREAMKEY_URL,

+               output,

+               error,

+               nullptr,

+               "application/json",

+               nullptr,

+               headers,

+               nullptr,

+               5);

+   };

+

+   ExecThreadedWithoutBlocking(

+           func,

+           QTStr("Auth.LoadingChannel.Title"),

+           QTStr("Auth.LoadingChannel.Text").arg(service()));

+   if (!success || output.empty())

+       throw ErrorInfo("Failed to get stream key from remote", error);

+

+   json = Json::parse(output, error);

+   if (!error.empty())

+       throw ErrorInfo("Failed to parse json", error);

+

+   error = json["error"].string_value();

+   if (!error.empty())

+       throw ErrorInfo(error, json["error_description"].string_value());

+

+   key_ = json["streamKey"].string_value();

+

+   return true;

+} catch (ErrorInfo info) {

+   QString title = QTStr("Auth.ChannelFailure.Title");

+   QString text = QTStr("Auth.ChannelFailure.Text")

+       .arg(service(), info.message.c_str(), info.error.c_str());

+

+   QMessageBox::warning(OBSBasic::Get(), title, text);

+

+   blog(LOG_WARNING, "%s: %s: %s",

+           __FUNCTION__,

+           info.message.c_str(),

+           info.error.c_str());

+   return false;

+}

+

+void RestreamAuth::SaveInternal()

+{

+   OBSBasic *main = OBSBasic::Get();

+   config_set_string(main->Config(), service(), "DockState",

+           main->saveState().toBase64().constData());

+   OAuthStreamKey::SaveInternal();

+}

+

+static inline std::string get_config_str(

+       OBSBasic *main,

+       const char *section,

+       const char *name)

+{

+   const char *val = config_get_string(main->Config(), section, name);

+   return val ? val : "";

+}

+

+bool RestreamAuth::LoadInternal()

+{

+   firstLoad = false;

+   return OAuthStreamKey::LoadInternal();

+}

+

+class RestreamWidget : public QDockWidget {

+public:

+   inline RestreamWidget() : QDockWidget() {}

+

+   QScopedPointer<QCefWidget> widget;

+};

+

+void RestreamAuth::LoadUI()

+{

+   if (uiLoaded)

+       return;

+   if (!GetChannelInfo())

+       return;

+

+   OBSBasic::InitBrowserPanelSafeBlock();

+   OBSBasic *main = OBSBasic::Get();

+

+   QCefWidget *browser;

+   std::string url;

+   std::string script;

+

+   /* ----------------------------------- */

+

+   url = "https://restream.io/chat-application";

+

+   QSize size = main->frameSize();

+   QPoint pos = main->pos();

+

+   chat.reset(new RestreamWidget());

+   chat->setObjectName("restreamChat");

+   chat->resize(420, 600);

+   chat->setMinimumSize(200, 300);

+   chat->setWindowTitle(QTStr("Auth.Chat"));

+   chat->setAllowedAreas(Qt::AllDockWidgetAreas);

+

+   browser = cef->create_widget(nullptr, url, panel_cookies);

+   chat->setWidget(browser);

+

+   main->addDockWidget(Qt::RightDockWidgetArea, chat.data());

+   chatMenu.reset(main->AddDockWidget(chat.data()));

+

+   /* ----------------------------------- */

+

+   url = "https://restream.io/titles/embed";

+

+   info.reset(new RestreamWidget());

+   info->setObjectName("restreamInfo");

+   info->resize(410, 600);

+   info->setMinimumSize(200, 150);

+   info->setWindowTitle(QTStr("Auth.StreamInfo"));

+   info->setAllowedAreas(Qt::AllDockWidgetAreas);

+

+   browser = cef->create_widget(nullptr, url, panel_cookies);

+   info->setWidget(browser);

+

+   main->addDockWidget(Qt::RightDockWidgetArea, info.data());

+   infoMenu.reset(main->AddDockWidget(info.data()));

+

+   /* ----------------------------------- */

+

+   chat->setFloating(true);

+   info->setFloating(true);

+   chat->move(pos.x() + size.width() - chat->width() - 50, pos.y() + 50);

+   info->move(pos.x() + 40, pos.y() + 50);

+

+   if (firstLoad) {

+       chat->setVisible(true);

+       info->setVisible(true);

+   }

+   else {

+       const char *dockStateStr = config_get_string(main->Config(),

+           service(), "DockState");

+       QByteArray dockState =

+           QByteArray::fromBase64(QByteArray(dockStateStr));

+       main->restoreState(dockState);

+   }

+

+   uiLoaded = true;

+}

+

+bool RestreamAuth::RetryLogin()

+{

+   OAuthLogin login(OBSBasic::Get(), RESTREAM_AUTH_URL, false);

+   cef->add_popup_whitelist_url("about:blank", &login);

+   if (login.exec() == QDialog::Rejected) {

+       return false;

+   }

+

+   std::shared_ptr<RestreamAuth> auth =

+       std::make_shared<RestreamAuth>(restreamDef);

+

+   std::string client_id = RESTREAM_CLIENTID;

+   deobfuscate_str(&client_id[0], RESTREAM_HASH);

+

+   return GetToken(RESTREAM_TOKEN_URL, client_id,

+           RESTREAM_SCOPE_VERSION,

+           QT_TO_UTF8(login.GetCode()), true);

+}

+

+std::shared_ptr<Auth> RestreamAuth::Login(QWidget *parent)

+{

+   OAuthLogin login(parent, RESTREAM_AUTH_URL, false);

+   cef->add_popup_whitelist_url("about:blank", &login);

+

+   if (login.exec() == QDialog::Rejected) {

+       return nullptr;

+   }

+

+   std::shared_ptr<RestreamAuth> auth =

+       std::make_shared<RestreamAuth>(restreamDef);

+

+   std::string client_id = RESTREAM_CLIENTID;

+   deobfuscate_str(&client_id[0], RESTREAM_HASH);

+

+   if (!auth->GetToken(RESTREAM_TOKEN_URL, client_id,

+               RESTREAM_SCOPE_VERSION,

+               QT_TO_UTF8(login.GetCode()))) {

+       return nullptr;

+   }

+

+   std::string error;

+   if (auth->GetChannelInfo()) {

+       return auth;

+   }