@@ -1,4 +1,77 @@

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

+Tue May 02 19:05:40 UTC 2017 - jimmy@boombatower.com

+

+- Update to version 18.0.2:

+  * UI/updater: Fix temp files being created and not deleted

+  * UI/updater: Fix potential fail case when no files to patch

+  * UI/updater: Fixed a bug with deflating

+  * UI/updater: Ignore 64bit files on 32bit windows

+  * CI: Use ccache to speed up the build

+  * CI: OSX - Fix obs.png

+  * UI/updater: Fix incorrect inflate use

+  * CI: Linux - Install libfdk-aac-dev

+  * image-source: Move file modification check before animation processing

+  * UI: Add workaround to fix deleting final scene bug

+  * rtmp-services: Update ingest list for Restream.io

+  * rtmp-services: Update maximum bitrate for Twitch

+  * UI: Fix segfault when no system tray exists

+  * CI: Linux - Install FFmpeg from source

+  * obs-ffmpeg/nvenc: Remove "default" preset

+  * libobs: Add obs_source_copy_filters function

+  * UI: Add copying/pasting of sources/filters

+  * UI: Disable filter pasting when scene collection changed

+  * UI: Fix bug where items can't be deleted in last scene

+  * libobs: Remove unimplemented exports

+  * rtmp-services: Add Livestream service

+  * win-dshow: Fix issue with activating when not set to

+  * rtmp-services: Update Picarto maximum bitrates

+  * libobs: Delay stop detection of audio source

+  * libobs: Allow source to fully control source flags (for now)

+  * libobs: Add ability to preload async frames

+  * libobs: Remove multiple calls to free_type_data

+  * deps: Add media-playback static lib

+  * obs-ffmpeg: Change from libff to media-playback

+  * deps/libff: Remove network init

+  * UI: Remove libff as a dependency

+  * deps/libff: Don't build libff (deprecated)

+  * obs-ffmpeg: Remove unnecessary open call

+  * obs-ffmpeg: Always open on update unless set otherwise

+  * obs-ffmpeg: Fix bug on non-MSVC compilers

+  * UI: Fix property widgets not being disabled

+  * mac-avcapture: Ability to directly add iOS devices over USB

+  * audio-monitoring: Add ability to monitor Outputs

+  * decklink: Add option to select channel format

+  * decklink: Add workaround for audio timestamp jump issue

+  * Improve README/CONTRIBUTING files

+  * win-dshow: Fix reallocation issue in ffmpeg-decode

+  * UI: Add window name to remux dialog

+  * UI: Hide OpenGL and D3D adapter on Windows

+  * UI: Continue to show OpenGL if already in use

+  * UI: Increase MAX_CRASH_REPORT_SIZE to 150 KB

+  * CI: Use webhooks for notifications

+  * CI: Fix notification frequency

+  * libobs-opengl: Log OpenGL version on all systems

+  * Fix various typos across multiple modules

+  * Update Linux kernel coding style URL in CONTRIBUTING

+  * UI: Ctrl+E to Edit Transform

+  * UI: Remove unused defines from old updater code

+  * win-capture: Log if shared texture capture is unavailable

+  * win-capture: Update get-graphics-offsets

+  * win-capture: Add missing 32 bit offsets

+  * win-capture: Fix and clarify window capture prioritization

+  * UI: Add front-end API functions to get/modify service

+  * UI: Display filename when dragging & dropping

+  * obs-outputs: Always call RTMP_Init before connecting

+  * UI: Make sure all dialogs have close buttons

+  * UI: Add command line option for starting up always on top

+  * frontend-tools: Rename some files

+  * frontend-plugins: Abstract captions

+  * enc-amf: Update to v2.1.0(.0)

+  * win-ivcam: Fix potential null pointer dereference

+  * libobs: Update to 18.0.2 (windows hotfix)

+  * UI/updater: Add opt to disable building update module

+

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

 Tue Mar 07 05:13:13 UTC 2017 - jimmy@boombatower.com

 - Update to version 18.0.1:

​

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

 Name:           obs-studio

-Version:        18.0.1

+Version:        18.0.2

 Release:        0

 Summary:        A recording/broadcasting program

​

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

 <services>

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

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

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

+    <param name="revision">refs/tags/18.0.2</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">bc9a58174b75c445dcb14259443a74746f0b3d43</param>

+    <param name="changesrevision">4684294bcd53193f4227fb31214a6417fdcd2b97</param>

   </service>

 </servicedata>

​

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

-Contributing Information:

-

- - Our bug tracker is located at (currently linked to forum accounts):

-       https://obsproject.com/mantis/

-

- - Development forums are currently located at:

-       https://obsproject.com/forum/list/general-development.21/

-

- - Development IRC channel is primarily #obs-dev on QuakeNet

- 

- - To contribute translations, see:

-       https://obsproject.com/forum/threads/how-to-contribute-translations-for-obs.16327/

-

-

-Contributing Guidelines:

-

- - Code and commits will be reviewed.  Reviews will be blunt and honest, and

-   your change probably won't go through the first time, or may be outright

-   rejected.  It may require many revisions before changes are finally

-   accepted.

-

- - If you want to avoid doing a lot of work only to have it rejected, discuss

-   what you want to change it in the main channels/forums/mailing lists before

-   actually working on it.  Open source requires thick skin.  Please don't be

-   discouraged if your changes don't go through, learn from it and get better.

-

- - Coding style is Linux-style KNF (kernel normal form).  This means K&R, 80

-   columns max, preferable maximum function length of approximately 42 lines, 8

-   character width tabs, lower_case_names, etc.  I chose this for the sake of

-   the project.  Don't argue about it, just do it.  It takes no time to do.

-

-   See https://www.kernel.org/doc/Documentation/CodingStyle for a general

-   guideline (though not necessarily a rulebook, for example we allow the use

-   of boolean return values instead of ints for failure).

-

-   NOTE: C++ is an exception to the lower_case_only rule, CamelCase is

-   encouraged (though not required) to distinguish it from C code.  Just a

-   personal and subjective stylistic thing on my part.

-

- - Commits are not just changes to code; they should also be treated as

-   annotation to code.  For that reason, do not put unrelated changes in a

-   single commit.  Separate out different changes in to different commits, and

-   make separate pull requests for unrelated changes.  Commits should be

-   formatted with the 50/72 standard, and should be descriptive and concise.

-   See http://chris.beams.io/posts/git-commit/ for a summary of how to make

-   good commit messages.

-

- - Core code is C only (unless there's an operating system specific thing that

-   absolutely requires another language).

-

- - Modules and UI may use C, C++, or Objective-C (for apple), though please try

-   to use C unless an API you're using requires C++ or Objective-C (such as

-   windows COM classes, or apple Objective-C APIs).

-

- - If you don't quite know what to work on and just want to help, the bug

-   tracker has a list of things that need to be worked on.

-

- - Try to respect the wishes of the author(s)/maintainer(s).  A good maintainer

-   will always listen, and will often ask others on the project for their

-   opinions, but don't expect things to be completely democratic.

-

- - Do not use dependencies for the sake of convenience.  There's enough

-   dependencies as it is.  Use them only if you absolutely have to depend on

-   them.

​

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

-

-What is OBS?

-

-  This project is a rewrite of what was formerly known as "Open Broadcaster

-  Software", software originally designed for recording and streaming live

-  video content, efficiently.

-

-Bug Tracker: https://obsproject.com/mantis/

-

-   We are no longer using GitHub issues!  Please use Mantis, and only report

-   bugs and major issues.  Do NOT use mantis to ask questions or request

-   features, please keep that to the forums.

-

-   Forum accounts are now linked to Mantis Bug Tracker.  To use the bug

-   tracker, simply log in to the forums and then go to the bug tracker link

-   above.

-

-What's the goal of rewriting OBS?

-

- - Make it multiplatform.  Use multiplatform libraries/functions/classes where

-   possible to allow this.  Multi-platform support was one of the primary

-   reasons for the rewrite.  This also means using a UI toolkit will be

-   necessary for user interface.  It also means allowing the use of OpenGL as

-   well as Direct3D.

-

- - Separate the application from the core, allowing custom application of

-   the core if desired, and easier extending of the user interface.

-

- - Simplify complex systems to not only make it easier to use, but easier to

-   maintain.

-

- - Write a better core API, and design the entire system to be modular.

-

- - Now that we have much more experience, improve the overall design of all

-   the subsystems/API, and minimize/eliminate design flaws.  Make it so we can

-   do all the things we've had trouble with before, such as custom outputs,

-   multiple outputs at once, better handling of inputs, custom services.

-

- - Make a better/cleaner code base, use better coding standards, use standard

-   libraries where possible (not just STL and C standard library, but also

-   things like ffmpeg as well), and improve maintainability of the project as a

-   whole.

-

- - Implement a new API-independent shader/effect system allowing better and

-   easier shaders usage and customization without having to duplicate shader

-   code.

-

- - Better device support.  Again, I didn't know what I was getting into when

-   I originally started writing code for devices.  It evolved into a totally

-   convoluted mess.  I would have improved the existing device plugin code, but

-   it was just all so fundamentally bad and flawed that it would have been

-   detrimental to progression to continue working on it rather than rewrite it.

-

-

-What was wrong with the original OBS?

-

-  The original OBS was rewritten not because it was bad, at least in terms of

-  optimization.  Optimization and graphics are things I love.  However, there

-  were some serious problems with the code and design that were deep and

-  fundamental, which prevented myself and other developers from being able to

-  improve/extend the application or add new features very easily.

-

-  First, the design flaws:

-

-    - The original OBS was completely and hopelessly hard-coded for windows,

-      and only windows.  It was just totally impossible to use it on other

-      systems.

-

-    - All the sub-systems were written before I really knew what I was getting

-      into.  When I started the project, I didn't really fully comprehend the

-      scope of what I would need or how to properly design the project.  My

-      design and plans for the application were just to write something that

-      would "stream games and a webcam, with things like overlays and such."

-      This turned out fine for most casual gamers and streamers (and very

-      successful), but left anyone wanting to do anything more advanced left

-      massively wanting.

-

-    - Subsystems and core functionalities intermingled in such a way that it

-      was a nightmare to get proper custom functionality out of it.  Things

-      like QSV had to be meshed in with the main encoding loop, and it just

-      made things a nightmare to deal with.  Custom outputs were nigh

-      impossible.

-

-    - The API was poorly designed because most of it came after I originally

-      wrote the application, it was more of an afterthought, and plugin API

-      would routinely break for plugin developers due to changing C++

-      interfaces (one of the reasons the core is now C).

-

-    - API was intermeshed with the main executable.  The OBSApi DLL was

-      nothing more than basically this mutant growth upon OBS.exe that allowed

-      plugin developers to barely write plugins, but all the important API

-      code was actually stored in the executable.  Navigation was a total mess.

-

-    - The graphics subsystem, while not bad, was incomplete, and though far

-      easier to use than bare D3D, wasn't ideal, and was hard-coded for D3D

-      specifically.

-

-    - The devices and audio code was poor, I had no idea what I was getting into

-      when I started writing them in.  I did not realize beforehand all the

-      device-specific quirks that each device/system could have.  Some devices

-      had bad timing and quirks that I never anticipated while writing them.

-      I struggled with devices, and my original design for the audio subsystem

-      for example morphed over and over into an abomination that, though works,

-      is basically this giant duct-taped zombie monster.

-

-    - Shaders were difficult to customize because they had to be duplicated if

-      you wanted slightly different functionality that required more than just

-      changing shader constants.

-

-    - Orientation of sources was fixed, and required special code for each

-      source to do any custom modification of rotation/position/scale/etc.

-      This is one of those fundamental flaws that I look back on and regret, as

-      it was a stupid idea from the beginning.  I originally thought I could

-      get more accurate source position/sizes, but it just turned out to be

-      totally bad.  Should have been matrices from the beginning just like with

-      a regular 3D engine.

-

-  Second, the coding flaws:

-

-    - The coding style was inconsistent.

-

-    - C++98, C-Style C++, there was no exception usage, no STL.  C++ used

-      poorly.

-

-    - Not Invented Here Syndrome everywhere.  Custom string functions/classes,

-      custom templates, custom everything everywhere.  To be fair, it was all

-      hand-me-down code from the early 2000s that I had become used to, but

-      that was no excuse -- C-standard libraries and the STL should have been

-      used from the beginning over anything else.  That doesn't mean to say

-      that using custom stuff is always bad, but doing it to the extent I did

-      definitely was.  Made it horrible to maintain as well, required extra

-      knowledge for plugin developers and anyone messing with the code.

-

-    - Giant monolithic classes everywhere, the main OBS class was paricularly

-      bad in this regard.  This meant navigation was a nightmare, and no one

-      really knew where to go or where to add/change things.

-

-    - Giant monolithic functions everywhere.  This was particularly bad

-      because it meant that functions became harder to debug and harder to

-      keep track of what was going on in any particular function at any given

-      time.  These large functions, though not inefficient, were delicate and

-      easily breakable.  (See OBS::MainCaptureLoop for a nightmarish example,

-      or the listbox subclass window procedure in WindowStuff.cpp)

-

-    - Very large file sizes with everything clumped up into single files (for

-      another particularly nightmarish example, see WindowStuff.cpp)

-

-    - Bad formatting.  Code could go beyond 200 columns in some cases, making

-      it very unpleasant to read with many editors.  Spaces instead of tabs,

-      K&R mixed with allman (which was admittedly my fault).

-

-

-New (actual) coding guidelines

-

- - For the C code (especially in the core), guidelines are pretty strict K&R,

-   kernel style.  See the linux kernel "CodingStyle" document for more

-   information.  That particular coding style guideline is for more than just

-   style, it actually helps produce a better overall code base.

-

- - For C++ code, I still use CamelCase instead of all_lowercase just because

-   I prefer it that way, it feels right with C++ for some reason.  It also

-   helps make it distinguishable from C code.

-

- - I've started using 8-column tabs for almost everything -- I really

-   personally like it over 4-column tabs.  I feel that 8-column tabs are very

-   helpful in preventing large amounts of indentation.  A self-imposed

-   limitation, if you will.  I also use actual tabs now, instead of spaces.

-   Also, I feel that the K&R style looks much better/cleaner when viewed with

-   8-column tabs.

-

- - Preferred maximum columns: 80.  I've also been doing this because in

-   combination with 8-column tabs, it further prevents large/bad functions

-   with high indentation.  Another self-imposed limitation.  Also, it makes

-   for much cleaner viewing in certain editors that wrap (like vim).

​

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

-#include "captions-stream.hpp"

-#include <mmreg.h>

-#include <util/windows/CoTaskMemPtr.hpp>

-#include <util/threading.h>

-#include <util/base.h>

-

-using namespace std;

-

-#if 0

-#define debugfunc(format, ...) blog(LOG_DEBUG, "[Captions] %s(" format ")", \

-       __FUNCTION__, ##__VA_ARGS__)

-#else

-#define debugfunc(format, ...)

-#endif

-

-CaptionStream::CaptionStream(DWORD samplerate_) :

-   samplerate(samplerate_),

-   event(CreateEvent(nullptr, false, false, nullptr))

-{

-   buf_info.ulMsMinNotification = 50;

-   buf_info.ulMsBufferSize = 500;

-   buf_info.ulMsEventBias = 0;

-

-   format.wFormatTag = WAVE_FORMAT_PCM;

-   format.nChannels = 1;

-   format.nSamplesPerSec = 16000;

-   format.nAvgBytesPerSec = format.nSamplesPerSec * sizeof(uint16_t);

-   format.nBlockAlign = 2;

-   format.wBitsPerSample = 16;

-   format.cbSize = sizeof(format);

-

-   resampler.Reset(&format);

-}

-

-void CaptionStream::Stop()

-{

-   {

-       lock_guard<mutex> lock(m);

-       circlebuf_free(buf);

-   }

-

-   cv.notify_one();

-}

-

-void CaptionStream::PushAudio(const struct audio_data *data, bool muted)

-{

-   uint8_t *output[MAX_AV_PLANES] = {};

-   uint32_t frames = data->frames;

-   uint64_t ts_offset;

-   bool ready = false;

-

-   audio_resampler_resample(resampler, output, &frames, &ts_offset,

-           data->data, data->frames);

-

-   if (output[0]) {

-       if (muted)

-           memset(output[0], 0, frames * sizeof(int16_t));

-

-       lock_guard<mutex> lock(m);

-       circlebuf_push_back(buf, output[0], frames * sizeof(int16_t));

-       write_pos += frames * sizeof(int16_t);

-

-       if (wait_size && buf->size >= wait_size)

-           ready = true;

-   }

-

-   if (ready)

-       cv.notify_one();

-}

-

-// IUnknown methods

-

-STDMETHODIMP CaptionStream::QueryInterface(REFIID riid, void **ppv)

-{

-   if (riid == IID_IUnknown) {

-       AddRef();

-       *ppv = this;

-

-   } else if (riid == IID_IStream) {

-       AddRef();

-       *ppv = (IStream*)this;

-

-   } else if (riid == IID_ISpStreamFormat) {

-       AddRef();

-       *ppv = (ISpStreamFormat*)this;

-

-   } else if (riid == IID_ISpAudio) {

-       AddRef();

-       *ppv = (ISpAudio*)this;

-

-   } else {

-       *ppv = nullptr;

-       return E_NOINTERFACE;

-   }

-

-   return NOERROR;

-}

-

-STDMETHODIMP_(ULONG) CaptionStream::AddRef()

-{

-   return (ULONG)os_atomic_inc_long(&refs);

-}

-

-STDMETHODIMP_(ULONG) CaptionStream::Release()

-{

-   ULONG new_refs = (ULONG)os_atomic_dec_long(&refs);

-   if (!new_refs)

-       delete this;

-

-   return new_refs;

-}

-

-// ISequentialStream methods

-

-STDMETHODIMP CaptionStream::Read(void *data, ULONG bytes, ULONG *read_bytes)

-{

-   HRESULT hr = S_OK;

-   size_t cur_size;

-

-   debugfunc("data, %lu, read_bytes", bytes);

-   if (!data)

-       return STG_E_INVALIDPOINTER;

-

-   {

-       lock_guard<mutex> lock1(m);

-       wait_size = bytes;

-       cur_size = buf->size;

-   }

-

-   unique_lock<mutex> lock(m);

-

-   if (bytes > cur_size)

-       cv.wait(lock);

-

-   if (bytes > (ULONG)buf->size) {

-       bytes = (ULONG)buf->size;

-       hr = S_FALSE;

-   }

-   if (bytes)

-       circlebuf_pop_front(buf, data, bytes);

-   if (read_bytes)

-       *read_bytes = bytes;

-

-   wait_size = 0;

-   pos.QuadPart += bytes;

-   return hr;

-}

-

-STDMETHODIMP CaptionStream::Write(const void *, ULONG bytes,

-       ULONG*)

-{

-   debugfunc("data, %lu, written_bytes", bytes);

-   UNUSED_PARAMETER(bytes);

-

-   return STG_E_INVALIDFUNCTION;

-}

-

-// IStream methods

-

-STDMETHODIMP CaptionStream::Seek(LARGE_INTEGER move, DWORD origin,

-       ULARGE_INTEGER *new_pos)

-{

-   debugfunc("%lld, %lx, new_pos", move, origin);

-   UNUSED_PARAMETER(move);

-   UNUSED_PARAMETER(origin);

-

-   if (!new_pos)

-       return E_POINTER;

-

-   if (origin != SEEK_CUR || move.QuadPart != 0)

-       return E_NOTIMPL;

-

-   *new_pos = pos;

-   return S_OK;

-}

-

-STDMETHODIMP CaptionStream::SetSize(ULARGE_INTEGER new_size)

-{

-   debugfunc("%llu", new_size);

-   UNUSED_PARAMETER(new_size);

-   return STG_E_INVALIDFUNCTION;

-}

-

-STDMETHODIMP CaptionStream::CopyTo(IStream *stream, ULARGE_INTEGER bytes,

-       ULARGE_INTEGER *read_bytes,

-       ULARGE_INTEGER *written_bytes)

-{

-   HRESULT hr;

-

-   debugfunc("stream, %llu, read_bytes, written_bytes", bytes);

-

-   if (!stream)

-       return STG_E_INVALIDPOINTER;

-

-   ULONG written = 0;

-   if (bytes.QuadPart > (ULONGLONG)buf->size)

-       bytes.QuadPart = (ULONGLONG)buf->size;

-

-   lock_guard<mutex> lock(m);

-   temp_buf.resize((size_t)bytes.QuadPart);

-   circlebuf_peek_front(buf, &temp_buf[0], (size_t)bytes.QuadPart);

-

-   hr = stream->Write(temp_buf.data(), (ULONG)bytes.QuadPart, &written);

-

-   if (read_bytes)

-       *read_bytes = bytes;

-   if (written_bytes)

-       written_bytes->QuadPart = written;

-

-   return hr;

-}

-

-STDMETHODIMP CaptionStream::Commit(DWORD commit_flags)

-{

-   debugfunc("%lx", commit_flags);

-   UNUSED_PARAMETER(commit_flags);

-   /* TODO? */

-   return S_OK;

-}

-

-STDMETHODIMP CaptionStream::Revert(void)

-{

-   debugfunc("");

-   return S_OK;

-}

-

-STDMETHODIMP CaptionStream::LockRegion(ULARGE_INTEGER offset,

-       ULARGE_INTEGER size, DWORD type)

-{

-   debugfunc("%llu, %llu, %ld", offset, size, type);

-   UNUSED_PARAMETER(offset);

-   UNUSED_PARAMETER(size);

-   UNUSED_PARAMETER(type);

-   /* TODO? */

-   return STG_E_INVALIDFUNCTION;

-}

-

-STDMETHODIMP CaptionStream::UnlockRegion(ULARGE_INTEGER offset,

-       ULARGE_INTEGER size, DWORD type)

-{

-   debugfunc("%llu, %llu, %ld", offset, size, type);

-   UNUSED_PARAMETER(offset);

-   UNUSED_PARAMETER(size);

-   UNUSED_PARAMETER(type);

-   /* TODO? */

-   return STG_E_INVALIDFUNCTION;

-}

-

-static const wchar_t *stat_name = L"Caption stream";

-

-STDMETHODIMP CaptionStream::Stat(STATSTG *stg, DWORD flag)

-{

-   debugfunc("stg, %lu", flag);

-

-   if (!stg)

-       return E_POINTER;

-

-   lock_guard<mutex> lock(m);

-   *stg = {};

-   stg->type = STGTY_STREAM;

-   stg->cbSize.QuadPart = (ULONGLONG)buf->size;

-

-   if (flag == STATFLAG_DEFAULT) {

-       stg->pwcsName = (wchar_t*)CoTaskMemAlloc(sizeof(stat_name));

-       memcpy(stg->pwcsName, stat_name, sizeof(stat_name));

-   }

-

-   return S_OK;

-}

-

-STDMETHODIMP CaptionStream::Clone(IStream **stream)

-{

-   debugfunc("stream");

-   *stream = nullptr;

-   return E_NOTIMPL;

-}

-

-// ISpStreamFormat methods

-

-STDMETHODIMP CaptionStream::GetFormat(GUID *guid,

-       WAVEFORMATEX **co_mem_wfex_out)

-{

-   debugfunc("guid, co_mem_wfex_out");

-

-   if (!guid || !co_mem_wfex_out)

-       return E_POINTER;

-

-   if (format.wFormatTag == 0) {

-       *co_mem_wfex_out = nullptr;

-       return S_OK;

-   }

-

-   void *wfex = CoTaskMemAlloc(sizeof(format));

-   memcpy(wfex, &format, sizeof(format));

-

-   *co_mem_wfex_out = (WAVEFORMATEX*)wfex;

-   return S_OK;

-}

-

-// ISpAudio methods

-

-STDMETHODIMP CaptionStream::SetState(SPAUDIOSTATE state_, ULONGLONG)

-{

-   debugfunc("%lu, reserved", state_);

-   state = state_;

-   return S_OK;

-}

-

-STDMETHODIMP CaptionStream::SetFormat(REFGUID guid_ref,

-       const WAVEFORMATEX *wfex)

-{

-   debugfunc("guid, wfex");

-   if (!wfex)

-       return E_INVALIDARG;

-

-   if (guid_ref == SPDFID_WaveFormatEx) {

-       lock_guard<mutex> lock(m);

-       memcpy(&format, wfex, sizeof(format));

-       resampler.Reset(wfex);

-

-       /* 50 msec */

-       DWORD size = format.nSamplesPerSec / 20;

-       DWORD byte_size = size * format.nBlockAlign;

-       circlebuf_reserve(buf, (size_t)byte_size);

-   }

-   return S_OK;

-}

-

-STDMETHODIMP CaptionStream::GetStatus(SPAUDIOSTATUS *status)

-{

-   debugfunc("status");

-

-   if (!status)

-       return E_POINTER;

-

-   /* TODO? */

-   lock_guard<mutex> lock(m);

-   *status = {};

-   status->cbNonBlockingIO = (ULONG)buf->size;

-   status->State = state;

-   status->CurSeekPos = pos.QuadPart;

-   status->CurDevicePos = write_pos;

-   return S_OK;

-}

-

-STDMETHODIMP CaptionStream::SetBufferInfo(const SPAUDIOBUFFERINFO *buf_info_)

-{

-   debugfunc("buf_info");

-

-   /* TODO */

-   buf_info = *buf_info_;

-   return S_OK;

-}

-

-STDMETHODIMP CaptionStream::GetBufferInfo(SPAUDIOBUFFERINFO *buf_info_)

-{

-   debugfunc("buf_info");

-   if (!buf_info_)

-       return E_POINTER;

-

-   *buf_info_ = buf_info;

-   return S_OK;

-}

-

-STDMETHODIMP CaptionStream::GetDefaultFormat(GUID *format,

-       WAVEFORMATEX **co_mem_wfex_out)

-{

-   debugfunc("format, co_mem_wfex_out");

-

-   if (!format || !co_mem_wfex_out)

-       return E_POINTER;

-

-   void *wfex = CoTaskMemAlloc(sizeof(format));

-   memcpy(wfex, &format, sizeof(format));

-

-   *format = SPDFID_WaveFormatEx;

-   *co_mem_wfex_out = (WAVEFORMATEX*)wfex;

-   return S_OK;

-}

-

-STDMETHODIMP_(HANDLE) CaptionStream::EventHandle(void)

-{

-   debugfunc("");

-   return event;

-}

-

-STDMETHODIMP CaptionStream::GetVolumeLevel(ULONG *level)

-{

-   debugfunc("level");

-   if (!level)

-       return E_POINTER;

-

-   *level = vol;

-   return S_OK;

-}

-

-STDMETHODIMP CaptionStream::SetVolumeLevel(ULONG level)

-{

-   debugfunc("%lu", level);

-   vol = level;

-   return S_OK;

-}

-

-STDMETHODIMP CaptionStream::GetBufferNotifySize(ULONG *size)

-{

-   debugfunc("size");

-   if (!size)

-       return E_POINTER;

-   *size = notify_size;

-   return S_OK;

-}

-

-STDMETHODIMP CaptionStream::SetBufferNotifySize(ULONG size)

-{

-   debugfunc("%lu", size);

-   notify_size = size;

-   return S_OK;

-}

​

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

-#include <windows.h>

-#include <sapi.h>

-#include <condition_variable>

-#include <mutex>

-#include <vector>

-#include <obs.h>

-#include <media-io/audio-resampler.h>

-#include <util/circlebuf.h>

-#include <util/windows/WinHandle.hpp>

-

-#include <fstream>

-

-class CircleBuf {

-   circlebuf buf = {};

-public:

-   inline ~CircleBuf() {circlebuf_free(&buf);}

-   inline operator circlebuf*() {return &buf;}

-   inline circlebuf *operator->() {return &buf;}

-};

-

-class Resampler {

-   audio_resampler_t *resampler = nullptr;

-

-public:

-   inline void Reset(const WAVEFORMATEX *wfex)

-   {

-       const struct audio_output_info *aoi =

-           audio_output_get_info(obs_get_audio());

-

-       struct resample_info src;

-       src.samples_per_sec = aoi->samples_per_sec;

-       src.format = aoi->format;

-       src.speakers = aoi->speakers;

-

-       struct resample_info dst;

-       dst.samples_per_sec = uint32_t(wfex->nSamplesPerSec);

-       dst.format = AUDIO_FORMAT_16BIT;

-       dst.speakers = (enum speaker_layout)wfex->nChannels;

-

-       if (resampler)

-           audio_resampler_destroy(resampler);

-       resampler = audio_resampler_create(&dst, &src);

-   }

-

-   inline ~Resampler() {audio_resampler_destroy(resampler);}

-   inline operator audio_resampler_t*() {return resampler;}

-};

-

-class CaptionStream : public ISpAudio {

-   volatile long refs = 1;

-   SPAUDIOBUFFERINFO buf_info = {};

-   ULONG notify_size = 0;

-   SPAUDIOSTATE state;

-   WinHandle event;

-   ULONG vol = 0;

-

-   std::condition_variable cv;

-   std::mutex m;

-   std::vector<int16_t> temp_buf;

-   WAVEFORMATEX format = {};

-   Resampler resampler;

-

-   CircleBuf buf;

-   ULONG wait_size = 0;

-   DWORD samplerate = 0;

-   ULARGE_INTEGER pos = {};

-   ULONGLONG write_pos = 0;

-

-public:

-   CaptionStream(DWORD samplerate);

-

-   void Stop();

-   void PushAudio(const struct audio_data *audio_data, bool muted);

-

-   // IUnknown methods

-   STDMETHODIMP QueryInterface(REFIID riid, void **ppv) override;

-   STDMETHODIMP_(ULONG) AddRef() override;

-   STDMETHODIMP_(ULONG) Release() override;

-

-   // ISequentialStream methods

-   STDMETHODIMP Read(void *data, ULONG bytes, ULONG *read_bytes) override;

-   STDMETHODIMP Write(const void *data, ULONG bytes, ULONG *written_bytes)

-       override;

-

-   // IStream methods

-   STDMETHODIMP Seek(LARGE_INTEGER move, DWORD origin,

-           ULARGE_INTEGER *new_pos) override;

-   STDMETHODIMP SetSize(ULARGE_INTEGER new_size) override;

-   STDMETHODIMP CopyTo(IStream *stream, ULARGE_INTEGER bytes,

-           ULARGE_INTEGER *read_bytes,

-           ULARGE_INTEGER *written_bytes) override;

-   STDMETHODIMP Commit(DWORD commit_flags) override;

-   STDMETHODIMP Revert(void) override;

-   STDMETHODIMP LockRegion(ULARGE_INTEGER offset, ULARGE_INTEGER size,

-           DWORD type) override;

-   STDMETHODIMP UnlockRegion(ULARGE_INTEGER offset, ULARGE_INTEGER size,

-           DWORD type) override;

-   STDMETHODIMP Stat(STATSTG *stg, DWORD flags) override;

-   STDMETHODIMP Clone(IStream **stream) override;

-

-   // ISpStreamFormat methods

-   STDMETHODIMP GetFormat(GUID *guid, WAVEFORMATEX **co_mem_wfex_out)

-       override;

-

-   // ISpAudio methods

-   STDMETHODIMP SetState(SPAUDIOSTATE state, ULONGLONG reserved) override;

-   STDMETHODIMP SetFormat(REFGUID guid_ref, const WAVEFORMATEX *wfex)

-       override;

-   STDMETHODIMP GetStatus(SPAUDIOSTATUS *status) override;

-   STDMETHODIMP SetBufferInfo(const SPAUDIOBUFFERINFO *buf_info) override;

-   STDMETHODIMP GetBufferInfo(SPAUDIOBUFFERINFO *buf_info) override;

-   STDMETHODIMP GetDefaultFormat(GUID *format,

-           WAVEFORMATEX **co_mem_wfex_out) override;

-   STDMETHODIMP_(HANDLE) EventHandle(void) override;

-   STDMETHODIMP GetVolumeLevel(ULONG *level) override;

-   STDMETHODIMP SetVolumeLevel(ULONG level) override;

-   STDMETHODIMP GetBufferNotifySize(ULONG *size) override;

-   STDMETHODIMP SetBufferNotifySize(ULONG size) override;

-};

​

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

-/*

-MIT License

-

-Copyright (c) 2016 Michael Fabian Dirks

-

-Permission is hereby granted, free of charge, to any person obtaining a copy

-of this software and associated documentation files (the "Software"), to deal

-in the Software without restriction, including without limitation the rights

-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

-copies of the Software, and to permit persons to whom the Software is

-furnished to do so, subject to the following conditions:

-

-The above copyright notice and this permission notice shall be included in all

-copies or substantial portions of the Software.

-

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

-SOFTWARE.

-*/

-

-#pragma once

-//////////////////////////////////////////////////////////////////////////

-// Includes

-//////////////////////////////////////////////////////////////////////////

-#include <condition_variable>

-#include <algorithm>

-#include <mutex>

-#include <queue>

-#include <thread>

-#include <vector>

-#include <chrono>

-

-// Plugin

-#include "plugin.h"

-#include "amf.h"

-#include "api-base.h"

-

-//////////////////////////////////////////////////////////////////////////

-// Code

-//////////////////////////////////////////////////////////////////////////

-

-namespace Plugin {

-   namespace AMD {

-       // Internal Properties

-       enum class H264EncoderType : uint8_t {

-           AVC = 0,    // Advanced Video Coding

-           SVC,        // Scalable Video Coding

-           HEVC,       // High-Efficiency Video Coding (Discovered in amfrt64.dll)

-       };

-       enum class H264MemoryType : uint8_t {

-           Host = 0,   // Host-Managed Memory

-           DirectX9,   // DirectX9

-           DirectX11,  // DirectX11

-           OpenGL,     // OpenGL

-       };

-       enum class H264ColorFormat : uint8_t {

-           // 4:2:0 Formats

-           NV12 = 0,   // NV12

-           I420,       // YUV 4:2:0

-           // 4:2:2 Formats

-           YUY2,

-           // Uncompressed

-           BGRA,       // ARGB

-           RGBA,       // RGBA

-           // Other

-           GRAY,       // Y 4:0:0

-       };

-       enum class H264ColorProfile : uint8_t {

-           Rec601 = 0,

-           Rec709,

-           Rec2020, // Truer to world color, used for HDR

-       };

-

-       // Static Properties

-       enum class H264Usage : uint8_t {

-           Transcoding = 0,    // Only one capable of streaming to services.

-           UltraLowLatency,    // Low Latency Recording or Network Streaming

-           LowLatency,         // Low Latency Recording or Network Streaming

-           Webcam,             // For SVC Recording and Streaming

-       };

-       enum class H264QualityPreset : uint8_t {

-           Speed = 0,

-           Balanced,

-           Quality,

-       };

-       enum class H264Profile : uint16_t {

-           Baseline = 66,

-           Main = 77,

-           High = 100,

-           ConstrainedBaseline = 256,

-           ConstrainedHigh = 257

-       };

-       enum class H264ProfileLevel : uint8_t {

-           Automatic = 0,

-           L10 = 10,

-           L11,

-           L12,

-           L13,

-           L20 = 20,

-           L21,

-           L22,

-           L30 = 30,

-           L31,

-           L32,

-           L40 = 40,

-           L41,

-           L42,

-           L50 = 50,

-           L51,

-           L52,

-       };

-       enum class H264ScanType : uint8_t {

-           Progressive = 0,

-           Interlaced,

-       };

-       enum class H264CodingType : uint8_t {

-           Default = 0,

-           CABAC = 1,

-           CALVC = 2,

-       };

-

-       // Dynamic Properties

-       enum class H264RateControlMethod : uint8_t {

-           ConstantQP = 0,

-           ConstantBitrate,

-           VariableBitrate_PeakConstrained,

-           VariableBitrate_LatencyConstrained = 3,

-       };

-       enum class H264BFramePattern : uint8_t {

-           None = 0,

-           One,

-           Two,

-           Three,

-       };

-

-       // Experimental

-       enum class H264SliceMode : uint8_t {

-           Horizontal = 1,

-           Vertical = 2

-       };

-       enum class H264SliceControlMode : uint8_t {

-           Off = 0,

-           Macroblock = 1, // AMF_VIDEO_ENCODER_SLICE_CTRL_MODE_MB

-           Invalid,

-           Macroblock_Row = 3 // AMF_VIDEO_ENCODER_SLICE_CTRL_MODE_MB_ROW

-       };

-       

-       class H264Encoder {

-           #pragma region Initializer & Finalizer

-           public:

-           H264Encoder(

-               H264EncoderType p_Type,

-               std::string p_VideoAPI,

-               uint64_t p_VideoAdapterId,

-               bool p_OpenCL,

-               H264ColorFormat p_SurfaceFormat = H264ColorFormat::NV12

-           );

-           ~H264Encoder();

-           #pragma endregion Initializer & Finalizer

-

-           public:

-           void Start();

-           void Restart();

-           void Stop();

-           bool IsStarted();

-

-           bool SendInput(struct encoder_frame* frame);

-           bool GetOutput(struct encoder_packet* packet, bool* received_packet);

-           bool GetExtraData(uint8_t**& data, size_t*& size);

-           void GetVideoInfo(struct video_scale_info*& vsi);

-

-           #pragma region Properties

-           public:

-           void LogProperties();

-

-           // Static

-

-           #pragma region Startup Properties

-           // Set which Usage preset to use.

-           // Changing this will also change a lot of other properties.

-           void SetUsage(H264Usage usage);

-           H264Usage GetUsage();

-

-           // Set which Quality Preset AMF should use.

-           // Affects the quality of the output.

-           void SetQualityPreset(H264QualityPreset preset);

-           H264QualityPreset GetQualityPreset();

-

-           // Set the Profile the output should have.

-           void SetProfile(H264Profile profile);

-           H264Profile GetProfile();

-

-           // Set the Profile Level the output should have.

-           void SetProfileLevel(H264ProfileLevel level);

-           H264ProfileLevel GetProfileLevel();

-           #pragma endregion Startup Properties

-

-           #pragma region Frame Properties

-           // Set which Color Profile the input frame is.

-           void SetColorProfile(H264ColorProfile profile);

-           H264ColorProfile GetColorProfile();

-

-           // Set if the input frame is in full color range.

-           void SetFullRangeColorEnabled(bool enabled);

-           bool IsFullRangeColorEnabled();

-

-           // Resolution for the input and output.

-           void SetResolution(uint32_t width, uint32_t height);

-           std::pair<uint32_t, uint32_t> GetResolution();

-

-           // Framerate of the input and output.

-           void SetFrameRate(uint32_t num, uint32_t den);

-           std::pair<uint32_t, uint32_t> GetFrameRate();

-

-           // Scanning method for input (and output?).